Commit Graph

32 Commits

Author SHA1 Message Date
Pascal Quantin eb5b2a211d S1AP: upgrade dissector to v14.4.0
Change-Id: I1124a691ec004507e6e144038b13f9d432d88c5f
Reviewed-on: https://code.wireshark.org/review/23857
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-07 21:36:54 +00:00
Pascal Quantin 82acd85bcc S1AP: avoid appending s1ap multiple times to frame.protocols field
Change-Id: Ide44391bf18d2f301f32cd6a65b246e9a1cc5891
Reviewed-on: https://code.wireshark.org/review/23845
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-05 21:23:04 +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
Pascal Quantin d4c8b27d13 S1AP: upgrade dissector to v13.6.0
Change-Id: Ic75bd30ae77053241bebeb47e9b3e10529a8d0f7
Reviewed-on: https://code.wireshark.org/review/22451
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-29 00:42:21 +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
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
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
AndersBroman 259a174988 [S1AP] Fix copy-paste error.
Change-Id: Id75d95c8d9cfdc5982bccefb9d4ece77cee871e3
Reviewed-on: https://code.wireshark.org/review/17010
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-11 14:02:37 +00:00
AndersBroman 1d7688c6c5 [S1AP] Update S1AP to Release 13.3.0
Change-Id: I0992f429de7812ea82809e0b63f534b44e7b6aee
Reviewed-on: https://code.wireshark.org/review/17006
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-11 13:12:21 +00:00
Alexis La Goutte 761d555e4f s1ap: fix indent (use 2 spaces) and modelines info
Change-Id: I450f252d22b21438e55285b2af950f6a1c9f6d10
Reviewed-on: https://code.wireshark.org/review/16693
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-07-26 11:30:33 +00:00
AndersBroman 10bcfa58f8 [S1AP] Add dissection of the content of UERadioCapabilityForPaging.
Change-Id: I7f6686a9324fdd364653404ed4b3315d6ca36716
Reviewed-on: https://code.wireshark.org/review/16650
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-07-25 11:35:18 +00:00
Michael Mann a062c80236 ASN.1 dissectors - don't try to find yourself.
If an ASN.1 dissector is calling register_dissector for itself in its proto_register_xxx
function and then calling find_dissector for itself in its proto_reg_handoff_xxx
function then just create a static handle for that dissector and use the return
value of register_dissector, so the find isn't necessary.

Change-Id: I911bdadc2fb4259601c141b955e741a2369cc447
Reviewed-on: https://code.wireshark.org/review/16233
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-01 14:26:20 +00:00
João Valverde a16d401b25 Remove Makefile.common files
Now that nmake build system has been removed they are not needed anymore.

Change-Id: I88075f955bb4349185859c1af4be22e53de5850f
Reviewed-on: https://code.wireshark.org/review/16050
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-06-30 11:04:17 +00:00
Pascal Quantin 6baa1b544c Remove Nmake build system
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61
Reviewed-on: https://code.wireshark.org/review/15777
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-15 19:21:57 +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
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
João Valverde 64c70ea62c Clean asn1 make/cmake whitespace
Add missing newline or remove extra newlines at the end of the file.

Trim trailing whitespace.

Change-Id: I73b7a4e20969bc13f72bf97e981fd5de89d8bb17
Reviewed-on: https://code.wireshark.org/review/14400
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-13 21:58:09 +00:00
João Valverde 54a520d4a1 Move /asn1 to /epan/dissectors
Change-Id: I1208fe3c2ba428995526f561e8f792b8d871e9a9
Reviewed-on: https://code.wireshark.org/review/14388
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-13 21:30:24 +00:00