Changeset 3718 for source/ariba/overlay

Timestamp:

May 27, 2009, 8:13:08 AM (16 years ago)

Author:

Christoph Mayer

Message:

-dynamische wahl des overlays durch den initiator, nodes kriegen bei join mitgeteilt welche overlay struktur zu verwenden ist

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (1 diff)
• modules/OverlayFactory.cpp (modified) (1 diff)
• modules/OverlayInterface.cpp (modified) (2 diffs)
• modules/OverlayInterface.h (modified) (4 diffs)
• modules/chord/Chord.cpp (modified) (1 diff)
• modules/chord/Chord.h (modified) (1 diff)
• modules/onehop/OneHop.cpp (modified) (1 diff)
• modules/onehop/OneHop.h (modified) (1 diff)

source/ariba/overlay/BaseOverlay.cpp

@@ -726 +726 @@
                 joiningNodes.push_back( overlayMsg->getSourceNode() );
 
+                //
                 // send back our spovnetid, default overlay parameters, join allow
                 // result, and ourself as the end-point to bootstrap the overlay against
+                //
+
+                assert( overlayInterface != NULL );
+                OverlayParameterSet parameters = overlayInterface->getParameters();
+
                 OverlayMsg retmsg( OverlayMsg::OverlayMessageTypeJoinReply, nodeId );
-                JoinReply replyMsg( spovnetId, OverlayParameterSet::DEFAULT,
+                JoinReply replyMsg( spovnetId, parameters,
                                         allow, getEndpointDescriptor() );
 

source/ariba/overlay/modules/OverlayFactory.cpp

@@ -53 +53 @@
 
         switch( param.getOverlayStructure() ){
-                case OverlayParameterSet::OverlayStructureOneHop:
-                        return new OneHop( baseoverlay, nodeid, routeReceiver );
 
                 case OverlayParameterSet::OverlayStructureChord:
-                        return new Chord( baseoverlay, nodeid, routeReceiver );
+                        return new Chord( baseoverlay, nodeid, routeReceiver, param );
 
-                case OverlayParameterSet::OverlayStructureKademlia:
-                        return NULL;
+                case OverlayParameterSet::OverlayStructureOneHop:
+                        return new OneHop( baseoverlay, nodeid, routeReceiver, param );
 
                 default:

source/ariba/overlay/modules/OverlayInterface.cpp

@@ -46 +46 @@
 ServiceID OverlayInterface::OVERLAY_SERVICE_ID(0);
 
-OverlayInterface::OverlayInterface(BaseOverlay& _baseoverlay,
-                const NodeID& _nodeid, OverlayStructureEvents* _eventsReceiver) :
-        baseoverlay(_baseoverlay), nodeid(_nodeid), eventsReceiver(_eventsReceiver) {
+OverlayInterface::OverlayInterface(BaseOverlay& _baseoverlay, const NodeID& _nodeid,
+                        OverlayStructureEvents* _eventsReceiver, OverlayParameterSet _parameters) :
+        baseoverlay(_baseoverlay), nodeid(_nodeid),
+        eventsReceiver(_eventsReceiver), parameters(_parameters) {
 
         _baseoverlay.bind(this, OVERLAY_SERVICE_ID);
@@ -82 +83 @@
 }
 
+const OverlayParameterSet& OverlayInterface::getParameters() const {
+        return parameters;
+}
+
 }} // namespace ariba, overlay

source/ariba/overlay/modules/OverlayInterface.h

@@ -45 +45 @@
 #include "ariba/utility/types/NodeID.h"
 #include "ariba/utility/types/ServiceID.h"
+#include "ariba/utility/types/OverlayParameterSet.h"
 
 using ariba::CommunicationListener;
@@ -51 +52 @@
 using ariba::utility::NodeID;
 using ariba::utility::ServiceID;
+using ariba::utility::OverlayParameterSet;
 
 namespace ariba {
@@ -75 +77 @@
                         BaseOverlay& _baseoverlay,
                         const NodeID& _nodeid,
-                        OverlayStructureEvents* _eventsReceiver );
+                        OverlayStructureEvents* _eventsReceiver,
+                        OverlayParameterSet _parameters
+                        );
 
         /**
@@ -154 +158 @@
                         const LinkID& lnk = LinkID::UNSPECIFIED);
 
+
+        const OverlayParameterSet& getParameters() const;
+
 protected:
 
         /// Reference to an active base overlay
         BaseOverlay& baseoverlay;
+
+        /// The parameters of the overlay structure
+        OverlayParameterSet parameters;
 
         /// The node identifier to use with this overlay

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

@@ -53 +53 @@
 
 Chord::Chord(BaseOverlay& _baseoverlay, const NodeID& _nodeid,
-                OverlayStructureEvents* _eventsReceiver) :
-        OverlayInterface(_baseoverlay, _nodeid, _eventsReceiver) {
+                OverlayStructureEvents* _eventsReceiver, const OverlayParameterSet& param) :
+        OverlayInterface(_baseoverlay, _nodeid, _eventsReceiver, param) {
 
         // create routing table

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

@@ -89 +89 @@
 public:
         Chord(BaseOverlay& _baseoverlay, const NodeID& _nodeid,
-                        OverlayStructureEvents* _eventsReceiver);
+                        OverlayStructureEvents* _eventsReceiver, const OverlayParameterSet& param);
         virtual ~Chord();
 

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

@@ -49 +49 @@
 use_logging_cpp( OneHop );
 
-OneHop::OneHop(BaseOverlay& _baseoverlay, const NodeID& _nodeid, OverlayStructureEvents* _eventsReceiver)
-        :       OverlayInterface( _baseoverlay, _nodeid, _eventsReceiver ),
+OneHop::OneHop(BaseOverlay& _baseoverlay, const NodeID& _nodeid,
+                OverlayStructureEvents* _eventsReceiver, const OverlayParameterSet& param)
+        :       OverlayInterface( _baseoverlay, _nodeid, _eventsReceiver, param ),
                 state           ( OneHopStateInvalid ),
                 bootstrapLink   ( LinkID::UNSPECIFIED ),

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

@@ -55 +55 @@
 public:
         OneHop(BaseOverlay& _overlay, const NodeID& _nodeid,
-                        OverlayStructureEvents* _eventsReceiver);
+                        OverlayStructureEvents* _eventsReceiver, const OverlayParameterSet& param);
 
         virtual ~OneHop();