diff options
| author |   reyk <reyk@openbsd.org> | 2016-09-02 12:12:51 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2016-09-02 12:12:51 +0000 |
| commit | c28c61cc15d3acfa1d80ccf450dcc219cf90321a (patch) | |
| tree | 4d542558dff7b088db0c1b8b845a504973fe961c /usr.sbin/relayd/pfe.c | |
| parent | backout accidental commit (diff) | |
| download | wireguard-openbsd-c28c61cc15d3acfa1d80ccf450dcc219cf90321a.tar.xz wireguard-openbsd-c28c61cc15d3acfa1d80ccf450dcc219cf90321a.zip | |
As done in httpd, remove ps_ninstances and p_instance.
OK benno@ rzalamena@
Diffstat (limited to 'usr.sbin/relayd/pfe.c')
| -rw-r--r-- | usr.sbin/relayd/pfe.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/relayd/pfe.c b/usr.sbin/relayd/pfe.c index 2ed98b81ed5..265b3cc12dd 100644 --- a/usr.sbin/relayd/pfe.c +++ b/usr.sbin/relayd/pfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfe.c,v 1.84 2016/09/02 11:51:49 reyk Exp $ */ +/* $OpenBSD: pfe.c,v 1.85 2016/09/02 12:12:51 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -103,7 +103,7 @@ pfe_dispatch_hce(int fd, struct privsep_proc *p, struct imsg *imsg) struct table *table; struct ctl_status st; - control_imsg_forward(imsg); + control_imsg_forward(p->p_ps, imsg); switch (imsg->hdr.type) { case IMSG_HOST_STATUS: @@ -687,7 +687,7 @@ pfe_sync(void) imsg.hdr.len = sizeof(id) + IMSG_HEADER_SIZE; imsg.data = &id; sync_table(env, rdr, active); - control_imsg_forward(&imsg); + control_imsg_forward(env->sc_ps, &imsg); } if (rdr->conf.flags & F_DOWN) { @@ -700,7 +700,7 @@ pfe_sync(void) imsg.hdr.len = sizeof(id) + IMSG_HEADER_SIZE; imsg.data = &id; sync_ruleset(env, rdr, 0); - control_imsg_forward(&imsg); + control_imsg_forward(env->sc_ps, &imsg); } } else if (!(rdr->conf.flags & F_ACTIVE_RULESET)) { log_debug("%s: enabling ruleset", __func__); @@ -710,7 +710,7 @@ pfe_sync(void) imsg.hdr.len = sizeof(id) + IMSG_HEADER_SIZE; imsg.data = &id; sync_ruleset(env, rdr, 1); - control_imsg_forward(&imsg); + control_imsg_forward(env->sc_ps, &imsg); } } |