Changeset 3690 for source/ariba/overlay/modules/onehop/OneHop.cpp

Timestamp:

May 26, 2009, 1:40:23 AM (16 years ago)

Author:

mies

Message:

Merged 20090512-mies-connectors changes r3472:r3689 into trunk.

File:

• source/ariba/overlay/modules/onehop/OneHop.cpp (modified) (8 diffs)

source/ariba/overlay/modules/onehop/OneHop.cpp

@@ -1 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35 +35 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "OneHop.h"
 #include "ariba/overlay/BaseOverlay.h"
+
+#include "ariba/overlay/modules/onehop/messages/OneHopMessage.h"
+#include "ariba/overlay/modules/onehop/messages/NodeListingRequest.h"
+#include "ariba/overlay/modules/onehop/messages/NodeListingReply.h"
 
 namespace ariba {
@@ -84 +88 @@
                 return;
         }
-
-        baseoverlay.sendMessage( msg, i->second );
-}
-
-void OneHop::createOverlay(){
-
+        OneHopMessage onehopRoute( OneHopMessage::OneHopMessageTypeRoute );
+        onehopRoute.encapsulate(msg);
+
+        baseoverlay.sendMessage( &onehopRoute, i->second );
+}
+
+void OneHop::createOverlay() {
         // don't need to bootstrap against ourselfs.
         // the create and join process is completed now.
-
         logging_info( "creating onehop overlay structure" );
         state = OneHopStateCompleted;
@@ -119 +123 @@
 void OneHop::joinOverlay(const EndpointDescriptor& bootstrapEp){
 
-        logging_info( "joining onehop overlay structure through endpoint " <<
+        logging_info( "joining onehop overlay structure through end-point " <<
                         (bootstrapEp == EndpointDescriptor::UNSPECIFIED ?
                                         "local" : bootstrapEp.toString()) );
@@ -133 +137 @@
 
                 state = OneHopStateCompleted;
-
-
         } else {
-
                 bootstrapLink = baseoverlay.establishLink( bootstrapEp,
                                         OverlayInterface::OVERLAY_SERVICE_ID );
@@ -175 +176 @@
         if( state == OneHopStateInvalid ) return;
 
-        //
         // node went down, remove from overlay mapping
-        //
-
         logging_debug( "node " << remote.toString() << " left overlay structure" );
 
@@ -223 +221 @@
         //
 
-        if( onemsg->isType( OneHopMessage::OneHopMessageTypeListingRequest) ){
+        if( onemsg->isType( OneHopMessage::OneHopMessageTypeListingRequest ) ){
 
                 NodeListingRequest* request = onemsg->decapsulate<NodeListingRequest>();
@@ -316 +314 @@
         } // if( reply != NULL )
 
+        if( onemsg->isType( OneHopMessage::OneHopMessageTypeRoute) ){
+                logging_debug( "Route message arrived at destination node -> delegate to BaseOverlay" );
+                baseoverlay.incomingRouteMessage( onemsg );
+        }
+
+
 }