diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c index 2979e25202..0f4355618e 100644 --- a/bin/check/check-tool.c +++ b/bin/check/check-tool.c @@ -15,6 +15,7 @@ #include #include +#include #ifdef _WIN32 #include @@ -734,7 +735,7 @@ load_zone(isc_mem_t *mctx, const char *zonename, const char *filename, isc_result_t dump_zone(const char *zonename, dns_zone_t *zone, const char *filename, dns_masterformat_t fileformat, const dns_master_style_t *style, - const isc_uint32_t rawversion) + const uint32_t rawversion) { isc_result_t result; FILE *output = stdout; diff --git a/bin/check/check-tool.h b/bin/check/check-tool.h index 575cccda23..c2683bad63 100644 --- a/bin/check/check-tool.h +++ b/bin/check/check-tool.h @@ -15,6 +15,8 @@ /*! \file */ +#include + #include #include #include @@ -36,7 +38,7 @@ load_zone(isc_mem_t *mctx, const char *zonename, const char *filename, isc_result_t dump_zone(const char *zonename, dns_zone_t *zone, const char *filename, dns_masterformat_t fileformat, const dns_master_style_t *style, - const isc_uint32_t rawversion); + const uint32_t rawversion); #ifdef _WIN32 void InitSockets(void); diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c index 76cc0c97ed..35d35ddc29 100644 --- a/bin/check/named-checkzone.c +++ b/bin/check/named-checkzone.c @@ -15,6 +15,7 @@ #include #include +#include #include #include @@ -106,7 +107,7 @@ main(int argc, char **argv) { dns_masterformat_t inputformat = dns_masterformat_text; dns_masterformat_t outputformat = dns_masterformat_text; dns_masterrawheader_t header; - isc_uint32_t rawversion = 1, serialnum = 0; + uint32_t rawversion = 1, serialnum = 0; dns_ttl_t maxttl = 0; isc_boolean_t snset = ISC_FALSE; isc_boolean_t logdump = ISC_FALSE; diff --git a/bin/delv/delv.c b/bin/delv/delv.c index 38af967357..2d5bc8899f 100644 --- a/bin/delv/delv.c +++ b/bin/delv/delv.c @@ -25,6 +25,7 @@ #endif #include +#include #include #include #include @@ -99,7 +100,7 @@ static dns_rdatatype_t qtype = dns_rdatatype_none; static isc_boolean_t typeset = ISC_FALSE; static unsigned int styleflags = 0; -static isc_uint32_t splitwidth = 0xffffffff; +static uint32_t splitwidth = 0xffffffff; static isc_boolean_t showcomments = ISC_TRUE, showdnssec = ISC_TRUE, @@ -147,7 +148,7 @@ static isc_result_t get_reverse(char *reverse, size_t len, char *value, isc_boolean_t strict); static isc_result_t -parse_uint(isc_uint32_t *uip, const char *value, isc_uint32_t max, +parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc); static void @@ -566,7 +567,7 @@ convert_name(dns_fixedname_t *fn, dns_name_t **name, const char *text) { static isc_result_t key_fromconfig(const cfg_obj_t *key, dns_client_t *client) { dns_rdata_dnskey_t keystruct; - isc_uint32_t flags, proto, alg; + uint32_t flags, proto, alg; const char *keystr, *keynamestr; unsigned char keydata[4096]; isc_buffer_t keydatabuf; @@ -621,9 +622,9 @@ key_fromconfig(const cfg_obj_t *key, dns_client_t *client) { if (alg > 0xff) CHECK(ISC_R_RANGE); - keystruct.flags = (isc_uint16_t)flags; - keystruct.protocol = (isc_uint8_t)proto; - keystruct.algorithm = (isc_uint8_t)alg; + keystruct.flags = (uint16_t)flags; + keystruct.protocol = (uint8_t)proto; + keystruct.algorithm = (uint8_t)alg; isc_buffer_init(&keydatabuf, keydata, sizeof(keydata)); isc_buffer_init(&rrdatabuf, rrdata, sizeof(rrdata)); @@ -778,7 +779,7 @@ addserver(dns_client_t *client) { struct in6_addr in6; isc_sockaddr_t *sa; isc_sockaddrlist_t servers; - isc_uint32_t destport; + uint32_t destport; isc_result_t result; dns_name_t *name = NULL; @@ -869,7 +870,7 @@ findserver(dns_client_t *client) { irs_resconf_t *resconf = NULL; isc_sockaddrlist_t *nameservers; isc_sockaddr_t *sa, *next; - isc_uint32_t destport; + uint32_t destport; result = parse_uint(&destport, port, 0xffff, "port"); if (result != ISC_R_SUCCESS) @@ -944,9 +945,9 @@ cleanup: } static isc_result_t -parse_uint(isc_uint32_t *uip, const char *value, isc_uint32_t max, +parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc) { - isc_uint32_t n; + uint32_t n; isc_result_t result = isc_parse_uint32(&n, value, 10); if (result == ISC_R_SUCCESS && n > max) result = ISC_R_RANGE; @@ -1177,7 +1178,7 @@ dash_option(char *option, char *next, isc_boolean_t *open_type_class) { struct in_addr in4; struct in6_addr in6; in_port_t srcport; - isc_uint32_t num; + uint32_t num; char *hash; while (strpbrk(option, single_dash_opts) == &option[0]) { diff --git a/bin/dig/dig.c b/bin/dig/dig.c index 91dee0b093..cc53f60895 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -12,10 +12,11 @@ /*! \file */ #include + +#include #include #include #include -#include #include #include @@ -65,7 +66,7 @@ static char hexcookie[81]; static isc_boolean_t short_form = ISC_FALSE, printcmd = ISC_TRUE, ip6_int = ISC_FALSE, plusquest = ISC_FALSE, pluscomm = ISC_FALSE, ipv4only = ISC_FALSE, ipv6only = ISC_FALSE; -static isc_uint32_t splitwidth = 0xffffffff; +static uint32_t splitwidth = 0xffffffff; /*% opcode text */ static const char * const opcodetext[] = { @@ -241,7 +242,7 @@ help(void) { */ static void received(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query) { - isc_uint64_t diff; + uint64_t diff; time_t tnow; struct tm tmnow; #ifdef WIN32 @@ -304,14 +305,14 @@ received(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query) { "from %s(%s) in %ld us\n\n", query->lookup->doing_xfr ? query->byte_count - : (isc_uint64_t)bytes, + : (uint64_t)bytes, fromtext, query->userarg, (long) diff); else printf(";; Received %" PRIu64 " bytes " "from %s(%s) in %ld ms\n\n", query->lookup->doing_xfr ? query->byte_count - : (isc_uint64_t)bytes, + : (uint64_t)bytes, fromtext, query->userarg, (long) diff / 1000); } } @@ -333,7 +334,7 @@ trying(char *frm, dig_lookup_t *lookup) { static isc_result_t say_message(dns_rdata_t *rdata, dig_query_t *query, isc_buffer_t *buf) { isc_result_t result; - isc_uint64_t diff; + uint64_t diff; char store[sizeof(" in 18446744073709551616 us.")]; unsigned int styleflags = 0; @@ -738,7 +739,7 @@ plus_option(char *option, isc_boolean_t is_batchfile, { isc_result_t result; char *cmd, *value, *last = NULL, *code, *extra; - isc_uint32_t num; + uint32_t num; isc_boolean_t state = ISC_TRUE; size_t n; @@ -1232,7 +1233,7 @@ plus_option(char *option, isc_boolean_t is_batchfile, warn("Couldn't parse padding"); goto exit_or_usage; } - lookup->padding = (isc_uint16_t)num; + lookup->padding = (uint16_t)num; break; case 'q': switch (cmd[1]) { @@ -1559,7 +1560,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, struct in6_addr in6; in_port_t srcport; char *hash, *cmd; - isc_uint32_t num; + uint32_t num; while (strpbrk(option, single_dash_opts) == &option[0]) { /* @@ -1731,7 +1732,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, "extra type option\n"); } if (rdtype == dns_rdatatype_ixfr) { - isc_uint32_t serial; + uint32_t serial; (*lookup)->rdtype = dns_rdatatype_ixfr; (*lookup)->rdtypeset = ISC_TRUE; result = parse_uint(&serial, &value[5], @@ -2034,7 +2035,7 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only, "extra type option\n"); } if (rdtype == dns_rdatatype_ixfr) { - isc_uint32_t serial; + uint32_t serial; lookup->rdtype = dns_rdatatype_ixfr; lookup->rdtypeset = ISC_TRUE; diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index 07db3e7b43..218a699fa4 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -20,6 +20,8 @@ */ #include + +#include #include #include #include @@ -901,9 +903,9 @@ setup_text_key(void) { } static isc_result_t -parse_uint_helper(isc_uint32_t *uip, const char *value, isc_uint32_t max, +parse_uint_helper(uint32_t *uip, const char *value, uint32_t max, const char *desc, int base) { - isc_uint32_t n; + uint32_t n; isc_result_t result = isc_parse_uint32(&n, value, base); if (result == ISC_R_SUCCESS && n > max) result = ISC_R_RANGE; @@ -917,21 +919,21 @@ parse_uint_helper(isc_uint32_t *uip, const char *value, isc_uint32_t max, } isc_result_t -parse_uint(isc_uint32_t *uip, const char *value, isc_uint32_t max, +parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc) { return (parse_uint_helper(uip, value, max, desc, 10)); } isc_result_t -parse_xint(isc_uint32_t *uip, const char *value, isc_uint32_t max, +parse_xint(uint32_t *uip, const char *value, uint32_t max, const char *desc) { return (parse_uint_helper(uip, value, max, desc, 0)); } -static isc_uint32_t -parse_bits(char *arg, const char *desc, isc_uint32_t max) { +static uint32_t +parse_bits(char *arg, const char *desc, uint32_t max) { isc_result_t result; - isc_uint32_t tmp; + uint32_t tmp; result = parse_uint(&tmp, arg, max, desc); if (result != ISC_R_SUCCESS) @@ -946,7 +948,7 @@ parse_netprefix(isc_sockaddr_t **sap, const char *value) { isc_sockaddr_t *sa = NULL; struct in_addr in4; struct in6_addr in6; - isc_uint32_t prefix_length = 0xffffffff; + uint32_t prefix_length = 0xffffffff; char *slash = NULL; isc_boolean_t parsed = ISC_FALSE; isc_boolean_t prefix_parsed = ISC_FALSE; @@ -1373,7 +1375,7 @@ setup_libs(void) { } typedef struct dig_ednsoptname { - isc_uint32_t code; + uint32_t code; const char *name; } dig_ednsoptname_t; @@ -1398,7 +1400,7 @@ dig_ednsoptname_t optnames[] = { void save_opt(dig_lookup_t *lookup, char *code, char *value) { isc_result_t result; - isc_uint32_t num = 0; + uint32_t num = 0; isc_buffer_t b; isc_boolean_t found = ISC_FALSE; unsigned int i; @@ -1454,7 +1456,7 @@ save_opt(dig_lookup_t *lookup, char *code, char *value) { * (e.g., NSID, COOKIE, client-subnet) */ static void -add_opt(dns_message_t *msg, isc_uint16_t udpsize, isc_uint16_t edns, +add_opt(dns_message_t *msg, uint16_t udpsize, uint16_t edns, unsigned int flags, dns_ednsopt_t *opts, size_t count) { dns_rdataset_t *rdataset = NULL; @@ -1829,7 +1831,7 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section) * Randomize the order the nameserver will be tried. */ if (numLookups > 1) { - isc_uint32_t i, j; + uint32_t i, j; dig_serverlist_t my_server_list; dig_server_t *next; @@ -2289,9 +2291,9 @@ setup_lookup(dig_lookup_t *lookup) { } if (lookup->ecs_addr != NULL) { - isc_uint8_t addr[16]; - isc_uint16_t family; - isc_uint32_t plen; + uint8_t addr[16]; + uint16_t family; + uint32_t plen; struct sockaddr *sa; struct sockaddr_in *sin; struct sockaddr_in6 *sin6; @@ -2305,7 +2307,7 @@ setup_lookup(dig_lookup_t *lookup) { INSIST(i < MAXOPTS); opts[i].code = DNS_OPT_CLIENT_SUBNET; - opts[i].length = (isc_uint16_t) addrl + 4; + opts[i].length = (uint16_t) addrl + 4; check_result(result, "isc_buffer_allocate"); /* @@ -2367,7 +2369,7 @@ setup_lookup(dig_lookup_t *lookup) { (unsigned)addrl); } - opts[i].value = (isc_uint8_t *) ecsbuf; + opts[i].value = (uint8_t *) ecsbuf; i++; } @@ -2972,7 +2974,7 @@ tcp_length_done(isc_task_t *task, isc_event_t *event) { isc_result_t result; dig_query_t *query = NULL; dig_lookup_t *l, *n; - isc_uint16_t length; + uint16_t length; REQUIRE(event->ev_type == ISC_SOCKEVENT_RECVDONE); INSIST(!free_now); @@ -3081,7 +3083,7 @@ launch_next_query(dig_query_t *query, isc_boolean_t include_question) { isc_buffer_clear(&query->slbuf); isc_buffer_clear(&query->lengthbuf); - isc_buffer_putuint16(&query->slbuf, (isc_uint16_t) query->sendbuf.used); + isc_buffer_putuint16(&query->slbuf, (uint16_t) query->sendbuf.used); ISC_LIST_INIT(query->sendlist); ISC_LINK_INIT(&query->slbuf, link); if (!query->first_soa_rcvd) { @@ -3223,7 +3225,7 @@ check_for_more_data(dig_query_t *query, dns_message_t *msg, dns_rdataset_t *rdataset = NULL; dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_soa_t soa; - isc_uint32_t ixfr_serial = query->lookup->ixfr_serial, serial; + uint32_t ixfr_serial = query->lookup->ixfr_serial, serial; isc_result_t result; isc_boolean_t ixfr = query->lookup->rdtype == dns_rdatatype_ixfr; isc_boolean_t axfr = query->lookup->rdtype == dns_rdatatype_axfr; @@ -3411,7 +3413,7 @@ process_opt(dig_lookup_t *l, dns_message_t *msg) { dns_rdata_t rdata; isc_result_t result; isc_buffer_t optbuf; - isc_uint16_t optcode, optlen; + uint16_t optcode, optlen; dns_rdataset_t *opt = msg->opt; isc_boolean_t seen_cookie = ISC_FALSE; diff --git a/bin/dig/host.c b/bin/dig/host.c index 29e898b4ec..9b7183df2a 100644 --- a/bin/dig/host.c +++ b/bin/dig/host.c @@ -12,6 +12,8 @@ /*! \file */ #include + +#include #include #include @@ -664,7 +666,7 @@ parse_args(isc_boolean_t is_batchfile, int argc, char **argv) { isc_result_t result = ISC_R_SUCCESS; dns_rdatatype_t rdtype; dns_rdataclass_t rdclass; - isc_uint32_t serial = 0; + uint32_t serial = 0; UNUSED(is_batchfile); diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h index 99f85cd904..c020fac712 100644 --- a/bin/dig/include/dig/dig.h +++ b/bin/dig/include/dig/dig.h @@ -14,6 +14,8 @@ /*! \file */ +#include + #include #include @@ -158,17 +160,17 @@ struct dig_lookup { dig_serverlist_t my_server_list; dig_searchlist_t *origin; dig_query_t *xfr_q; - isc_uint32_t retries; + uint32_t retries; int nsfound; - isc_uint16_t udpsize; - isc_int16_t edns; - isc_int16_t padding; - isc_uint32_t ixfr_serial; + uint16_t udpsize; + int16_t edns; + int16_t padding; + uint32_t ixfr_serial; isc_buffer_t rdatabuf; char rdatastore[MXNAME]; dst_context_t *tsigctx; isc_buffer_t *querysig; - isc_uint32_t msgcounter; + uint32_t msgcounter; dns_fixedname_t fdomain; isc_sockaddr_t *ecs_addr; char *cookie; @@ -194,10 +196,10 @@ struct dig_query { recv_made, warn_id, timedout; - isc_uint32_t first_rr_serial; - isc_uint32_t second_rr_serial; - isc_uint32_t msg_count; - isc_uint32_t rr_count; + uint32_t first_rr_serial; + uint32_t second_rr_serial; + uint32_t msg_count; + uint32_t rr_count; isc_boolean_t ixfr_axfr; char *servname; char *userarg; @@ -216,7 +218,7 @@ struct dig_query { isc_sockaddr_t sockaddr; isc_time_t time_sent; isc_time_t time_recv; - isc_uint64_t byte_count; + uint64_t byte_count; isc_buffer_t sendbuf; isc_timer_t *timer; }; @@ -327,11 +329,11 @@ void setup_system(isc_boolean_t ipv4only, isc_boolean_t ipv6only); isc_result_t -parse_uint(isc_uint32_t *uip, const char *value, isc_uint32_t max, +parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc); isc_result_t -parse_xint(isc_uint32_t *uip, const char *value, isc_uint32_t max, +parse_xint(uint32_t *uip, const char *value, uint32_t max, const char *desc); isc_result_t diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c index 16f4ad34d0..371281e19c 100644 --- a/bin/dig/nslookup.c +++ b/bin/dig/nslookup.c @@ -11,6 +11,7 @@ #include +#include #include #include @@ -601,15 +602,15 @@ testclass(char *typetext) { static void set_port(const char *value) { - isc_uint32_t n; + uint32_t n; isc_result_t result = parse_uint(&n, value, 65535, "port"); if (result == ISC_R_SUCCESS) - port = (isc_uint16_t) n; + port = (uint16_t) n; } static void set_timeout(const char *value) { - isc_uint32_t n; + uint32_t n; isc_result_t result = parse_uint(&n, value, UINT_MAX, "timeout"); if (result == ISC_R_SUCCESS) timeout = n; @@ -617,7 +618,7 @@ set_timeout(const char *value) { static void set_tries(const char *value) { - isc_uint32_t n; + uint32_t n; isc_result_t result = parse_uint(&n, value, INT_MAX, "tries"); if (result == ISC_R_SUCCESS) tries = n; @@ -625,7 +626,7 @@ set_tries(const char *value) { static void set_ndots(const char *value) { - isc_uint32_t n; + uint32_t n; isc_result_t result = parse_uint(&n, value, 128, "ndots"); if (result == ISC_R_SUCCESS) ndots = n; diff --git a/bin/dnssec/dnssec-cds.c b/bin/dnssec/dnssec-cds.c index 54fccc6e59..e473abb82b 100644 --- a/bin/dnssec/dnssec-cds.c +++ b/bin/dnssec/dnssec-cds.c @@ -19,6 +19,7 @@ #include #include +#include #include #include @@ -84,7 +85,7 @@ static dns_rdataclass_t rdclass = dns_rdataclass_in; * List of digest types used by ds_from_cdnskey(), filled in by add_dtype() * from -a arguments. The size of the array is an arbitrary limit. */ -static isc_uint8_t dtype[8]; +static uint8_t dtype[8]; static const char *startstr = NULL; /* from which we derive notbefore */ static isc_stdtime_t notbefore = 0; /* restrict sig inception times */ @@ -127,7 +128,7 @@ static int nkey; /* number of child zone DNSKEY records */ typedef struct keyinfo { dns_rdata_t rdata; dst_key_t *dst; - isc_uint8_t algo; + uint8_t algo; dns_keytag_t tag; } keyinfo_t; @@ -617,12 +618,12 @@ free_keytable(keyinfo_t **keytable_p) { * otherwise the key algorithm. This is used by the signature coverage * check functions below. */ -static isc_uint8_t * +static uint8_t * matching_sigs(keyinfo_t *keytbl, dns_rdataset_t *rdataset, dns_rdataset_t *sigset) { isc_result_t result; - isc_uint8_t *algo; + uint8_t *algo; int i; algo = isc_mem_get(mctx, nkey); @@ -705,7 +706,7 @@ matching_sigs(keyinfo_t *keytbl, dns_rdataset_t *rdataset, * fetched from the child zone, any working signature is enough. */ static isc_boolean_t -signed_loose(isc_uint8_t *algo) { +signed_loose(uint8_t *algo) { isc_boolean_t ok = ISC_FALSE; int i; for (i = 0; i < nkey; i++) { @@ -724,7 +725,7 @@ signed_loose(isc_uint8_t *algo) { * RRset. */ static isc_boolean_t -signed_strict(dns_rdataset_t *dsset, isc_uint8_t *algo) { +signed_strict(dns_rdataset_t *dsset, uint8_t *algo) { isc_result_t result; isc_boolean_t all_ok = ISC_TRUE; @@ -848,14 +849,14 @@ ds_from_cdnskey(dns_rdatalist_t *dslist, isc_buffer_t *buf, */ static int cmp_dtype(const void *ap, const void *bp) { - int a = *(const isc_uint8_t *)ap; - int b = *(const isc_uint8_t *)bp; + int a = *(const uint8_t *)ap; + int b = *(const uint8_t *)bp; return (a - b); } static void add_dtype(const char *dn) { - isc_uint8_t dt; + uint8_t dt; unsigned i, n; dt = strtodsdigest(dn); @@ -872,7 +873,7 @@ add_dtype(const char *dn) { static void make_new_ds_set(ds_maker_func_t *ds_from_rdata, - isc_uint32_t ttl, dns_rdataset_t *rdset) + uint32_t ttl, dns_rdataset_t *rdset) { unsigned int size = 16; for (;;) { @@ -940,7 +941,7 @@ consistent_digests(dns_rdataset_t *dsset) { dns_rdata_t *arrdata; dns_rdata_ds_t *ds; dns_keytag_t key_tag; - isc_uint8_t algorithm; + uint8_t algorithm; isc_boolean_t match; int i, j, n, d; @@ -1039,7 +1040,7 @@ print_diff(const char *cmd, dns_rdataset_t *rdataset) { } static void -update_diff(const char *cmd, isc_uint32_t ttl, +update_diff(const char *cmd, uint32_t ttl, dns_rdataset_t *addset, dns_rdataset_t *delset) { isc_result_t result; @@ -1047,7 +1048,7 @@ update_diff(const char *cmd, isc_uint32_t ttl, dns_dbnode_t *node; dns_dbversion_t *ver; dns_rdataset_t diffset; - isc_uint32_t save; + uint32_t save; db = NULL; result = dns_db_create(mctx, "rbt", name, dns_dbtype_zone, @@ -1088,7 +1089,7 @@ update_diff(const char *cmd, isc_uint32_t ttl, } static void -nsdiff(isc_uint32_t ttl, dns_rdataset_t *oldset, dns_rdataset_t *newset) { +nsdiff(uint32_t ttl, dns_rdataset_t *oldset, dns_rdataset_t *newset) { if (ttl == 0) { vbprintf(1, "warning: no TTL in nsupdate script\n"); } @@ -1138,7 +1139,7 @@ main(int argc, char *argv[]) { isc_result_t result; isc_boolean_t prefer_cdnskey = ISC_FALSE; isc_boolean_t nsupdate = ISC_FALSE; - isc_uint32_t ttl = 0; + uint32_t ttl = 0; int ch; char *endp; diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c index 983b0e2638..bfe125984e 100644 --- a/bin/dnssec/dnssec-dsfromkey.c +++ b/bin/dnssec/dnssec-dsfromkey.c @@ -13,6 +13,7 @@ #include +#include #include #include @@ -58,7 +59,7 @@ static dns_rdataclass_t rdclass; static dns_fixedname_t fixed; static dns_name_t *name = NULL; static isc_mem_t *mctx = NULL; -static isc_uint32_t ttl; +static uint32_t ttl; static isc_boolean_t emitttl = ISC_FALSE; static isc_result_t diff --git a/bin/dnssec/dnssec-keyfromlabel.c b/bin/dnssec/dnssec-keyfromlabel.c index c81a9f4077..1dbfc1de79 100644 --- a/bin/dnssec/dnssec-keyfromlabel.c +++ b/bin/dnssec/dnssec-keyfromlabel.c @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -127,7 +128,7 @@ main(int argc, char **argv) { dst_key_t *key = NULL; dns_fixedname_t fname; dns_name_t *name; - isc_uint16_t flags = 0, kskflag = 0, revflag = 0; + uint16_t flags = 0, kskflag = 0, revflag = 0; dns_secalg_t alg; isc_boolean_t oldstyle = ISC_FALSE; isc_mem_t *mctx = NULL; diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c index d8889395eb..3acf4d0df5 100644 --- a/bin/dnssec/dnssec-keygen.c +++ b/bin/dnssec/dnssec-keygen.c @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -198,7 +199,7 @@ main(int argc, char **argv) { dst_key_t *key = NULL; dns_fixedname_t fname; dns_name_t *name; - isc_uint16_t flags = 0, kskflag = 0, revflag = 0; + uint16_t flags = 0, kskflag = 0, revflag = 0; dns_secalg_t alg; isc_boolean_t conflict = ISC_FALSE, null_key = ISC_FALSE; isc_boolean_t oldstyle = ISC_FALSE; diff --git a/bin/dnssec/dnssec-revoke.c b/bin/dnssec/dnssec-revoke.c index f42dda5347..6733594281 100644 --- a/bin/dnssec/dnssec-revoke.c +++ b/bin/dnssec/dnssec-revoke.c @@ -13,6 +13,7 @@ #include +#include #include #include @@ -80,7 +81,7 @@ main(int argc, char **argv) { char *endp; int ch; dst_key_t *key = NULL; - isc_uint32_t flags; + uint32_t flags; isc_buffer_t buf; isc_boolean_t force = ISC_FALSE; isc_boolean_t removefile = ISC_FALSE; diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c index ba6d4f0d0c..fb1ab5df15 100644 --- a/bin/dnssec/dnssec-settime.c +++ b/bin/dnssec/dnssec-settime.c @@ -13,6 +13,7 @@ #include +#include #include #include #include @@ -141,7 +142,7 @@ main(int argc, char **argv) { dns_name_t *name = NULL; dns_secalg_t alg = 0; unsigned int size = 0; - isc_uint16_t flags = 0; + uint16_t flags = 0; int prepub = -1; dns_ttl_t ttl = 0; isc_stdtime_t now; diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index 7887147b6d..9a01cb6266 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -27,6 +27,7 @@ #include +#include #include #include #include @@ -141,7 +142,7 @@ static char *tempfile = NULL; static const dns_master_style_t *masterstyle; static dns_masterformat_t inputformat = dns_masterformat_text; static dns_masterformat_t outputformat = dns_masterformat_text; -static isc_uint32_t rawversion = 1, serialnum = 0; +static uint32_t rawversion = 1, serialnum = 0; static isc_boolean_t snset = ISC_FALSE; static unsigned int nsigned = 0, nretained = 0, ndropped = 0; static unsigned int nverified = 0, nverifyfailed = 0; @@ -931,7 +932,7 @@ opendb(const char *prefix, dns_name_t *name, dns_rdataclass_t rdclass, * dnssec-signzone, and build DS records from that. */ static isc_result_t -loadds(dns_name_t *name, isc_uint32_t ttl, dns_rdataset_t *dsset) { +loadds(dns_name_t *name, uint32_t ttl, dns_rdataset_t *dsset) { dns_db_t *db = NULL; dns_dbversion_t *ver = NULL; dns_dbnode_t *node = NULL; @@ -1049,7 +1050,7 @@ secure(dns_name_t *name, dns_dbnode_t *node) { static isc_boolean_t is_delegation(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *origin, - dns_name_t *name, dns_dbnode_t *node, isc_uint32_t *ttlp) + dns_name_t *name, dns_dbnode_t *node, uint32_t *ttlp) { dns_rdataset_t nsset; isc_result_t result; @@ -1316,12 +1317,12 @@ get_soa_ttls(void) { * Increment (or set if nonzero) the SOA serial */ static isc_result_t -setsoaserial(isc_uint32_t serial, dns_updatemethod_t method) { +setsoaserial(uint32_t serial, dns_updatemethod_t method) { isc_result_t result; dns_dbnode_t *node = NULL; dns_rdataset_t rdataset; dns_rdata_t rdata = DNS_RDATA_INIT; - isc_uint32_t old_serial, new_serial; + uint32_t old_serial, new_serial; result = dns_db_getoriginnode(gdb, &node); if (result != ISC_R_SUCCESS) @@ -1654,7 +1655,7 @@ sign(isc_task_t *task, isc_event_t *event) { * Update / remove the DS RRset. Preserve RRSIG(DS) if possible. */ static void -add_ds(dns_name_t *name, dns_dbnode_t *node, isc_uint32_t nsttl) { +add_ds(dns_name_t *name, dns_dbnode_t *node, uint32_t nsttl) { dns_rdataset_t dsset; dns_rdataset_t sigdsset; isc_result_t result; @@ -1790,7 +1791,7 @@ nsecify(void) { dns_rdatatype_t type, covers; isc_boolean_t done = ISC_FALSE; isc_result_t result; - isc_uint32_t nsttl = 0; + uint32_t nsttl = 0; dns_rdataset_init(&rdataset); name = dns_fixedname_initname(&fname); @@ -2262,7 +2263,7 @@ nsec3ify(unsigned int hashalg, dns_iterations_t iterations, isc_boolean_t active; isc_boolean_t done = ISC_FALSE; isc_result_t result; - isc_uint32_t nsttl = 0; + uint32_t nsttl = 0; unsigned int count, nlabels; dns_rdataset_init(&rdataset); @@ -2832,7 +2833,7 @@ set_nsec3params(isc_boolean_t update, isc_boolean_t set_salt, unsigned char orig_salt[255]; size_t orig_saltlen; dns_hash_t orig_hash; - isc_uint16_t orig_iter; + uint16_t orig_iter; dns_db_currentversion(gdb, &ver); dns_rdataset_init(&rdataset); @@ -3179,9 +3180,9 @@ static void print_stats(isc_time_t *timer_start, isc_time_t *timer_finish, isc_time_t *sign_start, isc_time_t *sign_finish) { - isc_uint64_t time_us; /* Time in microseconds */ - isc_uint64_t time_ms; /* Time in milliseconds */ - isc_uint64_t sig_ms; /* Signatures per millisecond */ + uint64_t time_us; /* Time in microseconds */ + uint64_t time_ms; /* Time in milliseconds */ + uint64_t sig_ms; /* Signatures per millisecond */ FILE *out = output_stdout ? stderr : stdout; fprintf(out, "Signatures generated: %10u\n", nsigned); @@ -3197,7 +3198,7 @@ print_stats(isc_time_t *timer_start, isc_time_t *timer_finish, (unsigned int) (time_ms / 1000), (unsigned int) (time_ms % 1000)); if (time_us > 0) { - sig_ms = ((isc_uint64_t)nsigned * 1000000000) / time_us; + sig_ms = ((uint64_t)nsigned * 1000000000) / time_us; fprintf(out, "Signatures per second: %7u.%03u\n", (unsigned int) sig_ms / 1000, (unsigned int) sig_ms % 1000); @@ -3438,7 +3439,7 @@ main(int argc, char *argv[]) { case 'n': endp = NULL; ntasks = strtol(isc_commandline_argument, &endp, 0); - if (*endp != '\0' || ntasks > ISC_INT32_MAX) + if (*endp != '\0' || ntasks > INT32_MAX) fatal("number of cpus must be numeric"); break; diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c index e7ea7d522d..f405b365a7 100644 --- a/bin/dnssec/dnssectool.c +++ b/bin/dnssec/dnssectool.c @@ -17,6 +17,7 @@ #include +#include #include #ifdef _WIN32 @@ -244,10 +245,10 @@ strtottl(const char *str) { } isc_stdtime_t -strtotime(const char *str, isc_int64_t now, isc_int64_t base, +strtotime(const char *str, int64_t now, int64_t base, isc_boolean_t *setp) { - isc_int64_t val, offset; + int64_t val, offset; isc_result_t result; const char *orig = str; char *endp; @@ -405,8 +406,8 @@ key_collision(dst_key_t *dstkey, dns_name_t *name, const char *dir, isc_boolean_t conflict = ISC_FALSE; dns_dnsseckeylist_t matchkeys; dns_dnsseckey_t *key = NULL; - isc_uint16_t id, oldid; - isc_uint32_t rid, roldid; + uint16_t id, oldid; + uint32_t rid, roldid; dns_secalg_t alg; char filename[ISC_DIR_NAMEMAX]; isc_buffer_t fileb; diff --git a/bin/dnssec/dnssectool.h b/bin/dnssec/dnssectool.h index 0ce686c393..1c1a154fbb 100644 --- a/bin/dnssec/dnssectool.h +++ b/bin/dnssec/dnssectool.h @@ -13,6 +13,8 @@ #ifndef DNSSECTOOL_H #define DNSSECTOOL_H 1 +#include + #include #include #include @@ -49,7 +51,7 @@ cleanup_logging(isc_log_t **logp); dns_ttl_t strtottl(const char *str); isc_stdtime_t -strtotime(const char *str, isc_int64_t now, isc_int64_t base, +strtotime(const char *str, int64_t now, int64_t base, isc_boolean_t *setp); unsigned int diff --git a/bin/named/config.c b/bin/named/config.c index a6031e12a3..405197363e 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -13,6 +13,7 @@ #include +#include #include #include @@ -447,7 +448,7 @@ isc_result_t named_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list, in_port_t defport, isc_mem_t *mctx, isc_sockaddr_t **addrsp, isc_dscp_t **dscpsp, - isc_uint32_t *countp) + uint32_t *countp) { int count, i = 0; const cfg_obj_t *addrlist; @@ -467,8 +468,8 @@ named_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list, portobj = cfg_tuple_get(list, "port"); if (cfg_obj_isuint32(portobj)) { - isc_uint32_t val = cfg_obj_asuint32(portobj); - if (val > ISC_UINT16_MAX) { + uint32_t val = cfg_obj_asuint32(portobj); + if (val > UINT16_MAX) { cfg_obj_log(portobj, named_g_lctx, ISC_LOG_ERROR, "port '%u' out of range", val); return (ISC_R_RANGE); @@ -538,7 +539,7 @@ named_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list, void named_config_putiplist(isc_mem_t *mctx, isc_sockaddr_t **addrsp, - isc_dscp_t **dscpsp, isc_uint32_t count) + isc_dscp_t **dscpsp, uint32_t count) { INSIST(addrsp != NULL && *addrsp != NULL); INSIST(dscpsp == NULL || *dscpsp != NULL); @@ -584,9 +585,9 @@ isc_result_t named_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, isc_mem_t *mctx, dns_ipkeylist_t *ipkl) { - isc_uint32_t addrcount = 0, dscpcount = 0, keycount = 0, i = 0; - isc_uint32_t listcount = 0, l = 0, j; - isc_uint32_t stackcount = 0, pushed = 0; + uint32_t addrcount = 0, dscpcount = 0, keycount = 0, i = 0; + uint32_t listcount = 0, l = 0, j; + uint32_t stackcount = 0, pushed = 0; isc_result_t result; const cfg_listelt_t *element; const cfg_obj_t *addrlist; @@ -630,8 +631,8 @@ named_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, dscpobj = cfg_tuple_get(list, "dscp"); if (cfg_obj_isuint32(portobj)) { - isc_uint32_t val = cfg_obj_asuint32(portobj); - if (val > ISC_UINT16_MAX) { + uint32_t val = cfg_obj_asuint32(portobj); + if (val > UINT16_MAX) { cfg_obj_log(portobj, named_g_lctx, ISC_LOG_ERROR, "port '%u' out of range", val); result = ISC_R_RANGE; @@ -675,7 +676,7 @@ named_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, /* Grow lists? */ if (listcount == l) { void * tmp; - isc_uint32_t newlen = listcount + 16; + uint32_t newlen = listcount + 16; size_t newsize, oldsize; newsize = newlen * sizeof(*lists); @@ -710,7 +711,7 @@ named_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, /* Grow stack? */ if (stackcount == pushed) { void * tmp; - isc_uint32_t newlen = stackcount + 16; + uint32_t newlen = stackcount + 16; size_t newsize, oldsize; newsize = newlen * sizeof(*stack); @@ -738,7 +739,7 @@ named_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, if (i == addrcount) { void * tmp; - isc_uint32_t newlen = addrcount + 16; + uint32_t newlen = addrcount + 16; size_t newsize, oldsize; newsize = newlen * sizeof(isc_sockaddr_t); @@ -911,7 +912,7 @@ named_config_getport(const cfg_obj_t *config, in_port_t *portp) { result = named_config_get(maps, "port", &portobj); INSIST(result == ISC_R_SUCCESS); - if (cfg_obj_asuint32(portobj) >= ISC_UINT16_MAX) { + if (cfg_obj_asuint32(portobj) >= UINT16_MAX) { cfg_obj_log(portobj, named_g_lctx, ISC_LOG_ERROR, "port '%u' out of range", cfg_obj_asuint32(portobj)); @@ -951,7 +952,7 @@ struct keyalgorithms { enum { hmacnone, hmacmd5, hmacsha1, hmacsha224, hmacsha256, hmacsha384, hmacsha512 } hmac; unsigned int type; - isc_uint16_t size; + uint16_t size; } algorithms[] = { { "hmac-md5", hmacmd5, DST_ALG_HMACMD5, 128 }, { "hmac-md5.sig-alg.reg.int", hmacmd5, DST_ALG_HMACMD5, 0 }, @@ -966,18 +967,18 @@ struct keyalgorithms { isc_result_t named_config_getkeyalgorithm(const char *str, const dns_name_t **name, - isc_uint16_t *digestbits) + uint16_t *digestbits) { return (named_config_getkeyalgorithm2(str, name, NULL, digestbits)); } isc_result_t named_config_getkeyalgorithm2(const char *str, const dns_name_t **name, - unsigned int *typep, isc_uint16_t *digestbits) + unsigned int *typep, uint16_t *digestbits) { int i; size_t len = 0; - isc_uint16_t bits; + uint16_t bits; isc_result_t result; for (i = 0; algorithms[i].str != NULL; i++) { diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c index 36602d3e18..f9bfc3acc0 100644 --- a/bin/named/controlconf.c +++ b/bin/named/controlconf.c @@ -13,6 +13,8 @@ #include +#include + #include #include #include @@ -65,7 +67,7 @@ typedef ISC_LIST(controllistener_t) controllistenerlist_t; struct controlkey { char * keyname; - isc_uint32_t algorithm; + uint32_t algorithm; isc_region_t secret; ISC_LINK(controlkey_t) link; }; @@ -78,7 +80,7 @@ struct controlconnection { isc_timer_t * timer; isc_buffer_t * buffer; controllistener_t * listener; - isc_uint32_t nonce; + uint32_t nonce; ISC_LINK(controlconnection_t) link; }; @@ -94,9 +96,9 @@ struct controllistener { controlkeylist_t keys; controlconnectionlist_t connections; isc_sockettype_t type; - isc_uint32_t perm; - isc_uint32_t owner; - isc_uint32_t group; + uint32_t perm; + uint32_t owner; + uint32_t group; isc_boolean_t readonly; ISC_LINK(controllistener_t) link; }; @@ -329,7 +331,7 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) { controlkey_t *key = NULL; isccc_sexpr_t *request = NULL; isccc_sexpr_t *response = NULL; - isc_uint32_t algorithm; + uint32_t algorithm; isccc_region_t secret; isc_stdtime_t now; isc_buffer_t b; @@ -340,7 +342,7 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) { isccc_sexpr_t *_ctrl = NULL; isccc_time_t sent; isccc_time_t exp; - isc_uint32_t nonce; + uint32_t nonce; isccc_sexpr_t *data = NULL; REQUIRE(event->ev_type == ISCCC_EVENT_CCMSG); @@ -1091,7 +1093,7 @@ update_listener(named_controls_t *cp, controllistener_t **listenerp, socktext, isc_result_totext(result)); if (result == ISC_R_SUCCESS && type == isc_sockettype_unix) { - isc_uint32_t perm, owner, group; + uint32_t perm, owner, group; perm = cfg_obj_asuint32(cfg_tuple_get(control, "perm")); owner = cfg_obj_asuint32(cfg_tuple_get(control, "owner")); group = cfg_obj_asuint32(cfg_tuple_get(control, "group")); diff --git a/bin/named/fuzz.c b/bin/named/fuzz.c index 6996529d83..dbf0d46095 100644 --- a/bin/named/fuzz.c +++ b/bin/named/fuzz.c @@ -11,6 +11,8 @@ #include "config.h" +#include + #include #ifdef ENABLE_AFL @@ -200,7 +202,7 @@ fuzz_thread_resolver(void *arg) { * have to be updated. 0x8d, 0xf6 at the start is the ID field * which will be made to match the query. */ - const isc_uint8_t dnskey_wf[] = { + const uint8_t dnskey_wf[] = { 0x8d, 0xf6, 0x84, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x00, 0x00, 0x30, 0x00, @@ -282,12 +284,12 @@ fuzz_thread_resolver(void *arg) { int sockfd; int listenfd; int loop; - isc_uint16_t qtype; + uint16_t qtype; char *buf, *rbuf; char *nameptr; unsigned int i; - isc_uint8_t llen; - isc_uint64_t seed; + uint8_t llen; + uint64_t seed; UNUSED(arg); @@ -549,7 +551,7 @@ fuzz_thread_resolver(void *arg) { * "example." */ if ((nameptr - buf) < (length - 2)) { - isc_uint8_t hb, lb; + uint8_t hb, lb; hb = *nameptr++; lb = *nameptr++; qtype = (hb << 8) | lb; diff --git a/bin/named/include/named/config.h b/bin/named/include/named/config.h index 1c6ce9e006..ad69a16248 100644 --- a/bin/named/include/named/config.h +++ b/bin/named/include/named/config.h @@ -15,6 +15,8 @@ /*! \file */ +#include + #include #include @@ -49,11 +51,11 @@ isc_result_t named_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list, in_port_t defport, isc_mem_t *mctx, isc_sockaddr_t **addrsp, isc_dscp_t **dscpsp, - isc_uint32_t *countp); + uint32_t *countp); void named_config_putiplist(isc_mem_t *mctx, isc_sockaddr_t **addrsp, - isc_dscp_t **dscpsp, isc_uint32_t count); + isc_dscp_t **dscpsp, uint32_t count); isc_result_t named_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, @@ -64,10 +66,10 @@ named_config_getport(const cfg_obj_t *config, in_port_t *portp); isc_result_t named_config_getkeyalgorithm(const char *str, const dns_name_t **name, - isc_uint16_t *digestbits); + uint16_t *digestbits); isc_result_t named_config_getkeyalgorithm2(const char *str, const dns_name_t **name, - unsigned int *typep, isc_uint16_t *digestbits); + unsigned int *typep, uint16_t *digestbits); isc_result_t named_config_getdscp(const cfg_obj_t *config, isc_dscp_t *dscpp); diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h index 296ac8e417..fc7d7fc961 100644 --- a/bin/named/include/named/server.h +++ b/bin/named/include/named/server.h @@ -14,6 +14,8 @@ /*! \file */ +#include + #include #include #include @@ -70,8 +72,8 @@ struct named_server { isc_timer_t * pps_timer; isc_timer_t * tat_timer; - isc_uint32_t interface_interval; - isc_uint32_t heartbeat_interval; + uint32_t interface_interval; + uint32_t heartbeat_interval; isc_mutex_t reload_event_lock; isc_event_t * reload_event; @@ -93,7 +95,7 @@ struct named_server { char *session_keyfile; dns_name_t *session_keyname; unsigned int session_keyalg; - isc_uint16_t session_keybits; + uint16_t session_keybits; isc_boolean_t interface_auto; unsigned char secret[32]; /*%< Server Cookie Secret */ ns_cookiealg_t cookiealg; diff --git a/bin/named/logconf.c b/bin/named/logconf.c index b18416df28..cdd998ef01 100644 --- a/bin/named/logconf.c +++ b/bin/named/logconf.c @@ -13,6 +13,8 @@ #include +#include + #include #include #include @@ -136,10 +138,10 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *logconfig) { cfg_tuple_get(fileobj, "versions"); const cfg_obj_t *suffixobj = cfg_tuple_get(fileobj, "suffix"); - isc_int32_t versions = ISC_LOG_ROLLNEVER; + int32_t versions = ISC_LOG_ROLLNEVER; isc_log_rollsuffix_t suffix = isc_log_rollsuffix_increment; isc_offset_t size = 0; - isc_uint64_t maxoffset; + uint64_t maxoffset; /* * isc_offset_t is a signed integer type, so the maximum diff --git a/bin/named/main.c b/bin/named/main.c index 4a874eed7a..ce3622f342 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -14,9 +14,9 @@ #include #include +#include #include #include -#include #include #include diff --git a/bin/named/server.c b/bin/named/server.c index c969d0b576..83c9caeca5 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -13,13 +13,13 @@ #include +#include #include #include #include #include #include #include -#include #include #include @@ -435,11 +435,11 @@ named_server_reload(isc_task_t *task, isc_event_t *event); static isc_result_t ns_listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, cfg_aclconfctx_t *actx, isc_mem_t *mctx, - isc_uint16_t family, ns_listenelt_t **target); + uint16_t family, ns_listenelt_t **target); static isc_result_t ns_listenlist_fromconfig(const cfg_obj_t *listenlist, const cfg_obj_t *config, cfg_aclconfctx_t *actx, isc_mem_t *mctx, - isc_uint16_t family, ns_listenlist_t **target); + uint16_t family, ns_listenlist_t **target); static isc_result_t configure_forward(const cfg_obj_t *config, dns_view_t *view, @@ -477,7 +477,7 @@ static isc_result_t putmem(isc_buffer_t **b, const char *str, size_t len); static isc_result_t -putuint8(isc_buffer_t **b, isc_uint8_t val); +putuint8(isc_buffer_t **b, uint8_t val); static inline isc_result_t putnull(isc_buffer_t **b); @@ -699,7 +699,7 @@ dstkey_fromconfig(const cfg_obj_t *vconfig, const cfg_obj_t *key, { dns_rdataclass_t viewclass; dns_rdata_dnskey_t keystruct; - isc_uint32_t flags, proto, alg; + uint32_t flags, proto, alg; const char *keystr, *keynamestr; unsigned char keydata[4096]; isc_buffer_t keydatabuf; @@ -756,9 +756,9 @@ dstkey_fromconfig(const cfg_obj_t *vconfig, const cfg_obj_t *key, CHECKM(ISC_R_RANGE, "key protocol"); if (alg > 0xff) CHECKM(ISC_R_RANGE, "key algorithm"); - keystruct.flags = (isc_uint16_t)flags; - keystruct.protocol = (isc_uint8_t)proto; - keystruct.algorithm = (isc_uint8_t)alg; + keystruct.flags = (uint16_t)flags; + keystruct.protocol = (uint8_t)proto; + keystruct.algorithm = (uint8_t)alg; isc_buffer_init(&keydatabuf, keydata, sizeof(keydata)); isc_buffer_init(&rrdatabuf, rrdata, sizeof(rrdata)); @@ -1357,45 +1357,45 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) { obj = NULL; (void)cfg_map_get(cpeer, "edns-udp-size", &obj); if (obj != NULL) { - isc_uint32_t udpsize = cfg_obj_asuint32(obj); + uint32_t udpsize = cfg_obj_asuint32(obj); if (udpsize < 512U) udpsize = 512U; if (udpsize > 4096U) udpsize = 4096U; - CHECK(dns_peer_setudpsize(peer, (isc_uint16_t)udpsize)); + CHECK(dns_peer_setudpsize(peer, (uint16_t)udpsize)); } obj = NULL; (void)cfg_map_get(cpeer, "edns-version", &obj); if (obj != NULL) { - isc_uint32_t ednsversion = cfg_obj_asuint32(obj); + uint32_t ednsversion = cfg_obj_asuint32(obj); if (ednsversion > 255U) ednsversion = 255U; - CHECK(dns_peer_setednsversion(peer, (isc_uint8_t)ednsversion)); + CHECK(dns_peer_setednsversion(peer, (uint8_t)ednsversion)); } obj = NULL; (void)cfg_map_get(cpeer, "max-udp-size", &obj); if (obj != NULL) { - isc_uint32_t udpsize = cfg_obj_asuint32(obj); + uint32_t udpsize = cfg_obj_asuint32(obj); if (udpsize < 512U) udpsize = 512U; if (udpsize > 4096U) udpsize = 4096U; - CHECK(dns_peer_setmaxudp(peer, (isc_uint16_t)udpsize)); + CHECK(dns_peer_setmaxudp(peer, (uint16_t)udpsize)); } obj = NULL; (void)cfg_map_get(cpeer, "padding", &obj); if (obj != NULL) { - isc_uint32_t padding = cfg_obj_asuint32(obj); + uint32_t padding = cfg_obj_asuint32(obj); if (padding > 512U) { cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING, "server padding value cannot " "exceed 512: lowering"); padding = 512U; } - CHECK(dns_peer_setpadding(peer, (isc_uint16_t)padding)); + CHECK(dns_peer_setpadding(peer, (uint16_t)padding)); } obj = NULL; @@ -1552,7 +1552,7 @@ disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) { result = dns_secalg_fromtext(&alg, &r); if (result != ISC_R_SUCCESS) { - isc_uint8_t ui; + uint8_t ui; result = isc_parse_uint8(&ui, r.base, 10); alg = ui; } @@ -1726,8 +1726,8 @@ static isc_boolean_t cache_sharable(dns_view_t *originview, dns_view_t *view, isc_boolean_t new_zero_no_soattl, unsigned int new_cleaning_interval, - isc_uint64_t new_max_cache_size, - isc_uint32_t new_stale_ttl) + uint64_t new_max_cache_size, + uint32_t new_stale_ttl) { /* * If the cache cannot even reused for the same view, it cannot be @@ -2102,7 +2102,7 @@ static isc_result_t configure_rpz_zone(dns_view_t *view, const cfg_listelt_t *element, isc_boolean_t recursive_only_default, dns_ttl_t ttl_default, - isc_uint32_t minupdateinterval_default, + uint32_t minupdateinterval_default, const dns_rpz_zone_t *old, isc_boolean_t *old_rpz_okp) { @@ -2261,7 +2261,7 @@ configure_rpz(dns_view_t *view, const cfg_obj_t **maps, isc_boolean_t nsip_enabled, nsdname_enabled; dns_rpz_zbits_t nsip_on, nsdname_on; dns_ttl_t ttl_default; - isc_uint32_t minupdateinterval_default; + uint32_t minupdateinterval_default; dns_rpz_zones_t *zones; const dns_rpz_zones_t *old; dns_view_t *pview; @@ -3435,8 +3435,8 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) { if (named_g_server->dtenv == NULL && dttypes != 0) { dns_dtmode_t dmode; - isc_uint64_t max_size = 0; - isc_uint32_t rolls = 0; + uint64_t max_size = 0; + uint32_t rolls = 0; isc_log_rollsuffix_t suffix = isc_log_rollsuffix_increment; obj = NULL; @@ -3658,10 +3658,10 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, isc_result_t result; unsigned int cleaning_interval; size_t max_cache_size; - isc_uint32_t max_cache_size_percent = 0; + uint32_t max_cache_size_percent = 0; size_t max_adb_size; - isc_uint32_t lame_ttl, fail_ttl; - isc_uint32_t max_stale_ttl; + uint32_t lame_ttl, fail_ttl; + uint32_t max_stale_ttl; dns_tsig_keyring_t *ring = NULL; dns_view_t *pview = NULL; /* Production view */ isc_mem_t *cmctx = NULL, *hmctx = NULL; @@ -3673,11 +3673,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, const char *str; const char *cachename = NULL; dns_order_t *order = NULL; - isc_uint32_t udpsize; - isc_uint32_t maxbits; + uint32_t udpsize; + uint32_t maxbits; unsigned int resopts = 0; dns_zone_t *zone = NULL; - isc_uint32_t max_clients_per_query; + uint32_t max_clients_per_query; isc_boolean_t empty_zones_enable; const cfg_obj_t *disablelist = NULL; isc_stats_t *resstats = NULL; @@ -3901,7 +3901,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, } if (max_cache_size == SIZE_AS_PERCENT) { - isc_uint64_t totalphys = isc_meminfo_totalphys(); + uint64_t totalphys = isc_meminfo_totalphys(); max_cache_size = (size_t) (totalphys * max_cache_size_percent/100); @@ -3918,7 +3918,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, "- setting to %" PRIu64 "MB " "(out of %" PRIu64 "MB)", max_cache_size_percent, - (isc_uint64_t)(max_cache_size / (1024*1024)), + (uint64_t)(max_cache_size / (1024*1024)), totalphys / (1024*1024)); } } @@ -4318,7 +4318,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, * Set up ADB quotas */ { - isc_uint32_t fps, freq; + uint32_t fps, freq; double low, high, discount; obj = NULL; @@ -4395,7 +4395,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, udpsize = 512; if (udpsize > 4096) udpsize = 4096; - dns_resolver_setudpsize(view->resolver, (isc_uint16_t)udpsize); + dns_resolver_setudpsize(view->resolver, (uint16_t)udpsize); /* * Set the maximum UDP response size. @@ -4912,7 +4912,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, if (result == ISC_R_SUCCESS) { const cfg_obj_t *padobj = cfg_tuple_get(obj, "block-size"); const cfg_obj_t *aclobj = cfg_tuple_get(obj, "acl"); - isc_uint32_t padding = cfg_obj_asuint32(padobj); + uint32_t padding = cfg_obj_asuint32(padobj); if (padding > 512U) { cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING, @@ -4920,7 +4920,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, "exceed 512: lowering"); padding = 512U; } - view->padding = (isc_uint16_t)padding; + view->padding = (uint16_t)padding; CHECK(cfg_acl_fromconfig(aclobj, config, named_g_lctx, actx, named_g_mctx, 0, &view->pad_acl)); @@ -5429,8 +5429,8 @@ configure_alternates(const cfg_obj_t *config, dns_view_t *view, if (alternates != NULL) { portobj = cfg_tuple_get(alternates, "port"); if (cfg_obj_isuint32(portobj)) { - isc_uint32_t val = cfg_obj_asuint32(portobj); - if (val > ISC_UINT16_MAX) { + uint32_t val = cfg_obj_asuint32(portobj); + if (val > UINT16_MAX) { cfg_obj_log(portobj, named_g_lctx, ISC_LOG_ERROR, "port '%u' out of range", val); @@ -5467,8 +5467,8 @@ configure_alternates(const cfg_obj_t *config, dns_view_t *view, portobj = cfg_tuple_get(alternate, "port"); if (cfg_obj_isuint32(portobj)) { - isc_uint32_t val = cfg_obj_asuint32(portobj); - if (val > ISC_UINT16_MAX) { + uint32_t val = cfg_obj_asuint32(portobj); + if (val > UINT16_MAX) { cfg_obj_log(portobj, named_g_lctx, ISC_LOG_ERROR, "port '%u' out of range", @@ -5518,8 +5518,8 @@ configure_forward(const cfg_obj_t *config, dns_view_t *view, if (forwarders != NULL) { portobj = cfg_tuple_get(forwarders, "port"); if (cfg_obj_isuint32(portobj)) { - isc_uint32_t val = cfg_obj_asuint32(portobj); - if (val > ISC_UINT16_MAX) { + uint32_t val = cfg_obj_asuint32(portobj); + if (val > UINT16_MAX) { cfg_obj_log(portobj, named_g_lctx, ISC_LOG_ERROR, "port '%u' out of range", val); @@ -6459,8 +6459,8 @@ typedef struct { static int cid(const void *a, const void *b) { - const isc_uint16_t ida = *(const isc_uint16_t *)a; - const isc_uint16_t idb = *(const isc_uint16_t *)b; + const uint16_t ida = *(const uint16_t *)a; + const uint16_t idb = *(const uint16_t *)b; if (ida < idb) return (-1); else if (ida > idb) @@ -6518,7 +6518,7 @@ get_tat_qname(dns_name_t *dst, const dns_name_t **origin, dns_keynode_t *firstnode = keynode; dns_keynode_t *nextnode; unsigned int i, n = 0; - isc_uint16_t ids[12]; + uint16_t ids[12]; isc_textregion_t r; char label[64]; int m; @@ -6902,7 +6902,7 @@ static isc_result_t generate_session_key(const char *filename, const char *keynamestr, const dns_name_t *keyname, const char *algstr, const dns_name_t *algname, unsigned int algtype, - isc_uint16_t bits, isc_mem_t *mctx, + uint16_t bits, isc_mem_t *mctx, dns_tsigkey_t **tsigkeyp) { isc_result_t result = ISC_R_SUCCESS; @@ -6999,7 +6999,7 @@ configure_session_key(const cfg_obj_t **maps, named_server_t *server, dns_name_t *keyname; const dns_name_t *algname; isc_buffer_t buffer; - isc_uint16_t bits; + uint16_t bits; const cfg_obj_t *obj; isc_boolean_t need_deleteold = ISC_FALSE; isc_boolean_t need_createnew = ISC_FALSE; @@ -7194,7 +7194,7 @@ setup_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, const char *dir = NULL; const cfg_obj_t *obj = NULL; int i = 0; - isc_uint64_t mapsize = 0ULL; + uint64_t mapsize = 0ULL; REQUIRE(config != NULL); @@ -7832,17 +7832,17 @@ load_configuration(const char *filename, named_server_t *server, isc_portset_t *v6portset = NULL; isc_resourcevalue_t nfiles; isc_result_t result, tresult; - isc_uint32_t heartbeat_interval; - isc_uint32_t interface_interval; - isc_uint32_t reserved; - isc_uint32_t udpsize; - isc_uint32_t transfer_message_size; + uint32_t heartbeat_interval; + uint32_t interface_interval; + uint32_t reserved; + uint32_t udpsize; + uint32_t transfer_message_size; named_cache_t *nsc; named_cachelist_t cachelist, tmpcachelist; ns_altsecret_t *altsecret; ns_altsecretlist_t altsecrets, tmpaltsecrets; unsigned int maxsocks; - isc_uint32_t softquota = 0; + uint32_t softquota = 0; unsigned int initial, idle, keepalive, advertised; dns_aclenv_t *env = ns_interfacemgr_getaclenv(named_g_server->interfacemgr); @@ -8220,7 +8220,7 @@ load_configuration(const char *filename, named_server_t *server, if (udpsize > 4096) { udpsize = 4096; } - server->sctx->udpsize = (isc_uint16_t)udpsize; + server->sctx->udpsize = (uint16_t)udpsize; /* Set the transfer message size for TCP */ obj = NULL; @@ -8233,7 +8233,7 @@ load_configuration(const char *filename, named_server_t *server, transfer_message_size = 65535; } server->sctx->transfer_tcp_message_size = - (isc_uint16_t) transfer_message_size; + (uint16_t) transfer_message_size; /* * Configure the zone manager. @@ -10232,7 +10232,7 @@ named_server_togglequerylog(named_server_t *server, isc_lex_t *lex) { static isc_result_t ns_listenlist_fromconfig(const cfg_obj_t *listenlist, const cfg_obj_t *config, cfg_aclconfctx_t *actx, isc_mem_t *mctx, - isc_uint16_t family, ns_listenlist_t **target) + uint16_t family, ns_listenlist_t **target) { isc_result_t result; const cfg_listelt_t *element; @@ -10271,7 +10271,7 @@ ns_listenlist_fromconfig(const cfg_obj_t *listenlist, const cfg_obj_t *config, static isc_result_t ns_listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, cfg_aclconfctx_t *actx, isc_mem_t *mctx, - isc_uint16_t family, ns_listenelt_t **target) + uint16_t family, ns_listenelt_t **target) { isc_result_t result; const cfg_obj_t *portobj, *dscpobj; @@ -10290,7 +10290,7 @@ ns_listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, return (result); } } else { - if (cfg_obj_asuint32(portobj) >= ISC_UINT16_MAX) { + if (cfg_obj_asuint32(portobj) >= UINT16_MAX) { cfg_obj_log(portobj, named_g_lctx, ISC_LOG_ERROR, "port value '%u' is out of range", cfg_obj_asuint32(portobj)); @@ -11531,7 +11531,7 @@ named_server_rekey(named_server_t *server, isc_lex_t *lex, isc_result_t result; dns_zone_t *zone = NULL; dns_zonetype_t type; - isc_uint16_t keyopts; + uint16_t keyopts; isc_boolean_t fullsign = ISC_FALSE; char *ptr; @@ -13658,7 +13658,7 @@ named_server_signing(named_server_t *server, isc_lex_t *lex, isc_boolean_t list = ISC_FALSE, clear = ISC_FALSE; isc_boolean_t chain = ISC_FALSE; isc_boolean_t setserial = ISC_FALSE; - isc_uint32_t serial = 0; + uint32_t serial = 0; char keystr[DNS_SECALG_FORMATSIZE + 7]; /* <5-digit keyid>/ */ unsigned short hash = 0, flags = 0, iter = 0, saltlen = 0; unsigned char salt[255]; @@ -13761,9 +13761,9 @@ named_server_signing(named_server_t *server, isc_lex_t *lex, (void) putstr(text, "request queued"); (void) putnull(text); } else if (chain) { - CHECK(dns_zone_setnsec3param(zone, (isc_uint8_t)hash, - (isc_uint8_t)flags, iter, - (isc_uint8_t)saltlen, salt, + CHECK(dns_zone_setnsec3param(zone, (uint8_t)hash, + (uint8_t)flags, iter, + (uint8_t)saltlen, salt, ISC_TRUE)); (void) putstr(text, "nsec3param request queued"); (void) putnull(text); @@ -13845,7 +13845,7 @@ putstr(isc_buffer_t **b, const char *str) { } static isc_result_t -putuint8(isc_buffer_t **b, isc_uint8_t val) { +putuint8(isc_buffer_t **b, uint8_t val) { isc_result_t result; result = isc_buffer_reserve(b, 1); @@ -13869,7 +13869,7 @@ named_server_zonestatus(named_server_t *server, isc_lex_t *lex, dns_zone_t *zone = NULL, *raw = NULL, *mayberaw = NULL; const char *type, *file; char zonename[DNS_NAME_FORMATSIZE]; - isc_uint32_t serial, signed_serial, nodes; + uint32_t serial, signed_serial, nodes; char serbuf[16], sserbuf[16], nodebuf[16]; char resignbuf[DNS_NAME_FORMATSIZE + DNS_RDATATYPE_FORMATSIZE + 2]; char lbuf[ISC_FORMATHTTPTIMESTAMP_SIZE]; @@ -14540,7 +14540,7 @@ mkey_dumpzone(dns_view_t *view, isc_buffer_t **text) { dns_rdataset_t *kdset = NULL; dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_keydata_t kd; - isc_uint32_t ttl; + uint32_t ttl; dns_rriterator_current(&rrit, &name, &ttl, &kdset, NULL); if (kdset == NULL || kdset->type != dns_rdatatype_keydata || diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c index 75ce76133d..c8046b4364 100644 --- a/bin/named/statschannel.c +++ b/bin/named/statschannel.c @@ -69,7 +69,7 @@ stats_dumparg { void *arg; /* type dependent argument */ int ncounters; /* for general statistics */ int *counterindices; /* for general statistics */ - isc_uint64_t *countervalues; /* for general statistics */ + uint64_t *countervalues; /* for general statistics */ isc_result_t result; } stats_dumparg_t; @@ -1050,7 +1050,7 @@ init_desc(void) { * Dump callback functions. */ static void -generalstat_dump(isc_statscounter_t counter, isc_uint64_t val, void *arg) { +generalstat_dump(isc_statscounter_t counter, uint64_t val, void *arg) { stats_dumparg_t *dumparg = arg; REQUIRE(counter < dumparg->ncounters); @@ -1060,10 +1060,10 @@ generalstat_dump(isc_statscounter_t counter, isc_uint64_t val, void *arg) { static isc_result_t dump_counters(isc_stats_t *stats, isc_statsformat_t type, void *arg, const char *category, const char **desc, int ncounters, - int *indices, isc_uint64_t *values, int options) + int *indices, uint64_t *values, int options) { int i, idx; - isc_uint64_t value; + uint64_t value; stats_dumparg_t dumparg; FILE *fp; #ifdef HAVE_LIBXML2 @@ -1181,7 +1181,7 @@ dump_counters(isc_stats_t *stats, isc_statsformat_t type, void *arg, } static void -rdtypestat_dump(dns_rdatastatstype_t type, isc_uint64_t val, void *arg) { +rdtypestat_dump(dns_rdatastatstype_t type, uint64_t val, void *arg) { char typebuf[64]; const char *typestr; stats_dumparg_t *dumparg = arg; @@ -1245,7 +1245,7 @@ rdtypestat_dump(dns_rdatastatstype_t type, isc_uint64_t val, void *arg) { } static void -rdatasetstats_dump(dns_rdatastatstype_t type, isc_uint64_t val, void *arg) { +rdatasetstats_dump(dns_rdatastatstype_t type, uint64_t val, void *arg) { stats_dumparg_t *dumparg = arg; FILE *fp; char typebuf[64]; @@ -1331,7 +1331,7 @@ rdatasetstats_dump(dns_rdatastatstype_t type, isc_uint64_t val, void *arg) { } static void -opcodestat_dump(dns_opcode_t code, isc_uint64_t val, void *arg) { +opcodestat_dump(dns_opcode_t code, uint64_t val, void *arg) { FILE *fp; isc_buffer_t b; char codebuf[64]; @@ -1388,7 +1388,7 @@ opcodestat_dump(dns_opcode_t code, isc_uint64_t val, void *arg) { } static void -rcodestat_dump(dns_rcode_t code, isc_uint64_t val, void *arg) { +rcodestat_dump(dns_rcode_t code, uint64_t val, void *arg) { FILE *fp; isc_buffer_t b; char codebuf[64]; @@ -1462,7 +1462,7 @@ zone_xmlrender(dns_zone_t *zone, void *arg) { isc_result_t result; char buf[1024 + 32]; /* sufficiently large for zone name and class */ dns_rdataclass_t rdclass; - isc_uint32_t serial; + uint32_t serial; xmlTextWriterPtr writer = arg; dns_zonestat_level_t statlevel; int xmlrc; @@ -1506,8 +1506,8 @@ zone_xmlrender(dns_zone_t *zone, void *arg) { isc_stats_t *zonestats; isc_stats_t *gluecachestats; dns_stats_t *rcvquerystats; - isc_uint64_t nsstat_values[ns_statscounter_max]; - isc_uint64_t gluecachestats_values[dns_gluecachestatscounter_max]; + uint64_t nsstat_values[ns_statscounter_max]; + uint64_t gluecachestats_values[dns_gluecachestatscounter_max]; zonestats = dns_zone_getrequeststats(zone); if (zonestats != NULL) { @@ -1580,7 +1580,7 @@ zone_xmlrender(dns_zone_t *zone, void *arg) { } static isc_result_t -generatexml(named_server_t *server, isc_uint32_t flags, +generatexml(named_server_t *server, uint32_t flags, int *buflen, xmlChar **buf) { char boottime[sizeof "yyyy-mm-ddThh:mm:ss.sssZ"]; @@ -1593,17 +1593,17 @@ generatexml(named_server_t *server, isc_uint32_t flags, dns_view_t *view; stats_dumparg_t dumparg; dns_stats_t *cacherrstats; - isc_uint64_t nsstat_values[ns_statscounter_max]; - isc_uint64_t resstat_values[dns_resstatscounter_max]; - isc_uint64_t adbstat_values[dns_adbstats_max]; - isc_uint64_t zonestat_values[dns_zonestatscounter_max]; - isc_uint64_t sockstat_values[isc_sockstatscounter_max]; - isc_uint64_t udpinsizestat_values[dns_sizecounter_in_max]; - isc_uint64_t udpoutsizestat_values[dns_sizecounter_out_max]; - isc_uint64_t tcpinsizestat_values[dns_sizecounter_in_max]; - isc_uint64_t tcpoutsizestat_values[dns_sizecounter_out_max]; + uint64_t nsstat_values[ns_statscounter_max]; + uint64_t resstat_values[dns_resstatscounter_max]; + uint64_t adbstat_values[dns_adbstats_max]; + uint64_t zonestat_values[dns_zonestatscounter_max]; + uint64_t sockstat_values[isc_sockstatscounter_max]; + uint64_t udpinsizestat_values[dns_sizecounter_in_max]; + uint64_t udpoutsizestat_values[dns_sizecounter_out_max]; + uint64_t tcpinsizestat_values[dns_sizecounter_in_max]; + uint64_t tcpoutsizestat_values[dns_sizecounter_out_max]; #ifdef HAVE_DNSTAP - isc_uint64_t dnstapstat_values[dns_dnstapcounter_max]; + uint64_t dnstapstat_values[dns_dnstapcounter_max]; #endif isc_result_t result; @@ -2055,7 +2055,7 @@ wrap_xmlfree(isc_buffer_t *buffer, void *arg) { } static isc_result_t -render_xml(isc_uint32_t flags, const char *url, isc_httpdurl_t *urlinfo, +render_xml(uint32_t flags, const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, @@ -2230,7 +2230,7 @@ wrap_jsonfree(isc_buffer_t *buffer, void *arg) { static json_object * addzone(char *name, char *classname, const char *ztype, - isc_uint32_t serial, isc_boolean_t add_serial) + uint32_t serial, isc_boolean_t add_serial) { json_object *node = json_object_new_object(); @@ -2257,7 +2257,7 @@ zone_jsonrender(dns_zone_t *zone, void *arg) { char *zone_name_only = NULL; char *class_only = NULL; dns_rdataclass_t rdclass; - isc_uint32_t serial; + uint32_t serial; json_object *zonearray = (json_object *) arg; json_object *zoneobj = NULL; dns_zonestat_level_t statlevel; @@ -2287,8 +2287,8 @@ zone_jsonrender(dns_zone_t *zone, void *arg) { isc_stats_t *zonestats; isc_stats_t *gluecachestats; dns_stats_t *rcvquerystats; - isc_uint64_t nsstat_values[ns_statscounter_max]; - isc_uint64_t gluecachestats_values[dns_gluecachestatscounter_max]; + uint64_t nsstat_values[ns_statscounter_max]; + uint64_t gluecachestats_values[dns_gluecachestatscounter_max]; zonestats = dns_zone_getrequeststats(zone); if (zonestats != NULL) { @@ -2378,7 +2378,7 @@ zone_jsonrender(dns_zone_t *zone, void *arg) { static isc_result_t generatejson(named_server_t *server, size_t *msglen, - const char **msg, json_object **rootp, isc_uint32_t flags) + const char **msg, json_object **rootp, uint32_t flags) { dns_view_t *view; isc_result_t result = ISC_R_SUCCESS; @@ -2388,17 +2388,17 @@ generatejson(named_server_t *server, size_t *msglen, json_object *tcpreq4 = NULL, *tcpresp4 = NULL; json_object *udpreq6 = NULL, *udpresp6 = NULL; json_object *tcpreq6 = NULL, *tcpresp6 = NULL; - isc_uint64_t nsstat_values[ns_statscounter_max]; - isc_uint64_t resstat_values[dns_resstatscounter_max]; - isc_uint64_t adbstat_values[dns_adbstats_max]; - isc_uint64_t zonestat_values[dns_zonestatscounter_max]; - isc_uint64_t sockstat_values[isc_sockstatscounter_max]; - isc_uint64_t udpinsizestat_values[dns_sizecounter_in_max]; - isc_uint64_t udpoutsizestat_values[dns_sizecounter_out_max]; - isc_uint64_t tcpinsizestat_values[dns_sizecounter_in_max]; - isc_uint64_t tcpoutsizestat_values[dns_sizecounter_out_max]; + uint64_t nsstat_values[ns_statscounter_max]; + uint64_t resstat_values[dns_resstatscounter_max]; + uint64_t adbstat_values[dns_adbstats_max]; + uint64_t zonestat_values[dns_zonestatscounter_max]; + uint64_t sockstat_values[isc_sockstatscounter_max]; + uint64_t udpinsizestat_values[dns_sizecounter_in_max]; + uint64_t udpoutsizestat_values[dns_sizecounter_out_max]; + uint64_t tcpinsizestat_values[dns_sizecounter_in_max]; + uint64_t tcpoutsizestat_values[dns_sizecounter_out_max]; #ifdef HAVE_DNSTAP - isc_uint64_t dnstapstat_values[dns_dnstapcounter_max]; + uint64_t dnstapstat_values[dns_dnstapcounter_max]; #endif stats_dumparg_t dumparg; char boottime[sizeof "yyyy-mm-ddThh:mm:ss.sssZ"]; @@ -2957,7 +2957,7 @@ generatejson(named_server_t *server, size_t *msglen, } static isc_result_t -render_json(isc_uint32_t flags, +render_json(uint32_t flags, const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, @@ -3568,12 +3568,12 @@ named_stats_dump(named_server_t *server, FILE *fp) { dns_view_t *view; dns_zone_t *zone, *next; stats_dumparg_t dumparg; - isc_uint64_t nsstat_values[ns_statscounter_max]; - isc_uint64_t resstat_values[dns_resstatscounter_max]; - isc_uint64_t adbstat_values[dns_adbstats_max]; - isc_uint64_t zonestat_values[dns_zonestatscounter_max]; - isc_uint64_t sockstat_values[isc_sockstatscounter_max]; - isc_uint64_t gluecachestats_values[dns_gluecachestatscounter_max]; + uint64_t nsstat_values[ns_statscounter_max]; + uint64_t resstat_values[dns_resstatscounter_max]; + uint64_t adbstat_values[dns_adbstats_max]; + uint64_t zonestat_values[dns_zonestatscounter_max]; + uint64_t sockstat_values[isc_sockstatscounter_max]; + uint64_t gluecachestats_values[dns_gluecachestatscounter_max]; RUNTIME_CHECK(isc_once_do(&once, init_desc) == ISC_R_SUCCESS); diff --git a/bin/named/tkeyconf.c b/bin/named/tkeyconf.c index 0a3a354522..6444654843 100644 --- a/bin/named/tkeyconf.c +++ b/bin/named/tkeyconf.c @@ -14,6 +14,8 @@ #include +#include + #include #include /* Required for HP/UX (and others?) */ #include @@ -50,7 +52,7 @@ named_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx, isc_result_t result; dns_tkeyctx_t *tctx = NULL; const char *s; - isc_uint32_t n; + uint32_t n; dns_fixedname_t fname; dns_name_t *name; isc_buffer_t b; diff --git a/bin/named/tsigconf.c b/bin/named/tsigconf.c index 2e0fc3a830..140c3cb6eb 100644 --- a/bin/named/tsigconf.c +++ b/bin/named/tsigconf.c @@ -14,6 +14,8 @@ #include +#include + #include #include #include @@ -43,7 +45,7 @@ add_initial_keys(const cfg_obj_t *list, dns_tsig_keyring_t *ring, int secretlen = 0; isc_result_t ret; isc_stdtime_t now; - isc_uint16_t bits; + uint16_t bits; for (element = cfg_list_first(list); element != NULL; diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c index 83383c9c3e..30c0a0a83d 100644 --- a/bin/named/unix/dlz_dlopen_driver.c +++ b/bin/named/unix/dlz_dlopen_driver.c @@ -13,8 +13,9 @@ #include #include -#include +#include #include +#include #include #include @@ -482,7 +483,7 @@ dlopen_dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, */ static isc_boolean_t dlopen_dlz_ssumatch(const char *signer, const char *name, const char *tcpaddr, - const char *type, const char *key, isc_uint32_t keydatalen, + const char *type, const char *key, uint32_t keydatalen, unsigned char *keydata, void *driverarg, void *dbdata) { dlopen_data_t *cd = (dlopen_data_t *) dbdata; diff --git a/bin/named/win32/dlz_dlopen_driver.c b/bin/named/win32/dlz_dlopen_driver.c index 1d8805b8c9..9ff1de218e 100644 --- a/bin/named/win32/dlz_dlopen_driver.c +++ b/bin/named/win32/dlz_dlopen_driver.c @@ -15,8 +15,9 @@ #include #include -#include +#include #include +#include #include #include @@ -467,7 +468,7 @@ dlopen_dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, */ static isc_boolean_t dlopen_dlz_ssumatch(const char *signer, const char *name, const char *tcpaddr, - const char *type, const char *key, isc_uint32_t keydatalen, + const char *type, const char *key, uint32_t keydatalen, unsigned char *keydata, void *driverarg, void *dbdata) { dlopen_data_t *cd = (dlopen_data_t *) dbdata; diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index 98d0c319e0..302e904cc2 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -845,7 +845,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, const char *filename = NULL; const char *dupcheck; dns_notifytype_t notifytype = dns_notifytype_yes; - isc_uint32_t count; + uint32_t count; unsigned int dbargc; char **dbargv; static char default_dbtype[] = "rbt"; @@ -855,7 +855,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, dns_dialuptype_t dialup = dns_dialuptype_no; dns_zonetype_t ztype; int i; - isc_int32_t journal_size; + int32_t journal_size; isc_boolean_t multi; isc_boolean_t alt; dns_view_t *view; @@ -1279,7 +1279,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, value); RETERR(ISC_R_RANGE); } - journal_size = (isc_uint32_t)value; + journal_size = (uint32_t)value; } if (raw != NULL) dns_zone_setjournalsize(raw, journal_size); @@ -1412,7 +1412,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, value); RETERR(ISC_R_RANGE); } - journal_size = (isc_uint32_t)value; + journal_size = (uint32_t)value; } dns_zone_setjournalsize(zone, journal_size); } diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index ad82abd6e4..08d3812ba0 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -124,7 +125,7 @@ extern int h_errno; /* Number of addresses to request from bind9_getaddresses() */ #define MAX_SERVERADDRS 4 -static isc_uint16_t dnsport = DNSDEFAULTPORT; +static uint16_t dnsport = DNSDEFAULTPORT; #ifndef RESOLV_CONF #define RESOLV_CONF "/etc/resolv.conf" @@ -187,7 +188,7 @@ static unsigned int udp_retries = 3; static dns_rdataclass_t defaultclass = dns_rdataclass_in; static dns_rdataclass_t zoneclass = dns_rdataclass_none; static dns_message_t *answer = NULL; -static isc_uint32_t default_ttl = 0; +static uint32_t default_ttl = 0; static isc_boolean_t default_ttl_set = ISC_FALSE; static isc_boolean_t checknames = ISC_TRUE; @@ -238,10 +239,10 @@ recvgss(isc_task_t *task, isc_event_t *event); static void error(const char *format, ...) ISC_FORMAT_PRINTF(1, 2); -#define STATUS_MORE (isc_uint16_t)0 -#define STATUS_SEND (isc_uint16_t)1 -#define STATUS_QUIT (isc_uint16_t)2 -#define STATUS_SYNTAX (isc_uint16_t)3 +#define STATUS_MORE (uint16_t)0 +#define STATUS_SEND (uint16_t)1 +#define STATUS_QUIT (uint16_t)2 +#define STATUS_SYNTAX (uint16_t)3 static void master_from_servers(void) { @@ -382,9 +383,9 @@ reset_system(void) { static isc_boolean_t parse_hmac(const dns_name_t **hmac, const char *hmacstr, size_t len, - isc_uint16_t *digestbitsp) + uint16_t *digestbitsp) { - isc_uint16_t digestbits = 0; + uint16_t digestbits = 0; isc_result_t result; char buf[20]; @@ -492,7 +493,7 @@ setup_keystr(void) { dns_name_t *mykeyname; char *name; const dns_name_t *hmacname = NULL; - isc_uint16_t digestbits = 0; + uint16_t digestbits = 0; mykeyname = dns_fixedname_initname(&fkeyname); @@ -1058,7 +1059,7 @@ pre_parse_args(int argc, char **argv) { static void parse_args(int argc, char **argv) { int ch; - isc_uint32_t i; + uint32_t i; isc_result_t result; isc_boolean_t force_interactive = ISC_FALSE; @@ -1212,7 +1213,7 @@ parse_args(int argc, char **argv) { } } -static isc_uint16_t +static uint16_t parse_name(char **cmdlinep, dns_message_t *msg, dns_name_t **namep) { isc_result_t result; char *word; @@ -1245,7 +1246,7 @@ parse_name(char **cmdlinep, dns_message_t *msg, dns_name_t **namep) { return (STATUS_MORE); } -static isc_uint16_t +static uint16_t parse_rdata(char **cmdlinep, dns_rdataclass_t rdataclass, dns_rdatatype_t rdatatype, dns_message_t *msg, dns_rdata_t *rdata) @@ -1301,7 +1302,7 @@ parse_rdata(char **cmdlinep, dns_rdataclass_t rdataclass, return (STATUS_MORE); } -static isc_uint16_t +static uint16_t make_prereq(char *cmdline, isc_boolean_t ispositive, isc_boolean_t isrrset) { isc_result_t result; char *word; @@ -1312,7 +1313,7 @@ make_prereq(char *cmdline, isc_boolean_t ispositive, isc_boolean_t isrrset) { dns_rdataclass_t rdataclass; dns_rdatatype_t rdatatype; dns_rdata_t *rdata = NULL; - isc_uint16_t retval; + uint16_t retval; ddebug("make_prereq()"); @@ -1406,7 +1407,7 @@ make_prereq(char *cmdline, isc_boolean_t ispositive, isc_boolean_t isrrset) { return (STATUS_SYNTAX); } -static isc_uint16_t +static uint16_t evaluate_prereq(char *cmdline) { char *word; isc_boolean_t ispositive, isrrset; @@ -1436,7 +1437,7 @@ evaluate_prereq(char *cmdline) { return (make_prereq(cmdline, ispositive, isrrset)); } -static isc_uint16_t +static uint16_t evaluate_server(char *cmdline) { char *word, *server; long port; @@ -1492,7 +1493,7 @@ evaluate_server(char *cmdline) { return (STATUS_MORE); } -static isc_uint16_t +static uint16_t evaluate_local(char *cmdline) { char *word, *local; long port; @@ -1542,7 +1543,7 @@ evaluate_local(char *cmdline) { return (STATUS_MORE); } -static isc_uint16_t +static uint16_t evaluate_key(char *cmdline) { char *namestr; char *secretstr; @@ -1554,7 +1555,7 @@ evaluate_key(char *cmdline) { unsigned char *secret = NULL; isc_buffer_t secretbuf; const dns_name_t *hmacname = NULL; - isc_uint16_t digestbits = 0; + uint16_t digestbits = 0; char *n; namestr = nsu_strsep(&cmdline, " \t\r\n"); @@ -1619,7 +1620,7 @@ evaluate_key(char *cmdline) { return (STATUS_MORE); } -static isc_uint16_t +static uint16_t evaluate_zone(char *cmdline) { char *word; isc_buffer_t b; @@ -1644,7 +1645,7 @@ evaluate_zone(char *cmdline) { return (STATUS_MORE); } -static isc_uint16_t +static uint16_t evaluate_realm(char *cmdline) { #ifdef GSSAPI char *word; @@ -1675,11 +1676,11 @@ evaluate_realm(char *cmdline) { #endif } -static isc_uint16_t +static uint16_t evaluate_ttl(char *cmdline) { char *word; isc_result_t result; - isc_uint32_t ttl; + uint32_t ttl; word = nsu_strsep(&cmdline, " \t\r\n"); if (word == NULL || *word == 0) { @@ -1708,7 +1709,7 @@ evaluate_ttl(char *cmdline) { return (STATUS_MORE); } -static isc_uint16_t +static uint16_t evaluate_class(char *cmdline) { char *word; isc_textregion_t r; @@ -1741,11 +1742,11 @@ evaluate_class(char *cmdline) { return (STATUS_MORE); } -static isc_uint16_t +static uint16_t update_addordelete(char *cmdline, isc_boolean_t isdelete) { isc_result_t result; dns_name_t *name = NULL; - isc_uint32_t ttl; + uint32_t ttl; char *word; dns_rdataclass_t rdataclass; dns_rdatatype_t rdatatype; @@ -1753,7 +1754,7 @@ update_addordelete(char *cmdline, isc_boolean_t isdelete) { dns_rdatalist_t *rdatalist = NULL; dns_rdataset_t *rdataset = NULL; isc_textregion_t region; - isc_uint16_t retval; + uint16_t retval; ddebug("update_addordelete()"); @@ -1935,7 +1936,7 @@ update_addordelete(char *cmdline, isc_boolean_t isdelete) { return (STATUS_SYNTAX); } -static isc_uint16_t +static uint16_t evaluate_update(char *cmdline) { char *word; isc_boolean_t isdelete; @@ -1959,7 +1960,7 @@ evaluate_update(char *cmdline) { return (update_addordelete(cmdline, isdelete)); } -static isc_uint16_t +static uint16_t evaluate_checknames(char *cmdline) { char *word; @@ -2054,7 +2055,7 @@ show_message(FILE *stream, dns_message_t *msg, const char *description) { isc_buffer_free(&buf); } -static isc_uint16_t +static uint16_t do_next_command(char *cmdline) { char *word; @@ -2172,9 +2173,9 @@ do_next_command(char *cmdline) { return (STATUS_SYNTAX); } -static isc_uint16_t +static uint16_t get_next_command(void) { - isc_uint16_t result = STATUS_QUIT; + uint16_t result = STATUS_QUIT; char cmdlinebuf[MAXCMD]; char *cmdline; @@ -2212,7 +2213,7 @@ get_next_command(void) { static isc_boolean_t user_interaction(void) { - isc_uint16_t result = STATUS_MORE; + uint16_t result = STATUS_MORE; ddebug("user_interaction()"); while ((result == STATUS_MORE) || (result == STATUS_SYNTAX)) { @@ -2790,7 +2791,7 @@ start_gssrequest(dns_name_t *master) { gss_ctx_id_t context; isc_buffer_t buf; isc_result_t result; - isc_uint32_t val = 0; + uint32_t val = 0; dns_message_t *rmsg = NULL; dns_request_t *request = NULL; dns_name_t *servname; diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c index 4fa17a641d..1d9c692604 100644 --- a/bin/rndc/rndc.c +++ b/bin/rndc/rndc.c @@ -13,6 +13,7 @@ #include +#include #include #include @@ -68,7 +69,7 @@ static unsigned int remoteport = 0; static isc_socketmgr_t *socketmgr = NULL; static isc_buffer_t *databuf; static isccc_ccmsg_t ccmsg; -static isc_uint32_t algorithm; +static uint32_t algorithm; static isccc_region_t secret; static isc_boolean_t failed = ISC_FALSE; static isc_boolean_t c_flag = ISC_FALSE; @@ -78,7 +79,7 @@ static char *command; static char *args; static char program[256]; static isc_socket_t *sock = NULL; -static isc_uint32_t serial; +static uint32_t serial; static isc_boolean_t quiet = ISC_FALSE; static isc_boolean_t showresult = ISC_FALSE; @@ -357,7 +358,7 @@ rndc_recvnonce(isc_task_t *task, isc_event_t *event) { isccc_sexpr_t *_ctrl; isccc_region_t source; isc_result_t result; - isc_uint32_t nonce; + uint32_t nonce; isccc_sexpr_t *request = NULL; isccc_time_t now; isc_region_t r; @@ -730,7 +731,7 @@ parse_config(isc_mem_t *mctx, isc_log_t *log, const char *keyname, obj = cfg_tuple_get(address, "port"); if (cfg_obj_isuint32(obj)) { myport = cfg_obj_asuint32(obj); - if (myport > ISC_UINT16_MAX || + if (myport > UINT16_MAX || myport == 0) fatal("port %u out of range", myport); diff --git a/bin/tests/optional/db_test.c b/bin/tests/optional/db_test.c index abc4847889..9370dc45ac 100644 --- a/bin/tests/optional/db_test.c +++ b/bin/tests/optional/db_test.c @@ -14,6 +14,7 @@ #include +#include #include #include @@ -909,7 +910,7 @@ main(int argc, char *argv[]) { } if (time_lookups) { - isc_uint64_t usec; + uint64_t usec; TIME_NOW(&finish); diff --git a/bin/tests/optional/lfsr_test.c b/bin/tests/optional/lfsr_test.c index af55a31abe..28303e0cfd 100644 --- a/bin/tests/optional/lfsr_test.c +++ b/bin/tests/optional/lfsr_test.c @@ -13,18 +13,19 @@ #include #include +#include #include #include #include -isc_uint32_t state[1024 * 64]; +uint32_t state[1024 * 64]; int main(int argc, char **argv) { isc_lfsr_t lfsr1, lfsr2; int i; - isc_uint32_t temp; + uint32_t temp; UNUSED(argc); UNUSED(argv); diff --git a/bin/tests/optional/serial_test.c b/bin/tests/optional/serial_test.c index 2c8715722c..3ecb147c8b 100644 --- a/bin/tests/optional/serial_test.c +++ b/bin/tests/optional/serial_test.c @@ -12,6 +12,7 @@ #include #include +#include #include #include @@ -19,7 +20,7 @@ int main() { - isc_uint32_t a, b; + uint32_t a, b; char buf[1024]; char *s, *e; diff --git a/bin/tests/pkcs11/benchmarks/create.c b/bin/tests/pkcs11/benchmarks/create.c index a46182aa9e..d6e408536a 100644 --- a/bin/tests/pkcs11/benchmarks/create.c +++ b/bin/tests/pkcs11/benchmarks/create.c @@ -41,6 +41,7 @@ #include #include +#include #include #include #include diff --git a/bin/tests/pkcs11/benchmarks/find.c b/bin/tests/pkcs11/benchmarks/find.c index 69497678af..e0396ba242 100644 --- a/bin/tests/pkcs11/benchmarks/find.c +++ b/bin/tests/pkcs11/benchmarks/find.c @@ -40,6 +40,7 @@ #include #include +#include #include #include #include diff --git a/bin/tests/pkcs11/benchmarks/genrsa.c b/bin/tests/pkcs11/benchmarks/genrsa.c index 988a3fe0fb..63da783f27 100644 --- a/bin/tests/pkcs11/benchmarks/genrsa.c +++ b/bin/tests/pkcs11/benchmarks/genrsa.c @@ -41,6 +41,7 @@ #include #include +#include #include #include #include diff --git a/bin/tests/pkcs11/benchmarks/login.c b/bin/tests/pkcs11/benchmarks/login.c index 3a20262d0a..13085e6975 100644 --- a/bin/tests/pkcs11/benchmarks/login.c +++ b/bin/tests/pkcs11/benchmarks/login.c @@ -41,6 +41,7 @@ #include #include +#include #include #include #include diff --git a/bin/tests/pkcs11/benchmarks/privrsa.c b/bin/tests/pkcs11/benchmarks/privrsa.c index bd034379e0..631c17a65a 100644 --- a/bin/tests/pkcs11/benchmarks/privrsa.c +++ b/bin/tests/pkcs11/benchmarks/privrsa.c @@ -41,6 +41,7 @@ #include #include +#include #include #include #include diff --git a/bin/tests/pkcs11/benchmarks/pubrsa.c b/bin/tests/pkcs11/benchmarks/pubrsa.c index 1c497fc46f..c46fe1421e 100644 --- a/bin/tests/pkcs11/benchmarks/pubrsa.c +++ b/bin/tests/pkcs11/benchmarks/pubrsa.c @@ -41,6 +41,7 @@ #include #include +#include #include #include #include diff --git a/bin/tests/pkcs11/benchmarks/session.c b/bin/tests/pkcs11/benchmarks/session.c index fb48f4b874..a070c3f4fc 100644 --- a/bin/tests/pkcs11/benchmarks/session.c +++ b/bin/tests/pkcs11/benchmarks/session.c @@ -41,6 +41,7 @@ #include #include +#include #include #include #include diff --git a/bin/tests/pkcs11/benchmarks/sha1.c b/bin/tests/pkcs11/benchmarks/sha1.c index caed31ca59..d01773e23b 100644 --- a/bin/tests/pkcs11/benchmarks/sha1.c +++ b/bin/tests/pkcs11/benchmarks/sha1.c @@ -41,6 +41,7 @@ #include #include +#include #include #include #include diff --git a/bin/tests/pkcs11/benchmarks/sign.c b/bin/tests/pkcs11/benchmarks/sign.c index 9a294a3438..77224f6bdc 100644 --- a/bin/tests/pkcs11/benchmarks/sign.c +++ b/bin/tests/pkcs11/benchmarks/sign.c @@ -41,6 +41,7 @@ #include #include +#include #include #include #include diff --git a/bin/tests/pkcs11/benchmarks/verify.c b/bin/tests/pkcs11/benchmarks/verify.c index 93f10f4d38..47f3e9c7b8 100644 --- a/bin/tests/pkcs11/benchmarks/verify.c +++ b/bin/tests/pkcs11/benchmarks/verify.c @@ -41,6 +41,7 @@ #include #include +#include #include #include #include diff --git a/bin/tests/system/dlzexternal/driver.c b/bin/tests/system/dlzexternal/driver.c index a0730f37c7..4302d026b0 100644 --- a/bin/tests/system/dlzexternal/driver.c +++ b/bin/tests/system/dlzexternal/driver.c @@ -17,6 +17,7 @@ #include #include +#include #include #include @@ -163,7 +164,7 @@ static isc_result_t fmt_address(isc_sockaddr_t *addr, char *buffer, size_t size) { char addr_buf[100]; const char *ret; - isc_uint16_t port = 0; + uint16_t port = 0; switch (addr->type.sa.sa_family) { case AF_INET: @@ -682,7 +683,7 @@ dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *dbdata) { */ isc_boolean_t dlz_ssumatch(const char *signer, const char *name, const char *tcpaddr, - const char *type, const char *key, isc_uint32_t keydatalen, + const char *type, const char *key, uint32_t keydatalen, unsigned char *keydata, void *dbdata) { struct dlz_example_data *state = (struct dlz_example_data *)dbdata; diff --git a/bin/tests/system/dyndb/driver/db.c b/bin/tests/system/dyndb/driver/db.c index eebe621880..69bb6cb619 100644 --- a/bin/tests/system/dyndb/driver/db.c +++ b/bin/tests/system/dyndb/driver/db.c @@ -12,6 +12,8 @@ */ #include +#include + #include #include @@ -440,8 +442,8 @@ transfernode(dns_db_t *db, dns_dbnode_t **sourcep, dns_dbnode_t **targetp) { static isc_result_t getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, - dns_hash_t *hash, isc_uint8_t *flags, - isc_uint16_t *iterations, + dns_hash_t *hash, uint8_t *flags, + uint16_t *iterations, unsigned char *salt, size_t *salt_length) { sampledb_t *sampledb = (sampledb_t *) db; diff --git a/bin/tests/system/dyndb/driver/zone.c b/bin/tests/system/dyndb/driver/zone.c index a9b7505527..3acefbfff9 100644 --- a/bin/tests/system/dyndb/driver/zone.c +++ b/bin/tests/system/dyndb/driver/zone.c @@ -6,6 +6,8 @@ #include +#include + #include #include @@ -146,7 +148,7 @@ static isc_result_t load_zone(dns_zone_t *zone) { isc_result_t result; isc_boolean_t zone_dynamic; - isc_uint32_t serial; + uint32_t serial; result = dns_zone_load(zone); if (result != ISC_R_SUCCESS && result != DNS_R_UPTODATE diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c index 3f18b77e8a..0689aef8c4 100644 --- a/bin/tests/system/pipelined/pipequeries.c +++ b/bin/tests/system/pipelined/pipequeries.c @@ -11,6 +11,7 @@ #include +#include #include #include #include @@ -216,7 +217,7 @@ main(int argc, char *argv[]) { unsigned int attrs, attrmask; dns_dispatch_t *dispatchv4; dns_view_t *view; - isc_uint16_t port = PORT; + uint16_t port = PORT; int c; RUNCHECK(isc_app_start()); diff --git a/bin/tests/system/rpz/dnsrps.c b/bin/tests/system/rpz/dnsrps.c index 40f8b8a48d..fb2f0281d2 100644 --- a/bin/tests/system/rpz/dnsrps.c +++ b/bin/tests/system/rpz/dnsrps.c @@ -22,6 +22,8 @@ #include +#include + #include #include #include diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c index 473159ef93..89b13519b6 100644 --- a/bin/tests/wire_test.c +++ b/bin/tests/wire_test.c @@ -11,6 +11,7 @@ #include +#include #include #include @@ -108,7 +109,7 @@ main(int argc, char *argv[]) { isc_boolean_t tcp = ISC_FALSE; isc_boolean_t rawdata = ISC_FALSE; isc_result_t result; - isc_uint8_t c; + uint8_t c; FILE *f; int ch; @@ -186,7 +187,7 @@ main(int argc, char *argv[]) { while (fread(&c, 1, 1, f) != 0) { result = isc_buffer_reserve(&input, 1); RUNTIME_CHECK(result == ISC_R_SUCCESS); - isc_buffer_putuint8(input, (isc_uint8_t) c); + isc_buffer_putuint8(input, (uint8_t) c); } } else { char s[BUFSIZ]; @@ -220,7 +221,7 @@ main(int argc, char *argv[]) { c += fromhex(*rp++); result = isc_buffer_reserve(&input, 1); RUNTIME_CHECK(result == ISC_R_SUCCESS); - isc_buffer_putuint8(input, (isc_uint8_t) c); + isc_buffer_putuint8(input, (uint8_t) c); } } } diff --git a/bin/tools/dnstap-read.c b/bin/tools/dnstap-read.c index 8f80248e79..73933e422e 100644 --- a/bin/tools/dnstap-read.c +++ b/bin/tools/dnstap-read.c @@ -29,6 +29,7 @@ #include +#include #include #include @@ -347,7 +348,7 @@ main(int argc, char *argv[]) { for (;;) { isc_region_t input; - isc_uint8_t *data; + uint8_t *data; size_t datalen; result = dns_dt_getframe(handle, &data, &datalen); diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c index 00dba8635d..e31a22c67c 100644 --- a/bin/tools/mdig.c +++ b/bin/tools/mdig.c @@ -11,6 +11,7 @@ #include +#include #include #include #include @@ -106,7 +107,7 @@ static isc_boolean_t display_authority = ISC_TRUE; static isc_boolean_t display_additional = ISC_TRUE; static isc_boolean_t display_unknown_format = ISC_FALSE; static isc_boolean_t continue_on_error = ISC_FALSE; -static isc_uint32_t display_splitwidth = 0xffffffff; +static uint32_t display_splitwidth = 0xffffffff; static isc_sockaddr_t srcaddr; static char *server; static isc_sockaddr_t dstaddr; @@ -131,8 +132,8 @@ struct query { isc_boolean_t nsid; dns_rdatatype_t rdtype; dns_rdataclass_t rdclass; - isc_uint16_t udpsize; - isc_int16_t edns; + uint16_t udpsize; + int16_t edns; dns_ednsopt_t *ednsopts; unsigned int ednsoptscnt; unsigned int ednsflags; @@ -492,7 +493,7 @@ cleanup: * (e.g., NSID, COOKIE, client-subnet) */ static void -add_opt(dns_message_t *msg, isc_uint16_t udpsize, isc_uint16_t edns, +add_opt(dns_message_t *msg, uint16_t udpsize, uint16_t edns, unsigned int flags, dns_ednsopt_t *opts, size_t count) { dns_rdataset_t *rdataset = NULL; @@ -589,8 +590,8 @@ sendquery(struct query *query, isc_task_t *task) } if (query->ecs_addr != NULL) { - isc_uint8_t addr[16], family; - isc_uint32_t plen; + uint8_t addr[16], family; + uint32_t plen; struct sockaddr *sa; struct sockaddr_in *sin; struct sockaddr_in6 *sin6; @@ -605,7 +606,7 @@ sendquery(struct query *query, isc_task_t *task) INSIST(i < DNS_EDNSOPTIONS); opts[i].code = DNS_OPT_CLIENT_SUBNET; - opts[i].length = (isc_uint16_t) addrl + 4; + opts[i].length = (uint16_t) addrl + 4; CHECK("isc_buffer_allocate", result); isc_buffer_init(&b, ecsbuf, sizeof(ecsbuf)); if (sa->sa_family == AF_INET) { @@ -636,7 +637,7 @@ sendquery(struct query *query, isc_task_t *task) isc_buffer_putmem(&b, addr, (unsigned)addrl); - opts[i].value = (isc_uint8_t *) ecsbuf; + opts[i].value = (uint8_t *) ecsbuf; i++; } @@ -814,9 +815,9 @@ fatal(const char *format, ...) { } static isc_result_t -parse_uint_helper(isc_uint32_t *uip, const char *value, isc_uint32_t max, +parse_uint_helper(uint32_t *uip, const char *value, uint32_t max, const char *desc, int base) { - isc_uint32_t n; + uint32_t n; isc_result_t result = isc_parse_uint32(&n, value, base); if (result == ISC_R_SUCCESS && n > max) result = ISC_R_RANGE; @@ -830,13 +831,13 @@ parse_uint_helper(isc_uint32_t *uip, const char *value, isc_uint32_t max, } static isc_result_t -parse_uint(isc_uint32_t *uip, const char *value, isc_uint32_t max, +parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc) { return (parse_uint_helper(uip, value, max, desc, 10)); } static isc_result_t -parse_xint(isc_uint32_t *uip, const char *value, isc_uint32_t max, +parse_xint(uint32_t *uip, const char *value, uint32_t max, const char *desc) { return (parse_uint_helper(uip, value, max, desc, 0)); } @@ -859,7 +860,7 @@ newopts(struct query *query) { static void save_opt(struct query *query, char *code, char *value) { - isc_uint32_t num; + uint32_t num; isc_buffer_t b; isc_result_t result; @@ -904,7 +905,7 @@ parse_netprefix(isc_sockaddr_t **sap, const char *value) { isc_sockaddr_t *sa = NULL; struct in_addr in4; struct in6_addr in6; - isc_uint32_t netmask = 0xffffffff; + uint32_t netmask = 0xffffffff; char *slash = NULL; isc_boolean_t parsed = ISC_FALSE; char buf[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:XXX.XXX.XXX.XXX/128")]; @@ -1046,7 +1047,7 @@ plus_option(char *option, struct query *query, isc_boolean_t global) { isc_result_t result; char *cmd, *value, *last = NULL, *code; - isc_uint32_t num; + uint32_t num; isc_boolean_t state = ISC_TRUE; size_t n; @@ -1555,7 +1556,7 @@ dash_option(const char *option, char *next, struct query *query, struct in6_addr in6; in_port_t srcport; char *hash; - isc_uint32_t num; + uint32_t num; while (strpbrk(option, single_dash_opts) == &option[0]) { /* diff --git a/contrib/dlz/example/dlz_example.c b/contrib/dlz/example/dlz_example.c index 848189903d..7d5c701149 100644 --- a/contrib/dlz/example/dlz_example.c +++ b/contrib/dlz/example/dlz_example.c @@ -20,10 +20,10 @@ */ #include +#include #include #include #include -#include #include "../modules/include/dlz_minimal.h" diff --git a/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c b/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c index 5ac2c5da7f..39112a4703 100644 --- a/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c +++ b/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c @@ -62,7 +62,6 @@ #include #include #include -#include #include diff --git a/contrib/dlz/modules/common/dlz_dbi.c b/contrib/dlz/modules/common/dlz_dbi.c index 488baf51b6..a606c6b31d 100644 --- a/contrib/dlz/modules/common/dlz_dbi.c +++ b/contrib/dlz/modules/common/dlz_dbi.c @@ -44,7 +44,6 @@ #include #include #include -#include #include #include diff --git a/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c b/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c index df48676802..1a013f4647 100644 --- a/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c +++ b/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c @@ -49,7 +49,6 @@ #include #include #include -#include #include #include diff --git a/contrib/dlz/modules/include/dlz_minimal.h b/contrib/dlz/modules/include/dlz_minimal.h index e3d61832a5..18dc11250c 100644 --- a/contrib/dlz/modules/include/dlz_minimal.h +++ b/contrib/dlz/modules/include/dlz_minimal.h @@ -26,6 +26,7 @@ #ifndef DLZ_MINIMAL_H #define DLZ_MINIMAL_H 1 +#include #include #include #ifdef ISC_PLATFORM_HAVESYSUNH diff --git a/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c b/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c index 2425951310..11257056f3 100644 --- a/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c +++ b/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c @@ -49,7 +49,6 @@ #include #include #include -#include #include #include diff --git a/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c b/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c index 974f94b19f..a325fc5d22 100644 --- a/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c +++ b/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c @@ -35,7 +35,7 @@ /* * Copyright (C) 1999-2001, 2013, 2016 Internet Systems Consortium, Inc. ("ISC") - * + * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -49,7 +49,6 @@ #include #include #include -#include #include #include diff --git a/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c b/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c index 7bc5398750..9af50e16e9 100644 --- a/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c +++ b/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include diff --git a/contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c b/contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c index e65fa35481..2d7d0b0675 100644 --- a/contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c +++ b/contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c @@ -49,7 +49,6 @@ #include #include #include -#include #include #include diff --git a/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c b/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c index 4e7373c42a..6dd8e04ccf 100644 --- a/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c +++ b/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c @@ -46,6 +46,7 @@ * This provides the externally loadable wildcard DLZ module. */ +#include #include #include #include diff --git a/contrib/dnsperf-2.1.0.0-1/dns.c b/contrib/dnsperf-2.1.0.0-1/dns.c index d442deecec..5002e77bd2 100644 --- a/contrib/dnsperf-2.1.0.0-1/dns.c +++ b/contrib/dnsperf-2.1.0.0-1/dns.c @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -421,7 +422,7 @@ add_tsig(isc_buffer_t *packet, perf_dnstsigkey_t *tsigkey) unsigned int rdlen, totallen; unsigned char tmpdata[512]; isc_buffer_t tmp; - isc_uint32_t now; + uint32_t now; unsigned char digest[ISC_SHA256_DIGESTLENGTH]; hmac_init(tsigkey, &hmac); @@ -536,7 +537,7 @@ static isc_result_t read_update_line(perf_dnsctx_t *ctx, const isc_textregion_t *line, char *str, dns_name_t *zname, int want_ttl, int need_type, int want_rdata, int need_rdata, dns_name_t *name, - isc_uint32_t *ttlp, dns_rdatatype_t *typep, + uint32_t *ttlp, dns_rdatatype_t *typep, dns_rdata_t *rdata, isc_buffer_t *rdatabuf) { char *curr_str; @@ -647,11 +648,11 @@ build_update(perf_dnsctx_t *ctx, const isc_textregion_t *record, int prereqs = 0; dns_fixedname_t fzname, foname; dns_name_t *zname, *oname; - isc_uint32_t ttl; + uint32_t ttl; dns_rdatatype_t rdtype; dns_rdataclass_t rdclass; dns_rdata_t rdata; - isc_uint16_t rdlen; + uint16_t rdlen; isc_result_t result; /* Reset compression context */ @@ -801,7 +802,7 @@ build_update(perf_dnsctx_t *ctx, const isc_textregion_t *record, isc_result_t perf_dns_buildrequest(perf_dnsctx_t *ctx, const isc_textregion_t *record, - isc_uint16_t qid, + uint16_t qid, isc_boolean_t edns, isc_boolean_t dnssec, perf_dnstsigkey_t *tsigkey, isc_buffer_t *msg) { diff --git a/contrib/dnsperf-2.1.0.0-1/dns.h b/contrib/dnsperf-2.1.0.0-1/dns.h index 3ac98a4e3c..5dab512f38 100644 --- a/contrib/dnsperf-2.1.0.0-1/dns.h +++ b/contrib/dnsperf-2.1.0.0-1/dns.h @@ -32,6 +32,8 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include + #include #ifndef PERF_DNS_H @@ -59,7 +61,7 @@ perf_dns_destroyctx(perf_dnsctx_t **ctxp); isc_result_t perf_dns_buildrequest(perf_dnsctx_t *ctx, const isc_textregion_t *record, - isc_uint16_t qid, + uint16_t qid, isc_boolean_t edns, isc_boolean_t dnssec, perf_dnstsigkey_t *tsigkey, isc_buffer_t *msg); diff --git a/contrib/dnsperf-2.1.0.0-1/dnsperf.c b/contrib/dnsperf-2.1.0.0-1/dnsperf.c index ba84de1a51..4c8ad39dc0 100644 --- a/contrib/dnsperf-2.1.0.0-1/dnsperf.c +++ b/contrib/dnsperf-2.1.0.0-1/dnsperf.c @@ -37,7 +37,6 @@ ***/ #include - #include #include #include @@ -93,52 +92,52 @@ typedef struct { int argc; char **argv; int family; - isc_uint32_t clients; - isc_uint32_t threads; - isc_uint32_t maxruns; - isc_uint64_t timelimit; + uint32_t clients; + uint32_t threads; + uint32_t maxruns; + uint64_t timelimit; isc_sockaddr_t server_addr; isc_sockaddr_t local_addr; - isc_uint64_t timeout; - isc_uint32_t bufsize; + uint64_t timeout; + uint32_t bufsize; isc_boolean_t edns; isc_boolean_t dnssec; perf_dnstsigkey_t *tsigkey; - isc_uint32_t max_outstanding; - isc_uint32_t max_qps; - isc_uint64_t stats_interval; + uint32_t max_outstanding; + uint32_t max_qps; + uint64_t stats_interval; isc_boolean_t updates; isc_boolean_t verbose; } config_t; typedef struct { - isc_uint64_t start_time; - isc_uint64_t end_time; - isc_uint64_t stop_time; + uint64_t start_time; + uint64_t end_time; + uint64_t stop_time; struct timespec stop_time_ns; } times_t; typedef struct { - isc_uint64_t rcodecounts[16]; + uint64_t rcodecounts[16]; - isc_uint64_t num_sent; - isc_uint64_t num_interrupted; - isc_uint64_t num_timedout; - isc_uint64_t num_completed; + uint64_t num_sent; + uint64_t num_interrupted; + uint64_t num_timedout; + uint64_t num_completed; - isc_uint64_t total_request_size; - isc_uint64_t total_response_size; + uint64_t total_request_size; + uint64_t total_response_size; - isc_uint64_t latency_sum; - isc_uint64_t latency_sum_squares; - isc_uint64_t latency_min; - isc_uint64_t latency_max; + uint64_t latency_sum; + uint64_t latency_sum_squares; + uint64_t latency_min; + uint64_t latency_max; } stats_t; typedef ISC_LIST(struct query_info) query_list; typedef struct query_info { - isc_uint64_t timestamp; + uint64_t timestamp; query_list *list; char *desc; int sock; @@ -169,16 +168,16 @@ typedef struct { perf_dnsctx_t *dnsctx; isc_boolean_t done_sending; - isc_uint64_t done_send_time; + uint64_t done_send_time; const config_t *config; const times_t *times; stats_t stats; - isc_uint32_t max_outstanding; - isc_uint32_t max_qps; + uint32_t max_outstanding; + uint32_t max_qps; - isc_uint64_t last_recv; + uint64_t last_recv; } threadinfo_t; static threadinfo_t *threads; @@ -257,7 +256,7 @@ print_final_status(const config_t *config) } static double -stddev(isc_uint64_t sum_of_squares, isc_uint64_t sum, isc_uint64_t total) +stddev(uint64_t sum_of_squares, uint64_t sum, uint64_t total) { double squared; @@ -269,9 +268,9 @@ static void print_statistics(const config_t *config, const times_t *times, stats_t *stats) { const char *units; - isc_uint64_t run_time; + uint64_t run_time; isc_boolean_t first_rcode; - isc_uint64_t latency_avg; + uint64_t latency_avg; unsigned int i; units = config->updates ? "Updates" : "Queries"; @@ -543,7 +542,7 @@ query_move(threadinfo_t *tinfo, query_info *q, query_move_op op) } } -static inline isc_uint64_t +static inline uint64_t num_outstanding(const stats_t *stats) { return stats->num_sent - stats->num_completed - stats->num_timedout; @@ -567,7 +566,7 @@ do_send(void *arg) stats_t *stats; unsigned int max_packet_size; isc_buffer_t msg; - isc_uint64_t now, run_time, req_time; + uint64_t now, run_time, req_time; char input_data[MAX_INPUT_DATA]; isc_buffer_t lines; isc_region_t used; @@ -626,7 +625,7 @@ do_send(void *arg) q = ISC_LIST_HEAD(tinfo->unused_queries); query_move(tinfo, q, prepend_outstanding); - q->timestamp = ISC_UINT64_MAX; + q->timestamp = UINT64_MAX; q->sock = tinfo->socks[tinfo->current_sock++ % tinfo->nsocks]; UNLOCK(&tinfo->lock); @@ -690,7 +689,7 @@ do_send(void *arg) } static void -process_timeouts(threadinfo_t *tinfo, isc_uint64_t now) +process_timeouts(threadinfo_t *tinfo, uint64_t now) { struct query_info *q; const config_t *config; @@ -726,11 +725,11 @@ process_timeouts(threadinfo_t *tinfo, isc_uint64_t now) typedef struct { int sock; - isc_uint16_t qid; - isc_uint16_t rcode; + uint16_t qid; + uint16_t rcode; unsigned int size; - isc_uint64_t when; - isc_uint64_t sent; + uint64_t when; + uint64_t sent; isc_boolean_t unexpected; isc_boolean_t short_response; char *desc; @@ -741,12 +740,12 @@ recv_one(threadinfo_t *tinfo, int which_sock, unsigned char *packet_buffer, unsigned int packet_size, received_query_t *recvd, int *saved_errnop) { - isc_uint16_t *packet_header; + uint16_t *packet_header; int s; - isc_uint64_t now; + uint64_t now; int n; - packet_header = (isc_uint16_t *) packet_buffer; + packet_header = (uint16_t *) packet_buffer; s = tinfo->socks[which_sock]; n = recv(s, packet_buffer, packet_size, 0); @@ -800,7 +799,7 @@ do_recv(void *arg) unsigned int nrecvd; int saved_errno; unsigned char socketbits[MAX_SOCKETS / 8]; - isc_uint64_t now, latency; + uint64_t now, latency; query_info *q; unsigned int current_socket, last_socket; unsigned int i, j; @@ -858,7 +857,7 @@ do_recv(void *arg) q = &tinfo->queries[recvd[i].qid]; if (q->list != &tinfo->outstanding_queries || - q->timestamp == ISC_UINT64_MAX || + q->timestamp == UINT64_MAX || q->sock != recvd[i].sock) { recvd[i].unexpected = ISC_TRUE; @@ -940,11 +939,11 @@ do_interval_stats(void *arg) { threadinfo_t *tinfo; stats_t total; - isc_uint64_t now; - isc_uint64_t last_interval_time; - isc_uint64_t last_completed; - isc_uint64_t interval_time; - isc_uint64_t num_completed; + uint64_t now; + uint64_t last_interval_time; + uint64_t last_completed; + uint64_t interval_time; + uint64_t num_completed; double qps; tinfo = arg; @@ -982,7 +981,7 @@ cancel_queries(threadinfo_t *tinfo) break; query_move(tinfo, q, append_unused); - if (q->timestamp == ISC_UINT64_MAX) + if (q->timestamp == UINT64_MAX) continue; tinfo->stats.num_interrupted++; @@ -994,10 +993,10 @@ cancel_queries(threadinfo_t *tinfo) } } -static isc_uint32_t -per_thread(isc_uint32_t total, isc_uint32_t nthreads, unsigned int offset) +static uint32_t +per_thread(uint32_t total, uint32_t nthreads, unsigned int offset) { - isc_uint32_t value; + uint32_t value; value = total / nthreads; if (value % nthreads > offset) @@ -1128,7 +1127,7 @@ main(int argc, char **argv) if (config.timelimit > 0) times.stop_time = times.start_time + config.timelimit; else - times.stop_time = ISC_UINT64_MAX; + times.stop_time = UINT64_MAX; times.stop_time_ns.tv_sec = times.stop_time / MILLION; times.stop_time_ns.tv_nsec = (times.stop_time % MILLION) * 1000; diff --git a/contrib/dnsperf-2.1.0.0-1/opt.c b/contrib/dnsperf-2.1.0.0-1/opt.c index 7fe46bade7..cd3bd59e69 100644 --- a/contrib/dnsperf-2.1.0.0-1/opt.c +++ b/contrib/dnsperf-2.1.0.0-1/opt.c @@ -17,6 +17,7 @@ #include #include +#include #include #include @@ -45,7 +46,7 @@ typedef struct { char **stringp; isc_boolean_t *boolp; unsigned int *uintp; - isc_uint64_t *uint64p; + uint64_t *uint64p; double *doublep; in_port_t *portp; } u; @@ -115,11 +116,11 @@ perf_opt_usage(void) } } -static isc_uint32_t +static uint32_t parse_uint(const char *desc, const char *str, unsigned int min, unsigned int max) { - isc_uint32_t val; + uint32_t val; isc_result_t result; val = 0; @@ -132,7 +133,7 @@ parse_uint(const char *desc, const char *str, return val; } -static isc_uint64_t +static uint64_t parse_timeval(const char *desc, const char *str) { const char *s; diff --git a/contrib/dnsperf-2.1.0.0-1/os.c b/contrib/dnsperf-2.1.0.0-1/os.c index 99234b4c17..2c3eae7d27 100644 --- a/contrib/dnsperf-2.1.0.0-1/os.c +++ b/contrib/dnsperf-2.1.0.0-1/os.c @@ -17,6 +17,7 @@ #include #include +#include #include #include @@ -57,7 +58,7 @@ perf_os_handlesignal(int sig, void (*handler)(int)) } isc_result_t -perf_os_waituntilreadable(int fd, int pipe_fd, isc_int64_t timeout) +perf_os_waituntilreadable(int fd, int pipe_fd, int64_t timeout) { fd_set read_fds; int maxfd; @@ -91,7 +92,7 @@ perf_os_waituntilreadable(int fd, int pipe_fd, isc_int64_t timeout) isc_result_t perf_os_waituntilanyreadable(int *fds, unsigned int nfds, int pipe_fd, - isc_int64_t timeout) + int64_t timeout) { fd_set read_fds; unsigned int i; diff --git a/contrib/dnsperf-2.1.0.0-1/os.h b/contrib/dnsperf-2.1.0.0-1/os.h index 6a75f4d479..1ca0b21bff 100644 --- a/contrib/dnsperf-2.1.0.0-1/os.h +++ b/contrib/dnsperf-2.1.0.0-1/os.h @@ -18,6 +18,8 @@ #ifndef PERF_OS_H #define PERF_OS_H 1 +#include + void perf_os_blocksignal(int sig, isc_boolean_t block); @@ -25,10 +27,10 @@ void perf_os_handlesignal(int sig, void (*handler)(int)); isc_result_t -perf_os_waituntilreadable(int fd, int pipe_fd, isc_int64_t timeout); +perf_os_waituntilreadable(int fd, int pipe_fd, int64_t timeout); isc_result_t perf_os_waituntilanyreadable(int *fds, unsigned int nfds, int pipe_fd, - isc_int64_t timeout); + int64_t timeout); #endif diff --git a/contrib/dnsperf-2.1.0.0-1/resperf.c b/contrib/dnsperf-2.1.0.0-1/resperf.c index 7744d32d65..00106f48c7 100644 --- a/contrib/dnsperf-2.1.0.0-1/resperf.c +++ b/contrib/dnsperf-2.1.0.0-1/resperf.c @@ -41,7 +41,6 @@ #include #include #include -#include #include @@ -83,7 +82,7 @@ struct query_info; typedef ISC_LIST(struct query_info) query_list; typedef struct query_info { - isc_uint64_t sent_timestamp; + uint64_t sent_timestamp; /* * This link links the query into the list of outstanding * queries or the list of available query IDs. @@ -107,7 +106,7 @@ static isc_sockaddr_t local_addr; static unsigned int nsocks; static int *socks; -static isc_uint64_t query_timeout; +static uint64_t query_timeout; static isc_boolean_t edns; static isc_boolean_t dnssec; @@ -118,24 +117,24 @@ double max_qps = 100000.0; /* The time period over which we ramp up traffic */ #define DEFAULT_RAMP_TIME 60 -static isc_uint64_t ramp_time; +static uint64_t ramp_time; /* How long to send constant traffic after the initial ramp-up */ #define DEFAULT_SUSTAIN_TIME 0 -static isc_uint64_t sustain_time; +static uint64_t sustain_time; /* How long to wait for responses after sending traffic */ -static isc_uint64_t wait_time = 40 * MILLION; +static uint64_t wait_time = 40 * MILLION; /* Total duration of the traffic-sending part of the test */ -static isc_uint64_t traffic_time; +static uint64_t traffic_time; /* Total duration of the test */ -static isc_uint64_t end_time; +static uint64_t end_time; /* Interval between plot data points, in microseconds */ #define DEFAULT_BUCKET_INTERVAL 0.5 -static isc_uint64_t bucket_interval; +static uint64_t bucket_interval; /* The number of plot data points */ static int n_buckets; @@ -149,15 +148,15 @@ static double max_loss_percent = 100.0; /* The maximum number of outstanding queries */ static unsigned int max_outstanding; -static isc_uint64_t num_queries_sent; -static isc_uint64_t num_queries_outstanding; -static isc_uint64_t num_responses_received; -static isc_uint64_t num_queries_timed_out; -static isc_uint64_t rcodecounts[16]; +static uint64_t num_queries_sent; +static uint64_t num_queries_outstanding; +static uint64_t num_responses_received; +static uint64_t num_queries_timed_out; +static uint64_t rcodecounts[16]; -static isc_uint64_t time_now; -static isc_uint64_t time_of_program_start; -static isc_uint64_t time_of_end_of_run; +static uint64_t time_now; +static uint64_t time_of_program_start; +static uint64_t time_of_end_of_run; /* * The last plot data point containing actual data; this can @@ -199,7 +198,7 @@ enum phase { static enum phase phase = PHASE_RAMP; /* The time when the sustain/wait phase began */ -static isc_uint64_t sustain_phase_began, wait_phase_began; +static uint64_t sustain_phase_began, wait_phase_began; static perf_dnstsigkey_t *tsigkey; @@ -360,8 +359,8 @@ cleanup(void) /* Find the ramp_bucket for queries sent at time "when" */ static ramp_bucket * -find_bucket(isc_uint64_t when) { - isc_uint64_t sent_at = when - time_of_program_start; +find_bucket(uint64_t when) { + uint64_t sent_at = when - time_of_program_start; int i = (int) ((n_buckets * sent_at) / traffic_time); /* * Guard against array bounds violations due to roundoff @@ -384,7 +383,7 @@ print_statistics(void) { double max_throughput; double loss_at_max_throughput; isc_boolean_t first_rcode; - isc_uint64_t run_time = time_of_end_of_run - time_of_program_start; + uint64_t run_time = time_of_end_of_run - time_of_program_start; printf("\nStatistics:\n\n"); @@ -528,14 +527,14 @@ enter_wait_phase(void) { static void try_process_response(unsigned int sockindex) { unsigned char packet_buffer[MAX_EDNS_PACKET]; - isc_uint16_t *packet_header; - isc_uint16_t qid, rcode; + uint16_t *packet_header; + uint16_t qid, rcode; query_info *q; double latency; ramp_bucket *b; int n; - packet_header = (isc_uint16_t *) packet_buffer; + packet_header = (uint16_t *) packet_buffer; n = recvfrom(socks[sockindex], packet_buffer, sizeof(packet_buffer), 0, NULL, NULL); if (n < 0) { @@ -596,7 +595,7 @@ retire_old_queries(void) } static inline int -num_scheduled(isc_uint64_t time_since_start) +num_scheduled(uint64_t time_since_start) { if (phase == PHASE_RAMP) { return 0.5 * max_qps * @@ -650,7 +649,7 @@ main(int argc, char **argv) { current_sock = 0; for (;;) { int should_send; - isc_uint64_t time_since_start = time_now - + uint64_t time_since_start = time_now - time_of_program_start; switch (phase) { case PHASE_RAMP: diff --git a/contrib/dnsperf-2.1.0.0-1/util.h b/contrib/dnsperf-2.1.0.0-1/util.h index fdaa8eb5ae..4cf0794ee3 100644 --- a/contrib/dnsperf-2.1.0.0-1/util.h +++ b/contrib/dnsperf-2.1.0.0-1/util.h @@ -16,6 +16,7 @@ */ #include +#include #include #include @@ -27,7 +28,7 @@ #ifndef PERF_UTIL_H #define PERF_UTIL_H 1 -#define MILLION ((isc_uint64_t) 1000000) +#define MILLION ((uint64_t) 1000000) #define THREAD(thread, start, arg) do { \ int __n = pthread_create((thread), NULL, (start), (arg)); \ @@ -109,7 +110,7 @@ *res = ISC_TF(__n != 0); \ } while (0) -static __inline__ isc_uint64_t +static __inline__ uint64_t get_time(void) { struct timeval tv; diff --git a/contrib/perftcpdns/perftcpdns.c b/contrib/perftcpdns/perftcpdns.c index 6c6aac8772..55486e4614 100644 --- a/contrib/perftcpdns/perftcpdns.c +++ b/contrib/perftcpdns/perftcpdns.c @@ -79,7 +79,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/doc/design/compression b/doc/design/compression index 11ae1d3012..dc88424fc5 100644 --- a/doc/design/compression +++ b/doc/design/compression @@ -121,12 +121,12 @@ Functions: isc_boolean_t dns_compress_findglobal(dns_compress_t *cctx, dns_name_t *name, dns_name_t *prefix, dns_name_t *suffix, - isc_uint16_t *offset, isc_buffer_t *workspace); + uint16_t *offset, isc_buffer_t *workspace); isc_boolean_t dns_compress_findlocal(dns_compress_t *cctx, dns_name_t *name, dns_name_t *prefix, dns_name_t *suffix, - isc_uint16_t *offset, isc_buffer_t *workspace); + uint16_t *offset, isc_buffer_t *workspace); Find the best best match in the global / local RBT. Returns prefix, suffix and offset of the bestmatch. Findglobal(), findlocal() @@ -138,7 +138,7 @@ Functions: void dns_compress_add(dns_compress_t *cctx, dns_name_t *prefix, - dns_name_t *suffix, isc_uint16_t offset); + dns_name_t *suffix, uint16_t offset); Add compression pointers pointing to lebels (if any) in prefix. The offset to the first label is passed in offset. diff --git a/doc/design/dscp b/doc/design/dscp index 94856d9705..36d5cc1582 100644 --- a/doc/design/dscp +++ b/doc/design/dscp @@ -77,7 +77,7 @@ struct isc_socketevent { isc_sockaddr_t address; /*%< source address */ isc_time_t timestamp; /*%< timestamp of packet recv */ struct in6_pktinfo pktinfo; /*%< ipv6 pktinfo */ - isc_uint32_t attributes; /*%< see below */ + uint32_t attributes; /*%< see below */ isc_eventdestructor_t destroy; /*%< original destructor */ unsigned int dscp; /*%< UDP dscp value */ }; diff --git a/doc/design/zone b/doc/design/zone index 7de045ea2b..6582cd1c91 100644 --- a/doc/design/zone +++ b/doc/design/zone @@ -121,7 +121,7 @@ Types: struct dns_ixfr { unsigned int magic; /* IXFR */ - isc_uint32_t serial; + uint32_t serial; time_t expire; unsigned int offset; ISC_LINK(dns_ixfr_t) link; @@ -133,11 +133,11 @@ Types: dns_rdataclass_t class; dns_zonetypes_t type; dns_bt_t top; - isc_uint32_t version; - isc_uint32_t serial; - isc_uint32_t refresh; - isc_uint32_t retry; - isc_uint32_t serial; + uint32_t version; + uint32_t serial; + uint32_t refresh; + uint32_t retry; + uint32_t serial; char *masterfile; dns_acl_t *access; dns_acl_t *transfer; diff --git a/doc/dev/rdata.md b/doc/dev/rdata.md index 7bb9394958..96c19a50a9 100644 --- a/doc/dev/rdata.md +++ b/doc/dev/rdata.md @@ -393,27 +393,27 @@ empty otherwise `ISC_FALSE`. Make `buffer` refer to the memory in `region` and make it active. static dns_result_t - uint32_tobuffer(isc_uint32_t value, isc_buffer_t *target); + uint32_tobuffer(uint32_t value, isc_buffer_t *target); Write the 32 bit `value` in network order to `target`. Returns `DNS_R_NOSPACE` and `DNS_R_SUCCESS`. static dns_result_t -uint16_tobuffer(isc_uint32_t value, isc_buffer_t *target); +uint16_tobuffer(uint32_t value, isc_buffer_t *target); Write them 16 bit `value` in network order to `target`. Returns `ISC_R_RANGE`, `DNS_R_NOSPACE` and `DNS_R_SUCCESS`. - static isc_uint32_t + static uint32_t uint32_fromregion(isc_region_t *region); Returns the 32 bit at the start of `region` in host byte order. Requires `(region->length >= 4)`. - static isc_uint16_t + static uint16_t uint16_fromregion(isc_region_t *region); Returns the 16 bit at the start of `region` in host byte order. diff --git a/doc/dev/style.md b/doc/dev/style.md index 45c481eb90..49b725452a 100644 --- a/doc/dev/style.md +++ b/doc/dev/style.md @@ -374,10 +374,8 @@ meaningful, the variable should be unsigned. Assignments and comparisons between signed and unsigned integers should be avoided; suppressing the warnings with casts is not desireable. -Typedefs are provided to specify particular sizes of integral variables, -e.g., `isc_uint32_t` (unsigned 32-bit integer), `isc_int16_t` (signed -16-bit integer). These may be used when `unsigned long` or `short` could -be ambiguous. +C99 standard integer types must be used when `unsigned long` or +`short` could be ambiguous. #### Clear Success or Failure diff --git a/lib/bind9/check.c b/lib/bind9/check.c index eb67ec20db..9b9617cf22 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -13,8 +13,8 @@ #include -#include #include +#include #include #include @@ -203,8 +203,8 @@ check_dual_stack(const cfg_obj_t *options, isc_log_t *logctx) { obj = cfg_tuple_get(alternates, "port"); if (cfg_obj_isuint32(obj)) { - isc_uint32_t val = cfg_obj_asuint32(obj); - if (val > ISC_UINT16_MAX) { + uint32_t val = cfg_obj_asuint32(obj); + if (val > UINT16_MAX) { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "port '%u' out of range", val); if (result == ISC_R_SUCCESS) @@ -233,8 +233,8 @@ check_dual_stack(const cfg_obj_t *options, isc_log_t *logctx) { } obj = cfg_tuple_get(value, "port"); if (cfg_obj_isuint32(obj)) { - isc_uint32_t val = cfg_obj_asuint32(obj); - if (val > ISC_UINT16_MAX) { + uint32_t val = cfg_obj_asuint32(obj); + if (val > UINT16_MAX) { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "port '%u' out of range", val); if (result == ISC_R_SUCCESS) @@ -917,7 +917,7 @@ check_dscp(const cfg_obj_t *options, isc_log_t *logctx) { obj = NULL; (void)cfg_map_get(options, "dscp", &obj); if (obj != NULL) { - isc_uint32_t dscp = cfg_obj_asuint32(obj); + uint32_t dscp = cfg_obj_asuint32(obj); if (dscp >= 64) { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "'dscp' out of range (0-63)"); @@ -951,7 +951,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, const char *str; dns_name_t *name; isc_buffer_t b; - isc_uint32_t lifetime = 3600; + uint32_t lifetime = 3600; const char *ccalg = "aes"; static intervaltable intervals[] = { @@ -1011,7 +1011,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, * have reasonable values. */ for (i = 0; i < sizeof(intervals) / sizeof(intervals[0]); i++) { - isc_uint32_t val; + uint32_t val; obj = NULL; (void)cfg_map_get(options, intervals[i].name, &obj); if (obj == NULL) @@ -1023,7 +1023,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, intervals[i].name, val, intervals[i].max); result = ISC_R_RANGE; - } else if (val > (ISC_UINT32_MAX / intervals[i].scale)) { + } else if (val > (UINT32_MAX / intervals[i].scale)) { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "%s '%d' is out of range", intervals[i].name, val); @@ -1034,7 +1034,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, obj = NULL; cfg_map_get(options, "max-rsa-exponent-size", &obj); if (obj != NULL) { - isc_uint32_t val; + uint32_t val; val = cfg_obj_asuint32(obj); if (val != 0 && (val < 35 || val > 4096)) { @@ -1048,7 +1048,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, obj = NULL; cfg_map_get(options, "sig-validity-interval", &obj); if (obj != NULL) { - isc_uint32_t validity, resign = 0; + uint32_t validity, resign = 0; validity = cfg_obj_asuint32(cfg_tuple_get(obj, "validity")); resignobj = cfg_tuple_get(obj, "re-sign"); @@ -1084,7 +1084,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, obj = NULL; cfg_map_get(options, "dnskey-sig-validity", &obj); if (obj != NULL) { - isc_uint32_t keyvalidity; + uint32_t keyvalidity; keyvalidity = cfg_obj_asuint32(obj); if (keyvalidity > 3660 || keyvalidity == 0) { /* 10 years */ @@ -1381,7 +1381,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, obj = NULL; (void)cfg_map_get(options, "nta-recheck", &obj); if (obj != NULL) { - isc_uint32_t recheck = cfg_obj_asuint32(obj); + uint32_t recheck = cfg_obj_asuint32(obj); if (recheck > 604800) { /* 7 days */ cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "'nta-recheck' cannot exceed one week"); @@ -1462,7 +1462,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, #ifdef HAVE_DNSTAP for (i = 0; i < sizeof(fstrm) / sizeof(fstrm[0]); i++) { - isc_uint32_t value; + uint32_t value; obj = NULL; (void) cfg_map_get(options, fstrm[i].name, &obj); @@ -1560,7 +1560,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, obj = NULL; (void)cfg_map_get(options, "lmdb-mapsize", &obj); if (obj != NULL) { - isc_uint64_t mapsize = cfg_obj_asuint64(obj); + uint64_t mapsize = cfg_obj_asuint64(obj); if (mapsize < (1ULL << 20)) { /* 1 megabyte */ cfg_obj_log(obj, logctx, @@ -1634,16 +1634,16 @@ get_masters_def(const cfg_obj_t *cctx, const char *name, const cfg_obj_t **ret) static isc_result_t validate_masters(const cfg_obj_t *obj, const cfg_obj_t *config, - isc_uint32_t *countp, isc_log_t *logctx, isc_mem_t *mctx) + uint32_t *countp, isc_log_t *logctx, isc_mem_t *mctx) { isc_result_t result = ISC_R_SUCCESS; isc_result_t tresult; - isc_uint32_t count = 0; + uint32_t count = 0; isc_symtab_t *symtab = NULL; isc_symvalue_t symvalue; const cfg_listelt_t *element; const cfg_listelt_t **stack = NULL; - isc_uint32_t stackcount = 0, pushed = 0; + uint32_t stackcount = 0, pushed = 0; const cfg_obj_t *list; REQUIRE(countp != NULL); @@ -1698,7 +1698,7 @@ validate_masters(const cfg_obj_t *obj, const cfg_obj_t *config, /* Grow stack? */ if (stackcount == pushed) { void * newstack; - isc_uint32_t newlen = stackcount + 16; + uint32_t newlen = stackcount + 16; size_t newsize, oldsize; newsize = newlen * sizeof(*stack); @@ -2200,7 +2200,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, if (tresult != ISC_R_SUCCESS && goptions != NULL) tresult = cfg_map_get(goptions, "also-notify", &obj); if (tresult == ISC_R_SUCCESS && donotify) { - isc_uint32_t count; + uint32_t count; tresult = validate_masters(obj, config, &count, logctx, mctx); if (tresult != ISC_R_SUCCESS && result == ISC_R_SUCCESS) @@ -2219,7 +2219,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, znamestr); result = ISC_R_FAILURE; } else { - isc_uint32_t count; + uint32_t count; tresult = validate_masters(obj, config, &count, logctx, mctx); if (tresult != ISC_R_SUCCESS && result == ISC_R_SUCCESS) @@ -2309,7 +2309,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, obj = NULL; res1 = cfg_map_get(zoptions, "sig-signing-type", &obj); if (res1 == ISC_R_SUCCESS) { - isc_uint32_t type = cfg_obj_asuint32(obj); + uint32_t type = cfg_obj_asuint32(obj); if (type < 0xff00U || type > 0xffffU) cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "sig-signing-type: %u out of " @@ -2629,7 +2629,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, typedef struct keyalgorithms { const char *name; - isc_uint16_t size; + uint16_t size; } algorithmtable; isc_result_t @@ -2687,7 +2687,7 @@ bind9_check_key(const cfg_obj_t *key, isc_log_t *logctx) { return (ISC_R_NOTFOUND); } if (algorithm[len] == '-') { - isc_uint16_t digestbits; + uint16_t digestbits; result = isc_parse_uint16(&digestbits, algorithm + len + 1, 10); if (result == ISC_R_SUCCESS || result == ISC_R_RANGE) { if (result == ISC_R_RANGE || @@ -2999,7 +2999,7 @@ check_trusted_key(const cfg_obj_t *key, isc_boolean_t managed, isc_region_t r; isc_result_t result = ISC_R_SUCCESS; isc_result_t tresult; - isc_uint32_t flags, proto, alg; + uint32_t flags, proto, alg; unsigned char keydata[4096]; flags = cfg_obj_asuint32(cfg_tuple_get(key, "flags")); @@ -3767,7 +3767,7 @@ bind9_check_controls(const cfg_obj_t *config, isc_log_t *logctx, const cfg_obj_t *unixcontrols; const cfg_obj_t *keylist = NULL; const char *path; - isc_uint32_t perm, mask; + uint32_t perm, mask; dns_acl_t *acl = NULL; isc_sockaddr_t addr; int i; diff --git a/lib/bind9/getaddresses.c b/lib/bind9/getaddresses.c index 4a82885205..066634d9d8 100644 --- a/lib/bind9/getaddresses.c +++ b/lib/bind9/getaddresses.c @@ -12,6 +12,8 @@ /*! \file */ #include + +#include #include #include @@ -81,7 +83,7 @@ bind9_getaddresses(const char *hostname, in_port_t port, return (ISC_R_SUCCESS); } else if (strlen(hostname) <= 127U) { char tmpbuf[128], *d; - isc_uint32_t zone = 0; + uint32_t zone = 0; strlcpy(tmpbuf, hostname, sizeof(tmpbuf)); d = strchr(tmpbuf, '%'); diff --git a/lib/dns/acl.c b/lib/dns/acl.c index 160a23b1e5..7dbbe24dd7 100644 --- a/lib/dns/acl.c +++ b/lib/dns/acl.c @@ -13,6 +13,8 @@ #include +#include + #include #include #include @@ -187,7 +189,7 @@ dns_acl_match(const isc_netaddr_t *reqaddr, int *match, const dns_aclelement_t **matchelt) { - isc_uint16_t bitlen; + uint16_t bitlen; isc_prefix_t pfx; isc_radix_node_t *node = NULL; const isc_netaddr_t *addr = reqaddr; diff --git a/lib/dns/adb.c b/lib/dns/adb.c index e7d3e3ee7d..e72ac4f168 100644 --- a/lib/dns/adb.c +++ b/lib/dns/adb.c @@ -21,6 +21,7 @@ #include #include +#include #include #include @@ -158,8 +159,8 @@ struct dns_adb { isc_event_t grownames; isc_boolean_t grownames_sent; - isc_uint32_t quota; - isc_uint32_t atr_freq; + uint32_t quota; + uint32_t atr_freq; double atr_low; double atr_high; double atr_discount; @@ -243,7 +244,7 @@ struct dns_adbentry { unsigned int flags; unsigned int srtt; - isc_uint16_t udpsize; + uint16_t udpsize; unsigned int completed; unsigned int timeouts; unsigned char plain; @@ -251,9 +252,9 @@ struct dns_adbentry { unsigned char edns; unsigned char to4096; /* Our max. */ - isc_uint8_t mode; - isc_uint32_t quota; - isc_uint32_t active; + uint8_t mode; + uint32_t quota; + uint32_t active; double atr; /* @@ -265,7 +266,7 @@ struct dns_adbentry { unsigned char to512; /* plain DNS */ isc_sockaddr_t sockaddr; unsigned char * cookie; - isc_uint16_t cookielen; + uint16_t cookielen; isc_stdtime_t expires; isc_stdtime_t lastage; @@ -511,7 +512,7 @@ inc_stats(dns_adb_t *adb, isc_statscounter_t counter) { * Set adb-related statistics counters. */ static inline void -set_adbstat(dns_adb_t *adb, isc_uint64_t val, isc_statscounter_t counter) { +set_adbstat(dns_adb_t *adb, uint64_t val, isc_statscounter_t counter) { if (adb->view->adbstats != NULL) isc_stats_set(adb->view->adbstats, val, counter); } @@ -4155,7 +4156,7 @@ static void adjustsrtt(dns_adbaddrinfo_t *addr, unsigned int rtt, unsigned int factor, isc_stdtime_t now) { - isc_uint64_t new_srtt; + uint64_t new_srtt; if (factor == DNS_ADB_RTTADJAGE) { if (addr->entry->lastage != now) { @@ -4167,8 +4168,8 @@ adjustsrtt(dns_adbaddrinfo_t *addr, unsigned int rtt, unsigned int factor, } else new_srtt = addr->entry->srtt; } else - new_srtt = ((isc_uint64_t)addr->entry->srtt / 10 * factor) - + ((isc_uint64_t)rtt / 10 * (10 - factor)); + new_srtt = ((uint64_t)addr->entry->srtt / 10 * factor) + + ((uint64_t)rtt / 10 * (10 - factor)); addr->entry->srtt = (unsigned int) new_srtt; addr->srtt = (unsigned int) new_srtt; @@ -4523,7 +4524,7 @@ dns_adb_setcookie(dns_adb_t *adb, dns_adbaddrinfo_t *addr, if (addr->entry->cookie == NULL && cookie != NULL && len != 0U) { addr->entry->cookie = isc_mem_get(adb->mctx, len); if (addr->entry->cookie != NULL) - addr->entry->cookielen = (isc_uint16_t)len; + addr->entry->cookielen = (uint16_t)len; } if (addr->entry->cookie != NULL) @@ -4765,7 +4766,7 @@ dns_adb_setadbsize(dns_adb_t *adb, size_t size) { } void -dns_adb_setquota(dns_adb_t *adb, isc_uint32_t quota, isc_uint32_t freq, +dns_adb_setquota(dns_adb_t *adb, uint32_t quota, uint32_t freq, double low, double high, double discount) { REQUIRE(DNS_ADB_VALID(adb)); diff --git a/lib/dns/badcache.c b/lib/dns/badcache.c index 644b147fc2..f9564e7cca 100644 --- a/lib/dns/badcache.c +++ b/lib/dns/badcache.c @@ -52,7 +52,7 @@ struct dns_bcentry { dns_bcentry_t * next; dns_rdatatype_t type; isc_time_t expire; - isc_uint32_t flags; + uint32_t flags; unsigned int hashval; dns_name_t name; }; @@ -157,7 +157,7 @@ badcache_resize(dns_badcache_t *bc, isc_time_t *now, isc_boolean_t grow) { void dns_badcache_add(dns_badcache_t *bc, const dns_name_t *name, dns_rdatatype_t type, isc_boolean_t update, - isc_uint32_t flags, isc_time_t *expire) + uint32_t flags, isc_time_t *expire) { isc_result_t result; unsigned int i, hashval; @@ -226,7 +226,7 @@ dns_badcache_add(dns_badcache_t *bc, const dns_name_t *name, isc_boolean_t dns_badcache_find(dns_badcache_t *bc, const dns_name_t *name, - dns_rdatatype_t type, isc_uint32_t *flagp, + dns_rdatatype_t type, uint32_t *flagp, isc_time_t *now) { dns_bcentry_t *bad, *prev, *next; @@ -399,7 +399,7 @@ dns_badcache_print(dns_badcache_t *bc, const char *cachename, FILE *fp) { dns_bcentry_t *bad, *next, *prev; isc_time_t now; unsigned int i; - isc_uint64_t t; + uint64_t t; REQUIRE(VALID_BADCACHE(bc)); REQUIRE(cachename != NULL); diff --git a/lib/dns/cache.c b/lib/dns/cache.c index 60669ab152..635f9eb366 100644 --- a/lib/dns/cache.c +++ b/lib/dns/cache.c @@ -15,6 +15,7 @@ #include #include +#include #include #include @@ -1365,12 +1366,12 @@ cache_dumparg { void *arg; /* type dependent argument */ int ncounters; /* for general statistics */ int *counterindices; /* for general statistics */ - isc_uint64_t *countervalues; /* for general statistics */ + uint64_t *countervalues; /* for general statistics */ isc_result_t result; } cache_dumparg_t; static void -getcounter(isc_statscounter_t counter, isc_uint64_t val, void *arg) { +getcounter(isc_statscounter_t counter, uint64_t val, void *arg) { cache_dumparg_t *dumparg = arg; REQUIRE(counter < dumparg->ncounters); @@ -1379,7 +1380,7 @@ getcounter(isc_statscounter_t counter, isc_uint64_t val, void *arg) { static void getcounters(isc_stats_t *stats, isc_statsformat_t type, int ncounters, - int *indices, isc_uint64_t *values) + int *indices, uint64_t *values) { cache_dumparg_t dumparg; @@ -1396,7 +1397,7 @@ getcounters(isc_stats_t *stats, isc_statsformat_t type, int ncounters, void dns_cache_dumpstats(dns_cache_t *cache, FILE *fp) { int indices[dns_cachestatscounter_max]; - isc_uint64_t values[dns_cachestatscounter_max]; + uint64_t values[dns_cachestatscounter_max]; REQUIRE(VALID_CACHE(cache)); @@ -1424,34 +1425,34 @@ dns_cache_dumpstats(dns_cache_t *cache, FILE *fp) { fprintf(fp, "%20u %s\n", dns_db_nodecount(cache->db), "cache database nodes"); fprintf(fp, "%20" PRIu64 " %s\n", - (isc_uint64_t) dns_db_hashsize(cache->db), + (uint64_t) dns_db_hashsize(cache->db), "cache database hash buckets"); fprintf(fp, "%20" PRIu64 " %s\n", - (isc_uint64_t) isc_mem_total(cache->mctx), + (uint64_t) isc_mem_total(cache->mctx), "cache tree memory total"); fprintf(fp, "%20" PRIu64 " %s\n", - (isc_uint64_t) isc_mem_inuse(cache->mctx), + (uint64_t) isc_mem_inuse(cache->mctx), "cache tree memory in use"); fprintf(fp, "%20" PRIu64 " %s\n", - (isc_uint64_t) isc_mem_maxinuse(cache->mctx), + (uint64_t) isc_mem_maxinuse(cache->mctx), "cache tree highest memory in use"); fprintf(fp, "%20" PRIu64 " %s\n", - (isc_uint64_t) isc_mem_total(cache->hmctx), + (uint64_t) isc_mem_total(cache->hmctx), "cache heap memory total"); fprintf(fp, "%20" PRIu64 " %s\n", - (isc_uint64_t) isc_mem_inuse(cache->hmctx), + (uint64_t) isc_mem_inuse(cache->hmctx), "cache heap memory in use"); fprintf(fp, "%20" PRIu64 " %s\n", - (isc_uint64_t) isc_mem_maxinuse(cache->hmctx), + (uint64_t) isc_mem_maxinuse(cache->hmctx), "cache heap highest memory in use"); } #ifdef HAVE_LIBXML2 #define TRY0(a) do { xmlrc = (a); if (xmlrc < 0) goto error; } while(0) static int -renderstat(const char *name, isc_uint64_t value, xmlTextWriterPtr writer) { +renderstat(const char *name, uint64_t value, xmlTextWriterPtr writer) { int xmlrc; TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "counter")); @@ -1469,7 +1470,7 @@ error: int dns_cache_renderxml(dns_cache_t *cache, xmlTextWriterPtr writer) { int indices[dns_cachestatscounter_max]; - isc_uint64_t values[dns_cachestatscounter_max]; + uint64_t values[dns_cachestatscounter_max]; int xmlrc; REQUIRE(VALID_CACHE(cache)); @@ -1516,7 +1517,7 @@ isc_result_t dns_cache_renderjson(dns_cache_t *cache, json_object *cstats) { isc_result_t result = ISC_R_SUCCESS; int indices[dns_cachestatscounter_max]; - isc_uint64_t values[dns_cachestatscounter_max]; + uint64_t values[dns_cachestatscounter_max]; json_object *obj; REQUIRE(VALID_CACHE(cache)); diff --git a/lib/dns/catz.c b/lib/dns/catz.c index f1ad559939..26d081f03d 100644 --- a/lib/dns/catz.c +++ b/lib/dns/catz.c @@ -13,6 +13,8 @@ #include +#include + #include #include #include @@ -56,7 +58,7 @@ struct dns_catz_zone { dns_catz_options_t zoneoptions; isc_time_t lastupdated; isc_boolean_t updatepending; - isc_uint32_t version; + uint32_t version; dns_db_t *db; dns_dbversion_t *dbversion; @@ -426,9 +428,9 @@ dns_catz_zones_merge(dns_catz_zone_t *target, dns_catz_zone_t *newzone) { &nentry->opts); result = isc_ht_find(target->entries, key, - (isc_uint32_t)keysize, (void **) &oentry); + (uint32_t)keysize, (void **) &oentry); if (result != ISC_R_SUCCESS) { - result = isc_ht_add(toadd, key, (isc_uint32_t)keysize, + result = isc_ht_add(toadd, key, (uint32_t)keysize, nentry); if (result != ISC_R_SUCCESS) isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, @@ -442,7 +444,7 @@ dns_catz_zones_merge(dns_catz_zone_t *target, dns_catz_zone_t *newzone) { } if (dns_catz_entry_cmp(oentry, nentry) != ISC_TRUE) { - result = isc_ht_add(tomod, key, (isc_uint32_t)keysize, + result = isc_ht_add(tomod, key, (uint32_t)keysize, nentry); if (result != ISC_R_SUCCESS) isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, @@ -455,7 +457,7 @@ dns_catz_zones_merge(dns_catz_zone_t *target, dns_catz_zone_t *newzone) { } dns_catz_entry_detach(target, &oentry); result = isc_ht_delete(target->entries, key, - (isc_uint32_t)keysize); + (uint32_t)keysize); RUNTIME_CHECK(result == ISC_R_SUCCESS); } RUNTIME_CHECK(result == ISC_R_NOMORE); @@ -649,7 +651,7 @@ dns_catz_new_zone(dns_catz_zones_t *catzs, dns_catz_zone_t **zonep, dns_catz_options_init(&new_zone->zoneoptions); new_zone->active = ISC_TRUE; new_zone->db_registered = ISC_FALSE; - new_zone->version = (isc_uint32_t)(-1); + new_zone->version = (uint32_t)(-1); isc_refcount_init(&new_zone->refs, 1); *zonep = new_zone; @@ -968,7 +970,7 @@ catz_process_version(dns_catz_zone_t *zone, dns_rdataset_t *value) { dns_rdata_t rdata; dns_rdata_txt_t rdatatxt; dns_rdata_txt_string_t rdatastr; - isc_uint32_t tversion; + uint32_t tversion; char t[16]; REQUIRE(zone != NULL); @@ -1518,7 +1520,7 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry, isc_buffer_t *buffer = NULL; isc_region_t region; isc_result_t result; - isc_uint32_t i; + uint32_t i; isc_netaddr_t netaddr; char pbuf[sizeof("65535")]; /* used both for port number and DSCP */ char zname[DNS_NAME_FORMATSIZE]; @@ -1654,7 +1656,7 @@ dns_catz_dbupdate_callback(dns_db_t *db, void *fn_arg) { dns_catz_zones_t *catzs; dns_catz_zone_t *zone = NULL; isc_time_t now; - isc_uint64_t tdiff; + uint64_t tdiff; isc_result_t result = ISC_R_SUCCESS; isc_region_t r; @@ -1744,7 +1746,7 @@ dns_catz_update_from_db(dns_db_t *db, dns_catz_zones_t *catzs) { dns_rdataset_t rdataset; char bname[DNS_NAME_FORMATSIZE]; isc_buffer_t ibname; - isc_uint32_t vers; + uint32_t vers; REQUIRE(DNS_DB_VALID(db)); REQUIRE(catzs != NULL); diff --git a/lib/dns/compress.c b/lib/dns/compress.c index 0a66569ae5..e660ffaf98 100644 --- a/lib/dns/compress.c +++ b/lib/dns/compress.c @@ -15,6 +15,10 @@ #define DNS_NAME_USEINLINE 1 +#include + +#include + #include #include #include @@ -231,7 +235,7 @@ dns_compress_getedns(dns_compress_t *cctx) { */ isc_boolean_t dns_compress_findglobal(dns_compress_t *cctx, const dns_name_t *name, - dns_name_t *prefix, isc_uint16_t *offset) + dns_name_t *prefix, uint16_t *offset) { dns_name_t tname; dns_compressnode_t *node = NULL; @@ -372,7 +376,7 @@ name_length(const dns_name_t *name) { void dns_compress_add(dns_compress_t *cctx, const dns_name_t *name, - const dns_name_t *prefix, isc_uint16_t offset) + const dns_name_t *prefix, uint16_t offset) { dns_name_t tname, xname; unsigned int start; @@ -382,7 +386,7 @@ dns_compress_add(dns_compress_t *cctx, const dns_name_t *name, dns_compressnode_t *node; unsigned int length; unsigned int tlength; - isc_uint16_t toffset; + uint16_t toffset; unsigned char *tmp; isc_region_t r; @@ -430,7 +434,7 @@ dns_compress_add(dns_compress_t *cctx, const dns_name_t *name, ch = tname.ndata[1]; i = tableindex[ch]; tlength = name_length(&tname); - toffset = (isc_uint16_t)(offset + (length - tlength)); + toffset = (uint16_t)(offset + (length - tlength)); if (toffset >= 0x4000) break; /* @@ -470,7 +474,7 @@ dns_compress_add(dns_compress_t *cctx, const dns_name_t *name, } void -dns_compress_rollback(dns_compress_t *cctx, isc_uint16_t offset) { +dns_compress_rollback(dns_compress_t *cctx, uint16_t offset) { unsigned int i; dns_compressnode_t *node; diff --git a/lib/dns/db.c b/lib/dns/db.c index 11e4532c53..aa3ac92e57 100644 --- a/lib/dns/db.c +++ b/lib/dns/db.c @@ -17,6 +17,8 @@ #include +#include + #include #include #include @@ -792,7 +794,7 @@ dns_db_overmem(dns_db_t *db, isc_boolean_t overmem) { } isc_result_t -dns_db_getsoaserial(dns_db_t *db, dns_dbversion_t *ver, isc_uint32_t *serialp) +dns_db_getsoaserial(dns_db_t *db, dns_dbversion_t *ver, uint32_t *serialp) { isc_result_t result; dns_dbnode_t *node = NULL; @@ -950,8 +952,8 @@ dns_db_setcachestats(dns_db_t *db, isc_stats_t *stats) { isc_result_t dns_db_getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, - dns_hash_t *hash, isc_uint8_t *flags, - isc_uint16_t *iterations, + dns_hash_t *hash, uint8_t *flags, + uint16_t *iterations, unsigned char *salt, size_t *salt_length) { REQUIRE(DNS_DB_VALID(db)); @@ -966,8 +968,8 @@ dns_db_getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, } isc_result_t -dns_db_getsize(dns_db_t *db, dns_dbversion_t *version, isc_uint64_t *records, - isc_uint64_t *bytes) +dns_db_getsize(dns_db_t *db, dns_dbversion_t *version, uint64_t *records, + uint64_t *bytes) { REQUIRE(DNS_DB_VALID(db)); REQUIRE(dns_db_iszone(db) == ISC_TRUE); @@ -1010,7 +1012,7 @@ dns_db_resigned(dns_db_t *db, dns_rdataset_t *rdataset, * it is dealing with a database that understands response policy zones. */ void -dns_db_rpz_attach(dns_db_t *db, void *rpzs, isc_uint8_t rpz_num) { +dns_db_rpz_attach(dns_db_t *db, void *rpzs, uint8_t rpz_num) { REQUIRE(db->methods->rpz_attach != NULL); (db->methods->rpz_attach)(db, rpzs, rpz_num); } diff --git a/lib/dns/diff.c b/lib/dns/diff.c index 4c85ac3b6a..6fdc32ce74 100644 --- a/lib/dns/diff.c +++ b/lib/dns/diff.c @@ -14,6 +14,7 @@ #include +#include #include #include @@ -201,7 +202,7 @@ static isc_stdtime_t setresign(dns_rdataset_t *modified) { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_rrsig_t sig; - isc_int64_t when; + int64_t when; isc_result_t result; result = dns_rdataset_first(modified); diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c index 76a2253058..57f9e85e9b 100644 --- a/lib/dns/dispatch.c +++ b/lib/dns/dispatch.c @@ -13,6 +13,8 @@ #include +#include + #include #include #include @@ -280,7 +282,7 @@ static void udp_shrecv(isc_task_t *, isc_event_t *); static void udp_recv(isc_event_t *, dns_dispatch_t *, dispsocket_t *); static void tcp_recv(isc_task_t *, isc_event_t *); static isc_result_t startrecv(dns_dispatch_t *, dispsocket_t *); -static isc_uint32_t dns_hash(dns_qid_t *, const isc_sockaddr_t *, +static uint32_t dns_hash(dns_qid_t *, const isc_sockaddr_t *, dns_messageid_t, in_port_t); static void free_buffer(dns_dispatch_t *disp, void *buf, unsigned int len); static void *allocate_udp_buffer(dns_dispatch_t *disp); @@ -411,14 +413,14 @@ request_log(dns_dispatch_t *disp, dns_dispentry_t *resp, /* * Return a hash of the destination and message id. */ -static isc_uint32_t +static uint32_t dns_hash(dns_qid_t *qid, const isc_sockaddr_t *dest, dns_messageid_t id, in_port_t port) { - isc_uint32_t ret; + uint32_t ret; ret = isc_sockaddr_hash(dest, ISC_TRUE); - ret ^= ((isc_uint32_t)id << 16) | port; + ret ^= ((uint32_t)id << 16) | port; ret %= qid->qid_nbuckets; INSIST(ret < qid->qid_nbuckets); diff --git a/lib/dns/dnsrps.c b/lib/dns/dnsrps.c index 77701da990..da7c8a8f50 100644 --- a/lib/dns/dnsrps.c +++ b/lib/dns/dnsrps.c @@ -13,6 +13,8 @@ #include +#include + #ifdef USE_DNSRPS #include diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c index dcda343034..e71bc7d7b9 100644 --- a/lib/dns/dnssec.c +++ b/lib/dns/dnssec.c @@ -13,6 +13,7 @@ #include +#include #include #include @@ -197,7 +198,7 @@ dns_dnssec_sign(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, isc_result_t ret; isc_buffer_t *databuf = NULL; char data[256 + 8]; - isc_uint32_t flags; + uint32_t flags; unsigned int sigsize; dns_fixedname_t fnewname; dns_fixedname_t fsigner; @@ -301,7 +302,7 @@ dns_dnssec_sign(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, isc_buffer_usedregion(&envbuf, &r); for (i = 0; i < nrdatas; i++) { - isc_uint16_t len; + uint16_t len; isc_buffer_t lenbuf; isc_region_t lenr; @@ -323,7 +324,7 @@ dns_dnssec_sign(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, */ isc_buffer_init(&lenbuf, &len, sizeof(len)); INSIST(rdatas[i].length < 65536); - isc_buffer_putuint16(&lenbuf, (isc_uint16_t)rdatas[i].length); + isc_buffer_putuint16(&lenbuf, (uint16_t)rdatas[i].length); isc_buffer_usedregion(&lenbuf, &lenr); ret = dst_context_adddata(ctx, &lenr); if (ret != ISC_R_SUCCESS) @@ -378,7 +379,7 @@ dns_dnssec_verify(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, unsigned char data[300]; dst_context_t *ctx = NULL; int labels = 0; - isc_uint32_t flags; + uint32_t flags; isc_boolean_t downcase = ISC_FALSE; REQUIRE(name != NULL); @@ -405,10 +406,10 @@ dns_dnssec_verify(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, /* * Is SIG temporally valid? */ - if (isc_serial_lt((isc_uint32_t)now, sig.timesigned)) { + if (isc_serial_lt((uint32_t)now, sig.timesigned)) { inc_stat(dns_dnssecstats_fail); return (DNS_R_SIGFUTURE); - } else if (isc_serial_lt(sig.timeexpire, (isc_uint32_t)now)) { + } else if (isc_serial_lt(sig.timeexpire, (uint32_t)now)) { inc_stat(dns_dnssecstats_fail); return (DNS_R_SIGEXPIRED); } @@ -503,7 +504,7 @@ dns_dnssec_verify(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, isc_buffer_usedregion(&envbuf, &r); for (i = 0; i < nrdatas; i++) { - isc_uint16_t len; + uint16_t len; isc_buffer_t lenbuf; isc_region_t lenr; @@ -525,7 +526,7 @@ dns_dnssec_verify(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, */ isc_buffer_init(&lenbuf, &len, sizeof(len)); INSIST(rdatas[i].length < 65536); - isc_buffer_putuint16(&lenbuf, (isc_uint16_t)rdatas[i].length); + isc_buffer_putuint16(&lenbuf, (uint16_t)rdatas[i].length); isc_buffer_usedregion(&lenbuf, &lenr); /* @@ -754,7 +755,7 @@ dns_dnssec_findzonekeys(dns_db_t *db, dns_dbversion_t *ver, * by named. Try loading the unrevoked version. */ if (result == ISC_R_FILENOTFOUND) { - isc_uint32_t flags; + uint32_t flags; flags = dst_key_flags(pubkey); if ((flags & DNS_KEYFLAG_REVOKE) != 0) { dst_key_setflags(pubkey, @@ -1015,7 +1016,7 @@ dns_dnssec_verifymessage(isc_buffer_t *source, dns_message_t *msg, dst_context_t *ctx = NULL; isc_mem_t *mctx; isc_result_t result; - isc_uint16_t addcount, addcount_n; + uint16_t addcount, addcount_n; isc_boolean_t signeedsfree = ISC_FALSE; REQUIRE(source != NULL); @@ -1053,12 +1054,12 @@ dns_dnssec_verifymessage(isc_buffer_t *source, dns_message_t *msg, } isc_stdtime_get(&now); - if (isc_serial_lt((isc_uint32_t)now, sig.timesigned)) { + if (isc_serial_lt((uint32_t)now, sig.timesigned)) { result = DNS_R_SIGFUTURE; msg->sig0status = dns_tsigerror_badtime; goto failure; } - else if (isc_serial_lt(sig.timeexpire, (isc_uint32_t)now)) { + else if (isc_serial_lt(sig.timeexpire, (uint32_t)now)) { result = DNS_R_SIGEXPIRED; msg->sig0status = dns_tsigerror_badtime; goto failure; @@ -1096,7 +1097,7 @@ dns_dnssec_verifymessage(isc_buffer_t *source, dns_message_t *msg, */ memmove(&addcount, &header[DNS_MESSAGE_HEADERLEN - 2], 2); addcount_n = ntohs(addcount); - addcount = htons((isc_uint16_t)(addcount_n - 1)); + addcount = htons((uint16_t)(addcount_n - 1)); memmove(&header[DNS_MESSAGE_HEADERLEN - 2], &addcount, 2); /* @@ -1335,7 +1336,7 @@ get_hints(dns_dnsseckey_t *key, isc_stdtime_t now) { * If it hasn't already been done, we should also revoke it now. */ if (key->hint_publish && (revset && revoke <= now)) { - isc_uint32_t flags; + uint32_t flags; key->hint_sign = ISC_TRUE; flags = dst_key_flags(key->key); if ((flags & DNS_KEYFLAG_REVOKE) == 0) { @@ -1561,7 +1562,7 @@ mark_active_keys(dns_dnsseckeylist_t *keylist, dns_rdataset_t *rrsigs) { for (key = ISC_LIST_HEAD(*keylist); key != NULL; key = ISC_LIST_NEXT(key, link)) { - isc_uint16_t keyid, sigid; + uint16_t keyid, sigid; dns_secalg_t keyalg, sigalg; keyid = dst_key_id(key->key); keyalg = dst_key_alg(key->key); @@ -1646,7 +1647,7 @@ dns_dnssec_keylistfromrdataset(const dns_name_t *origin, * by named. Try loading the unrevoked version. */ if (result == ISC_R_FILENOTFOUND) { - isc_uint32_t flags; + uint32_t flags; flags = dst_key_flags(pubkey); if ((flags & DNS_KEYFLAG_REVOKE) != 0) { dst_key_setflags(pubkey, diff --git a/lib/dns/dnstap.c b/lib/dns/dnstap.c index 35b325f207..dfe1e36cc6 100644 --- a/lib/dns/dnstap.c +++ b/lib/dns/dnstap.c @@ -49,6 +49,7 @@ #error DNSTAP not configured. #endif /* HAVE_DNSTAP */ +#include #include #include @@ -297,7 +298,7 @@ dns_dt_create(isc_mem_t *mctx, dns_dtmode_t mode, const char *path, } isc_result_t -dns_dt_setupfile(dns_dtenv_t *env, isc_uint64_t max_size, int rolls, +dns_dt_setupfile(dns_dtenv_t *env, uint64_t max_size, int rolls, isc_log_rollsuffix_t suffix) { REQUIRE(VALID_DTENV(env)); @@ -710,7 +711,7 @@ cpbuf(isc_buffer_t *buf, ProtobufCBinaryData *p, protobuf_c_boolean *has) { static void setaddr(dns_dtmsg_t *dm, isc_sockaddr_t *sa, isc_boolean_t tcp, ProtobufCBinaryData *addr, protobuf_c_boolean *has_addr, - isc_uint32_t *port, protobuf_c_boolean *has_port) + uint32_t *port, protobuf_c_boolean *has_port) { int family = isc_sockaddr_pf(sa); @@ -724,7 +725,7 @@ setaddr(dns_dtmsg_t *dm, isc_sockaddr_t *sa, isc_boolean_t tcp, *port = ntohs(sa->type.sin6.sin6_port); } else { dm->m.socket_family = DNSTAP__SOCKET_FAMILY__INET; - addr->data = (isc_uint8_t *) &sa->type.sin.sin_addr.s_addr; + addr->data = (uint8_t *) &sa->type.sin.sin_addr.s_addr; addr->len = 4; *port = ntohs(sa->type.sin.sin_port); } @@ -969,7 +970,7 @@ static isc_boolean_t dnstap_file(struct fstrm_reader *r) { fstrm_res res; const struct fstrm_control *control = NULL; - const isc_uint8_t *rtype = NULL; + const uint8_t *rtype = NULL; size_t dlen = strlen(DNSTAP_CONTENT_TYPE), rlen = 0; size_t n = 0; @@ -1057,15 +1058,15 @@ dns_dt_open(const char *filename, dns_dtmode_t mode, isc_mem_t *mctx, } isc_result_t -dns_dt_getframe(dns_dthandle_t *handle, isc_uint8_t **bufp, size_t *sizep) { - const isc_uint8_t *data; +dns_dt_getframe(dns_dthandle_t *handle, uint8_t **bufp, size_t *sizep) { + const uint8_t *data; fstrm_res res; REQUIRE(handle != NULL); REQUIRE(bufp != NULL); REQUIRE(sizep != NULL); - data = (const isc_uint8_t *) *bufp; + data = (const uint8_t *) *bufp; res = fstrm_reader_read(handle->reader, &data, sizep); switch (res) { diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c index 2c6e476d6b..72883bb6d7 100644 --- a/lib/dns/dst_api.c +++ b/lib/dns/dst_api.c @@ -27,6 +27,7 @@ #include +#include #include #include @@ -645,15 +646,15 @@ dst_key_todns(const dst_key_t *key, isc_buffer_t *target) { if (isc_buffer_availablelength(target) < 4) return (ISC_R_NOSPACE); - isc_buffer_putuint16(target, (isc_uint16_t)(key->key_flags & 0xffff)); - isc_buffer_putuint8(target, (isc_uint8_t)key->key_proto); - isc_buffer_putuint8(target, (isc_uint8_t)key->key_alg); + isc_buffer_putuint16(target, (uint16_t)(key->key_flags & 0xffff)); + isc_buffer_putuint8(target, (uint8_t)key->key_proto); + isc_buffer_putuint8(target, (uint8_t)key->key_alg); if (key->key_flags & DNS_KEYFLAG_EXTENDED) { if (isc_buffer_availablelength(target) < 2) return (ISC_R_NOSPACE); isc_buffer_putuint16(target, - (isc_uint16_t)((key->key_flags >> 16) + (uint16_t)((key->key_flags >> 16) & 0xffff)); } @@ -667,8 +668,8 @@ isc_result_t dst_key_fromdns(const dns_name_t *name, dns_rdataclass_t rdclass, isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp) { - isc_uint8_t alg, proto; - isc_uint32_t flags, extflags; + uint8_t alg, proto; + uint32_t flags, extflags; dst_key_t *key = NULL; dns_keytag_t id, rid; isc_region_t r; @@ -934,7 +935,7 @@ dst_key_generate(const dns_name_t *name, unsigned int alg, } isc_result_t -dst_key_getnum(const dst_key_t *key, int type, isc_uint32_t *valuep) +dst_key_getnum(const dst_key_t *key, int type, uint32_t *valuep) { REQUIRE(VALID_KEY(key)); REQUIRE(valuep != NULL); @@ -946,7 +947,7 @@ dst_key_getnum(const dst_key_t *key, int type, isc_uint32_t *valuep) } void -dst_key_setnum(dst_key_t *key, int type, isc_uint32_t value) +dst_key_setnum(dst_key_t *key, int type, uint32_t value) { REQUIRE(VALID_KEY(key)); REQUIRE(type <= DST_MAX_NUMERIC); @@ -1256,7 +1257,7 @@ dst_key_secretsize(const dst_key_t *key, unsigned int *n) { * Set the flags on a key, then recompute the key ID */ isc_result_t -dst_key_setflags(dst_key_t *key, isc_uint32_t flags) { +dst_key_setflags(dst_key_t *key, uint32_t flags) { REQUIRE(VALID_KEY(key)); key->key_flags = flags; return (computeid(key)); @@ -1412,7 +1413,7 @@ dst_key_read_public(const char *filename, int type, unsigned int opt = ISC_LEXOPT_DNSMULTILINE; dns_rdataclass_t rdclass = dns_rdataclass_in; isc_lexspecials_t specials; - isc_uint32_t ttl = 0; + uint32_t ttl = 0; isc_result_t result; dns_rdatatype_t keytype; diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h index 351d0d5f87..95b9aecc62 100644 --- a/lib/dns/dst_internal.h +++ b/lib/dns/dst_internal.h @@ -27,9 +27,10 @@ #include +#include + #include #include -#include #include #include #include @@ -94,11 +95,11 @@ struct dst_key { unsigned int key_size; /*%< size of the key in bits */ unsigned int key_proto; /*%< protocols this key is used for */ unsigned int key_alg; /*%< algorithm of the key */ - isc_uint32_t key_flags; /*%< flags of the public key */ - isc_uint16_t key_id; /*%< identifier of the key */ - isc_uint16_t key_rid; /*%< identifier of the key when + uint32_t key_flags; /*%< flags of the public key */ + uint16_t key_id; /*%< identifier of the key */ + uint16_t key_rid; /*%< identifier of the key when revoked */ - isc_uint16_t key_bits; /*%< hmac digest bits */ + uint16_t key_bits; /*%< hmac digest bits */ dns_rdataclass_t key_class; /*%< class of the key record */ dns_ttl_t key_ttl; /*%< default/initial dnskey ttl */ isc_mem_t *mctx; /*%< memory context */ diff --git a/lib/dns/dst_parse.c b/lib/dns/dst_parse.c index 2a71ccf2ac..da535506c3 100644 --- a/lib/dns/dst_parse.c +++ b/lib/dns/dst_parse.c @@ -25,6 +25,8 @@ #include +#include + #include #include #include @@ -625,7 +627,7 @@ dst__privstruct_writefile(const dst_key_t *key, const dst_private_t *priv, char buffer[MAXFIELDSIZE * 2]; isc_fsaccess_t access; isc_stdtime_t when; - isc_uint32_t value; + uint32_t value; isc_buffer_t b; isc_region_t r; int major, minor; diff --git a/lib/dns/geoip.c b/lib/dns/geoip.c index e619b31879..3f95110c90 100644 --- a/lib/dns/geoip.c +++ b/lib/dns/geoip.c @@ -13,6 +13,8 @@ #include +#include + #include #include @@ -63,9 +65,9 @@ * family and addr6 fields are to be used IPv6 is added. */ typedef struct geoip_state { - isc_uint16_t subtype; + uint16_t subtype; unsigned int family; - isc_uint32_t ipnum; + uint32_t ipnum; geoipv6_t ipnum6; GeoIPRecord *record; GeoIPRegion *region; @@ -157,7 +159,7 @@ clean_state(geoip_state_t *state) { } static isc_result_t -set_state(unsigned int family, isc_uint32_t ipnum, const geoipv6_t *ipnum6, +set_state(unsigned int family, uint32_t ipnum, const geoipv6_t *ipnum6, dns_geoip_subtype_t subtype, GeoIPRecord *record, GeoIPRegion *region, char *name, const char *text, int id) { @@ -210,7 +212,7 @@ set_state(unsigned int family, isc_uint32_t ipnum, const geoipv6_t *ipnum6, } static geoip_state_t * -get_state_for(unsigned int family, isc_uint32_t ipnum, +get_state_for(unsigned int family, uint32_t ipnum, const geoipv6_t *ipnum6) { geoip_state_t *state; @@ -246,7 +248,7 @@ get_state_for(unsigned int family, isc_uint32_t ipnum, static const char * country_lookup(GeoIP *db, dns_geoip_subtype_t subtype, unsigned int family, - isc_uint32_t ipnum, const geoipv6_t *ipnum6) + uint32_t ipnum, const geoipv6_t *ipnum6) { geoip_state_t *prev_state = NULL; const char *text = NULL; @@ -389,7 +391,7 @@ is_city(dns_geoip_subtype_t subtype) { */ static GeoIPRecord * city_lookup(GeoIP *db, dns_geoip_subtype_t subtype, - unsigned int family, isc_uint32_t ipnum, + unsigned int family, uint32_t ipnum, const geoipv6_t *ipnum6) { GeoIPRecord *record = NULL; @@ -467,7 +469,7 @@ is_region(dns_geoip_subtype_t subtype) { * outside the Region database. */ static GeoIPRegion * -region_lookup(GeoIP *db, dns_geoip_subtype_t subtype, isc_uint32_t ipnum) { +region_lookup(GeoIP *db, dns_geoip_subtype_t subtype, uint32_t ipnum) { GeoIPRegion *region = NULL; geoip_state_t *prev_state = NULL; @@ -496,7 +498,7 @@ region_lookup(GeoIP *db, dns_geoip_subtype_t subtype, isc_uint32_t ipnum) { * or was for a search of a different subtype. */ static char * -name_lookup(GeoIP *db, dns_geoip_subtype_t subtype, isc_uint32_t ipnum) { +name_lookup(GeoIP *db, dns_geoip_subtype_t subtype, uint32_t ipnum) { char *name = NULL; geoip_state_t *prev_state = NULL; @@ -525,7 +527,7 @@ name_lookup(GeoIP *db, dns_geoip_subtype_t subtype, isc_uint32_t ipnum) { * different subtype. */ static int -netspeed_lookup(GeoIP *db, dns_geoip_subtype_t subtype, isc_uint32_t ipnum) { +netspeed_lookup(GeoIP *db, dns_geoip_subtype_t subtype, uint32_t ipnum) { geoip_state_t *prev_state = NULL; isc_boolean_t found = ISC_FALSE; int id = -1; @@ -621,7 +623,7 @@ dns_geoip_match(const isc_netaddr_t *reqaddr, GeoIPRecord *record; GeoIPRegion *region; dns_geoip_subtype_t subtype; - isc_uint32_t ipnum = 0; + uint32_t ipnum = 0; int maxlen = 0, id, family; const char *cs; char *s; diff --git a/lib/dns/gssapictx.c b/lib/dns/gssapictx.c index 1c4eb5bc66..002b3afa07 100644 --- a/lib/dns/gssapictx.c +++ b/lib/dns/gssapictx.c @@ -13,6 +13,7 @@ #include #include +#include #include #include @@ -539,7 +540,7 @@ dst_gssapi_releasecred(gss_cred_id_t *cred) { * call chain for reporting to the user. */ static void -gss_err_message(isc_mem_t *mctx, isc_uint32_t major, isc_uint32_t minor, +gss_err_message(isc_mem_t *mctx, uint32_t major, uint32_t minor, char **err_message) { char buf[1024]; @@ -840,7 +841,7 @@ dst_gssapi_deletectx(isc_mem_t *mctx, gss_ctx_id_t *gssctx) } char * -gss_error_tostring(isc_uint32_t major, isc_uint32_t minor, +gss_error_tostring(uint32_t major, uint32_t minor, char *buf, size_t buflen) { #ifdef GSSAPI gss_buffer_desc msg_minor = GSS_C_EMPTY_BUFFER, diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h index 19b5caf7c1..740f6379b3 100644 --- a/lib/dns/include/dns/adb.h +++ b/lib/dns/include/dns/adb.h @@ -66,6 +66,8 @@ *** Imports ***/ +#include + #include #include #include @@ -769,7 +771,7 @@ dns_adb_getcookie(dns_adb_t *adb, dns_adbaddrinfo_t *addr, */ void -dns_adb_setquota(dns_adb_t *adb, isc_uint32_t quota, isc_uint32_t freq, +dns_adb_setquota(dns_adb_t *adb, uint32_t quota, uint32_t freq, double low, double high, double discount); /*%< * Set the baseline ADB quota, and configure parameters for the diff --git a/lib/dns/include/dns/badcache.h b/lib/dns/include/dns/badcache.h index 29f40475ad..2fcc33a31c 100644 --- a/lib/dns/include/dns/badcache.h +++ b/lib/dns/include/dns/badcache.h @@ -41,6 +41,8 @@ *** Imports ***/ +#include + #include ISC_LANG_BEGINDECLS @@ -72,7 +74,7 @@ dns_badcache_destroy(dns_badcache_t **bcp); void dns_badcache_add(dns_badcache_t *bc, const dns_name_t *name, dns_rdatatype_t type, isc_boolean_t update, - isc_uint32_t flags, isc_time_t *expire); + uint32_t flags, isc_time_t *expire); /*% * Adds a badcache entry to the badcache 'bc' for name 'name' and * type 'type'. If an entry already exists, then it will be updated if @@ -87,7 +89,7 @@ dns_badcache_add(dns_badcache_t *bc, const dns_name_t *name, isc_boolean_t dns_badcache_find(dns_badcache_t *bc, const dns_name_t *name, - dns_rdatatype_t type, isc_uint32_t *flagp, + dns_rdatatype_t type, uint32_t *flagp, isc_time_t *now); /*% * Returns ISC_TRUE if a record is found in the badcache 'bc' matching diff --git a/lib/dns/include/dns/bit.h b/lib/dns/include/dns/bit.h index 2a6b258883..5a908036a2 100644 --- a/lib/dns/include/dns/bit.h +++ b/lib/dns/include/dns/bit.h @@ -15,10 +15,9 @@ /*! \file dns/bit.h */ -#include -#include +#include -typedef isc_uint64_t dns_bitset_t; +typedef uint64_t dns_bitset_t; #define DNS_BIT_SET(bit, bitset) \ (*(bitset) |= ((dns_bitset_t)1 << (bit))) diff --git a/lib/dns/include/dns/catz.h b/lib/dns/include/dns/catz.h index a062847cd4..ec32a4b136 100644 --- a/lib/dns/include/dns/catz.h +++ b/lib/dns/include/dns/catz.h @@ -13,6 +13,8 @@ #ifndef DNS_CATZ_H #define DNS_CATZ_H 1 +#include + #include #include #include @@ -66,7 +68,7 @@ struct dns_catz_entry_options { * of catalog zone is received before this time the update will be * postponed. This is a global option for the whole catalog zone. */ - isc_uint32_t min_update_interval; + uint32_t min_update_interval; }; void diff --git a/lib/dns/include/dns/clientinfo.h b/lib/dns/include/dns/clientinfo.h index dcf6cc78b0..30e29c8801 100644 --- a/lib/dns/include/dns/clientinfo.h +++ b/lib/dns/include/dns/clientinfo.h @@ -37,6 +37,8 @@ ***** Imports *****/ +#include + #include #include @@ -48,7 +50,7 @@ ISC_LANG_BEGINDECLS #define DNS_CLIENTINFO_VERSION 2 typedef struct dns_clientinfo { - isc_uint16_t version; + uint16_t version; void *data; void *dbversion; } dns_clientinfo_t; @@ -60,8 +62,8 @@ typedef isc_result_t (*dns_clientinfo_sourceip_t)(dns_clientinfo_t *client, #define DNS_CLIENTINFOMETHODS_AGE 0 typedef struct dns_clientinfomethods { - isc_uint16_t version; - isc_uint16_t age; + uint16_t version; + uint16_t age; dns_clientinfo_sourceip_t sourceip; } dns_clientinfomethods_t; diff --git a/lib/dns/include/dns/compress.h b/lib/dns/include/dns/compress.h index dd497f0912..4c0c2e7ac7 100644 --- a/lib/dns/include/dns/compress.h +++ b/lib/dns/include/dns/compress.h @@ -12,6 +12,8 @@ #ifndef DNS_COMPRESS_H #define DNS_COMPRESS_H 1 +#include + #include #include @@ -54,8 +56,8 @@ typedef struct dns_compressnode dns_compressnode_t; struct dns_compressnode { dns_compressnode_t *next; - isc_uint16_t offset; - isc_uint16_t count; + uint16_t offset; + uint16_t count; isc_region_t r; dns_name_t name; }; @@ -68,7 +70,7 @@ struct dns_compress { dns_compressnode_t *table[DNS_COMPRESS_TABLESIZE]; /*% Preallocated nodes for the table. */ dns_compressnode_t initialnodes[DNS_COMPRESS_INITIALNODES]; - isc_uint16_t count; /*%< Number of nodes. */ + uint16_t count; /*%< Number of nodes. */ isc_mem_t *mctx; /*%< Memory context. */ }; @@ -182,7 +184,7 @@ dns_compress_getedns(dns_compress_t *cctx); isc_boolean_t dns_compress_findglobal(dns_compress_t *cctx, const dns_name_t *name, - dns_name_t *prefix, isc_uint16_t *offset); + dns_name_t *prefix, uint16_t *offset); /*%< * Finds longest possible match of 'name' in the global compression table. * @@ -190,7 +192,7 @@ dns_compress_findglobal(dns_compress_t *cctx, const dns_name_t *name, *\li 'cctx' to be initialized. *\li 'name' to be a absolute name. *\li 'prefix' to be initialized. - *\li 'offset' to point to an isc_uint16_t. + *\li 'offset' to point to an uint16_t. * * Ensures: *\li 'prefix' and 'offset' are valid if ISC_TRUE is returned. @@ -201,7 +203,7 @@ dns_compress_findglobal(dns_compress_t *cctx, const dns_name_t *name, void dns_compress_add(dns_compress_t *cctx, const dns_name_t *name, - const dns_name_t *prefix, isc_uint16_t offset); + const dns_name_t *prefix, uint16_t offset); /*%< * Add compression pointers for 'name' to the compression table, * not replacing existing pointers. @@ -217,7 +219,7 @@ dns_compress_add(dns_compress_t *cctx, const dns_name_t *name, */ void -dns_compress_rollback(dns_compress_t *cctx, isc_uint16_t offset); +dns_compress_rollback(dns_compress_t *cctx, uint16_t offset); /*%< * Remove any compression pointers from global table >= offset. diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h index 121c62a703..e754c4d135 100644 --- a/lib/dns/include/dns/db.h +++ b/lib/dns/include/dns/db.h @@ -46,6 +46,8 @@ ***** Imports *****/ +#include + #include #include #include @@ -150,8 +152,8 @@ typedef struct dns_dbmethods { isc_result_t (*getnsec3parameters)(dns_db_t *db, dns_dbversion_t *version, dns_hash_t *hash, - isc_uint8_t *flags, - isc_uint16_t *iterations, + uint8_t *flags, + uint16_t *iterations, unsigned char *salt, size_t *salt_len); isc_result_t (*findnsec3node)(dns_db_t *db, const dns_name_t *name, @@ -168,7 +170,7 @@ typedef struct dns_dbmethods { isc_boolean_t (*isdnssec)(dns_db_t *db); dns_stats_t *(*getrrsetstats)(dns_db_t *db); void (*rpz_attach)(dns_db_t *db, void *rpzs, - isc_uint8_t rpz_num); + uint8_t rpz_num); isc_result_t (*rpz_ready)(dns_db_t *db); isc_result_t (*findnodeext)(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, @@ -189,7 +191,7 @@ typedef struct dns_dbmethods { isc_result_t (*nodefullname)(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name); isc_result_t (*getsize)(dns_db_t *db, dns_dbversion_t *version, - isc_uint64_t *records, isc_uint64_t *bytes); + uint64_t *records, uint64_t *bytes); isc_result_t (*setservestalettl)(dns_db_t *db, dns_ttl_t ttl); isc_result_t (*getservestalettl)(dns_db_t *db, dns_ttl_t *ttl); isc_result_t (*setgluecachestats)(dns_db_t *db, isc_stats_t *stats); @@ -220,7 +222,7 @@ struct dns_db { unsigned int magic; unsigned int impmagic; dns_dbmethods_t * methods; - isc_uint16_t attributes; + uint16_t attributes; dns_rdataclass_t rdclass; dns_name_t origin; isc_mem_t * mctx; @@ -1331,7 +1333,7 @@ dns_db_deleterdataset(dns_db_t *db, dns_dbnode_t *node, */ isc_result_t -dns_db_getsoaserial(dns_db_t *db, dns_dbversion_t *ver, isc_uint32_t *serialp); +dns_db_getsoaserial(dns_db_t *db, dns_dbversion_t *ver, uint32_t *serialp); /*%< * Get the current SOA serial number from a zone database. * @@ -1462,8 +1464,8 @@ dns_db_getoriginnode(dns_db_t *db, dns_dbnode_t **nodep); isc_result_t dns_db_getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, - dns_hash_t *hash, isc_uint8_t *flags, - isc_uint16_t *interations, + dns_hash_t *hash, uint8_t *flags, + uint16_t *interations, unsigned char *salt, size_t *salt_length); /*%< * Get the NSEC3 parameters that are associated with this zone. @@ -1478,8 +1480,8 @@ dns_db_getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, */ isc_result_t -dns_db_getsize(dns_db_t *db, dns_dbversion_t *version, isc_uint64_t *records, - isc_uint64_t *bytes); +dns_db_getsize(dns_db_t *db, dns_dbversion_t *version, uint64_t *records, + uint64_t *bytes); /*%< * Get the number of records in the given version of the database as well * as the number bytes used to store those records. @@ -1609,7 +1611,7 @@ dns_db_setcachestats(dns_db_t *db, isc_stats_t *stats); */ void -dns_db_rpz_attach(dns_db_t *db, void *rpzs, isc_uint8_t rpz_num) +dns_db_rpz_attach(dns_db_t *db, void *rpzs, uint8_t rpz_num) ISC_DEPRECATED; /*%< * Attach the response policy information for a view to a database for a diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h index 8bf32013ac..95fc24a37d 100644 --- a/lib/dns/include/dns/dispatch.h +++ b/lib/dns/include/dns/dispatch.h @@ -44,6 +44,8 @@ *** Imports ***/ +#include + #include #include #include @@ -74,11 +76,11 @@ ISC_LANG_BEGINDECLS struct dns_dispatchevent { ISC_EVENT_COMMON(dns_dispatchevent_t); /*%< standard event common */ isc_result_t result; /*%< result code */ - isc_int32_t id; /*%< message id */ + int32_t id; /*%< message id */ isc_sockaddr_t addr; /*%< address recv'd from */ struct in6_pktinfo pktinfo; /*%< reply info for v6 */ isc_buffer_t buffer; /*%< data buffer */ - isc_uint32_t attributes; /*%< mirrored from socket.h */ + uint32_t attributes; /*%< mirrored from socket.h */ }; /*% @@ -375,7 +377,7 @@ isc_result_t dns_dispatch_addresponse(dns_dispatch_t *disp, unsigned int options, const isc_sockaddr_t *dest, isc_task_t *task, isc_taskaction_t action, void *arg, - isc_uint16_t *idp, dns_dispentry_t **resp, + uint16_t *idp, dns_dispentry_t **resp, isc_socketmgr_t *sockmgr); /*%< * Add a response entry for this dispatch. diff --git a/lib/dns/include/dns/dlz_dlopen.h b/lib/dns/include/dns/dlz_dlopen.h index 2b6a04aa93..420f2106ad 100644 --- a/lib/dns/include/dns/dlz_dlopen.h +++ b/lib/dns/include/dns/dlz_dlopen.h @@ -15,6 +15,8 @@ #ifndef DLZ_DLOPEN_H #define DLZ_DLOPEN_H +#include + #include ISC_LANG_BEGINDECLS @@ -133,7 +135,7 @@ typedef isc_boolean_t dlz_dlopen_ssumatch_t(const char *signer, const char *tcpaddr, const char *type, const char *key, - isc_uint32_t keydatalen, + uint32_t keydatalen, unsigned char *keydata, void *dbdata); diff --git a/lib/dns/include/dns/dnsrps.h b/lib/dns/include/dns/dnsrps.h index f79c24efb9..ad1cbd08f1 100644 --- a/lib/dns/include/dns/dnsrps.h +++ b/lib/dns/include/dns/dnsrps.h @@ -12,11 +12,11 @@ #ifndef DNS_DNSRPS_H #define DNS_DNSRPS_H +#include + #include #include -#include - #ifdef USE_DNSRPS #include diff --git a/lib/dns/include/dns/dnstap.h b/lib/dns/include/dns/dnstap.h index a37ed1a74c..f1aef4d369 100644 --- a/lib/dns/include/dns/dnstap.h +++ b/lib/dns/include/dns/dnstap.h @@ -23,6 +23,8 @@ * file dnstap.proto, which is compiled to dnstap.pb-c.c and dnstap.pb-c.h. */ +#include + #ifdef HAVE_DNSTAP #include #include @@ -104,8 +106,8 @@ struct dns_dtdata { isc_region_t qaddr; isc_region_t raddr; - isc_uint32_t qport; - isc_uint32_t rport; + uint32_t qport; + uint32_t rport; isc_region_t msgdata; dns_message_t *msg; @@ -163,7 +165,7 @@ dns_dt_create(isc_mem_t *mctx, dns_dtmode_t mode, const char *path, */ isc_result_t -dns_dt_setupfile(dns_dtenv_t *env, isc_uint64_t max_size, int rolls, +dns_dt_setupfile(dns_dtenv_t *env, uint64_t max_size, int rolls, isc_log_rollsuffix_t suffix); /*%< * Sets up the dnstap logfile limits. @@ -370,7 +372,7 @@ dns_dt_open(const char *filename, dns_dtmode_t mode, */ isc_result_t -dns_dt_getframe(dns_dthandle_t *handle, isc_uint8_t **bufp, size_t *sizep); +dns_dt_getframe(dns_dthandle_t *handle, uint8_t **bufp, size_t *sizep); /*%< * Read a dnstap frame from the framstream reader in 'handle', storing * a pointer to it in '*bufp' and its size in '*sizep'. diff --git a/lib/dns/include/dns/ecs.h b/lib/dns/include/dns/ecs.h index 356531e341..8c1e4fbf1b 100644 --- a/lib/dns/include/dns/ecs.h +++ b/lib/dns/include/dns/ecs.h @@ -12,14 +12,16 @@ #ifndef DNS_ECS_H #define DNS_ECS_H 1 +#include + #include #include #include struct dns_ecs { isc_netaddr_t addr; - isc_uint8_t source; - isc_uint8_t scope; + uint8_t source; + uint8_t scope; }; #define DNS_ECS_FORMATSIZE (ISC_NETADDR_FORMATSIZE + 8) /*
/NNN/NNN */ diff --git a/lib/dns/include/dns/ipkeylist.h b/lib/dns/include/dns/ipkeylist.h index 697c11d204..5b012b4226 100644 --- a/lib/dns/include/dns/ipkeylist.h +++ b/lib/dns/include/dns/ipkeylist.h @@ -12,6 +12,8 @@ #ifndef DNS_IPKEYLIST_H #define DNS_IPKEYLIST_H 1 +#include + #include #include @@ -24,8 +26,8 @@ struct dns_ipkeylist { isc_dscp_t *dscps; dns_name_t **keys; dns_name_t **labels; - isc_uint32_t count; - isc_uint32_t allocated; + uint32_t count; + uint32_t allocated; }; void diff --git a/lib/dns/include/dns/iptable.h b/lib/dns/include/dns/iptable.h index ea3dd20c87..05a9c18241 100644 --- a/lib/dns/include/dns/iptable.h +++ b/lib/dns/include/dns/iptable.h @@ -12,6 +12,8 @@ #ifndef DNS_IPTABLE_H #define DNS_IPTABLE_H 1 +#include + #include #include #include @@ -43,7 +45,7 @@ dns_iptable_create(isc_mem_t *mctx, dns_iptable_t **target); isc_result_t dns_iptable_addprefix(dns_iptable_t *tab, const isc_netaddr_t *addr, - isc_uint16_t bitlen, isc_boolean_t pos); + uint16_t bitlen, isc_boolean_t pos); /* * Add an IP prefix to an existing IP table */ diff --git a/lib/dns/include/dns/journal.h b/lib/dns/include/dns/journal.h index 7bcd733978..7b5df6d3c0 100644 --- a/lib/dns/include/dns/journal.h +++ b/lib/dns/include/dns/journal.h @@ -26,6 +26,8 @@ *** Imports ***/ +#include + #include #include @@ -43,7 +45,7 @@ #define DNS_JOURNAL_CREATE 0x00000001 /* ISC_TRUE */ #define DNS_JOURNAL_WRITE 0x00000002 -#define DNS_JOURNAL_SIZE_MAX ISC_INT32_MAX +#define DNS_JOURNAL_SIZE_MAX INT32_MAX #define DNS_JOURNAL_SIZE_MIN 4096 /*** @@ -180,9 +182,9 @@ dns_journal_empty(dns_journal_t *j); * Find out if a journal is empty. */ -isc_uint32_t +uint32_t dns_journal_first_serial(dns_journal_t *j); -isc_uint32_t +uint32_t dns_journal_last_serial(dns_journal_t *j); /*%< * Get the first and last addressable serial number in the journal. @@ -190,7 +192,7 @@ dns_journal_last_serial(dns_journal_t *j); isc_result_t dns_journal_iter_init(dns_journal_t *j, - isc_uint32_t begin_serial, isc_uint32_t end_serial); + uint32_t begin_serial, uint32_t end_serial); /*%< * Prepare to iterate over the transactions that will bring the database * from SOA serial number 'begin_serial' to 'end_serial'. @@ -219,7 +221,7 @@ dns_journal_next_rr(dns_journal_t *j); /*@}*/ void -dns_journal_current_rr(dns_journal_t *j, dns_name_t **name, isc_uint32_t *ttl, +dns_journal_current_rr(dns_journal_t *j, dns_name_t **name, uint32_t *ttl, dns_rdata_t **rdata); /*%< * Get the name, ttl, and rdata of the current journal RR. @@ -280,8 +282,8 @@ dns_db_diffx(dns_diff_t *diff, dns_db_t *dba, dns_dbversion_t *dbvera, */ isc_result_t -dns_journal_compact(isc_mem_t *mctx, char *filename, isc_uint32_t serial, - isc_uint32_t target_size); +dns_journal_compact(isc_mem_t *mctx, char *filename, uint32_t serial, + uint32_t target_size); /*%< * Attempt to compact the journal if it is greater that 'target_size'. * Changes from 'serial' onwards will be preserved. If the journal @@ -289,9 +291,9 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, isc_uint32_t serial, */ isc_boolean_t -dns_journal_get_sourceserial(dns_journal_t *j, isc_uint32_t *sourceserial); +dns_journal_get_sourceserial(dns_journal_t *j, uint32_t *sourceserial); void -dns_journal_set_sourceserial(dns_journal_t *j, isc_uint32_t sourceserial); +dns_journal_set_sourceserial(dns_journal_t *j, uint32_t sourceserial); /*%< * Get and set source serial. * diff --git a/lib/dns/include/dns/keydata.h b/lib/dns/include/dns/keydata.h index 20195e1025..f12932ad07 100644 --- a/lib/dns/include/dns/keydata.h +++ b/lib/dns/include/dns/keydata.h @@ -26,6 +26,8 @@ *** Imports ***/ +#include + #include #include @@ -41,8 +43,8 @@ dns_keydata_todnskey(dns_rdata_keydata_t *keydata, isc_result_t dns_keydata_fromdnskey(dns_rdata_keydata_t *keydata, dns_rdata_dnskey_t *dnskey, - isc_uint32_t refresh, isc_uint32_t addhd, - isc_uint32_t removehd, isc_mem_t *mctx); + uint32_t refresh, uint32_t addhd, + uint32_t removehd, isc_mem_t *mctx); ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/librpz.h b/lib/dns/include/dns/librpz.h index 9eb184db69..b9b2b36bb1 100644 --- a/lib/dns/include/dns/librpz.h +++ b/lib/dns/include/dns/librpz.h @@ -35,6 +35,8 @@ #ifndef LIBRPZ_H #define LIBRPZ_H +#include + #include #include #include diff --git a/lib/dns/include/dns/master.h b/lib/dns/include/dns/master.h index a8f8ea8d0c..a2d67ee7fb 100644 --- a/lib/dns/include/dns/master.h +++ b/lib/dns/include/dns/master.h @@ -20,6 +20,7 @@ ***/ #include +#include #include @@ -72,31 +73,31 @@ ISC_LANG_BEGINDECLS /* Common header */ struct dns_masterrawheader { - isc_uint32_t format; /* must be + uint32_t format; /* must be * dns_masterformat_raw * or * dns_masterformat_map */ - isc_uint32_t version; /* compatibility for future + uint32_t version; /* compatibility for future * extensions */ - isc_uint32_t dumptime; /* timestamp on creation + uint32_t dumptime; /* timestamp on creation * (currently unused) */ - isc_uint32_t flags; /* Flags */ - isc_uint32_t sourceserial; /* Source serial number (used + uint32_t flags; /* Flags */ + uint32_t sourceserial; /* Source serial number (used * by inline-signing zones) */ - isc_uint32_t lastxfrin; /* timestamp of last transfer + uint32_t lastxfrin; /* timestamp of last transfer * (used by slave zones) */ }; /* The structure for each RRset */ typedef struct { - isc_uint32_t totallen; /* length of the data for this + uint32_t totallen; /* length of the data for this * RRset, including the * "header" part */ dns_rdataclass_t rdclass; /* 16-bit class */ dns_rdatatype_t type; /* 16-bit type */ dns_rdatatype_t covers; /* same as type */ dns_ttl_t ttl; /* 32-bit TTL */ - isc_uint32_t nrdata; /* number of RRs in this set */ + uint32_t nrdata; /* number of RRs in this set */ /* followed by encoded owner name, and then rdata */ } dns_masterrawrdataset_t; @@ -117,7 +118,7 @@ dns_master_loadfile(const char *master_file, dns_name_t *origin, dns_rdataclass_t zclass, unsigned int options, - isc_uint32_t resign, + uint32_t resign, dns_rdatacallbacks_t *callbacks, dns_masterincludecb_t include_cb, void *include_arg, isc_mem_t *mctx, @@ -157,14 +158,14 @@ dns_master_loadfileinc(const char *master_file, dns_name_t *origin, dns_rdataclass_t zclass, unsigned int options, - isc_uint32_t resign, + uint32_t resign, dns_rdatacallbacks_t *callbacks, isc_task_t *task, dns_loaddonefunc_t done, void *done_arg, dns_loadctx_t **ctxp, dns_masterincludecb_t include_cb, void *include_arg, isc_mem_t *mctx, dns_masterformat_t format, - isc_uint32_t maxttl); + uint32_t maxttl); isc_result_t dns_master_loadstreaminc(FILE *stream, diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h index 3d8493e409..74459d1fb3 100644 --- a/lib/dns/include/dns/message.h +++ b/lib/dns/include/dns/message.h @@ -16,6 +16,8 @@ *** Imports ***/ +#include + #include #include @@ -112,7 +114,7 @@ #define DNS_MESSAGE_REPLYPRESERVE (DNS_MESSAGEFLAG_RD|DNS_MESSAGEFLAG_CD) #define DNS_MESSAGEEXTFLAG_REPLYPRESERVE (DNS_MESSAGEEXTFLAG_DO) -#define DNS_MESSAGE_HEADERLEN 12 /*%< 6 isc_uint16_t's */ +#define DNS_MESSAGE_HEADERLEN 12 /*%< 6 uint16_t's */ #define DNS_MESSAGE_MAGIC ISC_MAGIC('M','S','G','@') #define DNS_MESSAGE_VALID(msg) ISC_MAGIC_VALID(msg, DNS_MESSAGE_MAGIC) @@ -226,7 +228,7 @@ struct dns_message { unsigned int sig_reserved; unsigned int reserved; /* reserved space (render) */ - isc_uint16_t padding; + uint16_t padding; unsigned int padding_off; isc_buffer_t *buffer; @@ -266,8 +268,8 @@ struct dns_message { }; struct dns_ednsopt { - isc_uint16_t code; - isc_uint16_t length; + uint16_t code; + uint16_t length; unsigned char *value; }; @@ -1408,7 +1410,7 @@ dns_message_logfmtpacket(dns_message_t *message, const char *description, isc_result_t dns_message_buildopt(dns_message_t *msg, dns_rdataset_t **opt, - unsigned int version, isc_uint16_t udpsize, + unsigned int version, uint16_t udpsize, unsigned int flags, dns_ednsopt_t *ednsopts, size_t count); /*%< * Built a opt record. @@ -1434,7 +1436,7 @@ dns_message_setclass(dns_message_t *msg, dns_rdataclass_t rdclass); */ void -dns_message_setpadding(dns_message_t *msg, isc_uint16_t padding); +dns_message_setpadding(dns_message_t *msg, uint16_t padding); /*%< * Set the padding block size in the response. * 0 means no padding (default). diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h index c4cffb09a8..882920e968 100644 --- a/lib/dns/include/dns/name.h +++ b/lib/dns/include/dns/name.h @@ -65,6 +65,7 @@ ***/ #include +#include #include #include @@ -742,7 +743,7 @@ dns_name_towire(const dns_name_t *name, dns_compress_t *cctx, isc_buffer_t *target); isc_result_t dns_name_towire2(const dns_name_t *name, dns_compress_t *cctx, - isc_buffer_t *target, isc_uint16_t *comp_offsetp); + isc_buffer_t *target, uint16_t *comp_offsetp); /*%< * Convert 'name' into wire format, compressing it as specified by the * compression context 'cctx', and storing the result in 'target'. diff --git a/lib/dns/include/dns/nta.h b/lib/dns/include/dns/nta.h index 63b99b0b2c..2a04e97b5e 100644 --- a/lib/dns/include/dns/nta.h +++ b/lib/dns/include/dns/nta.h @@ -23,6 +23,8 @@ * DNSSEC validation. */ +#include + #include #include #include @@ -48,7 +50,7 @@ struct dns_ntatable { isc_timermgr_t *timermgr; isc_task_t *task; /* Locked by rwlock. */ - isc_uint32_t references; + uint32_t references; dns_rbt_t *table; }; @@ -116,7 +118,7 @@ dns_ntatable_detach(dns_ntatable_t **ntatablep); isc_result_t dns_ntatable_add(dns_ntatable_t *ntatable, const dns_name_t *name, isc_boolean_t force, isc_stdtime_t now, - isc_uint32_t lifetime); + uint32_t lifetime); /*%< * Add a negative trust anchor to 'ntatable' for name 'name', * which will expire at time 'now' + 'lifetime'. If 'force' is ISC_FALSE, diff --git a/lib/dns/include/dns/peer.h b/lib/dns/include/dns/peer.h index 2ae4e7676b..194f768bf2 100644 --- a/lib/dns/include/dns/peer.h +++ b/lib/dns/include/dns/peer.h @@ -26,6 +26,8 @@ *** Imports ***/ +#include + #include #include #include @@ -44,7 +46,7 @@ struct dns_peerlist { unsigned int magic; - isc_uint32_t refs; + uint32_t refs; isc_mem_t *mem; @@ -53,7 +55,7 @@ struct dns_peerlist { struct dns_peer { unsigned int magic; - isc_uint32_t refs; + uint32_t refs; isc_mem_t *mem; @@ -61,7 +63,7 @@ struct dns_peer { unsigned int prefixlen; isc_boolean_t bogus; dns_transfer_format_t transfer_format; - isc_uint32_t transfers; + uint32_t transfers; isc_boolean_t support_ixfr; isc_boolean_t provide_ixfr; isc_boolean_t request_ixfr; @@ -78,12 +80,12 @@ struct dns_peer { isc_dscp_t notify_dscp; isc_sockaddr_t *query_source; isc_dscp_t query_dscp; - isc_uint16_t udpsize; /* receive size */ - isc_uint16_t maxudp; /* transmit size */ - isc_uint16_t padding; /* pad block size */ - isc_uint8_t ednsversion; /* edns version */ + uint16_t udpsize; /* receive size */ + uint16_t maxudp; /* transmit size */ + uint16_t padding; /* pad block size */ + uint8_t ednsversion; /* edns version */ - isc_uint32_t bitflags; + uint32_t bitflags; ISC_LINK(dns_peer_t) next; }; @@ -189,10 +191,10 @@ isc_result_t dns_peer_getsupportedns(dns_peer_t *peer, isc_boolean_t *retval); isc_result_t -dns_peer_settransfers(dns_peer_t *peer, isc_uint32_t newval); +dns_peer_settransfers(dns_peer_t *peer, uint32_t newval); isc_result_t -dns_peer_gettransfers(dns_peer_t *peer, isc_uint32_t *retval); +dns_peer_gettransfers(dns_peer_t *peer, uint32_t *retval); isc_result_t dns_peer_settransferformat(dns_peer_t *peer, dns_transfer_format_t newval); @@ -217,22 +219,22 @@ isc_result_t dns_peer_gettransfersource(dns_peer_t *peer, isc_sockaddr_t *transfer_source); isc_result_t -dns_peer_setudpsize(dns_peer_t *peer, isc_uint16_t udpsize); +dns_peer_setudpsize(dns_peer_t *peer, uint16_t udpsize); isc_result_t -dns_peer_getudpsize(dns_peer_t *peer, isc_uint16_t *udpsize); +dns_peer_getudpsize(dns_peer_t *peer, uint16_t *udpsize); isc_result_t -dns_peer_setmaxudp(dns_peer_t *peer, isc_uint16_t maxudp); +dns_peer_setmaxudp(dns_peer_t *peer, uint16_t maxudp); isc_result_t -dns_peer_getmaxudp(dns_peer_t *peer, isc_uint16_t *maxudp); +dns_peer_getmaxudp(dns_peer_t *peer, uint16_t *maxudp); isc_result_t -dns_peer_setpadding(dns_peer_t *peer, isc_uint16_t padding); +dns_peer_setpadding(dns_peer_t *peer, uint16_t padding); isc_result_t -dns_peer_getpadding(dns_peer_t *peer, isc_uint16_t *padding); +dns_peer_getpadding(dns_peer_t *peer, uint16_t *padding); isc_result_t dns_peer_setnotifysource(dns_peer_t *peer, const isc_sockaddr_t *notify_source); @@ -265,10 +267,10 @@ isc_result_t dns_peer_getquerydscp(dns_peer_t *peer, isc_dscp_t *dscpp); isc_result_t -dns_peer_setednsversion(dns_peer_t *peer, isc_uint8_t ednsversion); +dns_peer_setednsversion(dns_peer_t *peer, uint8_t ednsversion); isc_result_t -dns_peer_getednsversion(dns_peer_t *peer, isc_uint8_t *ednsversion); +dns_peer_getednsversion(dns_peer_t *peer, uint8_t *ednsversion); ISC_LANG_ENDDECLS #endif /* DNS_PEER_H */ diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h index a2a07eebf3..7c9a6d0202 100644 --- a/lib/dns/include/dns/rbt.h +++ b/lib/dns/include/dns/rbt.h @@ -14,6 +14,8 @@ /*! \file dns/rbt.h */ +#include + #include #include #include @@ -178,11 +180,11 @@ typedef isc_result_t (*dns_rbtfindcallback_t)(dns_rbtnode_t *node, typedef isc_result_t (*dns_rbtdatawriter_t)(FILE *file, unsigned char *data, void *arg, - isc_uint64_t *crc); + uint64_t *crc); typedef isc_result_t (*dns_rbtdatafixer_t)(dns_rbtnode_t *rbtnode, void *base, size_t offset, - void *arg, isc_uint64_t *crc); + void *arg, uint64_t *crc); typedef void (*dns_rbtdeleter_t)(void *, void *); diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h index 7085d424b0..21875709b9 100644 --- a/lib/dns/include/dns/rdataset.h +++ b/lib/dns/include/dns/rdataset.h @@ -43,6 +43,8 @@ *\li None. */ +#include + #include #include #include @@ -122,11 +124,11 @@ struct dns_rdataset { unsigned int attributes; /*% * the counter provides the starting point in the "cyclic" order. - * The value ISC_UINT32_MAX has a special meaning of "picking up a + * The value UINT32_MAX has a special meaning of "picking up a * random value." in order to take care of databases that do not * increment the counter. */ - isc_uint32_t count; + uint32_t count; /* * This RRSIG RRset should be re-generated around this time. * Only valid if DNS_RDATASETATTR_RESIGN is set in attributes. diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h index 6454b68c74..4e12ece12c 100644 --- a/lib/dns/include/dns/resolver.h +++ b/lib/dns/include/dns/resolver.h @@ -44,6 +44,8 @@ *\li Drafts: TBS */ +#include + #include #include #include @@ -412,7 +414,7 @@ dns_resolver_socketmgr(dns_resolver_t *resolver); isc_taskmgr_t * dns_resolver_taskmgr(dns_resolver_t *resolver); -isc_uint32_t +uint32_t dns_resolver_getlamettl(dns_resolver_t *resolver); /*%< * Get the resolver's lame-ttl. zero => no lame processing. @@ -422,7 +424,7 @@ dns_resolver_getlamettl(dns_resolver_t *resolver); */ void -dns_resolver_setlamettl(dns_resolver_t *resolver, isc_uint32_t lame_ttl); +dns_resolver_setlamettl(dns_resolver_t *resolver, uint32_t lame_ttl); /*%< * Set the resolver's lame-ttl. zero => no lame processing. * @@ -453,12 +455,12 @@ dns_resolver_addalternate(dns_resolver_t *resolver, const isc_sockaddr_t *alt, */ void -dns_resolver_setudpsize(dns_resolver_t *resolver, isc_uint16_t udpsize); +dns_resolver_setudpsize(dns_resolver_t *resolver, uint16_t udpsize); /*%< * Set the EDNS UDP buffer size advertised by the server. */ -isc_uint16_t +uint16_t dns_resolver_getudpsize(dns_resolver_t *resolver); /*%< * Get the current EDNS UDP buffer size. @@ -560,13 +562,13 @@ dns_resolver_gettimeout(dns_resolver_t *resolver); void dns_resolver_setclientsperquery(dns_resolver_t *resolver, - isc_uint32_t min, isc_uint32_t max); + uint32_t min, uint32_t max); void -dns_resolver_setfetchesperzone(dns_resolver_t *resolver, isc_uint32_t clients); +dns_resolver_setfetchesperzone(dns_resolver_t *resolver, uint32_t clients); void -dns_resolver_getclientsperquery(dns_resolver_t *resolver, isc_uint32_t *cur, - isc_uint32_t *min, isc_uint32_t *max); +dns_resolver_getclientsperquery(dns_resolver_t *resolver, uint32_t *cur, + uint32_t *min, uint32_t *max); isc_boolean_t dns_resolver_getzeronosoattl(dns_resolver_t *resolver); diff --git a/lib/dns/include/dns/rpz.h b/lib/dns/include/dns/rpz.h index 34a3ff9c53..6e8e035cd7 100644 --- a/lib/dns/include/dns/rpz.h +++ b/lib/dns/include/dns/rpz.h @@ -13,6 +13,8 @@ #ifndef DNS_RPZ_H #define DNS_RPZ_H 1 +#include + #include #include #include @@ -43,7 +45,7 @@ ISC_LANG_BEGINDECLS #define DNS_RPZ_DROP_NAME DNS_RPZ_PREFIX"drop" #define DNS_RPZ_TCP_ONLY_NAME DNS_RPZ_PREFIX"tcp-only" -typedef isc_uint8_t dns_rpz_prefix_t; +typedef uint8_t dns_rpz_prefix_t; typedef enum { DNS_RPZ_TYPE_BAD, @@ -74,14 +76,14 @@ typedef enum { DNS_RPZ_POLICY_ERROR } dns_rpz_policy_t; -typedef isc_uint8_t dns_rpz_num_t; +typedef uint8_t dns_rpz_num_t; #define DNS_RPZ_MAX_ZONES 64 /* * Type dns_rpz_zbits_t must be an unsigned int wide enough to contain * at least DNS_RPZ_MAX_ZONES bits. */ -typedef isc_uint64_t dns_rpz_zbits_t; +typedef uint64_t dns_rpz_zbits_t; #define DNS_RPZ_ALL_ZBITS ((dns_rpz_zbits_t)-1) @@ -137,7 +139,7 @@ struct dns_rpz_zone { dns_ttl_t max_policy_ttl; dns_rpz_policy_t policy; /* DNS_RPZ_POLICY_GIVEN or override */ - isc_uint32_t min_update_interval;/* minimal interval between updates */ + uint32_t min_update_interval;/* minimal interval between updates */ isc_ht_t *nodes; /* entries in zone */ dns_rpz_zones_t *rpzs; /* owner */ isc_time_t lastupdated; /* last time the zone was processed */ diff --git a/lib/dns/include/dns/rriterator.h b/lib/dns/include/dns/rriterator.h index 4944e68104..2c2d7e1cfe 100644 --- a/lib/dns/include/dns/rriterator.h +++ b/lib/dns/include/dns/rriterator.h @@ -25,6 +25,8 @@ ***** Imports *****/ +#include + #include #include #include @@ -128,7 +130,7 @@ dns_rriterator_next(dns_rriterator_t *it); void dns_rriterator_current(dns_rriterator_t *it, dns_name_t **name, - isc_uint32_t *ttl, dns_rdataset_t **rdataset, + uint32_t *ttl, dns_rdataset_t **rdataset, dns_rdata_t **rdata); /*%< * Make '*name' refer to the current name. If 'rdataset' is not NULL, diff --git a/lib/dns/include/dns/rrl.h b/lib/dns/include/dns/rrl.h index c2be485531..50e3e017f4 100644 --- a/lib/dns/include/dns/rrl.h +++ b/lib/dns/include/dns/rrl.h @@ -17,6 +17,8 @@ * Rate limit DNS responses. */ +#include + #include #include @@ -86,16 +88,16 @@ typedef enum { #define DNS_RRL_MAX_PREFIX 64 typedef union dns_rrl_key dns_rrl_key_t; struct dns__rrl_key { - isc_uint32_t ip[DNS_RRL_MAX_PREFIX/32]; - isc_uint32_t qname_hash; + uint32_t ip[DNS_RRL_MAX_PREFIX/32]; + uint32_t qname_hash; dns_rdatatype_t qtype; - isc_uint8_t qclass; + uint8_t qclass; unsigned int rtype :4; /* dns_rrl_rtype_t */ unsigned int ipv6 :1; }; union dns_rrl_key { struct dns__rrl_key s; - isc_uint16_t w[sizeof(struct dns__rrl_key)/sizeof(isc_uint16_t)]; + uint16_t w[sizeof(struct dns__rrl_key)/sizeof(uint16_t)]; }; /* @@ -237,9 +239,9 @@ struct dns_rrl { isc_stdtime_t ts_bases[DNS_RRL_TS_BASES]; int ipv4_prefixlen; - isc_uint32_t ipv4_mask; + uint32_t ipv4_mask; int ipv6_prefixlen; - isc_uint32_t ipv6_mask[4]; + uint32_t ipv6_mask[4]; isc_stdtime_t log_stops_time; dns_rrl_entry_t *last_logged; diff --git a/lib/dns/include/dns/sdb.h b/lib/dns/include/dns/sdb.h index f21d12651d..c033b60d40 100644 --- a/lib/dns/include/dns/sdb.h +++ b/lib/dns/include/dns/sdb.h @@ -26,6 +26,8 @@ *** Imports ***/ +#include + #include #include @@ -197,7 +199,7 @@ dns_sdb_putnamedrdata(dns_sdballnodes_t *allnodes, const char *name, isc_result_t dns_sdb_putsoa(dns_sdblookup_t *lookup, const char *mname, const char *rname, - isc_uint32_t serial); + uint32_t serial); /*%< * This function may optionally be called from the 'authority' callback * to simplify construction of the SOA record for 'zone'. It will diff --git a/lib/dns/include/dns/sdlz.h b/lib/dns/include/dns/sdlz.h index 136e9ffe8c..597e16fc4b 100644 --- a/lib/dns/include/dns/sdlz.h +++ b/lib/dns/include/dns/sdlz.h @@ -50,6 +50,8 @@ #ifndef SDLZ_H #define SDLZ_H 1 +#include + #include #include @@ -237,7 +239,7 @@ typedef isc_boolean_t (*dns_sdlzssumatch_t)(const char *signer, const char *tcpaddr, const char *type, const char *key, - isc_uint32_t keydatalen, + uint32_t keydatalen, unsigned char *keydata, void *driverarg, void *dbdata); @@ -343,7 +345,7 @@ dns_sdlz_putrr_t dns_sdlz_putrr; typedef isc_result_t dns_sdlz_putsoa_t(dns_sdlzlookup_t *lookup, const char *mname, const char *rname, - isc_uint32_t serial); + uint32_t serial); dns_sdlz_putsoa_t dns_sdlz_putsoa; /*%< * This function may optionally be called from the 'authority' diff --git a/lib/dns/include/dns/soa.h b/lib/dns/include/dns/soa.h index b3aa30063d..7fddd60b68 100644 --- a/lib/dns/include/dns/soa.h +++ b/lib/dns/include/dns/soa.h @@ -26,6 +26,8 @@ *** Imports ***/ +#include + #include #include @@ -38,9 +40,9 @@ ISC_LANG_BEGINDECLS isc_result_t dns_soa_buildrdata(const dns_name_t *origin, const dns_name_t *contact, dns_rdataclass_t rdclass, - isc_uint32_t serial, isc_uint32_t refresh, - isc_uint32_t retry, isc_uint32_t expire, - isc_uint32_t minimum, unsigned char *buffer, + uint32_t serial, uint32_t refresh, + uint32_t retry, uint32_t expire, + uint32_t minimum, unsigned char *buffer, dns_rdata_t *rdata); /*%< * Build the rdata of an SOA record. @@ -55,15 +57,15 @@ dns_soa_buildrdata(const dns_name_t *origin, const dns_name_t *contact, * refers to 'buffer'. */ -isc_uint32_t +uint32_t dns_soa_getserial(dns_rdata_t *rdata); -isc_uint32_t +uint32_t dns_soa_getrefresh(dns_rdata_t *rdata); -isc_uint32_t +uint32_t dns_soa_getretry(dns_rdata_t *rdata); -isc_uint32_t +uint32_t dns_soa_getexpire(dns_rdata_t *rdata); -isc_uint32_t +uint32_t dns_soa_getminimum(dns_rdata_t *rdata); /* * Extract an integer field from the rdata of a SOA record. @@ -73,15 +75,15 @@ dns_soa_getminimum(dns_rdata_t *rdata); */ void -dns_soa_setserial(isc_uint32_t val, dns_rdata_t *rdata); +dns_soa_setserial(uint32_t val, dns_rdata_t *rdata); void -dns_soa_setrefresh(isc_uint32_t val, dns_rdata_t *rdata); +dns_soa_setrefresh(uint32_t val, dns_rdata_t *rdata); void -dns_soa_setretry(isc_uint32_t val, dns_rdata_t *rdata); +dns_soa_setretry(uint32_t val, dns_rdata_t *rdata); void -dns_soa_setexpire(isc_uint32_t val, dns_rdata_t *rdata); +dns_soa_setexpire(uint32_t val, dns_rdata_t *rdata); void -dns_soa_setminimum(isc_uint32_t val, dns_rdata_t *rdata); +dns_soa_setminimum(uint32_t val, dns_rdata_t *rdata); /* * Change an integer field of a SOA record by modifying the * rdata in-place. diff --git a/lib/dns/include/dns/stats.h b/lib/dns/include/dns/stats.h index a46b71fe66..6b7c423976 100644 --- a/lib/dns/include/dns/stats.h +++ b/lib/dns/include/dns/stats.h @@ -14,6 +14,8 @@ /*! \file dns/stats.h */ +#include + #include /*% @@ -493,13 +495,13 @@ LIBDNS_EXTERNAL_DATA extern const char *dns_statscounter_names[]; /*%< * Types of dump callbacks. */ -typedef void (*dns_generalstats_dumper_t)(isc_statscounter_t, isc_uint64_t, +typedef void (*dns_generalstats_dumper_t)(isc_statscounter_t, uint64_t, void *); -typedef void (*dns_rdatatypestats_dumper_t)(dns_rdatastatstype_t, isc_uint64_t, +typedef void (*dns_rdatatypestats_dumper_t)(dns_rdatastatstype_t, uint64_t, void *); -typedef void (*dns_opcodestats_dumper_t)(dns_opcode_t, isc_uint64_t, void *); +typedef void (*dns_opcodestats_dumper_t)(dns_opcode_t, uint64_t, void *); -typedef void (*dns_rcodestats_dumper_t)(dns_rcode_t, isc_uint64_t, void *); +typedef void (*dns_rcodestats_dumper_t)(dns_rcode_t, uint64_t, void *); ISC_LANG_BEGINDECLS @@ -740,7 +742,7 @@ dns_rcodestats_dump(dns_stats_t *stats, dns_rcodestats_dumper_t dump_fn, */ isc_result_t -dns_stats_alloccounters(isc_mem_t *mctx, isc_uint64_t **ctrp); +dns_stats_alloccounters(isc_mem_t *mctx, uint64_t **ctrp); /*%< * Allocate an array of query statistics counters from the memory * context 'mctx'. @@ -749,7 +751,7 @@ dns_stats_alloccounters(isc_mem_t *mctx, isc_uint64_t **ctrp); */ void -dns_stats_freecounters(isc_mem_t *mctx, isc_uint64_t **ctrp); +dns_stats_freecounters(isc_mem_t *mctx, uint64_t **ctrp); /*%< * Free an array of query statistics counters allocated from the memory * context 'mctx'. diff --git a/lib/dns/include/dns/tcpmsg.h b/lib/dns/include/dns/tcpmsg.h index 5be03c162f..1e8f29bf91 100644 --- a/lib/dns/include/dns/tcpmsg.h +++ b/lib/dns/include/dns/tcpmsg.h @@ -15,6 +15,8 @@ /*! \file dns/tcpmsg.h */ +#include + #include #include #include @@ -22,7 +24,7 @@ typedef struct dns_tcpmsg { /* private (don't touch!) */ unsigned int magic; - isc_uint16_t size; + uint16_t size; isc_buffer_t buffer; unsigned int maxsize; isc_mem_t *mctx; diff --git a/lib/dns/include/dns/time.h b/lib/dns/include/dns/time.h index 36a53a670d..012b733066 100644 --- a/lib/dns/include/dns/time.h +++ b/lib/dns/include/dns/time.h @@ -19,6 +19,8 @@ *** Imports ***/ +#include + #include #include @@ -29,7 +31,7 @@ ISC_LANG_BEGINDECLS ***/ isc_result_t -dns_time64_fromtext(const char *source, isc_int64_t *target); +dns_time64_fromtext(const char *source, int64_t *target); /*%< * Convert a date and time in YYYYMMDDHHMMSS text format at 'source' * into to a 64-bit count of seconds since Jan 1 1970 0:00 GMT. @@ -37,7 +39,7 @@ dns_time64_fromtext(const char *source, isc_int64_t *target); */ isc_result_t -dns_time32_fromtext(const char *source, isc_uint32_t *target); +dns_time32_fromtext(const char *source, uint32_t *target); /*%< * Like dns_time64_fromtext, but returns the second count modulo 2^32 * as per RFC2535. @@ -45,14 +47,14 @@ dns_time32_fromtext(const char *source, isc_uint32_t *target); isc_result_t -dns_time64_totext(isc_int64_t value, isc_buffer_t *target); +dns_time64_totext(int64_t value, isc_buffer_t *target); /*%< * Convert a 64-bit count of seconds since Jan 1 1970 0:00 GMT into * a YYYYMMDDHHMMSS text representation and append it to 'target'. */ isc_result_t -dns_time32_totext(isc_uint32_t value, isc_buffer_t *target); +dns_time32_totext(uint32_t value, isc_buffer_t *target); /*%< * Like dns_time64_totext, but for a 32-bit cyclic time value. * Of those dates whose counts of seconds since Jan 1 1970 0:00 GMT @@ -60,8 +62,8 @@ dns_time32_totext(isc_uint32_t value, isc_buffer_t *target); * current date is chosen. */ -isc_int64_t -dns_time64_from32(isc_uint32_t value); +int64_t +dns_time64_from32(uint32_t value); /*%< * Covert a 32-bit cyclic time value into a 64 bit time stamp. */ diff --git a/lib/dns/include/dns/tkey.h b/lib/dns/include/dns/tkey.h index e7a48aa0ee..66f4ec46b5 100644 --- a/lib/dns/include/dns/tkey.h +++ b/lib/dns/include/dns/tkey.h @@ -15,6 +15,8 @@ /*! \file dns/tkey.h */ +#include + #include #include @@ -88,7 +90,7 @@ dns_tkey_processquery(dns_message_t *msg, dns_tkeyctx_t *tctx, isc_result_t dns_tkey_builddhquery(dns_message_t *msg, dst_key_t *key, const dns_name_t *name, const dns_name_t *algorithm, - isc_buffer_t *nonce, isc_uint32_t lifetime); + isc_buffer_t *nonce, uint32_t lifetime); /*%< * Builds a query containing a TKEY that will generate a shared * secret using a Diffie-Hellman key exchange. The shared key @@ -115,7 +117,7 @@ dns_tkey_builddhquery(dns_message_t *msg, dst_key_t *key, isc_result_t dns_tkey_buildgssquery(dns_message_t *msg, const dns_name_t *name, const dns_name_t *gname, isc_buffer_t *intoken, - isc_uint32_t lifetime, gss_ctx_id_t *context, + uint32_t lifetime, gss_ctx_id_t *context, isc_boolean_t win2k, isc_mem_t *mctx, char **err_message); /*%< diff --git a/lib/dns/include/dns/ttl.h b/lib/dns/include/dns/ttl.h index 34c7b5c1a5..265d81fcdd 100644 --- a/lib/dns/include/dns/ttl.h +++ b/lib/dns/include/dns/ttl.h @@ -19,6 +19,8 @@ *** Imports ***/ +#include + #include #include @@ -29,7 +31,7 @@ ISC_LANG_BEGINDECLS ***/ isc_result_t -dns_ttl_totext(isc_uint32_t src, isc_boolean_t verbose, +dns_ttl_totext(uint32_t src, isc_boolean_t verbose, isc_boolean_t upcase, isc_buffer_t *target); /*%< * Output a TTL or other time interval in a human-readable form. @@ -53,7 +55,7 @@ dns_ttl_totext(isc_uint32_t src, isc_boolean_t verbose, */ isc_result_t -dns_counter_fromtext(isc_textregion_t *source, isc_uint32_t *ttl); +dns_counter_fromtext(isc_textregion_t *source, uint32_t *ttl); /*%< * Converts a counter from either a plain number or a BIND 8 style value. * @@ -63,7 +65,7 @@ dns_counter_fromtext(isc_textregion_t *source, isc_uint32_t *ttl); */ isc_result_t -dns_ttl_fromtext(isc_textregion_t *source, isc_uint32_t *ttl); +dns_ttl_fromtext(isc_textregion_t *source, uint32_t *ttl); /*%< * Converts a ttl from either a plain number or a BIND 8 style value. * diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h index 5daef6498f..825babfba3 100644 --- a/lib/dns/include/dns/types.h +++ b/lib/dns/include/dns/types.h @@ -22,6 +22,7 @@ */ #include +#include #include @@ -47,7 +48,7 @@ typedef void dns_clientrestrans_t; typedef void dns_clientreqtrans_t; typedef void dns_clientupdatetrans_t; typedef struct dns_cache dns_cache_t; -typedef isc_uint16_t dns_cert_t; +typedef uint16_t dns_cert_t; typedef struct dns_compress dns_compress_t; typedef struct dns_db dns_db_t; typedef struct dns_dbimplementation dns_dbimplementation_t; @@ -73,11 +74,11 @@ typedef struct dns_dns64 dns_dns64_t; typedef ISC_LIST(dns_dns64_t) dns_dns64list_t; typedef struct dns_dnsseckey dns_dnsseckey_t; typedef ISC_LIST(dns_dnsseckey_t) dns_dnsseckeylist_t; -typedef isc_uint8_t dns_dsdigest_t; +typedef uint8_t dns_dsdigest_t; typedef struct dns_dtdata dns_dtdata_t; typedef struct dns_dtenv dns_dtenv_t; typedef struct dns_dtmsg dns_dtmsg_t; -typedef isc_uint16_t dns_dtmsgtype_t; +typedef uint16_t dns_dtmsgtype_t; typedef struct dns_dumpctx dns_dumpctx_t; typedef struct dns_ecs dns_ecs_t; typedef struct dns_ednsopt dns_ednsopt_t; @@ -87,58 +88,58 @@ typedef struct dns_forwarders dns_forwarders_t; typedef struct dns_forwarder dns_forwarder_t; typedef struct dns_fwdtable dns_fwdtable_t; typedef struct dns_iptable dns_iptable_t; -typedef isc_uint32_t dns_iterations_t; -typedef isc_uint16_t dns_keyflags_t; +typedef uint32_t dns_iterations_t; +typedef uint16_t dns_keyflags_t; typedef struct dns_keynode dns_keynode_t; typedef ISC_LIST(dns_keynode_t) dns_keynodelist_t; typedef struct dns_keytable dns_keytable_t; -typedef isc_uint16_t dns_keytag_t; +typedef uint16_t dns_keytag_t; typedef struct dns_loadctx dns_loadctx_t; typedef struct dns_loadmgr dns_loadmgr_t; typedef struct dns_masterrawheader dns_masterrawheader_t; -typedef isc_uint64_t dns_masterstyle_flags_t; +typedef uint64_t dns_masterstyle_flags_t; typedef struct dns_message dns_message_t; -typedef isc_uint16_t dns_messageid_t; +typedef uint16_t dns_messageid_t; typedef isc_region_t dns_label_t; typedef struct dns_lookup dns_lookup_t; typedef struct dns_name dns_name_t; typedef ISC_LIST(dns_name_t) dns_namelist_t; typedef struct dns_nta dns_nta_t; typedef struct dns_ntatable dns_ntatable_t; -typedef isc_uint16_t dns_opcode_t; +typedef uint16_t dns_opcode_t; typedef unsigned char dns_offsets_t[128]; typedef struct dns_order dns_order_t; typedef struct dns_peer dns_peer_t; typedef struct dns_peerlist dns_peerlist_t; typedef struct dns_portlist dns_portlist_t; typedef struct dns_rbt dns_rbt_t; -typedef isc_uint16_t dns_rcode_t; +typedef uint16_t dns_rcode_t; typedef struct dns_rdata dns_rdata_t; typedef struct dns_rdatacallbacks dns_rdatacallbacks_t; -typedef isc_uint16_t dns_rdataclass_t; +typedef uint16_t dns_rdataclass_t; typedef struct dns_rdatalist dns_rdatalist_t; typedef struct dns_rdataset dns_rdataset_t; typedef ISC_LIST(dns_rdataset_t) dns_rdatasetlist_t; typedef struct dns_rdatasetiter dns_rdatasetiter_t; -typedef isc_uint16_t dns_rdatatype_t; +typedef uint16_t dns_rdatatype_t; typedef struct dns_request dns_request_t; typedef struct dns_requestmgr dns_requestmgr_t; typedef struct dns_resolver dns_resolver_t; typedef struct dns_sdbimplementation dns_sdbimplementation_t; -typedef isc_uint8_t dns_secalg_t; -typedef isc_uint8_t dns_secproto_t; +typedef uint8_t dns_secalg_t; +typedef uint8_t dns_secproto_t; typedef struct dns_signature dns_signature_t; typedef struct dns_sortlist_arg dns_sortlist_arg_t; typedef struct dns_ssurule dns_ssurule_t; typedef struct dns_ssutable dns_ssutable_t; typedef struct dns_stats dns_stats_t; -typedef isc_uint32_t dns_rdatastatstype_t; +typedef uint32_t dns_rdatastatstype_t; typedef struct dns_tkeyctx dns_tkeyctx_t; -typedef isc_uint16_t dns_trust_t; +typedef uint16_t dns_trust_t; typedef struct dns_tsec dns_tsec_t; typedef struct dns_tsig_keyring dns_tsig_keyring_t; typedef struct dns_tsigkey dns_tsigkey_t; -typedef isc_uint32_t dns_ttl_t; +typedef uint32_t dns_ttl_t; typedef struct dns_update_state dns_update_state_t; typedef struct dns_validator dns_validator_t; typedef struct dns_view dns_view_t; diff --git a/lib/dns/include/dns/update.h b/lib/dns/include/dns/update.h index 3a07ac982d..6700c8f2d1 100644 --- a/lib/dns/include/dns/update.h +++ b/lib/dns/include/dns/update.h @@ -19,6 +19,8 @@ *** Imports ***/ +#include + #include #include @@ -36,8 +38,8 @@ ISC_LANG_BEGINDECLS *** Functions ***/ -isc_uint32_t -dns_update_soaserial(isc_uint32_t serial, dns_updatemethod_t method); +uint32_t +dns_update_soaserial(uint32_t serial, dns_updatemethod_t method); /*%< * Return the next serial number after 'serial', depending on the * update method 'method': @@ -51,12 +53,12 @@ dns_update_soaserial(isc_uint32_t serial, dns_updatemethod_t method); isc_result_t dns_update_signatures(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *oldver, dns_dbversion_t *newver, - dns_diff_t *diff, isc_uint32_t sigvalidityinterval); + dns_diff_t *diff, uint32_t sigvalidityinterval); isc_result_t dns_update_signaturesinc(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *oldver, dns_dbversion_t *newver, - dns_diff_t *diff, isc_uint32_t sigvalidityinterval, + dns_diff_t *diff, uint32_t sigvalidityinterval, dns_update_state_t **state); ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h index 3ec8aba42f..cac1074312 100644 --- a/lib/dns/include/dns/view.h +++ b/lib/dns/include/dns/view.h @@ -53,6 +53,7 @@ */ #include +#include #include #include @@ -152,8 +153,8 @@ struct dns_view { isc_boolean_t sendcookie; dns_ttl_t maxcachettl; dns_ttl_t maxncachettl; - isc_uint32_t nta_lifetime; - isc_uint32_t nta_recheck; + uint32_t nta_lifetime; + uint32_t nta_recheck; char *nta_file; dns_ttl_t prefetch_trigger; dns_ttl_t prefetch_eligible; @@ -167,12 +168,12 @@ struct dns_view { isc_boolean_t checknames; dns_name_t * dlv; dns_fixedname_t dlv_fixed; - isc_uint16_t maxudp; + uint16_t maxudp; dns_ttl_t staleanswerttl; dns_stale_answer_t staleanswersok; /* rndc setting */ isc_boolean_t staleanswersenable; /* named.conf setting */ - isc_uint16_t nocookieudp; - isc_uint16_t padding; + uint16_t nocookieudp; + uint16_t padding; dns_acl_t * pad_acl; unsigned int maxbits; dns_aaaa_t v4_aaaa; @@ -184,7 +185,7 @@ struct dns_view { dns_catz_zones_t *catzs; dns_dlzdblist_t dlz_searched; dns_dlzdblist_t dlz_unsearched; - isc_uint32_t fail_ttl; + uint32_t fail_ttl; dns_badcache_t *failcache; /* @@ -223,7 +224,7 @@ struct dns_view { char * new_zone_file; char * new_zone_db; void * new_zone_dbenv; - isc_uint64_t new_zone_mapsize; + uint64_t new_zone_mapsize; void * new_zone_config; void (*cfg_destroy)(void **); isc_mutex_t new_zone_lock; @@ -1232,7 +1233,7 @@ dns_view_untrust(dns_view_t *view, const dns_name_t *keyname, isc_result_t dns_view_setnewzones(dns_view_t *view, isc_boolean_t allow, void *cfgctx, - void (*cfg_destroy)(void **), isc_uint64_t mapsize); + void (*cfg_destroy)(void **), uint64_t mapsize); /*%< * Set whether or not to allow zones to be created or deleted at runtime. * @@ -1294,7 +1295,7 @@ dns_view_searchdlz(dns_view_t *view, const dns_name_t *name, * \li 'dbp' is not NULL and *dbp is NULL. */ -isc_uint32_t +uint32_t dns_view_getfailttl(dns_view_t *view); /*%< * Get the view's servfail-ttl. zero => no servfail caching. @@ -1304,7 +1305,7 @@ dns_view_getfailttl(dns_view_t *view); */ void -dns_view_setfailttl(dns_view_t *view, isc_uint32_t failttl); +dns_view_setfailttl(dns_view_t *view, uint32_t failttl); /*%< * Set the view's servfail-ttl. zero => no servfail caching. * diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h index fe61e78a87..fd2c4ee780 100644 --- a/lib/dns/include/dns/zone.h +++ b/lib/dns/include/dns/zone.h @@ -19,6 +19,7 @@ ***/ #include +#include #include #include @@ -165,7 +166,7 @@ dns_zone_getclass(dns_zone_t *zone); */ isc_result_t -dns_zone_getserial(dns_zone_t *zone, isc_uint32_t *serialp); +dns_zone_getserial(dns_zone_t *zone, uint32_t *serialp); /*%< * Returns the current serial number of the zone. On success, the SOA * serial of the zone will be copied into '*serialp'. @@ -286,7 +287,7 @@ dns_zone_getfile(dns_zone_t *zone); */ void -dns_zone_setmaxrecords(dns_zone_t *zone, isc_uint32_t records); +dns_zone_setmaxrecords(dns_zone_t *zone, uint32_t records); /*%< * Sets the maximim number of records permitted in a zone. * 0 implies unlimited. @@ -298,7 +299,7 @@ dns_zone_setmaxrecords(dns_zone_t *zone, isc_uint32_t records); *\li void */ -isc_uint32_t +uint32_t dns_zone_getmaxrecords(dns_zone_t *zone); /*%< * Gets the maximim number of records permitted in a zone. @@ -308,11 +309,11 @@ dns_zone_getmaxrecords(dns_zone_t *zone); *\li 'zone' to be valid initialised zone. * * Returns: - *\li isc_uint32_t maxrecords. + *\li uint32_t maxrecords. */ void -dns_zone_setmaxttl(dns_zone_t *zone, isc_uint32_t maxttl); +dns_zone_setmaxttl(dns_zone_t *zone, uint32_t maxttl); /*%< * Sets the max ttl of the zone. * @@ -571,7 +572,7 @@ dns_zone_dump(dns_zone_t *zone); isc_result_t dns_zone_dumptostream(dns_zone_t *zone, FILE *fd, dns_masterformat_t format, const dns_master_style_t *style, - const isc_uint32_t rawversion); + const uint32_t rawversion); /*%< * Write the zone to stream 'fd' in the specified 'format'. * If the 'format' is dns_masterformat_text (RFC1035), 'style' also @@ -605,12 +606,12 @@ dns_zone_maintenance(dns_zone_t *zone); isc_result_t dns_zone_setmasters(dns_zone_t *zone, const isc_sockaddr_t *masters, - isc_uint32_t count); + uint32_t count); isc_result_t dns_zone_setmasterswithkeys(dns_zone_t *zone, const isc_sockaddr_t *masters, dns_name_t **keynames, - isc_uint32_t count); + uint32_t count); /*%< * Set the list of master servers for the zone. * @@ -633,14 +634,14 @@ dns_zone_setmasterswithkeys(dns_zone_t *zone, isc_result_t dns_zone_setalsonotify(dns_zone_t *zone, const isc_sockaddr_t *notify, - isc_uint32_t count); + uint32_t count); isc_result_t dns_zone_setalsonotifywithkeys(dns_zone_t *zone, const isc_sockaddr_t *notify, - dns_name_t **keynames, isc_uint32_t count); + dns_name_t **keynames, uint32_t count); isc_result_t dns_zone_setalsonotifydscpkeys(dns_zone_t *zone, const isc_sockaddr_t *notify, const isc_dscp_t *dscps, dns_name_t **keynames, - isc_uint32_t count); + uint32_t count); /*%< * Set the list of additional servers to be notified when * a zone changes. To clear the list use 'count = 0'. @@ -707,7 +708,7 @@ dns_zone_getkeyopts(dns_zone_t *zone); */ void -dns_zone_setminrefreshtime(dns_zone_t *zone, isc_uint32_t val); +dns_zone_setminrefreshtime(dns_zone_t *zone, uint32_t val); /*%< * Set the minimum refresh time. * @@ -717,7 +718,7 @@ dns_zone_setminrefreshtime(dns_zone_t *zone, isc_uint32_t val); */ void -dns_zone_setmaxrefreshtime(dns_zone_t *zone, isc_uint32_t val); +dns_zone_setmaxrefreshtime(dns_zone_t *zone, uint32_t val); /*%< * Set the maximum refresh time. * @@ -727,7 +728,7 @@ dns_zone_setmaxrefreshtime(dns_zone_t *zone, isc_uint32_t val); */ void -dns_zone_setminretrytime(dns_zone_t *zone, isc_uint32_t val); +dns_zone_setminretrytime(dns_zone_t *zone, uint32_t val); /*%< * Set the minimum retry time. * @@ -737,7 +738,7 @@ dns_zone_setminretrytime(dns_zone_t *zone, isc_uint32_t val); */ void -dns_zone_setmaxretrytime(dns_zone_t *zone, isc_uint32_t val); +dns_zone_setmaxretrytime(dns_zone_t *zone, uint32_t val); /*%< * Set the maximum retry time. * @@ -1180,7 +1181,7 @@ dns_zone_getchecknames(dns_zone_t *zone); */ void -dns_zone_setjournalsize(dns_zone_t *zone, isc_int32_t size); +dns_zone_setjournalsize(dns_zone_t *zone, int32_t size); /*%< * Sets the journal size for the zone. * @@ -1188,7 +1189,7 @@ dns_zone_setjournalsize(dns_zone_t *zone, isc_int32_t size); *\li 'zone' to be a valid zone. */ -isc_int32_t +int32_t dns_zone_getjournalsize(dns_zone_t *zone); /*%< * Return the journal size as set with a previous call to @@ -1219,7 +1220,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, */ void -dns_zone_setmaxxfrin(dns_zone_t *zone, isc_uint32_t maxxfrin); +dns_zone_setmaxxfrin(dns_zone_t *zone, uint32_t maxxfrin); /*%< * Set the maximum time (in seconds) that a zone transfer in (AXFR/IXFR) * of this zone will use before being aborted. @@ -1228,7 +1229,7 @@ dns_zone_setmaxxfrin(dns_zone_t *zone, isc_uint32_t maxxfrin); * \li 'zone' to be valid initialised zone. */ -isc_uint32_t +uint32_t dns_zone_getmaxxfrin(dns_zone_t *zone); /*%< * Returns the maximum transfer time for this zone. This will be @@ -1240,7 +1241,7 @@ dns_zone_getmaxxfrin(dns_zone_t *zone); */ void -dns_zone_setmaxxfrout(dns_zone_t *zone, isc_uint32_t maxxfrout); +dns_zone_setmaxxfrout(dns_zone_t *zone, uint32_t maxxfrout); /*%< * Set the maximum time (in seconds) that a zone transfer out (AXFR/IXFR) * of this zone will use before being aborted. @@ -1249,7 +1250,7 @@ dns_zone_setmaxxfrout(dns_zone_t *zone, isc_uint32_t maxxfrout); * \li 'zone' to be valid initialised zone. */ -isc_uint32_t +uint32_t dns_zone_getmaxxfrout(dns_zone_t *zone); /*%< * Returns the maximum transfer time for this zone. This will be @@ -1366,7 +1367,7 @@ dns_zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump); * Others */ -isc_uint32_t +uint32_t dns_zone_getidlein(dns_zone_t *zone); /*%< * Requires: @@ -1377,7 +1378,7 @@ dns_zone_getidlein(dns_zone_t *zone); */ void -dns_zone_setidlein(dns_zone_t *zone, isc_uint32_t idlein); +dns_zone_setidlein(dns_zone_t *zone, uint32_t idlein); /*%< * \li Set the idle timeout for transfer the. * \li Zero set the default value, 1 hour. @@ -1386,7 +1387,7 @@ dns_zone_setidlein(dns_zone_t *zone, isc_uint32_t idlein); * \li 'zone' to be a valid zone. */ -isc_uint32_t +uint32_t dns_zone_getidleout(dns_zone_t *zone); /*%< * @@ -1398,7 +1399,7 @@ dns_zone_getidleout(dns_zone_t *zone); */ void -dns_zone_setidleout(dns_zone_t *zone, isc_uint32_t idleout); +dns_zone_setidleout(dns_zone_t *zone, uint32_t idleout); /*%< * \li Set the idle timeout for transfers out. * \li Zero set the default value, 1 hour. @@ -1444,7 +1445,7 @@ dns_zone_getmgr(dns_zone_t *zone); */ void -dns_zone_setsigvalidityinterval(dns_zone_t *zone, isc_uint32_t interval); +dns_zone_setsigvalidityinterval(dns_zone_t *zone, uint32_t interval); /*%< * Set the zone's general signature validity interval. This is the length * of time for which DNSSEC signatures created as a result of dynamic @@ -1454,7 +1455,7 @@ dns_zone_setsigvalidityinterval(dns_zone_t *zone, isc_uint32_t interval); * \li 'zone' to be a valid zone. */ -isc_uint32_t +uint32_t dns_zone_getsigvalidityinterval(dns_zone_t *zone); /*%< * Get the zone's general signature validity interval. @@ -1464,7 +1465,7 @@ dns_zone_getsigvalidityinterval(dns_zone_t *zone); */ void -dns_zone_setkeyvalidityinterval(dns_zone_t *zone, isc_uint32_t interval); +dns_zone_setkeyvalidityinterval(dns_zone_t *zone, uint32_t interval); /*%< * Set the zone's DNSKEY signature validity interval. This is the length * of time for which DNSSEC signatures created for DNSKEY records @@ -1480,7 +1481,7 @@ dns_zone_setkeyvalidityinterval(dns_zone_t *zone, isc_uint32_t interval); * \li 'zone' to be a valid zone. */ -isc_uint32_t +uint32_t dns_zone_getkeyvalidityinterval(dns_zone_t *zone); /*%< * Get the zone's DNSKEY signature validity interval. @@ -1490,7 +1491,7 @@ dns_zone_getkeyvalidityinterval(dns_zone_t *zone); */ void -dns_zone_setsigresigninginterval(dns_zone_t *zone, isc_uint32_t interval); +dns_zone_setsigresigninginterval(dns_zone_t *zone, uint32_t interval); /*%< * Set the zone's RRSIG re-signing interval. A dynamic zone's RRSIG's * will be re-signed 'interval' amount of time before they expire. @@ -1499,7 +1500,7 @@ dns_zone_setsigresigninginterval(dns_zone_t *zone, isc_uint32_t interval); * \li 'zone' to be a valid zone. */ -isc_uint32_t +uint32_t dns_zone_getsigresigninginterval(dns_zone_t *zone); /*%< * Get the zone's RRSIG re-signing interval. @@ -1716,7 +1717,7 @@ dns_zonemgr_releasezone(dns_zonemgr_t *zmgr, dns_zone_t *zone); */ void -dns_zonemgr_settransfersin(dns_zonemgr_t *zmgr, isc_uint32_t value); +dns_zonemgr_settransfersin(dns_zonemgr_t *zmgr, uint32_t value); /*%< * Set the maximum number of simultaneous transfers in allowed by * the zone manager. @@ -1725,7 +1726,7 @@ dns_zonemgr_settransfersin(dns_zonemgr_t *zmgr, isc_uint32_t value); *\li 'zmgr' to be a valid zone manager. */ -isc_uint32_t +uint32_t dns_zonemgr_getttransfersin(dns_zonemgr_t *zmgr); /*%< * Return the maximum number of simultaneous transfers in allowed. @@ -1735,7 +1736,7 @@ dns_zonemgr_getttransfersin(dns_zonemgr_t *zmgr); */ void -dns_zonemgr_settransfersperns(dns_zonemgr_t *zmgr, isc_uint32_t value); +dns_zonemgr_settransfersperns(dns_zonemgr_t *zmgr, uint32_t value); /*%< * Set the number of zone transfers allowed per nameserver. * @@ -1743,7 +1744,7 @@ dns_zonemgr_settransfersperns(dns_zonemgr_t *zmgr, isc_uint32_t value); *\li 'zmgr' to be a valid zone manager */ -isc_uint32_t +uint32_t dns_zonemgr_getttransfersperns(dns_zonemgr_t *zmgr); /*%< * Return the number of transfers allowed per nameserver. @@ -1753,7 +1754,7 @@ dns_zonemgr_getttransfersperns(dns_zonemgr_t *zmgr); */ void -dns_zonemgr_setiolimit(dns_zonemgr_t *zmgr, isc_uint32_t iolimit); +dns_zonemgr_setiolimit(dns_zonemgr_t *zmgr, uint32_t iolimit); /*%< * Set the number of simultaneous file descriptors available for * reading and writing masterfiles. @@ -1763,7 +1764,7 @@ dns_zonemgr_setiolimit(dns_zonemgr_t *zmgr, isc_uint32_t iolimit); *\li 'iolimit' to be positive. */ -isc_uint32_t +uint32_t dns_zonemgr_getiolimit(dns_zonemgr_t *zmgr); /*%< * Get the number of simultaneous file descriptors available for @@ -1899,7 +1900,7 @@ dns_zone_setstatistics(dns_zone_t *zone, isc_boolean_t on); * This function is obsoleted by dns_zone_setrequeststats(). */ -isc_uint64_t * +uint64_t * dns_zone_getstatscounters(dns_zone_t *zone); /*%< * This function is obsoleted by dns_zone_getrequeststats(). @@ -2063,7 +2064,7 @@ dns_zone_setcheckns(dns_zone_t *zone, dns_checknsfunc_t checkns); */ void -dns_zone_setnotifydelay(dns_zone_t *zone, isc_uint32_t delay); +dns_zone_setnotifydelay(dns_zone_t *zone, uint32_t delay); /*%< * Set the minimum delay between sets of notify messages. * @@ -2071,7 +2072,7 @@ dns_zone_setnotifydelay(dns_zone_t *zone, isc_uint32_t delay); * 'zone' to be valid. */ -isc_uint32_t +uint32_t dns_zone_getnotifydelay(dns_zone_t *zone); /*%< * Get the minimum delay between sets of notify messages. @@ -2096,18 +2097,18 @@ dns_zone_setisself(dns_zone_t *zone, dns_isselffunc_t isself, void *arg); */ void -dns_zone_setnodes(dns_zone_t *zone, isc_uint32_t nodes); +dns_zone_setnodes(dns_zone_t *zone, uint32_t nodes); /*%< * Set the number of nodes that will be checked per quantum. */ void -dns_zone_setsignatures(dns_zone_t *zone, isc_uint32_t signatures); +dns_zone_setsignatures(dns_zone_t *zone, uint32_t signatures); /*%< * Set the number of signatures that will be generated per quantum. */ -isc_uint32_t +uint32_t dns_zone_getsignatures(dns_zone_t *zone); /*%< * Get the number of signatures that will be generated per quantum. @@ -2115,7 +2116,7 @@ dns_zone_getsignatures(dns_zone_t *zone); isc_result_t dns_zone_signwithkey(dns_zone_t *zone, dns_secalg_t algorithm, - isc_uint16_t keyid, isc_boolean_t deleteit); + uint16_t keyid, isc_boolean_t deleteit); /*%< * Initiate/resume signing of the entire zone with the zone DNSKEY(s) * that match the given algorithm and keyid. @@ -2246,7 +2247,7 @@ dns_zone_isdynamic(dns_zone_t *zone, isc_boolean_t ignore_freeze); */ isc_result_t -dns_zone_setrefreshkeyinterval(dns_zone_t *zone, isc_uint32_t interval); +dns_zone_setrefreshkeyinterval(dns_zone_t *zone, uint32_t interval); /*% * Sets the frequency, in minutes, with which the key repository will be * checked to see if the keys for this zone have been updated. Any value @@ -2327,8 +2328,8 @@ isc_result_t dns_zone_keydone(dns_zone_t *zone, const char *data); isc_result_t -dns_zone_setnsec3param(dns_zone_t *zone, isc_uint8_t hash, isc_uint8_t flags, - isc_uint16_t iter, isc_uint8_t saltlen, +dns_zone_setnsec3param(dns_zone_t *zone, uint8_t hash, uint8_t flags, + uint16_t iter, uint8_t saltlen, unsigned char *salt, isc_boolean_t replace); /*% * Set the NSEC3 parameters for the zone. @@ -2461,7 +2462,7 @@ dns_zone_getstatlevel(dns_zone_t *zone); */ isc_result_t -dns_zone_setserial(dns_zone_t *zone, isc_uint32_t serial); +dns_zone_setserial(dns_zone_t *zone, uint32_t serial); /*% * Set the zone's serial to 'serial'. */ diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h index a503f1e4bc..02b7e5d4a9 100644 --- a/lib/dns/include/dst/dst.h +++ b/lib/dns/include/dst/dst.h @@ -14,6 +14,8 @@ /*! \file dst/dst.h */ +#include + #include #include @@ -675,7 +677,7 @@ dst_key_proto(const dst_key_t *key); unsigned int dst_key_alg(const dst_key_t *key); -isc_uint32_t +uint32_t dst_key_flags(const dst_key_t *key); dns_keytag_t @@ -747,9 +749,9 @@ dst_key_secretsize(const dst_key_t *key, unsigned int *n); *\li "n" stores the size of a generated shared secret */ -isc_uint16_t +uint16_t dst_region_computeid(const isc_region_t *source, unsigned int alg); -isc_uint16_t +uint16_t dst_region_computerid(const isc_region_t *source, unsigned int alg); /*%< * Computes the (revoked) key id of the key stored in the provided @@ -762,7 +764,7 @@ dst_region_computerid(const isc_region_t *source, unsigned int alg); *\li the key id */ -isc_uint16_t +uint16_t dst_key_getbits(const dst_key_t *key); /*%< * Get the number of digest bits required (0 == MAX). @@ -772,7 +774,7 @@ dst_key_getbits(const dst_key_t *key); */ void -dst_key_setbits(dst_key_t *key, isc_uint16_t bits); +dst_key_setbits(dst_key_t *key, uint16_t bits); /*%< * Set the number of digest bits required (0 == MAX). * @@ -801,7 +803,7 @@ dst_key_getttl(const dst_key_t *key); */ isc_result_t -dst_key_setflags(dst_key_t *key, isc_uint32_t flags); +dst_key_setflags(dst_key_t *key, uint32_t flags); /* * Set the key flags, and recompute the key ID. * @@ -810,7 +812,7 @@ dst_key_setflags(dst_key_t *key, isc_uint32_t flags); */ isc_result_t -dst_key_getnum(const dst_key_t *key, int type, isc_uint32_t *valuep); +dst_key_getnum(const dst_key_t *key, int type, uint32_t *valuep); /*%< * Get a member of the numeric metadata array and place it in '*valuep'. * @@ -821,7 +823,7 @@ dst_key_getnum(const dst_key_t *key, int type, isc_uint32_t *valuep); */ void -dst_key_setnum(dst_key_t *key, int type, isc_uint32_t value); +dst_key_setnum(dst_key_t *key, int type, uint32_t value); /*%< * Set a member of the numeric metadata array. * diff --git a/lib/dns/include/dst/gssapi.h b/lib/dns/include/dst/gssapi.h index 084607046a..059ffbf196 100644 --- a/lib/dns/include/dst/gssapi.h +++ b/lib/dns/include/dst/gssapi.h @@ -15,6 +15,8 @@ /*! \file dst/gssapi.h */ +#include + #include #include #include @@ -169,7 +171,7 @@ ISC_FORMAT_PRINTF(2, 3); */ char * -gss_error_tostring(isc_uint32_t major, isc_uint32_t minor, +gss_error_tostring(uint32_t major, uint32_t minor, char *buf, size_t buflen); /* * Render a GSS major status/minor status pair into a string diff --git a/lib/dns/ipkeylist.c b/lib/dns/ipkeylist.c index 7ae8e3670f..4f114e5d90 100644 --- a/lib/dns/ipkeylist.c +++ b/lib/dns/ipkeylist.c @@ -11,6 +11,7 @@ #include +#include #include #include @@ -32,7 +33,7 @@ dns_ipkeylist_init(dns_ipkeylist_t *ipkl) { void dns_ipkeylist_clear(isc_mem_t *mctx, dns_ipkeylist_t *ipkl) { - isc_uint32_t i; + uint32_t i; REQUIRE(ipkl != NULL); @@ -79,7 +80,7 @@ dns_ipkeylist_copy(isc_mem_t *mctx, const dns_ipkeylist_t *src, dns_ipkeylist_t *dst) { isc_result_t result = ISC_R_SUCCESS; - isc_uint32_t i; + uint32_t i; REQUIRE(dst != NULL); /* dst might be preallocated, we don't care, but it must be empty */ diff --git a/lib/dns/iptable.c b/lib/dns/iptable.c index ec0c2229d0..93013bdde1 100644 --- a/lib/dns/iptable.c +++ b/lib/dns/iptable.c @@ -11,6 +11,8 @@ #include +#include + #include #include #include @@ -56,7 +58,7 @@ static isc_boolean_t dns_iptable_pos = ISC_TRUE; */ isc_result_t dns_iptable_addprefix(dns_iptable_t *tab, const isc_netaddr_t *addr, - isc_uint16_t bitlen, isc_boolean_t pos) + uint16_t bitlen, isc_boolean_t pos) { isc_result_t result; isc_prefix_t pfx; diff --git a/lib/dns/journal.c b/lib/dns/journal.c index 409b3957a8..c85785b236 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -11,6 +11,7 @@ #include +#include #include #include #include @@ -102,7 +103,7 @@ static isc_result_t index_to_disk(dns_journal_t *); -static inline isc_uint32_t +static inline uint32_t decode_uint32(unsigned char *p) { return ((p[0] << 24) + (p[1] << 16) + @@ -111,11 +112,11 @@ decode_uint32(unsigned char *p) { } static inline void -encode_uint32(isc_uint32_t val, unsigned char *p) { - p[0] = (isc_uint8_t)(val >> 24); - p[1] = (isc_uint8_t)(val >> 16); - p[2] = (isc_uint8_t)(val >> 8); - p[3] = (isc_uint8_t)(val >> 0); +encode_uint32(uint32_t val, unsigned char *p) { + p[0] = (uint8_t)(val >> 24); + p[1] = (uint8_t)(val >> 16); + p[2] = (uint8_t)(val >> 8); + p[3] = (uint8_t)(val >> 0); } isc_result_t @@ -235,7 +236,7 @@ typedef struct { * The in-core representation of the journal header. */ typedef struct { - isc_uint32_t serial; + uint32_t serial; isc_offset_t offset; } journal_pos_t; @@ -246,8 +247,8 @@ typedef struct { unsigned char format[16]; journal_pos_t begin; journal_pos_t end; - isc_uint32_t index_size; - isc_uint32_t sourceserial; + uint32_t index_size; + uint32_t sourceserial; isc_boolean_t serialset; } journal_header_t; @@ -256,16 +257,16 @@ typedef struct { */ typedef struct { - isc_uint32_t size; - isc_uint32_t serial0; - isc_uint32_t serial1; + uint32_t size; + uint32_t serial0; + uint32_t serial1; } journal_xhdr_t; /*% * The in-core representation of the RR header. */ typedef struct { - isc_uint32_t size; + uint32_t size; } journal_rrhdr_t; @@ -316,13 +317,13 @@ struct dns_journal { journal_pos_t bpos; /*%< Position before first, */ journal_pos_t epos; /*%< and after last transaction */ /* The rest is iterator state. */ - isc_uint32_t current_serial; /*%< Current SOA serial */ + uint32_t current_serial; /*%< Current SOA serial */ isc_buffer_t source; /*%< Data from disk */ isc_buffer_t target; /*%< Data from _fromwire check */ dns_decompress_t dctx; /*%< Dummy decompression ctx */ dns_name_t name; /*%< Current domain name */ dns_rdata_t rdata; /*%< Current rdata */ - isc_uint32_t ttl; /*%< Current TTL */ + uint32_t ttl; /*%< Current TTL */ unsigned int xsize; /*%< Size of transaction data */ unsigned int xpos; /*%< Current position in it */ isc_result_t result; /*%< Result of last call */ @@ -375,7 +376,7 @@ journal_header_encode(journal_header_t *cooked, journal_rawheader_t *raw) { * Journal file I/O subroutines, with error checking and reporting. */ static isc_result_t -journal_seek(dns_journal_t *j, isc_uint32_t offset) { +journal_seek(dns_journal_t *j, uint32_t offset) { isc_result_t result; result = isc_stdio_seek(j->fp, (off_t)offset, SEEK_SET); @@ -459,8 +460,8 @@ journal_read_xhdr(dns_journal_t *j, journal_xhdr_t *xhdr) { } static isc_result_t -journal_write_xhdr(dns_journal_t *j, isc_uint32_t size, - isc_uint32_t serial0, isc_uint32_t serial1) +journal_write_xhdr(dns_journal_t *j, uint32_t size, + uint32_t serial0, uint32_t serial1) { journal_rawxhdr_t raw; encode_uint32(size, raw.size); @@ -840,7 +841,7 @@ journal_next(dns_journal_t *j, journal_pos_t *pos) { * but not greater than 'serial'. */ static void -index_find(dns_journal_t *j, isc_uint32_t serial, journal_pos_t *best_guess) { +index_find(dns_journal_t *j, uint32_t serial, journal_pos_t *best_guess) { unsigned int i; if (j->index == NULL) return; @@ -901,7 +902,7 @@ index_add(dns_journal_t *j, journal_pos_t *pos) { * ambiguous when a new transaction with number 'serial' is added. */ static void -index_invalidate(dns_journal_t *j, isc_uint32_t serial) { +index_invalidate(dns_journal_t *j, uint32_t serial) { unsigned int i; if (j->index == NULL) return; @@ -931,7 +932,7 @@ index_invalidate(dns_journal_t *j, isc_uint32_t serial) { * */ static isc_result_t -journal_find(dns_journal_t *j, isc_uint32_t serial, journal_pos_t *pos) { +journal_find(dns_journal_t *j, uint32_t serial, journal_pos_t *pos) { isc_result_t result; journal_pos_t current_pos; REQUIRE(DNS_JOURNAL_VALID(j)); @@ -961,7 +962,7 @@ journal_find(dns_journal_t *j, isc_uint32_t serial, journal_pos_t *pos) { isc_result_t dns_journal_begin_transaction(dns_journal_t *j) { - isc_uint32_t offset; + uint32_t offset; isc_result_t result; journal_rawxhdr_t hdr; @@ -1005,7 +1006,7 @@ dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) { dns_difftuple_t *t; isc_buffer_t buffer; void *mem = NULL; - isc_uint64_t size; + uint64_t size; isc_result_t result; isc_region_t used; @@ -1038,7 +1039,7 @@ dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) { if (size >= DNS_JOURNAL_SIZE_MAX) { isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR, "dns_journal_writediff: %s: journal entry " - "too big to be stored: %llu bytes", j->filename, + "too big to be stored: %" PRIu64 " bytes", j->filename, size); return (ISC_R_NOSPACE); } @@ -1068,7 +1069,7 @@ dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) { isc_buffer_putuint16(&buffer, t->rdata.rdclass); isc_buffer_putuint32(&buffer, t->ttl); INSIST(t->rdata.length < 65536); - isc_buffer_putuint16(&buffer, (isc_uint16_t)t->rdata.length); + isc_buffer_putuint16(&buffer, (uint16_t)t->rdata.length); INSIST(isc_buffer_availablelength(&buffer) >= t->rdata.length); isc_buffer_putmem(&buffer, t->rdata.data, t->rdata.length); } @@ -1096,7 +1097,7 @@ isc_result_t dns_journal_commit(dns_journal_t *j) { isc_result_t result; journal_rawheader_t rawheader; - isc_uint64_t total; + uint64_t total; REQUIRE(DNS_JOURNAL_VALID(j)); REQUIRE(j->state == JOURNAL_STATE_TRANSACTION || @@ -1150,8 +1151,8 @@ dns_journal_commit(dns_journal_t *j) { if (total >= DNS_JOURNAL_SIZE_MAX) { isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR, "transaction too big to be stored in journal: " - "%llub (max is %llub)", total, - (isc_uint64_t)DNS_JOURNAL_SIZE_MAX); + "%" PRIu64 "b (max is %" PRIu64 "b)", total, + (uint64_t)DNS_JOURNAL_SIZE_MAX); return (ISC_R_UNEXPECTED); } @@ -1278,8 +1279,8 @@ static isc_result_t roll_forward(dns_journal_t *j, dns_db_t *db, unsigned int options) { isc_buffer_t source; /* Transaction data from disk */ isc_buffer_t target; /* Ditto after _fromwire check */ - isc_uint32_t db_serial; /* Database SOA serial */ - isc_uint32_t end_serial; /* Last journal SOA serial */ + uint32_t db_serial; /* Database SOA serial */ + uint32_t end_serial; /* Last journal SOA serial */ isc_result_t result; dns_dbversion_t *ver = NULL; journal_pos_t pos; @@ -1336,7 +1337,7 @@ roll_forward(dns_journal_t *j, dns_db_t *db, unsigned int options) { result = dns_journal_next_rr(j)) { dns_name_t *name; - isc_uint32_t ttl; + uint32_t ttl; dns_rdata_t *rdata; dns_difftuple_t *tuple = NULL; @@ -1442,8 +1443,8 @@ dns_journal_print(isc_mem_t *mctx, const char *filename, FILE *file) { dns_journal_t *j; isc_buffer_t source; /* Transaction data from disk */ isc_buffer_t target; /* Ditto after _fromwire check */ - isc_uint32_t start_serial; /* Database SOA serial */ - isc_uint32_t end_serial; /* Last journal SOA serial */ + uint32_t start_serial; /* Database SOA serial */ + uint32_t end_serial; /* Last journal SOA serial */ isc_result_t result; dns_diff_t diff; unsigned int n_soa = 0; @@ -1487,7 +1488,7 @@ dns_journal_print(isc_mem_t *mctx, const char *filename, FILE *file) { result = dns_journal_next_rr(j)) { dns_name_t *name; - isc_uint32_t ttl; + uint32_t ttl; dns_rdata_t *rdata; dns_difftuple_t *tuple = NULL; @@ -1554,18 +1555,18 @@ dns_journal_empty(dns_journal_t *j) { return (JOURNAL_EMPTY(&j->header)); } -isc_uint32_t +uint32_t dns_journal_first_serial(dns_journal_t *j) { return (j->header.begin.serial); } -isc_uint32_t +uint32_t dns_journal_last_serial(dns_journal_t *j) { return (j->header.end.serial); } void -dns_journal_set_sourceserial(dns_journal_t *j, isc_uint32_t sourceserial) { +dns_journal_set_sourceserial(dns_journal_t *j, uint32_t sourceserial) { REQUIRE(j->state == JOURNAL_STATE_WRITE || j->state == JOURNAL_STATE_INLINE || @@ -1578,7 +1579,7 @@ dns_journal_set_sourceserial(dns_journal_t *j, isc_uint32_t sourceserial) { } isc_boolean_t -dns_journal_get_sourceserial(dns_journal_t *j, isc_uint32_t *sourceserial) { +dns_journal_get_sourceserial(dns_journal_t *j, uint32_t *sourceserial) { REQUIRE(sourceserial != NULL); if (!j->header.serialset) @@ -1627,7 +1628,7 @@ size_buffer(isc_mem_t *mctx, isc_buffer_t *b, unsigned size) { isc_result_t dns_journal_iter_init(dns_journal_t *j, - isc_uint32_t begin_serial, isc_uint32_t end_serial) + uint32_t begin_serial, uint32_t end_serial) { isc_result_t result; @@ -1671,7 +1672,7 @@ read_one_rr(dns_journal_t *j) { dns_rdatatype_t rdtype; dns_rdataclass_t rdclass; unsigned int rdlen; - isc_uint32_t ttl; + uint32_t ttl; journal_xhdr_t xhdr; journal_rrhdr_t rrhdr; @@ -1789,7 +1790,7 @@ dns_journal_next_rr(dns_journal_t *j) { } void -dns_journal_current_rr(dns_journal_t *j, dns_name_t **name, isc_uint32_t *ttl, +dns_journal_current_rr(dns_journal_t *j, dns_name_t **name, uint32_t *ttl, dns_rdata_t **rdata) { REQUIRE(j->it.result == ISC_R_SUCCESS); @@ -2103,8 +2104,8 @@ dns_db_diffx(dns_diff_t *diff, dns_db_t *dba, dns_dbversion_t *dbvera, } isc_result_t -dns_journal_compact(isc_mem_t *mctx, char *filename, isc_uint32_t serial, - isc_uint32_t target_size) +dns_journal_compact(isc_mem_t *mctx, char *filename, uint32_t serial, + uint32_t target_size) { unsigned int i; journal_pos_t best_guess; @@ -2169,7 +2170,7 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, isc_uint32_t serial, /* * See if there is any work to do. */ - if ((isc_uint32_t) j1->header.end.offset < target_size) { + if ((uint32_t) j1->header.end.offset < target_size) { dns_journal_destroy(&j1); return (ISC_R_SUCCESS); } @@ -2189,7 +2190,7 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, isc_uint32_t serial, for (i = 0; i < j1->header.index_size; i++) { if (POS_VALID(j1->index[i]) && DNS_SERIAL_GE(serial, j1->index[i].serial) && - ((isc_uint32_t)(j1->header.end.offset - j1->index[i].offset) + ((uint32_t)(j1->header.end.offset - j1->index[i].offset) >= target_size / 2) && j1->index[i].offset > best_guess.offset) best_guess = j1->index[i]; @@ -2202,7 +2203,7 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, isc_uint32_t serial, break; if (DNS_SERIAL_GE(serial, current_pos.serial) && - ((isc_uint32_t)(j1->header.end.offset - current_pos.offset) + ((uint32_t)(j1->header.end.offset - current_pos.offset) >= (target_size / 2)) && current_pos.offset > best_guess.offset) best_guess = current_pos; diff --git a/lib/dns/key.c b/lib/dns/key.c index a4d4ea2e1a..2e664a3679 100644 --- a/lib/dns/key.c +++ b/lib/dns/key.c @@ -13,6 +13,7 @@ #include #include +#include #include #include @@ -24,9 +25,9 @@ #include "dst_internal.h" -isc_uint16_t +uint16_t dst_region_computeid(const isc_region_t *source, unsigned int alg) { - isc_uint32_t ac; + uint32_t ac; const unsigned char *p; int size; @@ -46,12 +47,12 @@ dst_region_computeid(const isc_region_t *source, unsigned int alg) { ac += ((*p) << 8); ac += (ac >> 16) & 0xffff; - return ((isc_uint16_t)(ac & 0xffff)); + return ((uint16_t)(ac & 0xffff)); } -isc_uint16_t +uint16_t dst_region_computerid(const isc_region_t *source, unsigned int alg) { - isc_uint32_t ac; + uint32_t ac; const unsigned char *p; int size; @@ -73,7 +74,7 @@ dst_region_computerid(const isc_region_t *source, unsigned int alg) { ac += ((*p) << 8); ac += (ac >> 16) & 0xffff; - return ((isc_uint16_t)(ac & 0xffff)); + return ((uint16_t)(ac & 0xffff)); } dns_name_t * @@ -100,7 +101,7 @@ dst_key_alg(const dst_key_t *key) { return (key->key_alg); } -isc_uint32_t +uint32_t dst_key_flags(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); return (key->key_flags); @@ -153,7 +154,7 @@ dst_key_isnullkey(const dst_key_t *key) { } void -dst_key_setbits(dst_key_t *key, isc_uint16_t bits) { +dst_key_setbits(dst_key_t *key, uint16_t bits) { unsigned int maxbits; REQUIRE(VALID_KEY(key)); if (bits != 0) { @@ -164,7 +165,7 @@ dst_key_setbits(dst_key_t *key, isc_uint16_t bits) { key->key_bits = bits; } -isc_uint16_t +uint16_t dst_key_getbits(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); return (key->key_bits); diff --git a/lib/dns/keydata.c b/lib/dns/keydata.c index 3a36772e93..135d9680df 100644 --- a/lib/dns/keydata.c +++ b/lib/dns/keydata.c @@ -14,6 +14,7 @@ #include +#include #include #include @@ -54,8 +55,8 @@ dns_keydata_todnskey(dns_rdata_keydata_t *keydata, isc_result_t dns_keydata_fromdnskey(dns_rdata_keydata_t *keydata, dns_rdata_dnskey_t *dnskey, - isc_uint32_t refresh, isc_uint32_t addhd, - isc_uint32_t removehd, isc_mem_t *mctx) + uint32_t refresh, uint32_t addhd, + uint32_t removehd, isc_mem_t *mctx) { REQUIRE(keydata != NULL && dnskey != NULL); diff --git a/lib/dns/master.c b/lib/dns/master.c index e446d8133e..23314330ff 100644 --- a/lib/dns/master.c +++ b/lib/dns/master.c @@ -13,6 +13,8 @@ #include +#include + #include #include #include @@ -109,7 +111,7 @@ struct dns_loadctx { isc_result_t (*load)(dns_loadctx_t *lctx); /* Members used by all formats */ - isc_uint32_t maxttl; + uint32_t maxttl; /* Members specific to the text format: */ isc_lex_t *lex; @@ -121,8 +123,8 @@ struct dns_loadctx { isc_boolean_t warn_tcr; isc_boolean_t warn_sigexpired; isc_boolean_t seen_include; - isc_uint32_t ttl; - isc_uint32_t default_ttl; + uint32_t ttl; + uint32_t default_ttl; dns_rdataclass_t zclass; dns_fixedname_t fixed_top; dns_name_t *top; /*%< top of zone */ @@ -139,9 +141,9 @@ struct dns_loadctx { isc_mutex_t lock; isc_result_t result; /* locked by lock */ - isc_uint32_t references; + uint32_t references; dns_incctx_t *inc; - isc_uint32_t resign; + uint32_t resign; isc_stdtime_t now; dns_masterincludecb_t include_cb; @@ -505,7 +507,7 @@ incctx_create(isc_mem_t *mctx, dns_name_t *origin, dns_incctx_t **ictxp) { static isc_result_t loadctx_create(dns_masterformat_t format, isc_mem_t *mctx, - unsigned int options, isc_uint32_t resign, dns_name_t *top, + unsigned int options, uint32_t resign, dns_name_t *top, dns_rdataclass_t zclass, dns_name_t *origin, dns_rdatacallbacks_t *callbacks, isc_task_t *task, dns_loaddonefunc_t done, void *done_arg, @@ -935,7 +937,7 @@ generate(dns_loadctx_t *lctx, char *range, char *lhs, char *gtype, char *rhs, static void limit_ttl(dns_rdatacallbacks_t *callbacks, const char *source, - unsigned int line, isc_uint32_t *ttlp) + unsigned int line, uint32_t *ttlp) { if (*ttlp > 0x7fffffffUL) { (callbacks->warn)(callbacks, @@ -1026,7 +1028,7 @@ static isc_result_t load_text(dns_loadctx_t *lctx) { dns_rdataclass_t rdclass; dns_rdatatype_t type, covers; - isc_uint32_t ttl_offset = 0; + uint32_t ttl_offset = 0; dns_name_t *new_name; isc_boolean_t current_has_delegation = ISC_FALSE; isc_boolean_t done = ISC_FALSE; @@ -1240,7 +1242,7 @@ load_text(dns_loadctx_t *lctx) { finish_include = ISC_TRUE; } else if (strcasecmp(DNS_AS_STR(token), "$DATE") == 0) { - isc_int64_t dump_time64; + int64_t dump_time64; isc_stdtime_t dump_time, current_time; GETTOKEN(lctx->lex, 0, &token, ISC_FALSE); isc_stdtime_get(¤t_time); @@ -2145,7 +2147,7 @@ pushfile(const char *master_file, dns_name_t *origin, dns_loadctx_t *lctx) { */ static inline isc_result_t read_and_check(isc_boolean_t do_read, isc_buffer_t *buffer, - size_t len, FILE *f, isc_uint32_t *totallen) + size_t len, FILE *f, uint32_t *totallen) { isc_result_t result; @@ -2160,7 +2162,7 @@ read_and_check(isc_boolean_t do_read, isc_buffer_t *buffer, isc_buffer_add(buffer, (unsigned int)len); if (*totallen < len) return (ISC_R_RANGE); - *totallen -= (isc_uint32_t)len; + *totallen -= (uint32_t)len; } else if (isc_buffer_remaininglength(buffer) < len) return (ISC_R_RANGE); @@ -2355,8 +2357,8 @@ load_raw(dns_loadctx_t *lctx) { (lctx->loop_cnt == 0 || loop_cnt < lctx->loop_cnt); loop_cnt++) { unsigned int i, rdcount; - isc_uint16_t namelen; - isc_uint32_t totallen; + uint16_t namelen; + uint32_t totallen; size_t minlen, readlen; isc_boolean_t sequential_read = ISC_FALSE; @@ -2380,9 +2382,9 @@ load_raw(dns_loadctx_t *lctx) { * Validation: the input data must at least contain the common * header. */ - minlen = sizeof(totallen) + sizeof(isc_uint16_t) + - sizeof(isc_uint16_t) + sizeof(isc_uint16_t) + - sizeof(isc_uint32_t) + sizeof(isc_uint32_t); + minlen = sizeof(totallen) + sizeof(uint16_t) + + sizeof(uint16_t) + sizeof(uint16_t) + + sizeof(uint32_t) + sizeof(uint32_t); if (totallen < minlen) { result = ISC_R_RANGE; goto cleanup; @@ -2417,7 +2419,7 @@ load_raw(dns_loadctx_t *lctx) { if (result != ISC_R_SUCCESS) goto cleanup; isc_buffer_add(&target, (unsigned int)readlen); - totallen -= (isc_uint32_t)readlen; + totallen -= (uint32_t)readlen; /* Construct RRset headers */ dns_rdatalist_init(&rdatalist); @@ -2486,7 +2488,7 @@ load_raw(dns_loadctx_t *lctx) { continue_read: for (i = 0; i < rdcount; i++) { - isc_uint16_t rdlen; + uint16_t rdlen; dns_rdata_init(&rdata[i]); @@ -2596,7 +2598,7 @@ load_raw(dns_loadctx_t *lctx) { isc_result_t dns_master_loadfile(const char *master_file, dns_name_t *top, dns_name_t *origin, dns_rdataclass_t zclass, - unsigned int options, isc_uint32_t resign, + unsigned int options, uint32_t resign, dns_rdatacallbacks_t *callbacks, dns_masterincludecb_t include_cb, void *include_arg, isc_mem_t *mctx, dns_masterformat_t format, @@ -2628,13 +2630,13 @@ dns_master_loadfile(const char *master_file, dns_name_t *top, isc_result_t dns_master_loadfileinc(const char *master_file, dns_name_t *top, dns_name_t *origin, dns_rdataclass_t zclass, - unsigned int options, isc_uint32_t resign, + unsigned int options, uint32_t resign, dns_rdatacallbacks_t *callbacks, isc_task_t *task, dns_loaddonefunc_t done, void *done_arg, dns_loadctx_t **lctxp, dns_masterincludecb_t include_cb, void *include_arg, isc_mem_t *mctx, dns_masterformat_t format, - isc_uint32_t maxttl) + uint32_t maxttl) { dns_loadctx_t *lctx = NULL; isc_result_t result; @@ -2965,11 +2967,11 @@ grow_rdata(int new_len, dns_rdata_t *oldlist, int old_len, return (newlist); } -static isc_uint32_t +static uint32_t resign_fromlist(dns_rdatalist_t *this, dns_loadctx_t *lctx) { dns_rdata_t *rdata; dns_rdata_rrsig_t sig; - isc_uint32_t when; + uint32_t when; rdata = ISC_LIST_HEAD(this->rdata); INSIST(rdata != NULL); diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c index e2eb61e1e9..44f685408b 100644 --- a/lib/dns/masterdump.c +++ b/lib/dns/masterdump.c @@ -13,6 +13,7 @@ #include +#include #include #include @@ -90,7 +91,7 @@ typedef struct dns_totext_ctx { dns_name_t * origin; dns_name_t * neworigin; dns_fixedname_t origin_fixname; - isc_uint32_t current_ttl; + uint32_t current_ttl; isc_boolean_t current_ttl_valid; dns_ttl_t serve_stale_ttl; } dns_totext_ctx_t; @@ -483,7 +484,7 @@ rdataset_totext(dns_rdataset_t *rdataset, isc_result_t result; unsigned int column; isc_boolean_t first = ISC_TRUE; - isc_uint32_t current_ttl; + uint32_t current_ttl; isc_boolean_t current_ttl_valid; dns_rdatatype_t type; unsigned int type_start; @@ -1052,7 +1053,7 @@ dump_rdatasets_text(isc_mem_t *mctx, const dns_name_t *name, char buf[sizeof("YYYYMMDDHHMMSS")]; memset(buf, 0, sizeof(buf)); isc_buffer_init(&b, buf, sizeof(buf) - 1); - dns_time64_totext((isc_uint64_t)rds->resign, &b); + dns_time64_totext((uint64_t)rds->resign, &b); if ((ctx->style.flags & DNS_STYLEFLAG_INDENT) != 0 || (ctx->style.flags & DNS_STYLEFLAG_YAML) != 0) { @@ -1089,8 +1090,8 @@ dump_rdataset_raw(isc_mem_t *mctx, const dns_name_t *name, dns_rdataset_t *rdataset, isc_buffer_t *buffer, FILE *f) { isc_result_t result; - isc_uint32_t totallen; - isc_uint16_t dlen; + uint32_t totallen; + uint16_t dlen; isc_region_t r, r_hdr; REQUIRE(buffer->length > 0); @@ -1123,7 +1124,7 @@ dump_rdataset_raw(isc_mem_t *mctx, const dns_name_t *name, dns_name_toregion(name, &r); INSIST(isc_buffer_availablelength(buffer) >= (sizeof(dlen) + r.length)); - dlen = (isc_uint16_t)r.length; + dlen = (uint16_t)r.length; isc_buffer_putuint16(buffer, dlen); isc_buffer_copyregion(buffer, &r); totallen += sizeof(dlen) + r.length; @@ -1134,7 +1135,7 @@ dump_rdataset_raw(isc_mem_t *mctx, const dns_name_t *name, dns_rdataset_current(rdataset, &rdata); dns_rdata_toregion(&rdata, &r); INSIST(r.length <= 0xffffU); - dlen = (isc_uint16_t)r.length; + dlen = (uint16_t)r.length; /* * Copy the rdata into the buffer. If the buffer is too small, @@ -1549,7 +1550,7 @@ writeheader(dns_dumpctx_t *dctx) { char *bufmem; isc_region_t r; dns_masterrawheader_t rawheader; - isc_uint32_t rawversion, now32; + uint32_t rawversion, now32; bufmem = isc_mem_get(dctx->mctx, initial_buffer_length); if (bufmem == NULL) @@ -1718,7 +1719,7 @@ dumptostreaminc(dns_dumpctx_t *dctx) { if (dctx->nodes != 0 && result == ISC_R_SUCCESS) { unsigned int pps = dns_pps; /* packets per second */ unsigned int interval; - isc_uint64_t usecs; + uint64_t usecs; isc_time_t end; isc_time_now(&end); diff --git a/lib/dns/message.c b/lib/dns/message.c index cb1aaa1b1e..e58f8f416d 100644 --- a/lib/dns/message.c +++ b/lib/dns/message.c @@ -17,6 +17,7 @@ #include #include +#include #include #include @@ -1664,7 +1665,7 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source, isc_region_t r; dns_decompress_t dctx; isc_result_t ret; - isc_uint16_t tmpflags; + uint16_t tmpflags; isc_buffer_t origsource; isc_boolean_t seen_problem; isc_boolean_t ignore_tc; @@ -2065,7 +2066,7 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, if (result != ISC_R_SUCCESS) { INSIST(st.used < 65536); dns_compress_rollback(msg->cctx, - (isc_uint16_t)st.used); + (uint16_t)st.used); *(msg->buffer) = st; /* rollback */ msg->buffer->length += msg->reserved; msg->counts[sectionid] += total; @@ -2165,7 +2166,7 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, if (result != ISC_R_SUCCESS) { INSIST(st.used < 65536); dns_compress_rollback(msg->cctx, - (isc_uint16_t)st.used); + (uint16_t)st.used); *(msg->buffer) = st; /* rollback */ msg->buffer->length += msg->reserved; msg->counts[sectionid] += total; @@ -2203,7 +2204,7 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, void dns_message_renderheader(dns_message_t *msg, isc_buffer_t *target) { - isc_uint16_t tmp; + uint16_t tmp; isc_region_t r; REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -2226,13 +2227,13 @@ dns_message_renderheader(dns_message_t *msg, isc_buffer_t *target) { isc_buffer_putuint16(target, tmp); isc_buffer_putuint16(target, - (isc_uint16_t)msg->counts[DNS_SECTION_QUESTION]); + (uint16_t)msg->counts[DNS_SECTION_QUESTION]); isc_buffer_putuint16(target, - (isc_uint16_t)msg->counts[DNS_SECTION_ANSWER]); + (uint16_t)msg->counts[DNS_SECTION_ANSWER]); isc_buffer_putuint16(target, - (isc_uint16_t)msg->counts[DNS_SECTION_AUTHORITY]); + (uint16_t)msg->counts[DNS_SECTION_AUTHORITY]); isc_buffer_putuint16(target, - (isc_uint16_t)msg->counts[DNS_SECTION_ADDITIONAL]); + (uint16_t)msg->counts[DNS_SECTION_ADDITIONAL]); } isc_result_t @@ -2308,7 +2309,7 @@ dns_message_renderend(dns_message_t *msg) { if (msg->padding_off > 0) { unsigned char *cp = isc_buffer_used(msg->buffer); unsigned int used, remaining; - isc_uint16_t len, padsize = 0; + uint16_t len, padsize = 0; /* Check PAD */ if ((cp[-4] != 0) || @@ -2325,7 +2326,7 @@ dns_message_renderend(dns_message_t *msg) { /* Aligned used length + reserved to padding block */ used = isc_buffer_usedlength(msg->buffer); if (msg->padding != 0) { - padsize = ((isc_uint16_t)used + msg->reserved) + padsize = ((uint16_t)used + msg->reserved) % msg->padding; } if (padsize != 0) { @@ -2341,8 +2342,8 @@ dns_message_renderend(dns_message_t *msg) { cp[-2] = (unsigned char)((padsize & 0xff00U) >> 8); cp[-1] = (unsigned char)(padsize & 0x00ffU); cp -= msg->padding_off; - len = ((isc_uint16_t)(cp[-2])) << 8; - len |= ((isc_uint16_t)(cp[-1])); + len = ((uint16_t)(cp[-2])) << 8; + len |= ((uint16_t)(cp[-1])); len += padsize; cp[-2] = (unsigned char)((len & 0xff00U) >> 8); cp[-1] = (unsigned char)(len & 0x00ffU); @@ -3429,8 +3430,8 @@ static isc_result_t render_ecs(isc_buffer_t *ecsbuf, isc_buffer_t *target) { int i; char addr[16], addr_text[64]; - isc_uint16_t family; - isc_uint8_t addrlen, addrbytes, scopelen; + uint16_t family; + uint8_t addrlen, addrbytes, scopelen; isc_result_t result; /* @@ -3497,10 +3498,10 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, const dns_name_t *name = NULL; isc_result_t result = ISC_R_SUCCESS; char buf[sizeof("1234567890")]; - isc_uint32_t mbz; + uint32_t mbz; dns_rdata_t rdata; isc_buffer_t optbuf; - isc_uint16_t optcode, optlen; + uint16_t optcode, optlen; unsigned char *optdata; unsigned int saveindent = dns_master_indent; @@ -3596,7 +3597,7 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, ADD_STRING(target, "\n"); } else if (optcode == DNS_OPT_EXPIRE) { if (optlen == 4) { - isc_uint32_t secs; + uint32_t secs; secs = isc_buffer_getuint32(&optbuf); INDENT(style); ADD_STRING(target, "EXPIRE: "); @@ -3622,7 +3623,7 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, ADD_STRING(target, "KEY-TAG"); if (optlen > 0U && (optlen % 2U) == 0U) { const char *sep = ": "; - isc_uint16_t id; + uint16_t id; while (optlen > 0U) { id = isc_buffer_getuint16(&optbuf); snprintf(buf, sizeof(buf), "%s%u", @@ -3759,10 +3760,10 @@ dns_message_pseudosectiontotext(dns_message_t *msg, const dns_name_t *name = NULL; isc_result_t result; char buf[sizeof(" (65000 bytes)")]; - isc_uint32_t mbz; + uint32_t mbz; dns_rdata_t rdata; isc_buffer_t optbuf; - isc_uint16_t optcode, optlen; + uint16_t optcode, optlen; unsigned char *optdata; REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -3849,7 +3850,7 @@ dns_message_pseudosectiontotext(dns_message_t *msg, } } else if (optcode == DNS_OPT_EXPIRE) { if (optlen == 4) { - isc_uint32_t secs; + uint32_t secs; secs = isc_buffer_getuint32(&optbuf); ADD_STRING(target, "; EXPIRE: "); snprintf(buf, sizeof(buf), "%u", secs); @@ -3891,7 +3892,7 @@ dns_message_pseudosectiontotext(dns_message_t *msg, ADD_STRING(target, "; KEY-TAG"); if (optlen > 0U && (optlen % 2U) == 0U) { const char *sep = ": "; - isc_uint16_t id; + uint16_t id; while (optlen > 0U) { id = isc_buffer_getuint16(&optbuf); snprintf(buf, sizeof(buf), "%s%u", @@ -4325,7 +4326,7 @@ logfmtpacket(dns_message_t *message, const char *description, isc_result_t dns_message_buildopt(dns_message_t *message, dns_rdataset_t **rdatasetp, - unsigned int version, isc_uint16_t udpsize, + unsigned int version, uint16_t udpsize, unsigned int flags, dns_ednsopt_t *ednsopts, size_t count) { dns_rdataset_t *rdataset = NULL; @@ -4442,7 +4443,7 @@ dns_message_setclass(dns_message_t *msg, dns_rdataclass_t rdclass) { } void -dns_message_setpadding(dns_message_t *msg, isc_uint16_t padding) { +dns_message_setpadding(dns_message_t *msg, uint16_t padding) { REQUIRE(DNS_MESSAGE_VALID(msg)); /* Avoid silly large padding */ diff --git a/lib/dns/name.c b/lib/dns/name.c index bd2973b96f..c0355313de 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -15,6 +15,7 @@ #include #include +#include #include #include @@ -1929,13 +1930,13 @@ dns_name_towire(const dns_name_t *name, dns_compress_t *cctx, isc_result_t dns_name_towire2(const dns_name_t *name, dns_compress_t *cctx, - isc_buffer_t *target, isc_uint16_t *comp_offsetp) + isc_buffer_t *target, uint16_t *comp_offsetp) { unsigned int methods; - isc_uint16_t offset; + uint16_t offset; dns_name_t gp; /* Global compression prefix */ isc_boolean_t gf; /* Global compression target found */ - isc_uint16_t go; /* Global compression offset */ + uint16_t go; /* Global compression offset */ dns_offsets_t clo; dns_name_t clname; diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c index de6986bda6..d396581d54 100644 --- a/lib/dns/ncache.c +++ b/lib/dns/ncache.c @@ -14,6 +14,8 @@ #include +#include + #include #include @@ -61,7 +63,7 @@ copy_rdataset(dns_rdataset_t *rdataset, isc_buffer_t *buffer) { return (ISC_R_NOSPACE); count = dns_rdataset_count(rdataset); INSIST(count <= 65535); - isc_buffer_putuint16(buffer, (isc_uint16_t)count); + isc_buffer_putuint16(buffer, (uint16_t)count); result = dns_rdataset_first(rdataset); while (result == ISC_R_SUCCESS) { @@ -74,7 +76,7 @@ copy_rdataset(dns_rdataset_t *rdataset, isc_buffer_t *buffer) { /* * Copy the rdata length to the buffer. */ - isc_buffer_putuint16(buffer, (isc_uint16_t)r.length); + isc_buffer_putuint16(buffer, (uint16_t)r.length); /* * Copy the rdata to the buffer. */ @@ -366,7 +368,7 @@ dns_ncache_towire(dns_rdataset_t *rdataset, dns_compress_t *cctx, INSIST((target->used >= rdlen.used + 2) && (target->used - rdlen.used - 2 < 65536)); isc_buffer_putuint16(&rdlen, - (isc_uint16_t)(target->used - + (uint16_t)(target->used - rdlen.used - 2)); count++; @@ -384,7 +386,7 @@ dns_ncache_towire(dns_rdataset_t *rdataset, dns_compress_t *cctx, rollback: INSIST(savedbuffer.used < 65536); - dns_compress_rollback(cctx, (isc_uint16_t)savedbuffer.used); + dns_compress_rollback(cctx, (uint16_t)savedbuffer.used); *countp = 0; *target = savedbuffer; diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c index 473933c334..859dd0cc42 100644 --- a/lib/dns/nsec3.c +++ b/lib/dns/nsec3.c @@ -12,6 +12,8 @@ #include +#include + #include #include #include @@ -520,7 +522,7 @@ dns_nsec3_addnsec3(dns_db_t *db, dns_dbversion_t *version, int pass; isc_boolean_t exists = ISC_FALSE; isc_boolean_t maybe_remove_unsecure = ISC_FALSE; - isc_uint8_t flags; + uint8_t flags; isc_buffer_t buffer; isc_result_t result; unsigned char *old_next; diff --git a/lib/dns/nta.c b/lib/dns/nta.c index 48810a4e15..826127820f 100644 --- a/lib/dns/nta.c +++ b/lib/dns/nta.c @@ -13,6 +13,8 @@ #include +#include + #include #include #include @@ -279,7 +281,7 @@ checkbogus(isc_task_t *task, isc_event_t *event) { } static isc_result_t -settimer(dns_ntatable_t *ntatable, dns_nta_t *nta, isc_uint32_t lifetime) { +settimer(dns_ntatable_t *ntatable, dns_nta_t *nta, uint32_t lifetime) { isc_result_t result; isc_interval_t interval; dns_view_t *view; @@ -343,7 +345,7 @@ nta_create(dns_ntatable_t *ntatable, const dns_name_t *name, isc_result_t dns_ntatable_add(dns_ntatable_t *ntatable, const dns_name_t *name, isc_boolean_t force, isc_stdtime_t now, - isc_uint32_t lifetime) + uint32_t lifetime) { isc_result_t result; dns_nta_t *nta = NULL; diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c index 920e619e58..440b84d677 100644 --- a/lib/dns/openssldh_link.c +++ b/lib/dns/openssldh_link.c @@ -30,6 +30,7 @@ #include #include +#include #include #include @@ -351,16 +352,16 @@ openssldh_destroy(dst_key_t *key) { } static void -uint16_toregion(isc_uint16_t val, isc_region_t *region) { +uint16_toregion(uint16_t val, isc_region_t *region) { *region->base = (val & 0xff00) >> 8; isc_region_consume(region, 1); *region->base = (val & 0x00ff); isc_region_consume(region, 1); } -static isc_uint16_t +static uint16_t uint16_fromregion(isc_region_t *region) { - isc_uint16_t val; + uint16_t val; unsigned char *cp = region->base; val = ((unsigned int)(cp[0])) << 8; @@ -376,7 +377,7 @@ openssldh_todns(const dst_key_t *key, isc_buffer_t *data) { DH *dh; const BIGNUM *pub_key = NULL, *p = NULL, *g = NULL; isc_region_t r; - isc_uint16_t dnslen, plen, glen, publen; + uint16_t dnslen, plen, glen, publen; REQUIRE(key->keydata.dh != NULL); @@ -433,7 +434,7 @@ openssldh_fromdns(dst_key_t *key, isc_buffer_t *data) { DH *dh; BIGNUM *pub_key = NULL, *p = NULL, *g = NULL; isc_region_t r; - isc_uint16_t plen, glen, publen; + uint16_t plen, glen, publen; int special = 0; isc_buffer_remainingregion(data, &r); diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c index 1b585cc71f..18e5a25308 100644 --- a/lib/dns/opensslrsa_link.c +++ b/lib/dns/opensslrsa_link.c @@ -13,6 +13,8 @@ #if !USE_PKCS11 +#include + #include #include #include @@ -585,13 +587,13 @@ opensslrsa_todns(const dst_key_t *key, isc_buffer_t *data) { if (e_bytes < 256) { /*%< key exponent is <= 2040 bits */ if (r.length < 1) DST_RET(ISC_R_NOSPACE); - isc_buffer_putuint8(data, (isc_uint8_t) e_bytes); + isc_buffer_putuint8(data, (uint8_t) e_bytes); isc_region_consume(&r, 1); } else { if (r.length < 3) DST_RET(ISC_R_NOSPACE); isc_buffer_putuint8(data, 0); - isc_buffer_putuint16(data, (isc_uint16_t) e_bytes); + isc_buffer_putuint16(data, (uint16_t) e_bytes); isc_region_consume(&r, 3); } diff --git a/lib/dns/peer.c b/lib/dns/peer.c index 172a512253..59a9d6d15a 100644 --- a/lib/dns/peer.c +++ b/lib/dns/peer.c @@ -13,6 +13,8 @@ #include +#include + #include #include #include @@ -553,7 +555,7 @@ dns_peer_gettcpkeepalive(dns_peer_t *peer, isc_boolean_t *retval) { } isc_result_t -dns_peer_settransfers(dns_peer_t *peer, isc_uint32_t newval) { +dns_peer_settransfers(dns_peer_t *peer, uint32_t newval) { isc_boolean_t existed; REQUIRE(DNS_PEER_VALID(peer)); @@ -567,7 +569,7 @@ dns_peer_settransfers(dns_peer_t *peer, isc_uint32_t newval) { } isc_result_t -dns_peer_gettransfers(dns_peer_t *peer, isc_uint32_t *retval) { +dns_peer_gettransfers(dns_peer_t *peer, uint32_t *retval) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(retval != NULL); @@ -766,7 +768,7 @@ dns_peer_getquerysource(dns_peer_t *peer, isc_sockaddr_t *query_source) { } isc_result_t -dns_peer_setudpsize(dns_peer_t *peer, isc_uint16_t udpsize) { +dns_peer_setudpsize(dns_peer_t *peer, uint16_t udpsize) { isc_boolean_t existed; REQUIRE(DNS_PEER_VALID(peer)); @@ -780,7 +782,7 @@ dns_peer_setudpsize(dns_peer_t *peer, isc_uint16_t udpsize) { } isc_result_t -dns_peer_getudpsize(dns_peer_t *peer, isc_uint16_t *udpsize) { +dns_peer_getudpsize(dns_peer_t *peer, uint16_t *udpsize) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(udpsize != NULL); @@ -794,7 +796,7 @@ dns_peer_getudpsize(dns_peer_t *peer, isc_uint16_t *udpsize) { } isc_result_t -dns_peer_setmaxudp(dns_peer_t *peer, isc_uint16_t maxudp) { +dns_peer_setmaxudp(dns_peer_t *peer, uint16_t maxudp) { isc_boolean_t existed; REQUIRE(DNS_PEER_VALID(peer)); @@ -808,7 +810,7 @@ dns_peer_setmaxudp(dns_peer_t *peer, isc_uint16_t maxudp) { } isc_result_t -dns_peer_getmaxudp(dns_peer_t *peer, isc_uint16_t *maxudp) { +dns_peer_getmaxudp(dns_peer_t *peer, uint16_t *maxudp) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(maxudp != NULL); @@ -822,7 +824,7 @@ dns_peer_getmaxudp(dns_peer_t *peer, isc_uint16_t *maxudp) { } isc_result_t -dns_peer_setpadding(dns_peer_t *peer, isc_uint16_t padding) { +dns_peer_setpadding(dns_peer_t *peer, uint16_t padding) { isc_boolean_t existed; REQUIRE(DNS_PEER_VALID(peer)); @@ -838,7 +840,7 @@ dns_peer_setpadding(dns_peer_t *peer, isc_uint16_t padding) { } isc_result_t -dns_peer_getpadding(dns_peer_t *peer, isc_uint16_t *padding) { +dns_peer_getpadding(dns_peer_t *peer, uint16_t *padding) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(padding != NULL); @@ -918,7 +920,7 @@ dns_peer_getquerydscp(dns_peer_t *peer, isc_dscp_t *dscpp) { } isc_result_t -dns_peer_setednsversion(dns_peer_t *peer, isc_uint8_t ednsversion) { +dns_peer_setednsversion(dns_peer_t *peer, uint8_t ednsversion) { REQUIRE(DNS_PEER_VALID(peer)); peer->ednsversion = ednsversion; @@ -928,7 +930,7 @@ dns_peer_setednsversion(dns_peer_t *peer, isc_uint8_t ednsversion) { } isc_result_t -dns_peer_getednsversion(dns_peer_t *peer, isc_uint8_t *ednsversion) { +dns_peer_getednsversion(dns_peer_t *peer, uint8_t *ednsversion) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(ednsversion != NULL); diff --git a/lib/dns/pkcs11rsa_link.c b/lib/dns/pkcs11rsa_link.c index 52a9472e31..b29983091d 100644 --- a/lib/dns/pkcs11rsa_link.c +++ b/lib/dns/pkcs11rsa_link.c @@ -15,6 +15,8 @@ #if USE_PKCS11 +#include + #include #include #include @@ -1375,13 +1377,13 @@ pkcs11rsa_todns(const dst_key_t *key, isc_buffer_t *data) { if (e_bytes < 256) { /*%< key exponent is <= 2040 bits */ if (r.length < 1) return (ISC_R_NOSPACE); - isc_buffer_putuint8(data, (isc_uint8_t) e_bytes); + isc_buffer_putuint8(data, (uint8_t) e_bytes); isc_region_consume(&r, 1); } else { if (r.length < 3) return (ISC_R_NOSPACE); isc_buffer_putuint8(data, 0); - isc_buffer_putuint16(data, (isc_uint16_t) e_bytes); + isc_buffer_putuint16(data, (uint16_t) e_bytes); isc_region_consume(&r, 3); } diff --git a/lib/dns/portlist.c b/lib/dns/portlist.c index d624a7a0f8..625d3e58b6 100644 --- a/lib/dns/portlist.c +++ b/lib/dns/portlist.c @@ -14,6 +14,7 @@ #include +#include #include #include @@ -34,7 +35,7 @@ typedef struct dns_element { in_port_t port; - isc_uint16_t flags; + uint16_t flags; } dns_element_t; struct dns_portlist { diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c index 918a97cdb2..0edd7c3d0f 100644 --- a/lib/dns/rbt.c +++ b/lib/dns/rbt.c @@ -13,8 +13,8 @@ #include +#include #include -#include /* uintptr_t */ #include #include @@ -99,16 +99,16 @@ static char FILE_VERSION[32] = "\0"; struct file_header { char version1[32]; - isc_uint64_t first_node_offset; /* usually 1024 */ + uint64_t first_node_offset; /* usually 1024 */ /* * information about the system on which the map file was generated * will be used to tell if we can load the map file or not */ - isc_uint32_t ptrsize; + uint32_t ptrsize; unsigned int bigendian:1; /* big or little endian system */ unsigned int rdataset_fixed:1; /* compiled with --enable-rrset-fixed */ unsigned int nodecount; /* shadow from rbt structure */ - isc_uint64_t crc; + uint64_t crc; char version2[32]; /* repeated; must match version1 */ }; @@ -135,8 +135,8 @@ static isc_result_t dns_rbt_zero_header(FILE *file); static isc_result_t -write_header(FILE *file, dns_rbt_t *rbt, isc_uint64_t first_node_offset, - isc_uint64_t crc); +write_header(FILE *file, dns_rbt_t *rbt, uint64_t first_node_offset, + uint64_t crc); static isc_boolean_t match_header_version(file_header_t *header); @@ -144,12 +144,12 @@ match_header_version(file_header_t *header); static isc_result_t serialize_node(FILE *file, dns_rbtnode_t *node, uintptr_t left, uintptr_t right, uintptr_t down, uintptr_t parent, - uintptr_t data, isc_uint64_t *crc); + uintptr_t data, uint64_t *crc); static isc_result_t serialize_nodes(FILE *file, dns_rbtnode_t *node, uintptr_t parent, dns_rbtdatawriter_t datawriter, void *writer_arg, - uintptr_t *where, isc_uint64_t *crc); + uintptr_t *where, uint64_t *crc); /* * The following functions allow you to get the actual address of a pointer @@ -415,7 +415,7 @@ static isc_result_t treefix(dns_rbt_t *rbt, void *base, size_t size, dns_rbtnode_t *n, const dns_name_t *name, dns_rbtdatafixer_t datafixer, void *fixer_arg, - isc_uint64_t *crc); + uint64_t *crc); static void deletetreeflat(dns_rbt_t *rbt, unsigned int quantum, isc_boolean_t unhash, @@ -469,8 +469,8 @@ init_file_version(void) { * here. */ static isc_result_t -write_header(FILE *file, dns_rbt_t *rbt, isc_uint64_t first_node_offset, - isc_uint64_t crc) +write_header(FILE *file, dns_rbt_t *rbt, uint64_t first_node_offset, + uint64_t crc) { file_header_t header; isc_result_t result; @@ -482,7 +482,7 @@ write_header(FILE *file, dns_rbt_t *rbt, isc_uint64_t first_node_offset, memmove(header.version1, FILE_VERSION, sizeof(header.version1)); memmove(header.version2, FILE_VERSION, sizeof(header.version2)); header.first_node_offset = first_node_offset; - header.ptrsize = (isc_uint32_t) sizeof(void *); + header.ptrsize = (uint32_t) sizeof(void *); header.bigendian = (1 == htonl(1)) ? 1 : 0; #ifdef DNS_RDATASET_FIXED @@ -526,7 +526,7 @@ match_header_version(file_header_t *header) { static isc_result_t serialize_node(FILE *file, dns_rbtnode_t *node, uintptr_t left, uintptr_t right, uintptr_t down, uintptr_t parent, - uintptr_t data, isc_uint64_t *crc) + uintptr_t data, uint64_t *crc) { dns_rbtnode_t temp_node; off_t file_position; @@ -596,9 +596,9 @@ serialize_node(FILE *file, dns_rbtnode_t *node, uintptr_t left, hexdump("node data", node_data, datasize); #endif - isc_crc64_update(crc, (const isc_uint8_t *) &temp_node, + isc_crc64_update(crc, (const uint8_t *) &temp_node, sizeof(dns_rbtnode_t)); - isc_crc64_update(crc, (const isc_uint8_t *) node_data, datasize); + isc_crc64_update(crc, (const uint8_t *) node_data, datasize); cleanup: return (result); @@ -607,7 +607,7 @@ serialize_node(FILE *file, dns_rbtnode_t *node, uintptr_t left, static isc_result_t serialize_nodes(FILE *file, dns_rbtnode_t *node, uintptr_t parent, dns_rbtdatawriter_t datawriter, void *writer_arg, - uintptr_t *where, isc_uint64_t *crc) + uintptr_t *where, uint64_t *crc) { uintptr_t left = 0, right = 0, down = 0, data = 0; off_t location = 0, offset_adjust; @@ -684,7 +684,7 @@ dns_rbt_serialize_tree(FILE *file, dns_rbt_t *rbt, { isc_result_t result; off_t header_position, node_position, end_position; - isc_uint64_t crc; + uint64_t crc; REQUIRE(file != NULL); @@ -736,7 +736,7 @@ dns_rbt_serialize_tree(FILE *file, dns_rbt_t *rbt, static isc_result_t treefix(dns_rbt_t *rbt, void *base, size_t filesize, dns_rbtnode_t *n, const dns_name_t *name, dns_rbtdatafixer_t datafixer, - void *fixer_arg, isc_uint64_t *crc) + void *fixer_arg, uint64_t *crc) { isc_result_t result = ISC_R_SUCCESS; dns_fixedname_t fixed; @@ -836,9 +836,9 @@ treefix(dns_rbt_t *rbt, void *base, size_t filesize, dns_rbtnode_t *n, sizeof(dns_rbtnode_t)); hexdump("node data", node_data, datasize); #endif - isc_crc64_update(crc, (const isc_uint8_t *) &header, + isc_crc64_update(crc, (const uint8_t *) &header, sizeof(dns_rbtnode_t)); - isc_crc64_update(crc, (const isc_uint8_t *) node_data, + isc_crc64_update(crc, (const uint8_t *) node_data, datasize); cleanup: @@ -855,7 +855,7 @@ dns_rbt_deserialize_tree(void *base_address, size_t filesize, isc_result_t result = ISC_R_SUCCESS; file_header_t *header; dns_rbt_t *rbt = NULL; - isc_uint64_t crc; + uint64_t crc; unsigned int host_big_endian; REQUIRE(originp == NULL || *originp == NULL); @@ -886,7 +886,7 @@ dns_rbt_deserialize_tree(void *base_address, size_t filesize, } #endif - if (header->ptrsize != (isc_uint32_t) sizeof(void *)) { + if (header->ptrsize != (uint32_t) sizeof(void *)) { result = ISC_R_INVALIDFILE; goto cleanup; } diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index d1511a9aa6..fe7abacd49 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -94,11 +94,11 @@ typedef struct rbtdb_file_header rbtdb_file_header_t; struct rbtdb_file_header { char version1[32]; - isc_uint32_t ptrsize; + uint32_t ptrsize; unsigned int bigendian:1; - isc_uint64_t tree; - isc_uint64_t nsec; - isc_uint64_t nsec3; + uint64_t tree; + uint64_t nsec; + uint64_t nsec3; char version2[32]; /* repeated; must match version1 */ }; @@ -111,12 +111,12 @@ struct rbtdb_file_header { #define VALID_RBTDB(rbtdb) ((rbtdb) != NULL && \ (rbtdb)->common.impmagic == RBTDB_MAGIC) -typedef isc_uint32_t rbtdb_serial_t; -typedef isc_uint32_t rbtdb_rdatatype_t; +typedef uint32_t rbtdb_serial_t; +typedef uint32_t rbtdb_rdatatype_t; #define RBTDB_RDATATYPE_BASE(type) ((dns_rdatatype_t)((type) & 0xFFFF)) #define RBTDB_RDATATYPE_EXT(type) ((dns_rdatatype_t)((type) >> 16)) -#define RBTDB_RDATATYPE_VALUE(base, ext) ((rbtdb_rdatatype_t)(((isc_uint32_t)ext) << 16) | (((isc_uint32_t)base) & 0xffff)) +#define RBTDB_RDATATYPE_VALUE(base, ext) ((rbtdb_rdatatype_t)(((uint32_t)ext) << 16) | (((uint32_t)base) & 0xffff)) #define RBTDB_RDATATYPE_SIGNSEC \ RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig, dns_rdatatype_nsec) @@ -237,7 +237,7 @@ typedef struct rdatasetheader { rbtdb_serial_t serial; dns_ttl_t rdh_ttl; rbtdb_rdatatype_t type; - isc_uint16_t attributes; + uint16_t attributes; dns_trust_t trust; struct noqname *noqname; struct noqname *closest; @@ -264,7 +264,7 @@ typedef struct rdatasetheader { * this rdataset. */ - isc_uint32_t count; + uint32_t count; /*%< * Monotonously increased every time this rdataset is bound so that * it is used as the base of the starting point in DNS responses @@ -441,17 +441,17 @@ typedef struct rbtdb_version { isc_boolean_t havensec3; /* NSEC3 parameters */ dns_hash_t hash; - isc_uint8_t flags; - isc_uint16_t iterations; - isc_uint8_t salt_length; + uint8_t flags; + uint16_t iterations; + uint8_t salt_length; unsigned char salt[DNS_NSEC3_SALTSIZE]; /* * records and bytes are covered by rwlock. */ isc_rwlock_t rwlock; - isc_uint64_t records; - isc_uint64_t bytes; + uint64_t records; + uint64_t bytes; isc_rwlock_t glue_rwlock; size_t glue_table_size; @@ -745,7 +745,7 @@ static char FILE_VERSION[32] = "\0"; * We don't lock this as we don't care about simultaneous updates. * * Note: - * Both init_count and header->count can be ISC_UINT32_MAX. + * Both init_count and header->count can be UINT32_MAX. * The count on the returned rdataset however can't be as * that indicates that the database does not implement cyclic * processing. @@ -956,7 +956,7 @@ static unsigned int adjust_quantum(unsigned int old, isc_time_t *start) { unsigned int pps = dns_pps; /* packets per second */ unsigned int interval; - isc_uint64_t usecs; + uint64_t usecs; isc_time_t end; unsigned int nodes; @@ -1466,7 +1466,7 @@ update_newheader(rdatasetheader_t *newh, rdatasetheader_t *old) { newh->node = (dns_rbtnode_t *)p; } if (CASESET(old)) { - isc_uint16_t attr; + uint16_t attr; memmove(newh->upper, old->upper, sizeof(old->upper)); attr = old->attributes & (RDATASET_ATTR_CASESET | @@ -3128,7 +3128,7 @@ bind_rdataset(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, raw = (unsigned char *)header + sizeof(*header); rdataset->private3 = raw; rdataset->count = header->count++; - if (rdataset->count == ISC_UINT32_MAX) + if (rdataset->count == UINT32_MAX) rdataset->count = 0; /* @@ -7244,7 +7244,7 @@ loading_addrdataset(void *arg, const dns_name_t *name, static isc_result_t rbt_datafixer(dns_rbtnode_t *rbtnode, void *base, size_t filesize, - void *arg, isc_uint64_t *crc) + void *arg, uint64_t *crc) { isc_result_t result; dns_rbtdb_t *rbtdb = (dns_rbtdb_t *) arg; @@ -7498,7 +7498,7 @@ endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) { */ static isc_result_t rbt_datawriter(FILE *rbtfile, unsigned char *data, void *arg, - isc_uint64_t *crc) + uint64_t *crc) { rbtdb_version_t *version = (rbtdb_version_t *) arg; rbtdb_serial_t serial; @@ -7633,11 +7633,11 @@ rbtdb_write_header(FILE *rbtfile, off_t tree_location, off_t nsec_location, memset(&header, 0, sizeof(rbtdb_file_header_t)); memmove(header.version1, FILE_VERSION, sizeof(header.version1)); memmove(header.version2, FILE_VERSION, sizeof(header.version2)); - header.ptrsize = (isc_uint32_t) sizeof(void *); + header.ptrsize = (uint32_t) sizeof(void *); header.bigendian = (1 == htonl(1)) ? 1 : 0; - header.tree = (isc_uint64_t) tree_location; - header.nsec = (isc_uint64_t) nsec_location; - header.nsec3 = (isc_uint64_t) nsec3_location; + header.tree = (uint64_t) tree_location; + header.nsec = (uint64_t) nsec_location; + header.nsec3 = (uint64_t) nsec3_location; result = isc_stdio_write(&header, 1, sizeof(rbtdb_file_header_t), rbtfile, NULL); fflush(rbtfile); @@ -7850,7 +7850,7 @@ getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) { static isc_result_t getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, dns_hash_t *hash, - isc_uint8_t *flags, isc_uint16_t *iterations, + uint8_t *flags, uint16_t *iterations, unsigned char *salt, size_t *salt_length) { dns_rbtdb_t *rbtdb; @@ -7889,8 +7889,8 @@ getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, dns_hash_t *hash, } static isc_result_t -getsize(dns_db_t *db, dns_dbversion_t *version, isc_uint64_t *records, - isc_uint64_t *bytes) +getsize(dns_db_t *db, dns_dbversion_t *version, uint64_t *records, + uint64_t *bytes) { dns_rbtdb_t *rbtdb; isc_result_t result = ISC_R_SUCCESS; @@ -9798,7 +9798,7 @@ rehash_gluetable(rbtdb_version_t *version) { rbtdb_glue_table_node_t **oldtable; rbtdb_glue_table_node_t *gluenode; rbtdb_glue_table_node_t *nextgluenode; - isc_uint32_t hash; + uint32_t hash; if (ISC_LIKELY(version->glue_table_nodecount < (version->glue_table_size * 3U))) @@ -9849,8 +9849,8 @@ rehash_gluetable(rbtdb_version_t *version) { "rehash_gluetable(): " "resized glue table from %" PRIu64 " to " "%" PRIu64, - (isc_uint64_t) oldsize, - (isc_uint64_t) version->glue_table_size); + (uint64_t) oldsize, + (uint64_t) version->glue_table_size); return (ISC_TRUE); } @@ -9979,7 +9979,7 @@ rdataset_addglue(dns_rdataset_t *rdataset, dns_rbtdb_t *rbtdb = rdataset->private1; dns_rbtnode_t *node = rdataset->private2; rbtdb_version_t *rbtversion = version; - isc_uint32_t idx; + uint32_t idx; rbtdb_glue_table_node_t *cur; isc_boolean_t found = ISC_FALSE; isc_boolean_t restarted = ISC_FALSE; diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c index 5a4c14b8a1..4103bbf4f5 100644 --- a/lib/dns/rcode.c +++ b/lib/dns/rcode.c @@ -12,6 +12,7 @@ #include #include +#include #include #include @@ -223,7 +224,7 @@ maybe_numeric(unsigned int *valuep, isc_textregion_t *source, unsigned int max, isc_boolean_t hex_allowed) { isc_result_t result; - isc_uint32_t n; + uint32_t n; char buffer[NUMBERSIZE]; if (! isdigit(source->base[0] & 0xff) || diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c index 6f9951709e..9314651c64 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -13,7 +13,9 @@ /*! \file */ #include + #include +#include #include #include @@ -157,27 +159,27 @@ static void buffer_fromregion(isc_buffer_t *buffer, isc_region_t *region); static isc_result_t -uint32_tobuffer(isc_uint32_t, isc_buffer_t *target); +uint32_tobuffer(uint32_t, isc_buffer_t *target); static isc_result_t -uint16_tobuffer(isc_uint32_t, isc_buffer_t *target); +uint16_tobuffer(uint32_t, isc_buffer_t *target); static isc_result_t -uint8_tobuffer(isc_uint32_t, isc_buffer_t *target); +uint8_tobuffer(uint32_t, isc_buffer_t *target); static isc_result_t name_tobuffer(const dns_name_t *name, isc_buffer_t *target); -static isc_uint32_t +static uint32_t uint32_fromregion(isc_region_t *region); -static isc_uint16_t +static uint16_t uint16_fromregion(isc_region_t *region); -static isc_uint8_t +static uint8_t uint8_fromregion(isc_region_t *region); -static isc_uint8_t +static uint8_t uint8_consume_fromregion(isc_region_t *region); static isc_result_t @@ -219,7 +221,7 @@ static void warn_badmx(isc_token_t *token, isc_lex_t *lexer, dns_rdatacallbacks_t *callbacks); -static isc_uint16_t +static uint16_t uint16_consume_fromregion(isc_region_t *region); static isc_result_t @@ -727,7 +729,7 @@ dns_rdata_fromwire(dns_rdata_t *rdata, dns_rdataclass_t rdclass, isc_buffer_t ss; isc_buffer_t st; isc_boolean_t use_default = ISC_FALSE; - isc_uint32_t activelength; + uint32_t activelength; unsigned int length; REQUIRE(dctx != NULL); @@ -822,7 +824,7 @@ dns_rdata_towire(dns_rdata_t *rdata, dns_compress_t *cctx, if (result != ISC_R_SUCCESS) { *target = st; INSIST(target->used < 65536); - dns_compress_rollback(cctx, (isc_uint16_t)target->used); + dns_compress_rollback(cctx, (uint16_t)target->used); } return (result); } @@ -1732,7 +1734,7 @@ buffer_fromregion(isc_buffer_t *buffer, isc_region_t *region) { } static isc_result_t -uint32_tobuffer(isc_uint32_t value, isc_buffer_t *target) { +uint32_tobuffer(uint32_t value, isc_buffer_t *target) { isc_region_t region; isc_buffer_availableregion(target, ®ion); @@ -1743,7 +1745,7 @@ uint32_tobuffer(isc_uint32_t value, isc_buffer_t *target) { } static isc_result_t -uint16_tobuffer(isc_uint32_t value, isc_buffer_t *target) { +uint16_tobuffer(uint32_t value, isc_buffer_t *target) { isc_region_t region; if (value > 0xffff) @@ -1751,12 +1753,12 @@ uint16_tobuffer(isc_uint32_t value, isc_buffer_t *target) { isc_buffer_availableregion(target, ®ion); if (region.length < 2) return (ISC_R_NOSPACE); - isc_buffer_putuint16(target, (isc_uint16_t)value); + isc_buffer_putuint16(target, (uint16_t)value); return (ISC_R_SUCCESS); } static isc_result_t -uint8_tobuffer(isc_uint32_t value, isc_buffer_t *target) { +uint8_tobuffer(uint32_t value, isc_buffer_t *target) { isc_region_t region; if (value > 0xff) @@ -1764,7 +1766,7 @@ uint8_tobuffer(isc_uint32_t value, isc_buffer_t *target) { isc_buffer_availableregion(target, ®ion); if (region.length < 1) return (ISC_R_NOSPACE); - isc_buffer_putuint8(target, (isc_uint8_t)value); + isc_buffer_putuint8(target, (uint8_t)value); return (ISC_R_SUCCESS); } @@ -1775,27 +1777,27 @@ name_tobuffer(const dns_name_t *name, isc_buffer_t *target) { return (isc_buffer_copyregion(target, &r)); } -static isc_uint32_t +static uint32_t uint32_fromregion(isc_region_t *region) { - isc_uint32_t value; + uint32_t value; REQUIRE(region->length >= 4); - value = (isc_uint32_t)region->base[0] << 24; - value |= (isc_uint32_t)region->base[1] << 16; - value |= (isc_uint32_t)region->base[2] << 8; - value |= (isc_uint32_t)region->base[3]; + value = (uint32_t)region->base[0] << 24; + value |= (uint32_t)region->base[1] << 16; + value |= (uint32_t)region->base[2] << 8; + value |= (uint32_t)region->base[3]; return(value); } -static isc_uint16_t +static uint16_t uint16_consume_fromregion(isc_region_t *region) { - isc_uint16_t r = uint16_fromregion(region); + uint16_t r = uint16_fromregion(region); isc_region_consume(region, 2); return r; } -static isc_uint16_t +static uint16_t uint16_fromregion(isc_region_t *region) { REQUIRE(region->length >= 2); @@ -1803,7 +1805,7 @@ uint16_fromregion(isc_region_t *region) { return ((region->base[0] << 8) | region->base[1]); } -static isc_uint8_t +static uint8_t uint8_fromregion(isc_region_t *region) { REQUIRE(region->length >= 1); @@ -1811,9 +1813,9 @@ uint8_fromregion(isc_region_t *region) { return (region->base[0]); } -static isc_uint8_t +static uint8_t uint8_consume_fromregion(isc_region_t *region) { - isc_uint8_t r = uint8_fromregion(region); + uint8_t r = uint8_fromregion(region); isc_region_consume(region, 1); return r; @@ -1885,11 +1887,11 @@ static const char atob_digits[86] = struct state { - isc_int32_t Ceor; - isc_int32_t Csum; - isc_int32_t Crot; - isc_int32_t word; - isc_int32_t bcount; + int32_t Ceor; + int32_t Csum; + int32_t Crot; + int32_t word; + int32_t bcount; }; #define Ceor state->Ceor @@ -1923,15 +1925,15 @@ byte_atob(int c, isc_buffer_t *target, struct state *state) { } } else if ((s = strchr(atob_digits, c)) != NULL) { if (bcount == 0) { - word = (isc_int32_t)(s - atob_digits); + word = (int32_t)(s - atob_digits); ++bcount; } else if (bcount < 4) { word = times85(word); - word += (isc_int32_t)(s - atob_digits); + word += (int32_t)(s - atob_digits); ++bcount; } else { word = times85(word); - word += (isc_int32_t)(s - atob_digits); + word += (int32_t)(s - atob_digits); RETERR(putbyte((word >> 24) & 0xff, target, state)); RETERR(putbyte((word >> 16) & 0xff, target, state)); RETERR(putbyte((word >> 8) & 0xff, target, state)); @@ -2076,25 +2078,25 @@ byte_btoa(int c, isc_buffer_t *target, struct state *state) { isc_buffer_add(target, 1); } else { register int tmp = 0; - register isc_int32_t tmpword = word; + register int32_t tmpword = word; if (tmpword < 0) { /* * Because some don't support u_long. */ tmp = 32; - tmpword -= (isc_int32_t)(85 * 85 * 85 * 85 * 32); + tmpword -= (int32_t)(85 * 85 * 85 * 85 * 32); } if (tmpword < 0) { tmp = 64; - tmpword -= (isc_int32_t)(85 * 85 * 85 * 85 * 32); + tmpword -= (int32_t)(85 * 85 * 85 * 85 * 32); } if (tr.length < 5) return (ISC_R_NOSPACE); tr.base[0] = atob_digits[(tmpword / - (isc_int32_t)(85 * 85 * 85 * 85)) + (int32_t)(85 * 85 * 85 * 85)) + tmp]; - tmpword %= (isc_int32_t)(85 * 85 * 85 * 85); + tmpword %= (int32_t)(85 * 85 * 85 * 85); tr.base[1] = atob_digits[tmpword / (85 * 85 * 85)]; tmpword %= (85 * 85 * 85); tr.base[2] = atob_digits[tmpword / (85 * 85)]; diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c index 50b4d283b0..d0282dcaf2 100644 --- a/lib/dns/rdata/any_255/tsig_250.c +++ b/lib/dns/rdata/any_255/tsig_250.c @@ -19,7 +19,7 @@ static inline isc_result_t fromtext_any_tsig(ARGS_FROMTEXT) { isc_token_t token; dns_name_t name; - isc_uint64_t sigtime; + uint64_t sigtime; isc_buffer_t buffer; dns_rcode_t rcode; long i; @@ -53,8 +53,8 @@ fromtext_any_tsig(ARGS_FROMTEXT) { RETTOK(DNS_R_SYNTAX); if ((sigtime >> 48) != 0) RETTOK(ISC_R_RANGE); - RETERR(uint16_tobuffer((isc_uint16_t)(sigtime >> 32), target)); - RETERR(uint32_tobuffer((isc_uint32_t)(sigtime & 0xffffffffU), target)); + RETERR(uint16_tobuffer((uint16_t)(sigtime >> 32), target)); + RETERR(uint32_tobuffer((uint32_t)(sigtime & 0xffffffffU), target)); /* * Fudge. @@ -129,7 +129,7 @@ totext_any_tsig(ARGS_TOTEXT) { dns_name_t name; dns_name_t prefix; isc_boolean_t sub; - isc_uint64_t sigtime; + uint64_t sigtime; unsigned short n; REQUIRE(rdata->type == dns_rdatatype_tsig); @@ -151,12 +151,12 @@ totext_any_tsig(ARGS_TOTEXT) { /* * Time Signed. */ - sigtime = ((isc_uint64_t)sr.base[0] << 40) | - ((isc_uint64_t)sr.base[1] << 32) | - ((isc_uint64_t)sr.base[2] << 24) | - ((isc_uint64_t)sr.base[3] << 16) | - ((isc_uint64_t)sr.base[4] << 8) | - (isc_uint64_t)sr.base[5]; + sigtime = ((uint64_t)sr.base[0] << 40) | + ((uint64_t)sr.base[1] << 32) | + ((uint64_t)sr.base[2] << 24) | + ((uint64_t)sr.base[3] << 16) | + ((uint64_t)sr.base[4] << 8) | + (uint64_t)sr.base[5]; isc_region_consume(&sr, 6); bufp = &buf[sizeof(buf) - 1]; *bufp-- = 0; @@ -373,9 +373,9 @@ fromstruct_any_tsig(ARGS_FROMSTRUCT) { /* * Time Signed: 48 bits. */ - RETERR(uint16_tobuffer((isc_uint16_t)(tsig->timesigned >> 32), + RETERR(uint16_tobuffer((uint16_t)(tsig->timesigned >> 32), target)); - RETERR(uint32_tobuffer((isc_uint32_t)(tsig->timesigned & 0xffffffffU), + RETERR(uint32_tobuffer((uint32_t)(tsig->timesigned & 0xffffffffU), target)); /* @@ -449,12 +449,12 @@ tostruct_any_tsig(ARGS_TOSTRUCT) { * Time Signed. */ INSIST(sr.length >= 6); - tsig->timesigned = ((isc_uint64_t)sr.base[0] << 40) | - ((isc_uint64_t)sr.base[1] << 32) | - ((isc_uint64_t)sr.base[2] << 24) | - ((isc_uint64_t)sr.base[3] << 16) | - ((isc_uint64_t)sr.base[4] << 8) | - (isc_uint64_t)sr.base[5]; + tsig->timesigned = ((uint64_t)sr.base[0] << 40) | + ((uint64_t)sr.base[1] << 32) | + ((uint64_t)sr.base[2] << 24) | + ((uint64_t)sr.base[3] << 16) | + ((uint64_t)sr.base[4] << 8) | + (uint64_t)sr.base[5]; isc_region_consume(&sr, 6); /* diff --git a/lib/dns/rdata/any_255/tsig_250.h b/lib/dns/rdata/any_255/tsig_250.h index 40f4f4fd9d..6ace1d2f8b 100644 --- a/lib/dns/rdata/any_255/tsig_250.h +++ b/lib/dns/rdata/any_255/tsig_250.h @@ -18,13 +18,13 @@ typedef struct dns_rdata_any_tsig { dns_rdatacommon_t common; isc_mem_t * mctx; dns_name_t algorithm; - isc_uint64_t timesigned; - isc_uint16_t fudge; - isc_uint16_t siglen; + uint64_t timesigned; + uint16_t fudge; + uint16_t siglen; unsigned char * signature; - isc_uint16_t originalid; - isc_uint16_t error; - isc_uint16_t otherlen; + uint16_t originalid; + uint16_t error; + uint16_t otherlen; unsigned char * other; } dns_rdata_any_tsig_t; diff --git a/lib/dns/rdata/ch_3/a_1.c b/lib/dns/rdata/ch_3/a_1.c index bf0c1e3b6d..1575d335e1 100644 --- a/lib/dns/rdata/ch_3/a_1.c +++ b/lib/dns/rdata/ch_3/a_1.c @@ -65,7 +65,7 @@ totext_ch_a(ARGS_TOTEXT) { dns_name_t prefix; isc_boolean_t sub; char buf[sizeof("0177777")]; - isc_uint16_t addr; + uint16_t addr; REQUIRE(rdata->type == dns_rdatatype_a); REQUIRE(rdata->rdclass == dns_rdataclass_ch); /* 3 */ diff --git a/lib/dns/rdata/ch_3/a_1.h b/lib/dns/rdata/ch_3/a_1.h index 97ea205070..a9695349d0 100644 --- a/lib/dns/rdata/ch_3/a_1.h +++ b/lib/dns/rdata/ch_3/a_1.h @@ -16,7 +16,7 @@ #ifndef CH_3_A_1_H #define CH_3_A_1_H 1 -typedef isc_uint16_t ch_addr_t; +typedef uint16_t ch_addr_t; typedef struct dns_rdata_ch_a { dns_rdatacommon_t common; diff --git a/lib/dns/rdata/generic/afsdb_18.h b/lib/dns/rdata/generic/afsdb_18.h index 204de5d24d..24da1aab1b 100644 --- a/lib/dns/rdata/generic/afsdb_18.h +++ b/lib/dns/rdata/generic/afsdb_18.h @@ -19,7 +19,7 @@ typedef struct dns_rdata_afsdb { dns_rdatacommon_t common; isc_mem_t *mctx; - isc_uint16_t subtype; + uint16_t subtype; dns_name_t server; } dns_rdata_afsdb_t; diff --git a/lib/dns/rdata/generic/avc_258.h b/lib/dns/rdata/generic/avc_258.h index b5d78d008e..88abaddd05 100644 --- a/lib/dns/rdata/generic/avc_258.h +++ b/lib/dns/rdata/generic/avc_258.h @@ -18,9 +18,9 @@ typedef struct dns_rdata_avc { dns_rdatacommon_t common; isc_mem_t *mctx; unsigned char *data; - isc_uint16_t length; + uint16_t length; /* private */ - isc_uint16_t offset; + uint16_t offset; } dns_rdata_avc_t; /* diff --git a/lib/dns/rdata/generic/caa_257.c b/lib/dns/rdata/generic/caa_257.c index 73e377033c..90b033b4d4 100644 --- a/lib/dns/rdata/generic/caa_257.c +++ b/lib/dns/rdata/generic/caa_257.c @@ -37,7 +37,7 @@ static inline isc_result_t fromtext_caa(ARGS_FROMTEXT) { isc_token_t token; isc_textregion_t tr; - isc_uint8_t flags; + uint8_t flags; unsigned int i; REQUIRE(type == dns_rdatatype_caa); @@ -53,7 +53,7 @@ fromtext_caa(ARGS_FROMTEXT) { ISC_FALSE)); if (token.value.as_ulong > 255U) RETTOK(ISC_R_RANGE); - flags = (isc_uint8_t)(token.value.as_ulong & 255U); + flags = (uint8_t)(token.value.as_ulong & 255U); RETERR(uint8_tobuffer(flags, target)); /* @@ -83,7 +83,7 @@ fromtext_caa(ARGS_FROMTEXT) { static inline isc_result_t totext_caa(ARGS_TOTEXT) { isc_region_t region; - isc_uint8_t flags; + uint8_t flags; char buf[256]; UNUSED(tctx); diff --git a/lib/dns/rdata/generic/caa_257.h b/lib/dns/rdata/generic/caa_257.h index 7ed6a27ca2..c16e427d66 100644 --- a/lib/dns/rdata/generic/caa_257.h +++ b/lib/dns/rdata/generic/caa_257.h @@ -16,11 +16,11 @@ typedef struct dns_rdata_caa { dns_rdatacommon_t common; isc_mem_t * mctx; - isc_uint8_t flags; + uint8_t flags; unsigned char * tag; - isc_uint8_t tag_len; + uint8_t tag_len; unsigned char *value; - isc_uint16_t value_len; + uint16_t value_len; } dns_rdata_caa_t; #endif /* GENERIC_CAA_257_H */ diff --git a/lib/dns/rdata/generic/cert_37.h b/lib/dns/rdata/generic/cert_37.h index f18fc53aed..db760e1e3c 100644 --- a/lib/dns/rdata/generic/cert_37.h +++ b/lib/dns/rdata/generic/cert_37.h @@ -17,10 +17,10 @@ typedef struct dns_rdata_cert { dns_rdatacommon_t common; isc_mem_t *mctx; - isc_uint16_t type; - isc_uint16_t key_tag; - isc_uint8_t algorithm; - isc_uint16_t length; + uint16_t type; + uint16_t key_tag; + uint8_t algorithm; + uint16_t length; unsigned char *certificate; } dns_rdata_cert_t; diff --git a/lib/dns/rdata/generic/csync_62.h b/lib/dns/rdata/generic/csync_62.h index 98a4395373..a1f63d5492 100644 --- a/lib/dns/rdata/generic/csync_62.h +++ b/lib/dns/rdata/generic/csync_62.h @@ -19,10 +19,10 @@ typedef struct dns_rdata_csync { dns_rdatacommon_t common; isc_mem_t *mctx; - isc_uint32_t serial; - isc_uint16_t flags; + uint32_t serial; + uint16_t flags; unsigned char *typebits; - isc_uint16_t len; + uint16_t len; } dns_rdata_csync_t; #endif /* GENERIC_CSYNC_62_H */ diff --git a/lib/dns/rdata/generic/doa_259.c b/lib/dns/rdata/generic/doa_259.c index 2e5b4746e9..0a1dff2c56 100644 --- a/lib/dns/rdata/generic/doa_259.c +++ b/lib/dns/rdata/generic/doa_259.c @@ -73,7 +73,7 @@ static inline isc_result_t totext_doa(ARGS_TOTEXT) { char buf[sizeof("4294967295 ")]; isc_region_t region; - isc_uint32_t n; + uint32_t n; REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_doa); diff --git a/lib/dns/rdata/generic/doa_259.h b/lib/dns/rdata/generic/doa_259.h index 9ba0bb8751..5ac5fbbfdc 100644 --- a/lib/dns/rdata/generic/doa_259.h +++ b/lib/dns/rdata/generic/doa_259.h @@ -17,11 +17,11 @@ typedef struct dns_rdata_doa { isc_mem_t * mctx; unsigned char * mediatype; unsigned char * data; - isc_uint32_t enterprise; - isc_uint32_t type; - isc_uint16_t data_len; - isc_uint8_t location; - isc_uint8_t mediatype_len; + uint32_t enterprise; + uint32_t type; + uint16_t data_len; + uint8_t location; + uint8_t mediatype_len; } dns_rdata_doa_t; #endif /* GENERIC_DOA_259_H */ diff --git a/lib/dns/rdata/generic/ds_43.h b/lib/dns/rdata/generic/ds_43.h index 663b7725bb..0d373ecea8 100644 --- a/lib/dns/rdata/generic/ds_43.h +++ b/lib/dns/rdata/generic/ds_43.h @@ -18,10 +18,10 @@ typedef struct dns_rdata_ds { dns_rdatacommon_t common; isc_mem_t *mctx; - isc_uint16_t key_tag; - isc_uint8_t algorithm; - isc_uint8_t digest_type; - isc_uint16_t length; + uint16_t key_tag; + uint8_t algorithm; + uint8_t digest_type; + uint16_t length; unsigned char *digest; } dns_rdata_ds_t; diff --git a/lib/dns/rdata/generic/gpos_27.h b/lib/dns/rdata/generic/gpos_27.h index de19559167..fac72cd82d 100644 --- a/lib/dns/rdata/generic/gpos_27.h +++ b/lib/dns/rdata/generic/gpos_27.h @@ -22,9 +22,9 @@ typedef struct dns_rdata_gpos { char *longitude; char *latitude; char *altitude; - isc_uint8_t long_len; - isc_uint8_t lat_len; - isc_uint8_t alt_len; + uint8_t long_len; + uint8_t lat_len; + uint8_t alt_len; } dns_rdata_gpos_t; #endif /* GENERIC_GPOS_27_H */ diff --git a/lib/dns/rdata/generic/hinfo_13.h b/lib/dns/rdata/generic/hinfo_13.h index d9dd1d9dd5..323be22cc4 100644 --- a/lib/dns/rdata/generic/hinfo_13.h +++ b/lib/dns/rdata/generic/hinfo_13.h @@ -18,8 +18,8 @@ typedef struct dns_rdata_hinfo { isc_mem_t *mctx; char *cpu; char *os; - isc_uint8_t cpu_len; - isc_uint8_t os_len; + uint8_t cpu_len; + uint8_t os_len; } dns_rdata_hinfo_t; #endif /* GENERIC_HINFO_13_H */ diff --git a/lib/dns/rdata/generic/hip_55.c b/lib/dns/rdata/generic/hip_55.c index c2d68122a0..aa99e0f926 100644 --- a/lib/dns/rdata/generic/hip_55.c +++ b/lib/dns/rdata/generic/hip_55.c @@ -67,7 +67,7 @@ fromtext_hip(ARGS_FROMTEXT) { len = (unsigned char *)isc_buffer_used(target) - start; if (len > 0xffU) RETTOK(ISC_R_RANGE); - RETERR(uint8_tobuffer((isc_uint32_t)len, &hit_len)); + RETERR(uint8_tobuffer((uint32_t)len, &hit_len)); /* * Public key (base64). @@ -83,7 +83,7 @@ fromtext_hip(ARGS_FROMTEXT) { len = (unsigned char *)isc_buffer_used(target) - start; if (len > 0xffffU) RETTOK(ISC_R_RANGE); - RETERR(uint16_tobuffer((isc_uint32_t)len, &key_len)); + RETERR(uint16_tobuffer((uint32_t)len, &key_len)); if (origin == NULL) origin = dns_rootname; @@ -183,8 +183,8 @@ static inline isc_result_t fromwire_hip(ARGS_FROMWIRE) { isc_region_t region, rr; dns_name_t name; - isc_uint8_t hit_len; - isc_uint16_t key_len; + uint8_t hit_len; + uint16_t key_len; REQUIRE(type == dns_rdatatype_hip); @@ -447,8 +447,8 @@ casecompare_hip(ARGS_COMPARE) { dns_name_t name1; dns_name_t name2; int order; - isc_uint8_t hit_len; - isc_uint16_t key_len; + uint8_t hit_len; + uint16_t key_len; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); diff --git a/lib/dns/rdata/generic/hip_55.h b/lib/dns/rdata/generic/hip_55.h index 8df7a870c8..12c195cb47 100644 --- a/lib/dns/rdata/generic/hip_55.h +++ b/lib/dns/rdata/generic/hip_55.h @@ -21,12 +21,12 @@ typedef struct dns_rdata_hip { unsigned char * hit; unsigned char * key; unsigned char * servers; - isc_uint8_t algorithm; - isc_uint8_t hit_len; - isc_uint16_t key_len; - isc_uint16_t servers_len; + uint8_t algorithm; + uint8_t hit_len; + uint16_t key_len; + uint16_t servers_len; /* Private */ - isc_uint16_t offset; + uint16_t offset; } dns_rdata_hip_t; isc_result_t diff --git a/lib/dns/rdata/generic/ipseckey_45.c b/lib/dns/rdata/generic/ipseckey_45.c index 6405baea80..8a07747a78 100644 --- a/lib/dns/rdata/generic/ipseckey_45.c +++ b/lib/dns/rdata/generic/ipseckey_45.c @@ -279,7 +279,7 @@ static inline isc_result_t fromstruct_ipseckey(ARGS_FROMSTRUCT) { dns_rdata_ipseckey_t *ipseckey = source; isc_region_t region; - isc_uint32_t n; + uint32_t n; REQUIRE(type == dns_rdatatype_ipseckey); REQUIRE(source != NULL); @@ -323,7 +323,7 @@ tostruct_ipseckey(ARGS_TOSTRUCT) { isc_region_t region; dns_rdata_ipseckey_t *ipseckey = target; dns_name_t name; - isc_uint32_t n; + uint32_t n; REQUIRE(rdata->type == dns_rdatatype_ipseckey); REQUIRE(target != NULL); diff --git a/lib/dns/rdata/generic/ipseckey_45.h b/lib/dns/rdata/generic/ipseckey_45.h index 04a552169e..e3f5804891 100644 --- a/lib/dns/rdata/generic/ipseckey_45.h +++ b/lib/dns/rdata/generic/ipseckey_45.h @@ -16,14 +16,14 @@ typedef struct dns_rdata_ipseckey { dns_rdatacommon_t common; isc_mem_t *mctx; - isc_uint8_t precedence; - isc_uint8_t gateway_type; - isc_uint8_t algorithm; + uint8_t precedence; + uint8_t gateway_type; + uint8_t algorithm; struct in_addr in_addr; /* gateway type 1 */ struct in6_addr in6_addr; /* gateway type 2 */ dns_name_t gateway; /* gateway type 3 */ unsigned char *key; - isc_uint16_t keylength; + uint16_t keylength; } dns_rdata_ipseckey_t; #endif /* GENERIC_IPSECKEY_45_H */ diff --git a/lib/dns/rdata/generic/isdn_20.h b/lib/dns/rdata/generic/isdn_20.h index 70a6dfa9de..48758bba56 100644 --- a/lib/dns/rdata/generic/isdn_20.h +++ b/lib/dns/rdata/generic/isdn_20.h @@ -21,8 +21,8 @@ typedef struct dns_rdata_isdn { isc_mem_t *mctx; char *isdn; char *subaddress; - isc_uint8_t isdn_len; - isc_uint8_t subaddress_len; + uint8_t isdn_len; + uint8_t subaddress_len; } dns_rdata_isdn_t; #endif /* GENERIC_ISDN_20_H */ diff --git a/lib/dns/rdata/generic/key_25.h b/lib/dns/rdata/generic/key_25.h index 090c812316..330363b465 100644 --- a/lib/dns/rdata/generic/key_25.h +++ b/lib/dns/rdata/generic/key_25.h @@ -19,10 +19,10 @@ typedef struct dns_rdata_key { dns_rdatacommon_t common; isc_mem_t * mctx; - isc_uint16_t flags; - isc_uint8_t protocol; - isc_uint8_t algorithm; - isc_uint16_t datalen; + uint16_t flags; + uint8_t protocol; + uint8_t algorithm; + uint16_t datalen; unsigned char * data; } dns_rdata_key_t; diff --git a/lib/dns/rdata/generic/keydata_65533.c b/lib/dns/rdata/generic/keydata_65533.c index b0537c1197..ffa945489f 100644 --- a/lib/dns/rdata/generic/keydata_65533.c +++ b/lib/dns/rdata/generic/keydata_65533.c @@ -26,7 +26,7 @@ fromtext_keydata(ARGS_FROMTEXT) { dns_secalg_t alg; dns_secproto_t proto; dns_keyflags_t flags; - isc_uint32_t refresh, addhd, removehd; + uint32_t refresh, addhd, removehd; REQUIRE(type == dns_rdatatype_keydata); diff --git a/lib/dns/rdata/generic/keydata_65533.h b/lib/dns/rdata/generic/keydata_65533.h index b95abfe071..40061e1fde 100644 --- a/lib/dns/rdata/generic/keydata_65533.h +++ b/lib/dns/rdata/generic/keydata_65533.h @@ -16,13 +16,13 @@ typedef struct dns_rdata_keydata { dns_rdatacommon_t common; isc_mem_t * mctx; - isc_uint32_t refresh; /* Timer for refreshing data */ - isc_uint32_t addhd; /* Hold-down timer for adding */ - isc_uint32_t removehd; /* Hold-down timer for removing */ - isc_uint16_t flags; /* Copy of DNSKEY_48 */ - isc_uint8_t protocol; - isc_uint8_t algorithm; - isc_uint16_t datalen; + uint32_t refresh; /* Timer for refreshing data */ + uint32_t addhd; /* Hold-down timer for adding */ + uint32_t removehd; /* Hold-down timer for removing */ + uint16_t flags; /* Copy of DNSKEY_48 */ + uint8_t protocol; + uint8_t algorithm; + uint16_t datalen; unsigned char * data; } dns_rdata_keydata_t; diff --git a/lib/dns/rdata/generic/l32_105.c b/lib/dns/rdata/generic/l32_105.c index 6332131e59..29c3100440 100644 --- a/lib/dns/rdata/generic/l32_105.c +++ b/lib/dns/rdata/generic/l32_105.c @@ -121,7 +121,7 @@ compare_l32(ARGS_COMPARE) { static inline isc_result_t fromstruct_l32(ARGS_FROMSTRUCT) { dns_rdata_l32_t *l32 = source; - isc_uint32_t n; + uint32_t n; REQUIRE(type == dns_rdatatype_l32); REQUIRE(source != NULL); @@ -140,7 +140,7 @@ static inline isc_result_t tostruct_l32(ARGS_TOSTRUCT) { isc_region_t region; dns_rdata_l32_t *l32 = target; - isc_uint32_t n; + uint32_t n; REQUIRE(rdata->type == dns_rdatatype_l32); REQUIRE(target != NULL); diff --git a/lib/dns/rdata/generic/l32_105.h b/lib/dns/rdata/generic/l32_105.h index 404bda24d4..3fca0f2721 100644 --- a/lib/dns/rdata/generic/l32_105.h +++ b/lib/dns/rdata/generic/l32_105.h @@ -15,7 +15,7 @@ typedef struct dns_rdata_l32 { dns_rdatacommon_t common; - isc_uint16_t pref; + uint16_t pref; struct in_addr l32; } dns_rdata_l32_t; diff --git a/lib/dns/rdata/generic/l64_106.h b/lib/dns/rdata/generic/l64_106.h index a9c4a78fe4..968a138816 100644 --- a/lib/dns/rdata/generic/l64_106.h +++ b/lib/dns/rdata/generic/l64_106.h @@ -15,7 +15,7 @@ typedef struct dns_rdata_l64 { dns_rdatacommon_t common; - isc_uint16_t pref; + uint16_t pref; unsigned char l64[8]; } dns_rdata_l64_t; diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c index 740439b5dd..19bd1cfd4e 100644 --- a/lib/dns/rdata/generic/loc_29.c +++ b/lib/dns/rdata/generic/loc_29.c @@ -666,7 +666,7 @@ compare_loc(ARGS_COMPARE) { static inline isc_result_t fromstruct_loc(ARGS_FROMSTRUCT) { dns_rdata_loc_t *loc = source; - isc_uint8_t c; + uint8_t c; REQUIRE(type == dns_rdatatype_loc); REQUIRE(source != NULL); @@ -711,7 +711,7 @@ static inline isc_result_t tostruct_loc(ARGS_TOSTRUCT) { dns_rdata_loc_t *loc = target; isc_region_t r; - isc_uint8_t version; + uint8_t version; REQUIRE(rdata->type == dns_rdatatype_loc); REQUIRE(target != NULL); diff --git a/lib/dns/rdata/generic/loc_29.h b/lib/dns/rdata/generic/loc_29.h index e7535082e1..c879581cd4 100644 --- a/lib/dns/rdata/generic/loc_29.h +++ b/lib/dns/rdata/generic/loc_29.h @@ -17,13 +17,13 @@ * \brief Per RFC1876 */ typedef struct dns_rdata_loc_0 { - isc_uint8_t version; /* must be first and zero */ - isc_uint8_t size; - isc_uint8_t horizontal; - isc_uint8_t vertical; - isc_uint32_t latitude; - isc_uint32_t longitude; - isc_uint32_t altitude; + uint8_t version; /* must be first and zero */ + uint8_t size; + uint8_t horizontal; + uint8_t vertical; + uint32_t latitude; + uint32_t longitude; + uint32_t altitude; } dns_rdata_loc_0_t; typedef struct dns_rdata_loc { diff --git a/lib/dns/rdata/generic/lp_107.h b/lib/dns/rdata/generic/lp_107.h index 1e47b27eca..4ccffacacf 100644 --- a/lib/dns/rdata/generic/lp_107.h +++ b/lib/dns/rdata/generic/lp_107.h @@ -16,7 +16,7 @@ typedef struct dns_rdata_lp { dns_rdatacommon_t common; isc_mem_t *mctx; - isc_uint16_t pref; + uint16_t pref; dns_name_t lp; } dns_rdata_lp_t; diff --git a/lib/dns/rdata/generic/mx_15.h b/lib/dns/rdata/generic/mx_15.h index a0dfe297e5..ed96beb4e0 100644 --- a/lib/dns/rdata/generic/mx_15.h +++ b/lib/dns/rdata/generic/mx_15.h @@ -17,7 +17,7 @@ typedef struct dns_rdata_mx { dns_rdatacommon_t common; isc_mem_t *mctx; - isc_uint16_t pref; + uint16_t pref; dns_name_t mx; } dns_rdata_mx_t; diff --git a/lib/dns/rdata/generic/naptr_35.h b/lib/dns/rdata/generic/naptr_35.h index afbed869f5..e72b6099b2 100644 --- a/lib/dns/rdata/generic/naptr_35.h +++ b/lib/dns/rdata/generic/naptr_35.h @@ -19,14 +19,14 @@ typedef struct dns_rdata_naptr { dns_rdatacommon_t common; isc_mem_t *mctx; - isc_uint16_t order; - isc_uint16_t preference; + uint16_t order; + uint16_t preference; char *flags; - isc_uint8_t flags_len; + uint8_t flags_len; char *service; - isc_uint8_t service_len; + uint8_t service_len; char *regexp; - isc_uint8_t regexp_len; + uint8_t regexp_len; dns_name_t replacement; } dns_rdata_naptr_t; diff --git a/lib/dns/rdata/generic/nid_104.h b/lib/dns/rdata/generic/nid_104.h index 8c97ae7a5a..9362e2b5b6 100644 --- a/lib/dns/rdata/generic/nid_104.h +++ b/lib/dns/rdata/generic/nid_104.h @@ -15,7 +15,7 @@ typedef struct dns_rdata_nid { dns_rdatacommon_t common; - isc_uint16_t pref; + uint16_t pref; unsigned char nid[8]; } dns_rdata_nid_t; diff --git a/lib/dns/rdata/generic/nsec3_50.c b/lib/dns/rdata/generic/nsec3_50.c index 294e856fc4..81d43f36a4 100644 --- a/lib/dns/rdata/generic/nsec3_50.c +++ b/lib/dns/rdata/generic/nsec3_50.c @@ -107,7 +107,7 @@ totext_nsec3(ARGS_TOTEXT) { unsigned char hash; unsigned char flags; char buf[sizeof("TYPE65535")]; - isc_uint32_t iterations; + uint32_t iterations; REQUIRE(rdata->type == dns_rdatatype_nsec3); REQUIRE(rdata->length != 0); diff --git a/lib/dns/rdata/generic/nsec3_50.h b/lib/dns/rdata/generic/nsec3_50.h index 696dad3942..36b9695f61 100644 --- a/lib/dns/rdata/generic/nsec3_50.h +++ b/lib/dns/rdata/generic/nsec3_50.h @@ -27,7 +27,7 @@ typedef struct dns_rdata_nsec3 { dns_iterations_t iterations; unsigned char salt_length; unsigned char next_length; - isc_uint16_t len; + uint16_t len; unsigned char *salt; unsigned char *next; unsigned char *typebits; diff --git a/lib/dns/rdata/generic/nsec3param_51.c b/lib/dns/rdata/generic/nsec3param_51.c index 88910697c3..af61b36299 100644 --- a/lib/dns/rdata/generic/nsec3param_51.c +++ b/lib/dns/rdata/generic/nsec3param_51.c @@ -93,7 +93,7 @@ totext_nsec3param(ARGS_TOTEXT) { unsigned char hash; unsigned char flags; char buf[sizeof("65535 ")]; - isc_uint32_t iterations; + uint32_t iterations; REQUIRE(rdata->type == dns_rdatatype_nsec3param); REQUIRE(rdata->length != 0); diff --git a/lib/dns/rdata/generic/nsec_47.h b/lib/dns/rdata/generic/nsec_47.h index 81118afde6..b597864930 100644 --- a/lib/dns/rdata/generic/nsec_47.h +++ b/lib/dns/rdata/generic/nsec_47.h @@ -21,7 +21,7 @@ typedef struct dns_rdata_nsec { isc_mem_t *mctx; dns_name_t next; unsigned char *typebits; - isc_uint16_t len; + uint16_t len; } dns_rdata_nsec_t; #endif /* GENERIC_NSEC_47_H */ diff --git a/lib/dns/rdata/generic/null_10.h b/lib/dns/rdata/generic/null_10.h index 26c1c83370..0b01dd8f24 100644 --- a/lib/dns/rdata/generic/null_10.h +++ b/lib/dns/rdata/generic/null_10.h @@ -17,7 +17,7 @@ typedef struct dns_rdata_null { dns_rdatacommon_t common; isc_mem_t *mctx; - isc_uint16_t length; + uint16_t length; unsigned char *data; } dns_rdata_null_t; diff --git a/lib/dns/rdata/generic/nxt_30.h b/lib/dns/rdata/generic/nxt_30.h index 0e490cdab5..63bbc0f571 100644 --- a/lib/dns/rdata/generic/nxt_30.h +++ b/lib/dns/rdata/generic/nxt_30.h @@ -21,7 +21,7 @@ typedef struct dns_rdata_nxt { isc_mem_t *mctx; dns_name_t next; unsigned char *typebits; - isc_uint16_t len; + uint16_t len; } dns_rdata_nxt_t; #endif /* GENERIC_NXT_30_H */ diff --git a/lib/dns/rdata/generic/openpgpkey_61.h b/lib/dns/rdata/generic/openpgpkey_61.h index 610f9b5a1a..7c68e7ff96 100644 --- a/lib/dns/rdata/generic/openpgpkey_61.h +++ b/lib/dns/rdata/generic/openpgpkey_61.h @@ -15,7 +15,7 @@ typedef struct dns_rdata_openpgpkey { dns_rdatacommon_t common; isc_mem_t * mctx; - isc_uint16_t length; + uint16_t length; unsigned char * keyring; } dns_rdata_openpgpkey_t; diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c index 46405a316e..b7886ec6da 100644 --- a/lib/dns/rdata/generic/opt_41.c +++ b/lib/dns/rdata/generic/opt_41.c @@ -41,8 +41,8 @@ static inline isc_result_t totext_opt(ARGS_TOTEXT) { isc_region_t r; isc_region_t or; - isc_uint16_t option; - isc_uint16_t length; + uint16_t option; + uint16_t length; char buf[sizeof("64000 64000")]; /* @@ -87,8 +87,8 @@ static inline isc_result_t fromwire_opt(ARGS_FROMWIRE) { isc_region_t sregion; isc_region_t tregion; - isc_uint16_t opt; - isc_uint16_t length; + uint16_t opt; + uint16_t length; unsigned int total; REQUIRE(type == dns_rdatatype_opt); @@ -114,10 +114,10 @@ fromwire_opt(ARGS_FROMWIRE) { return (ISC_R_UNEXPECTEDEND); switch (opt) { case DNS_OPT_CLIENT_SUBNET: { - isc_uint16_t family; - isc_uint8_t addrlen; - isc_uint8_t scope; - isc_uint8_t addrbytes; + uint16_t family; + uint8_t addrlen; + uint8_t scope; + uint8_t addrbytes; if (length < 4) return (DNS_R_OPTERR); @@ -158,7 +158,7 @@ fromwire_opt(ARGS_FROMWIRE) { return (DNS_R_OPTERR); if (addrbytes != 0U && (addrlen % 8) != 0) { - isc_uint8_t bits = ~0U << (8 - (addrlen % 8)); + uint8_t bits = ~0U << (8 - (addrlen % 8)); bits &= sregion.base[addrbytes - 1]; if (bits != sregion.base[addrbytes - 1]) return (DNS_R_OPTERR); @@ -230,7 +230,7 @@ static inline isc_result_t fromstruct_opt(ARGS_FROMSTRUCT) { dns_rdata_opt_t *opt = source; isc_region_t region; - isc_uint16_t length; + uint16_t length; REQUIRE(type == dns_rdatatype_opt); REQUIRE(source != NULL); @@ -368,7 +368,7 @@ dns_rdata_opt_first(dns_rdata_opt_t *opt) { isc_result_t dns_rdata_opt_next(dns_rdata_opt_t *opt) { isc_region_t r; - isc_uint16_t length; + uint16_t length; REQUIRE(opt != NULL); REQUIRE(opt->common.rdtype == dns_rdatatype_opt); diff --git a/lib/dns/rdata/generic/opt_41.h b/lib/dns/rdata/generic/opt_41.h index d31cf68d98..5b31f4d094 100644 --- a/lib/dns/rdata/generic/opt_41.h +++ b/lib/dns/rdata/generic/opt_41.h @@ -17,8 +17,8 @@ * \brief Per RFC2671 */ typedef struct dns_rdata_opt_opcode { - isc_uint16_t opcode; - isc_uint16_t length; + uint16_t opcode; + uint16_t length; unsigned char *data; } dns_rdata_opt_opcode_t; @@ -26,9 +26,9 @@ typedef struct dns_rdata_opt { dns_rdatacommon_t common; isc_mem_t *mctx; unsigned char *options; - isc_uint16_t length; + uint16_t length; /* private */ - isc_uint16_t offset; + uint16_t offset; } dns_rdata_opt_t; /* diff --git a/lib/dns/rdata/generic/rrsig_46.c b/lib/dns/rdata/generic/rrsig_46.c index 669731801f..4951defc00 100644 --- a/lib/dns/rdata/generic/rrsig_46.c +++ b/lib/dns/rdata/generic/rrsig_46.c @@ -26,7 +26,7 @@ fromtext_rrsig(ARGS_FROMTEXT) { isc_result_t result; dns_name_t name; isc_buffer_t buffer; - isc_uint32_t time_signed, time_expire; + uint32_t time_signed, time_expire; REQUIRE(type == dns_rdatatype_rrsig); @@ -84,7 +84,7 @@ fromtext_rrsig(ARGS_FROMTEXT) { *DNS_AS_STR(token) != '-' && *DNS_AS_STR(token) != '+') { char *end; unsigned long u; - isc_uint64_t u64; + uint64_t u64; u64 = u = strtoul(DNS_AS_STR(token), &end, 10); if (u == ULONG_MAX || *end != 0) @@ -105,7 +105,7 @@ fromtext_rrsig(ARGS_FROMTEXT) { *DNS_AS_STR(token) != '-' && *DNS_AS_STR(token) != '+') { char *end; unsigned long u; - isc_uint64_t u64; + uint64_t u64; u64 = u = strtoul(DNS_AS_STR(token), &end, 10); if (u == ULONG_MAX || *end != 0) diff --git a/lib/dns/rdata/generic/rrsig_46.h b/lib/dns/rdata/generic/rrsig_46.h index b46f7fd6c7..6dfbd424f0 100644 --- a/lib/dns/rdata/generic/rrsig_46.h +++ b/lib/dns/rdata/generic/rrsig_46.h @@ -20,13 +20,13 @@ typedef struct dns_rdata_rrsig { isc_mem_t * mctx; dns_rdatatype_t covered; dns_secalg_t algorithm; - isc_uint8_t labels; - isc_uint32_t originalttl; - isc_uint32_t timeexpire; - isc_uint32_t timesigned; - isc_uint16_t keyid; + uint8_t labels; + uint32_t originalttl; + uint32_t timeexpire; + uint32_t timesigned; + uint16_t keyid; dns_name_t signer; - isc_uint16_t siglen; + uint16_t siglen; unsigned char * signature; } dns_rdata_rrsig_t; diff --git a/lib/dns/rdata/generic/rt_21.h b/lib/dns/rdata/generic/rt_21.h index 605422924a..a9082c714d 100644 --- a/lib/dns/rdata/generic/rt_21.h +++ b/lib/dns/rdata/generic/rt_21.h @@ -19,7 +19,7 @@ typedef struct dns_rdata_rt { dns_rdatacommon_t common; isc_mem_t *mctx; - isc_uint16_t preference; + uint16_t preference; dns_name_t host; } dns_rdata_rt_t; diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c index 864c07d842..8606bfb481 100644 --- a/lib/dns/rdata/generic/sig_24.c +++ b/lib/dns/rdata/generic/sig_24.c @@ -26,7 +26,7 @@ fromtext_sig(ARGS_FROMTEXT) { isc_result_t result; dns_name_t name; isc_buffer_t buffer; - isc_uint32_t time_signed, time_expire; + uint32_t time_signed, time_expire; REQUIRE(type == dns_rdatatype_sig); diff --git a/lib/dns/rdata/generic/sig_24.h b/lib/dns/rdata/generic/sig_24.h index d1d5b73a3f..a3882d9ab2 100644 --- a/lib/dns/rdata/generic/sig_24.h +++ b/lib/dns/rdata/generic/sig_24.h @@ -21,13 +21,13 @@ typedef struct dns_rdata_sig_t { isc_mem_t * mctx; dns_rdatatype_t covered; dns_secalg_t algorithm; - isc_uint8_t labels; - isc_uint32_t originalttl; - isc_uint32_t timeexpire; - isc_uint32_t timesigned; - isc_uint16_t keyid; + uint8_t labels; + uint32_t originalttl; + uint32_t timeexpire; + uint32_t timesigned; + uint16_t keyid; dns_name_t signer; - isc_uint16_t siglen; + uint16_t siglen; unsigned char * signature; } dns_rdata_sig_t; diff --git a/lib/dns/rdata/generic/sink_40.c b/lib/dns/rdata/generic/sink_40.c index fc469bc817..283b763e3f 100644 --- a/lib/dns/rdata/generic/sink_40.c +++ b/lib/dns/rdata/generic/sink_40.c @@ -56,7 +56,7 @@ static inline isc_result_t totext_sink(ARGS_TOTEXT) { isc_region_t sr; char buf[sizeof("255 255 255")]; - isc_uint8_t meaning, coding, subcoding; + uint8_t meaning, coding, subcoding; REQUIRE(rdata->type == dns_rdatatype_sink); REQUIRE(rdata->length >= 3); diff --git a/lib/dns/rdata/generic/sink_40.h b/lib/dns/rdata/generic/sink_40.h index 55031a40a3..4e6e01e2dd 100644 --- a/lib/dns/rdata/generic/sink_40.h +++ b/lib/dns/rdata/generic/sink_40.h @@ -15,10 +15,10 @@ typedef struct dns_rdata_sink_t { dns_rdatacommon_t common; isc_mem_t * mctx; - isc_uint8_t meaning; - isc_uint8_t coding; - isc_uint8_t subcoding; - isc_uint16_t datalen; + uint8_t meaning; + uint8_t coding; + uint8_t subcoding; + uint16_t datalen; unsigned char * data; } dns_rdata_sink_t; diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c index 5d8e99008f..c47d17edf6 100644 --- a/lib/dns/rdata/generic/soa_6.c +++ b/lib/dns/rdata/generic/soa_6.c @@ -20,7 +20,7 @@ fromtext_soa(ARGS_FROMTEXT) { dns_name_t name; isc_buffer_t buffer; int i; - isc_uint32_t n; + uint32_t n; isc_boolean_t ok; REQUIRE(type == dns_rdatatype_soa); diff --git a/lib/dns/rdata/generic/soa_6.h b/lib/dns/rdata/generic/soa_6.h index 0fb39fc7d7..c9be985de6 100644 --- a/lib/dns/rdata/generic/soa_6.h +++ b/lib/dns/rdata/generic/soa_6.h @@ -19,11 +19,11 @@ typedef struct dns_rdata_soa { isc_mem_t *mctx; dns_name_t origin; dns_name_t contact; - isc_uint32_t serial; /*%< host order */ - isc_uint32_t refresh; /*%< host order */ - isc_uint32_t retry; /*%< host order */ - isc_uint32_t expire; /*%< host order */ - isc_uint32_t minimum; /*%< host order */ + uint32_t serial; /*%< host order */ + uint32_t refresh; /*%< host order */ + uint32_t retry; /*%< host order */ + uint32_t expire; /*%< host order */ + uint32_t minimum; /*%< host order */ } dns_rdata_soa_t; diff --git a/lib/dns/rdata/generic/spf_99.h b/lib/dns/rdata/generic/spf_99.h index f1305f4006..f10b790f9c 100644 --- a/lib/dns/rdata/generic/spf_99.h +++ b/lib/dns/rdata/generic/spf_99.h @@ -14,7 +14,7 @@ typedef struct dns_rdata_spf_string { - isc_uint8_t length; + uint8_t length; unsigned char *data; } dns_rdata_spf_string_t; @@ -22,9 +22,9 @@ typedef struct dns_rdata_spf { dns_rdatacommon_t common; isc_mem_t *mctx; unsigned char *txt; - isc_uint16_t txt_len; + uint16_t txt_len; /* private */ - isc_uint16_t offset; + uint16_t offset; } dns_rdata_spf_t; /* diff --git a/lib/dns/rdata/generic/sshfp_44.h b/lib/dns/rdata/generic/sshfp_44.h index e90f1a36a6..ba1129ae73 100644 --- a/lib/dns/rdata/generic/sshfp_44.h +++ b/lib/dns/rdata/generic/sshfp_44.h @@ -19,9 +19,9 @@ typedef struct dns_rdata_sshfp { dns_rdatacommon_t common; isc_mem_t *mctx; - isc_uint8_t algorithm; - isc_uint8_t digest_type; - isc_uint16_t length; + uint8_t algorithm; + uint8_t digest_type; + uint16_t length; unsigned char *digest; } dns_rdata_sshfp_t; diff --git a/lib/dns/rdata/generic/tkey_249.h b/lib/dns/rdata/generic/tkey_249.h index 7336b918e4..2fab08721d 100644 --- a/lib/dns/rdata/generic/tkey_249.h +++ b/lib/dns/rdata/generic/tkey_249.h @@ -20,13 +20,13 @@ typedef struct dns_rdata_tkey { dns_rdatacommon_t common; isc_mem_t * mctx; dns_name_t algorithm; - isc_uint32_t inception; - isc_uint32_t expire; - isc_uint16_t mode; - isc_uint16_t error; - isc_uint16_t keylen; + uint32_t inception; + uint32_t expire; + uint16_t mode; + uint16_t error; + uint16_t keylen; unsigned char * key; - isc_uint16_t otherlen; + uint16_t otherlen; unsigned char * other; } dns_rdata_tkey_t; diff --git a/lib/dns/rdata/generic/tlsa_52.h b/lib/dns/rdata/generic/tlsa_52.h index 51d21d7933..422fd8b9a8 100644 --- a/lib/dns/rdata/generic/tlsa_52.h +++ b/lib/dns/rdata/generic/tlsa_52.h @@ -19,10 +19,10 @@ typedef struct dns_rdata_tlsa { dns_rdatacommon_t common; isc_mem_t *mctx; - isc_uint8_t usage; - isc_uint8_t selector; - isc_uint8_t match; - isc_uint16_t length; + uint8_t usage; + uint8_t selector; + uint8_t match; + uint16_t length; unsigned char *data; } dns_rdata_tlsa_t; diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c index 832b72bf86..d31cf93db5 100644 --- a/lib/dns/rdata/generic/txt_16.c +++ b/lib/dns/rdata/generic/txt_16.c @@ -136,7 +136,7 @@ static inline isc_result_t generic_fromstruct_txt(ARGS_FROMSTRUCT) { dns_rdata_txt_t *txt = source; isc_region_t region; - isc_uint8_t length; + uint8_t length; REQUIRE(source != NULL); REQUIRE(txt->common.rdtype == type); @@ -294,7 +294,7 @@ generic_txt_first(dns_rdata_txt_t *txt) { static isc_result_t generic_txt_next(dns_rdata_txt_t *txt) { isc_region_t r; - isc_uint8_t length; + uint8_t length; REQUIRE(txt != NULL); REQUIRE(txt->txt != NULL && txt->txt_len != 0); diff --git a/lib/dns/rdata/generic/txt_16.h b/lib/dns/rdata/generic/txt_16.h index 24e66b0b6a..aaf94bf45e 100644 --- a/lib/dns/rdata/generic/txt_16.h +++ b/lib/dns/rdata/generic/txt_16.h @@ -15,7 +15,7 @@ typedef struct dns_rdata_txt_string { - isc_uint8_t length; + uint8_t length; unsigned char *data; } dns_rdata_txt_string_t; @@ -23,9 +23,9 @@ typedef struct dns_rdata_txt { dns_rdatacommon_t common; isc_mem_t *mctx; unsigned char *txt; - isc_uint16_t txt_len; + uint16_t txt_len; /* private */ - isc_uint16_t offset; + uint16_t offset; } dns_rdata_txt_t; /* diff --git a/lib/dns/rdata/generic/unspec_103.h b/lib/dns/rdata/generic/unspec_103.h index 70923845c8..9afb1bd591 100644 --- a/lib/dns/rdata/generic/unspec_103.h +++ b/lib/dns/rdata/generic/unspec_103.h @@ -18,7 +18,7 @@ typedef struct dns_rdata_unspec_t { dns_rdatacommon_t common; isc_mem_t *mctx; unsigned char *data; - isc_uint16_t datalen; + uint16_t datalen; } dns_rdata_unspec_t; #endif /* GENERIC_UNSPEC_103_H */ diff --git a/lib/dns/rdata/generic/uri_256.h b/lib/dns/rdata/generic/uri_256.h index 6e248a20b1..cea1d22611 100644 --- a/lib/dns/rdata/generic/uri_256.h +++ b/lib/dns/rdata/generic/uri_256.h @@ -16,10 +16,10 @@ typedef struct dns_rdata_uri { dns_rdatacommon_t common; isc_mem_t * mctx; - isc_uint16_t priority; - isc_uint16_t weight; + uint16_t priority; + uint16_t weight; unsigned char * target; - isc_uint16_t tgt_len; + uint16_t tgt_len; } dns_rdata_uri_t; #endif /* GENERIC_URI_256_H */ diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c index 20f98e3729..a846594db3 100644 --- a/lib/dns/rdata/generic/x25_19.c +++ b/lib/dns/rdata/generic/x25_19.c @@ -99,7 +99,7 @@ compare_x25(ARGS_COMPARE) { static inline isc_result_t fromstruct_x25(ARGS_FROMSTRUCT) { dns_rdata_x25_t *x25 = source; - isc_uint8_t i; + uint8_t i; REQUIRE(type == dns_rdatatype_x25); REQUIRE(source != NULL); diff --git a/lib/dns/rdata/generic/x25_19.h b/lib/dns/rdata/generic/x25_19.h index 903c6378e4..b10063ce4d 100644 --- a/lib/dns/rdata/generic/x25_19.h +++ b/lib/dns/rdata/generic/x25_19.h @@ -20,7 +20,7 @@ typedef struct dns_rdata_x25 { dns_rdatacommon_t common; isc_mem_t *mctx; unsigned char *x25; - isc_uint8_t x25_len; + uint8_t x25_len; } dns_rdata_x25_t; #endif /* GENERIC_X25_19_H */ diff --git a/lib/dns/rdata/hs_4/a_1.c b/lib/dns/rdata/hs_4/a_1.c index 531406065f..627d62d552 100644 --- a/lib/dns/rdata/hs_4/a_1.c +++ b/lib/dns/rdata/hs_4/a_1.c @@ -123,7 +123,7 @@ compare_hs_a(ARGS_COMPARE) { static inline isc_result_t fromstruct_hs_a(ARGS_FROMSTRUCT) { dns_rdata_hs_a_t *a = source; - isc_uint32_t n; + uint32_t n; REQUIRE(type == dns_rdatatype_a); REQUIRE(rdclass == dns_rdataclass_hs); @@ -142,7 +142,7 @@ fromstruct_hs_a(ARGS_FROMSTRUCT) { static inline isc_result_t tostruct_hs_a(ARGS_TOSTRUCT) { dns_rdata_hs_a_t *a = target; - isc_uint32_t n; + uint32_t n; isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_a); diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c index 36b06ee1f3..200f486102 100644 --- a/lib/dns/rdata/in_1/a6_38.c +++ b/lib/dns/rdata/in_1/a6_38.c @@ -273,9 +273,9 @@ fromstruct_in_a6(ARGS_FROMSTRUCT) { dns_rdata_in_a6_t *a6 = source; isc_region_t region; int octets; - isc_uint8_t bits; - isc_uint8_t first; - isc_uint8_t mask; + uint8_t bits; + uint8_t first; + uint8_t mask; REQUIRE(type == dns_rdatatype_a6); REQUIRE(rdclass == dns_rdataclass_in); diff --git a/lib/dns/rdata/in_1/a6_38.h b/lib/dns/rdata/in_1/a6_38.h index f2aedfc291..981164046d 100644 --- a/lib/dns/rdata/in_1/a6_38.h +++ b/lib/dns/rdata/in_1/a6_38.h @@ -20,7 +20,7 @@ typedef struct dns_rdata_in_a6 { dns_rdatacommon_t common; isc_mem_t *mctx; dns_name_t prefix; - isc_uint8_t prefixlen; + uint8_t prefixlen; struct in6_addr in6_addr; } dns_rdata_in_a6_t; diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c index 5db516d22b..5ad77a1b7f 100644 --- a/lib/dns/rdata/in_1/a_1.c +++ b/lib/dns/rdata/in_1/a_1.c @@ -124,7 +124,7 @@ compare_in_a(ARGS_COMPARE) { static inline isc_result_t fromstruct_in_a(ARGS_FROMSTRUCT) { dns_rdata_in_a_t *a = source; - isc_uint32_t n; + uint32_t n; REQUIRE(type == dns_rdatatype_a); REQUIRE(rdclass == dns_rdataclass_in); @@ -144,7 +144,7 @@ fromstruct_in_a(ARGS_FROMSTRUCT) { static inline isc_result_t tostruct_in_a(ARGS_TOSTRUCT) { dns_rdata_in_a_t *a = target; - isc_uint32_t n; + uint32_t n; isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_a); diff --git a/lib/dns/rdata/in_1/apl_42.c b/lib/dns/rdata/in_1/apl_42.c index 6a6ea5334b..13d160adde 100644 --- a/lib/dns/rdata/in_1/apl_42.c +++ b/lib/dns/rdata/in_1/apl_42.c @@ -22,8 +22,8 @@ fromtext_in_apl(ARGS_FROMTEXT) { isc_token_t token; unsigned char addr[16]; unsigned long afi; - isc_uint8_t prefix; - isc_uint8_t len; + uint8_t prefix; + uint8_t len; isc_boolean_t neg; char *cp, *ap, *slash; int n; @@ -104,9 +104,9 @@ static inline isc_result_t totext_in_apl(ARGS_TOTEXT) { isc_region_t sr; isc_region_t ir; - isc_uint16_t afi; - isc_uint8_t prefix; - isc_uint8_t len; + uint16_t afi; + uint8_t prefix; + uint8_t len; isc_boolean_t neg; unsigned char buf[16]; char txt[sizeof(" !64000:")]; @@ -169,9 +169,9 @@ static inline isc_result_t fromwire_in_apl(ARGS_FROMWIRE) { isc_region_t sr, sr2; isc_region_t tr; - isc_uint16_t afi; - isc_uint8_t prefix; - isc_uint8_t len; + uint16_t afi; + uint8_t prefix; + uint8_t len; REQUIRE(type == dns_rdatatype_apl); REQUIRE(rdclass == dns_rdataclass_in); @@ -299,7 +299,7 @@ freestruct_in_apl(ARGS_FREESTRUCT) { isc_result_t dns_rdata_apl_first(dns_rdata_in_apl_t *apl) { - isc_uint32_t length; + uint32_t length; REQUIRE(apl != NULL); REQUIRE(apl->common.rdtype == dns_rdatatype_apl); @@ -325,7 +325,7 @@ dns_rdata_apl_first(dns_rdata_in_apl_t *apl) { isc_result_t dns_rdata_apl_next(dns_rdata_in_apl_t *apl) { - isc_uint32_t length; + uint32_t length; REQUIRE(apl != NULL); REQUIRE(apl->common.rdtype == dns_rdatatype_apl); @@ -357,7 +357,7 @@ dns_rdata_apl_next(dns_rdata_in_apl_t *apl) { isc_result_t dns_rdata_apl_current(dns_rdata_in_apl_t *apl, dns_rdata_apl_ent_t *ent) { - isc_uint32_t length; + uint32_t length; REQUIRE(apl != NULL); REQUIRE(apl->common.rdtype == dns_rdatatype_apl); diff --git a/lib/dns/rdata/in_1/apl_42.h b/lib/dns/rdata/in_1/apl_42.h index 429de8fbf8..a931daab23 100644 --- a/lib/dns/rdata/in_1/apl_42.h +++ b/lib/dns/rdata/in_1/apl_42.h @@ -16,9 +16,9 @@ typedef struct dns_rdata_apl_ent { isc_boolean_t negative; - isc_uint16_t family; - isc_uint8_t prefix; - isc_uint8_t length; + uint16_t family; + uint8_t prefix; + uint8_t length; unsigned char *data; } dns_rdata_apl_ent_t; @@ -27,9 +27,9 @@ typedef struct dns_rdata_in_apl { isc_mem_t *mctx; /* type & class specific elements */ unsigned char *apl; - isc_uint16_t apl_len; + uint16_t apl_len; /* private */ - isc_uint16_t offset; + uint16_t offset; } dns_rdata_in_apl_t; /* diff --git a/lib/dns/rdata/in_1/kx_36.h b/lib/dns/rdata/in_1/kx_36.h index 1074aa0061..577a4c49e1 100644 --- a/lib/dns/rdata/in_1/kx_36.h +++ b/lib/dns/rdata/in_1/kx_36.h @@ -19,7 +19,7 @@ typedef struct dns_rdata_in_kx { dns_rdatacommon_t common; isc_mem_t *mctx; - isc_uint16_t preference; + uint16_t preference; dns_name_t exchange; } dns_rdata_in_kx_t; diff --git a/lib/dns/rdata/in_1/nsap_22.h b/lib/dns/rdata/in_1/nsap_22.h index 23098efa11..79599efd08 100644 --- a/lib/dns/rdata/in_1/nsap_22.h +++ b/lib/dns/rdata/in_1/nsap_22.h @@ -20,7 +20,7 @@ typedef struct dns_rdata_in_nsap { dns_rdatacommon_t common; isc_mem_t *mctx; unsigned char *nsap; - isc_uint16_t nsap_len; + uint16_t nsap_len; } dns_rdata_in_nsap_t; #endif /* IN_1_NSAP_22_H */ diff --git a/lib/dns/rdata/in_1/px_26.h b/lib/dns/rdata/in_1/px_26.h index 6760163cee..3cab1f1512 100644 --- a/lib/dns/rdata/in_1/px_26.h +++ b/lib/dns/rdata/in_1/px_26.h @@ -19,7 +19,7 @@ typedef struct dns_rdata_in_px { dns_rdatacommon_t common; isc_mem_t *mctx; - isc_uint16_t preference; + uint16_t preference; dns_name_t map822; dns_name_t mapx400; } dns_rdata_in_px_t; diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c index e185abb915..f31bd3b406 100644 --- a/lib/dns/rdata/in_1/srv_33.c +++ b/lib/dns/rdata/in_1/srv_33.c @@ -297,7 +297,7 @@ additionaldata_in_srv(ARGS_ADDLDATA) { dns_name_t name; dns_offsets_t offsets; isc_region_t region; - isc_uint16_t port; + uint16_t port; isc_result_t result; REQUIRE(rdata->type == dns_rdatatype_srv); diff --git a/lib/dns/rdata/in_1/srv_33.h b/lib/dns/rdata/in_1/srv_33.h index 8a76a29932..78d5ba9c20 100644 --- a/lib/dns/rdata/in_1/srv_33.h +++ b/lib/dns/rdata/in_1/srv_33.h @@ -18,9 +18,9 @@ typedef struct dns_rdata_in_srv { dns_rdatacommon_t common; isc_mem_t *mctx; - isc_uint16_t priority; - isc_uint16_t weight; - isc_uint16_t port; + uint16_t priority; + uint16_t weight; + uint16_t port; dns_name_t target; } dns_rdata_in_srv_t; diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c index 1ed3a514e7..0c7aadd749 100644 --- a/lib/dns/rdata/in_1/wks_11.c +++ b/lib/dns/rdata/in_1/wks_11.c @@ -293,7 +293,7 @@ compare_in_wks(ARGS_COMPARE) { static inline isc_result_t fromstruct_in_wks(ARGS_FROMSTRUCT) { dns_rdata_in_wks_t *wks = source; - isc_uint32_t a; + uint32_t a; REQUIRE(type == dns_rdatatype_wks); REQUIRE(rdclass == dns_rdataclass_in); @@ -315,7 +315,7 @@ fromstruct_in_wks(ARGS_FROMSTRUCT) { static inline isc_result_t tostruct_in_wks(ARGS_TOSTRUCT) { dns_rdata_in_wks_t *wks = target; - isc_uint32_t n; + uint32_t n; isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_wks); diff --git a/lib/dns/rdata/in_1/wks_11.h b/lib/dns/rdata/in_1/wks_11.h index 7c0491081c..d7883ddbe2 100644 --- a/lib/dns/rdata/in_1/wks_11.h +++ b/lib/dns/rdata/in_1/wks_11.h @@ -17,9 +17,9 @@ typedef struct dns_rdata_in_wks { dns_rdatacommon_t common; isc_mem_t *mctx; struct in_addr in_addr; - isc_uint16_t protocol; + uint16_t protocol; unsigned char *map; - isc_uint16_t map_len; + uint16_t map_len; } dns_rdata_in_wks_t; #endif /* IN_1_WKS_11_H */ diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c index c1bbbc2152..6b71e2c8ac 100644 --- a/lib/dns/rdataset.c +++ b/lib/dns/rdataset.c @@ -13,6 +13,7 @@ #include +#include #include #include @@ -48,7 +49,7 @@ dns_trust_totext(dns_trust_t trust) { return (trustnames[trust]); } -#define DNS_RDATASET_COUNT_UNDEFINED ISC_UINT32_MAX +#define DNS_RDATASET_COUNT_UNDEFINED UINT32_MAX void dns_rdataset_init(dns_rdataset_t *rdataset) { @@ -337,7 +338,7 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name, struct towire_sort *out = out_fixed; dns_fixedname_t fixed; dns_name_t *name; - isc_uint16_t offset; + uint16_t offset; UNUSED(state); @@ -400,7 +401,7 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name, } if ((shuffle || sort)) { - isc_uint32_t seed = 0; + uint32_t seed = 0; unsigned int j; /* @@ -512,7 +513,7 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name, INSIST((target->used >= rdlen.used + 2) && (target->used - rdlen.used - 2 < 65536)); isc_buffer_putuint16(&rdlen, - (isc_uint16_t)(target->used - + (uint16_t)(target->used - rdlen.used - 2)); added++; } @@ -539,13 +540,13 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name, rollback: if (partial && result == ISC_R_NOSPACE) { INSIST(rrbuffer.used < 65536); - dns_compress_rollback(cctx, (isc_uint16_t)rrbuffer.used); + dns_compress_rollback(cctx, (uint16_t)rrbuffer.used); *countp += added; *target = rrbuffer; goto cleanup; } INSIST(savedbuffer.used < 65536); - dns_compress_rollback(cctx, (isc_uint16_t)savedbuffer.used); + dns_compress_rollback(cctx, (uint16_t)savedbuffer.used); *countp = 0; *target = savedbuffer; @@ -730,7 +731,7 @@ dns_rdataset_trimttl(dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, dns_rdata_rrsig_t *rrsig, isc_stdtime_t now, isc_boolean_t acceptexpired) { - isc_uint32_t ttl = 0; + uint32_t ttl = 0; REQUIRE(DNS_RDATASET_VALID(rdataset)); REQUIRE(DNS_RDATASET_VALID(sigrdataset)); diff --git a/lib/dns/request.c b/lib/dns/request.c index b55d3fd86e..edcc9d503f 100644 --- a/lib/dns/request.c +++ b/lib/dns/request.c @@ -13,6 +13,8 @@ #include +#include + #include #include #include @@ -47,8 +49,8 @@ struct dns_requestmgr { isc_mem_t *mctx; /* locked */ - isc_int32_t eref; - isc_int32_t iref; + int32_t eref; + int32_t iref; isc_timermgr_t *timermgr; isc_socketmgr_t *socketmgr; isc_taskmgr_t *taskmgr; @@ -66,7 +68,7 @@ struct dns_request { unsigned int magic; unsigned int hash; isc_mem_t *mctx; - isc_int32_t flags; + int32_t flags; ISC_LINK(dns_request_t) link; isc_buffer_t *query; isc_buffer_t *answer; @@ -806,7 +808,7 @@ dns_request_createraw(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf, if (result != ISC_R_SUCCESS) goto cleanup; if (tcp) - isc_buffer_putuint16(request->query, (isc_uint16_t)r.length); + isc_buffer_putuint16(request->query, (uint16_t)r.length); result = isc_buffer_copyregion(request->query, &r); if (result != ISC_R_SUCCESS) goto cleanup; @@ -1116,7 +1118,7 @@ req_render(dns_message_t *message, isc_buffer_t **bufferp, if (result != ISC_R_SUCCESS) goto cleanup; if (tcp) - isc_buffer_putuint16(buf2, (isc_uint16_t)r.length); + isc_buffer_putuint16(buf2, (uint16_t)r.length); result = isc_buffer_copyregion(buf2, &r); if (result != ISC_R_SUCCESS) goto cleanup; diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 7d938cd140..c99d92cdd7 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -305,7 +305,7 @@ struct fetchctx { dns_db_t * cache; dns_adb_t * adb; isc_boolean_t ns_ttl_ok; - isc_uint32_t ns_ttl; + uint32_t ns_ttl; isc_counter_t * qc; isc_boolean_t minimized; unsigned int qmin_labels; @@ -357,8 +357,8 @@ struct fetchctx { /*% * Random numbers to use for mixing up server addresses. */ - isc_uint32_t rand_buf; - isc_uint32_t rand_bits; + uint32_t rand_buf; + uint32_t rand_bits; /*% * Fetch-local statistics for detailed logging. @@ -367,7 +367,7 @@ struct fetchctx { isc_result_t vresult; /*%< validation result */ int exitline; isc_time_t start; - isc_uint64_t duration; + uint64_t duration; isc_boolean_t logged; unsigned int querysent; unsigned int referrals; @@ -437,9 +437,9 @@ typedef struct fctxcount fctxcount_t; struct fctxcount { dns_fixedname_t fdname; dns_name_t *domain; - isc_uint32_t count; - isc_uint32_t allowed; - isc_uint32_t dropped; + uint32_t count; + uint32_t allowed; + uint32_t dropped; isc_stdtime_t logged; ISC_LINK(fctxcount_t) link; }; @@ -486,9 +486,9 @@ struct dns_resolver { unsigned int nbuckets; fctxbucket_t * buckets; zonebucket_t * dbuckets; - isc_uint32_t lame_ttl; + uint32_t lame_ttl; ISC_LIST(alternate_t) alternates; - isc_uint16_t udpsize; + uint16_t udpsize; #if USE_ALGLOCK isc_rwlock_t alglock; #endif @@ -1188,8 +1188,8 @@ fctx_cancelquery(resquery_t **queryp, dns_dispatchevent_t **deventp, dns_resstatscounter_queryrtt5); } } else { - isc_uint32_t value; - isc_uint32_t mask; + uint32_t value; + uint32_t mask; if ((query->options & DNS_FETCHOPT_NOEDNS0) == 0) dns_adb_ednsto(fctx->adb, query->addrinfo, @@ -1813,7 +1813,7 @@ resquery_senddone(isc_task_t *task, isc_event_t *event) { static inline isc_result_t fctx_addopt(dns_message_t *message, unsigned int version, - isc_uint16_t udpsize, dns_ednsopt_t *ednsopts, size_t count) + uint16_t udpsize, dns_ednsopt_t *ednsopts, size_t count) { dns_rdataset_t *rdataset = NULL; isc_result_t result; @@ -2368,7 +2368,7 @@ resquery_send(resquery_t *query) { isc_boolean_t tcp = ISC_TF((query->options & DNS_FETCHOPT_TCP) != 0); dns_ednsopt_t ednsopts[DNS_EDNSOPTIONS]; unsigned ednsopt = 0; - isc_uint16_t hint = 0, udpsize = 0; /* No EDNS */ + uint16_t hint = 0, udpsize = 0; /* No EDNS */ #ifdef HAVE_DNSTAP isc_sockaddr_t localaddr, *la = NULL; unsigned char zone[DNS_NAME_MAXWIRE]; @@ -2556,7 +2556,7 @@ resquery_send(resquery_t *query) { isc_boolean_t sendcookie = res->view->sendcookie; isc_boolean_t tcpkeepalive = ISC_FALSE; unsigned char cookie[64]; - isc_uint16_t padding = 0; + uint16_t padding = 0; if ((flags & FCTX_ADDRINFO_EDNSOK) != 0 && (query->options & DNS_FETCHOPT_EDNS512) == 0) { @@ -2599,7 +2599,7 @@ resquery_send(resquery_t *query) { /* Request NSID/COOKIE/VERSION for current peer? */ if (peer != NULL) { - isc_uint8_t ednsversion; + uint8_t ednsversion; (void) dns_peer_getrequestnsid(peer, &reqnsid); (void) dns_peer_getsendcookie(peer, &sendcookie); @@ -2630,7 +2630,7 @@ resquery_send(resquery_t *query) { if (sendcookie) { INSIST(ednsopt < DNS_EDNSOPTIONS); ednsopts[ednsopt].code = DNS_OPT_COOKIE; - ednsopts[ednsopt].length = (isc_uint16_t) + ednsopts[ednsopt].length = (uint16_t) dns_adb_getcookie(fctx->adb, query->addrinfo, cookie, @@ -2776,7 +2776,7 @@ resquery_send(resquery_t *query) { */ if (tcp) { isc_buffer_usedregion(&query->buffer, &r); - isc_buffer_putuint16(&tcpbuffer, (isc_uint16_t)r.length); + isc_buffer_putuint16(&tcpbuffer, (uint16_t)r.length); isc_buffer_add(&tcpbuffer, r.length); } @@ -5102,9 +5102,9 @@ validated(isc_task_t *task, isc_event_t *event) { isc_result_t eresult = ISC_R_SUCCESS; isc_result_t result = ISC_R_SUCCESS; isc_stdtime_t now; - isc_uint32_t ttl; + uint32_t ttl; unsigned options; - isc_uint32_t bucketnum; + uint32_t bucketnum; dns_fixedname_t fwild; dns_name_t *wild = NULL; @@ -6258,7 +6258,7 @@ ncache_message(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, isc_boolean_t need_validation, secure_domain; dns_name_t *aname; dns_fetchevent_t *event; - isc_uint32_t ttl; + uint32_t ttl; unsigned int valoptions = 0; isc_boolean_t checknta = ISC_TRUE; @@ -6980,12 +6980,12 @@ log_nsid(isc_buffer_t *opt, size_t nsid_len, resquery_t *query, { static const char hex[17] = "0123456789abcdef"; char addrbuf[ISC_SOCKADDR_FORMATSIZE]; - isc_uint16_t buflen, i; + uint16_t buflen, i; unsigned char *p, *nsid; unsigned char *buf = NULL, *pbuf = NULL; /* Allocate buffer for storing hex version of the NSID */ - buflen = (isc_uint16_t)nsid_len * 2 + 1; + buflen = (uint16_t)nsid_len * 2 + 1; buf = isc_mem_get(mctx, buflen); if (buf == NULL) goto cleanup; @@ -7642,8 +7642,8 @@ rctx_opt(respctx_t *rctx) { dns_rdata_t rdata; isc_buffer_t optbuf; isc_result_t result; - isc_uint16_t optcode; - isc_uint16_t optlen; + uint16_t optcode; + uint16_t optlen; unsigned char *optvalue; dns_adbaddrinfo_t *addrinfo; unsigned char cookie[8]; @@ -10666,14 +10666,14 @@ dns_resolver_taskmgr(dns_resolver_t *resolver) { return (resolver->taskmgr); } -isc_uint32_t +uint32_t dns_resolver_getlamettl(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); return (resolver->lame_ttl); } void -dns_resolver_setlamettl(dns_resolver_t *resolver, isc_uint32_t lame_ttl) { +dns_resolver_setlamettl(dns_resolver_t *resolver, uint32_t lame_ttl) { REQUIRE(VALID_RESOLVER(resolver)); resolver->lame_ttl = lame_ttl; } @@ -10720,12 +10720,12 @@ dns_resolver_addalternate(dns_resolver_t *resolver, const isc_sockaddr_t *alt, } void -dns_resolver_setudpsize(dns_resolver_t *resolver, isc_uint16_t udpsize) { +dns_resolver_setudpsize(dns_resolver_t *resolver, uint16_t udpsize) { REQUIRE(VALID_RESOLVER(resolver)); resolver->udpsize = udpsize; } -isc_uint16_t +uint16_t dns_resolver_getudpsize(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); return (resolver->udpsize); @@ -11106,8 +11106,8 @@ dns_resolver_getmustbesecure(dns_resolver_t *resolver, const dns_name_t *name) { } void -dns_resolver_getclientsperquery(dns_resolver_t *resolver, isc_uint32_t *cur, - isc_uint32_t *min, isc_uint32_t *max) +dns_resolver_getclientsperquery(dns_resolver_t *resolver, uint32_t *cur, + uint32_t *min, uint32_t *max) { REQUIRE(VALID_RESOLVER(resolver)); @@ -11122,8 +11122,8 @@ dns_resolver_getclientsperquery(dns_resolver_t *resolver, isc_uint32_t *cur, } void -dns_resolver_setclientsperquery(dns_resolver_t *resolver, isc_uint32_t min, - isc_uint32_t max) +dns_resolver_setclientsperquery(dns_resolver_t *resolver, uint32_t min, + uint32_t max) { REQUIRE(VALID_RESOLVER(resolver)); @@ -11134,7 +11134,7 @@ dns_resolver_setclientsperquery(dns_resolver_t *resolver, isc_uint32_t min, } void -dns_resolver_setfetchesperzone(dns_resolver_t *resolver, isc_uint32_t clients) +dns_resolver_setfetchesperzone(dns_resolver_t *resolver, uint32_t clients) { REQUIRE(VALID_RESOLVER(resolver)); diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c index 2698e69aab..f8427923ac 100644 --- a/lib/dns/rpz.c +++ b/lib/dns/rpz.c @@ -103,7 +103,7 @@ dns_rpz_update_taskaction(isc_task_t *task, isc_event_t *event); * Use a private definition of IPv6 addresses because s6_addr32 is not * always defined and our IPv6 addresses are in non-standard byte order */ -typedef isc_uint32_t dns_rpz_cidr_word_t; +typedef uint32_t dns_rpz_cidr_word_t; #define DNS_RPZ_CIDR_WORD_BITS ((int)sizeof(dns_rpz_cidr_word_t)*8) #define DNS_RPZ_CIDR_KEY_BITS ((int)sizeof(dns_rpz_cidr_key_t)*8) #define DNS_RPZ_CIDR_WORDS (128/DNS_RPZ_CIDR_WORD_BITS) @@ -556,7 +556,7 @@ fix_qname_skip_recurse(dns_rpz_zones_t *rpzs) { isc_log_write(dns_lctx, DNS_LOGCATEGORY_RPZ, DNS_LOGMODULE_RBTDB, DNS_RPZ_DEBUG_QUIET, "computed RPZ qname_skip_recurse mask=0x%" PRIx64, - (isc_uint64_t) mask); + (uint64_t) mask); rpzs->have.qname_skip_recurse = mask; } @@ -1585,7 +1585,7 @@ isc_result_t dns_rpz_dbupdate_callback(dns_db_t *db, void *fn_arg) { dns_rpz_zone_t *zone = (dns_rpz_zone_t *) fn_arg; isc_time_t now; - isc_uint64_t tdiff; + uint64_t tdiff; isc_result_t result = ISC_R_SUCCESS; char dname[DNS_NAME_FORMATSIZE]; @@ -1618,7 +1618,7 @@ dns_rpz_dbupdate_callback(dns_db_t *db, void *fn_arg) { isc_time_now(&now); tdiff = isc_time_microdiff(&now, &zone->lastupdated) / 1000000; if (tdiff < zone->min_update_interval) { - isc_uint64_t defer = zone->min_update_interval - tdiff; + uint64_t defer = zone->min_update_interval - tdiff; isc_interval_t interval; dns_name_format(&zone->origin, dname, DNS_NAME_FORMATSIZE); @@ -1693,7 +1693,7 @@ setup_update(dns_rpz_zone_t *rpz) { isc_result_t result; char domain[DNS_NAME_FORMATSIZE]; unsigned int nodecount; - isc_uint32_t hashsize; + uint32_t hashsize; dns_name_format(&rpz->origin, domain, DNS_NAME_FORMATSIZE); isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, @@ -1808,7 +1808,7 @@ finish_update(dns_rpz_zone_t *rpz) { * If there's an update pending schedule it */ if (rpz->updatepending == ISC_TRUE) { - isc_uint64_t defer = rpz->min_update_interval; + uint64_t defer = rpz->min_update_interval; isc_interval_t interval; dns_name_format(&rpz->origin, dname, DNS_NAME_FORMATSIZE); diff --git a/lib/dns/rriterator.c b/lib/dns/rriterator.c index f8bc7ff09e..3a6b9a1704 100644 --- a/lib/dns/rriterator.c +++ b/lib/dns/rriterator.c @@ -18,6 +18,8 @@ #include +#include + #include #include @@ -179,7 +181,7 @@ dns_rriterator_destroy(dns_rriterator_t *it) { void dns_rriterator_current(dns_rriterator_t *it, dns_name_t **name, - isc_uint32_t *ttl, dns_rdataset_t **rdataset, + uint32_t *ttl, dns_rdataset_t **rdataset, dns_rdata_t **rdata) { REQUIRE(name != NULL && *name == NULL); diff --git a/lib/dns/rrl.c b/lib/dns/rrl.c index a6616c5550..34e1d9fe6c 100644 --- a/lib/dns/rrl.c +++ b/lib/dns/rrl.c @@ -18,6 +18,9 @@ /* #define ISC_LIST_CHECKINIT */ #include + +#include + #include #include #include @@ -46,7 +49,7 @@ log_end(dns_rrl_t *rrl, dns_rrl_entry_t *e, isc_boolean_t early, */ static int hash_divisor(unsigned int initial) { - static isc_uint16_t primes[] = { + static uint16_t primes[] = { 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, #if 0 @@ -66,7 +69,7 @@ hash_divisor(unsigned int initial) { }; int divisions, tries; unsigned int result; - isc_uint16_t *pp, p; + uint16_t *pp, p; result = initial; @@ -366,9 +369,9 @@ key_cmp(const dns_rrl_key_t *a, const dns_rrl_key_t *b) { return (ISC_FALSE); } -static inline isc_uint32_t +static inline uint32_t hash_key(const dns_rrl_key_t *key) { - isc_uint32_t hval; + uint32_t hval; int i; hval = key->w[0]; @@ -493,7 +496,7 @@ get_entry(dns_rrl_t *rrl, const isc_sockaddr_t *client_addr, isc_boolean_t create, char *log_buf, unsigned int log_buf_len) { dns_rrl_key_t key; - isc_uint32_t hval; + uint32_t hval; dns_rrl_entry_t *e; dns_rrl_hash_t *hash; dns_rrl_bin_t *new_bin, *old_bin; @@ -1247,7 +1250,7 @@ dns_rrl_view_destroy(dns_view_t *view) { */ if (rrl->num_logged > 0) - log_stops(rrl, 0, ISC_INT32_MAX, log_buf, sizeof(log_buf)); + log_stops(rrl, 0, INT32_MAX, log_buf, sizeof(log_buf)); for (i = 0; i < DNS_RRL_QNAMES; ++i) { if (rrl->qnames[i] == NULL) diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c index d92296742e..2cfbdf71c3 100644 --- a/lib/dns/sdb.c +++ b/lib/dns/sdb.c @@ -13,6 +13,7 @@ #include +#include #include #include @@ -505,7 +506,7 @@ dns_sdb_putnamedrdata(dns_sdballnodes_t *allnodes, const char *name, isc_result_t dns_sdb_putsoa(dns_sdblookup_t *lookup, const char *mname, const char *rname, - isc_uint32_t serial) + uint32_t serial) { char str[2 * DNS_NAME_MAXTEXT + 5 * (sizeof("2147483647")) + 7]; int n; diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c index 1ae1ed01cf..73209d7d47 100644 --- a/lib/dns/sdlz.c +++ b/lib/dns/sdlz.c @@ -47,6 +47,8 @@ /*! \file */ #include + +#include #include #include @@ -1781,7 +1783,7 @@ dns_sdlzssumatch(const dns_name_t *signer, const dns_name_t *name, char b_key[DST_KEY_FORMATSIZE]; isc_buffer_t *tkey_token = NULL; isc_region_t token_region = { NULL, 0 }; - isc_uint32_t token_len = 0; + uint32_t token_len = 0; isc_boolean_t ret; REQUIRE(driverarg != NULL); @@ -2022,7 +2024,7 @@ dns_sdlz_putnamedrr(dns_sdlzallnodes_t *allnodes, const char *name, isc_result_t dns_sdlz_putsoa(dns_sdlzlookup_t *lookup, const char *mname, const char *rname, - isc_uint32_t serial) + uint32_t serial) { char str[2 * DNS_NAME_MAXTEXT + 5 * (sizeof("2147483647")) + 7]; int n; diff --git a/lib/dns/soa.c b/lib/dns/soa.c index c5dc4553cd..7fd75714f6 100644 --- a/lib/dns/soa.c +++ b/lib/dns/soa.c @@ -13,6 +13,8 @@ /*! \file */ #include + +#include #include #include @@ -22,7 +24,7 @@ #include #include -static inline isc_uint32_t +static inline uint32_t decode_uint32(unsigned char *p) { return ((p[0] << 24) + (p[1] << 16) + @@ -31,14 +33,14 @@ decode_uint32(unsigned char *p) { } static inline void -encode_uint32(isc_uint32_t val, unsigned char *p) { - p[0] = (isc_uint8_t)(val >> 24); - p[1] = (isc_uint8_t)(val >> 16); - p[2] = (isc_uint8_t)(val >> 8); - p[3] = (isc_uint8_t)(val >> 0); +encode_uint32(uint32_t val, unsigned char *p) { + p[0] = (uint8_t)(val >> 24); + p[1] = (uint8_t)(val >> 16); + p[2] = (uint8_t)(val >> 8); + p[3] = (uint8_t)(val >> 0); } -static isc_uint32_t +static uint32_t soa_get(dns_rdata_t *rdata, int offset) { INSIST(rdata->type == dns_rdatatype_soa); /* @@ -59,9 +61,9 @@ soa_get(dns_rdata_t *rdata, int offset) { isc_result_t dns_soa_buildrdata(const dns_name_t *origin, const dns_name_t *contact, dns_rdataclass_t rdclass, - isc_uint32_t serial, isc_uint32_t refresh, - isc_uint32_t retry, isc_uint32_t expire, - isc_uint32_t minimum, unsigned char *buffer, + uint32_t serial, uint32_t refresh, + uint32_t retry, uint32_t expire, + uint32_t minimum, unsigned char *buffer, dns_rdata_t *rdata) { dns_rdata_soa_t soa; isc_buffer_t rdatabuf; @@ -89,29 +91,29 @@ dns_soa_buildrdata(const dns_name_t *origin, const dns_name_t *contact, &soa, &rdatabuf)); } -isc_uint32_t +uint32_t dns_soa_getserial(dns_rdata_t *rdata) { return soa_get(rdata, 0); } -isc_uint32_t +uint32_t dns_soa_getrefresh(dns_rdata_t *rdata) { return soa_get(rdata, 4); } -isc_uint32_t +uint32_t dns_soa_getretry(dns_rdata_t *rdata) { return soa_get(rdata, 8); } -isc_uint32_t +uint32_t dns_soa_getexpire(dns_rdata_t *rdata) { return soa_get(rdata, 12); } -isc_uint32_t +uint32_t dns_soa_getminimum(dns_rdata_t *rdata) { return soa_get(rdata, 16); } static void -soa_set(dns_rdata_t *rdata, isc_uint32_t val, int offset) { +soa_set(dns_rdata_t *rdata, uint32_t val, int offset) { INSIST(rdata->type == dns_rdatatype_soa); INSIST(rdata->length >= 20); INSIST(offset >= 0 && offset <= 16); @@ -119,22 +121,22 @@ soa_set(dns_rdata_t *rdata, isc_uint32_t val, int offset) { } void -dns_soa_setserial(isc_uint32_t val, dns_rdata_t *rdata) { +dns_soa_setserial(uint32_t val, dns_rdata_t *rdata) { soa_set(rdata, val, 0); } void -dns_soa_setrefresh(isc_uint32_t val, dns_rdata_t *rdata) { +dns_soa_setrefresh(uint32_t val, dns_rdata_t *rdata) { soa_set(rdata, val, 4); } void -dns_soa_setretry(isc_uint32_t val, dns_rdata_t *rdata) { +dns_soa_setretry(uint32_t val, dns_rdata_t *rdata) { soa_set(rdata, val, 8); } void -dns_soa_setexpire(isc_uint32_t val, dns_rdata_t *rdata) { +dns_soa_setexpire(uint32_t val, dns_rdata_t *rdata) { soa_set(rdata, val, 12); } void -dns_soa_setminimum(isc_uint32_t val, dns_rdata_t *rdata) { +dns_soa_setminimum(uint32_t val, dns_rdata_t *rdata) { soa_set(rdata, val, 16); } diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c index 64d576b9d9..463e53b4f3 100644 --- a/lib/dns/spnego.c +++ b/lib/dns/spnego.c @@ -129,6 +129,9 @@ * harmless in any case. */ +#include + +#include #include #include @@ -314,11 +317,11 @@ fix_dce(size_t reallen, size_t * len); #include "spnego_asn1.c" /* - * Force the oid arrays to be isc_uint64_t aligned to silence warnings + * Force the oid arrays to be uint64_t aligned to silence warnings * about the arrays not being properly aligned for (void *). */ -typedef union { unsigned char b[8]; isc_uint64_t _align; } aligned8; -typedef union { unsigned char b[16]; isc_uint64_t _align[2]; } aligned16; +typedef union { unsigned char b[8]; uint64_t _align; } aligned8; +typedef union { unsigned char b[16]; uint64_t _align[2]; } aligned16; static aligned16 gss_krb5_mech_oid_bytes = { { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x12, 0x01, 0x02, 0x02 } diff --git a/lib/dns/ssu_external.c b/lib/dns/ssu_external.c index 55e021d676..62d899ee73 100644 --- a/lib/dns/ssu_external.c +++ b/lib/dns/ssu_external.c @@ -17,7 +17,9 @@ */ #include + #include +#include #include #ifdef ISC_PLATFORM_HAVESYSUNH @@ -130,8 +132,8 @@ dns_ssu_external_match(const dns_name_t *identity, isc_region_t token_region = {NULL, 0}; unsigned char *data; isc_buffer_t buf; - isc_uint32_t token_len = 0; - isc_uint32_t reply; + uint32_t token_len = 0; + uint32_t reply; ssize_t ret; /* The identity contains local:/path/to/socket */ @@ -176,14 +178,14 @@ dns_ssu_external_match(const dns_name_t *identity, dns_rdatatype_format(type, b_type, sizeof(b_type)); /* Work out how big the request will be */ - req_len = sizeof(isc_uint32_t) + /* Format version */ - sizeof(isc_uint32_t) + /* Length */ + req_len = sizeof(uint32_t) + /* Format version */ + sizeof(uint32_t) + /* Length */ strlen(b_signer) + 1 + /* Signer */ strlen(b_name) + 1 + /* Name */ strlen(b_addr) + 1 + /* Address */ strlen(b_type) + 1 + /* Type */ strlen(b_key) + 1 + /* Key */ - sizeof(isc_uint32_t) + /* tkey_token length */ + sizeof(uint32_t) + /* tkey_token length */ token_len; /* tkey_token */ @@ -229,8 +231,8 @@ dns_ssu_external_match(const dns_name_t *identity, } /* Receive the reply */ - ret = read(fd, &reply, sizeof(isc_uint32_t)); - if (ret != (ssize_t) sizeof(isc_uint32_t)) { + ret = read(fd, &reply, sizeof(uint32_t)); + if (ret != (ssize_t) sizeof(uint32_t)) { char strbuf[ISC_STRERRORSIZE]; isc__strerror(errno, strbuf, sizeof(strbuf)); ssu_e_log(3, "ssu_external: unable to receive reply - %s", diff --git a/lib/dns/stats.c b/lib/dns/stats.c index c0d332c452..1fff388472 100644 --- a/lib/dns/stats.c +++ b/lib/dns/stats.c @@ -14,6 +14,8 @@ #include +#include + #include #include #include @@ -310,7 +312,7 @@ dns_generalstats_dump(dns_stats_t *stats, dns_generalstats_dumper_t dump_fn, } static void -dump_rdentry(int rdcounter, isc_uint64_t value, dns_rdatastatstype_t attributes, +dump_rdentry(int rdcounter, uint64_t value, dns_rdatastatstype_t attributes, dns_rdatatypestats_dumper_t dump_fn, void * arg) { dns_rdatatype_t rdtype = dns_rdatatype_none; /* sentinel */ @@ -330,7 +332,7 @@ dump_rdentry(int rdcounter, isc_uint64_t value, dns_rdatastatstype_t attributes, } static void -rdatatype_dumpcb(isc_statscounter_t counter, isc_uint64_t value, void *arg) { +rdatatype_dumpcb(isc_statscounter_t counter, uint64_t value, void *arg) { rdatadumparg_t *rdatadumparg = arg; dump_rdentry(counter, value, 0, rdatadumparg->fn, rdatadumparg->arg); @@ -349,7 +351,7 @@ dns_rdatatypestats_dump(dns_stats_t *stats, dns_rdatatypestats_dumper_t dump_fn, } static void -rdataset_dumpcb(isc_statscounter_t counter, isc_uint64_t value, void *arg) { +rdataset_dumpcb(isc_statscounter_t counter, uint64_t value, void *arg) { rdatadumparg_t *rdatadumparg = arg; unsigned int attributes; @@ -398,14 +400,14 @@ dns_rdatasetstats_dump(dns_stats_t *stats, dns_rdatatypestats_dumper_t dump_fn, } static void -opcode_dumpcb(isc_statscounter_t counter, isc_uint64_t value, void *arg) { +opcode_dumpcb(isc_statscounter_t counter, uint64_t value, void *arg) { opcodedumparg_t *opcodearg = arg; opcodearg->fn((dns_opcode_t)counter, value, opcodearg->arg); } static void -rcode_dumpcb(isc_statscounter_t counter, isc_uint64_t value, void *arg) { +rcode_dumpcb(isc_statscounter_t counter, uint64_t value, void *arg) { rcodedumparg_t *rcodearg = arg; rcodearg->fn((dns_rcode_t)counter, value, rcodearg->arg); @@ -453,10 +455,10 @@ LIBDNS_EXTERNAL_DATA const char *dns_statscounter_names[DNS_STATS_NCOUNTERS] = }; isc_result_t -dns_stats_alloccounters(isc_mem_t *mctx, isc_uint64_t **ctrp) { +dns_stats_alloccounters(isc_mem_t *mctx, uint64_t **ctrp) { int i; - isc_uint64_t *p = - isc_mem_get(mctx, DNS_STATS_NCOUNTERS * sizeof(isc_uint64_t)); + uint64_t *p = + isc_mem_get(mctx, DNS_STATS_NCOUNTERS * sizeof(uint64_t)); if (p == NULL) return (ISC_R_NOMEMORY); for (i = 0; i < DNS_STATS_NCOUNTERS; i++) @@ -466,7 +468,7 @@ dns_stats_alloccounters(isc_mem_t *mctx, isc_uint64_t **ctrp) { } void -dns_stats_freecounters(isc_mem_t *mctx, isc_uint64_t **ctrp) { - isc_mem_put(mctx, *ctrp, DNS_STATS_NCOUNTERS * sizeof(isc_uint64_t)); +dns_stats_freecounters(isc_mem_t *mctx, uint64_t **ctrp) { + isc_mem_put(mctx, *ctrp, DNS_STATS_NCOUNTERS * sizeof(uint64_t)); *ctrp = NULL; } diff --git a/lib/dns/tcpmsg.c b/lib/dns/tcpmsg.c index bf40d30045..bb2a5d918d 100644 --- a/lib/dns/tcpmsg.c +++ b/lib/dns/tcpmsg.c @@ -14,6 +14,8 @@ #include +#include + #include #include #include @@ -181,7 +183,7 @@ dns_tcpmsg_readmessage(dns_tcpmsg_t *tcpmsg, NULL, NULL); region.base = (unsigned char *)&tcpmsg->size; - region.length = 2; /* isc_uint16_t */ + region.length = 2; /* uint16_t */ result = isc_socket_recv(tcpmsg->sock, ®ion, 0, tcpmsg->task, recv_length, tcpmsg); diff --git a/lib/dns/tests/dbversion_test.c b/lib/dns/tests/dbversion_test.c index d25b68759f..cfce9dd8d1 100644 --- a/lib/dns/tests/dbversion_test.c +++ b/lib/dns/tests/dbversion_test.c @@ -14,12 +14,13 @@ #include -#include - +#include #include #include #include +#include + #include #include #include @@ -564,8 +565,8 @@ static void getnsec3parameters(isc_assertioncallback_t callback) { isc_result_t result; dns_hash_t hash; - isc_uint8_t flags; - isc_uint16_t iterations; + uint8_t flags; + uint16_t iterations; unsigned char salt[DNS_NSEC3_SALTSIZE]; size_t salt_length = sizeof(salt); diff --git a/lib/dns/tests/dispatch_test.c b/lib/dns/tests/dispatch_test.c index 7abb809baa..08130a14e6 100644 --- a/lib/dns/tests/dispatch_test.c +++ b/lib/dns/tests/dispatch_test.c @@ -13,10 +13,11 @@ #include -#include - +#include #include +#include + #include #include #include @@ -245,7 +246,7 @@ ATF_TC_BODY(dispatch_getnext, tc) { isc_result_t result; isc_socket_t *sock = NULL; isc_task_t *task = NULL; - isc_uint16_t id; + uint16_t id; struct in_addr ina; unsigned char message[12]; unsigned int attrs; diff --git a/lib/dns/tests/dnstap_test.c b/lib/dns/tests/dnstap_test.c index 14892116c4..eb89b40c72 100644 --- a/lib/dns/tests/dnstap_test.c +++ b/lib/dns/tests/dnstap_test.c @@ -16,6 +16,7 @@ #include #include +#include #include #include @@ -121,7 +122,7 @@ ATF_TC_BODY(send, tc) { isc_result_t result; dns_dtenv_t *dtenv = NULL; dns_dthandle_t *handle = NULL; - isc_uint8_t *data; + uint8_t *data; size_t dsize; unsigned char zone[DNS_NAME_MAXWIRE]; unsigned char qambuffer[4096], rambuffer[4096]; @@ -290,7 +291,7 @@ ATF_TC_HEAD(totext, tc) { ATF_TC_BODY(totext, tc) { isc_result_t result; dns_dthandle_t *handle = NULL; - isc_uint8_t *data; + uint8_t *data; size_t dsize; FILE *fp = NULL; diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c index 4e8693a72d..37fda3c1d9 100644 --- a/lib/dns/tests/dnstest.c +++ b/lib/dns/tests/dnstest.c @@ -15,6 +15,7 @@ #include +#include #include #include #include @@ -302,7 +303,7 @@ dns_test_closezonemgr(void) { * Sleep for 'usec' microseconds. */ void -dns_test_nap(isc_uint32_t usec) { +dns_test_nap(uint32_t usec) { #ifdef HAVE_NANOSLEEP struct timespec ts; diff --git a/lib/dns/tests/dnstest.h b/lib/dns/tests/dnstest.h index e190963537..d9291792fa 100644 --- a/lib/dns/tests/dnstest.h +++ b/lib/dns/tests/dnstest.h @@ -13,6 +13,8 @@ #include +#include + #include #include #include @@ -96,7 +98,7 @@ void dns_test_closezonemgr(void); void -dns_test_nap(isc_uint32_t usec); +dns_test_nap(uint32_t usec); isc_result_t dns_test_loaddb(dns_db_t **db, dns_dbtype_t dbtype, const char *origin, diff --git a/lib/dns/tests/keytable_test.c b/lib/dns/tests/keytable_test.c index 92a4f8fb86..874148c731 100644 --- a/lib/dns/tests/keytable_test.c +++ b/lib/dns/tests/keytable_test.c @@ -17,6 +17,8 @@ #include #include +#include +#include #include #include @@ -74,7 +76,7 @@ str2name(const char *namestr) { } static void -create_key(isc_uint16_t flags, isc_uint8_t proto, isc_uint8_t alg, +create_key(uint16_t flags, uint8_t proto, uint8_t alg, const char *keynamestr, const char *keystr, dst_key_t **target) { dns_rdata_dnskey_t keystruct; diff --git a/lib/dns/tests/name_test.c b/lib/dns/tests/name_test.c index f5104bd68f..c4eb74d8b7 100644 --- a/lib/dns/tests/name_test.c +++ b/lib/dns/tests/name_test.c @@ -13,6 +13,7 @@ #include +#include #include #include #include @@ -663,7 +664,7 @@ ATF_TC_HEAD(benchmark, tc) { static void * fromwire_thread(void *arg) { unsigned int maxval = 32000000; - isc_uint8_t data[] = { + uint8_t data[] = { 3, 'w', 'w', 'w', 7, 'e', 'x', 'a', 'm', 'p', 'l', 'e', 7, 'i', 'n', 'v', 'a', 'l', 'i', 'd', diff --git a/lib/dns/tests/private_test.c b/lib/dns/tests/private_test.c index 1dd1f05cb8..2fb2d06873 100644 --- a/lib/dns/tests/private_test.c +++ b/lib/dns/tests/private_test.c @@ -16,6 +16,7 @@ #include +#include #include #include @@ -76,7 +77,7 @@ make_nsec3(nsec3_testcase_t *testcase, dns_rdata_t *private, dns_rdata_t nsec3param = DNS_RDATA_INIT; unsigned char bufdata[BUFSIZ]; isc_buffer_t buf; - isc_uint32_t salt; + uint32_t salt; unsigned char *sp; int slen = 4; diff --git a/lib/dns/tests/rbt_serialize_test.c b/lib/dns/tests/rbt_serialize_test.c index efe19c929e..dd9b06082b 100644 --- a/lib/dns/tests/rbt_serialize_test.c +++ b/lib/dns/tests/rbt_serialize_test.c @@ -13,16 +13,18 @@ /* ! \file */ #include + #include -#include -#include -#include -#include + +#include #include #include #include -#include /* uintptr_t */ +#include +#include +#include +#include #include #include @@ -99,7 +101,7 @@ delete_data(void *data, void *arg) { } static isc_result_t -write_data(FILE *file, unsigned char *datap, void *arg, isc_uint64_t *crc) { +write_data(FILE *file, unsigned char *datap, void *arg, uint64_t *crc) { isc_result_t result; size_t ret = 0; data_holder_t *data = (data_holder_t *)datap; @@ -139,7 +141,7 @@ write_data(FILE *file, unsigned char *datap, void *arg, isc_uint64_t *crc) { static isc_result_t fix_data(dns_rbtnode_t *p, void *base, size_t max, void *arg, - isc_uint64_t *crc) + uint64_t *crc) { data_holder_t *data = p->data; size_t size; diff --git a/lib/dns/tests/rbt_test.c b/lib/dns/tests/rbt_test.c index 6b1c7a51d6..b4b76c2cc9 100644 --- a/lib/dns/tests/rbt_test.c +++ b/lib/dns/tests/rbt_test.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include /* uintptr_t */ @@ -366,7 +367,7 @@ ATF_TC_BODY(rbt_check_distance_random, tc) { dns_name_t *name; for (j = 0; j < 32; j++) { - isc_uint32_t v = isc_random_uniform(26); + uint32_t v = isc_random_uniform(26); namebuf[j] = 'a' + v; } namebuf[32] = '.'; @@ -871,9 +872,9 @@ ATF_TC_BODY(rbt_remove, tc) { static void insert_nodes(dns_rbt_t *mytree, char **names, - size_t *names_count, isc_uint32_t num_names) + size_t *names_count, uint32_t num_names) { - isc_uint32_t i; + uint32_t i; dns_rbtnode_t *node; for (i = 0; i < num_names; i++) { @@ -892,7 +893,7 @@ insert_nodes(dns_rbt_t *mytree, char **names, isc_result_t result; for (j = 0; j < 32; j++) { - isc_uint32_t v = isc_random_uniform(26); + uint32_t v = isc_random_uniform(26); namebuf[j] = 'a' + v; } namebuf[32] = '.'; @@ -916,14 +917,14 @@ insert_nodes(dns_rbt_t *mytree, char **names, static void remove_nodes(dns_rbt_t *mytree, char **names, - size_t *names_count, isc_uint32_t num_names) + size_t *names_count, uint32_t num_names) { - isc_uint32_t i; + uint32_t i; UNUSED(mytree); for (i = 0; i < num_names; i++) { - isc_uint32_t node; + uint32_t node; dns_fixedname_t fname; dns_name_t *name; isc_result_t result; @@ -1015,7 +1016,7 @@ ATF_TC_BODY(rbt_insert_and_remove, tc) { /* Repeat the insert/remove test some 4096 times */ for (i = 0; i < 4096; i++) { - isc_uint32_t num_names; + uint32_t num_names; if (names_count < 1024) { num_names = isc_random_uniform(1024 - names_count); diff --git a/lib/dns/tests/rdatasetstats_test.c b/lib/dns/tests/rdatasetstats_test.c index d3584c8bf6..bad3c8d9ce 100644 --- a/lib/dns/tests/rdatasetstats_test.c +++ b/lib/dns/tests/rdatasetstats_test.c @@ -16,6 +16,7 @@ #include +#include #include #include @@ -58,7 +59,7 @@ set_nxdomainstats(dns_stats_t *stats, isc_boolean_t stale) { #define ATTRIBUTE_SET(y) ((attributes & (y)) != 0) static void -checkit1(dns_rdatastatstype_t which, isc_uint64_t value, void *arg) { +checkit1(dns_rdatastatstype_t which, uint64_t value, void *arg) { unsigned int attributes; #if debug unsigned int type; @@ -85,7 +86,7 @@ checkit1(dns_rdatastatstype_t which, isc_uint64_t value, void *arg) { } static void -checkit2(dns_rdatastatstype_t which, isc_uint64_t value, void *arg) { +checkit2(dns_rdatastatstype_t which, uint64_t value, void *arg) { unsigned int attributes; #if debug unsigned int type; diff --git a/lib/dns/tests/time_test.c b/lib/dns/tests/time_test.c index e4527938ad..83e3d9911f 100644 --- a/lib/dns/tests/time_test.c +++ b/lib/dns/tests/time_test.c @@ -16,6 +16,7 @@ #include +#include #include #include @@ -35,10 +36,10 @@ ATF_TC_HEAD(epoch_minus_one, tc) { } ATF_TC_BODY(epoch_minus_one, tc) { const char *test_text = "19691231235959"; - const isc_uint32_t test_time = 0xffffffff; + const uint32_t test_time = 0xffffffff; isc_result_t result; isc_buffer_t target; - isc_uint32_t when; + uint32_t when; char buf[128]; UNUSED(tc); @@ -63,10 +64,10 @@ ATF_TC_HEAD(epoch, tc) { } ATF_TC_BODY(epoch, tc) { const char *test_text = "19700101000000"; - const isc_uint32_t test_time = 0x00000000; + const uint32_t test_time = 0x00000000; isc_result_t result; isc_buffer_t target; - isc_uint32_t when; + uint32_t when; char buf[128]; UNUSED(tc); @@ -91,10 +92,10 @@ ATF_TC_HEAD(half_maxint, tc) { } ATF_TC_BODY(half_maxint, tc) { const char *test_text = "20380119031407"; - const isc_uint32_t test_time = 0x7fffffff; + const uint32_t test_time = 0x7fffffff; isc_result_t result; isc_buffer_t target; - isc_uint32_t when; + uint32_t when; char buf[128]; UNUSED(tc); @@ -119,10 +120,10 @@ ATF_TC_HEAD(half_plus_one, tc) { } ATF_TC_BODY(half_plus_one, tc) { const char *test_text = "20380119031408"; - const isc_uint32_t test_time = 0x80000000; + const uint32_t test_time = 0x80000000; isc_result_t result; isc_buffer_t target; - isc_uint32_t when; + uint32_t when; char buf[128]; UNUSED(tc); @@ -148,9 +149,9 @@ ATF_TC_HEAD(fifty_before, tc) { ATF_TC_BODY(fifty_before, tc) { isc_result_t result; const char *test_text = "19610307130000"; - const isc_uint32_t test_time = 0xef68f5d0; + const uint32_t test_time = 0xef68f5d0; isc_buffer_t target; - isc_uint32_t when; + uint32_t when; char buf[128]; UNUSED(tc); @@ -175,10 +176,10 @@ ATF_TC_HEAD(some_ago, tc) { } ATF_TC_BODY(some_ago, tc) { const char *test_text = "20110307130000"; - const isc_uint32_t test_time = 0x4d74d6d0; + const uint32_t test_time = 0x4d74d6d0; isc_result_t result; isc_buffer_t target; - isc_uint32_t when; + uint32_t when; char buf[128]; UNUSED(tc); diff --git a/lib/dns/tests/tsig_test.c b/lib/dns/tests/tsig_test.c index b2c8845a4d..befee8e799 100644 --- a/lib/dns/tests/tsig_test.c +++ b/lib/dns/tests/tsig_test.c @@ -16,7 +16,6 @@ #include #include -#include #include #include diff --git a/lib/dns/tests/update_test.c b/lib/dns/tests/update_test.c index fbf155bc8d..bf16dd2a33 100644 --- a/lib/dns/tests/update_test.c +++ b/lib/dns/tests/update_test.c @@ -16,6 +16,7 @@ #include +#include #include #include @@ -26,7 +27,7 @@ #include "dnstest.h" -static isc_uint32_t mystdtime; +static uint32_t mystdtime; static void set_mystdtime(int year, int month, int day) { struct tm tm; @@ -51,8 +52,8 @@ ATF_TC_HEAD(increment, tc) { atf_tc_set_md_var(tc, "descr", "simple increment by 1"); } ATF_TC_BODY(increment, tc) { - isc_uint32_t old = 50; - isc_uint32_t serial; + uint32_t old = 50; + uint32_t serial; isc_result_t result; UNUSED(tc); @@ -72,8 +73,8 @@ ATF_TC_HEAD(increment_past_zero, tc) { atf_tc_set_md_var(tc, "descr", "increment past zero, ffffffff -> 1"); } ATF_TC_BODY(increment_past_zero, tc) { - isc_uint32_t old = 0xffffffffu; - isc_uint32_t serial; + uint32_t old = 0xffffffffu; + uint32_t serial; isc_result_t result; UNUSED(tc); @@ -92,8 +93,8 @@ ATF_TC_HEAD(past_to_unix, tc) { atf_tc_set_md_var(tc, "descr", "past to unixtime"); } ATF_TC_BODY(past_to_unix, tc) { - isc_uint32_t old; - isc_uint32_t serial; + uint32_t old; + uint32_t serial; isc_result_t result; UNUSED(tc); @@ -115,8 +116,8 @@ ATF_TC_HEAD(now_to_unix, tc) { atf_tc_set_md_var(tc, "descr", "now to unixtime"); } ATF_TC_BODY(now_to_unix, tc) { - isc_uint32_t old; - isc_uint32_t serial; + uint32_t old; + uint32_t serial; isc_result_t result; UNUSED(tc); @@ -138,8 +139,8 @@ ATF_TC_HEAD(future_to_unix, tc) { atf_tc_set_md_var(tc, "descr", "future to unixtime"); } ATF_TC_BODY(future_to_unix, tc) { - isc_uint32_t old; - isc_uint32_t serial; + uint32_t old; + uint32_t serial; isc_result_t result; UNUSED(tc); @@ -161,8 +162,8 @@ ATF_TC_HEAD(undefined_plus1_to_unix, tc) { atf_tc_set_md_var(tc, "descr", "undefined plus 1 to unixtime"); } ATF_TC_BODY(undefined_plus1_to_unix, tc) { - isc_uint32_t old; - isc_uint32_t serial; + uint32_t old; + uint32_t serial; isc_result_t result; UNUSED(tc); @@ -185,8 +186,8 @@ ATF_TC_HEAD(undefined_minus1_to_unix, tc) { atf_tc_set_md_var(tc, "descr", "undefined minus 1 to unixtime"); } ATF_TC_BODY(undefined_minus1_to_unix, tc) { - isc_uint32_t old; - isc_uint32_t serial; + uint32_t old; + uint32_t serial; isc_result_t result; UNUSED(tc); @@ -209,8 +210,8 @@ ATF_TC_HEAD(undefined_to_unix, tc) { atf_tc_set_md_var(tc, "descr", "undefined to unixtime"); } ATF_TC_BODY(undefined_to_unix, tc) { - isc_uint32_t old; - isc_uint32_t serial; + uint32_t old; + uint32_t serial; isc_result_t result; UNUSED(tc); @@ -232,8 +233,8 @@ ATF_TC_HEAD(unixtime_zero, tc) { atf_tc_set_md_var(tc, "descr", "handle unixtime being zero"); } ATF_TC_BODY(unixtime_zero, tc) { - isc_uint32_t old; - isc_uint32_t serial; + uint32_t old; + uint32_t serial; isc_result_t result; UNUSED(tc); @@ -255,7 +256,7 @@ ATF_TC_HEAD(past_to_date, tc) { atf_tc_set_md_var(tc, "descr", "past to date"); } ATF_TC_BODY(past_to_date, tc) { - isc_uint32_t old, serial; + uint32_t old, serial; isc_result_t result; UNUSED(tc); @@ -278,8 +279,8 @@ ATF_TC_HEAD(now_to_date, tc) { atf_tc_set_md_var(tc, "descr", "now to date"); } ATF_TC_BODY(now_to_date, tc) { - isc_uint32_t old; - isc_uint32_t serial; + uint32_t old; + uint32_t serial; isc_result_t result; UNUSED(tc); @@ -301,8 +302,8 @@ ATF_TC_HEAD(future_to_date, tc) { atf_tc_set_md_var(tc, "descr", "future to date"); } ATF_TC_BODY(future_to_date, tc) { - isc_uint32_t old; - isc_uint32_t serial; + uint32_t old; + uint32_t serial; isc_result_t result; UNUSED(tc); diff --git a/lib/dns/time.c b/lib/dns/time.c index ea3b389e63..dedd5184d0 100644 --- a/lib/dns/time.c +++ b/lib/dns/time.c @@ -15,6 +15,7 @@ #include #include +#include #include /* Required for HP/UX (and others?) */ #include #include @@ -31,7 +32,7 @@ static const int days[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; isc_result_t -dns_time64_totext(isc_int64_t t, isc_buffer_t *target) { +dns_time64_totext(int64_t t, isc_buffer_t *target) { struct tm tm; char buf[sizeof("!!!!!!YYYY!!!!!!!!MM!!!!!!!!DD!!!!!!!!HH!!!!!!!!MM!!!!!!!!SS")]; int secs; @@ -96,11 +97,11 @@ dns_time64_totext(isc_int64_t t, isc_buffer_t *target) { return (ISC_R_SUCCESS); } -isc_int64_t -dns_time64_from32(isc_uint32_t value) { +int64_t +dns_time64_from32(uint32_t value) { isc_stdtime_t now; - isc_int64_t start; - isc_int64_t t; + int64_t start; + int64_t t; /* * Adjust the time to the closest epoch. This should be changed @@ -109,7 +110,7 @@ dns_time64_from32(isc_uint32_t value) { * 2106. */ isc_stdtime_get(&now); - start = (isc_int64_t) now; + start = (int64_t) now; if (isc_serial_gt(value, now)) t = start + (value - now); else @@ -119,14 +120,14 @@ dns_time64_from32(isc_uint32_t value) { } isc_result_t -dns_time32_totext(isc_uint32_t value, isc_buffer_t *target) { +dns_time32_totext(uint32_t value, isc_buffer_t *target) { return (dns_time64_totext(dns_time64_from32(value), target)); } isc_result_t -dns_time64_fromtext(const char *source, isc_int64_t *target) { +dns_time64_fromtext(const char *source, int64_t *target) { int year, month, day, hour, minute, second; - isc_int64_t value; + int64_t value; int secs; int i; @@ -192,13 +193,13 @@ dns_time64_fromtext(const char *source, isc_int64_t *target) { } isc_result_t -dns_time32_fromtext(const char *source, isc_uint32_t *target) { - isc_int64_t value64; +dns_time32_fromtext(const char *source, uint32_t *target) { + int64_t value64; isc_result_t result; result = dns_time64_fromtext(source, &value64); if (result != ISC_R_SUCCESS) return (result); - *target = (isc_uint32_t)value64; + *target = (uint32_t)value64; return (ISC_R_SUCCESS); } diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c index b28582049b..0339ed6ec0 100644 --- a/lib/dns/tkey.c +++ b/lib/dns/tkey.c @@ -12,6 +12,8 @@ /*! \file */ #include +#include + #include #include #include @@ -154,7 +156,7 @@ dns_tkeyctx_destroy(dns_tkeyctx_t **tctxp) { static isc_result_t add_rdata_to_list(dns_message_t *msg, dns_name_t *name, dns_rdata_t *rdata, - isc_uint32_t ttl, dns_namelist_t *namelist) + uint32_t ttl, dns_namelist_t *namelist) { isc_result_t result; isc_region_t r, newr; @@ -507,7 +509,7 @@ process_gsstkey(dns_name_t *name, dns_rdata_tkey_t *tkeyin, #ifdef GSSAPI OM_uint32 gret, minor, lifetime; #endif - isc_uint32_t expire; + uint32_t expire; RETERR(dst_key_fromgssapi(name, gss_ctx, ring->mctx, &dstkey, &intoken)); @@ -940,7 +942,7 @@ buildquery(dns_message_t *msg, const dns_name_t *name, isc_result_t dns_tkey_builddhquery(dns_message_t *msg, dst_key_t *key, const dns_name_t *name, const dns_name_t *algorithm, - isc_buffer_t *nonce, isc_uint32_t lifetime) + isc_buffer_t *nonce, uint32_t lifetime) { dns_rdata_tkey_t tkey; dns_rdata_t *rdata = NULL; @@ -1016,7 +1018,7 @@ dns_tkey_builddhquery(dns_message_t *msg, dst_key_t *key, isc_result_t dns_tkey_buildgssquery(dns_message_t *msg, const dns_name_t *name, const dns_name_t *gname, - isc_buffer_t *intoken, isc_uint32_t lifetime, + isc_buffer_t *intoken, uint32_t lifetime, gss_ctx_id_t *context, isc_boolean_t win2k, isc_mem_t *mctx, char **err_message) { diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c index 231e0b884a..2c751a8177 100644 --- a/lib/dns/tsig.c +++ b/lib/dns/tsig.c @@ -11,6 +11,8 @@ /*! \file */ #include + +#include #include #include @@ -830,7 +832,7 @@ dns_tsig_sign(dns_message_t *msg) { { unsigned char header[DNS_MESSAGE_HEADERLEN]; isc_buffer_t headerbuf; - isc_uint16_t digestbits; + uint16_t digestbits; /* * If it is a response, we assume that the request MAC @@ -1083,7 +1085,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, unsigned char header[DNS_MESSAGE_HEADERLEN]; dst_context_t *ctx = NULL; isc_mem_t *mctx; - isc_uint16_t addcount, id; + uint16_t addcount, id; unsigned int siglen; unsigned int alg; isc_boolean_t response; @@ -1217,7 +1219,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, } if (tsig.siglen > 0) { - isc_uint16_t addcount_n; + uint16_t addcount_n; sig_r.base = tsig.signature; sig_r.length = tsig.siglen; @@ -1256,7 +1258,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, */ memmove(&addcount, &header[DNS_MESSAGE_HEADERLEN - 2], 2); addcount_n = ntohs(addcount); - addcount = htons((isc_uint16_t)(addcount_n - 1)); + addcount = htons((uint16_t)(addcount_n - 1)); memmove(&header[DNS_MESSAGE_HEADERLEN - 2], &addcount, 2); /* @@ -1365,7 +1367,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, } if (dns__tsig_algvalid(alg)) { - isc_uint16_t digestbits = dst_key_getbits(key); + uint16_t digestbits = dst_key_getbits(key); /* * XXXRAY: Is this correct? What is the expected @@ -1428,7 +1430,7 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) { dns_tsigkey_t *tsigkey; dst_key_t *key = NULL; unsigned char header[DNS_MESSAGE_HEADERLEN]; - isc_uint16_t addcount, id; + uint16_t addcount, id; isc_boolean_t has_tsig = ISC_FALSE; isc_mem_t *mctx; unsigned int siglen; @@ -1557,11 +1559,11 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) { * Decrement the additional field counter if necessary. */ if (has_tsig) { - isc_uint16_t addcount_n; + uint16_t addcount_n; memmove(&addcount, &header[DNS_MESSAGE_HEADERLEN - 2], 2); addcount_n = ntohs(addcount); - addcount = htons((isc_uint16_t)(addcount_n - 1)); + addcount = htons((uint16_t)(addcount_n - 1)); memmove(&header[DNS_MESSAGE_HEADERLEN - 2], &addcount, 2); /* @@ -1669,7 +1671,7 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) { if (ret != ISC_R_SUCCESS) goto cleanup_context; if (dns__tsig_algvalid(alg)) { - isc_uint16_t digestbits = dst_key_getbits(key); + uint16_t digestbits = dst_key_getbits(key); /* * XXXRAY: Is this correct? What is the diff --git a/lib/dns/ttl.c b/lib/dns/ttl.c index a8d96a4cc5..43b96a5859 100644 --- a/lib/dns/ttl.c +++ b/lib/dns/ttl.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -36,7 +37,7 @@ } while (0) -static isc_result_t bind_ttl(isc_textregion_t *source, isc_uint32_t *ttl); +static isc_result_t bind_ttl(isc_textregion_t *source, uint32_t *ttl); /* * Helper for dns_ttl_totext(). @@ -71,7 +72,7 @@ ttlfmt(unsigned int t, const char *s, isc_boolean_t verbose, * Derived from bind8 ns_format_ttl(). */ isc_result_t -dns_ttl_totext(isc_uint32_t src, isc_boolean_t verbose, +dns_ttl_totext(uint32_t src, isc_boolean_t verbose, isc_boolean_t upcase, isc_buffer_t *target) { unsigned secs, mins, hours, days, weeks, x; @@ -128,12 +129,12 @@ dns_ttl_totext(isc_uint32_t src, isc_boolean_t verbose, } isc_result_t -dns_counter_fromtext(isc_textregion_t *source, isc_uint32_t *ttl) { +dns_counter_fromtext(isc_textregion_t *source, uint32_t *ttl) { return (bind_ttl(source, ttl)); } isc_result_t -dns_ttl_fromtext(isc_textregion_t *source, isc_uint32_t *ttl) { +dns_ttl_fromtext(isc_textregion_t *source, uint32_t *ttl) { isc_result_t result; result = bind_ttl(source, ttl); @@ -143,9 +144,9 @@ dns_ttl_fromtext(isc_textregion_t *source, isc_uint32_t *ttl) { } static isc_result_t -bind_ttl(isc_textregion_t *source, isc_uint32_t *ttl) { - isc_uint64_t tmp = 0ULL; - isc_uint32_t n; +bind_ttl(isc_textregion_t *source, uint32_t *ttl) { + uint64_t tmp = 0ULL; + uint32_t n; char *s; char buf[64]; char nbuf[64]; /* Number buffer */ @@ -174,27 +175,27 @@ bind_ttl(isc_textregion_t *source, isc_uint32_t *ttl) { switch (*s) { case 'w': case 'W': - tmp += (isc_uint64_t) n * 7 * 24 * 3600; + tmp += (uint64_t) n * 7 * 24 * 3600; s++; break; case 'd': case 'D': - tmp += (isc_uint64_t) n * 24 * 3600; + tmp += (uint64_t) n * 24 * 3600; s++; break; case 'h': case 'H': - tmp += (isc_uint64_t) n * 3600; + tmp += (uint64_t) n * 3600; s++; break; case 'm': case 'M': - tmp += (isc_uint64_t) n * 60; + tmp += (uint64_t) n * 60; s++; break; case 's': case 'S': - tmp += (isc_uint64_t) n; + tmp += (uint64_t) n; s++; break; case '\0': @@ -211,6 +212,6 @@ bind_ttl(isc_textregion_t *source, isc_uint32_t *ttl) { if (tmp > 0xffffffffULL) return (ISC_R_RANGE); - *ttl = (isc_uint32_t)(tmp & 0xffffffffUL); + *ttl = (uint32_t)(tmp & 0xffffffffUL); return (ISC_R_SUCCESS); } diff --git a/lib/dns/update.c b/lib/dns/update.c index cb703bdbe0..ea1fe1ea27 100644 --- a/lib/dns/update.c +++ b/lib/dns/update.c @@ -11,6 +11,7 @@ #include +#include #include #include @@ -182,7 +183,7 @@ typedef struct rr rr_t; struct rr { /* dns_name_t name; */ - isc_uint32_t ttl; + uint32_t ttl; dns_rdata_t rdata; }; @@ -1346,7 +1347,7 @@ add_exposed_sigs(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, isc_result_t dns_update_signatures(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *oldver, dns_dbversion_t *newver, - dns_diff_t *diff, isc_uint32_t sigvalidityinterval) + dns_diff_t *diff, uint32_t sigvalidityinterval) { return (dns_update_signaturesinc(log, zone, db, oldver, newver, diff, sigvalidityinterval, NULL)); @@ -1372,7 +1373,7 @@ struct dns_update_state { isc_result_t dns_update_signaturesinc(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *oldver, dns_dbversion_t *newver, - dns_diff_t *diff, isc_uint32_t sigvalidityinterval, + dns_diff_t *diff, uint32_t sigvalidityinterval, dns_update_state_t **statep) { isc_result_t result = ISC_R_SUCCESS; @@ -2063,10 +2064,10 @@ epoch_to_yyyymmdd(time_t when) { ((tm->tm_mon + 1) * 100) + tm->tm_mday); } -isc_uint32_t -dns_update_soaserial(isc_uint32_t serial, dns_updatemethod_t method) { +uint32_t +dns_update_soaserial(uint32_t serial, dns_updatemethod_t method) { isc_stdtime_t now; - isc_uint32_t new_serial; + uint32_t new_serial; switch (method) { case dns_updatemethod_none: diff --git a/lib/dns/validator.c b/lib/dns/validator.c index a13a99f9e8..4ba0160810 100644 --- a/lib/dns/validator.c +++ b/lib/dns/validator.c @@ -11,6 +11,8 @@ #include +#include + #include #include #include @@ -1497,7 +1499,7 @@ isselfsigned(dns_validator_t *val) { */ static isc_result_t verify(dns_validator_t *val, dst_key_t *key, dns_rdata_t *rdata, - isc_uint16_t keyid) + uint16_t keyid) { isc_result_t result; dns_fixedname_t fixed; @@ -1711,7 +1713,7 @@ validate(dns_validator_t *val, isc_boolean_t resume) { * (val->event->rdataset). */ static isc_result_t -checkkey(dns_validator_t *val, dns_rdata_t *keyrdata, isc_uint16_t keyid, +checkkey(dns_validator_t *val, dns_rdata_t *keyrdata, uint16_t keyid, dns_secalg_t algorithm) { dns_rdata_rrsig_t sig; @@ -1754,7 +1756,7 @@ checkkey(dns_validator_t *val, dns_rdata_t *keyrdata, isc_uint16_t keyid, */ static isc_result_t keyfromds(dns_validator_t *val, dns_rdataset_t *rdataset, dns_rdata_t *dsrdata, - isc_uint8_t digest, isc_uint16_t keyid, dns_secalg_t algorithm, + uint8_t digest, uint16_t keyid, dns_secalg_t algorithm, dns_rdata_t *keyrdata) { dns_keytag_t keytag; diff --git a/lib/dns/view.c b/lib/dns/view.c index 775153504a..d6af4eaf80 100644 --- a/lib/dns/view.c +++ b/lib/dns/view.c @@ -14,6 +14,7 @@ #include #include +#include #ifdef HAVE_LMDB #include @@ -1665,7 +1666,7 @@ isc_result_t dns_view_adddelegationonly(dns_view_t *view, const dns_name_t *name) { isc_result_t result; dns_name_t *item; - isc_uint32_t hash; + uint32_t hash; REQUIRE(DNS_VIEW_VALID(view)); @@ -1700,7 +1701,7 @@ isc_result_t dns_view_excludedelegationonly(dns_view_t *view, const dns_name_t *name) { isc_result_t result; dns_name_t *item; - isc_uint32_t hash; + uint32_t hash; REQUIRE(DNS_VIEW_VALID(view)); @@ -1734,7 +1735,7 @@ dns_view_excludedelegationonly(dns_view_t *view, const dns_name_t *name) { isc_boolean_t dns_view_isdelegationonly(dns_view_t *view, const dns_name_t *name) { dns_name_t *item; - isc_uint32_t hash; + uint32_t hash; REQUIRE(DNS_VIEW_VALID(view)); @@ -2024,7 +2025,7 @@ nz_legacy(const char *directory, const char *viewname, isc_result_t dns_view_setnewzones(dns_view_t *view, isc_boolean_t allow, void *cfgctx, - void (*cfg_destroy)(void **), isc_uint64_t mapsize) + void (*cfg_destroy)(void **), uint64_t mapsize) { isc_result_t result = ISC_R_SUCCESS; char buffer[1024]; @@ -2252,14 +2253,14 @@ dns_view_searchdlz(dns_view_t *view, const dns_name_t *name, return (ISC_R_NOTFOUND); } -isc_uint32_t +uint32_t dns_view_getfailttl(dns_view_t *view) { REQUIRE(DNS_VIEW_VALID(view)); return (view->fail_ttl); } void -dns_view_setfailttl(dns_view_t *view, isc_uint32_t fail_ttl) { +dns_view_setfailttl(dns_view_t *view, uint32_t fail_ttl) { REQUIRE(DNS_VIEW_VALID(view)); view->fail_ttl = fail_ttl; } diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c index 7ce5bc7a3e..eeaa3e58dc 100644 --- a/lib/dns/xfrin.c +++ b/lib/dns/xfrin.c @@ -138,12 +138,12 @@ struct dns_xfrin_ctx { int difflen; /*%< Number of pending tuples */ xfrin_state_t state; - isc_uint32_t end_serial; + uint32_t end_serial; isc_boolean_t is_ixfr; unsigned int nmsg; /*%< Number of messages recvd */ unsigned int nrecs; /*%< Number of records recvd */ - isc_uint64_t nbytes; /*%< Number of bytes received */ + uint64_t nbytes; /*%< Number of bytes received */ unsigned int maxrecords; /*%< The maximum number of records set for the zone */ @@ -166,8 +166,8 @@ struct dns_xfrin_ctx { dns_rdatacallbacks_t axfr; struct { - isc_uint32_t request_serial; - isc_uint32_t current_serial; + uint32_t request_serial; + uint32_t current_serial; dns_journal_t *journal; } ixfr; @@ -214,7 +214,7 @@ static isc_result_t ixfr_putdata(dns_xfrin_ctx_t *xfr, dns_diffop_t op, static isc_result_t ixfr_commit(dns_xfrin_ctx_t *xfr); static isc_result_t xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, - isc_uint32_t ttl, dns_rdata_t *rdata); + uint32_t ttl, dns_rdata_t *rdata); static isc_result_t xfrin_start(dns_xfrin_ctx_t *xfr); @@ -313,7 +313,7 @@ axfr_putdata(dns_xfrin_ctx_t *xfr, dns_diffop_t op, static isc_result_t axfr_apply(dns_xfrin_ctx_t *xfr) { isc_result_t result; - isc_uint64_t records; + uint64_t records; CHECK(dns_diff_load(&xfr->diff, xfr->axfr.add, xfr->axfr.add_private)); xfr->difflen = 0; @@ -412,7 +412,7 @@ ixfr_putdata(dns_xfrin_ctx_t *xfr, dns_diffop_t op, static isc_result_t ixfr_apply(dns_xfrin_ctx_t *xfr) { isc_result_t result; - isc_uint64_t records; + uint64_t records; if (xfr->ver == NULL) { CHECK(dns_db_newversion(xfr->db, &xfr->ver)); @@ -467,7 +467,7 @@ ixfr_commit(dns_xfrin_ctx_t *xfr) { * state. */ static isc_result_t -xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, isc_uint32_t ttl, +xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, uint32_t ttl, dns_rdata_t *rdata) { isc_result_t result; @@ -563,7 +563,7 @@ xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, isc_uint32_t ttl, case XFRST_IXFR_DEL: if (rdata->type == dns_rdatatype_soa) { - isc_uint32_t soa_serial = dns_soa_getserial(rdata); + uint32_t soa_serial = dns_soa_getserial(rdata); xfr->state = XFRST_IXFR_ADDSOA; xfr->ixfr.current_serial = soa_serial; goto redo; @@ -579,7 +579,7 @@ xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, isc_uint32_t ttl, case XFRST_IXFR_ADD: if (rdata->type == dns_rdatatype_soa) { - isc_uint32_t soa_serial = dns_soa_getserial(rdata); + uint32_t soa_serial = dns_soa_getserial(rdata); if (soa_serial == xfr->end_serial) { CHECK(ixfr_commit(xfr)); xfr->state = XFRST_IXFR_END; @@ -1436,8 +1436,8 @@ xfrin_timeout(isc_task_t *task, isc_event_t *event) { static void maybe_free(dns_xfrin_ctx_t *xfr) { - isc_uint64_t msecs; - isc_uint64_t persec; + uint64_t msecs; + uint64_t persec; const char *result_str; REQUIRE(VALID_XFRIN(xfr)); diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 2ce2f766b2..4a65db02a1 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -12,7 +12,9 @@ /*! \file */ #include + #include +#include #include #include @@ -221,7 +223,7 @@ struct dns_zone { dns_masterformat_t masterformat; const dns_master_style_t *masterstyle; char *journal; - isc_int32_t journalsize; + int32_t journalsize; dns_rdataclass_t rdclass; dns_zonetype_t type; unsigned int flags; @@ -238,22 +240,22 @@ struct dns_zone { isc_time_t signingtime; isc_time_t nsec3chaintime; isc_time_t refreshkeytime; - isc_uint32_t refreshkeyinterval; - isc_uint32_t refreshkeycount; - isc_uint32_t refresh; - isc_uint32_t retry; - isc_uint32_t expire; - isc_uint32_t minimum; + uint32_t refreshkeyinterval; + uint32_t refreshkeycount; + uint32_t refresh; + uint32_t retry; + uint32_t expire; + uint32_t minimum; isc_stdtime_t key_expiry; isc_stdtime_t log_key_expired_timer; char *keydirectory; - isc_uint32_t maxrefresh; - isc_uint32_t minrefresh; - isc_uint32_t maxretry; - isc_uint32_t minretry; + uint32_t maxrefresh; + uint32_t minrefresh; + uint32_t maxretry; + uint32_t minretry; - isc_uint32_t maxrecords; + uint32_t maxrecords; isc_sockaddr_t *masters; isc_dscp_t *masterdscps; @@ -301,15 +303,15 @@ struct dns_zone { dns_io_t *readio; dns_dumpctx_t *dctx; dns_io_t *writeio; - isc_uint32_t maxxfrin; - isc_uint32_t maxxfrout; - isc_uint32_t idlein; - isc_uint32_t idleout; + uint32_t maxxfrin; + uint32_t maxxfrout; + uint32_t idlein; + uint32_t idleout; isc_event_t ctlevent; dns_ssutable_t *ssutable; - isc_uint32_t sigvalidityinterval; - isc_uint32_t keyvalidityinterval; - isc_uint32_t sigresigninginterval; + uint32_t sigvalidityinterval; + uint32_t keyvalidityinterval; + uint32_t sigresigninginterval; dns_view_t *view; dns_view_t *prev_view; dns_checkmxfunc_t checkmx; @@ -336,7 +338,7 @@ struct dns_zone { isc_boolean_t requeststats_on; isc_stats_t *requeststats; dns_stats_t *rcvquerystats; - isc_uint32_t notifydelay; + uint32_t notifydelay; dns_isselffunc_t isself; void *isselfarg; @@ -348,7 +350,7 @@ struct dns_zone { /*% * Serial number for deferred journal compaction. */ - isc_uint32_t compact_serial; + uint32_t compact_serial; /*% * Keys that are signing the zone for the first time. */ @@ -357,14 +359,14 @@ struct dns_zone { /*% * Signing / re-signing quantum stopping parameters. */ - isc_uint32_t signatures; - isc_uint32_t nodes; + uint32_t signatures; + uint32_t nodes; dns_rdatatype_t privatetype; /*% * Autosigning/key-maintenance options */ - isc_uint32_t keyopts; + uint32_t keyopts; /*% * True if added by "rndc addzone" @@ -416,7 +418,7 @@ struct dns_zone { dns_zone_t *secure; isc_boolean_t sourceserialset; - isc_uint32_t sourceserial; + uint32_t sourceserial; /*% * maximum zone ttl @@ -518,9 +520,9 @@ struct dns_zone { struct dns_unreachable { isc_sockaddr_t remote; isc_sockaddr_t local; - isc_uint32_t expire; - isc_uint32_t last; - isc_uint32_t count; + uint32_t expire; + uint32_t last; + uint32_t count; }; struct dns_zonemgr { @@ -548,16 +550,16 @@ struct dns_zonemgr { dns_zonelist_t xfrin_in_progress; /* Configuration data. */ - isc_uint32_t transfersin; - isc_uint32_t transfersperns; + uint32_t transfersin; + uint32_t transfersperns; unsigned int notifyrate; unsigned int startupnotifyrate; unsigned int serialqueryrate; unsigned int startupserialqueryrate; /* Locked by iolock */ - isc_uint32_t iolimit; - isc_uint32_t ioactive; + uint32_t iolimit; + uint32_t ioactive; dns_iolist_t high; dns_iolist_t low; @@ -622,7 +624,7 @@ struct dns_forward { dns_zone_t *zone; isc_buffer_t *msgbuf; dns_request_t *request; - isc_uint32_t which; + uint32_t which; isc_sockaddr_t addr; dns_updatecallback_t callback; void *callback_arg; @@ -651,7 +653,7 @@ struct dns_signing { dns_db_t *db; dns_dbiterator_t *dbiterator; dns_secalg_t algorithm; - isc_uint16_t keyid; + uint16_t keyid; isc_boolean_t deleteit; isc_boolean_t done; ISC_LINK(dns_signing_t) link; @@ -766,7 +768,7 @@ static void zone_name_tostr(dns_zone_t *zone, char *buf, size_t length); static void zone_rdclass_tostr(dns_zone_t *zone, char *buf, size_t length); static void zone_viewname_tostr(dns_zone_t *zone, char *buf, size_t length); static isc_result_t zone_send_secureserial(dns_zone_t *zone, - isc_uint32_t serial); + uint32_t serial); static void refresh_callback(isc_task_t *, isc_event_t *); static void stub_callback(isc_task_t *, isc_event_t *); static void queue_soa_query(dns_zone_t *zone); @@ -797,9 +799,9 @@ static void zonemgr_cancelio(dns_io_t *io); static isc_result_t zone_get_from_db(dns_zone_t *zone, dns_db_t *db, unsigned int *nscount, - unsigned int *soacount, isc_uint32_t *serial, - isc_uint32_t *refresh, isc_uint32_t *retry, - isc_uint32_t *expire, isc_uint32_t *minimum, + unsigned int *soacount, uint32_t *serial, + uint32_t *refresh, uint32_t *retry, + uint32_t *expire, uint32_t *minimum, unsigned int *errors); static void zone_freedbargs(dns_zone_t *zone); @@ -810,7 +812,7 @@ static void zone_maintenance(dns_zone_t *zone); static void zone_notify(dns_zone_t *zone, isc_time_t *now); static void dump_done(void *arg, isc_result_t result); static isc_result_t zone_signwithkey(dns_zone_t *zone, dns_secalg_t algorithm, - isc_uint16_t keyid, + uint16_t keyid, isc_boolean_t deleteit); static isc_result_t delete_nsec(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node, dns_name_t *name, @@ -828,7 +830,7 @@ static const char *dbargv_default[] = { "rbt" }; #define DNS_ZONE_JITTER_ADD(a, b, c) \ do { \ isc_interval_t _i; \ - isc_uint32_t _j; \ + uint32_t _j; \ _j = (b) - isc_random_uniform((b)/4); \ isc_interval_set(&_i, _j, 0); \ if (isc_time_add((a), &_i, (c)) != ISC_R_SUCCESS) { \ @@ -869,7 +871,7 @@ struct np3event { struct ssevent { isc_event_t event; - isc_uint32_t serial; + uint32_t serial; }; /*% @@ -1339,7 +1341,7 @@ dns_zone_setnotifytype(dns_zone_t *zone, dns_notifytype_t notifytype) { } isc_result_t -dns_zone_getserial(dns_zone_t *zone, isc_uint32_t *serialp) { +dns_zone_getserial(dns_zone_t *zone, uint32_t *serialp) { isc_result_t result; unsigned int soacount; @@ -3552,7 +3554,7 @@ set_resigntime(dns_zone_t *zone) { dns_fixedname_t fixed; unsigned int resign; isc_result_t result; - isc_uint32_t nanosecs; + uint32_t nanosecs; dns_db_t *db = NULL; /* We only re-sign zones that can be dynamically updated */ @@ -4035,7 +4037,7 @@ update_soa_serial(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, isc_mem_t *mctx, dns_updatemethod_t method) { dns_difftuple_t *deltuple = NULL; dns_difftuple_t *addtuple = NULL; - isc_uint32_t serial; + uint32_t serial; isc_result_t result; INSIST(method != dns_updatemethod_none); @@ -4063,7 +4065,7 @@ update_soa_serial(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, * Write all transactions in 'diff' to the zone journal file. */ static isc_result_t -zone_journal(dns_zone_t *zone, dns_diff_t *diff, isc_uint32_t *sourceserial, +zone_journal(dns_zone_t *zone, dns_diff_t *diff, uint32_t *sourceserial, const char *caller) { const char me[] = "zone_journal"; @@ -4240,7 +4242,7 @@ sync_keyzone(dns_zone_t *zone, dns_db_t *db) { result = dns_rriterator_nextrrset(&rrit)) { dns_rdataset_t *rdataset = NULL; dns_name_t *rrname = NULL; - isc_uint32_t ttl; + uint32_t ttl; dns_rriterator_current(&rrit, &rrname, &ttl, &rdataset, NULL); if (!dns_rdataset_isassociated(rdataset)) { @@ -4347,7 +4349,7 @@ maybe_send_secure(dns_zone_t *zone) { */ if (zone->raw->db != NULL) { if (zone->db != NULL) { - isc_uint32_t serial; + uint32_t serial; unsigned int soacount; result = zone_get_from_db(zone->raw, zone->raw->db, @@ -4387,7 +4389,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, unsigned int soacount = 0; unsigned int nscount = 0; unsigned int errors = 0; - isc_uint32_t serial, oldserial, refresh, retry, expire, minimum; + uint32_t serial, oldserial, refresh, retry, expire, minimum; isc_time_t now; isc_boolean_t needdump = ISC_FALSE; isc_boolean_t hasinclude = DNS_ZONE_FLAG(zone, DNS_ZONEFLG_HASINCLUDE); @@ -4526,7 +4528,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, */ if (zone->journal != NULL && dns_zone_isdynamic(zone, ISC_TRUE) && ! DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IXFRFROMDIFFS)) { - isc_uint32_t jserial; + uint32_t jserial; dns_journal_t *journal = NULL; isc_boolean_t empty = ISC_FALSE; @@ -4632,7 +4634,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, RUNTIME_CHECK(soacount > 0U); if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IXFRFROMDIFFS) && !isc_serial_gt(serial, oldserial)) { - isc_uint32_t serialmin, serialmax; + uint32_t serialmin, serialmax; INSIST(zone->type == dns_zone_master); INSIST(zone->raw == NULL); @@ -4700,7 +4702,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, (zone->type == dns_zone_redirect && zone->masters != NULL)) { isc_time_t t; - isc_uint32_t delay; + uint32_t delay; result = isc_file_getmodtime(zone->journal, &t); if (result != ISC_R_SUCCESS) @@ -5051,9 +5053,9 @@ zone_count_ns_rr(dns_zone_t *zone, dns_db_t *db, dns_dbnode_t *node, static isc_result_t zone_load_soa_rr(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, unsigned int *soacount, - isc_uint32_t *serial, isc_uint32_t *refresh, - isc_uint32_t *retry, isc_uint32_t *expire, - isc_uint32_t *minimum) + uint32_t *serial, uint32_t *refresh, + uint32_t *retry, uint32_t *expire, + uint32_t *minimum) { isc_result_t result; unsigned int count; @@ -5144,9 +5146,9 @@ zone_load_soa_rr(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, */ static isc_result_t zone_get_from_db(dns_zone_t *zone, dns_db_t *db, unsigned int *nscount, - unsigned int *soacount, isc_uint32_t *serial, - isc_uint32_t *refresh, isc_uint32_t *retry, - isc_uint32_t *expire, isc_uint32_t *minimum, + unsigned int *soacount, uint32_t *serial, + uint32_t *refresh, uint32_t *retry, + uint32_t *expire, uint32_t *minimum, unsigned int *errors) { isc_result_t result; @@ -5592,7 +5594,7 @@ dns_zone_getnotifysrc6(dns_zone_t *zone) { static isc_boolean_t same_addrs(isc_sockaddr_t const *oldlist, isc_sockaddr_t const *newlist, - isc_uint32_t count) + uint32_t count) { unsigned int i; @@ -5604,7 +5606,7 @@ same_addrs(isc_sockaddr_t const *oldlist, isc_sockaddr_t const *newlist, static isc_boolean_t same_keynames(dns_name_t * const *oldlist, dns_name_t * const *newlist, - isc_uint32_t count) + uint32_t count) { unsigned int i; @@ -5762,7 +5764,7 @@ dns_zone_getnotifysrc6dscp(dns_zone_t *zone) { isc_result_t dns_zone_setalsonotify(dns_zone_t *zone, const isc_sockaddr_t *notify, - isc_uint32_t count) + uint32_t count) { return (dns_zone_setalsonotifydscpkeys(zone, notify, NULL, NULL, count)); @@ -5770,7 +5772,7 @@ dns_zone_setalsonotify(dns_zone_t *zone, const isc_sockaddr_t *notify, isc_result_t dns_zone_setalsonotifywithkeys(dns_zone_t *zone, const isc_sockaddr_t *notify, - dns_name_t **keynames, isc_uint32_t count) + dns_name_t **keynames, uint32_t count) { return (dns_zone_setalsonotifydscpkeys(zone, notify, NULL, keynames, count)); @@ -5779,7 +5781,7 @@ dns_zone_setalsonotifywithkeys(dns_zone_t *zone, const isc_sockaddr_t *notify, isc_result_t dns_zone_setalsonotifydscpkeys(dns_zone_t *zone, const isc_sockaddr_t *notify, const isc_dscp_t *dscps, dns_name_t **keynames, - isc_uint32_t count) + uint32_t count) { isc_result_t result; isc_sockaddr_t *newaddrs = NULL; @@ -5827,7 +5829,7 @@ dns_zone_setalsonotifydscpkeys(dns_zone_t *zone, const isc_sockaddr_t *notify, isc_result_t dns_zone_setmasters(dns_zone_t *zone, const isc_sockaddr_t *masters, - isc_uint32_t count) + uint32_t count) { isc_result_t result; @@ -5839,7 +5841,7 @@ isc_result_t dns_zone_setmasterswithkeys(dns_zone_t *zone, const isc_sockaddr_t *masters, dns_name_t **keynames, - isc_uint32_t count) + uint32_t count) { isc_result_t result = ISC_R_SUCCESS; isc_sockaddr_t *newaddrs = NULL; @@ -6133,7 +6135,7 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, unsigned int i; dns_rdata_rrsig_t rrsig; isc_boolean_t found; - isc_int64_t timewarn = 0, timemaybe = 0; + int64_t timewarn = 0, timemaybe = 0; dns_rdataset_init(&rdataset); @@ -6237,7 +6239,7 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, if (!dst_key_inactive(keys[i]) && !dst_key_isprivate(keys[i])) { - isc_int64_t timeexpire = + int64_t timeexpire = dns_time64_from32(rrsig.timeexpire); if (timewarn != 0 && timewarn > timeexpire) @@ -6426,7 +6428,7 @@ zone_resigninc(dns_zone_t *zone) { isc_boolean_t check_ksk, keyset_kskonly = ISC_FALSE; isc_result_t result; isc_stdtime_t now, inception, soaexpire, expire, stop; - isc_uint32_t jitter, sigvalidityinterval; + uint32_t jitter, sigvalidityinterval; unsigned int i; unsigned int nkeys = 0; unsigned int resign; @@ -6729,7 +6731,7 @@ sign_a_node(dns_db_t *db, dns_name_t *name, dns_dbnode_t *node, isc_stdtime_t inception, isc_stdtime_t expire, unsigned int minimum, isc_boolean_t is_ksk, isc_boolean_t keyset_kskonly, isc_boolean_t *delegation, - dns_diff_t *diff, isc_int32_t *signatures, isc_mem_t *mctx) + dns_diff_t *diff, int32_t *signatures, isc_mem_t *mctx) { isc_result_t result; dns_rdatasetiter_t *iterator = NULL; @@ -7425,16 +7427,16 @@ zone_nsec3chain(dns_zone_t *zone) { dns_nsec3chain_t *nsec3chain = NULL, *nextnsec3chain; dns_nsec3chainlist_t cleanup; dst_key_t *zone_keys[DNS_MAXZONEKEYS]; - isc_int32_t signatures; + int32_t signatures; isc_boolean_t check_ksk, keyset_kskonly; isc_boolean_t delegation; isc_boolean_t first; isc_result_t result; isc_stdtime_t now, inception, soaexpire, expire; - isc_uint32_t jitter, sigvalidityinterval; + uint32_t jitter, sigvalidityinterval; unsigned int i; unsigned int nkeys = 0; - isc_uint32_t nodes; + uint32_t nodes; isc_boolean_t unsecure = ISC_FALSE; isc_boolean_t seen_soa, seen_ns, seen_dname, seen_ds; isc_boolean_t seen_nsec, seen_nsec3, seen_rr; @@ -8255,7 +8257,7 @@ zone_nsec3chain(dns_zone_t *zone) { static isc_result_t del_sig(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, dns_dbnode_t *node, unsigned int nkeys, dns_secalg_t algorithm, - isc_uint16_t keyid, isc_boolean_t *has_algp, dns_diff_t *diff) + uint16_t keyid, isc_boolean_t *has_algp, dns_diff_t *diff) { dns_rdata_rrsig_t rrsig; dns_rdataset_t rdataset; @@ -8368,7 +8370,7 @@ zone_sign(dns_zone_t *zone) { dns_signing_t *signing, *nextsigning; dns_signinglist_t cleanup; dst_key_t *zone_keys[DNS_MAXZONEKEYS]; - isc_int32_t signatures; + int32_t signatures; isc_boolean_t check_ksk, keyset_kskonly, is_ksk; isc_boolean_t with_ksk, with_zsk; isc_boolean_t commit = ISC_FALSE; @@ -8378,10 +8380,10 @@ zone_sign(dns_zone_t *zone) { isc_boolean_t first; isc_result_t result; isc_stdtime_t now, inception, soaexpire, expire; - isc_uint32_t jitter, sigvalidityinterval; + uint32_t jitter, sigvalidityinterval; unsigned int i, j; unsigned int nkeys = 0; - isc_uint32_t nodes; + uint32_t nodes; ENTER; @@ -8970,7 +8972,7 @@ matchkey(dns_rdataset_t *rdset, dns_rdata_t *rr) { static inline isc_stdtime_t refresh_time(dns_keyfetch_t *kfetch, isc_boolean_t retry) { isc_result_t result; - isc_uint32_t t; + uint32_t t; dns_rdataset_t *rdset; dns_rdata_t sigrr = DNS_RDATA_INIT; dns_rdata_sig_t sig; @@ -8995,7 +8997,7 @@ refresh_time(dns_keyfetch_t *kfetch, isc_boolean_t retry) { t = sig.originalttl / 2; if (isc_serial_gt(sig.timeexpire, now)) { - isc_uint32_t exp = (sig.timeexpire - now) / 2; + uint32_t exp = (sig.timeexpire - now) / 2; if (t > exp) t = exp; } @@ -9009,7 +9011,7 @@ refresh_time(dns_keyfetch_t *kfetch, isc_boolean_t retry) { t = sig.originalttl / 10; if (isc_serial_gt(sig.timeexpire, now)) { - isc_uint32_t exp = (sig.timeexpire - now) / 10; + uint32_t exp = (sig.timeexpire - now) / 10; if (t > exp) t = exp; } @@ -9799,7 +9801,7 @@ zone_refreshkeys(dns_zone_t *zone) { dns_name_t *name = NULL, *kname = NULL; dns_rdataset_t *kdset = NULL; dns_keyfetch_t *kfetch; - isc_uint32_t ttl; + uint32_t ttl; dns_rriterator_current(&rrit, &name, &ttl, &kdset, NULL); if (kdset == NULL || kdset->type != dns_rdatatype_keydata || @@ -10131,7 +10133,7 @@ zone_maintenance(dns_zone_t *zone) { void dns_zone_markdirty(dns_zone_t *zone) { - isc_uint32_t serial; + uint32_t serial; isc_result_t result = ISC_R_SUCCESS; dns_zone_t *secure = NULL; @@ -10209,7 +10211,7 @@ zone_expire(dns_zone_t *zone) { void dns_zone_refresh(dns_zone_t *zone) { isc_interval_t i; - isc_uint32_t oldflags; + uint32_t oldflags; unsigned int j; isc_result_t result; @@ -10269,11 +10271,11 @@ dns_zone_refresh(dns_zone_t *zone) { } static void -zone_journal_compact(dns_zone_t *zone, dns_db_t *db, isc_uint32_t serial) { +zone_journal_compact(dns_zone_t *zone, dns_db_t *db, uint32_t serial) { isc_result_t result; - isc_int32_t journalsize; + int32_t journalsize; dns_dbversion_t *ver = NULL; - isc_uint64_t dbsize; + uint64_t dbsize; INSIST(LOCKED_ZONE(zone)); if (inline_raw(zone)) @@ -10291,7 +10293,7 @@ zone_journal_compact(dns_zone_t *zone, dns_db_t *db, isc_uint32_t serial) { "could not get zone size: %s", isc_result_totext(result)); } else if (dbsize < DNS_JOURNAL_SIZE_MAX / 2) { - journalsize = (isc_int32_t)dbsize * 2; + journalsize = (int32_t)dbsize * 2; } } zone_debuglog(zone, "zone_journal_compact", 1, @@ -10392,7 +10394,7 @@ dump_done(void *arg, isc_result_t result) { dns_dbversion_t *version; isc_boolean_t again = ISC_FALSE; isc_boolean_t compact = ISC_FALSE; - isc_uint32_t serial; + uint32_t serial; isc_result_t tresult; REQUIRE(DNS_ZONE_VALID(zone)); @@ -10431,7 +10433,7 @@ dump_done(void *arg, isc_result_t result) { * use its serial if it is less than ours. */ if (tresult == ISC_R_SUCCESS && secure != NULL) { - isc_uint32_t sserial; + uint32_t sserial; isc_result_t mresult; ZONEDB_LOCK(&secure->dblock, isc_rwlocktype_read); @@ -10590,7 +10592,7 @@ zone_dump(dns_zone_t *zone, isc_boolean_t compact) { static isc_result_t dumptostream(dns_zone_t *zone, FILE *fd, const dns_master_style_t *style, - dns_masterformat_t format, const isc_uint32_t rawversion) + dns_masterformat_t format, const uint32_t rawversion) { isc_result_t result; dns_dbversion_t *version = NULL; @@ -10626,7 +10628,7 @@ dumptostream(dns_zone_t *zone, FILE *fd, const dns_master_style_t *style, isc_result_t dns_zone_dumptostream(dns_zone_t *zone, FILE *fd, dns_masterformat_t format, const dns_master_style_t *style, - const isc_uint32_t rawversion) + const uint32_t rawversion) { return (dumptostream(zone, fd, style, format, rawversion)); } @@ -10702,7 +10704,7 @@ zone_unload(dns_zone_t *zone) { } void -dns_zone_setminrefreshtime(dns_zone_t *zone, isc_uint32_t val) { +dns_zone_setminrefreshtime(dns_zone_t *zone, uint32_t val) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(val > 0); @@ -10710,7 +10712,7 @@ dns_zone_setminrefreshtime(dns_zone_t *zone, isc_uint32_t val) { } void -dns_zone_setmaxrefreshtime(dns_zone_t *zone, isc_uint32_t val) { +dns_zone_setmaxrefreshtime(dns_zone_t *zone, uint32_t val) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(val > 0); @@ -10718,7 +10720,7 @@ dns_zone_setmaxrefreshtime(dns_zone_t *zone, isc_uint32_t val) { } void -dns_zone_setminretrytime(dns_zone_t *zone, isc_uint32_t val) { +dns_zone_setminretrytime(dns_zone_t *zone, uint32_t val) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(val > 0); @@ -10726,14 +10728,14 @@ dns_zone_setminretrytime(dns_zone_t *zone, isc_uint32_t val) { } void -dns_zone_setmaxretrytime(dns_zone_t *zone, isc_uint32_t val) { +dns_zone_setmaxretrytime(dns_zone_t *zone, uint32_t val) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(val > 0); zone->maxretry = val; } -isc_uint32_t +uint32_t dns_zone_getmaxrecords(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); @@ -10741,7 +10743,7 @@ dns_zone_getmaxrecords(dns_zone_t *zone) { } void -dns_zone_setmaxrecords(dns_zone_t *zone, isc_uint32_t val) { +dns_zone_setmaxrecords(dns_zone_t *zone, uint32_t val) { REQUIRE(DNS_ZONE_VALID(zone)); zone->maxrecords = val; @@ -11196,7 +11198,7 @@ zone_notify(dns_zone_t *zone, isc_time_t *now) { dns_name_t master; dns_rdata_ns_t ns; dns_rdata_soa_t soa; - isc_uint32_t serial; + uint32_t serial; dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_t nsrdset; dns_rdataset_t soardset; @@ -11506,7 +11508,7 @@ stub_callback(isc_task_t *task, isc_event_t *event) { dns_zone_t *zone = NULL; char master[ISC_SOCKADDR_FORMATSIZE]; char source[ISC_SOCKADDR_FORMATSIZE]; - isc_uint32_t nscnt, cnamecnt, refresh, retry, expire; + uint32_t nscnt, cnamecnt, refresh, retry, expire; isc_result_t result; isc_time_t now; isc_boolean_t exiting = ISC_FALSE; @@ -11762,14 +11764,14 @@ stub_callback(isc_task_t *task, isc_event_t *event) { */ static void get_edns_expire(dns_zone_t * zone, dns_message_t *message, - isc_uint32_t *expirep) + uint32_t *expirep) { isc_result_t result; - isc_uint32_t expire; + uint32_t expire; dns_rdata_t rdata = DNS_RDATA_INIT; isc_buffer_t optbuf; - isc_uint16_t optcode; - isc_uint16_t optlen; + uint16_t optcode; + uint16_t optlen; REQUIRE(expirep != NULL); REQUIRE(message != NULL); @@ -11849,7 +11851,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) { dns_requestevent_t *revent = (dns_requestevent_t *)event; dns_zone_t *zone; dns_message_t *msg = NULL; - isc_uint32_t soacnt, cnamecnt, soacount, nscount; + uint32_t soacnt, cnamecnt, soacount, nscount; isc_time_t now; char master[ISC_SOCKADDR_FORMATSIZE]; char source[ISC_SOCKADDR_FORMATSIZE]; @@ -11857,7 +11859,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_soa_t soa; isc_result_t result; - isc_uint32_t serial, oldserial = 0; + uint32_t serial, oldserial = 0; unsigned int j; isc_boolean_t do_queue_xfrin = ISC_FALSE; @@ -12135,7 +12137,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) { dns_message_destroy(&msg); } else if (isc_serial_eq(soa.serial, oldserial)) { isc_time_t expiretime; - isc_uint32_t expire; + uint32_t expire; /* * Compute the new expire time based on this response. @@ -12326,7 +12328,7 @@ create_query(dns_zone_t *zone, dns_rdatatype_t rdtype, } static isc_result_t -add_opt(dns_message_t *message, isc_uint16_t udpsize, isc_boolean_t reqnsid, +add_opt(dns_message_t *message, uint16_t udpsize, isc_boolean_t reqnsid, isc_boolean_t reqexpire) { isc_result_t result; @@ -12366,11 +12368,11 @@ soa_query(isc_task_t *task, isc_event_t *event) { dns_zone_t *dummy = NULL; isc_netaddr_t masterip; dns_tsigkey_t *key = NULL; - isc_uint32_t options; + uint32_t options; isc_boolean_t cancel = ISC_TRUE; int timeout; isc_boolean_t have_xfrsource, have_xfrdscp, reqnsid, reqexpire; - isc_uint16_t udpsize = SEND_BUFFER_SIZE; + uint16_t udpsize = SEND_BUFFER_SIZE; isc_dscp_t dscp = -1; REQUIRE(DNS_ZONE_VALID(zone)); @@ -12567,7 +12569,7 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) { int timeout; isc_boolean_t have_xfrsource = ISC_FALSE, have_xfrdscp = ISC_FALSE; isc_boolean_t reqnsid; - isc_uint16_t udpsize = SEND_BUFFER_SIZE; + uint16_t udpsize = SEND_BUFFER_SIZE; isc_dscp_t dscp = -1; REQUIRE(DNS_ZONE_VALID(zone)); @@ -13231,7 +13233,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, char fromtext[ISC_SOCKADDR_FORMATSIZE]; int match = 0; isc_netaddr_t netaddr; - isc_uint32_t serial = 0; + uint32_t serial = 0; isc_boolean_t have_serial = ISC_FALSE; dns_tsigkey_t *tsigkey; dns_name_t *tsig; @@ -13354,7 +13356,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, if (result == ISC_R_SUCCESS) result = dns_rdataset_first(rdataset); if (result == ISC_R_SUCCESS) { - isc_uint32_t oldserial; + uint32_t oldserial; unsigned int soacount; dns_rdataset_current(rdataset, &rdata); @@ -13646,13 +13648,13 @@ dns_zone_getchecknames(dns_zone_t *zone) { } void -dns_zone_setjournalsize(dns_zone_t *zone, isc_int32_t size) { +dns_zone_setjournalsize(dns_zone_t *zone, int32_t size) { REQUIRE(DNS_ZONE_VALID(zone)); zone->journalsize = size; } -isc_int32_t +int32_t dns_zone_getjournalsize(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); @@ -13870,13 +13872,13 @@ message_count(dns_message_t *msg, dns_section_t section, dns_rdatatype_t type) } void -dns_zone_setmaxxfrin(dns_zone_t *zone, isc_uint32_t maxxfrin) { +dns_zone_setmaxxfrin(dns_zone_t *zone, uint32_t maxxfrin) { REQUIRE(DNS_ZONE_VALID(zone)); zone->maxxfrin = maxxfrin; } -isc_uint32_t +uint32_t dns_zone_getmaxxfrin(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); @@ -13884,12 +13886,12 @@ dns_zone_getmaxxfrin(dns_zone_t *zone) { } void -dns_zone_setmaxxfrout(dns_zone_t *zone, isc_uint32_t maxxfrout) { +dns_zone_setmaxxfrout(dns_zone_t *zone, uint32_t maxxfrout) { REQUIRE(DNS_ZONE_VALID(zone)); zone->maxxfrout = maxxfrout; } -isc_uint32_t +uint32_t dns_zone_getmaxxfrout(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); @@ -13940,7 +13942,7 @@ dns_zone_gettask(dns_zone_t *zone, isc_task_t **target) { } void -dns_zone_setidlein(dns_zone_t *zone, isc_uint32_t idlein) { +dns_zone_setidlein(dns_zone_t *zone, uint32_t idlein) { REQUIRE(DNS_ZONE_VALID(zone)); if (idlein == 0) @@ -13948,7 +13950,7 @@ dns_zone_setidlein(dns_zone_t *zone, isc_uint32_t idlein) { zone->idlein = idlein; } -isc_uint32_t +uint32_t dns_zone_getidlein(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); @@ -13956,13 +13958,13 @@ dns_zone_getidlein(dns_zone_t *zone) { } void -dns_zone_setidleout(dns_zone_t *zone, isc_uint32_t idleout) { +dns_zone_setidleout(dns_zone_t *zone, uint32_t idleout) { REQUIRE(DNS_ZONE_VALID(zone)); zone->idleout = idleout; } -isc_uint32_t +uint32_t dns_zone_getidleout(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); @@ -14034,7 +14036,7 @@ notify_done(isc_task_t *task, isc_event_t *event) { struct secure_event { isc_event_t e; dns_db_t *db; - isc_uint32_t serial; + uint32_t serial; }; static void @@ -14045,7 +14047,7 @@ update_log_cb(void *arg, dns_zone_t *zone, int level, const char *message) { static isc_result_t sync_secure_journal(dns_zone_t *zone, dns_zone_t *raw, dns_journal_t *journal, - isc_uint32_t start, isc_uint32_t end, + uint32_t start, uint32_t end, dns_difftuple_t **soatuplep, dns_diff_t *diff) { isc_result_t result; @@ -14064,7 +14066,7 @@ sync_secure_journal(dns_zone_t *zone, dns_zone_t *raw, dns_journal_t *journal, result = dns_journal_next_rr(journal)) { dns_name_t *name = NULL; - isc_uint32_t ttl; + uint32_t ttl; dns_rdata_t *rdata = NULL; dns_journal_current_rr(journal, &name, &ttl, &rdata); @@ -14223,11 +14225,11 @@ receive_secure_serial(isc_task_t *task, isc_event_t *event) { isc_result_t result = ISC_R_SUCCESS; dns_journal_t *rjournal = NULL; dns_journal_t *sjournal = NULL; - isc_uint32_t start, end; + uint32_t start, end; dns_zone_t *zone; dns_difftuple_t *tuple = NULL, *soatuple = NULL; dns_update_log_t log = { update_log_cb, NULL }; - isc_uint32_t newserial = 0, desired = 0; + uint32_t newserial = 0, desired = 0; isc_time_t timenow; UNUSED(task); @@ -14300,7 +14302,7 @@ receive_secure_serial(isc_task_t *task, isc_event_t *event) { dns_journal_set_sourceserial(rjournal, start); } if (sjournal != NULL) { - isc_uint32_t serial; + uint32_t serial; /* * We read the secure journal first, if that * exists use its value provided it is greater @@ -14335,7 +14337,7 @@ receive_secure_serial(isc_task_t *task, isc_event_t *event) { zone->rss_newver)); if (soatuple != NULL) { - isc_uint32_t oldserial; + uint32_t oldserial; CHECK(dns_db_createsoatuple(zone->rss_db, zone->rss_oldver, @@ -14452,7 +14454,7 @@ receive_secure_serial(isc_task_t *task, isc_event_t *event) { } static isc_result_t -zone_send_secureserial(dns_zone_t *zone, isc_uint32_t serial) { +zone_send_secureserial(dns_zone_t *zone, uint32_t serial) { isc_event_t *e; dns_zone_t *dummy = NULL; @@ -14473,7 +14475,7 @@ zone_send_secureserial(dns_zone_t *zone, isc_uint32_t serial) { static isc_result_t checkandaddsoa(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, - dns_rdataset_t *rdataset, isc_uint32_t oldserial) + dns_rdataset_t *rdataset, uint32_t oldserial) { dns_rdata_soa_t soa; dns_rdata_t rdata = DNS_RDATA_INIT; @@ -15005,7 +15007,7 @@ zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump) { DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IXFRFROMDIFFS) && !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_FORCEXFER)) { - isc_uint32_t serial, oldserial; + uint32_t serial, oldserial; dns_zone_log(zone, ISC_LOG_DEBUG(3), "generating diffs"); @@ -15029,7 +15031,7 @@ zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump) { (zone->type == dns_zone_redirect && zone->masters != NULL)) && !isc_serial_gt(serial, oldserial)) { - isc_uint32_t serialmin, serialmax; + uint32_t serialmin, serialmax; serialmin = (oldserial + 1) & 0xffffffffU; serialmax = (oldserial + 0x7fffffffU) & 0xffffffffU; dns_zone_log(zone, ISC_LOG_ERROR, @@ -15150,7 +15152,7 @@ zone_xfrdone(dns_zone_t *zone, isc_result_t result) { isc_boolean_t again = ISC_FALSE; unsigned int soacount; unsigned int nscount; - isc_uint32_t serial, refresh, retry, expire, minimum; + uint32_t serial, refresh, retry, expire, minimum; isc_result_t xfrresult = result; isc_boolean_t free_needed; dns_zone_t *secure = NULL; @@ -15495,13 +15497,13 @@ dns_zone_setssutable(dns_zone_t *zone, dns_ssutable_t *table) { } void -dns_zone_setsigvalidityinterval(dns_zone_t *zone, isc_uint32_t interval) { +dns_zone_setsigvalidityinterval(dns_zone_t *zone, uint32_t interval) { REQUIRE(DNS_ZONE_VALID(zone)); zone->sigvalidityinterval = interval; } -isc_uint32_t +uint32_t dns_zone_getsigvalidityinterval(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); @@ -15509,13 +15511,13 @@ dns_zone_getsigvalidityinterval(dns_zone_t *zone) { } void -dns_zone_setkeyvalidityinterval(dns_zone_t *zone, isc_uint32_t interval) { +dns_zone_setkeyvalidityinterval(dns_zone_t *zone, uint32_t interval) { REQUIRE(DNS_ZONE_VALID(zone)); zone->keyvalidityinterval = interval; } -isc_uint32_t +uint32_t dns_zone_getkeyvalidityinterval(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); @@ -15523,7 +15525,7 @@ dns_zone_getkeyvalidityinterval(dns_zone_t *zone) { } void -dns_zone_setsigresigninginterval(dns_zone_t *zone, isc_uint32_t interval) { +dns_zone_setsigresigninginterval(dns_zone_t *zone, uint32_t interval) { isc_time_t now; REQUIRE(DNS_ZONE_VALID(zone)); @@ -15538,7 +15540,7 @@ dns_zone_setsigresigninginterval(dns_zone_t *zone, isc_uint32_t interval) { UNLOCK_ZONE(zone); } -isc_uint32_t +uint32_t dns_zone_getsigresigninginterval(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); @@ -16460,13 +16462,13 @@ zonemgr_free(dns_zonemgr_t *zmgr) { } void -dns_zonemgr_settransfersin(dns_zonemgr_t *zmgr, isc_uint32_t value) { +dns_zonemgr_settransfersin(dns_zonemgr_t *zmgr, uint32_t value) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); zmgr->transfersin = value; } -isc_uint32_t +uint32_t dns_zonemgr_getttransfersin(dns_zonemgr_t *zmgr) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); @@ -16474,13 +16476,13 @@ dns_zonemgr_getttransfersin(dns_zonemgr_t *zmgr) { } void -dns_zonemgr_settransfersperns(dns_zonemgr_t *zmgr, isc_uint32_t value) { +dns_zonemgr_settransfersperns(dns_zonemgr_t *zmgr, uint32_t value) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); zmgr->transfersperns = value; } -isc_uint32_t +uint32_t dns_zonemgr_getttransfersperns(dns_zonemgr_t *zmgr) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); @@ -16547,9 +16549,9 @@ static isc_result_t zmgr_start_xfrin_ifquota(dns_zonemgr_t *zmgr, dns_zone_t *zone) { dns_peer_t *peer = NULL; isc_netaddr_t masterip; - isc_uint32_t nxfrsin, nxfrsperns; + uint32_t nxfrsin, nxfrsperns; dns_zone_t *x; - isc_uint32_t maxtransfersin, maxtransfersperns; + uint32_t maxtransfersin, maxtransfersperns; isc_event_t *e; /* @@ -16633,7 +16635,7 @@ zmgr_start_xfrin_ifquota(dns_zonemgr_t *zmgr, dns_zone_t *zone) { } void -dns_zonemgr_setiolimit(dns_zonemgr_t *zmgr, isc_uint32_t iolimit) { +dns_zonemgr_setiolimit(dns_zonemgr_t *zmgr, uint32_t iolimit) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); REQUIRE(iolimit > 0); @@ -16641,7 +16643,7 @@ dns_zonemgr_setiolimit(dns_zonemgr_t *zmgr, isc_uint32_t iolimit) { zmgr->iolimit = iolimit; } -isc_uint32_t +uint32_t dns_zonemgr_getiolimit(dns_zonemgr_t *zmgr) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); @@ -16800,8 +16802,8 @@ zone_saveunique(dns_zone_t *zone, const char *path, const char *templat) { static void setrl(isc_ratelimiter_t *rl, unsigned int *rate, unsigned int value) { isc_interval_t interval; - isc_uint32_t s, ns; - isc_uint32_t pertic; + uint32_t s, ns; + uint32_t pertic; isc_result_t result; if (value == 0) @@ -16884,8 +16886,8 @@ dns_zonemgr_unreachable(dns_zonemgr_t *zmgr, isc_sockaddr_t *remote, unsigned int i; isc_rwlocktype_t locktype; isc_result_t result; - isc_uint32_t seconds = isc_time_seconds(now); - isc_uint32_t count = 0; + uint32_t seconds = isc_time_seconds(now); + uint32_t count = 0; REQUIRE(DNS_ZONEMGR_VALID(zmgr)); @@ -16951,8 +16953,8 @@ void dns_zonemgr_unreachableadd(dns_zonemgr_t *zmgr, isc_sockaddr_t *remote, isc_sockaddr_t *local, isc_time_t *now) { - isc_uint32_t seconds = isc_time_seconds(now); - isc_uint32_t last = seconds; + uint32_t seconds = isc_time_seconds(now); + uint32_t last = seconds; unsigned int i, slot = UNREACH_CHACHE_SIZE, oldest = 0; REQUIRE(DNS_ZONEMGR_VALID(zmgr)); @@ -17036,7 +17038,7 @@ dns_zone_setstatistics(dns_zone_t *zone, isc_boolean_t on) { return (ISC_R_NOTIMPLEMENTED); } -isc_uint64_t * +uint64_t * dns_zone_getstatscounters(dns_zone_t *zone) { /* * This function is obsoleted. @@ -17325,7 +17327,7 @@ dns_zone_setisself(dns_zone_t *zone, dns_isselffunc_t isself, void *arg) { } void -dns_zone_setnotifydelay(dns_zone_t *zone, isc_uint32_t delay) { +dns_zone_setnotifydelay(dns_zone_t *zone, uint32_t delay) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -17333,7 +17335,7 @@ dns_zone_setnotifydelay(dns_zone_t *zone, isc_uint32_t delay) { UNLOCK_ZONE(zone); } -isc_uint32_t +uint32_t dns_zone_getnotifydelay(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); @@ -17342,7 +17344,7 @@ dns_zone_getnotifydelay(dns_zone_t *zone) { isc_result_t dns_zone_signwithkey(dns_zone_t *zone, dns_secalg_t algorithm, - isc_uint16_t keyid, isc_boolean_t deleteit) + uint16_t keyid, isc_boolean_t deleteit) { isc_result_t result; REQUIRE(DNS_ZONE_VALID(zone)); @@ -17384,7 +17386,7 @@ dns_zone_addnsec3chain(dns_zone_t *zone, dns_rdata_nsec3param_t *nsec3param) { } void -dns_zone_setnodes(dns_zone_t *zone, isc_uint32_t nodes) { +dns_zone_setnodes(dns_zone_t *zone, uint32_t nodes) { REQUIRE(DNS_ZONE_VALID(zone)); if (nodes == 0) @@ -17393,21 +17395,21 @@ dns_zone_setnodes(dns_zone_t *zone, isc_uint32_t nodes) { } void -dns_zone_setsignatures(dns_zone_t *zone, isc_uint32_t signatures) { +dns_zone_setsignatures(dns_zone_t *zone, uint32_t signatures) { REQUIRE(DNS_ZONE_VALID(zone)); /* * We treat signatures as a signed value so explicitly * limit its range here. */ - if (signatures > ISC_INT32_MAX) - signatures = ISC_INT32_MAX; + if (signatures > INT32_MAX) + signatures = INT32_MAX; else if (signatures == 0) signatures = 1; zone->signatures = signatures; } -isc_uint32_t +uint32_t dns_zone_getsignatures(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->signatures); @@ -17426,7 +17428,7 @@ dns_zone_getprivatetype(dns_zone_t *zone) { } static isc_result_t -zone_signwithkey(dns_zone_t *zone, dns_secalg_t algorithm, isc_uint16_t keyid, +zone_signwithkey(dns_zone_t *zone, dns_secalg_t algorithm, uint16_t keyid, isc_boolean_t deleteit) { dns_signing_t *signing; @@ -17603,7 +17605,7 @@ add_signing_records(dns_db_t *db, dns_rdatatype_t privatetype, isc_boolean_t flag; isc_region_t r; isc_result_t result = ISC_R_SUCCESS; - isc_uint16_t keyid; + uint16_t keyid; unsigned char buf[5]; dns_name_t *name = dns_db_origin(db); @@ -17763,7 +17765,7 @@ dnskey_sane(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, for (tuple = ISC_LIST_HEAD(diff->tuples); tuple != NULL; tuple = ISC_LIST_NEXT(tuple, link)) { - isc_uint8_t alg; + uint8_t alg; if (tuple->rdata.type != dns_rdatatype_dnskey || tuple->op != DNS_DIFFOP_ADD) continue; @@ -18500,7 +18502,7 @@ dns_zone_dlzpostload(dns_zone_t *zone, dns_db_t *db) } isc_result_t -dns_zone_setrefreshkeyinterval(dns_zone_t *zone, isc_uint32_t interval) { +dns_zone_setrefreshkeyinterval(dns_zone_t *zone, uint32_t interval) { REQUIRE(DNS_ZONE_VALID(zone)); if (interval == 0) return (ISC_R_RANGE); @@ -19036,8 +19038,8 @@ setnsec3param(isc_task_t *task, isc_event_t *event) { * structure passed as an argument. */ isc_result_t -dns_zone_setnsec3param(dns_zone_t *zone, isc_uint8_t hash, isc_uint8_t flags, - isc_uint16_t iter, isc_uint8_t saltlen, +dns_zone_setnsec3param(dns_zone_t *zone, uint8_t hash, uint8_t flags, + uint16_t iter, uint8_t saltlen, unsigned char *salt, isc_boolean_t replace) { isc_result_t result = ISC_R_SUCCESS; @@ -19190,7 +19192,7 @@ dns_zone_getstatlevel(dns_zone_t *zone) { static void setserial(isc_task_t *task, isc_event_t *event) { - isc_uint32_t oldserial, desired; + uint32_t oldserial, desired; const char *me = "setserial"; isc_boolean_t commit = ISC_FALSE; isc_result_t result; @@ -19286,7 +19288,7 @@ setserial(isc_task_t *task, isc_event_t *event) { } isc_result_t -dns_zone_setserial(dns_zone_t *zone, isc_uint32_t serial) { +dns_zone_setserial(dns_zone_t *zone, uint32_t serial) { isc_result_t result = ISC_R_SUCCESS; dns_zone_t *dummy = NULL; isc_event_t *e = NULL; diff --git a/lib/dns/zoneverify.c b/lib/dns/zoneverify.c index c3b81bc432..0be3195990 100644 --- a/lib/dns/zoneverify.c +++ b/lib/dns/zoneverify.c @@ -13,6 +13,7 @@ #include +#include #include #include #include @@ -81,10 +82,10 @@ typedef struct vctx { } vctx_t; struct nsec3_chain_fixed { - isc_uint8_t hash; - isc_uint8_t salt_length; - isc_uint8_t next_length; - isc_uint16_t iterations; + uint8_t hash; + uint8_t salt_length; + uint8_t next_length; + uint16_t iterations; /* * The following non-fixed-length data is stored in memory after the * fields declared above for each NSEC3 chain element: @@ -135,7 +136,7 @@ zoneverify_print(const vctx_t *vctx, const char *fmt, ...) { static isc_boolean_t is_delegation(const vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, - isc_uint32_t *ttlp) + uint32_t *ttlp) { dns_rdataset_t nsset; isc_result_t result; diff --git a/lib/dns/zt.c b/lib/dns/zt.c index 9fec7c49c4..bb8cf32f9c 100644 --- a/lib/dns/zt.c +++ b/lib/dns/zt.c @@ -14,6 +14,8 @@ #include +#include + #include #include #include @@ -40,7 +42,7 @@ struct dns_zt { void * loaddone_arg; /* Locked by lock. */ isc_boolean_t flush; - isc_uint32_t references; + uint32_t references; unsigned int loads_pending; dns_rbt_t *table; }; diff --git a/lib/irs/dnsconf.c b/lib/irs/dnsconf.c index 401c23aa90..ee89af01e0 100644 --- a/lib/irs/dnsconf.c +++ b/lib/irs/dnsconf.c @@ -14,6 +14,7 @@ #include +#include #include #include @@ -55,7 +56,7 @@ configure_dnsseckeys(irs_dnsconf_t *conf, cfg_obj_t *cfgobj, dns_name_t *keyname_base, *keyname; const cfg_listelt_t *element, *element2; isc_result_t result; - isc_uint32_t flags, proto, alg; + uint32_t flags, proto, alg; const char *keystr, *keynamestr; unsigned char keydata[4096]; isc_buffer_t keydatabuf_base, *keydatabuf; @@ -102,9 +103,9 @@ configure_dnsseckeys(irs_dnsconf_t *conf, cfg_obj_t *cfgobj, return (ISC_R_RANGE); if (alg > 0xff) return (ISC_R_RANGE); - keystruct.flags = (isc_uint16_t)flags; - keystruct.protocol = (isc_uint8_t)proto; - keystruct.algorithm = (isc_uint8_t)alg; + keystruct.flags = (uint16_t)flags; + keystruct.protocol = (uint8_t)proto; + keystruct.algorithm = (uint8_t)alg; isc_buffer_init(&keydatabuf_base, keydata, sizeof(keydata)); diff --git a/lib/irs/getaddrinfo.c b/lib/irs/getaddrinfo.c index e67f9bbbfe..80fdf9da0e 100644 --- a/lib/irs/getaddrinfo.c +++ b/lib/irs/getaddrinfo.c @@ -120,6 +120,7 @@ #include +#include #include #include #include @@ -366,7 +367,7 @@ getaddrinfo(const char *hostname, const char *servname, #ifdef IRS_HAVE_SIN6_SCOPE_ID char *p, *ep; char ntmp[NI_MAXHOST]; - isc_uint32_t scopeid; + uint32_t scopeid; #endif #ifdef IRS_HAVE_SIN6_SCOPE_ID @@ -385,7 +386,7 @@ getaddrinfo(const char *hostname, const char *servname, */ if (p != NULL) - scopeid = (isc_uint32_t)strtoul(p + 1, + scopeid = (uint32_t)strtoul(p + 1, &ep, 10); if (p != NULL && ep != NULL && ep[0] == '\0') *p = '\0'; diff --git a/lib/irs/resconf.c b/lib/irs/resconf.c index 57fe5a7dd5..fa91d444e3 100644 --- a/lib/irs/resconf.c +++ b/lib/irs/resconf.c @@ -43,6 +43,7 @@ #include #include +#include #include #include #include @@ -97,7 +98,7 @@ struct irs_resconf { char *domainname; char *search[RESCONFMAXSEARCH]; - isc_uint8_t searchnxt; /*%< index for next free slot */ + uint8_t searchnxt; /*%< index for next free slot */ irs_resconf_searchlist_t searchlist; @@ -106,12 +107,12 @@ struct irs_resconf { /*% mask has a non-zero 'family' if set */ isc_netaddr_t mask; } sortlist[RESCONFMAXSORTLIST]; - isc_uint8_t sortlistnxt; + uint8_t sortlistnxt; /*%< non-zero if 'options debug' set */ - isc_uint8_t resdebug; + uint8_t resdebug; /*%< set to n in 'options ndots:n' */ - isc_uint8_t ndots; + uint8_t ndots; }; static isc_result_t @@ -453,7 +454,7 @@ resconf_parseoption(irs_resconf_t *conf, FILE *fp) { return (ISC_R_UNEXPECTEDTOKEN); if (ndots < 0 || ndots > 0xff) /* Out of range. */ return (ISC_R_RANGE); - conf->ndots = (isc_uint8_t)ndots; + conf->ndots = (uint8_t)ndots; } if (delim == EOF || delim == '\n') diff --git a/lib/isc/alpha/include/isc/atomic.h b/lib/isc/alpha/include/isc/atomic.h index 8d7c10fad8..e704fef042 100644 --- a/lib/isc/alpha/include/isc/atomic.h +++ b/lib/isc/alpha/include/isc/atomic.h @@ -46,6 +46,8 @@ #ifndef ISC_ATOMIC_H #define ISC_ATOMIC_H 1 +#include + #include #include @@ -60,8 +62,8 @@ * can be critical, so we add explicit memory block instructions at the * beginning and the end of it (same for other functions). */ -static inline isc_int32_t -isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) { +static inline int32_t +isc_atomic_xadd(int32_t *p, int32_t val) { return (asm("mb;" "1:" "ldl_l %t0, 0(%a0);" /* load old value */ @@ -77,7 +79,7 @@ isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) { * This routine atomically stores the value 'val' in 'p'. */ static inline void -isc_atomic_store(isc_int32_t *p, isc_int32_t val) { +isc_atomic_store(int32_t *p, int32_t val) { (void)asm("mb;" "1:" "ldl_l %t0, 0(%a0);" /* load old value */ @@ -93,8 +95,8 @@ isc_atomic_store(isc_int32_t *p, isc_int32_t val) { * original value is equal to 'cmpval'. The original value is returned in any * case. */ -static inline isc_int32_t -isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) { +static inline int32_t +isc_atomic_cmpxchg(int32_t *p, int32_t cmpval, int32_t val) { return(asm("mb;" "1:" @@ -110,9 +112,9 @@ isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) { p, cmpval, val)); } #elif defined (ISC_PLATFORM_USEGCCASM) -static inline isc_int32_t -isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) { - isc_int32_t temp, prev; +static inline int32_t +isc_atomic_xadd(int32_t *p, int32_t val) { + int32_t temp, prev; __asm__ volatile( "mb;" @@ -131,8 +133,8 @@ isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) { } static inline void -isc_atomic_store(isc_int32_t *p, isc_int32_t val) { - isc_int32_t temp; +isc_atomic_store(int32_t *p, int32_t val) { + int32_t temp; __asm__ volatile( "mb;" @@ -147,9 +149,9 @@ isc_atomic_store(isc_int32_t *p, isc_int32_t val) { : "memory"); } -static inline isc_int32_t -isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) { - isc_int32_t temp, prev; +static inline int32_t +isc_atomic_cmpxchg(int32_t *p, int32_t cmpval, int32_t val) { + int32_t temp, prev; __asm__ volatile( "mb;" diff --git a/lib/isc/buffer.c b/lib/isc/buffer.c index 56b38f9f62..a4ab9d9f86 100644 --- a/lib/isc/buffer.c +++ b/lib/isc/buffer.c @@ -269,10 +269,10 @@ isc_buffer_compact(isc_buffer_t *b) { b->used = length; } -isc_uint8_t +uint8_t isc_buffer_getuint8(isc_buffer_t *b) { unsigned char *cp; - isc_uint8_t result; + uint8_t result; /* * Read an unsigned 8-bit integer from 'b' and return it. @@ -283,13 +283,13 @@ isc_buffer_getuint8(isc_buffer_t *b) { cp = isc_buffer_current(b); b->current += 1; - result = ((isc_uint8_t)(cp[0])); + result = ((uint8_t)(cp[0])); return (result); } void -isc__buffer_putuint8(isc_buffer_t *b, isc_uint8_t val) { +isc__buffer_putuint8(isc_buffer_t *b, uint8_t val) { isc_result_t result; REQUIRE(ISC_BUFFER_VALID(b)); if (ISC_UNLIKELY(b->autore)) { @@ -301,10 +301,10 @@ isc__buffer_putuint8(isc_buffer_t *b, isc_uint8_t val) { ISC__BUFFER_PUTUINT8(b, val); } -isc_uint16_t +uint16_t isc_buffer_getuint16(isc_buffer_t *b) { unsigned char *cp; - isc_uint16_t result; + uint16_t result; /* * Read an unsigned 16-bit integer in network byte order from 'b', @@ -323,7 +323,7 @@ isc_buffer_getuint16(isc_buffer_t *b) { } void -isc__buffer_putuint16(isc_buffer_t *b, isc_uint16_t val) { +isc__buffer_putuint16(isc_buffer_t *b, uint16_t val) { isc_result_t result; REQUIRE(ISC_BUFFER_VALID(b)); if (ISC_UNLIKELY(b->autore)) { @@ -336,7 +336,7 @@ isc__buffer_putuint16(isc_buffer_t *b, isc_uint16_t val) { } void -isc__buffer_putuint24(isc_buffer_t *b, isc_uint32_t val) { +isc__buffer_putuint24(isc_buffer_t *b, uint32_t val) { isc_result_t result; REQUIRE(ISC_BUFFER_VALID(b)); if (ISC_UNLIKELY(b->autore)) { @@ -348,10 +348,10 @@ isc__buffer_putuint24(isc_buffer_t *b, isc_uint32_t val) { ISC__BUFFER_PUTUINT24(b, val); } -isc_uint32_t +uint32_t isc_buffer_getuint32(isc_buffer_t *b) { unsigned char *cp; - isc_uint32_t result; + uint32_t result; /* * Read an unsigned 32-bit integer in network byte order from 'b', @@ -372,7 +372,7 @@ isc_buffer_getuint32(isc_buffer_t *b) { } void -isc__buffer_putuint32(isc_buffer_t *b, isc_uint32_t val) { +isc__buffer_putuint32(isc_buffer_t *b, uint32_t val) { isc_result_t result; REQUIRE(ISC_BUFFER_VALID(b)); if (ISC_UNLIKELY(b->autore)) { @@ -384,10 +384,10 @@ isc__buffer_putuint32(isc_buffer_t *b, isc_uint32_t val) { ISC__BUFFER_PUTUINT32(b, val); } -isc_uint64_t +uint64_t isc_buffer_getuint48(isc_buffer_t *b) { unsigned char *cp; - isc_uint64_t result; + uint64_t result; /* * Read an unsigned 48-bit integer in network byte order from 'b', @@ -399,21 +399,21 @@ isc_buffer_getuint48(isc_buffer_t *b) { cp = isc_buffer_current(b); b->current += 6; - result = ((isc_int64_t)(cp[0])) << 40; - result |= ((isc_int64_t)(cp[1])) << 32; - result |= ((isc_int64_t)(cp[2])) << 24; - result |= ((isc_int64_t)(cp[3])) << 16; - result |= ((isc_int64_t)(cp[4])) << 8; - result |= ((isc_int64_t)(cp[5])); + result = ((int64_t)(cp[0])) << 40; + result |= ((int64_t)(cp[1])) << 32; + result |= ((int64_t)(cp[2])) << 24; + result |= ((int64_t)(cp[3])) << 16; + result |= ((int64_t)(cp[4])) << 8; + result |= ((int64_t)(cp[5])); return (result); } void -isc__buffer_putuint48(isc_buffer_t *b, isc_uint64_t val) { +isc__buffer_putuint48(isc_buffer_t *b, uint64_t val) { isc_result_t result; - isc_uint16_t valhi; - isc_uint32_t vallo; + uint16_t valhi; + uint32_t vallo; REQUIRE(ISC_BUFFER_VALID(b)); if (ISC_UNLIKELY(b->autore)) { @@ -422,8 +422,8 @@ isc__buffer_putuint48(isc_buffer_t *b, isc_uint64_t val) { } REQUIRE(isc_buffer_availablelength(b) >= 6); - valhi = (isc_uint16_t)(val >> 32); - vallo = (isc_uint32_t)(val & 0xFFFFFFFF); + valhi = (uint16_t)(val >> 32); + vallo = (uint32_t)(val & 0xFFFFFFFF); ISC__BUFFER_PUTUINT16(b, valhi); ISC__BUFFER_PUTUINT32(b, vallo); } @@ -468,7 +468,7 @@ isc__buffer_putstr(isc_buffer_t *b, const char *source) { } void -isc_buffer_putdecint(isc_buffer_t *b, isc_int64_t v) { +isc_buffer_putdecint(isc_buffer_t *b, int64_t v) { unsigned int l=0; unsigned char *cp; char buf[21]; @@ -572,7 +572,7 @@ isc_buffer_allocate(isc_mem_t *mctx, isc_buffer_t **dynbuffer, isc_result_t isc_buffer_reserve(isc_buffer_t **dynbuffer, unsigned int size) { unsigned char *bdata; - isc_uint64_t len; + uint64_t len; REQUIRE(dynbuffer != NULL); REQUIRE(ISC_BUFFER_VALID(*dynbuffer)); diff --git a/lib/isc/crc64.c b/lib/isc/crc64.c index 43434ffd73..1db2d5d5d7 100644 --- a/lib/isc/crc64.c +++ b/lib/isc/crc64.c @@ -11,6 +11,8 @@ #include "config.h" +#include + #include #include #include @@ -20,7 +22,7 @@ /*%< * ECMA-182 CRC64 polynomial. */ -static const isc_uint64_t crc64_table[256] = { +static const uint64_t crc64_table[256] = { 0x0000000000000000ULL, 0x42F0E1EBA9EA3693ULL, 0x85E1C3D753D46D26ULL, 0xC711223CFA3E5BB5ULL, 0x493366450E42ECDFULL, 0x0BC387AEA7A8DA4CULL, 0xCCD2A5925D9681F9ULL, 0x8E224479F47CB76AULL, 0x9266CC8A1C85D9BEULL, @@ -110,14 +112,14 @@ static const isc_uint64_t crc64_table[256] = { }; void -isc_crc64_init(isc_uint64_t *crc) { +isc_crc64_init(uint64_t *crc) { REQUIRE(crc != NULL); *crc = 0xffffffffffffffffULL; } void -isc_crc64_update(isc_uint64_t *crc, const void *data, size_t len) { +isc_crc64_update(uint64_t *crc, const void *data, size_t len) { const unsigned char *p = data; int i; @@ -132,7 +134,7 @@ isc_crc64_update(isc_uint64_t *crc, const void *data, size_t len) { void -isc_crc64_final(isc_uint64_t *crc) { +isc_crc64_final(uint64_t *crc) { REQUIRE(crc != NULL); *crc ^= 0xffffffffffffffffULL; diff --git a/lib/isc/entropy_private.h b/lib/isc/entropy_private.h index 771b0e4388..f9133c74f9 100644 --- a/lib/isc/entropy_private.h +++ b/lib/isc/entropy_private.h @@ -11,7 +11,6 @@ #pragma once -#include #include #include diff --git a/lib/isc/hash.c b/lib/isc/hash.c index 1158513c0b..e4417edde2 100644 --- a/lib/isc/hash.c +++ b/lib/isc/hash.c @@ -14,7 +14,10 @@ */ #include // IWYU pragma: keep + #include +#include + #include "isc/once.h" #include "isc/random.h" #include "isc/util.h" @@ -23,7 +26,7 @@ #include "isc/result.h" #include "isc/hash.h" // IWYU pragma: keep -static isc_uint32_t fnv_offset_basis; +static uint32_t fnv_offset_basis; static isc_once_t fnv_once = ISC_ONCE_INIT; static isc_boolean_t fnv_initialized = ISC_FALSE; @@ -98,14 +101,14 @@ isc_hash_set_initializer(const void *initializer) { fnv_offset_basis = *((const unsigned int *) initializer); } -#define FNV_32_PRIME ((isc_uint32_t)0x01000193) +#define FNV_32_PRIME ((uint32_t)0x01000193) -isc_uint32_t +uint32_t isc_hash_function(const void *data, size_t length, isc_boolean_t case_sensitive, - const isc_uint32_t *previous_hashp) + const uint32_t *previous_hashp) { - isc_uint32_t hval; + uint32_t hval; const unsigned char *bp; const unsigned char *be; @@ -149,12 +152,12 @@ isc_hash_function(const void *data, size_t length, return (hval); } -isc_uint32_t +uint32_t isc_hash_function_reverse(const void *data, size_t length, isc_boolean_t case_sensitive, - const isc_uint32_t *previous_hashp) + const uint32_t *previous_hashp) { - isc_uint32_t hval; + uint32_t hval; const unsigned char *bp; const unsigned char *be; diff --git a/lib/isc/ht.c b/lib/isc/ht.c index afb5fcbc68..049f679ae8 100644 --- a/lib/isc/ht.c +++ b/lib/isc/ht.c @@ -11,6 +11,7 @@ #include +#include #include #include @@ -50,7 +51,7 @@ struct isc_ht_iter { }; isc_result_t -isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, isc_uint8_t bits) { +isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, uint8_t bits) { isc_ht_t *ht = NULL; size_t i; @@ -120,10 +121,10 @@ isc_ht_destroy(isc_ht_t **htp) { isc_result_t isc_ht_add(isc_ht_t *ht, const unsigned char *key, - isc_uint32_t keysize, void *value) + uint32_t keysize, void *value) { isc_ht_node_t *node; - isc_uint32_t hash; + uint32_t hash; REQUIRE(ISC_HT_VALID(ht)); REQUIRE(key != NULL && keysize > 0); @@ -154,10 +155,10 @@ isc_ht_add(isc_ht_t *ht, const unsigned char *key, isc_result_t isc_ht_find(const isc_ht_t *ht, const unsigned char *key, - isc_uint32_t keysize, void **valuep) + uint32_t keysize, void **valuep) { isc_ht_node_t *node; - isc_uint32_t hash; + uint32_t hash; REQUIRE(ISC_HT_VALID(ht)); REQUIRE(key != NULL && keysize > 0); @@ -179,9 +180,9 @@ isc_ht_find(const isc_ht_t *ht, const unsigned char *key, } isc_result_t -isc_ht_delete(isc_ht_t *ht, const unsigned char *key, isc_uint32_t keysize) { +isc_ht_delete(isc_ht_t *ht, const unsigned char *key, uint32_t keysize) { isc_ht_node_t *node, *prev; - isc_uint32_t hash; + uint32_t hash; REQUIRE(ISC_HT_VALID(ht)); REQUIRE(key != NULL && keysize > 0); @@ -284,7 +285,7 @@ isc_ht_iter_delcurrent_next(isc_ht_iter_t *it) { isc_ht_node_t *to_delete = NULL; isc_ht_node_t *prev = NULL; isc_ht_node_t *node = NULL; - isc_uint32_t hash; + uint32_t hash; isc_ht_t *ht; REQUIRE(it != NULL); REQUIRE(it->cur != NULL); diff --git a/lib/isc/httpd.c b/lib/isc/httpd.c index 03b9e7c803..c1225f3a17 100644 --- a/lib/isc/httpd.c +++ b/lib/isc/httpd.c @@ -14,6 +14,9 @@ #include +#include +#include + #include #include #include @@ -24,8 +27,6 @@ #include #include -#include - #ifdef HAVE_ZLIB #include #endif @@ -74,7 +75,7 @@ struct isc_httpd { * Received data state. */ char recvbuf[HTTP_RECVLEN]; /*%< receive buffer */ - isc_uint32_t recvlen; /*%< length recv'd */ + uint32_t recvlen; /*%< length recv'd */ char *headers; /*%< set in process_request() */ unsigned int method; char *url; diff --git a/lib/isc/ia64/include/isc/atomic.h b/lib/isc/ia64/include/isc/atomic.h index 361e46f0bb..e2f4331dfb 100644 --- a/lib/isc/ia64/include/isc/atomic.h +++ b/lib/isc/ia64/include/isc/atomic.h @@ -13,6 +13,8 @@ #ifndef ISC_ATOMIC_H #define ISC_ATOMIC_H 1 +#include + #include #include @@ -24,15 +26,15 @@ * Open issue: can 'fetchadd' make the code faster for some particular values * (e.g., 1 and -1)? */ -static inline isc_int32_t +static inline int32_t #ifdef __GNUC__ __attribute__ ((unused)) #endif -isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) +isc_atomic_xadd(int32_t *p, int32_t val) { - isc_int32_t prev, swapped; + int32_t prev, swapped; - for (prev = *(volatile isc_int32_t *)p; ; prev = swapped) { + for (prev = *(volatile int32_t *)p; ; prev = swapped) { swapped = prev + val; __asm__ volatile( "mov ar.ccv=%2;;" @@ -54,7 +56,7 @@ static inline void #ifdef __GNUC__ __attribute__ ((unused)) #endif -isc_atomic_store(isc_int32_t *p, isc_int32_t val) +isc_atomic_store(int32_t *p, int32_t val) { __asm__ volatile( "st4.rel %0=%1" @@ -69,13 +71,13 @@ isc_atomic_store(isc_int32_t *p, isc_int32_t val) * original value is equal to 'cmpval'. The original value is returned in any * case. */ -static inline isc_int32_t +static inline int32_t #ifdef __GNUC__ __attribute__ ((unused)) #endif -isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) +isc_atomic_cmpxchg(int32_t *p, int32_t cmpval, int32_t val) { - isc_int32_t ret; + int32_t ret; __asm__ volatile( "mov ar.ccv=%2;;" diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in index 8183efb461..5c4a356193 100644 --- a/lib/isc/include/isc/Makefile.in +++ b/lib/isc/include/isc/Makefile.in @@ -24,7 +24,7 @@ HEADERS = aes.h app.h assertions.h backtrace.h base32.h base64.h \ errno.h error.h event.h eventclass.h \ file.h formatcheck.h fsaccess.h fuzz.h \ hash.h heap.h hex.h hmacmd5.h hmacsha.h ht.h httpd.h \ - interfaceiter.h @ISC_IPV6_H@ iterated_hash.h \ + int.h interfaceiter.h @ISC_IPV6_H@ iterated_hash.h \ json.h lang.h lex.h lfsr.h lib.h likely.h list.h log.h \ magic.h md5.h mem.h meminfo.h msgcat.h msgs.h mutexblock.h \ netaddr.h netscope.h nonce.h os.h parseint.h \ diff --git a/lib/isc/include/isc/buffer.h b/lib/isc/include/isc/buffer.h index edcbc6f913..1b523ebfb8 100644 --- a/lib/isc/include/isc/buffer.h +++ b/lib/isc/include/isc/buffer.h @@ -99,6 +99,8 @@ *** Imports ***/ +#include + #include #include #include @@ -488,7 +490,7 @@ isc_buffer_compact(isc_buffer_t *b); * are those of the remaining region (as it was before the call). */ -isc_uint8_t +uint8_t isc_buffer_getuint8(isc_buffer_t *b); /*!< * \brief Read an unsigned 8-bit integer from 'b' and return it. @@ -509,7 +511,7 @@ isc_buffer_getuint8(isc_buffer_t *b); */ void -isc__buffer_putuint8(isc_buffer_t *b, isc_uint8_t val); +isc__buffer_putuint8(isc_buffer_t *b, uint8_t val); /*!< * \brief Store an unsigned 8-bit integer from 'val' into 'b'. * @@ -523,7 +525,7 @@ isc__buffer_putuint8(isc_buffer_t *b, isc_uint8_t val); *\li The used pointer in 'b' is advanced by 1. */ -isc_uint16_t +uint16_t isc_buffer_getuint16(isc_buffer_t *b); /*!< * \brief Read an unsigned 16-bit integer in network byte order from 'b', convert @@ -546,7 +548,7 @@ isc_buffer_getuint16(isc_buffer_t *b); */ void -isc__buffer_putuint16(isc_buffer_t *b, isc_uint16_t val); +isc__buffer_putuint16(isc_buffer_t *b, uint16_t val); /*!< * \brief Store an unsigned 16-bit integer in host byte order from 'val' * into 'b' in network byte order. @@ -561,7 +563,7 @@ isc__buffer_putuint16(isc_buffer_t *b, isc_uint16_t val); *\li The used pointer in 'b' is advanced by 2. */ -isc_uint32_t +uint32_t isc_buffer_getuint32(isc_buffer_t *b); /*!< * \brief Read an unsigned 32-bit integer in network byte order from 'b', convert @@ -583,7 +585,7 @@ isc_buffer_getuint32(isc_buffer_t *b); */ void -isc__buffer_putuint32(isc_buffer_t *b, isc_uint32_t val); +isc__buffer_putuint32(isc_buffer_t *b, uint32_t val); /*!< * \brief Store an unsigned 32-bit integer in host byte order from 'val' * into 'b' in network byte order. @@ -598,7 +600,7 @@ isc__buffer_putuint32(isc_buffer_t *b, isc_uint32_t val); *\li The used pointer in 'b' is advanced by 4. */ -isc_uint64_t +uint64_t isc_buffer_getuint48(isc_buffer_t *b); /*!< * \brief Read an unsigned 48-bit integer in network byte order from 'b', @@ -620,7 +622,7 @@ isc_buffer_getuint48(isc_buffer_t *b); */ void -isc__buffer_putuint48(isc_buffer_t *b, isc_uint64_t val); +isc__buffer_putuint48(isc_buffer_t *b, uint64_t val); /*!< * \brief Store an unsigned 48-bit integer in host byte order from 'val' * into 'b' in network byte order. @@ -636,7 +638,7 @@ isc__buffer_putuint48(isc_buffer_t *b, isc_uint64_t val); */ void -isc__buffer_putuint24(isc_buffer_t *b, isc_uint32_t val); +isc__buffer_putuint24(isc_buffer_t *b, uint32_t val); /*!< * Store an unsigned 24-bit integer in host byte order from 'val' * into 'b' in network byte order. @@ -679,7 +681,7 @@ isc__buffer_putstr(isc_buffer_t *b, const char *source); */ void -isc_buffer_putdecint(isc_buffer_t *b, isc_int64_t v); +isc_buffer_putdecint(isc_buffer_t *b, int64_t v); /*!< * \brief Put decimal representation of 'v' in b * @@ -923,7 +925,7 @@ ISC_LANG_ENDDECLS do { \ unsigned char *_cp; \ /* evaluate (_val) only once */ \ - isc_uint8_t _val2 = (_val); \ + uint8_t _val2 = (_val); \ if (ISC_UNLIKELY((_b)->autore)) { \ isc_buffer_t *_tmp = _b; \ ISC_REQUIRE(isc_buffer_reserve(&_tmp, 1) \ @@ -939,7 +941,7 @@ ISC_LANG_ENDDECLS do { \ unsigned char *_cp; \ /* evaluate (_val) only once */ \ - isc_uint16_t _val2 = (_val); \ + uint16_t _val2 = (_val); \ if (ISC_UNLIKELY((_b)->autore)) { \ isc_buffer_t *_tmp = _b; \ ISC_REQUIRE(isc_buffer_reserve(&_tmp, 2) \ @@ -956,7 +958,7 @@ ISC_LANG_ENDDECLS do { \ unsigned char *_cp; \ /* evaluate (_val) only once */ \ - isc_uint32_t _val2 = (_val); \ + uint32_t _val2 = (_val); \ if (ISC_UNLIKELY((_b)->autore)) { \ isc_buffer_t *_tmp = _b; \ ISC_REQUIRE(isc_buffer_reserve(&_tmp, 3) \ @@ -974,7 +976,7 @@ ISC_LANG_ENDDECLS do { \ unsigned char *_cp; \ /* evaluate (_val) only once */ \ - isc_uint32_t _val2 = (_val); \ + uint32_t _val2 = (_val); \ if (ISC_UNLIKELY((_b)->autore)) { \ isc_buffer_t *_tmp = _b; \ ISC_REQUIRE(isc_buffer_reserve(&_tmp, 4) \ diff --git a/lib/isc/include/isc/crc64.h b/lib/isc/include/isc/crc64.h index 2371dfe5ec..ed5860b78e 100644 --- a/lib/isc/include/isc/crc64.h +++ b/lib/isc/include/isc/crc64.h @@ -16,13 +16,15 @@ * \brief CRC64 in C */ +#include + #include #include ISC_LANG_BEGINDECLS void -isc_crc64_init(isc_uint64_t *crc); +isc_crc64_init(uint64_t *crc); /*% * Initialize a new CRC. * @@ -31,7 +33,7 @@ isc_crc64_init(isc_uint64_t *crc); */ void -isc_crc64_update(isc_uint64_t *crc, const void *data, size_t len); +isc_crc64_update(uint64_t *crc, const void *data, size_t len); /*% * Add data to the CRC. * @@ -41,7 +43,7 @@ isc_crc64_update(isc_uint64_t *crc, const void *data, size_t len); */ void -isc_crc64_final(isc_uint64_t *crc); +isc_crc64_final(uint64_t *crc); /*% * Finalize the CRC. * diff --git a/lib/isc/include/isc/fsaccess.h b/lib/isc/include/isc/fsaccess.h index 50fd013832..d842aaf11a 100644 --- a/lib/isc/include/isc/fsaccess.h +++ b/lib/isc/include/isc/fsaccess.h @@ -123,6 +123,8 @@ * solve this problem. */ +#include + #include #include @@ -147,7 +149,7 @@ /*% * Adding any permission bits beyond 0x200 would mean typedef'ing - * isc_fsaccess_t as isc_uint64_t, and redefining this value to + * isc_fsaccess_t as uint64_t, and redefining this value to * reflect the new range of permission types, Probably to 21 for * maximum flexibility. The number of bits has to accommodate all of * the permission types, and three full sets of them have to fit diff --git a/lib/isc/include/isc/hash.h b/lib/isc/include/isc/hash.h index 3822bec906..2108c4d6a2 100644 --- a/lib/isc/include/isc/hash.h +++ b/lib/isc/include/isc/hash.h @@ -12,6 +12,8 @@ #ifndef ISC_HASH_H #define ISC_HASH_H 1 +#include + #include "isc/lang.h" #include "isc/types.h" @@ -26,14 +28,14 @@ isc_hash_get_initializer(void); void isc_hash_set_initializer(const void *initializer); -isc_uint32_t +uint32_t isc_hash_function(const void *data, size_t length, isc_boolean_t case_sensitive, - const isc_uint32_t *previous_hashp); -isc_uint32_t + const uint32_t *previous_hashp); +uint32_t isc_hash_function_reverse(const void *data, size_t length, isc_boolean_t case_sensitive, - const isc_uint32_t *previous_hashp); + const uint32_t *previous_hashp); /*!< * \brief Calculate a hash over data. * diff --git a/lib/isc/include/isc/ht.h b/lib/isc/include/isc/ht.h index 45a2f55394..608707b84b 100644 --- a/lib/isc/include/isc/ht.h +++ b/lib/isc/include/isc/ht.h @@ -14,7 +14,9 @@ #ifndef ISC_HT_H #define ISC_HT_H 1 +#include #include + #include #include @@ -35,7 +37,7 @@ typedef struct isc_ht_iter isc_ht_iter_t; *\li #ISC_R_SUCCESS -- all is well. */ isc_result_t -isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, isc_uint8_t bits); +isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, uint8_t bits); /*% * Destroy hashtable, freeing everything @@ -59,7 +61,7 @@ isc_ht_destroy(isc_ht_t **htp); *\li #ISC_R_SUCCESS -- all is well. */ isc_result_t -isc_ht_add(isc_ht_t *ht, const unsigned char *key, isc_uint32_t keysize, +isc_ht_add(isc_ht_t *ht, const unsigned char *key, uint32_t keysize, void *value); /*% @@ -77,7 +79,7 @@ isc_ht_add(isc_ht_t *ht, const unsigned char *key, isc_uint32_t keysize, */ isc_result_t isc_ht_find(const isc_ht_t *ht, const unsigned char *key, - isc_uint32_t keysize, void **valuep); + uint32_t keysize, void **valuep); /*% * Delete node from hashtable @@ -89,7 +91,7 @@ isc_ht_find(const isc_ht_t *ht, const unsigned char *key, *\li #ISC_R_SUCCESS -- all is well */ isc_result_t -isc_ht_delete(isc_ht_t *ht, const unsigned char *key, isc_uint32_t keysize); +isc_ht_delete(isc_ht_t *ht, const unsigned char *key, uint32_t keysize); /*% * Create an iterator for the hashtable; point '*itp' to it. diff --git a/lib/isc/include/isc/interfaceiter.h b/lib/isc/include/isc/interfaceiter.h index 98476863e3..2ef82a3f7a 100644 --- a/lib/isc/include/isc/interfaceiter.h +++ b/lib/isc/include/isc/interfaceiter.h @@ -33,6 +33,8 @@ *** Imports ***/ +#include + #include #include #include @@ -47,7 +49,7 @@ struct isc_interface { isc_netaddr_t address; /*%< Local address. */ isc_netaddr_t netmask; /*%< Network mask. */ isc_netaddr_t dstaddress; /*%< Destination address (point-to-point only). */ - isc_uint32_t flags; /*%< Flags; see INTERFACE flags. */ + uint32_t flags; /*%< Flags; see INTERFACE flags. */ }; /*@{*/ diff --git a/lib/isc/include/isc/ipv6.h b/lib/isc/include/isc/ipv6.h index 52b60f63f0..0d69379e36 100644 --- a/lib/isc/include/isc/ipv6.h +++ b/lib/isc/include/isc/ipv6.h @@ -39,7 +39,7 @@ *** Imports. ***/ -#include +#include #include /*** @@ -48,9 +48,9 @@ struct in6_addr { union { - isc_uint8_t _S6_u8[16]; - isc_uint16_t _S6_u16[8]; - isc_uint32_t _S6_u32[4]; + uint8_t _S6_u8[16]; + uint16_t _S6_u16[8]; + uint32_t _S6_u32[4]; } _S6_un; }; #define s6_addr _S6_un._S6_u8 @@ -66,15 +66,15 @@ LIBISC_EXTERNAL_DATA extern const struct in6_addr in6addr_loopback; struct sockaddr_in6 { #ifdef ISC_PLATFORM_HAVESALEN - isc_uint8_t sin6_len; - isc_uint8_t sin6_family; + uint8_t sin6_len; + uint8_t sin6_family; #else - isc_uint16_t sin6_family; + uint16_t sin6_family; #endif - isc_uint16_t sin6_port; - isc_uint32_t sin6_flowinfo; + uint16_t sin6_port; + uint32_t sin6_flowinfo; struct in6_addr sin6_addr; - isc_uint32_t sin6_scope_id; + uint32_t sin6_scope_id; }; #ifdef ISC_PLATFORM_HAVESALEN diff --git a/lib/isc/include/isc/lfsr.h b/lib/isc/include/isc/lfsr.h index 500ed8aa12..3f2cfb4b3e 100644 --- a/lib/isc/include/isc/lfsr.h +++ b/lib/isc/include/isc/lfsr.h @@ -15,6 +15,8 @@ /*! \file isc/lfsr.h */ +#include + #include #include @@ -36,9 +38,9 @@ typedef void (*isc_lfsrreseed_t)(isc_lfsr_t *, void *); * needs to be taken to not change state once the lfsr is in operation. */ struct isc_lfsr { - isc_uint32_t state; /*%< previous state */ + uint32_t state; /*%< previous state */ unsigned int bits; /*%< length */ - isc_uint32_t tap; /*%< bit taps */ + uint32_t tap; /*%< bit taps */ unsigned int count; /*%< reseed count (in BITS!) */ isc_lfsrreseed_t reseed; /*%< reseed function */ void *arg; /*%< reseed function argument */ @@ -48,8 +50,8 @@ ISC_LANG_BEGINDECLS void -isc_lfsr_init(isc_lfsr_t *lfsr, isc_uint32_t state, unsigned int bits, - isc_uint32_t tap, unsigned int count, +isc_lfsr_init(isc_lfsr_t *lfsr, uint32_t state, unsigned int bits, + uint32_t tap, unsigned int count, isc_lfsrreseed_t reseed, void *arg); /*%< * Initialize an LFSR. @@ -92,7 +94,7 @@ isc_lfsr_skip(isc_lfsr_t *lfsr, unsigned int skip); *\li lfsr be valid. */ -isc_uint32_t +uint32_t isc_lfsr_generate32(isc_lfsr_t *lfsr1, isc_lfsr_t *lfsr2); /*%< * Given two LFSRs, use the current state from each to skip entries in the diff --git a/lib/isc/include/isc/meminfo.h b/lib/isc/include/isc/meminfo.h index 44c1323f52..c2c7e57b9a 100644 --- a/lib/isc/include/isc/meminfo.h +++ b/lib/isc/include/isc/meminfo.h @@ -12,13 +12,15 @@ #ifndef ISC_MEMINFO_H #define ISC_MEMINFO_H 1 +#include + #include #include ISC_LANG_BEGINDECLS -isc_uint64_t +uint64_t isc_meminfo_totalphys(void); /*%< * Return total available physical memory in bytes, or 0 if this cannot diff --git a/lib/isc/include/isc/netaddr.h b/lib/isc/include/isc/netaddr.h index 3376cdec58..5dcd683d69 100644 --- a/lib/isc/include/isc/netaddr.h +++ b/lib/isc/include/isc/netaddr.h @@ -15,6 +15,8 @@ /*! \file isc/netaddr.h */ +#include + #include #include #include @@ -35,7 +37,7 @@ struct isc_netaddr { char un[sizeof(((struct sockaddr_un *)0)->sun_path)]; #endif } type; - isc_uint32_t zone; + uint32_t zone; }; isc_boolean_t @@ -107,9 +109,9 @@ isc_result_t isc_netaddr_frompath(isc_netaddr_t *netaddr, const char *path); void -isc_netaddr_setzone(isc_netaddr_t *netaddr, isc_uint32_t zone); +isc_netaddr_setzone(isc_netaddr_t *netaddr, uint32_t zone); -isc_uint32_t +uint32_t isc_netaddr_getzone(const isc_netaddr_t *netaddr); void diff --git a/lib/isc/include/isc/netscope.h b/lib/isc/include/isc/netscope.h index 681aafc4c9..22224a1560 100644 --- a/lib/isc/include/isc/netscope.h +++ b/lib/isc/include/isc/netscope.h @@ -15,6 +15,8 @@ /*! \file isc/netscope.h */ +#include + ISC_LANG_BEGINDECLS /*% @@ -29,7 +31,7 @@ ISC_LANG_BEGINDECLS * \li ISC_R_FAILURE: conversion fails */ isc_result_t -isc_netscope_pton(int af, char *scopename, void *addr, isc_uint32_t *zoneid); +isc_netscope_pton(int af, char *scopename, void *addr, uint32_t *zoneid); ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/nonce.h b/lib/isc/include/isc/nonce.h index d01096940e..48c3ebf087 100644 --- a/lib/isc/include/isc/nonce.h +++ b/lib/isc/include/isc/nonce.h @@ -11,7 +11,6 @@ #pragma once -#include #include #include diff --git a/lib/isc/include/isc/parseint.h b/lib/isc/include/isc/parseint.h index 2c604d549f..41e8a6ceba 100644 --- a/lib/isc/include/isc/parseint.h +++ b/lib/isc/include/isc/parseint.h @@ -13,6 +13,8 @@ #ifndef ISC_PARSEINT_H #define ISC_PARSEINT_H 1 +#include + #include #include @@ -27,13 +29,13 @@ ISC_LANG_BEGINDECLS isc_result_t -isc_parse_uint32(isc_uint32_t *uip, const char *string, int base); +isc_parse_uint32(uint32_t *uip, const char *string, int base); isc_result_t -isc_parse_uint16(isc_uint16_t *uip, const char *string, int base); +isc_parse_uint16(uint16_t *uip, const char *string, int base); isc_result_t -isc_parse_uint8(isc_uint8_t *uip, const char *string, int base); +isc_parse_uint8(uint8_t *uip, const char *string, int base); /*%< * Parse the null-terminated string 'string' containing a base 'base' * integer, storing the result in '*uip'. diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in index 5688ad2d44..79c5bf6106 100644 --- a/lib/isc/include/isc/platform.h.in +++ b/lib/isc/include/isc/platform.h.in @@ -165,8 +165,6 @@ *** Printing. ***/ -/*! \brief - /* * If the system needs strlcpy(), ISC_PLATFORM_NEEDSTRLCPY will be defined. */ diff --git a/lib/isc/include/isc/radix.h b/lib/isc/include/isc/radix.h index 8a70b95ec4..3b5aa7a607 100644 --- a/lib/isc/include/isc/radix.h +++ b/lib/isc/include/isc/radix.h @@ -9,6 +9,11 @@ * information regarding copyright ownership. */ +#ifndef _RADIX_H +#define _RADIX_H + +#include + #include #include #include @@ -17,9 +22,6 @@ #include -#ifndef _RADIX_H -#define _RADIX_H - #define NETADDR_TO_PREFIX_T(na,pt,bits) \ do { \ const void *p = na; \ @@ -86,7 +88,7 @@ typedef void (*isc_radix_processfunc_t)(isc_prefix_t *, void **); typedef struct isc_radix_node { isc_mem_t *mctx; - isc_uint32_t bit; /* bit length of the prefix */ + uint32_t bit; /* bit length of the prefix */ isc_prefix_t *prefix; /* who we are in radix tree */ struct isc_radix_node *l, *r; /* left and right children */ struct isc_radix_node *parent; /* may be used */ @@ -102,7 +104,7 @@ typedef struct isc_radix_tree { unsigned int magic; isc_mem_t *mctx; isc_radix_node_t *head; - isc_uint32_t maxbits; /* for IP, 32 bit addresses */ + uint32_t maxbits; /* for IP, 32 bit addresses */ int num_active_node; /* for debugging purposes */ int num_added_node; /* total number of nodes */ } isc_radix_tree_t; diff --git a/lib/isc/include/isc/random.h b/lib/isc/include/isc/random.h index edb06cec18..cdeaa3e44b 100644 --- a/lib/isc/include/isc/random.h +++ b/lib/isc/include/isc/random.h @@ -11,7 +11,7 @@ #pragma once -#include +#include #include #include @@ -25,19 +25,19 @@ ISC_LANG_BEGINDECLS -isc_uint8_t +uint8_t isc_random8(void); /*!< * \brief Returns a single 8-bit random value. */ -isc_uint16_t +uint16_t isc_random16(void); /*!< * \brief Returns a single 16-bit random value. */ -isc_uint32_t +uint32_t isc_random32(void); /*!< * \brief Returns a single 32-bit random value. @@ -49,8 +49,8 @@ isc_random_buf(void *buf, size_t buflen); * \brief Fills the region buf of length buflen with random data. */ -isc_uint32_t -isc_random_uniform(isc_uint32_t upper_bound); +uint32_t +isc_random_uniform(uint32_t upper_bound); /*!< * \brief Will return a single 32-bit value, uniformly distributed but * less than upper_bound. This is recommended over diff --git a/lib/isc/include/isc/ratelimiter.h b/lib/isc/include/isc/ratelimiter.h index e60bf7e14b..39560c9ee5 100644 --- a/lib/isc/include/isc/ratelimiter.h +++ b/lib/isc/include/isc/ratelimiter.h @@ -27,6 +27,8 @@ *** Imports. ***/ +#include + #include #include @@ -54,7 +56,7 @@ isc_ratelimiter_setinterval(isc_ratelimiter_t *rl, isc_interval_t *interval); */ void -isc_ratelimiter_setpertic(isc_ratelimiter_t *rl, isc_uint32_t perint); +isc_ratelimiter_setpertic(isc_ratelimiter_t *rl, uint32_t perint); /*%< * Set the number of events processed per interval timer tick. * If 'perint' is zero it is treated as 1. diff --git a/lib/isc/include/isc/refcount.h b/lib/isc/include/isc/refcount.h index 8b77f2e457..6894291276 100644 --- a/lib/isc/include/isc/refcount.h +++ b/lib/isc/include/isc/refcount.h @@ -13,6 +13,8 @@ #ifndef ISC_REFCOUNT_H #define ISC_REFCOUNT_H 1 +#include + #include #include #include @@ -103,7 +105,7 @@ typedef struct isc_refcount { #if defined(ISC_REFCOUNT_HAVESTDATOMIC) atomic_int_fast32_t refs; #else - isc_int32_t refs; + int32_t refs; #endif } isc_refcount_t; @@ -117,7 +119,7 @@ typedef struct isc_refcount { #define isc_refcount_increment0(rp, tp) \ do { \ unsigned int *_tmp = (unsigned int *)(tp); \ - isc_int32_t prev; \ + int32_t prev; \ prev = atomic_fetch_add_explicit \ (&(rp)->refs, 1, memory_order_relaxed); \ if (_tmp != NULL) \ @@ -127,7 +129,7 @@ typedef struct isc_refcount { #define isc_refcount_increment(rp, tp) \ do { \ unsigned int *_tmp = (unsigned int *)(tp); \ - isc_int32_t prev; \ + int32_t prev; \ prev = atomic_fetch_add_explicit \ (&(rp)->refs, 1, memory_order_relaxed); \ ISC_REQUIRE(prev > 0); \ @@ -138,7 +140,7 @@ typedef struct isc_refcount { #define isc_refcount_decrement(rp, tp) \ do { \ unsigned int *_tmp = (unsigned int *)(tp); \ - isc_int32_t prev; \ + int32_t prev; \ prev = atomic_fetch_sub_explicit \ (&(rp)->refs, 1, memory_order_relaxed); \ ISC_REQUIRE(prev > 0); \ @@ -155,7 +157,7 @@ typedef struct isc_refcount { #define isc_refcount_increment0(rp, tp) \ do { \ unsigned int *_tmp = (unsigned int *)(tp); \ - isc_int32_t prev; \ + int32_t prev; \ prev = isc_atomic_xadd(&(rp)->refs, 1); \ if (_tmp != NULL) \ *_tmp = prev + 1; \ @@ -164,7 +166,7 @@ typedef struct isc_refcount { #define isc_refcount_increment(rp, tp) \ do { \ unsigned int *_tmp = (unsigned int *)(tp); \ - isc_int32_t prev; \ + int32_t prev; \ prev = isc_atomic_xadd(&(rp)->refs, 1); \ ISC_REQUIRE(prev > 0); \ if (_tmp != NULL) \ @@ -174,7 +176,7 @@ typedef struct isc_refcount { #define isc_refcount_decrement(rp, tp) \ do { \ unsigned int *_tmp = (unsigned int *)(tp); \ - isc_int32_t prev; \ + int32_t prev; \ prev = isc_atomic_xadd(&(rp)->refs, -1); \ ISC_REQUIRE(prev > 0); \ if (_tmp != NULL) \ diff --git a/lib/isc/include/isc/resource.h b/lib/isc/include/isc/resource.h index ee2c3c89c8..017923451f 100644 --- a/lib/isc/include/isc/resource.h +++ b/lib/isc/include/isc/resource.h @@ -18,7 +18,7 @@ #include #include -#define ISC_RESOURCE_UNLIMITED ((isc_resourcevalue_t)ISC_UINT64_MAX) +#define ISC_RESOURCE_UNLIMITED ((isc_resourcevalue_t)UINT64_MAX) ISC_LANG_BEGINDECLS @@ -58,7 +58,7 @@ isc_resource_getlimit(isc_resource_t resource, isc_resourcevalue_t *value); * behaves the same. * *\li The current ISC libdns configuration file parser assigns a value - * of ISC_UINT32_MAX for a size_spec of "unlimited" and ISC_UNIT32_MAX - 1 + * of UINT32_MAX for a size_spec of "unlimited" and ISC_UNIT32_MAX - 1 * for "default", the latter of which is supposed to represent "the * limit that was in force when the server started". Since these are * valid values in the middle of the range of isc_resourcevalue_t, diff --git a/lib/isc/include/isc/rwlock.h b/lib/isc/include/isc/rwlock.h index c47b8d062e..fcd72cab2f 100644 --- a/lib/isc/include/isc/rwlock.h +++ b/lib/isc/include/isc/rwlock.h @@ -13,6 +13,8 @@ #ifndef ISC_RWLOCK_H #define ISC_RWLOCK_H 1 +#include + /*! \file isc/rwlock.h */ #include @@ -21,7 +23,6 @@ #include #if defined(ISC_PLATFORM_HAVESTDATOMIC) -#include #include #endif @@ -45,7 +46,7 @@ struct isc_rwlock { /* Unlocked. */ unsigned int magic; isc_mutex_t lock; - isc_int32_t spins; + int32_t spins; #if defined(ISC_RWLOCK_USEATOMIC) /* @@ -67,9 +68,9 @@ struct isc_rwlock { atomic_int_fast32_t write_completions; atomic_int_fast32_t cnt_and_flag; #else - isc_int32_t write_requests; - isc_int32_t write_completions; - isc_int32_t cnt_and_flag; + int32_t write_requests; + int32_t write_completions; + int32_t cnt_and_flag; #endif /* Locked by lock. */ diff --git a/lib/isc/include/isc/serial.h b/lib/isc/include/isc/serial.h index 5f39bc1832..640a939418 100644 --- a/lib/isc/include/isc/serial.h +++ b/lib/isc/include/isc/serial.h @@ -13,6 +13,8 @@ #ifndef ISC_SERIAL_H #define ISC_SERIAL_H 1 +#include + #include #include @@ -28,37 +30,37 @@ ISC_LANG_BEGINDECLS isc_boolean_t -isc_serial_lt(isc_uint32_t a, isc_uint32_t b); +isc_serial_lt(uint32_t a, uint32_t b); /*%< * Return true if 'a' < 'b' otherwise false. */ isc_boolean_t -isc_serial_gt(isc_uint32_t a, isc_uint32_t b); +isc_serial_gt(uint32_t a, uint32_t b); /*%< * Return true if 'a' > 'b' otherwise false. */ isc_boolean_t -isc_serial_le(isc_uint32_t a, isc_uint32_t b); +isc_serial_le(uint32_t a, uint32_t b); /*%< * Return true if 'a' <= 'b' otherwise false. */ isc_boolean_t -isc_serial_ge(isc_uint32_t a, isc_uint32_t b); +isc_serial_ge(uint32_t a, uint32_t b); /*%< * Return true if 'a' >= 'b' otherwise false. */ isc_boolean_t -isc_serial_eq(isc_uint32_t a, isc_uint32_t b); +isc_serial_eq(uint32_t a, uint32_t b); /*%< * Return true if 'a' == 'b' otherwise false. */ isc_boolean_t -isc_serial_ne(isc_uint32_t a, isc_uint32_t b); +isc_serial_ne(uint32_t a, uint32_t b); /*%< * Return true if 'a' != 'b' otherwise false. */ diff --git a/lib/isc/include/isc/sha2.h b/lib/isc/include/isc/sha2.h index 2b5827c798..ba06c55e2a 100644 --- a/lib/isc/include/isc/sha2.h +++ b/lib/isc/include/isc/sha2.h @@ -11,6 +11,8 @@ #pragma once +#include + #include #include #include @@ -54,30 +56,30 @@ ISC_LANG_BEGINDECLS void isc_sha224_init (isc_sha224_t *); void isc_sha224_invalidate (isc_sha224_t *); -void isc_sha224_update (isc_sha224_t *, const isc_uint8_t *, size_t); -void isc_sha224_final (isc_uint8_t[ISC_SHA224_DIGESTLENGTH], isc_sha224_t *); +void isc_sha224_update (isc_sha224_t *, const uint8_t *, size_t); +void isc_sha224_final (uint8_t[ISC_SHA224_DIGESTLENGTH], isc_sha224_t *); char *isc_sha224_end (isc_sha224_t *, char[ISC_SHA224_DIGESTSTRINGLENGTH]); -char *isc_sha224_data (const isc_uint8_t *, size_t, char[ISC_SHA224_DIGESTSTRINGLENGTH]); +char *isc_sha224_data (const uint8_t *, size_t, char[ISC_SHA224_DIGESTSTRINGLENGTH]); void isc_sha256_init (isc_sha256_t *); void isc_sha256_invalidate (isc_sha256_t *); -void isc_sha256_update (isc_sha256_t *, const isc_uint8_t *, size_t); -void isc_sha256_final (isc_uint8_t[ISC_SHA256_DIGESTLENGTH], isc_sha256_t *); +void isc_sha256_update (isc_sha256_t *, const uint8_t *, size_t); +void isc_sha256_final (uint8_t[ISC_SHA256_DIGESTLENGTH], isc_sha256_t *); char *isc_sha256_end (isc_sha256_t *, char[ISC_SHA256_DIGESTSTRINGLENGTH]); -char *isc_sha256_data (const isc_uint8_t *, size_t, char[ISC_SHA256_DIGESTSTRINGLENGTH]); +char *isc_sha256_data (const uint8_t *, size_t, char[ISC_SHA256_DIGESTSTRINGLENGTH]); void isc_sha384_init (isc_sha384_t *); void isc_sha384_invalidate (isc_sha384_t *); -void isc_sha384_update (isc_sha384_t *, const isc_uint8_t *, size_t); -void isc_sha384_final (isc_uint8_t[ISC_SHA384_DIGESTLENGTH], isc_sha384_t *); +void isc_sha384_update (isc_sha384_t *, const uint8_t *, size_t); +void isc_sha384_final (uint8_t[ISC_SHA384_DIGESTLENGTH], isc_sha384_t *); char *isc_sha384_end (isc_sha384_t *, char[ISC_SHA384_DIGESTSTRINGLENGTH]); -char *isc_sha384_data (const isc_uint8_t *, size_t, char[ISC_SHA384_DIGESTSTRINGLENGTH]); +char *isc_sha384_data (const uint8_t *, size_t, char[ISC_SHA384_DIGESTSTRINGLENGTH]); void isc_sha512_init (isc_sha512_t *); void isc_sha512_invalidate (isc_sha512_t *); -void isc_sha512_update (isc_sha512_t *, const isc_uint8_t *, size_t); -void isc_sha512_final (isc_uint8_t[ISC_SHA512_DIGESTLENGTH], isc_sha512_t *); +void isc_sha512_update (isc_sha512_t *, const uint8_t *, size_t); +void isc_sha512_final (uint8_t[ISC_SHA512_DIGESTLENGTH], isc_sha512_t *); char *isc_sha512_end (isc_sha512_t *, char[ISC_SHA512_DIGESTSTRINGLENGTH]); -char *isc_sha512_data (const isc_uint8_t *, size_t, char[ISC_SHA512_DIGESTSTRINGLENGTH]); +char *isc_sha512_data (const uint8_t *, size_t, char[ISC_SHA512_DIGESTSTRINGLENGTH]); ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h index e6f613b329..500104f9e9 100644 --- a/lib/isc/include/isc/socket.h +++ b/lib/isc/include/isc/socket.h @@ -49,6 +49,8 @@ *** Imports ***/ +#include + #include #include #include @@ -1188,8 +1190,8 @@ isc_socket_cleanunix(const isc_sockaddr_t *addr, isc_boolean_t active); */ isc_result_t -isc_socket_permunix(const isc_sockaddr_t *sockaddr, isc_uint32_t perm, - isc_uint32_t owner, isc_uint32_t group); +isc_socket_permunix(const isc_sockaddr_t *sockaddr, uint32_t perm, + uint32_t owner, uint32_t group); /*%< * Set ownership and file permissions on the UNIX domain socket. * @@ -1228,7 +1230,7 @@ int isc_socket_getfd(isc_socket_t *socket); */ void -isc__socketmgr_setreserved(isc_socketmgr_t *mgr, isc_uint32_t); +isc__socketmgr_setreserved(isc_socketmgr_t *mgr, uint32_t); /*%< * Temporary. For use by named only. */ diff --git a/lib/isc/include/isc/stats.h b/lib/isc/include/isc/stats.h index 5c3d6f1931..8f41bb95aa 100644 --- a/lib/isc/include/isc/stats.h +++ b/lib/isc/include/isc/stats.h @@ -15,6 +15,8 @@ /*! \file isc/stats.h */ +#include + #include ISC_LANG_BEGINDECLS @@ -27,7 +29,7 @@ ISC_LANG_BEGINDECLS /*%< * Dump callback type. */ -typedef void (*isc_stats_dumper_t)(isc_statscounter_t, isc_uint64_t, void *); +typedef void (*isc_stats_dumper_t)(isc_statscounter_t, uint64_t, void *); isc_result_t isc_stats_create(isc_mem_t *mctx, isc_stats_t **statsp, int ncounters); @@ -111,7 +113,7 @@ isc_stats_dump(isc_stats_t *stats, isc_stats_dumper_t dump_fn, void *arg, */ void -isc_stats_set(isc_stats_t *stats, isc_uint64_t val, +isc_stats_set(isc_stats_t *stats, uint64_t val, isc_statscounter_t counter); /*%< * Set the given counter to the specfied value. @@ -121,7 +123,7 @@ isc_stats_set(isc_stats_t *stats, isc_uint64_t val, */ void -isc_stats_set(isc_stats_t *stats, isc_uint64_t val, +isc_stats_set(isc_stats_t *stats, uint64_t val, isc_statscounter_t counter); /*%< * Set the given counter to the specfied value. diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h index 7e9fe504d7..5ba9ea9217 100644 --- a/lib/isc/include/isc/types.h +++ b/lib/isc/include/isc/types.h @@ -18,7 +18,7 @@ * \brief * OS-specific types, from the OS-specific include directories. */ -#include +#include #include /* @@ -41,11 +41,11 @@ typedef ISC_LIST(isc_buffer_t) isc_bufferlist_t; /*%< Buffer List */ typedef struct isc_constregion isc_constregion_t; /*%< Const region */ typedef struct isc_consttextregion isc_consttextregion_t; /*%< Const Text Region */ typedef struct isc_counter isc_counter_t; /*%< Counter */ -typedef isc_int16_t isc_dscp_t; /*%< Diffserv code point */ +typedef int16_t isc_dscp_t; /*%< Diffserv code point */ typedef struct isc_event isc_event_t; /*%< Event */ typedef ISC_LIST(isc_event_t) isc_eventlist_t; /*%< Event List */ typedef unsigned int isc_eventtype_t; /*%< Event Type */ -typedef isc_uint32_t isc_fsaccess_t; /*%< FS Access */ +typedef uint32_t isc_fsaccess_t; /*%< FS Access */ typedef struct isc_hash isc_hash_t; /*%< Hash */ typedef struct isc_httpd isc_httpd_t; /*%< HTTP client */ typedef void (isc_httpdfree_t)(isc_buffer_t *, void *); /*%< HTTP free function */ @@ -68,7 +68,7 @@ typedef struct isc_portset isc_portset_t; /*%< Port Set */ typedef struct isc_quota isc_quota_t; /*%< Quota */ typedef struct isc_ratelimiter isc_ratelimiter_t; /*%< Rate Limiter */ typedef struct isc_region isc_region_t; /*%< Region */ -typedef isc_uint64_t isc_resourcevalue_t; /*%< Resource Value */ +typedef uint64_t isc_resourcevalue_t; /*%< Resource Value */ typedef unsigned int isc_result_t; /*%< Result */ typedef struct isc_rwlock isc_rwlock_t; /*%< Read Write Lock */ typedef struct isc_sockaddr isc_sockaddr_t; /*%< Socket Address */ diff --git a/lib/isc/inet_ntop.c b/lib/isc/inet_ntop.c index 9f98139691..fb06f850fd 100644 --- a/lib/isc/inet_ntop.c +++ b/lib/isc/inet_ntop.c @@ -15,6 +15,7 @@ #include #include +#include #include #include diff --git a/lib/isc/lex.c b/lib/isc/lex.c index eabcc81aa5..e9552f7622 100644 --- a/lib/isc/lex.c +++ b/lib/isc/lex.c @@ -16,6 +16,7 @@ #include #include +#include #include #include @@ -345,7 +346,7 @@ pushandgrow(isc_lex_t *lex, inputsource *source, int c) { isc_buffer_free(&source->pushback); source->pushback = tbuf; } - isc_buffer_putuint8(source->pushback, (isc_uint8_t)c); + isc_buffer_putuint8(source->pushback, (uint8_t)c); return (ISC_R_SUCCESS); } @@ -362,7 +363,7 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) { FILE *stream; char *curr, *prev; size_t remaining; - isc_uint32_t as_ulong; + uint32_t as_ulong; unsigned int saved_options; isc_result_t result; diff --git a/lib/isc/lfsr.c b/lib/isc/lfsr.c index 73b20fd8b5..3b0b47fe1c 100644 --- a/lib/isc/lfsr.c +++ b/lib/isc/lfsr.c @@ -15,6 +15,7 @@ #include #include +#include #include #include @@ -24,8 +25,8 @@ #define VALID_LFSR(x) (x != NULL) void -isc_lfsr_init(isc_lfsr_t *lfsr, isc_uint32_t state, unsigned int bits, - isc_uint32_t tap, unsigned int count, +isc_lfsr_init(isc_lfsr_t *lfsr, uint32_t state, unsigned int bits, + uint32_t tap, unsigned int count, isc_lfsrreseed_t reseed, void *arg) { REQUIRE(VALID_LFSR(lfsr)); @@ -48,7 +49,7 @@ isc_lfsr_init(isc_lfsr_t *lfsr, isc_uint32_t state, unsigned int bits, /*! * Return the next state of the lfsr. */ -static inline isc_uint32_t +static inline uint32_t lfsr_generate(isc_lfsr_t *lfsr) { @@ -107,7 +108,7 @@ isc_lfsr_generate(isc_lfsr_t *lfsr, void *data, unsigned int count) } } -static inline isc_uint32_t +static inline uint32_t lfsr_skipgenerate(isc_lfsr_t *lfsr, unsigned int skip) { while (skip--) @@ -134,11 +135,11 @@ isc_lfsr_skip(isc_lfsr_t *lfsr, unsigned int skip) * Skip states in lfsr1 and lfsr2 using the other's current state. * Return the final state of lfsr1 ^ lfsr2. */ -isc_uint32_t +uint32_t isc_lfsr_generate32(isc_lfsr_t *lfsr1, isc_lfsr_t *lfsr2) { - isc_uint32_t state1, state2; - isc_uint32_t skip1, skip2; + uint32_t state1, state2; + uint32_t skip1, skip2; REQUIRE(VALID_LFSR(lfsr1)); REQUIRE(VALID_LFSR(lfsr2)); diff --git a/lib/isc/log.c b/lib/isc/log.c index 2006a870d6..1dee704818 100644 --- a/lib/isc/log.c +++ b/lib/isc/log.c @@ -14,6 +14,7 @@ #include #include +#include #include #include #include @@ -1220,8 +1221,8 @@ remove_old_tsversions(isc_logfile_t *file, int versions) { isc_result_t result; char *bname, *digit_end; const char *dirname; - isc_int64_t version, last = ISC_INT64_MAX; - isc_int64_t to_keep[ISC_LOG_MAX_VERSIONS]; + int64_t version, last = INT64_MAX; + int64_t to_keep[ISC_LOG_MAX_VERSIONS]; size_t bnamelen; isc_dir_t dir; char sep = '/'; diff --git a/lib/isc/mem.c b/lib/isc/mem.c index 6ce761dff9..afa057b569 100644 --- a/lib/isc/mem.c +++ b/lib/isc/mem.c @@ -13,10 +13,10 @@ #include +#include #include #include #include -#include #include #include @@ -115,7 +115,7 @@ static isc_mutex_t createlock; * Total size of lost memory due to a bug of external library. * Locked by the global lock. */ -static isc_uint64_t totallost; +static uint64_t totallost; struct isc__mem { isc_mem_t common; @@ -379,8 +379,8 @@ static struct isc__mempoolmethods { static void add_trace_entry(isc__mem_t *mctx, const void *ptr, size_t size FLARG) { debuglink_t *dl; - isc_uint32_t hash; - isc_uint32_t idx; + uint32_t hash; + uint32_t idx; if ((isc_mem_debugging & ISC_MEM_DEBUGTRACE) != 0) fprintf(stderr, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM, @@ -416,8 +416,8 @@ delete_trace_entry(isc__mem_t *mctx, const void *ptr, size_t size, const char *file, unsigned int line) { debuglink_t *dl; - isc_uint32_t hash; - isc_uint32_t idx; + uint32_t hash; + uint32_t idx; if ((isc_mem_debugging & ISC_MEM_DEBUGTRACE) != 0) fprintf(stderr, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM, @@ -2320,11 +2320,11 @@ isc_mem_references(isc_mem_t *ctx0) { } typedef struct summarystat { - isc_uint64_t total; - isc_uint64_t inuse; - isc_uint64_t malloced; - isc_uint64_t blocksize; - isc_uint64_t contextsize; + uint64_t total; + uint64_t inuse; + uint64_t malloced; + uint64_t blocksize; + uint64_t contextsize; } summarystat_t; #ifdef HAVE_LIBXML2 @@ -2370,33 +2370,33 @@ xml_renderctx(isc__mem_t *ctx, summarystat_t *summary, TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "total")); TRY0(xmlTextWriterWriteFormatString(writer, "%" PRIu64 "", - (isc_uint64_t)ctx->total)); + (uint64_t)ctx->total)); TRY0(xmlTextWriterEndElement(writer)); /* total */ summary->inuse += ctx->inuse; TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "inuse")); TRY0(xmlTextWriterWriteFormatString(writer, "%" PRIu64 "", - (isc_uint64_t)ctx->inuse)); + (uint64_t)ctx->inuse)); TRY0(xmlTextWriterEndElement(writer)); /* inuse */ TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "maxinuse")); TRY0(xmlTextWriterWriteFormatString(writer, "%" PRIu64 "", - (isc_uint64_t)ctx->maxinuse)); + (uint64_t)ctx->maxinuse)); TRY0(xmlTextWriterEndElement(writer)); /* maxinuse */ summary->malloced += ctx->malloced; TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "malloced")); TRY0(xmlTextWriterWriteFormatString(writer, "%" PRIu64 "", - (isc_uint64_t)ctx->malloced)); + (uint64_t)ctx->malloced)); TRY0(xmlTextWriterEndElement(writer)); /* malloced */ TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "maxmalloced")); TRY0(xmlTextWriterWriteFormatString(writer, "%" PRIu64 "", - (isc_uint64_t)ctx->maxmalloced)); + (uint64_t)ctx->maxmalloced)); TRY0(xmlTextWriterEndElement(writer)); /* maxmalloced */ TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "blocksize")); @@ -2405,7 +2405,7 @@ xml_renderctx(isc__mem_t *ctx, summarystat_t *summary, NUM_BASIC_BLOCKS * ctx->mem_target; TRY0(xmlTextWriterWriteFormatString(writer, "%" PRIu64 "", - (isc_uint64_t) + (uint64_t) ctx->basic_table_count * NUM_BASIC_BLOCKS * ctx->mem_target)); @@ -2421,13 +2421,13 @@ xml_renderctx(isc__mem_t *ctx, summarystat_t *summary, TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "hiwater")); TRY0(xmlTextWriterWriteFormatString(writer, "%" PRIu64 "", - (isc_uint64_t)ctx->hi_water)); + (uint64_t)ctx->hi_water)); TRY0(xmlTextWriterEndElement(writer)); /* hiwater */ TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "lowater")); TRY0(xmlTextWriterWriteFormatString(writer, "%" PRIu64 "", - (isc_uint64_t)ctx->lo_water)); + (uint64_t)ctx->lo_water)); TRY0(xmlTextWriterEndElement(writer)); /* lowater */ TRY0(xmlTextWriterEndElement(writer)); /* context */ @@ -2442,7 +2442,7 @@ int isc_mem_renderxml(xmlTextWriterPtr writer) { isc__mem_t *ctx; summarystat_t summary; - isc_uint64_t lost; + uint64_t lost; int xmlrc; memset(&summary, 0, sizeof(summary)); @@ -2588,7 +2588,7 @@ json_renderctx(isc__mem_t *ctx, summarystat_t *summary, json_object *array) { json_object_object_add(ctxobj, "maxmalloced", obj); if ((ctx->flags & ISC_MEMFLAG_INTERNAL) != 0) { - isc_uint64_t blocksize; + uint64_t blocksize; blocksize = ctx->basic_table_count * NUM_BASIC_BLOCKS * ctx->mem_target; obj = json_object_new_int64(blocksize); @@ -2626,7 +2626,7 @@ isc_mem_renderjson(json_object *memobj) { isc_result_t result = ISC_R_SUCCESS; isc__mem_t *ctx; summarystat_t summary; - isc_uint64_t lost; + uint64_t lost; json_object *ctxarray, *obj; memset(&summary, 0, sizeof(summary)); diff --git a/lib/isc/mips/include/isc/atomic.h b/lib/isc/mips/include/isc/atomic.h index d8e0c312ad..caba82fba0 100644 --- a/lib/isc/mips/include/isc/atomic.h +++ b/lib/isc/mips/include/isc/atomic.h @@ -13,6 +13,8 @@ #ifndef ISC_ATOMIC_H #define ISC_ATOMIC_H 1 +#include + #include #include @@ -21,9 +23,9 @@ * This routine atomically increments the value stored in 'p' by 'val', and * returns the previous value. */ -static inline isc_int32_t -isc_atomic_xadd(isc_int32_t *p, int val) { - isc_int32_t orig; +static inline int32_t +isc_atomic_xadd(int32_t *p, int val) { + int32_t orig; __asm__ __volatile__ ( " .set push \n" @@ -47,7 +49,7 @@ isc_atomic_xadd(isc_int32_t *p, int val) { * This routine atomically stores the value 'val' in 'p'. */ static inline void -isc_atomic_store(isc_int32_t *p, isc_int32_t val) { +isc_atomic_store(int32_t *p, int32_t val) { *p = val; } @@ -56,10 +58,10 @@ isc_atomic_store(isc_int32_t *p, isc_int32_t val) { * original value is equal to 'cmpval'. The original value is returned in any * case. */ -static inline isc_int32_t -isc_atomic_cmpxchg(isc_int32_t *p, int cmpval, int val) { - isc_int32_t orig; - isc_int32_t tmp; +static inline int32_t +isc_atomic_cmpxchg(int32_t *p, int cmpval, int val) { + int32_t orig; + int32_t tmp; __asm__ __volatile__ ( " .set push \n" diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c index 233c1e90df..a6ddce50f3 100644 --- a/lib/isc/netaddr.c +++ b/lib/isc/netaddr.c @@ -15,6 +15,7 @@ #include #include +#include #include #include @@ -311,14 +312,14 @@ isc_netaddr_frompath(isc_netaddr_t *netaddr, const char *path) { void -isc_netaddr_setzone(isc_netaddr_t *netaddr, isc_uint32_t zone) { +isc_netaddr_setzone(isc_netaddr_t *netaddr, uint32_t zone) { /* we currently only support AF_INET6. */ REQUIRE(netaddr->family == AF_INET6); netaddr->zone = zone; } -isc_uint32_t +uint32_t isc_netaddr_getzone(const isc_netaddr_t *netaddr) { return (netaddr->zone); } @@ -418,7 +419,7 @@ isc_netaddr_issitelocal(const isc_netaddr_t *na) { } #define ISC_IPADDR_ISNETZERO(i) \ - (((isc_uint32_t)(i) & ISC__IPADDR(0xff000000)) \ + (((uint32_t)(i) & ISC__IPADDR(0xff000000)) \ == ISC__IPADDR(0x00000000)) isc_boolean_t diff --git a/lib/isc/netscope.c b/lib/isc/netscope.c index 859d05ff68..7fed44ecc1 100644 --- a/lib/isc/netscope.c +++ b/lib/isc/netscope.c @@ -13,6 +13,7 @@ #include +#include #include #include @@ -21,14 +22,14 @@ #include isc_result_t -isc_netscope_pton(int af, char *scopename, void *addr, isc_uint32_t *zoneid) { +isc_netscope_pton(int af, char *scopename, void *addr, uint32_t *zoneid) { char *ep; #ifdef ISC_PLATFORM_HAVEIFNAMETOINDEX unsigned int ifid; struct in6_addr *in6; #endif - isc_uint32_t zone; - isc_uint64_t llz; + uint32_t zone; + uint64_t llz; /* at this moment, we only support AF_INET6 */ if (af != AF_INET6) @@ -46,7 +47,7 @@ isc_netscope_pton(int af, char *scopename, void *addr, isc_uint32_t *zoneid) { in6 = (struct in6_addr *)addr; if (IN6_IS_ADDR_LINKLOCAL(in6) && (ifid = if_nametoindex((const char *)scopename)) != 0) - zone = (isc_uint32_t)ifid; + zone = (uint32_t)ifid; else { #endif llz = strtoull(scopename, &ep, 10); @@ -54,7 +55,7 @@ isc_netscope_pton(int af, char *scopename, void *addr, isc_uint32_t *zoneid) { return (ISC_R_FAILURE); /* check overflow */ - zone = (isc_uint32_t)(llz & 0xffffffffUL); + zone = (uint32_t)(llz & 0xffffffffUL); if (zone != llz) return (ISC_R_FAILURE); #ifdef ISC_PLATFORM_HAVEIFNAMETOINDEX diff --git a/lib/isc/parseint.c b/lib/isc/parseint.c index 6c3fe3c441..58593695ad 100644 --- a/lib/isc/parseint.c +++ b/lib/isc/parseint.c @@ -17,15 +17,16 @@ #include #include #include +#include #include #include #include isc_result_t -isc_parse_uint32(isc_uint32_t *uip, const char *string, int base) { +isc_parse_uint32(uint32_t *uip, const char *string, int base) { unsigned long n; - isc_uint32_t r; + uint32_t r; char *e; if (! isalnum((unsigned char)(string[0]))) return (ISC_R_BADNUMBER); @@ -38,7 +39,7 @@ isc_parse_uint32(isc_uint32_t *uip, const char *string, int base) { * equality. This is a no-op on 32 bit machines and a good compiler * will optimise it away. */ - r = (isc_uint32_t)n; + r = (uint32_t)n; if ((n == ULONG_MAX && errno == ERANGE) || (n != (unsigned long)r)) return (ISC_R_RANGE); *uip = r; @@ -46,27 +47,27 @@ isc_parse_uint32(isc_uint32_t *uip, const char *string, int base) { } isc_result_t -isc_parse_uint16(isc_uint16_t *uip, const char *string, int base) { - isc_uint32_t val; +isc_parse_uint16(uint16_t *uip, const char *string, int base) { + uint32_t val; isc_result_t result; result = isc_parse_uint32(&val, string, base); if (result != ISC_R_SUCCESS) return (result); if (val > 0xFFFF) return (ISC_R_RANGE); - *uip = (isc_uint16_t) val; + *uip = (uint16_t) val; return (ISC_R_SUCCESS); } isc_result_t -isc_parse_uint8(isc_uint8_t *uip, const char *string, int base) { - isc_uint32_t val; +isc_parse_uint8(uint8_t *uip, const char *string, int base) { + uint32_t val; isc_result_t result; result = isc_parse_uint32(&val, string, base); if (result != ISC_R_SUCCESS) return (result); if (val > 0xFF) return (ISC_R_RANGE); - *uip = (isc_uint8_t) val; + *uip = (uint8_t) val; return (ISC_R_SUCCESS); } diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c index 5653b47929..85b7ca0c6e 100644 --- a/lib/isc/pk11.c +++ b/lib/isc/pk11.c @@ -12,6 +12,7 @@ #include #include +#include #include #include @@ -49,7 +50,7 @@ LIBISC_EXTERNAL_DATA isc_boolean_t pk11_verbose_init = ISC_FALSE; static isc_once_t once = ISC_ONCE_INIT; static isc_mem_t *pk11_mctx = NULL; -static isc_int32_t allocsize = 0; +static int32_t allocsize = 0; static isc_boolean_t initialized = ISC_FALSE; typedef struct pk11_session pk11_session_t; diff --git a/lib/isc/portset.c b/lib/isc/portset.c index c7366433b3..fe6656587f 100644 --- a/lib/isc/portset.c +++ b/lib/isc/portset.c @@ -14,13 +14,15 @@ #include +#include + #include #include #include #include #include -#define ISC_PORTSET_BUFSIZE (65536 / (sizeof(isc_uint32_t) * 8)) +#define ISC_PORTSET_BUFSIZE (65536 / (sizeof(uint32_t) * 8)) /*% * Internal representation of portset. It's an array of 32-bit integers, each @@ -29,19 +31,19 @@ */ struct isc_portset { unsigned int nports; /*%< number of ports in the set */ - isc_uint32_t buf[ISC_PORTSET_BUFSIZE]; + uint32_t buf[ISC_PORTSET_BUFSIZE]; }; static inline isc_boolean_t portset_isset(isc_portset_t *portset, in_port_t port) { - return (ISC_TF((portset->buf[port >> 5] & ((isc_uint32_t)1 << (port & 31))) != 0)); + return (ISC_TF((portset->buf[port >> 5] & ((uint32_t)1 << (port & 31))) != 0)); } static inline void portset_add(isc_portset_t *portset, in_port_t port) { if (!portset_isset(portset, port)) { portset->nports++; - portset->buf[port >> 5] |= ((isc_uint32_t)1 << (port & 31)); + portset->buf[port >> 5] |= ((uint32_t)1 << (port & 31)); } } @@ -49,7 +51,7 @@ static inline void portset_remove(isc_portset_t *portset, in_port_t port) { if (portset_isset(portset, port)) { portset->nports--; - portset->buf[port >> 5] &= ~((isc_uint32_t)1 << (port & 31)); + portset->buf[port >> 5] &= ~((uint32_t)1 << (port & 31)); } } diff --git a/lib/isc/powerpc/include/isc/atomic.h b/lib/isc/powerpc/include/isc/atomic.h index 42e509fb2c..9899934a75 100644 --- a/lib/isc/powerpc/include/isc/atomic.h +++ b/lib/isc/powerpc/include/isc/atomic.h @@ -13,23 +13,25 @@ #ifndef ISC_ATOMIC_H #define ISC_ATOMIC_H 1 +#include + #include #include /*!\file - * static inline isc_int32_t - * isc_atomic_xadd(isc_int32_t *p, isc_int32_t val); + * static inline int32_t + * isc_atomic_xadd(int32_t *p, int32_t val); * * This routine atomically increments the value stored in 'p' by 'val', and * returns the previous value. * * static inline void - * isc_atomic_store(void *p, isc_int32_t val); + * isc_atomic_store(void *p, int32_t val); * * This routine atomically stores the value 'val' in 'p'. * - * static inline isc_int32_t - * isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val); + * static inline int32_t + * isc_atomic_cmpxchg(int32_t *p, int32_t cmpval, int32_t val); * * This routine atomically replaces the value in 'p' with 'val', if the * original value is equal to 'cmpval'. The original value is returned in any @@ -43,11 +45,11 @@ #define isc_atomic_store(p, v) _clear_lock(p, v) #ifdef __GNUC__ -static inline isc_int32_t +static inline int32_t #else -static isc_int32_t +static int32_t #endif -isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) { +isc_atomic_xadd(int32_t *p, int32_t val) { int ret; #ifdef __GNUC__ @@ -93,9 +95,9 @@ isc_atomic_cmpxchg(atomic_p p, int old, int replacement) { } #elif defined(ISC_PLATFORM_USEGCCASM) || defined(ISC_PLATFORM_USEMACASM) -static inline isc_int32_t -isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) { - isc_int32_t orig; +static inline int32_t +isc_atomic_xadd(int32_t *p, int32_t val) { + int32_t orig; __asm__ volatile ( #ifdef ISC_PLATFORM_USEMACASM @@ -124,7 +126,7 @@ isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) { } static inline void -isc_atomic_store(void *p, isc_int32_t val) { +isc_atomic_store(void *p, int32_t val) { __asm__ volatile ( #ifdef ISC_PLATFORM_USEMACASM "1:" @@ -147,9 +149,9 @@ isc_atomic_store(void *p, isc_int32_t val) { ); } -static inline isc_int32_t -isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) { - isc_int32_t orig; +static inline int32_t +isc_atomic_cmpxchg(int32_t *p, int32_t cmpval, int32_t val) { + int32_t orig; __asm__ volatile ( #ifdef ISC_PLATFORM_USEMACASM diff --git a/lib/isc/radix.c b/lib/isc/radix.c index 2781d32e02..3fae918273 100644 --- a/lib/isc/radix.c +++ b/lib/isc/radix.c @@ -17,6 +17,8 @@ #include +#include + #include #include #include @@ -233,7 +235,7 @@ isc_radix_search(isc_radix_tree_t *radix, isc_radix_node_t **target, isc_radix_node_t *node; isc_radix_node_t *stack[RADIX_MAXBITS + 1]; u_char *addr; - isc_uint32_t bitlen; + uint32_t bitlen; int tfam = -1, cnt = 0; REQUIRE(radix != NULL); @@ -301,8 +303,8 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, { isc_radix_node_t *node, *new_node, *parent, *glue = NULL; u_char *addr, *test_addr; - isc_uint32_t bitlen, fam, check_bit, differ_bit; - isc_uint32_t i, j, r; + uint32_t bitlen, fam, check_bit, differ_bit; + uint32_t i, j, r; isc_result_t result; REQUIRE(radix != NULL); diff --git a/lib/isc/random.c b/lib/isc/random.c index 13bca5d994..098aa5d89e 100644 --- a/lib/isc/random.c +++ b/lib/isc/random.c @@ -30,7 +30,7 @@ #include -#include +#include #include #include #include @@ -69,21 +69,21 @@ isc_random_initialize(void) { isc_entropy_get(seed, sizeof(seed)); } -isc_uint8_t +uint8_t isc_random8(void) { RUNTIME_CHECK(isc_once_do(&isc_random_once, isc_random_initialize) == ISC_R_SUCCESS); return (next() & 0xff); } -isc_uint16_t +uint16_t isc_random16(void) { RUNTIME_CHECK(isc_once_do(&isc_random_once, isc_random_initialize) == ISC_R_SUCCESS); return (next() & 0xffff); } -isc_uint32_t +uint32_t isc_random32(void) { RUNTIME_CHECK(isc_once_do(&isc_random_once, isc_random_initialize) == ISC_R_SUCCESS); @@ -93,7 +93,7 @@ isc_random32(void) { void isc_random_buf(void *buf, size_t buflen) { int i; - isc_uint32_t r; + uint32_t r; REQUIRE(buf); REQUIRE(buflen > 0); @@ -114,10 +114,10 @@ isc_random_buf(void *buf, size_t buflen) { return; } -isc_uint32_t +uint32_t isc_random_uniform(uint32_t upper_bound) { /* Copy of arc4random_uniform from OpenBSD */ - isc_uint32_t r, min; + uint32_t r, min; RUNTIME_CHECK(isc_once_do(&isc_random_once, isc_random_initialize) == ISC_R_SUCCESS); diff --git a/lib/isc/ratelimiter.c b/lib/isc/ratelimiter.c index 7da62c1af3..8a0d0725b4 100644 --- a/lib/isc/ratelimiter.c +++ b/lib/isc/ratelimiter.c @@ -14,6 +14,8 @@ #include +#include + #include #include #include @@ -35,7 +37,7 @@ struct isc_ratelimiter { isc_task_t * task; isc_timer_t * timer; isc_interval_t interval; - isc_uint32_t pertic; + uint32_t pertic; isc_boolean_t pushpop; isc_ratelimiter_state_t state; isc_event_t shutdownevent; @@ -123,7 +125,7 @@ isc_ratelimiter_setinterval(isc_ratelimiter_t *rl, isc_interval_t *interval) { } void -isc_ratelimiter_setpertic(isc_ratelimiter_t *rl, isc_uint32_t pertic) { +isc_ratelimiter_setpertic(isc_ratelimiter_t *rl, uint32_t pertic) { REQUIRE(rl != NULL); @@ -201,7 +203,7 @@ ratelimiter_tick(isc_task_t *task, isc_event_t *event) { isc_result_t result = ISC_R_SUCCESS; isc_ratelimiter_t *rl = (isc_ratelimiter_t *)event->ev_arg; isc_event_t *p; - isc_uint32_t pertic; + uint32_t pertic; UNUSED(task); diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c index 8c9455932f..46d68c6e83 100644 --- a/lib/isc/rwlock.c +++ b/lib/isc/rwlock.c @@ -15,6 +15,7 @@ #include #include +#include #include #include @@ -262,7 +263,7 @@ isc_rwlock_destroy(isc_rwlock_t *rwl) { static isc_result_t isc__rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { - isc_int32_t cntflag; + int32_t cntflag; REQUIRE(VALID_RWLOCK(rwl)); @@ -336,7 +337,7 @@ isc__rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { */ rwl->write_granted = 0; } else { - isc_int32_t prev_writer; + int32_t prev_writer; /* enter the waiting queue, and wait for our turn */ #if defined(ISC_RWLOCK_USESTDATOMIC) @@ -363,7 +364,7 @@ isc__rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { (&rwl->cnt_and_flag, &cntflag2, WRITER_ACTIVE, memory_order_relaxed, memory_order_relaxed); #else - isc_int32_t cntflag2; + int32_t cntflag2; cntflag2 = isc_atomic_cmpxchg(&rwl->cnt_and_flag, 0, WRITER_ACTIVE); #endif @@ -392,8 +393,8 @@ isc__rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { isc_result_t isc_rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { - isc_int32_t cnt = 0; - isc_int32_t max_cnt = rwl->spins * 2 + 10; + int32_t cnt = 0; + int32_t max_cnt = rwl->spins * 2 + 10; isc_result_t result = ISC_R_SUCCESS; if (max_cnt > RWLOCK_MAX_ADAPTIVE_COUNT) @@ -416,7 +417,7 @@ isc_rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { isc_result_t isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { - isc_int32_t cntflag; + int32_t cntflag; REQUIRE(VALID_RWLOCK(rwl)); @@ -533,7 +534,7 @@ isc_rwlock_tryupgrade(isc_rwlock_t *rwl) { } #else { - isc_int32_t prevcnt; + int32_t prevcnt; /* Try to acquire write access. */ prevcnt = isc_atomic_cmpxchg(&rwl->cnt_and_flag, @@ -561,7 +562,7 @@ isc_rwlock_tryupgrade(isc_rwlock_t *rwl) { void isc_rwlock_downgrade(isc_rwlock_t *rwl) { - isc_int32_t prev_readers; + int32_t prev_readers; REQUIRE(VALID_RWLOCK(rwl)); @@ -602,7 +603,7 @@ isc_rwlock_downgrade(isc_rwlock_t *rwl) { isc_result_t isc_rwlock_unlock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { - isc_int32_t prev_cnt; + int32_t prev_cnt; REQUIRE(VALID_RWLOCK(rwl)); @@ -757,8 +758,8 @@ doit(isc_rwlock_t *rwl, isc_rwlocktype_t type, isc_boolean_t nonblock) { isc_result_t isc_rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { - isc_int32_t cnt = 0; - isc_int32_t max_cnt = rwl->spins * 2 + 10; + int32_t cnt = 0; + int32_t max_cnt = rwl->spins * 2 + 10; isc_result_t result = ISC_R_SUCCESS; if (max_cnt > RWLOCK_MAX_ADAPTIVE_COUNT) diff --git a/lib/isc/serial.c b/lib/isc/serial.c index 8ccd1d0b1e..662e864637 100644 --- a/lib/isc/serial.c +++ b/lib/isc/serial.c @@ -14,39 +14,41 @@ #include +#include + #include isc_boolean_t -isc_serial_lt(isc_uint32_t a, isc_uint32_t b) { +isc_serial_lt(uint32_t a, uint32_t b) { /* * Undefined => ISC_FALSE */ if (a == (b ^ 0x80000000U)) return (ISC_FALSE); - return (((isc_int32_t)(a - b) < 0) ? ISC_TRUE : ISC_FALSE); + return (((int32_t)(a - b) < 0) ? ISC_TRUE : ISC_FALSE); } isc_boolean_t -isc_serial_gt(isc_uint32_t a, isc_uint32_t b) { - return (((isc_int32_t)(a - b) > 0) ? ISC_TRUE : ISC_FALSE); +isc_serial_gt(uint32_t a, uint32_t b) { + return (((int32_t)(a - b) > 0) ? ISC_TRUE : ISC_FALSE); } isc_boolean_t -isc_serial_le(isc_uint32_t a, isc_uint32_t b) { +isc_serial_le(uint32_t a, uint32_t b) { return ((a == b) ? ISC_TRUE : isc_serial_lt(a, b)); } isc_boolean_t -isc_serial_ge(isc_uint32_t a, isc_uint32_t b) { +isc_serial_ge(uint32_t a, uint32_t b) { return ((a == b) ? ISC_TRUE : isc_serial_gt(a, b)); } isc_boolean_t -isc_serial_eq(isc_uint32_t a, isc_uint32_t b) { +isc_serial_eq(uint32_t a, uint32_t b) { return ((a == b) ? ISC_TRUE : ISC_FALSE); } isc_boolean_t -isc_serial_ne(isc_uint32_t a, isc_uint32_t b) { +isc_serial_ne(uint32_t a, uint32_t b) { return ((a != b) ? ISC_TRUE : ISC_FALSE); } diff --git a/lib/isc/sha2.c b/lib/isc/sha2.c index f5249e637a..2a62ac2cd5 100644 --- a/lib/isc/sha2.c +++ b/lib/isc/sha2.c @@ -11,6 +11,8 @@ #include +#include + #include #include #include @@ -43,7 +45,7 @@ isc_sha224_invalidate(isc_sha224_t *context) { } void -isc_sha224_update(isc_sha224_t *context, const isc_uint8_t* data, size_t len) { +isc_sha224_update(isc_sha224_t *context, const uint8_t* data, size_t len) { if (len == 0U) { /* Calling with no data is valid - we do nothing */ return; @@ -52,20 +54,20 @@ isc_sha224_update(isc_sha224_t *context, const isc_uint8_t* data, size_t len) { /* Sanity check: */ REQUIRE(context != (isc_sha224_t *)0); REQUIRE(context->ctx != (EVP_MD_CTX *)0); - REQUIRE(data != (isc_uint8_t*)0); + REQUIRE(data != (uint8_t*)0); RUNTIME_CHECK(EVP_DigestUpdate(context->ctx, (const void *) data, len) == 1); } void -isc_sha224_final(isc_uint8_t digest[], isc_sha224_t *context) { +isc_sha224_final(uint8_t digest[], isc_sha224_t *context) { /* Sanity check: */ REQUIRE(context != (isc_sha224_t *)0); REQUIRE(context->ctx != (EVP_MD_CTX *)0); /* If no digest buffer is passed, we don't bother doing this: */ - if (digest != (isc_uint8_t*)0) + if (digest != (uint8_t*)0) RUNTIME_CHECK(EVP_DigestFinal(context->ctx, digest, NULL) == 1); EVP_MD_CTX_free(context->ctx); @@ -91,7 +93,7 @@ isc_sha256_invalidate(isc_sha256_t *context) { } void -isc_sha256_update(isc_sha256_t *context, const isc_uint8_t *data, size_t len) { +isc_sha256_update(isc_sha256_t *context, const uint8_t *data, size_t len) { if (len == 0U) { /* Calling with no data is valid - we do nothing */ return; @@ -100,20 +102,20 @@ isc_sha256_update(isc_sha256_t *context, const isc_uint8_t *data, size_t len) { /* Sanity check: */ REQUIRE(context != (isc_sha256_t *)0); REQUIRE(context->ctx != (EVP_MD_CTX *)0); - REQUIRE(data != (isc_uint8_t*)0); + REQUIRE(data != (uint8_t*)0); RUNTIME_CHECK(EVP_DigestUpdate(context->ctx, (const void *) data, len) == 1); } void -isc_sha256_final(isc_uint8_t digest[], isc_sha256_t *context) { +isc_sha256_final(uint8_t digest[], isc_sha256_t *context) { /* Sanity check: */ REQUIRE(context != (isc_sha256_t *)0); REQUIRE(context->ctx != (EVP_MD_CTX *)0); /* If no digest buffer is passed, we don't bother doing this: */ - if (digest != (isc_uint8_t*)0) + if (digest != (uint8_t*)0) RUNTIME_CHECK(EVP_DigestFinal(context->ctx, digest, NULL) == 1); EVP_MD_CTX_free(context->ctx); @@ -138,7 +140,7 @@ isc_sha512_invalidate(isc_sha512_t *context) { context->ctx = NULL; } -void isc_sha512_update(isc_sha512_t *context, const isc_uint8_t *data, size_t len) { +void isc_sha512_update(isc_sha512_t *context, const uint8_t *data, size_t len) { if (len == 0U) { /* Calling with no data is valid - we do nothing */ return; @@ -147,19 +149,19 @@ void isc_sha512_update(isc_sha512_t *context, const isc_uint8_t *data, size_t le /* Sanity check: */ REQUIRE(context != (isc_sha512_t *)0); REQUIRE(context->ctx != (EVP_MD_CTX *)0); - REQUIRE(data != (isc_uint8_t*)0); + REQUIRE(data != (uint8_t*)0); RUNTIME_CHECK(EVP_DigestUpdate(context->ctx, (const void *) data, len) == 1); } -void isc_sha512_final(isc_uint8_t digest[], isc_sha512_t *context) { +void isc_sha512_final(uint8_t digest[], isc_sha512_t *context) { /* Sanity check: */ REQUIRE(context != (isc_sha512_t *)0); REQUIRE(context->ctx != (EVP_MD_CTX *)0); /* If no digest buffer is passed, we don't bother doing this: */ - if (digest != (isc_uint8_t*)0) + if (digest != (uint8_t*)0) RUNTIME_CHECK(EVP_DigestFinal(context->ctx, digest, NULL) == 1); EVP_MD_CTX_free(context->ctx); @@ -185,7 +187,7 @@ isc_sha384_invalidate(isc_sha384_t *context) { } void -isc_sha384_update(isc_sha384_t *context, const isc_uint8_t* data, size_t len) { +isc_sha384_update(isc_sha384_t *context, const uint8_t* data, size_t len) { if (len == 0U) { /* Calling with no data is valid - we do nothing */ return; @@ -194,20 +196,20 @@ isc_sha384_update(isc_sha384_t *context, const isc_uint8_t* data, size_t len) { /* Sanity check: */ REQUIRE(context != (isc_sha512_t *)0); REQUIRE(context->ctx != (EVP_MD_CTX *)0); - REQUIRE(data != (isc_uint8_t*)0); + REQUIRE(data != (uint8_t*)0); RUNTIME_CHECK(EVP_DigestUpdate(context->ctx, (const void *) data, len) == 1); } void -isc_sha384_final(isc_uint8_t digest[], isc_sha384_t *context) { +isc_sha384_final(uint8_t digest[], isc_sha384_t *context) { /* Sanity check: */ REQUIRE(context != (isc_sha384_t *)0); REQUIRE(context->ctx != (EVP_MD_CTX *)0); /* If no digest buffer is passed, we don't bother doing this: */ - if (digest != (isc_uint8_t*)0) + if (digest != (uint8_t*)0) RUNTIME_CHECK(EVP_DigestFinal(context->ctx, digest, NULL) == 1); EVP_MD_CTX_free(context->ctx); @@ -222,7 +224,7 @@ static const char *sha2_hex_digits = "0123456789abcdef"; char * isc_sha224_end(isc_sha224_t *context, char buffer[]) { - isc_uint8_t digest[ISC_SHA224_DIGESTLENGTH], *d = digest; + uint8_t digest[ISC_SHA224_DIGESTLENGTH], *d = digest; unsigned int i; /* Sanity check: */ @@ -245,7 +247,7 @@ isc_sha224_end(isc_sha224_t *context, char buffer[]) { } char * -isc_sha224_data(const isc_uint8_t *data, size_t len, +isc_sha224_data(const uint8_t *data, size_t len, char digest[ISC_SHA224_DIGESTSTRINGLENGTH]) { isc_sha224_t context; @@ -257,7 +259,7 @@ isc_sha224_data(const isc_uint8_t *data, size_t len, char * isc_sha256_end(isc_sha256_t *context, char buffer[]) { - isc_uint8_t digest[ISC_SHA256_DIGESTLENGTH], *d = digest; + uint8_t digest[ISC_SHA256_DIGESTLENGTH], *d = digest; unsigned int i; /* Sanity check: */ @@ -280,7 +282,7 @@ isc_sha256_end(isc_sha256_t *context, char buffer[]) { } char * -isc_sha256_data(const isc_uint8_t* data, size_t len, +isc_sha256_data(const uint8_t* data, size_t len, char digest[ISC_SHA256_DIGESTSTRINGLENGTH]) { isc_sha256_t context; @@ -292,7 +294,7 @@ isc_sha256_data(const isc_uint8_t* data, size_t len, char * isc_sha512_end(isc_sha512_t *context, char buffer[]) { - isc_uint8_t digest[ISC_SHA512_DIGESTLENGTH], *d = digest; + uint8_t digest[ISC_SHA512_DIGESTLENGTH], *d = digest; unsigned int i; /* Sanity check: */ @@ -315,7 +317,7 @@ isc_sha512_end(isc_sha512_t *context, char buffer[]) { } char * -isc_sha512_data(const isc_uint8_t *data, size_t len, +isc_sha512_data(const uint8_t *data, size_t len, char digest[ISC_SHA512_DIGESTSTRINGLENGTH]) { isc_sha512_t context; @@ -327,7 +329,7 @@ isc_sha512_data(const isc_uint8_t *data, size_t len, char * isc_sha384_end(isc_sha384_t *context, char buffer[]) { - isc_uint8_t digest[ISC_SHA384_DIGESTLENGTH], *d = digest; + uint8_t digest[ISC_SHA384_DIGESTLENGTH], *d = digest; unsigned int i; /* Sanity check: */ @@ -350,7 +352,7 @@ isc_sha384_end(isc_sha384_t *context, char buffer[]) { } char * -isc_sha384_data(const isc_uint8_t *data, size_t len, +isc_sha384_data(const uint8_t *data, size_t len, char digest[ISC_SHA384_DIGESTSTRINGLENGTH]) { isc_sha384_t context; diff --git a/lib/isc/socket_api.c b/lib/isc/socket_api.c index 36b3d0e33d..ff8b75c0ad 100644 --- a/lib/isc/socket_api.c +++ b/lib/isc/socket_api.c @@ -12,6 +12,8 @@ #include +#include + #include #include #include @@ -368,8 +370,8 @@ isc_socket_cleanunix(const isc_sockaddr_t *sockaddr, isc_boolean_t active) { } isc_result_t -isc_socket_permunix(const isc_sockaddr_t *sockaddr, isc_uint32_t perm, - isc_uint32_t owner, isc_uint32_t group) +isc_socket_permunix(const isc_sockaddr_t *sockaddr, uint32_t perm, + uint32_t owner, uint32_t group) { return (isc__socket_permunix(sockaddr, perm, owner, group)); } diff --git a/lib/isc/sparc64/include/isc/atomic.h b/lib/isc/sparc64/include/isc/atomic.h index fd5cf1da5a..21ec67e8c7 100644 --- a/lib/isc/sparc64/include/isc/atomic.h +++ b/lib/isc/sparc64/include/isc/atomic.h @@ -48,6 +48,8 @@ #ifndef ISC_ATOMIC_H #define ISC_ATOMIC_H 1 +#include + #include #include @@ -59,11 +61,11 @@ * This routine atomically increments the value stored in 'p' by 'val', and * returns the previous value. */ -static inline isc_int32_t -isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) { - isc_int32_t prev, swapped; +static inline int32_t +isc_atomic_xadd(int32_t *p, int32_t val) { + int32_t prev, swapped; - for (prev = *(volatile isc_int32_t *)p; ; prev = swapped) { + for (prev = *(volatile int32_t *)p; ; prev = swapped) { swapped = prev + val; __asm__ volatile( "casa [%2] %3, %4, %0" @@ -80,10 +82,10 @@ isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) { * This routine atomically stores the value 'val' in 'p'. */ static inline void -isc_atomic_store(isc_int32_t *p, isc_int32_t val) { - isc_int32_t prev, swapped; +isc_atomic_store(int32_t *p, int32_t val) { + int32_t prev, swapped; - for (prev = *(volatile isc_int32_t *)p; ; prev = swapped) { + for (prev = *(volatile int32_t *)p; ; prev = swapped) { swapped = val; __asm__ volatile( "casa [%2] %3, %4, %0" @@ -99,9 +101,9 @@ isc_atomic_store(isc_int32_t *p, isc_int32_t val) { * original value is equal to 'cmpval'. The original value is returned in any * case. */ -static inline isc_int32_t -isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) { - isc_int32_t temp = val; +static inline int32_t +isc_atomic_cmpxchg(int32_t *p, int32_t cmpval, int32_t val) { + int32_t temp = val; __asm__ volatile( "casa [%2] %3, %4, %0" diff --git a/lib/isc/stats.c b/lib/isc/stats.c index 5de077943c..0ecf2048de 100644 --- a/lib/isc/stats.c +++ b/lib/isc/stats.c @@ -14,6 +14,7 @@ #include +#include #include #include @@ -86,15 +87,15 @@ typedef struct { atomic_int_fast32_t hi; atomic_int_fast32_t lo; #else - isc_uint32_t hi; - isc_uint32_t lo; + uint32_t hi; + uint32_t lo; #endif } isc_stat_t; #else #if defined(ISC_STATS_HAVESTDATOMICQ) typedef atomic_int_fast64_t isc_stat_t; #else -typedef isc_uint64_t isc_stat_t; +typedef uint64_t isc_stat_t; #endif #endif @@ -127,7 +128,7 @@ struct isc_stats { * simplicity here, however, under the assumption that this function * should be only rarely called. */ - isc_uint64_t *copiedcounters; + uint64_t *copiedcounters; }; static isc_result_t @@ -151,7 +152,7 @@ create_stats(isc_mem_t *mctx, int ncounters, isc_stats_t **statsp) { goto clean_mutex; } stats->copiedcounters = isc_mem_get(mctx, - sizeof(isc_uint64_t) * ncounters); + sizeof(uint64_t) * ncounters); if (stats->copiedcounters == NULL) { result = ISC_R_NOMEMORY; goto clean_counters; @@ -242,7 +243,7 @@ isc_stats_ncounters(isc_stats_t *stats) { static inline void incrementcounter(isc_stats_t *stats, int counter) { - isc_int32_t prev; + int32_t prev; #if ISC_STATS_LOCKCOUNTERS /* @@ -258,7 +259,7 @@ incrementcounter(isc_stats_t *stats, int counter) { prev = atomic_fetch_add_explicit(&stats->counters[counter].lo, 1, memory_order_relaxed); #else - prev = isc_atomic_xadd((isc_int32_t *)&stats->counters[counter].lo, 1); + prev = isc_atomic_xadd((int32_t *)&stats->counters[counter].lo, 1); #endif /* * If the lower 32-bit field overflows, increment the higher field. @@ -268,12 +269,12 @@ incrementcounter(isc_stats_t *stats, int counter) { * isc_stats_copy() is called where the whole process is protected * by the write (exclusive) lock. */ - if (prev == (isc_int32_t)0xffffffff) { + if (prev == (int32_t)0xffffffff) { #if defined(ISC_STATS_HAVESTDATOMIC) atomic_fetch_add_explicit(&stats->counters[counter].hi, 1, memory_order_relaxed); #else - isc_atomic_xadd((isc_int32_t *)&stats->counters[counter].hi, 1); + isc_atomic_xadd((int32_t *)&stats->counters[counter].hi, 1); #endif } #elif ISC_STATS_HAVEATOMICQ @@ -282,7 +283,7 @@ incrementcounter(isc_stats_t *stats, int counter) { atomic_fetch_add_explicit(&stats->counters[counter], 1, memory_order_relaxed); #else - isc_atomic_xaddq((isc_int64_t *)&stats->counters[counter], 1); + isc_atomic_xaddq((int64_t *)&stats->counters[counter], 1); #endif #else UNUSED(prev); @@ -296,7 +297,7 @@ incrementcounter(isc_stats_t *stats, int counter) { static inline void decrementcounter(isc_stats_t *stats, int counter) { - isc_int32_t prev; + int32_t prev; #if ISC_STATS_LOCKCOUNTERS isc_rwlock_lock(&stats->counterlock, isc_rwlocktype_read); @@ -307,14 +308,14 @@ decrementcounter(isc_stats_t *stats, int counter) { prev = atomic_fetch_sub_explicit(&stats->counters[counter].lo, 1, memory_order_relaxed); #else - prev = isc_atomic_xadd((isc_int32_t *)&stats->counters[counter].lo, -1); + prev = isc_atomic_xadd((int32_t *)&stats->counters[counter].lo, -1); #endif if (prev == 0) { #if defined(ISC_STATS_HAVESTDATOMIC) atomic_fetch_sub_explicit(&stats->counters[counter].hi, 1, memory_order_relaxed); #else - isc_atomic_xadd((isc_int32_t *)&stats->counters[counter].hi, + isc_atomic_xadd((int32_t *)&stats->counters[counter].hi, -1); #endif } @@ -324,7 +325,7 @@ decrementcounter(isc_stats_t *stats, int counter) { atomic_fetch_sub_explicit(&stats->counters[counter], 1, memory_order_relaxed); #else - isc_atomic_xaddq((isc_int64_t *)&stats->counters[counter], -1); + isc_atomic_xaddq((int64_t *)&stats->counters[counter], -1); #endif #else UNUSED(prev); @@ -351,7 +352,7 @@ copy_counters(isc_stats_t *stats) { for (i = 0; i < stats->ncounters; i++) { #if ISC_STATS_USEMULTIFIELDS stats->copiedcounters[i] = - (isc_uint64_t)(stats->counters[i].hi) << 32 | + (uint64_t)(stats->counters[i].hi) << 32 | stats->counters[i].lo; #elif ISC_STATS_HAVEATOMICQ #if defined(ISC_STATS_HAVESTDATOMICQ) @@ -361,7 +362,7 @@ copy_counters(isc_stats_t *stats) { #else /* use xaddq(..., 0) as an atomic load */ stats->copiedcounters[i] = - (isc_uint64_t)isc_atomic_xaddq((isc_int64_t *)&stats->counters[i], 0); + (uint64_t)isc_atomic_xaddq((int64_t *)&stats->counters[i], 0); #endif #else stats->copiedcounters[i] = stats->counters[i]; @@ -415,7 +416,7 @@ isc_stats_dump(isc_stats_t *stats, isc_stats_dumper_t dump_fn, } void -isc_stats_set(isc_stats_t *stats, isc_uint64_t val, +isc_stats_set(isc_stats_t *stats, uint64_t val, isc_statscounter_t counter) { REQUIRE(ISC_STATS_VALID(stats)); @@ -430,14 +431,14 @@ isc_stats_set(isc_stats_t *stats, isc_uint64_t val, #endif #if ISC_STATS_USEMULTIFIELDS - stats->counters[counter].hi = (isc_uint32_t)((val >> 32) & 0xffffffff); - stats->counters[counter].lo = (isc_uint32_t)(val & 0xffffffff); + stats->counters[counter].hi = (uint32_t)((val >> 32) & 0xffffffff); + stats->counters[counter].lo = (uint32_t)(val & 0xffffffff); #elif ISC_STATS_HAVEATOMICQ #if defined(ISC_STATS_HAVESTDATOMICQ) atomic_store_explicit(&stats->counters[counter], val, memory_order_relaxed); #else - isc_atomic_storeq((isc_int64_t *)&stats->counters[counter], val); + isc_atomic_storeq((int64_t *)&stats->counters[counter], val); #endif #else stats->counters[counter] = val; diff --git a/lib/isc/tests/atomic_test.c b/lib/isc/tests/atomic_test.c index 3d1e135237..8ed5c9daa6 100644 --- a/lib/isc/tests/atomic_test.c +++ b/lib/isc/tests/atomic_test.c @@ -11,8 +11,8 @@ #include -#include #include +#include #include @@ -25,18 +25,18 @@ #define TASKS 32 #define ITERATIONS 1000 #define COUNTS_PER_ITERATION 1000 -#define INCREMENT_64 (isc_int64_t)0x0000000010000000 +#define INCREMENT_64 (int64_t)0x0000000010000000 #define EXPECTED_COUNT_32 (TASKS * ITERATIONS * COUNTS_PER_ITERATION) #define EXPECTED_COUNT_64 (TASKS * ITERATIONS * COUNTS_PER_ITERATION * INCREMENT_64) typedef struct { - isc_uint32_t iteration; + uint32_t iteration; } counter_t; counter_t counters[TASKS]; #if defined(ISC_PLATFORM_HAVEXADD) -static isc_int32_t counter_32; +static int32_t counter_32; static void do_xadd(isc_task_t *task, isc_event_t *ev) { @@ -98,7 +98,7 @@ ATF_TC_BODY(atomic_xadd, tc) { #endif #if defined(ISC_PLATFORM_HAVEXADDQ) -static isc_int64_t counter_64; +static int64_t counter_64; static void do_xaddq(isc_task_t *task, isc_event_t *ev) { @@ -161,14 +161,14 @@ ATF_TC_BODY(atomic_xaddq, tc) { #endif #if defined(ISC_PLATFORM_HAVEATOMICSTORE) -static isc_int32_t store_32; +static int32_t store_32; static void do_store(isc_task_t *task, isc_event_t *ev) { counter_t *state = (counter_t *)ev->ev_arg; int i; - isc_uint32_t r; - isc_uint32_t val; + uint32_t r; + uint32_t val; r = random() % 256; val = (r << 24) | (r << 16) | (r << 8) | r; @@ -193,8 +193,8 @@ ATF_TC_BODY(atomic_store, tc) { isc_result_t result; isc_task_t *tasks[TASKS]; isc_event_t *event = NULL; - isc_uint32_t val; - isc_uint32_t r; + uint32_t val; + uint32_t r; int i; UNUSED(tc); @@ -226,29 +226,29 @@ ATF_TC_BODY(atomic_store, tc) { val = (r << 24) | (r << 16) | (r << 8) | r; printf("32-bit store 0x%x, expected 0x%x\n", - (isc_uint32_t) store_32, val); + (uint32_t) store_32, val); - ATF_CHECK_EQ((isc_uint32_t) store_32, val); + ATF_CHECK_EQ((uint32_t) store_32, val); store_32 = 0; } #endif #if defined(ISC_PLATFORM_HAVEATOMICSTOREQ) -static isc_int64_t store_64; +static int64_t store_64; static void do_storeq(isc_task_t *task, isc_event_t *ev) { counter_t *state = (counter_t *)ev->ev_arg; int i; - isc_uint8_t r; - isc_uint64_t val; + uint8_t r; + uint64_t val; r = random() % 256; - val = (((isc_uint64_t) r << 24) | - ((isc_uint64_t) r << 16) | - ((isc_uint64_t) r << 8) | - (isc_uint64_t) r); - val |= ((isc_uint64_t) val << 32); + val = (((uint64_t) r << 24) | + ((uint64_t) r << 16) | + ((uint64_t) r << 8) | + (uint64_t) r); + val |= ((uint64_t) val << 32); for (i = 0 ; i < COUNTS_PER_ITERATION ; i++) { isc_atomic_storeq(&store_64, val); @@ -270,8 +270,8 @@ ATF_TC_BODY(atomic_storeq, tc) { isc_result_t result; isc_task_t *tasks[TASKS]; isc_event_t *event = NULL; - isc_uint64_t val; - isc_uint32_t r; + uint64_t val; + uint32_t r; int i; UNUSED(tc); @@ -300,17 +300,17 @@ ATF_TC_BODY(atomic_storeq, tc) { isc_test_end(); r = store_64 & 0xff; - val = (((isc_uint64_t) r << 24) | - ((isc_uint64_t) r << 16) | - ((isc_uint64_t) r << 8) | - (isc_uint64_t) r); - val |= ((isc_uint64_t) val << 32); + val = (((uint64_t) r << 24) | + ((uint64_t) r << 16) | + ((uint64_t) r << 8) | + (uint64_t) r); + val |= ((uint64_t) val << 32); printf("64-bit store 0x%" PRIx64 ", " "expected 0x%" PRIx64 "\n", - (isc_uint64_t) store_64, val); + (uint64_t) store_64, val); - ATF_CHECK_EQ((isc_uint64_t) store_64, val); + ATF_CHECK_EQ((uint64_t) store_64, val); store_64 = 0; } #endif diff --git a/lib/isc/tests/hash_test.c b/lib/isc/tests/hash_test.c index 4f7e721469..c468b3b3a3 100644 --- a/lib/isc/tests/hash_test.c +++ b/lib/isc/tests/hash_test.c @@ -15,9 +15,9 @@ #include +#include #include #include -#include #include @@ -201,7 +201,7 @@ ATF_TC_BODY(isc_sha1, tc) { isc_sha1_init(&sha1); for(i = 0; i < testcase->repeats; i++) { isc_sha1_update(&sha1, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); } isc_sha1_final(&sha1, digest); @@ -328,7 +328,7 @@ ATF_TC_BODY(isc_sha224, tc) { isc_sha224_init(&sha224); for(i = 0; i < testcase->repeats; i++) { isc_sha224_update(&sha224, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); } isc_sha224_final(digest, &sha224); @@ -460,7 +460,7 @@ ATF_TC_BODY(isc_sha256, tc) { isc_sha256_init(&sha256); for(i = 0; i < testcase->repeats; i++) { isc_sha256_update(&sha256, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); } isc_sha256_final(digest, &sha256); @@ -606,7 +606,7 @@ ATF_TC_BODY(isc_sha384, tc) { isc_sha384_init(&sha384); for(i = 0; i < testcase->repeats; i++) { isc_sha384_update(&sha384, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); } isc_sha384_final(digest, &sha384); @@ -753,7 +753,7 @@ ATF_TC_BODY(isc_sha512, tc) { isc_sha512_init(&sha512); for(i = 0; i < testcase->repeats; i++) { isc_sha512_update(&sha512, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); } isc_sha512_final(digest, &sha512); @@ -832,7 +832,7 @@ ATF_TC_BODY(isc_md5, tc) { isc_md5_init(&md5); for(i = 0; i < testcase->repeats; i++) { isc_md5_update(&md5, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); } isc_md5_final(&md5, digest); @@ -962,7 +962,7 @@ ATF_TC_BODY(isc_hmacsha1, tc) { memmove(buffer, test_key->key, test_key->len); isc_hmacsha1_init(&hmacsha1, buffer, test_key->len); isc_hmacsha1_update(&hmacsha1, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); isc_hmacsha1_sign(&hmacsha1, digest, ISC_SHA1_DIGESTLENGTH); tohexstr(digest, ISC_SHA1_DIGESTLENGTH, str, sizeof(str)); @@ -1125,7 +1125,7 @@ ATF_TC_BODY(isc_hmacsha224, tc) { memmove(buffer, test_key->key, test_key->len); isc_hmacsha224_init(&hmacsha224, buffer, test_key->len); isc_hmacsha224_update(&hmacsha224, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); isc_hmacsha224_sign(&hmacsha224, digest, ISC_SHA224_DIGESTLENGTH); tohexstr(digest, ISC_SHA224_DIGESTLENGTH, str, sizeof(str)); @@ -1288,7 +1288,7 @@ ATF_TC_BODY(isc_hmacsha256, tc) { memmove(buffer, test_key->key, test_key->len); isc_hmacsha256_init(&hmacsha256, buffer, test_key->len); isc_hmacsha256_update(&hmacsha256, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); isc_hmacsha256_sign(&hmacsha256, digest, ISC_SHA256_DIGESTLENGTH); tohexstr(digest, ISC_SHA256_DIGESTLENGTH, str, sizeof(str)); @@ -1457,7 +1457,7 @@ ATF_TC_BODY(isc_hmacsha384, tc) { memmove(buffer, test_key->key, test_key->len); isc_hmacsha384_init(&hmacsha384, buffer, test_key->len); isc_hmacsha384_update(&hmacsha384, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); isc_hmacsha384_sign(&hmacsha384, digest, ISC_SHA384_DIGESTLENGTH); tohexstr(digest, ISC_SHA384_DIGESTLENGTH, str, sizeof(str)); @@ -1626,7 +1626,7 @@ ATF_TC_BODY(isc_hmacsha512, tc) { memmove(buffer, test_key->key, test_key->len); isc_hmacsha512_init(&hmacsha512, buffer, test_key->len); isc_hmacsha512_update(&hmacsha512, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); isc_hmacsha512_sign(&hmacsha512, digest, ISC_SHA512_DIGESTLENGTH); tohexstr(digest, ISC_SHA512_DIGESTLENGTH, str, sizeof(str)); @@ -1769,7 +1769,7 @@ ATF_TC_BODY(isc_hmacmd5, tc) { memmove(buffer, test_key->key, test_key->len); isc_hmacmd5_init(&hmacmd5, buffer, test_key->len); isc_hmacmd5_update(&hmacmd5, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); isc_hmacmd5_sign(&hmacmd5, digest); tohexstr(digest, ISC_MD5_DIGESTLENGTH, str, sizeof(str)); @@ -1786,7 +1786,7 @@ ATF_TC_HEAD(isc_crc64, tc) { atf_tc_set_md_var(tc, "descr", "64-bit cyclic redundancy check"); } ATF_TC_BODY(isc_crc64, tc) { - isc_uint64_t crc; + uint64_t crc; int i; UNUSED(tc); @@ -1831,7 +1831,7 @@ ATF_TC_BODY(isc_crc64, tc) { isc_crc64_init(&crc); for(i = 0; i < testcase->repeats; i++) { isc_crc64_update(&crc, - (const isc_uint8_t *) testcase->input, + (const uint8_t *) testcase->input, testcase->input_len); } isc_crc64_final(&crc); diff --git a/lib/isc/tests/ht_test.c b/lib/isc/tests/ht_test.c index 4b069ef68a..5356142a4f 100644 --- a/lib/isc/tests/ht_test.c +++ b/lib/isc/tests/ht_test.c @@ -15,6 +15,7 @@ #include +#include #include #include #include @@ -26,8 +27,6 @@ #include #include -#include - static void * default_memalloc(void *arg, size_t size) { UNUSED(arg); @@ -196,7 +195,7 @@ static void test_ht_iterator() { uintptr_t i; void *v; uintptr_t count = 10000; - isc_uint32_t walked; + uint32_t walked; unsigned char key[16]; unsigned char *tkey; size_t tksize; diff --git a/lib/isc/tests/isctest.c b/lib/isc/tests/isctest.c index 50d23b3df4..fe1d79ff6b 100644 --- a/lib/isc/tests/isctest.c +++ b/lib/isc/tests/isctest.c @@ -13,6 +13,7 @@ #include +#include #include #include @@ -159,7 +160,7 @@ isc_test_end(void) { * Sleep for 'usec' microseconds. */ void -isc_test_nap(isc_uint32_t usec) { +isc_test_nap(uint32_t usec) { #ifdef HAVE_NANOSLEEP struct timespec ts; diff --git a/lib/isc/tests/isctest.h b/lib/isc/tests/isctest.h index ecb40f85c6..dc03ec0812 100644 --- a/lib/isc/tests/isctest.h +++ b/lib/isc/tests/isctest.h @@ -13,6 +13,8 @@ #include +#include + #include #include #include @@ -56,4 +58,4 @@ void isc_test_end(void); void -isc_test_nap(isc_uint32_t usec); +isc_test_nap(uint32_t usec); diff --git a/lib/isc/tests/parse_test.c b/lib/isc/tests/parse_test.c index 9409dd0e90..3947c09feb 100644 --- a/lib/isc/tests/parse_test.c +++ b/lib/isc/tests/parse_test.c @@ -15,6 +15,7 @@ #include +#include #include #include @@ -33,7 +34,7 @@ ATF_TC_HEAD(parse_overflow, tc) { } ATF_TC_BODY(parse_overflow, tc) { isc_result_t result; - isc_uint32_t output; + uint32_t output; UNUSED(tc); result = isc_test_begin(NULL, ISC_TRUE, 0); diff --git a/lib/isc/tests/radix_test.c b/lib/isc/tests/radix_test.c index 77fc8d3a7a..1ebad6f338 100644 --- a/lib/isc/tests/radix_test.c +++ b/lib/isc/tests/radix_test.c @@ -20,7 +20,6 @@ #include #include -#include #include "isctest.h" diff --git a/lib/isc/tests/random_test.c b/lib/isc/tests/random_test.c index b04cfb826f..4ffef4fbaf 100644 --- a/lib/isc/tests/random_test.c +++ b/lib/isc/tests/random_test.c @@ -18,6 +18,10 @@ #include +#include +#include +#include + #include #include #include @@ -27,14 +31,10 @@ #include -#include -#include -#include - #define REPS 25000 typedef double (pvalue_func_t)(isc_mem_t *mctx, - isc_uint16_t *values, size_t length); + uint16_t *values, size_t length); /* igamc(), igam(), etc. were adapted (and cleaned up) from the Cephes * math library: @@ -153,17 +153,17 @@ igam(double a, double x) { return (ans * ax / a); } -static isc_int8_t scounts_table[65536]; -static isc_uint8_t bitcounts_table[65536]; +static int8_t scounts_table[65536]; +static uint8_t bitcounts_table[65536]; -static isc_int8_t -scount_calculate(isc_uint16_t n) { +static int8_t +scount_calculate(uint16_t n) { int i; - isc_int8_t sc; + int8_t sc; sc = 0; for (i = 0; i < 16; i++) { - isc_uint16_t lsb; + uint16_t lsb; lsb = n & 1; if (lsb != 0) @@ -177,14 +177,14 @@ scount_calculate(isc_uint16_t n) { return (sc); } -static isc_uint8_t -bitcount_calculate(isc_uint16_t n) { +static uint8_t +bitcount_calculate(uint16_t n) { int i; - isc_uint8_t bc; + uint8_t bc; bc = 0; for (i = 0; i < 16; i++) { - isc_uint16_t lsb; + uint16_t lsb; lsb = n & 1; if (lsb != 0) @@ -198,7 +198,7 @@ bitcount_calculate(isc_uint16_t n) { static void tables_init(void) { - isc_uint32_t i; + uint32_t i; for (i = 0; i < 65536; i++) { scounts_table[i] = scount_calculate(i); @@ -213,12 +213,12 @@ tables_init(void) { * * This function destroys (modifies) the data passed in bits. */ -static isc_uint32_t -matrix_binaryrank(isc_uint32_t *bits, size_t rows, size_t cols) { +static uint32_t +matrix_binaryrank(uint32_t *bits, size_t rows, size_t cols) { size_t i, j, k; unsigned int rt = 0; - isc_uint32_t rank = 0; - isc_uint32_t tmp; + uint32_t rank = 0; + uint32_t tmp; for (k = 0; k < rows; k++) { i = k; @@ -263,10 +263,10 @@ static void random_test(pvalue_func_t *func, isc_random_func test_func) { isc_mem_t *mctx = NULL; isc_result_t result; - isc_uint32_t m; - isc_uint32_t j; - isc_uint32_t histogram[11] = { 0 }; - isc_uint32_t passed; + uint32_t m; + uint32_t j; + uint32_t histogram[11] = { 0 }; + uint32_t passed; double proportion; double p_hat; double lower_confidence, higher_confidence; @@ -283,9 +283,9 @@ random_test(pvalue_func_t *func, isc_random_func test_func) { passed = 0; for (j = 0; j < m; j++) { - isc_uint32_t i; - isc_uint32_t values[REPS]; - isc_uint16_t *uniform_values; + uint32_t i; + uint32_t values[REPS]; + uint16_t *uniform_values; double p_value; switch (test_func) { @@ -311,13 +311,13 @@ random_test(pvalue_func_t *func, isc_random_func test_func) { isc_random_buf(values, sizeof(values)); break; case ISC_RANDOM_UNIFORM: - uniform_values = (isc_uint16_t *)values; + uniform_values = (uint16_t *)values; for (i = 0; i < (sizeof(values) / sizeof(*uniform_values)); i++) { uniform_values[i] = - isc_random_uniform(ISC_UINT16_MAX); + isc_random_uniform(UINT16_MAX); } break; case ISC_NONCE_BYTES: @@ -395,10 +395,10 @@ random_test(pvalue_func_t *func, isc_random_func test_func) { * RANDOM test suite. */ static double -monobit(isc_mem_t *mctx, isc_uint16_t *values, size_t length) { +monobit(isc_mem_t *mctx, uint16_t *values, size_t length) { size_t i; - isc_int32_t scount; - isc_uint32_t numbits; + int32_t scount; + uint32_t numbits; double s_obs; double p_value; @@ -426,17 +426,17 @@ monobit(isc_mem_t *mctx, isc_uint16_t *values, size_t length) { * This is the runs test taken from the NIST SP 800-22 RNG test suite. */ static double -runs(isc_mem_t *mctx, isc_uint16_t *values, size_t length) { +runs(isc_mem_t *mctx, uint16_t *values, size_t length) { size_t i; - isc_uint32_t bcount; - isc_uint32_t numbits; + uint32_t bcount; + uint32_t numbits; double pi; double tau; - isc_uint32_t j; - isc_uint32_t b; - isc_uint8_t bit_this; - isc_uint8_t bit_prev; - isc_uint32_t v_obs; + uint32_t j; + uint32_t b; + uint8_t bit_this; + uint8_t bit_prev; + uint32_t v_obs; double numer; double denom; double p_value; @@ -502,12 +502,12 @@ runs(isc_mem_t *mctx, isc_uint16_t *values, size_t length) { * test suite. */ static double -blockfrequency(isc_mem_t *mctx, isc_uint16_t *values, size_t length) { - isc_uint32_t i; - isc_uint32_t numbits; - isc_uint32_t mbits; - isc_uint32_t mwords; - isc_uint32_t numblocks; +blockfrequency(isc_mem_t *mctx, uint16_t *values, size_t length) { + uint32_t i; + uint32_t numbits; + uint32_t mbits; + uint32_t mwords; + uint32_t numblocks; double *pi; double chi_square; double p_value; @@ -531,10 +531,10 @@ blockfrequency(isc_mem_t *mctx, isc_uint16_t *values, size_t length) { ATF_REQUIRE(pi != NULL); for (i = 0; i < numblocks; i++) { - isc_uint32_t j; + uint32_t j; pi[i] = 0.0; for (j = 0; j < mwords; j++) { - isc_uint32_t idx; + uint32_t idx; idx = i * mwords + j; pi[i] += bitcounts_table[values[idx]]; @@ -564,15 +564,15 @@ printf("chi_square=%f\n", chi_square); * test suite. */ static double -binarymatrixrank(isc_mem_t *mctx, isc_uint16_t *values, size_t length) { - isc_uint32_t i; +binarymatrixrank(isc_mem_t *mctx, uint16_t *values, size_t length) { + uint32_t i; size_t matrix_m; size_t matrix_q; - isc_uint32_t num_matrices; + uint32_t num_matrices; size_t numbits; - isc_uint32_t fm_0; - isc_uint32_t fm_1; - isc_uint32_t fm_rest; + uint32_t fm_0; + uint32_t fm_1; + uint32_t fm_rest; double term1; double term2; double term3; @@ -596,17 +596,17 @@ binarymatrixrank(isc_mem_t *mctx, isc_uint16_t *values, size_t length) { fm_rest = 0; for (i = 0; i < num_matrices; i++) { /* - * Each isc_uint32_t supplies 32 bits, so a 32x32 bit matrix - * takes up isc_uint32_t array of size 32. + * Each uint32_t supplies 32 bits, so a 32x32 bit matrix + * takes up uint32_t array of size 32. */ - isc_uint32_t bits[32]; + uint32_t bits[32]; int j; - isc_uint32_t rank; + uint32_t rank; for (j = 0; j < 32; j++) { size_t idx; - isc_uint32_t r1; - isc_uint32_t r2; + uint32_t r1; + uint32_t r2; idx = i * ((matrix_m * matrix_q) / 16); idx += j * 2; diff --git a/lib/isc/unix/app.c b/lib/isc/unix/app.c index 118729e9ab..aaf0365c69 100644 --- a/lib/isc/unix/app.c +++ b/lib/isc/unix/app.c @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -473,7 +474,7 @@ evloop(isc__appctx_t *ctx) { if (result != ISC_R_SUCCESS) tvp = NULL; else { - isc_uint64_t us; + uint64_t us; TIME_NOW(&now); us = isc_time_microdiff(&when, &now); diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c index 1abf412383..cb4a1a569e 100644 --- a/lib/isc/unix/file.c +++ b/lib/isc/unix/file.c @@ -46,6 +46,7 @@ #include #include #include +#include #include #include /* Required for utimes on some platforms. */ #include /* Required for mkstemp on NetBSD. */ @@ -201,7 +202,7 @@ isc_file_settime(const char *file, isc_time_t *when) { * we can at least cast to signed so the IRIX compiler shuts up. */ times[0].tv_usec = times[1].tv_usec = - (isc_int32_t)(isc_time_nanoseconds(when) / 1000); + (int32_t)(isc_time_nanoseconds(when) / 1000); if (utimes(file, times) < 0) return (isc__errno2result(errno)); diff --git a/lib/isc/unix/ifiter_sysctl.c b/lib/isc/unix/ifiter_sysctl.c index 0d6019b5b9..cc1bf93ffa 100644 --- a/lib/isc/unix/ifiter_sysctl.c +++ b/lib/isc/unix/ifiter_sysctl.c @@ -18,6 +18,10 @@ * and 19.16. */ +#include + +#include + #include #include diff --git a/lib/isc/unix/include/isc/Makefile.in b/lib/isc/unix/include/isc/Makefile.in index 3892e0fb38..46c75c1e60 100644 --- a/lib/isc/unix/include/isc/Makefile.in +++ b/lib/isc/unix/include/isc/Makefile.in @@ -13,7 +13,7 @@ top_srcdir = @top_srcdir@ VERSION=@BIND9_VERSION@ -HEADERS = dir.h int.h keyboard.h net.h netdb.h offset.h stat.h \ +HEADERS = dir.h keyboard.h net.h netdb.h offset.h stat.h \ stdtime.h strerror.h syslog.h time.h SUBDIRS = diff --git a/lib/isc/unix/include/isc/int.h b/lib/isc/unix/include/isc/int.h deleted file mode 100644 index fdf4d18a2d..0000000000 --- a/lib/isc/unix/include/isc/int.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -/* $Id: int.h,v 1.16 2007/06/19 23:47:19 tbox Exp $ */ - -#ifndef ISC_INT_H -#define ISC_INT_H 1 - -/*! \file */ - -typedef signed char isc_int8_t; -typedef unsigned char isc_uint8_t; -typedef short isc_int16_t; -typedef unsigned short isc_uint16_t; -typedef int isc_int32_t; -typedef unsigned int isc_uint32_t; -typedef long long isc_int64_t; -typedef unsigned long long isc_uint64_t; - -#define ISC_INT8_MIN -128 -#define ISC_INT8_MAX 127 -#define ISC_UINT8_MAX 255 - -#define ISC_INT16_MIN -32768 -#define ISC_INT16_MAX 32767 -#define ISC_UINT16_MAX 65535 - -/*% - * Note that "int" is 32 bits on all currently supported Unix-like operating - * systems, but "long" can be either 32 bits or 64 bits, thus the 32 bit - * constants are not qualified with "L". - */ -#define ISC_INT32_MIN -2147483648 -#define ISC_INT32_MAX 2147483647 -#define ISC_UINT32_MAX 4294967295U - -#define ISC_INT64_MIN -9223372036854775808LL -#define ISC_INT64_MAX 9223372036854775807LL -#define ISC_UINT64_MAX 18446744073709551615ULL - -#endif /* ISC_INT_H */ diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h index 38504bcce4..a30e7ef84e 100644 --- a/lib/isc/unix/include/isc/net.h +++ b/lib/isc/unix/include/isc/net.h @@ -67,6 +67,8 @@ ***/ #include +#include + #include #include /* Contractual promise. */ @@ -198,26 +200,26 @@ struct in6_pktinfo { #ifndef ISC_PLATFORM_HAVESOCKADDRSTORAGE #define _SS_MAXSIZE 128 -#define _SS_ALIGNSIZE (sizeof (isc_uint64_t)) +#define _SS_ALIGNSIZE (sizeof (uint64_t)) #ifdef ISC_PLATFORM_HAVESALEN -#define _SS_PAD1SIZE (_SS_ALIGNSIZE - (2 * sizeof(isc_uint8_t))) +#define _SS_PAD1SIZE (_SS_ALIGNSIZE - (2 * sizeof(uint8_t))) #define _SS_PAD2SIZE (_SS_MAXSIZE - (_SS_ALIGNSIZE + _SS_PAD1SIZE \ - + 2 * sizeof(isc_uint8_t))) + + 2 * sizeof(uint8_t))) #else -#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(isc_uint16_t)) +#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(uint16_t)) #define _SS_PAD2SIZE (_SS_MAXSIZE - (_SS_ALIGNSIZE + _SS_PAD1SIZE \ - + sizeof(isc_uint16_t))) + + sizeof(uint16_t))) #endif struct sockaddr_storage { #ifdef ISC_PLATFORM_HAVESALEN - isc_uint8_t ss_len; - isc_uint8_t ss_family; + uint8_t ss_len; + uint8_t ss_family; #else - isc_uint16_t ss_family; + uint16_t ss_family; #endif char __ss_pad1[_SS_PAD1SIZE]; - isc_uint64_t __ss_align; /* field to force desired structure */ + uint64_t __ss_align; /* field to force desired structure */ char __ss_pad2[_SS_PAD2SIZE]; }; #endif @@ -260,7 +262,7 @@ extern const struct in6_addr isc_net_in6addrloop; /*% * Ensure type in_port_t is defined. */ -typedef isc_uint16_t in_port_t; +typedef uint16_t in_port_t; #endif #ifndef MSG_TRUNC @@ -273,15 +275,15 @@ typedef isc_uint16_t in_port_t; #endif /*% IP address. */ -#define ISC__IPADDR(x) ((isc_uint32_t)htonl((isc_uint32_t)(x))) +#define ISC__IPADDR(x) ((uint32_t)htonl((uint32_t)(x))) /*% Is IP address multicast? */ #define ISC_IPADDR_ISMULTICAST(i) \ - (((isc_uint32_t)(i) & ISC__IPADDR(0xf0000000)) \ + (((uint32_t)(i) & ISC__IPADDR(0xf0000000)) \ == ISC__IPADDR(0xe0000000)) #define ISC_IPADDR_ISEXPERIMENTAL(i) \ - (((isc_uint32_t)(i) & ISC__IPADDR(0xf0000000)) \ + (((uint32_t)(i) & ISC__IPADDR(0xf0000000)) \ == ISC__IPADDR(0xf0000000)) /*** diff --git a/lib/isc/unix/include/isc/stdtime.h b/lib/isc/unix/include/isc/stdtime.h index 7b1e9ac2d1..1a3da825c5 100644 --- a/lib/isc/unix/include/isc/stdtime.h +++ b/lib/isc/unix/include/isc/stdtime.h @@ -16,14 +16,14 @@ /*! \file */ #include -#include +#include /*% * It's public information that 'isc_stdtime_t' is an unsigned integral type. * Applications that want maximum portability should not assume anything * about its size. */ -typedef isc_uint32_t isc_stdtime_t; +typedef uint32_t isc_stdtime_t; /* but this flag helps... */ #define STDTIME_ON_32BITS 1 @@ -33,7 +33,7 @@ typedef isc_uint32_t isc_stdtime_t; * type should only be used as an opaque integer (e.g.,) to compare two * time values. */ -typedef isc_uint32_t isc_stdtime32_t; +typedef uint32_t isc_stdtime32_t; ISC_LANG_BEGINDECLS /* */ diff --git a/lib/isc/unix/include/isc/time.h b/lib/isc/unix/include/isc/time.h index 1848428cc0..ff5c4db885 100644 --- a/lib/isc/unix/include/isc/time.h +++ b/lib/isc/unix/include/isc/time.h @@ -15,6 +15,8 @@ /*! \file */ +#include + #include #include @@ -223,7 +225,7 @@ isc_time_subtract(const isc_time_t *t, const isc_interval_t *i, * The interval is larger than the time since the epoch. */ -isc_uint64_t +uint64_t isc_time_microdiff(const isc_time_t *t1, const isc_time_t *t2); /*%< * Find the difference in microseconds between time t1 and time t2. @@ -237,7 +239,7 @@ isc_time_microdiff(const isc_time_t *t1, const isc_time_t *t2); *\li The difference of t1 - t2, or 0 if t1 <= t2. */ -isc_uint32_t +uint32_t isc_time_seconds(const isc_time_t *t); /*%< * Return the number of seconds since the epoch stored in a time structure. @@ -270,7 +272,7 @@ isc_time_secondsastimet(const isc_time_t *t, time_t *secondsp); *\li Out of range */ -isc_uint32_t +uint32_t isc_time_nanoseconds(const isc_time_t *t); /*%< * Return the number of nanoseconds stored in a time structure. diff --git a/lib/isc/unix/interfaceiter.c b/lib/isc/unix/interfaceiter.c index bfab189c8b..4df4d34703 100644 --- a/lib/isc/unix/interfaceiter.c +++ b/lib/isc/unix/interfaceiter.c @@ -21,6 +21,7 @@ #endif #include +#include #include #include #include @@ -96,7 +97,7 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src, * we only consider unicast link-local addresses. */ if (IN6_IS_ADDR_LINKLOCAL(&sa6->sin6_addr)) { - isc_uint16_t zone16; + uint16_t zone16; memmove(&zone16, &sa6->sin6_addr.s6_addr[2], sizeof(zone16)); @@ -104,7 +105,7 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src, if (zone16 != 0) { /* the zone ID is embedded */ isc_netaddr_setzone(dst, - (isc_uint32_t)zone16); + (uint32_t)zone16); dst->type.in6.s6_addr[2] = 0; dst->type.in6.s6_addr[3] = 0; #ifdef ISC_PLATFORM_HAVEIFNAMETOINDEX @@ -120,7 +121,7 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src, zone = if_nametoindex(ifname); if (zone != 0) { isc_netaddr_setzone(dst, - (isc_uint32_t)zone); + (uint32_t)zone); } #endif } @@ -219,7 +220,7 @@ linux_if_inet6_current(isc_interfaceiter_t *iter) { isc_netaddr_fromin6(&iter->current.address, &addr6); if (isc_netaddr_islinklocal(&iter->current.address)) { isc_netaddr_setzone(&iter->current.address, - (isc_uint32_t)ifindex); + (uint32_t)ifindex); } for (i = 0; i < 16; i++) { if (prefix > 8) { diff --git a/lib/isc/unix/meminfo.c b/lib/isc/unix/meminfo.c index f788c7855d..ad750a70f3 100644 --- a/lib/isc/unix/meminfo.c +++ b/lib/isc/unix/meminfo.c @@ -12,12 +12,13 @@ #include #include +#include #include #ifdef HAVE_SYS_SYSCTL_H #include #endif -isc_uint64_t +uint64_t isc_meminfo_totalphys(void) { #if defined(CTL_HW) && (defined(HW_PHYSMEM64) || defined(HW_MEMSIZE)) int mib[2]; @@ -27,7 +28,7 @@ isc_meminfo_totalphys(void) { #elif defined(HW_PHYSMEM64) mib[1] = HW_PHYSMEM64; #endif - isc_uint64_t size = 0; + uint64_t size = 0; size_t len = sizeof(size); if (sysctl(mib, 2, &size, &len, NULL, 0) == 0) return (size); diff --git a/lib/isc/unix/resource.c b/lib/isc/unix/resource.c index 5757f5f535..3c1d4c80ff 100644 --- a/lib/isc/unix/resource.c +++ b/lib/isc/unix/resource.c @@ -12,6 +12,8 @@ #include +#include + #include #include /* Required on some systems for . */ #include diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c index 6198a73d3b..2388ca01e2 100644 --- a/lib/isc/unix/socket.c +++ b/lib/isc/unix/socket.c @@ -13,6 +13,9 @@ #include +#include +#include + #include #include #include @@ -34,7 +37,6 @@ #include #include #include -#include #include #include @@ -579,8 +581,8 @@ isc_socket_socketevent(isc_mem_t *mctx, void *sender, void isc__socket_cleanunix(const isc_sockaddr_t *sockaddr, isc_boolean_t active); isc_result_t -isc__socket_permunix(const isc_sockaddr_t *sockaddr, isc_uint32_t perm, - isc_uint32_t owner, isc_uint32_t group); +isc__socket_permunix(const isc_sockaddr_t *sockaddr, uint32_t perm, + uint32_t owner, uint32_t group); isc_result_t isc__socket_bind(isc_socket_t *sock, const isc_sockaddr_t *sockaddr, unsigned int options); @@ -4366,7 +4368,7 @@ watcher(void *uap) { #endif /* USE_WATCHER_THREAD */ void -isc__socketmgr_setreserved(isc_socketmgr_t *manager0, isc_uint32_t reserved) { +isc__socketmgr_setreserved(isc_socketmgr_t *manager0, uint32_t reserved) { isc__socketmgr_t *manager = (isc__socketmgr_t *)manager0; REQUIRE(VALID_MANAGER(manager)); @@ -5462,8 +5464,8 @@ isc__socket_cleanunix(const isc_sockaddr_t *sockaddr, isc_boolean_t active) { } isc_result_t -isc__socket_permunix(const isc_sockaddr_t *sockaddr, isc_uint32_t perm, - isc_uint32_t owner, isc_uint32_t group) +isc__socket_permunix(const isc_sockaddr_t *sockaddr, uint32_t perm, + uint32_t owner, uint32_t group) { #ifdef ISC_PLATFORM_HAVESYSUNH isc_result_t result = ISC_R_SUCCESS; diff --git a/lib/isc/unix/time.c b/lib/isc/unix/time.c index 03367ff92d..d4d4697b2a 100644 --- a/lib/isc/unix/time.c +++ b/lib/isc/unix/time.c @@ -16,6 +16,7 @@ #include #include +#include #include #include #include @@ -298,15 +299,15 @@ isc_time_subtract(const isc_time_t *t, const isc_interval_t *i, return (ISC_R_SUCCESS); } -isc_uint64_t +uint64_t isc_time_microdiff(const isc_time_t *t1, const isc_time_t *t2) { - isc_uint64_t i1, i2, i3; + uint64_t i1, i2, i3; REQUIRE(t1 != NULL && t2 != NULL); INSIST(t1->nanoseconds < NS_PER_S && t2->nanoseconds < NS_PER_S); - i1 = (isc_uint64_t)t1->seconds * NS_PER_S + t1->nanoseconds; - i2 = (isc_uint64_t)t2->seconds * NS_PER_S + t2->nanoseconds; + i1 = (uint64_t)t1->seconds * NS_PER_S + t1->nanoseconds; + i2 = (uint64_t)t2->seconds * NS_PER_S + t2->nanoseconds; if (i1 <= i2) return (0); @@ -321,12 +322,12 @@ isc_time_microdiff(const isc_time_t *t1, const isc_time_t *t2) { return (i3); } -isc_uint32_t +uint32_t isc_time_seconds(const isc_time_t *t) { REQUIRE(t != NULL); INSIST(t->nanoseconds < NS_PER_S); - return ((isc_uint32_t)t->seconds); + return ((uint32_t)t->seconds); } isc_result_t @@ -355,8 +356,8 @@ isc_time_secondsastimet(const isc_time_t *t, time_t *secondsp) { */ seconds = (time_t)t->seconds; - INSIST(sizeof(unsigned int) == sizeof(isc_uint32_t)); - INSIST(sizeof(time_t) >= sizeof(isc_uint32_t)); + INSIST(sizeof(unsigned int) == sizeof(uint32_t)); + INSIST(sizeof(time_t) >= sizeof(uint32_t)); if (t->seconds > (~0U>>1) && seconds <= (time_t)(~0U>>1)) return (ISC_R_RANGE); @@ -366,13 +367,13 @@ isc_time_secondsastimet(const isc_time_t *t, time_t *secondsp) { return (ISC_R_SUCCESS); } -isc_uint32_t +uint32_t isc_time_nanoseconds(const isc_time_t *t) { REQUIRE(t != NULL); ENSURE(t->nanoseconds < NS_PER_S); - return ((isc_uint32_t)t->nanoseconds); + return ((uint32_t)t->nanoseconds); } void diff --git a/lib/isc/win32/condition.c b/lib/isc/win32/condition.c index 31d9aa368d..394034ad58 100644 --- a/lib/isc/win32/condition.c +++ b/lib/isc/win32/condition.c @@ -12,6 +12,8 @@ #include +#include + #include #include #include @@ -234,7 +236,7 @@ isc_result_t isc_condition_waituntil(isc_condition_t *cond, isc_mutex_t *mutex, isc_time_t *t) { DWORD milliseconds; - isc_uint64_t microseconds; + uint64_t microseconds; isc_time_t now; if (isc_time_now(&now) != ISC_R_SUCCESS) { diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c index 11c57c3f5b..082b78926e 100644 --- a/lib/isc/win32/file.c +++ b/lib/isc/win32/file.c @@ -15,6 +15,7 @@ #undef rename #include #include +#include #include #include #include @@ -56,7 +57,7 @@ gettemp(char *path, isc_boolean_t binary, int *doopen) { trv++; /* extra X's get set to 0's */ while (*--trv == 'X') { - isc_uint32_t which = isc_random_uniform(sizeof(alphnum) - 1); + uint32_t which = isc_random_uniform(sizeof(alphnum) - 1); *trv = alphnum[which]; } /* diff --git a/lib/isc/win32/include/isc/Makefile.in b/lib/isc/win32/include/isc/Makefile.in index 024d6b3d0c..1080619153 100644 --- a/lib/isc/win32/include/isc/Makefile.in +++ b/lib/isc/win32/include/isc/Makefile.in @@ -13,7 +13,7 @@ top_srcdir = @top_srcdir@ VERSION=@BIND9_VERSION@ -HEADERS = dir.h int.h keyboard.h mutex.h net.h netdb.h once.h \ +HEADERS = dir.h keyboard.h mutex.h net.h netdb.h once.h \ stat.h stdtime.h thread.h time.h SUBDIRS = diff --git a/lib/isc/win32/include/isc/atomic.h b/lib/isc/win32/include/isc/atomic.h index 800b9458ce..4b3d92dbd4 100644 --- a/lib/isc/win32/include/isc/atomic.h +++ b/lib/isc/win32/include/isc/atomic.h @@ -13,7 +13,8 @@ #ifndef ISC_ATOMIC_H #define ISC_ATOMIC_H 1 -#include +#include + #include #include @@ -22,16 +23,16 @@ * returns the previous value. */ #ifdef ISC_PLATFORM_HAVEXADD -static __inline isc_int32_t -isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) { - return (isc_int32_t) _InterlockedExchangeAdd((long *)p, (long)val); +static __inline int32_t +isc_atomic_xadd(int32_t *p, int32_t val) { + return (int32_t) _InterlockedExchangeAdd((long *)p, (long)val); } #endif #ifdef ISC_PLATFORM_HAVEXADDQ -static __inline isc_int64_t -isc_atomic_xaddq(isc_int64_t *p, isc_int64_t val) { - return (isc_int64_t) _InterlockedExchangeAdd64((__int64 *)p, +static __inline int64_t +isc_atomic_xaddq(int64_t *p, int64_t val) { + return (int64_t) _InterlockedExchangeAdd64((__int64 *)p, (__int64) val); } #endif @@ -41,7 +42,7 @@ isc_atomic_xaddq(isc_int64_t *p, isc_int64_t val) { */ #ifdef ISC_PLATFORM_HAVEATOMICSTORE static __inline void -isc_atomic_store(isc_int32_t *p, isc_int32_t val) { +isc_atomic_store(int32_t *p, int32_t val) { (void) _InterlockedExchange((long *)p, (long)val); } #endif @@ -51,7 +52,7 @@ isc_atomic_store(isc_int32_t *p, isc_int32_t val) { */ #ifdef ISC_PLATFORM_HAVEATOMICSTOREQ static __inline void -isc_atomic_storeq(isc_int64_t *p, isc_int64_t val) { +isc_atomic_storeq(int64_t *p, int64_t val) { (void) _InterlockedExchange64((__int64 *)p, (__int64)val); } #endif @@ -62,10 +63,10 @@ isc_atomic_storeq(isc_int64_t *p, isc_int64_t val) { * case. */ #ifdef ISC_PLATFORM_HAVECMPXCHG -static __inline isc_int32_t -isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) { +static __inline int32_t +isc_atomic_cmpxchg(int32_t *p, int32_t cmpval, int32_t val) { /* beware: swap arguments */ - return (isc_int32_t) _InterlockedCompareExchange((long *)p, + return (int32_t) _InterlockedCompareExchange((long *)p, (long)val, (long)cmpval); } diff --git a/lib/isc/win32/include/isc/int.h b/lib/isc/win32/include/isc/int.h deleted file mode 100644 index c71f8a46ba..0000000000 --- a/lib/isc/win32/include/isc/int.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -/* $Id: int.h,v 1.13 2007/06/19 23:47:20 tbox Exp $ */ - -#ifndef ISC_INT_H -#define ISC_INT_H 1 - -#define _INTEGRAL_MAX_BITS 64 -#include - -typedef __int8 isc_int8_t; -typedef unsigned __int8 isc_uint8_t; -typedef __int16 isc_int16_t; -typedef unsigned __int16 isc_uint16_t; -typedef __int32 isc_int32_t; -typedef unsigned __int32 isc_uint32_t; -typedef __int64 isc_int64_t; -typedef unsigned __int64 isc_uint64_t; - -#define ISC_INT8_MIN -128 -#define ISC_INT8_MAX 127 -#define ISC_UINT8_MAX 255 - -#define ISC_INT16_MIN -32768 -#define ISC_INT16_MAX 32767 -#define ISC_UINT16_MAX 65535 - -/* - * Note that "int" is 32 bits on all currently supported Unix-like operating - * systems, but "long" can be either 32 bits or 64 bits, thus the 32 bit - * constants are not qualified with "L". - */ -#define ISC_INT32_MIN _I32_MIN -#define ISC_INT32_MAX _I32_MAX -#define ISC_UINT32_MAX _UI32_MAX - -#define ISC_INT64_MIN _I64_MIN -#define ISC_INT64_MAX _I64_MAX -#define ISC_UINT64_MAX _UI64_MAX - -#endif /* ISC_INT_H */ diff --git a/lib/isc/win32/include/isc/net.h b/lib/isc/win32/include/isc/net.h index 00a38db2dc..8494bcccb1 100644 --- a/lib/isc/win32/include/isc/net.h +++ b/lib/isc/win32/include/isc/net.h @@ -62,6 +62,8 @@ /*** *** Imports. ***/ +#include + #include /* @@ -114,7 +116,7 @@ struct in6_pktinfo { * Ensure type in_port_t is defined. */ #ifdef ISC_PLATFORM_NEEDPORTT -typedef isc_uint16_t in_port_t; +typedef uint16_t in_port_t; #endif /* @@ -126,14 +128,14 @@ typedef isc_uint16_t in_port_t; #define ISC_PLATFORM_RECVOVERFLOW #endif -#define ISC__IPADDR(x) ((isc_uint32_t)htonl((isc_uint32_t)(x))) +#define ISC__IPADDR(x) ((uint32_t)htonl((uint32_t)(x))) #define ISC_IPADDR_ISMULTICAST(i) \ - (((isc_uint32_t)(i) & ISC__IPADDR(0xf0000000)) \ + (((uint32_t)(i) & ISC__IPADDR(0xf0000000)) \ == ISC__IPADDR(0xe0000000)) #define ISC_IPADDR_ISEXPERIMENTAL(i) \ - (((isc_uint32_t)(i) & ISC__IPADDR(0xf0000000)) \ + (((uint32_t)(i) & ISC__IPADDR(0xf0000000)) \ == ISC__IPADDR(0xf0000000)) /* diff --git a/lib/isc/win32/include/isc/stdtime.h b/lib/isc/win32/include/isc/stdtime.h index 0a241c5c75..e11647f3c7 100644 --- a/lib/isc/win32/include/isc/stdtime.h +++ b/lib/isc/win32/include/isc/stdtime.h @@ -14,14 +14,14 @@ #define ISC_STDTIME_H 1 #include -#include +#include /* * It's public information that 'isc_stdtime_t' is an unsigned integral type. * Applications that want maximum portability should not assume anything * about its size. */ -typedef isc_uint32_t isc_stdtime_t; +typedef uint32_t isc_stdtime_t; /* but this flag helps... */ #define STDTIME_ON_32BITS 1 @@ -31,7 +31,7 @@ typedef isc_uint32_t isc_stdtime_t; * type should only be used as an opaque integer (e.g.,) to compare two * time values. */ -typedef isc_uint32_t isc_stdtime32_t; +typedef uint32_t isc_stdtime32_t; ISC_LANG_BEGINDECLS diff --git a/lib/isc/win32/include/isc/time.h b/lib/isc/win32/include/isc/time.h index ffdd62100f..631dd019c4 100644 --- a/lib/isc/win32/include/isc/time.h +++ b/lib/isc/win32/include/isc/time.h @@ -13,6 +13,7 @@ #ifndef ISC_TIME_H #define ISC_TIME_H 1 +#include #include #include @@ -29,7 +30,7 @@ * The contents are exposed only to allow callers to avoid dynamic allocation. */ struct isc_interval { - isc_int64_t interval; + int64_t interval; }; LIBISC_EXTERNAL_DATA extern const isc_interval_t * const isc_interval_zero; @@ -210,7 +211,7 @@ isc_time_subtract(const isc_time_t *t, const isc_interval_t *i, * The interval is larger than the time since the epoch. */ -isc_uint64_t +uint64_t isc_time_microdiff(const isc_time_t *t1, const isc_time_t *t2); /* * Find the difference in milliseconds between time t1 and time t2. @@ -234,7 +235,7 @@ isc_time_parsehttptimestamp(char *input, isc_time_t *t); *\li 'buf' and 't' are not NULL. */ -isc_uint32_t +uint32_t isc_time_nanoseconds(const isc_time_t *t); /* * Return the number of nanoseconds stored in a time structure. @@ -359,7 +360,7 @@ isc_time_formatshorttimestamp(const isc_time_t *t, char *buf, unsigned int len); * */ -isc_uint32_t +uint32_t isc_time_seconds(const isc_time_t *t); /*%< * Return the number of seconds since the epoch stored in a time structure. diff --git a/lib/isc/win32/libisc.vcxproj.filters.in b/lib/isc/win32/libisc.vcxproj.filters.in index 75c578da12..8eab0bd792 100644 --- a/lib/isc/win32/libisc.vcxproj.filters.in +++ b/lib/isc/win32/libisc.vcxproj.filters.in @@ -307,9 +307,6 @@ Win32 Header Files - - Win32 Header Files - Win32 Header Files diff --git a/lib/isc/win32/libisc.vcxproj.in b/lib/isc/win32/libisc.vcxproj.in index c0a8fd1c64..62eba68722 100644 --- a/lib/isc/win32/libisc.vcxproj.in +++ b/lib/isc/win32/libisc.vcxproj.in @@ -391,7 +391,6 @@ copy InstallFiles ..\Build\Release\ - diff --git a/lib/isc/win32/meminfo.c b/lib/isc/win32/meminfo.c index 644ba4e5e2..51077f6ebc 100644 --- a/lib/isc/win32/meminfo.c +++ b/lib/isc/win32/meminfo.c @@ -11,15 +11,16 @@ #include +#include #include #include -isc_uint64_t +uint64_t isc_meminfo_totalphys(void) { MEMORYSTATUSEX statex; statex.dwLength = sizeof(statex); GlobalMemoryStatusEx(&statex); - return ((isc_uint64_t)statex.ullTotalPhys); + return ((uint64_t)statex.ullTotalPhys); } diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c index e125a7d52d..a6d0cde679 100644 --- a/lib/isc/win32/socket.c +++ b/lib/isc/win32/socket.c @@ -37,6 +37,7 @@ #include #include +#include #include #include #include @@ -3926,8 +3927,8 @@ isc__socket_cleanunix(const isc_sockaddr_t *addr, isc_boolean_t active) { } isc_result_t -isc__socket_permunix(const isc_sockaddr_t *addr, isc_uint32_t perm, - isc_uint32_t owner, isc_uint32_t group) +isc__socket_permunix(const isc_sockaddr_t *addr, uint32_t perm, + uint32_t owner, uint32_t group) { UNUSED(addr); UNUSED(perm); @@ -3967,7 +3968,7 @@ isc__socket_getfd(isc_socket_t *socket) { } void -isc__socketmgr_setreserved(isc_socketmgr_t *manager, isc_uint32_t reserved) { +isc__socketmgr_setreserved(isc_socketmgr_t *manager, uint32_t reserved) { UNUSED(manager); UNUSED(reserved); } diff --git a/lib/isc/win32/time.c b/lib/isc/win32/time.c index 8fa98c0441..ea9241ca74 100644 --- a/lib/isc/win32/time.c +++ b/lib/isc/win32/time.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -195,7 +196,7 @@ isc_time_subtract(const isc_time_t *t, const isc_interval_t *i, return (ISC_R_SUCCESS); } -isc_uint64_t +uint64_t isc_time_microdiff(const isc_time_t *t1, const isc_time_t *t2) { ULARGE_INTEGER i1, i2; LONGLONG i3; @@ -218,7 +219,7 @@ isc_time_microdiff(const isc_time_t *t1, const isc_time_t *t2) { return (i3); } -isc_uint32_t +uint32_t isc_time_seconds(const isc_time_t *t) { SYSTEMTIME epoch1970 = { 1970, 1, 4, 1, 0, 0, 0, 0 }; FILETIME temp; @@ -234,7 +235,7 @@ isc_time_seconds(const isc_time_t *t) { i3 = (i1.QuadPart - i2.QuadPart) / 10000000; - return ((isc_uint32_t)i3); + return ((uint32_t)i3); } isc_result_t @@ -245,8 +246,8 @@ isc_time_secondsastimet(const isc_time_t *t, time_t *secondsp) { seconds = (time_t)isc_time_seconds(t); - INSIST(sizeof(unsigned int) == sizeof(isc_uint32_t)); - INSIST(sizeof(time_t) >= sizeof(isc_uint32_t)); + INSIST(sizeof(unsigned int) == sizeof(uint32_t)); + INSIST(sizeof(time_t) >= sizeof(uint32_t)); if (isc_time_seconds(t) > (~0U>>1) && seconds <= (time_t)(~0U>>1)) return (ISC_R_RANGE); @@ -257,13 +258,13 @@ isc_time_secondsastimet(const isc_time_t *t, time_t *secondsp) { } -isc_uint32_t +uint32_t isc_time_nanoseconds(const isc_time_t *t) { ULARGE_INTEGER i; i.LowPart = t->absolute.dwLowDateTime; i.HighPart = t->absolute.dwHighDateTime; - return ((isc_uint32_t)(i.QuadPart % 10000000) * 100); + return ((uint32_t)(i.QuadPart % 10000000) * 100); } void diff --git a/lib/isc/x86_32/include/isc/atomic.h b/lib/isc/x86_32/include/isc/atomic.h index 6b0555ec30..8bcc8b08e6 100644 --- a/lib/isc/x86_32/include/isc/atomic.h +++ b/lib/isc/x86_32/include/isc/atomic.h @@ -13,6 +13,8 @@ #ifndef ISC_ATOMIC_H #define ISC_ATOMIC_H 1 +#include + #include #include @@ -21,9 +23,9 @@ * This routine atomically increments the value stored in 'p' by 'val', and * returns the previous value. */ -static __inline__ isc_int32_t -isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) { - isc_int32_t prev = val; +static __inline__ int32_t +isc_atomic_xadd(int32_t *p, int32_t val) { + int32_t prev = val; __asm__ volatile( #ifdef ISC_PLATFORM_USETHREADS @@ -38,9 +40,9 @@ isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) { } #ifdef ISC_PLATFORM_HAVEXADDQ -static __inline__ isc_int64_t -isc_atomic_xaddq(isc_int64_t *p, isc_int64_t val) { - isc_int64_t prev = val; +static __inline__ int64_t +isc_atomic_xaddq(int64_t *p, int64_t val) { + int64_t prev = val; __asm__ volatile( #ifdef ISC_PLATFORM_USETHREADS @@ -59,7 +61,7 @@ isc_atomic_xaddq(isc_int64_t *p, isc_int64_t val) { * This routine atomically stores the value 'val' in 'p' (32-bit version). */ static __inline__ void -isc_atomic_store(isc_int32_t *p, isc_int32_t val) { +isc_atomic_store(int32_t *p, int32_t val) { __asm__ volatile( #ifdef ISC_PLATFORM_USETHREADS /* @@ -80,7 +82,7 @@ isc_atomic_store(isc_int32_t *p, isc_int32_t val) { * This routine atomically stores the value 'val' in 'p' (64-bit version). */ static __inline__ void -isc_atomic_storeq(isc_int64_t *p, isc_int64_t val) { +isc_atomic_storeq(int64_t *p, int64_t val) { __asm__ volatile( #ifdef ISC_PLATFORM_USETHREADS /* @@ -102,8 +104,8 @@ isc_atomic_storeq(isc_int64_t *p, isc_int64_t val) { * original value is equal to 'cmpval'. The original value is returned in any * case. */ -static __inline__ isc_int32_t -isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) { +static __inline__ int32_t +isc_atomic_cmpxchg(int32_t *p, int32_t cmpval, int32_t val) { __asm__ volatile( #ifdef ISC_PLATFORM_USETHREADS "lock;" @@ -124,8 +126,8 @@ isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) { * positions of the stack frame, which would not actually point to the * intended address in the embedded mnemonic. */ -static isc_int32_t -isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) { +static int32_t +isc_atomic_xadd(int32_t *p, int32_t val) { (void)(p); (void)(val); @@ -147,7 +149,7 @@ isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) { } static void -isc_atomic_store(isc_int32_t *p, isc_int32_t val) { +isc_atomic_store(int32_t *p, int32_t val) { (void)(p); (void)(val); @@ -161,8 +163,8 @@ isc_atomic_store(isc_int32_t *p, isc_int32_t val) { ); } -static isc_int32_t -isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) { +static int32_t +isc_atomic_cmpxchg(int32_t *p, int32_t cmpval, int32_t val) { (void)(p); (void)(cmpval); (void)(val); diff --git a/lib/isc/x86_64/include/isc/atomic.h b/lib/isc/x86_64/include/isc/atomic.h index 8d68574aad..b2d7880f6f 100644 --- a/lib/isc/x86_64/include/isc/atomic.h +++ b/lib/isc/x86_64/include/isc/atomic.h @@ -13,6 +13,8 @@ #ifndef ISC_ATOMIC_H #define ISC_ATOMIC_H 1 +#include + #include #include @@ -30,8 +32,8 @@ * intended address or value in the embedded mnemonic. */ -static isc_int32_t -isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) { +static int32_t +isc_atomic_xadd(int32_t *p, int32_t val) { (void)(p); (void)(val); @@ -49,8 +51,8 @@ isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) { } #ifdef ISC_PLATFORM_HAVEXADDQ -static isc_int64_t -isc_atomic_xaddq(isc_int64_t *p, isc_int64_t val) { +static int64_t +isc_atomic_xaddq(int64_t *p, int64_t val) { (void)(p); (void)(val); @@ -69,7 +71,7 @@ isc_atomic_xaddq(isc_int64_t *p, isc_int64_t val) { #endif static void -isc_atomic_store(isc_int32_t *p, isc_int32_t val) { +isc_atomic_store(int32_t *p, int32_t val) { (void)(p); (void)(val); @@ -85,7 +87,7 @@ isc_atomic_store(isc_int32_t *p, isc_int32_t val) { #ifdef ISC_PLATFORM_HAVEATOMICSTOREQ static void -isc_atomic_storeq(isc_int64_t *p, isc_int64_t val) { +isc_atomic_storeq(int64_t *p, int64_t val) { (void)(p); (void)(val); @@ -100,8 +102,8 @@ isc_atomic_storeq(isc_int64_t *p, isc_int64_t val) { } #endif -static isc_int32_t -isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) { +static int32_t +isc_atomic_cmpxchg(int32_t *p, int32_t cmpval, int32_t val) { (void)(p); (void)(cmpval); (void)(val); diff --git a/lib/isc/xoshiro128starstar.c b/lib/isc/xoshiro128starstar.c index e2466dd54c..7b47f95665 100644 --- a/lib/isc/xoshiro128starstar.c +++ b/lib/isc/xoshiro128starstar.c @@ -22,7 +22,7 @@ #include -#include +#include /* * This is xoshiro128** 1.0, our 32-bit all-purpose, rock-solid generator. @@ -70,15 +70,15 @@ static pthread_mutex_t _mutex = PTHREAD_MUTEX_INITIALIZER; #define _UNLOCK() #endif -static inline isc_uint32_t rotl(const isc_uint32_t x, int k) { +static inline uint32_t rotl(const uint32_t x, int k) { return (x << k) | (x >> (32 - k)); } -static isc_uint32_t seed[4]; +static uint32_t seed[4]; -static inline isc_uint32_t +static inline uint32_t next(void) { - isc_uint32_t result_starstar, t; + uint32_t result_starstar, t; _LOCK(); diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c index 0ea5093565..eff1e9d06f 100644 --- a/lib/isccc/cc.c +++ b/lib/isccc/cc.c @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -217,7 +218,7 @@ table_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer) { result = isc_buffer_reserve(buffer, 1 + len); if (result != ISC_R_SUCCESS) return (ISC_R_NOSPACE); - isc_buffer_putuint8(*buffer, (isc_uint8_t)len); + isc_buffer_putuint8(*buffer, (uint8_t)len); isc_buffer_putmem(*buffer, (const unsigned char *) ks, len); /* * Emit the value. @@ -246,7 +247,7 @@ list_towire(isccc_sexpr_t *list, isc_buffer_t **buffer) { static isc_result_t sign(unsigned char *data, unsigned int length, unsigned char *hmac, - isc_uint32_t algorithm, isccc_region_t *secret) + uint32_t algorithm, isccc_region_t *secret) { union { isc_hmacmd5_t hmd5; @@ -336,7 +337,7 @@ sign(unsigned char *data, unsigned int length, unsigned char *hmac, isc_result_t isccc_cc_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer, - isc_uint32_t algorithm, isccc_region_t *secret) + uint32_t algorithm, isccc_region_t *secret) { unsigned int hmac_base, signed_base; isc_result_t result; @@ -398,7 +399,7 @@ isccc_cc_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer, static isc_result_t verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, - isc_uint32_t algorithm, isccc_region_t *secret) + uint32_t algorithm, isccc_region_t *secret) { union { isc_hmacmd5_t hmd5; @@ -512,7 +513,7 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, } else { isccc_region_t *region; unsigned char *value; - isc_uint32_t valalg; + uint32_t valalg; region = isccc_sexpr_tobinary(hmac); @@ -534,7 +535,7 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, static isc_result_t table_fromwire(isccc_region_t *source, isccc_region_t *secret, - isc_uint32_t algorithm, isccc_sexpr_t **alistp); + uint32_t algorithm, isccc_sexpr_t **alistp); static isc_result_t list_fromwire(isccc_region_t *source, isccc_sexpr_t **listp); @@ -542,7 +543,7 @@ list_fromwire(isccc_region_t *source, isccc_sexpr_t **listp); static isc_result_t value_fromwire(isccc_region_t *source, isccc_sexpr_t **valuep) { unsigned int msgtype; - isc_uint32_t len; + uint32_t len; isccc_sexpr_t *value; isccc_region_t active; isc_result_t result; @@ -575,10 +576,10 @@ value_fromwire(isccc_region_t *source, isccc_sexpr_t **valuep) { static isc_result_t table_fromwire(isccc_region_t *source, isccc_region_t *secret, - isc_uint32_t algorithm, isccc_sexpr_t **alistp) + uint32_t algorithm, isccc_sexpr_t **alistp) { char key[256]; - isc_uint32_t len; + uint32_t len; isc_result_t result; isccc_sexpr_t *alist, *value; isc_boolean_t first_tag; @@ -660,10 +661,10 @@ list_fromwire(isccc_region_t *source, isccc_sexpr_t **listp) { isc_result_t isccc_cc_fromwire(isccc_region_t *source, isccc_sexpr_t **alistp, - isc_uint32_t algorithm, isccc_region_t *secret) + uint32_t algorithm, isccc_region_t *secret) { unsigned int size; - isc_uint32_t version; + uint32_t version; size = REGION_SIZE(*source); if (size < 4) @@ -676,8 +677,8 @@ isccc_cc_fromwire(isccc_region_t *source, isccc_sexpr_t **alistp, } static isc_result_t -createmessage(isc_uint32_t version, const char *from, const char *to, - isc_uint32_t serial, isccc_time_t now, +createmessage(uint32_t version, const char *from, const char *to, + uint32_t serial, isccc_time_t now, isccc_time_t expires, isccc_sexpr_t **alistp, isc_boolean_t want_expires) { @@ -734,8 +735,8 @@ createmessage(isc_uint32_t version, const char *from, const char *to, } isc_result_t -isccc_cc_createmessage(isc_uint32_t version, const char *from, const char *to, - isc_uint32_t serial, isccc_time_t now, +isccc_cc_createmessage(uint32_t version, const char *from, const char *to, + uint32_t serial, isccc_time_t now, isccc_time_t expires, isccc_sexpr_t **alistp) { return (createmessage(version, from, to, serial, now, expires, @@ -747,7 +748,7 @@ isccc_cc_createack(isccc_sexpr_t *message, isc_boolean_t ok, isccc_sexpr_t **ackp) { char *_frm, *_to; - isc_uint32_t serial; + uint32_t serial; isccc_sexpr_t *ack, *_ctrl; isc_result_t result; isccc_time_t t; @@ -823,7 +824,7 @@ isccc_cc_createresponse(isccc_sexpr_t *message, isccc_time_t now, isccc_time_t expires, isccc_sexpr_t **alistp) { char *_frm, *_to, *type = NULL; - isc_uint32_t serial; + uint32_t serial; isccc_sexpr_t *alist, *_ctrl, *_data; isc_result_t result; @@ -892,7 +893,7 @@ isccc_cc_definestring(isccc_sexpr_t *alist, const char *key, const char *str) { } isccc_sexpr_t * -isccc_cc_defineuint32(isccc_sexpr_t *alist, const char *key, isc_uint32_t i) { +isccc_cc_defineuint32(isccc_sexpr_t *alist, const char *key, uint32_t i) { char b[100]; size_t len; isccc_region_t r; @@ -927,7 +928,7 @@ isccc_cc_lookupstring(isccc_sexpr_t *alist, const char *key, char **strp) { isc_result_t isccc_cc_lookupuint32(isccc_sexpr_t *alist, const char *key, - isc_uint32_t *uintp) + uint32_t *uintp) { isccc_sexpr_t *kv, *v; @@ -936,7 +937,7 @@ isccc_cc_lookupuint32(isccc_sexpr_t *alist, const char *key, v = ISCCC_SEXPR_CDR(kv); if (isccc_sexpr_binaryp(v)) { if (uintp != NULL) - *uintp = (isc_uint32_t) + *uintp = (uint32_t) strtoul(isccc_sexpr_tostring(v), NULL, 10); return (ISC_R_SUCCESS); diff --git a/lib/isccc/ccmsg.c b/lib/isccc/ccmsg.c index efe3738a1b..4cfa52818b 100644 --- a/lib/isccc/ccmsg.c +++ b/lib/isccc/ccmsg.c @@ -28,6 +28,8 @@ #include +#include + #include #include #include @@ -182,7 +184,7 @@ isccc_ccmsg_readmessage(isccc_ccmsg_t *ccmsg, NULL, NULL); region.base = (unsigned char *)&ccmsg->size; - region.length = 4; /* isc_uint32_t */ + region.length = 4; /* uint32_t */ result = isc_socket_recv(ccmsg->sock, ®ion, 0, ccmsg->task, recv_length, ccmsg); diff --git a/lib/isccc/include/isccc/cc.h b/lib/isccc/include/isccc/cc.h index 2891111a92..98ef9d65ad 100644 --- a/lib/isccc/include/isccc/cc.h +++ b/lib/isccc/include/isccc/cc.h @@ -29,6 +29,8 @@ /*! \file isccc/cc.h */ +#include + #include #include #include @@ -60,17 +62,17 @@ ISC_LANG_BEGINDECLS /*% Send to Wire */ isc_result_t isccc_cc_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer, - isc_uint32_t algorithm, isccc_region_t *secret); + uint32_t algorithm, isccc_region_t *secret); /*% Get From Wire */ isc_result_t isccc_cc_fromwire(isccc_region_t *source, isccc_sexpr_t **alistp, - isc_uint32_t algorithm, isccc_region_t *secret); + uint32_t algorithm, isccc_region_t *secret); /*% Create Message */ isc_result_t -isccc_cc_createmessage(isc_uint32_t version, const char *from, const char *to, - isc_uint32_t serial, isccc_time_t now, +isccc_cc_createmessage(uint32_t version, const char *from, const char *to, + uint32_t serial, isccc_time_t now, isccc_time_t expires, isccc_sexpr_t **alistp); /*% Create Acknowledgment */ @@ -97,7 +99,7 @@ isccc_cc_definestring(isccc_sexpr_t *alist, const char *key, const char *str); /*% Define uint 32 */ isccc_sexpr_t * -isccc_cc_defineuint32(isccc_sexpr_t *alist, const char *key, isc_uint32_t i); +isccc_cc_defineuint32(isccc_sexpr_t *alist, const char *key, uint32_t i); /*% Lookup String */ isc_result_t @@ -106,7 +108,7 @@ isccc_cc_lookupstring(isccc_sexpr_t *alist, const char *key, char **strp); /*% Lookup uint 32 */ isc_result_t isccc_cc_lookupuint32(isccc_sexpr_t *alist, const char *key, - isc_uint32_t *uintp); + uint32_t *uintp); /*% Create Symbol Table */ isc_result_t diff --git a/lib/isccc/include/isccc/ccmsg.h b/lib/isccc/include/isccc/ccmsg.h index 56f7237b1c..230d985c24 100644 --- a/lib/isccc/include/isccc/ccmsg.h +++ b/lib/isccc/include/isccc/ccmsg.h @@ -29,6 +29,8 @@ /*! \file isccc/ccmsg.h */ +#include + #include #include #include @@ -37,7 +39,7 @@ typedef struct isccc_ccmsg { /* private (don't touch!) */ unsigned int magic; - isc_uint32_t size; + uint32_t size; isc_buffer_t buffer; unsigned int maxsize; isc_mem_t *mctx; diff --git a/lib/isccc/include/isccc/types.h b/lib/isccc/include/isccc/types.h index c06fef0821..3c1dc04a0f 100644 --- a/lib/isccc/include/isccc/types.h +++ b/lib/isccc/include/isccc/types.h @@ -29,12 +29,13 @@ /*! \file isccc/types.h */ +#include + #include -#include #include /*% isccc_time_t typedef */ -typedef isc_uint32_t isccc_time_t; +typedef uint32_t isccc_time_t; /*% isccc_sexpr_t typedef */ typedef struct isccc_sexpr isccc_sexpr_t; diff --git a/lib/isccc/include/isccc/util.h b/lib/isccc/include/isccc/util.h index 63a3b4512f..58e69b3335 100644 --- a/lib/isccc/include/isccc/util.h +++ b/lib/isccc/include/isccc/util.h @@ -27,6 +27,8 @@ #ifndef ISCCC_UTIL_H #define ISCCC_UTIL_H 1 +#include + #include /*! \file isccc/util.h @@ -68,14 +70,14 @@ #define GET64(v, w) \ do { \ - v = (isc_uint64_t)w[0] << 56; \ - v |= (isc_uint64_t)w[1] << 48; \ - v |= (isc_uint64_t)w[2] << 40; \ - v |= (isc_uint64_t)w[3] << 32; \ - v |= (isc_uint64_t)w[4] << 24; \ - v |= (isc_uint64_t)w[5] << 16; \ - v |= (isc_uint64_t)w[6] << 8; \ - v |= (isc_uint64_t)w[7]; \ + v = (uint64_t)w[0] << 56; \ + v |= (uint64_t)w[1] << 48; \ + v |= (uint64_t)w[2] << 40; \ + v |= (uint64_t)w[3] << 32; \ + v |= (uint64_t)w[4] << 24; \ + v |= (uint64_t)w[5] << 16; \ + v |= (uint64_t)w[6] << 8; \ + v |= (uint64_t)w[7]; \ w += 8; \ } while (0) diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c index f9289d84be..fbdbc2eabc 100644 --- a/lib/isccfg/aclconf.c +++ b/lib/isccfg/aclconf.c @@ -11,6 +11,8 @@ #include +#include + #include #include #include /* Required for HP/UX (and others?) */ @@ -218,11 +220,11 @@ convert_keyname(const cfg_obj_t *keyobj, isc_log_t *lctx, isc_mem_t *mctx, static isc_result_t count_acl_elements(const cfg_obj_t *caml, const cfg_obj_t *cctx, isc_log_t *lctx, cfg_aclconfctx_t *ctx, isc_mem_t *mctx, - isc_uint32_t *count, isc_boolean_t *has_negative) + uint32_t *count, isc_boolean_t *has_negative) { const cfg_listelt_t *elt; isc_result_t result; - isc_uint32_t n = 0; + uint32_t n = 0; REQUIRE(count != NULL); @@ -249,7 +251,7 @@ count_acl_elements(const cfg_obj_t *caml, const cfg_obj_t *cctx, n++; } else if (cfg_obj_islist(ce)) { isc_boolean_t negative; - isc_uint32_t sub; + uint32_t sub; result = count_acl_elements(ce, cctx, lctx, ctx, mctx, &sub, &negative); if (result != ISC_R_SUCCESS) @@ -624,7 +626,7 @@ isc_result_t cfg_acl_fromconfig2(const cfg_obj_t *caml, const cfg_obj_t *cctx, isc_log_t *lctx, cfg_aclconfctx_t *ctx, isc_mem_t *mctx, unsigned int nest_level, - isc_uint16_t family, dns_acl_t **target) + uint16_t family, dns_acl_t **target) { isc_result_t result; dns_acl_t *dacl = NULL, *inneracl = NULL; @@ -656,7 +658,7 @@ cfg_acl_fromconfig2(const cfg_obj_t *caml, const cfg_obj_t *cctx, * elements table. (Note that if nest_level is nonzero, * *everything* goes in the elements table.) */ - isc_uint32_t nelem; + uint32_t nelem; if (nest_level == 0) { result = count_acl_elements(caml, cctx, lctx, ctx, diff --git a/lib/isccfg/include/isccfg/aclconf.h b/lib/isccfg/include/isccfg/aclconf.h index 78a16dbcf0..4108a0f775 100644 --- a/lib/isccfg/include/isccfg/aclconf.h +++ b/lib/isccfg/include/isccfg/aclconf.h @@ -13,6 +13,8 @@ #ifndef ISCCFG_ACLCONF_H #define ISCCFG_ACLCONF_H 1 +#include + #include #include @@ -66,7 +68,7 @@ isc_result_t cfg_acl_fromconfig2(const cfg_obj_t *caml, const cfg_obj_t *cctx, isc_log_t *lctx, cfg_aclconfctx_t *ctx, isc_mem_t *mctx, unsigned int nest_level, - isc_uint16_t family, dns_acl_t **target); + uint16_t family, dns_acl_t **target); /* * Construct a new dns_acl_t from configuration data in 'caml' and * 'cctx'. Memory is allocated through 'mctx'. diff --git a/lib/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h index ac4b122de1..d02b40e00b 100644 --- a/lib/isccfg/include/isccfg/cfg.h +++ b/lib/isccfg/include/isccfg/cfg.h @@ -25,6 +25,8 @@ *** Imports ***/ +#include + #include #include #include @@ -274,7 +276,7 @@ cfg_obj_isuint32(const cfg_obj_t *obj); * Return true iff 'obj' is of integer type. */ -isc_uint32_t +uint32_t cfg_obj_asuint32(const cfg_obj_t *obj); /*%< * Returns the value of a configuration object of 32-bit integer type. @@ -292,7 +294,7 @@ cfg_obj_isuint64(const cfg_obj_t *obj); * Return true iff 'obj' is of integer type. */ -isc_uint64_t +uint64_t cfg_obj_asuint64(const cfg_obj_t *obj); /*%< * Returns the value of a configuration object of 64-bit integer type. @@ -304,7 +306,7 @@ cfg_obj_asuint64(const cfg_obj_t *obj); * \li A 64-bit unsigned integer. */ -isc_uint32_t +uint32_t cfg_obj_asfixedpoint(const cfg_obj_t *obj); /*%< * Returns the value of a configuration object of fixed point number. @@ -316,7 +318,7 @@ cfg_obj_asfixedpoint(const cfg_obj_t *obj); * \li A 32-bit unsigned integer. */ -isc_uint32_t +uint32_t cfg_obj_aspercentage(const cfg_obj_t *obj); /*%< * Returns the value of a configuration object of percentage diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h index b0f2d761e2..1ceda8cbb9 100644 --- a/lib/isccfg/include/isccfg/grammar.h +++ b/lib/isccfg/include/isccfg/grammar.h @@ -14,6 +14,8 @@ /*! \file isccfg/grammar.h */ +#include + #include #include #include @@ -164,8 +166,8 @@ struct cfg_rep { struct cfg_obj { const cfg_type_t *type; union { - isc_uint32_t uint32; - isc_uint64_t uint64; + uint32_t uint32; + uint64_t uint64; isc_textregion_t string; /*%< null terminated, too */ isc_boolean_t boolean; cfg_map_t map; diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index 397ceafc11..4107b25344 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -13,6 +13,7 @@ #include +#include #include #include @@ -2558,8 +2559,8 @@ static isc_result_t parse_unitstring(char *str, isc_resourcevalue_t *valuep) { char *endp; unsigned int len; - isc_uint64_t value; - isc_uint64_t unit; + uint64_t value; + uint64_t unit; value = strtoull(str, &endp, 10); if (*endp == 0) { @@ -2587,7 +2588,7 @@ parse_unitstring(char *str, isc_resourcevalue_t *valuep) { default: return (ISC_R_FAILURE); } - if (value > ISC_UINT64_MAX / unit) + if (value > UINT64_MAX / unit) return (ISC_R_FAILURE); *valuep = value * unit; return (ISC_R_SUCCESS); @@ -2597,7 +2598,7 @@ static isc_result_t parse_sizeval(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; cfg_obj_t *obj = NULL; - isc_uint64_t val; + uint64_t val; UNUSED(type); @@ -2626,8 +2627,8 @@ parse_sizeval_percent(cfg_parser_t *pctx, const cfg_type_t *type, char *endp; isc_result_t result; cfg_obj_t *obj = NULL; - isc_uint64_t val; - isc_uint64_t percent; + uint64_t val; + uint64_t percent; UNUSED(type); @@ -2641,7 +2642,7 @@ parse_sizeval_percent(cfg_parser_t *pctx, const cfg_type_t *type, if (*endp == '%' && *(endp+1) == 0) { CHECK(cfg_create_obj(pctx, &cfg_type_percentage, &obj)); - obj->value.uint32 = (isc_uint32_t)percent; + obj->value.uint32 = (uint32_t)percent; *ret = obj; return (ISC_R_SUCCESS); } else { @@ -3995,7 +3996,7 @@ static isc_result_t parse_ttlval(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; cfg_obj_t *obj = NULL; - isc_uint32_t ttl; + uint32_t ttl; UNUSED(type); diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c index 926a477319..c21829775e 100644 --- a/lib/isccfg/parser.c +++ b/lib/isccfg/parser.c @@ -13,8 +13,8 @@ #include -#include #include +#include #include #include @@ -750,7 +750,7 @@ cfg_parse_percentage(cfg_parser_t *pctx, const cfg_type_t *type, char *endp; isc_result_t result; cfg_obj_t *obj = NULL; - isc_uint64_t percent; + uint64_t percent; REQUIRE(pctx != NULL); REQUIRE(ret != NULL && *ret == NULL); @@ -772,7 +772,7 @@ cfg_parse_percentage(cfg_parser_t *pctx, const cfg_type_t *type, } CHECK(cfg_create_obj(pctx, &cfg_type_percentage, &obj)); - obj->value.uint32 = (isc_uint32_t)percent; + obj->value.uint32 = (uint32_t)percent; *ret = obj; cleanup: @@ -792,7 +792,7 @@ cfg_print_percentage(cfg_printer_t *pctx, const cfg_obj_t *obj) { cfg_print_chars(pctx, buf, strlen(buf)); } -isc_uint32_t +uint32_t cfg_obj_aspercentage(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_percentage); return (obj->value.uint32); @@ -878,7 +878,7 @@ cfg_print_fixedpoint(cfg_printer_t *pctx, const cfg_obj_t *obj) { cfg_print_chars(pctx, buf, strlen(buf)); } -isc_uint32_t +uint32_t cfg_obj_asfixedpoint(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_fixedpoint); return (obj->value.uint32); @@ -946,7 +946,7 @@ cfg_obj_isuint32(const cfg_obj_t *obj) { return (ISC_TF(obj->type->rep == &cfg_rep_uint32)); } -isc_uint32_t +uint32_t cfg_obj_asuint32(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_uint32); return (obj->value.uint32); @@ -967,7 +967,7 @@ cfg_obj_isuint64(const cfg_obj_t *obj) { return (ISC_TF(obj->type->rep == &cfg_rep_uint64)); } -isc_uint64_t +uint64_t cfg_obj_asuint64(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_uint64); return (obj->value.uint64); @@ -2327,7 +2327,7 @@ token_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) { if ((flags & CFG_ADDR_V6OK) != 0 && strlen(s) <= 127U) { char buf[128]; /* see lib/bind9/getaddresses.c */ char *d; /* zone delimiter */ - isc_uint32_t zone = 0; /* scope zone ID */ + uint32_t zone = 0; /* scope zone ID */ strlcpy(buf, s, sizeof(buf)); d = strchr(buf, '%'); diff --git a/lib/ns/client.c b/lib/ns/client.c index c574ba247f..d19444c9c1 100644 --- a/lib/ns/client.c +++ b/lib/ns/client.c @@ -11,6 +11,8 @@ #include +#include + #include #include #include @@ -249,8 +251,8 @@ static isc_result_t get_client(ns_clientmgr_t *manager, ns_interface_t *ifp, dns_dispatch_t *disp, isc_boolean_t tcp); static isc_result_t get_worker(ns_clientmgr_t *manager, ns_interface_t *ifp, isc_socket_t *sock); -static void compute_cookie(ns_client_t *client, isc_uint32_t when, - isc_uint32_t nonce, const unsigned char *secret, +static void compute_cookie(ns_client_t *client, uint32_t when, + uint32_t nonce, const unsigned char *secret, isc_buffer_t *buf); void @@ -870,11 +872,11 @@ client_senddone(isc_task_t *task, isc_event_t *event) { static isc_result_t client_allocsendbuf(ns_client_t *client, isc_buffer_t *buffer, - isc_buffer_t *tcpbuffer, isc_uint32_t length, + isc_buffer_t *tcpbuffer, uint32_t length, unsigned char *sendbuf, unsigned char **datap) { unsigned char *data; - isc_uint32_t bufsize; + uint32_t bufsize; isc_result_t result; INSIST(datap != NULL); @@ -899,7 +901,7 @@ client_allocsendbuf(ns_client_t *client, isc_buffer_t *buffer, } else { isc_buffer_init(buffer, data, TCP_BUFFER_SIZE); INSIST(length <= 0xffff); - isc_buffer_putuint16(buffer, (isc_uint16_t)length); + isc_buffer_putuint16(buffer, (uint16_t)length); } } else { data = sendbuf; @@ -1245,7 +1247,7 @@ client_send(ns_client_t *client) { client->sendcb(&buffer); } else if (TCP_CLIENT(client)) { isc_buffer_usedregion(&buffer, &r); - isc_buffer_putuint16(&tcpbuffer, (isc_uint16_t) r.length); + isc_buffer_putuint16(&tcpbuffer, (uint16_t) r.length); isc_buffer_add(&tcpbuffer, r.length); #ifdef HAVE_DNSTAP if (client->view != NULL) { @@ -1577,7 +1579,7 @@ ns_client_error(ns_client_t *client, isc_result_t result) { */ isc_time_t expire; isc_interval_t i; - isc_uint32_t flags = 0; + uint32_t flags = 0; if ((message->flags & DNS_MESSAGEFLAG_CD) != 0) flags = NS_FAILCACHE_CD; @@ -1603,7 +1605,7 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, isc_result_t result; dns_view_t *view; dns_resolver_t *resolver; - isc_uint16_t udpsize; + uint16_t udpsize; dns_ednsopt_t ednsopts[DNS_EDNSOPTIONS]; int count = 0; unsigned int flags; @@ -1640,7 +1642,7 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, INSIST(count < DNS_EDNSOPTIONS); ednsopts[count].code = DNS_OPT_NSID; - ednsopts[count].length = (isc_uint16_t)strlen(nsidp); + ednsopts[count].length = (uint16_t)strlen(nsidp); ednsopts[count].value = (unsigned char *)nsidp; count++; } @@ -1648,7 +1650,7 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, if ((client->attributes & NS_CLIENTATTR_WANTCOOKIE) != 0) { isc_buffer_t buf; isc_stdtime_t now; - isc_uint32_t nonce; + uint32_t nonce; isc_buffer_init(&buf, cookie, sizeof(cookie)); isc_stdtime_get(&now); @@ -1681,9 +1683,9 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, client->ecs.addr.family == AF_UNSPEC)) { isc_buffer_t buf; - isc_uint8_t addr[16]; - isc_uint32_t plen, addrl; - isc_uint16_t family; + uint8_t addr[16]; + uint32_t plen, addrl; + uint16_t family; /* Add CLIENT-SUBNET option. */ @@ -1741,7 +1743,7 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, isc_buffer_init(&buf, advtimo, sizeof(advtimo)); isc_buffer_putuint16(&buf, - (isc_uint16_t) client->sctx->advertisedtimo); + (uint16_t) client->sctx->advertisedtimo); ednsopts[count].code = DNS_OPT_TCP_KEEPALIVE; ednsopts[count].length = 2; ednsopts[count].value = advtimo; @@ -1777,7 +1779,7 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, } static void -compute_cookie(ns_client_t *client, isc_uint32_t when, isc_uint32_t nonce, +compute_cookie(ns_client_t *client, uint32_t when, uint32_t nonce, const unsigned char *secret, isc_buffer_t *buf) { switch (client->sctx->cookiealg) { @@ -1900,8 +1902,8 @@ process_cookie(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { unsigned char dbuf[COOKIE_SIZE]; unsigned char *old; isc_stdtime_t now; - isc_uint32_t when; - isc_uint32_t nonce; + uint32_t when; + uint32_t nonce; isc_buffer_t db; /* @@ -1987,8 +1989,8 @@ process_cookie(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { static isc_result_t process_ecs(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { - isc_uint16_t family; - isc_uint8_t addrlen, addrbytes, scope, *paddr; + uint16_t family; + uint8_t addrlen, addrbytes, scope, *paddr; isc_netaddr_t caddr; /* @@ -2080,14 +2082,14 @@ process_ecs(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { return (DNS_R_OPTERR); } - paddr = (isc_uint8_t *) &caddr.type; + paddr = (uint8_t *) &caddr.type; if (addrbytes != 0U) { memmove(paddr, isc_buffer_current(buf), addrbytes); isc_buffer_forward(buf, addrbytes); optlen -= addrbytes; if ((addrlen % 8) != 0) { - isc_uint8_t bits = ~0U << (8 - (addrlen % 8)); + uint8_t bits = ~0U << (8 - (addrlen % 8)); bits &= paddr[addrbytes - 1]; if (bits != paddr[addrbytes - 1]) return (DNS_R_OPTERR); @@ -2113,7 +2115,7 @@ process_keytag(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { client->keytag = isc_mem_get(client->mctx, optlen); if (client->keytag != NULL) { - client->keytag_len = (isc_uint16_t)optlen; + client->keytag_len = (uint16_t)optlen; memmove(client->keytag, isc_buffer_current(buf), optlen); } isc_buffer_forward(buf, (unsigned int)optlen); @@ -2125,8 +2127,8 @@ process_opt(ns_client_t *client, dns_rdataset_t *opt) { dns_rdata_t rdata; isc_buffer_t optbuf; isc_result_t result; - isc_uint16_t optcode; - isc_uint16_t optlen; + uint16_t optcode; + uint16_t optlen; /* * Set the client's UDP buffer size. @@ -2143,7 +2145,7 @@ process_opt(ns_client_t *client, dns_rdataset_t *opt) { /* * Get the flags out of the OPT record. */ - client->extflags = (isc_uint16_t)(opt->ttl & 0xFFFF); + client->extflags = (uint16_t)(opt->ttl & 0xFFFF); /* * Do we understand this version of EDNS? @@ -2796,7 +2798,7 @@ ns__client_request(isc_task_t *task, isc_event_t *event) { */ if (client->udpsize > 512) { dns_peer_t *peer = NULL; - isc_uint16_t udpsize = client->view->maxudp; + uint16_t udpsize = client->view->maxudp; (void) dns_peerlist_peerbyaddr(client->view->peers, &netaddr, &peer); if (peer != NULL) diff --git a/lib/ns/include/ns/client.h b/lib/ns/include/ns/client.h index 21ed870a72..702c1ac204 100644 --- a/lib/ns/include/ns/client.h +++ b/lib/ns/include/ns/client.h @@ -54,6 +54,8 @@ *** Imports ***/ +#include + #include #include #include @@ -117,9 +119,9 @@ struct ns_client { isc_socketevent_t * recvevent; unsigned char * recvbuf; dns_rdataset_t * opt; - isc_uint16_t udpsize; - isc_uint16_t extflags; - isc_int16_t ednsversion; /* -1 noedns */ + uint16_t udpsize; + uint16_t extflags; + int16_t ednsversion; /* -1 noedns */ void (*next)(ns_client_t *); void (*shutdown)(void *arg, isc_result_t result); void *shutdown_arg; @@ -165,9 +167,9 @@ struct ns_client { ISC_LINK(ns_client_t) rlink; ISC_QLINK(ns_client_t) ilink; unsigned char cookie[8]; - isc_uint32_t expire; + uint32_t expire; unsigned char *keytag; - isc_uint16_t keytag_len; + uint16_t keytag_len; }; typedef ISC_QUEUE(ns_client_t) client_queue_t; diff --git a/lib/ns/include/ns/server.h b/lib/ns/include/ns/server.h index 1237d9c04c..394d03c40c 100644 --- a/lib/ns/include/ns/server.h +++ b/lib/ns/include/ns/server.h @@ -14,6 +14,8 @@ /*! \file */ +#include + #include #include #include @@ -84,7 +86,7 @@ struct ns_server { isc_quota_t xfroutquota; /*% Test options and other configurables */ - isc_uint32_t options; + uint32_t options; unsigned int delay; unsigned int initialtimo; @@ -94,8 +96,8 @@ struct ns_server { dns_acl_t *blackholeacl; dns_acl_t *keepresporder; - isc_uint16_t udpsize; - isc_uint16_t transfer_tcp_message_size; + uint16_t udpsize; + uint16_t transfer_tcp_message_size; isc_boolean_t interface_auto; dns_tkeyctx_t * tkeyctx; diff --git a/lib/ns/query.c b/lib/ns/query.c index 659038b532..fe53dde299 100644 --- a/lib/ns/query.c +++ b/lib/ns/query.c @@ -13,6 +13,7 @@ #include +#include #include #include @@ -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); diff --git a/lib/ns/tests/nstest.c b/lib/ns/tests/nstest.c index cd2907bf05..dec05716f2 100644 --- a/lib/ns/tests/nstest.c +++ b/lib/ns/tests/nstest.c @@ -13,6 +13,7 @@ #include +#include #include #include #include @@ -806,7 +807,7 @@ ns_test_hook_catch_call(void *hook_data, void *callback_data, * Sleep for 'usec' microseconds. */ void -ns_test_nap(isc_uint32_t usec) { +ns_test_nap(uint32_t usec) { #ifdef HAVE_NANOSLEEP struct timespec ts; diff --git a/lib/ns/tests/nstest.h b/lib/ns/tests/nstest.h index d4bc626787..eda64c593e 100644 --- a/lib/ns/tests/nstest.h +++ b/lib/ns/tests/nstest.h @@ -13,6 +13,8 @@ #include +#include + #include #include #include @@ -103,7 +105,7 @@ void ns_test_cleanup_zone(void); void -ns_test_nap(isc_uint32_t usec); +ns_test_nap(uint32_t usec); isc_result_t ns_test_loaddb(dns_db_t **db, dns_dbtype_t dbtype, const char *origin, diff --git a/lib/ns/tests/query_test.c b/lib/ns/tests/query_test.c index 9df07b3646..b4ca411f3e 100644 --- a/lib/ns/tests/query_test.c +++ b/lib/ns/tests/query_test.c @@ -13,6 +13,8 @@ #include +#include + #include #include @@ -38,7 +40,7 @@ typedef struct { isc_boolean_t cache_entry_present; /* whether a SERVFAIL cache entry matching the query should be present */ - isc_uint32_t cache_entry_flags; /* NS_FAILCACHE_* flags to set for + uint32_t cache_entry_flags; /* NS_FAILCACHE_* flags to set for the SERVFAIL cache entry */ isc_boolean_t servfail_expected; /* whether a cached SERVFAIL is expected to be returned */ diff --git a/lib/ns/update.c b/lib/ns/update.c index 39c0f1130a..7309c3ccc5 100644 --- a/lib/ns/update.c +++ b/lib/ns/update.c @@ -207,7 +207,7 @@ typedef struct rr rr_t; struct rr { /* dns_name_t name; */ - isc_uint32_t ttl; + uint32_t ttl; dns_rdata_t rdata; }; @@ -1441,7 +1441,7 @@ update_soa_serial(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, { dns_difftuple_t *deltuple = NULL; dns_difftuple_t *addtuple = NULL; - isc_uint32_t serial; + uint32_t serial; isc_result_t result; CHECK(dns_db_createsoatuple(db, ver, mctx, DNS_DIFFOP_DEL, &deltuple)); @@ -1487,8 +1487,8 @@ static isc_result_t check_soa_increment(dns_db_t *db, dns_dbversion_t *ver, dns_rdata_t *update_rdata, isc_boolean_t *ok) { - isc_uint32_t db_serial; - isc_uint32_t update_serial; + uint32_t db_serial; + uint32_t update_serial; isc_result_t result; update_serial = dns_soa_getserial(update_rdata); @@ -1945,7 +1945,7 @@ check_dnssec(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, continue; if (tuple->rdata.type == dns_rdatatype_dnskey) { - isc_uint8_t alg; + uint8_t alg; alg = tuple->rdata.data[3]; if (alg == DST_ALG_RSAMD5 || alg == DST_ALG_RSASHA1 || alg == DST_ALG_DSA || alg == DST_ALG_ECC) { @@ -2017,7 +2017,7 @@ add_nsec3param_records(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, isc_boolean_t flag; dns_name_t *name = dns_zone_getorigin(zone); dns_rdatatype_t privatetype = dns_zone_getprivatetype(zone); - isc_uint32_t ttl = 0; + uint32_t ttl = 0; isc_boolean_t ttl_good = ISC_FALSE; update_log(client, zone, ISC_LOG_DEBUG(3), @@ -2344,7 +2344,7 @@ add_signing_records(dns_db_t *db, dns_rdatatype_t privatetype, isc_boolean_t flag; isc_region_t r; isc_result_t result = ISC_R_SUCCESS; - isc_uint16_t keyid; + uint16_t keyid; unsigned char buf[5]; dns_name_t *name = dns_db_origin(db); dns_diff_t temp_diff; @@ -2509,8 +2509,8 @@ update_action(isc_task_t *task, isc_event_t *event) { isc_boolean_t had_dnskey; dns_rdatatype_t privatetype = dns_zone_getprivatetype(zone); dns_ttl_t maxttl = 0; - isc_uint32_t maxrecords; - isc_uint64_t records; + uint32_t maxrecords; + uint64_t records; dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->interface->mgr); INSIST(event->ev_type == DNS_EVENT_UPDATE); @@ -3174,7 +3174,7 @@ update_action(isc_task_t *task, isc_event_t *event) { CHECK(dns_nsec3param_deletechains(db, ver, zone, ISC_TRUE, &diff)); } else if (has_dnskey && isdnssec(db, ver, privatetype)) { - isc_uint32_t interval; + uint32_t interval; dns_update_log_t log; interval = dns_zone_getsigvalidityinterval(zone); @@ -3258,7 +3258,7 @@ update_action(isc_task_t *task, isc_event_t *event) { tuple = ISC_LIST_NEXT(tuple, link)) { isc_region_t r; dns_secalg_t algorithm; - isc_uint16_t keyid; + uint16_t keyid; if (tuple->rdata.type != dns_rdatatype_dnskey) continue; diff --git a/lib/ns/xfrout.c b/lib/ns/xfrout.c index 9884721aa7..cbbf3f3986 100644 --- a/lib/ns/xfrout.c +++ b/lib/ns/xfrout.c @@ -11,6 +11,8 @@ #include +#include + #include #include #include @@ -120,7 +122,7 @@ inc_stats(ns_client_t *client, dns_zone_t *zone, isc_statscounter_t counter) { /*% Log an RR (for debugging) */ static void -log_rr(dns_name_t *name, dns_rdata_t *rdata, isc_uint32_t ttl) { +log_rr(dns_name_t *name, dns_rdata_t *rdata, uint32_t ttl) { isc_result_t result; isc_buffer_t buf; char mem[2000]; @@ -186,7 +188,7 @@ struct rrstream_methods { isc_result_t (*next)(rrstream_t *); void (*current)(rrstream_t *, dns_name_t **, - isc_uint32_t *, + uint32_t *, dns_rdata_t **); void (*pause)(rrstream_t *); void (*destroy)(rrstream_t **); @@ -227,8 +229,8 @@ static rrstream_methods_t ixfr_rrstream_methods; static isc_result_t ixfr_rrstream_create(isc_mem_t *mctx, const char *journal_filename, - isc_uint32_t begin_serial, - isc_uint32_t end_serial, + uint32_t begin_serial, + uint32_t end_serial, rrstream_t **sp) { ixfr_rrstream_t *s; @@ -270,7 +272,7 @@ ixfr_rrstream_next(rrstream_t *rs) { static void ixfr_rrstream_current(rrstream_t *rs, - dns_name_t **name, isc_uint32_t *ttl, + dns_name_t **name, uint32_t *ttl, dns_rdata_t **rdata) { ixfr_rrstream_t *s = (ixfr_rrstream_t *) rs; @@ -354,7 +356,7 @@ axfr_rrstream_first(rrstream_t *rs) { /* Skip SOA records. */ for (;;) { dns_name_t *name_dummy = NULL; - isc_uint32_t ttl_dummy; + uint32_t ttl_dummy; dns_rdata_t *rdata = NULL; dns_rriterator_current(&s->it, &name_dummy, &ttl_dummy, NULL, &rdata); @@ -375,7 +377,7 @@ axfr_rrstream_next(rrstream_t *rs) { /* Skip SOA records. */ for (;;) { dns_name_t *name_dummy = NULL; - isc_uint32_t ttl_dummy; + uint32_t ttl_dummy; dns_rdata_t *rdata = NULL; result = dns_rriterator_next(&s->it); if (result != ISC_R_SUCCESS) @@ -389,7 +391,7 @@ axfr_rrstream_next(rrstream_t *rs) { } static void -axfr_rrstream_current(rrstream_t *rs, dns_name_t **name, isc_uint32_t *ttl, +axfr_rrstream_current(rrstream_t *rs, dns_name_t **name, uint32_t *ttl, dns_rdata_t **rdata) { axfr_rrstream_t *s = (axfr_rrstream_t *) rs; @@ -478,7 +480,7 @@ soa_rrstream_next(rrstream_t *rs) { } static void -soa_rrstream_current(rrstream_t *rs, dns_name_t **name, isc_uint32_t *ttl, +soa_rrstream_current(rrstream_t *rs, dns_name_t **name, uint32_t *ttl, dns_rdata_t **rdata) { soa_rrstream_t *s = (soa_rrstream_t *) rs; @@ -603,7 +605,7 @@ compound_rrstream_next(rrstream_t *rs) { } static void -compound_rrstream_current(rrstream_t *rs, dns_name_t **name, isc_uint32_t *ttl, +compound_rrstream_current(rrstream_t *rs, dns_name_t **name, uint32_t *ttl, dns_rdata_t **rdata) { compound_rrstream_t *s = (compound_rrstream_t *) rs; @@ -750,7 +752,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { isc_boolean_t is_poll = ISC_FALSE; isc_boolean_t is_dlz = ISC_FALSE; isc_boolean_t is_ixfr = ISC_FALSE; - isc_uint32_t begin_serial = 0, current_serial; + uint32_t begin_serial = 0, current_serial; switch (reqtype) { case dns_rdatatype_axfr: @@ -1086,7 +1088,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { if ((client->attributes & NS_CLIENTATTR_WANTEXPIRE) != 0 && dns_zone_gettype(mayberaw) == dns_zone_slave) { isc_time_t expiretime; - isc_uint32_t secs; + uint32_t secs; dns_zone_getexpiretime(zone, &expiretime); secs = isc_time_seconds(&expiretime); if (secs >= client->now && result == ISC_R_SUCCESS) { @@ -1383,7 +1385,7 @@ sendstream(xfrout_ctx_t *xfr) { */ for (n_rrs = 0; ; n_rrs++) { dns_name_t *name = NULL; - isc_uint32_t ttl; + uint32_t ttl; dns_rdata_t *rdata = NULL; unsigned int size; @@ -1504,7 +1506,7 @@ sendstream(xfrout_ctx_t *xfr) { isc_buffer_usedregion(&xfr->txbuf, &used); isc_buffer_putuint16(&xfr->txlenbuf, - (isc_uint16_t)used.length); + (uint16_t)used.length); region.base = xfr->txlenbuf.base; region.length = 2 + used.length; xfrout_log(xfr, ISC_LOG_DEBUG(8), diff --git a/lib/samples/sample-update.c b/lib/samples/sample-update.c index d452e434ac..b70aecd3f2 100644 --- a/lib/samples/sample-update.c +++ b/lib/samples/sample-update.c @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -481,7 +482,7 @@ update_addordelete(isc_mem_t *mctx, char *cmdline, isc_boolean_t isdelete, dns_name_t *name) { isc_result_t result; - isc_uint32_t ttl; + uint32_t ttl; char *word; dns_rdataclass_t rdataclass; dns_rdatatype_t rdatatype; diff --git a/util/copyrights b/util/copyrights index b2a583f7aa..b30c435ac3 100644 --- a/util/copyrights +++ b/util/copyrights @@ -3667,7 +3667,6 @@ ./lib/isc/unix/include/Makefile.in MAKE 1998,1999,2000,2001,2004,2007,2012,2014,2016,2018 ./lib/isc/unix/include/isc/Makefile.in MAKE 1998,1999,2000,2001,2004,2007,2012,2013,2014,2015,2016,2018 ./lib/isc/unix/include/isc/dir.h C 1999,2000,2001,2004,2005,2007,2016,2018 -./lib/isc/unix/include/isc/int.h C 1999,2000,2001,2004,2005,2007,2016,2018 ./lib/isc/unix/include/isc/keyboard.h C 2000,2001,2004,2005,2007,2016,2018 ./lib/isc/unix/include/isc/net.h C 1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2013,2014,2016,2017,2018 ./lib/isc/unix/include/isc/netdb.h C 1999,2000,2001,2004,2005,2007,2016,2018 @@ -3712,7 +3711,6 @@ ./lib/isc/win32/include/isc/bindevt.h C 2001,2004,2007,2016,2018 ./lib/isc/win32/include/isc/condition.h C 1998,1999,2000,2001,2004,2007,2016,2018 ./lib/isc/win32/include/isc/dir.h C 1999,2000,2001,2004,2007,2016,2018 -./lib/isc/win32/include/isc/int.h C 1999,2000,2001,2004,2007,2016,2018 ./lib/isc/win32/include/isc/ipv6.h C 1999,2000,2001,2002,2004,2005,2007,2011,2012,2016,2018 ./lib/isc/win32/include/isc/keyboard.h C 2000,2001,2004,2007,2016,2018 ./lib/isc/win32/include/isc/mutex.h C 1998,1999,2000,2001,2004,2007,2008,2009,2016,2018