Commit 3ad8c611 authored by Pieter Hintjens's avatar Pieter Hintjens

Whitespace fixes

parent 49a2902c
...@@ -36,7 +36,7 @@ zmq::router_t::router_t (class ctx_t *parent_, uint32_t tid_, int sid_) : ...@@ -36,7 +36,7 @@ zmq::router_t::router_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
// raw_sock functionality in ROUTER is deprecated // raw_sock functionality in ROUTER is deprecated
raw_sock (false), raw_sock (false),
probe_router (false), probe_router (false),
handover(false) handover (false)
{ {
options.type = ZMQ_ROUTER; options.type = ZMQ_ROUTER;
options.recv_identity = true; options.recv_identity = true;
...@@ -402,14 +402,11 @@ bool zmq::router_t::identify_peer (pipe_t *pipe_) ...@@ -402,14 +402,11 @@ bool zmq::router_t::identify_peer (pipe_t *pipe_)
outpipes_t::iterator it = outpipes.find (identity); outpipes_t::iterator it = outpipes.find (identity);
msg.close (); msg.close ();
if (it != outpipes.end ()) if (it != outpipes.end ()) {
{ if (!handover)
if (!handover) { // Ignore peers with duplicate ID
// Ignore peers with duplicate ID.
return false; return false;
} else {
else
{
// We will allow the new connection to take over this // We will allow the new connection to take over this
// identity. Temporarily assign a new identity to the // identity. Temporarily assign a new identity to the
// existing pipe so we can terminate it asynchronously. // existing pipe so we can terminate it asynchronously.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment