Commit Graph

281 Commits

Author SHA1 Message Date
AndersBroman 9a187cca74 [GTPv2] Basic dissection of IE Integer Number and value_string updates.
Change-Id: I4b5fa57121b56daf55ac2ae3a966679c5ab874fb
Reviewed-on: https://code.wireshark.org/review/18602
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-01 15:42:53 +00:00
Hessam Jalali 346bda4238 e212: added 3 new filters (CGI, ECGI, TAI)
Added these new filters to enhance mcc/mnc filtering in GTP protocol.

Change-Id: I595b5fde4fa358886fbe5c58f6ecab496d9ef08c
Reviewed-on: https://code.wireshark.org/review/18444
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-25 17:22:46 +00:00
Pascal Quantin 6b03eea714 GTPv2: add dissection of a few Information Elements
This commit adds the following IEs:
- CSG ID
- CSG Membership Indication (CMI)
- Service Indicator
- Detach Type
- Local Distinguished Name (LDN)

Change-Id: I1e3db7ffd217e3644acf6de0ad5002e65c73a9ea
Reviewed-on: https://code.wireshark.org/review/18396
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-22 22:17:41 +00:00
Jan Spevak 5cbdbecc35 GTPv2: Add support for NB-IoT features
Bug: 13026
Change-Id: I75de63bd58a35e234eef308fa592922e01ea3c18
Reviewed-on: https://code.wireshark.org/review/18300
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-19 07:42:37 +00:00
Pascal Quantin 152e245804 proto_tree_add_item_ret_(u)int/proto_tree_add_bitmask_with_flags_ret_uint64: return real value
Apply mask and bit shift on the returned value.

Change-Id: I00aebc854756f01a25199a259d6d5252abea4349
Reviewed-on: https://code.wireshark.org/review/17958
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-28 06:07:01 +00:00
AndersBroman 920df263e3 [GTPv2] Export dissect_gtpv2_tai()
Change-Id: I3ec15b0411d8e9639cc31b36aa25ce74054395da
Reviewed-on: https://code.wireshark.org/review/17819
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-20 13:40:17 +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 a216e6b945 GTPv2: Proper decoding of transparent containers for SRVCC PS to CS Request and Response
Change-Id: Icc84f8e431b440ac0b0364b9f068905d7a7cbf6b
Reviewed-on: https://code.wireshark.org/review/17052
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-15 14:40:01 +00:00
Pascal Quantin 65b9d561cd GTPv2: fix test for flags in TWAN Identifier IE (CID 1364616)
Change-Id: I7b87624bd60f514f2f5e9aafe19bcebf7799bcd1
Reviewed-on: https://code.wireshark.org/review/16772
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-07-29 19:08:13 +00:00
AndersBroman b814ae2057 [GTPv2] Dissect TWAN Identifier and other minor updates.
Bug:12638
Change-Id: I13446727a46b4df4fe3e667723aa43d83efe1159
Reviewed-on: https://code.wireshark.org/review/16585
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:34:53 +00:00
AndersBroman a21102069a [GTPv2] Extend MM Context dissection.
Change-Id: I24e9f8307ea199d5da0713f26aa075466c59bb1f
Reviewed-on: https://code.wireshark.org/review/16528
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-18 16:47:55 +00:00
Michael Mann 631b9c43e2 GTPv2: Use proto_tree_add_bitmask
Change-Id: I236a3513237a7a977389438adaf381542281943d
Reviewed-on: https://code.wireshark.org/review/15997
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-18 03:29:54 +00:00
Binh Trinh 2aa55a387a GTPV2: add decoding of ECI into enodebid and cellid
Change-Id: If46cc354e202ff9a126580bf742d747e42678f83
Reviewed-on: https://code.wireshark.org/review/15994
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-17 13:01:09 +00:00
Uli Heilmeier 3992f5a8de GTPv2: Fix length of Presence Reporting Area Identifier field
Specs (http://www.etsi.org/deliver/etsi_ts/129200_129299/129274/13.04.00_60/ts_129274v130400p.pdf
, page 281 ) lists 3 Bytes for field Presence Reporting Area Identifier.

Bug: 12284
Change-Id: I404c5133fa0975b5c9a245b8e4b952c7eb4d2818
Reviewed-on: https://code.wireshark.org/review/14608
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-03-24 12:34:00 +00:00
Lucas Simopoulos 37bb735c6f Add support in order to dissect the GTPv2 IE "Presence Reporting Area Information"
Change-Id: Ibe25fd95a5020b1663c096b5e35a04587821d71e
Reviewed-on: https://code.wireshark.org/review/14604
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-03-24 08:40:55 +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
glores 283d2c8c2d GTPv2 conversation time response
Change-Id: Ice7a08a47b091e4e47cd13b04b7dd7ed74a0f950
Reviewed-on: https://code.wireshark.org/review/14328
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-03-10 12:37:30 +00:00
glores b70d1d7e14 GTPv2 bearer resource command message conversation fix
Change-Id: Ida7d5aa9a5dd4c7fdc66806730762c70d3d951bb
Reviewed-on: https://code.wireshark.org/review/14327
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-03-03 17:22:29 +00:00
Guy Harris dc92e98db4 Define in one and only one C file, declare in a header file.
Presumably the intent is to have the two dissectors share the tables in
question; if so, it's best done by defining the tables in one and only
one C file and declaring it in a header file included by both C files -
that 1) ensures the declaration and definition stay in sync and 2) keeps
the OS X build from failing.

Change-Id: Id2e7e5b7270c7109ffb091b2e16a631b83dde212
Reviewed-on: https://code.wireshark.org/review/14309
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-03 01:38:10 +00:00
glores 2146c4632e GTP session ID generated tree item for tracking GTPv2 sessions
Change-Id: I6d487c901838dcdb3550674e0a514a59d221806f
Reviewed-on: https://code.wireshark.org/review/14093
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-03-02 19:46:36 +00:00
glores b77ffb9d36 GTPv2 command messages conversation
Change-Id: I2faa01b3c461269e5c8ed88ef44157fbc33758b9
Reviewed-on: https://code.wireshark.org/review/13980
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-02-18 00:05:20 +00:00
Branislav Makan 5225100609 Added dissector for Paging and Service Information (186) IE.
Change-Id: I175b48373f881238f938dd62c0d7f32c7c973387
Reviewed-on: https://code.wireshark.org/review/13550
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-01-27 13:25:21 +00:00
Guy Harris bc5a0374bf Add the packet number to the packet_info structure, and use it.
That removes most of the uses of the frame number field in the
frame_data structure.

Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22
Reviewed-on: https://code.wireshark.org/review/13509
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24 03:41:28 +00:00
Guy Harris 9141bd9700 Add more fields to packet_info structure and use them.
Add fields for the absolute time stamp (and another field for a presence
flag for the absolute time stamp) and the packet encapsulation for the
packet.

This lets us remove the field for the packet encapsulation in the
frame_data structure; do so.

Change-Id: Ifb910a9a192414e2a53086f3f7b97f39ed36aa39
Reviewed-on: https://code.wireshark.org/review/13499
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-23 03:50:58 +00:00
moshekaplan cd7026951b Fix a lot of typos and misspellings
Change-Id: I8512cfa1d424f82a873a0e0e1d22c7b075fdd7f3
Reviewed-on: https://code.wireshark.org/review/13069
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
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>
2016-01-08 20:04:56 +00:00
AndersBroman 396c92a89c [GTPv2] Add dissection of Source to Target Transparent Container
in SRVCC PS to CS Request

Change-Id: I663d31f5e35d8264241f73fc4e33bce18fa31333
Reviewed-on: https://code.wireshark.org/review/12646
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>
2015-12-15 11:51:21 +00:00
Gloria Pozuelo 4dd3a8aacd GTPv2 conversation adaptation
Change-Id: I55356532619d4dbeb225fc8a1684c22630bd00bd
Reviewed-on: https://code.wireshark.org/review/12501
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>
2015-12-14 10:06:31 +00:00
Michael Mann 31a54708f4 new_register_dissector -> register_dissector for dissector directory.
Change-Id: Ie39ef054a4a942687bd079f3a4d8c2cc55d5f22c
Reviewed-on: https://code.wireshark.org/review/12485
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 12:38:06 +00:00
Michael Mann 443a7ed259 new_create_dissector_handle -> create_dissector_handle for dissector directory.
Some of the ASN.1 dissectors still generate a new_create_dissector_handle from the tool itself, so leave those for now.

Change-Id: Ic6e5803b1444d7ac24070949f5fd557909a5641f
Reviewed-on: https://code.wireshark.org/review/12484
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 12:37:36 +00:00
Michael Mann 8faf5c80b3 register_dissector -> new_register_dissector
Picking off "easy" dissectors that only have one or two exit points at most.

Change-Id: I25fe6a0aac93980333217d007702799d16946563
Reviewed-on: https://code.wireshark.org/review/11816
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-14 18:00:00 +00:00
Michael Mann 74541a9596 Don't allow multiple registrations of a protocol in dissector tables.
The target here is the Decode As dialog where protocols have multiple registrations into a dissector table and that shows up as multiple entries in the Decode As dialog list with the same name so users are unsure which "dissector" they are choosing.

The "default" behavior (done in this commit) is to not allow duplicates for a dissector table, whether its part of Decode As or not.  It's just ENFORCED for Decode As.

Bug: 3949
Change-Id: Ibe14fa61aaeca0881f9cc39b78799e314b5e8127
Reviewed-on: https://code.wireshark.org/review/11405
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04 12:39:40 +00:00
Alexis La Goutte 657c55e862 GTPv2: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I6b2ddc2f84e954194260b956b6f46f0747d8a66a
Reviewed-on: https://code.wireshark.org/review/11504
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>
2015-11-03 14:35:21 +00:00
AndersBroman 1316fdf209 [GTPv2] Dissect UTRAN F-Container content.
Change-Id: Idaf07e31876b453f88c5fd7e886c72dffcb35a96
Reviewed-on: https://code.wireshark.org/review/11492
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>
2015-11-02 13:03:16 +00:00
Guy Harris d6dd50b1e3 The item argument is used.
Change-Id: I066c8364bcd12d78b41c336b42f235bdfe112515
Reviewed-on: https://code.wireshark.org/review/11441
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-30 17:20:37 +00:00
Gerald Combs 0cff6d6309 GTPv2: Mark a parameter unused.
Change-Id: I0dde941a1d1c9b776363d61cc3e849189b2ea0e7
Reviewed-on: https://code.wireshark.org/review/11439
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-30 17:08:15 +00:00
AndersBroman f0eae93df5 [GTPv2] Dissect Load Control Information IE
Bug: 11655
Change-Id: I9d50d53ce6b98d7a3e06e90450607f6d5b6be1bc
Reviewed-on: https://code.wireshark.org/review/11430
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-30 15:55:07 +00:00
Pascal Quantin 03d853400c GTPv2: display Sequence Number as BASE_HEX_DEC
As requested on https://ask.wireshark.org/questions/46393/gtpv2-teid-and-sqn-decoded-in-decimal-instead-of-hexa-in-ws-1127

Change-Id: Id0963394959eff979129470c70258323653e3fdf
Reviewed-on: https://code.wireshark.org/review/10886
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-08 19:04:19 +00:00
AndersBroman 61f07f1932 [GTPv2] Dissect F-Cause for FORWARD_RELOCATION_RESP in case of S1AP.
Change-Id: I245daad739c7f181d4f57cbc50416096199f682a
Reviewed-on: https://code.wireshark.org/review/10462
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>
2015-09-10 13:03:55 +00:00
Alexis La Goutte b703f479bc GTPv2: fix indent (use 4 spaces)
Change-Id: I7836360ae4fe67098776911a496ecc969d3e093d
Reviewed-on: https://code.wireshark.org/review/9921
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-08-08 14:09:38 +00:00
AndersBroman f657e6a090 [GTPv2] Mark a parameter as unused.
Change-Id: I37c983d756f23469e4cf1abd31b9c591f5612542
Reviewed-on: https://code.wireshark.org/review/9909
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-07 12:51:35 +00:00
AndersBroman 99873f7745 [GTPv2] Dissect IE MM Context for CS to PS SRVCC, update value strings.
Bug: 11423
Change-Id: I5a845e40fcbd4e06dec60c64edca9e8fea1459e1
Reviewed-on: https://code.wireshark.org/review/9907
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-07 12:12:16 +00:00
Pascal Quantin 09ae055f23 GTPv2: always set direction before dissecting PCO IE
Otherwise some protocol/container ID payload are skipped as their decoding depends on the direction that is unknown
Bug: 11378

Change-Id: Ic14aa67fe4f262a9f3056e8f70f58afd78c59043
Reviewed-on: https://code.wireshark.org/review/9710
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>
2015-07-20 13:19:37 +00:00
Alexis La Goutte 7948378260 GTPv2: fix indent (use 4 spaces)
Change-Id: I9f20a5797ec0f8f3ae67b1be67d342b256da03ae
Reviewed-on: https://code.wireshark.org/review/8836
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-08 11:14:49 +00:00
Anders fa64878f8f [GTPv2] Throttling Delay unit values are not the same as the timer values,
make a separate Value_string.

Change-Id: I79cb3b9d7261f8fba97f1938464d38c218282cb5
Reviewed-on: https://code.wireshark.org/review/8834
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-08 08:13:38 +00:00
Pascal Quantin dce4cc675d GTPv2: fix unused parameter 'pinfo' warning
Change-Id: I41e9d429685752c10562e5255036c2b84390373c
Reviewed-on: https://code.wireshark.org/review/8354
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-08 16:48:09 +00:00
AndersBroman 92853e8ec4 [GTPv2] Add dissection of Throttling IE.
Change-Id: I9c71a9d6e276213eb43e4265578e57f87f1619fd
Reviewed-on: https://code.wireshark.org/review/8352
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-08 13:43:28 +00:00
Alexis La Goutte 67da8aeda1 GTPv2 : fix unused parameter 'tree' [-Werror=unused-parameter]
Change-Id: I01097889dd4a1c29135f50dcfb737ff50b0de2b7
Reviewed-on: https://code.wireshark.org/review/8310
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-06 13:09:38 +00:00
AndersBroman 7fcd7b0b8a [GTPv2] Add dissetion of IE Overload Control Information and Metric.
Change-Id: I8bd423ea41929bfd20cecf9d80a686f1b286082f
Reviewed-on: https://code.wireshark.org/review/8309
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-06 11:35:19 +00:00
AndersBroman 360d49d9a4 [GTPv2] Mark a parameter as unused.
Change-Id: Ia007c4956d3ec422dca7f320a83ef7f84173d47b
Reviewed-on: https://code.wireshark.org/review/8219
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-28 09:02:08 +00:00