From 8f08b3b69f1c2d050992503ca488f2f257d45833 Mon Sep 17 00:00:00 2001
From: Nicolas F <ovdev@fratti.ch>
Date: Sat, 30 Jan 2016 15:25:45 +0100
Subject: [PATCH] rcon: Throw more helpful exception if proto error

Addresses #1273.
---
 overviewer_core/rcon.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/overviewer_core/rcon.py b/overviewer_core/rcon.py
index cffe546..d815b8e 100644
--- a/overviewer_core/rcon.py
+++ b/overviewer_core/rcon.py
@@ -68,8 +68,13 @@ class RConConnection():
         if not toread:
             raise RConException(self.rid, "Request timed out.")
 
-        res_len, res_id, res_type = \
-            struct.unpack("<iii", self.sock.recv(12, socket.MSG_WAITALL))
+        try:
+            res_len, res_id, res_type = \
+                struct.unpack("<iii", self.sock.recv(12, socket.MSG_WAITALL))
+        except Exception as e:
+            raise RConException(self.rid,
+                                "RCon protocol error. Are you sure you're " + \
+                                "talking to the RCon port? Error: %s" % e)
         res_data = self.sock.recv(res_len - 4 - 4)
         res_data = res_data[:-2]