Commit Graph

25 Commits

Author SHA1 Message Date
Alexis La Goutte 3c0c2e2e75 Fix (-W)documentation error found by Clang
./packet-gsm_rlcmac.h:1086:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< MS Radio Access capability IE >
^~~
/**<
./packet-gsm_rlcmac.h:1089:26: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
typedef guint8 A5_bits_t;/*<A5 bits> ::= < A5/1 : bit> <A5/2 : bit> <A5/...
                         ^~~~~
                         /**<
packet-gsm_rlcmac.c:169:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Global TFI IE >*/
^~~
/**<
packet-gsm_rlcmac.c:171:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Starting Frame Number Description IE >*/
^~~
/**<
packet-gsm_rlcmac.c:174:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Ack/Nack Description IE >*/
^~~
/**<
packet-gsm_rlcmac.c:178:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Packet Timing Advance IE >*/
^~~
/**<
packet-gsm_rlcmac.c:183:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Power Control Parameters IE >*/
^~~
/**<
packet-gsm_rlcmac.c:191:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Global Power Control Parameters IE >*/
^~~
/**<
packet-gsm_rlcmac.c:195:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Global Packet Timing Advance IE >*/
^~~
/**<
packet-gsm_rlcmac.c:197:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Channel Quality Report struct >*/
^~~
/**<
packet-gsm_rlcmac.c:210:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< EGPRS Ack/Nack Description >*/
^~~
/**<
packet-gsm_rlcmac.c:216:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*<P1 Rest Octets>*/
^~~~~
/**<
packet-gsm_rlcmac.c:218:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*<P2 Rest Octets>*/
^~~~~
/**<
packet-gsm_rlcmac.c:264:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< SI 13 Rest Octets >*/
^~~
/**<
packet-gsm_rlcmac.c:288:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Packet TBF Release message content >*/
^~~
/**<
packet-gsm_rlcmac.c:293:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Packet Control Acknowledgement message content >*/
^~~
/**<
packet-gsm_rlcmac.c:299:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Packet Downlink Dummy Control Block message content >*/
^~~
/**<
packet-gsm_rlcmac.c:301:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Packet Uplink Dummy Control Block message content >*/
^~~
/**<
packet-gsm_rlcmac.c:305:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< MS Radio Access capability IE >*/
^~~
/**<

svn path=/trunk/; revision=51267
2013-08-10 21:29:51 +00:00
Anders Broman 79d8f9f5f9 From Mike Morrin:
The gsm rlcmac dissector truncates the 12 bit BSNs to 8 bits when storing them.

Fix this and the handling of BSN2 is refactored to clarify the difference between BSN2 (the stored value) and BSN2_offset (the value transferred at the air interface).

svn path=/trunk/; revision=46301
2012-11-30 09:42:58 +00:00
Pascal Quantin 99e7a5b4dc From Mike Morrin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7615 :
Fix minor bug in dissection of "e" bit and add value strings for remaining data block header fields

svn path=/trunk/; revision=45206
2012-09-29 08:34:00 +00:00
Anders Broman 6aca10831f From Mike Morrin:
Fix pedantic compiler warnings in csn.1 dissectors.

There is some tricky casting going on in csn.1 structures.  To eliminate all
the warnings, the function pointers needed to be moved out of the object
pointer unions.  Fortunately macros (mostly) hide these changes from the
protocol dissector tables.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7686

svn path=/trunk/; revision=44899
2012-09-14 14:05:50 +00:00
Pascal Quantin 7e9411fee3 Enhance dissection of PSI1
svn path=/trunk/; revision=44870
2012-09-11 07:48:49 +00:00
Anders Broman cc6d4341e6 From Mike Morrin:
Interface based on header type rather than MCS.

passes in the header type for EGPRS packets. 
This makes sense because in a real protocol stack, the header type is encoded
in the burst stealing bits, allowing the header can be decoded, giving the CPS
IE, which then allows the data blocks to be decoded, so wireshark now follows
the same practice.

I found that there was a (previously overlooked) alignment error in decoding
the last octet of some headers due to the last "octet" having less than 8 bits,
and both the protocol stacks I have here assume that the left-hand bits are
missing (as per the figures in 44.060).  I corrected this by making a small
extension to the NULL encoding in packet-csn.[ch] to allow a NULL field to
consume more than 0 bits.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7615

svn path=/trunk/; revision=44805
2012-09-07 07:43:13 +00:00
Anders Broman 12e5e625a6 From Mike Morrin:
Enhancemnt to GSM RLCMAC dissection adding dissection of data block headers

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7615

svn path=/trunk/; revision=44741
2012-09-02 15:05:43 +00:00
Pascal Quantin 9f8b638cfa Remove Uplink messages from the RlcMacDownlink_t structure (as they are part of the RlcMacUplink_t structure that is also used to call csnStreamDissector function)
svn path=/trunk/; revision=44319
2012-08-08 00:11:14 +00:00
Gerald Combs 6c32ba5ff1 Make sure we have a corresponding 'u' member to RlcMacDownlink_t for
every call to csnStreamDissector. This should fix bug 7561. Based on
attachment 8888 from Martin Kaiser.

svn path=/trunk/; revision=44307
2012-08-07 18:36:18 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Anders Broman dea5452b95 From Lei Chen:
a patch to support decode FDD_CELL_INFORMATION of "UTRAN FDD Description" in packet-gsm_rlcmac.c

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6856

svn path=/trunk/; revision=41149
2012-02-23 08:57:40 +00:00
Anders Broman 00bf1ba8d3 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
2012-01-21 12:08:14 +00:00
Bill Meier 2ef0c61594 #if 0 unused stuff ...
svn path=/trunk/; revision=40102
2011-12-06 16:15:24 +00:00
Anders Broman 762bae3672 From Lei Chen:
upgrade PCCF/PMR/PEMR in packet-gsm_rlcmac.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6313

svn path=/trunk/; revision=38909
2011-09-07 04:54:19 +00:00
Anders Broman f0ef9f4a1b From Lei Chen:
Upgrade 'Packet Cell Change Order', 'Packet Cell Change Notification' and
'Packet Measurement Order' to R10.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6300

svn path=/trunk/; revision=38838
2011-09-01 05:06:42 +00:00
Anders Broman 3203f39543 From Lei Chen:
support PSI5 and PSI13 in packet-gsm_rlcmac.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6177

svn path=/trunk/; revision=38248
2011-07-29 05:19:29 +00:00
Anders Broman 9c92699857 From Lei Chen:
support 'Packet System Information Type 3' in packet-gsm_rlcmac.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6170

svn path=/trunk/; revision=38231
2011-07-28 05:38:07 +00:00
Anders Broman 6956686beb From Lei Chen:
This patch tries to support 'Packet System Information Type 2' in gsm rlcmac
dissector.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6167

svn path=/trunk/; revision=38206
2011-07-26 04:20:39 +00:00
Anders Broman 4b692c92c8 From Lei Chen:
patch to support "Additional MS Radio Access Capability" and "Packet Pause" in packet-gsm_rlcmac.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6133

svn path=/trunk/; revision=38136
2011-07-20 22:07:31 +00:00
Anders Broman 51b2410345 From Ludovic Haessler:
Wrong decoding of RLC/MAC EGPRS Packet Downlink Ack/Nack (3GPP TS 44.060)

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6098

svn path=/trunk/; revision=37919
2011-07-06 12:53:04 +00:00
Anders Broman 313dbdb114 Remove extra ;
svn path=/trunk/; revision=37177
2011-05-16 14:42:34 +00:00
Anders Broman fd782e736c From Vincent Helfre:
- added documentation in packet-csn1.h
- fixed a bug in packet-csn1.c
- fixed a BSIC description in packet-gsm_a_rr.c
- removed the "_v" suffix in packet-gsm_rlcmac element description

svn path=/trunk/; revision=36284
2011-03-23 09:14:50 +00:00
Bill Meier ef997f2290 Remove unneeded #includes; Add #includes to packet-gsm_rlcmac.c
svn path=/trunk/; revision=36099
2011-02-28 23:46:07 +00:00
Bill Meier 093e8f25c4 Define global vars as static; Whitespace cleanup.
svn path=/trunk/; revision=36098
2011-02-28 23:09:02 +00:00
Anders Broman eec32e9cbc svn path=/trunk/; revision=36087 2011-02-28 09:43:22 +00:00