3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-20 02:17:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Problem: libzmq does not advertise ZMTP 3.1

Browse Source 
Solution: bump minor version number in the engine as all 3.1 features
are now implemented
This commit is contained in:
Luca Boccassi 2018-05-30 23:53:29 +01:00
parent 253e9dd27b
commit 38b6888c3e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zmtp_engine.cpp
View File

@ -205,7 +205,7 @@ void zmq::zmtp_engine_t::receive_greeting_versioned ()
|| _greeting_recv[revision_pos] == ZMTP_2_0) || _greeting_recv[revision_pos] == ZMTP_2_0)
_outpos[_outsize++] = _options.type; _outpos[_outsize++] = _options.type;
else { else {
_outpos[_outsize++] = 0; // Minor version number _outpos[_outsize++] = 1; // Minor version number
memset (_outpos + _outsize, 0, 20); memset (_outpos + _outsize, 0, 20);
zmq_assert (_options.mechanism == ZMQ_NULL zmq_assert (_options.mechanism == ZMQ_NULL

8
tests/test_stream.cpp
View File

@ -40,7 +40,7 @@ typedef uint8_t byte;
typedef struct typedef struct
{ {
byte signature[10]; // 0xFF 8*0x00 0x7F byte signature[10]; // 0xFF 8*0x00 0x7F
byte version[2]; // 0x03 0x00 for ZMTP/3.0 byte version[2]; // 0x03 0x01 for ZMTP/3.1
byte mechanism[20]; // "NULL" byte mechanism[20]; // "NULL"
byte as_server; byte as_server;
byte filler[31]; byte filler[31];
@ -52,7 +52,7 @@ typedef struct
// 8-byte size is set to 1 for backwards compatibility // 8-byte size is set to 1 for backwards compatibility
static zmtp_greeting_t greeting = { static zmtp_greeting_t greeting = {
{0xFF, 0, 0, 0, 0, 0, 0, 0, 1, 0x7F}, {3, 0}, {'N', 'U', 'L', 'L'}, 0, {0}}; {0xFF, 0, 0, 0, 0, 0, 0, 0, 1, 0x7F}, {3, 1}, {'N', 'U', 'L', 'L'}, 0, {0}};
static void test_stream_to_dealer () static void test_stream_to_dealer ()
{ {
@ -135,8 +135,8 @@ static void test_stream_to_dealer ()
} }
// First two bytes are major and minor version numbers. // First two bytes are major and minor version numbers.
TEST_ASSERT_EQUAL_INT (3, buffer[0]); // ZMTP/3.0 TEST_ASSERT_EQUAL_INT (3, buffer[0]); // ZMTP/3.1
TEST_ASSERT_EQUAL_INT (0, buffer[1]); TEST_ASSERT_EQUAL_INT (1, buffer[1]);
// Mechanism is "NULL" // Mechanism is "NULL"
TEST_ASSERT_EQUAL_INT8_ARRAY (buffer + 2, TEST_ASSERT_EQUAL_INT8_ARRAY (buffer + 2,