proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-08-15 09:33:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipaddrlabel: add json support

Browse Source 
Add missing json and color support to addrlabel display

Example:
$ ip -j -p addrlabel
[ {
        "address": "::1",
        "prefixlen": 128,
        "label": 56
    },{
        "address": "::",
        "prefixlen": 96,
        "label": 56
    },{
...

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Stephen Hemminger 2018-03-06 13:07:10 -08:00 committed by David Ahern
parent aac7f725fa
commit a7ad1c8a68
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ip/ipaddrlabel.c
View File

@ -38,6 +38,7 @@
#include "rt_names.h" #include "rt_names.h"
#include "utils.h" #include "utils.h"
#include "ip_common.h" #include "ip_common.h"
#include "json_print.h"
#define IFAL_RTA(r) ((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrlblmsg)))) #define IFAL_RTA(r) ((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrlblmsg))))
#define IFAL_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct ifaddrlblmsg)) #define IFAL_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct ifaddrlblmsg))
@ -55,7 +56,6 @@ static void usage(void)
int print_addrlabel(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) int print_addrlabel(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
{ {
FILE *fp = (FILE *)arg;
struct ifaddrlblmsg *ifal = NLMSG_DATA(n); struct ifaddrlblmsg *ifal = NLMSG_DATA(n);
int len = n->nlmsg_len; int len = n->nlmsg_len;
struct rtattr *tb[IFAL_MAX+1]; struct rtattr *tb[IFAL_MAX+1];
@ -69,28 +69,40 @@ int print_addrlabel(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg
parse_rtattr(tb, IFAL_MAX, IFAL_RTA(ifal), len); parse_rtattr(tb, IFAL_MAX, IFAL_RTA(ifal), len);
open_json_object(NULL);
if (n->nlmsg_type == RTM_DELADDRLABEL) if (n->nlmsg_type == RTM_DELADDRLABEL)
fprintf(fp, "Deleted "); print_bool(PRINT_ANY, "deleted", "Deleted ", true);
if (tb[IFAL_ADDRESS]) { if (tb[IFAL_ADDRESS]) {
fprintf(fp, "prefix %s/%u ", const char *host
format_host_rta(ifal->ifal_family, = format_host_rta(ifal->ifal_family,
tb[IFAL_ADDRESS]), tb[IFAL_ADDRESS]);
ifal->ifal_prefixlen);
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) if (ifal->ifal_index) {
fprintf(fp, "dev %s ", ll_index_to_name(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)) { if (tb[IFAL_LABEL] && RTA_PAYLOAD(tb[IFAL_LABEL]) == sizeof(uint32_t)) {
uint32_t label; uint32_t label = rta_getattr_u32(RTA_DATA(tb[IFAL_LABEL]));
memcpy(&label, RTA_DATA(tb[IFAL_LABEL]), sizeof(label)); print_uint(PRINT_ANY,
fprintf(fp, "label %u ", label); "label", "label %u ", label);
} }
print_string(PRINT_FP, NULL, "\n", "");
close_json_object();
fprintf(fp, "\n");
fflush(fp);
return 0; return 0;
} }
@ -111,10 +123,12 @@ static int ipaddrlabel_list(int argc, char **argv)
return 1; return 1;
} }
new_json_obj(json);
if (rtnl_dump_filter(&rth, print_addrlabel, stdout) < 0) { if (rtnl_dump_filter(&rth, print_addrlabel, stdout) < 0) {
fprintf(stderr, "Dump terminated\n"); fprintf(stderr, "Dump terminated\n");
return 1; return 1;
} }
delete_json_obj();
return 0; return 0;
} }