[svn-commits] kaii: branch kaii/1.8-multicall r324301 - /team/kaii/1.8-multicall/apps/

[SVN commits to the Digium repositories]

Author: kaii
Date: Tue Jun 21 05:07:59 2011
New Revision: 324301

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=324301
Log:
fixed wrong memory access for OPT_CONVERGED


Modified:
    team/kaii/1.8-multicall/apps/app_dial.c

Modified: team/kaii/1.8-multicall/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/kaii/1.8-multicall/apps/app_dial.c?view=diff&rev=324301&r1=324300&r2=324301
==============================================================================
--- team/kaii/1.8-multicall/apps/app_dial.c (original)
+++ team/kaii/1.8-multicall/apps/app_dial.c Tue Jun 21 05:07:59 2011
@@ -881,7 +881,7 @@
 		const char *callback_from = NULL;
 		const char *callforward_from = NULL;
 
-		if (opt_args[OPT_CONVERGED] && (strncmp(in->name, "Local", 5) == 0)) {
+		if (ast_test_flag64(peerflags, OPT_CONVERGED) && (strncmp(in->name, "Local", 5) == 0)) {
 			callback = pbx_builtin_getvar_helper(in, "CALLBACK");
 			callback_from = pbx_builtin_getvar_helper(in, "CALLBACK_FROM");
 
@@ -1041,7 +1041,7 @@
 			ast_indicate(in, -1);
 		}
 	}
-	if (opt_args[OPT_CONVERGED]) {
+	if (ast_test_flag64(peerflags, OPT_CONVERGED)) {
 		if(outgoing && outgoing->next) {
 			struct chanlist *m;
 			for (m = outgoing; m; m = m->next) {
@@ -1293,7 +1293,7 @@
 					c = o->chan = NULL;
 					ast_clear_flag64(o, DIAL_STILLGOING);
 					handle_cause(AST_CAUSE_BUSY, &num);
-					if (opt_args[OPT_CONVERGED]) {
+					if (ast_test_flag64(peerflags, OPT_CONVERGED)) {
 						ast_verb(2, "At least one channel is busy at this time. Aborting call. (%d:%d/%d/%d)\n", numlines, num.busy, num.congestion, num.nochan);
 						strcpy(pa->status, "BUSY");
 						*to = 0;
@@ -2186,8 +2186,9 @@
 		outbound_group = ast_strdupa(outbound_group);
 	}
 	ast_channel_unlock(chan);	
+	/* KH */
 	ast_copy_flags64(peerflags, &opts, OPT_DTMF_EXIT | OPT_GO_ON | OPT_ORIGINAL_CLID | OPT_CALLER_HANGUP | OPT_IGNORE_FORWARDING | OPT_IGNORE_CONNECTEDLINE |
-			 OPT_CANCEL_TIMEOUT | OPT_ANNOUNCE | OPT_CALLEE_MACRO | OPT_CALLEE_GOSUB | OPT_FORCECLID);
+			 OPT_CANCEL_TIMEOUT | OPT_ANNOUNCE | OPT_CALLEE_MACRO | OPT_CALLEE_GOSUB | OPT_FORCECLID | OPT_CONVERGED);
 
 	/* loop through the list of dial destinations */
 	rest = args.peers;