Changeset 4838 for source

Timestamp:

Jul 9, 2009, 3:05:13 PM (15 years ago)

Author:

Christoph Mayer

Message:

bootstrap ablauf fixes und avahi fixes

Location:

source/ariba

Files:

• overlay/BaseOverlay.cpp (modified) (1 diff)
• overlay/OverlayBootstrap.cpp (modified) (4 diffs)
• utility/bootstrap/modules/multicastdns/MulticastDns.cpp (modified) (2 diffs)

source/ariba/overlay/BaseOverlay.cpp

@@ -115 +115 @@
         state = BaseOverlayStateJoinInitiated;
 
-
         //
         // start bootstrapping for spovnetid

source/ariba/overlay/OverlayBootstrap.cpp

@@ -50 +50 @@
                 nodeid( NodeID::UNSPECIFIED ),
                 overlay( NULL ){
-
-        manager.registerAllModules();
 }
 
 OverlayBootstrap::~OverlayBootstrap(){
-        manager.unregisterAllModules();
 }
 
@@ -64 +61 @@
 
         manager.registerCallback( this );
+        manager.registerAllModules();
 }
 void OverlayBootstrap::stop(){
@@ -71 +69 @@
 
         manager.unregisterCallback( this );
+        manager.unregisterAllModules();
 }
 
@@ -89 +88 @@
         //
 
+        // announcement for another spovnet
         if( sid != spovnetid )
                 return;
 
-        logging_info( "found bootstrap node for our SpoVNetID" << sid.toString()
-                        << " on NodeID " << nid << " and endpoint " << ep.toString() );
+        // announcement for our spovnet
+        logging_info( "found bootstrap node for our SpoVNetID " << sid.toString()
+                        << " on NodeID " << nid << " with endpoint " << ep.toString() );
 }
 

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

@@ -396 +396 @@
                 case AVAHI_RESOLVER_FOUND:
 
-                        char addr[AVAHI_ADDRESS_STR_MAX];
-
-                        avahi_address_snprint(addr, sizeof(addr), address);
-
                         string info1 = "";
                         string info2 = "";
@@ -405 +401 @@
 
                         if(txt != NULL){
-                                char* cinfo = avahi_string_list_to_string(txt);
-                                info1 = cinfo;
-                                avahi_free(cinfo);
+                                char* cinfo = (char*)avahi_string_list_get_text(txt);
+                                info1 = string(cinfo);
+                                txt = avahi_string_list_get_next(txt);
                         }
 
-                        if(txt != NULL && avahi_string_list_get_next(txt) != NULL){
-                                char* cinfo = avahi_string_list_to_string( avahi_string_list_get_next(txt) );
-                                info2 = cinfo;
-                                avahi_free(cinfo);
+                        if(txt != NULL){
+                                char* cinfo = (char*)avahi_string_list_get_text(txt);
+                                info2 = string(cinfo);
+                                txt = avahi_string_list_get_next(txt);
                         }
 
-                        if(txt != NULL && avahi_string_list_get_next(txt) != NULL){
-                                char* cinfo = avahi_string_list_to_string( avahi_string_list_get_next(txt) );
-                                info3 = cinfo;
-                                avahi_free(cinfo);
+                        if(txt != NULL){
+                                char* cinfo = (char*)avahi_string_list_get_text(txt);
+                                info3 = string(cinfo);
+                                txt = avahi_string_list_get_next(txt);
                         }