Changeset 4970 for source

Timestamp:

Jul 16, 2009, 9:23:30 AM (15 years ago)

Author:

stud-florian

Message:

Fixed some minor things

Location:

source/ariba/utility/bootstrap/modules/bluetoothsdp

Files:

• BluetoothSdp.cpp (modified) (11 diffs)
• BluetoothSdp.h (modified) (1 diff)

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

@@ -62 +62 @@
 namespace ariba {
 namespace utility {
-use_logging_cpp(BluetoothSdp)
-;
-
-//TODO: figure out this compiler flag stuff
+use_logging_cpp(BluetoothSdp);
 
 BluetoothSdp::BluetoothSdp(BootstrapInformationCallback* _callback) :
@@ -71 +68 @@
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
 
-        // TODO: think about this!
-        channel_ = 7;
-        // TODO: what about the callback?
+        // 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
@@ -149 +146 @@
 
         // prepare the info attribute buffers
-        string namebuf, info1buf, info2buf, info3buf;
+        //string namebuf, info1buf, info2buf, info3buf;
         uint8_t namelen, info1len, info2len, info3len;
 
@@ -162 +159 @@
         }
 
-        // we need to save the string len for sdp
+        // we need to save the string len for sdp; do we?
+        /*
         namebuf = (char)namelen;
         namebuf.append(name);
@@ -171 +169 @@
         info3buf = (char)info3len;
         info3buf.append(info3);
+        */
 
         // set the general service ID
@@ -212 +211 @@
         // add the spovnet attributes
         sdp_attr_add_new(&record, SDP_ATTR_SPOVNET_NAME, SDP_TEXT_STR8,
-                        namebuf.data());
+                        name.data());
 
         sdp_attr_add_new(&record, SDP_ATTR_SPOVNET_INFO1, SDP_TEXT_STR8,
-                        info1buf.data());
+                        info1.data());
 
         sdp_attr_add_new(&record, SDP_ATTR_SPOVNET_INFO2, SDP_TEXT_STR8,
-                        info2buf.data());
+                        info2.data());
 
         sdp_attr_add_new(&record, SDP_ATTR_SPOVNET_INFO3, SDP_TEXT_STR8,
-                        info3buf.data());
+                        info3.data());
 
         // connect to the local SDP server, register the service record,
@@ -271 +270 @@
         int i;
 
-        /*
-         char addr[19] = { 0 };
-         char name[248] = { 0 };
-         */
         bdaddr_t address;
         uint8_t channel;
@@ -306 +301 @@
                 address = (ii + i)->bdaddr;
 
-                logging_info("Peer found.")
+                logging_info("Found peer " << ba2string(&address) << ", querying SDP.")
 
                 // TODO: sdp_search can be very slow, fork it!
@@ -343 +338 @@
 
         if (session == 0) {
-                // TODO: put the remote's address here
-                logging_error("Failed to connect to remote SDP server.");
+                logging_error("Failed to connect to SDP server at " << ba2string(&target) <<".");
                 return;
         }
@@ -382 +376 @@
                                 logging_info("Remote peer info2 is: " << info2);
                                 logging_info("Remote peer info3 is: " << info3);
-                                //TODO: callback here + extract info's and stuff
+
+                                // Callback
+                                callback->onBootstrapServiceFound(name, info1, info2, info3);
+
                         }
                         sdp_record_free(rec);
@@ -394 +391 @@
 }
 
+string BluetoothSdp::ba2string(bdaddr_t *ba) {
+        /*
+         * Returns a string holding the bt adress in human readable form.
+         */
+        char *str;
+        ba2str(ba, str);
+        string result = str;
+        return result;
+}
+
 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
 

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

@@ -85 +85 @@
         void bt_scan();
         void sdp_search(bdaddr_t target);
+        string ba2string(bdaddr_t *ba);
 
         sdp_session_t *sdp_session_;