From 2b4b1ba9df3d9962e2ab993d38b97e24218f3658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Thu, 26 Oct 2023 13:35:49 -0400
Subject: [PATCH] jamiaccount: correctly pass public ip
GitLab: #910
Change-Id: I5e70fca251678f4355f1ea4925aec6e66b04e5c7
---
src/jamidht/jamiaccount.cpp | 6 ++++++
src/jamidht/jamiaccount.h | 1 +
src/sip/sipaccountbase.h | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp
index ab7e184610..426dc4ef1c 100644
--- a/src/jamidht/jamiaccount.cpp
+++ b/src/jamidht/jamiaccount.cpp
@@ -3288,6 +3288,12 @@ JamiAccount::getIceOptions() const noexcept
return connectionManager_->getIceOptions();
}
+dhtnet::IpAddr
+JamiAccount::getPublishedIpAddress(uint16_t family) const
+{
+ return connectionManager_->getPublishedIpAddress(family);
+}
+
bool
JamiAccount::setPushNotificationToken(const std::string& token)
{
diff --git a/src/jamidht/jamiaccount.h b/src/jamidht/jamiaccount.h
index 51e522e5c9..72d597f875 100644
--- a/src/jamidht/jamiaccount.h
+++ b/src/jamidht/jamiaccount.h
@@ -333,6 +333,7 @@ public:
* Create and return ICE options.
*/
dhtnet::IceTransportOptions getIceOptions() const noexcept override;
+ dhtnet::IpAddr getPublishedIpAddress(uint16_t family = PF_UNSPEC) const override;
/* Devices */
void addDevice(const std::string& password);
diff --git a/src/sip/sipaccountbase.h b/src/sip/sipaccountbase.h
index 534822d26e..7c3d4c099e 100644
--- a/src/sip/sipaccountbase.h
+++ b/src/sip/sipaccountbase.h
@@ -145,7 +145,7 @@ public:
*/
std::string getPublishedAddress() const { return config().publishedIp; }
- dhtnet::IpAddr getPublishedIpAddress(uint16_t family = PF_UNSPEC) const;
+ virtual dhtnet::IpAddr getPublishedIpAddress(uint16_t family = PF_UNSPEC) const;
void setPublishedAddress(const dhtnet::IpAddr& ip_addr);
--
GitLab