diff options
author | James Crayne <jim.crayne@gmail.com> | 2018-11-04 03:25:21 -0500 |
---|---|---|
committer | James Crayne <jim.crayne@gmail.com> | 2018-11-04 03:25:21 -0500 |
commit | 5f5aa818f8484570349e75a061d7b37cc9fe826a (patch) | |
tree | 9a574cc572d2caa4af9571a4776d207250e93add /examples | |
parent | df787ee7eea3d0d6e0defdc4a7cbe646ca062feb (diff) |
Preparation to move DPut to a separate project.
Diffstat (limited to 'examples')
-rw-r--r-- | examples/dhtd.hs | 4 | ||||
-rw-r--r-- | examples/testTox.hs | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/examples/dhtd.hs b/examples/dhtd.hs index 7c66fd73..27403971 100644 --- a/examples/dhtd.hs +++ b/examples/dhtd.hs | |||
@@ -113,6 +113,7 @@ import ToxToXMPP | |||
113 | import XMPPToTox | 113 | import XMPPToTox |
114 | import qualified Connection.Tcp as Tcp (ConnectionEvent(..),noCleanUp,TCPStatus) | 114 | import qualified Connection.Tcp as Tcp (ConnectionEvent(..),noCleanUp,TCPStatus) |
115 | import DPut | 115 | import DPut |
116 | import DebugTag | ||
116 | 117 | ||
117 | 118 | ||
118 | pshow :: Show a => a -> B.ByteString | 119 | pshow :: Show a => a -> B.ByteString |
@@ -361,6 +362,7 @@ clientSession s@Session{..} sock cnum h = do | |||
361 | case B.unsnoc x of | 362 | case B.unsnoc x of |
362 | Just (str,c) | isSpace c -> (str,False) | 363 | Just (str,c) | isSpace c -> (str,False) |
363 | _ -> (x,True) | 364 | _ -> (x,True) |
365 | allDebugTags :: [DebugTag] | ||
364 | allDebugTags = [minBound .. maxBound] | 366 | allDebugTags = [minBound .. maxBound] |
365 | showDebugTags = do | 367 | showDebugTags = do |
366 | vs <- mapM getVerbose allDebugTags | 368 | vs <- mapM getVerbose allDebugTags |
@@ -1535,7 +1537,7 @@ main = do | |||
1535 | announcer <- forkAnnouncer | 1537 | announcer <- forkAnnouncer |
1536 | 1538 | ||
1537 | -- Default: quiet all tags (except XMisc). | 1539 | -- Default: quiet all tags (except XMisc). |
1538 | forM [minBound .. maxBound] setQuiet | 1540 | forM ([minBound .. maxBound]::[DebugTag]) setQuiet |
1539 | forM (verboseTags opts) setVerbose | 1541 | forM (verboseTags opts) setVerbose |
1540 | 1542 | ||
1541 | (quitBt,btdhts,btips,baddrs) <- case portbt opts of | 1543 | (quitBt,btdhts,btips,baddrs) <- case portbt opts of |
diff --git a/examples/testTox.hs b/examples/testTox.hs index cc8bd45f..e82ca2d3 100644 --- a/examples/testTox.hs +++ b/examples/testTox.hs | |||
@@ -17,6 +17,7 @@ import qualified Data.IntMap.Strict as IntMap | |||
17 | import Data.Function | 17 | import Data.Function |
18 | import DebugUtil | 18 | import DebugUtil |
19 | import DPut | 19 | import DPut |
20 | import DebugTag | ||
20 | import HandshakeCache | 21 | import HandshakeCache |
21 | import Network.QueryResponse | 22 | import Network.QueryResponse |
22 | import Network.Socket | 23 | import Network.Socket |
@@ -81,7 +82,7 @@ netCrypto tox me ni them = do | |||
81 | 82 | ||
82 | main :: IO () | 83 | main :: IO () |
83 | main = do | 84 | main = do |
84 | mapM_ setVerbose [ minBound .. maxBound ] | 85 | mapM_ setVerbose ([ minBound .. maxBound ]::[DebugTag]) |
85 | setQuiet XRoutes | 86 | setQuiet XRoutes |
86 | 87 | ||
87 | (udpA,udpB) <- testPairTransport | 88 | (udpA,udpB) <- testPairTransport |