Changeset 6849 for source/ariba

Timestamp:

Nov 5, 2009, 4:53:47 PM (15 years ago)

Author:

Christoph Mayer

Message:

-listener sanity checks

Location:

source/ariba

Files:

• overlay/BaseOverlay.cpp (modified) (5 diffs)
• utility/visual/ServerVis.cpp (modified) (1 diff)

source/ariba/overlay/BaseOverlay.cpp

@@ -912 +912 @@
         }
 
-        visual.configure("134.155.92.246", 50005);
+        //visual.configure("134.155.92.246", 50005);
         //visual.configure("141.3.161.8", 50005);
         visual.visCreate(visualIdBase, nodeId, "", "");
@@ -1318 +1318 @@
         ld->communicationUp = false;
         if (!ld->service.isUnspecified()) {
-                getListener(ld->service)->onLinkDown( ld->overlayId, ld->remoteNode );
+                CommunicationListener* lst = getListener(ld->service);
+                if(lst != NULL) lst->onLinkDown( ld->overlayId, ld->remoteNode );
                 sideport->onLinkDown( id, this->nodeId, ld->remoteNode, this->spovnetId );
         }
@@ -1545 +1546 @@
 
         // delegate data message
-        getListener(service)->onMessage(
-                        overlayMsg,
-                        overlayMsg->getSourceNode(),
-                        overlayMsg->getDestinationLink()
-        );
+        CommunicationListener* lst = getListener(service);
+        if(lst != NULL){
+                lst->onMessage(
+                                overlayMsg,
+                                overlayMsg->getSourceNode(),
+                                overlayMsg->getDestinationLink()
+                );
+        }
 
         return true;
@@ -1829 +1833 @@
                 return ret;
         }
-
 
         // handle base overlay message
@@ -2092 +2095 @@
 
                 // delegate data message
-                getListener(service)->onKeyValue(dhtMsg->getKey(), dhtMsg->getValues() );
+                CommunicationListener* lst = getListener(service);
+                if(lst != NULL) lst->onKeyValue(dhtMsg->getKey(), dhtMsg->getValues() );
                 return true;
         }

source/ariba/utility/visual/ServerVis.cpp

@@ -110 +110 @@
 void ServerVis::sendSocket(const string& msg){
         if( socket.is_open() && socketOpened ){
-                logging_error("SENDING VISUAL COMMAND: " << msg);
+                logging_debug("sending visual command: " << msg);
                 socket.send( boost::asio::buffer(msg) );
         }