An Overlay-based
Virtual Network Substrate
SpoVNet

Changeset 10700 for source/ariba


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:
39 added
1 deleted
41 edited

Legend:

Unmodified
Added
Removed
  • source

    • Property svn:ignore deleted
  • source/ariba

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

    • Property svn:ignore deleted
  • source/ariba/communication/messages

    • Property svn:ignore deleted
  • source/ariba/communication/networkinfo

    • Property svn:ignore deleted
  • source/ariba/communication/networkinfo/AddressDiscovery.cpp

    r10653 r10700  
    4949#include <ifaddrs.h>
    5050
    51 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     51#ifdef HAVE_LIBBLUETOOTH
    5252  #include <bluetooth/bluetooth.h>
    5353  #include <bluetooth/hci.h>
     
    6060mac_address AddressDiscovery::getMacFromIF( const char* name ) {
    6161        mac_address addr;
    62 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     62#ifdef HAVE_LIBBLUETOOTH
    6363        int s;
    6464        struct ifreq buffer;
     
    7474
    7575int AddressDiscovery::dev_info(int s, int dev_id, long arg) {
    76 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     76#ifdef HAVE_LIBBLUETOOTH
    7777        endpoint_set* set = (endpoint_set*)arg;
    7878        struct hci_dev_info di;
     
    8989
    9090void AddressDiscovery::discover_bluetooth( endpoint_set& endpoints ) {
    91 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     91#ifdef HAVE_LIBBLUETOOTH
    9292        hci_for_each_dev(HCI_UP, &AddressDiscovery::dev_info, (long)&endpoints );
    9393#endif
  • source/ariba/communication/networkinfo/NetworkInformation.cpp

    r5860 r10700  
    4040#include "ariba/config.h"
    4141
    42 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     42#ifdef HAVE_LIBBLUETOOTH
    4343  #include <bluetooth/bluetooth.h>
    4444  #include <bluetooth/hci.h>
     
    211211        //
    212212
    213 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     213#ifdef HAVE_LIBBLUETOOTH
    214214
    215215        int btsock = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
  • source/ariba/overlay

    • Property svn:ignore deleted
  • source/ariba/overlay/messages

    • Property svn:ignore deleted
  • source/ariba/overlay/modules

    • Property svn:ignore deleted
  • source/ariba/overlay/modules/chord

    • Property svn:ignore deleted
  • source/ariba/overlay/modules/chord/messages

    • Property svn:ignore deleted
  • source/ariba/overlay/modules/onehop

    • Property svn:ignore deleted
  • source/ariba/overlay/modules/onehop/messages

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

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

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • source/ariba/utility/bootstrap/modules/bluetoothsdp

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp

    r7532 r10700  
    4040#include "ariba/overlay/OverlayBootstrap.h"
    4141
    42 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     42#ifdef HAVE_LIBBLUETOOTH
    4343
    4444// Attribute descriptors for SDP
     
    5858const char *service_prov = "ITM Uni Karlsruhe";
    5959
    60 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
     60#endif // HAVE_LIBBLUETOOTH
    6161
    6262
     
    6464namespace utility {
    6565
    66 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     66#ifdef HAVE_LIBBLUETOOTH
    6767static bdaddr_t bd_addr_any = {{0, 0, 0, 0, 0, 0}};
    6868static bdaddr_t bd_addr_local = {{0, 0, 0, 0xff, 0xff, 0xff}};
     
    7575        : BootstrapModule(_callback), scan_timer_(io_service_) {
    7676        srand( time(NULL) );
    77 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     77#ifdef HAVE_LIBBLUETOOTH
    7878
    7979        // This can be ignored, as the channel we really be saved in one
    8080        // of the info strings (as an attribute)
    8181        channel_ = 1;
    82 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
     82#endif // HAVE_LIBBLUETOOTH
    8383}
    8484
     
    9595
    9696bool BluetoothSdp::isFunctional() {
    97 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     97#ifdef HAVE_LIBBLUETOOTH
    9898        return true;
    9999#else
     
    103103
    104104void BluetoothSdp::start() {
    105 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     105#ifdef HAVE_LIBBLUETOOTH
    106106
    107107        /*
     
    112112        t_ = boost::thread(boost::bind(&boost::asio::io_service::run, &io_service_));
    113113
    114 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
     114#endif // HAVE_LIBBLUETOOTH
    115115}
    116116
    117117void BluetoothSdp::stop() {
    118 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     118#ifdef HAVE_LIBBLUETOOTH
    119119
    120120        /*
     
    129129                sdp_close(sdp_session_);
    130130
    131 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
     131#endif // HAVE_LIBBLUETOOTH
    132132}
    133133
    134134void BluetoothSdp::publishService(string name, string info1, string info2,
    135135                string info3) {
    136 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     136#ifdef HAVE_LIBBLUETOOTH
    137137
    138138        /*
     
    244244        sdp_list_free(profile_list, 0);
    245245
    246 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
     246#endif // HAVE_LIBBLUETOOTH
    247247}
    248248
    249249void BluetoothSdp::revokeService(string name) {
    250 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     250#ifdef HAVE_LIBBLUETOOTH
    251251
    252252        logging_debug("unregistering SDP service");
    253253        sdp_close(sdp_session_);
    254254
    255 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
    256 }
    257 
    258 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     255#endif // HAVE_LIBBLUETOOTH
     256}
     257
     258#ifdef HAVE_LIBBLUETOOTH
    259259
    260260void BluetoothSdp::bt_scan() {
     
    461461}
    462462
    463 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
     463#endif // HAVE_LIBBLUETOOTH
    464464
    465465}} //namespace ariba, utility
  • source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h

    r7532 r10700  
    5454#include "ariba/utility/logging/Logging.h"
    5555
    56 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     56#ifdef HAVE_LIBBLUETOOTH
    5757  #include <bluetooth/bluetooth.h>
    5858  #include <bluetooth/sdp.h>
     
    9494private:
    9595
    96 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     96#ifdef HAVE_LIBBLUETOOTH
    9797        void bt_scan();
    9898        void sdp_search(bdaddr_t target, string devicename);
     
    104104
    105105        bool haveConnections();
    106 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
     106#endif // HAVE_LIBBLUETOOTH
    107107
    108108        boost::asio::io_service io_service_;
  • 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
  • source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.h

    r7532 r10700  
    4242#include "ariba/config.h"
    4343
    44 #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
     44#ifdef HAVE_AVAHI
    4545  #include <avahi-client/client.h>
    4646  #include <avahi-client/lookup.h>
     
    5151  #include <avahi-common/error.h>
    5252  #include <avahi-common/timeval.h>
    53 #endif // HAVE_AVAHI_CLIENT_CLIENT_H
     53#endif // HAVE_AVAHI
    5454
    5555#include <iostream>
     
    8686        static const string serviceType;
    8787
    88 #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
     88#ifdef HAVE_AVAHI
    8989
    9090        AvahiClient*         avahiclient;
     
    133133                        );
    134134
    135 #endif // HAVE_AVAHI_CLIENT_CLIENT_H
     135#endif // HAVE_AVAHI
    136136
    137137};
  • source/ariba/utility/bootstrap/modules/periodicbroadcast

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • source/ariba/utility/configuration

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

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

    • Property svn:ignore deleted
  • source/ariba/utility/logging/Logging.h

    r9894 r10700  
    4444#include "ariba/config.h"
    4545
    46 #ifdef HAVE_LOG4CXX_LOGGER_H
     46#ifdef HAVE_LOG4CXX
    4747        #include <log4cxx/logger.h>
    4848        #include <log4cxx/basicconfigurator.h>
    49 #endif // HAVE_LOG4CXX_LOGGER_H
     49#endif // HAVE_LOG4CXX
    5050
    5151#ifdef LOGCOLORS
     
    6464
    6565
    66 #ifdef HAVE_LOG4CXX_LOGGER_H
     66#ifdef HAVE_LOG4CXX
    6767
    6868  #define use_logging_h(x) \
     
    8989  #define logging_classlevel_error(x) {log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger(#x)); if(logger != NULL) logger->setLevel(log4cxx::Level::getError()); }
    9090
    91 #else // HAVE_LOG4CXX_LOGGER_H
     91#else // HAVE_LOG4CXX
    9292
    9393  #define use_logging_h(x)
     
    115115  #define logging_classlevel_error(x) {std::cout << "individual class logging only available with log4cxx library" << std::endl;}
    116116
    117 #endif // HAVE_LOG4CXX_LOGGER_H
     117#endif // HAVE_LOG4CXX
    118118
    119119#endif //LOGGING_H__
  • source/ariba/utility/measurement

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

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

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

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

    • Property svn:ignore deleted
  • source/ariba/utility/system/StartupWrapper.cpp

    r9737 r10700  
    4040#include "ariba/config.h"
    4141
    42 #ifdef HAVE_LOG4CXX_LOGGER_H
     42#ifdef HAVE_LOG4CXX
    4343        #include <log4cxx/logger.h>
    4444        #include <log4cxx/basicconfigurator.h>
    45 #endif // HAVE_LOG4CXX_LOGGER_H
     45#endif // HAVE_LOG4CXX
    4646
    4747namespace ariba {
     
    9797        //
    9898
    99 #ifdef HAVE_LOG4CXX_LOGGER_H
     99#ifdef HAVE_LOG4CXX
    100100        log4cxx::BasicConfigurator::configure();
    101 #endif //HAVE_LOG4CXX_LOGGER_H
     101#endif //HAVE_LOG4CXX
    102102
    103103        //
  • source/ariba/utility/transport

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • source/ariba/utility/transport/messages/shared_buffer.hpp

    r10653 r10700  
    1111#include <boost/shared_ptr.hpp>
    1212
     13#include "ariba/config.h"
    1314#ifdef DEBUG
    1415#include <boost/thread/mutex.hpp>
  • source/ariba/utility/transport/rfcomm/bluetooth_endpoint.hpp

    r10653 r10700  
    192192}}} // namespace boost::asio::bluetooth
    193193
     194#endif /* BOOST_ASIO_BLUETOOTH_BLUETOOTH_ENDPOINT_HPP__ */
    194195#endif /* HAVE_LIBBLUETOOTH */
    195 #endif /* BOOST_ASIO_BLUETOOTH_BLUETOOTH_ENDPOINT_HPP__ */
  • source/ariba/utility/transport/rfcomm/bluetooth_rfcomm.hpp

    r10653 r10700  
     1#include "ariba/config.h"
     2
     3#ifdef HAVE_LIBBLUETOOTH
     4
    15#ifndef BOOST_ASIO_BLUETOOTH_RFCOMM_HPP__
    26#define BOOST_ASIO_BLUETOOTH_RFCOMM_HPP__
     
    5357
    5458#endif /* BOOST_ASIO_BLUETOOTH_RFCOMM_HPP__ */
     59#endif /* HAVE_LIBBLUETOOTH */
  • source/ariba/utility/transport/transport_peer.cpp

    r10653 r10700  
    33#include "transport_peer.hpp"
    44#include "transport.hpp"
    5 #include "ariba/utility/logging/Logging.h"
    65#include <boost/asio/ip/tcp.hpp>
    76#include <boost/asio/error.hpp>
  • source/ariba/utility/transport/transport_peer.hpp

    r10653 r10700  
    33
    44#include "ariba/config.h"
     5#include "ariba/utility/logging/Logging.h"
    56#include "transport_protocol.hpp"
    67#include "ariba/utility/addressing/endpoint_set.hpp"
     
    2930/// protocols and can send messages to an entire set of endpoints
    3031class transport_peer : public transport_protocol {
     32        use_logging_h(transport_peer);
    3133public:
    3234        transport_peer( endpoint_set& local_set );
  • source/ariba/utility/types

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

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

    • Property svn:ignore deleted
Note: See TracChangeset for help on using the changeset viewer.