kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-21 20:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@30067 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-05-24 20:05:12 +00:00
parent b30db14404
commit a71ff914c6
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/app_dial.c
View File

@@ -939,20 +939,26 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
} }
if( privdb_val == AST_PRIVACY_DENY ) { 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"); ast_verbose( VERBOSE_PREFIX_3 "Privacy DB reports PRIVACY_DENY for this callerid. Dial reports unavailable\n");
res=0; res=0;
goto out; goto out;
} }
else if( privdb_val == AST_PRIVACY_KILL ) { else if( privdb_val == AST_PRIVACY_KILL ) {
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); ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 201);
}
res = 0; res = 0;
goto out; /* Is this right? */ goto out; /* Is this right? */
} }
else if( privdb_val == AST_PRIVACY_TORTURE ) { else if( privdb_val == AST_PRIVACY_TORTURE ) {
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); ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 301);
}
res = 0; res = 0;
goto out; /* is this right??? */ goto out; /* is this right??? */
} }
else if( privdb_val == AST_PRIVACY_UNKNOWN ) { else if( privdb_val == AST_PRIVACY_UNKNOWN ) {
/* Get the user's intro, store it in priv-callerintros/$CID, /* 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); opt_args[OPT_ARG_PRIVACY], privcid);
ast_privacy_set(opt_args[OPT_ARG_PRIVACY], privcid, AST_PRIVACY_DENY); ast_privacy_set(opt_args[OPT_ARG_PRIVACY], privcid, AST_PRIVACY_DENY);
} }
strcpy(status,"NOANSWER");
if (ast_test_flag(&opts, OPT_MUSICBACK)) { if (ast_test_flag(&opts, OPT_MUSICBACK)) {
ast_moh_stop(chan); ast_moh_stop(chan);
} else if (ast_test_flag(&opts, OPT_RINGBACK)) { } else if (ast_test_flag(&opts, OPT_RINGBACK)) {

2
apps/app_meetme.c
View File

@@ -165,7 +165,7 @@ struct ast_conf_user {
int talking; /* Is user talking */ int talking; /* Is user talking */
int zapchannel; /* Is a Zaptel channel */ int zapchannel; /* Is a Zaptel channel */
char usrvalue[50]; /* Custom User Value */ 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 */ time_t jointime; /* Time the user joined the conference */
struct volume talk; struct volume talk;
struct volume listen; struct volume listen;

2
logger.c
View File

@@ -384,6 +384,7 @@ int reload_logger(int rotate)
FILE *myf; FILE *myf;
int x, res = 0; int x, res = 0;
ast_mutex_lock(&msglist_lock); /* to avoid deadlock */
ast_mutex_lock(&loglock); ast_mutex_lock(&loglock);
if (eventlog) if (eventlog)
fclose(eventlog); fclose(eventlog);
@@ -490,6 +491,7 @@ int reload_logger(int rotate)
} }
} }
ast_mutex_unlock(&loglock); ast_mutex_unlock(&loglock);
ast_mutex_unlock(&msglist_lock);
return res; return res;
} }