Commit 3d93657c authored by Robert Lubos's avatar Robert Lubos Committed by Anas Nashif
Browse files

net: if: Add const qualifier to addr pointer where applicable 

Some APIs taken in_addr/in6_addr pointer w/o const qualifier, while they
do not actually intend to modify the provided address. This commit
adds the missing const qualifier where applicable.

Signed-off-by: default avatarRobert Lubos <robert.lubos@nordicsemi.no>
parent cb018eae

include/zephyr/net/net_if.h

+15 −15
Changes for include/zephyr/net/net_if.h: 15 added lines, 15 removed lines.
Original line number Diff line number Diff line
@@ -1553,7 +1553,7 @@ struct net_if_addr *net_if_ipv6_addr_lookup_by_iface_raw(struct net_if *iface, 
 * @return Pointer to interface address, NULL if not found.

 */

struct net_if_addr *net_if_ipv6_addr_lookup_by_iface(struct net_if *iface,

						     struct in6_addr *addr);

						     const struct in6_addr *addr);



/**

 * @brief Check if this IPv6 address belongs to one of the interface indices.
@@ -1576,7 +1576,7 @@ __syscall int net_if_ipv6_addr_lookup_by_index(const struct in6_addr *addr); 
 * @return Pointer to interface address, NULL if cannot be added

 */

struct net_if_addr *net_if_ipv6_addr_add(struct net_if *iface,

					 struct in6_addr *addr,

					 const struct in6_addr *addr,

					 enum net_addr_type addr_type,

					 uint32_t vlifetime);
@@ -1591,7 +1591,7 @@ struct net_if_addr *net_if_ipv6_addr_add(struct net_if *iface, 
 * @return True if ok, false if address could not be added

 */

__syscall bool net_if_ipv6_addr_add_by_index(int index,

					     struct in6_addr *addr,

					     const struct in6_addr *addr,

					     enum net_addr_type addr_type,

					     uint32_t vlifetime);
@@ -1828,7 +1828,7 @@ struct net_if_ipv6_prefix *net_if_ipv6_prefix_get(struct net_if *iface, 
 * @return Pointer to prefix, NULL if not found.

 */

struct net_if_ipv6_prefix *net_if_ipv6_prefix_lookup(struct net_if *iface,

						     struct in6_addr *addr,

						     const struct in6_addr *addr,

						     uint8_t len);



/**
@@ -1842,7 +1842,7 @@ struct net_if_ipv6_prefix *net_if_ipv6_prefix_lookup(struct net_if *iface, 
 * @return Pointer to prefix, NULL if the prefix was not added.

 */

struct net_if_ipv6_prefix *net_if_ipv6_prefix_add(struct net_if *iface,

						  struct in6_addr *prefix,

						  const struct in6_addr *prefix,

						  uint8_t len,

						  uint32_t lifetime);
@@ -1855,7 +1855,7 @@ struct net_if_ipv6_prefix *net_if_ipv6_prefix_add(struct net_if *iface, 
 *

 * @return True if successfully removed, false otherwise

 */

bool net_if_ipv6_prefix_rm(struct net_if *iface, struct in6_addr *addr,

bool net_if_ipv6_prefix_rm(struct net_if *iface, const struct in6_addr *addr,

			   uint8_t len);



/**
@@ -1896,7 +1896,7 @@ void net_if_ipv6_prefix_unset_timer(struct net_if_ipv6_prefix *prefix); 
 *

 * @return True if address is part of our subnet, false otherwise

 */

bool net_if_ipv6_addr_onlink(struct net_if **iface, struct in6_addr *addr);

bool net_if_ipv6_addr_onlink(struct net_if **iface, const struct in6_addr *addr);



/**

 * @brief Get the IPv6 address of the given router
@@ -1934,7 +1934,7 @@ static inline struct in6_addr *net_if_router_ipv6(struct net_if_router *router) 
 * @return Pointer to router information, NULL if cannot be found

 */

struct net_if_router *net_if_ipv6_router_lookup(struct net_if *iface,

						struct in6_addr *addr);

						const struct in6_addr *addr);



/**

 * @brief Find default router for this IPv6 address.
@@ -1946,7 +1946,7 @@ struct net_if_router *net_if_ipv6_router_lookup(struct net_if *iface, 
 * @return Pointer to router information, NULL if cannot be found

 */

struct net_if_router *net_if_ipv6_router_find_default(struct net_if *iface,

						      struct in6_addr *addr);

						      const struct in6_addr *addr);



/**

 * @brief Update validity lifetime time of a router.
@@ -1967,7 +1967,7 @@ void net_if_ipv6_router_update_lifetime(struct net_if_router *router, 
 * @return Pointer to router information, NULL if could not be added

 */

struct net_if_router *net_if_ipv6_router_add(struct net_if *iface,

					     struct in6_addr *addr,

					     const struct in6_addr *addr,

					     uint16_t router_lifetime);



/**
@@ -2421,7 +2421,7 @@ struct net_if_addr *net_if_ipv4_addr_lookup(const struct in_addr *addr, 
 * @return Pointer to interface address, NULL if cannot be added

 */

struct net_if_addr *net_if_ipv4_addr_add(struct net_if *iface,

					 struct in_addr *addr,

					 const struct in_addr *addr,

					 enum net_addr_type addr_type,

					 uint32_t vlifetime);
@@ -2456,7 +2456,7 @@ __syscall int net_if_ipv4_addr_lookup_by_index(const struct in_addr *addr); 
 * @return True if ok, false if the address could not be added

 */

__syscall bool net_if_ipv4_addr_add_by_index(int index,

					     struct in_addr *addr,

					     const struct in_addr *addr,

					     enum net_addr_type addr_type,

					     uint32_t vlifetime);
@@ -2597,7 +2597,7 @@ static inline struct in_addr *net_if_router_ipv4(struct net_if_router *router) 
 * @return Pointer to router information, NULL if cannot be found

 */

struct net_if_router *net_if_ipv4_router_lookup(struct net_if *iface,

						struct in_addr *addr);

						const struct in_addr *addr);



/**

 * @brief Find default router for this IPv4 address.
@@ -2609,7 +2609,7 @@ struct net_if_router *net_if_ipv4_router_lookup(struct net_if *iface, 
 * @return Pointer to router information, NULL if cannot be found

 */

struct net_if_router *net_if_ipv4_router_find_default(struct net_if *iface,

						      struct in_addr *addr);

						      const struct in_addr *addr);

/**

 * @brief Add IPv4 router to the system.

 *
@@ -2621,7 +2621,7 @@ struct net_if_router *net_if_ipv4_router_find_default(struct net_if *iface, 
 * @return Pointer to router information, NULL if could not be added

 */

struct net_if_router *net_if_ipv4_router_add(struct net_if *iface,

					     struct in_addr *addr,

					     const struct in_addr *addr,

					     bool is_default,

					     uint16_t router_lifetime);

include/zephyr/net/net_ip.h

+2 −2
Changes for include/zephyr/net/net_ip.h: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ static inline bool net_ipv6_is_addr_loopback_raw(const uint8_t *addr) 
 *

 * @return True if address is a loopback address, False otherwise.

 */

static inline bool net_ipv6_is_addr_loopback(struct in6_addr *addr)

static inline bool net_ipv6_is_addr_loopback(const struct in6_addr *addr)

{

	return net_ipv6_is_addr_loopback_raw(addr->s6_addr);

}
@@ -845,7 +845,7 @@ static inline bool net_ipv4_is_addr_loopback_raw(const uint8_t *addr) 
 *

 * @return True if address is a loopback address, False otherwise.

 */

static inline bool net_ipv4_is_addr_loopback(struct in_addr *addr)

static inline bool net_ipv4_is_addr_loopback(const struct in_addr *addr)

{

	return net_ipv4_is_addr_loopback_raw(addr->s4_addr);

}

subsys/net/ip/net_if.c

+30 −28
Changes for subsys/net/ip/net_if.c: 30 added lines, 28 removed lines.
Original line number Diff line number Diff line
@@ -719,7 +719,8 @@ static uint8_t get_ipaddr_diff(const uint8_t *src, const uint8_t *dst, int addr_ 


#if defined(CONFIG_NET_NATIVE_IPV4) || defined(CONFIG_NET_NATIVE_IPV6)

static struct net_if_router *iface_router_lookup(struct net_if *iface,

						 uint8_t family, void *addr)

						 uint8_t family,

						 const void *addr)

{

	struct net_if_router *router = NULL;

	int i;
@@ -735,10 +736,10 @@ static struct net_if_router *iface_router_lookup(struct net_if *iface, 


		if ((IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6 &&

		     net_ipv6_addr_cmp(net_if_router_ipv6(&routers[i]),

				       (struct in6_addr *)addr)) ||

				       (const struct in6_addr *)addr)) ||

		    (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET &&

		     net_ipv4_addr_cmp(net_if_router_ipv4(&routers[i]),

				       (struct in_addr *)addr))) {

				       (const struct in_addr *)addr))) {

			router = &routers[i];

			goto out;

		}
@@ -849,7 +850,7 @@ static void iface_router_expired(struct k_work *work) 
}



static struct net_if_router *iface_router_add(struct net_if *iface,

					      uint8_t family, void *addr,

					      uint8_t family, const void *addr,

					      bool is_default,

					      uint16_t lifetime)

{
@@ -959,7 +960,8 @@ void net_if_router_rm(struct net_if_router *router) 
}



static struct net_if_router *iface_router_find_default(struct net_if *iface,

						       uint8_t family, void *addr)

						       uint8_t family,

						       const void *addr)

{

	struct net_if_router *router = NULL;

	int i;
@@ -1909,7 +1911,7 @@ out: 
}



struct net_if_addr *net_if_ipv6_addr_lookup_by_iface(struct net_if *iface,

						     struct in6_addr *addr)

						     const struct in6_addr *addr)

{

	return net_if_ipv6_addr_lookup_by_iface_raw(iface, addr->s6_addr);

}
@@ -1957,7 +1959,7 @@ void net_if_ipv6_addr_update_lifetime(struct net_if_addr *ifaddr, 
}



static struct net_if_addr *ipv6_addr_find(struct net_if *iface,

					  struct in6_addr *addr)

					  const struct in6_addr *addr)

{

	struct net_if_ipv6 *ipv6 = iface->config.ip.ipv6;
@@ -1977,7 +1979,7 @@ static struct net_if_addr *ipv6_addr_find(struct net_if *iface, 
}



static inline void net_if_addr_init(struct net_if_addr *ifaddr,

				    struct in6_addr *addr,

				    const struct in6_addr *addr,

				    enum net_addr_type addr_type,

				    uint32_t vlifetime)

{
@@ -2006,7 +2008,7 @@ static inline void net_if_addr_init(struct net_if_addr *ifaddr, 
}



struct net_if_addr *net_if_ipv6_addr_add(struct net_if *iface,

					 struct in6_addr *addr,

					 const struct in6_addr *addr,

					 enum net_addr_type addr_type,

					 uint32_t vlifetime)

{
@@ -2135,7 +2137,7 @@ out: 
}



bool z_impl_net_if_ipv6_addr_add_by_index(int index,

					  struct in6_addr *addr,

					  const struct in6_addr *addr,

					  enum net_addr_type addr_type,

					  uint32_t vlifetime)

{
@@ -2152,7 +2154,7 @@ bool z_impl_net_if_ipv6_addr_add_by_index(int index, 


#ifdef CONFIG_USERSPACE

bool z_vrfy_net_if_ipv6_addr_add_by_index(int index,

					  struct in6_addr *addr,

					  const struct in6_addr *addr,

					  enum net_addr_type addr_type,

					  uint32_t vlifetime)

{
@@ -2550,7 +2552,7 @@ out: 
#if defined(CONFIG_NET_NATIVE_IPV6)

static void remove_prefix_addresses(struct net_if *iface,

				    struct net_if_ipv6 *ipv6,

				    struct in6_addr *addr,

				    const struct in6_addr *addr,

				    uint8_t len)

{

	ARRAY_FOR_EACH(ipv6->unicast, i) {
@@ -2690,7 +2692,7 @@ static void prefix_start_timer(struct net_if_ipv6_prefix *ifprefix, 
}



static struct net_if_ipv6_prefix *ipv6_prefix_find(struct net_if *iface,

						   struct in6_addr *prefix,

						   const struct in6_addr *prefix,

						   uint8_t prefix_len)

{

	struct net_if_ipv6 *ipv6 = iface->config.ip.ipv6;
@@ -2715,7 +2717,7 @@ static struct net_if_ipv6_prefix *ipv6_prefix_find(struct net_if *iface, 


static void net_if_ipv6_prefix_init(struct net_if *iface,

				    struct net_if_ipv6_prefix *ifprefix,

				    struct in6_addr *addr, uint8_t len,

				    const struct in6_addr *addr, uint8_t len,

				    uint32_t lifetime)

{

	ifprefix->is_used = true;
@@ -2731,7 +2733,7 @@ static void net_if_ipv6_prefix_init(struct net_if *iface, 
}



struct net_if_ipv6_prefix *net_if_ipv6_prefix_add(struct net_if *iface,

						  struct in6_addr *prefix,

						  const struct in6_addr *prefix,

						  uint8_t len,

						  uint32_t lifetime)

{
@@ -2788,7 +2790,7 @@ out: 
	return ifprefix;

}



bool net_if_ipv6_prefix_rm(struct net_if *iface, struct in6_addr *addr,

bool net_if_ipv6_prefix_rm(struct net_if *iface, const struct in6_addr *addr,

			   uint8_t len)

{

	bool ret = false;
@@ -2896,7 +2898,7 @@ out: 
}



struct net_if_ipv6_prefix *net_if_ipv6_prefix_lookup(struct net_if *iface,

						     struct in6_addr *addr,

						     const struct in6_addr *addr,

						     uint8_t len)

{

	struct net_if_ipv6_prefix *prefix = NULL;
@@ -2927,7 +2929,7 @@ out: 
	return prefix;

}



bool net_if_ipv6_addr_onlink(struct net_if **iface, struct in6_addr *addr)

bool net_if_ipv6_addr_onlink(struct net_if **iface, const struct in6_addr *addr)

{

	bool ret = false;
@@ -2991,13 +2993,13 @@ void net_if_ipv6_prefix_unset_timer(struct net_if_ipv6_prefix *prefix) 
}



struct net_if_router *net_if_ipv6_router_lookup(struct net_if *iface,

						struct in6_addr *addr)

						const struct in6_addr *addr)

{

	return iface_router_lookup(iface, AF_INET6, addr);

}



struct net_if_router *net_if_ipv6_router_find_default(struct net_if *iface,

						      struct in6_addr *addr)

						      const struct in6_addr *addr)

{

	return iface_router_find_default(iface, AF_INET6, addr);

}
@@ -3016,7 +3018,7 @@ void net_if_ipv6_router_update_lifetime(struct net_if_router *router, 
}



struct net_if_router *net_if_ipv6_router_add(struct net_if *iface,

					     struct in6_addr *addr,

					     const struct in6_addr *addr,

					     uint16_t lifetime)

{

	return iface_router_add(iface, AF_INET6, addr, false, lifetime);
@@ -4377,7 +4379,7 @@ bool z_vrfy_net_if_ipv4_set_gw_by_index(int index, 
#endif /* CONFIG_USERSPACE */



static struct net_if_addr *ipv4_addr_find(struct net_if *iface,

					  struct in_addr *addr)

					  const struct in_addr *addr)

{

	struct net_if_ipv4 *ipv4 = iface->config.ip.ipv4;
@@ -4526,7 +4528,7 @@ out: 
#endif /* CONFIG_NET_IPV4_ACD */



struct net_if_addr *net_if_ipv4_addr_add(struct net_if *iface,

					 struct in_addr *addr,

					 const struct in_addr *addr,

					 enum net_addr_type addr_type,

					 uint32_t vlifetime)

{
@@ -4671,7 +4673,7 @@ out: 
}



bool z_impl_net_if_ipv4_addr_add_by_index(int index,

					  struct in_addr *addr,

					  const struct in_addr *addr,

					  enum net_addr_type addr_type,

					  uint32_t vlifetime)

{
@@ -4689,7 +4691,7 @@ bool z_impl_net_if_ipv4_addr_add_by_index(int index, 


#ifdef CONFIG_USERSPACE

bool z_vrfy_net_if_ipv4_addr_add_by_index(int index,

					  struct in_addr *addr,

					  const struct in_addr *addr,

					  enum net_addr_type addr_type,

					  uint32_t vlifetime)

{
@@ -5027,19 +5029,19 @@ out: 
}



struct net_if_router *net_if_ipv4_router_lookup(struct net_if *iface,

						struct in_addr *addr)

						const struct in_addr *addr)

{

	return iface_router_lookup(iface, AF_INET, addr);

}



struct net_if_router *net_if_ipv4_router_find_default(struct net_if *iface,

						      struct in_addr *addr)

						      const struct in_addr *addr)

{

	return iface_router_find_default(iface, AF_INET, addr);

}



struct net_if_router *net_if_ipv4_router_add(struct net_if *iface,

					     struct in_addr *addr,

					     const struct in_addr *addr,

					     bool is_default,

					     uint16_t lifetime)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE