Changeset 146 for trunk

Timestamp:

06/01/07 17:13:54 (18 months ago)

Author:

zany

Message:

adding hci selection support

Location:

trunk

Files:

• apps/obexftp.c (modified) (6 diffs)
• obexftp/client.c (modified) (4 diffs)
• obexftp/client.h (modified) (1 diff)

trunk/apps/obexftp.c

@@ -229 +229 @@
 
 /*@only@*/ /*@null@*/ static obexftp_client_t *cli = NULL;
+static const char *src_dev = NULL;
 #ifdef HAVE_BLUETOOTH
 static int transport = OBEX_TRANS_BLUETOOTH;
@@ -266 +267 @@
 
                 /* Connect */
-                if (obexftp_connect_uuid (cli, device, channel, uuid, uuid_len) >= 0)
+                if (obexftp_connect_src (cli, src_dev, device, channel, uuid, uuid_len) >= 0)
                         return TRUE;
                 fprintf(stderr, "Still trying to connect\n");
@@ -441 +442 @@
 #ifdef HAVE_BLUETOOTH
                         {"bluetooth",   optional_argument, NULL, 'b'},
+                        {"channel",     required_argument, NULL, 'B'},
+                        {"hci",         required_argument, NULL, 'd'},
 #endif
-                        {"channel",     required_argument, NULL, 'B'},
 #ifdef HAVE_USB
                         {"usb",         optional_argument, NULL, 'u'},
@@ -470 +472 @@
                 };
                 
-                c = getopt_long (argc, argv, "-ib::B:u::t:n:U::HSL::l::c:C:f:o:g:G:p:k:XYxm:VvhN:FP",
+                c = getopt_long (argc, argv, "-ib::B:d:u::t:n:U::HSL::l::c:C:f:o:g:G:p:k:XYxm:VvhN:FP",
                                  long_options, &option_index);
                 if (c == -1)
@@ -499 +501 @@
                 case 'B':
                         channel = atoi(optarg);
+                        break;
+                        
+                case 'd':
+                        src_dev = optarg;
                         break;
 #endif /* HAVE_BLUETOOTH */
@@ -716 +722 @@
                                 " -b, --bluetooth [<device>]  use or search a bluetooth device\n"
                                 " [ -B, --channel <number> ]  use this bluetooth channel when connecting\n"
+                                " [ -d, --hci <no/address> ]  use source device with this address or number\n"
 #endif
 #ifdef HAVE_USB

trunk/obexftp/client.c

@@ -53 +53 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/rfcomm.h>
+#include <bluetooth/hci.h>
+#include <bluetooth/hci_lib.h>
 #endif /* __FreeBSD__ */
 #endif
@@ -504 +506 @@
 int obexftp_connect_uuid(obexftp_client_t *cli, const char *device, int port, const uint8_t uuid[], uint32_t uuid_len)
 {
+        return obexftp_connect_src(cli, NULL, device, port, uuid, uuid_len);
+}
+
+int obexftp_connect_src(obexftp_client_t *cli, const char *src, const char *device, int port, const uint8_t uuid[], uint32_t uuid_len)
+{
         struct sockaddr_in peer;
 #ifdef HAVE_BLUETOOTH
         char *devicedup, *devicep;
-        bdaddr_t bdaddr;
+        bdaddr_t bdaddr, src_addr;
+        int hci_id;
 #endif
 #ifdef HAVE_USB
@@ -558 +566 @@
 #ifdef HAVE_BLUETOOTH
         case OBEX_TRANS_BLUETOOTH:
+                if (!src) {
+                        bacpy(&src_addr, BDADDR_ANY);
+                } else {
+                        str2ba(src, &src_addr);
+                        hci_id = atoi(src);
+                        if (hci_id > 0) {
+                                hci_devba(hci_id, &src_addr);   
+                        }
+                }
                 if (!device) {
                         ret = -EINVAL;
@@ -572 +589 @@
                         if (*devicep == '/') *devicep = ':';
                 }
-                (void) str2ba(devicedup, &bdaddr); /* what is the meaning of the return code? */
+                (void) str2ba(devicedup, &bdaddr);
                 free(devicedup);
-                ret = BtOBEX_TransportConnect(cli->obexhandle, BDADDR_ANY, &bdaddr, (uint8_t)port);
+                ret = BtOBEX_TransportConnect(cli->obexhandle, &src_addr, &bdaddr, (uint8_t)port);
                 DEBUG(3, "%s() BT %d\n", __func__, ret);
                 break;

trunk/obexftp/client.h

@@ -139 +139 @@
                                 int port, /* INET(?), BLUETOOTH, USB*/
                                 /*@null@*/ const uint8_t uuid[], uint32_t uuid_len);
+int obexftp_connect_src(obexftp_client_t *cli,
+                                /*@null@*/ const char *src, /* HCI no. or address */
+                                /*@null@*/ const char *device, /* for INET, BLUETOOTH */
+                                int port, /* INET(?), BLUETOOTH, USB*/
+                                /*@null@*/ const uint8_t uuid[], uint32_t uuid_len);
 
 //int obexftp_connect_service(obexftp_client_t *cli,