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

Bumped ZMTP revision to 2

Browse Source 
* Starting draft ZMTP/2.1 protocol (revision 2)
* Basis for adding security to the wire protocol
* Maintains backward compatibility
This commit is contained in:
Pieter Hintjens
2013-03-12 15:38:48 +01:00
parent 785ef41f67
commit d826c53b9b
4 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/stream_engine.cpp
View File

@@ -363,7 +363,6 @@ bool zmq::stream_engine_t::handshake ()
error ();
return false;
}
if (n == 0)
return false;
@@ -390,7 +389,7 @@ bool zmq::stream_engine_t::handshake ()
if (outpos + outsize != greeting_output_buffer + greeting_size) {
if (outsize == 0)
set_pollout (handle);
outpos [outsize++] = 1; // Protocol revision
outpos [outsize++] = ZMTP_2_1; // Protocol revision
outpos [outsize++] = options.type; // Socket type
}
}
@@ -432,25 +431,26 @@ bool zmq::stream_engine_t::handshake ()
decoder->set_msg_sink (this);
}
else
if (greeting [revision_pos] == 0) {
// ZMTP/1.0 framing (revision 0)
encoder = new (std::nothrow) v1_encoder_t (out_batch_size);
if (greeting [revision_pos] == ZMTP_1_0) {
encoder = new (std::nothrow) v1_encoder_t (
out_batch_size);
alloc_assert (encoder);
encoder->set_msg_source (session);
decoder = new (std::nothrow) v1_decoder_t (in_batch_size, options.maxmsgsize);
decoder = new (std::nothrow) v1_decoder_t (
in_batch_size, options.maxmsgsize);
alloc_assert (decoder);
decoder->set_msg_sink (session);
}
else
if (greeting [revision_pos] == 1
|| greeting [revision_pos] == 2) {
// ZMTP/2.0 framing (revision 1)
encoder = new (std::nothrow) v2_encoder_t (out_batch_size, session);
if (greeting [revision_pos] == ZMTP_2_0
|| greeting [revision_pos] == ZMTP_2_1) {
encoder = new (std::nothrow) v2_encoder_t (
out_batch_size, session);
alloc_assert (encoder);
decoder = new (std::nothrow)
v2_decoder_t (in_batch_size, options.maxmsgsize, session);
decoder = new (std::nothrow) v2_decoder_t (
in_batch_size, options.maxmsgsize, session);
alloc_assert (decoder);
}