anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-12-07 00:23:53 +01:00
Code Issues Releases Wiki Activity

geoip: split user/kernel-visible parts of struct geoip_info

Browse Source
This commit is contained in:
Jan Engelhardt
2008-03-18 02:31:57 +01:00
parent 65eeb7f1f6
commit fd5321c7d8
3 changed files with 46 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/libxt_geoip.c
View File

@@ -122,11 +122,11 @@ get_country_subnets(u_int16_t cc, u_int32_t *count)
return subnets;
}
static struct geoip_info *
static struct geoip_country_user *
load_geoip_cc(u_int16_t cc)
{
static struct geoip_info *ginfo;
ginfo = malloc(sizeof(struct geoip_info));
struct geoip_country_user *ginfo;
ginfo = malloc(sizeof(struct geoip_country_user));
if (!ginfo)
return NULL;
@@ -175,7 +175,7 @@ check_geoip_cc(char *cc, u_int16_t cc_used[], u_int8_t count)
/* Based on libipt_multiport.c parsing code. */
static u_int8_t
parse_geoip_cc(const char *ccstr, u_int16_t *cc, struct geoip_info **mem)
parse_geoip_cc(const char *ccstr, u_int16_t *cc, union geoip_country_group *mem)
{
char *buffer, *cp, *next;
u_int8_t i, count = 0;
@@ -192,7 +192,7 @@ parse_geoip_cc(const char *ccstr, u_int16_t *cc, struct geoip_info **mem)
if (next) *next++ = '\0';
if ((cctmp = check_geoip_cc(cp, cc, count)) != 0) {
if ((mem[count++] = load_geoip_cc(cctmp)) == NULL)
if ((mem[count++].user = load_geoip_cc(cctmp)) == NULL)
exit_error(OTHER_PROBLEM,
"geoip: insufficient memory available");
cc[count-1] = cctmp;