2 files changed, 13 insertions, 8 deletions

diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index bffb4280..0e349196 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -7,7 +7,7 @@ import Network.QueryResponse
 import Network.Tox.NodeId
 import Network.Tox.Crypto.Transport
 import Network.Tox.DHT.Transport (Cookie(..),CookieData(..), CookieRequest(..), NoSpam(..))
-import Network.Tox.DHT.Handlers (Client, cookieRequest, cookieRequestH )
+import Network.Tox.DHT.Handlers (Client, cookieRequest, createCookie )
 import Crypto.Tox
 import Control.Concurrent.STM
 import Network.Address
@@ -212,7 +212,7 @@ newHandShakeData crypto basenonce (HParam {hpOtherCookie,hpMySecretKey,hpCookieR
     = do
     freshCookie
       <- case  nodeInfo (key2id hpCookieRemoteDhtkey) addr  of
-            Right nodeinfo -> Just <$> cookieRequestH crypto nodeinfo (CookieRequest hpCookieRemotePubkey)
+            Right nodeinfo -> Just <$> createCookie crypto nodeinfo hpCookieRemotePubkey
             Left er        -> return Nothing
     let hinit                = hashInit
         Cookie n24 encrypted = hpOtherCookie
diff --git a/src/Network/Tox/DHT/Handlers.hs b/src/Network/Tox/DHT/Handlers.hs
index 9faee69a..327659a9 100644
--- a/src/Network/Tox/DHT/Handlers.hs
+++ b/src/Network/Tox/DHT/Handlers.hs
@@ -217,11 +217,8 @@ getNodesH routing addr (GetNodes nid) = do
 
     k = 4
 
-cookieRequestH :: TransportCrypto -> NodeInfo -> CookieRequest -> IO Cookie
-cookieRequestH crypto ni (CookieRequest remoteUserKey) = do
-    hPutStrLn stderr $ unlines
-        [ "CookieRequest! remoteUserKey=" ++ show (key2id remoteUserKey)
-        , "                      sender=" ++ show ni ]
+createCookie :: TransportCrypto -> NodeInfo -> PublicKey -> IO Cookie
+createCookie crypto ni remoteUserKey = do
     (n24,sym,us) <- atomically $ do
         n24 <- transportNewNonce crypto
         sym <- transportSymmetric crypto
@@ -234,9 +231,17 @@ cookieRequestH crypto ni (CookieRequest remoteUserKey) = do
             , dhtKey      = transportPublic crypto
             }
         edta = encryptSymmetric sym n24 dta
-    hPutStrLn stderr $ "CookieRequest! responding to " ++ show (key2id remoteUserKey)
     return $ Cookie n24 edta
 
+cookieRequestH :: TransportCrypto -> NodeInfo -> CookieRequest -> IO Cookie
+cookieRequestH crypto ni (CookieRequest remoteUserKey) = do
+    hPutStrLn stderr $ unlines
+        [ "CookieRequest! remoteUserKey=" ++ show (key2id remoteUserKey)
+        , "                      sender=" ++ show ni ]
+    x <- createCookie crypto ni remoteUserKey
+    hPutStrLn stderr $ "CookieRequest! responding to " ++ show (key2id remoteUserKey)
+    return x
+
 lanDiscoveryH :: Client -> NodeInfo -> NodeInfo -> IO (Maybe (Message -> Message))
 lanDiscoveryH client _ ni = do
     forkIO $ do