@@ -78,6 +78,7 @@ static connection_t *connections; static char *tty = NULL; // "/dev/ttyS0"; +static char *source = NULL; // "00:11:22:33:44:55"; "hci0"; static int search_irda = 1; static int search_bt = 1; static int search_usb = 1; @@ -250,7 +251,7 @@ static obexftp_client_t *cli_open(int transport, char *addr, int channel) for (retry = 0; retry < 3; retry++) { /* Connect */ - if (obexftp_connect (cli, addr, channel) >= 0) + if (obexftp_connect_src (cli, source, addr, channel, UUID_FBS, sizeof(UUID_FBS)) >= 0) return cli; /* Still trying to connect */ sleep(1); @@ -805,13 +806,14 @@ int main(int argc, char *argv[]) {"nobluetooth", no_argument, NULL, 'B'}, {"nousb", no_argument, NULL, 'U'}, {"tty", required_argument, NULL, 't'}, + {"hci", required_argument, NULL, 'd'}, {"nonblock", no_argument, NULL, 'N'}, {"help", no_argument, NULL, 'h'}, {"usage", no_argument, NULL, 'h'}, {0, 0, 0, 0} }; - c = getopt_long (argc, argv, "+IBUt:Nh", + c = getopt_long (argc, argv, "+IBUt:d:Nh", long_options, &option_index); if (c == -1) break; @@ -838,6 +840,10 @@ int main(int argc, char *argv[]) if (strcasecmp(optarg, "irda")) tty = optarg; break; + + case 'd': + source = optarg; + break; case 'N': nonblock = 1; @@ -845,7 +851,7 @@ int main(int argc, char *argv[]) case 'h': /* printf("ObexFS %s\n", VERSION); */ - printf("Usage: %s [-I] [-B] [-U] [-t <dev>] [-N] [-- <fuse options>]\n" + printf("Usage: %s [-I] [-B] [-U] [-t <dev>] [-d <hci>] [-N] [-- <fuse options>]\n" "Transfer files from/to Mobile Equipment.\n" "Copyright (c) 2002-2005 Christian W. Zuckschwerdt\n" "\n" @@ -853,6 +859,7 @@ int main(int argc, char *argv[]) " -B, --nobluetooth dont search for bluetooth devices\n" " -U, --nousb dont search for usb devices\n" " -t, --tty <device> search for devices at this tty\n\n" + " -d, --hci <no/address> use only this source device address or number\n" " -N, --nonblock nonblocking mode\n\n" " -h, --help, --usage this help text\n\n" "Options to fusermount need to be preceeded by two dashes (--).\n" fuse/obexautofs.c @@ -65,6 +65,7 @@ struct data_buffer { static obexftp_client_t *cli = NULL; static int transport = 0; +static char *source = NULL; // "00:11:22:33:44:55"; "hci0"; static char *device = NULL; // "00:11:22:33:44:55"; "/dev/ttyS0"; static int channel = -1; @@ -96,7 +97,7 @@ static int cli_open() for (retry = 0; retry < 3; retry++) { /* Connect */ - if (obexftp_connect (cli, device, channel) >= 0) + if (obexftp_connect_src (cli, source, device, channel, UUID_FBS, sizeof(UUID_FBS)) >= 0) return 0; /* Still trying to connect */ sleep(1); @@ -508,6 +509,7 @@ int main(int argc, char *argv[]) {"irda", no_argument, NULL, 'i'}, {"bluetooth", required_argument, NULL, 'b'}, {"channel", required_argument, NULL, 'B'}, + {"hci", required_argument, NULL, 'd'}, {"usb", required_argument, NULL, 'u'}, {"tty", required_argument, NULL, 't'}, {"network", required_argument, NULL, 'n'}, @@ -517,7 +519,7 @@ int main(int argc, char *argv[]) {0, 0, 0, 0} }; - c = getopt_long (argc, argv, "+ib:B:u:t:n:Nh", + c = getopt_long (argc, argv, "+ib:B:d:u:t:n:Nh", long_options, &option_index); if (c == -1) break; @@ -539,6 +541,10 @@ int main(int argc, char *argv[]) case 'B': channel = atoi(optarg); break; + + case 'd': + source = optarg; + break; case 'u': if (geteuid() != 0) @@ -571,13 +577,14 @@ int main(int argc, char *argv[]) case 'h': /* printf("ObexFS %s\n", VERSION); */ - printf("Usage: %s [-i | -b <dev> [-B <chan>] | -t <dev>] [-- <fuse options>]\n" + printf("Usage: %s [-i | -b <dev> [-B <chan>] [-d <hci>] | -u <dev> | -t <dev> | -n <dev>] [-- <fuse options>]\n" "Transfer files from/to Mobile Equipment.\n" "Copyright (c) 2002-2005 Christian W. Zuckschwerdt\n" "\n" " -i, --irda connect using IrDA transport\n" " -b, --bluetooth <device> connect to this 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" " -u, --usb <interface> connect to this usb interface number\n" " -t, --tty <device> connect to this tty using a custom transport\n" " -n, --network <device> connect to this network host\n\n" fuse/obexfs.c 12a9eca8802f57596784de356aba1cccf5d9e0dc Christian W. Zuckschwerdt christian@zuckschwerdt.org http://github.com/zuckschwerdt/obexfs/commit/afdf037f935275b5bb9b0afae3b623573d5ca189 afdf037f935275b5bb9b0afae3b623573d5ca189 2009-04-26T10:17:24-07:00 2009-04-26T10:17:24-07:00 adding option for source hci selection c461b165bffec39c5a861a6e50b4a9282c8784e1 Christian W. Zuckschwerdt christian@zuckschwerdt.org