Changeset 10700 for source

Timestamp:

Aug 22, 2012, 2:09:00 PM (12 years ago)

Author:

Michael Tänzer

Message:

Merge CMake branch into trunk

Location:

source

Files:

• . (modified) (1 prop)
• CMakeLists.txt (added)
• Makefile.am (deleted)
• ariba (modified) (1 prop)
• ariba/CMakeLists.txt (added)
• ariba/Makefile.am (deleted)
• ariba/communication (modified) (1 prop)
• ariba/communication/CMakeLists.txt (added)
• ariba/communication/messages (modified) (1 prop)
• ariba/communication/messages/CMakeLists.txt (added)
• ariba/communication/networkinfo (modified) (1 prop)
• ariba/communication/networkinfo/AddressDiscovery.cpp (modified) (4 diffs)
• ariba/communication/networkinfo/CMakeLists.txt (added)
• ariba/communication/networkinfo/NetworkInformation.cpp (modified) (2 diffs)
• ariba/config.h.in (added)
• ariba/overlay (modified) (1 prop)
• ariba/overlay/CMakeLists.txt (added)
• ariba/overlay/messages (modified) (1 prop)
• ariba/overlay/messages/CMakeLists.txt (added)
• ariba/overlay/modules (modified) (1 prop)
• ariba/overlay/modules/CMakeLists.txt (added)
• ariba/overlay/modules/chord (modified) (1 prop)
• ariba/overlay/modules/chord/CMakeLists.txt (added)
• ariba/overlay/modules/chord/detail/CMakeLists.txt (added)
• ariba/overlay/modules/chord/messages (modified) (1 prop)
• ariba/overlay/modules/chord/messages/CMakeLists.txt (added)
• ariba/overlay/modules/onehop (modified) (1 prop)
• ariba/overlay/modules/onehop/CMakeLists.txt (added)
• ariba/overlay/modules/onehop/messages (modified) (1 prop)
• ariba/overlay/modules/onehop/messages/CMakeLists.txt (added)
• ariba/utility (modified) (1 prop)
• ariba/utility/CMakeLists.txt (added)
• ariba/utility/addressing (modified) (1 prop)
• ariba/utility/addressing/CMakeLists.txt (added)
• ariba/utility/addressing/detail/CMakeLists.txt (added)
• ariba/utility/addressing/facades/CMakeLists.txt (added)
• ariba/utility/bootstrap/CMakeLists.txt (added)
• ariba/utility/bootstrap/modules/CMakeLists.txt (added)
• ariba/utility/bootstrap/modules/bluetoothsdp (modified) (1 prop)
• ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp (modified) (10 diffs)
• ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h (modified) (3 diffs)
• ariba/utility/bootstrap/modules/bluetoothsdp/CMakeLists.txt (added)
• ariba/utility/bootstrap/modules/multicastdns/CMakeLists.txt (added)
• ariba/utility/bootstrap/modules/multicastdns/MulticastDns.cpp (modified) (8 diffs)
• ariba/utility/bootstrap/modules/multicastdns/MulticastDns.h (modified) (4 diffs)
• ariba/utility/bootstrap/modules/periodicbroadcast (modified) (1 prop)
• ariba/utility/bootstrap/modules/periodicbroadcast/CMakeLists.txt (added)
• ariba/utility/configuration (modified) (1 prop)
• ariba/utility/configuration/CMakeLists.txt (added)
• ariba/utility/internal (modified) (1 prop)
• ariba/utility/internal/CMakeLists.txt (added)
• ariba/utility/logging (modified) (1 prop)
• ariba/utility/logging/CMakeLists.txt (added)
• ariba/utility/logging/Logging.h (modified) (4 diffs)
• ariba/utility/measurement (modified) (1 prop)
• ariba/utility/measurement/CMakeLists.txt (added)
• ariba/utility/messages (modified) (1 prop)
• ariba/utility/messages/CMakeLists.txt (added)
• ariba/utility/misc (modified) (1 prop)
• ariba/utility/misc/CMakeLists.txt (added)
• ariba/utility/serialization (modified) (1 prop)
• ariba/utility/serialization/CMakeLists.txt (added)
• ariba/utility/system (modified) (1 prop)
• ariba/utility/system/CMakeLists.txt (added)
• ariba/utility/system/StartupWrapper.cpp (modified) (2 diffs)
• ariba/utility/transport (modified) (1 prop)
• ariba/utility/transport/CMakeLists.txt (added)
• ariba/utility/transport/asio/CMakeLists.txt (added)
• ariba/utility/transport/messages/CMakeLists.txt (added)
• ariba/utility/transport/messages/shared_buffer.hpp (modified) (1 diff)
• ariba/utility/transport/rfcomm/CMakeLists.txt (added)
• ariba/utility/transport/rfcomm/bluetooth_endpoint.hpp (modified) (1 diff)
• ariba/utility/transport/rfcomm/bluetooth_rfcomm.hpp (modified) (2 diffs)
• ariba/utility/transport/tcpip/CMakeLists.txt (added)
• ariba/utility/transport/transport_peer.cpp (modified) (1 diff)
• ariba/utility/transport/transport_peer.hpp (modified) (2 diffs)
• ariba/utility/types (modified) (1 prop)
• ariba/utility/types/CMakeLists.txt (added)
• ariba/utility/visual/CMakeLists.txt (added)
• ariba/utility/vtypes (modified) (1 prop)
• ariba/utility/vtypes/CMakeLists.txt (added)
• ariba/utility/vtypes/detail (modified) (1 prop)
• ariba/utility/vtypes/detail/CMakeLists.txt (added)
• services (modified) (1 prop)
• services/CMakeLists.txt (added)
• services/Makefile.am (deleted)
• services/ariba_dht (added)
• services/ariba_dht/CMakeLists.txt (added)
• services/ariba_dht/Dht.cpp (added)
• services/ariba_dht/Dht.h (added)
• services/ariba_dht/DhtAnswerInterface.h (added)
• services/ariba_dht/messages (added)
• services/ariba_dht/messages/DhtMessage.cpp (added)
• services/ariba_dht/messages/DhtMessage.h (added)
• services/dht (deleted)

source/ariba/communication/networkinfo/AddressDiscovery.cpp

@@ -49 +49 @@
 #include <ifaddrs.h>
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
   #include <bluetooth/bluetooth.h>
   #include <bluetooth/hci.h>
@@ -60 +60 @@
 mac_address AddressDiscovery::getMacFromIF( const char* name ) {
         mac_address addr;
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
         int s;
         struct ifreq buffer;
@@ -74 +74 @@
 
 int AddressDiscovery::dev_info(int s, int dev_id, long arg) {
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
         endpoint_set* set = (endpoint_set*)arg;
         struct hci_dev_info di;
@@ -89 +89 @@
 
 void AddressDiscovery::discover_bluetooth( endpoint_set& endpoints ) {
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
         hci_for_each_dev(HCI_UP, &AddressDiscovery::dev_info, (long)&endpoints );
 #endif

source/ariba/communication/networkinfo/NetworkInformation.cpp

@@ -40 +40 @@
 #include "ariba/config.h"
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
   #include <bluetooth/bluetooth.h>
   #include <bluetooth/hci.h>
@@ -211 +211 @@
         //
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
 
         int btsock = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);

source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp

@@ -40 +40 @@
 #include "ariba/overlay/OverlayBootstrap.h"
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
 
 // Attribute descriptors for SDP
@@ -58 +58 @@
 const char *service_prov = "ITM Uni Karlsruhe";
 
-#endif // HAVE_BLUETOOTH_BLUETOOTH_H
+#endif // HAVE_LIBBLUETOOTH
 
 
@@ -64 +64 @@
 namespace utility {
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
 static bdaddr_t bd_addr_any = {{0, 0, 0, 0, 0, 0}};
 static bdaddr_t bd_addr_local = {{0, 0, 0, 0xff, 0xff, 0xff}};
@@ -75 +75 @@
         : BootstrapModule(_callback), scan_timer_(io_service_) {
         srand( time(NULL) );
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
 
         // This can be ignored, as the channel we really be saved in one
         // of the info strings (as an attribute)
         channel_ = 1;
-#endif // HAVE_BLUETOOTH_BLUETOOTH_H
+#endif // HAVE_LIBBLUETOOTH
 }
 
@@ -95 +95 @@
 
 bool BluetoothSdp::isFunctional() {
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
         return true;
 #else
@@ -103 +103 @@
 
 void BluetoothSdp::start() {
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
 
         /*
@@ -112 +112 @@
         t_ = boost::thread(boost::bind(&boost::asio::io_service::run, &io_service_));
 
-#endif // HAVE_BLUETOOTH_BLUETOOTH_H
+#endif // HAVE_LIBBLUETOOTH
 }
 
 void BluetoothSdp::stop() {
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
 
         /*
@@ -129 +129 @@
                 sdp_close(sdp_session_);
 
-#endif // HAVE_BLUETOOTH_BLUETOOTH_H
+#endif // HAVE_LIBBLUETOOTH
 }
 
 void BluetoothSdp::publishService(string name, string info1, string info2,
                 string info3) {
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
 
         /*
@@ -244 +244 @@
         sdp_list_free(profile_list, 0);
 
-#endif // HAVE_BLUETOOTH_BLUETOOTH_H
+#endif // HAVE_LIBBLUETOOTH
 }
 
 void BluetoothSdp::revokeService(string name) {
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
 
         logging_debug("unregistering SDP service");
         sdp_close(sdp_session_);
 
-#endif // HAVE_BLUETOOTH_BLUETOOTH_H
-}
-
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#endif // HAVE_LIBBLUETOOTH
+}
+
+#ifdef HAVE_LIBBLUETOOTH
 
 void BluetoothSdp::bt_scan() {
@@ -461 +461 @@
 }
 
-#endif // HAVE_BLUETOOTH_BLUETOOTH_H
+#endif // HAVE_LIBBLUETOOTH
 
 }} //namespace ariba, utility

source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h

@@ -54 +54 @@
 #include "ariba/utility/logging/Logging.h"
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
   #include <bluetooth/bluetooth.h>
   #include <bluetooth/sdp.h>
@@ -94 +94 @@
 private:
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
         void bt_scan();
         void sdp_search(bdaddr_t target, string devicename);
@@ -104 +104 @@
 
         bool haveConnections();
-#endif // HAVE_BLUETOOTH_BLUETOOTH_H
+#endif // HAVE_LIBBLUETOOTH
 
         boost::asio::io_service io_service_;

source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.cpp

@@ -48 +48 @@
 MulticastDns::MulticastDns(BootstrapInformationCallback* _callback, string info)
         : BootstrapModule(_callback) {
-  #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
+  #ifdef HAVE_AVAHI
         avahiclient = NULL;
         avahipoll = NULL;
         avahibrowser = NULL;
-  #endif // HAVE_AVAHI_CLIENT_CLIENT_H
+  #endif // HAVE_AVAHI
 }
 
@@ -67 +67 @@
 
 bool MulticastDns::isFunctional(){
-  #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
+  #ifdef HAVE_AVAHI
         return true;
   #else
@@ -75 +75 @@
 
 void MulticastDns::start(){
-  #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
+  #ifdef HAVE_AVAHI
 
         int error = 0;
@@ -119 +119 @@
         avahi_threaded_poll_start( avahipoll );
 
-  #endif // HAVE_AVAHI_CLIENT_CLIENT_H
+  #endif // HAVE_AVAHI
 }
 
 void MulticastDns::stop(){
-  #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
+  #ifdef HAVE_AVAHI
 
         //
@@ -155 +155 @@
         avahipoll = NULL;
 
-  #endif // HAVE_AVAHI_CLIENT_CLIENT_H
+  #endif // HAVE_AVAHI
 }
 
 void MulticastDns::publishService(string name, string info1, string info2, string info3){
-  #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
+  #ifdef HAVE_AVAHI
 
         if(name.length() > 63){
@@ -234 +234 @@
         avahi_threaded_poll_unlock(avahipoll);
 
-  #endif // HAVE_AVAHI_CLIENT_CLIENT_H
+  #endif // HAVE_AVAHI
 }
 
 void MulticastDns::revokeService(string name){
-  #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
+  #ifdef HAVE_AVAHI
 
         avahi_threaded_poll_lock(avahipoll);
@@ -254 +254 @@
         avahi_threaded_poll_unlock(avahipoll);
 
-  #endif // HAVE_AVAHI_CLIENT_CLIENT_H
-}
-
-#ifdef HAVE_AVAHI_CLIENT_CLIENT_H
+  #endif // HAVE_AVAHI
+}
+
+#ifdef HAVE_AVAHI
 
 void MulticastDns::client_callback(AvahiClient* client, AvahiClientState state, void* userdata){
@@ -440 +440 @@
 }
 
-#endif // HAVE_AVAHI_CLIENT_CLIENT_H
+#endif // HAVE_AVAHI
 
 }} //namespace ariba, utility

source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.h

@@ -42 +42 @@
 #include "ariba/config.h"
 
-#ifdef HAVE_AVAHI_CLIENT_CLIENT_H
+#ifdef HAVE_AVAHI
   #include <avahi-client/client.h>
   #include <avahi-client/lookup.h>
@@ -51 +51 @@
   #include <avahi-common/error.h>
   #include <avahi-common/timeval.h>
-#endif // HAVE_AVAHI_CLIENT_CLIENT_H
+#endif // HAVE_AVAHI
 
 #include <iostream>
@@ -86 +86 @@
         static const string serviceType;
 
-#ifdef HAVE_AVAHI_CLIENT_CLIENT_H
+#ifdef HAVE_AVAHI
 
         AvahiClient*         avahiclient;
@@ -133 +133 @@
                         );
 
-#endif // HAVE_AVAHI_CLIENT_CLIENT_H
+#endif // HAVE_AVAHI
 
 };

source/ariba/utility/logging/Logging.h

@@ -44 +44 @@
 #include "ariba/config.h"
 
-#ifdef HAVE_LOG4CXX_LOGGER_H
+#ifdef HAVE_LOG4CXX
         #include <log4cxx/logger.h>
         #include <log4cxx/basicconfigurator.h>
-#endif // HAVE_LOG4CXX_LOGGER_H
+#endif // HAVE_LOG4CXX
 
 #ifdef LOGCOLORS
@@ -64 +64 @@
 
 
-#ifdef HAVE_LOG4CXX_LOGGER_H
+#ifdef HAVE_LOG4CXX
 
   #define use_logging_h(x) \
@@ -89 +89 @@
   #define logging_classlevel_error(x) {log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger(#x)); if(logger != NULL) logger->setLevel(log4cxx::Level::getError()); }
 
-#else // HAVE_LOG4CXX_LOGGER_H
+#else // HAVE_LOG4CXX
 
   #define use_logging_h(x)
@@ -115 +115 @@
   #define logging_classlevel_error(x) {std::cout << "individual class logging only available with log4cxx library" << std::endl;}
 
-#endif // HAVE_LOG4CXX_LOGGER_H
+#endif // HAVE_LOG4CXX
 
 #endif //LOGGING_H__

source/ariba/utility/system/StartupWrapper.cpp

@@ -40 +40 @@
 #include "ariba/config.h"
 
-#ifdef HAVE_LOG4CXX_LOGGER_H
+#ifdef HAVE_LOG4CXX
         #include <log4cxx/logger.h>
         #include <log4cxx/basicconfigurator.h>
-#endif // HAVE_LOG4CXX_LOGGER_H
+#endif // HAVE_LOG4CXX
 
 namespace ariba {
@@ -97 +97 @@
         //
 
-#ifdef HAVE_LOG4CXX_LOGGER_H
+#ifdef HAVE_LOG4CXX
         log4cxx::BasicConfigurator::configure();
-#endif //HAVE_LOG4CXX_LOGGER_H
+#endif //HAVE_LOG4CXX
 
         //

source/ariba/utility/transport/messages/shared_buffer.hpp

@@ -11 +11 @@
 #include <boost/shared_ptr.hpp>
 
+#include "ariba/config.h"
 #ifdef DEBUG
 #include <boost/thread/mutex.hpp>

source/ariba/utility/transport/rfcomm/bluetooth_endpoint.hpp

@@ -192 +192 @@
 }}} // namespace boost::asio::bluetooth
 
+#endif /* BOOST_ASIO_BLUETOOTH_BLUETOOTH_ENDPOINT_HPP__ */
 #endif /* HAVE_LIBBLUETOOTH */
-#endif /* BOOST_ASIO_BLUETOOTH_BLUETOOTH_ENDPOINT_HPP__ */

source/ariba/utility/transport/rfcomm/bluetooth_rfcomm.hpp

@@ +1 @@
+#include "ariba/config.h"
+
+#ifdef HAVE_LIBBLUETOOTH
+
 #ifndef BOOST_ASIO_BLUETOOTH_RFCOMM_HPP__
 #define BOOST_ASIO_BLUETOOTH_RFCOMM_HPP__
@@ -53 +57 @@
 
 #endif /* BOOST_ASIO_BLUETOOTH_RFCOMM_HPP__ */
+#endif /* HAVE_LIBBLUETOOTH */

source/ariba/utility/transport/transport_peer.cpp

@@ -3 +3 @@
 #include "transport_peer.hpp"
 #include "transport.hpp"
-#include "ariba/utility/logging/Logging.h"
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/error.hpp>

source/ariba/utility/transport/transport_peer.hpp

@@ -3 +3 @@
 
 #include "ariba/config.h"
+#include "ariba/utility/logging/Logging.h"
 #include "transport_protocol.hpp"
 #include "ariba/utility/addressing/endpoint_set.hpp"
@@ -29 +30 @@
 /// protocols and can send messages to an entire set of endpoints
 class transport_peer : public transport_protocol {
+        use_logging_h(transport_peer);
 public:
         transport_peer( endpoint_set& local_set );