diff options
author | Ulf Lamping <ulf.lamping@web.de> | 2005-04-10 19:36:56 +0000 |
---|---|---|
committer | Ulf Lamping <ulf.lamping@web.de> | 2005-04-10 19:36:56 +0000 |
commit | 163f2b61a857b93126e1f84f8686555b9121b989 (patch) | |
tree | 697b7493d65461d089a8d5d7f24a0e125b3ef5d9 /capture.c | |
parent | adc2bf61a8a144f962f300a60b0ab891870ed6b6 (diff) |
fix statusbar messages by splitting into update and fixed messages between capture and main
svn path=/trunk/; revision=14044
Diffstat (limited to 'capture.c')
-rw-r--r-- | capture.c | 17 |
1 files changed, 10 insertions, 7 deletions
@@ -221,9 +221,12 @@ capture_input_new_file(capture_options *capture_opts, gchar *new_file) return FALSE; break; } + + cf_callback_invoke(cf_cb_live_capture_update_started, capture_opts->cf); + } else { + cf_callback_invoke(cf_cb_live_capture_fixed_started, capture_opts->cf); } - cf_callback_invoke(cf_cb_live_capture_started, capture_opts->cf); return TRUE; } @@ -269,6 +272,9 @@ capture_input_closed(capture_options *capture_opts) if(capture_opts->real_time_mode) { + /* first of all, we are not doing a capture any more */ + cf_callback_invoke(cf_cb_live_capture_update_finished, capture_opts->cf); + /* Read what remains of the capture file, and finish the capture. XXX - do something if this fails? */ switch (cf_finish_tail(capture_opts->cf, &err)) { @@ -296,17 +302,14 @@ capture_input_closed(capture_options *capture_opts) } } else { + /* first of all, we are not doing a capture any more */ + cf_callback_invoke(cf_cb_live_capture_fixed_finished, capture_opts->cf); + /* this is a normal mode capture, read in the capture file data */ 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)); } - /* if we have captured some packets, call cf_cb_live_capture_finished! */ - /* (otherwise we already have called cf_close) */ - if(cf_packet_count(capture_opts->cf) != 0) { - 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. */ g_assert(capture_opts->save_file); g_free(capture_opts->save_file); |