Changeset 2064 for pjproject/trunk

Timestamp:

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

Author:

nanang

Message:

Ticket #544: Fixed SRTP on hold+reinvite scenario

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/config.h (modified) (1 diff)
• pjmedia/include/pjmedia/transport_srtp.h (modified) (2 diffs)
• pjmedia/src/pjmedia/transport_srtp.c (modified) (6 diffs)
• pjsip/include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (3 diffs)

pjproject/trunk/pjmedia/include/pjmedia/config.h

@@ -610 +610 @@
  */
 #ifndef PJMEDIA_TRANSPORT_SPECIFIC_INFO_MAXSIZE
-#   define PJMEDIA_TRANSPORT_SPECIFIC_INFO_MAXSIZE  (12*sizeof(long))
+#   define PJMEDIA_TRANSPORT_SPECIFIC_INFO_MAXSIZE  (16*sizeof(long))
 #endif
 

pjproject/trunk/pjmedia/include/pjmedia/transport_srtp.h

@@ -139 +139 @@
      * Specify the usage policy. Default is PJMEDIA_SRTP_OPTIONAL.
      */
-    pjmedia_srtp_use use;
+    pjmedia_srtp_use            use;
 
     /**
@@ -180 +180 @@
      */
     pjmedia_srtp_crypto         tx_policy;
+
+    /**
+     * Specify the usage policy.
+     */
+    pjmedia_srtp_use            use;
+
+    /**
+     * Specify the peer's usage policy.
+     */
+    pjmedia_srtp_use            peer_use;
 
 } pjmedia_srtp_info;

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:

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -75 +75 @@
     pj_timer_entry       hangup_tm; /**< Timer to hangup call.              */
     pj_stun_nat_type     rem_nat_type; /**< NAT type of remote endpoint.    */
+    pjmedia_srtp_use     rem_srtp_use; /**< Remote's SRTP usage policy.     */
 
     char    last_text_buf_[128];    /**< Buffer for last_text.              */

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -116 +116 @@
     call->res_time.msec = 0;
     call->rem_nat_type = PJ_STUN_NAT_TYPE_UNKNOWN;
+    call->rem_srtp_use = PJMEDIA_SRTP_DISABLED;
 }
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -889 +889 @@
         pjmedia_srtp_setting_default(&srtp_opt);
         srtp_opt.close_member_tp = PJ_FALSE;
-        srtp_opt.use = acc->cfg.use_srtp;
+        /* If media session has been ever established, let's use remote's 
+         * preference in SRTP usage policy, especially when it is stricter.
+         */
+        if (call->rem_srtp_use > acc->cfg.use_srtp)
+            srtp_opt.use = call->rem_srtp_use;
+        else
+            srtp_opt.use = acc->cfg.use_srtp;
+
         status = pjmedia_transport_srtp_create(pjsua_var.med_endpt, 
                                                call->med_tp,
@@ -1144 +1151 @@
 
     } else {
+        pjmedia_srtp_info srtp_info;
+        pjmedia_transport_info tp_info;
+
         /* Start/restart media transport */
         status = pjmedia_transport_media_start(call->med_tp, 
@@ -1152 +1162 @@
 
         call->med_tp_st = PJSUA_MED_TP_RUNNING;
+
+        /* Get remote SRTP usage policy */
+        pjmedia_transport_info_init(&tp_info);
+        pjmedia_transport_get_info(call->med_tp, &tp_info);
+        if (tp_info.specific_info_cnt > 0) {
+            int i;
+            for (i = 0; i < tp_info.specific_info_cnt; ++i) {
+                if (tp_info.spc_info[i].type == PJMEDIA_TRANSPORT_TYPE_SRTP) 
+                {
+                    pjmedia_srtp_info *srtp_info = 
+                                (pjmedia_srtp_info*) tp_info.spc_info[i].buffer;
+
+                    call->rem_srtp_use = srtp_info->peer_use;
+                    break;
+                }
+            }
+        }
 
         /* Override ptime, if this option is specified. */