summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bittorrent/bittorrent.cabal2
-rw-r--r--dht-client.cabal2
-rw-r--r--examples/dhtd.hs2
-rw-r--r--src/Network/BitTorrent/MainlineDHT.hs2
-rw-r--r--src/Network/Kademlia.hs2
-rw-r--r--src/Network/Kademlia/Search.hs (renamed from src/Network/BitTorrent/DHT/Search.hs)2
-rw-r--r--src/Network/Tox.hs2
-rw-r--r--src/Network/Tox/DHT/Handlers.hs2
8 files changed, 8 insertions, 8 deletions
diff --git a/bittorrent/bittorrent.cabal b/bittorrent/bittorrent.cabal
index 910194c2..555143f7 100644
--- a/bittorrent/bittorrent.cabal
+++ b/bittorrent/bittorrent.cabal
@@ -85,7 +85,7 @@ library
85 Data.Torrent 85 Data.Torrent
86 Network.BitTorrent.DHT.ContactInfo 86 Network.BitTorrent.DHT.ContactInfo
87 Network.BitTorrent.DHT.Token 87 Network.BitTorrent.DHT.Token
88 Network.BitTorrent.DHT.Search 88 Network.Kademlia.Search
89 Network.QueryResponse 89 Network.QueryResponse
90 Network.StreamServer 90 Network.StreamServer
91 Data.BEncode.Pretty 91 Data.BEncode.Pretty
diff --git a/dht-client.cabal b/dht-client.cabal
index 92b57160..12f5cddd 100644
--- a/dht-client.cabal
+++ b/dht-client.cabal
@@ -69,7 +69,7 @@ library
69 Data.Torrent 69 Data.Torrent
70 Network.BitTorrent.DHT.ContactInfo 70 Network.BitTorrent.DHT.ContactInfo
71 Network.BitTorrent.DHT.Token 71 Network.BitTorrent.DHT.Token
72 Network.BitTorrent.DHT.Search 72 Network.Kademlia.Search
73 Network.QueryResponse 73 Network.QueryResponse
74 Network.StreamServer 74 Network.StreamServer
75 Data.BEncode.Pretty 75 Data.BEncode.Pretty
diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 198ab203..5c002363 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -46,7 +46,7 @@ import GHC.Conc (labelThread)
46#endif 46#endif
47 47
48import Network.Address hiding (NodeId, NodeInfo(..)) 48import Network.Address hiding (NodeId, NodeInfo(..))
49import Network.BitTorrent.DHT.Search 49import Network.Kademlia.Search
50import Network.QueryResponse 50import Network.QueryResponse
51import Network.StreamServer 51import Network.StreamServer
52import Network.Kademlia 52import Network.Kademlia
diff --git a/src/Network/BitTorrent/MainlineDHT.hs b/src/Network/BitTorrent/MainlineDHT.hs
index 6f03ef60..e7d702c3 100644
--- a/src/Network/BitTorrent/MainlineDHT.hs
+++ b/src/Network/BitTorrent/MainlineDHT.hs
@@ -58,7 +58,7 @@ import Network.Address (Address, fromAddr, fromSockAddr,
58 toSockAddr, genBucketSample', WantIP(..), 58 toSockAddr, genBucketSample', WantIP(..),
59 un4map,either4or6,ipFamily) 59 un4map,either4or6,ipFamily)
60import Network.BitTorrent.DHT.ContactInfo as Peers 60import Network.BitTorrent.DHT.ContactInfo as Peers
61import Network.BitTorrent.DHT.Search (Search (..)) 61import Network.Kademlia.Search (Search (..))
62import Network.BitTorrent.DHT.Token as Token 62import Network.BitTorrent.DHT.Token as Token
63import qualified Network.DHT.Routing as R 63import qualified Network.DHT.Routing as R
64 ;import Network.DHT.Routing (Timestamp, getTimestamp) 64 ;import Network.DHT.Routing (Timestamp, getTimestamp)
diff --git a/src/Network/Kademlia.hs b/src/Network/Kademlia.hs
index 315cc652..5fb1e334 100644
--- a/src/Network/Kademlia.hs
+++ b/src/Network/Kademlia.hs
@@ -29,7 +29,7 @@ import Data.Time.Clock.POSIX (POSIXTime)
29import qualified Data.Wrapper.PSQInt as Int 29import qualified Data.Wrapper.PSQInt as Int
30 ;import Data.Wrapper.PSQInt (pattern (:->)) 30 ;import Data.Wrapper.PSQInt (pattern (:->))
31import Network.Address (bucketRange,genBucketSample) 31import Network.Address (bucketRange,genBucketSample)
32import Network.BitTorrent.DHT.Search 32import Network.Kademlia.Search
33import System.Entropy 33import System.Entropy
34import System.Timeout 34import System.Timeout
35import Text.PrettyPrint as PP hiding (($$), (<>)) 35import Text.PrettyPrint as PP hiding (($$), (<>))
diff --git a/src/Network/BitTorrent/DHT/Search.hs b/src/Network/Kademlia/Search.hs
index 29e91633..195bed14 100644
--- a/src/Network/BitTorrent/DHT/Search.hs
+++ b/src/Network/Kademlia/Search.hs
@@ -4,7 +4,7 @@
4{-# LANGUAGE ScopedTypeVariables #-} 4{-# LANGUAGE ScopedTypeVariables #-}
5{-# LANGUAGE FlexibleContexts #-} 5{-# LANGUAGE FlexibleContexts #-}
6{-# LANGUAGE LambdaCase #-} 6{-# LANGUAGE LambdaCase #-}
7module Network.BitTorrent.DHT.Search where 7module Network.Kademlia.Search where
8 8
9import Control.Concurrent.Tasks 9import Control.Concurrent.Tasks
10import Control.Concurrent.STM 10import Control.Concurrent.STM
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index c88dbcd4..7279c2e3 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -70,7 +70,7 @@ import Network.Address (Address, WantIP (..), either4or6,
70 fromSockAddr, ipFamily, setPort, 70 fromSockAddr, ipFamily, setPort,
71 sockAddrPort, testIdBit, 71 sockAddrPort, testIdBit,
72 toSockAddr, un4map) 72 toSockAddr, un4map)
73import Network.BitTorrent.DHT.Search (Search (..)) 73import Network.Kademlia.Search (Search (..))
74import qualified Network.DHT.Routing as R 74import qualified Network.DHT.Routing as R
75import Network.QueryResponse 75import Network.QueryResponse
76import Network.Socket 76import Network.Socket
diff --git a/src/Network/Tox/DHT/Handlers.hs b/src/Network/Tox/DHT/Handlers.hs
index f22f9ffe..2dc183cd 100644
--- a/src/Network/Tox/DHT/Handlers.hs
+++ b/src/Network/Tox/DHT/Handlers.hs
@@ -7,7 +7,7 @@ import Network.Tox.DHT.Transport as DHTTransport
7import Network.QueryResponse as QR hiding (Client) 7import Network.QueryResponse as QR hiding (Client)
8import qualified Network.QueryResponse as QR (Client) 8import qualified Network.QueryResponse as QR (Client)
9import Crypto.Tox 9import Crypto.Tox
10import Network.BitTorrent.DHT.Search 10import Network.Kademlia.Search
11import qualified Data.Wrapper.PSQInt as Int 11import qualified Data.Wrapper.PSQInt as Int
12import Network.Kademlia 12import Network.Kademlia
13import Network.Address (WantIP (..), ipFamily, testIdBit,fromSockAddr, sockAddrPort) 13import Network.Address (WantIP (..), ipFamily, testIdBit,fromSockAddr, sockAddrPort)