diff options
| author |   reyk <reyk@openbsd.org> | 2015-01-22 17:42:09 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2015-01-22 17:42:09 +0000 |
| commit | f04ff968bdbf9c051b78e342c84c2472a4128884 (patch) | |
| tree | 33196cc37f7cb9a887d7ef834396aca53aa76991 /usr.sbin/relayctl | |
| parent | Only allow the -r flag when sending a message; from Martin Brandenburg (diff) | |
| download | wireguard-openbsd-f04ff968bdbf9c051b78e342c84c2472a4128884.tar.xz wireguard-openbsd-f04ff968bdbf9c051b78e342c84c2472a4128884.zip | |
Clean up the relayd headers with help of include-what-you-use and some
manual review. Based on common practice, relayd.h now includes the
necessary headers for itself.
OK benno@
Diffstat (limited to 'usr.sbin/relayctl')
| -rw-r--r-- | usr.sbin/relayctl/parser.c | 14 | ||||
| -rw-r--r-- | usr.sbin/relayctl/parser.h | 4 | ||||
| -rw-r--r-- | usr.sbin/relayctl/relayctl.c | 16 |
3 files changed, 10 insertions, 24 deletions
diff --git a/usr.sbin/relayctl/parser.c b/usr.sbin/relayctl/parser.c index fbe11e1c49f..0b97aa6ce6c 100644 --- a/usr.sbin/relayctl/parser.c +++ b/usr.sbin/relayctl/parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.c,v 1.26 2015/01/22 15:23:50 reyk Exp $ */ +/* $OpenBSD: parser.c,v 1.27 2015/01/22 17:42:09 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -19,25 +19,13 @@ */ #include <sys/types.h> -#include <sys/socket.h> -#include <sys/queue.h> -#include <net/if.h> -#include <netinet/in.h> -#include <arpa/inet.h> - -#include <err.h> -#include <errno.h> #include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <event.h> - -#include <openssl/ssl.h> #include "relayd.h" - #include "parser.h" enum token_type { diff --git a/usr.sbin/relayctl/parser.h b/usr.sbin/relayctl/parser.h index 5e19f9befde..158d95ff406 100644 --- a/usr.sbin/relayctl/parser.h +++ b/usr.sbin/relayctl/parser.h @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.h,v 1.14 2011/05/19 08:56:49 reyk Exp $ */ +/* $OpenBSD: parser.h,v 1.15 2015/01/22 17:42:09 reyk Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -16,6 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "relayd.h" + enum actions { NONE, SHOW_SUM, diff --git a/usr.sbin/relayctl/relayctl.c b/usr.sbin/relayctl/relayctl.c index e42dc5ec671..defc498a231 100644 --- a/usr.sbin/relayctl/relayctl.c +++ b/usr.sbin/relayctl/relayctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relayctl.c,v 1.52 2015/01/16 06:40:20 deraadt Exp $ */ +/* $OpenBSD: relayctl.c,v 1.53 2015/01/22 17:42:09 reyk Exp $ */ /* * Copyright (c) 2007 - 2013 Reyk Floeter <reyk@openbsd.org> @@ -22,25 +22,21 @@ #include <sys/types.h> #include <sys/socket.h> +#include <sys/time.h> #include <sys/queue.h> #include <sys/un.h> -#include <net/if.h> -#include <net/if_media.h> -#include <net/if_types.h> -#include <netinet/in.h> #include <arpa/inet.h> +#include <stdio.h> +#include <stdlib.h> #include <err.h> #include <errno.h> #include <limits.h> -#include <stdio.h> -#include <stdlib.h> #include <string.h> #include <unistd.h> -#include <event.h> - -#include <openssl/ssl.h> +#include <time.h> +#include <imsg.h> #include "relayd.h" #include "parser.h" |