Changeset 5284 for source/ariba/communication/messages

Timestamp:

Jul 24, 2009, 3:23:11 PM (15 years ago)

Author:

mies

Message:

+ added new transport modules and adapted ariba to them
+ exchange endpoint descriptors an link establishment
+ clean up of base communication
+ link establishment with in the presence of multiple endpoints
+ local discovery for ipv6, ipv4 and bluetooth mac addresses

Location:

source/ariba/communication/messages

Files:

• AribaBaseMsg.cpp (modified) (1 diff)
• AribaBaseMsg.h (modified) (3 diffs)

source/ariba/communication/messages/AribaBaseMsg.cpp

@@ -44 +44 @@
 vsznDefault(AribaBaseMsg);
 
-AribaBaseMsg::AribaBaseMsg(
-        const Address* address,
-        LINK_STATE _state,
-        const LinkID& _localLink,
-        const LinkID& _remoteLink )
-                : state( (uint8_t)_state ),
-                  localLink( _localLink ),
-                  remoteLink( _remoteLink ){
-
-        Message::setDestinationAddress( address );
+AribaBaseMsg::AribaBaseMsg( type_ _type,
+        const LinkID& localLink, const LinkID& remoteLink ) :
+        type((uint8_t)_type),
+        localLink(localLink),remoteLink(remoteLink) {
 }
 
-AribaBaseMsg::~AribaBaseMsg(){
+AribaBaseMsg::~AribaBaseMsg() {
 }
 
-const AribaBaseMsg::LINK_STATE AribaBaseMsg::getType(){
-        return (LINK_STATE)state;
-}
-
-const LinkID& AribaBaseMsg::getLocalLink(){
-        return localLink;
-}
-
-const LinkID& AribaBaseMsg::getRemoteLink(){
-        return remoteLink;
-}
-
-const string AribaBaseMsg::getTypeString(){
-
-        switch( getType() ){
-                case LINK_STATE_DATA:                   return "LINK_STATE_DATA";
-                case LINK_STATE_OPEN_REQUEST:   return "LINK_STATE_OPEN_REQUEST";
-                case LINK_STATE_OPEN_REPLY:     return "LINK_STATE_OPEN_REPLY";
-                case LINK_STATE_CLOSE_REQUEST:  return "LINK_STATE_CLOSE_REQUEST";
-                case LINK_STATE_UPDATE:                 return "LINK_STATE_UPDATE";
-                default:                                                "unknown";
+const string AribaBaseMsg::getTypeString() const {
+        switch (getType()) {
+                case typeData:
+                        return "typeData";
+                case typeLinkRequest:
+                        return "typeLinkRequest";
+                case typeLinkReply:
+                        return "typeLinkReply";
+                case typeLinkClose:
+                        return "typeLinkClose";
+                case typeLinkUpdate:
+                        return "typeLinkUpdate";
+                default:
+                        "unknown";
         }
-
         return "unknown";
 }

source/ariba/communication/messages/AribaBaseMsg.h

@@ -48 +48 @@
 #include "ariba/utility/types/ServiceID.h"
 
+#include "../EndpointDescriptor.h"
+
 using std::string;
 using ariba::utility::Address;
@@ -62 +64 @@
         VSERIALIZEABLE;
 public:
+        enum type_ {
+                typeData = 0,
+                typeLinkRequest = 1,
+                typeLinkReply = 2,
+                typeLinkClose = 3,
+                typeLinkUpdate = 4
+        };
 
-        typedef enum _LINK_STATE {
-                LINK_STATE_DATA          = 0,
-                LINK_STATE_OPEN_REQUEST  = 1,
-                LINK_STATE_OPEN_REPLY    = 2,
-                LINK_STATE_CLOSE_REQUEST = 3, // there is no close reply. send request and local link is closed
-                LINK_STATE_UPDATE        = 4,
-        } LINK_STATE;
-
-        AribaBaseMsg(
-                        const Address* address    = NULL,
-                        LINK_STATE _state         = LINK_STATE_DATA,
-                        const LinkID& _localLink  = LinkID::UNSPECIFIED,
-                        const LinkID& _remoteLink = LinkID::UNSPECIFIED );
+        AribaBaseMsg( type_ type = typeData,
+                        const LinkID& localLink = LinkID::UNSPECIFIED,
+                        const LinkID& remoteLink = LinkID::UNSPECIFIED );
 
         virtual ~AribaBaseMsg();
 
-        const LINK_STATE getType();
-        const string getTypeString();
-        const LinkID& getLocalLink();
-        const LinkID& getRemoteLink();
+        const string getTypeString() const;
+
+        const type_ getType() const {
+                return (type_)type;
+        }
+
+        const LinkID& getLocalLink() const {
+                return localLink;
+        }
+
+        const LinkID& getRemoteLink() const {
+                return remoteLink;
+        }
+
+        EndpointDescriptor& getLocalDescriptor() {
+                return localDescriptor;
+        }
+
+        EndpointDescriptor& getRemoteDescriptor() {
+                return remoteDescriptor;
+        }
 
 private:
-        uint8_t state;          // the link message type
+        uint8_t type;           // the link message type
+
+        // remote and local link ids
         LinkID localLink;       // the local link id
         LinkID remoteLink;      // the remote link id
 
+        // remote and local endpoint descriptors
+        EndpointDescriptor localDescriptor;
+        EndpointDescriptor remoteDescriptor;
 };
 
@@ -94 +115 @@
 
 sznBeginDefault( ariba::communication::AribaBaseMsg, X ) {
-        X && state && &localLink && &remoteLink && Payload();
+        X && type && &localLink && &remoteLink;
+        if (type == typeLinkReply || type == typeLinkRequest)
+                X && localDescriptor && remoteDescriptor;
+        X && Payload();
 } sznEnd();