diff options
| author | Matthew Jordan <mjordan@digium.com> | 2015-01-27 17:16:54 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2015-01-27 17:16:54 +0000 |
| commit | aa8fd7d1b9dcbcc207cbcc333df850b3e8e0be54 (patch) | |
| tree | 4d0989c451c08b79e5302b1e7adba9f8f55b8d58 /apps/confbridge/conf_config_parser.c | |
| parent | 2504f97b01fa0fa1dfbfa9f8d9fd80e3a5376fe9 (diff) | |
app_confbridge: Restore user's menu name to CLI output of 'confbridge list'
When issuing a 'confbridge list XXXX' CLI command, the resulting output no
longer displays the menu associated with a ConfBridge participant.
The issue was caused by ASTERISK-22760. When that patch was done, it removed
the copying of the menu name associated with the user from the actual user
profile.
This patch fixes the issue by copying the menu name over to the user profile
when the menu hooks are applied to the user. Since that function now does a
little bit more than just apply the hooks, the name of the function has been
changed to cover the copying of the menu name over as well.
In addition, there is a disparity between the menu name length as it is stored
on the conf_menu structure and the confbridge_user structure; this patch makes
the lengths match so that a strcpy can be used.
Review: https://reviewboard.asterisk.org/r/4372/
ASTERISK-24723 #close
Reported by: Steve Pitts
........
Merged revisions 431134 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@431136 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/confbridge/conf_config_parser.c')
| -rw-r--r-- | apps/confbridge/conf_config_parser.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c index ffb24a53c..41cc6c5c4 100644 --- a/apps/confbridge/conf_config_parser.c +++ b/apps/confbridge/conf_config_parser.c @@ -2312,7 +2312,7 @@ int conf_find_menu_entry_by_sequence(const char *dtmf_sequence, struct conf_menu return 0; } -static int apply_menu_hooks(struct confbridge_user *user, struct conf_menu *menu) +static int apply_menu_to_user(struct confbridge_user *user, struct conf_menu *menu) { struct conf_menu_entry *menu_entry; @@ -2336,6 +2336,7 @@ static int apply_menu_hooks(struct confbridge_user *user, struct conf_menu *menu menu_hook_destroy(pvt); } } + strcpy(user->menu_name, menu->name); /* Safe */ return 0; } @@ -2357,7 +2358,7 @@ int conf_set_menu_to_user(struct ast_channel *chan, struct confbridge_user *user b_data = datastore->data; if (b_data->m_usable) { menu = ao2_bump(b_data->menu); - return apply_menu_hooks(user, menu); + return apply_menu_to_user(user, menu); } } } @@ -2375,7 +2376,7 @@ int conf_set_menu_to_user(struct ast_channel *chan, struct confbridge_user *user return -1; } - return apply_menu_hooks(user, menu); + return apply_menu_to_user(user, menu); } void conf_destroy_config(void) |