aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ranap.c
AgeCommit message (Collapse)AuthorFilesLines
2018-12-27Try to squeeze some bytes out of the frame_data structure.Guy Harris1-2/+2
Make the time stamp precision a 4-bit bitfield, so, when combined with the other bitfields, we have 32 bits. That means we put the flags at the same structure level as the time stamp precision, so they can be combined; that gets rid of an extra "flags." for references to the flags. Put the two pointers next to each other, and after a multiple of 8 bytes worth of other fields, so that there's no padding before or between them. It's still not down to 64 bytes, which is the next lower power of 2, so there's more work to do. Change-Id: I6f3e9d9f6f48137bbee8f100c152d2c42adb8fbe Reviewed-on: https://code.wireshark.org/review/31213 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-08-03RANAP: decrease the min length to 7 bytesVasil Velichkov1-1/+1
The min length was increased to 8 in d9c70acaf4 but there are valid 7 bytes long RANAP messages that are not recognized by the heuristic function. Revert the value to 7 as in 482a3cd1f1c Change-Id: I5096cd905c24c87dccbc2aa4bbdccc7b0febead7 Reviewed-on: https://code.wireshark.org/review/28945 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-09RANAP: Simplify private data creationDarien Spencer1-9/+6
Change-Id: Id6dd45789b7418143dc1046dc465a0e60ee87c91 Reviewed-on: https://code.wireshark.org/review/28171 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-23RANAP: optimize a bit the heuristic checksSam Cisneros1-7/+11
And explain the new conditions Change-Id: I7061ef783bebc260370c16622b8811e7b109c520 Reviewed-on: https://code.wireshark.org/review/27727 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-02-18ASN.1: update auto generated dissectorsPascal Quantin1-7/+7
Change-Id: Ic73e72b3d2e7590eaed07f6eb30f74f4303e7a65 Reviewed-on: https://code.wireshark.org/review/25880 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-02-12dissectors: use SPDX identifiers.Dario Lombardo1-13/+1
Change-Id: I92c94448e6641716d03158a5f332c8b53709423a Reviewed-on: https://code.wireshark.org/review/25756 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-26RANAP: Associate RTP dissector with CS streamsDarien Spencer1-100/+208
Change-Id: If02b8cc5110c70e50ae04d245c45b1d133ee7fd3 Reviewed-on: https://code.wireshark.org/review/24010 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-11Ranap: improve heuristic algorithmIvan Nardi1-4/+18
Strength the heuristic cheking PDU-Type and Criticality field values too Change-Id: Id95603634a93033664bdbd169880e6b411cfbc11 Bug: 13791 Reviewed-on: https://code.wireshark.org/review/22076 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>
2017-06-10Resync some ASN.1 dissectors.Michael Mann1-1/+1
NBAP and RANAP regenerated don't match current branch Change-Id: I033997f4db15255b1439626cf973d218c1ad8416 Reviewed-on: https://code.wireshark.org/review/22065 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: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-07RANAP: prevent heuristic dissector from adding info to tree or triggering ↵Pascal Quantin1-9/+18
exception Bug: 13770 Change-Id: I6ba5dfb5098ea1a4d4d1e2d740382326c7d58f8c Reviewed-on: https://code.wireshark.org/review/22006 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Ivan Nardi <nardi.ivan@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-06[Ranap] Heuristic: update to the current highest ProcedureCode idIvan Nardi1-1/+1
Change-Id: Ib17b5db42717d92dfd139d56b947166fddc29c5b Reviewed-on: https://code.wireshark.org/review/21986 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-05-23[RANAP] Pretify info column.AndersBroman1-0/+340
Change-Id: I7f1832cd818d76843e00b689883e28ed46633585 Reviewed-on: https://code.wireshark.org/review/21739 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-22[RANAP] Update to 3GPP TS 25.413 V14.0.0 (2017-03)AndersBroman1-284/+512
Change-Id: I5d448a4daf438b05a30473e999574803e5d6ade9 Reviewed-on: https://code.wireshark.org/review/21730 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-21[RANAP] Update to 3GPP TS 25.413 V13.2.0 (2016-06)AndersBroman1-93/+1541
Change-Id: I1f6cc99761e13cd09811a4cebca145c47d5b4eca Reviewed-on: https://code.wireshark.org/review/20657 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>
2017-03-21[RANAP] Dissect RIMInformation.AndersBroman1-8/+19
Change-Id: I39281c36e55b09427b3022362964c934be433ef1 Reviewed-on: https://code.wireshark.org/review/20655 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-12PER: add support for bit strings >= 16KPascal Quantin1-1/+1
Bug: 13123 Change-Id: Ie20ef75393ea601d2702a024e0ade94b85adf9f2 Reviewed-on: https://code.wireshark.org/review/18748 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-10S1AP: prettify dissectionPascal Quantin1-23/+121
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-08-31Don't do any Decode As stuff for dissector tables not used with Decode As.Guy Harris1-10/+10
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-22RANAP: Add an heuristic to decode the HO-to-UTRAN Command embedded in the ↵Binh Trinh1-15/+24
RRC Container within the TargetRNC-to-SourceRNC Transparent Container Change-Id: Iea7c8d24f52cf8bd11e13a53853e11ec1ecdcd36 Reviewed-on: https://code.wireshark.org/review/17058 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-08-21RANAP: fix indent (use 2 spaces) and modelinesAlexis La Goutte1-184/+193
Change-Id: I84e3157a9303572dcd3d9ff5df6802c42553e62f Reviewed-on: https://code.wireshark.org/review/17197 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-14RANAP: fix TargetRNC-ToSourceRNC-TransparentContainer decodeBinh Trinh1-4/+14
Change-Id: Iadf712b6bad75faeade00ebd1f6bb2cb2013065b Reviewed-on: https://code.wireshark.org/review/17044 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-01ASN.1 dissectors - don't try to find yourself.Michael Mann1-7/+8
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-03-20Manually add protocol dependencies derived from find_dissector.Michael Mann1-2/+2
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-10/+10
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-38/+38
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-25Move the proto data stuff out of frame_data.[ch].Guy Harris1-7/+8
It's not tied to the frame_data structure any more, so it belongs by itself. Clean up some #includes while we're at it; in particular, frame_data.h doesn't use anything related to tvbuffs, so don't have it gratuitiously include tvbuff.h. Change-Id: Ic32922d4a3840bac47007c5d4c546b8842245e0c Reviewed-on: https://code.wireshark.org/review/13518 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14ranap: Sync with asn1 sourceStig Bjørlykke1-2/+2
Change-Id: I3b16427f43603bc665385b5c59d6e278797a2b96 Reviewed-on: https://code.wireshark.org/review/13285 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-08Fix a lot of typos and misspellingsmoshekaplan1-1/+1
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>
2015-12-10Convert ASN.1 dissectors to remove "new" from "new-style" dissector function ↵Michael Mann1-327/+327
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-04Don't allow multiple registrations of a protocol in dissector tables.Michael Mann1-10/+10
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-35/+43
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-07-17Remove all preferences related to enabling/disabling heuristic dissectors.Michael Mann1-6/+3
The preferences are still supported for backwards compatibility, but the heuristic_protos file has final say on the "preference" to enable/disable a heuristic dissector. Also add parameter to heur_dissector_add() for the "default" enable/disable of a heuristic dissector. With this parameter, a few more (presumably weak) heuristic dissectors have been "registered" but of course default to being disabled. Change-Id: I51bebb2146ef3fbb8418d4f5c7f2cb2b58003a22 Reviewed-on: https://code.wireshark.org/review/9610 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-12Add "user presentable" and "unique string ids" to heuristic table entries.Michael Mann1-2/+2
This allows better presentation of heuristic dissectors to the end user. Change-Id: I2ff3985ab914e83c2989880cc0c7b9904045b3f6 Reviewed-on: https://code.wireshark.org/review/9602 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-08RANAP: if bindingid looks like port number, extract and showMartin Mathieson1-1/+14
Change-Id: Ibfb98bf72ebbd620f21a13e5a4435144a8ef9f6a Reviewed-on: https://code.wireshark.org/review/9560 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-06-23RANAP: call nsap properly when bindingID is included in transport addressMartin Mathieson1-7/+8
Change-Id: I45fed890cc2f7f5d106bbb7b35038d8db141fa4e Reviewed-on: https://code.wireshark.org/review/9036 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-05-01Fix some cases where we're shifting a signed 1 left.Guy Harris1-3/+3
Shift 1U instead, to make sure it's unsigned; the result of, for example, the result of shifting a signed value left is undefined if the value times 2^{shift count} doesn't fit in the *signed* type of the shifted value. That means, in particular, that the result of shifting 1 left by {number of bits in an int - 1} is undefined. (In *practice*, it'll probably be -2^32, with the bit you want set, but that's not guaranteed, and GCC 5.1 seems not to like it.) Make some other left-hand operands of <<, and some variables holding results from shifts of that sort, unsigned, while we're at it. Change-Id: Ie72a9d0d518f59b35948267d10c80735d162e8bb Reviewed-on: https://code.wireshark.org/review/8264 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-27[RANAP] Heuristics does not work with lenght detremant of 2 bytes.AndersBroman1-6/+8
Change-Id: Ib26b9d66e690770a27d63f75f4c9a935fc93b2b0 Reviewed-on: https://code.wireshark.org/review/8209 Reviewed-by: Anders Broman <a.broman58@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-11/+9
Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387 Reviewed-on: https://code.wireshark.org/review/6008 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-26Remove sccp_info member from packet_info structure.Michael Mann1-26/+34
sccp_msg_info_t* is now passed from SCCP dissector to its subdissectors through dissector data parameter. Change-Id: Iab4aae58f8995e844f72e02e9f2de36e83589fc0 Reviewed-on: https://code.wireshark.org/review/5442 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-09-09Fix some spelling & grammar.Bill Meier1-1/+1
Change-Id: Iedeaa411caa0823922dd79c27897a2349d4e6907 Reviewed-on: https://code.wireshark.org/review/4054 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-19Remove unused hf and deprecated APIAndersBroman1-13/+8
Change-Id: I5196f2be4b15704517ff1dc8bfacc6f9b52ecd71 Reviewed-on: https://code.wireshark.org/review/3720 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19Use the E212 function to dissect IMSI correct the filter Id string inAndersBroman1-6/+6
E212. Change-Id: I203502b39d4ef216282d305f90c930aca84241bf Reviewed-on: https://code.wireshark.org/review/3718 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-21batch of tvb-length conversionsEvan Huus1-19/+16
Change-Id: I76ca4d075756e3ac691070e0c05344a410ea2498 Reviewed-on: https://code.wireshark.org/review/2507 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19Revert "Fixup: tvb_* -> tvb_captured"Michael Mann1-16/+16
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96. Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f Reviewed-on: https://code.wireshark.org/review/2430 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-18Fixup: tvb_* -> tvb_capturedDario Lombardo1-16/+16
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-27Regenerate the dissector with the latest template.AndersBroman1-2/+2
Change-Id: Iefdd7122537108c37e71650ad2674418109d2f1b Reviewed-on: https://code.wireshark.org/review/845 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-26Fix off by one errorAndersBroman1-4/+4
Change-Id: I24c9e988786a95489f918bed2c043e6eb23e4caa Reviewed-on: https://code.wireshark.org/review/834 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-25Strengthen RANAP heuristic.AndersBroman1-4/+13
Change-Id: I8f6515d2716bb633f753243b7f86d371a22ebbad Reviewed-on: https://code.wireshark.org/review/826 Reviewed-by: Anders Broman <a.broman58@gmail.com>