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

Merge pull request #178 from Arkshine/feature/update-libmaxminddb-1.0.4

Browse Source 
Geoip: Update libmaxminddb to 1.0.4
This commit is contained in:
Vincent Herbet 2015-01-14 12:48:44 +01:00
commit 7f9d677f89
9 changed files with 223 additions and 530 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/geoip/AMBuilder
View File

@ -9,7 +9,7 @@ binary.compiler.defines += [
binary.sources = [ binary.sources = [
'../../public/sdk/amxxmodule.cpp', '../../public/sdk/amxxmodule.cpp',
'GeoIP2/maxminddb.cpp', 'GeoIP2/maxminddb.c',
'geoip_main.cpp', 'geoip_main.cpp',
'geoip_natives.cpp', 'geoip_natives.cpp',
'geoip_util.cpp', 'geoip_util.cpp',

305
dlls/geoip/GeoIP2/inttypes.h
View File

@ -1,305 +0,0 @@
// ISO C9x compliant inttypes.h for Microsoft Visual Studio
// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
//
// Copyright (c) 2006 Alexander Chemeris
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// 1. Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
//
// 2. Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// 3. The name of the author may be used to endorse or promote products
// derived from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
///////////////////////////////////////////////////////////////////////////////
#ifndef _MSC_VER // [
#error "Use this header only with Microsoft Visual C++ compilers!"
#endif // _MSC_VER ]
#ifndef _MSC_INTTYPES_H_ // [
#define _MSC_INTTYPES_H_
#if _MSC_VER > 1000
#pragma once
#endif
#include <stdint.h>
// 7.8 Format conversion of integer types
typedef struct {
intmax_t quot;
intmax_t rem;
} imaxdiv_t;
// 7.8.1 Macros for format specifiers
#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [ See footnote 185 at page 198
// The fprintf macros for signed integers are:
#define PRId8 "d"
#define PRIi8 "i"
#define PRIdLEAST8 "d"
#define PRIiLEAST8 "i"
#define PRIdFAST8 "d"
#define PRIiFAST8 "i"
#define PRId16 "hd"
#define PRIi16 "hi"
#define PRIdLEAST16 "hd"
#define PRIiLEAST16 "hi"
#define PRIdFAST16 "hd"
#define PRIiFAST16 "hi"
#define PRId32 "I32d"
#define PRIi32 "I32i"
#define PRIdLEAST32 "I32d"
#define PRIiLEAST32 "I32i"
#define PRIdFAST32 "I32d"
#define PRIiFAST32 "I32i"
#define PRId64 "I64d"
#define PRIi64 "I64i"
#define PRIdLEAST64 "I64d"
#define PRIiLEAST64 "I64i"
#define PRIdFAST64 "I64d"
#define PRIiFAST64 "I64i"
#define PRIdMAX "I64d"
#define PRIiMAX "I64i"
#define PRIdPTR "Id"
#define PRIiPTR "Ii"
// The fprintf macros for unsigned integers are:
#define PRIo8 "o"
#define PRIu8 "u"
#define PRIx8 "x"
#define PRIX8 "X"
#define PRIoLEAST8 "o"
#define PRIuLEAST8 "u"
#define PRIxLEAST8 "x"
#define PRIXLEAST8 "X"
#define PRIoFAST8 "o"
#define PRIuFAST8 "u"
#define PRIxFAST8 "x"
#define PRIXFAST8 "X"
#define PRIo16 "ho"
#define PRIu16 "hu"
#define PRIx16 "hx"
#define PRIX16 "hX"
#define PRIoLEAST16 "ho"
#define PRIuLEAST16 "hu"
#define PRIxLEAST16 "hx"
#define PRIXLEAST16 "hX"
#define PRIoFAST16 "ho"
#define PRIuFAST16 "hu"
#define PRIxFAST16 "hx"
#define PRIXFAST16 "hX"
#define PRIo32 "I32o"
#define PRIu32 "I32u"
#define PRIx32 "I32x"
#define PRIX32 "I32X"
#define PRIoLEAST32 "I32o"
#define PRIuLEAST32 "I32u"
#define PRIxLEAST32 "I32x"
#define PRIXLEAST32 "I32X"
#define PRIoFAST32 "I32o"
#define PRIuFAST32 "I32u"
#define PRIxFAST32 "I32x"
#define PRIXFAST32 "I32X"
#define PRIo64 "I64o"
#define PRIu64 "I64u"
#define PRIx64 "I64x"
#define PRIX64 "I64X"
#define PRIoLEAST64 "I64o"
#define PRIuLEAST64 "I64u"
#define PRIxLEAST64 "I64x"
#define PRIXLEAST64 "I64X"
#define PRIoFAST64 "I64o"
#define PRIuFAST64 "I64u"
#define PRIxFAST64 "I64x"
#define PRIXFAST64 "I64X"
#define PRIoMAX "I64o"
#define PRIuMAX "I64u"
#define PRIxMAX "I64x"
#define PRIXMAX "I64X"
#define PRIoPTR "Io"
#define PRIuPTR "Iu"
#define PRIxPTR "Ix"
#define PRIXPTR "IX"
// The fscanf macros for signed integers are:
#define SCNd8 "d"
#define SCNi8 "i"
#define SCNdLEAST8 "d"
#define SCNiLEAST8 "i"
#define SCNdFAST8 "d"
#define SCNiFAST8 "i"
#define SCNd16 "hd"
#define SCNi16 "hi"
#define SCNdLEAST16 "hd"
#define SCNiLEAST16 "hi"
#define SCNdFAST16 "hd"
#define SCNiFAST16 "hi"
#define SCNd32 "ld"
#define SCNi32 "li"
#define SCNdLEAST32 "ld"
#define SCNiLEAST32 "li"
#define SCNdFAST32 "ld"
#define SCNiFAST32 "li"
#define SCNd64 "I64d"
#define SCNi64 "I64i"
#define SCNdLEAST64 "I64d"
#define SCNiLEAST64 "I64i"
#define SCNdFAST64 "I64d"
#define SCNiFAST64 "I64i"
#define SCNdMAX "I64d"
#define SCNiMAX "I64i"
#ifdef _WIN64 // [
# define SCNdPTR "I64d"
# define SCNiPTR "I64i"
#else // _WIN64 ][
# define SCNdPTR "ld"
# define SCNiPTR "li"
#endif // _WIN64 ]
// The fscanf macros for unsigned integers are:
#define SCNo8 "o"
#define SCNu8 "u"
#define SCNx8 "x"
#define SCNX8 "X"
#define SCNoLEAST8 "o"
#define SCNuLEAST8 "u"
#define SCNxLEAST8 "x"
#define SCNXLEAST8 "X"
#define SCNoFAST8 "o"
#define SCNuFAST8 "u"
#define SCNxFAST8 "x"
#define SCNXFAST8 "X"
#define SCNo16 "ho"
#define SCNu16 "hu"
#define SCNx16 "hx"
#define SCNX16 "hX"
#define SCNoLEAST16 "ho"
#define SCNuLEAST16 "hu"
#define SCNxLEAST16 "hx"
#define SCNXLEAST16 "hX"
#define SCNoFAST16 "ho"
#define SCNuFAST16 "hu"
#define SCNxFAST16 "hx"
#define SCNXFAST16 "hX"
#define SCNo32 "lo"
#define SCNu32 "lu"
#define SCNx32 "lx"
#define SCNX32 "lX"
#define SCNoLEAST32 "lo"
#define SCNuLEAST32 "lu"
#define SCNxLEAST32 "lx"
#define SCNXLEAST32 "lX"
#define SCNoFAST32 "lo"
#define SCNuFAST32 "lu"
#define SCNxFAST32 "lx"
#define SCNXFAST32 "lX"
#define SCNo64 "I64o"
#define SCNu64 "I64u"
#define SCNx64 "I64x"
#define SCNX64 "I64X"
#define SCNoLEAST64 "I64o"
#define SCNuLEAST64 "I64u"
#define SCNxLEAST64 "I64x"
#define SCNXLEAST64 "I64X"
#define SCNoFAST64 "I64o"
#define SCNuFAST64 "I64u"
#define SCNxFAST64 "I64x"
#define SCNXFAST64 "I64X"
#define SCNoMAX "I64o"
#define SCNuMAX "I64u"
#define SCNxMAX "I64x"
#define SCNXMAX "I64X"
#ifdef _WIN64 // [
# define SCNoPTR "I64o"
# define SCNuPTR "I64u"
# define SCNxPTR "I64x"
# define SCNXPTR "I64X"
#else // _WIN64 ][
# define SCNoPTR "lo"
# define SCNuPTR "lu"
# define SCNxPTR "lx"
# define SCNXPTR "lX"
#endif // _WIN64 ]
#endif // __STDC_FORMAT_MACROS ]
// 7.8.2 Functions for greatest-width integer types
// 7.8.2.1 The imaxabs function
#define imaxabs _abs64
// 7.8.2.2 The imaxdiv function
// This is modified version of div() function from Microsoft's div.c found
// in %MSVC.NET%\crt\src\div.c
#ifdef STATIC_IMAXDIV // [
static
#else // STATIC_IMAXDIV ][
_inline
#endif // STATIC_IMAXDIV ]
imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
{
imaxdiv_t result;
result.quot = numer / denom;
result.rem = numer % denom;
if (numer < 0 && result.rem > 0) {
// did division wrong; must fix up
++result.quot;
result.rem -= denom;
}
return result;
}
// 7.8.2.3 The strtoimax and strtoumax functions
#define strtoimax _strtoi64
#define strtoumax _strtoui64
// 7.8.2.4 The wcstoimax and wcstoumax functions
#define wcstoimax _wcstoi64
#define wcstoumax _wcstoui64
#endif // _MSC_INTTYPES_H_ ]

6
dlls/geoip/GeoIP2/maxminddb-compat-util.h
View File

@ -59,7 +59,7 @@ mmdb_memmem(const void *l, size_t l_len, const void *s, size_t s_len)
/* special case where s_len == 1 */ /* special case where s_len == 1 */
if (s_len == 1) if (s_len == 1)
return (void *)memchr(l, (int)*cs, l_len); return memchr(l, (int)*cs, l_len);
/* the last position where its possible to find "s" in "l" */ /* the last position where its possible to find "s" in "l" */
last = (char *)cl + l_len - s_len; last = (char *)cl + l_len - s_len;
@ -145,7 +145,7 @@ mmdb_strdup(const char *str)
char *copy; char *copy;
len = strlen(str) + 1; len = strlen(str) + 1;
if ((copy = (char *)malloc(len)) == NULL) if ((copy = malloc(len)) == NULL)
return (NULL); return (NULL);
memcpy(copy, str, len); memcpy(copy, str, len);
return (copy); return (copy);
@ -158,7 +158,7 @@ mmdb_strndup(const char *str, size_t n)
char *copy; char *copy;
len = mmdb_strnlen(str, n); len = mmdb_strnlen(str, n);
if ((copy = (char *)malloc(len + 1)) == NULL) if ((copy = malloc(len + 1)) == NULL)
return (NULL); return (NULL);
memcpy(copy, str, len); memcpy(copy, str, len);
copy[len] = '\0'; copy[len] = '\0';

238
dlls/geoip/GeoIP2/maxminddb.cpp → dlls/geoip/GeoIP2/maxminddb.c
View File

@ -3,23 +3,23 @@
#endif #endif
#include "maxminddb.h" #include "maxminddb.h"
#include "maxminddb-compat-util.h" #include "maxminddb-compat-util.h"
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <inttypes.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#define __STDC_FORMAT_MACROS /* Arkshine: Force to use C99 format macros */
#include <inttypes.h> /* MSVC doesn't fully support C99, so we provide the file */
#ifdef _WIN32 #ifdef _WIN32
#include <Windows.h> #include <windows.h>
#include <Ws2ipdef.h> #include <ws2ipdef.h>
#else #else
#include <arpa/inet.h> #include <arpa/inet.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <unistd.h> #include <unistd.h>
#endif #endif
#define MMDB_DATA_SECTION_SEPARATOR (16) #define MMDB_DATA_SECTION_SEPARATOR (16)
#ifdef MMDB_DEBUG #ifdef MMDB_DEBUG
@ -51,7 +51,7 @@
#ifdef MMDB_DEBUG #ifdef MMDB_DEBUG
DEBUG_FUNC char *byte_to_binary(uint8_t byte) DEBUG_FUNC char *byte_to_binary(uint8_t byte)
{ {
char *bits = (char *)malloc(sizeof(char) * 9); char *bits = malloc(sizeof(char) * 9);
if (NULL == bits) { if (NULL == bits) {
return bits; return bits;
} }
@ -122,10 +122,10 @@ LOCAL const uint8_t *find_metadata(const uint8_t *file_content,
ssize_t file_size, uint32_t *metadata_size); ssize_t file_size, uint32_t *metadata_size);
LOCAL int read_metadata(MMDB_s *mmdb); LOCAL int read_metadata(MMDB_s *mmdb);
LOCAL MMDB_s make_fake_metadata_db(MMDB_s *mmdb); LOCAL MMDB_s make_fake_metadata_db(MMDB_s *mmdb);
LOCAL uint16_t value_for_key_as_uint16(MMDB_entry_s *start, const char *key); LOCAL uint16_t value_for_key_as_uint16(MMDB_entry_s *start, char *key);
LOCAL uint32_t value_for_key_as_uint32(MMDB_entry_s *start, const char *key); LOCAL uint32_t value_for_key_as_uint32(MMDB_entry_s *start, char *key);
LOCAL uint64_t value_for_key_as_uint64(MMDB_entry_s *start, const char *key); LOCAL uint64_t value_for_key_as_uint64(MMDB_entry_s *start, char *key);
LOCAL char *value_for_key_as_string(MMDB_entry_s *start, const char *key); LOCAL char *value_for_key_as_string(MMDB_entry_s *start, char *key);
LOCAL int populate_languages_metadata(MMDB_s *mmdb, MMDB_s *metadata_db, LOCAL int populate_languages_metadata(MMDB_s *mmdb, MMDB_s *metadata_db,
MMDB_entry_s *metadata_start); MMDB_entry_s *metadata_start);
LOCAL int populate_description_metadata(MMDB_s *mmdb, MMDB_s *metadata_db, LOCAL int populate_description_metadata(MMDB_s *mmdb, MMDB_s *metadata_db,
@ -140,6 +140,7 @@ LOCAL int populate_result(MMDB_s *mmdb, uint32_t node_count, uint32_t value,
uint16_t netmask, MMDB_lookup_result_s *result); uint16_t netmask, MMDB_lookup_result_s *result);
LOCAL uint32_t get_left_28_bit_record(const uint8_t *record); LOCAL uint32_t get_left_28_bit_record(const uint8_t *record);
LOCAL uint32_t get_right_28_bit_record(const uint8_t *record); LOCAL uint32_t get_right_28_bit_record(const uint8_t *record);
LOCAL int path_length(va_list va_path);
LOCAL int lookup_path_in_array(const char *path_elem, MMDB_s *mmdb, LOCAL int lookup_path_in_array(const char *path_elem, MMDB_s *mmdb,
MMDB_entry_data_s *entry_data); MMDB_entry_data_s *entry_data);
LOCAL int lookup_path_in_map(const char *path_elem, MMDB_s *mmdb, LOCAL int lookup_path_in_map(const char *path_elem, MMDB_s *mmdb,
@ -154,8 +155,8 @@ LOCAL uint32_t get_ptr_from(uint8_t ctrl, uint8_t const *const ptr,
int ptr_size); int ptr_size);
LOCAL int get_entry_data_list(MMDB_s *mmdb, uint32_t offset, LOCAL int get_entry_data_list(MMDB_s *mmdb, uint32_t offset,
MMDB_entry_data_list_s *const entry_data_list); MMDB_entry_data_list_s *const entry_data_list);
LOCAL float get_ieee754_float(const uint8_t *__restrict p); LOCAL float get_ieee754_float(const uint8_t *restrict p);
LOCAL double get_ieee754_double(const uint8_t *__restrict p); LOCAL double get_ieee754_double(const uint8_t *restrict p);
LOCAL uint32_t get_uint32(const uint8_t *p); LOCAL uint32_t get_uint32(const uint8_t *p);
LOCAL uint32_t get_uint24(const uint8_t *p); LOCAL uint32_t get_uint24(const uint8_t *p);
LOCAL uint32_t get_uint16(const uint8_t *p); LOCAL uint32_t get_uint16(const uint8_t *p);
@ -189,6 +190,8 @@ LOCAL char *bytes_to_hex(uint8_t *bytes, uint32_t size);
} \ } \
} while (0) } while (0)
#define FREE_AND_SET_NULL(p) { free((void *)(p)); (p) = NULL; }
int MMDB_open(const char *const filename, uint32_t flags, MMDB_s *const mmdb) int MMDB_open(const char *const filename, uint32_t flags, MMDB_s *const mmdb)
{ {
mmdb->file_content = NULL; mmdb->file_content = NULL;
@ -212,6 +215,11 @@ int MMDB_open(const char *const filename, uint32_t flags, MMDB_s *const mmdb)
return MMDB_FILE_OPEN_ERROR; return MMDB_FILE_OPEN_ERROR;
} }
size = GetFileSize(fd, NULL); size = GetFileSize(fd, NULL);
if (size == INVALID_FILE_SIZE) {
free_mmdb_struct(mmdb);
CloseHandle(fd);
return MMDB_FILE_OPEN_ERROR;
}
#else #else
int fd = open(filename, O_RDONLY); int fd = open(filename, O_RDONLY);
if (fd < 0) { if (fd < 0) {
@ -220,7 +228,11 @@ int MMDB_open(const char *const filename, uint32_t flags, MMDB_s *const mmdb)
} }
struct stat s; struct stat s;
fstat(fd, &s); if (fstat(fd, &s) ) {
free_mmdb_struct(mmdb);
close(fd);
return MMDB_FILE_OPEN_ERROR;
}
size = s.st_size; size = s.st_size;
#endif #endif
@ -231,18 +243,19 @@ int MMDB_open(const char *const filename, uint32_t flags, MMDB_s *const mmdb)
mmdb->file_size = size; mmdb->file_size = size;
#ifdef _WIN32 #ifdef _WIN32
HANDLE mmh = CreateFileMappingA(fd, NULL, PAGE_READONLY, 0, size, filename); HANDLE mmh = CreateFileMappingA(fd, NULL, PAGE_READONLY, 0, size, NULL);
uint8_t *file_content = uint8_t *file_content =
(uint8_t *)MapViewOfFile(mmh, FILE_MAP_READ, 0, 0, 0); (uint8_t *)MapViewOfFile(mmh, FILE_MAP_READ, 0, 0, 0);
CloseHandle(fd);
if (file_content == NULL) { if (file_content == NULL) {
CloseHandle(mmh); CloseHandle(mmh);
CloseHandle(fd);
free_mmdb_struct(mmdb); free_mmdb_struct(mmdb);
return MMDB_IO_ERROR; return MMDB_IO_ERROR;
} }
#else #else
uint8_t *file_content = uint8_t *file_content =
(uint8_t *)mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0); (uint8_t *)mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
close(fd);
if (MAP_FAILED == file_content) { if (MAP_FAILED == file_content) {
free_mmdb_struct(mmdb); free_mmdb_struct(mmdb);
return MMDB_IO_ERROR; return MMDB_IO_ERROR;
@ -273,9 +286,6 @@ int MMDB_open(const char *const filename, uint32_t flags, MMDB_s *const mmdb)
#ifdef _WIN32 #ifdef _WIN32
WSADATA wsa; WSADATA wsa;
WSAStartup(MAKEWORD(2, 2), &wsa); WSAStartup(MAKEWORD(2, 2), &wsa);
CloseHandle(fd);
#else
close(fd);
#endif #endif
uint32_t search_tree_size = mmdb->metadata.node_count * uint32_t search_tree_size = mmdb->metadata.node_count *
@ -301,7 +311,7 @@ LOCAL const uint8_t *find_metadata(const uint8_t *file_content,
uint8_t *search_area = (uint8_t *)(file_content + (file_size - max_size)); uint8_t *search_area = (uint8_t *)(file_content + (file_size - max_size));
uint8_t *tmp = search_area; uint8_t *tmp = search_area;
do { do {
tmp = (uint8_t *)mmdb_memmem(search_area, max_size, tmp = mmdb_memmem(search_area, max_size,
METADATA_MARKER, strlen(METADATA_MARKER)); METADATA_MARKER, strlen(METADATA_MARKER));
if (NULL != tmp) { if (NULL != tmp) {
@ -324,9 +334,10 @@ LOCAL int read_metadata(MMDB_s *mmdb)
values. */ values. */
MMDB_s metadata_db = make_fake_metadata_db(mmdb); MMDB_s metadata_db = make_fake_metadata_db(mmdb);
MMDB_entry_s metadata_start; MMDB_entry_s metadata_start = {
metadata_start.mmdb = &metadata_db; .mmdb = &metadata_db,
metadata_start.offset = 0; .offset = 0
};
mmdb->metadata.node_count = mmdb->metadata.node_count =
value_for_key_as_uint32(&metadata_start, "node_count"); value_for_key_as_uint32(&metadata_start, "node_count");
@ -408,14 +419,15 @@ LOCAL int read_metadata(MMDB_s *mmdb)
LOCAL MMDB_s make_fake_metadata_db(MMDB_s *mmdb) LOCAL MMDB_s make_fake_metadata_db(MMDB_s *mmdb)
{ {
MMDB_s fake_metadata_db; MMDB_s fake_metadata_db = {
fake_metadata_db.data_section = mmdb->metadata_section; .data_section = mmdb->metadata_section,
fake_metadata_db.data_section_size = mmdb->metadata_section_size; .data_section_size = mmdb->metadata_section_size
};
return fake_metadata_db; return fake_metadata_db;
} }
LOCAL uint16_t value_for_key_as_uint16(MMDB_entry_s *start, const char *key) LOCAL uint16_t value_for_key_as_uint16(MMDB_entry_s *start, char *key)
{ {
MMDB_entry_data_s entry_data; MMDB_entry_data_s entry_data;
const char *path[] = { key, NULL }; const char *path[] = { key, NULL };
@ -423,7 +435,7 @@ LOCAL uint16_t value_for_key_as_uint16(MMDB_entry_s *start, const char *key)
return entry_data.uint16; return entry_data.uint16;
} }
LOCAL uint32_t value_for_key_as_uint32(MMDB_entry_s *start, const char *key) LOCAL uint32_t value_for_key_as_uint32(MMDB_entry_s *start, char *key)
{ {
MMDB_entry_data_s entry_data; MMDB_entry_data_s entry_data;
const char *path[] = { key, NULL }; const char *path[] = { key, NULL };
@ -431,7 +443,7 @@ LOCAL uint32_t value_for_key_as_uint32(MMDB_entry_s *start, const char *key)
return entry_data.uint32; return entry_data.uint32;
} }
LOCAL uint64_t value_for_key_as_uint64(MMDB_entry_s *start, const char *key) LOCAL uint64_t value_for_key_as_uint64(MMDB_entry_s *start, char *key)
{ {
MMDB_entry_data_s entry_data; MMDB_entry_data_s entry_data;
const char *path[] = { key, NULL }; const char *path[] = { key, NULL };
@ -439,7 +451,7 @@ LOCAL uint64_t value_for_key_as_uint64(MMDB_entry_s *start, const char *key)
return entry_data.uint64; return entry_data.uint64;
} }
LOCAL char *value_for_key_as_string(MMDB_entry_s *start, const char *key) LOCAL char *value_for_key_as_string(MMDB_entry_s *start, char *key)
{ {
MMDB_entry_data_s entry_data; MMDB_entry_data_s entry_data;
const char *path[] = { key, NULL }; const char *path[] = { key, NULL };
@ -459,9 +471,10 @@ LOCAL int populate_languages_metadata(MMDB_s *mmdb, MMDB_s *metadata_db,
return MMDB_INVALID_METADATA_ERROR; return MMDB_INVALID_METADATA_ERROR;
} }
MMDB_entry_s array_start; MMDB_entry_s array_start = {
array_start.mmdb = metadata_db; .mmdb = metadata_db,
array_start.offset = entry_data.offset; .offset = entry_data.offset
};
MMDB_entry_data_list_s *member; MMDB_entry_data_list_s *member;
MMDB_get_entry_data_list(&array_start, &member); MMDB_get_entry_data_list(&array_start, &member);
@ -470,7 +483,7 @@ LOCAL int populate_languages_metadata(MMDB_s *mmdb, MMDB_s *metadata_db,
uint32_t array_size = member->entry_data.data_size; uint32_t array_size = member->entry_data.data_size;
mmdb->metadata.languages.count = 0; mmdb->metadata.languages.count = 0;
mmdb->metadata.languages.names = (const char **)malloc(array_size * sizeof(char *)); mmdb->metadata.languages.names = malloc(array_size * sizeof(char *));
if (NULL == mmdb->metadata.languages.names) { if (NULL == mmdb->metadata.languages.names) {
return MMDB_OUT_OF_MEMORY_ERROR; return MMDB_OUT_OF_MEMORY_ERROR;
} }
@ -510,9 +523,10 @@ LOCAL int populate_description_metadata(MMDB_s *mmdb, MMDB_s *metadata_db,
return MMDB_INVALID_METADATA_ERROR; return MMDB_INVALID_METADATA_ERROR;
} }
MMDB_entry_s map_start; MMDB_entry_s map_start = {
map_start.mmdb = metadata_db; .mmdb = metadata_db,
map_start.offset = entry_data.offset; .offset = entry_data.offset
};
MMDB_entry_data_list_s *member; MMDB_entry_data_list_s *member;
MMDB_get_entry_data_list(&map_start, &member); MMDB_get_entry_data_list(&map_start, &member);
@ -522,14 +536,14 @@ LOCAL int populate_description_metadata(MMDB_s *mmdb, MMDB_s *metadata_db,
uint32_t map_size = member->entry_data.data_size; uint32_t map_size = member->entry_data.data_size;
mmdb->metadata.description.count = 0; mmdb->metadata.description.count = 0;
mmdb->metadata.description.descriptions = mmdb->metadata.description.descriptions =
(MMDB_description_s **)malloc(map_size * sizeof(MMDB_description_s *)); malloc(map_size * sizeof(MMDB_description_s *));
if (NULL == mmdb->metadata.description.descriptions) { if (NULL == mmdb->metadata.description.descriptions) {
return MMDB_OUT_OF_MEMORY_ERROR; return MMDB_OUT_OF_MEMORY_ERROR;
} }
for (uint32_t i = 0; i < map_size; i++) { for (uint32_t i = 0; i < map_size; i++) {
mmdb->metadata.description.descriptions[i] = mmdb->metadata.description.descriptions[i] =
(MMDB_description_s *)malloc(sizeof(MMDB_description_s)); malloc(sizeof(MMDB_description_s));
if (NULL == mmdb->metadata.description.descriptions[i]) { if (NULL == mmdb->metadata.description.descriptions[i]) {
return MMDB_OUT_OF_MEMORY_ERROR; return MMDB_OUT_OF_MEMORY_ERROR;
} }
@ -577,11 +591,14 @@ MMDB_lookup_result_s MMDB_lookup_string(MMDB_s *const mmdb,
int *const gai_error, int *const gai_error,
int *const mmdb_error) int *const mmdb_error)
{ {
MMDB_lookup_result_s result; MMDB_lookup_result_s result = {
result.found_entry = false; .found_entry = false,
result.netmask = 0; .netmask = 0,
result.entry.mmdb = mmdb; .entry = {
result.entry.offset = 0; .mmdb = mmdb,
.offset = 0
}
};
struct addrinfo *addresses = NULL; struct addrinfo *addresses = NULL;
*gai_error = resolve_any_address(ipstr, &addresses); *gai_error = resolve_any_address(ipstr, &addresses);
@ -610,10 +627,9 @@ 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. .ai_socktype = SOCK_STREAM
};
hints.ai_socktype = SOCK_STREAM;
int gai_status; int gai_status;
if (NULL != strchr(ipstr, ':')) { if (NULL != strchr(ipstr, ':')) {
@ -640,11 +656,14 @@ MMDB_lookup_result_s MMDB_lookup_sockaddr(
const struct sockaddr *const sockaddr, const struct sockaddr *const sockaddr,
int *const mmdb_error) int *const mmdb_error)
{ {
MMDB_lookup_result_s result; MMDB_lookup_result_s result = {
result.found_entry = false; .found_entry = false,
result.netmask = 0; .netmask = 0,
result.entry.mmdb = mmdb; .entry = {
result.entry.offset = 0; .mmdb = mmdb,
.offset = 0
}
};
uint8_t mapped_address[16], *address; uint8_t mapped_address[16], *address;
if (mmdb->metadata.ip_version == 4) { if (mmdb->metadata.ip_version == 4) {
@ -747,9 +766,10 @@ LOCAL int find_address_in_search_tree(MMDB_s *mmdb, uint8_t *address,
LOCAL record_info_s record_info_for_database(MMDB_s *mmdb) LOCAL record_info_s record_info_for_database(MMDB_s *mmdb)
{ {
record_info_s record_info; record_info_s record_info = {
record_info.record_length = mmdb->full_record_byte_size; .record_length = mmdb->full_record_byte_size,
record_info.right_record_offset = 0; .right_record_offset = 0
};
if (record_info.record_length == 6) { if (record_info.record_length == 6) {
record_info.left_record_getter = &get_uint24; record_info.left_record_getter = &get_uint24;
@ -864,41 +884,44 @@ int MMDB_vget_value(MMDB_entry_s *const start,
MMDB_entry_data_s *const entry_data, MMDB_entry_data_s *const entry_data,
va_list va_path) va_list va_path)
{ {
const char **path = NULL; int length = path_length(va_path);
int i = 0;
const char *path_elem; const char *path_elem;
int i = 0;
const char **path = malloc((length + 1) * sizeof(const char *));
if (NULL == path) {
return MMDB_OUT_OF_MEMORY_ERROR;
}
while (NULL != (path_elem = va_arg(va_path, char *))) { while (NULL != (path_elem = va_arg(va_path, char *))) {
path = (const char **)realloc(path, sizeof(const char *) * (i + 1)); path[i] = path_elem;
if (NULL == path) {
return MMDB_OUT_OF_MEMORY_ERROR;
}
path[i] = mmdb_strdup(path_elem);
if (NULL == path[i]) {
return MMDB_OUT_OF_MEMORY_ERROR;
}
i++; i++;
} }
path = (const char **)realloc(path, sizeof(char *) * (i + 1));
if (NULL == path) {
return MMDB_OUT_OF_MEMORY_ERROR;
}
path[i] = NULL; path[i] = NULL;
int status = MMDB_aget_value(start, entry_data, path); int status = MMDB_aget_value(start, entry_data, path);
i = 0; free((char **)path);
while (NULL != path[i]) {
free((void *)path[i]);
i++;
}
free(path);
return status; return status;
} }
LOCAL int path_length(va_list va_path)
{
int i = 0;
const char *ignore;
va_list path_copy;
va_copy(path_copy, va_path);
while (NULL != (ignore = va_arg(path_copy, char *))) {
i++;
}
va_end(path_copy);
return i;
}
int MMDB_aget_value(MMDB_entry_s *const start, int MMDB_aget_value(MMDB_entry_s *const start,
MMDB_entry_data_s *const entry_data, MMDB_entry_data_s *const entry_data,
const char *const *const path) const char *const *const path)
@ -960,13 +983,18 @@ LOCAL int lookup_path_in_array(const char *path_elem, MMDB_s *mmdb,
MMDB_entry_data_s *entry_data) MMDB_entry_data_s *entry_data)
{ {
uint32_t size = entry_data->data_size; uint32_t size = entry_data->data_size;
int array_index = strtol(path_elem, NULL, 10); char *first_invalid;
if (array_index < 0) {
int saved_errno = errno;
errno = 0;
int array_index = strtol(path_elem, &first_invalid, 10);
if (array_index < 0 || ERANGE == errno) {
errno = saved_errno;
return MMDB_INVALID_LOOKUP_PATH_ERROR; return MMDB_INVALID_LOOKUP_PATH_ERROR;
} }
errno = saved_errno;
if ((uint32_t)array_index >= size) { if (*first_invalid || (uint32_t)array_index >= size) {
memset(entry_data, 0, sizeof(MMDB_entry_data_s));
return MMDB_LOOKUP_PATH_DOES_NOT_MATCH_DATA_ERROR; return MMDB_LOOKUP_PATH_DOES_NOT_MATCH_DATA_ERROR;
} }
@ -1265,9 +1293,10 @@ int MMDB_get_metadata_as_entry_data_list(
{ {
MMDB_s metadata_db = make_fake_metadata_db(mmdb); MMDB_s metadata_db = make_fake_metadata_db(mmdb);
MMDB_entry_s metadata_start; MMDB_entry_s metadata_start = {
metadata_start.mmdb = &metadata_db; .mmdb = &metadata_db,
metadata_start.offset = 0; .offset = 0
};
return MMDB_get_entry_data_list(&metadata_start, entry_data_list); return MMDB_get_entry_data_list(&metadata_start, entry_data_list);
} }
@ -1276,7 +1305,7 @@ int MMDB_get_entry_data_list(
MMDB_entry_s *start, MMDB_entry_data_list_s **const entry_data_list) MMDB_entry_s *start, MMDB_entry_data_list_s **const entry_data_list)
{ {
*entry_data_list = new_entry_data_list(); *entry_data_list = new_entry_data_list();
if (NULL == entry_data_list) { if (NULL == *entry_data_list) {
return MMDB_OUT_OF_MEMORY_ERROR; return MMDB_OUT_OF_MEMORY_ERROR;
} }
return get_entry_data_list(start->mmdb, start->offset, *entry_data_list); return get_entry_data_list(start->mmdb, start->offset, *entry_data_list);
@ -1389,10 +1418,10 @@ LOCAL int get_entry_data_list(MMDB_s *mmdb, uint32_t offset,
return MMDB_SUCCESS; return MMDB_SUCCESS;
} }
LOCAL float get_ieee754_float(const uint8_t *__restrict p) LOCAL float get_ieee754_float(const uint8_t *restrict p)
{ {
volatile float f; volatile float f;
uint8_t *q = (uint8_t *)(void *)&f; uint8_t *q = (void *)&f;
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
q[3] = p[0]; q[3] = p[0];
q[2] = p[1]; q[2] = p[1];
@ -1404,10 +1433,10 @@ LOCAL float get_ieee754_float(const uint8_t *__restrict p)
return f; return f;
} }
LOCAL double get_ieee754_double(const uint8_t *__restrict p) LOCAL double get_ieee754_double(const uint8_t *restrict p)
{ {
volatile double d; volatile double d;
uint8_t *q = (uint8_t *)(void *)&d; uint8_t *q = (void *)&d;
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
q[7] = p[0]; q[7] = p[0];
q[6] = p[1]; q[6] = p[1];
@ -1458,7 +1487,7 @@ LOCAL MMDB_entry_data_list_s *new_entry_data_list(void)
{ {
/* We need calloc here in order to ensure that the ->next pointer in the /* We need calloc here in order to ensure that the ->next pointer in the
* struct doesn't point to some random address. */ * struct doesn't point to some random address. */
return (MMDB_entry_data_list_s *)calloc(1, sizeof(MMDB_entry_data_list_s)); return calloc(1, sizeof(MMDB_entry_data_list_s));
} }
void MMDB_free_entry_data_list(MMDB_entry_data_list_s *const entry_data_list) void MMDB_free_entry_data_list(MMDB_entry_data_list_s *const entry_data_list)
@ -1484,7 +1513,7 @@ LOCAL void free_mmdb_struct(MMDB_s *const mmdb)
} }
if (NULL != mmdb->filename) { if (NULL != mmdb->filename) {
free((void *)mmdb->filename); FREE_AND_SET_NULL(mmdb->filename);
} }
if (NULL != mmdb->file_content) { if (NULL != mmdb->file_content) {
#ifdef _WIN32 #ifdef _WIN32
@ -1498,7 +1527,7 @@ LOCAL void free_mmdb_struct(MMDB_s *const mmdb)
} }
if (NULL != mmdb->metadata.database_type) { if (NULL != mmdb->metadata.database_type) {
free((void *)mmdb->metadata.database_type); FREE_AND_SET_NULL(mmdb->metadata.database_type);
} }
free_languages_metadata(mmdb); free_languages_metadata(mmdb);
@ -1512,9 +1541,9 @@ LOCAL void free_languages_metadata(MMDB_s *mmdb)
} }
for (size_t i = 0; i < mmdb->metadata.languages.count; i++) { for (size_t i = 0; i < mmdb->metadata.languages.count; i++) {
free((char *)mmdb->metadata.languages.names[i]); FREE_AND_SET_NULL(mmdb->metadata.languages.names[i]);
} }
free(mmdb->metadata.languages.names); FREE_AND_SET_NULL(mmdb->metadata.languages.names);
} }
LOCAL void free_descriptions_metadata(MMDB_s *mmdb) LOCAL void free_descriptions_metadata(MMDB_s *mmdb)
@ -1527,22 +1556,20 @@ LOCAL void free_descriptions_metadata(MMDB_s *mmdb)
if (NULL != mmdb->metadata.description.descriptions[i]) { if (NULL != mmdb->metadata.description.descriptions[i]) {
if (NULL != if (NULL !=
mmdb->metadata.description.descriptions[i]->language) { mmdb->metadata.description.descriptions[i]->language) {
free( FREE_AND_SET_NULL(
(char *)mmdb->metadata.description.descriptions[i]-> mmdb->metadata.description.descriptions[i]->language);
language);
} }
if (NULL != if (NULL !=
mmdb->metadata.description.descriptions[i]->description) { mmdb->metadata.description.descriptions[i]->description) {
free( FREE_AND_SET_NULL(
(char *)mmdb->metadata.description.descriptions[i]-> mmdb->metadata.description.descriptions[i]->description);
description);
} }
free(mmdb->metadata.description.descriptions[i]); FREE_AND_SET_NULL(mmdb->metadata.description.descriptions[i]);
} }
} }
free(mmdb->metadata.description.descriptions); FREE_AND_SET_NULL(mmdb->metadata.description.descriptions);
} }
const char *MMDB_lib_version(void) const char *MMDB_lib_version(void)
@ -1692,7 +1719,7 @@ LOCAL MMDB_entry_data_list_s *dump_entry_data_list(
entry_data_list->entry_data.uint64); entry_data_list->entry_data.uint64);
entry_data_list = entry_data_list->next; entry_data_list = entry_data_list->next;
break; break;
case MMDB_DATA_TYPE_UINT128: { /* Error C2360 if hex_string initialization is not inside a block */ case MMDB_DATA_TYPE_UINT128:
print_indentation(stream, indent); print_indentation(stream, indent);
#if MMDB_UINT128_IS_BYTE_ARRAY #if MMDB_UINT128_IS_BYTE_ARRAY
char *hex_string = char *hex_string =
@ -1707,7 +1734,6 @@ LOCAL MMDB_entry_data_list_s *dump_entry_data_list(
#endif #endif
entry_data_list = entry_data_list->next; entry_data_list = entry_data_list->next;
break; break;
}
case MMDB_DATA_TYPE_INT32: case MMDB_DATA_TYPE_INT32:
print_indentation(stream, indent); print_indentation(stream, indent);
fprintf(stream, "%d <int32>\n", entry_data_list->entry_data.int32); fprintf(stream, "%d <int32>\n", entry_data_list->entry_data.int32);
@ -1733,7 +1759,7 @@ LOCAL void print_indentation(FILE *stream, int i)
LOCAL char *bytes_to_hex(uint8_t *bytes, uint32_t size) LOCAL char *bytes_to_hex(uint8_t *bytes, uint32_t size)
{ {
char *hex_string = (char *)malloc((size * 2) + 1); char *hex_string = malloc((size * 2) + 1);
char *hex_pointer = hex_string; char *hex_pointer = hex_string;
for (uint32_t i = 0; i < size; i++) { for (uint32_t i = 0; i < size; i++) {

91
dlls/geoip/GeoIP2/maxminddb.h
View File

@ -1,3 +1,7 @@
#ifdef __cplusplus
extern "C" {
#endif
#ifndef MAXMINDDB_H #ifndef MAXMINDDB_H
#define MAXMINDDB_H #define MAXMINDDB_H
@ -7,83 +11,32 @@
#include "maxminddb_config.h" #include "maxminddb_config.h"
#include <stdarg.h> #include <stdarg.h>
#include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#ifdef _WIN32 #ifdef _WIN32
#include "stdbool.h" /* Arksnine: Not supported by MSVC */ #include <winsock2.h>
#include <BaseTsd.h> /* Arkshine: ssize_t replacement */ #include <ws2tcpip.h>
typedef SSIZE_T ssize_t;
#include <WinSock2.h>
#include <WS2tcpip.h>
typedef ADDRESS_FAMILY sa_family_t; typedef ADDRESS_FAMILY sa_family_t;
#if defined(_MSC_VER)
/* MSVC doesn't define signed size_t, copy it from configure */
#define ssize_t int
/* MSVC doesn't support restricted pointers */
#define restrict
#endif
#else #else
#include <stdbool.h>
#include <netdb.h> #include <netdb.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
const char GeoIPCountryCode[][3] = /* libmaxminddb package version from configure */
{ #define PACKAGE_VERSION "1.0.4"
"AP", "EU", "AD", "AE", "AF", "AG", "AI", "AL", "AM", "AN",
"AO", "AQ", "AR", "AS", "AT", "AU", "AW", "AZ", "BA", "BB",
"BD", "BE", "BF", "BG", "BH", "BI", "BJ", "BM", "BN", "BO",
"BR", "BS", "BT", "BV", "BW", "BY", "BZ", "CA", "CC", "CD",
"CF", "CG", "CH", "CI", "CK", "CL", "CM", "CN", "CO", "CR",
"CU", "CV", "CX", "CY", "CZ", "DE", "DJ", "DK", "DM", "DO",
"DZ", "EC", "EE", "EG", "EH", "ER", "ES", "ET", "FI", "FJ",
"FK", "FM", "FO", "FR", "FX", "GA", "GB", "GD", "GE", "GF",
"GH", "GI", "GL", "GM", "GN", "GP", "GQ", "GR", "GS", "GT",
"GU", "GW", "GY", "HK", "HM", "HN", "HR", "HT", "HU", "ID",
"IE", "IL", "IN", "IO", "IQ", "IR", "IS", "IT", "JM", "JO",
"JP", "KE", "KG", "KH", "KI", "KM", "KN", "KP", "KR", "KW",
"KY", "KZ", "LA", "LB", "LC", "LI", "LK", "LR", "LS", "LT",
"LU", "LV", "LY", "MA", "MC", "MD", "MG", "MH", "MK", "ML",
"MM", "MN", "MO", "MP", "MQ", "MR", "MS", "MT", "MU", "MV",
"MW", "MX", "MY", "MZ", "NA", "NC", "NE", "NF", "NG", "NI",
"NL", "NO", "NP", "NR", "NU", "NZ", "OM", "PA", "PE", "PF",
"PG", "PH", "PK", "PL", "PM", "PN", "PR", "PS", "PT", "PW",
"PY", "QA", "RE", "RO", "RU", "RW", "SA", "SB", "SC", "SD",
"SE", "SG", "SH", "SI", "SJ", "SK", "SL", "SM", "SN", "SO",
"SR", "ST", "SV", "SY", "SZ", "TC", "TD", "TF", "TG", "TH",
"TJ", "TK", "TM", "TN", "TO", "TL", "TR", "TT", "TV", "TW",
"TZ", "UA", "UG", "UM", "US", "UY", "UZ", "VA", "VC", "VE",
"VG", "VI", "VN", "VU", "WF", "WS", "YE", "YT", "RS", "ZA",
"ZM", "ME", "ZW", "A1", "A2", "O1", "AX", "GG", "IM", "JE",
"BL", "MF"
};
const char GeoIPCountryCode3[][4] =
{
"AP", "EU", "AND", "ARE", "AFG", "ATG", "AIA", "ALB", "ARM", "ANT",
"AGO", "AQ", "ARG", "ASM", "AUT", "AUS", "ABW", "AZE", "BIH", "BRB",
"BGD", "BEL", "BFA", "BGR", "BHR", "BDI", "BEN", "BMU", "BRN", "BOL",
"BRA", "BHS", "BTN", "BV", "BWA", "BLR", "BLZ", "CAN", "CC", "COD",
"CAF", "COG", "CHE", "CIV", "COK", "CHL", "CMR", "CHN", "COL", "CRI",
"CUB", "CPV", "CX", "CYP", "CZE", "DEU", "DJI", "DNK", "DMA", "DOM",
"DZA", "ECU", "EST", "EGY", "ESH", "ERI", "ESP", "ETH", "FIN", "FJI",
"FLK", "FSM", "FRO", "FRA", "FX", "GAB", "GBR", "GRD", "GEO", "GUF",
"GHA", "GIB", "GRL", "GMB", "GIN", "GLP", "GNQ", "GRC", "GS", "GTM",
"GUM", "GNB", "GUY", "HKG", "HM", "HND", "HRV", "HTI", "HUN", "IDN",
"IRL", "ISR", "IND", "IO", "IRQ", "IRN", "ISL", "ITA", "JAM", "JOR",
"JPN", "KEN", "KGZ", "KHM", "KIR", "COM", "KNA", "PRK", "KOR", "KWT",
"CYM", "KAZ", "LAO", "LBN", "LCA", "LIE", "LKA", "LBR", "LSO", "LTU",
"LUX", "LVA", "LBY", "MAR", "MCO", "MDA", "MDG", "MHL", "MKD", "MLI",
"MMR", "MNG", "MAC", "MNP", "MTQ", "MRT", "MSR", "MLT", "MUS", "MDV",
"MWI", "MEX", "MYS", "MOZ", "NAM", "NCL", "NER", "NFK", "NGA", "NIC",
"NLD", "NOR", "NPL", "NRU", "NIU", "NZL", "OMN", "PAN", "PER", "PYF",
"PNG", "PHL", "PAK", "POL", "SPM", "PCN", "PRI", "PSE", "PRT", "PLW",
"PRY", "QAT", "REU", "ROU", "RUS", "RWA", "SAU", "SLB", "SYC", "SDN",
"SWE", "SGP", "SHN", "SVN", "SJM", "SVK", "SLE", "SMR", "SEN", "SOM",
"SUR", "STP", "SLV", "SYR", "SWZ", "TCA", "TCD", "TF", "TGO", "THA",
"TJK", "TKL", "TKM", "TUN", "TON", "TLS", "TUR", "TTO", "TUV", "TWN",
"TZA", "UKR", "UGA", "UM", "USA", "URY", "UZB", "VAT", "VCT", "VEN",
"VGB", "VIR", "VNM", "VUT", "WLF", "WSM", "YEM", "YT", "SRB", "ZAF",
"ZMB", "MNE", "ZWE", "A1", "A2", "O1", "ALA", "GGY", "IMN", "JEY",
"BLM", "MAF"
};
#define MMDB_DATA_TYPE_EXTENDED (0) #define MMDB_DATA_TYPE_EXTENDED (0)
#define MMDB_DATA_TYPE_POINTER (1) #define MMDB_DATA_TYPE_POINTER (1)
@ -102,11 +55,11 @@ const char GeoIPCountryCode3[][4] =
#define MMDB_DATA_TYPE_BOOLEAN (14) #define MMDB_DATA_TYPE_BOOLEAN (14)
#define MMDB_DATA_TYPE_FLOAT (15) #define MMDB_DATA_TYPE_FLOAT (15)
/* GEOIPDB flags */ /* flags for open */
#define MMDB_MODE_MMAP (1) #define MMDB_MODE_MMAP (1)
#define MMDB_MODE_MASK (7) #define MMDB_MODE_MASK (7)
/* GEOIPDB err codes */ /* error codes */
#define MMDB_SUCCESS (0) #define MMDB_SUCCESS (0)
#define MMDB_FILE_OPEN_ERROR (1) #define MMDB_FILE_OPEN_ERROR (1)
#define MMDB_CORRUPT_SEARCH_TREE_ERROR (2) #define MMDB_CORRUPT_SEARCH_TREE_ERROR (2)
@ -265,3 +218,7 @@ typedef struct MMDB_search_node_s {
/* *INDENT-ON* */ /* *INDENT-ON* */
#endif /* MAXMINDDB_H */ #endif /* MAXMINDDB_H */
#ifdef __cplusplus
}
#endif

2
dlls/geoip/GeoIP2/maxminddb_config.h
View File

@ -1,8 +1,6 @@
#ifndef MAXMINDDB_CONFIG_H #ifndef MAXMINDDB_CONFIG_H
#define MAXMINDDB_CONFIG_H #define MAXMINDDB_CONFIG_H
#define PACKAGE_VERSION "0.5.6" // Arkshine: added manually.
#ifndef MMDB_UINT128_USING_MODE #ifndef MMDB_UINT128_USING_MODE
/* Define as 1 if we we use unsigned int __atribute__ ((__mode__(TI))) for uint128 values */ /* Define as 1 if we we use unsigned int __atribute__ ((__mode__(TI))) for uint128 values */
#define MMDB_UINT128_USING_MODE 0 #define MMDB_UINT128_USING_MODE 0

46
dlls/geoip/GeoIP2/stdbool.h
View File

@ -1,46 +0,0 @@
/*
* Copyright (c) 2000 Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD: src/include/stdbool.h,v 1.6 2002/08/16 07:33:14 alfred Exp $
*/
#ifndef _STDBOOL_H_
#define _STDBOOL_H_
#define __bool_true_false_are_defined 1
#ifndef __cplusplus
#define false 0
#define true 1
#define bool _Bool
#if __STDC_VERSION__ < 199901L && __GNUC__ < 3
typedef int _Bool;
#endif
#endif /* !__cplusplus */
#endif /* !_STDBOOL_H_ */

60
dlls/geoip/geoip_util.cpp
View File

@ -14,6 +14,66 @@
#include "geoip_util.h" #include "geoip_util.h"
#include "geoip_natives.h" #include "geoip_natives.h"
const char GeoIPCountryCode[252][3] =
{
"AP", "EU", "AD", "AE", "AF", "AG", "AI", "AL", "AM", "AN",
"AO", "AQ", "AR", "AS", "AT", "AU", "AW", "AZ", "BA", "BB",
"BD", "BE", "BF", "BG", "BH", "BI", "BJ", "BM", "BN", "BO",
"BR", "BS", "BT", "BV", "BW", "BY", "BZ", "CA", "CC", "CD",
"CF", "CG", "CH", "CI", "CK", "CL", "CM", "CN", "CO", "CR",
"CU", "CV", "CX", "CY", "CZ", "DE", "DJ", "DK", "DM", "DO",
"DZ", "EC", "EE", "EG", "EH", "ER", "ES", "ET", "FI", "FJ",
"FK", "FM", "FO", "FR", "FX", "GA", "GB", "GD", "GE", "GF",
"GH", "GI", "GL", "GM", "GN", "GP", "GQ", "GR", "GS", "GT",
"GU", "GW", "GY", "HK", "HM", "HN", "HR", "HT", "HU", "ID",
"IE", "IL", "IN", "IO", "IQ", "IR", "IS", "IT", "JM", "JO",
"JP", "KE", "KG", "KH", "KI", "KM", "KN", "KP", "KR", "KW",
"KY", "KZ", "LA", "LB", "LC", "LI", "LK", "LR", "LS", "LT",
"LU", "LV", "LY", "MA", "MC", "MD", "MG", "MH", "MK", "ML",
"MM", "MN", "MO", "MP", "MQ", "MR", "MS", "MT", "MU", "MV",
"MW", "MX", "MY", "MZ", "NA", "NC", "NE", "NF", "NG", "NI",
"NL", "NO", "NP", "NR", "NU", "NZ", "OM", "PA", "PE", "PF",
"PG", "PH", "PK", "PL", "PM", "PN", "PR", "PS", "PT", "PW",
"PY", "QA", "RE", "RO", "RU", "RW", "SA", "SB", "SC", "SD",
"SE", "SG", "SH", "SI", "SJ", "SK", "SL", "SM", "SN", "SO",
"SR", "ST", "SV", "SY", "SZ", "TC", "TD", "TF", "TG", "TH",
"TJ", "TK", "TM", "TN", "TO", "TL", "TR", "TT", "TV", "TW",
"TZ", "UA", "UG", "UM", "US", "UY", "UZ", "VA", "VC", "VE",
"VG", "VI", "VN", "VU", "WF", "WS", "YE", "YT", "RS", "ZA",
"ZM", "ME", "ZW", "A1", "A2", "O1", "AX", "GG", "IM", "JE",
"BL", "MF"
};
const char GeoIPCountryCode3[252][4] =
{
"AP", "EU", "AND", "ARE", "AFG", "ATG", "AIA", "ALB", "ARM", "ANT",
"AGO", "AQ", "ARG", "ASM", "AUT", "AUS", "ABW", "AZE", "BIH", "BRB",
"BGD", "BEL", "BFA", "BGR", "BHR", "BDI", "BEN", "BMU", "BRN", "BOL",
"BRA", "BHS", "BTN", "BV", "BWA", "BLR", "BLZ", "CAN", "CC", "COD",
"CAF", "COG", "CHE", "CIV", "COK", "CHL", "CMR", "CHN", "COL", "CRI",
"CUB", "CPV", "CX", "CYP", "CZE", "DEU", "DJI", "DNK", "DMA", "DOM",
"DZA", "ECU", "EST", "EGY", "ESH", "ERI", "ESP", "ETH", "FIN", "FJI",
"FLK", "FSM", "FRO", "FRA", "FX", "GAB", "GBR", "GRD", "GEO", "GUF",
"GHA", "GIB", "GRL", "GMB", "GIN", "GLP", "GNQ", "GRC", "GS", "GTM",
"GUM", "GNB", "GUY", "HKG", "HM", "HND", "HRV", "HTI", "HUN", "IDN",
"IRL", "ISR", "IND", "IO", "IRQ", "IRN", "ISL", "ITA", "JAM", "JOR",
"JPN", "KEN", "KGZ", "KHM", "KIR", "COM", "KNA", "PRK", "KOR", "KWT",
"CYM", "KAZ", "LAO", "LBN", "LCA", "LIE", "LKA", "LBR", "LSO", "LTU",
"LUX", "LVA", "LBY", "MAR", "MCO", "MDA", "MDG", "MHL", "MKD", "MLI",
"MMR", "MNG", "MAC", "MNP", "MTQ", "MRT", "MSR", "MLT", "MUS", "MDV",
"MWI", "MEX", "MYS", "MOZ", "NAM", "NCL", "NER", "NFK", "NGA", "NIC",
"NLD", "NOR", "NPL", "NRU", "NIU", "NZL", "OMN", "PAN", "PER", "PYF",
"PNG", "PHL", "PAK", "POL", "SPM", "PCN", "PRI", "PSE", "PRT", "PLW",
"PRY", "QAT", "REU", "ROU", "RUS", "RWA", "SAU", "SLB", "SYC", "SDN",
"SWE", "SGP", "SHN", "SVN", "SJM", "SVK", "SLE", "SMR", "SEN", "SOM",
"SUR", "STP", "SLV", "SYR", "SWZ", "TCA", "TCD", "TF", "TGO", "THA",
"TJK", "TKL", "TKM", "TUN", "TON", "TLS", "TUR", "TTO", "TUV", "TWN",
"TZA", "UKR", "UGA", "UM", "USA", "URY", "UZB", "VAT", "VCT", "VEN",
"VGB", "VIR", "VNM", "VUT", "WLF", "WSM", "YEM", "YT", "SRB", "ZAF",
"ZMB", "MNE", "ZWE", "A1", "A2", "O1", "ALA", "GGY", "IMN", "JEY",
"BLM", "MAF"
};
char *stripPort(char *ip) char *stripPort(char *ip)
{ {
char *tmp = strchr(ip, ':'); char *tmp = strchr(ip, ':');

3
dlls/geoip/geoip_util.h
View File

@ -27,4 +27,7 @@ const char *getLang(int playerIndex);
const char* stristr(const char* str, const char* substr); const char* stristr(const char* str, const char* substr);
extern const char GeoIPCountryCode[252][3];
extern const char GeoIPCountryCode3[252][4];
#endif // _INCLUDE_GEOIPUTIL_H #endif // _INCLUDE_GEOIPUTIL_H