[svn-commits] murf: branch 1.6.1 r160766 - in /branches/1.6.1: ./ funcs/func_callerid.c

[SVN commits to the Digium repositories]

Author: murf
Date: Wed Dec  3 15:40:29 2008
New Revision: 160766

URL: http://svn.digium.com/view/asterisk?view=rev&rev=160766
Log:
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.


........

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

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/funcs/func_callerid.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/funcs/func_callerid.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/funcs/func_callerid.c?view=diff&rev=160766&r1=160765&r2=160766
==============================================================================
--- branches/1.6.1/funcs/func_callerid.c (original)
+++ branches/1.6.1/funcs/func_callerid.c Wed Dec  3 15:40:29 2008
@@ -129,24 +129,36 @@
 		char name[256];
 		char num[256];
 
-		ast_callerid_split(value, name, sizeof(name), num, sizeof(num));
-		ast_set_callerid(chan, num, name, 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)) {
 			chan->cid.cid_ani2 = atoi(value);
 		} 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);
@@ -154,6 +166,8 @@
 			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;