aboutsummaryrefslogtreecommitdiffstats
path: root/tshark.c
AgeCommit message (Collapse)AuthorFilesLines
2007-10-01Add 'C' as a valid -N option in error message.wmeier1-1/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23040 f5534014-38df-0310-8fa8-9805f1628bb7
2007-09-29Get rid of a forward declaration of a routine that no longer exists.guy1-2/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23030 f5534014-38df-0310-8fa8-9805f1628bb7
2007-09-29Clean up indentation a bit.guy1-16/+22
Count packets even if we're not dissecting them. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23026 f5534014-38df-0310-8fa8-9805f1628bb7
2007-09-28Specify that -l causes tshark to flush the *standard* output (from bug ↵morriss1-1/+1
1875). The man page already states this git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23014 f5534014-38df-0310-8fa8-9805f1628bb7
2007-09-27Load wpcap.dll, since we still use it for some things. This should hopefullygerald1-14/+12
fix Buildbot. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23003 f5534014-38df-0310-8fa8-9805f1628bb7
2007-09-27(Try to) get tshark capturing working on *NIX (it works for me anyway):morriss1-47/+57
We can simply block waiting for input from the child process because we are in a CLI that does not need to worry about updating a GUI while we're waiting for packets and so forth. Before I realized that I wrote a working (for me) method using select() that I've left in for now (#ifdef'd out). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22999 f5534014-38df-0310-8fa8-9805f1628bb7
2007-09-26the Ubuntu / OS X buildbots don't seem to like G_STATIC_MUTEX_INIT (for ↵ulfl1-1/+1
whatever reason), try to use g_static_mutex_init() instead git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22977 f5534014-38df-0310-8fa8-9805f1628bb7
2007-09-26solve some more of the unix specific buildbot problemsulfl1-10/+9
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22975 f5534014-38df-0310-8fa8-9805f1628bb7
2007-09-25add a dummy function, so unix/linux version should at least compileulfl1-1/+17
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22974 f5534014-38df-0310-8fa8-9805f1628bb7
2007-09-25as "advertised" some days ago:ulfl1-475/+372
rewrite the tshark capture code almost completely, to use dumpcap instead of it's own pcap functionality. This works on Win32 and should work on unix/linux (but I'm not sure here). Some stuff needs to be cleaned up, some more may need to be rewritten to specifically work with unix/win32. Futher work needs to be done at: 1. read filters (simply document current behaviour?) 2. event loop polling 3. privileges 4. code cleanup (e.g. in capture_loop.c) Be prepared that tshark might not work as before / expected at least in the next days! git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22969 f5534014-38df-0310-8fa8-9805f1628bb7
2007-09-15Add routines under Windows to check if npf.sys is running, and togerald1-0/+15
fetch the major OS version. If we're running Windows >= 6 (Vista) _and_ npf.sys isn't running, warn the user in Wireshark and TShark. Add a recent prefs item to disable the warning in Wireshark. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22877 f5534014-38df-0310-8fa8-9805f1628bb7
2007-08-30Change the "--enable-setuid-install" option to install dumpcap and TSharkgerald1-0/+21
setuid instead of Wireshark. Remove the "DANGEROUS" notices, but leave it disabled by default. Whine if the user runs Wireshark or TShark as root. Add a preference to disable the whining. Add a "setuid-root" script that can be used to switch dumpcap and TShark's setuid-ness on and off for development and testing. Update the release notes and README.packaging. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22733 f5534014-38df-0310-8fa8-9805f1628bb7
2007-08-22Fix bug http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1757 :morriss1-4/+2
Try to call get_interface_descriptive_name() as little as possible (storing the result in capture_opts) to avoid a performance hit during live capture (especially if you have lots of interfaces) and to avoid leaking memory. One issue with this is that capture_opts.c cannot (without adding significant dependencies) set the iface_descr so readers of that field (only gtk/main.c and tshark.c) use a macro to (set if not already set and) get the value of that field. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22587 f5534014-38df-0310-8fa8-9805f1628bb7
2007-08-07Make sure that wiretap plugins are loaded before dissectors are (if a new ↵lego1-1/+0
encap type is registered the plugin probably needs it before reg_handoff) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22461 f5534014-38df-0310-8fa8-9805f1628bb7
2007-07-20Remove the "-I" flag from dumpcap, and add a "-M" flag used to specifygerald1-1/+1
that "-D" and "-L" should produce machine-readable output. Use this to move an indirect get_pcap_linktype() call from the GUI to dumpcap. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22367 f5534014-38df-0310-8fa8-9805f1628bb7
2007-06-11One more step in privilege separation.gerald1-9/+9
Add a capture_interface_list(), which works similar to get_interface_list() except that it forks dumpcap instead of calling the pcap routines directly. Use it in the GUI. Add a "-I" flag to dumpcap, which prints out verbose interface information. Tested under Windows and Linux. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22071 f5534014-38df-0310-8fa8-9805f1628bb7
2007-05-25The libpcap callback "user" argument *should* have been a "void *", asguy1-1/+1
it's a pointer to an arbitrary object, assumed to be correctly aligned, not a pointer to a not-necessarily-properly-aligned array of bytes. Cast it, so we won't get alignment warnings. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21940 f5534014-38df-0310-8fa8-9805f1628bb7
2007-05-25Have editcap and capinfos loading the wiretap plugins.lego1-5/+0
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-25Fix for bug 1614:jake1-3/+16
Output preamble and finale on live capture. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21930 f5534014-38df-0310-8fa8-9805f1628bb7
2007-05-24Prepare wireshark and tshark for wiretap pluginslego1-0/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21928 f5534014-38df-0310-8fa8-9805f1628bb7
2007-05-21From Sake Blok:sfisher1-6/+6
Fix for bug #1056 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21867 f5534014-38df-0310-8fa8-9805f1628bb7
2007-05-21Have init_progfile_dir() also check whetherguy1-5/+5
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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21866 f5534014-38df-0310-8fa8-9805f1628bb7
2007-05-07Updated splash screen for Wireshark that shows the initialisation progress. gal1-1/+1
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-04-23Add some GCC warnings to the standard set, and add some others to theguy1-1/+1
--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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21526 f5534014-38df-0310-8fa8-9805f1628bb7
2007-04-03Fix warnings on Linux/gcc 4.1.1sfisher1-1/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21330 f5534014-38df-0310-8fa8-9805f1628bb7
2007-03-26The signature for load_cap_file changed in 21211sahlberg1-1/+1
Update also the code path for when not compiling with pcap so that code path also uses the new signature. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21219 f5534014-38df-0310-8fa8-9805f1628bb7
2007-03-26From Doug Pratley:sfisher1-25/+80
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). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21211 f5534014-38df-0310-8fa8-9805f1628bb7
2007-03-23From Sake Blok:sfisher1-10/+26
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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21154 f5534014-38df-0310-8fa8-9805f1628bb7
2007-02-28Fix problem where specifying -b duration:xx on tshark wasn't working bysfisher1-7/+5
testing for the "duration specified" variable along with the "maximum file size" variable. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20950 f5534014-38df-0310-8fa8-9805f1628bb7
2007-02-19Squelch a few unused parameter warnings.morriss1-3/+3
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20863 f5534014-38df-0310-8fa8-9805f1628bb7
2007-02-06From Eric Hall to fix bug 1289:morriss1-2/+2
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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20726 f5534014-38df-0310-8fa8-9805f1628bb7
2007-02-01make tshark compile and work also when pcap is not availablesahlberg1-0/+11
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20664 f5534014-38df-0310-8fa8-9805f1628bb7
2007-01-31Don't send ↵morriss1-4/+1
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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20647 f5534014-38df-0310-8fa8-9805f1628bb7
2007-01-02Add a WIRESHARK_RUN_FROM_BUILD_DIRECTORY environment variable on UN*X;guy1-4/+9
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
2006-12-23Have -X options defined before epan_init() gets called.lego1-2/+22
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20207 f5534014-38df-0310-8fa8-9805f1628bb7
2006-12-05From Douglas Pratley with trivial changes and documentation changes sfisher1-1/+3
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 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20040 f5534014-38df-0310-8fa8-9805f1628bb7
2006-11-23Fix for bug #1211. Patch from Joshua Wright to add -S option to tshark'ssfisher1-0/+1
usage description (-h). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19962 f5534014-38df-0310-8fa8-9805f1628bb7
2006-11-21We also need the memory allocation subsystem initialized in anythingguy1-4/+0
that uses libwireshark. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19940 f5534014-38df-0310-8fa8-9805f1628bb7
2006-11-21Call guids_init() in epan_init(), so anything that needs libwireshark -guy1-3/+0
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-21Squelch a compiler warning.guy1-0/+3
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19938 f5534014-38df-0310-8fa8-9805f1628bb7
2006-11-05change all file offsets from long to gint64 so we can - theoretically - ↵ulfl1-4/+4
handle files > 2GB correct. Please distclean Win32 builds! git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19814 f5534014-38df-0310-8fa8-9805f1628bb7
2006-10-19Rename get_epan_and_portaudio_version_info() to get_gui_compiled_info()gerald1-1/+1
and add version info for AirPcap. Add a corresponding get_gui_runtime_info(). Fix up whitespace. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19620 f5534014-38df-0310-8fa8-9805f1628bb7
2006-10-19Clean up the word wrap stuff a bit. (Arguably, that should be done inguy1-1/+1
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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19618 f5534014-38df-0310-8fa8-9805f1628bb7
2006-10-19Fix up the changes to put the Portaudio information at the end of theguy1-1/+1
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). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19613 f5534014-38df-0310-8fa8-9805f1628bb7
2006-10-08from Richard van der Hoff:ulfl1-5/+2
> [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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19456 f5534014-38df-0310-8fa8-9805f1628bb7
2006-09-22Add support for reading from stdin under Windows. Based on a patch sentgerald1-39/+28
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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19291 f5534014-38df-0310-8fa8-9805f1628bb7
2006-08-26Go back to setting the capture filter to an empty string when we start;guy1-10/+3
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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19047 f5534014-38df-0310-8fa8-9805f1628bb7
2006-08-21Initialize the cfilter field of a capture_opts structure to a nullguy1-4/+11
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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18989 f5534014-38df-0310-8fa8-9805f1628bb7
2006-08-18guids are not olnly used in dcerpc interfaces and they often occur in many ↵sahlberg1-0/+3
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 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18947 f5534014-38df-0310-8fa8-9805f1628bb7
2006-08-01Reported by Stephen Fisher <stephentfisher@yahoo.com>:jmayer1-1/+1
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" ? git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18813 f5534014-38df-0310-8fa8-9805f1628bb7
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 10:23:25 +0000