mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix uuid comparison

Browse source
This commit is contained in:
Joey Hess 2016-12-09 17:02:21 -04:00
parent 52ccd44812
commit 725b8a5e14
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
RemoteDaemon/Transport/Tor.hs
View file

@ -133,14 +133,16 @@ transport (RemoteRepo r _) url@(RemoteURI uri) th ichan ochan =
res <- runNetProto conn $ res <- runNetProto conn $
P2P.auth myuuid authtoken P2P.auth myuuid authtoken
case res of case res of
Right (Just theiruuid) Right (Just theiruuid) -> do
| getUncachedUUID r == theiruuid -> do expecteduuid <- liftAnnex th $ getRepoUUID r
send (CONNECTED url) if expecteduuid == theiruuid
status <- handlecontrol then do
`race` handlepeer conn send (CONNECTED url)
send (DISCONNECTED url) status <- handlecontrol
return $ either id id status `race` handlepeer conn
| otherwise -> return ConnectionStopping send (DISCONNECTED url)
return $ either id id status
else return ConnectionStopping
_ -> return ConnectionClosed _ -> return ConnectionClosed
send msg = atomically $ writeTChan ochan msg send msg = atomically $ writeTChan ochan msg