Changeset 5896 for source/ariba

Timestamp:

Aug 12, 2009, 4:19:55 PM (15 years ago)

Author:

mies

Message:

 

File:

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

source/ariba/overlay/BaseOverlay.cpp

@@ -299 +299 @@
 
 /// 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 ) {
+seqnum_t BaseOverlay::send( OverlayMsg* message, LinkDescriptor* ldr, bool ignore_down ) {
         // check if null
-        if (ld == NULL) {
+        if (ldr == NULL) {
                 logging_error("Can not send message to " << message->getDestinationAddress());
                 return -1;
@@ -307 +307 @@
 
         // check if up
-        if (!ld->up && !ignore_down) {
-                logging_error("Can not send message. Link not up:" << ld );
+        if (!ldr->up && !ignore_down) {
+                logging_error("Can not send message. Link not up:" << ldr );
                 return -1;
         }
+        LinkDescriptor* ld = NULL;
 
         // handle relayed link
-        if (ld->relayed) {
+        if (ldr->relayed) {
                 logging_debug("send(): Resolving direct link for relayed link to "
-                        << ld->remoteNode);
-                ld = getRelayLinkTo( ld->remoteNode );
+                        << ldr->remoteNode);
+                ld = getRelayLinkTo( ldr->remoteNode );
                 if (ld==NULL) {
-                        LinkID lnk = overlayInterface->getNextLinkId(ld->remoteNode);
+                        LinkID lnk = overlayInterface->getNextLinkId(ldr->remoteNode);
                         if (!lnk.isUnspecified())
                                 ld = getDescriptor(lnk);