korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-15 16:24:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: Add flags parameter to bt_search_service

Browse Source 
This allows to pass custom SDP flags to sdp_connect.
This commit is contained in:
Szymon Janc 2014-01-20 12:08:34 +01:00 committed by Johan Hedberg
parent af00880e63
commit cada0c0896
8 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/bluetooth.c
View File

@ -693,7 +693,7 @@ static void browse_cb(sdp_list_t *recs, int err, gpointer user_data)
if (uuid_list[req->search_uuid]) { if (uuid_list[req->search_uuid]) {
sdp_uuid16_create(&uuid, uuid_list[req->search_uuid++]); sdp_uuid16_create(&uuid, uuid_list[req->search_uuid++]);
bt_search_service(&adapter.bdaddr, &req->bdaddr, &uuid, bt_search_service(&adapter.bdaddr, &req->bdaddr, &uuid,
browse_cb, user_data, NULL); browse_cb, user_data, NULL, 0);
return; return;
} }
@ -729,7 +729,7 @@ static uint8_t browse_remote_sdp(const bdaddr_t *addr)
sdp_uuid16_create(&uuid, uuid_list[req->search_uuid++]); sdp_uuid16_create(&uuid, uuid_list[req->search_uuid++]);
if (bt_search_service(&adapter.bdaddr, if (bt_search_service(&adapter.bdaddr,
&req->bdaddr, &uuid, browse_cb, req, NULL) < 0) { &req->bdaddr, &uuid, browse_cb, req, NULL , 0) < 0) {
browse_req_free(req); browse_req_free(req);
return HAL_STATUS_FAILED; return HAL_STATUS_FAILED;
} }

4
android/hidhost.c
View File

@ -751,7 +751,7 @@ static void bt_hid_connect(const void *buf, uint16_t len)
bt_string2uuid(&uuid, HID_UUID); bt_string2uuid(&uuid, HID_UUID);
if (bt_search_service(&adapter_addr, &dev->dst, &uuid, if (bt_search_service(&adapter_addr, &dev->dst, &uuid,
hid_sdp_search_cb, dev, NULL) < 0) { hid_sdp_search_cb, dev, NULL, 0) < 0) {
error("Failed to search sdp details"); error("Failed to search sdp details");
hid_device_free(dev); hid_device_free(dev);
status = HAL_STATUS_FAILED; status = HAL_STATUS_FAILED;
@ -1254,7 +1254,7 @@ static void connect_cb(GIOChannel *chan, GError *err, gpointer user_data)
bt_string2uuid(&uuid, HID_UUID); bt_string2uuid(&uuid, HID_UUID);
if (bt_search_service(&src, &dev->dst, &uuid, if (bt_search_service(&src, &dev->dst, &uuid,
hid_sdp_search_cb, dev, NULL) < 0) { hid_sdp_search_cb, dev, NULL, 0) < 0) {
error("failed to search sdp details"); error("failed to search sdp details");
hid_device_free(dev); hid_device_free(dev);
return; return;

2
android/socket.c
View File

@ -1091,7 +1091,7 @@ static uint8_t connect_rfcomm(const bdaddr_t *addr, int chan,
rfsock->profile = get_profile_by_uuid(uuid); rfsock->profile = get_profile_by_uuid(uuid);
if (bt_search_service(&adapter_addr, &rfsock->dst, &uu, if (bt_search_service(&adapter_addr, &rfsock->dst, &uu,
sdp_search_cb, rfsock, NULL) < 0) { sdp_search_cb, rfsock, NULL, 0) < 0) {
error("Failed to search SDP records"); error("Failed to search SDP records");
goto failed; goto failed;
} }

6
profiles/health/hdp_util.c
View File

@ -864,7 +864,7 @@ gboolean hdp_get_mdep(struct hdp_device *device, struct hdp_application *app,
bt_string2uuid(&uuid, HDP_UUID); bt_string2uuid(&uuid, HDP_UUID);
if (bt_search_service(src, dst, &uuid, get_mdep_cb, mdep_data, if (bt_search_service(src, dst, &uuid, get_mdep_cb, mdep_data,
free_mdep_data) < 0) { free_mdep_data, 0) < 0) {
g_set_error(err, HDP_ERROR, HDP_CONNECTION_ERROR, g_set_error(err, HDP_ERROR, HDP_CONNECTION_ERROR,
"Can't get remote SDP record"); "Can't get remote SDP record");
g_free(mdep_data); g_free(mdep_data);
@ -1092,7 +1092,7 @@ gboolean hdp_establish_mcl(struct hdp_device *device,
bt_string2uuid(&uuid, HDP_UUID); bt_string2uuid(&uuid, HDP_UUID);
if (bt_search_service(src, dst, &uuid, search_cb, conn_data, if (bt_search_service(src, dst, &uuid, search_cb, conn_data,
destroy_con_mcl_data) < 0) { destroy_con_mcl_data, 0) < 0) {
g_set_error(err, HDP_ERROR, HDP_CONNECTION_ERROR, g_set_error(err, HDP_ERROR, HDP_CONNECTION_ERROR,
"Can't get remote SDP record"); "Can't get remote SDP record");
g_free(conn_data); g_free(conn_data);
@ -1161,7 +1161,7 @@ gboolean hdp_get_dcpsm(struct hdp_device *device, hdp_continue_dcpsm_f func,
bt_string2uuid(&uuid, HDP_UUID); bt_string2uuid(&uuid, HDP_UUID);
if (bt_search_service(src, dst, &uuid, get_dcpsm_cb, dcpsm_data, if (bt_search_service(src, dst, &uuid, get_dcpsm_cb, dcpsm_data,
free_dcpsm_data) < 0) { free_dcpsm_data, 0) < 0) {
g_set_error(err, HDP_ERROR, HDP_CONNECTION_ERROR, g_set_error(err, HDP_ERROR, HDP_CONNECTION_ERROR,
"Can't get remote SDP record"); "Can't get remote SDP record");
g_free(dcpsm_data); g_free(dcpsm_data);

5
src/device.c
View File

@ -2971,7 +2971,7 @@ static void browse_cb(sdp_list_t *recs, int err, gpointer user_data)
sdp_uuid16_create(&uuid, uuid_list[req->search_uuid++]); sdp_uuid16_create(&uuid, uuid_list[req->search_uuid++]);
bt_search_service(btd_adapter_get_address(adapter), bt_search_service(btd_adapter_get_address(adapter),
&device->bdaddr, &uuid, &device->bdaddr, &uuid,
browse_cb, user_data, NULL); browse_cb, user_data, NULL, 0);
return; return;
} }
@ -3513,7 +3513,8 @@ static int device_browse_sdp(struct btd_device *device, DBusMessage *msg)
sdp_uuid16_create(&uuid, uuid_list[req->search_uuid++]); sdp_uuid16_create(&uuid, uuid_list[req->search_uuid++]);
err = bt_search_service(btd_adapter_get_address(adapter), err = bt_search_service(btd_adapter_get_address(adapter),
&device->bdaddr, &uuid, browse_cb, req, NULL); &device->bdaddr, &uuid, browse_cb, req, NULL,
0);
if (err < 0) { if (err < 0) {
browse_request_free(req); browse_request_free(req);
return err; return err;

2
src/profile.c
View File

@ -1605,7 +1605,7 @@ static int resolve_service(struct ext_io *conn, const bdaddr_t *src,
bt_string2uuid(&uuid, ext->remote_uuid); bt_string2uuid(&uuid, ext->remote_uuid);
sdp_uuid128_to_uuid(&uuid); sdp_uuid128_to_uuid(&uuid);
err = bt_search_service(src, dst, &uuid, record_cb, conn, NULL); err = bt_search_service(src, dst, &uuid, record_cb, conn, NULL, 0);
if (err == 0) if (err == 0)
conn->resolving = true; conn->resolving = true;

8
src/sdp-client.c
View File

@ -264,7 +264,7 @@ failed:
static int create_search_context(struct search_context **ctxt, static int create_search_context(struct search_context **ctxt,
const bdaddr_t *src, const bdaddr_t *src,
const bdaddr_t *dst, const bdaddr_t *dst,
uuid_t *uuid) uuid_t *uuid, uint16_t flags)
{ {
sdp_session_t *s; sdp_session_t *s;
GIOChannel *chan; GIOChannel *chan;
@ -276,7 +276,7 @@ static int create_search_context(struct search_context **ctxt,
s = get_cached_sdp_session(src, dst); s = get_cached_sdp_session(src, dst);
if (!s) if (!s)
s = sdp_connect(src, dst, SDP_NON_BLOCKING); s = sdp_connect(src, dst, SDP_NON_BLOCKING | flags);
if (!s) if (!s)
return -errno; return -errno;
@ -311,7 +311,7 @@ static int create_search_context(struct search_context **ctxt,
int bt_search_service(const bdaddr_t *src, const bdaddr_t *dst, int bt_search_service(const bdaddr_t *src, const bdaddr_t *dst,
uuid_t *uuid, bt_callback_t cb, void *user_data, uuid_t *uuid, bt_callback_t cb, void *user_data,
bt_destroy_t destroy) bt_destroy_t destroy, uint16_t flags)
{ {
struct search_context *ctxt = NULL; struct search_context *ctxt = NULL;
int err; int err;
@ -319,7 +319,7 @@ int bt_search_service(const bdaddr_t *src, const bdaddr_t *dst,
if (!cb) if (!cb)
return -EINVAL; return -EINVAL;
err = create_search_context(&ctxt, src, dst, uuid); err = create_search_context(&ctxt, src, dst, uuid, flags);
if (err < 0) if (err < 0)
return err; return err;

2
src/sdp-client.h
View File

@ -26,6 +26,6 @@ typedef void (*bt_destroy_t) (gpointer user_data);
int bt_search_service(const bdaddr_t *src, const bdaddr_t *dst, int bt_search_service(const bdaddr_t *src, const bdaddr_t *dst,
uuid_t *uuid, bt_callback_t cb, void *user_data, uuid_t *uuid, bt_callback_t cb, void *user_data,
bt_destroy_t destroy); bt_destroy_t destroy, uint16_t flags);
int bt_cancel_discovery(const bdaddr_t *src, const bdaddr_t *dst); int bt_cancel_discovery(const bdaddr_t *src, const bdaddr_t *dst);
void bt_clear_cached_session(const bdaddr_t *src, const bdaddr_t *dst); void bt_clear_cached_session(const bdaddr_t *src, const bdaddr_t *dst);