Add more register_dfilter_stat driven menus to MAIN_MENU_USE_UIMANAGER

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

11 files changed, 96 insertions, 14 deletions

diff --git a/gtk/gui_stat_menu.h b/gtk/gui_stat_menu.h
index c535e3498d..6894cf7e00 100644
--- a/gtk/gui_stat_menu.h
+++ b/gtk/gui_stat_menu.h
@@ -175,6 +175,9 @@ void gsm_a_stat_gtk_dtap_ss_cb(GtkAction *action, gpointer user_data);
 void gsm_a_stat_gtk_dtap_tp_cb(GtkAction *action, gpointer user_data);
 void gsm_a_stat_gtk_sacch_rr_cb(GtkAction *action, gpointer user_data);
 void mac_lte_stat_cb(GtkAction *action, gpointer user_data);
+void rlc_lte_stat_cb(GtkAction *action, gpointer user_data);
+void sipstat_cb(GtkAction *action, gpointer user_data);
+void wsp_stat_cb(GtkAction *action, gpointer user_data);
 
 void gsm_map_stat_gtk_cb(GtkAction *action, gpointer user_data);
 void gsm_map_stat_gtk_sum_cb(GtkAction *action, gpointer user_data);
@@ -188,6 +191,12 @@ void gtp_srt_cb(GtkAction *action, gpointer user_data);
 void h225_srt_cb(GtkAction *action, gpointer user_data);
 void ldap_srt_cb(GtkAction *action, gpointer user_data);
 void megaco_srt_cb(GtkAction *action, gpointer user_data);
+void mgcp_srt_cb(GtkAction *action, gpointer user_data);
+void ncp_srt_cb(GtkAction *action, gpointer user_data);
+void radius_srt_cb(GtkAction *action, gpointer user_data);
+void scsi_srt_cb(GtkAction *action, gpointer user_data);
+void smb2_srt_cb(GtkAction *action, gpointer user_data);
+void smb_srt_cb(GtkAction *action, gpointer user_data);
 
 void tcp_graph_cb (GtkAction *action, gpointer user_data);
 gboolean tcp_graph_selected_packet_enabled(frame_data *current_frame, epan_dissect_t *edt, gpointer callback_data _U_);
diff --git a/gtk/main_menubar.c b/gtk/main_menubar.c
index 22c5af658b..6afea509bd 100644
--- a/gtk/main_menubar.c
+++ b/gtk/main_menubar.c
@@ -1226,6 +1226,11 @@ static const char *ui_desc_menubar =
 "        <menuitem name='H225' action='/Analyze/ServiceResponseTime/H225'/>\n"
 "        <menuitem name='LDAP' action='/Analyze/ServiceResponseTime/LDAP'/>\n"
 "        <menuitem name='MEGACO' action='/Analyze/ServiceResponseTime/MEGACO'/>\n"
+"        <menuitem name='MGCP' action='/Analyze/ServiceResponseTime/MGCP'/>\n"
+"        <menuitem name='NCP' action='/Analyze/ServiceResponseTime/NCP'/>\n"
+"        <menuitem name='RADIUS' action='/Analyze/ServiceResponseTime/RADISU'/>\n"
+"        <menuitem name='SCSI' action='/Analyze/ServiceResponseTime/SCSI'/>\n"
+"        <menuitem name='SMB2' action='/Analyze/ServiceResponseTime/SMB2'/>\n"
 "      </menu>\n"
 "      <separator/>\n"
 "      <placeholder name='ANCP'/>\n"
@@ -1273,7 +1278,10 @@ static const char *ui_desc_menubar =
 "      <menu name= 'IAX2menu' action='/Telephony/IAX2'>\n"
 "        <menuitem name='StreamAnalysis' action='/Telephony/IAX2/StreamAnalysis'/>\n"
 "      </menu>\n"
-"      <menuitem name='LTE_MAC' action='/Telephony/LTE_MAC'/>\n"
+"      <menu name= 'LTEmenu' action='/Telephony/LTE'>\n"
+"        <menuitem name='LTE_MAC' action='/Telephony/LTE/MAC'/>\n"
+"        <menuitem name='LTE_MAC' action='/Telephony/LTE/RLC'/>\n"
+"      </menu>\n"
 "      <menu name= 'MTP3menu' action='/Telephony/MTP3'>\n"
 "        <menuitem name='MSUs' action='/Telephony/MTP3/MSUs'/>\n"
 "        <menuitem name='MSUSummary' action='/Telephony/MTP3/MSUSummary'/>\n"
@@ -1287,7 +1295,9 @@ static const char *ui_desc_menubar =
 "        <menuitem name='ShowAllAssociations' action='/Telephony/SCTP/ShowAllAssociations'/>\n"
 "        <menuitem name='ChunkCounter' action='/Telephony/SCTP/ChunkCounter'/>\n"
 "      </menu>\n"
-"       <menuitem name='VoIPCalls' action='/Telephony/VoIPCalls'/>\n"
+"      <menuitem name='SIP' action='/Telephony/SIP'/>\n"
+"      <menuitem name='VoIPCalls' action='/Telephony/VoIPCalls'/>\n"
+"      <menuitem name='WSP' action='/Telephony/WSP'/>\n"
 "    </menu>\n"
 "    <menu name= 'ToolsMenu' action='/Tools'>\n"
 "      <menuitem name='FirewallACLRules' action='/Tools/FirewallACLRules'/>\n"
@@ -1659,6 +1669,12 @@ static const GtkActionEntry main_menu_bar_entries[] = {
    { "/Analyze/ServiceResponseTime/H225",		WIRESHARK_STOCK_TIME,			"H225...",						NULL, NULL,	G_CALLBACK(h225_srt_cb) },
    { "/Analyze/ServiceResponseTime/LDAP",		WIRESHARK_STOCK_TIME,			"LDAP...",						NULL, NULL,	G_CALLBACK(ldap_srt_cb) },
    { "/Analyze/ServiceResponseTime/MEGACO",		WIRESHARK_STOCK_TIME,			"MEGACO...",					NULL, NULL,	G_CALLBACK(megaco_srt_cb) },
+   { "/Analyze/ServiceResponseTime/MGCP",		WIRESHARK_STOCK_TIME,			"MGCP...",						NULL, NULL,	G_CALLBACK(mgcp_srt_cb) },
+   { "/Analyze/ServiceResponseTime/NCP",		WIRESHARK_STOCK_TIME,			"NCP...",						NULL, NULL,	G_CALLBACK(ncp_srt_cb) },
+   { "/Analyze/ServiceResponseTime/RADIUS",		WIRESHARK_STOCK_TIME,			"RADIUS...",					NULL, NULL,	G_CALLBACK(radius_srt_cb) },
+   { "/Analyze/ServiceResponseTime/SCSI",		WIRESHARK_STOCK_TIME,			"SCSI...",						NULL, NULL,	G_CALLBACK(scsi_srt_cb) },
+   { "/Analyze/ServiceResponseTime/SMB",		WIRESHARK_STOCK_TIME,			"SMB...",						NULL, NULL,	G_CALLBACK(smb_srt_cb) },
+   { "/Analyze/ServiceResponseTime/SMB2",		WIRESHARK_STOCK_TIME,			"SMB2...",						NULL, NULL,	G_CALLBACK(smb2_srt_cb) },
 
    { "/Analyze/BACnet",										NULL,				"BACnet",						NULL, NULL, NULL },
 
@@ -1681,14 +1697,14 @@ static const GtkActionEntry main_menu_bar_entries[] = {
    { "/Statistics/Endpoints",		WIRESHARK_STOCK_ENDPOINTS,		"Endpoints",				NULL,						NULL,				G_CALLBACK(init_hostlist_notebook_cb) },
    { "/Statistics/IOGraphs",			WIRESHARK_STOCK_GRAPHS,		"_IO Graph",				NULL,						NULL,				G_CALLBACK(gui_iostat_cb) },
 
-   { "/Telephony/ANSI",					NULL,						"ANSI",						NULL, NULL, NULL },
+   { "/Telephony/ANSI",					NULL,						"_ANSI",					NULL, NULL, NULL },
    { "/Telephony/ANSI/BSMAP",			NULL,						"A-Interface BSMAP",		NULL,						NULL,				G_CALLBACK(ansi_a_stat_gtk_bsmap_cb) },
    { "/Telephony/ANSI/DTAP",			NULL,						"A-Interface DTAP",			NULL,						NULL,				G_CALLBACK(ansi_a_stat_gtk_dtap_cb) },
    { "/Telephony/ANSI/MAP-OP",			NULL,						"MAP Operation",			NULL,						NULL,				G_CALLBACK(ansi_map_stat_gtk_cb) },
 
    { "/Telephony/H225",					NULL,						"_H.225...",				NULL,						NULL,				G_CALLBACK(h225_counter_cb) },
 
-   { "/Telephony/GSM",					NULL,						"GSM",						NULL, NULL, NULL },
+   { "/Telephony/GSM",					NULL,						"_GSM",						NULL, NULL, NULL },
    { "/Telephony/GSM/CAMEL",			NULL,						"CAMEL Messages and Response Status",	NULL,			NULL,				G_CALLBACK(camel_counter_cb) },
    { "/Telephony/GSM/BSSMAP",			NULL,						"_GSM/A-Interface BSSMAP",	NULL,						NULL,				G_CALLBACK(gsm_a_stat_gtk_bssmap_cb) },
 
@@ -1708,19 +1724,22 @@ static const GtkActionEntry main_menu_bar_entries[] = {
 
    { "/Telephony/IAX2",					NULL,						"IA_X2",					NULL, NULL, NULL },
    { "/Telephony/IAX2/StreamAnalysis",	NULL,						"Stream Analysis...",		NULL,						NULL,				G_CALLBACK(iax2_analysis_cb) },
-   { "/Telephony/LTE_MAC",				NULL,						"_LTE/_MAC...",				NULL,						NULL,				G_CALLBACK(mac_lte_stat_cb) },
-   { "/Telephony/MTP3",					NULL,						"M_TP3",					NULL, NULL, NULL },
+   { "/Telephony/LTE",					NULL,						"_LTE",						NULL, NULL, NULL },
+   { "/Telephony/LTE/MAC",				NULL,						"_MAC...",					NULL,						NULL,				G_CALLBACK(mac_lte_stat_cb) },
+   { "/Telephony/LTE/RLC",				NULL,						"_RLC...",					NULL,						NULL,				G_CALLBACK(rlc_lte_stat_cb) },
+   { "/Telephony/MTP3",					NULL,						"_MTP3",					NULL, NULL, NULL },
    { "/Telephony/MTP3/MSUs",			NULL,						"MSUs",						NULL,						NULL,				G_CALLBACK(mtp3_stat_gtk_cb) },
    { "/Telephony/MTP3/MSUSummary",		NULL,						"MSU Summary",				NULL,						NULL,				G_CALLBACK(mtp3_sum_gtk_sum_cb) },
-   { "/Telephony/RTP",					NULL,						"R_TP",						NULL, NULL, NULL },
+   { "/Telephony/RTP",					NULL,						"_RTP",						NULL, NULL, NULL },
    { "/Telephony/RTP/StreamAnalysis",	NULL,						"Stream Analysis...",		NULL,						NULL,				G_CALLBACK(rtp_analysis_cb) },
    { "/Telephony/RTP/ShowAllStreams",	NULL,						"Show All Streams",			NULL,						NULL,				G_CALLBACK(rtpstream_launch) },
    { "/Telephony/SCTP",					NULL,						"S_CTP",						NULL, NULL, NULL },
    { "/Telephony/SCTP/AnalysethisAssociation",	NULL,				"Analyse this Association",	NULL,						NULL,				G_CALLBACK(sctp_analyse_start) },
    { "/Telephony/SCTP/ShowAllAssociations",	NULL,					"Show All Associations...",	NULL,						NULL,				G_CALLBACK(sctp_stat_start) },
    { "/Telephony/SCTP/ChunkCounter",		NULL,					"Chunk Counter",			NULL,						NULL,				G_CALLBACK(sctp_chunk_counter_cb) },
-
+   { "/Telephony/SIP",					NULL,						"_SIP...",					NULL,						NULL,				G_CALLBACK(sipstat_cb) },
    { "/Telephony/VoIPCalls",			WIRESHARK_STOCK_TELEPHONE,	"_VoIP Calls",				NULL,						NULL,				G_CALLBACK(voip_calls_launch) },
+   { "/Telephony/WSP",					NULL,						"_WAP-WSP...",				NULL,						NULL,				G_CALLBACK(wsp_stat_cb) },
 
    { "/Tools/FirewallACLRules",		NULL,							"Firewall ACL Rules",		NULL,						NULL,				G_CALLBACK(firewall_rule_cb) },
 
diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c
index 663d186a40..0b48b119bd 100644
--- a/gtk/mgcp_stat.c
+++ b/gtk/mgcp_stat.c
@@ -319,9 +319,13 @@ static tap_param_dlg mgcp_srt_dlg = {
 void
 register_tap_listener_gtkmgcpstat(void)
 {
-	/* We don't register this tap, if we don't have the mgcp plugin loaded.*/
-	if (find_tap_id("mgcp")) {
-		register_dfilter_stat(&mgcp_srt_dlg, "MGCP",
-		    REGISTER_STAT_GROUP_RESPONSE_TIME);
-	}
+	register_dfilter_stat(&mgcp_srt_dlg, "MGCP",
+	    REGISTER_STAT_GROUP_RESPONSE_TIME);
+}
+#ifdef MAIN_MENU_USE_UIMANAGER
+void mgcp_srt_cb(GtkAction *action, gpointer user_data _U_)
+{
+	tap_param_dlg_cb(action, &mgcp_srt_dlg);
 }
+#endif
+
diff --git a/gtk/ncp_stat.c b/gtk/ncp_stat.c
index 6940b78b67..d193460a26 100644
--- a/gtk/ncp_stat.c
+++ b/gtk/ncp_stat.c
@@ -739,3 +739,9 @@ register_tap_listener_gtkncpstat(void)
 	register_dfilter_stat(&ncp_stat_dlg, "NCP",
 	    REGISTER_STAT_GROUP_RESPONSE_TIME);
 }
+#ifdef MAIN_MENU_USE_UIMANAGER
+void ncp_srt_cb(GtkAction *action, gpointer user_data _U_)
+{
+	tap_param_dlg_cb(action, &ncp_stat_dlg);
+}
+#endif
\ No newline at end of file
diff --git a/gtk/radius_stat.c b/gtk/radius_stat.c
index dd6ff59e56..7a7d783a38 100644
--- a/gtk/radius_stat.c
+++ b/gtk/radius_stat.c
@@ -373,3 +373,9 @@ register_tap_listener_gtkradiusstat(void)
 	register_dfilter_stat(&radius_srt_dlg, "RADIUS",
 		    REGISTER_STAT_GROUP_RESPONSE_TIME);
 }
+#ifdef MAIN_MENU_USE_UIMANAGER
+void radius_srt_cb(GtkAction *action, gpointer user_data _U_)
+{
+	tap_param_dlg_cb(action, &radius_srt_dlg);
+}
+#endif
diff --git a/gtk/rlc_lte_stat_dlg.c b/gtk/rlc_lte_stat_dlg.c
index fa070e466e..bf9fb63538 100644
--- a/gtk/rlc_lte_stat_dlg.c
+++ b/gtk/rlc_lte_stat_dlg.c
@@ -1552,4 +1552,9 @@ register_tap_listener_rlc_lte_stat(void)
 {
     register_dfilter_stat(&rlc_lte_stat_dlg, "_LTE/_RLC", REGISTER_STAT_GROUP_TELEPHONY);
 }
-
+#ifdef MAIN_MENU_USE_UIMANAGER
+void rlc_lte_stat_cb(GtkAction *action, gpointer user_data _U_)
+{
+	tap_param_dlg_cb(action, &rlc_lte_stat_dlg);
+}
+#endif
diff --git a/gtk/scsi_stat.c b/gtk/scsi_stat.c
index ea21831b60..0452f7d9f6 100644
--- a/gtk/scsi_stat.c
+++ b/gtk/scsi_stat.c
@@ -310,3 +310,10 @@ register_tap_listener_gtkscsistat(void)
 	register_dfilter_stat(&scsi_stat_dlg, "SCSI",
 	    REGISTER_STAT_GROUP_RESPONSE_TIME);
 }
+
+#ifdef MAIN_MENU_USE_UIMANAGER
+void scsi_srt_cb(GtkAction *action, gpointer user_data _U_)
+{
+	tap_param_dlg_cb(action, &scsi_stat_dlg);
+}
+#endif
\ No newline at end of file
diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c
index 417e0755b6..56487bdadc 100644
--- a/gtk/sip_stat.c
+++ b/gtk/sip_stat.c
@@ -740,3 +740,10 @@ register_tap_listener_gtksipstat(void)
 {
     register_dfilter_stat(&sip_stat_dlg, "_SIP", REGISTER_STAT_GROUP_TELEPHONY);
 }
+
+#ifdef MAIN_MENU_USE_UIMANAGER
+void sipstat_cb(GtkAction *action, gpointer user_data _U_)
+{
+	tap_param_dlg_cb(action, &sip_stat_dlg);
+}
+#endif
\ No newline at end of file
diff --git a/gtk/smb2_stat.c b/gtk/smb2_stat.c
index ddf8e4f3f0..2e6287505c 100644
--- a/gtk/smb2_stat.c
+++ b/gtk/smb2_stat.c
@@ -220,3 +220,9 @@ register_tap_listener_gtksmb2stat(void)
 	register_dfilter_stat(&smb2_stat_dlg, "SMB2",
 	    REGISTER_STAT_GROUP_RESPONSE_TIME);
 }
+#ifdef MAIN_MENU_USE_UIMANAGER
+void smb2_srt_cb(GtkAction *action, gpointer user_data _U_)
+{
+	tap_param_dlg_cb(action, &smb2_stat_dlg);
+}
+#endif
\ No newline at end of file
diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c
index 8fa3adb901..fffa2e3780 100644
--- a/gtk/smb_stat.c
+++ b/gtk/smb_stat.c
@@ -258,3 +258,9 @@ register_tap_listener_gtksmbstat(void)
 	register_dfilter_stat(&smb_stat_dlg, "SMB",
 	    REGISTER_STAT_GROUP_RESPONSE_TIME);
 }
+#ifdef MAIN_MENU_USE_UIMANAGER
+void smb_srt_cb(GtkAction *action, gpointer user_data _U_)
+{
+	tap_param_dlg_cb(action, &smb_stat_dlg);
+}
+#endif
\ No newline at end of file
diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c
index 245fe914d4..e3aea447e7 100644
--- a/gtk/wsp_stat.c
+++ b/gtk/wsp_stat.c
@@ -439,3 +439,10 @@ register_tap_listener_gtkwspstat(void)
 	register_dfilter_stat(&wsp_stat_dlg, "_WAP-WSP",
 	    REGISTER_STAT_GROUP_TELEPHONY);
 }
+
+#ifdef MAIN_MENU_USE_UIMANAGER
+void wsp_stat_cb(GtkAction *action, gpointer user_data _U_)
+{
+	tap_param_dlg_cb(action, &wsp_stat_dlg);
+}
+#endif
\ No newline at end of file