ip route: Add protocol, table id and device to dump request

[mirror_iproute2.git] / ip / ipaddrlabel.c

diff --git a/ip/ipaddrlabel.c b/ip/ipaddrlabel.c
index 6076bb952297f7a8d56d063870ba9f0cd374d44c..f06ed1e77f41ed8e79c101688ab457251bbb50aa 100644 (file)
--- a/ip/ipaddrlabel.c
+++ b/ip/ipaddrlabel.c
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <syslog.h>
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -39,6 +38,7 @@
 #include "rt_names.h"
 #include "utils.h"
 #include "ip_common.h"
+#include "json_print.h"
 
 #define IFAL_RTA(r)    ((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrlblmsg))))
 #define IFAL_PAYLOAD(n)        NLMSG_PAYLOAD(n, sizeof(struct ifaddrlblmsg))
@@ -54,9 +54,8 @@ static void usage(void)
        exit(-1);
 }
 
-int print_addrlabel(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
+int print_addrlabel(struct nlmsghdr *n, void *arg)
 {
-       FILE *fp = (FILE *)arg;
        struct ifaddrlblmsg *ifal = NLMSG_DATA(n);
        int len = n->nlmsg_len;
        struct rtattr *tb[IFAL_MAX+1];
@@ -70,29 +69,40 @@ int print_addrlabel(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg
 
        parse_rtattr(tb, IFAL_MAX, IFAL_RTA(ifal), len);
 
+       open_json_object(NULL);
        if (n->nlmsg_type == RTM_DELADDRLABEL)
-               fprintf(fp, "Deleted ");
+               print_bool(PRINT_ANY, "deleted", "Deleted ", true);
 
        if (tb[IFAL_ADDRESS]) {
-               fprintf(fp, "prefix %s/%u ",
-                       format_host(ifal->ifal_family,
-                                   RTA_PAYLOAD(tb[IFAL_ADDRESS]),
-                                   RTA_DATA(tb[IFAL_ADDRESS])),
-                       ifal->ifal_prefixlen);
+               const char *host
+                       = format_host_rta(ifal->ifal_family,
+                                         tb[IFAL_ADDRESS]);
+
+               print_string(PRINT_FP, NULL, "prefix ", NULL);
+               print_color_string(PRINT_ANY,
+                                  ifa_family_color(ifal->ifal_family),
+                                  "address", "%s", host);
+
+               print_uint(PRINT_ANY, "prefixlen", "/%u ",
+                          ifal->ifal_prefixlen);
        }
 
-       if (ifal->ifal_index)
-               fprintf(fp, "dev %s ", ll_index_to_name(ifal->ifal_index));
+       if (ifal->ifal_index) {
+               print_string(PRINT_FP, NULL, "dev ", NULL);
+               print_color_string(PRINT_ANY, COLOR_IFNAME,
+                                  "ifname", "%s ",
+                                  ll_index_to_name(ifal->ifal_index));
+       }
 
        if (tb[IFAL_LABEL] && RTA_PAYLOAD(tb[IFAL_LABEL]) == sizeof(uint32_t)) {
-               uint32_t label;
+               uint32_t label = rta_getattr_u32(tb[IFAL_LABEL]);
 
-               memcpy(&label, RTA_DATA(tb[IFAL_LABEL]), sizeof(label));
-               fprintf(fp, "label %u ", label);
+               print_uint(PRINT_ANY,
+                          "label", "label %u ", label);
        }
+       print_string(PRINT_FP, NULL, "\n", "");
+       close_json_object();
 
-       fprintf(fp, "\n");
-       fflush(fp);
        return 0;
 }
 
@@ -108,15 +118,17 @@ static int ipaddrlabel_list(int argc, char **argv)
                return -1;
        }
 
-       if (rtnl_wilddump_request(&rth, af, RTM_GETADDRLABEL) < 0) {
+       if (rtnl_addrlbldump_req(&rth, af) < 0) {
                perror("Cannot send dump request");
                return 1;
        }
 
+       new_json_obj(json);
        if (rtnl_dump_filter(&rth, print_addrlabel, stdout) < 0) {
                fprintf(stderr, "Dump terminated\n");
                return 1;
        }
+       delete_json_obj();
 
        return 0;
 }
@@ -128,23 +140,18 @@ static int ipaddrlabel_modify(int cmd, int argc, char **argv)
                struct nlmsghdr n;
                struct ifaddrlblmsg     ifal;
                char                    buf[1024];
-       } req;
-
-       inet_prefix prefix;
+       } req = {
+               .n.nlmsg_type = cmd,
+               .n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifaddrlblmsg)),
+               .n.nlmsg_flags = NLM_F_REQUEST,
+               .ifal.ifal_family = preferred_family,
+       };
+
+       inet_prefix prefix = {};
        uint32_t label = 0xffffffffUL;
        char *p = NULL;
        char *l = NULL;
 
-       memset(&req, 0, sizeof(req));
-       memset(&prefix, 0, sizeof(prefix));
-
-       req.n.nlmsg_type = cmd;
-       req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifaddrlblmsg));
-       req.n.nlmsg_flags = NLM_F_REQUEST;
-       req.ifal.ifal_family = preferred_family;
-       req.ifal.ifal_prefixlen = 0;
-       req.ifal.ifal_index = 0;
-
        if (cmd == RTM_NEWADDRLABEL) {
                req.n.nlmsg_flags |= NLM_F_CREATE|NLM_F_EXCL;
        }
@@ -182,14 +189,14 @@ static int ipaddrlabel_modify(int cmd, int argc, char **argv)
        if (req.ifal.ifal_family == AF_UNSPEC)
                req.ifal.ifal_family = AF_INET6;
 
-       if (rtnl_talk(&rth, &req.n, NULL, 0) < 0)
+       if (rtnl_talk(&rth, &req.n, NULL) < 0)
                return -2;
 
        return 0;
 }
 
 
-static int flush_addrlabel(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
+static int flush_addrlabel(struct nlmsghdr *n, void *arg)
 {
        struct rtnl_handle rth2;
        struct rtmsg *r = NLMSG_DATA(n);
@@ -209,7 +216,7 @@ static int flush_addrlabel(const struct sockaddr_nl *who, struct nlmsghdr *n, vo
                if (rtnl_open(&rth2, 0) < 0)
                        return -1;
 
-               if (rtnl_talk(&rth2, n, NULL, 0) < 0)
+               if (rtnl_talk(&rth2, n, NULL) < 0)
                        return -2;
 
                rtnl_close(&rth2);
@@ -230,7 +237,7 @@ static int ipaddrlabel_flush(int argc, char **argv)
                return -1;
        }
 
-       if (rtnl_wilddump_request(&rth, af, RTM_GETADDRLABEL) < 0) {
+       if (rtnl_addrlbldump_req(&rth, af) < 0) {
                perror("Cannot send dump request");
                return -1;
        }