1 files changed, 5 insertions, 4 deletions

diff --git a/Tox.hs b/Tox.hs
index 253c83e7..bd5ebbc2 100644
--- a/Tox.hs
+++ b/Tox.hs
@@ -597,7 +597,7 @@ newClient addr = do
         -- recursive since 'updateRouting' does not invoke 'awaitMessage' which
         -- which was modified by 'onInbound'.  However, I'm going to avoid the
         -- mutual reference just to be safe.
-        outgoingClient = client { clientNet = net { awaitMessage = return Nothing } }
+        outgoingClient = client { clientNet = net { awaitMessage = ($ Nothing) } }
 
         dispatch tbl var = DispatchMethods
             { classifyInbound = classify
@@ -608,6 +608,7 @@ newClient addr = do
         -- handlers :: TVar -> Method -> Maybe Handler
         handlers var PingType       = handler PongType pingH
         handlers var GetNodesType   = handler SendNodesType $ getNodesH routing
+        {-
         handlers var OnionRequest0  = noreply OnionRequest0
                                       $ onionSend0H (symmetricCipher (return symkey)
                                                                      (fst <$> readTVar var)
@@ -616,6 +617,7 @@ newClient addr = do
         handlers var OnionResponse1 = noreply OnionResponse1
                                       $ onionResponse1H (symmetricDecipher (return symkey))
                                                         udp
+        -}
         handlers var _              = Nothing
         -- TODO DHTRequest public key (onion)
         -- TODO DHTRequest NAT ping
@@ -690,12 +692,11 @@ dropEnd8 bs = B.take (B.length bs - 8) bs
 
 -- Add detailed printouts for every packet.
 addVerbosity tr =
-    tr { awaitMessage = do
-            m <- awaitMessage tr
+    tr { awaitMessage = \kont -> awaitMessage tr $ \m -> do
             forM_ m $ mapM_ $ \(msg,addr) -> do
                 hPutStrLn stderr ( (show addr)
                                     ++ " --> " ++ show (msgType msg))
-            return m
+            kont m
        , sendMessage = \addr msg -> do
             hPutStrLn stderr ( (show addr)
                                 ++ " <-- " ++ show (msgType msg))