osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Frank Wang: 

The ULMAP decoder can get a wrong bit offset when decoding CQICH_Alloc_IE.
The finishing position shoud not pad to byte but pad to the length specified,
which can be nibble aligned.

svn path=/trunk/; revision=25703
This commit is contained in:
Jaap Keuter 2008-07-11 16:03:06 +00:00
parent 0c18cbc98f
commit 77c287a58c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/wimax/msg_ulmap.c
View File

@ -1163,6 +1163,7 @@ gint CQICH_Alloc_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gi
/* offset of TLV in nibbles, length of TLV in nibbles */
gint bit;
gint data;
gint target;
proto_item *ti = NULL;
proto_item *tree = NULL;
gint rci, rtype, ftype, zperm, mgi, api, pad;
@ -1174,6 +1175,7 @@ gint CQICH_Alloc_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gi
XBIT(data, 4, "Extended UIUC");
XBIT(data, 4, "Length");
target = bit + BYTE_TO_BIT(data);
if (cqich_id_size == 0) {
proto_tree_add_text(tree, tvb, BITHI(bit, 1), "CQICH_ID: n/a (size == 0 bits)");
@ -1218,7 +1220,7 @@ gint CQICH_Alloc_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gi
}
XBIT(data, 2, "MIMO_permutation_feedback_cycle");
pad = BIT_PADDING(bit,8);
pad = target - bit;
if (pad) {
proto_tree_add_text(tree, tvb, BITHI(bit, pad), "Padding: %d bits", pad);
bit += pad;