From 4d43b72d78d19c12cde7910fae631f543ea22a35 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Fri, 30 Jun 2023 10:51:40 +0200 Subject: [PATCH] webrtc: Use UUID name as signaling peer by default Signed-off-by: Steffen Vogel --- lib/nodes/webrtc.cpp | 5 +++++ lib/nodes/webrtc/signaling_client.cpp | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/nodes/webrtc.cpp b/lib/nodes/webrtc.cpp index ceed5edc1..54bdae980 100644 --- a/lib/nodes/webrtc.cpp +++ b/lib/nodes/webrtc.cpp @@ -33,6 +33,11 @@ WebRTCNode::WebRTCNode(const uuid_t &id, const std::string &name) : dci({}) { dci.reliability.type = rtc::Reliability::Type::Rexmit; + + // Initialize signaling peer with node UUID + char uuid_str[36+1]; + uuid_unparse(id, uuid_str); + peer = uuid_str; } WebRTCNode::~WebRTCNode() diff --git a/lib/nodes/webrtc/signaling_client.cpp b/lib/nodes/webrtc/signaling_client.cpp index 752d413d8..9fb2caf1d 100644 --- a/lib/nodes/webrtc/signaling_client.cpp +++ b/lib/nodes/webrtc/signaling_client.cpp @@ -31,13 +31,10 @@ SignalingClient::SignalingClient(const std::string &server, const std::string &s memset(&info, 0, sizeof(info)); - ret = asprintf(&uri, "%s/%s", server.c_str(), session.c_str()); + ret = asprintf(&uri, "%s/%s/%s", server.c_str(), session.c_str(), peer.c_str()); if (ret < 0) throw RuntimeError { "Could not format signaling server uri" }; - if (!peer.empty()) - strcatf(&uri, "/%s", peer.c_str()); - ret = lws_parse_uri(uri, &prot, &a, &info.port, &p); if (ret) throw RuntimeError("Failed to parse WebSocket URI: '{}'", uri);