[Asterisk-cvs] asterisk/channels chan_h323.c,1.96,1.97

[jeremy at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv15326

Modified Files:
	chan_h323.c 
Log Message:
Fix incoming caller*id. Bug #3077

Index: chan_h323.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_h323.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- chan_h323.c	16 Dec 2004 04:25:49 -0000	1.96
+++ chan_h323.c	18 Dec 2004 04:09:39 -0000	1.97
@@ -807,9 +807,13 @@
 		}
 		if (!ast_strlen_zero(pvt->cid_num)) {
 			ch->cid.cid_num = strdup(pvt->cid_num);
+		} else if (!ast_strlen_zero(pvt->cd.call_source_e164)) {
+			ch->cid.cid_num = strdup(pvt->cd.call_source_e164);
 		}
 		if (!ast_strlen_zero(pvt->cid_name)) {
 			ch->cid.cid_name = strdup(pvt->cid_name);
+		} else if (!ast_strlen_zero(pvt->cd.call_source_name)) {
+			ch->cid.cid_name = strdup(pvt->cd.call_source_name);
 		}
 		if (!ast_strlen_zero(pvt->rdnis)) {
 			ch->cid.cid_rdnis = strdup(pvt->rdnis);