diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-12-16 18:26:07 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-12-16 18:26:07 -0400 |
commit | 82bb3565a3b4ae4442d006b06c1bd487cba783a8 (patch) | |
tree | 6d7681bed722e263a67770852930bdd1754e07b5 /P2P/Protocol.hs | |
parent | 097c82b17ed0f3c96d1ca1617f42c39650dc9ab2 (diff) |
Revert "p2p --link now defaults to setting up a bi-directional link"
This reverts commit 6aa7e136b5d246228723f4c9996bda11f66c4445.
On second thought, this was an overcomplication of what should be the
lowest-level primitive. Let's build bi-directional links at the pairing
level with eg magic wormhole.
Diffstat (limited to 'P2P/Protocol.hs')
-rw-r--r-- | P2P/Protocol.hs | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/P2P/Protocol.hs b/P2P/Protocol.hs index c383fa966..135409e26 100644 --- a/P2P/Protocol.hs +++ b/P2P/Protocol.hs @@ -14,7 +14,6 @@ module P2P.Protocol where import qualified Utility.SimpleProtocol as Proto import Types.Key import Types.UUID -import P2P.Address import Utility.AuthToken import Utility.Applicative import Utility.PartialPrelude @@ -50,7 +49,6 @@ data Message = AUTH UUID AuthToken -- uuid of the peer that is authenticating | AUTH_SUCCESS UUID -- uuid of the remote peer | AUTH_FAILURE - | LINK P2PAddressAuth -- sending an address that the peer may link to | CONNECT Service | CONNECTDONE ExitCode | NOTIFYCHANGE @@ -71,9 +69,8 @@ data Message instance Proto.Sendable Message where formatMessage (AUTH uuid authtoken) = ["AUTH", Proto.serialize uuid, Proto.serialize authtoken] - formatMessage (AUTH_SUCCESS uuid) = ["AUTH-SUCCESS", Proto.serialize uuid] + formatMessage (AUTH_SUCCESS uuid) = ["AUTH-SUCCESS", Proto.serialize uuid] formatMessage AUTH_FAILURE = ["AUTH-FAILURE"] - formatMessage (LINK addr) = ["LINK", Proto.serialize addr] formatMessage (CONNECT service) = ["CONNECT", Proto.serialize service] formatMessage (CONNECTDONE exitcode) = ["CONNECTDONE", Proto.serialize exitcode] formatMessage NOTIFYCHANGE = ["NOTIFYCHANGE"] @@ -95,7 +92,6 @@ instance Proto.Receivable Message where parseCommand "AUTH" = Proto.parse2 AUTH parseCommand "AUTH-SUCCESS" = Proto.parse1 AUTH_SUCCESS parseCommand "AUTH-FAILURE" = Proto.parse0 AUTH_FAILURE - parseCommand "LINK" = Proto.parse1 LINK parseCommand "CONNECT" = Proto.parse1 CONNECT parseCommand "CONNECTDONE" = Proto.parse1 CONNECTDONE parseCommand "NOTIFYCHANGE" = Proto.parse0 NOTIFYCHANGE @@ -240,8 +236,6 @@ data LocalF c -- with False. | WaitRefChange (ChangedRefs -> c) -- ^ Waits for one or more git refs to change and returns them. - | AddLinkToPeer P2PAddressAuth (Bool -> c) - -- ^ Adds a link to a peer using the provided address. deriving (Functor) type Local = Free LocalF @@ -261,11 +255,6 @@ auth myuuid t = do net $ sendMessage (ERROR "auth failed") return Nothing -link :: P2PAddressAuth -> Proto Bool -link addr = do - net $ sendMessage (LINK addr) - checkSuccess - checkPresent :: Key -> Proto Bool checkPresent key = do net $ sendMessage (CHECKPRESENT key) @@ -365,9 +354,6 @@ serveAuth myuuid = serverLoop handler serveAuthed :: UUID -> Proto () serveAuthed myuuid = void $ serverLoop handler where - handler (LINK addr) = do - sendSuccess =<< local (addLinkToPeer addr) - return ServerContinue handler (LOCKCONTENT key) = do local $ tryLockContent key $ \locked -> do sendSuccess locked |