Changeset 4879

Timestamp:

Jul 13, 2009, 5:41:44 PM (15 years ago)

Author:

Christoph Mayer

Message:

bluetooth zeugs leicht gefixt

Files:

• configure.ac (modified) (1 diff)
• m4/ax_bluetooth.m4 (modified) (1 diff)
• source/ariba/utility/bootstrap/BootstrapManager.cpp (modified) (4 diffs)
• source/ariba/utility/bootstrap/BootstrapManager.h (modified) (1 diff)
• source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp (modified) (9 diffs)
• source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h (modified) (4 diffs)

configure.ac

@@ -34 +34 @@
 AX_LOG4CXX
 AX_OPENSSL
+AX_BLUETOOTH
 AX_AVAHI
 

m4/ax_bluetooth.m4

@@ -9 +9 @@
 # LAST MODIFICATION
 #
-#   2009-0713
+#   2009-07-13
 
 AC_DEFUN([AX_BLUETOOTH],

source/ariba/utility/bootstrap/BootstrapManager.cpp

@@ -41 +41 @@
 #include "ariba/utility/bootstrap/modules/multicastdns/MulticastDns.h"
 #include "ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h"
+#include "ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h"
 
 namespace ariba {
@@ -72 +73 @@
                 module = new PeriodicBroadcast(this);
                 break;
+        case BootstrapTypeBluetoothSdp:
+                module = new BluetoothSdp(this);
+                break;
         }
 
@@ -130 +134 @@
         }
 
+        { // bluetooth sdp
+                        RegistrationResult resone = RegistrationSucceeded;
+                        resone = registerModule(BootstrapTypeBluetoothSdp);
+
+                        if(resone != RegistrationSucceeded)
+                                result = resone;
+                }
+
         { // todo
                 /*  ...   */
@@ -140 +152 @@
         unregisterModule(BootstrapTypeMulticastDns);
         unregisterModule(BootstrapTypePeriodicBroadcast);
+        unregisterModule(BootstrapTypeBluetoothSdp);
         /*  todo  ...  */
 

source/ariba/utility/bootstrap/BootstrapManager.h

@@ -75 +75 @@
                 BootstrapTypeMulticastDns,                      // use mDNS bootstrapping
                 BootstrapTypePeriodicBroadcast,         // stupid periodic broadcasting
+                BootstrapTypeBluetoothSdp,                      // bluetooth service discovery
         };
 

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

@@ -43 +43 @@
 // Attribute descriptors for SDP
 // base was chosen randomly
-#define SDP_SPOVNET_BASE                0x4000
+#define SDP_SPOVNET_BASE                        0x4000
 #define SDP_ATTR_SPOVNET_NAME           0x0000 + SDP_SPOVNET_BASE
 #define SDP_ATTR_SPOVNET_INFO1          0x0001 + SDP_SPOVNET_BASE
@@ -133 +133 @@
          */
 
-        logging_info("Registering SDP service.\n");
+        logging_info("Registering SDP service");
 
         uint8_t rfcomm_channel = channel_;
@@ -239 +239 @@
 
         if (sdp_session_ == 0) {
-                std::cout
-                << "Something is wrong with your SDP server, nothing registered.";
+                logging_error( "Something is wrong with your SDP server, nothing registered" );
         } else {
                 sdp_record_register(sdp_session_, &record, 0);
@@ -260 +259 @@
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
 
-        logging_info("Unregistering SDP service.\n");
+        logging_info("Unregistering SDP service");
         sdp_close(sdp_session_);
 
@@ -276 +275 @@
          */
 
-        logging_info("Scanning for peers.\n");
+        logging_info("Scanning for peers");
 
         inquiry_info *ii = NULL;
@@ -293 +292 @@
         sock = hci_open_dev(dev_id);
         if (dev_id < 0 || sock < 0) {
-                perror("opening socket");
+                logging_error("opening socket");
                 exit(1);
         }
@@ -304 +303 @@
         num_rsp = hci_inquiry(dev_id, len, max_rsp, NULL, &ii, flags);
         if (num_rsp < 0)
-        perror("hci_inquiry");
+                logging_error("hci_inquiry");
 
         for (i = 0; i < num_rsp; i++) {
@@ -324 +323 @@
         close(sock);
 
-        logging_info("Next scan in 20 seconds.\n");
+        logging_info("Next scan in 20 seconds");
 
         scan_timer_.expires_from_now(boost::posix_time::seconds(20));
         scan_timer_.async_wait(boost::bind(&BluetoothSdp::bt_scan, this));
-
-
 }
 
@@ -399 +396 @@
 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
 
-}
-} //namespace ariba, utility
+}} //namespace ariba, utility

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

@@ -53 +53 @@
 
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/sdp_lib.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_lib.h>
+  #include <bluetooth/bluetooth.h>
+  #include <bluetooth/sdp.h>
+  #include <bluetooth/sdp_lib.h>
+  #include <bluetooth/hci.h>
+  #include <bluetooth/hci_lib.h>
 #endif
 
@@ -80 +80 @@
         virtual void revokeService(string name);
 
+private:
+
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
-
-private:
         void bt_scan();
         void sdp_search(bdaddr_t target);
@@ -88 +88 @@
         sdp_session_t *sdp_session_;
         uint8_t channel_;
-
 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
 
@@ -95 +94 @@
         boost::thread t_;
 
-
 };