Changeset 4733

Timestamp:

Jul 4, 2009, 5:13:57 PM (15 years ago)

Author:

Christoph Mayer

Message:

-integrated avahi and a bootstrap manager and stuff (still not working, but compiling)

Files:

• configure.ac (modified) (1 diff)
• m4/ax_avahi.m4 (added)
• sample/pingpong/main.cpp (modified) (2 diffs)
• source/ariba/Makefile.am (modified) (1 diff)
• source/ariba/utility/bootstrap (added)
• source/ariba/utility/bootstrap/BootstrapInformationCallback.h (added)
• source/ariba/utility/bootstrap/BootstrapManager.cpp (added)
• source/ariba/utility/bootstrap/BootstrapManager.h (added)
• source/ariba/utility/bootstrap/modules (added)
• source/ariba/utility/bootstrap/modules/BootstrapModule.cpp (added)
• source/ariba/utility/bootstrap/modules/BootstrapModule.h (added)
• source/ariba/utility/bootstrap/modules/multicastdns (added)
• source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.cpp (added)
• source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.h (added)

configure.ac

@@ -34 +34 @@
 AX_LOG4CXX
 AX_OPENSSL
+AX_AVAHI
 
 dnl Check for boost

sample/pingpong/main.cpp

@@ -6 +6 @@
 using ariba::utility::StartupWrapper;
 using ariba::application::pingpong::PingPong;
-
-//*************************************************
-/*
-#include <iostream>
-#include <boost/cstdint.hpp>
-
-using std::cout;
-using std::endl;
-
-void debugging(){
-
-        cout << "int" << " - \t \t" << sizeof(int) << endl;
-        cout << "unsigned int" << " - \t \t" << sizeof(unsigned int) << endl;
-        cout << "long" << " - \t \t" << sizeof(long) << endl;
-        cout << "unsigned long" << " - \t \t" << sizeof(unsigned long) << endl;
-        cout << "char" << " - \t \t" << sizeof(char) << endl;
-        cout << "unsigned char" << " - \t \t" << sizeof(unsigned char) << endl;
-        cout << "short" << " - \t \t" << sizeof(short) << endl;
-        cout << "unsigned short" << " - \t \t" << sizeof(unsigned short) << endl;
-        cout << "uint16_t" << " - \t \t" << sizeof(uint16_t) << endl;
-        cout << "uint8_t" << " - \t \t" << sizeof(uint8_t) << endl;
-        cout << "uint32_t" << " - \t \t" << sizeof(uint32_t) << endl;
-        cout << "int8_t" << " - \t \t" << sizeof(int8_t) << endl;
-        cout << "int16_t" << " - \t \t" << sizeof(int16_t) << endl;
-        cout << "int32_t" << " - \t \t" << sizeof(int32_t) << endl;
-        cout << "boost::uint16_t" << " - \t \t" << sizeof(boost::uint16_t) << endl;
-        cout << "boost::uint8_t" << " - \t \t" << sizeof(boost::uint8_t) << endl;
-        cout << "boost::uint32_t" << " - \t \t" << sizeof(boost::uint32_t) << endl;
-        cout << "boost::int8_t" << " - \t \t" << sizeof(boost::int8_t) << endl;
-        cout << "boost::int16_t" << " - \t \t" << sizeof(boost::int16_t) << endl;
-        cout << "boost::int32_t" << " - \t \t" << sizeof(boost::int32_t) << endl;
-
-}
-*/
-//*************************************************
-
 
 int main( int argc, char** argv ) {
@@ -63 +27 @@
         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/Makefile.am

@@ -327 +327 @@
   utility/serialization.h
 
+#------------> utility :: bootstrap
+
+libariba_la_SOURCES += \
+  utility/bootstrap/BootstrapManager.cpp \
+  utility/bootstrap/modules/BootstrapModule.cpp \
+  utility/bootstrap/modules/multicastdns/MulticastDns.cpp
+  
+nobase_libariba_la_HEADERS += \
+  utility/bootstrap/BootstrapManager.h \
+  utility/bootstrap/BootstrapInformationCallback.h \
+  utility/bootstrap/modules/BootstrapModule.h \
+  utility/bootstrap/modules/multicastdns/MulticastDns.h
+
 #------------> utility :: configuration