1 files changed, 28 insertions, 24 deletions

diff --git a/src/zmq_init.hpp b/src/zmq_init.hpp
index 6f935c2..d90915a 100644
--- a/src/zmq_init.hpp
+++ b/src/zmq_init.hpp
@@ -1,19 +1,20 @@
 /*
-    Copyright (c) 2007-2010 iMatix Corporation
+    Copyright (c) 2007-2011 iMatix Corporation
+    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
     0MQ is free software; you can redistribute it and/or modify it under
-    the terms of the Lesser GNU General Public License as published by
+    the terms of the GNU Lesser General Public License as published by
     the Free Software Foundation; either version 3 of the License, or
     (at your option) any later version.
 
     0MQ is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    Lesser GNU General Public License for more details.
+    GNU Lesser General Public License for more details.
 
-    You should have received a copy of the Lesser GNU General Public License
+    You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
@@ -22,10 +23,9 @@
 
 #include "i_inout.hpp"
 #include "i_engine.hpp"
-#include "owned.hpp"
+#include "own.hpp"
 #include "fd.hpp"
 #include "stdint.hpp"
-#include "options.hpp"
 #include "stdint.hpp"
 #include "blob.hpp"
 
@@ -34,54 +34,58 @@ namespace zmq
 
     //  The class handles initialisation phase of 0MQ wire-level protocol.
 
-    class zmq_init_t : public owned_t, public i_inout
+    class zmq_init_t : public own_t, public i_inout
     {
     public:
 
-        zmq_init_t (class io_thread_t *parent_, socket_base_t *owner_,
-            fd_t fd_, const options_t &options_, bool reconnect_,
-            const char *protocol_, const char *address_,
-            uint64_t session_ordinal_);
+        zmq_init_t (class io_thread_t *io_thread_, class socket_base_t *socket_,
+            class session_t *session_, fd_t fd_, const options_t &options_);
         ~zmq_init_t ();
 
     private:
 
-        void finalise ();
+        void finalise_initialisation ();
+        void dispatch_engine ();
 
         //  i_inout interface implementation.
         bool read (::zmq_msg_t *msg_);
         bool write (::zmq_msg_t *msg_);
         void flush ();
-        void detach (owned_t *reconnecter_);
-        class io_thread_t *get_io_thread ();
-        class socket_base_t *get_owner ();
-        uint64_t get_ordinal ();
+        void detach ();
 
         //  Handlers for incoming commands.
         void process_plug ();
         void process_unplug ();
 
-        //  Associated wite-protocol engine.
+        //  Associated wire-protocol engine.
         i_engine *engine;
 
+        //  Detached transient engine.
+        i_engine *ephemeral_engine;
+
         //  True if our own identity was already sent to the peer.
         bool sent;
 
         //  True if peer's identity was already received.
         bool received;
 
+        //  Socket the object belongs to.
+        class socket_base_t *socket;
+
+        //  Reference to the session the init object belongs to.
+        //  If the associated session is unknown and should be found
+        //  depending on peer identity this value is NULL.
+        class session_t *session;
+
         //  Identity of the peer socket.
         blob_t peer_identity;
 
-        //  TCP connecter creates session before the name of the peer is known.
-        //  Thus we know only its ordinal number.
-        uint64_t session_ordinal;
-
-        //  Associated socket options.
-        options_t options;
+        //  I/O thread the object is living in. It will be used to plug
+        //  the engine into the same I/O thread.
+        class io_thread_t *io_thread;
 
         zmq_init_t (const zmq_init_t&);
-        void operator = (const zmq_init_t&);
+        const zmq_init_t &operator = (const zmq_init_t&);
     };
 
 }