From 760740e9aa7861a6eba566b96f4b4a6371c1f29a Mon Sep 17 00:00:00 2001
From: Avery Pennarun <apenwarr@gmail.com>
Date: Wed, 26 Jan 2011 05:19:03 -0800
Subject: [PATCH] Oops, dns_done() crashed if the request had already been
 timed out.

---
 client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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]