Imported Debian patch 2.1.3-1debian/2.1.3-1

1 files changed, 22 insertions, 19 deletions

diff --git a/src/zmq_listener.cpp b/src/zmq_listener.cpp
index d7cf292..e3f3bd8 100644
--- a/src/zmq_listener.cpp
+++ b/src/zmq_listener.cpp
@@ -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/>.
 */
 
@@ -24,11 +25,11 @@
 #include "io_thread.hpp"
 #include "err.hpp"
 
-zmq::zmq_listener_t::zmq_listener_t (io_thread_t *parent_,
-      socket_base_t *owner_, const options_t &options_) :
-    owned_t (parent_, owner_),
-    io_object_t (parent_),
-    options (options_)
+zmq::zmq_listener_t::zmq_listener_t (io_thread_t *io_thread_,
+      socket_base_t *socket_, const options_t &options_) :
+    own_t (io_thread_, options_),
+    io_object_t (io_thread_),
+    socket (socket_)
 {
 }
 
@@ -38,7 +39,7 @@ zmq::zmq_listener_t::~zmq_listener_t ()
 
 int zmq::zmq_listener_t::set_address (const char *protocol_, const char *addr_)
 {
-     return tcp_listener.set_address (protocol_, addr_);
+     return tcp_listener.set_address (protocol_, addr_, options.backlog);
 }
 
 void zmq::zmq_listener_t::process_plug ()
@@ -48,9 +49,10 @@ void zmq::zmq_listener_t::process_plug ()
     set_pollin (handle);
 }
 
-void zmq::zmq_listener_t::process_unplug ()
+void zmq::zmq_listener_t::process_term (int linger_)
 {
     rm_fd (handle);
+    own_t::process_term (linger_);
 }
 
 void zmq::zmq_listener_t::in_event ()
@@ -62,14 +64,15 @@ void zmq::zmq_listener_t::in_event ()
     if (fd == retired_fd)
         return;
 
-    //  Create an init object. 
+    //  Choose I/O thread to run connecter in. Given that we are already
+    //  running in an I/O thread, there must be at least one available.
     io_thread_t *io_thread = choose_io_thread (options.affinity);
-    zmq_init_t *init = new (std::nothrow) zmq_init_t (
-        io_thread, owner, fd, options, false, NULL, NULL, 0);
-    zmq_assert (init);
-    send_plug (init);
-    send_own (owner, init);
-}
-
+    zmq_assert (io_thread);
 
+    //  Create and launch an init object. 
+    zmq_init_t *init = new (std::nothrow) zmq_init_t (io_thread, socket,
+        NULL, fd, options);
+    alloc_assert (init);
+    launch_child (init);
+}