Changeset 5151 for source/ariba/overlay/messages/LinkRequest.h

Timestamp:

Jul 21, 2009, 1:54:55 PM (15 years ago)

Author:

Christoph Mayer

Message:

begin merge back from relay branch

File:

• source/ariba/overlay/messages/LinkRequest.h (modified) (3 diffs)

source/ariba/overlay/messages/LinkRequest.h

@@ -27 +27 @@
         uint32_t nonce;
         const EndpointDescriptor* endpoint;
+        LinkID remoteLinkId;
+        NodeID relay;
 
 public:
-        LinkRequest();
+        LinkRequest() {
+
+        }
 
         LinkRequest( uint32_t nonce, const EndpointDescriptor* endpoint,
-                        bool reply = false );
+                        bool reply = false, const LinkID& remoteLinkId = LinkID::UNSPECIFIED,
+                        const NodeID& relay = NodeID::UNSPECIFIED ) :
+                        flags(reply&1), nonce(nonce), endpoint(endpoint), remoteLinkId(remoteLinkId), relay(relay) {
+        }
 
         virtual ~LinkRequest();
@@ -38 +45 @@
         const EndpointDescriptor* getEndpoint() const {
                 return endpoint;
+        }
+
+        const LinkID& getRemoteLinkId() const {
+                return remoteLinkId;
+        }
+
+        const NodeID& getRelay() const {
+                return relay;
         }
 
@@ -53 +68 @@
 sznBeginDefault( ariba::overlay::LinkRequest, X ) {
         if (X.isDeserializer()) endpoint = new EndpointDescriptor();
-        X && flags && nonce && reinterpret_cast<VSerializeable*>(const_cast<EndpointDescriptor*>(endpoint));
+        X && flags && nonce;
+        X && const_cast<EndpointDescriptor*>(endpoint);
+        X && &relay && &remoteLinkId;
 } sznEnd();