Changeset 4836 for source/ariba/utility/bootstrap/modules

Timestamp:

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

Author:

Christoph Mayer

Message:

einige avahi fixes und ablauf

Location:

source/ariba/utility/bootstrap/modules

Files:

• BootstrapModule.h (modified) (2 diffs)
• multicastdns/MulticastDns.cpp (modified) (10 diffs)
• multicastdns/MulticastDns.h (modified) (5 diffs)

source/ariba/utility/bootstrap/modules/BootstrapModule.h

@@ -53 +53 @@
         virtual ~BootstrapModule();
 
+        // the module must run asynchronously in its own thread.
         virtual void start() = 0;
         virtual void stop() = 0;
@@ -60 +61 @@
         virtual bool isFunctional() = 0;
 
-        virtual void publishService(string name, string info) = 0;
+        virtual void publishService(string name, string info1, string info2, string info3) = 0;
         virtual void revokeService(string name) = 0;
 

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

@@ -46 +46 @@
 
 MulticastDns::MulticastDns(BootstrapInformationCallback* _callback) : BootstrapModule(_callback) {
-  #ifdef HAVE_LIBAVAHI_CLIENT
+  #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
         avahiclient = NULL;
         avahipoll = NULL;
         avahibrowser = NULL;
-  #endif // HAVE_LIBAVAHI_CLIENT
+  #endif // HAVE_AVAHI_CLIENT_CLIENT_H
 }
 
@@ -65 +65 @@
 
 bool MulticastDns::isFunctional(){
-  #ifdef HAVE_LIBAVAHI_CLIENT
+  #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
         return true;
   #else
@@ -73 +73 @@
 
 void MulticastDns::start(){
-  #ifdef HAVE_LIBAVAHI_CLIENT
+  #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
 
         int error = 0;
@@ -110 +110 @@
         avahi_threaded_poll_start( avahipoll );
 
-  #endif // HAVE_LIBAVAHI_CLIENT
+  #endif // HAVE_AVAHI_CLIENT_CLIENT_H
 }
 
 void MulticastDns::stop(){
-  #ifdef HAVE_LIBAVAHI_CLIENT
+  #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
 
         //
@@ -144 +144 @@
         avahipoll = NULL;
 
-  #endif // HAVE_LIBAVAHI_CLIENT
-}
-
-void MulticastDns::publishService(string name, string info){
-  #ifdef HAVE_LIBAVAHI_CLIENT
+  #endif // HAVE_AVAHI_CLIENT_CLIENT_H
+}
+
+void MulticastDns::publishService(string name, string info1, string info2, string info3){
+  #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
 
         if(name.length() > 63){
@@ -198 +198 @@
                         NULL,                                   // host name of our machine, let avahi find out
                         3333,                                   // port number the service is on, just dummy, everything is encoded in TXT
-                        info.c_str(),                   // arbitrary info
+                        info1.c_str(),                  // arbitrary info
+                        info2.c_str(),                  // arbitrary info
+                        info3.c_str(),                  // arbitrary info
                         NULL);                                  // make that this is the last info field
 
@@ -219 +221 @@
         avahi_threaded_poll_unlock(avahipoll);
 
-  #endif // HAVE_LIBAVAHI_CLIENT
+  #endif // HAVE_AVAHI_CLIENT_CLIENT_H
 }
 
 void MulticastDns::revokeService(string name){
-  #ifdef HAVE_LIBAVAHI_CLIENT
+  #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
 
         avahi_threaded_poll_lock(avahipoll);
@@ -239 +241 @@
         avahi_threaded_poll_unlock(avahipoll);
 
-  #endif // HAVE_LIBAVAHI_CLIENT
-}
-
-#ifdef HAVE_LIBAVAHI_CLIENT
+  #endif // HAVE_AVAHI_CLIENT_CLIENT_H
+}
+
+#ifdef HAVE_AVAHI_CLIENT_CLIENT_H
 
 void MulticastDns::client_callback(AvahiClient* client, AvahiClientState state, void* userdata){
@@ -395 +397 @@
 
                         char addr[AVAHI_ADDRESS_STR_MAX];
-                        char* text = NULL;
 
                         avahi_address_snprint(addr, sizeof(addr), address);
-                        text = avahi_string_list_to_string(txt);
+
+                        string info1 = "";
+                        string info2 = "";
+                        string info3 = "";
+
+                        if(txt != NULL){
+                                char* cinfo = avahi_string_list_to_string(txt);
+                                info1 = cinfo;
+                                avahi_free(cinfo);
+                        }
+
+                        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 && 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(obj != NULL && obj->callback != NULL)
-                                obj->callback->onBootstrapServiceFound(name, text);
-
-                        avahi_free( text );
+                                obj->callback->onBootstrapServiceFound(name, info1, info2, info3);
+
                         break;
         }
@@ -410 +431 @@
 }
 
-#endif // HAVE_LIBAVAHI_CLIENT
+#endif // HAVE_AVAHI_CLIENT_CLIENT_H
 
 }} //namespace ariba, utility

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

@@ -42 +42 @@
 #include "ariba/config.h"
 
-#ifdef HAVE_LIBAVAHI_CLIENT
+#ifdef HAVE_AVAHI_CLIENT_CLIENT_H
   #include <avahi-client/client.h>
   #include <avahi-client/lookup.h>
@@ -51 +51 @@
   #include <avahi-common/error.h>
   #include <avahi-common/timeval.h>
-#endif
+#endif // HAVE_AVAHI_CLIENT_CLIENT_H
 
 #include <iostream>
@@ -80 +80 @@
         virtual string getInformation();
         virtual bool isFunctional();
-        virtual void publishService(string name, string info);
+        virtual void publishService(string name, string info1, string info2, string info3);
         virtual void revokeService(string name);
 
@@ -86 +86 @@
         static const string serviceType;
 
-#ifdef HAVE_LIBAVAHI_CLIENT
+#ifdef HAVE_AVAHI_CLIENT_CLIENT_H
 
         AvahiClient*         avahiclient;
@@ -133 +133 @@
                         );
 
-#endif // HAVE_LIBAVAHI_CLIENT
+#endif // HAVE_AVAHI_CLIENT_CLIENT_H
 
 };