5 files changed, 9 insertions, 13 deletions

diff --git a/dht/src/Data/Tox/Onion.hs b/dht/src/Data/Tox/Onion.hs
index 86fc71f4..faff3cdf 100644
--- a/dht/src/Data/Tox/Onion.hs
+++ b/dht/src/Data/Tox/Onion.hs
@@ -831,8 +831,8 @@ decrypt crypto msg addr = do
             Right (msg, addr)
     case msg of
         OnionToRouteResponse {} -> case result of
-            Left e  -> dput XOnion $ "Error decrypting data-to-route response: " ++ e
-            Right m -> dput XOnion $ "Decrypted data-to-route response: " ++ show (fst m)
+            Left e  -> dput XMan $ "Error decrypting data-to-route response: " ++ e
+            Right m -> dput XMan $ "Decrypted data-to-route response: " ++ show (fst m)
         _ -> return ()
     return result
 
diff --git a/dht/src/DebugTag.hs b/dht/src/DebugTag.hs
index 83f9b1f8..75d07ef8 100644
--- a/dht/src/DebugTag.hs
+++ b/dht/src/DebugTag.hs
@@ -7,20 +7,16 @@ data DebugTag
   = XAnnounce
   | XAnnounceResponse
   | XBitTorrent
-  | XDHT
   | XLan
   | XMan
   | XNetCrypto
-  | XNetCryptoOut
   | XOnion
   | XRelay
   | XRoutes
   | XPing
-  | XRefresh
   | XJabber
   | XTCP
   | XMisc
-  | XNodeinfoSearch
   | XUnexpected -- Used only for special anomalous errors that we didn't expect to happen.
   | XUnused     -- Never commit code that uses XUnused.
   deriving (Eq, Ord, Show, Read, Enum, Bounded,Typeable)
diff --git a/dht/src/Network/Tox.hs b/dht/src/Network/Tox.hs
index 1a3bee79..a7e5d2c2 100644
--- a/dht/src/Network/Tox.hs
+++ b/dht/src/Network/Tox.hs
@@ -266,11 +266,11 @@ newTox :: TVar Onion.AnnouncedKeys   -- ^ Store of announced keys we are a rende
 newTox keydb bindspecs onsess crypto usetcp = do
   msock <- Bind.udpTransport' True bindspecs
   let failedBind = do
-            dput XDHT $ "tox udp bind error: " ++ show bindspecs
+            dput XMisc $ "tox udp bind error: " ++ show bindspecs
             throwIO $ userError "Tox UDP listen port?"
   fromMaybe failedBind $ msock <&> \(udp,sock) -> do
     addr <- getSocketName sock
-    dput XOnion $ "UDP bind address: " ++ show addr
+    dput XMisc $ "UDP bind address: " ++ show addr
     (relay,sendTCP) <-
         if usetcp then do
             fmap (Just *** Just) $ tcpRelay (fst crypto) addr $ \a x -> do
diff --git a/dht/src/Network/Tox/Onion/Handlers.hs b/dht/src/Network/Tox/Onion/Handlers.hs
index 8db1c534..ca7d47db 100644
--- a/dht/src/Network/Tox/Onion/Handlers.hs
+++ b/dht/src/Network/Tox/Onion/Handlers.hs
@@ -121,18 +121,18 @@ dataToRouteH ::
           -> IO ()
 dataToRouteH keydb udp _ (OnionToRoute pub asymm) = do
     let k = key2id pub
-    dput XOnion $ "dataToRouteH "++ show k
+    dput XAnnounce $ "dataToRouteH "++ show k
     mb <- atomically $ do
         ks <- readTVar keydb
         forM (MinMaxPSQ.lookup' k (keyAssoc ks)) $ \(p,(cnt,rpath)) -> do
             writeTVar keydb $ ks { keyAssoc = MinMaxPSQ.insert' k (cnt + 1, rpath) p (keyAssoc ks) }
             return rpath
-    dput XOnion $ "dataToRouteH "++ show (fmap (const ()) mb)
+    dput XAnnounce $ "dataToRouteH "++ show (fmap (const ()) mb)
     forM_ mb $ \rpath -> do
         -- forward
-        dput XOnion $ "dataToRouteH sendMessage"
+        dput XAnnounce $ "dataToRouteH sendMessage"
         sendMessage udp (toOnionDestination rpath) $ OnionToRouteResponse asymm
-        dput XOnion $ "Forwarding data-to-route -->"++show k
+        dput XAnnounce $ "Forwarding data-to-route -->"++show k
 
 type NodeDistance = NodeId
 
diff --git a/dht/src/Network/Tox/Relay.hs b/dht/src/Network/Tox/Relay.hs
index 66ab4b71..b315648a 100644
--- a/dht/src/Network/Tox/Relay.hs
+++ b/dht/src/Network/Tox/Relay.hs
@@ -272,7 +272,7 @@ tcpRelay crypto udp_addr sendOnion = do
     b33445 <- getBindAddress "33445" True
     bany   <- getBindAddress ""      True
     h <- forkStreamServer ServerConfig
-                        { serverWarn    = dput XOnion
+                        { serverWarn    = dput XMisc
                         , serverSession = relaySession crypto clients cons sendOnion
                         }
                       [b443,b80,b3389,udp_addr,b33445,bany]