Index: source/ariba/utility/bootstrap/modules/CMakeLists.txt =================================================================== --- source/ariba/utility/bootstrap/modules/CMakeLists.txt (revision 10700) +++ source/ariba/utility/bootstrap/modules/CMakeLists.txt (revision 10700) @@ -0,0 +1,47 @@ +# [License] +# The Ariba-Underlay Copyright +# +# Copyright (c) 2008-2012, Institute of Telematics, UniversitÀt Karlsruhe (TH) +# +# Institute of Telematics +# UniversitÀt Karlsruhe (TH) +# Zirkel 2, 76128 Karlsruhe +# Germany +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE INSTITUTE OF TELEMATICS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OF TELEMATICS OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# The views and conclusions contained in the software and documentation +# are those of the authors and should not be interpreted as representing +# official policies, either expressed or implied, of the Institute of +# Telematics. +# [License] + +add_headers(BootstrapModule.h) + +add_sources(BootstrapModule.cpp) + +add_subdir_sources( + bluetoothsdp + multicastdns + periodicbroadcast + ) Index: source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp =================================================================== --- source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp (revision 10688) +++ source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp (revision 10700) @@ -40,5 +40,5 @@ #include "ariba/overlay/OverlayBootstrap.h" -#ifdef HAVE_BLUETOOTH_BLUETOOTH_H +#ifdef HAVE_LIBBLUETOOTH // Attribute descriptors for SDP @@ -58,5 +58,5 @@ const char *service_prov = "ITM Uni Karlsruhe"; -#endif // HAVE_BLUETOOTH_BLUETOOTH_H +#endif // HAVE_LIBBLUETOOTH @@ -64,5 +64,5 @@ 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,10 +75,10 @@ : 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,5 +95,5 @@ bool BluetoothSdp::isFunctional() { -#ifdef HAVE_BLUETOOTH_BLUETOOTH_H +#ifdef HAVE_LIBBLUETOOTH return true; #else @@ -103,5 +103,5 @@ void BluetoothSdp::start() { -#ifdef HAVE_BLUETOOTH_BLUETOOTH_H +#ifdef HAVE_LIBBLUETOOTH /* @@ -112,9 +112,9 @@ 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,10 +129,10 @@ 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,17 +244,17 @@ 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,5 +461,5 @@ } -#endif // HAVE_BLUETOOTH_BLUETOOTH_H +#endif // HAVE_LIBBLUETOOTH }} //namespace ariba, utility Index: source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h =================================================================== --- source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h (revision 10688) +++ source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h (revision 10700) @@ -54,5 +54,5 @@ #include "ariba/utility/logging/Logging.h" -#ifdef HAVE_BLUETOOTH_BLUETOOTH_H +#ifdef HAVE_LIBBLUETOOTH #include #include @@ -94,5 +94,5 @@ private: -#ifdef HAVE_BLUETOOTH_BLUETOOTH_H +#ifdef HAVE_LIBBLUETOOTH void bt_scan(); void sdp_search(bdaddr_t target, string devicename); @@ -104,5 +104,5 @@ bool haveConnections(); -#endif // HAVE_BLUETOOTH_BLUETOOTH_H +#endif // HAVE_LIBBLUETOOTH boost::asio::io_service io_service_; Index: source/ariba/utility/bootstrap/modules/bluetoothsdp/CMakeLists.txt =================================================================== --- source/ariba/utility/bootstrap/modules/bluetoothsdp/CMakeLists.txt (revision 10700) +++ source/ariba/utility/bootstrap/modules/bluetoothsdp/CMakeLists.txt (revision 10700) @@ -0,0 +1,41 @@ +# [License] +# The Ariba-Underlay Copyright +# +# Copyright (c) 2008-2012, Institute of Telematics, UniversitÀt Karlsruhe (TH) +# +# Institute of Telematics +# UniversitÀt Karlsruhe (TH) +# Zirkel 2, 76128 Karlsruhe +# Germany +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE INSTITUTE OF TELEMATICS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OF TELEMATICS OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# The views and conclusions contained in the software and documentation +# are those of the authors and should not be interpreted as representing +# official policies, either expressed or implied, of the Institute of +# Telematics. +# [License] + +add_headers(BluetoothSdp.h) + +add_sources(BluetoothSdp.cpp) Index: source/ariba/utility/bootstrap/modules/multicastdns/CMakeLists.txt =================================================================== --- source/ariba/utility/bootstrap/modules/multicastdns/CMakeLists.txt (revision 10700) +++ source/ariba/utility/bootstrap/modules/multicastdns/CMakeLists.txt (revision 10700) @@ -0,0 +1,41 @@ +# [License] +# The Ariba-Underlay Copyright +# +# Copyright (c) 2008-2012, Institute of Telematics, UniversitÀt Karlsruhe (TH) +# +# Institute of Telematics +# UniversitÀt Karlsruhe (TH) +# Zirkel 2, 76128 Karlsruhe +# Germany +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE INSTITUTE OF TELEMATICS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OF TELEMATICS OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# The views and conclusions contained in the software and documentation +# are those of the authors and should not be interpreted as representing +# official policies, either expressed or implied, of the Institute of +# Telematics. +# [License] + +add_headers(MulticastDns.h) + +add_sources(MulticastDns.cpp) Index: source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.cpp =================================================================== --- source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.cpp (revision 10688) +++ source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.cpp (revision 10700) @@ -48,9 +48,9 @@ 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,5 +67,5 @@ bool MulticastDns::isFunctional(){ - #ifdef HAVE_AVAHI_CLIENT_CLIENT_H + #ifdef HAVE_AVAHI return true; #else @@ -75,5 +75,5 @@ void MulticastDns::start(){ - #ifdef HAVE_AVAHI_CLIENT_CLIENT_H + #ifdef HAVE_AVAHI int error = 0; @@ -119,9 +119,9 @@ 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,9 +155,9 @@ 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,9 +234,9 @@ 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,8 +254,8 @@ 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,5 +440,5 @@ } -#endif // HAVE_AVAHI_CLIENT_CLIENT_H +#endif // HAVE_AVAHI }} //namespace ariba, utility Index: source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.h =================================================================== --- source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.h (revision 10688) +++ source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.h (revision 10700) @@ -42,5 +42,5 @@ #include "ariba/config.h" -#ifdef HAVE_AVAHI_CLIENT_CLIENT_H +#ifdef HAVE_AVAHI #include #include @@ -51,5 +51,5 @@ #include #include -#endif // HAVE_AVAHI_CLIENT_CLIENT_H +#endif // HAVE_AVAHI #include @@ -86,5 +86,5 @@ static const string serviceType; -#ifdef HAVE_AVAHI_CLIENT_CLIENT_H +#ifdef HAVE_AVAHI AvahiClient* avahiclient; @@ -133,5 +133,5 @@ ); -#endif // HAVE_AVAHI_CLIENT_CLIENT_H +#endif // HAVE_AVAHI }; Index: source/ariba/utility/bootstrap/modules/periodicbroadcast/CMakeLists.txt =================================================================== --- source/ariba/utility/bootstrap/modules/periodicbroadcast/CMakeLists.txt (revision 10700) +++ source/ariba/utility/bootstrap/modules/periodicbroadcast/CMakeLists.txt (revision 10700) @@ -0,0 +1,47 @@ +# [License] +# The Ariba-Underlay Copyright +# +# Copyright (c) 2008-2012, Institute of Telematics, UniversitÀt Karlsruhe (TH) +# +# Institute of Telematics +# UniversitÀt Karlsruhe (TH) +# Zirkel 2, 76128 Karlsruhe +# Germany +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE INSTITUTE OF TELEMATICS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OF TELEMATICS OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# The views and conclusions contained in the software and documentation +# are those of the authors and should not be interpreted as representing +# official policies, either expressed or implied, of the Institute of +# Telematics. +# [License] + +add_headers( + PeriodicBroadcast.h + PeriodicBroadcastMessage.h + ) + +add_sources( + PeriodicBroadcast.cpp + PeriodicBroadcastMessage.cpp + )