Add daemon protocol version to {worker,serve}_protocol::*Conn

This will allow us to factor out more serializers

Author: Ericson2314

src/libstore/daemon.cc

@@ -276,8 +276,14 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
     TrustedFlag trusted, RecursiveFlag recursive, unsigned int clientVersion,
     Source & from, BufferedSink & to, unsigned int op)
 {
-    worker_proto::ReadConn rconn { { .from = from } };
-    worker_proto::WriteConn wconn { { .to = to } };
+    worker_proto::ReadConn rconn {
+        { .from = from },
+        /* .version = */ clientVersion,
+    };
+    worker_proto::WriteConn wconn {
+        { .to = to },
+        /* .version = */ clientVersion,
+    };
 
     switch (op) {
 

src/libstore/path-info.cc

@@ -91,7 +91,10 @@ ValidPathInfo ValidPathInfo::read(Source & source, const Store & store, unsigned
     ValidPathInfo info(path, narHash);
     if (deriver != "") info.deriver = store.parseStorePath(deriver);
     info.references = worker_proto::read(store,
-        worker_proto::ReadConn { { .from = source } },
+        worker_proto::ReadConn {
+            { .from = source },
+            /* .version = */ format,
+        },
         Phantom<StorePathSet> {});
     source >> info.registrationTime >> info.narSize;
     if (format >= 16) {
@@ -114,7 +117,10 @@ void ValidPathInfo::write(
     sink << (deriver ? store.printStorePath(*deriver) : "")
          << narHash.to_string(Base16, false);
     worker_proto::write(store,
-        worker_proto::WriteConn { { .to = sink } },
+        worker_proto::WriteConn {
+            { .to = sink },
+            /* .version = */ format,
+        },
         references);
     sink << registrationTime << narSize;
     if (format >= 16) {

src/libstore/remote-store-connection.hh

@@ -16,7 +16,8 @@ struct RemoteStore::Connection
         return worker_proto::ReadConn {
             {
                 .from = from,
-            }
+            },
+            /* .version = */ daemonVersion,
         };
     }
 
@@ -25,7 +26,8 @@ struct RemoteStore::Connection
         return worker_proto::WriteConn {
             {
                 .to = to,
-            }
+            },
+            /* .version = */ daemonVersion,
         };
     }
 

src/libstore/remote-store.cc

@@ -510,9 +510,7 @@ void RemoteStore::addToStore(const ValidPathInfo & info, Source & source,
             sink
                 << exportMagic
                 << printStorePath(info.path);
-            worker_proto::write(*this,
-                worker_proto::WriteConn { { .to = sink } },
-                info.references);
+            worker_proto::write(*this, *conn, info.references);
             sink
                 << (info.deriver ? printStorePath(*info.deriver) : "")
                 << 0 // == no legacy signature

src/libstore/serve-protocol.hh

@@ -37,9 +37,11 @@ using common_proto::write;
 /* FIXME maybe move more stuff inside here */
 
 struct ReadConn : common_proto::ReadConn {
+    unsigned int version;
 };
 
 struct WriteConn : common_proto::WriteConn {
+    unsigned int version;
 };
 
 MAKE_PROTO(template<typename T>, std::vector<T>);

src/libstore/worker-protocol.hh

@@ -85,9 +85,11 @@ using common_proto::write;
 /* FIXME maybe move more stuff inside here */
 
 struct ReadConn : common_proto::ReadConn {
+    unsigned int version;
 };
 
 struct WriteConn : common_proto::WriteConn {
+    unsigned int version;
 };
 
 MAKE_PROTO(, BuildResult);