TCP transport classes simplified

zmq_engine and tcp_socket merged into tcp_engine
zmq_connecter and tcp_connecter merged into tcp_connecter
zmq_listener and tcp_listener merged into tcp_listener

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

1 files changed, 0 insertions, 84 deletions

diff --git a/src/zmq_listener.cpp b/src/zmq_listener.cpp
deleted file mode 100644
index cb73ad8..0000000
--- a/src/zmq_listener.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-    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 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
-    GNU Lesser General Public License for more details.
-
-    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/>.
-*/
-
-#include <new>
-
-#include "zmq_listener.hpp"
-#include "zmq_engine.hpp"
-#include "io_thread.hpp"
-#include "session.hpp"
-#include "err.hpp"
-
-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_)
-{
-}
-
-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_, options.backlog);
-}
-
-void zmq::zmq_listener_t::process_plug ()
-{
-    //  Start polling for incoming connections.
-    handle = add_fd (tcp_listener.get_fd ());
-    set_pollin (handle);
-}
-
-void zmq::zmq_listener_t::process_term (int linger_)
-{
-    rm_fd (handle);
-    own_t::process_term (linger_);
-}
-
-void zmq::zmq_listener_t::in_event ()
-{
-    fd_t fd = tcp_listener.accept ();
-
-    //  If connection was reset by the peer in the meantime, just ignore it.
-    //  TODO: Handle specific errors like ENFILE/EMFILE etc.
-    if (fd == retired_fd)
-        return;
-    //  Create the engine object for this connection.
-    zmq_engine_t *engine = new (std::nothrow) zmq_engine_t (fd, options);
-    alloc_assert (engine);
-
-    //  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_assert (io_thread);
-
-    //  Create and launch a session object. 
-    session_t *session = new (std::nothrow)
-        session_t (io_thread, false, socket, options, NULL, NULL);
-    alloc_assert (session);
-    session->inc_seqnum ();
-    launch_child (session);
-    send_attach (session, engine, false);
-}
-