Simplified Kademlia class.

1 files changed, 23 insertions, 17 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 68f91446..e4716d1a 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -10,6 +10,7 @@
 {-# LANGUAGE PartialTypeSignatures #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE TypeFamilies #-}
 
 import Control.Arrow
 import Control.Monad
@@ -223,6 +224,8 @@ ipType :: f dht ip -> DHT raw dht u ip ()
 ipType _ = return ()
 
 instance Kademlia Tox.Message where
+    data DHTData Tox.Message ip = ToxData
+    initializeDHTData = return ToxData
 instance Pretty (NodeId Tox.Message) where
 instance Pretty (NodeInfo Tox.Message IPv4 ()) where
 instance Pretty (NodeInfo Tox.Message IPv4 Bool) where -- TODO
@@ -230,32 +233,32 @@ instance Read (NodeId KMessageOf) where
     readsPrec d s = map (\(ih,s) -> (toNodeId (ih::InfoHash),s)) $ readsPrec d s
 instance Read (NodeId Tox.Message) where -- TODO
 instance Serialize (FindNode Tox.Message IPv4) where
-    get = error "TODO get"
-    put = error "TODO put"
+    get = error "TODO get 1"
+    put = error "TODO put 2"
 instance Serialize (NodeFound Tox.Message IPv4) where
-    get = error "TODO get"
-    put = error "TODO put"
+    get = error "TODO get 3"
+    put = error "TODO put 4"
 instance Serialize (Ping Tox.Message) where
-    get = error "TODO get"
-    put = error "TODO put"
+    get = error "TODO get 5"
+    put = error "TODO put 6"
 instance Serialize (Query Tox.Message (FindNode Tox.Message IPv4)) where
-    get = error "TODO get"
-    put = error "TODO put"
+    get = error "TODO get 7"
+    put = error "TODO put 8"
 instance Serialize (Query Tox.Message (Ping Tox.Message)) where -- TODO
-    get = error "TODO get"
-    put = error "TODO put"
+    get = error "TODO get 9"
+    put = error "TODO put 10"
 instance Serialize (Response Tox.Message (NodeFound Tox.Message IPv4)) where
-    get = error "TODO get"
-    put = error "TODO put"
+    get = error "TODO get 11"
+    put = error "TODO put 12"
 instance Serialize (Response Tox.Message (Ping Tox.Message)) where -- TODO
-    get = error "TODO get"
-    put = error "TODO put"
+    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
-    method = error "TODO method"
+    method = error "TODO method 15"
 instance KRPC Tox.Message (Query    Tox.Message (Ping Tox.Message ))
               (Response Tox.Message (Ping Tox.Message )) where
-    method = error "TODO method"
+    method = error "TODO method 16"
 instance DataHandlers ByteString Tox.Message where
 
 
@@ -490,6 +493,9 @@ main = do
                 ["-p",port] | not ("-" `isPrefixOf` port) -> return port
                 ("-p":_)      -> error "Port not specified! (-p PORT)"
                 _             -> defaultPort
+
+    tox_state <- godht (show (succ (read p::Int))) $ \a me0 -> ask
+
     godht p $ \a me0 -> do
     printTable
     bs <- liftIO bootstrapNodes
@@ -525,7 +531,7 @@ main = do
     st <- ask
     waitForSignal <- liftIO $ do
         signalQuit <- newEmptyMVar
-        srv <- streamServer (withSession $ clientSession st (error "todo: tox state") signalQuit True) (SockAddrUnix "dht.sock")
+        srv <- streamServer (withSession $ clientSession st tox_state signalQuit True) (SockAddrUnix "dht.sock")
         return $ liftIO $ do
             () <- takeMVar signalQuit
             quitListening srv