More DPut stuff

        * verbose/quiet without args shows report
        * verbose all - sets all tags verbose
        * quiet all - sets all tags quiet
        * XMisc defaults to verbose, everything else quiet
        * new XMan tag for ToxManager related stuff
        * s/hputStrLn stderr/dput XMisc/ in daemon code

3 files changed, 15 insertions, 14 deletions

diff --git a/src/Network/Tox/ContactInfo.hs b/src/Network/Tox/ContactInfo.hs
index 64ea861b..5135813a 100644
--- a/src/Network/Tox/ContactInfo.hs
+++ b/src/Network/Tox/ContactInfo.hs
@@ -18,6 +18,7 @@ import Network.Tox.DHT.Transport     as DHT
 import Network.Tox.NodeId            (id2key)
 import Network.Tox.Onion.Transport   as Onion
 import System.IO
+import DPut
 
 newtype ContactInfo extra = ContactInfo
       -- | Map our toxid public key to an Account record.
@@ -55,7 +56,7 @@ myKeyPairs (ContactInfo accounts) = do
 
 updateContactInfo :: ContactInfo extra -> Onion.AnnouncedRendezvous -> (PublicKey,Onion.OnionData) -> IO ()
 updateContactInfo roster Onion.AnnouncedRendezvous{remoteUserKey} (localUserKey,omsg) = do
-    hPutStrLn stderr "updateContactInfo!!!"
+    dput XMisc "updateContactInfo!!!"
     now <- getPOSIXTime
     atomically $ do
         as <- readTVar (accounts roster)
diff --git a/src/Network/Tox/DHT/Handlers.hs b/src/Network/Tox/DHT/Handlers.hs
index 43169fa0..58a29c3e 100644
--- a/src/Network/Tox/DHT/Handlers.hs
+++ b/src/Network/Tox/DHT/Handlers.hs
@@ -404,9 +404,9 @@ unwrapNodes (SendNodes ns) = (ns,ns,Just ())
 
 getNodes :: Client -> TVar (HashMap NodeId [NodeInfoCallback]) -> NodeId -> NodeInfo -> IO (Maybe ([NodeInfo],[NodeInfo],Maybe ()))
 getNodes client cbvar nid addr = do
-    -- hPutStrLn stderr $ show addr ++ " <-- getnodes " ++ show nid
+    -- dput XMisc $ show addr ++ " <-- getnodes " ++ show nid
     reply <- QR.sendQuery client (serializer GetNodesType DHTGetNodes unsendNodes) (GetNodes nid) addr
-    -- hPutStrLn stderr $ show addr ++ " -sendnodes-> " ++ show reply
+    -- dput XMisc $ show addr ++ " -sendnodes-> " ++ show reply
     forM_ (join reply) $ \(SendNodes ns) -> 
         forM_ ns $ \n -> do
             now <- getPOSIXTime
@@ -430,13 +430,13 @@ updateRouting client routing orouter naddr msg
     case prefer4or6 naddr Nothing of
         Want_IP4 -> updateTable client naddr orouter (committee4 routing) (refresher4 routing)
         Want_IP6 -> updateTable client naddr orouter (committee6 routing) (refresher6 routing)
-        Want_Both -> do hPutStrLn stderr "BUG:unreachable"
+        Want_Both -> do dput XMisc "BUG:unreachable"
                         error $ "BUG:unreachable at " ++ __FILE__ ++ ":" ++ show __LINE__
 
 updateTable :: Client -> NodeInfo -> OnionRouter -> TriadCommittee NodeId SockAddr -> BucketRefresher NodeId NodeInfo -> IO ()
 updateTable client naddr orouter committee refresher = do
         self <- atomically $ R.thisNode <$> readTVar (refreshBuckets refresher)
-        -- hPutStrLn stderr $ "(tox)updateRouting: " ++ show (nodeIP self, nodeIP naddr)
+        -- dput XMisc $ "(tox)updateRouting: " ++ show (nodeIP self, nodeIP naddr)
         when (self /= naddr) $ do
             -- TODO: IP address vote?
             insertNode (toxKademlia client committee orouter refresher) naddr
@@ -455,7 +455,7 @@ toxKademlia client committee orouter refresher
                         return $ do
                             io1 >> io2
                             {-
-                            hPutStrLn stderr $ unwords
+                            dput XMisc $ unwords
                                 [ show (transitionedTo tr)
                                 , show (transitioningNode tr)
                                 ]
@@ -467,7 +467,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 XMisc $ "delVote "++show (nodeId ni)
         return ()
 transitionCommittee committee _ = return $ return ()
 
@@ -500,7 +500,7 @@ isDHTRequest _      _                        = Left "Bad dht relay request"
 
 dhtRequestH :: NodeInfo -> DHTRequest -> IO ()
 dhtRequestH ni req = do
-    hPutStrLn stderr $ "Unhandled DHT Request: " ++ show req
+    dput XMisc $ "Unhandled DHT Request: " ++ show req
 
 handlers :: TransportCrypto -> Routing -> PacketKind -> Maybe Handler
 handlers _      routing PingType          = Just $ MethodHandler (isPing snd) mkPong            $ pingH
diff --git a/src/Network/Tox/Onion/Transport.hs b/src/Network/Tox/Onion/Transport.hs
index 8a66f2b2..70714465 100644
--- a/src/Network/Tox/Onion/Transport.hs
+++ b/src/Network/Tox/Onion/Transport.hs
@@ -246,7 +246,7 @@ encodeOnionAddr crypto _ (msg,OnionToOwner ni p) =
                   , nodeAddr ni )
 encodeOnionAddr crypto getRoute (msg,OnionDestination x ni Nothing) = do
     encodeOnionAddr crypto getRoute (msg,OnionDestination x ni (Just $ routeId $ nodeId ni) )
-    -- hPutStrLn stderr $ "ONION encode missing routeid"
+    -- dput XMisc $ "ONION encode missing routeid"
     -- return Nothing
 encodeOnionAddr crypto getRoute (msg,OnionDestination _ ni (Just rid)) = do
     let go route = do
@@ -255,8 +255,8 @@ encodeOnionAddr crypto getRoute (msg,OnionDestination _ ni (Just rid)) = do
                    , nodeAddr $ routeNodeA route)
         mapM' f x = do
             let _ = x :: Maybe OnionRoute
-            -- hPutStrLn stderr $ "ONION encode sending to  " ++ show ni
-            -- hPutStrLn stderr $ "ONION encode getRoute -> " ++ show (fmap (\y -> map ($ y) [routeNodeA,routeNodeB,routeNodeC]) x)
+            -- dput XMisc $ "ONION encode sending to  " ++ show ni
+            -- dput XMisc $ "ONION encode getRoute -> " ++ show (fmap (\y -> map ($ y) [routeNodeA,routeNodeB,routeNodeC]) x)
             mapM f x         -- ONION encode getRoute -> Nothing
     getRoute ni rid >>= mapM' go
 
@@ -525,7 +525,7 @@ handleOnionResponse proxy crypto saddr udp kont (OnionResponse path msg) = do
         Left e -> do
             -- todo report encryption error
             let n = peanoVal path
-            hPutStrLn stderr $ unwords [ "peelSymmetric:", show n, either show show (either4or6 saddr), e]
+            dput XMisc $ unwords [ "peelSymmetric:", show n, either show show (either4or6 saddr), e]
             kont
         Right (Addressed dst path') -> do
             sendMessage udp dst (runPut $ putResponse $ OnionResponse path' msg)
@@ -897,9 +897,9 @@ parseDataToRoute crypto (OnionToRouteResponse dta, od) = do
       r = either (const $ Right (OnionToRouteResponse dta,od)) Left e
   -- parseDataToRoute OnionToRouteResponse decipherAndAuth: auth fail
   case e of
-    Left _  -> hPutStrLn stderr $ "Failed keys: " ++ show (map (key2id . snd) ks)
+    Left _  -> dput XMisc $ "Failed keys: " ++ show (map (key2id . snd) ks)
     Right _ -> return ()
-  hPutStrLn stderr $ unlines
+  dput XMisc $ unlines
         [ "parseDataToRoute " ++ either id (const "Right") e
         , "       crypto inner.me   = " ++ either id (\(pk,_,_) -> show $ key2id pk) eInner
         , "              inner.them = " ++ either id (show . key2id . dataFromKey) eOuter