diff --git a/bin/check/check-tool.h b/bin/check/check-tool.h index 62a9d1964085c734cf295068b8f829bf302fbce8..6bc2383f3f9e1ad97e7028d3c6fca7c9224e3e53 100644 --- a/bin/check/check-tool.h +++ b/bin/check/check-tool.h @@ -47,12 +47,12 @@ void DestroySockets(void); #endif /* ifdef _WIN32 */ -extern int debug; -extern const char * journal; -extern bool nomerge; -extern bool docheckmx; -extern bool docheckns; -extern bool dochecksrv; +extern int debug; +extern const char *journal; +extern bool nomerge; +extern bool docheckmx; +extern bool docheckns; +extern bool dochecksrv; extern dns_zoneopt_t zone_options; ISC_LANG_ENDDECLS diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c index fa40d2eb53b949419b48d78d2e359450daced792..ae3da7514e211922a74f17af2bc347865317d021 100644 --- a/bin/check/named-checkconf.c +++ b/bin/check/named-checkconf.c @@ -56,7 +56,8 @@ isc_log_t *logc = NULL; } while (0) /*% usage */ -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c index 034384760c3aae80c53b272c9157d18b8946f1b5..e50f84e0d2fde176ea77cef36eaacdff8710c47a 100644 --- a/bin/check/named-checkzone.c +++ b/bin/check/named-checkzone.c @@ -62,7 +62,8 @@ static enum { progmode_check, progmode_compile } progmode; } \ } while (0) -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { diff --git a/bin/delv/delv.c b/bin/delv/delv.c index b8d4639ecb9759722833256d200ff748ec91c325..a9b49f9d65293de7f04d5dfd02ac623741cc6fc3 100644 --- a/bin/delv/delv.c +++ b/bin/delv/delv.c @@ -127,11 +127,11 @@ static char anchortext[] = TRUST_ANCHORS; /* * Static function prototypes */ -static isc_result_t get_reverse(char *reverse, size_t len, char *value, - bool strict); +static isc_result_t +get_reverse(char *reverse, size_t len, char *value, bool strict); -static isc_result_t parse_uint(uint32_t *uip, const char *value, uint32_t max, - const char *desc); +static isc_result_t +parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc); static void usage(void) { @@ -205,7 +205,8 @@ usage(void) { exit(1); } -ISC_PLATFORM_NORETURN_PRE static void fatal(const char *format, ...) +ISC_PLATFORM_NORETURN_PRE static void +fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2) ISC_PLATFORM_NORETURN_POST; static void @@ -221,7 +222,8 @@ fatal(const char *format, ...) { exit(1); } -static void warn(const char *format, ...) ISC_FORMAT_PRINTF(1, 2); +static void +warn(const char *format, ...) ISC_FORMAT_PRINTF(1, 2); static void warn(const char *format, ...) { @@ -241,7 +243,8 @@ static isc_logcategory_t categories[] = { { "delv", 0 }, { NULL, 0 } }; static isc_logmodule_t modules[] = { { "delv", 0 }, { NULL, 0 } }; -static void delv_log(int level, const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3); +static void +delv_log(int level, const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3); static void delv_log(int level, const char *fmt, ...) { diff --git a/bin/dig/dig.c b/bin/dig/dig.c index 8f31cb79210df3a862f7c6b2183a0de250820cd3..bbe2fdfea594053941f3a7a91f21ed95fbd689f4 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -107,7 +107,8 @@ usage(void) { fprintf(stderr, "Press for complete list of options\n"); } #else /* if TARGET_OS_IPHONE */ -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index c175342d4175164bd025da066b50052e3462131a..e578168488d882fc029db84011bf8058b3ed803e 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -122,10 +122,12 @@ int lookup_counter = 0; static char servercookie[256]; #ifdef HAVE_LIBIDN2 -static void idn_locale_to_ace(const char *src, char *dst, size_t dstlen); -static void idn_ace_to_locale(const char *src, char **dst); -static isc_result_t idn_output_filter(isc_buffer_t *buffer, - unsigned int used_org); +static void +idn_locale_to_ace(const char *src, char *dst, size_t dstlen); +static void +idn_ace_to_locale(const char *src, char **dst); +static isc_result_t +idn_output_filter(isc_buffer_t *buffer, unsigned int used_org); #endif /* HAVE_LIBIDN2 */ isc_socket_t *keep = NULL; @@ -227,19 +229,26 @@ void (*dighost_shutdown)(void); /* forward declarations */ -static void cancel_lookup(dig_lookup_t *lookup); +static void +cancel_lookup(dig_lookup_t *lookup); -static void recv_done(isc_task_t *task, isc_event_t *event); +static void +recv_done(isc_task_t *task, isc_event_t *event); -static void send_udp(dig_query_t *query); +static void +send_udp(dig_query_t *query); -static void connect_timeout(isc_task_t *task, isc_event_t *event); +static void +connect_timeout(isc_task_t *task, isc_event_t *event); -static void launch_next_query(dig_query_t *query, bool include_question); +static void +launch_next_query(dig_query_t *query, bool include_question); -static void check_next_lookup(dig_lookup_t *lookup); +static void +check_next_lookup(dig_lookup_t *lookup); -static bool next_origin(dig_lookup_t *oldlookup); +static bool +next_origin(dig_lookup_t *oldlookup); static int count_dots(char *string) { @@ -2718,7 +2727,8 @@ force_timeout(dig_query_t *query) { } } -static void connect_done(isc_task_t *task, isc_event_t *event); +static void +connect_done(isc_task_t *task, isc_event_t *event); /*% * Unlike send_udp, this can't be called multiple times with the same diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c index 3790024892e6d5221f506a927d5137ffc1995722..b10c0d1b6ceae7142bbe37ddd94bbee8bd4965bd 100644 --- a/bin/dig/nslookup.c +++ b/bin/dig/nslookup.c @@ -124,8 +124,10 @@ static const char *rtypetext[] = { #define N_KNOWN_RRTYPES (sizeof(rtypetext) / sizeof(rtypetext[0])) -static void flush_lookup_list(void); -static void getinput(isc_task_t *task, isc_event_t *event); +static void +flush_lookup_list(void); +static void +getinput(isc_task_t *task, isc_event_t *event); static char * rcode_totext(dns_rcode_t rcode) { @@ -876,7 +878,8 @@ get_next_command(void) { isc_mem_free(mctx, buf); } -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { diff --git a/bin/dnssec/dnssec-cds.c b/bin/dnssec/dnssec-cds.c index dada882f0d6efb83b057ceebca3f584f3be09a21..2c7c3a511fbc9ce51934f174ec09e762c50a2b05 100644 --- a/bin/dnssec/dnssec-cds.c +++ b/bin/dnssec/dnssec-cds.c @@ -121,8 +121,8 @@ typedef struct keyinfo { } keyinfo_t; /* A replaceable function that can generate a DS RRset from some input */ -typedef isc_result_t ds_maker_func_t(dns_rdatalist_t *dslist, isc_buffer_t *buf, - dns_rdata_t *rdata); +typedef isc_result_t +ds_maker_func_t(dns_rdatalist_t *dslist, isc_buffer_t *buf, dns_rdata_t *rdata); static dns_rdataset_t cdnskey_set, cdnskey_sig; static dns_rdataset_t cds_set, cds_sig; @@ -1016,7 +1016,8 @@ nsdiff(uint32_t ttl, dns_rdataset_t *oldset, dns_rdataset_t *newset) { } } -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c index 03fc6a9d276e5b028da1d068a7592a7ec125b3c0..f2a989c5fe9c942cc9a6a212743b74b7d97617bd 100644 --- a/bin/dnssec/dnssec-dsfromkey.c +++ b/bin/dnssec/dnssec-dsfromkey.c @@ -320,7 +320,8 @@ emits(bool showall, bool cds, dns_rdata_t *rdata) { } } -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { diff --git a/bin/dnssec/dnssec-importkey.c b/bin/dnssec/dnssec-importkey.c index 9319f99977e1b2a580ba17807191dfc60f974616..f271c67c86c06c89bf9bcb402b912f6b14b82ad1 100644 --- a/bin/dnssec/dnssec-importkey.c +++ b/bin/dnssec/dnssec-importkey.c @@ -264,7 +264,8 @@ emit(const char *dir, dns_rdata_t *rdata) { dst_key_free(&key); } -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { diff --git a/bin/dnssec/dnssec-keyfromlabel.c b/bin/dnssec/dnssec-keyfromlabel.c index 4bc2f9f46f8647af0503bac1d2fbfec9dacd67c4..915d61db247c27cf215a9e06487ee72bf2f102fe 100644 --- a/bin/dnssec/dnssec-keyfromlabel.c +++ b/bin/dnssec/dnssec-keyfromlabel.c @@ -46,7 +46,8 @@ const char *program = "dnssec-keyfromlabel"; -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c index f40e16a6a7056082c9aad29d5030ec762729159c..f765c1fb31c95e90c3a323b9854de964f2311344 100644 --- a/bin/dnssec/dnssec-keygen.c +++ b/bin/dnssec/dnssec-keygen.c @@ -69,9 +69,11 @@ const char *program = "dnssec-keygen"; isc_log_t *lctx = NULL; -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; -static void progress(int p); +static void +progress(int p); struct keygen_ctx { const char *predecessor; diff --git a/bin/dnssec/dnssec-revoke.c b/bin/dnssec/dnssec-revoke.c index d8455e3a675525f89d8212111ad003af1f4f7f72..4d167abfa5ed741d22b8f41898b9a2133308c497 100644 --- a/bin/dnssec/dnssec-revoke.c +++ b/bin/dnssec/dnssec-revoke.c @@ -40,7 +40,8 @@ const char *program = "dnssec-revoke"; static isc_mem_t *mctx = NULL; -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c index 526e3f15508487e68468d7553dd51fd900709d44..f790777097b31bb493b6800eae904528fa52a8aa 100644 --- a/bin/dnssec/dnssec-settime.c +++ b/bin/dnssec/dnssec-settime.c @@ -43,7 +43,8 @@ const char *program = "dnssec-settime"; static isc_mem_t *mctx = NULL; -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index c107b4aaa5594ffcb5434d0df281acec5c4f4aa9..312bd061dfd437973672880624c0b054c08b4cb1 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -186,7 +186,8 @@ static dns_ttl_t maxttl = 0; UNLOCK(&statslock); \ } -static void sign(isc_task_t *task, isc_event_t *event); +static void +sign(isc_task_t *task, isc_event_t *event); /*% * Store a copy of 'name' in 'fzonecut' and return a pointer to that copy. @@ -3123,7 +3124,8 @@ print_version(FILE *fp) { fprintf(fp, "; dnssec_signzone version " VERSION "\n"); } -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { diff --git a/bin/dnssec/dnssec-verify.c b/bin/dnssec/dnssec-verify.c index 98d1a743241589883c6c2f70b65507718ae2823e..ac003ad58affb55c5083fde221951215f1af029a 100644 --- a/bin/dnssec/dnssec-verify.c +++ b/bin/dnssec/dnssec-verify.c @@ -137,7 +137,8 @@ loadzone(char *file, char *origin, dns_rdataclass_t rdclass, dns_db_t **db) { } } -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { diff --git a/bin/dnssec/dnssectool.h b/bin/dnssec/dnssectool.h index 55c3dcd95bdbd2c79699ba704b1caa45773882f1..9471f9680743e1d57f6c539f6dd741a72d5f6ad2 100644 --- a/bin/dnssec/dnssectool.h +++ b/bin/dnssec/dnssectool.h @@ -25,7 +25,7 @@ /*! verbosity: set by -v and -q option in each program, defined in dnssectool.c */ -extern int verbose; +extern int verbose; extern bool quiet; /*! program name, statically initialized in each program */ diff --git a/bin/named/builtin.c b/bin/named/builtin.c index b6294cc59888ae318873aaa06995875d928d825d..d3ab9ad4804da300e576ddb3539c0c0d2a1f27f8 100644 --- a/bin/named/builtin.c +++ b/bin/named/builtin.c @@ -32,12 +32,18 @@ typedef struct builtin builtin_t; -static isc_result_t do_version_lookup(dns_sdblookup_t *lookup); -static isc_result_t do_hostname_lookup(dns_sdblookup_t *lookup); -static isc_result_t do_authors_lookup(dns_sdblookup_t *lookup); -static isc_result_t do_id_lookup(dns_sdblookup_t *lookup); -static isc_result_t do_empty_lookup(dns_sdblookup_t *lookup); -static isc_result_t do_dns64_lookup(dns_sdblookup_t *lookup); +static isc_result_t +do_version_lookup(dns_sdblookup_t *lookup); +static isc_result_t +do_hostname_lookup(dns_sdblookup_t *lookup); +static isc_result_t +do_authors_lookup(dns_sdblookup_t *lookup); +static isc_result_t +do_id_lookup(dns_sdblookup_t *lookup); +static isc_result_t +do_empty_lookup(dns_sdblookup_t *lookup); +static isc_result_t +do_dns64_lookup(dns_sdblookup_t *lookup); /* * We can't use function pointers as the db_data directly diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c index 018327539c96666619eb028cb113227a5f210995..7a760c9e7611ae097a8333548f70a625024bc433 100644 --- a/bin/named/controlconf.c +++ b/bin/named/controlconf.c @@ -107,8 +107,10 @@ struct named_controls { isccc_symtab_t *symtab; }; -static void control_newconn(isc_task_t *task, isc_event_t *event); -static void control_recvmessage(isc_task_t *task, isc_event_t *event); +static void +control_newconn(isc_task_t *task, isc_event_t *event); +static void +control_recvmessage(isc_task_t *task, isc_event_t *event); #define CLOCKSKEW 300 diff --git a/bin/named/main.c b/bin/named/main.c index 7612618c049ee19ab67e24dfa6b5546f971cac2e..919b589f039d34bbed1f79015e005d9adb5fc59d 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -302,9 +302,9 @@ library_fatal_error(const char *file, int line, const char *format, exit(1); } -static void library_unexpected_error(const char *file, int line, - const char *format, va_list args) - ISC_FORMAT_PRINTF(3, 0); +static void +library_unexpected_error(const char *file, int line, const char *format, + va_list args) ISC_FORMAT_PRINTF(3, 0); static void library_unexpected_error(const char *file, int line, const char *format, diff --git a/bin/named/server.c b/bin/named/server.c index 0aded57485dbc3ef76845e00c95c80f238c57115..78402fa442e6aa97caef02fea8b9a4e156f5685d 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -383,74 +383,86 @@ ISC_PLATFORM_NORETURN_PRE static void fatal(named_server_t *server, const char *msg, isc_result_t result) ISC_PLATFORM_NORETURN_POST; -static void named_server_reload(isc_task_t *task, isc_event_t *event); +static void +named_server_reload(isc_task_t *task, isc_event_t *event); -static isc_result_t ns_listenelt_fromconfig(const cfg_obj_t *listener, - const cfg_obj_t *config, - cfg_aclconfctx_t *actx, - isc_mem_t *mctx, uint16_t family, - ns_listenelt_t **target); -static isc_result_t ns_listenlist_fromconfig(const cfg_obj_t *listenlist, - const cfg_obj_t *config, - cfg_aclconfctx_t *actx, - isc_mem_t *mctx, uint16_t family, - ns_listenlist_t **target); +static isc_result_t +ns_listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, + cfg_aclconfctx_t *actx, isc_mem_t *mctx, + uint16_t family, ns_listenelt_t **target); +static isc_result_t +ns_listenlist_fromconfig(const cfg_obj_t *listenlist, const cfg_obj_t *config, + cfg_aclconfctx_t *actx, isc_mem_t *mctx, + uint16_t family, ns_listenlist_t **target); -static isc_result_t configure_forward(const cfg_obj_t *config, dns_view_t *view, - const dns_name_t *origin, - const cfg_obj_t *forwarders, - const cfg_obj_t *forwardtype); +static isc_result_t +configure_forward(const cfg_obj_t *config, dns_view_t *view, + const dns_name_t *origin, const cfg_obj_t *forwarders, + const cfg_obj_t *forwardtype); -static isc_result_t configure_alternates(const cfg_obj_t *config, - dns_view_t *view, - const cfg_obj_t *alternates); +static isc_result_t +configure_alternates(const cfg_obj_t *config, dns_view_t *view, + const cfg_obj_t *alternates); -static isc_result_t configure_zone(const cfg_obj_t *config, - const cfg_obj_t *zconfig, - const cfg_obj_t *vconfig, isc_mem_t *mctx, - dns_view_t *view, dns_viewlist_t *viewlist, - dns_kasplist_t *kasplist, - cfg_aclconfctx_t *aclconf, bool added, - bool old_rpz_ok, bool modify); +static isc_result_t +configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, + const cfg_obj_t *vconfig, isc_mem_t *mctx, dns_view_t *view, + dns_viewlist_t *viewlist, dns_kasplist_t *kasplist, + cfg_aclconfctx_t *aclconf, bool added, bool old_rpz_ok, + bool modify); -static isc_result_t configure_newzones(dns_view_t *view, cfg_obj_t *config, - cfg_obj_t *vconfig, isc_mem_t *mctx, - cfg_aclconfctx_t *actx); +static isc_result_t +configure_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, + isc_mem_t *mctx, cfg_aclconfctx_t *actx); -static isc_result_t add_keydata_zone(dns_view_t *view, const char *directory, - isc_mem_t *mctx); +static isc_result_t +add_keydata_zone(dns_view_t *view, const char *directory, isc_mem_t *mctx); -static void end_reserved_dispatches(named_server_t *server, bool all); +static void +end_reserved_dispatches(named_server_t *server, bool all); -static void newzone_cfgctx_destroy(void **cfgp); +static void +newzone_cfgctx_destroy(void **cfgp); -static inline isc_result_t putstr(isc_buffer_t **b, const char *str); +static inline isc_result_t +putstr(isc_buffer_t **b, const char *str); -static isc_result_t putmem(isc_buffer_t **b, const char *str, size_t len); +static isc_result_t +putmem(isc_buffer_t **b, const char *str, size_t len); -static isc_result_t putuint8(isc_buffer_t **b, uint8_t val); +static isc_result_t +putuint8(isc_buffer_t **b, uint8_t val); -static inline isc_result_t putnull(isc_buffer_t **b); +static inline isc_result_t +putnull(isc_buffer_t **b); -static int count_zones(const cfg_obj_t *conf); +static int +count_zones(const cfg_obj_t *conf); #ifdef HAVE_LMDB -static isc_result_t migrate_nzf(dns_view_t *view); +static isc_result_t +migrate_nzf(dns_view_t *view); -static isc_result_t nzd_writable(dns_view_t *view); +static isc_result_t +nzd_writable(dns_view_t *view); -static isc_result_t nzd_open(dns_view_t *view, unsigned int flags, - MDB_txn **txnp, MDB_dbi *dbi); +static isc_result_t +nzd_open(dns_view_t *view, unsigned int flags, MDB_txn **txnp, MDB_dbi *dbi); -static isc_result_t nzd_env_reopen(dns_view_t *view); +static isc_result_t +nzd_env_reopen(dns_view_t *view); -static void nzd_env_close(dns_view_t *view); +static void +nzd_env_close(dns_view_t *view); -static isc_result_t nzd_close(MDB_txn **txnp, bool commit); +static isc_result_t +nzd_close(MDB_txn **txnp, bool commit); -static isc_result_t nzd_count(dns_view_t *view, int *countp); +static isc_result_t +nzd_count(dns_view_t *view, int *countp); #else /* ifdef HAVE_LMDB */ -static isc_result_t nzf_append(dns_view_t *view, const cfg_obj_t *zconfig); +static isc_result_t +nzf_append(dns_view_t *view, const cfg_obj_t *zconfig); #endif /* ifdef HAVE_LMDB */ /*% diff --git a/bin/named/win32/include/named/ntservice.h b/bin/named/win32/include/named/ntservice.h index 8fe6f5b32eeaa39614c4dfb72a67be662f0ad737..05f4f7c65f759df66b2767cc8568f126596011b7 100644 --- a/bin/named/win32/include/named/ntservice.h +++ b/bin/named/win32/include/named/ntservice.h @@ -18,7 +18,7 @@ #define BIND_SERVICE_NAME "named" void - ntservice_init(); +ntservice_init(); void UpdateSCM(DWORD); void ServiceControl(DWORD dwCtrlCode); diff --git a/bin/named/win32/ntservice.c b/bin/named/win32/ntservice.c index 58a723f7cfe8b6bd3e4a5ca1053fe0fc6ee43039..2aa9b812c920e10b9d0d51df2979ebae51e06d3e 100644 --- a/bin/named/win32/ntservice.c +++ b/bin/named/win32/ntservice.c @@ -30,8 +30,10 @@ static char ConsoleTitle[128]; /* * Forward declarations */ -void ServiceControl(DWORD dwCtrlCode); -int bindmain(int, char *[]); /* From main.c */ +void +ServiceControl(DWORD dwCtrlCode); +int +bindmain(int, char *[]); /* From main.c */ /* * Initialize the Service by registering it. diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index 6a2b9d6ce27a7e1a2e1597ef94268a5eb3a27318..9404ed1050ba832d4a6b52694d74b8785877aeb1 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -181,16 +181,21 @@ typedef struct nsu_requestinfo { isc_sockaddr_t *addr; } nsu_requestinfo_t; -static void sendrequest(isc_sockaddr_t *destaddr, dns_message_t *msg, - dns_request_t **request); -static void send_update(dns_name_t *zonename, isc_sockaddr_t *master); +static void +sendrequest(isc_sockaddr_t *destaddr, dns_message_t *msg, + dns_request_t **request); +static void +send_update(dns_name_t *zonename, isc_sockaddr_t *master); -ISC_PLATFORM_NORETURN_PRE static void fatal(const char *format, ...) +ISC_PLATFORM_NORETURN_PRE static void +fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2) ISC_PLATFORM_NORETURN_POST; -static void debug(const char *format, ...) ISC_FORMAT_PRINTF(1, 2); +static void +debug(const char *format, ...) ISC_FORMAT_PRINTF(1, 2); -static void ddebug(const char *format, ...) ISC_FORMAT_PRINTF(1, 2); +static void +ddebug(const char *format, ...) ISC_FORMAT_PRINTF(1, 2); #ifdef GSSAPI static dns_fixedname_t fkname; @@ -204,14 +209,19 @@ typedef struct nsu_gssinfo { gss_ctx_id_t context; } nsu_gssinfo_t; -static void failed_gssrequest(); -static void start_gssrequest(dns_name_t *master); -static void send_gssrequest(isc_sockaddr_t *destaddr, dns_message_t *msg, - dns_request_t **request, gss_ctx_id_t context); -static void recvgss(isc_task_t *task, isc_event_t *event); +static void +failed_gssrequest(); +static void +start_gssrequest(dns_name_t *master); +static void +send_gssrequest(isc_sockaddr_t *destaddr, dns_message_t *msg, + dns_request_t **request, gss_ctx_id_t context); +static void +recvgss(isc_task_t *task, isc_event_t *event); #endif /* GSSAPI */ -static void error(const char *format, ...) ISC_FORMAT_PRINTF(1, 2); +static void +error(const char *format, ...) ISC_FORMAT_PRINTF(1, 2); #define STATUS_MORE (uint16_t)0 #define STATUS_SEND (uint16_t)1 diff --git a/bin/plugins/filter-aaaa.c b/bin/plugins/filter-aaaa.c index b59fe1ddc99ebddf8d7dfe73f2ea9876a05dff38..e787b434712600c655a7899ae7791fda3b3e75ff 100644 --- a/bin/plugins/filter-aaaa.c +++ b/bin/plugins/filter-aaaa.c @@ -110,18 +110,18 @@ typedef struct filter_instance { /* * Forward declarations of functions referenced in install_hooks(). */ -static ns_hookresult_t filter_qctx_initialize(void *arg, void *cbdata, - isc_result_t *resp); -static ns_hookresult_t filter_respond_begin(void *arg, void *cbdata, - isc_result_t *resp); -static ns_hookresult_t filter_respond_any_found(void *arg, void *cbdata, - isc_result_t *resp); -static ns_hookresult_t filter_prep_response_begin(void *arg, void *cbdata, - isc_result_t *resp); -static ns_hookresult_t filter_query_done_send(void *arg, void *cbdata, - isc_result_t *resp); -static ns_hookresult_t filter_qctx_destroy(void *arg, void *cbdata, - isc_result_t *resp); +static ns_hookresult_t +filter_qctx_initialize(void *arg, void *cbdata, isc_result_t *resp); +static ns_hookresult_t +filter_respond_begin(void *arg, void *cbdata, isc_result_t *resp); +static ns_hookresult_t +filter_respond_any_found(void *arg, void *cbdata, isc_result_t *resp); +static ns_hookresult_t +filter_prep_response_begin(void *arg, void *cbdata, isc_result_t *resp); +static ns_hookresult_t +filter_query_done_send(void *arg, void *cbdata, isc_result_t *resp); +static ns_hookresult_t +filter_qctx_destroy(void *arg, void *cbdata, isc_result_t *resp); /*% * Register the functions to be called at each hook point in 'hooktable', using diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c index 225f29765d39df4d7455165e8864778696c59bf0..12254714e6238ad627765243a9bc6ac9d0827741 100644 --- a/bin/rndc/rndc.c +++ b/bin/rndc/rndc.c @@ -84,7 +84,8 @@ static uint32_t serial; static bool quiet = false; static bool showresult = false; -static void rndc_startconnect(isc_sockaddr_t *addr, isc_task_t *task); +static void +rndc_startconnect(isc_sockaddr_t *addr, isc_task_t *task); ISC_PLATFORM_NORETURN_PRE static void usage(int status) ISC_PLATFORM_NORETURN_POST; diff --git a/bin/tests/optional/adb_test.c b/bin/tests/optional/adb_test.c index ca12fc21e11e93c4d0fd8dfa56677ade3003c361..780a9814d132f3ef9a27cb617f49bb64427c750d 100644 --- a/bin/tests/optional/adb_test.c +++ b/bin/tests/optional/adb_test.c @@ -56,7 +56,8 @@ static isc_mutex_t client_lock; static isc_stdtime_t now; static dns_adb_t *adb; -static void check_result(isc_result_t result, const char *format, ...) +static void +check_result(isc_result_t result, const char *format, ...) ISC_FORMAT_PRINTF(2, 3); static void diff --git a/bin/tests/optional/byname_test.c b/bin/tests/optional/byname_test.c index ba483cf59abfa5e5b89266d500c20034026279f2..6ee3437621d662363dd872f83cc0fa3b1a0c477a 100644 --- a/bin/tests/optional/byname_test.c +++ b/bin/tests/optional/byname_test.c @@ -45,7 +45,8 @@ static isc_log_t *lctx; static isc_logconfig_t *lcfg; static unsigned int level = 0; -static void adb_callback(isc_task_t *task, isc_event_t *event); +static void +adb_callback(isc_task_t *task, isc_event_t *event); static void log_init(void) { diff --git a/bin/tests/optional/gsstest.c b/bin/tests/optional/gsstest.c index d7d89b41368dfdf4be3cb3604c3b1a5b92cbcb09..dd005c084b480978a669e68c423ae99d3efb95d8 100644 --- a/bin/tests/optional/gsstest.c +++ b/bin/tests/optional/gsstest.c @@ -72,9 +72,12 @@ static gss_ctx_id_t *gssctxp = &gssctx; #define PORT 53 #define TIMEOUT 30 -static void initctx1(isc_task_t *task, isc_event_t *event); -static void sendquery(isc_task_t *task, isc_event_t *event); -static void setup(); +static void +initctx1(isc_task_t *task, isc_event_t *event); +static void +sendquery(isc_task_t *task, isc_event_t *event); +static void +setup(); static void console(isc_task_t *task, isc_event_t *event) { diff --git a/bin/tests/optional/ratelimiter_test.c b/bin/tests/optional/ratelimiter_test.c index 03550b97e3ce929ab6f4f2914332da18b6bd2927..fd2111565bdee19350dfb1d1b073f10a8f3392b0 100644 --- a/bin/tests/optional/ratelimiter_test.c +++ b/bin/tests/optional/ratelimiter_test.c @@ -24,9 +24,12 @@ isc_timermgr_t *timermgr = NULL; isc_task_t *g_task = NULL; isc_mem_t *mctx = NULL; -static void utick(isc_task_t *task, isc_event_t *event); -static void shutdown_rl(isc_task_t *task, isc_event_t *event); -static void shutdown_all(isc_task_t *task, isc_event_t *event); +static void +utick(isc_task_t *task, isc_event_t *event); +static void +shutdown_rl(isc_task_t *task, isc_event_t *event); +static void +shutdown_all(isc_task_t *task, isc_event_t *event); typedef struct { int milliseconds; diff --git a/bin/tests/pkcs11/benchmarks/create.c b/bin/tests/pkcs11/benchmarks/create.c index f937e22d3180e454f17b6e04c66d388927dac41e..b3d1056897df144c33b871b0ae2d925c9375ea47 100644 --- a/bin/tests/pkcs11/benchmarks/create.c +++ b/bin/tests/pkcs11/benchmarks/create.c @@ -61,7 +61,8 @@ #define CLOCK_REALTIME 0 #endif /* ifndef CLOCK_REALTIME */ -static int clock_gettime(int32_t id, struct timespec *tp); +static int +clock_gettime(int32_t id, struct timespec *tp); static int clock_gettime(int32_t id, struct timespec *tp) { diff --git a/bin/tests/pkcs11/benchmarks/find.c b/bin/tests/pkcs11/benchmarks/find.c index a098cc42a7fa711eb211d00948fdf2b88748b000..2fb8968040b6154b73ed4e3d1c6e50c76e0f13b2 100644 --- a/bin/tests/pkcs11/benchmarks/find.c +++ b/bin/tests/pkcs11/benchmarks/find.c @@ -61,7 +61,8 @@ #define CLOCK_REALTIME 0 #endif /* ifndef CLOCK_REALTIME */ -static int clock_gettime(int32_t id, struct timespec *tp); +static int +clock_gettime(int32_t id, struct timespec *tp); static int clock_gettime(int32_t id, struct timespec *tp) { diff --git a/bin/tests/pkcs11/benchmarks/genrsa.c b/bin/tests/pkcs11/benchmarks/genrsa.c index 2707ec13a9d7631680facb38d0339a7e14e3c04f..3aabf63eefe1af0cee57920f776334a242f3d065 100644 --- a/bin/tests/pkcs11/benchmarks/genrsa.c +++ b/bin/tests/pkcs11/benchmarks/genrsa.c @@ -61,7 +61,8 @@ #define CLOCK_REALTIME 0 #endif /* ifndef CLOCK_REALTIME */ -static int clock_gettime(int32_t id, struct timespec *tp); +static int +clock_gettime(int32_t id, struct timespec *tp); static int clock_gettime(int32_t id, struct timespec *tp) { diff --git a/bin/tests/pkcs11/benchmarks/login.c b/bin/tests/pkcs11/benchmarks/login.c index 36c4fe8c6e9cabbbd1e4414247aeb381f496b023..aecbfa9cea2d61a570ee690d3b856116bc93e4f7 100644 --- a/bin/tests/pkcs11/benchmarks/login.c +++ b/bin/tests/pkcs11/benchmarks/login.c @@ -61,7 +61,8 @@ #define CLOCK_REALTIME 0 #endif /* ifndef CLOCK_REALTIME */ -static int clock_gettime(int32_t id, struct timespec *tp); +static int +clock_gettime(int32_t id, struct timespec *tp); static int clock_gettime(int32_t id, struct timespec *tp) { diff --git a/bin/tests/pkcs11/benchmarks/privrsa.c b/bin/tests/pkcs11/benchmarks/privrsa.c index df233723618f20aec48b73908ae5e5a9d64ebf6e..60bcdbab3321283f4eda0f4742ad2624bad62793 100644 --- a/bin/tests/pkcs11/benchmarks/privrsa.c +++ b/bin/tests/pkcs11/benchmarks/privrsa.c @@ -61,7 +61,8 @@ #define CLOCK_REALTIME 0 #endif /* ifndef CLOCK_REALTIME */ -static int clock_gettime(int32_t id, struct timespec *tp); +static int +clock_gettime(int32_t id, struct timespec *tp); static int clock_gettime(int32_t id, struct timespec *tp) { diff --git a/bin/tests/pkcs11/benchmarks/pubrsa.c b/bin/tests/pkcs11/benchmarks/pubrsa.c index 5164a2cf4f4e0987c86fa857262b238780687f5e..f9dac0fec49bc0f922e2a402724b8f36c8f33112 100644 --- a/bin/tests/pkcs11/benchmarks/pubrsa.c +++ b/bin/tests/pkcs11/benchmarks/pubrsa.c @@ -61,7 +61,8 @@ #define CLOCK_REALTIME 0 #endif /* ifndef CLOCK_REALTIME */ -static int clock_gettime(int32_t id, struct timespec *tp); +static int +clock_gettime(int32_t id, struct timespec *tp); static int clock_gettime(int32_t id, struct timespec *tp) { diff --git a/bin/tests/pkcs11/benchmarks/session.c b/bin/tests/pkcs11/benchmarks/session.c index f36b0577cd2ec6246ba036114a32a40ee5c8e8a8..22c13ec9a18e545f08eb214ddff6c1299fd16137 100644 --- a/bin/tests/pkcs11/benchmarks/session.c +++ b/bin/tests/pkcs11/benchmarks/session.c @@ -61,7 +61,8 @@ #define CLOCK_REALTIME 0 #endif /* ifndef CLOCK_REALTIME */ -static int clock_gettime(int32_t id, struct timespec *tp); +static int +clock_gettime(int32_t id, struct timespec *tp); static int clock_gettime(int32_t id, struct timespec *tp) { diff --git a/bin/tests/pkcs11/benchmarks/sha1.c b/bin/tests/pkcs11/benchmarks/sha1.c index 03d064ecda3d7107c2263bcab6758390f7496c55..578932fc406770ae71d027e43100c4befa62de5e 100644 --- a/bin/tests/pkcs11/benchmarks/sha1.c +++ b/bin/tests/pkcs11/benchmarks/sha1.c @@ -61,7 +61,8 @@ #define CLOCK_REALTIME 0 #endif /* ifndef CLOCK_REALTIME */ -static int clock_gettime(int32_t id, struct timespec *tp); +static int +clock_gettime(int32_t id, struct timespec *tp); static int clock_gettime(int32_t id, struct timespec *tp) { diff --git a/bin/tests/pkcs11/benchmarks/sign.c b/bin/tests/pkcs11/benchmarks/sign.c index 650aa3a96f089e8d028f097d8405bad2357ba670..047c92c5e37c354e3276f69c9502063399f22cc4 100644 --- a/bin/tests/pkcs11/benchmarks/sign.c +++ b/bin/tests/pkcs11/benchmarks/sign.c @@ -61,7 +61,8 @@ #define CLOCK_REALTIME 0 #endif /* ifndef CLOCK_REALTIME */ -static int clock_gettime(int32_t id, struct timespec *tp); +static int +clock_gettime(int32_t id, struct timespec *tp); static int clock_gettime(int32_t id, struct timespec *tp) { diff --git a/bin/tests/pkcs11/benchmarks/verify.c b/bin/tests/pkcs11/benchmarks/verify.c index daed6102cc42d0172fe77c1b92a0a541dce52316..e559d01c9439041cf87eb63040fd499d9f40277f 100644 --- a/bin/tests/pkcs11/benchmarks/verify.c +++ b/bin/tests/pkcs11/benchmarks/verify.c @@ -61,7 +61,8 @@ #define CLOCK_REALTIME 0 #endif /* ifndef CLOCK_REALTIME */ -static int clock_gettime(int32_t id, struct timespec *tp); +static int +clock_gettime(int32_t id, struct timespec *tp); static int clock_gettime(int32_t id, struct timespec *tp) { diff --git a/bin/tests/system/dlzexternal/driver.c b/bin/tests/system/dlzexternal/driver.c index 74ee7d3a144a43b682b2093baa47cdfbe00389a1..a641b89a350d710b2c92fd3280f5f36669852359 100644 --- a/bin/tests/system/dlzexternal/driver.c +++ b/bin/tests/system/dlzexternal/driver.c @@ -59,7 +59,8 @@ struct record { #define MAX_RECORDS 100 -typedef void log_t(int level, const char *fmt, ...); +typedef void +log_t(int level, const char *fmt, ...); struct dlz_example_data { char *zone_name; diff --git a/bin/tests/system/dlzexternal/driver.h b/bin/tests/system/dlzexternal/driver.h index d603151bbe21980f3495c8d441b18ec269658184..1d487fe1508ceef2e767260824e597171ec9c115 100644 --- a/bin/tests/system/dlzexternal/driver.h +++ b/bin/tests/system/dlzexternal/driver.h @@ -17,17 +17,17 @@ * This header includes the declarations of entry points. */ -dlz_dlopen_version_t dlz_version; -dlz_dlopen_create_t dlz_create; -dlz_dlopen_destroy_t dlz_destroy; -dlz_dlopen_findzonedb_t dlz_findzonedb; -dlz_dlopen_lookup_t dlz_lookup; +dlz_dlopen_version_t dlz_version; +dlz_dlopen_create_t dlz_create; +dlz_dlopen_destroy_t dlz_destroy; +dlz_dlopen_findzonedb_t dlz_findzonedb; +dlz_dlopen_lookup_t dlz_lookup; dlz_dlopen_allowzonexfr_t dlz_allowzonexfr; -dlz_dlopen_allnodes_t dlz_allnodes; -dlz_dlopen_newversion_t dlz_newversion; +dlz_dlopen_allnodes_t dlz_allnodes; +dlz_dlopen_newversion_t dlz_newversion; dlz_dlopen_closeversion_t dlz_closeversion; -dlz_dlopen_configure_t dlz_configure; -dlz_dlopen_ssumatch_t dlz_ssumatch; -dlz_dlopen_addrdataset_t dlz_addrdataset; -dlz_dlopen_subrdataset_t dlz_subrdataset; -dlz_dlopen_delrdataset_t dlz_delrdataset; +dlz_dlopen_configure_t dlz_configure; +dlz_dlopen_ssumatch_t dlz_ssumatch; +dlz_dlopen_addrdataset_t dlz_addrdataset; +dlz_dlopen_subrdataset_t dlz_subrdataset; +dlz_dlopen_delrdataset_t dlz_delrdataset; diff --git a/bin/tests/system/dyndb/driver/instance.h b/bin/tests/system/dyndb/driver/instance.h index 8e36335c26dbb50f5465de9c924f7dc07c5236b4..d91f5b1139214421911262a74a8a0f81d84ee3b7 100644 --- a/bin/tests/system/dyndb/driver/instance.h +++ b/bin/tests/system/dyndb/driver/instance.h @@ -14,23 +14,23 @@ #include struct sample_instance { - isc_mem_t * mctx; - char * db_name; + isc_mem_t *mctx; + char *db_name; dns_dbimplementation_t *db_imp; /* These are needed for zone creation. */ - dns_view_t * view; + dns_view_t *view; dns_zonemgr_t *zmgr; - isc_task_t * task; - bool exiting; + isc_task_t *task; + bool exiting; - dns_zone_t * zone1; + dns_zone_t *zone1; dns_fixedname_t zone1_fn; - dns_name_t * zone1_name; + dns_name_t *zone1_name; - dns_zone_t * zone2; + dns_zone_t *zone2; dns_fixedname_t zone2_fn; - dns_name_t * zone2_name; + dns_name_t *zone2_name; }; typedef struct sample_instance sample_instance_t; @@ -38,7 +38,7 @@ typedef struct sample_instance sample_instance_t; isc_result_t new_sample_instance(isc_mem_t *mctx, const char *db_name, int argc, char **argv, const dns_dyndbctx_t *dctx, - sample_instance_t ** sample_instp); + sample_instance_t **sample_instp); isc_result_t load_sample_instance_zones(sample_instance_t *inst); diff --git a/bin/tests/system/rpz/dnsrps.c b/bin/tests/system/rpz/dnsrps.c index ea63152da355659fe4df5303d68970421f593155..1e72f7d842d282d4a96d26cdc9d73749c9a5811b 100644 --- a/bin/tests/system/rpz/dnsrps.c +++ b/bin/tests/system/rpz/dnsrps.c @@ -46,7 +46,8 @@ typedef struct { } librpz_emsg_t; #endif /* ifdef USE_DNSRPS */ -static bool link_dnsrps(librpz_emsg_t *emsg); +static bool +link_dnsrps(librpz_emsg_t *emsg); #define USAGE "usage: [-ap] [-n domain] [-w sec.onds]\n" diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c index 06435a31a3b53c316b7722a866ab77c06132ba0b..3e6c7e73ede50ad254d63e52332d266fdea8cb0c 100644 --- a/bin/tests/wire_test.c +++ b/bin/tests/wire_test.c @@ -29,9 +29,11 @@ isc_mem_t *mctx = NULL; bool printmemstats = false; bool dorender = false; -static void process_message(isc_buffer_t *source); +static void +process_message(isc_buffer_t *source); -static isc_result_t printmessage(dns_message_t *msg); +static isc_result_t +printmessage(dns_message_t *msg); static inline void CHECKRESULT(isc_result_t result, const char *msg) { diff --git a/bin/tools/dnstap-read.c b/bin/tools/dnstap-read.c index 830626f7b7bae28dbd65c0224ed7970f7af83893..f6fca991a14fc5a35d28e20a2c39038c3a0024bc 100644 --- a/bin/tools/dnstap-read.c +++ b/bin/tools/dnstap-read.c @@ -68,8 +68,8 @@ const char *program = "dnstap-read"; } \ } while (0) -ISC_PLATFORM_NORETURN_PRE static void fatal(const char *format, - ...) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +fatal(const char *format, ...) ISC_PLATFORM_NORETURN_POST; static void fatal(const char *format, ...) { diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c index 4af29957e34a3d359faf8ab813c89802f2ccd70f..231bdfb127710ddb487d1e86465cf42de2b4fcd6 100644 --- a/bin/tools/mdig.c +++ b/bin/tools/mdig.c @@ -781,7 +781,8 @@ sendqueries(isc_task_t *task, isc_event_t *event) { return; } -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { @@ -891,7 +892,8 @@ help(void) { stdout); } -ISC_PLATFORM_NORETURN_PRE static void fatal(const char *format, ...) +ISC_PLATFORM_NORETURN_PRE static void +fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2) ISC_PLATFORM_NORETURN_POST; static void diff --git a/bin/tools/named-rrchecker.c b/bin/tools/named-rrchecker.c index 57a493198fe534dcfab3f98ee4ca727c70394d2c..d82a17049c4cc96328948a6eebd62b9032ab6816 100644 --- a/bin/tools/named-rrchecker.c +++ b/bin/tools/named-rrchecker.c @@ -32,7 +32,8 @@ static isc_lex_t *lex; static isc_lexspecials_t specials; -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { @@ -48,8 +49,8 @@ usage(void) { exit(0); } -ISC_PLATFORM_NORETURN_PRE static void fatal(const char *format, - ...) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +fatal(const char *format, ...) ISC_PLATFORM_NORETURN_POST; static void fatal(const char *format, ...) { diff --git a/bin/tools/nsec3hash.c b/bin/tools/nsec3hash.c index 9f0739b0e7ffd1b928911393451739c812fbab3d..d72e64c42b671674b807e9c9897c0c40846914e5 100644 --- a/bin/tools/nsec3hash.c +++ b/bin/tools/nsec3hash.c @@ -32,8 +32,8 @@ const char *program = "nsec3hash"; -ISC_PLATFORM_NORETURN_PRE static void fatal(const char *format, - ...) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +fatal(const char *format, ...) ISC_PLATFORM_NORETURN_POST; static void fatal(const char *format, ...) { @@ -63,9 +63,9 @@ usage() { exit(1); } -typedef void nsec3printer(unsigned algo, unsigned flags, unsigned iters, - const char *saltstr, const char *domain, - const char *digest); +typedef void +nsec3printer(unsigned algo, unsigned flags, unsigned iters, const char *saltstr, + const char *domain, const char *digest); static void nsec3hash(nsec3printer *nsec3print, const char *algostr, const char *flagstr, diff --git a/bin/win32/BINDInstall/AccountInfo.h b/bin/win32/BINDInstall/AccountInfo.h index 4a23d00970e21a09c1c4f9e57f4984cfea33fdb0..1c3e9da0419d9a7541341bf8e453eb4acd3811bc 100644 --- a/bin/win32/BINDInstall/AccountInfo.h +++ b/bin/win32/BINDInstall/AccountInfo.h @@ -21,12 +21,15 @@ * a given account as well as the groups to which it beongs */ int -GetAccountPrivileges(char * name, /* Name of Account */ - wchar_t ** PrivList, /* List of Privileges returned */ - unsigned int *PrivCount, /* Count of Privileges returned */ - char **Groups, /* List of Groups to which account belongs - */ - unsigned int *totalGroups, /* Count of Groups returned */ +GetAccountPrivileges(char *name, /* Name of Account */ + wchar_t **PrivList, /* List of Privileges returned */ + unsigned int *PrivCount, /* Count of Privileges + returned */ + char **Groups, /* List of Groups to which account + * belongs + */ + unsigned int *totalGroups, /* Count of Groups returned + */ int maxGroups /* Maximum number of Groups to return */ ); diff --git a/bin/win32/BINDInstall/BINDInstallDlg.h b/bin/win32/BINDInstall/BINDInstallDlg.h index 576ccd2621375b4ab9f30eae2004e8b3a992c3b5..f6971f6df5b0e55a3d2546e1d0a96525ad0053bf 100644 --- a/bin/win32/BINDInstall/BINDInstallDlg.h +++ b/bin/win32/BINDInstall/BINDInstallDlg.h @@ -37,11 +37,11 @@ class CBINDInstallDlg : public CDialog { enum { IDD = IDD_BINDINSTALL_DIALOG }; CString m_targetDir; CString m_version; - BOOL m_autoStart; - BOOL m_keepFiles; - BOOL m_toolsOnly; + BOOL m_autoStart; + BOOL m_keepFiles; + BOOL m_toolsOnly; CString m_current; - BOOL m_startOnInstall; + BOOL m_startOnInstall; /*}}AFX_DATA */ /* ClassWizard generated virtual function overrides */ @@ -119,20 +119,20 @@ class CBINDInstallDlg : public CDialog { void ProgramGroupRemove(TCHAR *commonPath); - HICON m_hIcon; + HICON m_hIcon; CString m_defaultDir; CString m_etcDir; CString m_binDir; CString m_winSysDir; - BOOL m_installed; + BOOL m_installed; CString m_currentDir; - BOOL m_accountExists; - BOOL m_accountUsed; + BOOL m_accountExists; + BOOL m_accountUsed; CString m_currentAccount; CString m_accountName; CString m_accountPasswordConfirm; CString m_accountPassword; - BOOL m_serviceExists; + BOOL m_serviceExists; /* Generated message map functions */ /*{{AFX_MSG(CBINDInstallDlg) */ diff --git a/bin/win32/BINDInstall/DirBrowse.h b/bin/win32/BINDInstall/DirBrowse.h index 1e75dc4b50ad068325e758ed20cdf30399a7d1a1..1780fa6c7ab4e40a41bc45bb7fd493d0eaf3c234 100644 --- a/bin/win32/BINDInstall/DirBrowse.h +++ b/bin/win32/BINDInstall/DirBrowse.h @@ -33,7 +33,7 @@ class CDirBrowse : public CDialog { /* Construction */ public: CDirBrowse(CString initialDir = "\\", - CWnd * pParent = NULL); /* standard + CWnd *pParent = NULL); /* standard * constructor */ CString diff --git a/bin/win32/BINDInstall/VersionInfo.h b/bin/win32/BINDInstall/VersionInfo.h index 5191ddb6381a6747da45d2f038b7bbb2ab876b06..9b8d212b0870cb452e6698fbe6784c17c2713e1c 100644 --- a/bin/win32/BINDInstall/VersionInfo.h +++ b/bin/win32/BINDInstall/VersionInfo.h @@ -76,12 +76,12 @@ class CVersionInfo { GetFileSubType(); private: - CString m_filename; - BOOL m_isValid; - LPVOID m_versionInfo; + CString m_filename; + BOOL m_isValid; + LPVOID m_versionInfo; VS_FIXEDFILEINFO *m_fixedInfo; - DWORD m_codePage; - DWORD m_status; + DWORD m_codePage; + DWORD m_status; CString QueryStringValue(CString value); diff --git a/conftools/perllib/dnsconf/DNSConf-macros.h b/conftools/perllib/dnsconf/DNSConf-macros.h index 2e6544d535b4db84406981ef94b5a3e5af35d164..5e602e6521a2837b89d63f5e9760dfe2557a469a 100644 --- a/conftools/perllib/dnsconf/DNSConf-macros.h +++ b/conftools/perllib/dnsconf/DNSConf-macros.h @@ -10,28 +10,26 @@ */ #define CONCAT(a, b) a##b -#define DNSCONF_SET_STRING(FIELD) \ - void CONCAT(DNSConf_set, FIELD)(DNSConf * cfg, const char *arg) \ - { \ - DBGPRINT("inside DNSConf_set" #FIELD "\n"); \ - \ - if (!DNSConf_initctx(cfg)) \ - return; \ - \ - if (arg == NULL) { \ - DBGPRINT("null pointer\n"); \ - CONCAT(dns_c_ctx_unset, FIELD)(cfg->confctx); \ - } else if (*arg == '\0') { \ - DBGPRINT("empty string\n"); \ - CONCAT(dns_c_ctx_unset, FIELD)(cfg->confctx); \ - } else \ - CONCAT(dns_c_ctx_set, FIELD)(cfg->confctx, arg); \ +#define DNSCONF_SET_STRING(FIELD) \ + void CONCAT(DNSConf_set, FIELD)(DNSConf * cfg, const char *arg) { \ + DBGPRINT("inside DNSConf_set" #FIELD "\n"); \ + \ + if (!DNSConf_initctx(cfg)) \ + return; \ + \ + if (arg == NULL) { \ + DBGPRINT("null pointer\n"); \ + CONCAT(dns_c_ctx_unset, FIELD)(cfg->confctx); \ + } else if (*arg == '\0') { \ + DBGPRINT("empty string\n"); \ + CONCAT(dns_c_ctx_unset, FIELD)(cfg->confctx); \ + } else \ + CONCAT(dns_c_ctx_set, FIELD)(cfg->confctx, arg); \ } #define DNSCONF_GET_STRING(FIELD) \ - char *CONCAT(DNSConf_get, FIELD)(DNSConf * cfg) \ - { \ - char * result = NULL; \ + char *CONCAT(DNSConf_get, FIELD)(DNSConf * cfg) { \ + char *result = NULL; \ isc_result_t tmpres; \ \ if (cfg == NULL || cfg->confctx == NULL) \ diff --git a/contrib/dlz/bin/dlzbdb/dlzbdb.c b/contrib/dlz/bin/dlzbdb/dlzbdb.c index 848a4e2423e330bb9aaca6df20c548b29f228768..6ce3c408901a1f16082b6a5e63f9995bc6808c16 100644 --- a/contrib/dlz/bin/dlzbdb/dlzbdb.c +++ b/contrib/dlz/bin/dlzbdb/dlzbdb.c @@ -69,35 +69,47 @@ /* shut up compiler warnings about no previous prototype */ -static void show_usage(void); +static void +show_usage(void); -int getzone(DB *dbp, const DBT *pkey, const DBT *pdata, DBT *skey); +int +getzone(DB *dbp, const DBT *pkey, const DBT *pdata, DBT *skey); -int gethost(DB *dbp, const DBT *pkey, const DBT *pdata, DBT *skey); +int +gethost(DB *dbp, const DBT *pkey, const DBT *pdata, DBT *skey); -void bdb_cleanup(void); +void +bdb_cleanup(void); -isc_result_t bdb_opendb(DBTYPE db_type, DB **db_out, const char *db_name, - int flags); +isc_result_t +bdb_opendb(DBTYPE db_type, DB **db_out, const char *db_name, int flags); -void put_data(bool dns_data, char *input_key, char *input_data); +void +put_data(bool dns_data, char *input_key, char *input_data); -void insert_data(void); +void +insert_data(void); -isc_result_t openBDB(void); +isc_result_t +openBDB(void); -isc_result_t open_lexer(void); +isc_result_t +open_lexer(void); -void close_lexer(void); +void +close_lexer(void); -isc_result_t bulk_write(char type, DB *database, DBC *dbcursor, DBT *bdbkey, - DBT *bdbdata); +isc_result_t +bulk_write(char type, DB *database, DBC *dbcursor, DBT *bdbkey, DBT *bdbdata); -void operation_add(void); +void +operation_add(void); -void operation_bulk(void); +void +operation_bulk(void); -void operation_listOrDelete(bool dlt); +void +operation_listOrDelete(bool dlt); /*% * Maximum length of a single data line that @@ -247,8 +259,7 @@ isc_buffer_t lex_buffer; /*%< buffer for lexer during add operation */ */ static void -show_usage(void) -{ +show_usage(void) { fprintf(stderr, "\n\n\ ---Usage:---------------------------------------------------------------------\ \n\n\ @@ -292,8 +303,7 @@ c mynm.com 192.168.0.10\n\ /*% BDB callback to create zone secondary index */ int -getzone(DB *dbp, const DBT *pkey, const DBT *pdata, DBT *skey) -{ +getzone(DB *dbp, const DBT *pkey, const DBT *pdata, DBT *skey) { char *token, *last; UNUSED(dbp); @@ -319,8 +329,7 @@ getzone(DB *dbp, const DBT *pkey, const DBT *pdata, DBT *skey) */ int -gethost(DB *dbp, const DBT *pkey, const DBT *pdata, DBT *skey) -{ +gethost(DB *dbp, const DBT *pkey, const DBT *pdata, DBT *skey) { char *token, *last; UNUSED(dbp); @@ -354,8 +363,7 @@ gethost(DB *dbp, const DBT *pkey, const DBT *pdata, DBT *skey) */ void -bdb_cleanup(void) -{ +bdb_cleanup(void) { /* close cursors */ if (db.cursor4 != NULL) { db.cursor4->c_close(db.cursor4); @@ -405,8 +413,7 @@ bdb_cleanup(void) /*% Initializes, sets flags and then opens Berkeley databases. */ isc_result_t -bdb_opendb(DBTYPE db_type, DB **db_out, const char *db_name, int flags) -{ +bdb_opendb(DBTYPE db_type, DB **db_out, const char *db_name, int flags) { int result; int createFlag = 0; @@ -451,8 +458,7 @@ bdb_opendb(DBTYPE db_type, DB **db_out, const char *db_name, int flags) */ void -put_data(bool dns_data, char *input_key, char *input_data) -{ +put_data(bool dns_data, char *input_key, char *input_data) { int bdbres; DBT key, data; @@ -487,8 +493,7 @@ put_data(bool dns_data, char *input_key, char *input_data) } void -insert_data(void) -{ +insert_data(void) { unsigned int opt = ISC_LEXOPT_EOL | /* Want end-of-line token. */ ISC_LEXOPT_EOF | /* Want end-of-file token. */ ISC_LEXOPT_QSTRING | /* Recognize qstrings. */ @@ -613,8 +618,7 @@ data_cleanup: } isc_result_t -openBDB(void) -{ +openBDB(void) { int bdbres; isc_result_t result; @@ -707,8 +711,7 @@ openBDB_cleanup: /*% Create & open lexer to parse input data */ isc_result_t -open_lexer(void) -{ +open_lexer(void) { isc_result_t result; /* check if we already opened the lexer, if we did, return success */ @@ -744,8 +747,7 @@ open_lexer(void) /*% Close the lexer, and cleanup memory */ void -close_lexer(void) -{ +close_lexer(void) { /* If lexer is still open, close it & destroy it. */ if (lexer != NULL) { isc_lex_close(lexer); @@ -761,8 +763,7 @@ close_lexer(void) /*% Perform add operation */ void -operation_add(void) -{ +operation_add(void) { /* check for any parameters that are not allowed during add */ checkInvalidParam(key, "k", "for add operation"); checkInvalidParam(zone, "z", "for add operation"); @@ -793,8 +794,7 @@ operation_add(void) /*% Perform bulk insert operation */ void -operation_bulk(void) -{ +operation_bulk(void) { /* check for any parameters that are not allowed during bulk */ checkInvalidParam(key, "k", "for bulk load operation"); checkInvalidParam(zone, "z", "for bulk load operation"); @@ -827,8 +827,7 @@ operation_bulk(void) } isc_result_t -bulk_write(char type, DB *database, DBC *dbcursor, DBT *bdbkey, DBT *bdbdata) -{ +bulk_write(char type, DB *database, DBC *dbcursor, DBT *bdbkey, DBT *bdbdata) { int bdbres; db_recno_t recNum; char *retkey = NULL, *retdata; @@ -910,8 +909,7 @@ bulk_write(char type, DB *database, DBC *dbcursor, DBT *bdbkey, DBT *bdbdata) */ void -operation_listOrDelete(bool dlt) -{ +operation_listOrDelete(bool dlt) { int bdbres = 0; DBC *curList[3]; DBT bdbkey, bdbdata; @@ -1160,8 +1158,7 @@ operation_listOrDelete(bool dlt) } int -main(int argc, char **argv) -{ +main(int argc, char **argv) { int ch; char *endp; diff --git a/contrib/dlz/drivers/dlz_bdb_driver.c b/contrib/dlz/drivers/dlz_bdb_driver.c index df9ee3c1fb6efea743ae7e43e9b8b5d16f768098..4524f47a1a760095bc52cdb8b189b94b8c7715b0 100644 --- a/contrib/dlz/drivers/dlz_bdb_driver.c +++ b/contrib/dlz/drivers/dlz_bdb_driver.c @@ -94,10 +94,9 @@ typedef struct parsed_data { /* forward reference */ -static isc_result_t bdb_findzone(void *driverarg, void *dbdata, - const char *name, - dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo); +static isc_result_t +bdb_findzone(void *driverarg, void *dbdata, const char *name, + dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo); /*% * Parses the DBT from the Berkeley DB into a parsed_data record @@ -108,8 +107,7 @@ static isc_result_t bdb_findzone(void *driverarg, void *dbdata, */ static isc_result_t -bdb_parse_data(char *in, parsed_data_t *pd) -{ +bdb_parse_data(char *in, parsed_data_t *pd) { char *endp, *ttlStr; char *tmp = in; char *lastchar = (char *)&tmp[strlen(tmp) + 1]; @@ -209,8 +207,7 @@ bdb_parse_data(char *in, parsed_data_t *pd) static isc_result_t bdb_allowzonexfr(void *driverarg, void *dbdata, const char *name, - const char *client) -{ + const char *client) { isc_result_t result; bdb_instance_t *db = (bdb_instance_t *)dbdata; DBC *client_cursor = NULL; @@ -280,8 +277,7 @@ xfr_cleanup: static isc_result_t bdb_allnodes(const char *zone, void *driverarg, void *dbdata, - dns_sdlzallnodes_t *allnodes) -{ + dns_sdlzallnodes_t *allnodes) { isc_result_t result = ISC_R_NOTFOUND; bdb_instance_t *db = (bdb_instance_t *)dbdata; DBC *zone_cursor = NULL; @@ -361,8 +357,7 @@ allnodes_cleanup: */ static void -bdb_cleanup(bdb_instance_t *db) -{ +bdb_cleanup(bdb_instance_t *db) { isc_mem_t *mctx; /* close databases */ @@ -395,8 +390,7 @@ bdb_cleanup(bdb_instance_t *db) static isc_result_t bdb_findzone(void *driverarg, void *dbdata, const char *name, - dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) -{ + dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { isc_result_t result; bdb_instance_t *db = (bdb_instance_t *)dbdata; DBC *zone_cursor = NULL; @@ -459,8 +453,7 @@ findzone_cleanup: static isc_result_t bdb_lookup(const char *zone, const char *name, void *driverarg, void *dbdata, dns_sdlzlookup_t *lookup, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo) -{ + dns_clientinfo_t *clientinfo) { isc_result_t result = ISC_R_NOTFOUND; bdb_instance_t *db = (bdb_instance_t *)dbdata; DBC *zone_cursor = NULL; @@ -581,8 +574,7 @@ lookup_cleanup: static isc_result_t bdb_opendb(DB_ENV *db_env, DBTYPE db_type, DB **db, const char *db_name, - char *db_file, int flags) -{ + char *db_file, int flags) { int result; /* Initialize the database. */ @@ -622,8 +614,7 @@ bdb_opendb(DB_ENV *db_env, DBTYPE db_type, DB **db, const char *db_name, static isc_result_t bdb_create(const char *dlzname, unsigned int argc, char *argv[], - void *driverarg, void **dbdata) -{ + void *driverarg, void **dbdata) { isc_result_t result; int bdbres; bdb_instance_t *db = NULL; @@ -738,8 +729,7 @@ init_cleanup: } static void -bdb_destroy(void *driverarg, void *dbdata) -{ +bdb_destroy(void *driverarg, void *dbdata) { UNUSED(driverarg); bdb_cleanup((bdb_instance_t *)dbdata); @@ -767,8 +757,7 @@ static dns_sdlzmethods_t dlz_bdb_methods = { * Wrapper around dns_sdlzregister(). */ isc_result_t -dlz_bdb_init(void) -{ +dlz_bdb_init(void) { isc_result_t result; /* @@ -796,8 +785,7 @@ dlz_bdb_init(void) * Wrapper around dns_sdlzunregister(). */ void -dlz_bdb_clear(void) -{ +dlz_bdb_clear(void) { /* * Write debugging message to log */ diff --git a/contrib/dlz/drivers/dlz_bdbhpt_driver.c b/contrib/dlz/drivers/dlz_bdbhpt_driver.c index ac52f2b8152b15b84849514432bbf0d540a303ab..9fbe174b3a9ebc1bc799e1f755687e060cdf1cb8 100644 --- a/contrib/dlz/drivers/dlz_bdbhpt_driver.c +++ b/contrib/dlz/drivers/dlz_bdbhpt_driver.c @@ -92,18 +92,16 @@ typedef struct bdbhpt_parsed_data { /* forward reference */ -static isc_result_t bdbhpt_findzone(void *driverarg, void *dbdata, - const char *name, - dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo); +static isc_result_t +bdbhpt_findzone(void *driverarg, void *dbdata, const char *name, + dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo); /*% * Reverses a string in place. */ static char * -bdbhpt_strrev(char *str) -{ +bdbhpt_strrev(char *str) { char *p1, *p2; if (!str || !*str) { @@ -126,8 +124,7 @@ bdbhpt_strrev(char *str) */ static isc_result_t -bdbhpt_parse_data(char *in, bdbhpt_parsed_data_t *pd) -{ +bdbhpt_parse_data(char *in, bdbhpt_parsed_data_t *pd) { char *endp, *ttlStr; char *tmp = in; char *lastchar = (char *)&tmp[strlen(tmp)]; @@ -237,8 +234,7 @@ bdbhpt_parse_data(char *in, bdbhpt_parsed_data_t *pd) static isc_result_t bdbhpt_allowzonexfr(void *driverarg, void *dbdata, const char *name, - const char *client) -{ + const char *client) { isc_result_t result; bdbhpt_instance_t *db = (bdbhpt_instance_t *)dbdata; DBT key, data; @@ -321,8 +317,7 @@ xfr_cleanup: static isc_result_t bdbhpt_allnodes(const char *zone, void *driverarg, void *dbdata, - dns_sdlzallnodes_t *allnodes) -{ + dns_sdlzallnodes_t *allnodes) { isc_result_t result = ISC_R_NOTFOUND; bdbhpt_instance_t *db = (bdbhpt_instance_t *)dbdata; DBC *xfr_cursor = NULL; @@ -456,8 +451,7 @@ allnodes_cleanup: */ static void -bdbhpt_cleanup(bdbhpt_instance_t *db) -{ +bdbhpt_cleanup(bdbhpt_instance_t *db) { isc_mem_t *mctx; /* close databases */ @@ -490,8 +484,8 @@ bdbhpt_cleanup(bdbhpt_instance_t *db) static isc_result_t bdbhpt_findzone(void *driverarg, void *dbdata, const char *name, - dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) -{ + dns_clientinfomethods_t *methods, + dns_clientinfo_t *clientinfo) { isc_result_t result; bdbhpt_instance_t *db = (bdbhpt_instance_t *)dbdata; DBT key, data; @@ -545,8 +539,7 @@ bdbhpt_findzone(void *driverarg, void *dbdata, const char *name, static isc_result_t bdbhpt_lookup(const char *zone, const char *name, void *driverarg, void *dbdata, dns_sdlzlookup_t *lookup, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo) -{ + dns_clientinfo_t *clientinfo) { isc_result_t result = ISC_R_NOTFOUND; bdbhpt_instance_t *db = (bdbhpt_instance_t *)dbdata; DBC *data_cursor = NULL; @@ -628,8 +621,7 @@ lookup_cleanup: static isc_result_t bdbhpt_opendb(DB_ENV *db_env, DBTYPE db_type, DB **db, const char *db_name, - char *db_file, int flags) -{ + char *db_file, int flags) { int result; /* Initialize the database. */ @@ -669,8 +661,7 @@ bdbhpt_opendb(DB_ENV *db_env, DBTYPE db_type, DB **db, const char *db_name, static isc_result_t bdbhpt_create(const char *dlzname, unsigned int argc, char *argv[], - void *driverarg, void **dbdata) -{ + void *driverarg, void **dbdata) { isc_result_t result; int bdbhptres; int bdbFlags = 0; @@ -805,8 +796,7 @@ init_cleanup: } static void -bdbhpt_destroy(void *driverarg, void *dbdata) -{ +bdbhpt_destroy(void *driverarg, void *dbdata) { UNUSED(driverarg); bdbhpt_cleanup((bdbhpt_instance_t *)dbdata); @@ -836,8 +826,7 @@ static dns_sdlzmethods_t dlz_bdbhpt_methods = { * Wrapper around dns_sdlzregister(). */ isc_result_t -dlz_bdbhpt_init(void) -{ +dlz_bdbhpt_init(void) { isc_result_t result; /* @@ -865,8 +854,7 @@ dlz_bdbhpt_init(void) * Wrapper around dns_sdlzunregister(). */ void -dlz_bdbhpt_clear(void) -{ +dlz_bdbhpt_clear(void) { /* * Write debugging message to log */ diff --git a/contrib/dlz/drivers/dlz_drivers.c b/contrib/dlz/drivers/dlz_drivers.c index 4da516223dae6cee92b87cea87f06c95e576d6ad..5f5b66e8840e94b92ed69aec67047ce4119e83d4 100644 --- a/contrib/dlz/drivers/dlz_drivers.c +++ b/contrib/dlz/drivers/dlz_drivers.c @@ -62,8 +62,7 @@ */ isc_result_t -dlz_drivers_init(void) -{ +dlz_drivers_init(void) { isc_result_t result = ISC_R_SUCCESS; #ifdef DLZ_STUB @@ -127,8 +126,7 @@ dlz_drivers_init(void) */ void -dlz_drivers_clear(void) -{ +dlz_drivers_clear(void) { #ifdef DLZ_STUB dlz_stub_clear(); #endif /* ifdef DLZ_STUB */ diff --git a/contrib/dlz/drivers/dlz_filesystem_driver.c b/contrib/dlz/drivers/dlz_filesystem_driver.c index db1005271019221bd5f3eb0bb681bc3c25d1de91..ec80a704cb513d4db0761a3cb5539925c6ae9989 100644 --- a/contrib/dlz/drivers/dlz_filesystem_driver.c +++ b/contrib/dlz/drivers/dlz_filesystem_driver.c @@ -89,15 +89,15 @@ typedef ISC_LIST(dir_entry_t) dlist_t; /* forward reference */ -static void fs_destroy(void *driverarg, void *dbdata); +static void +fs_destroy(void *driverarg, void *dbdata); /* * Private methods */ static bool -is_safe(const char *input) -{ +is_safe(const char *input) { unsigned int i; unsigned int len = strlen(input); @@ -165,8 +165,7 @@ is_safe(const char *input) } static void -create_path_helper(char *out, const char *in, config_data_t *cd) -{ +create_path_helper(char *out, const char *in, config_data_t *cd) { char *tmpString; char *tmpPtr; int i; @@ -229,8 +228,7 @@ create_path_helper(char *out, const char *in, config_data_t *cd) static isc_result_t create_path(const char *zone, const char *host, const char *client, - config_data_t *cd, char **path) -{ + config_data_t *cd, char **path) { char *tmpPath; int pathsize; int len; @@ -346,8 +344,7 @@ create_path(const char *zone, const char *host, const char *client, static isc_result_t process_dir(isc_dir_t *dir, void *passback, config_data_t *cd, - dlist_t *dir_list, unsigned int basedirlen) -{ + dlist_t *dir_list, unsigned int basedirlen) { char tmp[PATH_MAX + NAME_MAX]; int astPos; struct stat sb; @@ -574,8 +571,7 @@ process_dir(isc_dir_t *dir, void *passback, config_data_t *cd, static isc_result_t fs_allowzonexfr(void *driverarg, void *dbdata, const char *name, - const char *client) -{ + const char *client) { isc_result_t result; char *path; struct stat sb; @@ -609,8 +605,7 @@ complete_AXFR: static isc_result_t fs_allnodes(const char *zone, void *driverarg, void *dbdata, - dns_sdlzallnodes_t *allnodes) -{ + dns_sdlzallnodes_t *allnodes) { isc_result_t result; dlist_t *dir_list; config_data_t *cd; @@ -724,8 +719,7 @@ complete_allnds: static isc_result_t fs_findzone(void *driverarg, void *dbdata, const char *name, - dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) -{ + dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { isc_result_t result; char *path; struct stat sb; @@ -767,8 +761,7 @@ complete_FZ: static isc_result_t fs_lookup(const char *zone, const char *name, void *driverarg, void *dbdata, dns_sdlzlookup_t *lookup, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo) -{ + dns_clientinfo_t *clientinfo) { isc_result_t result; char *path; struct stat sb; @@ -841,8 +834,7 @@ complete_lkup: static isc_result_t fs_create(const char *dlzname, unsigned int argc, char *argv[], void *driverarg, - void **dbdata) -{ + void **dbdata) { config_data_t *cd; char *endp; int len; @@ -929,8 +921,7 @@ fs_create(const char *dlzname, unsigned int argc, char *argv[], void *driverarg, } static void -fs_destroy(void *driverarg, void *dbdata) -{ +fs_destroy(void *driverarg, void *dbdata) { isc_mem_t *mctx; config_data_t *cd; @@ -982,8 +973,7 @@ static dns_sdlzmethods_t dlz_fs_methods = { * Wrapper around dns_sdlzregister(). */ isc_result_t -dlz_fs_init(void) -{ +dlz_fs_init(void) { isc_result_t result; /* @@ -1010,8 +1000,7 @@ dlz_fs_init(void) * Wrapper around dns_sdlzunregister(). */ void -dlz_fs_clear(void) -{ +dlz_fs_clear(void) { /* * Write debugging message to log */ diff --git a/contrib/dlz/drivers/dlz_ldap_driver.c b/contrib/dlz/drivers/dlz_ldap_driver.c index 4748d38f63df0abf9cced9c831d11e6c19146f0c..9f37baa5bd58d318c0bbb163814617ec030ef2db 100644 --- a/contrib/dlz/drivers/dlz_ldap_driver.c +++ b/contrib/dlz/drivers/dlz_ldap_driver.c @@ -101,12 +101,13 @@ typedef struct { /* forward references */ -static isc_result_t dlz_ldap_findzone(void *driverarg, void *dbdata, - const char *name, - dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo); +static isc_result_t +dlz_ldap_findzone(void *driverarg, void *dbdata, const char *name, + dns_clientinfomethods_t *methods, + dns_clientinfo_t *clientinfo); -static void dlz_ldap_destroy(void *driverarg, void *dbdata); +static void +dlz_ldap_destroy(void *driverarg, void *dbdata); /* * Private methods @@ -114,8 +115,7 @@ static void dlz_ldap_destroy(void *driverarg, void *dbdata); /*% checks that the LDAP URL parameters make sense */ static isc_result_t -dlz_ldap_checkURL(char *URL, int attrCnt, const char *msg) -{ +dlz_ldap_checkURL(char *URL, int attrCnt, const char *msg) { isc_result_t result = ISC_R_SUCCESS; int ldap_result; LDAPURLDesc *ldap_url = NULL; @@ -191,8 +191,7 @@ cleanup: /*% Connects / reconnects to LDAP server */ static isc_result_t -dlz_ldap_connect(ldap_instance_t *dbi, dbinstance_t *dbc) -{ +dlz_ldap_connect(ldap_instance_t *dbi, dbinstance_t *dbc) { isc_result_t result; int ldap_result; @@ -246,8 +245,7 @@ cleanup: * multithreaded operation. */ static void -ldap_destroy_dblist(db_list_t *dblist) -{ +ldap_destroy_dblist(db_list_t *dblist) { dbinstance_t *ndbi = NULL; dbinstance_t *dbi = NULL; @@ -281,8 +279,7 @@ ldap_destroy_dblist(db_list_t *dblist) * multithreaded operation. */ static dbinstance_t * -ldap_find_avail_conn(db_list_t *dblist) -{ +ldap_find_avail_conn(db_list_t *dblist) { dbinstance_t *dbi = NULL; dbinstance_t *head; int count = 0; @@ -315,8 +312,7 @@ ldap_find_avail_conn(db_list_t *dblist) static isc_result_t ldap_process_results(LDAP *dbc, LDAPMessage *msg, char **attrs, void *ptr, - bool allnodes) -{ + bool allnodes) { isc_result_t result = ISC_R_SUCCESS; int i = 0; int j; @@ -553,8 +549,7 @@ cleanup: */ static isc_result_t ldap_get_results(const char *zone, const char *record, const char *client, - unsigned int query, void *dbdata, void *ptr) -{ + unsigned int query, void *dbdata, void *ptr) { isc_result_t result; dbinstance_t *dbi = NULL; char *querystring = NULL; @@ -839,8 +834,7 @@ cleanup: */ static isc_result_t dlz_ldap_allowzonexfr(void *driverarg, void *dbdata, const char *name, - const char *client) -{ + const char *client) { isc_result_t result; UNUSED(driverarg); @@ -858,16 +852,14 @@ dlz_ldap_allowzonexfr(void *driverarg, void *dbdata, const char *name, static isc_result_t dlz_ldap_allnodes(const char *zone, void *driverarg, void *dbdata, - dns_sdlzallnodes_t *allnodes) -{ + dns_sdlzallnodes_t *allnodes) { UNUSED(driverarg); return (ldap_get_results(zone, NULL, NULL, ALLNODES, dbdata, allnodes)); } static isc_result_t dlz_ldap_authority(const char *zone, void *driverarg, void *dbdata, - dns_sdlzlookup_t *lookup) -{ + dns_sdlzlookup_t *lookup) { UNUSED(driverarg); return (ldap_get_results(zone, NULL, NULL, AUTHORITY, dbdata, lookup)); } @@ -875,8 +867,7 @@ dlz_ldap_authority(const char *zone, void *driverarg, void *dbdata, static isc_result_t dlz_ldap_findzone(void *driverarg, void *dbdata, const char *name, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo) -{ + dns_clientinfo_t *clientinfo) { UNUSED(driverarg); UNUSED(methods); UNUSED(clientinfo); @@ -886,8 +877,8 @@ dlz_ldap_findzone(void *driverarg, void *dbdata, const char *name, static isc_result_t dlz_ldap_lookup(const char *zone, const char *name, void *driverarg, void *dbdata, dns_sdlzlookup_t *lookup, - dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) -{ + dns_clientinfomethods_t *methods, + dns_clientinfo_t *clientinfo) { isc_result_t result; UNUSED(driverarg); @@ -906,8 +897,7 @@ dlz_ldap_lookup(const char *zone, const char *name, void *driverarg, static isc_result_t dlz_ldap_create(const char *dlzname, unsigned int argc, char *argv[], - void *driverarg, void **dbdata) -{ + void *driverarg, void **dbdata) { isc_result_t result; ldap_instance_t *ldap_inst = NULL; dbinstance_t *dbi = NULL; @@ -1154,8 +1144,7 @@ cleanup: } void -dlz_ldap_destroy(void *driverarg, void *dbdata) -{ +dlz_ldap_destroy(void *driverarg, void *dbdata) { UNUSED(driverarg); if (dbdata != NULL) { @@ -1203,8 +1192,7 @@ static dns_sdlzmethods_t dlz_ldap_methods = { * Wrapper around dns_sdlzregister(). */ isc_result_t -dlz_ldap_init(void) -{ +dlz_ldap_init(void) { isc_result_t result; /* @@ -1231,8 +1219,7 @@ dlz_ldap_init(void) * Wrapper around dns_sdlzunregister(). */ void -dlz_ldap_clear(void) -{ +dlz_ldap_clear(void) { /* * Write debugging message to log */ diff --git a/contrib/dlz/drivers/dlz_mysql_driver.c b/contrib/dlz/drivers/dlz_mysql_driver.c index 57885476f7f3b60925c8ad4d7b5d2217d7a91bfe..75633984503965bb7e71506794aa4a9f683597eb 100644 --- a/contrib/dlz/drivers/dlz_mysql_driver.c +++ b/contrib/dlz/drivers/dlz_mysql_driver.c @@ -87,8 +87,7 @@ static dns_sdlzimplementation_t *dlz_mysql = NULL; */ static char * -mysqldrv_escape_string(MYSQL *mysql, const char *instr) -{ +mysqldrv_escape_string(MYSQL *mysql, const char *instr) { char *outstr; unsigned int len; @@ -117,8 +116,7 @@ mysqldrv_escape_string(MYSQL *mysql, const char *instr) static isc_result_t mysql_get_resultset(const char *zone, const char *record, const char *client, - unsigned int query, void *dbdata, MYSQL_RES **rs) -{ + unsigned int query, void *dbdata, MYSQL_RES **rs) { isc_result_t result; dbinstance_t *dbi = NULL; char *querystring = NULL; @@ -357,8 +355,7 @@ cleanup: */ static isc_result_t -mysql_process_rs(dns_sdlzlookup_t *lookup, MYSQL_RES *rs) -{ +mysql_process_rs(dns_sdlzlookup_t *lookup, MYSQL_RES *rs) { isc_result_t result = ISC_R_NOTFOUND; MYSQL_ROW row; unsigned int fields; @@ -475,8 +472,7 @@ mysql_process_rs(dns_sdlzlookup_t *lookup, MYSQL_RES *rs) static isc_result_t mysql_findzone(void *driverarg, void *dbdata, const char *name, - dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) -{ + dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { isc_result_t result; MYSQL_RES *rs = NULL; my_ulonglong rows; @@ -516,8 +512,7 @@ mysql_findzone(void *driverarg, void *dbdata, const char *name, /*% Determine if the client is allowed to perform a zone transfer */ static isc_result_t mysql_allowzonexfr(void *driverarg, void *dbdata, const char *name, - const char *client) -{ + const char *client) { isc_result_t result; MYSQL_RES *rs = NULL; my_ulonglong rows; @@ -575,8 +570,7 @@ mysql_allowzonexfr(void *driverarg, void *dbdata, const char *name, */ static isc_result_t mysql_allnodes(const char *zone, void *driverarg, void *dbdata, - dns_sdlzallnodes_t *allnodes) -{ + dns_sdlzallnodes_t *allnodes) { isc_result_t result; MYSQL_RES *rs = NULL; MYSQL_ROW row; @@ -681,8 +675,7 @@ mysql_allnodes(const char *zone, void *driverarg, void *dbdata, static isc_result_t mysql_authority(const char *zone, void *driverarg, void *dbdata, - dns_sdlzlookup_t *lookup) -{ + dns_sdlzlookup_t *lookup) { isc_result_t result; MYSQL_RES *rs = NULL; @@ -716,8 +709,7 @@ mysql_authority(const char *zone, void *driverarg, void *dbdata, static isc_result_t mysql_lookup(const char *zone, const char *name, void *driverarg, void *dbdata, dns_sdlzlookup_t *lookup, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo) -{ + dns_clientinfo_t *clientinfo) { isc_result_t result; MYSQL_RES *rs = NULL; @@ -753,8 +745,7 @@ mysql_lookup(const char *zone, const char *name, void *driverarg, void *dbdata, */ static isc_result_t mysql_create(const char *dlzname, unsigned int argc, char *argv[], - void *driverarg, void **dbdata) -{ + void *driverarg, void **dbdata) { isc_result_t result; dbinstance_t *dbi = NULL; char *tmp = NULL; @@ -973,8 +964,7 @@ cleanup: */ static void -mysql_destroy(void *driverarg, void *dbdata) -{ +mysql_destroy(void *driverarg, void *dbdata) { dbinstance_t *dbi; UNUSED(driverarg); @@ -1014,8 +1004,7 @@ static dns_sdlzmethods_t dlz_mysql_methods = { * Wrapper around dns_sdlzregister(). */ isc_result_t -dlz_mysql_init(void) -{ +dlz_mysql_init(void) { isc_result_t result; /* @@ -1050,8 +1039,7 @@ dlz_mysql_init(void) * Wrapper around dns_sdlzunregister(). */ void -dlz_mysql_clear(void) -{ +dlz_mysql_clear(void) { /* * Write debugging message to log */ diff --git a/contrib/dlz/drivers/dlz_odbc_driver.c b/contrib/dlz/drivers/dlz_odbc_driver.c index d2e7cc07c2fb053a51eb7997753f249559091ab0..c7b4e668c7a2e5400054794d43435e5bb4322428 100644 --- a/contrib/dlz/drivers/dlz_odbc_driver.c +++ b/contrib/dlz/drivers/dlz_odbc_driver.c @@ -104,15 +104,15 @@ typedef struct { /* forward reference */ -static size_t odbc_makesafe(char *to, const char *from, size_t length); +static size_t +odbc_makesafe(char *to, const char *from, size_t length); /* * Private methods */ static SQLSMALLINT -safeLen(void *a) -{ +safeLen(void *a) { if (a == NULL) { return (0); } @@ -122,8 +122,7 @@ safeLen(void *a) /*% propertly cleans up an odbc_instance_t */ static void -destroy_odbc_instance(odbc_instance_t *odbc_inst) -{ +destroy_odbc_instance(odbc_instance_t *odbc_inst) { dbinstance_t *ndbi = NULL; dbinstance_t *dbi = NULL; @@ -189,8 +188,7 @@ destroy_odbc_instance(odbc_instance_t *odbc_inst) /*% Connects to database, and creates ODBC statements */ static isc_result_t -odbc_connect(odbc_instance_t *dbi, odbc_db_t **dbc) -{ +odbc_connect(odbc_instance_t *dbi, odbc_db_t **dbc) { odbc_db_t *ndb = *dbc; SQLRETURN sqlRes; isc_result_t result = ISC_R_SUCCESS; @@ -281,8 +279,7 @@ cleanup: */ static dbinstance_t * -odbc_find_avail_conn(db_list_t *dblist) -{ +odbc_find_avail_conn(db_list_t *dblist) { dbinstance_t *dbi = NULL; dbinstance_t *head; int count = 0; @@ -321,8 +318,7 @@ odbc_find_avail_conn(db_list_t *dblist) */ static char * -odbc_escape_string(const char *instr) -{ +odbc_escape_string(const char *instr) { char *outstr; unsigned int len; @@ -358,8 +354,7 @@ odbc_escape_string(const char *instr) */ static size_t -odbc_makesafe(char *to, const char *from, size_t length) -{ +odbc_makesafe(char *to, const char *from, size_t length) { const char *source = from; char *target = to; unsigned int remaining = length; @@ -414,8 +409,7 @@ odbc_makesafe(char *to, const char *from, size_t length) static isc_result_t odbc_get_resultset(const char *zone, const char *record, const char *client, - unsigned int query, void *dbdata, dbinstance_t **r_dbi) -{ + unsigned int query, void *dbdata, dbinstance_t **r_dbi) { isc_result_t result; dbinstance_t *dbi = NULL; char *querystring = NULL; @@ -649,8 +643,7 @@ cleanup: /* it's always good to cleanup after yourself */ */ static isc_result_t -odbc_getField(SQLHSTMT *stmnt, SQLSMALLINT field, char **data) -{ +odbc_getField(SQLHSTMT *stmnt, SQLSMALLINT field, char **data) { SQLLEN size; REQUIRE(data != NULL && *data == NULL); @@ -680,8 +673,7 @@ odbc_getField(SQLHSTMT *stmnt, SQLSMALLINT field, char **data) static isc_result_t odbc_getManyFields(SQLHSTMT *stmnt, SQLSMALLINT startField, - SQLSMALLINT endField, char **retData) -{ + SQLSMALLINT endField, char **retData) { isc_result_t result; SQLLEN size; int totSize = 0; @@ -747,8 +739,7 @@ odbc_getManyFields(SQLHSTMT *stmnt, SQLSMALLINT startField, */ static isc_result_t -odbc_process_rs(dns_sdlzlookup_t *lookup, dbinstance_t *dbi) -{ +odbc_process_rs(dns_sdlzlookup_t *lookup, dbinstance_t *dbi) { isc_result_t result; SQLSMALLINT fields; SQLHSTMT *stmnt; @@ -884,8 +875,7 @@ process_rs_cleanup: static isc_result_t odbc_findzone(void *driverarg, void *dbdata, const char *name, - dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) -{ + dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { isc_result_t result; dbinstance_t *dbi = NULL; @@ -919,8 +909,7 @@ odbc_findzone(void *driverarg, void *dbdata, const char *name, /*% Determine if the client is allowed to perform a zone transfer */ static isc_result_t odbc_allowzonexfr(void *driverarg, void *dbdata, const char *name, - const char *client) -{ + const char *client) { isc_result_t result; dbinstance_t *dbi = NULL; @@ -975,8 +964,7 @@ odbc_allowzonexfr(void *driverarg, void *dbdata, const char *name, static isc_result_t odbc_allnodes(const char *zone, void *driverarg, void *dbdata, - dns_sdlzallnodes_t *allnodes) -{ + dns_sdlzallnodes_t *allnodes) { isc_result_t result; dbinstance_t *dbi = NULL; SQLHSTMT *stmnt; @@ -1108,8 +1096,7 @@ allnodes_cleanup: static isc_result_t odbc_authority(const char *zone, void *driverarg, void *dbdata, - dns_sdlzlookup_t *lookup) -{ + dns_sdlzlookup_t *lookup) { isc_result_t result; dbinstance_t *dbi = NULL; @@ -1139,8 +1126,7 @@ odbc_authority(const char *zone, void *driverarg, void *dbdata, static isc_result_t odbc_lookup(const char *zone, const char *name, void *driverarg, void *dbdata, dns_sdlzlookup_t *lookup, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo) -{ + dns_clientinfo_t *clientinfo) { isc_result_t result; dbinstance_t *dbi = NULL; @@ -1171,8 +1157,7 @@ odbc_lookup(const char *zone, const char *name, void *driverarg, void *dbdata, */ static isc_result_t odbc_create(const char *dlzname, unsigned int argc, char *argv[], - void *driverarg, void **dbdata) -{ + void *driverarg, void **dbdata) { isc_result_t result; odbc_instance_t *odbc_inst = NULL; dbinstance_t *db = NULL; @@ -1357,8 +1342,7 @@ cleanup: */ static void -odbc_destroy(void *driverarg, void *dbdata) -{ +odbc_destroy(void *driverarg, void *dbdata) { UNUSED(driverarg); destroy_odbc_instance((odbc_instance_t *)dbdata); @@ -1388,8 +1372,7 @@ static dns_sdlzmethods_t dlz_odbc_methods = { * Wrapper around dns_sdlzregister(). */ isc_result_t -dlz_odbc_init(void) -{ +dlz_odbc_init(void) { isc_result_t result; /* @@ -1425,8 +1408,7 @@ dlz_odbc_init(void) * Wrapper around dns_sdlzunregister(). */ void -dlz_odbc_clear(void) -{ +dlz_odbc_clear(void) { /* * Write debugging message to log */ diff --git a/contrib/dlz/drivers/dlz_postgres_driver.c b/contrib/dlz/drivers/dlz_postgres_driver.c index fa9dfa1b2df525ebb68dffc1eff675c856970ef4..f7d02a9d70e3913ecc84da9da7ae9ba8042eef78 100644 --- a/contrib/dlz/drivers/dlz_postgres_driver.c +++ b/contrib/dlz/drivers/dlz_postgres_driver.c @@ -107,8 +107,7 @@ static dns_sdlzimplementation_t *dlz_postgres = NULL; */ static size_t -postgres_makesafe(char *to, const char *from, size_t length) -{ +postgres_makesafe(char *to, const char *from, size_t length) { const char *source = from; char *target = to; unsigned int remaining = length; @@ -150,8 +149,7 @@ postgres_makesafe(char *to, const char *from, size_t length) * multithreaded operation. */ static void -postgres_destroy_dblist(db_list_t *dblist) -{ +postgres_destroy_dblist(db_list_t *dblist) { dbinstance_t *ndbi = NULL; dbinstance_t *dbi = NULL; @@ -186,8 +184,7 @@ postgres_destroy_dblist(db_list_t *dblist) */ static dbinstance_t * -postgres_find_avail_conn(db_list_t *dblist) -{ +postgres_find_avail_conn(db_list_t *dblist) { dbinstance_t *dbi = NULL; dbinstance_t *head; int count = 0; @@ -227,8 +224,7 @@ postgres_find_avail_conn(db_list_t *dblist) */ static char * -postgres_escape_string(const char *instr) -{ +postgres_escape_string(const char *instr) { char *outstr; unsigned int len; @@ -264,8 +260,7 @@ postgres_escape_string(const char *instr) */ static isc_result_t postgres_get_resultset(const char *zone, const char *record, const char *client, - unsigned int query, void *dbdata, PGresult **rs) -{ + unsigned int query, void *dbdata, PGresult **rs) { isc_result_t result; dbinstance_t *dbi = NULL; char *querystring = NULL; @@ -609,8 +604,7 @@ cleanup: */ static isc_result_t -postgres_process_rs(dns_sdlzlookup_t *lookup, PGresult *rs) -{ +postgres_process_rs(dns_sdlzlookup_t *lookup, PGresult *rs) { isc_result_t result; unsigned int i; unsigned int rows; @@ -730,8 +724,7 @@ postgres_process_rs(dns_sdlzlookup_t *lookup, PGresult *rs) static isc_result_t postgres_findzone(void *driverarg, void *dbdata, const char *name, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo) -{ + dns_clientinfo_t *clientinfo) { isc_result_t result; PGresult *rs = NULL; unsigned int rows; @@ -771,8 +764,7 @@ postgres_findzone(void *driverarg, void *dbdata, const char *name, /*% Determine if the client is allowed to perform a zone transfer */ static isc_result_t postgres_allowzonexfr(void *driverarg, void *dbdata, const char *name, - const char *client) -{ + const char *client) { isc_result_t result; PGresult *rs = NULL; unsigned int rows; @@ -830,8 +822,7 @@ postgres_allowzonexfr(void *driverarg, void *dbdata, const char *name, */ static isc_result_t postgres_allnodes(const char *zone, void *driverarg, void *dbdata, - dns_sdlzallnodes_t *allnodes) -{ + dns_sdlzallnodes_t *allnodes) { isc_result_t result; PGresult *rs = NULL; unsigned int i; @@ -942,8 +933,7 @@ postgres_allnodes(const char *zone, void *driverarg, void *dbdata, static isc_result_t postgres_authority(const char *zone, void *driverarg, void *dbdata, - dns_sdlzlookup_t *lookup) -{ + dns_sdlzlookup_t *lookup) { isc_result_t result; PGresult *rs = NULL; @@ -979,8 +969,8 @@ postgres_authority(const char *zone, void *driverarg, void *dbdata, static isc_result_t postgres_lookup(const char *zone, const char *name, void *driverarg, void *dbdata, dns_sdlzlookup_t *lookup, - dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) -{ + dns_clientinfomethods_t *methods, + dns_clientinfo_t *clientinfo) { isc_result_t result; PGresult *rs = NULL; @@ -1016,8 +1006,7 @@ postgres_lookup(const char *zone, const char *name, void *driverarg, */ static isc_result_t postgres_create(const char *dlzname, unsigned int argc, char *argv[], - void *driverarg, void **dbdata) -{ + void *driverarg, void **dbdata) { isc_result_t result; dbinstance_t *dbi = NULL; unsigned int j; @@ -1189,8 +1178,7 @@ cleanup: * so we really only need to clean it up since we are not using driverarg. */ static void -postgres_destroy(void *driverarg, void *dbdata) -{ +postgres_destroy(void *driverarg, void *dbdata) { UNUSED(driverarg); /* cleanup the list of DBI's */ postgres_destroy_dblist((db_list_t *)dbdata); @@ -1220,8 +1208,7 @@ static dns_sdlzmethods_t dlz_postgres_methods = { * Wrapper around dns_sdlzregister(). */ isc_result_t -dlz_postgres_init(void) -{ +dlz_postgres_init(void) { isc_result_t result; /* @@ -1257,8 +1244,7 @@ dlz_postgres_init(void) * Wrapper around dns_sdlzunregister(). */ void -dlz_postgres_clear(void) -{ +dlz_postgres_clear(void) { /* * Write debugging message to log */ diff --git a/contrib/dlz/drivers/dlz_stub_driver.c b/contrib/dlz/drivers/dlz_stub_driver.c index f0c78bfa80cf27bd70c588aab2500e35ca957cd1..26b5aa8cd241abffd2c091f8a0f30363b14b7147 100644 --- a/contrib/dlz/drivers/dlz_stub_driver.c +++ b/contrib/dlz/drivers/dlz_stub_driver.c @@ -73,8 +73,7 @@ typedef struct config_data { static isc_result_t stub_dlz_allnodes(const char *zone, void *driverarg, void *dbdata, - dns_sdlzallnodes_t *allnodes) -{ + dns_sdlzallnodes_t *allnodes) { config_data_t *cd; isc_result_t result; @@ -102,8 +101,7 @@ stub_dlz_allnodes(const char *zone, void *driverarg, void *dbdata, static isc_result_t stub_dlz_allowzonexfr(void *driverarg, void *dbdata, const char *name, - const char *client) -{ + const char *client) { config_data_t *cd; UNUSED(driverarg); @@ -119,8 +117,7 @@ stub_dlz_allowzonexfr(void *driverarg, void *dbdata, const char *name, static isc_result_t stub_dlz_authority(const char *zone, void *driverarg, void *dbdata, - dns_sdlzlookup_t *lookup) -{ + dns_sdlzlookup_t *lookup) { isc_result_t result; config_data_t *cd; @@ -148,8 +145,7 @@ stub_dlz_authority(const char *zone, void *driverarg, void *dbdata, static isc_result_t stub_dlz_findzonedb(void *driverarg, void *dbdata, const char *name, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo) -{ + dns_clientinfo_t *clientinfo) { config_data_t *cd; UNUSED(driverarg); @@ -173,8 +169,8 @@ stub_dlz_findzonedb(void *driverarg, void *dbdata, const char *name, static isc_result_t stub_dlz_lookup(const char *zone, const char *name, void *driverarg, void *dbdata, dns_sdlzlookup_t *lookup, - dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) -{ + dns_clientinfomethods_t *methods, + dns_clientinfo_t *clientinfo) { isc_result_t result; config_data_t *cd; @@ -198,8 +194,7 @@ stub_dlz_lookup(const char *zone, const char *name, void *driverarg, static isc_result_t stub_dlz_create(const char *dlzname, unsigned int argc, char *argv[], - void *driverarg, void **dbdata) -{ + void *driverarg, void **dbdata) { config_data_t *cd; UNUSED(driverarg); @@ -237,8 +232,7 @@ stub_dlz_create(const char *dlzname, unsigned int argc, char *argv[], } static void -stub_dlz_destroy(void *driverarg, void *dbdata) -{ +stub_dlz_destroy(void *driverarg, void *dbdata) { config_data_t *cd; isc_mem_t *mctx; @@ -280,8 +274,7 @@ static dns_sdlzmethods_t dlz_stub_methods = { * Wrapper around dns_sdlzregister(). */ isc_result_t -dlz_stub_init(void) -{ +dlz_stub_init(void) { isc_result_t result; /* @@ -308,8 +301,7 @@ dlz_stub_init(void) * Wrapper around dns_sdlzunregister(). */ void -dlz_stub_clear(void) -{ +dlz_stub_clear(void) { /* * Write debugging message to log */ diff --git a/contrib/dlz/drivers/include/dlz/sdlz_helper.h b/contrib/dlz/drivers/include/dlz/sdlz_helper.h index 4ffa13836dacea1f3bdead58f9221fba3ab62add..c6a9b04d0c711c55c397198a6ac8e8164e296c18 100644 --- a/contrib/dlz/drivers/include/dlz/sdlz_helper.h +++ b/contrib/dlz/drivers/include/dlz/sdlz_helper.h @@ -57,9 +57,9 @@ typedef struct driverinstance driverinstance_t; * special tokens are %zone%, %record%, %client% */ struct query_segment { - void * sql; + void *sql; unsigned int strlen; - bool direct; + bool direct; ISC_LINK(query_segment_t) link; }; @@ -71,19 +71,19 @@ 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; - isc_mem_t * mctx; - isc_mutex_t instance_lock; + char *query_buf; + char *zone; + char *record; + char *client; + isc_mem_t *mctx; + isc_mutex_t instance_lock; ISC_LINK(dbinstance_t) link; }; diff --git a/contrib/dlz/drivers/sdlz_helper.c b/contrib/dlz/drivers/sdlz_helper.c index 2c4d50abe9d01f2d40fa7383f821b25509608a66..3f5a88ca183d2f3e491d6de7d6268f472c8e5db6 100644 --- a/contrib/dlz/drivers/sdlz_helper.c +++ b/contrib/dlz/drivers/sdlz_helper.c @@ -63,8 +63,7 @@ */ static void -destroy_querylist(isc_mem_t *mctx, query_list_t **querylist) -{ +destroy_querylist(isc_mem_t *mctx, query_list_t **querylist) { query_segment_t *tseg = NULL; query_segment_t *nseg = NULL; @@ -100,8 +99,7 @@ destroy_querylist(isc_mem_t *mctx, query_list_t **querylist) static isc_result_t build_querylist(isc_mem_t *mctx, const char *query_str, char **zone, char **record, char **client, query_list_t **querylist, - unsigned int flags) -{ + unsigned int flags) { isc_result_t result; bool foundzone = false; bool foundrecord = false; @@ -268,8 +266,7 @@ flag_fail: * used to be in our queries from named.conf */ char * -sdlzh_build_querystring(isc_mem_t *mctx, query_list_t *querylist) -{ +sdlzh_build_querystring(isc_mem_t *mctx, query_list_t *querylist) { query_segment_t *tseg = NULL; unsigned int length = 0; char *qs = NULL; @@ -319,8 +316,7 @@ isc_result_t sdlzh_build_sqldbinstance(isc_mem_t *mctx, const char *allnodes_str, const char *allowxfr_str, const char *authority_str, const char *findzone_str, const char *lookup_str, - const char *countzone_str, dbinstance_t **dbi) -{ + const char *countzone_str, dbinstance_t **dbi) { isc_result_t result; dbinstance_t *db = NULL; @@ -435,8 +431,7 @@ cleanup: } void -sdlzh_destroy_sqldbinstance(dbinstance_t *dbi) -{ +sdlzh_destroy_sqldbinstance(dbinstance_t *dbi) { isc_mem_t *mctx; /* save mctx for later */ @@ -458,8 +453,7 @@ sdlzh_destroy_sqldbinstance(dbinstance_t *dbi) } char * -sdlzh_get_parameter_value(isc_mem_t *mctx, const char *input, const char *key) -{ +sdlzh_get_parameter_value(isc_mem_t *mctx, const char *input, const char *key) { int keylen; char *keystart; char value[255]; diff --git a/contrib/dlz/example/dlz_example.c b/contrib/dlz/example/dlz_example.c index a5926428971889533179661d6c81307c4ad68dab..cd4db52d87076171ca4efdd06bbffe7c77bb57af 100644 --- a/contrib/dlz/example/dlz_example.c +++ b/contrib/dlz/example/dlz_example.c @@ -63,8 +63,7 @@ struct dlz_example_data { }; static bool -single_valued(const char *type) -{ +single_valued(const char *type) { const char *single[] = { "soa", "cname", NULL }; int i; @@ -81,8 +80,7 @@ single_valued(const char *type) */ static isc_result_t add_name(struct dlz_example_data *state, struct record *list, const char *name, - const char *type, dns_ttl_t ttl, const char *data) -{ + const char *type, dns_ttl_t ttl, const char *data) { int i; bool single = single_valued(type); int first_empty = -1; @@ -139,8 +137,7 @@ add_name(struct dlz_example_data *state, struct record *list, const char *name, */ static isc_result_t del_name(struct dlz_example_data *state, struct record *list, const char *name, - const char *type, dns_ttl_t ttl, const char *data) -{ + const char *type, dns_ttl_t ttl, const char *data) { int i; UNUSED(state); @@ -161,8 +158,7 @@ del_name(struct dlz_example_data *state, struct record *list, const char *name, } static isc_result_t -fmt_address(isc_sockaddr_t *addr, char *buffer, size_t size) -{ +fmt_address(isc_sockaddr_t *addr, char *buffer, size_t size) { char addr_buf[100]; const char *ret; uint16_t port = 0; @@ -194,8 +190,7 @@ fmt_address(isc_sockaddr_t *addr, char *buffer, size_t size) * Return the version of the API */ int -dlz_version(unsigned int *flags) -{ +dlz_version(unsigned int *flags) { UNUSED(flags); return (DLZ_DLOPEN_VERSION); } @@ -205,8 +200,7 @@ dlz_version(unsigned int *flags) */ static void b9_add_helper(struct dlz_example_data *state, const char *helper_name, - void *ptr) -{ + void *ptr) { if (strcmp(helper_name, "log") == 0) { state->log = (log_t *)ptr; } @@ -226,8 +220,7 @@ b9_add_helper(struct dlz_example_data *state, const char *helper_name, */ isc_result_t dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, - ...) -{ + ...) { struct dlz_example_data *state; const char *helper_name; va_list ap; @@ -311,8 +304,7 @@ failure: * Shut down the backend */ void -dlz_destroy(void *dbdata) -{ +dlz_destroy(void *dbdata) { struct dlz_example_data *state = (struct dlz_example_data *)dbdata; if (state->log != NULL) { @@ -328,8 +320,7 @@ dlz_destroy(void *dbdata) */ isc_result_t dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo) -{ + dns_clientinfo_t *clientinfo) { struct dlz_example_data *state = (struct dlz_example_data *)dbdata; isc_sockaddr_t *src; char addrbuf[100]; @@ -397,8 +388,7 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, isc_result_t dlz_lookup(const char *zone, const char *name, void *dbdata, dns_sdlzlookup_t *lookup, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo) -{ + dns_clientinfo_t *clientinfo) { isc_result_t result; struct dlz_example_data *state = (struct dlz_example_data *)dbdata; bool found = false; @@ -501,8 +491,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, * See if a zone transfer is allowed */ isc_result_t -dlz_allowzonexfr(void *dbdata, const char *name, const char *client) -{ +dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { UNUSED(client); /* Just say yes for all our zones */ @@ -513,8 +502,7 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) * Perform a zone transfer */ isc_result_t -dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) -{ +dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { struct dlz_example_data *state = (struct dlz_example_data *)dbdata; int i; @@ -545,8 +533,7 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) * Start a transaction */ isc_result_t -dlz_newversion(const char *zone, void *dbdata, void **versionp) -{ +dlz_newversion(const char *zone, void *dbdata, void **versionp) { struct dlz_example_data *state = (struct dlz_example_data *)dbdata; if (state->transaction_started) { @@ -569,8 +556,7 @@ dlz_newversion(const char *zone, void *dbdata, void **versionp) * End a transaction */ void -dlz_closeversion(const char *zone, bool commit, void *dbdata, void **versionp) -{ +dlz_closeversion(const char *zone, bool commit, void *dbdata, void **versionp) { struct dlz_example_data *state = (struct dlz_example_data *)dbdata; if (!state->transaction_started) { @@ -630,8 +616,7 @@ dlz_closeversion(const char *zone, bool commit, void *dbdata, void **versionp) * Configure a writeable zone */ isc_result_t -dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *dbdata) -{ +dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *dbdata) { struct dlz_example_data *state = (struct dlz_example_data *)dbdata; isc_result_t result; @@ -674,8 +659,7 @@ dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *dbdata) bool dlz_ssumatch(const char *signer, const char *name, const char *tcpaddr, const char *type, const char *key, uint32_t keydatalen, - unsigned char *keydata, void *dbdata) -{ + unsigned char *keydata, void *dbdata) { struct dlz_example_data *state = (struct dlz_example_data *)dbdata; UNUSED(tcpaddr); @@ -704,8 +688,7 @@ dlz_ssumatch(const char *signer, const char *name, const char *tcpaddr, static isc_result_t modrdataset(struct dlz_example_data *state, const char *name, - const char *rdatastr, struct record *list) -{ + const char *rdatastr, struct record *list) { char *full_name, *dclass, *type, *data, *ttlstr, *buf; char absolute[1024]; isc_result_t result; @@ -768,8 +751,7 @@ error: isc_result_t dlz_addrdataset(const char *name, const char *rdatastr, void *dbdata, - void *version) -{ + void *version) { struct dlz_example_data *state = (struct dlz_example_data *)dbdata; if (version != (void *)&state->transaction_started) { @@ -786,8 +768,7 @@ dlz_addrdataset(const char *name, const char *rdatastr, void *dbdata, isc_result_t dlz_subrdataset(const char *name, const char *rdatastr, void *dbdata, - void *version) -{ + void *version) { struct dlz_example_data *state = (struct dlz_example_data *)dbdata; if (version != (void *)&state->transaction_started) { @@ -805,8 +786,8 @@ dlz_subrdataset(const char *name, const char *rdatastr, void *dbdata, } isc_result_t -dlz_delrdataset(const char *name, const char *type, void *dbdata, void *version) -{ +dlz_delrdataset(const char *name, const char *type, void *dbdata, + void *version) { struct dlz_example_data *state = (struct dlz_example_data *)dbdata; if (version != (void *)&state->transaction_started) { diff --git a/contrib/dlz/example/win32/DLLMain.c b/contrib/dlz/example/win32/DLLMain.c index 90da75aa93cc071991a422ea1466b811ce4c8d74..f21ad25eecb278bc98641a02685f4407d7499947 100644 --- a/contrib/dlz/example/win32/DLLMain.c +++ b/contrib/dlz/example/win32/DLLMain.c @@ -14,8 +14,7 @@ * Called when we enter the DLL */ __declspec(dllexport) BOOL WINAPI - DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ + DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch (fdwReason) { /* * The DLL is loading due to process diff --git a/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c b/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c index c918219d3fa9f3ffc0dc9750945211e139bd204e..d3c61591c7e23a2ffdb6b992e4d5c351b8d0ec60 100644 --- a/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c +++ b/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c @@ -103,15 +103,14 @@ typedef struct bdbhpt_parsed_data { char *data; } bdbhpt_parsed_data_t; -static void b9_add_helper(struct bdbhpt_instance *db, const char *helper_name, - void *ptr); +static void +b9_add_helper(struct bdbhpt_instance *db, const char *helper_name, void *ptr); /*% * Reverses a string in place. */ static char * -bdbhpt_strrev(char *str) -{ +bdbhpt_strrev(char *str) { char *p1, *p2; if (!str || !*str) { @@ -134,8 +133,7 @@ bdbhpt_strrev(char *str) */ static isc_result_t -bdbhpt_parse_data(log_t *log, char *in, bdbhpt_parsed_data_t *pd) -{ +bdbhpt_parse_data(log_t *log, char *in, bdbhpt_parsed_data_t *pd) { char *endp, *ttlStr; char *tmp = in; char *lastchar = (char *)&tmp[strlen(tmp)]; @@ -242,8 +240,7 @@ bdbhpt_parse_data(log_t *log, char *in, bdbhpt_parsed_data_t *pd) * See if a zone transfer is allowed */ isc_result_t -dlz_allowzonexfr(void *dbdata, const char *name, const char *client) -{ +dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { isc_result_t result; bdbhpt_instance_t *db = (bdbhpt_instance_t *)dbdata; DBT key, data; @@ -329,8 +326,7 @@ xfr_cleanup: * updates by a separate process). */ isc_result_t -dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) -{ +dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { isc_result_t result = ISC_R_NOTFOUND; bdbhpt_instance_t *db = (bdbhpt_instance_t *)dbdata; DBC *xfr_cursor = NULL; @@ -460,8 +456,7 @@ allnodes_cleanup: * Used by bdbhpt_destroy when the driver is shutting down. */ static void -bdbhpt_cleanup(bdbhpt_instance_t *db) -{ +bdbhpt_cleanup(bdbhpt_instance_t *db) { /* close databases */ if (db->data != NULL) { db->data->close(db->data, 0); @@ -641,8 +636,7 @@ lookup_cleanup: */ static isc_result_t bdbhpt_opendb(log_t *log, DB_ENV *db_env, DBTYPE db_type, DB **db, - const char *db_name, char *db_file, int flags) -{ + const char *db_name, char *db_file, int flags) { int result; /* Initialise the database. */ @@ -682,8 +676,7 @@ bdbhpt_opendb(log_t *log, DB_ENV *db_env, DBTYPE db_type, DB **db, */ isc_result_t dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, - ...) -{ + ...) { isc_result_t result; int bdbhptres; int bdbFlags = 0; @@ -826,8 +819,7 @@ init_cleanup: * Shut down the backend */ void -dlz_destroy(void *dbdata) -{ +dlz_destroy(void *dbdata) { struct bdbhpt_instance *db = (struct bdbhpt_instance *)dbdata; db->log(ISC_LOG_INFO, "dlz_bdbhpt_dynamic (%s): shutting down", @@ -840,8 +832,7 @@ dlz_destroy(void *dbdata) * Return the version of the API */ int -dlz_version(unsigned int *flags) -{ +dlz_version(unsigned int *flags) { UNUSED(flags); return (DLZ_DLOPEN_VERSION); } @@ -850,8 +841,7 @@ dlz_version(unsigned int *flags) * Register a helper function from the bind9 dlz_dlopen driver */ static void -b9_add_helper(struct bdbhpt_instance *db, const char *helper_name, void *ptr) -{ +b9_add_helper(struct bdbhpt_instance *db, const char *helper_name, void *ptr) { if (strcmp(helper_name, "log") == 0) { db->log = (log_t *)ptr; } diff --git a/contrib/dlz/modules/common/dlz_dbi.c b/contrib/dlz/modules/common/dlz_dbi.c index 3c0c152dda194692fc63aff58a8e053721a7b9aa..7d0567644dd6787cca61e7bea3ff5ba4b1c0d4fd 100644 --- a/contrib/dlz/modules/common/dlz_dbi.c +++ b/contrib/dlz/modules/common/dlz_dbi.c @@ -61,8 +61,7 @@ */ void -destroy_querylist(query_list_t **querylist) -{ +destroy_querylist(query_list_t **querylist) { query_segment_t *tseg = NULL; query_segment_t *nseg = NULL; @@ -96,8 +95,7 @@ destroy_querylist(query_list_t **querylist) isc_result_t build_querylist(const char *query_str, char **zone, char **record, char **client, query_list_t **querylist, unsigned int flags, - log_t log) -{ + log_t log) { isc_result_t result; bool foundzone = false; bool foundrecord = false; @@ -273,8 +271,7 @@ flag_fail: * used to be in our queries from named.conf */ char * -build_querystring(query_list_t *querylist) -{ +build_querystring(query_list_t *querylist) { query_segment_t *tseg = NULL; unsigned int length = 0; char *qs = NULL; @@ -323,8 +320,7 @@ isc_result_t build_dbinstance(const char *allnodes_str, const char *allowxfr_str, const char *authority_str, const char *findzone_str, const char *lookup_str, const char *countzone_str, - dbinstance_t **dbi, log_t log) -{ + dbinstance_t **dbi, log_t log) { isc_result_t result; dbinstance_t *db = NULL; int err; @@ -452,8 +448,7 @@ cleanup: } void -destroy_dbinstance(dbinstance_t *dbi) -{ +destroy_dbinstance(dbinstance_t *dbi) { /* destroy any query lists we created */ destroy_querylist(&dbi->allnodes_q); destroy_querylist(&dbi->allowxfr_q); @@ -470,8 +465,7 @@ destroy_dbinstance(dbinstance_t *dbi) } char * -get_parameter_value(const char *input, const char *key) -{ +get_parameter_value(const char *input, const char *key) { int keylen; char *keystart; char value[255]; diff --git a/contrib/dlz/modules/filesystem/dir.c b/contrib/dlz/modules/filesystem/dir.c index ea394afb164d27748e0033e4863727eb068012a5..d7fd02a7505825fa69ab5faa6c9a4384882ee7b8 100644 --- a/contrib/dlz/modules/filesystem/dir.c +++ b/contrib/dlz/modules/filesystem/dir.c @@ -27,8 +27,7 @@ #include void -dir_init(dir_t *dir) -{ +dir_init(dir_t *dir) { dir->entry.name[0] = '\0'; dir->entry.length = 0; @@ -36,8 +35,7 @@ dir_init(dir_t *dir) } isc_result_t -dir_open(dir_t *dir, const char *dirname) -{ +dir_open(dir_t *dir, const char *dirname) { char *p; isc_result_t result = ISC_R_SUCCESS; @@ -90,8 +88,7 @@ dir_open(dir_t *dir, const char *dirname) * the dir stream and reads the first file in one operation. */ isc_result_t -dir_read(dir_t *dir) -{ +dir_read(dir_t *dir) { struct dirent *entry; entry = readdir(dir->handle); @@ -113,8 +110,7 @@ dir_read(dir_t *dir) * \brief Close directory stream. */ void -dir_close(dir_t *dir) -{ +dir_close(dir_t *dir) { (void)closedir(dir->handle); dir->handle = NULL; } @@ -123,8 +119,7 @@ dir_close(dir_t *dir) * \brief Reposition directory stream at start. */ isc_result_t -dir_reset(dir_t *dir) -{ +dir_reset(dir_t *dir) { rewinddir(dir->handle); return (ISC_R_SUCCESS); diff --git a/contrib/dlz/modules/filesystem/dir.h b/contrib/dlz/modules/filesystem/dir.h index eeb64bf064b2c7826b321914eac533022d559e3b..e93dd5931c71e312a8167b7ac62f0b31fda7fd66 100644 --- a/contrib/dlz/modules/filesystem/dir.h +++ b/contrib/dlz/modules/filesystem/dir.h @@ -22,14 +22,14 @@ #define DIR_PATHMAX 1024 typedef struct direntry { - char name[DIR_NAMEMAX]; + char name[DIR_NAMEMAX]; unsigned int length; } direntry_t; typedef struct dir { - char dirname[DIR_PATHMAX]; + char dirname[DIR_PATHMAX]; direntry_t entry; - DIR * handle; + DIR *handle; } dir_t; void diff --git a/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c b/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c index 9f6800252d00e8b5a2c98c0f31fa9a1e6097cb5d..b0029fccedb14030798ceb494e34a110930cd4d2 100644 --- a/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c +++ b/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c @@ -88,15 +88,14 @@ typedef DLZ_LIST(dir_entry_t) dlist_t; /* forward reference */ -static void b9_add_helper(struct config_data *cd, const char *helper_name, - void *ptr); +static void +b9_add_helper(struct config_data *cd, const char *helper_name, void *ptr); /* * Private methods */ static bool -is_safe(const char *input) -{ +is_safe(const char *input) { unsigned int i; unsigned int len = strlen(input); @@ -164,8 +163,7 @@ is_safe(const char *input) } static isc_result_t -create_path_helper(char *out, const char *in, config_data_t *cd) -{ +create_path_helper(char *out, const char *in, config_data_t *cd) { char *tmpString; char *tmpPtr; int i; @@ -232,8 +230,7 @@ create_path_helper(char *out, const char *in, config_data_t *cd) static isc_result_t create_path(const char *zone, const char *host, const char *client, - config_data_t *cd, char **path) -{ + config_data_t *cd, char **path) { char *tmpPath; int pathsize; int len; @@ -361,8 +358,7 @@ cleanup_mem: static isc_result_t process_dir(dir_t *dir, void *passback, config_data_t *cd, dlist_t *dir_list, - unsigned int basedirlen) -{ + unsigned int basedirlen) { char tmp[DIR_PATHMAX + DIR_NAMEMAX]; int astPos; struct stat sb; @@ -582,8 +578,7 @@ process_dir(dir_t *dir, void *passback, config_data_t *cd, dlist_t *dir_list, * DLZ methods */ isc_result_t -dlz_allowzonexfr(void *dbdata, const char *name, const char *client) -{ +dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { isc_result_t result; char *path; struct stat sb; @@ -614,8 +609,7 @@ complete_AXFR: } isc_result_t -dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) -{ +dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { isc_result_t result; dlist_t *dir_list; config_data_t *cd = (config_data_t *)dbdata; @@ -849,8 +843,7 @@ complete_lkup: isc_result_t dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, - ...) -{ + ...) { isc_result_t result = ISC_R_NOMEMORY; config_data_t *cd; char *endp; @@ -971,8 +964,7 @@ free_cd: } void -dlz_destroy(void *dbdata) -{ +dlz_destroy(void *dbdata) { config_data_t *cd; cd = (config_data_t *)dbdata; @@ -1001,8 +993,7 @@ dlz_destroy(void *dbdata) * Return the version of the API */ int -dlz_version(unsigned int *flags) -{ +dlz_version(unsigned int *flags) { UNUSED(flags); return (DLZ_DLOPEN_VERSION); } @@ -1011,8 +1002,7 @@ dlz_version(unsigned int *flags) * Register a helper function from the bind9 dlz_dlopen driver */ static void -b9_add_helper(struct config_data *cd, const char *helper_name, void *ptr) -{ +b9_add_helper(struct config_data *cd, const char *helper_name, void *ptr) { if (strcmp(helper_name, "log") == 0) { cd->log = (log_t *)ptr; } diff --git a/contrib/dlz/modules/include/dlz_dbi.h b/contrib/dlz/modules/include/dlz_dbi.h index 735359c8731893df59e0b54fa0385dde6fa08abd..12952b923fbf0451abd51585671a31574bc8a9fe 100644 --- a/contrib/dlz/modules/include/dlz_dbi.h +++ b/contrib/dlz/modules/include/dlz_dbi.h @@ -61,9 +61,9 @@ typedef struct driverinstance driverinstance_t; * special tokens are %zone%, %record%, %client% */ struct query_segment { - void * cmd; + void *cmd; unsigned int strlen; - bool direct; + bool direct; DLZ_LINK(query_segment_t) link; }; @@ -75,18 +75,18 @@ 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; - dlz_mutex_t lock; + 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 bac8ab12d19904ffacf1b97facd29718914df9f7..98a791749d3360cd43d27048fbadb2582d18e2f3 100644 --- a/contrib/dlz/modules/include/dlz_minimal.h +++ b/contrib/dlz/modules/include/dlz_minimal.h @@ -39,7 +39,7 @@ #include typedef unsigned int isc_result_t; -typedef uint32_t dns_ttl_t; +typedef uint32_t dns_ttl_t; /* * Define DLZ_DLOPEN_VERSION to different values to use older versions @@ -82,7 +82,7 @@ typedef uint32_t dns_ttl_t; do { \ union { \ const void *k; \ - void * v; \ + void *v; \ } _u; \ _u.k = konst; \ var = _u.v; \ @@ -101,37 +101,37 @@ typedef void *dns_dlzdb_t; */ typedef struct isc_sockaddr { union { - struct sockaddr sa; - struct sockaddr_in sin; + struct sockaddr sa; + struct sockaddr_in sin; struct sockaddr_in6 sin6; #ifdef ISC_PLATFORM_HAVESYSUNH struct sockaddr_un sunix; #endif /* ifdef ISC_PLATFORM_HAVESYSUNH */ } 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 typedef struct dns_clientinfomethods { - uint16_t version; - uint16_t age; + uint16_t version; + uint16_t age; dns_clientinfo_sourceip_t sourceip; - dns_clientinfo_version_t dbversion; + dns_clientinfo_version_t dbversion; } dns_clientinfomethods_t; #endif /* DLZ_DLOPEN_VERSION > 1 */ diff --git a/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c b/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c index 6f8a4b28ba4d87c9f4479f97eed38496dd81bc7b..c854ea1c6aaf6e46b2637f1f52ac9f71d01be750 100644 --- a/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c +++ b/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c @@ -108,17 +108,19 @@ typedef struct { /* forward references */ #if DLZ_DLOPEN_VERSION < 3 -isc_result_t dlz_findzonedb(void *dbdata, const char *name); +isc_result_t +dlz_findzonedb(void *dbdata, const char *name); #else /* if DLZ_DLOPEN_VERSION < 3 */ -isc_result_t dlz_findzonedb(void *dbdata, const char *name, - dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo); +isc_result_t +dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, + dns_clientinfo_t *clientinfo); #endif /* if DLZ_DLOPEN_VERSION < 3 */ -void dlz_destroy(void *dbdata); +void +dlz_destroy(void *dbdata); -static void b9_add_helper(ldap_instance_t *db, const char *helper_name, - void *ptr); +static void +b9_add_helper(ldap_instance_t *db, const char *helper_name, void *ptr); /* * Private methods @@ -126,8 +128,7 @@ static void b9_add_helper(ldap_instance_t *db, const char *helper_name, /*% checks that the LDAP URL parameters make sense */ static isc_result_t -ldap_checkURL(ldap_instance_t *db, char *URL, int attrCnt, const char *msg) -{ +ldap_checkURL(ldap_instance_t *db, char *URL, int attrCnt, const char *msg) { isc_result_t result = ISC_R_SUCCESS; int ldap_result; LDAPURLDesc *ldap_url = NULL; @@ -192,8 +193,7 @@ cleanup: /*% Connects / reconnects to LDAP server */ static isc_result_t -ldap_connect(ldap_instance_t *dbi, dbinstance_t *dbc) -{ +ldap_connect(ldap_instance_t *dbi, dbinstance_t *dbc) { isc_result_t result; int ldap_result; @@ -248,8 +248,7 @@ cleanup: * multithreaded operation. */ static void -ldap_destroy_dblist(db_list_t *dblist) -{ +ldap_destroy_dblist(db_list_t *dblist) { dbinstance_t *ndbi = NULL; dbinstance_t *dbi = NULL; @@ -283,8 +282,7 @@ ldap_destroy_dblist(db_list_t *dblist) * multithreaded operation. */ static dbinstance_t * -ldap_find_avail_conn(ldap_instance_t *ldap) -{ +ldap_find_avail_conn(ldap_instance_t *ldap) { dbinstance_t *dbi = NULL; dbinstance_t *head; int count = 0; @@ -318,8 +316,7 @@ ldap_find_avail_conn(ldap_instance_t *ldap) static isc_result_t ldap_process_results(ldap_instance_t *db, LDAP *dbc, LDAPMessage *msg, - char **attrs, void *ptr, bool allnodes) -{ + char **attrs, void *ptr, bool allnodes) { isc_result_t result = ISC_R_SUCCESS; int i = 0; int j; @@ -547,8 +544,7 @@ cleanup: */ static isc_result_t ldap_get_results(const char *zone, const char *record, const char *client, - unsigned int query, void *dbdata, void *ptr) -{ + unsigned int query, void *dbdata, void *ptr) { isc_result_t result; ldap_instance_t *db = (ldap_instance_t *)dbdata; dbinstance_t *dbi = NULL; @@ -837,8 +833,7 @@ cleanup: * DLZ methods */ isc_result_t -dlz_allowzonexfr(void *dbdata, const char *name, const char *client) -{ +dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { isc_result_t result; /* check to see if we are authoritative for the zone first */ @@ -857,14 +852,12 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) } isc_result_t -dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) -{ +dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { return (ldap_get_results(zone, NULL, NULL, ALLNODES, dbdata, allnodes)); } isc_result_t -dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) -{ +dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) { return (ldap_get_results(zone, NULL, NULL, AUTHORITY, dbdata, lookup)); } @@ -914,8 +907,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, isc_result_t dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, - ...) -{ + ...) { isc_result_t result = ISC_R_FAILURE; ldap_instance_t *ldap = NULL; dbinstance_t *dbi = NULL; @@ -1201,8 +1193,7 @@ cleanup: } void -dlz_destroy(void *dbdata) -{ +dlz_destroy(void *dbdata) { if (dbdata != NULL) { ldap_instance_t *db = (ldap_instance_t *)dbdata; #if PTHREADS @@ -1236,8 +1227,7 @@ dlz_destroy(void *dbdata) * Return the version of the API */ int -dlz_version(unsigned int *flags) -{ +dlz_version(unsigned int *flags) { *flags |= DNS_SDLZFLAG_RELATIVERDATA; #if PTHREADS *flags |= DNS_SDLZFLAG_THREADSAFE; @@ -1251,8 +1241,7 @@ dlz_version(unsigned int *flags) * Register a helper function from the bind9 dlz_dlopen driver */ static void -b9_add_helper(ldap_instance_t *db, const char *helper_name, void *ptr) -{ +b9_add_helper(ldap_instance_t *db, const char *helper_name, void *ptr) { if (strcmp(helper_name, "log") == 0) { db->log = (log_t *)ptr; } diff --git a/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c b/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c index 2a59e3274200e703d140baf9eefc8edf2239d64d..f8762cf406a44241b2ceb30ab005d26ed4f5e04a 100644 --- a/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c +++ b/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c @@ -97,22 +97,22 @@ typedef struct { } mysql_instance_t; /* forward references */ -isc_result_t dlz_findzonedb(void *dbdata, const char *name, - dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo); +isc_result_t +dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, + dns_clientinfo_t *clientinfo); -void dlz_destroy(void *dbdata); +void +dlz_destroy(void *dbdata); -static void b9_add_helper(mysql_instance_t *db, const char *helper_name, - void *ptr); +static void +b9_add_helper(mysql_instance_t *db, const char *helper_name, void *ptr); /* * Private methods */ void -mysql_destroy(dbinstance_t *db) -{ +mysql_destroy(dbinstance_t *db) { /* release DB connection */ if (db->dbconn != NULL) { mysql_close((MYSQL *)db->dbconn); @@ -129,8 +129,7 @@ mysql_destroy(dbinstance_t *db) * multithreaded operation. */ static void -mysql_destroy_dblist(db_list_t *dblist) -{ +mysql_destroy_dblist(db_list_t *dblist) { dbinstance_t *ndbi = NULL; dbinstance_t *dbi = NULL; @@ -157,8 +156,7 @@ mysql_destroy_dblist(db_list_t *dblist) * multithreaded operation. */ static dbinstance_t * -mysql_find_avail_conn(mysql_instance_t *mysql) -{ +mysql_find_avail_conn(mysql_instance_t *mysql) { dbinstance_t *dbi = NULL, *head; int count = 0; @@ -197,8 +195,7 @@ mysql_find_avail_conn(mysql_instance_t *mysql) * want special characters in the string causing problems. */ static char * -mysqldrv_escape_string(MYSQL *mysql, const char *instr) -{ +mysqldrv_escape_string(MYSQL *mysql, const char *instr) { char *outstr; unsigned int len; @@ -228,8 +225,7 @@ mysqldrv_escape_string(MYSQL *mysql, const char *instr) */ static isc_result_t mysql_get_resultset(const char *zone, const char *record, const char *client, - unsigned int query, void *dbdata, MYSQL_RES **rs) -{ + unsigned int query, void *dbdata, MYSQL_RES **rs) { isc_result_t result; dbinstance_t *dbi = NULL; mysql_instance_t *db = (mysql_instance_t *)dbdata; @@ -441,8 +437,8 @@ cleanup: * into this function to minimize code. */ static isc_result_t -mysql_process_rs(mysql_instance_t *db, dns_sdlzlookup_t *lookup, MYSQL_RES *rs) -{ +mysql_process_rs(mysql_instance_t *db, dns_sdlzlookup_t *lookup, + MYSQL_RES *rs) { isc_result_t result = ISC_R_NOTFOUND; MYSQL_ROW row; unsigned int fields; @@ -554,8 +550,7 @@ mysql_process_rs(mysql_instance_t *db, dns_sdlzlookup_t *lookup, MYSQL_RES *rs) /*% determine if the zone is supported by (in) the database */ isc_result_t dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo) -{ + dns_clientinfo_t *clientinfo) { isc_result_t result; MYSQL_RES *rs = NULL; my_ulonglong rows; @@ -591,8 +586,7 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, /*% Determine if the client is allowed to perform a zone transfer */ isc_result_t -dlz_allowzonexfr(void *dbdata, const char *name, const char *client) -{ +dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { isc_result_t result; mysql_instance_t *db = (mysql_instance_t *)dbdata; MYSQL_RES *rs = NULL; @@ -643,8 +637,7 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) * query. */ isc_result_t -dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) -{ +dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { isc_result_t result; mysql_instance_t *db = (mysql_instance_t *)dbdata; MYSQL_RES *rs = NULL; @@ -747,8 +740,7 @@ cleanup: * use this function to get that information for named. */ isc_result_t -dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) -{ +dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) { isc_result_t result; MYSQL_RES *rs = NULL; mysql_instance_t *db = (mysql_instance_t *)dbdata; @@ -778,8 +770,7 @@ dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) isc_result_t dlz_lookup(const char *zone, const char *name, void *dbdata, dns_sdlzlookup_t *lookup, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo) -{ + dns_clientinfo_t *clientinfo) { isc_result_t result; MYSQL_RES *rs = NULL; mysql_instance_t *db = (mysql_instance_t *)dbdata; @@ -811,8 +802,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, */ isc_result_t dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, - ...) -{ + ...) { isc_result_t result = ISC_R_FAILURE; mysql_instance_t *mysql = NULL; dbinstance_t *dbi = NULL; @@ -1074,8 +1064,7 @@ cleanup: * Destroy the module. */ void -dlz_destroy(void *dbdata) -{ +dlz_destroy(void *dbdata) { mysql_instance_t *db = (mysql_instance_t *)dbdata; #if PTHREADS /* cleanup the list of DBI's */ @@ -1107,8 +1096,7 @@ dlz_destroy(void *dbdata) * Return the version of the API */ int -dlz_version(unsigned int *flags) -{ +dlz_version(unsigned int *flags) { *flags |= (DNS_SDLZFLAG_RELATIVEOWNER | DNS_SDLZFLAG_RELATIVERDATA | DNS_SDLZFLAG_THREADSAFE); return (DLZ_DLOPEN_VERSION); @@ -1118,8 +1106,7 @@ dlz_version(unsigned int *flags) * Register a helper function from the bind9 dlz_dlopen driver */ static void -b9_add_helper(mysql_instance_t *db, const char *helper_name, void *ptr) -{ +b9_add_helper(mysql_instance_t *db, const char *helper_name, void *ptr) { if (strcmp(helper_name, "log") == 0) { db->log = (log_t *)ptr; } diff --git a/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c b/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c index b8a15ba4b760e5202d0442c60db701734d3525c5..59a0d040354dac0876983dec696f07bcca9b24db 100644 --- a/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c +++ b/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c @@ -251,8 +251,7 @@ static const char *modname = "dlz_mysqldyn"; * Local functions */ static bool -db_connect(mysql_data_t *state, mysql_instance_t *dbi) -{ +db_connect(mysql_data_t *state, mysql_instance_t *dbi) { MYSQL *conn; /* * Make sure this thread has been through 'init' @@ -287,8 +286,7 @@ db_connect(mysql_data_t *state, mysql_instance_t *dbi) } static mysql_instance_t * -get_dbi(mysql_data_t *state) -{ +get_dbi(mysql_data_t *state) { int i; /* @@ -315,8 +313,7 @@ get_dbi(mysql_data_t *state) * of string 'original' */ static char * -sanitize(mysql_instance_t *dbi, const char *original) -{ +sanitize(mysql_instance_t *dbi, const char *original) { char *s; if (original == NULL) { @@ -339,8 +336,7 @@ sanitize(mysql_instance_t *dbi, const char *original) * and add the string length to the running total pointed to by 'len'. */ static isc_result_t -additem(mysql_arglist_t *arglist, char **s, size_t *len) -{ +additem(mysql_arglist_t *arglist, char **s, size_t *len) { mysql_arg_t *item; item = malloc(sizeof(*item)); @@ -369,8 +365,7 @@ additem(mysql_arglist_t *arglist, char **s, size_t *len) */ static char * build_query(mysql_data_t *state, mysql_instance_t *dbi, const char *command, - ...) -{ + ...) { isc_result_t result; bool localdbi = false; mysql_arglist_t arglist; @@ -491,8 +486,7 @@ fail: /* Does this name end in a dot? */ static bool -isrelative(const char *s) -{ +isrelative(const char *s) { if (s == NULL || s[strlen(s) - 1] == '.') { return (false); } @@ -501,8 +495,7 @@ isrelative(const char *s) /* Return a dot if 's' doesn't already end with one */ static inline const char * -dot(const char *s) -{ +dot(const char *s) { return (isrelative(s) ? "." : ""); } @@ -512,8 +505,7 @@ dot(const char *s) * enough space). */ static void -fqhn(const char *name, const char *zone, char *dest) -{ +fqhn(const char *name, const char *zone, char *dest) { if (dest == NULL) { return; } @@ -534,8 +526,7 @@ fqhn(const char *name, const char *zone, char *dest) * removes labels matching 'zone' from the end of 'name'. */ static char * -relname(const char *name, const char *zone) -{ +relname(const char *name, const char *zone) { size_t nlen, zlen; const char *p; char *new; @@ -570,8 +561,7 @@ relname(const char *name, const char *zone) } static isc_result_t -validate_txn(mysql_data_t *state, mysql_transaction_t *txn) -{ +validate_txn(mysql_data_t *state, mysql_transaction_t *txn) { isc_result_t result = ISC_R_FAILURE; mysql_transaction_t *txp; @@ -592,8 +582,7 @@ validate_txn(mysql_data_t *state, mysql_transaction_t *txn) } static isc_result_t -db_execute(mysql_data_t *state, mysql_instance_t *dbi, const char *query) -{ +db_execute(mysql_data_t *state, mysql_instance_t *dbi, const char *query) { int ret; /* Make sure this instance is connected. */ @@ -619,8 +608,7 @@ db_execute(mysql_data_t *state, mysql_instance_t *dbi, const char *query) } static MYSQL_RES * -db_query(mysql_data_t *state, mysql_instance_t *dbi, const char *query) -{ +db_query(mysql_data_t *state, mysql_instance_t *dbi, const char *query) { isc_result_t result; bool localdbi = false; MYSQL_RES *res = NULL; @@ -684,8 +672,7 @@ fail: * values to the 'on the wire' packet values. */ static unsigned char * -make_notify(const char *zone, int *packetlen) -{ +make_notify(const char *zone, int *packetlen) { int i, j; unsigned char *packet = (unsigned char *)malloc(strlen(zone) + 18); @@ -739,8 +726,7 @@ make_notify(const char *zone, int *packetlen) } static void -send_notify(struct sockaddr_in *addr, const unsigned char *p, const int plen) -{ +send_notify(struct sockaddr_in *addr, const unsigned char *p, const int plen) { int s; addr->sin_family = AF_INET; @@ -759,8 +745,7 @@ send_notify(struct sockaddr_in *addr, const unsigned char *p, const int plen) * Generate and send a DNS NOTIFY packet */ static void -notify(mysql_data_t *state, const char *zone, int sn) -{ +notify(mysql_data_t *state, const char *zone, int sn) { MYSQL_RES *res; MYSQL_ROW row; char *query; @@ -851,8 +836,7 @@ notify(mysql_data_t *state, const char *zone, int sn) * used in the dlz_{add,sub,del}rdataset functions below. */ static mysql_record_t * -makerecord(mysql_data_t *state, const char *name, const char *rdatastr) -{ +makerecord(mysql_data_t *state, const char *name, const char *rdatastr) { mysql_record_t *new_record; char *real_name, *dclass, *type, *data, *ttlstr, *buf; dns_ttl_t ttlvalue; @@ -929,8 +913,7 @@ error: * Remember a helper function from the bind9 dlz_dlopen driver */ static void -b9_add_helper(mysql_data_t *state, const char *helper_name, void *ptr) -{ +b9_add_helper(mysql_data_t *state, const char *helper_name, void *ptr) { if (strcmp(helper_name, "log") == 0) { state->log = (log_t *)ptr; } @@ -953,8 +936,7 @@ b9_add_helper(mysql_data_t *state, const char *helper_name, void *ptr) * Return the version of the API */ int -dlz_version(unsigned int *flags) -{ +dlz_version(unsigned int *flags) { UNUSED(flags); *flags |= DNS_SDLZFLAG_THREADSAFE; return (DLZ_DLOPEN_VERSION); @@ -965,8 +947,7 @@ dlz_version(unsigned int *flags) */ isc_result_t dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, - ...) -{ + ...) { mysql_data_t *state; const char *helper_name; va_list ap; @@ -1067,8 +1048,7 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, * Shut down the backend */ void -dlz_destroy(void *dbdata) -{ +dlz_destroy(void *dbdata) { mysql_data_t *state = (mysql_data_t *)dbdata; int i; @@ -1095,8 +1075,7 @@ dlz_destroy(void *dbdata) */ isc_result_t dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo) -{ + dns_clientinfo_t *clientinfo) { isc_result_t result = ISC_R_SUCCESS; mysql_data_t *state = (mysql_data_t *)dbdata; MYSQL_RES *res; @@ -1128,8 +1107,7 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, isc_result_t dlz_lookup(const char *zone, const char *name, void *dbdata, dns_sdlzlookup_t *lookup, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo) -{ + dns_clientinfo_t *clientinfo) { isc_result_t result; mysql_data_t *state = (mysql_data_t *)dbdata; bool found = false; @@ -1266,8 +1244,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, * See if a zone transfer is allowed */ isc_result_t -dlz_allowzonexfr(void *dbdata, const char *name, const char *client) -{ +dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { mysql_data_t *state = (mysql_data_t *)dbdata; if (state->debug && state->log != NULL) { @@ -1283,8 +1260,7 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) * Perform a zone transfer */ isc_result_t -dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) -{ +dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { isc_result_t result = ISC_R_SUCCESS; mysql_data_t *state = (mysql_data_t *)dbdata; MYSQL_RES *res; @@ -1336,8 +1312,7 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) * Start a transaction */ isc_result_t -dlz_newversion(const char *zone, void *dbdata, void **versionp) -{ +dlz_newversion(const char *zone, void *dbdata, void **versionp) { isc_result_t result = ISC_R_FAILURE; mysql_data_t *state = (mysql_data_t *)dbdata; MYSQL_RES *res; @@ -1451,8 +1426,7 @@ cleanup: * End a transaction */ void -dlz_closeversion(const char *zone, bool commit, void *dbdata, void **versionp) -{ +dlz_closeversion(const char *zone, bool commit, void *dbdata, void **versionp) { isc_result_t result; mysql_data_t *state = (mysql_data_t *)dbdata; mysql_transaction_t *txn = (mysql_transaction_t *)*versionp; @@ -1654,8 +1628,7 @@ dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *dbdata) bool dlz_ssumatch(const char *signer, const char *name, const char *tcpaddr, const char *type, const char *key, uint32_t keydatalen, - unsigned char *keydata, void *dbdata) -{ + unsigned char *keydata, void *dbdata) { mysql_data_t *state = (mysql_data_t *)dbdata; UNUSED(tcpaddr); @@ -1673,8 +1646,7 @@ dlz_ssumatch(const char *signer, const char *name, const char *tcpaddr, isc_result_t dlz_addrdataset(const char *name, const char *rdatastr, void *dbdata, - void *version) -{ + void *version) { mysql_data_t *state = (mysql_data_t *)dbdata; mysql_transaction_t *txn = (mysql_transaction_t *)version; char *new_name, *query; @@ -1737,8 +1709,7 @@ cleanup: isc_result_t dlz_subrdataset(const char *name, const char *rdatastr, void *dbdata, - void *version) -{ + void *version) { mysql_data_t *state = (mysql_data_t *)dbdata; mysql_transaction_t *txn = (mysql_transaction_t *)version; char *new_name, *query; @@ -1788,8 +1759,8 @@ cleanup: } isc_result_t -dlz_delrdataset(const char *name, const char *type, void *dbdata, void *version) -{ +dlz_delrdataset(const char *name, const char *type, void *dbdata, + void *version) { mysql_data_t *state = (mysql_data_t *)dbdata; mysql_transaction_t *txn = (mysql_transaction_t *)version; char *new_name, *query; diff --git a/contrib/dlz/modules/perl/dlz_perl_driver.c b/contrib/dlz/modules/perl/dlz_perl_driver.c index 41cb6f8b9a5b3dee8afa2097758bcae3c8fe7ddd..89cb5c165055986a311a268adf7f331308eb609a 100644 --- a/contrib/dlz/modules/perl/dlz_perl_driver.c +++ b/contrib/dlz/modules/perl/dlz_perl_driver.c @@ -101,11 +101,14 @@ typedef struct config_data { * the warnings. */ EXTERN_C void xs_init(pTHX); -EXTERN_C void boot_DynaLoader(pTHX_ CV *cv); -EXTERN_C void boot_DLZ_Perl__clientinfo(pTHX_ CV *cv); -EXTERN_C void boot_DLZ_Perl(pTHX_ CV *cv); -EXTERN_C void xs_init(pTHX) -{ +EXTERN_C void +boot_DynaLoader(pTHX_ CV *cv); +EXTERN_C void +boot_DLZ_Perl__clientinfo(pTHX_ CV *cv); +EXTERN_C void +boot_DLZ_Perl(pTHX_ CV *cv); +EXTERN_C void +xs_init(pTHX) { char *file = __FILE__; dXSUB_SYS; @@ -124,8 +127,7 @@ EXTERN_C void xs_init(pTHX) * remember a helper function, from the bind9 dlz_dlopen driver */ static void -b9_add_helper(config_data_t *state, const char *helper_name, void *ptr) -{ +b9_add_helper(config_data_t *state, const char *helper_name, void *ptr) { if (strcmp(helper_name, "log") == 0) { state->log = ptr; } @@ -141,14 +143,12 @@ b9_add_helper(config_data_t *state, const char *helper_name, void *ptr) } int -dlz_version(unsigned int *flags) -{ +dlz_version(unsigned int *flags) { return (DLZ_DLOPEN_VERSION); } isc_result_t -dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) -{ +dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { config_data_t *cd = (config_data_t *)dbdata; isc_result_t retval; int rrcount, r; @@ -250,8 +250,7 @@ CLEAN_UP_AND_RETURN: } isc_result_t -dlz_allowzonexfr(void *dbdata, const char *name, const char *client) -{ +dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { config_data_t *cd = (config_data_t *)dbdata; int r; isc_result_t retval; @@ -528,8 +527,7 @@ missing_perl_method(const char *perl_class_name) isc_result_t dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, - ...) -{ + ...) { config_data_t *cd; char *init_args[] = { NULL, NULL }; char *perlrun[] = { "", NULL, "dlz perl", NULL }; @@ -716,8 +714,7 @@ CLEAN_UP_PERL_AND_FAIL: } void -dlz_destroy(void *dbdata) -{ +dlz_destroy(void *dbdata) { config_data_t *cd = (config_data_t *)dbdata; #ifdef MULTIPLICITY PerlInterpreter *my_perl = cd->perl; diff --git a/contrib/dlz/modules/perl/dlz_perl_driver.h b/contrib/dlz/modules/perl/dlz_perl_driver.h index 513cbe957d648c1be1412860b4be0144d88bc55e..1db8e2833dbf5b373d8fb2b9c8de07810ad710c5 100644 --- a/contrib/dlz/modules/perl/dlz_perl_driver.h +++ b/contrib/dlz/modules/perl/dlz_perl_driver.h @@ -20,5 +20,5 @@ /* This is the only part that differs from dlz_minimal.h. */ typedef struct dlz_perl_clientinfo_opaque { dns_clientinfomethods_t *methods; - dns_clientinfo_t * clientinfo; + dns_clientinfo_t *clientinfo; } dlz_perl_clientinfo_opaque; diff --git a/contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c b/contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c index 9f9c9a8a7af28917191ff37f35d327876939f3d9..220dc07f595570e6d8de332f4d0a69559ab64a8a 100644 --- a/contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c +++ b/contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c @@ -102,22 +102,22 @@ typedef struct { } sqlite3_res_t; /* forward references */ -isc_result_t dlz_findzonedb(void *dbdata, const char *name, - dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo); +isc_result_t +dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, + dns_clientinfo_t *clientinfo); -void dlz_destroy(void *dbdata); +void +dlz_destroy(void *dbdata); -static void b9_add_helper(sqlite3_instance_t *db, const char *helper_name, - void *ptr); +static void +b9_add_helper(sqlite3_instance_t *db, const char *helper_name, void *ptr); /* * Private methods */ void -sqlite3_destroy(dbinstance_t *db) -{ +sqlite3_destroy(dbinstance_t *db) { /* release DB connection */ if (db->dbconn != NULL) { sqlite3_close((sqlite3 *)db->dbconn); @@ -135,8 +135,7 @@ sqlite3_destroy(dbinstance_t *db) * multithreaded operation. */ static void -sqlite3_destroy_dblist(db_list_t *dblist) -{ +sqlite3_destroy_dblist(db_list_t *dblist) { dbinstance_t *ndbi = NULL; dbinstance_t *dbi = NULL; @@ -163,8 +162,7 @@ sqlite3_destroy_dblist(db_list_t *dblist) * multithreaded operation. */ static dbinstance_t * -sqlite3_find_avail(sqlite3_instance_t *sqlite3) -{ +sqlite3_find_avail(sqlite3_instance_t *sqlite3) { dbinstance_t *dbi = NULL, *head; int count = 0; @@ -203,8 +201,7 @@ sqlite3_find_avail(sqlite3_instance_t *sqlite3) * want special characters in the string causing problems. */ static char * -escape_string(const char *instr) -{ +escape_string(const char *instr) { char *outstr; char *ptr; unsigned int len; @@ -252,8 +249,7 @@ escape_string(const char *instr) */ static isc_result_t sqlite3_get_resultset(const char *zone, const char *record, const char *client, - unsigned int query, void *dbdata, sqlite3_res_t **rsp) -{ + unsigned int query, void *dbdata, sqlite3_res_t **rsp) { isc_result_t result; dbinstance_t *dbi = NULL; sqlite3_instance_t *db = (sqlite3_instance_t *)dbdata; @@ -476,8 +472,7 @@ cleanup: */ char ** -sqlite3_fetch_row(sqlite3_res_t *rs) -{ +sqlite3_fetch_row(sqlite3_res_t *rs) { char **retval = NULL; if (rs != NULL) { if (rs->pnRow > 0U && rs->curRow < rs->pnRow) { @@ -490,8 +485,7 @@ sqlite3_fetch_row(sqlite3_res_t *rs) } unsigned int -sqlite3_num_fields(sqlite3_res_t *rs) -{ +sqlite3_num_fields(sqlite3_res_t *rs) { unsigned int retval = 0; if (rs != NULL) { retval = rs->pnColumn; @@ -500,8 +494,7 @@ sqlite3_num_fields(sqlite3_res_t *rs) } unsigned int -sqlite3_num_rows(sqlite3_res_t *rs) -{ +sqlite3_num_rows(sqlite3_res_t *rs) { unsigned int retval = 0; if (rs != NULL) { retval = rs->pnRow; @@ -510,8 +503,7 @@ sqlite3_num_rows(sqlite3_res_t *rs) } void -sqlite3_free_result(sqlite3_res_t *rs) -{ +sqlite3_free_result(sqlite3_res_t *rs) { if (rs != NULL) { sqlite3_free_table(rs->pazResult); free(rs); @@ -520,8 +512,7 @@ sqlite3_free_result(sqlite3_res_t *rs) static isc_result_t sqlite3_process_rs(sqlite3_instance_t *db, dns_sdlzlookup_t *lookup, - sqlite3_res_t *rs) -{ + sqlite3_res_t *rs) { isc_result_t result = ISC_R_NOTFOUND; char **row; unsigned int fields; @@ -633,8 +624,7 @@ sqlite3_process_rs(sqlite3_instance_t *db, dns_sdlzlookup_t *lookup, /*% determine if the zone is supported by (in) the database */ isc_result_t dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo) -{ + dns_clientinfo_t *clientinfo) { isc_result_t result; sqlite3_res_t *rs = NULL; sqlite3_uint64 rows; @@ -671,8 +661,7 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, /*% Determine if the client is allowed to perform a zone transfer */ isc_result_t -dlz_allowzonexfr(void *dbdata, const char *name, const char *client) -{ +dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { isc_result_t result; sqlite3_instance_t *db = (sqlite3_instance_t *)dbdata; sqlite3_res_t *rs = NULL; @@ -724,8 +713,7 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) * query. */ isc_result_t -dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) -{ +dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { isc_result_t result; sqlite3_instance_t *db = (sqlite3_instance_t *)dbdata; sqlite3_res_t *rs = NULL; @@ -828,8 +816,7 @@ cleanup: * use this function to get that information for named. */ isc_result_t -dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) -{ +dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) { isc_result_t result; sqlite3_res_t *rs = NULL; sqlite3_instance_t *db = (sqlite3_instance_t *)dbdata; @@ -860,8 +847,7 @@ dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) isc_result_t dlz_lookup(const char *zone, const char *name, void *dbdata, dns_sdlzlookup_t *lookup, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo) -{ + dns_clientinfo_t *clientinfo) { isc_result_t result; sqlite3_res_t *rs = NULL; sqlite3_instance_t *db = (sqlite3_instance_t *)dbdata; @@ -893,8 +879,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, */ isc_result_t dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, - ...) -{ + ...) { isc_result_t result = ISC_R_FAILURE; sqlite3_instance_t *s3 = NULL; dbinstance_t *dbi = NULL; @@ -1080,8 +1065,7 @@ cleanup: * Destroy the module. */ void -dlz_destroy(void *dbdata) -{ +dlz_destroy(void *dbdata) { sqlite3_instance_t *db = (sqlite3_instance_t *)dbdata; #if PTHREADS /* cleanup the list of DBI's */ @@ -1101,8 +1085,7 @@ dlz_destroy(void *dbdata) * Return the version of the API */ int -dlz_version(unsigned int *flags) -{ +dlz_version(unsigned int *flags) { *flags |= (DNS_SDLZFLAG_RELATIVEOWNER | DNS_SDLZFLAG_RELATIVERDATA | DNS_SDLZFLAG_THREADSAFE); return (DLZ_DLOPEN_VERSION); @@ -1112,8 +1095,7 @@ dlz_version(unsigned int *flags) * Register a helper function from the bind9 dlz_dlopen driver */ static void -b9_add_helper(sqlite3_instance_t *db, const char *helper_name, void *ptr) -{ +b9_add_helper(sqlite3_instance_t *db, const char *helper_name, void *ptr) { if (strcmp(helper_name, "log") == 0) { db->log = (log_t *)ptr; } diff --git a/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c b/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c index 533fc26b7d412b628665161aabcc640ef2eb5162..e02c677cb9e3945194779e6d0ff48f82eaa8738b 100644 --- a/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c +++ b/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c @@ -114,18 +114,20 @@ struct named_rr { /* * Forward references */ -static int rangematch(const char *, char, int, char **); +static int +rangematch(const char *, char, int, char **); -static int fnmatch(const char *pattern, const char *string, int flags); +static int +fnmatch(const char *pattern, const char *string, int flags); -static void b9_add_helper(struct config_data *cd, const char *helper_name, - void *ptr); +static void +b9_add_helper(struct config_data *cd, const char *helper_name, void *ptr); -static const char *shortest_match(const char *pattern, const char *string); +static const char * +shortest_match(const char *pattern, const char *string); isc_result_t -dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) -{ +dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { config_data_t *cd = (config_data_t *)dbdata; isc_result_t result; char *querystring = NULL; @@ -176,8 +178,7 @@ done: } isc_result_t -dlz_allowzonexfr(void *dbdata, const char *name, const char *client) -{ +dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { config_data_t *cd = (config_data_t *)dbdata; UNUSED(name); @@ -318,8 +319,7 @@ done: } isc_result_t -dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) -{ +dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) { isc_result_t result; config_data_t *cd = (config_data_t *)dbdata; char *querystring = NULL; @@ -376,8 +376,7 @@ done: } static void -destroy_rrlist(config_data_t *cd) -{ +destroy_rrlist(config_data_t *cd) { nrr_t *trec, *nrec; nrec = DLZ_LIST_HEAD(cd->rrs_list); @@ -404,8 +403,7 @@ destroy_rrlist(config_data_t *cd) isc_result_t dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, - ...) -{ + ...) { config_data_t *cd; char *endp; int i, def_ttl; @@ -516,8 +514,7 @@ cleanup: } void -dlz_destroy(void *dbdata) -{ +dlz_destroy(void *dbdata) { config_data_t *cd = (config_data_t *)dbdata; /* @@ -536,8 +533,7 @@ dlz_destroy(void *dbdata) * Return the version of the API */ int -dlz_version(unsigned int *flags) -{ +dlz_version(unsigned int *flags) { UNUSED(flags); /* XXX: ok to set DNS_SDLZFLAG_THREADSAFE here? */ return (DLZ_DLOPEN_VERSION); @@ -547,8 +543,7 @@ dlz_version(unsigned int *flags) * Register a helper function from the bind9 dlz_dlopen driver */ static void -b9_add_helper(struct config_data *cd, const char *helper_name, void *ptr) -{ +b9_add_helper(struct config_data *cd, const char *helper_name, void *ptr) { if (strcmp(helper_name, "log") == 0) { cd->log = (log_t *)ptr; } @@ -564,8 +559,7 @@ b9_add_helper(struct config_data *cd, const char *helper_name, void *ptr) } static const char * -shortest_match(const char *pattern, const char *string) -{ +shortest_match(const char *pattern, const char *string) { const char *p = string; if (pattern == NULL || p == NULL || *p == '\0') { return (NULL); @@ -601,8 +595,7 @@ shortest_match(const char *pattern, const char *string) #define RANGE_ERROR (-1) static int -fnmatch(const char *pattern, const char *string, int flags) -{ +fnmatch(const char *pattern, const char *string, int flags) { const char *stringstart; char *newp; char c, test; @@ -724,8 +717,7 @@ fnmatch(const char *pattern, const char *string, int flags) } static int -rangematch(const char *pattern, char test, int flags, char **newp) -{ +rangematch(const char *pattern, char test, int flags, char **newp) { int negate, ok; char c, c2; diff --git a/fuzz/dns_name_fromtext_target.c b/fuzz/dns_name_fromtext_target.c index b4aa9078bf678ae5f932f54f194260dd57699633..0e7af6b9ca0334e2a2860ffccaf9ba5e9b164f3a 100644 --- a/fuzz/dns_name_fromtext_target.c +++ b/fuzz/dns_name_fromtext_target.c @@ -22,12 +22,11 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size); int -LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) -{ - isc_buffer_t buf; - isc_result_t result; +LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { + isc_buffer_t buf; + isc_result_t result; dns_fixedname_t origin; - char * de_const; + char *de_const; if (size < 5) { return (0); diff --git a/fuzz/dns_rdata_fromwire_text.c b/fuzz/dns_rdata_fromwire_text.c index a387aa733b132820fe4c77db94cee044f3aed22a..10f0e4c2914a208e472231a2abfd07221940e809 100644 --- a/fuzz/dns_rdata_fromwire_text.c +++ b/fuzz/dns_rdata_fromwire_text.c @@ -42,35 +42,33 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size); static void -nullmsg(dns_rdatacallbacks_t *cb, const char *fmt, ...) -{ +nullmsg(dns_rdatacallbacks_t *cb, const char *fmt, ...) { UNUSED(cb); UNUSED(fmt); } int -LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) -{ - char totext[1024]; - dns_compress_t cctx; +LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { + char totext[1024]; + dns_compress_t cctx; dns_decompress_t dctx; - dns_rdatatype_t rdtype; + dns_rdatatype_t rdtype; dns_rdataclass_t rdclass; - dns_rdatatype_t typelist[256] = { 1000 }; /* unknown */ + dns_rdatatype_t typelist[256] = { 1000 }; /* unknown */ dns_rdataclass_t classlist[] = { dns_rdataclass_in, dns_rdataclass_hs, dns_rdataclass_ch, dns_rdataclass_any, 60 }; - dns_rdata_t rdata1 = DNS_RDATA_INIT, rdata2 = DNS_RDATA_INIT, + dns_rdata_t rdata1 = DNS_RDATA_INIT, rdata2 = DNS_RDATA_INIT, rdata3 = DNS_RDATA_INIT; dns_rdatacallbacks_t callbacks; - isc_buffer_t source, target; - isc_lex_t * lex = NULL; - isc_lexspecials_t specials; - isc_mem_t * mctx = NULL; - isc_result_t result; - unsigned char fromtext[1024]; - unsigned char fromwire[1024]; - unsigned char towire[1024]; + isc_buffer_t source, target; + isc_lex_t *lex = NULL; + isc_lexspecials_t specials; + isc_mem_t *mctx = NULL; + isc_result_t result; + unsigned char fromtext[1024]; + unsigned char fromwire[1024]; + unsigned char towire[1024]; unsigned int classes = (sizeof(classlist) / sizeof(classlist[0])); unsigned int types = 1, flags, t; diff --git a/fuzz/fuzz.h b/fuzz/fuzz.h index b8cee8b09d50276bc2aff5e4a6cecae6565049d0..b0976e634b8b52fc1dd3cf8299cd11e9a79991c8 100644 --- a/fuzz/fuzz.h +++ b/fuzz/fuzz.h @@ -28,14 +28,12 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size); static isc_mem_t *mctx = NULL; -static void __attribute__((constructor)) init(void) -{ +static void __attribute__((constructor)) init(void) { isc_mem_create(&mctx); RUNTIME_CHECK(dst_lib_init(mctx, NULL) == ISC_R_SUCCESS); } -static void __attribute__((destructor)) deinit(void) -{ +static void __attribute__((destructor)) deinit(void) { dst_lib_destroy(); isc_mem_destroy(&mctx); } diff --git a/fuzz/main.c b/fuzz/main.c index eef2f1218215c0dd0b60810ad2f561b1ba19356d..10157b5ab9e6b98244b4c957eb1a047bc2177d8d 100644 --- a/fuzz/main.c +++ b/fuzz/main.c @@ -26,9 +26,8 @@ #include static void -test_all_from(const char *dirname) -{ - DIR * dirp; +test_all_from(const char *dirname) { + DIR *dirp; struct dirent *dp; dirp = opendir(dirname); @@ -37,11 +36,11 @@ test_all_from(const char *dirname) } while ((dp = readdir(dirp)) != NULL) { - char filename[strlen(dirname) + strlen(dp->d_name) + 2]; - int fd; + char filename[strlen(dirname) + strlen(dp->d_name) + 2]; + int fd; struct stat st; - char * data; - ssize_t n; + char *data; + ssize_t n; if (dp->d_name[0] == '.') { continue; @@ -91,9 +90,8 @@ test_all_from(const char *dirname) } int -main(int argc, char **argv) -{ - char corpusdir[PATH_MAX]; +main(int argc, char **argv) { + char corpusdir[PATH_MAX]; const char *target = strrchr(argv[0], '/'); UNUSED(argc); @@ -114,9 +112,8 @@ main(int argc, char **argv) #elif __AFL_COMPILER int -main(int argc, char **argv) -{ - int ret; +main(int argc, char **argv) { + int ret; unsigned char buf[64 * 1024]; UNUSED(argc); diff --git a/lib/bind9/check.c b/lib/bind9/check.c index fea0d4ffce95ae84463e07b90483891dbd7b926c..a64e945aad475d4f8e8f0f7f36fc59df26fc15a4 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -60,8 +60,9 @@ #include #include -static isc_result_t fileexist(const cfg_obj_t *obj, isc_symtab_t *symtab, - bool writeable, isc_log_t *logctxlogc); +static isc_result_t +fileexist(const cfg_obj_t *obj, isc_symtab_t *symtab, bool writeable, + isc_log_t *logctxlogc); static void freekey(char *key, unsigned int type, isc_symvalue_t value, void *userarg) { diff --git a/lib/dns/adb.c b/lib/dns/adb.c index 4058a38acf744635e794a183a04a8a239b066f50..5d0a5d6dcf9bae389f085fa96d6973a4ab9e13d3 100644 --- a/lib/dns/adb.c +++ b/lib/dns/adb.c @@ -284,65 +284,105 @@ struct dns_adbentry { /* * Internal functions (and prototypes). */ -static inline dns_adbname_t *new_adbname(dns_adb_t *, const dns_name_t *); -static inline void free_adbname(dns_adb_t *, dns_adbname_t **); -static inline dns_adbnamehook_t *new_adbnamehook(dns_adb_t *, dns_adbentry_t *); -static inline void free_adbnamehook(dns_adb_t *, dns_adbnamehook_t **); +static inline dns_adbname_t * +new_adbname(dns_adb_t *, const dns_name_t *); +static inline void +free_adbname(dns_adb_t *, dns_adbname_t **); +static inline dns_adbnamehook_t * +new_adbnamehook(dns_adb_t *, dns_adbentry_t *); +static inline void +free_adbnamehook(dns_adb_t *, dns_adbnamehook_t **); static inline dns_adblameinfo_t * new_adblameinfo(dns_adb_t *, const dns_name_t *, dns_rdatatype_t); -static inline void free_adblameinfo(dns_adb_t *, dns_adblameinfo_t **); -static inline dns_adbentry_t *new_adbentry(dns_adb_t *); -static inline void free_adbentry(dns_adb_t *, dns_adbentry_t **); -static inline dns_adbfind_t *new_adbfind(dns_adb_t *); -static inline bool free_adbfind(dns_adb_t *, dns_adbfind_t **); -static inline dns_adbaddrinfo_t *new_adbaddrinfo(dns_adb_t *, dns_adbentry_t *, - in_port_t); -static inline dns_adbfetch_t *new_adbfetch(dns_adb_t *); -static inline void free_adbfetch(dns_adb_t *, dns_adbfetch_t **); -static inline dns_adbname_t *find_name_and_lock(dns_adb_t *, const dns_name_t *, - unsigned int, int *); +static inline void +free_adblameinfo(dns_adb_t *, dns_adblameinfo_t **); +static inline dns_adbentry_t * +new_adbentry(dns_adb_t *); +static inline void +free_adbentry(dns_adb_t *, dns_adbentry_t **); +static inline dns_adbfind_t * +new_adbfind(dns_adb_t *); +static inline bool +free_adbfind(dns_adb_t *, dns_adbfind_t **); +static inline dns_adbaddrinfo_t * +new_adbaddrinfo(dns_adb_t *, dns_adbentry_t *, in_port_t); +static inline dns_adbfetch_t * +new_adbfetch(dns_adb_t *); +static inline void +free_adbfetch(dns_adb_t *, dns_adbfetch_t **); +static inline dns_adbname_t * +find_name_and_lock(dns_adb_t *, const dns_name_t *, unsigned int, int *); static inline dns_adbentry_t * find_entry_and_lock(dns_adb_t *, const isc_sockaddr_t *, int *, isc_stdtime_t); -static void dump_adb(dns_adb_t *, FILE *, bool debug, isc_stdtime_t); -static void print_dns_name(FILE *, const dns_name_t *); -static void print_namehook_list(FILE *, const char *legend, dns_adb_t *adb, - dns_adbnamehooklist_t *list, bool debug, - isc_stdtime_t now); -static void print_find_list(FILE *, dns_adbname_t *); -static void print_fetch_list(FILE *, dns_adbname_t *); -static inline bool dec_adb_irefcnt(dns_adb_t *); -static inline void inc_adb_irefcnt(dns_adb_t *); -static inline void inc_adb_erefcnt(dns_adb_t *); -static inline void inc_entry_refcnt(dns_adb_t *, dns_adbentry_t *, bool); -static inline bool dec_entry_refcnt(dns_adb_t *, bool, dns_adbentry_t *, bool); -static inline void violate_locking_hierarchy(isc_mutex_t *, isc_mutex_t *); -static bool clean_namehooks(dns_adb_t *, dns_adbnamehooklist_t *); -static void clean_target(dns_adb_t *, dns_name_t *); -static void clean_finds_at_name(dns_adbname_t *, isc_eventtype_t, unsigned int); -static bool check_expire_namehooks(dns_adbname_t *, isc_stdtime_t); -static bool check_expire_entry(dns_adb_t *, dns_adbentry_t **, isc_stdtime_t); -static void cancel_fetches_at_name(dns_adbname_t *); -static isc_result_t dbfind_name(dns_adbname_t *, isc_stdtime_t, - dns_rdatatype_t); -static isc_result_t fetch_name(dns_adbname_t *, bool, unsigned int, - isc_counter_t *qc, dns_rdatatype_t); -static inline void check_exit(dns_adb_t *); -static void destroy(dns_adb_t *); -static bool shutdown_names(dns_adb_t *); -static bool shutdown_entries(dns_adb_t *); -static inline void link_name(dns_adb_t *, int, dns_adbname_t *); -static inline bool unlink_name(dns_adb_t *, dns_adbname_t *); -static inline void link_entry(dns_adb_t *, int, dns_adbentry_t *); -static inline bool unlink_entry(dns_adb_t *, dns_adbentry_t *); -static bool kill_name(dns_adbname_t **, isc_eventtype_t); -static void water(void *, int); -static void dump_entry(FILE *, dns_adb_t *, dns_adbentry_t *, bool, - isc_stdtime_t); -static void adjustsrtt(dns_adbaddrinfo_t *addr, unsigned int rtt, - unsigned int factor, isc_stdtime_t now); -static void shutdown_task(isc_task_t *task, isc_event_t *ev); -static void log_quota(dns_adbentry_t *entry, const char *fmt, ...) - ISC_FORMAT_PRINTF(2, 3); +static void +dump_adb(dns_adb_t *, FILE *, bool debug, isc_stdtime_t); +static void +print_dns_name(FILE *, const dns_name_t *); +static void +print_namehook_list(FILE *, const char *legend, dns_adb_t *adb, + dns_adbnamehooklist_t *list, bool debug, isc_stdtime_t now); +static void +print_find_list(FILE *, dns_adbname_t *); +static void +print_fetch_list(FILE *, dns_adbname_t *); +static inline bool +dec_adb_irefcnt(dns_adb_t *); +static inline void +inc_adb_irefcnt(dns_adb_t *); +static inline void +inc_adb_erefcnt(dns_adb_t *); +static inline void +inc_entry_refcnt(dns_adb_t *, dns_adbentry_t *, bool); +static inline bool +dec_entry_refcnt(dns_adb_t *, bool, dns_adbentry_t *, bool); +static inline void +violate_locking_hierarchy(isc_mutex_t *, isc_mutex_t *); +static bool +clean_namehooks(dns_adb_t *, dns_adbnamehooklist_t *); +static void +clean_target(dns_adb_t *, dns_name_t *); +static void +clean_finds_at_name(dns_adbname_t *, isc_eventtype_t, unsigned int); +static bool +check_expire_namehooks(dns_adbname_t *, isc_stdtime_t); +static bool +check_expire_entry(dns_adb_t *, dns_adbentry_t **, isc_stdtime_t); +static void +cancel_fetches_at_name(dns_adbname_t *); +static isc_result_t +dbfind_name(dns_adbname_t *, isc_stdtime_t, dns_rdatatype_t); +static isc_result_t +fetch_name(dns_adbname_t *, bool, unsigned int, isc_counter_t *qc, + dns_rdatatype_t); +static inline void +check_exit(dns_adb_t *); +static void +destroy(dns_adb_t *); +static bool +shutdown_names(dns_adb_t *); +static bool +shutdown_entries(dns_adb_t *); +static inline void +link_name(dns_adb_t *, int, dns_adbname_t *); +static inline bool +unlink_name(dns_adb_t *, dns_adbname_t *); +static inline void +link_entry(dns_adb_t *, int, dns_adbentry_t *); +static inline bool +unlink_entry(dns_adb_t *, dns_adbentry_t *); +static bool +kill_name(dns_adbname_t **, isc_eventtype_t); +static void +water(void *, int); +static void +dump_entry(FILE *, dns_adb_t *, dns_adbentry_t *, bool, isc_stdtime_t); +static void +adjustsrtt(dns_adbaddrinfo_t *addr, unsigned int rtt, unsigned int factor, + isc_stdtime_t now); +static void +shutdown_task(isc_task_t *task, isc_event_t *ev); +static void +log_quota(dns_adbentry_t *entry, const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3); /* * MUST NOT overlap DNS_ADBFIND_* flags! @@ -460,7 +500,8 @@ static isc_result_t find_err_map[FIND_ERR_MAX] = { DNS_R_NXRRSET, ISC_R_UNEXPECTED, ISC_R_NOTFOUND /* not YET found */ }; -static void DP(int level, const char *format, ...) ISC_FORMAT_PRINTF(2, 3); +static void +DP(int level, const char *format, ...) ISC_FORMAT_PRINTF(2, 3); static void DP(int level, const char *format, ...) { diff --git a/lib/dns/badcache.c b/lib/dns/badcache.c index 597b71391d4f7a37f70a6473f39e5d8059dd3c74..36a619dd860417dbe80b2b4732a1eaad6ec43e9a 100644 --- a/lib/dns/badcache.c +++ b/lib/dns/badcache.c @@ -56,8 +56,8 @@ struct dns_bcentry { dns_name_t name; }; -static isc_result_t badcache_resize(dns_badcache_t *bc, isc_time_t *now, - bool grow); +static isc_result_t +badcache_resize(dns_badcache_t *bc, isc_time_t *now, bool grow); isc_result_t dns_badcache_init(isc_mem_t *mctx, unsigned int size, dns_badcache_t **bcp) { diff --git a/lib/dns/cache.c b/lib/dns/cache.c index b607783639a30cc0eb2820306adddc7cb5256434..01ba94599152c74f2415bae797e59f22feaf80f7 100644 --- a/lib/dns/cache.c +++ b/lib/dns/cache.c @@ -153,16 +153,18 @@ struct dns_cache { *** Functions ***/ -static isc_result_t cache_cleaner_init(dns_cache_t *cache, - isc_taskmgr_t *taskmgr, - isc_timermgr_t *timermgr, - cache_cleaner_t *cleaner); +static isc_result_t +cache_cleaner_init(dns_cache_t *cache, isc_taskmgr_t *taskmgr, + isc_timermgr_t *timermgr, cache_cleaner_t *cleaner); -static void incremental_cleaning_action(isc_task_t *task, isc_event_t *event); +static void +incremental_cleaning_action(isc_task_t *task, isc_event_t *event); -static void cleaner_shutdown_action(isc_task_t *task, isc_event_t *event); +static void +cleaner_shutdown_action(isc_task_t *task, isc_event_t *event); -static void overmem_cleaning_action(isc_task_t *task, isc_event_t *event); +static void +overmem_cleaning_action(isc_task_t *task, isc_event_t *event); static inline isc_result_t cache_create_db(dns_cache_t *cache, dns_db_t **db) { diff --git a/lib/dns/callbacks.c b/lib/dns/callbacks.c index f1126ee696444ef4de434be00251183f4959d16b..90c6c53110b755b6edfafdd1cd1494cf5eea7b0c 100644 --- a/lib/dns/callbacks.c +++ b/lib/dns/callbacks.c @@ -17,14 +17,17 @@ #include #include -static void stdio_error_warn_callback(dns_rdatacallbacks_t *, const char *, ...) +static void +stdio_error_warn_callback(dns_rdatacallbacks_t *, const char *, ...) ISC_FORMAT_PRINTF(2, 3); -static void isclog_error_callback(dns_rdatacallbacks_t *callbacks, - const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3); +static void +isclog_error_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, ...) + ISC_FORMAT_PRINTF(2, 3); -static void isclog_warn_callback(dns_rdatacallbacks_t *callbacks, - const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3); +static void +isclog_warn_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, ...) + ISC_FORMAT_PRINTF(2, 3); /* * Private diff --git a/lib/dns/catz.c b/lib/dns/catz.c index 89888b396837392ef260c4e9533e82bac5f25408..b07dc2180e3e7f871ad177ae3a278df9ef2d1e25 100644 --- a/lib/dns/catz.c +++ b/lib/dns/catz.c @@ -80,13 +80,12 @@ struct dns_catz_zone { isc_refcount_t refs; }; -static isc_result_t catz_process_zones_entry(dns_catz_zone_t *zone, - dns_rdataset_t *value, - dns_label_t *mhash); -static isc_result_t catz_process_zones_suboption(dns_catz_zone_t *zone, - dns_rdataset_t *value, - dns_label_t *mhash, - dns_name_t *name); +static isc_result_t +catz_process_zones_entry(dns_catz_zone_t *zone, dns_rdataset_t *value, + dns_label_t *mhash); +static isc_result_t +catz_process_zones_suboption(dns_catz_zone_t *zone, dns_rdataset_t *value, + dns_label_t *mhash, dns_name_t *name); /*% * Collection of catalog zones for a view diff --git a/lib/dns/client.c b/lib/dns/client.c index 33d3cdce14fd1dec96751410f08d2862a889697a..0d8e951fa0de7218b7188364267d5b6878e7e343 100644 --- a/lib/dns/client.c +++ b/lib/dns/client.c @@ -255,9 +255,12 @@ typedef struct updatectx { struct updatectx *bp6; } updatectx_t; -static isc_result_t request_soa(updatectx_t *uctx); -static void client_resfind(resctx_t *rctx, dns_fetchevent_t *event); -static isc_result_t send_update(updatectx_t *uctx); +static isc_result_t +request_soa(updatectx_t *uctx); +static void +client_resfind(resctx_t *rctx, dns_fetchevent_t *event); +static isc_result_t +send_update(updatectx_t *uctx); /* * Try honoring the operating system's preferred ephemeral port range. diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c index 1d0a89e841c95fd8a48091fa70fd47c31d00b3ce..aa4b363283807939b62239376a4937648d949878 100644 --- a/lib/dns/dispatch.c +++ b/lib/dns/dispatch.c @@ -274,53 +274,75 @@ struct dns_dispatch { /* * Statics. */ -static dns_dispentry_t *entry_search(dns_qid_t *, const isc_sockaddr_t *, - dns_messageid_t, in_port_t, unsigned int); -static bool destroy_disp_ok(dns_dispatch_t *); -static void destroy_disp(isc_task_t *task, isc_event_t *event); -static void destroy_dispsocket(dns_dispatch_t *, dispsocket_t **); -static void deactivate_dispsocket(dns_dispatch_t *, dispsocket_t *); -static void udp_exrecv(isc_task_t *, isc_event_t *); -static void udp_shrecv(isc_task_t *, isc_event_t *); -static void udp_recv(isc_event_t *, dns_dispatch_t *, dispsocket_t *); -static void tcp_recv(isc_task_t *, isc_event_t *); -static isc_result_t startrecv(dns_dispatch_t *, dispsocket_t *); -static uint32_t dns_hash(dns_qid_t *, const isc_sockaddr_t *, dns_messageid_t, - in_port_t); -static void free_buffer(dns_dispatch_t *disp, void *buf, unsigned int len); -static void *allocate_udp_buffer(dns_dispatch_t *disp); -static inline void free_devent(dns_dispatch_t *disp, dns_dispatchevent_t *ev); -static inline dns_dispatchevent_t *allocate_devent(dns_dispatch_t *disp); -static void do_cancel(dns_dispatch_t *disp); -static dns_dispentry_t *linear_first(dns_qid_t *disp); -static dns_dispentry_t *linear_next(dns_qid_t *disp, dns_dispentry_t *resp); -static void dispatch_free(dns_dispatch_t **dispp); -static isc_result_t get_udpsocket(dns_dispatchmgr_t *mgr, dns_dispatch_t *disp, - isc_socketmgr_t *sockmgr, - const isc_sockaddr_t *localaddr, - isc_socket_t **sockp, - isc_socket_t *dup_socket, bool duponly); +static dns_dispentry_t * +entry_search(dns_qid_t *, const isc_sockaddr_t *, dns_messageid_t, in_port_t, + unsigned int); +static bool +destroy_disp_ok(dns_dispatch_t *); +static void +destroy_disp(isc_task_t *task, isc_event_t *event); +static void +destroy_dispsocket(dns_dispatch_t *, dispsocket_t **); +static void +deactivate_dispsocket(dns_dispatch_t *, dispsocket_t *); +static void +udp_exrecv(isc_task_t *, isc_event_t *); +static void +udp_shrecv(isc_task_t *, isc_event_t *); +static void +udp_recv(isc_event_t *, dns_dispatch_t *, dispsocket_t *); +static void +tcp_recv(isc_task_t *, isc_event_t *); +static isc_result_t +startrecv(dns_dispatch_t *, dispsocket_t *); +static uint32_t +dns_hash(dns_qid_t *, const isc_sockaddr_t *, dns_messageid_t, in_port_t); +static void +free_buffer(dns_dispatch_t *disp, void *buf, unsigned int len); +static void * +allocate_udp_buffer(dns_dispatch_t *disp); +static inline void +free_devent(dns_dispatch_t *disp, dns_dispatchevent_t *ev); +static inline dns_dispatchevent_t * +allocate_devent(dns_dispatch_t *disp); +static void +do_cancel(dns_dispatch_t *disp); +static dns_dispentry_t * +linear_first(dns_qid_t *disp); +static dns_dispentry_t * +linear_next(dns_qid_t *disp, dns_dispentry_t *resp); +static void +dispatch_free(dns_dispatch_t **dispp); +static isc_result_t +get_udpsocket(dns_dispatchmgr_t *mgr, dns_dispatch_t *disp, + isc_socketmgr_t *sockmgr, const isc_sockaddr_t *localaddr, + isc_socket_t **sockp, isc_socket_t *dup_socket, bool duponly); static isc_result_t dispatch_createudp(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr, isc_taskmgr_t *taskmgr, const isc_sockaddr_t *localaddr, unsigned int maxrequests, unsigned int attributes, dns_dispatch_t **dispp, isc_socket_t *dup_socket); -static bool destroy_mgr_ok(dns_dispatchmgr_t *mgr); -static void destroy_mgr(dns_dispatchmgr_t **mgrp); -static isc_result_t qid_allocate(dns_dispatchmgr_t *mgr, unsigned int buckets, - unsigned int increment, dns_qid_t **qidp, - bool needaddrtable); -static void qid_destroy(isc_mem_t *mctx, dns_qid_t **qidp); -static isc_result_t open_socket(isc_socketmgr_t *mgr, - const isc_sockaddr_t *local, - unsigned int options, isc_socket_t **sockp, - isc_socket_t *dup_socket, bool duponly); -static bool portavailable(dns_dispatchmgr_t *mgr, isc_socket_t *sock, - isc_sockaddr_t *sockaddrp); +static bool +destroy_mgr_ok(dns_dispatchmgr_t *mgr); +static void +destroy_mgr(dns_dispatchmgr_t **mgrp); +static isc_result_t +qid_allocate(dns_dispatchmgr_t *mgr, unsigned int buckets, + unsigned int increment, dns_qid_t **qidp, bool needaddrtable); +static void +qid_destroy(isc_mem_t *mctx, dns_qid_t **qidp); +static isc_result_t +open_socket(isc_socketmgr_t *mgr, const isc_sockaddr_t *local, + unsigned int options, isc_socket_t **sockp, + isc_socket_t *dup_socket, bool duponly); +static bool +portavailable(dns_dispatchmgr_t *mgr, isc_socket_t *sock, + isc_sockaddr_t *sockaddrp); #define LVL(x) ISC_LOG_DEBUG(x) -static void mgr_log(dns_dispatchmgr_t *mgr, int level, const char *fmt, ...) +static void +mgr_log(dns_dispatchmgr_t *mgr, int level, const char *fmt, ...) ISC_FORMAT_PRINTF(3, 4); static void @@ -355,7 +377,8 @@ dec_stats(dns_dispatchmgr_t *mgr, isc_statscounter_t counter) { } } -static void dispatch_log(dns_dispatch_t *disp, int level, const char *fmt, ...) +static void +dispatch_log(dns_dispatch_t *disp, int level, const char *fmt, ...) ISC_FORMAT_PRINTF(3, 4); static void @@ -376,8 +399,9 @@ dispatch_log(dns_dispatch_t *disp, int level, const char *fmt, ...) { msgbuf); } -static void request_log(dns_dispatch_t *disp, dns_dispentry_t *resp, int level, - const char *fmt, ...) ISC_FORMAT_PRINTF(4, 5); +static void +request_log(dns_dispatch_t *disp, dns_dispentry_t *resp, int level, + const char *fmt, ...) ISC_FORMAT_PRINTF(4, 5); static void request_log(dns_dispatch_t *disp, dns_dispentry_t *resp, int level, diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c index 3827d3e78091a45ffe15251907df9983cac3f830..a08923022927826349e04e1cb485493120342960 100644 --- a/lib/dns/dnssec.c +++ b/lib/dns/dnssec.c @@ -56,13 +56,15 @@ LIBDNS_EXTERNAL_DATA isc_stats_t *dns_dnssec_stats; #define TYPE_SIGN 0 #define TYPE_VERIFY 1 -static isc_result_t digest_callback(void *arg, isc_region_t *data); +static isc_result_t +digest_callback(void *arg, isc_region_t *data); -static int rdata_compare_wrapper(const void *rdata1, const void *rdata2); +static int +rdata_compare_wrapper(const void *rdata1, const void *rdata2); -static isc_result_t rdataset_to_sortedarray(dns_rdataset_t *set, - isc_mem_t *mctx, - dns_rdata_t **rdata, int *nrdata); +static isc_result_t +rdataset_to_sortedarray(dns_rdataset_t *set, isc_mem_t *mctx, + dns_rdata_t **rdata, int *nrdata); static isc_result_t digest_callback(void *arg, isc_region_t *data) { diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c index b9c560d29ee135712a0572d4b4a6b567de6207a6..ee61e24b74c6c06d5e889216e20ec27a72e02bdc 100644 --- a/lib/dns/dst_api.c +++ b/lib/dns/dst_api.c @@ -135,32 +135,36 @@ static dst_func_t *dst_t_func[DST_MAX_ALGS]; static bool dst_initialized = false; -void gss_log(int level, const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3); +void +gss_log(int level, const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3); /* * Static functions. */ -static dst_key_t *get_key_struct(const dns_name_t *name, unsigned int alg, - unsigned int flags, unsigned int protocol, - unsigned int bits, dns_rdataclass_t rdclass, - dns_ttl_t ttl, isc_mem_t *mctx); -static isc_result_t write_public_key(const dst_key_t *key, int type, - const char *directory); -static isc_result_t write_key_state(const dst_key_t *key, int type, - const char *directory); -static isc_result_t buildfilename(dns_name_t *name, dns_keytag_t id, - unsigned int alg, unsigned int type, - const char *directory, isc_buffer_t *out); -static isc_result_t computeid(dst_key_t *key); -static isc_result_t frombuffer(const dns_name_t *name, unsigned int alg, - unsigned int flags, unsigned int protocol, - dns_rdataclass_t rdclass, isc_buffer_t *source, - isc_mem_t *mctx, dst_key_t **keyp); - -static isc_result_t algorithm_status(unsigned int alg); - -static isc_result_t addsuffix(char *filename, int len, const char *dirname, - const char *ofilename, const char *suffix); +static dst_key_t * +get_key_struct(const dns_name_t *name, unsigned int alg, unsigned int flags, + unsigned int protocol, unsigned int bits, + dns_rdataclass_t rdclass, dns_ttl_t ttl, isc_mem_t *mctx); +static isc_result_t +write_public_key(const dst_key_t *key, int type, const char *directory); +static isc_result_t +write_key_state(const dst_key_t *key, int type, const char *directory); +static isc_result_t +buildfilename(dns_name_t *name, dns_keytag_t id, unsigned int alg, + unsigned int type, const char *directory, isc_buffer_t *out); +static isc_result_t +computeid(dst_key_t *key); +static isc_result_t +frombuffer(const dns_name_t *name, unsigned int alg, unsigned int flags, + unsigned int protocol, dns_rdataclass_t rdclass, + isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp); + +static isc_result_t +algorithm_status(unsigned int alg); + +static isc_result_t +addsuffix(char *filename, int len, const char *dirname, const char *ofilename, + const char *suffix); #define RETERR(x) \ do { \ diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h index 7b08bc146d511b811f34315d7d4bb73614be50a0..3859fbdd7f5119992a79f8f5dd069cf2f526864f 100644 --- a/lib/dns/dst_internal.h +++ b/lib/dns/dst_internal.h @@ -76,27 +76,27 @@ typedef enum { DO_SIGN, DO_VERIFY } dst_use_t; /*% DST Key Structure */ struct dst_key { - unsigned int magic; + unsigned int magic; isc_refcount_t refs; - dns_name_t * key_name; /*%< name of the key */ - unsigned int key_size; /*%< size of the key in bits */ - unsigned int key_proto; /*%< protocols this key is used for + dns_name_t *key_name; /*%< name of the key */ + unsigned int key_size; /*%< size of the key in bits */ + unsigned int key_proto; /*%< protocols this key is used for * */ unsigned int key_alg; /*%< algorithm of the key */ - uint32_t key_flags; /*%< flags of the public key */ - uint16_t key_id; /*%< identifier of the key */ - uint16_t key_rid; /*%< identifier of the key when + uint32_t key_flags; /*%< flags of the public key */ + uint16_t key_id; /*%< identifier of the key */ + uint16_t key_rid; /*%< identifier of the key when * revoked */ - uint16_t key_bits; /*%< hmac digest bits */ + uint16_t key_bits; /*%< hmac digest bits */ dns_rdataclass_t key_class; /*%< class of the key record */ - dns_ttl_t key_ttl; /*%< default/initial dnskey ttl */ - isc_mem_t * mctx; /*%< memory context */ - char * engine; /*%< engine name (HSM) */ - char * label; /*%< engine label (HSM) */ + dns_ttl_t key_ttl; /*%< default/initial dnskey ttl */ + isc_mem_t *mctx; /*%< memory context */ + char *engine; /*%< engine name (HSM) */ + char *label; /*%< engine label (HSM) */ union { - void * generic; + void *generic; gss_ctx_id_t gssctx; - DH * dh; + DH *dh; #if USE_OPENSSL EVP_PKEY *pkey; #endif /* if USE_OPENSSL */ @@ -106,8 +106,8 @@ struct dst_key { dst_hmac_key_t *hmac_key; } keydata; /*%< pointer to key in crypto pkg fmt */ - isc_stdtime_t times[DST_MAX_TIMES + 1]; /*%< timing metadata */ - bool timeset[DST_MAX_TIMES + 1]; /*%< data set? */ + isc_stdtime_t times[DST_MAX_TIMES + 1]; /*%< timing metadata */ + bool timeset[DST_MAX_TIMES + 1]; /*%< data set? */ uint32_t nums[DST_MAX_NUMERIC + 1]; /*%< numeric metadata * */ @@ -131,21 +131,21 @@ struct dst_key { int fmt_minor; /*%< private key format, minor version * */ - dst_func_t * func; /*%< crypto package specific functions */ + dst_func_t *func; /*%< crypto package specific functions */ isc_buffer_t *key_tkeytoken; /*%< TKEY token data */ }; struct dst_context { - unsigned int magic; - dst_use_t use; - dst_key_t * key; - isc_mem_t * mctx; + unsigned int magic; + dst_use_t use; + dst_key_t *key; + isc_mem_t *mctx; isc_logcategory_t *category; union { - void * generic; + void *generic; dst_gssapi_signverifyctx_t *gssctx; - isc_hmac_t * hmac_ctx; - EVP_MD_CTX * evp_md_ctx; + isc_hmac_t *hmac_ctx; + EVP_MD_CTX *evp_md_ctx; #if USE_PKCS11 pk11_context_t *pk11_ctx; #endif /* if USE_PKCS11 */ @@ -171,7 +171,7 @@ struct dst_func { const isc_region_t *sig); isc_result_t (*computesecret)(const dst_key_t *pub, const dst_key_t *priv, - isc_buffer_t * secret); + isc_buffer_t *secret); bool (*compare)(const dst_key_t *key1, const dst_key_t *key2); bool (*paramcompare)(const dst_key_t *key1, const dst_key_t *key2); isc_result_t (*generate)(dst_key_t *key, int parms, diff --git a/lib/dns/dst_parse.h b/lib/dns/dst_parse.h index e22beb277aca3c4c7b24f9a9584949c8ed6d2bff..b715c7c4e9562aa239ad3261865a490d6341a0d7 100644 --- a/lib/dns/dst_parse.h +++ b/lib/dns/dst_parse.h @@ -106,7 +106,7 @@ struct dst_private_element { typedef struct dst_private_element dst_private_element_t; struct dst_private { - unsigned short nelements; + unsigned short nelements; dst_private_element_t elements[MAXFIELDS]; }; diff --git a/lib/dns/ecdb.c b/lib/dns/ecdb.c index 746cb935b5e194408fbd484ffa6118a04e8355fb..1fb553e9caece54b5bf8c6807afeeed16f343abd 100644 --- a/lib/dns/ecdb.c +++ b/lib/dns/ecdb.c @@ -81,18 +81,25 @@ typedef struct rdatasetheader { #define NXDOMAIN(header) (((header)->attributes & RDATASET_ATTR_NXDOMAIN) != 0) #define NEGATIVE(header) (((header)->attributes & RDATASET_ATTR_NEGATIVE) != 0) -static isc_result_t dns_ecdb_create(isc_mem_t *mctx, const dns_name_t *origin, - dns_dbtype_t type, dns_rdataclass_t rdclass, - unsigned int argc, char *argv[], - void *driverarg, dns_db_t **dbp); - -static void rdataset_disassociate(dns_rdataset_t *rdataset); -static isc_result_t rdataset_first(dns_rdataset_t *rdataset); -static isc_result_t rdataset_next(dns_rdataset_t *rdataset); -static void rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata); -static void rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target); -static unsigned int rdataset_count(dns_rdataset_t *rdataset); -static void rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust); +static isc_result_t +dns_ecdb_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, + dns_rdataclass_t rdclass, unsigned int argc, char *argv[], + void *driverarg, dns_db_t **dbp); + +static void +rdataset_disassociate(dns_rdataset_t *rdataset); +static isc_result_t +rdataset_first(dns_rdataset_t *rdataset); +static isc_result_t +rdataset_next(dns_rdataset_t *rdataset); +static void +rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata); +static void +rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target); +static unsigned int +rdataset_count(dns_rdataset_t *rdataset); +static void +rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust); static dns_rdatasetmethods_t rdataset_methods = { rdataset_disassociate, @@ -118,11 +125,14 @@ typedef struct ecdb_rdatasetiter { rdatasetheader_t *current; } ecdb_rdatasetiter_t; -static void rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp); -static isc_result_t rdatasetiter_first(dns_rdatasetiter_t *iterator); -static isc_result_t rdatasetiter_next(dns_rdatasetiter_t *iterator); -static void rdatasetiter_current(dns_rdatasetiter_t *iterator, - dns_rdataset_t *rdataset); +static void +rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp); +static isc_result_t +rdatasetiter_first(dns_rdatasetiter_t *iterator); +static isc_result_t +rdatasetiter_next(dns_rdatasetiter_t *iterator); +static void +rdatasetiter_current(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset); static dns_rdatasetitermethods_t rdatasetiter_methods = { rdatasetiter_destroy, rdatasetiter_first, rdatasetiter_next, diff --git a/lib/dns/forward.c b/lib/dns/forward.c index ddc2391f890180118ebb5e867ffe890abb9bdc38..276a3d0b8721f438cc324fde416e4c96ad3cd9aa 100644 --- a/lib/dns/forward.c +++ b/lib/dns/forward.c @@ -33,7 +33,8 @@ struct dns_fwdtable { #define FWDTABLEMAGIC ISC_MAGIC('F', 'w', 'd', 'T') #define VALID_FWDTABLE(ft) ISC_MAGIC_VALID(ft, FWDTABLEMAGIC) -static void auto_detach(void *, void *); +static void +auto_detach(void *, void *); isc_result_t dns_fwdtable_create(isc_mem_t *mctx, dns_fwdtable_t **fwdtablep) { diff --git a/lib/dns/gen-unix.h b/lib/dns/gen-unix.h index 31168f3e3e81ae24ea60bc42885ad59963e6e28b..29c5f6e2ad2598a674cee39b5724f0fa03e2a746 100644 --- a/lib/dns/gen-unix.h +++ b/lib/dns/gen-unix.h @@ -43,7 +43,7 @@ extern char *optarg; #define isc_commandline_argument optarg typedef struct { - DIR * handle; + DIR *handle; char *filename; } isc_dir_t; diff --git a/lib/dns/gen-win32.h b/lib/dns/gen-win32.h index 2ea2d75c1a12862dd6ceab08e40b0a1f81b1644a..6d3cdf2e3e0b0bd18a5919ed731f06be1627bd8b 100644 --- a/lib/dns/gen-win32.h +++ b/lib/dns/gen-win32.h @@ -88,7 +88,7 @@ ISC_LANG_BEGINDECLS int isc_commandline_parse(int argc, char *const *argv, const char *options) { static char *place = ENDOPT; - char * option; /* Index into *options of option. */ + char *option; /* Index into *options of option. */ /* * Update scanning pointer, either because a reset was requested or @@ -207,10 +207,10 @@ isc_commandline_parse(int argc, char *const *argv, const char *options) { } typedef struct { - HANDLE handle; + HANDLE handle; WIN32_FIND_DATA find_data; - bool first_file; - char * filename; + bool first_file; + char *filename; } isc_dir_t; bool diff --git a/lib/dns/gen.c b/lib/dns/gen.c index 43a37d67152ae5d69c84d0139026ffbc7de7cd33..0868af328f230caec38973a82da6657f10498881 100644 --- a/lib/dns/gen.c +++ b/lib/dns/gen.c @@ -173,13 +173,19 @@ static struct ttnam { static int maxtype = -1; -static char *upper(char *); -static char *funname(const char *, char *); -static void doswitch(const char *, const char *, const char *, const char *, - const char *, const char *); -static void add(int, const char *, int, const char *, const char *); -static void sd(int, const char *, const char *, char); -static void insert_into_typenames(int, const char *, const char *); +static char * +upper(char *); +static char * +funname(const char *, char *); +static void +doswitch(const char *, const char *, const char *, const char *, const char *, + const char *); +static void +add(int, const char *, int, const char *, const char *); +static void +sd(int, const char *, const char *, char); +static void +insert_into_typenames(int, const char *, const char *); /*% * If you use more than 10 of these in, say, a printf(), you'll have problems. diff --git a/lib/dns/hmac_link.c b/lib/dns/hmac_link.c index 16dd5d65ae38d9236f3124507607152fb2703296..1de026e634cd681ce4016132ae73aec74e7dc9dd 100644 --- a/lib/dns/hmac_link.c +++ b/lib/dns/hmac_link.c @@ -135,8 +135,8 @@ return (ISC_R_SUCCESS); \ } -static isc_result_t hmac_fromdns(isc_md_type_t type, dst_key_t *key, - isc_buffer_t *data); +static isc_result_t +hmac_fromdns(isc_md_type_t type, dst_key_t *key, isc_buffer_t *data); struct dst_hmac_key { uint8_t key[ISC_MAX_BLOCK_SIZE]; diff --git a/lib/dns/iptable.c b/lib/dns/iptable.c index c16862e63467156dea859a205be33276a64c6a89..4f1cf3ecd594f1fe36473058bf7d1ef15ac27aaa 100644 --- a/lib/dns/iptable.c +++ b/lib/dns/iptable.c @@ -18,7 +18,8 @@ #include -static void destroy_iptable(dns_iptable_t *dtab); +static void +destroy_iptable(dns_iptable_t *dtab); /* * Create a new IP table and the underlying radix structure diff --git a/lib/dns/journal.c b/lib/dns/journal.c index 96c3ce1442cfe7344a676ebe7a7a43b97671b60f..e28dd61031608f1e356e3152b61662dfc869c5aa 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -103,7 +103,8 @@ #define JOURNAL_SERIALSET 0x01U -static isc_result_t index_to_disk(dns_journal_t *); +static isc_result_t +index_to_disk(dns_journal_t *); static inline uint32_t decode_uint32(unsigned char *p) { @@ -1640,7 +1641,8 @@ dns_journal_get_sourceserial(dns_journal_t *j, uint32_t *sourceserial) { * when we reach the serial number that was current when the IXFR started. */ -static isc_result_t read_one_rr(dns_journal_t *j); +static isc_result_t +read_one_rr(dns_journal_t *j); /* * Make sure the buffer 'b' is has at least 'size' bytes diff --git a/lib/dns/lookup.c b/lib/dns/lookup.c index 6b58625bb41b4f05152a9273668d8aad76b86a7c..4b93c4baa996a53943eae7355ee46c7fd2091c51 100644 --- a/lib/dns/lookup.c +++ b/lib/dns/lookup.c @@ -53,7 +53,8 @@ struct dns_lookup { #define MAX_RESTARTS 16 -static void lookup_find(dns_lookup_t *lookup, dns_fetchevent_t *event); +static void +lookup_find(dns_lookup_t *lookup, dns_fetchevent_t *event); static void fetch_done(isc_task_t *task, isc_event_t *event) { diff --git a/lib/dns/master.c b/lib/dns/master.c index d93a9bdaa9d340ba1fc418455e8781bacee4cc47..7becbec1e006638f1430b1250e0efd6a5fc68ce6 100644 --- a/lib/dns/master.c +++ b/lib/dns/master.c @@ -173,39 +173,50 @@ struct dns_incctx { #define DNS_AS_STR(t) ((t).value.as_textregion.base) -static isc_result_t openfile_text(dns_loadctx_t *lctx, const char *master_file); +static isc_result_t +openfile_text(dns_loadctx_t *lctx, const char *master_file); -static isc_result_t load_text(dns_loadctx_t *lctx); +static isc_result_t +load_text(dns_loadctx_t *lctx); -static isc_result_t openfile_raw(dns_loadctx_t *lctx, const char *master_file); +static isc_result_t +openfile_raw(dns_loadctx_t *lctx, const char *master_file); -static isc_result_t load_raw(dns_loadctx_t *lctx); +static isc_result_t +load_raw(dns_loadctx_t *lctx); -static isc_result_t openfile_map(dns_loadctx_t *lctx, const char *master_file); +static isc_result_t +openfile_map(dns_loadctx_t *lctx, const char *master_file); -static isc_result_t load_map(dns_loadctx_t *lctx); +static isc_result_t +load_map(dns_loadctx_t *lctx); -static isc_result_t pushfile(const char *master_file, dns_name_t *origin, - dns_loadctx_t *lctx); +static isc_result_t +pushfile(const char *master_file, dns_name_t *origin, dns_loadctx_t *lctx); -static isc_result_t commit(dns_rdatacallbacks_t *, dns_loadctx_t *, - rdatalist_head_t *, dns_name_t *, const char *, - unsigned int); +static isc_result_t +commit(dns_rdatacallbacks_t *, dns_loadctx_t *, rdatalist_head_t *, + dns_name_t *, const char *, unsigned int); -static bool is_glue(rdatalist_head_t *, dns_name_t *); +static bool +is_glue(rdatalist_head_t *, dns_name_t *); -static dns_rdatalist_t *grow_rdatalist(int, dns_rdatalist_t *, int, - rdatalist_head_t *, rdatalist_head_t *, - isc_mem_t *mctx); +static dns_rdatalist_t * +grow_rdatalist(int, dns_rdatalist_t *, int, rdatalist_head_t *, + rdatalist_head_t *, isc_mem_t *mctx); -static dns_rdata_t *grow_rdata(int, dns_rdata_t *, int, rdatalist_head_t *, - rdatalist_head_t *, isc_mem_t *); +static dns_rdata_t * +grow_rdata(int, dns_rdata_t *, int, rdatalist_head_t *, rdatalist_head_t *, + isc_mem_t *); -static void load_quantum(isc_task_t *task, isc_event_t *event); +static void +load_quantum(isc_task_t *task, isc_event_t *event); -static isc_result_t task_send(dns_loadctx_t *lctx); +static isc_result_t +task_send(dns_loadctx_t *lctx); -static void loadctx_destroy(dns_loadctx_t *lctx); +static void +loadctx_destroy(dns_loadctx_t *lctx); #define GETTOKENERR(lexer, options, token, eol, err) \ do { \ diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c index ea69a05a33badefde1196384dc4cf3662333fd91..12376b50d12c166b5480b52c5578d55d7b32f20d 100644 --- a/lib/dns/masterdump.c +++ b/lib/dns/masterdump.c @@ -1311,7 +1311,8 @@ dump_rdatasets_map(isc_mem_t *mctx, const dns_name_t *name, */ static const int initial_buffer_length = 1200; -static isc_result_t dumptostreaminc(dns_dumpctx_t *dctx); +static isc_result_t +dumptostreaminc(dns_dumpctx_t *dctx); static void dumpctx_destroy(dns_dumpctx_t *dctx) { diff --git a/lib/dns/message.c b/lib/dns/message.c index 8890d1974df2c718edd3c5c6ed0d203607c39c4c..08a230de00685868f56e21115cc3eaa2aa646171 100644 --- a/lib/dns/message.c +++ b/lib/dns/message.c @@ -138,23 +138,26 @@ struct dns_msgblock { ISC_LINK(dns_msgblock_t) link; }; /* dynamically sized */ -static inline dns_msgblock_t *msgblock_allocate(isc_mem_t *, unsigned int, - unsigned int); +static inline dns_msgblock_t * +msgblock_allocate(isc_mem_t *, unsigned int, unsigned int); #define msgblock_get(block, type) \ ((type *)msgblock_internalget(block, sizeof(type))) -static inline void *msgblock_internalget(dns_msgblock_t *, unsigned int); +static inline void * +msgblock_internalget(dns_msgblock_t *, unsigned int); -static inline void msgblock_reset(dns_msgblock_t *); +static inline void +msgblock_reset(dns_msgblock_t *); -static inline void msgblock_free(isc_mem_t *, dns_msgblock_t *, unsigned int); +static inline void +msgblock_free(isc_mem_t *, dns_msgblock_t *, unsigned int); -static void logfmtpacket(dns_message_t *message, const char *description, - const isc_sockaddr_t *address, - isc_logcategory_t *category, isc_logmodule_t *module, - const dns_master_style_t *style, int level, - isc_mem_t *mctx); +static void +logfmtpacket(dns_message_t *message, const char *description, + const isc_sockaddr_t *address, isc_logcategory_t *category, + isc_logmodule_t *module, const dns_master_style_t *style, + int level, isc_mem_t *mctx); /* * Allocate a new dns_msgblock_t, and return a pointer to it. If no memory diff --git a/lib/dns/name.c b/lib/dns/name.c index 08cf8112ec5f13b2370b425cbd6e715b33d8ff90..5632442f32bf671bfa5265de2f2fe1a1fcf124de 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -150,8 +150,9 @@ LIBDNS_EXTERNAL_DATA const dns_name_t *dns_wildcardname = &wild; */ ISC_THREAD_LOCAL dns_name_totextfilter_t *totext_filter_proc = NULL; -static void set_offsets(const dns_name_t *name, unsigned char *offsets, - dns_name_t *set_name); +static void +set_offsets(const dns_name_t *name, unsigned char *offsets, + dns_name_t *set_name); void dns_name_init(dns_name_t *name, unsigned char *offsets) { diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c index 13fcaaeb10e2babe10d9727cc8174d29d4886b97..9a979080b0ac8b9ef0f89300c248dee320b19ce8 100644 --- a/lib/dns/ncache.c +++ b/lib/dns/ncache.c @@ -40,11 +40,11 @@ * */ -static isc_result_t addoptout(dns_message_t *message, dns_db_t *cache, - dns_dbnode_t *node, dns_rdatatype_t covers, - isc_stdtime_t now, dns_ttl_t minttl, - dns_ttl_t maxttl, bool optout, bool secure, - dns_rdataset_t *addedrdataset); +static isc_result_t +addoptout(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node, + dns_rdatatype_t covers, isc_stdtime_t now, dns_ttl_t minttl, + dns_ttl_t maxttl, bool optout, bool secure, + dns_rdataset_t *addedrdataset); static inline isc_result_t copy_rdataset(dns_rdataset_t *rdataset, isc_buffer_t *buffer) { diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c index 785fb3ce539893af1f4029bdcbc0390c7b47c465..9ac2b81e78a2297f41316e90fb299244d2ebdafb 100644 --- a/lib/dns/openssldh_link.c +++ b/lib/dns/openssldh_link.c @@ -66,7 +66,8 @@ "83655D23DCA3AD961C62F356208552BB9ED529077096966D" \ "670C354E4ABC9804F1746C08CA237327FFFFFFFFFFFFFFFF" -static isc_result_t openssldh_todns(const dst_key_t *key, isc_buffer_t *data); +static isc_result_t +openssldh_todns(const dst_key_t *key, isc_buffer_t *data); static BIGNUM *bn2 = NULL, *bn768 = NULL, *bn1024 = NULL, *bn1536 = NULL; diff --git a/lib/dns/opensslecdsa_link.c b/lib/dns/opensslecdsa_link.c index f5fbe35b6b1546b3f9910913d2d14cbb4bd76eaf..4624cc837bfbb8ca1ab348ec0565a4f187e0e776 100644 --- a/lib/dns/opensslecdsa_link.c +++ b/lib/dns/opensslecdsa_link.c @@ -72,8 +72,8 @@ ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s) { } #endif /* !HAVE_ECDSA_SIG_GET0 */ -static isc_result_t opensslecdsa_todns(const dst_key_t *key, - isc_buffer_t *data); +static isc_result_t +opensslecdsa_todns(const dst_key_t *key, isc_buffer_t *data); static isc_result_t opensslecdsa_createctx(dst_key_t *key, dst_context_t *dctx) { diff --git a/lib/dns/openssleddsa_link.c b/lib/dns/openssleddsa_link.c index 2bcbbd20a5133df1e186215250c3c9046cd0557e..c98903e1bb7b24f3390a3e321152c0351630ba83 100644 --- a/lib/dns/openssleddsa_link.c +++ b/lib/dns/openssleddsa_link.c @@ -266,8 +266,8 @@ priv_ed448_from_ossl(EVP_PKEY *pkey, unsigned char *key) { #endif /* HAVE_OPENSSL_ED448 */ -static isc_result_t openssleddsa_todns(const dst_key_t *key, - isc_buffer_t *data); +static isc_result_t +openssleddsa_todns(const dst_key_t *key, isc_buffer_t *data); static isc_result_t openssleddsa_createctx(dst_key_t *key, dst_context_t *dctx) { diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c index 94554247225d173e138e4c02053f28776cfaee25..932fde9c90192606b968256433138d3536ee22a0 100644 --- a/lib/dns/opensslrsa_link.c +++ b/lib/dns/opensslrsa_link.c @@ -179,7 +179,8 @@ RSA_test_flags(const RSA *r, int flags) { #endif /* !HAVE_RSA_SET0_KEY */ -static isc_result_t opensslrsa_todns(const dst_key_t *key, isc_buffer_t *data); +static isc_result_t +opensslrsa_todns(const dst_key_t *key, isc_buffer_t *data); static isc_result_t opensslrsa_createctx(dst_key_t *key, dst_context_t *dctx) { diff --git a/lib/dns/peer.c b/lib/dns/peer.c index cf11ddf18813af164d969e180f768b17da658f99..c78fab27f6e9fdd789f9809b13bded0592c0b5b3 100644 --- a/lib/dns/peer.c +++ b/lib/dns/peer.c @@ -46,9 +46,11 @@ #define SERVER_PADDING_BIT 16 #define REQUEST_TCP_KEEPALIVE_BIT 17 -static void peerlist_delete(dns_peerlist_t **list); +static void +peerlist_delete(dns_peerlist_t **list); -static void peer_delete(dns_peer_t **peer); +static void +peer_delete(dns_peer_t **peer); isc_result_t dns_peerlist_new(isc_mem_t *mem, dns_peerlist_t **list) { diff --git a/lib/dns/pkcs11ecdsa_link.c b/lib/dns/pkcs11ecdsa_link.c index 9c4ac6e1842e200be26e95b25cd92834759387de..f010d0e6bf6637dcca28aa34811f5a4b8a04a119 100644 --- a/lib/dns/pkcs11ecdsa_link.c +++ b/lib/dns/pkcs11ecdsa_link.c @@ -64,10 +64,13 @@ static CK_BBOOL truevalue = TRUE; static CK_BBOOL falsevalue = FALSE; -static isc_result_t pkcs11ecdsa_todns(const dst_key_t *key, isc_buffer_t *data); -static void pkcs11ecdsa_destroy(dst_key_t *key); -static isc_result_t pkcs11ecdsa_fetch(dst_key_t *key, const char *engine, - const char *label, dst_key_t *pub); +static isc_result_t +pkcs11ecdsa_todns(const dst_key_t *key, isc_buffer_t *data); +static void +pkcs11ecdsa_destroy(dst_key_t *key); +static isc_result_t +pkcs11ecdsa_fetch(dst_key_t *key, const char *engine, const char *label, + dst_key_t *pub); static isc_result_t pkcs11ecdsa_createctx(dst_key_t *key, dst_context_t *dctx) { diff --git a/lib/dns/pkcs11eddsa_link.c b/lib/dns/pkcs11eddsa_link.c index 77b13e991a9e15b43ac35bdd865872416c43425c..22c8444ee128c417c22888bfa555d2bf362140ad 100644 --- a/lib/dns/pkcs11eddsa_link.c +++ b/lib/dns/pkcs11eddsa_link.c @@ -61,10 +61,13 @@ static CK_BBOOL truevalue = TRUE; static CK_BBOOL falsevalue = FALSE; -static isc_result_t pkcs11eddsa_todns(const dst_key_t *key, isc_buffer_t *data); -static void pkcs11eddsa_destroy(dst_key_t *key); -static isc_result_t pkcs11eddsa_fetch(dst_key_t *key, const char *engine, - const char *label, dst_key_t *pub); +static isc_result_t +pkcs11eddsa_todns(const dst_key_t *key, isc_buffer_t *data); +static void +pkcs11eddsa_destroy(dst_key_t *key); +static isc_result_t +pkcs11eddsa_fetch(dst_key_t *key, const char *engine, const char *label, + dst_key_t *pub); static isc_result_t pkcs11eddsa_createctx(dst_key_t *key, dst_context_t *dctx) { diff --git a/lib/dns/pkcs11rsa_link.c b/lib/dns/pkcs11rsa_link.c index 0e29c692ea0f0adc1b77eceb704812ec4beaf9dd..be805801857a86f8872e78b3fb036c0e1171b8c2 100644 --- a/lib/dns/pkcs11rsa_link.c +++ b/lib/dns/pkcs11rsa_link.c @@ -45,10 +45,13 @@ static CK_BBOOL truevalue = TRUE; static CK_BBOOL falsevalue = FALSE; -static isc_result_t pkcs11rsa_todns(const dst_key_t *key, isc_buffer_t *data); -static void pkcs11rsa_destroy(dst_key_t *key); -static isc_result_t pkcs11rsa_fetch(dst_key_t *key, const char *engine, - const char *label, dst_key_t *pub); +static isc_result_t +pkcs11rsa_todns(const dst_key_t *key, isc_buffer_t *data); +static void +pkcs11rsa_destroy(dst_key_t *key); +static isc_result_t +pkcs11rsa_fetch(dst_key_t *key, const char *engine, const char *label, + dst_key_t *pub); #ifndef PK11_RSA_PKCS_REPLACE diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c index d459846a5b83222d2d0364b719beba1d3f316608..653f71f85cdc44a218417e9f56381a7869c22ac3 100644 --- a/lib/dns/rbt.c +++ b/lib/dns/rbt.c @@ -133,23 +133,24 @@ struct file_header { * and fseeked, not to a pipe or stream */ -static isc_result_t dns_rbt_zero_header(FILE *file); +static isc_result_t +dns_rbt_zero_header(FILE *file); -static isc_result_t write_header(FILE *file, dns_rbt_t *rbt, - uint64_t first_node_offset, uint64_t crc); +static isc_result_t +write_header(FILE *file, dns_rbt_t *rbt, uint64_t first_node_offset, + uint64_t crc); -static bool match_header_version(file_header_t *header); +static bool +match_header_version(file_header_t *header); -static isc_result_t serialize_node(FILE *file, dns_rbtnode_t *node, - uintptr_t left, uintptr_t right, - uintptr_t down, uintptr_t parent, - uintptr_t data, uint64_t *crc); +static isc_result_t +serialize_node(FILE *file, dns_rbtnode_t *node, uintptr_t left, uintptr_t right, + uintptr_t down, uintptr_t parent, uintptr_t data, uint64_t *crc); -static isc_result_t serialize_nodes(FILE *file, dns_rbtnode_t *node, - uintptr_t parent, - dns_rbtdatawriter_t datawriter, - void *writer_arg, uintptr_t *where, - uint64_t *crc); +static isc_result_t +serialize_nodes(FILE *file, dns_rbtnode_t *node, uintptr_t parent, + dns_rbtdatawriter_t datawriter, void *writer_arg, + uintptr_t *where, uint64_t *crc); /* * The following functions allow you to get the actual address of a pointer @@ -301,7 +302,8 @@ dns_rbt_root(dns_rbt_t *rbt) { /* * A little something to help out in GDB. */ -dns_name_t Name(dns_rbtnode_t *node); +dns_name_t +Name(dns_rbtnode_t *node); dns_name_t Name(dns_rbtnode_t *node) { dns_name_t name; @@ -387,37 +389,47 @@ dns__rbtnode_getdistance(dns_rbtnode_t *node) { /* * Forward declarations. */ -static isc_result_t create_node(isc_mem_t *mctx, const dns_name_t *name, - dns_rbtnode_t **nodep); +static isc_result_t +create_node(isc_mem_t *mctx, const dns_name_t *name, dns_rbtnode_t **nodep); -static isc_result_t inithash(dns_rbt_t *rbt); +static isc_result_t +inithash(dns_rbt_t *rbt); -static inline void hash_node(dns_rbt_t *rbt, dns_rbtnode_t *node, - const dns_name_t *name); +static inline void +hash_node(dns_rbt_t *rbt, dns_rbtnode_t *node, const dns_name_t *name); -static inline void unhash_node(dns_rbt_t *rbt, dns_rbtnode_t *node); +static inline void +unhash_node(dns_rbt_t *rbt, dns_rbtnode_t *node); -static void rehash(dns_rbt_t *rbt, unsigned int newcount); +static void +rehash(dns_rbt_t *rbt, unsigned int newcount); -static inline void rotate_left(dns_rbtnode_t *node, dns_rbtnode_t **rootp); -static inline void rotate_right(dns_rbtnode_t *node, dns_rbtnode_t **rootp); +static inline void +rotate_left(dns_rbtnode_t *node, dns_rbtnode_t **rootp); +static inline void +rotate_right(dns_rbtnode_t *node, dns_rbtnode_t **rootp); -static void addonlevel(dns_rbtnode_t *node, dns_rbtnode_t *current, int order, - dns_rbtnode_t **rootp); +static void +addonlevel(dns_rbtnode_t *node, dns_rbtnode_t *current, int order, + dns_rbtnode_t **rootp); -static void deletefromlevel(dns_rbtnode_t *item, dns_rbtnode_t **rootp); +static void +deletefromlevel(dns_rbtnode_t *item, dns_rbtnode_t **rootp); -static isc_result_t treefix(dns_rbt_t *rbt, void *base, size_t size, - dns_rbtnode_t *n, const dns_name_t *name, - dns_rbtdatafixer_t datafixer, void *fixer_arg, - uint64_t *crc); +static isc_result_t +treefix(dns_rbt_t *rbt, void *base, size_t size, dns_rbtnode_t *n, + const dns_name_t *name, dns_rbtdatafixer_t datafixer, void *fixer_arg, + uint64_t *crc); -static void deletetreeflat(dns_rbt_t *rbt, unsigned int quantum, bool unhash, - dns_rbtnode_t **nodep); +static void +deletetreeflat(dns_rbt_t *rbt, unsigned int quantum, bool unhash, + dns_rbtnode_t **nodep); -static void printnodename(dns_rbtnode_t *node, bool quoted, FILE *f); +static void +printnodename(dns_rbtnode_t *node, bool quoted, FILE *f); -static void freenode(dns_rbt_t *rbt, dns_rbtnode_t **nodep); +static void +freenode(dns_rbt_t *rbt, dns_rbtnode_t **nodep); static isc_result_t dns_rbt_zero_header(FILE *file) { diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index 815fd71fdfe648c9e4f35984895b052dcb198ae2..c51375e8c849b67be5a16d9ce0f24b7cd154567f 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -503,43 +503,58 @@ typedef struct { isc_stdtime_t now; } rbtdb_load_t; -static void delete_callback(void *data, void *arg); -static void rdataset_disassociate(dns_rdataset_t *rdataset); -static isc_result_t rdataset_first(dns_rdataset_t *rdataset); -static isc_result_t rdataset_next(dns_rdataset_t *rdataset); -static void rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata); -static void rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target); -static unsigned int rdataset_count(dns_rdataset_t *rdataset); -static isc_result_t rdataset_getnoqname(dns_rdataset_t *rdataset, - dns_name_t *name, dns_rdataset_t *neg, - dns_rdataset_t *negsig); -static isc_result_t rdataset_getclosest(dns_rdataset_t *rdataset, - dns_name_t *name, dns_rdataset_t *neg, - dns_rdataset_t *negsig); -static inline bool need_headerupdate(rdatasetheader_t *header, - isc_stdtime_t now); -static void update_header(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, - isc_stdtime_t now); -static void expire_header(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, - bool tree_locked, expire_t reason); -static void overmem_purge(dns_rbtdb_t *rbtdb, unsigned int locknum_start, - isc_stdtime_t now, bool tree_locked); -static isc_result_t resign_insert(dns_rbtdb_t *rbtdb, int idx, - rdatasetheader_t *newheader); -static void resign_delete(dns_rbtdb_t *rbtdb, rbtdb_version_t *version, - rdatasetheader_t *header); -static void prune_tree(isc_task_t *task, isc_event_t *event); -static void rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust); -static void rdataset_expire(dns_rdataset_t *rdataset); -static void rdataset_clearprefetch(dns_rdataset_t *rdataset); -static void rdataset_setownercase(dns_rdataset_t *rdataset, - const dns_name_t *name); -static void rdataset_getownercase(const dns_rdataset_t *rdataset, - dns_name_t *name); -static isc_result_t rdataset_addglue(dns_rdataset_t *rdataset, - dns_dbversion_t *version, - dns_message_t *msg); -static void free_gluetable(rbtdb_version_t *version); +static void +delete_callback(void *data, void *arg); +static void +rdataset_disassociate(dns_rdataset_t *rdataset); +static isc_result_t +rdataset_first(dns_rdataset_t *rdataset); +static isc_result_t +rdataset_next(dns_rdataset_t *rdataset); +static void +rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata); +static void +rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target); +static unsigned int +rdataset_count(dns_rdataset_t *rdataset); +static isc_result_t +rdataset_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, + dns_rdataset_t *neg, dns_rdataset_t *negsig); +static isc_result_t +rdataset_getclosest(dns_rdataset_t *rdataset, dns_name_t *name, + dns_rdataset_t *neg, dns_rdataset_t *negsig); +static inline bool +need_headerupdate(rdatasetheader_t *header, isc_stdtime_t now); +static void +update_header(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, isc_stdtime_t now); +static void +expire_header(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, bool tree_locked, + expire_t reason); +static void +overmem_purge(dns_rbtdb_t *rbtdb, unsigned int locknum_start, isc_stdtime_t now, + bool tree_locked); +static isc_result_t +resign_insert(dns_rbtdb_t *rbtdb, int idx, rdatasetheader_t *newheader); +static void +resign_delete(dns_rbtdb_t *rbtdb, rbtdb_version_t *version, + rdatasetheader_t *header); +static void +prune_tree(isc_task_t *task, isc_event_t *event); +static void +rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust); +static void +rdataset_expire(dns_rdataset_t *rdataset); +static void +rdataset_clearprefetch(dns_rdataset_t *rdataset); +static void +rdataset_setownercase(dns_rdataset_t *rdataset, const dns_name_t *name); +static void +rdataset_getownercase(const dns_rdataset_t *rdataset, dns_name_t *name); +static isc_result_t +rdataset_addglue(dns_rdataset_t *rdataset, dns_dbversion_t *version, + dns_message_t *msg); +static void +free_gluetable(rbtdb_version_t *version); static dns_rdatasetmethods_t rdataset_methods = { rdataset_disassociate, rdataset_first, @@ -577,11 +592,14 @@ static dns_rdatasetmethods_t slab_methods = { NULL /* addglue */ }; -static void rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp); -static isc_result_t rdatasetiter_first(dns_rdatasetiter_t *iterator); -static isc_result_t rdatasetiter_next(dns_rdatasetiter_t *iterator); -static void rdatasetiter_current(dns_rdatasetiter_t *iterator, - dns_rdataset_t *rdataset); +static void +rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp); +static isc_result_t +rdatasetiter_first(dns_rdatasetiter_t *iterator); +static isc_result_t +rdatasetiter_next(dns_rdatasetiter_t *iterator); +static void +rdatasetiter_current(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset); static dns_rdatasetitermethods_t rdatasetiter_methods = { rdatasetiter_destroy, rdatasetiter_first, rdatasetiter_next, @@ -602,18 +620,25 @@ typedef struct rbtdb_rdatasetiter { * the address of either "chain" or "nsec3chain", depending on which RBT is * being traversed at given time. */ -static void dbiterator_destroy(dns_dbiterator_t **iteratorp); -static isc_result_t dbiterator_first(dns_dbiterator_t *iterator); -static isc_result_t dbiterator_last(dns_dbiterator_t *iterator); -static isc_result_t dbiterator_seek(dns_dbiterator_t *iterator, - const dns_name_t *name); -static isc_result_t dbiterator_prev(dns_dbiterator_t *iterator); -static isc_result_t dbiterator_next(dns_dbiterator_t *iterator); -static isc_result_t dbiterator_current(dns_dbiterator_t *iterator, - dns_dbnode_t **nodep, dns_name_t *name); -static isc_result_t dbiterator_pause(dns_dbiterator_t *iterator); -static isc_result_t dbiterator_origin(dns_dbiterator_t *iterator, - dns_name_t *name); +static void +dbiterator_destroy(dns_dbiterator_t **iteratorp); +static isc_result_t +dbiterator_first(dns_dbiterator_t *iterator); +static isc_result_t +dbiterator_last(dns_dbiterator_t *iterator); +static isc_result_t +dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name); +static isc_result_t +dbiterator_prev(dns_dbiterator_t *iterator); +static isc_result_t +dbiterator_next(dns_dbiterator_t *iterator); +static isc_result_t +dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, + dns_name_t *name); +static isc_result_t +dbiterator_pause(dns_dbiterator_t *iterator); +static isc_result_t +dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name); static dns_dbiteratormethods_t dbiterator_methods = { dbiterator_destroy, dbiterator_first, dbiterator_last, @@ -647,12 +672,17 @@ typedef struct rbtdb_dbiterator { #define IS_STUB(rbtdb) (((rbtdb)->common.attributes & DNS_DBATTR_STUB) != 0) #define IS_CACHE(rbtdb) (((rbtdb)->common.attributes & DNS_DBATTR_CACHE) != 0) -static void free_rbtdb(dns_rbtdb_t *rbtdb, bool log, isc_event_t *event); -static void overmem(dns_db_t *db, bool over); -static void setnsec3parameters(dns_db_t *db, rbtdb_version_t *version); -static void setownercase(rdatasetheader_t *header, const dns_name_t *name); +static void +free_rbtdb(dns_rbtdb_t *rbtdb, bool log, isc_event_t *event); +static void +overmem(dns_db_t *db, bool over); +static void +setnsec3parameters(dns_db_t *db, rbtdb_version_t *version); +static void +setownercase(rdatasetheader_t *header, const dns_name_t *name); -static bool match_header_version(rbtdb_file_header_t *header); +static bool +match_header_version(rbtdb_file_header_t *header); /* Pad to 32 bytes */ static char FILE_VERSION[32] = "\0"; diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c index d9bce925d7999483834bf9da8ef2b6a29b6b3ef0..f1161d07c8c68ebf20dc0415bc8e6c4dc1f855ef 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -126,58 +126,74 @@ typedef struct dns_rdata_textctx { const char *linebreak; /*%< Line break string. */ } dns_rdata_textctx_t; -static isc_result_t txt_totext(isc_region_t *source, bool quote, - isc_buffer_t *target); +static isc_result_t +txt_totext(isc_region_t *source, bool quote, isc_buffer_t *target); -static isc_result_t txt_fromtext(isc_textregion_t *source, - isc_buffer_t *target); +static isc_result_t +txt_fromtext(isc_textregion_t *source, isc_buffer_t *target); -static isc_result_t txt_fromwire(isc_buffer_t *source, isc_buffer_t *target); +static isc_result_t +txt_fromwire(isc_buffer_t *source, isc_buffer_t *target); -static isc_result_t multitxt_totext(isc_region_t *source, isc_buffer_t *target); +static isc_result_t +multitxt_totext(isc_region_t *source, isc_buffer_t *target); -static isc_result_t multitxt_fromtext(isc_textregion_t *source, - isc_buffer_t *target); +static isc_result_t +multitxt_fromtext(isc_textregion_t *source, isc_buffer_t *target); -static bool name_prefix(dns_name_t *name, const dns_name_t *origin, - dns_name_t *target); +static bool +name_prefix(dns_name_t *name, const dns_name_t *origin, dns_name_t *target); -static unsigned int name_length(const dns_name_t *name); +static unsigned int +name_length(const dns_name_t *name); -static isc_result_t str_totext(const char *source, isc_buffer_t *target); +static isc_result_t +str_totext(const char *source, isc_buffer_t *target); -static isc_result_t inet_totext(int af, isc_region_t *src, - isc_buffer_t *target); +static isc_result_t +inet_totext(int af, isc_region_t *src, isc_buffer_t *target); -static bool buffer_empty(isc_buffer_t *source); +static bool +buffer_empty(isc_buffer_t *source); -static void buffer_fromregion(isc_buffer_t *buffer, isc_region_t *region); +static void +buffer_fromregion(isc_buffer_t *buffer, isc_region_t *region); -static isc_result_t uint32_tobuffer(uint32_t, isc_buffer_t *target); +static isc_result_t +uint32_tobuffer(uint32_t, isc_buffer_t *target); -static isc_result_t uint16_tobuffer(uint32_t, isc_buffer_t *target); +static isc_result_t +uint16_tobuffer(uint32_t, isc_buffer_t *target); -static isc_result_t uint8_tobuffer(uint32_t, isc_buffer_t *target); +static isc_result_t +uint8_tobuffer(uint32_t, isc_buffer_t *target); -static isc_result_t name_tobuffer(const dns_name_t *name, isc_buffer_t *target); +static isc_result_t +name_tobuffer(const dns_name_t *name, isc_buffer_t *target); -static uint32_t uint32_fromregion(isc_region_t *region); +static uint32_t +uint32_fromregion(isc_region_t *region); -static uint16_t uint16_fromregion(isc_region_t *region); +static uint16_t +uint16_fromregion(isc_region_t *region); -static uint8_t uint8_fromregion(isc_region_t *region); +static uint8_t +uint8_fromregion(isc_region_t *region); -static uint8_t uint8_consume_fromregion(isc_region_t *region); +static uint8_t +uint8_consume_fromregion(isc_region_t *region); -static isc_result_t mem_tobuffer(isc_buffer_t *target, void *base, - unsigned int length); +static isc_result_t +mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length); -static int hexvalue(char value); +static int +hexvalue(char value); -static int decvalue(char value); +static int +decvalue(char value); -static void default_fromtext_callback(dns_rdatacallbacks_t *callbacks, - const char *, ...) +static void +default_fromtext_callback(dns_rdatacallbacks_t *callbacks, const char *, ...) ISC_FORMAT_PRINTF(2, 3); static void @@ -185,22 +201,27 @@ fromtext_error(void (*callback)(dns_rdatacallbacks_t *, const char *, ...), dns_rdatacallbacks_t *callbacks, const char *name, unsigned long line, isc_token_t *token, isc_result_t result); -static void fromtext_warneof(isc_lex_t *lexer, dns_rdatacallbacks_t *callbacks); +static void +fromtext_warneof(isc_lex_t *lexer, dns_rdatacallbacks_t *callbacks); -static isc_result_t rdata_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, - isc_buffer_t *target); +static isc_result_t +rdata_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, + isc_buffer_t *target); -static void warn_badname(const dns_name_t *name, isc_lex_t *lexer, - dns_rdatacallbacks_t *callbacks); +static void +warn_badname(const dns_name_t *name, isc_lex_t *lexer, + dns_rdatacallbacks_t *callbacks); -static void warn_badmx(isc_token_t *token, isc_lex_t *lexer, - dns_rdatacallbacks_t *callbacks); +static void +warn_badmx(isc_token_t *token, isc_lex_t *lexer, + dns_rdatacallbacks_t *callbacks); -static uint16_t uint16_consume_fromregion(isc_region_t *region); +static uint16_t +uint16_consume_fromregion(isc_region_t *region); -static isc_result_t unknown_totext(dns_rdata_t *rdata, - dns_rdata_textctx_t *tctx, - isc_buffer_t *target); +static isc_result_t +unknown_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, + isc_buffer_t *target); static inline isc_result_t generic_fromtext_key(ARGS_FROMTEXT); @@ -226,12 +247,14 @@ static isc_result_t generic_tostruct_txt(ARGS_TOSTRUCT); static void generic_freestruct_txt(ARGS_FREESTRUCT); -static isc_result_t generic_txt_first(dns_rdata_txt_t *txt); +static isc_result_t +generic_txt_first(dns_rdata_txt_t *txt); -static isc_result_t generic_txt_next(dns_rdata_txt_t *txt); +static isc_result_t +generic_txt_next(dns_rdata_txt_t *txt); -static isc_result_t generic_txt_current(dns_rdata_txt_t *txt, - dns_rdata_txt_string_t *string); +static isc_result_t +generic_txt_current(dns_rdata_txt_t *txt, dns_rdata_txt_string_t *string); static isc_result_t generic_totext_ds(ARGS_TOTEXT); diff --git a/lib/dns/rdata/any_255/tsig_250.h b/lib/dns/rdata/any_255/tsig_250.h index f7ff687a66dc2f349501521614c502de2bf4465a..2647a46abd65bbee8304278affeb3abe67a8f02c 100644 --- a/lib/dns/rdata/any_255/tsig_250.h +++ b/lib/dns/rdata/any_255/tsig_250.h @@ -15,16 +15,16 @@ /*% RFC2845 */ typedef struct dns_rdata_any_tsig { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t algorithm; - uint64_t timesigned; - uint16_t fudge; - uint16_t siglen; - unsigned char * signature; - uint16_t originalid; - uint16_t error; - uint16_t otherlen; - unsigned char * other; + isc_mem_t *mctx; + dns_name_t algorithm; + uint64_t timesigned; + uint16_t fudge; + uint16_t siglen; + unsigned char *signature; + uint16_t originalid; + uint16_t error; + uint16_t otherlen; + unsigned char *other; } dns_rdata_any_tsig_t; #endif /* ANY_255_TSIG_250_H */ diff --git a/lib/dns/rdata/ch_3/a_1.h b/lib/dns/rdata/ch_3/a_1.h index 03d9cddbb7b3054c9409dd17bace9882d3ef56d7..cb7f733742104526c4fffc56ba3d64edb8cb5937 100644 --- a/lib/dns/rdata/ch_3/a_1.h +++ b/lib/dns/rdata/ch_3/a_1.h @@ -19,11 +19,11 @@ typedef uint16_t ch_addr_t; typedef struct dns_rdata_ch_a { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t ch_addr_dom; /* ch-addr domain for back mapping - * */ - ch_addr_t ch_addr; /* chaos address (16 bit) network - * order */ + isc_mem_t *mctx; + dns_name_t ch_addr_dom; /* ch-addr domain for back mapping + * */ + ch_addr_t ch_addr; /* chaos address (16 bit) network + * order */ } dns_rdata_ch_a_t; #endif /* CH_3_A_1_H */ diff --git a/lib/dns/rdata/generic/afsdb_18.h b/lib/dns/rdata/generic/afsdb_18.h index 79633caacc950381dd985fc28f49961c35dc2765..6f83dc06730146e5913ff2a4b340183bfe0813f8 100644 --- a/lib/dns/rdata/generic/afsdb_18.h +++ b/lib/dns/rdata/generic/afsdb_18.h @@ -17,9 +17,9 @@ typedef struct dns_rdata_afsdb { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint16_t subtype; - dns_name_t server; + isc_mem_t *mctx; + uint16_t subtype; + dns_name_t server; } dns_rdata_afsdb_t; #endif /* GENERIC_AFSDB_18_H */ diff --git a/lib/dns/rdata/generic/amtrelay_260.h b/lib/dns/rdata/generic/amtrelay_260.h index f29e52ae5a750a737b0fe5943ec1b93c7ea3f10e..bf639e390a31582d5e8b739b42e9d23ec49af813 100644 --- a/lib/dns/rdata/generic/amtrelay_260.h +++ b/lib/dns/rdata/generic/amtrelay_260.h @@ -14,15 +14,15 @@ typedef struct dns_rdata_amtrelay { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint8_t precedence; - bool discovery; - uint8_t gateway_type; - struct in_addr in_addr; /* gateway type 1 */ - struct in6_addr in6_addr; /* gateway type 2 */ - dns_name_t gateway; /* gateway type 3 */ - unsigned char * data; /* gateway type > 3 */ - uint16_t length; + isc_mem_t *mctx; + uint8_t precedence; + bool discovery; + uint8_t gateway_type; + struct in_addr in_addr; /* gateway type 1 */ + struct in6_addr in6_addr; /* gateway type 2 */ + dns_name_t gateway; /* gateway type 3 */ + unsigned char *data; /* gateway type > 3 */ + uint16_t length; } dns_rdata_amtrelay_t; #endif /* GENERIC_AMTRELAY_260_H */ diff --git a/lib/dns/rdata/generic/avc_258.h b/lib/dns/rdata/generic/avc_258.h index c35fce952fd0206eea61e83160010acec3c75002..d84296c7aa23fbb9f9c0b62033c673e96159b813 100644 --- a/lib/dns/rdata/generic/avc_258.h +++ b/lib/dns/rdata/generic/avc_258.h @@ -16,9 +16,9 @@ typedef dns_rdata_txt_string_t dns_rdata_avc_string_t; typedef struct dns_rdata_avc { dns_rdatacommon_t common; - isc_mem_t * mctx; - unsigned char * data; - uint16_t length; + isc_mem_t *mctx; + unsigned char *data; + uint16_t length; /* private */ uint16_t offset; } dns_rdata_avc_t; diff --git a/lib/dns/rdata/generic/caa_257.h b/lib/dns/rdata/generic/caa_257.h index bdcd761c017dad2050c8fb6ce7c04173ef35fbad..325acb5ac812824963fccfc2538fdf460b2fe546 100644 --- a/lib/dns/rdata/generic/caa_257.h +++ b/lib/dns/rdata/generic/caa_257.h @@ -14,12 +14,12 @@ typedef struct dns_rdata_caa { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint8_t flags; - unsigned char * tag; - uint8_t tag_len; - unsigned char * value; - uint16_t value_len; + isc_mem_t *mctx; + uint8_t flags; + unsigned char *tag; + uint8_t tag_len; + unsigned char *value; + uint16_t value_len; } dns_rdata_caa_t; #endif /* GENERIC_CAA_257_H */ diff --git a/lib/dns/rdata/generic/cert_37.h b/lib/dns/rdata/generic/cert_37.h index 4baec34b3867998f37a663042c9a05b7bd8c35a9..7139193ef5ba7332348ea928166b7dfada1f8299 100644 --- a/lib/dns/rdata/generic/cert_37.h +++ b/lib/dns/rdata/generic/cert_37.h @@ -15,12 +15,12 @@ /*% RFC2538 */ typedef struct dns_rdata_cert { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint16_t type; - uint16_t key_tag; - uint8_t algorithm; - uint16_t length; - unsigned char * certificate; + isc_mem_t *mctx; + uint16_t type; + uint16_t key_tag; + uint8_t algorithm; + uint16_t length; + unsigned char *certificate; } dns_rdata_cert_t; #endif /* GENERIC_CERT_37_H */ diff --git a/lib/dns/rdata/generic/cname_5.h b/lib/dns/rdata/generic/cname_5.h index b02365bcc27d46fefd46c474780f8c1999073894..6b265c1527e14510f946d7db4cf462457c951b4f 100644 --- a/lib/dns/rdata/generic/cname_5.h +++ b/lib/dns/rdata/generic/cname_5.h @@ -14,8 +14,8 @@ typedef struct dns_rdata_cname { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t cname; + isc_mem_t *mctx; + dns_name_t cname; } dns_rdata_cname_t; #endif /* GENERIC_CNAME_5_H */ diff --git a/lib/dns/rdata/generic/csync_62.h b/lib/dns/rdata/generic/csync_62.h index b87a266fd2ce4dfd978cd314cb024e36a65d06f6..7041214f2505c5b5a88adbbc384c2256ef58d788 100644 --- a/lib/dns/rdata/generic/csync_62.h +++ b/lib/dns/rdata/generic/csync_62.h @@ -18,11 +18,11 @@ typedef struct dns_rdata_csync { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint32_t serial; - uint16_t flags; - unsigned char * typebits; - uint16_t len; + isc_mem_t *mctx; + uint32_t serial; + uint16_t flags; + unsigned char *typebits; + uint16_t len; } dns_rdata_csync_t; #endif /* GENERIC_CSYNC_62_H */ diff --git a/lib/dns/rdata/generic/dname_39.h b/lib/dns/rdata/generic/dname_39.h index 0571b3a915b4ab077b46bcfd4c1c328c8ceadaa9..f76819b3b1507ee814545780465751357774df0b 100644 --- a/lib/dns/rdata/generic/dname_39.h +++ b/lib/dns/rdata/generic/dname_39.h @@ -17,8 +17,8 @@ typedef struct dns_rdata_dname { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t dname; + isc_mem_t *mctx; + dns_name_t dname; } dns_rdata_dname_t; #endif /* GENERIC_DNAME_39_H */ diff --git a/lib/dns/rdata/generic/doa_259.h b/lib/dns/rdata/generic/doa_259.h index 16f7b8bf6a7b5087eae8700698e9b5d55f872900..1552d9bd12de07ab7e9eedec151879ccaf0defc5 100644 --- a/lib/dns/rdata/generic/doa_259.h +++ b/lib/dns/rdata/generic/doa_259.h @@ -14,14 +14,14 @@ typedef struct dns_rdata_doa { dns_rdatacommon_t common; - isc_mem_t * mctx; - unsigned char * mediatype; - unsigned char * data; - uint32_t enterprise; - uint32_t type; - uint16_t data_len; - uint8_t location; - uint8_t mediatype_len; + isc_mem_t *mctx; + unsigned char *mediatype; + unsigned char *data; + uint32_t enterprise; + uint32_t type; + uint16_t data_len; + uint8_t location; + uint8_t mediatype_len; } dns_rdata_doa_t; #endif /* GENERIC_DOA_259_H */ diff --git a/lib/dns/rdata/generic/ds_43.h b/lib/dns/rdata/generic/ds_43.h index 1701c216ea0b76a91325a114a6f81458bd866141..ac5b6396c47550075fd3db5449c208fed548f2de 100644 --- a/lib/dns/rdata/generic/ds_43.h +++ b/lib/dns/rdata/generic/ds_43.h @@ -16,12 +16,12 @@ * \brief per draft-ietf-dnsext-delegation-signer-05.txt */ typedef struct dns_rdata_ds { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint16_t key_tag; - dns_secalg_t algorithm; - dns_dsdigest_t digest_type; - uint16_t length; - unsigned char * digest; + isc_mem_t *mctx; + uint16_t key_tag; + dns_secalg_t algorithm; + dns_dsdigest_t digest_type; + uint16_t length; + unsigned char *digest; } dns_rdata_ds_t; #endif /* GENERIC_DS_43_H */ diff --git a/lib/dns/rdata/generic/eui48_108.h b/lib/dns/rdata/generic/eui48_108.h index 7093f98e0fd7dc9b648d9638dceeff7ed7db3082..29f64e9bd8e57b7b88813df891bd511a203242f5 100644 --- a/lib/dns/rdata/generic/eui48_108.h +++ b/lib/dns/rdata/generic/eui48_108.h @@ -15,7 +15,7 @@ typedef struct dns_rdata_eui48 { dns_rdatacommon_t common; - unsigned char eui48[6]; + unsigned char eui48[6]; } dns_rdata_eui48_t; #endif /* GENERIC_EUI48_10k_H */ diff --git a/lib/dns/rdata/generic/eui64_109.h b/lib/dns/rdata/generic/eui64_109.h index 6842d6f2e4bb47aaf409fd8aa9663a08a973edf1..18dad3bd1381529017da5f8cbd1997a0cd13293e 100644 --- a/lib/dns/rdata/generic/eui64_109.h +++ b/lib/dns/rdata/generic/eui64_109.h @@ -15,7 +15,7 @@ typedef struct dns_rdata_eui64 { dns_rdatacommon_t common; - unsigned char eui64[8]; + unsigned char eui64[8]; } dns_rdata_eui64_t; #endif /* GENERIC_EUI64_10k_H */ diff --git a/lib/dns/rdata/generic/gpos_27.h b/lib/dns/rdata/generic/gpos_27.h index 74aaa96fa218fab759dbecff80aedd90b46237d8..6b25bd92a3a2417cfff3b9233836d0fe7bad4c50 100644 --- a/lib/dns/rdata/generic/gpos_27.h +++ b/lib/dns/rdata/generic/gpos_27.h @@ -17,13 +17,13 @@ typedef struct dns_rdata_gpos { dns_rdatacommon_t common; - isc_mem_t * mctx; - char * longitude; - char * latitude; - char * altitude; - uint8_t long_len; - uint8_t lat_len; - uint8_t alt_len; + isc_mem_t *mctx; + char *longitude; + char *latitude; + char *altitude; + uint8_t long_len; + uint8_t lat_len; + uint8_t alt_len; } dns_rdata_gpos_t; #endif /* GENERIC_GPOS_27_H */ diff --git a/lib/dns/rdata/generic/hinfo_13.h b/lib/dns/rdata/generic/hinfo_13.h index 5a4c3bed844df4a717794cbb32d26ad0d57bcb49..a275f6c6a7f0606e42a0d8f76472ddf60092d756 100644 --- a/lib/dns/rdata/generic/hinfo_13.h +++ b/lib/dns/rdata/generic/hinfo_13.h @@ -14,11 +14,11 @@ typedef struct dns_rdata_hinfo { dns_rdatacommon_t common; - isc_mem_t * mctx; - char * cpu; - char * os; - uint8_t cpu_len; - uint8_t os_len; + isc_mem_t *mctx; + char *cpu; + char *os; + uint8_t cpu_len; + uint8_t os_len; } dns_rdata_hinfo_t; #endif /* GENERIC_HINFO_13_H */ diff --git a/lib/dns/rdata/generic/hip_55.h b/lib/dns/rdata/generic/hip_55.h index 7d5517a998a7ef443346bc104d05b54f0ea0bf7f..d2163a7b21d73404f9f3a1bc8283548b49d6cc07 100644 --- a/lib/dns/rdata/generic/hip_55.h +++ b/lib/dns/rdata/generic/hip_55.h @@ -16,14 +16,14 @@ typedef struct dns_rdata_hip { dns_rdatacommon_t common; - isc_mem_t * mctx; - unsigned char * hit; - unsigned char * key; - unsigned char * servers; - uint8_t algorithm; - uint8_t hit_len; - uint16_t key_len; - uint16_t servers_len; + isc_mem_t *mctx; + unsigned char *hit; + unsigned char *key; + unsigned char *servers; + uint8_t algorithm; + uint8_t hit_len; + uint16_t key_len; + uint16_t servers_len; /* Private */ uint16_t offset; } dns_rdata_hip_t; diff --git a/lib/dns/rdata/generic/ipseckey_45.h b/lib/dns/rdata/generic/ipseckey_45.h index 05d23887688d9591ca7e7238693cdc25908c0444..b61b1a0aaab8dfa1a5adf23e0e5597673901a027 100644 --- a/lib/dns/rdata/generic/ipseckey_45.h +++ b/lib/dns/rdata/generic/ipseckey_45.h @@ -14,15 +14,15 @@ typedef struct dns_rdata_ipseckey { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint8_t precedence; - uint8_t gateway_type; - uint8_t algorithm; - struct in_addr in_addr; /* gateway type 1 */ - struct in6_addr in6_addr; /* gateway type 2 */ - dns_name_t gateway; /* gateway type 3 */ - unsigned char * key; - uint16_t keylength; + isc_mem_t *mctx; + uint8_t precedence; + uint8_t gateway_type; + uint8_t algorithm; + struct in_addr in_addr; /* gateway type 1 */ + struct in6_addr in6_addr; /* gateway type 2 */ + dns_name_t gateway; /* gateway type 3 */ + unsigned char *key; + uint16_t keylength; } dns_rdata_ipseckey_t; #endif /* GENERIC_IPSECKEY_45_H */ diff --git a/lib/dns/rdata/generic/isdn_20.h b/lib/dns/rdata/generic/isdn_20.h index c2c3cc6980a82bbbf48b5940b7df1d8986aa9aee..039e213485091501902c062172e4baafe04007e3 100644 --- a/lib/dns/rdata/generic/isdn_20.h +++ b/lib/dns/rdata/generic/isdn_20.h @@ -17,11 +17,11 @@ typedef struct dns_rdata_isdn { dns_rdatacommon_t common; - isc_mem_t * mctx; - char * isdn; - char * subaddress; - uint8_t isdn_len; - uint8_t subaddress_len; + isc_mem_t *mctx; + char *isdn; + char *subaddress; + uint8_t isdn_len; + uint8_t subaddress_len; } dns_rdata_isdn_t; #endif /* GENERIC_ISDN_20_H */ diff --git a/lib/dns/rdata/generic/key_25.h b/lib/dns/rdata/generic/key_25.h index e19792bc30de338b27cbb94b93924041db45bf89..df6c2d48694e7cd6aa2110dfbe229a83481b19e7 100644 --- a/lib/dns/rdata/generic/key_25.h +++ b/lib/dns/rdata/generic/key_25.h @@ -17,12 +17,12 @@ typedef struct dns_rdata_key { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint16_t flags; - dns_secproto_t protocol; - dns_secalg_t algorithm; - uint16_t datalen; - unsigned char * data; + isc_mem_t *mctx; + uint16_t flags; + dns_secproto_t protocol; + dns_secalg_t algorithm; + uint16_t datalen; + unsigned char *data; } dns_rdata_key_t; #endif /* GENERIC_KEY_25_H */ diff --git a/lib/dns/rdata/generic/keydata_65533.h b/lib/dns/rdata/generic/keydata_65533.h index ed8f62ef83b2ce60f650bd84e9e6491440af58e2..d335358766f4f8231977b5bb977b4c67d2f970d7 100644 --- a/lib/dns/rdata/generic/keydata_65533.h +++ b/lib/dns/rdata/generic/keydata_65533.h @@ -14,15 +14,15 @@ typedef struct dns_rdata_keydata { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint32_t refresh; /* Timer for refreshing data */ - uint32_t addhd; /* Hold-down timer for adding */ - uint32_t removehd; /* Hold-down timer for removing */ - uint16_t flags; /* Copy of DNSKEY_48 */ - dns_secproto_t protocol; - dns_secalg_t algorithm; - uint16_t datalen; - unsigned char * data; + isc_mem_t *mctx; + uint32_t refresh; /* Timer for refreshing data */ + uint32_t addhd; /* Hold-down timer for adding */ + uint32_t removehd; /* Hold-down timer for removing */ + uint16_t flags; /* Copy of DNSKEY_48 */ + dns_secproto_t protocol; + dns_secalg_t algorithm; + uint16_t datalen; + unsigned char *data; } dns_rdata_keydata_t; #endif /* GENERIC_KEYDATA_65533_H */ diff --git a/lib/dns/rdata/generic/l32_105.h b/lib/dns/rdata/generic/l32_105.h index 3d15dc7ceae2c48a42f4e75241793a38b227ee0c..dd32338f16d25b57fce9e2c30df14a5f1af206eb 100644 --- a/lib/dns/rdata/generic/l32_105.h +++ b/lib/dns/rdata/generic/l32_105.h @@ -15,8 +15,8 @@ typedef struct dns_rdata_l32 { dns_rdatacommon_t common; - uint16_t pref; - struct in_addr l32; + uint16_t pref; + struct in_addr l32; } dns_rdata_l32_t; #endif /* GENERIC_L32_105_H */ diff --git a/lib/dns/rdata/generic/l64_106.h b/lib/dns/rdata/generic/l64_106.h index 71dd137851fca7160d4ea2b5a924a7902c157d7b..4fe54dd2a6176ce846544f388dbb8c6315321e68 100644 --- a/lib/dns/rdata/generic/l64_106.h +++ b/lib/dns/rdata/generic/l64_106.h @@ -15,8 +15,8 @@ typedef struct dns_rdata_l64 { dns_rdatacommon_t common; - uint16_t pref; - unsigned char l64[8]; + uint16_t pref; + unsigned char l64[8]; } dns_rdata_l64_t; #endif /* GENERIC_L64_106_H */ diff --git a/lib/dns/rdata/generic/loc_29.h b/lib/dns/rdata/generic/loc_29.h index 7d892fd8066a3f82cff91a991a1dadf12fb49ec4..b166a03fc13358e9781300c2427bdaa42eabd965 100644 --- a/lib/dns/rdata/generic/loc_29.h +++ b/lib/dns/rdata/generic/loc_29.h @@ -16,10 +16,10 @@ * \brief Per RFC1876 */ typedef struct dns_rdata_loc_0 { - uint8_t version; /* must be first and zero */ - uint8_t size; - uint8_t horizontal; - uint8_t vertical; + uint8_t version; /* must be first and zero */ + uint8_t size; + uint8_t horizontal; + uint8_t vertical; uint32_t latitude; uint32_t longitude; uint32_t altitude; diff --git a/lib/dns/rdata/generic/lp_107.h b/lib/dns/rdata/generic/lp_107.h index f99eb754dbff0c028f5c4190990611ef2b6f57a9..808ee874cc4dd7f693b2975e375c477f3c1adbdb 100644 --- a/lib/dns/rdata/generic/lp_107.h +++ b/lib/dns/rdata/generic/lp_107.h @@ -15,9 +15,9 @@ typedef struct dns_rdata_lp { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint16_t pref; - dns_name_t lp; + isc_mem_t *mctx; + uint16_t pref; + dns_name_t lp; } dns_rdata_lp_t; #endif /* GENERIC_LP_107_H */ diff --git a/lib/dns/rdata/generic/mb_7.h b/lib/dns/rdata/generic/mb_7.h index 8cb8d6341da5c1f5e34c98ee96ff365070960f41..4c21e11e100922aa76b9fe20073042b7d5ca3161 100644 --- a/lib/dns/rdata/generic/mb_7.h +++ b/lib/dns/rdata/generic/mb_7.h @@ -15,8 +15,8 @@ typedef struct dns_rdata_mb { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t mb; + isc_mem_t *mctx; + dns_name_t mb; } dns_rdata_mb_t; #endif /* GENERIC_MB_7_H */ diff --git a/lib/dns/rdata/generic/md_3.h b/lib/dns/rdata/generic/md_3.h index 02dd9db7b813f26e00f5e9a1405e0a46d7ea367e..febb5aca53c89ee4c21665190fbc3231134cbea1 100644 --- a/lib/dns/rdata/generic/md_3.h +++ b/lib/dns/rdata/generic/md_3.h @@ -15,8 +15,8 @@ typedef struct dns_rdata_md { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t md; + isc_mem_t *mctx; + dns_name_t md; } dns_rdata_md_t; #endif /* GENERIC_MD_3_H */ diff --git a/lib/dns/rdata/generic/mf_4.h b/lib/dns/rdata/generic/mf_4.h index d9a22a36b05849cc3fb951ce8aedd18f57238b36..782b6611fcf2c1a001c465ddc8853d470884b917 100644 --- a/lib/dns/rdata/generic/mf_4.h +++ b/lib/dns/rdata/generic/mf_4.h @@ -15,8 +15,8 @@ typedef struct dns_rdata_mf { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t mf; + isc_mem_t *mctx; + dns_name_t mf; } dns_rdata_mf_t; #endif /* GENERIC_MF_4_H */ diff --git a/lib/dns/rdata/generic/mg_8.h b/lib/dns/rdata/generic/mg_8.h index 06ec1d87b9b7bc699ddad978fdee18fd615d859c..ff2da82ed705c4210c3267c556857b46194574bf 100644 --- a/lib/dns/rdata/generic/mg_8.h +++ b/lib/dns/rdata/generic/mg_8.h @@ -15,8 +15,8 @@ typedef struct dns_rdata_mg { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t mg; + isc_mem_t *mctx; + dns_name_t mg; } dns_rdata_mg_t; #endif /* GENERIC_MG_8_H */ diff --git a/lib/dns/rdata/generic/minfo_14.h b/lib/dns/rdata/generic/minfo_14.h index 40eb12795639b27ac84fa8e71d576a8bff34754c..3f3a32fbc7376d428f1cf4ceef3af96f27008839 100644 --- a/lib/dns/rdata/generic/minfo_14.h +++ b/lib/dns/rdata/generic/minfo_14.h @@ -15,9 +15,9 @@ typedef struct dns_rdata_minfo { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t rmailbox; - dns_name_t emailbox; + isc_mem_t *mctx; + dns_name_t rmailbox; + dns_name_t emailbox; } dns_rdata_minfo_t; #endif /* GENERIC_MINFO_14_H */ diff --git a/lib/dns/rdata/generic/mr_9.h b/lib/dns/rdata/generic/mr_9.h index 4456f7c131d1a191976444cfd511f43c41968728..060de2709c22326426343676563a6d359cefdbb7 100644 --- a/lib/dns/rdata/generic/mr_9.h +++ b/lib/dns/rdata/generic/mr_9.h @@ -15,8 +15,8 @@ typedef struct dns_rdata_mr { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t mr; + isc_mem_t *mctx; + dns_name_t mr; } dns_rdata_mr_t; #endif /* GENERIC_MR_9_H */ diff --git a/lib/dns/rdata/generic/mx_15.h b/lib/dns/rdata/generic/mx_15.h index dd0d809d524fdd2bdbb117dc187becd7af944774..43b353c6388e001c0b7e166fd3b3f9fe39431dd1 100644 --- a/lib/dns/rdata/generic/mx_15.h +++ b/lib/dns/rdata/generic/mx_15.h @@ -15,9 +15,9 @@ typedef struct dns_rdata_mx { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint16_t pref; - dns_name_t mx; + isc_mem_t *mctx; + uint16_t pref; + dns_name_t mx; } dns_rdata_mx_t; #endif /* GENERIC_MX_15_H */ diff --git a/lib/dns/rdata/generic/naptr_35.h b/lib/dns/rdata/generic/naptr_35.h index d349b6fb066f023946bffae9fafda6d83c64a602..ac5fc08ac6c15c34af1c9295cf6107ac0277b59f 100644 --- a/lib/dns/rdata/generic/naptr_35.h +++ b/lib/dns/rdata/generic/naptr_35.h @@ -17,16 +17,16 @@ typedef struct dns_rdata_naptr { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint16_t order; - uint16_t preference; - char * flags; - uint8_t flags_len; - char * service; - uint8_t service_len; - char * regexp; - uint8_t regexp_len; - dns_name_t replacement; + isc_mem_t *mctx; + uint16_t order; + uint16_t preference; + char *flags; + uint8_t flags_len; + char *service; + uint8_t service_len; + char *regexp; + uint8_t regexp_len; + dns_name_t replacement; } dns_rdata_naptr_t; #endif /* GENERIC_NAPTR_35_H */ diff --git a/lib/dns/rdata/generic/nid_104.h b/lib/dns/rdata/generic/nid_104.h index 419f71f2acf69a882c8c4a2af2c37a9bc151c3d2..cf3b16c984b007e9a3150ff90bd0a9f05b1dddfe 100644 --- a/lib/dns/rdata/generic/nid_104.h +++ b/lib/dns/rdata/generic/nid_104.h @@ -15,8 +15,8 @@ typedef struct dns_rdata_nid { dns_rdatacommon_t common; - uint16_t pref; - unsigned char nid[8]; + uint16_t pref; + unsigned char nid[8]; } dns_rdata_nid_t; #endif /* GENERIC_NID_104_H */ diff --git a/lib/dns/rdata/generic/ns_2.h b/lib/dns/rdata/generic/ns_2.h index 22f20c88cf9e9a5138ff39e25143f4bd7e015cf2..5ee443fbe035e3826e0612f478fd05a393f7fc78 100644 --- a/lib/dns/rdata/generic/ns_2.h +++ b/lib/dns/rdata/generic/ns_2.h @@ -15,8 +15,8 @@ typedef struct dns_rdata_ns { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t name; + isc_mem_t *mctx; + dns_name_t name; } dns_rdata_ns_t; #endif /* GENERIC_NS_2_H */ diff --git a/lib/dns/rdata/generic/nsec3_50.h b/lib/dns/rdata/generic/nsec3_50.h index 7bc7af627f2785bf92ff4a2f810dfbedb0458e8d..e25c7f69ddd6da19c6b47b0bc7eb7a1437a3fbea 100644 --- a/lib/dns/rdata/generic/nsec3_50.h +++ b/lib/dns/rdata/generic/nsec3_50.h @@ -19,16 +19,16 @@ typedef struct dns_rdata_nsec3 { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_hash_t hash; - unsigned char flags; - dns_iterations_t iterations; - unsigned char salt_length; - unsigned char next_length; - uint16_t len; - unsigned char * salt; - unsigned char * next; - unsigned char * typebits; + isc_mem_t *mctx; + dns_hash_t hash; + unsigned char flags; + dns_iterations_t iterations; + unsigned char salt_length; + unsigned char next_length; + uint16_t len; + unsigned char *salt; + unsigned char *next; + unsigned char *typebits; } dns_rdata_nsec3_t; /* diff --git a/lib/dns/rdata/generic/nsec3param_51.h b/lib/dns/rdata/generic/nsec3param_51.h index e43c5e88d4606ccda17e7300bfba8bb937f32478..df6d621954bf94394f1755806fa8607abff2c176 100644 --- a/lib/dns/rdata/generic/nsec3param_51.h +++ b/lib/dns/rdata/generic/nsec3param_51.h @@ -19,12 +19,12 @@ typedef struct dns_rdata_nsec3param { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_hash_t hash; - unsigned char flags; /* DNS_NSEC3FLAG_* */ - dns_iterations_t iterations; - unsigned char salt_length; - unsigned char * salt; + isc_mem_t *mctx; + dns_hash_t hash; + unsigned char flags; /* DNS_NSEC3FLAG_* */ + dns_iterations_t iterations; + unsigned char salt_length; + unsigned char *salt; } dns_rdata_nsec3param_t; #endif /* GENERIC_NSEC3PARAM_51_H */ diff --git a/lib/dns/rdata/generic/nsec_47.h b/lib/dns/rdata/generic/nsec_47.h index 7fd1660d639b9e74f3d8ee0d6880e12d3dd2ba50..54a3a64f47858797213fbf71b80dac1a9c9e0480 100644 --- a/lib/dns/rdata/generic/nsec_47.h +++ b/lib/dns/rdata/generic/nsec_47.h @@ -17,10 +17,10 @@ typedef struct dns_rdata_nsec { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t next; - unsigned char * typebits; - uint16_t len; + isc_mem_t *mctx; + dns_name_t next; + unsigned char *typebits; + uint16_t len; } dns_rdata_nsec_t; #endif /* GENERIC_NSEC_47_H */ diff --git a/lib/dns/rdata/generic/null_10.h b/lib/dns/rdata/generic/null_10.h index ef60ce71e7d8c5c9510a35230ad304da61b3ee1d..a0fac02f9c56eae748e192e3126628dd33903de2 100644 --- a/lib/dns/rdata/generic/null_10.h +++ b/lib/dns/rdata/generic/null_10.h @@ -15,9 +15,9 @@ typedef struct dns_rdata_null { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint16_t length; - unsigned char * data; + isc_mem_t *mctx; + uint16_t length; + unsigned char *data; } dns_rdata_null_t; #endif /* GENERIC_NULL_10_H */ diff --git a/lib/dns/rdata/generic/nxt_30.h b/lib/dns/rdata/generic/nxt_30.h index 7ef4af13f22457351890b57796ad7054c5c0c0aa..a8d31e0208910071832eecb08fd710322b74d4bf 100644 --- a/lib/dns/rdata/generic/nxt_30.h +++ b/lib/dns/rdata/generic/nxt_30.h @@ -17,10 +17,10 @@ typedef struct dns_rdata_nxt { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t next; - unsigned char * typebits; - uint16_t len; + isc_mem_t *mctx; + dns_name_t next; + unsigned char *typebits; + uint16_t len; } dns_rdata_nxt_t; #endif /* GENERIC_NXT_30_H */ diff --git a/lib/dns/rdata/generic/openpgpkey_61.h b/lib/dns/rdata/generic/openpgpkey_61.h index 1f74d1216f6b96d79222b4465057e07539aab7e5..fb467e30bfeccb78048a4d754e2d82c77da70f72 100644 --- a/lib/dns/rdata/generic/openpgpkey_61.h +++ b/lib/dns/rdata/generic/openpgpkey_61.h @@ -14,9 +14,9 @@ typedef struct dns_rdata_openpgpkey { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint16_t length; - unsigned char * keyring; + isc_mem_t *mctx; + uint16_t length; + unsigned char *keyring; } dns_rdata_openpgpkey_t; #endif /* GENERIC_OPENPGPKEY_61_H */ diff --git a/lib/dns/rdata/generic/opt_41.h b/lib/dns/rdata/generic/opt_41.h index 2c80025300a8528e3defcde86100976d4c09090d..e46f22dc5ab8076d6472aea3be8ee2b7d4d340c9 100644 --- a/lib/dns/rdata/generic/opt_41.h +++ b/lib/dns/rdata/generic/opt_41.h @@ -16,16 +16,16 @@ * \brief Per RFC2671 */ typedef struct dns_rdata_opt_opcode { - uint16_t opcode; - uint16_t length; + uint16_t opcode; + uint16_t length; unsigned char *data; } dns_rdata_opt_opcode_t; typedef struct dns_rdata_opt { dns_rdatacommon_t common; - isc_mem_t * mctx; - unsigned char * options; - uint16_t length; + isc_mem_t *mctx; + unsigned char *options; + uint16_t length; /* private */ uint16_t offset; } dns_rdata_opt_t; diff --git a/lib/dns/rdata/generic/proforma.h b/lib/dns/rdata/generic/proforma.h index 550a3b248926988446d9e14df545663bc5bd4409..1ec7d792803504c259dcce286dcf6d6632c672a1 100644 --- a/lib/dns/rdata/generic/proforma.h +++ b/lib/dns/rdata/generic/proforma.h @@ -15,8 +15,8 @@ typedef struct dns_rdata_ #{ dns_rdatacommon_t common; - isc_mem_t * mctx; /* if required */ - /* type & class specific elements */ + isc_mem_t *mctx; /* if required */ + /* type & class specific elements */ } dns_rdata_ #_t; diff --git a/lib/dns/rdata/generic/ptr_12.h b/lib/dns/rdata/generic/ptr_12.h index b60aa921c0bfe666f7ffedfd86b32dec53b2126e..a601317aa531eb17e0c59de321aef946714b069e 100644 --- a/lib/dns/rdata/generic/ptr_12.h +++ b/lib/dns/rdata/generic/ptr_12.h @@ -15,8 +15,8 @@ typedef struct dns_rdata_ptr { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t ptr; + isc_mem_t *mctx; + dns_name_t ptr; } dns_rdata_ptr_t; #endif /* GENERIC_PTR_12_H */ diff --git a/lib/dns/rdata/generic/rp_17.h b/lib/dns/rdata/generic/rp_17.h index ea0e470c15692e8a42df385886c751b3a16c7a39..eaaacd8522cf147ea3e517156abf1c9c61224282 100644 --- a/lib/dns/rdata/generic/rp_17.h +++ b/lib/dns/rdata/generic/rp_17.h @@ -17,9 +17,9 @@ typedef struct dns_rdata_rp { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t mail; - dns_name_t text; + isc_mem_t *mctx; + dns_name_t mail; + dns_name_t text; } dns_rdata_rp_t; #endif /* GENERIC_RP_17_H */ diff --git a/lib/dns/rdata/generic/rrsig_46.h b/lib/dns/rdata/generic/rrsig_46.h index fb8224a802715745f6393f1e4ad3185521ef4339..bb4fa283a450e0bab48184315cba73c1bee50581 100644 --- a/lib/dns/rdata/generic/rrsig_46.h +++ b/lib/dns/rdata/generic/rrsig_46.h @@ -16,17 +16,17 @@ * \brief Per RFC2535 */ typedef struct dns_rdata_rrsig { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_rdatatype_t covered; - dns_secalg_t algorithm; - uint8_t labels; - uint32_t originalttl; - uint32_t timeexpire; - uint32_t timesigned; - uint16_t keyid; - dns_name_t signer; - uint16_t siglen; - unsigned char * signature; + isc_mem_t *mctx; + dns_rdatatype_t covered; + dns_secalg_t algorithm; + uint8_t labels; + uint32_t originalttl; + uint32_t timeexpire; + uint32_t timesigned; + uint16_t keyid; + dns_name_t signer; + uint16_t siglen; + unsigned char *signature; } dns_rdata_rrsig_t; #endif /* GENERIC_DNSSIG_46_H */ diff --git a/lib/dns/rdata/generic/rt_21.h b/lib/dns/rdata/generic/rt_21.h index aaa2f8e69e32433acfaf02ae683ab77b51c14ee0..3d0191ef8cb67800ba337a004698724eef0e5c2e 100644 --- a/lib/dns/rdata/generic/rt_21.h +++ b/lib/dns/rdata/generic/rt_21.h @@ -17,9 +17,9 @@ typedef struct dns_rdata_rt { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint16_t preference; - dns_name_t host; + isc_mem_t *mctx; + uint16_t preference; + dns_name_t host; } dns_rdata_rt_t; #endif /* GENERIC_RT_21_H */ diff --git a/lib/dns/rdata/generic/sig_24.h b/lib/dns/rdata/generic/sig_24.h index 460cb6de9b6b2a5b035c9b9659aa37c74806ac75..ca1a75b953220e95bdb67074122c83a8a4285991 100644 --- a/lib/dns/rdata/generic/sig_24.h +++ b/lib/dns/rdata/generic/sig_24.h @@ -17,17 +17,17 @@ typedef struct dns_rdata_sig_t { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_rdatatype_t covered; - dns_secalg_t algorithm; - uint8_t labels; - uint32_t originalttl; - uint32_t timeexpire; - uint32_t timesigned; - uint16_t keyid; - dns_name_t signer; - uint16_t siglen; - unsigned char * signature; + isc_mem_t *mctx; + dns_rdatatype_t covered; + dns_secalg_t algorithm; + uint8_t labels; + uint32_t originalttl; + uint32_t timeexpire; + uint32_t timesigned; + uint16_t keyid; + dns_name_t signer; + uint16_t siglen; + unsigned char *signature; } dns_rdata_sig_t; #endif /* GENERIC_SIG_24_H */ diff --git a/lib/dns/rdata/generic/sink_40.h b/lib/dns/rdata/generic/sink_40.h index 7aa63993db218d23d19ea8a08b579d79db926f0f..fc3402a330c9b726702ef7038d938bac45bef028 100644 --- a/lib/dns/rdata/generic/sink_40.h +++ b/lib/dns/rdata/generic/sink_40.h @@ -14,12 +14,12 @@ typedef struct dns_rdata_sink_t { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint8_t meaning; - uint8_t coding; - uint8_t subcoding; - uint16_t datalen; - unsigned char * data; + isc_mem_t *mctx; + uint8_t meaning; + uint8_t coding; + uint8_t subcoding; + uint16_t datalen; + unsigned char *data; } dns_rdata_sink_t; #endif /* GENERIC_SINK_40_H */ diff --git a/lib/dns/rdata/generic/soa_6.h b/lib/dns/rdata/generic/soa_6.h index 41b3cff7e95c6d9938cf8946f7a5cd5eb2824cf1..5f046d8ad185b07771bbd4826d3f058ad9078a52 100644 --- a/lib/dns/rdata/generic/soa_6.h +++ b/lib/dns/rdata/generic/soa_6.h @@ -15,14 +15,14 @@ typedef struct dns_rdata_soa { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t origin; - dns_name_t contact; - uint32_t serial; /*%< host order */ - uint32_t refresh; /*%< host order */ - uint32_t retry; /*%< host order */ - uint32_t expire; /*%< host order */ - uint32_t minimum; /*%< host order */ + isc_mem_t *mctx; + dns_name_t origin; + dns_name_t contact; + uint32_t serial; /*%< host order */ + uint32_t refresh; /*%< host order */ + uint32_t retry; /*%< host order */ + uint32_t expire; /*%< host order */ + uint32_t minimum; /*%< host order */ } dns_rdata_soa_t; #endif /* GENERIC_SOA_6_H */ diff --git a/lib/dns/rdata/generic/spf_99.h b/lib/dns/rdata/generic/spf_99.h index 53aca446034e781fbd57c5f4268c3b0e10a8727d..fc6e608d31321af3d04854ac8721bc33009329a5 100644 --- a/lib/dns/rdata/generic/spf_99.h +++ b/lib/dns/rdata/generic/spf_99.h @@ -13,15 +13,15 @@ #define GENERIC_SPF_99_H 1 typedef struct dns_rdata_spf_string { - uint8_t length; + uint8_t length; unsigned char *data; } dns_rdata_spf_string_t; typedef struct dns_rdata_spf { dns_rdatacommon_t common; - isc_mem_t * mctx; - unsigned char * txt; - uint16_t txt_len; + isc_mem_t *mctx; + unsigned char *txt; + uint16_t txt_len; /* private */ uint16_t offset; } dns_rdata_spf_t; diff --git a/lib/dns/rdata/generic/sshfp_44.h b/lib/dns/rdata/generic/sshfp_44.h index d9bd68cf4fcd4e03c5ec9260ecb238d19b6edd9c..878e370ccf8e0f1c73e1af523b179195331c565c 100644 --- a/lib/dns/rdata/generic/sshfp_44.h +++ b/lib/dns/rdata/generic/sshfp_44.h @@ -17,11 +17,11 @@ typedef struct dns_rdata_sshfp { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint8_t algorithm; - uint8_t digest_type; - uint16_t length; - unsigned char * digest; + isc_mem_t *mctx; + uint8_t algorithm; + uint8_t digest_type; + uint16_t length; + unsigned char *digest; } dns_rdata_sshfp_t; #endif /* GENERIC_SSHFP_44_H */ diff --git a/lib/dns/rdata/generic/talink_58.h b/lib/dns/rdata/generic/talink_58.h index 5fc6931a3cbd16d5ba03d6fb8e8caaaea7057c71..ee88972d7ad2028efe2d74366a21ee7d38c77fe5 100644 --- a/lib/dns/rdata/generic/talink_58.h +++ b/lib/dns/rdata/generic/talink_58.h @@ -18,9 +18,9 @@ typedef struct dns_rdata_talink { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t prev; - dns_name_t next; + isc_mem_t *mctx; + dns_name_t prev; + dns_name_t next; } dns_rdata_talink_t; #endif /* GENERIC_TALINK_58_H */ diff --git a/lib/dns/rdata/generic/tkey_249.h b/lib/dns/rdata/generic/tkey_249.h index 319d1abf9841ab9ad979389cd2b8068f67025988..fdb2b4252af5c1f3f495be9e2019d503c8f39dbc 100644 --- a/lib/dns/rdata/generic/tkey_249.h +++ b/lib/dns/rdata/generic/tkey_249.h @@ -17,16 +17,16 @@ typedef struct dns_rdata_tkey { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t algorithm; - uint32_t inception; - uint32_t expire; - uint16_t mode; - uint16_t error; - uint16_t keylen; - unsigned char * key; - uint16_t otherlen; - unsigned char * other; + isc_mem_t *mctx; + dns_name_t algorithm; + uint32_t inception; + uint32_t expire; + uint16_t mode; + uint16_t error; + uint16_t keylen; + unsigned char *key; + uint16_t otherlen; + unsigned char *other; } dns_rdata_tkey_t; #endif /* GENERIC_TKEY_249_H */ diff --git a/lib/dns/rdata/generic/tlsa_52.h b/lib/dns/rdata/generic/tlsa_52.h index 70a282c82217680a3f229873a5b40d5d8c65e46b..9c152b039dc04c5b49f20d8cb9f457415c138ff8 100644 --- a/lib/dns/rdata/generic/tlsa_52.h +++ b/lib/dns/rdata/generic/tlsa_52.h @@ -17,12 +17,12 @@ */ typedef struct dns_rdata_tlsa { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint8_t usage; - uint8_t selector; - uint8_t match; - uint16_t length; - unsigned char * data; + isc_mem_t *mctx; + uint8_t usage; + uint8_t selector; + uint8_t match; + uint16_t length; + unsigned char *data; } dns_rdata_tlsa_t; #endif /* GENERIC_TLSA_52_H */ diff --git a/lib/dns/rdata/generic/txt_16.h b/lib/dns/rdata/generic/txt_16.h index 7873895739c81f555fd30352fa8eed93ce0d5a7d..5a1a939d4996d3e68237efb7bff4f6bb2491ec4a 100644 --- a/lib/dns/rdata/generic/txt_16.h +++ b/lib/dns/rdata/generic/txt_16.h @@ -14,15 +14,15 @@ #define GENERIC_TXT_16_H 1 typedef struct dns_rdata_txt_string { - uint8_t length; + uint8_t length; unsigned char *data; } dns_rdata_txt_string_t; typedef struct dns_rdata_txt { dns_rdatacommon_t common; - isc_mem_t * mctx; - unsigned char * txt; - uint16_t txt_len; + isc_mem_t *mctx; + unsigned char *txt; + uint16_t txt_len; /* private */ uint16_t offset; } dns_rdata_txt_t; diff --git a/lib/dns/rdata/generic/uri_256.h b/lib/dns/rdata/generic/uri_256.h index e094c8858f68a234610d8f0afeca4cac7feb10f4..758998de5d01579bfba76d52465fdcab987bd740 100644 --- a/lib/dns/rdata/generic/uri_256.h +++ b/lib/dns/rdata/generic/uri_256.h @@ -14,11 +14,11 @@ typedef struct dns_rdata_uri { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint16_t priority; - uint16_t weight; - unsigned char * target; - uint16_t tgt_len; + isc_mem_t *mctx; + uint16_t priority; + uint16_t weight; + unsigned char *target; + uint16_t tgt_len; } dns_rdata_uri_t; #endif /* GENERIC_URI_256_H */ diff --git a/lib/dns/rdata/generic/x25_19.h b/lib/dns/rdata/generic/x25_19.h index 27730c3a4f7983bf374e01197cb96285177d4caa..df8f30d2489790114b3e42311f732648c50bcf50 100644 --- a/lib/dns/rdata/generic/x25_19.h +++ b/lib/dns/rdata/generic/x25_19.h @@ -17,9 +17,9 @@ typedef struct dns_rdata_x25 { dns_rdatacommon_t common; - isc_mem_t * mctx; - unsigned char * x25; - uint8_t x25_len; + isc_mem_t *mctx; + unsigned char *x25; + uint8_t x25_len; } dns_rdata_x25_t; #endif /* GENERIC_X25_19_H */ diff --git a/lib/dns/rdata/generic/zonemd_63.h b/lib/dns/rdata/generic/zonemd_63.h index b4161a6aaa4f11fdf5f8378bb1a236cce2314c83..3008dcfebb86201c46af599e47a6fce18b3568a9 100644 --- a/lib/dns/rdata/generic/zonemd_63.h +++ b/lib/dns/rdata/generic/zonemd_63.h @@ -20,12 +20,12 @@ */ typedef struct dns_rdata_zonemd { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint32_t serial; - uint8_t digest_type; - uint8_t reserved; - unsigned char * digest; - uint16_t length; + isc_mem_t *mctx; + uint32_t serial; + uint8_t digest_type; + uint8_t reserved; + unsigned char *digest; + uint16_t length; } dns_rdata_zonemd_t; #endif /* GENERIC_ZONEMD_63_H */ diff --git a/lib/dns/rdata/hs_4/a_1.h b/lib/dns/rdata/hs_4/a_1.h index ea0247e24d1daafd6a2c8849b24c7e32aed993b8..d42f7875f5ce8851583175080ff9b697921a5851 100644 --- a/lib/dns/rdata/hs_4/a_1.h +++ b/lib/dns/rdata/hs_4/a_1.h @@ -15,7 +15,7 @@ typedef struct dns_rdata_hs_a { dns_rdatacommon_t common; - struct in_addr in_addr; + struct in_addr in_addr; } dns_rdata_hs_a_t; #endif /* HS_4_A_1_H */ diff --git a/lib/dns/rdata/in_1/a6_38.h b/lib/dns/rdata/in_1/a6_38.h index 38b1526fb6836a05319f4848ecf1443ea691bae7..4f97204c89ba58e6396561795650fd0ae77d7f4f 100644 --- a/lib/dns/rdata/in_1/a6_38.h +++ b/lib/dns/rdata/in_1/a6_38.h @@ -17,10 +17,10 @@ typedef struct dns_rdata_in_a6 { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t prefix; - uint8_t prefixlen; - struct in6_addr in6_addr; + isc_mem_t *mctx; + dns_name_t prefix; + uint8_t prefixlen; + struct in6_addr in6_addr; } dns_rdata_in_a6_t; #endif /* IN_1_A6_38_H */ diff --git a/lib/dns/rdata/in_1/a_1.h b/lib/dns/rdata/in_1/a_1.h index e37ad82f0e1a0de5c718970ef9ed7b2100ae8513..ceaf1a0da5635cdc7c1e56cc51f5e49d4373457b 100644 --- a/lib/dns/rdata/in_1/a_1.h +++ b/lib/dns/rdata/in_1/a_1.h @@ -15,7 +15,7 @@ typedef struct dns_rdata_in_a { dns_rdatacommon_t common; - struct in_addr in_addr; + struct in_addr in_addr; } dns_rdata_in_a_t; #endif /* IN_1_A_1_H */ diff --git a/lib/dns/rdata/in_1/aaaa_28.h b/lib/dns/rdata/in_1/aaaa_28.h index 0348e4edebd5783b41a9b00d62b16641b747f608..3199fff71e5174c1bc2053e9685f4364ecc3ff89 100644 --- a/lib/dns/rdata/in_1/aaaa_28.h +++ b/lib/dns/rdata/in_1/aaaa_28.h @@ -17,7 +17,7 @@ typedef struct dns_rdata_in_aaaa { dns_rdatacommon_t common; - struct in6_addr in6_addr; + struct in6_addr in6_addr; } dns_rdata_in_aaaa_t; #endif /* IN_1_AAAA_28_H */ diff --git a/lib/dns/rdata/in_1/apl_42.h b/lib/dns/rdata/in_1/apl_42.h index e5b00db64a042fbef929f0f3fddf451ebaa8d504..f74421a752ee3c3bc7f4d6f8426a648bed5082cc 100644 --- a/lib/dns/rdata/in_1/apl_42.h +++ b/lib/dns/rdata/in_1/apl_42.h @@ -14,19 +14,19 @@ #define IN_1_APL_42_H 1 typedef struct dns_rdata_apl_ent { - bool negative; - uint16_t family; - uint8_t prefix; - uint8_t length; + bool negative; + uint16_t family; + uint8_t prefix; + uint8_t length; unsigned char *data; } dns_rdata_apl_ent_t; typedef struct dns_rdata_in_apl { dns_rdatacommon_t common; - isc_mem_t * mctx; + isc_mem_t *mctx; /* type & class specific elements */ unsigned char *apl; - uint16_t apl_len; + uint16_t apl_len; /* private */ uint16_t offset; } dns_rdata_in_apl_t; diff --git a/lib/dns/rdata/in_1/atma_34.h b/lib/dns/rdata/in_1/atma_34.h index 286b1f20109ec5e9b9ee0085496842b252195258..0aab6b5a124326ce751d20cca645aa360f3cc351 100644 --- a/lib/dns/rdata/in_1/atma_34.h +++ b/lib/dns/rdata/in_1/atma_34.h @@ -17,10 +17,10 @@ typedef struct dns_rdata_in_atma { dns_rdatacommon_t common; - isc_mem_t * mctx; - unsigned char format; - unsigned char * atma; - uint16_t atma_len; + isc_mem_t *mctx; + unsigned char format; + unsigned char *atma; + uint16_t atma_len; } dns_rdata_in_atma_t; #endif /* IN_1_ATMA_22_H */ diff --git a/lib/dns/rdata/in_1/dhcid_49.h b/lib/dns/rdata/in_1/dhcid_49.h index 6f27157864b4ca5612474bbf61cd919ade18ebc1..e5bac3ac54d00210d2c6c7587c0f9a3fff52c2f2 100644 --- a/lib/dns/rdata/in_1/dhcid_49.h +++ b/lib/dns/rdata/in_1/dhcid_49.h @@ -15,9 +15,9 @@ typedef struct dns_rdata_in_dhcid { dns_rdatacommon_t common; - isc_mem_t * mctx; - unsigned char * dhcid; - unsigned int length; + isc_mem_t *mctx; + unsigned char *dhcid; + unsigned int length; } dns_rdata_in_dhcid_t; #endif /* IN_1_DHCID_49_H */ diff --git a/lib/dns/rdata/in_1/eid_31.h b/lib/dns/rdata/in_1/eid_31.h index 20ccac2ba4ddd7d9b035f2d8aa9f8f3107dc4264..5aed98076464dcf2bbcd5c467ccc1d780f3c8457 100644 --- a/lib/dns/rdata/in_1/eid_31.h +++ b/lib/dns/rdata/in_1/eid_31.h @@ -18,9 +18,9 @@ typedef struct dns_rdata_in_eid { dns_rdatacommon_t common; - isc_mem_t * mctx; - unsigned char * eid; - uint16_t eid_len; + isc_mem_t *mctx; + unsigned char *eid; + uint16_t eid_len; } dns_rdata_in_eid_t; #endif /* IN_1_EID_31_H */ diff --git a/lib/dns/rdata/in_1/kx_36.h b/lib/dns/rdata/in_1/kx_36.h index d32d4a13504fe30484bbdb5df0efbf28eaf21433..8c8053817ad80d6636807f91f97651a9b42a7a21 100644 --- a/lib/dns/rdata/in_1/kx_36.h +++ b/lib/dns/rdata/in_1/kx_36.h @@ -17,9 +17,9 @@ typedef struct dns_rdata_in_kx { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint16_t preference; - dns_name_t exchange; + isc_mem_t *mctx; + uint16_t preference; + dns_name_t exchange; } dns_rdata_in_kx_t; #endif /* IN_1_KX_36_H */ diff --git a/lib/dns/rdata/in_1/nimloc_32.h b/lib/dns/rdata/in_1/nimloc_32.h index d79e1c81b98275c32f62db84b2a67b7b4c7c9e21..eebd03dbefd792d7be2ec04d2b73624a868a3576 100644 --- a/lib/dns/rdata/in_1/nimloc_32.h +++ b/lib/dns/rdata/in_1/nimloc_32.h @@ -18,9 +18,9 @@ typedef struct dns_rdata_in_nimloc { dns_rdatacommon_t common; - isc_mem_t * mctx; - unsigned char * nimloc; - uint16_t nimloc_len; + isc_mem_t *mctx; + unsigned char *nimloc; + uint16_t nimloc_len; } dns_rdata_in_nimloc_t; #endif /* IN_1_NIMLOC_32_H */ diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.h b/lib/dns/rdata/in_1/nsap-ptr_23.h index d6be1dc18f7ce6584b777a19db24248d236ac212..5ffbda5f3071c35c97824150bb1520e0354603cc 100644 --- a/lib/dns/rdata/in_1/nsap-ptr_23.h +++ b/lib/dns/rdata/in_1/nsap-ptr_23.h @@ -17,8 +17,8 @@ typedef struct dns_rdata_in_nsap_ptr { dns_rdatacommon_t common; - isc_mem_t * mctx; - dns_name_t owner; + isc_mem_t *mctx; + dns_name_t owner; } dns_rdata_in_nsap_ptr_t; #endif /* IN_1_NSAP_PTR_23_H */ diff --git a/lib/dns/rdata/in_1/nsap_22.h b/lib/dns/rdata/in_1/nsap_22.h index 6dd3e29a188720474b5b6c533cf38986f95ba350..bc9a32f52572b448bc4f9d09fe55b8e42338af04 100644 --- a/lib/dns/rdata/in_1/nsap_22.h +++ b/lib/dns/rdata/in_1/nsap_22.h @@ -17,9 +17,9 @@ typedef struct dns_rdata_in_nsap { dns_rdatacommon_t common; - isc_mem_t * mctx; - unsigned char * nsap; - uint16_t nsap_len; + isc_mem_t *mctx; + unsigned char *nsap; + uint16_t nsap_len; } dns_rdata_in_nsap_t; #endif /* IN_1_NSAP_22_H */ diff --git a/lib/dns/rdata/in_1/px_26.h b/lib/dns/rdata/in_1/px_26.h index a81da321cc30aa16d7724f5f0f6dd1c7661ec893..6dbce7847fb6529e1deeb5a61abca30754018baf 100644 --- a/lib/dns/rdata/in_1/px_26.h +++ b/lib/dns/rdata/in_1/px_26.h @@ -17,10 +17,10 @@ typedef struct dns_rdata_in_px { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint16_t preference; - dns_name_t map822; - dns_name_t mapx400; + isc_mem_t *mctx; + uint16_t preference; + dns_name_t map822; + dns_name_t mapx400; } dns_rdata_in_px_t; #endif /* IN_1_PX_26_H */ diff --git a/lib/dns/rdata/in_1/srv_33.h b/lib/dns/rdata/in_1/srv_33.h index 8004d19cce2321365e97a7fa8d36f692ad6ae38a..c46149c47e69a9566b4f56151736b9b978696818 100644 --- a/lib/dns/rdata/in_1/srv_33.h +++ b/lib/dns/rdata/in_1/srv_33.h @@ -17,11 +17,11 @@ typedef struct dns_rdata_in_srv { dns_rdatacommon_t common; - isc_mem_t * mctx; - uint16_t priority; - uint16_t weight; - uint16_t port; - dns_name_t target; + isc_mem_t *mctx; + uint16_t priority; + uint16_t weight; + uint16_t port; + dns_name_t target; } dns_rdata_in_srv_t; #endif /* IN_1_SRV_33_H */ diff --git a/lib/dns/rdata/in_1/wks_11.h b/lib/dns/rdata/in_1/wks_11.h index 91a816f48d5d8dfac209f66516f7bb59a2ec7ff5..54ac603277399d066bb4fc0a31251f7d426d5e33 100644 --- a/lib/dns/rdata/in_1/wks_11.h +++ b/lib/dns/rdata/in_1/wks_11.h @@ -14,11 +14,11 @@ typedef struct dns_rdata_in_wks { dns_rdatacommon_t common; - isc_mem_t * mctx; - struct in_addr in_addr; - uint16_t protocol; - unsigned char * map; - uint16_t map_len; + isc_mem_t *mctx; + struct in_addr in_addr; + uint16_t protocol; + unsigned char *map; + uint16_t map_len; } dns_rdata_in_wks_t; #endif /* IN_1_WKS_11_H */ diff --git a/lib/dns/rdata/rdatastructpre.h b/lib/dns/rdata/rdatastructpre.h index 74637dde94dea1bd9ca8a5eca0863639e436db32..f5874beb89dc908778859b51710205aed0d32a6e 100644 --- a/lib/dns/rdata/rdatastructpre.h +++ b/lib/dns/rdata/rdatastructpre.h @@ -22,7 +22,7 @@ ISC_LANG_BEGINDECLS typedef struct dns_rdatacommon { dns_rdataclass_t rdclass; - dns_rdatatype_t rdtype; + dns_rdatatype_t rdtype; ISC_LINK(struct dns_rdatacommon) link; } dns_rdatacommon_t; diff --git a/lib/dns/request.c b/lib/dns/request.c index 1805745282d37cb46ecf40bc240837648580f6df..0ffc368e9c28d7c10157a31be16a0d7a42d81156 100644 --- a/lib/dns/request.c +++ b/lib/dns/request.c @@ -101,23 +101,38 @@ struct dns_request { *** Forward ***/ -static void mgr_destroy(dns_requestmgr_t *requestmgr); -static void mgr_shutdown(dns_requestmgr_t *requestmgr); -static unsigned int mgr_gethash(dns_requestmgr_t *requestmgr); -static void send_shutdown_events(dns_requestmgr_t *requestmgr); - -static isc_result_t req_render(dns_message_t *message, isc_buffer_t **buffer, - unsigned int options, isc_mem_t *mctx); -static void req_senddone(isc_task_t *task, isc_event_t *event); -static void req_response(isc_task_t *task, isc_event_t *event); -static void req_timeout(isc_task_t *task, isc_event_t *event); -static isc_socket_t *req_getsocket(dns_request_t *request); -static void req_connected(isc_task_t *task, isc_event_t *event); -static void req_sendevent(dns_request_t *request, isc_result_t result); -static void req_cancel(dns_request_t *request); -static void req_destroy(dns_request_t *request); -static void req_log(int level, const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3); -static void do_cancel(isc_task_t *task, isc_event_t *event); +static void +mgr_destroy(dns_requestmgr_t *requestmgr); +static void +mgr_shutdown(dns_requestmgr_t *requestmgr); +static unsigned int +mgr_gethash(dns_requestmgr_t *requestmgr); +static void +send_shutdown_events(dns_requestmgr_t *requestmgr); + +static isc_result_t +req_render(dns_message_t *message, isc_buffer_t **buffer, unsigned int options, + isc_mem_t *mctx); +static void +req_senddone(isc_task_t *task, isc_event_t *event); +static void +req_response(isc_task_t *task, isc_event_t *event); +static void +req_timeout(isc_task_t *task, isc_event_t *event); +static isc_socket_t * +req_getsocket(dns_request_t *request); +static void +req_connected(isc_task_t *task, isc_event_t *event); +static void +req_sendevent(dns_request_t *request, isc_result_t result); +static void +req_cancel(dns_request_t *request); +static void +req_destroy(dns_request_t *request); +static void +req_log(int level, const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3); +static void +do_cancel(isc_task_t *task, isc_event_t *event); /*** *** Public diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 91af980cfd655f15b40fa8ea0c11f5d23c72ac98..08402f60325db226841afec14d7310eb25fed86a 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -598,30 +598,45 @@ static unsigned char underscore_offsets[] = { 0 }; static const dns_name_t underscore_name = DNS_NAME_INITNONABSOLUTE(underscore_data, underscore_offsets); -static void destroy(dns_resolver_t *res); -static void empty_bucket(dns_resolver_t *res); -static isc_result_t resquery_send(resquery_t *query); -static void resquery_response(isc_task_t *task, isc_event_t *event); -static void resquery_connected(isc_task_t *task, isc_event_t *event); -static void fctx_try(fetchctx_t *fctx, bool retrying, bool badcache); -static isc_result_t fctx_minimize_qname(fetchctx_t *fctx); -static void fctx_destroy(fetchctx_t *fctx); -static bool fctx_unlink(fetchctx_t *fctx); +static void +destroy(dns_resolver_t *res); +static void +empty_bucket(dns_resolver_t *res); +static isc_result_t +resquery_send(resquery_t *query); +static void +resquery_response(isc_task_t *task, isc_event_t *event); +static void +resquery_connected(isc_task_t *task, isc_event_t *event); +static void +fctx_try(fetchctx_t *fctx, bool retrying, bool badcache); +static isc_result_t +fctx_minimize_qname(fetchctx_t *fctx); +static void +fctx_destroy(fetchctx_t *fctx); +static bool +fctx_unlink(fetchctx_t *fctx); static isc_result_t ncache_adderesult(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node, dns_rdatatype_t covers, isc_stdtime_t now, dns_ttl_t minttl, dns_ttl_t maxttl, bool optout, bool secure, dns_rdataset_t *ardataset, isc_result_t *eresultp); -static void validated(isc_task_t *task, isc_event_t *event); -static bool maybe_destroy(fetchctx_t *fctx, bool locked); -static void add_bad(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, - isc_result_t reason, badnstype_t badtype); -static inline isc_result_t findnoqname(fetchctx_t *fctx, dns_name_t *name, - dns_rdatatype_t type, - dns_name_t **noqname); -static void fctx_increference(fetchctx_t *fctx); -static bool fctx_decreference(fetchctx_t *fctx); -static void resume_qmin(isc_task_t *task, isc_event_t *event); +static void +validated(isc_task_t *task, isc_event_t *event); +static bool +maybe_destroy(fetchctx_t *fctx, bool locked); +static void +add_bad(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, isc_result_t reason, + badnstype_t badtype); +static inline isc_result_t +findnoqname(fetchctx_t *fctx, dns_name_t *name, dns_rdatatype_t type, + dns_name_t **noqname); +static void +fctx_increference(fetchctx_t *fctx); +static bool +fctx_decreference(fetchctx_t *fctx); +static void +resume_qmin(isc_task_t *task, isc_event_t *event); /*% * The structure and functions defined below implement the resolver @@ -756,66 +771,94 @@ typedef struct respctx { dns_rdataset_t *opt; /* OPT rdataset */ } respctx_t; -static void rctx_respinit(isc_task_t *task, dns_dispatchevent_t *devent, - resquery_t *query, fetchctx_t *fctx, respctx_t *rctx); +static void +rctx_respinit(isc_task_t *task, dns_dispatchevent_t *devent, resquery_t *query, + fetchctx_t *fctx, respctx_t *rctx); -static void rctx_answer_init(respctx_t *rctx); +static void +rctx_answer_init(respctx_t *rctx); -static void rctx_answer_scan(respctx_t *rctx); +static void +rctx_answer_scan(respctx_t *rctx); -static void rctx_authority_positive(respctx_t *rctx); +static void +rctx_authority_positive(respctx_t *rctx); -static isc_result_t rctx_answer_any(respctx_t *rctx); +static isc_result_t +rctx_answer_any(respctx_t *rctx); -static isc_result_t rctx_answer_match(respctx_t *rctx); +static isc_result_t +rctx_answer_match(respctx_t *rctx); -static isc_result_t rctx_answer_cname(respctx_t *rctx); +static isc_result_t +rctx_answer_cname(respctx_t *rctx); -static isc_result_t rctx_answer_dname(respctx_t *rctx); +static isc_result_t +rctx_answer_dname(respctx_t *rctx); -static isc_result_t rctx_answer_positive(respctx_t *rctx); +static isc_result_t +rctx_answer_positive(respctx_t *rctx); -static isc_result_t rctx_authority_negative(respctx_t *rctx); +static isc_result_t +rctx_authority_negative(respctx_t *rctx); -static isc_result_t rctx_authority_dnssec(respctx_t *rctx); +static isc_result_t +rctx_authority_dnssec(respctx_t *rctx); -static void rctx_additional(respctx_t *rctx); +static void +rctx_additional(respctx_t *rctx); -static isc_result_t rctx_referral(respctx_t *rctx); +static isc_result_t +rctx_referral(respctx_t *rctx); -static isc_result_t rctx_answer_none(respctx_t *rctx); +static isc_result_t +rctx_answer_none(respctx_t *rctx); -static void rctx_nextserver(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo, - isc_result_t result); +static void +rctx_nextserver(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo, + isc_result_t result); -static void rctx_resend(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo); +static void +rctx_resend(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo); -static void rctx_next(respctx_t *rctx); +static void +rctx_next(respctx_t *rctx); -static void rctx_chaseds(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo, - isc_result_t result); +static void +rctx_chaseds(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo, isc_result_t result); -static void rctx_done(respctx_t *rctx, isc_result_t result); +static void +rctx_done(respctx_t *rctx, isc_result_t result); -static void rctx_logpacket(respctx_t *rctx); +static void +rctx_logpacket(respctx_t *rctx); -static void rctx_opt(respctx_t *rctx); +static void +rctx_opt(respctx_t *rctx); -static void rctx_edns(respctx_t *rctx); +static void +rctx_edns(respctx_t *rctx); -static isc_result_t rctx_parse(respctx_t *rctx); +static isc_result_t +rctx_parse(respctx_t *rctx); -static isc_result_t rctx_badserver(respctx_t *rctx, isc_result_t result); +static isc_result_t +rctx_badserver(respctx_t *rctx, isc_result_t result); -static isc_result_t rctx_answer(respctx_t *rctx); +static isc_result_t +rctx_answer(respctx_t *rctx); -static isc_result_t rctx_lameserver(respctx_t *rctx); +static isc_result_t +rctx_lameserver(respctx_t *rctx); -static isc_result_t rctx_dispfail(respctx_t *rctx); +static isc_result_t +rctx_dispfail(respctx_t *rctx); -static void rctx_delonly_zone(respctx_t *rctx); +static void +rctx_delonly_zone(respctx_t *rctx); -static void rctx_ncache(respctx_t *rctx); +static void +rctx_ncache(respctx_t *rctx); /*% * Increment resolver-related statistics counters. diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c index 9367848da4534e9f53ca0271e1a778960000fc39..d194a169e0fb5b4eeb00ffb24e1383464f09f373 100644 --- a/lib/dns/rpz.c +++ b/lib/dns/rpz.c @@ -91,9 +91,11 @@ */ #define DNS_RPZ_QUANTUM 1024 -static void dns_rpz_update_from_db(dns_rpz_zone_t *rpz); +static void +dns_rpz_update_from_db(dns_rpz_zone_t *rpz); -static void dns_rpz_update_taskaction(isc_task_t *task, isc_event_t *event); +static void +dns_rpz_update_taskaction(isc_task_t *task, isc_event_t *event); /* * Use a private definition of IPv6 addresses because s6_addr32 is not @@ -168,9 +170,11 @@ struct dns_rpz_nm_data { dns_rpz_nm_zbits_t wild; }; -static void rpz_detach(dns_rpz_zone_t **rpzp); +static void +rpz_detach(dns_rpz_zone_t **rpzp); -static void rpz_detach_rpzs(dns_rpz_zones_t **rpzsp); +static void +rpz_detach_rpzs(dns_rpz_zones_t **rpzsp); #if 0 /* diff --git a/lib/dns/rrl.c b/lib/dns/rrl.c index b4602f0aa5385252ff532b73c7eecc50edb59718..78884f96a4eae0b96707e7ebde1d208a09361e1a 100644 --- a/lib/dns/rrl.c +++ b/lib/dns/rrl.c @@ -34,8 +34,9 @@ #include #include -static void log_end(dns_rrl_t *rrl, dns_rrl_entry_t *e, bool early, - char *log_buf, unsigned int log_buf_len); +static void +log_end(dns_rrl_t *rrl, dns_rrl_entry_t *e, bool early, char *log_buf, + unsigned int log_buf_len); /* * Get a modulus for a hash function that is tolerably likely to be diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c index dc54fef5cbaab448f8679c7fc58fc866bf17a31a..2d85032a314ac8e24df8f812382331015656cbef 100644 --- a/lib/dns/sdb.c +++ b/lib/dns/sdb.c @@ -134,38 +134,48 @@ typedef struct sdb_rdatasetiter { static int dummy; -static isc_result_t dns_sdb_create(isc_mem_t *mctx, const dns_name_t *origin, - dns_dbtype_t type, dns_rdataclass_t rdclass, - unsigned int argc, char *argv[], - void *driverarg, dns_db_t **dbp); - -static isc_result_t findrdataset(dns_db_t *db, dns_dbnode_t *node, - dns_dbversion_t *version, dns_rdatatype_t type, - dns_rdatatype_t covers, isc_stdtime_t now, - dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset); - -static isc_result_t createnode(dns_sdb_t *sdb, dns_sdbnode_t **nodep); - -static void destroynode(dns_sdbnode_t *node); - -static void detachnode(dns_db_t *db, dns_dbnode_t **targetp); - -static void list_tordataset(dns_rdatalist_t *rdatalist, dns_db_t *db, - dns_dbnode_t *node, dns_rdataset_t *rdataset); - -static void dbiterator_destroy(dns_dbiterator_t **iteratorp); -static isc_result_t dbiterator_first(dns_dbiterator_t *iterator); -static isc_result_t dbiterator_last(dns_dbiterator_t *iterator); -static isc_result_t dbiterator_seek(dns_dbiterator_t *iterator, - const dns_name_t *name); -static isc_result_t dbiterator_prev(dns_dbiterator_t *iterator); -static isc_result_t dbiterator_next(dns_dbiterator_t *iterator); -static isc_result_t dbiterator_current(dns_dbiterator_t *iterator, - dns_dbnode_t **nodep, dns_name_t *name); -static isc_result_t dbiterator_pause(dns_dbiterator_t *iterator); -static isc_result_t dbiterator_origin(dns_dbiterator_t *iterator, - dns_name_t *name); +static isc_result_t +dns_sdb_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, + dns_rdataclass_t rdclass, unsigned int argc, char *argv[], + void *driverarg, dns_db_t **dbp); + +static isc_result_t +findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, + dns_rdatatype_t type, dns_rdatatype_t covers, isc_stdtime_t now, + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset); + +static isc_result_t +createnode(dns_sdb_t *sdb, dns_sdbnode_t **nodep); + +static void +destroynode(dns_sdbnode_t *node); + +static void +detachnode(dns_db_t *db, dns_dbnode_t **targetp); + +static void +list_tordataset(dns_rdatalist_t *rdatalist, dns_db_t *db, dns_dbnode_t *node, + dns_rdataset_t *rdataset); + +static void +dbiterator_destroy(dns_dbiterator_t **iteratorp); +static isc_result_t +dbiterator_first(dns_dbiterator_t *iterator); +static isc_result_t +dbiterator_last(dns_dbiterator_t *iterator); +static isc_result_t +dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name); +static isc_result_t +dbiterator_prev(dns_dbiterator_t *iterator); +static isc_result_t +dbiterator_next(dns_dbiterator_t *iterator); +static isc_result_t +dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, + dns_name_t *name); +static isc_result_t +dbiterator_pause(dns_dbiterator_t *iterator); +static isc_result_t +dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name); static dns_dbiteratormethods_t dbiterator_methods = { dbiterator_destroy, dbiterator_first, dbiterator_last, @@ -173,11 +183,14 @@ static dns_dbiteratormethods_t dbiterator_methods = { dbiterator_current, dbiterator_pause, dbiterator_origin }; -static void rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp); -static isc_result_t rdatasetiter_first(dns_rdatasetiter_t *iterator); -static isc_result_t rdatasetiter_next(dns_rdatasetiter_t *iterator); -static void rdatasetiter_current(dns_rdatasetiter_t *iterator, - dns_rdataset_t *rdataset); +static void +rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp); +static isc_result_t +rdatasetiter_first(dns_rdatasetiter_t *iterator); +static isc_result_t +rdatasetiter_next(dns_rdatasetiter_t *iterator); +static void +rdatasetiter_current(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset); static dns_rdatasetitermethods_t rdatasetiter_methods = { rdatasetiter_destroy, rdatasetiter_first, rdatasetiter_next, diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c index 5afaffe5e7522b0e9c81998c6111bd498163b242..fcdf0e66d88a990a4b40f505c2f03efdc20ac2f1 100644 --- a/lib/dns/sdlz.c +++ b/lib/dns/sdlz.c @@ -182,29 +182,37 @@ typedef struct sdlz_rdatasetiter { /* * Forward references. */ -static isc_result_t getnodedata(dns_db_t *db, const dns_name_t *name, - bool create, unsigned int options, - dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo, - dns_dbnode_t **nodep); - -static void list_tordataset(dns_rdatalist_t *rdatalist, dns_db_t *db, - dns_dbnode_t *node, dns_rdataset_t *rdataset); - -static void detachnode(dns_db_t *db, dns_dbnode_t **targetp); - -static void dbiterator_destroy(dns_dbiterator_t **iteratorp); -static isc_result_t dbiterator_first(dns_dbiterator_t *iterator); -static isc_result_t dbiterator_last(dns_dbiterator_t *iterator); -static isc_result_t dbiterator_seek(dns_dbiterator_t *iterator, - const dns_name_t *name); -static isc_result_t dbiterator_prev(dns_dbiterator_t *iterator); -static isc_result_t dbiterator_next(dns_dbiterator_t *iterator); -static isc_result_t dbiterator_current(dns_dbiterator_t *iterator, - dns_dbnode_t **nodep, dns_name_t *name); -static isc_result_t dbiterator_pause(dns_dbiterator_t *iterator); -static isc_result_t dbiterator_origin(dns_dbiterator_t *iterator, - dns_name_t *name); +static isc_result_t +getnodedata(dns_db_t *db, const dns_name_t *name, bool create, + unsigned int options, dns_clientinfomethods_t *methods, + dns_clientinfo_t *clientinfo, dns_dbnode_t **nodep); + +static void +list_tordataset(dns_rdatalist_t *rdatalist, dns_db_t *db, dns_dbnode_t *node, + dns_rdataset_t *rdataset); + +static void +detachnode(dns_db_t *db, dns_dbnode_t **targetp); + +static void +dbiterator_destroy(dns_dbiterator_t **iteratorp); +static isc_result_t +dbiterator_first(dns_dbiterator_t *iterator); +static isc_result_t +dbiterator_last(dns_dbiterator_t *iterator); +static isc_result_t +dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name); +static isc_result_t +dbiterator_prev(dns_dbiterator_t *iterator); +static isc_result_t +dbiterator_next(dns_dbiterator_t *iterator); +static isc_result_t +dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, + dns_name_t *name); +static isc_result_t +dbiterator_pause(dns_dbiterator_t *iterator); +static isc_result_t +dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name); static dns_dbiteratormethods_t dbiterator_methods = { dbiterator_destroy, dbiterator_first, dbiterator_last, diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c index fd3f81a247591588c83ec549d4cfc3f5d64c7d51..67f9034ce8db505382bb0abe4cdee12fa84b22ca 100644 --- a/lib/dns/spnego.c +++ b/lib/dns/spnego.c @@ -230,57 +230,73 @@ enum { UT_Boolean = 1, #define ASN1_INDEFINITE 0xdce0deed -static int der_get_length(const unsigned char *p, size_t len, size_t *val, - size_t *size); +static int +der_get_length(const unsigned char *p, size_t len, size_t *val, size_t *size); -static int der_get_octet_string(const unsigned char *p, size_t len, - octet_string *data, size_t *size); -static int der_get_oid(const unsigned char *p, size_t len, oid *data, - size_t *size); -static int der_get_tag(const unsigned char *p, size_t len, Der_class *xclass, - Der_type *type, int *tag, size_t *size); +static int +der_get_octet_string(const unsigned char *p, size_t len, octet_string *data, + size_t *size); +static int +der_get_oid(const unsigned char *p, size_t len, oid *data, size_t *size); +static int +der_get_tag(const unsigned char *p, size_t len, Der_class *xclass, + Der_type *type, int *tag, size_t *size); -static int der_match_tag(const unsigned char *p, size_t len, Der_class xclass, - Der_type type, int tag, size_t *size); -static int der_match_tag_and_length(const unsigned char *p, size_t len, - Der_class xclass, Der_type type, int tag, - size_t *length_ret, size_t *size); +static int +der_match_tag(const unsigned char *p, size_t len, Der_class xclass, + Der_type type, int tag, size_t *size); +static int +der_match_tag_and_length(const unsigned char *p, size_t len, Der_class xclass, + Der_type type, int tag, size_t *length_ret, + size_t *size); -static int decode_oid(const unsigned char *p, size_t len, oid *k, size_t *size); +static int +decode_oid(const unsigned char *p, size_t len, oid *k, size_t *size); -static int decode_enumerated(const unsigned char *p, size_t len, void *num, - size_t *size); +static int +decode_enumerated(const unsigned char *p, size_t len, void *num, size_t *size); -static int decode_octet_string(const unsigned char *, size_t, octet_string *, - size_t *); +static int +decode_octet_string(const unsigned char *, size_t, octet_string *, size_t *); -static int der_put_int(unsigned char *p, size_t len, int val, size_t *); +static int +der_put_int(unsigned char *p, size_t len, int val, size_t *); -static int der_put_length(unsigned char *p, size_t len, size_t val, size_t *); +static int +der_put_length(unsigned char *p, size_t len, size_t val, size_t *); -static int der_put_octet_string(unsigned char *p, size_t len, - const octet_string *data, size_t *); -static int der_put_oid(unsigned char *p, size_t len, const oid *data, - size_t *size); -static int der_put_tag(unsigned char *p, size_t len, Der_class xclass, - Der_type type, int tag, size_t *); -static int der_put_length_and_tag(unsigned char *, size_t, size_t, Der_class, - Der_type, int, size_t *); +static int +der_put_octet_string(unsigned char *p, size_t len, const octet_string *data, + size_t *); +static int +der_put_oid(unsigned char *p, size_t len, const oid *data, size_t *size); +static int +der_put_tag(unsigned char *p, size_t len, Der_class xclass, Der_type type, + int tag, size_t *); +static int +der_put_length_and_tag(unsigned char *, size_t, size_t, Der_class, Der_type, + int, size_t *); -static int encode_enumerated(unsigned char *p, size_t len, const void *data, - size_t *); +static int +encode_enumerated(unsigned char *p, size_t len, const void *data, size_t *); -static int encode_octet_string(unsigned char *p, size_t len, - const octet_string *k, size_t *); -static int encode_oid(unsigned char *p, size_t len, const oid *k, size_t *); +static int +encode_octet_string(unsigned char *p, size_t len, const octet_string *k, + size_t *); +static int +encode_oid(unsigned char *p, size_t len, const oid *k, size_t *); -static void free_octet_string(octet_string *k); +static void +free_octet_string(octet_string *k); -static void free_oid(oid *k); +static void +free_oid(oid *k); -static size_t length_len(size_t len); +static size_t +length_len(size_t len); -static int fix_dce(size_t reallen, size_t *len); +static int +fix_dce(size_t reallen, size_t *len); /* * Include stuff generated by the ASN.1 compiler. @@ -326,12 +342,13 @@ static gss_OID GSS_SPNEGO_MECH = &gss_spnego_mech_oid_desc; /* spnegokrb5_locl.h */ -static OM_uint32 gssapi_spnego_encapsulate(OM_uint32 *, unsigned char *, size_t, - gss_buffer_t, const gss_OID); +static OM_uint32 +gssapi_spnego_encapsulate(OM_uint32 *, unsigned char *, size_t, gss_buffer_t, + const gss_OID); -static OM_uint32 gssapi_spnego_decapsulate(OM_uint32 *, gss_buffer_t, - unsigned char **, size_t *, - const gss_OID); +static OM_uint32 +gssapi_spnego_decapsulate(OM_uint32 *, gss_buffer_t, unsigned char **, size_t *, + const gss_OID); /* mod_auth_kerb.c */ diff --git a/lib/dns/spnego_asn1.c b/lib/dns/spnego_asn1.c index 01604ff618a6b4ccac078d1a9e32456a343ab30e..142cf3e5af442b5fb0b5846f9d2007a04b4b54ac 100644 --- a/lib/dns/spnego_asn1.c +++ b/lib/dns/spnego_asn1.c @@ -61,9 +61,12 @@ typedef struct oid { typedef oid MechType; -static int encode_MechType(unsigned char *, size_t, const MechType *, size_t *); -static int decode_MechType(const unsigned char *, size_t, MechType *, size_t *); -static void free_MechType(MechType *); +static int +encode_MechType(unsigned char *, size_t, const MechType *, size_t *); +static int +decode_MechType(const unsigned char *, size_t, MechType *, size_t *); +static void +free_MechType(MechType *); /* unused declaration: length_MechType */ /* unused declaration: copy_MechType */ @@ -76,11 +79,12 @@ typedef struct MechTypeList { MechType *val; } MechTypeList; -static int encode_MechTypeList(unsigned char *, size_t, const MechTypeList *, - size_t *); -static int decode_MechTypeList(const unsigned char *, size_t, MechTypeList *, - size_t *); -static void free_MechTypeList(MechTypeList *); +static int +encode_MechTypeList(unsigned char *, size_t, const MechTypeList *, size_t *); +static int +decode_MechTypeList(const unsigned char *, size_t, MechTypeList *, size_t *); +static void +free_MechTypeList(MechTypeList *); /* unused declaration: length_MechTypeList */ /* unused declaration: copy_MechTypeList */ @@ -99,11 +103,12 @@ typedef struct ContextFlags { unsigned int integFlag : 1; } ContextFlags; -static int encode_ContextFlags(unsigned char *, size_t, const ContextFlags *, - size_t *); -static int decode_ContextFlags(const unsigned char *, size_t, ContextFlags *, - size_t *); -static void free_ContextFlags(ContextFlags *); +static int +encode_ContextFlags(unsigned char *, size_t, const ContextFlags *, size_t *); +static int +decode_ContextFlags(const unsigned char *, size_t, ContextFlags *, size_t *); +static void +free_ContextFlags(ContextFlags *); /* unused declaration: length_ContextFlags */ /* unused declaration: copy_ContextFlags */ /* unused declaration: ContextFlags2int */ @@ -123,11 +128,12 @@ typedef struct NegTokenInit { octet_string *mechListMIC; } NegTokenInit; -static int encode_NegTokenInit(unsigned char *, size_t, const NegTokenInit *, - size_t *); -static int decode_NegTokenInit(const unsigned char *, size_t, NegTokenInit *, - size_t *); -static void free_NegTokenInit(NegTokenInit *); +static int +encode_NegTokenInit(unsigned char *, size_t, const NegTokenInit *, size_t *); +static int +decode_NegTokenInit(const unsigned char *, size_t, NegTokenInit *, size_t *); +static void +free_NegTokenInit(NegTokenInit *); /* unused declaration: length_NegTokenInit */ /* unused declaration: copy_NegTokenInit */ @@ -150,11 +156,12 @@ typedef struct NegTokenResp { octet_string *mechListMIC; } NegTokenResp; -static int encode_NegTokenResp(unsigned char *, size_t, const NegTokenResp *, - size_t *); -static int decode_NegTokenResp(const unsigned char *, size_t, NegTokenResp *, - size_t *); -static void free_NegTokenResp(NegTokenResp *); +static int +encode_NegTokenResp(unsigned char *, size_t, const NegTokenResp *, size_t *); +static int +decode_NegTokenResp(const unsigned char *, size_t, NegTokenResp *, size_t *); +static void +free_NegTokenResp(NegTokenResp *); /* unused declaration: length_NegTokenResp */ /* unused declaration: copy_NegTokenResp */ diff --git a/lib/dns/tcpmsg.c b/lib/dns/tcpmsg.c index 9499c640a45f74232eff3feba02ca20cfff5fa1f..06ee429203abaa5f716c42f3f38ee94e42695a33 100644 --- a/lib/dns/tcpmsg.c +++ b/lib/dns/tcpmsg.c @@ -32,8 +32,10 @@ #define TCPMSG_MAGIC ISC_MAGIC('T', 'C', 'P', 'm') #define VALID_TCPMSG(foo) ISC_MAGIC_VALID(foo, TCPMSG_MAGIC) -static void recv_length(isc_task_t *, isc_event_t *); -static void recv_message(isc_task_t *, isc_event_t *); +static void +recv_length(isc_task_t *, isc_event_t *); +static void +recv_message(isc_task_t *, isc_event_t *); static void recv_length(isc_task_t *task, isc_event_t *ev_in) { diff --git a/lib/dns/tests/dnstest.h b/lib/dns/tests/dnstest.h index d9f2fb246c60f3892d164ab88a68090f1836f924..0b114b4818a618a939b444923a6128f1380e3736 100644 --- a/lib/dns/tests/dnstest.h +++ b/lib/dns/tests/dnstest.h @@ -29,10 +29,10 @@ typedef struct { dns_diffop_t op; - const char * owner; - dns_ttl_t ttl; - const char * type; - const char * rdata; + const char *owner; + dns_ttl_t ttl; + const char *type; + const char *rdata; } zonechange_t; #define ZONECHANGE_SENTINEL \ @@ -40,16 +40,16 @@ typedef struct { 0, NULL, 0, NULL, NULL \ } -extern isc_mem_t * dt_mctx; -extern isc_log_t * lctx; -extern isc_taskmgr_t * taskmgr; -extern isc_task_t * maintask; -extern isc_timermgr_t * timermgr; +extern isc_mem_t *dt_mctx; +extern isc_log_t *lctx; +extern isc_taskmgr_t *taskmgr; +extern isc_task_t *maintask; +extern isc_timermgr_t *timermgr; extern isc_socketmgr_t *socketmgr; -extern dns_zonemgr_t * zonemgr; -extern bool app_running; -extern int ncpus; -extern bool debug_mem_record; +extern dns_zonemgr_t *zonemgr; +extern bool app_running; +extern int ncpus; +extern bool debug_mem_record; isc_result_t dns_test_begin(FILE *logfile, bool create_managers); diff --git a/lib/dns/tests/geoip_test.c b/lib/dns/tests/geoip_test.c index cd77ce273cccdeb09d21aa0dbc8f92ae1fbae069..eca6f9b824b0c8214ffc62e9d97612a1d5d811e7 100644 --- a/lib/dns/tests/geoip_test.c +++ b/lib/dns/tests/geoip_test.c @@ -44,8 +44,10 @@ static dns_geoip_databases_t geoip; static MMDB_s geoip_country, geoip_city, geoip_as, geoip_isp, geoip_domain; -static void load_geoip(const char *dir); -static void close_geoip(void); +static void +load_geoip(const char *dir); +static void +close_geoip(void); static int _setup(void **state) { diff --git a/lib/dns/tests/master_test.c b/lib/dns/tests/master_test.c index 55ecea351ed6e54eb603d00850efafa85bde2b28..74709a85ea5139e96925dde2f062222ee0264654 100644 --- a/lib/dns/tests/master_test.c +++ b/lib/dns/tests/master_test.c @@ -79,7 +79,8 @@ unsigned char name_buf[BUFLEN]; dns_rdatacallbacks_t callbacks; char *include_file = NULL; -static void rawdata_callback(dns_zone_t *zone, dns_masterrawheader_t *header); +static void +rawdata_callback(dns_zone_t *zone, dns_masterrawheader_t *header); static isc_result_t add_callback(void *arg, const dns_name_t *owner, dns_rdataset_t *dataset) { diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c index 504063e7a876c34cea49c17e90532efa000457a2..8802d02f2e3f0096e7262a8d2286b09be860b516 100644 --- a/lib/dns/tkey.c +++ b/lib/dns/tkey.c @@ -57,7 +57,8 @@ goto failure; \ } while (0) -static void tkey_log(const char *fmt, ...) ISC_FORMAT_PRINTF(1, 2); +static void +tkey_log(const char *fmt, ...) ISC_FORMAT_PRINTF(1, 2); static void tkey_log(const char *fmt, ...) { diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c index 017c701bcbfaa411be8f35a6cbcaf213e5d405c9..28368811af1ddeebfbea4a349299babadb2eaa29 100644 --- a/lib/dns/tsig.c +++ b/lib/dns/tsig.c @@ -117,13 +117,17 @@ static const struct { { &hmacsha384, DST_ALG_HMACSHA384 }, { &hmacsha512, DST_ALG_HMACSHA512 } }; -static isc_result_t tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg); +static isc_result_t +tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg); -static void tsig_log(dns_tsigkey_t *key, int level, const char *fmt, ...) +static void +tsig_log(dns_tsigkey_t *key, int level, const char *fmt, ...) ISC_FORMAT_PRINTF(3, 4); -static void cleanup_ring(dns_tsig_keyring_t *ring); -static void tsigkey_free(dns_tsigkey_t *key); +static void +cleanup_ring(dns_tsig_keyring_t *ring); +static void +tsigkey_free(dns_tsigkey_t *key); bool dns__tsig_algvalid(unsigned int alg) { diff --git a/lib/dns/ttl.c b/lib/dns/ttl.c index 983fb4dbe1760b95a46eae2de97d4c778d575bbc..7230d77c0dfeebddba6a30d1f3ea53bb5759b62a 100644 --- a/lib/dns/ttl.c +++ b/lib/dns/ttl.c @@ -35,7 +35,8 @@ return ((_r)); \ } while (0) -static isc_result_t bind_ttl(isc_textregion_t *source, uint32_t *ttl); +static isc_result_t +bind_ttl(isc_textregion_t *source, uint32_t *ttl); /* * Helper for dns_ttl_totext(). diff --git a/lib/dns/update.c b/lib/dns/update.c index 272ab19e3bfc30f9ab3cd8c39d1884168c4704f5..e3477acb1be0b3af51adcf7f3c15a39833f1bb2d 100644 --- a/lib/dns/update.c +++ b/lib/dns/update.c @@ -196,8 +196,9 @@ typedef struct update_event update_event_t; /**************************************************************************/ -static void update_log(dns_update_log_t *callback, dns_zone_t *zone, int level, - const char *fmt, ...) ISC_FORMAT_PRINTF(4, 5); +static void +update_log(dns_update_log_t *callback, dns_zone_t *zone, int level, + const char *fmt, ...) ISC_FORMAT_PRINTF(4, 5); static void update_log(dns_update_log_t *callback, dns_zone_t *zone, int level, @@ -297,12 +298,14 @@ update_one_rr(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, /*% * Function type for foreach_rrset() iterator actions. */ -typedef isc_result_t rrset_func(void *data, dns_rdataset_t *rrset); +typedef isc_result_t +rrset_func(void *data, dns_rdataset_t *rrset); /*% * Function type for foreach_rr() iterator actions. */ -typedef isc_result_t rr_func(void *data, rr_t *rr); +typedef isc_result_t +rr_func(void *data, rr_t *rr); /*% * Internal context struct for foreach_node_rr(). @@ -492,7 +495,8 @@ cleanup_node: * Function type for predicate functions that compare a database RR 'db_rr' * against an update RR 'update_rr'. */ -typedef bool rr_predicate(dns_rdata_t *update_rr, dns_rdata_t *db_rr); +typedef bool +rr_predicate(dns_rdata_t *update_rr, dns_rdata_t *db_rr); /*% * Helper function for rrset_exists(). diff --git a/lib/dns/validator.c b/lib/dns/validator.c index db245c9fa0f4fd1b3ce2f7885620740f4cf1f496..42ce6a3b0da45d41863c6660570406b783752348 100644 --- a/lib/dns/validator.c +++ b/lib/dns/validator.c @@ -102,30 +102,37 @@ #define NEGATIVE(r) (((r)->attributes & DNS_RDATASETATTR_NEGATIVE) != 0) #define NXDOMAIN(r) (((r)->attributes & DNS_RDATASETATTR_NXDOMAIN) != 0) -static void destroy(dns_validator_t *val); +static void +destroy(dns_validator_t *val); -static isc_result_t select_signing_key(dns_validator_t *val, - dns_rdataset_t *rdataset); +static isc_result_t +select_signing_key(dns_validator_t *val, dns_rdataset_t *rdataset); -static isc_result_t validate_answer(dns_validator_t *val, bool resume); +static isc_result_t +validate_answer(dns_validator_t *val, bool resume); -static isc_result_t validate_dnskey(dns_validator_t *val); +static isc_result_t +validate_dnskey(dns_validator_t *val); -static isc_result_t validate_nx(dns_validator_t *val, bool resume); +static isc_result_t +validate_nx(dns_validator_t *val, bool resume); -static isc_result_t proveunsecure(dns_validator_t *val, bool have_ds, - bool resume); +static isc_result_t +proveunsecure(dns_validator_t *val, bool have_ds, bool resume); -static void validator_logv(dns_validator_t *val, isc_logcategory_t *category, - isc_logmodule_t *module, int level, const char *fmt, - va_list ap) ISC_FORMAT_PRINTF(5, 0); +static void +validator_logv(dns_validator_t *val, isc_logcategory_t *category, + isc_logmodule_t *module, int level, const char *fmt, va_list ap) + ISC_FORMAT_PRINTF(5, 0); -static void validator_log(void *val, int level, const char *fmt, ...) +static void +validator_log(void *val, int level, const char *fmt, ...) ISC_FORMAT_PRINTF(3, 4); -static void validator_logcreate(dns_validator_t *val, dns_name_t *name, - dns_rdatatype_t type, const char *caller, - const char *operation); +static void +validator_logcreate(dns_validator_t *val, dns_name_t *name, + dns_rdatatype_t type, const char *caller, + const char *operation); /*% * Ensure the validator's rdatasets are marked as expired. diff --git a/lib/dns/view.c b/lib/dns/view.c index c2ec4cf13109fc566ac2a899be10e7b7406e381c..0758ae4225cdc982ac82ce1ea73ff97910132fed 100644 --- a/lib/dns/view.c +++ b/lib/dns/view.c @@ -77,9 +77,12 @@ #define DNS_VIEW_DELONLYHASH 111 #define DNS_VIEW_FAILCACHESIZE 1021 -static void resolver_shutdown(isc_task_t *task, isc_event_t *event); -static void adb_shutdown(isc_task_t *task, isc_event_t *event); -static void req_shutdown(isc_task_t *task, isc_event_t *event); +static void +resolver_shutdown(isc_task_t *task, isc_event_t *event); +static void +adb_shutdown(isc_task_t *task, isc_event_t *event); +static void +req_shutdown(isc_task_t *task, isc_event_t *event); isc_result_t dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, const char *name, diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c index 9c92ac8ebc5b3d22bd5805a9d2b97c526c445b3c..07050ffd09982fb53f168703a2a21e9c3043a748 100644 --- a/lib/dns/xfrin.c +++ b/lib/dns/xfrin.c @@ -197,49 +197,66 @@ xfrin_create(isc_mem_t *mctx, dns_zone_t *zone, dns_db_t *db, isc_task_t *task, const isc_sockaddr_t *sourceaddr, isc_dscp_t dscp, dns_tsigkey_t *tsigkey, dns_xfrin_ctx_t **xfrp); -static isc_result_t axfr_init(dns_xfrin_ctx_t *xfr); -static isc_result_t axfr_makedb(dns_xfrin_ctx_t *xfr, dns_db_t **dbp); -static isc_result_t axfr_putdata(dns_xfrin_ctx_t *xfr, dns_diffop_t op, - dns_name_t *name, dns_ttl_t ttl, - dns_rdata_t *rdata); -static isc_result_t axfr_apply(dns_xfrin_ctx_t *xfr); -static isc_result_t axfr_commit(dns_xfrin_ctx_t *xfr); -static isc_result_t axfr_finalize(dns_xfrin_ctx_t *xfr); - -static isc_result_t ixfr_init(dns_xfrin_ctx_t *xfr); -static isc_result_t ixfr_apply(dns_xfrin_ctx_t *xfr); -static isc_result_t ixfr_putdata(dns_xfrin_ctx_t *xfr, dns_diffop_t op, - dns_name_t *name, dns_ttl_t ttl, - dns_rdata_t *rdata); -static isc_result_t ixfr_commit(dns_xfrin_ctx_t *xfr); - -static isc_result_t xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, uint32_t ttl, - dns_rdata_t *rdata); - -static isc_result_t xfrin_start(dns_xfrin_ctx_t *xfr); - -static void xfrin_connect_done(isc_task_t *task, isc_event_t *event); -static isc_result_t xfrin_send_request(dns_xfrin_ctx_t *xfr); -static void xfrin_send_done(isc_task_t *task, isc_event_t *event); -static void xfrin_recv_done(isc_task_t *task, isc_event_t *event); -static void xfrin_timeout(isc_task_t *task, isc_event_t *event); - -static void maybe_free(dns_xfrin_ctx_t *xfr); - -static void xfrin_fail(dns_xfrin_ctx_t *xfr, isc_result_t result, - const char *msg); -static isc_result_t render(dns_message_t *msg, isc_mem_t *mctx, - isc_buffer_t *buf); - -static void xfrin_logv(int level, const char *zonetext, - const isc_sockaddr_t *masteraddr, const char *fmt, - va_list ap) ISC_FORMAT_PRINTF(4, 0); - -static void xfrin_log1(int level, const char *zonetext, - const isc_sockaddr_t *masteraddr, const char *fmt, ...) - ISC_FORMAT_PRINTF(4, 5); - -static void xfrin_log(dns_xfrin_ctx_t *xfr, int level, const char *fmt, ...) +static isc_result_t +axfr_init(dns_xfrin_ctx_t *xfr); +static isc_result_t +axfr_makedb(dns_xfrin_ctx_t *xfr, dns_db_t **dbp); +static isc_result_t +axfr_putdata(dns_xfrin_ctx_t *xfr, dns_diffop_t op, dns_name_t *name, + dns_ttl_t ttl, dns_rdata_t *rdata); +static isc_result_t +axfr_apply(dns_xfrin_ctx_t *xfr); +static isc_result_t +axfr_commit(dns_xfrin_ctx_t *xfr); +static isc_result_t +axfr_finalize(dns_xfrin_ctx_t *xfr); + +static isc_result_t +ixfr_init(dns_xfrin_ctx_t *xfr); +static isc_result_t +ixfr_apply(dns_xfrin_ctx_t *xfr); +static isc_result_t +ixfr_putdata(dns_xfrin_ctx_t *xfr, dns_diffop_t op, dns_name_t *name, + dns_ttl_t ttl, dns_rdata_t *rdata); +static isc_result_t +ixfr_commit(dns_xfrin_ctx_t *xfr); + +static isc_result_t +xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, uint32_t ttl, + dns_rdata_t *rdata); + +static isc_result_t +xfrin_start(dns_xfrin_ctx_t *xfr); + +static void +xfrin_connect_done(isc_task_t *task, isc_event_t *event); +static isc_result_t +xfrin_send_request(dns_xfrin_ctx_t *xfr); +static void +xfrin_send_done(isc_task_t *task, isc_event_t *event); +static void +xfrin_recv_done(isc_task_t *task, isc_event_t *event); +static void +xfrin_timeout(isc_task_t *task, isc_event_t *event); + +static void +maybe_free(dns_xfrin_ctx_t *xfr); + +static void +xfrin_fail(dns_xfrin_ctx_t *xfr, isc_result_t result, const char *msg); +static isc_result_t +render(dns_message_t *msg, isc_mem_t *mctx, isc_buffer_t *buf); + +static void +xfrin_logv(int level, const char *zonetext, const isc_sockaddr_t *masteraddr, + const char *fmt, va_list ap) ISC_FORMAT_PRINTF(4, 0); + +static void +xfrin_log1(int level, const char *zonetext, const isc_sockaddr_t *masteraddr, + const char *fmt, ...) ISC_FORMAT_PRINTF(4, 5); + +static void +xfrin_log(dns_xfrin_ctx_t *xfr, int level, const char *fmt, ...) ISC_FORMAT_PRINTF(3, 4); /**************************************************************************/ diff --git a/lib/dns/zone.c b/lib/dns/zone.c index c0e0a6b6ec1901713031acf8000ddae4a146c5e4..a7d11e8192f3026b7ee76aafdaa019304a670990 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -747,91 +747,139 @@ LIBDNS_EXTERNAL_DATA unsigned int dns_zone_mkey_month = MONTH; #define SEND_BUFFER_SIZE 2048 -static void zone_settimer(dns_zone_t *, isc_time_t *); -static void cancel_refresh(dns_zone_t *); -static void zone_debuglog(dns_zone_t *zone, const char *, int debuglevel, - const char *msg, ...) ISC_FORMAT_PRINTF(4, 5); -static void notify_log(dns_zone_t *zone, int level, const char *fmt, ...) +static void +zone_settimer(dns_zone_t *, isc_time_t *); +static void +cancel_refresh(dns_zone_t *); +static void +zone_debuglog(dns_zone_t *zone, const char *, int debuglevel, const char *msg, + ...) ISC_FORMAT_PRINTF(4, 5); +static void +notify_log(dns_zone_t *zone, int level, const char *fmt, ...) ISC_FORMAT_PRINTF(3, 4); -static void dnssec_log(dns_zone_t *zone, int level, const char *fmt, ...) +static void +dnssec_log(dns_zone_t *zone, int level, const char *fmt, ...) ISC_FORMAT_PRINTF(3, 4); -static void queue_xfrin(dns_zone_t *zone); -static isc_result_t update_one_rr(dns_db_t *db, dns_dbversion_t *ver, - dns_diff_t *diff, dns_diffop_t op, - dns_name_t *name, dns_ttl_t ttl, - dns_rdata_t *rdata); -static void zone_unload(dns_zone_t *zone); -static void zone_expire(dns_zone_t *zone); -static void zone_iattach(dns_zone_t *source, dns_zone_t **target); -static void zone_idetach(dns_zone_t **zonep); -static isc_result_t zone_replacedb(dns_zone_t *zone, dns_db_t *db, bool dump); -static inline void zone_attachdb(dns_zone_t *zone, dns_db_t *db); -static inline void zone_detachdb(dns_zone_t *zone); -static isc_result_t default_journal(dns_zone_t *zone); -static void zone_xfrdone(dns_zone_t *zone, isc_result_t result); -static isc_result_t zone_postload(dns_zone_t *zone, dns_db_t *db, - isc_time_t loadtime, isc_result_t result); -static void zone_needdump(dns_zone_t *zone, unsigned int delay); -static void zone_shutdown(isc_task_t *, isc_event_t *); -static void zone_loaddone(void *arg, isc_result_t result); -static isc_result_t zone_startload(dns_db_t *db, dns_zone_t *zone, - isc_time_t loadtime); -static void zone_namerd_tostr(dns_zone_t *zone, char *buf, size_t length); -static void zone_name_tostr(dns_zone_t *zone, char *buf, size_t length); -static void zone_rdclass_tostr(dns_zone_t *zone, char *buf, size_t length); -static void zone_viewname_tostr(dns_zone_t *zone, char *buf, size_t length); -static isc_result_t zone_send_secureserial(dns_zone_t *zone, uint32_t serial); -static void refresh_callback(isc_task_t *, isc_event_t *); -static void stub_callback(isc_task_t *, isc_event_t *); -static void queue_soa_query(dns_zone_t *zone); -static void soa_query(isc_task_t *, isc_event_t *); -static void ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, - dns_stub_t *stub); -static int message_count(dns_message_t *msg, dns_section_t section, - dns_rdatatype_t type); -static void notify_cancel(dns_zone_t *zone); -static void notify_find_address(dns_notify_t *notify); -static void notify_send(dns_notify_t *notify); -static isc_result_t notify_createmessage(dns_zone_t *zone, unsigned int flags, - dns_message_t **messagep); -static void notify_done(isc_task_t *task, isc_event_t *event); -static void notify_send_toaddr(isc_task_t *task, isc_event_t *event); -static isc_result_t zone_dump(dns_zone_t *, bool); -static void got_transfer_quota(isc_task_t *task, isc_event_t *event); -static isc_result_t zmgr_start_xfrin_ifquota(dns_zonemgr_t *zmgr, - dns_zone_t *zone); -static void zmgr_resume_xfrs(dns_zonemgr_t *zmgr, bool multi); -static void zonemgr_free(dns_zonemgr_t *zmgr); -static isc_result_t zonemgr_getio(dns_zonemgr_t *zmgr, bool high, - isc_task_t *task, isc_taskaction_t action, - void *arg, dns_io_t **iop); -static void zonemgr_putio(dns_io_t **iop); -static void zonemgr_cancelio(dns_io_t *io); -static void rss_post(dns_zone_t *, isc_event_t *); - -static isc_result_t zone_get_from_db(dns_zone_t *zone, dns_db_t *db, - unsigned int *nscount, - unsigned int *soacount, uint32_t *serial, - uint32_t *refresh, uint32_t *retry, - uint32_t *expire, uint32_t *minimum, - unsigned int *errors); - -static void zone_freedbargs(dns_zone_t *zone); -static void forward_callback(isc_task_t *task, isc_event_t *event); -static void zone_saveunique(dns_zone_t *zone, const char *path, - const char *templat); -static void zone_maintenance(dns_zone_t *zone); -static void zone_notify(dns_zone_t *zone, isc_time_t *now); -static void dump_done(void *arg, isc_result_t result); -static isc_result_t zone_signwithkey(dns_zone_t *zone, dns_secalg_t algorithm, - uint16_t keyid, bool deleteit); -static isc_result_t delete_nsec(dns_db_t *db, dns_dbversion_t *ver, - dns_dbnode_t *node, dns_name_t *name, - dns_diff_t *diff); -static void zone_rekey(dns_zone_t *zone); -static isc_result_t zone_send_securedb(dns_zone_t *zone, dns_db_t *db); -static void setrl(isc_ratelimiter_t *rl, unsigned int *rate, - unsigned int value); +static void +queue_xfrin(dns_zone_t *zone); +static isc_result_t +update_one_rr(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, + dns_diffop_t op, dns_name_t *name, dns_ttl_t ttl, + dns_rdata_t *rdata); +static void +zone_unload(dns_zone_t *zone); +static void +zone_expire(dns_zone_t *zone); +static void +zone_iattach(dns_zone_t *source, dns_zone_t **target); +static void +zone_idetach(dns_zone_t **zonep); +static isc_result_t +zone_replacedb(dns_zone_t *zone, dns_db_t *db, bool dump); +static inline void +zone_attachdb(dns_zone_t *zone, dns_db_t *db); +static inline void +zone_detachdb(dns_zone_t *zone); +static isc_result_t +default_journal(dns_zone_t *zone); +static void +zone_xfrdone(dns_zone_t *zone, isc_result_t result); +static isc_result_t +zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, + isc_result_t result); +static void +zone_needdump(dns_zone_t *zone, unsigned int delay); +static void +zone_shutdown(isc_task_t *, isc_event_t *); +static void +zone_loaddone(void *arg, isc_result_t result); +static isc_result_t +zone_startload(dns_db_t *db, dns_zone_t *zone, isc_time_t loadtime); +static void +zone_namerd_tostr(dns_zone_t *zone, char *buf, size_t length); +static void +zone_name_tostr(dns_zone_t *zone, char *buf, size_t length); +static void +zone_rdclass_tostr(dns_zone_t *zone, char *buf, size_t length); +static void +zone_viewname_tostr(dns_zone_t *zone, char *buf, size_t length); +static isc_result_t +zone_send_secureserial(dns_zone_t *zone, uint32_t serial); +static void +refresh_callback(isc_task_t *, isc_event_t *); +static void +stub_callback(isc_task_t *, isc_event_t *); +static void +queue_soa_query(dns_zone_t *zone); +static void +soa_query(isc_task_t *, isc_event_t *); +static void +ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub); +static int +message_count(dns_message_t *msg, dns_section_t section, dns_rdatatype_t type); +static void +notify_cancel(dns_zone_t *zone); +static void +notify_find_address(dns_notify_t *notify); +static void +notify_send(dns_notify_t *notify); +static isc_result_t +notify_createmessage(dns_zone_t *zone, unsigned int flags, + dns_message_t **messagep); +static void +notify_done(isc_task_t *task, isc_event_t *event); +static void +notify_send_toaddr(isc_task_t *task, isc_event_t *event); +static isc_result_t +zone_dump(dns_zone_t *, bool); +static void +got_transfer_quota(isc_task_t *task, isc_event_t *event); +static isc_result_t +zmgr_start_xfrin_ifquota(dns_zonemgr_t *zmgr, dns_zone_t *zone); +static void +zmgr_resume_xfrs(dns_zonemgr_t *zmgr, bool multi); +static void +zonemgr_free(dns_zonemgr_t *zmgr); +static isc_result_t +zonemgr_getio(dns_zonemgr_t *zmgr, bool high, isc_task_t *task, + isc_taskaction_t action, void *arg, dns_io_t **iop); +static void +zonemgr_putio(dns_io_t **iop); +static void +zonemgr_cancelio(dns_io_t *io); +static void +rss_post(dns_zone_t *, isc_event_t *); + +static isc_result_t +zone_get_from_db(dns_zone_t *zone, dns_db_t *db, unsigned int *nscount, + unsigned int *soacount, uint32_t *serial, uint32_t *refresh, + uint32_t *retry, uint32_t *expire, uint32_t *minimum, + unsigned int *errors); + +static void +zone_freedbargs(dns_zone_t *zone); +static void +forward_callback(isc_task_t *task, isc_event_t *event); +static void +zone_saveunique(dns_zone_t *zone, const char *path, const char *templat); +static void +zone_maintenance(dns_zone_t *zone); +static void +zone_notify(dns_zone_t *zone, isc_time_t *now); +static void +dump_done(void *arg, isc_result_t result); +static isc_result_t +zone_signwithkey(dns_zone_t *zone, dns_secalg_t algorithm, uint16_t keyid, + bool deleteit); +static isc_result_t +delete_nsec(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node, + dns_name_t *name, dns_diff_t *diff); +static void +zone_rekey(dns_zone_t *zone); +static isc_result_t +zone_send_securedb(dns_zone_t *zone, dns_db_t *db); +static void +setrl(isc_ratelimiter_t *rl, unsigned int *rate, unsigned int value); #define ENTER zone_debuglog(zone, me, 1, "enter") diff --git a/lib/dns/zone_p.h b/lib/dns/zone_p.h index f409a29999cc613847d8d4e4a7626a484fe11920..64385473b072753ff60365923b59c2f3111d8f0c 100644 --- a/lib/dns/zone_p.h +++ b/lib/dns/zone_p.h @@ -25,7 +25,7 @@ ISC_LANG_BEGINDECLS typedef struct { dns_diff_t *diff; - bool offline; + bool offline; } dns__zonediff_t; isc_result_t diff --git a/lib/dns/zt.c b/lib/dns/zt.c index 997b4f4488a6f779c672d8a90ea344bfab0249da..53e491be943f7cef87650ef574f19fe2ca3acc3a 100644 --- a/lib/dns/zt.c +++ b/lib/dns/zt.c @@ -58,16 +58,20 @@ struct dns_zt { #define ZTMAGIC ISC_MAGIC('Z', 'T', 'b', 'l') #define VALID_ZT(zt) ISC_MAGIC_VALID(zt, ZTMAGIC) -static void auto_detach(void *, void *); +static void +auto_detach(void *, void *); -static isc_result_t load(dns_zone_t *zone, void *uap); +static isc_result_t +load(dns_zone_t *zone, void *uap); -static isc_result_t asyncload(dns_zone_t *zone, void *callback); +static isc_result_t +asyncload(dns_zone_t *zone, void *callback); -static isc_result_t freezezones(dns_zone_t *zone, void *uap); +static isc_result_t +freezezones(dns_zone_t *zone, void *uap); -static isc_result_t doneloading(dns_zt_t *zt, dns_zone_t *zone, - isc_task_t *task); +static isc_result_t +doneloading(dns_zt_t *zt, dns_zone_t *zone, isc_task_t *task); isc_result_t dns_zt_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, dns_zt_t **ztp) { diff --git a/lib/irs/getaddrinfo.c b/lib/irs/getaddrinfo.c index 707386ab2691c5a23ad9e04986e733f5ddd32f7a..ff8bfab3e09f13de20d316c633b681e6851a7d2d 100644 --- a/lib/irs/getaddrinfo.c +++ b/lib/irs/getaddrinfo.c @@ -160,24 +160,30 @@ /*! \struct addrinfo */ -static struct addrinfo *ai_concat(struct addrinfo *ai1, struct addrinfo *ai2), +static struct addrinfo * +ai_concat(struct addrinfo *ai1, struct addrinfo *ai2), *ai_reverse(struct addrinfo *oai), *ai_clone(struct addrinfo *oai, int family), *ai_alloc(int family, int addrlen); #ifdef AF_LOCAL -static int get_local(const char *name, int socktype, struct addrinfo **res); +static int +get_local(const char *name, int socktype, struct addrinfo **res); #endif /* ifdef AF_LOCAL */ -static int resolve_name(int family, const char *hostname, int flags, - struct addrinfo **aip, int socktype, int port); +static int +resolve_name(int family, const char *hostname, int flags, struct addrinfo **aip, + int socktype, int port); -static int add_ipv4(const char *hostname, int flags, struct addrinfo **aip, - int socktype, int port); -static int add_ipv6(const char *hostname, int flags, struct addrinfo **aip, - int socktype, int port); -static void set_order(int, int (**)(const char *, int, struct addrinfo **, int, - int)); -static void _freeaddrinfo(struct addrinfo *ai); +static int +add_ipv4(const char *hostname, int flags, struct addrinfo **aip, int socktype, + int port); +static int +add_ipv6(const char *hostname, int flags, struct addrinfo **aip, int socktype, + int port); +static void +set_order(int, int (**)(const char *, int, struct addrinfo **, int, int)); +static void +_freeaddrinfo(struct addrinfo *ai); #define FOUND_IPV4 0x1 #define FOUND_IPV6 0x2 diff --git a/lib/irs/resconf.c b/lib/irs/resconf.c index 2511c91a07d4c90065ee7df0fb63b8565929a296..36dea5720d404bfdaf3ae5ee839e4f029250fd74 100644 --- a/lib/irs/resconf.c +++ b/lib/irs/resconf.c @@ -115,14 +115,20 @@ struct irs_resconf { uint8_t ndots; }; -static isc_result_t resconf_parsenameserver(irs_resconf_t *conf, FILE *fp); -static isc_result_t resconf_parsedomain(irs_resconf_t *conf, FILE *fp); -static isc_result_t resconf_parsesearch(irs_resconf_t *conf, FILE *fp); -static isc_result_t resconf_parsesortlist(irs_resconf_t *conf, FILE *fp); -static isc_result_t resconf_parseoption(irs_resconf_t *ctx, FILE *fp); +static isc_result_t +resconf_parsenameserver(irs_resconf_t *conf, FILE *fp); +static isc_result_t +resconf_parsedomain(irs_resconf_t *conf, FILE *fp); +static isc_result_t +resconf_parsesearch(irs_resconf_t *conf, FILE *fp); +static isc_result_t +resconf_parsesortlist(irs_resconf_t *conf, FILE *fp); +static isc_result_t +resconf_parseoption(irs_resconf_t *ctx, FILE *fp); #if HAVE_GET_WIN32_NAMESERVERS -static isc_result_t get_win32_nameservers(irs_resconf_t *conf); +static isc_result_t +get_win32_nameservers(irs_resconf_t *conf); #endif /* if HAVE_GET_WIN32_NAMESERVERS */ /*! diff --git a/lib/irs/win32/include/irs/netdb.h b/lib/irs/win32/include/irs/netdb.h index be632eb073bbaef353ad26da7132d83c123ada26..8061c92a1a5097fccf7d5f45b5dab41d39d6ccb2 100644 --- a/lib/irs/win32/include/irs/netdb.h +++ b/lib/irs/win32/include/irs/netdb.h @@ -23,15 +23,15 @@ #ifdef ISC_IRS_NEEDADDRINFO struct addrinfo { - int ai_flags; /* AI_PASSIVE, AI_CANONNAME */ - int ai_family; /* PF_xxx */ - int ai_socktype; /* SOCK_xxx */ - int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and - * IPv6 */ - size_t ai_addrlen; /* Length of ai_addr */ - char * ai_canonname; /* Canonical name for hostname */ - struct sockaddr *ai_addr; /* Binary address */ - struct addrinfo *ai_next; /* Next structure in linked list */ + int ai_flags; /* AI_PASSIVE, AI_CANONNAME */ + int ai_family; /* PF_xxx */ + int ai_socktype; /* SOCK_xxx */ + int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and + * IPv6 */ + size_t ai_addrlen; /* Length of ai_addr */ + char *ai_canonname; /* Canonical name for hostname */ + struct sockaddr *ai_addr; /* Binary address */ + struct addrinfo *ai_next; /* Next structure in linked list */ }; #endif /* ifdef ISC_IRS_NEEDADDRINFO */ diff --git a/lib/isc/assertions.c b/lib/isc/assertions.c index b413fc5129f38a6403ea88285833517d5df5df70..21ca21b638b06606d36f00633040cf85b5e072bc 100644 --- a/lib/isc/assertions.c +++ b/lib/isc/assertions.c @@ -29,8 +29,8 @@ /*% * Forward. */ -static void default_callback(const char *, int, isc_assertiontype_t, - const char *); +static void +default_callback(const char *, int, isc_assertiontype_t, const char *); static isc_assertioncallback_t isc_assertion_failed_cb = default_callback; diff --git a/lib/isc/backtrace.c b/lib/isc/backtrace.c index c3570b462fb239c0439e2c205bdc23cb8833161f..d0a52ae36494576304f27276d6e4b6491dbb6a95 100644 --- a/lib/isc/backtrace.c +++ b/lib/isc/backtrace.c @@ -80,8 +80,10 @@ isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) { return (ISC_R_SUCCESS); } #elif defined(BACKTRACE_GCC) -extern int _Unwind_Backtrace(void *fn, void *a); -extern void *_Unwind_GetIP(void *ctx); +extern int +_Unwind_Backtrace(void *fn, void *a); +extern void * +_Unwind_GetIP(void *ctx); typedef struct { void **result; diff --git a/lib/isc/base32.c b/lib/isc/base32.c index a140ed1d456204d17bd0fff07c67209ce64ea3a2..2c4698413ace0543740629254149ca7016967a61 100644 --- a/lib/isc/base32.c +++ b/lib/isc/base32.c @@ -32,10 +32,11 @@ * These static functions are also present in lib/dns/rdata.c. I'm not * sure where they should go. -- bwelling */ -static isc_result_t str_totext(const char *source, isc_buffer_t *target); +static isc_result_t +str_totext(const char *source, isc_buffer_t *target); -static isc_result_t mem_tobuffer(isc_buffer_t *target, void *base, - unsigned int length); +static isc_result_t +mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length); /*@}*/ diff --git a/lib/isc/base64.c b/lib/isc/base64.c index 70e025cc28299b7c7283cd6d488b001c9f48a915..b940471bc542fca72d4a68c546f06aee1dd6aa7b 100644 --- a/lib/isc/base64.c +++ b/lib/isc/base64.c @@ -31,10 +31,11 @@ * These static functions are also present in lib/dns/rdata.c. I'm not * sure where they should go. -- bwelling */ -static isc_result_t str_totext(const char *source, isc_buffer_t *target); +static isc_result_t +str_totext(const char *source, isc_buffer_t *target); -static isc_result_t mem_tobuffer(isc_buffer_t *target, void *base, - unsigned int length); +static isc_result_t +mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length); static const char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvw" "xyz0123456789+/="; diff --git a/lib/isc/error.c b/lib/isc/error.c index 17675569d2a878f7ced5864880ef48bf7236121d..cff4abdd20daba78fc3a3152163ba91b7524f71e 100644 --- a/lib/isc/error.c +++ b/lib/isc/error.c @@ -18,11 +18,13 @@ #include /*% Default unexpected callback. */ -static void default_unexpected_callback(const char *, int, const char *, - va_list) ISC_FORMAT_PRINTF(3, 0); +static void +default_unexpected_callback(const char *, int, const char *, va_list) + ISC_FORMAT_PRINTF(3, 0); /*% Default fatal callback. */ -static void default_fatal_callback(const char *, int, const char *, va_list) +static void +default_fatal_callback(const char *, int, const char *, va_list) ISC_FORMAT_PRINTF(3, 0); /*% unexpected_callback */ diff --git a/lib/isc/hex.c b/lib/isc/hex.c index 95a2d1d95710b709066141332385831ba4fe368e..b64a470d2737ba4a8b13b115a478cbc0b2e65bc0 100644 --- a/lib/isc/hex.c +++ b/lib/isc/hex.c @@ -30,10 +30,11 @@ /* * BEW: These static functions are copied from lib/dns/rdata.c. */ -static isc_result_t str_totext(const char *source, isc_buffer_t *target); +static isc_result_t +str_totext(const char *source, isc_buffer_t *target); -static isc_result_t mem_tobuffer(isc_buffer_t *target, void *base, - unsigned int length); +static isc_result_t +mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length); static const char hex[] = "0123456789ABCDEF"; diff --git a/lib/isc/httpd.c b/lib/isc/httpd.c index 855a1ed2ce91b4dc06bdbc4cc0559eafdd20324d..9b7b32dd3d1fddd5a28a1c3c10d8dfab091985ab 100644 --- a/lib/isc/httpd.c +++ b/lib/isc/httpd.c @@ -197,12 +197,18 @@ struct isc_httpdmgr { #define ISC_HTTPD_SETSEND(c) ((c)->state = ISC_HTTPD_STATESEND) #define ISC_HTTPD_SETSENDDONE(c) ((c)->state = ISC_HTTPD_STATESENDDONE) -static void isc_httpd_accept(isc_task_t *, isc_event_t *); -static void isc_httpd_recvdone(isc_task_t *, isc_event_t *); -static void isc_httpd_senddone(isc_task_t *, isc_event_t *); -static isc_result_t process_request(isc_httpd_t *, int); -static isc_result_t grow_headerspace(isc_httpd_t *); -static void reset_client(isc_httpd_t *httpd); +static void +isc_httpd_accept(isc_task_t *, isc_event_t *); +static void +isc_httpd_recvdone(isc_task_t *, isc_event_t *); +static void +isc_httpd_senddone(isc_task_t *, isc_event_t *); +static isc_result_t +process_request(isc_httpd_t *, int); +static isc_result_t +grow_headerspace(isc_httpd_t *); +static void +reset_client(isc_httpd_t *httpd); static isc_httpdaction_t render_404; static isc_httpdaction_t render_500; @@ -211,13 +217,19 @@ static isc_httpdaction_t render_500; static void (*finishhook)(void) = NULL; #endif /* ENABLE_AFL */ -static void maybe_destroy_httpd(isc_httpd_t *); -static void destroy_httpd(isc_httpd_t *); -static void maybe_destroy_httpdmgr(isc_httpdmgr_t *); -static void destroy_httpdmgr(isc_httpdmgr_t *); +static void +maybe_destroy_httpd(isc_httpd_t *); +static void +destroy_httpd(isc_httpd_t *); +static void +maybe_destroy_httpdmgr(isc_httpdmgr_t *); +static void +destroy_httpdmgr(isc_httpdmgr_t *); -static void isc_httpdmgr_attach(isc_httpdmgr_t *, isc_httpdmgr_t **); -static void isc_httpdmgr_detach(isc_httpdmgr_t **); +static void +isc_httpdmgr_attach(isc_httpdmgr_t *, isc_httpdmgr_t **); +static void +isc_httpdmgr_detach(isc_httpdmgr_t **); static void maybe_destroy_httpd(isc_httpd_t *httpd) { diff --git a/lib/isc/log.c b/lib/isc/log.c index ac6d735324e2a0f4e9360b971d5564301da1cd3a..bb2cf59b57e6ae4df5bb2a71fa46178819f1c023 100644 --- a/lib/isc/log.c +++ b/lib/isc/log.c @@ -196,20 +196,20 @@ LIBISC_EXTERNAL_DATA isc_log_t *isc_lctx = NULL; /*! * Forward declarations. */ -static isc_result_t assignchannel(isc_logconfig_t *lcfg, - unsigned int category_id, - const isc_logmodule_t *module, - isc_logchannel_t *channel); +static isc_result_t +assignchannel(isc_logconfig_t *lcfg, unsigned int category_id, + const isc_logmodule_t *module, isc_logchannel_t *channel); -static isc_result_t sync_channellist(isc_logconfig_t *lcfg); +static isc_result_t +sync_channellist(isc_logconfig_t *lcfg); -static isc_result_t greatest_version(isc_logfile_t *file, int versions, - int *greatest); +static isc_result_t +greatest_version(isc_logfile_t *file, int versions, int *greatest); -static void isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category, - isc_logmodule_t *module, int level, bool write_once, - const char *format, va_list args) - ISC_FORMAT_PRINTF(6, 0); +static void +isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category, + isc_logmodule_t *module, int level, bool write_once, + const char *format, va_list args) ISC_FORMAT_PRINTF(6, 0); /*@{*/ /*! diff --git a/lib/isc/mem.c b/lib/isc/mem.c index 401aa2bd8fd027231942117427b673ec1bd16a64..8a78c6be85ec52e694b9de6af75ee2279fd9de1a 100644 --- a/lib/isc/mem.c +++ b/lib/isc/mem.c @@ -227,18 +227,25 @@ struct isc__mempool { delete_trace_entry(a, b, c, d, e); \ } while (0) -static void print_active(isc__mem_t *ctx, FILE *out); +static void +print_active(isc__mem_t *ctx, FILE *out); #endif /* ISC_MEM_TRACKLINES */ -static void *isc___mem_get(isc_mem_t *ctx, size_t size FLARG); -static void isc___mem_put(isc_mem_t *ctx, void *ptr, size_t size FLARG); -static void isc___mem_putanddetach(isc_mem_t **ctxp, void *ptr, - size_t size FLARG); -static void *isc___mem_allocate(isc_mem_t *ctx, size_t size FLARG); -static void *isc___mem_reallocate(isc_mem_t *ctx, void *ptr, size_t size FLARG); -static char *isc___mem_strdup(isc_mem_t *mctx, const char *s FLARG); -static void isc___mem_free(isc_mem_t *ctx, void *ptr FLARG); +static void * +isc___mem_get(isc_mem_t *ctx, size_t size FLARG); +static void +isc___mem_put(isc_mem_t *ctx, void *ptr, size_t size FLARG); +static void +isc___mem_putanddetach(isc_mem_t **ctxp, void *ptr, size_t size FLARG); +static void * +isc___mem_allocate(isc_mem_t *ctx, size_t size FLARG); +static void * +isc___mem_reallocate(isc_mem_t *ctx, void *ptr, size_t size FLARG); +static char * +isc___mem_strdup(isc_mem_t *mctx, const char *s FLARG); +static void +isc___mem_free(isc_mem_t *ctx, void *ptr FLARG); static isc_memmethods_t memmethods = { isc___mem_get, isc___mem_put, isc___mem_putanddetach, diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h index 5e8a5ca7be2071bbb88f8301807f185346640bab..653aa01cb075dd93dd7ef9c71349d692d182ab47 100644 --- a/lib/isc/netmgr/netmgr-int.h +++ b/lib/isc/netmgr/netmgr-int.h @@ -39,25 +39,25 @@ * Single network event loop worker. */ typedef struct isc__networker { - isc_nm_t * mgr; - int id; /* thread id */ - uv_loop_t loop; /* libuv loop structure */ + isc_nm_t *mgr; + int id; /* thread id */ + uv_loop_t loop; /* libuv loop structure */ uv_async_t async; /* async channel to send * data to this networker */ - isc_mutex_t lock; + isc_mutex_t lock; isc_condition_t cond; - bool paused; - bool finished; - isc_thread_t thread; - isc_queue_t * ievents; /* incoming async events */ - isc_queue_t * ievents_prio; /* priority async events - * used for listening etc. - * can be processed while - * worker is paused */ - isc_refcount_t references; + bool paused; + bool finished; + isc_thread_t thread; + isc_queue_t *ievents; /* incoming async events */ + isc_queue_t *ievents_prio; /* priority async events + * used for listening etc. + * can be processed while + * worker is paused */ + isc_refcount_t references; atomic_int_fast64_t pktcount; - char recvbuf[65536]; - bool recvbuf_inuse; + char recvbuf[65536]; + bool recvbuf_inuse; } isc__networker_t; /* @@ -71,7 +71,7 @@ typedef struct isc__networker { typedef void (*isc__nm_closecb)(isc_nmhandle_t *); struct isc_nmhandle { - int magic; + int magic; isc_refcount_t references; /* @@ -82,8 +82,8 @@ struct isc_nmhandle { * the socket. */ isc_nmsocket_t *sock; - size_t ah_pos; /* Position in the socket's - * 'active handles' array */ + size_t ah_pos; /* Position in the socket's + * 'active handles' array */ /* * The handle is 'inflight' if netmgr is not currently processing @@ -93,12 +93,12 @@ struct isc_nmhandle { */ atomic_bool inflight; - isc_sockaddr_t peer; - isc_sockaddr_t local; + isc_sockaddr_t peer; + isc_sockaddr_t local; isc_nm_opaquecb_t doreset; /* reset extra callback, external */ isc_nm_opaquecb_t dofree; /* free extra callback, external */ - void * opaque; - char extra[]; + void *opaque; + char extra[]; }; /* @@ -140,7 +140,7 @@ typedef enum isc__netievent_type { */ typedef union { isc_nm_recv_cb_t recv; - isc_nm_cb_t accept; + isc_nm_cb_t accept; } isc__nm_readcb_t; typedef union { @@ -150,9 +150,9 @@ typedef union { typedef union { isc_nm_recv_cb_t recv; - isc_nm_cb_t accept; - isc_nm_cb_t send; - isc_nm_cb_t connect; + isc_nm_cb_t accept; + isc_nm_cb_t send; + isc_nm_cb_t connect; } isc__nm_cb_t; /* @@ -164,33 +164,33 @@ typedef union { #define VALID_UVREQ(t) ISC_MAGIC_VALID(t, UVREQ_MAGIC) typedef struct isc__nm_uvreq { - int magic; + int magic; isc_nmsocket_t *sock; isc_nmhandle_t *handle; - uv_buf_t uvbuf; /* translated isc_region_t, to be - * sent or received */ - isc_sockaddr_t local; /* local address */ - isc_sockaddr_t peer; /* peer address */ - isc__nm_cb_t cb; /* callback */ - void * cbarg; /* callback argument */ - uv_pipe_t ipc; /* used for sending socket - * uv_handles to other threads */ + uv_buf_t uvbuf; /* translated isc_region_t, to be + * sent or received */ + isc_sockaddr_t local; /* local address */ + isc_sockaddr_t peer; /* peer address */ + isc__nm_cb_t cb; /* callback */ + void *cbarg; /* callback argument */ + uv_pipe_t ipc; /* used for sending socket + * uv_handles to other threads */ union { - uv_req_t req; + uv_req_t req; uv_getaddrinfo_t getaddrinfo; uv_getnameinfo_t getnameinfo; - uv_shutdown_t shutdown; - uv_write_t write; - uv_connect_t connect; - uv_udp_send_t udp_send; - uv_fs_t fs; - uv_work_t work; + uv_shutdown_t shutdown; + uv_write_t write; + uv_connect_t connect; + uv_udp_send_t udp_send; + uv_fs_t fs; + uv_work_t work; } uv_req; } isc__nm_uvreq_t; typedef struct isc__netievent__socket { isc__netievent_type type; - isc_nmsocket_t * sock; + isc_nmsocket_t *sock; } isc__netievent__socket_t; typedef isc__netievent__socket_t isc__netievent_udplisten_t; @@ -204,8 +204,8 @@ typedef isc__netievent__socket_t isc__netievent_pauseread_t; typedef struct isc__netievent__socket_req { isc__netievent_type type; - isc_nmsocket_t * sock; - isc__nm_uvreq_t * req; + isc_nmsocket_t *sock; + isc__nm_uvreq_t *req; } isc__netievent__socket_req_t; typedef isc__netievent__socket_req_t isc__netievent_tcpconnect_t; @@ -213,8 +213,8 @@ typedef isc__netievent__socket_req_t isc__netievent_tcplisten_t; typedef isc__netievent__socket_req_t isc__netievent_tcpsend_t; typedef struct isc__netievent__socket_streaminfo { - isc__netievent_type type; - isc_nmsocket_t * sock; + isc__netievent_type type; + isc_nmsocket_t *sock; isc_uv_stream_info_t streaminfo; } isc__netievent__socket_streaminfo_t; @@ -222,17 +222,17 @@ typedef isc__netievent__socket_streaminfo_t isc__netievent_tcpchildlisten_t; typedef struct isc__netievent__socket_handle { isc__netievent_type type; - isc_nmsocket_t * sock; - isc_nmhandle_t * handle; + isc_nmsocket_t *sock; + isc_nmhandle_t *handle; } isc__netievent__socket_handle_t; typedef isc__netievent__socket_handle_t isc__netievent_closecb_t; typedef struct isc__netievent_udpsend { isc__netievent_type type; - isc_nmsocket_t * sock; - isc_sockaddr_t peer; - isc__nm_uvreq_t * req; + isc_nmsocket_t *sock; + isc_sockaddr_t peer; + isc__nm_uvreq_t *req; } isc__netievent_udpsend_t; typedef struct isc__netievent { @@ -243,10 +243,10 @@ typedef isc__netievent_t isc__netievent_shutdown_t; typedef isc__netievent_t isc__netievent_stop_t; typedef union { - isc__netievent_t ni; - isc__netievent__socket_t nis; - isc__netievent__socket_req_t nisr; - isc__netievent_udpsend_t nius; + isc__netievent_t ni; + isc__netievent__socket_t nis; + isc__netievent__socket_req_t nisr; + isc__netievent_udpsend_t nius; isc__netievent__socket_streaminfo_t niss; } isc__netievent_storage_t; @@ -257,26 +257,26 @@ typedef union { #define VALID_NM(t) ISC_MAGIC_VALID(t, NM_MAGIC) struct isc_nm { - int magic; - isc_refcount_t references; - isc_mem_t * mctx; - uint32_t nworkers; - isc_mutex_t lock; - isc_condition_t wkstatecond; + int magic; + isc_refcount_t references; + isc_mem_t *mctx; + uint32_t nworkers; + isc_mutex_t lock; + isc_condition_t wkstatecond; isc__networker_t *workers; isc_stats_t *stats; isc_mempool_t *reqpool; - isc_mutex_t reqlock; + isc_mutex_t reqlock; isc_mempool_t *evpool; - isc_mutex_t evlock; + isc_mutex_t evlock; atomic_uint_fast32_t workers_running; atomic_uint_fast32_t workers_paused; atomic_uint_fast32_t maxudp; - atomic_bool paused; + atomic_bool paused; /* * Acive connections are being closed and new connections are @@ -339,10 +339,10 @@ enum { STATID_OPEN = 0, struct isc_nmsocket { /*% Unlocked, RO */ - int magic; - int tid; + int magic; + int tid; isc_nmsocket_type type; - isc_nm_t * mgr; + isc_nm_t *mgr; /*% Parent socket for multithreaded listeners */ isc_nmsocket_t *parent; /*% Listener socket this connection was accepted on */ @@ -356,7 +356,7 @@ struct isc_nmsocket { */ isc_quota_t *quota; isc_quota_t *pquota; - bool overquota; + bool overquota; /*% * Socket statistics @@ -367,8 +367,8 @@ struct isc_nmsocket { * TCP read timeout timer. */ uv_timer_t timer; - bool timer_initialized; - uint64_t read_timeout; + bool timer_initialized; + uint64_t read_timeout; /*% outer socket is for 'wrapped' sockets - e.g. tcpdns in tcp */ isc_nmsocket_t *outer; @@ -378,8 +378,8 @@ struct isc_nmsocket { /*% Child sockets for multi-socket setups */ isc_nmsocket_t *children; - int nchildren; - isc_nmiface_t * iface; + int nchildren; + isc_nmiface_t *iface; isc_nmhandle_t *tcphandle; /*% Extra data allocated at the end of each isc_nmhandle_t */ @@ -389,7 +389,7 @@ struct isc_nmsocket { int backlog; /*% libuv data */ - uv_os_sock_t fd; + uv_os_sock_t fd; union uv_any_handle uv_handle; /*% Peer address */ @@ -413,9 +413,9 @@ struct isc_nmsocket { * If active==false but closed==false, that means the socket * is closing. */ - atomic_bool closed; - atomic_bool listening; - atomic_bool listen_error; + atomic_bool closed; + atomic_bool listening; + atomic_bool listen_error; isc_refcount_t references; /*% @@ -459,7 +459,7 @@ struct isc_nmsocket { * for the number of running children to reach zero during * shutdown. */ - isc_mutex_t lock; + isc_mutex_t lock; isc_condition_t cond; /*% @@ -489,13 +489,13 @@ struct isc_nmsocket { * future. */ atomic_int_fast32_t ah; - size_t ah_size; - size_t * ah_frees; - isc_nmhandle_t ** ah_handles; + size_t ah_size; + size_t *ah_frees; + isc_nmhandle_t **ah_handles; /*% Buffer for TCPDNS processing */ - size_t buf_size; - size_t buf_len; + size_t buf_size; + size_t buf_len; unsigned char *buf; /*% @@ -506,10 +506,10 @@ struct isc_nmsocket { isc_nm_opaquecb_t closehandle_cb; isc__nm_readcb_t rcb; - void * rcbarg; + void *rcbarg; isc__nm_cb_t accept_cb; - void * accept_cbarg; + void *accept_cbarg; }; bool diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c index 1dadc524cff7f9d9fb73c70b4625a72019a96302..d4a4730eb6a46305e3fd0ba68ff7c16e3e0bd714 100644 --- a/lib/isc/netmgr/netmgr.c +++ b/lib/isc/netmgr/netmgr.c @@ -111,11 +111,16 @@ static const isc_statscounter_t unixstatsindex[] = { ISC_THREAD_LOCAL int isc__nm_tid_v = ISC_NETMGR_TID_UNKNOWN; -static void nmsocket_maybe_destroy(isc_nmsocket_t *sock); -static void nmhandle_free(isc_nmsocket_t *sock, isc_nmhandle_t *handle); -static isc_threadresult_t nm_thread(isc_threadarg_t worker0); -static void async_cb(uv_async_t *handle); -static void process_queue(isc__networker_t *worker, isc_queue_t *queue); +static void +nmsocket_maybe_destroy(isc_nmsocket_t *sock); +static void +nmhandle_free(isc_nmsocket_t *sock, isc_nmhandle_t *handle); +static isc_threadresult_t +nm_thread(isc_threadarg_t worker0); +static void +async_cb(uv_async_t *handle); +static void +process_queue(isc__networker_t *worker, isc_queue_t *queue); int isc_nm_tid() { diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c index 830453930f1bd63d311e371cbd2c5f5525d6877a..6abffa3ce584da2ab04c09644ff756fd8b03b327 100644 --- a/lib/isc/netmgr/tcp.c +++ b/lib/isc/netmgr/tcp.c @@ -32,21 +32,30 @@ #include "netmgr-int.h" #include "uv-compat.h" -static int tcp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req); +static int +tcp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req); -static void tcp_close_direct(isc_nmsocket_t *sock); +static void +tcp_close_direct(isc_nmsocket_t *sock); -static isc_result_t tcp_send_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req); -static void tcp_connect_cb(uv_connect_t *uvreq, int status); +static isc_result_t +tcp_send_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req); +static void +tcp_connect_cb(uv_connect_t *uvreq, int status); -static void tcp_connection_cb(uv_stream_t *server, int status); +static void +tcp_connection_cb(uv_stream_t *server, int status); -static void read_cb(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf); +static void +read_cb(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf); -static void tcp_close_cb(uv_handle_t *uvhandle); +static void +tcp_close_cb(uv_handle_t *uvhandle); -static void stoplistening(isc_nmsocket_t *sock); -static void tcp_listenclose_cb(uv_handle_t *handle); +static void +stoplistening(isc_nmsocket_t *sock); +static void +tcp_listenclose_cb(uv_handle_t *handle); static int tcp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) { diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c index 79650281e627e1d29821ed8ccd0702b23171380a..fecfb47babe1ea696ffe3b26e8f31b66454d64d5 100644 --- a/lib/isc/netmgr/tcpdns.c +++ b/lib/isc/netmgr/tcpdns.c @@ -37,10 +37,11 @@ * changed in the future. */ -static void dnslisten_readcb(isc_nmhandle_t *handle, isc_region_t *region, - void *arg); +static void +dnslisten_readcb(isc_nmhandle_t *handle, isc_region_t *region, void *arg); -static void resume_processing(void *arg); +static void +resume_processing(void *arg); static inline size_t dnslen(unsigned char *base) { diff --git a/lib/isc/netmgr/udp.c b/lib/isc/netmgr/udp.c index 2e0773a3d494ecdf3487c03e596e8083d7326448..6e229e1eea66efbfb54adefc02563835929f2ed7 100644 --- a/lib/isc/netmgr/udp.c +++ b/lib/isc/netmgr/udp.c @@ -29,13 +29,16 @@ #include "netmgr-int.h" #include "uv-compat.h" -static isc_result_t udp_send_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req, - isc_sockaddr_t *peer); +static isc_result_t +udp_send_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req, + isc_sockaddr_t *peer); -static void udp_recv_cb(uv_udp_t *handle, ssize_t nrecv, const uv_buf_t *buf, - const struct sockaddr *addr, unsigned flags); +static void +udp_recv_cb(uv_udp_t *handle, ssize_t nrecv, const uv_buf_t *buf, + const struct sockaddr *addr, unsigned flags); -static void udp_send_cb(uv_udp_send_t *req, int status); +static void +udp_send_cb(uv_udp_send_t *req, int status); isc_result_t isc_nm_listenudp(isc_nm_t *mgr, isc_nmiface_t *iface, isc_nm_recv_cb_t cb, diff --git a/lib/isc/netmgr/uv-compat.c b/lib/isc/netmgr/uv-compat.c index 9e75538f8a138a75d4912a910d92545e6b3e9d22..4e5531bda227e98462c5e671473fc02609d1b957 100644 --- a/lib/isc/netmgr/uv-compat.c +++ b/lib/isc/netmgr/uv-compat.c @@ -41,12 +41,14 @@ typedef struct { * libuv hasn't changed. */ -int uv__tcp_xfer_import(uv_tcp_t *tcp, uv__ipc_socket_xfer_type_t xfer_type, - uv__ipc_socket_xfer_info_t *xfer_info); +int +uv__tcp_xfer_import(uv_tcp_t *tcp, uv__ipc_socket_xfer_type_t xfer_type, + uv__ipc_socket_xfer_info_t *xfer_info); -int uv__tcp_xfer_export(uv_tcp_t *handle, int target_pid, - uv__ipc_socket_xfer_type_t *xfer_type, - uv__ipc_socket_xfer_info_t *xfer_info); +int +uv__tcp_xfer_export(uv_tcp_t *handle, int target_pid, + uv__ipc_socket_xfer_type_t *xfer_type, + uv__ipc_socket_xfer_info_t *xfer_info); int isc_uv_export(uv_stream_t *stream, isc_uv_stream_info_t *info) { diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c index 3258c1ed9c6b4d8bfb32496aefd4251b575b577e..f39cfaae915faa6bc44d91d8a3af97b9874075ac 100644 --- a/lib/isc/pk11.c +++ b/lib/isc/pk11.c @@ -82,16 +82,22 @@ static pk11_token_t *best_dh_token; static pk11_token_t *best_ecdsa_token; static pk11_token_t *best_eddsa_token; -static isc_result_t free_all_sessions(void); -static isc_result_t free_session_list(pk11_sessionlist_t *slist); -static isc_result_t setup_session(pk11_session_t *sp, pk11_token_t *token, - bool rw); -static void scan_slots(void); -static isc_result_t token_login(pk11_session_t *sp); -static char *percent_decode(char *x, size_t *len); -static bool pk11strcmp(const char *x, size_t lenx, const char *y, size_t leny); -static CK_ATTRIBUTE *push_attribute(pk11_object_t *obj, isc_mem_t *mctx, - size_t len); +static isc_result_t +free_all_sessions(void); +static isc_result_t +free_session_list(pk11_sessionlist_t *slist); +static isc_result_t +setup_session(pk11_session_t *sp, pk11_token_t *token, bool rw); +static void +scan_slots(void); +static isc_result_t +token_login(pk11_session_t *sp); +static char * +percent_decode(char *x, size_t *len); +static bool +pk11strcmp(const char *x, size_t lenx, const char *y, size_t leny); +static CK_ATTRIBUTE * +push_attribute(pk11_object_t *obj, isc_mem_t *mctx, size_t len); static isc_mutex_t alloclock; static isc_mutex_t sessionlock; diff --git a/lib/isc/pthreads/include/isc/mutex.h b/lib/isc/pthreads/include/isc/mutex.h index d4488e2876aca11328ec5733eea5ec90fa3080ee..4efa0303cb099d45289721fc05430b5c21e76f0b 100644 --- a/lib/isc/pthreads/include/isc/mutex.h +++ b/lib/isc/pthreads/include/isc/mutex.h @@ -52,7 +52,7 @@ extern pthread_mutexattr_t isc__mutex_attrs; typedef struct isc_mutexstats isc_mutexstats_t; typedef struct { - pthread_mutex_t mutex; /*%< The actual mutex. */ + pthread_mutex_t mutex; /*%< The actual mutex. */ isc_mutexstats_t *stats; /*%< Mutex statistics. */ } isc_mutex_t; #else /* if ISC_MUTEX_PROFILE */ diff --git a/lib/isc/pthreads/include/isc/thread.h b/lib/isc/pthreads/include/isc/thread.h index 79f3e96ce2cbfcf1bc1890cd4ac68f78c1e00296..89cd2637c7657af17cc09658188845a042b63b89 100644 --- a/lib/isc/pthreads/include/isc/thread.h +++ b/lib/isc/pthreads/include/isc/thread.h @@ -26,8 +26,8 @@ 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/radix.c b/lib/isc/radix.c index f11c20fd3c06a5cd8a88484ff96bf12d9469d361..72416a61a5982a32e3d232132012cba51bd51e46 100644 --- a/lib/isc/radix.c +++ b/lib/isc/radix.c @@ -24,17 +24,21 @@ #define BIT_TEST(f, b) (((f) & (b)) != 0) -static isc_result_t _new_prefix(isc_mem_t *mctx, isc_prefix_t **target, - int family, void *dest, int bitlen); +static isc_result_t +_new_prefix(isc_mem_t *mctx, isc_prefix_t **target, int family, void *dest, + int bitlen); -static void _deref_prefix(isc_prefix_t *prefix); +static void +_deref_prefix(isc_prefix_t *prefix); -static isc_result_t _ref_prefix(isc_mem_t *mctx, isc_prefix_t **target, - isc_prefix_t *prefix); +static isc_result_t +_ref_prefix(isc_mem_t *mctx, isc_prefix_t **target, isc_prefix_t *prefix); -static int _comp_with_mask(void *addr, void *dest, u_int mask); +static int +_comp_with_mask(void *addr, void *dest, u_int mask); -static void _clear_radix(isc_radix_tree_t *radix, isc_radix_destroyfunc_t func); +static void +_clear_radix(isc_radix_tree_t *radix, isc_radix_destroyfunc_t func); static isc_result_t _new_prefix(isc_mem_t *mctx, isc_prefix_t **target, int family, void *dest, diff --git a/lib/isc/ratelimiter.c b/lib/isc/ratelimiter.c index 64338fd2e615e317004b34a874ffc51340dd3828..3c067ba752eeb35b4cec82b479cbc3e9ece4d677 100644 --- a/lib/isc/ratelimiter.c +++ b/lib/isc/ratelimiter.c @@ -45,9 +45,11 @@ struct isc_ratelimiter { #define ISC_RATELIMITEREVENT_SHUTDOWN (ISC_EVENTCLASS_RATELIMITER + 1) -static void ratelimiter_tick(isc_task_t *task, isc_event_t *event); +static void +ratelimiter_tick(isc_task_t *task, isc_event_t *event); -static void ratelimiter_shutdowncomplete(isc_task_t *task, isc_event_t *event); +static void +ratelimiter_shutdowncomplete(isc_task_t *task, isc_event_t *event); isc_result_t isc_ratelimiter_create(isc_mem_t *mctx, isc_timermgr_t *timermgr, diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c index 3f2b0e1072d6248dff1a7994d6652f1d2c231b8c..f6dc7d87cdff51a81517872a2fb8fb2b6fc6e98a 100644 --- a/lib/isc/rwlock.c +++ b/lib/isc/rwlock.c @@ -165,7 +165,8 @@ isc_rwlock_destroy(isc_rwlock_t *rwl) { #define isc_rwlock_pause() #endif /* if defined(_MSC_VER) */ -static isc_result_t isc__rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type); +static isc_result_t +isc__rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type); #ifdef ISC_RWLOCK_TRACE #include /* Required for fprintf/stderr. */ diff --git a/lib/isc/task.c b/lib/isc/task.c index 1a542179ad6ca8843b791cc09765e3b90116814c..6d94da626391914e9656e282893b36c9a00ebce7 100644 --- a/lib/isc/task.c +++ b/lib/isc/task.c @@ -188,8 +188,10 @@ struct isc__taskmgr { isc__task_t *excl; }; -void isc__taskmgr_pause(isc_taskmgr_t *manager0); -void isc__taskmgr_resume(isc_taskmgr_t *manager0); +void +isc__taskmgr_pause(isc_taskmgr_t *manager0); +void +isc__taskmgr_resume(isc_taskmgr_t *manager0); #define DEFAULT_DEFAULT_QUANTUM 25 #define FINISHED(m) \ @@ -202,17 +204,23 @@ void isc__taskmgr_resume(isc_taskmgr_t *manager0); * unit tests etc. */ -bool isc_task_purgeevent(isc_task_t *task0, isc_event_t *event); -void isc_taskmgr_setexcltask(isc_taskmgr_t *mgr0, isc_task_t *task0); -isc_result_t isc_taskmgr_excltask(isc_taskmgr_t *mgr0, isc_task_t **taskp); -static inline bool empty_readyq(isc__taskmgr_t *manager, int c); +bool +isc_task_purgeevent(isc_task_t *task0, isc_event_t *event); +void +isc_taskmgr_setexcltask(isc_taskmgr_t *mgr0, isc_task_t *task0); +isc_result_t +isc_taskmgr_excltask(isc_taskmgr_t *mgr0, isc_task_t **taskp); +static inline bool +empty_readyq(isc__taskmgr_t *manager, int c); -static inline isc__task_t *pop_readyq(isc__taskmgr_t *manager, int c); +static inline isc__task_t * +pop_readyq(isc__taskmgr_t *manager, int c); -static inline void push_readyq(isc__taskmgr_t *manager, isc__task_t *task, - int c); +static inline void +push_readyq(isc__taskmgr_t *manager, isc__task_t *task, int c); -static inline void wake_all_queues(isc__taskmgr_t *manager); +static inline void +wake_all_queues(isc__taskmgr_t *manager); /*** *** Tasks. diff --git a/lib/isc/tests/aes_test.c b/lib/isc/tests/aes_test.c index 96a51cf2950a4ee564a4a8565131748caf5f7b15..e805ee23a9e1639670d237eef3a886ff147cf4e2 100644 --- a/lib/isc/tests/aes_test.c +++ b/lib/isc/tests/aes_test.c @@ -33,9 +33,11 @@ * Test data from NIST KAT */ -isc_result_t tohexstr(unsigned char *d, char *out); +isc_result_t +tohexstr(unsigned char *d, char *out); -size_t fromhexstr(const char *in, unsigned char *d); +size_t +fromhexstr(const char *in, unsigned char *d); unsigned char plaintext[3 * ISC_AES_BLOCK_LENGTH]; unsigned char ciphertext[ISC_AES_BLOCK_LENGTH]; diff --git a/lib/isc/tests/isctest.h b/lib/isc/tests/isctest.h index 8d748bca30577ba8b0af944082c9f6783affa059..a1607070d22e79f9136fd6eda1a3a55bddda3189 100644 --- a/lib/isc/tests/isctest.h +++ b/lib/isc/tests/isctest.h @@ -33,13 +33,13 @@ goto cleanup; \ } while (0) -extern isc_mem_t * test_mctx; -extern isc_log_t * test_lctx; -extern isc_taskmgr_t * taskmgr; -extern isc_timermgr_t * timermgr; +extern isc_mem_t *test_mctx; +extern isc_log_t *test_lctx; +extern isc_taskmgr_t *taskmgr; +extern isc_timermgr_t *timermgr; extern isc_socketmgr_t *socketmgr; -extern isc_nm_t * netmgr; -extern int ncpus; +extern isc_nm_t *netmgr; +extern int ncpus; isc_result_t isc_test_begin(FILE *logfile, bool start_managers, unsigned int workers); diff --git a/lib/isc/tests/random_test.c b/lib/isc/tests/random_test.c index d1c08f4f2a5c845031f1e971eae20d51bc25943b..2afbbb2308602a34ba2732fadc8556f50738ade8 100644 --- a/lib/isc/tests/random_test.c +++ b/lib/isc/tests/random_test.c @@ -59,8 +59,10 @@ static double MAXLOG = 7.09782712893383996843E2; static double big = 4.503599627370496e15; static double biginv = 2.22044604925031308085e-16; -static double igamc(double a, double x); -static double igam(double a, double x); +static double +igamc(double a, double x); +static double +igam(double a, double x); /* Set to true (or use -v option) for verbose output */ static bool verbose = false; diff --git a/lib/isc/tests/siphash_test.c b/lib/isc/tests/siphash_test.c index b09a2d795eb2965a5052e0577d7c52d13f6692d0..465d2565c9b256250de31a70fc9704b370ee462c 100644 --- a/lib/isc/tests/siphash_test.c +++ b/lib/isc/tests/siphash_test.c @@ -22,13 +22,14 @@ #include -void native_isc_siphash24(const uint8_t *, const uint8_t *, const size_t, - uint8_t *); +void +native_isc_siphash24(const uint8_t *, const uint8_t *, const size_t, uint8_t *); #if HAVE_OPENSSL_SIPHASH -void openssl_isc_siphash24(const uint8_t *, const uint8_t *, const size_t, - uint8_t *); +void +openssl_isc_siphash24(const uint8_t *, const uint8_t *, const size_t, + uint8_t *); #undef HAVE_OPENSSL_SIPHASH #define isc_siphash24 native_isc_siphash24 diff --git a/lib/isc/timer.c b/lib/isc/timer.c index d4fd5dd0d78eb2fdf97ac675a26f6efe27583ad7..a0e0e46ed0d64b03132bf397404f1f38c8245c1f 100644 --- a/lib/isc/timer.c +++ b/lib/isc/timer.c @@ -96,7 +96,8 @@ struct isc__timermgr { isc_heap_t *heap; }; -void isc_timermgr_poke(isc_timermgr_t *manager0); +void +isc_timermgr_poke(isc_timermgr_t *manager0); static inline isc_result_t schedule(isc__timer_t *timer, isc_time_t *now, bool signal_ok) { diff --git a/lib/isc/unix/include/isc/dir.h b/lib/isc/unix/include/isc/dir.h index 5e5ef6f60d543711338b10e7d2ebd96f883ff6c7..9d789c40d764d61a391cbeeeac37984dfa5e87a5 100644 --- a/lib/isc/unix/include/isc/dir.h +++ b/lib/isc/unix/include/isc/dir.h @@ -24,16 +24,16 @@ /*% Directory Entry */ typedef struct isc_direntry { - char name[NAME_MAX]; + char name[NAME_MAX]; unsigned int length; } isc_direntry_t; /*% Directory */ typedef struct isc_dir { - unsigned int magic; - char dirname[PATH_MAX]; + 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/unix/include/isc/stdatomic.h b/lib/isc/unix/include/isc/stdatomic.h index 7339b87f913ec5ce1662675796bf47558b1be233..7a75743eb2696895ed885adf4d6f4c3ca22d7e48 100644 --- a/lib/isc/unix/include/isc/stdatomic.h +++ b/lib/isc/unix/include/isc/stdatomic.h @@ -73,11 +73,11 @@ enum memory_order { typedef enum memory_order memory_order; -typedef int_fast32_t atomic_int_fast32_t; +typedef int_fast32_t atomic_int_fast32_t; typedef uint_fast32_t atomic_uint_fast32_t; -typedef int_fast64_t atomic_int_fast64_t; +typedef int_fast64_t atomic_int_fast64_t; typedef uint_fast64_t atomic_uint_fast64_t; -typedef bool atomic_bool; +typedef bool atomic_bool; typedef uint_fast64_t atomic_uintptr_t; diff --git a/lib/isc/unix/interfaceiter.c b/lib/isc/unix/interfaceiter.c index 2ff780a9e17e94bb65e38b6de8e109066d02daf2..875465c10c9a3360a65b89563bb3d4e4446d5fa7 100644 --- a/lib/isc/unix/interfaceiter.c +++ b/lib/isc/unix/interfaceiter.c @@ -134,9 +134,12 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src, #define ISC_IF_INET6_SZ \ sizeof("00000000000000000000000000000001 01 80 10 80 " \ "XXXXXXloXXXXXXXX\n") -static isc_result_t linux_if_inet6_next(isc_interfaceiter_t *); -static isc_result_t linux_if_inet6_current(isc_interfaceiter_t *); -static void linux_if_inet6_first(isc_interfaceiter_t *iter); +static isc_result_t +linux_if_inet6_next(isc_interfaceiter_t *); +static isc_result_t +linux_if_inet6_current(isc_interfaceiter_t *); +static void +linux_if_inet6_first(isc_interfaceiter_t *iter); #endif /* ifdef __linux */ #include "ifiter_getifaddrs.c" diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c index e6f1c4b545c0e30b06a2a3f0c63815a47670a14d..54058eef39673175a4b1a8482f94e4f7b670b322 100644 --- a/lib/isc/unix/socket.c +++ b/lib/isc/unix/socket.c @@ -445,27 +445,41 @@ struct isc__socketthread { #define MAXSCATTERGATHER_RECV (ISC_SOCKET_MAXSCATTERGATHER) #endif /* ifdef ISC_PLATFORM_RECVOVERFLOW */ -static isc_result_t socket_create(isc_socketmgr_t *manager0, int pf, - isc_sockettype_t type, isc_socket_t **socketp, - isc_socket_t *dup_socket); -static void send_recvdone_event(isc__socket_t *, isc_socketevent_t **); -static void send_senddone_event(isc__socket_t *, isc_socketevent_t **); -static void send_connectdone_event(isc__socket_t *, isc_socket_connev_t **); -static void free_socket(isc__socket_t **); -static isc_result_t allocate_socket(isc__socketmgr_t *, isc_sockettype_t, - isc__socket_t **); -static void destroy(isc__socket_t **); -static void internal_accept(isc__socket_t *); -static void internal_connect(isc__socket_t *); -static void internal_recv(isc__socket_t *); -static void internal_send(isc__socket_t *); -static void process_cmsg(isc__socket_t *, struct msghdr *, isc_socketevent_t *); -static void build_msghdr_send(isc__socket_t *, char *, isc_socketevent_t *, - struct msghdr *, struct iovec *, size_t *); -static void build_msghdr_recv(isc__socket_t *, char *, isc_socketevent_t *, - struct msghdr *, struct iovec *, size_t *); -static bool process_ctlfd(isc__socketthread_t *thread); -static void setdscp(isc__socket_t *sock, isc_dscp_t dscp); +static isc_result_t +socket_create(isc_socketmgr_t *manager0, int pf, isc_sockettype_t type, + isc_socket_t **socketp, isc_socket_t *dup_socket); +static void +send_recvdone_event(isc__socket_t *, isc_socketevent_t **); +static void +send_senddone_event(isc__socket_t *, isc_socketevent_t **); +static void +send_connectdone_event(isc__socket_t *, isc_socket_connev_t **); +static void +free_socket(isc__socket_t **); +static isc_result_t +allocate_socket(isc__socketmgr_t *, isc_sockettype_t, isc__socket_t **); +static void +destroy(isc__socket_t **); +static void +internal_accept(isc__socket_t *); +static void +internal_connect(isc__socket_t *); +static void +internal_recv(isc__socket_t *); +static void +internal_send(isc__socket_t *); +static void +process_cmsg(isc__socket_t *, struct msghdr *, isc_socketevent_t *); +static void +build_msghdr_send(isc__socket_t *, char *, isc_socketevent_t *, struct msghdr *, + struct iovec *, size_t *); +static void +build_msghdr_recv(isc__socket_t *, char *, isc_socketevent_t *, struct msghdr *, + struct iovec *, size_t *); +static bool +process_ctlfd(isc__socketthread_t *thread); +static void +setdscp(isc__socket_t *sock, isc_dscp_t dscp); #define SELECT_POKE_SHUTDOWN (-1) #define SELECT_POKE_NOTHING (-2) @@ -553,16 +567,18 @@ static const isc_statscounter_t rawstatsindex[] = { isc_sockstatscounter_rawactive }; -static int gen_threadid(isc__socket_t *sock); +static int +gen_threadid(isc__socket_t *sock); static int gen_threadid(isc__socket_t *sock) { return (sock->fd % sock->manager->nthreads); } -static void manager_log(isc__socketmgr_t *sockmgr, isc_logcategory_t *category, - isc_logmodule_t *module, int level, const char *fmt, - ...) ISC_FORMAT_PRINTF(5, 6); +static void +manager_log(isc__socketmgr_t *sockmgr, isc_logcategory_t *category, + isc_logmodule_t *module, int level, const char *fmt, ...) + ISC_FORMAT_PRINTF(5, 6); static void manager_log(isc__socketmgr_t *sockmgr, isc_logcategory_t *category, isc_logmodule_t *module, int level, const char *fmt, ...) { @@ -581,8 +597,9 @@ manager_log(isc__socketmgr_t *sockmgr, isc_logcategory_t *category, sockmgr, msgbuf); } -static void thread_log(isc__socketthread_t *thread, isc_logcategory_t *category, - isc_logmodule_t *module, int level, const char *fmt, ...) +static void +thread_log(isc__socketthread_t *thread, isc_logcategory_t *category, + isc_logmodule_t *module, int level, const char *fmt, ...) ISC_FORMAT_PRINTF(5, 6); static void thread_log(isc__socketthread_t *thread, isc_logcategory_t *category, @@ -603,9 +620,10 @@ thread_log(isc__socketthread_t *thread, isc_logcategory_t *category, thread->threadid, msgbuf); } -static void socket_log(isc__socket_t *sock, const isc_sockaddr_t *address, - isc_logcategory_t *category, isc_logmodule_t *module, - int level, const char *fmt, ...) ISC_FORMAT_PRINTF(6, 7); +static void +socket_log(isc__socket_t *sock, const isc_sockaddr_t *address, + isc_logcategory_t *category, isc_logmodule_t *module, int level, + const char *fmt, ...) ISC_FORMAT_PRINTF(6, 7); static void socket_log(isc__socket_t *sock, const isc_sockaddr_t *address, isc_logcategory_t *category, isc_logmodule_t *module, int level, diff --git a/lib/isc/win32/dir.c b/lib/isc/win32/dir.c index 501a1bdfc83346ae2a2709d9631c0ae7f8d7d65f..898fb7a9721c6b501b0d0db483e2022ece668d67 100644 --- a/lib/isc/win32/dir.c +++ b/lib/isc/win32/dir.c @@ -28,7 +28,8 @@ #define ISC_DIR_MAGIC ISC_MAGIC('D', 'I', 'R', '*') #define VALID_DIR(dir) ISC_MAGIC_VALID(dir, ISC_DIR_MAGIC) -static isc_result_t start_directory(isc_dir_t *p); +static isc_result_t +start_directory(isc_dir_t *p); void isc_dir_init(isc_dir_t *dir) { diff --git a/lib/isc/win32/include/isc/condition.h b/lib/isc/win32/include/isc/condition.h index 14c7cf634edff70cfff2661f45a6ea63bb66b2e1..8a65323eb9bf374aaf67268fca1d58dbf81dd608 100644 --- a/lib/isc/win32/include/isc/condition.h +++ b/lib/isc/win32/include/isc/condition.h @@ -23,12 +23,12 @@ typedef struct isc_condition_thread isc_condition_thread_t; struct isc_condition_thread { unsigned long th; - HANDLE handle[2]; + HANDLE handle[2]; ISC_LINK(isc_condition_thread_t) link; }; typedef struct isc_condition { - HANDLE events[2]; + HANDLE events[2]; unsigned int waiters; ISC_LIST(isc_condition_thread_t) threadlist; } isc_condition_t; diff --git a/lib/isc/win32/include/isc/dir.h b/lib/isc/win32/include/isc/dir.h index fa6a72d6de815c6540048ee0328fdbecf6d80737..a0f310752f0f24b2842ec1dff7fa7d250336fecc 100644 --- a/lib/isc/win32/include/isc/dir.h +++ b/lib/isc/win32/include/isc/dir.h @@ -21,17 +21,17 @@ #include typedef struct { - char name[NAME_MAX]; - unsigned int length; + char name[NAME_MAX]; + unsigned int length; WIN32_FIND_DATA find_data; } isc_direntry_t; typedef struct { - unsigned int magic; - char dirname[PATH_MAX]; + unsigned int magic; + char dirname[PATH_MAX]; isc_direntry_t entry; - bool entry_filled; - HANDLE search_handle; + bool entry_filled; + HANDLE search_handle; } isc_dir_t; ISC_LANG_BEGINDECLS diff --git a/lib/isc/win32/include/isc/stdatomic.h b/lib/isc/win32/include/isc/stdatomic.h index 15cf9b6f0bfc6cb48945d5b978358c6511930b17..62ed255f55a62b72dccc6607b9dcb9143c64e9d0 100644 --- a/lib/isc/win32/include/isc/stdatomic.h +++ b/lib/isc/win32/include/isc/stdatomic.h @@ -355,7 +355,7 @@ static inline bool atomic_compare_exchange_strong_explicit8(atomic_int_fast8_t *obj, int8_t *expected, int8_t desired, memory_order succ, memory_order fail) { - bool __r; + bool __r; int8_t __v; UNUSED(succ); @@ -375,7 +375,7 @@ atomic_compare_exchange_strong_explicit32(atomic_int_fast32_t *obj, int32_t *expected, int32_t desired, memory_order succ, memory_order fail) { - bool __r; + bool __r; int32_t __v; UNUSED(succ); @@ -411,7 +411,7 @@ atomic_compare_exchange_strong_explicit64(atomic_int_fast64_t *obj, int64_t *expected, int64_t desired, memory_order succ, memory_order fail) { - bool __r; + bool __r; int64_t __v; UNUSED(succ); diff --git a/lib/isc/win32/include/isc/thread.h b/lib/isc/win32/include/isc/thread.h index 9ce612217a5eeb95e544722bbddc82cb12f66166..43b79c6f8469283f7c1513a3c40729388990a00a 100644 --- a/lib/isc/win32/include/isc/thread.h +++ b/lib/isc/win32/include/isc/thread.h @@ -62,8 +62,8 @@ WaitAbandonedIndex(DWORD dwWaitResult) { } typedef HANDLE isc_thread_t; -typedef DWORD isc_threadresult_t; -typedef void * isc_threadarg_t; +typedef DWORD isc_threadresult_t; +typedef void *isc_threadarg_t; typedef isc_threadresult_t(WINAPI *isc_threadfunc_t)(isc_threadarg_t); #define isc_thread_self (unsigned long)GetCurrentThreadId diff --git a/lib/isc/win32/interfaceiter.c b/lib/isc/win32/interfaceiter.c index 73e82c34e8db955302eca302299d4a93a5bd73a7..39994a6f032b8663dcc27f064324124f5b143286 100644 --- a/lib/isc/win32/interfaceiter.c +++ b/lib/isc/win32/interfaceiter.c @@ -31,7 +31,8 @@ #include -void InitSockets(void); +void +InitSockets(void); /* Common utility functions */ diff --git a/lib/isc/win32/net.c b/lib/isc/win32/net.c index 1c0d5eee903e8926933f4b7333d0a2b6e47916e9..2144694c6d7b3502b9222db4734bc2bf9f35b8a8 100644 --- a/lib/isc/win32/net.c +++ b/lib/isc/win32/net.c @@ -44,7 +44,8 @@ static isc_result_t ipv6_result = ISC_R_NOTFOUND; static isc_result_t ipv6only_result = ISC_R_NOTFOUND; static isc_result_t ipv6pktinfo_result = ISC_R_NOTFOUND; -void InitSockets(void); +void +InitSockets(void); static isc_result_t try_proto(int domain) { diff --git a/lib/isc/win32/netdb.h b/lib/isc/win32/netdb.h index 48b4f444a44693f63634fe420210a82f637d7e1c..439dbcfe9a8f3939f04ad9847478f77d831949fe 100644 --- a/lib/isc/win32/netdb.h +++ b/lib/isc/win32/netdb.h @@ -21,15 +21,15 @@ #if _MSC_VER < 1600 struct addrinfo { - int ai_flags; /* AI_PASSIVE, AI_CANONNAME */ - int ai_family; /* PF_xxx */ - int ai_socktype; /* SOCK_xxx */ - int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and - * IPv6 */ - size_t ai_addrlen; /* Length of ai_addr */ - char * ai_canonname; /* Canonical name for hostname */ - struct sockaddr *ai_addr; /* Binary address */ - struct addrinfo *ai_next; /* Next structure in linked list */ + int ai_flags; /* AI_PASSIVE, AI_CANONNAME */ + int ai_family; /* PF_xxx */ + int ai_socktype; /* SOCK_xxx */ + int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and + * IPv6 */ + size_t ai_addrlen; /* Length of ai_addr */ + char *ai_canonname; /* Canonical name for hostname */ + struct sockaddr *ai_addr; /* Binary address */ + struct addrinfo *ai_next; /* Next structure in linked list */ }; #endif /* if _MSC_VER < 1600 */ @@ -147,18 +147,18 @@ struct addrinfo { * Structures for getrrsetbyname() */ struct rdatainfo { - unsigned int rdi_length; + unsigned int rdi_length; unsigned char *rdi_data; }; struct rrsetinfo { - unsigned int rri_flags; - int rri_rdclass; - int rri_rdtype; - unsigned int rri_ttl; - unsigned int rri_nrdatas; - unsigned int rri_nsigs; - char * rri_name; + unsigned int rri_flags; + int rri_rdclass; + int rri_rdtype; + unsigned int rri_ttl; + unsigned int rri_nrdatas; + unsigned int rri_nsigs; + char *rri_name; struct rdatainfo *rri_rdatas; struct rdatainfo *rri_sigs; }; diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c index e847ade985d367b791ef909a104847a542aca1b7..de4aaffa5a61b56e92c8dab56ca85229454c7447 100644 --- a/lib/isc/win32/socket.c +++ b/lib/isc/win32/socket.c @@ -110,7 +110,8 @@ LPFN_GETACCEPTEXSOCKADDRS ISCGetAcceptExSockaddrs; do { \ } while (0) #endif /* ifdef ISC_SOCKET_CONSISTENCY_CHECKS */ -static void consistent(isc_socket_t *sock); +static void +consistent(isc_socket_t *sock); /* * Define this macro to control the behavior of connection @@ -354,27 +355,38 @@ enum { SOCKET_RECV, SOCKET_SEND, SOCKET_ACCEPT, SOCKET_CONNECT }; #define MAXSCATTERGATHER_SEND (ISC_SOCKET_MAXSCATTERGATHER) #define MAXSCATTERGATHER_RECV (ISC_SOCKET_MAXSCATTERGATHER) -static isc_result_t socket_create(isc_socketmgr_t *manager0, int pf, - isc_sockettype_t type, isc_socket_t **socketp, - isc_socket_t *dup_socket); -static isc_threadresult_t WINAPI SocketIoThread(LPVOID ThreadContext); -static void maybe_free_socket(isc_socket_t **, int); -static void free_socket(isc_socket_t **, int); -static bool senddone_is_active(isc_socket_t *sock, isc_socketevent_t *dev); -static bool acceptdone_is_active(isc_socket_t *sock, - isc_socket_newconnev_t *dev); -static bool connectdone_is_active(isc_socket_t *sock, isc_socket_connev_t *dev); -static void send_recvdone_event(isc_socket_t *sock, isc_socketevent_t **dev); -static void send_senddone_event(isc_socket_t *sock, isc_socketevent_t **dev); -static void send_acceptdone_event(isc_socket_t *sock, - isc_socket_newconnev_t **adev); -static void send_connectdone_event(isc_socket_t *sock, - isc_socket_connev_t **cdev); -static void send_recvdone_abort(isc_socket_t *sock, isc_result_t result); -static void send_connectdone_abort(isc_socket_t *sock, isc_result_t result); -static void queue_receive_event(isc_socket_t *sock, isc_task_t *task, - isc_socketevent_t *dev); -static void queue_receive_request(isc_socket_t *sock); +static isc_result_t +socket_create(isc_socketmgr_t *manager0, int pf, isc_sockettype_t type, + isc_socket_t **socketp, isc_socket_t *dup_socket); +static isc_threadresult_t WINAPI +SocketIoThread(LPVOID ThreadContext); +static void +maybe_free_socket(isc_socket_t **, int); +static void +free_socket(isc_socket_t **, int); +static bool +senddone_is_active(isc_socket_t *sock, isc_socketevent_t *dev); +static bool +acceptdone_is_active(isc_socket_t *sock, isc_socket_newconnev_t *dev); +static bool +connectdone_is_active(isc_socket_t *sock, isc_socket_connev_t *dev); +static void +send_recvdone_event(isc_socket_t *sock, isc_socketevent_t **dev); +static void +send_senddone_event(isc_socket_t *sock, isc_socketevent_t **dev); +static void +send_acceptdone_event(isc_socket_t *sock, isc_socket_newconnev_t **adev); +static void +send_connectdone_event(isc_socket_t *sock, isc_socket_connev_t **cdev); +static void +send_recvdone_abort(isc_socket_t *sock, isc_result_t result); +static void +send_connectdone_abort(isc_socket_t *sock, isc_result_t result); +static void +queue_receive_event(isc_socket_t *sock, isc_task_t *task, + isc_socketevent_t *dev); +static void +queue_receive_request(isc_socket_t *sock); /* * This is used to dump the contents of the sock structure @@ -445,11 +457,10 @@ sock_dump(isc_socket_t *sock) { } } -static void socket_log(int lineno, isc_socket_t *sock, - const isc_sockaddr_t *address, - isc_logcategory_t *category, isc_logmodule_t *module, - int level, const char *fmt, ...) - ISC_FORMAT_PRINTF(10, 11); +static void +socket_log(int lineno, isc_socket_t *sock, const isc_sockaddr_t *address, + isc_logcategory_t *category, isc_logmodule_t *module, int level, + const char *fmt, ...) ISC_FORMAT_PRINTF(10, 11); /* This function will add an entry to the I/O completion port * that will signal the I/O thread to exit (gracefully) diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c index 5f4eef0804bfe78773304e2aee4038d708ecbad6..47c093eac42c275a287df0c0ba15488cbd06939b 100644 --- a/lib/isccc/cc.c +++ b/lib/isccc/cc.c @@ -94,9 +94,11 @@ static unsigned char auth_hsha[] = { #define HSHA_OFFSET 22 /*%< 21 = 6 + 1 + 4 + 5 + 1 + 4 + 1 */ #define HSHA_LENGTH 88 -static isc_result_t table_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer); +static isc_result_t +table_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer); -static isc_result_t list_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer); +static isc_result_t +list_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer); static isc_result_t value_towire(isccc_sexpr_t *elt, isc_buffer_t **buffer) { @@ -474,12 +476,12 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, return (ISC_R_SUCCESS); } -static isc_result_t table_fromwire(isccc_region_t *source, - isccc_region_t *secret, uint32_t algorithm, - isccc_sexpr_t **alistp); +static isc_result_t +table_fromwire(isccc_region_t *source, isccc_region_t *secret, + uint32_t algorithm, isccc_sexpr_t **alistp); -static isc_result_t list_fromwire(isccc_region_t *source, - isccc_sexpr_t **listp); +static isc_result_t +list_fromwire(isccc_region_t *source, isccc_sexpr_t **listp); static isc_result_t value_fromwire(isccc_region_t *source, isccc_sexpr_t **valuep) { diff --git a/lib/isccc/ccmsg.c b/lib/isccc/ccmsg.c index 612927d9ebbe10153206ee68b6521ec7713848c8..07a2d403ff270ebca8d57c073548eebffaf61955 100644 --- a/lib/isccc/ccmsg.c +++ b/lib/isccc/ccmsg.c @@ -38,8 +38,10 @@ #define CCMSG_MAGIC ISC_MAGIC('C', 'C', 'm', 's') #define VALID_CCMSG(foo) ISC_MAGIC_VALID(foo, CCMSG_MAGIC) -static void recv_length(isc_task_t *, isc_event_t *); -static void recv_message(isc_task_t *, isc_event_t *); +static void +recv_length(isc_task_t *, isc_event_t *); +static void +recv_message(isc_task_t *, isc_event_t *); static void recv_length(isc_task_t *task, isc_event_t *ev_in) { diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index 390aeb62c4bcb14ab26999b05d33b1b3761c06de..a80bb25357437228ada77952c384282ff9695357 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -52,24 +52,29 @@ * Forward declarations of static functions. */ -static isc_result_t parse_keyvalue(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret); +static isc_result_t +parse_keyvalue(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret); -static isc_result_t parse_optional_keyvalue(cfg_parser_t *pctx, - const cfg_type_t *type, - cfg_obj_t **ret); +static isc_result_t +parse_optional_keyvalue(cfg_parser_t *pctx, const cfg_type_t *type, + cfg_obj_t **ret); -static isc_result_t parse_updatepolicy(cfg_parser_t *pctx, - const cfg_type_t *type, cfg_obj_t **ret); -static void print_updatepolicy(cfg_printer_t *pctx, const cfg_obj_t *obj); +static isc_result_t +parse_updatepolicy(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret); +static void +print_updatepolicy(cfg_printer_t *pctx, const cfg_obj_t *obj); -static void doc_updatepolicy(cfg_printer_t *pctx, const cfg_type_t *type); +static void +doc_updatepolicy(cfg_printer_t *pctx, const cfg_type_t *type); -static void print_keyvalue(cfg_printer_t *pctx, const cfg_obj_t *obj); +static void +print_keyvalue(cfg_printer_t *pctx, const cfg_obj_t *obj); -static void doc_keyvalue(cfg_printer_t *pctx, const cfg_type_t *type); +static void +doc_keyvalue(cfg_printer_t *pctx, const cfg_type_t *type); -static void doc_optional_keyvalue(cfg_printer_t *pctx, const cfg_type_t *type); +static void +doc_optional_keyvalue(cfg_printer_t *pctx, const cfg_type_t *type); static cfg_type_t cfg_type_acl; static cfg_type_t cfg_type_bracketed_dscpsockaddrlist; diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c index bef3771a4ad745f79085b54d31026461dc51788d..8bc7a6606115533dc010ea747a2843da352ddbeb 100644 --- a/lib/isccfg/parser.c +++ b/lib/isccfg/parser.c @@ -64,46 +64,57 @@ * Forward declarations of static functions. */ -static void free_tuple(cfg_parser_t *pctx, cfg_obj_t *obj); +static void +free_tuple(cfg_parser_t *pctx, cfg_obj_t *obj); -static isc_result_t parse_list(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret); +static isc_result_t +parse_list(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret); -static void print_list(cfg_printer_t *pctx, const cfg_obj_t *obj); +static void +print_list(cfg_printer_t *pctx, const cfg_obj_t *obj); -static void free_list(cfg_parser_t *pctx, cfg_obj_t *obj); +static void +free_list(cfg_parser_t *pctx, cfg_obj_t *obj); -static isc_result_t create_listelt(cfg_parser_t *pctx, cfg_listelt_t **eltp); +static isc_result_t +create_listelt(cfg_parser_t *pctx, cfg_listelt_t **eltp); -static isc_result_t create_string(cfg_parser_t *pctx, const char *contents, - const cfg_type_t *type, cfg_obj_t **ret); +static isc_result_t +create_string(cfg_parser_t *pctx, const char *contents, const cfg_type_t *type, + cfg_obj_t **ret); -static void free_string(cfg_parser_t *pctx, cfg_obj_t *obj); +static void +free_string(cfg_parser_t *pctx, cfg_obj_t *obj); -static isc_result_t create_map(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **objp); +static isc_result_t +create_map(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **objp); -static void free_map(cfg_parser_t *pctx, cfg_obj_t *obj); +static void +free_map(cfg_parser_t *pctx, cfg_obj_t *obj); -static isc_result_t parse_symtab_elt(cfg_parser_t *pctx, const char *name, - cfg_type_t *elttype, isc_symtab_t *symtab, - bool callback); +static isc_result_t +parse_symtab_elt(cfg_parser_t *pctx, const char *name, cfg_type_t *elttype, + isc_symtab_t *symtab, bool callback); -static void free_noop(cfg_parser_t *pctx, cfg_obj_t *obj); +static void +free_noop(cfg_parser_t *pctx, cfg_obj_t *obj); -static isc_result_t cfg_getstringtoken(cfg_parser_t *pctx); +static isc_result_t +cfg_getstringtoken(cfg_parser_t *pctx); -static void parser_complain(cfg_parser_t *pctx, bool is_warning, - unsigned int flags, const char *format, - va_list args); +static void +parser_complain(cfg_parser_t *pctx, bool is_warning, unsigned int flags, + const char *format, va_list args); #if defined(HAVE_GEOIP2) -static isc_result_t parse_geoip(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret); +static isc_result_t +parse_geoip(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret); -static void print_geoip(cfg_printer_t *pctx, const cfg_obj_t *obj); +static void +print_geoip(cfg_printer_t *pctx, const cfg_obj_t *obj); -static void doc_geoip(cfg_printer_t *pctx, const cfg_type_t *type); +static void +doc_geoip(cfg_printer_t *pctx, const cfg_type_t *type); #endif /* HAVE_GEOIP2 */ /* diff --git a/lib/ns/client.c b/lib/ns/client.c index e88f39a2173e1ec8efbcc882f4deaa54d1c5b4d5..62005f90b693e582b4795d2ddf775c31c68e8ea1 100644 --- a/lib/ns/client.c +++ b/lib/ns/client.c @@ -118,14 +118,21 @@ LIBNS_EXTERNAL_DATA atomic_uint_fast32_t ns_client_requests; LIBNS_EXTERNAL_DATA atomic_uint_fast64_t ns_client_requests; #endif /* if defined(_WIN32) && !defined(_WIN64) */ -static void clientmgr_attach(ns_clientmgr_t *source, ns_clientmgr_t **targetp); -static void clientmgr_detach(ns_clientmgr_t **mp); -static void clientmgr_destroy(ns_clientmgr_t *manager); -static void ns_client_endrequest(ns_client_t *client); -static void ns_client_dumpmessage(ns_client_t *client, const char *reason); -static void compute_cookie(ns_client_t *client, uint32_t when, uint32_t nonce, - const unsigned char *secret, isc_buffer_t *buf); -static void get_clientmctx(ns_clientmgr_t *manager, isc_mem_t **mctxp); +static void +clientmgr_attach(ns_clientmgr_t *source, ns_clientmgr_t **targetp); +static void +clientmgr_detach(ns_clientmgr_t **mp); +static void +clientmgr_destroy(ns_clientmgr_t *manager); +static void +ns_client_endrequest(ns_client_t *client); +static void +ns_client_dumpmessage(ns_client_t *client, const char *reason); +static void +compute_cookie(ns_client_t *client, uint32_t when, uint32_t nonce, + const unsigned char *secret, isc_buffer_t *buf); +static void +get_clientmctx(ns_clientmgr_t *manager, isc_mem_t **mctxp); void ns_client_recursing(ns_client_t *client) { diff --git a/lib/ns/interfacemgr.c b/lib/ns/interfacemgr.c index 1e1acebe416fc0f40a29089cf56e13d2c5ce7af8..2dcccff7b5182a73cbc4a0a5ecac4d6bc10d3e82 100644 --- a/lib/ns/interfacemgr.c +++ b/lib/ns/interfacemgr.c @@ -95,9 +95,11 @@ struct ns_interfacemgr { #endif /* ifdef USE_ROUTE_SOCKET */ }; -static void purge_old_interfaces(ns_interfacemgr_t *mgr); +static void +purge_old_interfaces(ns_interfacemgr_t *mgr); -static void clearlistenon(ns_interfacemgr_t *mgr); +static void +clearlistenon(ns_interfacemgr_t *mgr); #ifdef USE_ROUTE_SOCKET static void diff --git a/lib/ns/listenlist.c b/lib/ns/listenlist.c index 6c70295093c895b2e59ddd45658971de5ecbcfbd..f075f15c0a33ffc95102e90e721689103031962d 100644 --- a/lib/ns/listenlist.c +++ b/lib/ns/listenlist.c @@ -20,7 +20,8 @@ #include -static void destroy(ns_listenlist_t *list); +static void +destroy(ns_listenlist_t *list); isc_result_t ns_listenelt_create(isc_mem_t *mctx, in_port_t port, isc_dscp_t dscp, diff --git a/lib/ns/query.c b/lib/ns/query.c index 8e783556ce28ca016329c341b5b413f9b74b702b..634ec37c134c893d3ef6fc01ce4d22af1395117a 100644 --- a/lib/ns/query.c +++ b/lib/ns/query.c @@ -199,8 +199,9 @@ client_trace(ns_client_t *client, int level, const char *message) { } while (0) #define RESTORE(a, b) SAVE(a, b) -static bool validate(ns_client_t *client, dns_db_t *db, dns_name_t *name, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset); +static bool +validate(ns_client_t *client, dns_db_t *db, dns_name_t *name, + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset); static void query_findclosestnsec3(dns_name_t *qname, dns_db_t *db, @@ -208,16 +209,18 @@ query_findclosestnsec3(dns_name_t *qname, dns_db_t *db, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, dns_name_t *fname, bool exact, dns_name_t *found); -static inline void log_queryerror(ns_client_t *client, isc_result_t result, - int line, int level); +static inline void +log_queryerror(ns_client_t *client, isc_result_t result, int line, int level); -static void rpz_st_clear(ns_client_t *client); +static void +rpz_st_clear(ns_client_t *client); -static bool rpz_ck_dnssec(ns_client_t *client, isc_result_t qresult, - dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset); +static bool +rpz_ck_dnssec(ns_client_t *client, isc_result_t qresult, + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset); -static void log_noexistnodata(void *val, int level, const char *fmt, ...) +static void +log_noexistnodata(void *val, int level, const char *fmt, ...) ISC_FORMAT_PRINTF(3, 4); /* @@ -358,86 +361,122 @@ get_hooktab(query_ctx_t *qctx) { * plugins.) */ -static void query_trace(query_ctx_t *qctx); +static void +query_trace(query_ctx_t *qctx); -static void qctx_init(ns_client_t *client, dns_fetchevent_t *event, - dns_rdatatype_t qtype, query_ctx_t *qctx); +static void +qctx_init(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype, + query_ctx_t *qctx); -static isc_result_t query_setup(ns_client_t *client, dns_rdatatype_t qtype); +static isc_result_t +query_setup(ns_client_t *client, dns_rdatatype_t qtype); -static isc_result_t query_lookup(query_ctx_t *qctx); +static isc_result_t +query_lookup(query_ctx_t *qctx); -static void fetch_callback(isc_task_t *task, isc_event_t *event); +static void +fetch_callback(isc_task_t *task, isc_event_t *event); -static void recparam_update(ns_query_recparam_t *param, dns_rdatatype_t qtype, - const dns_name_t *qname, const dns_name_t *qdomain); +static void +recparam_update(ns_query_recparam_t *param, dns_rdatatype_t qtype, + const dns_name_t *qname, const dns_name_t *qdomain); -static isc_result_t query_resume(query_ctx_t *qctx); +static isc_result_t +query_resume(query_ctx_t *qctx); -static isc_result_t query_checkrrl(query_ctx_t *qctx, isc_result_t result); +static isc_result_t +query_checkrrl(query_ctx_t *qctx, isc_result_t result); -static isc_result_t query_checkrpz(query_ctx_t *qctx, isc_result_t result); +static isc_result_t +query_checkrpz(query_ctx_t *qctx, isc_result_t result); -static isc_result_t query_rpzcname(query_ctx_t *qctx, dns_name_t *cname); +static isc_result_t +query_rpzcname(query_ctx_t *qctx, dns_name_t *cname); -static isc_result_t query_gotanswer(query_ctx_t *qctx, isc_result_t result); +static isc_result_t +query_gotanswer(query_ctx_t *qctx, isc_result_t result); -static void query_addnoqnameproof(query_ctx_t *qctx); +static void +query_addnoqnameproof(query_ctx_t *qctx); -static isc_result_t query_respond_any(query_ctx_t *qctx); +static isc_result_t +query_respond_any(query_ctx_t *qctx); -static isc_result_t query_respond(query_ctx_t *qctx); +static isc_result_t +query_respond(query_ctx_t *qctx); -static isc_result_t query_dns64(query_ctx_t *qctx); +static isc_result_t +query_dns64(query_ctx_t *qctx); -static void query_filter64(query_ctx_t *qctx); +static void +query_filter64(query_ctx_t *qctx); -static isc_result_t query_notfound(query_ctx_t *qctx); +static isc_result_t +query_notfound(query_ctx_t *qctx); -static isc_result_t query_zone_delegation(query_ctx_t *qctx); +static isc_result_t +query_zone_delegation(query_ctx_t *qctx); -static isc_result_t query_delegation(query_ctx_t *qctx); +static isc_result_t +query_delegation(query_ctx_t *qctx); -static isc_result_t query_delegation_recurse(query_ctx_t *qctx); +static isc_result_t +query_delegation_recurse(query_ctx_t *qctx); -static void query_addds(query_ctx_t *qctx); +static void +query_addds(query_ctx_t *qctx); -static isc_result_t query_nodata(query_ctx_t *qctx, isc_result_t result); +static isc_result_t +query_nodata(query_ctx_t *qctx, isc_result_t result); -static isc_result_t query_sign_nodata(query_ctx_t *qctx); +static isc_result_t +query_sign_nodata(query_ctx_t *qctx); -static void query_addnxrrsetnsec(query_ctx_t *qctx); +static void +query_addnxrrsetnsec(query_ctx_t *qctx); -static isc_result_t query_nxdomain(query_ctx_t *qctx, bool empty_wild); +static isc_result_t +query_nxdomain(query_ctx_t *qctx, bool empty_wild); -static isc_result_t query_redirect(query_ctx_t *qctx); +static isc_result_t +query_redirect(query_ctx_t *qctx); -static isc_result_t query_ncache(query_ctx_t *qctx, isc_result_t result); +static isc_result_t +query_ncache(query_ctx_t *qctx, isc_result_t result); -static isc_result_t query_coveringnsec(query_ctx_t *qctx); +static isc_result_t +query_coveringnsec(query_ctx_t *qctx); -static isc_result_t query_zerottl_refetch(query_ctx_t *qctx); +static isc_result_t +query_zerottl_refetch(query_ctx_t *qctx); -static isc_result_t query_cname(query_ctx_t *qctx); +static isc_result_t +query_cname(query_ctx_t *qctx); -static isc_result_t query_dname(query_ctx_t *qctx); +static isc_result_t +query_dname(query_ctx_t *qctx); -static isc_result_t query_addcname(query_ctx_t *qctx, dns_trust_t trust, - dns_ttl_t ttl); +static isc_result_t +query_addcname(query_ctx_t *qctx, dns_trust_t trust, dns_ttl_t ttl); -static isc_result_t query_prepresponse(query_ctx_t *qctx); +static isc_result_t +query_prepresponse(query_ctx_t *qctx); -static isc_result_t query_addsoa(query_ctx_t *qctx, unsigned int override_ttl, - dns_section_t section); +static isc_result_t +query_addsoa(query_ctx_t *qctx, unsigned int override_ttl, + dns_section_t section); -static isc_result_t query_addns(query_ctx_t *qctx); +static isc_result_t +query_addns(query_ctx_t *qctx); -static void query_addbestns(query_ctx_t *qctx); +static void +query_addbestns(query_ctx_t *qctx); -static void query_addwildcardproof(query_ctx_t *qctx, bool ispositive, - bool nodata); +static void +query_addwildcardproof(query_ctx_t *qctx, bool ispositive, bool nodata); -static void query_addauth(query_ctx_t *qctx); +static void +query_addauth(query_ctx_t *qctx); /* * Increment query statistics counters. diff --git a/lib/ns/tests/nstest.c b/lib/ns/tests/nstest.c index c7d46ae14424fc875c0eb27b75f82c1d9e0d805e..9ea820475370f112ae80bcf57d225041fa8d4c36 100644 --- a/lib/ns/tests/nstest.c +++ b/lib/ns/tests/nstest.c @@ -78,7 +78,8 @@ static dns_zone_t *served_zone = NULL; atomic_uint_fast32_t client_refs[32]; atomic_uintptr_t client_addrs[32]; -void __wrap_isc_nmhandle_unref(isc_nmhandle_t *handle); +void +__wrap_isc_nmhandle_unref(isc_nmhandle_t *handle); void __wrap_isc_nmhandle_unref(isc_nmhandle_t *handle) { diff --git a/lib/ns/tests/nstest.h b/lib/ns/tests/nstest.h index ab1ada8d4b529e3ceaa12242d119efe69816e877..dec5ec9e85e340abdd800aa54eae8f61b1eb9fd7 100644 --- a/lib/ns/tests/nstest.h +++ b/lib/ns/tests/nstest.h @@ -32,7 +32,7 @@ typedef struct ns_test_id { const char *description; - int lineno; + int lineno; } ns_test_id_t; #define NS_TEST_ID(desc) \ @@ -47,20 +47,20 @@ typedef struct ns_test_id { goto cleanup; \ } while (0) -extern isc_mem_t * mctx; -extern isc_log_t * lctx; -extern isc_taskmgr_t * taskmgr; -extern isc_task_t * maintask; -extern isc_timermgr_t * timermgr; -extern isc_socketmgr_t * socketmgr; -extern dns_zonemgr_t * zonemgr; +extern isc_mem_t *mctx; +extern isc_log_t *lctx; +extern isc_taskmgr_t *taskmgr; +extern isc_task_t *maintask; +extern isc_timermgr_t *timermgr; +extern isc_socketmgr_t *socketmgr; +extern dns_zonemgr_t *zonemgr; 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 bool app_running; -extern int ncpus; -extern bool debug_mem_record; +extern ns_server_t *sctx; +extern bool app_running; +extern int ncpus; +extern bool debug_mem_record; isc_result_t ns_test_begin(FILE *logfile, bool create_managers); @@ -124,10 +124,10 @@ 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; + unsigned int qflags; + bool with_cache; } ns_test_qctx_create_params_t; /*% @@ -139,7 +139,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(). diff --git a/lib/ns/tests/plugin_test.c b/lib/ns/tests/plugin_test.c index 795411219ab542bec6c61fb22d7e900b8d4090c2..2e6c6240e22314ba09e795e04397ef7eddcae011 100644 --- a/lib/ns/tests/plugin_test.c +++ b/lib/ns/tests/plugin_test.c @@ -29,8 +29,8 @@ #include #include -ISC_PLATFORM_NORETURN_PRE void _fail(const char *const file, - const int line) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE void +_fail(const char *const file, const int line) ISC_PLATFORM_NORETURN_POST; #include diff --git a/lib/ns/tests/wrap.c b/lib/ns/tests/wrap.c index 19a8219d1d47ecbdb9d41e6d074e7a370392bef5..41b8449fc6f00773dc1f762d1201accfcffc3697 100644 --- a/lib/ns/tests/wrap.c +++ b/lib/ns/tests/wrap.c @@ -31,7 +31,8 @@ * can't be used. */ -extern void __wrap_isc_nmhandle_unref(isc_nmhandle_t *handle); +extern void +__wrap_isc_nmhandle_unref(isc_nmhandle_t *handle); void isc_nmhandle_unref(isc_nmhandle_t *handle) { diff --git a/lib/ns/update.c b/lib/ns/update.c index ce812e85b878faf89f8ac377bd776806e886eb0f..0377a4494937acc78f92d3927e0d3458d5c92bb0 100644 --- a/lib/ns/update.c +++ b/lib/ns/update.c @@ -251,16 +251,22 @@ typedef struct { * Forward declarations. */ -static void update_action(isc_task_t *task, isc_event_t *event); -static void updatedone_action(isc_task_t *task, isc_event_t *event); -static isc_result_t send_forward_event(ns_client_t *client, dns_zone_t *zone); -static void forward_done(isc_task_t *task, isc_event_t *event); -static isc_result_t add_rr_prepare_action(void *data, rr_t *rr); +static void +update_action(isc_task_t *task, isc_event_t *event); +static void +updatedone_action(isc_task_t *task, isc_event_t *event); +static isc_result_t +send_forward_event(ns_client_t *client, dns_zone_t *zone); +static void +forward_done(isc_task_t *task, isc_event_t *event); +static isc_result_t +add_rr_prepare_action(void *data, rr_t *rr); /**************************************************************************/ -static void update_log(ns_client_t *client, dns_zone_t *zone, int level, - const char *fmt, ...) ISC_FORMAT_PRINTF(4, 5); +static void +update_log(ns_client_t *client, dns_zone_t *zone, int level, const char *fmt, + ...) ISC_FORMAT_PRINTF(4, 5); static void update_log(ns_client_t *client, dns_zone_t *zone, int level, const char *fmt, @@ -512,12 +518,14 @@ update_one_rr(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, /*% * Function type for foreach_rrset() iterator actions. */ -typedef isc_result_t rrset_func(void *data, dns_rdataset_t *rrset); +typedef isc_result_t +rrset_func(void *data, dns_rdataset_t *rrset); /*% * Function type for foreach_rr() iterator actions. */ -typedef isc_result_t rr_func(void *data, rr_t *rr); +typedef isc_result_t +rr_func(void *data, rr_t *rr); /*% * Internal context struct for foreach_node_rr(). @@ -742,7 +750,8 @@ cleanup_node: * Function type for predicate functions that compare a database RR 'db_rr' * against an update RR 'update_rr'. */ -typedef bool rr_predicate(dns_rdata_t *update_rr, dns_rdata_t *db_rr); +typedef bool +rr_predicate(dns_rdata_t *update_rr, dns_rdata_t *db_rr); /*% * Helper function for rrset_exists(). diff --git a/lib/ns/xfrout.c b/lib/ns/xfrout.c index 2ea07f3c5b22bc2173be551fc35ecac56fa41656..a92783cf1bb55e78082e7c955a860cfb068c059b 100644 --- a/lib/ns/xfrout.c +++ b/lib/ns/xfrout.c @@ -215,7 +215,8 @@ typedef struct ixfr_rrstream { } ixfr_rrstream_t; /* Forward declarations. */ -static void ixfr_rrstream_destroy(rrstream_t **sp); +static void +ixfr_rrstream_destroy(rrstream_t **sp); static rrstream_methods_t ixfr_rrstream_methods; @@ -302,7 +303,8 @@ typedef struct axfr_rrstream { /* * Forward declarations. */ -static void axfr_rrstream_destroy(rrstream_t **rsp); +static void +axfr_rrstream_destroy(rrstream_t **rsp); static rrstream_methods_t axfr_rrstream_methods; @@ -421,7 +423,8 @@ typedef struct soa_rrstream { /* * Forward declarations. */ -static void soa_rrstream_destroy(rrstream_t **rsp); +static void +soa_rrstream_destroy(rrstream_t **rsp); static rrstream_methods_t soa_rrstream_methods; @@ -506,9 +509,11 @@ typedef struct compound_rrstream { /* * Forward declarations. */ -static void compound_rrstream_destroy(rrstream_t **rsp); +static void +compound_rrstream_destroy(rrstream_t **rsp); -static isc_result_t compound_rrstream_next(rrstream_t *rs); +static isc_result_t +compound_rrstream_next(rrstream_t *rs); static rrstream_methods_t compound_rrstream_methods; @@ -664,35 +669,40 @@ typedef struct { struct xfr_stats stats; /*%< Transfer statistics */ } xfrout_ctx_t; -static void xfrout_ctx_create(isc_mem_t *mctx, ns_client_t *client, - unsigned int id, dns_name_t *qname, - dns_rdatatype_t qtype, dns_rdataclass_t qclass, - dns_zone_t *zone, dns_db_t *db, - dns_dbversion_t *ver, isc_quota_t *quota, - rrstream_t *stream, dns_tsigkey_t *tsigkey, - isc_buffer_t *lasttsig, bool verified_tsig, - unsigned int maxtime, unsigned int idletime, - bool many_answers, xfrout_ctx_t **xfrp); +static void +xfrout_ctx_create(isc_mem_t *mctx, ns_client_t *client, unsigned int id, + dns_name_t *qname, dns_rdatatype_t qtype, + dns_rdataclass_t qclass, dns_zone_t *zone, dns_db_t *db, + dns_dbversion_t *ver, isc_quota_t *quota, rrstream_t *stream, + dns_tsigkey_t *tsigkey, isc_buffer_t *lasttsig, + bool verified_tsig, unsigned int maxtime, + unsigned int idletime, bool many_answers, + xfrout_ctx_t **xfrp); -static void sendstream(xfrout_ctx_t *xfr); +static void +sendstream(xfrout_ctx_t *xfr); -static void xfrout_senddone(isc_nmhandle_t *handle, isc_result_t result, - void *arg); +static void +xfrout_senddone(isc_nmhandle_t *handle, isc_result_t result, void *arg); -static void xfrout_fail(xfrout_ctx_t *xfr, isc_result_t result, - const char *msg); +static void +xfrout_fail(xfrout_ctx_t *xfr, isc_result_t result, const char *msg); -static void xfrout_maybe_destroy(xfrout_ctx_t *xfr); +static void +xfrout_maybe_destroy(xfrout_ctx_t *xfr); -static void xfrout_ctx_destroy(xfrout_ctx_t **xfrp); +static void +xfrout_ctx_destroy(xfrout_ctx_t **xfrp); -static void xfrout_client_shutdown(void *arg, isc_result_t result); +static void +xfrout_client_shutdown(void *arg, isc_result_t result); -static void xfrout_log1(ns_client_t *client, dns_name_t *zonename, - dns_rdataclass_t rdclass, int level, const char *fmt, - ...) ISC_FORMAT_PRINTF(5, 6); +static void +xfrout_log1(ns_client_t *client, dns_name_t *zonename, dns_rdataclass_t rdclass, + int level, const char *fmt, ...) ISC_FORMAT_PRINTF(5, 6); -static void xfrout_log(xfrout_ctx_t *xfr, int level, const char *fmt, ...) +static void +xfrout_log(xfrout_ctx_t *xfr, int level, const char *fmt, ...) ISC_FORMAT_PRINTF(3, 4); /**************************************************************************/ @@ -1716,9 +1726,9 @@ xfrout_client_shutdown(void *arg, isc_result_t result) { * : transfer of : */ -static void xfrout_logv(ns_client_t *client, dns_name_t *zonename, - dns_rdataclass_t rdclass, int level, const char *fmt, - va_list ap) ISC_FORMAT_PRINTF(5, 0); +static void +xfrout_logv(ns_client_t *client, dns_name_t *zonename, dns_rdataclass_t rdclass, + int level, const char *fmt, va_list ap) ISC_FORMAT_PRINTF(5, 0); static void xfrout_logv(ns_client_t *client, dns_name_t *zonename, dns_rdataclass_t rdclass, diff --git a/lib/samples/nsprobe.c b/lib/samples/nsprobe.c index 989871797023dec9282142213685598e13633dff..1a1f7bf12cd0c09f3e6ff008346dc518b51228cd 100644 --- a/lib/samples/nsprobe.c +++ b/lib/samples/nsprobe.c @@ -124,10 +124,14 @@ static int verbose_level = 0; static const char *qlabels[] = { "www.", "ftp.", NULL }; static struct probe_trans probes[MAX_PROBES]; -static isc_result_t probe_domain(struct probe_trans *trans); -static void reset_probe(struct probe_trans *trans); -static isc_result_t fetch_nsaddress(struct probe_trans *trans); -static isc_result_t probe_name(struct probe_trans *trans, dns_rdatatype_t type); +static isc_result_t +probe_domain(struct probe_trans *trans); +static void +reset_probe(struct probe_trans *trans); +static isc_result_t +fetch_nsaddress(struct probe_trans *trans); +static isc_result_t +probe_name(struct probe_trans *trans, dns_rdatatype_t type); /* Dump an rdataset for debug */ static isc_result_t @@ -1035,7 +1039,8 @@ cleanup: return (result); } -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { diff --git a/lib/samples/resolve.c b/lib/samples/resolve.c index ed40d16e95cfa4be7de013ee55df0d0acd2d75d5..005ec1daf0b1a88a588a58ad8fbb3f4dc092398b 100644 --- a/lib/samples/resolve.c +++ b/lib/samples/resolve.c @@ -79,7 +79,8 @@ printdata(dns_rdataset_t *rdataset, dns_name_t *owner) { return (ISC_R_SUCCESS); } -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { diff --git a/lib/samples/sample-async.c b/lib/samples/sample-async.c index eebc2d365a2310506df2de5361d74488d7d541fb..c0fb6fecfa7a8ca566927dfe667a68122f5e70b4 100644 --- a/lib/samples/sample-async.c +++ b/lib/samples/sample-async.c @@ -65,7 +65,8 @@ struct query_trans { static struct query_trans query_array[MAX_QUERIES]; -static isc_result_t dispatch_query(struct query_trans *trans); +static isc_result_t +dispatch_query(struct query_trans *trans); static void ctxs_destroy(isc_mem_t **mctxp, isc_appctx_t **actxp, isc_taskmgr_t **taskmgrp, @@ -252,7 +253,8 @@ cleanup: return (result); } -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { diff --git a/lib/samples/sample-request.c b/lib/samples/sample-request.c index a3ea4d8c8766dd28ca7af7ee9441f072c0473fee..6378f03378438f2bc70fac6fa17056ae8b102a40 100644 --- a/lib/samples/sample-request.c +++ b/lib/samples/sample-request.c @@ -51,7 +51,8 @@ static isc_mem_t *mctx; static dns_fixedname_t fixedqname; -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { diff --git a/lib/samples/sample-update.c b/lib/samples/sample-update.c index fe09ae9904feca6f4c1391bdf632f4b43f5e78e7..b40b56059c653170bf23340fcbdfe15f08f12bd0 100644 --- a/lib/samples/sample-update.c +++ b/lib/samples/sample-update.c @@ -61,12 +61,16 @@ static ISC_LIST(dns_rdatalist_t) usedrdatalists; static const char *port = "53"; -static void setup_tsec(char *keyfile, isc_mem_t *mctx); -static void update_addordelete(isc_mem_t *mctx, char *cmdline, bool isdelete, - dns_name_t *name); -static void evaluate_prereq(isc_mem_t *mctx, char *cmdline, dns_name_t *name); +static void +setup_tsec(char *keyfile, isc_mem_t *mctx); +static void +update_addordelete(isc_mem_t *mctx, char *cmdline, bool isdelete, + dns_name_t *name); +static void +evaluate_prereq(isc_mem_t *mctx, char *cmdline, dns_name_t *name); -ISC_PLATFORM_NORETURN_PRE static void usage(void) ISC_PLATFORM_NORETURN_POST; +ISC_PLATFORM_NORETURN_PRE static void +usage(void) ISC_PLATFORM_NORETURN_POST; static void usage(void) { diff --git a/util/models.c b/util/models.c index 6c2a26757af7371b6084181a2be52777eb771760..0f9cc78e5a68b52c9c6db5345b6ba5360a55284a 100644 --- a/util/models.c +++ b/util/models.c @@ -16,13 +16,12 @@ * See https://scan.coverity.com/models */ -#define FLARG , const char *file, unsigned int line +#define FLARG , const char *file, unsigned int line #define FLARG_PASS , file, line int condition; void * -isc__mem_get(void *mem, unsigned int size FLARG) -{ +isc__mem_get(void *mem, unsigned int size FLARG) { if (!mem) { __coverity_panic__(); } @@ -34,8 +33,7 @@ isc__mem_get(void *mem, unsigned int size FLARG) } void -isc__mem_put(void *mem, void *ptr, unsigned int size FLARG) -{ +isc__mem_put(void *mem, void *ptr, unsigned int size FLARG) { if (!mem) { __coverity_panic__(); } @@ -43,8 +41,7 @@ isc__mem_put(void *mem, void *ptr, unsigned int size FLARG) } void -isc__mem_putanddetach(void *mem, void *ptr, unsigned int size FLARG) -{ +isc__mem_putanddetach(void *mem, void *ptr, unsigned int size FLARG) { if (!mem) { __coverity_panic__(); } @@ -52,8 +49,7 @@ isc__mem_putanddetach(void *mem, void *ptr, unsigned int size FLARG) } void * -isc__mem_allocate(void *mem, unsigned int size FLARG) -{ +isc__mem_allocate(void *mem, unsigned int size FLARG) { if (!mem) { __coverity_panic__(); } @@ -68,9 +64,8 @@ void * memcpy(void *s1, const void *s2, size_t n); void * -isc__mem_reallocate(void *mem, void *ptr, size_t size FLARG) -{ - char * p = (char *)0; +isc__mem_reallocate(void *mem, void *ptr, size_t size FLARG) { + char *p = (char *)0; size_t l; if (!mem) { @@ -90,8 +85,7 @@ isc__mem_reallocate(void *mem, void *ptr, size_t size FLARG) } void -isc__mem_free(void *mem, void *ptr FLARG) -{ +isc__mem_free(void *mem, void *ptr FLARG) { if (!mem) { __coverity_panic__(); } @@ -102,8 +96,7 @@ unsigned int strlen(const char *); void * -isc__mem_strdup(void *mem, char *s FLARG) -{ +isc__mem_strdup(void *mem, char *s FLARG) { void *d; if (!mem) { __coverity_panic__(); @@ -117,8 +110,7 @@ isc__mem_strdup(void *mem, char *s FLARG) } void * -isc__mempool_get(void *mem FLARG) -{ +isc__mempool_get(void *mem FLARG) { unsigned int size; if (!mem) { __coverity_panic__(); @@ -130,8 +122,7 @@ isc__mempool_get(void *mem FLARG) } void -isc__mempool_put(void *mem, void *ptr FLARG) -{ +isc__mempool_put(void *mem, void *ptr FLARG) { if (!mem) { __coverity_panic__(); } @@ -146,8 +137,7 @@ isc__mempool_put(void *mem, void *ptr FLARG) void _assert_true(const LargestIntegralType result, const char *const expression, - const char *const file, const int line) -{ + const char *const file, const int line) { if (!result) { __coverity_panic__(); }