Commit Graph

45 Commits

Author SHA1 Message Date
Michael Mann a33209d69e Convert ASN.1 dissectors to remove "new" from "new-style" dissector function 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-10 17:06:02 +00:00
Peter Wu a198f47c06 cmake: add asn1 target, avoid unnecessary rebuilds
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-11-26 12:37:21 +00:00
AndersBroman e914bd5d36 [GTP CDR] Add support for CDR data record format version 12.6.0
Bug: 11015
Change-Id: Iea4a4cd4e4e8b41ef781c92c838f17ea6d16e499
Reviewed-on: https://code.wireshark.org/review/7413
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-26 15:22:52 +00:00
AndersBroman 20e2c05d9b [E212]Modify dissect_e212_mcc_mnc() to take E212 number type as an
argument. While at it remove deprecated APIs

Change-Id: Ib1a7e9d7aeba6379fb4492816a0ac602e67493c6
Reviewed-on: https://code.wireshark.org/review/6534
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-14 13:37:14 +00:00
AndersBroman 42e4040429 [GPRS CDR]Fix faulty ASN1 modification
Should be: egsnPDPRecord			[70] EGSNPDPRecordV750

Change-Id: I4b03524c09b6ce603cf4783144d588c8839a16e6
Reviewed-on: https://code.wireshark.org/review/6523
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-13 14:15:20 +00:00
AndersBroman db7f25f354 [GPRS CDR] Handle Rel 7 CDRs
Change-Id: I09833a326e486273c3eacaceba0963fe88e0dac6
Reviewed-on: https://code.wireshark.org/review/6522
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-13 13:44:01 +00:00
AndersBroman 554a3972cd [GPRS CDR] Add expert info for unknown record types.
Change-Id: Ib485f435b6c423b06c7c31f2cf681d01261bfc15
Reviewed-on: https://code.wireshark.org/review/6504
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-12 13:01:00 +00:00
Bill Meier dd859eada4 asn1 generated dissectors: cleanup #include usage
Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387
Reviewed-on: https://code.wireshark.org/review/6008
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-23 05:39:00 +00:00
AndersBroman d99fe210af Update to V12.5.0
Bug: 10782

Change-Id: I5fd4ec14279411682d8a23f5e0f503180113f093
Reviewed-on: https://code.wireshark.org/review/5790
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-17 12:25:53 +00:00
Alexis La Goutte 0980dd5102 GPRSCDR: fix warning: 'dissect_gprscdr_MBMSInformation' defined but not use
Change-Id: I4bdbaeb3c1e3327af6f5e3de22ebcd4472b9f3e7
Reviewed-on: https://code.wireshark.org/review/5706
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-10 20:02:02 +00:00
AndersBroman 9c05b7f4a9 Make it possible to register an OID dissector to dissect
ManagementExtension.

Change-Id: I52c626b0d7a63214ccecf13d62e0a2850c2dee07
Reviewed-on: https://code.wireshark.org/review/5569
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-02 11:59:17 +00:00
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 791d93a259 Add more files to the distribution.
If it's checked into asn1 or a subdirectory thereof, put it into the
distribution.  (If it's not useful, why is it in Git?)

Change-Id: I4dac8a0d19a770db1513729cf71069a37f1d83fc
Reviewed-on: https://code.wireshark.org/review/3276
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31 04:31:10 +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
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
Guy Harris e35ca75a68 It's one character, either + or -, hence ASCII.
svn path=/trunk/; revision=54885
2014-01-22 01:28:31 +00:00
Anders Broman 2334acec2c Omit assignment for not used types.
svn path=/trunk/; revision=54589
2014-01-04 11:34:46 +00:00
Bill Meier c228237fac Change incorrect property 'keywords' to 'svn:keywords'
svn path=/trunk/; revision=54540
2014-01-01 18:08:30 +00:00
Jörg Mayer 40c6d9abcb Copy over rev 53700 to cmake
svn path=/trunk/; revision=53702
2013-12-01 21:56:40 +00:00
Anders Broman 9baa93519c Update to V11.7.1 (2013-09)
svn path=/trunk/; revision=53700
2013-12-01 20:34:21 +00:00
Pascal Quantin a0c53ffaa1 emem -> wmem conversion:
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits()
- tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup()
- tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode()
- tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string()
- tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string()
- tvb_get_ephemeral_string_enc() -> tvb_get_string_enc()
- update docs accordingly

svn path=/trunk/; revision=52172
2013-09-22 15:50:55 +00:00
Chris Maynard b9ee9fa694 Remove all non-ASCII characters from all .asn files. I didn't see the harm in replacing them all as opposed to only those not copied verbatim from other sources.
svn path=/trunk/; revision=52132
2013-09-18 02:48:29 +00:00
Jörg Mayer 39bff3218a Missed 50% of the updates in last commit
svn path=/trunk/; revision=51773
2013-09-05 07:33:05 +00:00
Jörg Mayer d4f2865595 CMakeLists was no longer in sync with Makefile.common
svn path=/trunk/; revision=51772
2013-09-05 07:28:47 +00:00
Anders Broman 82569132d9 Add the forgotten makefile updates.
svn path=/trunk/; revision=51017
2013-07-29 18:19:59 +00:00
Anders Broman 266e577aee Update to handle version 9.
svn path=/trunk/; revision=50981
2013-07-28 19:25:14 +00:00
Jörg Mayer 84469a3216 Another hour gone, another set of protocols.
svn path=/trunk/; revision=49198
2013-05-07 11:31:26 +00:00
Jörg Mayer 243e9c0ba5 Just whitespace changes
svn path=/trunk/; revision=49167
2013-05-05 08:49:18 +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 dafdc19d9e -Wmissing-prototypes
svn path=/trunk/; revision=48609
2013-03-28 07:34:13 +00:00
Anders Broman 5bd9f6aa9d Add sGSNPLMNIDChange
svn path=/trunk/; revision=47250
2013-01-24 09:53:57 +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
Anders Broman eedc186e94 Dissect Release 8 CDR:s
svn path=/trunk/; revision=43624
2012-07-09 14:09:59 +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
Anders Broman e3f5247fde RatingGroup -> RatingGroupId
svn path=/trunk/; revision=40110
2011-12-07 06:29:31 +00:00
Anders Broman 135b7ca184 Update to 3GPP TS 32.298 V6.4.1 (2006-06)
svn path=/trunk/; revision=40105
2011-12-06 19:16:10 +00:00
Anders Broman 471f342394 Pretify TimeStamp and TimeZone
svn path=/trunk/; revision=40096
2011-12-05 21:53:00 +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
Anders Broman b79dfbe405 Fix unused function warnings
svn path=/trunk/; revision=39338
2011-10-10 17:42:43 +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 6b38bce9c6 Hope fully this will be the correct set of files - finally.
svn path=/trunk/; revision=35781
2011-02-03 16:17:10 +00:00
Anders Broman 9b0adb69e6 Add a forgotten file
svn path=/trunk/; revision=35778
2011-02-03 08:06:54 +00:00
Anders Broman 77333de278 Start to prettify TimeStamp(to be continued).
svn path=/trunk/; revision=35773
2011-02-02 23:12:34 +00:00
Anders Broman 115dfa550c Routines to dissect GPRS CDR's tranported in GTP'
svn path=/trunk/; revision=35756
2011-02-02 17:00:19 +00:00