Return-Path: From: Andrei Emeltchenko To: linux-bluetooth@vger.kernel.org Subject: [PATCHv6 15/19] android/socket: Add SDP record for OPP profile Date: Wed, 20 Nov 2013 12:24:33 +0200 Message-Id: <1384943077-5366-16-git-send-email-Andrei.Emeltchenko.news@gmail.com> In-Reply-To: <1384943077-5366-1-git-send-email-Andrei.Emeltchenko.news@gmail.com> References: <1384943077-5366-1-git-send-email-Andrei.Emeltchenko.news@gmail.com> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: From: Andrei Emeltchenko This adds SDP record for OPP shown below: Service Name: OBEX Object Push Service RecHandle: 0x10002 Service Class ID List: "OBEX Object Push" (0x1105) Protocol Descriptor List: "RFCOMM" (0x0003) Channel: 9 "OBEX" (0x0008) Profile Descriptor List: "OBEX Object Push" (0x1105) Version: 0x0100 --- android/socket.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/android/socket.c b/android/socket.c index 5862c9c..06b2906 100644 --- a/android/socket.c +++ b/android/socket.c @@ -35,7 +35,9 @@ #include "lib/sdp.h" #include "lib/sdp_lib.h" #include "src/sdp-client.h" +#include "src/sdpd.h" +#include "bluetooth.h" #include "log.h" #include "hal-msg.h" #include "hal-ipc.h" @@ -46,6 +48,9 @@ #define OPP_DEFAULT_CHANNEL 9 #define PBAP_DEFAULT_CHANNEL 15 +/* Use Object Transfer for all services */ +#define SVC_HINT_OBEX 0x10 + static bdaddr_t adapter_addr; /* Simple list of RFCOMM server sockets */ @@ -63,6 +68,7 @@ struct rfcomm_sock { guint stack_watch; bdaddr_t dst; + uint32_t service_handle; }; static struct rfcomm_sock *create_rfsock(int sock, int *hal_fd) @@ -102,9 +108,79 @@ static void cleanup_rfsock(struct rfcomm_sock *rfsock) if (!g_source_remove(rfsock->stack_watch)) error("stack_watch source was not found"); + if (rfsock->service_handle) + bt_adapter_remove_record(rfsock->service_handle); + g_free(rfsock); } +static sdp_record_t *create_opp_record(uint8_t chan) +{ + sdp_list_t *svclass_id, *pfseq, *apseq, *root; + uuid_t root_uuid, opush_uuid, rfcomm_uuid, obex_uuid; + sdp_profile_desc_t profile[1]; + sdp_list_t *aproto, *proto[2]; + uint8_t formats[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0xff }; + void *dtds[sizeof(formats)], *values[sizeof(formats)]; + unsigned int i; + uint8_t dtd = SDP_UINT8; + sdp_data_t *sflist; + sdp_data_t *channel; + sdp_record_t *record; + + record = sdp_record_alloc(); + if (!record) + return NULL; + + record->handle = sdp_next_handle(); + + sdp_uuid16_create(&root_uuid, PUBLIC_BROWSE_GROUP); + root = sdp_list_append(NULL, &root_uuid); + sdp_set_browse_groups(record, root); + + sdp_uuid16_create(&opush_uuid, OBEX_OBJPUSH_SVCLASS_ID); + svclass_id = sdp_list_append(NULL, &opush_uuid); + sdp_set_service_classes(record, svclass_id); + + sdp_uuid16_create(&profile[0].uuid, OBEX_OBJPUSH_PROFILE_ID); + profile[0].version = 0x0100; + pfseq = sdp_list_append(NULL, profile); + sdp_set_profile_descs(record, pfseq); + + sdp_uuid16_create(&rfcomm_uuid, RFCOMM_UUID); + proto[0] = sdp_list_append(NULL, &rfcomm_uuid); + channel = sdp_data_alloc(SDP_UINT8, &chan); + proto[0] = sdp_list_append(proto[0], channel); + apseq = sdp_list_append(NULL, proto[0]); + + sdp_uuid16_create(&obex_uuid, OBEX_UUID); + proto[1] = sdp_list_append(NULL, &obex_uuid); + apseq = sdp_list_append(apseq, proto[1]); + + aproto = sdp_list_append(NULL, apseq); + sdp_set_access_protos(record, aproto); + + for (i = 0; i < sizeof(formats); i++) { + dtds[i] = &dtd; + values[i] = &formats[i]; + } + sflist = sdp_seq_alloc(dtds, values, sizeof(formats)); + sdp_attr_add(record, SDP_ATTR_SUPPORTED_FORMATS_LIST, sflist); + + sdp_set_info_attr(record, "OBEX Object Push", NULL, NULL); + + sdp_data_free(channel); + sdp_list_free(proto[0], NULL); + sdp_list_free(proto[1], NULL); + sdp_list_free(apseq, NULL); + sdp_list_free(pfseq, NULL); + sdp_list_free(aproto, NULL); + sdp_list_free(root, NULL); + sdp_list_free(svclass_id, NULL); + + return record; +} + static struct profile_info { uint8_t uuid[16]; uint8_t channel; @@ -123,10 +199,29 @@ static struct profile_info { 0x00, 0x00, 0x11, 0x05, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB }, - .channel = OPP_DEFAULT_CHANNEL + .channel = OPP_DEFAULT_CHANNEL, + .svc_hint = SVC_HINT_OBEX, + .create_record = create_opp_record } }; +static uint32_t sdp_service_register(struct profile_info *profile) +{ + sdp_record_t *record; + + record = profile->create_record(profile->channel); + if (!record) + return 0; + + if (bt_adapter_add_record(record, profile->svc_hint) < 0) { + error("Failed to register on SDP record"); + sdp_record_free(record); + return 0; + } + + return record->handle; +} + static int bt_sock_send_fd(int sock_fd, const void *buf, int len, int send_fd) { ssize_t ret; @@ -421,6 +516,8 @@ static int handle_listen(void *buf) return -1; } + rfsock->service_handle = sdp_service_register(profile); + return hal_fd; } -- 1.7.10.4