Index: source/ariba/communication/CMakeLists.txt =================================================================== --- source/ariba/communication/CMakeLists.txt (revision 10700) +++ source/ariba/communication/CMakeLists.txt (revision 10700) @@ -0,0 +1,51 @@ +# [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( + BaseCommunication.h + CommunicationEvents.h + EndpointDescriptor.h + ) + +add_sources( + BaseCommunication.cpp + CommunicationEvents.cpp + EndpointDescriptor.cpp + ) + +add_subdir_sources(messages networkinfo) Index: source/ariba/communication/messages/CMakeLists.txt =================================================================== --- source/ariba/communication/messages/CMakeLists.txt (revision 10700) +++ source/ariba/communication/messages/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(AribaBaseMsg.h) + +add_sources(AribaBaseMsg.cpp) Index: source/ariba/communication/networkinfo/AddressDiscovery.cpp =================================================================== --- source/ariba/communication/networkinfo/AddressDiscovery.cpp (revision 10653) +++ source/ariba/communication/networkinfo/AddressDiscovery.cpp (revision 10700) @@ -49,5 +49,5 @@ #include -#ifdef HAVE_BLUETOOTH_BLUETOOTH_H +#ifdef HAVE_LIBBLUETOOTH #include #include @@ -60,5 +60,5 @@ mac_address AddressDiscovery::getMacFromIF( const char* name ) { mac_address addr; -#ifdef HAVE_BLUETOOTH_BLUETOOTH_H +#ifdef HAVE_LIBBLUETOOTH int s; struct ifreq buffer; @@ -74,5 +74,5 @@ 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,5 +89,5 @@ 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 Index: source/ariba/communication/networkinfo/CMakeLists.txt =================================================================== --- source/ariba/communication/networkinfo/CMakeLists.txt (revision 10700) +++ source/ariba/communication/networkinfo/CMakeLists.txt (revision 10700) @@ -0,0 +1,52 @@ +# [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( + AddressDiscovery.h + NetworkChangeDetection.h + NetworkChangeInterface.h + NetworkInformation.h + NetworkInterface.h + ) + +add_sources( + AddressDiscovery.cpp + NetworkChangeDetection.cpp + NetworkInformation.cpp + NetworkInterface.cpp + ) Index: source/ariba/communication/networkinfo/NetworkInformation.cpp =================================================================== --- source/ariba/communication/networkinfo/NetworkInformation.cpp (revision 10653) +++ source/ariba/communication/networkinfo/NetworkInformation.cpp (revision 10700) @@ -40,5 +40,5 @@ #include "ariba/config.h" -#ifdef HAVE_BLUETOOTH_BLUETOOTH_H +#ifdef HAVE_LIBBLUETOOTH #include #include @@ -211,5 +211,5 @@ // -#ifdef HAVE_BLUETOOTH_BLUETOOTH_H +#ifdef HAVE_LIBBLUETOOTH int btsock = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);