Menu
▾
▴
CVS: 4 files have been modified in apps/bluetooth/sdp_server.
|
From: Mats F. <ma...@us...> - 2001-06-14 10:30:44
|
The following files were modified in apps/bluetooth/sdp_server:
Name Old version New version Comment
---- ----------- ----------- -------
sdp_parser.c 1.18 1.19=20=20=20=20=20=20=20=20=20=20=20=20
sdp_parser.h 1.5 1.6=20=20=20=20=20=20=20=20=20=20=20=20=20
sdp_server.c 1.27 1.28=20=20=20=20=20=20=20=20=20=20=20=20
sdp_server.h 1.10 1.11=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
*Corrected bug when searching for multiple UUIDs in Service Search and Serv=
ice
Attribute Search
*Now we should be able to split up responses larger than the L2CAP MTU in s=
maller
packets
The diff of the modified file(s):
--- sdp_parser.c 2001/04/17 12:43:39 1.18
+++ sdp_parser.c 2001/06/14 10:30:42 1.19
@@ -127,12 +127,12 @@
/****************** LOCAL FUNCTION DECLARATION SECTION *******************=
***/
=20
void sdp_parse_data(unsigned char* data, unsigned int len);
-void process_service_search_req(int sdp_con_id, unsigned char *data,
- unsigned short len, unsigned int trans_id);
-void process_service_attr_req(int sdp_con_id, unsigned char *data,
- unsigned short len, int trans_id);
-void process_service_search_attr_req(int sdp_con_id, unsigned char *data,
- unsigned short len, int trans_id);
+void process_service_search_req(database_query_struct *db, unsigned char *=
data,
+ unsigned short len);
+void process_service_attr_req(database_query_struct *db, unsigned char *da=
ta,
+ unsigned short len);
+void process_service_search_attr_req(database_query_struct *db,
+ unsigned char *data, unsigned short len);
=20
void process_service_search_rsp(int sdp_con_id, unsigned char *data);
void process_service_attr_rsp(int sdp_con_id, unsigned char *data);
@@ -156,25 +156,25 @@
void=20
sdp_parse_data(unsigned char* data, unsigned int len)
{
+ database_query_struct db;
unsigned char id;
- unsigned short trans_id;
unsigned short par_len;
unsigned int pkt_len;
- int sdp_con_id;
data_struct *db_hdl;
=20
D_REC("%d bytes",len);
PRINT_DATA(__FUNCTION__, data, len);
=20
db_hdl =3D (data_struct*)data;
- data +=3D sizeof *db_hdl;
- len -=3D sizeof *db_hdl;
+ data +=3D sizeof(*db_hdl);
+ len -=3D sizeof(*db_hdl);
=20
- sdp_con_id =3D db_hdl->sdp_con_id;
+ db.sdp_con_id =3D db_hdl->sdp_con_id;
+ db.l2cap_mtu =3D db_hdl->l2cap_mtu;
pkt_len =3D db_hdl->len;
=20
id =3D data[SDP_HDR_TYPE];
- trans_id =3D CHAR2INT16(data[SDP_HDR_TRANS_ID_MS], data[SDP_HDR_TRANS_ID=
_LS]);
+ db.trans_id =3D CHAR2INT16(data[SDP_HDR_TRANS_ID_MS], data[SDP_HDR_TRANS=
_ID_LS]);
par_len =3D CHAR2INT16(data[SDP_HDR_LENGTH_MS], data[SDP_HDR_LENGTH_LS]);
data +=3D SDP_HDR_SIZE;
=20
@@ -182,7 +182,7 @@
{
D_XMIT("Packet length (%d) does not match received data length (%d)",
len - SDP_HDR_SIZE, par_len);
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_PDU_SIZE);
+ send_error_rsp(&db, SDP_INVALID_PDU_SIZE);
return;
}
=20
@@ -220,44 +220,44 @@
=20
case SDP_SERVICESEARCH_REQ:
D_REC("SDP_SERVICESEARCH_REQ %d bytes", par_len);
- process_service_search_req(sdp_con_id, data, par_len, trans_id);
+ process_service_search_req(&db, data, par_len);
break;
=20=20=20=20=20
case SDP_SERVICESEARCH_RSP:
D_REC("SDP_SERVICESEARCH_RSP");
- process_service_search_rsp(sdp_con_id, data);
+ process_service_search_rsp(db.sdp_con_id, data);
break;
=20=20=20=20=20
case SDP_SERVICEATTR_REQ:
D_REC("SDP_SERVICEATTR_REQ");
- process_service_attr_req(sdp_con_id, data, par_len, trans_id);
+ process_service_attr_req(&db, data, par_len);
break;
=20=20=20=20=20
case SDP_SERVICEATTR_RSP:
D_REC("SDP_SERVICEATTR_RSP");
- process_service_attr_rsp(sdp_con_id, data);
+ process_service_attr_rsp(db.sdp_con_id, data);
break;
=20=20=20=20=20
case SDP_SERVICESEARCHATTR_REQ:
D_REC("SDP_SERVICESEARCHATTR_REQ");
- process_service_search_attr_req(sdp_con_id, data, par_len, trans_id);
+ process_service_search_attr_req(&db, data, par_len);
break;
=20=20=20=20=20
case SDP_SERVICESEARCHATTR_RSP:
D_REC("SDP_SERVICESEARCHATTR_RSP");
- process_service_search_attr_rsp(sdp_con_id, data);
+ process_service_search_attr_rsp(db.sdp_con_id, data);
break;
=20=20=20=20=20
default:
D_REC("ERROR Invalid pdu type");
/* Send an error response with error code Invalid request syntax */
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
+ send_error_rsp(&db, SDP_INVALID_REQUEST_SYNTAX);
break;
}
}
=20
void
-process_service_search_req(int sdp_con_id, unsigned char *data, unsigned s=
hort len, unsigned int trans_id)
+process_service_search_req(database_query_struct *db, unsigned char *data,=
unsigned short len)
{
unsigned int service_search_uuid[12];
int service_search_uuid_cnt;
@@ -272,7 +272,7 @@
{
D_REC("Incorrect packet: Data Element Sequence expected");
/* Send an error msg with error code Invalid request syntax */
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
+ send_error_rsp(db, SDP_INVALID_REQUEST_SYNTAX);
return;
}
=20
@@ -284,7 +284,7 @@
{
D_REC("Incorrect packet: Incorrect length field or whole packet was no=
t received");
/* Send an error msg with error code Invalid request syntax */
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
+ send_error_rsp(db, SDP_INVALID_REQUEST_SYNTAX);
return;
}
=20
@@ -296,7 +296,7 @@
{
D_REC("More than 12 UUID in one request");
/* Send an error msg with error code Invalid request syntax */
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
+ send_error_rsp(db, SDP_INVALID_REQUEST_SYNTAX);
break;
}
=20
@@ -333,7 +333,7 @@
{
D_REC("Unknown UUID size 0x%02x", data[cur_pos]);
/* Send an error msg with error code Invalid request syntax */
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
+ send_error_rsp(db, SDP_INVALID_REQUEST_SYNTAX);
return;
}
}
@@ -349,13 +349,13 @@
{
D_ERR("Packet length (%d) shorter than actual packet length (%d)", len=
, cur_pos);
=20
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_PDU_SIZE);
+ send_error_rsp(db, SDP_INVALID_PDU_SIZE);
return;
}
else if (len > cur_pos)
{
D_ERR("Packet length (%d) longer than actual packet length (%d)", len,=
cur_pos);
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_PDU_SIZE);
+ send_error_rsp(db, SDP_INVALID_PDU_SIZE);
return;
}
=20=20=20
@@ -364,21 +364,19 @@
cur_pos +=3D data[cur_pos];
=20=20=20=20=20
D_MISC("Sending continuationstate packet");
- send_cont_state_search_rsp(cont_state_len, data + cur_pos, max_rec_cnt,
- sdp_con_id, trans_id);
+ send_cont_state_search_rsp(cont_state_len, data + cur_pos, max_rec_cnt=
,db);
}
else
{
service_search_struct db_hdl;
=20
- db_hdl.db.sdp_con_id =3D sdp_con_id;
- db_hdl.db.trans_id =3D trans_id;
- db_hdl.db.pkt_type =3D SDP_SERVICESEARCH_REQ;
+ db->pkt_type =3D SDP_SERVICESEARCH_REQ;
+ memcpy(&db_hdl.db, db, sizeof(database_query_struct));
=20
db_hdl.max_rec_cnt =3D max_rec_cnt;
db_hdl.service_class_cnt =3D service_search_uuid_cnt;
memcpy(db_hdl.service_class_list, service_search_uuid,
- service_search_uuid_cnt * sizeof *service_search_uuid);
+ service_search_uuid_cnt * sizeof(*service_search_uuid));
=20
/* Here we ask the database for the requested attributes */
handle_query(&db_hdl.db);
@@ -386,7 +384,7 @@
}
=20
void=20
-process_service_attr_req(int sdp_con_id, unsigned char *data, unsigned sho=
rt len, int trans_id)
+process_service_attr_req(database_query_struct *db, unsigned char *data, u=
nsigned short len)
{
service_attr_struct *db_hdl;
=20
@@ -418,7 +416,7 @@
{
D_REC("Incorrect packet: Data Element Sequence expected");
/* Send an error msg with error code Invalid request syntax */
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
+ send_error_rsp(db, SDP_INVALID_REQUEST_SYNTAX);
return;
}
=20
@@ -430,7 +428,7 @@
{
D_REC("Incorrect packet: Incorrect length field or whole packet was no=
t received");
/* Send an error msg with error code Invalid request syntax */
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
+ send_error_rsp(db, SDP_INVALID_REQUEST_SYNTAX);
return;
}
=20
@@ -472,13 +470,13 @@
if (len < cur_pos)
{
D_ERR("Packet length (%d) shorter than actual packet length (%d)", len=
, cur_pos);
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_PDU_SIZE);
+ send_error_rsp(db, SDP_INVALID_PDU_SIZE);
return;
}
else if (len > cur_pos)
{
D_ERR("Packet length (%d) longer than actual packet length (%d)", len,=
cur_pos);
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_PDU_SIZE);
+ send_error_rsp(db, SDP_INVALID_PDU_SIZE);
return;
}
=20=20=20
@@ -486,7 +484,7 @@
{
D_MISC("Sending continuationstate packet");
send_cont_state_attr_rsp(cont_state_len, data + cur_pos, max_attr_cnt,
- sdp_con_id, trans_id);
+ db);
}
else
{
@@ -494,15 +492,15 @@
=20
if (!(db_hdl =3D malloc(len))) {
D_ERR("malloc failed to allocate %d bytes!", len);
- send_error_rsp(sdp_con_id, trans_id, SDP_INSUFFICIENT_RESOURCE=
S);
+ send_error_rsp(db, SDP_INSUFFICIENT_RESOURCES);
return;
}
=20
D_MEM("---> malloc%d %d bytes at 0x%08x", malloc_dbg++, len, (int)db_h=
dl);
=20=20=20=20=20
- db_hdl->db.sdp_con_id =3D sdp_con_id;
- db_hdl->db.trans_id =3D trans_id;
- db_hdl->db.pkt_type =3D SDP_SERVICEATTR_REQ;
+=20=20=20=20
+ db->pkt_type =3D SDP_SERVICEATTR_REQ;
+ memcpy(&db_hdl->db, db, sizeof(database_query_struct));=20=20=20=20
=20=20=20=20=20
db_hdl->max_attr_byte_cnt =3D max_attr_cnt;
db_hdl->rec_hdl =3D rec_hdl;
@@ -519,7 +517,7 @@
}
=20
void=20
-process_service_search_attr_req(int sdp_con_id, unsigned char *data, unsig=
ned short len,int trans_id)
+process_service_search_attr_req(database_query_struct *db, unsigned char *=
data, unsigned short len)
{
service_search_attr_struct *db_hdl;
unsigned int service_search_uuid[12];
@@ -537,7 +535,7 @@
{
D_REC("Incorrect packet: Data Element Sequence expected");
/* Send an error msg with error code Invalid request syntax */
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
+ send_error_rsp(db, SDP_INVALID_REQUEST_SYNTAX);
return;
}
=20
@@ -549,7 +547,7 @@
{
D_REC("Incorrect packet: Incorrect length field or whole packet was no=
t received");
/* Send an error msg with error code Invalid request syntax */
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
+ send_error_rsp(db, SDP_INVALID_REQUEST_SYNTAX);
return;
}
=20=20=20
@@ -595,7 +593,7 @@
else
{
D_REC("Unknown UUID size 0x%02x", data[cur_pos]);
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
+ send_error_rsp(db, SDP_INVALID_REQUEST_SYNTAX);
return;
}
}
@@ -609,7 +607,7 @@
{
D_REC("Incorrect packet: Data Element Sequence expected");
/* Send an error msg with error code Invalid request syntax */
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
+ send_error_rsp(db, SDP_INVALID_REQUEST_SYNTAX);
return;
}
=20
@@ -658,13 +656,13 @@
if (len < cur_pos)
{
D_ERR("Packet length (%d) shorter than actual packet length (%d)", len=
, cur_pos);
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_PDU_SIZE);
+ send_error_rsp(db, SDP_INVALID_PDU_SIZE);
return;
}
else if (len > cur_pos)
{
D_ERR("Packet length (%d) longer than actual packet length 8%d)", len,=
cur_pos);
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_PDU_SIZE);
+ send_error_rsp(db, SDP_INVALID_PDU_SIZE);
return;
}
=20=20=20
@@ -672,7 +670,7 @@
{
D_MISC("Sending continuationstate packet");
send_cont_state_attr_rsp(cont_state_len, data + cur_pos, max_attr_cnt,
- sdp_con_id, trans_id);
+ db);
}
else
{
@@ -680,15 +678,14 @@
=20
if (!(db_hdl =3D malloc(tmp_len))) {
D_ERR("malloc failed to allocate %d bytes!", tmp_len);
- send_error_rsp(sdp_con_id, trans_id, SDP_INSUFFICIENT_RESOURCE=
S);
+ send_error_rsp(db, SDP_INSUFFICIENT_RESOURCES);
return;
}
=20
D_MEM("---> malloc%d %d bytes at 0x%08x", malloc_dbg++, tmp_len, (int)=
db_hdl);
=20=20=20=20=20
- db_hdl->db.sdp_con_id =3D sdp_con_id;
- db_hdl->db.trans_id =3D trans_id;
- db_hdl->db.pkt_type =3D SDP_SERVICESEARCHATTR_REQ;
+ db->pkt_type =3D SDP_SERVICESEARCHATTR_REQ;
+ memcpy(&db_hdl->db, db, sizeof(database_query_struct));
=20=20=20=20=20
db_hdl->max_attr_byte_cnt =3D max_attr_cnt;
db_hdl->service_class_cnt =3D service_search_uuid_cnt;
@@ -720,7 +717,7 @@
}
=20
void
-send_error_rsp(int sdp_con_id, unsigned short trans_id, unsigned short err=
_code)
+send_error_rsp(database_query_struct *db, unsigned short err_code)
{
unsigned char sdp_data[7];
unsigned short pdu_len;
@@ -731,15 +728,15 @@
pdu_len =3D 2;
=20=20=20
sdp_data[0] =3D SDP_ERROR_RSP;
- sdp_data[1] =3D (trans_id >> 8) & 0xff;
- sdp_data[2] =3D trans_id & 0xff;
+ sdp_data[1] =3D (db->trans_id >> 8) & 0xff;
+ sdp_data[2] =3D db->trans_id & 0xff;
sdp_data[3] =3D (pdu_len >> 8) & 0xff;
sdp_data[4] =3D pdu_len & 0xff;
=20
sdp_data[5] =3D (err_code >> 8) & 0xff;
sdp_data[6] =3D err_code & 0xff;
=20
- write2stack(sdp_con_id, sdp_data, 7);
+ write2stack(db->sdp_con_id, sdp_data, 7);
}
=20
/* "Support" functions used by the other functions in this file */
--- sdp_parser.h 2001/03/23 16:19:36 1.5
+++ sdp_parser.h 2001/06/14 10:30:42 1.6
@@ -53,6 +53,13 @@
#define SDP_PROC_FILE "/tmp/sdp_sock"
#endif
=20
+#ifndef TRUE
+#define TRUE 1
+#endif
+#ifndef FALSE
+#define FALSE 0
+#endif
+
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MAX(a,b) ((a) > (b) ? (a) : (b))
=20
@@ -80,15 +87,15 @@
/****************** TYPE DEFINITION SECTION ******************************=
***/
=20
typedef struct data_struct {
- unsigned int sdp_con_id;
- int len;
+ unsigned short l2cap_mtu;
+ unsigned short sdp_con_id;
+ unsigned short len;
+ unsigned char data[0];
} data_struct;
=20
/****************** EXPORTED FUNCTION DECLARATION SECTION ****************=
***/
=20
void write2stack(int sdp_con_id, char *data, int len);
-void send_error_rsp(int sdp_con_id, unsigned short trans_id,
- unsigned short err_code);
=20
#endif
/****************** END OF FILE sdp_parser.h *****************************=
***/
--- sdp_server.c 2001/04/17 12:43:39 1.27
+++ sdp_server.c 2001/06/14 10:30:42 1.28
@@ -124,6 +124,10 @@
void set_sdp_hdr(unsigned char *hdr, unsigned char pkt_type,
unsigned short trans_id, unsigned short len);
=20
+unsigned int* remove_dublicated_rec_hdl(unsigned int *rec_hdl_list_in,
+ unsigned int cnt_in);
+unsigned int* get_all_rec_hdl(unsigned int *service_class_list,
+ unsigned int service_class_cnt);
unsigned int get_record_handle(unsigned short service_class, int fd);
=20
char* get_attribute_range(int fd, unsigned int record_handle,
@@ -396,6 +400,87 @@
hdr[SDP_HDR_LENGTH_LS] =3D SHORT2CHAR_LS(len);
}
=20
+unsigned int*
+remove_dublicated_rec_hdl(unsigned int *rec_hdl_list_in, unsigned int cnt_=
in)=20=20
+{
+ static unsigned int rec_hdl_list_out[128];
+ unsigned int i, j, cnt_out =3D 0;
+ unsigned int existing =3D FALSE;
+=20=20=20=20
+ for (i =3D 0; i < cnt_in; i++)
+ {
+ for (j =3D 0; j < cnt_out; j++)
+ {
+ if (rec_hdl_list_in[i] =3D=3D rec_hdl_list_out[j])
+ {
+ existing =3D TRUE;
+ }
+ }
+=20=20=20=20=20=20
+ if(!existing)
+ {
+ rec_hdl_list_out[cnt_out] =3D rec_hdl_list_in[i];
+ D_RHDL(__FUNCTION__": Found record_handle 0x%08x", rec_hdl_list_out[cnt_o=
ut]);
+ cnt_out++;
+ existing =3D FALSE;
+ }
+ }
+
+ rec_hdl_list_out[cnt_out] =3D NO_REC_HDL;
+
+ return rec_hdl_list_out;
+}
+
+unsigned int*
+get_all_rec_hdl(unsigned int *service_class_list, unsigned int service_cla=
ss_cnt)
+{
+ unsigned int rec_hdl_list[64];
+ unsigned int *tmp_hdl_list;
+ unsigned int rec_hdl_cnt =3D 0;
+ int i, j;
+=20=20
+ D_RHDL(__FUNCTION__": service_class_cnt:%d", service_class_cnt);
+
+ for (i =3D 0; i < service_class_cnt; i++)
+ {
+ D_RHDL(__FUNCTION__": Service Class:0x%08x", service_class_list[i]);
+ if ((rec_hdl_list[rec_hdl_cnt] =3D get_record_handle(service_class_lis=
t[i], xml_fd)) !=3D NO_REC_HDL)
+ {
+ D_REC("Got Record handle1: 0x%08x", rec_hdl_list[rec_hdl_cnt]);
+ rec_hdl_cnt++;
+ }
+=20=20=20=20=20=20=20=20
+ tmp_hdl_list =3D get_more_rec_hdl(service_class_list[i], xml_fd);
+
+ if (is_err())
+ {
+ D_MEM("<--- free%d 0x%8p", --malloc_dbg, tmp_hdl_list);
+ free(tmp_hdl_list);
+ return NULL;
+ }
+
+ if (tmp_hdl_list)
+ {
+ j =3D 0;
+ while (tmp_hdl_list[j] !=3D NO_REC_HDL)
+ {
+ rec_hdl_list[rec_hdl_cnt] =3D tmp_hdl_list[j];
+ D_REC("Got Record handle2: 0x%08x", rec_hdl_list[rec_hdl_cnt]);
+ rec_hdl_cnt++;
+ j++;
+ }
+=20=20=20=20=20=20
+ D_MEM("<--- free%d 0x%8p", --malloc_dbg, tmp_hdl_list);
+ free(tmp_hdl_list);
+ }
+=20=20=20=20
+ }
+=20=20
+ tmp_hdl_list =3D remove_dublicated_rec_hdl(rec_hdl_list, rec_hdl_cnt);
+=20
+ return tmp_hdl_list;
+}
+
unsigned int
get_record_handle(unsigned short service_class, int fd)
{
@@ -451,9 +536,9 @@
{
S_FNC("Found Record Handle %s", attr[1]);
s_hdl->tmp_hdl =3D strtoul(attr[1], NULL, 16);
- S_FNC("Found Record Handle 0x%08x", s_hdl->tmp_hdl);
+ S_FNC("Found Record Handle converted to int 0x%08x", s_hdl->tmp_hdl);
}
- if ((s_hdl->tmp_hdl) && (strcmp(el, s_hdl->uuid) =3D=3D 0))
+ if ((s_hdl->tmp_hdl !=3D NO_REC_HDL) && (strcmp(el, s_hdl->uuid) =3D=3D =
0))
{
if ((s_hdl->hdl_list_len > 0) &&
(s_hdl->tmp_hdl =3D=3D s_hdl->hdl_list[s_hdl->hdl_list_len - 1]))
@@ -473,8 +558,8 @@
if (s_hdl->hdl_list_len >=3D s_hdl->hdl_list_max)
{
s_hdl->hdl_list_max +=3D 16;
- tmp =3D realloc(s_hdl->hdl_list, s_hdl->hdl_list_max * sizeof *s_h=
dl->hdl_list);
- D_MEM("---> realloc%d %ld bytes at 0x%8p", malloc_dbg++, s_hdl->hd=
l_list_max * sizeof *s_hdl->hdl_list, tmp);
+ tmp =3D realloc(s_hdl->hdl_list, s_hdl->hdl_list_max * sizeof(*s_h=
dl->hdl_list));
+ D_MEM("---> realloc%d %ld bytes at 0x%8p", malloc_dbg++, s_hdl->hd=
l_list_max * sizeof(*s_hdl->hdl_list), tmp);
if (!tmp)
{
set_err(SDP_INSUFFICIENT_RESOURCES);
@@ -485,7 +570,8 @@
s_hdl->hdl_list =3D tmp;
}
=20=20=20=20=20
- s_hdl->hdl_list[s_hdl->hdl_list_len++] =3D s_hdl->tmp_hdl;
+ s_hdl->hdl_list[s_hdl->hdl_list_len] =3D s_hdl->tmp_hdl;
+ s_hdl->hdl_list_len++;
}
}
}
@@ -525,8 +611,8 @@
=20
s_hdl.hdl_list_len =3D 0;
s_hdl.hdl_list_max =3D 16;
- s_hdl.hdl_list =3D malloc(s_hdl.hdl_list_max * sizeof *s_hdl.hdl_list);
- D_MEM("---> malloc%d %ld bytes at 0x%8p", malloc_dbg++, s_hdl.hdl_list_m=
ax * sizeof *s_hdl.hdl_list, s_hdl.hdl_list);
+ s_hdl.hdl_list =3D malloc(s_hdl.hdl_list_max * sizeof(*s_hdl.hdl_list));
+ D_MEM("---> malloc%d %ld bytes at 0x%8p", malloc_dbg++, s_hdl.hdl_list_m=
ax * sizeof(*s_hdl.hdl_list), s_hdl.hdl_list);
if (!s_hdl.hdl_list)
{
set_err(SDP_INSUFFICIENT_RESOURCES);
@@ -557,8 +643,8 @@
{
s_hdl.hdl_list_max++;
=20
- tmp =3D realloc(s_hdl.hdl_list, s_hdl.hdl_list_max * sizeof *s_hdl.hdl=
_list);
- D_MEM("---> realloc%d %ld bytes at 0x%8p", malloc_dbg++, s_hdl.hdl_lis=
t_max * sizeof *s_hdl.hdl_list, tmp);
+ tmp =3D realloc(s_hdl.hdl_list, s_hdl.hdl_list_max * sizeof(*s_hdl.hdl=
_list));
+ D_MEM("---> realloc%d %ld bytes at 0x%8p", malloc_dbg++, s_hdl.hdl_lis=
t_max * sizeof(*s_hdl.hdl_list), tmp);
if (!tmp)
{
set_err(SDP_INSUFFICIENT_RESOURCES);
@@ -570,7 +656,7 @@
s_hdl.hdl_list =3D tmp;
}
=20
- s_hdl.hdl_list[s_hdl.hdl_list_len++] =3D NO_REC_HDL;
+ s_hdl.hdl_list[s_hdl.hdl_list_len] =3D NO_REC_HDL;
=20
return s_hdl.hdl_list;
}
@@ -1239,46 +1325,30 @@
/* FIXME: Add features to handle continuation states and multiple service
classes */
=20
+
void=20
handle_service_search_req(service_search_struct *db_hdl)
{
unsigned char rsp_pkt[256];
int rsp_pkt_len;
- unsigned int rec_hdl, rec_hdl_cnt =3D 0;
unsigned int *rec_hdl_list;
+ unsigned int rec_hdl_cnt =3D 0;
+ unsigned int max_rec_cnt;
int i;
-=20=20
- rec_hdl =3D get_record_handle(db_hdl->service_class_list[0], xml_fd);
-
- D_REC("Got Record handle: 0x%08x", rec_hdl);
=20
- if (rec_hdl !=3D NO_REC_HDL)
- {
- rec_hdl_cnt++;
- }
-
- rec_hdl_list =3D get_more_rec_hdl(db_hdl->service_class_list[0], xml_fd);
+ rec_hdl_list =3D get_all_rec_hdl(db_hdl->service_class_list, db_hdl->ser=
vice_class_cnt);
=20
if (is_err())
{
- D_MEM("<--- free%d 0x%8p", --malloc_dbg, rec_hdl_list);
- free(rec_hdl_list);
- send_error_rsp(db_hdl->db.sdp_con_id, db_hdl->db.trans_id, get_err());
- return;
+ send_error_rsp(&db_hdl->db, get_err());
}
=20=20=20
if (rec_hdl_list)
{
- for (i =3D 0; rec_hdl_list[i] !=3D NO_REC_HDL; i++)
- {
- D_REC("Got Record handle: 0x%08x", rec_hdl_list[i]);
- if (rec_hdl =3D=3D rec_hdl_list[i])
+ while (rec_hdl_list[rec_hdl_cnt] !=3D NO_REC_HDL)
{
- rec_hdl_cnt--;
- rec_hdl =3D NO_REC_HDL;
- }
+ rec_hdl_cnt++;
}
- rec_hdl_cnt +=3D i;
}
=20=20=20=20=20
rsp_pkt_len =3D SDP_HDR_SIZE;=20=20
@@ -1291,35 +1361,31 @@
rsp_pkt[rsp_pkt_len++] =3D SHORT2CHAR_MS(rec_hdl_cnt);
rsp_pkt[rsp_pkt_len++] =3D SHORT2CHAR_LS(rec_hdl_cnt);
=20=20=20
- if (rec_hdl !=3D NO_REC_HDL)
- {
- rsp_pkt[rsp_pkt_len++] =3D (rec_hdl >> 24) & 0xff;
- rsp_pkt[rsp_pkt_len++] =3D (rec_hdl >> 16) & 0xff;
- rsp_pkt[rsp_pkt_len++] =3D (rec_hdl >> 8) & 0xff;
- rsp_pkt[rsp_pkt_len++] =3D rec_hdl & 0xff;
- }
-
if (rec_hdl_list)
{
- for (i =3D 0; rec_hdl_list[i] !=3D NO_REC_HDL; i++)
+ for (i =3D 0; i < rec_hdl_cnt; i++)
{
rsp_pkt[rsp_pkt_len++] =3D (rec_hdl_list[i] >> 24) & 0xff;
rsp_pkt[rsp_pkt_len++] =3D (rec_hdl_list[i] >> 16) & 0xff;
rsp_pkt[rsp_pkt_len++] =3D (rec_hdl_list[i] >> 8) & 0xff;
rsp_pkt[rsp_pkt_len++] =3D rec_hdl_list[i] & 0xff;
}
- D_MEM("<--- free%d 0x%8p", --malloc_dbg, rec_hdl_list);
- free(rec_hdl_list);
}
=20=20=20
set_sdp_hdr(rsp_pkt, SDP_SERVICESEARCH_RSP, db_hdl->db.trans_id,
rsp_pkt_len - SDP_HDR_SIZE);
=20
- rsp_pkt_len =3D set_cont_state_search(rsp_pkt, rsp_pkt_len, db_hdl->max_=
rec_cnt);
+ max_rec_cnt =3D MIN(db_hdl->max_rec_cnt, db_hdl->db.l2cap_mtu - 11);
+ /* 11 comes from SDP_HDR_SIZE + tot+cur-rec cnt fiel + 2 bytes for cont
+ state */
=20
+ D_REC("l2cap_mtu:%d, mrc:%d, db->mrc:%d\n", db_hdl->db.l2cap_mtu, max_re=
c_cnt, db_hdl->max_rec_cnt);
+=20=20
+ rsp_pkt_len =3D set_cont_state_search(rsp_pkt, rsp_pkt_len, max_rec_cnt);
+
if (is_err())
{
- send_error_rsp(db_hdl->db.sdp_con_id, db_hdl->db.trans_id, get_err());
+ send_error_rsp(&db_hdl->db, get_err());
return;
}
=20=20=20
@@ -1332,6 +1398,7 @@
unsigned char rsp_pkt[256];
int rsp_pkt_len, i, des_len_pos;
unsigned char *tmp_ptr;
+ unsigned int max_attr_byte_cnt;
=20=20=20=20=20
/* Skip the sdp header and the attribute byte count field */
rsp_pkt_len =3D SDP_HDR_SIZE + 2;
@@ -1361,7 +1428,7 @@
}
else if (is_err())
{
- send_error_rsp(db_hdl->db.sdp_con_id, db_hdl->db.trans_id, get_err()=
);
+ send_error_rsp(&db_hdl->db, get_err());
return;
}
}
@@ -1378,11 +1445,16 @@
set_sdp_hdr(rsp_pkt, SDP_SERVICEATTR_RSP, db_hdl->db.trans_id,
rsp_pkt_len - SDP_HDR_SIZE);
=20
- rsp_pkt_len =3D set_cont_state_attr(rsp_pkt, rsp_pkt_len,db_hdl->max_att=
r_byte_cnt);
+ max_attr_byte_cnt =3D MIN(db_hdl->max_attr_byte_cnt, db_hdl->db.l2cap_mt=
u - 9);
+ /* 9 comes from SDP_HDR_SIZE + attr byte nt field + 2 bytes for cont sta=
te */
+
+ D_REC("l2cap_mtu:%d, mabc:%d, db->mabc:%d\n", db_hdl->db.l2cap_mtu, max_=
attr_byte_cnt, db_hdl->max_attr_byte_cnt);
+=20=20=20
+ rsp_pkt_len =3D set_cont_state_attr(rsp_pkt, rsp_pkt_len, max_attr_byte_=
cnt);
=20
if (is_err())
{
- send_error_rsp(db_hdl->db.sdp_con_id, db_hdl->db.trans_id, get_err());
+ send_error_rsp(&db_hdl->db, get_err());
return;
}
=20=20=20
@@ -1393,42 +1465,31 @@
handle_service_search_attr_req(service_search_attr_struct *db_hdl)
{
unsigned char *tmp_ptr;
- unsigned int rec_hdl;
unsigned int *rec_hdl_list;
unsigned int rec_hdl_cnt;
unsigned char rsp_pkt[1024];
+ unsigned int max_attr_byte_cnt;
int rsp_pkt_len =3D 0, tmp_len, des_len_pos, i, j =3D 0;
-
- rec_hdl =3D get_record_handle(db_hdl->service_class_list[0], xml_fd);
-
- D_REC("Got Record handle: 0x%08x", rec_hdl);
=20=20=20
- rec_hdl_list =3D get_more_rec_hdl(db_hdl->service_class_list[0], xml_fd);
+ rec_hdl_list =3D get_all_rec_hdl(db_hdl->service_class_list, db_hdl->ser=
vice_class_cnt);
=20=20=20
if (is_err())
{
+ if (rec_hdl_list)
+ {
D_MEM("<--- free%d 0x%8p", --malloc_dbg, rec_hdl_list);
free(rec_hdl_list);
- send_error_rsp(db_hdl->db.sdp_con_id, db_hdl->db.trans_id, get_err());
+ }
+ send_error_rsp(&db_hdl->db, get_err());
return;
}
=20=20=20
- rec_hdl_cnt =3D 0;
if (rec_hdl_list)
- {
- for (i =3D 0; rec_hdl_list[i] !=3D NO_REC_HDL; i++)
- {
- if (rec_hdl_list[i] !=3D rec_hdl)
{
- D_REC("Got Record handle list %d: 0x%08x", i, rec_hdl_list[i]);
- j++;
- }
- else
+ while (rec_hdl_list[rec_hdl_cnt] !=3D NO_REC_HDL)
{
- D_REC("Dupplicated record handle %d: 0x%08x", i, rec_hdl_list[i]);
- }
+ rec_hdl_cnt++;
}
- rec_hdl_cnt +=3D j;
}
=20=20=20
/* Skip the sdp header and the attribute byte count field */
@@ -1438,14 +1499,6 @@
des_len_pos =3D rsp_pkt_len;
rsp_pkt_len +=3D 2;
=20
- if (!rec_hdl_cnt) {
- D_MEM("<--- free%d 0x%8p", --malloc_dbg, rec_hdl_list);
- free(rec_hdl_list);
-
- rec_hdl_cnt =3D 1;
- rec_hdl_list =3D &rec_hdl;
- }
-
for (j =3D 0; j < rec_hdl_cnt; j++)
{
tmp_len =3D 2;
@@ -1472,12 +1525,12 @@
}
else if (is_err())
{
- if (rec_hdl_list !=3D &rec_hdl)
+ if (rec_hdl_list)
{
D_MEM("<--- free%d 0x%8p", --malloc_dbg, rec_hdl_list);
free(rec_hdl_list);
}
- send_error_rsp(db_hdl->db.sdp_con_id, db_hdl->db.trans_id, get_err=
());
+ send_error_rsp(&db_hdl->db, get_err());
return;
}
}
@@ -1488,7 +1541,7 @@
rsp_pkt_len +=3D tmp_len;
}
}
- if (rec_hdl_list !=3D &rec_hdl)
+ if (rec_hdl_list)
{
D_MEM("<--- free%d 0x%8p", --malloc_dbg, rec_hdl_list);
free(rec_hdl_list);
@@ -1508,11 +1561,16 @@
set_sdp_hdr(rsp_pkt, SDP_SERVICESEARCHATTR_RSP, db_hdl->db.trans_id,
rsp_pkt_len - SDP_HDR_SIZE);
=20=20=20
- rsp_pkt_len =3D set_cont_state_attr(rsp_pkt, rsp_pkt_len,db_hdl->max_att=
r_byte_cnt);
+ max_attr_byte_cnt =3D MIN(db_hdl->max_attr_byte_cnt, db_hdl->db.l2cap_mt=
u - 9);
+ /* 9 comes from SDP_HDR_SIZE + attr byte nt field + 2 bytes for cont sta=
te */
=20=20=20
+ D_REC("l2cap_mtu:%d, mabc:%d, db->mabc:%d\n", db_hdl->db.l2cap_mtu, max_=
attr_byte_cnt, db_hdl->max_attr_byte_cnt);
+=20=20
+ rsp_pkt_len =3D set_cont_state_attr(rsp_pkt, rsp_pkt_len, max_attr_byte_=
cnt);
+=20=20
if (is_err())
{
- send_error_rsp(db_hdl->db.sdp_con_id, db_hdl->db.trans_id, get_err());
+ send_error_rsp(&db_hdl->db, get_err());
return;
}
=20=20=20
@@ -1641,13 +1699,13 @@
=20
void
send_cont_state_search_rsp(int len, unsigned char *info, int max_rec_cnt,
- int sdp_con_id, int trans_id)
+ database_query_struct *db)
{
unsigned char *send_buf;
int send_len;
=20=20=20
if (!cont_state_buf) {
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_CONTINUATION_STATE);
+ send_error_rsp(db, SDP_INVALID_CONTINUATION_STATE);
}
else if ((max_rec_cnt * 4) >=3D cont_state_buf->len)
{
@@ -1659,11 +1717,11 @@
D_MEM("---> malloc%d %d bytes at 0x%8p", malloc_dbg++, send_len, send_=
buf);
if (!send_buf)
{
- send_error_rsp(sdp_con_id, trans_id, SDP_INSUFFICIENT_RESOURCES);
+ send_error_rsp(db, SDP_INSUFFICIENT_RESOURCES);
return;
}
=20
- set_sdp_hdr(send_buf, cont_state_buf->pdu, trans_id, send_len - SDP_HD=
R_SIZE);
+ set_sdp_hdr(send_buf, cont_state_buf->pdu, db->trans_id, send_len - SD=
P_HDR_SIZE);
=20
/* Set the attribute byte count field */
send_buf[SDP_HDR_SIZE] =3D SHORT2CHAR_MS(cont_state_buf->len / 4);
@@ -1678,7 +1736,7 @@
send_buf[send_len - 1] =3D 0;
=20
/* Send the whole buffer */
- write2stack(sdp_con_id, send_buf, send_len);
+ write2stack(db->sdp_con_id, send_buf, send_len);
=20
D_MEM("<--- free%d 0x%8p", --malloc_dbg, send_buf);
free(send_buf);
@@ -1693,19 +1751,19 @@
=20
/* FIXME: Have to implement this too... */
=20
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_SDP_VERSION);
+ send_error_rsp(db, SDP_INVALID_SDP_VERSION);
}
}
=20
void
send_cont_state_attr_rsp(int len, unsigned char *info, int max_attr_cnt,
- int sdp_con_id, int trans_id)
+ database_query_struct *db)
{
unsigned char *send_buf;
int send_len;
=20=20=20
if (!cont_state_buf) {
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_CONTINUATION_STATE);
+ send_error_rsp(db, SDP_INVALID_CONTINUATION_STATE);
}
else if (max_attr_cnt >=3D cont_state_buf->len)
{
@@ -1717,11 +1775,11 @@
D_MEM("---> malloc%d %d bytes at 0x%8p", malloc_dbg++, send_len, send_=
buf);
if (!send_buf)
{
- send_error_rsp(sdp_con_id, trans_id, SDP_INSUFFICIENT_RESOURCES);
+ send_error_rsp(db, SDP_INSUFFICIENT_RESOURCES);
return;
}
=20
- set_sdp_hdr(send_buf, cont_state_buf->pdu, trans_id, send_len - SDP_HD=
R_SIZE);
+ set_sdp_hdr(send_buf, cont_state_buf->pdu, db->trans_id, send_len - SD=
P_HDR_SIZE);
=20
/* Set the attribute byte count field */
send_buf[SDP_HDR_SIZE] =3D SHORT2CHAR_MS(cont_state_buf->len);
@@ -1732,7 +1790,7 @@
send_buf[send_len - 1] =3D 0;
=20
/* Send the whole buffer */
- write2stack(sdp_con_id, send_buf, send_len);
+ write2stack(db->sdp_con_id, send_buf, send_len);
=20
D_MEM("<--- free%d 0x%8p", --malloc_dbg, send_buf);
free(send_buf);
@@ -1747,6 +1805,6 @@
=20
/* FIXME: Have to implement this too... */
=20
- send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_SDP_VERSION);
+ send_error_rsp(db, SDP_INVALID_SDP_VERSION);
}
}
--- sdp_server.h 2001/03/26 15:52:26 1.10
+++ sdp_server.h 2001/06/14 10:30:42 1.11
@@ -116,9 +116,10 @@
=20
typedef struct database_query_struct
{
- unsigned int sdp_con_id;
- unsigned int trans_id;
- unsigned int pkt_type;
+ unsigned short l2cap_mtu;=20
+ unsigned short sdp_con_id;
+ unsigned short trans_id;
+ unsigned short pkt_type;
} database_query_struct;
=20
typedef struct service_search_struct
@@ -160,11 +161,15 @@
void handle_query(database_query_struct *db_hdl);
void init_sdp_server(int fd);
void print_data(const char *message, const unsigned char *buf, int len);
-void send_cont_state_attr_rsp(int len, unsigned char *info, int max_attr_c=
nt,
- int sdp_con_id, int trans_id);
-void send_cont_state_search_rsp(int len, unsigned char *info, int max_rec_=
cnt,
- int sdp_con_id, int trans_id);
+void
+send_cont_state_search_rsp(int len, unsigned char *info, int max_rec_cnt,
+ database_query_struct *db);
+void
+send_cont_state_attr_rsp(int len, unsigned char *info, int max_attr_cnt,
+ database_query_struct *db);
unsigned int *get_more_rec_hdl(unsigned short servive_class, int fd);
+void send_error_rsp(database_query_struct *db, unsigned short err_code);
+
=20
#endif
/****************** END OF FILE sdp_server.h *****************************=
***/
|
