Changeset 5755 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Mar 15, 2018 3:00:59 AM (7 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-apps/src/pjsua/pjsua_app.c (modified) (2 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -1011 +1011 @@
 }
 
-/*
- * This callback is called when media transport SRTP needs to be created.
- */
-static void on_create_media_transport_srtp(pjsua_call_id call_id,
-                                           unsigned media_idx,
-                                           pjmedia_srtp_setting *srtp_opt)
-{
-    PJ_UNUSED_ARG(call_id);
-    PJ_UNUSED_ARG(media_idx);
-
-    /* Set SRTP keying to use DTLS over SDES */
-    if (app_config.srtp_keying == 1) {
-        srtp_opt->keying_count = 2;
-        srtp_opt->keying[0] = PJMEDIA_SRTP_KEYING_DTLS_SRTP;
-        srtp_opt->keying[1] = PJMEDIA_SRTP_KEYING_SDES;
-    }
-}
-
-
 #ifdef TRANSPORT_ADAPTER_SAMPLE
 /*
@@ -1363 +1344 @@
     app_config.cfg.cb.on_snd_dev_operation = &on_snd_dev_operation;
     app_config.cfg.cb.on_call_media_event = &on_call_media_event;
-    app_config.cfg.cb.on_create_media_transport_srtp =
-                                            &on_create_media_transport_srtp;
 #ifdef TRANSPORT_ADAPTER_SAMPLE
     app_config.cfg.cb.on_create_media_transport = &on_create_media_transport;