Changeset 4582 for source

Timestamp:

Jun 29, 2009, 11:10:20 AM (15 years ago)

Author:

Christoph Mayer

Message:

 

Location:

source/ariba

Files:

• communication/BaseCommunication.cpp (modified) (3 diffs)
• communication/BaseCommunication.h (modified) (1 diff)
• communication/messages/AribaBaseMsg.cpp (modified) (1 diff)
• communication/messages/AribaBaseMsg.h (modified) (1 diff)
• utility/types/Identifier.h (modified) (1 diff)

source/ariba/communication/BaseCommunication.cpp

@@ -188 +188 @@
 
         // create link identifier and link descriptor
-        if (linkid.isUnspecified()) linkid = LinkID::create();
+        if (linkid.isUnspecified()){
+                linkid = LinkID::create();
+                assert(!linkid.isUnspecified());
+        }
+
         logging_debug( "creating new local descriptor entry with local link id " << linkid.toString() );
         LinkDescriptor linkDescriptor( linkid, local, LinkID::UNSPECIFIED, remote, descriptor, false );
@@ -199 +203 @@
 
         logging_debug( "sending out base messages with request to open link to " << remote->toString() );
-        AribaBaseMsg baseMsg( remote, AribaBaseMsg::LINK_STATE_OPEN_REQUEST, linkid,
-                                                                LinkID::UNSPECIFIED );
+        AribaBaseMsg baseMsg(
+                        remote,
+                        AribaBaseMsg::LINK_STATE_OPEN_REQUEST,
+                        linkid,
+                        LinkID::UNSPECIFIED );
+
         transport->sendMessage(&baseMsg);
-
         return linkid;
 }
@@ -360 +367 @@
                 LinkID remoteLink = spovmsg->getLocalLink();
 
+                if(localLink.isUnspecified()){
+                        logging_error("local link is unspecified");
+                        return false;
+                }
+
+                if(remoteLink.isUnspecified()){
+                        logging_error("remote link is unspecified");
+                        return false;
+                }
 
                 const NetworkLocator* localLocator  = dynamic_cast<const NetworkLocator*>(localDescriptor.locator);

source/ariba/communication/BaseCommunication.h

@@ -228 +228 @@
 
                 LinkDescriptor() :
-                        localLink(),
+                        localLink(LinkID::UNSPECIFIED),
                         localLocator(NULL),
-                        remoteLink(),
+                        remoteLink(LinkID::UNSPECIFIED),
                         remoteLocator(NULL),
                         remoteEndpoint(EndpointDescriptor::UNSPECIFIED),

source/ariba/communication/messages/AribaBaseMsg.cpp

@@ -74 +74 @@
 
         switch( getType() ){
-                case LINK_STATE_DATA:           return "LINK_STATE_DATA";
+                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";
+                case LINK_STATE_UPDATE:                 return "LINK_STATE_UPDATE";
+                default:                                                "unknown";
         }
 

source/ariba/communication/messages/AribaBaseMsg.h

@@ -71 +71 @@
         } LINK_STATE;
 
-        AribaBaseMsg(   const Address* address    = NULL,
+        AribaBaseMsg(
+                        const Address* address    = NULL,
                         LINK_STATE _state         = LINK_STATE_DATA,
                         const LinkID& _localLink  = LinkID::UNSPECIFIED,

source/ariba/utility/types/Identifier.h

@@ -575 +575 @@
         X && unspec && len;
 
+        if (X.isDeserializer()){
+                assert(len == array_size*sizeof(mp_limb_t));
+        }
+
         // serialize the identifier
         for (int i=array_size-1; i>=0; i--) X && key[i];