FS-3166 --resolve

This commit is contained in:
Anthony Minessale committed 2011-04-22 16:43:29 -05:00
1 parent c22aac0eac
commit 73279f01bf
41 files changed
+125 -258

No files matched your search

+4 -5
View File
@@ -2342,7 +2342,6 @@ static void do_flush(switch_rtp_t *rtp_session)
{
int was_blocking = 0;
switch_size_t bytes;
switch_status_t status;
if (!switch_rtp_ready(rtp_session) ||
switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA) ||
@@ -2377,7 +2376,7 @@ static void do_flush(switch_rtp_t *rtp_session)
do {
if (switch_rtp_ready(rtp_session)) {
bytes = sizeof(rtp_msg_t);
status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, &bytes);
switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, &bytes);
if (bytes) {
int do_cng = 0;
@@ -3981,14 +3980,14 @@ SWITCH_DECLARE(int) switch_rtp_write_frame(switch_rtp_t *rtp_session, switch_fra
if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_UDPTL)) {
switch_size_t bytes;
char bufa[30];
const char *tx_host;
//char bufa[30];
/* Fast PASS! */
if (!switch_test_flag(frame, SFF_PROXY_PACKET) && !switch_test_flag(frame, SFF_UDPTL_PACKET)) {
return 0;
}
bytes = frame->packetlen;
tx_host = switch_get_addr(bufa, sizeof(bufa), rtp_session->remote_addr);
//tx_host = switch_get_addr(bufa, sizeof(bufa), rtp_session->remote_addr);
send_msg = frame->packet;