summaryrefslogtreecommitdiff
path: root/src/socket_base.cpp
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@fastmq.commkdir>2009-12-01 18:50:54 +0100
committerMartin Sustrik <sustrik@fastmq.commkdir>2009-12-01 18:50:54 +0100
commit9bd309bda6522dfdd514dd0c4edae04322c83ed1 (patch)
treeffcb1f097b219f64cffb079e1e36a54d2f624e8b /src/socket_base.cpp
parentc04583ff6ca3c27de5628a61b6b6ce59fd13c9d9 (diff)
annoying optimisation in 'bind' command removed
Diffstat (limited to 'src/socket_base.cpp')
-rw-r--r--src/socket_base.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index a614759..6a972e4 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -161,7 +161,7 @@ int zmq::socket_base_t::connect (const char *addr_)
// was incremented in find_endpoint function. The callee is notified
// about the fact via the last parameter.
send_bind (peer, out_pipe ? &out_pipe->reader : NULL,
- in_pipe ? &in_pipe->writer : NULL, true);
+ in_pipe ? &in_pipe->writer : NULL);
return 0;
}
@@ -509,16 +509,9 @@ void zmq::socket_base_t::process_own (owned_t *object_)
io_objects.insert (object_);
}
-void zmq::socket_base_t::process_bind (reader_t *in_pipe_, writer_t *out_pipe_,
- bool adjust_seqnum_)
+void zmq::socket_base_t::process_bind (reader_t *in_pipe_, writer_t *out_pipe_)
{
- // In case of inproc transport, the seqnum should catch up here.
- // For other transports the seqnum modification can be optimised out
- // because final handshaking between the socket and the session ensures
- // that no 'bind' command will be left unprocessed.
- if (adjust_seqnum_)
- processed_seqnum++;
-
+ processed_seqnum++;
attach_pipes (in_pipe_, out_pipe_);
}