diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-24 20:05:12 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-24 20:05:12 +0000 |
commit | 24cda32ec77063753ee90bea6619d3ba1ae1078f (patch) | |
tree | 011cea41ebf78aeae0b4539916c274d860ff8586 /apps | |
parent | 519a3103edbcf6d1944fc84c97ddfca7d20c9a58 (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@30067 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_dial.c | 13 | ||||
-rw-r--r-- | apps/app_meetme.c | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 3bfa91165..4481910fb 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -939,20 +939,26 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags } if( privdb_val == AST_PRIVACY_DENY ) { + strcpy(status, "NOANSWER"); 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); + strcpy(status, "DONTCALL"); + 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); + strcpy(status, "TORTURE"); + 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, @@ -1310,6 +1316,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); } + strcpy(status,"NOANSWER"); if (ast_test_flag(&opts, OPT_MUSICBACK)) { ast_moh_stop(chan); } else if (ast_test_flag(&opts, OPT_RINGBACK)) { diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 129a57157..a4d82eb38 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -165,7 +165,7 @@ struct ast_conf_user { int talking; /* Is user talking */ int zapchannel; /* Is a Zaptel channel */ char usrvalue[50]; /* Custom User Value */ - char namerecloc[AST_MAX_EXTENSION]; /* Name Recorded file Location */ + char namerecloc[PATH_MAX]; /* Name Recorded file Location */ time_t jointime; /* Time the user joined the conference */ struct volume talk; struct volume listen; |