diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h index 7c5c7ca61d..45cb118c36 100644 --- a/bin/named/include/named/globals.h +++ b/bin/named/include/named/globals.h @@ -45,10 +45,10 @@ #define NAMED_RUN_PID_DIR 1 #endif /* ifndef NAMED_RUN_PID_DIR */ -EXTERN isc_mem_t *named_g_mctx INIT(NULL); -EXTERN unsigned int named_g_cpus INIT(0); -EXTERN unsigned int named_g_udpdisp INIT(0); -EXTERN isc_taskmgr_t *named_g_taskmgr INIT(NULL); +EXTERN isc_mem_t *named_g_mctx INIT(NULL); +EXTERN unsigned int named_g_cpus INIT(0); +EXTERN unsigned int named_g_udpdisp INIT(0); +EXTERN isc_taskmgr_t *named_g_taskmgr INIT(NULL); EXTERN dns_dispatchmgr_t *named_g_dispatchmgr INIT(NULL); EXTERN unsigned int named_g_cpus_detected INIT(1); @@ -60,22 +60,22 @@ EXTERN bool named_g_run_done INIT(false); * for really short timers, another for client timers, and one * for zone timers. */ -EXTERN isc_timermgr_t *named_g_timermgr INIT(NULL); +EXTERN isc_timermgr_t *named_g_timermgr INIT(NULL); EXTERN isc_socketmgr_t *named_g_socketmgr INIT(NULL); -EXTERN isc_nm_t *named_g_netmgr INIT(NULL); -EXTERN cfg_parser_t *named_g_parser INIT(NULL); -EXTERN cfg_parser_t *named_g_addparser INIT(NULL); -EXTERN const char *named_g_version INIT(PACKAGE_VERSION); -EXTERN const char *named_g_product INIT(PACKAGE_NAME); -EXTERN const char *named_g_description INIT(PACKAGE_DESCRIPTION); -EXTERN const char *named_g_srcid INIT(PACKAGE_SRCID); -EXTERN const char *named_g_configargs INIT(PACKAGE_CONFIGARGS); -EXTERN const char *named_g_builder INIT(PACKAGE_BUILDER); -EXTERN in_port_t named_g_port INIT(0); -EXTERN in_port_t named_g_tlsport INIT(0); -EXTERN in_port_t named_g_httpsport INIT(0); -EXTERN in_port_t named_g_httpport INIT(0); -EXTERN isc_dscp_t named_g_dscp INIT(-1); +EXTERN isc_nm_t *named_g_netmgr INIT(NULL); +EXTERN cfg_parser_t *named_g_parser INIT(NULL); +EXTERN cfg_parser_t *named_g_addparser INIT(NULL); +EXTERN const char *named_g_version INIT(PACKAGE_VERSION); +EXTERN const char *named_g_product INIT(PACKAGE_NAME); +EXTERN const char *named_g_description INIT(PACKAGE_DESCRIPTION); +EXTERN const char *named_g_srcid INIT(PACKAGE_SRCID); +EXTERN const char *named_g_configargs INIT(PACKAGE_CONFIGARGS); +EXTERN const char *named_g_builder INIT(PACKAGE_BUILDER); +EXTERN in_port_t named_g_port INIT(0); +EXTERN in_port_t named_g_tlsport INIT(0); +EXTERN in_port_t named_g_httpsport INIT(0); +EXTERN in_port_t named_g_httpport INIT(0); +EXTERN isc_dscp_t named_g_dscp INIT(-1); EXTERN in_port_t named_g_http_listener_clients INIT(0); EXTERN in_port_t named_g_http_streams_per_conn INIT(0); @@ -85,23 +85,23 @@ EXTERN named_server_t *named_g_server INIT(NULL); /* * Logging. */ -EXTERN isc_log_t *named_g_lctx INIT(NULL); +EXTERN isc_log_t *named_g_lctx INIT(NULL); EXTERN isc_logcategory_t *named_g_categories INIT(NULL); -EXTERN isc_logmodule_t *named_g_modules INIT(NULL); -EXTERN unsigned int named_g_debuglevel INIT(0); +EXTERN isc_logmodule_t *named_g_modules INIT(NULL); +EXTERN unsigned int named_g_debuglevel INIT(0); /* * Current configuration information. */ -EXTERN cfg_obj_t *named_g_config INIT(NULL); +EXTERN cfg_obj_t *named_g_config INIT(NULL); EXTERN const cfg_obj_t *named_g_defaults INIT(NULL); EXTERN const char *named_g_conffile INIT(NAMED_SYSCONFDIR "/named.conf"); EXTERN const char *named_g_defaultbindkeys INIT(NAMED_SYSCONFDIR "/bind.keys"); EXTERN const char *named_g_keyfile INIT(NAMED_SYSCONFDIR "/rndc.key"); -EXTERN dns_tsigkey_t *named_g_sessionkey INIT(NULL); -EXTERN dns_name_t named_g_sessionkeyname; -EXTERN bool named_g_conffileset INIT(false); +EXTERN dns_tsigkey_t *named_g_sessionkey INIT(NULL); +EXTERN dns_name_t named_g_sessionkeyname; +EXTERN bool named_g_conffileset INIT(false); EXTERN cfg_aclconfctx_t *named_g_aclconfctx INIT(NULL); /* diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h index 1628077677..99bcc6fe00 100644 --- a/bin/named/include/named/server.h +++ b/bin/named/include/named/server.h @@ -46,7 +46,7 @@ */ struct named_server { unsigned int magic; - isc_mem_t * mctx; + isc_mem_t *mctx; ns_server_t *sctx; @@ -67,12 +67,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; @@ -92,15 +92,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; diff --git a/contrib/dlz/modules/include/dlz_dbi.h b/contrib/dlz/modules/include/dlz_dbi.h index 735359c873..c4ce143718 100644 --- a/contrib/dlz/modules/include/dlz_dbi.h +++ b/contrib/dlz/modules/include/dlz_dbi.h @@ -61,7 +61,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; @@ -75,17 +75,17 @@ struct query_segment { * make sure no two threads try to use the same DBI at a time. */ struct dbinstance { - void * dbconn; + void *dbconn; query_list_t *allnodes_q; query_list_t *allowxfr_q; query_list_t *authority_q; query_list_t *findzone_q; query_list_t *lookup_q; query_list_t *countzone_q; - char * query_buf; - char * zone; - char * record; - char * client; + char *query_buf; + char *zone; + char *record; + char *client; dlz_mutex_t lock; DLZ_LINK(dbinstance_t) link; }; diff --git a/contrib/dlz/modules/include/dlz_minimal.h b/contrib/dlz/modules/include/dlz_minimal.h index f715b9feab..4259039bd4 100644 --- a/contrib/dlz/modules/include/dlz_minimal.h +++ b/contrib/dlz/modules/include/dlz_minimal.h @@ -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; \ @@ -105,21 +105,21 @@ typedef struct isc_sockaddr { struct sockaddr_un sunix; } type; unsigned int length; - void * link; + void *link; } isc_sockaddr_t; #define DNS_CLIENTINFO_VERSION 2 typedef struct dns_clientinfo { uint16_t version; - void * data; - void * dbversion; + void *data; + void *dbversion; } 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 diff --git a/lib/dns/include/dns/acl.h b/lib/dns/include/dns/acl.h index adbead90f5..a5f2e34e43 100644 --- a/lib/dns/include/dns/acl.h +++ b/lib/dns/include/dns/acl.h @@ -75,23 +75,23 @@ 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 */ }; struct dns_aclenv { unsigned int magic; - isc_mem_t * mctx; + isc_mem_t *mctx; isc_refcount_t references; - dns_acl_t * localhost; - dns_acl_t * localnets; + dns_acl_t *localhost; + dns_acl_t *localnets; bool match_mapped; #if defined(HAVE_GEOIP2) dns_geoip_databases_t *geoip; diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h index 44abefa0ae..635569f7a3 100644 --- a/lib/dns/include/dns/adb.h +++ b/lib/dns/include/dns/adb.h @@ -118,7 +118,7 @@ struct dns_adbfind { int name_bucket; 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; }; diff --git a/lib/dns/include/dns/callbacks.h b/lib/dns/include/dns/callbacks.h index b66d73b5a3..5d9fbcf39b 100644 --- a/lib/dns/include/dns/callbacks.h +++ b/lib/dns/include/dns/callbacks.h @@ -45,7 +45,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. diff --git a/lib/dns/include/dns/catz.h b/lib/dns/include/dns/catz.h index 1c979d5815..3e2a505267 100644 --- a/lib/dns/include/dns/catz.h +++ b/lib/dns/include/dns/catz.h @@ -321,15 +321,15 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry, /* Methods provided by named to dynamically modify the member zones */ /* 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_catz_zone_t *origin, + 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 diff --git a/lib/dns/include/dns/clientinfo.h b/lib/dns/include/dns/clientinfo.h index fd72d9453d..4061506527 100644 --- a/lib/dns/include/dns/clientinfo.h +++ b/lib/dns/include/dns/clientinfo.h @@ -50,12 +50,12 @@ ISC_LANG_BEGINDECLS #define DNS_CLIENTINFO_VERSION 2 typedef struct dns_clientinfo { uint16_t version; - void * data; - void * dbversion; + void *data; + void *dbversion; } 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 @@ -70,7 +70,7 @@ typedef struct dns_clientinfomethods { ***** Methods *****/ void -dns_clientinfomethods_init(dns_clientinfomethods_t * methods, +dns_clientinfomethods_init(dns_clientinfomethods_t *methods, dns_clientinfo_sourceip_t sourceip); void diff --git a/lib/dns/include/dns/compress.h b/lib/dns/include/dns/compress.h index 9c0ea5695a..dc17e14360 100644 --- a/lib/dns/include/dns/compress.h +++ b/lib/dns/include/dns/compress.h @@ -76,7 +76,7 @@ struct dns_compress { /*% Preallocated nodes for the table. */ dns_compressnode_t initialnodes[DNS_COMPRESS_INITIALNODES]; uint16_t count; /*%< Number of nodes. */ - isc_mem_t * mctx; /*%< Memory context. */ + isc_mem_t *mctx; /*%< Memory context. */ }; typedef enum { diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h index 29d3daebd2..75b50ca30a 100644 --- a/lib/dns/include/dns/db.h +++ b/lib/dns/include/dns/db.h @@ -76,11 +76,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); @@ -99,7 +99,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, @@ -117,7 +117,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, @@ -127,9 +127,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, @@ -142,12 +142,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, @@ -163,16 +163,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 (*adjusthashsize)(dns_db_t *db, size_t size); } 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; }; diff --git a/lib/dns/include/dns/dbiterator.h b/lib/dns/include/dns/dbiterator.h index bac1b8806b..7750a2f251 100644 --- a/lib/dns/include/dns/dbiterator.h +++ b/lib/dns/include/dns/dbiterator.h @@ -96,7 +96,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; }; diff --git a/lib/dns/include/dns/diff.h b/lib/dns/include/dns/diff.h index b3ae0054bd..39fb1a9c05 100644 --- a/lib/dns/include/dns/diff.h +++ b/lib/dns/include/dns/diff.h @@ -73,7 +73,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; @@ -94,7 +94,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; }; diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h index 572fa95d19..a53e66e746 100644 --- a/lib/dns/include/dns/dispatch.h +++ b/lib/dns/include/dns/dispatch.h @@ -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; diff --git a/lib/dns/include/dns/dlz.h b/lib/dns/include/dns/dlz.h index e1020fab4e..549b74415f 100644 --- a/lib/dns/include/dns/dlz.h +++ b/lib/dns/include/dns/dlz.h @@ -97,11 +97,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 @@ -135,12 +135,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 @@ -167,7 +167,7 @@ typedef isc_result_t (*dns_dlzfindzone_t)(void *driverarg, void *dbdata, */ typedef isc_result_t (*dns_dlzconfigure_t)(void *driverarg, void *dbdata, - dns_view_t * view, + dns_view_t *view, dns_dlzdb_t *dlzdb); /*%< * Method prototype. Drivers implementing the DLZ interface may @@ -176,8 +176,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); @@ -199,10 +199,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; }; @@ -212,12 +212,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; }; diff --git a/lib/dns/include/dns/dlz_dlopen.h b/lib/dns/include/dns/dlz_dlopen.h index fb2f2c5af1..1066156e22 100644 --- a/lib/dns/include/dns/dlz_dlopen.h +++ b/lib/dns/include/dns/dlz_dlopen.h @@ -56,7 +56,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 diff --git a/lib/dns/include/dns/dnsrps.h b/lib/dns/include/dns/dnsrps.h index 6381579f0d..a9af86f3bb 100644 --- a/lib/dns/include/dns/dnsrps.h +++ b/lib/dns/include/dns/dnsrps.h @@ -49,9 +49,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; diff --git a/lib/dns/include/dns/dyndb.h b/lib/dns/include/dns/dyndb.h index 0b2625403c..3291c1e379 100644 --- a/lib/dns/include/dns/dyndb.h +++ b/lib/dns/include/dns/dyndb.h @@ -33,14 +33,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; - dns_zonemgr_t * zmgr; - isc_task_t * task; + const void *hashinit; + isc_mem_t *mctx; + isc_log_t *lctx; + dns_view_t *view; + dns_zonemgr_t *zmgr; + isc_task_t *task; isc_timermgr_t *timermgr; - const bool * refvar; + const bool *refvar; }; #define DNS_DYNDBCTX_MAGIC ISC_MAGIC('D', 'd', 'b', 'c') diff --git a/lib/dns/include/dns/geoip.h b/lib/dns/include/dns/geoip.h index 14af51450a..45c9b9ea79 100644 --- a/lib/dns/include/dns/geoip.h +++ b/lib/dns/include/dns/geoip.h @@ -79,7 +79,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; @@ -101,9 +101,9 @@ struct dns_geoip_databases { ISC_LANG_BEGINDECLS bool -dns_geoip_match(const isc_netaddr_t * reqaddr, +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 diff --git a/lib/dns/include/dns/ipkeylist.h b/lib/dns/include/dns/ipkeylist.h index 2be60c35b6..de2010d0a8 100644 --- a/lib/dns/include/dns/ipkeylist.h +++ b/lib/dns/include/dns/ipkeylist.h @@ -24,10 +24,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; }; diff --git a/lib/dns/include/dns/iptable.h b/lib/dns/include/dns/iptable.h index 818b248773..86255e6bdc 100644 --- a/lib/dns/include/dns/iptable.h +++ b/lib/dns/include/dns/iptable.h @@ -23,7 +23,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; diff --git a/lib/dns/include/dns/kasp.h b/lib/dns/include/dns/kasp.h index d39ad80e79..84fed27c68 100644 --- a/lib/dns/include/dns/kasp.h +++ b/lib/dns/include/dns/kasp.h @@ -60,8 +60,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; diff --git a/lib/dns/include/dns/librpz.h b/lib/dns/include/dns/librpz.h index 47793c63d6..7ae95f3133 100644 --- a/lib/dns/include/dns/librpz.h +++ b/lib/dns/include/dns/librpz.h @@ -373,7 +373,7 @@ typedef struct librpz_client librpz_client_t; * @param mutex: pointer to the lock for the client handle * @param log_ctx: NULL or resolver's context log messages */ -typedef librpz_clist_t *(librpz_clist_create_t)(librpz_emsg_t * emsg, +typedef librpz_clist_t *(librpz_clist_create_t)(librpz_emsg_t *emsg, librpz_mutex_t *lock, librpz_mutex_t *unlock, librpz_mutex_t *mutex_destroy, @@ -394,9 +394,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) @@ -493,9 +493,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) /** @@ -508,9 +508,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) /** @@ -766,7 +766,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) @@ -789,57 +789,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; - librpz_set_log_t * set_log; - librpz_vpemsg_t * vpemsg; - librpz_pemsg_t * pemsg; - librpz_vlog_t * vlog; - librpz_log_t * log; + 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_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_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_rsp_soa_t * rsp_soa; - 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_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_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_rsp_soa_t *rsp_soa; + 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_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_0_t; extern librpz_0_t librpz_def_0; @@ -851,7 +851,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 @@ -865,7 +865,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'; diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h index ceeadb0082..9efd19d7dc 100644 --- a/lib/dns/include/dns/log.h +++ b/lib/dns/include/dns/log.h @@ -18,7 +18,7 @@ #include #include -extern isc_log_t * dns_lctx; +extern isc_log_t *dns_lctx; extern isc_logcategory_t dns_categories[]; extern isc_logmodule_t dns_modules[]; diff --git a/lib/dns/include/dns/lookup.h b/lib/dns/include/dns/lookup.h index 1ab7db3524..618c1b1791 100644 --- a/lib/dns/include/dns/lookup.h +++ b/lib/dns/include/dns/lookup.h @@ -57,11 +57,11 @@ ISC_LANG_BEGINDECLS typedef struct dns_lookupevent { ISC_EVENT_COMMON(struct dns_lookupevent); isc_result_t result; - dns_name_t * name; + dns_name_t *name; dns_rdataset_t *rdataset; dns_rdataset_t *sigrdataset; - dns_db_t * db; - dns_dbnode_t * node; + dns_db_t *db; + dns_dbnode_t *node; } dns_lookupevent_t; isc_result_t diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h index a0da63b693..40aa6a4200 100644 --- a/lib/dns/include/dns/masterdump.h +++ b/lib/dns/include/dns/masterdump.h @@ -242,7 +242,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); @@ -308,8 +308,8 @@ 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_master_rdatasettotext(const dns_name_t *owner_name, + dns_rdataset_t *rdataset, const dns_master_style_t *style, dns_indent_t *indent, isc_buffer_t *target); /*%< @@ -325,15 +325,15 @@ 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_master_questiontotext(const dns_name_t *owner_name, + 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, dns_dbversion_t *version, dns_dbnode_t *node, - const dns_name_t * name, + const dns_name_t *name, const dns_master_style_t *style, FILE *f); isc_result_t @@ -345,7 +345,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, diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h index 2d15c481c9..43528dea82 100644 --- a/lib/dns/include/dns/message.h +++ b/lib/dns/include/dns/message.h @@ -194,8 +194,8 @@ typedef int dns_messagetextflag_t; typedef struct dns_msgblock dns_msgblock_t; struct dns_sortlist_arg { - dns_aclenv_t * env; - const dns_acl_t * acl; + dns_aclenv_t *env; + const dns_acl_t *acl; const dns_aclelement_t *element; }; @@ -215,7 +215,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; @@ -241,10 +241,10 @@ struct dns_message { uint16_t padding; unsigned int padding_off; - isc_buffer_t * buffer; + isc_buffer_t *buffer; dns_compress_t *cctx; - isc_mem_t * mctx; + isc_mem_t *mctx; isc_mempool_t *namepool; isc_mempool_t *rdspool; @@ -263,14 +263,14 @@ struct dns_message { dns_name_t *tsigname; /* Owner name of TSIG, if any * */ dns_rdataset_t *querytsig; - dns_tsigkey_t * tsigkey; - dst_context_t * tsigctx; + dns_tsigkey_t *tsigkey; + dst_context_t *tsigctx; int sigstart; int timeadjust; 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; @@ -368,7 +368,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 diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h index 1ffafcf558..326bf76d76 100644 --- a/lib/dns/include/dns/name.h +++ b/lib/dns/include/dns/name.h @@ -107,7 +107,7 @@ struct dns_name { unsigned int labels; unsigned int attributes; unsigned char *offsets; - isc_buffer_t * buffer; + isc_buffer_t *buffer; ISC_LINK(dns_name_t) link; ISC_LIST(dns_rdataset_t) list; }; @@ -1361,9 +1361,9 @@ ISC_LANG_ENDDECLS #define DNS_NAME_SPLIT(n, l, p, s) \ do { \ - dns_name_t * _n = (n); \ - dns_name_t * _p = (p); \ - dns_name_t * _s = (s); \ + dns_name_t *_n = (n); \ + dns_name_t *_p = (p); \ + dns_name_t *_s = (s); \ unsigned int _l = (l); \ if (_p != NULL) \ dns_name_getlabelsequence(_n, 0, _n->labels - _l, _p); \ diff --git a/lib/dns/include/dns/nsec3.h b/lib/dns/include/dns/nsec3.h index 0cbcb51108..bfcc81c050 100644 --- a/lib/dns/include/dns/nsec3.h +++ b/lib/dns/include/dns/nsec3.h @@ -107,7 +107,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); @@ -154,7 +154,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 @@ -164,7 +164,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. diff --git a/lib/dns/include/dns/nta.h b/lib/dns/include/dns/nta.h index c07d8cd686..df5bf47130 100644 --- a/lib/dns/include/dns/nta.h +++ b/lib/dns/include/dns/nta.h @@ -45,11 +45,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_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. */ diff --git a/lib/dns/include/dns/peer.h b/lib/dns/include/dns/peer.h index 4fbf6facdc..652afc02af 100644 --- a/lib/dns/include/dns/peer.h +++ b/lib/dns/include/dns/peer.h @@ -163,7 +163,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 diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h index 098593240c..aa2b50b80c 100644 --- a/lib/dns/include/dns/rbt.h +++ b/lib/dns/include/dns/rbt.h @@ -152,8 +152,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); @@ -709,7 +709,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. diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h index 245b69b29c..d842b81543 100644 --- a/lib/dns/include/dns/rdata.h +++ b/lib/dns/include/dns/rdata.h @@ -108,7 +108,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; diff --git a/lib/dns/include/dns/rdatalist.h b/lib/dns/include/dns/rdatalist.h index 3266754d4c..9dc9a8db6f 100644 --- a/lib/dns/include/dns/rdatalist.h +++ b/lib/dns/include/dns/rdatalist.h @@ -96,7 +96,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'. diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h index f5a4f2be35..d8c69fb00a 100644 --- a/lib/dns/include/dns/rdataset.h +++ b/lib/dns/include/dns/rdataset.h @@ -68,11 +68,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); @@ -81,7 +81,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; @@ -135,13 +135,13 @@ 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; - const void * private6; - const void * private7; + void *private5; + const void *private6; + const void *private7; /*@}*/ }; @@ -398,7 +398,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, @@ -414,7 +414,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, @@ -438,8 +438,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 diff --git a/lib/dns/include/dns/rdatasetiter.h b/lib/dns/include/dns/rdatasetiter.h index adf0259fdc..8705dfc4c2 100644 --- a/lib/dns/include/dns/rdatasetiter.h +++ b/lib/dns/include/dns/rdatasetiter.h @@ -88,9 +88,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; }; @@ -143,7 +143,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. * diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h index 350bdf0ac2..918bddf928 100644 --- a/lib/dns/include/dns/resolver.h +++ b/lib/dns/include/dns/resolver.h @@ -67,15 +67,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_dbnode_t * node; - dns_rdataset_t * rdataset; - dns_rdataset_t * sigrdataset; + dns_db_t *db; + dns_dbnode_t *node; + 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; @@ -287,8 +287,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, @@ -497,7 +497,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. @@ -507,7 +507,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); /*%< diff --git a/lib/dns/include/dns/rpz.h b/lib/dns/include/dns/rpz.h index cf89ae115e..a0a59390a1 100644 --- a/lib/dns/include/dns/rpz.h +++ b/lib/dns/include/dns/rpz.h @@ -145,20 +145,20 @@ 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/waiting */ bool updaterunning; /* there is an update running */ - 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 */ dns_dbiterator_t *updbit; /* iterator to use when updating */ - isc_ht_t * newnodes; /* entries in zone being updated */ + isc_ht_t *newnodes; /* entries in zone being updated */ bool db_registered; /* is the notify event * registered? */ bool addsoa; /* add soa to the additional section */ @@ -214,7 +214,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]; /* @@ -250,10 +250,10 @@ struct dns_rpz_zones { */ dns_rpz_triggers_t total_triggers; - isc_mem_t * mctx; - isc_taskmgr_t * taskmgr; + 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; /* @@ -266,12 +266,12 @@ 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 */ - char * rps_cstr; + char *rps_cstr; size_t rps_cstr_size; struct librpz_client *rps_client; }; @@ -294,23 +294,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; @@ -324,9 +324,9 @@ typedef struct { isc_result_t result; bool is_zone; bool authoritative; - dns_zone_t * zone; - dns_db_t * db; - dns_dbnode_t * node; + dns_zone_t *zone; + dns_db_t *db; + dns_dbnode_t *node; dns_rdataset_t *rdataset; dns_rdataset_t *sigrdataset; dns_rdatatype_t qtype; @@ -352,9 +352,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; diff --git a/lib/dns/include/dns/rriterator.h b/lib/dns/include/dns/rriterator.h index ad4b98dcae..2adc67c568 100644 --- a/lib/dns/include/dns/rriterator.h +++ b/lib/dns/include/dns/rriterator.h @@ -54,11 +54,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; diff --git a/lib/dns/include/dns/rrl.h b/lib/dns/include/dns/rrl.h index c1ebe44353..a98649801c 100644 --- a/lib/dns/include/dns/rrl.h +++ b/lib/dns/include/dns/rrl.h @@ -197,7 +197,7 @@ struct dns_rrl_rate { typedef struct dns_rrl dns_rrl_t; struct dns_rrl { isc_mutex_t lock; - isc_mem_t * mctx; + isc_mem_t *mctx; bool log_only; dns_rrl_rate_t responses_per_second; diff --git a/lib/dns/include/dns/sdb.h b/lib/dns/include/dns/sdb.h index 1d4210d5dc..7d972ff300 100644 --- a/lib/dns/include/dns/sdb.h +++ b/lib/dns/include/dns/sdb.h @@ -52,14 +52,14 @@ 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, - dns_sdblookup_t * lookup, + 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, - dns_sdblookup_t * lookup, +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); diff --git a/lib/dns/include/dns/sdlz.h b/lib/dns/include/dns/sdlz.h index 115d5dc1d9..f4278b3ede 100644 --- a/lib/dns/include/dns/sdlz.h +++ b/lib/dns/include/dns/sdlz.h @@ -146,9 +146,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 @@ -178,7 +178,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); @@ -221,7 +221,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); /*%< diff --git a/lib/dns/include/dns/tkey.h b/lib/dns/include/dns/tkey.h index 6170d37338..11d758ec44 100644 --- a/lib/dns/include/dns/tkey.h +++ b/lib/dns/include/dns/tkey.h @@ -34,11 +34,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 diff --git a/lib/dns/include/dns/transport.h b/lib/dns/include/dns/transport.h index c4a0e945d7..63526fc8e3 100644 --- a/lib/dns/include/dns/transport.h +++ b/lib/dns/include/dns/transport.h @@ -119,7 +119,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. diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h index a79cd5e707..443736a857 100644 --- a/lib/dns/include/dns/tsig.h +++ b/lib/dns/include/dns/tsig.h @@ -53,10 +53,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. @@ -70,11 +70,11 @@ 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 */ - dns_name_t * creator; /*%< name that created secret */ + 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 */ isc_stdtime_t expire; /*%< end of validity period */ diff --git a/lib/dns/include/dns/validator.h b/lib/dns/include/dns/validator.h index 1c81efd3a2..4744014598 100644 --- a/lib/dns/include/dns/validator.h +++ b/lib/dns/include/dns/validator.h @@ -76,7 +76,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. @@ -118,24 +118,24 @@ struct dns_validator { /* Unlocked. */ unsigned int magic; isc_mutex_t lock; - dns_view_t * view; + dns_view_t *view; /* Locked by lock. */ 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; + 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; diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h index 5e777229e8..519521c33c 100644 --- a/lib/dns/include/dns/view.h +++ b/lib/dns/include/dns/view.h @@ -82,16 +82,16 @@ ISC_LANG_BEGINDECLS struct dns_view { /* Unlocked. */ unsigned int magic; - isc_mem_t * mctx; + isc_mem_t *mctx; dns_rdataclass_t rdclass; - char * name; - dns_zt_t * zonetable; - dns_resolver_t * resolver; - dns_adb_t * adb; + char *name; + dns_zt_t *zonetable; + dns_resolver_t *resolver; + dns_adb_t *adb; dns_requestmgr_t *requestmgr; - dns_cache_t * cache; - dns_db_t * cachedb; - dns_db_t * hints; + dns_cache_t *cache; + dns_db_t *cachedb; + dns_db_t *hints; /* * security roots and negative trust anchors. @@ -102,7 +102,7 @@ struct dns_view { isc_mutex_t lock; bool frozen; - isc_task_t * task; + isc_task_t *task; isc_event_t resevent; isc_event_t adbevent; isc_event_t reqevent; @@ -113,11 +113,11 @@ struct dns_view { /* Configurable data. */ 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_tsig_keyring_t *statickeys; + dns_tsig_keyring_t *dynamickeys; + dns_peerlist_t *peers; + dns_order_t *order; + dns_fwdtable_t *fwdtable; bool recursion; bool qminimization; bool qmin_strict; @@ -132,24 +132,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; @@ -159,16 +159,16 @@ struct dns_view { dns_ttl_t minncachettl; uint32_t nta_lifetime; uint32_t nta_recheck; - char * nta_file; + char *nta_file; dns_ttl_t prefetch_trigger; dns_ttl_t prefetch_eligible; in_port_t dstport; - dns_aclenv_t * aclenv; + 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; @@ -178,16 +178,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, @@ -220,19 +220,19 @@ 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; unsigned char secret[32]; /* Client secret */ unsigned int v6bias; - dns_dtenv_t * dtenv; /* Dnstap environment */ + dns_dtenv_t *dtenv; /* Dnstap environment */ dns_dtmsgtype_t dttypes; /* Dnstap message types * to log */ diff --git a/lib/isc/include/isc/buffer.h b/lib/isc/include/isc/buffer.h index 4072f14432..f85fd9db90 100644 --- a/lib/isc/include/isc/buffer.h +++ b/lib/isc/include/isc/buffer.h @@ -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); \ diff --git a/lib/isc/include/isc/dir.h b/lib/isc/include/isc/dir.h index 2b3bf34fc2..70561b180a 100644 --- a/lib/isc/include/isc/dir.h +++ b/lib/isc/include/isc/dir.h @@ -40,7 +40,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 diff --git a/lib/isc/include/isc/event.h b/lib/isc/include/isc/event.h index a28afbbaa5..494272194d 100644 --- a/lib/isc/include/isc/event.h +++ b/lib/isc/include/isc/event.h @@ -26,13 +26,13 @@ typedef void (*isc_eventdestructor_t)(isc_event_t *); #define ISC_EVENT_COMMON(ltype) \ size_t ev_size; \ unsigned int ev_attributes; \ - void * ev_tag; \ + void *ev_tag; \ isc_eventtype_t ev_type; \ isc_taskaction_t ev_action; \ - void * ev_arg; \ - void * ev_sender; \ + void *ev_arg; \ + void *ev_sender; \ isc_eventdestructor_t ev_destroy; \ - void * ev_destroy_arg; \ + void *ev_destroy_arg; \ ISC_LINK(ltype) ev_link; \ ISC_LINK(ltype) ev_ratelink diff --git a/lib/isc/include/isc/glob.h b/lib/isc/include/isc/glob.h index 56ecfdaf78..a1847a6a0b 100644 --- a/lib/isc/include/isc/glob.h +++ b/lib/isc/include/isc/glob.h @@ -24,9 +24,9 @@ typedef struct { size_t gl_pathc; - char ** gl_pathv; + char **gl_pathv; isc_mem_t *mctx; - void * reserved; + void *reserved; } glob_t; #endif diff --git a/lib/isc/include/isc/httpd.h b/lib/isc/include/isc/httpd.h index 6da2f29b6b..605b9c4d3b 100644 --- a/lib/isc/include/isc/httpd.h +++ b/lib/isc/include/isc/httpd.h @@ -31,9 +31,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; @@ -46,7 +46,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); diff --git a/lib/isc/include/isc/lex.h b/lib/isc/include/isc/lex.h index 84d4f42486..b179d5052e 100644 --- a/lib/isc/include/isc/lex.h +++ b/lib/isc/include/isc/lex.h @@ -129,7 +129,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 { diff --git a/lib/isc/include/isc/log.h b/lib/isc/include/isc/log.h index 1f9e627570..75bde1af89 100644 --- a/lib/isc/include/isc/log.h +++ b/lib/isc/include/isc/log.h @@ -100,7 +100,7 @@ typedef enum { * isc_log_registercategories. */ struct isc_logcategory { - const char * name; + const char *name; unsigned int id; }; @@ -108,7 +108,7 @@ struct isc_logcategory { * Similar to isc_logcategory, but for all the modules a library defines. */ struct isc_logmodule { - const char * name; + const char *name; unsigned int id; }; @@ -159,7 +159,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[]; /*@}*/ @@ -441,7 +441,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. diff --git a/lib/isc/include/isc/netmgr.h b/lib/isc/include/isc/netmgr.h index ceefd5e20f..980bff2a14 100644 --- a/lib/isc/include/isc/netmgr.h +++ b/lib/isc/include/isc/netmgr.h @@ -544,7 +544,7 @@ isc_nm_http_endpoints_add(isc_nm_http_endpoints_t *restrict eps, */ void -isc_nm_http_endpoints_attach(isc_nm_http_endpoints_t * source, +isc_nm_http_endpoints_attach(isc_nm_http_endpoints_t *source, isc_nm_http_endpoints_t **targetp); /*%< * Attaches to an HTTP endpoints set object. diff --git a/lib/isc/include/isc/quota.h b/lib/isc/include/isc/quota.h index 6498c6e956..c3b8dc8c66 100644 --- a/lib/isc/include/isc/quota.h +++ b/lib/isc/include/isc/quota.h @@ -47,7 +47,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; }; diff --git a/lib/isc/include/isc/radix.h b/lib/isc/include/isc/radix.h index 50cdf6be33..34ceb86d7e 100644 --- a/lib/isc/include/isc/radix.h +++ b/lib/isc/include/isc/radix.h @@ -42,7 +42,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" */ @@ -85,12 +85,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 @@ -104,7 +104,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 */ @@ -196,9 +196,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) diff --git a/lib/isc/include/isc/region.h b/lib/isc/include/isc/region.h index b6c932f4e4..ab09f14693 100644 --- a/lib/isc/include/isc/region.h +++ b/lib/isc/include/isc/region.h @@ -23,7 +23,7 @@ struct isc_region { }; struct isc_textregion { - char * base; + char *base; unsigned int length; }; @@ -31,12 +31,12 @@ struct isc_textregion { * discussing the region api. */ struct isc_constregion { - const void * base; + const void *base; unsigned int length; }; struct isc_consttextregion { - const char * base; + const char *base; unsigned int length; }; diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h index 23630bdaa5..10ac659a8b 100644 --- a/lib/isc/include/isc/socket.h +++ b/lib/isc/include/isc/socket.h @@ -132,7 +132,7 @@ struct isc_socketevent { typedef struct isc_socket_newconnev isc_socket_newconnev_t; struct isc_socket_newconnev { ISC_EVENT_COMMON(isc_socket_newconnev_t); - isc_socket_t * newsocket; + isc_socket_t *newsocket; isc_result_t result; /*%< OK, EOF, whatever else */ isc_sockaddr_t address; /*%< source address */ }; @@ -836,7 +836,7 @@ isc_socketmgr_renderjson(isc_socketmgr_t *mgr, void *stats0); /*%< * See isc_socketmgr_create() above. */ -typedef isc_result_t (*isc_socketmgrcreatefunc_t)(isc_mem_t * mctx, +typedef isc_result_t (*isc_socketmgrcreatefunc_t)(isc_mem_t *mctx, isc_socketmgr_t **managerp); ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/symtab.h b/lib/isc/include/isc/symtab.h index ed85d79872..07000c6fed 100644 --- a/lib/isc/include/isc/symtab.h +++ b/lib/isc/include/isc/symtab.h @@ -87,8 +87,8 @@ ***/ /*% Symbol table value. */ typedef union isc_symvalue { - void * as_pointer; - const void * as_cpointer; + void *as_pointer; + const void *as_cpointer; int as_integer; unsigned int as_uinteger; } isc_symvalue_t; diff --git a/lib/isc/include/isc/thread.h b/lib/isc/include/isc/thread.h index 037a44cf5b..5b13905219 100644 --- a/lib/isc/include/isc/thread.h +++ b/lib/isc/include/isc/thread.h @@ -30,8 +30,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 diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h index 0c240ea501..ed328f55a2 100644 --- a/lib/isc/include/isc/util.h +++ b/lib/isc/include/isc/util.h @@ -78,7 +78,7 @@ do { \ union { \ const void *k; \ - void * v; \ + void *v; \ } _u; \ _u.k = konst; \ var = _u.v; \ diff --git a/lib/isccc/include/isccc/ccmsg.h b/lib/isccc/include/isccc/ccmsg.h index c5ea35d088..1aff044a97 100644 --- a/lib/isccc/include/isccc/ccmsg.h +++ b/lib/isccc/include/isccc/ccmsg.h @@ -41,12 +41,12 @@ typedef struct isccc_ccmsg { unsigned int magic; uint32_t size; bool length_received; - isc_buffer_t * buffer; + 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; diff --git a/lib/isccc/include/isccc/sexpr.h b/lib/isccc/include/isccc/sexpr.h index d03572bb05..e2fb4919ba 100644 --- a/lib/isccc/include/isccc/sexpr.h +++ b/lib/isccc/include/isccc/sexpr.h @@ -47,7 +47,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; diff --git a/lib/isccc/include/isccc/symtab.h b/lib/isccc/include/isccc/symtab.h index d93ce66bd2..dbe2985999 100644 --- a/lib/isccc/include/isccc/symtab.h +++ b/lib/isccc/include/isccc/symtab.h @@ -81,18 +81,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, diff --git a/lib/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h index 388ebe30fa..09450f0ab3 100644 --- a/lib/isccfg/include/isccfg/cfg.h +++ b/lib/isccfg/include/isccfg/cfg.h @@ -70,7 +70,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); /*** @@ -579,9 +579,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(). diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h index 997a4e1fc6..09f1e83732 100644 --- a/lib/isccfg/include/isccfg/grammar.h +++ b/lib/isccfg/include/isccfg/grammar.h @@ -109,31 +109,31 @@ struct cfg_printer { /*% A clause definition. */ struct cfg_clausedef { - const char * name; - cfg_type_t * type; + const char *name; + cfg_type_t *type; unsigned int flags; }; /*% A tuple field definition. */ struct cfg_tuplefielddef { - const char * name; - cfg_type_t * type; + const char *name; + cfg_type_t *type; unsigned int flags; }; /*% 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 ". */ typedef struct { - const char * name; + const char *name; const cfg_type_t *type; } keyword_type_t; @@ -176,7 +176,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. */ }; @@ -194,7 +194,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; @@ -204,9 +204,9 @@ 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; + cfg_parser_t *pctx; }; /*% A list element. */ @@ -217,9 +217,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; @@ -273,7 +273,7 @@ struct cfg_parser { isc_refcount_t references; cfg_parsecallback_t callback; - void * callbackarg; + void *callbackarg; }; /* Parser context flags */ diff --git a/lib/ns/include/ns/client.h b/lib/ns/include/ns/client.h index c734358dcd..ecb59596fd 100644 --- a/lib/ns/include/ns/client.h +++ b/lib/ns/include/ns/client.h @@ -142,11 +142,11 @@ struct ns_clientmgr { /* Unlocked. */ unsigned int magic; - isc_mem_t * mctx; - ns_server_t * sctx; - isc_taskmgr_t * taskmgr; + isc_mem_t *mctx; + ns_server_t *sctx; + isc_taskmgr_t *taskmgr; isc_timermgr_t *timermgr; - isc_task_t * excl; + isc_task_t *excl; isc_refcount_t references; int tid; @@ -167,29 +167,29 @@ struct ns_clientmgr { /*% nameserver client structure */ struct ns_client { unsigned int magic; - isc_mem_t * mctx; + isc_mem_t *mctx; int tid; bool allocated; /* Do we need to free it? */ - ns_server_t * sctx; - ns_clientmgr_t * manager; + ns_server_t *sctx; + ns_clientmgr_t *manager; ns_clientstate_t state; int nupdates; bool nodetach; bool shuttingdown; unsigned int attributes; - isc_task_t * task; - 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 + isc_task_t *task; + 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 *fetchhandle; /* Waiting for recursive fetch */ isc_nmhandle_t *prefetchhandle; /* Waiting for prefetch / rpzfetch */ isc_nmhandle_t *updatehandle; /* Waiting for update callback */ - unsigned char * tcpbuf; - dns_message_t * message; - unsigned char * sendbuf; + unsigned char *tcpbuf; + dns_message_t *message; + unsigned char *sendbuf; dns_rdataset_t *opt; uint16_t udpsize; uint16_t extflags; @@ -197,15 +197,15 @@ struct ns_client { uint16_t additionaldepth; void (*cleanup)(ns_client_t *); void (*shutdown)(void *arg, isc_result_t result); - void * shutdown_arg; + void *shutdown_arg; ns_query_t query; isc_time_t requesttime; isc_stdtime_t now; isc_time_t tnow; dns_name_t signername; /*%< [T]SIG key name */ - dns_name_t * signer; /*%< NULL if not valid sig */ + dns_name_t *signer; /*%< NULL if not valid sig */ bool mortal; /*%< Die after handling request */ - isc_quota_t * recursionquota; + isc_quota_t *recursionquota; isc_sockaddr_t peeraddr; bool peeraddr_valid; diff --git a/lib/ns/include/ns/hooks.h b/lib/ns/include/ns/hooks.h index eebf8a7997..974ac16bab 100644 --- a/lib/ns/include/ns/hooks.h +++ b/lib/ns/include/ns/hooks.h @@ -397,9 +397,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; diff --git a/lib/ns/include/ns/interfacemgr.h b/lib/ns/include/ns/interfacemgr.h index 05fcfb30b1..db16ccd70d 100644 --- a/lib/ns/include/ns/interfacemgr.h +++ b/lib/ns/include/ns/interfacemgr.h @@ -73,10 +73,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 diff --git a/lib/ns/include/ns/listenlist.h b/lib/ns/include/ns/listenlist.h index 8119821b5b..0db7c2ede2 100644 --- a/lib/ns/include/ns/listenlist.h +++ b/lib/ns/include/ns/listenlist.h @@ -40,15 +40,15 @@ 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; + dns_acl_t *acl; isc_tlsctx_t *sslctx; - 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; }; @@ -79,7 +79,7 @@ isc_result_t ns_listenelt_create(isc_mem_t *mctx, in_port_t port, isc_dscp_t dscp, dns_acl_t *acl, bool tls, const ns_listen_tls_params_t *tls_params, - ns_listenelt_t ** target); + ns_listenelt_t **target); /*%< * Create a listen-on list element. * diff --git a/lib/ns/include/ns/log.h b/lib/ns/include/ns/log.h index 14d7799fce..b84b1a312b 100644 --- a/lib/ns/include/ns/log.h +++ b/lib/ns/include/ns/log.h @@ -17,7 +17,7 @@ #include #include -extern isc_log_t * ns_lctx; +extern isc_log_t *ns_lctx; extern isc_logcategory_t ns_categories[]; extern isc_logmodule_t ns_modules[]; diff --git a/lib/ns/include/ns/query.h b/lib/ns/include/ns/query.h index cee2e1796c..0e604cea05 100644 --- a/lib/ns/include/ns/query.h +++ b/lib/ns/include/ns/query.h @@ -30,7 +30,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; @@ -43,9 +43,9 @@ typedef struct ns_dbversion { */ 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; @@ -54,37 +54,37 @@ 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; - dns_fetch_t * fetch; - dns_fetch_t * prefetch; - ns_hookasync_t * hookactx; - dns_rpz_st_t * rpz_st; + dns_fetch_t *fetch; + dns_fetch_t *prefetch; + 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_dbnode_t * node; + 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; @@ -126,8 +126,8 @@ typedef struct query_ctx query_ctx_t; /* query context structure */ struct query_ctx { isc_buffer_t *dbuf; /* name buffer */ - dns_name_t * fname; /* found name from DB lookup */ - dns_name_t * tname; /* temporary name, used + dns_name_t *fname; /* found name from DB lookup */ + dns_name_t *tname; /* temporary name, used * when processing ANY * queries */ dns_rdataset_t *rdataset; /* found rdataset */ @@ -159,19 +159,19 @@ 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 */ + dns_zone_t *zone; /* zone to search */ dns_view_t *view; /* client view */ diff --git a/lib/ns/include/ns/server.h b/lib/ns/include/ns/server.h index d104b85f33..3768efbd37 100644 --- a/lib/ns/include/ns/server.h +++ b/lib/ns/include/ns/server.h @@ -69,7 +69,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; @@ -88,15 +88,15 @@ struct ns_server { /*% Test options and other configurables */ uint32_t options; - dns_acl_t * blackholeacl; - dns_acl_t * keepresporder; + dns_acl_t *blackholeacl; + dns_acl_t *keepresporder; 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 */ @@ -107,7 +107,7 @@ struct ns_server { ns_matchview_t matchingview; /*% Stats counters */ - ns_stats_t * nsstats; + ns_stats_t *nsstats; dns_stats_t *rcvquerystats; dns_stats_t *opcodestats; dns_stats_t *rcodestats; diff --git a/lib/ns/include/ns/sortlist.h b/lib/ns/include/ns/sortlist.h index ca4302f671..f60a88ba5e 100644 --- a/lib/ns/include/ns/sortlist.h +++ b/lib/ns/include/ns/sortlist.h @@ -23,7 +23,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. @@ -68,7 +68,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, const void **argp); /*%< * Find the sortlist statement in 'acl' that applies to 'clientaddr', if any.