Update to IO-Stat to put the capture filename on the titlebar

to make it easier to navigate when having multiple instances of ethereal
and io-stat open
at the same time.

Updates to all endpoint talkers and service response time windows to do this as well.

Bonus, when the user opens a new capture file when having these windows open,
the title bar will be updated to reflect the name of the new capture file.

svn path=/trunk/; revision=8251
This commit is contained in:
Ronnie Sahlberg 2003-08-25 11:06:32 +00:00
parent 764114e914
commit cd016e69a9
13 changed files with 100 additions and 40 deletions

View File

@ -1,7 +1,7 @@
/* dcerpc_stat.c
* dcerpc_stat 2002 Ronnie Sahlberg
*
* $Id: dcerpc_stat.c,v 1.12 2003/08/19 10:09:20 sahlberg Exp $
* $Id: dcerpc_stat.c,v 1.13 2003/08/25 11:06:31 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -83,7 +83,11 @@ uuid_equal(e_uuid_t *uuid1, e_uuid_t *uuid2)
static void
dcerpcstat_reset(rpcstat_t *rs)
{
char title_string[256];
reset_srt_table_data(&rs->srt_table);
snprintf(title_string, 255, "DCE-RPC Service Response Time statistics for %s version %d.%d : %s", rs->prog, rs->ver&0xff, rs->ver>>8, cfile.filename);
gtk_window_set_title(GTK_WINDOW(rs->win), title_string);
}
@ -157,7 +161,7 @@ gtk_dcerpcstat_init(char *optarg)
{
rpcstat_t *rs;
guint32 i, max_procs;
char title_string[60];
char title_string[256];
char filter_string[256];
GtkWidget *vbox;
GtkWidget *stat_label;
@ -206,7 +210,7 @@ gtk_dcerpcstat_init(char *optarg)
rs->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(rs->win), 550, 400);
sprintf(title_string,"DCE-RPC Service Response Time statistics for %s version %d.%d", rs->prog, rs->ver&0xff,rs->ver>>8);
snprintf(title_string, 255, "DCE-RPC Service Response Time statistics for %s version %d.%d : %s", rs->prog, rs->ver&0xff, rs->ver>>8, cfile.filename);
gtk_window_set_title(GTK_WINDOW(rs->win), title_string);
SIGNAL_CONNECT(rs->win, "destroy", win_destroy_cb, rs);

View File

@ -1,7 +1,7 @@
/* endpoint_talkers_eth.c
* endpoint_talkers_eth 2003 Ronnie Sahlberg
*
* $Id: endpoint_talkers_eth.c,v 1.3 2003/08/24 22:34:31 guy Exp $
* $Id: endpoint_talkers_eth.c,v 1.4 2003/08/25 11:06:31 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -70,9 +70,13 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data)
static void
eth_talkers_reset(void *pit)
{
char title[256];
eth_talkers_t *eth_talkers=(eth_talkers_t *)pit;
reset_ett_table_data(&eth_talkers->talkers);
snprintf(title, 255, "Ethernet Talkers: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(eth_talkers->win), title);
}
@ -106,7 +110,7 @@ gtk_eth_talkers_init(char *optarg)
GtkWidget *vbox;
GtkWidget *label;
GString *error_string;
char title[256];
if(!strncmp(optarg,"talkers,eth,",12)){
filter=optarg+12;
@ -118,7 +122,8 @@ gtk_eth_talkers_init(char *optarg)
eth_talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(eth_talkers->win), 750, 400);
gtk_window_set_title(GTK_WINDOW(eth_talkers->win), "Ethernet Talkers");
snprintf(title, 255, "Ethernet Talkers: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(eth_talkers->win), title);
SIGNAL_CONNECT(eth_talkers->win, "destroy", win_destroy_cb, eth_talkers);

View File

@ -1,7 +1,7 @@
/* endpoint_talkers_fc.c
* endpoint_talkers_fc 2003 Ronnie Sahlberg
*
* $Id: endpoint_talkers_fc.c,v 1.3 2003/08/24 22:34:31 guy Exp $
* $Id: endpoint_talkers_fc.c,v 1.4 2003/08/25 11:06:31 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -71,8 +71,11 @@ static void
fc_talkers_reset(void *pit)
{
fc_talkers_t *fc_talkers=(fc_talkers_t *)pit;
char title[256];
reset_ett_table_data(&fc_talkers->talkers);
snprintf(title, 255, "Fibre Channel Talkers: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(fc_talkers->win), title);
}
@ -106,7 +109,7 @@ gtk_fc_talkers_init(char *optarg)
GtkWidget *vbox;
GtkWidget *label;
GString *error_string;
char title[256];
if(!strncmp(optarg,"talkers,fc,",11)){
filter=optarg+11;
@ -118,7 +121,8 @@ gtk_fc_talkers_init(char *optarg)
fc_talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(fc_talkers->win), 750, 400);
gtk_window_set_title(GTK_WINDOW(fc_talkers->win), "Fibre Channel Talkers");
snprintf(title, 255, "Fibre Channel Talkers: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(fc_talkers->win), title);
SIGNAL_CONNECT(fc_talkers->win, "destroy", win_destroy_cb, fc_talkers);

View File

@ -1,7 +1,7 @@
/* endpoint_talkers_ip.c
* endpoint_talkers_ip 2003 Ronnie Sahlberg
*
* $Id: endpoint_talkers_ip.c,v 1.4 2003/08/24 22:34:31 guy Exp $
* $Id: endpoint_talkers_ip.c,v 1.5 2003/08/25 11:06:31 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -71,8 +71,11 @@ static void
ip_talkers_reset(void *pit)
{
ip_talkers_t *ip_talkers=(ip_talkers_t *)pit;
char title[256];
reset_ett_table_data(&ip_talkers->talkers);
snprintf(title, 255, "IPv4 Talkers: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(ip_talkers->win), title);
}
@ -106,7 +109,7 @@ gtk_ip_talkers_init(char *optarg)
GtkWidget *vbox;
GtkWidget *label;
GString *error_string;
char title[256];
if(!strncmp(optarg,"talkers,ip,",11)){
filter=optarg+11;
@ -118,7 +121,8 @@ gtk_ip_talkers_init(char *optarg)
ip_talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(ip_talkers->win), 750, 400);
gtk_window_set_title(GTK_WINDOW(ip_talkers->win), "IPv4 Talkers");
snprintf(title, 255, "IPv4 Talkers: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(ip_talkers->win), title);
SIGNAL_CONNECT(ip_talkers->win, "destroy", win_destroy_cb, ip_talkers);

View File

@ -1,7 +1,7 @@
/* endpoint_talkers_ipx.c
* endpoint_talkers_ipx 2003 Ronnie Sahlberg
*
* $Id: endpoint_talkers_ipx.c,v 1.2 2003/08/24 22:34:31 guy Exp $
* $Id: endpoint_talkers_ipx.c,v 1.3 2003/08/25 11:06:31 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -71,8 +71,11 @@ static void
ipx_talkers_reset(void *pit)
{
ipx_talkers_t *ipx_talkers=(ipx_talkers_t *)pit;
char title[256];
reset_ett_table_data(&ipx_talkers->talkers);
snprintf(title, 255, "IPX Talkers: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(ipx_talkers->win), title);
}
@ -106,7 +109,7 @@ gtk_ipx_talkers_init(char *optarg)
GtkWidget *vbox;
GtkWidget *label;
GString *error_string;
char title[256];
if(!strncmp(optarg,"talkers,ipx,",12)){
filter=optarg+12;
@ -118,7 +121,8 @@ gtk_ipx_talkers_init(char *optarg)
ipx_talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(ipx_talkers->win), 750, 400);
gtk_window_set_title(GTK_WINDOW(ipx_talkers->win), "IPX Talkers");
snprintf(title, 255, "IPX Talkers: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(ipx_talkers->win), title);
SIGNAL_CONNECT(ipx_talkers->win, "destroy", win_destroy_cb, ipx_talkers);

View File

@ -1,7 +1,7 @@
/* endpoint_talkers_tcpip.c
* endpoint_talkers_tcpip 2003 Ronnie Sahlberg
*
* $Id: endpoint_talkers_tcpip.c,v 1.5 2003/08/24 22:34:31 guy Exp $
* $Id: endpoint_talkers_tcpip.c,v 1.6 2003/08/25 11:06:31 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -88,8 +88,11 @@ static void
tcpip_talkers_reset(void *pit)
{
tcpip_talkers_t *tcpip_talkers=(tcpip_talkers_t *)pit;
char title[256];
reset_ett_table_data(&tcpip_talkers->talkers);
snprintf(title, 255, "TCP Talkers: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(tcpip_talkers->win), title);
}
@ -123,7 +126,7 @@ gtk_tcpip_talkers_init(char *optarg)
GtkWidget *vbox;
GtkWidget *label;
GString *error_string;
char title[256];
if(!strncmp(optarg,"talkers,tcp,",12)){
filter=optarg+12;
@ -135,7 +138,8 @@ gtk_tcpip_talkers_init(char *optarg)
tcpip_talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(tcpip_talkers->win), 750, 400);
gtk_window_set_title(GTK_WINDOW(tcpip_talkers->win), "TCP Talkers");
snprintf(title, 255, "TCP Talkers: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(tcpip_talkers->win), title);
SIGNAL_CONNECT(tcpip_talkers->win, "destroy", win_destroy_cb, tcpip_talkers);

View File

@ -1,7 +1,7 @@
/* endpoint_talkers_tr.c
* endpoint_talkers_tr 2003 Ronnie Sahlberg
*
* $Id: endpoint_talkers_tr.c,v 1.4 2003/08/24 22:34:32 guy Exp $
* $Id: endpoint_talkers_tr.c,v 1.5 2003/08/25 11:06:31 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -71,8 +71,11 @@ static void
tr_talkers_reset(void *pit)
{
tr_talkers_t *tr_talkers=(tr_talkers_t *)pit;
char title[256];
reset_ett_table_data(&tr_talkers->talkers);
snprintf(title, 255, "Token Ring Talkers: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(tr_talkers->win), title);
}
@ -106,7 +109,7 @@ gtk_tr_talkers_init(char *optarg)
GtkWidget *vbox;
GtkWidget *label;
GString *error_string;
char title[256];
if(!strncmp(optarg,"talkers,tr,",11)){
filter=optarg+11;
@ -118,7 +121,8 @@ gtk_tr_talkers_init(char *optarg)
tr_talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(tr_talkers->win), 750, 400);
gtk_window_set_title(GTK_WINDOW(tr_talkers->win), "Token Ring Talkers");
snprintf(title, 255, "Token Ring Talkers: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(tr_talkers->win), title);
SIGNAL_CONNECT(tr_talkers->win, "destroy", win_destroy_cb, tr_talkers);

View File

@ -1,7 +1,7 @@
/* endpoint_talkers_udpip.c
* endpoint_talkers_udpip 2003 Ronnie Sahlberg
*
* $Id: endpoint_talkers_udpip.c,v 1.5 2003/08/24 22:34:32 guy Exp $
* $Id: endpoint_talkers_udpip.c,v 1.6 2003/08/25 11:06:31 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -88,8 +88,11 @@ static void
udpip_talkers_reset(void *pit)
{
udpip_talkers_t *udpip_talkers=(udpip_talkers_t *)pit;
char title[256];
reset_ett_table_data(&udpip_talkers->talkers);
snprintf(title, 255, "UDP Talkers: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(udpip_talkers->win), title);
}
@ -123,7 +126,7 @@ gtk_udpip_talkers_init(char *optarg)
GtkWidget *vbox;
GtkWidget *label;
GString *error_string;
char title[256];
if(!strncmp(optarg,"talkers,udp,",12)){
filter=optarg+12;
@ -135,7 +138,8 @@ gtk_udpip_talkers_init(char *optarg)
udpip_talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(udpip_talkers->win), 750, 400);
gtk_window_set_title(GTK_WINDOW(udpip_talkers->win), "UDP Talkers");
snprintf(title, 255, "UDP Talkers: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(udpip_talkers->win), title);
SIGNAL_CONNECT(udpip_talkers->win, "destroy", win_destroy_cb, udpip_talkers);

View File

@ -1,7 +1,7 @@
/* fc_stat.c
* fc_stat 2003 Ronnie Sahlberg
*
* $Id: fc_stat.c,v 1.2 2003/08/19 10:09:20 sahlberg Exp $
* $Id: fc_stat.c,v 1.3 2003/08/25 11:06:32 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -61,8 +61,11 @@ static void
fcstat_reset(void *pfc)
{
fcstat_t *fc=(fcstat_t *)pfc;
char title[256];
reset_srt_table_data(&fc->fc_srt_table);
snprintf(title, 255, "Fibre Channel Service Response Time statistics : %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(fc->win), title);
}
static int
@ -122,6 +125,7 @@ gtk_fcstat_init(char *optarg)
GString *error_string;
int i;
GtkWidget *vbox;
char title[256];
if(!strncmp(optarg,"fc,srt,",7)){
filter=optarg+7;
@ -133,7 +137,8 @@ gtk_fcstat_init(char *optarg)
fc->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(fc->win), 550, 400);
gtk_window_set_title(GTK_WINDOW(fc->win), "Fibre Channel Service Response Time statistics");
snprintf(title, 255, "Fibre Channel Service Response Time statistics : %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(fc->win), title);
SIGNAL_CONNECT(fc->win, "destroy", win_destroy_cb, fc);
vbox=gtk_vbox_new(FALSE, 0);

View File

@ -1,7 +1,7 @@
/* io_stat.c
* io_stat 2002 Ronnie Sahlberg
*
* $Id: io_stat.c,v 1.21 2003/04/23 08:20:05 guy Exp $
* $Id: io_stat.c,v 1.22 2003/08/25 11:06:32 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -201,6 +201,7 @@ gtk_iostat_reset(void *g)
{
io_stat_graph_t *gio=g;
io_stat_item_t *it;
char title[256];
gio->io->needs_redraw=1;
@ -221,6 +222,9 @@ gtk_iostat_reset(void *g)
gio->io->last_interval=0xffffffff;
gio->io->max_interval=0;
snprintf(title, 255, "IO-Stat: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(gio->io->window), title);
}
@ -1616,6 +1620,7 @@ init_io_stat_window(io_stat_t *io)
{
GtkWidget *vbox;
GtkWidget *hbox;
char title[256];
/* create the main window */
io->window=gtk_window_new(GTK_WINDOW_TOPLEVEL);
@ -1637,7 +1642,8 @@ init_io_stat_window(io_stat_t *io)
create_ctrl_area(io, hbox);
gtk_widget_show(io->window);
gtk_window_set_title(GTK_WINDOW(io->window),"IO-Stat");
snprintf(title, 255, "IO-Stat: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(io->window), title);
}

View File

@ -2,7 +2,7 @@
* mgcp-statistics for ethereal
* Copyright 2003 Lars Roland
*
* $Id: mgcp_stat.c,v 1.7 2003/08/21 17:48:04 guy Exp $
* $Id: mgcp_stat.c,v 1.8 2003/08/25 11:06:32 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -79,11 +79,18 @@ static const value_string mgcp_mesage_type[] = {
{ 0, NULL}
};
static GtkWidget *dlg=NULL, *dlg_box;
static GtkWidget *filter_box;
static GtkWidget *filter_label, *filter_entry;
static GtkWidget *start_button;
static void
mgcpstat_reset(void *pms)
{
mgcpstat_t *ms=(mgcpstat_t *)pms;
int i;
char title[256];
for(i=0;i<NUM_TIMESTATS;i++) {
ms->rtd[i].num=0;
@ -102,6 +109,8 @@ mgcpstat_reset(void *pms)
ms->req_dup_num=0;
ms->rsp_dup_num=0;
snprintf(title, 255, "MGCP SRT Statistics: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(dlg), title);
}
@ -299,11 +308,6 @@ gtk_mgcpstat_init(char *optarg)
}
static GtkWidget *dlg=NULL, *dlg_box;
static GtkWidget *filter_box;
static GtkWidget *filter_label, *filter_entry;
static GtkWidget *start_button;
static void
dlg_destroy_cb(void)
{
@ -331,6 +335,7 @@ static void
gtk_mgcpstat_cb(GtkWidget *w _U_, gpointer d _U_)
{
char *filter;
char title[256];
/* if the window is already open, bring it to front */
if(dlg){
@ -339,7 +344,8 @@ gtk_mgcpstat_cb(GtkWidget *w _U_, gpointer d _U_)
}
dlg=gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(dlg), "MGCP SRT Statistics");
snprintf(title, 255, "MGCP SRT Statistics: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(dlg), title);
SIGNAL_CONNECT(dlg, "destroy", dlg_destroy_cb, NULL);
dlg_box=gtk_vbox_new(FALSE, 0);
gtk_container_add(GTK_CONTAINER(dlg), dlg_box);

View File

@ -1,7 +1,7 @@
/* rpc_stat.c
* rpc_stat 2002 Ronnie Sahlberg
*
* $Id: rpc_stat.c,v 1.13 2003/08/19 10:09:20 sahlberg Exp $
* $Id: rpc_stat.c,v 1.14 2003/08/25 11:06:32 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -61,7 +61,12 @@ typedef struct _rpcstat_t {
static void
rpcstat_reset(rpcstat_t *rs)
{
char title_string[256];
reset_srt_table_data(&rs->srt_table);
snprintf(title_string, 256, "ONC-RPC Service Response Time statistics for %s version %d : %s", rs->prog, rs->version, cfile.filename);
gtk_window_set_title(GTK_WINDOW(rs->win), title_string);
}
@ -176,7 +181,7 @@ gtk_rpcstat_init(char *optarg)
{
rpcstat_t *rs;
guint32 i;
char title_string[60];
char title_string[256];
char filter_string[256];
GtkWidget *vbox;
GtkWidget *stat_label;
@ -206,7 +211,7 @@ gtk_rpcstat_init(char *optarg)
rs->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(rs->win), 550, 400);
sprintf(title_string,"ONC-RPC Service Response Time statistics for %s version %d", rs->prog, rs->version);
snprintf(title_string, 256, "ONC-RPC Service Response Time statistics for %s version %d : %s", rs->prog, rs->version, cfile.filename);
gtk_window_set_title(GTK_WINDOW(rs->win), title_string);
SIGNAL_CONNECT(rs->win, "destroy", win_destroy_cb, rs);

View File

@ -1,7 +1,7 @@
/* smb_stat.c
* smb_stat 2003 Ronnie Sahlberg
*
* $Id: smb_stat.c,v 1.10 2003/08/19 10:09:20 sahlberg Exp $
* $Id: smb_stat.c,v 1.11 2003/08/25 11:06:32 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -63,10 +63,13 @@ static void
smbstat_reset(void *pss)
{
smbstat_t *ss=(smbstat_t *)pss;
char title[256];
reset_srt_table_data(&ss->smb_srt_table);
reset_srt_table_data(&ss->trans2_srt_table);
reset_srt_table_data(&ss->nt_trans_srt_table);
snprintf(title, 255, "SMB Service Response Time statistics: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(ss->win), title);
}
static int
@ -140,6 +143,7 @@ gtk_smbstat_init(char *optarg)
GString *error_string;
int i;
GtkWidget *vbox;
char title[256];
if(!strncmp(optarg,"smb,srt,",8)){
filter=optarg+8;
@ -151,7 +155,8 @@ gtk_smbstat_init(char *optarg)
ss->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size(GTK_WINDOW(ss->win), 550, 600);
gtk_window_set_title(GTK_WINDOW(ss->win), "SMB Service Response Time statistics");
snprintf(title, 255, "SMB Service Response Time statistics: %s", cfile.filename);
gtk_window_set_title(GTK_WINDOW(ss->win), title);
SIGNAL_CONNECT(ss->win, "destroy", win_destroy_cb, ss);
vbox=gtk_vbox_new(FALSE, 0);