From 99d00cf6a9ab2d0e4a294e752eb0d3e8aa3325e9 Mon Sep 17 00:00:00 2001
From: Sunpy <sunpy@osufx.com>
Date: Mon, 24 Sep 2018 13:40:46 +0200
Subject: [PATCH] Added r query for pinging

---
 .vscode/settings.json         |  3 +++
 handlers/serverPingHandler.py | 28 ++++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..615aafb
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "/usr/bin/python3"
+}
\ No newline at end of file
diff --git a/handlers/serverPingHandler.py b/handlers/serverPingHandler.py
index a565b21..dfa94b7 100644
--- a/handlers/serverPingHandler.py
+++ b/handlers/serverPingHandler.py
@@ -30,9 +30,33 @@ def query_i():
 
 	return packet
 
+def query_r():
+	packet_data = []
+
+	rules = get_rules()
+	packet_data.append(len(rules)) # len_rules
+
+	for name, value in rules.items():
+		packet_data.append(len(name)) # len_name
+		packet_data.append(name)
+		packet_data.append(len(value)) # len_value
+		packet_data.append(value)
+
+	flat_packet_data = [y for x in packet_data for y in x] # flattens the packet data arrays to one stream
+
+	packet = struct.pack(b"<H" + b"c%dsc%ds" * packet_data[0] # using len_rules
+			% [y for x in rules.items() for y in x], # array of only rules entries
+		*flat_packet_data)
+
+	return packet
+
 def get_online_players(): #TODO
 	return 0
 
-RESPONSE = { #TODO: r, c, d & p (https://wiki.sa-mp.com/wiki/Query_Mechanism)
-	b"i": query_i
+def get_rules(): #TODO
+	return {"Rule name sample": "Rule value"}
+
+RESPONSE = { #TODO: c, d & p (https://wiki.sa-mp.com/wiki/Query_Mechanism)
+	b"i": query_i,
+	b"r": query_r
 }
\ No newline at end of file