aboutsummaryrefslogtreecommitdiffstats
path: root/capture.h
AgeCommit message (Collapse)AuthorFilesLines
2011-06-27Get rid of old non-interface specific settings which are now interfacetuexen1-1/+1
specifc. This finalizes the change of the infrastructure. This patch is based on work by Irene Ruengeler. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37794 f5534014-38df-0310-8fa8-9805f1628bb7
2010-08-26Doxygen fixes.etxrab1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33942 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-26If dumpcap exits abnormally, report the error.guy1-2/+3
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32964 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-14If something is only supposed to be included if we have libpcap, don'tguy1-3/+0
put #ifdef HAVE_LIBPCAP in it. Add multiple-inclusion protection to capture_errs.h. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32803 f5534014-38df-0310-8fa8-9805f1628bb7
2010-03-04In Wireshark and TShark, run dumpcap to get interface lists and lists ofguy1-10/+0
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
2008-08-19The packet counts and drop counts reported by libpcap are unsigned.guy1-1/+1
Clean up indentation a bit. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26037 f5534014-38df-0310-8fa8-9805f1628bb7
2008-06-24Have separate callback mechanisms in file.c and capture.c; pass theguy1-0/+20
capture callbacks the capture_options * as its second argument in all cases. This makes it a bit clearer what arguments callbacks take, and means we can get rid of all global_capture_opts references in gtk/main_statusbar.c. Put the interface between gtk/main.c and gtk/main_statusbar.c into a private header. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25576 f5534014-38df-0310-8fa8-9805f1628bb7
2008-02-21Constify some arguments.guy1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24407 f5534014-38df-0310-8fa8-9805f1628bb7
2007-08-02Add a "-S" flag to dumpcap, which prints out interface statistics. Usegerald1-0/+23
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-0/+5
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-1/+6
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
2006-05-21name changesahlberg1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18197 f5534014-38df-0310-8fa8-9805f1628bb7
2006-03-13fix bug #803: sync pipe on Win32 wasn't set to binary mode, so error message ↵ulfl1-1/+1
transport failed between Ethereal and dumpcap. I've also changed the way the secondary error message is transported from former "header message 0 secondary 0" to "header header message 0 header secondary 0" as that might be a bit more clearer, and I'll need it for further development anyway. I was using this while debugging and not recognizing the real problem - for about four hours :-(. I'll need this feature when doing the interface (and link layer type) browsing later (transferring this data from dumpcap to Ethereal) to get a full blown privilege seperation. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17608 f5534014-38df-0310-8fa8-9805f1628bb7
2006-03-05Pass two strings in capture child messages, so the child can sendguy1-5/+11
primary and secondary error messages and let the parent worry about how to display them. This means dumpcap doesn't need stub routines for generating the formatting tags for the primary and secondary messages. Have a separate message for capture filter errors, so that the parent can check whether the capture filter looks like a display filter and report the appropriate message. This means that dumpcap doesn't need a stub routine for compiling display filters (a stub routine also means that Ethereal won't do the check for capture filters that look like display filters!). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17465 f5534014-38df-0310-8fa8-9805f1628bb7
2005-12-03split capture.h into capture.h, capture_loop.h and capture_opts.h and place ↵ulfl1-117/+1
the parts into the corresponding files git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16664 f5534014-38df-0310-8fa8-9805f1628bb7
2005-12-03add missing functions (to complete/cleanup of interface):ulfl1-0/+10
capture_input_drops capture_input_error_message and move the functionality from capture_sync.c to capture.c (just where it belongs) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16663 f5534014-38df-0310-8fa8-9805f1628bb7
2005-11-17Handle "-G" only in Tethereal - it doesn't work in Ethereal, and isn'tguy1-1/+1
necessary there. Add a "cmdarg_err()" routine to report command-line option errors; it creates a console if necessary, and prints the command name and the trailing newline. Also add "cmdarg_err_cont()", which also creates a console if necessary, and prints a trailing newline but no command name; it's used to continue the message. Use those, rather than "g_warning()", for errors. That means that we no longer need to pass the command name to various command-line argument parsing routines. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16526 f5534014-38df-0310-8fa8-9805f1628bb7
2005-05-26use the log features of the GLib to have verbose output of the capturing ↵ulfl1-0/+6
engine, e.g. GLib provides different domains for different submodules. Output more verbose than warning level will be disabled by default (just like before). use the console_log_handler in main.c for win32 AND unix now Currently use the log for the capturing engine (only), as I desperately needed a log output for debugging. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14438 f5534014-38df-0310-8fa8-9805f1628bb7
2005-04-27add a state member to the capture_opts, and set it according to the capture ↵ulfl1-0/+10
engine git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14205 f5534014-38df-0310-8fa8-9805f1628bb7
2005-04-16rename capture_clear() to capture_restart()ulfl1-2/+2
statusbar update should work now even in capture error case git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14105 f5534014-38df-0310-8fa8-9805f1628bb7
2005-04-12capture engine: ulfl1-2/+6
add a new feature to clear the currently captured packets and restart the capture with the previous parameters various code cleanup and minor bugfixes Win32: use millisecond resolution in capture_loop, to smooth screen update a bit (500ms instead of 1000ms) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14059 f5534014-38df-0310-8fa8-9805f1628bb7
2005-04-10Win32 only bugfix: as using TerminateProcess is the brute force way and ↵ulfl1-0/+3
sometimes clipped packets in the middle, now using a pipe called signal_pipe from the parent to the child for this. On unix we're using kill() for this, which simply signals the child, but this isn't available on win32. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14040 f5534014-38df-0310-8fa8-9805f1628bb7
2005-03-28various (minor) capture code cleanupulfl1-17/+9
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13957 f5534014-38df-0310-8fa8-9805f1628bb7
2005-03-28fix Solaris build (I've removed O_BINARY)ulfl1-2/+1
rename sync_mode to real_time_mode, as we using sync_mode all the time now, so the name is misleading git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13956 f5534014-38df-0310-8fa8-9805f1628bb7
2005-03-28remove capture_child flag from capture_opts as it's no longer requiredulfl1-5/+9
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13954 f5534014-38df-0310-8fa8-9805f1628bb7
2005-03-28a lot more capture engine code cleanupulfl1-4/+12
most notably: - moved opening of safe_file to the capture child (capture_loop.c) - removed save_file_fd from capture_opts (no longer need to have it global) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13953 f5534014-38df-0310-8fa8-9805f1628bb7
2005-03-07- pcap.h needs to be included before capture.hjmayer1-4/+2
- As capture.h is empty without libpcap defined, only include it in that case and don't protect the file internally against libpcap any more. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13648 f5534014-38df-0310-8fa8-9805f1628bb7
2005-02-28Another step towards using the parent/child mode for ALL captures.ulfl1-0/+6
This is currently still disabled, as we cannot pass all required capture flags to the child process (lack of command line parameters). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13558 f5534014-38df-0310-8fa8-9805f1628bb7
2005-02-27some clarification of the capture child thingulfl1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13535 f5534014-38df-0310-8fa8-9805f1628bb7
2005-02-27minor comment additionsulfl1-2/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13533 f5534014-38df-0310-8fa8-9805f1628bb7
2005-02-23CHILD_NAME is only used #ifdef HAVE_LIBPCAPulfl1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13481 f5534014-38df-0310-8fa8-9805f1628bb7
2005-02-23use the applications name (currently "ethereal" or "tethereal") in ↵ulfl1-1/+1
capture_opts, instead of hardcoded "ethereal" for both. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13476 f5534014-38df-0310-8fa8-9805f1628bb7
2005-02-06Clean up indentation.guy1-24/+24
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13323 f5534014-38df-0310-8fa8-9805f1628bb7
2005-02-06another two steps towards privilege seperation:ulfl1-3/+8
move another two capture related fields (iface and cfilter) from cfile to capture_opts also move the handling of capture related command line options from main.c to capture.c, that way a future privilege seperated capture program can use the same code to parse it's command line than Ethereal. It might be even possible to share this parser code even with Tethereal, didn't took a closer look at this. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13320 f5534014-38df-0310-8fa8-9805f1628bb7
2005-02-06instead of initializing the capture_options in main.c, use the new function ↵ulfl1-0/+4
capture_opts_init git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13315 f5534014-38df-0310-8fa8-9805f1628bb7
2005-02-05rename kill_capture_child to capture_kill_child to have a common prefixulfl1-1/+1
split drag and drop support out of main.c into new file drag_and_drop.c, to reduce the size of main.c a bit. Hopefully this won't break unix builds because of missing #include's, I will keep an eye on the buildbot git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13308 f5534014-38df-0310-8fa8-9805f1628bb7
2005-02-05updated some commentsulfl1-4/+8
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13301 f5534014-38df-0310-8fa8-9805f1628bb7
2005-02-04(some) redesign of capture data structures.ulfl1-2/+7
don't use global cfile at all but only an untpyed handle to call the cf_... functions in file.c move the save_file member from capture_file to capture_opts, as it's only used while capturing and while preparing it git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13276 f5534014-38df-0310-8fa8-9805f1628bb7
2005-02-03move capture_file_fd field from capture_file to capture_opts type, as this ↵ulfl1-0/+1
is the place where it should be git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13268 f5534014-38df-0310-8fa8-9805f1628bb7
2004-12-29move global capture_child flag into capture_optionsulfl1-3/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12855 f5534014-38df-0310-8fa8-9805f1628bb7
2004-12-29Don't use a global capture_opts in the capturing engine (this isn't a good ↵ulfl1-11/+8
idea). Do some more "housekeeping" in the capturing part. Hopefully the unspecified forward declaration of capture_options_t in main.h is portable, but buildbot will tell me. This way I need the internals of that struct only at the places I really use it. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12853 f5534014-38df-0310-8fa8-9805f1628bb7
2004-10-30split capture_loop from capture.c, some more code cleanupulfl1-10/+16
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12451 f5534014-38df-0310-8fa8-9805f1628bb7
2004-10-30move quit_after_cap into capture_optsulfl1-4/+8
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12449 f5534014-38df-0310-8fa8-9805f1628bb7
2004-07-18Set the svn:eol-style property on all text files to "native", so thatguy1-1/+1
they have LF at the end of the line on UN*X and CR/LF on Windows; hopefully this means that if a CR/LF version is checked in on Windows, the CRs will be stripped so that they show up only when checked out on Windows, not on UN*X. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11400 f5534014-38df-0310-8fa8-9805f1628bb7
2004-07-06Make sure child processes don't create a splash screen. Make the verbs ingerald1-3/+3
the splash screen messages present participles. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11321 f5534014-38df-0310-8fa8-9805f1628bb7
2004-06-20added an option to "avoid" the capture info dialog completely.ulfl1-1/+2
This matters for "update of list in real time" (sync_mode) only, as in normal mode you wouldn't otherwise have the possibility to stop the capture. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11194 f5534014-38df-0310-8fa8-9805f1628bb7
2004-06-04add more details for doxygenulfl1-37/+46
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11107 f5534014-38df-0310-8fa8-9805f1628bb7
2004-04-13From Jon Oberheide: Add interface name to the capture and ethereal windowtuexen1-2/+3
while capturing. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10594 f5534014-38df-0310-8fa8-9805f1628bb7
2004-03-13experimental: make usage of pcap_setbuff to increase the kernel buffer sizeulfl1-1/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10377 f5534014-38df-0310-8fa8-9805f1628bb7
2004-03-04fixed differences between capture GUI frontend and backendulfl1-13/+12
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10303 f5534014-38df-0310-8fa8-9805f1628bb7
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 21:26:57 +0000