An Overlay-based
Virtual Network Substrate
SpoVNet

Ignore:
Timestamp:
Aug 22, 2012, 2:09:00 PM (7 years ago)
Author:
Michael Tänzer
Message:

Merge CMake branch into trunk

Location:
source
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • source

    • Property svn:ignore deleted
  • source/ariba

    • Property svn:ignore deleted
  • source/ariba/utility

    • Property svn:ignore deleted
  • source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.cpp

    r7532 r10700  
    4848MulticastDns::MulticastDns(BootstrapInformationCallback* _callback, string info)
    4949        : BootstrapModule(_callback) {
    50   #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
     50  #ifdef HAVE_AVAHI
    5151        avahiclient = NULL;
    5252        avahipoll = NULL;
    5353        avahibrowser = NULL;
    54   #endif // HAVE_AVAHI_CLIENT_CLIENT_H
     54  #endif // HAVE_AVAHI
    5555}
    5656
     
    6767
    6868bool MulticastDns::isFunctional(){
    69   #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
     69  #ifdef HAVE_AVAHI
    7070        return true;
    7171  #else
     
    7575
    7676void MulticastDns::start(){
    77   #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
     77  #ifdef HAVE_AVAHI
    7878
    7979        int error = 0;
     
    119119        avahi_threaded_poll_start( avahipoll );
    120120
    121   #endif // HAVE_AVAHI_CLIENT_CLIENT_H
     121  #endif // HAVE_AVAHI
    122122}
    123123
    124124void MulticastDns::stop(){
    125   #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
     125  #ifdef HAVE_AVAHI
    126126
    127127        //
     
    155155        avahipoll = NULL;
    156156
    157   #endif // HAVE_AVAHI_CLIENT_CLIENT_H
     157  #endif // HAVE_AVAHI
    158158}
    159159
    160160void MulticastDns::publishService(string name, string info1, string info2, string info3){
    161   #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
     161  #ifdef HAVE_AVAHI
    162162
    163163        if(name.length() > 63){
     
    234234        avahi_threaded_poll_unlock(avahipoll);
    235235
    236   #endif // HAVE_AVAHI_CLIENT_CLIENT_H
     236  #endif // HAVE_AVAHI
    237237}
    238238
    239239void MulticastDns::revokeService(string name){
    240   #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
     240  #ifdef HAVE_AVAHI
    241241
    242242        avahi_threaded_poll_lock(avahipoll);
     
    254254        avahi_threaded_poll_unlock(avahipoll);
    255255
    256   #endif // HAVE_AVAHI_CLIENT_CLIENT_H
    257 }
    258 
    259 #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
     256  #endif // HAVE_AVAHI
     257}
     258
     259#ifdef HAVE_AVAHI
    260260
    261261void MulticastDns::client_callback(AvahiClient* client, AvahiClientState state, void* userdata){
     
    440440}
    441441
    442 #endif // HAVE_AVAHI_CLIENT_CLIENT_H
     442#endif // HAVE_AVAHI
    443443
    444444}} //namespace ariba, utility
Note: See TracChangeset for help on using the changeset viewer.