Debug prints when packets when packets are relayed between peers.

1 files changed, 9 insertions, 6 deletions

diff --git a/dht/src/Network/Tox/Relay.hs b/dht/src/Network/Tox/Relay.hs
index 3aa596ab..22a692a9 100644
--- a/dht/src/Network/Tox/Relay.hs
+++ b/dht/src/Network/Tox/Relay.hs
@@ -206,19 +206,22 @@ handlePacket cons thistcp me crypto sendOnion sendToMe session = \case
     RelayPing x -> sendToMe $ RelayPong x -- TODO x==0 is invalid.  Do we care?
 
     OOBSend them bs -> do
+        dput XRelay $ "OOB send to " ++ showKey256 them
         m <- atomically $ Map.lookup them <$> readTVar cons
         forM_ m $ \(sendToThem,_) -> sendToThem $ OOBRecv me bs
 
-    RelayData bs con -> join $ atomically $ do
+    RelayData bs con -> do
+        mySession <- atomically $ readTVar session
         -- Data: Data packets can only be sent and received if the
         -- corresponding connection_id is connection (a Connect notification
         -- has been received from it) if the server receives a Data packet for
         -- a non connected or existent connection it will discard it.
-        mySession <- readTVar session
-        return $ sequence_ $ do
-            i <- c2key con
-            sendToThem' <- IntMap.lookup i $ associated mySession
-            return $ sendToThem' $ RelayData bs
+        let mbSendIt = do
+                i <- c2key con
+                sendToThem' <- IntMap.lookup i $ associated mySession
+                return $ sendToThem' $ RelayData bs
+        dput XRelay $ "RelayData to con " ++ show con ++ maybe "to no key" (\io -> "to an associatied key") mbSendIt
+        sequence_ mbSendIt
 
     OnionPacket n24 (Addressed addr req) -> do
         dput XOnion $ "Received onion request via TCP client conid="++show thistcp