utils: Introduce get_addr_rta() and inet_addr_match_rta()

First is used to get address from netlink attribute to
inet_prefix data structure. Use memcpy() with constant
value to let complier optimize by replacing a call by
inlining load/store instructions.

Second is used to match address in given netlink attribute
with one given as reference. It matches successfully if
no attribute is given (@rta is NULL), reference address
family is AF_UNSPEC or it's length isn't given; fails if
get_attr_rta() can't get attribute or it's family does
not match reference; calls inet_addr_match() to get final
verdict.

Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
Signed-off-by: David Ahern <dsahern@gmail.com>

diff --git a/include/utils.h b/include/utils.h
index f562547d69837871b948722abfb0d87d8df1ea19..0394268e1276f7c7d47c3495844b391156440236 100644 (file)
--- a/include/utils.h
+++ b/include/utils.h
@@ -120,6 +120,7 @@ int get_prefix_1(inet_prefix *dst, char *arg, int family);
 int get_addr(inet_prefix *dst, const char *arg, int family);
 int get_prefix(inet_prefix *dst, char *arg, int family);
 int mask2bits(__u32 netmask);
+int get_addr_rta(inet_prefix *dst, const struct rtattr *rta, int family);
 int get_addr_ila(__u64 *val, const char *arg);
 
 int read_prop(const char *dev, char *prop, long *value);
@@ -174,6 +175,7 @@ int check_ifname(const char *);
 int get_ifname(char *, const char *);
 int matches(const char *arg, const char *pattern);
 int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits);
+int inet_addr_match_rta(const inet_prefix *m, const struct rtattr *rta);
 
 const char *dnet_ntop(int af, const void *addr, char *str, size_t len);
 int dnet_pton(int af, const char *src, void *addr);

diff --git a/lib/utils.c b/lib/utils.c
index e20b60e4bcbf870cdae576d1afe8f20b11e4c909..8e15625e0c1ec1af66afb1da391aad9e0c46ce66 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -534,6 +534,28 @@ int get_addr64(__u64 *ap, const char *cp)
        return 1;
 }
 
+static void set_address_type(inet_prefix *addr)
+{
+       switch (addr->family) {
+       case AF_INET:
+               if (!addr->data[0])
+                       addr->flags |= ADDRTYPE_INET_UNSPEC;
+               else if (IN_MULTICAST(ntohl(addr->data[0])))
+                       addr->flags |= ADDRTYPE_INET_MULTI;
+               else
+                       addr->flags |= ADDRTYPE_INET;
+               break;
+       case AF_INET6:
+               if (IN6_IS_ADDR_UNSPECIFIED(addr->data))
+                       addr->flags |= ADDRTYPE_INET_UNSPEC;
+               else if (IN6_IS_ADDR_MULTICAST(addr->data))
+                       addr->flags |= ADDRTYPE_INET_MULTI;
+               else
+                       addr->flags |= ADDRTYPE_INET;
+               break;
+       }
+}
+
 static int __get_addr_1(inet_prefix *addr, const char *name, int family)
 {
        memset(addr, 0, sizeof(*addr));
@@ -627,25 +649,7 @@ int get_addr_1(inet_prefix *addr, const char *name, int family)
        if (ret)
                return ret;
 
-       switch (addr->family) {
-       case AF_INET:
-               if (!addr->data[0])
-                       addr->flags |= ADDRTYPE_INET_UNSPEC;
-               else if (IN_MULTICAST(ntohl(addr->data[0])))
-                       addr->flags |= ADDRTYPE_INET_MULTI;
-               else
-                       addr->flags |= ADDRTYPE_INET;
-               break;
-       case AF_INET6:
-               if (IN6_IS_ADDR_UNSPECIFIED(addr->data))
-                       addr->flags |= ADDRTYPE_INET_UNSPEC;
-               else if (IN6_IS_ADDR_MULTICAST(addr->data))
-                       addr->flags |= ADDRTYPE_INET_MULTI;
-               else
-                       addr->flags |= ADDRTYPE_INET;
-               break;
-       }
-
+       set_address_type(addr);
        return 0;
 }
 
@@ -734,6 +738,46 @@ int get_addr(inet_prefix *dst, const char *arg, int family)
        return 0;
 }
 
+int get_addr_rta(inet_prefix *dst, const struct rtattr *rta, int family)
+{
+       const int len = RTA_PAYLOAD(rta);
+       const void *data = RTA_DATA(rta);
+
+       switch (len) {
+       case 4:
+               dst->family = AF_INET;
+               dst->bytelen = 4;
+               memcpy(dst->data, data, 4);
+               break;
+       case 16:
+               dst->family = AF_INET6;
+               dst->bytelen = 16;
+               memcpy(dst->data, data, 16);
+               break;
+       case 2:
+               dst->family = AF_DECnet;
+               dst->bytelen = 2;
+               memcpy(dst->data, data, 2);
+               break;
+       case 10:
+               dst->family = AF_IPX;
+               dst->bytelen = 10;
+               memcpy(dst->data, data, 10);
+               break;
+       default:
+               return -1;
+       }
+
+       if (family != AF_UNSPEC && family != dst->family)
+               return -2;
+
+       dst->bitlen = -1;
+       dst->flags = 0;
+
+       set_address_type(dst);
+       return 0;
+}
+
 int get_prefix(inet_prefix *dst, char *arg, int family)
 {
        if (family == AF_PACKET) {
@@ -864,6 +908,19 @@ int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits)
        return 0;
 }
 
+int inet_addr_match_rta(const inet_prefix *m, const struct rtattr *rta)
+{
+       inet_prefix dst;
+
+       if (!rta || m->family == AF_UNSPEC || m->bitlen <= 0)
+               return 0;
+
+       if (get_addr_rta(&dst, rta, m->family))
+               return -1;
+
+       return inet_addr_match(&dst, m, m->bitlen);
+}
+
 int __iproute2_hz_internal;
 
 int __get_hz(void)