1 files changed, 14 insertions, 10 deletions

diff --git a/OnionRouter.hs b/OnionRouter.hs
index 7a48aaab..40112e6a 100644
--- a/OnionRouter.hs
+++ b/OnionRouter.hs
@@ -33,21 +33,21 @@ newtype RouteId = RouteId Int
  deriving Show
 
 data OnionRouter = OnionRouter
-    { pendingQueries :: TVar (Word64Map NodeId)
-    , routeMap :: TVar (IntMap RouteRecord)
+    { pendingQueries  :: TVar (Word64Map NodeId) -- TODO: routeNonce belongs here instead of in routeMap, or just remove routeNonce and use transaction nonce.
+    , routeMap        :: TVar (IntMap RouteRecord)
     , trampolineNodes :: TVar (IntMap NodeInfo)
-    , trampolineIds :: TVar (HashMap NodeId Int)
+    , trampolineIds   :: TVar (HashMap NodeId Int)
     , trampolineCount :: TVar Int
-    , onionDRG :: TVar ChaChaDRG
-    , routeThread :: ThreadId
-    , pendingRoutes :: IntMap (TVar Bool)
-    , routeLog :: TChan String
+    , onionDRG        :: TVar ChaChaDRG
+    , routeThread     :: ThreadId
+    , pendingRoutes   :: IntMap (TVar Bool)
+    , routeLog        :: TChan String
     }
 
 data RouteRecord = RouteRecord
     { storedRoute :: OnionRoute
-    , responseCount :: Int
-    , timeoutCount :: Int
+    , responseCount :: !Int
+    , timeoutCount :: !Int
     }
 
 -- Onion paths have different timeouts depending on whether the path is
@@ -230,7 +230,8 @@ handleEvent getnodes or e@(BuildRoute (RouteId rid)) = do
                         [ "ONION trampolines:   " ++ show ts
                         , "ONION query results: " ++ show nodes ]
                     case nodes of
-                        [a,b,c] -> do -- | distinct3by nodeClass a b c -> do
+                        [a,b,c] | distinct3by nodeClass a b c -> do
+                            atomically $ writeTChan (routeLog or) $ unwords [ "ONION using route:", show $ nodeAddr a, show $ nodeAddr b, show $ nodeAddr c]
                             return $ Just OnionRoute
                                 { routeNonce = n24
                                 , routeAliasA = asec
@@ -240,6 +241,9 @@ handleEvent getnodes or e@(BuildRoute (RouteId rid)) = do
                                 , routeNodeB = b
                                 , routeNodeC = c
                                 }
+                        [a,b,c] -> do
+                            atomically $ writeTChan (routeLog or) $ unwords [ "ONION Discarding insecure route:", show $ nodeAddr a, show $ nodeAddr b, show $ nodeAddr c]
+                            return Nothing
                         _ -> return Nothing
         writeTVar (onionDRG or) drg'
         return $ getr