Cleaner tox debug prints.

1 files changed, 8 insertions, 6 deletions

diff --git a/src/Network/Tox/DHT/Handlers.hs b/src/Network/Tox/DHT/Handlers.hs
index 09d6f66b..b1db9044 100644
--- a/src/Network/Tox/DHT/Handlers.hs
+++ b/src/Network/Tox/DHT/Handlers.hs
@@ -273,7 +273,6 @@ createCookie crypto ni remoteUserKey = do
             , dhtKey      = id2key $ nodeId ni -- transportPublic crypto
             }
         edta = encryptSymmetric sym n24 dta
-    dput XNetCrypto $ "Created cookie with n24 = 0x" ++ show n24 ++ "\n    sym=" ++ show sym
     return $ Cookie n24 edta
 
 createCookieSTM :: POSIXTime -> TransportCrypto -> NodeInfo -> PublicKey -> STM (Cookie Encrypted)
@@ -290,20 +289,20 @@ createCookieSTM now crypto ni remoteUserKey = do
             , dhtKey      = id2key $ nodeId ni -- transportPublic crypto
             }
         edta = encryptSymmetric sym n24 dta
-    dmsg $ "(createCookieSTM) Created cookie with n24 = 0x" ++ show n24 ++ "\n    sym=" ++ show sym
     return $ Cookie n24 edta
 
 cookieRequestH :: TransportCrypto -> NodeInfo -> CookieRequest -> IO (Cookie Encrypted)
 cookieRequestH crypto ni (CookieRequest remoteUserKey) = do
     dput XNetCrypto $ unlines
-        [ "CookieRequest! remoteUserKey=" ++ show (key2id remoteUserKey)
-        , "                      sender=" ++ show ni ]
+        [ show (nodeAddr ni) ++ " --> request cookie: remoteUserKey=" ++ show (key2id remoteUserKey)
+        , show (nodeAddr ni) ++ " -->                        sender=" ++ show (nodeId ni) ]
     x <- createCookie crypto ni remoteUserKey
-    dput XNetCrypto $ "CookieRequest! responding to " ++ show (key2id remoteUserKey)
+    dput XNetCrypto $ show (nodeAddr ni) ++ " <-- cookie " ++ show (key2id remoteUserKey)
     return x
 
 lanDiscoveryH :: Client -> NodeInfo -> NodeInfo -> IO (Maybe (Message -> Message))
 lanDiscoveryH client _ ni = do
+    dput XLan $ show (nodeAddr ni) ++ " --> LanAnnounce " ++ show (nodeId ni)
     forkIO $ do
         myThreadId >>= flip labelThread "lan-discover-ping"
         ping client ni
@@ -417,7 +416,10 @@ getNodes client cbvar nid addr = do
 
 updateRouting :: Client -> Routing -> OnionRouter -> NodeInfo -> Message -> IO ()
 updateRouting client routing orouter naddr msg
-    | PacketKind 0x21 <- msgType msg = dput XLan "(tox)updateRouting: ignoring lan discovery" -- ignore lan discovery
+    | PacketKind 0x21 <- msgType msg = -- dput XLan "(tox)updateRouting: ignoring lan discovery" -- ignore lan discovery
+                                       -- Ignore lan announcements until they reply to our ping.
+                                       -- We do this because the lan announce is not authenticated.
+                                       return ()
     | otherwise                      = do
     now <- getPOSIXTime
     atomically $ do