forked from PaperMC/Waterfall
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
17 changed files
with
82 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
From 6870d66f4c81c4f0ea6ae7a047e9736998cd652f Mon Sep 17 00:00:00 2001 | ||
From b56f918c1ba3167e2d8ff9223afd830295e34717 Mon Sep 17 00:00:00 2001 | ||
From: Troy Frew <[email protected]> | ||
Date: Tue, 15 Nov 2016 09:07:51 -0500 | ||
Subject: [PATCH] Fixup ProtocolConstants | ||
|
||
|
||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java | ||
index 5be234d0..81def682 100644 | ||
index 40045b77..c6ad1f54 100644 | ||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java | ||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java | ||
@@ -117,6 +117,16 @@ public class ProtocolConstants | ||
@@ -118,6 +118,16 @@ public class ProtocolConstants | ||
SUPPORTED_VERSION_IDS = supportedVersionIds.build(); | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From a5f76a85a7ab7a4c5ac8a2280bce4a1b93063602 Mon Sep 17 00:00:00 2001 | ||
From fb960e8c0e54f29fc650000f64df2e131a35bae9 Mon Sep 17 00:00:00 2001 | ||
From: Techcable <[email protected]> | ||
Date: Mon, 14 Mar 2016 15:40:44 -0700 | ||
Subject: [PATCH] Optimize uuid conversions | ||
|
@@ -250,10 +250,10 @@ index e582808f..29cd91dd 100644 | |
} | ||
|
||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
index d9247fb2..43fb3208 100644 | ||
index 1d9a9ee5..616adcf1 100644 | ||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
@@ -788,7 +788,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
@@ -806,7 +806,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
@Override | ||
public String getUUID() | ||
{ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From c454b72bd9596c8dbae43ac54da10a045cb14442 Mon Sep 17 00:00:00 2001 | ||
From ec78f4a4d709b61e3320d0f68188a750a0d7d019 Mon Sep 17 00:00:00 2001 | ||
From: Techcable <[email protected]> | ||
Date: Thu, 19 May 2016 17:09:22 -0600 | ||
Subject: [PATCH] Allow invalid packet ids for forge servers | ||
|
@@ -37,10 +37,10 @@ index d79d5e5c..250e7620 100644 | |
{ | ||
packet.read( in, protocol, prot.getDirection(), protocolVersion ); | ||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java | ||
index cb5c30d5..a8a91955 100644 | ||
index 2271a2e5..d932b696 100644 | ||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java | ||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java | ||
@@ -861,14 +861,23 @@ public enum Protocol | ||
@@ -862,14 +862,23 @@ public enum Protocol | ||
return protocol; | ||
} | ||
|
||
|
@@ -66,7 +66,7 @@ index cb5c30d5..a8a91955 100644 | |
throw new BadPacketException( "Packet with id " + id + " outside of range" ); | ||
} | ||
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java | ||
index 37f86325..1b7395ad 100644 | ||
index 7a211f1b..a25a493e 100644 | ||
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java | ||
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java | ||
@@ -234,6 +234,12 @@ public class ServerConnector extends PacketHandler | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 3c900f573943775f96a381294368adf7a977337d Mon Sep 17 00:00:00 2001 | ||
From c42b40bcf61c7656d79a248c4e54553331de23e4 Mon Sep 17 00:00:00 2001 | ||
From: Janmm14 <[email protected]> | ||
Date: Sat, 12 Dec 2015 23:43:30 +0100 | ||
Subject: [PATCH] Improve server list ping logging | ||
|
@@ -7,7 +7,7 @@ This functionality of this patch was adopted upstream, however, this | |
patch remains for a few misc improvements around here | ||
|
||
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java | ||
index 1b7395ad..e670a57a 100644 | ||
index a25a493e..63920e7e 100644 | ||
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java | ||
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java | ||
@@ -522,6 +522,6 @@ public class ServerConnector extends PacketHandler | ||
|
@@ -31,10 +31,10 @@ index d408840d..cd3ed518 100644 | |
} | ||
} | ||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
index 43fb3208..4325fe23 100644 | ||
index 616adcf1..0fbe8b0d 100644 | ||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
@@ -794,20 +794,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
@@ -812,20 +812,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
@Override | ||
public String toString() | ||
{ | ||
|
@@ -57,7 +57,7 @@ index 43fb3208..4325fe23 100644 | |
|
||
@Override | ||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java | ||
index 050cc29b..740c90ec 100644 | ||
index bfd5cb5f..2dafa4d9 100644 | ||
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java | ||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java | ||
@@ -396,6 +396,6 @@ public class UpstreamBridge extends PacketHandler | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 5b5a81ae874f531cc9eab80032218531ef99d75b Mon Sep 17 00:00:00 2001 | ||
From b37e4d6c5c989c9361d83651fc34a1965875b6a4 Mon Sep 17 00:00:00 2001 | ||
From: Techcable <[email protected]> | ||
Date: Sun, 7 Feb 2016 00:01:19 -0700 | ||
Subject: [PATCH] Add a property to accept invalid ping packets | ||
|
@@ -9,10 +9,10 @@ You can enable it by setting '-Dwaterfall.acceptInvalidPackets=true' at the comm | |
Fixes #23 | ||
|
||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
index 4325fe23..b7dd5fe3 100644 | ||
index 0fbe8b0d..deb9fef3 100644 | ||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
@@ -323,10 +323,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
@@ -325,10 +325,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
thisState = State.PING; | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From e9771f21d74b050cbab4e13c3a7bf2172be0318a Mon Sep 17 00:00:00 2001 | ||
From 8047adc8debd73a2e4616159361b9102cb37c978 Mon Sep 17 00:00:00 2001 | ||
From: phenomax <[email protected]> | ||
Date: Thu, 10 Aug 2017 18:41:17 +0200 | ||
Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent | ||
|
@@ -51,10 +51,10 @@ similarity index 100% | |
rename from proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java | ||
rename to api/src/main/java/net/md_5/bungee/connection/LoginResult.java | ||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
index b7dd5fe3..5fd26bf1 100644 | ||
index deb9fef3..05261ccf 100644 | ||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
@@ -644,7 +644,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
@@ -653,7 +653,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
}; | ||
|
||
// fire login event | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From af0c08cce0e513f514f9f72ad3d834ecae796acf Mon Sep 17 00:00:00 2001 | ||
From 1f05c86d058af37b2ace4d0e9701bc2d22af90f9 Mon Sep 17 00:00:00 2001 | ||
From: Gabriele C <[email protected]> | ||
Date: Thu, 8 Feb 2018 19:10:52 +0100 | ||
Subject: [PATCH] Optionally log InitialHandler connections | ||
|
@@ -61,10 +61,10 @@ index ef44d334..4ff8da6d 100644 | |
public String getGameVersion() { | ||
return gameVersion; | ||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
index 5fd26bf1..ccc80506 100644 | ||
index 05261ccf..fcd973e5 100644 | ||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
@@ -380,7 +380,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
@@ -388,7 +388,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
case 3: | ||
transferred = handshake.getRequestedProtocol() == 3; | ||
// Login | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 6c6d0092941ba49d117a87cfe38b45203b2b7a05 Mon Sep 17 00:00:00 2001 | ||
From 1cc7dad7cc68e2853fa0fa5bc69960e4783fe948 Mon Sep 17 00:00:00 2001 | ||
From: Shane Freeder <[email protected]> | ||
Date: Mon, 14 Jan 2019 03:35:21 +0000 | ||
Subject: [PATCH] Provide an option to disable entity metadata rewriting | ||
|
@@ -57,7 +57,7 @@ index 4ff8da6d..e860214f 100644 | |
+ } | ||
} | ||
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java | ||
index 307a417b..43d13e36 100644 | ||
index e10f33ad..c0c523e3 100644 | ||
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java | ||
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java | ||
@@ -264,7 +264,8 @@ public class ServerConnector extends PacketHandler | ||
|
@@ -123,10 +123,10 @@ index 307a417b..43d13e36 100644 | |
(byte) 0, login.getDeathLocation(), login.getPortalCooldown() ) ); | ||
if ( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_14 ) | ||
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java | ||
index 86223e17..ee527938 100644 | ||
index d15f2bcc..b8762fc0 100644 | ||
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java | ||
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java | ||
@@ -816,4 +816,9 @@ public final class UserConnection implements ProxiedPlayer | ||
@@ -821,4 +821,9 @@ public final class UserConnection implements ProxiedPlayer | ||
|
||
unsafe().sendPacket( new Transfer( host, port ) ); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,17 @@ | ||
From bc847940495ff523e90196d7f6eaa7cfbed5e974 Mon Sep 17 00:00:00 2001 | ||
From 81ae8ba8065f7f01bae1a9b2f2d37cd90f5fbcd8 Mon Sep 17 00:00:00 2001 | ||
From: Colin Godsey <[email protected]> | ||
Date: Tue, 16 Apr 2019 07:25:52 -0600 | ||
Subject: [PATCH] OSX native zlib and crypto | ||
|
||
|
||
diff --git a/native/compile-native.sh b/native/compile-native.sh | ||
index f37c9fdd..a50b52bf 100755 | ||
index c342e782..0af5f481 100755 | ||
--- a/native/compile-native.sh | ||
+++ b/native/compile-native.sh | ||
@@ -8,7 +8,16 @@ echo "Compiling mbedtls" | ||
echo "Compiling zlib" | ||
@@ -9,6 +9,16 @@ echo "Compiling zlib" | ||
(cd zlib && CFLAGS=-fPIC ./configure --static && make) | ||
|
||
-CXX="g++ -shared -fPIC -Wl,--wrap=memcpy -O3 -Wall -Werror -I$JAVA_HOME/include/ -I$JAVA_HOME/include/linux/" | ||
CXX="g++ -shared -fPIC -O3 -Wall -Werror -I$JAVA_HOME/include/ -I$JAVA_HOME/include/linux/" | ||
+# Waterfall - rewrite below to extend platform support | ||
|
||
-$CXX -Imbedtls/include src/main/c/NativeCipherImpl.cpp -o src/main/resources/native-cipher.so mbedtls/library/libmbedcrypto.a | ||
|
@@ -29,39 +28,43 @@ index f37c9fdd..a50b52bf 100755 | |
+$CXX -Imbedtls/include src/main/c/NativeCipherImpl.cpp -o src/main/resources/${PREFIX:-}native-cipher.so mbedtls/library/libmbedcrypto.a $CXX_ARGS | ||
+$CXX -Izlib src/main/c/NativeCompressImpl.cpp -o src/main/resources/${PREFIX:-}native-compress.so zlib/libz.a $CXX_ARGS | ||
diff --git a/native/src/main/c/NativeCipherImpl.cpp b/native/src/main/c/NativeCipherImpl.cpp | ||
index 9de328ea..42fdb540 100644 | ||
index cfe5f089..42fdb540 100644 | ||
--- a/native/src/main/c/NativeCipherImpl.cpp | ||
+++ b/native/src/main/c/NativeCipherImpl.cpp | ||
@@ -5,10 +5,12 @@ | ||
@@ -4,6 +4,14 @@ | ||
#include <mbedtls/aes.h> | ||
#include "net_md_5_bungee_jni_cipher_NativeCipherImpl.h" | ||
|
||
// Support for CentOS 6 | ||
+// Support for CentOS 6 | ||
+#if __linux__ // Waterfall | ||
__asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); | ||
extern "C" void *__wrap_memcpy(void *dest, const void *src, size_t n) { | ||
return memcpy(dest, src, n); | ||
} | ||
+__asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); | ||
+extern "C" void *__wrap_memcpy(void *dest, const void *src, size_t n) { | ||
+ return memcpy(dest, src, n); | ||
+} | ||
+#endif // Waterfall | ||
+ | ||
typedef unsigned char byte; | ||
|
||
struct crypto_context { | ||
diff --git a/native/src/main/c/NativeCompressImpl.cpp b/native/src/main/c/NativeCompressImpl.cpp | ||
index b490ede5..8fa0bd61 100644 | ||
index 4b93a56a..8fa0bd61 100644 | ||
--- a/native/src/main/c/NativeCompressImpl.cpp | ||
+++ b/native/src/main/c/NativeCompressImpl.cpp | ||
@@ -5,10 +5,12 @@ | ||
@@ -4,6 +4,14 @@ | ||
#include <zlib.h> | ||
#include "net_md_5_bungee_jni_zlib_NativeCompressImpl.h" | ||
|
||
// Support for CentOS 6 | ||
+// Support for CentOS 6 | ||
+#if __linux__ // Waterfall | ||
__asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); | ||
extern "C" void *__wrap_memcpy(void *dest, const void *src, size_t n) { | ||
return memcpy(dest, src, n); | ||
} | ||
+__asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); | ||
+extern "C" void *__wrap_memcpy(void *dest, const void *src, size_t n) { | ||
+ return memcpy(dest, src, n); | ||
+} | ||
+#endif // Waterfall | ||
+ | ||
typedef unsigned char byte; | ||
|
||
static jfieldID consumedID; | ||
diff --git a/native/src/main/java/net/md_5/bungee/jni/NativeCode.java b/native/src/main/java/net/md_5/bungee/jni/NativeCode.java | ||
index 62bdaa0e..f4f6e6ab 100644 | ||
--- a/native/src/main/java/net/md_5/bungee/jni/NativeCode.java | ||
|
@@ -1215,5 +1218,5 @@ literal 0 | |
HcmV?d00001 | ||
|
||
-- | ||
2.43.0 | ||
2.44.0.windows.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 3a229a4d830893b705a69b0241530b052ece4d0f Mon Sep 17 00:00:00 2001 | ||
From 58191fa140fef280b5a7d3db8c7d7590af3e65a2 Mon Sep 17 00:00:00 2001 | ||
From: Shane Freeder <[email protected]> | ||
Date: Mon, 25 Nov 2019 19:54:06 +0000 | ||
Subject: [PATCH] Speed up some common exceptions | ||
|
@@ -172,7 +172,7 @@ index 237955ab..d0bd4d75 100644 | |
+ // Waterfall end | ||
} | ||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
index ccc80506..d8d65093 100644 | ||
index fcd973e5..473edd76 100644 | ||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
@@ -21,6 +21,8 @@ import javax.crypto.SecretKey; | ||
|
@@ -184,7 +184,7 @@ index ccc80506..d8d65093 100644 | |
import lombok.Getter; | ||
import lombok.RequiredArgsConstructor; | ||
import lombok.ToString; | ||
@@ -502,6 +504,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
@@ -510,6 +512,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" ); | ||
|
||
SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request ); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
From a04746f37aaa61f06c2189aa7976f37cf1a7d53d Mon Sep 17 00:00:00 2001 | ||
From c8f081e2f5d791491a117459bf61938aef9b1bf8 Mon Sep 17 00:00:00 2001 | ||
From: theminecoder <[email protected]> | ||
Date: Sun, 19 Jul 2020 10:18:23 +1000 | ||
Subject: [PATCH] Add auth url option | ||
|
||
|
||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
index d8d65093..ffb078d6 100644 | ||
index 473edd76..d095e5f9 100644 | ||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
@@ -83,6 +83,8 @@ import net.md_5.bungee.util.QuietException; | ||
|
@@ -17,7 +17,7 @@ index d8d65093..ffb078d6 100644 | |
private final BungeeCord bungee; | ||
private ChannelWrapper ch; | ||
@Getter | ||
@@ -530,7 +532,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
@@ -538,7 +540,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
String encodedHash = URLEncoder.encode( new BigInteger( sha.digest() ).toString( 16 ), "UTF-8" ); | ||
|
||
String preventProxy = ( BungeeCord.getInstance().config.isPreventProxyConnections() && getSocketAddress() instanceof InetSocketAddress ) ? "&ip=" + URLEncoder.encode( getAddress().getAddress().getHostAddress(), "UTF-8" ) : ""; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From cb4306f026fe37b6f2a417026c208e5b8e5bfca5 Mon Sep 17 00:00:00 2001 | ||
From 7219abfab73fa8811cc0424c849a7ef1e80f2e42 Mon Sep 17 00:00:00 2001 | ||
From: FivePB <[email protected]> | ||
Date: Tue, 16 Nov 2021 21:15:32 +0100 | ||
Subject: [PATCH] Configurable plugin messaging limits | ||
|
@@ -83,10 +83,10 @@ index b88e3c8a..da0efa36 100644 | |
+ } | ||
} | ||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
index ffb078d6..bb9063f6 100644 | ||
index d095e5f9..864cb119 100644 | ||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
@@ -830,9 +830,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
@@ -848,9 +848,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
|
||
for ( String id : content.split( "\0" ) ) | ||
{ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,22 @@ | ||
From 0b563c7cd2441857913c6ac17fe637b8b9fdad6d Mon Sep 17 00:00:00 2001 | ||
From 103736fccb45125fc9e618dad694622a0c75e152 Mon Sep 17 00:00:00 2001 | ||
From: Shane Freeder <[email protected]> | ||
Date: Sun, 8 May 2022 12:04:30 +0100 | ||
Subject: [PATCH] Improve login state transition | ||
|
||
|
||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
index bb9063f6..f5959b66 100644 | ||
index 864cb119..6344462c 100644 | ||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java | ||
@@ -504,6 +504,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
@@ -512,6 +512,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
{ | ||
Preconditions.checkState( thisState == State.ENCRYPT, "Not expecting ENCRYPT" ); | ||
Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" ); | ||
+ thisState = State.FINISHING; // Waterfall - move earlier - There is no verification of this later (and this is not API) | ||
|
||
SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request ); | ||
// Waterfall start | ||
@@ -558,7 +559,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
@@ -566,7 +567,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection | ||
} | ||
} | ||
}; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
From 17e3c7512e36d9334f871131a650de6912ab97ae Mon Sep 17 00:00:00 2001 | ||
From 1c79186994951aae060893302761cd57366f971a Mon Sep 17 00:00:00 2001 | ||
From: Shane Freeder <[email protected]> | ||
Date: Sun, 12 Jun 2022 06:45:54 +0100 | ||
Subject: [PATCH] Add protocol version to packet not found message | ||
|
||
Also avoids a double get, but, this is probably trivial | ||
|
||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java | ||
index a8a91955..414d4578 100644 | ||
index d932b696..7a29eb0d 100644 | ||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java | ||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java | ||
@@ -2,6 +2,8 @@ package net.md_5.bungee.protocol; | ||
|
@@ -18,7 +18,7 @@ index a8a91955..414d4578 100644 | |
import gnu.trove.map.TIntObjectMap; | ||
import gnu.trove.map.TObjectIntMap; | ||
import gnu.trove.map.hash.TIntObjectHashMap; | ||
@@ -942,9 +944,12 @@ public enum Protocol | ||
@@ -943,9 +945,12 @@ public enum Protocol | ||
{ | ||
throw new BadPacketException( "Unsupported protocol version" ); | ||
} | ||
|
Oops, something went wrong.