aboutsummaryrefslogtreecommitdiffstats
path: root/capture_opts.c
AgeCommit message (Collapse)AuthorFilesLines
2010-09-08Follow up to rev 34073: Since "-b files:0" is no longer necessary tosfisher1-1/+1
override the default of turning on a multiple file ring buffer, require a positive integer to be specified for the files value. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34082 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-28As mentioned on the users-mailinglist[1], it could be useful to have groups ↵sake1-0/+5
read access to the ringbuffer that dumpcap creates. That way, a group of people can access the capture files without having to use root access. [1] http://www.wireshark.org/lists/wireshark-users/201008/msg00235.html git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33978 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-27Set RINGBUFFER_MAX_NUM_FILES to 100000. Use it to generate file names.gerald1-1/+6
Add RINGBUFFER_WARN_NUM_FILES and use it to print a warning. Print warnings when we change the number of ringbuffer files. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32998 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-27Make -q not a capture option again - it's used by tshark even when notguy1-4/+0
capturing, and thus even when we build without pcap. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32988 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-26Add a -q flag to dumpcap, to squelch its reporting of the packet count,guy1-0/+4
and add support for SIGINFO, so, if your OS supports SIGINFO, you can get the packet count by typing ^T. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32958 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-14Um, no, the problem with the Leopard x86 build is that we first do aguy1-1/+1
build without libpcap, to make sure that works, and then do a build with libpcap, to put into a binary release. It's the former that's failing; I'll back out the previous change and then work on that. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32801 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-14See whether the Leopard x86 buildbot is upset because of the nameguy1-1/+1
if_capabilities_t - it doesn't fail on Snow Leopard, even if I undefine HAVE_PCAP_CREATE, and doesn't fail on the Leopard PPC buildbot, either. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32799 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-13Fetch an indication of whether the interface supports capturing inguy1-5/+8
monitor mode at the same time that we fetch its list of link-layer types. Support fetching that list in monitor mode, as the list may be different in regular and monitor mode. If the interface supports monitor mode, when printing the list of link-layer types, indicate whether they're fetched in monitor mode or not, as tcpdump 4.1.x does. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32789 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-08Prune some includes.guy1-24/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32721 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-07As with the list of data link types, so with the list of interfaces; moveguy1-80/+8
the code to print the machine-readable format into dumpcap, and have the code in capture_opts.c just print the human-readable format. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32714 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-07Add routines vfprintf_stderr() and fprintf_stderr() to print to theguy1-5/+6
standard error and, in Wireshark on Windows, create a console if necessary. Have the cmdarg_err routines use them. Use *fprintf_stderr() to print the output of -L, rather than using cmdarg_err_cont(), so that we don't get extra newlines in the output (it should look similar to the output of tcpdump). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32711 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-07For TShark and Wireshark, get the list of link-layer types for anguy1-44/+11
interface by running dumpcap, so that if you need privileges to open an interface, and dumpcap has those privileges, neither TShark nor Wireshark need them. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32710 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-07Handle -I in the options processing.guy1-0/+8
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32703 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-06Just check for pcap_create(); it first appeared in libpcap 1.0.0, andguy1-3/+3
pcap_set_buffer_size() did as well, so there aren't any libpcap releases with pcap_create() but not pcap_set_buffer_size(). Only do one check for pcap_create. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32695 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-06Checking in Stigs changes frometxrab1-3/+3
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=475 BUT not activating the check for pcap_create() pcap_set_buffer_size() This should make it possible to build with support for setting the buffersize if not capturing 802.11 traffic. The code for handling the 'B' option should be OK in any case. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32688 f5534014-38df-0310-8fa8-9805f1628bb7
2010-03-04Squelch some compiler warnings.guy1-7/+8
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32111 f5534014-38df-0310-8fa8-9805f1628bb7
2010-03-04In Wireshark and TShark, run dumpcap to get interface lists and lists ofguy1-15/+16
link-layer header types for interfaces; if special privileges are necessary to open capture devices, Wireshark and TShark shouldn't have those privileges, but dumpcap should. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32104 f5534014-38df-0310-8fa8-9805f1628bb7
2010-01-29Fix various gcc -Wshadow warnings.wmeier1-21/+21
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31729 f5534014-38df-0310-8fa8-9805f1628bb7
2009-04-27Add -n option to dumpcap. It will save the capture files intuexen1-0/+5
pcapng format instead of pcap. The default is to use pcap. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28170 f5534014-38df-0310-8fa8-9805f1628bb7
2009-02-23Have the minimum snapshot length be 1 byte, and have a snapshot lengthguy1-1/+7
of 0 mean 65535, similar to what tcpdump does. Fixes bug 2731. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27526 f5534014-38df-0310-8fa8-9805f1628bb7
2008-12-21If we don't have any of the pcap_datalink_XXX_to_YYY routines,guy1-5/+0
substitute our own (I wrote them all, so I can steal them from the BSD-licensed libpcap if I want :-)). This means that linktype_name_to_val() and linktype_val_to_name() are always available, and we don't need to #ifdef use of them. Use pcap_datalink_val_to_description() to get the description for a particular DLT_ value, rather than mapping the DLT_ value to a WTAP_ENCAP_ value and getting the description for the latter. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27074 f5534014-38df-0310-8fa8-9805f1628bb7
2008-11-03Use correct type when printing remote_port.stig1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26676 f5534014-38df-0310-8fa8-9805f1628bb7
2008-10-31Fix some "format not a string literal and no format arguments" warnings.stig1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26642 f5534014-38df-0310-8fa8-9805f1628bb7
2008-06-23Do not only update the argument name, but also where it's used.stig1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25566 f5534014-38df-0310-8fa8-9805f1628bb7
2008-06-23Rename a variable to avoid collisions with a global variable, as notedguy1-1/+1
by John Smith. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25549 f5534014-38df-0310-8fa8-9805f1628bb7
2008-06-20capture_opts_print_statistics() has nothing to do with capture optionsguy1-93/+0
setting, and is used only in dumpcap.c, and needs to get at information set by dumpcap's signal handlers so it can respond to ^C; move it to dumpcap.c, rename it print_statistics_loop(), and make it set ld.go to TRUE before looping and loop only as long as ld.go is TRUE. That fixes bug 2592 (at least on Mac OS X, and probably on other UN*Xes; it should fix it on Windows as well). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25492 f5534014-38df-0310-8fa8-9805f1628bb7
2008-05-22Move the file utility functions from wiretap to libwsutil so thatmorriss1-2/+2
libwireshark (and the plugins using those functions) do not depend on wiretap on Windows. While doing that, rename the eth_* functions to ws_*. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25354 f5534014-38df-0310-8fa8-9805f1628bb7
2008-05-12If we have pcap_open, call it instead of pcap_open_live, otherwise we mightgerald1-1/+5
crash. The changes to trigcap.c haven't been tested, but _should_ work. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25279 f5534014-38df-0310-8fa8-9805f1628bb7
2008-04-09replace confusing #if checking for GlIB2.6.0 by #if GLIB_CHECK_VERSION(2,6,0)ulfl1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24855 f5534014-38df-0310-8fa8-9805f1628bb7
2008-02-23Ensure tshark/wireshark always get good err msgs from dumpcap:wmeier1-4/+3
1. Clean up dumpcap 'as a child' err msg handling so that: - all err msgs are properly formatted when being sent back to the parent. - any log Critical, Warning, etc messages are sent back to parent and are properly formatted. 2. Change handling of -w <...> slightly in capture_opts.c so that wireshark provides a good error message if there is a 'write permissions' issue on the file. (Previously the error popup said only "Child exited with status 2"). This fixes bug #2288. Add some conditionalized DEBUG_CHILD_DUMPCAP code for dumpcap debug logging to a file. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24446 f5534014-38df-0310-8fa8-9805f1628bb7
2008-02-07Removed some more "statement not reached" warnings.stig1-1/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24283 f5534014-38df-0310-8fa8-9805f1628bb7
2007-12-04Support for RPCAP features in GUI (from Boris Misenov, see Bug 1366)kukosa1-0/+129
- retrieving the list of remote PCAP interfaces - password authentication support - UDP data fransfer - packet sampling (available in WinPcap 4.x) etc. fix problem if non-default rpcap port is used git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23750 f5534014-38df-0310-8fa8-9805f1628bb7
2007-09-25as "advertised" some days ago:ulfl1-1/+0
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-08-30Change the "--enable-setuid-install" option to install dumpcap and TSharkgerald1-0/+4
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-28capture_opts_log: use dummy string if iface_desc is NULL;wmeier1-1/+3
This fixes dumpcap crash on Windows git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22707 f5534014-38df-0310-8fa8-9805f1628bb7
2007-08-22Fix bug http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1757 :morriss1-0/+14
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-02Add a "-S" flag to dumpcap, which prints out interface statistics. Usegerald1-0/+92
this in the GUI rather than calling pcap_stats() directly. This gets rid of the last pcap_open_live() call in the GUI code. Update README.packaging. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22443 f5534014-38df-0310-8fa8-9805f1628bb7
2007-07-20Remove the "-I" flag from dumpcap, and add a "-M" flag used to specifygerald1-15/+35
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-25Fix bug #1665 / From Nikns Siankin:sfisher1-0/+4
Fix compilation on OpenBSD. This needs to go into 0.99.6 release. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22188 f5534014-38df-0310-8fa8-9805f1628bb7
2007-06-11Fix compilation under VS6 (hopefully without breaking compilationgerald1-13/+20
anywhere else). Instead of using getaddrinfo() and getnameinfo(), promote inet_pton.c and inet_ntop.c to the top level and use those routines instead. (It's 2007, for crying out loud. Why is this even an issue?) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22075 f5534014-38df-0310-8fa8-9805f1628bb7
2007-06-11One more step in privilege separation.gerald1-29/+67
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-01-21Have the routines to get interface lists take a pointer to a "gchar *"guy1-24/+18
as an argument, and, on an error, if they have an error message, have them set that "gchar *" to point to a g_malloc()ed string containing the error message, rather than taking a pointer to a buffer for that message as an argument. That's more like what's done in Wiretap, and doesn't impose an upper limit on the lengths of those error messages. If that pointer is null, don't allocate the message string and return it. Have that error message already have the "cant_get" processing applied to it, so nobody other than those routines need to call the "cant_get" routines to process the error messages. Have get_airpcap_interface_list() explicitly set "*err" to the appropriate error code. Clean up indentation. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20521 f5534014-38df-0310-8fa8-9805f1628bb7
2007-01-12Win32: MSVC > 6 doesn't work well with Unicode filenames!ulfl1-1/+1
fix this, by providing required functions in the new file file_util.c - it's mostly copied from GLib (g_open alike - that take UTF8 as filename format but don't use msvcrt.dll V6 for this as the glib files do) "link" to these functions in file_util.h: #define eth_open eth_stdio_open revert changes (from SVN 20282) throughout the code related to these file functions which were introduced with the first tries of MSVC 2005 ... Hopefully I've done everything right with the new file_util.c ... git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20402 f5534014-38df-0310-8fa8-9805f1628bb7
2007-01-03from Laurent Rabret:ulfl1-1/+1
I posted a patch about 1.5 years ago for the formerly Ethereal to successfully compiled with Visual > 6. I have always successfully used this patched Ethereal/Wireshark compiled with VS 2003 and have just checked when compiled with Visual C++ 2005 Express git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20282 f5534014-38df-0310-8fa8-9805f1628bb7
2007-01-01From Pierre Juhen: patch to correct the bug 1220wmeier1-3/+3
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20254 f5534014-38df-0310-8fa8-9805f1628bb7
2006-11-02Frederic Heem:jmayer1-0/+2
Fix some memleaks and overflows. I haven't committed the changes that are not bug fixes. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19777 f5534014-38df-0310-8fa8-9805f1628bb7
2006-08-26Go back to setting the capture filter to an empty string when we start;guy1-2/+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-3/+5
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-05-31Tethereal/tethereal -> TShark/tshark.gerald1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18268 f5534014-38df-0310-8fa8-9805f1628bb7
2006-05-28Ethereal->Wiresharketxrab1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18235 f5534014-38df-0310-8fa8-9805f1628bb7
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 21:02:42 +0000