]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
macsec: add an accessor for validate_str
authorAntoine Tenart <antoine.tenart@bootlin.com>
Tue, 3 Mar 2020 10:36:19 +0000 (11:36 +0100)
committerDavid Ahern <dsahern@gmail.com>
Wed, 4 Mar 2020 19:57:41 +0000 (19:57 +0000)
This patch adds an accessor for the validate_str array, to handle future
changes adding a member.

Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
ip/ipmacsec.c

index 6104a3a5523def0a9d6dbaf49f28f8c2af4e615d..4e500e4e4825d0ee40dc789f82fe36026d945d01 100644 (file)
@@ -653,6 +653,14 @@ static const char *cs_id_to_name(__u64 cid)
        }
 }
 
+static const char *validate_to_str(__u8 validate)
+{
+       if (validate >= ARRAY_SIZE(validate_str))
+               return "(unknown)";
+
+       return validate_str[validate];
+}
+
 static const char *offload_to_str(__u8 offload)
 {
        if (offload >= ARRAY_SIZE(offload_str))
@@ -669,7 +677,7 @@ static void print_attrs(struct rtattr *attrs[])
                __u8 val = rta_getattr_u8(attrs[MACSEC_SECY_ATTR_VALIDATE]);
 
                print_string(PRINT_ANY, "validate",
-                            "validate %s ", validate_str[val]);
+                            "validate %s ", validate_to_str(val));
        }
 
        print_flag(attrs, "sc", MACSEC_RXSC_ATTR_ACTIVE);
@@ -1208,7 +1216,7 @@ static void macsec_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
                print_string(PRINT_ANY,
                             "validation",
                             "validate %s ",
-                            validate_str[val]);
+                            validate_to_str(val));
        }
 
        const char *inc_sci, *es, *replay;