Changeset 6878

Timestamp:

Nov 6, 2009, 1:42:09 PM (14 years ago)

Author:

mies

Message:

 

File:

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

source/ariba/overlay/BaseOverlay.cpp

@@ -1112 +1112 @@
 
         // return own end-point descriptor
-        if( link == LinkID::UNSPECIFIED )
+        if( link.isUnspecified() )
                 return bc->getEndpointDescriptor();
 
@@ -1132 +1132 @@
         // no joined and request remote descriptor? -> fail!
         if( overlayInterface == NULL ) {
-                logging_error( "overlay interface not set, cannot resolve endpoint" );
+                logging_error( "Overlay interface not set, cannot resolve end-point." );
                 return EndpointDescriptor::UNSPECIFIED();
         }
 
-        // resolve end-point descriptor from the base-overlay routing table
-        const EndpointDescriptor& ep = overlayInterface->resolveNode( node );
-        if(ep.toString() != "") return ep;
+//      // resolve end-point descriptor from the base-overlay routing table
+//      const EndpointDescriptor& ep = overlayInterface->resolveNode( node );
+//      if(ep.toString() != "") return ep;
 
         // see if we can find the node in our own table
         BOOST_FOREACH(const LinkDescriptor* ld, links){
                 if(ld->remoteNode != node) continue;
-                const EndpointDescriptor& ep = bc->getEndpointDescriptor(ld->communicationId);
+                const EndpointDescriptor& ep =
+                                bc->getEndpointDescriptor(ld->communicationId);
                 if(ep.toString() == "") continue;
                 if(ep != EndpointDescriptor::UNSPECIFIED()) return ep;
         }
+
+        logging_warn( "No EndpointDescriptor found for node " << node );
+        logging_warn( debugInformation() );
 
         return EndpointDescriptor::UNSPECIFIED();
@@ -2264 +2268 @@
 
         // dump overlay information
+        s << "Long debug info ... [see below]" << endl << endl;
         s << "--- overlay information ----------------------" << endl;
         s << overlayInterface->debugInformation() << endl;
-        s << "----------------------------------------------" << endl;
 
         // dump link state
@@ -2274 +2278 @@
                 i++;
         }
-        s << endl;
+        s << endl << endl;
 
         return s.str();