diff options
| author |   bluhm <bluhm@openbsd.org> | 2018-12-03 18:39:42 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2018-12-03 18:39:42 +0000 |
| commit | e491a02f2dfd8a839ae6033d539c17e37cb9d89a (patch) | |
| tree | c24862f4abe6e750744639460649e637c8cb831f | |
| parent | Convert more MH_ALIGN() to m_align(). Also switch from m_gethdr/M_GETHDR (diff) | |
| download | wireguard-openbsd-e491a02f2dfd8a839ae6033d539c17e37cb9d89a.tar.xz wireguard-openbsd-e491a02f2dfd8a839ae6033d539c17e37cb9d89a.zip | |
The field dom_rtkeylen has been removed from struct domain. Convert
to designated initializers and adapt the test. Fix white space.
| -rw-r--r-- | regress/sys/net/rtable/util.c | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/regress/sys/net/rtable/util.c b/regress/sys/net/rtable/util.c index ea037b9409f..50756a1c2b5 100644 --- a/regress/sys/net/rtable/util.c +++ b/regress/sys/net/rtable/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.7 2018/06/23 09:54:16 denis Exp $ */ +/* $OpenBSD: util.c,v 1.8 2018/12/03 18:39:42 bluhm Exp $ */ /* * Copyright (c) 2015 Martin Pieuchot @@ -69,15 +69,31 @@ struct sockaddr *rt_plen2mask(struct rtentry *, struct sockaddr_in6 *); struct domain inetdomain = { - AF_INET, "inet", NULL, NULL, NULL, NULL, NULL, - sizeof(struct sockaddr_in), offsetof(struct sockaddr_in, sin_addr), - 32, + .dom_family = AF_INET, + .dom_name = "inet", + .dom_init = NULL, + .dom_externalize = NULL, + .dom_dispose = NULL, + .dom_protosw = NULL, + .dom_protoswNPROTOSW = NULL, + .dom_rtoffset = offsetof(struct sockaddr_in, sin_addr), + .dom_maxplen = 32, + .dom_ifattach = NULL, + .dom_ifdetach = NULL, }; struct domain inet6domain = { - AF_INET6, "inet6", NULL, NULL, NULL, NULL, NULL, - sizeof(struct sockaddr_in6), offsetof(struct sockaddr_in6, sin6_addr), - 128, + .dom_family = AF_INET6, + .dom_name = "inet6", + .dom_init = NULL, + .dom_externalize = NULL, + .dom_dispose = NULL, + .dom_protosw = NULL, + .dom_protoswNPROTOSW = NULL, + .dom_rtoffset = offsetof(struct sockaddr_in6, sin6_addr), + .dom_maxplen = 128, + .dom_ifattach = NULL, + .dom_ifdetach = NULL, }; struct domain *domains[] = { &inetdomain, &inet6domain, NULL }; @@ -500,4 +516,3 @@ rt_hash(struct rtentry *rt, struct sockaddr *dst, uint32_t *src) return (c & 0xffff); } - |