From 971cbeda3de6691b212ad18bed9e9f08b278cfe1 Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@250bpm.com>
Date: Tue, 1 May 2012 16:41:04 +0200
Subject: Revert "Implement protocol versioning (except PGM)"

This reverts commit 512f3a604924fec9d89e2b4bfd6f73aa66309fa7.
---
 src/stream_engine.cpp | 58 +--------------------------------------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

(limited to 'src/stream_engine.cpp')

diff --git a/src/stream_engine.cpp b/src/stream_engine.cpp
index 85e3073..e70d1d3 100644
--- a/src/stream_engine.cpp
+++ b/src/stream_engine.cpp
@@ -53,21 +53,8 @@ xs::stream_engine_t::stream_engine_t (fd_t fd_, const options_t &options_) :
     session (NULL),
     leftover_session (NULL),
     options (options_),
-    plugged (false),
-    header_pos (in_header),
-    header_remaining (sizeof in_header),
-    header_received (false),
-    header_sent (false)
+    plugged (false)
 {
-    //  Fill in outgoing SP protocol header and the complementary (desired)
-    //  header.
-    if (!options.legacy_protocol) {
-        sp_get_header (out_header, options.sp_pattern, options.sp_version,
-            options.sp_role);
-        sp_get_header (desired_header, options.sp_pattern, options.sp_version,
-            options.sp_complement);
-    }
-
     //  Get the socket into non-blocking mode.
     unblock_socket (s);
 
@@ -168,35 +155,6 @@ void xs::stream_engine_t::in_event (fd_t fd_)
 {
     bool disconnection = false;
 
-    //  If we have not yet received the full protocol header...
-    if (unlikely (!options.legacy_protocol && !header_received)) {
-
-        //  Read remaining header bytes.
-        int hbytes = read (header_pos, header_remaining);
-
-        //  Check whether the peer has closed the connection.
-        if (hbytes == -1) {
-            error ();
-            return;
-        }
-
-        header_remaining -= hbytes;
-        header_pos += hbytes;
-
-        //  If we did not read the whole header, poll for more.
-        if (header_remaining)
-            return;
-
-        //  If the protocol headers do not match, close the connection.
-        if (memcmp (in_header, desired_header, sizeof in_header) != 0) {
-            error ();
-            return;
-        }
-
-        //  Done with protocol header; proceed to read data.
-        header_received = true;
-    }
-
     //  If there's no data to process in the buffer...
     if (!insize) {
 
@@ -252,20 +210,6 @@ void xs::stream_engine_t::out_event (fd_t fd_)
 {
     bool more_data = true;
 
-    //  If protocol header was not yet sent...
-    if (unlikely (!options.legacy_protocol && !header_sent)) {
-        int hbytes = write (out_header, sizeof out_header);
-
-        //  It should always be possible to write the full protocol header to a
-        //  freshly connected TCP socket. Therefore, if we get an error or
-        //  partial write here the peer has disconnected.
-        if (hbytes != sizeof out_header) {
-            error ();
-            return;
-        }
-        header_sent = true;
-    }
-
     //  If write buffer is empty, try to read new data from the encoder.
     if (!outsize) {
 
-- 
cgit v1.2.3