Merge branch 'dht-rewrite' of 192.168.1.66:bittorrent into dht-rewrite

3 files changed, 5 insertions, 1 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
 
 cookieRequestH :: TransportCrypto -> NodeInfo -> CookieRequest -> IO Cookie
 cookieRequestH crypto ni (CookieRequest remoteUserKey) = do
+    hPutStrLn stderr $ "CookieRequest! remoteUserKey=" ++ show (key2id remoteUserKey)
     (n24,sym,us) <- atomically $ do
         n24 <- transportNewNonce crypto
         sym <- transportSymmetric crypto
@@ -231,6 +232,7 @@ 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
 
 lanDiscoveryH :: Client -> NodeInfo -> NodeInfo -> IO (Maybe (Message -> Message))
diff --git a/todo.txt b/todo.txt
index 6019b08a..75c046e0 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,3 +1,5 @@
+tox: Add fallback trials to cookie response in case response is from another address than request.
+
 ui: Online help.
 
 ui: Explicit routing table node deletion. "forget" command.
diff --git a/vnet/mkroutes.sh b/vnet/mkroutes.sh
index fa180051..4058bb40 100755
--- a/vnet/mkroutes.sh
+++ b/vnet/mkroutes.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-ip=$host
+ip=$1
 ip route add 80.99.99.99/32 via $host
 ip route add 80.99.99.99/32 via $host
 ip route add 81.99.99.99/32 via $host