aboutsummaryrefslogtreecommitdiff
path: root/P2P
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-12-24 12:49:28 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-12-24 12:50:23 -0400
commit3959f2ad9b17f91e6f42310b991c9e22d8f8f4e3 (patch)
tree3958f3ba6f2d439f96f33905d610b808ebaa6304 /P2P
parent856fa66695468e890749279e0b8ddfe60283f112 (diff)
enable-tor: When run as a regular user, test a connection back to the hidden service over tor.
This way we know that after enable-tor, the tor hidden service is fully published and working, and so there should be no problems with it at pairing time. It has to start up its own temporary listener on the hidden service. It would be nice to have it start the remotedaemon running, so that extra step is not needed afterwards. But, there may already be a remotedaemon running, in communication with the assistant and we don't want to start another one. I thought about trying to HUP any running remotedaemon, but Windows does not make it easy to do that. In any case, having the user start the remotedaemon themselves lets them know it needs to be running to serve the hidden service. This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
Diffstat (limited to 'P2P')
-rw-r--r--P2P/IO.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/P2P/IO.hs b/P2P/IO.hs
index 89f712fca..ee1724d7b 100644
--- a/P2P/IO.hs
+++ b/P2P/IO.hs
@@ -72,7 +72,7 @@ closeConnection conn = do
-- closing the Handle when done.
--
-- Note that while the callback is running, other connections won't be
--- processes, so longterm work should be run in a separate thread by
+-- processed, so longterm work should be run in a separate thread by
-- the callback.
serveUnixSocket :: FilePath -> (Handle -> IO ()) -> IO ()
serveUnixSocket unixsocket serveconn = do