TOX rewrite: Response nonces are now distinct from query nonces.

1 files changed, 14 insertions, 8 deletions

diff --git a/Tox.hs b/Tox.hs
index e1a1bf8a..77cd0ae0 100644
--- a/Tox.hs
+++ b/Tox.hs
@@ -240,16 +240,16 @@ encodePacket :: SecretKey -> SecretsCache -> Message ByteString -> NodeInfo -> (
 encodePacket sk cache msg ni = ( S.runPut . putMessage $ encryptMessage sk cache (nodeId ni) msg
                                , nodeAddr ni )
 
-newClient :: SockAddr -> IO (Client String Method TransactionId NodeInfo (Message ByteString) ())
+newClient :: SockAddr -> IO (Client String Method TransactionId NodeInfo (Message ByteString))
 newClient addr = do
     udp <- udpTransport addr
     secret <- generateSecretKey
     let pubkey = key2id $ toPublic secret
     cache <- newEmptyCache
     drg <- getSystemDRG
-    let me = NodeInfo pubkey (fromMaybe (toEnum 0) $ fromSockAddr addr)
-                             (fromMaybe 0 $ sockAddrPort addr)
-    tox <- atomically $ newTVar (me,())
+    self <- atomically $ newTVar
+             $ NodeInfo pubkey (fromMaybe (toEnum 0) $ fromSockAddr addr)
+                               (fromMaybe 0 $ sockAddrPort addr)
     let net = layerTransport (parsePacket secret cache)
                              (encodePacket secret cache)
                              udp
@@ -258,12 +258,18 @@ newClient addr = do
             , lookupHandler = handlers
             , tableMethods = tbl
             }
+        genNonce24 var (TransactionId nonce8 _) = atomically $ do
+            (g,pending) <- readTVar var
+            let (bs, g') = randomBytesGenerate 24 g
+            writeTVar var (g',pending)
+            return $ TransactionId nonce8 (Nonce24 bs)
         client tbl var = Client
             { clientNet           = net
             , clientDispatcher    = dispatch tbl
             , clientErrorReporter = ignoreErrors -- TODO
             , clientPending       = var
-            , clientContext       = atomically (readTVar tox)
+            , clientAddress       = atomically (readTVar self)
+            , clientResponseId    = genNonce24 var
             }
     if fitsInInt (Proxy :: Proxy Word64)
       then do
@@ -300,7 +306,7 @@ classify (Message { msgType    = typ
             PongType      -> IsResponse
             SendNodesType -> IsResponse
 
-encodePayload typ _ (TransactionId (Nonce8 tid) nonce) self dest b
+encodePayload typ (TransactionId (Nonce8 tid) nonce) self dest b
     = Message { msgType    = typ
               , msgOrigin  = nodeId self
               , msgNonce   = nonce
@@ -312,8 +318,8 @@ decodePayload msg = S.decode $ dropEnd8 $ msgPayload msg
 
 handler typ f = Just $ MethodHandler decodePayload (encodePayload typ) f
 
-handlers :: Method -> Maybe (MethodHandler String TransactionId NodeInfo (Message ByteString) ())
-handlers PingType     = error "handler PingType pingH"
+handlers :: Method -> Maybe (MethodHandler String TransactionId NodeInfo (Message ByteString))
+handlers PingType     = handler PingType pingH
 handlers GetNodesType = error "find_node"
 handlers _            = Nothing