Commit Graph

165 Commits

Author SHA1 Message Date
Guy Harris bb494c11de Fix various spelling errors.
Found by lintian and by looking for the misspelled words that lintian
found.

(Does not fix spelling errors in .asn1 files.)
2020-12-09 05:52:50 +00:00
Pascal Quantin 98c21601f8 NAS 5GS: add a fence to info column before calling EAP dissector 2020-11-26 19:42:27 +01:00
Pascal Quantin 063af96df7 NAS 5GS: add dissection of R16 UPDP messages 2020-11-23 23:55:04 +01:00
Pascal Quantin 9fdc3fb3ce NAS 5GS: request type field is 3 bits long 2020-11-23 22:11:13 +00:00
Pascal Quantin d75fef88fb NAS 5GS: upgrade remaining 5GSM IEs to v16.6.0
- IP header compression configuration
- DS-TT Ethernet port MAC address
- UE-DS-TT residence time
- Port management information container
- Ethernet header compression configuration
2020-11-23 19:22:58 +01:00
Pascal Quantin 533f21edfd NAS 5GS: upgrade some 5GSM IEs dissection to v16.6.0
- 5GSM capability
- 5GSM cause
- Integrity protection maximum data rate
- Mapped EPS bearer contexts
- PDU address
- Re-attempt indicator
- 5GSM network feature support
- Serving PLMN rate control
- 5GSM congestion re-attempt indicator
- ATSSS container
- Control plane only indication
2020-11-23 18:38:45 +01:00
Pascal Quantin f22ed956f6 NAS 5GS: upgrade dissection of remaining 5GMM IEs to v16.6.0
- Ciphering key data
- Control plane service type
- MICO indication
- MA PDU session information
- Mapped NSSAI
- Mobile station classmark 2
- Supported codecs
- Payload container
- Payload container type
- Rejected NSSAI
- Release assistance indication
- Request type
- UE radio capability ID deletion indication
- Truncated 5G-S-TMSI configuration
- WUS assistance information
- NB-N1 mode DRX parameters
- Additional configuration indication
2020-11-22 19:19:14 +00:00
Pascal Quantin 4212bea8f3 NAS 5GS: add dissection of 2 more r16 IEs
- CAG information list
- CIoT small data container
2020-11-22 13:42:58 +00:00
Pascal Quantin 7d16b7b251 NAS 5GS: upgrade dissection of more 5GMM IEs to v16.6.0 2020-11-21 23:29:52 +01:00
Pascal Quantin 561c5607a8 NAS 5GS: upgrade dissection of a few 5GMM IEs to v16.6.0 2020-11-21 19:02:32 +01:00
Pascal Quantin 1f40b822e6 NAS 5GS: upgrade 5GMM and 5GSM messages description to v16.6.0 2020-11-21 17:18:20 +01:00
Pascal Quantin 76c8e4c921 NAS 5GS: fix dissection of common information elements 2020-11-17 13:32:17 +01:00
Anders Broman e7898384b3 NAS 5GS: Add more IEs to messages. 2020-11-16 17:22:18 +00:00
Anders Broman 62730dc4fe NAS-5GS: Start upgrading to release 17.0 2020-11-14 16:38:58 +00:00
Pascal Quantin 83af7b89fd 3GPP: add 5G-TMSI to 3gpp.tmsi common filter 2020-10-14 11:08:19 +02:00
Martin Mathieson 8b4e0148a2 Fix some more wrong filter names.
These are duplicates detected seen by running
check_typed_item_calls.py  --consecutive.

There are still quite a few more to go.
2020-09-28 18:20:09 +01:00
Martin Mathieson 4c9f59ee56 Fix more spelling errors in dissector strings.
A second batch of spelling errors, detected using a script
that uses pyspellcheck and a Wireshark-specific dictionary file.

I will take at least one more pass through the dissectors, as
further improvements are made to the script.
2020-08-29 21:32:39 +00:00
Pascal Quantin 62c4e2525f Check that at least one token exists to consider the JSON as valid
Bug: 16780
Change-Id: I07ca12675fc79a7c524719d18b85e5d3dada6652
Reviewed-on: https://code.wireshark.org/review/38160
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-08-14 13:53:16 +00:00
Pascal Quantin c41c47505c NAS 5GS: fix dissection of extended emergency number list IE
Bug: 16668
Change-Id: If936bf25d8a062b72f1b682f9cf7d47d51aa5d1e
Reviewed-on: https://code.wireshark.org/review/37644
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-07-01 18:37:06 +00:00
Pascal Quantin 38bda830d3 NAS 5GS: fix dissection of S1 mode to N1 mode NAS transparent container
Change-Id: Iaf5100fb2f25c0c745a0609de1a639a6bda00ffd
Reviewed-on: https://code.wireshark.org/review/37563
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-06-26 22:01:05 +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
Pavel Strnad 43c16b14fb NAS-5GS: fix decoding of 5GSM cause
5GSM cause (9.11.4.2) is using TV format
    in PDU session modification request messgae
    based on 24.501/chapter 8.3.7.1

Change-Id: I7e072e2b4c3422ec75e8bcebebb534905028eb2a
Reviewed-on: https://code.wireshark.org/review/37433
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-10 09:06:28 +00:00
Pavel Strnad 4ef8c1880d NAS-5GS: fix decoding of SM PDU DN request container
SM PDU DN request container (9.11.4.15) is using TLV format
in PDU session establishment request messgae
based on 24.501/chapter 8.3.1.1

Change-Id: I9a85b321c051b798a207fdf251a273c1e7a5490e
Reviewed-on: https://code.wireshark.org/review/37386
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-06-06 11:25:15 +00:00
Martin Mathieson e0eefe186a Fix some cppcheck issues:
- Some redundant assignments or tests.
- Some declarations were changed to match definitions in terms of
including _U_ for the same parameters
- Some parenthesis added/changed to made precedence more obvious

epan/color_filters.c:533: style: Variable 'name' is reassigned a value before the old one has been used.
epan/color_filters.c:534: style: Variable 'filter_exp' is reassigned a value before the old one has been used.
asn1/tcap/packet-tcap-template.c:2199: warning: Function 'dissect_tcap_ITU_ComponentPDU' argument order different: declaration '_U_, tvb, offset, _U_, tree, _U_' definition '_U_, tvb, offset, actx, tree, _U_'
epan/dissectors/packet-aim.c:2546: warning: Function 'dissect_aim_tlv_value_icq' argument order different: declaration 'ti, subtype, tvb, _U_' definition 'ti, _U_, tvb, pinfo'
epan/dissectors/packet-arp.c:1133: style: Clarify calculation precedence for '&' and '?'.
epan/dissectors/packet-arp.c:1143: style: Clarify calculation precedence for '&' and '?'.
epan/dissectors/packet-arp.c:1158: style: Clarify calculation precedence for '&' and '?'.
epan/dissectors/packet-arp.c:1168: style: Clarify calculation precedence for '&' and '?'.
epan/dissectors/packet-gtpv2.c:5997: warning: Function 'dissect_gtpv2_mbms_service_area' argument order different: declaration 'tvb, _U_, tree, _U_, _U_, _U_, _U_, _U_' definition 'tvb, _U_, tree, item, _U_, _U_, _U_, _U_'
epan/dissectors/packet-gtpv2.c:6291: warning: Function 'dissect_gtpv2_mbms_time_to_data_xfer' argument order different: declaration 'tvb, _U_, tree, _U_, _U_, _U_, _U_, _U_' definition 'tvb, _U_, tree, item, _U_, _U_, _U_, _U_'
epan/dissectors/packet-gtpv2.c:6369: warning: Function 'dissect_gtpv2_epc_timer' argument order different: declaration 'tvb, _U_, tree, _U_, _U_, _U_, _U_, _U_' definition 'tvb, _U_, tree, item, _U_, message_type, _U_, _U_'
epan/dissectors/packet-knxip.c:2939: style: Condition 'mac_error' is always false  (just added comment)
epan/dissectors/packet-mac-lte.c:4386: style: Clarify calculation precedence for '&' and '?'.
epan/dissectors/packet-nas_5gs.c:1828: style: Variable 'nas5gs_data->payload_container_type' is reassigned a value before the old one has been used. (noted confusing recursion)
epan/dissectors/packet-rpcrdma.c:587: warning: Identical condition 'offset>max_offset', second condition is always false
epan/dissectors/packet-rsl.c:2098: style: Assignment of function parameter has no effect outside the function.

Change-Id: Ib5c9a04cfb6e6233972bc041434601c8ef09c969
Reviewed-on: https://code.wireshark.org/review/37343
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2020-06-01 20:44:27 +00:00
Pascal Quantin 64d99d6662 NAS 5GS: do not stop dissection if the messages are integrity protected only
We should explicitly check that the security header indicates the use of
ciphering.

Change-Id: I0e6f50e180f95e03d6e1dd96db39a03543490be4
Reviewed-on: https://code.wireshark.org/review/37326
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-05-27 16:51:54 +00:00
Pascal Quantin 9d6c7f3ffb NAS 5GS: fix parsing of mapped EPS bearer contexts IE
- the DEB bit no longer exists
- the EPS parameter highlight was off by one

Change-Id: Ic2abf827a2d70babab7854f339964a6535c73c53
Reviewed-on: https://code.wireshark.org/review/37243
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-05-18 11:40:26 +00:00
Pascal Quantin 274ec6adc4 NAS 5GS: fix highlighting of the QOs flow description elements
Change-Id: I3907f0dd4c985d4a4390ad37454967350b7745eb
Reviewed-on: https://code.wireshark.org/review/37099
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-05-04 19:20:35 +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 324f46ce1f NAS-5gs: Display interface identifier for the IPv6 lla as IPv6
Change-Id: Id9f234733818bdd428429a9035b20923e3d814bb
Reviewed-on: https://code.wireshark.org/review/36730
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-04-07 12:39:13 +00:00
Pascal Quantin 7fb4ae4c34 NAS 5GS: add dissection og multiple payloads container
Change-Id: If2fb7916e757cdbba445a7cd3a41208cab208c9f
Reviewed-on: https://code.wireshark.org/review/36696
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-04-04 16:16:50 +00:00
Swapnil Roy ca41f28cb5 NAS 5GS: S-NSSAI dissection fixed
Change-Id: I482220232cdbde1e7c90e21af5f7bf4809aa13d2
Reviewed-on: https://code.wireshark.org/review/36603
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-03-28 17:11:55 +00:00
Martin Mathieson d854143e8f NAS-5GS: shift supi_fmt field before testing
From cppcheck:
epan/dissectors/packet-nas_5gs.c:749: style: Mismatching assignment and comparison, comparison 'supi_fmt==1' is always false.

Change-Id: I702f0cae24fd95dc925a87ab3766f2995f3eb759
Reviewed-on: https://code.wireshark.org/review/36554
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-03-24 10:40:35 +00:00
Pascal Quantin f4cd24a3fc NAS 5GS: improve dissection of SUCI
- a SUCI with null scheme is always a MSIN, name it accordingly
- add breakout of scheme output for profiles A and B

Change-Id: I3453336291cbd515809054057a6e53902590e896
Reviewed-on: https://code.wireshark.org/review/36514
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-20 21:05:29 +00:00
Joakim Karlsson 60378b1071 NAS-5GS: PDU session reactivation result error cause wrong PDU type
Change-Id: I14552a44ef5d7dc4557d7a7ea4624c6f5299f5fa
Reviewed-on: https://code.wireshark.org/review/36488
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-18 15:30:54 +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 b7996de371 NAS-5GS: PDU session reactivation result error cause wrong offset used.
Change-Id: I16001d96f69ab3256ae229f629a1969ca42dadc4
Reviewed-on: https://code.wireshark.org/review/36285
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-05 08:18:27 +00:00
Anders Broman 912be1a298 NAS 5GS: Dissect more IEs
Change-Id: I79016ef7791ee7d535861222168e3e2f244ef6f4
Reviewed-on: https://code.wireshark.org/review/36075
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-02-11 11:29:09 +00:00
Pascal Quantin e0ea5cbc02 XnAP: upgrade dissector to v15.6.0
Change-Id: I98c594e0a0b9e9abfda2177b32aa23c9d96cf348
Reviewed-on: https://code.wireshark.org/review/35822
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-01-15 18:46:50 +00:00
Joakim Karlsson 3169344480 NAS-5GS: add support for n1SmMsg from 3GPP 29.502
Change-Id: Ie643abf1bc30d2350952cd9afe0af070f4ff980f
Reviewed-on: https://code.wireshark.org/review/35817
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-01-15 09:48:00 +00:00
Pascal Quantin c283cf37c5 NAS 5GS: add missing R15 bits in 5GS network feature support IE
Bug: 16310
Change-Id: I52a3e8bbe6ae89c227cd0eee58bb46ba37eceeb6
Reviewed-on: https://code.wireshark.org/review/35676
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-01-07 09:05:44 +00:00
Pavel Strnad 2df91a8742 NAS 5GS: fix LADN Indication ID in Registration Request
Change-Id: I46df64d47144eb943e8feee192d9bacb137b22c5
Reviewed-on: https://code.wireshark.org/review/35410
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-12-11 15:44:13 +00:00
Pascal Quantin 3704373206 NAS 5GS: small cleanup
- fix a few typos
- remove the intra N1, N1 to S1 and S1 to N1 mode NAS transparent
container functions: those are not real IEs and are already decoded

Change-Id: I73b4c3de4078a57e9471871d6ed47a08eb2a1fc0
Reviewed-on: https://code.wireshark.org/review/35286
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-12-02 19:24:51 +00:00
Pascal Quantin ecb90a4e25 NAS 5GS: fix for control plane service request identification
Change-Id: I1f2b6acd1bcaed003d021b110aafb2256bb7e62d
Reviewed-on: https://code.wireshark.org/review/35171
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-11-21 09:37:19 +00:00
Anders Broman e460205305 NAS-5GS: Add 9.11.3.65 Control plane service type
Change-Id: Id27f56808f28879d2f998c4eb0e4fa30f19593b8
Reviewed-on: https://code.wireshark.org/review/35136
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-19 14:28:44 +00:00
Anders Broman 3db2743095 NAS-5GS: Fix dissection of 8.2.19 Configuration update command.
Change-Id: Ieb3e8ba63496c6524b591a03b886316e07d96416
Reviewed-on: https://code.wireshark.org/review/35131
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-19 09:33:17 +00:00
Pascal Quantin e8265fbfe3 NAS 5GS: fix dissection of routing indicator
Change-Id: I75c344394bf796c0d58cf24c758a6a54a585dc75
Reviewed-on: https://code.wireshark.org/review/34877
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-10-28 15:23:22 +00:00
Pascal Quantin 5fb897077e NAS 5GS: fix dissection of ngKSI in Registration Request message
Bug: 16163
Change-Id: I00e5aa1f6e543eaf06d4c4f0e98c94eba80f5f6d
Reviewed-on: https://code.wireshark.org/review/34875
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-10-28 14:36:15 +00:00
Pascal Quantin c77471437f NAS 5GS: fix dissection of PLMN in a few IEs
The MNC is encoded in little endian format, not big endian.
The IEs impacted are 5GS tracking area identity list, service area list
and SOR transparent container.

Bug: 16162
Change-Id: I05acc5fb7d1c4a84f53cc5b2a21ee12c4813593d
Reviewed-on: https://code.wireshark.org/review/34874
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-10-28 13:26:20 +00:00
Anders Broman 5e8b6f3012 NAS 5GS: Rejected NSSAI. use correct offsets.
Change-Id: I30e1bda0d57dc7d5dfd5bf2036e6db6c9c211f3d
Reviewed-on: https://code.wireshark.org/review/34871
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-10-28 09:35:52 +00:00
Anders Broman dd71c18594 nas-5gs:Dissect 9.11.3.46 Rejected NSSAI.
Change-Id: Idc85a790b326e1087d10c3968eac84ff6d0382d4
Reviewed-on: https://code.wireshark.org/review/34857
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-10-25 14:10:02 +00:00