From: Julian Orth <ju.orth@gmail.com>
To: wireguard@lists.zx2c4.com
Subject: [PATCH v2 10/10] tools: add support for transit-credentials
Date: Sun, 9 Sep 2018 17:14:02 +0200 [thread overview]
Message-ID: <20180909151402.6033-11-ju.orth@gmail.com> (raw)
In-Reply-To: <20180909151402.6033-1-ju.orth@gmail.com>
The command is
wg set <device> transit-credentials <fd>[,<fd>]
For example
wg set wg0 transit-credentials 100
wg set wg0 transit-credentials 100,101
---
src/tools/config.c | 30 ++++++++++++++++++++++++++++++
src/tools/containers.h | 4 ++++
src/tools/ipc.c | 4 ++++
src/tools/set.c | 2 +-
4 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/src/tools/config.c b/src/tools/config.c
index dffec76..b1f4d8d 100644
--- a/src/tools/config.c
+++ b/src/tools/config.c
@@ -99,6 +99,31 @@ static bool parse_transit_netns(struct wgdevice *device, const char *arg)
return false;
}
+static bool parse_transit_credentials(struct wgdevice *device, const char *arg)
+{
+ char *end;
+ bool valid, have_ipv6 = false;
+
+ valid = isdigit(*arg);
+ device->transit_credentials_ipv4 = strtoul(arg, &end, 10);
+ if (*end) {
+ have_ipv6 = *end == ',' && isdigit(end[1]);
+ device->transit_credentials_ipv6 = strtoul(end + 1, &end, 10);
+ }
+ if (*end)
+ valid = false;
+
+ if (valid) {
+ device->flags |= WGDEVICE_HAS_TRANSIT_CREDENTIALS_IPV4;
+ if (have_ipv6)
+ device->flags |= WGDEVICE_HAS_TRANSIT_CREDENTIALS_IPV6;
+ } else {
+ fprintf(stderr, "Format of transit-credentials is invalid: '%s'\n", arg);
+ }
+
+ return valid;
+}
+
static inline bool parse_fwmark(uint32_t *fwmark, uint32_t *flags, const char *value)
{
unsigned long ret;
@@ -557,6 +582,11 @@ struct wgdevice *config_read_cmd(char *argv[], int argc)
goto error;
argv += 2;
argc -= 2;
+ } else if (!strcmp(argv[0], "transit-credentials") && argc >= 2 && !peer) {
+ if (!parse_transit_credentials(device, argv[1]))
+ goto error;
+ argv += 2;
+ argc -= 2;
} else if (!strcmp(argv[0], "fwmark") && argc >= 2 && !peer) {
if (!parse_fwmark(&device->fwmark, &device->flags, argv[1]))
goto error;
diff --git a/src/tools/containers.h b/src/tools/containers.h
index c6dd6fe..368e8d1 100644
--- a/src/tools/containers.h
+++ b/src/tools/containers.h
@@ -61,6 +61,8 @@ enum {
WGDEVICE_HAS_FWMARK = 1U << 4,
WGDEVICE_HAS_TRANSIT_NETNS_PID = 1U << 5,
WGDEVICE_HAS_TRANSIT_NETNS_FD = 1U << 6,
+ WGDEVICE_HAS_TRANSIT_CREDENTIALS_IPV4 = 1U << 7,
+ WGDEVICE_HAS_TRANSIT_CREDENTIALS_IPV6 = 1U << 8,
};
struct wgdevice {
@@ -76,6 +78,8 @@ struct wgdevice {
uint16_t listen_port;
uint32_t transit_netns_pid;
int transit_netns_fd;
+ int transit_credentials_ipv4;
+ int transit_credentials_ipv6;
struct wgpeer *first_peer, *last_peer;
};
diff --git a/src/tools/ipc.c b/src/tools/ipc.c
index aa82cb3..383737a 100644
--- a/src/tools/ipc.c
+++ b/src/tools/ipc.c
@@ -573,6 +573,10 @@ again:
mnl_attr_put_u32(nlh, WGDEVICE_A_TRANSIT_NETNS_PID, dev->transit_netns_pid);
if (dev->flags & WGDEVICE_HAS_TRANSIT_NETNS_FD)
mnl_attr_put_u32(nlh, WGDEVICE_A_TRANSIT_NETNS_FD, (uint32_t)dev->transit_netns_fd);
+ if (dev->flags & WGDEVICE_HAS_TRANSIT_CREDENTIALS_IPV4)
+ mnl_attr_put_u32(nlh, WGDEVICE_A_TRANSIT_CREDENTIALS_IPV4, (uint32_t)dev->transit_credentials_ipv4);
+ if (dev->flags & WGDEVICE_HAS_TRANSIT_CREDENTIALS_IPV6)
+ mnl_attr_put_u32(nlh, WGDEVICE_A_TRANSIT_CREDENTIALS_IPV6, (uint32_t)dev->transit_credentials_ipv6);
if (dev->flags & WGDEVICE_HAS_FWMARK)
mnl_attr_put_u32(nlh, WGDEVICE_A_FWMARK, dev->fwmark);
if (dev->flags & WGDEVICE_REPLACE_PEERS)
diff --git a/src/tools/set.c b/src/tools/set.c
index 37be9a0..9947cd4 100644
--- a/src/tools/set.c
+++ b/src/tools/set.c
@@ -18,7 +18,7 @@ int set_main(int argc, char *argv[])
int ret = 1;
if (argc < 3) {
- fprintf(stderr, "Usage: %s %s <interface> [listen-port <port>] [transit-netns <pid|file path>] [fwmark <mark>] [private-key <file path>] [peer <base64 public key> [remove] [preshared-key <file path>] [endpoint <ip>:<port>] [persistent-keepalive <interval seconds>] [allowed-ips <ip1>/<cidr1>[,<ip2>/<cidr2>]...] ]...\n", PROG_NAME, argv[0]);
+ fprintf(stderr, "Usage: %s %s <interface> [listen-port <port>] [transit-netns <pid|file path>] [transit-credentials <fd>[,<fd>]] [fwmark <mark>] [private-key <file path>] [peer <base64 public key> [remove] [preshared-key <file path>] [endpoint <ip>:<port>] [persistent-keepalive <interval seconds>] [allowed-ips <ip1>/<cidr1>[,<ip2>/<cidr2>]...] ]...\n", PROG_NAME, argv[0]);
return 1;
}
--
2.18.0
prev parent reply other threads:[~2018-09-09 15:14 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-09 15:13 [PATCH v2 00/10] Allow changing the transit namespace Julian Orth
2018-09-09 15:13 ` [PATCH v2 01/10] device: protect socket_init with device_update_lock Julian Orth
2018-09-09 15:13 ` [PATCH v2 02/10] device: rename creating_net to transit_net Julian Orth
2018-09-09 15:13 ` [PATCH v2 03/10] device: store a copy of the device net Julian Orth
2018-09-09 15:13 ` [PATCH v2 04/10] socket: allow modification of transit_net Julian Orth
2018-09-09 15:13 ` [PATCH v2 05/10] netlink: allow modification of transit net Julian Orth
2018-09-09 15:13 ` [PATCH v2 06/10] tools: " Julian Orth
2018-09-09 15:13 ` [PATCH v2 07/10] tests: add test for transit-net Julian Orth
2018-09-09 15:14 ` [PATCH v2 08/10] netlink: require CAP_NET_ADMIN for socket changes Julian Orth
2018-09-09 15:14 ` [PATCH v2 09/10] netlink: allow bypassing CAP_NET_ADMIN Julian Orth
2018-09-09 15:14 ` Julian Orth [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180909151402.6033-11-ju.orth@gmail.com \
--to=ju.orth@gmail.com \
--cc=wireguard@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).