Update to the conversations list.
Rename it from Endpoint Talkers to : Conversation List Change command line arguments to both tethereal and ethereal to be -z conv,<type> to reflect the new name Conversations This is the last time the tethereal cmd line arg is changed. But now it has a proper intuitive name at least. io,users was weird talkers was too close to names used in other tools svn path=/trunk/; revision=8379
This commit is contained in:
Ronnie Sahlberg
parent
4f893552d0
commit
e3cde3715e
|
|
@ -379,7 +379,7 @@ on those calls that match that filter.
|
|||
Example: use B<-z "mgcp,srt,ip.addr==1.2.3.4"> to only collect stats for
|
||||
MGCP packets exchanged by the host at IP address 1.2.3.4 .
|
||||
|
||||
B<-z> talkers,I<type>[,I<filter>]
|
||||
B<-z> conv,I<type>[,I<filter>]
|
||||
|
||||
Create a table that lists all conversations that could be seen in the
|
||||
capture. I<type> specifies for which type of conversation we want to
|
||||
|
|
@ -403,7 +403,7 @@ frames/bytes. By default, the table is sorted according to total number
|
|||
of frames.
|
||||
|
||||
These tables can also be generated at runtime by selecting the appropriate
|
||||
conversation type from the menu "Tools/Statistics/EndpointTalkers/".
|
||||
conversation type from the menu "Tools/Statistics/Conversation List/".
|
||||
|
||||
=back
|
||||
|
||||
|
|
@ -844,7 +844,7 @@ the calculation. The stats will only be calculated
|
|||
on those calls matching that filter.
|
||||
|
||||
|
||||
=item Tools:Statistics:Endpoint Talkers
|
||||
=item Tools:Statistics:Conversation List
|
||||
|
||||
This option will open a new window that displays a list of all
|
||||
conversations between two endpoints. The list has one row for each
|
||||
|
|
@ -856,7 +856,7 @@ clicking on the column header; it is possible to re-sort the list in
|
|||
ascending or descending order by any column.
|
||||
|
||||
These statistics windows can also be invoked from the Ethereal command
|
||||
line using the B<-z talkers> argument.
|
||||
line using the B<-z conv> argument.
|
||||
|
||||
=item Tools:Statistics:Traffic:IO-Stat
|
||||
|
||||
|
|
|
|||
|
|
@ -445,7 +445,7 @@ time and average response time.
|
|||
|
||||
|
||||
|
||||
B<-z> talkers,I<type>[,I<filter>]
|
||||
B<-z> conv,I<type>[,I<filter>]
|
||||
|
||||
Create a table that lists all conversations that could be seen in the capture.
|
||||
I<type> specifies which type of conversation we want to generate the
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* endpoint_talkers_eth.c
|
||||
* endpoint_talkers_eth 2003 Ronnie Sahlberg
|
||||
*
|
||||
* $Id: endpoint_talkers_eth.c,v 1.13 2003/09/04 23:11:02 sahlberg Exp $
|
||||
* $Id: endpoint_talkers_eth.c,v 1.14 2003/09/04 23:37:45 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -65,8 +65,8 @@ gtk_eth_talkers_init(char *optarg)
|
|||
{
|
||||
char *filter=NULL;
|
||||
|
||||
if(!strncmp(optarg,"talkers,eth,",12)){
|
||||
filter=optarg+12;
|
||||
if(!strncmp(optarg,"conv,eth,",9)){
|
||||
filter=optarg+9;
|
||||
} else {
|
||||
filter=NULL;
|
||||
}
|
||||
|
|
@ -79,14 +79,14 @@ gtk_eth_talkers_init(char *optarg)
|
|||
static void
|
||||
gtk_eth_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
|
||||
{
|
||||
gtk_eth_talkers_init("talkers,eth");
|
||||
gtk_eth_talkers_init("conv,eth");
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
register_tap_menu_eth_talkers(void)
|
||||
{
|
||||
register_tap_menu_item("Endpoint Talkers/Ethernet", gtk_eth_endpoints_cb);
|
||||
register_tap_menu_item("Conversation List/Ethernet", gtk_eth_endpoints_cb);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -95,6 +95,6 @@ register_tap_menu_eth_talkers(void)
|
|||
void
|
||||
register_tap_listener_eth_talkers(void)
|
||||
{
|
||||
register_ethereal_tap("talkers,eth", gtk_eth_talkers_init);
|
||||
register_ethereal_tap("conv,eth", gtk_eth_talkers_init);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* endpoint_talkers_fc.c
|
||||
* endpoint_talkers_fc 2003 Ronnie Sahlberg
|
||||
*
|
||||
* $Id: endpoint_talkers_fc.c,v 1.13 2003/09/04 23:11:03 sahlberg Exp $
|
||||
* $Id: endpoint_talkers_fc.c,v 1.14 2003/09/04 23:37:45 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -66,8 +66,8 @@ gtk_fc_talkers_init(char *optarg)
|
|||
{
|
||||
char *filter=NULL;
|
||||
|
||||
if(!strncmp(optarg,"talkers,fc,",11)){
|
||||
filter=optarg+11;
|
||||
if(!strncmp(optarg,"conv,fc,",8)){
|
||||
filter=optarg+8;
|
||||
} else {
|
||||
filter=NULL;
|
||||
}
|
||||
|
|
@ -80,14 +80,14 @@ gtk_fc_talkers_init(char *optarg)
|
|||
static void
|
||||
gtk_fc_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
|
||||
{
|
||||
gtk_fc_talkers_init("talkers,fc");
|
||||
gtk_fc_talkers_init("conv,fc");
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
register_tap_menu_fc_talkers(void)
|
||||
{
|
||||
register_tap_menu_item("Endpoint Talkers/Fibre Channel", gtk_fc_endpoints_cb);
|
||||
register_tap_menu_item("Conversation List/Fibre Channel", gtk_fc_endpoints_cb);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -96,6 +96,6 @@ register_tap_menu_fc_talkers(void)
|
|||
void
|
||||
register_tap_listener_fc_talkers(void)
|
||||
{
|
||||
register_ethereal_tap("talkers,fc", gtk_fc_talkers_init);
|
||||
register_ethereal_tap("conv,fc", gtk_fc_talkers_init);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* endpoint_talkers_fddi.c
|
||||
* endpoint_talkers_fddi 2003 Ronnie Sahlberg
|
||||
*
|
||||
* $Id: endpoint_talkers_fddi.c,v 1.8 2003/09/04 23:11:03 sahlberg Exp $
|
||||
* $Id: endpoint_talkers_fddi.c,v 1.9 2003/09/04 23:37:45 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -66,8 +66,8 @@ gtk_fddi_talkers_init(char *optarg)
|
|||
{
|
||||
char *filter=NULL;
|
||||
|
||||
if(!strncmp(optarg,"talkers,fddi,",13)){
|
||||
filter=optarg+13;
|
||||
if(!strncmp(optarg,"conv,fddi,",10)){
|
||||
filter=optarg+10;
|
||||
} else {
|
||||
filter=NULL;
|
||||
}
|
||||
|
|
@ -80,14 +80,14 @@ gtk_fddi_talkers_init(char *optarg)
|
|||
static void
|
||||
gtk_fddi_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
|
||||
{
|
||||
gtk_fddi_talkers_init("talkers,fddi");
|
||||
gtk_fddi_talkers_init("conv,fddi");
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
register_tap_menu_fddi_talkers(void)
|
||||
{
|
||||
register_tap_menu_item("Endpoint Talkers/FDDI", gtk_fddi_endpoints_cb);
|
||||
register_tap_menu_item("Conversation List/FDDI", gtk_fddi_endpoints_cb);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -96,6 +96,6 @@ register_tap_menu_fddi_talkers(void)
|
|||
void
|
||||
register_tap_listener_fddi_talkers(void)
|
||||
{
|
||||
register_ethereal_tap("talkers,fddi", gtk_fddi_talkers_init);
|
||||
register_ethereal_tap("conv,fddi", gtk_fddi_talkers_init);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* endpoint_talkers_ip.c
|
||||
* endpoint_talkers_ip 2003 Ronnie Sahlberg
|
||||
*
|
||||
* $Id: endpoint_talkers_ip.c,v 1.14 2003/09/04 23:11:03 sahlberg Exp $
|
||||
* $Id: endpoint_talkers_ip.c,v 1.15 2003/09/04 23:37:45 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -64,8 +64,8 @@ gtk_ip_talkers_init(char *optarg)
|
|||
{
|
||||
char *filter=NULL;
|
||||
|
||||
if(!strncmp(optarg,"talkers,ip,",11)){
|
||||
filter=optarg+11;
|
||||
if(!strncmp(optarg,"conv,ip,",8)){
|
||||
filter=optarg+8;
|
||||
} else {
|
||||
filter=NULL;
|
||||
}
|
||||
|
|
@ -78,14 +78,14 @@ gtk_ip_talkers_init(char *optarg)
|
|||
static void
|
||||
gtk_ip_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
|
||||
{
|
||||
gtk_ip_talkers_init("talkers,ip");
|
||||
gtk_ip_talkers_init("conv,ip");
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
register_tap_menu_ip_talkers(void)
|
||||
{
|
||||
register_tap_menu_item("Endpoint Talkers/IPv4", gtk_ip_endpoints_cb);
|
||||
register_tap_menu_item("Conversation List/IPv4", gtk_ip_endpoints_cb);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -94,6 +94,6 @@ register_tap_menu_ip_talkers(void)
|
|||
void
|
||||
register_tap_listener_ip_talkers(void)
|
||||
{
|
||||
register_ethereal_tap("talkers,ip", gtk_ip_talkers_init);
|
||||
register_ethereal_tap("conv,ip", gtk_ip_talkers_init);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* endpoint_talkers_ipx.c
|
||||
* endpoint_talkers_ipx 2003 Ronnie Sahlberg
|
||||
*
|
||||
* $Id: endpoint_talkers_ipx.c,v 1.12 2003/09/04 23:11:03 sahlberg Exp $
|
||||
* $Id: endpoint_talkers_ipx.c,v 1.13 2003/09/04 23:37:45 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -66,8 +66,8 @@ gtk_ipx_talkers_init(char *optarg)
|
|||
{
|
||||
char *filter=NULL;
|
||||
|
||||
if(!strncmp(optarg,"talkers,ipx,",12)){
|
||||
filter=optarg+12;
|
||||
if(!strncmp(optarg,"conv,ipx,",9)){
|
||||
filter=optarg+9;
|
||||
} else {
|
||||
filter=NULL;
|
||||
}
|
||||
|
|
@ -80,14 +80,14 @@ gtk_ipx_talkers_init(char *optarg)
|
|||
static void
|
||||
gtk_ipx_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
|
||||
{
|
||||
gtk_ipx_talkers_init("talkers,ipx");
|
||||
gtk_ipx_talkers_init("conv,ipx");
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
register_tap_menu_ipx_talkers(void)
|
||||
{
|
||||
register_tap_menu_item("Endpoint Talkers/IPX", gtk_ipx_endpoints_cb);
|
||||
register_tap_menu_item("Conversation List/IPX", gtk_ipx_endpoints_cb);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -96,6 +96,6 @@ register_tap_menu_ipx_talkers(void)
|
|||
void
|
||||
register_tap_listener_ipx_talkers(void)
|
||||
{
|
||||
register_ethereal_tap("talkers,ipx", gtk_ipx_talkers_init);
|
||||
register_ethereal_tap("conv,ipx", gtk_ipx_talkers_init);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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.13 2003/09/04 23:12:46 sahlberg Exp $
|
||||
* $Id: endpoint_talkers_table.c,v 1.14 2003/09/04 23:37:45 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -75,6 +75,7 @@ ett_port_to_str(int port_type, guint32 port)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
#define FN_SRC_ADDRESS 0
|
||||
#define FN_DST_ADDRESS 1
|
||||
#define FN_ANY_ADDRESS 2
|
||||
|
|
@ -853,7 +854,7 @@ init_ett_table(gboolean hide_ports, char *table_name, char *tap_name, char *filt
|
|||
talkers->name=table_name;
|
||||
talkers->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
||||
gtk_window_set_default_size(GTK_WINDOW(talkers->win), 750, 400);
|
||||
snprintf(title, 255, "%s Talkers: %s", table_name, get_basename(cfile.filename));
|
||||
snprintf(title, 255, "%s Conversations: %s", table_name, get_basename(cfile.filename));
|
||||
gtk_window_set_title(GTK_WINDOW(talkers->win), title);
|
||||
|
||||
SIGNAL_CONNECT(talkers->win, "destroy", ett_win_destroy_cb, talkers);
|
||||
|
|
@ -863,7 +864,7 @@ init_ett_table(gboolean hide_ports, char *table_name, char *tap_name, char *filt
|
|||
gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
|
||||
gtk_widget_show(vbox);
|
||||
|
||||
snprintf(title, 255, "%s Talkers", table_name);
|
||||
snprintf(title, 255, "%s Conversations", table_name);
|
||||
label=gtk_label_new(title);
|
||||
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
|
||||
gtk_widget_show(label);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* endpoint_talkers_tcpip.c
|
||||
* endpoint_talkers_tcpip 2003 Ronnie Sahlberg
|
||||
*
|
||||
* $Id: endpoint_talkers_tcpip.c,v 1.15 2003/09/04 23:11:03 sahlberg Exp $
|
||||
* $Id: endpoint_talkers_tcpip.c,v 1.16 2003/09/04 23:37:45 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -65,8 +65,8 @@ gtk_tcpip_talkers_init(char *optarg)
|
|||
{
|
||||
char *filter=NULL;
|
||||
|
||||
if(!strncmp(optarg,"talkers,tcp,",12)){
|
||||
filter=optarg+12;
|
||||
if(!strncmp(optarg,"conv,tcp,",9)){
|
||||
filter=optarg+9;
|
||||
} else {
|
||||
filter=NULL;
|
||||
}
|
||||
|
|
@ -79,14 +79,14 @@ gtk_tcpip_talkers_init(char *optarg)
|
|||
static void
|
||||
gtk_tcpip_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
|
||||
{
|
||||
gtk_tcpip_talkers_init("talkers,tcp");
|
||||
gtk_tcpip_talkers_init("conv,tcp");
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
register_tap_menu_tcpip_talkers(void)
|
||||
{
|
||||
register_tap_menu_item("Endpoint Talkers/TCP (IPv4 IPv6)", gtk_tcpip_endpoints_cb);
|
||||
register_tap_menu_item("Conversation List/TCP (IPv4 IPv6)", gtk_tcpip_endpoints_cb);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -95,6 +95,6 @@ register_tap_menu_tcpip_talkers(void)
|
|||
void
|
||||
register_tap_listener_tcpip_talkers(void)
|
||||
{
|
||||
register_ethereal_tap("talkers,tcp", gtk_tcpip_talkers_init);
|
||||
register_ethereal_tap("conv,tcp", gtk_tcpip_talkers_init);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* endpoint_talkers_tr.c
|
||||
* endpoint_talkers_tr 2003 Ronnie Sahlberg
|
||||
*
|
||||
* $Id: endpoint_talkers_tr.c,v 1.14 2003/09/04 23:11:03 sahlberg Exp $
|
||||
* $Id: endpoint_talkers_tr.c,v 1.15 2003/09/04 23:37:45 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -65,8 +65,8 @@ gtk_tr_talkers_init(char *optarg)
|
|||
{
|
||||
char *filter=NULL;
|
||||
|
||||
if(!strncmp(optarg,"talkers,tr,",11)){
|
||||
filter=optarg+11;
|
||||
if(!strncmp(optarg,"conv,tr,",8)){
|
||||
filter=optarg+8;
|
||||
} else {
|
||||
filter=NULL;
|
||||
}
|
||||
|
|
@ -79,14 +79,14 @@ gtk_tr_talkers_init(char *optarg)
|
|||
static void
|
||||
gtk_tr_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
|
||||
{
|
||||
gtk_tr_talkers_init("talkers,tr");
|
||||
gtk_tr_talkers_init("conv,tr");
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
register_tap_menu_tr_talkers(void)
|
||||
{
|
||||
register_tap_menu_item("Endpoint Talkers/Token Ring", gtk_tr_endpoints_cb);
|
||||
register_tap_menu_item("Conversation List/Token Ring", gtk_tr_endpoints_cb);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -95,6 +95,6 @@ register_tap_menu_tr_talkers(void)
|
|||
void
|
||||
register_tap_listener_tr_talkers(void)
|
||||
{
|
||||
register_ethereal_tap("talkers,tr", gtk_tr_talkers_init);
|
||||
register_ethereal_tap("conv,tr", gtk_tr_talkers_init);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* endpoint_talkers_udpip.c
|
||||
* endpoint_talkers_udpip 2003 Ronnie Sahlberg
|
||||
*
|
||||
* $Id: endpoint_talkers_udpip.c,v 1.15 2003/09/04 23:11:03 sahlberg Exp $
|
||||
* $Id: endpoint_talkers_udpip.c,v 1.16 2003/09/04 23:37:45 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -65,8 +65,8 @@ gtk_udpip_talkers_init(char *optarg)
|
|||
{
|
||||
char *filter=NULL;
|
||||
|
||||
if(!strncmp(optarg,"talkers,udp,",12)){
|
||||
filter=optarg+12;
|
||||
if(!strncmp(optarg,"conv,udp,",9)){
|
||||
filter=optarg+9;
|
||||
} else {
|
||||
filter=NULL;
|
||||
}
|
||||
|
|
@ -79,14 +79,14 @@ gtk_udpip_talkers_init(char *optarg)
|
|||
static void
|
||||
gtk_udpip_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
|
||||
{
|
||||
gtk_udpip_talkers_init("talkers,udp");
|
||||
gtk_udpip_talkers_init("conv,udp");
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
register_tap_menu_udpip_talkers(void)
|
||||
{
|
||||
register_tap_menu_item("Endpoint Talkers/UDP (IPv4 IPv6)", gtk_udpip_endpoints_cb);
|
||||
register_tap_menu_item("Conversation List/UDP (IPv4 IPv6)", gtk_udpip_endpoints_cb);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -95,6 +95,6 @@ register_tap_menu_udpip_talkers(void)
|
|||
void
|
||||
register_tap_listener_udpip_talkers(void)
|
||||
{
|
||||
register_ethereal_tap("talkers,udp", gtk_udpip_talkers_init);
|
||||
register_ethereal_tap("conv,udp", gtk_udpip_talkers_init);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* tap-iousers.c
|
||||
* iostat 2003 Ronnie Sahlberg
|
||||
*
|
||||
* $Id: tap-iousers.c,v 1.13 2003/08/29 10:59:10 sahlberg Exp $
|
||||
* $Id: tap-iousers.c,v 1.14 2003/09/04 23:37:43 sahlberg Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -456,7 +456,7 @@ iousers_draw(io_users_t *iu)
|
|||
guint32 last_frames, max_frames;
|
||||
|
||||
printf("================================================================================\n");
|
||||
printf("%s Talkers\n",iu->type);
|
||||
printf("%s Conversations\n",iu->type);
|
||||
printf("Filter:%s\n",iu->filter?iu->filter:"<No Filter>");
|
||||
printf(" | <- | | -> | | Total |\n");
|
||||
printf(" | Frames Bytes | | Frames Bytes | | Frames Bytes |\n");
|
||||
|
|
@ -500,72 +500,72 @@ iousers_init(char *optarg)
|
|||
io_users_t *iu=NULL;
|
||||
GString *error_string;
|
||||
|
||||
if(!strncmp(optarg,"talkers,eth",11)){
|
||||
if(optarg[11]==','){
|
||||
filter=optarg+12;
|
||||
if(!strncmp(optarg,"conv,eth",8)){
|
||||
if(optarg[8]==','){
|
||||
filter=optarg+9;
|
||||
} else {
|
||||
filter=NULL;
|
||||
}
|
||||
tap_type="eth";
|
||||
tap_type_name="Ethernet";
|
||||
packet_func=iousers_eth_packet;
|
||||
} else if(!strncmp(optarg,"talkers,fc",10)){
|
||||
if(optarg[10]==','){
|
||||
filter=optarg+11;
|
||||
} else if(!strncmp(optarg,"conv,fc",7)){
|
||||
if(optarg[7]==','){
|
||||
filter=optarg+8;
|
||||
} else {
|
||||
filter=NULL;
|
||||
}
|
||||
tap_type="fc";
|
||||
tap_type_name="Fibre Channel";
|
||||
packet_func=iousers_fc_packet;
|
||||
} else if(!strncmp(optarg,"talkers,fddi",12)){
|
||||
if(optarg[12]==','){
|
||||
filter=optarg+13;
|
||||
} else if(!strncmp(optarg,"conv,fddi",9)){
|
||||
if(optarg[9]==','){
|
||||
filter=optarg+10;
|
||||
} else {
|
||||
filter=NULL;
|
||||
}
|
||||
tap_type="fddi";
|
||||
tap_type_name="FDDI";
|
||||
packet_func=iousers_fddi_packet;
|
||||
} else if(!strncmp(optarg,"talkers,tcp",11)){
|
||||
if(optarg[11]==','){
|
||||
filter=optarg+12;
|
||||
} else if(!strncmp(optarg,"conv,tcp",8)){
|
||||
if(optarg[8]==','){
|
||||
filter=optarg+9;
|
||||
} else {
|
||||
filter=NULL;
|
||||
}
|
||||
tap_type="tcp";
|
||||
tap_type_name="TCP";
|
||||
packet_func=iousers_tcpip_packet;
|
||||
} else if(!strncmp(optarg,"talkers,udp",11)){
|
||||
if(optarg[11]==','){
|
||||
filter=optarg+12;
|
||||
} else if(!strncmp(optarg,"conv,udp",8)){
|
||||
if(optarg[8]==','){
|
||||
filter=optarg+9;
|
||||
} else {
|
||||
filter=NULL;
|
||||
}
|
||||
tap_type="udp";
|
||||
tap_type_name="UDP";
|
||||
packet_func=iousers_udpip_packet;
|
||||
} else if(!strncmp(optarg,"talkers,tr",10)){
|
||||
if(optarg[10]==','){
|
||||
filter=optarg+11;
|
||||
} else if(!strncmp(optarg,"conv,tr",7)){
|
||||
if(optarg[7]==','){
|
||||
filter=optarg+8;
|
||||
} else {
|
||||
filter=NULL;
|
||||
}
|
||||
tap_type="tr";
|
||||
tap_type_name="Token Ring";
|
||||
packet_func=iousers_tr_packet;
|
||||
} else if(!strncmp(optarg,"talkers,ipx",11)){
|
||||
if(optarg[11]==','){
|
||||
filter=optarg+12;
|
||||
} else if(!strncmp(optarg,"conv,ipx",8)){
|
||||
if(optarg[8]==','){
|
||||
filter=optarg+9;
|
||||
} else {
|
||||
filter=NULL;
|
||||
}
|
||||
tap_type="ipx";
|
||||
tap_type_name="IPX";
|
||||
packet_func=iousers_ipx_packet;
|
||||
} else if(!strncmp(optarg,"talkers,ip",10)){
|
||||
if(optarg[10]==','){
|
||||
filter=optarg+11;
|
||||
} else if(!strncmp(optarg,"conv,ip",7)){
|
||||
if(optarg[7]==','){
|
||||
filter=optarg+8;
|
||||
} else {
|
||||
filter=NULL;
|
||||
}
|
||||
|
|
@ -573,7 +573,7 @@ iousers_init(char *optarg)
|
|||
tap_type_name="IPv4";
|
||||
packet_func=iousers_ip_packet;
|
||||
} else {
|
||||
fprintf(stderr, "tethereal: invalid \"-z talkers,<type>[,<filter>]\" argument\n");
|
||||
fprintf(stderr, "tethereal: invalid \"-z conv,<type>[,<filter>]\" argument\n");
|
||||
fprintf(stderr," <type> must be one of\n");
|
||||
fprintf(stderr," \"eth\"\n");
|
||||
fprintf(stderr," \"fc\"\n");
|
||||
|
|
@ -602,7 +602,7 @@ iousers_init(char *optarg)
|
|||
g_free(iu->items);
|
||||
}
|
||||
g_free(iu);
|
||||
fprintf(stderr, "tethereal: Couldn't register talkers tap: %s\n",
|
||||
fprintf(stderr, "tethereal: Couldn't register conversations tap: %s\n",
|
||||
error_string->str);
|
||||
g_string_free(error_string, TRUE);
|
||||
exit(1);
|
||||
|
|
@ -613,6 +613,6 @@ iousers_init(char *optarg)
|
|||
void
|
||||
register_tap_listener_iousers(void)
|
||||
{
|
||||
register_ethereal_tap("talkers,", iousers_init);
|
||||
register_ethereal_tap("conv,", iousers_init);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue