Changeset 162

Timestamp:

06/07/07 14:34:42 (18 months ago)

Author:

zany

Message:

adding src to browse bt

Location:

trunk/obexftp

Files:

• bt_discovery.c (modified) (5 diffs)
• client.h (modified) (1 diff)

trunk/obexftp/bt_discovery.c

@@ -14 +14 @@
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
-
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
@@ -30 +29 @@
 static const uint8_t svc_uuid_pcsuite[] = SVC_UUID_PCSUITE;
 
-char **obexftp_discover_bt()
+char **obexftp_discover_bt_src(const char *src)
 {
         char **res;
@@ -42 +41 @@
   int dd, i;
 
-  dev_id = hci_get_route(NULL);
-  /* dev_id = hci_devid( "01:23:45:67:89:AB" ); */
+  /* Get local bluetooth address */
+  if (src && strlen(src) == 17)
+      dev_id = hci_devid(src);
+  else if (src)
+      dev_id = atoi(src);
+  else
+      dev_id = hci_get_route(NULL);
   DEBUG(1, "%s: Scanning ...\n", __func__);
   flags = IREQ_CACHE_FLUSH; /* only show devices currently in range */
@@ -124 +128 @@
 }
 
-int obexftp_browse_bt(const char *addr, int svclass)
+int obexftp_browse_bt_src(const char *src, const char *addr, int svclass)
 {
   int res = -1;
@@ -137 +141 @@
 
   /* Get local bluetooth address */
-  dev_id = hci_get_route(NULL);
-  /* dev_id = hci_devid( "01:23:45:67:89:AB" ); */
+  if (src && strlen(src) == 17)
+      dev_id = hci_devid(src);
+  else if (src)
+      dev_id = atoi(src);
+  else
+      dev_id = hci_get_route(NULL);
 
   /* Connect to remote SDP server */

trunk/obexftp/client.h

@@ -125 +125 @@
 
 char **obexftp_discover(int transport);
-char **obexftp_discover_bt(void); /* this is a quick hack */
-
-int obexftp_browse_bt(const char *addr, int svclass);
+char **obexftp_discover_bt_src(const char *src); /* HCI no. or address */
+#define obexftp_discover_bt() \
+        obexftp_discover_bt_src(NULL)
+
+int obexftp_browse_bt_src(const char *src, const char *addr, int svclass);
+#define obexftp_browse_bt(device, service) \
+        obexftp_browse_bt_src(NULL, device, service)
 #define obexftp_browse_bt_ftp(device) \
-        obexftp_browse_bt(device, OBEX_FTP_SERVICE)
+        obexftp_browse_bt_src(NULL, device, OBEX_FTP_SERVICE)
 #define obexftp_browse_bt_push(device) \
-        obexftp_browse_bt(device, OBEX_PUSH_SERVICE)
+        obexftp_browse_bt_src(NULL, device, OBEX_PUSH_SERVICE)
 #define obexftp_browse_bt_sync(device) \
-        obexftp_browse_bt(device, OBEX_SYNC_SERVICE)
+        obexftp_browse_bt_src(NULL, device, OBEX_SYNC_SERVICE)
 
 int obexftp_connect_uuid(obexftp_client_t *cli,