From 4ef9a33f4c803c65de535b10e12d488164924b72 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Sun, 1 Jan 2023 11:30:39 -0500 Subject: [PATCH] Add native info to dump --- .../velocitypowered/proxy/network/TransportType.java | 2 +- .../velocitypowered/proxy/util/InformationUtils.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/proxy/src/main/java/com/velocitypowered/proxy/network/TransportType.java b/proxy/src/main/java/com/velocitypowered/proxy/network/TransportType.java index 1082d1e97..4780d97e4 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/network/TransportType.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/network/TransportType.java @@ -35,7 +35,7 @@ import io.netty.channel.socket.nio.NioSocketChannel; import java.util.concurrent.ThreadFactory; import java.util.function.BiFunction; -enum TransportType { +public enum TransportType { NIO("NIO", NioServerSocketChannel::new, NioSocketChannel::new, NioDatagramChannel::new, diff --git a/proxy/src/main/java/com/velocitypowered/proxy/util/InformationUtils.java b/proxy/src/main/java/com/velocitypowered/proxy/util/InformationUtils.java index 2199dfa19..22d47eee9 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/util/InformationUtils.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/util/InformationUtils.java @@ -32,6 +32,8 @@ import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.config.ProxyConfig; import com.velocitypowered.api.proxy.server.RegisteredServer; import com.velocitypowered.api.util.ProxyVersion; +import com.velocitypowered.natives.util.Natives; +import com.velocitypowered.proxy.network.TransportType; import java.net.Inet4Address; import java.net.Inet6Address; import java.net.InetAddress; @@ -102,6 +104,14 @@ public enum InformationUtils { envInfo.addProperty("operatingSystemArchitecture", System.getProperty("os.arch")); envInfo.addProperty("javaVersion", System.getProperty("java.version")); envInfo.addProperty("javaVendor", System.getProperty("java.vendor")); + + JsonObject listenerInfo = new JsonObject(); + listenerInfo.addProperty("listenerType", TransportType.bestType().toString()); + listenerInfo.addProperty("compression", Natives.compress.getLoadedVariant()); + listenerInfo.addProperty("encryption", Natives.cipher.getLoadedVariant()); + + envInfo.add("listener", listenerInfo); + return envInfo; }