Commit Graph

785 Commits

Author SHA1 Message Date
Jaap Keuter 7ecc588029 Fix for bug 1614:
Output preamble and finale on live capture.

svn path=/trunk/; revision=21930
2007-05-25 06:46:47 +00:00
Luis Ontanon 869732d121 Prepare wireshark and tshark for wiretap plugins
svn path=/trunk/; revision=21928
2007-05-24 22:26:51 +00:00
Stephen Fisher 0fc9e207d2 From Sake Blok:
Fix for bug #1056


svn path=/trunk/; revision=21867
2007-05-21 20:41:05 +00:00
Guy Harris a3d3282e64 Have init_progfile_dir() also check whether
WIRESHARK_RUN_FROM_BUILD_DIRECTORY is set and, if so and we weren't run
with special privileges, set the running_in_build_directory_flag.  Have
it do the same if it finds ".libs" in the pathname of the program and we
weren't run with special privileges, as that means it was probably run
from the libtool wrapper script and presumably thus isn't an installed
binary.

This means that get_credential_info() has to be called before
init_progfile_dir().

Clean up some indentation.

svn path=/trunk/; revision=21866
2007-05-21 20:31:45 +00:00
Graeme Lunt cf56e76be9 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.


svn path=/trunk/; revision=21716
2007-05-07 17:55:42 +00:00
Guy Harris 1bc049906a Add some GCC warnings to the standard set, and add some others to the
--enable-extra-gcc-checks set.

If we turn on -pedantic, try turning on -Wno-long-long as well, so that
it's not *so* pedantic that it rejects the 64-bit integral data types
that we explicitly require.

Constify a bunch of stuff, and make some other changes, to get rid of
warnings.

Clean up some indentation.

svn path=/trunk/; revision=21526
2007-04-23 10:59:26 +00:00
Stephen Fisher 6625e7503f Fix warnings on Linux/gcc 4.1.1
svn path=/trunk/; revision=21330
2007-04-03 21:17:13 +00:00
Ronnie Sahlberg 910299acb1 The signature for load_cap_file changed in 21211
Update also the code path for when not compiling with pcap  so that code path also
uses the new signature.


svn path=/trunk/; revision=21219
2007-03-26 23:16:53 +00:00
Stephen Fisher 509883e3e9 From Doug Pratley:
The purpose of the patch is to provide a new output format (so it is
independent of -V): single line record per-packet with the fields chosen by the
user, with configuration options to control separator, quoting and whether a
header line is printed. It also extends some existing options behaviour (-c and
-a:filesize) so that they affect reading a file as well as writing one, so that
only the first <n> packets or bytes are read).


svn path=/trunk/; revision=21211
2007-03-26 20:17:05 +00:00
Stephen Fisher 6d8d2854c8 From Sake Blok:
Fix for bug #491: Unexpected frame.time_delta behavior

This patch ... fixes bug 491. It does this by changing the
behaviour of the frame.time_delta field so it reflects the delta
time between captured packets (tshark already did this).  To keep
the delta time between displayed packets, the field 
frame.time_delta_displayed is created.


svn path=/trunk/; revision=21154
2007-03-23 18:08:17 +00:00
Stephen Fisher 793e70956e Fix problem where specifying -b duration:xx on tshark wasn't working by
testing for the "duration specified" variable along with the "maximum
file size" variable.
 

svn path=/trunk/; revision=20950
2007-02-28 22:45:18 +00:00
Jeff Morriss 0787b688cc Squelch a few unused parameter warnings.
svn path=/trunk/; revision=20863
2007-02-19 15:30:06 +00:00
Jeff Morriss 0c17bfd3a8 From Eric Hall to fix bug 1289:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1289

Rename 'svnversion' to 'wireshark_svnversion' to resolve a symbol conflict with
GTK 2.10.6 (hmm, shouldn't GTK not be exporting that symbol or at least naming
it so as to prevent such collisions? Well, so should we, so...)

From Andreas Fink: change #ifdef for size_t in airdcap_interop.h to fix
compile on MacOS X.


svn path=/trunk/; revision=20726
2007-02-06 02:27:59 +00:00
Ronnie Sahlberg 57389a0c69 make tshark compile and work also when pcap is not available
svn path=/trunk/; revision=20664
2007-02-01 09:04:46 +00:00
Jeff Morriss fcff412ab6 Don't send G_LOG_LEVEL_ERROR|G_LOG_LEVEL_CRITICAL|G_LOG_FLAG_FATAL|G_LOG_FLAG_RECURSION to log_func_ignore() so that error messages from g_assert() get printed (by glib's default handler). Without this change developers only get a message saying the program aborted and maybe (if they're lucky^H^H^H^H^Hconfigured correctly) a core file. The latter would allow them to find out what went wrong but it would be much easier to just see the error message.
svn path=/trunk/; revision=20647
2007-01-31 06:01:14 +00:00
Guy Harris 44c0624bd9 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.

svn path=/trunk/; revision=20261
2007-01-02 06:49:40 +00:00
Luis Ontanon 91e2c565bd Have -X options defined before epan_init() gets called.
svn path=/trunk/; revision=20207
2006-12-23 03:52:38 +00:00
Stephen Fisher 75acf34518 From Douglas Pratley with trivial changes and documentation changes
by myself:

Corrected patch; epan/column.c and epan/column_utils.c were not included. This
one has now been properly tested against a clean checkout of today's code.

- New menu option available under view\time display format
- New sub-option (e) to -t switch for both wireshark and tshark
- Extended recent settings code to handle new value
- Did NOT add new explicit epoch time column


svn path=/trunk/; revision=20040
2006-12-05 03:19:51 +00:00
Stephen Fisher 868d6e86c1 Fix for bug #1211. Patch from Joshua Wright to add -S option to tshark's
usage description (-h).


svn path=/trunk/; revision=19962
2006-11-23 01:45:51 +00:00
Guy Harris a22101f8f0 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
Guy Harris b0640ceefc 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
Guy Harris 9e747bd46b Squelch a compiler warning.
svn path=/trunk/; revision=19938
2006-11-21 00:00:26 +00:00
Ulf Lamping 59d6c8ea33 change all file offsets from long to gint64 so we can - theoretically - handle files > 2GB correct.
Please distclean Win32 builds!

svn path=/trunk/; revision=19814
2006-11-05 22:46:44 +00:00
Gerald Combs 99d5c5e440 Rename get_epan_and_portaudio_version_info() to get_gui_compiled_info()
and add version info for AirPcap.  Add a corresponding
get_gui_runtime_info().  Fix up whitespace.

svn path=/trunk/; revision=19620
2006-10-19 22:43:38 +00:00
Guy Harris 1eefc6d60e Clean up the word wrap stuff a bit. (Arguably, that should be done in
the code that displays it - we might, for example, be able to have the
About dialog word-wrap to the appropriate size, and word-wrap text
printed to the standard output to the terminal width if it's going to a
terminal and to 80 or whatever columns otherwise.)

Don't report anything in dumpcap about libraries not used by dumpcap. 
(It was printing a blank, which looked a bit weird.)

Fix the handling of _MSC_VER as per Gerald's fix for _MSC_FULL_VER.

svn path=/trunk/; revision=19618
2006-10-19 21:17:23 +00:00
Guy Harris 00d8ca2d45 Fix up the changes to put the Portaudio information at the end of the
version string, so the information comes out right for applications that
don't use Portaudio.

Get rid of an extra "with" in the version string for dumpcap.

Get rid of an extra blank after the libpcap version string, and get rid
of an extra newline before it.

Attempt to add more compiler version information and to prettify the
MSVC++ version information (both untested).

svn path=/trunk/; revision=19613
2006-10-19 18:43:12 +00:00
Ulf Lamping 599ca2b824 from Richard van der Hoff:
> [tshark from a fifo]
> Ulf - I notice you made the relevant change here (r16787) - is there any reason why tshark shouldn't use capture_loop_dispatch to do its processing, rather than attempting to use cap_pipe_dispatch or pcap_dispatch directly?

well, there didn't seem to be, so I've made a patch which does exactly this, and which fixes the problem.

svn path=/trunk/; revision=19456
2006-10-08 22:39:23 +00:00
Gerald Combs 9e23f31e5f Add support for reading from stdin under Windows. Based on a patch sent
in last year by Gianluca Varenni.

Add partial support for reading from named pipes (currently disabled).

Move utf_8to16() and utf_16to8() to a separate module (unicode-utils.[ch])
so that we don't have to cut and paste code in dumpcap.c.

Fix up whitespace.

svn path=/trunk/; revision=19291
2006-09-22 21:14:54 +00:00
Guy Harris a28b428aff Go back to setting the capture filter to an empty string when we start;
that obviates the need to check for a null capture filter string, and
fixes bug 1055.

Keep track of whether it was set from the command line, though, so we
can catch attempts to set the filter more than once, and attempts to set
it when we're not capturing.

Clean up white space.

svn path=/trunk/; revision=19047
2006-08-26 18:36:09 +00:00
Guy Harris fde1140905 Initialize the cfilter field of a capture_opts structure to a null
pointer, so we can determine whether a capture filter has been set or
not.

Use that to check in TShark whether the user specified a filter with
"-f" or not, rather than using the no-longer-set
"capture_filter_specified" variable.

Also, check for multiple "-f" options.

If no capture filter is specified, use a null string, to work around
broken versions of Linux libpcap.

svn path=/trunk/; revision=18989
2006-08-21 23:28:19 +00:00
Ronnie Sahlberg b588469ccf guids are not olnly used in dcerpc interfaces and they often occur in many other protocols such as ldap and smb/smb2
move the initialization of the guid mapping table from the dcerpc dissector to a more neutral place


svn path=/trunk/; revision=18947
2006-08-18 09:32:19 +00:00
Jörg Mayer 30c04916b4 Reported by Stephen Fisher <stephentfisher@yahoo.com>:
I believe this is a typo in the command line help for the -i option:

Usage: wireshark [options] ... [ <infile> ]

Capture interface:
  -i <interface>           name or idx of interface (def: first none
loopback)

Shouldn't that read "first non-loopback" ?



svn path=/trunk/; revision=18813
2006-08-01 19:52:36 +00:00
Guy Harris ad74ee57f7 Call init_progfile_dir() - on Windows, at least, it's necessary in order
to get the directory where the data files are stored, and on UN*X we
might have an option in the future to have it search there for data
files, to make it easier to run WireShark/TShark from the build
directory and have it find plugins, etc..

svn path=/trunk/; revision=18622
2006-06-30 23:37:49 +00:00
Jörg Mayer d9b930a7d7 image/wireshark.rc.in
svn path=/trunk/; revision=18310
2006-06-02 06:50:57 +00:00
Gerald Combs 8958bab6de Tethereal/tethereal -> TShark/tshark.
svn path=/trunk/; revision=18268
2006-05-31 17:38:42 +00:00