Changeset 6832 for source

Timestamp:

Nov 5, 2009, 9:03:35 AM (14 years ago)

Author:

Christoph Mayer

Message:

-kleine fixes

Location:

source/ariba

Files:

• overlay/BaseOverlay.cpp (modified) (3 diffs)
• overlay/OverlayBootstrap.cpp (modified) (2 diffs)
• overlay/modules/chord/Chord.cpp (modified) (1 diff)
• utility/logging/Logging.h (modified) (1 diff)

source/ariba/overlay/BaseOverlay.cpp

@@ -509 +509 @@
         if (destination == nodeId) {
                 logging_warn("Sent message to myself. Handling message.")
-                                Message msg;
+                Message msg;
                 msg.encapsulate(message);
                 handleMessage( &msg, NULL );
@@ -819 +819 @@
 
                 // bootstrap against ourselfs
-                logging_debug("joining spovnet locally");
+                logging_info("joining spovnet locally");
 
                 overlayInterface->joinOverlay();
@@ -836 +836 @@
 
                 // bootstrap against another node
-                logging_debug("joining spovnet remotely against " << bootstrapEp.toString());
+                logging_info("joining spovnet remotely against " << bootstrapEp.toString());
 
                 const LinkID& lnk = bc->establishLink( bootstrapEp );

source/ariba/overlay/OverlayBootstrap.cpp

@@ -76 +76 @@
         //manager.registerModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
         //manager.registerModule( BootstrapManager::BootstrapTypeBluetoothSdp );
-        manager.registerModule( BootstrapManager::BootstrapTypeMulticastDns );
+        //manager.registerModule( BootstrapManager::BootstrapTypeMulticastDns );
 
         watchtimer.startWatchdog();
@@ -91 +91 @@
         //manager.unregisterModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
         //manager.unregisterModule( BootstrapManager::BootstrapTypeBluetoothSdp );
-        manager.unregisterModule( BootstrapManager::BootstrapTypeMulticastDns );
+        //manager.unregisterModule( BootstrapManager::BootstrapTypeMulticastDns );
 
         watchtimer.stopWatchdog();

source/ariba/overlay/modules/chord/Chord.cpp

@@ -251 +251 @@
                                 << " with link " << lnk.toString());
                 // replace with new link
-                if (!item->info.isUnspecified() || item->info!=lnk)
+                if (item->info!=lnk && item->info.isUnspecified()==false)
                         baseoverlay.dropLink(item->info);
                 item->info = lnk;

source/ariba/utility/logging/Logging.h

@@ -49 +49 @@
 
   #define colorDefault { std::cout << "\033[0m";  } /*reset*/
-  #define colorDebug   { std::cout << "\033[33m"; } /*cyan*/
-  #define colorInfo    { std::cout << "\033[32m"; } /*green*/
-  #define colorWarn    { std::cout << "\033[34m"; } /*blue*/
-  #define colorError   { std::cout << "\033[31m"; } /*red*/
+  #define colorDebug   { std::cout << "\033[0;33m"; } /*cyan*/
+  #define colorInfo    { std::cout << "\033[0;32m"; } /*green*/
+  #define colorWarn    { std::cout << "\033[0;34m"; } /*blue*/
+  #define colorError   { std::cout << "\033[0;31m"; } /*red*/
 
 #else