haskell-nix/hnix-store
1
1
Fork 0
mirror of https://github.com/haskell-nix/hnix-store.git synced 2024-09-11 18:05:56 +03:00
Code Issues Projects Releases Wiki Activity

remote: handshake - use minimumCommonVersion of our vs daemon protoVersion

Browse Source
This commit is contained in:
sorki 2023-12-02 13:58:33 +01:00
parent 14f93bf30b
commit d5557680de
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hnix-store-remote/src/System/Nix/Store/Remote/Client.hs
View File

@ -114,17 +114,17 @@ runStoreSocket preStoreConfig code =
sockPutS protoVersion ourProtoVersion
when (daemonVersion >= ProtoVersion 1 14)
let minimumCommonVersion = min daemonVersion ourProtoVersion
when (minimumCommonVersion >= ProtoVersion 1 14)
$ sockPutS int (0 :: Int) -- affinity, obsolete
when (daemonVersion >= ProtoVersion 1 11) $ do
when (minimumCommonVersion >= ProtoVersion 1 11) $ do
sockPutS
(mapErrorS RemoteStoreError_SerializerPut bool)
False -- reserveSpace, obsolete
-- not quite right, should be min of the two
-- as well as two ^ above
when (ourProtoVersion >= ProtoVersion 1 33) $ do
when (minimumCommonVersion >= ProtoVersion 1 33) $ do
-- If we were buffering I/O, we would flush the output here.
_daemonNixVersion <-
sockGetS
@ -133,7 +133,7 @@ runStoreSocket preStoreConfig code =
text
return ()
_remoteTrustsUs <- if ourProtoVersion >= ProtoVersion 1 35
_remoteTrustsUs <- if minimumCommonVersion >= ProtoVersion 1 35
then do
sockGetS
$ mapErrorS RemoteStoreError_SerializerHandshake trustedFlag
@ -146,6 +146,4 @@ runStoreSocket preStoreConfig code =
(\(PreStoreConfig a b) -> StoreConfig a ourProtoVersion b)
processOutput
-- TODO should be minimum of
-- ourProtoVersion vs daemonVersion
pure ourProtoVersion
pure minimumCommonVersion