korg/iproute2
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git synced 2024-11-15 22:15:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

iprule: Add tun_id filed in the selector

Browse Source 
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>
This commit is contained in:
wenxu 2018-12-24 16:49:44 +08:00 committed by Stephen Hemminger
parent 72cdb77d1a
commit cb65a9cb81
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ip/iprule.c
View File

@ -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();

4
man/man8/ip-rule.8
View File

@ -54,7 +54,9 @@ ip-rule \- routing policy database management
.IR NUMBER "-" NUMBER " ] ] [ "
.BR dport " [ "
.IR NUMBER " | "
.IR NUMBER "-" NUMBER " ] ]"
.IR NUMBER "-" NUMBER " ] ] [ "
.B tun_id
.IR TUN_ID " ]"
.BR