Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved server discovery

Browse Source
This commit is contained in:
Anuken
2018-10-13 12:21:11 -04:00
parent ed95e38257
commit 1cd8e8a097
4 changed files with 69 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
kryonet/src/io/anuke/kryonet/KryoClient.java
View File

@@ -2,8 +2,6 @@ package io.anuke.kryonet;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.ObjectMap;
import com.badlogic.gdx.utils.ObjectSet;
import com.esotericsoftware.kryonet.*;
import com.esotericsoftware.minlog.Log;
import io.anuke.mindustry.net.Host;
@@ -20,19 +18,17 @@ import net.jpountz.lz4.LZ4Factory;
import net.jpountz.lz4.LZ4FastDecompressor;
import java.io.IOException;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.InetAddress;
import java.net.*;
import java.nio.ByteBuffer;
import java.nio.channels.ClosedSelectorException;
import java.util.List;
import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.net.Net.packetPoolLock;
public class KryoClient implements ClientProvider{
Client client;
ObjectMap<InetAddress, Host> addresses = new ObjectMap<>();
Consumer<Host> lastCallback;
Array<InetAddress> foundAddresses = new Array<>();
ClientDiscoveryHandler handler;
LZ4FastDecompressor decompressor = LZ4Factory.fastestInstance().fastDecompressor();
@@ -48,8 +44,14 @@ public class KryoClient implements ClientProvider{
@Override
public void onDiscoveredHost(DatagramPacket datagramPacket) {
ByteBuffer buffer = ByteBuffer.wrap(datagramPacket.getData());
Host address = NetworkIO.readServerData(datagramPacket.getAddress().getHostAddress(), buffer);
addresses.put(datagramPacket.getAddress(), address);
Host host = NetworkIO.readServerData(datagramPacket.getAddress().getHostAddress(), buffer);
for(InetAddress address : foundAddresses){
if(address.equals(datagramPacket.getAddress()) || (isLocal(address) && isLocal(datagramPacket.getAddress()))){
return;
}
}
Gdx.app.postRunnable(() -> lastCallback.accept(host));
foundAddresses.add(datagramPacket.getAddress());
}
@Override
@@ -108,6 +110,17 @@ public class KryoClient implements ClientProvider{
}
}
private static boolean isLocal(InetAddress addr) {
if (addr.isAnyLocalAddress() || addr.isLoopbackAddress()) return true;
try {
return NetworkInterface.getByInetAddress(addr) != null;
} catch (Exception e) {
return false;
}
}
@Override
public byte[] decompressSnapshot(byte[] input, int size){
byte[] result = new byte[size];
@@ -170,7 +183,7 @@ public class KryoClient implements ClientProvider{
socket.setSoTimeout(2000);
addresses.clear();
lastCallback = valid;
DatagramPacket packet = handler.onRequestNewDatagramPacket();
@@ -187,23 +200,12 @@ public class KryoClient implements ClientProvider{
}
@Override
public void discover(Consumer<Array<Host>> callback){
public void discover(Consumer<Host> callback, Runnable done){
runAsync(() -> {
addresses.clear();
List<InetAddress> list = client.discoverHosts(port, 3000);
ObjectSet<String> hostnames = new ObjectSet<>();
Array<Host> result = new Array<>();
for(InetAddress a : list){
if(!hostnames.contains(a.getHostName())) {
Host address = addresses.get(a);
if(address != null) result.add(address);
}
hostnames.add(a.getHostName());
}
Gdx.app.postRunnable(() -> callback.accept(result));
foundAddresses.clear();
lastCallback = callback;
client.discoverHosts(port, 3000);
Gdx.app.postRunnable(done);
});
}