Tox: improved data-to-route and onion debug prints.

2 files changed, 9 insertions, 6 deletions

diff --git a/src/Network/Tox/Crypto/Transport.hs b/src/Network/Tox/Crypto/Transport.hs
index bc112078..73143e35 100644
--- a/src/Network/Tox/Crypto/Transport.hs
+++ b/src/Network/Tox/Crypto/Transport.hs
@@ -86,8 +86,8 @@ encodeCrypto :: (CryptoPacket Encrypted, SockAddr) -> Maybe (ByteString, SockAdd
 encodeCrypto (x,saddr) = Just (B.cons 0x1b (runPut $ put x),saddr)
 
 parseHandshakes :: ByteString -> SockAddr -> Either String (Handshake Encrypted, SockAddr)
-parseHandshakes (B.uncons -> Just (0x1a,pkt)) saddr = left ("parseNetCrypto: "++) $ (,saddr) <$> runGet get pkt
-parseHandshakes _                             _     = Left "parseHandshakes_: ?"
+parseHandshakes (B.uncons -> Just (0x1a,pkt)) saddr = left ("parseHandshakes: "++) $ (,saddr) <$> runGet get pkt
+parseHandshakes bs                            _     = Left $ "parseHandshakes_: " ++ show (B.unpack $ B.take 1 bs)
 
 encodeHandshakes :: Handshake Encrypted -> SockAddr -> (ByteString, SockAddr)
 encodeHandshakes x saddr = (B.cons 0x1a (runPut $ put x),saddr)
diff --git a/src/Network/Tox/Onion/Transport.hs b/src/Network/Tox/Onion/Transport.hs
index d604a5c8..864e831f 100644
--- a/src/Network/Tox/Onion/Transport.hs
+++ b/src/Network/Tox/Onion/Transport.hs
@@ -891,12 +891,15 @@ parseDataToRoute crypto (OnionToRouteResponse dta, od) = do
                     $ Rendezvous (rendezvousPublic crypto) $ onionNodeInfo od )
       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)
+    Right _ -> return ()
   hPutStrLn stderr $ unlines
         [ "parseDataToRoute " ++ either id (const "Right") e
-        , "       crypto inner.me =" ++ either id (\(pk,_,_) -> show $ key2id pk) eInner
-        , "              inner.you=" ++ either id (show . key2id . dataFromKey) eOuter
-        , "              outer.me =" ++ show (key2id $ rendezvousPublic crypto)
-        , "              outer.you=" ++ show (key2id $ senderKey dta)
+        , "       crypto inner.me   = " ++ either id (\(pk,_,_) -> show $ key2id pk) eInner
+        , "              inner.them = " ++ either id (show . key2id . dataFromKey) eOuter
+        , "              outer.me   = " ++ show (key2id $ rendezvousPublic crypto)
+        , "              outer.them = " ++ show (key2id $ senderKey dta)
         ]
   return r
 parseDataToRoute _ msg = return $ Right msg