Commit Graph

228 Commits

Author SHA1 Message Date
Martin Mathieson 0cf834f909 Make some more variables and functions static. 2021-02-14 19:42:01 +00:00
Martin Mathieson 259134b406 Make some more variables/functions static. 2021-02-10 11:14:52 +00:00
Pascal Quantin 125790b918 NAS EPS: fix a typo 2020-11-27 15:22:19 +00:00
Pascal Quantin e35752c252 3GPP NAS: upgrade dissector to v16.6.0 2020-11-13 15:40:19 +01:00
Anders Broman 7d3ee49180 RTCP: Add dissection of Application mccp TS 24.380 2020-09-29 16:47:42 +00:00
Joakim Karlsson 160a4696fa NAS 5GS: correction of QoS Rules with the length of two octets
Change-Id: I2d5c2e714067ec3198e24c54145315c009b56198
Reviewed-on: https://code.wireshark.org/review/35729
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-01-10 11:24:04 +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
Harald Welte 32fa74c08f GSUP: Add dissection of BSSMAP, RR and SM cause values
This is achieved by calling the respective dissector functions
from other dissectors, which requires them to be exported.

Change-Id: Ifd01da8e5ff4ac3f3f3179b842e3a7223629b234
Reviewed-on: https://code.wireshark.org/review/33121
Reviewed-by: fixeria <axilirator@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-10 07:19:09 +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
Pascal Quantin 864f43ea9b 3GPP NAS: upgrade dissector to v15.6.0
Change-Id: I622934203233ba8fc817d850d1b793b02e465337
Reviewed-on: https://code.wireshark.org/review/32604
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-03-28 06:14:31 +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
Anders Broman 18bfaea5ce GSM-A-GM: Enhance TIMER 3 presentation
Do the conversion for case 6, units of 320 hours too.

Change-Id: If9713ae2823308aba2afa404f7100157d68eb7d6
Reviewed-on: https://code.wireshark.org/review/32101
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:08:40 +00:00
Pascal Quantin 825de369d3 3GPP NAS: upgrade dissector to v15.5.0
Change-Id: I8cd60558ef6fb80d916f30aa79028cd87542d956
Reviewed-on: https://code.wireshark.org/review/31226
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-12-28 13:48:08 +00:00
Pascal Quantin e3c38ff329 NAS EPS: upgrade dissector to v15.4.0
Change-Id: I43c75c92beac87674bb1293ee4951e47560721d2
Reviewed-on: https://code.wireshark.org/review/30091
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-10-09 14:48:52 +00:00
AndersBroman 40789524c5 gsm_a_gm: Fix dissection of 10.5.6.3 Protocol configuration options.
Session-AMBR dissected as QoS rules
PDU session address lifetime dissected as Session-AMBR.

Change-Id: Iee9e630644638718f37ddbc185e23add32ee61ea
Reviewed-on: https://code.wireshark.org/review/29630
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-12 10:54:40 +00:00
AndersBroman 16b04f59ed NAS-5GS: Update towards spec 2.0.0
Change-Id: I31b1dda0f06bf1b719dc949dfd1a44c151f452b9
Reviewed-on: https://code.wireshark.org/review/28217
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-12 14:51:33 +00:00
Pascal Quantin d10f0a62b2 3GPP NAS: fix dissection of Linked TI IE
Change-Id: Idb5713e8ab9ef7c33110380516261f0202b8b599
Reviewed-on: https://code.wireshark.org/review/28047
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-06 08:44:20 +00:00
Peter Wu 4d800d7b8a gsm_a_gm: fix potential buffer overrun (read)
When the string "str" is empty, "str+1" is invalid. This function can be
called from functions using SET_ELEM_VARS in packet-gsm_a_common.c which
appear to check the length first, but packet-etsi_card_app_toolkit.c and
packet-camel.c do not. Err on the safe side and do not add the item.

Change-Id: I6bd559593bb10ff0b8bf08a48d828613e3d8ccf5
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=4311
Reviewed-on: https://code.wireshark.org/review/27470
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-12 17:36:34 +00:00
Pascal Quantin 684ca9db12 3GPP NAS: upgrade dissector to v15.2.0
Change-Id: I11510356950c1eab4d77f8473f62aa6428311853
Reviewed-on: https://code.wireshark.org/review/26682
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-29 22:56:03 +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
Pascal Quantin 8791e0b61f 3GPP NAS: rework PCO loop to better report extra data at the end of the payload
This will help identifying that the packet contains unexpected data at the end
rather than triggering a malformed error when trying to fetch outside of
the tvb.

Change-Id: Ieb71204f3c364e809447157e7a71c3eb92620d85
Reviewed-on: https://code.wireshark.org/review/25366
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-18 12:08:45 +00:00
Pascal Quantin 8a08237d23 3GPP NAS: upgrade dissector to v15.1.0
Change-Id: Ibfbed335d842e53eabce36e2955a9bb2790d46fb
Reviewed-on: https://code.wireshark.org/review/25131
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-01-03 20:36:01 +00:00
Pascal Quantin 456c3ff4a3 3GPP NAS: upgrade dissector to v14.6.0
Change-Id: If8d0ab933285f8398b0e8625e7c6e2ef0345fc95
Reviewed-on: https://code.wireshark.org/review/25040
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-12-28 19:07:59 +00:00
Pascal Quantin 7f327cc580 3GPP NAS: fix dissection of PCO MSISDN container ID
3GPP 24.008 is not very explicit regarding the encoding, but after
rereading 3GPP 23.003 and 3GPP 29.272, it is most likely the E.164
number in TBCD encoding (so without TON/NPI byte).

Change-Id: Iae58ccc2919d28cb802015205b3b5fb97a1c4abe
Reviewed-on: https://code.wireshark.org/review/24463
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-11-17 13:01:10 +00:00
Pascal Quantin 4efa11528e 3GPP NAS: upgrade dissector to v14.5.0
Change-Id: Ibf45c6b5930ee122004afc8d2ac84a751491f3a4
Reviewed-on: https://code.wireshark.org/review/23735
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-09-25 21:32:59 +00:00
Joakim Karlsson e345d19b95 GPRSCDR: decoding of PDPType
Change-Id: Iec007c5276e30c982e776263ef753c002e2a9c72
Reviewed-on: https://code.wireshark.org/review/23660
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-24 03:38:04 +00:00
Pascal Quantin 36bc2c6da4 3GPP NAS: upgrade dissector to v14.4.0
Change-Id: Iae5627a53683de0b359a95c21866513461b5d559
Reviewed-on: https://code.wireshark.org/review/22572
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: Michael Mann <mmann78@netscape.net>
2017-07-09 23:18:34 +00:00
Pascal Quantin 993542685b GSM A GM: add APN rate control parameters elements in the right tree
Change-Id: Id0f4d84c9f0cf9c1e0ebfb45265a63e918f831e1
Reviewed-on: https://code.wireshark.org/review/22546
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-07-07 17:04:40 +00:00
Pascal Quantin 9d909b22fc GSM A GM: fix dissection of AER bit
Change-Id: I705e0ed70bbd9c540615f6bf6e603596deb11d0d
Reviewed-on: https://code.wireshark.org/review/22543
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-07-07 16:37:58 +00:00
Ivan Nardi 1d657acf2d gsm-a, nas-eps: enhance handling of missing mandatory i.e.
When a mandatory information element is missing, try to report an expert info,
instead of throwing a fatal malformed exception (or of reporting nothing at all).

According to TS 24.007 11.2.3, a mandatory i.e. may be part of the imperative part
of the message, so that expert info should be at PI_ERROR level

Change-Id: Id399c236f2923db36540bbda0d29d666548f7cbd
Reviewed-on: https://code.wireshark.org/review/22134
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: Michael Mann <mmann78@netscape.net>
2017-06-15 11:48:11 +00:00
AndersBroman b5610a0436 [ISAKMP] Dissect 3GPP private error and status messages in NOTIFY.
Change-Id: Iaa65c1cf9f358e36e77b4a5cad2543dcbb98072e
Reviewed-on: https://code.wireshark.org/review/20090
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-13 17:36:52 +00:00
Pascal Quantin abe78e915e GSM A GM: align protocol / container id filter format with displayed one
Change-Id: If5dcee6a2a9dd6de304e78f84456903c932ad452
Reviewed-on: https://code.wireshark.org/review/19393
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-12-23 08:47:46 +00:00
Pascal Quantin c1e1f62cb8 GSM A GM: use same spelling as the 3GPP specification
Change-Id: I706b64bb3875a15d8be0e486a03784e19ab5af23
Reviewed-on: https://code.wireshark.org/review/19392
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-12-23 08:47:27 +00:00
Pascal Quantin 5a3d31b377 NAS EPS: upgrade dissector to v13.8.0
Change-Id: Ifad1fbd22984ad777278c7cc90622b205405cf1f
Reviewed-on: https://code.wireshark.org/review/19377
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>
2016-12-21 22:06:22 +00:00
Michael Mann 232cb9a2dd Remove proto_item_append_text calls in favor of BASE_UNIT_STRING.
Many proto_item_append_text calls were just adding a unit string to a field.
There's a better way to do that now.

Change-Id: Id18d5ac1ea4d8ecdc4cbe7ebaec07fbd2eab6e78
Reviewed-on: https://code.wireshark.org/review/19289
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-16 03:04:11 +00:00
Pascal Quantin f96ef34b19 3GPP NAS: shorten some value_string to avoid truncation during display
Change-Id: I50f9bbec5405c17a59c5eaac9833929737b8c145
Reviewed-on: https://code.wireshark.org/review/18984
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-11-29 13:31:53 +00:00
Pascal Quantin a222812787 3GPP NAS: add an expert info when APN encoding exceeds 100 bytes
As stated in 3GPP 23.003:
"the APN has, after encoding as defined in the paragraph below,
a maximum length of 100 octets"

Change-Id: Iae23117f44ea5b668f6cb23dbd0e726e4e56ce41
Reviewed-on: https://code.wireshark.org/review/18972
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>
2016-11-28 20:55:46 +00:00
Pascal Quantin a1ecd5661f GSM A GM: add specific filters for IPv4 / IPv6 Protocol ID
Bug: 13001
Change-Id: I6bdaa5cd034b9ccf608fe0f6913d099ee920f0db
Reviewed-on: https://code.wireshark.org/review/18157
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: Michael Mann <mmann78@netscape.net>
2016-10-11 23:27:13 +00:00
Pascal Quantin c33169b7b8 3GPP NAS: upgrade dissector to v13.7.0
Change-Id: I353608057c50e2631f6bae6a026f361640ec9560
Reviewed-on: https://code.wireshark.org/review/18006
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>
2016-10-01 14:27:07 +00:00
Guy Harris a4c8ebc18b Don't do any Decode As stuff for dissector tables not used with Decode As.
Have all dissector tables have a "supports Decode As" flag, which
defaults to FALSE, and which is set to TRUE if a register_decode_as()
refers to it.

When adding a dissector to a dissector table with a given key, only add
it for Decode As if the dissector table supports it.

For non-FT_STRING dissector tables, always check for multiple entries
for the same protocol with different dissectors, and report an error if
we found them.

This means there's no need for the creator of a dissector table to
specify whether duplicates of that sort should be allowed - we always do
the check when registering something for "Decode As" (in a non-FT_STRING
dissector table), and just don't bother registering anything for "Decode
As" if the dissector table doesn't support "Decode As", so there's no
check done for those dissector tables.

Change-Id: I4a1fdea3bddc2af27a65cfbca23edc99b26c0eed
Reviewed-on: https://code.wireshark.org/review/17402
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31 00:08:01 +00:00
Pascal Quantin fdd87a1e41 Network-Based IP Flow Mobility (NBIFOM) dissector
Based on 3GPP 24.161 V13.1.0

Change-Id: I7bf635c862bf7e0b73fd05bc8a55c900d1f4dd87
Reviewed-on: https://code.wireshark.org/review/16291
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: Michael Mann <mmann78@netscape.net>
2016-07-05 00:06:38 +00:00
Pascal Quantin 42b8c951fa 3GPP NAS: add a missing separator for optional string
Change-Id: Idddbae0e969b525ddbe31f3b1ddbccaed232891a
Reviewed-on: https://code.wireshark.org/review/16197
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-28 19:49:31 +00:00
Pascal Quantin ca369ac20d 3GPP NAS: upgrade dissector to v13.6.0
Change-Id: Ieffc5d6544f3bd121ff317ff598faaadb5f117ab
Reviewed-on: https://code.wireshark.org/review/16194
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>
2016-06-28 15:47:23 +00:00
Michael Mann 0ef1d941ea Allow control of individual columns to be (un)writable.
Most protocols just want to limit COL_INFO or COL_PROTOCOL
so give that level of granularity.

Bug: 12144
Bug: 5117
Bug: 11144
Change-Id: I8de9b7d2c69e90d3fbfc0a52c2bd78c3de58e2f8
Reviewed-on: https://code.wireshark.org/review/15894
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
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-06-15 06:03:57 +00:00
Pascal Quantin 5a166757ec 3GPP NAS: upgrade dissector to v13.5.0
Change-Id: I454a6a07efe599924edcfd2a5adeeabaf902995b
Reviewed-on: https://code.wireshark.org/review/14605
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-23 22:16:52 +00:00
Michael Mann 1e60d63c8c Create call_data_dissector() to call data dissector.
This saves many dissectors the need to find the data dissector and store a handle to it.

There were also some that were finding it, but not using it.
For others this was the only reason for their handoff function, so it could be eliminated.

Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b
Reviewed-on: https://code.wireshark.org/review/14530
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20 17:38:03 +00:00
Michael Mann 9bcac48403 Manually add protocol dependencies derived from find_dissector.
Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector.  Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector.
"data" dissector was not considered to be a dependency.

Change-Id: I15d0d77301306587ef8e7af5876e74231816890d
Reviewed-on: https://code.wireshark.org/review/14509
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-20 12:48:48 +00:00
Michael Mann e37275bfde Associate dissector tables and heuristic subdissector lists with a protocol.
This will make it easier to determine protocol dependencies.

Some LLC OUI dissector tables didn't have an associated protocol, so they were left without one (-1 used)

Change-Id: I6339f16476510ef3f393d6fb5d8946419bfb4b7d
Reviewed-on: https://code.wireshark.org/review/14446
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-17 00:05:17 +00:00
Pascal Quantin e0fe8c2543 3GPP NAS: fix dissection of GMM Identity Request, Response and Authentication and Ciphering Failure messages
Bug: 12246
Change-Id: I0cad1c951c4939bde41c281cfc0cf5b4a08ea2a3
Reviewed-on: https://code.wireshark.org/review/14406
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-10 12:47:44 +00:00
Pascal Quantin c1d9aca29b 3GPP NAS: upgrade dissector to v13.4.0
Change-Id: Id4c7b29d63216e0475da93ed38b5a275bd29cd5c
Reviewed-on: https://code.wireshark.org/review/12905
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-12-29 12:28:10 +00:00