summaryrefslogtreecommitdiff
path: root/src/input_common/drivers/udp_client.cpp
diff options
context:
space:
mode:
authorGravatar german772021-10-25 12:53:14 -0500
committerGravatar Narr the Reg2021-11-24 20:30:26 -0600
commit1d71d4b87415b2581e6757f07d29275e02671b7a (patch)
treefdce385f094f5b38394e2c8582309f00756a3393 /src/input_common/drivers/udp_client.cpp
parentinput_common: Add multiple vibration curves (diff)
downloadyuzu-1d71d4b87415b2581e6757f07d29275e02671b7a.tar.gz
yuzu-1d71d4b87415b2581e6757f07d29275e02671b7a.tar.xz
yuzu-1d71d4b87415b2581e6757f07d29275e02671b7a.zip
input_common: Fix UDP uuid
Diffstat (limited to 'src/input_common/drivers/udp_client.cpp')
-rw-r--r--src/input_common/drivers/udp_client.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp
index 192ab336b..7cab707da 100644
--- a/src/input_common/drivers/udp_client.cpp
+++ b/src/input_common/drivers/udp_client.cpp
@@ -4,6 +4,7 @@
4 4
5#include <random> 5#include <random>
6#include <boost/asio.hpp> 6#include <boost/asio.hpp>
7#include <fmt/format.h>
7 8
8#include "common/logging/log.h" 9#include "common/logging/log.h"
9#include "common/param_package.h" 10#include "common/param_package.h"
@@ -279,6 +280,7 @@ void UDPClient::StartCommunication(std::size_t client, const std::string& host,
279 [this](Response::PortInfo info) { OnPortInfo(info); }, 280 [this](Response::PortInfo info) { OnPortInfo(info); },
280 [this, client](Response::PadData data) { OnPadData(data, client); }}; 281 [this, client](Response::PadData data) { OnPadData(data, client); }};
281 LOG_INFO(Input, "Starting communication with UDP input server on {}:{}", host, port); 282 LOG_INFO(Input, "Starting communication with UDP input server on {}:{}", host, port);
283 clients[client].uuid = GetHostUUID(host);
282 clients[client].host = host; 284 clients[client].host = host;
283 clients[client].port = port; 285 clients[client].port = port;
284 clients[client].active = 0; 286 clients[client].active = 0;
@@ -293,12 +295,18 @@ void UDPClient::StartCommunication(std::size_t client, const std::string& host,
293const PadIdentifier UDPClient::GetPadIdentifier(std::size_t pad_index) const { 295const PadIdentifier UDPClient::GetPadIdentifier(std::size_t pad_index) const {
294 const std::size_t client = pad_index / PADS_PER_CLIENT; 296 const std::size_t client = pad_index / PADS_PER_CLIENT;
295 return { 297 return {
296 .guid = Common::UUID{clients[client].host}, 298 .guid = clients[client].uuid,
297 .port = static_cast<std::size_t>(clients[client].port), 299 .port = static_cast<std::size_t>(clients[client].port),
298 .pad = pad_index, 300 .pad = pad_index,
299 }; 301 };
300} 302}
301 303
304const Common::UUID UDPClient::GetHostUUID(const std::string host) const {
305 const auto ip = boost::asio::ip::address_v4::from_string(host);
306 const auto hex_host = fmt::format("{:06x}", ip.to_ulong());
307 return Common::UUID{hex_host};
308}
309
302void UDPClient::Reset() { 310void UDPClient::Reset() {
303 for (auto& client : clients) { 311 for (auto& client : clients) {
304 if (client.thread.joinable()) { 312 if (client.thread.joinable()) {