diff options
42 files changed, 143 insertions, 179 deletions
diff --git a/gtk/Makefile.common b/gtk/Makefile.common index c3d5bb88aa..da9a90113e 100644 --- a/gtk/Makefile.common +++ b/gtk/Makefile.common @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common,v 1.7 2004/02/22 18:44:02 ulfl Exp $ +# $Id: Makefile.common,v 1.8 2004/02/23 19:19:38 ulfl Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -46,6 +46,7 @@ ETHEREAL_GTK_SRC = \ file_dlg.c \ filter_prefs.c \ find_dlg.c \ + follow_dlg.c \ goto_dlg.c \ gtk_stat_util.c \ gui_prefs.c \ @@ -90,7 +91,6 @@ ETHEREAL_TAP_SRC = \ endpoint_talkers_tr.c \ endpoint_talkers_udpip.c \ fc_stat.c \ - follow_dlg.c \ gsm_a_stat.c \ gsm_map_stat.c \ h225_counter.c \ diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c index 78f5157753..59fed4e218 100644 --- a/gtk/ansi_a_stat.c +++ b/gtk/ansi_a_stat.c @@ -5,7 +5,7 @@ * * MUCH code modified from service_response_time_table.c. * - * $Id: ansi_a_stat.c,v 1.14 2004/02/22 18:44:00 ulfl Exp $ + * $Id: ansi_a_stat.c,v 1.15 2004/02/23 19:19:35 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -535,8 +535,8 @@ register_tap_listener_gtkansi_a_stat(void) exit(1); } - register_tap_menu_item("ANSI/A-Interface BSMAP", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("ANSI/A-Interface BSMAP", REGISTER_TAP_GROUP_NONE, ansi_a_stat_gtk_bsmap_cb, NULL, NULL ,NULL); - register_tap_menu_item("ANSI/A-Interface DTAP", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("ANSI/A-Interface DTAP", REGISTER_TAP_GROUP_NONE, ansi_a_stat_gtk_dtap_cb, NULL, NULL ,NULL); } diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c index b2965723b4..3a276cfee4 100644 --- a/gtk/ansi_map_stat.c +++ b/gtk/ansi_map_stat.c @@ -5,7 +5,7 @@ * * MUCH code modified from service_response_time_table.c. * - * $Id: ansi_map_stat.c,v 1.17 2004/02/22 18:44:00 ulfl Exp $ + * $Id: ansi_map_stat.c,v 1.18 2004/02/23 19:19:35 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -468,6 +468,6 @@ register_tap_listener_gtkansi_map_stat(void) exit(1); } - register_tap_menu_item("ANSI/MAP Operation", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("ANSI/MAP Operation", REGISTER_TAP_GROUP_NONE, ansi_map_stat_gtk_cb, NULL, NULL, NULL); } diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c index cd55b086f4..9d248917f6 100644 --- a/gtk/bootp_stat.c +++ b/gtk/bootp_stat.c @@ -1,7 +1,7 @@ /* bootp_stat.c * boop_stat 2003 Jean-Michel FAYARD * - * $Id: bootp_stat.c,v 1.21 2004/02/22 21:35:57 ulfl Exp $ + * $Id: bootp_stat.c,v 1.22 2004/02/23 19:19:35 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -358,6 +358,6 @@ register_tap_listener_gtkdhcpstat(void) { register_ethereal_tap("bootp,stat,", gtk_dhcpstat_init); - register_tap_menu_item("BOOTP-DHCP (Statistics)", REGISTER_TAP_LAYER_NETWORK, + register_tap_menu_item("BOOTP-DHCP", REGISTER_TAP_GROUP_NONE, gtk_dhcpstat_cb, NULL, NULL, NULL); } diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c index 3b08c7d1e3..a044451cdf 100644 --- a/gtk/dcerpc_stat.c +++ b/gtk/dcerpc_stat.c @@ -1,7 +1,7 @@ /* dcerpc_stat.c * dcerpc_stat 2002 Ronnie Sahlberg * - * $Id: dcerpc_stat.c,v 1.50 2004/02/22 18:44:00 ulfl Exp $ + * $Id: dcerpc_stat.c,v 1.51 2004/02/23 19:19:35 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -677,6 +677,6 @@ register_tap_listener_gtkdcerpcstat(void) { register_ethereal_tap("dcerpc,srt,", gtk_dcerpcstat_init); - register_tap_menu_item("DCE-RPC (Service Response Time...)", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("DCE-RPC...", REGISTER_TAP_GROUP_RESPONSE_TIME, gtk_dcerpcstat_cb, NULL, NULL, NULL); } diff --git a/gtk/endpoint_talkers_eth.c b/gtk/endpoint_talkers_eth.c index 0ee33796c9..bca9b2fa2b 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.23 2004/02/22 18:44:00 ulfl Exp $ + * $Id: endpoint_talkers_eth.c,v 1.24 2004/02/23 19:19:35 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -81,7 +81,7 @@ register_tap_listener_eth_talkers(void) { register_ethereal_tap("conv,eth", gtk_eth_talkers_init); - register_tap_menu_item("Ethernet/Conversation List", REGISTER_TAP_LAYER_DATA_LINK, + register_tap_menu_item("Ethernet", REGISTER_TAP_GROUP_CONVERSATION_LIST, gtk_eth_endpoints_cb, NULL, NULL, NULL); } diff --git a/gtk/endpoint_talkers_fc.c b/gtk/endpoint_talkers_fc.c index 098e3d09d7..d3cc831c9e 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.23 2004/02/22 18:44:00 ulfl Exp $ + * $Id: endpoint_talkers_fc.c,v 1.24 2004/02/23 19:19:35 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -81,7 +81,7 @@ register_tap_listener_fc_talkers(void) { register_ethereal_tap("conv,fc", gtk_fc_talkers_init); - register_tap_menu_item("Fibre Channel/Conversation List", REGISTER_TAP_LAYER_DATA_LINK, + register_tap_menu_item("Fibre Channel", REGISTER_TAP_GROUP_CONVERSATION_LIST, gtk_fc_endpoints_cb, NULL, NULL, NULL); } diff --git a/gtk/endpoint_talkers_fddi.c b/gtk/endpoint_talkers_fddi.c index 4bdab82a76..aa3df01c27 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.18 2004/02/22 18:44:00 ulfl Exp $ + * $Id: endpoint_talkers_fddi.c,v 1.19 2004/02/23 19:19:36 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -81,7 +81,7 @@ register_tap_listener_fddi_talkers(void) { register_ethereal_tap("conv,fddi", gtk_fddi_talkers_init); - register_tap_menu_item("FDDI/Conversation List", REGISTER_TAP_LAYER_DATA_LINK, + register_tap_menu_item("FDDI", REGISTER_TAP_GROUP_CONVERSATION_LIST, gtk_fddi_endpoints_cb, NULL, NULL, NULL); } diff --git a/gtk/endpoint_talkers_ip.c b/gtk/endpoint_talkers_ip.c index 15448964be..f315d4b638 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.24 2004/02/22 18:44:00 ulfl Exp $ + * $Id: endpoint_talkers_ip.c,v 1.25 2004/02/23 19:19:36 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -79,7 +79,7 @@ register_tap_listener_ip_talkers(void) { register_ethereal_tap("conv,ip", gtk_ip_talkers_init); - register_tap_menu_item("IP/Conversation List (IPv4)", REGISTER_TAP_LAYER_NETWORK, + register_tap_menu_item("IPv4", REGISTER_TAP_GROUP_CONVERSATION_LIST, gtk_ip_endpoints_cb, NULL, NULL, NULL); } diff --git a/gtk/endpoint_talkers_ipx.c b/gtk/endpoint_talkers_ipx.c index d1034ced86..739444caa8 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.22 2004/02/22 18:44:00 ulfl Exp $ + * $Id: endpoint_talkers_ipx.c,v 1.23 2004/02/23 19:19:36 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -81,7 +81,7 @@ register_tap_listener_ipx_talkers(void) { register_ethereal_tap("conv,ipx", gtk_ipx_talkers_init); - register_tap_menu_item("IPX/Conversation List", REGISTER_TAP_LAYER_NETWORK, + register_tap_menu_item("IPX", REGISTER_TAP_GROUP_CONVERSATION_LIST, gtk_ipx_endpoints_cb, NULL, NULL, NULL); } diff --git a/gtk/endpoint_talkers_tcpip.c b/gtk/endpoint_talkers_tcpip.c index 5b5c596ee7..3b97c0ee95 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.25 2004/02/22 18:44:00 ulfl Exp $ + * $Id: endpoint_talkers_tcpip.c,v 1.26 2004/02/23 19:19:36 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -81,7 +81,7 @@ register_tap_listener_tcpip_talkers(void) { register_ethereal_tap("conv,tcp", gtk_tcpip_talkers_init); - register_tap_menu_item("TCP/Conversation List (IPv4 & IPv6)", REGISTER_TAP_LAYER_TRANSPORT, + register_tap_menu_item("TCP (IPv4 & IPv6)", REGISTER_TAP_GROUP_CONVERSATION_LIST, gtk_tcpip_endpoints_cb, NULL, NULL, NULL); } diff --git a/gtk/endpoint_talkers_tr.c b/gtk/endpoint_talkers_tr.c index 01e9efa2b6..884517446a 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.24 2004/02/22 18:44:00 ulfl Exp $ + * $Id: endpoint_talkers_tr.c,v 1.25 2004/02/23 19:19:36 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -81,7 +81,7 @@ register_tap_listener_tr_talkers(void) { register_ethereal_tap("conv,tr", gtk_tr_talkers_init); - register_tap_menu_item("Token Ring/Conversation List", REGISTER_TAP_LAYER_DATA_LINK, + register_tap_menu_item("Token Ring", REGISTER_TAP_GROUP_CONVERSATION_LIST, gtk_tr_endpoints_cb, NULL, NULL, NULL); } diff --git a/gtk/endpoint_talkers_udpip.c b/gtk/endpoint_talkers_udpip.c index 9507d257fa..3f65a6d0a2 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.25 2004/02/22 18:44:01 ulfl Exp $ + * $Id: endpoint_talkers_udpip.c,v 1.26 2004/02/23 19:19:36 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -81,7 +81,7 @@ register_tap_listener_udpip_talkers(void) { register_ethereal_tap("conv,udp", gtk_udpip_talkers_init); - register_tap_menu_item("UDP/Conversation List (IPv4 & IPv6)", REGISTER_TAP_LAYER_TRANSPORT, + register_tap_menu_item("UDP (IPv4 & IPv6)", REGISTER_TAP_GROUP_CONVERSATION_LIST, gtk_udpip_endpoints_cb, NULL, NULL, NULL); } diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c index 7ea5dc2b02..f6f04d81cb 100644 --- a/gtk/fc_stat.c +++ b/gtk/fc_stat.c @@ -1,7 +1,7 @@ /* fc_stat.c * fc_stat 2003 Ronnie Sahlberg * - * $Id: fc_stat.c,v 1.27 2004/02/22 18:58:35 ulfl Exp $ + * $Id: fc_stat.c,v 1.28 2004/02/23 19:19:36 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -313,6 +313,6 @@ register_tap_listener_gtkfcstat(void) { register_ethereal_tap("fc,srt", gtk_fcstat_init); - register_tap_menu_item("Fibre Channel/Service Response Time...", REGISTER_TAP_LAYER_DATA_LINK, + register_tap_menu_item("Fibre Channel...", REGISTER_TAP_GROUP_RESPONSE_TIME, gtk_fcstat_cb, NULL, NULL, NULL); } diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c index e7f5e0d65f..986f607e25 100644 --- a/gtk/follow_dlg.c +++ b/gtk/follow_dlg.c @@ -1,6 +1,6 @@ /* follow_dlg.c * - * $Id: follow_dlg.c,v 1.48 2004/02/22 23:39:07 ulfl Exp $ + * $Id: follow_dlg.c,v 1.49 2004/02/23 19:19:36 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1040,20 +1040,3 @@ follow_save_as_destroy_cb(GtkWidget * win _U_, gpointer data) /* Note that we no longer have a dialog box. */ follow_info->follow_save_as_w = NULL; } - - - -gboolean follow_stream_selected_packet_enabled(frame_data *current_frame, epan_dissect_t *edt) -{ - return current_frame != NULL ? (edt->pi.ipproto == IP_PROTO_TCP) : FALSE; -} - - -void -register_tap_listener_follow_stream(void) -{ - register_tap_menu_item("TCP/Follow Stream", REGISTER_TAP_LAYER_TRANSPORT, - follow_stream_cb, follow_stream_selected_packet_enabled, NULL, NULL); -} - - diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c index 6dc40385b7..dbd6a88536 100644 --- a/gtk/gsm_a_stat.c +++ b/gtk/gsm_a_stat.c @@ -5,7 +5,7 @@ * * MUCH code modified from service_response_time_table.c. * - * $Id: gsm_a_stat.c,v 1.14 2004/02/22 18:44:01 ulfl Exp $ + * $Id: gsm_a_stat.c,v 1.15 2004/02/23 19:19:36 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -691,27 +691,27 @@ register_tap_listener_gtkgsm_a_stat(void) exit(1); } - register_tap_menu_item("GSM/A-Interface BSSMAP", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("GSM/A-Interface BSSMAP", REGISTER_TAP_GROUP_NONE, gsm_a_stat_gtk_bssmap_cb, NULL, NULL, NULL); - register_tap_menu_item("GSM/A-Interface DTAP/Mobility Management", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("GSM/A-Interface DTAP/Mobility Management", REGISTER_TAP_GROUP_NONE, gsm_a_stat_gtk_dtap_mm_cb, NULL, NULL, NULL); - register_tap_menu_item("GSM/A-Interface DTAP/Radio Resource Management", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("GSM/A-Interface DTAP/Radio Resource Management", REGISTER_TAP_GROUP_NONE, gsm_a_stat_gtk_dtap_rr_cb, NULL, NULL, NULL); - register_tap_menu_item("GSM/A-Interface DTAP/Call Control", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("GSM/A-Interface DTAP/Call Control", REGISTER_TAP_GROUP_NONE, gsm_a_stat_gtk_dtap_cc_cb, NULL, NULL, NULL); - register_tap_menu_item("GSM/A-Interface DTAP/GPRS Mobility Management", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("GSM/A-Interface DTAP/GPRS Mobility Management", REGISTER_TAP_GROUP_NONE, gsm_a_stat_gtk_dtap_gmm_cb, NULL, NULL, NULL); - register_tap_menu_item("GSM/A-Interface DTAP/Short Message Service", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("GSM/A-Interface DTAP/Short Message Service", REGISTER_TAP_GROUP_NONE, gsm_a_stat_gtk_dtap_sms_cb, NULL, NULL, NULL); - register_tap_menu_item("GSM/A-Interface DTAP/GPRS Session Management", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("GSM/A-Interface DTAP/GPRS Session Management", REGISTER_TAP_GROUP_NONE, gsm_a_stat_gtk_dtap_sm_cb, NULL, NULL, NULL); - register_tap_menu_item("GSM/A-Interface DTAP/Supplementary Services", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("GSM/A-Interface DTAP/Supplementary Services", REGISTER_TAP_GROUP_NONE, gsm_a_stat_gtk_dtap_ss_cb, NULL, NULL, NULL); } diff --git a/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c index f02d6a8fa9..c0c43aeaab 100644 --- a/gtk/gsm_map_stat.c +++ b/gtk/gsm_map_stat.c @@ -5,7 +5,7 @@ * * MUCH code modified from service_response_time_table.c. * - * $Id: gsm_map_stat.c,v 1.3 2004/02/22 18:44:01 ulfl Exp $ + * $Id: gsm_map_stat.c,v 1.4 2004/02/23 19:19:36 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -479,6 +479,6 @@ register_tap_listener_gtkgsm_map_stat(void) exit(1); } - register_tap_menu_item("GSM/MAP Operation", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("GSM/MAP Operation", REGISTER_TAP_GROUP_NONE, gsm_map_stat_gtk_cb, NULL, NULL, NULL); } diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c index df9fdd8edd..ce0b2f94bc 100644 --- a/gtk/h225_counter.c +++ b/gtk/h225_counter.c @@ -2,7 +2,7 @@ * h225 message counter for ethereal * Copyright 2003 Lars Roland * - * $Id: h225_counter.c,v 1.14 2004/02/22 21:35:57 ulfl Exp $ + * $Id: h225_counter.c,v 1.15 2004/02/23 19:19:36 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -520,6 +520,6 @@ register_tap_listener_gtk_h225counter(void) { register_ethereal_tap("h225,counter", gtk_h225counter_init); - register_tap_menu_item("ITU-T H.225/Statistics...", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("ITU-T H.225...", REGISTER_TAP_GROUP_NONE, gtk_tap_dfilter_dlg_cb, NULL, NULL, &(h225_counter_dlg)); } diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c index 479d2f7fc0..395e8fc272 100644 --- a/gtk/h225_ras_srt.c +++ b/gtk/h225_ras_srt.c @@ -2,7 +2,7 @@ * h225 RAS Service Response Time statistics for ethereal * Copyright 2003 Lars Roland * - * $Id: h225_ras_srt.c,v 1.12 2004/02/22 18:44:01 ulfl Exp $ + * $Id: h225_ras_srt.c,v 1.13 2004/02/23 19:19:36 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -317,6 +317,6 @@ register_tap_listener_gtk_h225rassrt(void) { register_ethereal_tap("h225,srt", gtk_h225rassrt_init); - register_tap_menu_item("ITU-T H.225/RAS (Service Response Time ...)", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("ITU-T H.225 RAS...", REGISTER_TAP_GROUP_RESPONSE_TIME, gtk_tap_dfilter_dlg_cb, NULL, NULL, &(h225_rassrt_dlg)); } diff --git a/gtk/hostlist_eth.c b/gtk/hostlist_eth.c index 6e68a03cf8..45c9fbf68a 100644 --- a/gtk/hostlist_eth.c +++ b/gtk/hostlist_eth.c @@ -1,7 +1,7 @@ /* hostlist_eth.c 2004 Ian Schorr * modified from endpoint_talkers_eth.c 2003 Ronnie Sahlberg * - * $Id: hostlist_eth.c,v 1.3 2004/02/23 05:35:46 guy Exp $ + * $Id: hostlist_eth.c,v 1.4 2004/02/23 19:19:36 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -85,7 +85,7 @@ register_tap_listener_eth_hostlist(void) { register_ethereal_tap("hosts,eth", gtk_eth_hostlist_init); - register_tap_menu_item("Ethernet/Host List", REGISTER_TAP_LAYER_DATA_LINK, + register_tap_menu_item("Ethernet", REGISTER_TAP_GROUP_HOST_LIST, gtk_eth_hostlist_cb, NULL, NULL, NULL); } diff --git a/gtk/hostlist_fc.c b/gtk/hostlist_fc.c index 06160bd9a0..440fba27fd 100644 --- a/gtk/hostlist_fc.c +++ b/gtk/hostlist_fc.c @@ -1,7 +1,7 @@ /* hostlist_fc.c 2004 Ian Schorr * modified from endpoint_talkers_fc.c 2003 Ronnie Sahlberg * - * $Id: hostlist_fc.c,v 1.3 2004/02/23 05:35:46 guy Exp $ + * $Id: hostlist_fc.c,v 1.4 2004/02/23 19:19:36 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -85,7 +85,7 @@ register_tap_listener_fc_hostlist(void) { register_ethereal_tap("hosts,fc", gtk_fc_hostlist_init); - register_tap_menu_item("Fibre Channel/Host List", REGISTER_TAP_LAYER_DATA_LINK, + register_tap_menu_item("Fibre Channel", REGISTER_TAP_GROUP_HOST_LIST, gtk_fc_hostlist_cb, NULL, NULL, NULL); } diff --git a/gtk/hostlist_fddi.c b/gtk/hostlist_fddi.c index 39bd5ee2b8..f452d5f588 100644 --- a/gtk/hostlist_fddi.c +++ b/gtk/hostlist_fddi.c @@ -1,7 +1,7 @@ /* hostlist_fddi.c 2004 Ian Schorr * modified from endpoint_talkers_fddi.c 2003 Ronnie Sahlberg * - * $Id: hostlist_fddi.c,v 1.3 2004/02/23 05:35:46 guy Exp $ + * $Id: hostlist_fddi.c,v 1.4 2004/02/23 19:19:36 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -85,7 +85,7 @@ register_tap_listener_fddi_hostlist(void) { register_ethereal_tap("hosts,fddi", gtk_fddi_hostlist_init); - register_tap_menu_item("FDDI/Host List", REGISTER_TAP_LAYER_DATA_LINK, + register_tap_menu_item("FDDI", REGISTER_TAP_GROUP_HOST_LIST, gtk_fddi_hostlist_cb, NULL, NULL, NULL); } diff --git a/gtk/hostlist_ip.c b/gtk/hostlist_ip.c index abba458860..a59d58b523 100644 --- a/gtk/hostlist_ip.c +++ b/gtk/hostlist_ip.c @@ -1,7 +1,7 @@ /* hostlist_ip.c 2004 Ian Schorr * modified from endpoint_talkers_ip.c 2003 Ronnie Sahlberg * - * $Id: hostlist_ip.c,v 1.3 2004/02/23 05:35:46 guy Exp $ + * $Id: hostlist_ip.c,v 1.4 2004/02/23 19:19:36 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -84,7 +84,7 @@ register_tap_listener_ip_hostlist(void) { register_ethereal_tap("hosts,ip", gtk_ip_hostlist_init); - register_tap_menu_item("IP/Host List (IPv4)", REGISTER_TAP_LAYER_NETWORK, + register_tap_menu_item("IPv4", REGISTER_TAP_GROUP_HOST_LIST, gtk_ip_hostlist_cb, NULL, NULL, NULL); } diff --git a/gtk/hostlist_ipx.c b/gtk/hostlist_ipx.c index 6ffeaa84e9..b5ef34800e 100644 --- a/gtk/hostlist_ipx.c +++ b/gtk/hostlist_ipx.c @@ -1,7 +1,7 @@ /* hostlist_ipx.c 2004 Ian Schorr * modified from endpoint_talkers_ipx.c 2003 Ronnie Sahlberg * - * $Id: hostlist_ipx.c,v 1.3 2004/02/23 05:35:46 guy Exp $ + * $Id: hostlist_ipx.c,v 1.4 2004/02/23 19:19:37 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -85,7 +85,7 @@ register_tap_listener_ipx_hostlist(void) { register_ethereal_tap("hosts,ipx", gtk_ipx_hostlist_init); - register_tap_menu_item("IPX/Host List", REGISTER_TAP_LAYER_NETWORK, + register_tap_menu_item("IPX", REGISTER_TAP_GROUP_HOST_LIST, gtk_ipx_hostlist_cb, NULL, NULL, NULL); } diff --git a/gtk/hostlist_tcpip.c b/gtk/hostlist_tcpip.c index 45106652e7..359a86585f 100644 --- a/gtk/hostlist_tcpip.c +++ b/gtk/hostlist_tcpip.c @@ -1,7 +1,7 @@ /* hostlist_tcpip.c 2004 Ian Schorr * modified from endpoint_talkers_tcpip.c 2003 Ronnie Sahlberg * - * $Id: hostlist_tcpip.c,v 1.4 2004/02/23 05:35:47 guy Exp $ + * $Id: hostlist_tcpip.c,v 1.5 2004/02/23 19:19:37 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -85,7 +85,7 @@ register_tap_listener_tcpip_hostlist(void) { register_ethereal_tap("endpoints,tcp", gtk_tcpip_hostlist_init); - register_tap_menu_item("TCP/Endpoint List (IPv4 & IPv6)", REGISTER_TAP_LAYER_TRANSPORT, + register_tap_menu_item("TCP (IPv4 & IPv6)", REGISTER_TAP_GROUP_ENDPOINT_LIST, gtk_tcpip_hostlist_cb, NULL, NULL, NULL); } diff --git a/gtk/hostlist_tr.c b/gtk/hostlist_tr.c index 2c2da4f93c..9ff01f362e 100644 --- a/gtk/hostlist_tr.c +++ b/gtk/hostlist_tr.c @@ -1,7 +1,7 @@ /* hostlist_tr.c 2004 Ian Schorr * modified from endpoint_talkers_tr.c 2003 Ronnie Sahlberg * - * $Id: hostlist_tr.c,v 1.3 2004/02/23 05:35:47 guy Exp $ + * $Id: hostlist_tr.c,v 1.4 2004/02/23 19:19:37 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -85,7 +85,7 @@ register_tap_listener_tr_hostlist(void) { register_ethereal_tap("hosts,tr", gtk_tr_hostlist_init); - register_tap_menu_item("Token Ring/Host List", REGISTER_TAP_LAYER_DATA_LINK, + register_tap_menu_item("Token Ring", REGISTER_TAP_GROUP_HOST_LIST, gtk_tr_hostlist_cb, NULL, NULL, NULL); } diff --git a/gtk/hostlist_udpip.c b/gtk/hostlist_udpip.c index a50b46e90e..703723a315 100644 --- a/gtk/hostlist_udpip.c +++ b/gtk/hostlist_udpip.c @@ -1,7 +1,7 @@ /* hostlist_udpip.c 2004 Ian Schorr * modified from endpoint_talkers_udpip.c 2003 Ronnie Sahlberg * - * $Id: hostlist_udpip.c,v 1.4 2004/02/23 05:35:47 guy Exp $ + * $Id: hostlist_udpip.c,v 1.5 2004/02/23 19:19:37 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -85,7 +85,7 @@ register_tap_listener_udpip_hostlist(void) { register_ethereal_tap("endpoints,udp", gtk_udpip_hostlist_init); - register_tap_menu_item("UDP/Endpoint List (IPv4 & IPv6)", REGISTER_TAP_LAYER_TRANSPORT, + register_tap_menu_item("UDP (IPv4 & IPv6)", REGISTER_TAP_GROUP_ENDPOINT_LIST, gtk_udpip_hostlist_cb, NULL, NULL, NULL); } diff --git a/gtk/http_stat.c b/gtk/http_stat.c index 8d14529b88..529c104213 100644 --- a/gtk/http_stat.c +++ b/gtk/http_stat.c @@ -1,7 +1,7 @@ /* http_stat.c * http_stat 2003 Jean-Michel FAYARD * - * $Id: http_stat.c,v 1.23 2004/02/22 21:35:57 ulfl Exp $ + * $Id: http_stat.c,v 1.24 2004/02/23 19:19:37 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -604,6 +604,6 @@ register_tap_listener_gtkhttpstat(void) { register_ethereal_tap("http,stat,", gtk_httpstat_init); - register_tap_menu_item("HTTP (Statistics)", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("HTTP", REGISTER_TAP_GROUP_NONE, gtk_httpstat_cb, NULL, NULL, NULL); } diff --git a/gtk/io_stat.c b/gtk/io_stat.c index c3feaf0189..79e2ec5412 100644 --- a/gtk/io_stat.c +++ b/gtk/io_stat.c @@ -1,7 +1,7 @@ /* io_stat.c * io_stat 2002 Ronnie Sahlberg * - * $Id: io_stat.c,v 1.64 2004/02/22 18:44:02 ulfl Exp $ + * $Id: io_stat.c,v 1.65 2004/02/23 19:19:37 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1792,6 +1792,6 @@ register_tap_listener_gtk_iostat(void) { register_ethereal_tap("io,stat", gtk_iostat_init); - register_tap_menu_item("IO Statistics", REGISTER_TAP_LAYER_GENERIC, + register_tap_menu_item("IO Statistics", REGISTER_TAP_GROUP_GENERIC, gtk_iostat_cb, NULL, NULL, NULL); } diff --git a/gtk/isup_stat.c b/gtk/isup_stat.c index b22f6eb7cc..dea6e37db8 100644 --- a/gtk/isup_stat.c +++ b/gtk/isup_stat.c @@ -5,7 +5,7 @@ * * MUCH code modified from service_response_time_table.c. * - * $Id: isup_stat.c,v 1.18 2004/02/22 18:44:02 ulfl Exp $ + * $Id: isup_stat.c,v 1.19 2004/02/23 19:19:37 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -473,6 +473,6 @@ register_tap_listener_gtkisup_stat(void) exit(1); } - register_tap_menu_item("ISUP (Message Types)", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("ISUP Message Types", REGISTER_TAP_GROUP_NONE, isup_stat_gtk_cb, NULL, NULL, NULL); } diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c index f21d8769a6..1e7ada992f 100644 --- a/gtk/ldap_stat.c +++ b/gtk/ldap_stat.c @@ -1,7 +1,7 @@ /* ldap_stat.c * ldap_stat 2003 Ronnie Sahlberg * - * $Id: ldap_stat.c,v 1.15 2004/02/22 18:58:35 ulfl Exp $ + * $Id: ldap_stat.c,v 1.16 2004/02/23 19:19:37 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -348,6 +348,6 @@ register_tap_listener_gtkldapstat(void) { register_ethereal_tap("ldap,srt", gtk_ldapstat_init); - register_tap_menu_item("LDAP (Service Response Time...)", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("LDAP...", REGISTER_TAP_GROUP_RESPONSE_TIME, gtk_ldapstat_cb, NULL, NULL, NULL); } diff --git a/gtk/main.c b/gtk/main.c index 0416b73ef7..5b7d8dc0b3 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.406 2004/02/23 16:12:52 gerald Exp $ + * $Id: main.c,v 1.407 2004/02/23 19:19:37 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -3787,7 +3787,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) set_menu_object_data("/File/Open...", E_DFILTER_TE_KEY, filter_te); set_menu_object_data("/Analyze/Display Filters...", E_FILT_TE_PTR_KEY, filter_te); - set_menu_object_data("/Transport/TCP/Follow Stream", E_DFILTER_TE_KEY, + set_menu_object_data("/Analyze/Follow TCP Stream", E_DFILTER_TE_KEY, filter_te); set_menu_object_data("/Analyze/Match/Selected", E_DFILTER_TE_KEY, filter_te); @@ -3814,9 +3814,6 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) set_menu_object_data("/Analyze/Prepare/Or Not Selected", E_DFILTER_TE_KEY, filter_te); set_toolbar_object_data(E_DFILTER_TE_KEY, filter_te); - /* XXX: why does the popup menues depend on this? */ - set_menu_object_data("/Follow TCP Stream", E_DFILTER_TE_KEY, - filter_te); OBJECT_SET_DATA(popup_menu_object, E_DFILTER_TE_KEY, filter_te); OBJECT_SET_DATA(popup_menu_object, E_MPACKET_LIST_KEY, packet_list); diff --git a/gtk/menu.c b/gtk/menu.c index 3b59ab9812..00cffebbda 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -1,7 +1,7 @@ /* menu.c * Menu routines * - * $Id: menu.c,v 1.171 2004/02/22 23:31:36 ulfl Exp $ + * $Id: menu.c,v 1.172 2004/02/23 19:19:38 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -78,7 +78,7 @@ clear_menu_recent_capture_file_cmd_cb(GtkWidget *w, gpointer unused _U_); typedef struct _menu_item { char *name; - gint layer; + gint group; gboolean enabled; GtkItemFactoryCallback callback; gpointer callback_data; @@ -291,11 +291,12 @@ static GtkItemFactoryEntry menu_items[] = ITEM_FACTORY_ENTRY("/Analyze/_User Specified Decodes...", NULL, decode_show_cb, 0, NULL, NULL), ITEM_FACTORY_ENTRY("/Analyze/<separator>", NULL, NULL, 0, "<Separator>", NULL), - ITEM_FACTORY_ENTRY("/Analyze/Summar_y", NULL, summary_open_cb, 0, NULL, NULL), - ITEM_FACTORY_ENTRY("/Analyze/Protocol _Hierarchy Statistics", NULL, + ITEM_FACTORY_ENTRY("/Analyze/_Follow TCP Stream", NULL, + follow_stream_cb, 0, NULL, NULL), + ITEM_FACTORY_ENTRY("/_Statistics", NULL, NULL, 0, "<Branch>", NULL), + ITEM_FACTORY_ENTRY("/Statistics/Summar_y", NULL, summary_open_cb, 0, NULL, NULL), + ITEM_FACTORY_ENTRY("/Statistics/Protocol _Hierarchy", NULL, proto_hier_stats_cb, 0, NULL, NULL), - ITEM_FACTORY_ENTRY("/_Transport", NULL, NULL, 0, "<Branch>", NULL), - ITEM_FACTORY_ENTRY("/App_lication", NULL, NULL, 0, "<Branch>", NULL), ITEM_FACTORY_ENTRY("/_Help", NULL, NULL, 0, "<Branch>", NULL), ITEM_FACTORY_STOCK_ENTRY("/Help/_Contents", "F1", help_cb, 0, GTK_STOCK_HELP), ITEM_FACTORY_ENTRY("/Help/_Supported Protocols", NULL, supported_cb, 0, NULL, NULL), @@ -505,8 +506,8 @@ gint tap_menu_item_add_compare(gconstpointer a, gconstpointer b) /* add a menuitem below the current node */ GList * tap_menu_item_add( - gint layer, char *name, + gint group, GtkItemFactoryCallback callback, gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *), gboolean (*selected_tree_row_enabled)(field_info *), @@ -518,7 +519,7 @@ GList * tap_menu_item_add( child = g_malloc(sizeof (menu_item_t)); - child->layer = layer; + child->group = group; child->name = name; child->callback = callback; child->selected_packet_enabled = selected_packet_enabled; @@ -560,13 +561,13 @@ GList * tap_menu_item_add( void register_tap_menu_item( char *name, - gint layer, + gint group, GtkItemFactoryCallback callback, gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *), gboolean (*selected_tree_row_enabled)(field_info *), gpointer callback_data) { - /* static const char toolspath[] = "/Analyze/"; */ + /*static const char toolspath[] = "/Statistics/";*/ char *toolspath; char *p; char *menupath; @@ -580,29 +581,13 @@ register_tap_menu_item( */ g_assert(*name != '/'); -#if 0 - switch(layer) { - case(REGISTER_TAP_LAYER_GENERIC): toolspath = "/Analyze/"; break; - case(REGISTER_TAP_LAYER_PHYSICAL): toolspath = "/Physical/"; break; - case(REGISTER_TAP_LAYER_DATA_LINK): toolspath = "/Link/"; break; - case(REGISTER_TAP_LAYER_NETWORK): toolspath = "/Network/"; break; - case(REGISTER_TAP_LAYER_TRANSPORT): toolspath = "/Transport/"; break; - case(REGISTER_TAP_LAYER_SESSION): toolspath = "/Session/"; break; - case(REGISTER_TAP_LAYER_PRESENTATION): toolspath = "/Presentation/"; break; - case(REGISTER_TAP_LAYER_APPLICATION): toolspath = "/Application/"; break; - default: - g_assert(0); - } -#endif - switch(layer) { - case(REGISTER_TAP_LAYER_GENERIC): toolspath = "/Analyze/"; break; - case(REGISTER_TAP_LAYER_PHYSICAL): toolspath = "/Transport/"; break; - case(REGISTER_TAP_LAYER_DATA_LINK): toolspath = "/Transport/"; break; - case(REGISTER_TAP_LAYER_NETWORK): toolspath = "/Transport/"; break; - case(REGISTER_TAP_LAYER_TRANSPORT): toolspath = "/Transport/"; break; - case(REGISTER_TAP_LAYER_SESSION): toolspath = "/Application/"; break; - case(REGISTER_TAP_LAYER_PRESENTATION): toolspath = "/Application/"; break; - case(REGISTER_TAP_LAYER_APPLICATION): toolspath = "/Application/"; break; + switch(group) { + case(REGISTER_TAP_GROUP_GENERIC): toolspath = "/Statistics/"; break; + case(REGISTER_TAP_GROUP_CONVERSATION_LIST): toolspath = "/Statistics/Conversation List/"; break; + case(REGISTER_TAP_GROUP_ENDPOINT_LIST): toolspath = "/Statistics/Endpoint List/"; break; + case(REGISTER_TAP_GROUP_HOST_LIST): toolspath = "/Statistics/Host List/"; break; + case(REGISTER_TAP_GROUP_RESPONSE_TIME): toolspath = "/Statistics/Service Response Time/"; break; + case(REGISTER_TAP_GROUP_NONE): toolspath = "/Statistics/"; break; default: g_assert(0); toolspath = NULL; @@ -648,7 +633,7 @@ register_tap_menu_item( * add it to the Tools menu tree. */ childnode = tap_menu_item_add( - layer, menupath, NULL, NULL ,NULL, NULL, curnode); + menupath, group, NULL, NULL ,NULL, NULL, curnode); } else { /* * Yes. We don't need this "menupath" any longer. @@ -676,13 +661,13 @@ register_tap_menu_item( * the main menu. */ tap_menu_item_add( - layer, menupath, callback, + menupath, group, callback, selected_packet_enabled, selected_tree_row_enabled, callback_data, curnode); } -guint merge_tap_menus_layered(GList *node, gint layer) { +guint merge_tap_menus_layered(GList *node, gint group) { GtkItemFactoryEntry *entry; GList *child; guint added = 0; @@ -700,7 +685,7 @@ guint merge_tap_menus_layered(GList *node, gint layer) { * The root node doesn't correspond to a menu tree item; it * has a null name pointer. */ - if (node_data->name != NULL && layer == node_data->layer) { + if (node_data->name != NULL && group == node_data->group) { entry = g_malloc0(sizeof (GtkItemFactoryEntry)); entry->path = node_data->name; entry->callback = node_data->callback; @@ -718,7 +703,7 @@ guint merge_tap_menus_layered(GList *node, gint layer) { * The root node doesn't correspond to a menu tree item; it * has a null name pointer. */ - if (node_data->name != NULL && layer == node_data->layer) { + if (node_data->name != NULL && group == node_data->group) { entry = g_malloc0(sizeof (GtkItemFactoryEntry)); entry->path = node_data->name; entry->item_type = "<Branch>"; @@ -731,7 +716,7 @@ guint merge_tap_menus_layered(GList *node, gint layer) { for (child = node_data->children; child != NULL; child = child->next) { - added += merge_tap_menus_layered(child, layer); + added += merge_tap_menus_layered(child, group); } } @@ -744,31 +729,30 @@ void merge_all_tap_menus(GList *node) { entry = g_malloc0(sizeof (GtkItemFactoryEntry)); entry->item_type = "<Separator>"; + entry->path = "/Statistics/"; /* - * merge only the menu items of the specific layer, + * merge only the menu items of the specific group, * and then append a seperator */ - entry->path = "/Analyze/"; - if (merge_tap_menus_layered(node, REGISTER_TAP_LAYER_GENERIC)) - /*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/ - - entry->path = "/Transport/"; - if (merge_tap_menus_layered(node, REGISTER_TAP_LAYER_PHYSICAL)) - gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2); - if (merge_tap_menus_layered(node, REGISTER_TAP_LAYER_DATA_LINK)) - gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2); - if (merge_tap_menus_layered(node, REGISTER_TAP_LAYER_NETWORK)) + if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_GENERIC)) { gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2); - if (merge_tap_menus_layered(node, REGISTER_TAP_LAYER_TRANSPORT)) + } + if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_CONVERSATION_LIST)) { /*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/ - - entry->path = "/Application/"; - if (merge_tap_menus_layered(node, REGISTER_TAP_LAYER_SESSION)) - gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2); - if (merge_tap_menus_layered(node, REGISTER_TAP_LAYER_PRESENTATION)) + } + if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_ENDPOINT_LIST)) { + /*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/ + } + if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_HOST_LIST)) { + /*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/ + } + if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_RESPONSE_TIME)) { gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2); - merge_tap_menus_layered(node, REGISTER_TAP_LAYER_APPLICATION); + } + if (merge_tap_menus_layered(node, REGISTER_TAP_GROUP_NONE)) { + /*gtk_item_factory_create_item(main_menu_factory, entry, NULL, 2);*/ + } } @@ -1558,9 +1542,9 @@ set_menus_for_captured_packets(gboolean have_captured_packets) have_captured_packets); set_menu_sensitivity(packet_list_menu_factory, "/Coloring Rules...", have_captured_packets); - set_menu_sensitivity(main_menu_factory, "/Analyze/Summary", + set_menu_sensitivity(main_menu_factory, "/Statistics/Summary", have_captured_packets); - set_menu_sensitivity(main_menu_factory, "/Analyze/Protocol Hierarchy Statistics", + set_menu_sensitivity(main_menu_factory, "/Statistics/Protocol Hierarchy", have_captured_packets); walk_menu_tree_for_captured_packets(tap_menu_tree_root, @@ -1654,6 +1638,8 @@ set_menus_for_selected_packet(capture_file *cf) cf->current_frame != NULL); set_menu_sensitivity(packet_list_menu_factory, "/Show Packet In New Window", cf->current_frame != NULL); + set_menu_sensitivity(main_menu_factory, "/Analyze/Follow TCP Stream", + cf->current_frame != NULL ? (cf->edt->pi.ipproto == IP_PROTO_TCP) : FALSE); set_menu_sensitivity(NULL, "/Follow TCP Stream", cf->current_frame != NULL ? (cf->edt->pi.ipproto == IP_PROTO_TCP) : FALSE); set_menu_sensitivity(main_menu_factory, "/Analyze/Decode As...", diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c index c6e5bd0d03..638ef11af4 100644 --- a/gtk/mgcp_stat.c +++ b/gtk/mgcp_stat.c @@ -2,7 +2,7 @@ * mgcp-statistics for ethereal * Copyright 2003 Lars Roland * - * $Id: mgcp_stat.c,v 1.29 2004/02/22 18:44:02 ulfl Exp $ + * $Id: mgcp_stat.c,v 1.30 2004/02/23 19:19:38 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -312,6 +312,6 @@ register_tap_listener_gtkmgcpstat(void) register_ethereal_tap("mgcp,srt", gtk_mgcpstat_init); if (find_tap_id("mgcp")) - register_tap_menu_item("MGCP (Service Response Time...)", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("MGCP...", REGISTER_TAP_GROUP_NONE, gtk_tap_dfilter_dlg_cb, NULL, NULL, &(mgcp_srt_dlg)); } diff --git a/gtk/rpc_progs.c b/gtk/rpc_progs.c index 55b703ce4d..4ad2037b36 100644 --- a/gtk/rpc_progs.c +++ b/gtk/rpc_progs.c @@ -1,7 +1,7 @@ /* rpc_progs.c * rpc_progs 2002 Ronnie Sahlberg * - * $Id: rpc_progs.c,v 1.20 2004/02/22 18:44:02 ulfl Exp $ + * $Id: rpc_progs.c,v 1.21 2004/02/23 19:19:38 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -404,6 +404,6 @@ register_tap_listener_gtkrpcprogs(void) { register_ethereal_tap("rpc,programs", gtk_rpcprogs_init); - register_tap_menu_item("ONC-RPC/Programs", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("ONC-RPC Programs", REGISTER_TAP_GROUP_NONE, gtk_rpcprogs_cb, NULL, NULL, NULL); } diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c index 299501a1ce..d5673b57d9 100644 --- a/gtk/rpc_stat.c +++ b/gtk/rpc_stat.c @@ -1,7 +1,7 @@ /* rpc_stat.c * rpc_stat 2002 Ronnie Sahlberg * - * $Id: rpc_stat.c,v 1.40 2004/02/22 18:58:35 ulfl Exp $ + * $Id: rpc_stat.c,v 1.41 2004/02/23 19:19:38 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -523,7 +523,7 @@ register_tap_listener_gtkrpcstat(void) { register_ethereal_tap("rpc,srt,", gtk_rpcstat_init); - register_tap_menu_item("ONC-RPC/Service Response Time...", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("ONC-RPC...", REGISTER_TAP_GROUP_RESPONSE_TIME, gtk_rpcstat_cb, NULL, NULL, NULL); } diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index 7ee792692f..b4d634caee 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -1,7 +1,7 @@ /* rtp_analysis.c * RTP analysis addition for ethereal * - * $Id: rtp_analysis.c,v 1.38 2004/02/22 18:44:03 ulfl Exp $ + * $Id: rtp_analysis.c,v 1.39 2004/02/23 19:19:38 ulfl Exp $ * * Copyright 2003, Alcatel Business Systems * By Lars Ruoff <lars.ruoff@gmx.net> @@ -2345,6 +2345,6 @@ register_tap_listener_rtp_analysis(void) { register_ethereal_tap("rtp", rtp_analysis_init); - register_tap_menu_item("RTP/Stream Analysis...", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("RTP/Stream Analysis...", REGISTER_TAP_GROUP_NONE, rtp_analysis_cb, NULL, NULL, NULL); } diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c index eef1e40bd1..e08ae2645a 100644 --- a/gtk/rtp_stream_dlg.c +++ b/gtk/rtp_stream_dlg.c @@ -1,7 +1,7 @@ /* rtp_stream_dlg.c * RTP streams summary addition for ethereal * - * $Id: rtp_stream_dlg.c,v 1.15 2004/02/22 18:44:03 ulfl Exp $ + * $Id: rtp_stream_dlg.c,v 1.16 2004/02/23 19:19:38 ulfl Exp $ * * Copyright 2003, Alcatel Business Systems * By Lars Ruoff <lars.ruoff@gmx.net> @@ -826,6 +826,6 @@ void rtpstream_launch(GtkWidget *w _U_, gpointer data _U_) void register_tap_listener_rtp_stream_dlg(void) { - register_tap_menu_item("RTP/Show All Streams...", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("RTP/Show All Streams...", REGISTER_TAP_GROUP_NONE, rtpstream_launch, NULL, NULL, NULL); } diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c index c28507e943..ea4a89357f 100644 --- a/gtk/smb_stat.c +++ b/gtk/smb_stat.c @@ -1,7 +1,7 @@ /* smb_stat.c * smb_stat 2003 Ronnie Sahlberg * - * $Id: smb_stat.c,v 1.38 2004/02/22 18:58:35 ulfl Exp $ + * $Id: smb_stat.c,v 1.39 2004/02/23 19:19:38 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -353,6 +353,6 @@ register_tap_listener_gtksmbstat(void) { register_ethereal_tap("smb,srt", gtk_smbstat_init); - register_tap_menu_item("SMB (Service Response Time...)", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("SMB...", REGISTER_TAP_GROUP_RESPONSE_TIME, gtk_smbstat_cb, NULL, NULL, NULL); } diff --git a/gtk/tap_menu.h b/gtk/tap_menu.h index 4836e67c47..f52f5121c2 100644 --- a/gtk/tap_menu.h +++ b/gtk/tap_menu.h @@ -1,7 +1,7 @@ /* tap_menu.h * Menu definitions for use by taps * - * $Id: tap_menu.h,v 1.2 2004/02/22 18:44:03 ulfl Exp $ + * $Id: tap_menu.h,v 1.3 2004/02/23 19:19:38 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -53,21 +53,19 @@ extern "C" { */ extern void register_tap_menu_item( char *name, - gint layer, + gint group, GtkItemFactoryCallback callback, gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *), gboolean (*selected_tree_row_enabled)(field_info *), gpointer callback_data); /* XXX: would it better to use an enum here? */ -#define REGISTER_TAP_LAYER_GENERIC 0 -#define REGISTER_TAP_LAYER_PHYSICAL 1 /* currently unused */ -#define REGISTER_TAP_LAYER_DATA_LINK 2 -#define REGISTER_TAP_LAYER_NETWORK 3 -#define REGISTER_TAP_LAYER_TRANSPORT 4 -#define REGISTER_TAP_LAYER_SESSION 5 /* currently unused */ -#define REGISTER_TAP_LAYER_PRESENTATION 6 /* currently unused */ -#define REGISTER_TAP_LAYER_APPLICATION 7 +#define REGISTER_TAP_GROUP_GENERIC 0 +#define REGISTER_TAP_GROUP_CONVERSATION_LIST 1 +#define REGISTER_TAP_GROUP_ENDPOINT_LIST 2 +#define REGISTER_TAP_GROUP_HOST_LIST 3 +#define REGISTER_TAP_GROUP_RESPONSE_TIME 4 +#define REGISTER_TAP_GROUP_NONE 10 #ifdef __cplusplus } diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index 8aaa246ee7..22f3f10fbf 100644 --- a/gtk/tcp_graph.c +++ b/gtk/tcp_graph.c @@ -3,7 +3,7 @@ * By Pavel Mores <pvl@uh.cz> * Win32 port: rwh@unifiedtech.com * - * $Id: tcp_graph.c,v 1.53 2004/02/22 19:48:10 ulfl Exp $ + * $Id: tcp_graph.c,v 1.54 2004/02/23 19:19:38 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -3974,13 +3974,13 @@ gboolean tcp_graph_selected_packet_enabled(frame_data *current_frame, epan_disse void register_tap_listener_tcp_graph(void) { - register_tap_menu_item("TCP/Stream Analysis/Time-Sequence Graph (Stevens)", REGISTER_TAP_LAYER_TRANSPORT, + register_tap_menu_item("TCP Stream Analysis/Time-Sequence Graph (Stevens)", REGISTER_TAP_GROUP_NONE, tcp_graph_cb, tcp_graph_selected_packet_enabled, NULL, GINT_TO_POINTER(0)); - register_tap_menu_item("TCP/Stream Analysis/Time-Sequence Graph (tcptrace)", REGISTER_TAP_LAYER_TRANSPORT, + register_tap_menu_item("TCP Stream Analysis/Time-Sequence Graph (tcptrace)", REGISTER_TAP_GROUP_NONE, tcp_graph_cb, tcp_graph_selected_packet_enabled, NULL, GINT_TO_POINTER(1)); - register_tap_menu_item("TCP/Stream Analysis/Throughput Graph", REGISTER_TAP_LAYER_TRANSPORT, + register_tap_menu_item("TCP Stream Analysis/Throughput Graph", REGISTER_TAP_GROUP_NONE, tcp_graph_cb, tcp_graph_selected_packet_enabled, NULL, GINT_TO_POINTER(2)); - register_tap_menu_item("TCP/Stream Analysis/Round Trip Time Graph", REGISTER_TAP_LAYER_TRANSPORT, + register_tap_menu_item("TCP Stream Analysis/Round Trip Time Graph", REGISTER_TAP_GROUP_NONE, tcp_graph_cb, tcp_graph_selected_packet_enabled, NULL, GINT_TO_POINTER(3)); } diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c index ed93cc5641..0f6a84f3e6 100644 --- a/gtk/wsp_stat.c +++ b/gtk/wsp_stat.c @@ -1,7 +1,7 @@ /* wsp_stat.c * wsp_stat 2003 Jean-Michel FAYARD * - * $Id: wsp_stat.c,v 1.21 2004/02/22 21:35:58 ulfl Exp $ + * $Id: wsp_stat.c,v 1.22 2004/02/23 19:19:39 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -508,6 +508,6 @@ register_tap_listener_gtkwspstat(void) { register_ethereal_tap("wsp,stat,", gtk_wspstat_init); - register_tap_menu_item("WAP-WSP (Statistics...)", REGISTER_TAP_LAYER_APPLICATION, + register_tap_menu_item("WAP-WSP...", REGISTER_TAP_GROUP_NONE, gtk_wspstat_cb, NULL, NULL, NULL); } |