Changeset 5151 for source/ariba/SideportListener.cpp

Timestamp:

Jul 21, 2009, 1:54:55 PM (16 years ago)

Author:

Christoph Mayer

Message:

begin merge back from relay branch

File:

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

source/ariba/SideportListener.cpp

@@ -40 +40 @@
 
 #include "ariba/overlay/BaseOverlay.h"
+#include "ariba/overlay/LinkDescriptor.h"
+
+using ariba::overlay::LinkDescriptor;
 
 namespace ariba {
@@ -71 +74 @@
 }
 
-//******************************************************
-//
-// JUST EXPERIMENTAL WITH RANDOM RESULTS
-//
+bool SideportListener::isRelayedNode(const NodeID& node){
 
-// 0 = normal node    --> directly accessible
-// 1 = relaying node  --> node that is relaying for us (must also be 0)
-// 2 = relayed node   --> node that we cannot access directly
-static map<NodeID,short> relayingnodes;
-static map<NodeID,SideportListener::Protocol> protocolnodes;
+        BOOST_FOREACH( LinkDescriptor* link, overlay->links ){
+
+                if( (!link->localRelay.isUnspecified()) && link->remoteRelay == node && link->up) {
+                        return true;
+                }
+
+        }
+
+        return false;
+}
 
 bool SideportListener::isRelayingNode(const NodeID& node){
 
-        map<NodeID,short>::iterator i = relayingnodes.find(node);
-        if(i != relayingnodes.end()) return (i->second == 1);
+        BOOST_FOREACH( LinkDescriptor* link, overlay->links ){
 
-        relayingnodes.insert( std::make_pair( node, rand()%3 ) );
-}
+                if( (!link->localRelay.isUnspecified()) && link->localRelay == node && link->up) {
+                        return true;
+                }
 
-bool SideportListener::isRelayedNode(const NodeID& node){
-
-        map<NodeID,short>::iterator i = relayingnodes.find(node);
-        if(i != relayingnodes.end()) return (i->second == 2);
-
-        relayingnodes.insert( std::make_pair( node, rand()%3 ) );
-}
-
-SideportListener::Protocol generateRandomProtocol(){
-
-        if( (rand() % 3) == 0 ){
-                return SideportListener::rfcomm;
         }
 
-        int ret = SideportListener::undefined;
-
-        if( (rand() % 2) == 0 ) ret |= SideportListener::ipv4;
-        else                                    ret |= SideportListener::ipv6;
-
-        if( (rand() % 2) == 0 ) ret |= SideportListener::udp;
-        else                                    ret |= SideportListener::tcp;
-
-        return (SideportListener::Protocol)ret;
+        return false;
 }
 
 SideportListener::Protocol SideportListener::getReachabilityProtocol(const NodeID& node){
-
-        map<NodeID,Protocol>::iterator i = protocolnodes.find(node);
-        if(i != protocolnodes.end()) return i->second;
-
-        protocolnodes.insert( std::make_pair(node, generateRandomProtocol()) );
+        return (SideportListener::Protocol)(ipv4 | tcp);
 }
-
-//
-//
-//******************************************************
 
 void SideportListener::configure( overlay::BaseOverlay* _overlay ) {