diff options
Diffstat (limited to 'P2P')
| -rw-r--r-- | P2P/Annex.hs | 20 | ||||
| -rw-r--r-- | P2P/Protocol.hs | 2 |
2 files changed, 2 insertions, 20 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 diff --git a/P2P/Protocol.hs b/P2P/Protocol.hs index e74979170..f762c3783 100644 --- a/P2P/Protocol.hs +++ b/P2P/Protocol.hs @@ -39,7 +39,7 @@ newtype Offset = Offset Integer newtype Len = Len Integer deriving (Show) --- | Service as used by the connect message is gitremote-helpers(1) +-- | Service as used by the connect message in gitremote-helpers(1) data Service = UploadPack | ReceivePack deriving (Show) |