From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 2 Jun 2016 18:34:21 +0000 (+0200)
Subject: util: make it easier to check whether in_addr or in6_addr addresses are NULL
X-Git-Tag: v231~207^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34380032fb8bdfd801fbd43c03acfb7ac664d2bb;p=platform%2Fupstream%2Fsystemd.git

util: make it easier to check whether in_addr or in6_addr addresses are NULL
---

diff --git a/src/basic/in-addr-util.c b/src/basic/in-addr-util.c
index 245107e..1447fa8 100644
--- a/src/basic/in-addr-util.c
+++ b/src/basic/in-addr-util.c
@@ -28,18 +28,26 @@
 #include "macro.h"
 #include "util.h"
 
+bool in4_addr_is_null(const struct in_addr *a) {
+        return a->s_addr == 0;
+}
+
+bool in6_addr_is_null(const struct in6_addr *a) {
+        return
+                a->s6_addr32[0] == 0 &&
+                a->s6_addr32[1] == 0 &&
+                a->s6_addr32[2] == 0 &&
+                a->s6_addr32[3] == 0;
+}
+
 int in_addr_is_null(int family, const union in_addr_union *u) {
         assert(u);
 
         if (family == AF_INET)
-                return u->in.s_addr == 0;
+                return in4_addr_is_null(&u->in);
 
         if (family == AF_INET6)
-                return
-                        u->in6.s6_addr32[0] == 0 &&
-                        u->in6.s6_addr32[1] == 0 &&
-                        u->in6.s6_addr32[2] == 0 &&
-                        u->in6.s6_addr32[3] == 0;
+                return in6_addr_is_null(&u->in6);
 
         return -EAFNOSUPPORT;
 }
diff --git a/src/basic/in-addr-util.h b/src/basic/in-addr-util.h
index 17798ce..62cc1e1 100644
--- a/src/basic/in-addr-util.h
+++ b/src/basic/in-addr-util.h
@@ -36,6 +36,9 @@ struct in_addr_data {
         union in_addr_union address;
 };
 
+bool in4_addr_is_null(const struct in_addr *a);
+bool in6_addr_is_null(const struct in6_addr *a);
+
 int in_addr_is_null(int family, const union in_addr_union *u);
 int in_addr_is_link_local(int family, const union in_addr_union *u);
 int in_addr_is_localhost(int family, const union in_addr_union *u);