SteamWar/Velocity
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,233 Commits 2 Branches 0 Tags
70698246bf20c669ed030d4d1a6e57cc9249d7a3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Steinborn 70698246bf Get everything compiling and Checkstyle clean 2020-06-28 23:20:46 -04:00
Andrew Steinborn c2edd82b16 Use more idiomatic adventure text serializer 2020-06-28 23:13:57 -04:00
Andrew Steinborn 0c6039a773 Make sure console is included in the ProxyServer audience 2020-06-28 22:57:28 -04:00
Andrew Steinborn c4f143a2bc Implement adventure title APIs 2020-06-28 22:52:46 -04:00
Andrew Steinborn 5c02d6b007 RegisteredServer and ProxyServer now implement MultiAudience 2020-06-28 22:01:45 -04:00
Andrew Steinborn 8ef2835a47 Fix API breaking change, deprecate ProxyAudience 2020-06-28 21:44:44 -04:00
Andrew Steinborn 70a989e955 Minor cleanup and add some missing Deprecated tags 2020-06-28 21:29:25 -04:00
Andrew Steinborn 2e7a598916 Initial commit of adventure-adapted Velocity API. 2020-06-28 21:23:01 -04:00
Andrew Steinborn 7fd76962f2 Graceful fallback if these values are absent 2020-06-27 23:03:47 -04:00
Andrew Steinborn 62703780e1 Fix a few areas of concern spotted by JITWatch 2020-06-27 21:33:05 -04:00
Andrew Steinborn 7e1f01f13a Bump Guice version to support Java 14 plugins 2020-06-26 23:44:08 -04:00
Andrew Steinborn 51819b563f Tolerate broken brand sending by some bots. 2020-06-24 22:32:44 -04:00
Andrew Steinborn 28d2366c73 Switch Velocity from existing toml4j+homebrew TOML serializer to night-config. 
This allows us to allow many more valid configurations and allows us to eliminate a bunch of ugly hacks.
 2020-06-24 21:31:39 -04:00
Andrew Steinborn 4bebda2549 Loosen Checkstyle rules for this. 2020-06-24 11:34:13 -04:00
Andrew Steinborn 7eaa6ef939 Fix saving of escaped strings 2020-06-24 11:21:34 -04:00
Andrew Steinborn 2f11c22003 Add Minecraft 1.16.1 compatibility 2020-06-24 10:07:24 -04:00
Andrew Steinborn 283d8d71b6 Restore compatibility with TCPShield plugin with recent change 2020-06-24 00:07:27 -04:00
Andrew Steinborn 780e1c8be5 Handle duplicates from server pings gracefully 2020-06-23 23:03:19 -04:00
Andrew Steinborn fd231c71fd Restore server disconnect messages. 2020-06-23 21:57:16 -04:00
Andrew Steinborn 24cd1f4da0 Allow showing ping requests in the console. 
The default is false, but this can be enabled in the configuration if desired.
 2020-06-23 17:05:01 -04:00
Andrew Steinborn 1fe01596d2 Fix escaping issues with spaces in server names 
Fixes #320
 2020-06-23 16:07:25 -04:00
Andrew Steinborn f7f4620b53 Temporarily revert DisconnectEvent changes due to some issues 2020-06-23 14:48:01 -04:00
Andrew Steinborn ae6afc8b18 Fix Minecraft 1.7 support (bad merge) 2020-06-23 13:17:36 -04:00
Andrew Steinborn 68e5b64c33 Don't contradict yourself. 2020-06-23 10:00:08 -04:00
Andrew Steinborn 43223548f4 Update outdated readme for natives. 2020-06-23 09:57:04 -04:00
Andrew Steinborn 0684e08f67 Really suppress the initial connection stuff 2020-06-23 08:32:47 -04:00
Andrew Steinborn e9cc390abd Revert "Clean up ClientPlaySessionHandler#handle(PluginMessage)" 
This reverts commit ac4359ad21.

Suspected to be causing problems with Fabric and Forge
 2020-06-23 08:22:09 -04:00
Andrew Steinborn df82c0b566 Suppress some really annoying spam 2020-06-23 07:56:19 -04:00
Andrew Steinborn 9dda0ba9dd Commit the other aarch64 native recompiled on Debian 9 2020-06-23 07:55:41 -04:00
Andrew Steinborn f00301e15b Add aarch64 natives compiled on Debian 9 2020-06-22 20:56:07 -04:00
Andrew Steinborn 316bf46181 Bump to Netty 4.1.50.Final again 2020-06-22 20:42:42 -04:00
Andrew Steinborn 6ec2ad3c7a Anticipatory bump to final Minecraft 1.16 version 2020-06-22 20:25:38 -04:00
Andrew Steinborn 676ce7b7fd Use compression native compiled on CentOS 7 2020-06-22 20:17:52 -04:00
Andrew Steinborn 1bb84f81df Rewrite native crypto to use OpenSSL 
OpenSSL is much more portable and optimized (important for aarch64) and most systems already have a version.

Unfortunately, OpenSSL likes to break their ABI. Thankfully, Velocity's natives system is very flexible largely, so we can provide multiple versions of this crypto.

Versions of the dynamically-linked crypto were compiled on CentOS 7 (still supported until 2024, uses OpenSSL 1.0.x) and Debian 9 (the oldest distro including OpenSSL 1.1.0, whose LTS supports ends in 2022). The choice of distros was intended to cover most modern distributions (2014 and afterwards).

An ARM compilation (using Debian 9) will be published soon.
 2020-06-22 20:14:46 -04:00
Andrew Steinborn bd0455caa0 Remove file 2020-06-22 07:46:03 -04:00
Andrew Steinborn 877f98b87a Fix typo in LibdeflateVelocityCompressor 2020-06-21 14:14:41 -04:00
Andrew Steinborn 91743aaa9d Merge branch 'dev/1.1.0' into future/1.16-velocity-1.1.0 
# Conflicts:
#	proxy/build.gradle
 2020-06-21 13:40:19 -04:00
Andrew Steinborn ab9115178b Merge branch 'decode-multiple' into dev/1.1.0 2020-06-21 13:39:24 -04:00
Andrew Steinborn d1a5d8dd82 Fix compile on JDK 8 and bad merge 2020-06-21 13:38:05 -04:00
Andrew Steinborn 09f71dede9 Rebase #310 on Velocity 1.1.0 
Totally untested, proceed with caution.
 2020-06-20 23:26:24 -04:00
Andrew Steinborn ada35ff286 Merge branch 'Xernium-future/1.16' into future/1.16-velocity-1.1.0 
# Conflicts:
#	.travis.yml
#	api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java
#	build.gradle
#	proxy/build.gradle
#	proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
#	proxy/src/main/java/com/velocitypowered/proxy/connection/backend/VelocityServerConnection.java
#	proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
#	proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
#	proxy/src/main/java/com/velocitypowered/proxy/network/netty/DiscardHandler.java
#	proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java
#	proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java
#	proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftCompressDecoder.java
#	proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftDecoder.java
#	proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/JoinGame.java
#	proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/Respawn.java
#	proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ServerLoginSuccess.java
#	proxy/src/test/java/com/velocitypowered/proxy/plugin/util/PluginDependencyUtilsTest.java
 2020-06-20 23:24:32 -04:00
Andrew Steinborn cd9bb61f20 Merge branch 'future/1.16' of https://github.com/Xernium/Velocity into Xernium-future/1.16 2020-06-20 23:11:19 -04:00
Andrew Steinborn d6b1bc26d8 Read target of Forward message properly. Fixes #318 2020-06-19 05:36:52 -04:00
Andrew Steinborn d1cbc7028a Merge branch 'dev/1.1.0' into decode-multiple 2020-06-19 05:23:20 -04:00
Andrew Steinborn f8e20ab3a7 Fix tab complete using proper vanilla limit. 2020-06-19 05:22:35 -04:00
Andrew Steinborn b79d2d4a94 Fix tab complete using proper vanilla limit. 2020-06-19 05:22:19 -04:00
Andrew Steinborn 0109f4477a Complete the teardown future anyway 2020-06-12 07:27:51 -04:00
Andrew Steinborn 8a6e77689b Checkstyle strikes again 2020-06-12 07:26:25 -04:00
Andrew Steinborn 8b8fd284b3 Call DisconnectEvent explicitly instead of relying on ConnectedPlayer#teardown() to do it for us 
Should fix (but not verified) #289
 2020-06-12 07:24:17 -04:00
Andrew Steinborn ac4359ad21 Clean up ClientPlaySessionHandler#handle(PluginMessage) 2020-06-12 07:16:43 -04:00
Andrew Steinborn f4bc2ac131 Regenerate with random secret if not present in velocity.toml. 2020-06-12 03:10:25 -04:00
Andrew Steinborn 9bece076f5 Remove old Checker Framework relics. 
Proper Checker Framework support needs to wait for a major Velocity version and almost necessities a total refactor, if not rewrite, of Velocity.
 2020-06-11 02:08:04 -04:00
Andrew Steinborn cf5f7fa38f Fix a typo. 2020-06-11 01:56:41 -04:00
Andrew Steinborn 6e7c0298de Remove Netty async DNS resolver completely 
It "mostly works" - but it's not good enough. Instead, we'll offload
the DNS resolution outside the event loop. This is a middle-ground approach between doing the resolution on the calling method (and potentially a Netty I/O thread) and using the intermittently broken Netty async DNS resolver.
 2020-06-11 01:54:12 -04:00
Andrew Steinborn f3d5c986da Add Velocity compression native for aarch64 
This native has been compiled and tested on Ubuntu 18.04 aarch64 on AWS Graviton2.

The cipher native is at the moment unlikely to provide a performance boost as mbed TLS doesn't provide an accelerated AES extension.
 2020-06-04 15:22:03 -04:00
Andrew Steinborn 31d1871bd5 Check for AARCH64. 2020-06-04 15:03:27 -04:00
Andrew Steinborn bb69481f99 Lay down foundation for cross-architecture natives 
We have dropped the rarely used kqueue and replaced it with the new Netty aarch64
native. In addition, lay down the foundation for other aarch64 natives.
 2020-06-04 14:59:22 -04:00
Andrew Steinborn 456b4b217f Run closeWith() logic in the event loop 2020-06-04 01:35:32 -04:00
Andrew Steinborn ee4bae60a9 Merge branch 'dev/1.1.0' into decode-multiple 2020-06-03 12:18:43 -04:00
Andrew Steinborn 669bd14779 Remove duplicate in-flight connection reset 2020-06-03 12:18:29 -04:00
Andrew Steinborn 042a9df4f1 Merge branch 'dev/1.1.0' into decode-multiple 2020-06-03 12:13:34 -04:00
Andrew SteinbornandGitHub 40ec39aa5e Merge pull request #316 from lucko/fix/cleanup-config 
Fix config formatting
 2020-06-02 20:03:48 -04:00
Andrew SteinbornandGitHub e3084e21a7 Merge pull request #315 from lucko/feature/bungeeguard 
Implement legacy forwarding BungeeGuard handshake support
 2020-06-02 19:36:24 -04:00
Andrew Steinborn 46e92a069b Fix an issue with too short not breaking the loop 2020-05-31 14:01:27 -04:00
Andrew Steinborn f27aa8e3ba Handle empty packets too 2020-05-31 09:54:47 -04:00
Andrew Steinborn c856635ac5 Try two, with improved state maintenance and some bugs fixed 2020-05-31 08:14:33 -04:00
Andrew Steinborn 3a8ba76f25 This did not work :( 2020-05-31 07:55:19 -04:00
Andrew Steinborn 869f2a6b32 Merge branch 'dev/1.1.0' into decode-multiple 2020-05-29 21:37:10 -04:00
Andrew Steinborn e83662e8c3 Clean up imports and remove some legacy declarations. 2020-05-29 21:36:58 -04:00
Andrew Steinborn 11fb5f2be3 Simplify the discard logic. 2020-05-29 21:35:07 -04:00
Andrew Steinborn dd2e1ad241 Handle partially sent varints better 2020-05-29 21:11:21 -04:00
Andrew Steinborn b6f1dcc166 Optimize varint frame decoding again 
Use ByteProcessor in a controlled matter in one specific case. Performance measurements with my Ryzen 5 3600 indicate a 25-35% improvement in time spent framing incoming packets.
 2020-05-29 20:52:04 -04:00
Andrew Steinborn 9f6d8e1840 Merge branch 'dev/1.1.0' into decode-multiple 2020-05-29 19:03:03 -04:00
Andrew Steinborn b028d9ca8f Use standard Guava annotation 2020-05-28 10:44:42 -04:00
Andrew Steinborn cb99b184ed Allow plugins to mutate available commands sent to the client. 
This is the first unstable API being introduced and is primarily to get feedback on the system.
 2020-05-28 07:14:49 -04:00
Andrew Steinborn 305949487e Add @UnstableApi annotation. Resolves #313 2020-05-28 07:05:19 -04:00
Andrew Steinborn d66766a38b Merge branch 'dev/1.1.0' into decode-multiple 2020-05-26 05:25:11 -04:00
Andrew Steinborn eeb660ce00 Fix bad ordering 2020-05-26 05:25:03 -04:00
Andrew Steinborn 0d1acdb056 Merge branch 'dev/1.1.0' into decode-multiple 2020-05-25 16:09:19 -04:00
Andrew Steinborn d538516f4c Bump Netty version 2020-05-25 16:08:53 -04:00
Andrew Steinborn ebad3d1005 Use Integer.MIN_VALUE for the sentinel for readVarIntSafely() 2020-05-25 16:05:36 -04:00
Andrew Steinborn d7bbe7531a Additional protocol hardening. 2020-05-25 15:58:52 -04:00
Andrew Steinborn ae8852dc9d Native tests should only run on Linux 2020-05-25 13:29:02 -04:00
Andrew Steinborn 62d3f61a77 Merge branch 'dev/1.1.0' into decode-multiple 
# Conflicts:
#	proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
 2020-05-25 13:27:44 -04:00
Andrew Steinborn abd81a0216 Fix Checkstyle errors. 2020-05-25 13:24:41 -04:00
Andrew Steinborn 0cb4c02107 Run all commands on a separate thread pool. 2020-05-25 13:09:04 -04:00
Andrew Steinborn ec1fc3944d Make sure this runs on the event loop. 2020-05-25 12:08:24 -04:00
Andrew Steinborn 942e2f2e1a Better generic cleanup. 2020-05-25 11:56:56 -04:00
Andrew Steinborn 74ff56cbc9 Also reset when an exception is thrown. 2020-05-25 11:49:45 -04:00
Andrew Steinborn 64c16e61d2 Reset in-flight connection only if the server disconnects the client. 2020-05-25 11:44:02 -04:00
Andrew Steinborn b0f1398b45 Further confinement of preconnect checks to event loop. 2020-05-25 10:26:05 -04:00
Andrew Steinborn fa954ab717 Confine preconnect validation/setup logic to event loop. 2020-05-25 09:38:41 -04:00
Andrew Steinborn 75ddeb062f Confine preconnect validation/setup logic to event loop. 2020-05-25 09:38:22 -04:00
Andrew Steinborn a98a7dd67e Merge branch 'dev/1.1.0' into decode-multiple 2020-05-24 11:41:17 -04:00
Andrew Steinborn 793e938dd1 Drop macOS native support 
This served a good purpose when I used macOS as a primary development system, but those days are gone (I use Linux now). The spirit of multiple variants is preserved by our special Java 11+ optimized compression.
 2020-05-24 10:58:28 -04:00
Andrew Steinborn b3bd773fea Switch out Cloudflare zlib for libdeflate. 
libdeflate is significantly faster than vanilla zlib, zlib-ng, and Cloudflare zlib. It is also MIT-licensed (so no licensing concerns). In addition, it simplifies a lot of the native code (something that's been tricky to get right).

While we're at it, I have also taken the time to fine-time compression in Velocity in general. Thanks to this work, native compression only requires one JNI call, an improvement from the more than 2 (sometimes up to 5) that were possible before. This optimization also extends to the existing Java compressors, though they require potentially two JNI calls.
 2020-05-24 10:56:26 -04:00
Andrew Steinborn 742b8d98cb Fix noexecstack for natives. 2020-05-20 04:55:55 -04:00
Andrew Steinborn 91e9769c5a Cap /server list to 50 servers. 
Any more, and the server list is arguably useless. Thanks to BXBW for finding this particular issue!
 2020-05-17 00:24:00 -04:00
Andrew Steinborn feb7c2f893 Reject invalid tab complete command requests. 2020-05-08 18:22:21 -04:00
Andrew Steinborn b42045c050 Reject invalid tab complete command requests. 2020-05-08 18:17:02 -04:00