1 files changed, 1 insertions, 27 deletions

diff --git a/OnionRouter.hs b/OnionRouter.hs
index 289dc7f4..26bc6525 100644
--- a/OnionRouter.hs
+++ b/OnionRouter.hs
@@ -31,9 +31,6 @@ import Network.Socket
 import System.Endian
 import System.IO
 
-newtype RouteId = RouteId Int
- deriving Show
-
 -- Toxcore saves a maximum of 12 paths: 6 paths are reserved for announcing
 -- ourselves and 6 others are used to search for friends.
 --
@@ -210,8 +207,8 @@ randomIvalInteger (l,h) rng
 selectTrampolines :: OnionRouter -> STM [NodeInfo]
 selectTrampolines or = do
     cnt <- readTVar (trampolineCount or)
-    drg0 <- readTVar (onionDRG or)
     ts <- readTVar (trampolineNodes or)
+    drg0 <- readTVar (onionDRG or)
     let (a, drg1) = randomR (0,cnt - 1) drg0
         (b0, drg2) = randomR (0,cnt - 2) drg1
         (c0, drg ) = randomR (0,cnt - 3) drg2
@@ -289,29 +286,6 @@ handleEvent getnodes or e@(BuildRoute (RouteId rid)) = do
         Just _  -> hPutStrLn stderr $ "ONION Finished RouteId " ++ show rid
         Nothing -> hPutStrLn stderr $ "ONION Failed RouteId " ++ show rid
 
--- We used to derive the RouteId from the Nonce8 associated with the query.
--- This is problematic because a nonce generated by toxcore will not validate
--- if it is received via a different route than it was issued.  This is
--- described by the Tox spec:
---
---   Toxcore generates `ping_id`s by taking a 32 byte sha hash of the current
---   time, some secret bytes generated when the instance is created, the
---   current time divided by a 20 second timeout, the public key of the
---   requester and the source ip/port that the packet was received from. Since
---   the ip/port that the packet was received from is in the `ping_id`, the
---   announce packets being sent with a ping id must be sent using the same
---   path as the packet that we received the `ping_id` from or announcing will
---   fail.
---
--- The original idea was:
---
--- > routeId :: Nonce8 -> RouteId
--- > routeId (Nonce8 w8) = RouteId $ mod (fromIntegral w8) 12
---
--- Instead, we'll just hash the destination node id.
-routeId :: NodeId -> RouteId
-routeId nid = RouteId $ mod (hash nid) 12
-
 lookupSender :: OnionRouter -> SockAddr -> Nonce8 -> IO (Maybe (OnionDestination RouteId))
 lookupSender or saddr (Nonce8 w8) = do
     result <- atomically $ do