All endpoint talkers table taps use "address_to_str()" as the routine to

use to translate addresses to strings - wire that into
"endpoint_talkers_table.c", don't pass the function as an argument to
"init_ett_table()".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8263 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/endpoint_talkers_eth.c b/gtk/endpoint_talkers_eth.c
index 54e49a7ca61eaf44d6390f29a4ea647ed6d514bc..1b32124d39b1ef7ff65fdeaae6e073df0c20b86a 100644 (file)
--- 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.4 2003/08/25 11:06:31 sahlberg Exp $
+ * $Id: endpoint_talkers_eth.c,v 1.5 2003/08/26 01:46:22 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -139,7 +139,7 @@ gtk_eth_talkers_init(char *optarg)
        /* We must display TOP LEVEL Widget before calling init_ett_table() */
        gtk_widget_show(eth_talkers->win);
 
-       init_ett_table(&eth_talkers->talkers, vbox, address_to_str, NULL);
+       init_ett_table(&eth_talkers->talkers, vbox, NULL);
 
        error_string=register_tap_listener("eth", eth_talkers, filter, eth_talkers_reset, eth_talkers_packet, eth_talkers_draw);
        if(error_string){

diff --git a/gtk/endpoint_talkers_fc.c b/gtk/endpoint_talkers_fc.c
index eac8ef15be6ef9a015808431a083e099a7e8c7b5..c88002c6874b08a458e40506a829b76cb7d3bef3 100644 (file)
--- 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.4 2003/08/25 11:06:31 sahlberg Exp $
+ * $Id: endpoint_talkers_fc.c,v 1.5 2003/08/26 01:46:22 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -138,7 +138,7 @@ gtk_fc_talkers_init(char *optarg)
        /* We must display TOP LEVEL Widget before calling init_ett_table() */
        gtk_widget_show(fc_talkers->win);
 
-       init_ett_table(&fc_talkers->talkers, vbox, address_to_str, NULL);
+       init_ett_table(&fc_talkers->talkers, vbox, NULL);
 
        error_string=register_tap_listener("fc", fc_talkers, filter, fc_talkers_reset, fc_talkers_packet, fc_talkers_draw);
        if(error_string){

diff --git a/gtk/endpoint_talkers_ip.c b/gtk/endpoint_talkers_ip.c
index 85b6ed7c544b705312fa737b969aa6b0fe1ef436..c56e63a1797e3db22eddae68081d8482f038a619 100644 (file)
--- 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.5 2003/08/25 11:06:31 sahlberg Exp $
+ * $Id: endpoint_talkers_ip.c,v 1.6 2003/08/26 01:46:22 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -138,7 +138,7 @@ gtk_ip_talkers_init(char *optarg)
        /* We must display TOP LEVEL Widget before calling init_ett_table() */
        gtk_widget_show(ip_talkers->win);
 
-       init_ett_table(&ip_talkers->talkers, vbox, address_to_str, NULL);
+       init_ett_table(&ip_talkers->talkers, vbox, NULL);
 
        error_string=register_tap_listener("ip", ip_talkers, filter, ip_talkers_reset, ip_talkers_packet, ip_talkers_draw);
        if(error_string){

diff --git a/gtk/endpoint_talkers_ipx.c b/gtk/endpoint_talkers_ipx.c
index 5f336be4e10f0761d48be0437b2a98eb027a12b5..3bef2e4b5243cd6ac304d7818a2fc6fb22d9cad8 100644 (file)
--- 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.3 2003/08/25 11:06:31 sahlberg Exp $
+ * $Id: endpoint_talkers_ipx.c,v 1.4 2003/08/26 01:46:22 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -138,7 +138,7 @@ gtk_ipx_talkers_init(char *optarg)
        /* We must display TOP LEVEL Widget before calling init_ett_table() */
        gtk_widget_show(ipx_talkers->win);
 
-       init_ett_table(&ipx_talkers->talkers, vbox, address_to_str, NULL);
+       init_ett_table(&ipx_talkers->talkers, vbox, NULL);
 
        error_string=register_tap_listener("ipx", ipx_talkers, filter, ipx_talkers_reset, ipx_talkers_packet, ipx_talkers_draw);
        if(error_string){

diff --git a/gtk/endpoint_talkers_table.c b/gtk/endpoint_talkers_table.c
index c88c21647672bc8eedc4e0c2c6159f6ac4f77ad7..868535264e8a4acd67f1b76d6f23de9a44522b05 100644 (file)
--- 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.2 2003/08/24 01:39:04 guy Exp $
+ * $Id: endpoint_talkers_table.c,v 1.3 2003/08/26 01:46:22 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -36,6 +36,7 @@
 #include <gtk/gtk.h>
 #include "compat_macros.h"
 #include "epan/packet_info.h"
+#include "epan/to_str.h"
 #include "endpoint_talkers_table.h"
 #include "image/clist_ascend.xpm"
 #include "image/clist_descend.xpm"
@@ -139,7 +140,7 @@ ett_click_column_cb(GtkCList *clist, gint column, gpointer data)
 
 
 void
-init_ett_table(endpoints_table *et, GtkWidget *vbox, char *(*address_to_str)(address *), char *(*port_to_str)(guint32))
+init_ett_table(endpoints_table *et, GtkWidget *vbox, char *(*port_to_str)(guint32))
 {
        int i;
        column_arrows *col_arrows;
@@ -219,7 +220,6 @@ init_ett_table(endpoints_table *et, GtkWidget *vbox, char *(*address_to_str)(add
 
        et->num_endpoints=0;
        et->endpoints=NULL;
-       et->address_to_str=address_to_str;
        et->port_to_str=port_to_str;
 
        /* hide srcport and dstport if we dont use ports */
@@ -332,9 +332,9 @@ add_ett_table_data(endpoints_table *et, address *src, address *dst, guint32 src_
                char *entries[NUM_COLS];
                char frames[16],bytes[16],txframes[16],txbytes[16],rxframes[16],rxbytes[16];
 
-               entries[0]=et->address_to_str(&talker->src_address);
+               entries[0]=address_to_str(&talker->src_address);
                entries[1]=(et->port_to_str)?et->port_to_str(talker->src_port):"";
-               entries[2]=et->address_to_str(&talker->dst_address);
+               entries[2]=address_to_str(&talker->dst_address);
                entries[3]=(et->port_to_str)?et->port_to_str(talker->dst_port):"";
 
                sprintf(frames,"%u", talker->tx_frames+talker->rx_frames);

diff --git a/gtk/endpoint_talkers_table.h b/gtk/endpoint_talkers_table.h
index 89578e2a378a66744aba789b0ff3edf619ed35fa..441bdd481f9cedff6ed1521b29ae62c4f9ea10b5 100644 (file)
--- 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.1 2003/08/23 09:09:35 sahlberg Exp $
+ * $Id: endpoint_talkers_table.h,v 1.2 2003/08/26 01:46:23 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -43,13 +43,12 @@ typedef struct _endpoints_table {
        gboolean has_ports;
        guint32 num_endpoints;
        endpoint_talker_t *endpoints;
-       char *(*address_to_str)(address *);
        char *(*port_to_str)(guint32);
 } endpoints_table;
 
 void reset_ett_table_data(endpoints_table *et);
 
-void init_ett_table(endpoints_table *et, GtkWidget *vbox, char *(*address_to_str)(address *),char *(*port_to_str)(guint32));
+void init_ett_table(endpoints_table *et, GtkWidget *vbox, char *(*port_to_str)(guint32));
 
 void add_ett_table_data(endpoints_table *et, address *src, address *dst, guint32 src_port, guint32 dst_port, int num_frames, int num_bytes);
 

diff --git a/gtk/endpoint_talkers_tcpip.c b/gtk/endpoint_talkers_tcpip.c
index 90d810fd0df435d18d466b11ba55d5e21f75bd0b..a4c49eb7af1001ed8bde840143dc918ea978e514 100644 (file)
--- 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.6 2003/08/25 11:06:31 sahlberg Exp $
+ * $Id: endpoint_talkers_tcpip.c,v 1.7 2003/08/26 01:46:23 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -155,7 +155,7 @@ gtk_tcpip_talkers_init(char *optarg)
        /* We must display TOP LEVEL Widget before calling init_ett_table() */
        gtk_widget_show(tcpip_talkers->win);
 
-       init_ett_table(&tcpip_talkers->talkers, vbox, address_to_str, tcpip_port_to_str);
+       init_ett_table(&tcpip_talkers->talkers, vbox, tcpip_port_to_str);
 
        error_string=register_tap_listener("tcp", tcpip_talkers, filter, tcpip_talkers_reset, tcpip_talkers_packet, tcpip_talkers_draw);
        if(error_string){

diff --git a/gtk/endpoint_talkers_tr.c b/gtk/endpoint_talkers_tr.c
index decece096e0bb1f2fba9d7c421627f2243957c2f..e9165f7950648e1d4849ac1bd06e9285212c7bb6 100644 (file)
--- 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.5 2003/08/25 11:06:31 sahlberg Exp $
+ * $Id: endpoint_talkers_tr.c,v 1.6 2003/08/26 01:46:23 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -138,7 +138,7 @@ gtk_tr_talkers_init(char *optarg)
        /* We must display TOP LEVEL Widget before calling init_ett_table() */
        gtk_widget_show(tr_talkers->win);
 
-       init_ett_table(&tr_talkers->talkers, vbox, address_to_str, NULL);
+       init_ett_table(&tr_talkers->talkers, vbox, NULL);
 
        error_string=register_tap_listener("tr", tr_talkers, filter, tr_talkers_reset, tr_talkers_packet, tr_talkers_draw);
        if(error_string){

diff --git a/gtk/endpoint_talkers_udpip.c b/gtk/endpoint_talkers_udpip.c
index 293c6529aff205f6b0aab97d040f04d493dc557e..8d088fabbb04d8125f9c0936e21ff893a2ec36cb 100644 (file)
--- 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.6 2003/08/25 11:06:31 sahlberg Exp $
+ * $Id: endpoint_talkers_udpip.c,v 1.7 2003/08/26 01:46:23 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -155,7 +155,7 @@ gtk_udpip_talkers_init(char *optarg)
        /* We must display TOP LEVEL Widget before calling init_ett_table() */
        gtk_widget_show(udpip_talkers->win);
 
-       init_ett_table(&udpip_talkers->talkers, vbox, address_to_str, udpip_port_to_str);
+       init_ett_table(&udpip_talkers->talkers, vbox, udpip_port_to_str);
 
        error_string=register_tap_listener("udp", udpip_talkers, filter, udpip_talkers_reset, udpip_talkers_packet, udpip_talkers_draw);
        if(error_string){