From 50d784112932f7bcdfe2e7fb69dcfc5c27546d0a Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Fri, 18 Nov 2011 10:00:38 +0100 Subject: [PATCH] Remove useless zid param. --- coreapi/linphonecall.c | 14 -------------- oRTP | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index 0310ec633..31270f99c 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -67,18 +67,6 @@ LinphoneCore *linphone_call_get_core(const LinphoneCall *call){ return call->core; } -static const char* get_hexa_zrtp_identifier(LinphoneCore *lc){ - const char *confZid=lp_config_get_string(lc->config,"rtp","zid",NULL); - if (confZid != NULL) { - return confZid; - } else { - char zidstr[128]; - snprintf(zidstr,sizeof(zidstr),"%x-%x-%x",rand(),rand(),rand()); - lp_config_set_string(lc->config,"rtp","zid",zidstr); - return lp_config_get_string(lc->config,"rtp","zid",NULL); - } -} - const char* linphone_call_get_authentication_token(LinphoneCall *call){ return call->auth_token; } @@ -150,7 +138,6 @@ static void linphone_call_audiostream_encryption_changed(void *data, bool_t encr if (params->has_video) { ms_message("Trying to enable encryption on video stream"); OrtpZrtpParams params; - params.zid=get_hexa_zrtp_identifier(call->core); params.zid_file=NULL; //unused video_stream_enable_zrtp(call->videostream,call->audiostream,¶ms); } @@ -1283,7 +1270,6 @@ void linphone_call_start_media_streams(LinphoneCall *call, bool_t all_inputs_mut /*will be set later when zrtp is activated*/ call->current_params.media_encryption=LinphoneMediaEncryptionNone; - params.zid=get_hexa_zrtp_identifier(lc); params.zid_file=lc->zrtp_secrets_cache; audio_stream_enable_zrtp(call->audiostream,¶ms); } diff --git a/oRTP b/oRTP index b44c6de6b..9e9265f9b 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit b44c6de6b63bf25cc4d144100811ab65ef7a5ba8 +Subproject commit 9e9265f9b6d6dd438bc07858b1ad832698df0f81