Commit Graph

163 Commits

Author SHA1 Message Date
Anders Broman 45188b673d Diameter make use of OctetStringOrUTF8
Use the new feature rather than coding it
2020-09-17 08:52:35 +02:00
Anders Broman 0e6551336d Diameter 3GPP: Pretify dissection of 3GPP AVP 524 Codec-Data 2020-09-04 06:04:50 +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
Anders Broman bc7c5ca628 Diameter-3gpp: 3GPP AVP 525 Service-URN show it as string if printable.
Change-Id: I71d46dfbb205448704792d5fafbd3986ccd2f773
Reviewed-on: https://code.wireshark.org/review/37377
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-04 18:30:18 +00:00
Anders Broman c24286a9ca 3GPP: Update Geographical Area Description (GAD).
Change-Id: I1ad8a4bd21ed590eae4d64b7a287256860e597ca
Reviewed-on: https://code.wireshark.org/review/36963
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-28 13:17:06 +00:00
Pascal Quantin 6d471c9a22 Diameter 3GPP: fix diameter_3gpp_qos_delay_cls_vals array definition
Change-Id: Id8df6889f177e203380a7cc98d15d8cb7514bb03
Reviewed-on: https://code.wireshark.org/review/36676
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-04-03 07:51:10 +00:00
Anders Broman 012695d944 Diameter 3GPP: Core-Network-Restrictions check if data exists.
Change-Id: I2861bd4008e8c39a9d8f184b82680095c54da92e
Reviewed-on: https://code.wireshark.org/review/36388
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-13 11:36:08 +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 297c680fa8 Diameter 3gpp: Don't write to columns when decoding SMS.
Change-Id: I6861d4875efced1a88d445ef97ed0642790b5cff
Reviewed-on: https://code.wireshark.org/review/36370
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Joakim Karlsson <oakimk@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-11 08:21:37 +00:00
Pascal Quantin 57de65c9e7 Diameter 3GPP: fix dissection of MBMS-Bearer-Event AVP
As reported in https://www.wireshark.org/lists/wireshark-users/202003/msg00004.html

Change-Id: I5eb911b9b86e34f01102afe649401a6393603e2c
Reviewed-on: https://code.wireshark.org/review/36274
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-03-04 18:25:13 +00:00
Anders Broman 8877fa2301 Diameter 3gpp: When checking if text ignore padding or NULL termination.
Change-Id: Ic8eac664e2537d0e85afb5cab80e2621407d2c79
Reviewed-on: https://code.wireshark.org/review/36253
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-02 16:58:46 +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 7e73515007 Diameter 3GPP: Fix output of AVP 713 Requested-Nodes
Change-Id: I0ef23d37c070c262f3be6d5c90d6bef9a41c6b79
Reviewed-on: https://code.wireshark.org/review/36071
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-02-11 08:22:13 +00:00
Anders Broman dafa87a0b6 Diameter: Update AVP and flag dissection.
Change-Id: I982f3ed12613b0dc6a4dfc1ffebebde5b0697c98
Reviewed-on: https://code.wireshark.org/review/34884
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-10-29 14:39:34 +00:00
Anders Broman 0dcbe1d1f0 Diameter 3GPP: Add a comment about a bitfield.
Change-Id: Ica224c7e766ed7174f13719886442e56ad4aa8ee
Reviewed-on: https://code.wireshark.org/review/34609
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-09-24 12:59:23 +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 2c330b69f9 3GPP Diameter: Add nev values to AVP 21 3GPP-RAT-Type
Change-Id: I252883bcc6f43bdacaa83cc43bf4624ccd44c7f0
Reviewed-on: https://code.wireshark.org/review/34269
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-08-13 11:51:40 +00:00
Anders Broman 1d40491b96 Diameter 3GPP: Dissect new ULR and DSR Flags.
Change-Id: Idd42138e5ce98c804ebe7811b8a942a9e9bd8127
Reviewed-on: https://code.wireshark.org/review/34263
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-13 07:50:31 +00:00
Guy Harris 20800366dd HTTPS (almost) everywhere.
Change all wireshark.org URLs to use https.

Fix some broken links while we're at it.

Change-Id: I161bf8eeca43b8027605acea666032da86f5ea1c
Reviewed-on: https://code.wireshark.org/review/34089
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-26 18:44:40 +00:00
Anders Broman be3f30b238 Diameter 3GPP: Avoid dereference reported by VS2019.
Change-Id: I63dee0897d8a8ee4efbc525f9de3938349fb849e
Reviewed-on: https://code.wireshark.org/review/33552
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2019-06-11 01:20:24 +00:00
Pascal Quantin 9d01faf0cb Diameter 3GPP: add a few Rx related AVPs
Change-Id: I6ce7d2a8e624430a99371c0ff173e5e48609c6d1
Reviewed-on: https://code.wireshark.org/review/33549
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-06-10 18:49:38 +00:00
Anders Broman ec0f8128bb Diameter 3GPP: Change PLR Flags TFS output to "Set" "Not set"
Change-Id: Ica4bda0b2b5983cf5ca9b0fec678f7f4ee0475ca
Reviewed-on: https://code.wireshark.org/review/32956
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-23 08:54:38 +00:00
Anders Broman e7429d505e Diameter: Add 3GPP AVP 1706 and bit decoding
in 1426 Access-Restriction-Data

Change-Id: I358ddffa1b395adeaa96494f572471619d8b40a6
Reviewed-on: https://code.wireshark.org/review/32884
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-18 09:52:35 +00:00
Anders Broman 36ff993151 Diameter 3GPP: Dissect S6t feature list
Change-Id: I0eeb0a40cba67c4e73b16d48b85ad028286407c5
Reviewed-on: https://code.wireshark.org/review/32878
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-17 13:17:35 +00:00
Anders Broman da8ad825d3 Diameter: Prettify subdissection of bitfields.
Change-Id: I818e00fc3e8e2ff3da50f2075f6e7f9ec085ca2d
Reviewed-on: https://code.wireshark.org/review/32876
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-17 10:43:52 +00:00
Anders Broman df2ccf09e5 Diameter: Update AVPs from TS 29.336 v15.6.0
Bug: 15700
Change-Id: Icea7af58eeb1c5586092065d94e9ce37546306e5
Reviewed-on: https://code.wireshark.org/review/32875
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-17 07:33:36 +00:00
Anders Broman 7abbbaac3d Diameter: Add 3GPP AVP:s and sub dissection.
Change-Id: I93b7afe9b2a2046204376dfd62cd0b508193c91b
Reviewed-on: https://code.wireshark.org/review/32810
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-10 14:23:11 +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 43d2179e96 Diameter 3GPP: Dissect bitfields of PLR-Flags and PLA-Flags.
Change-Id: Ib3286d7c4b473c7cbdfbc0ba83c87b1d679f87a2
Reviewed-on: https://code.wireshark.org/review/32673
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-01 12:11:23 +00:00
Joakim Karlsson c3eb293048 diameter: Added Secondary-RAT-Type
Group RAN-Secondary-RAT-Usage-Report and decoding of Secondary-RAT-Type

Change-Id: I33c1a0e21be64b5b5b4b9a4a40e9e718d89c9943
Reviewed-on: https://code.wireshark.org/review/31036
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-13 18:27:23 +00:00
Anders Broman ab68b2c9ce Diameter-3gpp: Dissect the SMS inside AVP 3301 SM-RP-UI.
Change-Id: I0f293ea529dce5147eef5bfb9d8d4b39640fd0aa
Reviewed-on: https://code.wireshark.org/review/30554
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-09 13:55:31 +00:00
Michael Mann 7a4e932571 Add tvb_ascii_isprint API
This allows dissectors to check if a portion of the tvb is an ascii string while hiding the use of tvb_get_ptr.

Change-Id: Iaec7559dcfdefb8a5ae23e099ced45e90e611f8f
Reviewed-on: https://code.wireshark.org/review/30291
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-21 07:55:40 +00:00
Pascal Quantin b7107f5fcb Diameter: add a few more AVPs from 3GPP 29.272 v15.5.0
Change-Id: Id01c2c79b0923eb469ab03f7cbc7fe9e0be59a3d
Reviewed-on: https://code.wireshark.org/review/30112
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-10-10 12:41:26 +00:00
AndersBroman 7fadcdb7ac [Diameter-3gpp] Add bit 8 in Access-Restriction-Data according to 3GPP
TS 29.272 V15.2.0

Change-Id: I1a9db8f0350f6b8916a321ddfcdf6d9ccc9f462a
Reviewed-on: https://code.wireshark.org/review/26113
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-26 09:53:49 +00:00
Joakim Karlsson cfafb915d1 [Diameter] Gx Supported-Features AVP, List-ID 2
Change-Id: I5cf5adf8c8ae8cbfb9c4c6369454ab4b3ee230a4
Reviewed-on: https://code.wireshark.org/review/25816
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-16 11:52:40 +00:00
Dario Lombardo fe219637a6 dissectors: use SPDX identifiers.
Change-Id: I92c94448e6641716d03158a5f332c8b53709423a
Reviewed-on: https://code.wireshark.org/review/25756
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-12 16:49:58 +00:00
Anders ca7bffbfc3 [Diameter 3GPP] Sub dissect AVP Code: 1677 Group-PLMN-Id.
Change-Id: I69ac8210dfcb43f9fc15e49c75dfb917976f0770
Reviewed-on: https://code.wireshark.org/review/24294
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-08 12:56:16 +00:00
Pascal Quantin 85820a8354 Diameter 3GPP: call XML dissector for Civic-Address AVP payload
Bug: 14142
Change-Id: Iccf5c375087cabd08aa551af8e6586e18684252a
Reviewed-on: https://code.wireshark.org/review/24008
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-21 12:10:06 +00:00
AndersBroman 3bfb9aabe0 [Diameter 3GPP] Fix bitmask in feature list B26 and add B27.
Change-Id: I0f035da3f5305ce6935c79e0c1b5f63f955d099d
Reviewed-on: https://code.wireshark.org/review/23865
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-09 11:46:10 +00:00
Pascal Quantin bd28737d7f Diameter 3GPP: update S6a/S6d/S13/S13' AVPs
Change-Id: Ief76bcd529576ccd5324efb042acc4cad7d79c9b
Reviewed-on: https://code.wireshark.org/review/23648
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-21 14:45:45 +00:00
Alexis La Goutte 837c42d264 diameter_3gpp: fix 'pinfo' was marked unused but was used [-Wused-but-marked-unused]
Change-Id: Iefec98b1bbb47eec4df684933df4b44197dd9164
Reviewed-on: https://code.wireshark.org/review/23242
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-27 20:02:17 +00:00
AndersBroman 1902204f96 [Diameter 3GPP] Add subdissection of AVP 1679 AIR-Flags
Change-Id: I783385b85cfb67d3b0d4affc82a6071e4de51062
Reviewed-on: https://code.wireshark.org/review/21824
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-30 14:24:26 +00:00
Marius Paliga e79488911f Rename AVP Emergency-Indication to Emergency-Services
Renamed in 29.273 Rel 14

Change-Id: I171510869ed2c8a77a983e7c37bbdcb7494ad076
Reviewed-on: https://code.wireshark.org/review/21696
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-18 21:43:20 +00:00
Joakim Karlsson 457f4fbab0 diameter: Improvement of AVP 8
Will now show country and operator
Same as Ic16623c226228ab0c3e31d33cda81953c80551d6

Change-Id: Iecae92d531b9d37254573894f0e7e7f2e2a970aa
Reviewed-on: https://code.wireshark.org/review/20708
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-26 11:51:52 +00:00
Pascal Quantin 4796f79f2f Diameter 3GPP: update Rx Feature-List AVP
Change-Id: Ia4fa3687173f8642f80e650df3e713a26e9a17b5
Reviewed-on: https://code.wireshark.org/review/20362
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-03 11:37:27 +00:00
Jan Spevak d13da6c408 diameter_3gpp: added decoding of TWAN-Identifier AVP
Change-Id: Ib3adec4f7abbdd0313e0017f540044ac45a8883a
Reviewed-on: https://code.wireshark.org/review/19930
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-10 20:27:02 +00:00
Jan Spevak d6d5168881 Diameter: decode Emergency-Indication AVP (1538)
Change-Id: Ie40d61944fd47eb532b759cb122367c18840feff
Reviewed-on: https://code.wireshark.org/review/19615
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-01-12 15:43:49 +00:00
Jan Spevak 36ec6240a8 Added decoding of RAN/NAS cause IE/AVP
Change-Id: I889820405528be5e17edf85e52291d642a98cce6
Reviewed-on: https://code.wireshark.org/review/19216
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-19 13:13:39 +00:00
Jan Spevak 17db0dca8b diameter_3gpp: add decoding of Sd feature list
Change-Id: I431cb2cb39328a7aa537eaa00b1cb1ab07723d3e
Reviewed-on: https://code.wireshark.org/review/18815
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-11-14 10:53:55 +00:00
Jan Spevak 20adb7a564 diameter_3gpp: decode AVP 1518
Change-Id: I95618ebeeb2a5ebe0dfc97bdfdd6c0bb91cb4381
Reviewed-on: https://code.wireshark.org/review/18739
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-11-11 12:15:34 +00:00