From b2659c419f21a397336f2b2a6105c5e986ebb219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Mon, 6 Feb 2023 16:08:30 -0500
Subject: [PATCH] sip: cleanup
Change-Id: I34bd8943520ed45238bae2fbfc3b71606ef5df8f
---
src/connectivity/sip_utils.cpp | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/connectivity/sip_utils.cpp b/src/connectivity/sip_utils.cpp
index b4d64a0c52..306250269a 100644
--- a/src/connectivity/sip_utils.cpp
+++ b/src/connectivity/sip_utils.cpp
@@ -47,6 +47,8 @@ using namespace std::literals;
namespace jami {
namespace sip_utils {
+constexpr pj_str_t USER_AGENT_STR = CONST_PJ_STR("User-Agent");
+
std::string
PjsipErrorCategory::message(int condition) const
{
@@ -205,23 +207,19 @@ addUserAgentHeader(const std::string& userAgent, pjsip_tx_data* tdata)
return;
auto pjUserAgent = CONST_PJ_STR(userAgent);
- constexpr pj_str_t STR_USER_AGENT = CONST_PJ_STR("User-Agent");
// Do nothing if user-agent header is present.
- if (pjsip_msg_find_hdr_by_name(tdata->msg, &STR_USER_AGENT, nullptr) != nullptr) {
+ if (pjsip_msg_find_hdr_by_name(tdata->msg, &USER_AGENT_STR, nullptr) != nullptr) {
return;
}
// Add Header
auto hdr = reinterpret_cast<pjsip_hdr*>(
- pjsip_user_agent_hdr_create(tdata->pool, &STR_USER_AGENT, &pjUserAgent));
+ pjsip_user_agent_hdr_create(tdata->pool, &USER_AGENT_STR, &pjUserAgent));
if (hdr != nullptr) {
- JAMI_DBG("Add header to SIP message: \"%.*s: %.*s\"",
- (int) hdr->name.slen,
- hdr->name.ptr,
- (int) pjUserAgent.slen,
- pjUserAgent.ptr);
+ JAMI_LOG("Add header to SIP message: \"{:s}: {:s}\"",
+ sip_utils::as_view(hdr->name), userAgent);
pjsip_msg_add_hdr(tdata->msg, hdr);
}
}
@@ -234,7 +232,6 @@ getPeerUserAgent(const pjsip_rx_data* rdata)
return {};
}
- constexpr auto USER_AGENT_STR = CONST_PJ_STR("User-Agent");
if (auto uaHdr = (pjsip_generic_string_hdr*) pjsip_msg_find_hdr_by_name(rdata->msg_info.msg,
&USER_AGENT_STR,
nullptr)) {
--
GitLab