Changeset 6133

Timestamp:

Sep 10, 2009, 2:33:32 PM (15 years ago)

Author:

Christoph Mayer

Message:

remote endpoint auflösung gefixt

Location:

source/ariba

Files:

• communication/BaseCommunication.cpp (modified) (1 diff)
• overlay/BaseOverlay.cpp (modified) (1 diff)

source/ariba/communication/BaseCommunication.cpp

@@ -428 +428 @@
                         ld.remoteLink = msg->getLocalLink();
                         ld.remoteLocator = remote->clone();
+                        ld.remoteEndpoint.getEndpoints().add(
+                                                        msg->getLocalDescriptor().getEndpoints(),
+                                                        endpoint_set::Layer1_4
+                                                );
+
+
                         localDescriptor.getEndpoints().add(
                                 msg->getRemoteDescriptor().getEndpoints(),

source/ariba/overlay/BaseOverlay.cpp

@@ -916 +916 @@
 
         // resolve end-point descriptor from the base-overlay routing table
-        return overlayInterface->resolveNode( node );
+        const EndpointDescriptor& ep = overlayInterface->resolveNode( node );
+        if(ep != EndpointDescriptor::UNSPECIFIED()) 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);
+                if(ep != EndpointDescriptor::UNSPECIFIED()) return ep;
+        }
+
+        return EndpointDescriptor::UNSPECIFIED();
 }