From 0d5e154043e923305d8a02609e6c0458f419b3b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 17 Nov 2022 11:27:42 -0500
Subject: [PATCH] sipaccount: fix srtp
Change-Id: I9aa531e26c3ddcae81472b8ba55fbfe004e21001
---
src/sip/sipaccount_config.cpp | 6 ++++++
src/sip/sipaccount_config.h | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/sip/sipaccount_config.cpp b/src/sip/sipaccount_config.cpp
index 9f57f5d66e..56b48d9945 100644
--- a/src/sip/sipaccount_config.cpp
+++ b/src/sip/sipaccount_config.cpp
@@ -267,6 +267,12 @@ SipAccountConfig::fromMap(const std::map<std::string, std::string>& details)
parseInt(details, Conf::CONFIG_ACCOUNT_VIDEO_PORT_MAX, tmpMax);
updateRange(tmpMin, tmpMax, videoPortRange);
+ // srtp settings
+ parseBool(details, Conf::CONFIG_SRTP_RTP_FALLBACK, srtpFallback);
+ auto iter = details.find(Conf::CONFIG_SRTP_KEY_EXCHANGE);
+ if (iter != details.end())
+ srtpKeyExchange = sip_utils::getKeyExchangeProtocol(iter->second);
+
if (credentials.empty()) { // credentials not set, construct 1 entry
JAMI_WARN("No credentials set, inferring them...");
std::map<std::string, std::string> map;
diff --git a/src/sip/sipaccount_config.h b/src/sip/sipaccount_config.h
index b708e002cc..27ff3d9605 100644
--- a/src/sip/sipaccount_config.h
+++ b/src/sip/sipaccount_config.h
@@ -98,7 +98,7 @@ struct SipAccountConfig : public SipAccountBaseConfig {
* Specifies the type of key exchange used for SRTP, if any.
* This only determine if the media channel is secured.
*/
- KeyExchangeProtocol srtpKeyExchange {KeyExchangeProtocol::NONE};
+ KeyExchangeProtocol srtpKeyExchange {KeyExchangeProtocol::SDES};
bool presenceEnabled {false};
bool publishSupported {false};
--
GitLab