ipvs: address family of LBLC entry depends on svc family
The LBLC entries should use svc->af, not dest->af. Needed to support svc->af != dest->af. Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Alex Gartrell <agartrell@fb.com> Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
parent
8052ba2925
commit
f7fa380069
|
@ -199,11 +199,11 @@ ip_vs_lblc_get(int af, struct ip_vs_lblc_table *tbl,
|
||||||
*/
|
*/
|
||||||
static inline struct ip_vs_lblc_entry *
|
static inline struct ip_vs_lblc_entry *
|
||||||
ip_vs_lblc_new(struct ip_vs_lblc_table *tbl, const union nf_inet_addr *daddr,
|
ip_vs_lblc_new(struct ip_vs_lblc_table *tbl, const union nf_inet_addr *daddr,
|
||||||
struct ip_vs_dest *dest)
|
u16 af, struct ip_vs_dest *dest)
|
||||||
{
|
{
|
||||||
struct ip_vs_lblc_entry *en;
|
struct ip_vs_lblc_entry *en;
|
||||||
|
|
||||||
en = ip_vs_lblc_get(dest->af, tbl, daddr);
|
en = ip_vs_lblc_get(af, tbl, daddr);
|
||||||
if (en) {
|
if (en) {
|
||||||
if (en->dest == dest)
|
if (en->dest == dest)
|
||||||
return en;
|
return en;
|
||||||
|
@ -213,8 +213,8 @@ ip_vs_lblc_new(struct ip_vs_lblc_table *tbl, const union nf_inet_addr *daddr,
|
||||||
if (!en)
|
if (!en)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
en->af = dest->af;
|
en->af = af;
|
||||||
ip_vs_addr_copy(dest->af, &en->addr, daddr);
|
ip_vs_addr_copy(af, &en->addr, daddr);
|
||||||
en->lastuse = jiffies;
|
en->lastuse = jiffies;
|
||||||
|
|
||||||
ip_vs_dest_hold(dest);
|
ip_vs_dest_hold(dest);
|
||||||
|
@ -521,13 +521,13 @@ ip_vs_lblc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,
|
||||||
/* If we fail to create a cache entry, we'll just use the valid dest */
|
/* If we fail to create a cache entry, we'll just use the valid dest */
|
||||||
spin_lock_bh(&svc->sched_lock);
|
spin_lock_bh(&svc->sched_lock);
|
||||||
if (!tbl->dead)
|
if (!tbl->dead)
|
||||||
ip_vs_lblc_new(tbl, &iph->daddr, dest);
|
ip_vs_lblc_new(tbl, &iph->daddr, svc->af, dest);
|
||||||
spin_unlock_bh(&svc->sched_lock);
|
spin_unlock_bh(&svc->sched_lock);
|
||||||
|
|
||||||
out:
|
out:
|
||||||
IP_VS_DBG_BUF(6, "LBLC: destination IP address %s --> server %s:%d\n",
|
IP_VS_DBG_BUF(6, "LBLC: destination IP address %s --> server %s:%d\n",
|
||||||
IP_VS_DBG_ADDR(svc->af, &iph->daddr),
|
IP_VS_DBG_ADDR(svc->af, &iph->daddr),
|
||||||
IP_VS_DBG_ADDR(svc->af, &dest->addr), ntohs(dest->port));
|
IP_VS_DBG_ADDR(dest->af, &dest->addr), ntohs(dest->port));
|
||||||
|
|
||||||
return dest;
|
return dest;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue