From 6e60f5d317d2bccaa556c98fbcc01d2db5796c1e Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Mon, 30 Jun 2014 19:51:28 +0000 Subject: Recorded merge of revisions 417677 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ res_rtp_asterisk: Add SHA-256 support for DTLS and perform DTLS negotiation on RTCP. This change fixes up DTLS support in res_rtp_asterisk so it can accept and provide a SHA-256 fingerprint, so it occurs on RTCP, and so it occurs after ICE negotiation completes. Configuration options to chan_sip and chan_pjsip have also been added to allow behavior to be tweaked (such as forcing the AVP type media transports in SDP). ASTERISK-22961 #close Reported by: Jay Jideliov Review: https://reviewboard.asterisk.org/r/3679/ Review: https://reviewboard.asterisk.org/r/3686/ ........ Merged revisions 417678 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@417679 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/res_pjsip_session.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/asterisk/res_pjsip_session.h') diff --git a/include/asterisk/res_pjsip_session.h b/include/asterisk/res_pjsip_session.h index 01c63db66..7340c6d71 100644 --- a/include/asterisk/res_pjsip_session.h +++ b/include/asterisk/res_pjsip_session.h @@ -73,6 +73,8 @@ struct ast_sip_session_media { struct ast_sip_session_sdp_handler *handler; /*! \brief Holds SRTP information */ struct ast_sdp_srtp *srtp; + /*! \brief The media transport in use for this stream */ + pj_str_t transport; /*! \brief Stream is on hold */ unsigned int held:1; /*! \brief Stream type this session media handles */ -- cgit v1.2.3