Changeset 4751 for source/ariba

Timestamp:

Jul 6, 2009, 8:14:42 AM (15 years ago)

Author:

Christoph Mayer

Message:

sideport protocol information

Location:

source/ariba

Files:

• SideportListener.cpp (modified) (2 diffs)
• SideportListener.h (modified) (3 diffs)

source/ariba/SideportListener.cpp

@@ -80 +80 @@
 // 2 = relayed node   --> node that we cannot access directly
 static map<NodeID,short> relayingnodes;
+static map<NodeID,SideportListener::Protocol> protocolnodes;
 
 bool SideportListener::isRelayingNode(const NodeID& node){
@@ -95 +96 @@
 
         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;
+}
+
+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()) );
 }
 

source/ariba/SideportListener.h

@@ -125 +125 @@
          * is set to unspecified.
          *
-         * @param The remote node to query all links or unspecified
+         * @param node The remote node to query all links or unspecified
          *                      for all local starting links
          * @return A vector of link ids.
@@ -136 +136 @@
          * Is this node acting as a relay for us
          *
-         * @param The node in question
+         * @param node The node in question
          * @return true, if this node is relaying for us
          */
@@ -144 +144 @@
          * Is this node only reachable for us through a relay?
          *
-         * @param The node in question
+         * @param node The node in question
          * @return true, if we reach this node only over a relay
          */
         bool isRelayedNode(const NodeID& node);
+
+
+        /**
+         * Protocols for some layer, can be combined
+         */
+        enum Protocol {
+                undefined = 0x0,
+                rfcomm = 0x1,
+                ipv4 = 0x2,
+                ipv6 = 0x4,
+                udp = 0x8,
+                tcp = 0x16,
+        };
+
+        /**
+         * Through which protocol is a node reachable.
+         *
+         * @param node The node for which to return protocol reachability
+         * @return Combination of protocols
+         */
+        Protocol getReachabilityProtocol(const NodeID& node);
 
 protected: