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

Better server discovery

Browse Source
This commit is contained in:
Anuken
2019-06-11 13:01:28 -04:00
parent 75a5bbdbb1
commit 16190aa878
3 changed files with 44 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/Vars.java
+4
View File
@@ -84,6 +84,10 @@ public class Vars{
};
/** default server port */
public static final int port = 6567;
/** multicast discovery port.*/
public static final int multicastPort = 20151;
/** multicast group for discovery.*/
public static final String multicastGroup = "227.2.7.7";
/** if true, UI is not drawn */
public static boolean disableUI;
/** if true, game is set up in mobile mode, even on desktop. used for debugging */
net/src/io/anuke/mindustry/net/ArcNetClient.java
+35 -63
View File
@@ -2,59 +2,28 @@ package io.anuke.mindustry.net;
import io.anuke.arc.Core;
import io.anuke.arc.collection.Array;
import io.anuke.arc.function.Consumer;
import io.anuke.arc.function.*;
import io.anuke.arc.net.*;
import io.anuke.arc.util.pooling.Pools;
import io.anuke.mindustry.net.Net.ClientProvider;
import io.anuke.mindustry.net.Net.SendMode;
import io.anuke.mindustry.net.Packets.Connect;
import io.anuke.mindustry.net.Packets.Disconnect;
import net.jpountz.lz4.LZ4Factory;
import net.jpountz.lz4.LZ4FastDecompressor;
import io.anuke.mindustry.net.Net.*;
import io.anuke.mindustry.net.Packets.*;
import net.jpountz.lz4.*;
import java.io.IOException;
import java.net.*;
import java.nio.*;
import java.nio.channels.ClosedSelectorException;
import static io.anuke.mindustry.Vars.netClient;
import static io.anuke.mindustry.Vars.port;
import static io.anuke.mindustry.Vars.*;
public class ArcNetClient implements ClientProvider{
final Client client;
final Array<InetAddress> foundAddresses = new Array<>();
final ClientDiscoveryHandler handler;
final Supplier<DatagramPacket> packetSupplier = () -> new DatagramPacket(new byte[256], 256);
final LZ4FastDecompressor decompressor = LZ4Factory.fastestInstance().fastDecompressor();
Consumer<Host> lastCallback;
public ArcNetClient(){
handler = new ClientDiscoveryHandler(){
@Override
public DatagramPacket newDatagramPacket(){
return new DatagramPacket(new byte[256], 256);
}
@Override
public void discoveredHost(DatagramPacket datagramPacket){
ByteBuffer buffer = ByteBuffer.wrap(datagramPacket.getData());
Host host = NetworkIO.readServerData(datagramPacket.getAddress().getHostAddress(), buffer);
for(InetAddress address : foundAddresses){
if(address.equals(datagramPacket.getAddress()) || (isLocal(address) && isLocal(datagramPacket.getAddress()))){
return;
}
}
Core.app.post(() -> lastCallback.accept(host));
foundAddresses.add(datagramPacket.getAddress());
}
@Override
public void finish(){
}
};
client = new Client(8192, 4096, new PacketSerializer());
client.setDiscoveryHandler(handler);
client.setDiscoveryPacket(packetSupplier);
NetListener listener = new NetListener(){
@Override
@@ -172,40 +141,43 @@ public class ArcNetClient implements ClientProvider{
@Override
public void pingHost(String address, int port, Consumer<Host> valid, Consumer<Exception> invalid){
runAsync(() -> {
synchronized(handler){
try{
DatagramSocket socket = new DatagramSocket();
socket.send(new DatagramPacket(new byte[]{-2, 1}, 2, InetAddress.getByName(address), port));
try{
DatagramSocket socket = new DatagramSocket();
socket.send(new DatagramPacket(new byte[]{-2, 1}, 2, InetAddress.getByName(address), port));
socket.setSoTimeout(2000);
socket.setSoTimeout(2000);
DatagramPacket packet = packetSupplier.get();
socket.receive(packet);
lastCallback = valid;
ByteBuffer buffer = ByteBuffer.wrap(packet.getData());
Host host = NetworkIO.readServerData(packet.getAddress().getHostAddress(), buffer);
DatagramPacket packet = handler.newDatagramPacket();
socket.receive(packet);
ByteBuffer buffer = ByteBuffer.wrap(packet.getData());
Host host = NetworkIO.readServerData(packet.getAddress().getHostAddress(), buffer);
Core.app.post(() -> valid.accept(host));
}catch(Exception e){
Core.app.post(() -> invalid.accept(e));
}
Core.app.post(() -> valid.accept(host));
}catch(Exception e){
Core.app.post(() -> invalid.accept(e));
}
});
}
@Override
public void discover(Consumer<Host> callback, Runnable done){
runAsync(() -> {
synchronized(handler){
foundAddresses.clear();
lastCallback = callback;
client.discoverHosts(port, 3000);
Core.app.post(done);
}
});
Array<InetAddress> foundAddresses = new Array<>();
client.discoverHosts(port, multicastGroup, multicastPort, 3000, packet -> {
Core.app.post(() -> {
try{
if(foundAddresses.contains(address -> address.equals(packet.getAddress()) || (isLocal(address) && isLocal(packet.getAddress())))){
return;
}
ByteBuffer buffer = ByteBuffer.wrap(packet.getData());
Host host = NetworkIO.readServerData(packet.getAddress().getHostAddress(), buffer);
callback.accept(host);
foundAddresses.add(packet.getAddress());
}catch(Exception e){
//don't crash when there's an error pinging a a server or parsing data
e.printStackTrace();
}
});
}, () -> Core.app.post(done));
}
@Override
net/src/io/anuke/mindustry/net/ArcNetServer.java
+5 -2
View File
@@ -19,6 +19,8 @@ import java.nio.channels.ClosedSelectorException;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArraySet;
import static io.anuke.mindustry.Vars.*;
public class ArcNetServer implements ServerProvider{
final Server server;
final CopyOnWriteArrayList<KryoConnection> connections = new CopyOnWriteArrayList<>();
@@ -31,10 +33,11 @@ public class ArcNetServer implements ServerProvider{
public ArcNetServer(){
server = new Server(4096 * 2, 4096, new PacketSerializer());
server.setDiscoveryHandler((datagramChannel, fromAddress) -> {
server.setMulticast(multicastGroup, multicastPort);
server.setDiscoveryHandler((address, handler) -> {
ByteBuffer buffer = NetworkIO.writeServerData();
buffer.position(0);
datagramChannel.send(buffer, fromAddress);
handler.respond(buffer);
});
NetListener listener = new NetListener(){