diff --git a/GeoIP.dat b/GeoIP.dat index fa159b51..f4dd1cf1 100644 Binary files a/GeoIP.dat and b/GeoIP.dat differ diff --git a/src/mod/libGeoIP/GeoIP_depreciated.c b/src/mod/libGeoIP/GeoIP_depreciated.c deleted file mode 100644 index e933d01a..00000000 --- a/src/mod/libGeoIP/GeoIP_depreciated.c +++ /dev/null @@ -1,352 +0,0 @@ - -#include "GeoIP_internal.h" - -char * -GeoIP_org_by_ipnum(GeoIP * gi, unsigned long ipnum) -{ - GeoIPLookup gl; - return GeoIP_name_by_ipnum_gl(gi, ipnum, &gl); -} - -char * -GeoIP_org_by_ipnum_v6(GeoIP * gi, geoipv6_t ipnum) -{ - GeoIPLookup gl; - return GeoIP_name_by_ipnum_v6_gl(gi, ipnum, &gl); -} - -char * -GeoIP_org_by_addr(GeoIP * gi, const char *addr) -{ - GeoIPLookup gl; - return GeoIP_name_by_addr_gl(gi, addr, &gl); -} - -char * -GeoIP_org_by_addr_v6(GeoIP * gi, const char *addr) -{ - GeoIPLookup gl; - return GeoIP_name_by_addr_v6_gl(gi, addr, &gl); -} - -char * -GeoIP_org_by_name(GeoIP * gi, const char *name) -{ - GeoIPLookup gl; - return GeoIP_name_by_name_gl(gi, name, &gl); -} - -char * -GeoIP_org_by_name_v6(GeoIP * gi, const char *name) -{ - GeoIPLookup gl; - return GeoIP_name_by_name_v6_gl(gi, name, &gl); -} - -int -GeoIP_last_netmask(GeoIP * gi) -{ - return gi->netmask; -} - -unsigned int -_GeoIP_seek_record_v6(GeoIP * gi, geoipv6_t ipnum) -{ - GeoIPLookup gl; - return _GeoIP_seek_record_v6_gl(gi, ipnum, &gl); -} - -unsigned int -_GeoIP_seek_record(GeoIP * gi, unsigned long ipnum) -{ - GeoIPLookup gl; - return _GeoIP_seek_record_gl(gi, ipnum, &gl); -} - -const char * -GeoIP_country_code_by_name_v6(GeoIP * gi, const char *name) -{ - GeoIPLookup gl; - return GeoIP_country_code_by_name_v6_gl(gi, name, &gl); -} - -const char * -GeoIP_country_code_by_name(GeoIP * gi, const char *name) -{ - GeoIPLookup gl; - return GeoIP_country_code_by_name_gl(gi, name, &gl); -} - -const char * -GeoIP_country_code3_by_name_v6(GeoIP * gi, const char *name) -{ - GeoIPLookup gl; - return GeoIP_country_code3_by_name_v6_gl(gi, name, &gl); -} - -const char * -GeoIP_country_code3_by_name(GeoIP * gi, const char *name) -{ - GeoIPLookup gl; - return GeoIP_country_code3_by_name_gl(gi, name, &gl); -} - -const char * -GeoIP_country_name_by_name_v6(GeoIP * gi, const char *name) -{ - GeoIPLookup gl; - return GeoIP_country_name_by_name_v6_gl(gi, name, &gl); -} - -const char * -GeoIP_country_name_by_name(GeoIP * gi, const char *name) -{ - GeoIPLookup gl; - return GeoIP_country_name_by_name_gl(gi, name, &gl); -} - -int -GeoIP_id_by_name(GeoIP * gi, const char *name) -{ - GeoIPLookup gl; - return GeoIP_id_by_name_gl(gi, name, &gl); -} -int -GeoIP_id_by_name_v6(GeoIP * gi, const char *name) -{ - GeoIPLookup gl; - return GeoIP_id_by_name_v6_gl(gi, name, &gl); -} - -const char * -GeoIP_country_code_by_addr_v6(GeoIP * gi, const char *addr) -{ - GeoIPLookup gl; - return GeoIP_country_code_by_addr_v6_gl(gi, addr, &gl); -} -const char * -GeoIP_country_code_by_addr(GeoIP * gi, const char *addr) -{ - GeoIPLookup gl; - return GeoIP_country_code_by_addr_gl(gi, addr, &gl); -} - -const char * -GeoIP_country_code3_by_addr_v6(GeoIP * gi, const char *addr) -{ - GeoIPLookup gl; - return GeoIP_country_code3_by_addr_v6_gl(gi, addr, &gl); -} - -const char * -GeoIP_country_code3_by_addr(GeoIP * gi, const char *addr) -{ - GeoIPLookup gl; - return GeoIP_country_code3_by_addr_gl(gi, addr, &gl); -} - -const char * -GeoIP_country_name_by_addr_v6(GeoIP * gi, const char *addr) -{ - GeoIPLookup gl; - return GeoIP_country_name_by_addr_v6_gl(gi, addr, &gl); -} -const char * -GeoIP_country_name_by_addr(GeoIP * gi, const char *addr) -{ - GeoIPLookup gl; - return GeoIP_country_name_by_addr_gl(gi, addr, &gl); -} - -const char * -GeoIP_country_name_by_ipnum(GeoIP * gi, unsigned long ipnum) -{ - GeoIPLookup gl; - return GeoIP_country_name_by_ipnum_gl(gi, ipnum, &gl); -} - -const char * -GeoIP_country_name_by_ipnum_v6(GeoIP * gi, geoipv6_t ipnum) -{ - GeoIPLookup gl; - return GeoIP_country_name_by_ipnum_v6_gl(gi, ipnum, &gl); -} - -const char * -GeoIP_country_code_by_ipnum_v6(GeoIP * gi, geoipv6_t ipnum) -{ - GeoIPLookup gl; - return GeoIP_country_code_by_ipnum_v6_gl(gi, ipnum, &gl); -} - - -const char * -GeoIP_country_code_by_ipnum(GeoIP * gi, unsigned long ipnum) -{ - GeoIPLookup gl; - return GeoIP_country_code_by_ipnum_gl(gi, ipnum, &gl); -} - -const char * -GeoIP_country_code3_by_ipnum(GeoIP * gi, unsigned long ipnum) -{ - GeoIPLookup gl; - return GeoIP_country_code3_by_ipnum_gl(gi, ipnum, &gl); -} - -const char * -GeoIP_country_code3_by_ipnum_v6(GeoIP * gi, geoipv6_t ipnum) -{ - GeoIPLookup gl; - return GeoIP_country_code3_by_ipnum_v6_gl(gi, ipnum, &gl); -} - -int -GeoIP_country_id_by_addr_v6(GeoIP * gi, const char *addr) -{ - GeoIPLookup gl; - return GeoIP_id_by_addr_v6_gl(gi, addr, &gl); -} - -int -GeoIP_country_id_by_addr(GeoIP * gi, const char *addr) -{ - GeoIPLookup gl; - return GeoIP_id_by_addr_gl(gi, addr, &gl); -} -int -GeoIP_country_id_by_name_v6(GeoIP * gi, const char *host) -{ - GeoIPLookup gl; - return GeoIP_id_by_name_v6_gl(gi, host, &gl); -} -int -GeoIP_country_id_by_name(GeoIP * gi, const char *host) -{ - GeoIPLookup gl; - return GeoIP_id_by_name_gl(gi, host, &gl); -} -int -GeoIP_id_by_addr_v6(GeoIP * gi, const char *addr) -{ - GeoIPLookup gl; - return GeoIP_id_by_addr_v6_gl(gi, addr, &gl); -} -int -GeoIP_id_by_addr(GeoIP * gi, const char *addr) -{ - GeoIPLookup gl; - return GeoIP_id_by_addr_gl(gi, addr, &gl); -} - -int -GeoIP_id_by_ipnum_v6(GeoIP * gi, geoipv6_t ipnum) -{ - GeoIPLookup gl; - return GeoIP_id_by_ipnum_v6_gl(gi, ipnum, &gl); -} -int -GeoIP_id_by_ipnum(GeoIP * gi, unsigned long ipnum) -{ - GeoIPLookup gl; - return GeoIP_id_by_ipnum_gl(gi, ipnum, &gl); -} -void -GeoIP_assign_region_by_inetaddr(GeoIP * gi, unsigned long inetaddr, GeoIPRegion * region) -{ - GeoIPLookup gl; - GeoIP_assign_region_by_inetaddr_gl(gi, inetaddr, region, &gl); -} - -void -GeoIP_assign_region_by_inetaddr_v6(GeoIP * gi, geoipv6_t inetaddr, GeoIPRegion * region) -{ - GeoIPLookup gl; - GeoIP_assign_region_by_inetaddr_v6_gl(gi, inetaddr, region, &gl); -} - - -GeoIPRegion * -GeoIP_region_by_addr(GeoIP * gi, const char *addr) -{ - GeoIPLookup gl; - return GeoIP_region_by_addr_gl(gi, addr, &gl); -} -GeoIPRegion * -GeoIP_region_by_addr_v6(GeoIP * gi, const char *addr) -{ - GeoIPLookup gl; - return GeoIP_region_by_addr_v6_gl(gi, addr, &gl); -} - -GeoIPRegion * -GeoIP_region_by_name(GeoIP * gi, const char *name) -{ - GeoIPLookup gl; - return GeoIP_region_by_name_gl(gi, name, &gl); -} -GeoIPRegion * -GeoIP_region_by_name_v6(GeoIP * gi, const char *name) -{ - GeoIPLookup gl; - return GeoIP_region_by_name_v6_gl(gi, name, &gl); -} - -GeoIPRegion * -GeoIP_region_by_ipnum(GeoIP * gi, unsigned long ipnum) -{ - GeoIPLookup gl; - return GeoIP_region_by_ipnum_gl(gi, ipnum, &gl); -} -GeoIPRegion * -GeoIP_region_by_ipnum_v6(GeoIP * gi, geoipv6_t ipnum) -{ - GeoIPLookup gl; - return GeoIP_region_by_ipnum_v6_gl(gi, ipnum, &gl); -} - -char ** -GeoIP_range_by_ip(GeoIP * gi, const char *addr) -{ - GeoIPLookup gl; - return GeoIP_range_by_ip_gl(gi, addr, &gl); -} - -char * -GeoIP_name_by_ipnum(GeoIP * gi, unsigned long ipnum) -{ - GeoIPLookup gl; - return GeoIP_name_by_ipnum_gl(gi, ipnum, &gl); -} -char * -GeoIP_name_by_ipnum_v6(GeoIP * gi, geoipv6_t ipnum) -{ - GeoIPLookup gl; - return GeoIP_name_by_ipnum_v6_gl(gi, ipnum, &gl); -} -char * -GeoIP_name_by_addr(GeoIP * gi, const char *addr) -{ - GeoIPLookup gl; - return GeoIP_name_by_addr_gl(gi, addr, &gl); -} -char * -GeoIP_name_by_addr_v6(GeoIP * gi, const char *addr) -{ - GeoIPLookup gl; - return GeoIP_name_by_addr_v6_gl(gi, addr, &gl); -} - -char * -GeoIP_name_by_name(GeoIP * gi, const char *name) -{ - GeoIPLookup gl; - return GeoIP_name_by_name_gl(gi, name, &gl); -} - -char * -GeoIP_name_by_name_v6(GeoIP * gi, const char *name) -{ - GeoIPLookup gl; - return GeoIP_name_by_name_v6_gl(gi, name, &gl); -} diff --git a/src/mod/libGeoIP/global.h b/src/mod/libGeoIP/global.h deleted file mode 100644 index 22c5684b..00000000 --- a/src/mod/libGeoIP/global.h +++ /dev/null @@ -1,32 +0,0 @@ -/* GLOBAL.H - RSAREF types and constants - */ - -/* PROTOTYPES should be set to one if and only if the compiler supports - function argument prototyping. -The following makes PROTOTYPES default to 0 if it has not already - - been defined with C compiler flags. - */ -#ifndef PROTOTYPES -#define PROTOTYPES 0 -#endif - -/* POINTER defines a generic pointer type */ -typedef unsigned char *POINTER; - -/* UINT2 defines a two byte word */ -typedef unsigned short int UINT2; - -/* UINT4 defines a four byte word */ -typedef unsigned long int UINT4; - -/* PROTO_LIST is defined depending on how PROTOTYPES is defined above. -If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it - returns an empty list. - */ -#if PROTOTYPES -#define PROTO_LIST(list) list -#else -#define PROTO_LIST(list) () -#endif - diff --git a/src/mod/libGeoIP/types.h b/src/mod/libGeoIP/types.h deleted file mode 100644 index 42c5ddd0..00000000 --- a/src/mod/libGeoIP/types.h +++ /dev/null @@ -1,140 +0,0 @@ -/* types.h - some common typedefs - * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. - * - * This file is part of GNUPG. - * - * GNUPG is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GNUPG is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ - -#ifndef G10_TYPES_H -#define G10_TYPES_H - -#ifdef HAVE_INTTYPES_H -/* For uint64_t */ -#include -#endif - -/* The AC_CHECK_SIZEOF() in configure fails for some machines. - * we provide some fallback values here */ -#if !SIZEOF_UNSIGNED_SHORT -#undef SIZEOF_UNSIGNED_SHORT -#define SIZEOF_UNSIGNED_SHORT 2 -#endif -#if !SIZEOF_UNSIGNED_INT -#undef SIZEOF_UNSIGNED_INT -#define SIZEOF_UNSIGNED_INT 4 -#endif -#if !SIZEOF_UNSIGNED_LONG -#undef SIZEOF_UNSIGNED_LONG -#define SIZEOF_UNSIGNED_LONG 4 -#endif - - -#include - -#ifndef HAVE_BYTE_TYPEDEF -#undef byte /* maybe there is a macro with this name */ -#ifndef __riscos__ -typedef unsigned char byte; -#else -/* Norcroft treats char = unsigned char as legal assignment - but char* = unsigned char* as illegal assignment - and the same applies to the signed variants as well */ -typedef char byte; -#endif -#define HAVE_BYTE_TYPEDEF -#endif - -#ifndef HAVE_USHORT_TYPEDEF -#undef ushort /* maybe there is a macro with this name */ -typedef unsigned short ushort; -#define HAVE_USHORT_TYPEDEF -#endif - -#ifndef HAVE_ULONG_TYPEDEF -#undef ulong /* maybe there is a macro with this name */ -typedef unsigned long ulong; -#define HAVE_ULONG_TYPEDEF -#endif - -#ifndef HAVE_U16_TYPEDEF -#undef u16 /* maybe there is a macro with this name */ -#if SIZEOF_UNSIGNED_INT == 2 -typedef unsigned int u16; -#elif SIZEOF_UNSIGNED_SHORT == 2 -typedef unsigned short u16; -#else -#error no typedef for u16 -#endif -#define HAVE_U16_TYPEDEF -#endif - -#ifndef HAVE_U32_TYPEDEF -#undef u32 /* maybe there is a macro with this name */ -#if SIZEOF_UNSIGNED_INT == 4 -typedef unsigned int u32; -#elif SIZEOF_UNSIGNED_LONG == 4 -typedef unsigned long u32; -#else -#error no typedef for u32 -#endif -#define HAVE_U32_TYPEDEF -#endif - -/**************** - * Warning: Some systems segfault when this u64 typedef and - * the dummy code in cipher/md.c is not available. Examples are - * Solaris and IRIX. - */ -#ifndef HAVE_U64_TYPEDEF -#undef u64 /* maybe there is a macro with this name */ -#if SIZEOF_UINT64_T == 8 -typedef uint64_t u64; -#define U64_C(c) (UINT64_C(c)) -#define HAVE_U64_TYPEDEF -#elif SIZEOF_UNSIGNED_INT == 8 -typedef unsigned int u64; -#define U64_C(c) (c ## U) -#define HAVE_U64_TYPEDEF -#elif SIZEOF_UNSIGNED_LONG == 8 -typedef unsigned long u64; -#define U64_C(c) (c ## UL) -#define HAVE_U64_TYPEDEF -#elif SIZEOF_UNSIGNED_LONG_LONG == 8 -typedef unsigned long long u64; -#define U64_C(c) (c ## ULL) -#define HAVE_U64_TYPEDEF -#endif -#endif - -typedef union { - int a; - short b; - char c[1]; - long d; -#ifdef HAVE_U64_TYPEDEF - u64 e; -#endif - float f; - double g; -} PROPERLY_ALIGNED_TYPE; - -typedef struct string_list { - struct string_list *next; - unsigned int flags; - char d[1]; -} *STRLIST; - -#endif /*G10_TYPES_H*/ diff --git a/src/mod/version.inc b/src/mod/version.inc index 85fa261d..84c17a3e 100644 --- a/src/mod/version.inc +++ b/src/mod/version.inc @@ -1,6 +1,6 @@ // version, change on release #ifndef REMOD_VERSION -#define REMOD_VERSION "v1.0.14" +#define REMOD_VERSION "v1.0.15" #endif // codename