3 files changed, 19 insertions, 14 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index 345e8018..22c2794a 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -43,6 +43,7 @@ library
                      , Network.BitTorrent.Peer
                      , Network.BitTorrent.Tracker
                      , Network.BitTorrent.Exchange
+                     , Network.BitTorrent.DHT
                      , System.Torrent.Storage
                        Network.BitTorrent.Internal
   other-modules:
@@ -108,6 +109,7 @@ library
                      , filepath    >= 1
                      , directory   >= 1
                      , mmap        >= 0.5.2
+                     , entropy
 
                        -- Hash
                      , cryptohash
diff --git a/src/Network/BitTorrent/DHT.hs b/src/Network/BitTorrent/DHT.hs
index 3be7cfa0..2e8164bd 100644
--- a/src/Network/BitTorrent/DHT.hs
+++ b/src/Network/BitTorrent/DHT.hs
@@ -23,14 +23,13 @@ import Data.Maybe
 import Data.List as L
 import Data.Map as M
 import Data.HashMap.Strict as HM
-
 import Network
 import Network.Socket
-import Remote.KRPC
+import System.Entropy
 
+import Remote.KRPC
 import Data.BEncode
 import Data.Torrent
-import Data.Kademlia.Routing.Table
 import Network.BitTorrent.Peer
 
 {-----------------------------------------------------------------------
@@ -44,7 +43,7 @@ type NodeId = ByteString
 --   Distribution of ID's should be as uniform as possible.
 --
 genNodeID :: IO NodeId
-genNodeID = undefined -- randomIO
+genNodeID = getEntropy 20
 
 instance Serialize PortNumber where
   get = fromIntegral <$> getWord16be
diff --git a/src/Network/BitTorrent/Peer.hs b/src/Network/BitTorrent/Peer.hs
index 97c9f57f..cdcd65ea 100644
--- a/src/Network/BitTorrent/Peer.hs
+++ b/src/Network/BitTorrent/Peer.hs
@@ -43,7 +43,8 @@ module Network.BitTorrent.Peer
        , defaultClientId, defaultVersionNumber
 
          -- ** Generation
-       , genPeerId, timestampByteString
+       , genPeerId
+       , timestamp, entropy
 
          -- ** Extra
        , byteStringPadded
@@ -68,8 +69,6 @@ module Network.BitTorrent.Peer
 
 
 import Control.Applicative
-import Control.Concurrent
-import Control.Exception
 import Data.BEncode
 import Data.Bits
 import Data.Word
@@ -87,15 +86,16 @@ import Data.Time.Clock  (getCurrentTime)
 import Data.Time.Format (formatTime)
 import Text.PrettyPrint (text, Doc, (<+>))
 import System.Locale    (defaultTimeLocale)
-
+import System.Entropy   (getEntropy)
 import Network hiding (accept)
 import Network.Socket
 
 
-
--- TODO we have linker error here, so manual hardcoded version for a
+-- TODO we have linker error here, so manually hardcoded version for a
 -- while.
+
 -- import Paths_network_bittorrent (version)
+
 version :: Version
 version = Version [0, 10, 0, 0] []
 
@@ -185,12 +185,17 @@ defaultVersionNumber = B.take 4 $ BC.pack $ foldMap show $
 --   format is used to make the ID's readable(for debugging) and more
 --   or less random.
 --
-timestampByteString :: IO ByteString
-timestampByteString = (BC.pack . format) <$> getCurrentTime
+timestamp :: IO ByteString
+timestamp = (BC.pack . format) <$> getCurrentTime
   where
     format t = take 6 (formatTime defaultTimeLocale "%q" t) ++ "." ++
                take 9 (reverse (formatTime defaultTimeLocale "%s" t))
 
+-- | Gives 15 character long random bytestring. This is more robust
+-- method for generation of random part of peer ID than timestamp.
+entropy :: IO ByteString
+entropy = getEntropy 15
+
 -- |  Here we use Azureus-style encoding with the following args:
 --
 --      * 'HS' for the client id.
@@ -200,8 +205,7 @@ timestampByteString = (BC.pack . format) <$> getCurrentTime
 --      * UTC time day ++ day time for the random number.
 --
 genPeerId :: IO PeerId
-genPeerId = azureusStyle defaultClientId defaultVersionNumber
-                                     <$> timestampByteString
+genPeerId = azureusStyle defaultClientId defaultVersionNumber <$> entropy
 
 -- | Pad bytestring so it's becomes exactly request length. Conversion
 -- is done like so: