diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-08-07 14:22:09 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-08-07 14:22:09 +0000 |
commit | 3396a4b9ec887e9938c24b218c93b59d40d992de (patch) | |
tree | 132eb8f1fdb622f4a6c7e4da8233eb2009d9467e | |
parent | f057b665aa35d29225fe8261dddfdea508275569 (diff) |
Wait for command to complete (bug #1733) and take RTP 19 as CN too...
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3590 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | asterisk.c | 8 | ||||
-rwxr-xr-x | rtp.c | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/asterisk.c b/asterisk.c index 3e39c7cbf..2f8df1279 100755 --- a/asterisk.c +++ b/asterisk.c @@ -1413,7 +1413,13 @@ static void ast_remotecontrol(char * data) #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(;;) { @@ -616,6 +616,7 @@ static struct rtpPayloadType static_RTP_PT[MAX_RTP_PT] = { [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}, |