PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

#3147: HAProxyMessage.sourceAddress() can be null

Browse Source 
.sourceAddress() is null when send-proxy-v2 & check option is used
This commit is contained in:
Adrian Antkowiak 2021-07-11 01:06:51 +02:00 committed by GitHub
parent c866619f56
commit 5db276eb52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
View File

@ -83,14 +83,17 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
HAProxyMessage proxy = (HAProxyMessage) msg; HAProxyMessage proxy = (HAProxyMessage) msg;
try try
{ {
InetSocketAddress newAddress = new InetSocketAddress( proxy.sourceAddress(), proxy.sourcePort() ); if ( proxy.sourceAddress() != null )
ProxyServer.getInstance().getLogger().log( Level.FINE, "Set remote address via PROXY {0} -> {1}", new Object[]
{ {
channel.getRemoteAddress(), newAddress InetSocketAddress newAddress = new InetSocketAddress( proxy.sourceAddress(), proxy.sourcePort() );
} );
channel.setRemoteAddress( newAddress ); ProxyServer.getInstance().getLogger().log( Level.FINE, "Set remote address via PROXY {0} -> {1}", new Object[]
{
channel.getRemoteAddress(), newAddress
} );
channel.setRemoteAddress( newAddress );
}
} finally } finally
{ {
proxy.release(); proxy.release();