From: Matthew Jordan Date: Wed, 13 Mar 2013 14:39:54 +0000 (+0000) Subject: Always set the RTP instance data in the RTP engine X-Git-Tag: 13.0.0-beta1~2014 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95849b1a831bca5ad8550c4fdebc8d61e334d37b;p=thirdparty%2Fasterisk.git Always set the RTP instance data in the RTP engine Not informing the RTP engine of the instance data creates shrapnel. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@383008 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index 0cfd9f7b6d..a96103fe1d 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -1791,9 +1791,9 @@ static int ast_rtp_new(struct ast_rtp_instance *instance, 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 */