osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

bugfix: when no packets were captured, don't call cf_cb_live_capture_finished after closing the capture file 

svn path=/trunk/; revision=14039
This commit is contained in:
Ulf Lamping 2005-04-10 15:35:41 +00:00
parent 3ee155a90a
commit 78a7b0bcc0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
capture.c
View File

@ -281,28 +281,30 @@ capture_input_closed(capture_options *capture_opts)
simple_dialog_primary_start(), simple_dialog_primary_end(), simple_dialog_primary_start(), simple_dialog_primary_end(),
cf_is_tempfile(capture_opts->cf) ? "temporary " : ""); cf_is_tempfile(capture_opts->cf) ? "temporary " : "");
cf_close(capture_opts->cf); cf_close(capture_opts->cf);
/* we have closed the capture file, don't call cf_cb_live_capture_finished! */
} }
break; break;
case CF_READ_ERROR: case CF_READ_ERROR:
/* Just because we got an error, that doesn't mean we were unable /* Just because we got an error, that doesn't mean we were unable
to read any of the file; we handle what we could get from the to read any of the file; we handle what we could get from the
file. */ file. */
cf_callback_invoke(cf_cb_live_capture_finished, capture_opts->cf);
break; break;
case CF_READ_ABORTED: case CF_READ_ABORTED:
/* Exit by leaving the main loop, so that any quit functions /* Exit by leaving the main loop, so that any quit functions
we registered get called. */ we registered get called. */
main_window_quit(); main_window_quit();
cf_callback_invoke(cf_cb_live_capture_finished, capture_opts->cf);
} }
} else { } else {
/* this is a normal mode capture, read in the capture file data */ /* this is a normal mode capture, read in the capture file data */
capture_input_read_all(capture_opts, cf_is_tempfile(capture_opts->cf), capture_input_read_all(capture_opts, cf_is_tempfile(capture_opts->cf),
cf_get_drops_known(capture_opts->cf), cf_get_drops(capture_opts->cf)); cf_get_drops_known(capture_opts->cf), cf_get_drops(capture_opts->cf));
cf_callback_invoke(cf_cb_live_capture_finished, capture_opts->cf);
} }
cf_callback_invoke(cf_cb_live_capture_finished, capture_opts->cf);
/* We're not doing a capture any more, so we don't have a save file. */ /* We're not doing a capture any more, so we don't have a save file. */
g_assert(capture_opts->save_file); g_assert(capture_opts->save_file);
g_free(capture_opts->save_file); g_free(capture_opts->save_file);