diff options
Diffstat (limited to 'dht')
-rw-r--r-- | dht/Connection.hs | 2 | ||||
-rw-r--r-- | dht/Connection/Tcp.hs | 6 | ||||
-rw-r--r-- | dht/Presence/DNSCache.hs | 2 | ||||
-rw-r--r-- | dht/dht-client.cabal | 4 | ||||
-rw-r--r-- | dht/src/Control/Concurrent/Delay.hs (renamed from dht/InterruptibleDelay.hs) | 2 | ||||
-rw-r--r-- | dht/src/Control/Concurrent/PingMachine.hs (renamed from dht/PingMachine.hs) | 4 | ||||
-rw-r--r-- | dht/todo.txt | 2 |
7 files changed, 10 insertions, 12 deletions
diff --git a/dht/Connection.hs b/dht/Connection.hs index 9a4077f5..ea86f4bb 100644 --- a/dht/Connection.hs +++ b/dht/Connection.hs | |||
@@ -11,7 +11,7 @@ import qualified Data.Map as Map | |||
11 | ;import Data.Map (Map) | 11 | ;import Data.Map (Map) |
12 | import Network.Socket (SockAddr(..)) | 12 | import Network.Socket (SockAddr(..)) |
13 | 13 | ||
14 | import PingMachine | 14 | import Control.Concurrent.PingMachine |
15 | 15 | ||
16 | -- | This type indicates the current status of a connection. The type | 16 | -- | This type indicates the current status of a connection. The type |
17 | -- parameter indicates protocol-specific status information. To present | 17 | -- parameter indicates protocol-specific status information. To present |
diff --git a/dht/Connection/Tcp.hs b/dht/Connection/Tcp.hs index 06290a1c..4d50d47f 100644 --- a/dht/Connection/Tcp.hs +++ b/dht/Connection/Tcp.hs | |||
@@ -22,7 +22,7 @@ | |||
22 | -- | 22 | -- |
23 | module Connection.Tcp | 23 | module Connection.Tcp |
24 | ( module Connection.Tcp | 24 | ( module Connection.Tcp |
25 | , module PingMachine ) where | 25 | , module Control.Concurrent.PingMachine ) where |
26 | 26 | ||
27 | import Data.ByteString (ByteString,hGetNonBlocking) | 27 | import Data.ByteString (ByteString,hGetNonBlocking) |
28 | import qualified Data.ByteString.Char8 as S -- ( hPutStrLn, hPutStr, pack) | 28 | import qualified Data.ByteString.Char8 as S -- ( hPutStrLn, hPutStr, pack) |
@@ -71,8 +71,8 @@ import Data.Time.Clock (getCurrentTime,diffUTCTime) | |||
71 | import qualified Data.Text as Text | 71 | import qualified Data.Text as Text |
72 | ;import Data.Text (Text) | 72 | ;import Data.Text (Text) |
73 | import DNSCache | 73 | import DNSCache |
74 | import InterruptibleDelay | 74 | import Control.Concurrent.Delay |
75 | import PingMachine | 75 | import Control.Concurrent.PingMachine |
76 | import Network.StreamServer | 76 | import Network.StreamServer |
77 | import Network.SocketLike hiding (sClose) | 77 | import Network.SocketLike hiding (sClose) |
78 | import qualified Connection as G | 78 | import qualified Connection as G |
diff --git a/dht/Presence/DNSCache.hs b/dht/Presence/DNSCache.hs index 14581fee..9bb354e1 100644 --- a/dht/Presence/DNSCache.hs +++ b/dht/Presence/DNSCache.hs | |||
@@ -46,7 +46,7 @@ import System.IO.Unsafe | |||
46 | import SockAddr () | 46 | import SockAddr () |
47 | import ControlMaybe ( handleIO_ ) | 47 | import ControlMaybe ( handleIO_ ) |
48 | import GetHostByAddr ( getHostByAddr ) | 48 | import GetHostByAddr ( getHostByAddr ) |
49 | import InterruptibleDelay | 49 | import Control.Concurrent.Delay |
50 | import DPut | 50 | import DPut |
51 | import DebugTag | 51 | import DebugTag |
52 | 52 | ||
diff --git a/dht/dht-client.cabal b/dht/dht-client.cabal index 4155e7e7..dc9b7ca2 100644 --- a/dht/dht-client.cabal +++ b/dht/dht-client.cabal | |||
@@ -110,7 +110,7 @@ library | |||
110 | Network.Tox.ContactInfo | 110 | Network.Tox.ContactInfo |
111 | Announcer | 111 | Announcer |
112 | Announcer.Tox | 112 | Announcer.Tox |
113 | InterruptibleDelay | 113 | Control.Concurrent.Delay |
114 | ByteStringOperators | 114 | ByteStringOperators |
115 | ClientState | 115 | ClientState |
116 | ConfigFiles | 116 | ConfigFiles |
@@ -142,7 +142,7 @@ library | |||
142 | XMPPServer | 142 | XMPPServer |
143 | Util | 143 | Util |
144 | Presence | 144 | Presence |
145 | PingMachine | 145 | Control.Concurrent.PingMachine |
146 | Connection | 146 | Connection |
147 | ToxChat | 147 | ToxChat |
148 | ToxToXMPP | 148 | ToxToXMPP |
diff --git a/dht/InterruptibleDelay.hs b/dht/src/Control/Concurrent/Delay.hs index b2683441..67dcd451 100644 --- a/dht/InterruptibleDelay.hs +++ b/dht/src/Control/Concurrent/Delay.hs | |||
@@ -1,4 +1,4 @@ | |||
1 | module InterruptibleDelay where | 1 | module Control.Concurrent.Delay where |
2 | 2 | ||
3 | import Control.Concurrent | 3 | import Control.Concurrent |
4 | import Control.Monad | 4 | import Control.Monad |
diff --git a/dht/PingMachine.hs b/dht/src/Control/Concurrent/PingMachine.hs index ccf5b1d3..a8f10e83 100644 --- a/dht/PingMachine.hs +++ b/dht/src/Control/Concurrent/PingMachine.hs | |||
@@ -1,6 +1,6 @@ | |||
1 | {-# LANGUAGE CPP #-} | 1 | {-# LANGUAGE CPP #-} |
2 | {-# LANGUAGE TupleSections #-} | 2 | {-# LANGUAGE TupleSections #-} |
3 | module PingMachine where | 3 | module Control.Concurrent.PingMachine where |
4 | 4 | ||
5 | import Control.Monad | 5 | import Control.Monad |
6 | import Data.Function | 6 | import Data.Function |
@@ -12,7 +12,7 @@ import GHC.Conc (labelThread) | |||
12 | #endif | 12 | #endif |
13 | import Control.Concurrent.STM | 13 | import Control.Concurrent.STM |
14 | 14 | ||
15 | import InterruptibleDelay | 15 | import Control.Concurrent.Delay |
16 | 16 | ||
17 | type Miliseconds = Int | 17 | type Miliseconds = Int |
18 | type TimeOut = Miliseconds | 18 | type TimeOut = Miliseconds |
diff --git a/dht/todo.txt b/dht/todo.txt index aaf1c6bd..98f10967 100644 --- a/dht/todo.txt +++ b/dht/todo.txt | |||
@@ -58,8 +58,6 @@ maint: Newtype for internet (ipv4,ipv6) sockaddr. | |||
58 | maint: Rename files. | 58 | maint: Rename files. |
59 | 59 | ||
60 | Announcer -> Network.Kademlia.Announce | 60 | Announcer -> Network.Kademlia.Announce |
61 | InterruptibleDelay -> Control.Concurrent.Delay | ||
62 | Roster -> Network.Tox.ContactInfo | ||
63 | Crypto.Tox -> Network.Tox.Crypto | 61 | Crypto.Tox -> Network.Tox.Crypto |
64 | Network.Tox.Crypto.Handlers -> Network.Tox.Friend.Handlers | 62 | Network.Tox.Crypto.Handlers -> Network.Tox.Friend.Handlers |
65 | Network.Tox.Crypto.Transport -> Network.Tox.Friend.Transport | 63 | Network.Tox.Crypto.Transport -> Network.Tox.Friend.Transport |