Quieter output and some bug fixes.

2 files changed, 12 insertions, 4 deletions

diff --git a/src/Network/Tox/DHT/Handlers.hs b/src/Network/Tox/DHT/Handlers.hs
index 89f3d442..fc28e2d2 100644
--- a/src/Network/Tox/DHT/Handlers.hs
+++ b/src/Network/Tox/DHT/Handlers.hs
@@ -383,12 +383,20 @@ isCookieRequest _      _                    = Left "Bad cookie request"
 mkCookie :: TransactionId -> NodeInfo -> NodeInfo -> Cookie -> DHTMessage ((,) Nonce8)
 mkCookie (TransactionId n8 n24) src dst cookie = DHTCookie n24 (n8,cookie)
 
+isDHTRequest :: (f DHTRequest -> DHTRequest) -> DHTMessage f -> Either String DHTRequest
+isDHTRequest unpack (DHTDHTRequest pubkey a) = Right $ unpack $ asymmData a
+isDHTRequest _      _                        = Left "Bad dht relay request"
+
+dhtRequestH :: NodeInfo -> DHTRequest -> IO ()
+dhtRequestH ni req = do
+    hPutStrLn stderr $ "Unhandled DHT Request: " ++ show req
 
 handlers :: TransportCrypto -> Routing -> PacketKind -> Maybe Handler
 handlers _      routing PingType          = Just $ MethodHandler (isPing snd) mkPong            $ pingH
 handlers _      routing GetNodesType      = Just $ MethodHandler (isGetNodes snd) mkSendNodes   $ getNodesH routing
 handlers crypto _       CookieRequestType = Just $ MethodHandler (isCookieRequest snd) mkCookie $ cookieRequestH crypto
-handlers _      _       _                 = error "TODO handlers"
+handlers _      _       DHTRequestType    = Just $ NoReply (isDHTRequest snd) $ dhtRequestH
+handlers _      _       typ               = error $ "TODO DHT handlers " ++ show typ
 
 nodeSearch :: Client -> Search NodeId (IP,PortNumber) () NodeInfo NodeInfo
 nodeSearch client  = Search
diff --git a/src/Network/Tox/Onion/Transport.hs b/src/Network/Tox/Onion/Transport.hs
index 39ea8c46..5b7aad0b 100644
--- a/src/Network/Tox/Onion/Transport.hs
+++ b/src/Network/Tox/Onion/Transport.hs
@@ -247,8 +247,8 @@ encodeOnionAddr 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)
+            -- hPutStrLn stderr $ "ONION encode sending to  " ++ show ni
+            -- hPutStrLn stderr $ "ONION encode getRoute -> " ++ show (fmap (\y -> map ($ y) [routeNodeA,routeNodeB,routeNodeC]) x)
             mapM f x         -- ONION encode getRoute -> Nothing
     getRoute ni rid >>= mapM' go
 
@@ -846,7 +846,7 @@ parseDataToRoute crypto (OnionToRouteResponse dta, od) = do
                                  (Left (dataFromKey dtr, dataToRoute dtr))
         return (pk,dtr,omsg)
 
-      eInner = foldr1 (<|>) eInners
+      eInner = foldr (<|>) (Left "no user key") eInners
 
       e = do
         (pk,dtr,omsg) <- eInner