diff options
author | Martin Sustrik <sustrik@250bpm.com> | 2010-02-13 09:09:40 +0100 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2010-02-13 09:09:40 +0100 |
commit | 923eacd28a725a6b32de588fe7a54dbe252d84aa (patch) | |
tree | 98053991e177ce1938bac04b3c8cb143ac3f3445 /src/zmq_init.cpp | |
parent | 2e78e48503375a415d95ee8df80df9c065172abc (diff) |
Multi-hop REQ/REP, part VI., session 'name' renamed to 'peer_identity'
Diffstat (limited to 'src/zmq_init.cpp')
-rw-r--r-- | src/zmq_init.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/zmq_init.cpp b/src/zmq_init.cpp index 6baa88f..b853a64 100644 --- a/src/zmq_init.cpp +++ b/src/zmq_init.cpp @@ -168,7 +168,8 @@ void zmq::zmq_init_t::finalise () if (!session) { session = new (std::nothrow) session_t ( choose_io_thread (options.affinity), owner, options, - peer_identity.c_str ()); + (unsigned char) peer_identity.size (), + (unsigned char*) peer_identity.c_str ()); zmq_assert (session); send_plug (session); send_own (owner, session); @@ -182,7 +183,7 @@ void zmq::zmq_init_t::finalise () // transient session. else { session = new (std::nothrow) session_t ( - choose_io_thread (options.affinity), owner, options, NULL); + choose_io_thread (options.affinity), owner, options, 0, NULL); zmq_assert (session); send_plug (session); send_own (owner, session); @@ -191,7 +192,7 @@ void zmq::zmq_init_t::finalise () session->inc_seqnum (); } - // No need to increment seqnum as it was laready incremented above. + // No need to increment seqnum as it was already incremented above. send_attach (session, engine, (unsigned char) peer_identity.size (), (unsigned char*) peer_identity.data (), false); |