aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/acse
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-26cmake: add asn1 target, avoid unnecessary rebuildsPeter Wu1-1/+1
Add an "asn1" build target that rebuilds all ASN.1 dissectors. Do not always generate the ASN.1 dissector when invoking the "generate_dissector-PROTO" target. Use a special "packet-PROTO-stamp" file to detect whether the dissector is out of date. This indirection is needed because cmake removes output files from add_custom_command in the clean target, but we would like to keep the generated packet-PROTO.c files. Make all EXTRA_CNF and EXPORT_DEPENDS point to absolute paths for generated exported configs (PROTO-exp.cnf). This is done by automake too and is needed for proper dependency tracking. Example: when h225.cnf is updated, h225-exp.cnf needs to be generated. That is the purpose of the "generate-h225-exp.cnf" target. Now h235 (and other) dissectors need to be regenerated as well because the h225-exp.cnf is updated. This is why there is a separate add_custom_command and add_custom_target. Change-Id: I8cfc1f8f43cea595267b21eae30b4548f3407c0b Reviewed-on: https://code.wireshark.org/review/12080 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@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-01-04ACSE: get rid of an evil global variablePascal Quantin2-12/+30
Bug: 10787 Change-Id: I225dab439e195bbd308bcafd4658e77ef9023c0f Reviewed-on: https://code.wireshark.org/review/6263 Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-23asn1 generated dissectors: cleanup #include usageBill Meier1-4/+0
Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387 Reviewed-on: https://code.wireshark.org/review/6008 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-09Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors.Michael Mann1-5/+13
This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions. Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree. Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141 Reviewed-on: https://code.wireshark.org/review/3500 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
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-19batch of manual tvb_length conversionsEvan Huus1-1/+1
Change-Id: Ib3a1ddc4342a7a8648d6ed8bfcb35aa229c56a27 Reviewed-on: https://code.wireshark.org/review/2445 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19Revert "Update ASN.1 source files with the API changes done in g021e7af"Pascal Quantin1-1/+1
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 Quantin1-1/+1
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-5/+5
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 Morriss7-18/+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>
2013-12-09- Forward declaration of register functions.Anders Broman1-1/+3
svn path=/trunk/; revision=53877
2013-12-02If data is NULL, the bug, if any, is not with *this* dissector, but with ↵Chris Maynard1-9/+6
whichever one failed to pass the data properly. svn path=/trunk/; revision=53706
2013-11-10Add missing includes in order to remove exceptions.h from proto.h (next commit).Jakub Zawadzki1-0/+1
svn path=/trunk/; revision=53230
2013-11-05Add missing cast.Evan Huus1-1/+1
svn path=/trunk/; revision=53096
2013-11-05In an effort to reduce the use of pinfo->private_data (and some true global ↵Michael Mann2-37/+38
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-10-31Add a data parameter to call_ber_oid_callback to be able to pass data to ↵Michael Mann2-4/+4
subdissectors found with dissector_try_string_new. The intention is to aid in the removal of pinfo->private_data use as well as static global variables in a dissector. For now, all calls to call_ber_oid_callback have the data parameter set to NULL. svn path=/trunk/; revision=52994
2013-10-29From didier gautheron: remove redundant or use faster col_xxx functionsBill Meier1-5/+5
- 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-07-06Fix duplicate diplay filter names found by checkfiltername.plMichael Mann1-3/+3
svn path=/trunk/; revision=50396
2013-07-03expert_add_info + proto_tree_add_text = proto_tree_add_expert, where applicableMichael Mann1-2/+2
svn path=/trunk/; revision=50337
2013-06-19Apparently one of our major global headers must include emem.h, because I justEvan Huus1-1/+1
found a bunch more asn1 dissectors using emem without ever directly including the header. Convert those to wmem as well, which involves add a number of #include directives since dissectors do *not* automatically pull in the wmem headers. svn path=/trunk/; revision=50066
2013-06-19Convert a batch of asn1 dissectors from emem to wmem.Evan Huus1-4/+4
svn path=/trunk/; revision=50057
2013-06-03Convert ASN.1 dissectors to use filterable expert info.Michael Mann1-2/+11
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/+35
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
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-06-28Update Free Software Foundation address.Jakub Zawadzki5-5/+5
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-01-19fix compile errors found by dumpabi targetBalint Reczey1-0/+1
svn path=/trunk/; revision=40595
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-7/+3
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-07-19Use ENC_NA as encoding for FT_PROTOCOL, FT_NONE and FT_BYTES.Stig Bjørlykke1-2/+2
svn path=/trunk/; revision=38122
2011-07-19Use correct encoding for proto_tree_add_item().Stig Bjørlykke1-2/+2
svn path=/trunk/; revision=38107
2010-10-15Added info column descriptions for AARQ and AARE.Stig Bjørlykke1-0/+10
svn path=/trunk/; revision=34519
2010-09-23Show Abort source in info column.Stig Bjørlykke1-0/+12
svn path=/trunk/; revision=34202
2010-06-09Print correct RLRE reason in Info column.Stig Bjørlykke1-2/+11
Dump RLRQ/RLRE text in Info column even when having no reason code. svn path=/trunk/; revision=33178
2010-04-06#include <stdio.h> not needed.Bill Meier1-1/+0
svn path=/trunk/; revision=32405
2010-01-13Remove redundant calls to check_col() in the .cnf files and regenerate.Anders Broman1-2/+2
svn path=/trunk/; revision=31523
2010-01-04From gonzalocas:Anders Broman2-9/+37
GSSE message dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4370 svn path=/trunk/; revision=31442
2010-01-03Corrected type for ACRP-apdu aSO-context-name,Stig Bjørlykke1-1/+3
which has to be wrong in the ASN.1 spec. svn path=/trunk/; revision=31417
2009-12-19Regenerate with SIZE constraints checking.Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=31322
2009-10-11Make all proto_* values static.Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=30516
2009-10-08Remove unused NEED_PACKET_PROTO_H variableKovarththanan Rajaratnam1-1/+0
svn path=/trunk/; revision=30409
2009-08-09Don't guard col_clear with col_checkKovarththanan Rajaratnam1-2/+1
svn path=/trunk/; revision=29344
2009-08-09Don't guard col_set_str (COL_PROTOCOL) with col_checkKovarththanan Rajaratnam1-2/+1
svn path=/trunk/; revision=29340
2009-07-30Remove more unused variables.Gerald Combs1-1/+0
svn path=/trunk/; revision=29249
2009-03-09Corrected oid name.Stig Bjørlykke1-2/+2
svn path=/trunk/; revision=27672
2009-03-07Added an expert info when dissector is not available.Stig Bjørlykke1-2/+3
svn path=/trunk/; revision=27632