generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-14 11:06:59 +01:00
Code Issues Projects Releases Wiki Activity

Do not crash when multiple peers connect to PAIR socket

Browse Source 
When more then one peer connected to a ZMQ_PAIR socket,
an application aborted due to assertion failure.
This patch changes the ZMQ_PAIR socket behaviour so that
it rejects any further connection requests.
This commit is contained in:
Martin Hurton 2012-04-30 00:48:07 +02:00
parent 16ec2868c5
commit d84709497e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pair.cpp
View File

@ -38,14 +38,20 @@ zmq::pair_t::~pair_t ()
void zmq::pair_t::xattach_pipe (pipe_t *pipe_, bool icanhasall_) void zmq::pair_t::xattach_pipe (pipe_t *pipe_, bool icanhasall_)
{ {
zmq_assert (!pipe); zmq_assert (pipe_ != NULL);
pipe = pipe_;
// ZMQ_PAIR socket can only be connected to a single peer.
// The socket rejects any further connection requests.
if (pipe == NULL)
pipe = pipe_;
else
pipe_->terminate (false);
} }
void zmq::pair_t::xterminated (pipe_t *pipe_) void zmq::pair_t::xterminated (pipe_t *pipe_)
{ {
zmq_assert (pipe_ == pipe); if (pipe_ == pipe)
pipe = NULL; pipe = NULL;
} }
void zmq::pair_t::xread_activated (pipe_t *pipe_) void zmq::pair_t::xread_activated (pipe_t *pipe_)