Changeset 5316 for source/ariba/overlay/modules/onehop/OneHop.h

Timestamp:

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

Author:

Christoph Mayer

Message:

merge from bootstrap branch

File:

• source/ariba/overlay/modules/onehop/OneHop.h (modified) (2 diffs)

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

@@ -90 +90 @@
 
         /// @see OverlayInterface.h
-        virtual NodeList getKnownNodes() const;
+        virtual NodeList getKnownNodes(bool deep = true) const;
 
         /// @see CommunicationListener.h or @see OverlayInterface.h
@@ -110 +110 @@
         typedef enum _OneHopState {
                 OneHopStateInvalid = 0,
-                OneHopStateJoinInitiated = 1,
-                OneHopStateJoinListingRequested = 2,
-                OneHopStateCompleted = 3,
+                OneHopStateCompleted = 1,
         } OneHopState;
 
         OneHopState state;
-        uint16_t pendingLinks;
-        LinkID bootstrapLink;
+        vector<LinkID> bootstrapLinks;
 };