Commit Graph

244 Commits

Author SHA1 Message Date
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
Cathy Yang Y aaa6d2af65 [GTPv2] Add dissection of IE User CSG Information (UCI)
Change-Id: Ie06122ceb59db66c5ecd05b2fa4a9b9acc16f5dd
Reviewed-on: https://code.wireshark.org/review/8217
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-28 08:45:11 +00:00
AndersBroman 1e3840e40c [GTPv2] Dissect ULI Timestamp.
Change-Id: If257831315423e5654cbbc3f6af99703cfad7f90
Reviewed-on: https://code.wireshark.org/review/7614
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-10 09:57:13 +00:00
AndersBroman 20e2c05d9b [E212]Modify dissect_e212_mcc_mnc() to take E212 number type as an
argument. While at it remove deprecated APIs

Change-Id: Ib1a7e9d7aeba6379fb4492816a0ac602e67493c6
Reviewed-on: https://code.wireshark.org/review/6534
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-14 13:37:14 +00:00
AndersBroman 2619eddee8 [E212] Make it possible to use different filters for MCC and MNC in LAI
RAI and SAI.

Change-Id: I2abcc868899b8752f66347b3a0fe190670c3ce3f
Reviewed-on: https://code.wireshark.org/review/6447
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-12 08:42:55 +00:00
Michael Mann 64a7bac641 tvb_bytes_to_ep_str -> tvb_bytes_to_str
Change-Id: I79c613cbdd8dc939dd4c29ebc477fb6eefd5bfc4
Reviewed-on: https://code.wireshark.org/review/6371
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-01-07 18:16:23 +00:00
Alexis La Goutte b0b51ddad0 GTPv2: fix Logically dead code (CID 1250813)
Change-Id: I1761af90bd85b14e6021a5d7b07686a37593a152
Reviewed-on: https://code.wireshark.org/review/6279
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-04 13:59:13 +00:00
Alexis La Goutte 83ac5b752a GTPv2: fix Logically dead code (CID 1255924)
Change-Id: Ia21d8f68b5d898b4493da8cf948ad421f94234fc
Reviewed-on: https://code.wireshark.org/review/6278
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-04 12:06:38 +00:00
Alexis La Goutte 02f41b1e71 GTPv2: fix Copy-paste error (CID 1158587)
Change-Id: I56eaa2071b4b8042c214cf882d35ebec646d2cb5
Reviewed-on: https://code.wireshark.org/review/6169
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-31 17:13:41 +00:00
Alexis La Goutte 784b39cbb4 GTPv2: fix typo in Anders e-mail Address
Change-Id: I2410aa7bce574c9153b971b2d8b0cbfbe24e54dc
Reviewed-on: https://code.wireshark.org/review/6170
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-31 15:17:23 +00:00
Michael Mann 1d598bbff7 Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.
Change-Id: I1d258923a7a63539ec8456d3e306bca5016a1e4b
Reviewed-on: https://code.wireshark.org/review/6060
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-28 14:09:27 +00:00
Martin Mathieson 48db2548a9 Deleting unneccessary #includes from dissectors.
Second batch (packet-eth.c -> packet-icmpv6.d).

Will look at cleaning up and committing script afterwards.

Change-Id: I14295758b81a59115d8c88899f166cc3d5d17594
Reviewed-on: https://code.wireshark.org/review/6013
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23 12:22:54 +00:00
Bill Meier b5d7b7ab6e Cleanup use of #includes in non-generated epan/dissector/*.c
Specifically:
- Set packet.h to be the first wireshark #include after
   config.h and "system" #includes.
   packet.h added as an #include in some cases when missing.
- Remove some #includes included (directly/indirectly) in
   packet.h. E.g., glib.h.
   (Done only for those files including packet.h).
- As needed, move "system" #includes to be after config.h and
   before wireshark #includes.
- Rework various #include file specifications for consistency.
- Misc.

Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95
Reviewed-on: https://code.wireshark.org/review/5923
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-21 05:46:22 +00:00
Bill Meier f412c9a01a Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields ...
(for some dissectors which fetch all other integral fields using
   ENC_BIG_ENDIAN).

Change-Id: Ic18e3172aad76af12b12d6732c88497be22aed56
Reviewed-on: https://code.wireshark.org/review/5748
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13 18:45:56 +00:00
AndersBroman 43069c28c8 GTPv2: Update Indication with Octet 8 and 9 dissection.
Change-Id: Ifa18f31a98932236b102db0f4f28169a7eb72978
Reviewed-on: https://code.wireshark.org/review/5169
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-07 14:14:55 +00:00
Michael Mann d821440b51 Eliminate proto_tree_add_text from packet-gtpv2.c
Change-Id: I127447941e4c926d9194373a405c82145b1392bb
Reviewed-on: https://code.wireshark.org/review/5025
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-31 13:43:49 +00:00
AndersBroman b64183285b GTPv2 in Complete Request Message call the NAS dissector with a tvb only
containing the IE not the rest of the tvb.

Change-Id: I3eead5047b4f8de47e280ac447c66b110592bccd
Reviewed-on: https://code.wireshark.org/review/4744
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-16 20:32:49 +00:00
AndersBroman 1a652bd78d GTPv2: Fully dissect Presence Reporting Area Action.
Change-Id: If38f639049bd897587ed61cc2d94f974131ccd20
Reviewed-on: https://code.wireshark.org/review/4700
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-15 11:14:49 +00:00
AndersBroman 2359e67f9c GTPv2 Dissect more bits in IE Indication.
Change-Id: I19d0b67e06ec22bfc5bafc58fdeb445e30e25f95
Reviewed-on: https://code.wireshark.org/review/4682
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-14 13:59:33 +00:00
AndersBroman bdbc8e3a79 GTPv2: Presence-Reporting-Area-Elements-List do full dissection of ECGI
and TAI.

Change-Id: I95d9ebf1d6f4eabe30b557fdc937d56006f8b123
Reviewed-on: https://code.wireshark.org/review/4593
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-10 13:45:27 +00:00
Pascal Quantin 40e6d764c5 GTPv2: fix an infinite loop
Bug: 10548
Change-Id: I916e15cecf0ec9dc607362b902709567d69243df
Reviewed-on: https://code.wireshark.org/review/4578
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-09 20:34:16 +00:00
AndersBroman 4d930724ff Dissect 3GPP AVP Presence-Reporting-Area-Elements-List.
Change-Id: Ic7b99d41a275fb6f50758ea87763844f24be537c
Reviewed-on: https://code.wireshark.org/review/4495
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>
2014-10-06 17:04:39 +00:00
AndersBroman 47de5a1fa0 Expand dissection of 8.108 Presence Reporting Area Action.
Change-Id: I2ad57d8cdb6758f01146b37ac924e2d8f2141546
Reviewed-on: https://code.wireshark.org/review/4491
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>
2014-10-06 13:43:53 +00:00
Bill Meier 07698d536b Adjust some whitespace to match editor modelines.
Change-Id: Ia22cac3ebd7a454c156f98d967e6fd61f708a2b3
Reviewed-on: https://code.wireshark.org/review/4489
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06 02:55:49 +00:00
AndersBroman aef88f4959 Dissect more of the Presence Reporting Area Action IE.
Change-Id: I4bf0c7890fff4162e1cf5faad8dd0ca008e0dbe6
Reviewed-on: https://code.wireshark.org/review/4368
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-29 15:08:34 +00:00
AndersBroman a7591fbb04 Added basic decoding of new IEs
Change-Id: I7982fe6ccee806b574f780cc2e96d7139a6a74c5
Reviewed-on: https://code.wireshark.org/review/4305
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-26 13:02:20 +00:00
AndersBroman 4319ab30ac Add basic dissection for new IEs
Change-Id: Ie9fc9ac4672a80c82c3b09188752c928b1e7d6c1
Reviewed-on: https://code.wireshark.org/review/4302
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>
2014-09-26 13:02:01 +00:00
AndersBroman a5a87210c6 Add comments about new IEs
Change-Id: Ibc035872ff6406830a06bcfd365047a6d8c2478f
Reviewed-on: https://code.wireshark.org/review/4283
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-25 15:06:08 +00:00
Pascal Quantin c4c82577d3 GTPv2: further fixes for Trace Information IE dissection
Bug: 10470
Change-Id: I8b61e5601379a568da39cce2335122e91ab37ec4
Reviewed-on: https://code.wireshark.org/review/4142
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>
2014-09-17 12:32:59 +00:00
Pascal Quantin 4cf9e71730 GTPv2: fix dissection of Triggering Events IE
Bug: 10470
Change-Id: Ieb9819e578f078e956861a4e2d7ab3d8b96416d6
Reviewed-on: https://code.wireshark.org/review/4130
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-17 02:19:18 +00:00
Michael Mann 3df42e79a5 proto_tree_add_text cleanup
Create filters (expert and hf_) that have the "most bang for the buck" (ie have many instances for a single filter)

Change-Id: I61995e41c5b298df77e084e65cdf30ebe95da1e6
Reviewed-on: https://code.wireshark.org/review/4086
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>
2014-09-12 05:51:11 +00:00
AndersBroman 64cabe9ed2 Use dissect_e164_msisdn() for MSISDN.
Change-Id: I297241cafee8ec504b46044cacba457c5f261d6e
Reviewed-on: https://code.wireshark.org/review/4034
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-08 12:45:26 +00:00
Jeff Morriss a3d8f31ad0 Add a function to dissect an E.164 (MSISDN) number in UTF8 format and use it
in the Diameter dissector.

This new API adds a filter for the MSISDN as well as a subtree and filter for
the Country Code.

Change-Id: Ibcbf4b5f72178b7e4af63efa7496188d608a9de7
Reviewed-on: https://code.wireshark.org/review/3760
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-21 13:01:22 +00:00
AndersBroman 88e802516b Use e212 function to dissect IMSI.
Remove deprecated APIs

Change-Id: I1d5a1437000c5bc4ffd7708bc5b3ab42f7019acf
Reviewed-on: https://code.wireshark.org/review/3721
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 15:01:41 +00:00
Bill Meier 72c2a33437 Do various minor dissector changes:
- remove unneeded initializers;
- replace tabs in files with editor mode line 'expandtabs';
- col_set_str() --> col_add_str() (in one case);
- tvb_length() -- > tvb_reported_length() (in one case);
- do some whitespace & indentation fixes/changes.

Change-Id: Ib8ffbbcdb6e4a74c0df6021a75430ae1ef9ae089
Reviewed-on: https://code.wireshark.org/review/3435
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-05 19:07:28 +00:00
Michael Mann fe4b7ee625 convert to proto_tree_add_subtree[_format]
Change-Id: If110de1e0555637264f86f1508858d569871a9c7
Reviewed-on: https://code.wireshark.org/review/2675
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29 13:10:02 +00:00
Michael Mann 14824e6adf Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html

This reverts commit 246fe2ca4c.

Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 18:25:59 +00:00
Dario Lombardo 246fe2ca4c Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:14:58 +00:00