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

Added test_metadata

Browse Source 
- also prioritize ZAP metadata over ZMTP metadata in case application
  uses same names.
This commit is contained in:
Pieter Hintjens
2014-05-02 22:19:30 +02:00
parent ded00177b3
commit 84ed81c014
11 changed files with 175 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/stream_engine.cpp
View File

@@ -33,6 +33,7 @@
#include <string.h>
#include <new>
#include <sstream>
#include <iostream>
#include "stream_engine.hpp"
#include "io_thread.hpp"
@@ -741,14 +742,6 @@ void zmq::stream_engine_t::mechanism_ready ()
properties_t properties;
properties_t::const_iterator it;
// Add ZAP properties.
const properties_t& zap_properties = mechanism->get_zap_properties ();
it = zap_properties.begin ();
while (it != zap_properties.end ()) {
properties.insert (properties_t::value_type (it->first, it->second));
it++;
}
// Add ZMTP properties.
const properties_t& zmtp_properties = mechanism->get_zmtp_properties ();
it = zmtp_properties.begin ();
@@ -757,6 +750,14 @@ void zmq::stream_engine_t::mechanism_ready ()
it++;
}
// Add ZAP properties.
const properties_t& zap_properties = mechanism->get_zap_properties ();
it = zap_properties.begin ();
while (it != zap_properties.end ()) {
properties.insert (properties_t::value_type (it->first, it->second));
it++;
}
zmq_assert (metadata == NULL);
if (!properties.empty ())
metadata = new (std::nothrow) metadata_t (properties);