Changeset 5358 for source/ariba/SideportListener.cpp

Timestamp:

Jul 26, 2009, 5:17:30 PM (16 years ago)

Author:

Christoph Mayer

Message:

sideport und sdp bootstrap

File:

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

source/ariba/SideportListener.cpp

@@ -41 +41 @@
 #include "ariba/overlay/BaseOverlay.h"
 #include "ariba/overlay/LinkDescriptor.h"
+#include "ariba/utility/addressing/endpoint_set.hpp"
 
 using ariba::overlay::LinkDescriptor;
@@ -82 +83 @@
 
 bool SideportListener::isRelayedNode(const NodeID& node){
+        if( overlay == NULL ) return false;
 
         BOOST_FOREACH( LinkDescriptor* link, overlay->links ){
-
-                if( (!link->localRelay.isUnspecified()) && link->remoteRelay == node && link->up) {
+                if( (!link->localRelay.isUnspecified()) && link->remoteRelay == node && link->up)
                         return true;
-                }
-
         }
 
@@ -95 +94 @@
 
 bool SideportListener::isRelayingNode(const NodeID& node){
+        if( overlay == NULL ) return false;
 
         BOOST_FOREACH( LinkDescriptor* link, overlay->links ){
-
-                if( (!link->localRelay.isUnspecified()) && link->localRelay == node && link->up) {
+                if( (!link->localRelay.isUnspecified()) && link->localRelay == node && link->up)
                         return true;
-                }
-
         }
 
@@ -108 +105 @@
 
 SideportListener::Protocol SideportListener::getReachabilityProtocol(const NodeID& node){
-        return (SideportListener::Protocol)(ipv4 | tcp);
+        int ret = SideportListener::undefined;
+        if( overlay == NULL ) return (Protocol)ret;
+
+        using namespace ariba::addressing;
+
+        BOOST_FOREACH( LinkDescriptor* link, overlay->links ){
+                if(link->remoteNode == node){
+                        if(overlay->bc == NULL) continue;
+
+                        BaseCommunication::LinkDescriptor& bclink =
+                                overlay->bc->queryLocalLink(link->communicationId);
+
+                        if(bclink.isUnspecified()) continue;
+                        if(bclink.localLocator == NULL) continue;
+
+                        const address_v* locator = bclink.remoteLocator;
+
+                        if( locator->instanceof<tcpip_endpoint>() ){
+
+                                tcpip_endpoint tcpip = *locator;
+
+                                ret |= SideportListener::tcp;
+
+                                if( tcpip.address().is_v4() )
+                                        ret |= SideportListener::ipv4;
+
+                                if( tcpip.address().is_v6() )
+                                        ret |= SideportListener::ipv6;
+
+                        }else if( locator->instanceof<rfcomm_endpoint>() ){
+                                ret |= SideportListener::rfcomm;
+                        }
+                }
+        }
+
+        return (Protocol)ret;
+        //return (SideportListener::Protocol)(ipv4 | tcp);
 }