Ignore:
Timestamp:
Mar 15, 2018 3:00:59 AM (3 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:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_config.c

    r5746 r5755  
    10551055                return -1; 
    10561056            } 
     1057            /* Set SRTP keying to use DTLS over SDES */ 
     1058            if (app_config.srtp_keying == 1) { 
     1059                pjsua_srtp_opt *srtp_opt = &app_config.cfg.srtp_opt; 
     1060                srtp_opt->keying_count = 2; 
     1061                srtp_opt->keying[0] = PJMEDIA_SRTP_KEYING_DTLS_SRTP; 
     1062                srtp_opt->keying[1] = PJMEDIA_SRTP_KEYING_SDES; 
     1063 
     1064                cur_acc->srtp_opt.keying_count = 2; 
     1065                cur_acc->srtp_opt.keying[0] = PJMEDIA_SRTP_KEYING_DTLS_SRTP; 
     1066                cur_acc->srtp_opt.keying[1] = PJMEDIA_SRTP_KEYING_SDES; 
     1067            } 
    10571068            break; 
    10581069#endif 
Note: See TracChangeset for help on using the changeset viewer.