summaryrefslogtreecommitdiff
path: root/ip/iprule.c
diff options
context:
space:
mode:
authorwenxu <wenxu@ucloud.cn>2018-12-24 16:49:44 +0800
committerStephen Hemminger <stephen@networkplumber.org>2018-12-31 22:13:13 -0800
commitcb65a9cb81c95028bc97f421b0c4cfbf749f621c (patch)
treeb49bb7f8ebc88bf5d9c5128aed042e7497cc8b3a /ip/iprule.c
parent72cdb77d1a31afde5eb998eefe596db5d48d72cd (diff)
iprule: Add tun_id filed in the selector
ip rule add from all iif gretap tun_id 2000 lookup 200 Signed-off-by: wenxu <wenxu@ucloud.cn> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Diffstat (limited to 'ip/iprule.c')
-rw-r--r--ip/iprule.c33
1 files changed, 33 insertions, 0 deletions
diff --git a/ip/iprule.c b/ip/iprule.c
index 0f8fc6d9..9a7173d0 100644
--- a/ip/iprule.c
+++ b/ip/iprule.c
@@ -71,6 +71,7 @@ static struct
unsigned int tos, tosmask;
unsigned int pref, prefmask;
unsigned int fwmark, fwmask;
+ uint64_t tun_id;
char iif[IFNAMSIZ];
char oif[IFNAMSIZ];
struct fib_rule_uid_range range;
@@ -174,6 +175,18 @@ static bool filter_nlmsg(struct nlmsghdr *n, struct rtattr **tb, int host_len)
return false;
}
+ if (filter.tun_id) {
+ __u64 tun_id = 0;
+
+ if (tb[FRA_TUN_ID]) {
+ tun_id = ntohll(rta_getattr_u64(tb[FRA_TUN_ID]));
+ if (filter.tun_id != tun_id)
+ return false;
+ } else {
+ return false;
+ }
+ }
+
table = frh_get_table(frh, tb);
if (filter.tb > 0 && filter.tb ^ table)
return false;
@@ -340,6 +353,12 @@ int print_rule(struct nlmsghdr *n, void *arg)
}
}
+ if (tb[FRA_TUN_ID]) {
+ __u64 tun_id = ntohll(rta_getattr_u64(tb[FRA_TUN_ID]));
+
+ print_u64(PRINT_ANY, "tun_id", "tun_id %llu ", tun_id);
+ }
+
table = frh_get_table(frh, tb);
if (table) {
print_string(PRINT_ANY, "table",
@@ -583,6 +602,13 @@ static int iprule_list_flush_or_save(int argc, char **argv, int action)
&filter.range.end) != 2)
invarg("invalid UID range\n", *argv);
+ } else if (matches(*argv, "tun_id") == 0) {
+ __u64 tun_id;
+
+ NEXT_ARG();
+ if (get_u64(&tun_id, *argv, 0))
+ invarg("\"tun_id\" value is invalid\n", *argv);
+ filter.tun_id = tun_id;
} else if (matches(*argv, "lookup") == 0 ||
matches(*argv, "table") == 0) {
__u32 tid;
@@ -779,6 +805,13 @@ static int iprule_modify(int cmd, int argc, char **argv)
if (rtnl_rtprot_a2n(&proto, *argv))
invarg("\"protocol\" value is invalid\n", *argv);
addattr8(&req.n, sizeof(req), FRA_PROTOCOL, proto);
+ } else if (matches(*argv, "tun_id") == 0) {
+ __u64 tun_id;
+
+ NEXT_ARG();
+ if (get_be64(&tun_id, *argv, 0))
+ invarg("\"tun_id\" value is invalid\n", *argv);
+ addattr64(&req.n, sizeof(req), FRA_TUN_ID, tun_id);
} else if (matches(*argv, "table") == 0 ||
strcmp(*argv, "lookup") == 0) {
NEXT_ARG();