3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-30 01:06:55 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #573 from shripchenko/master

Browse Source 
another iteration on ZMQ_PROBE_ROUTER
This commit is contained in:
Pieter Hintjens 2013-06-10 03:34:23 -07:00
commit 5c54bc358e
3 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dealer.cpp
View File

@ -44,8 +44,8 @@ void zmq::dealer_t::xattach_pipe (pipe_t *pipe_, bool icanhasall_)
int rc = probe_msg_.init (); int rc = probe_msg_.init ();
errno_assert (rc == 0); errno_assert (rc == 0);
int ok = pipe_->write (&probe_msg_); rc = pipe_->write (&probe_msg_);
zmq_assert (ok); // zmq_assert (rc) is not applicable here, since it is not a bug.
pipe_->flush (); pipe_->flush ();
rc = probe_msg_.close (); rc = probe_msg_.close ();

29
src/router.cpp
View File

@ -59,6 +59,19 @@ void zmq::router_t::xattach_pipe (pipe_t *pipe_, bool icanhasall_)
zmq_assert (pipe_); zmq_assert (pipe_);
if (probe_router) {
msg_t probe_msg_;
int rc = probe_msg_.init ();
errno_assert (rc == 0);
rc = pipe_->write (&probe_msg_);
// zmq_assert (rc) is not applicable here, since it is not a bug.
pipe_->flush ();
rc = probe_msg_.close ();
errno_assert (rc == 0);
}
bool identity_ok = identify_peer (pipe_); bool identity_ok = identify_peer (pipe_);
if (identity_ok) if (identity_ok)
fq.attach (pipe_); fq.attach (pipe_);
@ -391,22 +404,6 @@ bool zmq::router_t::identify_peer (pipe_t *pipe_)
ok = outpipes.insert (outpipes_t::value_type (identity, outpipe)).second; ok = outpipes.insert (outpipes_t::value_type (identity, outpipe)).second;
zmq_assert (ok); zmq_assert (ok);
if (probe_router) {
msg_t probe_msg_;
int rc = probe_msg_.init ();
errno_assert (rc == 0);
ok = pipe_->write (&probe_msg_);
pipe_->flush ();
rc = probe_msg_.close ();
errno_assert (rc == 0);
// Ignore not probed peers
if (!ok)
return false;
}
return true; return true;
} }

4
tests/test_probe_router.cpp
View File

@ -35,9 +35,7 @@ int main (void)
assert (rc == 0); assert (rc == 0);
// Create client and connect to server, doing a probe // Create client and connect to server, doing a probe
void *client = zmq_socket (ctx, ZMQ_DEALER); void *client = zmq_socket (ctx, ZMQ_ROUTER);
// Trying this results in the first recv waiting forever
// void *client = zmq_socket (ctx, ZMQ_ROUTER);
assert (client); assert (client);
rc = zmq_setsockopt (client, ZMQ_IDENTITY, "X", 1); rc = zmq_setsockopt (client, ZMQ_IDENTITY, "X", 1);
assert (rc == 0); assert (rc == 0);