aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/rtse
AgeCommit message (Collapse)AuthorFilesLines
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-1/+1
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-04Don't include "file.h" if you don't need it.Guy Harris1-0/+2
It ends up dragging in libwireshark headers, which programs not linking with libwireshark shouldn't do. In particular, including <epan/address.h> causes some functions that refer to libwireshark functions to be defined if the compiler doesn't handle "static inline" the way GCC does, and you end up requiring libwireshark even though you shouldn't require it. Move plurality() to wsutil/str_util.h, so that non-libwireshark code can get it without include epan/packet.h. Fix includes as necessary. Change-Id: Ie4819719da4c2b349f61445112aa419e99b977d3 Reviewed-on: https://code.wireshark.org/review/11545 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-04asn1: split off cleanup routinesPeter Wu1-0/+6
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-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-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-04-10Remove depricated API tvb_length -> tvb_reported_lengthAndersBroman1-3/+3
Change-Id: I78b1d2accf4fd0b37eaa16cb8bf515422565e98a Reviewed-on: https://code.wireshark.org/review/8011 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-13Replace tabs by spaces when editor modelines has "expandtab"Bill Meier1-1/+1
Change-Id: If7a6f2697be732ae4f94ed8b845fd293c32510f7 Also: tabs-stops should be 8 Reviewed-on: https://code.wireshark.org/review/7100 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-02-04Support for P3 over RTSE.gal1-168/+186
Resolve mixed space/tab issue in the RTSE and BER dissectors and included modelines in both templates. Change-Id: I4b75bad94ed111d0faee205e026b2322b7dafbd1 Reviewed-on: https://code.wireshark.org/review/6932 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31rtse.cnf: fix Nesting level does not match indendation (CID 1159214)Alexis La Goutte1-1/+2
Change-Id: I86e6c9103990bedf93c323e1360394a7c0a39db4 Reviewed-on: https://code.wireshark.org/review/6173 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23asn1 generated dissectors: cleanup #include usageBill Meier1-1/+0
Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387 Reviewed-on: https://code.wireshark.org/review/6008 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-13RTSE: Return dissected length from call_rtse_oid_callbackStig Bjørlykke1-9/+8
Change-Id: I6766135ddcdfe25d9bcc060bb2a47376abb36794 Reviewed-on: https://code.wireshark.org/review/4642 Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.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-22convert to proto_tree_add_subtree[_format] for ASN.1 dissectorsMichael Mann1-6/+7
Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef Reviewed-on: https://code.wireshark.org/review/2509 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-21batch of tvb-length conversionsEvan Huus1-6/+6
Change-Id: I76ca4d075756e3ac691070e0c05344a410ea2498 Reviewed-on: https://code.wireshark.org/review/2507 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19Revert "Update ASN.1 source files with the API changes done in g021e7af"Pascal Quantin2-9/+9
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-9/+9
Change-Id: I52ecfccbce423206242e3cf99401a8c9e1655d88 Reviewed-on: https://code.wireshark.org/review/2385 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-15Remove unused const variables errors seen with recent Clang versionPascal Quantin1-0/+3
Fixes bug 9886 Change-Id: I8624ef1c5874aea5521d21c998510fc29c838936 Reviewed-on: https://code.wireshark.org/review/657 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-26Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate ↵Bill Meier1-2/+2
dissectors. Change-Id: I0e779b2ac2f608356649c5bbfca438141070dea4 Reviewed-on: https://code.wireshark.org/review/412 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-18Remove $Id$ from the ASN.1 dissectors and regenerate them.Jeff Morriss8-17/+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-01-27Add back the fix from revision 54693.Stig Bjørlykke1-0/+3
svn path=/trunk/; revision=54976
2014-01-13Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
svn path=/trunk/; revision=54732
2013-12-09Reject the packet if data is NULL without doing anything else.Chris Maynard1-11/+5
Note: We *might* want to do _something_ but that _something_ should be well-defined and consistent across all dissectors. Previously, some dissectors called proto_tree_add_text() to add some error message text to the tree, while others called DISSECTOR_ASSERT(). svn path=/trunk/; revision=53895
2013-12-08- Forward declaration of register functions.Anders Broman1-0/+3
svn path=/trunk/; revision=53861
2013-11-05In an effort to reduce the use of pinfo->private_data (and some true global ↵Michael Mann2-27/+33
variables), I converted the ASN.1 dissectors that use pinfo->private_data to exchange a SESSION_DATA_STRUCTURE to instead only exchange it in the context of ASN.1. This meant converting dissectors to the "new" style to pass the SESSION_DATA_STRUCTURE as well as providing a pointer to it in asn1_ctx_t.private_data. Yes, it's still "private data", but it's not used by all dissectors like pinfo->private data is. svn path=/trunk/; revision=53090
2013-11-02Require dissector_try_string to pass a data parameter to its subdissectors. ↵Michael Mann1-1/+1
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-10-29From didier gautheron: remove redundant or use faster col_xxx functionsBill Meier1-3/+3
- when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster. - same for replace col_append_fstr and col_append_str - remove col_clear() when it's redundant: + before a col_set/col_add if the dissector can't throw an exception. - replace col_append() after a col_clear() with faster col_add... or col_set https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9344 svn path=/trunk/; revision=52948
2013-09-09expert_add_info_format_text -> expert_add_info_formatMichael Mann1-1/+1
svn path=/trunk/; revision=51851
2013-07-17Remove fragment_data, add fragment_head, fragment_item - for now alias it to ↵Jakub Zawadzki1-1/+1
the same structure. This is begin of work to split fragment head and fragments items. svn path=/trunk/; revision=50708
2013-06-14Remove check_col() from ASN.1 dissectorsMichael Mann1-2/+1
svn path=/trunk/; revision=49927
2013-06-03Convert ASN.1 dissectors to use filterable expert info.Michael Mann1-7/+14
NOTE: Kerberos ASN.1 template was updated, but not generated to source. svn path=/trunk/; revision=49707
2013-05-07Allow generating some more dissectors with cmake.Jörg Mayer1-0/+34
svn path=/trunk/; revision=49196
2013-05-05Just whitespace changesJörg Mayer1-1/+2
svn path=/trunk/; revision=49167
2013-04-23Stub cmake support for generating the asn1 dissectors.Jörg Mayer1-0/+23
It doesn't do anything yet, it is just to make svn status readable again. svn path=/trunk/; revision=49007
2013-03-22Don't wire into the reassembly code the notion that reassemblies shouldGuy Harris1-9/+9
be done on flows from one address to another; reassembly for protocols running atop TCP should be done on flows from one TCP endpoint to another. We do this by: adding "reassembly table" as a data structure; associating hash tables for both in-progress reassemblies and completed reassemblies with that data structure (currently, not all reassemblies use the latter; they might keep completed reassemblies in the first table); having functions to create and destroy keys in that table; offering standard routines for doing address-based and address-and-port-based flow processing, so that dissectors not needing their own specialized flow processing can just use them. This fixes some mis-reassemblies of NIS YPSERV YPALL responses (where the second YPALL response is processed as if it were a continuation of a previous response between different endpoints, even though said response is already reassembled), and also allows the DCE RPC-specific stuff to be moved out of epan/reassembly.c into the DCE RPC dissector. svn path=/trunk/; revision=48491
2013-02-19How can I get a new tvbuff that starts at an offset within a givenGuy Harris1-1/+1
tvbuff and runs to the end of the tvbuff? Let me count the ways.... Replace a bunch of different ways of doing that (some incorrect, in that they're not properly handling tvbuffs where the captured and reported lengths are different) with tvb_new_subset_remaining(). svn path=/trunk/; revision=47751
2012-12-26Fix a bunch of warnings.Guy Harris1-2/+2
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-3/+1
svn path=/trunk/; revision=45015
2012-09-10Propage changes done in generated dissectors to asn1/Jakub Zawadzki2-14/+16
svn path=/trunk/; revision=44845
2012-06-28Update Free Software Foundation address.Jakub Zawadzki5-5/+5
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-01-13Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+0
svn path=/trunk/; revision=40468
2011-10-14Don't generate the conformance file for exported types when building theJeff Morriss1-1/+1
dissector; instead built it only when the separate target (generate_export) is built. Built generate_export when building "all". This prevents the exp_*.cnf files from being regenerated each time another one of the exp_*.cnf files (which the current dissector depends on) has changed (despite the fact that the exported types does not depe Also fix the CLEANFILES definition so it actually cleans things. svn path=/trunk/; revision=39421
2011-10-10Build the ASN.1 dissectors directly into epan/dissectors (rather than buildingJeff Morriss1-4/+0
them and then copying them over). The "all" target to builds these dissectors now (instead of "generate_files" and/or "copy_files"). asn2wrs's "-O" option now means "the dissector goes in this directory" (rather than "all output goes in this directory"); it also means that the "-s" (single output file) option is now required. Fix things up so that it's possible to build all of the ASN.1 dissectors in one shot. Fix building of conformance files when doing out-of-source-tree builds. Unfortunately "make all" in the asn1 directory always builds something--I think because of circular depedencies. svn path=/trunk/; revision=39333
2011-09-27Get rid of check_col, while at it set ENC.Anders Broman1-4/+4
svn path=/trunk/; revision=39164
2011-07-19Use ENC_NA as encoding for FT_PROTOCOL, FT_NONE and FT_BYTES.Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=38122
2011-07-19Use correct encoding for proto_tree_add_item().Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=38107
2011-01-30Introduce "Fragment count" filter element for all protocols doing reassembly.Stig Bjørlykke1-0/+5
svn path=/trunk/; revision=35705
2010-09-30Cleanup reassembly hf entries.Stig Bjørlykke1-9/+8
svn path=/trunk/; revision=34291
2010-08-24Display octet string fragments for RTSE segment data.Stig Bjørlykke1-4/+7
svn path=/trunk/; revision=33911
2010-08-24Indicate abort and abort-reason in info column.Stig Bjørlykke1-0/+17
svn path=/trunk/; revision=33908