Revert "Use SRTP as a rtp_transport_modifier instead of rtp_transport to allow...

Revert "Use SRTP as a rtp_transport_modifier instead of rtp_transport to allow use of both tunnel + SRTP"

This reverts commit 24ea2d9d.
parent 1a370b77
......@@ -257,7 +257,6 @@ static int check_srtp_session_created(MediaStream *stream){
err_status_t err;
srtp_t session;
RtpTransport *rtp=NULL,*rtcp=NULL;
RtpTransportModifier *rtp_modifier, *rtcp_modifier;
err = ortp_srtp_create(&session, NULL);
if (err != 0) {
......@@ -265,15 +264,7 @@ static int check_srtp_session_created(MediaStream *stream){
return -1;
}
stream->sessions.srtp_session=session;
srtp_transport_modifier_new(session,&rtp_modifier,&rtcp_modifier);
rtp_session_get_transports(stream->sessions.rtp_session,&rtp,&rtcp);
/*if transports are set, we assume they are meta transporters, otherwise create them*/
if (rtp==NULL&&rtcp==NULL){
meta_rtp_transport_new(&rtp, NULL, 0);
meta_rtp_transport_new(&rtcp, NULL, 0);
}
meta_rtp_transport_append_modifier(rtp, rtp_modifier);
meta_rtp_transport_append_modifier(rtp, rtcp_modifier);
srtp_transport_new(session,&rtp,&rtcp);
rtp_session_set_transports(stream->sessions.rtp_session,rtp,rtcp);
stream->sessions.is_secured=TRUE;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment