diff options
| author |   reyk <reyk@openbsd.org> | 2015-12-02 13:43:36 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2015-12-02 13:43:36 +0000 |
| commit | 41b2bea69eced8ff96b08daf847614d44e959a96 (patch) | |
| tree | c8c2562c90e0a13eab145555ae99cabc8bc1a212 /usr.sbin/vmd/proc.c | |
| parent | In most cases we don't need all arguments of proc_compose*_imsg(), (diff) | |
| download | wireguard-openbsd-41b2bea69eced8ff96b08daf847614d44e959a96.tar.xz wireguard-openbsd-41b2bea69eced8ff96b08daf847614d44e959a96.zip | |
Sync with relayd, fix previous use of proc_compose*_imsg()
Diffstat (limited to 'usr.sbin/vmd/proc.c')
| -rw-r--r-- | usr.sbin/vmd/proc.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/usr.sbin/vmd/proc.c b/usr.sbin/vmd/proc.c index 4ec159a4a10..a3582cf1e33 100644 --- a/usr.sbin/vmd/proc.c +++ b/usr.sbin/vmd/proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.c,v 1.2 2015/12/02 09:39:41 reyk Exp $ */ +/* $OpenBSD: proc.c,v 1.3 2015/12/02 13:43:36 reyk Exp $ */ /* * Copyright (c) 2010 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -32,7 +32,7 @@ #include <event.h> #include <imsg.h> -#include "proc.h" +#include "vmd.h" void proc_open(struct privsep *, struct privsep_proc *, struct privsep_proc *, size_t); @@ -591,6 +591,13 @@ proc_compose_imsg(struct privsep *ps, enum privsep_procid id, int n, } int +proc_compose(struct privsep *ps, enum privsep_procid id, + uint16_t type, void *data, uint16_t datalen) +{ + return (proc_compose_imsg(ps, id, -1, type, -1, -1, data, datalen)); +} + +int proc_composev_imsg(struct privsep *ps, enum privsep_procid id, int n, uint16_t type, uint32_t peerid, int fd, const struct iovec *iov, int iovcnt) { @@ -606,6 +613,13 @@ proc_composev_imsg(struct privsep *ps, enum privsep_procid id, int n, } int +proc_composev(struct privsep *ps, enum privsep_procid id, + uint16_t type, const struct iovec *iov, int iovcnt) +{ + return (proc_composev_imsg(ps, id, -1, type, -1, -1, iov, iovcnt)); +} + +int proc_forward_imsg(struct privsep *ps, struct imsg *imsg, enum privsep_procid id, int n) { |