LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

rcon: Wait for buffer to fill

Browse Source 
We should wait for the buffer to fill up to 12 bytes instead of
simply assuming it will.

Possible fix for #1273.
This commit is contained in:
Nicolas F
2016-01-30 13:58:36 +01:00
parent a0766974b5
commit c7f8cfee8c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
overviewer_core/rcon.py
View File

@@ -68,7 +68,8 @@ class RConConnection():
if not toread: if not toread:
raise RConException(self.rid, "Request timed out.") raise RConException(self.rid, "Request timed out.")
res_len, res_id, res_type = struct.unpack("<iii", self.sock.recv(12)) res_len, res_id, res_type = \
struct.unpack("<iii", self.sock.recv(12, socket.MSG_WAITALL))
res_data = self.sock.recv(res_len - 4 - 4) res_data = self.sock.recv(res_len - 4 - 4)
res_data = res_data[:-2] res_data = res_data[:-2]