[svn-commits] murf: branch murf/CDRfix4 r127660 - in /team/murf/CDRfix4: channels/ main/ res/

[SVN commits to the Digium repositories]

Author: murf
Date: Wed Jul  2 18:40:49 2008
New Revision: 127660

URL: http://svn.digium.com/view/asterisk?view=rev&rev=127660
Log:
Cleaning up CDRfix4 before merging

Modified:
    team/murf/CDRfix4/channels/chan_dahdi.c
    team/murf/CDRfix4/channels/chan_sip.c
    team/murf/CDRfix4/main/pbx.c
    team/murf/CDRfix4/res/res_features.c

Modified: team/murf/CDRfix4/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/team/murf/CDRfix4/channels/chan_dahdi.c?view=diff&rev=127660&r1=127659&r2=127660
==============================================================================
--- team/murf/CDRfix4/channels/chan_dahdi.c (original)
+++ team/murf/CDRfix4/channels/chan_dahdi.c Wed Jul  2 18:40:49 2008
@@ -4316,15 +4316,6 @@
 							swap_subs(p, SUB_THREEWAY, SUB_REAL);
 							p->owner = p->subs[SUB_REAL].owner;
 						}
-#ifdef CDR_FIX_NOT_ANYMORE
-						if (p->subs[SUB_THREEWAY].owner->cdr) {
-							struct ast_cdr *x2 = ast_cdr_dup(p->subs[SUB_THREEWAY].owner->cdr);
-							ast_cdr_end(x2);
-							ast_cdr_detach(x2);
-							p->subs[SUB_THREEWAY].owner->cdr->start = ast_tvnow();
-							p->subs[SUB_THREEWAY].owner->cdr->answer = ast_tvnow();
-						}
-#endif
 						/* Drop the last call and stop the conference */
 						if (option_verbose > 2)
 							ast_verbose(VERBOSE_PREFIX_3 "Dropping three-way call on %s\n", p->subs[SUB_THREEWAY].owner->name);

Modified: team/murf/CDRfix4/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/murf/CDRfix4/channels/chan_sip.c?view=diff&rev=127660&r1=127659&r2=127660
==============================================================================
--- team/murf/CDRfix4/channels/chan_sip.c (original)
+++ team/murf/CDRfix4/channels/chan_sip.c Wed Jul  2 18:40:49 2008
@@ -13402,21 +13402,6 @@
 		if (peerd)
 			ast_quiet_chan(peerd);
 
-#ifdef DONT_FIX_CDRS
-		/* Fix CDRs so they're attached to the remaining channel */
-		if (peera->cdr && peerb->cdr)
-			peerb->cdr = ast_cdr_append(peerb->cdr, peera->cdr);
-		else if (peera->cdr) 
-			peerb->cdr = peera->cdr;
-		peera->cdr = NULL;
-
-		if (peerb->cdr && peerc->cdr) 
-			peerb->cdr = ast_cdr_append(peerb->cdr, peerc->cdr);
-		else if (peerc->cdr)
-			peerb->cdr = peerc->cdr;
-		peerc->cdr = NULL;
-#endif
-	
 		if (option_debug > 3)
 			ast_log(LOG_DEBUG, "SIP transfer: trying to masquerade %s into %s\n", peerc->name, peerb->name);
 		if (ast_channel_masquerade(peerb, peerc)) {

Modified: team/murf/CDRfix4/main/pbx.c
URL: http://svn.digium.com/view/asterisk/team/murf/CDRfix4/main/pbx.c?view=diff&rev=127660&r1=127659&r2=127660
==============================================================================
--- team/murf/CDRfix4/main/pbx.c (original)
+++ team/murf/CDRfix4/main/pbx.c Wed Jul  2 18:40:49 2008
@@ -5164,20 +5164,6 @@
 	if (sync) {
 		chan = __ast_request_and_dial(type, format, data, timeout, reason, cid_num, cid_name, &oh);
 		if (chan) {
-#ifdef THIS_CODE_IS_NO_LONGER_NEEDED_METHINKS
-			if (!chan->cdr) { /* check if the channel already has a cdr record, if not give it one */
-				chan->cdr = ast_cdr_alloc();   /* allocate a cdr for the channel */
-				if(!chan->cdr) {
-					/* allocation of the cdr failed */
-					free(chan->pbx);
-					res = -1;
-					goto outgoing_app_cleanup;
-				}
-				/* allocation of the cdr was successful */
-				ast_cdr_init(chan->cdr, chan);  /* initilize our channel's cdr */
-				ast_cdr_start(chan->cdr);
-			}
-#endif
 			ast_set_variables(chan, vars);
 			if (account)
 				ast_cdr_setaccount(chan, account);

Modified: team/murf/CDRfix4/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/murf/CDRfix4/res/res_features.c?view=diff&rev=127660&r1=127659&r2=127660
==============================================================================
--- team/murf/CDRfix4/res/res_features.c (original)
+++ team/murf/CDRfix4/res/res_features.c Wed Jul  2 18:40:49 2008
@@ -231,17 +231,6 @@
 	tobj->chan->data = tobj->peer->name;
 	tobj->peer->appl = "Transferred Call";
 	tobj->peer->data = tobj->chan->name;
-
-#ifdef NOMORE
-	if (tobj->chan->cdr) {
-		ast_cdr_reset(tobj->chan->cdr, NULL);
-		ast_cdr_setdestchan(tobj->chan->cdr, tobj->peer->name);
-	}
-	if (tobj->peer->cdr) {
-		ast_cdr_reset(tobj->peer->cdr, NULL);
-		ast_cdr_setdestchan(tobj->peer->cdr, tobj->chan->name);
-	}
-#endif
 
 	ast_bridge_call(tobj->peer, tobj->chan, &tobj->bconfig);
 	ast_hangup(tobj->chan);