From 63d5f4b540888e66e05d2b2d77a2164899c22b07 Mon Sep 17 00:00:00 2001 From: ovari123 Date: Tue, 26 Nov 2024 19:32:56 -0400 Subject: [PATCH] misc: unify terminology MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit platform → platforms Change-Id: I99a79c2073e4c9a593fd264f75e22e4e1df1afcc GitLab: https://git.jami.net/savoirfairelinux/jami-client-qt/issues/1730 --- Packaging.md | 6 +++--- src/connectionmanager.cpp | 6 +++--- src/ice_transport.cpp | 14 +++++++------- src/upnp/protocol/pupnp/pupnp.cpp | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Packaging.md b/Packaging.md index be00038..081e9e9 100644 --- a/Packaging.md +++ b/Packaging.md @@ -4,7 +4,7 @@ In `extras/packaging`, the `build_packages.sh` script will build packages for su **Usage:** ```bash -extras/packaging/build_packages.sh -a # -a or --all will build all platform which are known to be supported -extras/packaging/build_packages.sh -u # -u or --ubuntu will build for all supported versions of Ubuntu -extras/packaging/build_packages.sh -u22 -d11 # -u22 will build for ubuntu 22.04 and -d11 will build for Debian 11 +extras/packaging/build_packages.sh -a # -a or --all builds all supported platforms +extras/packaging/build_packages.sh -u # -u or --ubuntu builds all supported versions of Ubuntu +extras/packaging/build_packages.sh -u22 -d11 # -u22 builds ubuntu 22.04 and -d11 builds Debian 11 ``` diff --git a/src/connectionmanager.cpp b/src/connectionmanager.cpp index 8a748ac..40755ff 100644 --- a/src/connectionmanager.cpp +++ b/src/connectionmanager.cpp @@ -446,7 +446,7 @@ class ConnectionManager::Impl : public std::enable_shared_from_thislogger) config_->logger->debug("ConnectionManager: stopping io_context thread"); + if (config_->logger) config_->logger->debug("ConnectionManager: Stopping io_context thread"); config_->ioContext->stop(); ioContextRunner_->join(); ioContextRunner_.reset(); @@ -731,7 +731,7 @@ ConnectionManager::Impl::onResponse(const asio::error_code& ec, } if (!info->responseReceived_) { if (config_->logger) - config_->logger->error("[device {}] no response from DHT to ICE request.", deviceId); + config_->logger->error("[device {}] No response from DHT to ICE request.", deviceId); info->onConnected_(false); return; } @@ -745,7 +745,7 @@ ConnectionManager::Impl::onResponse(const asio::error_code& ec, if (not ice->startIce({sdp.rem_ufrag, sdp.rem_pwd}, std::move(sdp.rem_candidates))) { if (config_->logger) - config_->logger->warn("[device {}] start ICE failed", deviceId); + config_->logger->warn("[device {}] Start ICE failed", deviceId); info->onConnected_(false); return; } diff --git a/src/ice_transport.cpp b/src/ice_transport.cpp index e749756..7b9aad9 100644 --- a/src/ice_transport.cpp +++ b/src/ice_transport.cpp @@ -288,7 +288,7 @@ add_stun_server(pj_pool_t& pool, pj_ice_strans_cfg& cfg, const StunServerInfo& i stun.cfg.max_pkt_size = STUN_MAX_PACKET_SIZE; stun.conn_type = cfg.stun.conn_type; if (logger) - logger->debug("added stun server '{}', port {}", pj_strbuf(&stun.server), stun.port); + logger->debug("Added stun server '{}', port {}", pj_strbuf(&stun.server), stun.port); } static void @@ -330,7 +330,7 @@ add_turn_server(pj_pool_t& pool, pj_ice_strans_cfg& cfg, const TurnServerInfo& i info.password.size()); } if (logger) - logger->debug("added turn server '{}', port {}", pj_strbuf(&turn.server), turn.port); + logger->debug("Added turn server '{}', port {}", pj_strbuf(&turn.server), turn.port); } //============================================================================== @@ -534,7 +534,7 @@ IceTransport::Impl::initIceInstance(const IceTransportOptions& options) icecb.on_destroy = [](pj_ice_strans* ice_st) { if (auto* tr = static_cast(pj_ice_strans_get_user_data(ice_st))) - tr->cancelOperations(); // Avoid upper layer to manage this ; Stop read operations + tr->cancelOperations(); // Avoid upper layer to manage this; Stop read operations }; // Add STUN servers @@ -1080,14 +1080,14 @@ IceTransport::Impl::setupGenericReflexiveCandidates() { if (not accountLocalAddr_) { if (logger_) - logger_->warn("[ice:{}] Missing local address, generic srflx candidates wont be generated!", + logger_->warn("[ice:{}] Missing local address, generic srflx candidates unable to be generated!", fmt::ptr(this)); return {}; } if (not accountPublicAddr_) { if (logger_) - logger_->warn("[ice:{}] Missing public address, generic srflx candidates wont be generated!", + logger_->warn("[ice:{}] Missing public address, generic srflx candidates unable to be generated!", fmt::ptr(this)); return {}; } @@ -1340,7 +1340,7 @@ IceTransport::startIce(const Attribute& rem_attrs, std::vector&& r pj_str_t ufrag, pwd; if (pimpl_->logger_) - pimpl_->logger_->debug("[ice:{}] negotiation starting ({:d} remote candidates)", + pimpl_->logger_->debug("[ice:{}] Negotiation starting ({:d} remote candidates)", fmt::ptr(pimpl_), rem_candidates.size()); @@ -1410,7 +1410,7 @@ IceTransport::startIce(const SDP& sdp) rem_candidates.data()); if (status != PJ_SUCCESS) { if (pimpl_->logger_) - pimpl_->logger_->error("[ice:{}] start failed: {:s}", fmt::ptr(pimpl_), sip_utils::sip_strerror(status)); + pimpl_->logger_->error("[ice:{}] Start failed: {:s}", fmt::ptr(pimpl_), sip_utils::sip_strerror(status)); pimpl_->is_stopped_ = true; return false; } diff --git a/src/upnp/protocol/pupnp/pupnp.cpp b/src/upnp/protocol/pupnp/pupnp.cpp index 68eafa6..a4b077c 100644 --- a/src/upnp/protocol/pupnp/pupnp.cpp +++ b/src/upnp/protocol/pupnp/pupnp.cpp @@ -326,7 +326,7 @@ PUPnP::searchForIgd() return; } - if (logger_) logger_->debug("PUPnP: Start search for IGD: attempt {:d}", igdSearchCounter_); + if (logger_) logger_->debug("PUPnP: Start search for IGD. Attempt {:d}", igdSearchCounter_); // Do not init if the host is not valid. Otherwise, the init will fail // anyway and may put libupnp in an unstable state (mainly deadlocks)