morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

ssh-generator: split out common helper function

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2025-11-18 11:19:41 +01:00
parent d22139ad71
commit 7e8fe8e29f
5 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ssh-generator/meson.build
View File

@@ -3,15 +3,26 @@
executables += [
generator_template + {
'name' : 'systemd-ssh-generator',
'sources' : files('ssh-generator.c'),
'sources' : files(
'ssh-generator.c',
'ssh-util.c',
),
'extract' : files(
'ssh-util.c',
),
},
libexec_template + {
'name' : 'systemd-ssh-proxy',
'sources' : files('ssh-proxy.c'),
'sources' : files(
'ssh-proxy.c',
),
},
libexec_template + {
'name' : 'systemd-ssh-issue',
'sources' : files('ssh-issue.c'),
'sources' : files(
'ssh-issue.c',
),
'objects' : ['systemd-ssh-generator'],
},
]

15
src/ssh-generator/ssh-generator.c
View File

@@ -17,6 +17,7 @@
#include "socket-netlink.h"
#include "socket-util.h"
#include "special.h"
#include "ssh-util.h"
#include "string-util.h"
#include "strv.h"
#include "virt.h"
@@ -212,17 +213,9 @@ static int add_vsock_socket(
return 0;
}
_cleanup_close_ int vsock_fd = socket(AF_VSOCK, SOCK_STREAM|SOCK_CLOEXEC, 0);
if (vsock_fd < 0) {
if (ERRNO_IS_NOT_SUPPORTED(errno)) {
log_debug("Not creating AF_VSOCK ssh listener, since AF_VSOCK is not available.");
return 0;
}
return log_error_errno(errno, "Unable to test if AF_VSOCK is available: %m");
}
vsock_fd = safe_close(vsock_fd);
r = vsock_open_or_warn(/* ret= */ NULL);
if (r <= 0)
return r;
/* Determine the local CID so that we can log it to help users to connect to this VM */
unsigned local_cid;

16
src/ssh-generator/ssh-issue.c
View File

@@ -16,6 +16,7 @@
#include "parse-argument.h"
#include "pretty-print.h"
#include "socket-util.h"
#include "ssh-util.h"
#include "string-util.h"
#include "tmpfile-util.h"
#include "virt.h"
@@ -135,18 +136,9 @@ static int acquire_cid(unsigned *ret_cid) {
return 0;
}
_cleanup_close_ int vsock_fd = socket(AF_VSOCK, SOCK_STREAM|SOCK_CLOEXEC, 0);
if (vsock_fd < 0) {
if (ERRNO_IS_NOT_SUPPORTED(errno)) {
log_debug("Not creating issue file, since AF_VSOCK is not available.");
*ret_cid = 0;
return 0;
}
return log_error_errno(errno, "Unable to test if AF_VSOCK is available: %m");
}
vsock_fd = safe_close(vsock_fd);
r = vsock_open_or_warn(/* ret= */ NULL);
if (r <= 0)
return r;
unsigned local_cid;
r = vsock_get_local_cid(&local_cid);

23
src/ssh-generator/ssh-util.c Normal file
View File

@@ -0,0 +1,23 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/socket.h>
#include <unistd.h>
#include "errno-util.h"
#include "log.h"
#include "ssh-util.h"
int vsock_open_or_warn(int *ret) {
int fd = RET_NERRNO(socket(AF_VSOCK, SOCK_STREAM|SOCK_CLOEXEC, 0));
if (ERRNO_IS_NEG_NOT_SUPPORTED(fd))
log_debug_errno(fd, "AF_VSOCK is not available, ignoring: %m");
else if (fd < 0)
return log_error_errno(fd, "Unable to test if AF_VSOCK is available: %m");
if (ret)
*ret = fd;
else
close(fd);
return fd >= 0;
}

3
src/ssh-generator/ssh-util.h Normal file
View File

@@ -0,0 +1,3 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
int vsock_open_or_warn(int *ret);