Remove the individual reset functions and replace with a common one in the helpers file.

cleanup part 5?

svn path=/trunk/; revision=8320

10 files changed, 32 insertions, 116 deletions

diff --git a/gtk/endpoint_talkers_eth.c b/gtk/endpoint_talkers_eth.c
index 121369c704..2cbe974efe 100644
--- a/gtk/endpoint_talkers_eth.c
+++ b/gtk/endpoint_talkers_eth.c
@@ -1,7 +1,7 @@
 /* endpoint_talkers_eth.c
  * endpoint_talkers_eth   2003 Ronnie Sahlberg
  *
- * $Id: endpoint_talkers_eth.c,v 1.9 2003/08/30 01:05:03 sahlberg Exp $
+ * $Id: endpoint_talkers_eth.c,v 1.10 2003/08/30 01:18:14 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -46,19 +46,6 @@
 #include "packet-eth.h"
 
 
-static void
-eth_talkers_reset(void *pit)
-{
-	char title[256];
-	endpoints_table *talkers=(endpoints_table *)pit;
-
-	reset_ett_table_data(talkers);
-
-	snprintf(title, 255, "Ethernet Talkers: %s", cfile.filename);
-	gtk_window_set_title(GTK_WINDOW(talkers->win), title);
-}
-
-
 static int
 eth_talkers_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
 {
@@ -98,6 +85,7 @@ gtk_eth_talkers_init(char *optarg)
 
 	talkers=g_malloc(sizeof(endpoints_table));
 
+	talkers->name="Ethernet";
 	talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(talkers->win), 750, 400);
 	snprintf(title, 255, "Ethernet Talkers: %s", cfile.filename);
@@ -119,7 +107,7 @@ gtk_eth_talkers_init(char *optarg)
 
 	init_ett_table(talkers, vbox, NULL, filter_names);
 
-	error_string=register_tap_listener("eth", talkers, filter, eth_talkers_reset, eth_talkers_packet, (void *)draw_ett_table_data);
+	error_string=register_tap_listener("eth", talkers, filter, (void *)reset_ett_table_data, eth_talkers_packet, (void *)draw_ett_table_data);
 	if(error_string){
 		simple_dialog(ESD_TYPE_WARN, NULL, error_string->str);
 		g_string_free(error_string, TRUE);
diff --git a/gtk/endpoint_talkers_fc.c b/gtk/endpoint_talkers_fc.c
index 474c364b1e..4d7ed882b4 100644
--- a/gtk/endpoint_talkers_fc.c
+++ b/gtk/endpoint_talkers_fc.c
@@ -1,7 +1,7 @@
 /* endpoint_talkers_fc.c
  * endpoint_talkers_fc   2003 Ronnie Sahlberg
  *
- * $Id: endpoint_talkers_fc.c,v 1.9 2003/08/30 01:05:03 sahlberg Exp $
+ * $Id: endpoint_talkers_fc.c,v 1.10 2003/08/30 01:18:15 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -47,18 +47,6 @@
 
 
 
-static void
-fc_talkers_reset(void *pit)
-{
-	endpoints_table *talkers=(endpoints_table *)pit;
-	char title[256];
-
-	reset_ett_table_data(talkers);
-	snprintf(title, 255, "Fibre Channel Talkers: %s", cfile.filename);
-	gtk_window_set_title(GTK_WINDOW(talkers->win), title);
-}
-
-
 static int
 fc_talkers_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
 {
@@ -98,6 +86,7 @@ gtk_fc_talkers_init(char *optarg)
 
 	talkers=g_malloc(sizeof(endpoints_table));
 
+	talkers->name="Fibre Channel";
 	talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(talkers->win), 750, 400);
 	snprintf(title, 255, "Fibre Channel Talkers: %s", cfile.filename);
@@ -119,7 +108,7 @@ gtk_fc_talkers_init(char *optarg)
 
 	init_ett_table(talkers, vbox, NULL, filter_names);
 
-	error_string=register_tap_listener("fc", talkers, filter, fc_talkers_reset, fc_talkers_packet, (void *)draw_ett_table_data);
+	error_string=register_tap_listener("fc", talkers, filter, (void *)reset_ett_table_data, fc_talkers_packet, (void *)draw_ett_table_data);
 	if(error_string){
 		simple_dialog(ESD_TYPE_WARN, NULL, error_string->str);
 		g_string_free(error_string, TRUE);
diff --git a/gtk/endpoint_talkers_fddi.c b/gtk/endpoint_talkers_fddi.c
index 997a8c543b..dbe3009423 100644
--- a/gtk/endpoint_talkers_fddi.c
+++ b/gtk/endpoint_talkers_fddi.c
@@ -1,7 +1,7 @@
 /* endpoint_talkers_fddi.c
  * endpoint_talkers_fddi   2003 Ronnie Sahlberg
  *
- * $Id: endpoint_talkers_fddi.c,v 1.4 2003/08/30 01:05:03 sahlberg Exp $
+ * $Id: endpoint_talkers_fddi.c,v 1.5 2003/08/30 01:18:15 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -47,19 +47,6 @@
 
 
 
-static void
-fddi_talkers_reset(void *pit)
-{
-	char title[256];
-	endpoints_table *talkers=(endpoints_table *)pit;
-
-	reset_ett_table_data(talkers);
-
-	snprintf(title, 255, "FDDI Talkers: %s", cfile.filename);
-	gtk_window_set_title(GTK_WINDOW(talkers->win), title);
-}
-
-
 static int
 fddi_talkers_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
 {
@@ -99,6 +86,7 @@ gtk_fddi_talkers_init(char *optarg)
 
 	talkers=g_malloc(sizeof(endpoints_table));
 
+	talkers->name="FDDI";
 	talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(talkers->win), 750, 400);
 	snprintf(title, 255, "FDDI Talkers: %s", cfile.filename);
@@ -120,7 +108,7 @@ gtk_fddi_talkers_init(char *optarg)
 
 	init_ett_table(talkers, vbox, NULL, filter_names);
 
-	error_string=register_tap_listener("fddi", talkers, filter, fddi_talkers_reset, fddi_talkers_packet, (void *)draw_ett_table_data);
+	error_string=register_tap_listener("fddi", talkers, filter, (void *)reset_ett_table_data, fddi_talkers_packet, (void *)draw_ett_table_data);
 	if(error_string){
 		simple_dialog(ESD_TYPE_WARN, NULL, error_string->str);
 		g_string_free(error_string, TRUE);
diff --git a/gtk/endpoint_talkers_ip.c b/gtk/endpoint_talkers_ip.c
index 01acee87a6..1a672e3f96 100644
--- a/gtk/endpoint_talkers_ip.c
+++ b/gtk/endpoint_talkers_ip.c
@@ -1,7 +1,7 @@
 /* endpoint_talkers_ip.c
  * endpoint_talkers_ip   2003 Ronnie Sahlberg
  *
- * $Id: endpoint_talkers_ip.c,v 1.10 2003/08/30 01:05:03 sahlberg Exp $
+ * $Id: endpoint_talkers_ip.c,v 1.11 2003/08/30 01:18:15 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -47,18 +47,6 @@
 
 
 
-static void
-ip_talkers_reset(void *pit)
-{
-	endpoints_table *talkers=(endpoints_table *)pit;
-	char title[256];
-
-	reset_ett_table_data(talkers);
-	snprintf(title, 255, "IPv4 Talkers: %s", cfile.filename);
-	gtk_window_set_title(GTK_WINDOW(talkers->win), title);
-}
-
-
 static int
 ip_talkers_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
 {
@@ -97,6 +85,7 @@ gtk_ip_talkers_init(char *optarg)
 
 	talkers=g_malloc(sizeof(endpoints_table));
 
+	talkers->name="IPv4";
 	talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(talkers->win), 750, 400);
 	snprintf(title, 255, "IPv4 Talkers: %s", cfile.filename);
@@ -118,7 +107,7 @@ gtk_ip_talkers_init(char *optarg)
 
 	init_ett_table(talkers, vbox, NULL, filter_names);
 
-	error_string=register_tap_listener("ip", talkers, filter, ip_talkers_reset, ip_talkers_packet, (void *)draw_ett_table_data);
+	error_string=register_tap_listener("ip", talkers, filter, (void *)reset_ett_table_data, ip_talkers_packet, (void *)draw_ett_table_data);
 	if(error_string){
 		simple_dialog(ESD_TYPE_WARN, NULL, error_string->str);
 		g_string_free(error_string, TRUE);
diff --git a/gtk/endpoint_talkers_ipx.c b/gtk/endpoint_talkers_ipx.c
index b8f3bbf702..67d3fa255a 100644
--- a/gtk/endpoint_talkers_ipx.c
+++ b/gtk/endpoint_talkers_ipx.c
@@ -1,7 +1,7 @@
 /* endpoint_talkers_ipx.c
  * endpoint_talkers_ipx   2003 Ronnie Sahlberg
  *
- * $Id: endpoint_talkers_ipx.c,v 1.8 2003/08/30 01:05:03 sahlberg Exp $
+ * $Id: endpoint_talkers_ipx.c,v 1.9 2003/08/30 01:18:15 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -47,18 +47,6 @@
 
 
 
-static void
-ipx_talkers_reset(void *pit)
-{
-	endpoints_table *talkers=(endpoints_table *)pit;
-	char title[256];
-
-	reset_ett_table_data(talkers);
-	snprintf(title, 255, "IPX Talkers: %s", cfile.filename);
-	gtk_window_set_title(GTK_WINDOW(talkers->win), title);
-}
-
-
 static int
 ipx_talkers_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
 {
@@ -98,6 +86,7 @@ gtk_ipx_talkers_init(char *optarg)
 
 	talkers=g_malloc(sizeof(endpoints_table));
 
+	talkers->name="IPX";
 	talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(talkers->win), 750, 400);
 	snprintf(title, 255, "IPX Talkers: %s", cfile.filename);
@@ -119,7 +108,7 @@ gtk_ipx_talkers_init(char *optarg)
 
 	init_ett_table(talkers, vbox, NULL, filter_names);
 
-	error_string=register_tap_listener("ipx", talkers, filter, ipx_talkers_reset, ipx_talkers_packet, (void *)draw_ett_table_data);
+	error_string=register_tap_listener("ipx", talkers, filter, (void *)reset_ett_table_data, ipx_talkers_packet, (void *)draw_ett_table_data);
 	if(error_string){
 		simple_dialog(ESD_TYPE_WARN, NULL, error_string->str);
 		g_string_free(error_string, TRUE);
diff --git a/gtk/endpoint_talkers_table.c b/gtk/endpoint_talkers_table.c
index 75d22e252b..ccdf10c360 100644
--- a/gtk/endpoint_talkers_table.c
+++ b/gtk/endpoint_talkers_table.c
@@ -4,7 +4,7 @@
  * endpoint_talkers_table   2003 Ronnie Sahlberg
  * Helper routines common to all endpoint talkers tap.
  *
- * $Id: endpoint_talkers_table.c,v 1.7 2003/08/30 00:53:15 sahlberg Exp $
+ * $Id: endpoint_talkers_table.c,v 1.8 2003/08/30 01:18:15 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -77,6 +77,10 @@ void
 reset_ett_table_data(endpoints_table *et)
 {
 	guint32 i;
+	char title[256];
+
+	snprintf(title, 255, "%s Conversations: %s", et->name, cfile.filename);
+	gtk_window_set_title(GTK_WINDOW(et->win), title);
 
 	/* remove all entries from the clist */
 	for(i=0;i<et->num_endpoints;i++){
@@ -93,6 +97,7 @@ reset_ett_table_data(endpoints_table *et)
 	et->num_endpoints=0;
 }
 
+
 static gint
 ett_sort_column(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
 {
diff --git a/gtk/endpoint_talkers_table.h b/gtk/endpoint_talkers_table.h
index 8b274ebdda..80d715457b 100644
--- a/gtk/endpoint_talkers_table.h
+++ b/gtk/endpoint_talkers_table.h
@@ -2,7 +2,7 @@
  * endpoint_talkers_table   2003 Ronnie Sahlberg
  * Helper routines common to all endpoint talkers taps.
  *
- * $Id: endpoint_talkers_table.h,v 1.5 2003/08/30 00:53:15 sahlberg Exp $
+ * $Id: endpoint_talkers_table.h,v 1.6 2003/08/30 01:18:15 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -38,6 +38,7 @@ typedef struct _endpoint_talker_t {
 } endpoint_talker_t;
 
 typedef struct _endpoints_table {
+	char *name;
 	GtkWidget *win;
 	GtkWidget *scrolled_window;
 	GtkCList *table;
diff --git a/gtk/endpoint_talkers_tcpip.c b/gtk/endpoint_talkers_tcpip.c
index baa1961343..4eb1998e08 100644
--- a/gtk/endpoint_talkers_tcpip.c
+++ b/gtk/endpoint_talkers_tcpip.c
@@ -1,7 +1,7 @@
 /* endpoint_talkers_tcpip.c
  * endpoint_talkers_tcpip   2003 Ronnie Sahlberg
  *
- * $Id: endpoint_talkers_tcpip.c,v 1.11 2003/08/30 01:05:03 sahlberg Exp $
+ * $Id: endpoint_talkers_tcpip.c,v 1.12 2003/08/30 01:18:15 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -63,18 +63,6 @@ tcpip_port_to_str(guint32 port)
 	return strp;
 }
 
-static void
-tcpip_talkers_reset(void *pit)
-{
-	endpoints_table *talkers=(endpoints_table *)pit;
-	char title[256];
-
-	reset_ett_table_data(talkers);
-	snprintf(title, 255, "TCP Talkers: %s", cfile.filename);
-	gtk_window_set_title(GTK_WINDOW(talkers->win), title);
-}
-
-
 static int
 tcpip_talkers_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
 {
@@ -117,6 +105,7 @@ gtk_tcpip_talkers_init(char *optarg)
 
 	talkers=g_malloc(sizeof(endpoints_table));
 
+	talkers->name="TCP";
 	talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(talkers->win), 750, 400);
 	snprintf(title, 255, "TCP Talkers: %s", cfile.filename);
@@ -138,7 +127,7 @@ gtk_tcpip_talkers_init(char *optarg)
 
 	init_ett_table(talkers, vbox, tcpip_port_to_str, filter_names);
 
-	error_string=register_tap_listener("tcp", talkers, filter, tcpip_talkers_reset, tcpip_talkers_packet, (void *)draw_ett_table_data);
+	error_string=register_tap_listener("tcp", talkers, filter, (void *)reset_ett_table_data, tcpip_talkers_packet, (void *)draw_ett_table_data);
 	if(error_string){
 		simple_dialog(ESD_TYPE_WARN, NULL, error_string->str);
 		g_string_free(error_string, TRUE);
diff --git a/gtk/endpoint_talkers_tr.c b/gtk/endpoint_talkers_tr.c
index bb3b6887be..6f92425a01 100644
--- a/gtk/endpoint_talkers_tr.c
+++ b/gtk/endpoint_talkers_tr.c
@@ -1,7 +1,7 @@
 /* endpoint_talkers_tr.c
  * endpoint_talkers_tr   2003 Ronnie Sahlberg
  *
- * $Id: endpoint_talkers_tr.c,v 1.10 2003/08/30 01:05:03 sahlberg Exp $
+ * $Id: endpoint_talkers_tr.c,v 1.11 2003/08/30 01:18:16 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -46,18 +46,6 @@
 #include "packet-tr.h"
 
 
-static void
-tr_talkers_reset(void *pit)
-{
-	endpoints_table *talkers=(endpoints_table *)pit;
-	char title[256];
-
-	reset_ett_table_data(talkers);
-	snprintf(title, 255, "Token Ring Talkers: %s", cfile.filename);
-	gtk_window_set_title(GTK_WINDOW(talkers->win), title);
-}
-
-
 static int
 tr_talkers_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
 {
@@ -97,6 +85,7 @@ gtk_tr_talkers_init(char *optarg)
 
 	talkers=g_malloc(sizeof(endpoints_table));
 
+	talkers->name="Token Ring";
 	talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(talkers->win), 750, 400);
 	snprintf(title, 255, "Token Ring Talkers: %s", cfile.filename);
@@ -118,7 +107,7 @@ gtk_tr_talkers_init(char *optarg)
 
 	init_ett_table(talkers, vbox, NULL, filter_names);
 
-	error_string=register_tap_listener("tr", talkers, filter, tr_talkers_reset, tr_talkers_packet, (void *)draw_ett_table_data);
+	error_string=register_tap_listener("tr", talkers, filter, (void *)reset_ett_table_data, tr_talkers_packet, (void *)draw_ett_table_data);
 	if(error_string){
 		simple_dialog(ESD_TYPE_WARN, NULL, error_string->str);
 		g_string_free(error_string, TRUE);
diff --git a/gtk/endpoint_talkers_udpip.c b/gtk/endpoint_talkers_udpip.c
index 560ade15cb..720de6ed58 100644
--- a/gtk/endpoint_talkers_udpip.c
+++ b/gtk/endpoint_talkers_udpip.c
@@ -1,7 +1,7 @@
 /* endpoint_talkers_udpip.c
  * endpoint_talkers_udpip   2003 Ronnie Sahlberg
  *
- * $Id: endpoint_talkers_udpip.c,v 1.11 2003/08/30 01:05:03 sahlberg Exp $
+ * $Id: endpoint_talkers_udpip.c,v 1.12 2003/08/30 01:18:16 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -64,18 +64,6 @@ udpip_port_to_str(guint32 port)
 	return strp;
 }
 
-static void
-udpip_talkers_reset(void *pit)
-{
-	endpoints_table *talkers=(endpoints_table *)pit;
-	char title[256];
-
-	reset_ett_table_data(talkers);
-	snprintf(title, 255, "UDP Talkers: %s", cfile.filename);
-	gtk_window_set_title(GTK_WINDOW(talkers->win), title);
-}
-
-
 static int
 udpip_talkers_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
 {
@@ -117,6 +105,7 @@ gtk_udpip_talkers_init(char *optarg)
 
 	talkers=g_malloc(sizeof(endpoints_table));
 
+	talkers->name="UDP";
 	talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(talkers->win), 750, 400);
 	snprintf(title, 255, "UDP Talkers: %s", cfile.filename);
@@ -138,7 +127,7 @@ gtk_udpip_talkers_init(char *optarg)
 
 	init_ett_table(talkers, vbox, udpip_port_to_str, filter_names);
 
-	error_string=register_tap_listener("udp", talkers, filter, udpip_talkers_reset, udpip_talkers_packet, (void *)draw_ett_table_data);
+	error_string=register_tap_listener("udp", talkers, filter, (void *)reset_ett_table_data, udpip_talkers_packet, (void *)draw_ett_table_data);
 	if(error_string){
 		simple_dialog(ESD_TYPE_WARN, NULL, error_string->str);
 		g_string_free(error_string, TRUE);