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

Timestamp:

May 26, 2009, 1:40:23 AM (16 years ago)

Author:

mies

Message:

Merged 20090512-mies-connectors changes r3472:r3689 into trunk.

File:

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

source/ariba/communication/BaseCommunication.cpp

@@ -1 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35 +35 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "BaseCommunication.h"
@@ -160 +160 @@
 
 const LinkID BaseCommunication::establishLink(
-                        const EndpointDescriptor& descriptor,
-                        const QoSParameterSet& qos,
-                        const SecurityParameterSet& sec){
-
+        const EndpointDescriptor& descriptor,
+        const LinkID& link_id,
+        const QoSParameterSet& qos,
+        const SecurityParameterSet& sec) {
+
+        // copy link id
+        LinkID linkid = link_id;
+
+        // debug
         logging_debug( "request to establish link" );
 
@@ -169 +174 @@
         // just use the first locator in the endp descriptors
         //
-
         if( descriptor.locator == NULL ){
                 logging_error( "invalid destination endpoint" );
@@ -183 +187 @@
         const NetworkLocator* local =  localDescriptor.locator;
 
-        //
-        // create link and link descriptor
-        //
-
-        LinkID linkid = LinkID::create();
-
+        // create link identifier and link descriptor
+        if (linkid.isUnspecified()) linkid = LinkID::create();
         logging_debug( "creating new local descriptor entry with local link id " << linkid.toString() );
         LinkDescriptor linkDescriptor( linkid, local, LinkID::UNSPECIFIED, remote, descriptor, false );