pissnet/pissircd
1
0
Fork 0
mirror of https://github.com/pissnet/pissircd.git synced 2025-08-07 18:55:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

geoip_classic: ipv6 support

Browse source
This commit is contained in:
k4be 2021-08-26 13:33:40 +02:00
parent 326c1f5e4a
commit d5f69982eb
No known key found for this signature in database
GPG key ID: CF966708422300DC
1 changed files with 71 additions and 20 deletions

91
src/modules/geoip_classic.c
View file

@ -15,9 +15,16 @@ ModuleHeader MOD_HEADER
"unrealircd-6",
};
struct geoip_classic_config_s {
char *v4_db_file;
char *v6_db_file;
};
/* Variables */
char *db_file = NULL;
GeoIP *gi = NULL;
struct geoip_classic_config_s geoip_classic_config;
GeoIP *gi4 = NULL;
GeoIP *gi6 = NULL;
/* Forward declarations */
GeoIPResult *geoip_lookup_classic(char *ip);
@ -29,7 +36,7 @@ MOD_TEST()
{
unreal_log(ULOG_ERROR, "geoip_classic", "GEOIP_ADD_CALLBACK_FAILED", NULL,
"geoip_classic: Could not install GEOIP_LOOKUP callback. "
"Most likely another eoip module is already loaded. "
"Most likely another geoip module is already loaded. "
"You can only load one!");
return MOD_FAILED;
}
@ -38,17 +45,45 @@ MOD_TEST()
MOD_INIT()
{
int found_good_file = 0;
MARK_AS_OFFICIAL_MODULE(modinfo);
safe_strdup(db_file, "GeoIP.dat");
convert_to_absolute_path(&db_file, PERMDATADIR);
gi = GeoIP_open(db_file, GEOIP_STANDARD | GEOIP_CHECK_CACHE | GEOIP_SILENCE);
if (!gi)
safe_strdup(geoip_classic_config.v4_db_file, "GeoIP.dat");
safe_strdup(geoip_classic_config.v6_db_file, "GeoIPv6.dat");
convert_to_absolute_path(&geoip_classic_config.v4_db_file, PERMDATADIR);
convert_to_absolute_path(&geoip_classic_config.v6_db_file, PERMDATADIR);
gi4 = GeoIP_open(geoip_classic_config.v4_db_file, GEOIP_STANDARD | GEOIP_CHECK_CACHE | GEOIP_SILENCE);
if (gi4)
{
found_good_file = 1;
} else
{
int save_err = errno;
unreal_log(ULOG_ERROR, "geoip_classic", "GEOIP_CANNOT_OPEN_DB", NULL,
"Could not open '$filename': $system_error",
log_data_string("filename", db_file),
unreal_log(ULOG_WARNING, "geoip_classic", "GEOIP_CANNOT_OPEN_DB", NULL,
"[IPv4] Could not open '$filename': $system_error",
log_data_string("filename", geoip_classic_config.v4_db_file),
log_data_string("system_error", strerror(save_err)));
}
gi6 = GeoIP_open(geoip_classic_config.v6_db_file, GEOIP_STANDARD | GEOIP_CHECK_CACHE | GEOIP_SILENCE);
if (gi6)
{
found_good_file = 1;
} else
{
int save_err = errno;
unreal_log(ULOG_WARNING, "geoip_classic", "GEOIP_CANNOT_OPEN_DB", NULL,
"[IPv6] Could not open '$filename': $system_error",
log_data_string("filename", geoip_classic_config.v6_db_file),
log_data_string("system_error", strerror(save_err)));
}
if (!found_good_file)
{
unreal_log(ULOG_ERROR, "geoip_classic", "GEOIP_CANNOT_OPEN_DB", NULL,
"could not open any database!");
return MOD_FAILED;
}
return MOD_SUCCESS;
@ -61,9 +96,12 @@ MOD_LOAD()
MOD_UNLOAD()
{
if (gi)
GeoIP_delete(gi);
safe_free(db_file);
if (gi4)
GeoIP_delete(gi4);
if (gi6)
GeoIP_delete(gi6);
safe_free(geoip_classic_config.v4_db_file);
safe_free(geoip_classic_config.v6_db_file);
return MOD_SUCCESS;
}
@ -73,18 +111,31 @@ GeoIPResult *geoip_lookup_classic(char *ip)
const char *country_code, *country_name;
GeoIPResult *r;
if (!gi || !ip || !strcmp(ip, "255.255.255.255"))
if (!ip)
return NULL;
country_code = GeoIP_country_code_by_name(gi, ip);
if (!country_code)
return NULL;
country_name = GeoIP_country_name_by_name(gi, ip);
if (!country_name)
return NULL;
if (strchr(ip, ':'))
{
if (!gi6)
return NULL;
country_code = GeoIP_country_code_by_name_v6(gi6, ip);
country_name = GeoIP_country_name_by_name_v6(gi6, ip);
} else
{
if (!gi4 || !strcmp(ip, "255.255.255.255"))
return NULL;
country_code = GeoIP_country_code_by_name(gi4, ip);
country_name = GeoIP_country_name_by_name(gi4, ip);
}
if (!country_code || !country_name)
return NULL;
r = safe_alloc(sizeof(GeoIPResult));
safe_strdup(r->country_code, country_code);
safe_strdup(r->country_name, country_name);
return r;
}