ip route: get: allow zero-length subnet mask

[mirror_iproute2.git] / ip / ipprefix.c

diff --git a/ip/ipprefix.c b/ip/ipprefix.c
index 4d986dbc1a5d1c5c335cb1ab4ec741f2e8924af3..466af2088d9037e4a56ee2df21fa9eee145b12b5 100644 (file)
--- a/ip/ipprefix.c
+++ b/ip/ipprefix.c
@@ -35,7 +35,7 @@
 #define IF_PREFIX_ONLINK       0x01
 #define IF_PREFIX_AUTOCONF     0x02
 
-int print_prefix(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
+int print_prefix(struct nlmsghdr *n, void *arg)
 {
        FILE *fp = (FILE *)arg;
        struct prefixmsg *prefix = NLMSG_DATA(n);
@@ -71,19 +71,11 @@ int print_prefix(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 
        parse_rtattr(tb, RTA_MAX, RTM_RTA(prefix), len);
 
-       fprintf(fp, "prefix ");
-
        if (tb[PREFIX_ADDRESS]) {
-               struct in6_addr *pfx;
-
-               pfx = (struct in6_addr *)RTA_DATA(tb[PREFIX_ADDRESS]);
-
-               fprintf(fp, "%s", rt_addr_n2a(family,
-                                             RTA_PAYLOAD(tb[PREFIX_ADDRESS]),
-                                             pfx));
+               fprintf(fp, "prefix %s/%u",
+                       rt_addr_n2a_rta(family, tb[PREFIX_ADDRESS]),
+                       prefix->prefix_len);
        }
-       fprintf(fp, "/%u ", prefix->prefix_len);
-
        fprintf(fp, "dev %s ", ll_index_to_name(prefix->prefix_ifindex));
 
        if (prefix->prefix_flags & IF_PREFIX_ONLINK)
@@ -92,9 +84,8 @@ int print_prefix(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
                fprintf(fp, "autoconf ");
 
        if (tb[PREFIX_CACHEINFO]) {
-               struct prefix_cacheinfo *pc;
-
-               pc = (struct prefix_cacheinfo *)RTA_DATA(tb[PREFIX_CACHEINFO]);
+               const struct prefix_cacheinfo *pc
+                        = RTA_DATA(tb[PREFIX_CACHEINFO]);
 
                fprintf(fp, "valid %u ", pc->valid_time);
                fprintf(fp, "preferred %u ", pc->preferred_time);