[asterisk-commits] file: trunk r58241 - in /trunk: ./ channels/chan_sip.c main/rtp.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Wed Mar  7 11:55:11 2007
New Revision: 58241

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

........
r58240 | file | 2007-03-07 12:52:58 -0500 (Wed, 07 Mar 2007) | 2 lines

Ensure we have (or should have) at least one matching codec before attempting early bridge SDP seeding. (issue #9221 reported by marcelbarbulescu)

........

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

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

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=58241&r1=58240&r2=58241
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Mar  7 11:55:11 2007
@@ -17830,7 +17830,7 @@
 static int sip_get_codec(struct ast_channel *chan)
 {
 	struct sip_pvt *p = chan->tech_pvt;
-	return p->peercapability;	
+	return p->peercapability ? p->peercapability : p->capability;	
 }
 
 /*! \brief Send a poke to all known peers 

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?view=diff&rev=58241&r1=58240&r2=58241
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Wed Mar  7 11:55:11 2007
@@ -1537,7 +1537,7 @@
 	struct ast_rtp_protocol *destpr = NULL, *srcpr = NULL;
 	enum ast_rtp_get_result audio_dest_res = AST_RTP_GET_FAILED, video_dest_res = AST_RTP_GET_FAILED, text_dest_res = AST_RTP_GET_FAILED;
 	enum ast_rtp_get_result audio_src_res = AST_RTP_GET_FAILED, video_src_res = AST_RTP_GET_FAILED, text_src_res = AST_RTP_GET_FAILED;
-	int srccodec, nat_active = 0;
+	int srccodec, destcodec, nat_active = 0;
 
 	/* Lock channels */
 	ast_channel_lock(c0);
@@ -1592,6 +1592,17 @@
 		srccodec = srcpr->get_codec(c1);
 	else
 		srccodec = 0;
+	if (audio_dest_res == AST_RTP_TRY_NATIVE && destpr->get_codec)
+		destcodec = destpr->get_codec(c0);
+	else
+		destcodec = 0;
+	/* Ensure we have at least one matching codec */
+	if (!(srccodec & destcodec)) {
+		ast_channel_unlock(c0);
+		if (c1)
+			ast_channel_unlock(c1);
+		return 0;
+	}
 	/* Consider empty media as non-existant */
 	if (audio_src_res == AST_RTP_TRY_NATIVE && !srcp->them.sin_addr.s_addr)
 		srcp = NULL;