diff options
| author | Hadriel Kaplan <hadrielk@yahoo.com> | 2014-02-07 14:23:41 -0500 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-02-08 11:29:32 +0000 |
| commit | 991bd3d7e10966e429bebd71bd7433f61e320482 (patch) | |
| tree | 8740b0c2a4299b6b9efe6b9e8863cc604636c80a /epan/wslua/wslua_gui.c | |
| parent | 8d7b6001bb62c823b814b91ee858ff1ee48bad99 (diff) | |
Fix bug 9732: ' Lua: recent commit changed some MENU_ key names in init.lua'
A recent fix (made by me) for bug 9707, in Change-Id:
If4ee1906aa60dd37366cf2ef9bc4168e0ea024b6, made the perl regex grab too much
of the menu name. It changed MENU_STAT_CONVERSATION, MENU_STAT_RESPONSE, and
MENU_ANALYZE_CONVERSATION's key names into their longer C-code names. Ugh.
The fix for this is a bit brittle, but I think it's impractical to avoid it
being brittle, due to needing to support legacy Lua scripts. I put comments
in stat_menu.h to warn of the danger.
Change-Id: I41408e9d4f5b5bd73e2871fccabff81c7cbd242d
Reviewed-on: https://code.wireshark.org/review/140
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/wslua/wslua_gui.c')
| -rw-r--r-- | epan/wslua/wslua_gui.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/epan/wslua/wslua_gui.c b/epan/wslua/wslua_gui.c index 2d7ed2b286..fc421caec7 100644 --- a/epan/wslua/wslua_gui.c +++ b/epan/wslua/wslua_gui.c @@ -84,7 +84,11 @@ WSLUA_FUNCTION wslua_register_menu(lua_State* L) { /* Register a menu item in o MENU_STAT_CONVERSATION (Statistics/Conversation List), MENU_STAT_ENDPOINT (Statistics/Endpoint List), MENU_STAT_RESPONSE (Statistics/Service Response Time), - MENU_STAT_TELEPHONY (Telephony), MENU_ANALYZE (Analyze), + MENU_STAT_TELEPHONY (Telephony), + MENU_STAT_TELEPHONY_GSM (Telephony/GSM), + MENU_STAT_TELEPHONY_LTE (Telephony/LTE), + MENU_STAT_TELEPHONY_SCTP (Telephony/SCTP), + MENU_ANALYZE (Analyze), MENU_ANALYZE_CONVERSATION (Analyze/Conversation Filter), MENU_TOOLS_UNSORTED (Tools). (number) */ |