diff options
| author | Igor Ryzhov <iryzhov@nfware.com> | 2022-01-27 21:05:40 +0300 |
|---|---|---|
| committer | Igor Ryzhov <iryzhov@nfware.com> | 2022-01-27 21:05:40 +0300 |
| commit | 3448a75c9d2d23a36006267c20f102fd7afaaf92 (patch) | |
| tree | 3074e36ca0378c0652931ac0ff3929be8fe624ba | |
| parent | 6766acddbfb966f7a5cb79fd4eebb87d52ad2679 (diff) | |
vrrpd: use ipaddr_is_zero when needed
Replace custom implementation or call to ipaddr_isset with a call to
ipaddr_is_zero.
ipaddr_isset is not fully correct, because it's fine to have some
non-zero bytes at the end of the struct in case of IPv4 and the function
doesn't allow that.
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
| -rw-r--r-- | lib/ipaddr.h | 9 | ||||
| -rw-r--r-- | vrrpd/vrrp_northbound.c | 7 |
2 files changed, 2 insertions, 14 deletions
diff --git a/lib/ipaddr.h b/lib/ipaddr.h index a334ea969e..d7ab358afe 100644 --- a/lib/ipaddr.h +++ b/lib/ipaddr.h @@ -137,15 +137,6 @@ static inline void ipv4_mapped_ipv6_to_ipv4(const struct in6_addr *in6, } /* - * Check if a struct ipaddr has nonzero value - */ -static inline bool ipaddr_isset(struct ipaddr *ip) -{ - static struct ipaddr a = {}; - return (0 != memcmp(&a, ip, sizeof(struct ipaddr))); -} - -/* * generic ordering comparison between IP addresses */ static inline int ipaddr_cmp(const struct ipaddr *a, const struct ipaddr *b) diff --git a/vrrpd/vrrp_northbound.c b/vrrpd/vrrp_northbound.c index f814963fe5..d25dc0a197 100644 --- a/vrrpd/vrrp_northbound.c +++ b/vrrpd/vrrp_northbound.c @@ -246,11 +246,8 @@ lib_interface_vrrp_vrrp_group_v4_source_address_get_elem( { const struct vrrp_vrouter *vr = args->list_entry; struct yang_data *val = NULL; - struct ipaddr ip; - - memset(&ip, 0x00, sizeof(ip)); - if (memcmp(&vr->v4->src.ipaddr_v4, &ip.ipaddr_v4, sizeof(ip.ipaddr_v4))) + if (!ipaddr_is_zero(&vr->v4->src)) val = yang_data_new_ip(args->xpath, &vr->v4->src); return val; @@ -410,7 +407,7 @@ lib_interface_vrrp_vrrp_group_v6_source_address_get_elem( const struct vrrp_vrouter *vr = args->list_entry; struct yang_data *val = NULL; - if (ipaddr_isset(&vr->v6->src)) + if (!ipaddr_is_zero(&vr->v6->src)) val = yang_data_new_ip(args->xpath, &vr->v6->src); return val; |