1 files changed, 7 insertions, 6 deletions

diff --git a/dht/src/Network/Tox/DHT/Transport.hs b/dht/src/Network/Tox/DHT/Transport.hs
index ed755880..5de92916 100644
--- a/dht/src/Network/Tox/DHT/Transport.hs
+++ b/dht/src/Network/Tox/DHT/Transport.hs
@@ -59,6 +59,8 @@ import Data.Tuple
 import Data.Word
 import GHC.Generics
 import Network.Socket
+import DPut
+import DebugTag
 
 type DHTTransport ni = Transport String ni (DHTMessage Encrypted8)
 type HandleHi ni a = Arrival String ni (DHTMessage Encrypted8) -> IO a
@@ -97,8 +99,8 @@ mapMessage f (DHTLanDiscovery nid)     = Nothing
 instance Sized Ping where size = ConstSize 1
 instance Sized Pong where size = ConstSize 1
 
-parseDHTAddr :: Eq saddr =>
-                    STM [(saddr, (Int, PublicKey))]
+parseDHTAddr :: (Eq saddr, Show ni) =>
+                    (saddr -> STM (Maybe ni))
                     -> (NodeId -> saddr -> Either String ni)
                     -> (ByteString, saddr)
                     -> IO (Either (DHTMessage Encrypted8,ni) (ByteString,saddr))
@@ -113,10 +115,9 @@ parseDHTAddr pendingCookies nodeInfo (msg,saddr)
     0x04 -> left $ direct nodeInfo bs saddr DHTSendNodes
     0x18 -> left $ direct nodeInfo bs saddr DHTCookieRequest
     0x19 -> do
-        cs <- atomically pendingCookies
-        let ni = fromMaybe (noReplyAddr nodeInfo saddr) $ do
-                    (cnt,key) <- lookup saddr cs <|> listToMaybe (map snd cs)
-                    either (const Nothing) Just $ nodeInfo (key2id key) saddr
+        mni <- atomically $ pendingCookies saddr
+        let ni = fromMaybe (noReplyAddr nodeInfo saddr) mni
+        dput XMan $ "Got encrypted cookie! mni="++show mni
         left $ fanGet bs getCookie (uncurry DHTCookie) (const $ ni)
     0x20 -> left $ fanGet bs getDHTReqest (uncurry DHTDHTRequest) (asymNodeInfo nodeInfo saddr . snd)
     0x21 -> left $ do