From: Mark Andrews Date: Fri, 30 Dec 2016 04:45:08 +0000 (+1100) Subject: 4546. [func] Extend the use of const declarations. [RT #43379] X-Git-Tag: v9.12.0a1~563 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=52e2aab39253db07f67ab340e208189cc68af389;p=thirdparty%2Fbind9.git 4546. [func] Extend the use of const declarations. [RT #43379] --- diff --git a/CHANGES b/CHANGES index 6a1e9fec919..1f4c40a688e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +4546. [func] Extend the use of const declarations. [RT #43379] + 4545. [func] Expand YAML output from dnstap-read to include a detailed breakdown of the DNS message contents. [RT #43642] diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c index 3935ea73ddf..36aeabc2d9f 100644 --- a/bin/check/check-tool.c +++ b/bin/check/check-tool.c @@ -175,7 +175,7 @@ logged(char *key, int value) { } static isc_boolean_t -checkns(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner, +checkns(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner, dns_rdataset_t *a, dns_rdataset_t *aaaa) { #ifdef USE_GETADDRINFO @@ -379,7 +379,7 @@ checkns(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner, } static isc_boolean_t -checkmx(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner) { +checkmx(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner) { #ifdef USE_GETADDRINFO struct addrinfo hints, *ai, *cur; char namebuf[DNS_NAME_FORMATSIZE + 1]; @@ -464,7 +464,7 @@ checkmx(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner) { } static isc_boolean_t -checksrv(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner) { +checksrv(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner) { #ifdef USE_GETADDRINFO struct addrinfo hints, *ai, *cur; char namebuf[DNS_NAME_FORMATSIZE + 1]; diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index 2e4c8648dff..859a11db9f3 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -177,7 +177,7 @@ char keyfile[MXNAME] = ""; char keysecret[MXNAME] = ""; unsigned char cookie_secret[33]; unsigned char cookie[8]; -dns_name_t *hmacname = NULL; +const dns_name_t *hmacname = NULL; unsigned int digestbits = 0; isc_buffer_t *namebuf = NULL; dns_tsigkey_t *key = NULL; diff --git a/bin/dig/host.c b/bin/dig/host.c index 196d546e979..d6418dfc63a 100644 --- a/bin/dig/host.c +++ b/bin/dig/host.c @@ -356,8 +356,9 @@ printsection(dns_message_t *msg, dns_section_t sectionid, } static isc_result_t -printrdata(dns_message_t *msg, dns_rdataset_t *rdataset, dns_name_t *owner, - const char *set_name, isc_boolean_t headers) +printrdata(dns_message_t *msg, dns_rdataset_t *rdataset, + const dns_name_t *owner, const char *set_name, + isc_boolean_t headers) { isc_buffer_t target; isc_result_t result; @@ -410,7 +411,7 @@ isc_result_t printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) { isc_boolean_t did_flag = ISC_FALSE; dns_rdataset_t *opt, *tsig = NULL; - dns_name_t *tsigname; + const dns_name_t *tsigname; isc_result_t result = ISC_R_SUCCESS; int force_error; diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h index 03f9c664969..f7875b469e6 100644 --- a/bin/dig/include/dig/dig.h +++ b/bin/dig/include/dig/dig.h @@ -283,7 +283,7 @@ extern isc_sockaddr_t bind_address; extern char keynametext[MXNAME]; extern char keyfile[MXNAME]; extern char keysecret[MXNAME]; -extern dns_name_t *hmacname; +extern const dns_name_t *hmacname; extern unsigned int digestbits; #ifdef DIG_SIGCHASE extern char trustedkey[MXNAME]; diff --git a/bin/named/client.c b/bin/named/client.c index 89721a7e7d5..37f259387b8 100644 --- a/bin/named/client.c +++ b/bin/named/client.c @@ -1703,7 +1703,7 @@ allowed(isc_netaddr_t *addr, dns_name_t *signer, */ isc_boolean_t ns_client_isself(dns_view_t *myview, dns_tsigkey_t *mykey, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *dstaddr, + const isc_sockaddr_t *srcaddr, const isc_sockaddr_t *dstaddr, dns_rdataclass_t rdclass, void *arg) { dns_view_t *view; @@ -2189,7 +2189,7 @@ client_request(isc_task_t *task, isc_event_t *event) { isc_buffer_t tbuffer; dns_view_t *view; dns_rdataset_t *opt; - dns_name_t *signame; + const dns_name_t *signame; isc_boolean_t ra; /* Recursion available. */ isc_netaddr_t netaddr; int match; @@ -3747,7 +3747,7 @@ ns_client_log(ns_client_t *client, isc_logcategory_t *category, } void -ns_client_aclmsg(const char *msg, dns_name_t *name, dns_rdatatype_t type, +ns_client_aclmsg(const char *msg, const dns_name_t *name, dns_rdatatype_t type, dns_rdataclass_t rdclass, char *buf, size_t len) { char namebuf[DNS_NAME_FORMATSIZE]; diff --git a/bin/named/config.c b/bin/named/config.c index 7eacf7ecd77..d2ffbb350e3 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -956,14 +956,14 @@ struct keyalgorithms { }; isc_result_t -ns_config_getkeyalgorithm(const char *str, dns_name_t **name, +ns_config_getkeyalgorithm(const char *str, const dns_name_t **name, isc_uint16_t *digestbits) { return (ns_config_getkeyalgorithm2(str, name, NULL, digestbits)); } isc_result_t -ns_config_getkeyalgorithm2(const char *str, dns_name_t **name, +ns_config_getkeyalgorithm2(const char *str, const dns_name_t **name, unsigned int *typep, isc_uint16_t *digestbits) { int i; diff --git a/bin/named/include/named/client.h b/bin/named/include/named/client.h index 075658105ac..9d326fba061 100644 --- a/bin/named/include/named/client.h +++ b/bin/named/include/named/client.h @@ -361,7 +361,7 @@ ns_client_logv(ns_client_t *client, isc_logcategory_t *category, isc_logmodule_t *module, int level, const char *fmt, va_list ap) ISC_FORMAT_PRINTF(5, 0); void -ns_client_aclmsg(const char *msg, dns_name_t *name, dns_rdatatype_t type, +ns_client_aclmsg(const char *msg, const dns_name_t *name, dns_rdatatype_t type, dns_rdataclass_t rdclass, char *buf, size_t len); #define NS_CLIENT_ACLMSGSIZE(x) \ @@ -394,7 +394,7 @@ ns_client_qnamereplace(ns_client_t *client, dns_name_t *name); isc_boolean_t ns_client_isself(dns_view_t *myview, dns_tsigkey_t *mykey, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, + const isc_sockaddr_t *srcaddr, const isc_sockaddr_t *destaddr, dns_rdataclass_t rdclass, void *arg); /*% * Isself callback. diff --git a/bin/named/include/named/config.h b/bin/named/include/named/config.h index 92b23ef73c6..15617200124 100644 --- a/bin/named/include/named/config.h +++ b/bin/named/include/named/config.h @@ -61,10 +61,10 @@ isc_result_t ns_config_getport(const cfg_obj_t *config, in_port_t *portp); isc_result_t -ns_config_getkeyalgorithm(const char *str, dns_name_t **name, +ns_config_getkeyalgorithm(const char *str, const dns_name_t **name, isc_uint16_t *digestbits); isc_result_t -ns_config_getkeyalgorithm2(const char *str, dns_name_t **name, +ns_config_getkeyalgorithm2(const char *str, const dns_name_t **name, unsigned int *typep, isc_uint16_t *digestbits); isc_result_t diff --git a/bin/named/include/named/interfacemgr.h b/bin/named/include/named/interfacemgr.h index 1df9d149dd6..963fcf20052 100644 --- a/bin/named/include/named/interfacemgr.h +++ b/bin/named/include/named/interfacemgr.h @@ -173,6 +173,6 @@ void ns_interfacemgr_dumprecursing(FILE *f, ns_interfacemgr_t *mgr); isc_boolean_t -ns_interfacemgr_listeningon(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr); +ns_interfacemgr_listeningon(ns_interfacemgr_t *mgr, const isc_sockaddr_t *addr); #endif /* NAMED_INTERFACEMGR_H */ diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c index 70e07039a08..10cec44321f 100644 --- a/bin/named/interfacemgr.c +++ b/bin/named/interfacemgr.c @@ -1221,7 +1221,9 @@ ns_interfacemgr_dumprecursing(FILE *f, ns_interfacemgr_t *mgr) { } isc_boolean_t -ns_interfacemgr_listeningon(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr) { +ns_interfacemgr_listeningon(ns_interfacemgr_t *mgr, + const isc_sockaddr_t *addr) +{ isc_sockaddr_t *old; for (old = ISC_LIST_HEAD(mgr->listenon); diff --git a/bin/named/lwsearch.c b/bin/named/lwsearch.c index c9117a9662d..e92f6cb11f7 100644 --- a/bin/named/lwsearch.c +++ b/bin/named/lwsearch.c @@ -174,7 +174,7 @@ ns_lwsearchctx_next(ns_lwsearchctx_t *sctx) { isc_result_t ns_lwsearchctx_current(ns_lwsearchctx_t *sctx, dns_name_t *absname) { - dns_name_t *tname; + const dns_name_t *tname; isc_boolean_t useexact = ISC_FALSE; REQUIRE(sctx != NULL); diff --git a/bin/named/query.c b/bin/named/query.c index 645b2cff75e..0f3ad52ba7e 100644 --- a/bin/named/query.c +++ b/bin/named/query.c @@ -757,7 +757,7 @@ query_findversion(ns_client_t *client, dns_db_t *db) { } static inline isc_result_t -query_validatezonedb(ns_client_t *client, dns_name_t *name, +query_validatezonedb(ns_client_t *client, const dns_name_t *name, dns_rdatatype_t qtype, unsigned int options, dns_zone_t *zone, dns_db_t *db, dns_dbversion_t **versionp) @@ -907,9 +907,9 @@ query_validatezonedb(ns_client_t *client, dns_name_t *name, } static inline isc_result_t -query_getzonedb(ns_client_t *client, dns_name_t *name, dns_rdatatype_t qtype, - unsigned int options, dns_zone_t **zonep, dns_db_t **dbp, - dns_dbversion_t **versionp) +query_getzonedb(ns_client_t *client, const dns_name_t *name, + dns_rdatatype_t qtype, unsigned int options, + dns_zone_t **zonep, dns_db_t **dbp, dns_dbversion_t **versionp) { isc_result_t result; unsigned int ztoptions; @@ -1082,8 +1082,8 @@ rpz_getdb(ns_client_t *client, dns_name_t *p_name, dns_rpz_type_t rpz_type, } static inline isc_result_t -query_getcachedb(ns_client_t *client, dns_name_t *name, dns_rdatatype_t qtype, - dns_db_t **dbp, unsigned int options) +query_getcachedb(ns_client_t *client, const dns_name_t *name, + dns_rdatatype_t qtype, dns_db_t **dbp, unsigned int options) { isc_result_t result; isc_boolean_t check_acl; @@ -1314,7 +1314,7 @@ query_isduplicate(ns_client_t *client, dns_name_t *name, } static isc_result_t -query_addadditional(void *arg, dns_name_t *name, dns_rdatatype_t qtype) { +query_addadditional(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) { ns_client_t *client = arg; isc_result_t result, eresult; dns_dbnode_t *node; @@ -1774,7 +1774,7 @@ query_iscachevalid(dns_zone_t *zone, dns_db_t *db, dns_db_t *db0, } static isc_result_t -query_addadditional2(void *arg, dns_name_t *name, dns_rdatatype_t qtype) { +query_addadditional2(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) { client_additionalctx_t *additionalctx = arg; dns_rdataset_t *rdataset_base; ns_client_t *client; @@ -6999,17 +6999,18 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) char log_buf[DNS_RRL_LOG_BUF_LEN]; isc_result_t nc_result, resp_result; dns_rrl_result_t rrl_result; + const dns_name_t *constname; client->query.attributes |= NS_QUERYATTR_RRL_CHECKED; wouldlog = isc_log_wouldlog(ns_g_lctx, DNS_RRL_LOG_DROP); - tname = fname; + constname = fname; if (result == DNS_R_NXDOMAIN) { /* * Use the database origin name to rate limit NXDOMAIN */ if (db != NULL) - tname = dns_db_origin(db); + constname = dns_db_origin(db); resp_result = result; } else if (result == DNS_R_NCACHENXDOMAIN && rdataset != NULL && @@ -7029,7 +7030,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) &nc_rdataset); if (nc_rdataset.type == dns_rdatatype_soa) { dns_rdataset_disassociate(&nc_rdataset); - tname = dns_fixedname_name(&fixed); + constname = dns_fixedname_name(&fixed); break; } dns_rdataset_disassociate(&nc_rdataset); @@ -7046,14 +7047,14 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) * is off or not requested and the hints have not * been loaded or we have "additional-from-cache no". */ - tname = dns_rootname; + constname = dns_rootname; resp_result = DNS_R_DELEGATION; } else { resp_result = ISC_R_SUCCESS; } rrl_result = dns_rrl(client->view, &client->peeraddr, TCP(client), client->message->rdclass, - qtype, tname, resp_result, client->now, + qtype, constname, resp_result, client->now, wouldlog, log_buf, sizeof(log_buf)); if (rrl_result != DNS_RRL_RESULT_OK) { /* diff --git a/bin/named/server.c b/bin/named/server.c index 45c592b3457..5eb0860ed37 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -432,8 +432,9 @@ ns_listenlist_fromconfig(const cfg_obj_t *listenlist, const cfg_obj_t *config, isc_uint16_t family, ns_listenlist_t **target); static isc_result_t -configure_forward(const cfg_obj_t *config, dns_view_t *view, dns_name_t *origin, - const cfg_obj_t *forwarders, const cfg_obj_t *forwardtype); +configure_forward(const cfg_obj_t *config, dns_view_t *view, + const dns_name_t *origin, const cfg_obj_t *forwarders, + const cfg_obj_t *forwardtype); static isc_result_t configure_alternates(const cfg_obj_t *config, dns_view_t *view, @@ -788,7 +789,7 @@ dstkey_fromconfig(const cfg_obj_t *vconfig, const cfg_obj_t *key, static isc_result_t load_view_keys(const cfg_obj_t *keys, const cfg_obj_t *vconfig, dns_view_t *view, isc_boolean_t managed, - dns_name_t *keyname, isc_mem_t *mctx) + const dns_name_t *keyname, isc_mem_t *mctx) { const cfg_listelt_t *elt, *elt2; const cfg_obj_t *key, *keylist; @@ -2684,8 +2685,8 @@ configure_rrl(dns_view_t *view, const cfg_obj_t *config, const cfg_obj_t *map) { } static isc_result_t -add_soa(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, - dns_name_t *origin, dns_name_t *contact) +add_soa(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, + const dns_name_t *origin, const dns_name_t *contact) { dns_dbnode_t *node = NULL; dns_rdata_t rdata = DNS_RDATA_INIT; @@ -2715,8 +2716,8 @@ add_soa(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, } static isc_result_t -add_ns(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, - dns_name_t *nsname) +add_ns(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, + const dns_name_t *nsname) { dns_dbnode_t *node = NULL; dns_rdata_ns_t ns; @@ -4916,8 +4917,9 @@ configure_alternates(const cfg_obj_t *config, dns_view_t *view, } static isc_result_t -configure_forward(const cfg_obj_t *config, dns_view_t *view, dns_name_t *origin, - const cfg_obj_t *forwarders, const cfg_obj_t *forwardtype) +configure_forward(const cfg_obj_t *config, dns_view_t *view, + const dns_name_t *origin, const cfg_obj_t *forwarders, + const cfg_obj_t *forwardtype) { const cfg_obj_t *portobj, *dscpobj; const cfg_obj_t *faddresses; @@ -6269,8 +6271,8 @@ cleanup_session_key(ns_server_t *server, isc_mem_t *mctx) { static isc_result_t generate_session_key(const char *filename, const char *keynamestr, - dns_name_t *keyname, const char *algstr, - dns_name_t *algname, unsigned int algtype, + const dns_name_t *keyname, const char *algstr, + const dns_name_t *algname, unsigned int algtype, isc_uint16_t bits, isc_mem_t *mctx, dns_tsigkey_t **tsigkeyp) { @@ -6365,7 +6367,8 @@ configure_session_key(const cfg_obj_t **maps, ns_server_t *server, const char *keyfile, *keynamestr, *algstr; unsigned int algtype; dns_fixedname_t fname; - dns_name_t *keyname, *algname; + dns_name_t *keyname; + const dns_name_t *algname; isc_buffer_t buffer; isc_uint16_t bits; const cfg_obj_t *obj; @@ -12938,14 +12941,15 @@ ns_server_nta(ns_server_t *server, isc_lex_t *lex, isc_boolean_t readonly, const char *msg = NULL; isc_boolean_t dump = ISC_FALSE, force = ISC_FALSE; dns_fixedname_t fn; - dns_name_t *ntaname; + const dns_name_t *ntaname; + dns_name_t *fname; dns_ttl_t ntattl; isc_boolean_t ttlset = ISC_FALSE, excl = ISC_FALSE; UNUSED(force); dns_fixedname_init(&fn); - ntaname = dns_fixedname_name(&fn); + fname = dns_fixedname_name(&fn); /* Skip the command name. */ ptr = next_token(lex, text); @@ -13039,7 +13043,8 @@ ns_server_nta(ns_server_t *server, isc_lex_t *lex, isc_boolean_t readonly, isc_buffer_t b; isc_buffer_init(&b, namebuf, strlen(namebuf)); isc_buffer_add(&b, strlen(namebuf)); - CHECK(dns_name_fromtext(ntaname, &b, dns_rootname, 0, NULL)); + CHECK(dns_name_fromtext(fname, &b, dns_rootname, 0, NULL)); + ntaname = fname; } /* Look for the view name. */ diff --git a/bin/named/tsigconf.c b/bin/named/tsigconf.c index c5f5db1c0be..9a913f55361 100644 --- a/bin/named/tsigconf.c +++ b/bin/named/tsigconf.c @@ -49,7 +49,7 @@ add_initial_keys(const cfg_obj_t *list, dns_tsig_keyring_t *ring, const cfg_obj_t *algobj = NULL; const cfg_obj_t *secretobj = NULL; dns_name_t keyname; - dns_name_t *alg; + const dns_name_t *alg; const char *algstr; char keynamedata[1024]; isc_buffer_t keynamesrc, keynamebuf; diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index 44451263b97..9572fd8b08e 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -448,7 +448,7 @@ reset_system(void) { } static isc_uint16_t -parse_hmac(dns_name_t **hmac, const char *hmacstr, size_t len) { +parse_hmac(const dns_name_t **hmac, const char *hmacstr, size_t len) { isc_uint16_t digestbits = 0; isc_result_t result; char buf[20]; @@ -543,7 +543,7 @@ setup_keystr(void) { dns_fixedname_t fkeyname; dns_name_t *mykeyname; char *name; - dns_name_t *hmacname = NULL; + const dns_name_t *hmacname = NULL; isc_uint16_t digestbits = 0; dns_fixedname_init(&fkeyname); @@ -674,7 +674,7 @@ static void setup_keyfile(isc_mem_t *mctx, isc_log_t *lctx) { dst_key_t *dstkey = NULL; isc_result_t result; - dns_name_t *hmacname = NULL; + const dns_name_t *hmacname = NULL; debug("Creating key..."); @@ -1543,7 +1543,7 @@ evaluate_key(char *cmdline) { int secretlen; unsigned char *secret = NULL; isc_buffer_t secretbuf; - dns_name_t *hmacname = NULL; + const dns_name_t *hmacname = NULL; isc_uint16_t digestbits = 0; char *n; diff --git a/bin/tests/master/t_master.c b/bin/tests/master/t_master.c index c2a90a2c307..a15073bd3b7 100644 --- a/bin/tests/master/t_master.c +++ b/bin/tests/master/t_master.c @@ -31,13 +31,13 @@ #define BIGBUFLEN (64 * 1024) static isc_result_t -t1_add_callback(void *arg, dns_name_t *owner, dns_rdataset_t *dataset); +t1_add_callback(void *arg, const dns_name_t *owner, dns_rdataset_t *dataset); isc_mem_t *T1_mctx; char *Tokens[T_MAXTOKS + 1]; static isc_result_t -t1_add_callback(void *arg, dns_name_t *owner, dns_rdataset_t *dataset) { +t1_add_callback(void *arg, const dns_name_t *owner, dns_rdataset_t *dataset) { char buf[BIGBUFLEN]; isc_buffer_t target; isc_result_t result; diff --git a/bin/tests/system/dyndb/driver/db.c b/bin/tests/system/dyndb/driver/db.c index 5c1cfd5f4f6..699971baa79 100644 --- a/bin/tests/system/dyndb/driver/db.c +++ b/bin/tests/system/dyndb/driver/db.c @@ -190,7 +190,7 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) { } static isc_result_t -findnode(dns_db_t *db, dns_name_t *name, isc_boolean_t create, +findnode(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, dns_dbnode_t **nodep) { sampledb_t *sampledb = (sampledb_t *) db; @@ -201,7 +201,7 @@ findnode(dns_db_t *db, dns_name_t *name, isc_boolean_t create, } static isc_result_t -find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, +find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) @@ -216,7 +216,7 @@ find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, } static isc_result_t -findzonecut(dns_db_t *db, dns_name_t *name, unsigned int options, +findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { @@ -454,7 +454,7 @@ getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, } static isc_result_t -findnsec3node(dns_db_t *db, dns_name_t *name, isc_boolean_t create, +findnsec3node(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, dns_dbnode_t **nodep) { sampledb_t *sampledb = (sampledb_t *) db; @@ -529,7 +529,7 @@ rpz_ready(dns_db_t *db) { } static isc_result_t -findnodeext(dns_db_t *db, dns_name_t *name, +findnodeext(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, dns_dbnode_t **nodep) { @@ -542,7 +542,7 @@ findnodeext(dns_db_t *db, dns_name_t *name, } static isc_result_t -findext(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, +findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, @@ -639,8 +639,8 @@ static dns_dbmethods_t sampledb_methods = { * credit goes to ISC. */ static isc_result_t -add_soa(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, - dns_name_t *origin, dns_name_t *contact) +add_soa(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, + const dns_name_t *origin, const dns_name_t *contact) { dns_dbnode_t *node = NULL; dns_rdata_t rdata = DNS_RDATA_INIT; @@ -669,8 +669,8 @@ add_soa(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, static isc_result_t -add_ns(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, - dns_name_t *nsname) +add_ns(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, + const dns_name_t *nsname) { dns_dbnode_t *node = NULL; dns_rdata_ns_t ns; @@ -707,7 +707,7 @@ add_ns(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, } static isc_result_t -add_a(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, +add_a(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, struct in_addr addr) { dns_dbnode_t *node = NULL; @@ -749,7 +749,7 @@ add_a(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, * @param[in] driverarg Driver-specific parameter from dns_db_register(). */ isc_result_t -create_db(isc_mem_t *mctx, dns_name_t *origin, dns_dbtype_t type, +create_db(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], void *driverarg, dns_db_t **dbp) { diff --git a/bin/tests/system/dyndb/driver/db.h b/bin/tests/system/dyndb/driver/db.h index 80693a7d90d..fc284d7738d 100644 --- a/bin/tests/system/dyndb/driver/db.h +++ b/bin/tests/system/dyndb/driver/db.h @@ -8,7 +8,7 @@ #define DB_H_ isc_result_t -create_db(isc_mem_t *mctx, dns_name_t *origin, dns_dbtype_t type, +create_db(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], void *driverarg, dns_db_t **dbp); diff --git a/lib/dns/adb.c b/lib/dns/adb.c index c67413fa829..a56d4b7073e 100644 --- a/lib/dns/adb.c +++ b/lib/dns/adb.c @@ -281,12 +281,13 @@ struct dns_adbentry { /* * Internal functions (and prototypes). */ -static inline dns_adbname_t *new_adbname(dns_adb_t *, dns_name_t *); +static inline dns_adbname_t *new_adbname(dns_adb_t *, const dns_name_t *); static inline void free_adbname(dns_adb_t *, dns_adbname_t **); static inline dns_adbnamehook_t *new_adbnamehook(dns_adb_t *, dns_adbentry_t *); static inline void free_adbnamehook(dns_adb_t *, dns_adbnamehook_t **); -static inline dns_adblameinfo_t *new_adblameinfo(dns_adb_t *, dns_name_t *, +static inline dns_adblameinfo_t *new_adblameinfo(dns_adb_t *, + const dns_name_t *, dns_rdatatype_t); static inline void free_adblameinfo(dns_adb_t *, dns_adblameinfo_t **); static inline dns_adbentry_t *new_adbentry(dns_adb_t *); @@ -297,13 +298,14 @@ static inline dns_adbaddrinfo_t *new_adbaddrinfo(dns_adb_t *, dns_adbentry_t *, in_port_t); static inline dns_adbfetch_t *new_adbfetch(dns_adb_t *); static inline void free_adbfetch(dns_adb_t *, dns_adbfetch_t **); -static inline dns_adbname_t *find_name_and_lock(dns_adb_t *, dns_name_t *, +static inline dns_adbname_t *find_name_and_lock(dns_adb_t *, + const dns_name_t *, unsigned int, int *); static inline dns_adbentry_t *find_entry_and_lock(dns_adb_t *, - isc_sockaddr_t *, int *, - isc_stdtime_t); + const isc_sockaddr_t *, + int *, isc_stdtime_t); static void dump_adb(dns_adb_t *, FILE *, isc_boolean_t debug, isc_stdtime_t); -static void print_dns_name(FILE *, dns_name_t *); +static void print_dns_name(FILE *, const dns_name_t *); static void print_namehook_list(FILE *, const char *legend, dns_adb_t *adb, dns_adbnamehooklist_t *list, @@ -1375,7 +1377,7 @@ clean_target(dns_adb_t *adb, dns_name_t *target) { } static isc_result_t -set_target(dns_adb_t *adb, dns_name_t *name, dns_name_t *fname, +set_target(dns_adb_t *adb, const dns_name_t *name, const dns_name_t *fname, dns_rdataset_t *rdataset, dns_name_t *target) { isc_result_t result; @@ -1663,7 +1665,7 @@ dec_entry_refcnt(dns_adb_t *adb, isc_boolean_t overmem, dns_adbentry_t *entry, } static inline dns_adbname_t * -new_adbname(dns_adb_t *adb, dns_name_t *dnsname) { +new_adbname(dns_adb_t *adb, const dns_name_t *dnsname) { dns_adbname_t *name; name = isc_mempool_get(adb->nmp); @@ -1767,7 +1769,9 @@ free_adbnamehook(dns_adb_t *adb, dns_adbnamehook_t **namehook) { } static inline dns_adblameinfo_t * -new_adblameinfo(dns_adb_t *adb, dns_name_t *qname, dns_rdatatype_t qtype) { +new_adblameinfo(dns_adb_t *adb, const dns_name_t *qname, + dns_rdatatype_t qtype) +{ dns_adblameinfo_t *li; li = isc_mempool_get(adb->limp); @@ -2034,7 +2038,7 @@ free_adbaddrinfo(dns_adb_t *adb, dns_adbaddrinfo_t **ainfo) { * DNS_ADB_INVALIDBUCKET. */ static inline dns_adbname_t * -find_name_and_lock(dns_adb_t *adb, dns_name_t *name, +find_name_and_lock(dns_adb_t *adb, const dns_name_t *name, unsigned int options, int *bucketp) { dns_adbname_t *adbname; @@ -2076,7 +2080,7 @@ find_name_and_lock(dns_adb_t *adb, dns_name_t *name, * the bucket changes. */ static inline dns_adbentry_t * -find_entry_and_lock(dns_adb_t *adb, isc_sockaddr_t *addr, int *bucketp, +find_entry_and_lock(dns_adb_t *adb, const isc_sockaddr_t *addr, int *bucketp, isc_stdtime_t now) { dns_adbentry_t *entry, *entry_next; @@ -2115,7 +2119,7 @@ find_entry_and_lock(dns_adb_t *adb, isc_sockaddr_t *addr, int *bucketp, * Entry bucket MUST be locked! */ static isc_boolean_t -entry_is_lame(dns_adb_t *adb, dns_adbentry_t *entry, dns_name_t *qname, +entry_is_lame(dns_adb_t *adb, dns_adbentry_t *entry, const dns_name_t *qname, dns_rdatatype_t qtype, isc_stdtime_t now) { dns_adblameinfo_t *li, *next_li; @@ -2173,9 +2177,9 @@ log_quota(dns_adbentry_t *entry, const char *fmt, ...) { } static void -copy_namehook_lists(dns_adb_t *adb, dns_adbfind_t *find, dns_name_t *qname, - dns_rdatatype_t qtype, dns_adbname_t *name, - isc_stdtime_t now) +copy_namehook_lists(dns_adb_t *adb, dns_adbfind_t *find, + const dns_name_t *qname, dns_rdatatype_t qtype, + dns_adbname_t *name, isc_stdtime_t now) { dns_adbnamehook_t *namehook; dns_adbaddrinfo_t *addrinfo; @@ -2927,7 +2931,7 @@ dns_adb_shutdown(dns_adb_t *adb) { isc_result_t dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, - void *arg, dns_name_t *name, dns_name_t *qname, + void *arg, const dns_name_t *name, const dns_name_t *qname, dns_rdatatype_t qtype, unsigned int options, isc_stdtime_t now, dns_name_t *target, in_port_t port, dns_adbfind_t **findp) @@ -2939,7 +2943,7 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, isc_result_t dns_adb_createfind2(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, - void *arg, dns_name_t *name, dns_name_t *qname, + void *arg, const dns_name_t *name, const dns_name_t *qname, dns_rdatatype_t qtype, unsigned int options, isc_stdtime_t now, dns_name_t *target, in_port_t port, unsigned int depth, isc_counter_t *qc, @@ -3623,7 +3627,7 @@ dns_adb_dumpfind(dns_adbfind_t *find, FILE *f) { } static void -print_dns_name(FILE *f, dns_name_t *name) { +print_dns_name(FILE *f, const dns_name_t *name) { char buf[DNS_NAME_FORMATSIZE]; INSIST(f != NULL); @@ -4080,8 +4084,9 @@ fetch_name(dns_adbname_t *adbname, isc_boolean_t start_at_zone, * since these can be extracted from the find itself. */ isc_result_t -dns_adb_marklame(dns_adb_t *adb, dns_adbaddrinfo_t *addr, dns_name_t *qname, - dns_rdatatype_t qtype, isc_stdtime_t expire_time) +dns_adb_marklame(dns_adb_t *adb, dns_adbaddrinfo_t *addr, + const dns_name_t *qname, dns_rdatatype_t qtype, + isc_stdtime_t expire_time) { dns_adblameinfo_t *li; int bucket; @@ -4559,7 +4564,7 @@ dns_adb_getcookie(dns_adb_t *adb, dns_adbaddrinfo_t *addr, } isc_result_t -dns_adb_findaddrinfo(dns_adb_t *adb, isc_sockaddr_t *sa, +dns_adb_findaddrinfo(dns_adb_t *adb, const isc_sockaddr_t *sa, dns_adbaddrinfo_t **addrp, isc_stdtime_t now) { int bucket; @@ -4676,7 +4681,7 @@ dns_adb_flush(dns_adb_t *adb) { } void -dns_adb_flushname(dns_adb_t *adb, dns_name_t *name) { +dns_adb_flushname(dns_adb_t *adb, const dns_name_t *name) { dns_adbname_t *adbname; dns_adbname_t *nextname; int bucket; @@ -4703,7 +4708,7 @@ dns_adb_flushname(dns_adb_t *adb, dns_name_t *name) { } void -dns_adb_flushnames(dns_adb_t *adb, dns_name_t *name) { +dns_adb_flushnames(dns_adb_t *adb, const dns_name_t *name) { dns_adbname_t *adbname, *nextname; unsigned int i; diff --git a/lib/dns/badcache.c b/lib/dns/badcache.c index 468f1925e4f..3bb001406e8 100644 --- a/lib/dns/badcache.c +++ b/lib/dns/badcache.c @@ -150,7 +150,7 @@ badcache_resize(dns_badcache_t *bc, isc_time_t *now, isc_boolean_t grow) { } void -dns_badcache_add(dns_badcache_t *bc, dns_name_t *name, +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) { @@ -220,7 +220,7 @@ dns_badcache_add(dns_badcache_t *bc, dns_name_t *name, } isc_boolean_t -dns_badcache_find(dns_badcache_t *bc, dns_name_t *name, +dns_badcache_find(dns_badcache_t *bc, const dns_name_t *name, dns_rdatatype_t type, isc_uint32_t *flagp, isc_time_t *now) { @@ -311,7 +311,7 @@ dns_badcache_flush(dns_badcache_t *bc) { } void -dns_badcache_flushname(dns_badcache_t *bc, dns_name_t *name) { +dns_badcache_flushname(dns_badcache_t *bc, const dns_name_t *name) { dns_bcentry_t *bad, *prev, *next; isc_result_t result; isc_time_t now; @@ -348,7 +348,7 @@ dns_badcache_flushname(dns_badcache_t *bc, dns_name_t *name) { } void -dns_badcache_flushtree(dns_badcache_t *bc, dns_name_t *name) { +dns_badcache_flushtree(dns_badcache_t *bc, const dns_name_t *name) { dns_bcentry_t *bad, *prev, *next; unsigned int i; int n; diff --git a/lib/dns/byaddr.c b/lib/dns/byaddr.c index 2ff89a7bc7e..7c3de1922fb 100644 --- a/lib/dns/byaddr.c +++ b/lib/dns/byaddr.c @@ -40,7 +40,7 @@ static char hex_digits[] = { }; isc_result_t -dns_byaddr_createptrname(isc_netaddr_t *address, isc_boolean_t nibble, +dns_byaddr_createptrname(const isc_netaddr_t *address, isc_boolean_t nibble, dns_name_t *name) { /* @@ -53,11 +53,11 @@ dns_byaddr_createptrname(isc_netaddr_t *address, isc_boolean_t nibble, } isc_result_t -dns_byaddr_createptrname2(isc_netaddr_t *address, unsigned int options, +dns_byaddr_createptrname2(const isc_netaddr_t *address, unsigned int options, dns_name_t *name) { char textname[128]; - unsigned char *bytes; + const unsigned char *bytes; int i; char *cp; isc_buffer_t buffer; @@ -71,7 +71,7 @@ dns_byaddr_createptrname2(isc_netaddr_t *address, unsigned int options, * of the knowledge of wire format in the dns_name_ routines. */ - bytes = (unsigned char *)(&address->type); + bytes = (const unsigned char *)(&address->type); if (address->family == AF_INET) { (void)snprintf(textname, sizeof(textname), "%u.%u.%u.%u.in-addr.arpa.", @@ -203,8 +203,8 @@ bevent_destroy(isc_event_t *event) { } isc_result_t -dns_byaddr_create(isc_mem_t *mctx, isc_netaddr_t *address, dns_view_t *view, - unsigned int options, isc_task_t *task, +dns_byaddr_create(isc_mem_t *mctx, const isc_netaddr_t *address, + dns_view_t *view, unsigned int options, isc_task_t *task, isc_taskaction_t action, void *arg, dns_byaddr_t **byaddrp) { isc_result_t result; diff --git a/lib/dns/cache.c b/lib/dns/cache.c index 9c505ab151e..5f05be22bc3 100644 --- a/lib/dns/cache.c +++ b/lib/dns/cache.c @@ -1204,7 +1204,7 @@ clearnode(dns_db_t *db, dns_dbnode_t *node) { } static isc_result_t -cleartree(dns_db_t *db, dns_name_t *name) { +cleartree(dns_db_t *db, const dns_name_t *name) { isc_result_t result, answer = ISC_R_SUCCESS; dns_dbiterator_t *iter = NULL; dns_dbnode_t *node = NULL, *top = NULL; @@ -1268,12 +1268,12 @@ cleartree(dns_db_t *db, dns_name_t *name) { } isc_result_t -dns_cache_flushname(dns_cache_t *cache, dns_name_t *name) { +dns_cache_flushname(dns_cache_t *cache, const dns_name_t *name) { return (dns_cache_flushnode(cache, name, ISC_FALSE)); } isc_result_t -dns_cache_flushnode(dns_cache_t *cache, dns_name_t *name, +dns_cache_flushnode(dns_cache_t *cache, const dns_name_t *name, isc_boolean_t tree) { isc_result_t result; diff --git a/lib/dns/catz.c b/lib/dns/catz.c index 276408a1c28..94b585ec79f 100644 --- a/lib/dns/catz.c +++ b/lib/dns/catz.c @@ -1382,7 +1382,7 @@ catz_process_value(dns_catz_zone_t *zone, dns_name_t *name, isc_result_t dns_catz_update_process(dns_catz_zones_t *catzs, dns_catz_zone_t *zone, - dns_name_t *src_name, dns_rdataset_t *rdataset) + const dns_name_t *src_name, dns_rdataset_t *rdataset) { isc_result_t result; int order; diff --git a/lib/dns/client.c b/lib/dns/client.c index 16b0baba10f..557668167cd 100644 --- a/lib/dns/client.c +++ b/lib/dns/client.c @@ -252,7 +252,7 @@ static isc_result_t getudpdispatch(int family, dns_dispatchmgr_t *dispatchmgr, isc_socketmgr_t *socketmgr, isc_taskmgr_t *taskmgr, isc_boolean_t is_shared, dns_dispatch_t **dispp, - isc_sockaddr_t *localaddr) + const isc_sockaddr_t *localaddr) { unsigned int attrs, attrmask; dns_dispatch_t *disp; @@ -279,8 +279,8 @@ getudpdispatch(int family, dns_dispatchmgr_t *dispatchmgr, attrmask |= DNS_DISPATCHATTR_IPV6; if (localaddr == NULL) { + isc_sockaddr_anyofpf(&anyaddr, family); localaddr = &anyaddr; - isc_sockaddr_anyofpf(localaddr, family); } buffersize = 4096; @@ -438,8 +438,8 @@ isc_result_t dns_client_createx2(isc_mem_t *mctx, isc_appctx_t *actx, isc_taskmgr_t *taskmgr, isc_socketmgr_t *socketmgr, isc_timermgr_t *timermgr, unsigned int options, - dns_client_t **clientp, isc_sockaddr_t *localaddr4, - isc_sockaddr_t *localaddr6) + dns_client_t **clientp, const isc_sockaddr_t *localaddr4, + const isc_sockaddr_t *localaddr6) { dns_client_t *client; isc_result_t result; @@ -619,7 +619,7 @@ dns_client_destroy(dns_client_t **clientp) { isc_result_t dns_client_setservers(dns_client_t *client, dns_rdataclass_t rdclass, - dns_name_t *namespace, isc_sockaddrlist_t *addrs) + const dns_name_t *namespace, isc_sockaddrlist_t *addrs) { isc_result_t result; dns_view_t *view = NULL; @@ -649,7 +649,7 @@ dns_client_setservers(dns_client_t *client, dns_rdataclass_t rdclass, isc_result_t dns_client_clearservers(dns_client_t *client, dns_rdataclass_t rdclass, - dns_name_t *namespace) + const dns_name_t *namespace) { isc_result_t result; dns_view_t *view = NULL; @@ -1226,7 +1226,7 @@ resolve_done(isc_task_t *task, isc_event_t *event) { } isc_result_t -dns_client_resolve(dns_client_t *client, dns_name_t *name, +dns_client_resolve(dns_client_t *client, const dns_name_t *name, dns_rdataclass_t rdclass, dns_rdatatype_t type, unsigned int options, dns_namelist_t *namelist) { @@ -1312,7 +1312,7 @@ dns_client_resolve(dns_client_t *client, dns_name_t *name, } isc_result_t -dns_client_startresolve(dns_client_t *client, dns_name_t *name, +dns_client_startresolve(dns_client_t *client, const dns_name_t *name, dns_rdataclass_t rdclass, dns_rdatatype_t type, unsigned int options, isc_task_t *task, isc_taskaction_t action, void *arg, @@ -1523,7 +1523,7 @@ dns_client_destroyrestrans(dns_clientrestrans_t **transp) { isc_result_t dns_client_addtrustedkey(dns_client_t *client, dns_rdataclass_t rdclass, - dns_name_t *keyname, isc_buffer_t *keydatabuf) + const dns_name_t *keyname, isc_buffer_t *keydatabuf) { isc_result_t result; dns_view_t *view = NULL; @@ -1635,7 +1635,7 @@ localrequest_done(isc_task_t *task, isc_event_t *event) { isc_result_t dns_client_request(dns_client_t *client, dns_message_t *qmessage, - dns_message_t *rmessage, isc_sockaddr_t *server, + dns_message_t *rmessage, const isc_sockaddr_t *server, unsigned int options, unsigned int parseoptions, dns_tsec_t *tsec, unsigned int timeout, unsigned int udptimeout, unsigned int udpretries) @@ -1717,7 +1717,7 @@ dns_client_request(dns_client_t *client, dns_message_t *qmessage, isc_result_t dns_client_startrequest(dns_client_t *client, dns_message_t *qmessage, - dns_message_t *rmessage, isc_sockaddr_t *server, + dns_message_t *rmessage, const isc_sockaddr_t *server, unsigned int options, unsigned int parseoptions, dns_tsec_t *tsec, unsigned int timeout, unsigned int udptimeout, unsigned int udpretries, @@ -2198,7 +2198,9 @@ resolveaddr_done(isc_task_t *task, isc_event_t *event) { } static isc_result_t -process_soa(updatectx_t *uctx, dns_rdataset_t *soaset, dns_name_t *soaname) { +process_soa(updatectx_t *uctx, dns_rdataset_t *soaset, + const dns_name_t *soaname) +{ isc_result_t result; dns_rdata_t soarr = DNS_RDATA_INIT; dns_rdata_soa_t soa; @@ -2577,7 +2579,7 @@ resolvesoa_done(isc_task_t *task, isc_event_t *event) { } static isc_result_t -copy_name(isc_mem_t *mctx, dns_message_t *msg, dns_name_t *name, +copy_name(isc_mem_t *mctx, dns_message_t *msg, const dns_name_t *name, dns_name_t **newnamep) { isc_result_t result; @@ -2693,7 +2695,7 @@ internal_update_callback(isc_task_t *task, isc_event_t *event) { isc_result_t dns_client_update(dns_client_t *client, dns_rdataclass_t rdclass, - dns_name_t *zonename, dns_namelist_t *prerequisites, + const dns_name_t *zonename, dns_namelist_t *prerequisites, dns_namelist_t *updates, isc_sockaddrlist_t *servers, dns_tsec_t *tsec, unsigned int options) { @@ -2816,7 +2818,8 @@ fail: isc_result_t dns_client_startupdate(dns_client_t *client, dns_rdataclass_t rdclass, - dns_name_t *zonename, dns_namelist_t *prerequisites, + const dns_name_t *zonename, + dns_namelist_t *prerequisites, dns_namelist_t *updates, isc_sockaddrlist_t *servers, dns_tsec_t *tsec, unsigned int options, isc_task_t *task, isc_taskaction_t action, void *arg, @@ -3095,7 +3098,7 @@ typedef struct { } dns_client_updaterec_t; isc_result_t -dns_client_updaterec(dns_client_updateop_t op, dns_name_t *owner, +dns_client_updaterec(dns_client_updateop_t op, const dns_name_t *owner, dns_rdatatype_t type, dns_rdata_t *source, dns_ttl_t ttl, dns_name_t *target, dns_rdataset_t *rdataset, dns_rdatalist_t *rdatalist, diff --git a/lib/dns/db.c b/lib/dns/db.c index 0be1e22e171..c707e943802 100644 --- a/lib/dns/db.c +++ b/lib/dns/db.c @@ -101,7 +101,7 @@ impfind(const char *name) { ***/ isc_result_t -dns_db_create(isc_mem_t *mctx, const char *db_type, dns_name_t *origin, +dns_db_create(isc_mem_t *mctx, const char *db_type, const dns_name_t *origin, dns_dbtype_t type, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], dns_db_t **dbp) { @@ -469,7 +469,7 @@ dns_db_closeversion(dns_db_t *db, dns_dbversion_t **versionp, ***/ isc_result_t -dns_db_findnode(dns_db_t *db, dns_name_t *name, +dns_db_findnode(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, dns_dbnode_t **nodep) { @@ -488,7 +488,7 @@ dns_db_findnode(dns_db_t *db, dns_name_t *name, } isc_result_t -dns_db_findnodeext(dns_db_t *db, dns_name_t *name, +dns_db_findnodeext(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, dns_dbnode_t **nodep) { @@ -508,7 +508,7 @@ dns_db_findnodeext(dns_db_t *db, dns_name_t *name, } isc_result_t -dns_db_findnsec3node(dns_db_t *db, dns_name_t *name, +dns_db_findnsec3node(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, dns_dbnode_t **nodep) { @@ -523,7 +523,7 @@ dns_db_findnsec3node(dns_db_t *db, dns_name_t *name, } isc_result_t -dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, +dns_db_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) @@ -556,7 +556,7 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, } isc_result_t -dns_db_findext(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, +dns_db_findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, @@ -591,7 +591,7 @@ dns_db_findext(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, } isc_result_t -dns_db_findzonecut(dns_db_t *db, dns_name_t *name, +dns_db_findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) @@ -1026,7 +1026,8 @@ dns_db_setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, } isc_result_t -dns_db_getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, dns_name_t *name) +dns_db_getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, + dns_name_t *name) { if (db->methods->getsigningtime != NULL) return ((db->methods->getsigningtime)(db, rdataset, name)); diff --git a/lib/dns/dbiterator.c b/lib/dns/dbiterator.c index 6bf96f5c1ba..2f19e2034b9 100644 --- a/lib/dns/dbiterator.c +++ b/lib/dns/dbiterator.c @@ -54,7 +54,7 @@ dns_dbiterator_last(dns_dbiterator_t *iterator) { } isc_result_t -dns_dbiterator_seek(dns_dbiterator_t *iterator, dns_name_t *name) { +dns_dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name) { /* * Move the node cursor to the node with name 'name'. */ diff --git a/lib/dns/dbtable.c b/lib/dns/dbtable.c index b916c3c606f..73c63c99dc2 100644 --- a/lib/dns/dbtable.c +++ b/lib/dns/dbtable.c @@ -252,7 +252,7 @@ dns_dbtable_removedefault(dns_dbtable_t *dbtable) { } isc_result_t -dns_dbtable_find(dns_dbtable_t *dbtable, dns_name_t *name, +dns_dbtable_find(dns_dbtable_t *dbtable, const dns_name_t *name, unsigned int options, dns_db_t **dbp) { dns_db_t *stored_data = NULL; diff --git a/lib/dns/diff.c b/lib/dns/diff.c index f96537b2e8f..ef3ad4f38a6 100644 --- a/lib/dns/diff.c +++ b/lib/dns/diff.c @@ -47,7 +47,7 @@ rdata_covers(dns_rdata_t *rdata) { isc_result_t dns_difftuple_create(isc_mem_t *mctx, - dns_diffop_t op, dns_name_t *name, dns_ttl_t ttl, + dns_diffop_t op, const dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata, dns_difftuple_t **tp) { dns_difftuple_t *t; @@ -232,7 +232,7 @@ getownercase(dns_rdataset_t *rdataset, dns_name_t *name) { } static void -setownercase(dns_rdataset_t *rdataset, dns_name_t *name) { +setownercase(dns_rdataset_t *rdataset, const dns_name_t *name) { if (dns_rdataset_isassociated(rdataset)) dns_rdataset_setownercase(rdataset, name); } diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c index d188bda46a7..383b2a4287e 100644 --- a/lib/dns/dispatch.c +++ b/lib/dns/dispatch.c @@ -275,7 +275,7 @@ struct dns_dispatch { /* * Statics. */ -static dns_dispentry_t *entry_search(dns_qid_t *, isc_sockaddr_t *, +static dns_dispentry_t *entry_search(dns_qid_t *, const isc_sockaddr_t *, dns_messageid_t, in_port_t, unsigned int); static isc_boolean_t destroy_disp_ok(dns_dispatch_t *); static void destroy_disp(isc_task_t *task, isc_event_t *event); @@ -286,8 +286,8 @@ 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 *, isc_sockaddr_t *, dns_messageid_t, - in_port_t); +static isc_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); static inline void free_devent(dns_dispatch_t *disp, dns_dispatchevent_t *ev); @@ -300,13 +300,13 @@ static void dispatch_free(dns_dispatch_t **dispp); static isc_result_t get_udpsocket(dns_dispatchmgr_t *mgr, dns_dispatch_t *disp, isc_socketmgr_t *sockmgr, - isc_sockaddr_t *localaddr, + const isc_sockaddr_t *localaddr, isc_socket_t **sockp, isc_socket_t *dup_socket); static isc_result_t dispatch_createudp(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr, isc_taskmgr_t *taskmgr, - isc_sockaddr_t *localaddr, + const isc_sockaddr_t *localaddr, unsigned int maxrequests, unsigned int attributes, dns_dispatch_t **dispp, @@ -317,7 +317,8 @@ static isc_result_t qid_allocate(dns_dispatchmgr_t *mgr, unsigned int buckets, unsigned int increment, dns_qid_t **qidp, isc_boolean_t needaddrtable); static void qid_destroy(isc_mem_t *mctx, dns_qid_t **qidp); -static isc_result_t open_socket(isc_socketmgr_t *mgr, isc_sockaddr_t *local, +static isc_result_t open_socket(isc_socketmgr_t *mgr, + const isc_sockaddr_t *local, unsigned int options, isc_socket_t **sockp, isc_socket_t *dup_socket); static isc_boolean_t portavailable(dns_dispatchmgr_t *mgr, isc_socket_t *sock, @@ -417,7 +418,7 @@ request_log(dns_dispatch_t *disp, dns_dispentry_t *resp, * Return a hash of the destination and message id. */ static isc_uint32_t -dns_hash(dns_qid_t *qid, isc_sockaddr_t *dest, dns_messageid_t id, +dns_hash(dns_qid_t *qid, const isc_sockaddr_t *dest, dns_messageid_t id, in_port_t port) { unsigned int ret; @@ -628,7 +629,7 @@ deref_portentry(dns_dispatch_t *disp, dispportentry_t **portentryp) { * Return NULL if no such entry exists. Requires qid->lock to be held. */ static dispsocket_t * -socket_search(dns_qid_t *qid, isc_sockaddr_t *dest, in_port_t port, +socket_search(dns_qid_t *qid, const isc_sockaddr_t *dest, in_port_t port, unsigned int bucket) { dispsocket_t *dispsock; @@ -654,7 +655,7 @@ socket_search(dns_qid_t *qid, isc_sockaddr_t *dest, in_port_t port, * The caller must hold the disp->lock */ static isc_result_t -get_dispsocket(dns_dispatch_t *disp, isc_sockaddr_t *dest, +get_dispsocket(dns_dispatch_t *disp, const isc_sockaddr_t *dest, isc_socketmgr_t *sockmgr, dispsocket_t **dispsockp, in_port_t *portp) { @@ -867,7 +868,7 @@ deactivate_dispsocket(dns_dispatch_t *disp, dispsocket_t *dispsock) { * Return NULL if no such entry exists. */ static dns_dispentry_t * -entry_search(dns_qid_t *qid, isc_sockaddr_t *dest, dns_messageid_t id, +entry_search(dns_qid_t *qid, const isc_sockaddr_t *dest, dns_messageid_t id, in_port_t port, unsigned int bucket) { dns_dispentry_t *res; @@ -1675,7 +1676,7 @@ destroy_mgr(dns_dispatchmgr_t **mgrp) { } static isc_result_t -open_socket(isc_socketmgr_t *mgr, isc_sockaddr_t *local, +open_socket(isc_socketmgr_t *mgr, const isc_sockaddr_t *local, unsigned int options, isc_socket_t **sockp, isc_socket_t *dup_socket) { @@ -2189,7 +2190,7 @@ unlock: #define ATTRMATCH(_a1, _a2, _mask) (((_a1) & (_mask)) == ((_a2) & (_mask))) static isc_boolean_t -local_addr_match(dns_dispatch_t *disp, isc_sockaddr_t *addr) { +local_addr_match(dns_dispatch_t *disp, const isc_sockaddr_t *addr) { isc_sockaddr_t sockaddr; isc_result_t result; @@ -2240,7 +2241,7 @@ local_addr_match(dns_dispatch_t *disp, isc_sockaddr_t *addr) { * returns, and must be unlocked by the caller. */ static isc_result_t -dispatch_find(dns_dispatchmgr_t *mgr, isc_sockaddr_t *local, +dispatch_find(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *local, unsigned int attributes, unsigned int mask, dns_dispatch_t **dispp) { @@ -2508,8 +2509,8 @@ dns_dispatch_createtcp(dns_dispatchmgr_t *mgr, isc_socket_t *sock, isc_result_t dns_dispatch_createtcp2(dns_dispatchmgr_t *mgr, isc_socket_t *sock, - isc_taskmgr_t *taskmgr, isc_sockaddr_t *localaddr, - isc_sockaddr_t *destaddr, unsigned int buffersize, + isc_taskmgr_t *taskmgr, const isc_sockaddr_t *localaddr, + const isc_sockaddr_t *destaddr, unsigned int buffersize, unsigned int maxbuffers, unsigned int maxrequests, unsigned int buckets, unsigned int increment, unsigned int attributes, dns_dispatch_t **dispp) @@ -2618,8 +2619,8 @@ dns_dispatch_createtcp2(dns_dispatchmgr_t *mgr, isc_socket_t *sock, } isc_result_t -dns_dispatch_gettcp(dns_dispatchmgr_t *mgr, isc_sockaddr_t *destaddr, - isc_sockaddr_t *localaddr, dns_dispatch_t **dispp) +dns_dispatch_gettcp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *destaddr, + const isc_sockaddr_t *localaddr, dns_dispatch_t **dispp) { dns_dispatch_t *disp; isc_result_t result; @@ -2667,8 +2668,8 @@ dns_dispatch_gettcp(dns_dispatchmgr_t *mgr, isc_sockaddr_t *destaddr, } isc_result_t -dns_dispatch_gettcp2(dns_dispatchmgr_t *mgr, isc_sockaddr_t *destaddr, - isc_sockaddr_t *localaddr, isc_boolean_t *connected, +dns_dispatch_gettcp2(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *destaddr, + const isc_sockaddr_t *localaddr, isc_boolean_t *connected, dns_dispatch_t **dispp) { dns_dispatch_t *disp; @@ -2745,7 +2746,7 @@ dns_dispatch_gettcp2(dns_dispatchmgr_t *mgr, isc_sockaddr_t *destaddr, isc_result_t dns_dispatch_getudp_dup(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr, - isc_taskmgr_t *taskmgr, isc_sockaddr_t *localaddr, + isc_taskmgr_t *taskmgr, const isc_sockaddr_t *localaddr, unsigned int buffersize, unsigned int maxbuffers, unsigned int maxrequests, unsigned int buckets, unsigned int increment, @@ -2831,7 +2832,7 @@ dns_dispatch_getudp_dup(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr, isc_result_t dns_dispatch_getudp(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr, - isc_taskmgr_t *taskmgr, isc_sockaddr_t *localaddr, + isc_taskmgr_t *taskmgr, const isc_sockaddr_t *localaddr, unsigned int buffersize, unsigned int maxbuffers, unsigned int maxrequests, unsigned int buckets, unsigned int increment, @@ -2854,7 +2855,7 @@ dns_dispatch_getudp(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr, static isc_result_t get_udpsocket(dns_dispatchmgr_t *mgr, dns_dispatch_t *disp, - isc_socketmgr_t *sockmgr, isc_sockaddr_t *localaddr, + isc_socketmgr_t *sockmgr, const isc_sockaddr_t *localaddr, isc_socket_t **sockp, isc_socket_t *dup_socket) { unsigned int i, j; @@ -2961,7 +2962,7 @@ end: static isc_result_t dispatch_createudp(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr, isc_taskmgr_t *taskmgr, - isc_sockaddr_t *localaddr, + const isc_sockaddr_t *localaddr, unsigned int maxrequests, unsigned int attributes, dns_dispatch_t **dispp, @@ -3171,7 +3172,7 @@ dns_dispatch_detach(dns_dispatch_t **dispp) { } isc_result_t -dns_dispatch_addresponse2(dns_dispatch_t *disp, isc_sockaddr_t *dest, +dns_dispatch_addresponse2(dns_dispatch_t *disp, const isc_sockaddr_t *dest, isc_task_t *task, isc_taskaction_t action, void *arg, dns_messageid_t *idp, dns_dispentry_t **resp, isc_socketmgr_t *sockmgr) @@ -3182,7 +3183,7 @@ dns_dispatch_addresponse2(dns_dispatch_t *disp, isc_sockaddr_t *dest, isc_result_t dns_dispatch_addresponse3(dns_dispatch_t *disp, unsigned int options, - isc_sockaddr_t *dest, isc_task_t *task, + const isc_sockaddr_t *dest, isc_task_t *task, isc_taskaction_t action, void *arg, dns_messageid_t *idp, dns_dispentry_t **resp, isc_socketmgr_t *sockmgr) @@ -3380,7 +3381,7 @@ dns_dispatch_addresponse3(dns_dispatch_t *disp, unsigned int options, } isc_result_t -dns_dispatch_addresponse(dns_dispatch_t *disp, isc_sockaddr_t *dest, +dns_dispatch_addresponse(dns_dispatch_t *disp, const isc_sockaddr_t *dest, isc_task_t *task, isc_taskaction_t action, void *arg, dns_messageid_t *idp, dns_dispentry_t **resp) { diff --git a/lib/dns/dlz.c b/lib/dns/dlz.c index 9f819374cf6..6571394765f 100644 --- a/lib/dns/dlz.c +++ b/lib/dns/dlz.c @@ -103,8 +103,8 @@ dlz_impfind(const char *name) { ***/ isc_result_t -dns_dlzallowzonexfr(dns_view_t *view, dns_name_t *name, - isc_sockaddr_t *clientaddr, dns_db_t **dbp) +dns_dlzallowzonexfr(dns_view_t *view, const dns_name_t *name, + const isc_sockaddr_t *clientaddr, dns_db_t **dbp) { isc_result_t result = ISC_R_NOTFOUND; dns_dlzallowzonexfr_t allowzonexfr; @@ -520,8 +520,8 @@ dns_dlzconfigure(dns_view_t *view, dns_dlzdb_t *dlzdb, } isc_boolean_t -dns_dlz_ssumatch(dns_dlzdb_t *dlzdatabase, dns_name_t *signer, - dns_name_t *name, isc_netaddr_t *tcpaddr, +dns_dlz_ssumatch(dns_dlzdb_t *dlzdatabase, const dns_name_t *signer, + const dns_name_t *name, const isc_netaddr_t *tcpaddr, dns_rdatatype_t type, const dst_key_t *key) { dns_dlzimplementation_t *impl; diff --git a/lib/dns/dns64.c b/lib/dns/dns64.c index 10e9a81a88b..417c6ee88bc 100644 --- a/lib/dns/dns64.c +++ b/lib/dns/dns64.c @@ -46,8 +46,8 @@ struct dns_dns64 { }; isc_result_t -dns_dns64_create(isc_mem_t *mctx, isc_netaddr_t *prefix, - unsigned int prefixlen, isc_netaddr_t *suffix, +dns_dns64_create(isc_mem_t *mctx, const isc_netaddr_t *prefix, + unsigned int prefixlen, const isc_netaddr_t *suffix, dns_acl_t *clients, dns_acl_t *mapped, dns_acl_t *excluded, unsigned int flags, dns_dns64_t **dns64) { diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c index e619366b87a..fb64f776fec 100644 --- a/lib/dns/dnssec.c +++ b/lib/dns/dnssec.c @@ -131,8 +131,8 @@ rdataset_to_sortedarray(dns_rdataset_t *set, isc_mem_t *mctx, } isc_result_t -dns_dnssec_keyfromrdata(dns_name_t *name, dns_rdata_t *rdata, isc_mem_t *mctx, - dst_key_t **key) +dns_dnssec_keyfromrdata(const dns_name_t *name, const dns_rdata_t *rdata, + isc_mem_t *mctx, dst_key_t **key) { isc_buffer_t b; isc_region_t r; @@ -180,7 +180,7 @@ digest_sig(dst_context_t *ctx, isc_boolean_t downcase, dns_rdata_t *sigrdata, } isc_result_t -dns_dnssec_sign(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, +dns_dnssec_sign(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, isc_stdtime_t *inception, isc_stdtime_t *expire, isc_mem_t *mctx, isc_buffer_t *buffer, dns_rdata_t *sigrdata) { @@ -360,7 +360,7 @@ cleanup_signature: } isc_result_t -dns_dnssec_verify2(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, +dns_dnssec_verify2(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, isc_boolean_t ignoretime, isc_mem_t *mctx, dns_rdata_t *sigrdata, dns_name_t *wild) { @@ -369,7 +369,7 @@ dns_dnssec_verify2(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, } isc_result_t -dns_dnssec_verify3(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, +dns_dnssec_verify3(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, isc_boolean_t ignoretime, unsigned int maxbits, isc_mem_t *mctx, dns_rdata_t *sigrdata, dns_name_t *wild) { @@ -588,7 +588,7 @@ cleanup_struct: } isc_result_t -dns_dnssec_verify(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, +dns_dnssec_verify(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, isc_boolean_t ignoretime, isc_mem_t *mctx, dns_rdata_t *sigrdata) { @@ -728,7 +728,7 @@ syncdelete(dst_key_t *key, isc_stdtime_t now) { isc_result_t dns_dnssec_findzonekeys3(dns_db_t *db, dns_dbversion_t *ver, - dns_dbnode_t *node, dns_name_t *name, + dns_dbnode_t *node, const dns_name_t *name, const char *directory, isc_stdtime_t now, isc_mem_t *mctx, unsigned int maxkeys, dst_key_t **keys, unsigned int *nkeys) @@ -889,7 +889,7 @@ dns_dnssec_findzonekeys3(dns_db_t *db, dns_dbversion_t *ver, isc_result_t dns_dnssec_findzonekeys2(dns_db_t *db, dns_dbversion_t *ver, - dns_dbnode_t *node, dns_name_t *name, + dns_dbnode_t *node, const dns_name_t *name, const char *directory, isc_mem_t *mctx, unsigned int maxkeys, dst_key_t **keys, unsigned int *nkeys) @@ -903,9 +903,9 @@ dns_dnssec_findzonekeys2(dns_db_t *db, dns_dbversion_t *ver, isc_result_t dns_dnssec_findzonekeys(dns_db_t *db, dns_dbversion_t *ver, - dns_dbnode_t *node, dns_name_t *name, isc_mem_t *mctx, - unsigned int maxkeys, dst_key_t **keys, - unsigned int *nkeys) + dns_dbnode_t *node, const dns_name_t *name, + isc_mem_t *mctx, unsigned int maxkeys, + dst_key_t **keys, unsigned int *nkeys) { isc_stdtime_t now; @@ -1184,7 +1184,7 @@ failure: * Does this key ('rdata') self sign the rrset ('rdataset')? */ isc_boolean_t -dns_dnssec_selfsigns(dns_rdata_t *rdata, dns_name_t *name, +dns_dnssec_selfsigns(dns_rdata_t *rdata, const dns_name_t *name, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, isc_boolean_t ignoretime, isc_mem_t *mctx) { @@ -1204,7 +1204,7 @@ dns_dnssec_selfsigns(dns_rdata_t *rdata, dns_name_t *name, } isc_boolean_t -dns_dnssec_signs(dns_rdata_t *rdata, dns_name_t *name, +dns_dnssec_signs(dns_rdata_t *rdata, const dns_name_t *name, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, isc_boolean_t ignoretime, isc_mem_t *mctx) { @@ -1400,7 +1400,7 @@ get_hints(dns_dnsseckey_t *key, isc_stdtime_t now) { * Get a list of DNSSEC keys from the key repository */ isc_result_t -dns_dnssec_findmatchingkeys2(dns_name_t *origin, const char *directory, +dns_dnssec_findmatchingkeys2(const dns_name_t *origin, const char *directory, isc_stdtime_t now, isc_mem_t *mctx, dns_dnsseckeylist_t *keylist) { @@ -1531,7 +1531,7 @@ dns_dnssec_findmatchingkeys2(dns_name_t *origin, const char *directory, } isc_result_t -dns_dnssec_findmatchingkeys(dns_name_t *origin, const char *directory, +dns_dnssec_findmatchingkeys(const dns_name_t *origin, const char *directory, isc_mem_t *mctx, dns_dnsseckeylist_t *keylist) { isc_stdtime_t now; @@ -1651,7 +1651,7 @@ mark_active_keys(dns_dnsseckeylist_t *keylist, dns_rdataset_t *rrsigs) { * Add the contents of a DNSKEY rdataset 'keyset' to 'keylist'. */ isc_result_t -dns_dnssec_keylistfromrdataset(dns_name_t *origin, +dns_dnssec_keylistfromrdataset(const dns_name_t *origin, const char *directory, isc_mem_t *mctx, dns_rdataset_t *keyset, dns_rdataset_t *keysigs, dns_rdataset_t *soasigs, isc_boolean_t savekeys, @@ -1851,7 +1851,7 @@ delete(dns_rdata_t *rdata, dns_diff_t *diff, dns_name_t *origin, } static isc_result_t -publish_key(dns_diff_t *diff, dns_dnsseckey_t *key, dns_name_t *origin, +publish_key(dns_diff_t *diff, dns_dnsseckey_t *key, const dns_name_t *origin, dns_ttl_t ttl, isc_mem_t *mctx, isc_boolean_t allzsk, void (*report)(const char *, ...)) { @@ -1893,7 +1893,7 @@ publish_key(dns_diff_t *diff, dns_dnsseckey_t *key, dns_name_t *origin, } static isc_result_t -remove_key(dns_diff_t *diff, dns_dnsseckey_t *key, dns_name_t *origin, +remove_key(dns_diff_t *diff, dns_dnsseckey_t *key, const dns_name_t *origin, dns_ttl_t ttl, isc_mem_t *mctx, const char *reason, void (*report)(const char *, ...)) { @@ -2068,7 +2068,7 @@ dns_dnssec_syncupdate(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *rmkeys, */ isc_result_t dns_dnssec_updatekeys(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *newkeys, - dns_dnsseckeylist_t *removed, dns_name_t *origin, + dns_dnsseckeylist_t *removed, const dns_name_t *origin, dns_ttl_t hint_ttl, dns_diff_t *diff, isc_boolean_t allzsk, isc_mem_t *mctx, void (*report)(const char *, ...)) diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c index 65f5768d01d..307aee1e5fd 100644 --- a/lib/dns/dst_api.c +++ b/lib/dns/dst_api.c @@ -80,7 +80,7 @@ LIBDNS_EXTERNAL_DATA isc_mem_t *dst__memory_pool = NULL; /* * Static functions. */ -static dst_key_t * get_key_struct(dns_name_t *name, +static dst_key_t * get_key_struct(const dns_name_t *name, unsigned int alg, unsigned int flags, unsigned int protocol, @@ -97,7 +97,7 @@ static isc_result_t buildfilename(dns_name_t *name, const char *directory, isc_buffer_t *out); static isc_result_t computeid(dst_key_t *key); -static isc_result_t frombuffer(dns_name_t *name, +static isc_result_t frombuffer(const dns_name_t *name, unsigned int alg, unsigned int flags, unsigned int protocol, @@ -728,7 +728,7 @@ dst_key_todns(const dst_key_t *key, isc_buffer_t *target) { } isc_result_t -dst_key_fromdns(dns_name_t *name, dns_rdataclass_t rdclass, +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; @@ -770,7 +770,7 @@ dst_key_fromdns(dns_name_t *name, dns_rdataclass_t rdclass, } isc_result_t -dst_key_frombuffer(dns_name_t *name, unsigned int alg, +dst_key_frombuffer(const dns_name_t *name, unsigned int alg, unsigned int flags, unsigned int protocol, dns_rdataclass_t rdclass, isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp) @@ -840,8 +840,8 @@ dst_key_getgssctx(const dst_key_t *key) } isc_result_t -dst_key_fromgssapi(dns_name_t *name, gss_ctx_id_t gssctx, isc_mem_t *mctx, - dst_key_t **keyp, isc_region_t *intoken) +dst_key_fromgssapi(const dns_name_t *name, gss_ctx_id_t gssctx, + isc_mem_t *mctx, dst_key_t **keyp, isc_region_t *intoken) { dst_key_t *key; isc_result_t result; @@ -872,7 +872,7 @@ out: } isc_result_t -dst_key_buildinternal(dns_name_t *name, unsigned int alg, +dst_key_buildinternal(const dns_name_t *name, unsigned int alg, unsigned int bits, unsigned int flags, unsigned int protocol, dns_rdataclass_t rdclass, void *data, isc_mem_t *mctx, dst_key_t **keyp) @@ -906,7 +906,7 @@ dst_key_buildinternal(dns_name_t *name, unsigned int alg, } isc_result_t -dst_key_fromlabel(dns_name_t *name, int alg, unsigned int flags, +dst_key_fromlabel(const dns_name_t *name, int alg, unsigned int flags, unsigned int protocol, dns_rdataclass_t rdclass, const char *engine, const char *label, const char *pin, isc_mem_t *mctx, dst_key_t **keyp) @@ -948,7 +948,7 @@ dst_key_fromlabel(dns_name_t *name, int alg, unsigned int flags, } isc_result_t -dst_key_generate(dns_name_t *name, unsigned int alg, +dst_key_generate(const dns_name_t *name, unsigned int alg, unsigned int bits, unsigned int param, unsigned int flags, unsigned int protocol, dns_rdataclass_t rdclass, @@ -959,7 +959,7 @@ dst_key_generate(dns_name_t *name, unsigned int alg, } isc_result_t -dst_key_generate2(dns_name_t *name, unsigned int alg, +dst_key_generate2(const dns_name_t *name, unsigned int alg, unsigned int bits, unsigned int param, unsigned int flags, unsigned int protocol, dns_rdataclass_t rdclass, @@ -1409,7 +1409,7 @@ dst_key_restore(dns_name_t *name, unsigned int alg, unsigned int flags, * Allocates a key structure and fills in some of the fields. */ static dst_key_t * -get_key_struct(dns_name_t *name, unsigned int alg, +get_key_struct(const dns_name_t *name, unsigned int alg, unsigned int flags, unsigned int protocol, unsigned int bits, dns_rdataclass_t rdclass, dns_ttl_t ttl, isc_mem_t *mctx) @@ -1868,7 +1868,7 @@ computeid(dst_key_t *key) { } static isc_result_t -frombuffer(dns_name_t *name, unsigned int alg, unsigned int flags, +frombuffer(const dns_name_t *name, unsigned int alg, unsigned int flags, unsigned int protocol, dns_rdataclass_t rdclass, isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp) { diff --git a/lib/dns/ecdb.c b/lib/dns/ecdb.c index 23aca666f49..163441b33b9 100644 --- a/lib/dns/ecdb.c +++ b/lib/dns/ecdb.c @@ -76,7 +76,7 @@ typedef struct rdatasetheader { #define NEGATIVE(header) \ (((header)->attributes & RDATASET_ATTR_NEGATIVE) != 0) -static isc_result_t dns_ecdb_create(isc_mem_t *mctx, dns_name_t *origin, +static isc_result_t dns_ecdb_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], @@ -282,7 +282,7 @@ detachnode(dns_db_t *db, dns_dbnode_t **nodep) { } static isc_result_t -find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, +find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) @@ -305,7 +305,7 @@ find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, } static isc_result_t -findzonecut(dns_db_t *db, dns_name_t *name, +findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) @@ -326,7 +326,7 @@ findzonecut(dns_db_t *db, dns_name_t *name, } static isc_result_t -findnode(dns_db_t *db, dns_name_t *name, isc_boolean_t create, +findnode(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, dns_dbnode_t **nodep) { dns_ecdb_t *ecdb = (dns_ecdb_t *)db; @@ -587,7 +587,7 @@ static dns_dbmethods_t ecdb_methods = { }; static isc_result_t -dns_ecdb_create(isc_mem_t *mctx, dns_name_t *origin, dns_dbtype_t type, +dns_ecdb_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], void *driverarg, dns_db_t **dbp) { diff --git a/lib/dns/forward.c b/lib/dns/forward.c index 08e89d8f859..e6d71c356cf 100644 --- a/lib/dns/forward.c +++ b/lib/dns/forward.c @@ -72,7 +72,7 @@ dns_fwdtable_create(isc_mem_t *mctx, dns_fwdtable_t **fwdtablep) { } isc_result_t -dns_fwdtable_addfwd(dns_fwdtable_t *fwdtable, dns_name_t *name, +dns_fwdtable_addfwd(dns_fwdtable_t *fwdtable, const dns_name_t *name, dns_forwarderlist_t *fwdrs, dns_fwdpolicy_t fwdpolicy) { isc_result_t result; @@ -121,7 +121,7 @@ dns_fwdtable_addfwd(dns_fwdtable_t *fwdtable, dns_name_t *name, } isc_result_t -dns_fwdtable_add(dns_fwdtable_t *fwdtable, dns_name_t *name, +dns_fwdtable_add(dns_fwdtable_t *fwdtable, const dns_name_t *name, isc_sockaddrlist_t *addrs, dns_fwdpolicy_t fwdpolicy) { isc_result_t result; @@ -172,7 +172,7 @@ dns_fwdtable_add(dns_fwdtable_t *fwdtable, dns_name_t *name, } isc_result_t -dns_fwdtable_delete(dns_fwdtable_t *fwdtable, dns_name_t *name) { +dns_fwdtable_delete(dns_fwdtable_t *fwdtable, const dns_name_t *name) { isc_result_t result; REQUIRE(VALID_FWDTABLE(fwdtable)); @@ -188,14 +188,14 @@ dns_fwdtable_delete(dns_fwdtable_t *fwdtable, dns_name_t *name) { } isc_result_t -dns_fwdtable_find(dns_fwdtable_t *fwdtable, dns_name_t *name, +dns_fwdtable_find(dns_fwdtable_t *fwdtable, const dns_name_t *name, dns_forwarders_t **forwardersp) { return (dns_fwdtable_find2(fwdtable, name, NULL, forwardersp)); } isc_result_t -dns_fwdtable_find2(dns_fwdtable_t *fwdtable, dns_name_t *name, +dns_fwdtable_find2(dns_fwdtable_t *fwdtable, const dns_name_t *name, dns_name_t *foundname, dns_forwarders_t **forwardersp) { isc_result_t result; diff --git a/lib/dns/gssapictx.c b/lib/dns/gssapictx.c index 3b92805cb11..d2fe9de23c6 100644 --- a/lib/dns/gssapictx.c +++ b/lib/dns/gssapictx.c @@ -111,10 +111,11 @@ static gss_OID_set_desc mech_oid_set = { #ifdef GSSAPI static inline void -name_to_gbuffer(dns_name_t *name, isc_buffer_t *buffer, +name_to_gbuffer(const dns_name_t *name, isc_buffer_t *buffer, gss_buffer_desc *gbuffer) { - dns_name_t tname, *namep; + dns_name_t tname; + const dns_name_t *namep; isc_region_t r; isc_result_t result; @@ -243,7 +244,7 @@ check_config(const char *gss_name) { #endif isc_result_t -dst_gssapi_acquirecred(dns_name_t *name, isc_boolean_t initiate, +dst_gssapi_acquirecred(const dns_name_t *name, isc_boolean_t initiate, gss_cred_id_t *cred) { #ifdef GSSAPI @@ -341,8 +342,9 @@ cleanup: } isc_boolean_t -dst_gssapi_identitymatchesrealmkrb5(dns_name_t *signer, dns_name_t *name, - dns_name_t *realm) +dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer, + const dns_name_t *name, + const dns_name_t *realm) { #ifdef GSSAPI char sbuf[DNS_NAME_FORMATSIZE]; @@ -414,8 +416,9 @@ dst_gssapi_identitymatchesrealmkrb5(dns_name_t *signer, dns_name_t *name, } isc_boolean_t -dst_gssapi_identitymatchesrealmms(dns_name_t *signer, dns_name_t *name, - dns_name_t *realm) +dst_gssapi_identitymatchesrealmms(const dns_name_t *signer, + const dns_name_t *name, + const dns_name_t *realm) { #ifdef GSSAPI char sbuf[DNS_NAME_FORMATSIZE]; @@ -553,7 +556,7 @@ gss_err_message(isc_mem_t *mctx, isc_uint32_t major, isc_uint32_t minor, #endif isc_result_t -dst_gssapi_initctx(dns_name_t *name, isc_buffer_t *intoken, +dst_gssapi_initctx(const dns_name_t *name, isc_buffer_t *intoken, isc_buffer_t *outtoken, gss_ctx_id_t *gssctx, isc_mem_t *mctx, char **err_message) { diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h index a33dd953401..b33e0d4c714 100644 --- a/lib/dns/include/dns/adb.h +++ b/lib/dns/include/dns/adb.h @@ -328,13 +328,13 @@ dns_adb_shutdown(dns_adb_t *adb); isc_result_t dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, - void *arg, dns_name_t *name, dns_name_t *qname, + void *arg, const dns_name_t *name, const dns_name_t *qname, dns_rdatatype_t qtype, unsigned int options, isc_stdtime_t now, dns_name_t *target, in_port_t port, dns_adbfind_t **find); isc_result_t dns_adb_createfind2(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, - void *arg, dns_name_t *name, dns_name_t *qname, + void *arg, const dns_name_t *name, const dns_name_t *qname, dns_rdatatype_t qtype, unsigned int options, isc_stdtime_t now, dns_name_t *target, in_port_t port, unsigned int depth, isc_counter_t *qc, @@ -493,8 +493,9 @@ dns_adb_dumpfind(dns_adbfind_t *find, FILE *f); */ isc_result_t -dns_adb_marklame(dns_adb_t *adb, dns_adbaddrinfo_t *addr, dns_name_t *qname, - dns_rdatatype_t type, isc_stdtime_t expire_time); +dns_adb_marklame(dns_adb_t *adb, dns_adbaddrinfo_t *addr, + const dns_name_t *qname, dns_rdatatype_t type, + isc_stdtime_t expire_time); /*%< * Mark the given address as lame for the . expire_time should * be set to the time when the entry should expire. That is, if it is to @@ -672,7 +673,7 @@ dns_adb_noedns(dns_adb_t *adb, dns_adbaddrinfo_t *addr); isc_result_t -dns_adb_findaddrinfo(dns_adb_t *adb, isc_sockaddr_t *sa, +dns_adb_findaddrinfo(dns_adb_t *adb, const isc_sockaddr_t *sa, dns_adbaddrinfo_t **addrp, isc_stdtime_t now); /*%< * Return a dns_adbaddrinfo_t that is associated with address 'sa'. @@ -726,7 +727,7 @@ dns_adb_setadbsize(dns_adb_t *adb, size_t size); */ void -dns_adb_flushname(dns_adb_t *adb, dns_name_t *name); +dns_adb_flushname(dns_adb_t *adb, const dns_name_t *name); /*%< * Flush 'name' from the adb cache. * @@ -736,7 +737,7 @@ dns_adb_flushname(dns_adb_t *adb, dns_name_t *name); */ void -dns_adb_flushnames(dns_adb_t *adb, dns_name_t *name); +dns_adb_flushnames(dns_adb_t *adb, const dns_name_t *name); /*%< * Flush 'name' and all subdomains from the adb cache. * diff --git a/lib/dns/include/dns/badcache.h b/lib/dns/include/dns/badcache.h index 3a808cbb431..baf25b1c597 100644 --- a/lib/dns/include/dns/badcache.h +++ b/lib/dns/include/dns/badcache.h @@ -67,7 +67,7 @@ dns_badcache_destroy(dns_badcache_t **bcp); */ void -dns_badcache_add(dns_badcache_t *bc, dns_name_t *name, +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); /*% @@ -83,7 +83,7 @@ dns_badcache_add(dns_badcache_t *bc, dns_name_t *name, */ isc_boolean_t -dns_badcache_find(dns_badcache_t *bc, dns_name_t *name, +dns_badcache_find(dns_badcache_t *bc, const dns_name_t *name, dns_rdatatype_t type, isc_uint32_t *flagp, isc_time_t *now); /*% @@ -109,7 +109,7 @@ dns_badcache_flush(dns_badcache_t *bc); */ void -dns_badcache_flushname(dns_badcache_t *bc, dns_name_t *name); +dns_badcache_flushname(dns_badcache_t *bc, const dns_name_t *name); /*% * Flush the bad cache of all entries at 'name'. * @@ -119,7 +119,7 @@ dns_badcache_flushname(dns_badcache_t *bc, dns_name_t *name); */ void -dns_badcache_flushtree(dns_badcache_t *bc, dns_name_t *name); +dns_badcache_flushtree(dns_badcache_t *bc, const dns_name_t *name); /*% * Flush the bad cache of all entries at or below 'name'. * diff --git a/lib/dns/include/dns/byaddr.h b/lib/dns/include/dns/byaddr.h index 245a2dff7d7..3444cf703e7 100644 --- a/lib/dns/include/dns/byaddr.h +++ b/lib/dns/include/dns/byaddr.h @@ -66,8 +66,8 @@ typedef struct dns_byaddrevent { #define DNS_BYADDROPT_IPV6INT 0x0002 isc_result_t -dns_byaddr_create(isc_mem_t *mctx, isc_netaddr_t *address, dns_view_t *view, - unsigned int options, isc_task_t *task, +dns_byaddr_create(isc_mem_t *mctx, const isc_netaddr_t *address, + dns_view_t *view, unsigned int options, isc_task_t *task, isc_taskaction_t action, void *arg, dns_byaddr_t **byaddrp); /*%< * Find the domain name of 'address'. @@ -138,11 +138,11 @@ dns_byaddr_destroy(dns_byaddr_t **byaddrp); */ isc_result_t -dns_byaddr_createptrname(isc_netaddr_t *address, isc_boolean_t nibble, +dns_byaddr_createptrname(const isc_netaddr_t *address, isc_boolean_t nibble, dns_name_t *name); isc_result_t -dns_byaddr_createptrname2(isc_netaddr_t *address, unsigned int options, +dns_byaddr_createptrname2(const isc_netaddr_t *address, unsigned int options, dns_name_t *name); /*%< * Creates a name that would be used in a PTR query for this address. The diff --git a/lib/dns/include/dns/cache.h b/lib/dns/include/dns/cache.h index 11ab642306e..bb0557707de 100644 --- a/lib/dns/include/dns/cache.h +++ b/lib/dns/include/dns/cache.h @@ -267,7 +267,7 @@ dns_cache_flush(dns_cache_t *cache); */ isc_result_t -dns_cache_flushnode(dns_cache_t *cache, dns_name_t *name, +dns_cache_flushnode(dns_cache_t *cache, const dns_name_t *name, isc_boolean_t tree); /* * Flush a given name from the cache. If 'tree' is true, then @@ -284,7 +284,7 @@ dns_cache_flushnode(dns_cache_t *cache, dns_name_t *name, */ isc_result_t -dns_cache_flushname(dns_cache_t *cache, dns_name_t *name); +dns_cache_flushname(dns_cache_t *cache, const dns_name_t *name); /* * Flush a given name from the cache. Equivalent to * dns_cache_flushpartial(cache, name, ISC_FALSE). diff --git a/lib/dns/include/dns/catz.h b/lib/dns/include/dns/catz.h index 580609bbd21..631daa4e19e 100644 --- a/lib/dns/include/dns/catz.h +++ b/lib/dns/include/dns/catz.h @@ -215,7 +215,7 @@ dns_catz_zone_detach(dns_catz_zone_t** zonep); isc_result_t dns_catz_new_zone(dns_catz_zones_t *catzs, dns_catz_zone_t **zonep, - const dns_name_t *name); + const dns_name_t *name); /*%< * Allocate a new catz zone on catzs mctx * @@ -268,7 +268,7 @@ dns_catz_zones_merge(dns_catz_zone_t *target, dns_catz_zone_t *newzone); isc_result_t dns_catz_update_process(dns_catz_zones_t *catzs, dns_catz_zone_t *zone, - dns_name_t *src_name, dns_rdataset_t *rdataset); + const dns_name_t *src_name, dns_rdataset_t *rdataset); /*%< * Process a single rdataset from a catalog zone 'zone' update, src_name is the * record name. diff --git a/lib/dns/include/dns/client.h b/lib/dns/include/dns/client.h index 252a428c1bd..5204aca75ad 100644 --- a/lib/dns/include/dns/client.h +++ b/lib/dns/include/dns/client.h @@ -162,8 +162,8 @@ isc_result_t dns_client_createx2(isc_mem_t *mctx, isc_appctx_t *actx, isc_taskmgr_t *taskmgr, isc_socketmgr_t *socketmgr, isc_timermgr_t *timermgr, unsigned int options, - dns_client_t **clientp, - isc_sockaddr_t *localaddr4, isc_sockaddr_t *localaddr6); + dns_client_t **clientp, const isc_sockaddr_t *localaddr4, + const isc_sockaddr_t *localaddr6); /*%< * Create a DNS client. These functions create a new client object with * minimal internal resources such as the default 'view' for the IN class and @@ -222,7 +222,7 @@ dns_client_destroy(dns_client_t **clientp); isc_result_t dns_client_setservers(dns_client_t *client, dns_rdataclass_t rdclass, - dns_name_t *namespace, isc_sockaddrlist_t *addrs); + const dns_name_t *namespace, isc_sockaddrlist_t *addrs); /*%< * Specify a list of addresses of recursive name servers that the client will * use for name resolution. A view for the 'rdclass' class must be created @@ -250,7 +250,7 @@ dns_client_setservers(dns_client_t *client, dns_rdataclass_t rdclass, isc_result_t dns_client_clearservers(dns_client_t *client, dns_rdataclass_t rdclass, - dns_name_t *namespace); + const dns_name_t *namespace); /*%< * Remove configured recursive name servers for the 'rdclass' and 'namespace' * from the client. See the description of dns_client_setservers() for @@ -290,12 +290,12 @@ dns_client_setdlv(dns_client_t *client, dns_rdataclass_t rdclass, */ isc_result_t -dns_client_resolve(dns_client_t *client, dns_name_t *name, +dns_client_resolve(dns_client_t *client, const dns_name_t *name, dns_rdataclass_t rdclass, dns_rdatatype_t type, unsigned int options, dns_namelist_t *namelist); isc_result_t -dns_client_startresolve(dns_client_t *client, dns_name_t *name, +dns_client_startresolve(dns_client_t *client, const dns_name_t *name, dns_rdataclass_t rdclass, dns_rdatatype_t type, unsigned int options, isc_task_t *task, isc_taskaction_t action, void *arg, @@ -403,7 +403,7 @@ dns_client_freeresanswer(dns_client_t *client, dns_namelist_t *namelist); isc_result_t dns_client_addtrustedkey(dns_client_t *client, dns_rdataclass_t rdclass, - dns_name_t *keyname, isc_buffer_t *keydatabuf); + const dns_name_t *keyname, isc_buffer_t *keydatabuf); /*%< * Add a DNSSEC trusted key for the 'rdclass' class. A view for the 'rdclass' * class must be created beforehand. 'keyname' is the DNS name of the key, @@ -426,14 +426,14 @@ dns_client_addtrustedkey(dns_client_t *client, dns_rdataclass_t rdclass, isc_result_t dns_client_request(dns_client_t *client, dns_message_t *qmessage, - dns_message_t *rmessage, isc_sockaddr_t *server, + dns_message_t *rmessage, const isc_sockaddr_t *server, unsigned int options, unsigned int parseoptions, dns_tsec_t *tsec, unsigned int timeout, unsigned int udptimeout, unsigned int udpretries); isc_result_t dns_client_startrequest(dns_client_t *client, dns_message_t *qmessage, - dns_message_t *rmessage, isc_sockaddr_t *server, + dns_message_t *rmessage, const isc_sockaddr_t *server, unsigned int options, unsigned int parseoptions, dns_tsec_t *tsec, unsigned int timeout, unsigned int udptimeout, unsigned int udpretries, @@ -530,13 +530,14 @@ dns_client_destroyreqtrans(dns_clientreqtrans_t **transp); isc_result_t dns_client_update(dns_client_t *client, dns_rdataclass_t rdclass, - dns_name_t *zonename, dns_namelist_t *prerequisites, + const dns_name_t *zonename, dns_namelist_t *prerequisites, dns_namelist_t *updates, isc_sockaddrlist_t *servers, dns_tsec_t *tsec, unsigned int options); isc_result_t dns_client_startupdate(dns_client_t *client, dns_rdataclass_t rdclass, - dns_name_t *zonename, dns_namelist_t *prerequisites, + const dns_name_t *zonename, + dns_namelist_t *prerequisites, dns_namelist_t *updates, isc_sockaddrlist_t *servers, dns_tsec_t *tsec, unsigned int options, isc_task_t *task, isc_taskaction_t action, void *arg, @@ -649,7 +650,7 @@ dns_client_destroyupdatetrans(dns_clientupdatetrans_t **transp); */ isc_result_t -dns_client_updaterec(dns_client_updateop_t op, dns_name_t *owner, +dns_client_updaterec(dns_client_updateop_t op, const dns_name_t *owner, dns_rdatatype_t type, dns_rdata_t *source, dns_ttl_t ttl, dns_name_t *target, dns_rdataset_t *rdataset, dns_rdatalist_t *rdatalist, diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h index b2bcb004fc5..44da8fa3ecd 100644 --- a/lib/dns/include/dns/db.h +++ b/lib/dns/include/dns/db.h @@ -86,17 +86,17 @@ typedef struct dns_dbmethods { void (*closeversion)(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit); - isc_result_t (*findnode)(dns_db_t *db, dns_name_t *name, + isc_result_t (*findnode)(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, dns_dbnode_t **nodep); - isc_result_t (*find)(dns_db_t *db, dns_name_t *name, + isc_result_t (*find)(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset); - isc_result_t (*findzonecut)(dns_db_t *db, dns_name_t *name, + isc_result_t (*findzonecut)(dns_db_t *db, const dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, @@ -154,7 +154,7 @@ typedef struct dns_dbmethods { isc_uint16_t *iterations, unsigned char *salt, size_t *salt_len); - isc_result_t (*findnsec3node)(dns_db_t *db, dns_name_t *name, + isc_result_t (*findnsec3node)(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, dns_dbnode_t **nodep); isc_result_t (*setsigningtime)(dns_db_t *db, @@ -170,12 +170,12 @@ typedef struct dns_dbmethods { void (*rpz_attach)(dns_db_t *db, dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num); isc_result_t (*rpz_ready)(dns_db_t *db); - isc_result_t (*findnodeext)(dns_db_t *db, dns_name_t *name, + isc_result_t (*findnodeext)(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, dns_dbnode_t **nodep); - isc_result_t (*findext)(dns_db_t *db, dns_name_t *name, + isc_result_t (*findext)(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, @@ -193,7 +193,7 @@ typedef struct dns_dbmethods { } dns_dbmethods_t; typedef isc_result_t -(*dns_dbcreatefunc_t)(isc_mem_t *mctx, dns_name_t *name, +(*dns_dbcreatefunc_t)(isc_mem_t *mctx, const dns_name_t *name, dns_dbtype_t type, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], void *driverarg, dns_db_t **dbp); @@ -285,7 +285,7 @@ struct dns_dbonupdatelistener { ***/ isc_result_t -dns_db_create(isc_mem_t *mctx, const char *db_type, dns_name_t *origin, +dns_db_create(isc_mem_t *mctx, const char *db_type, const dns_name_t *origin, dns_dbtype_t type, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], dns_db_t **dbp); /*%< @@ -705,11 +705,11 @@ dns_db_closeversion(dns_db_t *db, dns_dbversion_t **versionp, ***/ isc_result_t -dns_db_findnode(dns_db_t *db, dns_name_t *name, isc_boolean_t create, +dns_db_findnode(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, dns_dbnode_t **nodep); isc_result_t -dns_db_findnodeext(dns_db_t *db, dns_name_t *name, isc_boolean_t create, +dns_db_findnodeext(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, dns_dbnode_t **nodep); /*%< @@ -752,13 +752,13 @@ dns_db_findnodeext(dns_db_t *db, dns_name_t *name, isc_boolean_t create, */ isc_result_t -dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, +dns_db_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset); isc_result_t -dns_db_findext(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, +dns_db_findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, @@ -956,7 +956,7 @@ dns_db_findext(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, */ isc_result_t -dns_db_findzonecut(dns_db_t *db, dns_name_t *name, +dns_db_findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset); @@ -1522,7 +1522,7 @@ dns_db_getsize(dns_db_t *db, dns_dbversion_t *version, isc_uint64_t *records, */ isc_result_t -dns_db_findnsec3node(dns_db_t *db, dns_name_t *name, +dns_db_findnsec3node(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, dns_dbnode_t **nodep); /*%< * Find the NSEC3 node with name 'name'. diff --git a/lib/dns/include/dns/dbiterator.h b/lib/dns/include/dns/dbiterator.h index 2d7864ea9fd..7ad46a46bf9 100644 --- a/lib/dns/include/dns/dbiterator.h +++ b/lib/dns/include/dns/dbiterator.h @@ -67,7 +67,8 @@ typedef struct dns_dbiteratormethods { void (*destroy)(dns_dbiterator_t **iteratorp); isc_result_t (*first)(dns_dbiterator_t *iterator); isc_result_t (*last)(dns_dbiterator_t *iterator); - isc_result_t (*seek)(dns_dbiterator_t *iterator, dns_name_t *name); + isc_result_t (*seek)(dns_dbiterator_t *iterator, + const dns_name_t *name); isc_result_t (*prev)(dns_dbiterator_t *iterator); isc_result_t (*next)(dns_dbiterator_t *iterator); isc_result_t (*current)(dns_dbiterator_t *iterator, @@ -145,7 +146,7 @@ dns_dbiterator_last(dns_dbiterator_t *iterator); */ isc_result_t -dns_dbiterator_seek(dns_dbiterator_t *iterator, dns_name_t *name); +dns_dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name); /*%< * Move the node cursor to the node with name 'name'. * diff --git a/lib/dns/include/dns/dbtable.h b/lib/dns/include/dns/dbtable.h index 6f4005005f4..7ebb04d0e27 100644 --- a/lib/dns/include/dns/dbtable.h +++ b/lib/dns/include/dns/dbtable.h @@ -137,7 +137,7 @@ dns_dbtable_removedefault(dns_dbtable_t *dbtable); */ isc_result_t -dns_dbtable_find(dns_dbtable_t *dbtable, dns_name_t *name, +dns_dbtable_find(dns_dbtable_t *dbtable, const dns_name_t *name, unsigned int options, dns_db_t **dbp); /*%< * Find the deepest match to 'name' in the dbtable, and return it diff --git a/lib/dns/include/dns/diff.h b/lib/dns/include/dns/diff.h index 571ad12f901..22a6d868abc 100644 --- a/lib/dns/include/dns/diff.h +++ b/lib/dns/include/dns/diff.h @@ -112,7 +112,7 @@ ISC_LANG_BEGINDECLS isc_result_t dns_difftuple_create(isc_mem_t *mctx, - dns_diffop_t op, dns_name_t *name, dns_ttl_t ttl, + dns_diffop_t op, const dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata, dns_difftuple_t **tp); /*%< * Create a tuple. Deep copies are made of the name and rdata, so diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h index 9e0e8f98255..25533907494 100644 --- a/lib/dns/include/dns/dispatch.h +++ b/lib/dns/include/dns/dispatch.h @@ -245,7 +245,7 @@ dns_dispatchmgr_setstats(dns_dispatchmgr_t *mgr, isc_stats_t *stats); isc_result_t dns_dispatch_getudp(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr, - isc_taskmgr_t *taskmgr, isc_sockaddr_t *localaddr, + isc_taskmgr_t *taskmgr, const isc_sockaddr_t *localaddr, unsigned int buffersize, unsigned int maxbuffers, unsigned int maxrequests, unsigned int buckets, unsigned int increment, @@ -254,7 +254,7 @@ dns_dispatch_getudp(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr, isc_result_t dns_dispatch_getudp_dup(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr, - isc_taskmgr_t *taskmgr, isc_sockaddr_t *localaddr, + isc_taskmgr_t *taskmgr, const isc_sockaddr_t *localaddr, unsigned int buffersize, unsigned int maxbuffers, unsigned int maxrequests, unsigned int buckets, unsigned int increment, @@ -293,8 +293,8 @@ dns_dispatch_createtcp(dns_dispatchmgr_t *mgr, isc_socket_t *sock, unsigned int attributes, dns_dispatch_t **dispp); isc_result_t dns_dispatch_createtcp2(dns_dispatchmgr_t *mgr, isc_socket_t *sock, - isc_taskmgr_t *taskmgr, isc_sockaddr_t *localaddr, - isc_sockaddr_t *destaddr, unsigned int buffersize, + isc_taskmgr_t *taskmgr, const isc_sockaddr_t *localaddr, + const isc_sockaddr_t *destaddr, unsigned int buffersize, unsigned int maxbuffers, unsigned int maxrequests, unsigned int buckets, unsigned int increment, unsigned int attributes, dns_dispatch_t **dispp); @@ -370,11 +370,11 @@ dns_dispatch_starttcp(dns_dispatch_t *disp); */ isc_result_t -dns_dispatch_gettcp(dns_dispatchmgr_t *mgr, isc_sockaddr_t *destaddr, - isc_sockaddr_t *localaddr, dns_dispatch_t **dispp); +dns_dispatch_gettcp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *destaddr, + const isc_sockaddr_t *localaddr, dns_dispatch_t **dispp); isc_result_t -dns_dispatch_gettcp2(dns_dispatchmgr_t *mgr, isc_sockaddr_t *destaddr, - isc_sockaddr_t *localaddr, isc_boolean_t *connected, +dns_dispatch_gettcp2(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *destaddr, + const isc_sockaddr_t *localaddr, isc_boolean_t *connected, dns_dispatch_t **dispp); /* * Attempt to connect to a existing TCP connection (connection completed @@ -384,19 +384,19 @@ dns_dispatch_gettcp2(dns_dispatchmgr_t *mgr, isc_sockaddr_t *destaddr, isc_result_t dns_dispatch_addresponse3(dns_dispatch_t *disp, unsigned int options, - isc_sockaddr_t *dest, isc_task_t *task, + const isc_sockaddr_t *dest, isc_task_t *task, isc_taskaction_t action, void *arg, isc_uint16_t *idp, dns_dispentry_t **resp, isc_socketmgr_t *sockmgr); isc_result_t -dns_dispatch_addresponse2(dns_dispatch_t *disp, isc_sockaddr_t *dest, +dns_dispatch_addresponse2(dns_dispatch_t *disp, const isc_sockaddr_t *dest, isc_task_t *task, isc_taskaction_t action, void *arg, isc_uint16_t *idp, dns_dispentry_t **resp, isc_socketmgr_t *sockmgr); isc_result_t -dns_dispatch_addresponse(dns_dispatch_t *disp, isc_sockaddr_t *dest, +dns_dispatch_addresponse(dns_dispatch_t *disp, const isc_sockaddr_t *dest, isc_task_t *task, isc_taskaction_t action, void *arg, isc_uint16_t *idp, dns_dispentry_t **resp); /*%< diff --git a/lib/dns/include/dns/dlz.h b/lib/dns/include/dns/dlz.h index 70c5bffd68b..7e6cb5a172e 100644 --- a/lib/dns/include/dns/dlz.h +++ b/lib/dns/include/dns/dlz.h @@ -94,9 +94,8 @@ ISC_LANG_BEGINDECLS typedef isc_result_t (*dns_dlzallowzonexfr_t)(void *driverarg, void *dbdata, isc_mem_t *mctx, - dns_rdataclass_t rdclass, dns_name_t *name, - isc_sockaddr_t *clientaddr, - dns_db_t **dbp); + dns_rdataclass_t rdclass, const dns_name_t *name, + const isc_sockaddr_t *clientaddr, dns_db_t **dbp); /*%< * Method prototype. Drivers implementing the DLZ interface MUST @@ -131,7 +130,7 @@ typedef void typedef isc_result_t (*dns_dlzfindzone_t)(void *driverarg, void *dbdata, isc_mem_t *mctx, - dns_rdataclass_t rdclass, dns_name_t *name, + dns_rdataclass_t rdclass, const dns_name_t *name, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, dns_db_t **dbp); @@ -172,9 +171,9 @@ typedef isc_result_t */ -typedef isc_boolean_t (*dns_dlzssumatch_t)(dns_name_t *signer, - dns_name_t *name, - isc_netaddr_t *tcpaddr, +typedef isc_boolean_t (*dns_dlzssumatch_t)(const dns_name_t *signer, + const dns_name_t *name, + const isc_netaddr_t *tcpaddr, dns_rdatatype_t type, const dst_key_t *key, void *driverarg, void *dbdata); @@ -225,8 +224,8 @@ struct dns_dlzdb { ***/ isc_result_t -dns_dlzallowzonexfr(dns_view_t *view, dns_name_t *name, - isc_sockaddr_t *clientaddr, dns_db_t **dbp); +dns_dlzallowzonexfr(dns_view_t *view, const dns_name_t *name, + const isc_sockaddr_t *clientaddr, dns_db_t **dbp); /*%< * This method is called when the DNS server is performing a zone @@ -323,9 +322,9 @@ dns_dlzconfigure(dns_view_t *view, dns_dlzdb_t *dlzdb, */ isc_boolean_t -dns_dlz_ssumatch(dns_dlzdb_t *dlzdatabase, - dns_name_t *signer, dns_name_t *name, isc_netaddr_t *tcpaddr, - dns_rdatatype_t type, const dst_key_t *key); +dns_dlz_ssumatch(dns_dlzdb_t *dlzdatabase, const dns_name_t *signer, + const dns_name_t *name, const isc_netaddr_t *tcpaddr, + dns_rdatatype_t type, const dst_key_t *key); /*%< * call a DLZ drivers ssumatch method, if supplied. Otherwise return ISC_FALSE */ diff --git a/lib/dns/include/dns/dns64.h b/lib/dns/include/dns/dns64.h index 5c0158d4c1b..389740f25cf 100644 --- a/lib/dns/include/dns/dns64.h +++ b/lib/dns/include/dns/dns64.h @@ -37,8 +37,8 @@ ISC_LANG_BEGINDECLS #define DNS_DNS64_DNSSEC 0x02 /* DNSSEC sensitive query. */ isc_result_t -dns_dns64_create(isc_mem_t *mctx, isc_netaddr_t *prefix, - unsigned int prefixlen, isc_netaddr_t *suffix, +dns_dns64_create(isc_mem_t *mctx, const isc_netaddr_t *prefix, + unsigned int prefixlen, const isc_netaddr_t *suffix, dns_acl_t *client, dns_acl_t *mapped, dns_acl_t *excluded, unsigned int flags, dns_dns64_t **dns64); /* diff --git a/lib/dns/include/dns/dnssec.h b/lib/dns/include/dns/dnssec.h index 80546875413..1c907a6d072 100644 --- a/lib/dns/include/dns/dnssec.h +++ b/lib/dns/include/dns/dnssec.h @@ -65,8 +65,8 @@ struct dns_dnsseckey { }; isc_result_t -dns_dnssec_keyfromrdata(dns_name_t *name, dns_rdata_t *rdata, isc_mem_t *mctx, - dst_key_t **key); +dns_dnssec_keyfromrdata(const dns_name_t *name, const dns_rdata_t *rdata, + isc_mem_t *mctx, dst_key_t **key); /*%< * Creates a DST key from a DNS record. Basically a wrapper around * dst_key_fromdns(). @@ -86,7 +86,7 @@ dns_dnssec_keyfromrdata(dns_name_t *name, dns_rdata_t *rdata, isc_mem_t *mctx, */ isc_result_t -dns_dnssec_sign(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, +dns_dnssec_sign(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, isc_stdtime_t *inception, isc_stdtime_t *expire, isc_mem_t *mctx, isc_buffer_t *buffer, dns_rdata_t *sigrdata); /*%< @@ -115,17 +115,17 @@ dns_dnssec_sign(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, */ isc_result_t -dns_dnssec_verify(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, +dns_dnssec_verify(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, isc_boolean_t ignoretime, isc_mem_t *mctx, dns_rdata_t *sigrdata); isc_result_t -dns_dnssec_verify2(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, +dns_dnssec_verify2(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, isc_boolean_t ignoretime, isc_mem_t *mctx, dns_rdata_t *sigrdata, dns_name_t *wild); isc_result_t -dns_dnssec_verify3(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, +dns_dnssec_verify3(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, isc_boolean_t ignoretime, unsigned int maxbits, isc_mem_t *mctx, dns_rdata_t *sigrdata, dns_name_t *wild); /*%< @@ -162,20 +162,20 @@ dns_dnssec_verify3(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, /*@{*/ isc_result_t dns_dnssec_findzonekeys(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node, - dns_name_t *name, isc_mem_t *mctx, + const dns_name_t *name, isc_mem_t *mctx, unsigned int maxkeys, dst_key_t **keys, unsigned int *nkeys); isc_result_t dns_dnssec_findzonekeys2(dns_db_t *db, dns_dbversion_t *ver, - dns_dbnode_t *node, dns_name_t *name, + dns_dbnode_t *node, const dns_name_t *name, const char *directory, isc_mem_t *mctx, unsigned int maxkeys, dst_key_t **keys, unsigned int *nkeys); isc_result_t dns_dnssec_findzonekeys3(dns_db_t *db, dns_dbversion_t *ver, - dns_dbnode_t *node, dns_name_t *name, + dns_dbnode_t *node, const dns_name_t *name, const char *directory, isc_stdtime_t now, isc_mem_t *mctx, unsigned int maxkeys, dst_key_t **keys, unsigned int *nkeys); @@ -242,13 +242,13 @@ dns_dnssec_verifymessage(isc_buffer_t *source, dns_message_t *msg, */ isc_boolean_t -dns_dnssec_selfsigns(dns_rdata_t *rdata, dns_name_t *name, +dns_dnssec_selfsigns(dns_rdata_t *rdata, const dns_name_t *name, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, isc_boolean_t ignoretime, isc_mem_t *mctx); isc_boolean_t -dns_dnssec_signs(dns_rdata_t *rdata, dns_name_t *name, +dns_dnssec_signs(dns_rdata_t *rdata, const dns_name_t *name, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, isc_boolean_t ignoretime, isc_mem_t *mctx); /*%< @@ -287,11 +287,11 @@ dns_dnsseckey_destroy(isc_mem_t *mctx, dns_dnsseckey_t **dkp); */ isc_result_t -dns_dnssec_findmatchingkeys(dns_name_t *origin, const char *directory, +dns_dnssec_findmatchingkeys(const dns_name_t *origin, const char *directory, isc_mem_t *mctx, dns_dnsseckeylist_t *keylist); isc_result_t -dns_dnssec_findmatchingkeys2(dns_name_t *origin, const char *directory, +dns_dnssec_findmatchingkeys2(const dns_name_t *origin, const char *directory, isc_stdtime_t now, isc_mem_t *mctx, dns_dnsseckeylist_t *keylist); /*%< @@ -314,7 +314,7 @@ dns_dnssec_findmatchingkeys2(dns_name_t *origin, const char *directory, */ isc_result_t -dns_dnssec_keylistfromrdataset(dns_name_t *origin, +dns_dnssec_keylistfromrdataset(const dns_name_t *origin, const char *directory, isc_mem_t *mctx, dns_rdataset_t *keyset, dns_rdataset_t *keysigs, dns_rdataset_t *soasigs, isc_boolean_t savekeys, @@ -334,7 +334,7 @@ dns_dnssec_keylistfromrdataset(dns_name_t *origin, isc_result_t dns_dnssec_updatekeys(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *newkeys, - dns_dnsseckeylist_t *removed, dns_name_t *origin, + dns_dnsseckeylist_t *removed, const dns_name_t *origin, dns_ttl_t hint_ttl, dns_diff_t *diff, isc_boolean_t allzsk, isc_mem_t *mctx, void (*report)(const char *, ...)); /*%< diff --git a/lib/dns/include/dns/dnstap.h b/lib/dns/include/dns/dnstap.h index e8953783292..f6b5def9849 100644 --- a/lib/dns/include/dns/dnstap.h +++ b/lib/dns/include/dns/dnstap.h @@ -235,7 +235,7 @@ dns_dt_shutdown(void); void dns_dt_send(dns_view_t *view, dns_dtmsgtype_t msgtype, - isc_sockaddr_t *sa, isc_boolean_t tcp, isc_region_t *zone, + const isc_sockaddr_t *sa, isc_boolean_t tcp, isc_region_t *zone, isc_time_t *qtime, isc_time_t *rtime, isc_buffer_t *buf); /*%< * Sends a dnstap message to the log, if 'msgtype' is one of the message diff --git a/lib/dns/include/dns/forward.h b/lib/dns/include/dns/forward.h index a5a3194afd3..e8e95eee69e 100644 --- a/lib/dns/include/dns/forward.h +++ b/lib/dns/include/dns/forward.h @@ -47,10 +47,10 @@ dns_fwdtable_create(isc_mem_t *mctx, dns_fwdtable_t **fwdtablep); */ isc_result_t -dns_fwdtable_addfwd(dns_fwdtable_t *fwdtable, dns_name_t *name, +dns_fwdtable_addfwd(dns_fwdtable_t *fwdtable, const dns_name_t *name, dns_forwarderlist_t *fwdrs, dns_fwdpolicy_t policy); isc_result_t -dns_fwdtable_add(dns_fwdtable_t *fwdtable, dns_name_t *name, +dns_fwdtable_add(dns_fwdtable_t *fwdtable, const dns_name_t *name, isc_sockaddrlist_t *addrs, dns_fwdpolicy_t policy); /*%< * Adds an entry to the forwarding table. The entry associates @@ -70,7 +70,7 @@ dns_fwdtable_add(dns_fwdtable_t *fwdtable, dns_name_t *name, */ isc_result_t -dns_fwdtable_delete(dns_fwdtable_t *fwdtable, dns_name_t *name); +dns_fwdtable_delete(dns_fwdtable_t *fwdtable, const dns_name_t *name); /*%< * Removes an entry for 'name' from the forwarding table. If an entry * that exactly matches 'name' does not exist, ISC_R_NOTFOUND will be returned. @@ -85,7 +85,7 @@ dns_fwdtable_delete(dns_fwdtable_t *fwdtable, dns_name_t *name); */ isc_result_t -dns_fwdtable_find(dns_fwdtable_t *fwdtable, dns_name_t *name, +dns_fwdtable_find(dns_fwdtable_t *fwdtable, const dns_name_t *name, dns_forwarders_t **forwardersp); /*%< * Finds a domain in the forwarding table. The closest matching parent @@ -102,7 +102,7 @@ dns_fwdtable_find(dns_fwdtable_t *fwdtable, dns_name_t *name, */ isc_result_t -dns_fwdtable_find2(dns_fwdtable_t *fwdtable, dns_name_t *name, +dns_fwdtable_find2(dns_fwdtable_t *fwdtable, const dns_name_t *name, dns_name_t *foundname, dns_forwarders_t **forwardersp); /*%< * Finds a domain in the forwarding table. The closest matching parent diff --git a/lib/dns/include/dns/iptable.h b/lib/dns/include/dns/iptable.h index 30df8ef3224..d55248462bf 100644 --- a/lib/dns/include/dns/iptable.h +++ b/lib/dns/include/dns/iptable.h @@ -41,10 +41,10 @@ dns_iptable_create(isc_mem_t *mctx, dns_iptable_t **target); */ isc_result_t -dns_iptable_addprefix(dns_iptable_t *tab, isc_netaddr_t *addr, +dns_iptable_addprefix(dns_iptable_t *tab, const isc_netaddr_t *addr, isc_uint16_t bitlen, isc_boolean_t pos); isc_result_t -dns_iptable_addprefix2(dns_iptable_t *tab, isc_netaddr_t *addr, +dns_iptable_addprefix2(dns_iptable_t *tab, const isc_netaddr_t *addr, isc_uint16_t bitlen, isc_boolean_t pos, isc_boolean_t is_ecs); /* diff --git a/lib/dns/include/dns/keytable.h b/lib/dns/include/dns/keytable.h index 4114cb29324..a3dab22baad 100644 --- a/lib/dns/include/dns/keytable.h +++ b/lib/dns/include/dns/keytable.h @@ -132,7 +132,7 @@ dns_keytable_add(dns_keytable_t *keytable, isc_boolean_t managed, */ isc_result_t -dns_keytable_marksecure(dns_keytable_t *keytable, dns_name_t *name); +dns_keytable_marksecure(dns_keytable_t *keytable, const dns_name_t *name); /*%< * Add a null key to 'keytable' for name 'name'. This marks the * name as a secure domain, but doesn't supply any key data to allow the @@ -161,7 +161,7 @@ dns_keytable_marksecure(dns_keytable_t *keytable, dns_name_t *name); */ isc_result_t -dns_keytable_delete(dns_keytable_t *keytable, dns_name_t *keyname); +dns_keytable_delete(dns_keytable_t *keytable, const dns_name_t *keyname); /*%< * Delete node(s) from 'keytable' matching name 'keyname' * @@ -197,7 +197,7 @@ dns_keytable_deletekeynode(dns_keytable_t *keytable, dst_key_t *dstkey); */ isc_result_t -dns_keytable_find(dns_keytable_t *keytable, dns_name_t *keyname, +dns_keytable_find(dns_keytable_t *keytable, const dns_name_t *keyname, dns_keynode_t **keynodep); /*%< * Search for the first instance of a key named 'name' in 'keytable', @@ -244,7 +244,7 @@ dns_keytable_nextkeynode(dns_keytable_t *keytable, dns_keynode_t *keynode, */ isc_result_t -dns_keytable_findkeynode(dns_keytable_t *keytable, dns_name_t *name, +dns_keytable_findkeynode(dns_keytable_t *keytable, const dns_name_t *name, dns_secalg_t algorithm, dns_keytag_t tag, dns_keynode_t **keynodep); /*%< @@ -293,7 +293,7 @@ dns_keytable_findnextkeynode(dns_keytable_t *keytable, dns_keynode_t *keynode, */ isc_result_t -dns_keytable_finddeepestmatch(dns_keytable_t *keytable, dns_name_t *name, +dns_keytable_finddeepestmatch(dns_keytable_t *keytable, const dns_name_t *name, dns_name_t *foundname); /*%< * Search for the deepest match of 'name' in 'keytable'. @@ -349,7 +349,7 @@ dns_keytable_detachkeynode(dns_keytable_t *keytable, */ isc_result_t -dns_keytable_issecuredomain(dns_keytable_t *keytable, dns_name_t *name, +dns_keytable_issecuredomain(dns_keytable_t *keytable, const dns_name_t *name, dns_name_t *foundname, isc_boolean_t *wantdnssecp); /*%< * Is 'name' at or beneath a trusted key? diff --git a/lib/dns/include/dns/lookup.h b/lib/dns/include/dns/lookup.h index ec07a0da7d1..6e7e6fa6227 100644 --- a/lib/dns/include/dns/lookup.h +++ b/lib/dns/include/dns/lookup.h @@ -64,7 +64,7 @@ typedef struct dns_lookupevent { } dns_lookupevent_t; isc_result_t -dns_lookup_create(isc_mem_t *mctx, dns_name_t *name, dns_rdatatype_t type, +dns_lookup_create(isc_mem_t *mctx, const dns_name_t *name, dns_rdatatype_t type, dns_view_t *view, unsigned int options, isc_task_t *task, isc_taskaction_t action, void *arg, dns_lookup_t **lookupp); /*%< diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h index 84fd5671b75..5b5d6cf4d18 100644 --- a/lib/dns/include/dns/masterdump.h +++ b/lib/dns/include/dns/masterdump.h @@ -365,7 +365,7 @@ dns_master_dump3(isc_mem_t *mctx, dns_db_t *db, /*@}*/ isc_result_t -dns_master_rdatasettotext(dns_name_t *owner_name, +dns_master_rdatasettotext(const dns_name_t *owner_name, dns_rdataset_t *rdataset, const dns_master_style_t *style, isc_buffer_t *target); @@ -382,7 +382,7 @@ dns_master_rdatasettotext(dns_name_t *owner_name, */ isc_result_t -dns_master_questiontotext(dns_name_t *owner_name, +dns_master_questiontotext(const dns_name_t *owner_name, dns_rdataset_t *rdataset, const dns_master_style_t *style, isc_buffer_t *target); @@ -390,13 +390,13 @@ dns_master_questiontotext(dns_name_t *owner_name, isc_result_t dns_master_dumpnodetostream(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, - dns_dbnode_t *node, dns_name_t *name, + dns_dbnode_t *node, const dns_name_t *name, const dns_master_style_t *style, FILE *f); isc_result_t dns_master_dumpnode(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, - dns_dbnode_t *node, dns_name_t *name, + dns_dbnode_t *node, const dns_name_t *name, const dns_master_style_t *style, const char *filename); unsigned int diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h index ebaa4d6d775..3d3a5a6eac9 100644 --- a/lib/dns/include/dns/message.h +++ b/lib/dns/include/dns/message.h @@ -683,7 +683,7 @@ dns_message_currentname(dns_message_t *msg, dns_section_t section, isc_result_t dns_message_findname(dns_message_t *msg, dns_section_t section, - dns_name_t *target, dns_rdatatype_t type, + const dns_name_t *target, dns_rdatatype_t type, dns_rdatatype_t covers, dns_name_t **foundname, dns_rdataset_t **rdataset); /*%< @@ -718,7 +718,7 @@ dns_message_findname(dns_message_t *msg, dns_section_t section, */ isc_result_t -dns_message_findtype(dns_name_t *name, dns_rdatatype_t type, +dns_message_findtype(const dns_name_t *name, dns_rdatatype_t type, dns_rdatatype_t covers, dns_rdataset_t **rdataset); /*%< * Search the name for the specified type. If it is found, *rdataset is @@ -738,7 +738,7 @@ dns_message_findtype(dns_name_t *name, dns_rdatatype_t type, */ isc_result_t -dns_message_find(dns_name_t *name, dns_rdataclass_t rdclass, +dns_message_find(const dns_name_t *name, dns_rdataclass_t rdclass, dns_rdatatype_t type, dns_rdatatype_t covers, dns_rdataset_t **rdataset); /*%< @@ -1067,7 +1067,7 @@ dns_message_setopt(dns_message_t *msg, dns_rdataset_t *opt); */ dns_rdataset_t * -dns_message_gettsig(dns_message_t *msg, dns_name_t **owner); +dns_message_gettsig(dns_message_t *msg, const dns_name_t **owner); /*%< * Get the TSIG record and owner for 'msg'. * @@ -1161,7 +1161,7 @@ dns_message_getquerytsig(dns_message_t *msg, isc_mem_t *mctx, */ dns_rdataset_t * -dns_message_getsig0(dns_message_t *msg, dns_name_t **owner); +dns_message_getsig0(dns_message_t *msg, const dns_name_t **owner); /*%< * Get the SIG(0) record and owner for 'msg'. * @@ -1365,7 +1365,7 @@ dns_message_logpacket(dns_message_t *message, const char *description, int level, isc_mem_t *mctx); void dns_message_logpacket2(dns_message_t *message, - const char *description, isc_sockaddr_t *address, + const char *description, const isc_sockaddr_t *address, isc_logcategory_t *category, isc_logmodule_t *module, int level, isc_mem_t *mctx); void @@ -1374,8 +1374,8 @@ dns_message_logfmtpacket(dns_message_t *message, const char *description, const dns_master_style_t *style, int level, isc_mem_t *mctx); void -dns_message_logfmtpacket2(dns_message_t *message, - const char *description, isc_sockaddr_t *address, +dns_message_logfmtpacket2(dns_message_t *message, const char *description, + const isc_sockaddr_t *address, isc_logcategory_t *category, isc_logmodule_t *module, const dns_master_style_t *style, int level, isc_mem_t *mctx); diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h index 1be723b52f9..23f51279944 100644 --- a/lib/dns/include/dns/name.h +++ b/lib/dns/include/dns/name.h @@ -140,8 +140,8 @@ struct dns_name { #define DNS_NAME_CHECKMX 0x0010 /*%< Used by rdata. */ #define DNS_NAME_CHECKMXFAIL 0x0020 /*%< Used by rdata. */ -LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_rootname; -LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_wildcardname; +LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_rootname; +LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_wildcardname; #define DNS_NAME_INITNONABSOLUTE(A,B) { \ DNS_NAME_MAGIC, \ @@ -319,7 +319,7 @@ dns_name_iswildcard(const dns_name_t *name); */ unsigned int -dns_name_hash(dns_name_t *name, isc_boolean_t case_sensitive); +dns_name_hash(const dns_name_t *name, isc_boolean_t case_sensitive); /*%< * Provide a hash value for 'name'. * @@ -334,7 +334,7 @@ dns_name_hash(dns_name_t *name, isc_boolean_t case_sensitive); */ unsigned int -dns_name_fullhash(dns_name_t *name, isc_boolean_t case_sensitive); +dns_name_fullhash(const dns_name_t *name, isc_boolean_t case_sensitive); /*%< * Provide a hash value for 'name'. Unlike dns_name_hash(), this function * always takes into account of the entire name to calculate the hash value. @@ -350,7 +350,7 @@ dns_name_fullhash(dns_name_t *name, isc_boolean_t case_sensitive); */ unsigned int -dns_name_hashbylabel(dns_name_t *name, isc_boolean_t case_sensitive); +dns_name_hashbylabel(const dns_name_t *name, isc_boolean_t case_sensitive); /*%< * Provide a hash value for 'name', where the hash value is the sum * of the hash values of each label. @@ -664,7 +664,7 @@ dns_name_fromregion(dns_name_t *name, const isc_region_t *r); */ void -dns_name_toregion(dns_name_t *name, isc_region_t *r); +dns_name_toregion(const dns_name_t *name, isc_region_t *r); /*%< * Make 'r' refer to 'name'. * @@ -887,7 +887,7 @@ dns_name_totext2(const dns_name_t *name, unsigned int options, */ isc_result_t -dns_name_tofilenametext(dns_name_t *name, isc_boolean_t omit_final_dot, +dns_name_tofilenametext(const dns_name_t *name, isc_boolean_t omit_final_dot, isc_buffer_t *target); /*%< * Convert 'name' into an alternate text format appropriate for filenames, @@ -917,7 +917,7 @@ dns_name_tofilenametext(dns_name_t *name, isc_boolean_t omit_final_dot, */ isc_result_t -dns_name_downcase(dns_name_t *source, dns_name_t *name, +dns_name_downcase(const dns_name_t *source, dns_name_t *name, isc_buffer_t *target); /*%< * Downcase 'source'. @@ -941,7 +941,7 @@ dns_name_downcase(dns_name_t *source, dns_name_t *name, */ isc_result_t -dns_name_concatenate(dns_name_t *prefix, dns_name_t *suffix, +dns_name_concatenate(const dns_name_t *prefix, const dns_name_t *suffix, dns_name_t *name, isc_buffer_t *target); /*%< * Concatenate 'prefix' and 'suffix'. @@ -973,7 +973,7 @@ dns_name_concatenate(dns_name_t *prefix, dns_name_t *suffix, */ void -dns_name_split(dns_name_t *name, unsigned int suffixlabels, +dns_name_split(const dns_name_t *name, unsigned int suffixlabels, dns_name_t *prefix, dns_name_t *suffix); /*%< * @@ -1035,7 +1035,7 @@ dns_name_dup(const dns_name_t *source, isc_mem_t *mctx, */ isc_result_t -dns_name_dupwithoffsets(dns_name_t *source, isc_mem_t *mctx, +dns_name_dupwithoffsets(const dns_name_t *source, isc_mem_t *mctx, dns_name_t *target); /*%< * Make 'target' a read-only dynamically allocated copy of 'source'. @@ -1070,7 +1070,7 @@ dns_name_free(dns_name_t *name, isc_mem_t *mctx); */ isc_result_t -dns_name_digest(dns_name_t *name, dns_digestfunc_t digest, void *arg); +dns_name_digest(const dns_name_t *name, dns_digestfunc_t digest, void *arg); /*%< * Send 'name' in DNSSEC canonical form to 'digest'. * @@ -1097,7 +1097,7 @@ dns_name_digest(dns_name_t *name, dns_digestfunc_t digest, void *arg); */ isc_boolean_t -dns_name_dynamic(dns_name_t *name); +dns_name_dynamic(const dns_name_t *name); /*%< * Returns whether there is dynamic memory associated with this name. * @@ -1111,7 +1111,7 @@ dns_name_dynamic(dns_name_t *name); */ isc_result_t -dns_name_print(dns_name_t *name, FILE *stream); +dns_name_print(const dns_name_t *name, FILE *stream); /*%< * Print 'name' on 'stream'. * @@ -1154,7 +1154,7 @@ dns_name_format(const dns_name_t *name, char *cp, unsigned int size); */ isc_result_t -dns_name_tostring(dns_name_t *source, char **target, isc_mem_t *mctx); +dns_name_tostring(const dns_name_t *source, char **target, isc_mem_t *mctx); /*%< * Convert 'name' to string format, allocating sufficient memory to * hold it (free with isc_mem_free()). diff --git a/lib/dns/include/dns/nsec.h b/lib/dns/include/dns/nsec.h index f76992fe321..6cb86da6b03 100644 --- a/lib/dns/include/dns/nsec.h +++ b/lib/dns/include/dns/nsec.h @@ -24,7 +24,7 @@ ISC_LANG_BEGINDECLS isc_result_t dns_nsec_buildrdata(dns_db_t *db, dns_dbversion_t *version, - dns_dbnode_t *node, dns_name_t *target, + dns_dbnode_t *node, const dns_name_t *target, unsigned char *buffer, dns_rdata_t *rdata); /*%< * Build the rdata of a NSEC record. @@ -41,7 +41,7 @@ dns_nsec_buildrdata(dns_db_t *db, dns_dbversion_t *version, isc_result_t dns_nsec_build(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, - dns_name_t *target, dns_ttl_t ttl); + const dns_name_t *target, dns_ttl_t ttl); /*%< * Build a NSEC record and add it to a database. */ @@ -90,8 +90,8 @@ dns_nsec_isset(const unsigned char *array, unsigned int type); */ isc_result_t -dns_nsec_noexistnodata(dns_rdatatype_t type, dns_name_t *name, - dns_name_t *nsecname, dns_rdataset_t *nsecset, +dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, + const dns_name_t *nsecname, dns_rdataset_t *nsecset, isc_boolean_t *exists, isc_boolean_t *data, dns_name_t *wild, dns_nseclog_t log, void *arg); /*% diff --git a/lib/dns/include/dns/nsec3.h b/lib/dns/include/dns/nsec3.h index f185caad182..423af4a3ae0 100644 --- a/lib/dns/include/dns/nsec3.h +++ b/lib/dns/include/dns/nsec3.h @@ -72,7 +72,8 @@ dns_nsec3_typepresent(dns_rdata_t *nsec, dns_rdatatype_t type); isc_result_t dns_nsec3_hashname(dns_fixedname_t *result, unsigned char rethash[NSEC3_MAX_HASH_LENGTH], - size_t *hash_length, dns_name_t *name, dns_name_t *origin, + size_t *hash_length, + const dns_name_t *name, const dns_name_t *origin, dns_hash_t hashalg, unsigned int iterations, const unsigned char *salt, size_t saltlength); /*%< @@ -95,17 +96,18 @@ dns_nsec3_supportedhash(dns_hash_t hash); isc_result_t dns_nsec3_addnsec3(dns_db_t *db, dns_dbversion_t *version, - dns_name_t *name, const dns_rdata_nsec3param_t *nsec3param, + const dns_name_t *name, + const dns_rdata_nsec3param_t *nsec3param, dns_ttl_t nsecttl, isc_boolean_t unsecure, dns_diff_t *diff); isc_result_t dns_nsec3_addnsec3s(dns_db_t *db, dns_dbversion_t *version, - dns_name_t *name, dns_ttl_t nsecttl, + const dns_name_t *name, dns_ttl_t nsecttl, isc_boolean_t unsecure, dns_diff_t *diff); isc_result_t dns_nsec3_addnsec3sx(dns_db_t *db, dns_dbversion_t *version, - dns_name_t *name, dns_ttl_t nsecttl, + const dns_name_t *name, dns_ttl_t nsecttl, isc_boolean_t unsecure, dns_rdatatype_t private, dns_diff_t *diff); /*%< @@ -141,16 +143,18 @@ dns_nsec3_addnsec3sx(dns_db_t *db, dns_dbversion_t *version, */ isc_result_t -dns_nsec3_delnsec3(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, +dns_nsec3_delnsec3(dns_db_t *db, dns_dbversion_t *version, + const dns_name_t *name, const dns_rdata_nsec3param_t *nsec3param, dns_diff_t *diff); isc_result_t -dns_nsec3_delnsec3s(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, - dns_diff_t *diff); +dns_nsec3_delnsec3s(dns_db_t *db, dns_dbversion_t *version, + const dns_name_t *name, dns_diff_t *diff); isc_result_t -dns_nsec3_delnsec3sx(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, - dns_rdatatype_t private, dns_diff_t *diff); +dns_nsec3_delnsec3sx(dns_db_t *db, dns_dbversion_t *version, + const dns_name_t *name, dns_rdatatype_t private, + dns_diff_t *diff); /*%< * Remove NSEC3 records for 'name', recording the change in 'diff'. * Adjust previous NSEC3 records, if any, to reflect the removal. @@ -241,8 +245,8 @@ dns_nsec3param_deletechains(dns_db_t *db, dns_dbversion_t *ver, */ isc_result_t -dns_nsec3_noexistnodata(dns_rdatatype_t type, dns_name_t* name, - dns_name_t *nsec3name, dns_rdataset_t *nsec3set, +dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, + const dns_name_t *nsec3name, dns_rdataset_t *nsec3set, dns_name_t *zonename, isc_boolean_t *exists, isc_boolean_t *data, isc_boolean_t *optout, isc_boolean_t *unknown, isc_boolean_t *setclosest, diff --git a/lib/dns/include/dns/nta.h b/lib/dns/include/dns/nta.h index 3c96c1ff0d5..86a723008c0 100644 --- a/lib/dns/include/dns/nta.h +++ b/lib/dns/include/dns/nta.h @@ -112,7 +112,7 @@ dns_ntatable_detach(dns_ntatable_t **ntatablep); */ isc_result_t -dns_ntatable_add(dns_ntatable_t *ntatable, dns_name_t *name, +dns_ntatable_add(dns_ntatable_t *ntatable, const dns_name_t *name, isc_boolean_t force, isc_stdtime_t now, isc_uint32_t lifetime); /*%< @@ -140,7 +140,7 @@ dns_ntatable_add(dns_ntatable_t *ntatable, dns_name_t *name, */ isc_result_t -dns_ntatable_delete(dns_ntatable_t *ntatable, dns_name_t *keyname); +dns_ntatable_delete(dns_ntatable_t *ntatable, const dns_name_t *keyname); /*%< * Delete node(s) from 'ntatable' matching name 'keyname' * @@ -159,7 +159,7 @@ dns_ntatable_delete(dns_ntatable_t *ntatable, dns_name_t *keyname); isc_boolean_t dns_ntatable_covered(dns_ntatable_t *ntatable, isc_stdtime_t now, - dns_name_t *name, dns_name_t *anchor); + const dns_name_t *name, const dns_name_t *anchor); /*%< * Return ISC_TRUE if 'name' is below a non-expired negative trust * anchor which in turn is at or below 'anchor'. diff --git a/lib/dns/include/dns/order.h b/lib/dns/include/dns/order.h index 8c0747f3841..c58abb74a1f 100644 --- a/lib/dns/include/dns/order.h +++ b/lib/dns/include/dns/order.h @@ -35,7 +35,7 @@ dns_order_create(isc_mem_t *mctx, dns_order_t **orderp); */ isc_result_t -dns_order_add(dns_order_t *order, dns_name_t *name, +dns_order_add(dns_order_t *order, const dns_name_t *name, dns_rdatatype_t rdtype, dns_rdataclass_t rdclass, unsigned int mode); /*%< @@ -53,7 +53,7 @@ dns_order_add(dns_order_t *order, dns_name_t *name, */ unsigned int -dns_order_find(dns_order_t *order, dns_name_t *name, +dns_order_find(dns_order_t *order, const dns_name_t *name, dns_rdatatype_t rdtype, dns_rdataclass_t rdclass); /*%< * Find the first matching entry on the list. diff --git a/lib/dns/include/dns/peer.h b/lib/dns/include/dns/peer.h index 46452a7668e..9fc1fdf8cfe 100644 --- a/lib/dns/include/dns/peer.h +++ b/lib/dns/include/dns/peer.h @@ -108,7 +108,7 @@ dns_peerlist_addpeer(dns_peerlist_t *peers, dns_peer_t *peer); /* * Ditto. */ isc_result_t -dns_peerlist_peerbyaddr(dns_peerlist_t *peers, isc_netaddr_t *addr, +dns_peerlist_peerbyaddr(dns_peerlist_t *peers, const isc_netaddr_t *addr, dns_peer_t **retval); /* @@ -118,10 +118,10 @@ isc_result_t dns_peerlist_currpeer(dns_peerlist_t *peers, dns_peer_t **retval); isc_result_t -dns_peer_new(isc_mem_t *mem, isc_netaddr_t *ipaddr, dns_peer_t **peer); +dns_peer_new(isc_mem_t *mem, const isc_netaddr_t *ipaddr, dns_peer_t **peer); isc_result_t -dns_peer_newprefix(isc_mem_t *mem, isc_netaddr_t *ipaddr, +dns_peer_newprefix(isc_mem_t *mem, const isc_netaddr_t *ipaddr, unsigned int prefixlen, dns_peer_t **peer); void diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h index ad82502ce95..a4d8ddae501 100644 --- a/lib/dns/include/dns/rbt.h +++ b/lib/dns/include/dns/rbt.h @@ -308,7 +308,7 @@ dns_rbt_create(isc_mem_t *mctx, dns_rbtdeleter_t deleter, */ isc_result_t -dns_rbt_addname(dns_rbt_t *rbt, dns_name_t *name, void *data); +dns_rbt_addname(dns_rbt_t *rbt, const dns_name_t *name, void *data); /*%< * Add 'name' to the tree of trees, associated with 'data'. * @@ -348,7 +348,7 @@ dns_rbt_addname(dns_rbt_t *rbt, dns_name_t *name, void *data); */ isc_result_t -dns_rbt_addnode(dns_rbt_t *rbt, dns_name_t *name, dns_rbtnode_t **nodep); +dns_rbt_addnode(dns_rbt_t *rbt, const dns_name_t *name, dns_rbtnode_t **nodep); /*%< * Just like dns_rbt_addname, but returns the address of the node. @@ -526,7 +526,8 @@ dns_rbt_findnode(dns_rbt_t *rbt, const dns_name_t *name, dns_name_t *foundname, */ isc_result_t -dns_rbt_deletename(dns_rbt_t *rbt, dns_name_t *name, isc_boolean_t recurse); +dns_rbt_deletename(dns_rbt_t *rbt, const dns_name_t *name, + isc_boolean_t recurse); /*%< * Delete 'name' from the tree of trees. * diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h index e5185db4e65..7647230bd9c 100644 --- a/lib/dns/include/dns/rdata.h +++ b/lib/dns/include/dns/rdata.h @@ -343,8 +343,9 @@ dns_rdata_towire(dns_rdata_t *rdata, dns_compress_t *cctx, isc_result_t dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass, - dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, - unsigned int options, isc_mem_t *mctx, + dns_rdatatype_t type, isc_lex_t *lexer, + const dns_name_t *origin, unsigned int options, + isc_mem_t *mctx, isc_buffer_t *target, dns_rdatacallbacks_t *callbacks); /*%< * Convert the textual representation of a DNS rdata into uncompressed wire @@ -399,7 +400,8 @@ dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass, */ isc_result_t -dns_rdata_totext(dns_rdata_t *rdata, dns_name_t *origin, isc_buffer_t *target); +dns_rdata_totext(dns_rdata_t *rdata, const dns_name_t *origin, + isc_buffer_t *target); /*%< * Convert 'rdata' into text format, storing the result in 'target'. * The text will consist of a single line, with fields separated by @@ -432,9 +434,10 @@ dns_rdata_totext(dns_rdata_t *rdata, dns_name_t *origin, isc_buffer_t *target); */ isc_result_t -dns_rdata_tofmttext(dns_rdata_t *rdata, dns_name_t *origin, unsigned int flags, - unsigned int width, unsigned int split_width, - const char *linebreak, isc_buffer_t *target); +dns_rdata_tofmttext(dns_rdata_t *rdata, const dns_name_t *origin, + unsigned int flags, unsigned int width, + unsigned int split_width, const char *linebreak, + isc_buffer_t *target); /*%< * Like dns_rdata_totext, but do formatted output suitable for * database dumps. This is intended for use by dns_db_dump(); @@ -724,7 +727,7 @@ dns_rdata_covers(dns_rdata_t *rdata); */ isc_boolean_t -dns_rdata_checkowner(dns_name_t* name, dns_rdataclass_t rdclass, +dns_rdata_checkowner(const dns_name_t *name, dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_boolean_t wildcard); /* * Returns whether this is a valid ownername for this . @@ -736,7 +739,8 @@ dns_rdata_checkowner(dns_name_t* name, dns_rdataclass_t rdclass, */ isc_boolean_t -dns_rdata_checknames(dns_rdata_t *rdata, dns_name_t *owner, dns_name_t *bad); +dns_rdata_checknames(dns_rdata_t *rdata, const dns_name_t *owner, + dns_name_t *bad); /* * Returns whether 'rdata' contains valid domain names. The checks are * sensitive to the owner name. diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h index 4afb3db0e6b..fa6ce450b49 100644 --- a/lib/dns/include/dns/rdataset.h +++ b/lib/dns/include/dns/rdataset.h @@ -65,13 +65,13 @@ typedef struct dns_rdatasetmethods { dns_rdataset_t *target); unsigned int (*count)(dns_rdataset_t *rdataset); isc_result_t (*addnoqname)(dns_rdataset_t *rdataset, - dns_name_t *name); + const dns_name_t *name); isc_result_t (*getnoqname)(dns_rdataset_t *rdataset, dns_name_t *name, dns_rdataset_t *neg, dns_rdataset_t *negsig); isc_result_t (*addclosest)(dns_rdataset_t *rdataset, - dns_name_t *name); + const dns_name_t *name); isc_result_t (*getclosest)(dns_rdataset_t *rdataset, dns_name_t *name, dns_rdataset_t *neg, @@ -158,8 +158,8 @@ struct dns_rdataset { void * private3; unsigned int privateuint4; void * private5; - void * private6; - void * private7; + const void * private6; + const void * private7; /*@}*/ }; @@ -354,7 +354,7 @@ dns_rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata); isc_result_t dns_rdataset_totext(dns_rdataset_t *rdataset, - dns_name_t *owner_name, + const dns_name_t *owner_name, isc_boolean_t omit_final_dot, isc_boolean_t question, isc_buffer_t *target); @@ -379,7 +379,7 @@ dns_rdataset_totext(dns_rdataset_t *rdataset, isc_result_t dns_rdataset_towire(dns_rdataset_t *rdataset, - dns_name_t *owner_name, + const dns_name_t *owner_name, dns_compress_t *cctx, isc_buffer_t *target, unsigned int options, @@ -530,7 +530,7 @@ dns_rdataset_getclosest(dns_rdataset_t *rdataset, dns_name_t *name, */ isc_result_t -dns_rdataset_addclosest(dns_rdataset_t *rdataset, dns_name_t *name); +dns_rdataset_addclosest(dns_rdataset_t *rdataset, const dns_name_t *name); /*%< * Associate a closest encloset proof with this record. * Sets #DNS_RDATASETATTR_CLOSEST if successful. diff --git a/lib/dns/include/dns/request.h b/lib/dns/include/dns/request.h index 203042b5723..bc2b087d5a2 100644 --- a/lib/dns/include/dns/request.h +++ b/lib/dns/include/dns/request.h @@ -155,7 +155,7 @@ dns_requestmgr_detach(dns_requestmgr_t **requestmgrp); isc_result_t dns_request_create(dns_requestmgr_t *requestmgr, dns_message_t *message, - isc_sockaddr_t *address, unsigned int options, + const isc_sockaddr_t *address, unsigned int options, dns_tsigkey_t *key, unsigned int timeout, isc_task_t *task, isc_taskaction_t action, void *arg, @@ -193,16 +193,17 @@ dns_request_create(dns_requestmgr_t *requestmgr, dns_message_t *message, /*% See dns_request_createvia4() */ isc_result_t dns_request_createvia(dns_requestmgr_t *requestmgr, dns_message_t *message, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, - unsigned int options, dns_tsigkey_t *key, - unsigned int timeout, isc_task_t *task, - isc_taskaction_t action, void *arg, + const isc_sockaddr_t *srcaddr, + const isc_sockaddr_t *destaddr, unsigned int options, + dns_tsigkey_t *key, unsigned int timeout, + isc_task_t *task, isc_taskaction_t action, void *arg, dns_request_t **requestp); /*% See dns_request_createvia4() */ isc_result_t dns_request_createvia2(dns_requestmgr_t *requestmgr, dns_message_t *message, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, + const isc_sockaddr_t *srcaddr, + const isc_sockaddr_t *destaddr, unsigned int options, dns_tsigkey_t *key, unsigned int timeout, unsigned int udptimeout, isc_task_t *task, isc_taskaction_t action, void *arg, @@ -211,7 +212,8 @@ dns_request_createvia2(dns_requestmgr_t *requestmgr, dns_message_t *message, /*% See dns_request_createvia4() */ isc_result_t dns_request_createvia3(dns_requestmgr_t *requestmgr, dns_message_t *message, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, + const isc_sockaddr_t *srcaddr, + const isc_sockaddr_t *destaddr, unsigned int options, dns_tsigkey_t *key, unsigned int timeout, unsigned int udptimeout, unsigned int udpretries, isc_task_t *task, @@ -220,7 +222,8 @@ dns_request_createvia3(dns_requestmgr_t *requestmgr, dns_message_t *message, isc_result_t dns_request_createvia4(dns_requestmgr_t *requestmgr, dns_message_t *message, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, + const isc_sockaddr_t *srcaddr, + const isc_sockaddr_t *destaddr, isc_dscp_t dscp, unsigned int options, dns_tsigkey_t *key, unsigned int timeout, unsigned int udptimeout, unsigned int udpretries, @@ -264,7 +267,8 @@ dns_request_createvia4(dns_requestmgr_t *requestmgr, dns_message_t *message, /*% See dns_request_createraw4() */ isc_result_t dns_request_createraw(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, + const isc_sockaddr_t *srcaddr, + const isc_sockaddr_t *destaddr, unsigned int options, unsigned int timeout, isc_task_t *task, isc_taskaction_t action, void *arg, dns_request_t **requestp); @@ -272,7 +276,8 @@ dns_request_createraw(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf, /*% See dns_request_createraw4() */ isc_result_t dns_request_createraw2(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, + const isc_sockaddr_t *srcaddr, + const isc_sockaddr_t *destaddr, unsigned int options, unsigned int timeout, unsigned int udptimeout, isc_task_t *task, isc_taskaction_t action, void *arg, @@ -281,7 +286,8 @@ dns_request_createraw2(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf, /*% See dns_request_createraw4() */ isc_result_t dns_request_createraw3(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, + const isc_sockaddr_t *srcaddr, + const isc_sockaddr_t *destaddr, unsigned int options, unsigned int timeout, unsigned int udptimeout, unsigned int udpretries, isc_task_t *task, isc_taskaction_t action, void *arg, @@ -289,7 +295,8 @@ dns_request_createraw3(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf, isc_result_t dns_request_createraw4(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, + const isc_sockaddr_t *srcaddr, + const isc_sockaddr_t *destaddr, isc_dscp_t dscp, unsigned int options, unsigned int timeout, unsigned int udptimeout, unsigned int udpretries, isc_task_t *task, diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h index 5f8dcbf2f2e..45be77e3d2d 100644 --- a/lib/dns/include/dns/resolver.h +++ b/lib/dns/include/dns/resolver.h @@ -69,7 +69,7 @@ typedef struct dns_fetchevent { dns_rdataset_t * rdataset; dns_rdataset_t * sigrdataset; dns_fixedname_t foundname; - isc_sockaddr_t * client; + const isc_sockaddr_t * client; dns_messageid_t id; isc_result_t vresult; } dns_fetchevent_t; @@ -255,9 +255,9 @@ void dns_resolver_detach(dns_resolver_t **resp); isc_result_t -dns_resolver_createfetch(dns_resolver_t *res, dns_name_t *name, +dns_resolver_createfetch(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type, - dns_name_t *domain, dns_rdataset_t *nameservers, + const dns_name_t *domain, dns_rdataset_t *nameservers, dns_forwarders_t *forwarders, unsigned int options, isc_task_t *task, isc_taskaction_t action, void *arg, @@ -266,22 +266,22 @@ dns_resolver_createfetch(dns_resolver_t *res, dns_name_t *name, dns_fetch_t **fetchp); isc_result_t -dns_resolver_createfetch2(dns_resolver_t *res, dns_name_t *name, +dns_resolver_createfetch2(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type, - dns_name_t *domain, dns_rdataset_t *nameservers, + const dns_name_t *domain, dns_rdataset_t *nameservers, dns_forwarders_t *forwarders, - isc_sockaddr_t *client, isc_uint16_t id, + const isc_sockaddr_t *client, isc_uint16_t id, unsigned int options, isc_task_t *task, isc_taskaction_t action, void *arg, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, dns_fetch_t **fetchp); isc_result_t -dns_resolver_createfetch3(dns_resolver_t *res, dns_name_t *name, +dns_resolver_createfetch3(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type, - dns_name_t *domain, dns_rdataset_t *nameservers, + const dns_name_t *domain, dns_rdataset_t *nameservers, dns_forwarders_t *forwarders, - isc_sockaddr_t *client, isc_uint16_t id, + const isc_sockaddr_t *client, isc_uint16_t id, unsigned int options, unsigned int depth, isc_counter_t *qc, isc_task_t *task, isc_taskaction_t action, void *arg, @@ -441,8 +441,8 @@ dns_resolver_nrunning(dns_resolver_t *resolver); */ isc_result_t -dns_resolver_addalternate(dns_resolver_t *resolver, isc_sockaddr_t *alt, - dns_name_t *name, in_port_t port); +dns_resolver_addalternate(dns_resolver_t *resolver, const isc_sockaddr_t *alt, + const dns_name_t *name, in_port_t port); /*%< * Add alternate addresses to be tried in the event that the nameservers * for a zone are not available in the address families supported by the @@ -477,8 +477,8 @@ dns_resolver_reset_ds_digests(dns_resolver_t *resolver); */ isc_result_t -dns_resolver_disable_algorithm(dns_resolver_t *resolver, dns_name_t *name, - unsigned int alg); +dns_resolver_disable_algorithm(dns_resolver_t *resolver, + const dns_name_t *name, unsigned int alg); /*%< * Mark the given DNSSEC algorithm as disabled and below 'name'. * Valid algorithms are less than 256. @@ -490,8 +490,8 @@ dns_resolver_disable_algorithm(dns_resolver_t *resolver, dns_name_t *name, */ isc_result_t -dns_resolver_disable_ds_digest(dns_resolver_t *resolver, dns_name_t *name, - unsigned int digest_type); +dns_resolver_disable_ds_digest(dns_resolver_t *resolver, + const dns_name_t *name, unsigned int digest_type); /*%< * Mark the given DS/DLV digest type as disabled and below 'name'. * Valid types are less than 256. @@ -503,8 +503,8 @@ dns_resolver_disable_ds_digest(dns_resolver_t *resolver, dns_name_t *name, */ isc_boolean_t -dns_resolver_algorithm_supported(dns_resolver_t *resolver, dns_name_t *name, - unsigned int alg); +dns_resolver_algorithm_supported(dns_resolver_t *resolver, + const dns_name_t *name, unsigned int alg); /*%< * Check if the given algorithm is supported by this resolver. * This checks whether the algorithm has been disabled via @@ -513,7 +513,8 @@ dns_resolver_algorithm_supported(dns_resolver_t *resolver, dns_name_t *name, */ isc_boolean_t -dns_resolver_ds_digest_supported(dns_resolver_t *resolver, dns_name_t *name, +dns_resolver_ds_digest_supported(dns_resolver_t *resolver, + const dns_name_t *name, unsigned int digest_type); /*%< * Check if the given digest type is supported by this resolver. @@ -526,11 +527,11 @@ void dns_resolver_resetmustbesecure(dns_resolver_t *resolver); isc_result_t -dns_resolver_setmustbesecure(dns_resolver_t *resolver, dns_name_t *name, +dns_resolver_setmustbesecure(dns_resolver_t *resolver, const dns_name_t *name, isc_boolean_t value); isc_boolean_t -dns_resolver_getmustbesecure(dns_resolver_t *resolver, dns_name_t *name); +dns_resolver_getmustbesecure(dns_resolver_t *resolver, const dns_name_t *name); void @@ -573,7 +574,7 @@ unsigned int dns_resolver_getoptions(dns_resolver_t *resolver); void -dns_resolver_addbadcache(dns_resolver_t *resolver, dns_name_t *name, +dns_resolver_addbadcache(dns_resolver_t *resolver, const dns_name_t *name, dns_rdatatype_t type, isc_time_t *expire); /*%< * Add a entry to the bad cache for that will expire at 'expire'. @@ -584,7 +585,7 @@ dns_resolver_addbadcache(dns_resolver_t *resolver, dns_name_t *name, */ isc_boolean_t -dns_resolver_getbadcache(dns_resolver_t *resolver, dns_name_t *name, +dns_resolver_getbadcache(dns_resolver_t *resolver, const dns_name_t *name, dns_rdatatype_t type, isc_time_t *now); /*%< * Check to see if there is a unexpired entry in the bad cache for @@ -596,7 +597,7 @@ dns_resolver_getbadcache(dns_resolver_t *resolver, dns_name_t *name, */ void -dns_resolver_flushbadcache(dns_resolver_t *resolver, dns_name_t *name); +dns_resolver_flushbadcache(dns_resolver_t *resolver, const dns_name_t *name); /*%< * Flush the bad cache of all entries at 'name' if 'name' is non NULL. * Flush the entire bad cache if 'name' is NULL. @@ -606,7 +607,7 @@ dns_resolver_flushbadcache(dns_resolver_t *resolver, dns_name_t *name); */ void -dns_resolver_flushbadnames(dns_resolver_t *resolver, dns_name_t *name); +dns_resolver_flushbadnames(dns_resolver_t *resolver, const dns_name_t *name); /*%< * Flush the bad cache of all entries at or below 'name'. * diff --git a/lib/dns/include/dns/rpz.h b/lib/dns/include/dns/rpz.h index 19fcf9e6181..d7350a93796 100644 --- a/lib/dns/include/dns/rpz.h +++ b/lib/dns/include/dns/rpz.h @@ -353,10 +353,12 @@ dns_rpz_ready(dns_rpz_zones_t *rpzs, dns_rpz_zones_t **load_rpzsp, dns_rpz_num_t rpz_num); isc_result_t -dns_rpz_add(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, dns_name_t *name); +dns_rpz_add(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, + const dns_name_t *name); void -dns_rpz_delete(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, dns_name_t *name); +dns_rpz_delete(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, + const dns_name_t *name); dns_rpz_num_t dns_rpz_find_ip(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type, diff --git a/lib/dns/include/dns/rrl.h b/lib/dns/include/dns/rrl.h index 85a83557575..cdfaa14f5dd 100644 --- a/lib/dns/include/dns/rrl.h +++ b/lib/dns/include/dns/rrl.h @@ -257,7 +257,7 @@ dns_rrl_result_t dns_rrl(dns_view_t *view, const isc_sockaddr_t *client_addr, isc_boolean_t is_tcp, dns_rdataclass_t rdclass, dns_rdatatype_t qtype, - dns_name_t *qname, isc_result_t resp_result, isc_stdtime_t now, + const dns_name_t *qname, isc_result_t resp_result, isc_stdtime_t now, isc_boolean_t wouldlog, char *log_buf, unsigned int log_buf_len); void diff --git a/lib/dns/include/dns/sdlz.h b/lib/dns/include/dns/sdlz.h index 44f01a4eb8c..acb966328f9 100644 --- a/lib/dns/include/dns/sdlz.h +++ b/lib/dns/include/dns/sdlz.h @@ -356,7 +356,7 @@ dns_sdlz_putsoa_t dns_sdlz_putsoa; typedef isc_result_t dns_sdlz_setdb_t(dns_dlzdb_t *dlzdatabase, dns_rdataclass_t rdclass, - dns_name_t *name, + const dns_name_t *name, dns_db_t **dbp); dns_sdlz_setdb_t dns_sdlz_setdb; /*%< diff --git a/lib/dns/include/dns/soa.h b/lib/dns/include/dns/soa.h index 4a82a3ae1d8..7730928914a 100644 --- a/lib/dns/include/dns/soa.h +++ b/lib/dns/include/dns/soa.h @@ -34,7 +34,7 @@ ISC_LANG_BEGINDECLS #define DNS_SOA_BUFFERSIZE ((2 * DNS_NAME_MAXWIRE) + (4 * 5)) isc_result_t -dns_soa_buildrdata(dns_name_t *origin, dns_name_t *contact, +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, diff --git a/lib/dns/include/dns/ssu.h b/lib/dns/include/dns/ssu.h index 63287a4c562..eda7ff8436a 100644 --- a/lib/dns/include/dns/ssu.h +++ b/lib/dns/include/dns/ssu.h @@ -90,8 +90,8 @@ dns_ssutable_detach(dns_ssutable_t **tablep); isc_result_t dns_ssutable_addrule(dns_ssutable_t *table, isc_boolean_t grant, - dns_name_t *identity, unsigned int matchtype, - dns_name_t *name, unsigned int ntypes, + const dns_name_t *identity, unsigned int matchtype, + const dns_name_t *name, unsigned int ntypes, dns_rdatatype_t *types); /*%< * Adds a new rule to a simple-secure-update rule table. The rule @@ -122,8 +122,8 @@ dns_ssutable_addrule(dns_ssutable_t *table, isc_boolean_t grant, */ isc_boolean_t -dns_ssutable_checkrules(dns_ssutable_t *table, dns_name_t *signer, - dns_name_t *name, isc_netaddr_t *tcpaddr, +dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, + const dns_name_t *name, const isc_netaddr_t *tcpaddr, dns_rdatatype_t type, const dst_key_t *key); /*%< * Checks that the attempted update of (name, type) is allowed according @@ -193,8 +193,8 @@ isc_result_t dns_ssutable_nextrule(dns_ssurule_t *rule, * Check a policy rule via an external application */ isc_boolean_t -dns_ssu_external_match(dns_name_t *identity, dns_name_t *signer, - dns_name_t *name, isc_netaddr_t *tcpaddr, +dns_ssu_external_match(const dns_name_t *identity, const dns_name_t *signer, + const dns_name_t *name, const isc_netaddr_t *tcpaddr, dns_rdatatype_t type, const dst_key_t *key, isc_mem_t *mctx); diff --git a/lib/dns/include/dns/tkey.h b/lib/dns/include/dns/tkey.h index 5bb2fc93188..86ea33c6450 100644 --- a/lib/dns/include/dns/tkey.h +++ b/lib/dns/include/dns/tkey.h @@ -86,9 +86,9 @@ 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, dns_name_t *name, - dns_name_t *algorithm, isc_buffer_t *nonce, - isc_uint32_t lifetime); +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); /*%< * Builds a query containing a TKEY that will generate a shared * secret using a Diffie-Hellman key exchange. The shared key @@ -113,10 +113,11 @@ dns_tkey_builddhquery(dns_message_t *msg, dst_key_t *key, dns_name_t *name, */ isc_result_t -dns_tkey_buildgssquery(dns_message_t *msg, dns_name_t *name, dns_name_t *gname, - isc_buffer_t *intoken, isc_uint32_t lifetime, - gss_ctx_id_t *context, isc_boolean_t win2k, - isc_mem_t *mctx, char **err_message); +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, + isc_boolean_t win2k, isc_mem_t *mctx, + char **err_message); /*%< * Builds a query containing a TKEY that will generate a GSSAPI context. * The key is requested to have the specified lifetime (in seconds). @@ -179,7 +180,7 @@ dns_tkey_processdhresponse(dns_message_t *qmsg, dns_message_t *rmsg, isc_result_t dns_tkey_processgssresponse(dns_message_t *qmsg, dns_message_t *rmsg, - dns_name_t *gname, gss_ctx_id_t *context, + const dns_name_t *gname, gss_ctx_id_t *context, isc_buffer_t *outtoken, dns_tsigkey_t **outkey, dns_tsig_keyring_t *ring, char **err_message); /*%< @@ -207,7 +208,7 @@ dns_tkey_processdeleteresponse(dns_message_t *qmsg, dns_message_t *rmsg, isc_result_t dns_tkey_gssnegotiate(dns_message_t *qmsg, dns_message_t *rmsg, - dns_name_t *server, gss_ctx_id_t *context, + const dns_name_t *server, gss_ctx_id_t *context, dns_tsigkey_t **outkey, dns_tsig_keyring_t *ring, isc_boolean_t win2k, char **err_message); diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h index bd08712d953..dc37a1d1dfb 100644 --- a/lib/dns/include/dns/tsig.h +++ b/lib/dns/include/dns/tsig.h @@ -30,22 +30,22 @@ * Algorithms. */ #ifndef PK11_MD5_DISABLE -LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_tsig_hmacmd5_name; +LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_tsig_hmacmd5_name; #define DNS_TSIG_HMACMD5_NAME dns_tsig_hmacmd5_name #endif -LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_tsig_gssapi_name; +LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_tsig_gssapi_name; #define DNS_TSIG_GSSAPI_NAME dns_tsig_gssapi_name -LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_tsig_gssapims_name; +LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_tsig_gssapims_name; #define DNS_TSIG_GSSAPIMS_NAME dns_tsig_gssapims_name -LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_tsig_hmacsha1_name; +LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_tsig_hmacsha1_name; #define DNS_TSIG_HMACSHA1_NAME dns_tsig_hmacsha1_name -LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_tsig_hmacsha224_name; +LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_tsig_hmacsha224_name; #define DNS_TSIG_HMACSHA224_NAME dns_tsig_hmacsha224_name -LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_tsig_hmacsha256_name; +LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_tsig_hmacsha256_name; #define DNS_TSIG_HMACSHA256_NAME dns_tsig_hmacsha256_name -LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_tsig_hmacsha384_name; +LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_tsig_hmacsha384_name; #define DNS_TSIG_HMACSHA384_NAME dns_tsig_hmacsha384_name -LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_tsig_hmacsha512_name; +LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_tsig_hmacsha512_name; #define DNS_TSIG_HMACSHA512_NAME dns_tsig_hmacsha512_name /*% @@ -74,7 +74,7 @@ struct dns_tsigkey { isc_mem_t *mctx; dst_key_t *key; /*%< Key */ dns_name_t name; /*%< Key name */ - dns_name_t *algorithm; /*%< Algorithm name */ + const dns_name_t *algorithm; /*%< Algorithm name */ dns_name_t *creator; /*%< name that created secret */ isc_boolean_t generated; /*%< was this generated? */ isc_stdtime_t inception; /*%< start of validity period */ @@ -92,16 +92,16 @@ struct dns_tsigkey { ISC_LANG_BEGINDECLS isc_result_t -dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm, +dns_tsigkey_create(const dns_name_t *name, const dns_name_t *algorithm, unsigned char *secret, int length, isc_boolean_t generated, - dns_name_t *creator, isc_stdtime_t inception, + const dns_name_t *creator, isc_stdtime_t inception, isc_stdtime_t expire, isc_mem_t *mctx, dns_tsig_keyring_t *ring, dns_tsigkey_t **key); isc_result_t -dns_tsigkey_createfromkey(dns_name_t *name, dns_name_t *algorithm, +dns_tsigkey_createfromkey(const dns_name_t *name, const dns_name_t *algorithm, dst_key_t *dstkey, isc_boolean_t generated, - dns_name_t *creator, isc_stdtime_t inception, + const dns_name_t *creator, isc_stdtime_t inception, isc_stdtime_t expire, isc_mem_t *mctx, dns_tsig_keyring_t *ring, dns_tsigkey_t **key); /*%< @@ -217,8 +217,8 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, */ isc_result_t -dns_tsigkey_find(dns_tsigkey_t **tsigkey, dns_name_t *name, - dns_name_t *algorithm, dns_tsig_keyring_t *ring); +dns_tsigkey_find(dns_tsigkey_t **tsigkey, const dns_name_t *name, + const dns_name_t *algorithm, dns_tsig_keyring_t *ring); /*%< * Returns the TSIG key corresponding to this name and (possibly) * algorithm. Also increments the key's reference counter. @@ -251,7 +251,7 @@ dns_tsigkeyring_create(isc_mem_t *mctx, dns_tsig_keyring_t **ringp); */ isc_result_t -dns_tsigkeyring_add(dns_tsig_keyring_t *ring, dns_name_t *name, +dns_tsigkeyring_add(dns_tsig_keyring_t *ring, const dns_name_t *name, dns_tsigkey_t *tkey); /*%< * Place a TSIG key onto a key ring. diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h index 1c0d9862da8..fe0a7a21ddd 100644 --- a/lib/dns/include/dns/types.h +++ b/lib/dns/include/dns/types.h @@ -391,10 +391,10 @@ typedef void (*dns_rawdatafunc_t)(dns_zone_t *, dns_masterrawheader_t *); typedef isc_result_t -(*dns_addrdatasetfunc_t)(void *, dns_name_t *, dns_rdataset_t *); +(*dns_addrdatasetfunc_t)(void *, const dns_name_t *, dns_rdataset_t *); typedef isc_result_t -(*dns_additionaldatafunc_t)(void *, dns_name_t *, dns_rdatatype_t); +(*dns_additionaldatafunc_t)(void *, const dns_name_t *, dns_rdatatype_t); typedef isc_result_t (*dns_digestfunc_t)(void *, isc_region_t *); @@ -409,18 +409,18 @@ typedef int (*dns_rdatasetorderfunc_t)(const dns_rdata_t *, const void *); typedef isc_boolean_t -(*dns_checkmxfunc_t)(dns_zone_t *, dns_name_t *, dns_name_t *); +(*dns_checkmxfunc_t)(dns_zone_t *, const dns_name_t *, const dns_name_t *); typedef isc_boolean_t -(*dns_checksrvfunc_t)(dns_zone_t *, dns_name_t *, dns_name_t *); +(*dns_checksrvfunc_t)(dns_zone_t *, const dns_name_t *, const dns_name_t *); typedef isc_boolean_t -(*dns_checknsfunc_t)(dns_zone_t *, dns_name_t *, dns_name_t *, +(*dns_checknsfunc_t)(dns_zone_t *, const dns_name_t *, const dns_name_t *, dns_rdataset_t *, dns_rdataset_t *); typedef isc_boolean_t -(*dns_isselffunc_t)(dns_view_t *, dns_tsigkey_t *, isc_sockaddr_t *, - isc_sockaddr_t *, dns_rdataclass_t, void *); +(*dns_isselffunc_t)(dns_view_t *, dns_tsigkey_t *, const isc_sockaddr_t *, + const isc_sockaddr_t *, dns_rdataclass_t, void *); typedef isc_result_t (*dns_deserializefunc_t)(void *, FILE *, off_t); diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h index ebfb127921d..6aea8cf502b 100644 --- a/lib/dns/include/dns/view.h +++ b/lib/dns/include/dns/view.h @@ -519,12 +519,12 @@ dns_view_thaw(dns_view_t *view); *\li 'view' is no longer frozen. */ isc_result_t -dns_view_find(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type, +dns_view_find(dns_view_t *view, const dns_name_t *name, dns_rdatatype_t type, isc_stdtime_t now, unsigned int options, isc_boolean_t use_hints, dns_db_t **dbp, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset); isc_result_t -dns_view_find2(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type, +dns_view_find2(dns_view_t *view, const dns_name_t *name, dns_rdatatype_t type, isc_stdtime_t now, unsigned int options, isc_boolean_t use_hints, isc_boolean_t use_static_stub, dns_db_t **dbp, dns_dbnode_t **nodep, dns_name_t *foundname, @@ -615,9 +615,9 @@ dns_view_find2(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type, */ isc_result_t -dns_view_simplefind(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type, - isc_stdtime_t now, unsigned int options, - isc_boolean_t use_hints, +dns_view_simplefind(dns_view_t *view, const dns_name_t *name, + dns_rdatatype_t type, isc_stdtime_t now, + unsigned int options, isc_boolean_t use_hints, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset); /*%< * Find an rdataset whose owner name is 'name', and whose type is @@ -677,14 +677,15 @@ dns_view_simplefind(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type, /*% See dns_view_findzonecut2() */ isc_result_t -dns_view_findzonecut(dns_view_t *view, dns_name_t *name, dns_name_t *fname, - isc_stdtime_t now, unsigned int options, - isc_boolean_t use_hints, +dns_view_findzonecut(dns_view_t *view, const dns_name_t *name, + dns_name_t *fname, isc_stdtime_t now, + unsigned int options, isc_boolean_t use_hints, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset); isc_result_t -dns_view_findzonecut2(dns_view_t *view, dns_name_t *name, dns_name_t *fname, - isc_stdtime_t now, unsigned int options, +dns_view_findzonecut2(dns_view_t *view, const dns_name_t *name, + dns_name_t *fname, isc_stdtime_t now, + unsigned int options, isc_boolean_t use_hints, isc_boolean_t use_cache, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset); /*%< @@ -744,8 +745,9 @@ dns_viewlist_find(dns_viewlist_t *list, const char *name, */ isc_result_t -dns_viewlist_findzone(dns_viewlist_t *list, dns_name_t *name, isc_boolean_t allclasses, - dns_rdataclass_t rdclass, dns_zone_t **zonep); +dns_viewlist_findzone(dns_viewlist_t *list, const dns_name_t *name, + isc_boolean_t allclasses, dns_rdataclass_t rdclass, + dns_zone_t **zonep); /*%< * Search zone with 'name' in view with 'rdclass' in viewlist 'list' @@ -758,7 +760,8 @@ dns_viewlist_findzone(dns_viewlist_t *list, dns_name_t *name, isc_boolean_t allc */ isc_result_t -dns_view_findzone(dns_view_t *view, dns_name_t *name, dns_zone_t **zonep); +dns_view_findzone(dns_view_t *view, const dns_name_t *name, + dns_zone_t **zonep); /*%< * Search for the zone 'name' in the zone table of 'view'. * If found, 'zonep' is (strongly) attached to it. There @@ -801,7 +804,7 @@ dns_view_asyncload(dns_view_t *view, dns_zt_allloaded_t callback, void *arg); */ isc_result_t -dns_view_gettsig(dns_view_t *view, dns_name_t *keyname, +dns_view_gettsig(dns_view_t *view, const dns_name_t *keyname, dns_tsigkey_t **keyp); /*%< * Find the TSIG key configured in 'view' with name 'keyname', @@ -817,7 +820,7 @@ dns_view_gettsig(dns_view_t *view, dns_name_t *keyname, */ isc_result_t -dns_view_getpeertsig(dns_view_t *view, isc_netaddr_t *peeraddr, +dns_view_getpeertsig(dns_view_t *view, const isc_netaddr_t *peeraddr, dns_tsigkey_t **keyp); /*%< * Find the TSIG key configured in 'view' for the server whose @@ -897,7 +900,8 @@ dns_view_flushcache2(dns_view_t *view, isc_boolean_t fixuponly); */ isc_result_t -dns_view_flushnode(dns_view_t *view, dns_name_t *name, isc_boolean_t tree); +dns_view_flushnode(dns_view_t *view, const dns_name_t *name, + isc_boolean_t tree); /*%< * Flush the given name from the view's cache (and optionally ADB/badcache). * @@ -914,7 +918,7 @@ dns_view_flushnode(dns_view_t *view, dns_name_t *name, isc_boolean_t tree); */ isc_result_t -dns_view_flushname(dns_view_t *view, dns_name_t *name); +dns_view_flushname(dns_view_t *view, const dns_name_t *name); /*%< * Flush the given name from the view's cache, ADB and badcache. * Equivalent to dns_view_flushnode(view, name, ISC_FALSE). @@ -930,7 +934,7 @@ dns_view_flushname(dns_view_t *view, dns_name_t *name); */ isc_result_t -dns_view_adddelegationonly(dns_view_t *view, dns_name_t *name); +dns_view_adddelegationonly(dns_view_t *view, const dns_name_t *name); /*%< * Add the given name to the delegation only table. * @@ -944,7 +948,7 @@ dns_view_adddelegationonly(dns_view_t *view, dns_name_t *name); */ isc_result_t -dns_view_excludedelegationonly(dns_view_t *view, dns_name_t *name); +dns_view_excludedelegationonly(dns_view_t *view, const dns_name_t *name); /*%< * Add the given name to be excluded from the root-delegation-only. * @@ -959,7 +963,7 @@ dns_view_excludedelegationonly(dns_view_t *view, dns_name_t *name); */ isc_boolean_t -dns_view_isdelegationonly(dns_view_t *view, dns_name_t *name); +dns_view_isdelegationonly(dns_view_t *view, const dns_name_t *name); /*%< * Check if 'name' is in the delegation only table or if * rootdelonly is set that name is not being excluded. @@ -1158,7 +1162,7 @@ dns_view_getsecroots(dns_view_t *view, dns_keytable_t **ktp); */ isc_result_t -dns_view_issecuredomain(dns_view_t *view, dns_name_t *name, +dns_view_issecuredomain(dns_view_t *view, const dns_name_t *name, isc_stdtime_t now, isc_boolean_t checknta, isc_boolean_t *secure_domain); /*%< @@ -1178,7 +1182,7 @@ dns_view_issecuredomain(dns_view_t *view, dns_name_t *name, isc_boolean_t dns_view_ntacovers(dns_view_t *view, isc_stdtime_t now, - dns_name_t *name, dns_name_t *anchor); + const dns_name_t *name, const dns_name_t *anchor); /*%< * Is there a current negative trust anchor above 'name' and below 'anchor'? * @@ -1191,7 +1195,7 @@ dns_view_ntacovers(dns_view_t *view, isc_stdtime_t now, */ void -dns_view_untrust(dns_view_t *view, dns_name_t *keyname, +dns_view_untrust(dns_view_t *view, const dns_name_t *keyname, dns_rdata_dnskey_t *dnskey, isc_mem_t *mctx); /*%< * Remove keys that match 'keyname' and 'dnskey' from the views trust @@ -1239,7 +1243,7 @@ void dns_view_restorekeyring(dns_view_t *view); isc_result_t -dns_view_searchdlz(dns_view_t *view, dns_name_t *name, +dns_view_searchdlz(dns_view_t *view, const dns_name_t *name, unsigned int minlabels, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, diff --git a/lib/dns/include/dns/xfrin.h b/lib/dns/include/dns/xfrin.h index f93303c001e..7ebd8966cdf 100644 --- a/lib/dns/include/dns/xfrin.h +++ b/lib/dns/include/dns/xfrin.h @@ -46,14 +46,15 @@ ISC_LANG_BEGINDECLS /*% see dns_xfrin_create2() */ isc_result_t dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype, - isc_sockaddr_t *masteraddr, dns_tsigkey_t *tsigkey, + const isc_sockaddr_t *masteraddr, dns_tsigkey_t *tsigkey, isc_mem_t *mctx, isc_timermgr_t *timermgr, isc_socketmgr_t *socketmgr, isc_task_t *task, dns_xfrindone_t done, dns_xfrin_ctx_t **xfrp); isc_result_t dns_xfrin_create2(dns_zone_t *zone, dns_rdatatype_t xfrtype, - isc_sockaddr_t *masteraddr, isc_sockaddr_t *sourceaddr, + const isc_sockaddr_t *masteraddr, + const isc_sockaddr_t *sourceaddr, dns_tsigkey_t *tsigkey, isc_mem_t *mctx, isc_timermgr_t *timermgr, isc_socketmgr_t *socketmgr, isc_task_t *task, dns_xfrindone_t done, @@ -61,7 +62,8 @@ dns_xfrin_create2(dns_zone_t *zone, dns_rdatatype_t xfrtype, isc_result_t dns_xfrin_create3(dns_zone_t *zone, dns_rdatatype_t xfrtype, - isc_sockaddr_t *masteraddr, isc_sockaddr_t *sourceaddr, + const isc_sockaddr_t *masteraddr, + const isc_sockaddr_t *sourceaddr, isc_dscp_t dscp, dns_tsigkey_t *tsigkey, isc_mem_t *mctx, isc_timermgr_t *timermgr, isc_socketmgr_t *socketmgr, isc_task_t *task, dns_xfrindone_t done, diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h index 5b58b7b9169..ab8d4f9a0af 100644 --- a/lib/dns/include/dns/zone.h +++ b/lib/dns/include/dns/zone.h @@ -2009,7 +2009,8 @@ dns_zone_nameonly(dns_zone_t *zone, char *buf, size_t len); */ isc_result_t -dns_zone_checknames(dns_zone_t *zone, dns_name_t *name, dns_rdata_t *rdata); +dns_zone_checknames(dns_zone_t *zone, const dns_name_t *name, + dns_rdata_t *rdata); /*%< * Check if this record meets the check-names policy. * @@ -2091,8 +2092,9 @@ dns_zone_setisself(dns_zone_t *zone, dns_isselffunc_t isself, void *arg); * Set the isself callback function and argument. * * isc_boolean_t - * isself(dns_view_t *myview, dns_tsigkey_t *mykey, isc_netaddr_t *srcaddr, - * isc_netaddr_t *destaddr, dns_rdataclass_t rdclass, void *arg); + * isself(dns_view_t *myview, dns_tsigkey_t *mykey, + * const isc_netaddr_t *srcaddr, const isc_netaddr_t *destaddr, + * dns_rdataclass_t rdclass, void *arg); * * 'isself' returns ISC_TRUE if a non-recursive query from 'srcaddr' to * 'destaddr' with optional key 'mykey' for class 'rdclass' would be diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h index 4a0f26f363a..c1191512f66 100644 --- a/lib/dns/include/dst/dst.h +++ b/lib/dns/include/dst/dst.h @@ -410,7 +410,7 @@ dst_key_tofile(const dst_key_t *key, int type, const char *directory); */ isc_result_t -dst_key_fromdns(dns_name_t *name, dns_rdataclass_t rdclass, +dst_key_fromdns(const dns_name_t *name, dns_rdataclass_t rdclass, isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp); /*%< * Converts a DNS KEY record into a DST key. @@ -448,7 +448,7 @@ dst_key_todns(const dst_key_t *key, isc_buffer_t *target); */ isc_result_t -dst_key_frombuffer(dns_name_t *name, unsigned int alg, +dst_key_frombuffer(const dns_name_t *name, unsigned int alg, unsigned int flags, unsigned int protocol, dns_rdataclass_t rdclass, isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp); @@ -521,7 +521,7 @@ dst_key_getgssctx(const dst_key_t *key); */ isc_result_t -dst_key_fromgssapi(dns_name_t *name, gss_ctx_id_t gssctx, isc_mem_t *mctx, +dst_key_fromgssapi(const dns_name_t *name, gss_ctx_id_t gssctx, isc_mem_t *mctx, dst_key_t **keyp, isc_region_t *intoken); /*%< * Converts a GSSAPI opaque context id into a DST key. @@ -543,27 +543,27 @@ dst_key_fromgssapi(dns_name_t *name, gss_ctx_id_t gssctx, isc_mem_t *mctx, #ifdef DST_KEY_INTERNAL isc_result_t -dst_key_buildinternal(dns_name_t *name, unsigned int alg, +dst_key_buildinternal(const dns_name_t *name, unsigned int alg, unsigned int bits, unsigned int flags, unsigned int protocol, dns_rdataclass_t rdclass, void *data, isc_mem_t *mctx, dst_key_t **keyp); #endif isc_result_t -dst_key_fromlabel(dns_name_t *name, int alg, unsigned int flags, +dst_key_fromlabel(const dns_name_t *name, int alg, unsigned int flags, unsigned int protocol, dns_rdataclass_t rdclass, const char *engine, const char *label, const char *pin, isc_mem_t *mctx, dst_key_t **keyp); isc_result_t -dst_key_generate(dns_name_t *name, unsigned int alg, +dst_key_generate(const dns_name_t *name, unsigned int alg, unsigned int bits, unsigned int param, unsigned int flags, unsigned int protocol, dns_rdataclass_t rdclass, isc_mem_t *mctx, dst_key_t **keyp); isc_result_t -dst_key_generate2(dns_name_t *name, unsigned int alg, +dst_key_generate2(const dns_name_t *name, unsigned int alg, unsigned int bits, unsigned int param, unsigned int flags, unsigned int protocol, dns_rdataclass_t rdclass, diff --git a/lib/dns/include/dst/gssapi.h b/lib/dns/include/dst/gssapi.h index c22e8290d3f..6348d0b32ae 100644 --- a/lib/dns/include/dst/gssapi.h +++ b/lib/dns/include/dst/gssapi.h @@ -48,7 +48,7 @@ ISC_LANG_BEGINDECLS ***/ isc_result_t -dst_gssapi_acquirecred(dns_name_t *name, isc_boolean_t initiate, +dst_gssapi_acquirecred(const dns_name_t *name, isc_boolean_t initiate, gss_cred_id_t *cred); /* * Acquires GSS credentials. @@ -84,7 +84,7 @@ dst_gssapi_releasecred(gss_cred_id_t *cred); */ isc_result_t -dst_gssapi_initctx(dns_name_t *name, isc_buffer_t *intoken, +dst_gssapi_initctx(const dns_name_t *name, isc_buffer_t *intoken, isc_buffer_t *outtoken, gss_ctx_id_t *gssctx, isc_mem_t *mctx, char **err_message); /* @@ -182,8 +182,9 @@ gss_error_tostring(isc_uint32_t major, isc_uint32_t minor, */ isc_boolean_t -dst_gssapi_identitymatchesrealmkrb5(dns_name_t *signer, dns_name_t *name, - dns_name_t *realm); +dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer, + const dns_name_t *name, + const dns_name_t *realm); /* * Compare a "signer" (in the format of a Kerberos-format Kerberos5 * principal: host/example.com@EXAMPLE.COM) to the realm name stored @@ -192,8 +193,9 @@ dst_gssapi_identitymatchesrealmkrb5(dns_name_t *signer, dns_name_t *name, */ isc_boolean_t -dst_gssapi_identitymatchesrealmms(dns_name_t *signer, dns_name_t *name, - dns_name_t *realm); +dst_gssapi_identitymatchesrealmms(const dns_name_t *signer, + const dns_name_t *name, + const dns_name_t *realm); /* * Compare a "signer" (in the format of a Kerberos-format Kerberos5 * principal: host/example.com@EXAMPLE.COM) to the realm name stored diff --git a/lib/dns/iptable.c b/lib/dns/iptable.c index 21029e0d84f..2522c4aa818 100644 --- a/lib/dns/iptable.c +++ b/lib/dns/iptable.c @@ -51,14 +51,14 @@ static isc_boolean_t dns_iptable_pos = ISC_TRUE; * Add an IP prefix to an existing IP table */ isc_result_t -dns_iptable_addprefix(dns_iptable_t *tab, isc_netaddr_t *addr, +dns_iptable_addprefix(dns_iptable_t *tab, const isc_netaddr_t *addr, isc_uint16_t bitlen, isc_boolean_t pos) { return(dns_iptable_addprefix2(tab, addr, bitlen, pos, ISC_FALSE)); } isc_result_t -dns_iptable_addprefix2(dns_iptable_t *tab, isc_netaddr_t *addr, +dns_iptable_addprefix2(dns_iptable_t *tab, const isc_netaddr_t *addr, isc_uint16_t bitlen, isc_boolean_t pos, isc_boolean_t is_ecs) { diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c index 042e9bb5bf5..022ab204587 100644 --- a/lib/dns/keytable.c +++ b/lib/dns/keytable.c @@ -166,7 +166,7 @@ dns_keytable_detach(dns_keytable_t **keytablep) { static isc_result_t insert(dns_keytable_t *keytable, isc_boolean_t managed, - dns_name_t *keyname, dst_key_t **keyp) + const dns_name_t *keyname, dst_key_t **keyp) { isc_result_t result; dns_keynode_t *knode = NULL; @@ -239,12 +239,12 @@ dns_keytable_add(dns_keytable_t *keytable, isc_boolean_t managed, } isc_result_t -dns_keytable_marksecure(dns_keytable_t *keytable, dns_name_t *name) { +dns_keytable_marksecure(dns_keytable_t *keytable, const dns_name_t *name) { return (insert(keytable, ISC_TRUE, name, NULL)); } isc_result_t -dns_keytable_delete(dns_keytable_t *keytable, dns_name_t *keyname) { +dns_keytable_delete(dns_keytable_t *keytable, const dns_name_t *keyname) { isc_result_t result; dns_rbtnode_t *node = NULL; @@ -331,7 +331,7 @@ dns_keytable_deletekeynode(dns_keytable_t *keytable, dst_key_t *dstkey) { } isc_result_t -dns_keytable_find(dns_keytable_t *keytable, dns_name_t *keyname, +dns_keytable_find(dns_keytable_t *keytable, const dns_name_t *keyname, dns_keynode_t **keynodep) { isc_result_t result; @@ -384,7 +384,7 @@ dns_keytable_nextkeynode(dns_keytable_t *keytable, dns_keynode_t *keynode, } isc_result_t -dns_keytable_findkeynode(dns_keytable_t *keytable, dns_name_t *name, +dns_keytable_findkeynode(dns_keytable_t *keytable, const dns_name_t *name, dns_secalg_t algorithm, dns_keytag_t tag, dns_keynode_t **keynodep) { @@ -478,7 +478,7 @@ dns_keytable_findnextkeynode(dns_keytable_t *keytable, dns_keynode_t *keynode, } isc_result_t -dns_keytable_finddeepestmatch(dns_keytable_t *keytable, dns_name_t *name, +dns_keytable_finddeepestmatch(dns_keytable_t *keytable, const dns_name_t *name, dns_name_t *foundname) { isc_result_t result; @@ -543,7 +543,7 @@ dns_keytable_detachkeynode(dns_keytable_t *keytable, dns_keynode_t **keynodep) } isc_result_t -dns_keytable_issecuredomain(dns_keytable_t *keytable, dns_name_t *name, +dns_keytable_issecuredomain(dns_keytable_t *keytable, const dns_name_t *name, dns_name_t *foundname, isc_boolean_t *wantdnssecp) { isc_result_t result; diff --git a/lib/dns/lookup.c b/lib/dns/lookup.c index 6eddb0f79d6..a80047a880a 100644 --- a/lib/dns/lookup.c +++ b/lib/dns/lookup.c @@ -373,7 +373,7 @@ levent_destroy(isc_event_t *event) { } isc_result_t -dns_lookup_create(isc_mem_t *mctx, dns_name_t *name, dns_rdatatype_t type, +dns_lookup_create(isc_mem_t *mctx, const dns_name_t *name, dns_rdatatype_t type, dns_view_t *view, unsigned int options, isc_task_t *task, isc_taskaction_t action, void *arg, dns_lookup_t **lookupp) { diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c index b799e5287cc..4234deff616 100644 --- a/lib/dns/masterdump.c +++ b/lib/dns/masterdump.c @@ -232,7 +232,8 @@ struct dns_dumpctx { char *tmpfile; dns_masterformat_t format; dns_masterrawheader_t header; - isc_result_t (*dumpsets)(isc_mem_t *mctx, dns_name_t *name, + isc_result_t (*dumpsets)(isc_mem_t *mctx, + const dns_name_t *name, dns_rdatasetiter_t *rdsiter, dns_totext_ctx_t *ctx, isc_buffer_t *buffer, FILE *f); @@ -468,7 +469,7 @@ ncache_summary(dns_rdataset_t *rdataset, isc_boolean_t omit_final_dot, static isc_result_t rdataset_totext(dns_rdataset_t *rdataset, - dns_name_t *owner_name, + const dns_name_t *owner_name, dns_totext_ctx_t *ctx, isc_boolean_t omit_final_dot, isc_buffer_t *target) @@ -708,7 +709,7 @@ rdataset_totext(dns_rdataset_t *rdataset, */ static isc_result_t question_totext(dns_rdataset_t *rdataset, - dns_name_t *owner_name, + const dns_name_t *owner_name, dns_totext_ctx_t *ctx, isc_boolean_t omit_final_dot, isc_buffer_t *target) @@ -775,7 +776,7 @@ question_totext(dns_rdataset_t *rdataset, isc_result_t dns_rdataset_totext(dns_rdataset_t *rdataset, - dns_name_t *owner_name, + const dns_name_t *owner_name, isc_boolean_t omit_final_dot, isc_boolean_t question, isc_buffer_t *target) @@ -807,7 +808,7 @@ dns_rdataset_totext(dns_rdataset_t *rdataset, } isc_result_t -dns_master_rdatasettotext(dns_name_t *owner_name, +dns_master_rdatasettotext(const dns_name_t *owner_name, dns_rdataset_t *rdataset, const dns_master_style_t *style, isc_buffer_t *target) @@ -826,7 +827,7 @@ dns_master_rdatasettotext(dns_name_t *owner_name, } isc_result_t -dns_master_questiontotext(dns_name_t *owner_name, +dns_master_questiontotext(const dns_name_t *owner_name, dns_rdataset_t *rdataset, const dns_master_style_t *style, isc_buffer_t *target) @@ -852,8 +853,8 @@ dns_master_questiontotext(dns_name_t *owner_name, */ static isc_result_t -dump_rdataset(isc_mem_t *mctx, dns_name_t *name, dns_rdataset_t *rdataset, - dns_totext_ctx_t *ctx, +dump_rdataset(isc_mem_t *mctx, const dns_name_t *name, + dns_rdataset_t *rdataset, dns_totext_ctx_t *ctx, isc_buffer_t *buffer, FILE *f) { isc_region_t r; @@ -979,7 +980,7 @@ dump_order_compare(const void *a, const void *b) { #define MAXSORT 64 static isc_result_t -dump_rdatasets_text(isc_mem_t *mctx, dns_name_t *name, +dump_rdatasets_text(isc_mem_t *mctx, const dns_name_t *name, dns_rdatasetiter_t *rdsiter, dns_totext_ctx_t *ctx, isc_buffer_t *buffer, FILE *f) { @@ -1077,8 +1078,8 @@ dump_rdatasets_text(isc_mem_t *mctx, dns_name_t *name, * Dump given RRsets in the "raw" format. */ static isc_result_t -dump_rdataset_raw(isc_mem_t *mctx, dns_name_t *name, dns_rdataset_t *rdataset, - isc_buffer_t *buffer, FILE *f) +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; @@ -1184,7 +1185,7 @@ dump_rdataset_raw(isc_mem_t *mctx, dns_name_t *name, dns_rdataset_t *rdataset, } static isc_result_t -dump_rdatasets_raw(isc_mem_t *mctx, dns_name_t *name, +dump_rdatasets_raw(isc_mem_t *mctx, const dns_name_t *name, dns_rdatasetiter_t *rdsiter, dns_totext_ctx_t *ctx, isc_buffer_t *buffer, FILE *f) { @@ -1217,7 +1218,7 @@ dump_rdatasets_raw(isc_mem_t *mctx, dns_name_t *name, } static isc_result_t -dump_rdatasets_map(isc_mem_t *mctx, dns_name_t *name, +dump_rdatasets_map(isc_mem_t *mctx, const dns_name_t *name, dns_rdatasetiter_t *rdsiter, dns_totext_ctx_t *ctx, isc_buffer_t *buffer, FILE *f) { @@ -1985,7 +1986,7 @@ dns_master_dump3(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, isc_result_t dns_master_dumpnodetostream(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, - dns_dbnode_t *node, dns_name_t *name, + dns_dbnode_t *node, const dns_name_t *name, const dns_master_style_t *style, FILE *f) { @@ -2028,7 +2029,7 @@ dns_master_dumpnodetostream(isc_mem_t *mctx, dns_db_t *db, isc_result_t dns_master_dumpnode(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, - dns_dbnode_t *node, dns_name_t *name, + dns_dbnode_t *node, const dns_name_t *name, const dns_master_style_t *style, const char *filename) { FILE *f = NULL; diff --git a/lib/dns/message.c b/lib/dns/message.c index 0ad25ae1193..b8f7ff66802 100644 --- a/lib/dns/message.c +++ b/lib/dns/message.c @@ -167,7 +167,7 @@ msgblock_free(isc_mem_t *, dns_msgblock_t *, unsigned int); static void logfmtpacket(dns_message_t *message, const char *description, - isc_sockaddr_t *address, isc_logcategory_t *category, + const isc_sockaddr_t *address, isc_logcategory_t *category, isc_logmodule_t *module, const dns_master_style_t *style, int level, isc_mem_t *mctx); @@ -808,7 +808,7 @@ dns_message_destroy(dns_message_t **msgp) { } static isc_result_t -findname(dns_name_t **foundname, dns_name_t *target, +findname(dns_name_t **foundname, const dns_name_t *target, dns_namelist_t *section) { dns_name_t *curr; @@ -827,7 +827,7 @@ findname(dns_name_t **foundname, dns_name_t *target, } isc_result_t -dns_message_find(dns_name_t *name, dns_rdataclass_t rdclass, +dns_message_find(const dns_name_t *name, dns_rdataclass_t rdclass, dns_rdatatype_t type, dns_rdatatype_t covers, dns_rdataset_t **rdataset) { @@ -851,7 +851,7 @@ dns_message_find(dns_name_t *name, dns_rdataclass_t rdclass, } isc_result_t -dns_message_findtype(dns_name_t *name, dns_rdatatype_t type, +dns_message_findtype(const dns_name_t *name, dns_rdatatype_t type, dns_rdatatype_t covers, dns_rdataset_t **rdataset) { dns_rdataset_t *curr; @@ -1936,7 +1936,7 @@ norender_rdataset(const dns_rdataset_t *rdataset, unsigned int options, #endif static isc_result_t -renderset(dns_rdataset_t *rdataset, dns_name_t *owner_name, +renderset(dns_rdataset_t *rdataset, const dns_name_t *owner_name, dns_compress_t *cctx, isc_buffer_t *target, unsigned int reserved, unsigned int options, unsigned int *countp) { @@ -2412,7 +2412,7 @@ dns_message_currentname(dns_message_t *msg, dns_section_t section, isc_result_t dns_message_findname(dns_message_t *msg, dns_section_t section, - dns_name_t *target, dns_rdatatype_t type, + const dns_name_t *target, dns_rdatatype_t type, dns_rdatatype_t covers, dns_name_t **name, dns_rdataset_t **rdataset) { @@ -2762,7 +2762,7 @@ dns_message_setopt(dns_message_t *msg, dns_rdataset_t *opt) { } dns_rdataset_t * -dns_message_gettsig(dns_message_t *msg, dns_name_t **owner) { +dns_message_gettsig(dns_message_t *msg, const dns_name_t **owner) { /* * Get the TSIG record and owner for 'msg'. @@ -2905,7 +2905,7 @@ dns_message_getquerytsig(dns_message_t *msg, isc_mem_t *mctx, } dns_rdataset_t * -dns_message_getsig0(dns_message_t *msg, dns_name_t **owner) { +dns_message_getsig0(dns_message_t *msg, const dns_name_t **owner) { /* * Get the SIG(0) record for 'msg'. @@ -3414,7 +3414,7 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, isc_buffer_t *target) { dns_rdataset_t *ps = NULL; - dns_name_t *name = NULL; + const dns_name_t *name = NULL; isc_result_t result = ISC_R_SUCCESS; char buf[sizeof("1234567890")]; isc_uint32_t mbz; @@ -3658,7 +3658,7 @@ dns_message_pseudosectiontotext(dns_message_t *msg, isc_buffer_t *target) { dns_rdataset_t *ps = NULL; - dns_name_t *name = NULL; + const dns_name_t *name = NULL; isc_result_t result; char buf[sizeof("1234567890")]; isc_uint32_t mbz; @@ -4118,7 +4118,7 @@ dns_message_logpacket(dns_message_t *message, const char *description, void dns_message_logpacket2(dns_message_t *message, - const char *description, isc_sockaddr_t *address, + const char *description, const isc_sockaddr_t *address, isc_logcategory_t *category, isc_logmodule_t *module, int level, isc_mem_t *mctx) { @@ -4140,7 +4140,8 @@ dns_message_logfmtpacket(dns_message_t *message, const char *description, void dns_message_logfmtpacket2(dns_message_t *message, - const char *description, isc_sockaddr_t *address, + const char *description, + const isc_sockaddr_t *address, isc_logcategory_t *category, isc_logmodule_t *module, const dns_master_style_t *style, int level, isc_mem_t *mctx) @@ -4153,7 +4154,7 @@ dns_message_logfmtpacket2(dns_message_t *message, static void logfmtpacket(dns_message_t *message, const char *description, - isc_sockaddr_t *address, isc_logcategory_t *category, + const isc_sockaddr_t *address, isc_logcategory_t *category, isc_logmodule_t *module, const dns_master_style_t *style, int level, isc_mem_t *mctx) { diff --git a/lib/dns/name.c b/lib/dns/name.c index 5eecca5dabd..f8c0dcb4e1b 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -158,7 +158,7 @@ static dns_name_t root = }; /* XXXDCL make const? */ -LIBDNS_EXTERNAL_DATA dns_name_t *dns_rootname = &root; +LIBDNS_EXTERNAL_DATA const dns_name_t *dns_rootname = &root; static unsigned char wild_ndata[] = { '\001', '*' }; static unsigned char wild_offsets[] = { 0 }; @@ -174,10 +174,10 @@ static dns_name_t wild = }; /* XXXDCL make const? */ -LIBDNS_EXTERNAL_DATA dns_name_t *dns_wildcardname = &wild; +LIBDNS_EXTERNAL_DATA const dns_name_t *dns_wildcardname = &wild; unsigned int -dns_fullname_hash(dns_name_t *name, isc_boolean_t case_sensitive); +dns_fullname_hash(const dns_name_t *name, isc_boolean_t case_sensitive); /* * dns_name_t to text post-conversion procedure. @@ -471,7 +471,7 @@ dns_name_internalwildcard(const dns_name_t *name) { } unsigned int -dns_name_hash(dns_name_t *name, isc_boolean_t case_sensitive) { +dns_name_hash(const dns_name_t *name, isc_boolean_t case_sensitive) { unsigned int length; /* @@ -491,7 +491,7 @@ dns_name_hash(dns_name_t *name, isc_boolean_t case_sensitive) { } unsigned int -dns_name_fullhash(dns_name_t *name, isc_boolean_t case_sensitive) { +dns_name_fullhash(const dns_name_t *name, isc_boolean_t case_sensitive) { /* * Provide a hash value for 'name'. */ @@ -505,7 +505,7 @@ dns_name_fullhash(dns_name_t *name, isc_boolean_t case_sensitive) { } unsigned int -dns_fullname_hash(dns_name_t *name, isc_boolean_t case_sensitive) { +dns_fullname_hash(const dns_name_t *name, isc_boolean_t case_sensitive) { /* * This function was deprecated due to the breakage of the name space * convention. We only keep this internally to provide binary backward @@ -515,7 +515,7 @@ dns_fullname_hash(dns_name_t *name, isc_boolean_t case_sensitive) { } unsigned int -dns_name_hashbylabel(dns_name_t *name, isc_boolean_t case_sensitive) { +dns_name_hashbylabel(const dns_name_t *name, isc_boolean_t case_sensitive) { unsigned char *offsets; dns_offsets_t odata; dns_name_t tname; @@ -1074,7 +1074,7 @@ dns_name_fromregion(dns_name_t *name, const isc_region_t *r) { } void -dns_name_toregion(dns_name_t *name, isc_region_t *r) { +dns_name_toregion(const dns_name_t *name, isc_region_t *r) { /* * Make 'r' refer to 'name'. */ @@ -1578,7 +1578,7 @@ dns_name_totext2(const dns_name_t *name, unsigned int options, } isc_result_t -dns_name_tofilenametext(dns_name_t *name, isc_boolean_t omit_final_dot, +dns_name_tofilenametext(const dns_name_t *name, isc_boolean_t omit_final_dot, isc_buffer_t *target) { unsigned char *ndata; @@ -1688,7 +1688,9 @@ dns_name_tofilenametext(dns_name_t *name, isc_boolean_t omit_final_dot, } isc_result_t -dns_name_downcase(dns_name_t *source, dns_name_t *name, isc_buffer_t *target) { +dns_name_downcase(const dns_name_t *source, dns_name_t *name, + isc_buffer_t *target) +{ unsigned char *sndata, *ndata; unsigned int nlen, count, labels; isc_buffer_t buffer; @@ -2057,8 +2059,8 @@ dns_name_towire(const dns_name_t *name, dns_compress_t *cctx, } isc_result_t -dns_name_concatenate(dns_name_t *prefix, dns_name_t *suffix, dns_name_t *name, - isc_buffer_t *target) +dns_name_concatenate(const dns_name_t *prefix, const dns_name_t *suffix, + dns_name_t *name, isc_buffer_t *target) { unsigned char *ndata, *offsets; unsigned int nrem, labels, prefix_length, length; @@ -2159,7 +2161,7 @@ dns_name_concatenate(dns_name_t *prefix, dns_name_t *suffix, dns_name_t *name, } void -dns_name_split(dns_name_t *name, unsigned int suffixlabels, +dns_name_split(const dns_name_t *name, unsigned int suffixlabels, dns_name_t *prefix, dns_name_t *suffix) { @@ -2229,7 +2231,7 @@ dns_name_dup(const dns_name_t *source, isc_mem_t *mctx, } isc_result_t -dns_name_dupwithoffsets(dns_name_t *source, isc_mem_t *mctx, +dns_name_dupwithoffsets(const dns_name_t *source, isc_mem_t *mctx, dns_name_t *target) { /* @@ -2288,7 +2290,7 @@ dns_name_free(dns_name_t *name, isc_mem_t *mctx) { } isc_result_t -dns_name_digest(dns_name_t *name, dns_digestfunc_t digest, void *arg) { +dns_name_digest(const dns_name_t *name, dns_digestfunc_t digest, void *arg) { dns_name_t downname; unsigned char data[256]; isc_buffer_t buffer; @@ -2320,7 +2322,7 @@ dns_name_digest(dns_name_t *name, dns_digestfunc_t digest, void *arg) { } isc_boolean_t -dns_name_dynamic(dns_name_t *name) { +dns_name_dynamic(const dns_name_t *name) { REQUIRE(VALID_NAME(name)); /* @@ -2332,7 +2334,7 @@ dns_name_dynamic(dns_name_t *name) { } isc_result_t -dns_name_print(dns_name_t *name, FILE *stream) { +dns_name_print(const dns_name_t *name, FILE *stream) { isc_result_t result; isc_buffer_t b; isc_region_t r; @@ -2427,7 +2429,7 @@ dns_name_format(const dns_name_t *name, char *cp, unsigned int size) { * memory. */ isc_result_t -dns_name_tostring(dns_name_t *name, char **target, isc_mem_t *mctx) { +dns_name_tostring(const dns_name_t *name, char **target, isc_mem_t *mctx) { isc_result_t result; isc_buffer_t buf; isc_region_t reg; diff --git a/lib/dns/nsec.c b/lib/dns/nsec.c index d76e0c7c52d..bb6edd3b386 100644 --- a/lib/dns/nsec.c +++ b/lib/dns/nsec.c @@ -92,7 +92,7 @@ dns_nsec_compressbitmap(unsigned char *map, const unsigned char *raw, isc_result_t dns_nsec_buildrdata(dns_db_t *db, dns_dbversion_t *version, - dns_dbnode_t *node, dns_name_t *target, + dns_dbnode_t *node, const dns_name_t *target, unsigned char *buffer, dns_rdata_t *rdata) { isc_result_t result; @@ -167,7 +167,7 @@ dns_nsec_buildrdata(dns_db_t *db, dns_dbversion_t *version, isc_result_t dns_nsec_build(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, - dns_name_t *target, dns_ttl_t ttl) + const dns_name_t *target, dns_ttl_t ttl) { isc_result_t result; dns_rdata_t rdata = DNS_RDATA_INIT; @@ -290,8 +290,8 @@ dns_nsec_nseconly(dns_db_t *db, dns_dbversion_t *version, * Return ISC_R_IGNORE when the NSEC is not the appropriate one. */ isc_result_t -dns_nsec_noexistnodata(dns_rdatatype_t type, dns_name_t *name, - dns_name_t *nsecname, dns_rdataset_t *nsecset, +dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, + const dns_name_t *nsecname, dns_rdataset_t *nsecset, isc_boolean_t *exists, isc_boolean_t *data, dns_name_t *wild, dns_nseclog_t logit, void *arg) { diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c index 9a8210511ef..9d03b3a9c49 100644 --- a/lib/dns/nsec3.c +++ b/lib/dns/nsec3.c @@ -215,7 +215,8 @@ dns_nsec3_typepresent(dns_rdata_t *rdata, dns_rdatatype_t type) { isc_result_t dns_nsec3_hashname(dns_fixedname_t *result, unsigned char rethash[NSEC3_MAX_HASH_LENGTH], - size_t *hash_length, dns_name_t *name, dns_name_t *origin, + size_t *hash_length, const dns_name_t *name, + const dns_name_t *origin, dns_hash_t hashalg, unsigned int iterations, const unsigned char *salt, size_t saltlength) { @@ -323,7 +324,7 @@ do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver, * Set '*exists' to true iff the given name exists, to false otherwise. */ static isc_result_t -name_exists(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, +name_exists(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, isc_boolean_t *exists) { isc_result_t result; @@ -375,7 +376,7 @@ match_nsec3param(const dns_rdata_nsec3_t *nsec3, * change in "diff". */ static isc_result_t -delete(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, +delete(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, const dns_rdata_nsec3param_t *nsec3param, dns_diff_t *diff) { dns_dbnode_t *node = NULL ; @@ -497,7 +498,8 @@ find_nsec3(dns_rdata_nsec3_t *nsec3, dns_rdataset_t *rdataset, isc_result_t dns_nsec3_addnsec3(dns_db_t *db, dns_dbversion_t *version, - dns_name_t *name, const dns_rdata_nsec3param_t *nsec3param, + const dns_name_t *name, + const dns_rdata_nsec3param_t *nsec3param, dns_ttl_t nsecttl, isc_boolean_t unsecure, dns_diff_t *diff) { dns_dbiterator_t *dbit = NULL; @@ -859,7 +861,7 @@ dns_nsec3_addnsec3(dns_db_t *db, dns_dbversion_t *version, */ isc_result_t dns_nsec3_addnsec3s(dns_db_t *db, dns_dbversion_t *version, - dns_name_t *name, dns_ttl_t nsecttl, + const dns_name_t *name, dns_ttl_t nsecttl, isc_boolean_t unsecure, dns_diff_t *diff) { dns_dbnode_t *node = NULL; @@ -965,7 +967,7 @@ dns_nsec3param_toprivate(dns_rdata_t *src, dns_rdata_t *target, } static isc_result_t -rr_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, +rr_exists(dns_db_t *db, dns_dbversion_t *ver, const dns_name_t *name, const dns_rdata_t *rdata, isc_boolean_t *flag) { dns_rdataset_t rdataset; @@ -1134,7 +1136,7 @@ dns_nsec3param_deletechains(dns_db_t *db, dns_dbversion_t *ver, isc_result_t dns_nsec3_addnsec3sx(dns_db_t *db, dns_dbversion_t *version, - dns_name_t *name, dns_ttl_t nsecttl, + const dns_name_t *name, dns_ttl_t nsecttl, isc_boolean_t unsecure, dns_rdatatype_t type, dns_diff_t *diff) { @@ -1243,7 +1245,7 @@ dns_nsec3_addnsec3sx(dns_db_t *db, dns_dbversion_t *version, * ISC_FALSE indicates they should be retained. */ static isc_result_t -deleteit(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, +deleteit(dns_db_t *db, dns_dbversion_t *ver, const dns_name_t *name, isc_boolean_t *yesno) { isc_result_t result; @@ -1273,7 +1275,8 @@ deleteit(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, } isc_result_t -dns_nsec3_delnsec3(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, +dns_nsec3_delnsec3(dns_db_t *db, dns_dbversion_t *version, + const dns_name_t *name, const dns_rdata_nsec3param_t *nsec3param, dns_diff_t *diff) { dns_dbiterator_t *dbit = NULL; @@ -1534,14 +1537,16 @@ dns_nsec3_delnsec3(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, } isc_result_t -dns_nsec3_delnsec3s(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, +dns_nsec3_delnsec3s(dns_db_t *db, dns_dbversion_t *version, + const dns_name_t *name, dns_diff_t *diff) { return (dns_nsec3_delnsec3sx(db, version, name, 0, diff)); } isc_result_t -dns_nsec3_delnsec3sx(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, +dns_nsec3_delnsec3sx(dns_db_t *db, dns_dbversion_t *version, + const dns_name_t *name, dns_rdatatype_t privatetype, dns_diff_t *diff) { dns_dbnode_t *node = NULL; @@ -1797,8 +1802,8 @@ dns_nsec3_maxiterations(dns_db_t *db, dns_dbversion_t *version, } isc_result_t -dns_nsec3_noexistnodata(dns_rdatatype_t type, dns_name_t* name, - dns_name_t *nsec3name, dns_rdataset_t *nsec3set, +dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, + const dns_name_t *nsec3name, dns_rdataset_t *nsec3set, dns_name_t *zonename, isc_boolean_t *exists, isc_boolean_t *data, isc_boolean_t *optout, isc_boolean_t *unknown, isc_boolean_t *setclosest, diff --git a/lib/dns/nta.c b/lib/dns/nta.c index ef241db58e0..d2a840bae03 100644 --- a/lib/dns/nta.c +++ b/lib/dns/nta.c @@ -298,7 +298,9 @@ settimer(dns_ntatable_t *ntatable, dns_nta_t *nta, isc_uint32_t lifetime) { } static isc_result_t -nta_create(dns_ntatable_t *ntatable, dns_name_t *name, dns_nta_t **target) { +nta_create(dns_ntatable_t *ntatable, const dns_name_t *name, + dns_nta_t **target) +{ isc_result_t result; dns_nta_t *nta = NULL; dns_view_t *view; @@ -336,7 +338,7 @@ nta_create(dns_ntatable_t *ntatable, dns_name_t *name, dns_nta_t **target) { } isc_result_t -dns_ntatable_add(dns_ntatable_t *ntatable, dns_name_t *name, +dns_ntatable_add(dns_ntatable_t *ntatable, const dns_name_t *name, isc_boolean_t force, isc_stdtime_t now, isc_uint32_t lifetime) { @@ -391,7 +393,7 @@ dns_ntatable_add(dns_ntatable_t *ntatable, dns_name_t *name, * Caller must hold a write lock on rwlock. */ static isc_result_t -delete(dns_ntatable_t *ntatable, dns_name_t *name) { +delete(dns_ntatable_t *ntatable, const dns_name_t *name) { isc_result_t result; dns_rbtnode_t *node = NULL; @@ -413,7 +415,7 @@ delete(dns_ntatable_t *ntatable, dns_name_t *name) { } isc_result_t -dns_ntatable_delete(dns_ntatable_t *ntatable, dns_name_t *name) { +dns_ntatable_delete(dns_ntatable_t *ntatable, const dns_name_t *name) { isc_result_t result; RWLOCK(&ntatable->rwlock, isc_rwlocktype_write); @@ -425,7 +427,7 @@ dns_ntatable_delete(dns_ntatable_t *ntatable, dns_name_t *name) { isc_boolean_t dns_ntatable_covered(dns_ntatable_t *ntatable, isc_stdtime_t now, - dns_name_t *name, dns_name_t *anchor) + const dns_name_t *name, const dns_name_t *anchor) { isc_result_t result; dns_fixedname_t fn; diff --git a/lib/dns/order.c b/lib/dns/order.c index 8450d9b76f4..bda589e7ec9 100644 --- a/lib/dns/order.c +++ b/lib/dns/order.c @@ -71,7 +71,7 @@ dns_order_create(isc_mem_t *mctx, dns_order_t **orderp) { } isc_result_t -dns_order_add(dns_order_t *order, dns_name_t *name, +dns_order_add(dns_order_t *order, const dns_name_t *name, dns_rdatatype_t rdtype, dns_rdataclass_t rdclass, unsigned int mode) { @@ -98,7 +98,7 @@ dns_order_add(dns_order_t *order, dns_name_t *name, } static inline isc_boolean_t -match(dns_name_t *name1, dns_name_t *name2) { +match(const dns_name_t *name1, const dns_name_t *name2) { if (dns_name_iswildcard(name2)) return(dns_name_matcheswildcard(name1, name2)); @@ -106,7 +106,7 @@ match(dns_name_t *name1, dns_name_t *name2) { } unsigned int -dns_order_find(dns_order_t *order, dns_name_t *name, +dns_order_find(dns_order_t *order, const dns_name_t *name, dns_rdatatype_t rdtype, dns_rdataclass_t rdclass) { dns_order_ent_t *ent; diff --git a/lib/dns/peer.c b/lib/dns/peer.c index a9dc9f6d5c0..1964206ac01 100644 --- a/lib/dns/peer.c +++ b/lib/dns/peer.c @@ -149,8 +149,8 @@ dns_peerlist_addpeer(dns_peerlist_t *peers, dns_peer_t *peer) { } isc_result_t -dns_peerlist_peerbyaddr(dns_peerlist_t *servers, - isc_netaddr_t *addr, dns_peer_t **retval) +dns_peerlist_peerbyaddr(dns_peerlist_t *servers, const isc_netaddr_t *addr, + dns_peer_t **retval) { dns_peer_t *server; isc_result_t res; @@ -191,7 +191,7 @@ dns_peerlist_currpeer(dns_peerlist_t *peers, dns_peer_t **retval) { } isc_result_t -dns_peer_new(isc_mem_t *mem, isc_netaddr_t *addr, dns_peer_t **peerptr) { +dns_peer_new(isc_mem_t *mem, const isc_netaddr_t *addr, dns_peer_t **peerptr) { unsigned int prefixlen = 0; REQUIRE(peerptr != NULL); @@ -210,8 +210,8 @@ dns_peer_new(isc_mem_t *mem, isc_netaddr_t *addr, dns_peer_t **peerptr) { } isc_result_t -dns_peer_newprefix(isc_mem_t *mem, isc_netaddr_t *addr, unsigned int prefixlen, - dns_peer_t **peerptr) +dns_peer_newprefix(isc_mem_t *mem, const isc_netaddr_t *addr, + unsigned int prefixlen, dns_peer_t **peerptr) { dns_peer_t *peer; diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c index 868751aa5cb..502800f0015 100644 --- a/lib/dns/rbt.c +++ b/lib/dns/rbt.c @@ -418,11 +418,11 @@ dns__rbtnode_getdistance(dns_rbtnode_t *node) { * Forward declarations. */ static isc_result_t -create_node(isc_mem_t *mctx, dns_name_t *name, dns_rbtnode_t **nodep); +create_node(isc_mem_t *mctx, const dns_name_t *name, dns_rbtnode_t **nodep); #ifdef DNS_RBT_USEHASH static inline void -hash_node(dns_rbt_t *rbt, dns_rbtnode_t *node, dns_name_t *name); +hash_node(dns_rbt_t *rbt, dns_rbtnode_t *node, const dns_name_t *name); static inline void unhash_node(dns_rbt_t *rbt, dns_rbtnode_t *node); static void @@ -447,7 +447,7 @@ deletefromlevel(dns_rbtnode_t *delete, dns_rbtnode_t **rootp); static isc_result_t treefix(dns_rbt_t *rbt, void *base, size_t size, - dns_rbtnode_t *n, dns_name_t *name, + dns_rbtnode_t *n, const dns_name_t *name, dns_rbtdatafixer_t datafixer, void *fixer_arg, isc_uint64_t *crc); @@ -746,7 +746,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, - dns_name_t *name, dns_rbtdatafixer_t datafixer, + const dns_name_t *name, dns_rbtdatafixer_t datafixer, void *fixer_arg, isc_uint64_t *crc) { isc_result_t result = ISC_R_SUCCESS; @@ -1100,7 +1100,7 @@ move_chain_to_last(dns_rbtnodechain_t *chain, dns_rbtnode_t *node) { */ isc_result_t -dns_rbt_addnode(dns_rbt_t *rbt, dns_name_t *name, dns_rbtnode_t **nodep) { +dns_rbt_addnode(dns_rbt_t *rbt, const dns_name_t *name, dns_rbtnode_t **nodep) { /* * Does this thing have too many variables or what? */ @@ -1418,7 +1418,7 @@ dns_rbt_addnode(dns_rbt_t *rbt, dns_name_t *name, dns_rbtnode_t **nodep) { * Add a name to the tree of trees, associating it with some data. */ isc_result_t -dns_rbt_addname(dns_rbt_t *rbt, dns_name_t *name, void *data) { +dns_rbt_addname(dns_rbt_t *rbt, const dns_name_t *name, void *data) { isc_result_t result; dns_rbtnode_t *node; @@ -2002,7 +2002,9 @@ dns_rbt_findname(dns_rbt_t *rbt, const dns_name_t *name, unsigned int options, * Delete a name from the tree of trees. */ isc_result_t -dns_rbt_deletename(dns_rbt_t *rbt, dns_name_t *name, isc_boolean_t recurse) { +dns_rbt_deletename(dns_rbt_t *rbt, const dns_name_t *name, + isc_boolean_t recurse) +{ dns_rbtnode_t *node = NULL; isc_result_t result; @@ -2195,7 +2197,7 @@ dns_rbt_formatnodename(dns_rbtnode_t *node, char *printname, unsigned int size) } static isc_result_t -create_node(isc_mem_t *mctx, dns_name_t *name, dns_rbtnode_t **nodep) { +create_node(isc_mem_t *mctx, const dns_name_t *name, dns_rbtnode_t **nodep) { dns_rbtnode_t *node; isc_region_t region; unsigned int labels; @@ -2277,7 +2279,7 @@ create_node(isc_mem_t *mctx, dns_name_t *name, dns_rbtnode_t **nodep) { #ifdef DNS_RBT_USEHASH static inline void -hash_add_node(dns_rbt_t *rbt, dns_rbtnode_t *node, dns_name_t *name) { +hash_add_node(dns_rbt_t *rbt, dns_rbtnode_t *node, const dns_name_t *name) { unsigned int hash; REQUIRE(name != NULL); @@ -2345,7 +2347,7 @@ rehash(dns_rbt_t *rbt, unsigned int newcount) { } static inline void -hash_node(dns_rbt_t *rbt, dns_rbtnode_t *node, dns_name_t *name) { +hash_node(dns_rbt_t *rbt, dns_rbtnode_t *node, const dns_name_t *name) { REQUIRE(DNS_RBTNODE_VALID(node)); if (rbt->nodecount >= (rbt->hashsize * 3)) diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index 5323b23be4f..15b5237e5fc 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -840,7 +840,7 @@ static void dbiterator_destroy(dns_dbiterator_t **iteratorp); static isc_result_t dbiterator_first(dns_dbiterator_t *iterator); static isc_result_t dbiterator_last(dns_dbiterator_t *iterator); static isc_result_t dbiterator_seek(dns_dbiterator_t *iterator, - dns_name_t *name); + const dns_name_t *name); static isc_result_t dbiterator_prev(dns_dbiterator_t *iterator); static isc_result_t dbiterator_next(dns_dbiterator_t *iterator); static isc_result_t dbiterator_current(dns_dbiterator_t *iterator, @@ -2896,7 +2896,7 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) { * a wildcard level. */ static isc_result_t -add_wildcard_magic(dns_rbtdb_t *rbtdb, dns_name_t *name) { +add_wildcard_magic(dns_rbtdb_t *rbtdb, const dns_name_t *name) { isc_result_t result; dns_name_t foundname; dns_offsets_t offsets; @@ -2919,7 +2919,7 @@ add_wildcard_magic(dns_rbtdb_t *rbtdb, dns_name_t *name) { } static isc_result_t -add_empty_wildcards(dns_rbtdb_t *rbtdb, dns_name_t *name) { +add_empty_wildcards(dns_rbtdb_t *rbtdb, const dns_name_t *name) { isc_result_t result; dns_name_t foundname; dns_offsets_t offsets; @@ -2949,7 +2949,7 @@ add_empty_wildcards(dns_rbtdb_t *rbtdb, dns_name_t *name) { } static isc_result_t -findnodeintree(dns_rbtdb_t *rbtdb, dns_rbt_t *tree, dns_name_t *name, +findnodeintree(dns_rbtdb_t *rbtdb, dns_rbt_t *tree, const dns_name_t *name, isc_boolean_t create, dns_dbnode_t **nodep) { dns_rbtnode_t *node = NULL; @@ -3046,7 +3046,7 @@ findnodeintree(dns_rbtdb_t *rbtdb, dns_rbt_t *tree, dns_name_t *name, } static isc_result_t -findnode(dns_db_t *db, dns_name_t *name, isc_boolean_t create, +findnode(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, dns_dbnode_t **nodep) { dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; @@ -3057,7 +3057,7 @@ findnode(dns_db_t *db, dns_name_t *name, isc_boolean_t create, } static isc_result_t -findnsec3node(dns_db_t *db, dns_name_t *name, isc_boolean_t create, +findnsec3node(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, dns_dbnode_t **nodep) { dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; @@ -3405,7 +3405,7 @@ valid_glue(rbtdb_search_t *search, dns_name_t *name, rbtdb_rdatatype_t type, static inline isc_boolean_t activeempty(rbtdb_search_t *search, dns_rbtnodechain_t *chain, - dns_name_t *name) + const dns_name_t *name) { dns_fixedname_t fnext; dns_fixedname_t forigin; @@ -3456,7 +3456,9 @@ activeempty(rbtdb_search_t *search, dns_rbtnodechain_t *chain, } static inline isc_boolean_t -activeemtpynode(rbtdb_search_t *search, dns_name_t *qname, dns_name_t *wname) { +activeemtpynode(rbtdb_search_t *search, const dns_name_t *qname, + dns_name_t *wname) +{ dns_fixedname_t fnext; dns_fixedname_t forigin; dns_fixedname_t fprev; @@ -3572,7 +3574,7 @@ activeemtpynode(rbtdb_search_t *search, dns_name_t *qname, dns_name_t *wname) { static inline isc_result_t find_wildcard(rbtdb_search_t *search, dns_rbtnode_t **nodep, - dns_name_t *qname) + const dns_name_t *qname) { unsigned int i, j; dns_rbtnode_t *node, *level_node, *wnode; @@ -3775,9 +3777,9 @@ matchparams(rdatasetheader_t *header, rbtdb_search_t *search) */ static inline isc_result_t previous_closest_nsec(dns_rdatatype_t type, rbtdb_search_t *search, - dns_name_t *name, dns_name_t *origin, - dns_rbtnode_t **nodep, dns_rbtnodechain_t *nsecchain, - isc_boolean_t *firstp) + dns_name_t *name, dns_name_t *origin, + dns_rbtnode_t **nodep, dns_rbtnodechain_t *nsecchain, + isc_boolean_t *firstp) { dns_fixedname_t ftarget; dns_name_t *target; @@ -4071,7 +4073,7 @@ find_closest_nsec(rbtdb_search_t *search, dns_dbnode_t **nodep, } static isc_result_t -zone_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, +zone_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) @@ -4580,7 +4582,7 @@ zone_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, } static isc_result_t -zone_findzonecut(dns_db_t *db, dns_name_t *name, unsigned int options, +zone_findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) @@ -4983,7 +4985,7 @@ rpz_ready(dns_db_t *db) { } static isc_result_t -cache_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, +cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) @@ -5297,7 +5299,7 @@ cache_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, } static isc_result_t -cache_findzonecut(dns_db_t *db, dns_name_t *name, unsigned int options, +cache_findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) @@ -7122,7 +7124,7 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, * load a non-NSEC3 node in the main tree and optionally to the auxiliary NSEC */ static isc_result_t -loadnode(dns_rbtdb_t *rbtdb, dns_name_t *name, dns_rbtnode_t **nodep, +loadnode(dns_rbtdb_t *rbtdb, const dns_name_t *name, dns_rbtnode_t **nodep, isc_boolean_t hasnsec) { isc_result_t noderesult, rpzresult, nsecresult, tmpresult; @@ -7234,7 +7236,9 @@ loadnode(dns_rbtdb_t *rbtdb, dns_name_t *name, dns_rbtnode_t **nodep, } static isc_result_t -loading_addrdataset(void *arg, dns_name_t *name, dns_rdataset_t *rdataset) { +loading_addrdataset(void *arg, const dns_name_t *name, + dns_rdataset_t *rdataset) +{ rbtdb_load_t *loadctx = arg; dns_rbtdb_t *rbtdb = loadctx->rbtdb; dns_rbtnode_t *node; @@ -8282,7 +8286,7 @@ dns_rbtdb64_create #else dns_rbtdb_create #endif - (isc_mem_t *mctx, dns_name_t *origin, dns_dbtype_t type, + (isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], void *driverarg, dns_db_t **dbp) { @@ -8787,7 +8791,7 @@ rdataset_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, dns_db_t *db = rdataset->private1; dns_dbnode_t *node = rdataset->private2; dns_dbnode_t *cloned_node; - struct noqname *noqname = rdataset->private6; + const struct noqname *noqname = rdataset->private6; cloned_node = NULL; attachnode(db, node, &cloned_node); @@ -8833,7 +8837,7 @@ rdataset_getclosest(dns_rdataset_t *rdataset, dns_name_t *name, dns_db_t *db = rdataset->private1; dns_dbnode_t *node = rdataset->private2; dns_dbnode_t *cloned_node; - struct noqname *closest = rdataset->private7; + const struct noqname *closest = rdataset->private7; cloned_node = NULL; attachnode(db, node, &cloned_node); @@ -9321,7 +9325,7 @@ dbiterator_last(dns_dbiterator_t *iterator) { } static isc_result_t -dbiterator_seek(dns_dbiterator_t *iterator, dns_name_t *name) { +dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name) { isc_result_t result, tresult; rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator; dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)iterator->db; diff --git a/lib/dns/rbtdb.h b/lib/dns/rbtdb.h index d9bb0448561..ad76b2c95ed 100644 --- a/lib/dns/rbtdb.h +++ b/lib/dns/rbtdb.h @@ -26,7 +26,7 @@ ISC_LANG_BEGINDECLS isc_result_t -dns_rbtdb_create(isc_mem_t *mctx, dns_name_t *base, dns_dbtype_t type, +dns_rbtdb_create(isc_mem_t *mctx, const dns_name_t *base, dns_dbtype_t type, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], void *driverarg, dns_db_t **dbp); diff --git a/lib/dns/rbtdb64.h b/lib/dns/rbtdb64.h index 61e69616b39..d675a76bffe 100644 --- a/lib/dns/rbtdb64.h +++ b/lib/dns/rbtdb64.h @@ -27,7 +27,7 @@ ISC_LANG_BEGINDECLS isc_result_t -dns_rbtdb64_create(isc_mem_t *mctx, dns_name_t *base, dns_dbtype_t type, +dns_rbtdb64_create(isc_mem_t *mctx, const dns_name_t *base, dns_dbtype_t type, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], void *driverarg, dns_db_t **dbp); diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c index 6b6f3d18687..a65da6c4690 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -74,7 +74,7 @@ #define DNS_AS_STR(t) ((t).value.as_textregion.base) #define ARGS_FROMTEXT int rdclass, dns_rdatatype_t type, \ - isc_lex_t *lexer, dns_name_t *origin, \ + isc_lex_t *lexer, const dns_name_t *origin, \ unsigned int options, isc_buffer_t *target, \ dns_rdatacallbacks_t *callbacks @@ -102,10 +102,11 @@ #define ARGS_DIGEST dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg -#define ARGS_CHECKOWNER dns_name_t *name, dns_rdataclass_t rdclass, \ +#define ARGS_CHECKOWNER const dns_name_t *name, dns_rdataclass_t rdclass, \ dns_rdatatype_t type, isc_boolean_t wildcard -#define ARGS_CHECKNAMES dns_rdata_t *rdata, dns_name_t *owner, dns_name_t *bad +#define ARGS_CHECKNAMES dns_rdata_t *rdata, const dns_name_t *owner, \ + dns_name_t *bad /*% @@ -114,7 +115,7 @@ * conversion. */ typedef struct dns_rdata_textctx { - dns_name_t *origin; /*%< Current origin, or NULL. */ + const dns_name_t *origin; /*%< Current origin, or NULL. */ unsigned int flags; /*%< DNS_STYLEFLAG_* */ unsigned int width; /*%< Width of rdata column. */ const char *linebreak; /*%< Line break string. */ @@ -136,10 +137,10 @@ static isc_result_t multitxt_fromtext(isc_textregion_t *source, isc_buffer_t *target); static isc_boolean_t -name_prefix(dns_name_t *name, dns_name_t *origin, dns_name_t *target); +name_prefix(dns_name_t *name, const dns_name_t *origin, dns_name_t *target); static unsigned int -name_length(dns_name_t *name); +name_length(const dns_name_t *name); static isc_result_t str_totext(const char *source, isc_buffer_t *target); @@ -163,7 +164,7 @@ static isc_result_t uint8_tobuffer(isc_uint32_t, isc_buffer_t *target); static isc_result_t -name_tobuffer(dns_name_t *name, isc_buffer_t *target); +name_tobuffer(const dns_name_t *name, isc_buffer_t *target); static isc_uint32_t uint32_fromregion(isc_region_t *region); @@ -209,7 +210,7 @@ rdata_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target); static void -warn_badname(dns_name_t *name, isc_lex_t *lexer, +warn_badname(const dns_name_t *name, isc_lex_t *lexer, dns_rdatacallbacks_t *callbacks); static void @@ -401,7 +402,7 @@ getquad(const void *src, struct in_addr *dst, } static inline isc_result_t -name_duporclone(dns_name_t *source, isc_mem_t *mctx, dns_name_t *target) { +name_duporclone(const dns_name_t *source, isc_mem_t *mctx, dns_name_t *target) { if (mctx != NULL) return (dns_name_dup(source, mctx, target)); @@ -919,8 +920,9 @@ unknown_fromtext(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_result_t dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, - dns_name_t *origin, unsigned int options, isc_mem_t *mctx, - isc_buffer_t *target, dns_rdatacallbacks_t *callbacks) + const dns_name_t *origin, unsigned int options, + isc_mem_t *mctx, isc_buffer_t *target, + dns_rdatacallbacks_t *callbacks) { isc_result_t result = ISC_R_NOTIMPLEMENTED; isc_region_t region; @@ -1121,7 +1123,8 @@ rdata_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } isc_result_t -dns_rdata_totext(dns_rdata_t *rdata, dns_name_t *origin, isc_buffer_t *target) +dns_rdata_totext(dns_rdata_t *rdata, const dns_name_t *origin, + isc_buffer_t *target) { dns_rdata_textctx_t tctx; @@ -1138,7 +1141,7 @@ dns_rdata_totext(dns_rdata_t *rdata, dns_name_t *origin, isc_buffer_t *target) } isc_result_t -dns_rdata_tofmttext(dns_rdata_t *rdata, dns_name_t *origin, +dns_rdata_tofmttext(dns_rdata_t *rdata, const dns_name_t *origin, unsigned int flags, unsigned int width, unsigned int split_width, const char *linebreak, isc_buffer_t *target) @@ -1279,7 +1282,7 @@ dns_rdata_digest(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { } isc_boolean_t -dns_rdata_checkowner(dns_name_t *name, dns_rdataclass_t rdclass, +dns_rdata_checkowner(const dns_name_t *name, dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_boolean_t wildcard) { isc_boolean_t result; @@ -1289,7 +1292,8 @@ dns_rdata_checkowner(dns_name_t *name, dns_rdataclass_t rdclass, } isc_boolean_t -dns_rdata_checknames(dns_rdata_t *rdata, dns_name_t *owner, dns_name_t *bad) +dns_rdata_checknames(dns_rdata_t *rdata, const dns_name_t *owner, + dns_name_t *bad) { isc_boolean_t result; @@ -1392,7 +1396,7 @@ dns_rdatatype_format(dns_rdatatype_t rdtype, */ static unsigned int -name_length(dns_name_t *name) { +name_length(const dns_name_t *name) { return (name->length); } @@ -1673,7 +1677,7 @@ multitxt_fromtext(isc_textregion_t *source, isc_buffer_t *target) { } static isc_boolean_t -name_prefix(dns_name_t *name, dns_name_t *origin, dns_name_t *target) { +name_prefix(dns_name_t *name, const dns_name_t *origin, dns_name_t *target) { int l1, l2; if (origin == NULL) @@ -1783,7 +1787,7 @@ uint8_tobuffer(isc_uint32_t value, isc_buffer_t *target) { } static isc_result_t -name_tobuffer(dns_name_t *name, isc_buffer_t *target) { +name_tobuffer(const dns_name_t *name, isc_buffer_t *target) { isc_region_t r; dns_name_toregion(name, &r); return (isc_buffer_copyregion(target, &r)); @@ -2195,7 +2199,7 @@ warn_badmx(isc_token_t *token, isc_lex_t *lexer, } static void -warn_badname(dns_name_t *name, isc_lex_t *lexer, +warn_badname(const dns_name_t *name, isc_lex_t *lexer, dns_rdatacallbacks_t *callbacks) { const char *file; diff --git a/lib/dns/rdatalist.c b/lib/dns/rdatalist.c index d73cdc97df4..57024273644 100644 --- a/lib/dns/rdatalist.c +++ b/lib/dns/rdatalist.c @@ -190,7 +190,7 @@ isc__rdatalist_count(dns_rdataset_t *rdataset) { } isc_result_t -isc__rdatalist_addnoqname(dns_rdataset_t *rdataset, dns_name_t *name) { +isc__rdatalist_addnoqname(dns_rdataset_t *rdataset, const dns_name_t *name) { dns_rdataset_t *neg = NULL; dns_rdataset_t *negsig = NULL; dns_rdataset_t *rdset; @@ -243,7 +243,7 @@ isc__rdatalist_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, dns_rdataclass_t rdclass = rdataset->rdclass; dns_rdataset_t *tneg = NULL; dns_rdataset_t *tnegsig = NULL; - dns_name_t *noqname = rdataset->private6; + const dns_name_t *noqname = rdataset->private6; REQUIRE(rdataset != NULL); REQUIRE((rdataset->attributes & DNS_RDATASETATTR_NOQNAME) != 0); @@ -281,7 +281,7 @@ isc__rdatalist_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, } isc_result_t -isc__rdatalist_addclosest(dns_rdataset_t *rdataset, dns_name_t *name) { +isc__rdatalist_addclosest(dns_rdataset_t *rdataset, const dns_name_t *name) { dns_rdataset_t *neg = NULL; dns_rdataset_t *negsig = NULL; dns_rdataset_t *rdset; @@ -334,7 +334,7 @@ isc__rdatalist_getclosest(dns_rdataset_t *rdataset, dns_name_t *name, dns_rdataclass_t rdclass = rdataset->rdclass; dns_rdataset_t *tneg = NULL; dns_rdataset_t *tnegsig = NULL; - dns_name_t *closest = rdataset->private7; + const dns_name_t *closest = rdataset->private7; REQUIRE(rdataset != NULL); REQUIRE((rdataset->attributes & DNS_RDATASETATTR_CLOSEST) != 0); diff --git a/lib/dns/rdatalist_p.h b/lib/dns/rdatalist_p.h index e7cee715fc6..f95f6d0efee 100644 --- a/lib/dns/rdatalist_p.h +++ b/lib/dns/rdatalist_p.h @@ -37,14 +37,14 @@ unsigned int isc__rdatalist_count(dns_rdataset_t *rdataset); isc_result_t -isc__rdatalist_addnoqname(dns_rdataset_t *rdataset, dns_name_t *name); +isc__rdatalist_addnoqname(dns_rdataset_t *rdataset, const dns_name_t *name); isc_result_t isc__rdatalist_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, dns_rdataset_t *neg, dns_rdataset_t *negsig); isc_result_t -isc__rdatalist_addclosest(dns_rdataset_t *rdataset, dns_name_t *name); +isc__rdatalist_addclosest(dns_rdataset_t *rdataset, const dns_name_t *name); isc_result_t isc__rdatalist_getclosest(dns_rdataset_t *rdataset, dns_name_t *name, diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c index 25f7e6db4f1..8bfa645e187 100644 --- a/lib/dns/rdataset.c +++ b/lib/dns/rdataset.c @@ -592,7 +592,7 @@ dns_rdataset_towirepartial(dns_rdataset_t *rdataset, isc_result_t dns_rdataset_towire(dns_rdataset_t *rdataset, - dns_name_t *owner_name, + const dns_name_t *owner_name, dns_compress_t *cctx, isc_buffer_t *target, unsigned int options, @@ -658,7 +658,7 @@ dns_rdataset_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, } isc_result_t -dns_rdataset_addclosest(dns_rdataset_t *rdataset, dns_name_t *name) { +dns_rdataset_addclosest(dns_rdataset_t *rdataset, const dns_name_t *name) { REQUIRE(DNS_RDATASET_VALID(rdataset)); REQUIRE(rdataset->methods != NULL); diff --git a/lib/dns/request.c b/lib/dns/request.c index ee6a5142aa5..2452bb4ec07 100644 --- a/lib/dns/request.c +++ b/lib/dns/request.c @@ -416,7 +416,9 @@ mgr_gethash(dns_requestmgr_t *requestmgr) { } static inline isc_result_t -req_send(dns_request_t *request, isc_task_t *task, isc_sockaddr_t *address) { +req_send(dns_request_t *request, isc_task_t *task, + const isc_sockaddr_t *address) +{ isc_region_t r; isc_socket_t *sock; isc_socketevent_t *sendevent; @@ -494,7 +496,7 @@ new_request(isc_mem_t *mctx, dns_request_t **requestp) static isc_boolean_t -isblackholed(dns_dispatchmgr_t *dispatchmgr, isc_sockaddr_t *destaddr) { +isblackholed(dns_dispatchmgr_t *dispatchmgr, const isc_sockaddr_t *destaddr) { dns_acl_t *blackhole; isc_netaddr_t netaddr; int match; @@ -519,8 +521,8 @@ isblackholed(dns_dispatchmgr_t *dispatchmgr, isc_sockaddr_t *destaddr) { static isc_result_t create_tcp_dispatch(isc_boolean_t newtcp, isc_boolean_t share, dns_requestmgr_t *requestmgr, - isc_sockaddr_t *srcaddr, - isc_sockaddr_t *destaddr, isc_dscp_t dscp, + const isc_sockaddr_t *srcaddr, + const isc_sockaddr_t *destaddr, isc_dscp_t dscp, isc_boolean_t *connected, dns_dispatch_t **dispatchp) { isc_result_t result; @@ -595,8 +597,8 @@ cleanup: } static isc_result_t -find_udp_dispatch(dns_requestmgr_t *requestmgr, isc_sockaddr_t *srcaddr, - isc_sockaddr_t *destaddr, dns_dispatch_t **dispatchp) +find_udp_dispatch(dns_requestmgr_t *requestmgr, const isc_sockaddr_t *srcaddr, + const isc_sockaddr_t *destaddr, dns_dispatch_t **dispatchp) { dns_dispatch_t *disp = NULL; unsigned int attrs, attrmask; @@ -650,7 +652,7 @@ find_udp_dispatch(dns_requestmgr_t *requestmgr, isc_sockaddr_t *srcaddr, static isc_result_t get_dispatch(isc_boolean_t tcp, isc_boolean_t newtcp, isc_boolean_t share, dns_requestmgr_t *requestmgr, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, + const isc_sockaddr_t *srcaddr, const isc_sockaddr_t *destaddr, isc_dscp_t dscp, isc_boolean_t *connected, dns_dispatch_t **dispatchp) { @@ -686,7 +688,8 @@ set_timer(isc_timer_t *timer, unsigned int timeout, unsigned int udpresend) { isc_result_t dns_request_createraw(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, + const isc_sockaddr_t *srcaddr, + const isc_sockaddr_t *destaddr, unsigned int options, unsigned int timeout, isc_task_t *task, isc_taskaction_t action, void *arg, dns_request_t **requestp) @@ -698,7 +701,8 @@ dns_request_createraw(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf, isc_result_t dns_request_createraw2(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, + const isc_sockaddr_t *srcaddr, + const isc_sockaddr_t *destaddr, unsigned int options, unsigned int timeout, unsigned int udptimeout, isc_task_t *task, isc_taskaction_t action, void *arg, @@ -717,7 +721,8 @@ dns_request_createraw2(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf, isc_result_t dns_request_createraw3(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, + const isc_sockaddr_t *srcaddr, + const isc_sockaddr_t *destaddr, unsigned int options, unsigned int timeout, unsigned int udptimeout, unsigned int udpretries, isc_task_t *task, isc_taskaction_t action, void *arg, @@ -731,7 +736,8 @@ dns_request_createraw3(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf, isc_result_t dns_request_createraw4(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, + const isc_sockaddr_t *srcaddr, + const isc_sockaddr_t *destaddr, isc_dscp_t dscp, unsigned int options, unsigned int timeout, unsigned int udptimeout, unsigned int udpretries, isc_task_t *task, @@ -907,7 +913,7 @@ dns_request_createraw4(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf, isc_result_t dns_request_create(dns_requestmgr_t *requestmgr, dns_message_t *message, - isc_sockaddr_t *address, unsigned int options, + const isc_sockaddr_t *address, unsigned int options, dns_tsigkey_t *key, unsigned int timeout, isc_task_t *task, isc_taskaction_t action, void *arg, @@ -920,7 +926,8 @@ dns_request_create(dns_requestmgr_t *requestmgr, dns_message_t *message, isc_result_t dns_request_createvia(dns_requestmgr_t *requestmgr, dns_message_t *message, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, + const isc_sockaddr_t *srcaddr, + const isc_sockaddr_t *destaddr, unsigned int options, dns_tsigkey_t *key, unsigned int timeout, isc_task_t *task, isc_taskaction_t action, void *arg, @@ -933,7 +940,8 @@ dns_request_createvia(dns_requestmgr_t *requestmgr, dns_message_t *message, isc_result_t dns_request_createvia2(dns_requestmgr_t *requestmgr, dns_message_t *message, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, + const isc_sockaddr_t *srcaddr, + const isc_sockaddr_t *destaddr, unsigned int options, dns_tsigkey_t *key, unsigned int timeout, unsigned int udptimeout, isc_task_t *task, isc_taskaction_t action, void *arg, @@ -951,7 +959,8 @@ dns_request_createvia2(dns_requestmgr_t *requestmgr, dns_message_t *message, isc_result_t dns_request_createvia3(dns_requestmgr_t *requestmgr, dns_message_t *message, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, + const isc_sockaddr_t *srcaddr, + const isc_sockaddr_t *destaddr, unsigned int options, dns_tsigkey_t *key, unsigned int timeout, unsigned int udptimeout, unsigned int udpretries, isc_task_t *task, @@ -966,7 +975,8 @@ dns_request_createvia3(dns_requestmgr_t *requestmgr, dns_message_t *message, isc_result_t dns_request_createvia4(dns_requestmgr_t *requestmgr, dns_message_t *message, - isc_sockaddr_t *srcaddr, isc_sockaddr_t *destaddr, + const isc_sockaddr_t *srcaddr, + const isc_sockaddr_t *destaddr, isc_dscp_t dscp, unsigned int options, dns_tsigkey_t *key, unsigned int timeout, unsigned int udptimeout, unsigned int udpretries, diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 699c805d0f4..93587caddc4 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -367,7 +367,7 @@ struct fetchctx { unsigned int valfail; isc_boolean_t timeout; dns_adbaddrinfo_t *addrinfo; - isc_sockaddr_t *client; + const isc_sockaddr_t *client; unsigned int depth; }; @@ -2047,7 +2047,7 @@ compute_cc(resquery_t *query, unsigned char *cookie, size_t len) { } static isc_result_t -issecuredomain(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type, +issecuredomain(dns_view_t *view, const dns_name_t *name, dns_rdatatype_t type, isc_stdtime_t now, isc_boolean_t checknta, isc_boolean_t *issecure) { @@ -3065,7 +3065,7 @@ sort_finds(dns_adbfindlist_t *findlist, unsigned int bias) { } static void -findname(fetchctx_t *fctx, dns_name_t *name, in_port_t port, +findname(fetchctx_t *fctx, const dns_name_t *name, in_port_t port, unsigned int options, unsigned int flags, isc_stdtime_t now, isc_boolean_t *overquota, isc_boolean_t *need_alternate) { @@ -3185,7 +3185,7 @@ findname(fetchctx_t *fctx, dns_name_t *name, in_port_t port, } static isc_boolean_t -isstrictsubdomain(dns_name_t *name1, dns_name_t *name2) { +isstrictsubdomain(const dns_name_t *name1, const dns_name_t *name2) { int order; unsigned int nlabels; dns_namereln_t namereln; @@ -4135,7 +4135,7 @@ fctx_start(isc_task_t *task, isc_event_t *event) { */ static inline isc_result_t -fctx_join(fetchctx_t *fctx, isc_task_t *task, isc_sockaddr_t *client, +fctx_join(fetchctx_t *fctx, isc_task_t *task, const isc_sockaddr_t *client, dns_messageid_t id, isc_taskaction_t action, void *arg, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, dns_fetch_t *fetch) @@ -4202,8 +4202,8 @@ log_ns_ttl(fetchctx_t *fctx, const char *where) { } static isc_result_t -fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type, - dns_name_t *domain, dns_rdataset_t *nameservers, +fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type, + const dns_name_t *domain, dns_rdataset_t *nameservers, unsigned int options, unsigned int bucketnum, unsigned int depth, isc_counter_t *qc, fetchctx_t **fctxp) { @@ -4325,8 +4325,9 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type, if (domain == NULL) { dns_forwarders_t *forwarders = NULL; unsigned int labels; - dns_name_t *fwdname = name; + const dns_name_t *fwdname = name; dns_name_t suffix; + dns_name_t *fname; /* * DS records are found in the parent server. Strip one @@ -4343,9 +4344,9 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type, /* Find the forwarder for this name. */ dns_fixedname_init(&fixed); - domain = dns_fixedname_name(&fixed); + fname = dns_fixedname_name(&fixed); result = dns_fwdtable_find2(fctx->res->view->fwdtable, fwdname, - domain, &forwarders); + fname, &forwarders); if (result == ISC_R_SUCCESS) fctx->fwdpolicy = forwarders->fwdpolicy; @@ -4357,15 +4358,14 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type, */ if (dns_rdatatype_atparent(fctx->type)) findoptions |= DNS_DBFIND_NOEXACT; - result = dns_view_findzonecut(res->view, name, - domain, 0, findoptions, - ISC_TRUE, + result = dns_view_findzonecut(res->view, name, fname, + 0, findoptions, ISC_TRUE, &fctx->nameservers, NULL); if (result != ISC_R_SUCCESS) goto cleanup_nameservers; - result = dns_name_dup(domain, mctx, &fctx->domain); + result = dns_name_dup(fname, mctx, &fctx->domain); if (result != ISC_R_SUCCESS) goto cleanup_nameservers; @@ -4375,7 +4375,7 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type, /* * We're in forward-only mode. Set the query domain. */ - result = dns_name_dup(domain, mctx, &fctx->domain); + result = dns_name_dup(fname, mctx, &fctx->domain); if (result != ISC_R_SUCCESS) goto cleanup_name; } @@ -6032,7 +6032,7 @@ mark_related(dns_name_t *name, dns_rdataset_t *rdataset, } static isc_result_t -check_section(void *arg, dns_name_t *addname, dns_rdatatype_t type, +check_section(void *arg, const dns_name_t *addname, dns_rdatatype_t type, dns_section_t section) { fetchctx_t *fctx = arg; @@ -6096,7 +6096,7 @@ check_section(void *arg, dns_name_t *addname, dns_rdatatype_t type, } static isc_result_t -check_related(void *arg, dns_name_t *addname, dns_rdatatype_t type) { +check_related(void *arg, const dns_name_t *addname, dns_rdatatype_t type) { return (check_section(arg, addname, type, DNS_SECTION_ADDITIONAL)); } @@ -6105,7 +6105,7 @@ check_related(void *arg, dns_name_t *addname, dns_rdatatype_t type) { #endif #if CHECK_FOR_GLUE_IN_ANSWER static isc_result_t -check_answer(void *arg, dns_name_t *addname, dns_rdatatype_t type) { +check_answer(void *arg, const dns_name_t *addname, dns_rdatatype_t type) { return (check_section(arg, addname, type, DNS_SECTION_ANSWER)); } #endif @@ -9338,7 +9338,7 @@ dns_resolver_detach(dns_resolver_t **resp) { } static inline isc_boolean_t -fctx_match(fetchctx_t *fctx, dns_name_t *name, dns_rdatatype_t type, +fctx_match(fetchctx_t *fctx, const dns_name_t *name, dns_rdatatype_t type, unsigned int options) { /* @@ -9354,7 +9354,7 @@ fctx_match(fetchctx_t *fctx, dns_name_t *name, dns_rdatatype_t type, } static inline void -log_fetch(dns_name_t *name, dns_rdatatype_t type) { +log_fetch(const dns_name_t *name, dns_rdatatype_t type) { char namebuf[DNS_NAME_FORMATSIZE]; char typebuf[DNS_RDATATYPE_FORMATSIZE]; int level = ISC_LOG_DEBUG(1); @@ -9375,9 +9375,9 @@ log_fetch(dns_name_t *name, dns_rdatatype_t type) { } isc_result_t -dns_resolver_createfetch(dns_resolver_t *res, dns_name_t *name, +dns_resolver_createfetch(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type, - dns_name_t *domain, dns_rdataset_t *nameservers, + const dns_name_t *domain, dns_rdataset_t *nameservers, dns_forwarders_t *forwarders, unsigned int options, isc_task_t *task, isc_taskaction_t action, void *arg, @@ -9392,11 +9392,11 @@ dns_resolver_createfetch(dns_resolver_t *res, dns_name_t *name, } isc_result_t -dns_resolver_createfetch2(dns_resolver_t *res, dns_name_t *name, +dns_resolver_createfetch2(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type, - dns_name_t *domain, dns_rdataset_t *nameservers, + const dns_name_t *domain, dns_rdataset_t *nameservers, dns_forwarders_t *forwarders, - isc_sockaddr_t *client, dns_messageid_t id, + const isc_sockaddr_t *client, dns_messageid_t id, unsigned int options, isc_task_t *task, isc_taskaction_t action, void *arg, dns_rdataset_t *rdataset, @@ -9410,11 +9410,11 @@ dns_resolver_createfetch2(dns_resolver_t *res, dns_name_t *name, } isc_result_t -dns_resolver_createfetch3(dns_resolver_t *res, dns_name_t *name, +dns_resolver_createfetch3(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type, - dns_name_t *domain, dns_rdataset_t *nameservers, + const dns_name_t *domain, dns_rdataset_t *nameservers, dns_forwarders_t *forwarders, - isc_sockaddr_t *client, dns_messageid_t id, + const isc_sockaddr_t *client, dns_messageid_t id, unsigned int options, unsigned int depth, isc_counter_t *qc, isc_task_t *task, isc_taskaction_t action, void *arg, @@ -9742,8 +9742,8 @@ dns_resolver_nrunning(dns_resolver_t *resolver) { } isc_result_t -dns_resolver_addalternate(dns_resolver_t *resolver, isc_sockaddr_t *alt, - dns_name_t *name, in_port_t port) { +dns_resolver_addalternate(dns_resolver_t *resolver, const isc_sockaddr_t *alt, + const dns_name_t *name, in_port_t port) { alternate_t *a; isc_result_t result; @@ -9786,7 +9786,7 @@ dns_resolver_getudpsize(dns_resolver_t *resolver) { } void -dns_resolver_flushbadcache(dns_resolver_t *resolver, dns_name_t *name) { +dns_resolver_flushbadcache(dns_resolver_t *resolver, const dns_name_t *name) { if (name != NULL) dns_badcache_flushname(resolver->badcache, name); else @@ -9794,12 +9794,12 @@ dns_resolver_flushbadcache(dns_resolver_t *resolver, dns_name_t *name) { } void -dns_resolver_flushbadnames(dns_resolver_t *resolver, dns_name_t *name) { +dns_resolver_flushbadnames(dns_resolver_t *resolver, const dns_name_t *name) { dns_badcache_flushtree(resolver->badcache, name); } void -dns_resolver_addbadcache(dns_resolver_t *resolver, dns_name_t *name, +dns_resolver_addbadcache(dns_resolver_t *resolver, const dns_name_t *name, dns_rdatatype_t type, isc_time_t *expire) { #ifdef ENABLE_AFL @@ -9812,7 +9812,7 @@ dns_resolver_addbadcache(dns_resolver_t *resolver, dns_name_t *name, } isc_boolean_t -dns_resolver_getbadcache(dns_resolver_t *resolver, dns_name_t *name, +dns_resolver_getbadcache(dns_resolver_t *resolver, const dns_name_t *name, dns_rdatatype_t type, isc_time_t *now) { return (dns_badcache_find(resolver->badcache, name, type, NULL, now)); @@ -9847,7 +9847,8 @@ dns_resolver_reset_algorithms(dns_resolver_t *resolver) { } isc_result_t -dns_resolver_disable_algorithm(dns_resolver_t *resolver, dns_name_t *name, +dns_resolver_disable_algorithm(dns_resolver_t *resolver, + const dns_name_t *name, unsigned int alg) { unsigned int len, mask; @@ -9922,8 +9923,8 @@ dns_resolver_disable_algorithm(dns_resolver_t *resolver, dns_name_t *name, } isc_boolean_t -dns_resolver_algorithm_supported(dns_resolver_t *resolver, dns_name_t *name, - unsigned int alg) +dns_resolver_algorithm_supported(dns_resolver_t *resolver, + const dns_name_t *name, unsigned int alg) { unsigned int len, mask; unsigned char *algorithms; @@ -9986,7 +9987,8 @@ dns_resolver_reset_ds_digests(dns_resolver_t *resolver) { } isc_result_t -dns_resolver_disable_ds_digest(dns_resolver_t *resolver, dns_name_t *name, +dns_resolver_disable_ds_digest(dns_resolver_t *resolver, + const dns_name_t *name, unsigned int digest_type) { unsigned int len, mask; @@ -10057,7 +10059,8 @@ dns_resolver_disable_ds_digest(dns_resolver_t *resolver, dns_name_t *name, } isc_boolean_t -dns_resolver_ds_digest_supported(dns_resolver_t *resolver, dns_name_t *name, +dns_resolver_ds_digest_supported(dns_resolver_t *resolver, + const dns_name_t *name, unsigned int digest_type) { unsigned int len, mask; @@ -10108,7 +10111,7 @@ dns_resolver_resetmustbesecure(dns_resolver_t *resolver) { static isc_boolean_t yes = ISC_TRUE, no = ISC_FALSE; isc_result_t -dns_resolver_setmustbesecure(dns_resolver_t *resolver, dns_name_t *name, +dns_resolver_setmustbesecure(dns_resolver_t *resolver, const dns_name_t *name, isc_boolean_t value) { isc_result_t result; @@ -10134,7 +10137,7 @@ dns_resolver_setmustbesecure(dns_resolver_t *resolver, dns_name_t *name, } isc_boolean_t -dns_resolver_getmustbesecure(dns_resolver_t *resolver, dns_name_t *name) { +dns_resolver_getmustbesecure(dns_resolver_t *resolver, const dns_name_t *name) { void *data = NULL; isc_boolean_t value = ISC_FALSE; isc_result_t result; diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c index 3ead261395f..10c3f356f05 100644 --- a/lib/dns/rpz.c +++ b/lib/dns/rpz.c @@ -641,7 +641,7 @@ new_node(dns_rpz_zones_t *rpzs, } static void -badname(int level, dns_name_t *name, const char *str1, const char *str2) { +badname(int level, const dns_name_t *name, const char *str1, const char *str2) { char namebuf[DNS_NAME_FORMATSIZE]; /* @@ -664,7 +664,7 @@ badname(int level, dns_name_t *name, const char *str1, const char *str2) { */ static isc_result_t ip2name(const dns_rpz_cidr_key_t *tgt_ip, dns_rpz_prefix_t tgt_prefix, - dns_name_t *base_name, dns_name_t *ip_name) + const dns_name_t *base_name, dns_name_t *ip_name) { #ifndef INET6_ADDRSTRLEN #define INET6_ADDRSTRLEN 46 @@ -733,7 +733,7 @@ ip2name(const dns_rpz_cidr_key_t *tgt_ip, dns_rpz_prefix_t tgt_prefix, * Determine the type a of a name in a response policy zone. */ static dns_rpz_type_t -type_from_name(dns_rpz_zone_t *rpz, dns_name_t *name) { +type_from_name(dns_rpz_zone_t *rpz, const dns_name_t *name) { if (dns_name_issubdomain(name, &rpz->ip)) return (DNS_RPZ_TYPE_IP); @@ -762,7 +762,7 @@ type_from_name(dns_rpz_zone_t *rpz, dns_name_t *name) { static isc_result_t name2ipkey(int log_level, const dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, - dns_rpz_type_t rpz_type, dns_name_t *src_name, + dns_rpz_type_t rpz_type, const dns_name_t *src_name, dns_rpz_cidr_key_t *tgt_ip, dns_rpz_prefix_t *tgt_prefix, dns_rpz_addr_zbits_t *new_set) { @@ -1250,7 +1250,7 @@ search(dns_rpz_zones_t *rpzs, */ static isc_result_t add_cidr(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, - dns_rpz_type_t rpz_type, dns_name_t *src_name) + dns_rpz_type_t rpz_type, const dns_name_t *src_name) { dns_rpz_cidr_key_t tgt_ip; dns_rpz_prefix_t tgt_prefix; @@ -1337,7 +1337,7 @@ add_nm(dns_rpz_zones_t *rpzs, dns_name_t *trig_name, static isc_result_t add_name(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, - dns_rpz_type_t rpz_type, dns_name_t *src_name) + dns_rpz_type_t rpz_type, const dns_name_t *src_name) { dns_rpz_nm_data_t new_data; dns_fixedname_t trig_namef; @@ -1883,7 +1883,8 @@ dns_rpz_ready(dns_rpz_zones_t *rpzs, * Add an IP address to the radix tree or a name to the summary database. */ isc_result_t -dns_rpz_add(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, dns_name_t *src_name) +dns_rpz_add(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, + const dns_name_t *src_name) { dns_rpz_zone_t *rpz; dns_rpz_type_t rpz_type; @@ -1922,7 +1923,7 @@ dns_rpz_add(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, dns_name_t *src_name) */ static void del_cidr(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, - dns_rpz_type_t rpz_type, dns_name_t *src_name) + dns_rpz_type_t rpz_type, const dns_name_t *src_name) { isc_result_t result; dns_rpz_cidr_key_t tgt_ip; @@ -2009,7 +2010,7 @@ del_cidr(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, static void del_name(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, - dns_rpz_type_t rpz_type, dns_name_t *src_name) + dns_rpz_type_t rpz_type, const dns_name_t *src_name) { char namebuf[DNS_NAME_FORMATSIZE]; dns_fixedname_t trig_namef; @@ -2088,7 +2089,8 @@ del_name(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, */ void dns_rpz_delete(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, - dns_name_t *src_name) { + const dns_name_t *src_name) +{ dns_rpz_zone_t *rpz; dns_rpz_type_t rpz_type; diff --git a/lib/dns/rrl.c b/lib/dns/rrl.c index 726f5da1cd3..252ebd86f4b 100644 --- a/lib/dns/rrl.c +++ b/lib/dns/rrl.c @@ -385,8 +385,8 @@ hash_key(const dns_rrl_key_t *key) { */ static void make_key(const dns_rrl_t *rrl, dns_rrl_key_t *key, - const isc_sockaddr_t *client_addr, - dns_rdatatype_t qtype, dns_name_t *qname, dns_rdataclass_t qclass, + const isc_sockaddr_t *client_addr, dns_rdatatype_t qtype, + const dns_name_t *qname, dns_rdataclass_t qclass, dns_rrl_rtype_t rtype) { dns_name_t base; @@ -484,9 +484,9 @@ response_balance(dns_rrl_t *rrl, const dns_rrl_entry_t *e, int age) { */ static dns_rrl_entry_t * get_entry(dns_rrl_t *rrl, const isc_sockaddr_t *client_addr, - dns_rdataclass_t qclass, dns_rdatatype_t qtype, dns_name_t *qname, - dns_rrl_rtype_t rtype, isc_stdtime_t now, isc_boolean_t create, - char *log_buf, unsigned int log_buf_len) + dns_rdataclass_t qclass, dns_rdatatype_t qtype, + const dns_name_t *qname, dns_rrl_rtype_t rtype, isc_stdtime_t now, + isc_boolean_t create, char *log_buf, unsigned int log_buf_len) { dns_rrl_key_t key; isc_uint32_t hval; @@ -781,7 +781,7 @@ add_log_str(isc_buffer_t *lb, const char *str, unsigned int str_len) { static void make_log_buf(dns_rrl_t *rrl, dns_rrl_entry_t *e, const char *str1, const char *str2, isc_boolean_t plural, - dns_name_t *qname, isc_boolean_t save_qname, + const dns_name_t *qname, isc_boolean_t save_qname, dns_rrl_result_t rrl_result, isc_result_t resp_result, char *log_buf, unsigned int log_buf_len) { @@ -1000,7 +1000,7 @@ dns_rrl_result_t dns_rrl(dns_view_t *view, const isc_sockaddr_t *client_addr, isc_boolean_t is_tcp, dns_rdataclass_t qclass, dns_rdatatype_t qtype, - dns_name_t *qname, isc_result_t resp_result, isc_stdtime_t now, + const dns_name_t *qname, isc_result_t resp_result, isc_stdtime_t now, isc_boolean_t wouldlog, char *log_buf, unsigned int log_buf_len) { dns_rrl_t *rrl; diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c index 651c7dcfd94..55cbf44554c 100644 --- a/lib/dns/sdb.c +++ b/lib/dns/sdb.c @@ -133,7 +133,7 @@ typedef struct sdb_rdatasetiter { static int dummy; -static isc_result_t dns_sdb_create(isc_mem_t *mctx, dns_name_t *origin, +static isc_result_t dns_sdb_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], void *driverarg, dns_db_t **dbp); @@ -159,7 +159,7 @@ static void dbiterator_destroy(dns_dbiterator_t **iteratorp); static isc_result_t dbiterator_first(dns_dbiterator_t *iterator); static isc_result_t dbiterator_last(dns_dbiterator_t *iterator); static isc_result_t dbiterator_seek(dns_dbiterator_t *iterator, - dns_name_t *name); + const dns_name_t *name); static isc_result_t dbiterator_prev(dns_dbiterator_t *iterator); static isc_result_t dbiterator_next(dns_dbiterator_t *iterator); static isc_result_t dbiterator_current(dns_dbiterator_t *iterator, @@ -342,7 +342,7 @@ dns_sdb_putrr(dns_sdblookup_t *lookup, const char *type, dns_ttl_t ttl, unsigned int size = 0; /* Init to suppress compiler warning */ isc_mem_t *mctx; dns_sdbimplementation_t *imp; - dns_name_t *origin; + const dns_name_t *origin; isc_buffer_t b; isc_buffer_t rb; @@ -421,7 +421,8 @@ dns_sdb_putrr(dns_sdblookup_t *lookup, const char *type, dns_ttl_t ttl, static isc_result_t getnode(dns_sdballnodes_t *allnodes, const char *name, dns_sdbnode_t **nodep) { - dns_name_t *newname, *origin; + dns_name_t *newname; + const dns_name_t *origin; dns_fixedname_t fnewname; dns_sdb_t *sdb = (dns_sdb_t *)allnodes->common.db; dns_sdbimplementation_t *imp = sdb->implementation; @@ -716,7 +717,7 @@ destroynode(dns_sdbnode_t *node) { } static isc_result_t -findnodeext(dns_db_t *db, dns_name_t *name, isc_boolean_t create, +findnodeext(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, dns_dbnode_t **nodep) { @@ -804,7 +805,7 @@ findnodeext(dns_db_t *db, dns_name_t *name, isc_boolean_t create, } static isc_result_t -findext(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, +findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, @@ -982,7 +983,7 @@ findext(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, } static isc_result_t -findzonecut(dns_db_t *db, dns_name_t *name, unsigned int options, +findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { @@ -1295,7 +1296,7 @@ static dns_dbmethods_t sdb_methods = { }; static isc_result_t -dns_sdb_create(isc_mem_t *mctx, dns_name_t *origin, dns_dbtype_t type, +dns_sdb_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], void *driverarg, dns_db_t **dbp) { @@ -1490,7 +1491,7 @@ dbiterator_last(dns_dbiterator_t *iterator) { } static isc_result_t -dbiterator_seek(dns_dbiterator_t *iterator, dns_name_t *name) { +dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name) { sdb_dbiterator_t *sdbiter = (sdb_dbiterator_t *)iterator; sdbiter->current = ISC_LIST_HEAD(sdbiter->nodelist); diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c index 60ccc344e4e..c0a49533492 100644 --- a/lib/dns/sdlz.c +++ b/lib/dns/sdlz.c @@ -179,7 +179,7 @@ typedef struct sdlz_rdatasetiter { /* * Forward references. */ -static isc_result_t getnodedata(dns_db_t *db, dns_name_t *name, +static isc_result_t getnodedata(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, unsigned int options, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, @@ -195,7 +195,7 @@ static void dbiterator_destroy(dns_dbiterator_t **iteratorp); static isc_result_t dbiterator_first(dns_dbiterator_t *iterator); static isc_result_t dbiterator_last(dns_dbiterator_t *iterator); static isc_result_t dbiterator_seek(dns_dbiterator_t *iterator, - dns_name_t *name); + const dns_name_t *name); static isc_result_t dbiterator_prev(dns_dbiterator_t *iterator); static isc_result_t dbiterator_next(dns_dbiterator_t *iterator); static isc_result_t dbiterator_current(dns_dbiterator_t *iterator, @@ -532,7 +532,7 @@ destroynode(dns_sdlznode_t *node) { } static isc_result_t -getnodedata(dns_db_t *db, dns_name_t *name, isc_boolean_t create, +getnodedata(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, unsigned int options, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, dns_dbnode_t **nodep) { @@ -614,20 +614,23 @@ getnodedata(dns_db_t *db, dns_name_t *name, isc_boolean_t create, for (i = 0; i < dlabels; i++) { char wildstr[DNS_NAME_MAXTEXT + 1]; dns_fixedname_t fixed; - dns_name_t *wild; + const dns_name_t *wild; dns_fixedname_init(&fixed); if (i == dlabels) wild = dns_wildcardname; else { - wild = dns_fixedname_name(&fixed); + dns_name_t *fname; + fname = dns_fixedname_name(&fixed); dns_name_getlabelsequence(name, i + 1, dlabels - i - 1, - wild); + fname); result = dns_name_concatenate(dns_wildcardname, - wild, wild, NULL); + fname, fname, + NULL); if (result != ISC_R_SUCCESS) return (result); + wild = fname; } isc_buffer_init(&b, wildstr, sizeof(wildstr)); @@ -691,7 +694,7 @@ getnodedata(dns_db_t *db, dns_name_t *name, isc_boolean_t create, } static isc_result_t -findnodeext(dns_db_t *db, dns_name_t *name, isc_boolean_t create, +findnodeext(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, dns_dbnode_t **nodep) { @@ -699,14 +702,14 @@ findnodeext(dns_db_t *db, dns_name_t *name, isc_boolean_t create, } static isc_result_t -findnode(dns_db_t *db, dns_name_t *name, isc_boolean_t create, +findnode(dns_db_t *db, const dns_name_t *name, isc_boolean_t create, dns_dbnode_t **nodep) { return (getnodedata(db, name, create, 0, NULL, NULL, nodep)); } static isc_result_t -findzonecut(dns_db_t *db, dns_name_t *name, unsigned int options, +findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { @@ -879,7 +882,7 @@ findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, } static isc_result_t -findext(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, +findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, @@ -1049,7 +1052,7 @@ findext(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, } static isc_result_t -find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version, +find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) @@ -1374,7 +1377,7 @@ dbiterator_last(dns_dbiterator_t *iterator) { } static isc_result_t -dbiterator_seek(dns_dbiterator_t *iterator, dns_name_t *name) { +dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name) { sdlz_dbiterator_t *sdlziter = (sdlz_dbiterator_t *)iterator; sdlziter->current = ISC_LIST_HEAD(sdlziter->nodelist); @@ -1513,7 +1516,8 @@ list_tordataset(dns_rdatalist_t *rdatalist, static isc_result_t dns_sdlzcreateDBP(isc_mem_t *mctx, void *driverarg, void *dbdata, - dns_name_t *name, dns_rdataclass_t rdclass, dns_db_t **dbp) + const dns_name_t *name, dns_rdataclass_t rdclass, + dns_db_t **dbp) { isc_result_t result; dns_sdlz_db_t *sdlzdb; @@ -1574,8 +1578,8 @@ dns_sdlzcreateDBP(isc_mem_t *mctx, void *driverarg, void *dbdata, static isc_result_t dns_sdlzallowzonexfr(void *driverarg, void *dbdata, isc_mem_t *mctx, - dns_rdataclass_t rdclass, dns_name_t *name, - isc_sockaddr_t *clientaddr, dns_db_t **dbp) + dns_rdataclass_t rdclass, const dns_name_t *name, + const isc_sockaddr_t *clientaddr, dns_db_t **dbp) { isc_buffer_t b; isc_buffer_t b2; @@ -1691,7 +1695,7 @@ dns_sdlzdestroy(void *driverdata, void **dbdata) { static isc_result_t dns_sdlzfindzone(void *driverarg, void *dbdata, isc_mem_t *mctx, - dns_rdataclass_t rdclass, dns_name_t *name, + dns_rdataclass_t rdclass, const dns_name_t *name, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, dns_db_t **dbp) @@ -1763,9 +1767,9 @@ dns_sdlzconfigure(void *driverarg, void *dbdata, } static isc_boolean_t -dns_sdlzssumatch(dns_name_t *signer, dns_name_t *name, isc_netaddr_t *tcpaddr, - dns_rdatatype_t type, const dst_key_t *key, void *driverarg, - void *dbdata) +dns_sdlzssumatch(const dns_name_t *signer, const dns_name_t *name, + const isc_netaddr_t *tcpaddr, dns_rdatatype_t type, + const dst_key_t *key, void *driverarg, void *dbdata) { dns_sdlzimplementation_t *imp; char b_signer[DNS_NAME_FORMATSIZE]; @@ -1849,7 +1853,7 @@ dns_sdlz_putrr(dns_sdlzlookup_t *lookup, const char *type, dns_ttl_t ttl, isc_result_t result; unsigned int size; isc_mem_t *mctx; - dns_name_t *origin; + const dns_name_t *origin; REQUIRE(VALID_SDLZLOOKUP(lookup)); REQUIRE(type != NULL); @@ -1959,7 +1963,8 @@ isc_result_t dns_sdlz_putnamedrr(dns_sdlzallnodes_t *allnodes, const char *name, const char *type, dns_ttl_t ttl, const char *data) { - dns_name_t *newname, *origin; + dns_name_t *newname; + const dns_name_t *origin; dns_fixedname_t fnewname; dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)allnodes->common.db; dns_sdlznode_t *sdlznode; @@ -2159,7 +2164,7 @@ dns_sdlzunregister(dns_sdlzimplementation_t **sdlzimp) { isc_result_t dns_sdlz_setdb(dns_dlzdb_t *dlzdatabase, dns_rdataclass_t rdclass, - dns_name_t *name, dns_db_t **dbp) + const dns_name_t *name, dns_db_t **dbp) { isc_result_t result; diff --git a/lib/dns/soa.c b/lib/dns/soa.c index ad8168f1155..5f3c2199670 100644 --- a/lib/dns/soa.c +++ b/lib/dns/soa.c @@ -55,7 +55,7 @@ soa_get(dns_rdata_t *rdata, int offset) { } isc_result_t -dns_soa_buildrdata(dns_name_t *origin, dns_name_t *contact, +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, diff --git a/lib/dns/ssu.c b/lib/dns/ssu.c index 353d5c847c3..f86d41b57a4 100644 --- a/lib/dns/ssu.c +++ b/lib/dns/ssu.c @@ -150,8 +150,8 @@ dns_ssutable_detach(dns_ssutable_t **tablep) { isc_result_t dns_ssutable_addrule(dns_ssutable_t *table, isc_boolean_t grant, - dns_name_t *identity, unsigned int matchtype, - dns_name_t *name, unsigned int ntypes, + const dns_name_t *identity, unsigned int matchtype, + const dns_name_t *name, unsigned int ntypes, dns_rdatatype_t *types) { dns_ssurule_t *rule; @@ -244,10 +244,10 @@ isusertype(dns_rdatatype_t type) { } static void -reverse_from_address(dns_name_t *tcpself, isc_netaddr_t *tcpaddr) { +reverse_from_address(dns_name_t *tcpself, const isc_netaddr_t *tcpaddr) { char buf[16 * 4 + sizeof("IP6.ARPA.")]; isc_result_t result; - unsigned char *ap; + const unsigned char *ap; isc_buffer_t b; unsigned long l; @@ -296,10 +296,10 @@ reverse_from_address(dns_name_t *tcpself, isc_netaddr_t *tcpaddr) { } static void -stf_from_address(dns_name_t *stfself, isc_netaddr_t *tcpaddr) { +stf_from_address(dns_name_t *stfself, const isc_netaddr_t *tcpaddr) { char buf[sizeof("X.X.X.X.Y.Y.Y.Y.2.0.0.2.IP6.ARPA.")]; isc_result_t result; - unsigned char *ap; + const unsigned char *ap; isc_buffer_t b; unsigned long l; @@ -338,10 +338,9 @@ stf_from_address(dns_name_t *stfself, isc_netaddr_t *tcpaddr) { } isc_boolean_t -dns_ssutable_checkrules(dns_ssutable_t *table, dns_name_t *signer, - dns_name_t *name, isc_netaddr_t *tcpaddr, - dns_rdatatype_t type, - const dst_key_t *key) +dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, + const dns_name_t *name, const isc_netaddr_t *tcpaddr, + dns_rdatatype_t type, const dst_key_t *key) { dns_ssurule_t *rule; unsigned int i; diff --git a/lib/dns/ssu_external.c b/lib/dns/ssu_external.c index c22f95dd8d0..7c19f1619b1 100644 --- a/lib/dns/ssu_external.c +++ b/lib/dns/ssu_external.c @@ -109,9 +109,9 @@ ux_socket_connect(const char *path) { * the authorization server. */ isc_boolean_t -dns_ssu_external_match(dns_name_t *identity, - dns_name_t *signer, dns_name_t *name, - isc_netaddr_t *tcpaddr, dns_rdatatype_t type, +dns_ssu_external_match(const dns_name_t *identity, + const dns_name_t *signer, const dns_name_t *name, + const isc_netaddr_t *tcpaddr, dns_rdatatype_t type, const dst_key_t *key, isc_mem_t *mctx) { char b_identity[DNS_NAME_FORMATSIZE]; diff --git a/lib/dns/tests/master_test.c b/lib/dns/tests/master_test.c index b54f91e0c75..cb967b5943c 100644 --- a/lib/dns/tests/master_test.c +++ b/lib/dns/tests/master_test.c @@ -49,14 +49,11 @@ unsigned char name_buf[BUFLEN]; dns_rdatacallbacks_t callbacks; char *include_file = NULL; -static isc_result_t -add_callback(void *arg, dns_name_t *owner, dns_rdataset_t *dataset); - static void rawdata_callback(dns_zone_t *zone, dns_masterrawheader_t *header); static isc_result_t -add_callback(void *arg, dns_name_t *owner, dns_rdataset_t *dataset) { +add_callback(void *arg, const dns_name_t *owner, dns_rdataset_t *dataset) { char buf[BIGBUFLEN]; isc_buffer_t target; isc_result_t result; diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c index 91292dfec23..12d0e46f041 100644 --- a/lib/dns/tkey.c +++ b/lib/dns/tkey.c @@ -885,7 +885,7 @@ dns_tkey_processquery(dns_message_t *msg, dns_tkeyctx_t *tctx, } static isc_result_t -buildquery(dns_message_t *msg, dns_name_t *name, +buildquery(dns_message_t *msg, const dns_name_t *name, dns_rdata_tkey_t *tkey, isc_boolean_t win2k) { dns_name_t *qname = NULL, *aname = NULL; @@ -968,9 +968,9 @@ buildquery(dns_message_t *msg, dns_name_t *name, } isc_result_t -dns_tkey_builddhquery(dns_message_t *msg, dst_key_t *key, dns_name_t *name, - dns_name_t *algorithm, isc_buffer_t *nonce, - isc_uint32_t lifetime) +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) { dns_rdata_tkey_t tkey; dns_rdata_t *rdata = NULL; @@ -980,6 +980,7 @@ dns_tkey_builddhquery(dns_message_t *msg, dst_key_t *key, dns_name_t *name, dns_namelist_t namelist; isc_result_t result; isc_stdtime_t now; + dns_name_t *item; REQUIRE(msg != NULL); REQUIRE(key != NULL); @@ -1025,12 +1026,12 @@ dns_tkey_builddhquery(dns_message_t *msg, dst_key_t *key, dns_name_t *name, ISC_LIST_INIT(namelist); RETERR(add_rdata_to_list(msg, &keyname, rdata, 0, &namelist)); - name = ISC_LIST_HEAD(namelist); - while (name != NULL) { - dns_name_t *next = ISC_LIST_NEXT(name, link); - ISC_LIST_UNLINK(namelist, name, link); - dns_message_addname(msg, name, DNS_SECTION_ADDITIONAL); - name = next; + item = ISC_LIST_HEAD(namelist); + while (item != NULL) { + dns_name_t *next = ISC_LIST_NEXT(item, link); + ISC_LIST_UNLINK(namelist, item, link); + dns_message_addname(msg, item, DNS_SECTION_ADDITIONAL); + item = next; } return (ISC_R_SUCCESS); @@ -1043,7 +1044,8 @@ dns_tkey_builddhquery(dns_message_t *msg, dst_key_t *key, dns_name_t *name, } isc_result_t -dns_tkey_buildgssquery(dns_message_t *msg, dns_name_t *name, dns_name_t *gname, +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, isc_boolean_t win2k, isc_mem_t *mctx, char **err_message) @@ -1272,7 +1274,7 @@ dns_tkey_processdhresponse(dns_message_t *qmsg, dns_message_t *rmsg, isc_result_t dns_tkey_processgssresponse(dns_message_t *qmsg, dns_message_t *rmsg, - dns_name_t *gname, gss_ctx_id_t *context, + const dns_name_t *gname, gss_ctx_id_t *context, isc_buffer_t *outtoken, dns_tsigkey_t **outkey, dns_tsig_keyring_t *ring, char **err_message) { @@ -1405,7 +1407,7 @@ dns_tkey_processdeleteresponse(dns_message_t *qmsg, dns_message_t *rmsg, isc_result_t dns_tkey_gssnegotiate(dns_message_t *qmsg, dns_message_t *rmsg, - dns_name_t *server, gss_ctx_id_t *context, + const dns_name_t *server, gss_ctx_id_t *context, dns_tsigkey_t **outkey, dns_tsig_keyring_t *ring, isc_boolean_t win2k, char **err_message) { diff --git a/lib/dns/tsec.c b/lib/dns/tsec.c index 832b7f9f7f4..11d1f8517db 100644 --- a/lib/dns/tsec.c +++ b/lib/dns/tsec.c @@ -44,7 +44,7 @@ dns_tsec_create(isc_mem_t *mctx, dns_tsectype_t type, dst_key_t *key, isc_result_t result; dns_tsec_t *tsec; dns_tsigkey_t *tsigkey = NULL; - dns_name_t *algname; + const dns_name_t *algname; REQUIRE(mctx != NULL); REQUIRE(tsecp != NULL && *tsecp == NULL); diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c index 80550136f76..912d10bf983 100644 --- a/lib/dns/tsig.c +++ b/lib/dns/tsig.c @@ -82,7 +82,7 @@ static dns_name_t hmacmd5 = { {NULL, NULL} }; -dns_name_t *dns_tsig_hmacmd5_name = &hmacmd5; +LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacmd5_name = &hmacmd5; #endif static unsigned char gsstsig_ndata[] = "\010gss-tsig"; @@ -95,7 +95,7 @@ static dns_name_t gsstsig = { {(void *)-1, (void *)-1}, {NULL, NULL} }; -LIBDNS_EXTERNAL_DATA dns_name_t *dns_tsig_gssapi_name = &gsstsig; +LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_gssapi_name = &gsstsig; /* * Since Microsoft doesn't follow its own standard, we will use this @@ -111,7 +111,7 @@ static dns_name_t gsstsigms = { {(void *)-1, (void *)-1}, {NULL, NULL} }; -LIBDNS_EXTERNAL_DATA dns_name_t *dns_tsig_gssapims_name = &gsstsigms; +LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_gssapims_name = &gsstsigms; static unsigned char hmacsha1_ndata[] = "\011hmac-sha1"; static unsigned char hmacsha1_offsets[] = { 0, 10 }; @@ -125,7 +125,7 @@ static dns_name_t hmacsha1 = { {NULL, NULL} }; -LIBDNS_EXTERNAL_DATA dns_name_t *dns_tsig_hmacsha1_name = &hmacsha1; +LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha1_name = &hmacsha1; static unsigned char hmacsha224_ndata[] = "\013hmac-sha224"; static unsigned char hmacsha224_offsets[] = { 0, 12 }; @@ -139,7 +139,7 @@ static dns_name_t hmacsha224 = { {NULL, NULL} }; -LIBDNS_EXTERNAL_DATA dns_name_t *dns_tsig_hmacsha224_name = &hmacsha224; +LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha224_name = &hmacsha224; static unsigned char hmacsha256_ndata[] = "\013hmac-sha256"; static unsigned char hmacsha256_offsets[] = { 0, 12 }; @@ -153,7 +153,7 @@ static dns_name_t hmacsha256 = { {NULL, NULL} }; -LIBDNS_EXTERNAL_DATA dns_name_t *dns_tsig_hmacsha256_name = &hmacsha256; +LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha256_name = &hmacsha256; static unsigned char hmacsha384_ndata[] = "\013hmac-sha384"; static unsigned char hmacsha384_offsets[] = { 0, 12 }; @@ -167,7 +167,7 @@ static dns_name_t hmacsha384 = { {NULL, NULL} }; -LIBDNS_EXTERNAL_DATA dns_name_t *dns_tsig_hmacsha384_name = &hmacsha384; +LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha384_name = &hmacsha384; static unsigned char hmacsha512_ndata[] = "\013hmac-sha512"; static unsigned char hmacsha512_offsets[] = { 0, 12 }; @@ -181,7 +181,7 @@ static dns_name_t hmacsha512 = { {NULL, NULL} }; -LIBDNS_EXTERNAL_DATA dns_name_t *dns_tsig_hmacsha512_name = &hmacsha512; +LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha512_name = &hmacsha512; static isc_result_t tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg); @@ -263,7 +263,7 @@ adjust_lru(dns_tsigkey_t *tkey) { * counter: it's protected by a separate lock. */ static isc_result_t -keyring_add(dns_tsig_keyring_t *ring, dns_name_t *name, +keyring_add(dns_tsig_keyring_t *ring, const dns_name_t *name, dns_tsigkey_t *tkey) { isc_result_t result; @@ -296,9 +296,9 @@ keyring_add(dns_tsig_keyring_t *ring, dns_name_t *name, } isc_result_t -dns_tsigkey_createfromkey(dns_name_t *name, dns_name_t *algorithm, +dns_tsigkey_createfromkey(const dns_name_t *name, const dns_name_t *algorithm, dst_key_t *dstkey, isc_boolean_t generated, - dns_name_t *creator, isc_stdtime_t inception, + const dns_name_t *creator, isc_stdtime_t inception, isc_stdtime_t expire, isc_mem_t *mctx, dns_tsig_keyring_t *ring, dns_tsigkey_t **key) { @@ -378,21 +378,24 @@ dns_tsigkey_createfromkey(dns_name_t *name, dns_name_t *algorithm, goto cleanup_name; } } else { + dns_name_t *tmpname; if (dstkey != NULL) { ret = DNS_R_BADALG; goto cleanup_name; } - tkey->algorithm = isc_mem_get(mctx, sizeof(dns_name_t)); - if (tkey->algorithm == NULL) { + tmpname = isc_mem_get(mctx, sizeof(dns_name_t)); + if (tmpname == NULL) { ret = ISC_R_NOMEMORY; goto cleanup_name; } - dns_name_init(tkey->algorithm, NULL); - ret = dns_name_dup(algorithm, mctx, tkey->algorithm); - if (ret != ISC_R_SUCCESS) - goto cleanup_algorithm; - (void)dns_name_downcase(tkey->algorithm, tkey->algorithm, - NULL); + dns_name_init(tmpname, NULL); + ret = dns_name_dup(algorithm, mctx, tmpname); + if (ret != ISC_R_SUCCESS) { + dns_name_free(tmpname, mctx); + goto cleanup_name; + } + (void)dns_name_downcase(tmpname, tmpname, NULL); + tkey->algorithm = tmpname; } if (creator != NULL) { @@ -471,9 +474,11 @@ dns_tsigkey_createfromkey(dns_name_t *name, dns_name_t *algorithm, } cleanup_algorithm: if (algname_is_allocated(tkey->algorithm)) { - if (dns_name_dynamic(tkey->algorithm)) - dns_name_free(tkey->algorithm, mctx); - isc_mem_put(mctx, tkey->algorithm, sizeof(dns_name_t)); + dns_name_t *tmpname; + DE_CONST(tkey->algorithm, tmpname); + if (dns_name_dynamic(tmpname)) + dns_name_free(tmpname, mctx); + isc_mem_put(mctx, tmpname, sizeof(dns_name_t)); } cleanup_name: dns_name_free(&tkey->name, mctx); @@ -548,7 +553,7 @@ destroyring(dns_tsig_keyring_t *ring) { } static unsigned int -dst_alg_fromname(dns_name_t *algorithm) { +dst_alg_fromname(const dns_name_t *algorithm) { #ifndef PK11_MD5_DISABLE if (dns_name_equal(algorithm, DNS_TSIG_HMACMD5_NAME)) { return (DST_ALG_HMACMD5); @@ -724,9 +729,9 @@ dns_tsigkeyring_dumpanddetach(dns_tsig_keyring_t **ringp, FILE *fp) { } isc_result_t -dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm, +dns_tsigkey_create(const dns_name_t *name, const dns_name_t *algorithm, unsigned char *secret, int length, isc_boolean_t generated, - dns_name_t *creator, isc_stdtime_t inception, + const dns_name_t *creator, isc_stdtime_t inception, isc_stdtime_t expire, isc_mem_t *mctx, dns_tsig_keyring_t *ring, dns_tsigkey_t **key) { @@ -851,8 +856,10 @@ tsigkey_free(dns_tsigkey_t *key) { key->magic = 0; dns_name_free(&key->name, key->mctx); if (algname_is_allocated(key->algorithm)) { - dns_name_free(key->algorithm, key->mctx); - isc_mem_put(key->mctx, key->algorithm, sizeof(dns_name_t)); + dns_name_t *name; + DE_CONST(key->algorithm, name); + dns_name_free(name, key->mctx); + isc_mem_put(key->mctx, name, sizeof(dns_name_t)); } if (key->key != NULL) dst_key_free(&key->key); @@ -1733,8 +1740,8 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) { } isc_result_t -dns_tsigkey_find(dns_tsigkey_t **tsigkey, dns_name_t *name, - dns_name_t *algorithm, dns_tsig_keyring_t *ring) +dns_tsigkey_find(dns_tsigkey_t **tsigkey, const dns_name_t *name, + const dns_name_t *algorithm, dns_tsig_keyring_t *ring) { dns_tsigkey_t *key; isc_stdtime_t now; @@ -1845,7 +1852,7 @@ dns_tsigkeyring_create(isc_mem_t *mctx, dns_tsig_keyring_t **ringp) { } isc_result_t -dns_tsigkeyring_add(dns_tsig_keyring_t *ring, dns_name_t *name, +dns_tsigkeyring_add(dns_tsig_keyring_t *ring, const dns_name_t *name, dns_tsigkey_t *tkey) { isc_result_t result; diff --git a/lib/dns/validator.c b/lib/dns/validator.c index 9bfcbaa17ac..80894e5f9ea 100644 --- a/lib/dns/validator.c +++ b/lib/dns/validator.c @@ -164,7 +164,7 @@ static isc_result_t finddlvsep(dns_validator_t *val, isc_boolean_t resume); static isc_result_t -startfinddlvsep(dns_validator_t *val, dns_name_t *unsecure); +startfinddlvsep(dns_validator_t *val, const dns_name_t *unsecure); /*% * Mark the RRsets as a answer. @@ -3048,7 +3048,7 @@ dlvfetched(isc_task_t *task, isc_event_t *event) { * \li Others on validation failures. */ static isc_result_t -startfinddlvsep(dns_validator_t *val, dns_name_t *unsecure) { +startfinddlvsep(dns_validator_t *val, const dns_name_t *unsecure) { char namebuf[DNS_NAME_FORMATSIZE]; isc_result_t result; diff --git a/lib/dns/view.c b/lib/dns/view.c index 288ef6ce60f..c7c5d3cd024 100644 --- a/lib/dns/view.c +++ b/lib/dns/view.c @@ -964,7 +964,9 @@ dns_view_addzone(dns_view_t *view, dns_zone_t *zone) { } isc_result_t -dns_view_findzone(dns_view_t *view, dns_name_t *name, dns_zone_t **zonep) { +dns_view_findzone(dns_view_t *view, const dns_name_t *name, + dns_zone_t **zonep) +{ isc_result_t result; REQUIRE(DNS_VIEW_VALID(view)); @@ -984,7 +986,7 @@ dns_view_findzone(dns_view_t *view, dns_name_t *name, dns_zone_t **zonep) { } isc_result_t -dns_view_find(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type, +dns_view_find(dns_view_t *view, const dns_name_t *name, dns_rdatatype_t type, isc_stdtime_t now, unsigned int options, isc_boolean_t use_hints, dns_db_t **dbp, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { @@ -994,7 +996,7 @@ dns_view_find(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type, } isc_result_t -dns_view_find2(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type, +dns_view_find2(dns_view_t *view, const dns_name_t *name, dns_rdatatype_t type, isc_stdtime_t now, unsigned int options, isc_boolean_t use_hints, isc_boolean_t use_static_stub, dns_db_t **dbp, dns_dbnode_t **nodep, dns_name_t *foundname, @@ -1207,9 +1209,9 @@ dns_view_find2(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type, } isc_result_t -dns_view_simplefind(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type, - isc_stdtime_t now, unsigned int options, - isc_boolean_t use_hints, +dns_view_simplefind(dns_view_t *view, const dns_name_t *name, + dns_rdatatype_t type, isc_stdtime_t now, + unsigned int options, isc_boolean_t use_hints, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { isc_result_t result; @@ -1251,8 +1253,8 @@ dns_view_simplefind(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type, } isc_result_t -dns_view_findzonecut(dns_view_t *view, dns_name_t *name, dns_name_t *fname, - isc_stdtime_t now, unsigned int options, +dns_view_findzonecut(dns_view_t *view, const dns_name_t *name, + dns_name_t *fname, isc_stdtime_t now, unsigned int options, isc_boolean_t use_hints, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { @@ -1262,10 +1264,11 @@ dns_view_findzonecut(dns_view_t *view, dns_name_t *name, dns_name_t *fname, } isc_result_t -dns_view_findzonecut2(dns_view_t *view, dns_name_t *name, dns_name_t *fname, - isc_stdtime_t now, unsigned int options, - isc_boolean_t use_hints, isc_boolean_t use_cache, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) +dns_view_findzonecut2(dns_view_t *view, const dns_name_t *name, + dns_name_t *fname, isc_stdtime_t now, + unsigned int options, isc_boolean_t use_hints, + isc_boolean_t use_cache, dns_rdataset_t *rdataset, + dns_rdataset_t *sigrdataset) { isc_result_t result; dns_db_t *db; @@ -1468,7 +1471,7 @@ dns_viewlist_find(dns_viewlist_t *list, const char *name, } isc_result_t -dns_viewlist_findzone(dns_viewlist_t *list, dns_name_t *name, +dns_viewlist_findzone(dns_viewlist_t *list, const dns_name_t *name, isc_boolean_t allclasses, dns_rdataclass_t rdclass, dns_zone_t **zonep) { @@ -1552,7 +1555,8 @@ dns_view_asyncload(dns_view_t *view, dns_zt_allloaded_t callback, void *arg) { } isc_result_t -dns_view_gettsig(dns_view_t *view, dns_name_t *keyname, dns_tsigkey_t **keyp) +dns_view_gettsig(dns_view_t *view, const dns_name_t *keyname, + dns_tsigkey_t **keyp) { isc_result_t result; REQUIRE(keyp != NULL && *keyp == NULL); @@ -1566,7 +1570,7 @@ dns_view_gettsig(dns_view_t *view, dns_name_t *keyname, dns_tsigkey_t **keyp) } isc_result_t -dns_view_getpeertsig(dns_view_t *view, isc_netaddr_t *peeraddr, +dns_view_getpeertsig(dns_view_t *view, const isc_netaddr_t *peeraddr, dns_tsigkey_t **keyp) { isc_result_t result; @@ -1645,12 +1649,14 @@ dns_view_flushcache2(dns_view_t *view, isc_boolean_t fixuponly) { } isc_result_t -dns_view_flushname(dns_view_t *view, dns_name_t *name) { +dns_view_flushname(dns_view_t *view, const dns_name_t *name) { return (dns_view_flushnode(view, name, ISC_FALSE)); } isc_result_t -dns_view_flushnode(dns_view_t *view, dns_name_t *name, isc_boolean_t tree) { +dns_view_flushnode(dns_view_t *view, const dns_name_t *name, + isc_boolean_t tree) +{ isc_result_t result = ISC_R_SUCCESS; REQUIRE(DNS_VIEW_VALID(view)); @@ -1678,7 +1684,7 @@ dns_view_flushnode(dns_view_t *view, dns_name_t *name, isc_boolean_t tree) { } isc_result_t -dns_view_adddelegationonly(dns_view_t *view, dns_name_t *name) { +dns_view_adddelegationonly(dns_view_t *view, const dns_name_t *name) { isc_result_t result; dns_name_t *new; isc_uint32_t hash; @@ -1713,7 +1719,7 @@ dns_view_adddelegationonly(dns_view_t *view, dns_name_t *name) { } isc_result_t -dns_view_excludedelegationonly(dns_view_t *view, dns_name_t *name) { +dns_view_excludedelegationonly(dns_view_t *view, const dns_name_t *name) { isc_result_t result; dns_name_t *new; isc_uint32_t hash; @@ -1748,7 +1754,7 @@ dns_view_excludedelegationonly(dns_view_t *view, dns_name_t *name) { } isc_boolean_t -dns_view_isdelegationonly(dns_view_t *view, dns_name_t *name) { +dns_view_isdelegationonly(dns_view_t *view, const dns_name_t *name) { dns_name_t *new; isc_uint32_t hash; @@ -1896,7 +1902,7 @@ dns_view_getsecroots(dns_view_t *view, dns_keytable_t **ktp) { isc_boolean_t dns_view_ntacovers(dns_view_t *view, isc_stdtime_t now, - dns_name_t *name, dns_name_t *anchor) + const dns_name_t *name, const dns_name_t *anchor) { REQUIRE(DNS_VIEW_VALID(view)); @@ -1907,7 +1913,7 @@ dns_view_ntacovers(dns_view_t *view, isc_stdtime_t now, } isc_result_t -dns_view_issecuredomain(dns_view_t *view, dns_name_t *name, +dns_view_issecuredomain(dns_view_t *view, const dns_name_t *name, isc_stdtime_t now, isc_boolean_t checknta, isc_boolean_t *secure_domain) { @@ -1938,7 +1944,7 @@ dns_view_issecuredomain(dns_view_t *view, dns_name_t *name, } void -dns_view_untrust(dns_view_t *view, dns_name_t *keyname, +dns_view_untrust(dns_view_t *view, const dns_name_t *keyname, dns_rdata_dnskey_t *dnskey, isc_mem_t *mctx) { isc_result_t result; @@ -2079,10 +2085,9 @@ dns_view_setnewzones(dns_view_t *view, isc_boolean_t allow, void *cfgctx, } isc_result_t -dns_view_searchdlz(dns_view_t *view, dns_name_t *name, unsigned int minlabels, - dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo, - dns_db_t **dbp) +dns_view_searchdlz(dns_view_t *view, const dns_name_t *name, + unsigned int minlabels, dns_clientinfomethods_t *methods, + dns_clientinfo_t *clientinfo, dns_db_t **dbp) { dns_fixedname_t fname; dns_name_t *zonename; @@ -2250,7 +2255,7 @@ dns_view_loadnta(dns_view_t *view) { char *name, *type, *timestamp; size_t len; dns_fixedname_t fn; - dns_name_t *ntaname; + const dns_name_t *ntaname; isc_buffer_t b; isc_stdtime_t t; isc_boolean_t forced; @@ -2266,13 +2271,15 @@ dns_view_loadnta(dns_view_t *view) { if (strcmp(name, ".") == 0) ntaname = dns_rootname; else { + dns_name_t *fname; dns_fixedname_init(&fn); - ntaname = dns_fixedname_name(&fn); + fname = dns_fixedname_name(&fn); isc_buffer_init(&b, name, (unsigned int)len); isc_buffer_add(&b, (unsigned int)len); - CHECK(dns_name_fromtext(ntaname, &b, dns_rootname, + CHECK(dns_name_fromtext(fname, &b, dns_rootname, 0, NULL)); + ntaname = fname; } CHECK(isc_lex_gettoken(lex, options, &token)); diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c index 2078298aa34..f691336cdc5 100644 --- a/lib/dns/xfrin.c +++ b/lib/dns/xfrin.c @@ -187,8 +187,8 @@ xfrin_create(isc_mem_t *mctx, dns_name_t *zonename, dns_rdataclass_t rdclass, dns_rdatatype_t reqtype, - isc_sockaddr_t *masteraddr, - isc_sockaddr_t *sourceaddr, + const isc_sockaddr_t *masteraddr, + const isc_sockaddr_t *sourceaddr, isc_dscp_t dscp, dns_tsigkey_t *tsigkey, dns_xfrin_ctx_t **xfrp); @@ -228,12 +228,12 @@ static isc_result_t render(dns_message_t *msg, isc_mem_t *mctx, isc_buffer_t *buf); static void -xfrin_logv(int level, const char *zonetext, isc_sockaddr_t *masteraddr, +xfrin_logv(int level, const char *zonetext, const isc_sockaddr_t *masteraddr, const char *fmt, va_list ap) ISC_FORMAT_PRINTF(4, 0); static void -xfrin_log1(int level, const char *zonetext, isc_sockaddr_t *masteraddr, +xfrin_log1(int level, const char *zonetext, const isc_sockaddr_t *masteraddr, const char *fmt, ...) ISC_FORMAT_PRINTF(4, 5); @@ -626,7 +626,7 @@ xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, isc_uint32_t ttl, isc_result_t dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype, - isc_sockaddr_t *masteraddr, dns_tsigkey_t *tsigkey, + const isc_sockaddr_t *masteraddr, dns_tsigkey_t *tsigkey, isc_mem_t *mctx, isc_timermgr_t *timermgr, isc_socketmgr_t *socketmgr, isc_task_t *task, dns_xfrindone_t done, dns_xfrin_ctx_t **xfrp) @@ -654,7 +654,8 @@ dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype, isc_result_t dns_xfrin_create2(dns_zone_t *zone, dns_rdatatype_t xfrtype, - isc_sockaddr_t *masteraddr, isc_sockaddr_t *sourceaddr, + const isc_sockaddr_t *masteraddr, + const isc_sockaddr_t *sourceaddr, dns_tsigkey_t *tsigkey, isc_mem_t *mctx, isc_timermgr_t *timermgr, isc_socketmgr_t *socketmgr, isc_task_t *task, dns_xfrindone_t done, @@ -667,7 +668,8 @@ dns_xfrin_create2(dns_zone_t *zone, dns_rdatatype_t xfrtype, isc_result_t dns_xfrin_create3(dns_zone_t *zone, dns_rdatatype_t xfrtype, - isc_sockaddr_t *masteraddr, isc_sockaddr_t *sourceaddr, + const isc_sockaddr_t *masteraddr, + const isc_sockaddr_t *sourceaddr, isc_dscp_t dscp, dns_tsigkey_t *tsigkey, isc_mem_t *mctx, isc_timermgr_t *timermgr, isc_socketmgr_t *socketmgr, isc_task_t *task, dns_xfrindone_t done, @@ -810,8 +812,8 @@ xfrin_create(isc_mem_t *mctx, dns_name_t *zonename, dns_rdataclass_t rdclass, dns_rdatatype_t reqtype, - isc_sockaddr_t *masteraddr, - isc_sockaddr_t *sourceaddr, + const isc_sockaddr_t *masteraddr, + const isc_sockaddr_t *sourceaddr, isc_dscp_t dscp, dns_tsigkey_t *tsigkey, dns_xfrin_ctx_t **xfrp) @@ -1229,7 +1231,7 @@ xfrin_recv_done(isc_task_t *task, isc_event_t *ev) { dns_message_t *msg = NULL; dns_name_t *name; dns_tcpmsg_t *tcpmsg; - dns_name_t *tsigowner = NULL; + const dns_name_t *tsigowner = NULL; REQUIRE(VALID_XFRIN(xfr)); @@ -1557,7 +1559,7 @@ maybe_free(dns_xfrin_ctx_t *xfr) { * transfer of from
: */ static void -xfrin_logv(int level, const char *zonetext, isc_sockaddr_t *masteraddr, +xfrin_logv(int level, const char *zonetext, const isc_sockaddr_t *masteraddr, const char *fmt, va_list ap) { char mastertext[ISC_SOCKADDR_FORMATSIZE]; @@ -1577,7 +1579,7 @@ xfrin_logv(int level, const char *zonetext, isc_sockaddr_t *masteraddr, */ static void -xfrin_log1(int level, const char *zonetext, isc_sockaddr_t *masteraddr, +xfrin_log1(int level, const char *zonetext, const isc_sockaddr_t *masteraddr, const char *fmt, ...) { va_list ap; diff --git a/lib/dns/zone.c b/lib/dns/zone.c index b6b727cc5b2..f715b2a7bf7 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -16765,7 +16765,9 @@ dns_zonemgr_getcount(dns_zonemgr_t *zmgr, int state) { } isc_result_t -dns_zone_checknames(dns_zone_t *zone, dns_name_t *name, dns_rdata_t *rdata) { +dns_zone_checknames(dns_zone_t *zone, const dns_name_t *name, + dns_rdata_t *rdata) +{ isc_boolean_t ok = ISC_TRUE; isc_boolean_t fail = ISC_FALSE; char namebuf[DNS_NAME_FORMATSIZE]; diff --git a/lib/isc/include/isc/netaddr.h b/lib/isc/include/isc/netaddr.h index 4e341f763d2..55be2f8b4af 100644 --- a/lib/isc/include/isc/netaddr.h +++ b/lib/isc/include/isc/netaddr.h @@ -123,31 +123,31 @@ isc_netaddr_any6(isc_netaddr_t *netaddr); */ isc_boolean_t -isc_netaddr_ismulticast(isc_netaddr_t *na); +isc_netaddr_ismulticast(const isc_netaddr_t *na); /*%< * Returns ISC_TRUE if the address is a multicast address. */ isc_boolean_t -isc_netaddr_isexperimental(isc_netaddr_t *na); +isc_netaddr_isexperimental(const isc_netaddr_t *na); /*%< * Returns ISC_TRUE if the address is a experimental (CLASS E) address. */ isc_boolean_t -isc_netaddr_islinklocal(isc_netaddr_t *na); +isc_netaddr_islinklocal(const isc_netaddr_t *na); /*%< * Returns #ISC_TRUE if the address is a link local address. */ isc_boolean_t -isc_netaddr_issitelocal(isc_netaddr_t *na); +isc_netaddr_issitelocal(const isc_netaddr_t *na); /*%< * Returns #ISC_TRUE if the address is a site local address. */ isc_boolean_t -isc_netaddr_isnetzero(isc_netaddr_t *na); +isc_netaddr_isnetzero(const isc_netaddr_t *na); /*%< * Returns #ISC_TRUE if the address is in net zero. */ diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h index d8956740ef7..a980da5590a 100644 --- a/lib/isc/include/isc/socket.h +++ b/lib/isc/include/isc/socket.h @@ -336,18 +336,22 @@ typedef struct isc_socketmethods { void (*attach)(isc_socket_t *socket, isc_socket_t **socketp); void (*detach)(isc_socket_t **socketp); - isc_result_t (*bind)(isc_socket_t *sock, isc_sockaddr_t *sockaddr, + isc_result_t (*bind)(isc_socket_t *sock, + const isc_sockaddr_t *sockaddr, unsigned int options); isc_result_t (*sendto)(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, isc_taskaction_t action, - void *arg, isc_sockaddr_t *address, + void *arg, + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo); isc_result_t (*sendto2)(isc_socket_t *sock, isc_region_t *region, - isc_task_t *task, isc_sockaddr_t *address, + isc_task_t *task, + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, isc_socketevent_t *event, unsigned int flags); - isc_result_t (*connect)(isc_socket_t *sock, isc_sockaddr_t *addr, + isc_result_t (*connect)(isc_socket_t *sock, + const isc_sockaddr_t *addr, isc_task_t *task, isc_taskaction_t action, void *arg); isc_result_t (*recv)(isc_socket_t *sock, isc_region_t *region, @@ -683,7 +687,7 @@ isc_socket_close(isc_socket_t *sock); */ isc_result_t -isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *addressp, +isc_socket_bind(isc_socket_t *sock, const isc_sockaddr_t *addressp, unsigned int options); /*%< * Bind 'socket' to '*addressp'. @@ -759,7 +763,7 @@ isc_socket_accept(isc_socket_t *sock, */ isc_result_t -isc_socket_connect(isc_socket_t *sock, isc_sockaddr_t *addressp, +isc_socket_connect(isc_socket_t *sock, const isc_sockaddr_t *addressp, isc_task_t *task, isc_taskaction_t action, void *arg); /*%< @@ -919,23 +923,23 @@ isc_socket_send(isc_socket_t *sock, isc_region_t *region, isc_result_t isc_socket_sendto(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, isc_taskaction_t action, void *arg, - isc_sockaddr_t *address, struct in6_pktinfo *pktinfo); + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo); isc_result_t isc_socket_sendv(isc_socket_t *sock, isc_bufferlist_t *buflist, isc_task_t *task, isc_taskaction_t action, void *arg); isc_result_t isc_socket_sendtov(isc_socket_t *sock, isc_bufferlist_t *buflist, isc_task_t *task, isc_taskaction_t action, void *arg, - isc_sockaddr_t *address, struct in6_pktinfo *pktinfo); + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo); isc_result_t isc_socket_sendtov2(isc_socket_t *sock, isc_bufferlist_t *buflist, isc_task_t *task, isc_taskaction_t action, void *arg, - isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, unsigned int flags); isc_result_t isc_socket_sendto2(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, - isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, isc_socketevent_t *event, unsigned int flags); /*! @@ -1155,7 +1159,7 @@ isc_socket_socketevent(isc_mem_t *mctx, void *sender, */ void -isc_socket_cleanunix(isc_sockaddr_t *addr, isc_boolean_t active); +isc_socket_cleanunix(const isc_sockaddr_t *addr, isc_boolean_t active); /*%< * Cleanup UNIX domain sockets in the file-system. If 'active' is true @@ -1173,7 +1177,7 @@ isc_socket_cleanunix(isc_sockaddr_t *addr, isc_boolean_t active); */ isc_result_t -isc_socket_permunix(isc_sockaddr_t *sockaddr, isc_uint32_t perm, +isc_socket_permunix(const isc_sockaddr_t *sockaddr, isc_uint32_t perm, isc_uint32_t owner, isc_uint32_t group); /*%< * Set ownership and file permissions on the UNIX domain socket. diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c index c5d068d6d91..3aed87993c5 100644 --- a/lib/isc/netaddr.c +++ b/lib/isc/netaddr.c @@ -364,7 +364,7 @@ isc_netaddr_any6(isc_netaddr_t *netaddr) { } isc_boolean_t -isc_netaddr_ismulticast(isc_netaddr_t *na) { +isc_netaddr_ismulticast(const isc_netaddr_t *na) { switch (na->family) { case AF_INET: return (ISC_TF(ISC_IPADDR_ISMULTICAST(na->type.in.s_addr))); @@ -376,7 +376,7 @@ isc_netaddr_ismulticast(isc_netaddr_t *na) { } isc_boolean_t -isc_netaddr_isexperimental(isc_netaddr_t *na) { +isc_netaddr_isexperimental(const isc_netaddr_t *na) { switch (na->family) { case AF_INET: return (ISC_TF(ISC_IPADDR_ISEXPERIMENTAL(na->type.in.s_addr))); @@ -386,7 +386,7 @@ isc_netaddr_isexperimental(isc_netaddr_t *na) { } isc_boolean_t -isc_netaddr_islinklocal(isc_netaddr_t *na) { +isc_netaddr_islinklocal(const isc_netaddr_t *na) { switch (na->family) { case AF_INET: return (ISC_FALSE); @@ -398,7 +398,7 @@ isc_netaddr_islinklocal(isc_netaddr_t *na) { } isc_boolean_t -isc_netaddr_issitelocal(isc_netaddr_t *na) { +isc_netaddr_issitelocal(const isc_netaddr_t *na) { switch (na->family) { case AF_INET: return (ISC_FALSE); @@ -414,7 +414,7 @@ isc_netaddr_issitelocal(isc_netaddr_t *na) { == ISC__IPADDR(0x00000000)) isc_boolean_t -isc_netaddr_isnetzero(isc_netaddr_t *na) { +isc_netaddr_isnetzero(const isc_netaddr_t *na) { switch (na->family) { case AF_INET: return (ISC_TF(ISC_IPADDR_ISNETZERO(na->type.in.s_addr))); diff --git a/lib/isc/socket_api.c b/lib/isc/socket_api.c index 62a72dc415d..78158c7426a 100644 --- a/lib/isc/socket_api.c +++ b/lib/isc/socket_api.c @@ -128,7 +128,7 @@ isc_socket_detach(isc_socket_t **socketp) { } isc_result_t -isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr, +isc_socket_bind(isc_socket_t *sock, const isc_sockaddr_t *sockaddr, unsigned int options) { REQUIRE(ISCAPI_SOCKET_VALID(sock)); @@ -142,7 +142,7 @@ isc_socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr, isc_result_t isc_socket_sendto(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, isc_taskaction_t action, void *arg, - isc_sockaddr_t *address, struct in6_pktinfo *pktinfo) + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo) { REQUIRE(ISCAPI_SOCKET_VALID(sock)); @@ -155,8 +155,8 @@ isc_socket_sendto(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, } isc_result_t -isc_socket_connect(isc_socket_t *sock, isc_sockaddr_t *addr, isc_task_t *task, - isc_taskaction_t action, void *arg) +isc_socket_connect(isc_socket_t *sock, const isc_sockaddr_t *addr, + isc_task_t *task, isc_taskaction_t action, void *arg) { REQUIRE(ISCAPI_SOCKET_VALID(sock)); @@ -334,7 +334,7 @@ isc_socket_sendv(isc_socket_t *sock, isc_bufferlist_t *buflist, isc_result_t isc_socket_sendtov(isc_socket_t *sock, isc_bufferlist_t *buflist, isc_task_t *task, isc_taskaction_t action, void *arg, - isc_sockaddr_t *address, struct in6_pktinfo *pktinfo) + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo) { return (isc__socket_sendtov(sock, buflist, task, action, arg, address, pktinfo)); @@ -343,7 +343,7 @@ isc_socket_sendtov(isc_socket_t *sock, isc_bufferlist_t *buflist, isc_result_t isc_socket_sendtov2(isc_socket_t *sock, isc_bufferlist_t *buflist, isc_task_t *task, isc_taskaction_t action, void *arg, - isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, unsigned int flags) { return (isc__socket_sendtov2(sock, buflist, task, action, arg, @@ -353,7 +353,7 @@ isc_socket_sendtov2(isc_socket_t *sock, isc_bufferlist_t *buflist, isc_result_t isc_socket_sendto2(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, - isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, isc_socketevent_t *event, unsigned int flags) { return (isc__socket_sendto2(sock, region, task, address, pktinfo, @@ -361,12 +361,12 @@ isc_socket_sendto2(isc_socket_t *sock, isc_region_t *region, } void -isc_socket_cleanunix(isc_sockaddr_t *sockaddr, isc_boolean_t active) { +isc_socket_cleanunix(const isc_sockaddr_t *sockaddr, isc_boolean_t active) { isc__socket_cleanunix(sockaddr, active); } isc_result_t -isc_socket_permunix(isc_sockaddr_t *sockaddr, isc_uint32_t perm, +isc_socket_permunix(const isc_sockaddr_t *sockaddr, isc_uint32_t perm, isc_uint32_t owner, isc_uint32_t group) { return (isc__socket_permunix(sockaddr, perm, owner, group)); diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c index 829ff06d996..c1831c05288 100644 --- a/lib/isc/unix/socket.c +++ b/lib/isc/unix/socket.c @@ -525,23 +525,23 @@ isc__socket_send(isc_socket_t *sock, isc_region_t *region, isc_result_t isc__socket_sendto(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, isc_taskaction_t action, void *arg, - isc_sockaddr_t *address, struct in6_pktinfo *pktinfo); + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo); isc_result_t isc__socket_sendv(isc_socket_t *sock, isc_bufferlist_t *buflist, isc_task_t *task, isc_taskaction_t action, void *arg); isc_result_t isc__socket_sendtov(isc_socket_t *sock, isc_bufferlist_t *buflist, isc_task_t *task, isc_taskaction_t action, void *arg, - isc_sockaddr_t *address, struct in6_pktinfo *pktinfo); + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo); isc_result_t isc__socket_sendtov2(isc_socket_t *sock, isc_bufferlist_t *buflist, isc_task_t *task, isc_taskaction_t action, void *arg, - isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, unsigned int flags); isc_result_t isc__socket_sendto2(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, - isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, isc_socketevent_t *event, unsigned int flags); isc_socketevent_t * isc_socket_socketevent(isc_mem_t *mctx, void *sender, @@ -549,12 +549,12 @@ isc_socket_socketevent(isc_mem_t *mctx, void *sender, void *arg); void -isc__socket_cleanunix(isc_sockaddr_t *sockaddr, isc_boolean_t active); +isc__socket_cleanunix(const isc_sockaddr_t *sockaddr, isc_boolean_t active); isc_result_t -isc__socket_permunix(isc_sockaddr_t *sockaddr, isc_uint32_t perm, +isc__socket_permunix(const isc_sockaddr_t *sockaddr, isc_uint32_t perm, isc_uint32_t owner, isc_uint32_t group); isc_result_t -isc__socket_bind(isc_socket_t *sock, isc_sockaddr_t *sockaddr, +isc__socket_bind(isc_socket_t *sock, const isc_sockaddr_t *sockaddr, unsigned int options); isc_result_t isc__socket_filter(isc_socket_t *sock, const char *filter); @@ -564,7 +564,7 @@ isc_result_t isc__socket_accept(isc_socket_t *sock, isc_task_t *task, isc_taskaction_t action, void *arg); isc_result_t -isc__socket_connect(isc_socket_t *sock, isc_sockaddr_t *addr, +isc__socket_connect(isc_socket_t *sock, const isc_sockaddr_t *addr, isc_task_t *task, isc_taskaction_t action, void *arg); isc_result_t @@ -805,12 +805,12 @@ manager_log(isc__socketmgr_t *sockmgr, #endif static void -socket_log(isc__socket_t *sock, isc_sockaddr_t *address, +socket_log(isc__socket_t *sock, const isc_sockaddr_t *address, isc_logcategory_t *category, isc_logmodule_t *module, int level, isc_msgcat_t *msgcat, int msgset, int message, const char *fmt, ...) ISC_FORMAT_PRINTF(9, 10); static void -socket_log(isc__socket_t *sock, isc_sockaddr_t *address, +socket_log(isc__socket_t *sock, const isc_sockaddr_t *address, isc_logcategory_t *category, isc_logmodule_t *module, int level, isc_msgcat_t *msgcat, int msgset, int message, const char *fmt, ...) @@ -1772,7 +1772,7 @@ build_msghdr_recv(isc__socket_t *sock, isc_socketevent_t *dev, } static void -set_dev_address(isc_sockaddr_t *address, isc__socket_t *sock, +set_dev_address(const isc_sockaddr_t *address, isc__socket_t *sock, isc_socketevent_t *dev) { if (sock->type == isc_sockettype_udp) { @@ -5142,7 +5142,7 @@ isc__socket_recv2(isc_socket_t *sock0, isc_region_t *region, static isc_result_t socket_send(isc__socket_t *sock, isc_socketevent_t *dev, isc_task_t *task, - isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, unsigned int flags) { int io_state; @@ -5246,7 +5246,7 @@ isc__socket_send(isc_socket_t *sock, isc_region_t *region, isc_result_t isc__socket_sendto(isc_socket_t *sock0, isc_region_t *region, isc_task_t *task, isc_taskaction_t action, void *arg, - isc_sockaddr_t *address, struct in6_pktinfo *pktinfo) + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo) { isc__socket_t *sock = (isc__socket_t *)sock0; isc_socketevent_t *dev; @@ -5283,7 +5283,7 @@ isc__socket_sendv(isc_socket_t *sock, isc_bufferlist_t *buflist, isc_result_t isc__socket_sendtov(isc_socket_t *sock, isc_bufferlist_t *buflist, isc_task_t *task, isc_taskaction_t action, void *arg, - isc_sockaddr_t *address, struct in6_pktinfo *pktinfo) + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo) { return (isc__socket_sendtov2(sock, buflist, task, action, arg, address, pktinfo, 0)); @@ -5292,7 +5292,7 @@ isc__socket_sendtov(isc_socket_t *sock, isc_bufferlist_t *buflist, isc_result_t isc__socket_sendtov2(isc_socket_t *sock0, isc_bufferlist_t *buflist, isc_task_t *task, isc_taskaction_t action, void *arg, - isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, unsigned int flags) { isc__socket_t *sock = (isc__socket_t *)sock0; @@ -5334,7 +5334,7 @@ isc__socket_sendtov2(isc_socket_t *sock0, isc_bufferlist_t *buflist, isc_result_t isc__socket_sendto2(isc_socket_t *sock0, isc_region_t *region, isc_task_t *task, - isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, isc_socketevent_t *event, unsigned int flags) { isc__socket_t *sock = (isc__socket_t *)sock0; @@ -5355,7 +5355,7 @@ isc__socket_sendto2(isc_socket_t *sock0, isc_region_t *region, } void -isc__socket_cleanunix(isc_sockaddr_t *sockaddr, isc_boolean_t active) { +isc__socket_cleanunix(const isc_sockaddr_t *sockaddr, isc_boolean_t active) { #ifdef ISC_PLATFORM_HAVESYSUNH int s; struct stat sb; @@ -5451,7 +5451,7 @@ isc__socket_cleanunix(isc_sockaddr_t *sockaddr, isc_boolean_t active) { goto cleanup; } - if (connect(s, (struct sockaddr *)&sockaddr->type.sunix, + if (connect(s, (const struct sockaddr *)&sockaddr->type.sunix, sizeof(sockaddr->type.sunix)) < 0) { switch (errno) { case ECONNREFUSED: @@ -5485,7 +5485,7 @@ isc__socket_cleanunix(isc_sockaddr_t *sockaddr, isc_boolean_t active) { } isc_result_t -isc__socket_permunix(isc_sockaddr_t *sockaddr, isc_uint32_t perm, +isc__socket_permunix(const isc_sockaddr_t *sockaddr, isc_uint32_t perm, isc_uint32_t owner, isc_uint32_t group) { #ifdef ISC_PLATFORM_HAVESYSUNH @@ -5539,7 +5539,7 @@ isc__socket_permunix(isc_sockaddr_t *sockaddr, isc_uint32_t perm, } isc_result_t -isc__socket_bind(isc_socket_t *sock0, isc_sockaddr_t *sockaddr, +isc__socket_bind(isc_socket_t *sock0, const isc_sockaddr_t *sockaddr, unsigned int options) { isc__socket_t *sock = (isc__socket_t *)sock0; char strbuf[ISC_STRERRORSIZE]; @@ -5783,7 +5783,7 @@ isc__socket_accept(isc_socket_t *sock0, } isc_result_t -isc__socket_connect(isc_socket_t *sock0, isc_sockaddr_t *addr, +isc__socket_connect(isc_socket_t *sock0, const isc_sockaddr_t *addr, isc_task_t *task, isc_taskaction_t action, void *arg) { isc__socket_t *sock = (isc__socket_t *)sock0;