diff options
author | reyk <reyk@openbsd.org> | 2018-11-21 12:31:47 +0000 |
---|---|---|
committer | reyk <reyk@openbsd.org> | 2018-11-21 12:31:47 +0000 |
commit | 723f86d268ce8d6f0aa3efacb7ba3214531f3534 (patch) | |
tree | 2e96da16e34b221ef763f0966c2420432b376c17 /usr.sbin/vmd/dhcp.c | |
parent | Allow rad(8) to watch interface groups; e.g. "interface tap" in rad.conf. (diff) | |
download | wireguard-openbsd-723f86d268ce8d6f0aa3efacb7ba3214531f3534.tar.xz wireguard-openbsd-723f86d268ce8d6f0aa3efacb7ba3214531f3534.zip |
Add support for "local inet6" interfaces.
ok & test ccardenas@, additional review from kn@
Diffstat (limited to 'usr.sbin/vmd/dhcp.c')
-rw-r--r-- | usr.sbin/vmd/dhcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/vmd/dhcp.c b/usr.sbin/vmd/dhcp.c index 88cb62f4ab5..60016e27759 100644 --- a/usr.sbin/vmd/dhcp.c +++ b/usr.sbin/vmd/dhcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcp.c,v 1.5 2018/08/17 07:12:28 martijn Exp $ */ +/* $OpenBSD: dhcp.c,v 1.6 2018/11/21 12:31:47 reyk Exp $ */ /* * Copyright (c) 2017 Reyk Floeter <reyk@openbsd.org> @@ -109,7 +109,7 @@ dhcp_request(struct vionet_dev *dev, char *buf, size_t buflen, char **obuf) resp.xid = req.xid; if ((client_addr.s_addr = - vm_priv_addr(&env->vmd_cfg.cfg_localprefix, + vm_priv_addr(&env->vmd_cfg, dev->vm_vmid, dev->idx, 1)) == 0) return (-1); memcpy(&resp.yiaddr, &client_addr, @@ -119,7 +119,7 @@ dhcp_request(struct vionet_dev *dev, char *buf, size_t buflen, char **obuf) ss2sin(&pc.pc_dst)->sin_port = htons(CLIENT_PORT); if ((server_addr.s_addr = - vm_priv_addr(&env->vmd_cfg.cfg_localprefix, + vm_priv_addr(&env->vmd_cfg, dev->vm_vmid, dev->idx, 0)) == 0) return (-1); memcpy(&resp.siaddr, &server_addr, |