aboutsummaryrefslogtreecommitdiffstats
path: root/capture_opts.h
AgeCommit message (Collapse)AuthorFilesLines
2012-03-21scan_local_interfaces() isn't in capture_opts.c; don't declare it inGuy Harris1-3/+0
capture_opts.h. (It arguably belongs somewhere other than in a file in ui/gtk, but, if so, move it there, e.g. to something in ui.) svn path=/trunk/; revision=41712
2012-03-12capture_opts_add_iface_opt() is not used outside capture_opts.c; make itGuy Harris1-3/+0
static. svn path=/trunk/; revision=41494
2012-01-25Actually, you only have monitor mode support if you have pcap_create() -Guy Harris1-0/+2
without pcap_create() and pcap_activate() you don't have any API to turn it on. svn path=/trunk/; revision=40725
2012-01-25Fix error when building QtShark:Bill Meier1-2/+2
...\capture_opts.h(94) : error C2461: 'remote_host' : constructor syntax missing formal parameters svn path=/trunk/; revision=40723
2012-01-25Third try. This time pipes and stdin are supported and theMichael Tüxen1-0/+90
test scripts are passed. Use a global list containing all interfaces and only change properties of the entries when changes are made in the GUI. Do not misuse the list of interfaces specified on the command line anymore. This patch does not provide any new functionality, it just provides the base for future extensions like removing remote interface, mulitple airpcap devices and multiple pipes. This patch was provided by Irene Ruengeler. svn path=/trunk/; revision=40715
2012-01-24We need a 3rd try. (After learning how to run the testuite on Windows locally).Michael Tüxen1-90/+0
svn path=/trunk/; revision=40695
2012-01-24Second try. This time pipes and stdin are supported.Michael Tüxen1-0/+90
Use a global list containing all interfaces and only change properties of the entries when changes are made in the GUI. Do not misuse the list of interfaces specified on the command line anymore. This patch does not provide any new functionality, it just provides the base for future extensions like removing remote interface, mulitple airpcap devices and multiple pipes. This patch was provided by Irene Ruengeler. svn path=/trunk/; revision=40693
2011-12-29Add 'extern "C"' wrappers and #include guards to various header files.Gerald Combs1-0/+8
svn path=/trunk/; revision=40321
2011-10-20Back out infrastructure change. We missed supportingMichael Tüxen1-83/+0
stdin and pipes. svn path=/trunk/; revision=39498
2011-10-20Use a global list containing all interfaces and only changeMichael Tüxen1-0/+83
properties of the entries when changes are made in the GUI. Do not misuse the list of interfaces specified on the command line anymore. This patch does not provide any new functionality, it just provides the base for future extensions like removing remote interface, mulitple airpcap devices and multiple pipes. This patch was provided by Irene Ruengeler. svn path=/trunk/; revision=39495
2011-06-27Get rid of old non-interface specific settings which are now interfaceMichael Tüxen1-59/+1
specifc. This finalizes the change of the infrastructure. This patch is based on work by Irene Ruengeler. svn path=/trunk/; revision=37794
2011-05-31Get rid of has_cfilter to simplify the handling of multiple interfaces.Michael Tüxen1-1/+0
svn path=/trunk/; revision=37478
2011-05-16Make remote capturing settings a per interface thing. You can nowMichael Tüxen1-1/+12
configure that you want to capture on multiple remote interfaces on mulitple hosts. Improve some #ifdef mess in dumpcap. svn path=/trunk/; revision=37178
2011-05-16Make pcap samping a per interface setting.Michael Tüxen1-4/+10
Use consistent naming of variables on capture_options. Make pcap sampling independent of remote capturing, since it seems to work local pcap devices using winpcap (at least that is what the documentation says). svn path=/trunk/; revision=37176
2011-05-16* Fix a bug when printing a pointer.Michael Tüxen1-1/+0
* Remove number_of_ifaces, since ifaces->len can be used instead. svn path=/trunk/; revision=37174
2011-05-13Get -L and -d working with multiple interface. Internally get some functionsMichael Tüxen1-1/+1
using the array of interface data. Improve output of -L by printing the interface name. svn path=/trunk/; revision=37120
2011-05-12Add support for handling multiple interfaces as command lineMichael Tüxen1-8/+45
parameters. An array of interface specific data is handled in addition to the current way. This change should not have any effect right now, it will be used by dumpcap when supporting multiple interfaces (and tshark/wireshark... in the future). svn path=/trunk/; revision=37082
2011-04-11Back out Jeff Morris's change to make the autostop file size 64-bit - itGuy Harris1-1/+1
didn't change the GUI code for setting the autostop file size, and that broke the build. svn path=/trunk/; revision=36552
2011-04-11Jeff Morris's change to make the autostop file size 64-bit. Fixes bugGuy Harris1-1/+1
5691. svn path=/trunk/; revision=36551
2011-03-01Make HAVE_PCAP_REMOTE and HAVE_PCAP_SETSAMPLING independentMichael Tüxen1-11/+10
as in other places of the code. Such that this is consistently used. While there, clean up some whitespaces. This fix was provided by Irene Ruengeler which testing remote capturing (with multiple interfaces). svn path=/trunk/; revision=36112
2010-08-28As mentioned on the users-mailinglist[1], it could be useful to have groups ↵Sake Blok1-0/+1
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 svn path=/trunk/; revision=33978
2010-07-01From Petr Lautrbach: when capturing, return the exit status of dumpcap,Guy Harris1-0/+1
so we give a non-zero exit status for invalid interfaces or capture filters. From me: don't exit immediately if dumpcap failed, print out information from taps and the like. svn path=/trunk/; revision=33393
2010-05-27Make -q not a capture option again - it's used by tshark even when notGuy Harris1-1/+0
capturing, and thus even when we build without pcap. svn path=/trunk/; revision=32988
2010-05-26Add a -q flag to dumpcap, to squelch its reporting of the packet count,Guy Harris1-0/+1
and add support for SIGINFO, so, if your OS supports SIGINFO, you can get the packet count by typing ^T. svn path=/trunk/; revision=32958
2010-05-14Um, no, the problem with the Leopard x86 build is that we first do aGuy Harris1-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. svn path=/trunk/; revision=32801
2010-05-14See whether the Leopard x86 buildbot is upset because of the nameGuy Harris1-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. svn path=/trunk/; revision=32799
2010-05-13Fetch an indication of whether the interface supports capturing inGuy Harris1-4/+4
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. svn path=/trunk/; revision=32789
2010-05-07As with the list of data link types, so with the list of interfaces; moveGuy Harris1-3/+3
the code to print the machine-readable format into dumpcap, and have the code in capture_opts.c just print the human-readable format. svn path=/trunk/; revision=32714
2010-05-07For TShark and Wireshark, get the list of link-layer types for anGuy Harris1-3/+3
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. svn path=/trunk/; revision=32710
2010-05-07Beginnings of monitor mode support with libpcap 1.x.Guy Harris1-0/+3
svn path=/trunk/; revision=32702
2010-05-06Just check for pcap_create(); it first appeared in libpcap 1.0.0, andGuy Harris1-1/+1
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. svn path=/trunk/; revision=32695
2010-05-06Checking in Stigs changes fromAnders Broman1-1/+1
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. svn path=/trunk/; revision=32688
2009-04-27Add -n option to dumpcap. It will save the capture files inMichael Tüxen1-0/+1
pcapng format instead of pcap. The default is to use pcap. svn path=/trunk/; revision=28170
2008-06-24Add gtk/capture_globals.h, to declare global_capture_opts, so files thatGuy Harris1-0/+4
don't need global_capture_opts don't need to have it declared and thus don't need capture_options defined. Include gtk/capture_globals in the files in question. Change some more capture_opts references to refer to global_capture_opts. Change some global_capture_opts references in routines with a capture_opts argument to refer to capture_opts. The structure type is capture_options, not capture_opts; fix some references. Include <sys/types.h>, if it's present, in capture_opts.h, so we get gid_t defined. Clean up indentation. svn path=/trunk/; revision=25574
2008-06-23Rename a variable to avoid collisions with a global variable, as notedGuy Harris1-1/+1
by John Smith. svn path=/trunk/; revision=25549
2008-06-20capture_opts_print_statistics() has nothing to do with capture optionsGuy Harris1-4/+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). svn path=/trunk/; revision=25492
2007-12-04Support for RPCAP features in GUI (from Boris Misenov, see Bug 1366)Tomas Kukosa1-1/+46
- 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 svn path=/trunk/; revision=23750
2007-08-30Change the "--enable-setuid-install" option to install dumpcap and TSharkGerald Combs1-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. svn path=/trunk/; revision=22733
2007-08-22gcc 4 doesn't like my macro for getting the interface description: it says ↵Jeff Morriss1-10/+2
there's an invalid lvalue in it. I don't see what's wrong with it, but replace the macro with a function. Also: don't include the .xpm files in gtk/main.c if we're building without PCAP (as they're not used in that configuration). svn path=/trunk/; revision=22588
2007-08-22Fix bug http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1757 :Jeff 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. svn path=/trunk/; revision=22587
2007-08-02Add a "-S" flag to dumpcap, which prints out interface statistics. UseGerald Combs1-0/+4
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. svn path=/trunk/; revision=22443
2007-07-20Remove the "-I" flag from dumpcap, and add a "-M" flag used to specifyGerald Combs1-2/+2
that "-D" and "-L" should produce machine-readable output. Use this to move an indirect get_pcap_linktype() call from the GUI to dumpcap. svn path=/trunk/; revision=22367
2007-06-11One more step in privilege separation.Gerald Combs1-4/+4
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. svn path=/trunk/; revision=22071
2006-08-26Go back to setting the capture filter to an empty string when we start;Guy Harris1-38/+39
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-05-21name changeRonnie Sahlberg1-2/+2
svn path=/trunk/; revision=18197
2006-04-03In Tethereal, don't save to a temporary file if "-w" isn't specified,Guy Harris1-7/+8
even if doing a live capture; just print the packets without saving them. In dumpcap: default to the capturing the entire packet; don't do the "Press any key" stuff when debugging on UN*X; do console logging (to the standard error) even when we're running as the capture child (the sync pipe should only be the standard output, not the standard error). svn path=/trunk/; revision=17786
2006-02-11the point of no return ...Ulf Lamping1-1/+1
using dumpcap as the capture child for Ethereal. dumpcap is a plain console application now, even for Win32 (so no WinMain, create_console and special piping stuff reguired). The undocumented command line option -Z will switch dumpcap into "child mode", using binary instead of plain text output messages to communicate with a parent Ethereal. Ethereal's main.c no longer needs to distinguish between child mode or not, so some simplifying here. capture_sync.c has to call dumpcap in a "hidden window" mode using CreateProcess instead of spawnvp, otherwise an uggly console window would appear. The handles created by _pipe doesn't seem to be inheritable for this function, using CreatePipe instead. The file capture_loop.c is only needed by dumpcap, removed from Ethereal link objects. Some debugging aid added and other minor cleanup done. svn path=/trunk/; revision=17256
2006-02-10remove all calls to exit() from the capture_opts.c and replace them by ↵Ulf Lamping1-3/+3
status return values (0,1 or 2). This way makes it much easier to debug, e.g. to set a common breakpoint if a command line parameter fails. svn path=/trunk/; revision=17240
2006-01-07move output_to_pipe flag from tethereal's loop_data into capture_opts, so it ↵Ulf Lamping1-0/+1
can be used by dumpcap (capture_loop.c) as well svn path=/trunk/; revision=16972
2005-12-18warning: function declaration isn't a prototypeJörg Mayer1-1/+1
svn path=/trunk/; revision=16852
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 16:55:50 +0000