xt_geoip: v4/v6 name preparations

This commit is contained in:
Jan Engelhardt
2011-02-02 01:56:38 +01:00
parent 19f241a09c
commit eb9634aee6
3 changed files with 16 additions and 15 deletions

View File

@@ -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;
}