aboutsummaryrefslogtreecommitdiffstats
path: root/capture.c
AgeCommit message (Collapse)AuthorFilesLines
2006-03-13fix bug #803: sync pipe on Win32 wasn't set to binary mode, so error message ↵Ulf Lamping1-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
2006-03-05Pass two strings in capture child messages, so the child can sendGuy Harris1-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
2006-03-01Clean up indentation a bit.Guy Harris1-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
2006-02-17add a log message, if capture start failedUlf Lamping1-0/+1
svn path=/trunk/; revision=17340
2006-02-17remove dependencies to pcap.h, so getting an idea what needs to be done by ↵Ulf Lamping1-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
2006-01-22show the number of packets captured, if "Update list of packets ..." isn't usedUlf Lamping1-5/+11
svn path=/trunk/; revision=17071
2005-12-06we can even get error messages while we are capturing (e.g. when a network ↵Ulf Lamping1-3/+3
cable is unplugged) problem found by Joerg Mayer svn path=/trunk/; revision=16704
2005-12-06rename pcap-....c/.h files to capture-pcap-....c/.hUlf Lamping1-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
2005-12-04move the complete functionality of the capture info dialog from ↵Ulf Lamping1-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
2005-12-03clarify a commentUlf Lamping1-1/+2
svn path=/trunk/; revision=16667
2005-12-03add missing functions (to complete/cleanup of interface):Ulf Lamping1-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
2005-11-25add some more help text to the "no packets captured" error dialog:Ulf Lamping1-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
2005-11-06replace *a lot* of file related calls by their GLib counterparts. This is ↵Ulf Lamping1-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
2005-10-07minor fix: fix the sequence while finishing a live capture, so the statusbar ↵Ulf Lamping1-4/+10
information about the file size is correct svn path=/trunk/; revision=16148
2005-09-20add two new callbacks:Ulf Lamping1-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
2005-05-26changed the loglevel of "capture kill" from message to info (it's no action ↵Ulf Lamping1-1/+1
that the user directly triggered) svn path=/trunk/; revision=14446
2005-05-26use the log features of the GLib to have verbose output of the capturing ↵Ulf Lamping1-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
2005-05-25the capture child might not respond shortly after bringing it up (especially ↵Ulf Lamping1-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
2005-04-30removed various gcc warningsUlf Lamping1-0/+4
svn path=/trunk/; revision=14246
2005-04-30(hopefully) removed various gcc warningsUlf Lamping1-1/+1
svn path=/trunk/; revision=14241
2005-04-27add a state member to the capture_opts, and set it according to the capture ↵Ulf Lamping1-2/+13
engine svn path=/trunk/; revision=14205
2005-04-18statusbar changes:Ulf Lamping1-4/+2
-show the current capture file size, if capturing in real time mode. -move the packet "Drops" count (if available) from file to packets statusbar part svn path=/trunk/; revision=14130
2005-04-17bugfix: show the right filesize after a live capture finishedUlf Lamping1-1/+4
svn path=/trunk/; revision=14118
2005-04-16rename capture_clear() to capture_restart()Ulf Lamping1-1/+13
statusbar update should work now even in capture error case svn path=/trunk/; revision=14105
2005-04-16bugfix: don't crash on error in normal mode captureUlf Lamping1-3/+10
svn path=/trunk/; revision=14104
2005-04-12don't display "No packets captured" dialog, when using the new clear featureUlf Lamping1-2/+2
svn path=/trunk/; revision=14060
2005-04-12capture engine: Ulf Lamping1-2/+26
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) svn path=/trunk/; revision=14059
2005-04-12it should now be possible to use "Update packets in real time" even if used ↵Ulf Lamping1-3/+4
with one of the "Multiple files" option. If this is used together with an option where input files changes too fast (e.g. new file every second), capturing will be (hopefully) stopped. I've replaced the former capture pipe message format into a somewhat more general format to remove a lot of confusion. svn path=/trunk/; revision=14054
2005-04-11various capture code cleanup and fixes: Ulf Lamping1-25/+25
display filename in statusbar while capturing print_usage banner fixed cf_cb_live_capture_prepare no longer needed rename sync_pipe_do_capture -> sync_pipe_start bugfix: sync_pipe_input_wait_for_start replaced by former implementation fix cleanup of old file in capture_input_new_file fix a tempfile detection bug (named file showed up as tempfile after capture) svn path=/trunk/; revision=14053
2005-04-10bugfix: call to cf_cb_live_capture_..._started with correct parameterUlf Lamping1-2/+2
svn path=/trunk/; revision=14045
2005-04-10fix statusbar messages by splitting into update and fixed messages between ↵Ulf Lamping1-7/+10
capture and main svn path=/trunk/; revision=14044
2005-04-10bugfix: hide panes if a non "Update" capture had no packets captured ↵Ulf Lamping1-5/+5
(hopefully it's working correct now...) svn path=/trunk/; revision=14043
2005-04-10bugfix: call cf_cb_live_capture_finished *if* some packets were capturedUlf Lamping1-0/+2
svn path=/trunk/; revision=14042
2005-04-10bugfix: when no packets were captured, don't call ↵Ulf Lamping1-2/+4
cf_cb_live_capture_finished after closing the capture file svn path=/trunk/; revision=14039
2005-04-10Clean up indentation.Guy Harris1-119/+119
svn path=/trunk/; revision=14036
2005-03-28some minor changesUlf Lamping1-5/+4
svn path=/trunk/; revision=13962
2005-03-28bugfixes: bring non real-time captures back to former behaviour, other minor ↵Ulf Lamping1-0/+6
fixes svn path=/trunk/; revision=13961
2005-03-28various (minor) capture code cleanupUlf Lamping1-48/+21
svn path=/trunk/; revision=13957
2005-03-28fix Solaris build (I've removed O_BINARY)Ulf Lamping1-4/+4
rename sync_mode to real_time_mode, as we using sync_mode all the time now, so the name is misleading svn path=/trunk/; revision=13956
2005-03-28remove capture_child flag from capture_opts as it's no longer requiredUlf Lamping1-8/+8
svn path=/trunk/; revision=13954
2005-03-28a lot more capture engine code cleanupUlf Lamping1-153/+133
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) svn path=/trunk/; revision=13953
2005-03-28major capture engine rework: use two task model for EVERY capture modeUlf Lamping1-7/+23
rework of the -b command line parameter (for Ethereal and Tethereal) svn path=/trunk/; revision=13949
2005-02-28Another step towards using the parent/child mode for ALL captures.Ulf Lamping1-9/+17
This is currently still disabled, as we cannot pass all required capture flags to the child process (lack of command line parameters). svn path=/trunk/; revision=13558
2005-02-27some more cleanup of the capturing code (e.g. split up of the code reading ↵Ulf Lamping1-26/+38
in the "normal mode" captured data) svn path=/trunk/; revision=13538
2005-02-27bugfix to bring up correct error message if capture file couldn't be openened.Ulf Lamping1-20/+17
some code cleanup svn path=/trunk/; revision=13537
2005-02-27some clarification of the capture child thingUlf Lamping1-5/+20
svn path=/trunk/; revision=13535
2005-02-23move capture_opts related things (init, command line, ...) from capture.c to ↵Ulf Lamping1-272/+0
a new file capture_opts.c and let both ethereal and tethereal use it. svn path=/trunk/; revision=13474
2005-02-22add the number of autostop files to the command line parameters, e.g.:Ulf Lamping1-0/+4
-a files:20 also added this to the manpage, the user's guide will follow later svn path=/trunk/; revision=13473
2005-02-13change nmake makefiles in /trunk and /trunk/epan so thatLars Roland1-4/+0
object code for libethereal.dll isn't generated by the makefile in /trunk. Having no code in /trunk linked into libethereal.dll anymore, the definition of the macro _NEED_VAR_IMPORT_ can be moved from various source files in /trunk to /trunk/Makefile.nmake . So do that, too. svn path=/trunk/; revision=13389
2005-02-08fix a capture bug if the capture filter wasn't valid to get back to "empty" ↵Ulf Lamping1-2/+2
state. instead of already invoking cf_cb_live_capture_started in capture.c, I've introduced the new event cf_cb_live_capture_prepare which only has to set the main windows title and nothing more. svn path=/trunk/; revision=13355