kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Make alias->real_cmd point to the allocated space outside alias->alias.

Browse Source 
- Register the aliased cli command (or we will not alias anything).
- Use ARRAY_LEN() when possible.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@156355 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Eliel C. Sardanons
2008-11-12 20:27:40 +00:00
parent 449c012c68
commit 10da221e03
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/res_clialiases.c
View File

@@ -213,13 +213,14 @@ static void load_config(int reload)
continue; continue;
} }
alias->alias = ((char *) alias) + sizeof(*alias); alias->alias = ((char *) alias) + sizeof(*alias);
alias->real_cmd = ((char *) alias) + strlen(v1->name) + 1; alias->real_cmd = ((char *) alias->alias) + strlen(v1->name) + 1;
strcpy(alias->alias, v1->name); strcpy(alias->alias, v1->name);
strcpy(alias->real_cmd, v1->value); strcpy(alias->real_cmd, v1->value);
alias->cli_entry.handler = cli_alias_passthrough; alias->cli_entry.handler = cli_alias_passthrough;
alias->cli_entry.command = alias->alias; alias->cli_entry.command = alias->alias;
alias->cli_entry.usage = "Aliased CLI Command"; alias->cli_entry.usage = "Aliased CLI Command";
ast_cli_register(&alias->cli_entry);
ao2_link(cli_aliases, alias); ao2_link(cli_aliases, alias);
ast_verbose(VERBOSE_PREFIX_2 "Aliased CLI command '%s' to '%s'\n", v1->name, v1->value); ast_verbose(VERBOSE_PREFIX_2 "Aliased CLI command '%s' to '%s'\n", v1->name, v1->value);
ao2_ref(alias, -1); ao2_ref(alias, -1);
@@ -262,7 +263,7 @@ static int load_module(void)
load_config(0); load_config(0);
ast_cli_register_multiple(cli_alias, sizeof(cli_alias) / sizeof(struct ast_cli_entry)); ast_cli_register_multiple(cli_alias, ARRAY_LEN(cli_alias));
return AST_MODULE_LOAD_SUCCESS; return AST_MODULE_LOAD_SUCCESS;
} }