Changeset 5151 for source/ariba/overlay/messages

Timestamp:

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

Author:

Christoph Mayer

Message:

begin merge back from relay branch

Location:

source/ariba/overlay/messages

Files:

• JoinReply.h (modified) (1 diff)
• LinkRequest.cpp (modified) (1 diff)
• LinkRequest.h (modified) (3 diffs)
• OverlayMsg.cpp (modified) (1 diff)
• OverlayMsg.h (modified) (1 diff)
• RelayMessage.cpp (added)
• RelayMessage.h (added)

source/ariba/overlay/messages/JoinReply.h

@@ -85 +85 @@
 
 sznBeginDefault( ariba::overlay::JoinReply, X ) {
-        X && &spovnetid && param && bootstrapEp && joinAllowed && cI(0,7);
+        uint8_t ja = joinAllowed;
+        X && &spovnetid && param && &bootstrapEp && ja;
+        if (X.isDeserializer()) joinAllowed = ja;
 } sznEnd();
 

source/ariba/overlay/messages/LinkRequest.cpp

@@ -7 +7 @@
 vsznDefault(LinkRequest);
 
-LinkRequest::LinkRequest() {
-
-}
-
-LinkRequest::LinkRequest( uint32_t nonce, const EndpointDescriptor* endpoint, bool reply ) :
-        flags(reply&1), nonce(nonce), endpoint(endpoint) {
-}
-
 LinkRequest::~LinkRequest() {
 }

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();
 

source/ariba/overlay/messages/OverlayMsg.cpp

@@ -44 +44 @@
 vsznDefault(OverlayMsg);
 
-OverlayMsg::OverlayMsg(OverlayMessageType _type, const ServiceID _service, const NodeID _sourceNode)
-        : type( (uint8_t)_type), service( _service ), sourceNode( _sourceNode ) {
-}
-
-OverlayMsg::OverlayMsg(OverlayMessageType _type, const NodeID _sourceNode)
-        : type( (uint8_t)_type), service( ServiceID::UNSPECIFIED ), sourceNode( _sourceNode ){
-}
-
 OverlayMsg::~OverlayMsg(){
 }
 
-OverlayMsg::OverlayMessageType OverlayMsg::getType(){
-        return (OverlayMessageType)type;
-}
-
-const ServiceID& OverlayMsg::getService(){
-        return service;
-}
-
-bool OverlayMsg::isType(OverlayMessageType _type){
-        return (OverlayMessageType)type == _type;
-}
-
-const NodeID& OverlayMsg::getSourceNode(){
-        return sourceNode;
-}
-
 }} // ariba::overlay

source/ariba/overlay/messages/OverlayMsg.h

@@ -55 +55 @@
 namespace overlay {
 
-using_serialization;
+using_serialization
+;
 
-class OverlayMsg : public Message {
-        VSERIALIZEABLE;
+class OverlayMsg: public Message {
+VSERIALIZEABLE
+        ;
 public:
 
-        typedef enum _OverlayMessageType {
-                OverlayMessageTypeInvalid     = 0, // invalid type (no encapsulated messages)
-                OverlayMessageTypeData        = 1, // message contains data for higher layers
-                OverlayMessageTypeJoinRequest = 2, // spovnet join request
-                OverlayMessageTypeJoinReply   = 3, // spovnet join reply
-                OverlayMessageTypeUpdate      = 4, // update message for link association
-                OverlayMessageTypeBye         = 5, // spovnet leave (no encapsulated messages)
-                OverlayMessageTypeLinkRequest = 6, // link request (sent over the overlay)
-        } OverlayMessageType;
+        /// (payload-) message types
+        enum type_ {
+                typeInvalid = 0, ///< invalid type (no encapsulated messages)
+                typeData = 1, ///< message contains data for higher layers
+                typeJoinRequest = 2, ///< join request
+                typeJoinReply = 3, ///< join reply
+                typeUpdate = 4, ///< update message for link association
+                typeBye = 5, ///< leave (no encapsulated messages)
+                typeLinkRequest = 6, ///< link request (sent over the overlay)
+                typeRelay = 7, ///< relay message
+                typeKeepAlive = 8, ///< a keep-alive message
+                typeDirectLink = 9,
+        ///< a direct connection has been established
+        };
 
-        OverlayMsg(
-                OverlayMessageType _type       = OverlayMessageTypeInvalid,
-                const ServiceID    _service    = ServiceID::UNSPECIFIED,
-                const NodeID       _sourceNode = NodeID::UNSPECIFIED
-        );
+        /// default constructor
+        OverlayMsg(type_ type = typeInvalid, const ServiceID _service =
+                        ServiceID::UNSPECIFIED, const NodeID _sourceNode =
+                        NodeID::UNSPECIFIED) :
+                type((uint8_t) type), service(_service), sourceNode(_sourceNode),
+                                relayLink(LinkID::UNSPECIFIED), autoLink(false) {
+        }
 
-        OverlayMsg(
-                OverlayMessageType _type,
-                const NodeID       _sourceNode
-        );
+        OverlayMsg(const OverlayMsg& rhs) :
+                type(rhs.type), service(rhs.service), sourceNode(rhs.sourceNode),
+                                relayLink(rhs.relayLink), autoLink(rhs.autoLink) {
+        }
 
-        virtual ~OverlayMsg();
+        /// type and source node constructor
+        OverlayMsg(type_ type, const NodeID _sourceNode) :
+                type((uint8_t) type), service(ServiceID::UNSPECIFIED), sourceNode(
+                                _sourceNode), relayLink(LinkID::UNSPECIFIED), autoLink(false) {
+        }
 
-        bool isType(OverlayMessageType _type);
-        OverlayMessageType getType();
-        const ServiceID& getService();
-        const NodeID& getSourceNode();
+        /// destructor
+        ~OverlayMsg();
 
+        type_ getType() const {
+                return (type_) type;
+        }
+
+        const ServiceID& getService() const {
+                return service;
+        }
+
+        const NodeID& getSourceNode() const {
+                return sourceNode;
+        }
+
+        const LinkID& getRelayLink() const {
+                return relayLink;
+        }
+
+        void setRelayLink(const LinkID& relayLink) {
+                this->relayLink = relayLink;
+        }
+
+        const bool isAutoLink() const {
+                return autoLink;
+        }
+
+        void setAutoLink(bool autoLink) {
+                this->autoLink = autoLink;
+        }
 private:
         uint8_t type;
         ServiceID service;
         NodeID sourceNode;
+        LinkID relayLink;
+        uint8_t autoLink;
 };
 
-}} // ariba::overlay
+}
+} // ariba::overlay
 
-sznBeginDefault( ariba::overlay::OverlayMsg, X ) {
-        X && type && &service && &sourceNode && Payload();
-} sznEnd();
+sznBeginDefault( ariba::overlay::OverlayMsg, X ){
+X && type && &service && &sourceNode;
+if (type == typeDirectLink) X && &relayLink;
+if (type == typeUpdate) X && autoLink;
+X && Payload();
+}sznEnd();
 
 #endif // OVERLAY_MSG_H__