]> git.proxmox.com Git - mirror_iproute2.git/blobdiff - bridge/fdb.c
bridge: fdb: Use 'struct ndmsg' for FDB dumping
[mirror_iproute2.git] / bridge / fdb.c
index 1ab1fb716260aadea10e51646e96c775a90bdf5c..a7a0d80523075d04ba36e8b021463b541735103d 100644 (file)
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Get/set/delete fdb table with netlink
  *
@@ -21,9 +22,9 @@
 #include <linux/neighbour.h>
 #include <string.h>
 #include <limits.h>
-#include <json_writer.h>
 #include <stdbool.h>
 
+#include "json_print.h"
 #include "libnetlink.h"
 #include "br_common.h"
 #include "rt_names.h"
 
 static unsigned int filter_index, filter_vlan, filter_state;
 
-json_writer_t *jw_global;
-
 static void usage(void)
 {
        fprintf(stderr,
                "Usage: bridge fdb { add | append | del | replace } ADDR dev DEV\n"
-               "              [ self ] [ master ] [ use ] [ router ]\n"
-               "              [ local | static | dynamic ] [ dst IPADDR ] [ vlan VID ]\n"
-               "              [ port PORT] [ vni VNI ] [ via DEV ]\n"
+               "              [ self ] [ master ] [ use ] [ router ] [ extern_learn ]\n"
+               "              [ sticky ] [ local | static | dynamic ] [ dst IPADDR ]\n"
+               "              [ vlan VID ] [ port PORT] [ vni VNI ] [ via DEV ]\n"
                "       bridge fdb [ show [ br BRDEV ] [ brport DEV ] [ vlan VID ] [ state STATE ] ]\n");
        exit(-1);
 }
@@ -82,24 +81,58 @@ static int state_a2n(unsigned int *s, const char *arg)
        return 0;
 }
 
-static void start_json_fdb_flags_array(bool *fdb_flags)
+static void fdb_print_flags(FILE *fp, unsigned int flags)
+{
+       open_json_array(PRINT_JSON,
+                       is_json_context() ?  "flags" : "");
+
+       if (flags & NTF_SELF)
+               print_string(PRINT_ANY, NULL, "%s ", "self");
+
+       if (flags & NTF_ROUTER)
+               print_string(PRINT_ANY, NULL, "%s ", "router");
+
+       if (flags & NTF_EXT_LEARNED)
+               print_string(PRINT_ANY, NULL, "%s ", "extern_learn");
+
+       if (flags & NTF_OFFLOADED)
+               print_string(PRINT_ANY, NULL, "%s ", "offload");
+
+       if (flags & NTF_MASTER)
+               print_string(PRINT_ANY, NULL, "%s ", "master");
+
+       if (flags & NTF_STICKY)
+               print_string(PRINT_ANY, NULL, "%s ", "sticky");
+
+       close_json_array(PRINT_JSON, NULL);
+}
+
+static void fdb_print_stats(FILE *fp, const struct nda_cacheinfo *ci)
 {
-       if (*fdb_flags)
-               return;
-       jsonw_name(jw_global, "flags");
-       jsonw_start_array(jw_global);
-       *fdb_flags = true;
+       static int hz;
+
+       if (!hz)
+               hz = get_user_hz();
+
+       if (is_json_context()) {
+               print_uint(PRINT_JSON, "used", NULL,
+                                ci->ndm_used / hz);
+               print_uint(PRINT_JSON, "updated", NULL,
+                               ci->ndm_updated / hz);
+       } else {
+               fprintf(fp, "used %d/%d ", ci->ndm_used / hz,
+                                       ci->ndm_updated / hz);
+
+       }
 }
 
-int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
+int print_fdb(struct nlmsghdr *n, void *arg)
 {
        FILE *fp = arg;
        struct ndmsg *r = NLMSG_DATA(n);
        int len = n->nlmsg_len;
        struct rtattr *tb[NDA_MAX+1];
        __u16 vid = 0;
-       bool fdb_flags = false;
-       const char *state_s;
 
        if (n->nlmsg_type != RTM_NEWNEIGH && n->nlmsg_type != RTM_DELNEIGH) {
                fprintf(stderr, "Not RTM_NEWNEIGH: %08x %08x %08x\n",
@@ -131,192 +164,95 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
        if (filter_vlan && filter_vlan != vid)
                return 0;
 
-       if (jw_global) {
-               jsonw_pretty(jw_global, 1);
-               jsonw_start_object(jw_global);
-       }
-
-       if (n->nlmsg_type == RTM_DELNEIGH) {
-               if (jw_global)
-                       jsonw_string_field(jw_global, "opCode", "deleted");
-               else
-                       fprintf(fp, "Deleted ");
-       }
+       open_json_object(NULL);
+       if (n->nlmsg_type == RTM_DELNEIGH)
+               print_bool(PRINT_ANY, "deleted", "Deleted ", true);
 
        if (tb[NDA_LLADDR]) {
+               const char *lladdr;
                SPRINT_BUF(b1);
-               ll_addr_n2a(RTA_DATA(tb[NDA_LLADDR]),
-                           RTA_PAYLOAD(tb[NDA_LLADDR]),
-                           ll_index_to_type(r->ndm_ifindex),
-                           b1, sizeof(b1));
-               if (jw_global)
-                       jsonw_string_field(jw_global, "mac", b1);
-               else
-                       fprintf(fp, "%s ", b1);
-       }
 
-       if (!filter_index && r->ndm_ifindex) {
-               if (jw_global)
-                       jsonw_string_field(jw_global, "dev",
-                                          ll_index_to_name(r->ndm_ifindex));
-               else
-                       fprintf(fp, "dev %s ",
-                               ll_index_to_name(r->ndm_ifindex));
+               lladdr = ll_addr_n2a(RTA_DATA(tb[NDA_LLADDR]),
+                                    RTA_PAYLOAD(tb[NDA_LLADDR]),
+                                    ll_index_to_type(r->ndm_ifindex),
+                                    b1, sizeof(b1));
+
+               print_color_string(PRINT_ANY, COLOR_MAC,
+                                  "mac", "%s ", lladdr);
        }
 
+       if (!filter_index && r->ndm_ifindex)
+               print_color_string(PRINT_ANY, COLOR_IFNAME,
+                                  "ifname", "dev %s ",
+                                  ll_index_to_name(r->ndm_ifindex));
+
        if (tb[NDA_DST]) {
                int family = AF_INET;
-               const char *abuf_s;
+               const char *dst;
 
                if (RTA_PAYLOAD(tb[NDA_DST]) == sizeof(struct in6_addr))
                        family = AF_INET6;
 
-               abuf_s = format_host(family,
-                                    RTA_PAYLOAD(tb[NDA_DST]),
-                                    RTA_DATA(tb[NDA_DST]));
-               if (jw_global)
-                       jsonw_string_field(jw_global, "dst", abuf_s);
-               else
-                       fprintf(fp, "dst %s ", abuf_s);
-       }
+               dst = format_host(family,
+                                 RTA_PAYLOAD(tb[NDA_DST]),
+                                 RTA_DATA(tb[NDA_DST]));
 
-       if (vid) {
-               if (jw_global)
-                       jsonw_uint_field(jw_global, "vlan", vid);
-               else
-                       fprintf(fp, "vlan %hu ", vid);
+               print_color_string(PRINT_ANY,
+                                  ifa_family_color(family),
+                                   "dst", "dst %s ", dst);
        }
 
-       if (tb[NDA_PORT]) {
-               if (jw_global)
-                       jsonw_uint_field(jw_global, "port",
-                                        rta_getattr_be16(tb[NDA_PORT]));
-               else
-                       fprintf(fp, "port %d ",
-                               rta_getattr_be16(tb[NDA_PORT]));
-       }
+       if (vid)
+               print_uint(PRINT_ANY,
+                                "vlan", "vlan %hu ", vid);
 
-       if (tb[NDA_VNI]) {
-               if (jw_global)
-                       jsonw_uint_field(jw_global, "vni",
-                                        rta_getattr_u32(tb[NDA_VNI]));
-               else
-                       fprintf(fp, "vni %d ",
-                               rta_getattr_u32(tb[NDA_VNI]));
-       }
+       if (tb[NDA_PORT])
+               print_uint(PRINT_ANY,
+                                "port", "port %u ",
+                                rta_getattr_be16(tb[NDA_PORT]));
 
-       if (tb[NDA_SRC_VNI]) {
-               if (jw_global)
-                       jsonw_uint_field(jw_global, "src_vni",
-                                        rta_getattr_u32(tb[NDA_SRC_VNI]));
-               else
-                       fprintf(fp, "src_vni %d ",
+       if (tb[NDA_VNI])
+               print_uint(PRINT_ANY,
+                                "vni", "vni %u ",
+                                rta_getattr_u32(tb[NDA_VNI]));
+
+       if (tb[NDA_SRC_VNI])
+               print_uint(PRINT_ANY,
+                                "src_vni", "src_vni %u ",
                                rta_getattr_u32(tb[NDA_SRC_VNI]));
-       }
 
        if (tb[NDA_IFINDEX]) {
                unsigned int ifindex = rta_getattr_u32(tb[NDA_IFINDEX]);
 
-               if (ifindex) {
-                       char ifname[IF_NAMESIZE];
-
-                       if (!tb[NDA_LINK_NETNSID] &&
-                           if_indextoname(ifindex, ifname)) {
-                               if (jw_global)
-                                       jsonw_string_field(jw_global, "viaIf",
-                                                          ifname);
-                               else
-                                       fprintf(fp, "via %s ", ifname);
-                       } else {
-                               if (jw_global)
-                                       jsonw_uint_field(jw_global, "viaIfIndex",
-                                                        ifindex);
-                               else
-                                       fprintf(fp, "via ifindex %u ", ifindex);
-                       }
-               }
-       }
-
-       if (tb[NDA_LINK_NETNSID]) {
-               if (jw_global)
-                       jsonw_uint_field(jw_global, "linkNetNsId",
-                                        rta_getattr_u32(tb[NDA_LINK_NETNSID]));
+               if (tb[NDA_LINK_NETNSID])
+                       print_uint(PRINT_ANY,
+                                        "viaIfIndex", "via ifindex %u ",
+                                        ifindex);
                else
-                       fprintf(fp, "link-netnsid %d ",
-                               rta_getattr_u32(tb[NDA_LINK_NETNSID]));
+                       print_string(PRINT_ANY,
+                                          "viaIf", "via %s ",
+                                          ll_index_to_name(ifindex));
        }
 
-       if (show_stats && tb[NDA_CACHEINFO]) {
-               struct nda_cacheinfo *ci = RTA_DATA(tb[NDA_CACHEINFO]);
-               int hz = get_user_hz();
+       if (tb[NDA_LINK_NETNSID])
+               print_uint(PRINT_ANY,
+                                "linkNetNsId", "link-netnsid %d ",
+                                rta_getattr_u32(tb[NDA_LINK_NETNSID]));
 
-               if (jw_global) {
-                       jsonw_uint_field(jw_global, "used",
-                               ci->ndm_used/hz);
-                       jsonw_uint_field(jw_global, "updated",
-                               ci->ndm_updated/hz);
-               } else {
-                       fprintf(fp, "used %d/%d ", ci->ndm_used/hz,
-                                       ci->ndm_updated/hz);
-               }
-       }
+       if (show_stats && tb[NDA_CACHEINFO])
+               fdb_print_stats(fp, RTA_DATA(tb[NDA_CACHEINFO]));
 
-       if (jw_global) {
-               if (r->ndm_flags & NTF_SELF) {
-                       start_json_fdb_flags_array(&fdb_flags);
-                       jsonw_string(jw_global, "self");
-               }
-               if (r->ndm_flags & NTF_ROUTER) {
-                       start_json_fdb_flags_array(&fdb_flags);
-                       jsonw_string(jw_global, "router");
-               }
-               if (r->ndm_flags & NTF_EXT_LEARNED) {
-                       start_json_fdb_flags_array(&fdb_flags);
-                       jsonw_string(jw_global, "extern_learn");
-               }
-               if (r->ndm_flags & NTF_OFFLOADED) {
-                       start_json_fdb_flags_array(&fdb_flags);
-                       jsonw_string(jw_global, "offload");
-               }
-               if (r->ndm_flags & NTF_MASTER)
-                       jsonw_string(jw_global, "master");
-               if (fdb_flags)
-                       jsonw_end_array(jw_global);
+       fdb_print_flags(fp, r->ndm_flags);
 
-               if (tb[NDA_MASTER])
-                       jsonw_string_field(jw_global,
-                                          "master",
-                                          ll_index_to_name(rta_getattr_u32(tb[NDA_MASTER])));
 
-       } else {
-               if (r->ndm_flags & NTF_SELF)
-                       fprintf(fp, "self ");
-               if (r->ndm_flags & NTF_ROUTER)
-                       fprintf(fp, "router ");
-               if (r->ndm_flags & NTF_EXT_LEARNED)
-                       fprintf(fp, "extern_learn ");
-               if (r->ndm_flags & NTF_OFFLOADED)
-                       fprintf(fp, "offload ");
-               if (tb[NDA_MASTER]) {
-                       fprintf(fp, "master %s ",
-                               ll_index_to_name(rta_getattr_u32(tb[NDA_MASTER])));
-               } else if (r->ndm_flags & NTF_MASTER) {
-                       fprintf(fp, "master ");
-               }
-       }
-
-       state_s = state_n2a(r->ndm_state);
-       if (jw_global) {
-               if (state_s[0])
-                       jsonw_string_field(jw_global, "state", state_s);
-
-               jsonw_end_object(jw_global);
-       } else {
-               fprintf(fp, "%s\n", state_s);
-
-               fflush(fp);
-       }
+       if (tb[NDA_MASTER])
+               print_string(PRINT_ANY, "master", "master %s ",
+                            ll_index_to_name(rta_getattr_u32(tb[NDA_MASTER])));
 
+       print_string(PRINT_ANY, "state", "%s\n",
+                          state_n2a(r->ndm_state));
+       close_json_object();
+       fflush(fp);
        return 0;
 }
 
@@ -324,16 +260,16 @@ static int fdb_show(int argc, char **argv)
 {
        struct {
                struct nlmsghdr n;
-               struct ifinfomsg        ifm;
+               struct ndmsg            ndm;
                char                    buf[256];
        } req = {
-               .n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg)),
-               .ifm.ifi_family = PF_BRIDGE,
+               .n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg)),
+               .ndm.ndm_family = PF_BRIDGE,
        };
 
        char *filter_dev = NULL;
        char *br = NULL;
-       int msg_size = sizeof(struct ifinfomsg);
+       int msg_size = sizeof(struct ndmsg);
 
        while (argc > 0) {
                if ((strcmp(*argv, "brport") == 0) || strcmp(*argv, "dev") == 0) {
@@ -374,36 +310,24 @@ static int fdb_show(int argc, char **argv)
 
        /*we'll keep around filter_dev for older kernels */
        if (filter_dev) {
-               filter_index = if_nametoindex(filter_dev);
-               if (filter_index == 0) {
-                       fprintf(stderr, "Cannot find device \"%s\"\n",
-                               filter_dev);
-                       return -1;
-               }
-               req.ifm.ifi_index = filter_index;
+               filter_index = ll_name_to_index(filter_dev);
+               if (!filter_index)
+                       return nodev(filter_dev);
+               req.ndm.ndm_ifindex = filter_index;
        }
 
-       if (rtnl_dump_request(&rth, RTM_GETNEIGH, &req.ifm, msg_size) < 0) {
+       if (rtnl_dump_request(&rth, RTM_GETNEIGH, &req.ndm, msg_size) < 0) {
                perror("Cannot send dump request");
                exit(1);
        }
 
-       if (json_output) {
-               jw_global = jsonw_new(stdout);
-               if (!jw_global) {
-                       fprintf(stderr, "Error allocation json object\n");
-                       exit(1);
-               }
-               jsonw_start_array(jw_global);
-       }
+       new_json_obj(json);
        if (rtnl_dump_filter(&rth, print_fdb, stdout) < 0) {
                fprintf(stderr, "Dump terminated\n");
                exit(1);
        }
-       if (jw_global) {
-               jsonw_end_array(jw_global);
-               jsonw_destroy(&jw_global);
-       }
+       delete_json_obj();
+       fflush(stdout);
 
        return 0;
 }
@@ -463,9 +387,9 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
                                invarg("invalid VNI\n", *argv);
                } else if (strcmp(*argv, "via") == 0) {
                        NEXT_ARG();
-                       via = if_nametoindex(*argv);
-                       if (via == 0)
-                               invarg("invalid device\n", *argv);
+                       via = ll_name_to_index(*argv);
+                       if (!via)
+                               exit(nodev(*argv));
                } else if (strcmp(*argv, "self") == 0) {
                        req.ndm.ndm_flags |= NTF_SELF;
                } else if (matches(*argv, "master") == 0) {
@@ -488,6 +412,10 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
                        vid = atoi(*argv);
                } else if (matches(*argv, "use") == 0) {
                        req.ndm.ndm_flags |= NTF_USE;
+               } else if (matches(*argv, "extern_learn") == 0) {
+                       req.ndm.ndm_flags |= NTF_EXT_LEARNED;
+               } else if (matches(*argv, "sticky") == 0) {
+                       req.ndm.ndm_flags |= NTF_STICKY;
                } else {
                        if (strcmp(*argv, "to") == 0)
                                NEXT_ARG();
@@ -540,10 +468,8 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
                addattr32(&req.n, sizeof(req), NDA_IFINDEX, via);
 
        req.ndm.ndm_ifindex = ll_name_to_index(d);
-       if (req.ndm.ndm_ifindex == 0) {
-               fprintf(stderr, "Cannot find device \"%s\"\n", d);
-               return -1;
-       }
+       if (!req.ndm.ndm_ifindex)
+               return nodev(d);
 
        if (rtnl_talk(&rth, &req.n, NULL) < 0)
                return -1;