Commit Graph

383 Commits

Author SHA1 Message Date
Martin Mathieson fc64ba242a More dissector spelling fixes. 2020-09-24 16:40:51 +00:00
Martin Mathieson 82827278f7 More dissector string spelling fixes.
Finally, it is becoming difficult to find more.
2020-09-13 09:03:08 +01:00
Pascal Quantin c09cb5c343 GTPv2: fix dissection of Target Identification IE
Closes #16822
2020-09-03 21:54:18 +02:00
Anders Broman 00bf625286 GTpv2: Add expert info for zero length IE
Add an Expert info for zero length 8.76 CSG Information Reporting Action
IE.
2020-09-01 07:30:44 +00:00
Martin Mathieson b8a773dddc Fix some spelling errors in dissector strings.
A first batch of spelling errors, detected using a script that uses
pyspellcheck and a Wireshark-specific dictionary file.
2020-08-29 19:31:11 +00:00
Pascal Quantin f59262b94c GTPv2: fix S103PDF and S1UDF IE dissection
The IPv4 or IPv6 address was not added properly to the tree

Bug: 16777
Change-Id: Ic28138cc1d4c2dc350fb5ff95aa3a5496a293c91
Reviewed-on: https://code.wireshark.org/review/38153
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-08-13 12:47:24 +00:00
Andreas Schultz 0cce968634 GTPv2: validate length of PDN Address Allocation (PAA) IE
PAA is a variable length IE, but it is not extendable (see Table 8.1-1 in
3GPP TS 29.274). For a give type the length therefore has to match and
can not exceed the defined length.

Change-Id: Id65842a7f25018fd3864efd73f74ae583102a681
Reviewed-on: https://code.wireshark.org/review/37984
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-08-10 10:30:57 +00:00
Guy Harris e1d9a226a2 Fix the type of arrays of pointers to hf_ values for bitfield routines.
The static arrays are supposed to be arrays of const pointers to int,
not arrays of non-const pointers to const int.

Fixing that means some bugs (scribbling on what's *supposed* to be a
const array) will be caught (see packet-ieee80211-radiotap.c for
examples, the first of which inspired this change and the second of
which was discovered while testing compiles with this change), and
removes the need for some annoying casts.

Also make some of those arrays static while we're at it.

Update documentation and dissector-generator tools.

Change-Id: I789da5fc60aadc15797cefecfd9a9fbe9a130ccc
Reviewed-on: https://code.wireshark.org/review/37517
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-19 11:32:26 +00:00
Pascal Quantin be1ac1333d GTPv2: fix dissection of gtpv2.mon_event_ext_inf.lrtp
Bug: 16602
Change-Id: I42e66b84e9f1779b0f1a0c9226c2c444dcf26aa8
Reviewed-on: https://code.wireshark.org/review/37444
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-06-10 21:25:45 +00:00
Joakim Karlsson d6c7699790 diameter: update ULI list according to TS 29.061 v15.5.0
Change-Id: Ief7de8ae3cf74e2de63aac7172bd9b3a04e3b142
Reviewed-on: https://code.wireshark.org/review/37413
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-10 03:42:04 +00:00
Pascal Quantin 1bab3c4a0f GTPv2: the header sequence number is 3 bytes long, display it as FT_UINT24
Change-Id: Id47b720a1ac4e11c0d3c4322fc4929e3d6ab8e9d
Reviewed-on: https://code.wireshark.org/review/37379
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2020-06-04 17:01:38 +00:00
Pascal Quantin 507285a534 GTPv2: add dissection of Monitoring Event Extension Information IE
Bug: 16596
Change-Id: I3467ea41d0686338d1c4aa085ebbafa18b1062f7
Reviewed-on: https://code.wireshark.org/review/37348
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-05-31 16:42:58 +00:00
Pascal Quantin 9888a4c742 GTPv2: fix display of spare bits in Monitoring Event Information IE
Bug: 16596
Change-Id: I82a8b5cdb341138d3a4928d2fe3a9df2f885ce51
Reviewed-on: https://code.wireshark.org/review/37347
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-05-31 16:42:41 +00:00
Anders Broman a97956fa20 gtpv2: Use ENC_TIME_MSEC_NT for "Origination time stamp".
Change-Id: Ia993f61058907e75487f6a1a718b34dccfd1437e
Reviewed-on: https://code.wireshark.org/review/37312
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-26 10:34:00 +00:00
Anders Broman e4ef58a883 GTPv2: Use message specific IE name for generic IE
In Create Session Request generic IE Millisecond Time Stamp is
Origination time stamp.

Change-Id: Ib033d56bc9995903973837c56f1a3ec7c62c3663
Reviewed-on: https://code.wireshark.org/review/37303
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-25 08:27:13 +00:00
Guy Harris 524baee94f Add string encoding values for various BCD encodings, and use them.
Add some ENC_ values for various flavors of packed BCD, and use that
instead of explicitly calling tvb_bcd_dig_to_wmem_packet_str() and
adding the result.

Change-Id: I07511d9d09c9231b610c121cd6ffb3b16fb017a9
Reviewed-on: https://code.wireshark.org/review/36952
Reviewed-by: Guy Harris <gharris@sonic.net>
2020-04-27 01:53:09 +00:00
Anders Broman 5fbe2e4df8 GTPv2: Dissect IE 8.106 Node Number
Change-Id: I910910f9447048bf1a5645ad01f07da8fa0bfb59
Reviewed-on: https://code.wireshark.org/review/36561
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-25 08:39:55 +00:00
Anders Broman 16adaf33b4 GTPv2: Dissect Core Network Restrictions and UE Radio Capability ID.
Change-Id: I91714384688a554cbca82a0ae887e18f6304e0c1
Reviewed-on: https://code.wireshark.org/review/36379
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-12 15:25:12 +00:00
Anders Broman e2c07dae19 GTPv2: Length of APN Rate Control Statuses is 2 bytes.
Change-Id: I501c86b6203a74a252beccf5275677f3bf0f559d
Reviewed-on: https://code.wireshark.org/review/36354
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-10 08:01:03 +00:00
Anders Broman e8d770f3c7 GTpv2: MM Context, handle new data.
Change-Id: I01c7f6e6dd1beb7f5df34e795ace437c89120545
Reviewed-on: https://code.wireshark.org/review/36312
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-06 15:05:54 +00:00
Joakim Karlsson 00edddb9ba GTPv2: 8.22 F-TEID, update interface types
Change-Id: Iaeaa0bce866ece4702da7f5b3c4446fc568325f0
Reviewed-on: https://code.wireshark.org/review/36220
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-02-28 04:49:27 +00:00
Anders Broman 4e98225198 GTPv2: Dissect more flags
Change-Id: I42907c1d339e105efd45d248a94d041afebc6a75
Reviewed-on: https://code.wireshark.org/review/36170
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-02-24 15:33:06 +00:00
Anders Broman 301cb9956b gtpv2: 8.12 Indication, add new bit decoding.
Change-Id: I9791bc901cc88288963a31c36b4660595e23d470
Reviewed-on: https://code.wireshark.org/review/36169
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-02-24 09:47:59 +00:00
Joakim Karlsson 9fd4555c6f gtpv2: added IE Monitoring Event Information
Change-Id: Icf02c5715c2eda01fc86d5a71a209983b2f5df68
Reviewed-on: https://code.wireshark.org/review/35603
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-01-04 13:42:28 +00:00
Pascal Quantin 7590d08db1 GTPv2: small fixes
- fix dissection of ULI
- fix a typo in gtpv2.gnodeb_id filter name

Change-Id: I271916fadb76247651ac0325fce8330e3a6f5f13
Reviewed-on: https://code.wireshark.org/review/35094
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-11-15 19:40:25 +00:00
Pavel Strnad fd4bb1e392 GTPv2: fix wrong offset in FWRDRELREQ if Target Type is gNB ID
Change-Id: I7c26f5876be04de32244b098f97bf5c2502b0391
Reviewed-on: https://code.wireshark.org/review/35093
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-11-15 17:05:11 +00:00
Anders Broman 58099c2d66 GTPv2: 8.38 MM Context check end of IE.
Change-Id: I109c78186fcffe635bac13ceb7174749451bf0d1
Reviewed-on: https://code.wireshark.org/review/34773
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-10-14 10:42:12 +00:00
Anders Broman b6f78f45b5 GTPv2: Add basic dissection for Monitoring Event Extension Information
Change-Id: Ic3bd56d383840e3cf9521feb77a7d6bfbdc50aa4
Reviewed-on: https://code.wireshark.org/review/34729
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-10-08 08:19:40 +00:00
Michael Mann 01d7793976 Add proto_tree_add_item_ret_time_string
A few dissectors need the functionality of adding a time field to a proto_tree
while also needing the "time to string" value (typically to show on a tree above).
The functionality to do "get value from tvb and convert to string" was being done
in packet-ntp.c.
Instead proto_tree_add_item_ret_time_string can be used with various encoding to
get the necessary functionality with less code duplication.

ENC_TIME_MIP6 was added as a result of the refactoring.
ABSOLUTE_TIME_NTP_UTC was added as another potential "base" type for time fields.

Change-Id: Ie460c33370b0af59ef60bdab893ce9d6eb23b94f
Reviewed-on: https://code.wireshark.org/review/34390
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-29 13:31:48 +00:00
Anders Broman 44fe92559b GTPv2:Add dissection of new bit in IE 8.12 Indication.
Change-Id: Idcd5f1cd785d092d9169ef71e18705ab258b9476
Reviewed-on: https://code.wireshark.org/review/34282
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-14 08:10:55 +00:00
Anders Broman f86c6bd957 GTPv2: hf for spare bits must have a bitmask.
Change-Id: Idc0c9e3eea9fc888c7fd7f03d3382e9bc83a9adb
Reviewed-on: https://code.wireshark.org/review/34197
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-06 10:24:23 +00:00
Anders Broman 94f9563f5d GTPv2: Update Cause IE.
Change-Id: I52ccd9c680f3dd95ce6d001d61c39146d60c81eb
Reviewed-on: https://code.wireshark.org/review/34186
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-05 12:07:15 +00:00
Anders Broman 991512c62f GTPv2: IE UE Usage Type can have zero length.
Change-Id: I09b45f1bc6fcbf4ca2d6c97d33db4d848f783a29
Reviewed-on: https://code.wireshark.org/review/33127
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-09 08:07:40 +00:00
Alexis La Goutte 15fcf3d4ac gtpv2: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I1d4210883423db76d83ea5dbbdc98736807b4374
Reviewed-on: https://code.wireshark.org/review/33024
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-04-30 13:26:55 +00:00
Anders Broman d0ce55289b GTPv2: Update a value string.
Change-Id: If38d9e86fff6e142804b3d206f5afed2c6fec8bd
Reviewed-on: https://code.wireshark.org/review/32991
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-26 13:24:37 +00:00
Anders Broman 7c59ac4c6d GTPv2: Add decoding of more IEs
Bug: 15724
Change-Id: I5a2b017eff3b245189c92f9b4500d4e30750a035
Reviewed-on: https://code.wireshark.org/review/32983
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-26 12:49:10 +00:00
Gerald Combs 8d3ac3af86 epan: Convert our PROTO_ITEM_ macros to inline functions.
Convert our various PROTO_ITEM_ macros to inline functions and document
them.

Change-Id: I070b15d4f70d2189217a177ee8ba2740be36327c
Reviewed-on: https://code.wireshark.org/review/32706
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-04 04:03:38 +00:00
Anders Broman ed41f73708 GTPv2: Update Presence Reporting Area Action to v15.7.0
Change-Id: Ic904e93caf8d0d3de5e3a0351fc58ac9773aa161
Reviewed-on: https://code.wireshark.org/review/32609
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-03-28 11:29:11 +00:00
Anders Broman 38b186cf66 GTPv2: Fix MM Context Used NAS integrity protection algorithm values.
Bug: 15648
Change-Id: Ieb1f9db7bc481c1bb612ba1f3b3dadd5cdee2fc4
Reviewed-on: https://code.wireshark.org/review/32602
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-03-27 15:00:33 +00:00
Anders Broman 5aa5f1c231 GSM-A-GM: Remove redundant code, gtpv2 add a comment
Change-Id: I4cad8e1ccdf83b0ed953462ab496c303f97c3caa
Reviewed-on: https://code.wireshark.org/review/32103
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-19 12:45:45 +00:00
Pascal Quantin 6180d0fdaa GTPv2: fix dissection of APN IE
The total maximum length of the APN with Network Identifier and Operator
Identifier is 100 bytes.

Bug: 15383
Change-Id: Ib74eac1f18f2235c2788e58370f50eeb9a678357
Reviewed-on: https://code.wireshark.org/review/31225
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-28 14:08:53 +00:00
Joakim Karlsson 495a6204a4 gtpv2: Update Security Capability in MM Context
According to TS 29.274, ch8.38. the UE NR security capability coding
is specified in clause 9.9.3.53 of 3GPP TS 24.501

Change-Id: I4e5352bf7a5c75a3766b2d1162d8d85c3566da86
Reviewed-on: https://code.wireshark.org/review/31074
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-18 05:17:12 +00:00
Anders Broman 9fe5d3729f gtpv2: Handle different sizes of 8.38 MM Context.
Change-Id: Iaeb795f439a1157bca6d006d2a0bf8fe44703267
Reviewed-on: https://code.wireshark.org/review/30662
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-16 09:55:31 +00:00
Anders Broman 8f4cf7c8d4 gtpv2: Update RAT types.
Change-Id: Ifb134ce340d847af65bad4dd20d5c453af85d4e1
Reviewed-on: https://code.wireshark.org/review/30582
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-12 12:49:09 +00:00
Anders Broman 2ed1e002b3 gtpv2: Add dissection of SCEF PDN Connection.
Change-Id: I940c786d01d6b648f6e50dad50bb2ecfb37ddefb
Reviewed-on: https://code.wireshark.org/review/30511
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-05 12:39:42 +00:00
AndersBroman dd4efcfb37 GTPv2: Update 8.38 MM Context.
Change-Id: Ie04878b92133c00a668fea74736c694d4e9a87dc
Reviewed-on: https://code.wireshark.org/review/29732
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-19 08:57:53 +00:00
Alexis La Goutte 5b533e4f3e gtp(v2): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I3bfe5fdbe16a5fd7072f3a1c1e8bb5fdd6be0040
Reviewed-on: https://code.wireshark.org/review/29436
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-05 19:53:17 +00:00
Anders 20c41b689b GTPv2: Add expert info for wrong length IEs
Change-Id: I1d6f5198ec7ae39d870e5d4ad4630b29d0016f21
Reviewed-on: https://code.wireshark.org/review/29350
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-30 15:29:25 +00:00
slavka a9e7bda136 GTPV2: Extended Macro eNB ID was not assigned to correct type of subtree
Change-Id: I51446af504a5cac1b8917e06d899b4aec51d02be
Reviewed-on: https://code.wireshark.org/review/29265
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-08-23 13:43:48 +00:00
slavka c0b81e01d9 GTPV2: added support for Extended Macro eNodeB
Added support for Extended Macro eNodeB field in Presence Reporting
Area Action. Defined in 29.274 sec 8.51.5.

Change-Id: I27242b38c03cea4c1284c14d42b0d3f54da710f4
Reviewed-on: https://code.wireshark.org/review/29245
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-08-23 10:48:24 +00:00