diff options
| author | martinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-06-23 09:24:32 +0000 |
|---|---|---|
| committer | martinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-06-23 09:24:32 +0000 |
| commit | 7676688d9752cfc3a2b75c73536eb92b5b281d66 (patch) | |
| tree | da7170687e5a861164b72b2793caa0c80b70c42a /plugins | |
| parent | fa3e52405e28eb7cc01c83c1c8eba84075152a01 (diff) | |
Fix wimax UL-MAP ext IE decode error.
From Frank Wang (bug 2548).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25528 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/wimax/msg_ulmap.c | 2 | ||||
| -rw-r--r-- | plugins/wimax/wimax_bits.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/wimax/msg_ulmap.c b/plugins/wimax/msg_ulmap.c index b6f507ada5..b6b246f12f 100644 --- a/plugins/wimax/msg_ulmap.c +++ b/plugins/wimax/msg_ulmap.c @@ -1224,7 +1224,7 @@ gint UL_Zone_IE(proto_tree *uiuc_tree, const guint8 *bufptr, gint offset, gint l bit = NIB_TO_BIT(offset); - ti = proto_tree_add_text(uiuc_tree, tvb, NIBHI(offset, length), "UL_ZONE_IE"); + ti = proto_tree_add_text(uiuc_tree, tvb, NIBHI(offset, length), "CQICH_Alloc_IE"); tree = proto_item_add_subtree(ti, ett_294); XBIT(data, 4, "Extended UIUC"); diff --git a/plugins/wimax/wimax_bits.h b/plugins/wimax/wimax_bits.h index 8da7da8c3e..080dca9972 100644 --- a/plugins/wimax/wimax_bits.h +++ b/plugins/wimax/wimax_bits.h @@ -154,7 +154,7 @@ * num ... length of bitfield */ #define BIT_BITS16(bit, buf, num) \ - (( pletohs(buf+ADDR16(bit)) >> SHIFT16(bit,num) ) & MASK16(num)) + (( pntohs(buf+ADDR16(bit)) >> SHIFT16(bit,num) ) & MASK16(num)) /* extract bitfield up to 24 bits * bit ... bit address @@ -163,14 +163,14 @@ */ #define BIT_BITS32(bit, buf, num) \ - ((pletohl(buf+ADDR32(bit)) >> SHIFT32(bit,num) ) & MASK32(num)) + ((pntohl(buf+ADDR32(bit)) >> SHIFT32(bit,num) ) & MASK32(num)) /* bitfield up to 32 bits */ #define BIT_BITS64a(bit, buf, num) \ - ((pletohl(buf+ADDR32(bit)) & MASK64a(bit)) << SHIFT64a(bit,num)) + ((pntohl(buf+ADDR32(bit)) & MASK64a(bit)) << SHIFT64a(bit,num)) #define BIT_BITS64b(bit, buf, num) \ - ((pletohl(buf+ADDR32(bit)+4) >> SHIFT64b(bit,num) ) & MASK64b(bit,num)) + ((pntohl(buf+ADDR32(bit)+4) >> SHIFT64b(bit,num) ) & MASK64b(bit,num)) #define BIT_BITS64(bit, buf, num) \ ( (OFFSET32(bit)+(num)) <= 32 \ |