diff options
| author | Pierre-Yves Ritschard <pyr@cvs.openbsd.org> | 2009-06-05 23:39:52 +0000 |
|---|---|---|
| committer | Pierre-Yves Ritschard <pyr@cvs.openbsd.org> | 2009-06-05 23:39:52 +0000 |
| commit | eec120ac35f33ddf2b90df426deaa4f48088b71d (patch) | |
| tree | 39e95460b2f91d49890ed92bb5cd6dbb11f5eaf3 /usr.sbin/relayd/relay_udp.c | |
| parent | 24d25743651001129029931c6fcb908bc43867fd (diff) | |
4 handed diff with eric:
Stop pushing event handling in the imsg framework.
Instead, provide a small glue layer on top of both imsg and libevent.
This finally clearly separates event handling and imsg construction.
Sidetrack bonus: remove the mega-ugly hack of having a dummy imsg_event_add
stub in relayctl.
This will make bgpd (and thus henning) happy. Next up are smtpd and ospfd.
ok eric@
Diffstat (limited to 'usr.sbin/relayd/relay_udp.c')
| -rw-r--r-- | usr.sbin/relayd/relay_udp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/relayd/relay_udp.c b/usr.sbin/relayd/relay_udp.c index f323807268b..d5ff36f74d3 100644 --- a/usr.sbin/relayd/relay_udp.c +++ b/usr.sbin/relayd/relay_udp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relay_udp.c,v 1.19 2009/06/05 00:04:01 pyr Exp $ */ +/* $OpenBSD: relay_udp.c,v 1.20 2009/06/05 23:39:51 pyr Exp $ */ /* * Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org> @@ -50,7 +50,7 @@ extern volatile sig_atomic_t relay_sessions; extern objid_t relay_conid; extern int proc_id; -extern struct imsgbuf *ibuf_pfe; +extern struct imsgev *iev_pfe; extern int debug; struct relayd *env = NULL; @@ -321,7 +321,7 @@ relay_udp_server(int fd, short sig, void *arg) cnl->proto = IPPROTO_UDP; bcopy(&con->se_in.ss, &cnl->src, sizeof(cnl->src)); bcopy(&rlay->rl_conf.ss, &cnl->dst, sizeof(cnl->dst)); - imsg_compose_event(ibuf_pfe, IMSG_NATLOOK, 0, 0, -1, cnl, + imsg_compose_event(iev_pfe, IMSG_NATLOOK, 0, 0, -1, cnl, sizeof(*cnl)); /* Schedule timeout */ |