Commit Graph

101 Commits

Author SHA1 Message Date
Anders Broman d50dcb37e9 From Sylvain Munaut: gsm_a_common: ELEM_MAND_VV_SHORT doesn't support IEs of different types. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6924
svn path=/trunk/; revision=41445
2012-03-09 05:08:30 +00:00
Jeff Morriss 406861ebf4 Don't use FT_*INT with true_false strings: the code to generate
representations of former is expecting value_strings--which are quite
different than the latter.

svn path=/trunk/; revision=41362
2012-03-06 02:04:10 +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
Bill Meier 083496f05c Fix:
packet-gsm_a_rr.c:3867:101: error: parameter 'len' set but not used [-Werror=unused-but-set-parameter]
packet-gsm_a_rr.c:6837:46: warning: variable 'bit_offset_sav2' set but not used [-Wunused-but-set-variable]
packet-gsm_a_rr.c:7458:18: warning: variable 'curr_offset' set but not used [-Wunused-but-set-variab

svn path=/trunk/; revision=40453
2012-01-13 14:18:07 +00:00
Anders Broman 77e16b842e Fix:
packet-gsm_a_rr.c:3289: warning: unused parameter 'len'
packet-gsm_a_rr.c:3412: warning: unused parameter 'len'
packet-gsm_a_rr.c:4449: warning: unused variable 'bit_len'
packet-gsm_a_rr.c:4444: warning: unused parameter 'len'
packet-gsm_a_rr.c:4557: warning: unused parameter 'len'
packet-gsm_a_rr.c:6285: warning: unused parameter 'len'
packet-gsm_a_rr.c:6765: warning: unused variable 'bit_len'
packet-gsm_a_rr.c:6759: warning: unused parameter 'len'
packet-gsm_a_rr.c:6987: warning: unused variable 'bit_len'
packet-gsm_a_rr.c:6979: warning: unused parameter 'len'
packet-gsm_a_rr.c:7457: warning: unused parameter 'len'

svn path=/trunk/; revision=40451
2012-01-13 06:42:46 +00:00
Anders Broman d9df8397f4 From Mike Morrin:
This is largely a cosmetic update of the gsm_a_rr dissector:

•    TBF starting time is now fully decoded.
•    “Double indenting” of IE groups (where an IE dissector adds a subtree just
after the generic dissector adds a subtree) has been eliminated.
•    “Null” break points in CSN.1 IEs have been added where they were
previously missing (this could have caused some correct PDUs to be reported as
malformed).
•    The calculation of CSN.1 IE lengths has been corrected: ((a – b)>>3)+1 is
not the same as (a>>3)-(b>>3)+1 .
•    The handling of CSN.1 padding bits is slightly improved.
•    The handling of CSN.1 “truncated” bits is slightly improved.
•    Eliminated superfluous checks for len==0 at the beginning of some
rest-octet dissectors (the generic dissector won’t call the CSN.1 dissector if
len is 0).
•    A few minor corrections to text strings and formatting.

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

svn path=/trunk/; revision=40447
2012-01-13 06:11:44 +00:00
Anders Broman 6fe073426a From Lei Chen:
An error in eutran_measurement_param_desc of GSM si2qua rest octet.

From me fix similar bugs.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6721

svn path=/trunk/; revision=40434
2012-01-11 06:30:20 +00:00
Anders Broman ec2f398ad1 From Mike Morrin:
GSM RR CCCH dissection ignores last octet of PDU.

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

svn path=/trunk/; revision=40405
2012-01-08 15:30:05 +00:00
Alexis La Goutte 96ba099770 Fix the following error :
packet-gsm_a_rr.c: In function 'de_rr_p2_rest_oct':
packet-gsm_a_rr.c:4033:105: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]

svn path=/trunk/; revision=40386
2012-01-05 08:29:58 +00:00
Anders Broman 755c083fd8 From Mike Morrin:
Improvements to handling of gsm_um traces and dissection of ccch protocol

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

svn path=/trunk/; revision=40385
2012-01-05 07:24:21 +00:00
Anders Broman 56188e9d27 From Mike Morrin:
GSM ENHANCED MEASUREMENT REPORT PDUs were not
dissected when present as L3_INFO in RSL MEAS_RES PDUs.

It seems that the RSL L3_INFO needs to be handled by a different dissector
depending on whether it contains a DTAP, SACCH or CCCH PDU, which fortunately
can be deduced from the RSL PDU type.  packet-rsl.c is updated to implement
this.

In packet-gsm_a_rr.c the dissection of PDUs with RR Short PD format is
improved, and also some items are renamed to make clearer the difference
between SACCH PDUs (which cna be normal or Short PD format) and RR Short PD
format PDUs (which can occur on SACCH, CCCH, or DCH).

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

svn path=/trunk/; revision=40357
2012-01-01 19:57:47 +00:00
Anders Broman f5f746f54f From Mike Morrin:
eliminates the global variable for tracking which nibble is
to be decoded by taking advantage of the fact that half octet IEs always occur
in pairs, and thus a pair can be grouped together for decoding.

There was probably also some confusion caused by the macros UPPER_NIBBLE and
LOWER_NIBBLE because the GSM bit numbering is opposite to Wireshark internal
numbering, so I have changed these to be LEFT_NIBBLE and RIGHT_NIBBLE, which
corresponds to the display format in Wireshark.

The dissection order of half octet IEs has been adjusted where necessary to
align with the ordering shown in the GSM specifications.

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

svn path=/trunk/; revision=40157
2011-12-12 07:24:57 +00:00
Anders Broman 243b43c1fc From Vincent Helfre.
The offset in "Cell Selection Indicator after Release of all TCH and SDCCH" was not correct because the length was element was decoded twice.  So I removed the second decoding of the length.

svn path=/trunk/; revision=40088
2011-12-04 15:21:22 +00:00
Anders Broman 756113888a Get rid of Warnings.
svn path=/trunk/; revision=39977
2011-11-21 18:21:59 +00:00
Anders Broman 603173b64a From Vincent Helfre:
added the display of intermediate value used to decode ARFCN in 
range 1024/256 format.
So now the W(n) values can be displayed and localised in the tvb buffer.
The code was reworked a little to use the get_bit functions.

svn path=/trunk/; revision=39976
2011-11-21 18:16:19 +00:00
Bill Meier 54b72021bb Fix encoding arg for various fcn calls:
- proto_tree_add_bits_item
 - proto_tree_add_bits_ret_val
 - proto_tree_add_bitmask
 - tvb_get_bits
 - tvb_get_bits16
 - tvb_get_bits24
 - tvb_get_bits32
 - tvb_get_bits64


svn path=/trunk/; revision=39539
2011-10-24 19:57:53 +00:00
Anders Broman 49f715f169 Remove unused hf field.
svn path=/trunk/; revision=39238
2011-10-03 06:24:28 +00:00
Bill Meier e2f6d85655 Fix a 'set but not used' gcc warning; Mark param arg as _U_;
Whitespace cleanup: trailing blanks & "4 space tabs".

svn path=/trunk/; revision=38925
2011-09-07 19:35:55 +00:00
Anders Broman c1e282bf9f From Lei Chen:
Implement 'IAR Rest Octets', 'IAX Rest Octets' and
'Multislot Allocation'

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

svn path=/trunk/; revision=38911
2011-09-07 07:49:20 +00:00
Anders Broman 1c4d4319ee From Lei Chen:
Support E-UTRAN neighbor cells in Enhanced Measurement Report.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6275

svn path=/trunk/; revision=38765
2011-08-29 05:24:10 +00:00
Anders Broman b5740c2288 From Jeremy Quirke:
misdecoding 3G Neighbour Cell Information Element in SI2quater message due to a coding typo

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

svn path=/trunk/; revision=38542
2011-08-15 04:39:30 +00:00
Anders Broman ce3db724c1 From Lei Chen:
patch to support gsm rr decoding of Immediate Assignment rest octet
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6119

svn path=/trunk/; revision=38348
2011-08-05 07:02:22 +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 0a65432f96 Use ENC_BIG_ENDIAN.
svn path=/trunk/; revision=38135
2011-07-20 14:09:19 +00:00
Bill Meier e69a4c6e45 Don't assign to a proto_item * if the value won't be used: Coverity 911;
Fix bug wherein an item was apparently added to the wrong subtree: Coverity 910;
Remove unneeded #includes;
Do whitespace and indentation cleanup.

svn path=/trunk/; revision=36530
2011-04-09 17:17:47 +00:00
Anders Broman 8d6ca293dc Change the signature of elem_fcn():ns to include pinfo.
svn path=/trunk/; revision=36443
2011-04-04 14:37:25 +00:00
Anders Broman 72b69aeaf5 Change the msg_fcn() signature to include pinfo.
svn path=/trunk/; revision=36441
2011-04-04 07:45: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
Anders Broman ed66081a4d From Alexis La Goutte:
Cleanup packet-ipv6.h and dependency.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5713

svn path=/trunk/; revision=36031
2011-02-23 13:51:49 +00:00
Anders Broman a469849210 From Pascal Quantin:
[3GPP protocols] Prettify the display of Mandatory Value information elements

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

svn path=/trunk/; revision=36026
2011-02-22 11:56:10 +00:00
Anders Broman 821f91f278 - append TLLI value.
- Whitespace changes.

svn path=/trunk/; revision=35572
2011-01-17 21:10:54 +00:00
Anders Broman b124071369 From Vincent Helfre:
fixed the conversions for utran and eutran threshold which are used for Enhanced Measurement Report.

svn path=/trunk/; revision=35199
2010-12-16 12:26:49 +00:00
Anders Broman 5a0e550686 From Vincent Helfre:
I have fixed some issue in the measurement information decoding in packet-gsm_a_rr.c.

svn path=/trunk/; revision=35061
2010-11-29 13:12:35 +00:00
Anders Broman 5f1b6a507b From Alex Badea:
gsm_a_rr: System Information Type 4 / CBCH mobile allocation dissected incorrectly
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5436

svn path=/trunk/; revision=35054
2010-11-28 20:58:26 +00:00
Anders Broman b91ed78bcc Add a value_string_ext.
svn path=/trunk/; revision=34825
2010-11-09 17:24:45 +00:00
Anders Broman 348e0bc54b Use value_string_ext for gsm_a_rr_rxlev_vals.
svn path=/trunk/; revision=34818
2010-11-09 07:28:04 +00:00
Anders Broman 5bf4fc3116 From Vincent Helfre:
Some improvements for the presentations.

svn path=/trunk/; revision=34620
2010-10-22 13:35:03 +00:00
Anders Broman 64d4b08a82 From Vincent Helfre:
various bug fix and enhancement for Release 8 additionnal parameters.

svn path=/trunk/; revision=34585
2010-10-20 12:40:13 +00:00
Anders Broman 0d4a4542ba From Vincent Helfre:
Display the bits for 
.... .00. = PCID_Pattern: 0

svn path=/trunk/; revision=34262
2010-09-27 12:53:42 +00:00
Anders Broman a498b71098 Initialize subtree.
svn path=/trunk/; revision=34261
2010-09-27 10:11:40 +00:00
Anders Broman 415691da9d From Vincent Helfre:
Release 8 june 2010 parameters decoding for SI2quater and Measurement Information messages.

svn path=/trunk/; revision=34260
2010-09-27 08:45:16 +00:00
Anders Broman 14b9a4c56a From Vincent Helfre:
Incorrect decoding of List of ARFCN in BCCH frequency list.
When the range 1024 is selected, it can happen that 2 bytes need to be read for
W1, and also for W2. In the current version, when W1 ends on a byte boundary,
W2 will get an incorrect value, since it will be truncated by 1 bit.

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

svn path=/trunk/; revision=34113
2010-09-14 14:24:39 +00:00
Bill Meier dac0bf77ed Fix cases where the type of a for loop variable is smaller than the type of the "end" variable.
In some cases the usage may have been benign since it can be seen by code inspection that the maximum value of the end variable can't exceed the maximum value of the loop variable.
However, on general principles, all the usages have been fixed.

svn path=/trunk/; revision=33692
2010-08-02 13:09:01 +00:00
Anders Broman f9d6b18de7 from Sylvain Munaut:
SDCCH8 subchannel decoding error in GSM RR dissector 
Summary:  SDCCH8 subchannel decoding error in GSM RR dissector  

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

svn path=/trunk/; revision=33312
2010-06-24 10:42:13 +00:00
Bill Meier e79dddc257 Add an if-test to fix a fuzz-test crash;
See Bug #4897: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4897

svn path=/trunk/; revision=33280
2010-06-21 14:24:34 +00:00
Bill Meier 10ffd14b8f Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces)
svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
Anders Broman 447faa6082 From Mike Morrin:
Dissection of BSSMAP IEs: Old BSS to New BSS Info and New BSS to Old BSS Info
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4712

svn path=/trunk/; revision=32606
2010-04-29 20:45:53 +00:00
Bill Meier 09764dd969 Remove unneeded #include <stdio.h>
svn path=/trunk/; revision=32367
2010-04-03 21:55:23 +00:00
Gerald Combs b3a1cd8859 Temporary (?) fix for bug 4623.
svn path=/trunk/; revision=32327
2010-03-30 21:12:52 +00:00
Bill Meier de4c6ff515 Fix a number of gcc _Wshadow warnings
svn path=/trunk/; revision=31557
2010-01-18 21:49:47 +00:00