abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-06-16 09:53:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

nd6: add cast of nd6_find_option to struct pointer

Browse Source 
GCC compiler complained:

../../../../src/core/ipv6/nd6.c:861:16: error: request for implicit conversion from ‘void *’ to ‘struct lladdr_option *’ not permitted in C++ [-Werror=c++-compat]
  861 |     lladdr_opt = nd6_find_option(p, sizeof(*redir_hdr), ND6_OPTION_TYPE_TARGET_LLADDR);
      |                ^
cc1: all warnings being treated as errors
This commit is contained in:
Erik Ekman
2026-06-02 23:04:23 +02:00
parent 0a65e65494
commit db4e4c9d0e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/ipv6/nd6.c
View File

@@ -394,7 +394,8 @@ nd6_input(struct pbuf *p, struct netif *inp)
} }
#endif /* LWIP_IPV6_DUP_DETECT_ATTEMPTS */ #endif /* LWIP_IPV6_DUP_DETECT_ATTEMPTS */
lladdr_opt = nd6_find_option(p, sizeof(*na_hdr), ND6_OPTION_TYPE_TARGET_LLADDR); lladdr_opt = (struct lladdr_option *)
nd6_find_option(p, sizeof(*na_hdr), ND6_OPTION_TYPE_TARGET_LLADDR);
if (!lladdr_opt) { if (!lladdr_opt) {
/* Missing target lladdr option, or did not fully fit inside p */ /* Missing target lladdr option, or did not fully fit inside p */
pbuf_free(p); pbuf_free(p);
@@ -426,7 +427,8 @@ nd6_input(struct pbuf *p, struct netif *inp)
/* Update cache entry. */ /* Update cache entry. */
if ((na_hdr->flags & ND6_FLAG_OVERRIDE) || if ((na_hdr->flags & ND6_FLAG_OVERRIDE) ||
(neighbor_cache[i].state == ND6_INCOMPLETE)) { (neighbor_cache[i].state == ND6_INCOMPLETE)) {
lladdr_opt = nd6_find_option(p, sizeof(*na_hdr), ND6_OPTION_TYPE_TARGET_LLADDR); lladdr_opt = (struct lladdr_option *)
nd6_find_option(p, sizeof(*na_hdr), ND6_OPTION_TYPE_TARGET_LLADDR);
if (!lladdr_opt) { if (!lladdr_opt) {
/* Missing target lladdr option, or did not fully fit inside p */ /* Missing target lladdr option, or did not fully fit inside p */
pbuf_free(p); pbuf_free(p);
@@ -486,7 +488,8 @@ nd6_input(struct pbuf *p, struct netif *inp)
/* @todo RFC MUST: if IP source is 'any', there is no source LL address option */ /* @todo RFC MUST: if IP source is 'any', there is no source LL address option */
/* Check if there is a link-layer address provided. Only point to it if in this buffer. */ /* Check if there is a link-layer address provided. Only point to it if in this buffer. */
lladdr_opt = nd6_find_option(p, sizeof(*ns_hdr), ND6_OPTION_TYPE_SOURCE_LLADDR); lladdr_opt = (struct lladdr_option*)
nd6_find_option(p, sizeof(*ns_hdr), ND6_OPTION_TYPE_SOURCE_LLADDR);
/* Check if the target address is configured on the receiving netif. */ /* Check if the target address is configured on the receiving netif. */
accepted = 0; accepted = 0;
@@ -858,7 +861,8 @@ nd6_input(struct pbuf *p, struct netif *inp)
/* @todo RFC MUST: all included options have a length greater than zero */ /* @todo RFC MUST: all included options have a length greater than zero */
/* Check if there is a link-layer address provided. Only point to it if in this buffer. */ /* Check if there is a link-layer address provided. Only point to it if in this buffer. */
lladdr_opt = nd6_find_option(p, sizeof(*redir_hdr), ND6_OPTION_TYPE_TARGET_LLADDR); lladdr_opt = (struct lladdr_option *)
nd6_find_option(p, sizeof(*redir_hdr), ND6_OPTION_TYPE_TARGET_LLADDR);
/* Find dest address in cache */ /* Find dest address in cache */
dest_idx = nd6_find_destination_cache_entry(&destination_address); dest_idx = nd6_find_destination_cache_entry(&destination_address);