jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

misc: fix some build warning and add ut_bootstrap to CMakeLists

Browse Source 
Change-Id: I114a876bf6becacac00eec362a4481f3b0de6494
This commit is contained in:
Sébastien Blin
2023-07-03 08:31:34 -04:00
committed by Adrien Béraud
parent 498b6d0664
commit e8b1209b3d
2 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -701,6 +701,10 @@ else()
target_compile_definitions(ut_library PUBLIC ENABLE_VIDEO)
endif()
add_executable(ut_bootstrap test/unitTest/swarm/bootstrap.cpp)
target_link_libraries(ut_bootstrap ut_library)
add_test(NAME bootstrap COMMAND ut_bootstrap)
add_executable(ut_conversationRepository test/unitTest/conversationRepository/conversationRepository.cpp)
target_link_libraries(ut_conversationRepository ut_library)
add_test(NAME conversationRepository COMMAND ut_conversationRepository)

69
src/connectivity/connectionmanager.h
View File

@ -233,46 +233,11 @@ public:
~Config() {}
/**
* Determine if STUN public address resolution is required to register this account. In this
* case a STUN server hostname must be specified.
*/
bool stunEnabled_ {false};
/**
* The STUN server hostname (optional), used to provide the public IP address in case the
* softphone stay behind a NAT.
*/
std::string stunServer_ {};
/**
* Determine if TURN public address resolution is required to register this account. In this
* case a TURN server hostname must be specified.
*/
bool turnEnabled_ {false};
/**
* The TURN server hostname (optional), used to provide the public IP address in case the
* softphone stay behind a NAT.
*/
std::string turnServer_;
std::string turnServerUserName_;
std::string turnServerPwd_;
std::string turnServerRealm_;
mutable std::mutex cachedTurnMutex_ {};
std::unique_ptr<IpAddr> cacheTurnV4_ {};
std::unique_ptr<IpAddr> cacheTurnV6_ {};
std::string cachePath {};
std::shared_ptr<dht::DhtRunner> dht_;
const dht::crypto::Identity& id_;
const dht::crypto::Identity& identity() const { return id_; }
tls::CertificateStore* certStore_;
/**
* UPnP IGD controller and the mutex to access it
*/
@ -285,6 +250,40 @@ public:
* ie: if it is able to make port mappings
*/
bool getUPnPActive() const;
/**
* Determine if STUN public address resolution is required to register this account. In this
* case a STUN server hostname must be specified.
*/
bool stunEnabled_ {false};
/**
* The STUN server hostname (optional), used to provide the public IP address in case the
* softphone stay behind a NAT.
*/
std::string stunServer_ {};
/**
* The TURN server hostname (optional), used to provide the public IP address in case the
* softphone stay behind a NAT.
*/
std::string turnServer_;
std::string turnServerUserName_;
std::string turnServerPwd_;
std::string turnServerRealm_;
/**
* Determine if TURN public address resolution is required to register this account. In this
* case a TURN server hostname must be specified.
*/
bool turnEnabled_ {false};
mutable std::mutex cachedTurnMutex_ {};
std::unique_ptr<IpAddr> cacheTurnV4_ {};
std::unique_ptr<IpAddr> cacheTurnV6_ {};
std::string cachePath {};
tls::CertificateStore* certStore_;
};
} // namespace jami