STREAM socket support for limited metadata

WIP - STREAM socket support for limited metadata

STREAM socket support for limited metadata

Makefile.am

@@ -484,9 +484,6 @@ test_bind_src_address_LDADD = libzmq.la
 test_metadata_SOURCES = tests/test_metadata.cpp
 test_metadata_LDADD = libzmq.la
 
-test_id2fd_SOURCES = tests/test_id2fd.cpp
-test_id2fd_LDADD = libzmq.la
-
 test_capabilities_SOURCES = tests/test_capabilities.cpp
 test_capabilities_LDADD = libzmq.la
 

src/stream.cpp

@@ -208,9 +208,16 @@ int zmq::stream_t::xrecv (msg_t *msg_)
     //  We have received a frame with TCP data.
     //  Rather than sendig this frame, we keep it in prefetched
     //  buffer and send a frame with peer's ID.
+
     blob_t identity = pipe->get_identity ();
     rc = msg_->init_size (identity.size ());
     errno_assert (rc == 0);
+
+    // forward metadata (if any)
+    metadata_t *metadata = prefetched_msg.metadata();
+    if (metadata)
+        msg_->set_metadata(metadata);
+
     memcpy (msg_->data (), identity.data (), identity.size ());
     msg_->set_flags (msg_t::more);
 

src/stream_engine.cpp

@@ -36,7 +36,6 @@
 #include <string.h>
 #include <new>
 #include <sstream>
-#include <iostream>
 
 #include "stream_engine.hpp"
 #include "io_thread.hpp"
@@ -61,6 +60,8 @@
 #include "likely.hpp"
 #include "wire.hpp"
 
+#include <iostream>
+
 zmq::stream_engine_t::stream_engine_t (fd_t fd_, const options_t &options_,
                                        const std::string &endpoint_) :
     s (fd_),
@@ -192,14 +193,24 @@ void zmq::stream_engine_t::plug (io_thread_t *io_thread_,
         handshaking = false;
 
         next_msg = &stream_engine_t::pull_msg_from_session;
-        process_msg = &stream_engine_t::push_msg_to_session;
+        process_msg = &stream_engine_t::push_raw_msg_to_session;
+
+        if (!peer_address.empty()) {
+            //  Compile metadata.
+            typedef metadata_t::dict_t properties_t;
+            properties_t properties;
+            properties.insert(std::make_pair("Peer-Address", peer_address));
+            zmq_assert (metadata == NULL);
+            metadata = new (std::nothrow) metadata_t (properties);
+        }
 
         //  For raw sockets, send an initial 0-length message to the
         // application so that it knows a peer has connected.
         msg_t connector;
         connector.init();
+        if (metadata)
+            connector.set_metadata(metadata);
         push_msg_to_session (&connector);
-        connector.close();
         session->flush ();
     }
     else {
@@ -792,7 +803,6 @@ void zmq::stream_engine_t::mechanism_ready ()
     //  Compile metadata.
     typedef metadata_t::dict_t properties_t;
     properties_t properties;
-    properties_t::const_iterator it;
 
     //  If we have a peer_address, add it to metadata
     if (!peer_address.empty()) {
@@ -822,6 +832,12 @@ int zmq::stream_engine_t::push_msg_to_session (msg_t *msg_)
     return session->push_msg (msg_);
 }
 
+int zmq::stream_engine_t::push_raw_msg_to_session (msg_t *msg_) {
+    if (metadata)
+        msg_->set_metadata(metadata);
+    return push_msg_to_session(msg_);
+}
+
 int zmq::stream_engine_t::write_credential (msg_t *msg_)
 {
     zmq_assert (mechanism != NULL);

src/stream_engine.hpp

@@ -99,6 +99,8 @@ namespace zmq
         int pull_msg_from_session (msg_t *msg_);
         int push_msg_to_session (msg_t *msg);
 
+        int push_raw_msg_to_session (msg_t *msg);
+
         int write_credential (msg_t *msg_);
         int pull_and_encode (msg_t *msg_);
         int decode_and_push (msg_t *msg_);

tests/test_stream.cpp

@@ -74,6 +74,10 @@ test_stream_to_dealer (void)
     rc = zmq_msg_init (&identity);
     assert (rc == 0);
     rc = zmq_msg_recv (&identity, stream, 0);
+
+    // Verify the existence of Peer-Address metadata
+    assert (streq (zmq_msg_gets (&identity, "Peer-Address"), "127.0.0.1"));
+
     assert (rc > 0);
     assert (zmq_msg_more (&identity));
 
@@ -88,6 +92,9 @@ test_stream_to_dealer (void)
     assert (rc > 0);
     assert (zmq_msg_more (&identity));
 
+    // Verify the existence of Peer-Address metadata
+    assert (streq (zmq_msg_gets (&identity, "Peer-Address"), "127.0.0.1"));
+
     //  Second frame is greeting signature
     rc = zmq_recv (stream, buffer, 255, 0);
     assert (rc == 10);