3 files changed, 16 insertions, 13 deletions

diff --git a/Connection/Tcp.hs b/Connection/Tcp.hs
index 2c2c8d76..9a44f34f 100644
--- a/Connection/Tcp.hs
+++ b/Connection/Tcp.hs
@@ -80,6 +80,7 @@ import Network.StreamServer
 import Network.SocketLike hiding (sClose)
 import qualified Connection as G
          ;import Connection (Manager (..), Policy(..))
+import DPut
 
 
 type Microseconds = Int
@@ -298,10 +299,10 @@ server allocate sessionConduits = do
                  `fmap` atomically (readTVar $ listenmap server)
     when (not listening) $ do
 
-    hPutStrLn stderr $ "Started listening on "++show port
+    dput XMisc $ "Started listening on "++show port
 
     sserv <- flip streamServer port ServerConfig
-        { serverWarn    = hPutStrLn stderr
+        { serverWarn    = dput XMisc
         , serverSession = \sock _ h -> do
             (conkey,u) <- makeConnKey params sock
             _ <- newConnection server sessionConduits params conkey u h In
@@ -311,7 +312,7 @@ server allocate sessionConduits = do
     atomically $ listenmap server `modifyTVar'` Map.insert port sserv
 
   doit server (Ignore port) = do
-    hPutStrLn stderr $ "Stopping listen on "++show port
+    dput XMisc $ "Stopping listen on "++show port
     mb <- atomically $ do
         map <- readTVar $ listenmap server
         modifyTVar' (listenmap server) $ Map.delete port
@@ -758,7 +759,7 @@ bshow :: Show a => a -> ByteString
 bshow e = S.pack . show $ e
 
 warn :: ByteString -> IO ()
-warn str = S.hPutStrLn stderr str >> hFlush stderr
+warn str =dputB XMisc str >> hFlush stderr
 
 debugNoise :: Monad m => t -> m ()
 debugNoise str = return ()
@@ -790,8 +791,8 @@ tcpManager grokKey s2k resolvKey sv = do
                         Just conkey -> do
                             control sv $ case grokKey conkey of
                                     (saddr,params,ms) -> ConnectWithEndlessRetry saddr params ms
-        OpenToConnect     -> hPutStrLn stderr "TODO: TCP OpenToConnect"
-        RefusingToConnect -> hPutStrLn stderr "TODO: TCP RefusingToConnect"
+        OpenToConnect     -> dput XMisc "TODO: TCP OpenToConnect"
+        RefusingToConnect -> dput XMisc "TODO: TCP RefusingToConnect"
     , connections = do
         c <- readTVar $ conmap sv
         fmap (exportConnection nullping c) <$> readTVar rmap
diff --git a/Connection/Tox.hs b/Connection/Tox.hs
index 03ffbc25..1cbbdaee 100644
--- a/Connection/Tox.hs
+++ b/Connection/Tox.hs
@@ -31,6 +31,7 @@ import GHC.Conc                  (labelThread)
 #endif
 import GHC.Conc (ThreadStatus (..), threadStatus)
 import System.IO
+import DPut
 
 
 
@@ -81,7 +82,7 @@ launch lbl st f = do
     tid <- forkIO (f stvar)
     labelThread tid lbl
     stat <- threadStatus tid
-    hPutStrLn stderr $ "launch "++lbl++" "++show stat
+    dput XMan $ "launch "++lbl++" "++show stat
     return $ StatefulTask tid stvar
 
 
@@ -142,12 +143,12 @@ setToxPolicy :: Parameters extra
              -> Policy
              -> IO ()
 setToxPolicy params conmap k@(Key me them) policy = do
-  hPutStrLn stderr $ "C.setToxPolicy "++show (them,policy)
+  dput XMan $ "C.setToxPolicy "++show (them,policy)
   case policy of
     TryingToConnect -> do
         mst <- lookupForPolicyChange conmap k policy
         r <- atomically $ lookupContact k (roster params)
-        hPutStrLn stderr $ "C.r="++show (fmap (const ()) r)
+        dput XMan $ "C.r="++show (fmap (const ()) r)
         forM_ r $ \(sec,c) -> do
         let persue_methods = PersueContactMethods
                 { allsessions        = sessions params
@@ -178,7 +179,7 @@ setToxPolicy params conmap k@(Key me them) policy = do
                 fmap (fromMaybe G.Dormant) $ forM (Map.lookup (id2key them) sbk) $ \ss -> do
                     stats <- mapM (readTVar . ncState) ss
                     return $ maximum stats
-        hPutStrLn stderr $ "C.mst="++show (fmap (const ()) mst)
+        dput XMan $ "C.mst="++show (fmap (const ()) mst)
         forM_ mst $ \st -> do
             let getPolicy = readTVar $ connPolicy st
             tasks <- atomically $ readTVar (handshakeTask st)
diff --git a/Connection/Tox/Threads.hs b/Connection/Tox/Threads.hs
index aeeab0e1..6a7edeb4 100644
--- a/Connection/Tox/Threads.hs
+++ b/Connection/Tox/Threads.hs
@@ -41,6 +41,7 @@ import Data.Functor.Identity
 import Data.Time.Clock.POSIX
 import System.IO
 import System.Timeout
+import DPut
 
 
 
@@ -146,11 +147,11 @@ persueContact getPolicy getStatus PersueContactMethods{..} statusVar = do
                                 DHT.cookieRequest crypto client (toPublic myseckey) ni
                     interval <- case mbCookie of
                           Nothing -> do
-                            hPutStrLn stderr ("persueContact: (" ++ show mykeyAsId ++") <--> (" ++ show theirkeyAsId ++ ").")
-                            hPutStrLn stderr ("persueContact: CookieRequest failed. TODO: dhtpkNodes thingy")
+                            dput XMan ("persueContact: (" ++ show mykeyAsId ++") <--> (" ++ show theirkeyAsId ++ ").")
+                            dput XMan ("persueContact: CookieRequest failed. TODO: dhtpkNodes thingy")
                             return longRetryInterval
                           Just cookie -> do
-                            hPutStrLn stderr "Have cookie, creating handshake packet..."
+                            dput XMan "Have cookie, creating handshake packet..."
                             let hp = HParam { hpOtherCookie = cookie
                                             , hpMySecretKey = myseckey
                                             , hpCookieRemotePubkey = theirpubkey