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

Update clang to version 14

Browse Source
This commit is contained in:
Michal Nowak
2022-05-31 16:55:01 +02:00
parent 51ebc6e1e8
commit 1c45a9885a
74 changed files with 381 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@@ -16,16 +16,16 @@ variables:
TEST_PARALLEL_JOBS: 6
CONFIGURE: ./configure
CLANG: clang-13
SCAN_BUILD: scan-build-13
ASAN_SYMBOLIZER_PATH: /usr/lib/llvm-13/bin/llvm-symbolizer
CLANG_FORMAT: clang-format-13
CLANG: clang-14
SCAN_BUILD: scan-build-14
ASAN_SYMBOLIZER_PATH: /usr/lib/llvm-14/bin/llvm-symbolizer
CLANG_FORMAT: clang-format-14
CFLAGS_COMMON: -fno-omit-frame-pointer -fno-optimize-sibling-calls -O1 -g -Wall -Wextra
# Pass run-time flags to AddressSanitizer to get core dumps on error.
ASAN_OPTIONS: abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1
TSAN_OPTIONS_COMMON: "disable_coredump=0 second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=/usr/lib/llvm-12/bin/llvm-symbolizer"
TSAN_OPTIONS_COMMON: "disable_coredump=0 second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=/usr/lib/llvm-14/bin/llvm-symbolizer"
TARBALL_EXTENSION: xz

14
bin/named/include/named/server.h
View File

@@ -49,7 +49,7 @@
*/
struct named_server {
unsigned int magic;
isc_mem_t *mctx;
isc_mem_t *mctx;
ns_server_t *sctx;
@@ -70,12 +70,12 @@ struct named_server {
* */
/* Server data structures. */
dns_loadmgr_t *loadmgr;
dns_zonemgr_t *zonemgr;
dns_loadmgr_t *loadmgr;
dns_zonemgr_t *zonemgr;
dns_viewlist_t viewlist;
dns_kasplist_t kasplist;
ns_interfacemgr_t *interfacemgr;
dns_db_t *in_roothints;
dns_db_t *in_roothints;
isc_timer_t *interface_timer;
isc_timer_t *heartbeat_timer;
@@ -95,15 +95,15 @@ struct named_server {
isc_stats_t *resolverstats; /*% Resolver stats */
isc_stats_t *sockstats; /*%< Socket stats */
named_controls_t *controls; /*%< Control channels */
named_controls_t *controls; /*%< Control channels */
unsigned int dispatchgen;
named_dispatchlist_t dispatches;
named_statschannellist_t statschannels;
dns_tsigkey_t *sessionkey;
char *session_keyfile;
dns_name_t *session_keyname;
char *session_keyfile;
dns_name_t *session_keyname;
unsigned int session_keyalg;
uint16_t session_keybits;
bool interface_auto;

2
contrib/dlz/modules/include/dlz_dbi.h
View File

@@ -47,7 +47,7 @@ typedef struct driverinstance driverinstance_t;
* special tokens are %zone%, %record%, %client%
*/
struct query_segment {
void *cmd;
void *cmd;
unsigned int strlen;
bool direct;
DLZ_LINK(query_segment_t) link;

12
contrib/dlz/modules/include/dlz_minimal.h
View File

@@ -80,7 +80,7 @@ typedef uint32_t dns_ttl_t;
do { \
union { \
const void *k; \
void *v; \
void *v; \
} _u; \
_u.k = konst; \
var = _u.v; \
@@ -123,7 +123,7 @@ typedef struct isc_sockaddr {
struct sockaddr_un sunix;
} type;
unsigned int length;
void *link;
void *link;
} isc_sockaddr_t;
typedef struct isc_netaddr {
@@ -145,16 +145,16 @@ typedef struct dns_ecs {
#define DNS_CLIENTINFO_VERSION 3
typedef struct dns_clientinfo {
uint16_t version;
void *data;
void *dbversion;
void *data;
void *dbversion;
dns_ecs_t ecs;
} dns_clientinfo_t;
typedef isc_result_t (*dns_clientinfo_sourceip_t)(dns_clientinfo_t *client,
isc_sockaddr_t **addrp);
isc_sockaddr_t **addrp);
typedef isc_result_t (*dns_clientinfo_version_t)(dns_clientinfo_t *client,
void **addrp);
void **addrp);
#define DNS_CLIENTINFOMETHODS_VERSION 2
#define DNS_CLIENTINFOMETHODS_AGE 1

14
lib/dns/include/dns/acl.h
View File

@@ -85,14 +85,14 @@ struct dns_aclelement {
struct dns_acl {
unsigned int magic;
isc_mem_t *mctx;
isc_mem_t *mctx;
isc_refcount_t refcount;
dns_iptable_t *iptable;
dns_iptable_t *iptable;
dns_aclelement_t *elements;
bool has_negatives;
unsigned int alloc; /*%< Elements allocated */
unsigned int length; /*%< Elements initialized */
char *name; /*%< Temporary use only */
char *name; /*%< Temporary use only */
ISC_LINK(dns_acl_t) nextincache; /*%< Ditto */
ISC_LIST(dns_acl_port_transports_t) ports_and_transports;
size_t port_proto_entries;
@@ -100,12 +100,12 @@ struct dns_acl {
struct dns_aclenv {
unsigned int magic;
isc_mem_t *mctx;
isc_mem_t *mctx;
isc_refcount_t references;
isc_rwlock_t rwlock; /*%< Locks localhost and localnets */
dns_acl_t *localhost;
dns_acl_t *localnets;
dns_acl_t *localhost;
dns_acl_t *localnets;
bool match_mapped;
#if defined(HAVE_GEOIP2)
@@ -293,7 +293,7 @@ dns_aclelement_match(const isc_netaddr_t *reqaddr, const dns_name_t *reqsigner,
*/
isc_result_t
dns_acl_match_port_transport(const isc_netaddr_t *reqaddr,
dns_acl_match_port_transport(const isc_netaddr_t *reqaddr,
const in_port_t local_port,
const isc_nmsocket_type_t transport,
const bool encrypted, const dns_name_t *reqsigner,

2
lib/dns/include/dns/adb.h
View File

@@ -120,7 +120,7 @@ struct dns_adbfind {
in_port_t port;
unsigned int flags;
dns_adbname_t *adbname;
dns_adb_t *adb;
dns_adb_t *adb;
isc_event_t event;
ISC_LINK(dns_adbfind_t) plink;
};

2
lib/dns/include/dns/callbacks.h
View File

@@ -46,7 +46,7 @@ struct dns_rdatacallbacks {
* to pass back information obtained from the file header
*/
dns_rawdatafunc_t rawdata;
dns_zone_t *zone;
dns_zone_t *zone;
/*%
* dns_load_master / dns_rdata_fromtext call this to issue a error.

8
lib/dns/include/dns/catz.h
View File

@@ -323,14 +323,14 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry,
/* xxxwpk TODO config! */
typedef isc_result_t (*dns_catz_zoneop_fn_t)(dns_catz_entry_t *entry,
dns_catz_zone_t *origin,
dns_view_t *view,
isc_taskmgr_t *taskmgr,
void *udata);
dns_view_t *view,
isc_taskmgr_t *taskmgr,
void *udata);
struct dns_catz_zonemodmethods {
dns_catz_zoneop_fn_t addzone;
dns_catz_zoneop_fn_t modzone;
dns_catz_zoneop_fn_t delzone;
void *udata;
void *udata;
};
isc_result_t

6
lib/dns/include/dns/clientinfo.h
View File

@@ -57,13 +57,13 @@ ISC_LANG_BEGINDECLS
*/
typedef struct dns_clientinfo {
uint16_t version;
void *data;
void *dbversion;
void *data;
void *dbversion;
dns_ecs_t ecs;
} dns_clientinfo_t;
typedef isc_result_t (*dns_clientinfo_sourceip_t)(dns_clientinfo_t *client,
isc_sockaddr_t **addrp);
isc_sockaddr_t **addrp);
#define DNS_CLIENTINFOMETHODS_VERSION 2
#define DNS_CLIENTINFOMETHODS_AGE 1

34
lib/dns/include/dns/db.h
View File

@@ -77,11 +77,11 @@ extern unsigned int dns_pps;
typedef struct dns_dbmethods {
void (*attach)(dns_db_t *source, dns_db_t **targetp);
void (*detach)(dns_db_t **dbp);
isc_result_t (*beginload)(dns_db_t *db,
isc_result_t (*beginload)(dns_db_t *db,
dns_rdatacallbacks_t *callbacks);
isc_result_t (*endload)(dns_db_t *db, dns_rdatacallbacks_t *callbacks);
isc_result_t (*dump)(dns_db_t *db, dns_dbversion_t *version,
const char *filename,
const char *filename,
dns_masterformat_t masterformat);
void (*currentversion)(dns_db_t *db, dns_dbversion_t **versionp);
isc_result_t (*newversion)(dns_db_t *db, dns_dbversion_t **versionp);
@@ -100,7 +100,7 @@ typedef struct dns_dbmethods {
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,
dns_name_t *dcname,
dns_name_t *dcname,
dns_rdataset_t *rdataset,
dns_rdataset_t *sigrdataset);
void (*attachnode)(dns_db_t *db, dns_dbnode_t *source,
@@ -118,7 +118,7 @@ typedef struct dns_dbmethods {
dns_rdataset_t *rdataset,
dns_rdataset_t *sigrdataset);
isc_result_t (*allrdatasets)(dns_db_t *db, dns_dbnode_t *node,
dns_dbversion_t *version,
dns_dbversion_t *version,
isc_stdtime_t now,
dns_rdatasetiter_t **iteratorp);
isc_result_t (*addrdataset)(dns_db_t *db, dns_dbnode_t *node,
@@ -128,9 +128,9 @@ typedef struct dns_dbmethods {
dns_rdataset_t *addedrdataset);
isc_result_t (*subtractrdataset)(dns_db_t *db, dns_dbnode_t *node,
dns_dbversion_t *version,
dns_rdataset_t *rdataset,
dns_rdataset_t *rdataset,
unsigned int options,
dns_rdataset_t *newrdataset);
dns_rdataset_t *newrdataset);
isc_result_t (*deleterdataset)(dns_db_t *db, dns_dbnode_t *node,
dns_dbversion_t *version,
dns_rdatatype_t type,
@@ -143,12 +143,12 @@ typedef struct dns_dbmethods {
isc_result_t (*getoriginnode)(dns_db_t *db, dns_dbnode_t **nodep);
void (*transfernode)(dns_db_t *db, dns_dbnode_t **sourcep,
dns_dbnode_t **targetp);
isc_result_t (*getnsec3parameters)(dns_db_t *db,
isc_result_t (*getnsec3parameters)(dns_db_t *db,
dns_dbversion_t *version,
dns_hash_t *hash, uint8_t *flags,
uint16_t *iterations,
uint16_t *iterations,
unsigned char *salt,
size_t *salt_len);
size_t *salt_len);
isc_result_t (*findnsec3node)(dns_db_t *db, const dns_name_t *name,
bool create, dns_dbnode_t **nodep);
isc_result_t (*setsigningtime)(dns_db_t *db, dns_rdataset_t *rdataset,
@@ -164,16 +164,16 @@ typedef struct dns_dbmethods {
isc_result_t (*findnodeext)(dns_db_t *db, const dns_name_t *name,
bool create,
dns_clientinfomethods_t *methods,
dns_clientinfo_t *clientinfo,
dns_dbnode_t **nodep);
dns_clientinfo_t *clientinfo,
dns_dbnode_t **nodep);
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,
dns_dbnode_t **nodep, dns_name_t *foundname,
dns_clientinfomethods_t *methods,
dns_clientinfo_t *clientinfo,
dns_rdataset_t *rdataset,
dns_rdataset_t *sigrdataset);
dns_clientinfo_t *clientinfo,
dns_rdataset_t *rdataset,
dns_rdataset_t *sigrdataset);
isc_result_t (*setcachestats)(dns_db_t *db, isc_stats_t *stats);
size_t (*hashsize)(dns_db_t *db);
isc_result_t (*nodefullname)(dns_db_t *db, dns_dbnode_t *node,
@@ -187,7 +187,7 @@ typedef struct dns_dbmethods {
isc_result_t (*setgluecachestats)(dns_db_t *db, isc_stats_t *stats);
} dns_dbmethods_t;
typedef isc_result_t (*dns_dbcreatefunc_t)(isc_mem_t *mctx,
typedef isc_result_t (*dns_dbcreatefunc_t)(isc_mem_t *mctx,
const dns_name_t *name,
dns_dbtype_t type,
dns_rdataclass_t rdclass,
@@ -215,7 +215,7 @@ struct dns_db {
uint16_t attributes;
dns_rdataclass_t rdclass;
dns_name_t origin;
isc_mem_t *mctx;
isc_mem_t *mctx;
ISC_LIST(dns_dbonupdatelistener_t) update_listeners;
};
@@ -224,7 +224,7 @@ struct dns_db {
struct dns_dbonupdatelistener {
dns_dbupdate_callback_t onupdate;
void *onupdate_arg;
void *onupdate_arg;
ISC_LINK(dns_dbonupdatelistener_t) link;
};

2
lib/dns/include/dns/dbiterator.h
View File

@@ -97,7 +97,7 @@ struct dns_dbiterator {
/* Unlocked. */
unsigned int magic;
dns_dbiteratormethods_t *methods;
dns_db_t *db;
dns_db_t *db;
bool relative_names;
bool cleaning;
};

4
lib/dns/include/dns/diff.h
View File

@@ -74,7 +74,7 @@ typedef ISC_LIST(dns_difftuple_t) dns_difftuplelist_t;
struct dns_difftuple {
unsigned int magic;
isc_mem_t *mctx;
isc_mem_t *mctx;
dns_diffop_t op;
dns_name_t name;
dns_ttl_t ttl;
@@ -95,7 +95,7 @@ typedef struct dns_diff dns_diff_t;
struct dns_diff {
unsigned int magic;
isc_mem_t *mctx;
isc_mem_t *mctx;
dns_difftuplelist_t tuples;
};

2
lib/dns/include/dns/dispatch.h
View File

@@ -64,7 +64,7 @@ ISC_LANG_BEGINDECLS
* round-robin fashion.
*/
struct dns_dispatchset {
isc_mem_t *mctx;
isc_mem_t *mctx;
dns_dispatch_t **dispatches;
int ndisp;
int cur;

30
lib/dns/include/dns/dlz.h
View File

@@ -98,11 +98,11 @@ ISC_LANG_BEGINDECLS
#define DNS_DLZ_VALID(dlz) ISC_MAGIC_VALID(dlz, DNS_DLZ_MAGIC)
typedef isc_result_t (*dns_dlzallowzonexfr_t)(void *driverarg, void *dbdata,
isc_mem_t *mctx,
isc_mem_t *mctx,
dns_rdataclass_t rdclass,
const dns_name_t *name,
const dns_name_t *name,
const isc_sockaddr_t *clientaddr,
dns_db_t **dbp);
dns_db_t **dbp);
/*%<
* Method prototype. Drivers implementing the DLZ interface MUST
@@ -136,12 +136,12 @@ typedef void (*dns_dlzdestroy_t)(void *driverarg, void **dbdata);
*/
typedef isc_result_t (*dns_dlzfindzone_t)(void *driverarg, void *dbdata,
isc_mem_t *mctx,
isc_mem_t *mctx,
dns_rdataclass_t rdclass,
const dns_name_t *name,
const dns_name_t *name,
dns_clientinfomethods_t *methods,
dns_clientinfo_t *clientinfo,
dns_db_t **dbp);
dns_clientinfo_t *clientinfo,
dns_db_t **dbp);
/*%<
* Method prototype. Drivers implementing the DLZ interface MUST
@@ -177,8 +177,8 @@ typedef isc_result_t (*dns_dlzconfigure_t)(void *driverarg, void *dbdata,
* may call configuration functions during the configure call
*/
typedef bool (*dns_dlzssumatch_t)(const dns_name_t *signer,
const dns_name_t *name,
typedef bool (*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);
@@ -200,10 +200,10 @@ typedef struct dns_dlzmethods {
/*% information about a DLZ driver */
struct dns_dlzimplementation {
const char *name;
const char *name;
const dns_dlzmethods_t *methods;
isc_mem_t *mctx;
void *driverarg;
isc_mem_t *mctx;
void *driverarg;
ISC_LINK(dns_dlzimplementation_t) link;
};
@@ -213,12 +213,12 @@ typedef isc_result_t (*dlzconfigure_callback_t)(dns_view_t *, dns_dlzdb_t *,
/*% An instance of a DLZ driver */
struct dns_dlzdb {
unsigned int magic;
isc_mem_t *mctx;
isc_mem_t *mctx;
dns_dlzimplementation_t *implementation;
void *dbdata;
void *dbdata;
dlzconfigure_callback_t configure_callback;
bool search;
char *dlzname;
char *dlzname;
ISC_LINK(dns_dlzdb_t) link;
dns_ssutable_t *ssutable;
};

2
lib/dns/include/dns/dlz_dlopen.h
View File

@@ -57,7 +57,7 @@ dlz_dlopen_destroy_t(void *dbdata);
typedef isc_result_t
dlz_dlopen_findzonedb_t(void *dbdata, const char *name,
dns_clientinfomethods_t *methods,
dns_clientinfo_t *clientinfo);
dns_clientinfo_t *clientinfo);
/*
* dlz_dlopen_lookup() is required for all DLZ external drivers

4
lib/dns/include/dns/dnsrps.h
View File

@@ -50,9 +50,9 @@ typedef struct rpsdb {
int ref_cnt;
librpz_result_id_t hit_id;
librpz_result_t result;
librpz_rsp_t *rsp;
librpz_rsp_t *rsp;
librpz_domain_buf_t origin_buf;
const dns_name_t *qname;
const dns_name_t *qname;
rpsnode_t origin_node;
rpsnode_t data_node;
} rpsdb_t;

12
lib/dns/include/dns/dyndb.h
View File

@@ -34,14 +34,14 @@ ISC_LANG_BEGINDECLS
*/
struct dns_dyndbctx {
unsigned int magic;
const void *hashinit;
isc_mem_t *mctx;
isc_log_t *lctx;
dns_view_t *view;
const void *hashinit;
isc_mem_t *mctx;
isc_log_t *lctx;
dns_view_t *view;
dns_zonemgr_t *zmgr;
isc_task_t *task;
isc_task_t *task;
isc_timermgr_t *timermgr;
const bool *refvar;
const bool *refvar;
};
#define DNS_DYNDBCTX_MAGIC ISC_MAGIC('D', 'd', 'b', 'c')

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

@@ -80,7 +80,7 @@ typedef enum {
typedef struct dns_geoip_elem {
dns_geoip_subtype_t subtype;
void *db;
void *db;
union {
char as_string[256];
int as_int;
@@ -104,7 +104,7 @@ ISC_LANG_BEGINDECLS
bool
dns_geoip_match(const isc_netaddr_t *reqaddr,
const dns_geoip_databases_t *geoip,
const dns_geoip_elem_t *elt);
const dns_geoip_elem_t *elt);
ISC_LANG_ENDDECLS

8
lib/dns/include/dns/ipkeylist.h
View File

@@ -25,10 +25,10 @@
*/
struct dns_ipkeylist {
isc_sockaddr_t *addrs;
isc_dscp_t *dscps;
dns_name_t **keys;
dns_name_t **tlss;
dns_name_t **labels;
isc_dscp_t *dscps;
dns_name_t **keys;
dns_name_t **tlss;
dns_name_t **labels;
uint32_t count;
uint32_t allocated;
};

2
lib/dns/include/dns/iptable.h
View File

@@ -24,7 +24,7 @@
struct dns_iptable {
unsigned int magic;
isc_mem_t *mctx;
isc_mem_t *mctx;
isc_refcount_t refcount;
isc_radix_tree_t *radix;
ISC_LINK(dns_iptable_t) nextincache;

4
lib/dns/include/dns/kasp.h
View File

@@ -61,8 +61,8 @@ struct dns_kasp_nsec3param {
/* Stores a DNSSEC policy */
struct dns_kasp {
unsigned int magic;
isc_mem_t *mctx;
char *name;
isc_mem_t *mctx;
char *name;
/* Internals. */
isc_mutex_t lock;

100
lib/dns/include/dns/librpz.h
View File

@@ -387,9 +387,9 @@ LIBDEF_F(clist_detach)
* @param use_expired: true to not ignore expired zones
* @return client handle or NULL if the handle could not be created
*/
typedef librpz_client_t *(librpz_client_create_t)(librpz_emsg_t *emsg,
typedef librpz_client_t *(librpz_client_create_t)(librpz_emsg_t *emsg,
librpz_clist_t *clist,
const char *cstr,
const char *cstr,
bool use_expired);
LIBDEF_F(client_create)
@@ -486,9 +486,9 @@ LIBDEF_F(have_ns_trig)
* @param[in,out] rsp state from librpz_itr_start()
* @return false on error
*/
typedef bool(librpz_rsp_clientip_prefix_t)(librpz_emsg_t *emsg,
typedef bool(librpz_rsp_clientip_prefix_t)(librpz_emsg_t *emsg,
librpz_prefix_t *prefix,
librpz_rsp_t *rsp);
librpz_rsp_t *rsp);
LIBDEF_F(rsp_clientip_prefix)
/**
@@ -501,9 +501,9 @@ LIBDEF_F(rsp_clientip_prefix)
* @param[in,out] rsp state from librpz_itr_start()
* @return false on error
*/
typedef bool(librpz_rsp_domain_t)(librpz_emsg_t *emsg,
typedef bool(librpz_rsp_domain_t)(librpz_emsg_t *emsg,
librpz_domain_buf_t *owner,
librpz_rsp_t *rsp);
librpz_rsp_t *rsp);
LIBDEF_F(rsp_domain)
/**
@@ -759,7 +759,7 @@ typedef socku_t *(librpz_mk_inet_su_t)(socku_t *su, const struct in_addr *addrp,
in_port_t port);
LIBDEF_F(mk_inet_su)
typedef socku_t *(librpz_mk_inet6_su_t)(socku_t *su,
typedef socku_t *(librpz_mk_inet6_su_t)(socku_t *su,
const struct in6_addr *addrp,
uint32_t scope_id, in_port_t port);
LIBDEF_F(mk_inet6_su)
@@ -782,57 +782,57 @@ LIBDEF(const char *, librpz_dnsrpzd_path)
* This is the dlopen() interface to librpz.
*/
typedef const struct {
const char *dnsrpzd_path;
const char *version;
librpz_parse_log_opt_t *parse_log_opt;
librpz_log_level_val_t *log_level_val;
const char *dnsrpzd_path;
const char *version;
librpz_parse_log_opt_t *parse_log_opt;
librpz_log_level_val_t *log_level_val;
librpz_set_log_t *set_log;
librpz_vpemsg_t *vpemsg;
librpz_pemsg_t *pemsg;
librpz_vlog_t *vlog;
librpz_log_t *log;
librpz_vpemsg_t *vpemsg;
librpz_pemsg_t *pemsg;
librpz_vlog_t *vlog;
librpz_log_t *log;
librpz_fatal_t *fatal LIBRPZ_NORET;
librpz_rpz_assert_t *rpz_assert LIBRPZ_NORET;
librpz_rpz_vassert_t *rpz_vassert LIBRPZ_NORET;
librpz_clist_create_t *clist_create;
librpz_clist_detach_t *clist_detach;
librpz_client_create_t *client_create;
librpz_clist_create_t *clist_create;
librpz_clist_detach_t *clist_detach;
librpz_client_create_t *client_create;
librpz_connect_t *connect;
librpz_client_detach_t *client_detach;
librpz_rsp_create_t *rsp_create;
librpz_rsp_detach_t *rsp_detach;
librpz_rsp_result_t *rsp_result;
librpz_have_trig_t *have_trig;
librpz_have_ns_trig_t *have_ns_trig;
librpz_rsp_clientip_prefix_t *rsp_clientip_prefix;
librpz_rsp_domain_t *rsp_domain;
librpz_rsp_rr_t *rsp_rr;
librpz_client_detach_t *client_detach;
librpz_rsp_create_t *rsp_create;
librpz_rsp_detach_t *rsp_detach;
librpz_rsp_result_t *rsp_result;
librpz_have_trig_t *have_trig;
librpz_have_ns_trig_t *have_ns_trig;
librpz_rsp_clientip_prefix_t *rsp_clientip_prefix;
librpz_rsp_domain_t *rsp_domain;
librpz_rsp_rr_t *rsp_rr;
librpz_rsp_soa_t *rsp_soa;
librpz_soa_serial_t *soa_serial;
librpz_rsp_push_t *rsp_push;
librpz_soa_serial_t *soa_serial;
librpz_rsp_push_t *rsp_push;
librpz_rsp_pop_t *rsp_pop;
librpz_rsp_pop_discard_t *rsp_pop_discard;
librpz_rsp_forget_zone_t *rsp_forget_zone;
librpz_ck_ip_t *ck_ip;
librpz_ck_domain_t *ck_domain;
librpz_zone_refresh_t *zone_refresh;
librpz_ck_ip_t *ck_ip;
librpz_ck_domain_t *ck_domain;
librpz_zone_refresh_t *zone_refresh;
librpz_db_info_t *db_info;
librpz_itr_start_t *itr_start;
librpz_mf_stats_t *mf_stats;
librpz_vers_stats_t *vers_stats;
librpz_itr_zone_t *itr_zone;
librpz_itr_node_t *itr_node;
librpz_policy2str_t *policy2str;
librpz_trig2str_t *trig2str;
librpz_secs2str_t *secs2str;
librpz_str2secs_t *str2secs;
librpz_rtype2str_t *rtype2str;
librpz_domain_ntop_t *domain_ntop;
librpz_domain_pton2_t *domain_pton2;
librpz_mk_inet_su_t *mk_inet_su;
librpz_mk_inet6_su_t *mk_inet6_su;
librpz_str2su_t *str2su;
librpz_su2str_t *su2str;
librpz_itr_start_t *itr_start;
librpz_mf_stats_t *mf_stats;
librpz_vers_stats_t *vers_stats;
librpz_itr_zone_t *itr_zone;
librpz_itr_node_t *itr_node;
librpz_policy2str_t *policy2str;
librpz_trig2str_t *trig2str;
librpz_secs2str_t *secs2str;
librpz_str2secs_t *str2secs;
librpz_rtype2str_t *rtype2str;
librpz_domain_ntop_t *domain_ntop;
librpz_domain_pton2_t *domain_pton2;
librpz_mk_inet_su_t *mk_inet_su;
librpz_mk_inet6_su_t *mk_inet6_su;
librpz_str2su_t *str2su;
librpz_su2str_t *su2str;
} librpz_0_t;
extern librpz_0_t librpz_def_0;
@@ -844,7 +844,7 @@ extern librpz_0_t librpz_def_0;
#define LIBRPZ_DEF_STR "librpz_def_0"
typedef librpz_0_t librpz_t;
extern librpz_t *librpz;
extern librpz_t *librpz;
#if LIBRPZ_LIB_OPEN == 2
#include <dlfcn.h>
@@ -858,7 +858,7 @@ extern librpz_t *librpz;
*/
static inline librpz_t *
librpz_lib_open(librpz_emsg_t *emsg, void **dl_handle, const char *path) {
void *handle;
void *handle;
librpz_t *new_librpz;
emsg->c[0] = '\0';

2
lib/dns/include/dns/log.h
View File

@@ -19,7 +19,7 @@
#include <isc/lang.h>
#include <isc/log.h>
extern isc_log_t *dns_lctx;
extern isc_log_t *dns_lctx;
extern isc_logcategory_t dns_categories[];
extern isc_logmodule_t dns_modules[];

10
lib/dns/include/dns/masterdump.h
View File

@@ -243,7 +243,7 @@ dns_dumpctx_db(dns_dumpctx_t *dctx);
/*@{*/
isc_result_t
dns_master_dumptostreamasync(isc_mem_t *mctx, dns_db_t *db,
dns_dbversion_t *version,
dns_dbversion_t *version,
const dns_master_style_t *style, FILE *f,
isc_task_t *task, dns_dumpdonefunc_t done,
void *done_arg, dns_dumpctx_t **dctxp);
@@ -310,7 +310,7 @@ dns_master_dump(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version,
isc_result_t
dns_master_rdatasettotext(const dns_name_t *owner_name,
dns_rdataset_t *rdataset,
dns_rdataset_t *rdataset,
const dns_master_style_t *style, dns_indent_t *indent,
isc_buffer_t *target);
/*%<
@@ -327,9 +327,9 @@ dns_master_rdatasettotext(const dns_name_t *owner_name,
isc_result_t
dns_master_questiontotext(const dns_name_t *owner_name,
dns_rdataset_t *rdataset,
dns_rdataset_t *rdataset,
const dns_master_style_t *style,
isc_buffer_t *target);
isc_buffer_t *target);
isc_result_t
dns_master_dumpnodetostream(isc_mem_t *mctx, dns_db_t *db,
@@ -346,7 +346,7 @@ dns_masterstyle_flags_t
dns_master_styleflags(const dns_master_style_t *style);
isc_result_t
dns_master_stylecreate(dns_master_style_t **style,
dns_master_stylecreate(dns_master_style_t **style,
dns_masterstyle_flags_t flags, unsigned int ttl_column,
unsigned int class_column, unsigned int type_column,
unsigned int rdata_column, unsigned int line_length,

12
lib/dns/include/dns/message.h
View File

@@ -237,8 +237,8 @@ typedef int dns_messagetextflag_t;
typedef struct dns_msgblock dns_msgblock_t;
struct dns_sortlist_arg {
dns_aclenv_t *env;
dns_acl_t *acl;
dns_aclenv_t *env;
dns_acl_t *acl;
const dns_aclelement_t *element;
};
@@ -263,7 +263,7 @@ struct dns_message {
/* private from here down */
dns_namelist_t sections[DNS_SECTION_MAX];
dns_name_t *cursors[DNS_SECTION_MAX];
dns_name_t *cursors[DNS_SECTION_MAX];
dns_rdataset_t *opt;
dns_rdataset_t *sig0;
dns_rdataset_t *tsig;
@@ -292,7 +292,7 @@ struct dns_message {
isc_buffer_t *buffer;
dns_compress_t *cctx;
isc_mem_t *mctx;
isc_mem_t *mctx;
isc_mempool_t *namepool;
isc_mempool_t *rdspool;
@@ -318,7 +318,7 @@ struct dns_message {
dns_name_t *sig0name; /* Owner name of SIG0, if any
* */
dst_key_t *sig0key;
dst_key_t *sig0key;
dns_rcode_t sig0status;
isc_region_t query;
isc_region_t saved;
@@ -418,7 +418,7 @@ isc_result_t
dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section,
const dns_master_style_t *style,
dns_messagetextflag_t flags,
isc_buffer_t *target);
isc_buffer_t *target);
/*%<
* Convert section 'section' or 'pseudosection' of message 'msg' to
* a cleartext representation

6
lib/dns/include/dns/nsec3.h
View File

@@ -108,7 +108,7 @@ dns_nsec3_supportedhash(dns_hash_t hash);
isc_result_t
dns_nsec3_addnsec3(dns_db_t *db, dns_dbversion_t *version,
const dns_name_t *name,
const dns_name_t *name,
const dns_rdata_nsec3param_t *nsec3param, dns_ttl_t nsecttl,
bool unsecure, dns_diff_t *diff);
@@ -155,7 +155,7 @@ 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,
const dns_name_t *name,
const dns_name_t *name,
const dns_rdata_nsec3param_t *nsec3param, dns_diff_t *diff);
isc_result_t
@@ -165,7 +165,7 @@ dns_nsec3_delnsec3s(dns_db_t *db, dns_dbversion_t *version,
isc_result_t
dns_nsec3_delnsec3sx(dns_db_t *db, dns_dbversion_t *version,
const dns_name_t *name, dns_rdatatype_t private,
dns_diff_t *diff);
dns_diff_t *diff);
/*%<
* Remove NSEC3 records for 'name', recording the change in 'diff'.
* Adjust previous NSEC3 records, if any, to reflect the removal.

4
lib/dns/include/dns/nta.h
View File

@@ -46,11 +46,11 @@ ISC_LANG_BEGINDECLS
struct dns_ntatable {
/* Unlocked. */
unsigned int magic;
dns_view_t *view;
dns_view_t *view;
isc_rwlock_t rwlock;
isc_taskmgr_t *taskmgr;
isc_timermgr_t *timermgr;
isc_task_t *task;
isc_task_t *task;
/* Protected by atomics */
isc_refcount_t references;
/* Locked by rwlock. */

2
lib/dns/include/dns/peer.h
View File

@@ -164,7 +164,7 @@ isc_result_t
dns_peer_setkey(dns_peer_t *peer, dns_name_t **keyval);
isc_result_t
dns_peer_settransfersource(dns_peer_t *peer,
dns_peer_settransfersource(dns_peer_t *peer,
const isc_sockaddr_t *transfer_source);
isc_result_t

6
lib/dns/include/dns/rbt.h
View File

@@ -150,8 +150,8 @@ struct dns_rbtnode {
};
typedef isc_result_t (*dns_rbtfindcallback_t)(dns_rbtnode_t *node,
dns_name_t *name,
void *callback_arg);
dns_name_t *name,
void *callback_arg);
typedef isc_result_t (*dns_rbtdatawriter_t)(FILE *file, unsigned char *data,
void *arg, uint64_t *crc);
@@ -696,7 +696,7 @@ dns_rbt_destroy2(dns_rbt_t **rbtp, unsigned int quantum);
void
dns_rbt_printtext(dns_rbt_t *rbt, void (*data_printer)(FILE *, void *),
FILE *f);
FILE *f);
/*%<
* Print an ASCII representation of the internal structure of the red-black
* tree of trees to the passed stream.

2
lib/dns/include/dns/rdata.h
View File

@@ -109,7 +109,7 @@ ISC_LANG_BEGINDECLS
* purpose the client desires.
*/
struct dns_rdata {
unsigned char *data;
unsigned char *data;
unsigned int length;
dns_rdataclass_t rdclass;
dns_rdatatype_t type;

2
lib/dns/include/dns/rdatalist.h
View File

@@ -97,7 +97,7 @@ dns_rdatalist_tordataset(dns_rdatalist_t *rdatalist, dns_rdataset_t *rdataset);
*/
isc_result_t
dns_rdatalist_fromrdataset(dns_rdataset_t *rdataset,
dns_rdatalist_fromrdataset(dns_rdataset_t *rdataset,
dns_rdatalist_t **rdatalist);
/*%<
* Point 'rdatalist' to the rdatalist in 'rdataset'.

22
lib/dns/include/dns/rdataset.h
View File

@@ -69,11 +69,11 @@ typedef struct dns_rdatasetmethods {
void (*current)(dns_rdataset_t *rdataset, dns_rdata_t *rdata);
void (*clone)(dns_rdataset_t *source, dns_rdataset_t *target);
unsigned int (*count)(dns_rdataset_t *rdataset);
isc_result_t (*addnoqname)(dns_rdataset_t *rdataset,
isc_result_t (*addnoqname)(dns_rdataset_t *rdataset,
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,
isc_result_t (*addclosest)(dns_rdataset_t *rdataset,
const dns_name_t *name);
isc_result_t (*getclosest)(dns_rdataset_t *rdataset, dns_name_t *name,
dns_rdataset_t *neg, dns_rdataset_t *negsig);
@@ -82,7 +82,7 @@ typedef struct dns_rdatasetmethods {
void (*clearprefetch)(dns_rdataset_t *rdataset);
void (*setownercase)(dns_rdataset_t *rdataset, const dns_name_t *name);
void (*getownercase)(const dns_rdataset_t *rdataset, dns_name_t *name);
isc_result_t (*addglue)(dns_rdataset_t *rdataset,
isc_result_t (*addglue)(dns_rdataset_t *rdataset,
dns_dbversion_t *version, dns_message_t *msg);
} dns_rdatasetmethods_t;
@@ -136,11 +136,11 @@ struct dns_rdataset {
* These are for use by the rdataset implementation, and MUST NOT
* be changed by clients.
*/
void *private1;
void *private2;
void *private3;
void *private1;
void *private2;
void *private3;
unsigned int privateuint4;
void *private5;
void *private5;
const void *private6;
const void *private7;
/*@}*/
@@ -399,7 +399,7 @@ dns_rdataset_towire(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
*/
isc_result_t
dns_rdataset_towiresorted(dns_rdataset_t *rdataset,
dns_rdataset_towiresorted(dns_rdataset_t *rdataset,
const dns_name_t *owner_name, dns_compress_t *cctx,
isc_buffer_t *target, dns_rdatasetorderfunc_t order,
const void *order_arg, unsigned int options,
@@ -415,7 +415,7 @@ dns_rdataset_towiresorted(dns_rdataset_t *rdataset,
*/
isc_result_t
dns_rdataset_towirepartial(dns_rdataset_t *rdataset,
dns_rdataset_towirepartial(dns_rdataset_t *rdataset,
const dns_name_t *owner_name, dns_compress_t *cctx,
isc_buffer_t *target, dns_rdatasetorderfunc_t order,
const void *order_arg, unsigned int options,
@@ -439,8 +439,8 @@ dns_rdataset_towirepartial(dns_rdataset_t *rdataset,
*/
isc_result_t
dns_rdataset_additionaldata(dns_rdataset_t *rdataset,
const dns_name_t *owner_name,
dns_rdataset_additionaldata(dns_rdataset_t *rdataset,
const dns_name_t *owner_name,
dns_additionaldatafunc_t add, void *arg);
/*%<
* For each rdata in rdataset, call 'add' for each name and type in the

8
lib/dns/include/dns/rdatasetiter.h
View File

@@ -89,9 +89,9 @@ struct dns_rdatasetiter {
/* Unlocked. */
unsigned int magic;
dns_rdatasetitermethods_t *methods;
dns_db_t *db;
dns_dbnode_t *node;
dns_dbversion_t *version;
dns_db_t *db;
dns_dbnode_t *node;
dns_dbversion_t *version;
isc_stdtime_t now;
};
@@ -144,7 +144,7 @@ dns_rdatasetiter_next(dns_rdatasetiter_t *iterator);
void
dns_rdatasetiter_current(dns_rdatasetiter_t *iterator,
dns_rdataset_t *rdataset);
dns_rdataset_t *rdataset);
/*%<
* Return the current rdataset.
*

18
lib/dns/include/dns/resolver.h
View File

@@ -68,15 +68,15 @@ ISC_LANG_BEGINDECLS
*/
typedef struct dns_fetchevent {
ISC_EVENT_COMMON(struct dns_fetchevent);
dns_fetch_t *fetch;
dns_fetch_t *fetch;
isc_result_t result;
dns_rdatatype_t qtype;
dns_db_t *db;
dns_db_t *db;
dns_dbnode_t *node;
dns_rdataset_t *rdataset;
dns_rdataset_t *sigrdataset;
dns_rdataset_t *rdataset;
dns_rdataset_t *sigrdataset;
dns_fixedname_t fname;
dns_name_t *foundname;
dns_name_t *foundname;
const isc_sockaddr_t *client;
dns_messageid_t id;
isc_result_t vresult;
@@ -264,8 +264,8 @@ dns_resolver_detach(dns_resolver_t **resp);
isc_result_t
dns_resolver_createfetch(dns_resolver_t *res, const dns_name_t *name,
dns_rdatatype_t type, const dns_name_t *domain,
dns_rdataset_t *nameservers,
dns_forwarders_t *forwarders,
dns_rdataset_t *nameservers,
dns_forwarders_t *forwarders,
const isc_sockaddr_t *client, dns_messageid_t id,
unsigned int options, unsigned int depth,
isc_counter_t *qc, isc_task_t *task,
@@ -474,7 +474,7 @@ dns_resolver_disable_ds_digest(dns_resolver_t *resolver, const dns_name_t *name,
*/
bool
dns_resolver_algorithm_supported(dns_resolver_t *resolver,
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.
@@ -484,7 +484,7 @@ dns_resolver_algorithm_supported(dns_resolver_t *resolver,
*/
bool
dns_resolver_ds_digest_supported(dns_resolver_t *resolver,
dns_resolver_ds_digest_supported(dns_resolver_t *resolver,
const dns_name_t *name,
unsigned int digest_type);
/*%<

36
lib/dns/include/dns/rpz.h
View File

@@ -146,16 +146,16 @@ struct dns_rpz_zone {
uint32_t min_update_interval; /* minimal interval between
* updates */
isc_ht_t *nodes; /* entries in zone */
isc_ht_t *nodes; /* entries in zone */
dns_rpz_zones_t *rpzs; /* owner */
isc_time_t lastupdated; /* last time the zone was processed
* */
bool updatepending; /* there is an update pending */
bool updaterunning; /* there is an update running */
isc_result_t updateresult; /* result from the offloaded work */
dns_db_t *db; /* zones database */
dns_db_t *db; /* zones database */
dns_dbversion_t *dbversion; /* version we will be updating to */
dns_db_t *updb; /* zones database we're working on */
dns_db_t *updb; /* zones database we're working on */
dns_dbversion_t *updbversion; /* version we're currently working
* on */
bool addsoa; /* add soa to the additional section */
@@ -211,7 +211,7 @@ struct dns_rpz_popt {
*/
struct dns_rpz_zones {
dns_rpz_popt_t p;
dns_rpz_zone_t *zones[DNS_RPZ_MAX_ZONES];
dns_rpz_zone_t *zones[DNS_RPZ_MAX_ZONES];
dns_rpz_triggers_t triggers[DNS_RPZ_MAX_ZONES];
/*
@@ -247,10 +247,10 @@ struct dns_rpz_zones {
*/
dns_rpz_triggers_t total_triggers;
isc_mem_t *mctx;
isc_mem_t *mctx;
isc_taskmgr_t *taskmgr;
isc_timermgr_t *timermgr;
isc_task_t *updater;
isc_task_t *updater;
isc_refcount_t refs;
isc_refcount_t irefs;
/*
@@ -263,7 +263,7 @@ struct dns_rpz_zones {
isc_mutex_t maint_lock;
dns_rpz_cidr_node_t *cidr;
dns_rbt_t *rbt;
dns_rbt_t *rbt;
/*
* DNSRPZ librpz configuration string and handle on librpz connection
@@ -291,23 +291,23 @@ typedef struct {
*/
struct {
dns_rpz_type_t type;
dns_rpz_zone_t *rpz;
dns_rpz_zone_t *rpz;
dns_rpz_prefix_t prefix;
dns_rpz_policy_t policy;
dns_ttl_t ttl;
isc_result_t result;
dns_zone_t *zone;
dns_db_t *db;
dns_zone_t *zone;
dns_db_t *db;
dns_dbversion_t *version;
dns_dbnode_t *node;
dns_rdataset_t *rdataset;
dns_dbnode_t *node;
dns_rdataset_t *rdataset;
} m;
/*
* State for chasing IP addresses and NS names including recursion.
*/
struct {
unsigned int label;
dns_db_t *db;
dns_db_t *db;
dns_rdataset_t *ns_rdataset;
dns_rdatatype_t r_type;
isc_result_t r_result;
@@ -321,8 +321,8 @@ typedef struct {
isc_result_t result;
bool is_zone;
bool authoritative;
dns_zone_t *zone;
dns_db_t *db;
dns_zone_t *zone;
dns_db_t *db;
dns_dbnode_t *node;
dns_rdataset_t *rdataset;
dns_rdataset_t *sigrdataset;
@@ -349,9 +349,9 @@ typedef struct {
* r_name: recursing for this name to possible policy triggers
* f_name: saved found name from before recursion
*/
dns_name_t *p_name;
dns_name_t *r_name;
dns_name_t *fname;
dns_name_t *p_name;
dns_name_t *r_name;
dns_name_t *fname;
dns_fixedname_t _p_namef;
dns_fixedname_t _r_namef;
dns_fixedname_t _fnamef;

8
lib/dns/include/dns/rriterator.h
View File

@@ -55,11 +55,11 @@ ISC_LANG_BEGINDECLS
typedef struct dns_rriterator {
unsigned int magic;
isc_result_t result;
dns_db_t *db;
dns_dbiterator_t *dbit;
dns_dbversion_t *ver;
dns_db_t *db;
dns_dbiterator_t *dbit;
dns_dbversion_t *ver;
isc_stdtime_t now;
dns_dbnode_t *node;
dns_dbnode_t *node;
dns_fixedname_t fixedname;
dns_rdatasetiter_t *rdatasetit;
dns_rdataset_t rdataset;

8
lib/dns/include/dns/sdb.h
View File

@@ -53,13 +53,13 @@ typedef struct dns_sdblookup dns_sdblookup_t;
typedef struct dns_sdballnodes dns_sdballnodes_t;
typedef isc_result_t (*dns_sdblookupfunc_t)(const char *zone, const char *name,
void *dbdata,
void *dbdata,
dns_sdblookup_t *lookup,
dns_clientinfomethods_t *methods,
dns_clientinfo_t *clientinfo);
typedef isc_result_t (*dns_sdblookup2func_t)(const dns_name_t *zone,
const dns_name_t *name,
void *dbdata,
typedef isc_result_t (*dns_sdblookup2func_t)(const dns_name_t *zone,
const dns_name_t *name,
void *dbdata,
dns_sdblookup_t *lookup,
dns_clientinfomethods_t *methods,
dns_clientinfo_t *clientinfo);

8
lib/dns/include/dns/sdlz.h
View File

@@ -147,9 +147,9 @@ typedef void (*dns_sdlzdestroy_t)(void *driverarg, void *dbdata);
*/
typedef isc_result_t (*dns_sdlzfindzone_t)(void *driverarg, void *dbdata,
const char *name,
const char *name,
dns_clientinfomethods_t *methods,
dns_clientinfo_t *clientinfo);
dns_clientinfo_t *clientinfo);
/*%<
* Method prototype. Drivers implementing the SDLZ interface MUST
* supply a find zone method. This method is called when the DNS
@@ -179,7 +179,7 @@ typedef isc_result_t (*dns_sdlzfindzone_t)(void *driverarg, void *dbdata,
typedef isc_result_t (*dns_sdlzlookupfunc_t)(const char *zone, const char *name,
void *driverarg, void *dbdata,
dns_sdlzlookup_t *lookup,
dns_sdlzlookup_t *lookup,
dns_clientinfomethods_t *methods,
dns_clientinfo_t *clientinfo);
@@ -222,7 +222,7 @@ typedef void (*dns_sdlzcloseversion_t)(const char *zone, bool commit,
* If the call is successful then *versionp should be set to NULL
*/
typedef isc_result_t (*dns_sdlzconfigure_t)(dns_view_t *view,
typedef isc_result_t (*dns_sdlzconfigure_t)(dns_view_t *view,
dns_dlzdb_t *dlzdb, void *driverarg,
void *dbdata);
/*%<

8
lib/dns/include/dns/tkey.h
View File

@@ -35,11 +35,11 @@ ISC_LANG_BEGINDECLS
#define DNS_TKEYMODE_DELETE 5
struct dns_tkeyctx {
dst_key_t *dhkey;
dns_name_t *domain;
dst_key_t *dhkey;
dns_name_t *domain;
dns_gss_cred_id_t gsscred;
isc_mem_t *mctx;
char *gssapi_keytab;
isc_mem_t *mctx;
char *gssapi_keytab;
};
isc_result_t

6
lib/dns/include/dns/transport.h
View File

@@ -62,7 +62,7 @@ uint32_t
dns_transport_get_tls_versions(const dns_transport_t *transport);
bool
dns_transport_get_prefer_server_ciphers(const dns_transport_t *transport,
bool *preferp);
bool *preferp);
/*%<
* Getter functions: return the type, cert file, key file, CA file,
* hostname, HTTP endpoint, or HTTP mode (GET or POST) for 'transport'.
@@ -80,7 +80,7 @@ void
dns_transport_set_cafile(dns_transport_t *transport, const char *cafile);
void
dns_transport_set_remote_hostname(dns_transport_t *transport,
const char *hostname);
const char *hostname);
void
dns_transport_set_endpoint(dns_transport_t *transport, const char *endpoint);
void
@@ -146,7 +146,7 @@ dns_transport_list_new(isc_mem_t *mctx);
*/
void
dns_transport_list_attach(dns_transport_list_t *source,
dns_transport_list_attach(dns_transport_list_t *source,
dns_transport_list_t **targetp);
/*%<
* Attach to a transport list.

10
lib/dns/include/dns/tsig.h
View File

@@ -54,10 +54,10 @@ extern const dns_name_t *dns_tsig_hmacsha512_name;
#define DNS_TSIG_FUDGE 300
struct dns_tsig_keyring {
dns_rbt_t *keys;
dns_rbt_t *keys;
unsigned int writecount;
isc_rwlock_t lock;
isc_mem_t *mctx;
isc_mem_t *mctx;
/*
* LRU list of generated key along with a count of the keys on the
* list and a maximum size.
@@ -71,10 +71,10 @@ struct dns_tsig_keyring {
struct dns_tsigkey {
/* Unlocked */
unsigned int magic; /*%< Magic number. */
isc_mem_t *mctx;
dst_key_t *key; /*%< Key */
isc_mem_t *mctx;
dst_key_t *key; /*%< Key */
dns_name_t name; /*%< Key name */
const dns_name_t *algorithm; /*%< Algorithm name */
const dns_name_t *algorithm; /*%< Algorithm name */
dns_name_t *creator; /*%< name that created secret */
bool generated; /*%< was this generated? */
isc_stdtime_t inception; /*%< start of validity period */

22
lib/dns/include/dns/validator.h
View File

@@ -77,7 +77,7 @@ typedef struct dns_validatorevent {
/*
* Name and type of the response to be validated.
*/
dns_name_t *name;
dns_name_t *name;
dns_rdatatype_t type;
/*
* Rdata and RRSIG (if any) for positive responses.
@@ -124,19 +124,19 @@ struct dns_validator {
unsigned int options;
unsigned int attributes;
dns_validatorevent_t *event;
dns_fetch_t *fetch;
dns_validator_t *subvalidator;
dns_validator_t *parent;
dns_keytable_t *keytable;
dst_key_t *key;
dns_rdata_rrsig_t *siginfo;
isc_task_t *task;
dns_fetch_t *fetch;
dns_validator_t *subvalidator;
dns_validator_t *parent;
dns_keytable_t *keytable;
dst_key_t *key;
dns_rdata_rrsig_t *siginfo;
isc_task_t *task;
isc_taskaction_t action;
void *arg;
unsigned int labels;
dns_rdataset_t *currentset;
dns_rdataset_t *keyset;
dns_rdataset_t *dsset;
dns_rdataset_t *currentset;
dns_rdataset_t *keyset;
dns_rdataset_t *dsset;
dns_rdataset_t fdsset;
dns_rdataset_t frdataset;
dns_rdataset_t fsigrdataset;

70
lib/dns/include/dns/view.h
View File

@@ -83,14 +83,14 @@ ISC_LANG_BEGINDECLS
struct dns_view {
/* Unlocked. */
unsigned int magic;
isc_mem_t *mctx;
isc_mem_t *mctx;
dns_rdataclass_t rdclass;
char *name;
char *name;
dns_zt_t *zonetable;
dns_resolver_t *resolver;
dns_adb_t *adb;
dns_resolver_t *resolver;
dns_adb_t *adb;
dns_requestmgr_t *requestmgr;
dns_cache_t *cache;
dns_cache_t *cache;
dns_db_t *cachedb;
dns_db_t *hints;
@@ -110,9 +110,9 @@ struct dns_view {
dns_transport_list_t *transports;
dns_tsig_keyring_t *statickeys;
dns_tsig_keyring_t *dynamickeys;
dns_peerlist_t *peers;
dns_order_t *order;
dns_fwdtable_t *fwdtable;
dns_peerlist_t *peers;
dns_order_t *order;
dns_fwdtable_t *fwdtable;
bool recursion;
bool qminimization;
bool qmin_strict;
@@ -127,24 +127,24 @@ struct dns_view {
bool trust_anchor_telemetry;
bool root_key_sentinel;
dns_transfer_format_t transfer_format;
dns_acl_t *cacheacl;
dns_acl_t *cacheonacl;
dns_acl_t *queryacl;
dns_acl_t *queryonacl;
dns_acl_t *recursionacl;
dns_acl_t *recursiononacl;
dns_acl_t *sortlist;
dns_acl_t *notifyacl;
dns_acl_t *transferacl;
dns_acl_t *updateacl;
dns_acl_t *upfwdacl;
dns_acl_t *denyansweracl;
dns_acl_t *nocasecompress;
dns_acl_t *cacheacl;
dns_acl_t *cacheonacl;
dns_acl_t *queryacl;
dns_acl_t *queryonacl;
dns_acl_t *recursionacl;
dns_acl_t *recursiononacl;
dns_acl_t *sortlist;
dns_acl_t *notifyacl;
dns_acl_t *transferacl;
dns_acl_t *updateacl;
dns_acl_t *upfwdacl;
dns_acl_t *denyansweracl;
dns_acl_t *nocasecompress;
bool msgcompression;
dns_rbt_t *answeracl_exclude;
dns_rbt_t *denyanswernames;
dns_rbt_t *answernames_exclude;
dns_rrl_t *rrl;
dns_rbt_t *answeracl_exclude;
dns_rbt_t *denyanswernames;
dns_rbt_t *answernames_exclude;
dns_rrl_t *rrl;
bool provideixfr;
bool requestnsid;
bool sendcookie;
@@ -161,9 +161,9 @@ struct dns_view {
dns_aclenv_t *aclenv;
dns_rdatatype_t preferred_glue;
bool flush;
dns_namelist_t *delonly;
dns_namelist_t *delonly;
bool rootdelonly;
dns_namelist_t *rootexclude;
dns_namelist_t *rootexclude;
bool checknames;
uint16_t maxudp;
dns_ttl_t staleanswerttl;
@@ -173,16 +173,16 @@ struct dns_view {
uint32_t staleanswerclienttimeout;
uint16_t nocookieudp;
uint16_t padding;
dns_acl_t *pad_acl;
dns_acl_t *pad_acl;
unsigned int maxbits;
dns_dns64list_t dns64;
unsigned int dns64cnt;
dns_rpz_zones_t *rpzs;
dns_rpz_zones_t *rpzs;
dns_catz_zones_t *catzs;
dns_dlzdblist_t dlz_searched;
dns_dlzdblist_t dlz_unsearched;
uint32_t fail_ttl;
dns_badcache_t *failcache;
dns_badcache_t *failcache;
/*
* Configurable data for server use only,
@@ -214,12 +214,12 @@ struct dns_view {
* XXX: This should be a pointer to an opaque type that
* named implements.
*/
char *new_zone_dir;
char *new_zone_file;
char *new_zone_db;
void *new_zone_dbenv;
char *new_zone_dir;
char *new_zone_file;
char *new_zone_db;
void *new_zone_dbenv;
uint64_t new_zone_mapsize;
void *new_zone_config;
void *new_zone_config;
void (*cfg_destroy)(void **);
isc_mutex_t new_zone_lock;

2
lib/dns/include/dns/zone.h
View File

@@ -2049,7 +2049,7 @@ dns_zonemgr_unreachabledel(dns_zonemgr_t *zmgr, isc_sockaddr_t *remote,
*/
void
dns_zonemgr_set_tlsctx_cache(dns_zonemgr_t *zmgr,
dns_zonemgr_set_tlsctx_cache(dns_zonemgr_t *zmgr,
isc_tlsctx_cache_t *tlsctx_cache);
/*%<
* Set the TLS client context cache used for zone transfers via

4
lib/isc/include/isc/buffer.h
View File

@@ -172,7 +172,7 @@ ISC_LANG_BEGINDECLS
struct isc_buffer {
unsigned int magic;
void *base;
void *base;
/*@{*/
/*! The following integers are byte offsets from 'base'. */
unsigned int length;
@@ -1050,7 +1050,7 @@ ISC_LANG_ENDDECLS
#define isc_buffer_constinit(_b, _d, _l) \
do { \
union { \
void *_var; \
void *_var; \
const void *_const; \
} _deconst; \
_deconst._const = (_d); \

2
lib/isc/include/isc/dir.h
View File

@@ -42,7 +42,7 @@ typedef struct isc_dir {
unsigned int magic;
char dirname[PATH_MAX];
isc_direntry_t entry;
DIR *handle;
DIR *handle;
} isc_dir_t;
ISC_LANG_BEGINDECLS

4
lib/isc/include/isc/glob.h
View File

@@ -25,9 +25,9 @@
typedef struct {
size_t gl_pathc;
char **gl_pathv;
char **gl_pathv;
isc_mem_t *mctx;
void *reserved;
void *reserved;
} glob_t;
#endif

6
lib/isc/include/isc/httpd.h
View File

@@ -32,9 +32,9 @@
* the data cleanup function.
*/
struct isc_httpdurl {
char *url;
char *url;
isc_httpdaction_t *action;
void *action_arg;
void *action_arg;
bool isstatic;
isc_time_t loadtime;
ISC_LINK(isc_httpdurl_t) link;
@@ -47,7 +47,7 @@ struct isc_httpdurl {
isc_result_t
isc_httpdmgr_create(isc_nm_t *nm, isc_mem_t *mctx, isc_sockaddr_t *addr,
isc_httpdclientok_t *client_ok,
isc_httpdclientok_t *client_ok,
isc_httpdondestroy_t *ondestroy, void *cb_arg,
isc_httpdmgr_t **httpdmgrp);

2
lib/isc/include/isc/lex.h
View File

@@ -130,7 +130,7 @@ typedef union {
unsigned long as_ulong;
isc_region_t as_region;
isc_textregion_t as_textregion;
void *as_pointer;
void *as_pointer;
} isc_tokenvalue_t;
typedef struct isc_token {

4
lib/isc/include/isc/log.h
View File

@@ -160,7 +160,7 @@ typedef union isc_logdestination {
* the order of the names.
*/
extern isc_logcategory_t isc_categories[];
extern isc_log_t *isc_lctx;
extern isc_log_t *isc_lctx;
extern isc_logmodule_t isc_modules[];
/*@}*/
@@ -443,7 +443,7 @@ isc_log_createchannel(isc_logconfig_t *lcfg, const char *name,
isc_result_t
isc_log_usechannel(isc_logconfig_t *lcfg, const char *name,
const isc_logcategory_t *category,
const isc_logmodule_t *module);
const isc_logmodule_t *module);
/*%<
* Associate a named logging channel with a category and module that
* will use it.

4
lib/isc/include/isc/netmgr.h
View File

@@ -484,7 +484,7 @@ isc_nm_tcpdnsconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
void
isc_nm_tlsdnsconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
isc_nm_cb_t cb, void *cbarg, unsigned int timeout,
isc_tlsctx_t *sslctx,
isc_tlsctx_t *sslctx,
isc_tlsctx_client_session_cache_t *client_sess_cache);
/*%<
* Establish a DNS client connection via a TCP or TLS connection, bound to
@@ -530,7 +530,7 @@ isc_nm_tlsconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
void
isc_nm_httpconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
const char *uri, bool POST, isc_nm_cb_t cb, void *cbarg,
isc_tlsctx_t *ctx,
isc_tlsctx_t *ctx,
isc_tlsctx_client_session_cache_t *client_sess_cache,
unsigned int timeout);

2
lib/isc/include/isc/quota.h
View File

@@ -48,7 +48,7 @@ typedef void (*isc_quota_cb_func_t)(isc_quota_t *quota, void *data);
struct isc_quota_cb {
int magic;
isc_quota_cb_func_t cb_func;
void *data;
void *data;
ISC_LINK(isc_quota_cb_t) link;
};

14
lib/isc/include/isc/radix.h
View File

@@ -43,7 +43,7 @@
} while (0)
typedef struct isc_prefix {
isc_mem_t *mctx;
isc_mem_t *mctx;
unsigned int family; /* AF_INET | AF_INET6, or AF_UNSPEC for
* "any" */
unsigned int bitlen; /* 0 for "any" */
@@ -86,12 +86,12 @@ typedef void (*isc_radix_processfunc_t)(isc_prefix_t *, void **);
#define ISC_RADIX_FAMILY(p) (((p)->family == AF_INET6) ? RADIX_V6 : RADIX_V4)
typedef struct isc_radix_node {
isc_mem_t *mctx;
isc_mem_t *mctx;
uint32_t bit; /* bit length of the prefix */
isc_prefix_t *prefix; /* who we are in radix tree */
isc_prefix_t *prefix; /* who we are in radix tree */
struct isc_radix_node *l, *r; /* left and right children */
struct isc_radix_node *parent; /* may be used */
void *data[RADIX_FAMILIES]; /* pointers to IPv4
void *data[RADIX_FAMILIES]; /* pointers to IPv4
* and IPV6 data */
int node_num[RADIX_FAMILIES]; /* which node
* this was in
@@ -105,7 +105,7 @@ typedef struct isc_radix_node {
typedef struct isc_radix_tree {
unsigned int magic;
isc_mem_t *mctx;
isc_mem_t *mctx;
isc_radix_node_t *head;
uint32_t maxbits; /* for IP, 32 bit addresses */
int num_active_node; /* for debugging purposes */
@@ -197,9 +197,9 @@ isc_radix_process(isc_radix_tree_t *radix, isc_radix_processfunc_t func);
#define RADIX_WALK(Xhead, Xnode) \
do { \
isc_radix_node_t *Xstack[RADIX_MAXBITS + 1]; \
isc_radix_node_t *Xstack[RADIX_MAXBITS + 1]; \
isc_radix_node_t **Xsp = Xstack; \
isc_radix_node_t *Xrn = (Xhead); \
isc_radix_node_t *Xrn = (Xhead); \
while ((Xnode = Xrn)) { \
if (Xnode->prefix)

2
lib/isc/include/isc/region.h
View File

@@ -24,7 +24,7 @@ struct isc_region {
};
struct isc_textregion {
char *base;
char *base;
unsigned int length;
};

2
lib/isc/include/isc/symtab.h
View File

@@ -88,7 +88,7 @@
***/
/*% Symbol table value. */
typedef union isc_symvalue {
void *as_pointer;
void *as_pointer;
const void *as_cpointer;
int as_integer;
unsigned int as_uinteger;

4
lib/isc/include/isc/thread.h
View File

@@ -32,8 +32,8 @@ extern thread_local size_t isc_tid_v;
ISC_LANG_BEGINDECLS
typedef pthread_t isc_thread_t;
typedef void *isc_threadresult_t;
typedef void *isc_threadarg_t;
typedef void *isc_threadresult_t;
typedef void *isc_threadarg_t;
typedef isc_threadresult_t (*isc_threadfunc_t)(isc_threadarg_t);
void

4
lib/isc/include/isc/tls.h
View File

@@ -222,7 +222,7 @@ isc_tlsctx_enable_dot_server_alpn(isc_tlsctx_t *ctx);
isc_result_t
isc_tlsctx_enable_peer_verification(isc_tlsctx_t *ctx, const bool is_server,
isc_tls_cert_store_t *store,
const char *hostname,
const char *hostname,
bool hostname_ignore_subject);
/*%<
* Enable peer certificate and, optionally, hostname (for client contexts)
@@ -247,7 +247,7 @@ isc_tlsctx_load_client_ca_names(isc_tlsctx_t *ctx, const char *ca_bundle_file);
*/
isc_result_t
isc_tls_cert_store_create(const char *ca_bundle_filename,
isc_tls_cert_store_create(const char *ca_bundle_filename,
isc_tls_cert_store_t **pstore);
/*%<
* Create X509 certificate store. The 'ca_bundle_filename' might be

2
lib/isc/include/isc/util.h
View File

@@ -105,7 +105,7 @@
do { \
union { \
const void *k; \
void *v; \
void *v; \
} _u; \
_u.k = konst; \
var = _u.v; \

4
lib/isccc/include/isccc/ccmsg.h
View File

@@ -46,10 +46,10 @@ typedef struct isccc_ccmsg {
bool length_received;
isc_buffer_t *buffer;
unsigned int maxsize;
isc_mem_t *mctx;
isc_mem_t *mctx;
isc_nmhandle_t *handle;
isc_nm_cb_t cb;
void *cbarg;
void *cbarg;
bool reading;
/* public (read-only) */
isc_result_t result;

2
lib/isccc/include/isccc/sexpr.h
View File

@@ -50,7 +50,7 @@ struct isccc_dottedpair {
struct isccc_sexpr {
unsigned int type;
union {
char *as_string;
char *as_string;
isccc_dottedpair_t as_dottedpair;
isccc_region_t as_region;
} value;

6
lib/isccc/include/isccc/symtab.h
View File

@@ -84,18 +84,18 @@
***/
typedef union isccc_symvalue {
void *as_pointer;
void *as_pointer;
int as_integer;
unsigned int as_uinteger;
} isccc_symvalue_t;
typedef void (*isccc_symtabundefaction_t)(char *key, unsigned int type,
isccc_symvalue_t value,
void *userarg);
void *userarg);
typedef bool (*isccc_symtabforeachaction_t)(char *key, unsigned int type,
isccc_symvalue_t value,
void *userarg);
void *userarg);
typedef enum {
isccc_symexists_reject = 0,

8
lib/isccfg/include/isccfg/cfg.h
View File

@@ -71,7 +71,7 @@ typedef struct cfg_listelt cfg_listelt_t;
* that needs to be interpreted at parsing time, like
* "directory".
*/
typedef isc_result_t (*cfg_parsecallback_t)(const char *clausename,
typedef isc_result_t (*cfg_parsecallback_t)(const char *clausename,
const cfg_obj_t *obj, void *arg);
/***
@@ -580,9 +580,9 @@ cfg_map_nextclause(const cfg_type_t *map, const void **clauses,
typedef isc_result_t(pluginlist_cb_t)(const cfg_obj_t *config,
const cfg_obj_t *obj,
const char *plugin_path,
const char *parameters,
void *callback_data);
const char *plugin_path,
const char *parameters,
void *callback_data);
/*%<
* Function prototype for the callback used with cfg_pluginlist_foreach().
* Called once for each element of the list passed to cfg_pluginlist_foreach().

22
lib/isccfg/include/isccfg/grammar.h
View File

@@ -125,17 +125,17 @@ struct cfg_tuplefielddef {
/*% A configuration object type definition. */
struct cfg_type {
const char *name; /*%< For debugging purposes only */
const char *name; /*%< For debugging purposes only */
cfg_parsefunc_t parse;
cfg_printfunc_t print;
cfg_docfunc_t doc; /*%< Print grammar description */
cfg_rep_t *rep; /*%< Data representation */
const void *of; /*%< Additional data for meta-types */
cfg_rep_t *rep; /*%< Data representation */
const void *of; /*%< Additional data for meta-types */
};
/*% A keyword-type definition, for things like "port <integer>". */
typedef struct {
const char *name;
const char *name;
const cfg_type_t *type;
} keyword_type_t;
@@ -178,7 +178,7 @@ struct cfg_duration {
* A configuration data representation.
*/
struct cfg_rep {
const char *name; /*%< For debugging only */
const char *name; /*%< For debugging only */
cfg_freefunc_t free; /*%< How to free this kind of data. */
};
@@ -196,7 +196,7 @@ struct cfg_obj {
bool boolean;
cfg_map_t map;
cfg_list_t list;
cfg_obj_t **tuple;
cfg_obj_t **tuple;
isc_sockaddr_t sockaddr;
struct {
isc_sockaddr_t sockaddr;
@@ -206,7 +206,7 @@ struct cfg_obj {
cfg_duration_t duration;
} value;
isc_refcount_t references; /*%< reference counter */
const char *file;
const char *file;
unsigned int line;
cfg_parser_t *pctx;
};
@@ -219,9 +219,9 @@ struct cfg_listelt {
/*% The parser object. */
struct cfg_parser {
isc_mem_t *mctx;
isc_log_t *lctx;
isc_lex_t *lexer;
isc_mem_t *mctx;
isc_log_t *lctx;
isc_lex_t *lexer;
unsigned int errors;
unsigned int warnings;
isc_token_t token;
@@ -275,7 +275,7 @@ struct cfg_parser {
isc_refcount_t references;
cfg_parsecallback_t callback;
void *callbackarg;
void *callbackarg;
};
/* Parser context flags */

14
lib/ns/include/ns/client.h
View File

@@ -143,7 +143,7 @@ struct ns_clientmgr {
/* Unlocked. */
unsigned int magic;
isc_mem_t *mctx;
isc_mem_t *mctx;
ns_server_t *sctx;
isc_taskmgr_t *taskmgr;
isc_timermgr_t *timermgr;
@@ -163,16 +163,16 @@ struct ns_clientmgr {
/*% nameserver client structure */
struct ns_client {
unsigned int magic;
ns_clientmgr_t *manager;
ns_clientmgr_t *manager;
ns_clientstate_t state;
int nupdates;
bool nodetach;
unsigned int attributes;
dns_view_t *view;
dns_dispatch_t *dispatch;
isc_nmhandle_t *handle; /* Permanent pointer to handle */
isc_nmhandle_t *sendhandle; /* Waiting for send callback */
isc_nmhandle_t *reqhandle; /* Waiting for request callback
dns_view_t *view;
dns_dispatch_t *dispatch;
isc_nmhandle_t *handle; /* Permanent pointer to handle */
isc_nmhandle_t *sendhandle; /* Waiting for send callback */
isc_nmhandle_t *reqhandle; /* Waiting for request callback
(query, update, notify) */
isc_nmhandle_t *updatehandle; /* Waiting for update callback */
unsigned char *tcpbuf;

4
lib/ns/include/ns/hooks.h
View File

@@ -398,9 +398,9 @@ typedef ns_hookresult_t (*ns_hook_action_t)(void *arg, void *data,
isc_result_t *resultp);
typedef struct ns_hook {
isc_mem_t *mctx;
isc_mem_t *mctx;
ns_hook_action_t action;
void *action_data;
void *action_data;
ISC_LINK(struct ns_hook) link;
} ns_hook_t;

8
lib/ns/include/ns/interfacemgr.h
View File

@@ -75,10 +75,10 @@ struct ns_interface {
isc_sockaddr_t addr; /*%< Address and port. */
unsigned int flags; /*%< Interface flags */
char name[32]; /*%< Null terminated. */
isc_nmsocket_t *udplistensocket;
isc_nmsocket_t *tcplistensocket;
isc_nmsocket_t *http_listensocket;
isc_nmsocket_t *http_secure_listensocket;
isc_nmsocket_t *udplistensocket;
isc_nmsocket_t *tcplistensocket;
isc_nmsocket_t *http_listensocket;
isc_nmsocket_t *http_secure_listensocket;
isc_dscp_t dscp; /*%< "listen-on" DSCP value */
isc_refcount_t ntcpaccepting; /*%< Number of clients
* ready to accept new

10
lib/ns/include/ns/listenlist.h
View File

@@ -41,16 +41,16 @@ typedef struct ns_listenelt ns_listenelt_t;
typedef struct ns_listenlist ns_listenlist_t;
struct ns_listenelt {
isc_mem_t *mctx;
isc_mem_t *mctx;
in_port_t port;
bool is_http;
isc_dscp_t dscp; /* -1 = not set, 0..63 */
dns_acl_t *acl;
isc_tlsctx_t *sslctx;
dns_acl_t *acl;
isc_tlsctx_t *sslctx;
isc_tlsctx_cache_t *sslctx_cache;
char **http_endpoints;
char **http_endpoints;
size_t http_endpoints_number;
isc_quota_t *http_quota;
isc_quota_t *http_quota;
uint32_t max_concurrent_streams;
ISC_LINK(ns_listenelt_t) link;
};

2
lib/ns/include/ns/log.h
View File

@@ -18,7 +18,7 @@
#include <isc/log.h>
#include <isc/types.h>
extern isc_log_t *ns_lctx;
extern isc_log_t *ns_lctx;
extern isc_logcategory_t ns_categories[];
extern isc_logmodule_t ns_modules[];

42
lib/ns/include/ns/query.h
View File

@@ -31,7 +31,7 @@
/*% nameserver database version structure */
typedef struct ns_dbversion {
dns_db_t *db;
dns_db_t *db;
dns_dbversion_t *version;
bool acl_checked;
bool queryok;
@@ -95,9 +95,9 @@ typedef enum {
*/
typedef struct ns_query_recparam {
dns_rdatatype_t qtype;
dns_name_t *qname;
dns_name_t *qname;
dns_fixedname_t fqname;
dns_name_t *qdomain;
dns_name_t *qdomain;
dns_fixedname_t fqdomain;
} ns_query_recparam_t;
@@ -106,35 +106,35 @@ struct ns_query {
unsigned int attributes;
unsigned int restarts;
bool timerset;
dns_name_t *qname;
dns_name_t *origqname;
dns_name_t *qname;
dns_name_t *origqname;
dns_rdatatype_t qtype;
unsigned int dboptions;
unsigned int fetchoptions;
dns_db_t *gluedb;
dns_db_t *authdb;
dns_zone_t *authzone;
dns_db_t *gluedb;
dns_db_t *authdb;
dns_zone_t *authzone;
bool authdbset;
bool isreferral;
isc_mutex_t fetchlock;
ns_hookasync_t *hookactx;
dns_rpz_st_t *rpz_st;
ns_hookasync_t *hookactx;
dns_rpz_st_t *rpz_st;
isc_bufferlist_t namebufs;
ISC_LIST(ns_dbversion_t) activeversions;
ISC_LIST(ns_dbversion_t) freeversions;
dns_rdataset_t *dns64_aaaa;
dns_rdataset_t *dns64_sigaaaa;
bool *dns64_aaaaok;
bool *dns64_aaaaok;
unsigned int dns64_aaaaoklen;
unsigned int dns64_options;
unsigned int dns64_ttl;
struct {
dns_db_t *db;
dns_zone_t *zone;
dns_db_t *db;
dns_zone_t *zone;
dns_dbnode_t *node;
dns_rdatatype_t qtype;
dns_name_t *fname;
dns_name_t *fname;
dns_fixedname_t fixed;
isc_result_t result;
dns_rdataset_t *rdataset;
@@ -215,16 +215,16 @@ struct query_ctx {
dns_fetchevent_t *event; /* recursion event */
dns_db_t *db; /* zone or cache database */
dns_db_t *db; /* zone or cache database */
dns_dbversion_t *version; /* DB version */
dns_dbnode_t *node; /* DB node */
dns_dbnode_t *node; /* DB node */
dns_db_t *zdb; /* zone DB values, saved */
dns_dbnode_t *znode; /* while searching cache */
dns_name_t *zfname; /* for a better answer */
dns_db_t *zdb; /* zone DB values, saved */
dns_dbnode_t *znode; /* while searching cache */
dns_name_t *zfname; /* for a better answer */
dns_dbversion_t *zversion;
dns_rdataset_t *zrdataset;
dns_rdataset_t *zsigrdataset;
dns_rdataset_t *zrdataset;
dns_rdataset_t *zsigrdataset;
dns_rpz_st_t *rpz_st; /* RPZ state */
dns_zone_t *zone; /* zone to search */

6
lib/ns/include/ns/server.h
View File

@@ -70,7 +70,7 @@ typedef isc_result_t (*ns_matchview_t)(
*/
struct ns_server {
unsigned int magic;
isc_mem_t *mctx;
isc_mem_t *mctx;
isc_refcount_t references;
@@ -89,14 +89,14 @@ struct ns_server {
/*% Test options and other configurables */
uint32_t options;
dns_acl_t *blackholeacl;
dns_acl_t *blackholeacl;
uint16_t udpsize;
uint16_t transfer_tcp_message_size;
bool interface_auto;
dns_tkeyctx_t *tkeyctx;
/*% Server id for NSID */
char *server_id;
char *server_id;
ns_hostnamecb_t gethostname;
/*% Fuzzer callback */

4
lib/ns/include/ns/sortlist.h
View File

@@ -24,7 +24,7 @@
* Type for callback functions that rank addresses.
*/
typedef int (*dns_addressorderfunc_t)(const isc_netaddr_t *address,
const void *arg);
const void *arg);
/*%
* Return value type for setup_sortlist.
@@ -69,7 +69,7 @@ ns_sortlist_addrorder2(const isc_netaddr_t *addr, const void *arg);
void
ns_sortlist_byaddrsetup(dns_acl_t *sortlist_acl, dns_aclenv_t *env,
isc_netaddr_t *client_addr,
isc_netaddr_t *client_addr,
dns_addressorderfunc_t *orderp, void **argp);
/*%<
* Find the sortlist statement in 'acl' that applies to 'clientaddr', if any.

12
tests/dns/private_test.c
View File

@@ -88,14 +88,10 @@ make_signing(signing_testcase_t *testcase, dns_rdata_t *private,
buf[2] = (testcase->keyid & 0xff);
buf[3] = testcase->remove;
buf[4] = testcase->complete;
private
->data = buf;
private
->length = len;
private
->type = privatetype;
private
->rdclass = dns_rdataclass_in;
private->data = buf;
private->length = len;
private->type = privatetype;
private->rdclass = dns_rdataclass_in;
}
static void

6
tests/include/tests/isc.h
View File

@@ -42,12 +42,12 @@
goto cleanup; \
} while (0)
extern isc_mem_t *mctx;
extern isc_nm_t *netmgr;
extern isc_mem_t *mctx;
extern isc_nm_t *netmgr;
extern isc_taskmgr_t *taskmgr;
extern isc_timermgr_t *timermgr;
extern unsigned int workers;
extern isc_task_t *maintask;
extern isc_task_t *maintask;
#define isc_test_nap(ms) uv_sleep(ms)

10
tests/include/tests/ns.h
View File

@@ -54,13 +54,13 @@ typedef struct ns_test_id {
} while (0)
extern dns_dispatchmgr_t *dispatchmgr;
extern ns_clientmgr_t *clientmgr;
extern ns_clientmgr_t *clientmgr;
extern ns_interfacemgr_t *interfacemgr;
extern ns_server_t *sctx;
extern ns_server_t *sctx;
#ifdef NETMGR_TRACE
#define FLARG \
, const char *file __attribute__((unused)), \
, const char *file __attribute__((unused)), \
unsigned int line __attribute__((unused)), \
const char *func __attribute__((unused))
#else
@@ -102,7 +102,7 @@ ns_test_getclient(ns_interface_t *ifp0, bool tcp, ns_client_t **clientp);
* Structure containing parameters for ns_test_qctx_create().
*/
typedef struct ns_test_qctx_create_params {
const char *qname;
const char *qname;
dns_rdatatype_t qtype;
unsigned int qflags;
bool with_cache;
@@ -117,7 +117,7 @@ typedef struct ns_test_qctx_create_params {
*/
isc_result_t
ns_test_qctx_create(const ns_test_qctx_create_params_t *params,
query_ctx_t **qctxp);
query_ctx_t **qctxp);
/*%
* Destroy a query context created by ns_test_qctx_create().