Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Geoip: Fix missing continent id and fix indentation.

Browse Source
This commit is contained in:
Arkshine 2014-08-05 22:57:48 +02:00
parent adde73123f
commit 023c1e3baf
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/geoip/GeoIP2/maxminddb.cpp
View File

@ -611,7 +611,7 @@ MMDB_lookup_result_s MMDB_lookup_string(MMDB_s *const mmdb,
LOCAL int resolve_any_address(const char *ipstr, struct addrinfo **addresses) LOCAL int resolve_any_address(const char *ipstr, struct addrinfo **addresses)
{ {
struct addrinfo hints; struct addrinfo hints;
memset(&hints, 0, sizeof(addrinfo)); // getaddrinfo doesn't like garbage. memset(&hints, 0, sizeof(addrinfo)); // getaddrinfo doesn't like garbage.
hints.ai_socktype = SOCK_STREAM; hints.ai_socktype = SOCK_STREAM;
int gai_status; int gai_status;

14
dlls/geoip/geoip_util.cpp
View File

@ -139,12 +139,13 @@ double lookupDouble(const char *ip, const char **path)
int getContinentId(const char *code) int getContinentId(const char *code)
{ {
#define CONTINENT_UNKNOWN 0 #define CONTINENT_UNKNOWN 0
#define CONTINENT_AFRICA 1 #define CONTINENT_AFRICA 1
#define CONTINENT_ASIA 2 #define CONTINENT_ANTARCTICA 2
#define CONTINENT_EUROPE 3 #define CONTINENT_ASIA 3
#define CONTINENT_NORTH_AMERICA 4 #define CONTINENT_EUROPE 4
#define CONTINENT_OCEANIA 5 #define CONTINENT_NORTH_AMERICA 5
#define CONTINENT_SOUTH_AMERICA 6 #define CONTINENT_OCEANIA 6
#define CONTINENT_SOUTH_AMERICA 7
int index = CONTINENT_UNKNOWN; int index = CONTINENT_UNKNOWN;
@ -157,6 +158,7 @@ int getContinentId(const char *code)
switch (code[1]) switch (code[1])
{ {
case 'F': index = CONTINENT_AFRICA; break; case 'F': index = CONTINENT_AFRICA; break;
case 'N': index = CONTINENT_ANTARCTICA; break;
case 'S': index = CONTINENT_ASIA; break; case 'S': index = CONTINENT_ASIA; break;
} }
} }

7
plugins/include/geoip.inc
View File

@ -197,8 +197,8 @@ native Float:geoip_distance(Float:lat1, Float:lon1, Float:lat2, Float:lon2, syst
* Look up the continent code for a given IP address. * Look up the continent code for a given IP address.
* *
* @note The code can be retrieved as integer (See CONTINENT_* constants.) or string (2 characters). * @note The code can be retrieved as integer (See CONTINENT_* constants.) or string (2 characters).
* @note Possible continent codes are AF, AS, EU, NA, OC, SA for * @note Possible continent codes are AF, AN, AS, EU, NA, OC, SA for
* Africa(1), Asia(2), Europe(3), North America(4), Oceania(5) and South America(6). * Africa(1), Antarctica(2), Asia(3), Europe(4), North America(5), Oceania(6), South America(7).
* *
* @param ip The IP address to look up. * @param ip The IP address to look up.
* @param result The result of the geoip look up. * @param result The result of the geoip look up.
@ -209,11 +209,12 @@ enum Continent
{ {
CONTINENT_UNKNOW = 0, CONTINENT_UNKNOW = 0,
CONTINENT_AFRICA, CONTINENT_AFRICA,
CONTINENT_ANTARCTICA,
CONTINENT_ASIA, CONTINENT_ASIA,
CONTINENT_EUROPE, CONTINENT_EUROPE,
CONTINENT_NORTH_AMERICA, CONTINENT_NORTH_AMERICA,
CONTINENT_OCEANIA, CONTINENT_OCEANIA,
CONTINENT_SOUTH_AMERICA CONTINENT_SOUTH_AMERICA,
}; };
native Continent:geoip_continent_code(const ip[], result[3]); native Continent:geoip_continent_code(const ip[], result[3]);