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/relayctl | |
| 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/relayctl')
| -rw-r--r-- | usr.sbin/relayctl/relayctl.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/usr.sbin/relayctl/relayctl.c b/usr.sbin/relayctl/relayctl.c index 5c5ee09cb58..94aca767f97 100644 --- a/usr.sbin/relayctl/relayctl.c +++ b/usr.sbin/relayctl/relayctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relayctl.c,v 1.36 2008/12/31 15:22:27 sobrado Exp $ */ +/* $OpenBSD: relayctl.c,v 1.37 2009/06/05 23:39:51 pyr Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -93,13 +93,6 @@ usage(void) exit(1); } -/* dummy function so that relayctl does not need libevent */ -void -imsg_event_add(struct imsgbuf *i) -{ - /* nothing */ -} - int main(int argc, char *argv[]) { @@ -134,7 +127,7 @@ main(int argc, char *argv[]) if ((ibuf = malloc(sizeof(struct imsgbuf))) == NULL) err(1, NULL); - imsg_init(ibuf, ctl_sock, NULL); + imsg_init(ibuf, ctl_sock); done = 0; /* process user request */ |