diff options
| author |   Alex Gartrell <agartrell@fb.com> | 2014-09-09 16:40:21 -0700 |
|---|---|---|
| committer |   Simon Horman <horms@verge.net.au> | 2014-09-16 09:03:33 +0900 |
| commit | 655eef103d0bd99f540a52f7ede032e120756846 (patch) | |
| tree | 4279dfa6fd9c3e7825ce0a4f892b72d5a52eeb0d /net/netfilter/ipvs/ip_vs_sync.c | |
| parent | ipvs: Add destination address family to netlink interface (diff) | |
| download | linux-dev-655eef103d0bd99f540a52f7ede032e120756846.tar.xz linux-dev-655eef103d0bd99f540a52f7ede032e120756846.zip | |
ipvs: Supply destination addr family to ip_vs_{lookup_dest,find_dest}
We need to remove the assumption that virtual address family is the same as
real address family in order to support heterogeneous services (that is,
services with v4 vips and v6 backends or the opposite).
Signed-off-by: Alex Gartrell <agartrell@fb.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_sync.c')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_sync.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c index eadffb29dec0..edd266414b7d 100644 --- a/net/netfilter/ipvs/ip_vs_sync.c +++ b/net/netfilter/ipvs/ip_vs_sync.c @@ -880,8 +880,14 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param, * but still handled. */ rcu_read_lock(); - dest = ip_vs_find_dest(net, type, daddr, dport, param->vaddr, - param->vport, protocol, fwmark, flags); + /* This function is only invoked by the synchronization + * code. We do not currently support heterogeneous pools + * with synchronization, so we can make the assumption that + * the svc_af is the same as the dest_af + */ + dest = ip_vs_find_dest(net, type, type, daddr, dport, + param->vaddr, param->vport, protocol, + fwmark, flags); cp = ip_vs_conn_new(param, daddr, dport, flags, dest, fwmark); rcu_read_unlock(); |