Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix idle state disconnecting regardless of received pong

Browse Source
This commit is contained in:
P0nk
2021-07-12 19:19:12 +02:00
parent 5a7d8e6b1f
commit 3de827553e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/client/MapleClient.java
View File

@@ -1149,7 +1149,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter {
} }
public void pongReceived() { public void pongReceived() {
lastPong = Server.getInstance().getCurrentTime(); lastPong = System.currentTimeMillis();
} }
@Deprecated(forRemoval = true) @Deprecated(forRemoval = true)

3
src/main/java/net/netty/ServerChannelInitializer.java
View File

@@ -12,6 +12,7 @@ import tools.MaplePacketCreator;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
public abstract class ServerChannelInitializer extends ChannelInitializer<SocketChannel> { public abstract class ServerChannelInitializer extends ChannelInitializer<SocketChannel> {
private static final int IDLE_TIME_SECONDS = 30;
static final AtomicLong sessionId = new AtomicLong(7777); static final AtomicLong sessionId = new AtomicLong(7777);
void initPipeline(SocketChannel socketChannel, MapleClient client) { void initPipeline(SocketChannel socketChannel, MapleClient client) {
@@ -27,7 +28,7 @@ public abstract class ServerChannelInitializer extends ChannelInitializer<Socket
private void setUpHandlers(ChannelPipeline pipeline, InitializationVector sendIv, InitializationVector recvIv, private void setUpHandlers(ChannelPipeline pipeline, InitializationVector sendIv, InitializationVector recvIv,
MapleClient client) { MapleClient client) {
pipeline.addFirst("IdleStateHandler", new IdleStateHandler(30, 30, 0)); pipeline.addLast("IdleStateHandler", new IdleStateHandler(0, 0, IDLE_TIME_SECONDS));
pipeline.addLast("PacketCodec", new PacketCodec(ClientCyphers.of(sendIv, recvIv))); pipeline.addLast("PacketCodec", new PacketCodec(ClientCyphers.of(sendIv, recvIv)));
pipeline.addLast("MapleClient", client); pipeline.addLast("MapleClient", client);
} }