[asterisk-commits] file: trunk r51183 - in /trunk: ./ main/rtp.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Wed Jan 17 00:37:47 2007
New Revision: 51183

URL: http://svn.digium.com/view/asterisk?view=rev&rev=51183
Log:
Merged revisions 51182 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r51182 | file | 2007-01-17 01:36:41 -0500 (Wed, 17 Jan 2007) | 2 lines

Return the correct result when directly writing out a packet so that the core doesn't then decide to handle it the regular way again. (issue #8833 reported by rcourtna)

........

Modified:
    trunk/   (props changed)
    trunk/main/rtp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?view=diff&rev=51183&r1=51182&r2=51183
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Wed Jan 17 00:37:47 2007
@@ -1116,11 +1116,11 @@
 				ast_log(LOG_DEBUG, "RTP NAT: Can't write RTP to private address %s:%d, waiting for other end to send audio...\n", ast_inet_ntoa(bridged->them.sin_addr), ntohs(bridged->them.sin_port));
 			ast_set_flag(bridged, FLAG_NAT_INACTIVE_NOWARN);
 		}
-		return -1;
+		return 0;
 	} else if (rtp_debug_test_addr(&bridged->them))
 			ast_verbose("Sent RTP P2P packet to %s:%d (type %-2.2d, len %-6.6u)\n", ast_inet_ntoa(bridged->them.sin_addr), ntohs(bridged->them.sin_port), bridged_payload, len - hdrlen);
 
-	return -1;
+	return 0;
 }
 
 struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)