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

Timestamp:

Jul 25, 2012, 11:41:36 AM (12 years ago)

Author:

Michael Tänzer

Message:

Merge the ASIO branch back into trunk

File:

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

source/ariba/overlay/BaseOverlay.h

@@ -74 +74 @@
 using std::vector;
 using std::list;
-using std::cout;
 using std::map;
 using std::make_pair;
@@ -187 +186 @@
                 const ServiceID& service = OverlayInterface::OVERLAY_SERVICE_ID);
 
+    /**
+     *  send a message to the closest directly known node to an address
+     *  
+     *  @return NodeID of the (closest) destination node; 
+     */
+        NodeID sendMessageCloserToNodeID(const Message* message, const NodeID& address,
+                const ServiceID& service = OverlayInterface::OVERLAY_SERVICE_ID);
+        
         /**
          * Send out a message to all nodes that are known in the overlay structure.
@@ -287 +294 @@
          */
         void leaveSpoVNet();
-
-        /// put a value to the DHT with a ttl given in seconds
-        void dhtPut( const Data& key, const Data& value, int ttl = 0, bool replace = false, bool no_local_refresh = false);
-
-        /// removes a key value pair from the DHT
-        void dhtRemove( const Data& key, const Data& value );
-
-        /// removes all data stored at the given key
-        void dhtRemove( const Data& key );
-
-        /// requests data stored using key
-        void dhtGet( const Data& key, const ServiceID& service );
 
 protected:
@@ -411 +406 @@
         bool handleJoinRequest( OverlayMsg* msg, const LinkID& bcLink );
         bool handleJoinReply( OverlayMsg* msg, const LinkID& bcLink );
-
-        // handle DHT messages
-        bool handleDHTMessage( OverlayMsg* msg );
 
         // handle link messages
@@ -506 +498 @@
                 bool ignore_down = false );
 
-        // distributed hashtable handling ------------------------------------------
-
-        DHT* dht;
-        DHT* localDHT;
-        int republishCounter;
-
-        void initDHT();
-        void destroyDHT();
-        void stabilizeDHT();
-        void dhtSend( OverlayMsg* msg, const NodeID& dest );
-
         // misc --------------------------------------------------------------------