From c8e8f2a24cd339c548e06f75a3cef96454671a85 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Fri, 15 Jul 2011 11:24:33 +0200 Subject: ZMQ_IDENTITY socket option removed This patch simplifies the whole codebase significantly, including dropping depedency on libuuid. Signed-off-by: Martin Sustrik --- src/session.cpp | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'src/session.cpp') diff --git a/src/session.cpp b/src/session.cpp index 1ca69cf..0dd0e34 100644 --- a/src/session.cpp +++ b/src/session.cpp @@ -159,8 +159,7 @@ void zmq::session_t::process_plug () { } -void zmq::session_t::process_attach (i_engine *engine_, - const blob_t &peer_identity_) +void zmq::session_t::process_attach (i_engine *engine_) { // If some other object (e.g. init) notifies us that the connection failed // without creating an engine we need to start the reconnection process. @@ -171,7 +170,7 @@ void zmq::session_t::process_attach (i_engine *engine_, } // Trigger the notfication event about the attachment. - if (!attached (peer_identity_)) { + if (!attached ()) { delete engine_; return; } @@ -193,7 +192,7 @@ void zmq::session_t::process_attach (i_engine *engine_, pipe = pipes [0]; // Ask socket to plug into the remote end of the pipe. - send_bind (socket, pipes [1], peer_identity_); + send_bind (socket, pipes [1]); } // Plug in the engine. @@ -272,24 +271,9 @@ void zmq::session_t::timer_event (int id_) pipe->terminate (false); } -bool zmq::session_t::has_engine () +bool zmq::session_t::attached () { - return engine != NULL; -} - -bool zmq::session_t::register_session (const blob_t &name_, session_t *session_) -{ - return socket->register_session (name_, session_); -} - -void zmq::session_t::unregister_session (const blob_t &name_) -{ - socket->unregister_session (name_); -} - -bool zmq::session_t::attached (const blob_t &peer_identity_) -{ - return xattached (peer_identity_); + return xattached (); } void zmq::session_t::detached () -- cgit v1.2.3