Changeset 7744 for source/ariba

Timestamp:

Mar 11, 2010, 9:28:24 AM (14 years ago)

Author:

Christoph Mayer

Message:

-branch merge back

Location:

source/ariba

Files:

• Makefile.am (modified) (2 diffs)
• communication/BaseCommunication.cpp (modified) (6 diffs)
• communication/EndpointDescriptor.h (modified) (4 diffs)
• communication/networkinfo/AddressDiscovery.cpp (modified) (1 diff)
• overlay/BaseOverlay.cpp (modified) (5 diffs)
• overlay/modules/chord/Chord.cpp (modified) (1 diff)
• utility/addressing (modified) (1 prop)
• utility/bootstrap/modules/bluetoothsdp (modified) (1 prop)
• utility/bootstrap/modules/periodicbroadcast (modified) (1 prop)
• utility/transport (modified) (1 prop)
• utility/types/PeerID.cpp (added)
• utility/types/PeerID.h (added)

source/ariba/Makefile.am

@@ -415 +415 @@
   utility/types/Locator.cpp \
   utility/types/NodeID.cpp \
+  utility/types/PeerID.cpp \
   utility/types/OverlayParameterSet.cpp \
   utility/types/QoSParameterSet.cpp \
@@ -429 +430 @@
   utility/types/Locator.h \
   utility/types/NodeID.h \
+  utility/types/PeerID.h \
   utility/types/OverlayParameterSet.h \
   utility/types/QoSParameterSet.h \

source/ariba/communication/BaseCommunication.cpp

@@ -38 +38 @@
 
 #include "BaseCommunication.h"
+
 #include "networkinfo/AddressDiscovery.h"
+#include "ariba/utility/types/PeerID.h"
 
 #ifdef UNDERLAY_OMNET
@@ -52 +54 @@
 namespace ariba {
 namespace communication {
+
+using ariba::utility::PeerID;
 
 use_logging_cpp(BaseCommunication);
@@ -100 +104 @@
         currentSeqnum = 0;
 
+        // set local peer id
+        localDescriptor.getPeerId() = PeerID::random();
+        logging_info( "Using PeerID: " << localDescriptor.getPeerId() );
+
         // creating transports
         logging_info( "Creating transports ..." );
@@ -114 +122 @@
 
         logging_info( "Searching for local locators ..." );
-        if(localDescriptor.getEndpoints().to_string().length() == 0)
-                AddressDiscovery::discover_endpoints( localDescriptor.getEndpoints() );
+        /**
+         * DONT DO THAT: if(localDescriptor.getEndpoints().to_string().length() == 0)
+         * since addresses are used to initialize transport addresses
+         */
+        AddressDiscovery::discover_endpoints( localDescriptor.getEndpoints() );
         logging_info( "Done. Local endpoints = " << localDescriptor.toString() );
 
@@ -177 +188 @@
         AribaBaseMsg baseMsg( AribaBaseMsg::typeLinkRequest, linkid );
         baseMsg.getLocalDescriptor() = localDescriptor;
+        baseMsg.getRemoteDescriptor().getPeerId() = descriptor.getPeerId();
 
         // serialize and send message
@@ -338 +350 @@
                         logging_debug( "Received link open request" );
 
+                        /// not the correct peer id-> skip request
+                        if (!msg->getRemoteDescriptor().getPeerId().isUnspecified()
+                                && msg->getRemoteDescriptor().getPeerId() != localDescriptor.getPeerId()) {
+                                logging_info("Received link request for "
+                                        << msg->getRemoteDescriptor().getPeerId().toString()
+                                        << "but i'm "
+                                        << localDescriptor.getPeerId()
+                                        << ": Ignoring!");
+                                break;
+                        }
+
                         /// only answer the first request
                         if (!queryRemoteLink(msg->getLocalLink()).isUnspecified()) {

source/ariba/communication/EndpointDescriptor.h

@@ -43 +43 @@
 #include <set>
 #include "ariba/utility/serialization.h"
+#include "ariba/utility/types/PeerID.h"
 #include "ariba/utility/addressing/endpoint_set.hpp"
 
@@ -51 +52 @@
 using namespace std;
 using namespace ariba::addressing;
+using ariba::utility::PeerID;
 
 class EndpointDescriptor: public VSerializeable { VSERIALIZEABLE
@@ -120 +122 @@
         }
 
+        /// returns a reference to the peer id
+        PeerID& getPeerId() {
+                return peerId;
+        }
+
+
+        /// returns a reference to the constant peer id
+        const PeerID& getPeerId() const {
+                return peerId;
+        }
 private:
         endpoint_set endpoints;
+        PeerID peerId;
 };
 
@@ -127 +140 @@
 
 sznBeginDefault( ariba::communication::EndpointDescriptor, X ){
-        // serialize endpoints
+
+        // serialize peer id
+        X && &peerId;
+
+        // serialize end-points
         uint16_t len = endpoints.to_bytes_size();
         X && len;

source/ariba/communication/networkinfo/AddressDiscovery.cpp

@@ -107 +107 @@
                 if (addr==NULL) continue;
 
+                // ignore tun devices
+                string device = string(i->ifa_name);
+                if(device.find_first_of("tun") == 0) continue;
+
                 if (addr->sa_family == AF_INET) {
                         // look for ipv4

source/ariba/overlay/BaseOverlay.cpp

@@ -135 +135 @@
                 for (vector<ValueEntry>::iterator i = values.begin();
                                 i != values.end(); i++ )
-                        if (i->is_ttl_elapsed()) i = values.erase(i);
+                        if (i->is_ttl_elapsed()) i = values.erase(i)-1;
         }
 };
@@ -214 +214 @@
                         // found? yes-> delete entry
                         if ( equals(entry.key, key) ) {
-                                i = entries.erase(i);
+                                i = entries.erase(i)-1;
                                 return true;
                         }
@@ -233 +233 @@
                                         // value found? yes-> delete
                                         if (equals(j->get_value(), value)) {
-                                                j = entry.values.erase(j);
+                                                j = entry.values.erase(j)-1;
                                                 return true;
                                         }
@@ -252 +252 @@
                                 // value found? yes-> delete
                                 if (j->is_ttl_elapsed())
-                                        j = entry.values.erase(j);
+                                        j = entry.values.erase(j)-1;
                         }
 
-                        if (entry.values.size()==0) i = entries.erase(i);
+                        if (entry.values.size()==0) i = entries.erase(i)-1;
                 }
         }
@@ -1911 +1911 @@
                         "in the overlay from service " + service.toString() );
 
+        if(message == NULL) return;
+        message->setReleasePayload(false);
+
         OverlayInterface::NodeList nodes = overlayInterface->getKnownNodes(true);
-        OverlayInterface::NodeList::iterator i = nodes.begin();
-        for(; i != nodes.end(); i++ ) {
-                if( *i == nodeId) continue; // don't send to ourselfs
-                sendMessage( message, *i, service );
+        for(size_t i=0; i<nodes.size(); i++){
+                NodeID& id = nodes.at(i);
+                if(id == this->nodeId) continue; // don't send to ourselfs
+                if(i+1 == nodes.size()) message->setReleasePayload(true); // release payload on last send
+                sendMessage( message, id, service );
         }
 }

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

@@ -250 +250 @@
                 logging_info("new routing neighbor: " << remote.toString()
                                 << " with link " << lnk.toString());
-                // replace with new link
-                if (item->info!=lnk && item->info.isUnspecified()==false)
-                        baseoverlay.dropLink(item->info);
-                item->info = lnk;
+
+                // replace with new link if link is "better"
+                if (item->info!=lnk && item->info.isUnspecified()==false) {
+                        if (baseoverlay.compare( item->info, lnk ) == 1) {
+                                logging_info("Replacing link due to concurrent link establishment.");
+                                baseoverlay.dropLink(item->info);
+                                item->info = lnk;
+                        }
+                } else {
+                        item->info = lnk;
+                }
 
                 // discover neighbors of new overlay neighbor