aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-s1ap.c
AgeCommit message (Collapse)AuthorFilesLines
2017-07-13S1AP: upgrade dissector to v14.3.0Pascal Quantin1-187/+822
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-06-29S1AP: upgrade dissector to v13.6.0Pascal Quantin1-2/+3
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-22sbc-ap: Dissect several IEsVasil Velichkov1-7/+7
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-04-27S1AP: fix dissection of MS Classmark 2 and MS Classmark 3 IEsPavel Strnad1-2/+2
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-03-17S1AP: fix dissection of Reroute NAS Request messagePascal Quantin1-118/+123
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-01-11S1AP: upgrade dissector to v13.5.0Pascal Quantin1-87/+90
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>
2016-12-31Dissectors don't need a journey of self discovery.Michael Mann1-96/+96
They already know who they are when they register themselves. Saving the handle then to avoid finding it later. Not sure if this will increase unnecessary register_dissector functions (instead of using create_dissector_handle in proto_reg_handoff function) when other dissectors copy/paste, but it should make startup time a few microseconds better. Change-Id: I3839be791b32b84887ac51a6a65fb5733e9f1f43 Reviewed-on: https://code.wireshark.org/review/19481 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-12-19Added decoding of RAN/NAS cause IE/AVPJan Spevak1-155/+155
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-18S1AP: use unit stringsPascal Quantin1-133/+107
Change-Id: I53a639b210592b36fc3f5aaf45db3932a469b49f Reviewed-on: https://code.wireshark.org/review/19321 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-12-16[S1AP] Handle the case where the TransparentContainer is empty.AndersBroman1-2/+2
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-10-02S1AP: upgrade dissector to v13.4.0Pascal Quantin1-88/+176
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-09-15S1AP: add dissection of NB-IoT transparent containersPascal Quantin1-214/+446
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-13S1AP: remove Procedure Code from info columnPascal Quantin1-244/+241
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-12S1AP: add missing messages in info columnPascal Quantin1-84/+150
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-10S1AP: prettify dissectionPascal Quantin1-175/+783
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-04S1AP: fix dissection of TransportLayerAddress IE when it contains both IPv4 ↵Pascal Quantin1-82/+87
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-03S1AP: add more LTE-RRC transparent containers dissectionPascal Quantin1-113/+207
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-08-31Don't do any Decode As stuff for dissector tables not used with Decode As.Guy Harris1-7/+7
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-17S1AP: Initialise handovertype for procedure HOReqAckBinh Trinh1-66/+67
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-11[S1AP] Fix copy-paste error.AndersBroman1-60/+85
Change-Id: Id75d95c8d9cfdc5982bccefb9d4ece77cee871e3 Reviewed-on: https://code.wireshark.org/review/17010 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-11[S1AP] Update S1AP to Release 13.3.0AndersBroman1-77/+1232
Change-Id: I0992f429de7812ea82809e0b63f534b44e7b6aee Reviewed-on: https://code.wireshark.org/review/17006 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-26s1ap: fix indent (use 2 spaces) and modelines infoAlexis La Goutte1-270/+278
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-25[S1AP] Add dissection of the content of UERadioCapabilityForPaging.AndersBroman1-64/+79
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-01ASN.1 dissectors - don't try to find yourself.Michael Mann1-4/+4
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-06-15Allow control of individual columns to be (un)writable.Michael Mann1-2/+2
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-03-20Manually add protocol dependencies derived from find_dissector.Michael Mann1-4/+4
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-17Associate dissector tables and heuristic subdissector lists with a protocol.Michael Mann1-7/+7
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-13Move /asn1 to /epan/dissectorsJoão Valverde1-102/+102
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-01-06[S1AP] Update to version V13.1.0 (2015-12)AndersBroman1-166/+1801
Change-Id: I48080dd6839d3cb02b6ea3717d69b56dbf3e59d8 Reviewed-on: https://code.wireshark.org/review/13077 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-10Convert ASN.1 dissectors to remove "new" from "new-style" dissector function ↵Michael Mann1-245/+245
names that were generated from asn2wrs.py This includes: 1. new_create_dissector_handle -> create_dissector_handle 2. new_register_dissector -> register_dissector 3. new_register_ber_oid_dissector -> register_ber_oid_dissector 4. new_register_ber_syntax_dissector -> register_ber_syntax_dissector Also remove PDU_NEW, SYNTAX_NEW and REGISTER_NEW as there is no need for the distinction anymore. Change-Id: I82c7de7c8ffeeab3259d1b55bb4afc5f6a1e0329 Reviewed-on: https://code.wireshark.org/review/12491 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09"new" dissector API -> dissector API for ASN.1 dissectors.Michael Mann1-1/+1
Change-Id: I7b794cba2feda2cae40411e2b1cb9fb091d08220 Reviewed-on: https://code.wireshark.org/review/12480 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-22register_dissector -> new_register_dissector for ASN.1 dissectors.Michael Mann1-6/+7
Change-Id: I0476519c02ffdd426b4fdfe8a206d61b728c327a Reviewed-on: https://code.wireshark.org/review/12026 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-04Don't allow multiple registrations of a protocol in dissector tables.Michael Mann1-7/+7
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-02[GTPv2] Dissect UTRAN F-Container content.AndersBroman1-74/+87
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-04-27S1AP: Add missing protocol IE declaration for E-UTRAN-Trace-IDMartin Mathieson1-45/+59
Change-Id: I03caf29a5a1889884837fccf366cb35d0ccd6281 Reviewed-on: https://code.wireshark.org/review/8213 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-03[S1AP] Display the decimal value for TAC.AndersBroman1-64/+76
Change-Id: I12127b5f7e53e2d47a42ad54d4e952f6a184d7b6 Reviewed-on: https://code.wireshark.org/review/7883 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-18asn2wrs: autodetect if 64 bits variant is required for constrained integersPascal Quantin1-67/+66
It does not work with defines, but is already a great step forward Change-Id: I346d4124690ec46a2299d4eae8031bbb19a3db8e Reviewed-on: https://code.wireshark.org/review/6617 Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-14[E212]Modify dissect_e212_mcc_mnc() to take E212 number type as anAndersBroman1-1/+1
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>
2014-12-23asn1 generated dissectors: cleanup #include usageBill Meier1-8/+7
Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387 Reviewed-on: https://code.wireshark.org/review/6008 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-14[S1AP) Wrong tree usedAndersBroman1-1/+1
s1ap.cnf:547:14: error: variable 'subtree' set but not used Change-Id: I84a345709b1ef9688f3f1a4e876a75dd575c1c2e Reviewed-on: https://code.wireshark.org/review/5299 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-14[S1AP] Let the A21 dissector do further dissection of Cdma2000SectorIDAndersBroman1-53/+77
Change-Id: I8c503acf6860b34d24769cdf981dcaeea4667ffb Reviewed-on: https://code.wireshark.org/review/5298 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-29Replace isalpha() with g_ascii_isprint().AndersBroman1-9/+8
Change-Id: I416fd36f65ee80a0b17939bc081ddae0f3f72a32 Reviewed-on: https://code.wireshark.org/review/4984 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-22S1AP: Add an S1AP context to be able to determine which message andAndersBroman1-11/+25
message type an IE was sent in. Needed to dissect proprietarry data. Change-Id: Ie75a2f6a544cb33e22c42457b0edd83e6456bfe5 Reviewed-on: https://code.wireshark.org/review/4910 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-21Add OID callback for private IEs making it possible to call a dissectorAndersBroman1-80/+98
for the private OID. Change-Id: Ibb86d8523f1aee14ba1a843ec3ad4becc7729013 Reviewed-on: https://code.wireshark.org/review/4893 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-18Check for printable ASCII in an ENBName.Guy Harris1-13/+12
I'm not sure why the check is only for alphabetical characters; if that's correct, change this to use g_ascii_isalpha, and change is_printable_ascii to is_ascii_alpha or something such as that. Don't use ctype.h routines, as they are locale-dependent. Change-Id: I61d0672350d35ad918e95d7e96ed5dd263102da9 Reviewed-on: https://code.wireshark.org/review/4805 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-17Dissect CDMA2000 PDU if GCSNA dissector exists.AndersBroman1-51/+71
Change-Id: I866fb9bbc3e94df63231959d6745f3d45ca84020 Reviewed-on: https://code.wireshark.org/review/4772 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-25Freeze Info column while dissecting RRC transparent containerMartin Mathieson1-49/+53
Change-Id: I30900fd6a73ca38736b3f28eb416820f74003768 Reviewed-on: https://code.wireshark.org/review/4285 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-09-10Update to revission V12.2.0 (2014-06)AndersBroman1-67/+595
Remove soft deprecated APIs Change-Id: I30adcb9f381c77142385c22fcc4a208169b0cf5e Reviewed-on: https://code.wireshark.org/review/4062 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-06-21batch of tvb-length conversionsEvan Huus1-7/+7
Change-Id: I76ca4d075756e3ac691070e0c05344a410ea2498 Reviewed-on: https://code.wireshark.org/review/2507 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-20Rename dissector_add_handle() to dissector_add_for_decode_as().Guy Harris1-1/+1
Hopefully that name makes it clear what the routiner's purpose is, and will encourage people to use it rather than using dissector_add_uint() with a bogus integer value. Change-Id: Ic5be456d0ad40b176aab01712ab7b13aed5de2a8 Reviewed-on: https://code.wireshark.org/review/2483 Reviewed-by: Guy Harris <guy@alum.mit.edu>