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

ip: xfrm: Clean-up for internal mask to filter. 

Remove unused or redundant usage for xfrm_filter.

Signed-off-by: Masahide NAKAMURA <nakam@linux-ipv6.org>
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
This commit is contained in:
Masahide NAKAMURA 2007-08-24 11:05:07 +09:00 committed by Stephen Hemminger
parent 2da55b1bbe
commit ed01e39068
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ip/xfrm_policy.c
View File

@ -222,16 +222,10 @@ static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv)
NEXT_ARG(); NEXT_ARG();
xfrm_policy_dir_parse(&req.xpinfo.dir, &argc, &argv); xfrm_policy_dir_parse(&req.xpinfo.dir, &argc, &argv);
filter.dir_mask = XFRM_FILTER_MASK_FULL;
} else if (strcmp(*argv, "index") == 0) { } else if (strcmp(*argv, "index") == 0) {
NEXT_ARG(); NEXT_ARG();
if (get_u32(&req.xpinfo.index, *argv, 0)) if (get_u32(&req.xpinfo.index, *argv, 0))
invarg("\"INDEX\" is invalid", *argv); invarg("\"INDEX\" is invalid", *argv);
filter.index_mask = XFRM_FILTER_MASK_FULL;
} else if (strcmp(*argv, "ptype") == 0) { } else if (strcmp(*argv, "ptype") == 0) {
if (ptypep) if (ptypep)
duparg("ptype", *argv); duparg("ptype", *argv);
@ -239,9 +233,6 @@ static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv)
NEXT_ARG(); NEXT_ARG();
xfrm_policy_ptype_parse(&upt.type, &argc, &argv); xfrm_policy_ptype_parse(&upt.type, &argc, &argv);
filter.dir_mask = XFRM_FILTER_MASK_FULL;
} else if (strcmp(*argv, "action") == 0) { } else if (strcmp(*argv, "action") == 0) {
NEXT_ARG(); NEXT_ARG();
if (strcmp(*argv, "allow") == 0) if (strcmp(*argv, "allow") == 0)
@ -250,16 +241,10 @@ static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv)
req.xpinfo.action = XFRM_POLICY_BLOCK; req.xpinfo.action = XFRM_POLICY_BLOCK;
else else
invarg("\"action\" value is invalid\n", *argv); invarg("\"action\" value is invalid\n", *argv);
filter.action_mask = XFRM_FILTER_MASK_FULL;
} else if (strcmp(*argv, "priority") == 0) { } else if (strcmp(*argv, "priority") == 0) {
NEXT_ARG(); NEXT_ARG();
if (get_u32(&req.xpinfo.priority, *argv, 0)) if (get_u32(&req.xpinfo.priority, *argv, 0))
invarg("\"PRIORITY\" is invalid", *argv); invarg("\"PRIORITY\" is invalid", *argv);
filter.priority_mask = XFRM_FILTER_MASK_FULL;
} else if (strcmp(*argv, "limit") == 0) { } else if (strcmp(*argv, "limit") == 0) {
NEXT_ARG(); NEXT_ARG();
xfrm_lifetime_cfg_parse(&req.xpinfo.lft, &argc, &argv); xfrm_lifetime_cfg_parse(&req.xpinfo.lft, &argc, &argv);
@ -888,8 +873,6 @@ static int xfrm_policy_flush(int argc, char **argv)
NEXT_ARG(); NEXT_ARG();
xfrm_policy_ptype_parse(&upt.type, &argc, &argv); xfrm_policy_ptype_parse(&upt.type, &argc, &argv);
filter.dir_mask = XFRM_FILTER_MASK_FULL;
} else } else
invarg("unknown", *argv); invarg("unknown", *argv);

2
ip/xfrm_state.c
View File

@ -216,8 +216,6 @@ static int xfrm_state_flag_parse(__u8 *flags, int *argcp, char ***argvp)
} }
} }
filter.state_flags_mask = XFRM_FILTER_MASK_FULL;
*argcp = argc; *argcp = argc;
*argvp = argv; *argvp = argv;