Changeset 4762

Timestamp:

Jul 6, 2009, 3:43:11 PM (15 years ago)

Author:

Christoph Mayer

Message:

avahi optional

Files:

• m4/ax_avahi.m4 (modified) (2 diffs)
• sample/pingpong/main.cpp (modified) (2 diffs)
• source/ariba/communication/BaseCommunication.cpp (modified) (1 diff)
• source/ariba/overlay/BaseOverlay.cpp (modified) (2 diffs)

m4/ax_avahi.m4

@@ -5 +5 @@
 # DESCRIPTION
 #
-#   Test for the Avahi library
+#   Test for the Avahi library. The library is optional!
 #
 # LAST MODIFICATION
@@ -13 +13 @@
 AC_DEFUN([AX_AVAHI],
 [
-  AC_CHECK_HEADERS(avahi-client/client.h,,
-    [AC_MSG_ERROR([Avahi Client Library not found. Install libavahi-client-dev])])
+  AC_CHECK_HEADERS(avahi-client/client.h,
+    [AC_MSG_NOTICE([Avahi Client Library found])], )
     
-  AC_CHECK_HEADERS(avahi-common/timeval.h,,
-    [AC_MSG_ERROR([Avahi Common Library not found. Install libavahi-common-dev])])
+  AC_CHECK_HEADERS(avahi-common/timeval.h,
+    [AC_MSG_NOTICE([Avahi Common Library found])], )
     
-  AC_CHECK_LIB([avahi-client],[avahi_entry_group_new],,
-    [AC_MSG_ERROR([Avahi Client Library not found. Install libavahi-client-dev])])
+  AC_CHECK_LIB([avahi-client],[avahi_entry_group_new],
+    [AC_MSG_NOTICE([Avahi Client Library found])], )
     
-  AC_CHECK_LIB([avahi-common],[avahi_free],,
-    [AC_MSG_ERROR([Avahi Client Library not found. Install libavahi-client-dev])])
+  AC_CHECK_LIB([avahi-common],[avahi_free],
+    [AC_MSG_NOTICE([Avahi Client Library found])], )
 ])

sample/pingpong/main.cpp

@@ -7 +7 @@
 using ariba::application::pingpong::PingPong;
 
+#include "ariba/utility/bootstrap/BootstrapManager.h"
+using ariba::utility::BootstrapManager;
+
 int main( int argc, char** argv ) {
+
+
+        StartupWrapper::startSystem();
+        BootstrapManager::instance().registerModule(
+                        BootstrapManager::BootstrapTypeMulticastDns);
+        BootstrapManager::instance().publish("testname", "testinfo");
+        getchar();
+        StartupWrapper::stopSystem();
+        return 0;
+
+
 
         // get config file
@@ -27 +41 @@
         return 0;
 }
-
-/* Chris's debugging stuff
-
-        #include "ariba/utility/bootstrap/BootstrapManager.h"
-        using ariba::utility::BootstrapManager;
-
-        StartupWrapper::startSystem();
-        BootstrapManager::instance().registerModule(
-                        BootstrapManager::BootstrapTypeMulticastDns);
-        BootstrapManager::instance().publish("testname", "testinfo");
-        getchar();
-        return 0;
-*/

source/ariba/communication/BaseCommunication.cpp

@@ -97 +97 @@
                 IPv4Locator* ipv4locator = dynamic_cast<IPv4Locator*>(*i);
 
-                // TODO: which locators are find to bind to?
+                // TODO: which locators can we find to bind to?
                 // localhost is not too bad, works when testing locally
                 // with several instances. the manual override currently

source/ariba/overlay/BaseOverlay.cpp

@@ -696 +696 @@
         /* Handle spovnet instance join requests
          */
-        else if( overlayMsg->isType(OverlayMsg::OverlayMessageTypeJoinRequest) &&
-                                                state == BaseOverlayStateInitiator){
+        else if( overlayMsg->isType(OverlayMsg::OverlayMessageTypeJoinRequest) ){
 
                 logging_debug(
@@ -748 +747 @@
                 return true;
 
-        } // else if( overlayMsg->isType(OverlayMsg::OverlayMessageTypeJoinRequest)
-          //          && state == BaseOverlayStateInitiator)
+        } // else if( overlayMsg->isType(OverlayMsg::OverlayMessageTypeJoinRequest))
 
         /* ************************************************************************