[svn-commits] murf: trunk r64208 - in /trunk: ./ channels/chan_local.c main/cdr.c main/pbx.c

[svn-commits at lists.digium.com]

Author: murf
Date: Mon May 14 09:13:45 2007
New Revision: 64208

URL: http://svn.digium.com/view/asterisk?view=rev&rev=64208
Log:
Merged revisions 64193 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r64193 | murf | 2007-05-14 07:58:42 -0600 (Mon, 14 May 2007) | 1 line

As per 9570, worrisome CDR warnings have been removed, that are either not helpful, or not relevant.
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_local.c
    trunk/main/cdr.c
    trunk/main/pbx.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_local.c?view=diff&rev=64208&r1=64207&r2=64208
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Mon May 14 09:13:45 2007
@@ -594,10 +594,22 @@
 {
 	struct ast_channel *tmp = NULL, *tmp2 = NULL;
 	int randnum = ast_random() & 0xffff, fmt = 0;
+	const char *t;
+	int ama;
 
 	/* Allocate two new Asterisk channels */
-	if (!(tmp = ast_channel_alloc(1, state, 0, 0, "", p->exten, p->context, 0, "Local/%s@%s-%04x,1", p->exten, p->context, randnum)) 
-			|| !(tmp2 = ast_channel_alloc(1, AST_STATE_RING, 0, 0, "", p->exten, p->context, 0, "Local/%s@%s-%04x,2", p->exten, p->context, randnum))) {
+	/* safe accountcode */
+	if (p->owner && p->owner->accountcode)
+		t = p->owner->accountcode;
+	else
+		t = "";
+
+	if (p->owner)
+		ama = p->owner->amaflags;
+	else
+		ama = 0;
+	if (!(tmp = ast_channel_alloc(1, state, 0, 0, t, p->exten, p->context, ama, "Local/%s@%s-%04x,1", p->exten, p->context, randnum)) 
+			|| !(tmp2 = ast_channel_alloc(1, AST_STATE_RING, 0, 0, t, p->exten, p->context, ama, "Local/%s@%s-%04x,2", p->exten, p->context, randnum))) {
 		if (tmp)
 			ast_channel_free(tmp);
 		if (tmp2)

Modified: trunk/main/cdr.c
URL: http://svn.digium.com/view/asterisk/trunk/main/cdr.c?view=diff&rev=64208&r1=64207&r2=64208
==============================================================================
--- trunk/main/cdr.c (original)
+++ trunk/main/cdr.c Mon May 14 09:13:45 2007
@@ -426,15 +426,6 @@
 		ast_log(LOG_NOTICE, "CDR on channel '%s' already posted\n", S_OR(cdr->channel, "<unknown>"));
 }
 
-/*! \brief  print a warning if cdr already started */
-static void check_start(struct ast_cdr *cdr)
-{
-	if (!cdr)
-		return;
-	if (!ast_tvzero(cdr->start))
-		ast_log(LOG_NOTICE, "CDR on channel '%s' already started\n", S_OR(cdr->channel, "<unknown>"));
-}
-
 void ast_cdr_free(struct ast_cdr *cdr)
 {
 
@@ -634,7 +625,6 @@
 		if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
 			chan = S_OR(cdr->channel, "<unknown>");
 			check_post(cdr);
-			check_start(cdr);
 			cdr->start = ast_tvnow();
 		}
 	}

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=64208&r1=64207&r2=64208
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Mon May 14 09:13:45 2007
@@ -5018,20 +5018,6 @@
 				ast_channel_lock(chan);
 		}
 		if (chan) {
-			if (chan->cdr) { /* check if the channel already has a cdr record, if not give it one */
-				ast_log(LOG_WARNING, "%s already has a call record??\n", chan->name);
-			} else {
-				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_exten_cleanup;
-				}
-				/* allocation of the cdr was successful */
-				ast_cdr_init(chan->cdr, chan);  /* initialize our channel's cdr */
-				ast_cdr_start(chan->cdr);
-			}
 			if (chan->_state == AST_STATE_UP) {
 					res = 0;
 				if (option_verbose > 3)