Merge branch 'no-xmpp'
This commit is contained in:
commit
93f7d114db
97 changed files with 505 additions and 2953 deletions
|
@ -78,7 +78,7 @@ mkCodeProducer :: IO CodeProducer
|
|||
mkCodeProducer = CodeProducer <$> newEmptyMVar
|
||||
|
||||
waitCode :: CodeObserver -> IO Code
|
||||
waitCode (CodeObserver o) = takeMVar o
|
||||
waitCode (CodeObserver o) = readMVar o
|
||||
|
||||
sendCode :: CodeProducer -> Code -> IO ()
|
||||
sendCode (CodeProducer p) = putMVar p
|
||||
|
@ -119,7 +119,7 @@ sendFile f (CodeObserver observer) ps = do
|
|||
-- read from the CodeProducer, and fed to wormhole on stdin.
|
||||
receiveFile :: FilePath -> CodeProducer -> WormHoleParams -> IO Bool
|
||||
receiveFile f (CodeProducer producer) ps = runWormHoleProcess p $ \hin _hout -> do
|
||||
Code c <- takeMVar producer
|
||||
Code c <- readMVar producer
|
||||
hPutStrLn hin c
|
||||
hFlush hin
|
||||
return True
|
||||
|
|
|
@ -161,3 +161,6 @@ torLibDir = "/var/lib/tor"
|
|||
|
||||
varLibDir :: FilePath
|
||||
varLibDir = "/var/lib"
|
||||
|
||||
torIsInstalled :: IO Bool
|
||||
torIsInstalled = inPath "tor"
|
||||
|
|
|
@ -84,7 +84,6 @@ fixSockAddr addr = addr
|
|||
|
||||
-- disable buggy sloworis attack prevention code
|
||||
webAppSettings :: Settings
|
||||
|
||||
webAppSettings = setTimeout halfhour defaultSettings
|
||||
where
|
||||
halfhour = 30 * 60
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue