mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-25 18:14:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

netif: Remove unnecessary NULL checking in netif_do_set_{ipaddr|netmask|gw}

Browse Source 
The callers already ensure the ipaddr/netmask/gw won't be NULL, so remove
the duplicated NULL checking in these static functions.
While at it, also move the code saving old_address for netmask/gw as
it's only used when address is actually being changed.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Dirk Ziegelmeier <dirk@ziegelmeier.net>
This commit is contained in:
Axel Lin 2018-01-09 15:08:22 +08:00 committed by Dirk Ziegelmeier
parent 0795e289eb
commit deab51c36d
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/netif.c
View File

@ -426,7 +426,7 @@ netif_do_set_ipaddr(struct netif *netif, const ip4_addr_t *ipaddr, u8_t callback
{ {
ip_addr_t new_addr; ip_addr_t new_addr;
*ip_2_ip4(&new_addr) = (ipaddr ? *ipaddr : *IP4_ADDR_ANY4); *ip_2_ip4(&new_addr) = *ipaddr;
IP_SET_TYPE_VAL(new_addr, IPADDR_TYPE_V4); IP_SET_TYPE_VAL(new_addr, IPADDR_TYPE_V4);
/* address is actually being changed? */ /* address is actually being changed? */
@ -492,7 +492,8 @@ netif_set_ipaddr(struct netif *netif, const ip4_addr_t *ipaddr)
static void static void
netif_do_set_netmask(struct netif *netif, const ip4_addr_t *netmask, u8_t callback) netif_do_set_netmask(struct netif *netif, const ip4_addr_t *netmask, u8_t callback)
{ {
const ip4_addr_t *safe_netmask = netmask ? netmask : IP4_ADDR_ANY4; /* address is actually being changed? */
if (ip4_addr_cmp(netmask, netif_ip4_netmask(netif)) == 0) {
#if LWIP_NETIF_EXT_STATUS_CALLBACK #if LWIP_NETIF_EXT_STATUS_CALLBACK
netif_ext_callback_args_t args; netif_ext_callback_args_t args;
ip_addr_t old_addr; ip_addr_t old_addr;
@ -500,8 +501,6 @@ netif_do_set_netmask(struct netif *netif, const ip4_addr_t *netmask, u8_t callba
args.ipv4_nm_changed.old_address = &old_addr; args.ipv4_nm_changed.old_address = &old_addr;
#endif #endif
/* address is actually being changed? */
if (ip4_addr_cmp(safe_netmask, netif_ip4_netmask(netif)) == 0) {
mib2_remove_route_ip4(0, netif); mib2_remove_route_ip4(0, netif);
/* set new netmask to netif */ /* set new netmask to netif */
ip4_addr_set(ip_2_ip4(&netif->netmask), netmask); ip4_addr_set(ip_2_ip4(&netif->netmask), netmask);
@ -546,7 +545,8 @@ netif_set_netmask(struct netif *netif, const ip4_addr_t *netmask)
static void static void
netif_do_set_gw(struct netif *netif, const ip4_addr_t *gw, u8_t callback) netif_do_set_gw(struct netif *netif, const ip4_addr_t *gw, u8_t callback)
{ {
const ip4_addr_t *safe_gw = gw ? gw : IP4_ADDR_ANY4; /* address is actually being changed? */
if (ip4_addr_cmp(gw, netif_ip4_gw(netif)) == 0) {
#if LWIP_NETIF_EXT_STATUS_CALLBACK #if LWIP_NETIF_EXT_STATUS_CALLBACK
netif_ext_callback_args_t args; netif_ext_callback_args_t args;
ip_addr_t old_addr; ip_addr_t old_addr;
@ -554,8 +554,6 @@ netif_do_set_gw(struct netif *netif, const ip4_addr_t *gw, u8_t callback)
args.ipv4_gw_changed.old_address = &old_addr; args.ipv4_gw_changed.old_address = &old_addr;
#endif #endif
/* address is actually being changed? */
if (ip4_addr_cmp(safe_gw, netif_ip4_gw(netif)) == 0) {
ip4_addr_set(ip_2_ip4(&netif->gw), gw); ip4_addr_set(ip_2_ip4(&netif->gw), gw);
IP_SET_TYPE_VAL(netif->gw, IPADDR_TYPE_V4); IP_SET_TYPE_VAL(netif->gw, IPADDR_TYPE_V4);
LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("netif: GW address of interface %c%c set to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n", LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("netif: GW address of interface %c%c set to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",