dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Removed cdrflags from ast_channel structure. 

Only chan_dahdi set a value in cdrflags.  Everyone else just copied it
around the system.  Noone cared about any value it may have contained.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@250565 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
rmudgett 2010-03-03 19:38:06 +00:00
parent de908247c7
commit 869624a523
6 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/app_dial.c
View File

@ -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);

1
apps/app_queue.c
View File

@ -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);

3
channels/chan_dahdi.c
View File

@ -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

1
channels/chan_local.c
View File

@ -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);

8
include/asterisk/channel.h
View File

@ -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 */
@ -884,13 +883,6 @@ struct outgoing_helper {
struct ast_channel *parent_channel;
};
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),

1
main/dial.c
View File

@ -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);