summaryrefslogtreecommitdiff
path: root/asn1
AgeCommit message (Collapse)AuthorFilesLines
2015-08-06Fixup stat_tap table freeing.Gerald Combs2-4/+22
As it turns out we *do* need to free table elements. We also need to free the tables themselves and clear the table array. Do so. Change-Id: Ic1c81388eac8f47f74caea0169c79685a83aaff9 Reviewed-on: https://code.wireshark.org/review/9901 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-06Convert the GSM MAP stats to new "generic stat API".Gerald Combs2-3/+159
Convert both the MAP statistics and summary. As with the GSM A stats this are mostly untested. Change-Id: Ibd3a7346b09d1401e78724c0197ec2a38deb97a3 Reviewed-on: https://code.wireshark.org/review/9883 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-04Convert Camel tap stats to new "generic stat API".Gerald Combs2-14/+106
Migrate the Camel stats similar to the recent BOOTP and H.225 migrations. Change-Id: If82617068ff4b8fa186899f66dc34a08585f66cb Reviewed-on: https://code.wireshark.org/review/9865 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-04Convert H.225 tap stats to new "generic stat API".Gerald Combs2-16/+427
Migrate the H.225 stats similar to the recent BOOTP migration. Change-Id: I70ff7ab6cf3e9796f257412ba7d65ec9fe7f77ad Reviewed-on: https://code.wireshark.org/review/9859 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-31RRC: upgrade dissector to v12.6.0Pascal Quantin7-97/+3517
Change-Id: Ied56f90a8689a25d4093795bfd97d57d40e382c6 Reviewed-on: https://code.wireshark.org/review/9838 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-29GSM_MAP: adding dissector for sendParameters (MAPv1)Luca Melette4-12/+55
The current ASN.1 description of MAP (3GPP 29.002) is missing this operation. I recovered the needed code from an old MAP description (ets_300599e01p) and integrated the missing parts into the asn tree and C template file (via asn2wrs). Change-Id: Ibe05e6a99f3f95ac66740b5d319a7200fdb3e54b Reviewed-on: https://code.wireshark.org/review/9594 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-21LTE RRC: fix a typoPascal Quantin1-1/+1
Let's have consistent naming for dissectors Change-Id: I03d14e208692f39a7ae5017bd539f38f14abaa1f Reviewed-on: https://code.wireshark.org/review/9737 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-17Remove all preferences related to enabling/disabling heuristic dissectors.Michael Mann11-22/+16
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-16LTE RRC: fix dissection of ETWS/CMAS warning messagesPascal Quantin2-3/+235
Change-Id: I20bb219a32b6c7e39ac415c5c13ad5379f78cba2 Reviewed-on: https://code.wireshark.org/review/9658 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-12Add "user presentable" and "unique string ids" to heuristic table entries.Michael Mann11-11/+17
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-10LTE RRC: upgrade dissector to v12.6.0Pascal Quantin6-15/+34
Change-Id: I6e8271f98cba0074b27df73a21337d388efcdc7a Reviewed-on: https://code.wireshark.org/review/9578 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-08GTK+: Add a Telephony/ANSI menu placeholder.Gerald Combs1-2/+2
Add REGISTER_STAT_GROUP_TELEPHONY_ANSI as well, and use it to add recently updated stats. Make sure we properly escape our path separators. Change-Id: I979d5c29a82acddec1a9bcae7e3cb9c5ea3f9d33 Reviewed-on: https://code.wireshark.org/review/9564 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-08RANAP: if bindingid looks like port number, extract and showMartin Mathieson1-0/+12
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-07-04ansi_map: fix float literals missing f suffixEvan Huus1-2/+2
Should fix OSX buildbots Change-Id: I466d4cdc0c4b52a15cadb9b5d429561ca68cc913 Reviewed-on: https://code.wireshark.org/review/9484 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-07-04asn1: split off cleanup routinesPeter Wu17-108/+135
General approach: 1. Split allocation (e.g. g_hash_table_new) from deallocation (g_hash_table_destroy) into functions named "init" and "cleanup". 2. Remove guards that test whether the hash tables are set as init is always called before cleanup. 3. Remove setting hash tables to NULL after destruction. 4. Copy register_init_routine function call and change init to cleanup. 5. Add cleanup function that calls reassembly_table_destroy if there is a reassembly_table_init function. Some templates were modified as follows: - snmp: split renew into init+cleanup, but keep renew for the uat_new callback. - ldap,ros: Rename init to cleanup as there was no initialization. - camel: remove init function from header, make it static. Remove debug print. - tcap: remove unused ssn_range assignment. Files in epan/ were regenerated using cmake && make asn1 Change-Id: Idac16ebf0ec304e0c8becaab5d32904e56eb69b9 Reviewed-on: https://code.wireshark.org/review/9136 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-03Create very basic "generic" stat tap API to create a "GUI" independent table.Michael Mann1-0/+116
A few sample tap/dissectors (ANSI/A, ANSI MAP) are also included to test the API. The "GUI output" is a bit raw and could use some "prettying up", but all the basic hooks are there. Telephony "stat grouping" needs to be better alphabetized to properly populate menu (on GTK, probably Qt) Change-Id: I98514171f69c4ab3a304dccb26c71d629703c9ab Reviewed-on: https://code.wireshark.org/review/9110 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-26Added option in h245 preferences to print h245 messages content Michal Pazdera2-43/+31
into Information column in typical fashion (append) instead of just in reversed order (prepand) Change-Id: Id78c307fc6d34a378ac7b9335ac1e578837b08a6 Reviewed-on: https://code.wireshark.org/review/9170 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-26RRC: remove non ASCII characters from ASN.1 descriptionPascal Quantin5-498/+498
Change-Id: I7edb23651caa5ccf8e9989069803a8800e358670 Reviewed-on: https://code.wireshark.org/review/9172 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-25CredSSP: update template after the API change done in gcdc7d25Pascal Quantin1-1/+1
Change-Id: I548870ba423c7c3b714047f9f02c6cfb9a6a0661 Reviewed-on: https://code.wireshark.org/review/9156 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-25acse: don't THROW() an exception from a dissectorMartin Kaiser1-2/+3
we already have an expert info, we can simply exit Change-Id: I8adbfb084991195152a02bbef64c38c5aa9e841e Reviewed-on: https://code.wireshark.org/review/9113 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23P1: fix 'dissect_p1_T_report_type' defined but not used [-Wunused-function]Alexis La Goutte1-4/+9
Change-Id: Idee443cd35846bb197070cff5fb37e3904afb856 Reviewed-on: https://code.wireshark.org/review/8757 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-23Use RTD functionality for H.225Michael Mann1-32/+129
This got missed in the initial refactoring. Change-Id: I98dcc0816e065efab9b497f753c8d2d388349ff3 Reviewed-on: https://code.wireshark.org/review/9044 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-23RANAP: call nsap properly when bindingID is included in transport addressMartin Mathieson1-3/+4
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-06-22PKCS12: fix unused function 'dissect_AuthenticatedSafe_PDU' [-Wunused-function]Alexis La Goutte2-1/+7
Change-Id: Iaaaaffc8a271ac844b745d1b9265eb06df2efe9c Reviewed-on: https://code.wireshark.org/review/9003 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-22GSM MAP: Fix decoding of IPv6 addressesVasil Velichckov2-3/+8
From 3GPP 23.003 The GSN Address is composed of the following elements: 1) The Address Type, which is a fixed length code (of 2 bits) identifying the type of address that is used in the Address field. 2) The Address Length, which is a fixed length code (of 6 bits) identifying the length of the Address field. 3) The Address, which is a variable length field which contains either an IPv4 address or an IPv6 address. Address Type 0 and Address Length 4 are used when Address is an IPv4 address. Address Type 1 and Address Length 16 are used when Address is an IPv6 address. The IP v4 address structure is defined in RFC 791 [14]. The IP v6 address structure is defined in RFC 2373 [15]. Currently the Wireshark decodes IPv6 addresses as IPv4 This commit reverts parts of commit 1cdef1d98aac306932dc599d427a3e1191d48a44 Change-Id: I4905d4cf559abcb42b9dfe3652667d2ff96dd444 Reviewed-on: https://code.wireshark.org/review/8984 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-21PKCS12: fix warning about unused parameter when don't build with LIBGCRYPTAlexis La Goutte1-1/+1
Change-Id: I7cc47f811d6c090aa2be54d3d92361966d011ccd Reviewed-on: https://code.wireshark.org/review/9002 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-21Further refactor SRT stats.Michael Mann2-0/+97
Create "common" SRT tap data collection intended for all GUIs. Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK. SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic. CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone. Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc Reviewed-on: https://code.wireshark.org/review/8894 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-19[rtse] Convert tabs to spaces to match editor modelinesBill Meier2-56/+56
Change-Id: I03c7decacd4def0552f461c81c4e634a85380438 Reviewed-on: https://code.wireshark.org/review/8986 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-16PKCS12: fix a duplicate OIDEtienne Millon1-1/+1
The value for OID 1.2.840.113549.1.12.1.6 was copy-pasted from the line above. Its correct definition can be found in RFC7292, whose relevant parts are in pkcs12.asn. Note that the capitalization is not consistent in the RFC (pbeWith/pbewith). I used the same convention. Change-Id: I702c2b698660a7ea8df043775d37cadfa6d3ca72 Reviewed-on: https://code.wireshark.org/review/8928 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-06-07H248: fix V712 warning reported by PVS-StudioPascal Quantin1-2/+3
Be advised that compiler may delete this cycle or make it infinity. Use volatile variable(s) or synchronization primitives to avoid this. Change-Id: I39104ec09f4c12994d62ed23e7a0cc00829b1255 Reviewed-on: https://code.wireshark.org/review/8818 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-04P1: fix request for implicit conversion from 'gpointer' to 'struct ↵Alexis La Goutte1-1/+1
p1_address_ctx_t *' not permitted in C++ [-Wc++-compat] Change-Id: I43364dda21abe3281fbd15ad953232093bb1fffa Reviewed-on: https://code.wireshark.org/review/8756 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-05-30Q955.3 MLPP DissectorMikhail Koreshkov4-1/+140
Added ASN.1 dissector for MLPP (Multi-Level Precedence and Preemption) protocol Q955.3 Change-Id: Ic1c855dfbf1fb1295a43cfe3a5ad7087b5b89c12 Reviewed-on: https://code.wireshark.org/review/8689 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-05-30NULL terminate the list of hfs given to proto_tree_add_bitmask*().Jeff Morriss1-1/+2
This fixes a number of recent fuzz failures. Bug: 11195 Change-Id: Ifa6cc380fd3f610469d3c795e234e6986cfaf674 Reviewed-on: https://code.wireshark.org/review/8699 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26Remove proto_tree_add_text from some dissectors.Michael Mann1-1/+4
Change-Id: Id7ef95a56d9d8cc01f9a1a4556ad056b8bb7f8bc Reviewed-on: https://code.wireshark.org/review/8654 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>
2015-05-25Fix out of tree buildsGraham Bloice1-1/+1
Stop out of tree builds picking up the in-tree version and config.h Change-Id: Icadc46cab66db72af2d475eac31b28d0ca10df90 Reviewed-on: https://code.wireshark.org/review/8204 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-05-22p1: Fixed do_address for extension attributesStig Bjørlykke2-4/+25
This is not an optimal solution, but fixes the reported problem. The do_address functionality should probably be rewritten to only use pinfo for storing data. Bug: 11210 Ping-Bug: 8515 Change-Id: I2625cc4044ab93b6e943a3c2d2ffd1b26149da29 Reviewed-on: https://code.wireshark.org/review/8585 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-19p1: Handle OrganizationalUnitNameStig Bjørlykke1-0/+2
Added back code removed in commit for bug 8515. Bug: 11210 Change-Id: I23bf56f88d8a1320da8404a82a8d9d3aacc3dace Reviewed-on: https://code.wireshark.org/review/8537 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-09Define the SHA-1 digest length in wsutil/sha1.h and use it.Guy Harris2-7/+6
Hopefully that'll make it a little easier to make sure that we're not overflowing arrays. Change-Id: I770df045ef9a45fd486c1271ea424b3334bb39d2 Reviewed-on: https://code.wireshark.org/review/8370 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-09RRC: add domain and release cause information to the INFO column.Martin Mathieson1-0/+7
Change-Id: If0bee7f283d6c4dd44618221d528fb55e30f510a Reviewed-on: https://code.wireshark.org/review/8353 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: Anders Broman <a.broman58@gmail.com>
2015-05-05kerberos encryption types (etype) additions + cleanupMark Cunningham1-3/+13
source http://www.iana.org/assignments/kerberos-parameters/kerberos-parameters.xhtml and referenced RFCs Change-Id: I898218c3ef75da21130f3f6c83848c0fca095acf Reviewed-on: https://code.wireshark.org/review/8300 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-05-01C12.22: check c1222_baseoid_len before doing a memcpyPascal Quantin1-4/+10
Should fix the following runtime error reported by Joerg: ../../asn1/c1222/packet-c1222-template.c:1427:3: runtime error: null pointer passed as argument 1, which is declared to never be null ../../asn1/c1222/packet-c1222-template.c:1427:3: runtime error: null pointer passed as argument 2, which is declared to never be null Change-Id: I2f952815ed81e47b504e6479835a357b7656828e Reviewed-on: https://code.wireshark.org/review/8251 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: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-01Fix some cases where we're shifting a signed 1 left.Guy Harris4-33/+33
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-27Add tshark -z "ldap,srt"Michael Mann2-0/+15
Bug: 9363 Change-Id: Ic64716ef0156607ca40773cef8e76fc4a0825b3c Reviewed-on: https://code.wireshark.org/review/8196 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-27S1AP: Add missing protocol IE declaration for E-UTRAN-Trace-IDMartin Mathieson1-0/+1
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-27[RANAP] Heuristics does not work with lenght detremant of 2 bytes.AndersBroman1-3/+5
Change-Id: Ib26b9d66e690770a27d63f75f4c9a935fc93b2b0 Reviewed-on: https://code.wireshark.org/review/8209 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-23LPP: fix a typo in the protocol abbreviationPascal Quantin3-4/+4
Bug: 11141 Change-Id: I2bd00a84dd59bbcfc67bf6b8286cb49fd9ff01f9 Reviewed-on: https://code.wireshark.org/review/8175 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-22Convert proto_tree_add_boolean to ↵Michael Mann2-111/+44
proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-20sv: remove #if0'd codeEvan Huus1-93/+1
we can always get it back from git if we want Change-Id: I61911628541cf4ed4be20e736e41fbaa58978d75 Reviewed-on: https://code.wireshark.org/review/8124 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-10Remove depricated API tvb_length -> tvb_reported_lengthAndersBroman15-26/+26
Change-Id: I78b1d2accf4fd0b37eaa16cb8bf515422565e98a Reviewed-on: https://code.wireshark.org/review/8011 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09Replace deprecated API tvb_length -> tvb_reported_lengthAndersBroman9-38/+38
Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>