3 files changed, 103 insertions, 2 deletions

diff --git a/network-bittorrent.cabal b/network-bittorrent.cabal
index 53cadcd8..da4e6818 100644
--- a/network-bittorrent.cabal
+++ b/network-bittorrent.cabal
@@ -22,8 +22,8 @@ source-repository head
 
 library
   exposed-modules:     Data.Torrent
-                     , Data.Bitfield
                      , Data.Torrent.InfoHash
+                     , Data.Bitfield
 
                      , Network.BitTorrent
                      , Network.BitTorrent.Extension
@@ -44,6 +44,10 @@ library
                      , Network.BitTorrent.PeerWire.Message
                      , Network.BitTorrent.PeerWire.Handshake
 
+                       -- DHT
+                     , Data.Kademlia.RoutingTable
+                     , Network.DHT.Kademlia
+
   other-modules:
 
 
@@ -69,8 +73,9 @@ library
                        -- network related packages
                      , network    >= 2.4
                      , HTTP       >= 4000.2
-                     , cryptohash
+                     , krpc
 
+                     , cryptohash
                      , filepath   == 1.*
 
 
diff --git a/src/Data/Kademlia/RoutingTable.hs b/src/Data/Kademlia/RoutingTable.hs
new file mode 100644
index 00000000..98e15a0b
--- /dev/null
+++ b/src/Data/Kademlia/RoutingTable.hs
@@ -0,0 +1,28 @@
+module Data.Kademlia.RoutingTable
+       (
+       ) where
+
+import Data.ByteString
+
+type NodeID = ByteString
+type InfoHash = ByteString
+
+type Bucket = [NodeID]
+
+data Tree
+  = Tip Bucket
+  | Bin Table Table
+
+data Table = Table {
+    tree :: Tree
+  , bucketSize :: Int
+  }
+
+closest :: InfoHash -> Table -> [NodeID]
+closest = undefined
+
+insert :: NodeID -> Table -> Table
+insert x t = undefined
+
+-- TODO table serialization: usually we need to save table between
+-- target program executions
diff --git a/src/Network/DHT/Kademlia.hs b/src/Network/DHT/Kademlia.hs
new file mode 100644
index 00000000..d5418beb
--- /dev/null
+++ b/src/Network/DHT/Kademlia.hs
@@ -0,0 +1,68 @@
+-- TODO move to Network.DHT.Kademlia
+{-# LANGUAGE OverloadedStrings #-}
+module Network.DHT.Kademlia
+       (
+       ) where
+
+import Data.ByteString
+import Network
+import Remote.KRPC
+
+
+
+-- | Global unique identifier of the node. Size of the identifier
+-- should(!) be equal to the size of DHT keys. This limitation arises
+-- from the design of Kademlia: we should estimate distance between
+-- keys and NodeId in routing algorithms.
+--
+type NodeID = ByteString
+
+type NodeAddr = ByteString
+type InfoHash = ByteString
+type Token    = ByteString
+
+-- | Used to check out if a node is alive or not. This has a tow-fold effect:
+--
+--     * If(!) caller get response it should update the bucket
+--     corresponding to the callee.
+--
+--     * Callee of the ping should update the bucket corresponding
+--     to the caller as well.
+--
+ping :: Method NodeID NodeID
+ping = method "ping" ["id"] ["id"]
+
+type PeerContact = ()
+data NodeContact = NodeContact {
+    peerContact :: PeerContact
+  , nodeID :: NodeID
+  }
+
+-- | Used to lookup peer ID from node ID.
+--
+find_node :: Method (NodeID, NodeID) (NodeID, NodeContact)
+find_node = method "find_node" ["id", "target"] ["id", "nodes"]
+
+-- |
+announce_peer :: Method (NodeID, InfoHash, PortNumber, Token) NodeID
+announce_peer = undefined
+
+genNodeID :: IO NodeID
+genNodeID = undefined
+
+{-
+type InfoHash = Int
+type Token = Int
+
+ping :: Method NodeId NodeId
+ping = method "ping" ["id"] ["id"]
+
+get_peers :: Method (NodeId :*: InfoHash) (NodeId, Token, NodeAddr :|: NodeAddr)
+get_peers = method "get_peers"
+  ("id", "target")
+  ("id", "token", view ("values" :|: "nodes"))
+
+
+
+
+-}
\ No newline at end of file