[asterisk-commits] russell: trunk r41272 - /trunk/channels/chan_jingle.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Aug 29 08:55:54 2006
New Revision: 41272

URL: http://svn.digium.com/view/asterisk?rev=41272&view=rev
Log:
update to reflect recent rtp changes

Modified:
    trunk/channels/chan_jingle.c

Modified: trunk/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_jingle.c?rev=41272&r1=41271&r2=41272&view=diff
==============================================================================
--- trunk/channels/chan_jingle.c (original)
+++ trunk/channels/chan_jingle.c Tue Aug 29 08:55:54 2006
@@ -185,7 +185,7 @@
 /*----- RTP interface functions */
 static int jingle_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp,
 							   struct ast_rtp *vrtp, int codecs, int nat_active);
-static struct ast_rtp *jingle_get_rtp_peer(struct ast_channel *chan);
+static enum ast_rtp_get_result jingle_get_rtp_peer(struct ast_channel *chan, struct ast_rtp **rtp);
 static int jingle_get_codec(struct ast_channel *chan);
 
 /*! \brief PBX interface structure for channel registration */
@@ -405,18 +405,22 @@
 	return res;
 }
 
-static struct ast_rtp *jingle_get_rtp_peer(struct ast_channel *chan)
+static enum ast_rtp_get_result jingle_get_rtp_peer(struct ast_channel *chan, struct ast_rtp **rtp)
 {
 	struct jingle_pvt *p = chan->tech_pvt;
-	struct ast_rtp *rtp = NULL;
+	enum ast_rtp_get_result res = AST_RTP_GET_FAILED;
 
 	if (!p)
-		return NULL;
+		return res;
+
 	ast_mutex_lock(&p->lock);
-	if (p->rtp)
-		rtp = p->rtp;
+	if (p->rtp) {
+		*rtp = p->rtp;
+		res = AST_RTP_TRY_NATIVE;
+	}
 	ast_mutex_unlock(&p->lock);
-	return rtp;
+
+	return res;
 }
 
 static int jingle_get_codec(struct ast_channel *chan)