Changeset 5870 for source/ariba/SideportListener.cpp

Timestamp:

Aug 11, 2009, 4:11:02 PM (16 years ago)

Author:

Christoph Mayer

Message:

merge noch nicht fertig

File:

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

source/ariba/SideportListener.cpp

@@ -85 +85 @@
 bool SideportListener::isRelayedNode(const NodeID& node){
         if( overlay == NULL ) return false;
+/*
+        bool relay = false;
 
         bool relay = false;
@@ -100 +102 @@
         }
 
+<<<<<<< .working
         return relay;
+=======
+        return relay;
+        */
+
+        return false;
+>>>>>>> .merge-rechts.r5869
 }
 
 bool SideportListener::isRelayingNode(const NodeID& node){
         if( overlay == NULL ) return false;
-
+/*
         BOOST_FOREACH( LinkDescriptor* link, overlay->links ){
                 if( link->relay && link->localRelay == node && link->up)
                         return true;
         }
-
+*/
         return false;
 }
@@ -119 +128 @@
 
         using namespace ariba::addressing;
-
+/*
         LinkDescriptor* link = overlay->getSendDescriptor(node);
         if (link==NULL) return (Protocol)ret;
@@ -142 +151 @@
                 ret = SideportListener::rfcomm;
         }
-
+*/
         return (Protocol)ret;
 }