mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-07-09 23:38:15 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved ClientData tuple and removed connectionIds and clientDatas hash maps

Browse Source
This commit is contained in:
Collin Smith
2020-06-27 16:28:11 -07:00
parent 03ae8f103c
commit 65e14b7514
1 changed files with 65 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
server/netty/src/com/riiablo/server/d2gs/Main.java
View File

@ -14,10 +14,8 @@ import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.channel.socket.nio.NioServerSocketChannel;
import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.handler.codec.ByteToMessageDecoder;
import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.util.List; import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import com.badlogic.gdx.Application; import com.badlogic.gdx.Application;
@ -56,9 +54,9 @@ public class Main extends ApplicationAdapter implements PacketProcessor {
private EventLoopGroup workerGroup; private EventLoopGroup workerGroup;
private final ConnectionLimiter connectionLimiter = new ConnectionLimiter(MAX_CLIENTS); private final ConnectionLimiter connectionLimiter = new ConnectionLimiter(MAX_CLIENTS);
private final ClientData[] clients = new ClientData[MAX_CLIENTS]; {
private final ConcurrentHashMap<SocketAddress, Integer> connectionIds = new ConcurrentHashMap<>(32); for (int i = 0; i < MAX_CLIENTS; i++) clients[i] = new ClientData();
private final ConcurrentHashMap<SocketAddress, ClientData> clientDatas = new ConcurrentHashMap<>(32); }
@Override @Override
public void create() { public void create() {
@ -122,7 +120,7 @@ public class Main extends ApplicationAdapter implements PacketProcessor {
public void processPacket(ChannelHandlerContext ctx, SocketAddress from, ByteBuf bb) { public void processPacket(ChannelHandlerContext ctx, SocketAddress from, ByteBuf bb) {
Gdx.app.debug(TAG, "Processing packet..."); Gdx.app.debug(TAG, "Processing packet...");
Gdx.app.debug(TAG, " " + ByteBufUtil.hexDump(bb)); Gdx.app.debug(TAG, " " + ByteBufUtil.hexDump(bb));
processPacket(ctx, Netty.getRootAsNetty(bb.nioBuffer())); processPacket(ctx, from, Netty.getRootAsNetty(bb.nioBuffer()));
} }
private int state = 0; private int state = 0;
@ -130,10 +128,8 @@ public class Main extends ApplicationAdapter implements PacketProcessor {
public static final int CLIENT_DISCONNECTED = 0; public static final int CLIENT_DISCONNECTED = 0;
public static final int CLIENT_CONNECT = 0; public static final int CLIENT_CONNECT = 0;
public void processPacket(ChannelHandlerContext ctx, Netty netty) { public void processPacket(ChannelHandlerContext ctx, SocketAddress from, Netty netty) {
Gdx.app.debug(TAG, " " + "dataType=" + NettyData.name(netty.dataType())); Gdx.app.debug(TAG, " " + "dataType=" + NettyData.name(netty.dataType()));
InetSocketAddress from = (InetSocketAddress) ctx.channel().remoteAddress();
switch (netty.dataType()) { switch (netty.dataType()) {
case NettyData.Connection: { case NettyData.Connection: {
Connection(ctx, from, netty); Connection(ctx, from, netty);
@ -145,46 +141,64 @@ public class Main extends ApplicationAdapter implements PacketProcessor {
} }
} }
private void Connection(ChannelHandlerContext ctx, InetSocketAddress from, Netty netty) { private void Connection(ChannelHandlerContext ctx, SocketAddress from, Netty netty) {
Gdx.app.debug(TAG, "Connection from " + from); Gdx.app.debug(TAG, "Connection from " + from);
Connection connection = (Connection) netty.data(new Connection()); Connection connection = (Connection) netty.data(new Connection());
boolean generateSalt = true; boolean generateSalt = true;
long clientSalt = connection.salt(); long clientSalt = connection.salt();
Gdx.app.debug(TAG, " " + String.format("client salt=%016x", clientSalt)); Gdx.app.debug(TAG, " " + String.format("client salt=%016x", clientSalt));
ClientData client = clientDatas.get(from);
if (client != null) { synchronized (clients) {
long storedClientSalt = client.clientSalt; final ClientData client;
if (storedClientSalt == clientSalt) { final ClientData[] clients = this.clients;
Gdx.app.debug(TAG, " " + "client salt matches server record");
generateSalt = false; int id;
for (id = 0; id < MAX_CLIENTS && !from.equals(clients[id].address); id++);
if (id == MAX_CLIENTS) {
Gdx.app.debug(TAG, " " + "no connection record found for " + from);
Gdx.app.debug(TAG, " " + "creating connection record for " + from);
for (id = 0; id < MAX_CLIENTS && clients[id].connected; id++);
assert id != MAX_CLIENTS : "no available client slots. connection limiter should have caught this";
if (id == MAX_CLIENTS) {
Gdx.app.error(TAG, " " + "client connected, but no slot is available");
ctx.channel().close(); // TODO: does this work on a UDP? (connectionless)
return;
}
Gdx.app.debug(TAG, " " + "assigned " + from + " to " + id);
client = clients[id].connect(from, clientSalt);
} else { } else {
Gdx.app.debug(TAG, " " + "client salt mismatch with server record"); Gdx.app.debug(TAG, " " + "found connection record for " + from + " as " + id);
Gdx.app.debug(TAG, " " + "updating client salt to server record"); client = clients[id];
client.clientSalt = clientSalt; Gdx.app.debug(TAG, " " + "checking client salt");
clientSalt = storedClientSalt; if (client.clientSalt == clientSalt) {
Gdx.app.debug(TAG, " " + String.format("client salt=%016x", clientSalt)); Gdx.app.debug(TAG, " " + "client salt matches server record");
generateSalt = false;
} else {
Gdx.app.debug(TAG, " " + "client salt mismatch with server record");
Gdx.app.debug(TAG, " " + "updating client salt to server record");
clientSalt = client.clientSalt;
Gdx.app.debug(TAG, " " + String.format("client salt=%016x", clientSalt));
}
} }
} else {
Gdx.app.debug(TAG, " " + "no server record found matching client salt");
clientDatas.put(from, client = new ClientData(clientSalt));
}
long serverSalt; long serverSalt;
if (generateSalt) { if (generateSalt) {
Gdx.app.debug(TAG, " " + "generating server salt"); Gdx.app.debug(TAG, " " + "generating server salt");
serverSalt = MathUtils.random.nextLong(); if (client.serverSalt != 0L) {
if (client.serverSalt != 0L) { Gdx.app.debug(TAG, " " + String.format("overwriting existing server salt %016x", client.serverSalt));
Gdx.app.debug(TAG, " " + String.format("overwriting existing server salt %016x", client.serverSalt)); }
serverSalt = client.serverSalt = MathUtils.random.nextLong();
Gdx.app.debug(TAG, " " + String.format("server salt=%016x", serverSalt));
} else {
serverSalt = client.serverSalt;
} }
client.serverSalt = serverSalt;
Gdx.app.debug(TAG, " " + String.format("server salt=%016x", serverSalt));
} else {
serverSalt = client.serverSalt;
}
long salt = client.xor = clientSalt ^ serverSalt; long salt = client.xor = clientSalt ^ serverSalt;
Gdx.app.debug(TAG, " " + String.format("salt=%016x", salt)); Gdx.app.debug(TAG, " " + String.format("salt=%016x", salt));
}
} }
@ChannelHandler.Sharable @ChannelHandler.Sharable
@ -223,9 +237,21 @@ public class Main extends ApplicationAdapter implements PacketProcessor {
long serverSalt; long serverSalt;
long xor; long xor;
byte state; byte state;
SocketAddress address;
boolean connected;
ClientData(long clientSalt) { ClientData connect(SocketAddress address, long clientSalt) {
assert !connected;
this.address = address;
this.clientSalt = clientSalt; this.clientSalt = clientSalt;
connected = true;
return this;
}
ClientData disconnect() {
assert connected;
connected = false;
return this;
} }
} }
} }