diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2005-05-08 17:22:23 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2005-05-08 17:22:23 +0000 |
| commit | b4d9988bdaadfe79fd802793e16ef1f77f8c537c (patch) | |
| tree | 996537ea130dbc3af6cb239195d73d52f1d678e6 | |
| parent | 258887a0f6a798cc021837c3f686d02ff317d271 (diff) | |
Wait until the SDP connection is closed
| -rw-r--r-- | hidd/main.c | 2 | ||||
| -rw-r--r-- | hidd/sdp.c | 17 |
2 files changed, 16 insertions, 3 deletions
diff --git a/hidd/main.c b/hidd/main.c index 25567c9e..98a8f12a 100644 --- a/hidd/main.c +++ b/hidd/main.c @@ -430,7 +430,7 @@ static void do_connect(int ctl, bdaddr_t *src, bdaddr_t *dst, uint8_t subclass, exit(1); } - err = create_device(ctl, csk, isk, subclass, nosdp, encrypt, timeout); + err = create_device(ctl, csk, isk, subclass, 1, encrypt, timeout); if (err < 0) { fprintf(stderr, "HID create error %d (%s)\n", errno, strerror(errno)); @@ -41,6 +41,7 @@ #include <sys/socket.h> #include <bluetooth/bluetooth.h> +#include <bluetooth/l2cap.h> #include <bluetooth/sdp.h> #include <bluetooth/sdp_lib.h> #include <bluetooth/hidp.h> @@ -164,6 +165,9 @@ int get_stored_device_info(const bdaddr_t *src, const bdaddr_t *dst, struct hidp int get_sdp_device_info(const bdaddr_t *src, const bdaddr_t *dst, struct hidp_connadd_req *req) { + struct sockaddr_l2 addr; + socklen_t addrlen; + bdaddr_t bdaddr; uint32_t range = 0x0000ffff; sdp_session_t *s; sdp_list_t *search, *attrid, *pnp_rsp, *hid_rsp; @@ -172,7 +176,7 @@ int get_sdp_device_info(const bdaddr_t *src, const bdaddr_t *dst, struct hidp_co uuid_t svclass; int err; - s = sdp_connect(src, dst, 0); + s = sdp_connect(src, dst, SDP_RETRY_IF_BUSY | SDP_WAIT_ON_CLOSE); if (!s) return -1; @@ -194,6 +198,14 @@ int get_sdp_device_info(const bdaddr_t *src, const bdaddr_t *dst, struct hidp_co sdp_list_free(search, 0); sdp_list_free(attrid, 0); + memset(&addr, 0, sizeof(addr)); + addrlen = sizeof(addr); + + if (getsockname(s->sock, (struct sockaddr *) &addr, &addrlen) < 0) + bacpy(&bdaddr, src); + else + bacpy(&bdaddr, &addr.l2_bdaddr); + sdp_close(s); if (err || !hid_rsp) @@ -259,7 +271,8 @@ int get_sdp_device_info(const bdaddr_t *src, const bdaddr_t *dst, struct hidp_co sdp_record_free(rec); - store_device_info(src, dst, req); + if (bacmp(&bdaddr, BDADDR_ANY)) + store_device_info(&bdaddr, dst, req); return 0; } |