Changeset 3961

Timestamp:

Feb 28, 2012 10:38:32 AM (13 years ago)

Author:

nanang

Message:

Fix #1456: don't use SRTP internal state (tx_policy/rx_policy) directly for calling pjmedia_transport_srtp_start() in restarting SRTP after getting replay error.

File:

• pjproject/branches/1.x/pjmedia/src/pjmedia/transport_srtp.c (modified) (1 diff)

pjproject/branches/1.x/pjmedia/src/pjmedia/transport_srtp.c

@@ -908 +908 @@
     {
         /* Handle such condition that stream is updated (RTP seq is reinited
-        * & SRTP is restarted), but some old packets are still coming 
-        * so SRTP is learning wrong RTP seq. While the newly inited RTP seq
-        * comes, SRTP thinks the RTP seq is replayed, so srtp_unprotect() 
-        * will returning err_status_replay_*. Restarting SRTP can resolve 
-        * this.
-        */
-        if (pjmedia_transport_srtp_start((pjmedia_transport*)srtp, 
-                                         &srtp->tx_policy, &srtp->rx_policy) 
-                                         != PJ_SUCCESS)
-        {
+         * & SRTP is restarted), but some old packets are still coming 
+         * so SRTP is learning wrong RTP seq. While the newly inited RTP seq
+         * comes, SRTP thinks the RTP seq is replayed, so srtp_unprotect() 
+         * will return err_status_replay_*. Restarting SRTP can resolve this.
+         */
+        pjmedia_srtp_crypto tx, rx;
+        pj_status_t status;
+
+        tx = srtp->tx_policy;
+        rx = srtp->rx_policy;
+        status = pjmedia_transport_srtp_start((pjmedia_transport*)srtp,
+                                              &tx, &rx);
+        if (status != PJ_SUCCESS) {
             PJ_LOG(5,(srtp->pool->obj_name, "Failed to restart SRTP, err=%s", 
                       get_libsrtp_errstr(err)));
-        } else {
+        } else if (!srtp->bypass_srtp) {
             err = srtp_unprotect(srtp->srtp_rx_ctx, (pj_uint8_t*)pkt, &len);
         }