summaryrefslogtreecommitdiff
path: root/src/Network/BitTorrent
diff options
context:
space:
mode:
Diffstat (limited to 'src/Network/BitTorrent')
-rw-r--r--src/Network/BitTorrent/Address.hs2
-rw-r--r--src/Network/BitTorrent/DHT.hs2
-rw-r--r--src/Network/BitTorrent/DHT/Message.hs2
-rw-r--r--src/Network/BitTorrent/DHT/Query.hs4
-rw-r--r--src/Network/BitTorrent/DHT/Routing.hs2
-rw-r--r--src/Network/BitTorrent/DHT/Search.hs2
-rw-r--r--src/Network/BitTorrent/DHT/Session.hs2
7 files changed, 8 insertions, 8 deletions
diff --git a/src/Network/BitTorrent/Address.hs b/src/Network/BitTorrent/Address.hs
index 05c6504c..e75066b1 100644
--- a/src/Network/BitTorrent/Address.hs
+++ b/src/Network/BitTorrent/Address.hs
@@ -128,7 +128,7 @@ import System.Locale (defaultTimeLocale)
128import System.Entropy 128import System.Entropy
129import Data.Digest.CRC32C 129import Data.Digest.CRC32C
130import Network.DatagramServer.Types as RPC 130import Network.DatagramServer.Types as RPC
131import Network.KRPC.Message (KMessageOf) 131import Network.DatagramServer.Mainline (KMessageOf)
132-- import Network.DHT.Mainline 132-- import Network.DHT.Mainline
133 133
134-- import Paths_bittorrent (version) 134-- import Paths_bittorrent (version)
diff --git a/src/Network/BitTorrent/DHT.hs b/src/Network/BitTorrent/DHT.hs
index ab948a2d..169abcfc 100644
--- a/src/Network/BitTorrent/DHT.hs
+++ b/src/Network/BitTorrent/DHT.hs
@@ -71,7 +71,7 @@ import Network.BitTorrent.DHT.Session
71import Network.BitTorrent.DHT.Routing as T hiding (null) 71import Network.BitTorrent.DHT.Routing as T hiding (null)
72import qualified Data.Text as Text 72import qualified Data.Text as Text
73import Data.Monoid 73import Data.Monoid
74import Network.KRPC.Message (KMessageOf) 74import Network.DatagramServer.Mainline (KMessageOf)
75 75
76 76
77{----------------------------------------------------------------------- 77{-----------------------------------------------------------------------
diff --git a/src/Network/BitTorrent/DHT/Message.hs b/src/Network/BitTorrent/DHT/Message.hs
index 2a2cee35..cfe24fc5 100644
--- a/src/Network/BitTorrent/DHT/Message.hs
+++ b/src/Network/BitTorrent/DHT/Message.hs
@@ -108,7 +108,7 @@ import Data.Serialize as S
108import Data.Typeable 108import Data.Typeable
109import Network 109import Network
110import Network.DatagramServer 110import Network.DatagramServer
111import Network.KRPC.Message (KMessageOf) 111import Network.DatagramServer.Mainline (KMessageOf)
112import Data.Maybe 112import Data.Maybe
113 113
114import Data.Torrent (InfoHash) 114import Data.Torrent (InfoHash)
diff --git a/src/Network/BitTorrent/DHT/Query.hs b/src/Network/BitTorrent/DHT/Query.hs
index 90cdcbee..1c4df267 100644
--- a/src/Network/BitTorrent/DHT/Query.hs
+++ b/src/Network/BitTorrent/DHT/Query.hs
@@ -82,7 +82,7 @@ import Data.Time
82import Data.Time.Clock.POSIX 82import Data.Time.Clock.POSIX
83 83
84import Network.DatagramServer as KRPC hiding (Options, def) 84import Network.DatagramServer as KRPC hiding (Options, def)
85import Network.KRPC.Message (ReflectedIP(..)) 85import Network.DatagramServer.Mainline (ReflectedIP(..))
86import Network.DatagramServer (QueryFailure(..)) 86import Network.DatagramServer (QueryFailure(..))
87import Data.Torrent 87import Data.Torrent
88import Network.BitTorrent.DHT.Message 88import Network.BitTorrent.DHT.Message
@@ -93,7 +93,7 @@ import qualified Network.BitTorrent.DHT.Search as Search
93#ifdef VERSION_bencoding 93#ifdef VERSION_bencoding
94import Data.BEncode (BValue) 94import Data.BEncode (BValue)
95import Network.DHT.Mainline hiding (NodeId) 95import Network.DHT.Mainline hiding (NodeId)
96import Network.KRPC.Message (KMessageOf) 96import Network.DatagramServer.Mainline (KMessageOf)
97#else 97#else
98import Data.ByteString (ByteString) 98import Data.ByteString (ByteString)
99import Data.Tox 99import Data.Tox
diff --git a/src/Network/BitTorrent/DHT/Routing.hs b/src/Network/BitTorrent/DHT/Routing.hs
index c64678e0..d147bb94 100644
--- a/src/Network/BitTorrent/DHT/Routing.hs
+++ b/src/Network/BitTorrent/DHT/Routing.hs
@@ -87,7 +87,7 @@ import Data.Torrent
87import Network.BitTorrent.Address 87import Network.BitTorrent.Address
88#ifdef VERSION_bencoding 88#ifdef VERSION_bencoding
89import Network.DHT.Mainline () 89import Network.DHT.Mainline ()
90import Network.KRPC.Message (KMessageOf) 90import Network.DatagramServer.Mainline (KMessageOf)
91#else 91#else
92import Data.Tox as Tox 92import Data.Tox as Tox
93type KMessageOf = Tox.Message 93type KMessageOf = Tox.Message
diff --git a/src/Network/BitTorrent/DHT/Search.hs b/src/Network/BitTorrent/DHT/Search.hs
index c60ae48f..7a587644 100644
--- a/src/Network/BitTorrent/DHT/Search.hs
+++ b/src/Network/BitTorrent/DHT/Search.hs
@@ -27,7 +27,7 @@ import Network.BitTorrent.Address hiding (NodeId)
27import Network.DatagramServer.Types 27import Network.DatagramServer.Types
28#ifdef VERSION_bencoding 28#ifdef VERSION_bencoding
29import Network.DHT.Mainline () 29import Network.DHT.Mainline ()
30import Network.KRPC.Message (KMessageOf) 30import Network.DatagramServer.Mainline (KMessageOf)
31type Ann = () 31type Ann = ()
32#else 32#else
33import Data.Tox as Tox 33import Data.Tox as Tox
diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs
index 0800f147..ead4a723 100644
--- a/src/Network/BitTorrent/DHT/Session.hs
+++ b/src/Network/BitTorrent/DHT/Session.hs
@@ -108,7 +108,7 @@ import Network.DatagramServer as KRPC hiding (Options, def)
108import qualified Network.DatagramServer as KRPC (def) 108import qualified Network.DatagramServer as KRPC (def)
109#ifdef VERSION_bencoding 109#ifdef VERSION_bencoding
110import Data.BEncode (BValue) 110import Data.BEncode (BValue)
111import Network.KRPC.Message (KMessageOf) 111import Network.DatagramServer.Mainline (KMessageOf)
112#else 112#else
113import Data.Tox as Tox 113import Data.Tox as Tox
114#endif 114#endif