2 files changed, 14 insertions, 3 deletions

diff --git a/TCPProber.hs b/TCPProber.hs
index 8d468e53..8059fea7 100644
--- a/TCPProber.hs
+++ b/TCPProber.hs
@@ -1,8 +1,13 @@
+{-# LANGUAGE CPP        #-}
 {-# LANGUAGE LambdaCase #-}
 module TCPProber where
 
+#ifdef THREAD_DEBUG
+import Control.Concurrent.Lifted.Instrument
+#else
 import Control.Concurrent
 import GHC.Conc
+#endif
 
 import Control.Arrow
 import Control.Concurrent.STM
@@ -14,6 +19,8 @@ import Data.Time.Clock.POSIX
 import Network.Socket
 import System.Timeout
 
+import DPut
+import DebugTag
 import Crypto.Tox
 import Data.Wrapper.PSQ as PSQ
 import Network.Kademlia.Search
@@ -141,6 +148,7 @@ runProbeQueue prober client maxjobs = do
 getNodes :: TCPProber -> TCP.TCPClient err () Nonce8 -> NodeId -> TCP.NodeInfo -> IO (Maybe ([TCP.NodeInfo],[TCP.NodeInfo],Maybe ()))
 getNodes prober tcp seeking dst = do
     r <- TCP.getUDPNodes' tcp seeking (TCP.udpNodeInfo dst)
+    dput XTCP $ "Got via TCP nodes: " ++ show r
     let tcps (ns,_,mb) = (ns',ns',mb)
          where ns' = do
                     n <- ns
diff --git a/src/Network/QueryResponse/TCP.hs b/src/Network/QueryResponse/TCP.hs
index 154e9145..328a19e1 100644
--- a/src/Network/QueryResponse/TCP.hs
+++ b/src/Network/QueryResponse/TCP.hs
@@ -98,7 +98,7 @@ acquireConnection mvar tcpcache stream addr = do
                 killThread (tcpThread r)
                 streamGoodbye st
                 hClose (tcpHandle r)
-            atomically $ writeTVar (lru tcpcache) cache'
+                atomically $ modifyTVar' (lru tcpcache) $ MM.delete (TCPAddress k)
 
             return $ Just $ streamEncode st
         Just (tm,v) -> do
@@ -126,7 +126,10 @@ tcpTransport maxcon stream = do
     return Transport
         { awaitMessage   = (takeMVar msgvar >>=)
         , sendMessage    = \addr y -> do
-                                msock <- acquireConnection msgvar tcpcache stream addr
-                                mapM_ ($ y) msock
+                                t <- forkIO $ do
+                                    msock <- acquireConnection msgvar tcpcache stream addr
+                                    mapM_ ($ y) msock
+                                  `catchIOError` \e -> return ()
+                                labelThread t "tcp-send"
         , closeTransport = closeAll tcpcache stream
         }