osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

some more renaming of the conversation tables things 

svn path=/trunk/; revision=11448
This commit is contained in:
Ulf Lamping 2004-07-20 20:56:53 +00:00
parent 9127c0350c
commit e083ac3514
11 changed files with 373 additions and 373 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/conversations_eth.c
View File

@ -41,11 +41,11 @@
static int
eth_talkers_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
eth_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
{
eth_hdr *ehdr=vip;
add_ett_table_data((conversations_table *)pct, &ehdr->src, &ehdr->dst, 0, 0, 1, pinfo->fd->pkt_len, SAT_ETHER, PT_NONE);
add_conversation_table_data((conversations_table *)pct, &ehdr->src, &ehdr->dst, 0, 0, 1, pinfo->fd->pkt_len, SAT_ETHER, PT_NONE);
return 1;
}
@ -53,7 +53,7 @@ eth_talkers_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void
static void
gtk_eth_talkers_init(char *optarg)
eth_conversation_init(char *optarg)
{
char *filter=NULL;
@ -63,26 +63,26 @@ gtk_eth_talkers_init(char *optarg)
filter=NULL;
}
init_ett_table(TRUE, "Ethernet", "eth", filter, (void *)eth_talkers_packet);
init_conversation_table(TRUE, "Ethernet", "eth", filter, (void *)eth_conversation_packet);
}
static void
gtk_eth_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
eth_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
{
gtk_eth_talkers_init("conv,eth");
eth_conversation_init("conv,eth");
}
void
register_tap_listener_eth_talkers(void)
register_tap_listener_eth_conversation(void)
{
register_ethereal_tap("conv,eth", gtk_eth_talkers_init);
register_ethereal_tap("conv,eth", eth_conversation_init);
register_tap_menu_item("Ethernet", REGISTER_TAP_GROUP_CONVERSATION_LIST,
gtk_eth_endpoints_cb, NULL, NULL, NULL);
eth_endpoints_cb, NULL, NULL, NULL);
register_ett_table(TRUE, "Ethernet", "eth", NULL /*filter*/, (void *)eth_talkers_packet);
register_conversation_table(TRUE, "Ethernet", "eth", NULL /*filter*/, (void *)eth_conversation_packet);
}

20
gtk/conversations_fc.c
View File

@ -41,11 +41,11 @@
static int
fc_talkers_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
fc_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
{
fc_hdr *fchdr=vip;
add_ett_table_data((conversations_table *)pct, &fchdr->s_id, &fchdr->d_id, 0, 0, 1, pinfo->fd->pkt_len, SAT_NONE, PT_NONE);
add_conversation_table_data((conversations_table *)pct, &fchdr->s_id, &fchdr->d_id, 0, 0, 1, pinfo->fd->pkt_len, SAT_NONE, PT_NONE);
return 1;
}
@ -53,7 +53,7 @@ fc_talkers_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *
static void
gtk_fc_talkers_init(char *optarg)
fc_conversation_init(char *optarg)
{
char *filter=NULL;
@ -63,26 +63,26 @@ gtk_fc_talkers_init(char *optarg)
filter=NULL;
}
init_ett_table(TRUE, "Fibre Channel", "fc", filter, (void *)fc_talkers_packet);
init_conversation_table(TRUE, "Fibre Channel", "fc", filter, (void *)fc_conversation_packet);
}
static void
gtk_fc_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
fc_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
{
gtk_fc_talkers_init("conv,fc");
fc_conversation_init("conv,fc");
}
void
register_tap_listener_fc_talkers(void)
register_tap_listener_fc_conversation(void)
{
register_ethereal_tap("conv,fc", gtk_fc_talkers_init);
register_ethereal_tap("conv,fc", fc_conversation_init);
register_tap_menu_item("Fibre Channel", REGISTER_TAP_GROUP_CONVERSATION_LIST,
gtk_fc_endpoints_cb, NULL, NULL, NULL);
fc_endpoints_cb, NULL, NULL, NULL);
register_ett_table(TRUE, "Fibre Channel", "fc", NULL /*filter*/, (void *)fc_talkers_packet);
register_conversation_table(TRUE, "Fibre Channel", "fc", NULL /*filter*/, (void *)fc_conversation_packet);
}

20
gtk/conversations_fddi.c
View File

@ -41,11 +41,11 @@
static int
fddi_talkers_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
fddi_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
{
fddi_hdr *ehdr=vip;
add_ett_table_data((conversations_table *)pct, &ehdr->src, &ehdr->dst, 0, 0, 1, pinfo->fd->pkt_len, SAT_FDDI, PT_NONE);
add_conversation_table_data((conversations_table *)pct, &ehdr->src, &ehdr->dst, 0, 0, 1, pinfo->fd->pkt_len, SAT_FDDI, PT_NONE);
return 1;
}
@ -53,7 +53,7 @@ fddi_talkers_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void
static void
gtk_fddi_talkers_init(char *optarg)
fddi_conversation_init(char *optarg)
{
char *filter=NULL;
@ -63,26 +63,26 @@ gtk_fddi_talkers_init(char *optarg)
filter=NULL;
}
init_ett_table(TRUE, "FDDI", "fddi", filter, (void *)fddi_talkers_packet);
init_conversation_table(TRUE, "FDDI", "fddi", filter, (void *)fddi_conversation_packet);
}
static void
gtk_fddi_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
fddi_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
{
gtk_fddi_talkers_init("conv,fddi");
fddi_conversation_init("conv,fddi");
}
void
register_tap_listener_fddi_talkers(void)
register_tap_listener_fddi_conversation(void)
{
register_ethereal_tap("conv,fddi", gtk_fddi_talkers_init);
register_ethereal_tap("conv,fddi", fddi_conversation_init);
register_tap_menu_item("FDDI", REGISTER_TAP_GROUP_CONVERSATION_LIST,
gtk_fddi_endpoints_cb, NULL, NULL, NULL);
fddi_endpoints_cb, NULL, NULL, NULL);
register_ett_table(TRUE, "FDDI", "fddi", NULL /*filter*/, (void *)fddi_talkers_packet);
register_conversation_table(TRUE, "FDDI", "fddi", NULL /*filter*/, (void *)fddi_conversation_packet);
}

20
gtk/conversations_ip.c
View File

@ -41,17 +41,17 @@
static int
ip_talkers_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
ip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
{
e_ip *iph=vip;
add_ett_table_data((conversations_table *)pct, &iph->ip_src, &iph->ip_dst, 0, 0, 1, pinfo->fd->pkt_len, SAT_NONE, PT_NONE);
add_conversation_table_data((conversations_table *)pct, &iph->ip_src, &iph->ip_dst, 0, 0, 1, pinfo->fd->pkt_len, SAT_NONE, PT_NONE);
return 1;
}
static void
gtk_ip_talkers_init(char *optarg)
ip_conversation_init(char *optarg)
{
char *filter=NULL;
@ -61,26 +61,26 @@ gtk_ip_talkers_init(char *optarg)
filter=NULL;
}
init_ett_table(TRUE, "IPv4", "ip", filter, (void *)ip_talkers_packet);
init_conversation_table(TRUE, "IPv4", "ip", filter, (void *)ip_conversation_packet);
}
static void
gtk_ip_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
ip_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
{
gtk_ip_talkers_init("conv,ip");
ip_conversation_init("conv,ip");
}
void
register_tap_listener_ip_talkers(void)
register_tap_listener_ip_conversation(void)
{
register_ethereal_tap("conv,ip", gtk_ip_talkers_init);
register_ethereal_tap("conv,ip", ip_conversation_init);
register_tap_menu_item("IPv4", REGISTER_TAP_GROUP_CONVERSATION_LIST,
gtk_ip_endpoints_cb, NULL, NULL, NULL);
ip_endpoints_cb, NULL, NULL, NULL);
register_ett_table(TRUE, "IPv4", "ip", NULL /*filter*/, (void *)ip_talkers_packet);
register_conversation_table(TRUE, "IPv4", "ip", NULL /*filter*/, (void *)ip_conversation_packet);
}

20
gtk/conversations_ipx.c
View File

@ -41,11 +41,11 @@
static int
ipx_talkers_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
ipx_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
{
ipxhdr_t *ipxh=vip;
add_ett_table_data((conversations_table *)pct, &ipxh->ipx_src, &ipxh->ipx_dst, 0, 0, 1, pinfo->fd->pkt_len, SAT_NONE, PT_NONE);
add_conversation_table_data((conversations_table *)pct, &ipxh->ipx_src, &ipxh->ipx_dst, 0, 0, 1, pinfo->fd->pkt_len, SAT_NONE, PT_NONE);
return 1;
}
@ -53,7 +53,7 @@ ipx_talkers_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void
static void
gtk_ipx_talkers_init(char *optarg)
ipx_conversation_init(char *optarg)
{
char *filter=NULL;
@ -63,26 +63,26 @@ gtk_ipx_talkers_init(char *optarg)
filter=NULL;
}
init_ett_table(TRUE, "IPX", "ipx", filter, (void *)ipx_talkers_packet);
init_conversation_table(TRUE, "IPX", "ipx", filter, (void *)ipx_conversation_packet);
}
static void
gtk_ipx_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
ipx_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
{
gtk_ipx_talkers_init("conv,ipx");
ipx_conversation_init("conv,ipx");
}
void
register_tap_listener_ipx_talkers(void)
register_tap_listener_ipx_conversation(void)
{
register_ethereal_tap("conv,ipx", gtk_ipx_talkers_init);
register_ethereal_tap("conv,ipx", ipx_conversation_init);
register_tap_menu_item("IPX", REGISTER_TAP_GROUP_CONVERSATION_LIST,
gtk_ipx_endpoints_cb, NULL, NULL, NULL);
ipx_endpoints_cb, NULL, NULL, NULL);
register_ett_table(TRUE, "IPX", "ipx", NULL /*filter*/, (void *)ipx_talkers_packet);
register_conversation_table(TRUE, "IPX", "ipx", NULL /*filter*/, (void *)ipx_conversation_packet);
}

570
gtk/conversations_table.c
View File

File diff suppressed because it is too large Load Diff

14
gtk/conversations_table.h
View File

@ -66,7 +66,7 @@ typedef struct _conversations_table {
* @param filter the optional filter name or NULL
* @param packet_func the function to be called for each incoming packet
*/
extern void register_ett_table(gboolean hide_ports, char *table_name, char *tap_name, char *filter, void *packet_func);
extern void register_conversation_table(gboolean hide_ports, char *table_name, char *tap_name, char *filter, void *packet_func);
/** Init the conversation table for the single conversation window.
*
@ -76,16 +76,16 @@ extern void register_ett_table(gboolean hide_ports, char *table_name, char *tap_
* @param filter the optional filter name or NULL
* @param packet_func the function to be called for each incoming packet
*/
extern void init_ett_table(gboolean hide_ports, char *table_name, char *tap_name, char *filter, void *packet_func);
extern void init_conversation_table(gboolean hide_ports, char *table_name, char *tap_name, char *filter, void *packet_func);
/** Callback for "Conversations" statistics item.
*
* @param w unused
* @param d unused
* @param widget unused
* @param data unused
*/
extern void init_ett_notebook_cb(GtkWidget *w, gpointer d);
extern void init_conversation_notebook_cb(GtkWidget *widget, gpointer data);
/** Add some data to the table.
/** Add some data to the conversation table.
*
* @param ct the table to add the data to
* @param src source address
@ -97,5 +97,5 @@ extern void init_ett_notebook_cb(GtkWidget *w, gpointer d);
* @param sat address type
* @param port_type the port type (e.g. PT_TCP)
*/
extern void add_ett_table_data(conversations_table *ct, address *src, address *dst,
extern void add_conversation_table_data(conversations_table *ct, address *src, address *dst,
guint32 src_port, guint32 dst_port, int num_frames, int num_bytes, SAT_E sat, int port_type);

20
gtk/conversations_tcpip.c
View File

@ -41,11 +41,11 @@
static int
tcpip_talkers_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
tcpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
{
struct tcpheader *tcphdr=vip;
add_ett_table_data((conversations_table *)pct, &tcphdr->ip_src, &tcphdr->ip_dst, tcphdr->th_sport, tcphdr->th_dport, 1, pinfo->fd->pkt_len, SAT_NONE, PT_TCP);
add_conversation_table_data((conversations_table *)pct, &tcphdr->ip_src, &tcphdr->ip_dst, tcphdr->th_sport, tcphdr->th_dport, 1, pinfo->fd->pkt_len, SAT_NONE, PT_TCP);
return 1;
}
@ -53,7 +53,7 @@ tcpip_talkers_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, voi
static void
gtk_tcpip_talkers_init(char *optarg)
tcpip_conversation_init(char *optarg)
{
char *filter=NULL;
@ -63,26 +63,26 @@ gtk_tcpip_talkers_init(char *optarg)
filter=NULL;
}
init_ett_table(FALSE, "TCP", "tcp", filter, (void *)tcpip_talkers_packet);
init_conversation_table(FALSE, "TCP", "tcp", filter, (void *)tcpip_conversation_packet);
}
static void
gtk_tcpip_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
tcpip_conversation_cb(GtkWidget *w _U_, gpointer d _U_)
{
gtk_tcpip_talkers_init("conv,tcp");
tcpip_conversation_init("conv,tcp");
}
void
register_tap_listener_tcpip_talkers(void)
register_tap_listener_tcpip_conversation(void)
{
register_ethereal_tap("conv,tcp", gtk_tcpip_talkers_init);
register_ethereal_tap("conv,tcp", tcpip_conversation_init);
register_tap_menu_item("TCP (IPv4 & IPv6)", REGISTER_TAP_GROUP_CONVERSATION_LIST,
gtk_tcpip_endpoints_cb, NULL, NULL, NULL);
tcpip_conversation_cb, NULL, NULL, NULL);
register_ett_table(FALSE, "TCP", "tcp", NULL /*filter*/, (void *)tcpip_talkers_packet);
register_conversation_table(FALSE, "TCP", "tcp", NULL /*filter*/, (void *)tcpip_conversation_packet);
}

20
gtk/conversations_tr.c
View File

@ -41,11 +41,11 @@
static int
tr_talkers_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
tr_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
{
tr_hdr *trhdr=vip;
add_ett_table_data((conversations_table *)pct, &trhdr->src, &trhdr->dst, 0, 0, 1, pinfo->fd->pkt_len, SAT_TOKENRING, PT_NONE);
add_conversation_table_data((conversations_table *)pct, &trhdr->src, &trhdr->dst, 0, 0, 1, pinfo->fd->pkt_len, SAT_TOKENRING, PT_NONE);
return 1;
}
@ -53,7 +53,7 @@ tr_talkers_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *
static void
gtk_tr_talkers_init(char *optarg)
tr_conversation_init(char *optarg)
{
char *filter=NULL;
@ -63,26 +63,26 @@ gtk_tr_talkers_init(char *optarg)
filter=NULL;
}
init_ett_table(TRUE, "Token Ring", "tr", filter, (void *)tr_talkers_packet);
init_conversation_table(TRUE, "Token Ring", "tr", filter, (void *)tr_conversation_packet);
}
static void
gtk_tr_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
tr_conversation_cb(GtkWidget *w _U_, gpointer d _U_)
{
gtk_tr_talkers_init("conv,tr");
tr_conversation_init("conv,tr");
}
void
register_tap_listener_tr_talkers(void)
register_tap_listener_tr_conversation(void)
{
register_ethereal_tap("conv,tr", gtk_tr_talkers_init);
register_ethereal_tap("conv,tr", tr_conversation_init);
register_tap_menu_item("Token Ring", REGISTER_TAP_GROUP_CONVERSATION_LIST,
gtk_tr_endpoints_cb, NULL, NULL, NULL);
tr_conversation_cb, NULL, NULL, NULL);
register_ett_table(TRUE, "Token Ring", "tr", NULL /*filter*/, (void *)tr_talkers_packet);
register_conversation_table(TRUE, "Token Ring", "tr", NULL /*filter*/, (void *)tr_conversation_packet);
}

20
gtk/conversations_udpip.c
View File

@ -41,11 +41,11 @@
static int
udpip_talkers_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
udpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
{
e_udphdr *udphdr=vip;
add_ett_table_data((conversations_table *)pct, &udphdr->ip_src, &udphdr->ip_dst, udphdr->uh_sport, udphdr->uh_dport, 1, pinfo->fd->pkt_len, SAT_NONE, PT_UDP);
add_conversation_table_data((conversations_table *)pct, &udphdr->ip_src, &udphdr->ip_dst, udphdr->uh_sport, udphdr->uh_dport, 1, pinfo->fd->pkt_len, SAT_NONE, PT_UDP);
return 1;
}
@ -53,7 +53,7 @@ udpip_talkers_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, voi
static void
gtk_udpip_talkers_init(char *optarg)
udpip_conversation_init(char *optarg)
{
char *filter=NULL;
@ -63,26 +63,26 @@ gtk_udpip_talkers_init(char *optarg)
filter=NULL;
}
init_ett_table(FALSE, "UDP", "udp", filter, (void *)udpip_talkers_packet);
init_conversation_table(FALSE, "UDP", "udp", filter, (void *)udpip_conversation_packet);
}
static void
gtk_udpip_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
udpip_conversation_cb(GtkWidget *w _U_, gpointer d _U_)
{
gtk_udpip_talkers_init("conv,udp");
udpip_conversation_init("conv,udp");
}
void
register_tap_listener_udpip_talkers(void)
register_tap_listener_udpip_conversation(void)
{
register_ethereal_tap("conv,udp", gtk_udpip_talkers_init);
register_ethereal_tap("conv,udp", udpip_conversation_init);
register_tap_menu_item("UDP (IPv4 & IPv6)", REGISTER_TAP_GROUP_CONVERSATION_LIST,
gtk_udpip_endpoints_cb, NULL, NULL, NULL);
udpip_conversation_cb, NULL, NULL, NULL);
register_ett_table(FALSE, "UDP", "udp", NULL /*filter*/, (void *)udpip_talkers_packet);
register_conversation_table(FALSE, "UDP", "udp", NULL /*filter*/, (void *)udpip_conversation_packet);
}

2
gtk/menu.c
View File

@ -320,7 +320,7 @@ static GtkItemFactoryEntry menu_items[] =
ITEM_FACTORY_ENTRY("/Statistics/_Protocol Hierarchy", NULL,
proto_hier_stats_cb, 0, NULL, NULL),
ITEM_FACTORY_ENTRY("/Statistics/Conversations", NULL,
init_ett_notebook_cb, 0, NULL, NULL),
init_conversation_notebook_cb, 0, NULL, NULL),
ITEM_FACTORY_ENTRY("/Statistics/Endpoints", NULL,
init_hostlist_notebook_cb, 0, NULL, NULL),
ITEM_FACTORY_ENTRY("/_Help", NULL, NULL, 0, "<Branch>", NULL),