diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2008-06-26 19:12:09 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2008-06-26 19:12:09 +0000 |
commit | c2bf0b1ca18b3ccc8ccf3d580840900a0518e049 (patch) | |
tree | 1f8b388e0ef44d360e6a31b61ca900635fe04ace /pjsip/src | |
parent | 349f63c0e6559210b51e31a6ee01fa17ad34baeb (diff) |
Ticket #544: Fixed SRTP on hold+reinvite scenario
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2064 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src')
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_call.c | 1 | ||||
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_media.c | 29 |
2 files changed, 29 insertions, 1 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c index b5482957..d12ea9d2 100644 --- a/pjsip/src/pjsua-lib/pjsua_call.c +++ b/pjsip/src/pjsua-lib/pjsua_call.c @@ -115,6 +115,7 @@ static void reset_call(pjsua_call_id id) call->res_time.sec = 0; call->res_time.msec = 0; call->rem_nat_type = PJ_STUN_NAT_TYPE_UNKNOWN; + call->rem_srtp_use = PJMEDIA_SRTP_DISABLED; } diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index 7d2742f6..84b85101 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -888,7 +888,14 @@ pj_status_t pjsua_media_channel_init(pjsua_call_id call_id, /* Always create SRTP adapter */ 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, &srtp_opt, &srtp); @@ -1143,6 +1150,9 @@ pj_status_t pjsua_media_channel_update(pjsua_call_id call_id, } } else { + pjmedia_srtp_info srtp_info; + pjmedia_transport_info tp_info; + /* Start/restart media transport */ status = pjmedia_transport_media_start(call->med_tp, call->inv->pool, @@ -1152,6 +1162,23 @@ pj_status_t pjsua_media_channel_update(pjsua_call_id call_id, 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. */ if (pjsua_var.media_cfg.ptime != 0) { si->param->setting.frm_per_pkt = (pj_uint8_t) |