From 7e5ba81d540dbccaedcae760be854f399c83446d Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Mon, 19 Dec 2016 03:00:37 +0000 Subject: Misc (re #1945): Update SRTP to restart crypto tag from 1 when generating reoffer. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5500 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/src/pjmedia/transport_srtp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pjmedia/src/pjmedia/transport_srtp.c b/pjmedia/src/pjmedia/transport_srtp.c index 16d0adfd..1e4e57c7 100644 --- a/pjmedia/src/pjmedia/transport_srtp.c +++ b/pjmedia/src/pjmedia/transport_srtp.c @@ -1418,6 +1418,8 @@ static pj_status_t transport_encode_sdp(pjmedia_transport *tp, /* Generate crypto attribute if not yet */ if (pjmedia_sdp_media_find_attr(m_loc, &ID_CRYPTO, NULL) == NULL) { + int tag = 1; + /* Offer only current active crypto if any, otherwise offer all * crypto-suites in the setting. */ @@ -1432,7 +1434,7 @@ static pj_status_t transport_encode_sdp(pjmedia_transport *tp, buffer_len = MAXLEN; status = generate_crypto_attr_value(srtp->pool, buffer, &buffer_len, &srtp->setting.crypto[i], - i+1); + tag); if (status != PJ_SUCCESS) return status; @@ -1442,6 +1444,7 @@ static pj_status_t transport_encode_sdp(pjmedia_transport *tp, attr = pjmedia_sdp_attr_create(srtp->pool, ID_CRYPTO.ptr, &attr_value); m_loc->attr[m_loc->attr_count++] = attr; + ++tag; } } } -- cgit v1.2.3