[svn-commits] file: trunk r50033 - in /trunk: ./ main/rtp.c

[svn-commits at lists.digium.com]

Author: file
Date: Mon Jan  8 12:23:39 2007
New Revision: 50033

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

........
r50032 | file | 2007-01-08 13:21:31 -0500 (Mon, 08 Jan 2007) | 2 lines

Disable the more intense packet2packet bridging until the bugs can be worked out.

........

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=50033&r1=50032&r2=50033
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Mon Jan  8 12:23:39 2007
@@ -89,6 +89,9 @@
 #ifdef SO_NO_CHECK
 static int nochecksums;
 #endif
+
+/* Uncomment this to enable more intense native bridging, but note: this is currently buggy */
+/* #define P2P_INTENSE */
 
 /*!
  * \brief Structure representing a RTP session.
@@ -2947,6 +2950,7 @@
 }
 
 /*! \brief P2P RTP Callback */
+#ifdef P2P_INTENSE
 static int p2p_rtp_callback(int *id, int fd, short events, void *cbdata)
 {
 	int res = 0, hdrlen = 12;
@@ -3003,6 +3007,12 @@
 
 	return 1;
 }
+#else
+static int p2p_callback_enable(struct ast_channel *chan, struct ast_rtp *rtp, int *fds, int **iod)
+{
+	return 0;
+}
+#endif
 
 /*! \brief Helper function to switch a channel and RTP stream out of callback mode */
 static int p2p_callback_disable(struct ast_channel *chan, struct ast_rtp *rtp, int **iod)