[PATCH ipvs,v2 03/18] ipvs: maintain a mixed_address_family_dest count

[Alex Gartrell <agartrell@xxxxxx>]

This is necessary to validate that we're not accidentally enabling
heterogeneous pool incompatible features like syncing.

Signed-off-by: Alex Gartrell <agartrell@xxxxxx>
---
 include/net/ip_vs.h            |  4 ++++
 net/netfilter/ipvs/ip_vs_ctl.c | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 7600dbe..576d7f0 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -990,6 +990,10 @@ struct netns_ipvs {
        char                    backup_mcast_ifn[IP_VS_IFNAME_MAXLEN];
        /* net name space ptr */
        struct net              *net;            /* Needed by timer routines */
+       /* Number of heterogeneous destinations, needed because
+        * heterogeneous are not supported when synchronization is
+        * enabled */
+       unsigned int            mixed_address_family_dests;
 };
 
 #define DEFAULT_SYNC_THRESHOLD 3
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 01c813e..2356f1d 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -778,6 +778,16 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct 
ip_vs_dest *dest,
        struct ip_vs_service *old_svc;
        struct ip_vs_scheduler *sched;
        int conn_flags;
+       u16 old_af, new_af;
+
+       new_af = udest->af;
+       old_af = dest->af;
+
+       /* We cannot modify an address and change the address family */
+       BUG_ON(!add && udest->af != dest->af);
+
+       if (add && udest->af != svc->af)
+               ipvs->mixed_address_family_dests++;
 
        /* set the weight and the flags */
        atomic_set(&dest->weight, udest->weight);
@@ -1061,6 +1071,9 @@ static void __ip_vs_unlink_dest(struct ip_vs_service *svc,
        list_del_rcu(&dest->n_list);
        svc->num_dests--;
 
+       if (dest->af != svc->af)
+               net_ipvs(svc->net)->mixed_address_family_dests--;
+
        if (svcupd) {
                struct ip_vs_scheduler *sched;
 
-- 
1.8.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