Skip to content

Commit

Permalink
Bluetooth: Add MAP profile and features (#3857)
Browse files Browse the repository at this point in the history 
Change-Id: I16b74d7588594a3e2249c2f167fed1e269e6fa88
  • Loading branch information
@turl
Jonathan Bensen authored and turl committed Dec 5, 2011
1 parent 8636fe3 commit 044f9f7
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 0 deletions.
7 changes: 7 additions & 0 deletions lib/bluetooth/sdp.h
View file
Expand Up @@ -128,6 +128,9 @@ extern "C" {
#define PBAP_PCE_SVCLASS_ID 0x112e #define PBAP_PCE_SVCLASS_ID 0x112e
#define PBAP_PSE_SVCLASS_ID 0x112f #define PBAP_PSE_SVCLASS_ID 0x112f
#define PBAP_SVCLASS_ID 0x1130 #define PBAP_SVCLASS_ID 0x1130
#define OBEX_MAS_SVCLASS_ID 0x1132
#define OBEX_MNS_SVCLASS_ID 0x1133
#define OBEX_MAP_SVCLASS_ID 0x1134
#define PNP_INFO_SVCLASS_ID 0x1200 #define PNP_INFO_SVCLASS_ID 0x1200
#define GENERIC_NETWORKING_SVCLASS_ID 0x1201 #define GENERIC_NETWORKING_SVCLASS_ID 0x1201
#define GENERIC_FILETRANS_SVCLASS_ID 0x1202 #define GENERIC_FILETRANS_SVCLASS_ID 0x1202
Expand Down Expand Up @@ -158,6 +161,8 @@ extern "C" {
#define IRMC_SYNC_PROFILE_ID IRMC_SYNC_SVCLASS_ID #define IRMC_SYNC_PROFILE_ID IRMC_SYNC_SVCLASS_ID
#define OBEX_OBJPUSH_PROFILE_ID OBEX_OBJPUSH_SVCLASS_ID #define OBEX_OBJPUSH_PROFILE_ID OBEX_OBJPUSH_SVCLASS_ID
#define OBEX_FILETRANS_PROFILE_ID OBEX_FILETRANS_SVCLASS_ID #define OBEX_FILETRANS_PROFILE_ID OBEX_FILETRANS_SVCLASS_ID
#define OBEX_MAP_PROFILE_ID OBEX_MAP_SVCLASS_ID
#define OBEX_MAS_PROFILE_ID OBEX_MAS_SVCLASS_ID
#define IRMC_SYNC_CMD_PROFILE_ID IRMC_SYNC_CMD_SVCLASS_ID #define IRMC_SYNC_CMD_PROFILE_ID IRMC_SYNC_CMD_SVCLASS_ID
#define HEADSET_PROFILE_ID HEADSET_SVCLASS_ID #define HEADSET_PROFILE_ID HEADSET_SVCLASS_ID
#define CORDLESS_TELEPHONY_PROFILE_ID CORDLESS_TELEPHONY_SVCLASS_ID #define CORDLESS_TELEPHONY_PROFILE_ID CORDLESS_TELEPHONY_SVCLASS_ID
Expand Down Expand Up @@ -283,6 +288,8 @@ extern "C" {
#define SDP_ATTR_SUPPORTED_FUNCTIONS 0x0312 #define SDP_ATTR_SUPPORTED_FUNCTIONS 0x0312
#define SDP_ATTR_TOTAL_IMAGING_DATA_CAPACITY 0x0313 #define SDP_ATTR_TOTAL_IMAGING_DATA_CAPACITY 0x0313
#define SDP_ATTR_SUPPORTED_REPOSITORIES 0x0314 #define SDP_ATTR_SUPPORTED_REPOSITORIES 0x0314
#define SDP_ATTR_MAS_INSTANCE_ID 0x0315
#define SDP_ATTR_SUPPORTED_MESSAGE_TYPES 0x0316


#define SDP_ATTR_SPECIFICATION_ID 0x0200 #define SDP_ATTR_SPECIFICATION_ID 0x0200
#define SDP_ATTR_VENDOR_ID 0x0201 #define SDP_ATTR_VENDOR_ID 0x0201
Expand Down
77 changes: 77 additions & 0 deletions tools/sdptool.c
View file
Expand Up @@ -1958,6 +1958,82 @@ static int add_ftp(sdp_session_t *session, svc_info_t *si)
return ret; return ret;
} }


static int add_mas(sdp_session_t *session, svc_info_t *si)
{
sdp_list_t *svclass_id, *pfseq, *apseq, *root;
uuid_t root_uuid, ftrn_uuid, l2cap_uuid, rfcomm_uuid, obex_uuid;
uuid_t masid_uuid, sprtd_msg_uuid;
uint16_t masid;
uint8_t sprtd_msg;
sdp_profile_desc_t profile[1];
sdp_list_t *aproto, *proto[3];
sdp_record_t record;
uint8_t u8_val = si->channel ? si->channel : 10;
sdp_data_t *channel;
int ret = 0;

memset(&record, 0, sizeof(sdp_record_t));
record.handle = si->handle;

sdp_uuid16_create(&root_uuid, PUBLIC_BROWSE_GROUP);
root = sdp_list_append(0, &root_uuid);
sdp_set_browse_groups(&record, root);

sdp_uuid16_create(&ftrn_uuid, OBEX_MAS_SVCLASS_ID);
svclass_id = sdp_list_append(0, &ftrn_uuid);
sdp_set_service_classes(&record, svclass_id);

sdp_uuid16_create(&l2cap_uuid, L2CAP_UUID);
proto[0] = sdp_list_append(0, &l2cap_uuid);
apseq = sdp_list_append(0, proto[0]);

sdp_uuid16_create(&rfcomm_uuid, RFCOMM_UUID);
proto[1] = sdp_list_append(0, &rfcomm_uuid);
channel = sdp_data_alloc(SDP_UINT8, &u8_val);
proto[1] = sdp_list_append(proto[1], channel);
apseq = sdp_list_append(apseq, proto[1]);

sdp_uuid16_create(&obex_uuid, OBEX_UUID);
proto[2] = sdp_list_append(0, &obex_uuid);
apseq = sdp_list_append(apseq, proto[2]);

aproto = sdp_list_append(0, apseq);
sdp_set_access_protos(&record, aproto);

sdp_uuid16_create(&profile[0].uuid, OBEX_MAP_PROFILE_ID);
profile[0].version = 0x0100;
pfseq = sdp_list_append(0, &profile[0]);
sdp_set_profile_descs(&record, pfseq);

masid = 0x0;
sdp_attr_add_new(&record, SDP_ATTR_MAS_INSTANCE_ID, SDP_UINT16,
&masid);

sprtd_msg = 0x0F;
sdp_attr_add_new(&record, SDP_ATTR_SUPPORTED_MESSAGE_TYPES, SDP_UINT8,
&sprtd_msg);

sdp_set_info_attr(&record, "OBEX Message Access", 0, 0);

if (sdp_device_record_register(session, &interface, &record, SDP_RECORD_PERSIST) < 0) {
printf("Service Record registration failed\n");
ret = -1;
goto end;
}

printf("OBEX Message Access service registered\n");

end:
sdp_data_free(channel);
sdp_list_free(proto[0], 0);
sdp_list_free(proto[1], 0);
sdp_list_free(proto[2], 0);
sdp_list_free(apseq, 0);
sdp_list_free(aproto, 0);

return ret;
}

static int add_directprint(sdp_session_t *session, svc_info_t *si) static int add_directprint(sdp_session_t *session, svc_info_t *si)
{ {
sdp_list_t *svclass_id, *pfseq, *apseq, *root; sdp_list_t *svclass_id, *pfseq, *apseq, *root;
Expand Down Expand Up @@ -3443,6 +3519,7 @@ struct {
{ "OPUSH", OBEX_OBJPUSH_SVCLASS_ID, add_opush }, { "OPUSH", OBEX_OBJPUSH_SVCLASS_ID, add_opush },
{ "FTP", OBEX_FILETRANS_SVCLASS_ID, add_ftp }, { "FTP", OBEX_FILETRANS_SVCLASS_ID, add_ftp },
{ "PRINT", DIRECT_PRINTING_SVCLASS_ID, add_directprint }, { "PRINT", DIRECT_PRINTING_SVCLASS_ID, add_directprint },
{ "MAS", OBEX_MAP_SVCLASS_ID, add_mas },


{ "HS", HEADSET_SVCLASS_ID, add_headset }, { "HS", HEADSET_SVCLASS_ID, add_headset },
{ "HSAG", HEADSET_AGW_SVCLASS_ID, add_headset_ag }, { "HSAG", HEADSET_AGW_SVCLASS_ID, add_headset_ag },
Expand Down

0 comments on commit 044f9f7

Please sign in to comment.