korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-13 22:14:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

hcidump: Use better way of counting the number of L2CAP channels per PSM

Browse Source
This commit is contained in:
Marcel Holtmann 2004-11-20 21:18:20 +00:00
parent dd106b1734
commit 669b75fc6e
1 changed files with 26 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
tools/parser/l2cap.c
View File

@ -61,14 +61,6 @@ static cid_info cid_table[2][CID_TABLE_SIZE];
#define SCID cid_table[0] #define SCID cid_table[0]
#define DCID cid_table[1] #define DCID cid_table[1]
typedef struct {
uint16_t psm;
uint16_t num;
} psm_info;
#define PSM_TABLE_SIZE 20
static psm_info psm_table[PSM_TABLE_SIZE];
static struct frame *add_handle(uint16_t handle) static struct frame *add_handle(uint16_t handle)
{ {
register handle_info *t = handle_table; register handle_info *t = handle_table;
@ -100,39 +92,24 @@ static void add_cid(int in, uint16_t cid, uint16_t psm)
register int i, pos = -1; register int i, pos = -1;
uint16_t num = 1; uint16_t num = 1;
if (in) { for (i = 0; i < CID_TABLE_SIZE; i++) {
for (i = 0; i < PSM_TABLE_SIZE; i++) if ((pos < 0 && !table[i].cid) || table[i].cid == cid)
if (psm_table[i].psm == psm) pos = i;
num = psm_table[i].num; if (table[i].psm == psm)
} else { num++;
for (i = 0; i < PSM_TABLE_SIZE; i++) {
if (psm_table[i].psm == psm) {
pos = i;
break;
} else if (pos < 0 && !psm_table[i].psm)
pos = i;
}
if (pos >= 0) {
psm_table[pos].psm = psm;
psm_table[pos].num++;
num = psm_table[pos].num;
}
} }
for (i = 0; i < CID_TABLE_SIZE; i++) if (pos >= 0) {
if (!table[i].cid || table[i].cid == cid) { table[pos].cid = cid;
table[i].cid = cid; table[pos].psm = psm;
table[i].psm = psm; table[pos].num = num;
table[i].num = num; }
break;
}
} }
static void del_cid(int in, uint16_t dcid, uint16_t scid) static void del_cid(int in, uint16_t dcid, uint16_t scid)
{ {
register int t, i; register int t, i;
uint16_t cid[2], psm = 0; uint16_t cid[2];
if (!in) { if (!in) {
cid[0] = dcid; cid[0] = dcid;
@ -145,21 +122,12 @@ static void del_cid(int in, uint16_t dcid, uint16_t scid)
for (t = 0; t < 2; t++) { for (t = 0; t < 2; t++) {
for (i = 0; i < CID_TABLE_SIZE; i++) for (i = 0; i < CID_TABLE_SIZE; i++)
if (cid_table[t][i].cid == cid[t]) { if (cid_table[t][i].cid == cid[t]) {
psm = cid_table[t][i].psm;
cid_table[t][i].cid = 0; cid_table[t][i].cid = 0;
cid_table[t][i].psm = 0;
cid_table[t][i].num = 0;
break; break;
} }
} }
for (i = 0; i < PSM_TABLE_SIZE; i++)
if (psm_table[i].psm == psm) {
if (psm_table[i].num < 2) {
psm_table[i].psm = 0;
psm_table[i].num = 0;
} else
psm_table[i].num--;
break;
}
} }
static uint16_t get_psm(int in, uint16_t cid) static uint16_t get_psm(int in, uint16_t cid)
@ -236,8 +204,19 @@ static inline void conn_rsp(int level, struct frame *frm)
l2cap_conn_rsp *h = frm->ptr; l2cap_conn_rsp *h = frm->ptr;
uint16_t psm; uint16_t psm;
if ((psm = get_psm(!frm->in, btohs(h->scid)))) switch (h->result) {
add_cid(frm->in, btohs(h->dcid), psm); case L2CAP_CR_SUCCESS:
if ((psm = get_psm(!frm->in, btohs(h->scid))))
add_cid(frm->in, btohs(h->dcid), psm);
break;
case L2CAP_CR_PEND:
break;
default:
del_cid(frm->in, btohs(h->dcid), btohs(h->scid));
break;
}
if (p_filter(FILT_L2CAP)) if (p_filter(FILT_L2CAP))
return; return;