make remote-daemon able to send and receive objects over tor

Each worker thread needs to run in the Annex monad, but the
remote-daemon's liftAnnex can only run 1 action at a time. Used
Annex.Concurrent to deal with that.

P2P.Annex is incomplete as of yet.

P2P/Annex.hs

@@ -0,0 +1,36 @@
+{- P2P protocol, Annex implementation
+ -
+ - Copyright 2016 Joey Hess <id@joeyh.name>
+ -
+ - Licensed under the GNU GPL version 3 or higher.
+ -}
+
+{-# LANGUAGE RankNTypes, FlexibleContexts #-}
+
+module P2P.Annex
+	( RunEnv(..)
+	, runFullProto
+	) where
+
+import Annex.Common
+import Annex.Content
+import P2P.Protocol
+import P2P.IO
+
+import Control.Monad.Free
+
+-- Full interpreter for Proto, that can receive and send objects.
+runFullProto :: RunEnv -> Proto a -> Annex (Maybe a)
+runFullProto runenv = go
+  where
+	go :: RunProto Annex
+	go (Pure v) = pure (Just v)
+	go (Free (Net n)) = runNet runenv go n
+	go (Free (Local l)) = runLocal runenv go l
+
+runLocal :: RunEnv -> RunProto Annex -> LocalF (Proto a) -> Annex (Maybe a)
+runLocal runenv runner f = case f of
+	TmpContentSize k next -> do
+		tmp <- fromRepo $ gitAnnexTmpObjectLocation k
+		size <- liftIO $ catchDefaultIO 0 $ getFileSize tmp
+		runner (next (Len size))

RemoteDaemon/Transport/Tor.hs

@@ -8,6 +8,8 @@
 module RemoteDaemon.Transport.Tor (server) where
 
 import Common
+import qualified Annex
+import Annex.Concurrent
 import RemoteDaemon.Types
 import RemoteDaemon.Common
 import Utility.Tor
@@ -15,7 +17,7 @@ import Utility.FileMode
 import Utility.AuthToken
 import Remote.Helper.Tor
 import P2P.Protocol
-import P2P.IO
+import P2P.Annex
 import P2P.Auth
 import Annex.UUID
 import Types.UUID
@@ -75,14 +77,20 @@ serveClient th u r q = bracket setup cleanup go
 	cleanup = hClose
 	go h = do
 		debugM "remotedaemon" "serving a TOR connection"
-		-- Load auth tokens for every connection, to notice
+		-- Avoid doing any work in the liftAnnex, since only one
-		-- when the allowed set is changed.
+		-- can run at a time.
-		allowed <- liftAnnex th loadP2PAuthTokens
+		st <- liftAnnex th dupState
-		let runenv = RunEnv
+		((), st') <- Annex.run st $ do
-			{ runRepo = r
+			-- Load auth tokens for every connection, to notice
-			, runCheckAuth = (`isAllowedAuthToken` allowed)
+			-- when the allowed set is changed.
-			, runIhdl = h
+			allowed <- loadP2PAuthTokens
-			, runOhdl = h
+			let runenv = RunEnv
-			}
+				{ runRepo = r
-		void $ runNetProto runenv (serve u)
+				, runCheckAuth = (`isAllowedAuthToken` allowed)
+				, runIhdl = h
+				, runOhdl = h
+				}
+			void $ runFullProto runenv (serve u)
+		-- Merge the duplicated state back in.
+		liftAnnex th $ mergeState st'
 		debugM "remotedaemon" "done with TOR connection"

git-annex.cabal

@@ -908,6 +908,7 @@ Executable git-annex
     Messages.JSON
     Messages.Progress
     P2P.Address
+    P2P.Annex
     P2P.Auth
     P2P.IO
     P2P.Protocol