Changeset 5698

Timestamp:

Aug 5, 2009, 11:05:33 AM (15 years ago)

Author:

mies

Message:

 

Location:

source/ariba

Files:

• overlay/BaseOverlay.cpp (modified) (23 diffs)
• overlay/modules/chord/Chord.cpp (modified) (1 diff)
• utility/transport/tcpip/tcpip.cpp (modified) (1 diff)

source/ariba/overlay/BaseOverlay.cpp

@@ -944 +944 @@
         logging_debug( "Handling message: " << message->toString());
 
+        bool ret = false;
+
         // decapsulate overlay message
         OverlayMsg* overlayMsg =
@@ -973 +975 @@
                                         "Received join request for spovnet we don't handle " <<
                                         joinReq->getSpoVNetID().toString() );
-                                return false;
+                                ret = false;
+                                break;
                         }
 
@@ -994 +997 @@
                         retmsg.encapsulate(&replyMsg);
                         bc->sendMessage( bcLink, &retmsg );
-                        return true;
+                        ret = true;
+                        break;
                 }
 
@@ -1011 +1015 @@
                                                 replyMsg->getSpoVNetID().toString() <<
                                                 " != " << spovnetId.toString() );
-                                return false;
+                                ret = false;
+                                delete replyMsg;
+                                break;
                         }
 
@@ -1033 +1039 @@
                                         i->onJoinFailed( spovnetId );
 
-                                return true;
+                                ret = true;
+                                delete replyMsg;
+                                break;
                         }
 
@@ -1072 +1080 @@
                                         i->onJoinFailed( spovnetId );
 
-                                        return true;
+                                        delete replyMsg;
+                                        ret = true;
+                                        break;
                                 }
 
@@ -1088 +1098 @@
                                         i->onJoinCompleted( spovnetId );
 
+                                delete replyMsg;
+
                         } else {
 
@@ -1094 +1106 @@
                                 overlayInterface->joinOverlay( replyMsg->getBootstrapEndpoint() );
 
+                                delete replyMsg;
+
                         } // if( overlayInterface == NULL )
 
-                        return true;
+                        ret = true;
+                        break;
                 }
 
@@ -1111 +1126 @@
                         CommunicationListener* listener =
                                 communicationListeners.get( service );
-                        if( listener == NULL ) return true;
+                        if( listener == NULL ) {
+                                ret = true;
+                                break;
+                        }
 
                         // delegate data message
@@ -1117 +1135 @@
                                 overlayMsg->getSourceNode(), ld->overlayId );
 
-                        return true;
+                        ret = true;
+                        break;
                 }
 
@@ -1134 +1153 @@
                                 logging_warn( "received overlay update message for link " <<
                                                 ld->overlayId.toString() << " for which we have no mapping" );
-                                return false;
+                                ret = false;
+                                break;
                         }
 
@@ -1154 +1174 @@
                         if( !communicationListeners.contains( service ) ) {
                                 logging_warn( "Link up: event listener has not been registered" );
-                                return false;
+                                ret = false;
+                                break;
                         }
 
@@ -1161 +1182 @@
                         if( listener == NULL || listener == &CommunicationListener::DEFAULT ) {
                                 logging_warn("Link up: event listener is default or null!" );
-                                return true;
+                                ret = true;
+                                break;
                         }
 
@@ -1180 +1202 @@
                                 // drop the link
                                 dropLink( ld->overlayId );
-                                return true;
+                                ret = true;
+                                break;
                         }
 
@@ -1206 +1229 @@
                         sideport->onLinkUp( ld->overlayId, nodeId, sourcenode, this->spovnetId );
 
-                        return true;
+                        ret = true;
+                        break;
                 }
 
@@ -1227 +1251 @@
                                 if ( i == pendingLinks.end() ) {
                                         logging_error( "Nonce not found in link request" );
-                                        return true;
+                                        ret = true;
+                                        break;
                                 }
 
@@ -1241 +1266 @@
                                 // get descriptor
                                 LinkDescriptor* ldn = getDescriptor(i->second);
-                                if (ldn==NULL) return true;
+                                if (ldn==NULL) {
+                                        delete linkReq;
+                                        ret = true;
+                                        break;
+                                }
 
                                 // check if link request reply has a relay node ...
@@ -1330 +1359 @@
                         }
                         delete linkReq;
-                        return true;
+                        ret = true;
+                        break;
                 }
 
@@ -1360 +1390 @@
                                                 logging_debug("Relay message reached destination. Handling the message.");
                                                 handleMessage( relayMsg, relayMsg->getDestLink(), LinkID::UNSPECIFIED, remoteNode );
-                                                return true;
+                                                ret = true;
+                                                break;
                                         }
 
@@ -1377 +1408 @@
                                                 sendOverlay( &_overMsg, relayMsg->getRelayNode() );
                                         }
-                                        return true;
+                                        ret = true;
+                                        break;
                                 }
 
@@ -1394 +1426 @@
                                                 logging_debug("Relay message reached destination. Handling the message.");
                                                 handleMessage( relayMsg, relayMsg->getDestLink(), LinkID::UNSPECIFIED, remoteNode );
-                                                return true;
+                                                ret = true;
+                                                break;
                                         }
 
@@ -1406 +1439 @@
                                                 /// this must be handled by using relay link!
                                                 sendOverlay(&_overMsg, relayMsg->getDestNode());
-                                                return true;
+                                                ret = true;
+                                                break;
                                         }
 
                                         // error: I'm not a relay or destination!
                                         logging_error("This node is neither relay nor destination. Dropping Message!");
-                                        return true;
+                                        ret = true;
+                                        break;
                                 }
                                 default: {
                                         logging_error("RelayMessage Unknown!");
-                                        return true;
+                                        ret = true;
+                                        break;
                                 }
                         }
@@ -1476 +1512 @@
                                         "what to do with this message of type " <<
                                         overlayMsg->getType() );
-                        return false;
+                        ret = false;
+                        break;
                 }
         } /* switch */
 
-        return false;
+        delete overlayMsg;
+        return ret;
 }
 

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

@@ -314 +314 @@
                         logging_debug("Route chord message to "
                                 << item->id.toString() << " (destination=" << m->getDestination() << ")");
-                        send(m, item->info);
+                        ChordMessage cmsg(*m);
+                        send(&cmsg, item->info);
                 }
                 break;

source/ariba/utility/transport/tcpip/tcpip.cpp

@@ -190 +190 @@
                         tcpip_endpoint remote = convert(remote_peer);
                         tcpip_endpoint local  = convert(local_peer);
-
-// DO NOT SET REMOTE PORT!
-//                      remote.port() = remote_port;
-//                      cout << "received: remote="
-//                               << remote.to_string()
-//               << " local="
-//                               << local.to_string() << " size=" << message_size << endl;
                         tp.listener->receive_message(
                                         &tp, local, remote, datamsg->get_buffer()+6, message_size );
 
-                        delete datamsg;
-                }
+                }
+                delete tpmsg;
         }
         // clean queue & stop