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

Include ZMTP properties in message metadata

Browse Source 
Metadata are built in stream_engine now.
This makes it easy to extend metadata with user-defined properties.
This commit is contained in:
Martin Hurton
2014-05-02 12:33:26 +02:00
parent 55c06924c8
commit 8d82cc2a0b
6 changed files with 60 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/stream_engine.cpp
View File

@@ -64,6 +64,7 @@ zmq::stream_engine_t::stream_engine_t (fd_t fd_, const options_t &options_,
outpos (NULL),
outsize (0),
encoder (NULL),
metadata (NULL),
handshaking (true),
greeting_size (v2_greeting_size),
greeting_bytes_read (0),
@@ -144,6 +145,12 @@ zmq::stream_engine_t::~stream_engine_t ()
int rc = tx_msg.close ();
errno_assert (rc == 0);
// Drop reference to metadata and destroy it if we are
// the only user.
if (metadata != NULL)
if (metadata->drop_ref ())
delete metadata;
delete encoder;
delete decoder;
delete mechanism;
@@ -728,6 +735,31 @@ void zmq::stream_engine_t::mechanism_ready ()
read_msg = &stream_engine_t::pull_and_encode;
write_msg = &stream_engine_t::write_credential;
// Compile metadata.
typedef metadata_t::dict_t properties_t;
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 ();
while (it != zmtp_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);
}
int zmq::stream_engine_t::pull_msg_from_session (msg_t *msg_)
@@ -780,7 +812,6 @@ int zmq::stream_engine_t::decode_and_push (msg_t *msg_)
if (mechanism->decode (msg_) == -1)
return -1;
metadata_t *metadata = mechanism->get_metadata ();
if (metadata)
msg_->set_properties (metadata);
if (session->push_msg (msg_) == -1) {