|
 |
061d3d5 |
diff --git a/tc/f_u32.c b/tc/f_u32.c
|
|
|
061d3d5 |
index 4f5f74e..290595c 100644
|
|
|
061d3d5 |
--- a/tc/f_u32.c
|
|
|
061d3d5 |
+++ b/tc/f_u32.c
|
|
|
061d3d5 |
@@ -403,6 +403,43 @@ static int parse_ip6_addr(int *argc_p, char ***argv_p,
|
|
|
061d3d5 |
return res;
|
|
|
061d3d5 |
}
|
|
|
061d3d5 |
|
|
|
061d3d5 |
+static int parse_ip6_class(int *argc_p, char ***argv_p, struct tc_u32_sel *sel)
|
|
|
061d3d5 |
+{
|
|
|
061d3d5 |
+ int res = -1;
|
|
|
061d3d5 |
+ int argc = *argc_p;
|
|
|
061d3d5 |
+ char **argv = *argv_p;
|
|
|
061d3d5 |
+ __u32 key;
|
|
|
061d3d5 |
+ __u32 mask;
|
|
|
061d3d5 |
+ int offmask = 0;
|
|
|
061d3d5 |
+
|
|
|
061d3d5 |
+ if (argc < 2)
|
|
|
061d3d5 |
+ return -1;
|
|
|
061d3d5 |
+
|
|
|
061d3d5 |
+ if (get_u32(&key, *argv, 0))
|
|
|
061d3d5 |
+ return -1;
|
|
|
061d3d5 |
+ argc--; argv++;
|
|
|
061d3d5 |
+
|
|
|
061d3d5 |
+ if (get_u32(&mask, *argv, 16))
|
|
|
061d3d5 |
+ return -1;
|
|
|
061d3d5 |
+ argc--; argv++;
|
|
|
061d3d5 |
+
|
|
|
061d3d5 |
+ if (key > 0xFF || mask > 0xFF)
|
|
|
061d3d5 |
+ return -1;
|
|
|
061d3d5 |
+
|
|
|
061d3d5 |
+ key <<= 20;
|
|
|
061d3d5 |
+ mask <<= 20;
|
|
|
061d3d5 |
+ key = htonl(key);
|
|
|
061d3d5 |
+ mask = htonl(mask);
|
|
|
061d3d5 |
+
|
|
|
061d3d5 |
+ if (res = pack_key(sel, key, mask, 0, offmask) < 0)
|
|
|
061d3d5 |
+ return -1;
|
|
|
061d3d5 |
+ res = 0;
|
|
|
061d3d5 |
+
|
|
|
061d3d5 |
+ *argc_p = argc;
|
|
|
061d3d5 |
+ *argv_p = argv;
|
|
|
061d3d5 |
+ return res;
|
|
|
061d3d5 |
+}
|
|
|
061d3d5 |
+
|
|
|
061d3d5 |
static int parse_ether_addr(int *argc_p, char ***argv_p,
|
|
|
061d3d5 |
struct tc_u32_sel *sel, int off)
|
|
|
061d3d5 |
{
|
|
|
061d3d5 |
@@ -522,7 +559,7 @@ static int parse_ip6(int *argc_p, char ***argv_p, struct tc_u32_sel *sel)
|
|
|
061d3d5 |
res = parse_ip6_addr(&argc, &argv, sel, 24);
|
|
|
061d3d5 |
} else if (strcmp(*argv, "priority") == 0) {
|
|
|
061d3d5 |
NEXT_ARG();
|
|
|
061d3d5 |
- res = parse_u8(&argc, &argv, sel, 4, 0);
|
|
|
061d3d5 |
+ res = parse_ip6_class(&argc, &argv, sel);
|
|
|
061d3d5 |
} else if (strcmp(*argv, "protocol") == 0) {
|
|
|
061d3d5 |
NEXT_ARG();
|
|
|
061d3d5 |
res = parse_u8(&argc, &argv, sel, 6, 0);
|