Cleaning up a small disaster I created earlier

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70607 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 7d92d6d8c50f9b4388504b162f477208547eeba3..7ecf8eef13d635119cf93676ce65ac7a36e75918 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -224,10 +224,6 @@ static char *rdescrip =
 "  The 'dialargs' are specified in the same format that arguments are provided\n"
 "to the Dial application.\n";
 
-static char *kapp = "KeepAlive";
-static char *ksynopsis = "DO NOT USE";
-static char *kdescrip = "";
-
 enum {
        OPT_ANNOUNCE =          (1 << 0),
        OPT_RESETCDR =          (1 << 1),
@@ -1934,11 +1930,6 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
        return res;
 }
 
-static int keepalive_exec(struct ast_channel *chan, void *data)
-{
-       return AST_PBX_KEEPALIVE;
-}
-
 static int unload_module(void)
 {
        int res;
@@ -1946,7 +1937,6 @@ static int unload_module(void)
 
        res = ast_unregister_application(app);
        res |= ast_unregister_application(rapp);
-       res |= ast_unregister_application(kapp);
 
        ast_module_user_hangup_all();
 
@@ -1972,7 +1962,6 @@ static int load_module(void)
 
        res = ast_register_application(app, dial_exec, synopsis, descrip);
        res |= ast_register_application(rapp, retrydial_exec, rsynopsis, rdescrip);
-       res |= ast_register_application(kapp, keepalive_exec, ksynopsis, kdescrip);
        
        return res;
 }

diff --git a/apps/app_queue.c b/apps/app_queue.c
index ac07a40182555b936c722cf9f7559f8e4c079a69..e82eed70f0385663f89aa2fa0394e37d2c4ba687 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -4717,15 +4717,6 @@ static struct ast_cli_entry cli_queue[] = {
        qrm_cmd_usage, complete_queue_remove_member, NULL },
 };
 
-static char *kapp = "KeepAlive";
-static char *ksynopsis = "DO NOT USE";
-static char *kdescrip = "";
-
-static int keepalive_exec(struct ast_channel *chan, void *data)
-{
-       return AST_PBX_KEEPALIVE;
-}
-
 static int unload_module(void)
 {
        int res;
@@ -4754,7 +4745,6 @@ static int unload_module(void)
        res |= ast_unregister_application(app_upqm);
        res |= ast_unregister_application(app_ql);
        res |= ast_unregister_application(app);
-       res |= ast_unregister_application(kapp);
        res |= ast_custom_function_unregister(&queuevar_function);
        res |= ast_custom_function_unregister(&queuemembercount_function);
        res |= ast_custom_function_unregister(&queuememberlist_function);
@@ -4782,9 +4772,9 @@ static int load_module(void)
        if (!reload_queues())
                return AST_MODULE_LOAD_DECLINE;
 
-       con = ast_context_find("app_dial_queue_virtual_context");
+       con = ast_context_find("app_queue_gosub_virtual_context");
        if (!con)
-               con = ast_context_create(NULL, "app_queue_gosub_virtual_context", "app_dial");
+               con = ast_context_create(NULL, "app_queue_gosub_virtual_context", "app_queue");
        if (!con)
                ast_log(LOG_ERROR, "Queue virtual context 'app_queue_gosub_virtual_context' does not exist and unable to create\n");
        else
@@ -4804,7 +4794,6 @@ static int load_module(void)
        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_register_application(kapp, keepalive_exec, ksynopsis, kdescrip);
        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("QueueSummary", 0, manager_queues_summary, "Queue Summary");

diff --git a/main/pbx.c b/main/pbx.c
index 74235f581db5d824d3c6cb95c44c2a2eff3b6ef9..dba568a450158c980f908388faf99a75d2ecb77e 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -250,6 +250,7 @@ static int pbx_builtin_hangup(struct ast_channel *, void *);
 static int pbx_builtin_background(struct ast_channel *, void *);
 static int pbx_builtin_wait(struct ast_channel *, void *);
 static int pbx_builtin_waitexten(struct ast_channel *, void *);
+static int pbx_builtin_keepalive(struct ast_channel *, void *);
 static int pbx_builtin_resetcdr(struct ast_channel *, void *);
 static int pbx_builtin_setamaflags(struct ast_channel *, void *);
 static int pbx_builtin_ringing(struct ast_channel *, void *);
@@ -511,6 +512,12 @@ static struct pbx_builtin {
        "               Optionally, specify the class for music on hold within parenthesis.\n"
        },
 
+       { "KeepAlive", pbx_builtin_keepalive,
+       "returns AST_PBX_KEEPALIVE value",
+       "  KeepAlive(): This application is chiefly meant for internal use with Gosubs.\n"
+       "Please do not run it alone from the dialplan!\n"
+       },
+
 };
 
 static struct ast_context *contexts;
@@ -5472,6 +5479,11 @@ static int pbx_builtin_answer(struct ast_channel *chan, void *data)
        return __ast_answer(chan, delay);
 }
 
+static int pbx_builtin_keepalive(struct ast_channel *chan, void *data)
+{
+       return AST_PBX_KEEPALIVE;
+}
+
 AST_APP_OPTIONS(resetcdr_opts, {
        AST_APP_OPTION('w', AST_CDR_FLAG_POSTED),
        AST_APP_OPTION('a', AST_CDR_FLAG_LOCKED),