Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-24 23:30:10 +01:00
142 Zeilen
9.0 KiB
Diff
142 Zeilen
9.0 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: Andrew Steinborn <git@steinborn.me>
|
||
|
Date: Tue, 11 May 2021 17:39:22 -0400
|
||
|
Subject: [PATCH] Add Unix domain socket support
|
||
|
|
||
|
For Windows and ARM support, JEP-380 is required:
|
||
|
https://inside.java/2021/02/03/jep380-unix-domain-sockets-channels/
|
||
|
This will be possible as of the Minecraft 1.17 Java version bump.
|
||
|
|
||
|
Tested-by: Mariell Hoversholm <proximyst@proximyst.com>
|
||
|
Reviewed-by: Mariell Hoversholm <proximyst@proximyst.com>
|
||
|
|
||
|
diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
|
||
|
index 3ba9c38fc44a8edba9b504112a383249052a0035..cc823a1337bea3ad552687add46706128311f26d 100644
|
||
|
--- a/src/main/java/net/minecraft/network/Connection.java
|
||
|
+++ b/src/main/java/net/minecraft/network/Connection.java
|
||
|
@@ -564,6 +564,11 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
|
||
|
// Spigot Start
|
||
|
public SocketAddress getRawAddress()
|
||
|
{
|
||
|
+ // Paper start - this can be nullable in the case of a Unix domain socket, so if it is, fake something
|
||
|
+ if (this.channel.remoteAddress() == null) {
|
||
|
+ return new java.net.InetSocketAddress(java.net.InetAddress.getLoopbackAddress(), 0);
|
||
|
+ }
|
||
|
+ // Paper end
|
||
|
return this.channel.remoteAddress();
|
||
|
}
|
||
|
// Spigot End
|
||
|
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||
|
index 0198268bc614b190cd84f625a62f6c55247a01c8..2821fa9505d6b5adc8e776219df024713fc1a486 100644
|
||
|
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||
|
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||
|
@@ -222,6 +222,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||
|
this.setEnforceWhitelist(dedicatedserverproperties.enforceWhitelist);
|
||
|
// this.saveData.setGameType(dedicatedserverproperties.gamemode); // CraftBukkit - moved to world loading
|
||
|
DedicatedServer.LOGGER.info("Default game type: {}", dedicatedserverproperties.gamemode);
|
||
|
+ // Paper start - Unix domain socket support
|
||
|
+ java.net.SocketAddress bindAddress;
|
||
|
+ if (this.getLocalIp().startsWith("unix:")) {
|
||
|
+ if (!io.netty.channel.epoll.Epoll.isAvailable()) {
|
||
|
+ DedicatedServer.LOGGER.fatal("**** INVALID CONFIGURATION!");
|
||
|
+ DedicatedServer.LOGGER.fatal("You are trying to use a Unix domain socket but you're not on a supported OS.");
|
||
|
+ return false;
|
||
|
+ } else if (!com.destroystokyo.paper.PaperConfig.velocitySupport && !org.spigotmc.SpigotConfig.bungee) {
|
||
|
+ DedicatedServer.LOGGER.fatal("**** INVALID CONFIGURATION!");
|
||
|
+ DedicatedServer.LOGGER.fatal("Unix domain sockets require IPs to be forwarded from a proxy.");
|
||
|
+ return false;
|
||
|
+ }
|
||
|
+ bindAddress = new io.netty.channel.unix.DomainSocketAddress(this.getLocalIp().substring("unix:".length()));
|
||
|
+ } else {
|
||
|
InetAddress inetaddress = null;
|
||
|
|
||
|
if (!this.getLocalIp().isEmpty()) {
|
||
|
@@ -231,12 +245,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||
|
if (this.getPort() < 0) {
|
||
|
this.setPort(dedicatedserverproperties.serverPort);
|
||
|
}
|
||
|
+ bindAddress = new java.net.InetSocketAddress(inetaddress, this.getPort());
|
||
|
+ }
|
||
|
+ // Paper end
|
||
|
|
||
|
this.initializeKeyPair();
|
||
|
DedicatedServer.LOGGER.info("Starting Minecraft server on {}:{}", this.getLocalIp().isEmpty() ? "*" : this.getLocalIp(), this.getPort());
|
||
|
|
||
|
try {
|
||
|
- this.getConnection().startTcpServerListener(inetaddress, this.getPort());
|
||
|
+ this.getConnection().bind(bindAddress); // Paper - Unix domain socket support
|
||
|
} catch (IOException ioexception) {
|
||
|
DedicatedServer.LOGGER.warn("**** FAILED TO BIND TO PORT!");
|
||
|
DedicatedServer.LOGGER.warn("The exception was: {}", ioexception.toString());
|
||
|
diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
|
||
|
index bcc19d0a4b6c5f683dc416e27a13705b57213d21..67a17ced9460bc83a6f564b38fdb43b1a7f1b8a0 100644
|
||
|
--- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
|
||
|
+++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
|
||
|
@@ -70,7 +70,12 @@ public class ServerConnectionListener {
|
||
|
this.running = true;
|
||
|
}
|
||
|
|
||
|
+ // Paper start
|
||
|
public void startTcpServerListener(@Nullable InetAddress address, int port) throws IOException {
|
||
|
+ bind(new java.net.InetSocketAddress(address, port));
|
||
|
+ }
|
||
|
+ public void bind(java.net.SocketAddress address) throws IOException {
|
||
|
+ // Paper end
|
||
|
List list = this.channels;
|
||
|
|
||
|
synchronized (this.channels) {
|
||
|
@@ -78,7 +83,11 @@ public class ServerConnectionListener {
|
||
|
LazyLoadedValue lazyinitvar;
|
||
|
|
||
|
if (Epoll.isAvailable() && this.server.isEpollEnabled()) {
|
||
|
+ if (address instanceof io.netty.channel.unix.DomainSocketAddress) {
|
||
|
+ oclass = io.netty.channel.epoll.EpollServerDomainSocketChannel.class;
|
||
|
+ } else {
|
||
|
oclass = EpollServerSocketChannel.class;
|
||
|
+ }
|
||
|
lazyinitvar = ServerConnectionListener.SERVER_EPOLL_EVENT_GROUP;
|
||
|
ServerConnectionListener.LOGGER.info("Using epoll channel type");
|
||
|
} else {
|
||
|
@@ -106,7 +115,7 @@ public class ServerConnectionListener {
|
||
|
((Connection) object).setListener(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));
|
||
|
io.papermc.paper.network.ChannelInitializeListenerHolder.callListeners(channel); // Paper
|
||
|
}
|
||
|
- }).group((EventLoopGroup) lazyinitvar.get()).localAddress(address, port)).option(ChannelOption.AUTO_READ, false).bind().syncUninterruptibly()); // CraftBukkit
|
||
|
+ }).group((EventLoopGroup) lazyinitvar.get()).localAddress(address)).option(ChannelOption.AUTO_READ, false).bind().syncUninterruptibly()); // CraftBukkit // Paper
|
||
|
}
|
||
|
}
|
||
|
|
||
|
diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
|
||
|
index 4e055a41de3ee410682cc05a3b883ac8babeb290..e1fbb207d6921516c7423e9a3cded8efb5676d49 100644
|
||
|
--- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
|
||
|
+++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
|
||
|
@@ -44,6 +44,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
|
||
|
this.connection.setProtocol(ConnectionProtocol.LOGIN);
|
||
|
// CraftBukkit start - Connection throttle
|
||
|
try {
|
||
|
+ if (!(this.connection.channel.localAddress() instanceof io.netty.channel.unix.DomainSocketAddress)) { // Paper - the connection throttle is useless when you have a Unix domain socket
|
||
|
long currentTime = System.currentTimeMillis();
|
||
|
long connectionThrottle = this.server.server.getConnectionThrottle();
|
||
|
InetAddress address = ((java.net.InetSocketAddress) this.connection.getRemoteAddress()).getAddress();
|
||
|
@@ -72,6 +73,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
|
||
|
}
|
||
|
}
|
||
|
}
|
||
|
+ } // Paper - add closing bracket for if check above
|
||
|
} catch (Throwable t) {
|
||
|
org.apache.logging.log4j.LogManager.getLogger().debug("Failed to check connection throttle", t);
|
||
|
}
|
||
|
@@ -120,8 +122,11 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
|
||
|
//if (org.spigotmc.SpigotConfig.bungee) { // Paper - comment out, we check above!
|
||
|
String[] split = packet.hostName.split("\00");
|
||
|
if ( ( split.length == 3 || split.length == 4 ) && ( BYPASS_HOSTCHECK || HOST_PATTERN.matcher( split[1] ).matches() ) ) { // Paper
|
||
|
+ // Paper start - Unix domain socket support
|
||
|
+ java.net.SocketAddress socketAddress = connection.getRemoteAddress();
|
||
|
packet.hostName = split[0];
|
||
|
- connection.address = new java.net.InetSocketAddress(split[1], ((java.net.InetSocketAddress) connection.getRemoteAddress()).getPort());
|
||
|
+ connection.address = new java.net.InetSocketAddress(split[1], socketAddress instanceof java.net.InetSocketAddress ? ((java.net.InetSocketAddress) socketAddress).getPort() : 0);
|
||
|
+ // Paper end
|
||
|
connection.spoofedUUID = com.mojang.util.UUIDTypeAdapter.fromString( split[2] );
|
||
|
} else
|
||
|
{
|