Merge branch 'master' of github.com:zeromq/libzmq

1 files changed, 8 insertions, 5 deletions

diff --git a/src/pipe.hpp b/src/pipe.hpp
index 437d84d..75a2021 100644
--- a/src/pipe.hpp
+++ b/src/pipe.hpp
@@ -1,5 +1,7 @@
 /*
-    Copyright (c) 2007-2011 iMatix Corporation
+    Copyright (c) 2009-2011 250bpm s.r.o.
+    Copyright (c) 2007-2009 iMatix Corporation
+    Copyright (c) 2011 VMware, Inc.
     Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
@@ -27,6 +29,7 @@
 #include "object.hpp"
 #include "stdint.hpp"
 #include "array.hpp"
+#include "blob.hpp"
 
 namespace zmq
 {
@@ -70,8 +73,8 @@ namespace zmq
         void set_event_sink (i_pipe_events *sink_);
 
         //  Pipe endpoint can store an opaque ID to be used by its clients.
-        void set_pipe_id (uint32_t id_);
-        uint32_t get_pipe_id ();
+        void set_identity (const blob_t &identity_);
+        blob_t get_identity ();
 
         //  Returns true if there is at least one message to read in the pipe.
         bool check_read ();
@@ -182,8 +185,8 @@ namespace zmq
         //  asks us to.
         bool delay;
 
-        //  Opaque ID. To be used by the clients, not the pipe itself.
-        uint32_t pipe_id;
+        //  Identity of the writer. Used uniquely by the reader side.
+        blob_t identity;
 
         //  Returns true if the message is delimiter; false otherwise.
         static bool is_delimiter (msg_t &msg_);