[Asterisk-cvs] asterisk asterisk.c,1.113,1.114 rtp.c,1.83,1.84

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory localhost.localdomain:/tmp/cvs-serv32128

Modified Files:
	asterisk.c rtp.c 
Log Message:
Wait for command to complete (bug #1733) and take RTP 19 as CN too...


Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- asterisk.c	5 Aug 2004 21:22:56 -0000	1.113
+++ asterisk.c	7 Aug 2004 14:22:09 -0000	1.114
@@ -1413,7 +1413,13 @@
 #endif	
 	if (option_exec && data) {  /* hack to print output then exit if asterisk -rx is used */
 		char tempchar;
-		ast_el_read_char(el, &tempchar);
+		struct pollfd fds[0];
+		fds[0].fd = ast_consock;
+		fds[0].events = POLLIN;
+		fds[0].revents = 0;
+		while(poll(fds, 1, 100) > 0) {
+			ast_el_read_char(el, &tempchar);
+		}
 		return;
 	}
 	for(;;) {

Index: rtp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/rtp.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- rtp.c	31 Jul 2004 23:02:55 -0000	1.83
+++ rtp.c	7 Aug 2004 14:22:09 -0000	1.84
@@ -616,6 +616,7 @@
   [16] = {1, AST_FORMAT_ADPCM}, /* 11.025 kHz */
   [17] = {1, AST_FORMAT_ADPCM}, /* 22.050 kHz */
   [18] = {1, AST_FORMAT_G729A},
+  [19] = {0, AST_RTP_CN},		/* Also used for CN */
   [26] = {1, AST_FORMAT_JPEG},
   [31] = {1, AST_FORMAT_H261},
   [34] = {1, AST_FORMAT_H263},