Commit Graph

144 Commits

Author SHA1 Message Date
Chris Maynard 9105d0b0c9 Revert a recent spelling change back to its UK variant.
svn path=/trunk/; revision=40631
2012-01-21 16:09:08 +00:00
Chris Maynard e4862cf115 Fix a comment and some typos.
svn path=/trunk/; revision=40619
2012-01-21 02:39:59 +00:00
Jaap Keuter 72ebaa39e3 From Pascal Quantin:
Some test equipments can send weird Protocol Configuration Options IE in the
Attach Accept message with an empty protocol identifier content. Wireshark 
will trigger an assert when dissecting those messages because it does not 
check the tvb length before calling the sub dissector.
With checking the protocol identifier length before calling the sub dissector,
the PCO is decoded correctly.

svn path=/trunk/; revision=40604
2012-01-20 07:49:12 +00:00
Anders Broman b24d4d9142 From Pascal Quantin:
Add S1 related info to the DRX parameter dissection (IE
common to 2G/3G/LTE) as specified in 3GPP 24.301 Release 9.8.0 chapter 10.5.5.6.

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

svn path=/trunk/; revision=40070
2011-12-02 21:56:10 +00:00
Anders Broman 4dd121e599 Extend dissection of GTPv2 EPS Security Context and Quadruplets.
svn path=/trunk/; revision=40065
2011-12-01 21:26:22 +00:00
Anders Broman 291994def5 From Pascal Quantin:
adds to the Protocol Configuration Options the decoding of
the following container identifiers:
- Selected Bearer Control Mode
- DSMIPv6 Home Agent Address
- DSMIPv6 Home Network Prefix
- DSMIPv6 IPv4 Home Agent Address
- P-CSCF IPv4 Address
- DNS Server IPv4 Address

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

svn path=/trunk/; revision=40057
2011-12-01 05:42:07 +00:00
Anders Broman f40538afeb From Pascal Quantin:
Currently Wireshark limits the Access Point Name length to 50 bytes. But
according to 3GPP 24.008 chapter 10.5.6.1, the maximum length is 100 bytes (102
bytes minus the IEI and length fields) and not 50.
The attached patch increases the MAX_APN_LENGTH define value and allow the
correct display of an APN with a size greater than 50 bytes.

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

svn path=/trunk/; revision=40044
2011-11-29 22:25:21 +00:00
Anders Broman 094e30816d Fix Checkapi found errors.
svn path=/trunk/; revision=40030
2011-11-28 18:10:57 +00:00
Anders Broman c755a51c40 Prevet a crash when dissecting linked TI.
svn path=/trunk/; revision=40024
2011-11-28 16:41:59 +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
Bill Meier 67ee5049d4 Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors:
Specifically:  Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
  the encoding parameter for proto_tree_add_item() calls which directly reference
  an item in hf[] which has a type of:
     FT_BOOLEAN
     FT_IPv4
     FT_EUI64
     FT_GUID
     FT_UINT_STRING

Also: For type FT_ITv6 use ENC_NA. (This was missed in SVN #39260)

svn path=/trunk/; revision=39328
2011-10-10 00:39:31 +00:00
Anders Broman 5ba5385c74 Protect the columns from beeing overwritten.
svn path=/trunk/; revision=37752
2011-06-22 14:49:26 +00:00
Bill Meier d2269ce7d5 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
svn path=/trunk/; revision=37716
2011-06-19 18:47:35 +00:00
Anders Broman ed1bfad981 From Pascal Quantin:
Update 3GPP NAS MS Radio Access Capability dissection to Release 9.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5970

From me change all enc type to ENC_BIG_ENDIAN.

svn path=/trunk/; revision=37451
2011-05-29 06:06:22 +00:00
Jeff Morriss cdedb31e94 As suggested by Chris: use val_to_str_const() instead of match_strval() plus a
NULL-return check.

Use val_to_str_const instead of val_to_str() in a couple places where the string
is constant.

Use val_to_str() instead of blindly passing the return value from match_strval()
into a format routine (to ensure a non-NULL string pointer).  A couple of these
were cases where it could not actually return NULL, but I changed it for
consistency.

Store the return value of match_strval() rather than calling it repeatedly.

svn path=/trunk/; revision=37204
2011-05-17 18:58:40 +00:00
Anders Broman 5a0acb469e Use the correct value string and bitmasks.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5928

svn path=/trunk/; revision=37199
2011-05-17 08:23:30 +00:00
Anders Broman 7dce5861cc From Pascal Quantin:
Enhance the dissection of MM, GMM, SM, EPS EMM and EPS ESM
protocols according to 3GPP 24.008 V9.6.0 and 24.301 V9.6.0.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5866

svn path=/trunk/; revision=36918
2011-04-27 22:18:00 +00:00
Anders Broman aaf0d277b8 Get rid of gsm_a_dtap_pinfo.
svn path=/trunk/; revision=36444
2011-04-04 14:49:14 +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 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 57f8048743 Add 10.5.1.14 NAS container for PS HO.
svn path=/trunk/; revision=35665
2011-01-26 19:37:30 +00:00
Anders Broman dd1ab4b227 Use EXTRANEOUS_DATA_CHECK_EXPERT
svn path=/trunk/; revision=35608
2011-01-21 09:31:25 +00:00
Sake Blok 6e74ad9097 Adress => Address corrections (also in comments).
(see bug 5600)


svn path=/trunk/; revision=35600
2011-01-21 00:19:03 +00:00
Anders Broman 6b24548858 Add the RAI value to "add_string"
svn path=/trunk/; revision=35579
2011-01-19 06:43:28 +00:00
Anders Broman 71d02b5455 - Remove debug printout.
- Enhance dissection a bit.
- add new true_false_strings

svn path=/trunk/; revision=35566
2011-01-17 13:09:08 +00:00
Anders Broman 672ce3871d Switch to using proto_add_bits_item in a couple of places and fix
missing stepping of bit_offset.

svn path=/trunk/; revision=35561
2011-01-16 22:32:22 +00:00
Jeff Morriss f36e2be287 Use tvb_memeql() and tvb_memcpy().
Use tvb_ip_to_str() and tvb_ip6_to_str().

There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().

Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s to ensure the
return string is NULL terminated.

svn path=/trunk/; revision=35546
2011-01-16 03:35:29 +00:00
Anders Broman 0a95691b3d From Pascal Quantin:
Fix dissection of  protocol ID.

svn path=/trunk/; revision=35513
2011-01-13 06:32:23 +00:00
Anders Broman a5683f7d48 Update dissection of Protocol configuration options.
svn path=/trunk/; revision=35505
2011-01-12 16:43:19 +00:00
Guy Harris a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Jaap Keuter fb1390652b Fix for bug 5475:
Track dissection properly of Packet Flow Identifier IE to 
avoid Extraneous Data reporting.

svn path=/trunk/; revision=35194
2010-12-16 07:25:01 +00:00
Anders Broman 58308341bd From Pascal Quantin:
[NAS EPS] Display explicitly the spare bits when decoding a TFT
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5371

svn path=/trunk/; revision=34781
2010-11-05 06:19:57 +00:00
Bill Meier c256942255 Use value_string_ext fcns to access various value_string arrays.
Also: use value_string_const() instead of value_string() where apropriate;
      minor reformatting & whitespace cleanup.

svn path=/trunk/; revision=34745
2010-11-01 18:26:34 +00:00
Anders Broman fe71cbcc99 From Pascal Quantin:
[NAS EPS] Fix TFT decoding in case of "delete packet filters from existing TFT" operation

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

svn path=/trunk/; revision=34666
2010-10-28 15:06:48 +00:00
Anders Broman 23c4983424 From Pascal Quantin:
[NAS EPS] Fix TFT decoding when having several Packet Filters defined
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5274

svn path=/trunk/; revision=34385
2010-10-05 17:58:58 +00:00
Anders Broman b596b69f66 From Pascal Quantin:
[NAS EPS] Use Request Type IE defined in 3GPP 24.008

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

svn path=/trunk/; revision=34179
2010-09-22 10:38:45 +00:00
Anders Broman f80f4ae05f From Pascal Quantin:
[NAS EPS] Traffic Flow Template IE dissection bugs.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5243

svn path=/trunk/; revision=34177
2010-09-22 07:06:15 +00:00
Anders Broman b2f660f0d3 Add missing break, should fix bug
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5110

svn path=/trunk/; revision=33794
2010-08-13 11:57:18 +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 b5753ef3fc Add a field for "Revision Level Indicator" in the "MS Radio Access Capability IE".
svn path=/trunk/; revision=33518
2010-07-14 12:01:05 +00:00
Anders Broman 2707d0ddde Set pinfo->link_dir when protocol configuration options is in the message.
svn path=/trunk/; revision=33366
2010-06-29 05:40:45 +00:00
Bill Meier 7b85f43d0e Do some constifying [or other] based upon gcc -Wwrite-strings warnings.
svn path=/trunk/; revision=33198
2010-06-09 18:12:17 +00:00
Anders Broman 875240d59e - Traffic flow template miss dissected, use de_sm_tflow_temp()
insted.
- Dissect vendor id of private message.

svn path=/trunk/; revision=33037
2010-06-01 22:22:09 +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
Gerasimos Dimitriadis dfde72f247 Fix for Bug 4588:
RANAP and friends want the MNC encoded in big endian form.

svn path=/trunk/; revision=32257
2010-03-20 23:53:22 +00:00
Gerasimos Dimitriadis 0b13ca1a48 Decode GPRS SM Messages related to MBMS Context handling
svn path=/trunk/; revision=32176
2010-03-12 21:30:54 +00:00
Anders Broman 342a3ca712 From Vladimir Kazansky:
Wrong offset returned by de_sm_pdp_addr().
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4568

svn path=/trunk/; revision=32156
2010-03-10 06:39:14 +00:00
Anders Broman 18202ab0ed from Pascal Quantin:
Update that enhance a little bit the display of the Parameters List IE

svn path=/trunk/; revision=32153
2010-03-09 16:57:24 +00:00
Anders Broman 334210d3db From Pascal Quantin:
[NAS EPS] Fixes for the Traffic Flow Template IE.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4564

svn path=/trunk/; revision=32145
2010-03-08 20:46:30 +00:00
Anders Broman 016530ba0f From Pascal Quantin:
[NAS EPS] Various small bug fixes.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4562

svn path=/trunk/; revision=32130
2010-03-06 20:32:27 +00:00
Gerasimos Dimitriadis 00c4b361e2 Decoding support for GPRS Session Management 'Activate MBMS
Context Request' message and related IEs

svn path=/trunk/; revision=32126
2010-03-06 00:06:27 +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
Gerasimos Dimitriadis 976be95b98 Fixes/enhancements/updates for 24.008 IEs:
MS Network Capability, LLC SAPI, Tear Down Indicator,
Packet Flow Identifier

svn path=/trunk/; revision=31352
2009-12-22 20:36:20 +00:00
Gerasimos Dimitriadis ec5cd4d450 Update SM Cause IE; Decode SM Cause 2 IE; Update
Activate PDP Context Accept msg

svn path=/trunk/; revision=31330
2009-12-20 23:17:40 +00:00
Gerasimos Dimitriadis 309d920eb8 Fix/enhacement of Quality of Service IE
svn path=/trunk/; revision=31295
2009-12-17 16:56:56 +00:00
Gerasimos Dimitriadis acd70335d1 More NULL entries in dtap_msg_sm_fcn[] to avoid out of bounds access
svn path=/trunk/; revision=31279
2009-12-15 22:09:32 +00:00
Gerasimos Dimitriadis af4c9216ce Fix/update for PDP Address IE
svn path=/trunk/; revision=31278
2009-12-15 21:48:05 +00:00
Gerasimos Dimitriadis 5de2fed9aa PS LCS Capability IE updated according to 24.008 V8.6.0;
Change printing of values according to standard style.

svn path=/trunk/; revision=31127
2009-11-29 23:23:27 +00:00
Gerasimos Dimitriadis 8a70d722d9 Explicitly show LAC and RAC when dissecting Routing Area
Identification; print LAC/RAC parts as decimals in RAI;
remove unneeded #include.

svn path=/trunk/; revision=31103
2009-11-27 23:55:32 +00:00
Gerasimos Dimitriadis b7261fe2e4 Expert info when E.212 MCC/MNC contain non-decimal digits
svn path=/trunk/; revision=31102
2009-11-27 22:57:50 +00:00
Gerasimos Dimitriadis b77caf13a9 More uniform printing of field values: Interpretation first, actual
value second.

svn path=/trunk/; revision=31092
2009-11-26 22:37:43 +00:00
Gerasimos Dimitriadis 299d64d458 Use range_string for the decoding of the CN specific DRX
cycle length coefficient; fixed the decoding of unknown 
values for Split PG Cycle Code; updated function for
Identity Type 2, now spare bit is explicitly shown; Reuse
the definition of the Switch-Measure-Switch values from
packet-gsm_a_common.c

svn path=/trunk/; revision=31060
2009-11-23 23:02:02 +00:00
Gerasimos Dimitriadis 5664dac535 Analyze GPRS Timer in its two subfields, unit and value
svn path=/trunk/; revision=31056
2009-11-23 19:59:40 +00:00
Gerasimos Dimitriadis 518995a4d8 No need for decoding function for a Tag-only IE
svn path=/trunk/; revision=31055
2009-11-23 19:15:58 +00:00
Gerasimos Dimitriadis 36b1cc8e77 Updated GPRS TMSI Status and Update Type IEs
svn path=/trunk/; revision=31009
2009-11-18 22:41:08 +00:00
Gerasimos Dimitriadis bb3447c6b1 GPRS Attach Type IE updated according to 24.008 v8.6.0
svn path=/trunk/; revision=31008
2009-11-18 22:05:16 +00:00
Gerasimos Dimitriadis 55b982b031 - Use the spare_bits hf from packet_gsm_a_common.c in
packet-gsm_a_dtap.c and packet-gsm_a_gm.c
- Update a number of GPRS IEs according to 24.008 v8.6.0
- Rewrite parts of GPRS IEs so that it is shown which octet parts
  contribute to which header fields


svn path=/trunk/; revision=31006
2009-11-18 20:39:14 +00:00
Gerasimos Dimitriadis e92c2e17da GPRS Attach Result IE updated according to 24.008 v8.6.0
svn path=/trunk/; revision=30977
2009-11-16 18:22:43 +00:00
Anders Broman 40447d1c12 Updated decoding of GMM Cause to V8.6.0, i.e. added cause code 0x19 - "Not authorized for this CSG". Changed to use a range_string.
Based on 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4132

svn path=/trunk/; revision=30627
2009-10-20 03:13:56 +00:00
Bill Meier 8790ed892f Define a global variable as static;
#include <stdio.h> & <stdlib.h>  not req'd.

svn path=/trunk/; revision=30101
2009-09-23 18:20:06 +00:00
Bill Meier 9310f13f19 Change gchar foo[mm][nn] = {"xxx", "yyy", ...} to static const gchar *foo[mm] = {...}
Add a comment about a possible bug: some strings in array are never used ?
Do some minor reformatting.

svn path=/trunk/; revision=30097
2009-09-23 17:55:37 +00:00
Bill Meier 81444cdda0 Quick fix for Bug #4040.
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4040

ToDo: Fix usage of
 gchar xxx[..][..] = {"aaa", "bbb", ...};

svn path=/trunk/; revision=30094
2009-09-23 16:06:39 +00:00
Anders Broman 2cacda1823 From Vincent Helfre:
MS network capability enhancement.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4039

svn path=/trunk/; revision=30075
2009-09-22 19:15:30 +00:00
Bill Meier 6c545e0d79 Save some memory: Don't statically allocate ett[] arrays used "dynamically".
svn path=/trunk/; revision=29929
2009-09-15 17:37:54 +00:00
Anders Broman 7945bf1bc9 From Harald Welte :
Connect RRLP to GSM A DTAP application info message.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3919

From me try to fix missuse of pinfo.

svn path=/trunk/; revision=29482
2009-08-20 07:26:16 +00:00
Anders Broman 43cbf13ad4 Minor clean up.
svn path=/trunk/; revision=29466
2009-08-18 14:39:32 +00:00
Jaap Keuter c9e3f66d14 Optimize empty strings to NULL pointers.
svn path=/trunk/; revision=29298
2009-08-04 21:05:38 +00:00
Anders Broman 1464f7ca84 Introduce decode_bits_in_field() and use it.
clean up some left owers from previous checkin.

svn path=/trunk/; revision=28373
2009-05-15 18:38:13 +00:00
Anders Broman 2289fa0d21 Fix:
GSM DTAP: Incorrect decoding of MS Radio Access Capability Switch-Measure*
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3461

svn path=/trunk/; revision=28361
2009-05-14 18:26:18 +00:00
Bill Meier 18fac3d956 Use NULL instead of repeated,indentical text for blurbs in hf[];
Adjust some spacing;
Replace tab in string by a space;
Use #if 0... #endif instead of /* ... */ to comment out some code.

svn path=/trunk/; revision=28296
2009-05-07 21:22:36 +00:00
Jaap Keuter 23143c2580 From rspmn:
Wireshark considers an Activate PDP Context Request which contains a
DNS Server Address Request parameter according to section 10.5.6.3 of
TS 24.008 to be a malformed packet.
The attached patch (against SVN revision 28067) fixes the problem for
the parameters DNS Server Address Request and P-CSCF Address Request.

svn path=/trunk/; revision=28084
2009-04-18 06:34:58 +00:00
Anders Broman 2db386dfd4 - Use correct length in TLV-E and LV-E.
- Update PD values to the latest spec.
- Remove some non ASCII chars.
- Start dissecton of LTE NAS ESM EPS messages and IE's.

svn path=/trunk/; revision=27605
2009-03-04 19:51:55 +00:00
Anders Broman fea7018ed8 Add dissection of some IE's, reworked input from Zakia Karim.
svn path=/trunk/; revision=27467
2009-02-16 21:21:11 +00:00
Bill Meier 35e5fa9bc1 #include <epan/conversation.h> and/or #include <epan/emem.h> not req'd ...
svn path=/trunk/; revision=27390
2009-02-07 14:33:47 +00:00
Anders Broman b631b88d61 Implement TLV-E and LV-E type IE dissection (2 byte length value).
svn path=/trunk/; revision=27100
2008-12-23 20:49:15 +00:00
Bill Meier c544c20956 Fix various typos and spelling errors (mostly in text strings)
svn path=/trunk/; revision=27050
2008-12-18 19:08:49 +00:00
Bill Meier 33c99f44fd Fix typos and spelling (mostly in text strings)
svn path=/trunk/; revision=27028
2008-12-17 00:08:38 +00:00
Anders Broman dabf28342f From Pascal Quantin:
Enhance 3GPP 24.008 GMM dissection.

svn path=/trunk/; revision=26796
2008-11-17 19:41:44 +00:00
Anders Broman 2ff51cb037 Update the QoS IE
svn path=/trunk/; revision=26526
2008-10-23 19:22:54 +00:00
Anders Broman 07ccec7bcb 3GPP TMSI STATUS IE decoding does not update curr_offset
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2945

svn path=/trunk/; revision=26379
2008-10-08 16:09:28 +00:00
Anders Broman ebc8f1f8bf From Niel Percy:
Much as I hate white space changes, I got fed up of the huge variation of styles within these files, and tried to get to a much smaller range of variation. Also a few comment tidies, and use of _U_ for unused args rather than "arg = arg" lines.

svn path=/trunk/; revision=26140
2008-09-05 05:49:39 +00:00
Anders Broman 2226bccd44 From Neil Piercy:
1 new split file (GMM & SM in one file) and diff patches for the others. The RR, RP and BSSMAP patches are really a tidy-up: now they are split it becomes clear what was redundant code.

svn path=/trunk/; revision=26064
2008-08-24 17:42:30 +00:00