generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-27 19:10:22 +01:00
Code Issues Projects Releases Wiki Activity

Fixed issue #325

Browse Source
This commit is contained in:
Pieter Hintjens
2012-03-23 17:29:04 -05:00
parent c861fb4c83
commit 82c06e4417
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/router.cpp
View File

@@ -1,6 +1,6 @@
/* /*
Copyright (c) 2012 iMatix Corporation
Copyright (c) 2009-2011 250bpm s.r.o. Copyright (c) 2009-2011 250bpm s.r.o.
Copyright (c) 2011 iMatix Corporation
Copyright (c) 2011 VMware, Inc. Copyright (c) 2011 VMware, Inc.
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
@@ -106,6 +106,7 @@ void zmq::router_t::xterminated (pipe_t *pipe_)
return; return;
} }
} }
// We should never get here
zmq_assert (false); zmq_assert (false);
} }
@@ -236,25 +237,29 @@ int zmq::router_t::xrecv (msg_t *msg_, int flags_)
zmq_assert (!more_in); zmq_assert (!more_in);
// Empty identity means we can preserve the auto-generated identity. // Empty identity means we can preserve the auto-generated identity
if (msg_->size () != 0) { if (msg_->size ()) {
blob_t identity ((unsigned char*) msg_->data (), msg_->size ());
// Actual change of the identity. outpipes_t::iterator it = outpipes.find (identity);
outpipes_t::iterator it = outpipes.begin (); if (it == outpipes.end ()) {
while (it != outpipes.end ()) { // Find the pipe and change its identity
if (it->second.pipe == pipe) { bool changed = false;
blob_t identity ((unsigned char*) msg_->data (), it = outpipes.begin ();
msg_->size ()); while (it != outpipes.end ()) {
pipe->set_identity (identity); if (it->second.pipe == pipe) {
outpipes.erase (it); pipe->set_identity (identity);
outpipe_t outpipe = {pipe, true}; outpipes.erase (it);
outpipes.insert (outpipes_t::value_type (identity, outpipe_t outpipe = {pipe, true};
outpipe)); if (!outpipes.insert (
break; outpipes_t::value_type (identity, outpipe)).second)
zmq_assert (false);
changed = true;
break;
}
++it;
} }
++it; zmq_assert (changed);
} }
zmq_assert (it != outpipes.end ());
} }
} }