Changeset 7532 for source/ariba/utility/bootstrap

Timestamp:

Feb 4, 2010, 5:29:37 PM (14 years ago)

Author:

Christoph Mayer

Message:

-von außen konfigurierbare bootstrap module, -periodicbroadcast crash fix

Location:

source/ariba/utility/bootstrap

Files:

• BootstrapManager.cpp (modified) (2 diffs)
• BootstrapManager.h (modified) (1 diff)
• modules/bluetoothsdp/BluetoothSdp.cpp (modified) (2 diffs)
• modules/bluetoothsdp/BluetoothSdp.h (modified) (1 diff)
• modules/multicastdns/MulticastDns.cpp (modified) (1 diff)
• modules/multicastdns/MulticastDns.h (modified) (1 diff)
• modules/periodicbroadcast/PeriodicBroadcast.cpp (modified) (3 diffs)
• modules/periodicbroadcast/PeriodicBroadcast.h (modified) (3 diffs)

source/ariba/utility/bootstrap/BootstrapManager.cpp

@@ -54 +54 @@
 }
 
-BootstrapManager::RegistrationResult BootstrapManager::registerModule(BootstrapManager::BootstrapType type){
+BootstrapManager::RegistrationResult BootstrapManager::registerModule(
+                BootstrapManager::BootstrapType type, string info){
 
         boost::mutex::scoped_lock lock( modulesMutex );
@@ -68 +69 @@
         switch(type){
         case BootstrapTypeMulticastDns:
-                module = new MulticastDns(this);
+                module = new MulticastDns(this, info);
                 break;
         case BootstrapTypePeriodicBroadcast:
-                module = new PeriodicBroadcast(this);
+                module = new PeriodicBroadcast(this, info);
                 break;
         case BootstrapTypeBluetoothSdp:
-                module = new BluetoothSdp(this);
+                module = new BluetoothSdp(this, info);
                 break;
         }

source/ariba/utility/bootstrap/BootstrapManager.h

@@ -85 +85 @@
 
         RegistrationResult registerAllModules();
-        RegistrationResult registerModule(BootstrapType type);
+        RegistrationResult registerModule(BootstrapType type, string info=string(""));
         RegistrationResult unregisterAllModules();
         RegistrationResult unregisterModule(BootstrapType type);

source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp

@@ -72 +72 @@
 OverlayBootstrap* BluetoothSdp::CONNECTION_CHECKER = NULL;
 
-BluetoothSdp::BluetoothSdp(BootstrapInformationCallback* _callback) :
-        BootstrapModule(_callback), scan_timer_(io_service_) {
+BluetoothSdp::BluetoothSdp(BootstrapInformationCallback* _callback, string info)
+        : BootstrapModule(_callback), scan_timer_(io_service_) {
         srand( time(NULL) );
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
@@ -80 +80 @@
         // of the info strings (as an attribute)
         channel_ = 1;
-
 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
 }

source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h

@@ -80 +80 @@
         static OverlayBootstrap* CONNECTION_CHECKER;
 
-        BluetoothSdp(BootstrapInformationCallback* _callback);
+        BluetoothSdp(BootstrapInformationCallback* _callback, string info);
         virtual ~BluetoothSdp();
 

source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.cpp

@@ -46 +46 @@
 use_logging_cpp(MulticastDns);
 
-MulticastDns::MulticastDns(BootstrapInformationCallback* _callback) : BootstrapModule(_callback) {
+MulticastDns::MulticastDns(BootstrapInformationCallback* _callback, string info)
+        : BootstrapModule(_callback) {
   #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
         avahiclient = NULL;

source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.h

@@ -71 +71 @@
         use_logging_h(MulticastDns);
 public:
-        MulticastDns(BootstrapInformationCallback* _callback);
+        MulticastDns(BootstrapInformationCallback* _callback, string info);
         virtual ~MulticastDns();
 

source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp

@@ -63 +63 @@
 const unsigned int PeriodicBroadcast::serverport_v6 = 5636;
 
-PeriodicBroadcast::PeriodicBroadcast(BootstrapInformationCallback* _callback)
+PeriodicBroadcast::PeriodicBroadcast(BootstrapInformationCallback* _callback, string info)
         : BootstrapModule(_callback),
         server(io_service, &newRemoteServices, &newRemoteServicesMutex) {
@@ -108 +108 @@
 
         boost::mutex::scoped_lock lock( localServicesMutex );
+        if(name.empty()) return;
+
         localServices.insert( std::make_pair(name, service) );
 }
@@ -113 +115 @@
 void PeriodicBroadcast::revokeService(string name){
         boost::mutex::scoped_lock lock( localServicesMutex );
+        if(name.empty()) return;
 
         ServiceList::iterator i = localServices.find( name );

source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h

@@ -66 +66 @@
         use_logging_h(PeriodicBroadcast);
 public:
-        PeriodicBroadcast(BootstrapInformationCallback* _callback);
+        PeriodicBroadcast(BootstrapInformationCallback* _callback, string info);
         virtual ~PeriodicBroadcast();
 
@@ -275 +275 @@
 
                         PeriodicBroadcastMessage msg;
+                        if(service.getName().empty()) return;
 
                         msg.setName( service.getName() );
@@ -351 +352 @@
                                 { // insert new found service
                                         boost::mutex::scoped_lock lock( *servicesmutex );
+                                        if(msg.getName().empty()) return;
 
                                         ServiceList::iterator it = services->find( msg.getName() );