matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ip xfrm: policy: support policies with IF_ID in get/delete/deleteall 

The XFRMA_IF_ID attribute is set in policies for them to be
associated with an XFRM interface (4.19+).

Add support for getting/deleting policies with this attribute.

For supporting 'deleteall' the XFRMA_IF_ID attribute needs to be
explicitly copied.

Signed-off-by: Eyal Birger <eyal.birger@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Eyal Birger 2020-07-09 09:29:48 +03:00 committed by Stephen Hemminger
parent ee93c1107f
commit f33a871b80
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ip/xfrm_policy.c
View File

@ -59,6 +59,7 @@ static void usage(void)
" [ if_id IF_ID ] [ LIMIT-LIST ] [ TMPL-LIST ]\n" " [ if_id IF_ID ] [ LIMIT-LIST ] [ TMPL-LIST ]\n"
"Usage: ip xfrm policy { delete | get } { SELECTOR | index INDEX } dir DIR\n" "Usage: ip xfrm policy { delete | get } { SELECTOR | index INDEX } dir DIR\n"
" [ ctx CTX ] [ mark MARK [ mask MASK ] ] [ ptype PTYPE ]\n" " [ ctx CTX ] [ mark MARK [ mask MASK ] ] [ ptype PTYPE ]\n"
" [ if_id IF_ID ]\n"
"Usage: ip xfrm policy { deleteall | list } [ nosock ] [ SELECTOR ] [ dir DIR ]\n" "Usage: ip xfrm policy { deleteall | list } [ nosock ] [ SELECTOR ] [ dir DIR ]\n"
" [ index INDEX ] [ ptype PTYPE ] [ action ACTION ] [ priority PRIORITY ]\n" " [ index INDEX ] [ ptype PTYPE ] [ action ACTION ] [ priority PRIORITY ]\n"
" [ flag FLAG-LIST ]\n" " [ flag FLAG-LIST ]\n"
@ -582,6 +583,8 @@ static int xfrm_policy_get_or_delete(int argc, char **argv, int delete,
struct xfrm_user_sec_ctx sctx; struct xfrm_user_sec_ctx sctx;
char str[CTX_BUF_SIZE]; char str[CTX_BUF_SIZE];
} ctx = {}; } ctx = {};
bool is_if_id_set = false;
__u32 if_id = 0;
while (argc > 0) { while (argc > 0) {
if (strcmp(*argv, "dir") == 0) { if (strcmp(*argv, "dir") == 0) {
@ -619,7 +622,11 @@ static int xfrm_policy_get_or_delete(int argc, char **argv, int delete,
NEXT_ARG(); NEXT_ARG();
xfrm_policy_ptype_parse(&upt.type, &argc, &argv); xfrm_policy_ptype_parse(&upt.type, &argc, &argv);
} else if (strcmp(*argv, "if_id") == 0) {
NEXT_ARG();
if (get_u32(&if_id, *argv, 0))
invarg("IF_ID value is invalid", *argv);
is_if_id_set = true;
} else { } else {
if (selp) if (selp)
invarg("unknown", *argv); invarg("unknown", *argv);
@ -669,6 +676,9 @@ static int xfrm_policy_get_or_delete(int argc, char **argv, int delete,
(void *)&ctx, ctx.sctx.len); (void *)&ctx, ctx.sctx.len);
} }
if (is_if_id_set)
addattr32(&req.n, sizeof(req.buf), XFRMA_IF_ID, if_id);
if (rtnl_talk(&rth, &req.n, answer) < 0) if (rtnl_talk(&rth, &req.n, answer) < 0)
exit(2); exit(2);
@ -767,6 +777,11 @@ static int xfrm_policy_keep(struct nlmsghdr *n, void *arg)
} }
} }
if (tb[XFRMA_IF_ID]) {
addattr32(new_n, xb->size, XFRMA_IF_ID,
rta_getattr_u32(tb[XFRMA_IF_ID]));
}
xb->offset += new_n->nlmsg_len; xb->offset += new_n->nlmsg_len;
xb->nlmsg_count++; xb->nlmsg_count++;

2
man/man8/ip-xfrm.8
View File

@ -259,6 +259,8 @@ ip-xfrm \- transform configuration
.IR MASK " ] ]" .IR MASK " ] ]"
.RB "[ " ptype .RB "[ " ptype
.IR PTYPE " ]" .IR PTYPE " ]"
.RB "[ " if_id
.IR IF-ID " ]"
.ti -8 .ti -8
.BR ip " [ " -4 " | " -6 " ] " "xfrm policy" " { " deleteall " | " list " }" .BR ip " [ " -4 " | " -6 " ] " "xfrm policy" " { " deleteall " | " list " }"