Commit Graph

58 Commits

Author SHA1 Message Date
Michael Mann cd02af56a1 Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors.
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-08-09 01:57:08 +00:00
Guy Harris 4d90d6e38d Add some files under asn1 to the distribution.
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-07-30 23:42:55 +00:00
Michael Mann 9356d5c689 convert to proto_tree_add_subtree[_format] for ASN.1 dissectors
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-22 21:08:21 +00:00
Pascal Quantin d0ac937567 Revert "Update ASN.1 source files with the API changes done in g021e7af"
This reverts commit e308e7c4de.

Change-Id: I079616d63f643f79f1bc03ef5fdf724f36df4071
Reviewed-on: https://code.wireshark.org/review/2435
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-19 18:42:28 +00:00
Pascal Quantin e308e7c4de Update ASN.1 source files with the API changes done in g021e7af
Change-Id: I52ecfccbce423206242e3cf99401a8c9e1655d88
Reviewed-on: https://code.wireshark.org/review/2385
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 16:15:42 +00:00
Michael Mann 73217d9f3f tvb_new_subset -> tvb_new_subset_length when length parameters are equal.
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is.

Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d
Reviewed-on: https://code.wireshark.org/review/1999
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07 15:41:07 +00:00
Bill Meier 1dff4e309d Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate 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-26 19:38:21 +00:00
Jeff Morriss 8c608e6e82 Remove $Id$ from the ASN.1 dissectors and regenerate them.
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-18 03:05:28 +00:00
Evan Huus a6415ece0a Rename a couple of to_str functions to have ep_ in the name. This makes it
obvious that the returned string is ephemeral, and opens up the original names
in the API for versions that take a wmem pool (and thus can work in any scope).

svn path=/trunk/; revision=54249
2013-12-19 15:49:09 +00:00
Anders Broman e6d09c1634 Make local functions static. Include *.h when needed.
svn path=/trunk/; revision=54201
2013-12-17 22:07:32 +00:00
Anders Broman 8983ae005a - Forward declaration of register functions.
svn path=/trunk/; revision=53861
2013-12-08 16:40:49 +00:00
Michael Mann 149de99d68 Have rose_ctx_t passed into subdissectors instead of using pinfo->private_data.
svn path=/trunk/; revision=53061
2013-11-03 12:57:58 +00:00
Jörg Mayer b22ed68d8d Some more protocols can be generated via cmake
svn path=/trunk/; revision=49233
2013-05-10 14:55:15 +00:00
Jörg Mayer 8faa262e90 Stub cmake support for generating the asn1 dissectors.
It doesn't do anything yet, it is just to make svn status
readable again.

svn path=/trunk/; revision=49007
2013-04-23 23:05:33 +00:00
Anders Broman 7c56677cf9 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48429
2013-03-19 21:22:31 +00:00
Balint Reczey 1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Anders Broman 9341c04a12 Add a preferense to the Q.932 dissector wether facility messages should be dissected as QSIG or ETSI.
Add the ISUP Supplementary services dissector.

svn path=/trunk/; revision=47713
2013-02-17 19:28:59 +00:00
Jeff Morriss 3551a86c36 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45015
2012-09-20 01:29:52 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Jeff Morriss 75c3c92f19 Add a "-build" argument to checkAPIs.pl. Use that argument when building
from makefiles (and thus from the buildbot).

The intention is to be able to tell when a human is running the tool so we
can provide more code-review guidance.

As a starter, enable the "too many proto_tree_add_text() calls" check when
a human is running the tool.

svn path=/trunk/; revision=41943
2012-04-04 20:46:49 +00:00
Jeff Morriss b21b495f9f Don't generate the conformance file for exported types when building the
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-14 10:22:01 +00:00
Jeff Morriss cf012d27b1 Build the ASN.1 dissectors directly into epan/dissectors (rather than building
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-10-10 02:31:11 +00:00
Anders Broman 0f2e6c6cc5 Get rid of check_col, while at it set ENC.
svn path=/trunk/; revision=39164
2011-09-27 12:05:32 +00:00
Guy Harris a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Stig Bjørlykke 6d1dae6f28 Make all proto_* values static.
svn path=/trunk/; revision=30516
2009-10-11 16:24:29 +00:00
Kovarththanan Rajaratnam 7ab993bee7 Remove unused NEED_PACKET_PROTO_H variable
svn path=/trunk/; revision=30409
2009-10-08 17:26:57 +00:00
Stig Bjørlykke e3ef20f3ea From Kovarththanan Rajaratnam:
Clean up header field info in asn1/*-template.c files.

From me:
Fixed a few typos in the patch.

svn path=/trunk/; revision=28817
2009-06-23 06:02:12 +00:00
Bill Meier 35e5fa9bc1 #include <epan/conversation.h> and/or #include <epan/emem.h> not req'd ...
svn path=/trunk/; revision=27390
2009-02-07 14:33:47 +00:00
Bill Meier 9d721959b7 #include prefs.h not req'd
svn path=/trunk/; revision=27322
2009-01-28 20:52:52 +00:00
Bill Meier f35324d0fd Minor cleanup mostly related to proto_reg_handoff
Remove code for unused handles;
 Localize handles (in proto_reg_handoff) which need not be global;
 Localize (in proto_reg_handoff) "saved prefs";
 Use find_dissector instead of create_dissector_handle as appropriate;
 Use gboolean for "initialized" flag in proto_reg_handoff.

svn path=/trunk/; revision=26693
2008-11-04 21:42:02 +00:00
Tomas Kukosa 1644e4138a Get rid of few warnings (unused generated code, signed/unsigned mismatch)
svn path=/trunk/; revision=25839
2008-07-26 15:28:04 +00:00
Anders Broman 45b3155321 Fix some of the Errors/warnings detected by checkapi.
svn path=/trunk/; revision=25335
2008-05-21 05:41:39 +00:00
Jörg Mayer 3d22aa561b asn1/*/Makefile.nmake were not part of the source package.
Spotted by Tomas Kukosa.

svn path=/trunk/; revision=23921
2007-12-19 10:02:50 +00:00
Tomas Kukosa 1e794fc494 ANSI TCAP regenerated and tested with -T -X asn2wrs options
asn2wrs has -T (tagged types support) and -X (new BER sttructures) default behavior
remove all -T and -X usage

svn path=/trunk/; revision=23823
2007-12-10 08:35:41 +00:00
Jörg Mayer c2d0c8fa31 - Fix svn:ignore for all directories
- gsmmap: uncomment -s option in gsmmap.cnf
- Fix cyclic dependencies:
  + Remove EXPORT_CNF from dependencies for cnf files
  + Replace all INCLUDE ...-exp.cnf with IMPORT ...-exp.cnf

svn path=/trunk/; revision=23202
2007-10-16 13:59:40 +00:00
Tomas Kukosa 399cb7bc5f create exported cnf file for Q.932 and QSIG
(they are not used in any Wireshark dissector but they can be used in any plugin as few Q.932 and QSIG types are exported)

svn path=/trunk/; revision=23183
2007-10-15 12:25:05 +00:00
Jörg Mayer d0e34ab8c3 Remove the remaining autogenereated -exp.cnf files
svn path=/trunk/; revision=23148
2007-10-11 17:56:24 +00:00
Jörg Mayer 0e0bed500d - Remove -e option if the generated -exp.cnf file isn't used.
- Add EXPORT_FILES to all files that still contain -e.

svn path=/trunk/; revision=23145
2007-10-11 05:27:27 +00:00
Tomas Kukosa e8c04c81da more makefiles changed to new export mechanism
svn path=/trunk/; revision=23132
2007-10-10 10:56:17 +00:00
Jörg Mayer 24470fdfae More conversions and updates to existing Makefile stuff
svn path=/trunk/; revision=23127
2007-10-10 08:09:19 +00:00
Tomas Kukosa 138050c4ea improvements in ROS handling in Q.932 and H.450
move common ROS code into ros/ros-*.cnf files

svn path=/trunk/; revision=22936
2007-09-24 11:01:53 +00:00
Jörg Mayer b312e64f6a get_ber_length doesn't need the tree argument, get rid of it.
Rebuild asn1 dissectors.

svn path=/trunk/; revision=22627
2007-08-24 07:12:04 +00:00
Tomas Kukosa 3b5c406f8c QSIG fully implemented
svn path=/trunk/; revision=22361
2007-07-20 09:54:47 +00:00
Tomas Kukosa 9dad88f94b get rid of few warnings
svn path=/trunk/; revision=22355
2007-07-19 12:31:01 +00:00
Tomas Kukosa 17feb32ca9 change QSIG tables structure so as they can be generated automatically from ASN.1 in the next step
svn path=/trunk/; revision=22354
2007-07-19 11:41:10 +00:00
Tomas Kukosa ab5d466fc7 rose_ctx_t structure usage in Q.932 dissector
svn path=/trunk/; revision=22349
2007-07-18 13:15:36 +00:00
Tomas Kukosa 6659588f60 - get rid of anonymous unions
- move some structures from packet-per and packet-q932-ros to asn1.h

svn path=/trunk/; revision=22295
2007-07-13 11:25:53 +00:00
Tomas Kukosa 90974e3440 Q.932 ROS regenerated from original ASN.1 source
svn path=/trunk/; revision=22055
2007-06-06 09:43:45 +00:00
Tomas Kukosa 49df6a8c10 Q.932 and QSIG regenerated with -X (new BER) option
svn path=/trunk/; revision=22044
2007-06-05 12:15:52 +00:00
Anders Broman c01f382974 Second step in introducing asn context to BER dissectors just like in PER.
svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00