patches and low-level development discussion
 help / color / mirror / code / Atom feed
598c01cc5b3b8a9e3a4ede39640e43570dab58a1 blob 2003 bytes (raw)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
 
// SPDX-License-Identifier: GPL-2.0-or-later
// SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is>

#define _GNU_SOURCE

#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <stdnoreturn.h>
#include <string.h>
#include <sysexits.h>
#include <sys/socket.h>
#include <unistd.h>

#include <linux/vm_sockets.h>

#include "log.h"
#include "num.h"
#include "vsock.h"

noreturn static void ex_usage(void)
{
	if (verbosity)
		fprintf(stderr, "Usage: %s cid port prog...\n",
			program_invocation_short_name);
	exit(EX_USAGE);
}

int main(int argc, char *argv[])
{
	int opt, fd;
	uint32_t cid, port;

	// A skeleton of an option parser to reject any options that
	// are given, so we can add options in the future without
	// worrying about breaking backwards compatibility because
	// they were previously interpreted as a first argument.
	while ((opt = getopt(argc, argv, "+")) != -1) {
		switch (opt) {
		default:
			ex_usage();
		}
	}

	// Check there are enough positional arguments (two for the
	// address and at least one to exec into).
	if (optind > argc - 3)
		ex_usage();

	// Parse the `cid' argument.
	if (!strcmp(argv[optind], "-1"))
		cid = VMADDR_CID_ANY;
	else if (getu32(argv[optind], 0,  UINT32_MAX, &cid))
		ex_usage();
	optind++;

	// Parse the `port' argument.
	if (!strcmp(argv[optind], "-1"))
		port = VMADDR_PORT_ANY;
	else if (getu32(argv[optind], 0, UINT32_MAX, &port))
		ex_usage();
	optind++;

	// Set up the socket.
	fd = socket(AF_VSOCK, SOCK_STREAM, 0);
	if (fd == -1)
		diee(EX_OSERR, "socket");
	if (fcntl(fd, F_SETFL, O_NONBLOCK) == -1)
		diee(EX_OSERR, "fcntl");
	if (vsock_bind(fd, cid, port) == -1)
		diee(EX_OSERR, "bind");
	if (listen(fd ,40) == -1)
		diee(EX_OSERR, "listen");

	// Place the socket at stdout.
	if (dup2(fd, STDIN_FILENO) == -1)
		diee(EX_OSERR, "dup2");
	if (fd != STDIN_FILENO)
		close(fd);

	// Finally, exec into `prog'.
	execvp(argv[optind], &argv[optind]);
	diee(EX_OSERR, "execvp");
}
debug log:

solving 598c01c ...
found 598c01c in https://spectrum-os.org/lists/archives/spectrum-devel/20210319031713.23600-1-hi@alyssa.is/

applying [1/1] https://spectrum-os.org/lists/archives/spectrum-devel/20210319031713.23600-1-hi@alyssa.is/
diff --git a/vsockserver-socketbinder.c b/vsockserver-socketbinder.c
new file mode 100644
index 0000000..598c01c

Checking patch vsockserver-socketbinder.c...
Applied patch vsockserver-socketbinder.c cleanly.

index at:
100644 598c01cc5b3b8a9e3a4ede39640e43570dab58a1	vsockserver-socketbinder.c

Code repositories for project(s) associated with this public inbox

	https://spectrum-os.org/git/crosvm
	https://spectrum-os.org/git/doc
	https://spectrum-os.org/git/mktuntap
	https://spectrum-os.org/git/nixpkgs
	https://spectrum-os.org/git/spectrum
	https://spectrum-os.org/git/ucspi-vsock
	https://spectrum-os.org/git/www

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).