An Overlay-based
Virtual Network Substrate
SpoVNet

Changeset 4762


Ignore:
Timestamp:
Jul 6, 2009, 3:43:11 PM (15 years ago)
Author:
Christoph Mayer
Message:

avahi optional

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • m4/ax_avahi.m4

    r4733 r4762  
    55# DESCRIPTION
    66#
    7 #   Test for the Avahi library
     7#   Test for the Avahi library. The library is optional!
    88#
    99# LAST MODIFICATION
     
    1313AC_DEFUN([AX_AVAHI],
    1414[
    15   AC_CHECK_HEADERS(avahi-client/client.h,,
    16     [AC_MSG_ERROR([Avahi Client Library not found. Install libavahi-client-dev])])
     15  AC_CHECK_HEADERS(avahi-client/client.h,
     16    [AC_MSG_NOTICE([Avahi Client Library found])], )
    1717   
    18   AC_CHECK_HEADERS(avahi-common/timeval.h,,
    19     [AC_MSG_ERROR([Avahi Common Library not found. Install libavahi-common-dev])])
     18  AC_CHECK_HEADERS(avahi-common/timeval.h,
     19    [AC_MSG_NOTICE([Avahi Common Library found])], )
    2020   
    21   AC_CHECK_LIB([avahi-client],[avahi_entry_group_new],,
    22     [AC_MSG_ERROR([Avahi Client Library not found. Install libavahi-client-dev])])
     21  AC_CHECK_LIB([avahi-client],[avahi_entry_group_new],
     22    [AC_MSG_NOTICE([Avahi Client Library found])], )
    2323   
    24   AC_CHECK_LIB([avahi-common],[avahi_free],,
    25     [AC_MSG_ERROR([Avahi Client Library not found. Install libavahi-client-dev])])
     24  AC_CHECK_LIB([avahi-common],[avahi_free],
     25    [AC_MSG_NOTICE([Avahi Client Library found])], )
    2626])
  • sample/pingpong/main.cpp

    r4733 r4762  
    77using ariba::application::pingpong::PingPong;
    88
     9#include "ariba/utility/bootstrap/BootstrapManager.h"
     10using ariba::utility::BootstrapManager;
     11
    912int main( int argc, char** argv ) {
     13
     14
     15        StartupWrapper::startSystem();
     16        BootstrapManager::instance().registerModule(
     17                        BootstrapManager::BootstrapTypeMulticastDns);
     18        BootstrapManager::instance().publish("testname", "testinfo");
     19        getchar();
     20        StartupWrapper::stopSystem();
     21        return 0;
     22
     23
    1024
    1125        // get config file
     
    2741        return 0;
    2842}
    29 
    30 /* Chris's debugging stuff
    31 
    32         #include "ariba/utility/bootstrap/BootstrapManager.h"
    33         using ariba::utility::BootstrapManager;
    34 
    35         StartupWrapper::startSystem();
    36         BootstrapManager::instance().registerModule(
    37                         BootstrapManager::BootstrapTypeMulticastDns);
    38         BootstrapManager::instance().publish("testname", "testinfo");
    39         getchar();
    40         return 0;
    41 */
  • source/ariba/communication/BaseCommunication.cpp

    r4582 r4762  
    9797                IPv4Locator* ipv4locator = dynamic_cast<IPv4Locator*>(*i);
    9898
    99                 // TODO: which locators are find to bind to?
     99                // TODO: which locators can we find to bind to?
    100100                // localhost is not too bad, works when testing locally
    101101                // with several instances. the manual override currently
  • source/ariba/overlay/BaseOverlay.cpp

    r4483 r4762  
    696696        /* Handle spovnet instance join requests
    697697         */
    698         else if( overlayMsg->isType(OverlayMsg::OverlayMessageTypeJoinRequest) &&
    699                                                 state == BaseOverlayStateInitiator){
     698        else if( overlayMsg->isType(OverlayMsg::OverlayMessageTypeJoinRequest) ){
    700699
    701700                logging_debug(
     
    748747                return true;
    749748
    750         } // else if( overlayMsg->isType(OverlayMsg::OverlayMessageTypeJoinRequest)
    751           //          && state == BaseOverlayStateInitiator)
     749        } // else if( overlayMsg->isType(OverlayMsg::OverlayMessageTypeJoinRequest))
    752750
    753751        /* ************************************************************************
Note: See TracChangeset for help on using the changeset viewer.