ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '1114-windows-build-broken-v9_11' into 'v9_11'

Browse Source 
fix broken windows build

See merge request isc-projects/bind9!2131
This commit is contained in:
Evan Hunt
2019-07-03 14:17:06 -04:00
parent 7355529a98 f81020a748
commit 7af1323425
3 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/dns/include/dns/geoip.h
View File

@@ -16,11 +16,13 @@
***** Module Info
*****/
/*! \file dns/acl.h
/*! \file dns/geoip.h
* \brief
* Address match list handling.
* GeoIP/GeoIP2 data types and function prototypes.
*/
#if defined(HAVE_GEOIP) || defined(HAVE_GEOIP2)
/***
*** Imports
***/
@@ -83,8 +85,8 @@ typedef struct dns_geoip_elem {
};
} dns_geoip_elem_t;
typedef struct dns_geoip_databases {
#if defined(HAVE_GEOIP2)
struct dns_geoip_databases {
#ifdef HAVE_GEOIP2
void *country; /* GeoIP2-Country or GeoLite2-Country */
void *city; /* GeoIP2-CIty or GeoLite2-City */
void *domain; /* GeoIP2-Domain */
@@ -92,21 +94,21 @@ typedef struct dns_geoip_databases {
void *as; /* GeoIP2-ASN or GeoLite2-ASN */
#define DNS_GEOIP_DATABASE_INIT \
{ NULL, NULL, NULL, NULL, NULL }
#elif defined(HAVE_GEOIP)
void *country_v4; /* DB 1 */
void *city_v4; /* DB 2 or 6 */
void *region; /* DB 3 or 7 */
void *isp; /* DB 4 */
void *org; /* DB 5 */
void *as; /* DB 9 */
void *netspeed; /* DB 10 */
void *domain; /* DB 11 */
void *country_v6; /* DB 12 */
void *city_v6; /* DB 30 or 31 */
#else /* HAVE_GEOIP */
void *country_v4; /* GeoIP DB 1 */
void *city_v4; /* GeoIP DB 2 or 6 */
void *region; /* GeoIP DB 3 or 7 */
void *isp; /* GeoIP DB 4 */
void *org; /* GeoIP DB 5 */
void *as; /* GeoIP DB 9 */
void *netspeed; /* GeoIP DB 10 */
void *domain; /* GeoIP DB 11 */
void *country_v6; /* GeoIP DB 12 */
void *city_v6; /* GeoIP DB 30 or 31 */
#define DNS_GEOIP_DATABASE_INIT \
{ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
#endif
} dns_geoip_databases_t;
#endif /* HAVE_GEOIP */
};
/***
*** Functions
@@ -123,4 +125,7 @@ void
dns_geoip_shutdown(void);
ISC_LANG_ENDDECLS
#endif /* HAVE_GEOIP | HAVE_GEOIP2 */
#endif /* DNS_GEOIP_H */

1
lib/dns/include/dns/types.h
View File

@@ -90,6 +90,7 @@ typedef struct dns_fixedname dns_fixedname_t;
typedef struct dns_forwarders dns_forwarders_t;
typedef struct dns_forwarder dns_forwarder_t;
typedef struct dns_fwdtable dns_fwdtable_t;
typedef struct dns_geoip_databases dns_geoip_databases_t;
typedef struct dns_iptable dns_iptable_t;
typedef uint32_t dns_iterations_t;
typedef uint16_t dns_keyflags_t;

1
lib/isccfg/aclconf.c
View File

@@ -832,6 +832,7 @@ geoip_can_answer(dns_aclelement_t *elt, cfg_aclconfctx_t *ctx) {
case dns_geoip_netspeed_id:
if (ctx->geoip->netspeed != NULL)
return (true);
/* FALLTHROUGH */
/*
* The following enums are only valid with GeoIP2,
* not legacy GeoIP.