From f8175ea00f8441c14115efc013e9d45115dc0e7a Mon Sep 17 00:00:00 2001 From: "Alexander V. Chernikov" Date: Fri, 23 Dec 2022 17:57:09 +0000 Subject: [PATCH] netlink: fix test-includes broken by f2c8381fce9b Reported by: many (cherry picked from commit c89209c674f2c867a2a3a4cccd4760311399d7e4) --- sys/netlink/netlink_snl.h | 34 ++++++++++++++++++--------------- sys/netlink/netlink_snl_route.h | 12 ++++++------ 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h index 1fafa37c6dc..6e2c4b89a7c 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -58,7 +58,7 @@ #define NLA_TYPE(_nla) ((_nla)->nla_type & 0x3FFF) -#define NLA_NEXT(_attr) (struct nlattr *)((char *)_attr + NLA_ALIGN(_attr->nla_len)) +#define NLA_NEXT(_attr) (struct nlattr *)(void *)((char *)_attr + NLA_ALIGN(_attr->nla_len)) #define _NLA_END(_start, _len) ((char *)(_start) + (_len)) #define NLA_FOREACH(_attr, _start, _len) \ @@ -241,7 +241,7 @@ snl_read_message(struct snl_state *ss) return (NULL); } } - struct nlmsghdr *hdr = (struct nlmsghdr *)&ss->buf[ss->off]; + struct nlmsghdr *hdr = (struct nlmsghdr *)(void *)&ss->buf[ss->off]; ss->off += NLMSG_ALIGN(hdr->nlmsg_len); return (hdr); } @@ -313,7 +313,7 @@ snl_parse_attrs(struct snl_state *ss, struct nlmsghdr *hdr, int hdrlen, { int off = NLMSG_HDRLEN + NETLINK_ALIGN(hdrlen); int len = hdr->nlmsg_len - off; - struct nlattr *nla_head = (struct nlattr *)((char *)hdr + off); + struct nlattr *nla_head = (struct nlattr *)(void *)((char *)hdr + off); return (snl_parse_attrs_raw(ss, nla_head, len, ps, pslen, target)); } @@ -331,7 +331,7 @@ snl_parse_header(struct snl_state *ss, void *hdr, int len, fp->cb(ss, src, dst); } - struct nlattr *nla_head = (struct nlattr *)((char *)hdr + parser->hdr_off); + struct nlattr *nla_head = (struct nlattr *)(void *)((char *)hdr + parser->hdr_off); bool result = snl_parse_attrs_raw(ss, nla_head, len - parser->hdr_off, parser->np, parser->np_size, target); @@ -346,7 +346,7 @@ snl_parse_nlmsg(struct snl_state *ss, struct nlmsghdr *hdr, } static inline bool -snl_attr_get_flag(struct snl_state *ss, struct nlattr *nla, void *target) +snl_attr_get_flag(struct snl_state *ss __unused, struct nlattr *nla, void *target) { if (NLA_DATA_LEN(nla) == 0) { *((uint8_t *)target) = 1; @@ -356,27 +356,30 @@ snl_attr_get_flag(struct snl_state *ss, struct nlattr *nla, void *target) } static inline bool -snl_attr_get_uint16(struct snl_state *ss, struct nlattr *nla, const void *arg, void *target) +snl_attr_get_uint16(struct snl_state *ss __unused, struct nlattr *nla, + const void *arg __unused, void *target) { if (NLA_DATA_LEN(nla) == sizeof(uint16_t)) { - *((uint16_t *)target) = *((const uint16_t *)NL_RTA_DATA_CONST(nla)); + *((uint16_t *)target) = *((const uint16_t *)NLA_DATA_CONST(nla)); return (true); } return (false); } static inline bool -snl_attr_get_uint32(struct snl_state *ss, struct nlattr *nla, const void *arg, void *target) +snl_attr_get_uint32(struct snl_state *ss __unused, struct nlattr *nla, + const void *arg __unused, void *target) { if (NLA_DATA_LEN(nla) == sizeof(uint32_t)) { - *((uint32_t *)target) = *((const uint32_t *)NL_RTA_DATA_CONST(nla)); + *((uint32_t *)target) = *((const uint32_t *)NLA_DATA_CONST(nla)); return (true); } return (false); } static inline bool -snl_attr_get_string(struct snl_state *ss, struct nlattr *nla, const void *arg, void *target) +snl_attr_get_string(struct snl_state *ss __unused, struct nlattr *nla, + const void *arg __unused, void *target) { size_t maxlen = NLA_DATA_LEN(nla); @@ -388,7 +391,8 @@ snl_attr_get_string(struct snl_state *ss, struct nlattr *nla, const void *arg, v } static inline bool -snl_attr_get_stringn(struct snl_state *ss, struct nlattr *nla, const void *arg, void *target) +snl_attr_get_stringn(struct snl_state *ss, struct nlattr *nla, + const void *arg __unused, void *target) { int maxlen = NLA_DATA_LEN(nla); @@ -412,26 +416,26 @@ snl_attr_get_nested(struct snl_state *ss, struct nlattr *nla, const void *arg, v } static inline bool -snl_attr_get_nla(struct snl_state *ss, struct nlattr *nla, void *target) +snl_attr_get_nla(struct snl_state *ss __unused, struct nlattr *nla, void *target) { *((struct nlattr **)target) = nla; return (true); } static inline void -snl_field_get_uint8(struct snl_state *ss, void *src, void *target) +snl_field_get_uint8(struct snl_state *ss __unused, void *src, void *target) { *((uint8_t *)target) = *((uint8_t *)src); } static inline void -snl_field_get_uint16(struct snl_state *ss, void *src, void *target) +snl_field_get_uint16(struct snl_state *ss __unused, void *src, void *target) { *((uint16_t *)target) = *((uint16_t *)src); } static inline void -snl_field_get_uint32(struct snl_state *ss, void *src, void *target) +snl_field_get_uint32(struct snl_state *ss __unused, void *src, void *target) { *((uint32_t *)target) = *((uint32_t *)src); } diff --git a/sys/netlink/netlink_snl_route.h b/sys/netlink/netlink_snl_route.h index 34dfb00a09c..4adb3d697ec 100644 --- a/sys/netlink/netlink_snl_route.h +++ b/sys/netlink/netlink_snl_route.h @@ -35,14 +35,12 @@ * Simple Netlink Library - NETLINK_ROUTE helpers */ -#define snl_alloc_sockaddr(_ss, _len) ((struct sockaddr *)(snl_allocz(_ss, _len))) - static inline struct sockaddr * parse_rta_ip4(struct snl_state *ss, void *rta_data, int *perror) { struct sockaddr_in *sin; - sin = (struct sockaddr_in *)snl_alloc_sockaddr(ss, sizeof(struct sockaddr_in)); + sin = (struct sockaddr_in *)snl_allocz(ss, sizeof(struct sockaddr_in)); if (sin == NULL) { *perror = ENOBUFS; return (NULL); @@ -58,7 +56,7 @@ parse_rta_ip6(struct snl_state *ss, void *rta_data, int *perror) { struct sockaddr_in6 *sin6; - sin6 = (struct sockaddr_in6 *)snl_alloc_sockaddr(ss, sizeof(struct sockaddr_in6)); + sin6 = (struct sockaddr_in6 *)snl_allocz(ss, sizeof(struct sockaddr_in6)); if (sin6 == NULL) { *perror = ENOBUFS; return (NULL); @@ -87,7 +85,8 @@ parse_rta_ip(struct snl_state *ss, struct rtattr *rta, int *perror) } static inline bool -snl_attr_get_ip(struct snl_state *ss, struct nlattr *nla, const void *arg, void *target) +snl_attr_get_ip(struct snl_state *ss, struct nlattr *nla, + const void *arg __unused, void *target) { int error = 0; struct sockaddr *sa = parse_rta_ip(ss, (struct rtattr *)nla, &error); @@ -115,7 +114,8 @@ parse_rta_via(struct snl_state *ss, struct rtattr *rta, int *perror) } static inline bool -snl_attr_get_ipvia(struct snl_state *ss, struct nlattr *nla, const void *arg, void *target) +snl_attr_get_ipvia(struct snl_state *ss, struct nlattr *nla, + const void *arg __unused, void *target) { int error = 0; -- 2.45.0