diff --git a/include/certstore.h b/include/certstore.h index 289d400d62552467ca76aded3448ae4d886662ac..1f850007df20206ae5a473abab187004970621ab 100644 --- a/include/certstore.h +++ b/include/certstore.h @@ -188,4 +188,4 @@ private: }; } // namespace tls -} // namespace jami +} // namespace dhtnet diff --git a/include/connectionmanager.h b/include/connectionmanager.h index 99c74669a759a80b382d3af61f371eeb10abe2bd..22f6aa01eb4ac8c4a2912da37a09623a526a1061 100644 --- a/include/connectionmanager.h +++ b/include/connectionmanager.h @@ -251,7 +251,7 @@ struct ConnectionManager::Config /** * UPnP IGD controller and the mutex to access it - */ + */ bool upnpEnabled; std::shared_ptr<dhtnet::upnp::Controller> upnpCtrl; @@ -264,4 +264,4 @@ struct ConnectionManager::Config bool getUPnPActive() const; }; -} // namespace jami \ No newline at end of file +} // namespace dhtnet \ No newline at end of file diff --git a/include/diffie-hellman.h b/include/diffie-hellman.h index 3642a966d0826b917d88c91547d866d05f0dfb2d..f6bd64d42ffd6ee21758848fa84c9618df4596af 100644 --- a/include/diffie-hellman.h +++ b/include/diffie-hellman.h @@ -65,4 +65,4 @@ private: }; } // namespace tls -} // namespace jami +} // namespace dhtnet diff --git a/include/fileutils.h b/include/fileutils.h index 5116e229a8872e3465ac73a59c6367db4d947248..b058973bf1017862140ff4ad4024691eb8c80773 100644 --- a/include/fileutils.h +++ b/include/fileutils.h @@ -143,4 +143,4 @@ int accessFile(const std::string& file, int mode); uint64_t lastWriteTime(const std::string& p); } // namespace fileutils -} // namespace jami +} // namespace dhtnet diff --git a/include/generic_io.h b/include/generic_io.h index 3ad9c80822ae801be6a033aa15df519567b9b085..67812c23735e482180f218f383f2d32b90312729 100644 --- a/include/generic_io.h +++ b/include/generic_io.h @@ -120,4 +120,4 @@ protected: GenericSocket() = default; }; -} // namespace jami +} // namespace dhtnet diff --git a/include/ip_utils.h b/include/ip_utils.h index b13e563ad545d1fee153809e68612ac9096edcd8..ae7d8d38ae5857504c3f3c01f4bcb6392e23b14f 100644 --- a/include/ip_utils.h +++ b/include/ip_utils.h @@ -342,4 +342,4 @@ bool haveCommonAddr(const std::vector<IpAddr>& a, const std::vector<IpAddr>& b); std::vector<IpAddr> getLocalNameservers(); } // namespace ip_utils -} // namespace jami +} // namespace dhtnet diff --git a/include/multiplexed_socket.h b/include/multiplexed_socket.h index 7b62fc378fa9a1f562d6b47436573224e61839be..e2439462ff3ebade13c444449383534ba9858eda 100644 --- a/include/multiplexed_socket.h +++ b/include/multiplexed_socket.h @@ -356,6 +356,6 @@ private: std::unique_ptr<Impl> pimpl_; }; -} // namespace jami +} // namespace dhtnet MSGPACK_ADD_ENUM(dhtnet::ChannelRequestState); diff --git a/include/string_utils.h b/include/string_utils.h index e9876df6caaf82f8f929989553a13a8afe327968..37fb1ac12d4008c72391f96d91e9eddae3fde2c6 100644 --- a/include/string_utils.h +++ b/include/string_utils.h @@ -169,7 +169,7 @@ std::string string_join(const std::set<std::string>& set, std::string_view separ std::set<std::string> string_split_set(std::string& str, std::string_view separator = "/"); -} // namespace jami +} // namespace dhtnet /* // Add string operators missing from standard diff --git a/include/tls_session.h b/include/tls_session.h index 87e84a2a41b3b8376a7f3d944f31a9dbf26f4844..d0adb63820fcf37ca9c2517cb1ada789b8bb1834 100644 --- a/include/tls_session.h +++ b/include/tls_session.h @@ -155,4 +155,4 @@ private: }; } // namespace tls -} // namespace jami +} // namespace dhtnet diff --git a/include/turn_cache.h b/include/turn_cache.h index c8d368435bcc7fbf572b9ad688315e9523260b5a..f3617c9764499294164eb751e831bb3a465466bb 100644 --- a/include/turn_cache.h +++ b/include/turn_cache.h @@ -108,4 +108,4 @@ private: } }; -} // namespace jami +} // namespace dhtnet diff --git a/include/upnp/mapping.h b/include/upnp/mapping.h index d22e64277cdd729bfeb246b280718bb4fc416e45..a9cff54f115fe52061ea58308ec3016bfae68975 100644 --- a/include/upnp/mapping.h +++ b/include/upnp/mapping.h @@ -138,4 +138,4 @@ private: }; } // namespace upnp -} // namespace jami +} // namespace dhtnet diff --git a/include/upnp/upnp_context.h b/include/upnp/upnp_context.h index 1ed96ea56ac0596143c42a8b773451c77f6c546e..bd1cc2bdc15a56cf93d333cb1a380020aaa2cf76 100644 --- a/include/upnp/upnp_context.h +++ b/include/upnp/upnp_context.h @@ -314,4 +314,4 @@ private: }; } // namespace upnp -} // namespace jami +} // namespace dhtnet diff --git a/include/upnp/upnp_control.h b/include/upnp/upnp_control.h index 3926e90f3db1835de0e7f688fa7c8ad840dc8a01..73936165168e95cc03da2448524a31e6d68a99bf 100644 --- a/include/upnp/upnp_control.h +++ b/include/upnp/upnp_control.h @@ -69,4 +69,4 @@ private: }; } // namespace upnp -} // namespace jami +} // namespace dhtnet diff --git a/include/upnp/upnp_thread_util.h b/include/upnp/upnp_thread_util.h index 8ba06d6e5f52626bc5e1f698bc4596396aef697b..22b25028461ebad1baafbb303865f39e1173a771 100644 --- a/include/upnp/upnp_thread_util.h +++ b/include/upnp/upnp_thread_util.h @@ -42,7 +42,7 @@ protected: // Upnp context execution queue (same as manager's scheduler) // Helpers to run tasks on upnp context queue. //static ScheduledExecutor* getScheduler() { return &Manager::instance().scheduler(); } - + template<typename Callback> static void runOnUpnpContextQueue(Callback&& cb) { @@ -55,4 +55,4 @@ protected: }; } // namespace upnp -} // namespace jami +} // namespace dhtnet diff --git a/src/connectionmanager.cpp b/src/connectionmanager.cpp index 9d955a5275e132978c4b49d870ac34c58cb9fbf9..e5fb5008092f1d4d634b209adeac3ebe5e69e143 100644 --- a/src/connectionmanager.cpp +++ b/src/connectionmanager.cpp @@ -1680,4 +1680,4 @@ ConnectionManager::getConfig() return pimpl_->config_; } -} // namespace jami +} // namespace dhtnet diff --git a/src/fileutils.cpp b/src/fileutils.cpp index 565263c75626683803104f2ff136386e4f62ee85..b6194d24bc73c57944d7a51a4560f3abf4646553 100644 --- a/src/fileutils.cpp +++ b/src/fileutils.cpp @@ -580,7 +580,7 @@ recursive_mkdir(const std::string& path, mode_t mode) return false; } } - } // namespace jami + } // namespace dhtnet return true; } @@ -863,4 +863,4 @@ lastWriteTime(const std::string& p) } } // namespace fileutils -} // namespace jami +} // namespace dhtnet diff --git a/src/ice_transport.cpp b/src/ice_transport.cpp index 0318a3d1fa81609e0198d9ef2c0d6a1858f47f55..602347de8a4b4cd71b57277ed87c1c329b058e23 100644 --- a/src/ice_transport.cpp +++ b/src/ice_transport.cpp @@ -1896,4 +1896,4 @@ IceSocket::setDefaultRemoteAddress(const IpAddr& addr) ice_transport_->setDefaultRemoteAddress(compId_, addr); } -} // namespace jami +} // namespace dhtnet diff --git a/src/ip_utils.cpp b/src/ip_utils.cpp index abc706c2e8a3c1a102d775c8eee2bf3a43987fe1..91df4148423e4adb4f5d85f523cbca1ddee005bd 100644 --- a/src/ip_utils.cpp +++ b/src/ip_utils.cpp @@ -496,4 +496,4 @@ IpAddr::isPrivate() const return false; } } -} // namespace jami +} // namespace dhtnet diff --git a/src/multiplexed_socket.cpp b/src/multiplexed_socket.cpp index aea9954a61ce4f3eb537336fcb8ac1e0859df285..7b58922d242ef31d60415df31754737cd5fb936f 100644 --- a/src/multiplexed_socket.cpp +++ b/src/multiplexed_socket.cpp @@ -1204,4 +1204,4 @@ ChannelSocket::getRemoteAddress() const return {}; } -} // namespace jami +} // namespace dhtnet diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp index a2c0615ef2be65fa9ffc23ee6233f9761511c692..42bfbc011e921bf204df3bcb912a128951602e11 100644 --- a/src/peer_connection.cpp +++ b/src/peer_connection.cpp @@ -444,4 +444,4 @@ TlsSocketEndpoint::getRemoteAddress() const return {}; } -} // namespace jami +} // namespace dhtnet diff --git a/src/peer_connection.h b/src/peer_connection.h index 962e8d0fa6c1bf1e86ae854fe6f564a48cf6f203..143ca706141f9acda4b8d625f236c1476d14c1e5 100644 --- a/src/peer_connection.h +++ b/src/peer_connection.h @@ -134,4 +134,4 @@ private: std::unique_ptr<Impl> pimpl_; }; -} // namespace jami +} // namespace dhtnet diff --git a/src/security/certstore.cpp b/src/security/certstore.cpp index 865493b0772b4376365051f11ceac3d8c164ce96..2ef05e4deb3c3098b5ef0f1ed011f1a378b657f3 100644 --- a/src/security/certstore.cpp +++ b/src/security/certstore.cpp @@ -665,4 +665,4 @@ TrustStore::rebuildTrust() } } // namespace tls -} // namespace jami +} // namespace dhtnet diff --git a/src/security/diffie-hellman.cpp b/src/security/diffie-hellman.cpp index e15e4182e094515138c9c21c86b6425b77682b8b..78f901fbb2afe8f3d5e342e140095aeb3d9c912a 100644 --- a/src/security/diffie-hellman.cpp +++ b/src/security/diffie-hellman.cpp @@ -131,4 +131,4 @@ DhParams::loadDhParams(const std::string& path) } } // namespace tls -} // namespace jami +} // namespace dhtnet diff --git a/src/security/threadloop.cpp b/src/security/threadloop.cpp index ab570f26d67fcc5569492ec8c4dff42f960c05e1..3686991f6ab9b9ba6584cea874e8e9d7e9e8a329 100644 --- a/src/security/threadloop.cpp +++ b/src/security/threadloop.cpp @@ -128,4 +128,4 @@ InterruptedThreadLoop::stop() ThreadLoop::stop(); cv_.notify_one(); } -} // namespace jami +} // namespace dhtnet diff --git a/src/security/threadloop.h b/src/security/threadloop.h index 58524244430f6967851a868aae715e62a8e24179..7e18e1b8e79fb0e934237e0150ad04cac895801e 100644 --- a/src/security/threadloop.h +++ b/src/security/threadloop.h @@ -126,4 +126,4 @@ private: std::condition_variable cv_; }; -} // namespace jami +} // namespace dhtnet diff --git a/src/security/tls_session.cpp b/src/security/tls_session.cpp index ef856379b59aedda4aca6d8e02e6f6a5fe719f8f..027067ef3294329e7eed65ddc6f6eb2abef323a0 100644 --- a/src/security/tls_session.cpp +++ b/src/security/tls_session.cpp @@ -1780,4 +1780,4 @@ TlsSession::logger() const } } // namespace tls -} // namespace jami +} // namespace dhtnet diff --git a/src/sip_utils.h b/src/sip_utils.h index 67238fa5d35112b7cab7de55bc6e86945d9fc1d9..0f02255502d7e54d4d290f436e74c2fb023707b6 100644 --- a/src/sip_utils.h +++ b/src/sip_utils.h @@ -167,4 +167,4 @@ static constexpr int POOL_TP_INC {512}; static constexpr int TRANSPORT_INFO_LENGTH {64}; } // namespace sip_utils -} // namespace jami +} // namespace dhtnet diff --git a/src/string_utils.cpp b/src/string_utils.cpp index e3141ae3fb3ef73a3c9cba5649349f15e0a4ee41..d970011e3df8e69cdafe115f71e81f5a498ee344 100644 --- a/src/string_utils.cpp +++ b/src/string_utils.cpp @@ -159,4 +159,4 @@ string_split_set(std::string& str, std::string_view separator) return output; } -} // namespace jami +} // namespace dhtnet diff --git a/src/transport/peer_channel.h b/src/transport/peer_channel.h index 62dd76ed0356336b8867b95fa98e18f12f2d3985..8608a0811fddd5c0a4f6ece58cc9d27a7dceecff 100644 --- a/src/transport/peer_channel.h +++ b/src/transport/peer_channel.h @@ -104,4 +104,4 @@ private: bool stop_ {false}; }; -} // namespace jami +} // namespace dhtnet diff --git a/src/turn/turn_cache.cpp b/src/turn/turn_cache.cpp index 12dfe8ba4ac55172c41ba9e9849f07be6507b4c4..f351347e1a97c0c219c729fb1a214739290a6759 100644 --- a/src/turn/turn_cache.cpp +++ b/src/turn/turn_cache.cpp @@ -236,4 +236,4 @@ TurnCache::refreshTurnDelay(bool scheduleNext) } } -} // namespace jami +} // namespace dhtnet diff --git a/src/turn/turn_transport.cpp b/src/turn/turn_transport.cpp index bf114c72b48204c987f70dad1902d633d3c38574..c847e2853f79e4ba7d161eb4bfa31133f92538a4 100644 --- a/src/turn/turn_transport.cpp +++ b/src/turn/turn_transport.cpp @@ -216,4 +216,4 @@ TurnTransport::shutdown() pimpl_->shutdown(); } -} // namespace jami +} // namespace dhtnet diff --git a/src/turn/turn_transport.h b/src/turn/turn_transport.h index da9404e33578ae19c54912c2e40bf86663455548..180207361eb2478a0185e70328f14ce468c1d9a9 100644 --- a/src/turn/turn_transport.h +++ b/src/turn/turn_transport.h @@ -52,4 +52,4 @@ private: std::unique_ptr<Impl> pimpl_; }; -} // namespace jami +} // namespace dhtnet diff --git a/src/upnp/protocol/igd.cpp b/src/upnp/protocol/igd.cpp index 2b0b2891bbb4e65d40fcb5b9f478ff5dd08e2da1..bd31a71a0edb1239c1052dcfdcf7b9dd056d315e 100644 --- a/src/upnp/protocol/igd.cpp +++ b/src/upnp/protocol/igd.cpp @@ -67,4 +67,4 @@ IGD::getErrorsCount() const } } // namespace upnp -} // namespace jami \ No newline at end of file +} // namespace dhtnet \ No newline at end of file diff --git a/src/upnp/protocol/igd.h b/src/upnp/protocol/igd.h index 5ee5549c8a6f7d61ca7e3dacedb8cf303acbd936..8e8e5a92ae238a6d5bf5119a55bac0efae95e81c 100644 --- a/src/upnp/protocol/igd.h +++ b/src/upnp/protocol/igd.h @@ -104,4 +104,4 @@ private: }; } // namespace upnp -} // namespace jami +} // namespace dhtnet diff --git a/src/upnp/protocol/mapping.cpp b/src/upnp/protocol/mapping.cpp index bcd53b5d35fbbf61e27c46d36c3703dca6e768ea..3aa24b345c6ed49ae0818c3caca18d4bc5e9bdcc 100644 --- a/src/upnp/protocol/mapping.cpp +++ b/src/upnp/protocol/mapping.cpp @@ -339,4 +339,4 @@ Mapping::setRenewalTime(sys_clock::time_point time) #endif } // namespace upnp -} // namespace jami +} // namespace dhtnet diff --git a/src/upnp/protocol/natpmp/nat_pmp.cpp b/src/upnp/protocol/natpmp/nat_pmp.cpp index b0aa78ca68757abadaecb2465591227b9683a2f1..599205e2d990d1a102f523cf0e31804664cf5af3 100644 --- a/src/upnp/protocol/natpmp/nat_pmp.cpp +++ b/src/upnp/protocol/natpmp/nat_pmp.cpp @@ -765,6 +765,6 @@ NatPmp::processMappingRemoved(const Mapping& map) } } // namespace upnp -} // namespace jami +} // namespace dhtnet #endif //-- #if HAVE_LIBNATPMP diff --git a/src/upnp/protocol/natpmp/nat_pmp.h b/src/upnp/protocol/natpmp/nat_pmp.h index b62b2f59a6db5744bda09b5b044f4ed41246e0a9..30642a0ba1fbf83af8dcec11e19415fdf1a79bab 100644 --- a/src/upnp/protocol/natpmp/nat_pmp.h +++ b/src/upnp/protocol/natpmp/nat_pmp.h @@ -166,4 +166,4 @@ private: }; } // namespace upnp -} // namespace jami +} // namespace dhtnet diff --git a/src/upnp/protocol/natpmp/pmp_igd.cpp b/src/upnp/protocol/natpmp/pmp_igd.cpp index e43c0c6f333eadd5b349f8527a0af15b50b3e05a..915f4922cccee5044bfdbfcd18667952deb90cae 100644 --- a/src/upnp/protocol/natpmp/pmp_igd.cpp +++ b/src/upnp/protocol/natpmp/pmp_igd.cpp @@ -54,4 +54,4 @@ PMPIGD::toString() const } } // namespace upnp -} // namespace jami +} // namespace dhtnet diff --git a/src/upnp/protocol/natpmp/pmp_igd.h b/src/upnp/protocol/natpmp/pmp_igd.h index 84a042bb67a69e8e23e5b2a7bb5c89d1e2488e92..df1c44b2dd8359fd06f226c9f74f8a00719e5bc2 100644 --- a/src/upnp/protocol/natpmp/pmp_igd.h +++ b/src/upnp/protocol/natpmp/pmp_igd.h @@ -46,4 +46,4 @@ public: }; } // namespace upnp -} // namespace jami +} // namespace dhtnet diff --git a/src/upnp/protocol/pupnp/pupnp.cpp b/src/upnp/protocol/pupnp/pupnp.cpp index ad6ef9e37feb7bd2f32e58cbc71ae23decea1a9a..e6ad85d174fb78cd078615090baf7ad4a3fe1500 100644 --- a/src/upnp/protocol/pupnp/pupnp.cpp +++ b/src/upnp/protocol/pupnp/pupnp.cpp @@ -1589,4 +1589,4 @@ PUPnP::actionDeletePortMapping(const Mapping& mapping) } } // namespace upnp -} // namespace jami +} // namespace dhtnet diff --git a/src/upnp/protocol/pupnp/pupnp.h b/src/upnp/protocol/pupnp/pupnp.h index 268846f30f552470eb6793605ea90d94b20795c4..d45fddea2c11471750b08ccb211956222872f2df 100644 --- a/src/upnp/protocol/pupnp/pupnp.h +++ b/src/upnp/protocol/pupnp/pupnp.h @@ -262,4 +262,4 @@ private: }; } // namespace upnp -} // namespace jami +} // namespace dhtnet diff --git a/src/upnp/protocol/pupnp/upnp_igd.cpp b/src/upnp/protocol/pupnp/upnp_igd.cpp index 6e36a9b9e0d2d0f36e8727f94f02ef6e2574b76b..8c8a580e943b490a945e97f8a6502ab36e6faae8 100644 --- a/src/upnp/protocol/pupnp/upnp_igd.cpp +++ b/src/upnp/protocol/pupnp/upnp_igd.cpp @@ -65,4 +65,4 @@ UPnPIGD::operator==(UPnPIGD& other) const } } // namespace upnp -} // namespace jami \ No newline at end of file +} // namespace dhtnet \ No newline at end of file diff --git a/src/upnp/protocol/pupnp/upnp_igd.h b/src/upnp/protocol/pupnp/upnp_igd.h index 077f07196a5a3b3ae3814c4108f3bc11b4c0facc..9f335058e76f77e037c92cb7790e07489179f070 100644 --- a/src/upnp/protocol/pupnp/upnp_igd.h +++ b/src/upnp/protocol/pupnp/upnp_igd.h @@ -97,4 +97,4 @@ private: }; } // namespace upnp -} // namespace jami +} // namespace dhtnet diff --git a/src/upnp/protocol/upnp_protocol.h b/src/upnp/protocol/upnp_protocol.h index d960d3e6ad3ed15da5c26aebe9202b0f2b4f1341..ce891e178e9c88d09edaaae322e4e8629c103159 100644 --- a/src/upnp/protocol/upnp_protocol.h +++ b/src/upnp/protocol/upnp_protocol.h @@ -96,4 +96,4 @@ public: }; } // namespace upnp -} // namespace jami +} // namespace dhtnet diff --git a/src/upnp/upnp_context.cpp b/src/upnp/upnp_context.cpp index c4344cf7a7761796030405f84cda5e865835116d..93af97183ee91887f010da4fd8e068a4096869a2 100644 --- a/src/upnp/upnp_context.cpp +++ b/src/upnp/upnp_context.cpp @@ -1343,4 +1343,4 @@ UPnPContext::renewAllocations() #endif } // namespace upnp -} // namespace jami +} // namespace dhtnet diff --git a/src/upnp/upnp_control.cpp b/src/upnp/upnp_control.cpp index 77db1cefe3247cb0601b59487cc6693f54afb43f..6c58c21c01bee48597e4232d0bfe43b2af29d1bb 100644 --- a/src/upnp/upnp_control.cpp +++ b/src/upnp/upnp_control.cpp @@ -135,4 +135,4 @@ Controller::generateRandomPort(PortType type) } } // namespace upnp -} // namespace jami +} // namespace dhtnet diff --git a/tests/certstore.cpp b/tests/certstore.cpp index 01005e91582ff6bfa895ee3ce18daf5b83f0206b..0bc7722cc1921f5597218f9b82515da3f51b9f36 100644 --- a/tests/certstore.cpp +++ b/tests/certstore.cpp @@ -200,6 +200,6 @@ CertStoreTest::getCertificateWithSplitted() } } // namespace test -} // namespace jami +} // namespace dhtnet JAMI_TEST_RUNNER(dhtnet::test::CertStoreTest::name()); diff --git a/tests/connectionManager.cpp b/tests/connectionManager.cpp index cc74dd83d909d73756f301db66cc711e6af44318..ab4274484c3d584b643b0e237a585cf8890e2fc0 100644 --- a/tests/connectionManager.cpp +++ b/tests/connectionManager.cpp @@ -1270,6 +1270,6 @@ ConnectionManagerTest::testShutdownWhileNegotiating() } } // namespace test -} // namespace jami +} // namespace dhtnet JAMI_TEST_RUNNER(dhtnet::test::ConnectionManagerTest::name()) diff --git a/tests/testString_utils.cpp b/tests/testString_utils.cpp index b858c77748f3bd2b1e2328a0f052667be3e7c454..16e4094519a0fe1a1c9fedf4760edc59acc071ea 100644 --- a/tests/testString_utils.cpp +++ b/tests/testString_utils.cpp @@ -117,6 +117,6 @@ StringUtilsTest::split_string_test() } } // namespace test -} // namespace jami +} // namespace dhtnet JAMI_TEST_RUNNER(dhtnet::test::StringUtilsTest::name());