diff options
| author |   tobhe <tobhe@openbsd.org> | 2021-02-21 14:21:37 +0000 |
|---|---|---|
| committer | tobhe <tobhe@openbsd.org> | 2021-02-21 14:21:37 +0000 |
| commit | 404aa605100301c45325a314993127266295d16c (patch) | |
| tree | c0fe791099dacb2bd32f743540558a5e4c2d2228 | |
| parent | One CPUs that implement the VHE extension and have the E2H bit set, keep (diff) | |
| download | wireguard-openbsd-404aa605100301c45325a314993127266295d16c.tar.xz wireguard-openbsd-404aa605100301c45325a314993127266295d16c.zip | |
Don't explicitly send address family in IMSG_VROUTE_ADD. The receiving
process parses af from the sockaddrs.
ok patrick@
| -rw-r--r-- | sbin/iked/vroute.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sbin/iked/vroute.c b/sbin/iked/vroute.c index ceec85c214d..47496c053ef 100644 --- a/sbin/iked/vroute.c +++ b/sbin/iked/vroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vroute.c,v 1.1 2021/02/13 16:14:12 tobhe Exp $ */ +/* $OpenBSD: vroute.c,v 1.2 2021/02/21 14:21:37 tobhe Exp $ */ /* * Copyright (c) 2021 Tobias Heider <tobhe@openbsd.org> @@ -169,10 +169,6 @@ vroute_setroute(struct iked *env, uint8_t rdomain, struct sockaddr *dst, return (-1); af = dst->sa_family; - iov[iovcnt].iov_base = ⁡ - iov[iovcnt].iov_len = sizeof(af); - iovcnt++; - iov[iovcnt].iov_base = &rdomain; iov[iovcnt].iov_len = sizeof(rdomain); iovcnt++; @@ -221,17 +217,11 @@ vroute_getroute(struct iked *env, struct imsg *imsg) size_t left; int addrs = 0; int type, flags; - uint8_t af, rdomain; + uint8_t rdomain; ptr = (uint8_t *)imsg->data; left = IMSG_DATA_SIZE(imsg); - if (left < sizeof(af)) - return (-1); - af = *ptr; - ptr += sizeof(af); - left -= sizeof(af); - if (left < sizeof(rdomain)) return (-1); rdomain = *ptr; |