Changeset 5893 for source/ariba

Timestamp:

Aug 12, 2009, 4:08:05 PM (15 years ago)

Author:

mies

Message:

 

File:

• source/ariba/overlay/BaseOverlay.cpp (modified) (2 diffs)

source/ariba/overlay/BaseOverlay.cpp

@@ -300 +300 @@
 /// send a message using a link descriptor, delivers it to the base overlay class
 seqnum_t BaseOverlay::send( OverlayMsg* message, LinkDescriptor* ld, bool ignore_down ) {
-        assert(ld!=NULL);
+        // check if null
+        if (ld == NULL) {
+                logging_error("Can not send message to " << message->getDestinationAddress());
+                return -1;
+        }
 
         // check if up
@@ -313 +317 @@
                         << ld->remoteNode);
                 ld = getRelayLinkTo( ld->remoteNode );
+                if (ld==NULL) {
+                        LinkID lnk = overlayInterface->getNextLinkId(ld->remoteNode);
+                        if (!lnk.isUnspecified())
+                                ld = getDescriptor(lnk);
+                        if (ld!=NULL && ld->relayed)
+                                ld = NULL;
+                }
                 if (ld==NULL) {
                         logging_error("Direct link not found.");