aboutsummaryrefslogtreecommitdiffstats
path: root/capture.c
Commit message (Collapse)AuthorAgeFilesLines
* Clean up white space.Guy Harris2010-11-281-9/+9
| | | | svn path=/trunk/; revision=35047
* From Gregor Beck:Anders Broman2010-08-241-3/+4
| | | | | | | ERROR:capture.c:141:capture_start: assertion failed: (capture_opts->state == CAPTURE_STOPPED) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5126 svn path=/trunk/; revision=33906
* Add cf_fake_continue_tail() which is called when real-time captureGerald Combs2010-05-271-0/+1
| | | | | | | updates are off and which sets the capture file state to a value that won't cause an assertion when the user stops capturing. Fixes bug 4035. svn path=/trunk/; revision=33005
* If dumpcap exits abnormally, report the error.Guy Harris2010-05-261-1/+4
| | | | svn path=/trunk/; revision=32964
* When dumpcap is run to get an interface list, interface capabilities, orGuy Harris2010-05-171-1/+6
| | | | | | | | interface statistics, have its error messages come out as sync-pipe errors, have it send a sync-pipe "success" message on success, and have the callers get that message and display it. svn path=/trunk/; revision=32843
* Keep a copy of the interface description and capture filter around so thatGerald Combs2010-04-011-4/+9
| | | | | | | we can use it in the main window title during and after capture. Add a "-X" option for providing a description for stdin. svn path=/trunk/; revision=32357
* In Wireshark and TShark, run dumpcap to get interface lists and lists ofGuy Harris2010-03-041-194/+1
| | | | | | | | 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. svn path=/trunk/; revision=32104
* Behave more gracefully if WinPcap isn't installed. Don't assert ifGerald Combs2009-12-151-2/+2
| | | | | | | | | | we call pcap_open or pcap_open_live when WinPcap isn't loaded - just return NULL. Don't display the "NPF driver isn't running" dialog if we're capturing from stdin or a file. Fix a cut-and-paste error in capture_pcap_linktype_list. svn path=/trunk/; revision=31275
* From Valerio Messina:Jaap Keuter2009-12-141-1/+1
| | | | | | | | As now, when Wireshark save capture files, it show "Loading" in status bar and in the dialog box, warning many users of lost them packets. Saving work as expected. Is simply a GUI use interaction problem. svn path=/trunk/; revision=31269
* (FWIW) One step towards including stdio.h & stdlib.h only when req'd.Bill Meier2009-08-261-0/+1
| | | | svn path=/trunk/; revision=29568
* (Minor) #include "alert_box.h" not req'dBill Meier2009-06-111-1/+0
| | | | svn path=/trunk/; revision=28707
* Minor rewording of a few comments; fix a few typos.Bill Meier2009-01-041-17/+16
| | | | svn path=/trunk/; revision=27151
* The packet counts and drop counts reported by libpcap are unsigned.Guy Harris2008-08-191-2/+2
| | | | | | Clean up indentation a bit. svn path=/trunk/; revision=26037
* Fix some incorrect code (found by valgrind).Bill Meier2008-08-151-7/+5
| | | | svn path=/trunk/; revision=26032
* Have separate callback mechanisms in file.c and capture.c; pass theGuy Harris2008-06-241-11/+67
| | | | | | | | | | | | 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. svn path=/trunk/; revision=25576
* Have capture_info_ui_create() and capture_info_open() take a pointer toGuy Harris2008-06-241-1/+1
| | | | | | | | | | the capture_opts structure as an argument, rather than just a pointer to the interface name. Don't declare a global "capture_opts" pointer, as we don't define it any more. svn path=/trunk/; revision=25570
* Don't include \r in linktype on win32, it looks weird in the combo box.Stig Bjørlykke2008-06-021-0/+8
| | | | svn path=/trunk/; revision=25410
* Move the file utility functions from wiretap to libwsutil so thatJeff Morriss2008-05-221-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_*. svn path=/trunk/; revision=25354
* - Remove GLIB1 codeStephen Fisher2008-04-071-1/+0
| | | | | | | | | - Change ugly GLIB version checking statements to GLIB_CHECK_VERSION - Remove ws_strsplit files because we no longer need to borrow GLIB2's g_strsplit code for the no longer supported GLIB1 builds svn path=/trunk/; revision=24829
* Constify some arguments.Guy Harris2008-02-211-1/+1
| | | | svn path=/trunk/; revision=24407
* Removed some more "statement not reached" warnings.Stig Bjørlykke2008-02-071-1/+0
| | | | svn path=/trunk/; revision=24283
* as "advertised" some days ago:Ulf Lamping2007-09-251-2/+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! svn path=/trunk/; revision=22969
* Add a "-S" flag to dumpcap, which prints out interface statistics. UseGerald Combs2007-08-021-6/+133
| | | | | | | | 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
* Remove the "-I" flag from dumpcap, and add a "-M" flag used to specifyGerald Combs2007-07-201-0/+57
| | | | | | | 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
* Fix compilation under VS6 (hopefully without breaking compilationGerald Combs2007-06-111-25/+25
| | | | | | | | | | 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?) svn path=/trunk/; revision=22075
* Fix segmentation fault when NULL err_msg pointer passed to ↵Jaap Keuter2007-06-111-4/+8
| | | | | | capture_interface_list() and sync_list_interface_open() fails. svn path=/trunk/; revision=22073
* One more step in privilege separation.Gerald Combs2007-06-111-10/+125
| | | | | | | | | | | | | 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
* Minor fix: For "wireshark -Q ..." show "no packets captured" popup only when ↵Bill Meier2007-05-171-3/+5
| | | | | | valid. svn path=/trunk/; revision=21810
* Ethereal->WiresharkAnders Broman2006-05-281-2/+2
| | | | svn path=/trunk/; revision=18235
* name changeRonnie Sahlberg2006-05-211-2/+2
| | | | svn path=/trunk/; revision=18197
* fix bug #803: sync pipe on Win32 wasn't set to binary mode, so error message ↵Ulf Lamping2006-03-131-2/+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. svn path=/trunk/; revision=17608
* Pass two strings in capture child messages, so the child can sendGuy Harris2006-03-051-8/+78
| | | | | | | | | | | | | | | 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!). svn path=/trunk/; revision=17465
* Clean up indentation a bit.Guy Harris2006-03-011-5/+8
| | | | | | | | | | | | In "capture_input_new_file()", don't call the callbacks unless we succeed in opening the new file. Have "capture_info_new_file()" return a success/failure indication. Improve the message logged when we fail to open the new file if we're only opening it for the quick packet counts. We really should put up an alert box and give up on the capture at that point. svn path=/trunk/; revision=17437
* add a log message, if capture start failedUlf Lamping2006-02-171-0/+1
| | | | svn path=/trunk/; revision=17340
* remove dependencies to pcap.h, so getting an idea what needs to be done by ↵Ulf Lamping2006-02-171-2/+0
| | | | | | | | dumpcap in addition to the things already done now various dumpcap related code cleanup: mainly #include's and capture engine related stuff svn path=/trunk/; revision=17327
* show the number of packets captured, if "Update list of packets ..." isn't usedUlf Lamping2006-01-221-5/+11
| | | | svn path=/trunk/; revision=17071
* we can even get error messages while we are capturing (e.g. when a network ↵Ulf Lamping2005-12-061-3/+3
| | | | | | | | cable is unplugged) problem found by Joerg Mayer svn path=/trunk/; revision=16704
* rename pcap-....c/.h files to capture-pcap-....c/.hUlf Lamping2005-12-061-1/+1
| | | | | | | | this way, the capture prefix will "logically" group the files together and file browsers will also group them we may want to move the files into a subdir capture later svn path=/trunk/; revision=16691
* move the complete functionality of the capture info dialog from ↵Ulf Lamping2005-12-041-1/+15
| | | | | | | | | | capture_loop.c to capture_info.c and call it from capture.c (instead of capture_loop.c). This way, the capture child don't need to now any of the packet_counter things (no epan/packet.h and all alike). Currently the capture_info code will always open another wiretap file instance to build it's own counter values. This isn't optimized for now (next step: use data from cf_continue_tail() somehow). svn path=/trunk/; revision=16669
* clarify a commentUlf Lamping2005-12-031-1/+2
| | | | svn path=/trunk/; revision=16667
* add missing functions (to complete/cleanup of interface):Ulf Lamping2005-12-031-3/+30
| | | | | | | | | capture_input_drops capture_input_error_message and move the functionality from capture_sync.c to capture.c (just where it belongs) svn path=/trunk/; revision=16663
* add some more help text to the "no packets captured" error dialog:Ulf Lamping2005-11-251-5/+29
| | | | | | | | | | | link to CaptureSetup wiki page Win32 only: wireless: "try switch off promicuous mode" This way we might get less user questions on the users-mailing list ... Especially the second one hopefully could save us from a lot of support mails :-) svn path=/trunk/; revision=16591
* replace *a lot* of file related calls by their GLib counterparts. This is ↵Ulf Lamping2005-11-061-5/+2
| | | | | | | | | | | | necessary for the switch to GTK 2.6 (at least on WIN32). to do this, I've added file_util.h to wiretap (would file_compat.h be a better name?), and provide compat_macros like eth_open() instead of open(). While at it, move other file related things there, like #include <io.h>, definition of O_BINARY and alike, so it's all in one place. deleted related things from config.h.win32 As of these massive changes, I'm almost certain that this will break the Unix build. I'll keep an eye on the buildbot so hopefully everything is working again soon. svn path=/trunk/; revision=16403
* minor fix: fix the sequence while finishing a live capture, so the statusbar ↵Ulf Lamping2005-10-071-4/+10
| | | | | | information about the file size is correct svn path=/trunk/; revision=16148
* add two new callbacks:Ulf Lamping2005-09-201-0/+3
| | | | | | | | | | cf_cb_file_closing (called before closing a capture file) cf_cb_file_closed will be called afterwards, but both only if a file is really closed as cf_close is called more often ... If we are closing large capture files (~20MB), the screen looks ugly while the file is closed. Change this so the screen will immediately go back to initial state and a dialog (without buttons) is shown that the file is currently closed. As the operation which takes most of the time to close the file is a single eth_clist_clear call, we can't use a progress bar here. cf_cb_live_capture_stopping: called when the user wants to stop the capture (toolbar or menu clicked). At least on Win32, the time between this and the actual stop completed can be noticeable (1-2 seconds), so the user doesn't know if the button press did anything at all. Do something similar as above, show a dialog box without buttons to inform that the close is in progress. svn path=/trunk/; revision=15891
* changed the loglevel of "capture kill" from message to info (it's no action ↵Ulf Lamping2005-05-261-1/+1
| | | | | | that the user directly triggered) svn path=/trunk/; revision=14446
* use the log features of the GLib to have verbose output of the capturing ↵Ulf Lamping2005-05-261-1/+15
| | | | | | | | | | | 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. svn path=/trunk/; revision=14438
* the capture child might not respond shortly after bringing it up (especially ↵Ulf Lamping2005-05-251-0/+7
| | | | | | | | it will block, if no input coming from an input capture pipe (e.g. mkfifo) is coming in) to prevent problems, bring the main GUI into "capture mode" right after successfully spawn/exec the capture child, without waiting for any response from it svn path=/trunk/; revision=14436
* removed various gcc warningsUlf Lamping2005-04-301-0/+4
| | | | svn path=/trunk/; revision=14246
* (hopefully) removed various gcc warningsUlf Lamping2005-04-301-1/+1
| | | | svn path=/trunk/; revision=14241