Changeset 4841 for source/ariba

Timestamp:

Jul 9, 2009, 4:48:08 PM (15 years ago)

Author:

Christoph Mayer

Message:

avahi fehler logging

Location:

source/ariba

Files:

• Makefile.am (modified) (2 diffs)
• utility/bootstrap/modules/multicastdns/MulticastDns.cpp (modified) (3 diffs)

source/ariba/Makefile.am

@@ -334 +334 @@
   utility/bootstrap/BootstrapManager.cpp \
   utility/bootstrap/modules/BootstrapModule.cpp \
-  utility/bootstrap/modules/multicastdns/MulticastDns.cpp
+  utility/bootstrap/modules/multicastdns/MulticastDns.cpp \
   utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp
   
@@ -341 +341 @@
   utility/bootstrap/BootstrapInformationCallback.h \
   utility/bootstrap/modules/BootstrapModule.h \
-  utility/bootstrap/modules/multicastdns/MulticastDns.h
+  utility/bootstrap/modules/multicastdns/MulticastDns.h \
   utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h
 

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

@@ -88 +88 @@
                         (AvahiClientFlags)0, MulticastDns::client_callback, this, &error );
         if( avahiclient == NULL){
-                logging_error("creating avahi client failed");
+                logging_error("creating avahi client failed with error "
+                                << error << ". make sure that the avahi-daemon is running. e.g. by installing avahi-utils);
                 return;
         }
@@ -138 +139 @@
         //
 
-        avahi_client_free( avahiclient );
+        if(avahiclient != NULL)
+                avahi_client_free( avahiclient );
         avahiclient = NULL;
 
-        avahi_threaded_poll_free( avahipoll );
+        if(avahipoll != NULL)
+                avahi_threaded_poll_free( avahipoll );
         avahipoll = NULL;
 
@@ -156 +159 @@
         }
 
+        if( avahiclient == NULL ){
+                logging_error("avahi client is invalid");
+                return;
+        }
 
         avahi_threaded_poll_lock(avahipoll);
-        assert( avahiclient != NULL );
-
         int ret = 0;