[asterisk-commits] file: trunk r50302 - in /trunk: ./ apps/app_dial.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Tue Jan  9 22:56:48 2007
New Revision: 50302

URL: http://svn.digium.com/view/asterisk?view=rev&rev=50302
Log:
Merged revisions 50298 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r50298 | file | 2007-01-09 23:55:13 -0500 (Tue, 09 Jan 2007) | 10 lines

Merged revisions 50295 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r50295 | file | 2007-01-09 23:51:06 -0500 (Tue, 09 Jan 2007) | 2 lines

Add another return value to dial_exec_full that indicates execution is going to continuing at a new extension/context/priority and to just let it slide. (issue #8598 reported by jon)

........

................

Modified:
    trunk/   (props changed)
    trunk/apps/app_dial.c

Propchange: trunk/
            ('branch-1.2-blocked' removed)

Propchange: trunk/
            ('branch-1.2-merged' removed)

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_dial.c?view=diff&rev=50302&r1=50301&r2=50302
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Tue Jan  9 22:56:48 2007
@@ -1517,7 +1517,7 @@
 			peer->priority++;
 			ast_pbx_start(peer);
 			hanguptree(outgoing, NULL);
-			res = 0;
+			res = 1;
 			goto done;
 		}
 
@@ -1692,8 +1692,12 @@
 static int dial_exec(struct ast_channel *chan, void *data)
 {
 	struct ast_flags peerflags;
+	int res = 0;
+
 	memset(&peerflags, 0, sizeof(peerflags));
-	return dial_exec_full(chan, data, &peerflags);
+	res = dial_exec_full(chan, data, &peerflags);
+
+	return (res >= 0 ? 0 : -1);
 }
 
 static int retrydial_exec(struct ast_channel *chan, void *data)
@@ -1753,7 +1757,10 @@
 		if (ast_test_flag(chan, AST_FLAG_MOH))
 			ast_moh_stop(chan);
 
-		if ((res = dial_exec_full(chan, dialdata, &peerflags)) == 0) {
+		res = dial_exec_full(chan, dialdata, &peerflags);
+		if (res == 1) {
+			break;
+		} else 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);
@@ -1786,10 +1793,13 @@
 	}
 	if (loops == 0)
 		res = 0;
-	
+	else if (res == 1)
+		res = 0;
+
 	if (ast_test_flag(chan, AST_FLAG_MOH))
 		ast_moh_stop(chan);
-done:
+
+ done:
 	ast_module_user_remove(u);
 	return res;
 }