app_originate: Set ORIGINATE_STATUS correctly on failure

We were ignoring the return value from ast_pbx_outgoing_exten() and
ast_pbx_outgoing_app() which could fail before setting the reason code.
This resulted in failures being reported as success.

ASTERISK-25266 #close
Reported by: Allen Ford

Change-Id: Idf16237b7e41b527d2c69c865829128686beeb3b

diff --git a/apps/app_originate.c b/apps/app_originate.c
index 88245f0a6e1ea19af7cc66021374035a24037bec..6093f30fda6024007b92d3d7b79029f1ab39c4f9 100644 (file)
--- a/apps/app_originate.c
+++ b/apps/app_originate.c
@@ -110,6 +110,7 @@ static int originate_exec(struct ast_channel *chan, const char *data)
        char *parse;
        char *chantech, *chandata;
        int res = -1;
+       int continue_in_dialplan = 0;
        int outgoing_status = 0;
        unsigned int timeout = 30;
        static const char default_exten[] = "s";
@@ -159,6 +160,12 @@ static int originate_exec(struct ast_channel *chan, const char *data)
                goto return_cleanup;
        }
 
+       if (strcasecmp(args.type, "exten") && strcasecmp(args.type, "app")) {
+               ast_log(LOG_ERROR, "Incorrect type, it should be 'exten' or 'app': %s\n",
+                               args.type);
+               goto return_cleanup;
+       }
+
        if (!strcasecmp(args.type, "exten")) {
                int priority = 1; /* Initialized in case priority not specified */
                const char *exten = args.arg2;
@@ -177,23 +184,30 @@ static int originate_exec(struct ast_channel *chan, const char *data)
                ast_debug(1, "Originating call to '%s/%s' and connecting them to extension %s,%s,%d\n",
                                chantech, chandata, args.arg1, exten, priority);
 
-               ast_pbx_outgoing_exten(chantech, cap_slin, chandata,
+               res = ast_pbx_outgoing_exten(chantech, cap_slin, chandata,
                                timeout * 1000, args.arg1, exten, priority, &outgoing_status,
                                AST_OUTGOING_WAIT, NULL, NULL, NULL, NULL, NULL, 0, NULL);
-       } else if (!strcasecmp(args.type, "app")) {
+       } else {
                ast_debug(1, "Originating call to '%s/%s' and connecting them to %s(%s)\n",
                                chantech, chandata, args.arg1, S_OR(args.arg2, ""));
 
-               ast_pbx_outgoing_app(chantech, cap_slin, chandata,
+               res = ast_pbx_outgoing_app(chantech, cap_slin, chandata,
                                timeout * 1000, args.arg1, args.arg2, &outgoing_status,
                                AST_OUTGOING_WAIT, NULL, NULL, NULL, NULL, NULL, NULL);
-       } else {
-               ast_log(LOG_ERROR, "Incorrect type, it should be 'exten' or 'app': %s\n",
-                               args.type);
-               goto return_cleanup;
        }
 
-       res = 0;
+       /*
+        * Getting here means that we have passed the various validation checks and
+        * have at least attempted the dial. If we have a reason (outgoing_status),
+        * we clear our error indicator so that we ultimately report the right thing
+        * to the caller.
+        */
+       if (res && outgoing_status) {
+               res = 0;
+       }
+
+       /* We need to exit cleanly if we've gotten this far */
+       continue_in_dialplan = 1;
 
 return_cleanup:
        if (res) {
@@ -226,7 +240,7 @@ return_cleanup:
        ao2_cleanup(cap_slin);
        ast_autoservice_stop(chan);
 
-       return res;
+       return continue_in_dialplan ? 0 : -1;
 }
 
 static int unload_module(void)