Changeset 7744 for source/ariba/communication/BaseCommunication.cpp

Timestamp:

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

Author:

Christoph Mayer

Message:

-branch merge back

File:

• source/ariba/communication/BaseCommunication.cpp (modified) (6 diffs)

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()) {