Changeset 4841 for source/ariba


Ignore:
Timestamp:
Jul 9, 2009, 4:48:08 PM (15 years ago)
Author:
Christoph Mayer
Message:

avahi fehler logging

Location:
source/ariba
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • source/ariba/Makefile.am

    r4840 r4841  
    334334  utility/bootstrap/BootstrapManager.cpp \
    335335  utility/bootstrap/modules/BootstrapModule.cpp \
    336   utility/bootstrap/modules/multicastdns/MulticastDns.cpp
     336  utility/bootstrap/modules/multicastdns/MulticastDns.cpp \
    337337  utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp
    338338 
     
    341341  utility/bootstrap/BootstrapInformationCallback.h \
    342342  utility/bootstrap/modules/BootstrapModule.h \
    343   utility/bootstrap/modules/multicastdns/MulticastDns.h
     343  utility/bootstrap/modules/multicastdns/MulticastDns.h \
    344344  utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h
    345345
  • source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.cpp

    r4838 r4841  
    8888                        (AvahiClientFlags)0, MulticastDns::client_callback, this, &error );
    8989        if( avahiclient == NULL){
    90                 logging_error("creating avahi client failed");
     90                logging_error("creating avahi client failed with error "
     91                                << error << ". make sure that the avahi-daemon is running. e.g. by installing avahi-utils);
    9192                return;
    9293        }
     
    138139        //
    139140
    140         avahi_client_free( avahiclient );
     141        if(avahiclient != NULL)
     142                avahi_client_free( avahiclient );
    141143        avahiclient = NULL;
    142144
    143         avahi_threaded_poll_free( avahipoll );
     145        if(avahipoll != NULL)
     146                avahi_threaded_poll_free( avahipoll );
    144147        avahipoll = NULL;
    145148
     
    156159        }
    157160
     161        if( avahiclient == NULL ){
     162                logging_error("avahi client is invalid");
     163                return;
     164        }
    158165
    159166        avahi_threaded_poll_lock(avahipoll);
    160         assert( avahiclient != NULL );
    161 
    162167        int ret = 0;
    163168
Note: See TracChangeset for help on using the changeset viewer.