1 files changed, 10 insertions, 9 deletions

diff --git a/src/Network/BitTorrent/MainlineDHT.hs b/src/Network/BitTorrent/MainlineDHT.hs
index 847d820b..626f980f 100644
--- a/src/Network/BitTorrent/MainlineDHT.hs
+++ b/src/Network/BitTorrent/MainlineDHT.hs
@@ -87,6 +87,7 @@ import qualified Data.Aeson as JSON
 import Text.Read
 import System.Global6
 import Control.TriadCommittee
+import DPut
 
 newtype NodeId = NodeId ByteString
  deriving (Eq,Ord,ByteArrayAccess, Bits, Hashable)
@@ -431,10 +432,10 @@ addVerbosity :: Transport err SockAddr ByteString -> Transport err SockAddr Byte
 addVerbosity tr =
     tr { awaitMessage = \kont -> awaitMessage tr $ \m -> do
             forM_ m $ mapM_ $ \(msg,addr) -> do
-                hPutStrLn stderr (showPacket id addr " --> " msg)
+                dput XBitTorrent (showPacket id addr " --> " msg)
             kont m
        , sendMessage = \addr msg -> do
-            hPutStrLn stderr (showPacket id addr " <-- " msg)
+            dput XBitTorrent (showPacket id addr " <-- " msg)
             sendMessage tr addr msg
        }
 
@@ -642,18 +643,18 @@ newClient swarms addr = do
     fork $ fix $ \again -> do
         myThreadId >>= flip labelThread "addr4"
         (addr, ns) <- atomically $ readTChan addr4
-        hPutStrLn stderr $ "External IPv4: "++show (addr, length ns)
+        dput XBitTorrent $ "External IPv4: "++show (addr, length ns)
         forM_ ns $ \n -> do
-            hPutStrLn stderr $ "Change IP, ping: "++show n
+            dput XBitTorrent $ "Change IP, ping: "++show n
             ping outgoingClient n
         -- TODO: trigger bootstrap ipv4
         again
     fork $ fix $ \again -> do
         myThreadId >>= flip labelThread "addr6"
         (addr,ns) <- atomically $ readTChan addr6
-        hPutStrLn stderr $ "External IPv6: "++show (addr, length ns)
+        dput XBitTorrent $ "External IPv6: "++show (addr, length ns)
         forM_ ns $ \n -> do
-            hPutStrLn stderr $ "Change IP, ping: "++show n
+            dput XBitTorrent $ "Change IP, ping: "++show n
             ping outgoingClient n
         -- TODO: trigger bootstrap ipv6
         again
@@ -734,7 +735,7 @@ mainlineKademlia client committee refresher
                         return $ do
                             io1 >> io2
                             {-  noisy (timestamp updates are currently reported as transitions to Accepted)
-                            hPutStrLn stderr $ unwords
+                            dput XBitTorrent $ unwords
                                 [ show (transitionedTo tr)
                                 , show (transitioningNode tr)
                                 ] -}
@@ -753,7 +754,7 @@ transitionCommittee :: TriadCommittee NodeId SockAddr -> RoutingTransition NodeI
 transitionCommittee committee (RoutingTransition ni Stranger) = do
     delVote committee (nodeId ni)
     return $ do
-        hPutStrLn stderr $ "delVote "++show (nodeId ni)
+        dput XBitTorrent $ "delVote "++show (nodeId ni)
 transitionCommittee committee _ = return $ return ()
 
 updateRouting :: MainlineClient -> Routing -> NodeInfo -> Message BValue -> IO ()
@@ -768,7 +769,7 @@ updateRouting client routing naddr msg = do
             case msg of
                 R { rspReflectedIP = Just sockaddr }
                     -> do
-                        -- hPutStrLn stderr $ "External: "++show (nodeId naddr,sockaddr)
+                        -- dput XBitTorrent $ "External: "++show (nodeId naddr,sockaddr)
                         atomically $ addVote committee (nodeId naddr) sockaddr
                 _   -> return ()
             insertNode (mainlineKademlia client committee refresher) naddr