diff options
author | Anders Broman <anders.broman@ericsson.com> | 2012-01-21 12:08:14 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2012-01-21 12:08:14 +0000 |
commit | 00bf1ba8d3eec4fc5ee3c2c47921d9e821447213 (patch) | |
tree | 66a67a135fbfbc6fa4a9542b7301ac5e7d585b16 /epan/dissectors/packet-gsm_rlcmac.h | |
parent | 0c682968ddfb84e4a067ff0ef80261c473192b58 (diff) |
From Mike Morrin:
a patch which improves several aspects of GSM RLS/MAC
dissection.
Generic improvements to the csn.1 dissector include:
• Added a flag to the type descriptor structure so that any type can
(potentially) flagged as xxx_OR_NULL. This was specifically needed for
UINT_OR_NULL for the ms capabilities struct.
• Corrected the octet calculation in app of the proto_tree_add_text() and
proto_item_set_len() calls.
• Changed the CSN_SERIALIZE so that the length of the length field can be
specified.
• For CSN_NEXT_EXIST removed the requirement that the next type be CSN_END,
to allow truncation of multiple IEs.
• For CSN_LEFT_ALIGNED_VAR_BITMAP corrected the handling of bit_offset.
• Added a new type CSN_PADDING_BITS to make inspection of padding bits more
convenient.
• Improved the CSN_RECURSIVE_TARRAY_1 to show the array index.
Improvements to the gsm_rlcmac dissector include:
• Comment out a couple of unused hf variables.
• Rework the definition of EGPRS Ack/Nack Description so that the length IE
(and absence thereof) is handled correctly. This is the original issue for
which the bug was raised.
• Added Padding Bits definitions to all PDUs
• Change the Multislot_capability_t and Content_t definitions to allow
truncation at any IE
• Added proto_tree_add_protocol_format() calls so that the protocol can be
added to a display filter
• Append Protocol to the PROTOCOL column and PDU type to the INFO column.
From me get rid of C++ style comments.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6375
svn path=/trunk/; revision=40627
Diffstat (limited to 'epan/dissectors/packet-gsm_rlcmac.h')
-rw-r--r-- | epan/dissectors/packet-gsm_rlcmac.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/epan/dissectors/packet-gsm_rlcmac.h b/epan/dissectors/packet-gsm_rlcmac.h index 37f665ab8f..e92d3240ef 100644 --- a/epan/dissectors/packet-gsm_rlcmac.h +++ b/epan/dissectors/packet-gsm_rlcmac.h @@ -447,9 +447,6 @@ typedef struct typedef struct { - gboolean Exist_LENGTH; - guint8 LENGTH; - guint8 FINAL_ACK_INDICATION; guint8 BEGINNING_OF_WINDOW; guint8 END_OF_WINDOW; @@ -462,8 +459,20 @@ typedef struct guint16 URBB_LENGTH; guint8 URBB[URBB_MAX_BITS/8]; +} EGPRS_AckNack_Desc_t; + +typedef struct +{ + guint8 UnionType; + EGPRS_AckNack_Desc_t Desc; } EGPRS_AckNack_t; +typedef struct +{ + guint8 LENGTH; + EGPRS_AckNack_Desc_t Desc; +} EGPRS_AckNack_w_len_t; + /* <P1 Rest Octets> * <P2 Rest Octets> |