d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add workaround for {not so|too} smart phones that cannot handle SDP attribute

Browse Source 
ID ranges that consist of exactly one attribute ID. libsdp(3) will check start
and end of the attribute ID range and if they are the same the range will be
collapsed to one atribute ID.

The problem was observed on Audiovox SMT5600 and Palm Treo 650.

MFC after:	3 days
This commit is contained in:
Maksim Yevmenkin 2004-12-09 18:57:12 +00:00
parent 9dfeca922c
commit ed9a95c4a1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=138633
1 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
lib/libsdp/search.c
View File

@ -55,7 +55,8 @@ sdp_search(void *xss,
sdp_session_p ss = (sdp_session_p) xss;
uint8_t *req = NULL, *rsp = NULL, *rsp_tmp = NULL;
int32_t type, len;
int32_t t, len;
uint16_t lo, hi;
if (ss == NULL)
return (-1);
@ -66,11 +67,29 @@ sdp_search(void *xss,
return (-1);
}
/* Calculate length of the request */
req = ss->req;
plen = plen * (sizeof(pp[0]) + 1);
alen = alen * (sizeof(ap[0]) + 1);
/* Calculate ServiceSearchPattern length */
plen = plen * (sizeof(pp[0]) + 1);
/* Calculate AttributeIDList length */
for (len = 0, t = 0; t < alen; t ++) {
lo = (uint16_t) (ap[t] >> 16);
hi = (uint16_t) (ap[t]);
if (lo > hi) {
ss->error = EINVAL;
return (-1);
}
if (lo != hi)
len += (sizeof(ap[t]) + 1);
else
len += (sizeof(lo) + 1);
}
alen = len;
/* Calculate length of the request */
len = plen + sizeof(uint8_t) + sizeof(uint16_t) +
/* ServiceSearchPattern */
sizeof(uint16_t) +
@ -97,9 +116,21 @@ sdp_search(void *xss,
/* Put AttributeIDList */
SDP_PUT8(SDP_DATA_SEQ16, req);
SDP_PUT16(alen, req);
for (; alen > 0; ap ++, alen -= (sizeof(ap[0]) + 1)) {
SDP_PUT8(SDP_DATA_UINT32, req);
SDP_PUT32(*ap, req);
for (; alen > 0; ap ++) {
lo = (uint16_t) (*ap >> 16);
hi = (uint16_t) (*ap);
if (lo != hi) {
/* Put attribute range */
SDP_PUT8(SDP_DATA_UINT32, req);
SDP_PUT32(*ap, req);
alen -= (sizeof(ap[0]) + 1);
} else {
/* Put attribute */
SDP_PUT8(SDP_DATA_UINT16, req);
SDP_PUT16(lo, req);
alen -= (sizeof(lo) + 1);
}
}
/* Submit ServiceSearchAttributeRequest and wait for response */
@ -241,8 +272,8 @@ sdp_search(void *xss,
rsp_tmp = ss->rsp;
/* Skip the first SEQ */
SDP_GET8(type, rsp_tmp);
switch (type) {
SDP_GET8(t, rsp_tmp);
switch (t) {
case SDP_DATA_SEQ8:
SDP_GET8(len, rsp_tmp);
break;
@ -263,8 +294,8 @@ sdp_search(void *xss,
for (; rsp_tmp < rsp && vlen > 0; ) {
/* Get set of attributes for the next record */
SDP_GET8(type, rsp_tmp);
switch (type) {
SDP_GET8(t, rsp_tmp);
switch (t) {
case SDP_DATA_SEQ8:
SDP_GET8(len, rsp_tmp);
break;
@ -286,8 +317,8 @@ sdp_search(void *xss,
/* Now rsp_tmp points to list of (attr,value) pairs */
for (; len > 0 && vlen > 0; vp ++, vlen --) {
/* Attribute */
SDP_GET8(type, rsp_tmp);
if (type != SDP_DATA_UINT16) {
SDP_GET8(t, rsp_tmp);
if (t != SDP_DATA_UINT16) {
ss->error = ENOATTR;
return (-1);
}