wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-24 22:11:15 +02:00
Code Activity

Add convenience function for connecting to a Unix domain socket

Browse source
This commit is contained in:
Eelco Dolstra 2025-04-11 16:11:57 +02:00 • committed by Jörg Thalheim
parent 5b4806ab3c
commit 0087188d47
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/uds-remote-store.cc
View file

@ -83,9 +83,7 @@ ref<RemoteStore::Connection> UDSRemoteStore::openConnection()
auto conn = make_ref<Connection>();
/* Connect to a daemon that does the privileged work for us. */
conn->fd = createUnixDomainSocket();
nix::connect(toSocket(conn->fd.get()), config->path);
conn->fd = nix::connect(config->path);
conn->from.fd = conn->fd.get();
conn->to.fd = conn->fd.get();

7
src/libutil/include/nix/util/unix-domain-socket.hh
View file

@ -9,6 +9,8 @@
#endif
#include <unistd.h>
#include <filesystem>
namespace nix {
/**
@ -80,4 +82,9 @@ void bind(Socket fd, const std::string & path);
*/
void connect(Socket fd, const std::string & path);
/**
* Connect to a Unix domain socket.
*/
AutoCloseFD connect(const std::filesystem::path & path);
}

7
src/libutil/unix-domain-socket.cc
View file

@ -114,4 +114,11 @@ void connect(Socket fd, const std::string & path)
bindConnectProcHelper("connect", ::connect, fd, path);
}
AutoCloseFD connect(const std::filesystem::path & path)
{
auto fd = createUnixDomainSocket();
nix::connect(toSocket(fd.get()), path);
return fd;
}
}