Commit Graph

44 Commits

Author SHA1 Message Date
Bill Meier d3261b2dda Comment out various 'if(tree)'
col..._() and/or expert...() should not be called under 'if(tree)'

Change-Id: I57efe44794977d3f93e4764642b091044a125c0c
Reviewed-on: https://code.wireshark.org/review/6826
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-27 18:07:24 +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
Stig Bjørlykke 4e1b5ea866 ASN1: Register PDU-dissectors as NEW
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-10-13 11:24:07 +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
Evan Huus 37b903d7ab batch of tvb-length conversions
Change-Id: I76ca4d075756e3ac691070e0c05344a410ea2498
Reviewed-on: https://code.wireshark.org/review/2507
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-21 04:01:52 +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
Anders Broman 25ce6c262e - Forward declaration of register functions.
svn path=/trunk/; revision=53908
2013-12-10 17:41:57 +00:00
Anders Broman 0d46cdae53 - Forward declaration of register functions.
svn path=/trunk/; revision=53876
2013-12-09 06:20:42 +00:00
Anders Broman 4124b7aa17 - Forward declaration of register functions.
svn path=/trunk/; revision=53872
2013-12-08 22:02:12 +00:00
Michael Mann 93be0fb393 Batch of filterable expert infos with some minor cleanup I noticed while doing the filter conversions.
svn path=/trunk/; revision=49893
2013-06-12 03:33:44 +00:00
Gerald Combs c891784de7 Quick fix for bug 8768. For now assume that only three logical channels
are valid. If we run into more add expert item and cap the channel
count.

svn path=/trunk/; revision=49787
2013-06-05 16:38:20 +00:00
Pascal Quantin ec1ebf5dd8 From LI Hai via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8708 :
Add MAC-DATA support to TETRA dissector and other minor improvements

svn path=/trunk/; revision=49567
2013-05-24 20:55:42 +00:00
Jörg Mayer d266d38af0 Now all disectors requiring asn2wrs can be generated using
cmake.

svn path=/trunk/; revision=49254
2013-05-11 20:52:50 +00:00
Jörg Mayer 66eb2bed96 Small cleanups
svn path=/trunk/; revision=49242
2013-05-11 12:16:06 +00:00
Jörg Mayer 7a58867626 x721 and kerberos: Use standard Makefile.am
idmp: remove an unused line
tetra, h460: Whitespace changes to be a "standard" Makefile.am
asn1/Makefile.am: don't try to build kerberos and x721 dissectors

svn path=/trunk/; revision=49201
2013-05-07 12:58:27 +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 fb46fccec4 From LI Hai:
According to Table 161 in ETSI 392-2 standard, the Class of MS field in
U-LOCATION UPDATE DEMAND in tetra.asn is incorrect. the type of Class of MS
field should be Type 2, not Type 1, and the length should be 24 bits, not
32bits.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7946

svn path=/trunk/; revision=45857
2012-11-01 09:11:06 +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
Pascal Quantin 0543f20a15 From LI Hai via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7736 :
Fix dissection error of D-RELEASE and D-CONNECT in TETRA dissector

svn path=/trunk/; revision=45004
2012-09-19 11:02:19 +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
Bill Meier fe9aac8af0 FT_BOOLEAN hf[] entry with a 0 'bitmask' should have 'display' = BASE_NONE;
svn path=/trunk/; revision=41590
2012-03-16 02:31:42 +00:00
Anders Broman 16be627c1a Get rid of Warnings.
svn path=/trunk/; revision=39980
2011-11-21 20:08:11 +00:00
Anders Broman 8fdb6af097 Remove export.
svn path=/trunk/; revision=39956
2011-11-20 10:27:26 +00:00
Anders Broman 03b2005957 See if this fixes it, why it worked on my system is anybodys guess.
svn path=/trunk/; revision=39955
2011-11-20 09:51:03 +00:00
Anders Broman 42b44648c8 Get rid of Warnings.
svn path=/trunk/; revision=39954
2011-11-20 08:59:19 +00:00
Guy Harris 0c530d222a At least as I read the code, there can be up to 3 receive channels (the
number of channels is XXX & 0x03, hence in the range 0-3.

Thanks and a tip of the hat to Clang Cat for catching this.

svn path=/trunk/; revision=39839
2011-11-15 05:10:56 +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
Bill Meier e2996ceabe Convert 'encoding' parameter of certain proto_tree_add_item() calls in asn1 dissectors:
Specifically:  Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
 the encoding parameter for proto_tree_add_item() calls which directly reference
 an item in hf[] which has a type of:
    FT_UINT8
    FT_UINT16
    FT_UINT24
    FT_UINT32
    FT_UINT64
    FT_INT8
    FT_INT16
    FT_INT24
    FT_INT32
    FT_INT64
    FT_FLOAT
    FT_DOUBLE


svn path=/trunk/; revision=39294
2011-10-06 16:50:13 +00:00
Bill Meier e18e2694c6 Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types:
FT_NONE
     FT_BYTES
     FT_IPV6
     FT_IPXNET
     FT_OID
Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|1|0|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN
 

svn path=/trunk/; revision=39263
2011-10-05 02:39:04 +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
Jeff Morriss 339136d1d0 Based on patch from Denis Ovsienko via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6244 :

Fix typo: s/unkown/unknown/

svn path=/trunk/; revision=38561
2011-08-16 13:16:33 +00:00
Stig Bjørlykke b862371815 Removed some unused variables.
svn path=/trunk/; revision=36602
2011-04-12 19:06:51 +00:00
Jeff Morriss 21cf6ff3ce Remove an unused ett_ variable.
svn path=/trunk/; revision=35927
2011-02-12 03:51:12 +00:00
Anders Broman f02c4d6685 Warning: packet-tetra.c does not have an SVN Id tag.
Error: the blurb for field "Carrier Number" ("tetra.carrier") matches the field name in packet-tetra.c
Error: the blurb for field "PDU" ("tetra.pdu") matches the field name in packet-tetra.c
Error: Found deprecated APIs in packet-tetra.c: dissector_add

svn path=/trunk/; revision=35769
2011-02-02 21:06:51 +00:00
Anders Broman 2395973d17 Integrate and build the tetra dissector.
svn path=/trunk/; revision=35766
2011-02-02 20:11:02 +00:00
Anders Broman b52d775061 Add the local makefiles.
svn path=/trunk/; revision=35755
2011-02-02 06:48:58 +00:00
Anders Broman 51fbf86740 From Holger Freyther:
- Code Cleanups and preparation to call code from gsmtap
- Fix a bug in the asn1 file, Bug found with traces from OsmocomTETRA

svn path=/trunk/; revision=35754
2011-02-02 06:41:16 +00:00
Anders Broman c88ad5ccb2 The Beijing Institute of Technology (BIT) and associate professor LI Hai has created a TETRA decoder for wireshark,
they made the decision to use the ASN1 infrastructure for creating the dissector and were kind enough to send the
GPLed sourcecode to us(The Osmocom Group). This group is using a protocol provided by their equipment.

This is an initial checkin of the code from BIT, it is not fit for inclusion in Wireshark in this state. Further patches are expected
before the code can be integrated by being added to the makefiles.

svn path=/trunk/; revision=35753
2011-02-02 06:35:08 +00:00