Changeset 5540

Timestamp:

Jul 31, 2009, 4:39:27 PM (15 years ago)

Author:

mies

Message:

 

File:

• source/ariba/SideportListener.cpp (modified) (3 diffs)

source/ariba/SideportListener.cpp

@@ -87 +87 @@
 
         BOOST_FOREACH( LinkDescriptor* link, overlay->links ){
-                if( (!link->localRelay.isUnspecified()) && link->remoteRelay == node && link->up)
+                if( link->relay && link->remoteNode == node && link->up)
                         return true;
         }
@@ -98 +98 @@
 
         BOOST_FOREACH( LinkDescriptor* link, overlay->links ){
-                if( (!link->localRelay.isUnspecified()) && link->localRelay == node && link->up)
+                if( link->relay && link->localRelay == node && link->up)
                         return true;
         }
@@ -111 +111 @@
         using namespace ariba::addressing;
 
-        BOOST_FOREACH( LinkDescriptor* link, overlay->links ){
-                if(link->remoteNode == node){
-                        if(overlay->bc == NULL) continue;
+        LinkDescriptor* link = overlay->getSendDescriptor(node);
+        if (link==NULL) return (Protocol)ret;
 
-                        BaseCommunication::LinkDescriptor& bclink =
-                                overlay->bc->queryLocalLink(link->communicationId);
+        BaseCommunication::LinkDescriptor& bclink =
+                overlay->bc->queryLocalLink(link->communicationId);
 
-                        if(bclink.isUnspecified()) continue;
-                        if(bclink.localLocator == NULL) continue;
+        if(bclink.isUnspecified()) return (Protocol)ret;
+        if(bclink.localLocator == NULL) return (Protocol)ret;
 
-                        const address_v* locator = bclink.remoteLocator;
+        const address_v* locator = bclink.remoteLocator;
 
-                        if( locator->instanceof<tcpip_endpoint>() ){
+        if( locator->instanceof<tcpip_endpoint>() ){
 
-                                tcpip_endpoint tcpip = *locator;
-                                ret |= SideportListener::tcp;
+                tcpip_endpoint tcpip = *locator;
+                ret |= SideportListener::tcp;
 
-                                if( tcpip.address().is_v4() )
-                                        ret |= SideportListener::ipv4;
+                if( tcpip.address().is_v4() )
+                        ret |= SideportListener::ipv4;
 
-                                if( tcpip.address().is_v6() )
-                                        ret |= SideportListener::ipv6;
+                if( tcpip.address().is_v6() )
+                        ret |= SideportListener::ipv6;
 
-                        }else if( locator->instanceof<rfcomm_endpoint>() ){
-                                ret |= SideportListener::rfcomm;
-                        }
-                }
+        }else if( locator->instanceof<rfcomm_endpoint>() ){
+                ret |= SideportListener::rfcomm;
         }