Changeset 4850

Timestamp:

Jul 10, 2009, 11:26:51 AM (15 years ago)

Author:

Christoph Mayer

Message:

-neues bootstrap module für dumme periodische broadcasts

Location:

source/ariba

Files:

• Makefile.am (modified) (2 diffs)
• overlay/OverlayBootstrap.cpp (modified) (1 diff)
• utility/bootstrap/BootstrapManager.cpp (modified) (4 diffs)
• utility/bootstrap/BootstrapManager.h (modified) (1 diff)
• utility/bootstrap/modules/multicastdns/MulticastDns.cpp (modified) (1 diff)
• utility/bootstrap/modules/periodicbroadcast (added)
• utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp (added)
• utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h (added)

source/ariba/Makefile.am

@@ -335 +335 @@
   utility/bootstrap/modules/BootstrapModule.cpp \
   utility/bootstrap/modules/multicastdns/MulticastDns.cpp \
-  utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp
+  utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp \
+  utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp
   
 nobase_libariba_la_HEADERS += \
@@ -342 +343 @@
   utility/bootstrap/modules/BootstrapModule.h \
   utility/bootstrap/modules/multicastdns/MulticastDns.h \
-  utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h
+  utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h \
+  utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h
 
 #------------> utility :: configuration

source/ariba/overlay/OverlayBootstrap.cpp

@@ -89 +89 @@
 
         // announcement for another spovnet
-        if( sid != spovnetid )
-                return;
+        if( sid != this->spovnetid ) return;
+
+        // announcement with our nodeid (either our announcement
+        // or a node with the same id, any way -> ignore)
+        if( nid == this->nodeid ) return;
 
         // announcement for our spovnet

source/ariba/utility/bootstrap/BootstrapManager.cpp

@@ -40 +40 @@
 #include "BootstrapManager.h"
 #include "ariba/utility/bootstrap/modules/multicastdns/MulticastDns.h"
+#include "ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h"
 
 namespace ariba {
@@ -65 +66 @@
 
         switch(type){
-                case BootstrapTypeMulticastDns:
-                        module = new MulticastDns(this);
-                        break;
+        case BootstrapTypeMulticastDns:
+                module = new MulticastDns(this);
+                break;
+        case BootstrapTypePeriodicBroadcast:
+                module = new PeriodicBroadcast(this);
+                break;
         }
 
@@ -113 +117 @@
                 RegistrationResult resone = RegistrationSucceeded;
                 resone = registerModule(BootstrapTypeMulticastDns);
+
+                if(resone != RegistrationSucceeded)
+                        result = resone;
+        }
+
+        { // periodic broadcast
+                RegistrationResult resone = RegistrationSucceeded;
+                resone = registerModule(BootstrapTypePeriodicBroadcast);
+
                 if(resone != RegistrationSucceeded)
                         result = resone;
@@ -126 +139 @@
 BootstrapManager::RegistrationResult BootstrapManager::unregisterAllModules(){
         unregisterModule(BootstrapTypeMulticastDns);
+        unregisterModule(BootstrapTypePeriodicBroadcast);
         /*  todo  ...  */
 

source/ariba/utility/bootstrap/BootstrapManager.h

@@ -73 +73 @@
 
         enum BootstrapType {
-                BootstrapTypeMulticastDns,      // use mDNS bootstrapping
+                BootstrapTypeMulticastDns,                      // use mDNS bootstrapping
+                BootstrapTypePeriodicBroadcast,         // stupid periodic broadcasting
         };
 

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

@@ -85 +85 @@
 
         // create a new avahi client
-        avahiclient = avahi_client_new( avahi_threaded_poll_get(avahipoll),
-                        (AvahiClientFlags)0, MulticastDns::client_callback, this, &error );
+        avahiclient = avahi_client_new(
+                        avahi_threaded_poll_get(avahipoll),
+                        (AvahiClientFlags)0,
+                        MulticastDns::client_callback,
+                        this,
+                        &error
+                        );
+
         if( avahiclient == NULL){
                 logging_error("creating avahi client failed with error "<<