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

Timestamp:

Aug 6, 2009, 2:32:48 PM (16 years ago)

Author:

mies

Message:

 

File:

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

source/ariba/overlay/BaseOverlay.h

@@ -160 +160 @@
         bool isStarted();
 
+        /// Tries to establish a direct or overlay link
+        const LinkID establishLink(const EndpointDescriptor& ep,
+                const NodeID& node, const ServiceID& service,
+                const NodeID& remoteRelay = NodeID::UNSPECIFIED,
+                const LinkID& linkid = LinkID::UNSPECIFIED);
+
         /**
          * Starts a link establishment procedure to the specfied node
@@ -169 +175 @@
          */
         const LinkID establishLink(const NodeID& node, const ServiceID& service,
+                const NodeID& remoteRelay = NodeID::UNSPECIFIED,
                 const LinkID& linkid = LinkID::UNSPECIFIED);
-
-        /**
-         * Starts a link establishment procedure to the specified
-         * endpoint and to the specified service. Concurrently it tries to
-         * establish a relay link over the overlay using the nodeid
-         */
-        const LinkID establishLink(const EndpointDescriptor& ep, const NodeID& nodeid,
-                const ServiceID& service, const LinkID& linkid = LinkID::UNSPECIFIED);
 
         /**
@@ -183 +182 @@
          * endpoint and to the specified service
          */
-        const LinkID establishLink(const EndpointDescriptor& ep,
+        const LinkID establishDirectLink(const EndpointDescriptor& ep,
                 const ServiceID& service, const LinkID& linkid = LinkID::UNSPECIFIED);
 
@@ -412 +411 @@
 
         /// returns a direct link relay descriptor to the given relay node
-        LinkDescriptor* getRelayDescriptor( const NodeID& relayNode );
-
-        /// find a proper relay node that is directly connected to this node
-        const NodeID findRelayNode( const NodeID id );
+        LinkDescriptor* getRelayDescriptor( const NodeID& remoteNode );
+
+        /// returns the local relay node to a given remote node
+        NodeID getRelayNode( const NodeID& remoteNode );
+
+        /// returns the direct link the message to a neighbor is send to
+        LinkDescriptor* getSendDescriptor( const NodeID& nodeid, bool follow = true );
+
+        /// routes a message over the overlay or directly sends it when a link is open
+        seqnum_t sendOverlay( Message* message, const NodeID& nodeid,
+                const NodeID& remoteRelay = NodeID::UNSPECIFIED );
 
         /// forwards a message over relays/overlay/directly using link descriptor
         seqnum_t sendMessage( Message* message, const LinkDescriptor* ld );
-
-        LinkDescriptor* getSendDescriptor( const NodeID& nodeid, bool follow = true );
-
-        /// routes a message over the overlay or directly sends it when a link is open
-        seqnum_t sendOverlay( Message* message, const NodeID& nodeid );
 
         /// creates a link descriptor, applys relay semantics if possible