diff options
| -rw-r--r-- | apps/app_dial.c | 3 | ||||
| -rw-r--r-- | apps/app_queue.c | 1 | ||||
| -rw-r--r-- | channels/chan_dahdi.c | 3 | ||||
| -rw-r--r-- | channels/chan_local.c | 1 | ||||
| -rw-r--r-- | include/asterisk/channel.h | 8 | ||||
| -rw-r--r-- | main/dial.c | 1 |
6 files changed, 0 insertions, 17 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 2ca2c4a95..cff55aff5 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -823,8 +823,6 @@ static void do_forward(struct chanlist *o, ast_rtp_instance_early_bridge_make_compatible(c, in); } - c->cdrflags = in->cdrflags; - ast_channel_set_redirecting(c, apr); ast_channel_lock(c); while (ast_channel_trylock(in)) { @@ -1921,7 +1919,6 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast if (!ast_strlen_zero(chan->accountcode)) { ast_string_field_set(tc, peeraccount, chan->accountcode); } - tc->cdrflags = chan->cdrflags; if (ast_strlen_zero(tc->musicclass)) ast_string_field_set(tc, musicclass, chan->musicclass); diff --git a/apps/app_queue.c b/apps/app_queue.c index 7cd8ed0df..86a20da4f 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3312,7 +3312,6 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte ast_channel_datastore_inherit(in, o->chan); ast_string_field_set(o->chan, accountcode, in->accountcode); - o->chan->cdrflags = in->cdrflags; ast_channel_set_redirecting(o->chan, apr); diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 169760068..302fb7a7f 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -12244,9 +12244,6 @@ static struct ast_channel *dahdi_request(const char *type, format_t format, cons if (!tmp) { p->outgoing = 0; } - /* Note if the call is a call waiting call */ - if (tmp && callwait) - tmp->cdrflags |= AST_CDR_CALLWAIT; break; } #ifdef HAVE_OPENR2 diff --git a/channels/chan_local.c b/channels/chan_local.c index 80044f484..5de9ed5f3 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -615,7 +615,6 @@ start_over: ast_string_field_set(p->chan, accountcode, p->owner->accountcode); ast_string_field_set(p->chan, musicclass, p->owner->musicclass); ast_cdr_update(p->chan); - p->chan->cdrflags = p->owner->cdrflags; if (!ast_exists_extension(NULL, p->chan->context, p->chan->exten, 1, p->owner->cid.cid_num)) { ast_log(LOG_NOTICE, "No such extension/context %s@%s while calling Local channel\n", p->chan->exten, p->chan->context); diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 0d7b869c9..8c3d27f98 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -725,7 +725,6 @@ struct ast_channel { int fds[AST_MAX_FDS]; /*!< File descriptors for channel -- Drivers will poll on * these file descriptors, so at least one must be non -1. * See \arg \ref AstFileDesc */ - int cdrflags; /*!< Call Detail Record Flags */ int _softhangup; /*!< Whether or not we have been hung up... Do not set this value * directly, use ast_softhangup() */ int fdno; /*!< Which fd had an event detected on */ @@ -885,13 +884,6 @@ struct outgoing_helper { }; enum { - AST_CDR_TRANSFER = (1 << 0), - AST_CDR_FORWARD = (1 << 1), - AST_CDR_CALLWAIT = (1 << 2), - AST_CDR_CONFERENCE = (1 << 3), -}; - -enum { /*! Soft hangup by device */ AST_SOFTHANGUP_DEV = (1 << 0), /*! Soft hangup for async goto */ diff --git a/main/dial.c b/main/dial.c index cd8a7af7a..31ac899f8 100644 --- a/main/dial.c +++ b/main/dial.c @@ -284,7 +284,6 @@ static int begin_dial_channel(struct ast_dial_channel *channel, struct ast_chann ast_string_field_set(channel->owner, language, chan->language); ast_string_field_set(channel->owner, accountcode, chan->accountcode); - channel->owner->cdrflags = chan->cdrflags; if (ast_strlen_zero(channel->owner->musicclass)) ast_string_field_set(channel->owner, musicclass, chan->musicclass); |