riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gnrc_netif: generalise address search functions

Browse Source 
Reduce code duplication by combining internal helper functions
    that either loop over interface addresses or multicast groups.
This commit is contained in:
smlng 2018-08-02 11:59:26 +02:00
parent 7cb41ba829
commit d4e8c57621
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/net/gnrc/netif/gnrc_netif.c
View File

@ -456,6 +456,7 @@ void gnrc_netif_release(gnrc_netif_t *netif)
#ifdef MODULE_GNRC_IPV6 #ifdef MODULE_GNRC_IPV6
static inline bool _addr_anycast(const gnrc_netif_t *netif, unsigned idx); static inline bool _addr_anycast(const gnrc_netif_t *netif, unsigned idx);
static int _addr_idx(const gnrc_netif_t *netif, const ipv6_addr_t *addr); static int _addr_idx(const gnrc_netif_t *netif, const ipv6_addr_t *addr);
static int _group_idx(const gnrc_netif_t *netif, const ipv6_addr_t *addr);
static char addr_str[IPV6_ADDR_MAX_STR_LEN]; static char addr_str[IPV6_ADDR_MAX_STR_LEN];
@ -547,7 +548,6 @@ static int _create_candidate_set(const gnrc_netif_t *netif,
static ipv6_addr_t *_src_addr_selection(gnrc_netif_t *netif, static ipv6_addr_t *_src_addr_selection(gnrc_netif_t *netif,
const ipv6_addr_t *dst, const ipv6_addr_t *dst,
uint8_t *candidate_set); uint8_t *candidate_set);
static int _group_idx(const gnrc_netif_t *netif, const ipv6_addr_t *addr);
int gnrc_netif_ipv6_addr_add_internal(gnrc_netif_t *netif, int gnrc_netif_ipv6_addr_add_internal(gnrc_netif_t *netif,
const ipv6_addr_t *addr, const ipv6_addr_t *addr,
@ -875,11 +875,13 @@ static inline bool _addr_anycast(const gnrc_netif_t *netif, unsigned idx)
return (netif->ipv6.addrs_flags[idx] & GNRC_NETIF_IPV6_ADDRS_FLAGS_ANYCAST); return (netif->ipv6.addrs_flags[idx] & GNRC_NETIF_IPV6_ADDRS_FLAGS_ANYCAST);
} }
static int _addr_idx(const gnrc_netif_t *netif, const ipv6_addr_t *addr) static int _idx(const gnrc_netif_t *netif, const ipv6_addr_t *addr, bool mcast)
{ {
if (!ipv6_addr_is_unspecified(addr)) { if (!ipv6_addr_is_unspecified(addr)) {
for (unsigned i = 0; i < GNRC_NETIF_IPV6_ADDRS_NUMOF; i++) { const ipv6_addr_t *iplist = (mcast) ? netif->ipv6.groups : netif->ipv6.addrs;
if (ipv6_addr_equal(&netif->ipv6.addrs[i], addr)) { unsigned ipmax = (mcast) ? GNRC_NETIF_IPV6_GROUPS_NUMOF : GNRC_NETIF_IPV6_ADDRS_NUMOF;
for (unsigned i = 0; i < ipmax; i++) {
if (ipv6_addr_equal(&iplist[i], addr)) {
return i; return i;
} }
} }
@ -887,6 +889,16 @@ static int _addr_idx(const gnrc_netif_t *netif, const ipv6_addr_t *addr)
return -1; return -1;
} }
static inline int _addr_idx(const gnrc_netif_t *netif, const ipv6_addr_t *addr)
{
return _idx(netif, addr, false);
}
static inline int _group_idx(const gnrc_netif_t *netif, const ipv6_addr_t *addr)
{
return _idx(netif, addr, true);
}
static unsigned _match_to_len(const gnrc_netif_t *netif, static unsigned _match_to_len(const gnrc_netif_t *netif,
const ipv6_addr_t *addr) const ipv6_addr_t *addr)
{ {
@ -1131,18 +1143,6 @@ static ipv6_addr_t *_src_addr_selection(gnrc_netif_t *netif,
int idx = _match_to_idx(netif, dst, candidate_set); int idx = _match_to_idx(netif, dst, candidate_set);
return (idx < 0) ? NULL : &netif->ipv6.addrs[idx]; return (idx < 0) ? NULL : &netif->ipv6.addrs[idx];
} }
static int _group_idx(const gnrc_netif_t *netif, const ipv6_addr_t *addr)
{
if (!ipv6_addr_is_unspecified(addr)) {
for (unsigned i = 0; i < GNRC_NETIF_IPV6_GROUPS_NUMOF; i++) {
if (ipv6_addr_equal(&netif->ipv6.groups[i], addr)) {
return i;
}
}
}
return -1;
}
#endif /* MODULE_GNRC_IPV6 */ #endif /* MODULE_GNRC_IPV6 */
#if (GNRC_NETIF_NUMOF > 1) || !defined(MODULE_GNRC_SIXLOWPAN) #if (GNRC_NETIF_NUMOF > 1) || !defined(MODULE_GNRC_SIXLOWPAN)