summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvery Pennarun <apenwarr@gmail.com>2011-01-26 05:19:03 -0800
committerAvery Pennarun <apenwarr@gmail.com>2011-01-26 05:25:26 -0800
commit760740e9aa7861a6eba566b96f4b4a6371c1f29a (patch)
tree3eeec3be3d62bd14b7bfcbc7cb0b1c78a7979bce
parentb570778894045d0ae461368d071e86ba4e82415a (diff)
Oops, dns_done() crashed if the request had already been timed out.
-rw-r--r--client.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/client.py b/client.py
index 0f596eb..a824bff 100644
--- a/client.py
+++ b/client.py
@@ -295,7 +295,7 @@ def _main(listener, fw, ssh_cmd, remotename, python, latency_control,
dnsreqs = {}
def dns_done(chan, data):
- peer,timeout = dnsreqs.get(chan)
+ peer,timeout = dnsreqs.get(chan) or (None,None)
debug3('dns_done: channel=%r peer=%r\n' % (chan, peer))
if peer:
del dnsreqs[chan]