[asterisk-commits] murf: branch 1.4 r160703 - /branches/1.4/funcs/func_callerid.c

[SVN commits to the Asterisk project]

Author: murf
Date: Wed Dec  3 14:41:42 2008
New Revision: 160703

URL: http://svn.digium.com/view/asterisk?view=rev&rev=160703
Log:
(closes issue #13597)
Reported by: john8675309
Patches:
      patch.13597 uploaded by murf (license 17)
Tested by: murf, john8675309

This patch causes the setcid func to update the CDR
clid after setting the channel field.



Modified:
    branches/1.4/funcs/func_callerid.c

Modified: branches/1.4/funcs/func_callerid.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/funcs/func_callerid.c?view=diff&rev=160703&r1=160702&r2=160703
==============================================================================
--- branches/1.4/funcs/func_callerid.c (original)
+++ branches/1.4/funcs/func_callerid.c Wed Dec  3 14:41:42 2008
@@ -121,26 +121,39 @@
 		char name[256];
 		char num[256];
 
-		if (!ast_callerid_split(value, name, sizeof(name), num, sizeof(num)))
+		if (!ast_callerid_split(value, name, sizeof(name), num, sizeof(num))) {
 			ast_set_callerid(chan, num, name, num);
+			if (chan->cdr)
+				ast_cdr_setcid(chan->cdr, chan);
+		}
 	} else if (!strncasecmp("name", data, 4)) {
 		ast_set_callerid(chan, NULL, value, NULL);
+		if (chan->cdr)
+			ast_cdr_setcid(chan->cdr, chan);
 	} else if (!strncasecmp("num", data, 3) ||
 		   !strncasecmp("number", data, 6)) {
 		ast_set_callerid(chan, value, NULL, NULL);
+		if (chan->cdr)
+			ast_cdr_setcid(chan->cdr, chan);
 	} else if (!strncasecmp("ani", data, 3)) {
 		ast_set_callerid(chan, NULL, NULL, value);
+		if (chan->cdr)
+			ast_cdr_setcid(chan->cdr, chan);
 	} else if (!strncasecmp("dnid", data, 4)) {
 		ast_channel_lock(chan);
 		if (chan->cid.cid_dnid)
 			free(chan->cid.cid_dnid);
 		chan->cid.cid_dnid = ast_strdup(value);
+		if (chan->cdr)
+			ast_cdr_setcid(chan->cdr, chan);
 		ast_channel_unlock(chan);
 	} else if (!strncasecmp("rdnis", data, 5)) {
 		ast_channel_lock(chan);
 		if (chan->cid.cid_rdnis)
 			free(chan->cid.cid_rdnis);
 		chan->cid.cid_rdnis = ast_strdup(value);
+		if (chan->cdr)
+			ast_cdr_setcid(chan->cdr, chan);
 		ast_channel_unlock(chan);
 	} else {
 		ast_log(LOG_ERROR, "Unknown callerid data type '%s'.\n", data);