From 2e1c1e23c2c98ae90c3eba495bae6f809cbc9671 Mon Sep 17 00:00:00 2001
From: murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Wed, 3 Dec 2008 21:23:23 +0000
Subject: Merged revisions 160760 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

................
r160760 | murf | 2008-12-03 14:09:15 -0700 (Wed, 03 Dec 2008) | 23 lines

Merged revisions 160703 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r160703 | murf | 2008-12-03 13:41:42 -0700 (Wed, 03 Dec 2008) | 11 lines

(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.

I also notice that in trunk, the num/number of 1.4 is
left out; I decided to include the option to use
either in trunk, so as not to have 1.4 upgraders
not to have problems.


........

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


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@160761 f38db490-d61c-443f-a65b-d21fe96a405b
---
 funcs/func_callerid.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'funcs')

diff --git a/funcs/func_callerid.c b/funcs/func_callerid.c
index 9dfe0d8c7..af0ba1748 100644
--- a/funcs/func_callerid.c
+++ b/funcs/func_callerid.c
@@ -124,29 +124,43 @@ static int callerid_write(struct ast_channel *chan, const char *cmd, char *data,
 		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);
-	} else if (!strncasecmp("num", data, 3)) { 
+		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)) {
 		if (!strncasecmp(data + 3, "2", 1)) {
 			int i = atoi(value);
 			chan->cid.cid_ani2 = i;
 		} else
 			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)
 			ast_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)
 			ast_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 if (!strncasecmp("pres", data, 4)) {
 		int i;
-- 
cgit v1.2.3