From: Thomas Egerer <hakke_007@gmx.de>
Date: Sun, 17 Mar 2013 00:56:01 +0000 (+0000)
Subject: ip xfrm state: Allow different selector family
X-Git-Tag: v3.9.0~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23d5b0d5510242dc9622c3c63cfed01695dd94d0;p=thirdparty%2Fiproute2.git

ip xfrm state: Allow different selector family

Do not enforce the selector of a state to have the same address family
as the id. This makes it possible to configure inter family states.

Signed-off-by: Thomas Egerer <hakke_007@gmx.de>
---

diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c
index 35957bdde..6ff5b51fd 100644
--- a/ip/xfrm_state.c
+++ b/ip/xfrm_state.c
@@ -294,7 +294,9 @@ static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv)
 			xfrm_state_flag_parse(&req.xsinfo.flags, &argc, &argv);
 		} else if (strcmp(*argv, "sel") == 0) {
 			NEXT_ARG();
+			preferred_family = AF_UNSPEC;
 			xfrm_selector_parse(&req.xsinfo.sel, &argc, &argv);
+			preferred_family = req.xsinfo.sel;
 		} else if (strcmp(*argv, "limit") == 0) {
 			NEXT_ARG();
 			xfrm_lifetime_cfg_parse(&req.xsinfo.lft, &argc, &argv);