[asterisk-commits] murf: trunk r62741 - in /trunk: ./ main/cdr.c main/pbx.c

[asterisk-commits at lists.digium.com]

Author: murf
Date: Wed May  2 15:57:55 2007
New Revision: 62741

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

................
r62738 | murf | 2007-05-02 14:46:07 -0600 (Wed, 02 May 2007) | 9 lines

Merged revisions 62737 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r62737 | murf | 2007-05-02 14:10:32 -0600 (Wed, 02 May 2007) | 1 line

Some tweaks to satisfy CDR bug 8796, where being in 'h' extension louses up the dst field
........

................

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

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

Modified: trunk/main/cdr.c
URL: http://svn.digium.com/view/asterisk/trunk/main/cdr.c?view=diff&rev=62741&r1=62740&r2=62741
==============================================================================
--- trunk/main/cdr.c (original)
+++ trunk/main/cdr.c Wed May  2 15:57:55 2007
@@ -884,9 +884,11 @@
 
 			/* Copy account code et-al */	
 			ast_copy_string(cdr->accountcode, c->accountcode, sizeof(cdr->accountcode));
-			/* Destination information */ /* XXX privilege macro* ? */
-			ast_copy_string(cdr->dst, S_OR(c->macroexten, c->exten), sizeof(cdr->dst));
-			ast_copy_string(cdr->dcontext, S_OR(c->macrocontext, c->context), sizeof(cdr->dcontext));
+			if (!ast_check_hangup(c)) {
+				/* Destination information */ /* XXX privilege macro* ? */
+				ast_copy_string(cdr->dst, S_OR(c->macroexten, c->exten), sizeof(cdr->dst));
+				ast_copy_string(cdr->dcontext, S_OR(c->macrocontext, c->context), sizeof(cdr->dcontext));
+			}
 		}
 	}
 

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=62741&r1=62740&r2=62741
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Wed May  2 15:57:55 2007
@@ -515,7 +515,7 @@
 	const char *saved_c_appl;
 	const char *saved_c_data;
 
-	if (c->cdr && !(c->exten[0] == 'h' && c->exten[1] == 0) )
+	if (c->cdr &&  !ast_check_hangup(c))
 		ast_cdr_setapp(c->cdr, app->name, data);
 
 	/* save channel values */