Changeset 162 for trunk

Show
Ignore:
Timestamp:
06/07/07 14:34:42 (18 months ago)
Author:
zany
Message:

adding src to browse bt

Location:
trunk/obexftp
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/obexftp/bt_discovery.c

    r145 r162  
    1414#include <bluetooth/hci.h> 
    1515#include <bluetooth/hci_lib.h> 
    16  
    1716#include <bluetooth/sdp.h> 
    1817#include <bluetooth/sdp_lib.h> 
    … …  
    3029static const uint8_t svc_uuid_pcsuite[] = SVC_UUID_PCSUITE; 
    3130 
    32 char **obexftp_discover_bt() 
     31char **obexftp_discover_bt_src(const char *src) 
    3332{ 
    3433        char **res; 
    … …  
    4241  int dd, i; 
    4342 
    44   dev_id = hci_get_route(NULL); 
    45   /* dev_id = hci_devid( "01:23:45:67:89:AB" ); */ 
     43  /* Get local bluetooth address */ 
     44  if (src && strlen(src) == 17) 
     45      dev_id = hci_devid(src); 
     46  else if (src) 
     47      dev_id = atoi(src); 
     48  else 
     49      dev_id = hci_get_route(NULL); 
    4650  DEBUG(1, "%s: Scanning ...\n", __func__); 
    4751  flags = IREQ_CACHE_FLUSH; /* only show devices currently in range */ 
    … …  
    124128} 
    125129 
    126 int obexftp_browse_bt(const char *addr, int svclass) 
     130int obexftp_browse_bt_src(const char *src, const char *addr, int svclass) 
    127131{ 
    128132  int res = -1; 
    … …  
    137141 
    138142  /* Get local bluetooth address */ 
    139   dev_id = hci_get_route(NULL); 
    140   /* dev_id = hci_devid( "01:23:45:67:89:AB" ); */ 
     143  if (src && strlen(src) == 17) 
     144      dev_id = hci_devid(src); 
     145  else if (src) 
     146      dev_id = atoi(src); 
     147  else 
     148      dev_id = hci_get_route(NULL); 
    141149 
    142150  /* Connect to remote SDP server */ 

  • trunk/obexftp/client.h

    r146 r162  
    125125 
    126126char **obexftp_discover(int transport); 
    127 char **obexftp_discover_bt(void); /* this is a quick hack */ 
    128  
    129 int obexftp_browse_bt(const char *addr, int svclass); 
     127char **obexftp_discover_bt_src(const char *src); /* HCI no. or address */ 
     128#define obexftp_discover_bt() \ 
     129        obexftp_discover_bt_src(NULL) 
     130 
     131int obexftp_browse_bt_src(const char *src, const char *addr, int svclass); 
     132#define obexftp_browse_bt(device, service) \ 
     133        obexftp_browse_bt_src(NULL, device, service) 
    130134#define obexftp_browse_bt_ftp(device) \ 
    131         obexftp_browse_bt(device, OBEX_FTP_SERVICE) 
     135        obexftp_browse_bt_src(NULL, device, OBEX_FTP_SERVICE) 
    132136#define obexftp_browse_bt_push(device) \ 
    133         obexftp_browse_bt(device, OBEX_PUSH_SERVICE) 
     137        obexftp_browse_bt_src(NULL, device, OBEX_PUSH_SERVICE) 
    134138#define obexftp_browse_bt_sync(device) \ 
    135         obexftp_browse_bt(device, OBEX_SYNC_SERVICE) 
     139        obexftp_browse_bt_src(NULL, device, OBEX_SYNC_SERVICE) 
    136140 
    137141int obexftp_connect_uuid(obexftp_client_t *cli,