X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=doc%2Fprotocol.txt;h=b151f88d8b356d7941c777b9425e68b9363ef289;hb=62c10e3d0855fa14fdc260da0b7cd748e53db13f;hp=da2d3394f9c03698eda199682aafb856a2f3a7b4;hpb=9d09103e481c4979ebb0130a9dee6265d0d6223b;p=minetest.git

diff --git a/doc/protocol.txt b/doc/protocol.txt
index da2d3394f..b151f88d8 100644
--- a/doc/protocol.txt
+++ b/doc/protocol.txt
@@ -1,4 +1,4 @@
-Minetest-c55 protocol (incomplete, early draft):
+Minetest protocol (incomplete, early draft):
 Updated 2011-06-18
 
 A custom protocol over UDP.
@@ -42,7 +42,7 @@ Initialization:
 		u8 channel = 0
 		# Control packet header
 		u8 type = TYPE_CONTROL = 0
-		u8 controltype = CONTROLTYPE_DISCO = 2
+		u8 controltype = CONTROLTYPE_DISCO = 3
 
 - Here's a quick untested connect-disconnect done in PHP:
 # host: ip of server (use gethostbyname(hostname) to get from a dns name)
@@ -61,7 +61,7 @@ function check_if_minetestserver_up($host, $port)
 		$peer_id = substr($buf, 9, 2);
 		
 		# Disconnect
-		$buf = "\x4f\x45\x74\x03".$peer_id."\x00\x00\x02";
+		$buf = "\x4f\x45\x74\x03".$peer_id."\x00\x00\x03";
 		socket_sendto($socket, $buf, strlen($buf), 0, $host, $port);
 		socket_close($socket);
 		
@@ -70,3 +70,39 @@ function check_if_minetestserver_up($host, $port)
 	return false;
 }
 
+- Here's a Python script for checking if a minetest server is up, confirmed working
+#!/usr/bin/env python
+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]
+    try:
+        port = int(sys.argv[1].split(':')[1])
+    except ValueError:
+        print("Please specify a valid port")
+        exit()
+else:
+    address = sys.argv[1]
+
+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"
+    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"
+        sock.sendto(buf, (address, port))
+        sock.close()
+        end = time.time()
+        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])