Changeset 4836 for source/ariba/utility/bootstrap/BootstrapManager.cpp

Timestamp:

Jul 9, 2009, 1:50:37 PM (16 years ago)

Author:

Christoph Mayer

Message:

einige avahi fixes und ablauf

File:

• source/ariba/utility/bootstrap/BootstrapManager.cpp (modified) (5 diffs)

source/ariba/utility/bootstrap/BootstrapManager.cpp

@@ -50 +50 @@
 
 BootstrapManager::~BootstrapManager(){
-
-        boost::mutex::scoped_lock lock( modulesMutex );
-
-        while( modules.size() > 0 ){
-                ModuleMap::iterator i = modules.begin();
-                unregisterModule( i->first );
-        }
 }
 
@@ -96 +89 @@
 }
 
-BootstrapManager::RegistrationResult BootstrapManager::unregisterModule(BootstrapManager::BootstrapType type){
+BootstrapManager::RegistrationResult BootstrapManager::unregisterModule(
+                BootstrapManager::BootstrapType type){
 
         boost::mutex::scoped_lock lock( modulesMutex );
@@ -113 +107 @@
 }
 
-void BootstrapManager::onBootstrapServiceFound(string name, string info){
+BootstrapManager::RegistrationResult BootstrapManager::registerAllModules(){
+        RegistrationResult result = RegistrationSucceeded;
+
+        { // multicast dns
+                RegistrationResult resone = RegistrationSucceeded;
+                resone = registerModule(BootstrapTypeMulticastDns);
+                if(resone != RegistrationSucceeded)
+                        result = resone;
+        }
+
+        { // todo
+                /*  ...   */
+        }
+
+        return result;
+}
+
+BootstrapManager::RegistrationResult BootstrapManager::unregisterAllModules(){
+        unregisterModule(BootstrapTypeMulticastDns);
+        /*  todo  ...  */
+
+        return RegistrationSucceeded;
+}
+
+void BootstrapManager::onBootstrapServiceFound(string name, string info1, string info2, string info3){
 
         BOOST_FOREACH( BootstrapInformationCallback* callback, callbacks ){
-                callback->onBootstrapServiceFound(name, info);
+                callback->onBootstrapServiceFound(name, info1, info2, info3);
         }
 }
@@ -132 +150 @@
 }
 
-void BootstrapManager::publish(string name, string info){
+void BootstrapManager::publish(string name, string info1, string info2, string info3){
         boost::mutex::scoped_lock lock( modulesMutex );
 
@@ -141 +159 @@
                 logging_info("bootstrap manager publishing service "
                                 << name << " on module " << i->second->getName());
-                i->second->publishService(name, info);
+                i->second->publishService(name, info1, info2, info3);
         }
 }
 
 void BootstrapManager::revoke(string name){
+        boost::mutex::scoped_lock lock( modulesMutex );
+
         ModuleMap::iterator i = modules.begin();
         ModuleMap::iterator iend = modules.end();