automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@54671 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 69b5813d3cde311dcfad3d7bcd015e3f8a726ee9..0b2409adf4a1b845f67944e3be44036e366693d6 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -728,7 +728,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct localu
        
 }
 
-static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags *peerflags)
+static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags *peerflags, int *continue_exec)
 {
        int res=-1;
        struct localuser *u;
@@ -1004,6 +1004,9 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                }
        }
 
+       if (continue_exec)
+               *continue_exec = 0;
+
        /* If a channel group has been specified, get it for use when we create peer channels */
        outbound_group = pbx_builtin_getvar_helper(chan, "OUTBOUND_GROUP");
 
@@ -1469,7 +1472,9 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                        ast_pbx_start(peer);
                        hanguptree(outgoing, NULL);
                        LOCAL_USER_REMOVE(u);
-                       return 1;
+                       if (continue_exec)
+                               *continue_exec = 1;
+                       return 0;
                }
 
                if (ast_test_flag(&opts, OPT_CALLEE_MACRO) && !ast_strlen_zero(opt_args[OPT_ARG_CALLEE_MACRO])) {
@@ -1648,12 +1653,10 @@ out:
 static int dial_exec(struct ast_channel *chan, void *data)
 {
        struct ast_flags peerflags;
-       int res = 0;
 
        memset(&peerflags, 0, sizeof(peerflags));
-       res = dial_exec_full(chan, data, &peerflags);
 
-       return (res >= 0 ? 0 : -1);
+       return dial_exec_full(chan, data, &peerflags, NULL);
 }
 
 static int retrydial_exec(struct ast_channel *chan, void *data)
@@ -1718,14 +1721,16 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
        context = pbx_builtin_getvar_helper(chan, "EXITCONTEXT");
        
        while (loops) {
+               int continue_exec;
+
                chan->data = "Retrying";
                if (ast_test_flag(chan, AST_FLAG_MOH))
                        ast_moh_stop(chan);
 
-               res = dial_exec_full(chan, dialdata, &peerflags);
-               if (res == 1) {
+               res = dial_exec_full(chan, dialdata, &peerflags, &continue_exec);
+               if (continue_exec)
                        break;
-               } else if (res == 0) {
+               if (res == 0) {
                        if (ast_test_flag(&peerflags, OPT_DTMF_EXIT)) {
                                if (!(res = ast_streamfile(chan, announce, chan->language)))
                                        res = ast_waitstream(chan, AST_DIGIT_ANY);
@@ -1761,8 +1766,7 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
                ast_moh_stop(chan);
 
        LOCAL_USER_REMOVE(u);
-       return loops ? (res >= 0 ? 0 : -1) : 0;
-
+       return loops ? res : 0;
 }
 
 int unload_module(void)