ipv6: introdcue __ipv6_addr_needs_scope_id and ipv6_iface_scope_id helper functions
Subsystems (3)
PATCH v3 1/4 ipv6: introdcue __ipv6_addr_needs_scope_id and ipv6_iface_scope_id helper functions
__ipv6_addr_needs_scope_id checks if an ipv6 address needs to supply a 'sin6_scope_id != 0'. 'sin6_scope_id != 0' was enforced in case of link-local addresses. To support interface-local multicast these checks had to be enhanced and are now consolidated into these new helper functions.
v2:
a) migrated to struct ipv6_addr_props
v3:
a) reverted changes for ipv6_addr_props
b) test for address type instead of comparing scope
--- include/net/ipv6.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
include/net/ipv6.h +12 -0
@@ -320,6 +320,18 @@ static inline int ipv6_addr_src_scope(const struct in6_addr *addr)return __ipv6_addr_src_scope (__ipv6_addr_type (addr)); } +static inline bool __ipv6_addr_needs_scope_id (int type) +{ +return type &IPV6_ADDR_LINKLOCAL || + (type &IPV6_ADDR_MULTICAST && + (type & (IPV6_ADDR_LOOPBACK |IPV6_ADDR_LINKLOCAL ))); +} + +static inline __u32 ipv6_iface_scope_id (const struct in6_addr *addr,int iface) +{ +return __ipv6_addr_needs_scope_id (__ipv6_addr_type (addr)) ? iface :0 ; +} +static inline int ipv6_addr_cmp (const struct in6_addr *a1,const struct in6_addr *a2) {return memcmp (a1, a2,sizeof (struct in6_addr ));
Signature · 1 line
1.8.1.4
Quoted 34 lines · Hannes Frederic Sowa
__ipv6_addr_needs_scope_idchecks if an ipv6 address needs to supply a 'sin6_scope_id!= 0'. 'sin6_scope_id!= 0' was enforced in case of link-local addresses. To support interface-local multicast these checks had to be enhanced and are now consolidated into these new helper functions.v2:
a) migrated to structipv6_addr_propsv3:
a) reverted changes foripv6_addr_props
b) test for address type instead of comparing scopeSuggested-by YOSHIFUJI Hideaki <[email protected]>Cc YOSHIFUJI Hideaki <[email protected]>Signed-off-by Hannes Frederic Sowa <[email protected]>--- include/net/ipv6.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)include/net/ipv6.h +5
-0@@ -320,6 +320,18 @@ static inline int ipv6_addr_src_scope(const struct in6_addr *addr)return __ipv6_addr_src_scope (__ipv6_addr_type (addr)); } +static inline bool __ipv6_addr_needs_scope_id (int type) +{ +return type &IPV6_ADDR_LINKLOCAL || + (type &IPV6_ADDR_MULTICAST && + (type & (IPV6_ADDR_LOOPBACK |IPV6_ADDR_LINKLOCAL )));
include/net/ipv6.h static inline int ipv6_addr_src_scope(const struct in6_addr *addr) · line 337
Quoted 10 lines
include/net/ipv6.h +7
-0+} + +static inline __u32 ipv6_iface_scope_id (const struct in6_addr *addr,int iface) +{ +return __ipv6_addr_needs_scope_id (__ipv6_addr_type (addr)) ? iface :0 ; +} +static inline int ipv6_addr_cmp (const struct in6_addr *a1,const struct in6_addr *a2) {return memcmp (a1, a2,sizeof (struct in6_addr ));