[Asterisk-cvs] asterisk/channels chan_h323.c,1.94,1.95

[jeremy at lists.digium.com]

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

Modified Files:
	chan_h323.c 
Log Message:
Properly deal with Caller*ID, document the new RTP Payload setting, remove compiler option that may confuse g++ and force chan_h323.so to be relinked on every compile

Index: chan_h323.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_h323.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- chan_h323.c	15 Dec 2004 23:24:13 -0000	1.94
+++ chan_h323.c	16 Dec 2004 02:03:19 -0000	1.95
@@ -131,9 +131,9 @@
 	char exten[AST_MAX_EXTENSION];				/* Requested extension */
 	char context[AST_MAX_EXTENSION];			/* Context where to start */
 	char accountcode[256];					/* Account code */
-	char cid_num[256];					/* Caller*id number, if available */
-	char cid_name[256];					/* Caller*id name, if available */
-	char rdnis[256];					/* Referring DNIS, if available */
+	char cid_num[80];					/* Caller*id number, if available */
+	char cid_name[80];					/* Caller*id name, if available */
+	char rdnis[80];						/* Referring DNIS, if available */
 	int amaflags;						/* AMA Flags */
 	struct ast_rtp *rtp;					/* RTP Session */
 	int dtmfmode;						/* What DTMF Mode is being used */
@@ -499,7 +499,15 @@
         } else {
                 ast_inet_ntoa(addr, sizeof(addr), pvt->sa.sin_addr);
                 pvt->options.port = htons(pvt->sa.sin_port);
-	}       
+	}
+
+	if (c->cid.cid_num) {
+		strncpy(pvt->options.cid_num, c->cid.cid_num, sizeof(pvt->options.cid_num));
+	}
+	if (c->cid.cid_name) {
+		strncpy(pvt->options.cid_name, c->cid.cid_name, sizeof(pvt->options.cid_name));
+	}
+
 	/* indicate that this is an outgoing call */
 	pvt->outgoing = 1;