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

ip xfrm state: Allow different selector family 

My previous commit introduced a patch to allow for states with different
ip address families for selector and id. The must have somehow been a
mixup of the patch I tested and the one I send, so the patch sent breaks
the iproute2 build. This patch fixes this. My apologies.

Signed-off-by: Thomas Egerer <hakke_007@gmx.de>
This commit is contained in:
Thomas Egerer 2013-03-20 02:18:43 -07:00 committed by Stephen Hemminger
parent 23d5b0d551
commit 0c5982fd7f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ip/xfrm_state.c
View File

@ -296,7 +296,7 @@ static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv)
NEXT_ARG(); NEXT_ARG();
preferred_family = AF_UNSPEC; preferred_family = AF_UNSPEC;
xfrm_selector_parse(&req.xsinfo.sel, &argc, &argv); xfrm_selector_parse(&req.xsinfo.sel, &argc, &argv);
preferred_family = req.xsinfo.sel; preferred_family = req.xsinfo.sel.family;
} else if (strcmp(*argv, "limit") == 0) { } else if (strcmp(*argv, "limit") == 0) {
NEXT_ARG(); NEXT_ARG();
xfrm_lifetime_cfg_parse(&req.xsinfo.lft, &argc, &argv); xfrm_lifetime_cfg_parse(&req.xsinfo.lft, &argc, &argv);