[asterisk-commits] rmudgett: trunk r250565 - in /trunk: apps/ channels/ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Mar  3 13:38:06 2010
New Revision: 250565

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=250565
Log:
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.

Modified:
    trunk/apps/app_dial.c
    trunk/apps/app_queue.c
    trunk/channels/chan_dahdi.c
    trunk/channels/chan_local.c
    trunk/include/asterisk/channel.h
    trunk/main/dial.c

Modified: trunk/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_dial.c?view=diff&rev=250565&r1=250564&r2=250565
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Wed Mar  3 13:38:06 2010
@@ -822,8 +822,6 @@
 		if (single && CAN_EARLY_BRIDGE(peerflags, c, in)) {
 			ast_rtp_instance_early_bridge_make_compatible(c, in);
 		}
-
-		c->cdrflags = in->cdrflags;
 
 		ast_channel_set_redirecting(c, apr);
 		ast_channel_lock(c);
@@ -1921,7 +1919,6 @@
 		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);
 

Modified: trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_queue.c?view=diff&rev=250565&r1=250564&r2=250565
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Wed Mar  3 13:38:06 2010
@@ -3312,7 +3312,6 @@
 						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);
 

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=250565&r1=250564&r2=250565
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Wed Mar  3 13:38:06 2010
@@ -12244,9 +12244,6 @@
 			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

Modified: trunk/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_local.c?view=diff&rev=250565&r1=250564&r2=250565
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Wed Mar  3 13:38:06 2010
@@ -615,7 +615,6 @@
 	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);

Modified: trunk/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/channel.h?view=diff&rev=250565&r1=250564&r2=250565
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Wed Mar  3 13:38:06 2010
@@ -725,7 +725,6 @@
 	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 @@
 };
 
 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 */

Modified: trunk/main/dial.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/dial.c?view=diff&rev=250565&r1=250564&r2=250565
==============================================================================
--- trunk/main/dial.c (original)
+++ trunk/main/dial.c Wed Mar  3 13:38:06 2010
@@ -284,7 +284,6 @@
 
 		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);