Changeset 2452 for source/ariba/AribaModule.cpp

Timestamp:

Feb 18, 2009, 11:39:30 AM (16 years ago)

Author:

mies

Message:

implemented bootstrap info parser

File:

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

source/ariba/AribaModule.cpp

@@ -45 +45 @@
 // ariba includes
 #include "ariba/utility/misc/Helper.h"
+#include "ariba/utility/misc/StringFormat.h"
 
 // hack includes
@@ -53 +54 @@
 using namespace ariba::utility::Helper;
 using ariba::interface::UnderlayAbstraction;
+using ariba::communication::EndpointDescriptor;
 
 namespace ariba {
+
+AribaModule::BootstrapNode::~BootstrapNode() {
+        if (desc!=NULL) delete desc;
+}
 
 AribaModule::AribaModule() {
@@ -69 +75 @@
 }
 
-
 string AribaModule::getBootstrapHints(const Name& spoVNetName) const {
-
+        std::ostringstream o;
+        BOOST_FOREACH( const BootstrapInfo& info, bootstrapNodes ) {
+                o << info.spovnetName.toString() << "{";
+                int i=0;
+                BOOST_FOREACH( const BootstrapNode& node, info.nodes ) {
+                        if (i!=0) o << ",";
+                        if( node.desc != NULL ) o << node.desc->toString();
+                        i++;
+                }
+        }
+        return o.str();
 }
 
 void AribaModule::addBootstrapHints(string boot_info) {
-        string str = boot_info;
-        static ::boost::regex boot_expr("<([^>:]+)[:]?([0-9]+)?>([^<]+)(.*)");
-        ::boost::smatch what;
-        while (::boost::regex_match(str, what, boot_expr)) {
-                std::cout << what[1].str() << ":" << what[2].str() << "=" << what[3]
-                                << std::endl;
-                str = what[4].str();
-        }
-}
-
-void AribaModule::addBootstrapNode(const Name& spovnet, const Name& node,
+        using namespace boost::xpressive;
+        using namespace ariba::utility::string_format;
+        using namespace ariba::utility::Helper;
+        using namespace std;
+
+        smatch match;
+        if (regex_search(boot_info, match, robjects)) {
+                regex_nav nav = match;
+                for (int i = 0; i < nav.size(); i++) {
+                        string type = nav[i][robject_id].str();
+                        string data = nav[i][robject_data].str();
+                        data = data.substr(1, data.size() - 2);
+                        Name name = type;
+                        EndpointDescriptor* desc = EndpointDescriptor::fromString(data);
+                        addBootstrapNode(name, desc);
+                }
+        }
+}
+
+void AribaModule::addBootstrapNode(const Name& spovnet,
                 communication::EndpointDescriptor* desc) {
 
+        // set bootstrap node
+        BootstrapNode node;
+        node.timestamp = 0;
+        node.desc = desc;
+        bool added = false;
+
+        // add node to existing bootstrap list
+        BOOST_FOREACH( BootstrapInfo& info, bootstrapNodes ){
+                if (info.spovnetName == spovnet) {
+                        info.nodes.push_back(node);
+                        added = true;
+                        break;
+                }
+        }
+
+        // create new entry
+        if (!added) {
+                BootstrapInfo info;
+                info.spovnetName = spovnet;
+                info.nodes.push_back(node);
+                bootstrapNodes.push_back(info);
+        }
+
+        std::cout << "added bootstrap info: " << getBootstrapHints() << std::endl;
 }
 
 const communication::EndpointDescriptor* AribaModule::getBootstrapNode(
-                const Name& spovnet) {
-
-        BOOST_FOREACH( BootstrapInfo info, bootstrapNodes ){
-                if( info.spovnetName == spovnet ){
-                        BOOST_FOREACH( BootstrapNode node, info.desc ){
+                const Name& spovnet) const {
+        BOOST_FOREACH( const BootstrapInfo& info, bootstrapNodes ) {
+                if( info.spovnetName == spovnet ) {
+                        BOOST_FOREACH( const BootstrapNode& node, info.nodes ) {
                                 if( node.desc != NULL ) return node.desc;
                         }
                 }
         }
-
         return NULL;
 }
@@ -150 +196 @@
                 *loc = communication::IPv4Locator::fromString(value);
                 ip_addr = loc;
-        } else if (key == "tcp.port") tcp_port = stoi(value);
+        }
+        else if (key == "tcp.port") tcp_port = stoi(value);
         else if (key == "udp.port") udp_port = stoi(value);
         else if (key == "bootstrap.hints") addBootstrapHints(value);