mirror of
https://github.com/NixOS/nix.git
synced 2025-11-15 15:02:42 +01:00
cc24766fa6
For example, instead of doing
#include "nix/store-config.hh"
#include "nix/derived-path.hh"
Now do
#include "nix/store/config.hh"
#include "nix/store/derived-path.hh"
This was originally planned in the issue, and also recent requested by
Eelco.
Most of the change is purely mechanical. There is just one small
additional issue. See how, in the example above, we took this
opportunity to also turn `<comp>-config.hh` into `<comp>/config.hh`.
Well, there was already a `nix/util/config.{cc,hh}`. Even though there
is not a public configuration header for libutil (which also would be
called `nix/util/config.{cc,hh}`) that's still confusing, To avoid any
such confusion, we renamed that to `nix/util/configuration.{cc,hh}`.
Finally, note that the libflake headers already did this, so we didn't
need to do anything to them. We wouldn't want to mistakenly get
`nix/flake/flake/flake.hh`!
Progress on #7876
43 lines
1 KiB
C++
43 lines
1 KiB
C++
#include <regex>
|
|
|
|
#include "nix/store/common-ssh-store-config.hh"
|
|
#include "nix/store/ssh.hh"
|
|
|
|
namespace nix {
|
|
|
|
static std::string extractConnStr(std::string_view scheme, std::string_view _connStr)
|
|
{
|
|
if (_connStr.empty())
|
|
throw UsageError("`%s` store requires a valid SSH host as the authority part in Store URI", scheme);
|
|
|
|
std::string connStr{_connStr};
|
|
|
|
std::smatch result;
|
|
static std::regex v6AddrRegex("^((.*)@)?\\[(.*)\\]$");
|
|
|
|
if (std::regex_match(connStr, result, v6AddrRegex)) {
|
|
connStr = result[1].matched ? result.str(1) + result.str(3) : result.str(3);
|
|
}
|
|
|
|
return connStr;
|
|
}
|
|
|
|
CommonSSHStoreConfig::CommonSSHStoreConfig(std::string_view scheme, std::string_view host, const Params & params)
|
|
: StoreConfig(params)
|
|
, host(extractConnStr(scheme, host))
|
|
{
|
|
}
|
|
|
|
SSHMaster CommonSSHStoreConfig::createSSHMaster(bool useMaster, Descriptor logFD)
|
|
{
|
|
return {
|
|
host,
|
|
sshKey.get(),
|
|
sshPublicHostKey.get(),
|
|
useMaster,
|
|
compress,
|
|
logFD,
|
|
};
|
|
}
|
|
|
|
}
|