Moved node-id out of Query/Response. It can be either in the

envelope (Tox) or in the query/response payload (Mainline).

1 files changed, 30 insertions, 14 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index dd038d70..3fca5482 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -29,11 +29,12 @@ import System.IO
 import System.IO.Error
 import Text.PrettyPrint.HughesPJClass
 import Text.Printf
-import Text.Read
+import Text.Read hiding (get)
 import Control.Monad.Reader.Class
 import System.Posix.Process (getProcessID)
 import GHC.Stats
 import System.Mem
+import Data.Word
 
 import Data.Torrent (InfoHash)
 import Network.Address
@@ -66,6 +67,7 @@ import Data.Serialize
 import Network.KRPC.Method
 import Data.Typeable
 import GHC.Generics
+import Data.Bool
 
 mkNodeAddr :: SockAddr -> NodeAddr IPv4
 mkNodeAddr addr = NodeAddr (fromJust $ fromSockAddr addr)
@@ -225,29 +227,43 @@ ipType _ = return ()
 
 instance Kademlia Tox.Message where
     data DHTData Tox.Message ip = ToxData
-    namePing      _ = Tox.Ping
-    nameFindNodes _ = Tox.GetNodes
+    namePing      _   = Tox.Ping
+    nameFindNodes _   = Tox.GetNodes
     initializeDHTData = return ToxData
 
-instance Pretty (NodeId Tox.Message) where pPrint (Tox.NodeId nid) = encodeHexDoc nid
+instance Pretty (NodeId Tox.Message) where
+    pPrint (Tox.NodeId nid) = encodeHexDoc nid
+
+getToxPing isPong c n = do
+    q'r <- get :: Get Word8
+    when (bool 0 1 isPong /= q'r) $
+        fail "Tox ping/pong parse fail."
+    n8 <- get :: Get Tox.Nonce8
+    return $ c (n n8) Ping
+
+putToxPing isPong n8 = do
+    put (bool 0 1 isPong :: Word8)
+    put n8
+
+instance Serialize (Query Tox.Message (Ping Tox.Message)) where
+    get = getToxPing False Network.DHT.Types.Query Tox.QueryNonce
+    put (Network.DHT.Types.Query extra Ping) = putToxPing False (Tox.qryNonce extra)
+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"
-instance Serialize (Query Tox.Message (Ping Tox.Message)) where -- TODO
-    get = error "TODO get 9"
-    put = error "TODO put 10"
 instance Serialize (Response Tox.Message (NodeFound Tox.Message IPv4)) where
     get = error "TODO get 11"
     put = error "TODO put 12"
-instance Serialize (Response Tox.Message (Ping Tox.Message)) where -- TODO
-    get = error "TODO get 13"
-    put = error "TODO put 14"
-instance KRPC Tox.Message (Query    Tox.Message (FindNode Tox.Message IPv4))
-              (Response Tox.Message (NodeFound Tox.Message IPv4)) where
+
+instance KRPC Tox.Message (Query    Tox.Message (FindNode  Tox.Message IPv4))
+                          (Response Tox.Message (NodeFound Tox.Message IPv4)) where
     method = error "TODO method 15"
-instance KRPC Tox.Message (Query    Tox.Message (Ping Tox.Message ))
-              (Response Tox.Message (Ping Tox.Message )) where
+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