tc: break long lines

[mirror_iproute2.git] / bridge / fdb.c

diff --git a/bridge/fdb.c b/bridge/fdb.c
index a91521776e99043d32cb723986f298f702f1c6a4..1ab1fb716260aadea10e51646e96c775a90bdf5c 100644 (file)
--- a/bridge/fdb.c
+++ b/bridge/fdb.c
@@ -29,17 +29,18 @@
 #include "rt_names.h"
 #include "utils.h"
 
-static unsigned int filter_index, filter_vlan;
+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");
-       fprintf(stderr, "       bridge fdb [ show [ br BRDEV ] [ brport DEV ] [ vlan VID ] ]\n");
+       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"
+               "       bridge fdb [ show [ br BRDEV ] [ brport DEV ] [ vlan VID ] [ state STATE ] ]\n");
        exit(-1);
 }
 
@@ -63,6 +64,24 @@ static const char *state_n2a(unsigned int s)
        return buf;
 }
 
+static int state_a2n(unsigned int *s, const char *arg)
+{
+       if (matches(arg, "permanent") == 0)
+               *s = NUD_PERMANENT;
+       else if (matches(arg, "static") == 0 || matches(arg, "temp") == 0)
+               *s = NUD_NOARP;
+       else if (matches(arg, "stale") == 0)
+               *s = NUD_STALE;
+       else if (matches(arg, "reachable") == 0 || matches(arg, "dynamic") == 0)
+               *s = NUD_REACHABLE;
+       else if (strcmp(arg, "all") == 0)
+               *s = ~0;
+       else if (get_unsigned(s, arg, 0))
+               return -1;
+
+       return 0;
+}
+
 static void start_json_fdb_flags_array(bool *fdb_flags)
 {
        if (*fdb_flags)
@@ -100,6 +119,9 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
        if (filter_index && filter_index != r->ndm_ifindex)
                return 0;
 
+       if (filter_state && !(r->ndm_state & filter_state))
+               return 0;
+
        parse_rtattr(tb, NDA_MAX, NDA_RTA(r),
                     n->nlmsg_len - NLMSG_LENGTH(sizeof(*r)));
 
@@ -183,6 +205,15 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
                                rta_getattr_u32(tb[NDA_VNI]));
        }
 
+       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 ",
+                               rta_getattr_u32(tb[NDA_SRC_VNI]));
+       }
+
        if (tb[NDA_IFINDEX]) {
                unsigned int ifindex = rta_getattr_u32(tb[NDA_IFINDEX]);
 
@@ -240,6 +271,10 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
                        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");
                }
@@ -259,6 +294,8 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
                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 ",
@@ -310,6 +347,13 @@ static int fdb_show(int argc, char **argv)
                        if (filter_vlan)
                                duparg("vlan", *argv);
                        filter_vlan = atoi(*argv);
+               } else if (strcmp(*argv, "state") == 0) {
+                       unsigned int state;
+
+                       NEXT_ARG();
+                       if (state_a2n(&state, *argv))
+                               invarg("invalid state", *argv);
+                       filter_state |= state;
                } else {
                        if (matches(*argv, "help") == 0)
                                usage();
@@ -445,9 +489,9 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
                } else if (matches(*argv, "use") == 0) {
                        req.ndm.ndm_flags |= NTF_USE;
                } else {
-                       if (strcmp(*argv, "to") == 0) {
+                       if (strcmp(*argv, "to") == 0)
                                NEXT_ARG();
-                       }
+
                        if (matches(*argv, "help") == 0)
                                usage();
                        if (addr)
@@ -501,7 +545,7 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
                return -1;
        }
 
-       if (rtnl_talk(&rth, &req.n, NULL, 0) < 0)
+       if (rtnl_talk(&rth, &req.n, NULL) < 0)
                return -1;
 
        return 0;