diff options
author | James Crayne <jim.crayne@gmail.com> | 2017-11-15 23:38:27 +0000 |
---|---|---|
committer | James Crayne <jim.crayne@gmail.com> | 2017-11-15 23:38:27 +0000 |
commit | 9fefcd6aaa2093e52b344af7d24106bb159fe206 (patch) | |
tree | 24140f280719bdf142f9883df8bebcc4b8a2f1d7 /src | |
parent | 3ce72e7bc8ae7cdb7b69f42b1dfcbe4cb05f12ce (diff) | |
parent | a85856d19cc905dd72188e3b048dc0736f1c07ce (diff) |
Merge branch 'dht-rewrite' of 192.168.1.66:bittorrent into dht-rewrite
Diffstat (limited to 'src')
-rw-r--r-- | src/Network/Tox/DHT/Handlers.hs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Network/Tox/DHT/Handlers.hs b/src/Network/Tox/DHT/Handlers.hs index 7f3bc7ed..500785cc 100644 --- a/src/Network/Tox/DHT/Handlers.hs +++ b/src/Network/Tox/DHT/Handlers.hs | |||
@@ -219,6 +219,7 @@ getNodesH routing addr (GetNodes nid) = do | |||
219 | 219 | ||
220 | cookieRequestH :: TransportCrypto -> NodeInfo -> CookieRequest -> IO Cookie | 220 | cookieRequestH :: TransportCrypto -> NodeInfo -> CookieRequest -> IO Cookie |
221 | cookieRequestH crypto ni (CookieRequest remoteUserKey) = do | 221 | cookieRequestH crypto ni (CookieRequest remoteUserKey) = do |
222 | hPutStrLn stderr $ "CookieRequest! remoteUserKey=" ++ show (key2id remoteUserKey) | ||
222 | (n24,sym,us) <- atomically $ do | 223 | (n24,sym,us) <- atomically $ do |
223 | n24 <- transportNewNonce crypto | 224 | n24 <- transportNewNonce crypto |
224 | sym <- transportSymmetric crypto | 225 | sym <- transportSymmetric crypto |
@@ -231,6 +232,7 @@ cookieRequestH crypto ni (CookieRequest remoteUserKey) = do | |||
231 | , dhtKey = transportPublic crypto | 232 | , dhtKey = transportPublic crypto |
232 | } | 233 | } |
233 | edta = encryptSymmetric sym n24 dta | 234 | edta = encryptSymmetric sym n24 dta |
235 | hPutStrLn stderr $ "CookieRequest! responding to " ++ show (key2id remoteUserKey) | ||
234 | return $ Cookie n24 edta | 236 | return $ Cookie n24 edta |
235 | 237 | ||
236 | lanDiscoveryH :: Client -> NodeInfo -> NodeInfo -> IO (Maybe (Message -> Message)) | 238 | lanDiscoveryH :: Client -> NodeInfo -> NodeInfo -> IO (Maybe (Message -> Message)) |