From 5ef6293af5b1006a7c0f6d383ff372f5ef3e3a59 Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Thu, 3 Apr 2014 15:03:56 +0200 Subject: [PATCH] Prepare for IM encryption - update oRTP and ms2 --- coreapi/linphonecall.c | 1 + mediastreamer2 | 2 +- oRTP | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index eee0e6305..0e69bf546 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -1994,6 +1994,7 @@ void linphone_call_start_media_streams(LinphoneCall *call, bool_t all_inputs_mut call->current_params.media_encryption=LinphoneMediaEncryptionNone; params.zid_file=lc->zrtp_secrets_cache; + params.uri= "SetThePeerSipUriHere@nullTerminated.String"; /* TODO: set the sip URI there, MUST be a null terminated string */ audio_stream_enable_zrtp(call->audiostream,¶ms); }else{ call->current_params.media_encryption=linphone_call_are_all_streams_encrypted(call) ? diff --git a/mediastreamer2 b/mediastreamer2 index 9956d3d6e..9117185fd 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 9956d3d6e37a09991b948b1cad8d1382e046b0d1 +Subproject commit 9117185fd8b0a4679cc198cded64dad7d85628e0 diff --git a/oRTP b/oRTP index 04f2c4bff..5c3952c5b 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 04f2c4bff871c108fd645f6f16a3164f9fa42769 +Subproject commit 5c3952c5b90b82fe2cff122c67959b88c358bce8