Changeset 5284 for source/ariba/AribaModule.cpp

Timestamp:

Jul 24, 2009, 3:23:11 PM (15 years ago)

Author:

mies

Message:

+ added new transport modules and adapted ariba to them
+ exchange endpoint descriptors an link establishment
+ clean up of base communication
+ link establishment with in the presence of multiple endpoints
+ local discovery for ipv6, ipv4 and bluetooth mac addresses

File:

• source/ariba/AribaModule.cpp (modified) (8 diffs)

source/ariba/AribaModule.cpp

@@ -50 +50 @@
 #include "ariba/communication/BaseCommunication.h"
 #include "ariba/communication/EndpointDescriptor.h"
-#include "ariba/communication/modules/network/NetworkLocator.h"
 
 using namespace ariba::utility::Helper;
@@ -58 +57 @@
 namespace ariba {
 
+use_logging_cpp(AribaModule);
+
 AribaModule::AribaModule()
-        : base_comm(NULL), sideport_sniffer(NULL),
-                ip_addr(NULL), started(false) {
-
-        // init with default values
-
-        this->tcp_port = 41402;
-        this->udp_port = 41402;
+        : base_comm(NULL), sideport_sniffer(NULL), started(false) {
 }
 
@@ -101 +96 @@
                         Name name(type);
                         EndpointDescriptor* desc = EndpointDescriptor::fromString(data);
+                        logging_debug("Added bootstap info for " << type << ": " << desc->toString() );
                         addBootstrapNode(name, desc);
                 }
@@ -132 +128 @@
         }
 
-        //logging_debug( "added bootstrap info: " << getBootstrapHints() );
+        logging_debug( "Added bootstrap info: " << getBootstrapHints() );
 }
 
@@ -171 +167 @@
         started = true;
         base_comm = new BaseCommunication();
+        base_comm->setEndpoints(endpoints);
 }
 
@@ -192 +189 @@
 // @see Module.h
 void AribaModule::setProperty(string key, string value) {
-        if (key == "ip.addr") {
-                if (ip_addr != NULL) delete ip_addr;
-                communication::IPv4Locator* loc = new communication::IPv4Locator();
-                *loc = communication::IPv4Locator::fromString(value);
-                ip_addr = loc;
-        }
-        else if (key == "tcp.port") tcp_port = stoi(value);
-        else if (key == "udp.port") udp_port = stoi(value);
+        if (key == "endpoints") endpoints = value;
         else if (key == "bootstrap.hints") addBootstrapHints(value);
 }
@@ -205 +195 @@
 // @see Module.h
 const string AribaModule::getProperty(string key) const {
-        if (key == "ip.addr") return ip_addr->toString();
-        else if (key == "tcp.port") return ultos(tcp_port);
-        else if (key == "udp.port") return ultos(udp_port);
+        if (key == "endpoints") return endpoints; // TODO: return local endpoints
         else if (key == "bootstrap.hints") return getBootstrapHints();
 }
@@ -214 +202 @@
 const vector<string> AribaModule::getProperties() const {
         vector<string> properties;
-        properties.push_back("ip.addr");
-        properties.push_back("tcp.port");
-        properties.push_back("udp.port");
-        properties.push_back("hints");
+        properties.push_back("endpoints");
+        properties.push_back("bootstrap.hints");
         return properties;
 }