LVS
lvs-devel
Google
 
Web LinuxVirtualServer.org

[PATCH nf-next 18/21] ipvs: use correct address family in SH logs

To: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
Subject: [PATCH nf-next 18/21] ipvs: use correct address family in SH logs
Cc: lvs-devel@xxxxxxxxxxxxxxx, netdev@xxxxxxxxxxxxxxx, netfilter-devel@xxxxxxxxxxxxxxx, Wensong Zhang <wensong@xxxxxxxxxxxx>, Julian Anastasov <ja@xxxxxx>, Alex Gartrell <agartrell@xxxxxx>, Simon Horman <horms@xxxxxxxxxxxx>
From: Simon Horman <horms@xxxxxxxxxxxx>
Date: Tue, 16 Sep 2014 09:34:32 +0900
From: Julian Anastasov <ja@xxxxxx>

Needed to support svc->af != dest->af.

Signed-off-by: Julian Anastasov <ja@xxxxxx>
Signed-off-by: Alex Gartrell <agartrell@xxxxxx>
Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
---
 net/netfilter/ipvs/ip_vs_sh.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_sh.c b/net/netfilter/ipvs/ip_vs_sh.c
index cc65b2f..98a1343 100644
--- a/net/netfilter/ipvs/ip_vs_sh.c
+++ b/net/netfilter/ipvs/ip_vs_sh.c
@@ -138,7 +138,7 @@ ip_vs_sh_get_fallback(struct ip_vs_service *svc, struct 
ip_vs_sh_state *s,
                return dest;
 
        IP_VS_DBG_BUF(6, "SH: selected unavailable server %s:%d, reselecting",
-                     IP_VS_DBG_ADDR(svc->af, &dest->addr), ntohs(dest->port));
+                     IP_VS_DBG_ADDR(dest->af, &dest->addr), ntohs(dest->port));
 
        /* if the original dest is unavailable, loop around the table
         * starting from ihash to find a new dest
@@ -153,7 +153,7 @@ ip_vs_sh_get_fallback(struct ip_vs_service *svc, struct 
ip_vs_sh_state *s,
                        return dest;
                IP_VS_DBG_BUF(6, "SH: selected unavailable "
                              "server %s:%d (offset %d), reselecting",
-                             IP_VS_DBG_ADDR(svc->af, &dest->addr),
+                             IP_VS_DBG_ADDR(dest->af, &dest->addr),
                              ntohs(dest->port), roffset);
        }
 
@@ -192,7 +192,7 @@ ip_vs_sh_reassign(struct ip_vs_sh_state *s, struct 
ip_vs_service *svc)
                        RCU_INIT_POINTER(b->dest, dest);
 
                        IP_VS_DBG_BUF(6, "assigned i: %d dest: %s weight: %d\n",
-                                     i, IP_VS_DBG_ADDR(svc->af, &dest->addr),
+                                     i, IP_VS_DBG_ADDR(dest->af, &dest->addr),
                                      atomic_read(&dest->weight));
 
                        /* Don't move to next dest until filling weight */
@@ -342,7 +342,7 @@ ip_vs_sh_schedule(struct ip_vs_service *svc, const struct 
sk_buff *skb,
 
        IP_VS_DBG_BUF(6, "SH: source IP address %s --> server %s:%d\n",
                      IP_VS_DBG_ADDR(svc->af, &iph->saddr),
-                     IP_VS_DBG_ADDR(svc->af, &dest->addr),
+                     IP_VS_DBG_ADDR(dest->af, &dest->addr),
                      ntohs(dest->port));
 
        return dest;
-- 
2.0.1

--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

<Prev in Thread] Current Thread [Next in Thread>