diff options
| -rw-r--r-- | capture.c | 4 | ||||
| -rw-r--r-- | capture.h | 5 | ||||
| -rw-r--r-- | file.c | 7 | ||||
| -rw-r--r-- | gtk/capture_info_dlg.c | 10 |
4 files changed, 17 insertions, 9 deletions
@@ -1,7 +1,7 @@ /* capture.c * Routines for packet capture windows * - * $Id: capture.c,v 1.248 2004/03/23 06:48:31 guy Exp $ + * $Id: capture.c,v 1.249 2004/04/13 18:01:39 tuexen Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1756,7 +1756,7 @@ capture(gboolean *stats_known, struct pcap_stat *stats) /* start capture info dialog */ capture_ui.callback_data = &ld; capture_ui.counts = &ld.counts; - capture_info_create(&capture_ui); + capture_info_create(&capture_ui, cfile.iface); start_time = time(NULL); upd_time = time(NULL); @@ -1,7 +1,7 @@ /* capture.h * Definitions for packet capture windows * - * $Id: capture.h,v 1.44 2004/03/13 22:49:30 ulfl Exp $ + * $Id: capture.h,v 1.45 2004/04/13 18:01:39 tuexen Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -101,7 +101,8 @@ typedef struct { /* create the capture info dialog */ extern void capture_info_create( -capture_info *cinfo); +capture_info *cinfo, +gchar *iface); /* Update the capture info counters in the dialog */ extern void capture_info_update( @@ -1,7 +1,7 @@ /* file.c * File I/O routines * - * $Id: file.c,v 1.370 2004/03/08 23:45:24 guy Exp $ + * $Id: file.c,v 1.371 2004/04/13 18:01:39 tuexen Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -529,6 +529,7 @@ int cf_start_tail(char *fname, gboolean is_tempfile, capture_file *cf) { int err; + gchar *capture_msg; err = cf_open(fname, is_tempfile, cf); if (err == 0) { @@ -540,7 +541,9 @@ cf_start_tail(char *fname, gboolean is_tempfile, capture_file *cf) packets (yes, I know, we don't have any *yet*). */ set_menus_for_captured_packets(TRUE); - statusbar_push_file_msg(" <live capture in progress>"); + capture_msg = g_strdup_printf(" %s: <live capture in progress>", cf->iface); + + statusbar_push_file_msg(capture_msg); } return err; } diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c index 76a37cdad7..3dcf101b21 100644 --- a/gtk/capture_info_dlg.c +++ b/gtk/capture_info_dlg.c @@ -1,7 +1,7 @@ /* capture_info_dlg.c * Routines for packet capture info dialog * - * $Id: capture_info_dlg.c,v 1.13 2004/03/13 15:15:22 ulfl Exp $ + * $Id: capture_info_dlg.c,v 1.14 2004/04/13 18:01:40 tuexen Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -84,12 +84,14 @@ capture_info_delete_cb(GtkWidget *w _U_, GdkEvent *event _U_, gpointer data _U_) /* create the capture info dialog */ /* will keep pointers to the fields in the counts parameter */ void capture_info_create( -capture_info *cinfo) +capture_info *cinfo, +gchar *iface) { unsigned int i; GtkWidget *main_vb, *stop_bt, *counts_tb; GtkWidget *counts_fr, *running_tb, *running_label, *bbox; capture_info_ui_t *info; + gchar *cap_w_title; info = g_malloc0(sizeof(capture_info_ui_t)); info->counts[0].title = "Total"; @@ -117,7 +119,9 @@ capture_info *cinfo) info->counts[11].title = "Other"; info->counts[11].value_ptr = &(cinfo->counts->other); - info->cap_w = dlg_window_new("Ethereal: Capture"); + cap_w_title = g_strdup_printf("Ethereal: Capture - Interface %s", iface); + + info->cap_w = dlg_window_new(cap_w_title); gtk_window_set_modal(GTK_WINDOW(info->cap_w), TRUE); /* Container for capture display widgets */ |