diff options
| author | Alex Gartrell <agartrell@fb.com> | 2014-09-09 16:40:39 -0700 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2014-09-18 08:59:29 +0900 |
| commit | bc18d37f676f76edbb5e0c37def78c704b5fbed0 (patch) | |
| tree | 6da9a81dd94cceb14092385e91c739d8352a511e | |
| parent | f18ae7206eaebfecc2dd8b017b0d6a0950eabf8b (diff) | |
| download | linux-stable-bc18d37f676f76edbb5e0c37def78c704b5fbed0.tar.gz linux-stable-bc18d37f676f76edbb5e0c37def78c704b5fbed0.tar.bz2 linux-stable-bc18d37f676f76edbb5e0c37def78c704b5fbed0.zip | |
ipvs: Allow heterogeneous pools now that we support them
Remove the temporary consistency check and add a case statement to only
allow ipip mixed dests.
Signed-off-by: Alex Gartrell <agartrell@fb.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 462760eded94..ac7ba689efe7 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -854,10 +854,6 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest, EnterFunction(2); - /* Temporary for consistency */ - if (udest->af != svc->af) - return -EINVAL; - #ifdef CONFIG_IP_VS_IPV6 if (udest->af == AF_INET6) { atype = ipv6_addr_type(&udest->addr.in6); @@ -3403,6 +3399,26 @@ static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct genl_info *info) */ if (udest.af == 0) udest.af = svc->af; + + if (udest.af != svc->af) { + /* The synchronization protocol is incompatible + * with mixed family services + */ + if (net_ipvs(net)->sync_state) { + ret = -EINVAL; + goto out; + } + + /* Which connection types do we support? */ + switch (udest.conn_flags) { + case IP_VS_CONN_F_TUNNEL: + /* We are able to forward this */ + break; + default: + ret = -EINVAL; + goto out; + } + } } switch (cmd) { |