diff options
| author |   pamela <pamela@openbsd.org> | 2019-03-02 03:40:45 +0000 |
|---|---|---|
| committer | pamela <pamela@openbsd.org> | 2019-03-02 03:40:45 +0000 |
| commit | b17c900d138a009e136bf23bd9ed5b0056bb4a34 (patch) | |
| tree | aad792121ccbbec910386d10f3d2731b643ac042 /usr.sbin/rad/control.c | |
| parent | Since ring->index points to the next free slot, once we reach index zero (diff) | |
| download | wireguard-openbsd-b17c900d138a009e136bf23bd9ed5b0056bb4a34.tar.xz wireguard-openbsd-b17c900d138a009e136bf23bd9ed5b0056bb4a34.zip | |
Introduce the IMSG_DATA_SIZE() macro to replace recurring math on imsg.hdr.len to shorten and simplify code.
OK florian@
Diffstat (limited to 'usr.sbin/rad/control.c')
| -rw-r--r-- | usr.sbin/rad/control.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/usr.sbin/rad/control.c b/usr.sbin/rad/control.c index 65d69f97a72..8232ca96c16 100644 --- a/usr.sbin/rad/control.c +++ b/usr.sbin/rad/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.4 2018/08/04 09:37:17 florian Exp $ */ +/* $OpenBSD: control.c,v 1.5 2019/03/02 03:40:45 pamela Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -240,16 +240,14 @@ control_dispatch_imsg(int fd, short event, void *bula) frontend_imsg_compose_main(imsg.hdr.type, 0, NULL, 0); break; case IMSG_CTL_LOG_VERBOSE: - if (imsg.hdr.len != IMSG_HEADER_SIZE + - sizeof(verbose)) + if (IMSG_DATA_SIZE(imsg) != sizeof(verbose)) break; /* Forward to all other processes. */ frontend_imsg_compose_main(imsg.hdr.type, imsg.hdr.pid, - imsg.data, imsg.hdr.len - IMSG_HEADER_SIZE); + imsg.data, IMSG_DATA_SIZE(imsg)); frontend_imsg_compose_engine(imsg.hdr.type, - imsg.hdr.pid, imsg.data, - imsg.hdr.len - IMSG_HEADER_SIZE); + imsg.hdr.pid, imsg.data, IMSG_DATA_SIZE(imsg)); memcpy(&verbose, imsg.data, sizeof(verbose)); log_setverbose(verbose); @@ -274,5 +272,5 @@ control_imsg_relay(struct imsg *imsg) return (0); return (imsg_compose_event(&c->iev, imsg->hdr.type, 0, imsg->hdr.pid, - -1, imsg->data, imsg->hdr.len - IMSG_HEADER_SIZE)); + -1, imsg->data, IMSG_DATA_SIZE(*imsg))); } |