Merge branch for bug 6264 (Privacy option 2 returns dial-status ANSWER / option_prior...
authorJoshua Colp <jcolp@digium.com>
Wed, 24 May 2006 20:00:10 +0000 (20:00 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 24 May 2006 20:00:10 +0000 (20:00 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30040 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_dial.c

index 5c2aec5..421c7cf 100644 (file)
@@ -959,21 +959,27 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                }
                
                if(privdb_val == AST_PRIVACY_DENY ) {
+                       ast_copy_string(status, "NOANSWER", sizeof(status));
                        if (option_verbose > 2)
                                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 (ast_opt_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);
+                       ast_copy_string(status, "TORTURE", sizeof(status));
+                       if (ast_opt_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, 
@@ -1000,6 +1006,8 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                                ast_play_and_record(chan, "priv-recordintro", privintro, 4, "gsm", &duration, 128, 2000, 0);  /* NOTE: I've reduced the total time to 4 sec */
                                                                                /* don't think we'll need a lock removed, we took care of
                                                                                   conflicts by naming the privintro file */
+                               if( !ast_streamfile(chan, "vm-dialout", chan->language) )
+                                       ast_waitstream(chan, "");
                        }
                }
        }
@@ -1312,6 +1320,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                                                             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));
                                ast_hangup(peer); /* hang up on the callee -- he didn't want to talk anyway! */
                                res=0;
                                goto out;