Changeset 5755 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Mar 15, 2018 3:00:59 AM (6 years ago)

Author:

nanang

Message:

Close #2100:

• Added new APIs:
  • PJMEDIA: pjmedia_srtp_enum_crypto(), pjmedia_srtp_enum_keying()
  • PJSUA: pjsua_config.srtp_opt, pjsua_acc_config.srtp_opt, pjsua_srtp_opt_default()
  • PJSUA2: AccountMediaConfig::srtpOpt, Endpoint::srtpCryptoEnum()
• Deprecated PJSUA callback on_create_media_transport_srtp() (not removed yet, just warnings).
• Slightly refactored SRTP code:
  • Fixed potential issue with on_create_media_transport_srtp(), some PJSUA internal values in pjmedia_srtp_setting may be overridden by app.
  • Fixed few issues in SRTP and keying mechanism, e.g: premature local SDP modification (it should be done after verification).
  • Potential minor backward compatibility issue: default value of pjmedia_srtp_setting.crypto_count is now zero, previously it was initialized with all crypto via pjmedia_srtp_setting_default(), actually zero and all cryptos in this setting semantically are the same.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (3 diffs)

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

@@ -1536 +1536 @@
     if (!call_med->tp_orig) {
         pjmedia_srtp_setting srtp_opt;
+        pjsua_srtp_opt *acc_srtp_opt = &acc->cfg.srtp_opt;
         pjmedia_transport *srtp = NULL;
+        unsigned i;
 
         /* Check if SRTP requires secure signaling */
@@ -1552 +1554 @@
         srtp_opt.cb.on_srtp_nego_complete = &on_srtp_nego_complete;
         srtp_opt.user_data = call_med;
+
+        /* Get crypto and keying settings from account settings */
+        srtp_opt.crypto_count = acc_srtp_opt->crypto_count;
+        for (i = 0; i < srtp_opt.crypto_count; ++i)
+            srtp_opt.crypto[i] = acc_srtp_opt->crypto[i];
+        srtp_opt.keying_count = acc_srtp_opt->keying_count;
+        for (i = 0; i < srtp_opt.keying_count; ++i)
+            srtp_opt.keying[i] = acc_srtp_opt->keying[i];
 
         /* If media session has been ever established, let's use remote's 
@@ -1560 +1570 @@
         else
             srtp_opt.use = acc->cfg.use_srtp;
-            
+
         if (pjsua_var.ua_cfg.cb.on_create_media_transport_srtp) {
+            pjmedia_srtp_setting srtp_opt2 = srtp_opt;
             pjsua_call *call = call_med->call;
-            pjmedia_srtp_use srtp_use = srtp_opt.use;
+
+            /* Warn that this callback is deprecated (see also #2100) */
+            PJ_LOG(1,(THIS_FILE, "Warning: on_create_media_transport_srtp "
+                                 "is deprecated and will be removed in the "
+                                 "future release"));
 
             (*pjsua_var.ua_cfg.cb.on_create_media_transport_srtp)
-                (call->index, call_med->idx, &srtp_opt);
-
-            /* Close_member_tp must not be overwritten by app */
-            srtp_opt.close_member_tp = PJ_TRUE;
-
-            /* Revert SRTP usage policy if media is reinitialized */
-            if (call->inv && call->inv->state == PJSIP_INV_STATE_CONFIRMED) {
-                srtp_opt.use = srtp_use;
-            }
+                (call->index, call_med->idx, &srtp_opt2);
+
+            /* Only apply SRTP usage policy if this is initial INVITE */
+            if (call->inv && call->inv->state < PJSIP_INV_STATE_CONFIRMED) {
+                srtp_opt.use = srtp_opt2.use;
+            }
+
+            /* Apply crypto and keying settings from callback */
+            srtp_opt.crypto_count = srtp_opt2.crypto_count;
+            for (i = 0; i < srtp_opt.crypto_count; ++i)
+                srtp_opt.crypto[i] = srtp_opt2.crypto[i];
+            srtp_opt.keying_count = srtp_opt2.keying_count;
+            for (i = 0; i < srtp_opt.keying_count; ++i)
+                srtp_opt.keying[i] = srtp_opt2.keying[i];
         }