aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJulien Palard <julien@palard.fr>2019-02-03 02:32:37 +0100
committerrubenwardy <rw@rubenwardy.com>2019-02-03 01:32:37 +0000
commit23ea02c79cde40a25fea9eb1c97d216d25f8590d (patch)
tree3ca4e38201073a0cd7f6427e4cc18210aec32ba5 /doc
parent3c7e92049d233053a659e5665b121bea67baa69e (diff)
downloadminetest-23ea02c79cde40a25fea9eb1c97d216d25f8590d.tar.gz
minetest-23ea02c79cde40a25fea9eb1c97d216d25f8590d.tar.bz2
minetest-23ea02c79cde40a25fea9eb1c97d216d25f8590d.zip
Protocol Docs: Python check bump to Python 3
Diffstat (limited to 'doc')
-rw-r--r--doc/protocol.txt24
1 files changed, 13 insertions, 11 deletions
diff --git a/doc/protocol.txt b/doc/protocol.txt
index b151f88d8..4c8ddd500 100644
--- a/doc/protocol.txt
+++ b/doc/protocol.txt
@@ -59,29 +59,31 @@ function check_if_minetestserver_up($host, $port)
{
# We got a reply! read the peer id from it.
$peer_id = substr($buf, 9, 2);
-
+
# Disconnect
$buf = "\x4f\x45\x74\x03".$peer_id."\x00\x00\x03";
socket_sendto($socket, $buf, strlen($buf), 0, $host, $port);
socket_close($socket);
-
+
return true;
}
return false;
}
- Here's a Python script for checking if a minetest server is up, confirmed working
-#!/usr/bin/env python
+
+#!/usr/bin/env python3
import sys, time, socket
+
address = ""
port = 30000
if len(sys.argv) <= 1:
print("Usage: %s <address>" % sys.argv[0])
exit()
-if ':' in sys.argv[1]:
- address = sys.argv[1].split(':')[0]
+if ":" in sys.argv[1]:
+ address = sys.argv[1].split(":")[0]
try:
- port = int(sys.argv[1].split(':')[1])
+ port = int(sys.argv[1].split(":")[1])
except ValueError:
print("Please specify a valid port")
exit()
@@ -92,17 +94,17 @@ try:
start = time.time()
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
sock.settimeout(2.0)
- buf = "\x4f\x45\x74\x03\x00\x00\x00\x01"
+ buf = b"\x4f\x45\x74\x03\x00\x00\x00\x01"
sock.sendto(buf, (address, port))
data, addr = sock.recvfrom(1000)
if data:
peer_id = data[12:14]
- buf = "\x4f\x45\x74\x03" + peer_id + "\x00\x00\x03"
+ buf = b"\x4f\x45\x74\x03" + peer_id + b"\x00\x00\x03"
sock.sendto(buf, (address, port))
sock.close()
end = time.time()
- print("%s is up (%0.5fms)" % (sys.argv[1],end-start))
+ print("%s is up (%0.5fms)" % (sys.argv[1], end - start))
else:
print("%s seems to be down " % sys.argv[1])
-except:
- print("%s seems to be down " % sys.argv[1])
+except Exception as err:
+ print("%s seems to be down (%s) " % (sys.argv[1], str(err)))