[asterisk-commits] qwell: branch qwell/pimp_my_sip-butnotwithpjproject r382854 - in /team/qwell/...

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue Mar 12 11:59:21 2013
New Revision: 382854

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=382854
Log:
Workaround addition of group locks in pjlib.

pj_ice_sess_create() was changed to allow passing in a pj_grp_lock_t.  This
will need to be looked into further, at some point.
........

Merged revisions 382853 from http://svn.asterisk.org/svn/asterisk/team/qwell/pjsip-shared-libs

Modified:
    team/qwell/pimp_my_sip-butnotwithpjproject/   (props changed)
    team/qwell/pimp_my_sip-butnotwithpjproject/res/res_rtp_asterisk.c

Propchange: team/qwell/pimp_my_sip-butnotwithpjproject/
------------------------------------------------------------------------------
Binary property 'branchmerge' - no diff available.

Modified: team/qwell/pimp_my_sip-butnotwithpjproject/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/pimp_my_sip-butnotwithpjproject/res/res_rtp_asterisk.c?view=diff&rev=382854&r1=382853&r2=382854
==============================================================================
--- team/qwell/pimp_my_sip-butnotwithpjproject/res/res_rtp_asterisk.c (original)
+++ team/qwell/pimp_my_sip-butnotwithpjproject/res/res_rtp_asterisk.c Tue Mar 12 11:59:21 2013
@@ -1785,7 +1785,7 @@
 	ast_rtp_instance_set_data(instance, rtp);
 
 	/* 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, &rtp->ice) == PJ_SUCCESS) {
+	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 */
 		rtp->ice->user_data = rtp;