Quieter output and some bug fixes.

1 files changed, 17 insertions, 10 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index 9f41fbe5..7179e3c2 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -284,24 +284,31 @@ getOnionAlias crypto dhtself remoteNode = atomically $ do
 
 newTox :: TVar Onion.AnnouncedKeys -> SockAddr -> Maybe NetCryptoSessions -> Maybe SecretKey -> IO Tox
 newTox keydb addr mbSessionsState suppliedDHTKey = do
-    udp <- addVerbosity <$> udpTransport addr
-    (crypto,sessionsState) <- case mbSessionsState of
+    udp <- {- addVerbosity <$> -} udpTransport addr
+    (crypto0,sessionsState) <- case mbSessionsState of
                                  Nothing -> do
-                                    crypto0 <- newCrypto
-                                    let crypto = fromMaybe crypto0 $do
-                                            k <- suppliedDHTKey
-                                            return crypto0
-                                                { transportSecret = k
-                                                , transportPublic = toPublic k
-                                                }
+                                    crypto <- newCrypto
                                     sessionsState <- newSessionsState crypto defaultUnRecHook defaultCryptoDataHooks
                                     return (crypto,sessionsState)
                                  Just s -> return (transportCrypto s, s)
+
+    let crypto = fromMaybe crypto0 $do
+            k <- suppliedDHTKey
+            return crypto0
+                { transportSecret = k
+                , transportPublic = toPublic k
+                }
+    forM_ suppliedDHTKey $ \k -> do
+        maybe (hPutStrLn stderr "failed to encode suppliedDHTKey")
+              (C8.hPutStrLn stderr . C8.append "Using suppliedDHTKey: ")
+              $ encodeSecret k
+
     drg <- drgNew
     let lookupClose _ = return Nothing
 
     routing <- DHT.newRouting addr crypto updateIP updateIP
-    orouter <- newOnionRouter
+    let ignoreErrors _ = return () -- Set this to (hPutStrLn stderr) to debug onion route building.
+    orouter <- newOnionRouter ignoreErrors
     (dhtcrypt,onioncrypt,dtacrypt,cryptonet) <- toxTransport crypto orouter lookupClose udp
     let dhtnet0 = layerTransport (DHT.decrypt crypto) (DHT.encrypt crypto) dhtcrypt
     dhtclient <- newClient drg dhtnet0 DHT.classify (myAddr routing) (DHT.handlers crypto routing) id