aboutsummaryrefslogtreecommitdiff
path: root/P2P/Annex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2018-03-06 15:14:53 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2018-03-06 15:14:53 -0400
commit18395df2e1007d872cf63d895fe6343e7e4dd473 (patch)
tree5fb6cc590c148313a3637512fdefa20c15d9c226 /P2P/Annex.hs
parent24aa7b9fc80f7dc62a6db3a715c7aaa8dc5bbe1f (diff)
refactor
Diffstat (limited to 'P2P/Annex.hs')
-rw-r--r--P2P/Annex.hs20
1 files changed, 1 insertions, 19 deletions
diff --git a/P2P/Annex.hs b/P2P/Annex.hs
index 82f669eaf..9971762f5 100644
--- a/P2P/Annex.hs
+++ b/P2P/Annex.hs
@@ -5,32 +5,25 @@
- Licensed under the GNU GPL version 3 or higher.
-}
-{-# LANGUAGE RankNTypes, FlexibleContexts, CPP #-}
+{-# LANGUAGE RankNTypes, FlexibleContexts #-}
module P2P.Annex
( RunMode(..)
, P2PConnection(..)
, runFullProto
- , torSocketFile
) where
import Annex.Common
import Annex.Content
import Annex.Transfer
import Annex.ChangedRefs
-import P2P.Address
import P2P.Protocol
import P2P.IO
import Logs.Location
import Types.NumCopies
import Utility.Metered
-import Utility.Tor
-import Annex.UUID
import Control.Monad.Free
-#ifndef mingw32_HOST_OS
-import System.Posix.User
-#endif
data RunMode
= Serving UUID (Maybe ChangedRefsHandle)
@@ -159,14 +152,3 @@ runLocal runmode runner a = case a of
liftIO $ hSeek h AbsoluteSeek o
b <- liftIO $ hGetContentsMetered h p'
runner (sender b)
-
-torSocketFile :: Annex (Maybe FilePath)
-torSocketFile = do
- u <- getUUID
- let ident = fromUUID u
-#ifndef mingw32_HOST_OS
- uid <- liftIO getRealUserID
-#else
- let uid = 0
-#endif
- liftIO $ getHiddenServiceSocketFile torAppName uid ident