kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-17 23:38:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

More flagification, courtesy drumkilla (bug #3280)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4748 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-01-10 14:46:59 +00:00
parent e7cb975021
commit 92eb0c2018
13 changed files with 168 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/app_dial.c
View File

@@ -1085,21 +1085,21 @@ static int dial_exec(struct ast_channel *chan, void *data)
if (!res) {
memset(&config,0,sizeof(struct ast_bridge_config));
if (play_to_caller)
config.features_caller |= AST_FEATURE_PLAY_WARNING;
ast_set_flag(&(config.features_caller), AST_FEATURE_PLAY_WARNING);
if (play_to_callee)
config.features_callee |= AST_FEATURE_PLAY_WARNING;
ast_set_flag(&(config.features_callee), AST_FEATURE_PLAY_WARNING);
if (ast_test_flag(&peerflags, DIAL_ALLOWREDIRECT_IN))
config.features_callee |= AST_FEATURE_REDIRECT;
ast_set_flag(&(config.features_callee), AST_FEATURE_REDIRECT);
if (ast_test_flag(&peerflags, DIAL_ALLOWREDIRECT_OUT))
config.features_caller |= AST_FEATURE_REDIRECT;
ast_set_flag(&(config.features_caller), AST_FEATURE_REDIRECT);
if (ast_test_flag(&peerflags, DIAL_ALLOWDISCONNECT_IN))
config.features_callee |= AST_FEATURE_DISCONNECT;
ast_set_flag(&(config.features_callee), AST_FEATURE_DISCONNECT);
if (ast_test_flag(&peerflags, DIAL_ALLOWDISCONNECT_OUT))
config.features_caller |= AST_FEATURE_DISCONNECT;
ast_set_flag(&(config.features_caller), AST_FEATURE_DISCONNECT);
if (ast_test_flag(&peerflags, DIAL_MONITOR_IN))
config.features_callee |= AST_FEATURE_AUTOMON;
ast_set_flag(&(config.features_callee), AST_FEATURE_AUTOMON);
if (ast_test_flag(&peerflags, DIAL_MONITOR_OUT))
config.features_caller |= AST_FEATURE_AUTOMON;
ast_set_flag(&(config.features_caller), AST_FEATURE_AUTOMON);
config.timelimit = timelimit;
config.play_warning = play_warning;
config.warning_freq = warning_freq;

2
apps/app_forkcdr.c
View File

@@ -41,7 +41,7 @@ static void ast_cdr_clone(struct ast_cdr *cdr) {
gettimeofday(&newcdr->start, NULL);
memset(&newcdr->answer, 0, sizeof(newcdr->answer));
newcdr->disposition = AST_CDR_NOANSWER;
ast_cdr_add_flag(cdr,AST_CDR_FLAG_CHILD|AST_CDR_FLAG_LOCKED);
ast_set_flag(cdr, AST_CDR_FLAG_CHILD|AST_CDR_FLAG_LOCKED);
}
static void ast_cdr_fork(struct ast_channel *chan) {

8
apps/app_queue.c
View File

@@ -1543,13 +1543,13 @@ static int try_calling(struct queue_ent *qe, char *options, char *announceoverri
memset(&config,0,sizeof(struct ast_bridge_config));
if (ast_test_flag(&flags, QUEUE_FLAG_REDIR_IN))
config.features_callee |= AST_FEATURE_REDIRECT;
ast_set_flag(&(config.features_callee), AST_FEATURE_REDIRECT);
if (ast_test_flag(&flags, QUEUE_FLAG_REDIR_OUT))
config.features_caller |= AST_FEATURE_REDIRECT;
ast_set_flag(&(config.features_caller), AST_FEATURE_REDIRECT);
if (ast_test_flag(&flags, QUEUE_FLAG_DISCON_IN))
config.features_callee |= AST_FEATURE_DISCONNECT;
ast_set_flag(&(config.features_callee), AST_FEATURE_DISCONNECT);
if (ast_test_flag(&flags, QUEUE_FLAG_DISCON_OUT))
config.features_caller |= AST_FEATURE_DISCONNECT;
ast_set_flag(&(config.features_caller), AST_FEATURE_DISCONNECT);
bridge = ast_bridge_call(qe->chan,peer,&config);
if (strcasecmp(oldcontext, qe->chan->context) || strcasecmp(oldexten, qe->chan->exten)) {