Factor out ServeProto::BasicClientConnection::putBuildSettings

For Hydra.

Author: Ericson2314

src/libstore/legacy-ssh-store.cc

@@ -252,20 +252,14 @@ struct LegacySSHStore : public virtual LegacySSHStoreConfig, public virtual Stor
 
     void putBuildSettings(Connection & conn)
     {
-        conn.to
-            << settings.maxSilentTime
-            << settings.buildTimeout;
-        if (GET_PROTOCOL_MINOR(conn.remoteVersion) >= 2)
-            conn.to
-                << settings.maxLogSize;
-        if (GET_PROTOCOL_MINOR(conn.remoteVersion) >= 3)
-            conn.to
-                << 0 // buildRepeat hasn't worked for ages anyway
-                << 0;
-
-        if (GET_PROTOCOL_MINOR(conn.remoteVersion) >= 7) {
-            conn.to << ((int) settings.keepFailed);
-        }
+        conn.putBuildSettings({
+            .maxSilentTime = settings.maxSilentTime,
+            .buildTimeout = settings.buildTimeout,
+            .repeats = 0, // buildRepeat hasn't worked for ages anyway
+            .maxLogSize = settings.maxLogSize,
+            .enforceDeterminism = 0,
+            .keepFailed = settings.keepFailed,
+        });
     }
 
 public:

src/libstore/serve-protocol-impl.cc

@@ -17,4 +17,23 @@ StorePathSet ServeProto::BasicClientConnection::queryValidPaths(
     return Serialise<StorePathSet>::read(store, *this);
 }
 
+void ServeProto::BasicClientConnection::putBuildSettings(
+    const ServeProto::BasicClientConnection::BuildOptions & options)
+{
+    to
+        << options.maxSilentTime
+        << options.buildTimeout;
+    if (GET_PROTOCOL_MINOR(remoteVersion) >= 2)
+        to
+            << options.maxLogSize;
+    if (GET_PROTOCOL_MINOR(remoteVersion) >= 3)
+        to
+            << options.repeats
+            << options.enforceDeterminism;
+
+    if (GET_PROTOCOL_MINOR(remoteVersion) >= 7) {
+        to << ((int) options.keepFailed);
+    }
+}
+
 }

src/libstore/serve-protocol-impl.hh

@@ -99,6 +99,15 @@ struct ServeProto::BasicClientConnection
         const Store & remoteStore,
         bool lock, const StorePathSet & paths,
         SubstituteFlag maybeSubstitute);
+
+    struct BuildOptions {
+        time_t maxSilentTime, buildTimeout;
+        unsigned int repeats;
+        size_t maxLogSize;
+        bool enforceDeterminism, keepFailed;
+    };
+
+    void putBuildSettings(const BuildOptions & options);
 };
 
 }