Changeset 7041 for source/ariba/utility/transport

Timestamp:

Dec 8, 2009, 6:18:58 PM (15 years ago)

Author:

mies

Message:

added bluetooth check

Location:

source/ariba/utility/transport

Files:

• asio/bluetooth_endpoint.hpp (modified) (2 diffs)
• rfcomm/rfcomm.cpp (modified) (2 diffs)
• rfcomm/rfcomm.hpp (modified) (2 diffs)
• transport_peer.cpp (modified) (6 diffs)
• transport_peer.hpp (modified) (3 diffs)

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

@@ +1 @@
+#include<config.h>
+
+#ifdef HAVE_LIBBLUETOOTH
+
 #ifndef BOOST_ASIO_BLUETOOTH_BLUETOOTH_ENDPOINT_HPP__
 #define BOOST_ASIO_BLUETOOTH_BLUETOOTH_ENDPOINT_HPP__
@@ -180 +184 @@
 
 #endif
+#endif

source/ariba/utility/transport/rfcomm/rfcomm.cpp

@@ +1 @@
+#include<config.h>
+
+#ifdef HAVE_LIBBLUETOOTH
+
 #include "rfcomm.hpp"
 
@@ -432 +436 @@
 
 }} // namespace ariba::transport
+
+#endif

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

@@ +1 @@
+#include<config.h>
+
+#ifdef HAVE_LIBBLUETOOTH
+
 #ifndef RFCOMM_HPP_
 #define RFCOMM_HPP_
@@ -72 +76 @@
 
 #endif /* RFCOMM_HPP_ */
+#endif

source/ariba/utility/transport/transport_peer.cpp

@@ -1 +1 @@
 
+#include<config.h>
 #include "transport_peer.hpp"
 #include "transport.hpp"
@@ -17 +18 @@
                 cout << "Started tcpip_transport on port "  << local.tcp.begin()->value() << endl;
         }
+
+        #ifdef HAVE_LIBBLUETOOTH
         // setup rfcomm transports
         rfc = NULL;
@@ -24 +27 @@
                 cout << "Started rfcomm_transport on port "  << local.rfcomm.begin()->value() << endl;
         }
+        #endif
 }
 
 transport_peer::~transport_peer() {
         if (tcp !=NULL ) delete tcp;
+#ifdef HAVE_LIBBLUETOOTH
         if (rfc !=NULL ) delete rfc;
+#endif
 }
 
 void transport_peer::start() {
         if (tcp!=NULL) tcp->start();
+#ifdef HAVE_LIBBLUETOOTH
         if (rfc!=NULL) rfc->start();
+#endif
 }
 
 void transport_peer::stop() {
         if (tcp!=NULL) tcp->stop();
+#ifdef HAVE_LIBBLUETOOTH
         if (rfc!=NULL) rfc->stop();
+#endif
 }
 
@@ -45 +55 @@
                 tcp->send(remote,data,size);
         } else
+#ifdef HAVE_LIBBLUETOOTH
         if (remote->instanceof<rfcomm_endpoint>() && rfc!=NULL) {
                 rfc->send(remote,data,size);
         } else
+#endif
                 cerr << "Could not send message to " << remote->to_string() << endl;
 }
@@ -53 +65 @@
 void transport_peer::send( const endpoint_set& endpoints, const uint8_t* data, size_t size ) {
         if (tcp!=NULL) tcp->send(endpoints,data,size);
+#ifdef HAVE_LIBBLUETOOTH
         if (rfc!=NULL) rfc->send(endpoints,data,size);
+#endif
 }
 
@@ -59 +73 @@
         if (remote->instanceof<tcpip_endpoint>() && tcp!=NULL)
                 tcp->terminate(remote);
+#ifdef HAVE_LIBBLUETOOTH
         if (remote->instanceof<rfcomm_endpoint>() && rfc!=NULL)
                 rfc->terminate(remote);
+#endif
 }
 
 void transport_peer::register_listener( transport_listener* listener ) {
         if (tcp!=NULL) tcp->register_listener(listener);
+#ifdef HAVE_LIBBLUETOOTH
         if (rfc!=NULL) rfc->register_listener(listener);
+#endif
 }
 

source/ariba/utility/transport/transport_peer.hpp

@@ -2 +2 @@
 #define TRANSPORT_PEER_HPP_
 
+#include<config.h>
 #include "transport_protocol.hpp"
 #include "ariba/utility/addressing/endpoint_set.hpp"
@@ -12 +13 @@
 
 class tcpip;
+#ifdef HAVE_LIBBLUETOOTH
 class rfcomm;
+#endif
 
 /**
@@ -35 +38 @@
         endpoint_set&  local;
         tcpip* tcp;
+#ifdef HAVE_LIBBLUETOOTH
         rfcomm* rfc;
+#endif
 };