Changeset 5638 for source/ariba/overlay/BaseOverlay.cpp

Timestamp:

Aug 4, 2009, 10:17:33 AM (15 years ago)

Author:

Christoph Mayer

Message:

adress detection aufgeräumt, network info für bleutooth, data stream (hopeful crash fix), logging auf maemo nur warn, ...

File:

• source/ariba/overlay/BaseOverlay.cpp (modified) (10 diffs)

source/ariba/overlay/BaseOverlay.cpp

@@ -127 +127 @@
                 // get descriptor of first hop
                 rld = getDescriptor(rlid);
-                logging_force( rld );
+                logging_info( rld );
 
                 // is first hop a relay path? yes-> try to find real link!
@@ -154 +154 @@
                 return NodeID::UNSPECIFIED;
         else {
-                logging_force( "Returning relay node " << relayNode.toString() );
+                logging_info( "Returning relay node " << relayNode.toString() );
                 return relayNode;
         }
@@ -810 +810 @@
                 // if link is a relayed link ->convert to direct link
                 if (ld->relay) {
-                        logging_force( "Converting to direct link: " << ld );
+                        logging_info( "Converting to direct link: " << ld );
                         ld->up = true;
                         ld->relay = false;
@@ -836 +836 @@
         LinkDescriptor* ld = getDescriptor(id, true);
         if ( ld == NULL ) return; // not found? ->ignore!
-        logging_force( "onLinkDown descriptor: " << ld );
+        logging_info( "onLinkDown descriptor: " << ld );
 
         // inform listeners about link down
@@ -1426 +1426 @@
                         logging_debug( "received keep-alive on link" );
                         if ( ld != NULL ) {
-                                logging_force("Keep-Alive for "<< ld->overlayId);
+                                logging_info("Keep-Alive for "<< ld->overlayId);
                                 ld->markAlive();
                         }
@@ -1445 +1445 @@
                                 break;
                         }
-                        logging_force( "Received direct link convert notification for " << rld );
+                        logging_info( "Received direct link convert notification for " << rld );
 
                         // set communcation link id and set it up
@@ -1560 +1560 @@
                         // missed more than four keep-alive messages (10 sec)? -> drop link
                         if (ld->keepAliveMissed > 4) {
-                                logging_force( "Link connection request is stale, closing: " << ld );
+                                logging_info( "Link connection request is stale, closing: " << ld );
                                 oldlinks.push_back( ld );
                                 continue;
@@ -1588 +1588 @@
                         // missed more than four keep-alive messages (4 sec)? -> drop link
                         if (ld->keepAliveMissed >= 8) {
-                                logging_force( "Link is stale, closing: " << ld );
+                                logging_info( "Link is stale, closing: " << ld );
                                 oldlinks.push_back( ld );
                                 continue;
@@ -1602 +1602 @@
 
                 if (!ld->communicationId.isUnspecified() && it != bootstrapLinks.end() ){
-                        logging_force( "Not dropping initiator link: " << ld );
+                        logging_info( "Not dropping initiator link: " << ld );
                         continue;
                 }
 */
-                logging_force( "Link timed out. Dropping " << ld );
+                logging_info( "Link timed out. Dropping " << ld );
                 dropLink( ld->overlayId );
         }
@@ -1618 +1618 @@
 void BaseOverlay::showLinkState() {
         int i=0;
-        logging_force("--- link state -------------------------------");
+        logging_info("--- link state -------------------------------");
         BOOST_FOREACH( LinkDescriptor* ld, links ) {
-                logging_force("link " << i << ": " << ld);
+                logging_info("link " << i << ": " << ld);
                 i++;
         }
-        logging_force("----------------------------------------------");
+        logging_info("----------------------------------------------");
 }