ipvs: use correct address family in scheduler logs

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>

diff --git a/net/netfilter/ipvs/ip_vs_dh.c b/net/netfilter/ipvs/ip_vs_dh.c
index c3b8454..6be5c53 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_dh.c
+++ b/net/netfilter/ipvs/ip_vs_dh.c
@@ -234,7 +234,7 @@ ip_vs_dh_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,
 
        IP_VS_DBG_BUF(6, "DH: destination IP address %s --> server %s:%d\n",
                      IP_VS_DBG_ADDR(svc->af, &iph->daddr),
-                     IP_VS_DBG_ADDR(svc->af, &dest->addr),
+                     IP_VS_DBG_ADDR(dest->af, &dest->addr),
                      ntohs(dest->port));
 
        return dest;

diff --git a/net/netfilter/ipvs/ip_vs_fo.c b/net/netfilter/ipvs/ip_vs_fo.c
index 6a2647d..e09874d 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_fo.c
+++ b/net/netfilter/ipvs/ip_vs_fo.c
@@ -44,7 +44,7 @@ ip_vs_fo_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,
 
        if (hweight) {
                IP_VS_DBG_BUF(6, "FO: server %s:%u activeconns %d weight %d\n",
-                             IP_VS_DBG_ADDR(svc->af, &hweight->addr),
+                             IP_VS_DBG_ADDR(hweight->af, &hweight->addr),
                              ntohs(hweight->port),
                              atomic_read(&hweight->activeconns),
                              atomic_read(&hweight->weight));

diff --git a/net/netfilter/ipvs/ip_vs_lc.c b/net/netfilter/ipvs/ip_vs_lc.c
index 2bdcb1c..19a0769 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_lc.c
+++ b/net/netfilter/ipvs/ip_vs_lc.c
@@ -59,7 +59,7 @@ ip_vs_lc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,
        else
                IP_VS_DBG_BUF(6, "LC: server %s:%u activeconns %d "
                              "inactconns %d\n",
-                             IP_VS_DBG_ADDR(svc->af, &least->addr),
+                             IP_VS_DBG_ADDR(least->af, &least->addr),
                              ntohs(least->port),
                              atomic_read(&least->activeconns),
                              atomic_read(&least->inactconns));

diff --git a/net/netfilter/ipvs/ip_vs_nq.c b/net/netfilter/ipvs/ip_vs_nq.c
index 961a6de..a8b6340 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_nq.c
+++ b/net/netfilter/ipvs/ip_vs_nq.c
@@ -107,7 +107,8 @@ ip_vs_nq_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,
   out:
        IP_VS_DBG_BUF(6, "NQ: server %s:%u "
                      "activeconns %d refcnt %d weight %d overhead %d\n",
-                     IP_VS_DBG_ADDR(svc->af, &least->addr), ntohs(least->port),
+                     IP_VS_DBG_ADDR(least->af, &least->addr),
+                     ntohs(least->port),
                      atomic_read(&least->activeconns),
                      atomic_read(&least->refcnt),
                      atomic_read(&least->weight), loh);

diff --git a/net/netfilter/ipvs/ip_vs_rr.c b/net/netfilter/ipvs/ip_vs_rr.c
index 176b87c..58bacfc 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_rr.c
+++ b/net/netfilter/ipvs/ip_vs_rr.c
@@ -95,7 +95,7 @@ stop:
        spin_unlock_bh(&svc->sched_lock);
        IP_VS_DBG_BUF(6, "RR: server %s:%u "
                      "activeconns %d refcnt %d weight %d\n",
-                     IP_VS_DBG_ADDR(svc->af, &dest->addr), ntohs(dest->port),
+                     IP_VS_DBG_ADDR(dest->af, &dest->addr), ntohs(dest->port),
                      atomic_read(&dest->activeconns),
                      atomic_read(&dest->refcnt), atomic_read(&dest->weight));
 

diff --git a/net/netfilter/ipvs/ip_vs_sed.c b/net/netfilter/ipvs/ip_vs_sed.c
index e446b9f..f8e2d00 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_sed.c
+++ b/net/netfilter/ipvs/ip_vs_sed.c
@@ -108,7 +108,8 @@ ip_vs_sed_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,
 
        IP_VS_DBG_BUF(6, "SED: server %s:%u "
                      "activeconns %d refcnt %d weight %d overhead %d\n",
-                     IP_VS_DBG_ADDR(svc->af, &least->addr), ntohs(least->port),
+                     IP_VS_DBG_ADDR(least->af, &least->addr),
+                     ntohs(least->port),
                      atomic_read(&least->activeconns),
                      atomic_read(&least->refcnt),
                      atomic_read(&least->weight), loh);

diff --git a/net/netfilter/ipvs/ip_vs_sh.c b/net/netfilter/ipvs/ip_vs_sh.c
index cc65b2f..98a1343 100644 (file)
--- 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;

diff --git a/net/netfilter/ipvs/ip_vs_wlc.c b/net/netfilter/ipvs/ip_vs_wlc.c
index b5b4650..6b366fd 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_wlc.c
+++ b/net/netfilter/ipvs/ip_vs_wlc.c
@@ -80,7 +80,8 @@ ip_vs_wlc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,
 
        IP_VS_DBG_BUF(6, "WLC: server %s:%u "
                      "activeconns %d refcnt %d weight %d overhead %d\n",
-                     IP_VS_DBG_ADDR(svc->af, &least->addr), ntohs(least->port),
+                     IP_VS_DBG_ADDR(least->af, &least->addr),
+                     ntohs(least->port),
                      atomic_read(&least->activeconns),
                      atomic_read(&least->refcnt),
                      atomic_read(&least->weight), loh);

diff --git a/net/netfilter/ipvs/ip_vs_wrr.c b/net/netfilter/ipvs/ip_vs_wrr.c
index 0546cd5..17e6d44 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_wrr.c
+++ b/net/netfilter/ipvs/ip_vs_wrr.c
@@ -216,7 +216,7 @@ ip_vs_wrr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,
 found:
        IP_VS_DBG_BUF(6, "WRR: server %s:%u "
                      "activeconns %d refcnt %d weight %d\n",
-                     IP_VS_DBG_ADDR(svc->af, &dest->addr), ntohs(dest->port),
+                     IP_VS_DBG_ADDR(dest->af, &dest->addr), ntohs(dest->port),
                      atomic_read(&dest->activeconns),
                      atomic_read(&dest->refcnt),
                      atomic_read(&dest->weight));