Commit Graph

130 Commits

Author SHA1 Message Date
Alexis La Goutte 81b457d0c4 ASN1: fix misspelling (found by Lintian)
Extention -> Extension

Change-Id: I10278ce21da805b2b86cac6e2b14e921acf15544
Reviewed-on: https://code.wireshark.org/review/13052
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-04 09:44:43 +00:00
Guy Harris 099698445b Move the proto data stuff out of frame_data.[ch].
It's not tied to the frame_data structure any more, so it belongs by
itself.

Clean up some #includes while we're at it; in particular, frame_data.h
doesn't use anything related to tvbuffs, so don't have it gratuitiously
include tvbuff.h.

Change-Id: Ic32922d4a3840bac47007c5d4c546b8842245e0c
Reviewed-on: https://code.wireshark.org/review/13518
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-25 02:24:34 +00:00
Guy Harris bc5a0374bf Add the packet number to the packet_info structure, and use it.
That removes most of the uses of the frame number field in the
frame_data structure.

Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22
Reviewed-on: https://code.wireshark.org/review/13509
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24 03:41:28 +00:00
Pascal Quantin d15d88ed0b RRC: follow-up of g588955d
Change-Id: I46d23e57441f5776a63776adc8cbf7fedffad49c
Reviewed-on: https://code.wireshark.org/review/13264
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-13 17:34:02 +00:00
AndersBroman 588955d2ac [RRC] Update to V13.1.0 (2015-12)
Change-Id: Ic9c19bf7f8ee4233ac1150bc372b3693502d986d
Reviewed-on: https://code.wireshark.org/review/13261
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-13 16:41:37 +00:00
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
Michael Mann a391a70b3b "new" dissector API -> dissector API for ASN.1 dissectors.
Change-Id: I7b794cba2feda2cae40411e2b1cb9fb091d08220
Reviewed-on: https://code.wireshark.org/review/12480
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 03:12:23 +00:00
Michael Mann bcabd8df0f register_dissector -> new_register_dissector for ASN.1 dissectors.
Change-Id: I0476519c02ffdd426b4fdfe8a206d61b728c327a
Reviewed-on: https://code.wireshark.org/review/12026
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-22 08:38:50 +00:00
Pascal Quantin 2e3be5410c RRC: upgrade dissector to v12.6.0
Change-Id: Ied56f90a8689a25d4093795bfd97d57d40e382c6
Reviewed-on: https://code.wireshark.org/review/9838
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-31 22:01:32 +00:00
Peter Wu 3243b6f964 asn1: split off cleanup routines
General approach:

 1. Split allocation (e.g. g_hash_table_new) from deallocation
    (g_hash_table_destroy) into functions named "init" and "cleanup".
 2. Remove guards that test whether the hash tables are set as
    init is always called before cleanup.
 3. Remove setting hash tables to NULL after destruction.
 4. Copy register_init_routine function call and change init to cleanup.
 5. Add cleanup function that calls reassembly_table_destroy if there
    is a reassembly_table_init function.

Some templates were modified as follows:

 - snmp: split renew into init+cleanup, but keep renew for the uat_new
   callback.
 - ldap,ros: Rename init to cleanup as there was no initialization.
 - camel: remove init function from header, make it static. Remove debug
   print.
 - tcap: remove unused ssn_range assignment.

Files in epan/ were regenerated using cmake && make asn1

Change-Id: Idac16ebf0ec304e0c8becaab5d32904e56eb69b9
Reviewed-on: https://code.wireshark.org/review/9136
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-04 00:17:14 +00:00
Pascal Quantin 29aecdf032 RRC: remove non ASCII characters from ASN.1 description
Change-Id: I7edb23651caa5ccf8e9989069803a8800e358670
Reviewed-on: https://code.wireshark.org/review/9172
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-26 15:50:36 +00:00
Martin Mathieson 9f613e3305 RRC: add domain and release cause information to the INFO column.
Change-Id: If0bee7f283d6c4dd44618221d528fb55e30f510a
Reviewed-on: https://code.wireshark.org/review/8353
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-09 07:16:41 +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 1785d42061 Remove depricated API tvb_length -> tvb_reported_length
Change-Id: I78b1d2accf4fd0b37eaa16cb8bf515422565e98a
Reviewed-on: https://code.wireshark.org/review/8011
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-10 13:19:33 +00:00
Vincent Helfre 8874653a1c RRC: add a missing mask forgotten in gf3d1e3c
Change-Id: Ib62e15d17ea576f2180ac92d217869768225905d
Reviewed-on: https://code.wireshark.org/review/7850
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-29 18:51:12 +00:00
Vincent Helfre f3d1e3c660 RRC: add dissection of ims-Information IE
Bug: 11096
Change-Id: I348726dcd3b62f75db67e63c07bcdc79e86657a7
Reviewed-on: https://code.wireshark.org/review/7842
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-29 15:36:44 +00:00
Dario Lombardo 63ebe918d9 Removed duplicated #include lines
Change-Id: I9cafa3cd5c74121168777d8c656e7e94e89efd3c
Reviewed-on: https://code.wireshark.org/review/6065
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-28 00:02:39 +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
Bill Meier a379ac74d2 Fix spelling: cant-->can't, wont-->won't, etc
Change-Id: Ia6c3e7a25615bf8e052c3bacf096d76df775c9c2
Reviewed-on: https://code.wireshark.org/review/4126
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-16 15:31:58 +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
Pascal Quantin ac52c06038 RRC: fix ASN.1 description by manually adding CR5591
Without it, dual-band DF-3C feature does not work

Change-Id: I95d4a7320b77c6093f5d51efdbb2b21af0deab11
Reviewed-on: https://code.wireshark.org/review/2942
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-08 15:17:17 +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
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
Pascal Quantin 8f547d74dc Upgrade RRC dissector to v11.8.0
Change-Id: If43fc7ec8b5f997e573a9d84fda03f2ca2bf6dc7
Reviewed-on: https://code.wireshark.org/review/94
Tested-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-03 22:25:12 +00:00
Pascal Quantin 93398e794e Use STR_UNICODE display instead of proto_tree_add_unicode_string() in the remaining dissectors
svn path=/trunk/; revision=53867
2013-12-08 20:03:15 +00:00
Michael Mann 9b7fb8a811 Create the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470)
I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future.  And search/replace of a function name is easy enough to do.

The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As.

All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope().  All other dissectors were converted to using file_scope() which was the original scope for "proto" data.

svn path=/trunk/; revision=53520
2013-11-23 02:20:13 +00:00
Pascal Quantin 019e64f58d Upgrade RRC dissector to v11.7.0
svn path=/trunk/; revision=52202
2013-09-24 17:56:17 +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 802e7bed77 Try to differentiate a non filled private_data (pointer set to NULL) from an enum with value = 0
svn path=/trunk/; revision=50837
2013-07-23 14:34:46 +00:00
Pascal Quantin b00abd1c43 Check actx->private_data validity before using it
svn path=/trunk/; revision=50339
2013-07-03 12:01:12 +00:00
Pascal Quantin 2eec913a4d Fet rid of a global variable
svn path=/trunk/; revision=50034
2013-06-19 07:16:14 +00:00
Michael Mann 7fe5422c4b Convert ASN.1 dissectors to use filterable expert info.
NOTE: Kerberos ASN.1 template was updated, but not generated to source.

svn path=/trunk/; revision=49707
2013-06-03 03:42:36 +00:00
Anders Broman 85a8e304dd Add the posibillity to use a key for per-packet-data.
svn path=/trunk/; revision=49259
2013-05-12 18:11:02 +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
Chris Maynard e08b7c3a38 Fix encoding arg for proto_tree_add_item() and friends.
svn path=/trunk/; revision=48732
2013-04-04 15:33:14 +00:00
Pascal Quantin e704aaa14b Upgrade RRC dissector to v11.5.0
svn path=/trunk/; revision=48444
2013-03-20 21:15:19 +00:00
Anders Broman 20c17246d4 svn path=/trunk/; revision=48440 2013-03-20 06:50:56 +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
Anders Broman 04ec1e0984 Use explicit casts.
svn path=/trunk/; revision=48043
2013-03-03 21:22:25 +00:00
Pascal Quantin d3e4d6c972 Upgrade RRC dissector to v11.4.0
svn path=/trunk/; revision=47041
2013-01-11 23:25:30 +00:00
Pascal Quantin 17781b66bf Add missing OPTIONAL keyword in RRCConnectionRequest message
svn path=/trunk/; revision=46202
2012-11-26 13:21:18 +00:00
Pascal Quantin 8acaffff82 Pacify OSX-10.5 buildbots
svn path=/trunk/; revision=46017
2012-11-13 07:40:23 +00:00