diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-10 05:18:26 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-10 05:18:26 +0000 |
| commit | a6c0a8e6eac6cb7b63c57b08c8cfc5c943722df3 (patch) | |
| tree | 3fddefc90fa88ec4c202425e29e32bbea743ae34 /main | |
| parent | 12ed3782802cb4a44d421e334bc9a7fc4f6e46c8 (diff) | |
Finished up a previous fix to overcome a compiler warning; the app NoCDR() has been updated to mark the channel CDR as POST_DISABLED instead of destroying the CDR; this way its flags are propagated thru a bridge and the CDR is actually dropped. The cases where only one channel in a bridge has a CDR was cleaned up.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@61136 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/cdr.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/main/cdr.c b/main/cdr.c index f6a90c035..18f878d75 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -88,7 +88,7 @@ static pthread_t cdr_thread = AST_PTHREADT_NULL; #define BATCH_SCHEDULER_ONLY_DEFAULT 0 #define BATCH_SAFE_SHUTDOWN_DEFAULT 1 -static int enabled; +static int enabled; /*! Is the CDR subsystem enabled ? */ static int batchmode; static int batchsize; static int batchtime; @@ -596,6 +596,17 @@ void ast_cdr_merge(struct ast_cdr *to, struct ast_cdr *from) } /* flags, varsead, ? */ cdr_merge_vars(from, to); + + if (ast_test_flag(from, AST_CDR_FLAG_KEEP_VARS)) + ast_set_flag(to, AST_CDR_FLAG_KEEP_VARS); + if (ast_test_flag(from, AST_CDR_FLAG_POSTED)) + ast_set_flag(to, AST_CDR_FLAG_POSTED); + if (ast_test_flag(from, AST_CDR_FLAG_LOCKED)) + ast_set_flag(to, AST_CDR_FLAG_LOCKED); + if (ast_test_flag(from, AST_CDR_FLAG_CHILD)) + ast_set_flag(to, AST_CDR_FLAG_CHILD); + if (ast_test_flag(from, AST_CDR_FLAG_POST_DISABLED)) + ast_set_flag(to, AST_CDR_FLAG_POST_DISABLED); } void ast_cdr_start(struct ast_cdr *cdr) |