Commit graph

169 commits

Author SHA1 Message Date
Balint Reczey
c297df134b More spelling fixes found by lintian
Change-Id: Id218dec9e5a721d6c63fd34962ffe50b6ab8dd56
Reviewed-on: https://code.wireshark.org/review/11946
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Diederik de Groot <dkgroot@talon.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-20 05:47:29 +00:00
Michael Mann
74541a9596 Don't allow multiple registrations of a protocol in dissector tables.
The target here is the Decode As dialog where protocols have multiple registrations into a dissector table and that shows up as multiple entries in the Decode As dialog list with the same name so users are unsure which "dissector" they are choosing.

The "default" behavior (done in this commit) is to not allow duplicates for a dissector table, whether its part of Decode As or not.  It's just ENFORCED for Decode As.

Bug: 3949
Change-Id: Ibe14fa61aaeca0881f9cc39b78799e314b5e8127
Reviewed-on: https://code.wireshark.org/review/11405
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04 12:39:40 +00:00
Alexis La Goutte
8f0fc4ba77 GSM/ANSI/CAMEL...: fix no previous prototype for '*_stat_init' [-Wmissing-prototypes]
Change-Id: I0aedefbb77899ebceac7fb08249faf47964d785b
Reviewed-on: https://code.wireshark.org/review/10163
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-21 04:57:30 +00:00
Alexis La Goutte
b07ae6c2b2 ANSI: Add modelines
Change-Id: I641a9525ec5a6315cc4a2d97506a885605b3504b
Reviewed-on: https://code.wireshark.org/review/10170
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-20 21:36:04 +00:00
Gerald Combs
e312d41883 GTK+: Add a Telephony/ANSI menu placeholder.
Add REGISTER_STAT_GROUP_TELEPHONY_ANSI as well, and use it to add
recently updated stats.

Make sure we properly escape our path separators.

Change-Id: I979d5c29a82acddec1a9bcae7e3cb9c5ea3f9d33
Reviewed-on: https://code.wireshark.org/review/9564
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-08 23:01:49 +00:00
Evan Huus
c60b8eac0c ansi_map: fix float literals missing f suffix
Should fix OSX buildbots

Change-Id: I466d4cdc0c4b52a15cadb9b5d429561ca68cc913
Reviewed-on: https://code.wireshark.org/review/9484
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-07-04 01:50:13 +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
Michael Mann
a8ff1e2778 Create very basic "generic" stat tap API to create a "GUI" independent table.
A few sample tap/dissectors (ANSI/A, ANSI MAP) are also included to test the API.  The "GUI output" is a bit raw and could use some "prettying up", but all the basic hooks are there.

Telephony "stat grouping" needs to be better alphabetized to properly populate menu (on GTK, probably Qt)

Change-Id: I98514171f69c4ab3a304dccb26c71d629703c9ab
Reviewed-on: https://code.wireshark.org/review/9110
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-03 23:08:28 +00:00
AndersBroman
99e7395e9e Replace deprecated API tvb_length... with tvb_reported_length...
Change-Id: I44732d2743ba461d1791bb3795b0aef5a314bc1f
Reviewed-on: https://code.wireshark.org/review/8001
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 11:41:32 +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
Alexis La Goutte
414701dfcb ANSI_MAP: Fix unused function (by add to .OMIT list)
Change-Id: I4e2278d563659db6acc6c02b9e66d58c67939e30
warning: unused function 'dissect_ansi_map_InvokeData' [-Wunused-function]
warning: unused function 'dissect_ansi_map_ReturnData' [-Wunused-function]
Reviewed-on: https://code.wireshark.org/review/5976
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22 15:23: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
Evan Huus
5ed05dd747 batch of manual tvb_length conversions
Change-Id: Ib3a1ddc4342a7a8648d6ed8bfcb35aa229c56a27
Reviewed-on: https://code.wireshark.org/review/2445
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 19:55:31 +00:00
Michael Mann
14824e6adf Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html

This reverts commit 246fe2ca4c.

Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 18:25:59 +00:00
Dario Lombardo
246fe2ca4c Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:14:58 +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
87f4b376f1 Fix one half-changed tvb_get_string() call.
svn path=/trunk/; revision=54879
2014-01-21 20:13:17 +00:00
Guy Harris
73598a7991 IA5 = ASCII. Use tvb_get_string_enc() with an explicit encoding, not
tvb_get_string().

svn path=/trunk/; revision=54877
2014-01-21 20:08:39 +00:00
Anders Broman
6b58ef91d4 Omit assignment for not used types.
svn path=/trunk/; revision=54591
2014-01-04 11:48:40 +00:00
Evan Huus
8f665d9b36 Add a sixteenth element to all BCD digit sets to avoid garbage values when
decoding corrupt bytes. Some of these digit sets could probably be
deduplicated...

svn path=/trunk/; revision=54224
2013-12-18 15:54:32 +00:00
Jakub Zawadzki
4d92f6079b Remove not needed ';'
svn path=/trunk/; revision=54088
2013-12-14 11:12:20 +00:00
Chris Maynard
9b38829b34 Reject the packet if data is NULL without doing anything else.
svn path=/trunk/; revision=53708
2013-12-02 02:31:04 +00:00
Evan Huus
1db1b8e2bb Convert ASN1 dissectors from ep_address_to_str to address_to_str. Clean up a bit
of ansi_tcap code while in the neighbourhood.

svn path=/trunk/; revision=53530
2013-11-23 22:37:33 +00:00
Michael Mann
09bd9ad788 Have ANSI TCAP dissector pass data through subdissector parameter instead of using struct _packet_info.
svn path=/trunk/; revision=52885
2013-10-27 02:00:18 +00:00
Bill Meier
6dd42b581a Fix some [-Wunused-const-variable] warnings (using '#if 0')
svn path=/trunk/; revision=52862
2013-10-26 02:09:14 +00:00
Pascal Quantin
102c452bcb More emem -> wmem conversion:
- tvb_get_g_stringz()/tvb_get_ephemeral_stringz()/tvb_get_seasonal_stringz() -> tvb_get_stringz()
- tvb_get_g_stringz_enc()/tvb_get_ephemeral_stringz_enc() -> tvb_get_stringz_enc()
- tvb_get_ephemeral_unicode_stringz() -> tvb_get_unicode_stringz()
- tvb_bcd_dig_to_ep_str() -> tvb_bcd_dig_to_wmem_packet_str()
- update docs accordingly

svn path=/trunk/; revision=52180
2013-09-22 20:04:35 +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
Pascal Quantin
efe18f199c Convert a few dissectors from emem to wmem API
svn path=/trunk/; revision=51983
2013-09-12 20:37:30 +00:00
Evan Huus
8b0f1addd9 Apparently one of our major global headers must include emem.h, because I just
found a bunch more asn1 dissectors using emem without ever directly including
the header. Convert those to wmem as well, which involves add a number of
#include directives since dissectors do *not* automatically pull in the wmem
headers.

svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
Pascal Quantin
0ee4d0a00a Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402

svn path=/trunk/; revision=49599
2013-05-27 20:26:49 +00:00
Pascal Quantin
a37c044203 Update the ASN.1 based dissectors following the changes done in r48812
svn path=/trunk/; revision=48820
2013-04-11 18:14:53 +00:00
Anders Broman
f92bd64966 [-Wmissing-prototypes]
Use explicit casts.

svn path=/trunk/; revision=48439
2013-03-20 05:59:22 +00:00
Bill Meier
d449c31d1d its ==> it's & it's ==> its as needed.
svn path=/trunk/; revision=47892
2013-02-26 01:22:18 +00:00
Pascal Quantin
b1143f60b3 Regenerate ANSI MAP dissector
svn path=/trunk/; revision=46948
2013-01-05 13:53:27 +00:00
Jeff Morriss
0266cceef3 Make all enum_val_t's const.
svn path=/trunk/; revision=46292
2012-11-29 20:15:37 +00:00
Jakub Zawadzki
7a9d27c33f Regenerate asn.1 dissectors.
svn path=/trunk/; revision=45110
2012-09-24 19:38:46 +00:00
Jeff Morriss
2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
Michael Mann
296871713f make hash key session scoped
cleanup g_snprintf

svn path=/trunk/; revision=44565
2012-08-18 19:22:22 +00:00
Guy Harris
ff6a33fdb4 Mark a parameter as unused.
Clean up indentation and get rid of trailing white space.

svn path=/trunk/; revision=44562
2012-08-18 06:53:39 +00:00
Guy Harris
549d81fe37 epan/dissectors/packet-ansi_map.c shouldn't be edited - it's generated
from the files in asn1/ansi_map.  Update packet-ansi_map-template.c to
reflect the use of session-scope-allocated data for the saved invoke
data, and regenerate the dissector - which means that
TransactionId_table_cleanup() still exists, and is still used, it just
frees only the hash table key, which is g_strdup()ed, not the value,
which is automatically freed when the session-scope-allocated data is
all freed.

svn path=/trunk/; revision=44561
2012-08-18 06:33:08 +00:00
Michael Mann
db98d944e5 Use capture scoped memory for hash table functionality
svn path=/trunk/; revision=44558
2012-08-18 02:54:06 +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
acc2a3706b Fix RVALS() macro usage
svn path=/trunk/; revision=42720
2012-05-19 19:05:36 +00:00
Guy Harris
9f925a618f The trial period is arguably over - no need for packet-ansi_map.c to
have its own #if 0'ed out definition of dgt_set_t.

svn path=/trunk/; revision=42020
2012-04-11 00:35:53 +00:00
Guy Harris
dd4cb8424b Get rid of redundant Dgt1_9_bcd digit set - passing NULL as the digit
set uses tvb_bcd_dig_to_ep_str()'s default digit set, which is the same.

Clean up white space (no 4-space tab characters).

svn path=/trunk/; revision=42019
2012-04-11 00:34:13 +00:00
Stig Bjørlykke
b71ce5d268 Do not assign a value to itself.
svn path=/trunk/; revision=41482
2012-03-11 14:03:13 +00:00
Alexis La Goutte
95cc98f92c Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=41211
2012-02-27 16:50:27 +00:00
Chris Maynard
e799efeed9 Fix some duplicate display filter names.
svn path=/trunk/; revision=40568
2012-01-18 21:07:53 +00:00
Anders Broman
faea2d624c Get rid of Warnings.
svn path=/trunk/; revision=39951
2011-11-19 22:42:51 +00:00
Anders Broman
1b7b2dd067 Use tvb_bcd_dig_to_ep_str().
svn path=/trunk/; revision=39929
2011-11-18 07:01:10 +00:00