3 files changed, 18 insertions, 5 deletions

diff --git a/src/Network/QueryResponse.hs b/src/Network/QueryResponse.hs
index 1901e164..9563fa7c 100644
--- a/src/Network/QueryResponse.hs
+++ b/src/Network/QueryResponse.hs
@@ -27,6 +27,7 @@ import qualified Data.IntMap.Strict as IntMap
          ;import Data.IntMap.Strict (IntMap)
 import qualified Data.Map.Strict    as Map
          ;import Data.Map.Strict    (Map)
+import qualified Data.Word64Map as W64Map
 import Data.Maybe
 import Data.Typeable
 import Network.Socket
@@ -128,6 +129,10 @@ partitionTransportM parse encodex tr = do
                 }
     return (xtr, ytr)
 
+-- |
+--      * f add x --> Nothing, consume x
+--                --> Just id, leave x to a different handler
+--                --> Just g, apply g to x and leave that to a different handler
 addHandler :: ErrorReporter addr x meth tid err -> (addr -> x -> IO (Maybe (x -> x))) -> Transport err addr x -> Transport err addr x
 addHandler err f tr = tr
     { awaitMessage = \kont -> fix $ \eat -> awaitMessage tr $ \m -> do
@@ -304,7 +309,7 @@ data TransactionMethods d tid addr x = TransactionMethods
       dispatchRegister :: MVar x -> addr -> d -> STM (tid, d)
       -- | This method is invoked when an incoming packet /x/ indicates it is
       -- a response to the transaction with id /tid/.  The returned IO action
-      -- is will write the packet to the correct 'MVar' thus completing the
+      -- will write the packet to the correct 'MVar' thus completing the
       -- dispatch.
     , dispatchResponse :: tid -> x -> d -> STM (d, IO ())
       -- | When a timeout interval elapses, this method is called to remove the
@@ -323,10 +328,14 @@ data TableMethods t tid = TableMethods
     , tblLookup :: forall a. tid -> t a -> Maybe a
     }
 
--- | Methods for using 'Data.IntMap.
+-- | Methods for using 'Data.IntMap'.
 intMapMethods :: TableMethods IntMap Int
 intMapMethods = TableMethods IntMap.insert IntMap.delete IntMap.lookup
 
+-- | Methods for using 'Data.Word64Map'.
+w64MapMethods :: TableMethods IntMap Int
+w64MapMethods = TableMethods W64Map.insert W64Map.delete W64Map.lookup
+
 -- | Methods for using 'Data.Map'
 mapMethods :: Ord tid => TableMethods (Map tid) tid
 mapMethods = TableMethods Map.insert Map.delete Map.lookup
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index af8114f4..c587578d 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -155,6 +155,9 @@ gen g = let (bs, g')  = randomBytesGenerate 24 g
 intKey :: DHT.TransactionId -> Int
 intKey (DHT.TransactionId (Nonce8 w) _) = fromIntegral w
 
+w64Key :: DHT.TransactionId -> Word64
+w64Key (DHT.TransactionId (Nonce8 w) _) = w
+
 nonceKey :: DHT.TransactionId -> Nonce8
 nonceKey (DHT.TransactionId n _) = n
 
@@ -178,6 +181,7 @@ newClient drg net classify selfAddr handlers modifytbl modifynet = do
     -- If we have 8-byte keys for IntMap, then use it for transaction lookups.
     -- Otherwise, use ordinary Map.  The details of which will be hidden by an
     -- existential closure (see mkclient below).
+    --
     tblvar <-
       if fitsInInt (Proxy :: Proxy Word64)
         then do
@@ -185,9 +189,9 @@ newClient drg net classify selfAddr handlers modifytbl modifynet = do
             intmap_var <- atomically $ newTVar (drg, mempty)
             return $ Right (intmapT,intmap_var)
          else do
-            let mapT = transactionMethods (contramap nonceKey mapMethods) gen
+            let word64mapT = transactionMethods (contramap w64key w64MapMethods) gen
             map_var <- atomically $ newTVar (drg, mempty)
-            return $ Left (mapT,map_var)
+            return $ Left (word64mapT,map_var)
     let dispatch tbl var handlers = DispatchMethods
                 { classifyInbound = classify
                 , lookupHandler = handlers -- var
diff --git a/src/Network/Tox/Crypto/Transport.hs b/src/Network/Tox/Crypto/Transport.hs
index 40ca8b11..2a0e4a38 100644
--- a/src/Network/Tox/Crypto/Transport.hs
+++ b/src/Network/Tox/Crypto/Transport.hs
@@ -25,7 +25,7 @@ data NetCrypto
     | NetCrypto (CryptoPacket Encrypted)
 
 parseNetCrypto :: ByteString -> SockAddr -> Either String (NetCrypto, SockAddr)
-parseNetCrypto _ _  = Left "TODO: parseNetCrypto"
+parseNetCrypto pkt saddr = Left "TODO: parseNetCrypto"
 
 encodeNetCrypto :: NetCrypto -> SockAddr -> (ByteString, SockAddr)
 encodeNetCrypto _ _ = _todo