osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Add a REGISTER_STAT_GROUP_TELEPHONY_LTE for the Telephony/LTE menu, and 

use it o register the MAC and RLC statistics dialogues.  Get rid of the
explicit menu items for them, as they now show up in the menu as a
result of the tap registering itself.

svn path=/trunk/; revision=49658
This commit is contained in:
Guy Harris 2013-05-31 21:57:15 +00:00
parent bfe9967fc8
commit c7bd9ae115
6 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
stat_menu.h
View File

@ -51,7 +51,8 @@ typedef enum {
REGISTER_STAT_GROUP_ENDPOINT_LIST, /* member of the endpoint list */
REGISTER_STAT_GROUP_RESPONSE_TIME, /* member of the service response time list */
REGISTER_STAT_GROUP_TELEPHONY, /* telephony specific */
REGISTER_STAT_GROUP_TELEPHONY_GSM, /* GSM (and UMTS and LTE?) */
REGISTER_STAT_GROUP_TELEPHONY_GSM, /* GSM (and UMTS?) */
REGISTER_STAT_GROUP_TELEPHONY_LTE, /* name says it all */
REGISTER_TOOLS_GROUP_UNSORTED /* unsorted tools */
} register_stat_group_t;

2
ui/gtk/gui_stat_menu.h
View File

@ -145,9 +145,7 @@ void gsm_a_stat_gtk_dtap_sm_cb(GtkAction *action, gpointer user_data);
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 gtk_mac_lte_stat_init(const char *opt_arg, void *userdata);
void rlc_lte_stat_cb(GtkAction *action, gpointer user_data);
void gtk_rlc_lte_stat_init(const char *opt_arg, void *userdata);
void sipstat_cb(GtkAction *action, gpointer user_data);
void wsp_stat_cb(GtkAction *action, gpointer user_data);

8
ui/gtk/mac_lte_stat_dlg.c
View File

@ -1403,11 +1403,5 @@ static tap_param_dlg mac_lte_stat_dlg = {
/* Register this tap listener (need void on own so line register function found) */
void register_tap_listener_mac_lte_stat(void)
{
register_param_stat(&mac_lte_stat_dlg, "_LTE/_MAC", REGISTER_STAT_GROUP_TELEPHONY);
register_param_stat(&mac_lte_stat_dlg, "_MAC", REGISTER_STAT_GROUP_TELEPHONY_LTE);
}
void mac_lte_stat_cb(GtkAction *action, gpointer user_data _U_)
{
tap_param_dlg_cb(action, &mac_lte_stat_dlg);
}

5
ui/gtk/main_menubar.c
View File

@ -1261,8 +1261,6 @@ static const char *ui_desc_menubar =
" </menu>\n"
" <menuitem name='ISUP' action='/Telephony/isup_msg'/>\n"
" <menu name= 'LTEmenu' action='/Telephony/LTE'>\n"
" <menuitem name='LTE_MAC' action='/Telephony/LTE/MAC'/>\n"
" <menuitem name='LTE_RLC' action='/Telephony/LTE/RLC'/>\n"
" <menuitem name='LTE_RLC_Graph' action='/Telephony/LTE/RLCGraph'/>\n"
" </menu>\n"
" <menu name= 'MTP3menu' action='/Telephony/MTP3'>\n"
@ -1717,8 +1715,6 @@ static const GtkActionEntry main_menu_bar_entries[] = {
{ "/Telephony/isup_msg", NULL, "_ISUP Messages", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) },
{ "/Telephony/LTE", NULL, "_LTE", NULL, NULL, NULL },
{ "/Telephony/LTE/MAC", NULL, "_MAC Stats...", NULL, NULL, G_CALLBACK(mac_lte_stat_cb) },
{ "/Telephony/LTE/RLC", NULL, "_RLC Stats...", NULL, NULL, G_CALLBACK(rlc_lte_stat_cb) },
{ "/Telephony/LTE/RLCGraph", NULL, "RLC _Graph...", NULL, NULL, G_CALLBACK(rlc_lte_graph_cb) },
{ "/Telephony/MTP3", NULL, "_MTP3", NULL, NULL, NULL },
{ "/Telephony/MTP3/MSUs", NULL, "MSUs", NULL, NULL, G_CALLBACK(mtp3_stat_gtk_cb) },
@ -3929,6 +3925,7 @@ stat_group_name(register_stat_group_t group)
{REGISTER_STAT_GROUP_RESPONSE_TIME, "/Menubar/StatisticsMenu|Statistics/ServiceResponseTimeMenu|Statistics#ServiceResponseTime"}, /* member of the service response time list */
{REGISTER_STAT_GROUP_TELEPHONY, "/Menubar/TelephonyMenu|Telephony"}, /* telephony specific */
{REGISTER_STAT_GROUP_TELEPHONY_GSM, "/Menubar/TelephonyMenu|Telephony/GSM|Telephony#GSM"}, /* GSM-specific */
{REGISTER_STAT_GROUP_TELEPHONY_LTE, "/Menubar/TelephonyMenu|Telephony/LTEmenu|Telephony#LTE"}, /* LTE-specific */
{REGISTER_TOOLS_GROUP_UNSORTED, "/Menubar/ToolsMenu|Tools"}, /* unsorted tools */
{0, NULL}
};

8
ui/gtk/rlc_lte_stat_dlg.c
View File

@ -1662,11 +1662,5 @@ static tap_param_dlg rlc_lte_stat_dlg = {
void
register_tap_listener_rlc_lte_stat(void)
{
register_param_stat(&rlc_lte_stat_dlg, "_LTE/_RLC", REGISTER_STAT_GROUP_TELEPHONY);
register_param_stat(&rlc_lte_stat_dlg, "_RLC", REGISTER_STAT_GROUP_TELEPHONY_LTE);
}
void rlc_lte_stat_cb(GtkAction *action, gpointer user_data _U_)
{
tap_param_dlg_cb(action, &rlc_lte_stat_dlg);
}

1
ui/gtk/tap_param_dlg.c
View File

@ -100,6 +100,7 @@ register_param_stat(tap_param_dlg *info, const char *name,
case REGISTER_STAT_GROUP_TELEPHONY:
case REGISTER_STAT_GROUP_TELEPHONY_GSM:
case REGISTER_STAT_GROUP_TELEPHONY_LTE:
break;
case REGISTER_TOOLS_GROUP_UNSORTED: