Commit Graph

84 Commits

Author SHA1 Message Date
etxrab 1cc99b9268 From Tony Trinh:
Update Lua from 5.1 to 5.2

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43482 f5534014-38df-0310-8fa8-9805f1628bb7
2012-06-25 20:42:07 +00:00
morriss c8391561bf Use separate filters for the RTT found on a SACK and the RTT found on a
DATA chunk: having them in both places is helpful when looking at the
messages but having them separate is helpful when graphing the RTTs.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43406 f5534014-38df-0310-8fa8-9805f1628bb7
2012-06-20 13:30:07 +00:00
morriss 20103c69ba Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3315 -
make Save-As/Displayed/All-Packets save not only the displayed packets but
also any other packets needed (e.g., for reassembly) to fully dissect the
displayed packets.

This works only for the "All packets" case; choosing only the Selected packet,
the Marked packets, or a range of packets would require actually storing which
packets depend on which (too much memory) or going through the packet list many
times (too slow).  Also, this behavior is always the case: you can't save the
displayed packets without their dependencies (I don't see why this would be
desirable).

So far this is done for SCTP and things using the reassembly routines (TCP has
been tested).

The Win32 dialog was modified but hasn't been tested yet.

One confusing aspect of the UI is that the Displayed count in the Save-As
dialog does not match the number of displayed packets.  (I tried renaming the
button "Displayed + Dependencies" but it looked too big.)  The tooltip tries
to explain this and the fact that this works only in the All-Packets case;
suggestions for improvement are welcome.


Implementation details:

Dissectors (or the reassembly code) can list frames which were needed to
build the current frame's tree.  If the current frame passes the display
filter then each listed frame is marked as "depended upon" (this takes up the
last free frame_data flag).

When performing a Save-As/Displayed/All-Packets then choose packets which
passed the dfilter _or_ are depended upon.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41216 f5534014-38df-0310-8fa8-9805f1628bb7
2012-02-28 03:19:49 +00:00
wmeier 26b61941c3 Remove no longer relevant comment about incrementing tvb usage count to prevent freeing tvbs.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40265 f5534014-38df-0310-8fa8-9805f1628bb7
2011-12-21 18:57:42 +00:00
stig 3daa9d71fa Added register action for loading Lua plugins.
Removed an unused argument to wslua_init().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39214 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-02 13:39:35 +00:00
stig 2bd8b99ae0 Whitespace cleanup.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38893 f5534014-38df-0310-8fa8-9805f1628bb7
2011-09-06 09:09:36 +00:00
stig 75002b8f2f Remove support for libpcre, we use GRegex in GLib.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38683 f5534014-38df-0310-8fa8-9805f1628bb7
2011-08-23 09:25:06 +00:00
gerald ce4a032157 More GLIB_CHECK_VERSION cleanups. Update the minimum GLib/GTK+ versions
in README.devloper. Remove g_gnuc.h since it's no longer needed. Remove
tvbuff_init(), tvbuff_cleanup(), reassemble_init(), and
reassemble_cleanup() since they were only used for older GLib versions
which didn't support GSlices. Assume we always support the "matches"
operator.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37978 f5534014-38df-0310-8fa8-9805f1628bb7
2011-07-11 20:32:19 +00:00
guy 94ba507cba Constify a return value, to squelch a compiler warning.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37680 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-16 07:27:48 +00:00
guy 0077356f92 Include <Python.h> to get the Python version number.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37651 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-11 17:20:44 +00:00
morriss f5b9349d62 Revert 34191 and add some casts instead
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34193 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-23 06:00:22 +00:00
morriss 8c88f74f2a Use gsize (size_t) in a couple of places to make the Win64 build happy.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34191 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-23 01:14:44 +00:00
sake 2652efb401 When using a custom column, make it possible to select which occurrence to show if the field has multiple occurrences.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34186 f5534014-38df-0310-8fa8-9805f1628bb7
2010-09-22 20:56:14 +00:00
guy 4ffaaf8ccf If we have neither libgnutls nor libgcrypt,
epan_get_runtime_version_info() does nothing, and thus doesn't use its
argument.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33532 f5534014-38df-0310-8fa8-9805f1628bb7
2010-07-15 03:22:49 +00:00
guy 4b21238141 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33531 f5534014-38df-0310-8fa8-9805f1628bb7
2010-07-15 02:07:16 +00:00
etxrab 1c2dbebd04 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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33059 f5534014-38df-0310-8fa8-9805f1628bb7
2010-06-02 19:29:14 +00:00
wmeier 4e4e8476e7 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32365 f5534014-38df-0310-8fa8-9805f1628bb7
2010-04-03 18:18:50 +00:00
wmeier ff27c86799 Revert SVN #32360 until Windows compilation errors corrected.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32361 f5534014-38df-0310-8fa8-9805f1628bb7
2010-04-02 15:18:03 +00:00
wmeier 81f3e316e8 From Yaniv Kaul: constify parameters
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32360 f5534014-38df-0310-8fa8-9805f1628bb7
2010-04-02 14:37:49 +00:00
rbalint b381a8d348 Disable OID resolution and loading SMI modules by default.
Add an option to enable OID resolution.
Add an option to suppress errors reported by libsmi.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32096 f5534014-38df-0310-8fa8-9805f1628bb7
2010-03-03 17:19:30 +00:00
wmeier 04cb936dc7 Fix various gcc -Wshadow warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31720 f5534014-38df-0310-8fa8-9805f1628bb7
2010-01-28 18:45:46 +00:00
gerald fc9ccecead Switch to using a bundled version of the openSUSE Build Service packages
for GNUTLS since they provide 32-bit and 64-bit Windows packages. We no
longer have winposixtype.h, so remove its #includes and add a ssize_t
typedef to config.h.win32.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31341 f5534014-38df-0310-8fa8-9805f1628bb7
2009-12-21 21:06:01 +00:00
morriss 2f0724eadc Add emem_init() which initializes both the ep_ and se_ allocators; have all
callers use that instead of initializing each allocator individually.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30646 f5534014-38df-0310-8fa8-9805f1628bb7
2009-10-20 17:43:05 +00:00
krj d4d0793c09 Add an option to col_fill_in() to allow us to disable column expression processing. This is rarely needed. It's only needed when the user right clicks on the packet list view to generate a display filter.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29806 f5534014-38df-0310-8fa8-9805f1628bb7
2009-09-08 19:00:54 +00:00
etxrab 84a4c1606d From : Didier Gautheron
speed up a little proto_custom_set.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3972

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29789 f5534014-38df-0310-8fa8-9805f1628bb7
2009-09-08 10:33:15 +00:00
krj 08963ce918 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29754 f5534014-38df-0310-8fa8-9805f1628bb7
2009-09-06 18:25:23 +00:00
etxrab 313deac154 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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29551 f5534014-38df-0310-8fa8-9805f1628bb7
2009-08-25 21:10:35 +00:00
krj 6bd9953293 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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29404 f5534014-38df-0310-8fa8-9805f1628bb7
2009-08-13 19:42:46 +00:00
krj 4bd7148627 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().


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29380 f5534014-38df-0310-8fa8-9805f1628bb7
2009-08-11 18:08:03 +00:00
etxrab 122527f1e9 From Kovarththanan Rajaratnam:
Only fill in frame_data vals when needed.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29203 f5534014-38df-0310-8fa8-9805f1628bb7
2009-07-27 08:33:26 +00:00
guy 1372d880e4 Add a routine to report write errors to the list of failure-reporting
routines handled by epan/report_err.c.

Move copy_binary_file() in file.c to epan/filesystem.c, and rename it to
copy_file_binary_mode() (to clarify that it *can* copy text files;
arguably, *all* files are "binary" unless you're on, say, an IBM 1401
:-)).  Have it use the report_err.c routines, so it works in
console-mode programs.

Clean up some comments while we're at it.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27456 f5534014-38df-0310-8fa8-9805f1628bb7
2009-02-15 21:47:57 +00:00
gerald 99ecc0dc24 Rename geoip.[ch] to geoip_db.[ch] so we don't collide with GeoIP.h. Rename
some functions to match.

Add GeoIP lookups to the IP dissector. Add a preference for GeoIP lookups,
which is disabled by default.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27063 f5534014-38df-0310-8fa8-9805f1628bb7
2008-12-19 23:49:03 +00:00
gerald 3c150b6f33 Add support for the GeoIP library. Using different database files,
GeoIP can map IP addresses to Countries, Cities, AS numbers, ISPs,
etc. If any library paths are defined AND any database files are found,
corresponding columns are added to the endpoint tables in the GUI.

To do:
  - Add columns to the conversation list
  - Add GeoIP info to "-z conv,..."
  - Create a default UAT file.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26571 f5534014-38df-0310-8fa8-9805f1628bb7
2008-10-27 04:50:57 +00:00
guy 578ca6f28d Rename arguments not to collide with function names, to avoid warnings
from -Wshadow, as noted by John Smith.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25541 f5534014-38df-0310-8fa8-9805f1628bb7
2008-06-23 20:17:08 +00:00
morriss 48d520d204 Call se_free_all() in epan_cleanup() so that we will detect per-session (se_)
memory corruption in tshark (and Wireshark when exiting the program instead
of loading a new file?).

Why this wasn't always here I don't know.

This may give us a pile of buildbot fuzz failures but that's a Good Thing.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25196 f5534014-38df-0310-8fa8-9805f1628bb7
2008-04-29 15:29:02 +00:00
kukosa 3c43e1e4b8 Next few improvements to speed up startup about 10%.
- use GTree instead of GList for preference module lists

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23679 f5534014-38df-0310-8fa8-9805f1628bb7
2007-11-30 09:22:01 +00:00
lego ac32510733 get users of oid_resolv to use the new oids, rollout packet-snmp.c
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22651 f5534014-38df-0310-8fa8-9805f1628bb7
2007-08-25 01:14:24 +00:00
lego 2d7d7e8a3c Have editcap and capinfos loading the wiretap plugins.
epan/filesystem.c
   have get_plugin_dir() calling init_plugin_dir() if necessary

epan/epan.c and epan/report_err.c
   move the report_failure family into the new report_err.c file, have epan_init() calling the initializer

epan/plugins.h and epan/proto.c
   do not have init_plugins() calling the proto_reg functions instead do it in init_proto()

gtk/main.c and tshark.c
   init_plugin_dir() has become suprefluous

capinfos.c and editcap.c
   load the wiretap plugins

Makefiles
   do what's needed to build withe the above changes.





git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21935 f5534014-38df-0310-8fa8-9805f1628bb7
2007-05-25 17:22:32 +00:00
gal 428f602b2d Updated splash screen for Wireshark that shows the initialisation progress.
The splash screen shows a progress bar and a percentage complete - like the progress dialog.
As dissectors are initialised and handed off the name is shown. However, the names of plugin dissectors are not shown.
The update to the make-dissector-reg shell script has been tested, though I think generally the python version is used.



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21716 f5534014-38df-0310-8fa8-9805f1628bb7
2007-05-07 17:55:42 +00:00
guy 3b19e4b369 Add a WIRESHARK_RUN_FROM_BUILD_DIRECTORY environment variable on UN*X;
if set, and if the program isn't running with additional privileges,
it'll treat the directory in which the program is found as the data
directory.

If, on Windows, the version-number subdirectory of {data
directory}\plugins doesn't exist (which is assumed to mean that the
program is being run from the build directory), or if, on UN*X,
WIRESHARK_RUN_FROM_BUILD_DIRECTORY is set, the plugin directory is the
"plugins" subdirectory of the data directory, and all subdirectories of
that directory are scanned for plugins, as the "plugins" subdirectory of
the build directory contains subdirectories for the plugins; this means
that if we're running from the build directory, we'll find the plugins
we built in the build tree.

When generating the wireshark-filter man page, run tshark with
WIRESHARK_RUN_FROM_BUILD_DIRECTORY set, so it uses the plugins from the
build to generate the list of filters.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20261 f5534014-38df-0310-8fa8-9805f1628bb7
2007-01-02 06:49:40 +00:00
gram cd2ac4cd8c Add GPL disclaimer, which as been missing since forever.
Thanks to Jaap Keuter for pointing this out.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20027 f5534014-38df-0310-8fa8-9805f1628bb7
2006-11-30 21:32:05 +00:00
guy 6c4694a2bf We also need the memory allocation subsystem initialized in anything
that uses libwireshark.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19940 f5534014-38df-0310-8fa8-9805f1628bb7
2006-11-21 00:30:36 +00:00
guy 62f6f23974 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).


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19939 f5534014-38df-0310-8fa8-9805f1628bb7
2006-11-21 00:16:44 +00:00
lego 9084cf0f29 Re-enable lua as the windows version is already there.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19327 f5534014-38df-0310-8fa8-9805f1628bb7
2006-09-26 10:22:20 +00:00
lego 2d6bb0d0bf Complete the workarround of prev rev, temporarilly disabling lua from unix as well.
Luis.



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19323 f5534014-38df-0310-8fa8-9805f1628bb7
2006-09-26 01:19:29 +00:00
lego abb3419e7d Since there's no Lua headers in windows yet, as a temporary workarround just declare wslua_init instead of including wslua.h.
Sorry!



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19322 f5534014-38df-0310-8fa8-9805f1628bb7
2006-09-26 01:12:14 +00:00
lego c2b17acf40 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



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19319 f5534014-38df-0310-8fa8-9805f1628bb7
2006-09-25 01:09:00 +00:00
kukosa 9239ca18f1 GnuTLS/libgcrypt initialization moved to epan.c
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18863 f5534014-38df-0310-8fa8-9805f1628bb7
2006-08-10 06:06:21 +00:00
kukosa 2cf6f80f58 new function epan_get_version()
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18450 f5534014-38df-0310-8fa8-9805f1628bb7
2006-06-13 08:18:50 +00:00
gerald f29eded8e1 libethereal -> libwireshark. idl2eth -> idl2wrs. There are a _lot_ of
changes here.  It compiles OK on OS X, but hasn't been tested anywhere else.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18260 f5534014-38df-0310-8fa8-9805f1628bb7
2006-05-31 00:23:01 +00:00