Changeset 2064 for pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

Timestamp:

Jun 26, 2008 7:12:09 PM (16 years ago)

Author:

nanang

Message:

Ticket #544: Fixed SRTP on hold+reinvite scenario

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c (modified) (6 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -112 +112 @@
     pjmedia_transport   *member_tp; /**< Underlying transport.       */
 
-    /* When in SRTP optional mode, instead of always offering RTP/AVP,
-     * we should create offer based on remote preference. At the first time,
-     * remote preference is unknown, it is known after media_start() called.
-     * So next time the same session need to create an offer, it will create
-     * SDP with transport type based on remote preference.
+    /* SRTP usage policy of peer. This field is updated when media is starting.
+     * This is useful when SRTP is in optional mode and peer is using mandatory
+     * mode, so when local is about to reinvite/update, it should offer 
+     * RTP/SAVP instead of offering RTP/AVP.
      */
-    pj_bool_t            remote_prefer_rtp_savp;
+    pjmedia_srtp_use     peer_use;
 
 } transport_srtp;
@@ -349 +348 @@
     srtp->session_inited = PJ_FALSE;
     srtp->bypass_srtp = PJ_FALSE;
-    srtp->remote_prefer_rtp_savp = PJ_FALSE;
+    srtp->peer_use = opt->use;
 
     if (opt) {
@@ -587 +586 @@
     srtp_info.rx_policy = srtp->rx_policy;
     srtp_info.tx_policy = srtp->tx_policy;
+    srtp_info.use = srtp->setting.use;
+    srtp_info.peer_use = srtp->peer_use;
 
     spc_info_idx = info->specific_info_cnt++;
@@ -1077 +1078 @@
                 goto BYPASS_SRTP;
             case PJMEDIA_SRTP_OPTIONAL:
-                m_loc->desc.transport = srtp->remote_prefer_rtp_savp?
-                                        ID_RTP_SAVP : ID_RTP_AVP;
+                m_loc->desc.transport = 
+                                (srtp->peer_use == PJMEDIA_SRTP_MANDATORY)?
+                                ID_RTP_SAVP : ID_RTP_AVP;
                 break;
             case PJMEDIA_SRTP_MANDATORY:
@@ -1284 +1286 @@
     m_loc = sdp_local->media[media_index];
 
-    srtp->remote_prefer_rtp_savp = (pj_stricmp(&m_rem->desc.transport, 
-                                   &ID_RTP_SAVP) == 0);
+    if (pj_stricmp(&m_rem->desc.transport, &ID_RTP_SAVP) == 0)
+        srtp->peer_use = PJMEDIA_SRTP_MANDATORY;
+    else
+        srtp->peer_use = PJMEDIA_SRTP_OPTIONAL;
 
     /* For answerer side, this function will just have to start SRTP */
@@ -1383 +1387 @@
 BYPASS_SRTP:
     srtp->bypass_srtp = PJ_TRUE;
+    srtp->peer_use = PJMEDIA_SRTP_DISABLED;
 
 PROPAGATE_MEDIA_START: