aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/nbap
AgeCommit message (Collapse)AuthorFilesLines
2016-02-26Add free_address_wmem(), fix warnings [-Wcast-qual]João Valverde2-13/+13
Try to improve address API and also fix some constness warnings by not overloading the 'data' pointer to store malloc'ed buffers (use private pointer for that instead). Second try, now passing test suite. Change-Id: Idc101cd866b6d4f13500c9d59da5c7a38847fb7f Reviewed-on: https://code.wireshark.org/review/13946 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-12umts_fp: fix ... defined but not used [-Werror=unused-const-variable] found ↵Alexis La Goutte1-28/+0
by gcc6 Change-Id: I5866ea2d6a08a90799882b0c4626d0ed215069a8 error: ‘fake_lchid_macd_flow’ defined but not used [-Werror=unused-const-variable] error: ‘hsdsch_macdflow_id_mac_content_map’ defined but not used [-Werror=unused-const-variable] error: ‘hsdsch_macdflow_id_rlc_map’ defined but not used [-Werror=unused-const-variable] Reviewed-on: https://code.wireshark.org/review/13871 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-02-11[NBAP] Array hsdsch_macdflow_id_rlc_map should be 8 elements.AndersBroman1-6/+7
Bug: 12112 Change-Id: I3d3fd822b291d459613030dda122963a72c13ee6 Reviewed-on: https://code.wireshark.org/review/13901 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-02-11NBAP: fix ‘lchid_name_resolve’ defined but not used ↵Alexis La Goutte1-0/+2
[-Werror=unused-const-variable] found by gcc6 Change-Id: Iedf13ff9844a43625fa374d8df8da9b0e0fae55a Reviewed-on: https://code.wireshark.org/review/13878 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-11NBAP: fix ‘lchId_rlc_map’ defined but not used ↵Alexis La Goutte2-18/+23
[-Werror=unused-const-variable] found by gcc6 Change-Id: I39ca2510d01a7ba3318dfcf9e380eab637994b08 Reviewed-on: https://code.wireshark.org/review/13880 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-02-08Revert "Add free_address_wmem() and other extensions to address API"João Valverde2-13/+13
This reverts commit 13ec77a9fc3af3b0b502820d0b55796c89997896. This commit introduces a segmentation fault for Lua code (uncovered by the test suite). Change-Id: Ibc273d1915cda9632697b9f138f0ae104d3fb65e Reviewed-on: https://code.wireshark.org/review/13813 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-07Add free_address_wmem() and other extensions to address APIJoão Valverde2-13/+13
Try to improve 'address' API (to be easier/safer) and also avoid some constness warnings by not overloading the 'data' pointer to store malloc'ed buffers (use private pointer for that instead). Change-Id: I7456516b12c67620ceadac447907c12f5905bd49 Reviewed-on: https://code.wireshark.org/review/13463 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-01-24Add the packet number to the packet_info structure, and use it.Guy Harris2-47/+47
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-02Get rid of an unnecessary level of indirection.Guy Harris1-27/+25
Instead of an array of pointers to preference values, have an array of preference values. Clean up some white space while we're at it. Change-Id: Iaa2cf6bcc2a271a5c2645ddbb2dbddba311b413d Reviewed-on: https://code.wireshark.org/review/13002 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-13NBAP : Verify conversation proto data exists before trying to access itAnish Bhatt1-3/+6
Bug 11841 Change-Id: Ic0dea6491a68a042ddc0f2dbee19739e4568b18c Reviewed-on: https://code.wireshark.org/review/12576 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-10Convert ASN.1 dissectors to remove "new" from "new-style" dissector function ↵Michael Mann1-2/+2
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-12-02[NBAP] Fix SIGSEGV in dissect_nbap_MACdPDU_SizeMichael Mann1-5/+6
Bug: 11815 Change-Id: I107cf90df87bdafa23bd4b81acbc25d98773b223 Reviewed-on: https://code.wireshark.org/review/12347 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01[NBAP] Prevent crash.Michael Mann1-2/+3
If no previous conversation exists, a memcpy will try to copy from NULL destination. Bug: 11835 Change-Id: I445480bb425834c5a918f1ffa148cb83d6c9750c Reviewed-on: https://code.wireshark.org/review/12326 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-11-04Don't allow multiple registrations of a protocol in dissector tables.Michael Mann1-5/+5
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-03Remaining ADDRESS macro to address function conversionsJoão Valverde2-10/+10
Change-Id: I8bc9af431e70243b05f4f0ce8c2b8ee451383788 Reviewed-on: https://code.wireshark.org/review/11463 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-10-22Use address functions instead of ADDRESS macros in asn1 and epanGerald Combs2-29/+29
Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case equivalents in the asn1 and epan directories. Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4 Reviewed-on: https://code.wireshark.org/review/11200 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.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-10-18NBAP: fix indent (use 8 spaces)Alexis La Goutte1-6/+6
Change-Id: I79c19f887cc868cb861631fe6926f0ec2b903a8c Reviewed-on: https://code.wireshark.org/review/11111 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-17NBAP: avoid dereferencing a NULL pointerPascal Quantin1-2/+5
Bug: 11602 Change-Id: I56b9db19eca416c288f36c1f3a4faa7e22b38c8f Reviewed-on: https://code.wireshark.org/review/11109 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-10-05Allow use of variadic macrosPeter Wu2-34/+26
Remove variadic macros restriction (c99, c++11 feature) from README.developer. GCC, Clang, MSVC 2005 all support it. Enable -Wno-variadic-macros in configure.ac and CMakeLists.txt when -Wpedantic is enabled (which would enable -Wvariadic-macros). For all files matching 'define\s*\w+[0-9]\(', replace "FOO[0-9]" by "FOO" and adjust the macro definition accordingly. The nbap dissector was regenerated after adjusting its template and .cnf file. The generated code is the same since all files disabled the debug macros. Discussed at: https://www.wireshark.org/lists/wireshark-dev/201209/msg00142.html https://www.wireshark.org/lists/wireshark-dev/201510/msg00012.html Change-Id: I3b2e22487db817cbbaac774a592669a4f44314b2 Reviewed-on: https://code.wireshark.org/review/10781 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-04asn1: split off cleanup routinesPeter Wu1-12/+13
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-04-09Replace deprecated API tvb_length -> tvb_reported_lengthAndersBroman1-2/+2
Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-16SE_COPY_ADDRESS -> WMEM_COPY_ADDRESSMichael Mann2-10/+10
Copy addresses with wmem-scope instead of (forced) seasonal scope. All existing instances were converted to wmem_file_scope, but the flexibility is there for other scopes. Change-Id: I8e58837b9ef574ec7dd87e278470d7063ae8c1c2 Reviewed-on: https://code.wireshark.org/review/6564 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-25 NBAP: fix ddi missed for non first macdflow_id in E-DCH channelIlya Gavrilov1-4/+3
Change-Id: Ib93cac8a4b186114f50ef4a26bdace2d72219644 Reviewed-on: https://code.wireshark.org/review/6022 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> 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>
2014-12-23asn1 generated dissectors: cleanup #include usageBill Meier1-3/+0
Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387 Reviewed-on: https://code.wireshark.org/review/6008 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-13ASN1: Register PDU-dissectors as NEWStig Bjørlykke2-5/+5
Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 Reviewed-on: https://code.wireshark.org/review/4494 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-09-16Fix spelling: cant-->can't, wont-->won't, etcBill Meier1-1/+1
Change-Id: Ia6c3e7a25615bf8e052c3bacf096d76df775c9c2 Reviewed-on: https://code.wireshark.org/review/4126 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-09Fix some spelling & grammar.Bill Meier1-7/+7
Change-Id: Iedeaa411caa0823922dd79c27897a2349d4e6907 Reviewed-on: https://code.wireshark.org/review/4054 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-30Add some files under asn1 to the distribution.Guy Harris1-1/+1
Include CMakeLists.txt files and the gnm subdirectory, along with the top-level Makefile.inc and Makefile.preinc files. Don't explicitly include Custom.make, as automake does that automatically given that it's included by asn1/Makefile.am. Add some files to EXTRA_DIST lists. Move some .asn files to EXTRA_DIST; they don't need to be in SRC_FILES, as SRC_FILES always includes EXTRA_DIST, and they *do* need to be in EXTRA_DIST so that they're in the distribution. Change-Id: Id91df577260fa57028d40fe098be1d79c59398e6 Reviewed-on: https://code.wireshark.org/review/3273 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22Fix leak in nbap init functionEvan Huus1-2/+2
Change-Id: I9a70d4da936ad5fd847fc1ba0b29b7220030b977 Reviewed-on: https://code.wireshark.org/review/2558 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-21batch of tvb-length conversionsEvan Huus1-5/+5
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-2/+2
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>
2014-06-19Revert "Update ASN.1 source files with the API changes done in g021e7af"Pascal Quantin2-7/+7
This reverts commit e308e7c4de81c2ff7159e444b865ac59de4faa2b. Change-Id: I079616d63f643f79f1bc03ef5fdf724f36df4071 Reviewed-on: https://code.wireshark.org/review/2435 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18Update ASN.1 source files with the API changes done in g021e7afPascal Quantin2-7/+7
Change-Id: I52ecfccbce423206242e3cf99401a8c9e1655d88 Reviewed-on: https://code.wireshark.org/review/2385 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-18Remove $Id$ from the ASN.1 dissectors and regenerate them.Jeff Morriss13-28/+0
Change-Id: Ie476c6f82f318188b41ed922b92c6fec119ea954 Reviewed-on: https://code.wireshark.org/review/244 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-05Dissector assert in packet-nbap.c. num_items isn't reset before calling a ↵Anders Broman1-0/+5
sequence filling the array. Closed-bug #9726 Change-Id: Ie4bc538b0788eb32895c9eedf8e0277c6d9ed1b2 Reviewed-on: https://code.wireshark.org/review/120 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Anders Broman <a.broman58@gmail.com>
2013-12-09- Forward declaration of register functions.Anders Broman1-0/+3
svn path=/trunk/; revision=53876
2013-11-23Convert ASN1 dissectors from ep_address_to_str to address_to_str. Clean up a bitEvan Huus1-6/+6
of ansi_tcap code while in the neighbourhood. svn path=/trunk/; revision=53530
2013-11-02Require dissector_try_string to pass a data parameter to its subdissectors. ↵Michael Mann1-3/+3
There weren't that many calls, so might as well modify the function than create a need for dissector_try_string_new. svn path=/trunk/; revision=53049
2013-09-20DCH-ID can be 255Anders Broman2-2/+2
svn path=/trunk/; revision=52154
2013-09-18Remove all non-ASCII characters from all .asn files. I didn't see the harm ↵Chris Maynard3-227/+227
in replacing them all as opposed to only those not copied verbatim from other sources. svn path=/trunk/; revision=52132
2013-09-15emem -> wmem (don't forget about .cnf)Jörg Mayer2-11/+12
svn path=/trunk/; revision=52058
2013-08-07add a range check for dch_idMartin Kaiser1-1/+2
this should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9005 svn path=/trunk/; revision=51195
2013-08-05Make some global variables staticJakub Zawadzki1-1/+1
svn path=/trunk/; revision=51163
2013-07-01Fix Coverity CID 712348 (Unused pointer value).Chris Maynard1-1/+1
svn path=/trunk/; revision=50288
2013-06-19Fix CID 712341: Dereference null return value (NULL_RETURNS)Jörg Mayer1-0/+1
Well, not really. Just catch that case and error out. svn path=/trunk/; revision=50029
2013-06-03cc1: warnings being treated as errorsAnders Broman2-3/+3
../../asn1/nbap/packet-nbap-template.c: In function 'add_hsdsch_bind': ../../asn1/nbap/packet-nbap-template.c:349: warning: unused parameter 'tree' svn path=/trunk/; revision=49708
2013-06-03Convert ASN.1 dissectors to use filterable expert info.Michael Mann2-5/+20
NOTE: Kerberos ASN.1 template was updated, but not generated to source. svn path=/trunk/; revision=49707
2013-05-19Don't access nbap_dch_chnl_info if the index is > maxNrOfDCHsAnders Broman1-2/+4
svn path=/trunk/; revision=49418
2013-05-07Some moreJörg Mayer1-0/+32
svn path=/trunk/; revision=49203
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 18:04:17 +0000