Commit Graph

51 Commits

Author SHA1 Message Date
Anders Broman 5c1bc94608 "Fill" a couple of value_string(ext)
svn path=/trunk/; revision=46518
2012-12-12 12:48:12 +00:00
Anders Broman a4e26f6600 From Mike Morrin:
fix handling of some EGPRS Coding and Puncturing Schemes.

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

svn path=/trunk/; revision=46394
2012-12-05 09:10:18 +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 a059014195 Fix 'value computed is not used' error
svn path=/trunk/; revision=45992
2012-11-10 20:59:38 +00:00
Pascal Quantin e4a0fe1007 Fix a few Clang dead assignment / increment warnings
svn path=/trunk/; revision=45990
2012-11-10 20:31:08 +00:00
Stig Bjørlykke 1e355c77d3 Removed double parentheses in a while
svn path=/trunk/; revision=45943
2012-11-06 08:40:40 +00:00
Pascal Quantin 4afd80511e Fix hf_me (it is a 2 bits long field, not a boolean)
svn path=/trunk/; revision=45249
2012-10-02 07:20:31 +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
Pascal Quantin 12c71b2ff1 Remove a duplicate hf
svn path=/trunk/; revision=45198
2012-09-28 20:36:03 +00:00
Jeff Morriss 2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +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 3e8ac587fd Fix FBI true_false_string array and remove a useless hf variable
svn path=/trunk/; revision=44884
2012-09-12 12:29:59 +00:00
Anders Broman e97273a35d From Mike Morrin:
* fixup of dissection of message type for PRACH messages.
* fixed dissection of optional octet 2/3 in dl control messages
* removed a few more duplicate hf items
* changed all M_BIT macros to M_UINT, as M_BIT does not use the referenced hf.
* fixed dissection of ul_tfi and dl_tfi so that assignments and usage can be
filtered more easily
* fixed missing references to existing value strings and converted to tfs
strings where possible

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

svn path=/trunk/; revision=44883
2012-09-12 12:07:53 +00:00
Pascal Quantin 7e9411fee3 Enhance dissection of PSI1
svn path=/trunk/; revision=44870
2012-09-11 07:48:49 +00:00
Martin Kaiser 1f34b32040 fix compiler errors
packet-gsm_rlcmac.c:6341: error: missing braces around initializer

packet-gsm_rlcmac.c:473: error: hf_h110qi_t_tqi defined but not used
packet-gsm_rlcmac.c:474: error: hf_packetuplinkid_tqi defined but not used
packet-gsm_rlcmac.c:477: error: hf_multiblock_allocation_number_of_radio_blocks_allocated defined but not used

svn path=/trunk/; revision=44855
2012-09-10 21:00:18 +00:00
Pascal Quantin 3f1e1285f3 From Mike Morrin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7686 :
Remove duplicate hf items in packet-gsm_rlcmac.c

svn path=/trunk/; revision=44854
2012-09-10 20:31:41 +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
Evan Huus d936fe6cf0 Fix compile with gcc. Mostly removing unused parameters and code.
Change one tvb_get_bits8 to tvb_get_bits16 since the queried length is
9 bits long (should this be added to checkAPI somehow?)

svn path=/trunk/; revision=44742
2012-09-02 16:46:39 +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
Michael Mann 1741731384 remove unnecessary underscores from display filters
svn path=/trunk/; revision=44181
2012-08-01 02:59:17 +00:00
Michael Mann 175851fb40 Updated GSM dissectors display filters per checkfiltername.pl
Tried to provide consistency with GSM dissector (protocol) names, even if the filenames now don't match the dissector name.

svn path=/trunk/; revision=44162
2012-07-31 18:54:11 +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
Pascal Quantin 8c91a5ab0b Do not use same name for filters with incompatible types
svn path=/trunk/; revision=43446
2012-06-23 14:10:19 +00:00
Jakub Zawadzki 68ec58d385 Fix some: 'cast discards qualifiers from pointer target type' warnings
- Add const qualifier
- Remove some strange casts

svn path=/trunk/; revision=42131
2012-04-18 12:35:36 +00:00
Martin Mathieson 51c31cd7bd Move 'static' qualifier before 'const' in a couple of places. I didn't
know it mattered, but gcc warns.

svn path=/trunk/; revision=41155
2012-02-23 11:03:30 +00:00
Martin Mathieson 774be29de0 Mark some unused parameters. Still getting other warnings...
svn path=/trunk/; revision=41154
2012-02-23 10:55:57 +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 2f024256bf From Sylvain Munaut:
0001-packet-csn1-Fix-indenting-of-the-CSN_UINT-subsection.patch
0002-packet-csn1-Add-new-maro-M_TYPE_LABEL-to-customize-n.patch
0003-packet-csn1-New-macro-M_FIXED_LABEL-to-customize-str.patch
0004-packet-csn1-Allow-CHOICE-elements-to-re-process-the-.patch
0005-packet-csn1-Make-new-M_CHOICE_IL-option-that-doesn-t.patch
0006-packet-csn-Extend-CSN_SERIALIZE-to-allow-0-bit-of-le.patch

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

svn path=/trunk/; revision=40847
2012-02-05 08:14:09 +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
Anders Broman 0f2e6c6cc5 Get rid of check_col, while at it set ENC.
svn path=/trunk/; revision=39164
2011-09-27 12:05:32 +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
Bill Meier c67363e4de Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
svn path=/trunk/; revision=38170
2011-07-22 18:33:44 +00:00
Anders Broman 78e17be242 From Lei Chen:
Support "Packet System Information Type 1" in packet-gsm_rlcmac.c

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

svn path=/trunk/; revision=38165
2011-07-22 08:18:59 +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 1f0ca1440c From Ludovic Haessler:
Add 3GPP TS44.060 RLC/MAC control blocks management in GSMTAP dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6103

svn path=/trunk/; revision=37960
2011-07-11 13:32:04 +00:00
Anders Broman 2a6c45c5a2 From Ludovic Haessler:
CSN Ack/Nack Description wrongly handled in gsm_rlcmac_dl dissector (3GPP TS 44.060)

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

svn path=/trunk/; revision=37926
2011-07-07 07:44:25 +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
Bill Meier 8d8043e4f6 Don't assign to a proto_item * if the value won't be used: Coverity 912 & 913.
svn path=/trunk/; revision=36557
2011-04-11 14:45:54 +00:00
Anders Broman d11e6439cd Fix Checkapi errors
Error: the name for field " N32" ("gsm_rlcmac_dl.n32") has leading space in packet-gsm_rlcmac.c
Error: the name for field " N51" ("gsm_rlcmac_dl.n51") has leading space in packet-gsm_rlcmac.c
Error: the name for field " N26" ("gsm_rlcmac_dl.n26") has leading space in packet-gsm_rlcmac.c

svn path=/trunk/; revision=36307
2011-03-24 10:35:29 +00:00
Anders Broman 4cd37afb6c From Vincent Helfre:
I updated again the csn1 dissector to associate hf_field to each element.

svn path=/trunk/; revision=36306
2011-03-24 09:20:14 +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 6eaae55c79 - RE apply checkapi patch.
- Mark unused parameters (From Pascal Quantin).

svn path=/trunk/; revision=36093
2011-02-28 14:17:52 +00:00
Anders Broman 7f604b779d From Vincent Helfre:
I change the void * descr field as an union to either store a pointer or a value.

Hope it solves the problem.

svn path=/trunk/; revision=36092
2011-02-28 13:55:47 +00:00
Anders Broman 6820a81354 Fix checkapi detected errors.
Missing log message:
From Vincent Helfre:
GSM RLC MAC dissector

There are 2 things remaining to do:

-  Update to Rel 8 the control messages such as Packet Measurement Order, Packet Measurement Report, Packet Cell Change Order, Packet Cell Change Notification…

-  Improve the display by replacing the strings describing the type by a hf field

svn path=/trunk/; revision=36088
2011-02-28 11:33:27 +00:00