Changeset 7744 for source/ariba/communication

Timestamp:

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

Author:

Christoph Mayer

Message:

-branch merge back

Location:

source/ariba/communication

Files:

• BaseCommunication.cpp (modified) (6 diffs)
• EndpointDescriptor.h (modified) (4 diffs)
• networkinfo/AddressDiscovery.cpp (modified) (1 diff)

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