3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-10 07:56:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Removing unnecessary outpipe values that had been used for reconnecting existing pipes - no longer needed when using a pipe term for the delay_attach situation."

Browse Source 
This reverts commit ace7c99b917dd66f1fcaed3cbb50c988b7e33b09.
This commit is contained in:
Ian Barber 2012-06-12 14:48:24 +01:00
parent 440af0022d
commit 74175decb4
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/session_base.cpp
View File

@ -306,9 +306,15 @@ void zmq::session_base_t::process_attach (i_engine *engine_)
zmq_assert (!pipe); zmq_assert (!pipe);
pipe = pipes [0]; pipe = pipes [0];
// Remember the remote end of the pipe if required
if (options.delay_attach_on_connect == 1)
outpipe = pipes [1];
// Ask socket to plug into the pipe. // Ask socket to plug into the pipe.
send_bind (socket, pipes [1]); send_bind (socket, pipes [1]);
} }
else if (outpipe && (options.delay_attach_on_connect == 1))
send_bind (socket, outpipe);
// Plug in the engine. // Plug in the engine.
zmq_assert (!engine); zmq_assert (!engine);

3
src/session_base.hpp
View File

@ -104,6 +104,9 @@ namespace zmq
// Pipe connecting the session to its socket. // Pipe connecting the session to its socket.
zmq::pipe_t *pipe; zmq::pipe_t *pipe;
// Socket end of pipe, in case of reconnection
zmq::pipe_t *outpipe;
// This flag is true if the remainder of the message being processed // This flag is true if the remainder of the message being processed
// is still in the in pipe. // is still in the in pipe.
bool incomplete_in; bool incomplete_in;