Changeset 5316 for source/ariba/overlay/BaseOverlay.h

Timestamp:

Jul 24, 2009, 8:53:41 PM (16 years ago)

Author:

Christoph Mayer

Message:

merge from bootstrap branch

File:

• source/ariba/overlay/BaseOverlay.h (modified) (6 diffs)

source/ariba/overlay/BaseOverlay.h

@@ -112 +112 @@
 using ariba::utility::OvlVis;
 
-#define ovl OvlVis::instance()
-#define ovlId OvlVis::NETWORK_ID_BASE_OVERLAY
+//#define ovl OvlVis::instance()
+//#define ovlId OvlVis::NETWORK_ID_BASE_OVERLAY
 
 namespace ariba {
@@ -156 +156 @@
 
         /**
+         * Is the BaseOverlay instance started up yet
+         */
+        bool isStarted();
+
+        /**
          * Starts a link establishment procedure to the specfied node
          * for the service with id service
@@ -211 +216 @@
          * @return A list of overlay neighbors.
          */
-        vector<NodeID> getOverlayNeighbors() const;
+        vector<NodeID> getOverlayNeighbors(bool deep = true) const;
 
         /**
@@ -264 +269 @@
          * @param boot A bootstrap node
          */
-        void joinSpoVNet(const SpoVNetID& id, const EndpointDescriptor& boot);
+        void joinSpoVNet(const SpoVNetID& id, const EndpointDescriptor& boot = EndpointDescriptor::UNSPECIFIED);
 
         /**
@@ -365 +370 @@
         typedef enum _BaseOverlayState {
                 BaseOverlayStateInvalid = 0,
-                BaseOverlayStateInitiator = 1,
-                BaseOverlayStateJoinInitiated = 2,
-                BaseOverlayStateCompleted = 3,
+                BaseOverlayStateCompleted = 1,
         } BaseOverlayState;
 
-        BaseOverlayState state; ///< Current Base-Overlay state
-        BaseCommunication* bc;  ///< reference to the base communication
-        NodeID nodeId;          ///< the node id of this node
-        SpoVNetID spovnetId;    ///< the spovnet id of the currently joined overlay
-        LinkID initiatorLink;   ///< the link id of the link to the initiator node
-        NodeID spovnetInitiator;///< The initiator node
+        BaseOverlayState state;          ///< Current Base-Overlay state
+        BaseCommunication* bc;           ///< reference to the base communication
+        NodeID nodeId;                   ///< the node id of this node
+        SpoVNetID spovnetId;             ///< the spovnet id of the currently joined overlay
+        vector<LinkID> bootstrapLinks;   ///< the link id of the link to the initiator node
+        NodeID spovnetInitiator;         ///< The initiator node
 
         /// the service id communication listeners
@@ -440 +443 @@
          */
         OverlayBootstrap overlayBootstrap;
+
+        /// is the base overlay started yet
+        bool started;
 };