Commit Graph

143 Commits

Author SHA1 Message Date
Michael Mann 21e5a950ad Remove all preferences related to enabling/disabling heuristic dissectors.
The preferences are still supported for backwards compatibility, but the heuristic_protos file has final say on the "preference" to enable/disable a heuristic dissector.

Also add parameter to heur_dissector_add() for the "default" enable/disable of a heuristic dissector. With this parameter, a few more (presumably weak) heuristic dissectors have been "registered" but of course default to being disabled.

Change-Id: I51bebb2146ef3fbb8418d4f5c7f2cb2b58003a22
Reviewed-on: https://code.wireshark.org/review/9610
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-17 17:12:22 +00:00
Michael Mann be7d295fbf Add "user presentable" and "unique string ids" to heuristic table entries.
This allows better presentation of heuristic dissectors to the end user.

Change-Id: I2ff3985ab914e83c2989880cc0c7b9904045b3f6
Reviewed-on: https://code.wireshark.org/review/9602
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-12 03:14:38 +00:00
Martin Mathieson bd64be6444 RANAP: if bindingid looks like port number, extract and show
Change-Id: Ibfb98bf72ebbd620f21a13e5a4435144a8ef9f6a
Reviewed-on: https://code.wireshark.org/review/9560
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-07-08 14:27:45 +00:00
Martin Mathieson 61e127a8ca RANAP: call nsap properly when bindingID is included in transport address
Change-Id: I45fed890cc2f7f5d106bbb7b35038d8db141fa4e
Reviewed-on: https://code.wireshark.org/review/9036
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-06-23 04:52:08 +00:00
Guy Harris b849726351 Fix some cases where we're shifting a signed 1 left.
Shift 1U instead, to make sure it's unsigned; the result of, for
example, the result of shifting a signed value left is undefined if the
value times 2^{shift count} doesn't fit in the *signed* type of the
shifted value.  That means, in particular, that the result of shifting 1
left by {number of bits in an int - 1} is undefined.  (In *practice*,
it'll probably be -2^32, with the bit you want set, but that's not
guaranteed, and GCC 5.1 seems not to like it.)

Make some other left-hand operands of <<, and some variables holding
results from shifts of that sort, unsigned, while we're at it.

Change-Id: Ie72a9d0d518f59b35948267d10c80735d162e8bb
Reviewed-on: https://code.wireshark.org/review/8264
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-01 06:50:36 +00:00
AndersBroman af11fde75d [RANAP] Heuristics does not work with lenght detremant of 2 bytes.
Change-Id: Ib26b9d66e690770a27d63f75f4c9a935fc93b2b0
Reviewed-on: https://code.wireshark.org/review/8209
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-27 11:27:28 +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
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
Michael Mann ab8cad2816 Remove sccp_info member from packet_info structure.
sccp_msg_info_t* is now passed from SCCP dissector to its subdissectors through dissector data parameter.

Change-Id: Iab4aae58f8995e844f72e02e9f2de36e83589fc0
Reviewed-on: https://code.wireshark.org/review/5442
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-26 09:20:44 +00:00
Bill Meier 93cc6f004f Fix some spelling & grammar.
Change-Id: Iedeaa411caa0823922dd79c27897a2349d4e6907
Reviewed-on: https://code.wireshark.org/review/4054
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-09 19:43:27 +00:00
AndersBroman 93da6170e3 Remove unused hf and deprecated API
Change-Id: I5196f2be4b15704517ff1dc8bfacc6f9b52ecd71
Reviewed-on: https://code.wireshark.org/review/3720
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 14:07:06 +00:00
AndersBroman 50413192e3 Use the E212 function to dissect IMSI correct the filter Id string in
E212.

Change-Id: I203502b39d4ef216282d305f90c930aca84241bf
Reviewed-on: https://code.wireshark.org/review/3718
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-19 13:46:00 +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
AndersBroman 482a3cd1f1 More fiddling with heuristic.
Change-Id: I50b78cc38c6f529695ecd54ced0ed94e8a683534
Reviewed-on: https://code.wireshark.org/review/835
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-26 14:57:14 +00:00
AndersBroman 873a96fab1 Fix off by one error
Change-Id: I24c9e988786a95489f918bed2c043e6eb23e4caa
Reviewed-on: https://code.wireshark.org/review/834
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-26 12:11:39 +00:00
AndersBroman d6381c6fe6 Strengthen RANAP heuristic.
Change-Id: I8f6515d2716bb633f753243b7f86d371a22ebbad
Reviewed-on: https://code.wireshark.org/review/826
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-25 17:20:48 +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 4124b7aa17 - Forward declaration of register functions.
svn path=/trunk/; revision=53872
2013-12-08 22:02:12 +00:00
Anders Broman b630ccec17 - Forward declaration of register functions.
svn path=/trunk/; revision=53859
2013-12-08 15:40:10 +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 c65459c729 emem -> wmem (don't forget about .cnf)
svn path=/trunk/; revision=52058
2013-09-15 14:33:38 +00:00
Pascal Quantin d23f769c0d Add an option to dissect RRC-Container IE
svn path=/trunk/; revision=50130
2013-06-24 21:31:25 +00:00
Evan Huus b1e12ec925 Convert the rest of the ASN1 dissectors from emem to wmem.
svn path=/trunk/; revision=50063
2013-06-19 22:47:36 +00:00
Jörg Mayer 59417deed4 I added EXPORT_FILES in too many places, remove them
(via "copy - modify too little - paste" cycle)

svn path=/trunk/; revision=49255
2013-05-11 22:02:33 +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 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 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
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 a406bb1a50 Add data parameter to dissector_try_uint_new
svn path=/trunk/; revision=44874
2012-09-11 09:06:48 +00:00
Jakub Zawadzki 5a8783f5b1 Initial commit to support yet another method of passing data between dissectors.
Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL

svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
Pascal Quantin 870b536e6c Fix field type for some 64 bits header fields
svn path=/trunk/; revision=44513
2012-08-15 13:42:46 +00:00
Anders Broman 796bbde5d3 - Put back not used constants to fill value_strings_ext.
- Don't dissect RRC container, it seems to only cause grief.

svn path=/trunk/; revision=44156
2012-07-31 13:49:39 +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
Pascal Quantin f0a74f3a5c Upgrade GSM BSSMAP dissection to Release 9 (V9.8.0)
svn path=/trunk/; revision=43227
2012-06-12 21:36:55 +00:00
Guy Harris 27286517f7 Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

Also, fix a call for IPv4 addresses to use ENC_BIG_ENDIAN (yes, we do
support ENC_LITTLE_ENDIAN for IPv4 addresses - at least one protocol
apparently puts IPv4 addresses out byte-swapped!).

svn path=/trunk/; revision=42531
2012-05-10 01:08:50 +00:00
Anders Broman ced09423a6 Dissect transport layer address NSAP
svn path=/trunk/; revision=42416
2012-05-04 06:31:31 +00:00
Anders Broman f104bae88a From David Wei and me, update to 3GPP TS 25.413 V10.4.0 (2011-12).
svn path=/trunk/; revision=41104
2012-02-21 09:25:41 +00:00
Anders Broman 27f95726b3 Try to get the container stuff right...
svn path=/trunk/; revision=40119
2011-12-08 21:17:03 +00:00
Anders Broman befe8805a6 Add a missing IE number.
svn path=/trunk/; revision=39897
2011-11-17 06:46:34 +00:00
Bill Meier 794757ae8f For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.
Also: remove trailing whitespace for a number of files.

svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +00:00
Anders Broman c20e6b8a25 Dissect NSAP encoded transport layer address.
svn path=/trunk/; revision=39408
2011-10-13 19:41:34 +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 4d33ad6f6d Fix a typo
svn path=/trunk/; revision=38978
2011-09-12 16:09:36 +00:00
Anders Broman 3aa4c91d03 Update to V10.2.0 (2011-06)
svn path=/trunk/; revision=38972
2011-09-12 13:00:11 +00:00