summaryrefslogtreecommitdiff
path: root/Connection/Tox
diff options
context:
space:
mode:
authorjim@bo <jim@bo>2018-06-20 22:40:37 -0400
committerjim@bo <jim@bo>2018-06-20 22:43:47 -0400
commit825962518c6ad00279fc23e8e1dec746980e483f (patch)
tree68c135bdffd879835c48cce3d397e8edf99b53f4 /Connection/Tox
parent09aa079fbab069f177e08b5239bf684d312eb00a (diff)
More DPut stuff
* verbose/quiet without args shows report * verbose all - sets all tags verbose * quiet all - sets all tags quiet * XMisc defaults to verbose, everything else quiet * new XMan tag for ToxManager related stuff * s/hputStrLn stderr/dput XMisc/ in daemon code
Diffstat (limited to 'Connection/Tox')
-rw-r--r--Connection/Tox/Threads.hs7
1 files changed, 4 insertions, 3 deletions
diff --git a/Connection/Tox/Threads.hs b/Connection/Tox/Threads.hs
index aeeab0e1..6a7edeb4 100644
--- a/Connection/Tox/Threads.hs
+++ b/Connection/Tox/Threads.hs
@@ -41,6 +41,7 @@ import Data.Functor.Identity
41import Data.Time.Clock.POSIX 41import Data.Time.Clock.POSIX
42import System.IO 42import System.IO
43import System.Timeout 43import System.Timeout
44import DPut
44 45
45 46
46 47
@@ -146,11 +147,11 @@ persueContact getPolicy getStatus PersueContactMethods{..} statusVar = do
146 DHT.cookieRequest crypto client (toPublic myseckey) ni 147 DHT.cookieRequest crypto client (toPublic myseckey) ni
147 interval <- case mbCookie of 148 interval <- case mbCookie of
148 Nothing -> do 149 Nothing -> do
149 hPutStrLn stderr ("persueContact: (" ++ show mykeyAsId ++") <--> (" ++ show theirkeyAsId ++ ").") 150 dput XMan ("persueContact: (" ++ show mykeyAsId ++") <--> (" ++ show theirkeyAsId ++ ").")
150 hPutStrLn stderr ("persueContact: CookieRequest failed. TODO: dhtpkNodes thingy") 151 dput XMan ("persueContact: CookieRequest failed. TODO: dhtpkNodes thingy")
151 return longRetryInterval 152 return longRetryInterval
152 Just cookie -> do 153 Just cookie -> do
153 hPutStrLn stderr "Have cookie, creating handshake packet..." 154 dput XMan "Have cookie, creating handshake packet..."
154 let hp = HParam { hpOtherCookie = cookie 155 let hp = HParam { hpOtherCookie = cookie
155 , hpMySecretKey = myseckey 156 , hpMySecretKey = myseckey
156 , hpCookieRemotePubkey = theirpubkey 157 , hpCookieRemotePubkey = theirpubkey