diff options
author | Gerald Combs <gerald@wireshark.org> | 2015-07-08 13:54:24 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2015-07-08 23:01:49 +0000 |
commit | e312d418831c2f1cbb256584550b2c6ff765b7bc (patch) | |
tree | 11493db07fb721036c766e02a864cfbc24e0e961 | |
parent | 5c8b92c28b08d439b080232c2c686a11a15a5f39 (diff) |
GTK+: Add a Telephony/ANSI menu placeholder.
Add REGISTER_STAT_GROUP_TELEPHONY_ANSI as well, and use it to add
recently updated stats.
Make sure we properly escape our path separators.
Change-Id: I979d5c29a82acddec1a9bcae7e3cb9c5ea3f9d33
Reviewed-on: https://code.wireshark.org/review/9564
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r-- | asn1/ansi_map/packet-ansi_map-template.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-ansi_a.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-ansi_map.c | 4 | ||||
-rw-r--r-- | epan/stat_groups.h | 1 | ||||
-rw-r--r-- | ui/gtk/main_menubar.c | 10 | ||||
-rw-r--r-- | ui/gtk/tap_param_dlg.c | 15 |
6 files changed, 30 insertions, 12 deletions
diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c index a1420ca59b..ccdb536b2a 100644 --- a/asn1/ansi_map/packet-ansi_map-template.c +++ b/asn1/ansi_map/packet-ansi_map-template.c @@ -5435,8 +5435,8 @@ void proto_register_ansi_map(void) { /* TAP STAT INFO */ static new_stat_tap_ui stat_table = { - REGISTER_STAT_GROUP_TELEPHONY, - "ANSI Map Operation Statistics", + REGISTER_STAT_GROUP_TELEPHONY_ANSI, + "Map Operation Statistics", "ansi_map", "ansi_map", ansi_map_stat_init, diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c index f402ab05de..f0c0765690 100644 --- a/epan/dissectors/packet-ansi_a.c +++ b/epan/dissectors/packet-ansi_a.c @@ -12860,8 +12860,8 @@ proto_register_ansi_a(void) gint ett_len = (NUM_INDIVIDUAL_ELEMS+MAX_NUM_DTAP_MSG+MAX_NUM_BSMAP_MSG+MAX_NUM_ELEM_1+NUM_FWD_MS_INFO_REC+NUM_REV_MS_INFO_REC) * sizeof(gint *); static new_stat_tap_ui dtap_stat_table = { - REGISTER_STAT_GROUP_TELEPHONY, - "ANSI A-I/F DTAP Statistics", + REGISTER_STAT_GROUP_TELEPHONY_ANSI, + "A-I/F DTAP Statistics", "ansi_a", "ansi_a,dtap", ansi_a_dtap_stat_init, @@ -12875,8 +12875,8 @@ proto_register_ansi_a(void) }; static new_stat_tap_ui bsmap_stat_table = { - REGISTER_STAT_GROUP_TELEPHONY, - "ANSI A-I/F BSMAP Statistics", + REGISTER_STAT_GROUP_TELEPHONY_ANSI, + "A-I/F BSMAP Statistics", "ansi_a", "ansi_a,bsmap", ansi_a_bsmap_stat_init, diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index 0547e9870d..20e0c27aed 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -19505,8 +19505,8 @@ void proto_register_ansi_map(void) { /* TAP STAT INFO */ static new_stat_tap_ui stat_table = { - REGISTER_STAT_GROUP_TELEPHONY, - "ANSI Map Operation Statistics", + REGISTER_STAT_GROUP_TELEPHONY_ANSI, + "Map Operation Statistics", "ansi_map", "ansi_map", ansi_map_stat_init, diff --git a/epan/stat_groups.h b/epan/stat_groups.h index 6f603325fc..c6fcbe2d1d 100644 --- a/epan/stat_groups.h +++ b/epan/stat_groups.h @@ -63,6 +63,7 @@ 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_ANSI, /* name says it all */ REGISTER_STAT_GROUP_TELEPHONY_GSM, /* GSM (and UMTS?) */ REGISTER_STAT_GROUP_TELEPHONY_LTE, /* name says it all */ REGISTER_STAT_GROUP_TELEPHONY_SCTP, /* name says it all */ diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index b6caa9f6ef..81c3cfb59a 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -1075,6 +1075,8 @@ static const char *ui_desc_menubar = " <separator/>\n" " </menu>\n" " <menu name= 'TelephonyMenu' action='/Telephony'>\n" +" <menu name= 'ANSImenu' action='/Telephony/ANSI'>\n" +" </menu>\n" " <menu name= 'GSM' action='/Telephony/GSM'>\n" " <menuitem name='BSSMAP' action='/Telephony/GSM/BSSMAP'/>\n" " <menu name='GSM-DTAP' action='/Telephony/GSM/DTAP'>\n" @@ -1510,6 +1512,7 @@ static const GtkActionEntry main_menu_bar_entries[] = { { "/Statistics/IOGraphs", WIRESHARK_STOCK_GRAPHS, "_IO Graph", NULL, NULL, G_CALLBACK(gui_iostat_cb) }, { "/Statistics/plen", NULL, "Packet Lengths...", NULL, NULL, G_CALLBACK(gtk_stats_tree_cb) }, + { "/Telephony/ANSI", NULL, "_ANSI", NULL, NULL, NULL }, { "/Telephony/GSM", NULL, "_GSM", NULL, NULL, NULL }, { "/Telephony/GSM/BSSMAP", NULL, "A-Interface BSSMAP", NULL, NULL, G_CALLBACK(gsm_a_stat_gtk_bssmap_cb) }, @@ -3563,9 +3566,10 @@ stat_group_name(register_stat_group_t group) {REGISTER_STAT_GROUP_ENDPOINT_LIST, "/Menubar/StatisticsMenu|Statistics/EndpointListMenu|Statistics#EndpointList"}, /* member of the endpoint list */ {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_STAT_GROUP_TELEPHONY_SCTP, "/Menubar/TelephonyMenu|Telephony/SCTPmenu|Telephony#SCTP"}, /* SCTP-specific */ + {REGISTER_STAT_GROUP_TELEPHONY_ANSI, "/Menubar/TelephonyMenu|Telephony/ANSI|Telephony#ANSI"}, /* ANSI-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_STAT_GROUP_TELEPHONY_SCTP, "/Menubar/TelephonyMenu|Telephony/SCTPmenu|Telephony#SCTP"}, /* SCTP-specific */ {REGISTER_TOOLS_GROUP_UNSORTED, "/Menubar/ToolsMenu|Tools"}, /* unsorted tools */ {0, NULL} }; diff --git a/ui/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c index cdb6a3bf08..baf2661902 100644 --- a/ui/gtk/tap_param_dlg.c +++ b/ui/gtk/tap_param_dlg.c @@ -62,15 +62,27 @@ void register_param_stat(tap_param_dlg *info, const char *name, register_stat_group_t group) { + gchar *action_name; gchar *full_name; const gchar *stock_id = NULL; stat_tap_ui ui_info; + size_t i; + /* XXX We appear to leak memory here. */ /* * This menu item will pop up a dialog box, so append "..." * to it. */ full_name = g_strdup_printf("%s...", name); + /* + * Escape path separators for add_menu_item_to_main_menubar. + */ + action_name = g_strdup(name); + for (i = 0; i < strlen(action_name); i++) { + if (action_name[i] == '/') { + action_name[i] = '#'; + } + } ui_info.group = group; ui_info.title = full_name; @@ -101,6 +113,7 @@ register_param_stat(tap_param_dlg *info, const char *name, break; case REGISTER_STAT_GROUP_TELEPHONY: + case REGISTER_STAT_GROUP_TELEPHONY_ANSI: case REGISTER_STAT_GROUP_TELEPHONY_GSM: case REGISTER_STAT_GROUP_TELEPHONY_LTE: case REGISTER_STAT_GROUP_TELEPHONY_SCTP: @@ -112,7 +125,7 @@ register_param_stat(tap_param_dlg *info, const char *name, register_menu_bar_menu_items( stat_group_name(group), /* GUI path to the place holder in the menu */ - name, /* Action name */ + action_name, /* Action name */ stock_id, /* Stock id */ full_name, /* label */ NULL, /* Accelerator */ |