From 5aacb6a82d4cf625774fa1ea39ca193a3be73b35 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Mon, 18 Sep 2006 19:54:18 +0000 Subject: merge qwell's CLI verbification work git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43212 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_meetme.c | 59 ++++++++++------------------- apps/app_mixmonitor.c | 17 ++++----- apps/app_osplookup.c | 15 ++++---- apps/app_playback.c | 8 ++-- apps/app_queue.c | 103 +++++++++++++++++++++++++++++--------------------- apps/app_realtime.c | 34 ++++++++--------- apps/app_rpt.c | 61 +++++++++++++----------------- apps/app_voicemail.c | 46 ++++++++++++---------- 8 files changed, 171 insertions(+), 172 deletions(-) (limited to 'apps') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 4fc0206ed..4f3ee3051 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -661,13 +661,6 @@ static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin return cnf; } -static int confs_show(int fd, int argc, char **argv) -{ - ast_cli(fd, "Deprecated! Please use 'meetme' instead.\n"); - - return RESULT_SUCCESS; -} - /*! \brief CLI command for showing SLAs */ static int sla_show(int fd, int argc, char *argv[]) { @@ -693,23 +686,7 @@ static int sla_show(int fd, int argc, char *argv[]) return RESULT_SUCCESS; } -static char show_confs_usage[] = -"Deprecated! Please use 'meetme' instead.\n"; - -static struct ast_cli_entry cli_show_confs = { - { "show", "conferences", NULL }, confs_show, - "Show status of conferences", show_confs_usage, NULL }; - - -static char sla_show_usage[] = -"Usage: sla show\n" -" Lists status of all shared line appearances\n"; - -static struct ast_cli_entry cli_sla_show = { - { "sla", "show", NULL }, sla_show, - "Show status of Shared Line Appearances", sla_show_usage, NULL }; - -static int conf_cmd(int fd, int argc, char **argv) +static int meetme_cmd(int fd, int argc, char **argv) { /* Process the command */ struct ast_conference *cnf; @@ -853,7 +830,7 @@ static int conf_cmd(int fd, int argc, char **argv) return 0; } -static char *complete_confcmd(const char *line, const char *word, int pos, int state) +static char *complete_meetmecmd(const char *line, const char *word, int pos, int state) { static char *cmds[] = {"lock", "unlock", "mute", "unmute", "kick", "list", NULL}; @@ -915,13 +892,23 @@ static char *complete_confcmd(const char *line, const char *word, int pos, int s return NULL; } -static char conf_usage[] = -"Usage: meetme (un)lock|(un)mute|kick|list [concise] \n" +static char meetme_usage[] = +"Usage: meetme (un)lock|(un)mute|kick|list [concise] \n" " Executes a command for the conference or on a conferee\n"; -static struct ast_cli_entry cli_conf = { - {"meetme", NULL, NULL }, conf_cmd, - "Execute a command on a conference or conferee", conf_usage, complete_confcmd}; +static char sla_show_usage[] = +"Usage: sla show\n" +" Lists status of all shared line appearances\n"; + +static struct ast_cli_entry cli_meetme[] = { + { { "sla", "show", NULL }, + sla_show, "Show status of Shared Line Appearances", + sla_show_usage, NULL }, + + { { "meetme", NULL, NULL }, + meetme_cmd, "Execute a command on a conference or conferee", + meetme_usage, complete_meetmecmd }, +}; static void conf_flush(int fd, struct ast_channel *chan) { @@ -3072,10 +3059,8 @@ static int unload_module(void) { int res = 0; - res |= ast_cli_unregister(&cli_show_confs); - res |= ast_cli_unregister(&cli_sla_show); - res |= ast_cli_unregister(&cli_conf); - res |= ast_manager_unregister("MeetmeMute"); + ast_cli_unregister_multiple(cli_meetme, sizeof(cli_meetme) / sizeof(struct ast_cli_entry)); + res = ast_manager_unregister("MeetmeMute"); res |= ast_manager_unregister("MeetmeUnmute"); res |= ast_unregister_application(app3); res |= ast_unregister_application(app2); @@ -3095,10 +3080,8 @@ static int load_module(void) int res; ASTOBJ_CONTAINER_INIT(&slas); - res = ast_cli_register(&cli_show_confs); - res |= ast_cli_register(&cli_sla_show); - res |= ast_cli_register(&cli_conf); - res |= ast_manager_register("MeetmeMute", EVENT_FLAG_CALL, action_meetmemute, "Mute a Meetme user"); + ast_cli_register_multiple(cli_meetme, sizeof(cli_meetme) / sizeof(struct ast_cli_entry)); + res = ast_manager_register("MeetmeMute", EVENT_FLAG_CALL, action_meetmemute, "Mute a Meetme user"); res |= ast_manager_register("MeetmeUnmute", EVENT_FLAG_CALL, action_meetmeunmute, "Unmute a Meetme user"); res |= ast_register_application(app3, admin_exec, synopsis3, descrip3); res |= ast_register_application(app2, count_exec, synopsis2, descrip2); diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index 5038776a3..1530920b1 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -421,22 +421,21 @@ static char *complete_mixmonitor_cli(const char *line, const char *word, int pos return ast_complete_channels(line, word, pos, state, 2); } -static struct ast_cli_entry cli_mixmonitor = { - { "mixmonitor", NULL, NULL }, - mixmonitor_cli, - "Execute a MixMonitor command.", +static struct ast_cli_entry cli_mixmonitor[] = { + { { "mixmonitor", NULL, NULL }, + mixmonitor_cli, "Execute a MixMonitor command.", "mixmonitor [args]\n\n" "The optional arguments are passed to the\n" "MixMonitor application when the 'start' command is used.\n", - complete_mixmonitor_cli + complete_mixmonitor_cli }, }; static int unload_module(void) { int res; - res = ast_cli_unregister(&cli_mixmonitor); - res |= ast_unregister_application(stop_app); + ast_cli_unregister_multiple(cli_mixmonitor, sizeof(cli_mixmonitor) / sizeof(struct ast_cli_entry)); + res = ast_unregister_application(stop_app); res |= ast_unregister_application(app); ast_module_user_hangup_all(); @@ -448,8 +447,8 @@ static int load_module(void) { int res; - res = ast_cli_register(&cli_mixmonitor); - res |= ast_register_application(app, mixmonitor_exec, synopsis, desc); + ast_cli_register_multiple(cli_mixmonitor, sizeof(cli_mixmonitor) / sizeof(struct ast_cli_entry)); + res = ast_register_application(app, mixmonitor_exec, synopsis, desc); res |= ast_register_application(stop_app, stop_mixmonitor_exec, stop_synopsis, stop_desc); return res; diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c index e5fcf9a51..f4f7d8cc6 100644 --- a/apps/app_osplookup.c +++ b/apps/app_osplookup.c @@ -1596,11 +1596,10 @@ static const char osp_usage[] = "Usage: osp show\n" " Displays information on Open Settlement Protocol support\n"; -static struct ast_cli_entry osp_cli = { - {"osp", "show", NULL}, - osp_show, - "Displays OSP information", - osp_usage +static struct ast_cli_entry cli_osp[] = { + { { "osp", "show", NULL}, + osp_show, "Displays OSP information", + osp_usage }, }; static int load_module(void) @@ -1610,8 +1609,8 @@ static int load_module(void) if(!osp_load()) return AST_MODULE_LOAD_DECLINE; - res = ast_cli_register(&osp_cli); - res |= ast_register_application(app1, ospauth_exec, synopsis1, descrip1); + ast_cli_register_multiple(cli_osp, sizeof(cli_osp) / sizeof(struct ast_cli_entry)); + res = ast_register_application(app1, ospauth_exec, synopsis1, descrip1); res |= ast_register_application(app2, osplookup_exec, synopsis2, descrip2); res |= ast_register_application(app3, ospnext_exec, synopsis3, descrip3); res |= ast_register_application(app4, ospfinished_exec, synopsis4, descrip4); @@ -1627,7 +1626,7 @@ static int unload_module(void) res |= ast_unregister_application(app3); res |= ast_unregister_application(app2); res |= ast_unregister_application(app1); - res |= ast_cli_unregister(&osp_cli); + ast_cli_unregister_multiple(cli_osp, sizeof(cli_osp) / sizeof(struct ast_cli_entry)); osp_unload(); ast_module_user_hangup_all(); diff --git a/apps/app_playback.c b/apps/app_playback.c index f3788c351..87b06b02e 100644 --- a/apps/app_playback.c +++ b/apps/app_playback.c @@ -371,8 +371,10 @@ static int __say_init(int fd, int argc, char *argv[]) return RESULT_SUCCESS; } -static struct ast_cli_entry myclis[] = { - { { "say", "load", NULL }, __say_init, "set/show the say mode", "say load new|old" }, +static struct ast_cli_entry cli_playback[] = { + { { "say", "load", NULL }, + __say_init, "set/show the say mode", + "say load new|old" }, }; static int playback_exec(struct ast_channel *chan, void *data) @@ -478,7 +480,7 @@ static int unload_module(void) static int load_module(void) { reload(); - ast_cli_register_multiple(myclis, sizeof(myclis)/sizeof(struct ast_cli_entry)); + ast_cli_register_multiple(cli_playback, sizeof(cli_playback) / sizeof(struct ast_cli_entry)); return ast_register_application(app, playback_exec, synopsis, descrip); } diff --git a/apps/app_queue.c b/apps/app_queue.c index 579f80951..4726257f4 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3941,7 +3941,7 @@ static int __queues_show(struct mansession *s, int manager, int fd, int argc, ch return RESULT_SUCCESS; } -static int queues_show(int fd, int argc, char **argv) +static int queue_list(int fd, int argc, char **argv) { return __queues_show(NULL, 0, fd, argc, argv, 0); } @@ -3975,7 +3975,7 @@ static char *complete_queue(const char *line, const char *word, int pos, int sta */ static int manager_queues_show( struct mansession *s, struct message *m ) { - char *a[] = { "show", "queues" }; + char *a[] = { "queue", "list" }; __queues_show(s, 1, -1, 2, a, 0); astman_append(s, "\r\n\r\n"); /* Properly terminate Manager output */ @@ -4175,7 +4175,7 @@ static int manager_pause_queue_member(struct mansession *s, struct message *m) return 0; } -static int handle_add_queue_member(int fd, int argc, char *argv[]) +static int handle_queue_add_member(int fd, int argc, char *argv[]) { char *queuename, *interface; int penalty; @@ -4222,9 +4222,9 @@ static int handle_add_queue_member(int fd, int argc, char *argv[]) } } -static char *complete_add_queue_member(const char *line, const char *word, int pos, int state) +static char *complete_queue_add_member(const char *line, const char *word, int pos, int state) { - /* 0 - add; 1 - queue; 2 - member; 3 - ; 4 - to; 5 - ; 6 - penalty; 7 - */ + /* 0 - queue; 1 - add; 2 - member; 3 - ; 4 - to; 5 - ; 6 - penalty; 7 - */ switch (pos) { case 3: /* Don't attempt to complete name of member (infinite possibilities) */ return NULL; @@ -4249,7 +4249,7 @@ static char *complete_add_queue_member(const char *line, const char *word, int p } } -static int handle_remove_queue_member(int fd, int argc, char *argv[]) +static int handle_queue_remove_member(int fd, int argc, char *argv[]) { char *queuename, *interface; @@ -4280,13 +4280,13 @@ static int handle_remove_queue_member(int fd, int argc, char *argv[]) } } -static char *complete_remove_queue_member(const char *line, const char *word, int pos, int state) +static char *complete_queue_remove_member(const char *line, const char *word, int pos, int state) { int which = 0; struct call_queue *q; struct member *m; - /* 0 - add; 1 - queue; 2 - member; 3 - ; 4 - from; 5 - */ + /* 0 - queue; 1 - remove; 2 - member; 3 - ; 4 - from; 5 - */ if (pos > 5 || pos < 3) return NULL; if (pos == 4) /* only one possible match, 'from' */ @@ -4312,44 +4312,64 @@ static char *complete_remove_queue_member(const char *line, const char *word, in return NULL; } -static char show_queues_usage[] = -"Usage: show queues\n" +static char queue_list_usage[] = +"Usage: queue list\n" " Provides summary information on call queues.\n"; -static struct ast_cli_entry cli_show_queues = { - { "show", "queues", NULL }, queues_show, - "Show status of queues", show_queues_usage, NULL }; - -static char show_queue_usage[] = -"Usage: show queue\n" +static char queue_show_usage[] = +"Usage: queue show\n" " Provides summary information on a specified queue.\n"; -static struct ast_cli_entry cli_show_queue = { - { "show", "queue", NULL }, queue_show, - "Show status of a specified queue", show_queue_usage, complete_queue }; +static char qam_cmd_usage[] = +"Usage: queue add member to [penalty ]\n"; + +static char qrm_cmd_usage[] = +"Usage: queue remove member from \n"; + +static struct ast_cli_entry cli_show_queues_deprecated = { + { "show", "queues", NULL }, + queue_list, NULL, + NULL, NULL }; + +static struct ast_cli_entry cli_show_queue_deprecated = { + { "show", "queue", NULL }, + queue_show, NULL, + NULL, complete_queue }; + +static struct ast_cli_entry cli_add_queue_member_deprecated = { + { "add", "queue", "member", NULL }, + handle_queue_add_member, NULL, + NULL, complete_queue_add_member }; -static char aqm_cmd_usage[] = -"Usage: add queue member to [penalty ]\n"; +static struct ast_cli_entry cli_remove_queue_member_deprecated = { + { "remove", "queue", "member", NULL }, + handle_queue_remove_member, NULL, + NULL, complete_queue_remove_member }; -static struct ast_cli_entry cli_add_queue_member = { - { "add", "queue", "member", NULL }, handle_add_queue_member, - "Add a channel to a specified queue", aqm_cmd_usage, complete_add_queue_member }; +static struct ast_cli_entry cli_queue[] = { + { { "queue", "list", NULL }, + queue_list, "Show status of queues", + queue_list_usage, NULL, &cli_show_queues_deprecated }, -static char rqm_cmd_usage[] = -"Usage: remove queue member from \n"; + { { "queue", "show", NULL }, + queue_show, "Show status of a specified queue", + queue_show_usage, complete_queue, &cli_show_queue_deprecated }, -static struct ast_cli_entry cli_remove_queue_member = { - { "remove", "queue", "member", NULL }, handle_remove_queue_member, - "Removes a channel from a specified queue", rqm_cmd_usage, complete_remove_queue_member }; + { { "queue", "add", "member", NULL }, + handle_queue_add_member, "Add a channel to a specified queue", + qam_cmd_usage, complete_queue_add_member, &cli_add_queue_member_deprecated }, + + { { "queue", "remove", "member", NULL }, + handle_queue_remove_member, "Removes a channel from a specified queue", + qrm_cmd_usage, complete_queue_remove_member, &cli_remove_queue_member_deprecated }, +}; static int unload_module(void) { int res; - res = ast_cli_unregister(&cli_show_queue); - res |= ast_cli_unregister(&cli_show_queues); - res |= ast_cli_unregister(&cli_add_queue_member); - res |= ast_cli_unregister(&cli_remove_queue_member); + ast_cli_unregister_multiple(cli_queue, sizeof(cli_queue) / sizeof(struct ast_cli_entry)); + res = ast_manager_unregister("QueueStatus"); res |= ast_manager_unregister("Queues"); res |= ast_manager_unregister("QueueStatus"); res |= ast_manager_unregister("QueueAdd"); @@ -4360,11 +4380,11 @@ static int unload_module(void) res |= ast_unregister_application(app_pqm); res |= ast_unregister_application(app_upqm); res |= ast_unregister_application(app_ql); + res |= ast_unregister_application(app); res |= ast_custom_function_unregister(&queueagentcount_function); res |= ast_custom_function_unregister(&queuemembercount_function); res |= ast_custom_function_unregister(&queuememberlist_function); res |= ast_custom_function_unregister(&queuewaitingcount_function); - res |= ast_unregister_application(app); ast_module_user_hangup_all(); @@ -4380,21 +4400,18 @@ static int load_module(void) return AST_MODULE_LOAD_DECLINE; if (queue_persistent_members) reload_queue_members(); + ast_cli_register_multiple(cli_queue, sizeof(cli_queue) / sizeof(struct ast_cli_entry)); res = ast_register_application(app, queue_exec, synopsis, descrip); - res |= ast_cli_register(&cli_show_queue); - res |= ast_cli_register(&cli_show_queues); - res |= ast_cli_register(&cli_add_queue_member); - res |= ast_cli_register(&cli_remove_queue_member); - res |= ast_manager_register("Queues", 0, manager_queues_show, "Queues"); - res |= ast_manager_register("QueueStatus", 0, manager_queues_status, "Queue Status"); - res |= ast_manager_register("QueueAdd", EVENT_FLAG_AGENT, manager_add_queue_member, "Add interface to queue."); - res |= ast_manager_register("QueueRemove", EVENT_FLAG_AGENT, manager_remove_queue_member, "Remove interface from queue."); - res |= ast_manager_register("QueuePause", EVENT_FLAG_AGENT, manager_pause_queue_member, "Makes a queue member temporarily unavailable"); res |= ast_register_application(app_aqm, aqm_exec, app_aqm_synopsis, app_aqm_descrip); res |= ast_register_application(app_rqm, rqm_exec, app_rqm_synopsis, app_rqm_descrip); res |= ast_register_application(app_pqm, pqm_exec, app_pqm_synopsis, app_pqm_descrip); res |= ast_register_application(app_upqm, upqm_exec, app_upqm_synopsis, app_upqm_descrip); res |= ast_register_application(app_ql, ql_exec, app_ql_synopsis, app_ql_descrip); + res |= ast_manager_register("Queues", 0, manager_queues_show, "Queues"); + res |= ast_manager_register("QueueStatus", 0, manager_queues_status, "Queue Status"); + res |= ast_manager_register("QueueAdd", EVENT_FLAG_AGENT, manager_add_queue_member, "Add interface to queue."); + res |= ast_manager_register("QueueRemove", EVENT_FLAG_AGENT, manager_remove_queue_member, "Remove interface from queue."); + res |= ast_manager_register("QueuePause", EVENT_FLAG_AGENT, manager_pause_queue_member, "Makes a queue member temporarily unavailable"); res |= ast_custom_function_register(&queueagentcount_function); res |= ast_custom_function_register(&queuemembercount_function); res |= ast_custom_function_register(&queuememberlist_function); diff --git a/apps/app_realtime.c b/apps/app_realtime.c index cc7ad7dd4..48e1dca5b 100644 --- a/apps/app_realtime.c +++ b/apps/app_realtime.c @@ -69,7 +69,7 @@ static char *udesc = "Use the RealTime config handler system to update a value\n "updated or -1 if an error occurs.\n"; -static int cli_load_realtime(int fd, int argc, char **argv) +static int cli_realtime_load(int fd, int argc, char **argv) { char *header_format = "%30s %-30s\n"; struct ast_variable *var=NULL; @@ -94,7 +94,7 @@ static int cli_load_realtime(int fd, int argc, char **argv) return RESULT_SUCCESS; } -static int cli_update_realtime(int fd, int argc, char **argv) { +static int cli_realtime_update(int fd, int argc, char **argv) { int res = 0; if(argc<7) { @@ -115,21 +115,23 @@ static int cli_update_realtime(int fd, int argc, char **argv) { return RESULT_SUCCESS; } -static char cli_load_realtime_usage[] = +static char cli_realtime_load_usage[] = "Usage: realtime load \n" " Prints out a list of variables using the RealTime driver.\n"; -static struct ast_cli_entry cli_load_realtime_cmd = { - { "realtime", "load", NULL, NULL }, cli_load_realtime, - "Used to print out RealTime variables.", cli_load_realtime_usage, NULL }; - -static char cli_update_realtime_usage[] = +static char cli_realtime_update_usage[] = "Usage: realtime update \n" " Update a single variable using the RealTime driver.\n"; -static struct ast_cli_entry cli_update_realtime_cmd = { - { "realtime", "update", NULL, NULL }, cli_update_realtime, - "Used to update RealTime variables.", cli_update_realtime_usage, NULL }; +static struct ast_cli_entry cli_realtime[] = { + { { "realtime", "load", NULL, NULL }, + cli_realtime_load, "Used to print out RealTime variables.", + cli_realtime_load_usage, NULL }, + + { { "realtime", "update", NULL, NULL }, + cli_realtime_update, "Used to update RealTime variables.", + cli_realtime_update_usage, NULL }, +}; static int realtime_update_exec(struct ast_channel *chan, void *data) { @@ -236,9 +238,8 @@ static int unload_module(void) { int res; - res = ast_cli_unregister(&cli_load_realtime_cmd); - res |= ast_cli_unregister(&cli_update_realtime_cmd); - res |= ast_unregister_application(uapp); + ast_cli_unregister_multiple(cli_realtime, sizeof(cli_realtime) / sizeof(struct ast_cli_entry)); + res = ast_unregister_application(uapp); res |= ast_unregister_application(app); ast_module_user_hangup_all(); @@ -250,9 +251,8 @@ static int load_module(void) { int res; - res = ast_cli_register(&cli_load_realtime_cmd); - res |= ast_cli_register(&cli_update_realtime_cmd); - res |= ast_register_application(uapp, realtime_update_exec, usynopsis, udesc); + ast_cli_register_multiple(cli_realtime, sizeof(cli_realtime) / sizeof(struct ast_cli_entry)); + res = ast_register_application(uapp, realtime_update_exec, usynopsis, udesc); res |= ast_register_application(app, realtime_exec, synopsis, desc); return res; diff --git a/apps/app_rpt.c b/apps/app_rpt.c index 858525a58..d9895320e 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -726,29 +726,30 @@ static char restart_usage[] = "Usage: rpt restart\n" " Restarts app_rpt\n"; -static struct ast_cli_entry cli_debug = - { { "rpt", "debug", "level" }, rpt_do_debug, - "Enable app_rpt debugging", debug_usage }; - -static struct ast_cli_entry cli_dump = - { { "rpt", "dump" }, rpt_do_dump, - "Dump app_rpt structs for debugging", dump_usage }; - -static struct ast_cli_entry cli_stats = - { { "rpt", "stats" }, rpt_do_stats, - "Dump node statistics", dump_stats }; - -static struct ast_cli_entry cli_lstats = - { { "rpt", "lstats" }, rpt_do_lstats, - "Dump link statistics", dump_lstats }; - -static struct ast_cli_entry cli_reload = - { { "rpt", "reload" }, rpt_do_reload, - "Reload app_rpt config", reload_usage }; - -static struct ast_cli_entry cli_restart = - { { "rpt", "restart" }, rpt_do_restart, - "Restart app_rpt", restart_usage }; +static struct ast_cli_entry cli_rpt[] = { + { { "rpt", "debug", "level" }, + rpt_do_debug, "Enable app_rpt debugging", + debug_usage }, + + { { "rpt", "dump" }, + rpt_do_dump, "Dump app_rpt structs for debugging", + dump_usage }, + + { { "rpt", "stats" }, + rpt_do_stats, "Dump node statistics", + dump_stats }, + { { "rpt", "lstats" }, + rpt_do_lstats, "Dump link statistics", + dump_lstats }, + + { { "rpt", "reload" }, + rpt_do_reload, "Reload app_rpt config", + reload_usage }, + + { { "rpt", "restart" }, + rpt_do_restart, "Restart app_rpt", + restart_usage }, +}; /* * Telemetry defaults @@ -8018,12 +8019,7 @@ static int unload_module(void) i = ast_unregister_application(app); /* Unregister cli extensions */ - ast_cli_unregister(&cli_debug); - ast_cli_unregister(&cli_dump); - ast_cli_unregister(&cli_stats); - ast_cli_unregister(&cli_lstats); - ast_cli_unregister(&cli_reload); - ast_cli_unregister(&cli_restart); + ast_cli_unregister_multiple(cli_rpt, sizeof(cli_rpt) / sizeof(struct ast_cli_entry)); return i; } @@ -8038,12 +8034,7 @@ static int load_module(void) ast_pthread_create(&rpt_master_thread,NULL,rpt_master,cfg); /* Register cli extensions */ - ast_cli_register(&cli_debug); - ast_cli_register(&cli_dump); - ast_cli_register(&cli_stats); - ast_cli_register(&cli_lstats); - ast_cli_register(&cli_reload); - ast_cli_register(&cli_restart); + ast_cli_register_multiple(cli_rpt, sizeof(cli_rpt) / sizeof(struct ast_cli_entry)); return ast_register_application(app, rpt_exec, synopsis, descrip); } diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 70ebc9f1d..f0c9d985f 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -6710,15 +6710,15 @@ static int vmauthenticate(struct ast_channel *chan, void *data) return res; } -static char show_voicemail_users_help[] = -"Usage: show voicemail users [for ]\n" +static char voicemail_show_users_help[] = +"Usage: voicemail list users [for ]\n" " Lists all mailboxes currently set up\n"; -static char show_voicemail_zones_help[] = -"Usage: show voicemail zones\n" +static char voicemail_show_zones_help[] = +"Usage: voicemail list zones\n" " Lists zone message formats\n"; -static int handle_show_voicemail_users(int fd, int argc, char *argv[]) +static int handle_voicemail_show_users(int fd, int argc, char *argv[]) { struct ast_vm_user *vmu; char *output_format = "%-10s %-5s %-25s %-10s %6s\n"; @@ -6773,7 +6773,7 @@ static int handle_show_voicemail_users(int fd, int argc, char *argv[]) return RESULT_SUCCESS; } -static int handle_show_voicemail_zones(int fd, int argc, char *argv[]) +static int handle_voicemail_show_zones(int fd, int argc, char *argv[]) { struct vm_zone *zone; char *output_format = "%-15s %-20s %-45s\n"; @@ -6797,7 +6797,7 @@ static int handle_show_voicemail_zones(int fd, int argc, char *argv[]) return res; } -static char *complete_show_voicemail_users(const char *line, const char *word, int pos, int state) +static char *complete_voicemail_show_users(const char *line, const char *word, int pos, int state) { int which = 0; int wordlen; @@ -6821,15 +6821,25 @@ static char *complete_show_voicemail_users(const char *line, const char *word, i return NULL; } -static struct ast_cli_entry show_voicemail_users_cli = - { { "show", "voicemail", "users", NULL }, - handle_show_voicemail_users, "List defined voicemail boxes", - show_voicemail_users_help, complete_show_voicemail_users }; +static struct ast_cli_entry cli_show_voicemail_users_deprecated = { + { "show", "voicemail", "users", NULL }, + handle_voicemail_show_users, NULL, + NULL, complete_voicemail_show_users }; -static struct ast_cli_entry show_voicemail_zones_cli = - { { "show", "voicemail", "zones", NULL }, - handle_show_voicemail_zones, "List zone message formats", - show_voicemail_zones_help, NULL }; +static struct ast_cli_entry cli_show_voicemail_zones_deprecated = { + { "show", "voicemail", "zones", NULL }, + handle_voicemail_show_zones, NULL, + NULL, NULL }; + +static struct ast_cli_entry cli_voicemail[] = { + { { "voicemail", "list", "users", NULL }, + handle_voicemail_show_users, "List defined voicemail boxes", + voicemail_show_users_help, complete_voicemail_show_users, &cli_show_voicemail_users_deprecated }, + + { { "voicemail", "list", "zones", NULL }, + handle_voicemail_show_zones, "List zone message formats", + voicemail_show_zones_help, NULL, &cli_show_voicemail_zones_deprecated }, +}; static int load_config(void) { @@ -7359,8 +7369,7 @@ static int unload_module(void) res |= ast_unregister_application(app2); res |= ast_unregister_application(app3); res |= ast_unregister_application(app4); - res |= ast_cli_unregister(&show_voicemail_users_cli); - res |= ast_cli_unregister(&show_voicemail_zones_cli); + ast_cli_unregister_multiple(cli_voicemail, sizeof(cli_voicemail) / sizeof(struct ast_cli_entry)); ast_uninstall_vm_functions(); ast_module_user_hangup_all(); @@ -7382,8 +7391,7 @@ static int load_module(void) return(res); } - ast_cli_register(&show_voicemail_users_cli); - ast_cli_register(&show_voicemail_zones_cli); + ast_cli_register_multiple(cli_voicemail, sizeof(cli_voicemail) / sizeof(struct ast_cli_entry)); /* compute the location of the voicemail spool directory */ snprintf(VM_SPOOL_DIR, sizeof(VM_SPOOL_DIR), "%s/voicemail/", ast_config_AST_SPOOL_DIR); -- cgit v1.2.3