4 files changed, 61 insertions, 15 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index c46ed17f..936b022a 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -395,6 +395,7 @@ executable dhtd
                      , stm
                      , cereal
                      , bencoding
+                     , random
   if flag(thread-debug)
     build-depends: time
     cpp-options:   -DTHREAD_DEBUG
diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 3fca5482..4c8cefb5 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -68,6 +68,7 @@ import Network.KRPC.Method
 import Data.Typeable
 import GHC.Generics
 import Data.Bool
+import System.Random
 
 mkNodeAddr :: SockAddr -> NodeAddr IPv4
 mkNodeAddr addr = NodeAddr (fromJust $ fromSockAddr addr)
@@ -252,23 +253,66 @@ instance Serialize (Response Tox.Message (Ping Tox.Message)) where
     get = getToxPing True Network.DHT.Types.Response Tox.ResponseNonce
     put (Network.DHT.Types.Response extra Ping) = putToxPing True (Tox.rspNonce extra)
 
-instance Serialize (Query Tox.Message (FindNode Tox.Message IPv4)) where
-    get = error "TODO get 7"
-    put = error "TODO put 8"
+nodeFormatToNodeInfo nf = NodeInfo nid addr u
+ where
+    u    = Tox.nodeIsTCP nf
+    addr = NodeAddr (Tox.nodeIP nf) (Tox.nodePort nf)
+    nid  = Tox.nodePublicKey nf
+
+instance Serialize (Query Tox.Message (FindNode Tox.Message ip)) where
+    get = do
+        nid <- get
+        n8 <- get
+        return $ Network.DHT.Types.Query (Tox.QueryNonce n8) (FindNode nid)
+    put (Network.DHT.Types.Query (Tox.QueryNonce n8) (FindNode nid)) = do
+        put nid
+        put n8
 instance Serialize (Response Tox.Message (NodeFound Tox.Message IPv4)) where
-    get = error "TODO get 11"
-    put = error "TODO put 12"
+    get = do
+        num <- get :: Get Word8
+        when (num > 4) $ fail "Too many nodes in Tox get-nodes reply"
+        ns0 <- sequence $ replicate (fromIntegral num) (nodeFormatToNodeInfo <$> get)
+        -- TODO: Allow tcp and ipv6. For now filtering to udp ip4...
+        let ns = flip mapMaybe ns0 $ \(NodeInfo nid addr u) -> do
+                    guard $ not u
+                    ip4 <- fromAddr addr
+                    return $ NodeInfo nid ip4 ()
+        n8 <- get
+        return $ Network.DHT.Types.Response (Tox.ResponseNonce n8) $ NodeFound ns
+    put (Network.DHT.Types.Response (Tox.ResponseNonce n8) (NodeFound ns)) = do
+        put ( fromIntegral (length ns) :: Word8 )
+        forM_ ns $ \(NodeInfo nid ip4 ()) -> do
+            put Tox.NodeFormat { nodePublicKey = nid
+                               , nodeIsTCP     = False
+                               , nodeIP        = IPv4 (nodeHost ip4)
+                               , nodePort      = nodePort ip4
+                               }
+        put n8
+
+validateToxExchange q r = qnonce == rnonce
+      where
+        qnonce = Tox.qryNonce . queryExtra    . Tox.msgPayload $ q
+        rnonce = Tox.rspNonce . responseExtra . Tox.msgPayload $ r
 
 instance KRPC Tox.Message (Query    Tox.Message (FindNode  Tox.Message IPv4))
                           (Response Tox.Message (NodeFound Tox.Message IPv4)) where
-    method = error "TODO method 15"
+    method = Method Tox.GetNodes
+    validateExchange = validateToxExchange
+    makeQueryExtra _ _ _ _ = Tox.QueryNonce <$> randomIO
+    makeResponseExtra _ _ q _ = return $ Tox.ResponseNonce $ Tox.qryNonce $ queryExtra q
+    messageSender q _ = Tox.msgClient q
+    messageResponder _ r = Tox.msgClient r
+
 instance KRPC Tox.Message (Query    Tox.Message (Ping Tox.Message))
                           (Response Tox.Message (Ping Tox.Message)) where
-    method = error "TODO method 16"
-instance DataHandlers ByteString Tox.Message where
-
-
--- instance Generic (Response Tox.Message (NodeFound Tox.Message IPv4)) where -- TODO
+    method = Method Tox.Ping
+    validateExchange = validateToxExchange
+    makeQueryExtra _ _ _ _ = Tox.QueryNonce <$> randomIO
+    makeResponseExtra _ _ q _ = return $ Tox.ResponseNonce $ Tox.qryNonce $ queryExtra q
+    messageSender q _ = Tox.msgClient q
+    messageResponder _ r = Tox.msgClient r
+
+instance DataHandlers ByteString Tox.Message
 
 instance Default Bool where def = False
 
diff --git a/src/Network/BitTorrent/DHT/Query.hs b/src/Network/BitTorrent/DHT/Query.hs
index 330b5478..ad29adb6 100644
--- a/src/Network/BitTorrent/DHT/Query.hs
+++ b/src/Network/BitTorrent/DHT/Query.hs
@@ -232,6 +232,7 @@ class DataHandlers raw dht where
          (NodeId dht  -> IO [NodeInfo dht ip ()])
         -> DHTData dht ip
         -> [MethodHandler raw dht ip]
+    dataHandlers _ _ = []
 
 instance DataHandlers BValue KMessageOf where
     dataHandlers = bthandlers
diff --git a/src/Network/DatagramServer/Tox.hs b/src/Network/DatagramServer/Tox.hs
index 83701b6b..3a6135cc 100644
--- a/src/Network/DatagramServer/Tox.hs
+++ b/src/Network/DatagramServer/Tox.hs
@@ -37,7 +37,7 @@ type Nonce24 = Word192 -- 24 bytes
 
 
 data NodeFormat  = NodeFormat
-    { nodePublicKey :: Key32 -- 32 byte public key
+    { nodePublicKey :: NodeId Message -- 32 byte public key
     , nodeIsTCP :: Bool -- This has no analog in mainline NodeInfo structure
     , nodeIP :: IP -- IPv4 or IPv6  address
     , nodePort :: PortNumber
@@ -149,10 +149,10 @@ instance Serialize NodeFormat where
         return $ NodeFormat { nodeIsTCP     = istcp
                             , nodeIP        = ip
                             , nodePort      = port
-                            , nodePublicKey = pubkey
+                            , nodePublicKey = NodeId pubkey
                             }
 
-    put (NodeFormat{..}) = do
+    put (NodeFormat{ nodePublicKey = NodeId pubkey, ..}) = do
         put $ case (# nodeIP, nodeIsTCP #) of
                 (# IPv4 _, False #) -> 2
                 (# IPv4 _, True  #) -> 130
@@ -160,7 +160,7 @@ instance Serialize NodeFormat where
                 (# IPv6 _, True  #) -> 138 :: Word8
         put nodeIP
         put nodePort
-        put nodePublicKey
+        put pubkey
 
 -- Note: the char array is a public key, the 32-bytes is provided by libsodium-dev
 -- in /usr/include/sodium/crypto_box.h as the symbol crypto_box_PUBLICKEYBYTES