[asterisk-commits] branch murf/bug_6264-1.2 - r8302 in /team/murf/bug_6264-1.2: ./ apps/app_dial.c

[asterisk-commits at lists.digium.com]

Author: murf
Date: Thu Jan 19 16:49:47 2006
New Revision: 8302

URL: http://svn.digium.com/view/asterisk?rev=8302&view=rev
Log:
committing removal of svnmerge-integrated, and the applied patches for the bug.


Modified:
    team/murf/bug_6264-1.2/   (props changed)
    team/murf/bug_6264-1.2/apps/app_dial.c

Propchange: team/murf/bug_6264-1.2/
            ('svnmerge-integrated' removed)

Modified: team/murf/bug_6264-1.2/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug_6264-1.2/apps/app_dial.c?rev=8302&r1=8301&r2=8302&view=diff
==============================================================================
--- team/murf/bug_6264-1.2/apps/app_dial.c (original)
+++ team/murf/bug_6264-1.2/apps/app_dial.c Thu Jan 19 16:49:47 2006
@@ -915,20 +915,26 @@
 		}
 		
 		if( privdb_val == AST_PRIVACY_DENY ) {
+			ast_copy_string(status, "NOANSWER", sizeof(status));
 			ast_verbose( VERBOSE_PREFIX_3  "Privacy DB reports PRIVACY_DENY for this callerid. Dial reports unavailable\n");
 			res=0;
 			goto out;
 		}
 		else if( privdb_val == AST_PRIVACY_KILL ) {
-			ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 201);
+			ast_copy_string(status, "DONTCALL", sizeof(status));
+			if (option_priority_jumping || ast_test_flag(&opts, OPT_PRIORITY_JUMP)) {
+				ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 201);
+			}
 			res = 0;
 			goto out; /* Is this right? */
 		}
 		else if( privdb_val == AST_PRIVACY_TORTURE ) {
-			ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 301);
-			res = 0;
-			goto out; /* is this right??? */
-
+			ast_copy_string(status, "TORTURE", sizeof(status));
+                        if (option_priority_jumping || ast_test_flag(&opts, OPT_PRIORITY_JUMP)) {
+				ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 301);
+			}
+				res = 0;
+				goto out; /* is this right??? */
 		}
 		else if( privdb_val == AST_PRIVACY_UNKNOWN ) {
 			/* Get the user's intro, store it in priv-callerintros/$CID, 
@@ -1284,6 +1290,8 @@
 								     opt_args[OPT_ARG_PRIVACY], privcid);
 						ast_privacy_set(opt_args[OPT_ARG_PRIVACY], privcid, AST_PRIVACY_DENY);
 					}
+					ast_copy_string(status, "NOANSWER", sizeof(status));
+
 					if (ast_test_flag(&opts, OPT_MUSICBACK)) {
 						ast_moh_stop(chan);
 					} else if (ast_test_flag(&opts, OPT_RINGBACK)) {