From 43a5292fc1dc67c6598e12bf298520e640d0d42c Mon Sep 17 00:00:00 2001 From: Philipp Jungkamp Date: Thu, 15 Jun 2023 11:24:18 +0200 Subject: [PATCH] node-webrtc: fix CI warnings Signed-off-by: Philipp Jungkamp --- include/villas/nodes/webrtc.hpp | 2 +- lib/nodes/webrtc.cpp | 9 ++++++--- lib/nodes/webrtc/signaling_client.cpp | 1 + lib/nodes/webrtc/signaling_message.cpp | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/villas/nodes/webrtc.hpp b/include/villas/nodes/webrtc.hpp index 7baf24693..0cabb6397 100644 --- a/include/villas/nodes/webrtc.hpp +++ b/include/villas/nodes/webrtc.hpp @@ -35,7 +35,7 @@ protected: struct Pool pool; std::shared_ptr conn; - rtc::Configuration config; + rtc::Configuration rtcConf; rtc::DataChannelInit dci; virtual diff --git a/lib/nodes/webrtc.cpp b/lib/nodes/webrtc.cpp index 9efd48472..c30ecaab7 100644 --- a/lib/nodes/webrtc.cpp +++ b/lib/nodes/webrtc.cpp @@ -25,6 +25,9 @@ WebRTCNode::WebRTCNode(const std::string &name) : Node(name), server("wss://villas.k8s.eonerc.rwth-aachen.de/ws/signaling"), wait_seconds(0), + format(nullptr), + queue({}), + pool({}), dci({}) { dci.reliability.type = rtc::Reliability::Type::Rexmit; @@ -81,7 +84,7 @@ int WebRTCNode::parse(json_t *json, const uuid_t sn_uuid) throw ConfigError(json, err, "node-config-node-webrtc-ice"); if (json_servers) { - config.iceServers.clear(); + rtcConf.iceServers.clear(); if (!json_is_array(json_servers)) throw ConfigError(json_servers, "node-config-node-webrtc-ice-servers", "ICE Servers must be a an array of server configurations."); @@ -94,7 +97,7 @@ int WebRTCNode::parse(json_t *json, const uuid_t sn_uuid) std::string uri = json_string_value(json_server); - config.iceServers.emplace_back(uri); + rtcConf.iceServers.emplace_back(uri); } } } @@ -121,7 +124,7 @@ int WebRTCNode::prepare() format->start(getInputSignals(false), ~(int) SampleFlags::HAS_OFFSET); - conn = std::make_shared(server, session, config, web, dci); + conn = std::make_shared(server, session, rtcConf, web, dci); ret = pool_init(&pool, 1024, SAMPLE_LENGTH(getInputSignals(false)->size())); if (ret) // TODO log diff --git a/lib/nodes/webrtc/signaling_client.cpp b/lib/nodes/webrtc/signaling_client.cpp index 57e4dbc53..a2cfd2d68 100644 --- a/lib/nodes/webrtc/signaling_client.cpp +++ b/lib/nodes/webrtc/signaling_client.cpp @@ -15,6 +15,7 @@ using namespace villas::node; using namespace villas::node::webrtc; SignalingClient::SignalingClient(const std::string &srv, const std::string &sess, Web *w) : + retry_count(0), web(w), running(false), logger(logging.get("webrtc:signal")) diff --git a/lib/nodes/webrtc/signaling_message.cpp b/lib/nodes/webrtc/signaling_message.cpp index f751c0cdf..38150f699 100644 --- a/lib/nodes/webrtc/signaling_message.cpp +++ b/lib/nodes/webrtc/signaling_message.cpp @@ -113,6 +113,7 @@ ControlMessage::ControlMessage(json_t *j) json_t *json_connection; size_t i; + // cppcheck-suppress unknownMacro json_array_foreach(json_connections, i, json_connection) connections.emplace_back(json_connection); }