[asterisk-commits] file: branch 1.4 r50032 - /branches/1.4/main/rtp.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Mon Jan  8 12:21:31 2007
New Revision: 50032

URL: http://svn.digium.com/view/asterisk?view=rev&rev=50032
Log:
Disable the more intense packet2packet bridging until the bugs can be worked out.

Modified:
    branches/1.4/main/rtp.c

Modified: branches/1.4/main/rtp.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/rtp.c?view=diff&rev=50032&r1=50031&r2=50032
==============================================================================
--- branches/1.4/main/rtp.c (original)
+++ branches/1.4/main/rtp.c Mon Jan  8 12:21:31 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.
@@ -2879,6 +2882,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;
@@ -2936,6 +2940,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 *fds, int **iod)