Commit Graph

56 Commits

Author SHA1 Message Date
Pascal Quantin 74c0b2134b S1AP: fix decoding of inter eNB transparent container from NGAP 2020-11-24 14:05:21 +01:00
Anders Broman e209253636 Create a cross protocol filter 3gpp.tmsi
It can be useful to track a "call" trough multiple protocols to make
that easier create a cross protocol filter, more may come.
2020-10-14 07:56:26 +00:00
Pascal Quantin 09c9b87c8c XnAP: upgrade dissector to v16.2.0 2020-09-03 12:22:26 +02:00
Pascal Quantin 986ead744d NGAP: upgrade dissector to v16.2.0 2020-08-26 18:37:12 +02:00
Pascal Quantin abd6f143c7 S1AP: upgrade dissector to v16.2.0
Change-Id: Ifa71f952f5aca11f99ae751d1c1404a2af95e3a5
Reviewed-on: https://code.wireshark.org/review/38204
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Reviewed-by: Tomáš Kukosa <keksa@email.cz>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-08-20 12:14:30 +00:00
Pascal Quantin 18d29c7023 S1AP: add dissection of inter RAT to EUTRA transparent containers
Change-Id: Ibcffda34dea8e8e4f247667222cca24b80cd32b1
Reviewed-on: https://code.wireshark.org/review/37637
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-07-01 10:56:17 +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 a3cf955113 X2AP: upgrade dissector to v15.9.0
Change-Id: I3a3c73eac9a576f4c494986b19332330523a9883
Reviewed-on: https://code.wireshark.org/review/36698
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-04-04 17:30:10 +00:00
Peter Wu 0145bd0ce5 asn1: fix -Wmisleading-indentation warnings with Clang 10
A lot of auto-generated ASN.1 dissectors have broken identation and
Clang 10 started warning about them for the first time. Fix these by
using 2 spaces as indentation instead of 2, none, or tabs.

Change-Id: Ia91668596c2f5000954d2265c39cc5dba18e44a7
Reviewed-on: https://code.wireshark.org/review/36368
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-11 04:18:46 +00:00
Pascal Quantin 56bb121cb9 S1AP: upgrade dissector to v15.7.0
Change-Id: Ie56d3796bf8cc17d995f66159ef8f85d2485e34a
Reviewed-on: https://code.wireshark.org/review/34699
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-10-03 15:38:16 +00:00
Anders Broman 459b9ad293 BSS MAP: Dissect Source Cell ID IE.
Bug: 16086
Change-Id: I9904a75dd4c8e14f848f7977d5cb17aa0cc5fd4e
Reviewed-on: https://code.wireshark.org/review/34655
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-09-30 13:02:24 +00:00
Pascal Quantin d2229b368e S1AP: use SRVCC HO Indication IE to decode Source to Target Transparent Cont IE
Bug: 16073
Change-Id: I78caf82103e1a3e2027cd5f5c6f862fde4f2c898
Reviewed-on: https://code.wireshark.org/review/34603
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-09-24 14:04:25 +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
Pascal Quantin 62abddc26e S1AP: upgrade dissector to v15.6.0
Change-Id: I87b7aba8abb69254f30429cdc1c84efac317b652
Reviewed-on: https://code.wireshark.org/review/33909
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-07-12 10:22:04 +00:00
Joakim Karlsson 84a3cc1064 s1ap: fix compile error on older GCC
error: variable ‘handle’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]

Change-Id: Id53d02927cbb738acedc80b0f6556afb3322c787
Reviewed-on: https://code.wireshark.org/review/33846
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-04 22:07:43 +00:00
Anders Broman 41d0cf7320 S1AP: Catch out-of-bounds error when dissecting UERadioCapability.
Change-Id: I14fbf46583a5e17bcd3e7b05d1faee43983f47a5
Reviewed-on: https://code.wireshark.org/review/33763
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-28 12:50:07 +00:00
Pascal Quantin a8317adbca S1AP: add ErrorIndication message type to info column
Change-Id: I82206169d7a77f9798fc672a87de9789d56fda3d
Reviewed-on: https://code.wireshark.org/review/33088
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-05 21:36:00 +00:00
Pascal Quantin fe50824bb4 X2AP: upgrade dissector to v15.5.0
Change-Id: I43f96e8ea5acb3cd94b8b3b4e08e0d10a5e8d951
Reviewed-on: https://code.wireshark.org/review/32800
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-04-09 11:31:21 +00:00
Pascal Quantin a9861fb4cf S1AP: upgrade dissector to v15.5.0
Change-Id: Ibef1a516dfd0cb5b66abdc8df0663174687ca39a
Reviewed-on: https://code.wireshark.org/review/32796
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-04-09 06:56:02 +00:00
Binh Trinh 54ca64a1c4 S1AP: add hidden items for mme/enb-ue-s1ap-id
Bug: 8165
Change-Id: I73bca63d6c5b32a1b185cd7a65cbf914f5b7823f
Reviewed-on: https://code.wireshark.org/review/32694
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-04-05 05:38:14 +00:00
Pascal Quantin d6b187e42f XnAP: upgrade dissector to v15.2.0
Change-Id: Ie26f8918aff20ade21eda611950795a320a417f2
Reviewed-on: https://code.wireshark.org/review/31483
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2019-01-11 12:02:40 +00:00
Pascal Quantin e0d6041bcf S1AP: upgrade dissector to v15.4.0
Change-Id: Iecf02ce3858cd2cea12bc73e402ace0c558d8abc
Reviewed-on: https://code.wireshark.org/review/31444
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2019-01-08 15:25:28 +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 8d3243edc3 S1AP: prettify TrafficLoadReductionIndication IE decoding
Change-Id: I87a861db1ebb931193918821a6c4656c61a91e47
Reviewed-on: https://code.wireshark.org/review/30033
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-10-05 18:29:36 +00:00
Pascal Quantin 4e519c12a4 S1AP: remove a duplicate line in .cnf file
Change-Id: I0b4ccc2f270d7c0132ca4960a2426c66f1cf67d1
Reviewed-on: https://code.wireshark.org/review/29855
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-09-26 13:23:51 +00:00
Pascal Quantin 74957d4f07 S1AP: upgrade dissector to v15.3.0
Change-Id: I949665dd7b26775f3f9a3e704f7e8b815a419165
Reviewed-on: https://code.wireshark.org/review/29824
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-25 13:25:28 +00:00
Pascal Quantin 2c6248f011 NGAP: upgrade dissector to v15.0.0
Change-Id: I859265260fde2e986a3b95ff117512cff90bed90
Reviewed-on: https://code.wireshark.org/review/28556
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-07-01 18:10:39 +00:00
Pascal Quantin 6cbf24b58e S1AP: display 5GS TAC as DEC_HEX
Change-Id: Ib5950cbd587809424c1e3fc3ae8cd2dc7e504348
Reviewed-on: https://code.wireshark.org/review/28512
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-28 18:58:28 +00:00
Pascal Quantin 3909f8a8b9 S1AP: upgrade dissector to v15.2.0
Change-Id: I53feb77f91ac72f4e5f18c56453f2974b8b426be
Reviewed-on: https://code.wireshark.org/review/28376
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-22 08:29:03 +00:00
Pascal Quantin 4cc78e6fe4 S1AP: upgrade dissector to v15.1.0
Change-Id: Ib3728a35f3635b58da2a10736799fd825c34e58b
Reviewed-on: https://code.wireshark.org/review/26782
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-06 21:49:02 +00:00
Pavel Strnad 18cd454da9 S1AP: fix filtering on cell-ID
Filter does not work due to same shared short name for cell-id being used for two different asn.1 defintions
  cell-ID OCTET STRING,
  cell-ID CellIdentity,

Change-Id: I5921bc82d46f38d43f9083e41d3a0558821042eb
Reviewed-on: https://code.wireshark.org/review/26545
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pavel Strnad <pavel_strnad@hotmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-19 14:37:04 +00:00
AndersBroman 5c25e1b2c1 S1AP: EmergencyAreaIDListForRestart is not an extension IE.
Change-Id: I3dd623e1a2ec3005ee2c810492e4d0fad39ce1d0
Reviewed-on: https://code.wireshark.org/review/26364
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.quantin@gmail.com>
2018-03-08 14:44:02 +00:00
Pascal Quantin c2daa6bc73 LTE RRC: register dissectors for UERadioAccessCapabilityInformation(-NB) and UERadioPagingInformation(-NB)
Change-Id: Idb3c3fe2cab4ce7aff2bfe108a6bd4fb07fe44b3
Reviewed-on: https://code.wireshark.org/review/25426
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 12:15:35 +00:00
Pascal Quantin ecced16299 S1AP: upgrade dissector to v15.0.0
Change-Id: I2c2a0f8093678769427ff4303ad41a5c97bdd05c
Reviewed-on: https://code.wireshark.org/review/25379
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-19 04:06:32 +00:00
Pascal Quantin 3c3c845f33 S1AP: upgrade dissector to v14.3.0
Change-Id: Ib28228db70a23d6f73f3c1740abc2e6542818ff9
Reviewed-on: https://code.wireshark.org/review/22609
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-07-13 13:37:28 +00:00
Vasil Velichkov 2954a69d7d sbc-ap: Dissect several IEs
Add dissection of the following IEs:
- Serial-Number
- Warning-Type
- Data-Coding-Scheme
- Warning-Message-Contents
- Message-Identifier

Reuse the code from S1AP wherever possible

Change-Id: Icaf78b21532cf91fc2cd225d687a6a11813a20d8
Reviewed-on: https://code.wireshark.org/review/22352
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-06-22 16:25:53 +00:00
Pavel Strnad 8d72865eb9 S1AP: fix dissection of MS Classmark 2 and MS Classmark 3 IEs
Bug: 13666
Change-Id: If65ba54db3541575fb71d1cd88a2fd3c47ef95c3
Reviewed-on: https://code.wireshark.org/review/21364
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-04-27 13:33:34 +00:00
Pascal Quantin 693a61e2d5 S1AP: fix dissection of Reroute NAS Request message
The S1 Message information element contains a full S1AP PDU, not
only the Initial UE Message payload

Change-Id: Ibf416ea45efbd65b341ba3ce1cc5b02b0747f46b
Reviewed-on: https://code.wireshark.org/review/20595
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-03-17 19:11:13 +00:00
Pascal Quantin 9414f56152 S1AP: upgrade dissector to v13.5.0
Change-Id: Ic65ae88af37f0e82207c093827755f93934d9424
Reviewed-on: https://code.wireshark.org/review/19612
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-11 19:43:47 +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
Pascal Quantin b4ea3c50f5 S1AP: use unit strings
Change-Id: I53a639b210592b36fc3f5aaf45db3932a469b49f
Reviewed-on: https://code.wireshark.org/review/19321
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-12-18 08:16:05 +00:00
AndersBroman 8a0e86301b [S1AP] Handle the case where the TransparentContainer is empty.
Change-Id: I6b2333c32119149b32beacc660b48970e0ddbae6
Reviewed-on: https://code.wireshark.org/review/19303
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-16 15:38:02 +00:00
Pascal Quantin 483c4a61d5 S1AP: upgrade dissector to v13.4.0
Change-Id: I140c40a93dce2ffdf7c144701bc3886d5366f951
Reviewed-on: https://code.wireshark.org/review/18012
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>
2016-10-02 06:35:31 +00:00
Pascal Quantin c5a477e72a S1AP: add dissection of NB-IoT transparent containers
To do so, memorize whether a given eNB UE S1AP ID belongs to a NB-IoT
TAI or not.
Also add a preference allowing to force dissection as legacy LTE or
NB-IoT if automatic mode fails.
While we are at it, let's remove the global variables and introduce
a S1AP private data info stored in pinfo.

Change-Id: I7e30b3d59d909684e5cfe13510293ed38ad52574
Reviewed-on: https://code.wireshark.org/review/17709
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-09-15 12:31:02 +00:00
Pascal Quantin c644651bac S1AP: remove Procedure Code from info column
Change-Id: I53ece74627adc038ee6ff2af2959f2dae76ab879
Reviewed-on: https://code.wireshark.org/review/17691
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-13 22:09:04 +00:00
Pascal Quantin 4fe91cf9f5 S1AP: add missing messages in info column
While we are at it, let's reorder them in the .cnf file to match their
definition in S1AP-PDU-Contents.asn and ease review

Change-Id: I4c433fa862d83053d8b01cc951e756379356fa57
Reviewed-on: https://code.wireshark.org/review/17649
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>
2016-09-12 04:08:11 +00:00
Pascal Quantin d6f91a7ca4 S1AP: prettify dissection
Change-Id: I2b4339e489d11ade2751cad8874ba220d12fe3db
Reviewed-on: https://code.wireshark.org/review/17615
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-09-10 07:47:48 +00:00
Pascal Quantin 87519e4c06 S1AP: fix dissection of TransportLayerAddress IE when it contains both IPv4 and IPv6
Change-Id: I8c257d79b4e842da6853ea3c53ae479f33a8047a
Reviewed-on: https://code.wireshark.org/review/17491
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-09-04 21:25:20 +00:00
Pascal Quantin 4a3b320c98 S1AP: add more LTE-RRC transparent containers dissection
Change-Id: I08246d3fa97ceafefd3a1ab5c36de50a5728fd19
Reviewed-on: https://code.wireshark.org/review/17474
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-09-03 19:06:37 +00:00
Binh Trinh c92ff165a2 S1AP: Initialise handovertype for procedure HOReqAck
Change-Id: I4d90bebc94d7e3ead1f2263668c6a3344d02bc0f
Reviewed-on: https://code.wireshark.org/review/17098
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-17 07:01:59 +00:00