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

- 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

diff --git a/res/res_clialiases.c b/res/res_clialiases.c
index 1da4ea4f63eb938630f749be3fe53b2654ca4e61..a20947bb19af44884b63b2dd342447cdc17870ac 100644 (file)
--- a/res/res_clialiases.c
+++ b/res/res_clialiases.c
@@ -213,13 +213,14 @@ static void load_config(int reload)
                                continue;
                        }
                        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->real_cmd, v1->value);
                        alias->cli_entry.handler = cli_alias_passthrough;
                        alias->cli_entry.command = alias->alias;
                        alias->cli_entry.usage = "Aliased CLI Command";
 
+                       ast_cli_register(&alias->cli_entry);
                        ao2_link(cli_aliases, alias);
                        ast_verbose(VERBOSE_PREFIX_2 "Aliased CLI command '%s' to '%s'\n", v1->name, v1->value);
                        ao2_ref(alias, -1);
@@ -262,7 +263,7 @@ static int load_module(void)
 
        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;
 }