mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

Replace custom isc_u?intNN_t types with C99 u?intNN_t types

Browse Source
This commit is contained in:
Ondřej Surý
2018-03-28 14:19:37 +02:00
parent 055278c936
commit cb6a185c69
390 changed files with 2812 additions and 2528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/ns/query.c
View File

@@ -13,6 +13,7 @@
#include <config.h>
#include <inttypes.h>
#include <string.h>
#include <isc/hex.h>
@@ -701,7 +702,7 @@ query_reset(ns_client_t *client, isc_boolean_t everything) {
client->query.authdbset = ISC_FALSE;
client->query.isreferral = ISC_FALSE;
client->query.dns64_options = 0;
client->query.dns64_ttl = ISC_UINT32_MAX;
client->query.dns64_ttl = UINT32_MAX;
recparam_update(&client->query.recparam, 0, NULL, NULL);
client->query.root_key_sentinel_keyid = 0;
client->query.root_key_sentinel_is_ta = ISC_FALSE;
@@ -4503,7 +4504,7 @@ query_findclosestnsec3(dns_name_t *qname, dns_db_t *db,
{
unsigned char salt[256];
size_t salt_length;
isc_uint16_t iterations;
uint16_t iterations;
isc_result_t result;
unsigned int dboptions;
dns_fixedname_t fixed;
@@ -4610,14 +4611,14 @@ is_v6_client(ns_client_t *client) {
return (ISC_FALSE);
}
static isc_uint32_t
static uint32_t
dns64_ttl(dns_db_t *db, dns_dbversion_t *version) {
dns_dbnode_t *node = NULL;
dns_rdata_soa_t soa;
dns_rdata_t rdata = DNS_RDATA_INIT;
dns_rdataset_t rdataset;
isc_result_t result;
isc_uint32_t ttl = ISC_UINT32_MAX;
uint32_t ttl = UINT32_MAX;
dns_rdataset_init(&rdataset);
@@ -6056,7 +6057,7 @@ query_resume(query_ctx_t *qctx) {
isc_result_t
ns__query_sfcache(query_ctx_t *qctx) {
isc_boolean_t failcache;
isc_uint32_t flags;
uint32_t flags;
/*
* The SERVFAIL cache doesn't apply to authoritative queries.
@@ -7043,7 +7044,7 @@ query_getexpire(query_ctx_t *qctx) {
if (dns_zone_gettype(mayberaw) == dns_zone_slave) {
isc_time_t expiretime;
isc_uint32_t secs;
uint32_t secs;
dns_zone_getexpiretime(qctx->zone, &expiretime);
secs = isc_time_seconds(&expiretime);
if (secs >= qctx->client->now &&
@@ -7418,7 +7419,7 @@ query_dns64(query_ctx_t *qctx) {
dns_rdatalist_init(dns64_rdatalist);
dns64_rdatalist->rdclass = dns_rdataclass_in;
dns64_rdatalist->type = dns_rdatatype_aaaa;
if (client->query.dns64_ttl != ISC_UINT32_MAX)
if (client->query.dns64_ttl != UINT32_MAX)
dns64_rdatalist->ttl = ISC_MIN(qctx->rdataset->ttl,
client->query.dns64_ttl);
else
@@ -8340,7 +8341,7 @@ query_sign_nodata(query_ctx_t *qctx) {
* if this was an RPZ rewrite, but if it wasn't, add it now.
*/
if (!qctx->nxrewrite) {
result = query_addsoa(qctx, ISC_UINT32_MAX,
result = query_addsoa(qctx, UINT32_MAX,
DNS_SECTION_AUTHORITY);
if (result != ISC_R_SUCCESS) {
QUERY_ERROR(qctx, result);
@@ -8428,7 +8429,7 @@ query_addnxrrsetnsec(query_ctx_t *qctx) {
static isc_result_t
query_nxdomain(query_ctx_t *qctx, isc_boolean_t empty_wild) {
dns_section_t section;
isc_uint32_t ttl;
uint32_t ttl;
isc_result_t result;
INSIST(qctx->is_zone || REDIRECT(qctx->client));
@@ -8466,7 +8467,7 @@ query_nxdomain(query_ctx_t *qctx, isc_boolean_t empty_wild) {
*/
section = qctx->nxrewrite ? DNS_SECTION_ADDITIONAL
: DNS_SECTION_AUTHORITY;
ttl = ISC_UINT32_MAX;
ttl = UINT32_MAX;
if (!qctx->nxrewrite && qctx->qtype == dns_rdatatype_soa &&
qctx->zone != NULL && dns_zone_getzeronosoattl(qctx->zone))
{
@@ -9821,7 +9822,7 @@ query_addsoa(query_ctx_t *qctx, unsigned int override_ttl,
if (result != ISC_R_SUCCESS)
goto cleanup;
if (override_ttl != ISC_UINT32_MAX &&
if (override_ttl != UINT32_MAX &&
override_ttl < rdataset->ttl)
{
rdataset->ttl = override_ttl;
@@ -10762,7 +10763,7 @@ log_tat(ns_client_t *client) {
sizeof(classname));
if (client->query.qtype == dns_rdatatype_dnskey) {
isc_uint16_t keytags = client->keytag_len / 2;
uint16_t keytags = client->keytag_len / 2;
size_t len = taglen = sizeof("65000") * keytags + 1;
char *cp = tags = isc_mem_get(client->mctx, taglen);
int i = 0;
@@ -10771,7 +10772,7 @@ log_tat(ns_client_t *client) {
if (tags != NULL) {
while (keytags-- > 0U) {
int n;
isc_uint16_t keytag;
uint16_t keytag;
keytag = (client->keytag[i * 2] << 8) |
client->keytag[i * 2 + 1];
n = snprintf(cp, len, " %u", keytag);