diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2009-01-10 10:25:27 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2009-01-10 10:25:27 +0000 |
| commit | b281831d5d3c9eadb92f6a88355a9174c670b40e (patch) | |
| tree | 37a2b51b9d84bda58426a7314f46def169c8d2c7 /scripts | |
| parent | 1f2ffb0ffeeccd2e9ec7cf549a27a60929853d72 (diff) | |
| download | zcatch-b281831d5d3c9eadb92f6a88355a9174c670b40e.tar.gz zcatch-b281831d5d3c9eadb92f6a88355a9174c670b40e.zip | |
fixed more reliable tw_api.py script
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/tw_api.py | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/scripts/tw_api.py b/scripts/tw_api.py index 8077e3ee..11970bbe 100644 --- a/scripts/tw_api.py +++ b/scripts/tw_api.py @@ -59,9 +59,9 @@ def get_servers(address): try: sock = socket(AF_INET, SOCK_DGRAM) - sock.settimeout(1.5) + sock.settimeout(1.5) sock.sendto("\x20\x00\x00\x00\x00\x00\xff\xff\xff\xffreqt", (address, master_port)) - + while 1: data, addr = sock.recvfrom(1024) @@ -72,17 +72,10 @@ def get_servers(address): ip = ".".join(map(str, map(ord, data[n*6:n*6+4]))) port = ord(data[n*6+5]) * 256 + ord(data[n*6+4]) servers += [[ip, port]] - - # and we are done - if num_servers < 128: - break - - sock.close() + except: # timeout + sock.close() return servers - except: - return None - def get_all_servers(): servers = [] |