summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bittorrent.cabal4
-rw-r--r--examples/dhtd.hs2
-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
-rw-r--r--src/Network/DHT/Mainline.hs2
-rw-r--r--src/Network/DatagramServer.hs6
-rw-r--r--src/Network/DatagramServer/Mainline.hs (renamed from src/Network/KRPC/Message.hs)2
-rw-r--r--src/Network/KRPC/Method.hs2
13 files changed, 17 insertions, 17 deletions
diff --git a/bittorrent.cabal b/bittorrent.cabal
index dee8bbe5..6470f612 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -77,7 +77,7 @@ library
77 , RecordWildCards 77 , RecordWildCards
78 hs-source-dirs: src 78 hs-source-dirs: src
79 exposed-modules: Network.DatagramServer 79 exposed-modules: Network.DatagramServer
80 Network.KRPC.Message 80 Network.DatagramServer.Mainline
81 Network.KRPC.Method 81 Network.KRPC.Method
82 Data.Torrent 82 Data.Torrent
83 Data.Digest.CRC32C 83 Data.Digest.CRC32C
@@ -260,7 +260,7 @@ test-suite spec
260 Config 260 Config
261 Network.KRPCSpec 261 Network.KRPCSpec
262 Network.KRPC.MethodSpec 262 Network.KRPC.MethodSpec
263 Network.KRPC.MessageSpec 263 Network.DatagramServer.MainlineSpec
264 Data.TorrentSpec 264 Data.TorrentSpec
265 Network.BitTorrent.Client.HandleSpec 265 Network.BitTorrent.Client.HandleSpec
266 Network.BitTorrent.CoreSpec 266 Network.BitTorrent.CoreSpec
diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 715f8ec1..ab6ea2c1 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -38,7 +38,7 @@ import Network.BitTorrent.DHT.Search
38import Network.BitTorrent.DHT.Query 38import Network.BitTorrent.DHT.Query
39import Network.BitTorrent.DHT.Message (FindNode(..),NodeFound(..),GetPeers(..),GotPeers(..)) 39import Network.BitTorrent.DHT.Message (FindNode(..),NodeFound(..),GetPeers(..),GotPeers(..))
40import Network.DatagramServer (QueryFailure(..)) 40import Network.DatagramServer (QueryFailure(..))
41import Network.KRPC.Message (ReflectedIP(..),KMessageOf) 41import Network.DatagramServer.Mainline (ReflectedIP(..),KMessageOf)
42import qualified Network.BitTorrent.DHT.Routing as R 42import qualified Network.BitTorrent.DHT.Routing as R
43import Network.BitTorrent.DHT.Session 43import Network.BitTorrent.DHT.Session
44import Network.SocketLike 44import Network.SocketLike
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
diff --git a/src/Network/DHT/Mainline.hs b/src/Network/DHT/Mainline.hs
index cf284404..7b3d6d55 100644
--- a/src/Network/DHT/Mainline.hs
+++ b/src/Network/DHT/Mainline.hs
@@ -24,7 +24,7 @@ import Data.LargeWord
24import Data.Serialize as S 24import Data.Serialize as S
25import Data.String 25import Data.String
26import Data.Typeable 26import Data.Typeable
27import Network.KRPC.Message as KRPC 27import Network.DatagramServer.Mainline as KRPC
28import Network.DatagramServer.Types as RPC 28import Network.DatagramServer.Types as RPC
29import Text.PrettyPrint as PP hiding ((<>)) 29import Text.PrettyPrint as PP hiding ((<>))
30import Text.PrettyPrint.HughesPJClass hiding (($$), (<>)) 30import Text.PrettyPrint.HughesPJClass hiding (($$), (<>))
diff --git a/src/Network/DatagramServer.hs b/src/Network/DatagramServer.hs
index 8a803f1d..d22bc893 100644
--- a/src/Network/DatagramServer.hs
+++ b/src/Network/DatagramServer.hs
@@ -48,7 +48,7 @@
48-- 48--
49-- For async 'query' use @async@ package. 49-- For async 'query' use @async@ package.
50-- 50--
51-- For protocol details see "Network.KRPC.Message" module. 51-- For protocol details see "Network.DatagramServer.Mainline" module.
52-- 52--
53{-# LANGUAGE CPP #-} 53{-# LANGUAGE CPP #-}
54{-# LANGUAGE OverloadedStrings #-} 54{-# LANGUAGE OverloadedStrings #-}
@@ -95,7 +95,7 @@ module Network.DatagramServer
95 ) where 95 ) where
96 96
97import Data.Default.Class 97import Data.Default.Class
98import Network.KRPC.Message 98import Network.DatagramServer.Mainline
99import Network.KRPC.Method 99import Network.KRPC.Method
100import Network.Socket (SockAddr (..)) 100import Network.Socket (SockAddr (..))
101 101
@@ -135,7 +135,7 @@ import Data.Text.Encoding as T
135import Data.Tuple 135import Data.Tuple
136import Data.Typeable 136import Data.Typeable
137import Network.DatagramServer.Types 137import Network.DatagramServer.Types
138import Network.KRPC.Message 138import Network.DatagramServer.Mainline
139import Network.KRPC.Method hiding (Envelope) 139import Network.KRPC.Method hiding (Envelope)
140import qualified Network.KRPC.Method as KRPC (Envelope) 140import qualified Network.KRPC.Method as KRPC (Envelope)
141import Network.Socket hiding (listen) 141import Network.Socket hiding (listen)
diff --git a/src/Network/KRPC/Message.hs b/src/Network/DatagramServer/Mainline.hs
index 2f5f6729..2177d076 100644
--- a/src/Network/KRPC/Message.hs
+++ b/src/Network/DatagramServer/Mainline.hs
@@ -23,7 +23,7 @@
23{-# LANGUAGE MultiParamTypeClasses #-} 23{-# LANGUAGE MultiParamTypeClasses #-}
24{-# LANGUAGE OverloadedStrings #-} 24{-# LANGUAGE OverloadedStrings #-}
25{-# LANGUAGE TypeSynonymInstances #-} 25{-# LANGUAGE TypeSynonymInstances #-}
26module Network.KRPC.Message 26module Network.DatagramServer.Mainline
27 ( -- * Transaction 27 ( -- * Transaction
28 TransactionId 28 TransactionId
29 29
diff --git a/src/Network/KRPC/Method.hs b/src/Network/KRPC/Method.hs
index ad93cb8b..ea11720c 100644
--- a/src/Network/KRPC/Method.hs
+++ b/src/Network/KRPC/Method.hs
@@ -31,7 +31,7 @@ import Data.Monoid
31import Data.List as L 31import Data.List as L
32import Data.String 32import Data.String
33import Data.Typeable 33import Data.Typeable
34import Network.KRPC.Message 34import Network.DatagramServer.Mainline
35 35
36 36
37-- | Method datatype used to describe method name, parameters and 37-- | Method datatype used to describe method name, parameters and