From 2b6c283cd15b81043e274aea8a3ff48ec8cb35c8 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Fri, 17 Jan 2025 06:17:32 -0500 Subject: [PATCH] [-] Revert aeab453e --- .../icu/samnyan/aqua/sega/maimai2/worldslink/FutariRelay.kt | 5 +++++ .../icu/samnyan/aqua/sega/maimai2/worldslink/FutariTypes.kt | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/worldslink/FutariRelay.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/worldslink/FutariRelay.kt index b323b8c5..1e5d47af 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/worldslink/FutariRelay.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/worldslink/FutariRelay.kt @@ -64,6 +64,11 @@ fun ActiveClient.handle(msg: Msg) { lastHeartbeat = millis() send(ctlMsg(Command.CTL_HEARTBEAT)) } + Command.DATA_BROADCAST -> { + // Broadcast to all clients. This is only used in UDP so SID is always 0 + if (msg.proto != Proto.UDP) return log.warn("TCP Broadcast received, something is wrong.") + clients.values.forEach { it.send(msg.copy(src = stubIp)) } + } Command.DATA_SEND -> { target ?: return log.warn("Send: Target not found: ${msg.dst}") diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/worldslink/FutariTypes.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/worldslink/FutariTypes.kt index 58fdbcf9..c011af57 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/worldslink/FutariTypes.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/worldslink/FutariTypes.kt @@ -8,9 +8,11 @@ import ext.str object Command { // Control plane const val CTL_START = 1u + const val CTL_BIND = 2u const val CTL_HEARTBEAT = 3u const val CTL_TCP_CONNECT = 4u // Accept a new multiplexed TCP stream const val CTL_TCP_ACCEPT = 5u + const val CTL_TCP_ACCEPT_ACK = 6u const val CTL_TCP_CLOSE = 7u // Data plane