Changeset 5412 for source/ariba/overlay

Timestamp:

Jul 29, 2009, 11:45:17 AM (15 years ago)

Author:

Christoph Mayer

Message:

-logging fix, -sdp fix, -endpoint operator fix, -endpoint aufräumen

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (4 diffs)
• OverlayBootstrap.cpp (modified) (2 diffs)

source/ariba/overlay/BaseOverlay.cpp

@@ -60 +60 @@
 namespace overlay {
 
-#define logging_force(x) std::cout << x << std::endl;
-#define logging_force1(x) std::cout << x << std::endl;
-
 LinkDescriptor* BaseOverlay::getDescriptor( const LinkID& link, bool communication ) {
         BOOST_FOREACH( LinkDescriptor* lp, links )
@@ -127 +124 @@
                 // get descriptor of first hop
                 rld = getDescriptor(rlid);
-                logging_force1( rld );
+                logging_force( rld );
 
                 // is first hop a relay path? yes-> try to find real link!
@@ -136 +133 @@
                 else relayNode = rld->remoteNode;
         }
-        logging_force1( "Potential relay node " << relayNode.toString() );
+        logging_force( "Potential relay node " << relayNode.toString() );
         // do not return myself or use the node as relay node
         if (relayNode == nodeId)
                 return NodeID::UNSPECIFIED;
         else {
-                logging_force1( "Returning relay node " << relayNode.toString() );
+                logging_force( "Returning relay node " << relayNode.toString() );
                 return relayNode;
         }
@@ -310 +307 @@
                         " with nodeid " << nodeId.toString());
 
-        if(bootstrapEp == EndpointDescriptor::UNSPECIFIED && state == BaseOverlayStateInvalid){
+        if(bootstrapEp.isUnspecified() && state == BaseOverlayStateInvalid){
 
                 // bootstrap against ourselfs

source/ariba/overlay/OverlayBootstrap.cpp

@@ -65 +65 @@
         manager.registerCallback( this );
         manager.registerModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
-        //manager.registerModule( BootstrapManager::BootstrapTypeBluetoothSdp );
+        manager.registerModule( BootstrapManager::BootstrapTypeBluetoothSdp );
 }
 
@@ -77 +77 @@
         manager.unregisterCallback( this );
         manager.unregisterModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
-        //manager.unregisterModule( BootstrapManager::BootstrapTypeBluetoothSdp );
+        manager.unregisterModule( BootstrapManager::BootstrapTypeBluetoothSdp );
 }