osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
wireshark/epan/epan.c

915 lines
21 KiB
C
Raw Normal View History

Add GPL disclaimer, which as been missing since forever. Thanks to Jaap Keuter for pointing this out. svn path=/trunk/; revision=20027
2006-11-30 21:32:05 +00:00
/* epan.c
Give libethereal its own configuration file, and have that configuration file, rather than the top-level Ethereal configuration file, check for "inet_aton()", "inet_pton()", and "inet_ntop()". Then make its Makefile.am include the appropriate object files if necessary. Otherwise, they don't get built and put into libethereal, and therefore attempts to link with anything in libethereal that uses them fail on platforms that lack ethem, causing the build to fail. That means a bunch of things need to be fixed to cope with libethereal having its own "config.h" file; this means removing the include of "config.h" from some libethereal header files. Move the definitions of the path names used only by "resolv.c" to "resolv.c" from "resolv.h" (so "resolv.h" doesn't need "config.h", define HAVE_PLUGINS in the configure script (so we don't have to include it in "plugins.h" to check whether HAVE_DLFCN_H is defined). Unfortunately, stuff outside libethereal needs to know PLUGIN_DIR; for now, define that in the top-level configuration file, and have Ethereal and Tethereal pass it as an argument to "epan_init()" - that should be cleaned up at some point. Remove from the top-level configure script checks for things used only in libethereal. svn path=/trunk/; revision=2498
2000-10-16 23:18:05 +00:00
*
name change svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
* Wireshark Protocol Analyzer Library
Add GPL disclaimer, which as been missing since forever. Thanks to Jaap Keuter for pointing this out. svn path=/trunk/; revision=20027
2006-11-30 21:32:05 +00:00
*
* Copyright (c) 2001 by Gerald Combs <gerald@wireshark.org>
*
replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later. The first is deprecated, as per https://spdx.org/licenses/. Change-Id: I8e21e1d32d09b8b94b93a2dc9fbdde5ffeba6bed Reviewed-on: https://code.wireshark.org/review/25661 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07 11:26:45 +00:00
* SPDX-License-Identifier: GPL-2.0-or-later
Give libethereal its own configuration file, and have that configuration file, rather than the top-level Ethereal configuration file, check for "inet_aton()", "inet_pton()", and "inet_ntop()". Then make its Makefile.am include the appropriate object files if necessary. Otherwise, they don't get built and put into libethereal, and therefore attempts to link with anything in libethereal that uses them fail on platforms that lack ethem, causing the build to fail. That means a bunch of things need to be fixed to cope with libethereal having its own "config.h" file; this means removing the include of "config.h" from some libethereal header files. Move the definitions of the path names used only by "resolv.c" to "resolv.c" from "resolv.h" (so "resolv.h" doesn't need "config.h", define HAVE_PLUGINS in the configure script (so we don't have to include it in "plugins.h" to check whether HAVE_DLFCN_H is defined). Unfortunately, stuff outside libethereal needs to know PLUGIN_DIR; for now, define that in the top-level configuration file, and have Ethereal and Tethereal pass it as an argument to "epan_init()" - that should be cleaned up at some point. Remove from the top-level configure script checks for things used only in libethereal. svn path=/trunk/; revision=2498
2000-10-16 23:18:05 +00:00
*/
First step in moving core Ethereal routines to libepan. svn path=/trunk/; revision=2458
2000-09-27 04:55:05 +00:00
#include "config.h"
Catch REPORT_DISSECTOR_BUG() calls in dissector registration routines. Have epan_init() return a success/failure Boolean indication. Catch exceptions when calling the dissector registration routines and, if we get one, report the error and return a failure indication. If epan_init() fails, quit, but first make sure the reported error is displayed. Change-Id: I0300cbb1f66a5644f857a205235124909d684c50 Reviewed-on: https://code.wireshark.org/review/11340 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-28 00:41:23 +00:00
#include <stdarg.h>
include the wsutil/wsgcrypt.h instead of including gcrypt.h directly svn path=/trunk/; revision=47802
2013-02-21 18:23:29 +00:00
#include <wsutil/wsgcrypt.h>
GnuTLS/libgcrypt initialization moved to epan.c svn path=/trunk/; revision=18863
2006-08-10 06:06:21 +00:00
#ifdef HAVE_LIBGNUTLS
#include <gnutls/gnutls.h>
#endif /* HAVE_LIBGNUTLS */
First step in moving core Ethereal routines to libepan. svn path=/trunk/; revision=2458
2000-09-27 04:55:05 +00:00
#include <glib.h>
Dissectors should not use dfilter.h, don't include it. XXX ncp2222 dissector is using dfilter_compile(), why? svn path=/trunk/; revision=53766
2013-12-03 21:31:04 +00:00
Clean up handling of enabled/disabled protocols/heuristic dissectors. Add a "report a warning message" routine to the "report_err" code in libwsutil, and rename files and routines appropriately, as they don't only handle errors any more. Have a routine read_enabled_and_disabled_protos() that reads all the files that enable or disable protocols or heuristic dissectors, enables and disables them based on the contents of those files, and reports errors itself (as warnings) using the new "report a warning message" routine. Fix that error reporting to report separately on the disabled protocols, enabled protocols, and heuristic dissectors files. Have a routine to set up the enabled and disabled protocols and heuristic dissectors from the command-line arguments, so it's done the same way in all programs. If we try to enable or disable an unknown heuristic dissector via a command-line argument, report an error. Update a bunch of comments. Update the name of disabled_protos_cleanup(), as it cleans up information for disabled *and* enabled protocols and for heuristic dissectors. Support the command-line flags to enable and disable protocols and heuristic dissectors in tfshark. Change-Id: I9b8bd29947cccdf6dc34a0540b5509ef941391df Reviewed-on: https://code.wireshark.org/review/20966 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-08 19:45:19 +00:00
#include <wsutil/report_message.h>
Catch REPORT_DISSECTOR_BUG() calls in dissector registration routines. Have epan_init() return a success/failure Boolean indication. Catch exceptions when calling the dissector registration routines and, if we get one, report the error and return a failure indication. If epan_init() fails, quit, but first make sure the reported error is displayed. Change-Id: I0300cbb1f66a5644f857a205235124909d684c50 Reviewed-on: https://code.wireshark.org/review/11340 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-28 00:41:23 +00:00
#include <epan/exceptions.h>
Provide for per-protocol-tree data in the proto_tree code. Put a hash-table of "interesting" fields in the per-proto-tree data. The dfilter code records which fields/protocols are "interesting" (by which I mean, their value or existence is checked). Thus, the proto_tree routines can create special arrays of field_info*'s that are ready for the dfilter engine to use during a filter operation. Also store the "proto_tree_is_visible" boolean, renamed "visible", in the per-proto-tree data. Move epan_dissect_t to its own header file to make #include dependencies easier to handle. Provide epan_dissect_fill_in_columns(), which accepts just the epan_dissect_t* as an argument. epan_dissect_new() needs to be followed by epan_dissect_run() for the dissection to actually take place. Between those two calls, epan_dissect_prime_dfilter() can be run 0, 1, or multiple times in order to prime the empty proto_tree with the "intersesting" fields from the dfilter_t. svn path=/trunk/; revision=4422
2001-12-18 19:09:08 +00:00
#include "epan.h"
Hand the packet provider functions to epan_new(). Have separate packet_provider_data structures and packet_provider_funcs structures; the latter holds a table of functions that libwireshark can call for information about packets, the latter holds the data that those functions use. This means we no longer need to expose the structure of an epan_t outside epan/epan.c; get rid of epan/epan-int.h. Change-Id: I381b88993aa19e55720ce02c42ad33738e3f51f4 Reviewed-on: https://code.wireshark.org/review/24732 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08 04:33:22 +00:00
#include "epan/frame_data.h"
Dissectors should not use dfilter.h, don't include it. XXX ncp2222 dissector is using dfilter_compile(), why? svn path=/trunk/; revision=53766
2013-12-03 21:31:04 +00:00
#include "dfilter/dfilter.h"
Provide for per-protocol-tree data in the proto_tree code. Put a hash-table of "interesting" fields in the per-proto-tree data. The dfilter code records which fields/protocols are "interesting" (by which I mean, their value or existence is checked). Thus, the proto_tree routines can create special arrays of field_info*'s that are ready for the dfilter engine to use during a filter operation. Also store the "proto_tree_is_visible" boolean, renamed "visible", in the per-proto-tree data. Move epan_dissect_t to its own header file to make #include dependencies easier to handle. Provide epan_dissect_fill_in_columns(), which accepts just the epan_dissect_t* as an argument. epan_dissect_new() needs to be followed by epan_dissect_run() for the dissection to actually take place. Between those two calls, epan_dissect_prime_dfilter() can be run 0, 1, or multiple times in order to prime the empty proto_tree with the "intersesting" fields from the dfilter_t. svn path=/trunk/; revision=4422
2001-12-18 19:09:08 +00:00
#include "epan_dissect.h"
First step in moving core Ethereal routines to libepan. svn path=/trunk/; revision=2458
2000-09-27 04:55:05 +00:00
Hand the packet provider functions to epan_new(). Have separate packet_provider_data structures and packet_provider_funcs structures; the latter holds a table of functions that libwireshark can call for information about packets, the latter holds the data that those functions use. This means we no longer need to expose the structure of an epan_t outside epan/epan.c; get rid of epan/epan-int.h. Change-Id: I381b88993aa19e55720ce02c42ad33738e3f51f4 Reviewed-on: https://code.wireshark.org/review/24732 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08 04:33:22 +00:00
#include <wsutil/nstime.h>
Refactor our logging and extend the wslog API Experience has shown that: 1. The current logging methods are not very reliable or practical. A logging bitmask makes little sense as the user-facing interface (who would want debug but not crtical messages for example?); it's computer-friendly and user-unfriendly. More importantly the console log level preference is initialized too late in the startup process to be used for the logging subsystem and that fact raises a number of annoying and hard-to-fix usability issues. 2. Coding around G_MESSAGES_DEBUG to comply with our log level mask and not clobber the user's settings or not create unexpected log misses is unworkable and generally follows the principle of most surprise. The fact that G_MESSAGES_DEBUG="all" can leak to other programs using GLib is also annoying. 3. The non-structured GLib logging API is very opinionated and lacks configurability beyond replacing the log handler. 4. Windows GUI has some special code to attach to a console, but it would be nice to abstract away the rest under a single interface. 5. Using this logger seems to be noticeably faster. Deprecate the console log level preference and extend our API to implement a log handler in wsutil/wslog.h to provide easy-to-use, flexible and dependable logging during all execution phases. Log levels have a hierarchy, from most verbose to least verbose (debug to error). When a given level is set everything above that is also enabled. The log level can be set with an environment variable or a command line option (parsed as soon as possible but still later than the environment). The default log level is "message". Dissector logging is not included because it is not clear what log domain they should use. An explosion to thousands of domains is not desirable and putting everything in a single domain is probably too coarse and noisy. For now I think it makes sense to let them do their own thing using g_log_default_handler() and continue using the G_MESSAGES_DEBUG mechanism with specific domains for each individual dissector. In the future a mechanism may be added to selectively enable these domains at runtime while trying to avoid the problems introduced by G_MESSAGES_DEBUG.
2021-06-08 01:46:52 +00:00
#include <wsutil/wslog.h>
Replace g_assert() with ws_assert()
2021-06-18 18:21:42 +00:00
#include <wsutil/ws_assert.h>
Hand the packet provider functions to epan_new(). Have separate packet_provider_data structures and packet_provider_funcs structures; the latter holds a table of functions that libwireshark can call for information about packets, the latter holds the data that those functions use. This means we no longer need to expose the structure of an epan_t outside epan/epan.c; get rid of epan/epan-int.h. Change-Id: I381b88993aa19e55720ce02c42ad33738e3f51f4 Reviewed-on: https://code.wireshark.org/review/24732 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08 04:33:22 +00:00
First step in moving core Ethereal routines to libepan. svn path=/trunk/; revision=2458
2000-09-27 04:55:05 +00:00
#include "conversation.h"
#include "except.h"
Implement epan_dissect_new() and epan_dissect_free(). These are the "top-level" dissectors that libepan-users call, instead of dissect_packet(). The epan_dissect_t holds the tvbuff after dissection so that the tvbuff's memory is not cleared until after the proto_tree is freed. (I might stuff the proto_tree into the epan_dissect_t, too). What remains of dissect_packet() in packet.c handles the tvbuff initialiation. The real meat of dissect_packet() is now in dissect_frame(), in packet-frame.c This means that "packet.c" is no longer a dissector, os it is no longer passed to make-reg-dotc. Once dissect_fddi() gets two wrapper functions (dissect_fddi_swapped() and dissect_fddi_nonswapped()), the a dissector handoff routine could be used instead of the switch statement in dissect_frame(). I'd register a field like "wtap.encap" svn path=/trunk/; revision=2478
2000-10-06 10:11:40 +00:00
#include "packet.h"
Next few improvements to speed up startup about 10%. - use GTree instead of GList for preference module lists svn path=/trunk/; revision=23679
2007-11-30 09:22:01 +00:00
#include "prefs.h"
Provide for per-protocol-tree data in the proto_tree code. Put a hash-table of "interesting" fields in the per-proto-tree data. The dfilter code records which fields/protocols are "interesting" (by which I mean, their value or existence is checked). Thus, the proto_tree routines can create special arrays of field_info*'s that are ready for the dfilter engine to use during a filter operation. Also store the "proto_tree_is_visible" boolean, renamed "visible", in the per-proto-tree data. Move epan_dissect_t to its own header file to make #include dependencies easier to handle. Provide epan_dissect_fill_in_columns(), which accepts just the epan_dissect_t* as an argument. epan_dissect_new() needs to be followed by epan_dissect_run() for the dissection to actually take place. Between those two calls, epan_dissect_prime_dfilter() can be run 0, 1, or multiple times in order to prime the empty proto_tree with the "intersesting" fields from the dfilter_t. svn path=/trunk/; revision=4422
2001-12-18 19:09:08 +00:00
#include "column-utils.h"
Move the tap infrastructure to the epan directory. svn path=/trunk/; revision=12128
2004-09-29 00:06:36 +00:00
#include "tap.h"
From Albert Chin: rename resolv.{ch} to addr_resolv.{ch}, so that an include of <resolv.h> in any system header file gets the system <resolv.h> (needed for builds on Tru64 with GTK+ 1.2[.x]). svn path=/trunk/; revision=11615
2004-08-06 19:57:49 +00:00
#include "addr_resolv.h"
get users of oid_resolv to use the new oids, rollout packet-snmp.c svn path=/trunk/; revision=22651
2007-08-25 01:14:24 +00:00
#include "oids.h"
Move epan/wmem/wmem_scopes.h to epan/ This header was installed incorrectly to epan/wmem_scopes.h. Instead of creating additional installation rules for a single header in a subfolder (kept for backward compatibility) just rename the standard "epan/wmem/wmem.h" include to "epan/wmem_scopes.h" and fix the documentation. Now the header is installed *correctly* to epan/wmem_scopes.h.
2021-07-26 00:31:17 +00:00
#include <epan/wmem_scopes.h>
I'm adding the "Expert Info" prototype now, as it seems to be in a state where others might have a look and probably already find it useful :-). Anyway, we can easily disable it at one or two places in the code if it get's in our way of a new release. Please see: http://wiki.ethereal.com/Development/ExpertInfo for a complete overview of the intended feature and it's current state of implementation. While I'm working on this, I've also added some more status result codes to the DCE/RPC and DCOM dissectors. svn path=/trunk/; revision=15754
2005-09-11 16:55:34 +00:00
#include "expert.h"
Reduce epan dependence on dissectors by having print module "cache" the protocol and field ids that it needs. Change-Id: I4ec48067e9ca2cbe88e1cf2e6c9dc1e382379221 Reviewed-on: https://code.wireshark.org/review/7767 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-20 00:59:42 +00:00
#include "print.h"
Create a way to register "capture" dissectors. Capture dissectors could be architected like dissection dissectors, with tables and subtables and possibly using tvbs to pass there data instead of raw byte arrays. This is a first step towards that by refactoring capture_info_packet() to work off of a "capture dissector table" Registering the capture dissection functions instead of calling them directly also clears up a bunch of dissector header files who sole purpose was providing the capture dissection function definition. Change-Id: I10e9b79e061f32d2572f009823601d4f048d37aa Reviewed-on: https://code.wireshark.org/review/12581 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-13 04:38:21 +00:00
#include "capture_dissectors.h"
Convert AT_SS7PC to a "dissector address type" The formatting of the address type is determined by a preference in packet-mtp3.c, so just make MTP3 register the address type. Use address_type_get_by_name in other dissectors (and export_pdu) to use the address type. Change-Id: Ifb32d7de27aeaa23cee8e803e25ffb3c905547b5 Reviewed-on: https://code.wireshark.org/review/15856 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-12 16:28:02 +00:00
#include "exported_pdu.h"
exported_object: add cleanup function. Change-Id: If4c35d18db1dc982e981004838e0eabbf4479e78 Reviewed-on: https://code.wireshark.org/review/19653 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-16 21:08:12 +00:00
#include "export_object.h"
stat_tap_ui: add cleanup function. Change-Id: I0275a6e0d5d151f086d96c6388b9fa647ea0085c Reviewed-on: https://code.wireshark.org/review/19654 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-01-16 21:41:53 +00:00
#include "stat_tap_ui.h"
follow-stream: add cleanup function. Change-Id: Icfe7de118bc49da57f537601c2f256e4a028b4e2 Reviewed-on: https://code.wireshark.org/review/19680 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-19 20:57:08 +00:00
#include "follow.h"
disabled_protos: add cleanup function. Change-Id: I7d585404463691946e2aa67e14e53edb813d9be8 Reviewed-on: https://code.wireshark.org/review/19681 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-01-19 21:32:51 +00:00
#include "disabled_protos.h"
decode_as: clean memory on exit. Change-Id: Ifbbfc1ff71c32c2e9b758b55d32bff9a1ccd1576 Reviewed-on: https://code.wireshark.org/review/19689 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 09:30:59 +00:00
#include "decode_as.h"
epan: Rename dissector_filters.c to conversation_filter.c For the same reason as in g89c9d909. Change-Id: I5e344ebdf8ba05d169484aa32b409d84edc6124f Reviewed-on: https://code.wireshark.org/review/34943 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-04 09:42:29 +00:00
#include "conversation_filter.h"
conversation_table: add cleanup function. Change-Id: Icea963384c16b1ad5387a885219d0621b470181b Reviewed-on: https://code.wireshark.org/review/19699 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 13:52:05 +00:00
#include "conversation_table.h"
reassemble: add cleanup routine. Change-Id: I948d342a29aacc2212076359e5b073113c50c5de Reviewed-on: https://code.wireshark.org/review/19697 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 16:02:52 +00:00
#include "reassemble.h"
srt_table: add cleanup function. Change-Id: I8d1e9d587f7d47a9064d7b2e0c89f31dc41854ea Reviewed-on: https://code.wireshark.org/review/19946 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-03 22:49:27 +00:00
#include "srt_table.h"
stats_tree: add cleanup function. Change-Id: Iefd264bdd79af172c245c3a30119999cca9d56c0 Reviewed-on: https://code.wireshark.org/review/19976 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-05 22:00:51 +00:00
#include "stats_tree.h"
Add new Secrets API and allow TLS to use pcapng decryption secrets Add a new secrets API to the core, one that can outlive the lifetime of a single capture file. Expose decryption secrets from wiretap through a callback and let the secrets API route it to a dissector. Bug: 15252 Change-Id: Ie2f1867bdfd265bad11fc58f1e8d8e7295c0d1e7 Reviewed-on: https://code.wireshark.org/review/30705 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-18 17:11:42 +00:00
#include "secrets.h"
epan: add missing include. Fix broken compilation on fedora28. Change-Id: Ib2c4ec3b2437bab0b8bf35e8a3c8072cf1c0f996 Reviewed-on: https://code.wireshark.org/review/31772 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Vasil Velichkov <vvvelichkov@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2019-01-28 12:50:24 +00:00
#include "funnel.h"
COSE dissector from dtn-wireshark project
2021-05-11 03:50:41 +00:00
#include "wscbor.h"
dtd: free memory on shutdown. Change-Id: I502e505730b9310066563bfd9c8df9fceddd0301 Reviewed-on: https://code.wireshark.org/review/20229 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-21 15:37:29 +00:00
#include <dtd.h>
First step in moving core Ethereal routines to libepan. svn path=/trunk/; revision=2458
2000-09-27 04:55:05 +00:00
Add new plugin type for libwireshark Allow epan itself to be extended by plugins. Adds the following new plugin interfaces: void plugin_epan_init() void plugin_epan_dissect_init(epan_dissect_t *) void plugin_epan_dissect_cleanup(epan_dissect_t *) void plugin_epan_cleanup() void plugin_epan_register_all_protocols(register_cb, gointer) [OPTIONAL] void plugin_epan_register_all_handoffs(register_cb, gointer) [OPTIONAL] Any one of these can be an empty function but the first four must be present. The motivation for the change is a better way to implement a language binding other than registering a fake protocol and stuffing everything into a single dissector call (and maybe require an extra packet_info field) but I expect there would be other interesting use cases. Change-Id: I215d50750ac7561fe25fdcdcfbc6a3f351984785 Reviewed-on: https://code.wireshark.org/review/24813 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-08-29 14:34:31 +00:00
#ifdef HAVE_PLUGINS
#include <wsutil/plugins.h>
#endif
From Tony Trinh: Update Lua from 5.1 to 5.2 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400 svn path=/trunk/; revision=43482
2012-06-25 20:42:07 +00:00
#ifdef HAVE_LUA
Move the code to get version information for libraries used by libwireshark into libwireshark, and call it only in programs linked with libwireshark. That way, programs that don't link with libwireshark don't have to link with libgcrypt or libgnutls solely so that they can say that they're linked with a particular version of libgcrypt or libgnutls. Don't link dumpcap with libgcrypt or libgnutls any more. svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
#include <lua.h>
#include <wslua/wslua.h>
#endif
#ifdef HAVE_LIBSMI
#include <smi.h>
#endif
epan: Add c-ares version
2021-05-25 14:06:42 +00:00
#include <ares.h>
Move the Lua interface into epan... (not a plugin anymore). - Rename Tap into Listener - add a mechanism to pass protocols' tap data to the Listener svn path=/trunk/; revision=19319
2006-09-25 01:09:00 +00:00
Add version info for lz4, zstd, maxmind This simply implements the patches given in a comment on bug 16270. <https://gitlab.com/wireshark/wireshark/-/issues/16270#note_400748726>
2021-05-17 12:18:10 +00:00
#ifdef HAVE_LZ4
#include <lz4.h>
#endif
#ifdef HAVE_ZSTD
#include <zstd.h>
#endif
Remove nghttp2 code and use system' nghttp2 Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-26 13:18:29 +00:00
#ifdef HAVE_NGHTTP2
epan: Add nghttp2 version
2021-05-25 13:50:07 +00:00
#include <nghttp2/nghttp2.h>
Remove nghttp2 code and use system' nghttp2 Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-26 13:18:29 +00:00
#endif
Add brotli decompression support for HTTP and HTTP2 dissectors. Change-Id: I9c09f55673187f6fee723fcd72798fb6b9958b03 Reviewed-on: https://code.wireshark.org/review/32745 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-10 10:52:52 +00:00
#ifdef HAVE_BROTLI
#include <brotli/decode.h>
#endif
Add libxml2 as optional dependency This can be used by dissectors that need to parse out-of-band configuration. Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783 Reviewed-on: https://code.wireshark.org/review/20912 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-04-04 21:23:59 +00:00
#ifdef HAVE_LIBXML2
#include <libxml/xmlversion.h>
#include <libxml/parser.h>
#endif
epan: Ignore SIGPIPE. We need to ignore SIGPIPE whenever we use maxmind_db. Do so in epan_init. Ping-Bug: 14494 Change-Id: I4372935e371a94c02a79050d59b2e3ee1ba04fee Reviewed-on: https://code.wireshark.org/review/26369 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-08 17:32:51 +00:00
#ifndef _WIN32
#include <signal.h>
#endif
epan: Remove unnecessary all protocols registration callback We are exporting a registration function from libwireshark just to have it passed back as a callback. Seems unnecessary. Change-Id: I7621005c9be11691d319102326824c5e3520a6f3 Reviewed-on: https://code.wireshark.org/review/29328 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-28 20:39:55 +00:00
static GSList *epan_plugin_register_all_procotols = NULL;
static GSList *epan_plugin_register_all_handoffs = NULL;
Add new plugin type for libwireshark Allow epan itself to be extended by plugins. Adds the following new plugin interfaces: void plugin_epan_init() void plugin_epan_dissect_init(epan_dissect_t *) void plugin_epan_dissect_cleanup(epan_dissect_t *) void plugin_epan_cleanup() void plugin_epan_register_all_protocols(register_cb, gointer) [OPTIONAL] void plugin_epan_register_all_handoffs(register_cb, gointer) [OPTIONAL] Any one of these can be an empty function but the first four must be present. The motivation for the change is a better way to implement a language binding other than registering a fake protocol and stuffing everything into a single dissector call (and maybe require an extra packet_info field) but I expect there would be other interesting use cases. Change-Id: I215d50750ac7561fe25fdcdcfbc6a3f351984785 Reviewed-on: https://code.wireshark.org/review/24813 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-08-29 14:34:31 +00:00
Effectively remove the tree memory pool and port some of its behaviour to the pinfo memory pool, they have exactly the same scope. Simplification and minor performance win (one GHashTable we longer have to create/destroy on every packet). svn path=/trunk/; revision=53076
2013-11-04 14:12:59 +00:00
static wmem_allocator_t *pinfo_pool_cache = NULL;
Load environment vars to globals for efficency. These environment variables are read very frequently, read them once to globals for performance improvment. Change-Id: I4f05a5edca85b370674cc5f85fce40bd1af695cb Reviewed-on: https://code.wireshark.org/review/34449 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-09-04 11:51:29 +00:00
/* Global variables holding the content of the corresponding environment variable
* to save fetching it repeatedly.
*/
gboolean wireshark_abort_on_dissector_bug = FALSE;
gboolean wireshark_abort_on_too_many_items = FALSE;
Refactor plugin registration and loading Put different types of plugins (libwiretap, libwireshark) in different subdirectories, give libwiretap and libwireshark init routines that load the plugins, and have them scan the appropriate subdirectories so that we don't even *try* to, for example, load libwireshark plugins in programs that only use libwiretap. Compiled plugins are stored in subfolders of the plugin folders, with the subfolder name being the Wireshark minor version number (X.Y). There is another hierarchical level for each Wireshark library (libwireshark, libwscodecs and libwiretap). The folder names are respectively plugins/X.Y/{epan,codecs,wiretap}. Currently we only distribute "epan" (libwireshark) plugins. Change-Id: I3438787a6f45820d64ba4ca91cbe3c8864708acb Reviewed-on: https://code.wireshark.org/review/23983 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-09-30 23:56:03 +00:00
#ifdef HAVE_PLUGINS
Avoid exposing HAVE_PLUGINS in the public API Instead *_register_plugin() is turned into a noop (with a warning). The test suit is failing with ENABLE_PLUGINS=Off (it was already failing before and this patch didn't affect that). Closes #17202.
2021-02-06 16:35:51 +00:00
/* Used for bookkeeping, includes all libwireshark plugin types (dissector, tap, epan). */
static plugins_t *libwireshark_plugins = NULL;
Refactor plugin registration and loading Put different types of plugins (libwiretap, libwireshark) in different subdirectories, give libwiretap and libwireshark init routines that load the plugins, and have them scan the appropriate subdirectories so that we don't even *try* to, for example, load libwireshark plugins in programs that only use libwiretap. Compiled plugins are stored in subfolders of the plugin folders, with the subfolder name being the Wireshark minor version number (X.Y). There is another hierarchical level for each Wireshark library (libwireshark, libwscodecs and libwiretap). The folder names are respectively plugins/X.Y/{epan,codecs,wiretap}. Currently we only distribute "epan" (libwireshark) plugins. Change-Id: I3438787a6f45820d64ba4ca91cbe3c8864708acb Reviewed-on: https://code.wireshark.org/review/23983 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-09-30 23:56:03 +00:00
#endif
Avoid exposing HAVE_PLUGINS in the public API Instead *_register_plugin() is turned into a noop (with a warning). The test suit is failing with ENABLE_PLUGINS=Off (it was already failing before and this patch didn't affect that). Closes #17202.
2021-02-06 16:35:51 +00:00
/* "epan_plugins" are a specific type of libwireshark plugin (the name isn't the best for clarity). */
static GSList *epan_plugins = NULL;
Constify a return value, to squelch a compiler warning. svn path=/trunk/; revision=37680
2011-06-16 07:27:48 +00:00
const gchar*
new function epan_get_version() svn path=/trunk/; revision=18450
2006-06-13 08:18:50 +00:00
epan_get_version(void) {
Constify a return value, to squelch a compiler warning. svn path=/trunk/; revision=37680
2011-06-16 07:27:48 +00:00
return VERSION;
new function epan_get_version() svn path=/trunk/; revision=18450
2006-06-13 08:18:50 +00:00
}
Add function to return version number at run-time For use by plugins using libwireshark to check compatibility. Change-Id: I66a9d41644da7efce01cbed30d2a1f76fbc3754d Reviewed-on: https://code.wireshark.org/review/23378 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-03 14:03:31 +00:00
void
epan_get_version_number(int *major, int *minor, int *micro)
{
epan: Remove dependency on version_info object library Dependending on version_info is unnecessary and forces an epan rebuild every time the git commit id changes, which can be slow, especially with LTO enabled, and again is unnecessary. Printing the VCS version to the TLS debug log is a minor convenience that doesn't justify the cost to relink epan with every commit.
2021-07-03 11:26:26 +00:00
if (major)
*major = VERSION_MAJOR;
if (minor)
*minor = VERSION_MINOR;
if (micro)
*micro = VERSION_MICRO;
Add function to return version number at run-time For use by plugins using libwireshark to check compatibility. Change-Id: I66a9d41644da7efce01cbed30d2a1f76fbc3754d Reviewed-on: https://code.wireshark.org/review/23378 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-03 14:03:31 +00:00
}
Make Libgcrypt a mandatory dependency Removed all guards for HAVE_LIBGCRYPT, change autotools and CMake to error out if it is not available. Update release notes, developer documentation and README with the new status. Clarify relation with GnuTLS in macosx-setup.sh. Install Libgcrypt via brew script. Motivation for this change is that many dissectors depend on Libgcrypt and having it optional increases the maintenance burden (there have been several compile issues in the past due to the optional status). Furthermore, wsutil has crypto code that can be replaced by Libgcrypt. Change-Id: Idf0021b8c4cd5db70b8766f7dcc2a8b3acbf042f Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html Reviewed-on: https://code.wireshark.org/review/20030 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: Peter Wu <peter@lekensteyn.nl>
2017-02-09 14:00:19 +00:00
#if defined(_WIN32)
Set a Libgcrypt log handler on Windows. Libgcrypt prints all log messages to stderr by default. On Windows the slow_gatherer routine logs NOTE: you should run 'diskperf -y' to enable the disk statistics if DeviceIoControl(..., IOCTL_DISK_PERFORMANCE, ...) fails. We don't depend on cryptographically secure random numbers and the message is needlessly confusing. Add a log handler that ignores less-severe messages. Change-Id: If40a691ea380364457dfdf126b9bf33ac2672d3a Reviewed-on: https://code.wireshark.org/review/19155 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-08 23:16:00 +00:00
// Libgcrypt prints all log messages to stderr by default. This is noisier
// than we would like on Windows. In particular slow_gatherer tends to print
// "NOTE: you should run 'diskperf -y' to enable the disk statistics"
// which we don't care about.
static void
quiet_gcrypt_logger (void *dummy _U_, int level, const char *format, va_list args)
{
Refactor our logging and extend the wslog API Experience has shown that: 1. The current logging methods are not very reliable or practical. A logging bitmask makes little sense as the user-facing interface (who would want debug but not crtical messages for example?); it's computer-friendly and user-unfriendly. More importantly the console log level preference is initialized too late in the startup process to be used for the logging subsystem and that fact raises a number of annoying and hard-to-fix usability issues. 2. Coding around G_MESSAGES_DEBUG to comply with our log level mask and not clobber the user's settings or not create unexpected log misses is unworkable and generally follows the principle of most surprise. The fact that G_MESSAGES_DEBUG="all" can leak to other programs using GLib is also annoying. 3. The non-structured GLib logging API is very opinionated and lacks configurability beyond replacing the log handler. 4. Windows GUI has some special code to attach to a console, but it would be nice to abstract away the rest under a single interface. 5. Using this logger seems to be noticeably faster. Deprecate the console log level preference and extend our API to implement a log handler in wsutil/wslog.h to provide easy-to-use, flexible and dependable logging during all execution phases. Log levels have a hierarchy, from most verbose to least verbose (debug to error). When a given level is set everything above that is also enabled. The log level can be set with an environment variable or a command line option (parsed as soon as possible but still later than the environment). The default log level is "message". Dissector logging is not included because it is not clear what log domain they should use. An explosion to thousands of domains is not desirable and putting everything in a single domain is probably too coarse and noisy. For now I think it makes sense to let them do their own thing using g_log_default_handler() and continue using the G_MESSAGES_DEBUG mechanism with specific domains for each individual dissector. In the future a mechanism may be added to selectively enable these domains at runtime while trying to avoid the problems introduced by G_MESSAGES_DEBUG.
2021-06-08 01:46:52 +00:00
enum ws_log_level log_level;
Set a Libgcrypt log handler on Windows. Libgcrypt prints all log messages to stderr by default. On Windows the slow_gatherer routine logs NOTE: you should run 'diskperf -y' to enable the disk statistics if DeviceIoControl(..., IOCTL_DISK_PERFORMANCE, ...) fails. We don't depend on cryptographically secure random numbers and the message is needlessly confusing. Add a log handler that ignores less-severe messages. Change-Id: If40a691ea380364457dfdf126b9bf33ac2672d3a Reviewed-on: https://code.wireshark.org/review/19155 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-08 23:16:00 +00:00
switch (level) {
case GCRY_LOG_CONT: // Continuation. Ignore for now.
case GCRY_LOG_DEBUG:
case GCRY_LOG_INFO:
return;
Refactor our logging and extend the wslog API Experience has shown that: 1. The current logging methods are not very reliable or practical. A logging bitmask makes little sense as the user-facing interface (who would want debug but not crtical messages for example?); it's computer-friendly and user-unfriendly. More importantly the console log level preference is initialized too late in the startup process to be used for the logging subsystem and that fact raises a number of annoying and hard-to-fix usability issues. 2. Coding around G_MESSAGES_DEBUG to comply with our log level mask and not clobber the user's settings or not create unexpected log misses is unworkable and generally follows the principle of most surprise. The fact that G_MESSAGES_DEBUG="all" can leak to other programs using GLib is also annoying. 3. The non-structured GLib logging API is very opinionated and lacks configurability beyond replacing the log handler. 4. Windows GUI has some special code to attach to a console, but it would be nice to abstract away the rest under a single interface. 5. Using this logger seems to be noticeably faster. Deprecate the console log level preference and extend our API to implement a log handler in wsutil/wslog.h to provide easy-to-use, flexible and dependable logging during all execution phases. Log levels have a hierarchy, from most verbose to least verbose (debug to error). When a given level is set everything above that is also enabled. The log level can be set with an environment variable or a command line option (parsed as soon as possible but still later than the environment). The default log level is "message". Dissector logging is not included because it is not clear what log domain they should use. An explosion to thousands of domains is not desirable and putting everything in a single domain is probably too coarse and noisy. For now I think it makes sense to let them do their own thing using g_log_default_handler() and continue using the G_MESSAGES_DEBUG mechanism with specific domains for each individual dissector. In the future a mechanism may be added to selectively enable these domains at runtime while trying to avoid the problems introduced by G_MESSAGES_DEBUG.
2021-06-08 01:46:52 +00:00
break;
Set a Libgcrypt log handler on Windows. Libgcrypt prints all log messages to stderr by default. On Windows the slow_gatherer routine logs NOTE: you should run 'diskperf -y' to enable the disk statistics if DeviceIoControl(..., IOCTL_DISK_PERFORMANCE, ...) fails. We don't depend on cryptographically secure random numbers and the message is needlessly confusing. Add a log handler that ignores less-severe messages. Change-Id: If40a691ea380364457dfdf126b9bf33ac2672d3a Reviewed-on: https://code.wireshark.org/review/19155 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-08 23:16:00 +00:00
case GCRY_LOG_WARN:
case GCRY_LOG_BUG:
Refactor our logging and extend the wslog API Experience has shown that: 1. The current logging methods are not very reliable or practical. A logging bitmask makes little sense as the user-facing interface (who would want debug but not crtical messages for example?); it's computer-friendly and user-unfriendly. More importantly the console log level preference is initialized too late in the startup process to be used for the logging subsystem and that fact raises a number of annoying and hard-to-fix usability issues. 2. Coding around G_MESSAGES_DEBUG to comply with our log level mask and not clobber the user's settings or not create unexpected log misses is unworkable and generally follows the principle of most surprise. The fact that G_MESSAGES_DEBUG="all" can leak to other programs using GLib is also annoying. 3. The non-structured GLib logging API is very opinionated and lacks configurability beyond replacing the log handler. 4. Windows GUI has some special code to attach to a console, but it would be nice to abstract away the rest under a single interface. 5. Using this logger seems to be noticeably faster. Deprecate the console log level preference and extend our API to implement a log handler in wsutil/wslog.h to provide easy-to-use, flexible and dependable logging during all execution phases. Log levels have a hierarchy, from most verbose to least verbose (debug to error). When a given level is set everything above that is also enabled. The log level can be set with an environment variable or a command line option (parsed as soon as possible but still later than the environment). The default log level is "message". Dissector logging is not included because it is not clear what log domain they should use. An explosion to thousands of domains is not desirable and putting everything in a single domain is probably too coarse and noisy. For now I think it makes sense to let them do their own thing using g_log_default_handler() and continue using the G_MESSAGES_DEBUG mechanism with specific domains for each individual dissector. In the future a mechanism may be added to selectively enable these domains at runtime while trying to avoid the problems introduced by G_MESSAGES_DEBUG.
2021-06-08 01:46:52 +00:00
log_level = LOG_LEVEL_WARNING;
Set a Libgcrypt log handler on Windows. Libgcrypt prints all log messages to stderr by default. On Windows the slow_gatherer routine logs NOTE: you should run 'diskperf -y' to enable the disk statistics if DeviceIoControl(..., IOCTL_DISK_PERFORMANCE, ...) fails. We don't depend on cryptographically secure random numbers and the message is needlessly confusing. Add a log handler that ignores less-severe messages. Change-Id: If40a691ea380364457dfdf126b9bf33ac2672d3a Reviewed-on: https://code.wireshark.org/review/19155 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-08 23:16:00 +00:00
break;
case GCRY_LOG_ERROR:
Refactor our logging and extend the wslog API Experience has shown that: 1. The current logging methods are not very reliable or practical. A logging bitmask makes little sense as the user-facing interface (who would want debug but not crtical messages for example?); it's computer-friendly and user-unfriendly. More importantly the console log level preference is initialized too late in the startup process to be used for the logging subsystem and that fact raises a number of annoying and hard-to-fix usability issues. 2. Coding around G_MESSAGES_DEBUG to comply with our log level mask and not clobber the user's settings or not create unexpected log misses is unworkable and generally follows the principle of most surprise. The fact that G_MESSAGES_DEBUG="all" can leak to other programs using GLib is also annoying. 3. The non-structured GLib logging API is very opinionated and lacks configurability beyond replacing the log handler. 4. Windows GUI has some special code to attach to a console, but it would be nice to abstract away the rest under a single interface. 5. Using this logger seems to be noticeably faster. Deprecate the console log level preference and extend our API to implement a log handler in wsutil/wslog.h to provide easy-to-use, flexible and dependable logging during all execution phases. Log levels have a hierarchy, from most verbose to least verbose (debug to error). When a given level is set everything above that is also enabled. The log level can be set with an environment variable or a command line option (parsed as soon as possible but still later than the environment). The default log level is "message". Dissector logging is not included because it is not clear what log domain they should use. An explosion to thousands of domains is not desirable and putting everything in a single domain is probably too coarse and noisy. For now I think it makes sense to let them do their own thing using g_log_default_handler() and continue using the G_MESSAGES_DEBUG mechanism with specific domains for each individual dissector. In the future a mechanism may be added to selectively enable these domains at runtime while trying to avoid the problems introduced by G_MESSAGES_DEBUG.
2021-06-08 01:46:52 +00:00
log_level = LOG_LEVEL_ERROR;
Set a Libgcrypt log handler on Windows. Libgcrypt prints all log messages to stderr by default. On Windows the slow_gatherer routine logs NOTE: you should run 'diskperf -y' to enable the disk statistics if DeviceIoControl(..., IOCTL_DISK_PERFORMANCE, ...) fails. We don't depend on cryptographically secure random numbers and the message is needlessly confusing. Add a log handler that ignores less-severe messages. Change-Id: If40a691ea380364457dfdf126b9bf33ac2672d3a Reviewed-on: https://code.wireshark.org/review/19155 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-08 23:16:00 +00:00
break;
case GCRY_LOG_FATAL:
Refactor our logging and extend the wslog API Experience has shown that: 1. The current logging methods are not very reliable or practical. A logging bitmask makes little sense as the user-facing interface (who would want debug but not crtical messages for example?); it's computer-friendly and user-unfriendly. More importantly the console log level preference is initialized too late in the startup process to be used for the logging subsystem and that fact raises a number of annoying and hard-to-fix usability issues. 2. Coding around G_MESSAGES_DEBUG to comply with our log level mask and not clobber the user's settings or not create unexpected log misses is unworkable and generally follows the principle of most surprise. The fact that G_MESSAGES_DEBUG="all" can leak to other programs using GLib is also annoying. 3. The non-structured GLib logging API is very opinionated and lacks configurability beyond replacing the log handler. 4. Windows GUI has some special code to attach to a console, but it would be nice to abstract away the rest under a single interface. 5. Using this logger seems to be noticeably faster. Deprecate the console log level preference and extend our API to implement a log handler in wsutil/wslog.h to provide easy-to-use, flexible and dependable logging during all execution phases. Log levels have a hierarchy, from most verbose to least verbose (debug to error). When a given level is set everything above that is also enabled. The log level can be set with an environment variable or a command line option (parsed as soon as possible but still later than the environment). The default log level is "message". Dissector logging is not included because it is not clear what log domain they should use. An explosion to thousands of domains is not desirable and putting everything in a single domain is probably too coarse and noisy. For now I think it makes sense to let them do their own thing using g_log_default_handler() and continue using the G_MESSAGES_DEBUG mechanism with specific domains for each individual dissector. In the future a mechanism may be added to selectively enable these domains at runtime while trying to avoid the problems introduced by G_MESSAGES_DEBUG.
2021-06-08 01:46:52 +00:00
log_level = LOG_LEVEL_CRITICAL;
Set a Libgcrypt log handler on Windows. Libgcrypt prints all log messages to stderr by default. On Windows the slow_gatherer routine logs NOTE: you should run 'diskperf -y' to enable the disk statistics if DeviceIoControl(..., IOCTL_DISK_PERFORMANCE, ...) fails. We don't depend on cryptographically secure random numbers and the message is needlessly confusing. Add a log handler that ignores less-severe messages. Change-Id: If40a691ea380364457dfdf126b9bf33ac2672d3a Reviewed-on: https://code.wireshark.org/review/19155 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-08 23:16:00 +00:00
break;
Refactor our logging and extend the wslog API Experience has shown that: 1. The current logging methods are not very reliable or practical. A logging bitmask makes little sense as the user-facing interface (who would want debug but not crtical messages for example?); it's computer-friendly and user-unfriendly. More importantly the console log level preference is initialized too late in the startup process to be used for the logging subsystem and that fact raises a number of annoying and hard-to-fix usability issues. 2. Coding around G_MESSAGES_DEBUG to comply with our log level mask and not clobber the user's settings or not create unexpected log misses is unworkable and generally follows the principle of most surprise. The fact that G_MESSAGES_DEBUG="all" can leak to other programs using GLib is also annoying. 3. The non-structured GLib logging API is very opinionated and lacks configurability beyond replacing the log handler. 4. Windows GUI has some special code to attach to a console, but it would be nice to abstract away the rest under a single interface. 5. Using this logger seems to be noticeably faster. Deprecate the console log level preference and extend our API to implement a log handler in wsutil/wslog.h to provide easy-to-use, flexible and dependable logging during all execution phases. Log levels have a hierarchy, from most verbose to least verbose (debug to error). When a given level is set everything above that is also enabled. The log level can be set with an environment variable or a command line option (parsed as soon as possible but still later than the environment). The default log level is "message". Dissector logging is not included because it is not clear what log domain they should use. An explosion to thousands of domains is not desirable and putting everything in a single domain is probably too coarse and noisy. For now I think it makes sense to let them do their own thing using g_log_default_handler() and continue using the G_MESSAGES_DEBUG mechanism with specific domains for each individual dissector. In the future a mechanism may be added to selectively enable these domains at runtime while trying to avoid the problems introduced by G_MESSAGES_DEBUG.
2021-06-08 01:46:52 +00:00
default:
return;
Set a Libgcrypt log handler on Windows. Libgcrypt prints all log messages to stderr by default. On Windows the slow_gatherer routine logs NOTE: you should run 'diskperf -y' to enable the disk statistics if DeviceIoControl(..., IOCTL_DISK_PERFORMANCE, ...) fails. We don't depend on cryptographically secure random numbers and the message is needlessly confusing. Add a log handler that ignores less-severe messages. Change-Id: If40a691ea380364457dfdf126b9bf33ac2672d3a Reviewed-on: https://code.wireshark.org/review/19155 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-08 23:16:00 +00:00
}
Refactor our logging and extend the wslog API Experience has shown that: 1. The current logging methods are not very reliable or practical. A logging bitmask makes little sense as the user-facing interface (who would want debug but not crtical messages for example?); it's computer-friendly and user-unfriendly. More importantly the console log level preference is initialized too late in the startup process to be used for the logging subsystem and that fact raises a number of annoying and hard-to-fix usability issues. 2. Coding around G_MESSAGES_DEBUG to comply with our log level mask and not clobber the user's settings or not create unexpected log misses is unworkable and generally follows the principle of most surprise. The fact that G_MESSAGES_DEBUG="all" can leak to other programs using GLib is also annoying. 3. The non-structured GLib logging API is very opinionated and lacks configurability beyond replacing the log handler. 4. Windows GUI has some special code to attach to a console, but it would be nice to abstract away the rest under a single interface. 5. Using this logger seems to be noticeably faster. Deprecate the console log level preference and extend our API to implement a log handler in wsutil/wslog.h to provide easy-to-use, flexible and dependable logging during all execution phases. Log levels have a hierarchy, from most verbose to least verbose (debug to error). When a given level is set everything above that is also enabled. The log level can be set with an environment variable or a command line option (parsed as soon as possible but still later than the environment). The default log level is "message". Dissector logging is not included because it is not clear what log domain they should use. An explosion to thousands of domains is not desirable and putting everything in a single domain is probably too coarse and noisy. For now I think it makes sense to let them do their own thing using g_log_default_handler() and continue using the G_MESSAGES_DEBUG mechanism with specific domains for each individual dissector. In the future a mechanism may be added to selectively enable these domains at runtime while trying to avoid the problems introduced by G_MESSAGES_DEBUG.
2021-06-08 01:46:52 +00:00
ws_logv(LOG_DOMAIN_EPAN, log_level, format, args);
Set a Libgcrypt log handler on Windows. Libgcrypt prints all log messages to stderr by default. On Windows the slow_gatherer routine logs NOTE: you should run 'diskperf -y' to enable the disk statistics if DeviceIoControl(..., IOCTL_DISK_PERFORMANCE, ...) fails. We don't depend on cryptographically secure random numbers and the message is needlessly confusing. Add a log handler that ignores less-severe messages. Change-Id: If40a691ea380364457dfdf126b9bf33ac2672d3a Reviewed-on: https://code.wireshark.org/review/19155 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-08 23:16:00 +00:00
}
Make Libgcrypt a mandatory dependency Removed all guards for HAVE_LIBGCRYPT, change autotools and CMake to error out if it is not available. Update release notes, developer documentation and README with the new status. Clarify relation with GnuTLS in macosx-setup.sh. Install Libgcrypt via brew script. Motivation for this change is that many dissectors depend on Libgcrypt and having it optional increases the maintenance burden (there have been several compile issues in the past due to the optional status). Furthermore, wsutil has crypto code that can be replaced by Libgcrypt. Change-Id: Idf0021b8c4cd5db70b8766f7dcc2a8b3acbf042f Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html Reviewed-on: https://code.wireshark.org/review/20030 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: Peter Wu <peter@lekensteyn.nl>
2017-02-09 14:00:19 +00:00
#endif // _WIN32
Set a Libgcrypt log handler on Windows. Libgcrypt prints all log messages to stderr by default. On Windows the slow_gatherer routine logs NOTE: you should run 'diskperf -y' to enable the disk statistics if DeviceIoControl(..., IOCTL_DISK_PERFORMANCE, ...) fails. We don't depend on cryptographically secure random numbers and the message is needlessly confusing. Add a log handler that ignores less-severe messages. Change-Id: If40a691ea380364457dfdf126b9bf33ac2672d3a Reviewed-on: https://code.wireshark.org/review/19155 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-08 23:16:00 +00:00
Add new plugin type for libwireshark Allow epan itself to be extended by plugins. Adds the following new plugin interfaces: void plugin_epan_init() void plugin_epan_dissect_init(epan_dissect_t *) void plugin_epan_dissect_cleanup(epan_dissect_t *) void plugin_epan_cleanup() void plugin_epan_register_all_protocols(register_cb, gointer) [OPTIONAL] void plugin_epan_register_all_handoffs(register_cb, gointer) [OPTIONAL] Any one of these can be an empty function but the first four must be present. The motivation for the change is a better way to implement a language binding other than registering a fake protocol and stuffing everything into a single dissector call (and maybe require an extra packet_info field) but I expect there would be other interesting use cases. Change-Id: I215d50750ac7561fe25fdcdcfbc6a3f351984785 Reviewed-on: https://code.wireshark.org/review/24813 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-08-29 14:34:31 +00:00
static void
epan_plugin_init(gpointer data, gpointer user_data _U_)
{
((epan_plugin *)data)->init();
}
static void
epan_plugin_dissect_init(gpointer data, gpointer user_data)
{
((epan_plugin *)data)->dissect_init((epan_dissect_t *)user_data);
}
static void
epan_plugin_dissect_cleanup(gpointer data, gpointer user_data)
{
((epan_plugin *)data)->dissect_cleanup((epan_dissect_t *)user_data);
}
static void
epan_plugin_cleanup(gpointer data, gpointer user_data _U_)
{
((epan_plugin *)data)->cleanup();
}
Avoid exposing HAVE_PLUGINS in the public API Instead *_register_plugin() is turned into a noop (with a warning). The test suit is failing with ENABLE_PLUGINS=Off (it was already failing before and this patch didn't affect that). Closes #17202.
2021-02-06 16:35:51 +00:00
#ifdef HAVE_PLUGINS
Add new plugin type for libwireshark Allow epan itself to be extended by plugins. Adds the following new plugin interfaces: void plugin_epan_init() void plugin_epan_dissect_init(epan_dissect_t *) void plugin_epan_dissect_cleanup(epan_dissect_t *) void plugin_epan_cleanup() void plugin_epan_register_all_protocols(register_cb, gointer) [OPTIONAL] void plugin_epan_register_all_handoffs(register_cb, gointer) [OPTIONAL] Any one of these can be an empty function but the first four must be present. The motivation for the change is a better way to implement a language binding other than registering a fake protocol and stuffing everything into a single dissector call (and maybe require an extra packet_info field) but I expect there would be other interesting use cases. Change-Id: I215d50750ac7561fe25fdcdcfbc6a3f351984785 Reviewed-on: https://code.wireshark.org/review/24813 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-08-29 14:34:31 +00:00
void epan_register_plugin(const epan_plugin *plug)
{
epan_plugins = g_slist_prepend(epan_plugins, (epan_plugin *)plug);
if (plug->register_all_protocols)
epan: Remove unnecessary all protocols registration callback We are exporting a registration function from libwireshark just to have it passed back as a callback. Seems unnecessary. Change-Id: I7621005c9be11691d319102326824c5e3520a6f3 Reviewed-on: https://code.wireshark.org/review/29328 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-28 20:39:55 +00:00
epan_plugin_register_all_procotols = g_slist_prepend(epan_plugin_register_all_procotols, plug->register_all_protocols);
Add new plugin type for libwireshark Allow epan itself to be extended by plugins. Adds the following new plugin interfaces: void plugin_epan_init() void plugin_epan_dissect_init(epan_dissect_t *) void plugin_epan_dissect_cleanup(epan_dissect_t *) void plugin_epan_cleanup() void plugin_epan_register_all_protocols(register_cb, gointer) [OPTIONAL] void plugin_epan_register_all_handoffs(register_cb, gointer) [OPTIONAL] Any one of these can be an empty function but the first four must be present. The motivation for the change is a better way to implement a language binding other than registering a fake protocol and stuffing everything into a single dissector call (and maybe require an extra packet_info field) but I expect there would be other interesting use cases. Change-Id: I215d50750ac7561fe25fdcdcfbc6a3f351984785 Reviewed-on: https://code.wireshark.org/review/24813 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-08-29 14:34:31 +00:00
if (plug->register_all_handoffs)
epan: Remove unnecessary all protocols registration callback We are exporting a registration function from libwireshark just to have it passed back as a callback. Seems unnecessary. Change-Id: I7621005c9be11691d319102326824c5e3520a6f3 Reviewed-on: https://code.wireshark.org/review/29328 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-28 20:39:55 +00:00
epan_plugin_register_all_handoffs = g_slist_prepend(epan_plugin_register_all_handoffs, plug->register_all_handoffs);
Add new plugin type for libwireshark Allow epan itself to be extended by plugins. Adds the following new plugin interfaces: void plugin_epan_init() void plugin_epan_dissect_init(epan_dissect_t *) void plugin_epan_dissect_cleanup(epan_dissect_t *) void plugin_epan_cleanup() void plugin_epan_register_all_protocols(register_cb, gointer) [OPTIONAL] void plugin_epan_register_all_handoffs(register_cb, gointer) [OPTIONAL] Any one of these can be an empty function but the first four must be present. The motivation for the change is a better way to implement a language binding other than registering a fake protocol and stuffing everything into a single dissector call (and maybe require an extra packet_info field) but I expect there would be other interesting use cases. Change-Id: I215d50750ac7561fe25fdcdcfbc6a3f351984785 Reviewed-on: https://code.wireshark.org/review/24813 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-08-29 14:34:31 +00:00
}
Avoid exposing HAVE_PLUGINS in the public API Instead *_register_plugin() is turned into a noop (with a warning). The test suit is failing with ENABLE_PLUGINS=Off (it was already failing before and this patch didn't affect that). Closes #17202.
2021-02-06 16:35:51 +00:00
#else /* HAVE_PLUGINS */
void epan_register_plugin(const epan_plugin *plug _U_)
{
Replace g_log() calls with ws_log()
2021-06-14 23:06:02 +00:00
ws_warning("epan_register_plugin: built without support for binary plugins");
Avoid exposing HAVE_PLUGINS in the public API Instead *_register_plugin() is turned into a noop (with a warning). The test suit is failing with ENABLE_PLUGINS=Off (it was already failing before and this patch didn't affect that). Closes #17202.
2021-02-06 16:35:51 +00:00
}
#endif /* HAVE_PLUGINS */
int epan_plugins_supported(void)
{
#ifdef HAVE_PLUGINS
return g_module_supported() ? 0 : 1;
#else
return -1;
#endif
}
Extend epan library plugins with a tap registration callback tap_register_plugin() is not sufficient for an extension language implementation because the epan plugin is initialized before proto_init(), therefore before dissectors have registered taps. Change-Id: Ief213f85ff4f7182f9af985e5f45476355cc2b86 Reviewed-on: https://code.wireshark.org/review/34048 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-07-18 09:28:04 +00:00
Avoid exposing HAVE_PLUGINS in the public API Instead *_register_plugin() is turned into a noop (with a warning). The test suit is failing with ENABLE_PLUGINS=Off (it was already failing before and this patch didn't affect that). Closes #17202.
2021-02-06 16:35:51 +00:00
static void epan_plugin_register_all_tap_listeners(gpointer data, gpointer user_data _U_)
Extend epan library plugins with a tap registration callback tap_register_plugin() is not sufficient for an extension language implementation because the epan plugin is initialized before proto_init(), therefore before dissectors have registered taps. Change-Id: Ief213f85ff4f7182f9af985e5f45476355cc2b86 Reviewed-on: https://code.wireshark.org/review/34048 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-07-18 09:28:04 +00:00
{
epan_plugin *plug = (epan_plugin *)data;
if (plug->register_all_tap_listeners)
plug->register_all_tap_listeners();
}
Add new plugin type for libwireshark Allow epan itself to be extended by plugins. Adds the following new plugin interfaces: void plugin_epan_init() void plugin_epan_dissect_init(epan_dissect_t *) void plugin_epan_dissect_cleanup(epan_dissect_t *) void plugin_epan_cleanup() void plugin_epan_register_all_protocols(register_cb, gointer) [OPTIONAL] void plugin_epan_register_all_handoffs(register_cb, gointer) [OPTIONAL] Any one of these can be an empty function but the first four must be present. The motivation for the change is a better way to implement a language binding other than registering a fake protocol and stuffing everything into a single dissector call (and maybe require an extra packet_info field) but I expect there would be other interesting use cases. Change-Id: I215d50750ac7561fe25fdcdcfbc6a3f351984785 Reviewed-on: https://code.wireshark.org/review/24813 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-08-29 14:34:31 +00:00
Catch REPORT_DISSECTOR_BUG() calls in dissector registration routines. Have epan_init() return a success/failure Boolean indication. Catch exceptions when calling the dissector registration routines and, if we get one, report the error and return a failure indication. If epan_init() fails, quit, but first make sure the reported error is displayed. Change-Id: I0300cbb1f66a5644f857a205235124909d684c50 Reviewed-on: https://code.wireshark.org/review/11340 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-28 00:41:23 +00:00
gboolean
epan: Add argument to epan_init() to disable plugins Change-Id: I8dc76e6bf8c4d5a3081cbdc1d47b88e857415d29 Reviewed-on: https://code.wireshark.org/review/29498 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-09-08 15:02:06 +00:00
epan_init(register_cb cb, gpointer client_data, gboolean load_plugins)
First step in moving core Ethereal routines to libepan. svn path=/trunk/; revision=2458
2000-09-27 04:55:05 +00:00
{
epan_init(): make 'status' volatile (to avoid might-be-clobbered warnings). Change-Id: Ic0f1c99a530089f21b08337379a5a0bc7f566b9c Reviewed-on: https://code.wireshark.org/review/11352 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-10-28 12:42:23 +00:00
volatile gboolean status = TRUE;
Catch REPORT_DISSECTOR_BUG() calls in dissector registration routines. Have epan_init() return a success/failure Boolean indication. Catch exceptions when calling the dissector registration routines and, if we get one, report the error and return a failure indication. If epan_init() fails, quit, but first make sure the reported error is displayed. Change-Id: I0300cbb1f66a5644f857a205235124909d684c50 Reviewed-on: https://code.wireshark.org/review/11340 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-28 00:41:23 +00:00
Load environment vars to globals for efficency. These environment variables are read very frequently, read them once to globals for performance improvment. Change-Id: I4f05a5edca85b370674cc5f85fce40bd1af695cb Reviewed-on: https://code.wireshark.org/review/34449 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-09-04 11:51:29 +00:00
/* Get the value of some environment variables and set corresponding globals for performance reasons*/
/* If the WIRESHARK_ABORT_ON_DISSECTOR_BUG environment variable is set,
* it will call abort(), instead, to make it easier to get a stack trace.
*/
if (getenv("WIRESHARK_ABORT_ON_DISSECTOR_BUG") != NULL) {
wireshark_abort_on_dissector_bug = TRUE;
} else {
wireshark_abort_on_dissector_bug = FALSE;
}
if (getenv("WIRESHARK_ABORT_ON_TOO_MANY_ITEMS") != NULL) {
wireshark_abort_on_too_many_items = TRUE;
} else {
wireshark_abort_on_too_many_items = FALSE;
}
Fix build and thread runtime compat with older GLib CentOS 6 ships with glib 2.28.8 which do not support g_ptr_array_new_full (make-taps/make-dissectors) and need to link with wsutil for glib-compat. g_thread_new was only introduced with GLib 2.32 (not 2.31), so adjust the check accordingly. Abort in case thread creation fails (as documented). Properly initialize threads or it will abort on runtime (this also requires linking epan with gthreads in CMake, autotools already includes it with GLIB_LIBS). Change-Id: Ie81d6df7b3b26aaa4eb25e23719a220755e2c13c Reviewed-on: https://code.wireshark.org/review/24978 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-24 11:59:47 +00:00
/*
* proto_init -> register_all_protocols -> g_async_queue_new which
* requires threads to be initialized. This happens automatically with
* GLib 2.32, before that g_thread_init must be called. But only since
* GLib 2.24, multiple invocations are allowed. Check for an earlier
* invocation just in case.
*/
emem is dead! Long live wmem! Change-Id: Iddd1200e62bf3200cb1a68408378dd9d47120b77 Reviewed-on: https://code.wireshark.org/review/6939 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-03 22:15:23 +00:00
/* initialize memory allocation subsystem */
Move wmem to wsutil This allows wmem to be used from other libraries, namely wsutil. It is often the case that a funtion exists in wsutil and cannot be used with a wmem scope, requiring some code duplication or extra memory allocations, or vice-versa, code in epan cannot be moved to wsutil because it has a wmem dependency. To this end wmem is moved to wsutil. Scope management remains part of epan because those scope semantics are specific to dissection.
2021-07-12 20:22:05 +00:00
wmem_init_scopes();
We also need the memory allocation subsystem initialized in anything that uses libwireshark. svn path=/trunk/; revision=19940
2006-11-21 00:30:36 +00:00
Call guids_init() in epan_init(), so anything that needs libwireshark - including dftest - will get the GUID table initialized (which anything that needs libwireshark needs to have happen, so dissectors can register GUIDs in that table). svn path=/trunk/; revision=19939
2006-11-21 00:16:44 +00:00
/* initialize the GUID to name mapping table */
guids_init();
EPAN: fix indent (use tab) Change-Id: I0545cf70decf923a3a042fa8c9dec3e60a861268 Reviewed-on: https://code.wireshark.org/review/11391 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28 14:38:39 +00:00
/* initialize name resolution (addr_resolv.c) */
addr_resolv_init();
Ensure we have both _initialize() and a corresponding _cleanup() routines for the various name resolvers; put those two routines next to each other. Add generic addr_resolv_init() and addr_resolv_cleanup() routines which call all of those internal routines. Call the generic init/cleanup routine from epan_init() and epan_cleanup(). Create the hash tables for each name resolver in those initialization routines in order to avoid having to repeatedly check if the table is already created or not (and to avoid glib warnings if we neglected to perform that check): http://www.wireshark.org/lists/wireshark-dev/201308/msg00012.html Don't clean up hostnames in init_dissection(): it's done already in cleanup_dissection(). Don't initialize hostnames in cleanup_dissection(): it's done already in init_dissection(). svn path=/trunk/; revision=51191
2013-08-07 16:46:08 +00:00
First step in moving core Ethereal routines to libepan. svn path=/trunk/; revision=2458
2000-09-27 04:55:05 +00:00
except_init();
Make Libgcrypt a mandatory dependency Removed all guards for HAVE_LIBGCRYPT, change autotools and CMake to error out if it is not available. Update release notes, developer documentation and README with the new status. Clarify relation with GnuTLS in macosx-setup.sh. Install Libgcrypt via brew script. Motivation for this change is that many dissectors depend on Libgcrypt and having it optional increases the maintenance burden (there have been several compile issues in the past due to the optional status). Furthermore, wsutil has crypto code that can be replaced by Libgcrypt. Change-Id: Idf0021b8c4cd5db70b8766f7dcc2a8b3acbf042f Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html Reviewed-on: https://code.wireshark.org/review/20030 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: Peter Wu <peter@lekensteyn.nl>
2017-02-09 14:00:19 +00:00
epan: Add argument to epan_init() to disable plugins Change-Id: I8dc76e6bf8c4d5a3081cbdc1d47b88e857415d29 Reviewed-on: https://code.wireshark.org/review/29498 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-09-08 15:02:06 +00:00
if (load_plugins) {
Refactor plugin registration and loading Put different types of plugins (libwiretap, libwireshark) in different subdirectories, give libwiretap and libwireshark init routines that load the plugins, and have them scan the appropriate subdirectories so that we don't even *try* to, for example, load libwireshark plugins in programs that only use libwiretap. Compiled plugins are stored in subfolders of the plugin folders, with the subfolder name being the Wireshark minor version number (X.Y). There is another hierarchical level for each Wireshark library (libwireshark, libwscodecs and libwiretap). The folder names are respectively plugins/X.Y/{epan,codecs,wiretap}. Currently we only distribute "epan" (libwireshark) plugins. Change-Id: I3438787a6f45820d64ba4ca91cbe3c8864708acb Reviewed-on: https://code.wireshark.org/review/23983 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-09-30 23:56:03 +00:00
#ifdef HAVE_PLUGINS
epan: Add argument to epan_init() to disable plugins Change-Id: I8dc76e6bf8c4d5a3081cbdc1d47b88e857415d29 Reviewed-on: https://code.wireshark.org/review/29498 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-09-08 15:02:06 +00:00
libwireshark_plugins = plugins_init(WS_PLUGIN_EPAN);
Refactor plugin registration and loading Put different types of plugins (libwiretap, libwireshark) in different subdirectories, give libwiretap and libwireshark init routines that load the plugins, and have them scan the appropriate subdirectories so that we don't even *try* to, for example, load libwireshark plugins in programs that only use libwiretap. Compiled plugins are stored in subfolders of the plugin folders, with the subfolder name being the Wireshark minor version number (X.Y). There is another hierarchical level for each Wireshark library (libwireshark, libwscodecs and libwiretap). The folder names are respectively plugins/X.Y/{epan,codecs,wiretap}. Currently we only distribute "epan" (libwireshark) plugins. Change-Id: I3438787a6f45820d64ba4ca91cbe3c8864708acb Reviewed-on: https://code.wireshark.org/review/23983 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-09-30 23:56:03 +00:00
#endif
epan: Add argument to epan_init() to disable plugins Change-Id: I8dc76e6bf8c4d5a3081cbdc1d47b88e857415d29 Reviewed-on: https://code.wireshark.org/review/29498 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-09-08 15:02:06 +00:00
}
Refactor plugin registration and loading Put different types of plugins (libwiretap, libwireshark) in different subdirectories, give libwiretap and libwireshark init routines that load the plugins, and have them scan the appropriate subdirectories so that we don't even *try* to, for example, load libwireshark plugins in programs that only use libwiretap. Compiled plugins are stored in subfolders of the plugin folders, with the subfolder name being the Wireshark minor version number (X.Y). There is another hierarchical level for each Wireshark library (libwireshark, libwscodecs and libwiretap). The folder names are respectively plugins/X.Y/{epan,codecs,wiretap}. Currently we only distribute "epan" (libwireshark) plugins. Change-Id: I3438787a6f45820d64ba4ca91cbe3c8864708acb Reviewed-on: https://code.wireshark.org/review/23983 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-09-30 23:56:03 +00:00
/* initialize libgcrypt (beware, it won't be thread-safe) */
From Bartosz Brachaczek: Make the SSL dissector work with GnuTLS compiled with nettle. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6869 #BACKPORT svn path=/trunk/; revision=45465
2012-10-11 08:28:57 +00:00
gcry_check_version(NULL);
Make Libgcrypt a mandatory dependency Removed all guards for HAVE_LIBGCRYPT, change autotools and CMake to error out if it is not available. Update release notes, developer documentation and README with the new status. Clarify relation with GnuTLS in macosx-setup.sh. Install Libgcrypt via brew script. Motivation for this change is that many dissectors depend on Libgcrypt and having it optional increases the maintenance burden (there have been several compile issues in the past due to the optional status). Furthermore, wsutil has crypto code that can be replaced by Libgcrypt. Change-Id: Idf0021b8c4cd5db70b8766f7dcc2a8b3acbf042f Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html Reviewed-on: https://code.wireshark.org/review/20030 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: Peter Wu <peter@lekensteyn.nl>
2017-02-09 14:00:19 +00:00
#if defined(_WIN32)
Set a Libgcrypt log handler on Windows. Libgcrypt prints all log messages to stderr by default. On Windows the slow_gatherer routine logs NOTE: you should run 'diskperf -y' to enable the disk statistics if DeviceIoControl(..., IOCTL_DISK_PERFORMANCE, ...) fails. We don't depend on cryptographically secure random numbers and the message is needlessly confusing. Add a log handler that ignores less-severe messages. Change-Id: If40a691ea380364457dfdf126b9bf33ac2672d3a Reviewed-on: https://code.wireshark.org/review/19155 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-08 23:16:00 +00:00
gcry_set_log_handler (quiet_gcrypt_logger, NULL);
#endif
From Bartosz Brachaczek: Make the SSL dissector work with GnuTLS compiled with nettle. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6869 #BACKPORT svn path=/trunk/; revision=45465
2012-10-11 08:28:57 +00:00
gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
GnuTLS/libgcrypt initialization moved to epan.c svn path=/trunk/; revision=18863
2006-08-10 06:06:21 +00:00
#ifdef HAVE_LIBGNUTLS
gnutls_global_init();
Add libxml2 as optional dependency This can be used by dissectors that need to parse out-of-band configuration. Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783 Reviewed-on: https://code.wireshark.org/review/20912 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-04-04 21:23:59 +00:00
#endif
#ifdef HAVE_LIBXML2
xmlInitParser();
LIBXML_TEST_VERSION;
GnuTLS/libgcrypt initialization moved to epan.c svn path=/trunk/; revision=18863
2006-08-10 06:06:21 +00:00
#endif
epan: Ignore SIGPIPE. We need to ignore SIGPIPE whenever we use maxmind_db. Do so in epan_init. Ping-Bug: 14494 Change-Id: I4372935e371a94c02a79050d59b2e3ee1ba04fee Reviewed-on: https://code.wireshark.org/review/26369 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-08 17:32:51 +00:00
#ifndef _WIN32
// We might receive a SIGPIPE due to maxmind_db.
signal(SIGPIPE, SIG_IGN);
#endif
Catch REPORT_DISSECTOR_BUG() calls in dissector registration routines. Have epan_init() return a success/failure Boolean indication. Catch exceptions when calling the dissector registration routines and, if we get one, report the error and return a failure indication. If epan_init() fails, quit, but first make sure the reported error is displayed. Change-Id: I0300cbb1f66a5644f857a205235124909d684c50 Reviewed-on: https://code.wireshark.org/review/11340 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-28 00:41:23 +00:00
TRY {
tap_init();
prefs_init();
expert_init();
packet_init();
Add new Secrets API and allow TLS to use pcapng decryption secrets Add a new secrets API to the core, one that can outlive the lifetime of a single capture file. Expose decryption secrets from wiretap through a callback and let the secrets API route it to a dissector. Bug: 15252 Change-Id: Ie2f1867bdfd265bad11fc58f1e8d8e7295c0d1e7 Reviewed-on: https://code.wireshark.org/review/30705 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-18 17:11:42 +00:00
secrets_init();
Convert conversation hash tables to use wmem. Simplifies cleanup because wmem can handle the memory cleanup. Change-Id: Idc6a9bfe5f23c83b59a5278a64b9fb706862342d Reviewed-on: https://code.wireshark.org/review/20042 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-09 17:28:14 +00:00
conversation_init();
Create the capture dissector hash table before registering capture dissectors. Change-Id: I76efd64b4e6803db909203a66b35e1a50708ca90 Reviewed-on: https://code.wireshark.org/review/12591 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-13 18:02:19 +00:00
capture_dissector_init();
Register reassembly tables Register all reassembly tables with a central unit, allowing the central unit to have the callback that initializes and destroys the reassembly tables, rather than have dissectors do it individually. Change-Id: Ic92619c06fb5ba6f1c3012f613cae14982e101d4 Reviewed-on: https://code.wireshark.org/review/19834 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-29 00:53:36 +00:00
reassembly_tables_init();
Add new plugin type for libwireshark Allow epan itself to be extended by plugins. Adds the following new plugin interfaces: void plugin_epan_init() void plugin_epan_dissect_init(epan_dissect_t *) void plugin_epan_dissect_cleanup(epan_dissect_t *) void plugin_epan_cleanup() void plugin_epan_register_all_protocols(register_cb, gointer) [OPTIONAL] void plugin_epan_register_all_handoffs(register_cb, gointer) [OPTIONAL] Any one of these can be an empty function but the first four must be present. The motivation for the change is a better way to implement a language binding other than registering a fake protocol and stuffing everything into a single dissector call (and maybe require an extra packet_info field) but I expect there would be other interesting use cases. Change-Id: I215d50750ac7561fe25fdcdcfbc6a3f351984785 Reviewed-on: https://code.wireshark.org/review/24813 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-08-29 14:34:31 +00:00
g_slist_foreach(epan_plugins, epan_plugin_init, NULL);
epan: Remove unnecessary all protocols registration callback We are exporting a registration function from libwireshark just to have it passed back as a callback. Seems unnecessary. Change-Id: I7621005c9be11691d319102326824c5e3520a6f3 Reviewed-on: https://code.wireshark.org/review/29328 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-28 20:39:55 +00:00
proto_init(epan_plugin_register_all_procotols, epan_plugin_register_all_handoffs, cb, client_data);
Extend epan library plugins with a tap registration callback tap_register_plugin() is not sufficient for an extension language implementation because the epan plugin is initialized before proto_init(), therefore before dissectors have registered taps. Change-Id: Ief213f85ff4f7182f9af985e5f45476355cc2b86 Reviewed-on: https://code.wireshark.org/review/34048 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-07-18 09:28:04 +00:00
g_slist_foreach(epan_plugins, epan_plugin_register_all_tap_listeners, NULL);
Catch REPORT_DISSECTOR_BUG() calls in dissector registration routines. Have epan_init() return a success/failure Boolean indication. Catch exceptions when calling the dissector registration routines and, if we get one, report the error and return a failure indication. If epan_init() fails, quit, but first make sure the reported error is displayed. Change-Id: I0300cbb1f66a5644f857a205235124909d684c50 Reviewed-on: https://code.wireshark.org/review/11340 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-28 00:41:23 +00:00
packet_cache_proto_handles();
dfilter_init();
COSE dissector from dtn-wireshark project
2021-05-11 03:50:41 +00:00
wscbor_init();
Catch REPORT_DISSECTOR_BUG() calls in dissector registration routines. Have epan_init() return a success/failure Boolean indication. Catch exceptions when calling the dissector registration routines and, if we get one, report the error and return a failure indication. If epan_init() fails, quit, but first make sure the reported error is displayed. Change-Id: I0300cbb1f66a5644f857a205235124909d684c50 Reviewed-on: https://code.wireshark.org/review/11340 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-28 00:41:23 +00:00
final_registration_all_protocols();
print_cache_field_handles();
expert_packet_init();
Convert AT_SS7PC to a "dissector address type" The formatting of the address type is determined by a preference in packet-mtp3.c, so just make MTP3 register the address type. Use address_type_get_by_name in other dissectors (and export_pdu) to use the address type. Change-Id: Ifb32d7de27aeaa23cee8e803e25ffb3c905547b5 Reviewed-on: https://code.wireshark.org/review/15856 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-12 16:28:02 +00:00
export_pdu_init();
From Tony Trinh: Update Lua from 5.1 to 5.2 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400 svn path=/trunk/; revision=43482
2012-06-25 20:42:07 +00:00
#ifdef HAVE_LUA
Catch REPORT_DISSECTOR_BUG() calls in dissector registration routines. Have epan_init() return a success/failure Boolean indication. Catch exceptions when calling the dissector registration routines and, if we get one, report the error and return a failure indication. If epan_init() fails, quit, but first make sure the reported error is displayed. Change-Id: I0300cbb1f66a5644f857a205235124909d684c50 Reviewed-on: https://code.wireshark.org/review/11340 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-28 00:41:23 +00:00
wslua_init(cb, client_data);
Move the Lua interface into epan... (not a plugin anymore). - Rename Tap into Listener - add a mechanism to pass protocols' tap data to the Listener svn path=/trunk/; revision=19319
2006-09-25 01:09:00 +00:00
#endif
Catch REPORT_DISSECTOR_BUG() calls in dissector registration routines. Have epan_init() return a success/failure Boolean indication. Catch exceptions when calling the dissector registration routines and, if we get one, report the error and return a failure indication. If epan_init() fails, quit, but first make sure the reported error is displayed. Change-Id: I0300cbb1f66a5644f857a205235124909d684c50 Reviewed-on: https://code.wireshark.org/review/11340 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-28 00:41:23 +00:00
}
CATCH(DissectorError) {
/*
* This is probably a dissector, or something it calls,
* calling REPORT_DISSECTOR_ERROR() in a registration
* routine or something else outside the normal dissection
* code path.
*/
const char *exception_message = GET_MESSAGE;
static const char dissector_error_nomsg[] =
"Dissector writer didn't bother saying what the error was";
report_failure("Dissector bug: %s",
exception_message == NULL ?
dissector_error_nomsg : exception_message);
if (getenv("WIRESHARK_ABORT_ON_DISSECTOR_BUG") != NULL)
abort();
status = FALSE;
}
ENDTRY;
return status;
First step in moving core Ethereal routines to libepan. svn path=/trunk/; revision=2458
2000-09-27 04:55:05 +00:00
}
Pull all the "load settings" calls into a epan_load_settings() routine. That way, nothing using libwireshark needs to know what settings need to be loaded, they just call epan_load_settings(). Change-Id: I9390e259e286fc4f5acaeaac2767e4c3c4b656af Reviewed-on: https://code.wireshark.org/review/20983 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-09 19:27:57 +00:00
/*
* Load all settings, from the current profile, that affect libwireshark.
*/
e_prefs *
epan_load_settings(void)
{
e_prefs *prefs_p;
/* load the decode as entries of the current profile */
load_decode_as_entries();
prefs_p = read_prefs();
/*
* Read the files that enable and disable protocols and heuristic
* dissectors.
*/
read_enabled_and_disabled_lists();
return prefs_p;
}
First step in moving core Ethereal routines to libepan. svn path=/trunk/; revision=2458
2000-09-27 04:55:05 +00:00
void
epan_cleanup(void)
{
Add new plugin type for libwireshark Allow epan itself to be extended by plugins. Adds the following new plugin interfaces: void plugin_epan_init() void plugin_epan_dissect_init(epan_dissect_t *) void plugin_epan_dissect_cleanup(epan_dissect_t *) void plugin_epan_cleanup() void plugin_epan_register_all_protocols(register_cb, gointer) [OPTIONAL] void plugin_epan_register_all_handoffs(register_cb, gointer) [OPTIONAL] Any one of these can be an empty function but the first four must be present. The motivation for the change is a better way to implement a language binding other than registering a fake protocol and stuffing everything into a single dissector call (and maybe require an extra packet_info field) but I expect there would be other interesting use cases. Change-Id: I215d50750ac7561fe25fdcdcfbc6a3f351984785 Reviewed-on: https://code.wireshark.org/review/24813 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-08-29 14:34:31 +00:00
g_slist_foreach(epan_plugins, epan_plugin_cleanup, NULL);
plugins: Don't free static variable Our convention is to pass a pointer to a static structure as argument to *_register_plugin(). Don't try to free it. Change-Id: I16d81b72faf298ebfb3dccf4c9d4772291fd8cf0 Reviewed-on: https://code.wireshark.org/review/27748 Reviewed-by: João Valverde <j@v6e.pt>
2018-05-23 15:58:05 +00:00
g_slist_free(epan_plugins);
Add new plugin type for libwireshark Allow epan itself to be extended by plugins. Adds the following new plugin interfaces: void plugin_epan_init() void plugin_epan_dissect_init(epan_dissect_t *) void plugin_epan_dissect_cleanup(epan_dissect_t *) void plugin_epan_cleanup() void plugin_epan_register_all_protocols(register_cb, gointer) [OPTIONAL] void plugin_epan_register_all_handoffs(register_cb, gointer) [OPTIONAL] Any one of these can be an empty function but the first four must be present. The motivation for the change is a better way to implement a language binding other than registering a fake protocol and stuffing everything into a single dissector call (and maybe require an extra packet_info field) but I expect there would be other interesting use cases. Change-Id: I215d50750ac7561fe25fdcdcfbc6a3f351984785 Reviewed-on: https://code.wireshark.org/review/24813 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-08-29 14:34:31 +00:00
epan_plugins = NULL;
epan: Remove unnecessary all protocols registration callback We are exporting a registration function from libwireshark just to have it passed back as a callback. Seems unnecessary. Change-Id: I7621005c9be11691d319102326824c5e3520a6f3 Reviewed-on: https://code.wireshark.org/review/29328 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-28 20:39:55 +00:00
g_slist_free(epan_plugin_register_all_procotols);
epan_plugin_register_all_procotols = NULL;
g_slist_free(epan_plugin_register_all_handoffs);
epan_plugin_register_all_handoffs = NULL;
Add new plugin type for libwireshark Allow epan itself to be extended by plugins. Adds the following new plugin interfaces: void plugin_epan_init() void plugin_epan_dissect_init(epan_dissect_t *) void plugin_epan_dissect_cleanup(epan_dissect_t *) void plugin_epan_cleanup() void plugin_epan_register_all_protocols(register_cb, gointer) [OPTIONAL] void plugin_epan_register_all_handoffs(register_cb, gointer) [OPTIONAL] Any one of these can be an empty function but the first four must be present. The motivation for the change is a better way to implement a language binding other than registering a fake protocol and stuffing everything into a single dissector call (and maybe require an extra packet_info field) but I expect there would be other interesting use cases. Change-Id: I215d50750ac7561fe25fdcdcfbc6a3f351984785 Reviewed-on: https://code.wireshark.org/review/24813 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-08-29 14:34:31 +00:00
First step in moving core Ethereal routines to libepan. svn path=/trunk/; revision=2458
2000-09-27 04:55:05 +00:00
dfilter_cleanup();
decode_as: clean memory on exit. Change-Id: Ifbbfc1ff71c32c2e9b758b55d32bff9a1ccd1576 Reviewed-on: https://code.wireshark.org/review/19689 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 09:30:59 +00:00
decode_clear_all();
epan: Keep decode_as_list when changing profile The decode_as_list is built at startup and contains all protocols registered for "decode as". Do not clear this list on profile change, only on exit. Bug: 16635 Change-Id: I832a042327603ae0f01b10ab620fccc03d4fd3a3 Reviewed-on: https://code.wireshark.org/review/37579 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2020-06-29 07:58:51 +00:00
decode_cleanup();
Free dynamic header fields on exit Put routine to free all dynamically registered header fields in the UAT reset callback to avoid ASAN report for memory leaks on exit. Handle duplicated entries without leaking memory. Call proto_free_deregistered_fields() in proto_cleanup() and move this after prefs_cleanup() to free the memory used in UATs. Change-Id: I96545177b5b23b9c20ad8e7751a0d5621c9ca10f Reviewed-on: https://code.wireshark.org/review/27907 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-30 07:00:16 +00:00
wslua: fix memleaks related to Proto and Pref Proto objects were only freed while reloading Lua plugins, be sure to release these on program exit too. Fix missing deallocation of heur_list (matches per-protocol cleanup in proto_cleanup_base). Be sure to keep a reference to the "Pref" object after registering it to a Proto, otherwise it could be garbage-collected early, resulting in memleaks (because the preference was still in use). Fixes a lot of memory leaks reported by ASAN for tests, ten tests were affected by Proto_new leaks, four were affected by the new_pref leaks. Change-Id: Ica52718849a33eda614775f533dc0fcefec9cc74 Reviewed-on: https://code.wireshark.org/review/31746 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-25 21:55:24 +00:00
#ifdef HAVE_LUA
/*
* Must deregister Proto objects in Lua before destroying dissector
* tables in packet_cleanup(). Doing so will also deregister and free
* preferences, this must happen before prefs_cleanup(). That will
* update the list of deregistered fields which must be followed by
* proto_cleanup() to complete deallocation.
*/
wslua_early_cleanup();
#endif
Free dynamic header fields on exit Put routine to free all dynamically registered header fields in the UAT reset callback to avoid ASAN report for memory leaks on exit. Handle duplicated entries without leaking memory. Call proto_free_deregistered_fields() in proto_cleanup() and move this after prefs_cleanup() to free the memory used in UATs. Change-Id: I96545177b5b23b9c20ad8e7751a0d5621c9ca10f Reviewed-on: https://code.wireshark.org/review/27907 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-30 07:00:16 +00:00
/*
* Note: packet_cleanup() will call registered shutdown routines which
* may be used to deregister dynamically registered protocol fields,
* and prefs_cleanup() will call uat_clear() which also may be used to
* deregister dynamically registered protocol fields. This must be done
* before proto_cleanup() to avoid inconsistency and memory leaks.
*/
packet_cleanup();
prefs_cleanup();
proto_cleanup();
Add new Secrets API and allow TLS to use pcapng decryption secrets Add a new secrets API to the core, one that can outlive the lifetime of a single capture file. Expose decryption secrets from wiretap through a callback and let the secrets API route it to a dissector. Bug: 15252 Change-Id: Ie2f1867bdfd265bad11fc58f1e8d8e7295c0d1e7 Reviewed-on: https://code.wireshark.org/review/30705 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-18 17:11:42 +00:00
secrets_cleanup();
dissector_filters: add cleanup function. Change-Id: I9694a8e817e357061a60c425fb5881d525ed8143 Reviewed-on: https://code.wireshark.org/review/19695 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 11:19:18 +00:00
conversation_filters_cleanup();
reassemble: add cleanup routine. Change-Id: I948d342a29aacc2212076359e5b073113c50c5de Reviewed-on: https://code.wireshark.org/review/19697 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-20 16:02:52 +00:00
reassembly_table_cleanup();
tap: add cleanup routine. Change-Id: I460b053880ed43a7377b7696531bbaeb0fd0d68b Reviewed-on: https://code.wireshark.org/review/19764 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-24 13:19:22 +00:00
tap_cleanup();
Add expert info configuration framework. Bug 2412 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2412). Expert info "fields" can now be registered/addressed by name. Right now, the basic framework allows expert info fields to become "display filters". However more could be done, like user preferences overriding default severity level, speeding up expert info dialog load time by not needing to redissect a file, etc. Long term goal is to have all expert_info filterable and have the functionality of expert_add_info_format() include the "registered index". expert_add_info_format_text() is the workaround until all current calls to expert_add_info_format() have been updated with either expert_add_info() or expert_add_info_format_text(). Then the remaining expert_add_info_format_text() will be renamed to expert_add_info_format(). svn path=/trunk/; revision=49559
2013-05-24 17:59:36 +00:00
expert_cleanup();
Create a way to register "capture" dissectors. Capture dissectors could be architected like dissection dissectors, with tables and subtables and possibly using tvbs to pass there data instead of raw byte arrays. This is a first step towards that by refactoring capture_info_packet() to work off of a "capture dissector table" Registering the capture dissection functions instead of calling them directly also clears up a bunch of dissector header files who sole purpose was providing the capture dissection function definition. Change-Id: I10e9b79e061f32d2572f009823601d4f048d37aa Reviewed-on: https://code.wireshark.org/review/12581 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-13 04:38:21 +00:00
capture_dissector_cleanup();
exported_pdu: add cleanup function. Change-Id: Iafc9f1c4b2a0210d8098b37eefc095e740182258 Reviewed-on: https://code.wireshark.org/review/19648 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-16 20:51:39 +00:00
export_pdu_cleanup();
Pull the code to save enabled/disabled lists into libwireshark. It's identical in the GTK+ and Qt UIs, and it should just be done in libwireshark. Rename some routines to just speak of enabled_and_disabled_lists, so we don't have to say enabled_and_disabled_protos_and_heuristic_dissectors or something such as that. Clean up indentation. Change-Id: Ief2e612d9e1b60d8d0123b6bd3409dce5faf6495 Reviewed-on: https://code.wireshark.org/review/20970 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-09 01:59:17 +00:00
cleanup_enabled_and_disabled_lists();
stats_tree: add cleanup function. Change-Id: Iefd264bdd79af172c245c3a30119999cca9d56c0 Reviewed-on: https://code.wireshark.org/review/19976 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-05 22:00:51 +00:00
stats_tree_cleanup();
funnel: Fix memleaks in funnel_remove_menu The loop to remove all matching callbacks was skipping every second entry which would give some leaks when reloading Lua plugins. Add funnel_cleanup() to be called in epan_cleanup() at shutdown to remove all allocated menu entries. Change-Id: I3a50ba2070c8675fee1385f25e9e109db57c2dc5 Reviewed-on: https://code.wireshark.org/review/31769 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2019-01-28 08:16:32 +00:00
funnel_cleanup();
dtd: free memory on shutdown. Change-Id: I502e505730b9310066563bfd9c8df9fceddd0301 Reviewed-on: https://code.wireshark.org/review/20229 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-21 15:37:29 +00:00
dtd_location(NULL);
Add Lua cleanup on shutdown, to help with memory leak detection. Bug 5575 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5575) From Robert G. Jakabosky From me: cleanup so that it applies to trunk. svn path=/trunk/; revision=52798
2013-10-23 16:47:02 +00:00
#ifdef HAVE_LUA
wslua_cleanup();
#endif
GnuTLS/libgcrypt initialization moved to epan.c svn path=/trunk/; revision=18863
2006-08-10 06:06:21 +00:00
#ifdef HAVE_LIBGNUTLS
gnutls_global_deinit();
Add libxml2 as optional dependency This can be used by dissectors that need to parse out-of-band configuration. Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783 Reviewed-on: https://code.wireshark.org/review/20912 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-04-04 21:23:59 +00:00
#endif
#ifdef HAVE_LIBXML2
xmlCleanupParser();
GnuTLS/libgcrypt initialization moved to epan.c svn path=/trunk/; revision=18863
2006-08-10 06:06:21 +00:00
#endif
First step in moving core Ethereal routines to libepan. svn path=/trunk/; revision=2458
2000-09-27 04:55:05 +00:00
except_deinit();
Ensure we have both _initialize() and a corresponding _cleanup() routines for the various name resolvers; put those two routines next to each other. Add generic addr_resolv_init() and addr_resolv_cleanup() routines which call all of those internal routines. Call the generic init/cleanup routine from epan_init() and epan_cleanup(). Create the hash tables for each name resolver in those initialization routines in order to avoid having to repeatedly check if the table is already created or not (and to avoid glib warnings if we neglected to perform that check): http://www.wireshark.org/lists/wireshark-dev/201308/msg00012.html Don't clean up hostnames in init_dissection(): it's done already in cleanup_dissection(). Don't initialize hostnames in cleanup_dissection(): it's done already in init_dissection(). svn path=/trunk/; revision=51191
2013-08-07 16:46:08 +00:00
addr_resolv_cleanup();
Remember to destroy the pinfo pool cache Otherwise a library reinitialization leaks at least one large 8MB chunk. Change-Id: I5336fef5925eb54e88a72f1a16fc0ddf77ae6c10 Reviewed-on: https://code.wireshark.org/review/945 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-03 16:55:51 +00:00
Refactor plugin registration and loading Put different types of plugins (libwiretap, libwireshark) in different subdirectories, give libwiretap and libwireshark init routines that load the plugins, and have them scan the appropriate subdirectories so that we don't even *try* to, for example, load libwireshark plugins in programs that only use libwiretap. Compiled plugins are stored in subfolders of the plugin folders, with the subfolder name being the Wireshark minor version number (X.Y). There is another hierarchical level for each Wireshark library (libwireshark, libwscodecs and libwiretap). The folder names are respectively plugins/X.Y/{epan,codecs,wiretap}. Currently we only distribute "epan" (libwireshark) plugins. Change-Id: I3438787a6f45820d64ba4ca91cbe3c8864708acb Reviewed-on: https://code.wireshark.org/review/23983 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-09-30 23:56:03 +00:00
#ifdef HAVE_PLUGINS
plugins_cleanup(libwireshark_plugins);
libwireshark_plugins = NULL;
#endif
Remember to destroy the pinfo pool cache Otherwise a library reinitialization leaks at least one large 8MB chunk. Change-Id: I5336fef5925eb54e88a72f1a16fc0ddf77ae6c10 Reviewed-on: https://code.wireshark.org/review/945 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-03 16:55:51 +00:00
if (pinfo_pool_cache != NULL) {
wmem_destroy_allocator(pinfo_pool_cache);
pinfo_pool_cache = NULL;
}
Move wmem to wsutil This allows wmem to be used from other libraries, namely wsutil. It is often the case that a funtion exists in wsutil and cannot be used with a wmem scope, requiring some code duplication or extra memory allocations, or vice-versa, code in epan cannot be moved to wsutil because it has a wmem dependency. To this end wmem is moved to wsutil. Scope management remains part of epan because those scope semantics are specific to dissection.
2021-07-12 20:22:05 +00:00
wmem_cleanup_scopes();
First step in moving core Ethereal routines to libepan. svn path=/trunk/; revision=2458
2000-09-27 04:55:05 +00:00
}
Hand the packet provider functions to epan_new(). Have separate packet_provider_data structures and packet_provider_funcs structures; the latter holds a table of functions that libwireshark can call for information about packets, the latter holds the data that those functions use. This means we no longer need to expose the structure of an epan_t outside epan/epan.c; get rid of epan/epan-int.h. Change-Id: I381b88993aa19e55720ce02c42ad33738e3f51f4 Reviewed-on: https://code.wireshark.org/review/24732 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08 04:33:22 +00:00
struct epan_session {
struct packet_provider_data *prov; /* packet provider data for this session */
struct packet_provider_funcs funcs; /* functions using that data */
};
Some work on multi file dissection - make init_dissection/cleanup_dissection private for libwireshark - implement epan_new(), epan_free() - pass epan_t to epan_dissect* svn path=/trunk/; revision=50761
2013-07-21 18:38:03 +00:00
epan_t *
Hand the packet provider functions to epan_new(). Have separate packet_provider_data structures and packet_provider_funcs structures; the latter holds a table of functions that libwireshark can call for information about packets, the latter holds the data that those functions use. This means we no longer need to expose the structure of an epan_t outside epan/epan.c; get rid of epan/epan-int.h. Change-Id: I381b88993aa19e55720ce02c42ad33738e3f51f4 Reviewed-on: https://code.wireshark.org/review/24732 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08 04:33:22 +00:00
epan_new(struct packet_provider_data *prov,
const struct packet_provider_funcs *funcs)
Some work on multi file dissection - make init_dissection/cleanup_dissection private for libwireshark - implement epan_new(), epan_free() - pass epan_t to epan_dissect* svn path=/trunk/; revision=50761
2013-07-21 18:38:03 +00:00
{
Get rid of some void pointers. Explictly struct _capture_file * in epan_session and its callbacks. Change-Id: I63703015c661a08f3350a7448a7bcdaf98f119dc Reviewed-on: https://code.wireshark.org/review/24675 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-01 19:13:18 +00:00
epan_t *session = g_slice_new0(epan_t);
Some work on multi file dissection - make init_dissection/cleanup_dissection private for libwireshark - implement epan_new(), epan_free() - pass epan_t to epan_dissect* svn path=/trunk/; revision=50761
2013-07-21 18:38:03 +00:00
Move the frame_set stuff back into the capture_file structure. libwireshark now expects an epan_t to be created with a pointer to a "packet provider" structure; that structure is opaque within libwireshark, and a pointer to it is passed to the callbacks that provide interface names, interface, descriptions, user comments, and packet time stamps, and that set user comments. The code that calls epan_new() is expected to provide those callbacks, and to define the structure, which can be used by the providers. If none of the callbacks need that extra information, the "packet provider" structure can be null. Have a "file" packet provider for all the programs that provide packets from a file. Change-Id: I4b5709a3dd7b098ebd7d2a7d95bcdd7b5903c1a0 Reviewed-on: https://code.wireshark.org/review/24731 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08 03:31:43 +00:00
session->prov = prov;
Hand the packet provider functions to epan_new(). Have separate packet_provider_data structures and packet_provider_funcs structures; the latter holds a table of functions that libwireshark can call for information about packets, the latter holds the data that those functions use. This means we no longer need to expose the structure of an epan_t outside epan/epan.c; get rid of epan/epan-int.h. Change-Id: I381b88993aa19e55720ce02c42ad33738e3f51f4 Reviewed-on: https://code.wireshark.org/review/24732 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08 04:33:22 +00:00
session->funcs = *funcs;
Move the frame_set stuff back into the capture_file structure. libwireshark now expects an epan_t to be created with a pointer to a "packet provider" structure; that structure is opaque within libwireshark, and a pointer to it is passed to the callbacks that provide interface names, interface, descriptions, user comments, and packet time stamps, and that set user comments. The code that calls epan_new() is expected to provide those callbacks, and to define the structure, which can be used by the providers. If none of the callbacks need that extra information, the "packet provider" structure can be null. Have a "file" packet provider for all the programs that provide packets from a file. Change-Id: I4b5709a3dd7b098ebd7d2a7d95bcdd7b5903c1a0 Reviewed-on: https://code.wireshark.org/review/24731 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08 03:31:43 +00:00
Some work on multi file dissection - make init_dissection/cleanup_dissection private for libwireshark - implement epan_new(), epan_free() - pass epan_t to epan_dissect* svn path=/trunk/; revision=50761
2013-07-21 18:38:03 +00:00
/* XXX, it should take session as param */
init_dissection();
return session;
}
Use wtap_blocks for packet comments Mostly functioning proof of concept for #14329. This work is intended to allow Wireshark to support multiple packet comments per packet. Uses and expands upon the `wtap_block` API in `wiretap/wtap_opttypes.h`. It attaches a `wtap_block` structure to `wtap_rec` in place of its current `opt_comment` and `packet_verdict` members to hold OPT_COMMENT and OPT_PKT_VERDICT option values.
2021-04-29 11:23:21 +00:00
wtap_block_t
Consistently refer to blocks that have been modified as "modified". "User" sounds as if the blocks belong to the user; at most, the current user might have modified them directly, but they might also have, for example, run a Lua script that, unknown to them, modified comments. Also, a file might have "user comments" added by a previous user, who them wrote the file and and provided it to the current user. "Modified" seems a bit clearer than "changed".
2021-07-08 05:43:29 +00:00
epan_get_modified_block(const epan_t *session, const frame_data *fd)
Remove fdata->opt_comment, add pkt_comment to pinfo Original (read from file) comments can be accessed by pkthdr->opt_comment Keep user comments in seperated BST, add new method for epan session to get it. svn path=/trunk/; revision=51090
2013-08-01 20:59:38 +00:00
{
Consistently refer to blocks that have been modified as "modified". "User" sounds as if the blocks belong to the user; at most, the current user might have modified them directly, but they might also have, for example, run a Lua script that, unknown to them, modified comments. Also, a file might have "user comments" added by a previous user, who them wrote the file and and provided it to the current user. "Modified" seems a bit clearer than "changed".
2021-07-08 05:43:29 +00:00
if (session->funcs.get_modified_block)
return session->funcs.get_modified_block(session->prov, fd);
Remove fdata->opt_comment, add pkt_comment to pinfo Original (read from file) comments can be accessed by pkthdr->opt_comment Keep user comments in seperated BST, add new method for epan session to get it. svn path=/trunk/; revision=51090
2013-08-01 20:59:38 +00:00
return NULL;
}
Abuse epan_t more: add callback to get interface name. svn path=/trunk/; revision=50794
2013-07-22 19:38:38 +00:00
const char *
epan_get_interface_name(const epan_t *session, guint32 interface_id)
{
Hand the packet provider functions to epan_new(). Have separate packet_provider_data structures and packet_provider_funcs structures; the latter holds a table of functions that libwireshark can call for information about packets, the latter holds the data that those functions use. This means we no longer need to expose the structure of an epan_t outside epan/epan.c; get rid of epan/epan-int.h. Change-Id: I381b88993aa19e55720ce02c42ad33738e3f51f4 Reviewed-on: https://code.wireshark.org/review/24732 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08 04:33:22 +00:00
if (session->funcs.get_interface_name)
return session->funcs.get_interface_name(session->prov, interface_id);
Abuse epan_t more: add callback to get interface name. svn path=/trunk/; revision=50794
2013-07-22 19:38:38 +00:00
return NULL;
}
Make the capture file's interface description filterable This patch introduces the frame.interface_description field. While testing this new functionality it became obvious that we have a non-optimal interaction between the existing cfile.c's cap_file_get_interface_name(), the recently added frame.interface_name field and this new frame.interface_description field. The string returned from cap_file_get_interface_name() may in fact come from one of three different sources: the idb's interface name (if it exists) or the idb's interface description (if that exists) or a default text of "unknown". The string ultimately becomes the rame.interface_name whether or not the idb had an interface name option to begin with. This behavior does not allow one to test for the simple presence of frame.interface_name. The new peer function cap_file_get_interface_description() added by this patch returns NULL instead of "unknown" if the idb does not have an interface description. Should cap_file_get_interface_name() be similarly modified to return NULL if the idb does not have an interface name? Bug: 9781 Change-Id: Ie479f373c5080c004dd22bd88919838feca71e95 Reviewed-on: https://code.wireshark.org/review/19861 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-30 07:45:15 +00:00
const char *
epan_get_interface_description(const epan_t *session, guint32 interface_id)
{
Hand the packet provider functions to epan_new(). Have separate packet_provider_data structures and packet_provider_funcs structures; the latter holds a table of functions that libwireshark can call for information about packets, the latter holds the data that those functions use. This means we no longer need to expose the structure of an epan_t outside epan/epan.c; get rid of epan/epan-int.h. Change-Id: I381b88993aa19e55720ce02c42ad33738e3f51f4 Reviewed-on: https://code.wireshark.org/review/24732 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08 04:33:22 +00:00
if (session->funcs.get_interface_description)
return session->funcs.get_interface_description(session->prov, interface_id);
Make the capture file's interface description filterable This patch introduces the frame.interface_description field. While testing this new functionality it became obvious that we have a non-optimal interaction between the existing cfile.c's cap_file_get_interface_name(), the recently added frame.interface_name field and this new frame.interface_description field. The string returned from cap_file_get_interface_name() may in fact come from one of three different sources: the idb's interface name (if it exists) or the idb's interface description (if that exists) or a default text of "unknown". The string ultimately becomes the rame.interface_name whether or not the idb had an interface name option to begin with. This behavior does not allow one to test for the simple presence of frame.interface_name. The new peer function cap_file_get_interface_description() added by this patch returns NULL instead of "unknown" if the idb does not have an interface description. Should cap_file_get_interface_name() be similarly modified to return NULL if the idb does not have an interface name? Bug: 9781 Change-Id: Ie479f373c5080c004dd22bd88919838feca71e95 Reviewed-on: https://code.wireshark.org/review/19861 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-30 07:45:15 +00:00
return NULL;
}
Add helper function to epan_session which can be used to get absolute timestamp of given frame. Remove ->prev_cap, for testing purpose also replace ->prev_dis with number of previously displayed frame number. This patch reduce size of frame_data by 8B (amd64) This is what (I think) was suggested by Guy in comment 13 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5821#c13) svn path=/trunk/; revision=50765
2013-07-21 20:48:30 +00:00
const nstime_t *
epan_get_frame_ts(const epan_t *session, guint32 frame_num)
{
Fix: epan.c:155: warning: assignment discards qualifiers from pointer target type svn path=/trunk/; revision=50767
2013-07-21 21:04:25 +00:00
const nstime_t *abs_ts = NULL;
Add helper function to epan_session which can be used to get absolute timestamp of given frame. Remove ->prev_cap, for testing purpose also replace ->prev_dis with number of previously displayed frame number. This patch reduce size of frame_data by 8B (amd64) This is what (I think) was suggested by Guy in comment 13 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5821#c13) svn path=/trunk/; revision=50765
2013-07-21 20:48:30 +00:00
epan: Fix session null-pointer check Fix rare null-pointer when switching profiles Change-Id: I2a57ef22b4567f936f3a87e133db6132864a83ac Reviewed-on: https://code.wireshark.org/review/28468 Reviewed-by: Roland Knall <rknall@gmail.com>
2018-06-26 21:55:27 +00:00
if (session && session->funcs.get_frame_ts)
Hand the packet provider functions to epan_new(). Have separate packet_provider_data structures and packet_provider_funcs structures; the latter holds a table of functions that libwireshark can call for information about packets, the latter holds the data that those functions use. This means we no longer need to expose the structure of an epan_t outside epan/epan.c; get rid of epan/epan-int.h. Change-Id: I381b88993aa19e55720ce02c42ad33738e3f51f4 Reviewed-on: https://code.wireshark.org/review/24732 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-08 04:33:22 +00:00
abs_ts = session->funcs.get_frame_ts(session->prov, frame_num);
Add helper function to epan_session which can be used to get absolute timestamp of given frame. Remove ->prev_cap, for testing purpose also replace ->prev_dis with number of previously displayed frame number. This patch reduce size of frame_data by 8B (amd64) This is what (I think) was suggested by Guy in comment 13 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5821#c13) svn path=/trunk/; revision=50765
2013-07-21 20:48:30 +00:00
if (!abs_ts)
Replace g_log() calls with ws_log()
2021-06-14 23:06:02 +00:00
ws_warning("!!! couldn't get frame ts for %u !!!\n", frame_num);
Add helper function to epan_session which can be used to get absolute timestamp of given frame. Remove ->prev_cap, for testing purpose also replace ->prev_dis with number of previously displayed frame number. This patch reduce size of frame_data by 8B (amd64) This is what (I think) was suggested by Guy in comment 13 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5821#c13) svn path=/trunk/; revision=50765
2013-07-21 20:48:30 +00:00
return abs_ts;
}
Some work on multi file dissection - make init_dissection/cleanup_dissection private for libwireshark - implement epan_new(), epan_free() - pass epan_t to epan_dissect* svn path=/trunk/; revision=50761
2013-07-21 18:38:03 +00:00
void
epan_free(epan_t *session)
{
As suggested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9033 Make epan_free a no-op if the pointer is NULL. This fixes 99% of the cases causing problems for wmem_leave_file_scope() - remove that XXX comment and add back the assertion. Remove the cleanup_dissection call from epan_cleanup, it doesn't make sense there. init_dissection is only called from epan_new, so cleanup_dissection should only be called from epan_free. Add one missing epan_free call to tshark revealed by the above changes. svn path=/trunk/; revision=51342
2013-08-13 22:41:34 +00:00
if (session) {
/* XXX, it should take session as param */
cleanup_dissection();
Some work on multi file dissection - make init_dissection/cleanup_dissection private for libwireshark - implement epan_new(), epan_free() - pass epan_t to epan_dissect* svn path=/trunk/; revision=50761
2013-07-21 18:38:03 +00:00
As suggested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9033 Make epan_free a no-op if the pointer is NULL. This fixes 99% of the cases causing problems for wmem_leave_file_scope() - remove that XXX comment and add back the assertion. Remove the cleanup_dissection call from epan_cleanup, it doesn't make sense there. init_dissection is only called from epan_new, so cleanup_dissection should only be called from epan_free. Add one missing epan_free call to tshark revealed by the above changes. svn path=/trunk/; revision=51342
2013-08-13 22:41:34 +00:00
g_slice_free(epan_t, session);
}
Some work on multi file dissection - make init_dissection/cleanup_dissection private for libwireshark - implement epan_new(), epan_free() - pass epan_t to epan_dissect* svn path=/trunk/; revision=50761
2013-07-21 18:38:03 +00:00
}
First step in moving core Ethereal routines to libepan. svn path=/trunk/; revision=2458
2000-09-27 04:55:05 +00:00
void
epan_conversation_init(void)
{
Convert conversation hash tables to use wmem. Simplifies cleanup because wmem can handle the memory cleanup. Change-Id: Idc6a9bfe5f23c83b59a5278a64b9fb706862342d Reviewed-on: https://code.wireshark.org/review/20042 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-09 17:28:14 +00:00
conversation_epan_reset();
Split a bunch of init routines into init() and cleanup(). This allows us to free memory properly on shutdown. This is an initial step. There's still some work to do. svn path=/trunk/; revision=29754
2009-09-06 18:25:23 +00:00
}
Fix bug 6357: Lua all_field_infos() broken within tap/listener The current API for Lua provides a global function "all_field_infos()" which returns all the populated field_info nodes in the current proto_tree. By default all_field_infos() "works", in the literal sense: it returns exactly the fields the previous dissectors of the packet have populated at that instant of time. But of course dissectors don't populate all the applicable fields most of the time, because of the TRY_TO_FAKE_THIS_ITEM optimization where they don't fill in things that aren't needed at the time by a display, color, or tap's dfilter. So this commit offers a way to force the dissectors to populate all the applicable field_infos in the tree, by setting the proto_tree to be visible. Obviously that is going to impact performance, since it basically bypasses the TRY_TO_FAKE_THIS_ITEM optimization; so the patch only does this if the Lua script author told it to explicitly, by adding an argument to Listener.new() and register_postdissector(). Change-Id: I11d3559fbe8c14fbadf1b51415a3701dc1200b7b Reviewed-on: https://code.wireshark.org/review/286 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-21 06:11:41 +00:00
/* Overrides proto_tree_visible i epan_dissect_init to make all fields visible.
* This is > 0 if a Lua script wanted to see all fields all the time.
* This is ref-counted, so clearing it won't override other taps/scripts wanting it.
*/
static gint always_visible_refcount = 0;
void
epan_set_always_visible(gboolean force)
{
if (force)
always_visible_refcount++;
else if (always_visible_refcount > 0)
always_visible_refcount--;
}
Don't have epan_dissect_init() return anything. It manipulates the epan_dissect_t structure passed into it and then returns that. Callers can (and have been) just using the passed in epan_dissect_t structure anyway. Change-Id: Ia19d360a7347ff473654eeb553756f59a38f95bd Reviewed-on: https://code.wireshark.org/review/21570 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-09 14:11:27 +00:00
void
Some work on multi file dissection - make init_dissection/cleanup_dissection private for libwireshark - implement epan_new(), epan_free() - pass epan_t to epan_dissect* svn path=/trunk/; revision=50761
2013-07-21 18:38:03 +00:00
epan_dissect_init(epan_dissect_t *edt, epan_t *session, const gboolean create_proto_tree, const gboolean proto_tree_visible)
Implement epan_dissect_new() and epan_dissect_free(). These are the "top-level" dissectors that libepan-users call, instead of dissect_packet(). The epan_dissect_t holds the tvbuff after dissection so that the tvbuff's memory is not cleared until after the proto_tree is freed. (I might stuff the proto_tree into the epan_dissect_t, too). What remains of dissect_packet() in packet.c handles the tvbuff initialiation. The real meat of dissect_packet() is now in dissect_frame(), in packet-frame.c This means that "packet.c" is no longer a dissector, os it is no longer passed to make-reg-dotc. Once dissect_fddi() gets two wrapper functions (dissect_fddi_swapped() and dissect_fddi_nonswapped()), the a dissector handoff routine could be used instead of the switch statement in dissect_frame(). I'd register a field like "wtap.encap" svn path=/trunk/; revision=2478
2000-10-06 10:11:40 +00:00
{
Replace g_assert() with ws_assert()
2021-06-18 18:21:42 +00:00
ws_assert(edt);
Implement epan_dissect_new() and epan_dissect_free(). These are the "top-level" dissectors that libepan-users call, instead of dissect_packet(). The epan_dissect_t holds the tvbuff after dissection so that the tvbuff's memory is not cleared until after the proto_tree is freed. (I might stuff the proto_tree into the epan_dissect_t, too). What remains of dissect_packet() in packet.c handles the tvbuff initialiation. The real meat of dissect_packet() is now in dissect_frame(), in packet-frame.c This means that "packet.c" is no longer a dissector, os it is no longer passed to make-reg-dotc. Once dissect_fddi() gets two wrapper functions (dissect_fddi_swapped() and dissect_fddi_nonswapped()), the a dissector handoff routine could be used instead of the switch statement in dissect_frame(). I'd register a field like "wtap.encap" svn path=/trunk/; revision=2478
2000-10-06 10:11:40 +00:00
Some work on multi file dissection - make init_dissection/cleanup_dissection private for libwireshark - implement epan_new(), epan_free() - pass epan_t to epan_dissect* svn path=/trunk/; revision=50761
2013-07-21 18:38:03 +00:00
edt->session = session;
Create a wmem pool in pinfo and use it for some address allocations. A (better?) fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8030 See also thread starting at: http://www.wireshark.org/lists/wireshark-dev/201212/msg00001.html svn path=/trunk/; revision=46331
2012-12-02 17:01:04 +00:00
Effectively remove the tree memory pool and port some of its behaviour to the pinfo memory pool, they have exactly the same scope. Simplification and minor performance win (one GHashTable we longer have to create/destroy on every packet). svn path=/trunk/; revision=53076
2013-11-04 14:12:59 +00:00
memset(&edt->pi, 0, sizeof(edt->pi));
if (pinfo_pool_cache != NULL) {
edt->pi.pool = pinfo_pool_cache;
pinfo_pool_cache = NULL;
}
else {
wmem: add new simple block allocator, use it in packet-scope. For packet-scope allocation, there's no need to support realloc(), free() cause memory will be garbage collected after packet dissection. (and this allocator is much faster than full block allocator). Change-Id: I73fdf708c3077f48f55bdcc71f4fa859e4ac2335 Reviewed-on: https://code.wireshark.org/review/1428 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-29 06:57:40 +00:00
edt->pi.pool = wmem_allocator_new(WMEM_ALLOCATOR_BLOCK_FAST);
Effectively remove the tree memory pool and port some of its behaviour to the pinfo memory pool, they have exactly the same scope. Simplification and minor performance win (one GHashTable we longer have to create/destroy on every packet). svn path=/trunk/; revision=53076
2013-11-04 14:12:59 +00:00
}
Remove proto_tree from capture_file and PacketWinData, since they already contain a pointer to an epan_dissect_t, which contains the proto_tree. Routines calling epan_dissect_new() do not create their own proto_tree via proto_tree_create_root(); instead, they pass a boolean to epan_dissect_new() telling it whether it should create the root proto_tree. svn path=/trunk/; revision=4343
2001-12-06 04:25:09 +00:00
if (create_proto_tree) {
Make the corresponding packet_info available to each tree item. This lets us pass a NULL pinfo to expert_add_info_format() and expert_add_undecoded_item(), which makes it possible to use those routines deep in the bowels of many dissectors. As a proof of concept remove the recent pinfo additions to packet-afp.c. This should also make it easier to fix bug 3884. svn path=/trunk/; revision=44435
2012-08-10 20:33:01 +00:00
edt->tree = proto_tree_create_root(&edt->pi);
Fix bug 6357: Lua all_field_infos() broken within tap/listener The current API for Lua provides a global function "all_field_infos()" which returns all the populated field_info nodes in the current proto_tree. By default all_field_infos() "works", in the literal sense: it returns exactly the fields the previous dissectors of the packet have populated at that instant of time. But of course dissectors don't populate all the applicable fields most of the time, because of the TRY_TO_FAKE_THIS_ITEM optimization where they don't fill in things that aren't needed at the time by a display, color, or tap's dfilter. So this commit offers a way to force the dissectors to populate all the applicable field_infos in the tree, by setting the proto_tree to be visible. Obviously that is going to impact performance, since it basically bypasses the TRY_TO_FAKE_THIS_ITEM optimization; so the patch only does this if the Lua script author told it to explicitly, by adding an argument to Listener.new() and register_postdissector(). Change-Id: I11d3559fbe8c14fbadf1b51415a3701dc1200b7b Reviewed-on: https://code.wireshark.org/review/286 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-21 06:11:41 +00:00
proto_tree_set_visible(edt->tree, (always_visible_refcount > 0) ? TRUE : proto_tree_visible);
Remove proto_tree from capture_file and PacketWinData, since they already contain a pointer to an epan_dissect_t, which contains the proto_tree. Routines calling epan_dissect_new() do not create their own proto_tree via proto_tree_create_root(); instead, they pass a boolean to epan_dissect_new() telling it whether it should create the root proto_tree. svn path=/trunk/; revision=4343
2001-12-06 04:25:09 +00:00
}
else {
edt->tree = NULL;
}
Create a more modular type system for the FT_* types. Put them into epan/ftypes. Re-write display filter routines using Lemon parser instead of yacc. Besides using a different tool, the new grammar is much simpler, while the display filter engine itself is more powerful and more easily extended. Add dftest executable, to test display filter "bytecode" generation. Add option to "configure" to build dftest or randpkt, both of which are not built by default. Implement Ed Warnicke's ideas about dranges in the new display filter and ftype code. Remove type FT_TEXT_ONLY in favor of FT_NONE, and have protocols registered as FT_PROTOCOL. Thus, FT_NONE is used only for simple labels in the proto tree, while FT_PROTOCOL is used for protocols. This was necessary for being able to make byte slices (ranges) out of protocols, like "frame[0:3]" Win32 Makefile.nmake's will be added tonight. svn path=/trunk/; revision=2967
2001-02-01 20:21:25 +00:00
2nd try to fix recent test failures. After recent changes it's possible that epan_dissect_cleanup() can be called if there were no dissection run on it (epan_dissect_run()) In such case ->tvb will have random value, just initialize it to NULL in _init() and see if it's working. Thanks goes to Evan for backtrace. svn path=/trunk/; revision=52722
2013-10-20 19:05:00 +00:00
edt->tvb = NULL;
Add new plugin type for libwireshark Allow epan itself to be extended by plugins. Adds the following new plugin interfaces: void plugin_epan_init() void plugin_epan_dissect_init(epan_dissect_t *) void plugin_epan_dissect_cleanup(epan_dissect_t *) void plugin_epan_cleanup() void plugin_epan_register_all_protocols(register_cb, gointer) [OPTIONAL] void plugin_epan_register_all_handoffs(register_cb, gointer) [OPTIONAL] Any one of these can be an empty function but the first four must be present. The motivation for the change is a better way to implement a language binding other than registering a fake protocol and stuffing everything into a single dissector call (and maybe require an extra packet_info field) but I expect there would be other interesting use cases. Change-Id: I215d50750ac7561fe25fdcdcfbc6a3f351984785 Reviewed-on: https://code.wireshark.org/review/24813 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-08-29 14:34:31 +00:00
g_slist_foreach(epan_plugins, epan_plugin_dissect_init, edt);
Provide for per-protocol-tree data in the proto_tree code. Put a hash-table of "interesting" fields in the per-proto-tree data. The dfilter code records which fields/protocols are "interesting" (by which I mean, their value or existence is checked). Thus, the proto_tree routines can create special arrays of field_info*'s that are ready for the dfilter engine to use during a filter operation. Also store the "proto_tree_is_visible" boolean, renamed "visible", in the per-proto-tree data. Move epan_dissect_t to its own header file to make #include dependencies easier to handle. Provide epan_dissect_fill_in_columns(), which accepts just the epan_dissect_t* as an argument. epan_dissect_new() needs to be followed by epan_dissect_run() for the dissection to actually take place. Between those two calls, epan_dissect_prime_dfilter() can be run 0, 1, or multiple times in order to prime the empty proto_tree with the "intersesting" fields from the dfilter_t. svn path=/trunk/; revision=4422
2001-12-18 19:09:08 +00:00
}
Implement epan_dissect_new() and epan_dissect_free(). These are the "top-level" dissectors that libepan-users call, instead of dissect_packet(). The epan_dissect_t holds the tvbuff after dissection so that the tvbuff's memory is not cleared until after the proto_tree is freed. (I might stuff the proto_tree into the epan_dissect_t, too). What remains of dissect_packet() in packet.c handles the tvbuff initialiation. The real meat of dissect_packet() is now in dissect_frame(), in packet-frame.c This means that "packet.c" is no longer a dissector, os it is no longer passed to make-reg-dotc. Once dissect_fddi() gets two wrapper functions (dissect_fddi_swapped() and dissect_fddi_nonswapped()), the a dissector handoff routine could be used instead of the switch statement in dissect_frame(). I'd register a field like "wtap.encap" svn path=/trunk/; revision=2478
2000-10-06 10:11:40 +00:00
Reintroduce back epan_dissect_reset(), proto_tree_reset() This time it makes more sense, cause for each dissection we need two wmem allocators. Reseting wmem allocator is much faster than destroy & create. svn path=/trunk/; revision=52706
2013-10-20 10:21:25 +00:00
void
epan_dissect_reset(epan_dissect_t *edt)
{
/* We have to preserve the pool pointer across the memzeroing */
wmem_allocator_t *tmp;
Replace g_assert() with ws_assert()
2021-06-18 18:21:42 +00:00
ws_assert(edt);
Reintroduce back epan_dissect_reset(), proto_tree_reset() This time it makes more sense, cause for each dissection we need two wmem allocators. Reseting wmem allocator is much faster than destroy & create. svn path=/trunk/; revision=52706
2013-10-20 10:21:25 +00:00
Use wtap_blocks for packet comments Mostly functioning proof of concept for #14329. This work is intended to allow Wireshark to support multiple packet comments per packet. Uses and expands upon the `wtap_block` API in `wiretap/wtap_opttypes.h`. It attaches a `wtap_block` structure to `wtap_rec` in place of its current `opt_comment` and `packet_verdict` members to hold OPT_COMMENT and OPT_PKT_VERDICT option values.
2021-04-29 11:23:21 +00:00
wtap_block_unref(edt->pi.rec->block);
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
g_slist_free(edt->pi.proto_data);
Reintroduce back epan_dissect_reset(), proto_tree_reset() This time it makes more sense, cause for each dissection we need two wmem allocators. Reseting wmem allocator is much faster than destroy & create. svn path=/trunk/; revision=52706
2013-10-20 10:21:25 +00:00
g_slist_free(edt->pi.dependent_frames);
/* Free the data sources list. */
free_data_sources(&edt->pi);
if (edt->tvb) {
/* Free all tvb's chained from this tvb */
tvb_free_chain(edt->tvb);
edt->tvb = NULL;
}
if (edt->tree)
proto_tree_reset(edt->tree);
tmp = edt->pi.pool;
wmem_free_all(tmp);
memset(&edt->pi, 0, sizeof(edt->pi));
edt->pi.pool = tmp;
}
Introduce epan_dissect_init()/epan_dissect_cleanup(). These are used to initialise/cleanup stack allocated 'edt' structures. This should speed up dissection since we avoid some malloc traffic. svn path=/trunk/; revision=29404
2009-08-13 19:42:46 +00:00
epan_dissect_t*
Some work on multi file dissection - make init_dissection/cleanup_dissection private for libwireshark - implement epan_new(), epan_free() - pass epan_t to epan_dissect* svn path=/trunk/; revision=50761
2013-07-21 18:38:03 +00:00
epan_dissect_new(epan_t *session, const gboolean create_proto_tree, const gboolean proto_tree_visible)
Introduce epan_dissect_init()/epan_dissect_cleanup(). These are used to initialise/cleanup stack allocated 'edt' structures. This should speed up dissection since we avoid some malloc traffic. svn path=/trunk/; revision=29404
2009-08-13 19:42:46 +00:00
{
Whitespace cleanup. svn path=/trunk/; revision=38893
2011-09-06 09:09:36 +00:00
epan_dissect_t *edt;
Introduce epan_dissect_init()/epan_dissect_cleanup(). These are used to initialise/cleanup stack allocated 'edt' structures. This should speed up dissection since we avoid some malloc traffic. svn path=/trunk/; revision=29404
2009-08-13 19:42:46 +00:00
From David Bond: Added the IEEE defined ether types for TRILL and Layer 2 ISIS. Also had ISIS register itself with the ethertype dissector. References: http://www.postel.org/pipermail/rbridge/2010-May/003998.html http://tools.ietf.org/html/draft-ietf-isis-layer2-05 http://tools.ietf.org/html/draft-ietf-trill-rbridge-protocol-16 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4825 svn path=/trunk/; revision=33059
2010-06-02 19:29:14 +00:00
edt = g_new0(epan_dissect_t, 1);
Introduce epan_dissect_init()/epan_dissect_cleanup(). These are used to initialise/cleanup stack allocated 'edt' structures. This should speed up dissection since we avoid some malloc traffic. svn path=/trunk/; revision=29404
2009-08-13 19:42:46 +00:00
Don't have epan_dissect_init() return anything. It manipulates the epan_dissect_t structure passed into it and then returns that. Callers can (and have been) just using the passed in epan_dissect_t structure anyway. Change-Id: Ia19d360a7347ff473654eeb553756f59a38f95bd Reviewed-on: https://code.wireshark.org/review/21570 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-09 14:11:27 +00:00
epan_dissect_init(edt, session, create_proto_tree, proto_tree_visible);
return edt;
Introduce epan_dissect_init()/epan_dissect_cleanup(). These are used to initialise/cleanup stack allocated 'edt' structures. This should speed up dissection since we avoid some malloc traffic. svn path=/trunk/; revision=29404
2009-08-13 19:42:46 +00:00
}
TRY_TO_FAKE_THIS_ITEM now fakes FT_PROTOCOL per default. If there are any users (e.g. proto_hier_stats.c, others?) that relies on FT_PROTOCOL nodes being created they'll now need to call the newly introduced epan_dissect_fake_protocols() to disable this optimization. Also make use of TRY_TO_FAKE_THIS_ITEM in proto_tree_add_text_node(), proto_tree_add_none_format() and proto_tree_add_protocol_format(). svn path=/trunk/; revision=29380
2009-08-11 18:08:03 +00:00
void
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
epan_dissect_fake_protocols(epan_dissect_t *edt, const gboolean fake_protocols)
TRY_TO_FAKE_THIS_ITEM now fakes FT_PROTOCOL per default. If there are any users (e.g. proto_hier_stats.c, others?) that relies on FT_PROTOCOL nodes being created they'll now need to call the newly introduced epan_dissect_fake_protocols() to disable this optimization. Also make use of TRY_TO_FAKE_THIS_ITEM in proto_tree_add_text_node(), proto_tree_add_none_format() and proto_tree_add_protocol_format(). svn path=/trunk/; revision=29380
2009-08-11 18:08:03 +00:00
{
if (edt)
proto_tree_set_fake_protocols(edt->tree, fake_protocols);
}
Provide for per-protocol-tree data in the proto_tree code. Put a hash-table of "interesting" fields in the per-proto-tree data. The dfilter code records which fields/protocols are "interesting" (by which I mean, their value or existence is checked). Thus, the proto_tree routines can create special arrays of field_info*'s that are ready for the dfilter engine to use during a filter operation. Also store the "proto_tree_is_visible" boolean, renamed "visible", in the per-proto-tree data. Move epan_dissect_t to its own header file to make #include dependencies easier to handle. Provide epan_dissect_fill_in_columns(), which accepts just the epan_dissect_t* as an argument. epan_dissect_new() needs to be followed by epan_dissect_run() for the dissection to actually take place. Between those two calls, epan_dissect_prime_dfilter() can be run 0, 1, or multiple times in order to prime the empty proto_tree with the "intersesting" fields from the dfilter_t. svn path=/trunk/; revision=4422
2001-12-18 19:09:08 +00:00
void
Add support for dissecting non-packet records. Add a dissector table indexed by the file type, and, for the file-type-specific records, have the frame dissector skip the usual pseudo-header processing, as the pseudo-header has a file-type-specific record subtype in it, and call the dissector for that file type's records. Change-Id: Ibe97cf6340ffb0dabc08f355891bc346391b91f9 Reviewed-on: https://code.wireshark.org/review/1782 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-25 00:04:44 +00:00
epan_dissect_run(epan_dissect_t *edt, int file_type_subtype,
Generalize wtap_pkthdr into a structure for packet and non-packet records. Separate the stuff that any record could have from the stuff that only particular record types have; put the latter into a union, and put all that into a wtap_rec structure. Add some record-type checks as necessary. Change-Id: Id6b3486858f826fce4b096c59231f463e44bfaa2 Reviewed-on: https://code.wireshark.org/review/25696 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-09 00:19:12 +00:00
wtap_rec *rec, tvbuff_t *tvb, frame_data *fd,
EPAN: fix indent (use tab) Change-Id: I0545cf70decf923a3a042fa8c9dec3e60a861268 Reviewed-on: https://code.wireshark.org/review/11391 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28 14:38:39 +00:00
column_info *cinfo)
Provide for per-protocol-tree data in the proto_tree code. Put a hash-table of "interesting" fields in the per-proto-tree data. The dfilter code records which fields/protocols are "interesting" (by which I mean, their value or existence is checked). Thus, the proto_tree routines can create special arrays of field_info*'s that are ready for the dfilter engine to use during a filter operation. Also store the "proto_tree_is_visible" boolean, renamed "visible", in the per-proto-tree data. Move epan_dissect_t to its own header file to make #include dependencies easier to handle. Provide epan_dissect_fill_in_columns(), which accepts just the epan_dissect_t* as an argument. epan_dissect_new() needs to be followed by epan_dissect_run() for the dissection to actually take place. Between those two calls, epan_dissect_prime_dfilter() can be run 0, 1, or multiple times in order to prime the empty proto_tree with the "intersesting" fields from the dfilter_t. svn path=/trunk/; revision=4422
2001-12-18 19:09:08 +00:00
{
Bugfix Lua pinfo.cols.protocol not holding value in postdissector From Hadriel Kaplan, bug 6020 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6020) svn path=/trunk/; revision=47877
2013-02-25 17:32:25 +00:00
#ifdef HAVE_LUA
wslua_prime_dfilter(edt); /* done before entering wmem scope */
#endif
Add wmem scopes for packet and file lifetimes. The file lifetime scope isn't yet initialized because I can't figure out where the enter() and leave() calls should go - the obvious place in packet.c causes a lot of assertion errors. svn path=/trunk/; revision=45879
2012-11-03 15:49:15 +00:00
wmem_enter_packet_scope();
Generalize wtap_pkthdr into a structure for packet and non-packet records. Separate the stuff that any record could have from the stuff that only particular record types have; put the latter into a union, and put all that into a wtap_rec structure. Add some record-type checks as necessary. Change-Id: Id6b3486858f826fce4b096c59231f463e44bfaa2 Reviewed-on: https://code.wireshark.org/review/25696 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-09 00:19:12 +00:00
dissect_record(edt, file_type_subtype, rec, tvb, fd, cinfo);
Move ep_free_all() *AFTER* packet dissection. Use glib allocator for data_source. Thread on wireshark-dev: http://www.wireshark.org/lists/wireshark-dev/201210/msg00116.html svn path=/trunk/; revision=45673
2012-10-20 20:04:40 +00:00
/* free all memory allocated */
Add wmem scopes for packet and file lifetimes. The file lifetime scope isn't yet initialized because I can't figure out where the enter() and leave() calls should go - the obvious place in packet.c causes a lot of assertion errors. svn path=/trunk/; revision=45879
2012-11-03 15:49:15 +00:00
wmem_leave_packet_scope();
Use wtap_blocks for packet comments Mostly functioning proof of concept for #14329. This work is intended to allow Wireshark to support multiple packet comments per packet. Uses and expands upon the `wtap_block` API in `wiretap/wtap_opttypes.h`. It attaches a `wtap_block` structure to `wtap_rec` in place of its current `opt_comment` and `packet_verdict` members to hold OPT_COMMENT and OPT_PKT_VERDICT option values.
2021-04-29 11:23:21 +00:00
wtap_block_unref(rec->block);
rec->block = NULL;
Implement epan_dissect_new() and epan_dissect_free(). These are the "top-level" dissectors that libepan-users call, instead of dissect_packet(). The epan_dissect_t holds the tvbuff after dissection so that the tvbuff's memory is not cleared until after the proto_tree is freed. (I might stuff the proto_tree into the epan_dissect_t, too). What remains of dissect_packet() in packet.c handles the tvbuff initialiation. The real meat of dissect_packet() is now in dissect_frame(), in packet-frame.c This means that "packet.c" is no longer a dissector, os it is no longer passed to make-reg-dotc. Once dissect_fddi() gets two wrapper functions (dissect_fddi_swapped() and dissect_fddi_nonswapped()), the a dissector handoff routine could be used instead of the switch statement in dissect_frame(). I'd register a field like "wtap.encap" svn path=/trunk/; revision=2478
2000-10-06 10:11:40 +00:00
}
Introduce epan_dissect_run_with_taps() which run dissection with taps. unexport tap_queue_init, tap_push_tapped_queue svn path=/trunk/; revision=45670
2012-10-20 19:27:24 +00:00
void
Add support for dissecting non-packet records. Add a dissector table indexed by the file type, and, for the file-type-specific records, have the frame dissector skip the usual pseudo-header processing, as the pseudo-header has a file-type-specific record subtype in it, and call the dissector for that file type's records. Change-Id: Ibe97cf6340ffb0dabc08f355891bc346391b91f9 Reviewed-on: https://code.wireshark.org/review/1782 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-25 00:04:44 +00:00
epan_dissect_run_with_taps(epan_dissect_t *edt, int file_type_subtype,
Generalize wtap_pkthdr into a structure for packet and non-packet records. Separate the stuff that any record could have from the stuff that only particular record types have; put the latter into a union, and put all that into a wtap_rec structure. Add some record-type checks as necessary. Change-Id: Id6b3486858f826fce4b096c59231f463e44bfaa2 Reviewed-on: https://code.wireshark.org/review/25696 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-09 00:19:12 +00:00
wtap_rec *rec, tvbuff_t *tvb, frame_data *fd,
EPAN: fix indent (use tab) Change-Id: I0545cf70decf923a3a042fa8c9dec3e60a861268 Reviewed-on: https://code.wireshark.org/review/11391 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28 14:38:39 +00:00
column_info *cinfo)
Introduce epan_dissect_run_with_taps() which run dissection with taps. unexport tap_queue_init, tap_push_tapped_queue svn path=/trunk/; revision=45670
2012-10-20 19:27:24 +00:00
{
Add wmem scopes for packet and file lifetimes. The file lifetime scope isn't yet initialized because I can't figure out where the enter() and leave() calls should go - the obvious place in packet.c causes a lot of assertion errors. svn path=/trunk/; revision=45879
2012-11-03 15:49:15 +00:00
wmem_enter_packet_scope();
Introduce epan_dissect_run_with_taps() which run dissection with taps. unexport tap_queue_init, tap_push_tapped_queue svn path=/trunk/; revision=45670
2012-10-20 19:27:24 +00:00
tap_queue_init(edt);
Generalize wtap_pkthdr into a structure for packet and non-packet records. Separate the stuff that any record could have from the stuff that only particular record types have; put the latter into a union, and put all that into a wtap_rec structure. Add some record-type checks as necessary. Change-Id: Id6b3486858f826fce4b096c59231f463e44bfaa2 Reviewed-on: https://code.wireshark.org/review/25696 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-09 00:19:12 +00:00
dissect_record(edt, file_type_subtype, rec, tvb, fd, cinfo);
Introduce epan_dissect_run_with_taps() which run dissection with taps. unexport tap_queue_init, tap_push_tapped_queue svn path=/trunk/; revision=45670
2012-10-20 19:27:24 +00:00
tap_push_tapped_queue(edt);
Move ep_free_all() *AFTER* packet dissection. Use glib allocator for data_source. Thread on wireshark-dev: http://www.wireshark.org/lists/wireshark-dev/201210/msg00116.html svn path=/trunk/; revision=45673
2012-10-20 20:04:40 +00:00
/* free all memory allocated */
Add wmem scopes for packet and file lifetimes. The file lifetime scope isn't yet initialized because I can't figure out where the enter() and leave() calls should go - the obvious place in packet.c causes a lot of assertion errors. svn path=/trunk/; revision=45879
2012-11-03 15:49:15 +00:00
wmem_leave_packet_scope();
Use wtap_blocks for packet comments Mostly functioning proof of concept for #14329. This work is intended to allow Wireshark to support multiple packet comments per packet. Uses and expands upon the `wtap_block` API in `wiretap/wtap_opttypes.h`. It attaches a `wtap_block` structure to `wtap_rec` in place of its current `opt_comment` and `packet_verdict` members to hold OPT_COMMENT and OPT_PKT_VERDICT option values.
2021-04-29 11:23:21 +00:00
wtap_block_unref(rec->block);
rec->block = NULL;
Introduce epan_dissect_run_with_taps() which run dissection with taps. unexport tap_queue_init, tap_push_tapped_queue svn path=/trunk/; revision=45670
2012-10-20 19:27:24 +00:00
}
TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2014-01-08 04:35:28 +00:00
void
Generalize wtap_pkthdr into a structure for packet and non-packet records. Separate the stuff that any record could have from the stuff that only particular record types have; put the latter into a union, and put all that into a wtap_rec structure. Add some record-type checks as necessary. Change-Id: Id6b3486858f826fce4b096c59231f463e44bfaa2 Reviewed-on: https://code.wireshark.org/review/25696 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-09 00:19:12 +00:00
epan_dissect_file_run(epan_dissect_t *edt, wtap_rec *rec,
EPAN: fix indent (use tab) Change-Id: I0545cf70decf923a3a042fa8c9dec3e60a861268 Reviewed-on: https://code.wireshark.org/review/11391 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28 14:38:39 +00:00
tvbuff_t *tvb, frame_data *fd, column_info *cinfo)
TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2014-01-08 04:35:28 +00:00
{
#ifdef HAVE_LUA
wslua_prime_dfilter(edt); /* done before entering wmem scope */
#endif
wmem_enter_packet_scope();
Generalize wtap_pkthdr into a structure for packet and non-packet records. Separate the stuff that any record could have from the stuff that only particular record types have; put the latter into a union, and put all that into a wtap_rec structure. Add some record-type checks as necessary. Change-Id: Id6b3486858f826fce4b096c59231f463e44bfaa2 Reviewed-on: https://code.wireshark.org/review/25696 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-09 00:19:12 +00:00
dissect_file(edt, rec, tvb, fd, cinfo);
TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2014-01-08 04:35:28 +00:00
/* free all memory allocated */
wmem_leave_packet_scope();
Use wtap_blocks for packet comments Mostly functioning proof of concept for #14329. This work is intended to allow Wireshark to support multiple packet comments per packet. Uses and expands upon the `wtap_block` API in `wiretap/wtap_opttypes.h`. It attaches a `wtap_block` structure to `wtap_rec` in place of its current `opt_comment` and `packet_verdict` members to hold OPT_COMMENT and OPT_PKT_VERDICT option values.
2021-04-29 11:23:21 +00:00
wtap_block_unref(rec->block);
rec->block = NULL;
TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2014-01-08 04:35:28 +00:00
}
void
Generalize wtap_pkthdr into a structure for packet and non-packet records. Separate the stuff that any record could have from the stuff that only particular record types have; put the latter into a union, and put all that into a wtap_rec structure. Add some record-type checks as necessary. Change-Id: Id6b3486858f826fce4b096c59231f463e44bfaa2 Reviewed-on: https://code.wireshark.org/review/25696 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-09 00:19:12 +00:00
epan_dissect_file_run_with_taps(epan_dissect_t *edt, wtap_rec *rec,
EPAN: fix indent (use tab) Change-Id: I0545cf70decf923a3a042fa8c9dec3e60a861268 Reviewed-on: https://code.wireshark.org/review/11391 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28 14:38:39 +00:00
tvbuff_t *tvb, frame_data *fd, column_info *cinfo)
TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2014-01-08 04:35:28 +00:00
{
wmem_enter_packet_scope();
tap_queue_init(edt);
Generalize wtap_pkthdr into a structure for packet and non-packet records. Separate the stuff that any record could have from the stuff that only particular record types have; put the latter into a union, and put all that into a wtap_rec structure. Add some record-type checks as necessary. Change-Id: Id6b3486858f826fce4b096c59231f463e44bfaa2 Reviewed-on: https://code.wireshark.org/review/25696 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-09 00:19:12 +00:00
dissect_file(edt, rec, tvb, fd, cinfo);
TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2014-01-08 04:35:28 +00:00
tap_push_tapped_queue(edt);
/* free all memory allocated */
wmem_leave_packet_scope();
Use wtap_blocks for packet comments Mostly functioning proof of concept for #14329. This work is intended to allow Wireshark to support multiple packet comments per packet. Uses and expands upon the `wtap_block` API in `wiretap/wtap_opttypes.h`. It attaches a `wtap_block` structure to `wtap_rec` in place of its current `opt_comment` and `packet_verdict` members to hold OPT_COMMENT and OPT_PKT_VERDICT option values.
2021-04-29 11:23:21 +00:00
wtap_block_unref(rec->block);
rec->block = NULL;
TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2014-01-08 04:35:28 +00:00
}
Implement epan_dissect_new() and epan_dissect_free(). These are the "top-level" dissectors that libepan-users call, instead of dissect_packet(). The epan_dissect_t holds the tvbuff after dissection so that the tvbuff's memory is not cleared until after the proto_tree is freed. (I might stuff the proto_tree into the epan_dissect_t, too). What remains of dissect_packet() in packet.c handles the tvbuff initialiation. The real meat of dissect_packet() is now in dissect_frame(), in packet-frame.c This means that "packet.c" is no longer a dissector, os it is no longer passed to make-reg-dotc. Once dissect_fddi() gets two wrapper functions (dissect_fddi_swapped() and dissect_fddi_nonswapped()), the a dissector handoff routine could be used instead of the switch statement in dissect_frame(). I'd register a field like "wtap.encap" svn path=/trunk/; revision=2478
2000-10-06 10:11:40 +00:00
void
Introduce epan_dissect_init()/epan_dissect_cleanup(). These are used to initialise/cleanup stack allocated 'edt' structures. This should speed up dissection since we avoid some malloc traffic. svn path=/trunk/; revision=29404
2009-08-13 19:42:46 +00:00
epan_dissect_cleanup(epan_dissect_t* edt)
Implement epan_dissect_new() and epan_dissect_free(). These are the "top-level" dissectors that libepan-users call, instead of dissect_packet(). The epan_dissect_t holds the tvbuff after dissection so that the tvbuff's memory is not cleared until after the proto_tree is freed. (I might stuff the proto_tree into the epan_dissect_t, too). What remains of dissect_packet() in packet.c handles the tvbuff initialiation. The real meat of dissect_packet() is now in dissect_frame(), in packet-frame.c This means that "packet.c" is no longer a dissector, os it is no longer passed to make-reg-dotc. Once dissect_fddi() gets two wrapper functions (dissect_fddi_swapped() and dissect_fddi_nonswapped()), the a dissector handoff routine could be used instead of the switch statement in dissect_frame(). I'd register a field like "wtap.encap" svn path=/trunk/; revision=2478
2000-10-06 10:11:40 +00:00
{
Replace g_assert() with ws_assert()
2021-06-18 18:21:42 +00:00
ws_assert(edt);
Introduce epan_dissect_init()/epan_dissect_cleanup(). These are used to initialise/cleanup stack allocated 'edt' structures. This should speed up dissection since we avoid some malloc traffic. svn path=/trunk/; revision=29404
2009-08-13 19:42:46 +00:00
Add new plugin type for libwireshark Allow epan itself to be extended by plugins. Adds the following new plugin interfaces: void plugin_epan_init() void plugin_epan_dissect_init(epan_dissect_t *) void plugin_epan_dissect_cleanup(epan_dissect_t *) void plugin_epan_cleanup() void plugin_epan_register_all_protocols(register_cb, gointer) [OPTIONAL] void plugin_epan_register_all_handoffs(register_cb, gointer) [OPTIONAL] Any one of these can be an empty function but the first four must be present. The motivation for the change is a better way to implement a language binding other than registering a fake protocol and stuffing everything into a single dissector call (and maybe require an extra packet_info field) but I expect there would be other interesting use cases. Change-Id: I215d50750ac7561fe25fdcdcfbc6a3f351984785 Reviewed-on: https://code.wireshark.org/review/24813 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-08-29 14:34:31 +00:00
g_slist_foreach(epan_plugins, epan_plugin_dissect_cleanup, edt);
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
g_slist_free(edt->pi.proto_data);
Fix dependent_frames memleak. Reviewed-By: Jeff Morriss (http://www.wireshark.org/lists/wireshark-dev/201204/msg00013.html) svn path=/trunk/; revision=41902
2012-04-03 09:18:16 +00:00
g_slist_free(edt->pi.dependent_frames);
Get rid of the "data_src" member of the "frame_data" structure; put it in the "packet_info" structure instead, as we don't need a pointer for every single frame in the capture file, just for each frame for which we currently have an open "epan_dissect_t". svn path=/trunk/; revision=5614
2002-06-04 07:03:57 +00:00
/* Free the data sources list. */
free_data_sources(&edt->pi);
Reintroduce back epan_dissect_reset(), proto_tree_reset() This time it makes more sense, cause for each dissection we need two wmem allocators. Reseting wmem allocator is much faster than destroy & create. svn path=/trunk/; revision=52706
2013-10-20 10:21:25 +00:00
if (edt->tvb) {
/* Free all tvb's chained from this tvb */
tvb_free_chain(edt->tvb);
}
Implement epan_dissect_new() and epan_dissect_free(). These are the "top-level" dissectors that libepan-users call, instead of dissect_packet(). The epan_dissect_t holds the tvbuff after dissection so that the tvbuff's memory is not cleared until after the proto_tree is freed. (I might stuff the proto_tree into the epan_dissect_t, too). What remains of dissect_packet() in packet.c handles the tvbuff initialiation. The real meat of dissect_packet() is now in dissect_frame(), in packet-frame.c This means that "packet.c" is no longer a dissector, os it is no longer passed to make-reg-dotc. Once dissect_fddi() gets two wrapper functions (dissect_fddi_swapped() and dissect_fddi_nonswapped()), the a dissector handoff routine could be used instead of the switch statement in dissect_frame(). I'd register a field like "wtap.encap" svn path=/trunk/; revision=2478
2000-10-06 10:11:40 +00:00
Remove proto_tree from capture_file and PacketWinData, since they already contain a pointer to an epan_dissect_t, which contains the proto_tree. Routines calling epan_dissect_new() do not create their own proto_tree via proto_tree_create_root(); instead, they pass a boolean to epan_dissect_new() telling it whether it should create the root proto_tree. svn path=/trunk/; revision=4343
2001-12-06 04:25:09 +00:00
if (edt->tree) {
proto_tree_free(edt->tree);
}
Create a wmem pool in pinfo and use it for some address allocations. A (better?) fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8030 See also thread starting at: http://www.wireshark.org/lists/wireshark-dev/201212/msg00001.html svn path=/trunk/; revision=46331
2012-12-02 17:01:04 +00:00
Effectively remove the tree memory pool and port some of its behaviour to the pinfo memory pool, they have exactly the same scope. Simplification and minor performance win (one GHashTable we longer have to create/destroy on every packet). svn path=/trunk/; revision=53076
2013-11-04 14:12:59 +00:00
if (pinfo_pool_cache == NULL) {
wmem_free_all(edt->pi.pool);
pinfo_pool_cache = edt->pi.pool;
}
else {
wmem_destroy_allocator(edt->pi.pool);
}
Introduce epan_dissect_init()/epan_dissect_cleanup(). These are used to initialise/cleanup stack allocated 'edt' structures. This should speed up dissection since we avoid some malloc traffic. svn path=/trunk/; revision=29404
2009-08-13 19:42:46 +00:00
}
Remove proto_tree from capture_file and PacketWinData, since they already contain a pointer to an epan_dissect_t, which contains the proto_tree. Routines calling epan_dissect_new() do not create their own proto_tree via proto_tree_create_root(); instead, they pass a boolean to epan_dissect_new() telling it whether it should create the root proto_tree. svn path=/trunk/; revision=4343
2001-12-06 04:25:09 +00:00
Introduce epan_dissect_init()/epan_dissect_cleanup(). These are used to initialise/cleanup stack allocated 'edt' structures. This should speed up dissection since we avoid some malloc traffic. svn path=/trunk/; revision=29404
2009-08-13 19:42:46 +00:00
void
epan_dissect_free(epan_dissect_t* edt)
{
epan_dissect_cleanup(edt);
Implement epan_dissect_new() and epan_dissect_free(). These are the "top-level" dissectors that libepan-users call, instead of dissect_packet(). The epan_dissect_t holds the tvbuff after dissection so that the tvbuff's memory is not cleared until after the proto_tree is freed. (I might stuff the proto_tree into the epan_dissect_t, too). What remains of dissect_packet() in packet.c handles the tvbuff initialiation. The real meat of dissect_packet() is now in dissect_frame(), in packet-frame.c This means that "packet.c" is no longer a dissector, os it is no longer passed to make-reg-dotc. Once dissect_fddi() gets two wrapper functions (dissect_fddi_swapped() and dissect_fddi_nonswapped()), the a dissector handoff routine could be used instead of the switch statement in dissect_frame(). I'd register a field like "wtap.encap" svn path=/trunk/; revision=2478
2000-10-06 10:11:40 +00:00
g_free(edt);
}
Provide for per-protocol-tree data in the proto_tree code. Put a hash-table of "interesting" fields in the per-proto-tree data. The dfilter code records which fields/protocols are "interesting" (by which I mean, their value or existence is checked). Thus, the proto_tree routines can create special arrays of field_info*'s that are ready for the dfilter engine to use during a filter operation. Also store the "proto_tree_is_visible" boolean, renamed "visible", in the per-proto-tree data. Move epan_dissect_t to its own header file to make #include dependencies easier to handle. Provide epan_dissect_fill_in_columns(), which accepts just the epan_dissect_t* as an argument. epan_dissect_new() needs to be followed by epan_dissect_run() for the dissection to actually take place. Between those two calls, epan_dissect_prime_dfilter() can be run 0, 1, or multiple times in order to prime the empty proto_tree with the "intersesting" fields from the dfilter_t. svn path=/trunk/; revision=4422
2001-12-18 19:09:08 +00:00
void
Rename routines to clarify what they do. XXX_prime_with_YYY makes it a bit clearer than does XXX_prime_YYY that we're not priming YYY, we're priming XXX *using* YYY. Change-Id: I1686b8b5469bc0f0bd6db8551fb6301776a1b133 Reviewed-on: https://code.wireshark.org/review/21031 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-12 04:56:14 +00:00
epan_dissect_prime_with_dfilter(epan_dissect_t *edt, const dfilter_t* dfcode)
Provide for per-protocol-tree data in the proto_tree code. Put a hash-table of "interesting" fields in the per-proto-tree data. The dfilter code records which fields/protocols are "interesting" (by which I mean, their value or existence is checked). Thus, the proto_tree routines can create special arrays of field_info*'s that are ready for the dfilter engine to use during a filter operation. Also store the "proto_tree_is_visible" boolean, renamed "visible", in the per-proto-tree data. Move epan_dissect_t to its own header file to make #include dependencies easier to handle. Provide epan_dissect_fill_in_columns(), which accepts just the epan_dissect_t* as an argument. epan_dissect_new() needs to be followed by epan_dissect_run() for the dissection to actually take place. Between those two calls, epan_dissect_prime_dfilter() can be run 0, 1, or multiple times in order to prime the empty proto_tree with the "intersesting" fields from the dfilter_t. svn path=/trunk/; revision=4422
2001-12-18 19:09:08 +00:00
{
Don't walk the entire protocol tree to extract the value of one field. Instead, prime the epan_dissect_t's tree to look for rtp.ssrc, and extract that value with proto_get_finfo_ptr_array(). Also, have the filter used to check whether the packet is a candidate for RTP analysis to check for RTPv2 (and add a check for IPv4 or IPv6 back to the Qt version), and get rid of an unnecessary extra level of indirection for that string. In the Qt version, if findStreams() set the error string, don't overwrite it with a "No streams found." indication, and fix error handling for the "filter didn't compile" case. Change-Id: I09d0ea37ccd4806d99e3b6394f2a8a376e974705 Reviewed-on: https://code.wireshark.org/review/13045 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-04 21:14:08 +00:00
dfilter_prime_proto_tree(dfcode, edt->tree);
}
void
Rename routines to clarify what they do. XXX_prime_with_YYY makes it a bit clearer than does XXX_prime_YYY that we're not priming YYY, we're priming XXX *using* YYY. Change-Id: I1686b8b5469bc0f0bd6db8551fb6301776a1b133 Reviewed-on: https://code.wireshark.org/review/21031 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-12 04:56:14 +00:00
epan_dissect_prime_with_hfid(epan_dissect_t *edt, int hfid)
Don't walk the entire protocol tree to extract the value of one field. Instead, prime the epan_dissect_t's tree to look for rtp.ssrc, and extract that value with proto_get_finfo_ptr_array(). Also, have the filter used to check whether the packet is a candidate for RTP analysis to check for RTPv2 (and add a check for IPv4 or IPv6 back to the Qt version), and get rid of an unnecessary extra level of indirection for that string. In the Qt version, if findStreams() set the error string, don't overwrite it with a "No streams found." indication, and fix error handling for the "filter didn't compile" case. Change-Id: I09d0ea37ccd4806d99e3b6394f2a8a376e974705 Reviewed-on: https://code.wireshark.org/review/13045 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-04 21:14:08 +00:00
{
Rename routines to clarify what they do. XXX_prime_with_YYY makes it a bit clearer than does XXX_prime_YYY that we're not priming YYY, we're priming XXX *using* YYY. Change-Id: I1686b8b5469bc0f0bd6db8551fb6301776a1b133 Reviewed-on: https://code.wireshark.org/review/21031 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-12 04:56:14 +00:00
proto_tree_prime_with_hfid(edt->tree, hfid);
From Didier Gautheron: move custom col set from proto_tree_set_xxx() to epan_dissect_fill_in_columns(). https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3930 I'v added the new functions to the .h files. svn path=/trunk/; revision=29551
2009-08-25 21:10:35 +00:00
}
Prime the epan_dissect_t with postdissector wanted fields if necessary. This makes sure that postdissectors that indicate that they need certain fields in the first pass will get them. While we're at it: Fix the field-fetching code in TRANSUM not to assume it got any instances of the field being fetched. Rename process_packet_first_pass() in sharkd to process_packet(), as it's the only routine in sharkd that processes packets. Rename process_packet() in tshark and tfshark to process_packet_single_pass(), as it's what's used if we're only doing one-pass analysis. Clean up comments and whitespace. Change-Id: I3769af952c66f5ca4b68002ad6213858ab9cab9b Reviewed-on: https://code.wireshark.org/review/21063 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-12 20:52:07 +00:00
void
epan_dissect_prime_with_hfid_array(epan_dissect_t *edt, GArray *hfids)
{
guint i;
for (i = 0; i < hfids->len; i++) {
proto_tree_prime_with_hfid(edt->tree,
g_array_index(hfids, int, i));
}
}
From Didier Gautheron: move custom col set from proto_tree_set_xxx() to epan_dissect_fill_in_columns(). https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3930 I'v added the new functions to the .h files. svn path=/trunk/; revision=29551
2009-08-25 21:10:35 +00:00
/* ----------------------- */
const gchar *
Add support for multifields in custom column You can now add column with Custom type with more than one field by using OR "||" splitter. Bug: 9695 Change-Id: Ia82a91e7a35b867647d36cb9626e3870f46c0d85 Reviewed-on: https://code.wireshark.org/review/5804 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-17 10:38:49 +00:00
epan_custom_set(epan_dissect_t *edt, GSList *field_ids,
EPAN: fix indent (use tab) Change-Id: I0545cf70decf923a3a042fa8c9dec3e60a861268 Reviewed-on: https://code.wireshark.org/review/11391 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28 14:38:39 +00:00
gint occurrence,
gchar *result,
gchar *expr, const int size )
From Didier Gautheron: move custom col set from proto_tree_set_xxx() to epan_dissect_fill_in_columns(). https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3930 I'v added the new functions to the .h files. svn path=/trunk/; revision=29551
2009-08-25 21:10:35 +00:00
{
EPAN: fix indent (use tab) Change-Id: I0545cf70decf923a3a042fa8c9dec3e60a861268 Reviewed-on: https://code.wireshark.org/review/11391 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28 14:38:39 +00:00
return proto_custom_set(edt->tree, field_ids, occurrence, result, expr, size);
Provide for per-protocol-tree data in the proto_tree code. Put a hash-table of "interesting" fields in the per-proto-tree data. The dfilter code records which fields/protocols are "interesting" (by which I mean, their value or existence is checked). Thus, the proto_tree routines can create special arrays of field_info*'s that are ready for the dfilter engine to use during a filter operation. Also store the "proto_tree_is_visible" boolean, renamed "visible", in the per-proto-tree data. Move epan_dissect_t to its own header file to make #include dependencies easier to handle. Provide epan_dissect_fill_in_columns(), which accepts just the epan_dissect_t* as an argument. epan_dissect_new() needs to be followed by epan_dissect_run() for the dissection to actually take place. Between those two calls, epan_dissect_prime_dfilter() can be run 0, 1, or multiple times in order to prime the empty proto_tree with the "intersesting" fields from the dfilter_t. svn path=/trunk/; revision=4422
2001-12-18 19:09:08 +00:00
}
void
From Yaniv Kaul: constify parameters https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
epan_dissect_fill_in_columns(epan_dissect_t *edt, const gboolean fill_col_exprs, const gboolean fill_fd_colums)
Provide for per-protocol-tree data in the proto_tree code. Put a hash-table of "interesting" fields in the per-proto-tree data. The dfilter code records which fields/protocols are "interesting" (by which I mean, their value or existence is checked). Thus, the proto_tree routines can create special arrays of field_info*'s that are ready for the dfilter engine to use during a filter operation. Also store the "proto_tree_is_visible" boolean, renamed "visible", in the per-proto-tree data. Move epan_dissect_t to its own header file to make #include dependencies easier to handle. Provide epan_dissect_fill_in_columns(), which accepts just the epan_dissect_t* as an argument. epan_dissect_new() needs to be followed by epan_dissect_run() for the dissection to actually take place. Between those two calls, epan_dissect_prime_dfilter() can be run 0, 1, or multiple times in order to prime the empty proto_tree with the "intersesting" fields from the dfilter_t. svn path=/trunk/; revision=4422
2001-12-18 19:09:08 +00:00
{
EPAN: fix indent (use tab) Change-Id: I0545cf70decf923a3a042fa8c9dec3e60a861268 Reviewed-on: https://code.wireshark.org/review/11391 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28 14:38:39 +00:00
col_custom_set_edt(edt, edt->pi.cinfo);
col_fill_in(&edt->pi, fill_col_exprs, fill_fd_colums);
Provide for per-protocol-tree data in the proto_tree code. Put a hash-table of "interesting" fields in the per-proto-tree data. The dfilter code records which fields/protocols are "interesting" (by which I mean, their value or existence is checked). Thus, the proto_tree routines can create special arrays of field_info*'s that are ready for the dfilter engine to use during a filter operation. Also store the "proto_tree_is_visible" boolean, renamed "visible", in the per-proto-tree data. Move epan_dissect_t to its own header file to make #include dependencies easier to handle. Provide epan_dissect_fill_in_columns(), which accepts just the epan_dissect_t* as an argument. epan_dissect_new() needs to be followed by epan_dissect_run() for the dissection to actually take place. Between those two calls, epan_dissect_prime_dfilter() can be run 0, 1, or multiple times in order to prime the empty proto_tree with the "intersesting" fields from the dfilter_t. svn path=/trunk/; revision=4422
2001-12-18 19:09:08 +00:00
}
From Didier Gautheron: move custom col set from proto_tree_set_xxx() to epan_dissect_fill_in_columns(). https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3930 I'v added the new functions to the .h files. svn path=/trunk/; revision=29551
2009-08-25 21:10:35 +00:00
Turn "packet_is_ssl()" into a general "does the packet whose dissection is in this epan_dissect_t contain the field whose name is passed as an argument" routine in libwireshark, and use it where we used packet_is_ssl(). (We should check to see if anything *else* could use it.) svn path=/trunk/; revision=49530
2013-05-22 23:02:19 +00:00
gboolean
epan_dissect_packet_contains_field(epan_dissect_t* edt,
EPAN: fix indent (use tab) Change-Id: I0545cf70decf923a3a042fa8c9dec3e60a861268 Reviewed-on: https://code.wireshark.org/review/11391 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28 14:38:39 +00:00
const char *field_name)
Turn "packet_is_ssl()" into a general "does the packet whose dissection is in this epan_dissect_t contain the field whose name is passed as an argument" routine in libwireshark, and use it where we used packet_is_ssl(). (We should check to see if anything *else* could use it.) svn path=/trunk/; revision=49530
2013-05-22 23:02:19 +00:00
{
EPAN: fix indent (use tab) Change-Id: I0545cf70decf923a3a042fa8c9dec3e60a861268 Reviewed-on: https://code.wireshark.org/review/11391 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28 14:38:39 +00:00
GPtrArray* array;
int field_id;
gboolean contains_field;
if (!edt || !edt->tree)
return FALSE;
field_id = proto_get_id_by_filter_name(field_name);
if (field_id < 0)
return FALSE;
array = proto_find_finfo(edt->tree, field_id);
contains_field = (array->len > 0) ? TRUE : FALSE;
g_ptr_array_free(array, TRUE);
return contains_field;
Turn "packet_is_ssl()" into a general "does the packet whose dissection is in this epan_dissect_t contain the field whose name is passed as an argument" routine in libwireshark, and use it where we used packet_is_ssl(). (We should check to see if anything *else* could use it.) svn path=/trunk/; revision=49530
2013-05-22 23:02:19 +00:00
}
Move the code to get version information for libraries used by libwireshark into libwireshark, and call it only in programs linked with libwireshark. That way, programs that don't link with libwireshark don't have to link with libgcrypt or libgnutls solely so that they can say that they're linked with a particular version of libgcrypt or libgnutls. Don't link dumpcap with libgcrypt or libgnutls any more. svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
/*
* Get compile-time information for libraries used by libwireshark.
*/
void
epan_get_compiled_version_info(GString *str)
{
EPAN: fix indent (use tab) Change-Id: I0545cf70decf923a3a042fa8c9dec3e60a861268 Reviewed-on: https://code.wireshark.org/review/11391 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28 14:38:39 +00:00
/* LUA */
From Tony Trinh: Update Lua from 5.1 to 5.2 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400 svn path=/trunk/; revision=43482
2012-06-25 20:42:07 +00:00
#ifdef HAVE_LUA
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", with " LUA_RELEASE);
Move the code to get version information for libraries used by libwireshark into libwireshark, and call it only in programs linked with libwireshark. That way, programs that don't link with libwireshark don't have to link with libgcrypt or libgnutls solely so that they can say that they're linked with a particular version of libgcrypt or libgnutls. Don't link dumpcap with libgcrypt or libgnutls any more. svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
#else
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", without Lua");
From Tony Trinh: Update Lua from 5.1 to 5.2 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400 svn path=/trunk/; revision=43482
2012-06-25 20:42:07 +00:00
#endif /* HAVE_LUA */
Move the code to get version information for libraries used by libwireshark into libwireshark, and call it only in programs linked with libwireshark. That way, programs that don't link with libwireshark don't have to link with libgcrypt or libgnutls solely so that they can say that they're linked with a particular version of libgcrypt or libgnutls. Don't link dumpcap with libgcrypt or libgnutls any more. svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
EPAN: fix indent (use tab) Change-Id: I0545cf70decf923a3a042fa8c9dec3e60a861268 Reviewed-on: https://code.wireshark.org/review/11391 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28 14:38:39 +00:00
/* GnuTLS */
Move the code to get version information for libraries used by libwireshark into libwireshark, and call it only in programs linked with libwireshark. That way, programs that don't link with libwireshark don't have to link with libgcrypt or libgnutls solely so that they can say that they're linked with a particular version of libgcrypt or libgnutls. Don't link dumpcap with libgcrypt or libgnutls any more. svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
#ifdef HAVE_LIBGNUTLS
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", with GnuTLS " LIBGNUTLS_VERSION);
Add support for RSA decryption using PKCS #11 tokens Add support for loading RSA private key files from PKCS #11 tokens, identified by PKCS #11 URIs. Add a new 'pkcs11_libs' UAT which can dynamically load PKCS #11 provider libraries that are not found by p11-kit. The configuration GUI will need additional code to discover available PKCS #11 tokens and will be added later. This feature requires GnuTLS 3.4 with PKCS #11 support, so Windows, macOS via Homebrew, Ubuntu 16.04, Debian Stretch. Not supported: RHEL7. Currently macOS via official packages disables PKCS #11 support, so that will also not work. Change-Id: I20646bfd69c6bd13c8c2d27cb65c164a4b0b7a66 Reviewed-on: https://code.wireshark.org/review/30855 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-12 13:34:00 +00:00
#ifdef HAVE_GNUTLS_PKCS11
g_string_append(str, " and PKCS #11 support");
#endif /* HAVE_GNUTLS_PKCS11 */
Move the code to get version information for libraries used by libwireshark into libwireshark, and call it only in programs linked with libwireshark. That way, programs that don't link with libwireshark don't have to link with libgcrypt or libgnutls solely so that they can say that they're linked with a particular version of libgcrypt or libgnutls. Don't link dumpcap with libgcrypt or libgnutls any more. svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
#else
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", without GnuTLS");
Move the code to get version information for libraries used by libwireshark into libwireshark, and call it only in programs linked with libwireshark. That way, programs that don't link with libwireshark don't have to link with libgcrypt or libgnutls solely so that they can say that they're linked with a particular version of libgcrypt or libgnutls. Don't link dumpcap with libgcrypt or libgnutls any more. svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
#endif /* HAVE_LIBGNUTLS */
EPAN: fix indent (use tab) Change-Id: I0545cf70decf923a3a042fa8c9dec3e60a861268 Reviewed-on: https://code.wireshark.org/review/11391 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28 14:38:39 +00:00
/* Gcrypt */
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", with Gcrypt " GCRYPT_VERSION);
Move the code to get version information for libraries used by libwireshark into libwireshark, and call it only in programs linked with libwireshark. That way, programs that don't link with libwireshark don't have to link with libgcrypt or libgnutls solely so that they can say that they're linked with a particular version of libgcrypt or libgnutls. Don't link dumpcap with libgcrypt or libgnutls any more. svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
EPAN: fix indent (use tab) Change-Id: I0545cf70decf923a3a042fa8c9dec3e60a861268 Reviewed-on: https://code.wireshark.org/review/11391 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28 14:38:39 +00:00
/* Kerberos */
epan: Remove some extraneous #ifdefs If a macro identifier is not defined it evaluates to zero in an expression, so the outer #ifdef is unnecessary and should be avoided (the less the better). Add a missing CMake comment while here.
2021-09-18 13:41:49 +00:00
#if defined(HAVE_MIT_KERBEROS)
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", with MIT Kerberos");
epan: Remove some extraneous #ifdefs If a macro identifier is not defined it evaluates to zero in an expression, so the outer #ifdef is unnecessary and should be avoided (the less the better). Add a missing CMake comment while here.
2021-09-18 13:41:49 +00:00
#elif defined(HAVE_HEIMDAL_KERBEROS)
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", with Heimdal Kerberos");
Move the code to get version information for libraries used by libwireshark into libwireshark, and call it only in programs linked with libwireshark. That way, programs that don't link with libwireshark don't have to link with libgcrypt or libgnutls solely so that they can say that they're linked with a particular version of libgcrypt or libgnutls. Don't link dumpcap with libgcrypt or libgnutls any more. svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
#else
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", without Kerberos");
Move the code to get version information for libraries used by libwireshark into libwireshark, and call it only in programs linked with libwireshark. That way, programs that don't link with libwireshark don't have to link with libgcrypt or libgnutls solely so that they can say that they're linked with a particular version of libgcrypt or libgnutls. Don't link dumpcap with libgcrypt or libgnutls any more. svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
#endif /* HAVE_KERBEROS */
Transition from GeoIP Legacy to MaxMindDB. MaxMind is discontinuing its legacy databases in April in favor of GeoIP2, which use a newer database format (MaxMind DB). The reference C library (libmaxminddb) is available under the Apache 2.0 license which isn't quite compatible with ours. Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin and prints resolved information on stdout. Place it under a liberal license (MIT) so that we can keep libmaxminddb at arm's length. Add epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it via stdio. Migrate the preferences and documentation to MaxMindDB. Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the geographic coordinate fields to FT_DOUBLEs. Bug: 10658 Change-Id: I24aeed637bea1b41d173270bda413af230f4425f Reviewed-on: https://code.wireshark.org/review/26214 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-09 01:20:26 +00:00
/* MaxMindDB */
#ifdef HAVE_MAXMINDDB
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", with MaxMind DB resolver");
Move the code to get version information for libraries used by libwireshark into libwireshark, and call it only in programs linked with libwireshark. That way, programs that don't link with libwireshark don't have to link with libgcrypt or libgnutls solely so that they can say that they're linked with a particular version of libgcrypt or libgnutls. Don't link dumpcap with libgcrypt or libgnutls any more. svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
#else
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", without MaxMind DB resolver");
Transition from GeoIP Legacy to MaxMindDB. MaxMind is discontinuing its legacy databases in April in favor of GeoIP2, which use a newer database format (MaxMind DB). The reference C library (libmaxminddb) is available under the Apache 2.0 license which isn't quite compatible with ours. Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin and prints resolved information on stdout. Place it under a liberal license (MIT) so that we can keep libmaxminddb at arm's length. Add epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it via stdio. Migrate the preferences and documentation to MaxMindDB. Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the geographic coordinate fields to FT_DOUBLEs. Bug: 10658 Change-Id: I24aeed637bea1b41d173270bda413af230f4425f Reviewed-on: https://code.wireshark.org/review/26214 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-09 01:20:26 +00:00
#endif /* HAVE_MAXMINDDB */
Move the code to get version information for libraries used by libwireshark into libwireshark, and call it only in programs linked with libwireshark. That way, programs that don't link with libwireshark don't have to link with libgcrypt or libgnutls solely so that they can say that they're linked with a particular version of libgcrypt or libgnutls. Don't link dumpcap with libgcrypt or libgnutls any more. svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
Remove nghttp2 code and use system' nghttp2 Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-26 13:18:29 +00:00
/* nghttp2 */
#ifdef HAVE_NGHTTP2
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", with nghttp2 " NGHTTP2_VERSION);
Remove nghttp2 code and use system' nghttp2 Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-26 13:18:29 +00:00
#else
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", without nghttp2");
Remove nghttp2 code and use system' nghttp2 Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-26 13:18:29 +00:00
#endif /* HAVE_NGHTTP2 */
cql: add lz4 and snappy decompression We do not use the STARTUP negotiation since a stream can be captured in its middle but try to decompress if the flag is present and fallback if it fails. Change-Id: Iecbf49a45220b04be7808869c9884548eb1e7694 Signed-off-by: Benoît Canet <benoit@scylladb.com> Reviewed-on: https://code.wireshark.org/review/17952 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-26 14:25:11 +00:00
Add brotli decompression support for HTTP and HTTP2 dissectors. Change-Id: I9c09f55673187f6fee723fcd72798fb6b9958b03 Reviewed-on: https://code.wireshark.org/review/32745 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-10 10:52:52 +00:00
/* brotli */
#ifdef HAVE_BROTLI
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", with brotli");
Add brotli decompression support for HTTP and HTTP2 dissectors. Change-Id: I9c09f55673187f6fee723fcd72798fb6b9958b03 Reviewed-on: https://code.wireshark.org/review/32745 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-10 10:52:52 +00:00
#else
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", without brotli");
Add brotli decompression support for HTTP and HTTP2 dissectors. Change-Id: I9c09f55673187f6fee723fcd72798fb6b9958b03 Reviewed-on: https://code.wireshark.org/review/32745 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-10 10:52:52 +00:00
#endif /* HAVE_BROTLI */
cql: add lz4 and snappy decompression We do not use the STARTUP negotiation since a stream can be captured in its middle but try to decompress if the flag is present and fallback if it fails. Change-Id: Iecbf49a45220b04be7808869c9884548eb1e7694 Signed-off-by: Benoît Canet <benoit@scylladb.com> Reviewed-on: https://code.wireshark.org/review/17952 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-26 14:25:11 +00:00
/* LZ4 */
#ifdef HAVE_LZ4
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", with LZ4");
cql: add lz4 and snappy decompression We do not use the STARTUP negotiation since a stream can be captured in its middle but try to decompress if the flag is present and fallback if it fails. Change-Id: Iecbf49a45220b04be7808869c9884548eb1e7694 Signed-off-by: Benoît Canet <benoit@scylladb.com> Reviewed-on: https://code.wireshark.org/review/17952 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-26 14:25:11 +00:00
#else
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", without LZ4");
cql: add lz4 and snappy decompression We do not use the STARTUP negotiation since a stream can be captured in its middle but try to decompress if the flag is present and fallback if it fails. Change-Id: Iecbf49a45220b04be7808869c9884548eb1e7694 Signed-off-by: Benoît Canet <benoit@scylladb.com> Reviewed-on: https://code.wireshark.org/review/17952 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-26 14:25:11 +00:00
#endif /* HAVE_LZ4 */
Kafka: include zstd compression in Kafka message batches Change-Id: I1d06486ccf7b174ee9aa621fa3d8acb8b3673777 Reviewed-on: https://code.wireshark.org/review/34222 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-12 21:57:45 +00:00
/* Zstandard */
#ifdef HAVE_ZSTD
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", with Zstandard");
Kafka: include zstd compression in Kafka message batches Change-Id: I1d06486ccf7b174ee9aa621fa3d8acb8b3673777 Reviewed-on: https://code.wireshark.org/review/34222 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-12 21:57:45 +00:00
#else
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", without Zstandard");
Kafka: include zstd compression in Kafka message batches Change-Id: I1d06486ccf7b174ee9aa621fa3d8acb8b3673777 Reviewed-on: https://code.wireshark.org/review/34222 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-12 21:57:45 +00:00
#endif /* HAVE_ZSTD */
cql: add lz4 and snappy decompression We do not use the STARTUP negotiation since a stream can be captured in its middle but try to decompress if the flag is present and fallback if it fails. Change-Id: Iecbf49a45220b04be7808869c9884548eb1e7694 Signed-off-by: Benoît Canet <benoit@scylladb.com> Reviewed-on: https://code.wireshark.org/review/17952 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-26 14:25:11 +00:00
/* Snappy */
#ifdef HAVE_SNAPPY
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", with Snappy");
cql: add lz4 and snappy decompression We do not use the STARTUP negotiation since a stream can be captured in its middle but try to decompress if the flag is present and fallback if it fails. Change-Id: Iecbf49a45220b04be7808869c9884548eb1e7694 Signed-off-by: Benoît Canet <benoit@scylladb.com> Reviewed-on: https://code.wireshark.org/review/17952 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-26 14:25:11 +00:00
#else
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", without Snappy");
cql: add lz4 and snappy decompression We do not use the STARTUP negotiation since a stream can be captured in its middle but try to decompress if the flag is present and fallback if it fails. Change-Id: Iecbf49a45220b04be7808869c9884548eb1e7694 Signed-off-by: Benoît Canet <benoit@scylladb.com> Reviewed-on: https://code.wireshark.org/review/17952 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-26 14:25:11 +00:00
#endif /* HAVE_SNAPPY */
Add libxml2 as optional dependency This can be used by dissectors that need to parse out-of-band configuration. Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783 Reviewed-on: https://code.wireshark.org/review/20912 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-04-04 21:23:59 +00:00
/* libxml2 */
#ifdef HAVE_LIBXML2
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", with libxml2 " LIBXML_DOTTED_VERSION);
Add libxml2 as optional dependency This can be used by dissectors that need to parse out-of-band configuration. Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783 Reviewed-on: https://code.wireshark.org/review/20912 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-04-04 21:23:59 +00:00
#else
epan: Remove some superfluous calls
2021-05-25 13:43:39 +00:00
g_string_append(str, ", without libxml2");
Add libxml2 as optional dependency This can be used by dissectors that need to parse out-of-band configuration. Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783 Reviewed-on: https://code.wireshark.org/review/20912 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-04-04 21:23:59 +00:00
#endif /* HAVE_LIBXML2 */
epan: Rename SMI dependency to "libsmi"
2021-09-15 23:40:13 +00:00
/* libsmi */
epan: Add SMI version
2021-05-25 17:12:29 +00:00
#ifdef HAVE_LIBSMI
epan: Rename SMI dependency to "libsmi"
2021-09-15 23:40:13 +00:00
g_string_append(str, ", with libsmi " SMI_VERSION_STRING);
#else
g_string_append(str, ", without libsmi");
epan: Add SMI version
2021-05-25 17:12:29 +00:00
#endif /* HAVE_LIBSMI */
Move the code to get version information for libraries used by libwireshark into libwireshark, and call it only in programs linked with libwireshark. That way, programs that don't link with libwireshark don't have to link with libgcrypt or libgnutls solely so that they can say that they're linked with a particular version of libgcrypt or libgnutls. Don't link dumpcap with libgcrypt or libgnutls any more. svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
}
/*
* Get runtime information for libraries used by libwireshark.
*/
void
Make Libgcrypt a mandatory dependency Removed all guards for HAVE_LIBGCRYPT, change autotools and CMake to error out if it is not available. Update release notes, developer documentation and README with the new status. Clarify relation with GnuTLS in macosx-setup.sh. Install Libgcrypt via brew script. Motivation for this change is that many dissectors depend on Libgcrypt and having it optional increases the maintenance burden (there have been several compile issues in the past due to the optional status). Furthermore, wsutil has crypto code that can be replaced by Libgcrypt. Change-Id: Idf0021b8c4cd5db70b8766f7dcc2a8b3acbf042f Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html Reviewed-on: https://code.wireshark.org/review/20030 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: Peter Wu <peter@lekensteyn.nl>
2017-02-09 14:00:19 +00:00
epan_get_runtime_version_info(GString *str)
Move the code to get version information for libraries used by libwireshark into libwireshark, and call it only in programs linked with libwireshark. That way, programs that don't link with libwireshark don't have to link with libgcrypt or libgnutls solely so that they can say that they're linked with a particular version of libgcrypt or libgnutls. Don't link dumpcap with libgcrypt or libgnutls any more. svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
{
epan: Add c-ares version
2021-05-25 14:06:42 +00:00
/* c-ares */
g_string_append_printf(str, ", with c-ares %s", ares_version(NULL));
EPAN: fix indent (use tab) Change-Id: I0545cf70decf923a3a042fa8c9dec3e60a861268 Reviewed-on: https://code.wireshark.org/review/11391 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28 14:38:39 +00:00
/* GnuTLS */
Move the code to get version information for libraries used by libwireshark into libwireshark, and call it only in programs linked with libwireshark. That way, programs that don't link with libwireshark don't have to link with libgcrypt or libgnutls solely so that they can say that they're linked with a particular version of libgcrypt or libgnutls. Don't link dumpcap with libgcrypt or libgnutls any more. svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
#ifdef HAVE_LIBGNUTLS
Have individual programs get libpcap and libz version info. That way, the code that constructs the runtime version string doesn't itself have to call libpcap and libz, and could be usable in programs that don't call them. While we're at it, add "with" to the run-time version information for GnuTLS and libgcrypt, to match the compile-time version information, and add the version information from libwireshark to TShark. Change-Id: I3726a027d032270b032292da9314c1cec535dcd2 Reviewed-on: https://code.wireshark.org/review/2587 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23 21:55:56 +00:00
g_string_append_printf(str, ", with GnuTLS %s", gnutls_check_version(NULL));
Move the code to get version information for libraries used by libwireshark into libwireshark, and call it only in programs linked with libwireshark. That way, programs that don't link with libwireshark don't have to link with libgcrypt or libgnutls solely so that they can say that they're linked with a particular version of libgcrypt or libgnutls. Don't link dumpcap with libgcrypt or libgnutls any more. svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
#endif /* HAVE_LIBGNUTLS */
EPAN: fix indent (use tab) Change-Id: I0545cf70decf923a3a042fa8c9dec3e60a861268 Reviewed-on: https://code.wireshark.org/review/11391 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-28 14:38:39 +00:00
/* Gcrypt */
Have individual programs get libpcap and libz version info. That way, the code that constructs the runtime version string doesn't itself have to call libpcap and libz, and could be usable in programs that don't call them. While we're at it, add "with" to the run-time version information for GnuTLS and libgcrypt, to match the compile-time version information, and add the version information from libwireshark to TShark. Change-Id: I3726a027d032270b032292da9314c1cec535dcd2 Reviewed-on: https://code.wireshark.org/review/2587 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23 21:55:56 +00:00
g_string_append_printf(str, ", with Gcrypt %s", gcry_check_version(NULL));
Add brotli decompression support for HTTP and HTTP2 dissectors. Change-Id: I9c09f55673187f6fee723fcd72798fb6b9958b03 Reviewed-on: https://code.wireshark.org/review/32745 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-10 10:52:52 +00:00
epan: Add nghttp2 version
2021-05-25 13:50:07 +00:00
/* nghttp2 */
#if NGHTTP2_VERSION_AGE >= 1
nghttp2_info *nghttp2_ptr = nghttp2_version(0);
g_string_append_printf(str, ", with nghttp2 %s", nghttp2_ptr->version_str);
epan: Remove some extraneous #ifdefs If a macro identifier is not defined it evaluates to zero in an expression, so the outer #ifdef is unnecessary and should be avoided (the less the better). Add a missing CMake comment while here.
2021-09-18 13:41:49 +00:00
#endif /* NGHTTP2_VERSION_AGE */
epan: Add nghttp2 version
2021-05-25 13:50:07 +00:00
Add brotli decompression support for HTTP and HTTP2 dissectors. Change-Id: I9c09f55673187f6fee723fcd72798fb6b9958b03 Reviewed-on: https://code.wireshark.org/review/32745 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-10 10:52:52 +00:00
/* brotli */
#ifdef HAVE_BROTLI
g_string_append_printf(str, ", with brotli %d.%d.%d", BrotliDecoderVersion() >> 24,
(BrotliDecoderVersion() >> 12) & 0xFFF, BrotliDecoderVersion() & 0xFFF);
#endif
Add version info for lz4, zstd, maxmind This simply implements the patches given in a comment on bug 16270. <https://gitlab.com/wireshark/wireshark/-/issues/16270#note_400748726>
2021-05-17 12:18:10 +00:00
/* LZ4 */
epan: Add some minimum version checks
2021-05-25 12:14:15 +00:00
#if LZ4_VERSION_NUMBER >= 10703
Add version info for lz4, zstd, maxmind This simply implements the patches given in a comment on bug 16270. <https://gitlab.com/wireshark/wireshark/-/issues/16270#note_400748726>
2021-05-17 12:18:10 +00:00
g_string_append_printf(str, ", with LZ4 %s", LZ4_versionString());
epan: Remove some extraneous #ifdefs If a macro identifier is not defined it evaluates to zero in an expression, so the outer #ifdef is unnecessary and should be avoided (the less the better). Add a missing CMake comment while here.
2021-09-18 13:41:49 +00:00
#endif /* LZ4_VERSION_NUMBER */
Add version info for lz4, zstd, maxmind This simply implements the patches given in a comment on bug 16270. <https://gitlab.com/wireshark/wireshark/-/issues/16270#note_400748726>
2021-05-17 12:18:10 +00:00
/* Zstandard */
epan: Add some minimum version checks
2021-05-25 12:14:15 +00:00
#if ZSTD_VERSION_NUMBER >= 10300
Add version info for lz4, zstd, maxmind This simply implements the patches given in a comment on bug 16270. <https://gitlab.com/wireshark/wireshark/-/issues/16270#note_400748726>
2021-05-17 12:18:10 +00:00
g_string_append_printf(str, ", with Zstandard %s", ZSTD_versionString());
epan: Remove some extraneous #ifdefs If a macro identifier is not defined it evaluates to zero in an expression, so the outer #ifdef is unnecessary and should be avoided (the less the better). Add a missing CMake comment while here.
2021-09-18 13:41:49 +00:00
#endif /* ZSTD_VERSION_NUMBER */
Add version info for lz4, zstd, maxmind This simply implements the patches given in a comment on bug 16270. <https://gitlab.com/wireshark/wireshark/-/issues/16270#note_400748726>
2021-05-17 12:18:10 +00:00
epan: Rename SMI dependency to "libsmi"
2021-09-15 23:40:13 +00:00
/* libsmi */
epan: Add SMI version
2021-05-25 17:12:29 +00:00
#ifdef HAVE_SMI_VERSION_STRING
g_string_append_printf(str, ", with libsmi %s", smi_version_string);
#endif /* HAVE_SMI_VERSION_STRING */
Move the code to get version information for libraries used by libwireshark into libwireshark, and call it only in programs linked with libwireshark. That way, programs that don't link with libwireshark don't have to link with libgcrypt or libgnutls solely so that they can say that they're linked with a particular version of libgcrypt or libgnutls. Don't link dumpcap with libgcrypt or libgnutls any more. svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
}
EDT structures now own their ep_ memory pools. This should finally clean up the last little bits of: - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5284 - https://www.wireshark.org/lists/wireshark-dev/201208/msg00128.html and possibly part of: - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7775 This is a fairly invasive change that required some funky work with linked lists to avoid changing any of the public ep_* APIs, so if something breaks blame me :) svn path=/trunk/; revision=45389
2012-10-08 15:23:36 +00:00
/*
HTTPS (almost) everywhere. Change all wireshark.org URLs to use https. Fix some broken links while we're at it. Change-Id: I161bf8eeca43b8027605acea666032da86f5ea1c Reviewed-on: https://code.wireshark.org/review/34089 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-26 18:43:17 +00:00
* Editor modelines - https://www.wireshark.org/tools/modelines.html
EDT structures now own their ep_ memory pools. This should finally clean up the last little bits of: - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5284 - https://www.wireshark.org/lists/wireshark-dev/201208/msg00128.html and possibly part of: - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7775 This is a fairly invasive change that required some funky work with linked lists to avoid changing any of the public ep_* APIs, so if something breaks blame me :) svn path=/trunk/; revision=45389
2012-10-08 15:23:36 +00:00
*
* Local variables:
* c-basic-offset: 8
* tab-width: 8
* indent-tabs-mode: t
* End:
*
* vi: set shiftwidth=8 tabstop=8 noexpandtab:
* :indentSize=8:tabSize=8:noTabs=false:
*/