From eb9634aee671129033f01821a5790a5e30e252a7 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@medozas.de>
Date: Wed, 2 Feb 2011 01:56:38 +0100
Subject: [PATCH] xt_geoip: v4/v6 name preparations

---
 extensions/libxt_geoip.c |  9 +++++----
 extensions/xt_geoip.c    | 20 ++++++++++----------
 extensions/xt_geoip.h    |  2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/extensions/libxt_geoip.c b/extensions/libxt_geoip.c
index df28185..e6fbdd3 100644
--- a/extensions/libxt_geoip.c
+++ b/extensions/libxt_geoip.c
@@ -49,9 +49,10 @@ static struct option geoip_opts[] = {
 	{NULL},
 };
 
-static struct geoip_subnet *geoip_get_subnets(const char *code, uint32_t *count)
+static struct geoip_subnet4 *
+geoip_get_subnets(const char *code, uint32_t *count)
 {
-	struct geoip_subnet *subnets;
+	struct geoip_subnet4 *subnets;
 	struct stat sb;
 	char buf[256];
 	int fd;
@@ -69,7 +70,7 @@ static struct geoip_subnet *geoip_get_subnets(const char *code, uint32_t *count)
 	}
 
 	fstat(fd, &sb);
-	if (sb.st_size % sizeof(struct geoip_subnet) != 0)
+	if (sb.st_size % sizeof(struct geoip_subnet4) != 0)
 		xtables_error(OTHER_PROBLEM, "Database file %s seems to be "
 		           "corrupted", buf);
 	subnets = malloc(sb.st_size);
@@ -77,7 +78,7 @@ static struct geoip_subnet *geoip_get_subnets(const char *code, uint32_t *count)
 		xtables_error(OTHER_PROBLEM, "geoip: insufficient memory");
 	read(fd, subnets, sb.st_size);
 	close(fd);
-	*count = sb.st_size / sizeof(struct geoip_subnet);
+	*count = sb.st_size / sizeof(struct geoip_subnet4);
 	return subnets;
 }
  
diff --git a/extensions/xt_geoip.c b/extensions/xt_geoip.c
index acd1343..2f3caae 100644
--- a/extensions/xt_geoip.c
+++ b/extensions/xt_geoip.c
@@ -37,7 +37,7 @@ MODULE_ALIAS("ipt_geoip");
  */
 struct geoip_country_kernel {
 	struct list_head list;
-	struct geoip_subnet *subnets;
+	struct geoip_subnet4 *subnets;
 	atomic_t ref;
 	unsigned int count;
 	unsigned short cc;
@@ -51,7 +51,7 @@ geoip_add_node(const struct geoip_country_user __user *umem_ptr)
 {
 	struct geoip_country_user umem;
 	struct geoip_country_kernel *p;
-	struct geoip_subnet *subnet;
+	struct geoip_subnet4 *subnet;
 	int ret;
 
 	if (copy_from_user(&umem, umem_ptr, sizeof(umem)) != 0)
@@ -64,14 +64,14 @@ geoip_add_node(const struct geoip_country_user __user *umem_ptr)
 	p->count   = umem.count;
 	p->cc      = umem.cc;
 
-	subnet = vmalloc(p->count * sizeof(struct geoip_subnet));
+	subnet = vmalloc(p->count * sizeof(struct geoip_subnet4));
 	if (subnet == NULL) {
 		ret = -ENOMEM;
 		goto free_p;
 	}
 	if (copy_from_user(subnet,
 	    (const void __user *)(unsigned long)umem.subnets,
-	    p->count * sizeof(struct geoip_subnet)) != 0) {
+	    p->count * sizeof(struct geoip_subnet4)) != 0) {
 		ret = -EFAULT;
 		goto free_s;
 	}
@@ -128,7 +128,7 @@ static struct geoip_country_kernel *find_node(unsigned short cc)
 	return NULL;
 }
 
-static bool geoip_bsearch(const struct geoip_subnet *range,
+static bool geoip_bsearch4(const struct geoip_subnet4 *range,
     uint32_t addr, int lo, int hi)
 {
 	int mid;
@@ -139,16 +139,16 @@ static bool geoip_bsearch(const struct geoip_subnet *range,
 	if (range[mid].begin <= addr && addr <= range[mid].end)
 		return true;
 	if (range[mid].begin > addr)
-		return geoip_bsearch(range, addr, lo, mid);
+		return geoip_bsearch4(range, addr, lo, mid);
 	else if (range[mid].end < addr)
-		return geoip_bsearch(range, addr, mid + 1, hi);
+		return geoip_bsearch4(range, addr, mid + 1, hi);
 
 	WARN_ON(true);
 	return false;
 }
 
 static bool
-xt_geoip_mt(const struct sk_buff *skb, struct xt_action_param *par)
+xt_geoip_mt4(const struct sk_buff *skb, struct xt_action_param *par)
 {
 	const struct xt_geoip_match_info *info = par->matchinfo;
 	const struct geoip_country_kernel *node;
@@ -164,7 +164,7 @@ xt_geoip_mt(const struct sk_buff *skb, struct xt_action_param *par)
 					COUNTRY(info->cc[i]));
 			continue;
 		}
-		if (geoip_bsearch(node->subnets, ip, 0, node->count)) {
+		if (geoip_bsearch4(node->subnets, ip, 0, node->count)) {
 			rcu_read_unlock();
 			return !(info->flags & XT_GEOIP_INV);
 		}
@@ -232,7 +232,7 @@ static struct xt_match xt_geoip_match __read_mostly = {
 	.name       = "geoip",
 	.revision   = 1,
 	.family     = NFPROTO_IPV4,
-	.match      = xt_geoip_mt,
+	.match      = xt_geoip_mt4,
 	.checkentry = xt_geoip_mt_checkentry,
 	.destroy    = xt_geoip_mt_destroy,
 	.matchsize  = sizeof(struct xt_geoip_match_info),
diff --git a/extensions/xt_geoip.h b/extensions/xt_geoip.h
index eed4571..c447e61 100644
--- a/extensions/xt_geoip.h
+++ b/extensions/xt_geoip.h
@@ -22,7 +22,7 @@ enum {
 };
 
 /* Yup, an address range will be passed in with host-order */
-struct geoip_subnet {
+struct geoip_subnet4 {
 	__u32 begin;
 	__u32 end;
 };