diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-02 18:56:49 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-02 18:56:49 -0500 |
| commit | 455ffa607f0efa90c9fec99604553b7cdd5274b2 (patch) | |
| tree | 6ff12c853b4a26612ceea8191a8eae29b130b670 /net/netfilter/ipvs/ip_vs_ctl.c | |
| parent | 3ab0b245aa550ea4670d096092ca8e8d5e14ac89 (diff) | |
| parent | 115e8e705e4be071b9e06ff72578e3b603f2ba65 (diff) | |
| download | linux-3.10-455ffa607f0efa90c9fec99604553b7cdd5274b2.tar.gz linux-3.10-455ffa607f0efa90c9fec99604553b7cdd5274b2.tar.bz2 linux-3.10-455ffa607f0efa90c9fec99604553b7cdd5274b2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_ctl.c')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 03df505f3c1..b3afe189af6 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -619,15 +619,21 @@ struct ip_vs_dest *ip_vs_find_dest(struct net *net, int af, const union nf_inet_addr *daddr, __be16 dport, const union nf_inet_addr *vaddr, - __be16 vport, __u16 protocol, __u32 fwmark) + __be16 vport, __u16 protocol, __u32 fwmark, + __u32 flags) { struct ip_vs_dest *dest; struct ip_vs_service *svc; + __be16 port = dport; svc = ip_vs_service_get(net, af, fwmark, protocol, vaddr, vport); if (!svc) return NULL; - dest = ip_vs_lookup_dest(svc, daddr, dport); + if (fwmark && (flags & IP_VS_CONN_F_FWD_MASK) != IP_VS_CONN_F_MASQ) + port = 0; + dest = ip_vs_lookup_dest(svc, daddr, port); + if (!dest) + dest = ip_vs_lookup_dest(svc, daddr, port ^ dport); if (dest) atomic_inc(&dest->refcnt); ip_vs_service_put(svc); |