[svn-commits] mjordan: trunk r383008 - /trunk/res/res_rtp_asterisk.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Wed Mar 13 09:39:54 2013
New Revision: 383008

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=383008
Log:
Always set the RTP instance data in the RTP engine

Not informing the RTP engine of the instance data creates shrapnel.

Modified:
    trunk/res/res_rtp_asterisk.c

Modified: trunk/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_rtp_asterisk.c?view=diff&rev=383008&r1=383007&r2=383008
==============================================================================
--- trunk/res/res_rtp_asterisk.c (original)
+++ trunk/res/res_rtp_asterisk.c Wed Mar 13 09:39:54 2013
@@ -1791,9 +1791,9 @@
 	ufrag = pj_str(rtp->local_ufrag);
 	generate_random_string(rtp->local_passwd, sizeof(rtp->local_passwd));
 	passwd = pj_str(rtp->local_passwd);
-
+#endif
 	ast_rtp_instance_set_data(instance, rtp);
-
+#ifdef HAVE_PJPROJECT
 	/* Create an ICE session for ICE negotiation */
 	if (icesupport && pj_ice_sess_create(&stun_config, NULL, PJ_ICE_SESS_ROLE_UNKNOWN, 2, &ast_rtp_ice_sess_cb, &ufrag, &passwd, NULL, &rtp->ice) == PJ_SUCCESS) {
 		/* Make this available for the callbacks */