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: https://origsvn.digium.com/svn/asterisk/trunk@250565 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 2ca2c4a95507f93aa37b131d37c264a3bbf5f0e2..cff55aff5460600f5d26ad8659a379788926ac7b 100644 (file)
--- 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 7cd8ed0df0970ae3c9b5c28a51844c375f6ce997..86a20da4f21f6adaa3b1a5fa886b855467a194c7 100644 (file)
--- 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 169760068be711bb0fe6e1abda7b4d6704c7855b..302fb7a7f9fd5e8c07232672da10dd36af03b2f6 100644 (file)
--- 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 80044f484dcfeccda15ef8a03e03055cca51304d..5de9ed5f3cae05061ad22681f2a267d7f3988d84 100644 (file)
--- 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 0d7b869c9bddd4be405378bf0c90392548a23409..8c3d27f98bfa3b452a07e02f90568f152aac595e 100644 (file)
--- 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 */
@@ -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),

diff --git a/main/dial.c b/main/dial.c
index cd8a7af7a7dc6024dbfa72e5ed39cbb693516f19..31ac899f8aecbde096a5eec515d3de0d23f23c90 100644 (file)
--- 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);