Skip to content
Snippets Groups Projects
Unverified Commit 8f7de7c2 authored by Sebastian Meiling's avatar Sebastian Meiling Committed by GitHub
Browse files

Merge pull request #8179 from miri64/gnrc_ipv6_nib/api/NULL-l2addr

gnrc_ipv6_nib: Allow l2addr == NULL for gnrc_ipv6_nib_nc_set()
parents 19d983be 7d20a80b
No related branches found
No related tags found
No related merge requests found
...@@ -207,7 +207,7 @@ static inline unsigned gnrc_ipv6_nib_nc_get_ar_state(const gnrc_ipv6_nib_nc_t *e ...@@ -207,7 +207,7 @@ static inline unsigned gnrc_ipv6_nib_nc_get_ar_state(const gnrc_ipv6_nib_nc_t *e
/** /**
* @brief Adds an unmanaged neighbor entry to NIB * @brief Adds an unmanaged neighbor entry to NIB
* *
* @pre `(ipv6 != NULL) && (l2addr != NULL)` * @pre `ipv6 != NULL`
* @pre `l2addr_len <= GNRC_IPV6_NIB_L2ADDR_MAX_LEN` * @pre `l2addr_len <= GNRC_IPV6_NIB_L2ADDR_MAX_LEN`
* @pre `(iface > KERNEL_PID_UNDEF) && (iface <= KERNEL_PID_LAST)` * @pre `(iface > KERNEL_PID_UNDEF) && (iface <= KERNEL_PID_LAST)`
* *
......
...@@ -29,7 +29,7 @@ int gnrc_ipv6_nib_nc_set(const ipv6_addr_t *ipv6, unsigned iface, ...@@ -29,7 +29,7 @@ int gnrc_ipv6_nib_nc_set(const ipv6_addr_t *ipv6, unsigned iface,
{ {
_nib_onl_entry_t *node; _nib_onl_entry_t *node;
assert((ipv6 != NULL) && (l2addr != NULL)); assert(ipv6 != NULL);
assert(l2addr_len <= GNRC_IPV6_NIB_L2ADDR_MAX_LEN); assert(l2addr_len <= GNRC_IPV6_NIB_L2ADDR_MAX_LEN);
assert((iface > KERNEL_PID_UNDEF) && (iface <= KERNEL_PID_LAST)); assert((iface > KERNEL_PID_UNDEF) && (iface <= KERNEL_PID_LAST));
mutex_lock(&_nib_mutex); mutex_lock(&_nib_mutex);
...@@ -39,7 +39,9 @@ int gnrc_ipv6_nib_nc_set(const ipv6_addr_t *ipv6, unsigned iface, ...@@ -39,7 +39,9 @@ int gnrc_ipv6_nib_nc_set(const ipv6_addr_t *ipv6, unsigned iface,
return -ENOMEM; return -ENOMEM;
} }
#if GNRC_IPV6_NIB_CONF_ARSM #if GNRC_IPV6_NIB_CONF_ARSM
memcpy(node->l2addr, l2addr, l2addr_len); if ((l2addr != NULL) && (l2addr_len > 0)) {
memcpy(node->l2addr, l2addr, l2addr_len);
}
node->l2addr_len = l2addr_len; node->l2addr_len = l2addr_len;
#else #else
(void)l2addr; (void)l2addr;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment