summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2021-02-28 22:56:10 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2021-02-28 22:56:10 +0000
commit7f64af13c6edfe6ddddfb4d78f8bfd7eb8599b2c (patch)
tree52df52c35b77f36291bc034c4e31d94834c6a201 /usr.sbin
parent38349ad65865ab511f63acbfe2704b1cfe79478d (diff)
add veb(4) to the list of supported bridges/switches you can configure.
tested by josh rickmar ok kn@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/vmd/config.c4
-rw-r--r--usr.sbin/vmd/priv.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/vmd/config.c b/usr.sbin/vmd/config.c
index f9f303a3d2b..9ef5dca626e 100644
--- a/usr.sbin/vmd/config.c
+++ b/usr.sbin/vmd/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.58 2019/05/11 19:55:14 jasper Exp $ */
+/* $OpenBSD: config.c,v 1.59 2021/02/28 22:56:09 dlg Exp $ */
/*
* Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -40,7 +40,7 @@
#include "vmd.h"
/* Supported bridge types */
-const char *vmd_descsw[] = { "switch", "bridge", NULL };
+const char *vmd_descsw[] = { "switch", "bridge", "veb", NULL };
static int config_init_localprefix(struct vmd_config *);
diff --git a/usr.sbin/vmd/priv.c b/usr.sbin/vmd/priv.c
index 6ced20244ea..7335f0c4a89 100644
--- a/usr.sbin/vmd/priv.c
+++ b/usr.sbin/vmd/priv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: priv.c,v 1.15 2019/06/28 13:32:51 deraadt Exp $ */
+/* $OpenBSD: priv.c,v 1.16 2021/02/28 22:56:09 dlg Exp $ */
/*
* Copyright (c) 2016 Reyk Floeter <reyk@openbsd.org>
@@ -81,7 +81,8 @@ priv_run(struct privsep *ps, struct privsep_proc *p, void *arg)
int
priv_dispatch_parent(int fd, struct privsep_proc *p, struct imsg *imsg)
{
- const char *desct[] = { "tap", "switch", "bridge", NULL };
+ const char *desct[] = { "tap", "switch", "bridge",
+ "veb", NULL };
struct privsep *ps = p->p_ps;
struct vmop_ifreq vfr;
struct vmd *env = ps->ps_env;