maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix-store --serve: Use a versioned protocol

Browse source 
Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2014-02-10 07:43:13 -05:00
parent 38c3beac1a
commit c89d6b9b63
4 changed files with 102 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/download-via-ssh/download-via-ssh.cc
View file

@ -4,6 +4,7 @@
#include "archive.hh"
#include "affinity.hh"
#include "globals.hh"
#include "serve-protocol.hh"
#include <iostream>
#include <unistd.h>
@ -54,7 +55,7 @@ static pair<FdSink, FdSource> connect(string conn) {
}
static void substitute(pair<FdSink, FdSource> & pipes, Path storePath, Path destPath) {
writeString("substitute", pipes.first);
writeInt(cmdSubstitute, pipes.first);
writeString(storePath, pipes.first);
pipes.first.flush();
restorePath(destPath, pipes.second);
@ -63,20 +64,24 @@ static void substitute(pair<FdSink, FdSource> & pipes, Path storePath, Path dest
static void query(pair<FdSink, FdSource> & pipes) {
using std::cin;
writeString("query", pipes.first);
writeInt(cmdQuery, pipes.first);
for (string line; getline(cin, line);) {
Strings tokenized = tokenizeString<Strings>(line);
string cmd = tokenized.front();
writeString(cmd, pipes.first);
tokenized.pop_front();
foreach (Strings::iterator, i, tokenized)
writeStrings(tokenized, pipes.first);
pipes.first.flush();
if (cmd == "have") {
writeInt(qCmdHave, pipes.first);
foreach (Strings::iterator, i, tokenized)
writeStrings(tokenized, pipes.first);
pipes.first.flush();
PathSet paths = readStrings<PathSet>(pipes.second);
foreach (PathSet::iterator, i, paths)
cout << *i << endl;
} else if (cmd == "info") {
writeInt(qCmdInfo, pipes.first);
foreach (Strings::iterator, i, tokenized)
writeStrings(tokenized, pipes.first);
pipes.first.flush();
for (Path path = readString(pipes.second); !path.empty(); path = readString(pipes.second)) {
cout << path << endl;
cout << readString(pipes.second) << endl;
@ -91,7 +96,6 @@ static void query(pair<FdSink, FdSource> & pipes) {
throw Error(format("Unknown substituter query `%1%'") % cmd);
cout << endl;
}
writeString("", pipes.first);
}
void run(Strings args)
@ -106,6 +110,16 @@ void run(Strings args)
pair<FdSink, FdSource> pipes = connect(settings.sshSubstituterHosts.front());
/* Exchange the greeting */
writeInt(SERVE_MAGIC_1, pipes.first);
pipes.first.flush();
unsigned int magic = readInt(pipes.second);
if (magic != SERVE_MAGIC_2)
throw Error("protocol mismatch");
readInt(pipes.second); // Server version, unused for now
writeInt(SERVE_PROTOCOL_VERSION, pipes.first);
pipes.first.flush();
Strings::iterator i = args.begin();
if (*i == "--query")
query(pipes);

2
src/download-via-ssh/local.mk
View file

@ -6,4 +6,6 @@ download-via-ssh_SOURCES := $(d)/download-via-ssh.cc
download-via-ssh_INSTALL_DIR := $(libexecdir)/nix/substituters
download-via-ssh_CXXFLAGS = -Isrc/nix-store
download-via-ssh_LIBS = libmain libstore libutil libformat