diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2003-09-04 11:07:51 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2003-09-04 11:07:51 +0000 |
| commit | 188a4e8d81091e751546873933143be5fe2a2aee (patch) | |
| tree | acb9e71f5e2a498e0e113be21ac14942bb48a202 /gtk/endpoint_talkers_udpip.c | |
| parent | 4f01e65223440a194410a9dd0f6a06403ca306b1 (diff) | |
Uglify endpoint_talkers_table.c
make it know how to build the filter strings, address and port hf_ fields properly so TCP and UDP works and is agnostic on whether ipv4 or ipv6 is used as transport
svn path=/trunk/; revision=8368
Diffstat (limited to 'gtk/endpoint_talkers_udpip.c')
| -rw-r--r-- | gtk/endpoint_talkers_udpip.c | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/gtk/endpoint_talkers_udpip.c b/gtk/endpoint_talkers_udpip.c index b96b42c88f..93b9847154 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.13 2003/09/02 08:27:32 sahlberg Exp $ + * $Id: endpoint_talkers_udpip.c,v 1.14 2003/09/04 11:07:51 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -47,31 +47,13 @@ #include "packet-udp.h" - -static char * -udpip_port_to_str(guint32 port) -{ - static int i=0; - static char *strp, str[4][6]; - - i++; - if(i>=4){ - i=0; - } - strp=str[i]; - - sprintf(strp, "%u", port); - - return strp; -} - static int udpip_talkers_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip) { endpoints_table *talkers=(endpoints_table *)pit; e_udphdr *udphdr=vip; - add_ett_table_data(talkers, &udphdr->ip_src, &udphdr->ip_dst, udphdr->uh_sport, udphdr->uh_dport, 1, pinfo->fd->pkt_len); + add_ett_table_data(talkers, &udphdr->ip_src, &udphdr->ip_dst, udphdr->uh_sport, udphdr->uh_dport, 1, pinfo->fd->pkt_len, SAT_NONE, PT_UDP); return 1; } @@ -87,16 +69,6 @@ gtk_udpip_talkers_init(char *optarg) GtkWidget *label; GString *error_string; char title[256]; - /* XXX crap, once again we get visibility of the type of transport */ - /* XXX fixme or fix the api to make ipv6 work */ - static char *filter_names[] = { - "ip.addr", - "ip.src", - "ip.dst", - "udp.port", - "udp.srcport", - "udp.dstport" - }; if(!strncmp(optarg,"talkers,udp,",12)){ filter=optarg+12; @@ -126,7 +98,7 @@ gtk_udpip_talkers_init(char *optarg) /* We must display TOP LEVEL Widget before calling init_ett_table() */ gtk_widget_show(talkers->win); - init_ett_table(talkers, vbox, udpip_port_to_str, filter_names); + init_ett_table(talkers, vbox, FALSE); error_string=register_tap_listener("udp", talkers, filter, (void *)reset_ett_table_data, udpip_talkers_packet, (void *)draw_ett_table_data); if(error_string){ |