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

Fixed #5519

Browse Source
This commit is contained in:
Anuken
2021-07-01 10:22:28 -04:00
parent f7e4936445
commit 2ea1671739
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
desktop/src/mindustry/desktop/steam/SNet.java
View File

@@ -31,6 +31,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
final PacketSerializer serializer = new PacketSerializer();
final ByteBuffer writeBuffer = ByteBuffer.allocateDirect(16384);
final ByteBuffer readBuffer = ByteBuffer.allocateDirect(16384);
final ByteBuffer readCopyBuffer = ByteBuffer.allocate(writeBuffer.capacity());
final CopyOnWriteArrayList<SteamConnection> connections = new CopyOnWriteArrayList<>();
final IntMap<SteamConnection> steamConnections = new IntMap<>(); //maps steam ID -> valid net connection
@@ -51,10 +52,15 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
public void update(){
while((length = snet.isP2PPacketAvailable(0)) != 0){
try{
readBuffer.position(0);
snet.readP2PPacket(from, readBuffer, 0);
readBuffer.position(0).limit(readBuffer.capacity());
//lz4 chokes on direct buffers, so copy the bytes over
int len = snet.readP2PPacket(from, readBuffer, 0);
readBuffer.limit(len);
readCopyBuffer.position(0);
readCopyBuffer.put(readBuffer);
readCopyBuffer.position(0);
int fromID = from.getAccountID();
Object output = serializer.read(readBuffer);
Object output = serializer.read(readCopyBuffer);
//it may be theoretically possible for this to be a framework message, if the packet is malicious or corrupted
if(!(output instanceof Packet)) return;