From 954d7f743dbc0c159794915c6deadc374dbf64d2 Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@250bpm.com>
Date: Tue, 12 Oct 2010 17:55:09 +0200
Subject: Avoid duplicate creation of pipes for a single session

When a session is being closed down its inbound and outbound
pipe pointers are set to null. If (re) connection happens at
that time, session may try to reinistantiate the pipes which
is wrong. This patch allows session to attach pipes only once
in its lifetime.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
---
 src/session.cpp | 40 ++++++++++++++++++++++++----------------
 src/session.hpp |  3 +++
 2 files changed, 27 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/session.cpp b/src/session.cpp
index c926e63..76e782b 100644
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -36,6 +36,7 @@ zmq::session_t::session_t (class io_thread_t *io_thread_,
     engine (NULL),
     socket (socket_),
     io_thread (io_thread_),
+    pipes_attached (false),
     delimiter_processed (false),
     force_terminate (false),
     state (active)
@@ -125,6 +126,9 @@ void zmq::session_t::clean_pipes ()
 void zmq::session_t::attach_pipes (class reader_t *inpipe_,
     class writer_t *outpipe_, const blob_t &peer_identity_)
 {
+    zmq_assert (!pipes_attached);
+    pipes_attached = true;
+    
     if (inpipe_) {
         zmq_assert (!in_pipe);
         in_pipe = inpipe_;
@@ -218,24 +222,28 @@ void zmq::session_t::process_attach (i_engine *engine_,
 
     //  Check whether the required pipes already exist. If not so, we'll
     //  create them and bind them to the socket object.
-    reader_t *socket_reader = NULL;
-    writer_t *socket_writer = NULL;
+    if (!pipes_attached) {
+        zmq_assert (!in_pipe && !out_pipe);
+        pipes_attached = true;
+        reader_t *socket_reader = NULL;
+        writer_t *socket_writer = NULL;
+
+        //  Create the pipes, as required.
+        if (options.requires_in) {
+            create_pipe (socket, this, options.hwm, options.swap, &socket_reader,
+                &out_pipe);
+            out_pipe->set_event_sink (this);
+        }
+        if (options.requires_out) {
+            create_pipe (this, socket, options.hwm, options.swap, &in_pipe,
+                &socket_writer);
+            in_pipe->set_event_sink (this);
+        }
 
-    //  Create the pipes, if required.
-    if (options.requires_in && !out_pipe) {
-        create_pipe (socket, this, options.hwm, options.swap, &socket_reader,
-            &out_pipe);
-        out_pipe->set_event_sink (this);
+        //  Bind the pipes to the socket object.
+        if (socket_reader || socket_writer)
+            send_bind (socket, socket_reader, socket_writer, peer_identity_);
     }
-    if (options.requires_out && !in_pipe) {
-        create_pipe (this, socket, options.hwm, options.swap, &in_pipe,
-            &socket_writer);
-        in_pipe->set_event_sink (this);
-    }
-
-    //  Bind the pipes to the socket object.
-    if (socket_reader || socket_writer)
-        send_bind (socket, socket_reader, socket_writer, peer_identity_);
 
     //  Plug in the engine.
     zmq_assert (!engine);
diff --git a/src/session.hpp b/src/session.hpp
index d4b6ad9..7e528de 100644
--- a/src/session.hpp
+++ b/src/session.hpp
@@ -117,6 +117,9 @@ namespace zmq
         //  the engines into the same thread.
         class io_thread_t *io_thread;
 
+        //  If true, pipes were already attached to this session.
+        bool pipes_attached;
+
         //  If true, delimiter was already read from the inbound pipe.
         bool delimiter_processed;
 
-- 
cgit v1.2.3