From e851ed0bb502fb2e883ed3e3cc2e90d680009294 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Thu, 13 Feb 2020 14:44:37 -0800 Subject: [PATCH] apply the modified style --- bin/check/check-tool.c | 149 +- bin/check/named-checkconf.c | 163 +- bin/check/named-checkzone.c | 78 +- bin/confgen/ddns-confgen.c | 32 +- bin/confgen/keygen.c | 23 +- bin/confgen/rndc-confgen.c | 53 +- bin/confgen/unix/os.c | 3 +- bin/confgen/util.c | 8 +- bin/confgen/win32/os.c | 3 +- bin/delv/delv.c | 278 +- bin/dig/dig.c | 254 +- bin/dig/dighost.c | 754 ++- bin/dig/host.c | 152 +- bin/dig/include/dig/dig.h | 4 +- bin/dig/nslookup.c | 201 +- bin/dnssec/dnssec-cds.c | 294 +- bin/dnssec/dnssec-dsfromkey.c | 98 +- bin/dnssec/dnssec-importkey.c | 81 +- bin/dnssec/dnssec-keyfromlabel.c | 105 +- bin/dnssec/dnssec-keygen.c | 199 +- bin/dnssec/dnssec-revoke.c | 33 +- bin/dnssec/dnssec-settime.c | 135 +- bin/dnssec/dnssec-signzone.c | 925 ++-- bin/dnssec/dnssec-verify.c | 67 +- bin/dnssec/dnssectool.c | 130 +- bin/named/builtin.c | 97 +- bin/named/config.c | 155 +- bin/named/control.c | 41 +- bin/named/controlconf.c | 355 +- bin/named/fuzz.c | 77 +- bin/named/geoip.c | 35 +- bin/named/include/named/control.h | 84 +- bin/named/include/named/log.h | 4 +- bin/named/include/named/server.h | 6 +- bin/named/log.c | 24 +- bin/named/logconf.c | 86 +- bin/named/main.c | 149 +- bin/named/server.c | 2843 +++++------ bin/named/statschannel.c | 472 +- bin/named/tkeyconf.c | 19 +- bin/named/tsigconf.c | 51 +- bin/named/unix/dlz_dlopen_driver.c | 140 +- bin/named/unix/os.c | 146 +- bin/named/win32/dlz_dlopen_driver.c | 140 +- bin/named/win32/ntservice.c | 34 +- bin/named/win32/os.c | 120 +- bin/named/zoneconf.c | 309 +- bin/nsupdate/nsupdate.c | 716 ++- bin/pkcs11/pkcs11-destroy.c | 50 +- bin/pkcs11/pkcs11-keygen.c | 105 +- bin/pkcs11/pkcs11-list.c | 51 +- bin/pkcs11/pkcs11-tokens.c | 14 +- bin/plugins/filter-aaaa.c | 219 +- bin/rndc/rndc.c | 216 +- bin/rndc/util.c | 8 +- bin/tests/cfg_test.c | 36 +- bin/tests/makejournal.c | 18 +- bin/tests/optional/adb_test.c | 75 +- bin/tests/optional/backtrace_test.c | 22 +- bin/tests/optional/byaddr_test.c | 47 +- bin/tests/optional/byname_test.c | 73 +- bin/tests/optional/db_test.c | 186 +- bin/tests/optional/fsaccess_test.c | 9 +- bin/tests/optional/gsstest.c | 127 +- bin/tests/optional/inter_test.c | 13 +- bin/tests/optional/lex_test.c | 21 +- bin/tests/optional/lfsr_test.c | 7 +- bin/tests/optional/log_test.c | 28 +- bin/tests/optional/master_test.c | 18 +- bin/tests/optional/mempool_test.c | 13 +- bin/tests/optional/name_test.c | 55 +- bin/tests/optional/nsecify.c | 46 +- bin/tests/optional/ratelimiter_test.c | 36 +- bin/tests/optional/rbt_test.c | 68 +- bin/tests/optional/rwlock_test.c | 13 +- bin/tests/optional/serial_test.c | 7 +- bin/tests/optional/shutdown_test.c | 57 +- bin/tests/optional/sig0_test.c | 84 +- bin/tests/optional/sock_test.c | 76 +- bin/tests/optional/sym_test.c | 22 +- bin/tests/optional/task_test.c | 28 +- bin/tests/optional/timer_test.c | 30 +- bin/tests/optional/zone_test.c | 67 +- bin/tests/pkcs11/benchmarks/create.c | 54 +- bin/tests/pkcs11/benchmarks/find.c | 46 +- bin/tests/pkcs11/benchmarks/genrsa.c | 66 +- bin/tests/pkcs11/benchmarks/login.c | 31 +- bin/tests/pkcs11/benchmarks/privrsa.c | 72 +- bin/tests/pkcs11/benchmarks/pubrsa.c | 60 +- bin/tests/pkcs11/benchmarks/session.c | 29 +- bin/tests/pkcs11/benchmarks/sha1.c | 42 +- bin/tests/pkcs11/benchmarks/sign.c | 78 +- bin/tests/pkcs11/benchmarks/verify.c | 66 +- bin/tests/system/dlzexternal/driver.c | 156 +- bin/tests/system/dyndb/driver/db.c | 199 +- bin/tests/system/dyndb/driver/driver.c | 25 +- bin/tests/system/dyndb/driver/instance.c | 16 +- bin/tests/system/dyndb/driver/lock.c | 6 +- bin/tests/system/dyndb/driver/log.c | 3 +- bin/tests/system/dyndb/driver/syncptr.c | 53 +- bin/tests/system/dyndb/driver/zone.c | 33 +- bin/tests/system/feature-test.c | 18 +- bin/tests/system/pipelined/pipequeries.c | 74 +- bin/tests/system/rndc/gencheck.c | 22 +- bin/tests/system/rpz/dnsrps.c | 27 +- bin/tests/system/rsabigexponent/bigkey.c | 34 +- bin/tests/system/tkey/keycreate.c | 83 +- bin/tests/system/tkey/keydelete.c | 55 +- bin/tests/wire_test.c | 74 +- bin/tools/arpaname.c | 5 +- bin/tools/dnstap-read.c | 73 +- bin/tools/mdig.c | 390 +- bin/tools/named-journalprint.c | 16 +- bin/tools/named-nzd2nzf.c | 19 +- bin/tools/named-rrchecker.c | 55 +- bin/tools/nsec3hash.c | 59 +- bin/win32/BINDInstall/AccountInfo.h | 6 +- bin/win32/BINDInstall/BINDInstall.h | 3 +- bin/win32/BINDInstall/BINDInstallDlg.h | 3 +- bin/win32/BINDInstall/DirBrowse.h | 13 +- bin/win32/BINDInstall/StdAfx.h | 2 +- bin/win32/BINDInstall/VersionInfo.h | 9 +- bin/win32/BINDInstall/resource.h | 184 +- contrib/dlz/bin/dlzbdb/dlzbdb.c | 134 +- contrib/dlz/drivers/dlz_bdb_driver.c | 84 +- contrib/dlz/drivers/dlz_bdbhpt_driver.c | 82 +- contrib/dlz/drivers/dlz_filesystem_driver.c | 100 +- contrib/dlz/drivers/dlz_ldap_driver.c | 99 +- contrib/dlz/drivers/dlz_mysql_driver.c | 85 +- contrib/dlz/drivers/dlz_odbc_driver.c | 131 +- contrib/dlz/drivers/dlz_postgres_driver.c | 68 +- contrib/dlz/drivers/dlz_stub_driver.c | 16 +- contrib/dlz/drivers/include/dlz/sdlz_helper.h | 8 +- contrib/dlz/drivers/sdlz_helper.c | 28 +- contrib/dlz/example/dlz_example.c | 81 +- .../dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c | 85 +- contrib/dlz/modules/common/dlz_dbi.c | 33 +- contrib/dlz/modules/filesystem/dir.c | 2 +- .../filesystem/dlz_filesystem_dynamic.c | 108 +- contrib/dlz/modules/include/dlz_dbi.h | 4 +- contrib/dlz/modules/include/dlz_minimal.h | 36 +- contrib/dlz/modules/include/dlz_pthread.h | 14 +- contrib/dlz/modules/ldap/dlz_ldap_dynamic.c | 100 +- contrib/dlz/modules/mysql/dlz_mysql_dynamic.c | 130 +- .../dlz/modules/mysqldyn/dlz_mysqldyn_mod.c | 171 +- contrib/dlz/modules/perl/dlz_perl_driver.c | 79 +- .../dlz/modules/sqlite3/dlz_sqlite3_dynamic.c | 126 +- .../modules/wildcard/dlz_wildcard_dynamic.c | 123 +- lib/bind9/check.c | 1024 ++-- lib/bind9/getaddresses.c | 17 +- lib/bind9/win32/DLLMain.c | 3 +- lib/dns/acl.c | 121 +- lib/dns/adb.c | 1055 ++-- lib/dns/badcache.c | 93 +- lib/dns/byaddr.c | 63 +- lib/dns/cache.c | 232 +- lib/dns/callbacks.c | 32 +- lib/dns/catz.c | 400 +- lib/dns/client.c | 664 ++- lib/dns/clientinfo.c | 8 +- lib/dns/compress.c | 117 +- lib/dns/db.c | 221 +- lib/dns/dbiterator.c | 30 +- lib/dns/dbtable.c | 53 +- lib/dns/diff.c | 122 +- lib/dns/dispatch.c | 781 ++- lib/dns/dlz.c | 65 +- lib/dns/dns64.c | 54 +- lib/dns/dnsrps.c | 186 +- lib/dns/dnssec.c | 411 +- lib/dns/dnstap.c | 190 +- lib/dns/ds.c | 24 +- lib/dns/dst_api.c | 523 +- lib/dns/dst_openssl.h | 4 +- lib/dns/dst_parse.c | 122 +- lib/dns/dst_parse.h | 70 +- lib/dns/dst_result.c | 12 +- lib/dns/dyndb.c | 91 +- lib/dns/ecdb.c | 208 +- lib/dns/ecs.c | 6 +- lib/dns/fixedname.c | 12 +- lib/dns/forward.c | 44 +- lib/dns/gen-unix.h | 11 +- lib/dns/gen-win32.h | 15 +- lib/dns/gen.c | 252 +- lib/dns/geoip2.c | 57 +- lib/dns/gssapi_link.c | 93 +- lib/dns/gssapictx.c | 130 +- lib/dns/hmac_link.c | 143 +- lib/dns/include/dns/acl.h | 2 +- lib/dns/include/dns/adb.h | 14 +- lib/dns/include/dns/bit.h | 2 +- lib/dns/include/dns/callbacks.h | 2 +- lib/dns/include/dns/catz.h | 6 +- lib/dns/include/dns/clientinfo.h | 2 +- lib/dns/include/dns/compress.h | 14 +- lib/dns/include/dns/db.h | 32 +- lib/dns/include/dns/dbiterator.h | 2 +- lib/dns/include/dns/diff.h | 4 +- lib/dns/include/dns/dispatch.h | 16 +- lib/dns/include/dns/dlz.h | 2 +- lib/dns/include/dns/dlz_dlopen.h | 2 +- lib/dns/include/dns/dns64.h | 2 +- lib/dns/include/dns/ds.h | 4 +- lib/dns/include/dns/dyndb.h | 4 +- lib/dns/include/dns/events.h | 116 +- lib/dns/include/dns/iptable.h | 2 +- lib/dns/include/dns/journal.h | 4 +- lib/dns/include/dns/kasp.h | 22 +- lib/dns/include/dns/keyvalues.h | 82 +- lib/dns/include/dns/librpz.h | 26 +- lib/dns/include/dns/log.h | 94 +- lib/dns/include/dns/master.h | 20 +- lib/dns/include/dns/message.h | 54 +- lib/dns/include/dns/name.h | 53 +- lib/dns/include/dns/nta.h | 2 +- lib/dns/include/dns/peer.h | 4 +- lib/dns/include/dns/rbt.h | 6 +- lib/dns/include/dns/rdata.h | 16 +- lib/dns/include/dns/rdataset.h | 54 +- lib/dns/include/dns/rdatasetiter.h | 2 +- lib/dns/include/dns/request.h | 6 +- lib/dns/include/dns/resolver.h | 32 +- lib/dns/include/dns/result.h | 258 +- lib/dns/include/dns/rpz.h | 32 +- lib/dns/include/dns/rriterator.h | 2 +- lib/dns/include/dns/rrl.h | 6 +- lib/dns/include/dns/sdb.h | 4 +- lib/dns/include/dns/sdlz.h | 2 +- lib/dns/include/dns/stats.h | 12 +- lib/dns/include/dns/tkey.h | 8 +- lib/dns/include/dns/types.h | 2 +- lib/dns/include/dns/validator.h | 8 +- lib/dns/include/dns/view.h | 2 +- lib/dns/include/dns/zone.h | 8 +- lib/dns/include/dns/zt.h | 2 +- lib/dns/include/dst/dst.h | 106 +- lib/dns/include/dst/result.h | 28 +- lib/dns/ipkeylist.c | 24 +- lib/dns/iptable.c | 36 +- lib/dns/journal.c | 438 +- lib/dns/kasp.c | 126 +- lib/dns/key.c | 56 +- lib/dns/keydata.c | 6 +- lib/dns/keymgr.c | 182 +- lib/dns/keytable.c | 181 +- lib/dns/lib.c | 17 +- lib/dns/log.c | 6 +- lib/dns/lookup.c | 84 +- lib/dns/master.c | 580 +-- lib/dns/masterdump.c | 399 +- lib/dns/message.c | 705 ++- lib/dns/name.c | 381 +- lib/dns/ncache.c | 161 +- lib/dns/nsec.c | 95 +- lib/dns/nsec3.c | 458 +- lib/dns/nta.c | 163 +- lib/dns/openssl_link.c | 45 +- lib/dns/openssldh_link.c | 119 +- lib/dns/opensslecdsa_link.c | 176 +- lib/dns/openssleddsa_link.c | 187 +- lib/dns/opensslrsa_link.c | 190 +- lib/dns/order.c | 31 +- lib/dns/peer.c | 234 +- lib/dns/pkcs11.c | 3 +- lib/dns/pkcs11ecdsa_link.c | 363 +- lib/dns/pkcs11eddsa_link.c | 318 +- lib/dns/pkcs11rsa_link.c | 589 +-- lib/dns/portlist.c | 46 +- lib/dns/private.c | 67 +- lib/dns/rbt.c | 556 +- lib/dns/rbtdb.c | 2033 ++++---- lib/dns/rcode.c | 171 +- lib/dns/rdata.c | 491 +- lib/dns/rdata/any_255/tsig_250.c | 109 +- lib/dns/rdata/ch_3/a_1.c | 93 +- lib/dns/rdata/generic/afsdb_18.c | 94 +- lib/dns/rdata/generic/amtrelay_260.c | 94 +- lib/dns/rdata/generic/avc_258.c | 52 +- lib/dns/rdata/generic/caa_257.c | 68 +- lib/dns/rdata/generic/cdnskey_60.c | 52 +- lib/dns/rdata/generic/cds_59.c | 52 +- lib/dns/rdata/generic/cert_37.c | 60 +- lib/dns/rdata/generic/cname_5.c | 78 +- lib/dns/rdata/generic/csync_62.c | 60 +- lib/dns/rdata/generic/dlv_32769.c | 52 +- lib/dns/rdata/generic/dname_39.c | 78 +- lib/dns/rdata/generic/dnskey_48.c | 52 +- lib/dns/rdata/generic/doa_259.c | 58 +- lib/dns/rdata/generic/ds_43.c | 83 +- lib/dns/rdata/generic/eui48_108.c | 61 +- lib/dns/rdata/generic/eui64_109.c | 61 +- lib/dns/rdata/generic/gpos_27.c | 58 +- lib/dns/rdata/generic/hinfo_13.c | 56 +- lib/dns/rdata/generic/hip_55.c | 105 +- lib/dns/rdata/generic/ipseckey_45.c | 96 +- lib/dns/rdata/generic/isdn_20.c | 58 +- lib/dns/rdata/generic/key_25.c | 104 +- lib/dns/rdata/generic/keydata_65533.c | 78 +- lib/dns/rdata/generic/l32_105.c | 66 +- lib/dns/rdata/generic/l64_106.c | 60 +- lib/dns/rdata/generic/loc_29.c | 134 +- lib/dns/rdata/generic/lp_107.c | 86 +- lib/dns/rdata/generic/mb_7.c | 82 +- lib/dns/rdata/generic/md_3.c | 82 +- lib/dns/rdata/generic/mf_4.c | 82 +- lib/dns/rdata/generic/mg_8.c | 78 +- lib/dns/rdata/generic/minfo_14.c | 92 +- lib/dns/rdata/generic/mr_9.c | 78 +- lib/dns/rdata/generic/mx_15.c | 110 +- lib/dns/rdata/generic/naptr_35.c | 119 +- lib/dns/rdata/generic/nid_104.c | 60 +- lib/dns/rdata/generic/ninfo_56.c | 63 +- lib/dns/rdata/generic/ns_2.c | 86 +- lib/dns/rdata/generic/nsec3_50.c | 74 +- lib/dns/rdata/generic/nsec3param_51.c | 70 +- lib/dns/rdata/generic/nsec_47.c | 76 +- lib/dns/rdata/generic/null_10.c | 54 +- lib/dns/rdata/generic/nxt_30.c | 98 +- lib/dns/rdata/generic/openpgpkey_61.c | 54 +- lib/dns/rdata/generic/opt_41.c | 81 +- lib/dns/rdata/generic/proforma.c | 39 +- lib/dns/rdata/generic/proforma.h | 3 +- lib/dns/rdata/generic/ptr_12.c | 106 +- lib/dns/rdata/generic/rkey_57.c | 52 +- lib/dns/rdata/generic/rp_17.c | 92 +- lib/dns/rdata/generic/rrsig_46.c | 117 +- lib/dns/rdata/generic/rt_21.c | 98 +- lib/dns/rdata/generic/sig_24.c | 107 +- lib/dns/rdata/generic/sink_40.c | 58 +- lib/dns/rdata/generic/smimea_53.c | 52 +- lib/dns/rdata/generic/soa_6.c | 108 +- lib/dns/rdata/generic/spf_99.c | 52 +- lib/dns/rdata/generic/sshfp_44.c | 61 +- lib/dns/rdata/generic/ta_32768.c | 52 +- lib/dns/rdata/generic/talink_58.c | 80 +- lib/dns/rdata/generic/tkey_249.c | 90 +- lib/dns/rdata/generic/tlsa_52.c | 80 +- lib/dns/rdata/generic/txt_16.c | 104 +- lib/dns/rdata/generic/uri_256.c | 60 +- lib/dns/rdata/generic/x25_19.c | 58 +- lib/dns/rdata/generic/zonemd_63.c | 63 +- lib/dns/rdata/hs_4/a_1.c | 62 +- lib/dns/rdata/in_1/a6_38.c | 112 +- lib/dns/rdata/in_1/a_1.c | 62 +- lib/dns/rdata/in_1/aaaa_28.c | 64 +- lib/dns/rdata/in_1/apl_42.c | 104 +- lib/dns/rdata/in_1/atma_34.c | 66 +- lib/dns/rdata/in_1/dhcid_49.c | 54 +- lib/dns/rdata/in_1/eid_31.c | 54 +- lib/dns/rdata/in_1/kx_36.c | 90 +- lib/dns/rdata/in_1/nimloc_32.c | 54 +- lib/dns/rdata/in_1/nsap-ptr_23.c | 78 +- lib/dns/rdata/in_1/nsap_22.c | 66 +- lib/dns/rdata/in_1/px_26.c | 88 +- lib/dns/rdata/in_1/srv_33.c | 102 +- lib/dns/rdata/in_1/wks_11.c | 106 +- lib/dns/rdatalist.c | 110 +- lib/dns/rdataset.c | 152 +- lib/dns/rdatasetiter.c | 13 +- lib/dns/rdataslab.c | 111 +- lib/dns/request.c | 367 +- lib/dns/resolver.c | 2468 +++++---- lib/dns/result.c | 17 +- lib/dns/rootns.c | 98 +- lib/dns/rpz.c | 344 +- lib/dns/rriterator.c | 21 +- lib/dns/rrl.c | 181 +- lib/dns/sdb.c | 429 +- lib/dns/sdlz.c | 476 +- lib/dns/soa.c | 47 +- lib/dns/spnego.c | 387 +- lib/dns/spnego_asn1.c | 128 +- lib/dns/ssu.c | 120 +- lib/dns/ssu_external.c | 39 +- lib/dns/stats.c | 139 +- lib/dns/tcpmsg.c | 49 +- lib/dns/tests/acl_test.c | 31 +- lib/dns/tests/db_test.c | 82 +- lib/dns/tests/dbdiff_test.c | 54 +- lib/dns/tests/dbiterator_test.c | 135 +- lib/dns/tests/dbversion_test.c | 106 +- lib/dns/tests/dh_test.c | 25 +- lib/dns/tests/dispatch_test.c | 85 +- lib/dns/tests/dnstap_test.c | 92 +- lib/dns/tests/dnstest.c | 142 +- lib/dns/tests/dst_test.c | 69 +- lib/dns/tests/geoip_test.c | 79 +- lib/dns/tests/keytable_test.c | 116 +- lib/dns/tests/master_test.c | 140 +- lib/dns/tests/name_test.c | 191 +- lib/dns/tests/nsec3_test.c | 36 +- lib/dns/tests/peer_test.c | 23 +- lib/dns/tests/private_test.c | 72 +- lib/dns/tests/rbt_serialize_test.c | 118 +- lib/dns/tests/rbt_test.c | 269 +- lib/dns/tests/rdata_test.c | 216 +- lib/dns/tests/rdataset_test.c | 19 +- lib/dns/tests/rdatasetstats_test.c | 53 +- lib/dns/tests/resolver_test.c | 52 +- lib/dns/tests/result_test.c | 20 +- lib/dns/tests/rsa_test.c | 27 +- lib/dns/tests/sigs_test.c | 86 +- lib/dns/tests/time_test.c | 90 +- lib/dns/tests/tsig_test.c | 116 +- lib/dns/tests/update_test.c | 54 +- lib/dns/tests/zonemgr_test.c | 40 +- lib/dns/tests/zt_test.c | 80 +- lib/dns/time.c | 36 +- lib/dns/timer.c | 7 +- lib/dns/tkey.c | 287 +- lib/dns/tsec.c | 26 +- lib/dns/tsig.c | 381 +- lib/dns/ttl.c | 26 +- lib/dns/update.c | 396 +- lib/dns/validator.c | 626 +-- lib/dns/view.c | 385 +- lib/dns/win32/DLLMain.c | 3 +- lib/dns/xfrin.c | 354 +- lib/dns/zone.c | 4538 ++++++++--------- lib/dns/zonekey.c | 7 +- lib/dns/zoneverify.c | 505 +- lib/dns/zt.c | 161 +- lib/irs/context.c | 82 +- lib/irs/dnsconf.c | 70 +- lib/irs/gai_strerror.c | 8 +- lib/irs/getaddrinfo.c | 239 +- lib/irs/getnameinfo.c | 51 +- lib/irs/resconf.c | 138 +- lib/irs/tests/resconf_test.c | 18 +- lib/irs/win32/DLLMain.c | 3 +- lib/irs/win32/include/irs/netdb.h | 56 +- lib/irs/win32/resconf.c | 24 +- lib/isc/aes.c | 17 +- lib/isc/app.c | 109 +- lib/isc/assertions.c | 24 +- lib/isc/astack.c | 20 +- lib/isc/backtrace-emptytbl.c | 2 +- lib/isc/backtrace.c | 49 +- lib/isc/base32.c | 105 +- lib/isc/base64.c | 57 +- lib/isc/buffer.c | 149 +- lib/isc/bufferlist.c | 10 +- lib/isc/commandline.c | 15 +- lib/isc/counter.c | 29 +- lib/isc/crc64.c | 11 +- lib/isc/entropy.c | 3 +- lib/isc/error.c | 29 +- lib/isc/event.c | 14 +- lib/isc/fsaccess.c | 11 +- lib/isc/hash.c | 16 +- lib/isc/heap.c | 61 +- lib/isc/hex.c | 51 +- lib/isc/hmac.c | 33 +- lib/isc/hp.c | 46 +- lib/isc/ht.c | 80 +- lib/isc/httpd.c | 276 +- lib/isc/include/isc/app.h | 4 +- lib/isc/include/isc/buffer.h | 92 +- lib/isc/include/isc/event.h | 2 +- lib/isc/include/isc/eventclass.h | 18 +- lib/isc/include/isc/fsaccess.h | 12 +- lib/isc/include/isc/httpd.h | 2 +- lib/isc/include/isc/interfaceiter.h | 4 +- lib/isc/include/isc/lang.h | 2 +- lib/isc/include/isc/lex.h | 24 +- lib/isc/include/isc/likely.h | 6 +- lib/isc/include/isc/list.h | 6 +- lib/isc/include/isc/log.h | 52 +- lib/isc/include/isc/md.h | 14 +- lib/isc/include/isc/mem.h | 20 +- lib/isc/include/isc/radix.h | 12 +- lib/isc/include/isc/refcount.h | 9 +- lib/isc/include/isc/result.h | 142 +- lib/isc/include/isc/resultclass.h | 18 +- lib/isc/include/isc/socket.h | 16 +- lib/isc/include/isc/task.h | 8 +- lib/isc/include/isc/timer.h | 10 +- lib/isc/include/isc/util.h | 38 +- lib/isc/include/pk11/result.h | 6 +- lib/isc/include/pkcs11/pkcs11.h | 1412 ++--- lib/isc/iterated_hash.c | 13 +- lib/isc/lex.c | 189 +- lib/isc/lfsr.c | 22 +- lib/isc/lib.c | 3 +- lib/isc/log.c | 360 +- lib/isc/md.c | 38 +- lib/isc/mem.c | 509 +- lib/isc/mutexblock.c | 6 +- lib/isc/netaddr.c | 81 +- lib/isc/netmgr/netmgr-int.h | 8 +- lib/isc/netmgr/netmgr.c | 218 +- lib/isc/netmgr/tcp.c | 197 +- lib/isc/netmgr/tcpdns.c | 84 +- lib/isc/netmgr/udp.c | 89 +- lib/isc/netmgr/uv-compat.c | 35 +- lib/isc/netmgr/uv-compat.h | 6 +- lib/isc/netmgr/uverr2result.c | 3 +- lib/isc/netscope.c | 8 +- lib/isc/nonce.c | 3 +- lib/isc/openssl_shim.c | 30 +- lib/isc/parseint.c | 17 +- lib/isc/pk11.c | 246 +- lib/isc/pk11_result.c | 12 +- lib/isc/pool.c | 35 +- lib/isc/portset.c | 35 +- lib/isc/pthreads/condition.c | 9 +- lib/isc/pthreads/mutex.c | 71 +- lib/isc/pthreads/thread.c | 21 +- lib/isc/queue.c | 60 +- lib/isc/quota.c | 45 +- lib/isc/radix.c | 102 +- lib/isc/random.c | 20 +- lib/isc/ratelimiter.c | 75 +- lib/isc/regex.c | 51 +- lib/isc/region.c | 5 +- lib/isc/result.c | 39 +- lib/isc/rwlock.c | 95 +- lib/isc/serial.c | 18 +- lib/isc/siphash.c | 5 +- lib/isc/sockaddr.c | 106 +- lib/isc/stats.c | 45 +- lib/isc/string.c | 19 +- lib/isc/symtab.c | 64 +- lib/isc/task.c | 372 +- lib/isc/taskpool.c | 41 +- lib/isc/tests/aes_test.c | 31 +- lib/isc/tests/buffer_test.c | 40 +- lib/isc/tests/counter_test.c | 19 +- lib/isc/tests/crc64_test.c | 19 +- lib/isc/tests/errno_test.c | 13 +- lib/isc/tests/file_test.c | 31 +- lib/isc/tests/hash_test.c | 12 +- lib/isc/tests/heap_test.c | 25 +- lib/isc/tests/hmac_test.c | 60 +- lib/isc/tests/ht_test.c | 74 +- lib/isc/tests/isctest.c | 33 +- lib/isc/tests/lex_test.c | 32 +- lib/isc/tests/md_test.c | 60 +- lib/isc/tests/mem_test.c | 120 +- lib/isc/tests/netaddr_test.c | 41 +- lib/isc/tests/parse_test.c | 17 +- lib/isc/tests/pool_test.c | 39 +- lib/isc/tests/radix_test.c | 23 +- lib/isc/tests/random_test.c | 191 +- lib/isc/tests/regex_test.c | 23 +- lib/isc/tests/result_test.c | 20 +- lib/isc/tests/safe_test.c | 12 +- lib/isc/tests/siphash_test.c | 23 +- lib/isc/tests/sockaddr_test.c | 43 +- lib/isc/tests/socket_test.c | 186 +- lib/isc/tests/symtab_test.c | 26 +- lib/isc/tests/task_test.c | 266 +- lib/isc/tests/taskpool_test.c | 36 +- lib/isc/tests/time_test.c | 48 +- lib/isc/tests/timer_test.c | 154 +- lib/isc/timer.c | 147 +- lib/isc/tm.c | 22 +- lib/isc/unix/dir.c | 39 +- lib/isc/unix/errno.c | 3 +- lib/isc/unix/errno2result.c | 3 +- lib/isc/unix/file.c | 202 +- lib/isc/unix/fsaccess.c | 11 +- lib/isc/unix/ifiter_getifaddrs.c | 40 +- lib/isc/unix/include/isc/net.h | 10 +- lib/isc/unix/include/isc/stdatomic.h | 6 +- lib/isc/unix/interfaceiter.c | 48 +- lib/isc/unix/meminfo.c | 5 +- lib/isc/unix/net.c | 166 +- lib/isc/unix/os.c | 11 +- lib/isc/unix/pk11_api.c | 185 +- lib/isc/unix/resource.c | 28 +- lib/isc/unix/socket.c | 947 ++-- lib/isc/unix/stdio.c | 30 +- lib/isc/unix/stdtime.c | 6 +- lib/isc/unix/syslog.c | 5 +- lib/isc/unix/time.c | 127 +- lib/isc/win32/DLLMain.c | 3 +- lib/isc/win32/condition.c | 49 +- lib/isc/win32/dir.c | 42 +- lib/isc/win32/errno.c | 3 +- lib/isc/win32/errno2result.c | 3 +- lib/isc/win32/file.c | 209 +- lib/isc/win32/fsaccess.c | 105 +- lib/isc/win32/include/isc/bind_registry.h | 8 +- lib/isc/win32/include/isc/mutex.h | 4 +- lib/isc/win32/include/isc/net.h | 12 +- lib/isc/win32/include/isc/ntpaths.h | 10 +- lib/isc/win32/include/isc/once.h | 2 +- lib/isc/win32/include/isc/stat.h | 14 +- lib/isc/win32/include/isc/stdatomic.h | 34 +- lib/isc/win32/include/isc/thread.h | 21 +- lib/isc/win32/interfaceiter.c | 105 +- lib/isc/win32/meminfo.c | 3 +- lib/isc/win32/net.c | 79 +- lib/isc/win32/netdb.h | 64 +- lib/isc/win32/ntgroups.c | 29 +- lib/isc/win32/ntpaths.c | 14 +- lib/isc/win32/once.c | 3 +- lib/isc/win32/os.c | 8 +- lib/isc/win32/pk11_api.c | 132 +- lib/isc/win32/resource.c | 11 +- lib/isc/win32/socket.c | 678 ++- lib/isc/win32/stdio.c | 30 +- lib/isc/win32/stdtime.c | 3 +- lib/isc/win32/syslog.c | 33 +- lib/isc/win32/syslog.h | 26 +- lib/isc/win32/thread.c | 15 +- lib/isc/win32/time.c | 122 +- lib/isc/win32/unistd.h | 2 +- lib/isc/win32/win32os.c | 20 +- lib/isc/xoshiro128starstar.c | 6 +- lib/isccc/alist.c | 50 +- lib/isccc/base64.c | 6 +- lib/isccc/cc.c | 221 +- lib/isccc/ccmsg.c | 41 +- lib/isccc/include/isccc/cc.h | 6 +- lib/isccc/include/isccc/events.h | 2 +- lib/isccc/include/isccc/sexpr.h | 8 +- lib/isccc/include/isccc/symtype.h | 6 +- lib/isccc/include/isccc/util.h | 2 +- lib/isccc/result.c | 12 +- lib/isccc/sexpr.c | 62 +- lib/isccc/symtab.c | 60 +- lib/isccc/tests/result_test.c | 14 +- lib/isccc/win32/DLLMain.c | 3 +- lib/isccfg/aclconf.c | 123 +- lib/isccfg/include/isccfg/cfg.h | 2 +- lib/isccfg/include/isccfg/grammar.h | 30 +- lib/isccfg/kaspconf.c | 37 +- lib/isccfg/log.c | 3 +- lib/isccfg/namedconf.c | 685 ++- lib/isccfg/parser.c | 905 ++-- lib/isccfg/tests/duration_test.c | 40 +- lib/isccfg/tests/parser_test.c | 41 +- lib/isccfg/win32/DLLMain.c | 3 +- lib/ns/client.c | 518 +- lib/ns/hooks.c | 89 +- lib/ns/include/ns/client.h | 30 +- lib/ns/include/ns/hooks.h | 2 +- lib/ns/include/ns/interfacemgr.h | 2 +- lib/ns/include/ns/log.h | 28 +- lib/ns/include/ns/query.h | 32 +- lib/ns/include/ns/server.h | 26 +- lib/ns/interfacemgr.c | 258 +- lib/ns/lib.c | 15 +- lib/ns/listenlist.c | 30 +- lib/ns/log.c | 6 +- lib/ns/notify.c | 30 +- lib/ns/query.c | 1977 ++++--- lib/ns/server.c | 20 +- lib/ns/sortlist.c | 36 +- lib/ns/stats.c | 34 +- lib/ns/tests/listenlist_test.c | 25 +- lib/ns/tests/notify_test.c | 34 +- lib/ns/tests/nstest.c | 172 +- lib/ns/tests/plugin_test.c | 39 +- lib/ns/tests/query_test.c | 114 +- lib/ns/tests/wrap.c | 6 +- lib/ns/update.c | 670 ++- lib/ns/win32/DLLMain.c | 3 +- lib/ns/xfrout.c | 405 +- lib/samples/nsprobe.c | 253 +- lib/samples/resolve.c | 124 +- lib/samples/sample-async.c | 93 +- lib/samples/sample-gai.c | 10 +- lib/samples/sample-request.c | 41 +- lib/samples/sample-update.c | 162 +- lib/win32/bindevt/bindevt.c | 3 +- 669 files changed, 35995 insertions(+), 42219 deletions(-) diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c index e1b370ecb8..5f00121d26 100644 --- a/bin/check/check-tool.c +++ b/bin/check/check-tool.c @@ -67,20 +67,20 @@ goto cleanup; \ } while (0) -#define ERR_IS_CNAME 1 -#define ERR_NO_ADDRESSES 2 +#define ERR_IS_CNAME 1 +#define ERR_NO_ADDRESSES 2 #define ERR_LOOKUP_FAILURE 3 -#define ERR_EXTRA_A 4 -#define ERR_EXTRA_AAAA 5 -#define ERR_MISSING_GLUE 5 -#define ERR_IS_MXCNAME 6 -#define ERR_IS_SRVCNAME 7 +#define ERR_EXTRA_A 4 +#define ERR_EXTRA_AAAA 5 +#define ERR_MISSING_GLUE 5 +#define ERR_IS_MXCNAME 6 +#define ERR_IS_SRVCNAME 7 static const char *dbtype[] = { "rbt" }; -int debug = 0; +int debug = 0; const char *journal = NULL; -bool nomerge = true; +bool nomerge = true; #if CHECK_LOCAL bool docheckmx = true; bool dochecksrv = true; @@ -107,20 +107,18 @@ static isc_logcategory_t categories[] = { { "", 0 }, { NULL, 0 } }; static isc_symtab_t *symtab = NULL; -static isc_mem_t * sym_mctx; +static isc_mem_t *sym_mctx; static void -freekey(char *key, unsigned int type, isc_symvalue_t value, void *userarg) -{ +freekey(char *key, unsigned int type, isc_symvalue_t value, void *userarg) { UNUSED(type); UNUSED(value); isc_mem_free(userarg, key); } static void -add(char *key, int value) -{ - isc_result_t result; +add(char *key, int value) { + isc_result_t result; isc_symvalue_t symvalue; if (sym_mctx == NULL) { @@ -146,8 +144,7 @@ add(char *key, int value) } static bool -logged(char *key, int value) -{ +logged(char *key, int value) { isc_result_t result; if (symtab == NULL) { @@ -163,19 +160,18 @@ logged(char *key, int value) static bool checkns(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner, - dns_rdataset_t *a, dns_rdataset_t *aaaa) -{ + dns_rdataset_t *a, dns_rdataset_t *aaaa) { dns_rdataset_t *rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_t rdata = DNS_RDATA_INIT; struct addrinfo hints, *ai, *cur; - char namebuf[DNS_NAME_FORMATSIZE + 1]; - char ownerbuf[DNS_NAME_FORMATSIZE]; + char namebuf[DNS_NAME_FORMATSIZE + 1]; + char ownerbuf[DNS_NAME_FORMATSIZE]; char addrbuf[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:123.123.123.123")]; bool answer = true; bool match; const char *type; - void * ptr = NULL; - int result; + void *ptr = NULL; + int result; REQUIRE(a == NULL || !dns_rdataset_isassociated(a) || a->type == dns_rdatatype_a); @@ -216,7 +212,8 @@ checkns(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner, } if (cur != NULL && cur->ai_canonname != NULL && strcasecmp(cur->ai_canonname, namebuf) != 0 && - !logged(namebuf, ERR_IS_CNAME)) { + !logged(namebuf, ERR_IS_CNAME)) + { dns_zone_log(zone, ISC_LOG_ERROR, "%s/NS '%s' (out of zone) " "is a CNAME '%s' (illegal)", @@ -350,8 +347,8 @@ checkmissing: } while (result == ISC_R_SUCCESS && !match) { dns_rdataset_current(rdataset, &rdata); - if (memcmp(ptr, rdata.data, rdata.length) == - 0) { + if (memcmp(ptr, rdata.data, rdata.length) == 0) + { match = true; } dns_rdata_reset(&rdata); @@ -379,14 +376,13 @@ checkmissing: } static bool -checkmx(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner) -{ +checkmx(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner) { struct addrinfo hints, *ai, *cur; - char namebuf[DNS_NAME_FORMATSIZE + 1]; - char ownerbuf[DNS_NAME_FORMATSIZE]; - int result; - int level = ISC_LOG_ERROR; - bool answer = true; + char namebuf[DNS_NAME_FORMATSIZE + 1]; + char ownerbuf[DNS_NAME_FORMATSIZE]; + int result; + int level = ISC_LOG_ERROR; + bool answer = true; memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_CANONNAME; @@ -417,7 +413,8 @@ checkmx(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner) cur = cur->ai_next; } if (cur != NULL && cur->ai_canonname != NULL && - strcasecmp(cur->ai_canonname, namebuf) != 0) { + strcasecmp(cur->ai_canonname, namebuf) != 0) + { if ((zone_options & DNS_ZONEOPT_WARNMXCNAME) != 0) { level = ISC_LOG_WARNING; } @@ -465,14 +462,13 @@ checkmx(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner) } static bool -checksrv(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner) -{ +checksrv(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner) { struct addrinfo hints, *ai, *cur; - char namebuf[DNS_NAME_FORMATSIZE + 1]; - char ownerbuf[DNS_NAME_FORMATSIZE]; - int result; - int level = ISC_LOG_ERROR; - bool answer = true; + char namebuf[DNS_NAME_FORMATSIZE + 1]; + char ownerbuf[DNS_NAME_FORMATSIZE]; + int result; + int level = ISC_LOG_ERROR; + bool answer = true; memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_CANONNAME; @@ -503,7 +499,8 @@ checksrv(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner) cur = cur->ai_next; } if (cur != NULL && cur->ai_canonname != NULL && - strcasecmp(cur->ai_canonname, namebuf) != 0) { + strcasecmp(cur->ai_canonname, namebuf) != 0) + { if ((zone_options & DNS_ZONEOPT_WARNSRVCNAME) != 0) { level = ISC_LOG_WARNING; } @@ -551,11 +548,10 @@ checksrv(dns_zone_t *zone, const dns_name_t *name, const dns_name_t *owner) } isc_result_t -setup_logging(isc_mem_t *mctx, FILE *errout, isc_log_t **logp) -{ +setup_logging(isc_mem_t *mctx, FILE *errout, isc_log_t **logp) { isc_logdestination_t destination; - isc_logconfig_t * logconfig = NULL; - isc_log_t * log = NULL; + isc_logconfig_t *logconfig = NULL; + isc_log_t *log = NULL; RUNTIME_CHECK(isc_log_create(mctx, &log, &logconfig) == ISC_R_SUCCESS); isc_log_registercategories(log, categories); @@ -581,17 +577,16 @@ setup_logging(isc_mem_t *mctx, FILE *errout, isc_log_t **logp) /*% scan the zone for oversize TTLs */ static isc_result_t -check_ttls(dns_zone_t *zone, dns_ttl_t maxttl) -{ - isc_result_t result; - dns_db_t * db = NULL; - dns_dbversion_t * version = NULL; - dns_dbnode_t * node = NULL; - dns_dbiterator_t * dbiter = NULL; +check_ttls(dns_zone_t *zone, dns_ttl_t maxttl) { + isc_result_t result; + dns_db_t *db = NULL; + dns_dbversion_t *version = NULL; + dns_dbnode_t *node = NULL; + dns_dbiterator_t *dbiter = NULL; dns_rdatasetiter_t *rdsiter = NULL; - dns_rdataset_t rdataset; - dns_fixedname_t fname; - dns_name_t * name; + dns_rdataset_t rdataset; + dns_fixedname_t fname; + dns_name_t *name; name = dns_fixedname_initname(&fname); dns_rdataset_init(&rdataset); @@ -602,7 +597,8 @@ check_ttls(dns_zone_t *zone, dns_ttl_t maxttl) CHECK(dns_db_createiterator(db, 0, &dbiter)); for (result = dns_dbiterator_first(dbiter); result == ISC_R_SUCCESS; - result = dns_dbiterator_next(dbiter)) { + result = dns_dbiterator_next(dbiter)) + { result = dns_dbiterator_current(dbiter, &node, name); if (result == DNS_R_NEWORIGIN) { result = ISC_R_SUCCESS; @@ -612,11 +608,12 @@ check_ttls(dns_zone_t *zone, dns_ttl_t maxttl) CHECK(dns_db_allrdatasets(db, node, version, 0, &rdsiter)); for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(rdsiter)) { + result = dns_rdatasetiter_next(rdsiter)) + { dns_rdatasetiter_current(rdsiter, &rdataset); if (rdataset.ttl > maxttl) { - char nbuf[DNS_NAME_FORMATSIZE]; - char tbuf[255]; + char nbuf[DNS_NAME_FORMATSIZE]; + char tbuf[255]; isc_buffer_t b; isc_region_t r; @@ -672,15 +669,14 @@ cleanup: isc_result_t load_zone(isc_mem_t *mctx, const char *zonename, const char *filename, dns_masterformat_t fileformat, const char *classname, - dns_ttl_t maxttl, dns_zone_t **zonep) -{ - isc_result_t result; + dns_ttl_t maxttl, dns_zone_t **zonep) { + isc_result_t result; dns_rdataclass_t rdclass; isc_textregion_t region; - isc_buffer_t buffer; - dns_fixedname_t fixorigin; - dns_name_t * origin; - dns_zone_t * zone = NULL; + isc_buffer_t buffer; + dns_fixedname_t fixorigin; + dns_name_t *origin; + dns_zone_t *zone = NULL; REQUIRE(zonep == NULL || *zonep == NULL); @@ -751,11 +747,10 @@ cleanup: isc_result_t dump_zone(const char *zonename, dns_zone_t *zone, const char *filename, dns_masterformat_t fileformat, const dns_master_style_t *style, - const uint32_t rawversion) -{ + const uint32_t rawversion) { isc_result_t result; - FILE * output = stdout; - const char * flags; + FILE *output = stdout; + const char *flags; flags = (fileformat == dns_masterformat_text) ? "w" : "wb"; @@ -791,11 +786,10 @@ dump_zone(const char *zonename, dns_zone_t *zone, const char *filename, #ifdef _WIN32 void -InitSockets(void) -{ - WORD wVersionRequested; +InitSockets(void) { + WORD wVersionRequested; WSADATA wsaData; - int err; + int err; wVersionRequested = MAKEWORD(2, 0); @@ -807,8 +801,7 @@ InitSockets(void) } void -DestroySockets(void) -{ +DestroySockets(void) { WSACleanup(); } #endif /* ifdef _WIN32 */ diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c index c1ba60e35c..fa40d2eb53 100644 --- a/bin/check/named-checkconf.c +++ b/bin/check/named-checkconf.c @@ -56,12 +56,10 @@ 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) -{ +usage(void) { fprintf(stderr, "usage: %s [-chijlvz] [-p [-x]] [-t directory] " "[named.conf]\n", @@ -71,10 +69,9 @@ usage(void) /*% directory callback */ static isc_result_t -directory_callback(const char *clausename, const cfg_obj_t *obj, void *arg) -{ +directory_callback(const char *clausename, const cfg_obj_t *obj, void *arg) { isc_result_t result; - const char * directory; + const char *directory; REQUIRE(strcasecmp("directory", clausename) == 0); @@ -97,8 +94,7 @@ directory_callback(const char *clausename, const cfg_obj_t *obj, void *arg) } static bool -get_maps(const cfg_obj_t **maps, const char *name, const cfg_obj_t **obj) -{ +get_maps(const cfg_obj_t **maps, const char *name, const cfg_obj_t **obj) { int i; for (i = 0;; i++) { if (maps[i] == NULL) { @@ -111,14 +107,13 @@ get_maps(const cfg_obj_t **maps, const char *name, const cfg_obj_t **obj) } static bool -get_checknames(const cfg_obj_t **maps, const cfg_obj_t **obj) -{ +get_checknames(const cfg_obj_t **maps, const cfg_obj_t **obj) { const cfg_listelt_t *element; - const cfg_obj_t * checknames; - const cfg_obj_t * type; - const cfg_obj_t * value; - isc_result_t result; - int i; + const cfg_obj_t *checknames; + const cfg_obj_t *type; + const cfg_obj_t *value; + isc_result_t result; + int i; for (i = 0;; i++) { if (maps[i] == NULL) { @@ -134,13 +129,14 @@ get_checknames(const cfg_obj_t **maps, const cfg_obj_t **obj) return (true); } for (element = cfg_list_first(checknames); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { value = cfg_listelt_value(element); type = cfg_tuple_get(value, "type"); if ((strcasecmp(cfg_obj_asstring(type), "primary") != 0) && - (strcasecmp(cfg_obj_asstring(type), "master") != - 0)) { + (strcasecmp(cfg_obj_asstring(type), "master") != 0)) + { continue; } *obj = cfg_tuple_get(value, "mode"); @@ -150,10 +146,9 @@ get_checknames(const cfg_obj_t **maps, const cfg_obj_t **obj) } static isc_result_t -configure_hint(const char *zfile, const char *zclass, isc_mem_t *mctx) -{ - isc_result_t result; - dns_db_t * db = NULL; +configure_hint(const char *zfile, const char *zclass, isc_mem_t *mctx) { + isc_result_t result; + dns_db_t *db = NULL; dns_rdataclass_t rdclass; isc_textregion_t r; @@ -181,26 +176,25 @@ configure_hint(const char *zfile, const char *zclass, isc_mem_t *mctx) static isc_result_t configure_zone(const char *vclass, const char *view, const cfg_obj_t *zconfig, const cfg_obj_t *vconfig, const cfg_obj_t *config, - isc_mem_t *mctx, bool list) -{ - int i = 0; - isc_result_t result; - const char * zclass; - const char * zname; - const char * zfile = NULL; - const cfg_obj_t * maps[4]; - const cfg_obj_t * mastersobj = NULL; - const cfg_obj_t * inviewobj = NULL; - const cfg_obj_t * zoptions = NULL; - const cfg_obj_t * classobj = NULL; - const cfg_obj_t * typeobj = NULL; - const cfg_obj_t * fileobj = NULL; - const cfg_obj_t * dlzobj = NULL; - const cfg_obj_t * dbobj = NULL; - const cfg_obj_t * obj = NULL; - const cfg_obj_t * fmtobj = NULL; + isc_mem_t *mctx, bool list) { + int i = 0; + isc_result_t result; + const char *zclass; + const char *zname; + const char *zfile = NULL; + const cfg_obj_t *maps[4]; + const cfg_obj_t *mastersobj = NULL; + const cfg_obj_t *inviewobj = NULL; + const cfg_obj_t *zoptions = NULL; + const cfg_obj_t *classobj = NULL; + const cfg_obj_t *typeobj = NULL; + const cfg_obj_t *fileobj = NULL; + const cfg_obj_t *dlzobj = NULL; + const cfg_obj_t *dbobj = NULL; + const cfg_obj_t *obj = NULL; + const cfg_obj_t *fmtobj = NULL; dns_masterformat_t masterformat; - dns_ttl_t maxttl = 0; + dns_ttl_t maxttl = 0; zone_options = DNS_ZONEOPT_CHECKNS | DNS_ZONEOPT_MANYERRORS; @@ -250,7 +244,8 @@ configure_zone(const char *vclass, const char *view, const cfg_obj_t *zconfig, */ cfg_map_get(zoptions, "database", &dbobj); if (dbobj != NULL && strcmp("rbt", cfg_obj_asstring(dbobj)) != 0 && - strcmp("rbt64", cfg_obj_asstring(dbobj)) != 0) { + strcmp("rbt64", cfg_obj_asstring(dbobj)) != 0) + { return (ISC_R_SUCCESS); } @@ -273,7 +268,8 @@ configure_zone(const char *vclass, const char *view, const cfg_obj_t *zconfig, return (configure_hint(zfile, zclass, mctx)); } else if ((strcasecmp(cfg_obj_asstring(typeobj), "primary") != 0) && (strcasecmp(cfg_obj_asstring(typeobj), "master") != 0) && - (strcasecmp(cfg_obj_asstring(typeobj), "redirect") != 0)) { + (strcasecmp(cfg_obj_asstring(typeobj), "redirect") != 0)) + { return (ISC_R_SUCCESS); } @@ -459,13 +455,12 @@ configure_zone(const char *vclass, const char *view, const cfg_obj_t *zconfig, /*% configure a view */ static isc_result_t configure_view(const char *vclass, const char *view, const cfg_obj_t *config, - const cfg_obj_t *vconfig, isc_mem_t *mctx, bool list) -{ + const cfg_obj_t *vconfig, isc_mem_t *mctx, bool list) { const cfg_listelt_t *element; - const cfg_obj_t * voptions; - const cfg_obj_t * zonelist; - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; + const cfg_obj_t *voptions; + const cfg_obj_t *zonelist; + isc_result_t result = ISC_R_SUCCESS; + isc_result_t tresult; voptions = NULL; if (vconfig != NULL) { @@ -480,7 +475,8 @@ configure_view(const char *vclass, const char *view, const cfg_obj_t *config, } for (element = cfg_list_first(zonelist); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *zconfig = cfg_listelt_value(element); tresult = configure_zone(vclass, view, zconfig, vconfig, config, mctx, list); @@ -493,8 +489,7 @@ configure_view(const char *vclass, const char *view, const cfg_obj_t *config, static isc_result_t config_getclass(const cfg_obj_t *classobj, dns_rdataclass_t defclass, - dns_rdataclass_t *classp) -{ + dns_rdataclass_t *classp) { isc_textregion_t r; if (!cfg_obj_isstring(classobj)) { @@ -508,23 +503,24 @@ config_getclass(const cfg_obj_t *classobj, dns_rdataclass_t defclass, /*% load zones from the configuration */ static isc_result_t -load_zones_fromconfig(const cfg_obj_t *config, isc_mem_t *mctx, bool list_zones) -{ +load_zones_fromconfig(const cfg_obj_t *config, isc_mem_t *mctx, + bool list_zones) { const cfg_listelt_t *element; - const cfg_obj_t * views; - const cfg_obj_t * vconfig; - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; + const cfg_obj_t *views; + const cfg_obj_t *vconfig; + isc_result_t result = ISC_R_SUCCESS; + isc_result_t tresult; views = NULL; (void)cfg_map_get(config, "view", &views); for (element = cfg_list_first(views); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *classobj; dns_rdataclass_t viewclass; - const char * vname; - char buf[sizeof("CLASS65535")]; + const char *vname; + char buf[sizeof("CLASS65535")]; vconfig = cfg_listelt_value(element); if (vconfig == NULL) { @@ -559,8 +555,7 @@ cleanup: } static void -output(void *closure, const char *text, int textlen) -{ +output(void *closure, const char *text, int textlen) { UNUSED(closure); if (fwrite(text, 1, textlen, stdout) != (size_t)textlen) { perror("fwrite"); @@ -570,20 +565,19 @@ output(void *closure, const char *text, int textlen) /*% The main processing routine */ int -main(int argc, char **argv) -{ - int c; +main(int argc, char **argv) { + int c; cfg_parser_t *parser = NULL; - cfg_obj_t * config = NULL; - const char * conffile = NULL; - isc_mem_t * mctx = NULL; - isc_result_t result; - int exit_status = 0; - bool load_zones = false; - bool list_zones = false; - bool print = false; - bool nodeprecate = false; - unsigned int flags = 0; + cfg_obj_t *config = NULL; + const char *conffile = NULL; + isc_mem_t *mctx = NULL; + isc_result_t result; + int exit_status = 0; + bool load_zones = false; + bool list_zones = false; + bool print = false; + bool nodeprecate = false; + unsigned int flags = 0; isc_commandline_errprint = false; @@ -594,16 +588,16 @@ main(int argc, char **argv) while ((c = isc_commandline_parse(argc, argv, CMDLINE_FLAGS)) != -1) { switch (c) { case 'm': - if (strcasecmp(isc_commandline_argument, "record") == - 0) { + if (strcasecmp(isc_commandline_argument, "record") == 0) + { isc_mem_debugging |= ISC_MEM_DEBUGRECORD; } - if (strcasecmp(isc_commandline_argument, "trace") == - 0) { + if (strcasecmp(isc_commandline_argument, "trace") == 0) + { isc_mem_debugging |= ISC_MEM_DEBUGTRACE; } - if (strcasecmp(isc_commandline_argument, "usage") == - 0) { + if (strcasecmp(isc_commandline_argument, "usage") == 0) + { isc_mem_debugging |= ISC_MEM_DEBUGUSAGE; } if (strcasecmp(isc_commandline_argument, "size") == 0) { @@ -725,7 +719,8 @@ main(int argc, char **argv) cfg_parser_setcallback(parser, directory_callback, NULL); if (cfg_parse_file(parser, conffile, &cfg_type_namedconf, &config) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { exit(1); } diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c index 9209ab93e2..034384760c 100644 --- a/bin/check/named-checkzone.c +++ b/bin/check/named-checkzone.c @@ -42,13 +42,13 @@ #include "check-tool.h" -static int quiet = 0; -static isc_mem_t * mctx = NULL; -dns_zone_t * zone = NULL; -dns_zonetype_t zonetype = dns_zone_master; -static int dumpzone = 0; -static const char * output_filename; -static const char * prog_name = NULL; +static int quiet = 0; +static isc_mem_t *mctx = NULL; +dns_zone_t *zone = NULL; +dns_zonetype_t zonetype = dns_zone_master; +static int dumpzone = 0; +static const char *output_filename; +static const char *prog_name = NULL; static const dns_master_style_t *outputstyle = NULL; static enum { progmode_check, progmode_compile } progmode; @@ -62,12 +62,10 @@ 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) -{ +usage(void) { fprintf(stderr, "usage: %s [-djqvD] [-c class] " "[-f inputformat] [-F outputformat] [-J filename] " @@ -84,8 +82,7 @@ usage(void) } static void -destroy(void) -{ +destroy(void) { if (zone != NULL) { dns_zone_detach(&zone); } @@ -93,27 +90,26 @@ destroy(void) /*% main processing routine */ int -main(int argc, char **argv) -{ - int c; - char * origin = NULL; - char * filename = NULL; - isc_log_t * lctx = NULL; - isc_result_t result; - char classname_in[] = "IN"; - char * classname = classname_in; - const char * workdir = NULL; - const char * inputformatstr = NULL; - const char * outputformatstr = NULL; - dns_masterformat_t inputformat = dns_masterformat_text; - dns_masterformat_t outputformat = dns_masterformat_text; +main(int argc, char **argv) { + int c; + char *origin = NULL; + char *filename = NULL; + isc_log_t *lctx = NULL; + isc_result_t result; + char classname_in[] = "IN"; + char *classname = classname_in; + const char *workdir = NULL; + const char *inputformatstr = NULL; + const char *outputformatstr = NULL; + dns_masterformat_t inputformat = dns_masterformat_text; + dns_masterformat_t outputformat = dns_masterformat_text; dns_masterrawheader_t header; - uint32_t rawversion = 1, serialnum = 0; - dns_ttl_t maxttl = 0; - bool snset = false; - bool logdump = false; - FILE * errout = stdout; - char * endp; + uint32_t rawversion = 1, serialnum = 0; + dns_ttl_t maxttl = 0; + bool snset = false; + bool logdump = false; + FILE *errout = stdout; + char *endp; /* * Uncomment the following line if memory debugging is needed: @@ -153,11 +149,11 @@ main(int argc, char **argv) /* Compilation specific defaults */ if (progmode == progmode_compile) { - zone_options |= - (DNS_ZONEOPT_CHECKNS | DNS_ZONEOPT_FATALNS | - DNS_ZONEOPT_CHECKSPF | DNS_ZONEOPT_CHECKDUPRR | - DNS_ZONEOPT_CHECKNAMES | DNS_ZONEOPT_CHECKNAMESFAIL | - DNS_ZONEOPT_CHECKWILDCARD); + zone_options |= (DNS_ZONEOPT_CHECKNS | DNS_ZONEOPT_FATALNS | + DNS_ZONEOPT_CHECKSPF | DNS_ZONEOPT_CHECKDUPRR | + DNS_ZONEOPT_CHECKNAMES | + DNS_ZONEOPT_CHECKNAMESFAIL | + DNS_ZONEOPT_CHECKWILDCARD); } else { zone_options |= (DNS_ZONEOPT_CHECKDUPRR | DNS_ZONEOPT_CHECKSPF); } @@ -168,7 +164,8 @@ main(int argc, char **argv) while ((c = isc_commandline_parse(argc, argv, "c:df:hi:jJ:k:L:l:m:n:qr:s:t:o:vw:DF:" - "M:S:T:W:")) != EOF) { + "M:S:T:W:")) != EOF) + { switch (c) { case 'c': classname = isc_commandline_argument; @@ -508,7 +505,8 @@ main(int argc, char **argv) if (dumpzone && (output_filename == NULL || strcmp(output_filename, "-") == 0 || strcmp(output_filename, "/dev/fd/1") == 0 || - strcmp(output_filename, "/dev/stdout") == 0)) { + strcmp(output_filename, "/dev/stdout") == 0)) + { errout = stderr; logdump = false; } diff --git a/bin/confgen/ddns-confgen.c b/bin/confgen/ddns-confgen.c index 0ee722f414..427924ea36 100644 --- a/bin/confgen/ddns-confgen.c +++ b/bin/confgen/ddns-confgen.c @@ -48,7 +48,7 @@ #include #include -#define KEYGEN_DEFAULT "tsig-key" +#define KEYGEN_DEFAULT "tsig-key" #define CONFGEN_DEFAULT "ddns-key" static char program[256]; @@ -60,8 +60,7 @@ ISC_PLATFORM_NORETURN_PRE static void usage(int status) ISC_PLATFORM_NORETURN_POST; static void -usage(int status) -{ +usage(int status) { if (progmode == progmode_confgen) { fprintf(stderr, "\ Usage:\n\ @@ -84,23 +83,22 @@ Usage:\n\ } int -main(int argc, char **argv) -{ +main(int argc, char **argv) { isc_result_t result = ISC_R_SUCCESS; - bool show_final_mem = false; - bool quiet = false; + bool show_final_mem = false; + bool quiet = false; isc_buffer_t key_txtbuffer; - char key_txtsecret[256]; - isc_mem_t * mctx = NULL; - const char * keyname = NULL; - const char * zone = NULL; - const char * self_domain = NULL; - char * keybuf = NULL; + char key_txtsecret[256]; + isc_mem_t *mctx = NULL; + const char *keyname = NULL; + const char *zone = NULL; + const char *self_domain = NULL; + char *keybuf = NULL; dns_secalg_t alg = DST_ALG_HMACSHA256; - const char * algname; - int keysize = 256; - int len = 0; - int ch; + const char *algname; + int keysize = 256; + int len = 0; + int ch; #if USE_PKCS11 pk11_result_register(); diff --git a/bin/confgen/keygen.c b/bin/confgen/keygen.c index d2ae7507fb..3ad4e57a9a 100644 --- a/bin/confgen/keygen.c +++ b/bin/confgen/keygen.c @@ -37,8 +37,7 @@ * Convert algorithm type to string. */ const char * -alg_totext(dns_secalg_t alg) -{ +alg_totext(dns_secalg_t alg) { switch (alg) { case DST_ALG_HMACMD5: return ("hmac-md5"); @@ -61,8 +60,7 @@ alg_totext(dns_secalg_t alg) * Convert string to algorithm type. */ dns_secalg_t -alg_fromtext(const char *name) -{ +alg_fromtext(const char *name) { const char *p = name; if (strncasecmp(p, "hmac-", 5) == 0) { p = &name[5]; @@ -93,8 +91,7 @@ alg_fromtext(const char *name) * Return default keysize for a given algorithm type. */ int -alg_bits(dns_secalg_t alg) -{ +alg_bits(dns_secalg_t alg) { switch (alg) { case DST_ALG_HMACMD5: return (128); @@ -118,13 +115,12 @@ alg_bits(dns_secalg_t alg) */ void generate_key(isc_mem_t *mctx, dns_secalg_t alg, int keysize, - isc_buffer_t *key_txtbuffer) -{ + isc_buffer_t *key_txtbuffer) { isc_result_t result = ISC_R_SUCCESS; isc_buffer_t key_rawbuffer; isc_region_t key_rawregion; - char key_rawsecret[64]; - dst_key_t * key = NULL; + char key_rawsecret[64]; + dst_key_t *key = NULL; switch (alg) { case DST_ALG_HMACMD5: @@ -176,11 +172,10 @@ generate_key(isc_mem_t *mctx, dns_secalg_t alg, int keysize, */ void write_key_file(const char *keyfile, const char *user, const char *keyname, - isc_buffer_t *secret, dns_secalg_t alg) -{ + isc_buffer_t *secret, dns_secalg_t alg) { isc_result_t result; - const char * algname = alg_totext(alg); - FILE * fd = NULL; + const char *algname = alg_totext(alg); + FILE *fd = NULL; DO("create keyfile", isc_file_safecreate(keyfile, &fd)); diff --git a/bin/confgen/rndc-confgen.c b/bin/confgen/rndc-confgen.c index 95c5c12df1..980e343266 100644 --- a/bin/confgen/rndc-confgen.c +++ b/bin/confgen/rndc-confgen.c @@ -48,8 +48,8 @@ #include #define DEFAULT_KEYNAME "rndc-key" -#define DEFAULT_SERVER "127.0.0.1" -#define DEFAULT_PORT 953 +#define DEFAULT_SERVER "127.0.0.1" +#define DEFAULT_PORT 953 static char program[256]; const char *progname; @@ -62,8 +62,7 @@ ISC_PLATFORM_NORETURN_PRE static void usage(int status) ISC_PLATFORM_NORETURN_POST; static void -usage(int status) -{ +usage(int status) { fprintf(stderr, "\ Usage:\n\ %s [-a] [-b bits] [-c keyfile] [-k keyname] [-p port] \ @@ -83,27 +82,26 @@ Usage:\n\ } int -main(int argc, char **argv) -{ - bool show_final_mem = false; - isc_buffer_t key_txtbuffer; - char key_txtsecret[256]; - isc_mem_t * mctx = NULL; - isc_result_t result = ISC_R_SUCCESS; - const char * keyname = NULL; - const char * serveraddr = NULL; - dns_secalg_t alg; - const char * algname; - char * p; - int ch; - int port; - int keysize = -1; - struct in_addr addr4_dummy; +main(int argc, char **argv) { + bool show_final_mem = false; + isc_buffer_t key_txtbuffer; + char key_txtsecret[256]; + isc_mem_t *mctx = NULL; + isc_result_t result = ISC_R_SUCCESS; + const char *keyname = NULL; + const char *serveraddr = NULL; + dns_secalg_t alg; + const char *algname; + char *p; + int ch; + int port; + int keysize = -1; + struct in_addr addr4_dummy; struct in6_addr addr6_dummy; - char * chrootdir = NULL; - char * user = NULL; - bool keyonly = false; - int len; + char *chrootdir = NULL; + char *user = NULL; + bool keyonly = false; + int len; keydef = keyfile = RNDC_KEYFILE; @@ -121,7 +119,8 @@ main(int argc, char **argv) isc_commandline_errprint = false; while ((ch = isc_commandline_parse(argc, argv, - "aA:b:c:hk:Mmp:r:s:t:u:Vy")) != -1) { + "aA:b:c:hk:Mmp:r:s:t:u:Vy")) != -1) + { switch (ch) { case 'a': keyonly = true; @@ -168,8 +167,8 @@ main(int argc, char **argv) case 's': serveraddr = isc_commandline_argument; if (inet_pton(AF_INET, serveraddr, &addr4_dummy) != 1 && - inet_pton(AF_INET6, serveraddr, &addr6_dummy) != - 1) { + inet_pton(AF_INET6, serveraddr, &addr6_dummy) != 1) + { fatal("-s should be an IPv4 or IPv6 address"); } break; diff --git a/bin/confgen/unix/os.c b/bin/confgen/unix/os.c index 0127b59934..4af6234b69 100644 --- a/bin/confgen/unix/os.c +++ b/bin/confgen/unix/os.c @@ -22,8 +22,7 @@ #include int -set_user(FILE *fd, const char *user) -{ +set_user(FILE *fd, const char *user) { struct passwd *pw; pw = getpwnam(user); diff --git a/bin/confgen/util.c b/bin/confgen/util.c index 5b89bc3e4f..a6dc649e33 100644 --- a/bin/confgen/util.c +++ b/bin/confgen/util.c @@ -20,12 +20,11 @@ #include -extern bool verbose; +extern bool verbose; extern const char *progname; void -notify(const char *fmt, ...) -{ +notify(const char *fmt, ...) { va_list ap; if (verbose) { @@ -37,8 +36,7 @@ notify(const char *fmt, ...) } void -fatal(const char *format, ...) -{ +fatal(const char *format, ...) { va_list args; fprintf(stderr, "%s: ", progname); diff --git a/bin/confgen/win32/os.c b/bin/confgen/win32/os.c index 6fa346a91e..582475d00a 100644 --- a/bin/confgen/win32/os.c +++ b/bin/confgen/win32/os.c @@ -20,7 +20,6 @@ #include int -set_user(FILE *fd, const char *user) -{ +set_user(FILE *fd, const char *user) { return (0); } diff --git a/bin/delv/delv.c b/bin/delv/delv.c index 1f67619f38..b8d4639ecb 100644 --- a/bin/delv/delv.c +++ b/bin/delv/delv.c @@ -84,23 +84,23 @@ #define MAXNAME (DNS_NAME_MAXTEXT + 1) /* Variables used internally by delv. */ -char * progname; +char *progname; static isc_mem_t *mctx = NULL; static isc_log_t *lctx = NULL; /* Configurables */ -static char * server = NULL; -static const char * port = "53"; +static char *server = NULL; +static const char *port = "53"; static isc_sockaddr_t *srcaddr4 = NULL, *srcaddr6 = NULL; -static isc_sockaddr_t a4, a6; -static char * curqname = NULL, *qname = NULL; -static bool classset = false; +static isc_sockaddr_t a4, a6; +static char *curqname = NULL, *qname = NULL; +static bool classset = false; static dns_rdatatype_t qtype = dns_rdatatype_none; -static bool typeset = false; +static bool typeset = false; static unsigned int styleflags = 0; -static uint32_t splitwidth = 0xffffffff; -static bool showcomments = true, showdnssec = true, showtrust = true, +static uint32_t splitwidth = 0xffffffff; +static bool showcomments = true, showdnssec = true, showtrust = true, rrcomments = true, noclass = false, nocrypto = false, nottl = false, multiline = false, short_form = false, print_unknown_format = false, yaml = false; @@ -116,10 +116,10 @@ static bool use_tcp = false; static char *anchorfile = NULL; static char *trust_anchor = NULL; -static int num_keys = 0; +static int num_keys = 0; static dns_fixedname_t afn; -static dns_name_t * anchor_name = NULL; +static dns_name_t *anchor_name = NULL; /* Default bind.keys contents */ static char anchortext[] = TRUST_ANCHORS; @@ -127,15 +127,14 @@ 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) -{ +usage(void) { fputs("Usage: delv [@server] {q-opt} {d-opt} [domain] [q-type] " "[q-class]\n" "Where: domain is in the Domain Name System\n" @@ -206,13 +205,11 @@ 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 -fatal(const char *format, ...) -{ +fatal(const char *format, ...) { va_list args; fflush(stdout); @@ -224,12 +221,10 @@ 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, ...) -{ +warn(const char *format, ...) { va_list args; fflush(stdout); @@ -242,18 +237,16 @@ warn(const char *format, ...) static isc_logcategory_t categories[] = { { "delv", 0 }, { NULL, 0 } }; #define LOGCATEGORY_DEFAULT (&categories[0]) -#define LOGMODULE_DEFAULT (&modules[0]) +#define LOGMODULE_DEFAULT (&modules[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, ...) -{ +delv_log(int level, const char *fmt, ...) { va_list ap; - char msgbuf[2048]; + char msgbuf[2048]; if (!isc_log_wouldlog(lctx, level)) { return; @@ -270,11 +263,10 @@ delv_log(int level, const char *fmt, ...) static int loglevel = 0; static void -setup_logging(FILE *errout) -{ - isc_result_t result; +setup_logging(FILE *errout) { + isc_result_t result; isc_logdestination_t destination; - isc_logconfig_t * logconfig = NULL; + isc_logconfig_t *logconfig = NULL; result = isc_log_create(mctx, &lctx, &logconfig); if (result != ISC_R_SUCCESS) { @@ -363,8 +355,7 @@ setup_logging(FILE *errout) } static void -print_status(dns_rdataset_t *rdataset) -{ +print_status(dns_rdataset_t *rdataset) { char buf[1024] = { 0 }; REQUIRE(rdataset != NULL); @@ -443,15 +434,14 @@ print_status(dns_rdataset_t *rdataset) static isc_result_t printdata(dns_rdataset_t *rdataset, dns_name_t *owner, - dns_master_style_t *style) -{ - isc_result_t result = ISC_R_SUCCESS; + dns_master_style_t *style) { + isc_result_t result = ISC_R_SUCCESS; static dns_trust_t trust; - static bool first = true; - isc_buffer_t target; - isc_region_t r; - char * t = NULL; - int len = 2048; + static bool first = true; + isc_buffer_t target; + isc_region_t r; + char *t = NULL; + int len = 2048; if (!dns_rdataset_isassociated(rdataset)) { char namebuf[DNS_NAME_FORMATSIZE]; @@ -481,7 +471,8 @@ printdata(dns_rdataset_t *rdataset, dns_name_t *owner, dns_rdata_t rdata = DNS_RDATA_INIT; for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { if ((rdataset->attributes & DNS_RDATASETATTR_NEGATIVE) != 0) { continue; @@ -537,9 +528,8 @@ cleanup: } static isc_result_t -setup_style(dns_master_style_t **stylep) -{ - isc_result_t result; +setup_style(dns_master_style_t **stylep) { + isc_result_t result; dns_master_style_t *style = NULL; REQUIRE(stylep != NULL && *stylep == NULL); @@ -590,11 +580,10 @@ setup_style(dns_master_style_t **stylep) } static isc_result_t -convert_name(dns_fixedname_t *fn, dns_name_t **name, const char *text) -{ +convert_name(dns_fixedname_t *fn, dns_name_t **name, const char *text) { isc_result_t result; isc_buffer_t b; - dns_name_t * n; + dns_name_t *n; unsigned int len; REQUIRE(fn != NULL && name != NULL && text != NULL); @@ -616,21 +605,20 @@ convert_name(dns_fixedname_t *fn, dns_name_t **name, const char *text) } static isc_result_t -key_fromconfig(const cfg_obj_t *key, dns_client_t *client) -{ +key_fromconfig(const cfg_obj_t *key, dns_client_t *client) { dns_rdata_dnskey_t dnskey; - dns_rdata_ds_t ds; - uint32_t rdata1, rdata2, rdata3; - const char * datastr = NULL, *keynamestr = NULL, *atstr = NULL; - unsigned char data[4096]; - isc_buffer_t databuf; - unsigned char rrdata[4096]; - isc_buffer_t rrdatabuf; - isc_region_t r; - dns_fixedname_t fkeyname; - dns_name_t * keyname; - isc_result_t result; - bool match_root = false; + dns_rdata_ds_t ds; + uint32_t rdata1, rdata2, rdata3; + const char *datastr = NULL, *keynamestr = NULL, *atstr = NULL; + unsigned char data[4096]; + isc_buffer_t databuf; + unsigned char rrdata[4096]; + isc_buffer_t rrdatabuf; + isc_region_t r; + dns_fixedname_t fkeyname; + dns_name_t *keyname; + isc_result_t result; + bool match_root = false; enum { INITIAL_KEY, STATIC_KEY, INITIAL_DS, @@ -790,14 +778,13 @@ cleanup: } static isc_result_t -load_keys(const cfg_obj_t *keys, dns_client_t *client) -{ +load_keys(const cfg_obj_t *keys, dns_client_t *client) { const cfg_listelt_t *elt, *elt2; - const cfg_obj_t * key, *keylist; - isc_result_t result = ISC_R_SUCCESS; + const cfg_obj_t *key, *keylist; + isc_result_t result = ISC_R_SUCCESS; - for (elt = cfg_list_first(keys); elt != NULL; - elt = cfg_list_next(elt)) { + for (elt = cfg_list_first(keys); elt != NULL; elt = cfg_list_next(elt)) + { keylist = cfg_listelt_value(elt); for (elt2 = cfg_list_first(keylist); elt2 != NULL; @@ -815,15 +802,14 @@ cleanup: } static isc_result_t -setup_dnsseckeys(dns_client_t *client) -{ - isc_result_t result; - cfg_parser_t * parser = NULL; +setup_dnsseckeys(dns_client_t *client) { + isc_result_t result; + cfg_parser_t *parser = NULL; const cfg_obj_t *trusted_keys = NULL; const cfg_obj_t *managed_keys = NULL; const cfg_obj_t *trust_anchors = NULL; - cfg_obj_t * bindkeys = NULL; - const char * filename = anchorfile; + cfg_obj_t *bindkeys = NULL; + const char *filename = anchorfile; if (!root_validation) { return (ISC_R_SUCCESS); @@ -912,17 +898,16 @@ cleanup: } static isc_result_t -addserver(dns_client_t *client) -{ - struct addrinfo hints, *res, *cur; - int gaierror; - struct in_addr in4; - struct in6_addr in6; - isc_sockaddr_t * sa; +addserver(dns_client_t *client) { + struct addrinfo hints, *res, *cur; + int gaierror; + struct in_addr in4; + struct in6_addr in6; + isc_sockaddr_t *sa; isc_sockaddrlist_t servers; - uint32_t destport; - isc_result_t result; - dns_name_t * name = NULL; + uint32_t destport; + isc_result_t result; + dns_name_t *name = NULL; result = parse_uint(&destport, port, 0xffff, "port"); if (result != ISC_R_SUCCESS) { @@ -1000,13 +985,12 @@ cleanup: } static isc_result_t -findserver(dns_client_t *client) -{ - isc_result_t result; - irs_resconf_t * resconf = NULL; +findserver(dns_client_t *client) { + isc_result_t result; + irs_resconf_t *resconf = NULL; isc_sockaddrlist_t *nameservers; - isc_sockaddr_t * sa, *next; - uint32_t destport; + isc_sockaddr_t *sa, *next; + uint32_t destport; result = parse_uint(&destport, port, 0xffff, "port"); if (result != ISC_R_SUCCESS) { @@ -1076,9 +1060,8 @@ cleanup: } static isc_result_t -parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc) -{ - uint32_t n; +parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc) { + uint32_t n; isc_result_t result = isc_parse_uint32(&n, value, 10); if (result == ISC_R_SUCCESS && n > max) { result = ISC_R_RANGE; @@ -1093,11 +1076,10 @@ parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc) } static void -plus_option(char *option) -{ +plus_option(char *option) { isc_result_t result; - char * cmd, *value, *last = NULL; - bool state = true; + char *cmd, *value, *last = NULL; + bool state = true; INSIST(option != NULL); @@ -1311,20 +1293,19 @@ static const char *single_dash_opts = "46himv"; static const char *dash_opts = "46abcdhimpqtvx"; static bool -dash_option(char *option, char *next, bool *open_type_class) -{ - char opt, *value; - isc_result_t result; - bool value_from_next; +dash_option(char *option, char *next, bool *open_type_class) { + char opt, *value; + isc_result_t result; + bool value_from_next; isc_textregion_t tr; - dns_rdatatype_t rdtype; + dns_rdatatype_t rdtype; dns_rdataclass_t rdclass; - char textname[MAXNAME]; - struct in_addr in4; - struct in6_addr in6; - in_port_t srcport; - uint32_t num; - char * hash; + char textname[MAXNAME]; + struct in_addr in4; + struct in6_addr in6; + in_port_t srcport; + uint32_t num; + char *hash; while (strpbrk(option, single_dash_opts) == &option[0]) { /* @@ -1516,9 +1497,8 @@ dash_option(char *option, char *next, bool *open_type_class) * memory debugging when setting up the memory context. */ static void -preparse_args(int argc, char **argv) -{ - bool ipv4only = false, ipv6only = false; +preparse_args(int argc, char **argv) { + bool ipv4only = false, ipv6only = false; char *option; for (argc--, argv++; argc > 0; argc--, argv++) { @@ -1578,13 +1558,12 @@ preparse_args(int argc, char **argv) * should be familiar to dig users, however. */ static void -parse_args(int argc, char **argv) -{ - isc_result_t result; +parse_args(int argc, char **argv) { + isc_result_t result; isc_textregion_t tr; - dns_rdatatype_t rdtype; + dns_rdatatype_t rdtype; dns_rdataclass_t rdclass; - bool open_type_class = true; + bool open_type_class = true; for (; argc > 0; argc--, argv++) { if (argv[0][0] == '@') { @@ -1631,8 +1610,8 @@ parse_args(int argc, char **argv) if (result == ISC_R_SUCCESS) { if (classset) { warn("extra query class"); - } else if (rdclass != - dns_rdataclass_in) { + } else if (rdclass != dns_rdataclass_in) + { warn("ignoring non-IN " "query class"); } @@ -1666,8 +1645,7 @@ parse_args(int argc, char **argv) } static isc_result_t -append_str(const char *text, int len, char **p, char *end) -{ +append_str(const char *text, int len, char **p, char *end) { if (len > end - *p) { return (ISC_R_NOSPACE); } @@ -1677,10 +1655,9 @@ append_str(const char *text, int len, char **p, char *end) } static isc_result_t -reverse_octets(const char *in, char **p, char *end) -{ +reverse_octets(const char *in, char **p, char *end) { char *dot = strchr(in, '.'); - int len; + int len; if (dot != NULL) { isc_result_t result; result = reverse_octets(dot + 1, p, end); @@ -1699,10 +1676,9 @@ reverse_octets(const char *in, char **p, char *end) } static isc_result_t -get_reverse(char *reverse, size_t len, char *value, bool strict) -{ - int r; - isc_result_t result; +get_reverse(char *reverse, size_t len, char *value, bool strict) { + int r; + isc_result_t result; isc_netaddr_t addr; addr.family = AF_INET6; @@ -1710,8 +1686,8 @@ get_reverse(char *reverse, size_t len, char *value, bool strict) if (r > 0) { /* This is a valid IPv6 address. */ dns_fixedname_t fname; - dns_name_t * name; - unsigned int options = 0; + dns_name_t *name; + unsigned int options = 0; name = dns_fixedname_initname(&fname); result = dns_byaddr_createptrname(&addr, options, name); @@ -1747,20 +1723,19 @@ get_reverse(char *reverse, size_t len, char *value, bool strict) } int -main(int argc, char *argv[]) -{ - dns_client_t * client = NULL; - isc_result_t result; - dns_fixedname_t qfn; - dns_name_t * query_name, *response_name; - char namestr[DNS_NAME_FORMATSIZE]; - dns_rdataset_t * rdataset; - dns_namelist_t namelist; - unsigned int resopt, clopt; - isc_appctx_t * actx = NULL; - isc_taskmgr_t * taskmgr = NULL; - isc_socketmgr_t * socketmgr = NULL; - isc_timermgr_t * timermgr = NULL; +main(int argc, char *argv[]) { + dns_client_t *client = NULL; + isc_result_t result; + dns_fixedname_t qfn; + dns_name_t *query_name, *response_name; + char namestr[DNS_NAME_FORMATSIZE]; + dns_rdataset_t *rdataset; + dns_namelist_t namelist; + unsigned int resopt, clopt; + isc_appctx_t *actx = NULL; + isc_taskmgr_t *taskmgr = NULL; + isc_socketmgr_t *socketmgr = NULL; + isc_timermgr_t *timermgr = NULL; dns_master_style_t *style = NULL; #ifndef WIN32 struct sigaction sa; @@ -1857,10 +1832,11 @@ main(int argc, char *argv[]) } for (response_name = ISC_LIST_HEAD(namelist); response_name != NULL; - response_name = ISC_LIST_NEXT(response_name, link)) { + response_name = ISC_LIST_NEXT(response_name, link)) + { for (rdataset = ISC_LIST_HEAD(response_name->list); - rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset != NULL; rdataset = ISC_LIST_NEXT(rdataset, link)) + { result = printdata(rdataset, response_name, style); if (result != ISC_R_SUCCESS) { delv_log(ISC_LOG_ERROR, "print data failed"); diff --git a/bin/dig/dig.c b/bin/dig/dig.c index e194542ff6..8f31cb7921 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -55,9 +55,9 @@ dig_lookup_t *default_lookup = NULL; static atomic_uintptr_t batchname = ATOMIC_VAR_INIT(0); -static FILE * batchfp = NULL; -static char * argv0; -static int addresscount = 0; +static FILE *batchfp = NULL; +static char *argv0; +static int addresscount = 0; static char domainopt[DNS_NAME_MAXTEXT]; static char hexcookie[81]; @@ -75,9 +75,8 @@ static const char *const opcodetext[] = { }; static const char * -rcode_totext(dns_rcode_t rcode) -{ - static char buf[64]; +rcode_totext(dns_rcode_t rcode) { + static char buf[64]; isc_buffer_t b; isc_result_t result; @@ -94,8 +93,7 @@ rcode_totext(dns_rcode_t rcode) /*% print usage */ static void -print_usage(FILE *fp) -{ +print_usage(FILE *fp) { fputs("Usage: dig [@global-server] [domain] [q-type] [q-class] " "{q-opt}\n" " {global-d-opt} host [@local-server] {local-d-opt}\n" @@ -105,17 +103,14 @@ print_usage(FILE *fp) #if TARGET_OS_IPHONE static void -usage(void) -{ +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) -{ +usage(void) { print_usage(stderr); fputs("\nUse \"dig -h\" (or \"dig -h | more\") " "for complete list of options\n", @@ -126,15 +121,13 @@ usage(void) /*% version */ static void -version(void) -{ +version(void) { fputs("DiG " VERSION "\n", stderr); } /*% help */ static void -help(void) -{ +help(void) { print_usage(stdout); fputs("Where: domain is in the Domain Name System\n" " q-class is one of (in,hs,ch,...) [default: in]\n" @@ -315,10 +308,9 @@ help(void) * Callback from dighost.c to print the received message. */ static void -received(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query) -{ - uint64_t diff; - time_t tnow; +received(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query) { + uint64_t diff; + time_t tnow; struct tm tmnow; #ifdef WIN32 wchar_t time_str[100]; @@ -354,12 +346,14 @@ received(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query) * wide-character string, which strftime() handles incorrectly. */ if (wcsftime(time_str, sizeof(time_str) / sizeof(time_str[0]), - L"%a %b %d %H:%M:%S %Z %Y", &tmnow) > 0U) { + L"%a %b %d %H:%M:%S %Z %Y", &tmnow) > 0U) + { printf(";; WHEN: %ls\n", time_str); } #else /* ifdef WIN32 */ if (strftime(time_str, sizeof(time_str), - "%a %b %d %H:%M:%S %Z %Y", &tmnow) > 0U) { + "%a %b %d %H:%M:%S %Z %Y", &tmnow) > 0U) + { printf(";; WHEN: %s\n", time_str); } #endif /* ifdef WIN32 */ @@ -405,8 +399,7 @@ received(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query) * XXX print_trying */ static void -trying(char *frm, dig_lookup_t *lookup) -{ +trying(char *frm, dig_lookup_t *lookup) { UNUSED(frm); UNUSED(lookup); } @@ -415,11 +408,10 @@ trying(char *frm, dig_lookup_t *lookup) * Internal print routine used to print short form replies. */ static isc_result_t -say_message(dns_rdata_t *rdata, dig_query_t *query, isc_buffer_t *buf) -{ +say_message(dns_rdata_t *rdata, dig_query_t *query, isc_buffer_t *buf) { isc_result_t result; - uint64_t diff; - char store[sizeof(" in 18446744073709551616 us.")]; + uint64_t diff; + char store[sizeof(" in 18446744073709551616 us.")]; unsigned int styleflags = 0; if (query->lookup->trace || query->lookup->ns_search_only) { @@ -471,13 +463,12 @@ say_message(dns_rdata_t *rdata, dig_query_t *query, isc_buffer_t *buf) */ static isc_result_t short_answer(dns_message_t *msg, dns_messagetextflag_t flags, isc_buffer_t *buf, - dig_query_t *query) -{ - dns_name_t * name; + dig_query_t *query) { + dns_name_t *name; dns_rdataset_t *rdataset; - isc_result_t result, loopresult; - dns_name_t empty_name; - dns_rdata_t rdata = DNS_RDATA_INIT; + isc_result_t result, loopresult; + dns_name_t empty_name; + dns_rdata_t rdata = DNS_RDATA_INIT; UNUSED(flags); @@ -494,7 +485,8 @@ short_answer(dns_message_t *msg, dns_messagetextflag_t flags, isc_buffer_t *buf, dns_message_currentname(msg, DNS_SECTION_ANSWER, &name); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { loopresult = dns_rdataset_first(rdataset); while (loopresult == ISC_R_SUCCESS) { dns_rdataset_current(rdataset, &rdata); @@ -519,17 +511,17 @@ short_answer(dns_message_t *msg, dns_messagetextflag_t flags, isc_buffer_t *buf, } static bool -isdotlocal(dns_message_t *msg) -{ - isc_result_t result; +isdotlocal(dns_message_t *msg) { + isc_result_t result; static unsigned char local_ndata[] = { "\005local\0" }; static unsigned char local_offsets[] = { 0, 6 }; - static dns_name_t local = - DNS_NAME_INITABSOLUTE(local_ndata, local_offsets); + static dns_name_t local = DNS_NAME_INITABSOLUTE(local_ndata, + local_offsets); for (result = dns_message_firstname(msg, DNS_SECTION_QUESTION); result == ISC_R_SUCCESS; - result = dns_message_nextname(msg, DNS_SECTION_QUESTION)) { + result = dns_message_nextname(msg, DNS_SECTION_QUESTION)) + { dns_name_t *name = NULL; dns_message_currentname(msg, DNS_SECTION_QUESTION, &name); if (dns_name_issubdomain(name, &local)) { @@ -544,15 +536,14 @@ isdotlocal(dns_message_t *msg) */ static isc_result_t printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, - bool headers) -{ - isc_result_t result; + bool headers) { + isc_result_t result; dns_messagetextflag_t flags; - isc_buffer_t * buf = NULL; - unsigned int len = OUTPUTBUF; - dns_master_style_t * style = NULL; - unsigned int styleflags = 0; - bool isquery = (msg == query->lookup->sendmsg); + isc_buffer_t *buf = NULL; + unsigned int len = OUTPUTBUF; + dns_master_style_t *style = NULL; + unsigned int styleflags = 0; + bool isquery = (msg == query->lookup->sendmsg); UNUSED(msgbuf); @@ -601,7 +592,8 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, } } if (query->lookup->multiline || - (query->lookup->nottl && query->lookup->noclass)) { + (query->lookup->nottl && query->lookup->noclass)) + { result = dns_master_stylecreate(&style, styleflags, 24, 24, 24, 32, 80, 8, splitwidth, mctx); } else if (query->lookup->nottl || query->lookup->noclass) { @@ -641,12 +633,12 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, if (yaml) { enum { Q = 0x1, R = 0x2 }; /* Q:query; R:ecursive */ - unsigned int tflag = 0; + unsigned int tflag = 0; isc_sockaddr_t saddr; - char sockstr[ISC_SOCKADDR_FORMATSIZE]; - uint16_t sport; - char * hash; - int pf; + char sockstr[ISC_SOCKADDR_FORMATSIZE]; + uint16_t sport; + char *hash; + int pf; printf("-\n"); printf(" type: MESSAGE\n"); @@ -658,7 +650,8 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, tflag |= R; } } else if (((msg->flags & DNS_MESSAGEFLAG_RD) != 0) && - ((msg->flags & DNS_MESSAGEFLAG_RA) != 0)) { + ((msg->flags & DNS_MESSAGEFLAG_RA) != 0)) + { tflag |= R; } @@ -714,7 +707,8 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, if (query->sock != NULL && isc_socket_getsockname(query->sock, &saddr) == - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { sport = isc_sockaddr_getport(&saddr); isc_sockaddr_format(&saddr, sockstr, sizeof(sockstr)); hash = strchr(sockstr, '#'); @@ -788,7 +782,8 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, if (msg != query->lookup->sendmsg && (msg->flags & DNS_MESSAGEFLAG_RD) != 0 && - (msg->flags & DNS_MESSAGEFLAG_RA) == 0) { + (msg->flags & DNS_MESSAGEFLAG_RA) == 0) + { printf(";; WARNING: recursion requested " "but not available\n"); } @@ -796,7 +791,8 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, if (msg != query->lookup->sendmsg && query->lookup->edns != -1 && msg->opt == NULL && (msg->rcode == dns_rcode_formerr || - msg->rcode == dns_rcode_notimp)) { + msg->rcode == dns_rcode_notimp)) + { printf("\n;; WARNING: EDNS query returned status " "%s - retry with '%s+noedns'\n", rcode_totext(msg->rcode), @@ -910,11 +906,10 @@ repopulate_buffer: * print the greeting message when the program first starts up. */ static void -printgreeting(int argc, char **argv, dig_lookup_t *lookup) -{ - int i; +printgreeting(int argc, char **argv, dig_lookup_t *lookup) { + int i; static bool first = true; - char append[MXNAME]; + char append[MXNAME]; if (printcmd) { snprintf(lookup->cmdline, sizeof(lookup->cmdline), @@ -953,13 +948,12 @@ printgreeting(int argc, char **argv, dig_lookup_t *lookup) */ static void -plus_option(char *option, bool is_batchfile, dig_lookup_t *lookup) -{ +plus_option(char *option, bool is_batchfile, dig_lookup_t *lookup) { isc_result_t result; - char * cmd, *value, *last = NULL, *code, *extra; - uint32_t num; - bool state = true; - size_t n; + char *cmd, *value, *last = NULL, *code, *extra; + uint32_t num; + bool state = true; + size_t n; INSIST(option != NULL); @@ -1837,20 +1831,19 @@ static const char *dash_opts = "46bcdfhikmnpqrtvyx"; static bool dash_option(char *option, char *next, dig_lookup_t **lookup, bool *open_type_class, bool *need_clone, bool config_only, int argc, - char **argv, bool *firstarg) -{ - char opt, *value, *ptr, *ptr2, *ptr3, *last; - isc_result_t result; - bool value_from_next; + char **argv, bool *firstarg) { + char opt, *value, *ptr, *ptr2, *ptr3, *last; + isc_result_t result; + bool value_from_next; isc_textregion_t tr; - dns_rdatatype_t rdtype; + dns_rdatatype_t rdtype; dns_rdataclass_t rdclass; - char textname[MXNAME]; - struct in_addr in4; - struct in6_addr in6; - in_port_t srcport; - char * hash, *cmd; - uint32_t num; + char textname[MXNAME]; + struct in_addr in4; + struct in6_addr in6; + in_port_t srcport; + char *hash, *cmd; + uint32_t num; while (strpbrk(option, single_dash_opts) == &option[0]) { /* @@ -2004,8 +1997,8 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, *need_clone = true; strlcpy((*lookup)->textname, value, sizeof((*lookup)->textname)); - (*lookup)->trace_root = - ((*lookup)->trace || (*lookup)->ns_search_only); + (*lookup)->trace_root = ((*lookup)->trace || + (*lookup)->ns_search_only); (*lookup)->new_search = true; if (*firstarg) { printgreeting(argc, argv, *lookup); @@ -2103,8 +2096,8 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, strlcpy((*lookup)->textname, textname, sizeof((*lookup)->textname)); debug("looking up %s", (*lookup)->textname); - (*lookup)->trace_root = - ((*lookup)->trace || (*lookup)->ns_search_only); + (*lookup)->trace_root = ((*lookup)->trace || + (*lookup)->ns_search_only); if (!(*lookup)->rdtypeset) { (*lookup)->rdtype = dns_rdatatype_ptr; } @@ -2141,11 +2134,10 @@ dash_option(char *option, char *next, dig_lookup_t **lookup, * by its nature, so it can't be done in the main argument parser. */ static void -preparse_args(int argc, char **argv) -{ - int rc; +preparse_args(int argc, char **argv) { + int rc; char **rv; - char * option; + char *option; rc = argc; rv = argv; @@ -2207,39 +2199,38 @@ preparse_args(int argc, char **argv) } static int -split_batchline(char *batchline, char **bargv, int len, const char *msg) -{ - int bargc; +split_batchline(char *batchline, char **bargv, int len, const char *msg) { + int bargc; char *last = NULL; REQUIRE(batchline != NULL); for (bargc = 1, bargv[bargc] = strtok_r(batchline, " \t\r\n", &last); bargc < len && bargv[bargc]; - bargv[++bargc] = strtok_r(NULL, " \t\r\n", &last)) { + bargv[++bargc] = strtok_r(NULL, " \t\r\n", &last)) + { debug("%s %d: %s", msg, bargc, bargv[bargc]); } return (bargc); } static void -parse_args(bool is_batchfile, bool config_only, int argc, char **argv) -{ - isc_result_t result; +parse_args(bool is_batchfile, bool config_only, int argc, char **argv) { + isc_result_t result; isc_textregion_t tr; - bool firstarg = true; - dig_lookup_t * lookup = NULL; - dns_rdatatype_t rdtype; + bool firstarg = true; + dig_lookup_t *lookup = NULL; + dns_rdatatype_t rdtype; dns_rdataclass_t rdclass; - bool open_type_class = true; - char batchline[MXNAME]; - int bargc; - char * bargv[64]; - int rc; - char ** rv; + bool open_type_class = true; + char batchline[MXNAME]; + int bargc; + char *bargv[64]; + int rc; + char **rv; #ifndef NOPOSIX char *homedir; - char rcfile[PATH_MAX]; + char rcfile[PATH_MAX]; #endif /* ifndef NOPOSIX */ bool need_clone = true; @@ -2326,8 +2317,8 @@ parse_args(bool is_batchfile, bool config_only, int argc, char **argv) return; } } else { - addresscount = - getaddresses(lookup, &rv[0][1], NULL); + addresscount = getaddresses(lookup, &rv[0][1], + NULL); if (addresscount == 0) { fatal("no valid addresses for '%s'\n", &rv[0][1]); @@ -2340,7 +2331,8 @@ parse_args(bool is_batchfile, bool config_only, int argc, char **argv) if (dash_option(&rv[0][1], NULL, &lookup, &open_type_class, &need_clone, config_only, argc, argv, - &firstarg)) { + &firstarg)) + { rc--; rv++; } @@ -2348,7 +2340,8 @@ parse_args(bool is_batchfile, bool config_only, int argc, char **argv) if (dash_option(&rv[0][1], rv[1], &lookup, &open_type_class, &need_clone, config_only, argc, argv, - &firstarg)) { + &firstarg)) + { rc--; rv++; } @@ -2483,7 +2476,8 @@ parse_args(bool is_batchfile, bool config_only, int argc, char **argv) if (fgets(batchline, sizeof(batchline), batchfp) != 0) { debug("batch line %s", batchline); if (batchline[0] == '\r' || batchline[0] == '\n' || - batchline[0] == '#' || batchline[0] == ';') { + batchline[0] == '#' || batchline[0] == ';') + { goto next_line; } bargc = split_batchline(batchline, bargv, 14, @@ -2525,10 +2519,9 @@ parse_args(bool is_batchfile, bool config_only, int argc, char **argv) * for real if there's nothing in the batch file to read. */ static void -query_finished(void) -{ - char batchline[MXNAME]; - int bargc; +query_finished(void) { + char batchline[MXNAME]; + int bargc; char *bargv[16]; if (atomic_load(&batchname) == 0) { @@ -2563,8 +2556,7 @@ query_finished(void) } static void -dig_error(const char *format, ...) -{ +dig_error(const char *format, ...) { va_list args; if (yaml) { @@ -2593,8 +2585,7 @@ dig_error(const char *format, ...) } static void -dig_warning(const char *format, ...) -{ +dig_warning(const char *format, ...) { va_list args; if (!yaml) { @@ -2609,8 +2600,7 @@ dig_warning(const char *format, ...) } static void -dig_comments(dig_lookup_t *lookup, const char *format, ...) -{ +dig_comments(dig_lookup_t *lookup, const char *format, ...) { va_list args; if (lookup->comments && !yaml) { @@ -2625,8 +2615,7 @@ dig_comments(dig_lookup_t *lookup, const char *format, ...) } void -dig_setup(int argc, char **argv) -{ +dig_setup(int argc, char **argv) { isc_result_t result; ISC_LIST_INIT(lookup_list); @@ -2655,8 +2644,7 @@ dig_setup(int argc, char **argv) } void -dig_query_setup(bool is_batchfile, bool config_only, int argc, char **argv) -{ +dig_query_setup(bool is_batchfile, bool config_only, int argc, char **argv) { debug("dig_query_setup"); parse_args(is_batchfile, config_only, argc, argv); @@ -2672,8 +2660,7 @@ dig_query_setup(bool is_batchfile, bool config_only, int argc, char **argv) } void -dig_startup() -{ +dig_startup() { isc_result_t result; debug("dig_startup()"); @@ -2684,14 +2671,12 @@ dig_startup() } void -dig_query_start() -{ +dig_query_start() { start_lookup(); } void -dig_shutdown() -{ +dig_shutdown() { destroy_lookup(default_lookup); if (atomic_load(&batchname) != 0) { if (batchfp != stdin) { @@ -2706,8 +2691,7 @@ dig_shutdown() /*% Main processing routine for dig */ int -main(int argc, char **argv) -{ +main(int argc, char **argv) { dig_setup(argc, argv); dig_query_setup(false, false, argc, argv); dig_startup(); diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index 057e9e96b8..c175342d41 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -93,44 +93,42 @@ #define NS_IN6ADDRSZ 16 #endif /* if !defined(NS_IN6ADDRSZ) */ -dig_lookuplist_t lookup_list; -dig_serverlist_t server_list; +dig_lookuplist_t lookup_list; +dig_serverlist_t server_list; dig_searchlistlist_t search_list; bool check_ra = false, have_ipv4 = false, have_ipv6 = false, specified_source = false, free_now = false, cancel_now = false, usesearch = false, showsearch = false, is_dst_up = false, keep_open = false, verbose = false, yaml = false; -in_port_t port = 53; -unsigned int timeout = 0; -unsigned int extrabytes; -isc_mem_t * mctx = NULL; -isc_log_t * lctx = NULL; -isc_taskmgr_t * taskmgr = NULL; -isc_task_t * global_task = NULL; -isc_timermgr_t * timermgr = NULL; +in_port_t port = 53; +unsigned int timeout = 0; +unsigned int extrabytes; +isc_mem_t *mctx = NULL; +isc_log_t *lctx = NULL; +isc_taskmgr_t *taskmgr = NULL; +isc_task_t *global_task = NULL; +isc_timermgr_t *timermgr = NULL; isc_socketmgr_t *socketmgr = NULL; -isc_sockaddr_t bind_address; -isc_sockaddr_t bind_any; -int sendcount = 0; -int recvcount = 0; -int sockcount = 0; -int ndots = -1; -int tries = 3; -int lookup_counter = 0; +isc_sockaddr_t bind_address; +isc_sockaddr_t bind_any; +int sendcount = 0; +int recvcount = 0; +int sockcount = 0; +int ndots = -1; +int tries = 3; +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; +isc_socket_t *keep = NULL; isc_sockaddr_t keepaddr; /*% @@ -143,25 +141,25 @@ isc_sockaddr_t keepaddr; *\li 9 No reply from server *\li 10 Internal error */ -int exitcode = 0; -int fatalexit = 0; -char keynametext[MXNAME]; -char keyfile[MXNAME] = ""; -char keysecret[MXNAME] = ""; -unsigned char cookie_secret[33]; -unsigned char cookie[8]; +int exitcode = 0; +int fatalexit = 0; +char keynametext[MXNAME]; +char keyfile[MXNAME] = ""; +char keysecret[MXNAME] = ""; +unsigned char cookie_secret[33]; +unsigned char cookie[8]; const dns_name_t *hmacname = NULL; -unsigned int digestbits = 0; -isc_buffer_t * namebuf = NULL; -dns_tsigkey_t * tsigkey = NULL; -bool validated = true; -isc_mempool_t * commctx = NULL; -bool debugging = false; -bool debugtiming = false; -bool memdebugging = false; -char * progname = NULL; -isc_mutex_t lookup_lock; -dig_lookup_t * current_lookup = NULL; +unsigned int digestbits = 0; +isc_buffer_t *namebuf = NULL; +dns_tsigkey_t *tsigkey = NULL; +bool validated = true; +isc_mempool_t *commctx = NULL; +bool debugging = false; +bool debugtiming = false; +bool memdebugging = false; +char *progname = NULL; +isc_mutex_t lookup_lock; +dig_lookup_t *current_lookup = NULL; #define DIG_MAX_ADDRESSES 20 @@ -184,8 +182,7 @@ dig_lookup_t * current_lookup = NULL; } static void -default_warnerr(const char *format, ...) -{ +default_warnerr(const char *format, ...) { va_list args; printf(";; "); @@ -196,8 +193,7 @@ default_warnerr(const char *format, ...) } static void -default_comments(dig_lookup_t *lookup, const char *format, ...) -{ +default_comments(dig_lookup_t *lookup, const char *format, ...) { va_list args; if (lookup->comments) { @@ -211,7 +207,7 @@ default_comments(dig_lookup_t *lookup, const char *format, ...) /* dynamic callbacks */ -isc_result_t (*dighost_printmessage)(dig_query_t * query, +isc_result_t (*dighost_printmessage)(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, bool headers); @@ -231,32 +227,24 @@ 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) -{ +count_dots(char *string) { char *s; - int i = 0; + int i = 0; s = string; while (*s != '\0') { @@ -269,8 +257,7 @@ count_dots(char *string) } static void -hex_dump(isc_buffer_t *b) -{ +hex_dump(isc_buffer_t *b) { unsigned int len, i; isc_region_t r; @@ -312,8 +299,7 @@ hex_dump(isc_buffer_t *b) * ISC_R_NOSPACE if that would advance p past 'end'. */ static isc_result_t -append(const char *text, size_t len, char **p, char *end) -{ +append(const char *text, size_t len, char **p, char *end) { if (*p + len > end) { return (ISC_R_NOSPACE); } @@ -323,10 +309,9 @@ append(const char *text, size_t len, char **p, char *end) } static isc_result_t -reverse_octets(const char *in, char **p, char *end) -{ +reverse_octets(const char *in, char **p, char *end) { const char *dot = strchr(in, '.'); - size_t len; + size_t len; if (dot != NULL) { isc_result_t result; result = reverse_octets(dot + 1, p, end); @@ -345,10 +330,9 @@ reverse_octets(const char *in, char **p, char *end) } isc_result_t -get_reverse(char *reverse, size_t len, char *value, bool strict) -{ - int r; - isc_result_t result; +get_reverse(char *reverse, size_t len, char *value, bool strict) { + int r; + isc_result_t result; isc_netaddr_t addr; addr.family = AF_INET6; @@ -356,8 +340,8 @@ get_reverse(char *reverse, size_t len, char *value, bool strict) if (r > 0) { /* This is a valid IPv6 address. */ dns_fixedname_t fname; - dns_name_t * name; - unsigned int options = 0; + dns_name_t *name; + unsigned int options = 0; name = dns_fixedname_initname(&fname); result = dns_byaddr_createptrname(&addr, options, name); @@ -397,8 +381,7 @@ void (*dighost_pre_exit_hook)(void) = NULL; #if TARGET_OS_IPHONE void -warn(const char *format, ...) -{ +warn(const char *format, ...) { va_list args; fflush(stdout); @@ -410,8 +393,7 @@ warn(const char *format, ...) } #else /* if TARGET_OS_IPHONE */ void -warn(const char *format, ...) -{ +warn(const char *format, ...) { va_list args; fflush(stdout); @@ -424,8 +406,7 @@ warn(const char *format, ...) #endif /* if TARGET_OS_IPHONE */ void -digexit(void) -{ +digexit(void) { if (exitcode < 10) { exitcode = 10; } @@ -439,8 +420,7 @@ digexit(void) } void -fatal(const char *format, ...) -{ +fatal(const char *format, ...) { va_list args; fflush(stdout); @@ -453,9 +433,8 @@ fatal(const char *format, ...) } void -debug(const char *format, ...) -{ - va_list args; +debug(const char *format, ...) { + va_list args; isc_time_t t; if (debugging) { @@ -473,8 +452,7 @@ debug(const char *format, ...) } void -check_result(isc_result_t result, const char *msg) -{ +check_result(isc_result_t result, const char *msg) { if (result != ISC_R_SUCCESS) { fatal("%s: %s", msg, isc_result_totext(result)); } @@ -486,8 +464,7 @@ check_result(isc_result_t result, const char *msg) * of finding the answer the user is looking for */ dig_server_t * -make_server(const char *servname, const char *userarg) -{ +make_server(const char *servname, const char *userarg) { dig_server_t *srv; REQUIRE(servname != NULL); @@ -505,21 +482,20 @@ make_server(const char *servname, const char *userarg) * The dest list must have already had ISC_LIST_INIT applied. */ static void -get_server_list(irs_resconf_t *resconf) -{ +get_server_list(irs_resconf_t *resconf) { isc_sockaddrlist_t *servers; - isc_sockaddr_t * sa; - dig_server_t * newsrv; + isc_sockaddr_t *sa; + dig_server_t *newsrv; char tmp[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255") + sizeof("%4000000000")]; debug("get_server_list()"); servers = irs_resconf_getnameservers(resconf); for (sa = ISC_LIST_HEAD(*servers); sa != NULL; sa = ISC_LIST_NEXT(sa, link)) { - int pf = isc_sockaddr_pf(sa); + int pf = isc_sockaddr_pf(sa); isc_netaddr_t na; - isc_result_t result; - isc_buffer_t b; + isc_result_t result; + isc_buffer_t b; if (pf == AF_INET && !have_ipv4) { continue; @@ -547,8 +523,7 @@ get_server_list(irs_resconf_t *resconf) } void -flush_server_list(void) -{ +flush_server_list(void) { dig_server_t *s, *ps; debug("flush_server_list()"); @@ -562,14 +537,13 @@ flush_server_list(void) } void -set_nameserver(char *opt) -{ - isc_result_t result; +set_nameserver(char *opt) { + isc_result_t result; isc_sockaddr_t sockaddrs[DIG_MAX_ADDRESSES]; - isc_netaddr_t netaddr; - int count, i; - dig_server_t * srv; - char tmp[ISC_NETADDR_FORMATSIZE]; + isc_netaddr_t netaddr; + int count, i; + dig_server_t *srv; + char tmp[ISC_NETADDR_FORMATSIZE]; if (opt == NULL) { return; @@ -600,8 +574,7 @@ set_nameserver(char *opt) * ISC_LIST_INIT applied. */ void -clone_server_list(dig_serverlist_t src, dig_serverlist_t *dest) -{ +clone_server_list(dig_serverlist_t src, dig_serverlist_t *dest) { dig_server_t *srv, *newsrv; debug("clone_server_list()"); @@ -621,8 +594,7 @@ clone_server_list(dig_serverlist_t src, dig_serverlist_t *dest) * (outstanding queries which have been made to the listed servers). */ dig_lookup_t * -make_empty_lookup(void) -{ +make_empty_lookup(void) { dig_lookup_t *looknew; debug("make_empty_lookup()"); @@ -728,8 +700,7 @@ make_empty_lookup(void) #define EDNSOPT_OPTIONS 100U static void -cloneopts(dig_lookup_t *looknew, dig_lookup_t *lookold) -{ +cloneopts(dig_lookup_t *looknew, dig_lookup_t *lookold) { size_t len = sizeof(looknew->ednsopts[0]) * EDNSOPT_OPTIONS; size_t i; looknew->ednsopts = isc_mem_allocate(mctx, len); @@ -747,8 +718,8 @@ cloneopts(dig_lookup_t *looknew, dig_lookup_t *lookold) len = lookold->ednsopts[i].length; if (len != 0) { INSIST(lookold->ednsopts[i].value != NULL); - looknew->ednsopts[i].value = - isc_mem_allocate(mctx, len); + looknew->ednsopts[i].value = isc_mem_allocate(mctx, + len); memmove(looknew->ednsopts[i].value, lookold->ednsopts[i].value, len); } @@ -766,8 +737,7 @@ cloneopts(dig_lookup_t *looknew, dig_lookup_t *lookold) * list separately from somewhere else, or construct it by hand. */ dig_lookup_t * -clone_lookup(dig_lookup_t *lookold, bool servers) -{ +clone_lookup(dig_lookup_t *lookold, bool servers) { dig_lookup_t *looknew; debug("clone_lookup()"); @@ -879,8 +849,7 @@ clone_lookup(dig_lookup_t *lookold, bool servers) * queue getting run. */ dig_lookup_t * -requeue_lookup(dig_lookup_t *lookold, bool servers) -{ +requeue_lookup(dig_lookup_t *lookold, bool servers) { dig_lookup_t *looknew; debug("requeue_lookup()"); @@ -902,12 +871,11 @@ requeue_lookup(dig_lookup_t *lookold, bool servers) } void -setup_text_key(void) -{ - isc_result_t result; - dns_name_t keyname; - isc_buffer_t secretbuf; - unsigned int secretsize; +setup_text_key(void) { + isc_result_t result; + dns_name_t keyname; + isc_buffer_t secretbuf; + unsigned int secretsize; unsigned char *secretstore; debug("setup_text_key()"); @@ -952,9 +920,8 @@ failure: static isc_result_t parse_uint_helper(uint32_t *uip, const char *value, uint32_t max, - const char *desc, int base) -{ - uint32_t n; + const char *desc, int base) { + uint32_t n; isc_result_t result = isc_parse_uint32(&n, value, base); if (result == ISC_R_SUCCESS && n > max) { result = ISC_R_RANGE; @@ -969,22 +936,19 @@ parse_uint_helper(uint32_t *uip, const char *value, uint32_t max, } isc_result_t -parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc) -{ +parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc) { return (parse_uint_helper(uip, value, max, desc, 10)); } isc_result_t -parse_xint(uint32_t *uip, const char *value, uint32_t max, const char *desc) -{ +parse_xint(uint32_t *uip, const char *value, uint32_t max, const char *desc) { return (parse_uint_helper(uip, value, max, desc, 0)); } static uint32_t -parse_bits(char *arg, const char *desc, uint32_t max) -{ +parse_bits(char *arg, const char *desc, uint32_t max) { isc_result_t result; - uint32_t tmp; + uint32_t tmp; result = parse_uint(&tmp, arg, max, desc); if (result != ISC_R_SUCCESS) { @@ -995,16 +959,15 @@ parse_bits(char *arg, const char *desc, uint32_t max) } isc_result_t -parse_netprefix(isc_sockaddr_t **sap, const char *value) -{ - isc_result_t result = ISC_R_SUCCESS; +parse_netprefix(isc_sockaddr_t **sap, const char *value) { + isc_result_t result = ISC_R_SUCCESS; isc_sockaddr_t *sa = NULL; - struct in_addr in4; + struct in_addr in4; struct in6_addr in6; - uint32_t prefix_length = 0xffffffff; - char * slash = NULL; - bool parsed = false; - bool prefix_parsed = false; + uint32_t prefix_length = 0xffffffff; + char *slash = NULL; + bool parsed = false; + bool prefix_parsed = false; char buf[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:XXX.XXX.XXX.XXX/128")]; REQUIRE(sap != NULL && *sap == NULL); @@ -1077,9 +1040,8 @@ done: * Parse HMAC algorithm specification */ void -parse_hmac(const char *hmac) -{ - char buf[20]; +parse_hmac(const char *hmac) { + char buf[20]; size_t len; REQUIRE(hmac != NULL); @@ -1135,17 +1097,16 @@ parse_hmac(const char *hmac) * Get a key from a named.conf format keyfile */ static isc_result_t -read_confkey(void) -{ - cfg_parser_t * pctx = NULL; - cfg_obj_t * file = NULL; +read_confkey(void) { + cfg_parser_t *pctx = NULL; + cfg_obj_t *file = NULL; const cfg_obj_t *keyobj = NULL; const cfg_obj_t *secretobj = NULL; const cfg_obj_t *algorithmobj = NULL; - const char * keyname; - const char * secretstr; - const char * algorithm; - isc_result_t result; + const char *keyname; + const char *secretstr; + const char *algorithm; + isc_result_t result; if (!isc_file_exists(keyfile)) { return (ISC_R_FILENOTFOUND); @@ -1193,10 +1154,9 @@ cleanup: } void -setup_file_key(void) -{ +setup_file_key(void) { isc_result_t result; - dst_key_t * dstkey = NULL; + dst_key_t *dstkey = NULL; debug("setup_file_key()"); @@ -1257,8 +1217,7 @@ failure: } static dig_searchlist_t * -make_searchlist_entry(char *domain) -{ +make_searchlist_entry(char *domain) { dig_searchlist_t *search; search = isc_mem_allocate(mctx, sizeof(*search)); strlcpy(search->origin, domain, MXNAME); @@ -1268,8 +1227,7 @@ make_searchlist_entry(char *domain) } static void -clear_searchlist(void) -{ +clear_searchlist(void) { dig_searchlist_t *search; while ((search = ISC_LIST_HEAD(search_list)) != NULL) { ISC_LIST_UNLINK(search_list, search, link); @@ -1278,18 +1236,18 @@ clear_searchlist(void) } static void -create_search_list(irs_resconf_t *resconf) -{ +create_search_list(irs_resconf_t *resconf) { irs_resconf_searchlist_t *list; - irs_resconf_search_t * entry; - dig_searchlist_t * search; + irs_resconf_search_t *entry; + dig_searchlist_t *search; debug("create_search_list()"); clear_searchlist(); list = irs_resconf_getsearchlist(resconf); for (entry = ISC_LIST_HEAD(*list); entry != NULL; - entry = ISC_LIST_NEXT(entry, link)) { + entry = ISC_LIST_NEXT(entry, link)) + { search = make_searchlist_entry(entry->domain); ISC_LIST_APPEND(search_list, search, link); } @@ -1302,8 +1260,7 @@ create_search_list(irs_resconf_t *resconf) * libirs are usable due to the specified address family restrictions. */ static void -add_fallback_nameserver(const char *addr) -{ +add_fallback_nameserver(const char *addr) { dig_server_t *server = make_server(addr, addr); ISC_LINK_INIT(server, link); ISC_LIST_APPEND(server_list, server, link); @@ -1314,10 +1271,9 @@ add_fallback_nameserver(const char *addr) * settings. */ void -setup_system(bool ipv4only, bool ipv6only) -{ +setup_system(bool ipv4only, bool ipv6only) { irs_resconf_t *resconf = NULL; - isc_result_t result; + isc_result_t result; debug("setup_system()"); @@ -1385,8 +1341,7 @@ setup_system(bool ipv4only, bool ipv6only) * Override the search list derived from resolv.conf by 'domain'. */ void -set_search_domain(char *domain) -{ +set_search_domain(char *domain) { dig_searchlist_t *search; clear_searchlist(); @@ -1398,9 +1353,8 @@ set_search_domain(char *domain) * Setup the ISC and DNS libraries for use by the system. */ void -setup_libs(void) -{ - isc_result_t result; +setup_libs(void) { + isc_result_t result; isc_logconfig_t *logconfig = NULL; debug("setup_libs()"); @@ -1468,7 +1422,7 @@ setup_libs(void) } typedef struct dig_ednsoptname { - uint32_t code; + uint32_t code; const char *name; } dig_ednsoptname_t; @@ -1494,12 +1448,11 @@ dig_ednsoptname_t optnames[] = { #define N_EDNS_OPTNAMES (sizeof(optnames) / sizeof(optnames[0])) void -save_opt(dig_lookup_t *lookup, char *code, char *value) -{ +save_opt(dig_lookup_t *lookup, char *code, char *value) { isc_result_t result; - uint32_t num = 0; + uint32_t num = 0; isc_buffer_t b; - bool found = false; + bool found = false; unsigned int i; if (lookup->ednsoptscnt >= EDNSOPT_OPTIONS) { @@ -1555,10 +1508,9 @@ save_opt(dig_lookup_t *lookup, char *code, char *value) */ static void add_opt(dns_message_t *msg, uint16_t udpsize, uint16_t edns, unsigned int flags, - dns_ednsopt_t *opts, size_t count) -{ + dns_ednsopt_t *opts, size_t count) { dns_rdataset_t *rdataset = NULL; - isc_result_t result; + isc_result_t result; debug("add_opt()"); result = dns_message_buildopt(msg, &rdataset, edns, udpsize, flags, @@ -1574,10 +1526,9 @@ add_opt(dns_message_t *msg, uint16_t udpsize, uint16_t edns, unsigned int flags, */ static void add_question(dns_message_t *message, dns_name_t *name, dns_rdataclass_t rdclass, - dns_rdatatype_t rdtype) -{ + dns_rdatatype_t rdtype) { dns_rdataset_t *rdataset; - isc_result_t result; + isc_result_t result; debug("add_question()"); rdataset = NULL; @@ -1596,8 +1547,7 @@ add_question(dns_message_t *message, dns_name_t *name, dns_rdataclass_t rdclass, * a whole or reseed the lookup list. */ static void -check_if_done(void) -{ +check_if_done(void) { debug("check_if_done()"); debug("list %s", ISC_LIST_EMPTY(lookup_list) ? "empty" : "full"); if (ISC_LIST_EMPTY(lookup_list) && current_lookup == NULL && @@ -1614,8 +1564,7 @@ check_if_done(void) * WILL invalidate the query pointer. */ static void -clear_query(dig_query_t *query) -{ +clear_query(dig_query_t *query) { dig_lookup_t *lookup; REQUIRE(query != NULL); @@ -1663,8 +1612,7 @@ clear_query(dig_query_t *query) * lookup pointer has been invalidated. */ static bool -try_clear_lookup(dig_lookup_t *lookup) -{ +try_clear_lookup(dig_lookup_t *lookup) { dig_query_t *q; REQUIRE(lookup != NULL); @@ -1672,7 +1620,8 @@ try_clear_lookup(dig_lookup_t *lookup) debug("try_clear_lookup(%p)", lookup); if (ISC_LIST_HEAD(lookup->q) != NULL || - ISC_LIST_HEAD(lookup->connecting) != NULL) { + ISC_LIST_HEAD(lookup->connecting) != NULL) + { if (debugging) { q = ISC_LIST_HEAD(lookup->q); while (q != NULL) { @@ -1699,10 +1648,9 @@ try_clear_lookup(dig_lookup_t *lookup) } void -destroy_lookup(dig_lookup_t *lookup) -{ +destroy_lookup(dig_lookup_t *lookup) { dig_server_t *s; - void * ptr; + void *ptr; debug("destroy"); s = ISC_LIST_HEAD(lookup->my_server_list); @@ -1753,8 +1701,7 @@ destroy_lookup(dig_lookup_t *lookup) * setting the current_lookup pointer pointing to it. */ void -start_lookup(void) -{ +start_lookup(void) { debug("start_lookup()"); if (cancel_now) { return; @@ -1787,8 +1734,7 @@ start_lookup(void) * This calls try_clear_lookup, so may invalidate the lookup pointer. */ static void -check_next_lookup(dig_lookup_t *lookup) -{ +check_next_lookup(dig_lookup_t *lookup) { INSIST(!free_now); debug("check_next_lookup(%p)", lookup); @@ -1810,21 +1756,20 @@ check_next_lookup(dig_lookup_t *lookup) * NS records in a reply. Returns the number of followup lookups made. */ static int -followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section) -{ - dig_lookup_t * lookup = NULL; - dig_server_t * srv = NULL; +followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section) { + dig_lookup_t *lookup = NULL; + dig_server_t *srv = NULL; dns_rdataset_t *rdataset = NULL; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_name_t * name = NULL; - isc_result_t result; - bool success = false; - int numLookups = 0; - int num; - isc_result_t lresult, addresses_result; - char bad_namestr[DNS_NAME_FORMATSIZE]; - dns_name_t * domain; - bool horizontal = false, bad = false; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_name_t *name = NULL; + isc_result_t result; + bool success = false; + int numLookups = 0; + int num; + isc_result_t lresult, addresses_result; + char bad_namestr[DNS_NAME_FORMATSIZE]; + dns_name_t *domain; + bool horizontal = false, bad = false; INSIST(!free_now); @@ -1834,7 +1779,8 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section) bad_namestr[0] = '\0'; for (result = dns_message_firstname(msg, section); result == ISC_R_SUCCESS; - result = dns_message_nextname(msg, section)) { + result = dns_message_nextname(msg, section)) + { name = NULL; dns_message_currentname(msg, section, &name); @@ -1857,8 +1803,8 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section) if (query->lookup->trace && !query->lookup->trace_root) { dns_namereln_t namereln; - unsigned int nlabels; - int order; + unsigned int nlabels; + int order; domain = dns_fixedname_name(&query->lookup->fdomain); namereln = dns_name_fullcompare(name, domain, &order, @@ -1880,8 +1826,9 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section) for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { - char namestr[DNS_NAME_FORMATSIZE]; + result = dns_rdataset_next(rdataset)) + { + char namestr[DNS_NAME_FORMATSIZE]; dns_rdata_ns_t ns; if (query->lookup->trace_root && @@ -1941,7 +1888,8 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section) } if (lookup == NULL && section == DNS_SECTION_ANSWER && - (query->lookup->trace || query->lookup->ns_search_only)) { + (query->lookup->trace || query->lookup->ns_search_only)) + { return (followup_lookup(msg, query, DNS_SECTION_AUTHORITY)); } @@ -1949,15 +1897,16 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section) * Randomize the order the nameserver will be tried. */ if (numLookups > 1) { - uint32_t i, j; + uint32_t i, j; dig_serverlist_t my_server_list; - dig_server_t * next; + dig_server_t *next; ISC_LIST_INIT(my_server_list); i = numLookups; for (srv = ISC_LIST_HEAD(lookup->my_server_list); srv != NULL; - srv = ISC_LIST_HEAD(lookup->my_server_list)) { + srv = ISC_LIST_HEAD(lookup->my_server_list)) + { INSIST(i > 0); j = isc_random_uniform(i); next = ISC_LIST_NEXT(srv, link); @@ -1983,13 +1932,12 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section) * Return true iff there was another searchlist entry. */ static bool -next_origin(dig_lookup_t *oldlookup) -{ - dig_lookup_t * newlookup; +next_origin(dig_lookup_t *oldlookup) { + dig_lookup_t *newlookup; dig_searchlist_t *search; - dns_fixedname_t fixed; - dns_name_t * name; - isc_result_t result; + dns_fixedname_t fixed; + dns_name_t *name; + isc_result_t result; INSIST(!free_now); @@ -2011,7 +1959,8 @@ next_origin(dig_lookup_t *oldlookup) result = dns_name_fromstring2(name, oldlookup->textname, NULL, 0, NULL); if (result == ISC_R_SUCCESS && (dns_name_isabsolute(name) || - (int)dns_name_countlabels(name) > ndots)) { + (int)dns_name_countlabels(name) > ndots)) + { return (false); } @@ -2042,14 +1991,13 @@ next_origin(dig_lookup_t *oldlookup) * creating IXFR queries. */ static void -insert_soa(dig_lookup_t *lookup) -{ - isc_result_t result; - dns_rdata_soa_t soa; - dns_rdata_t * rdata = NULL; +insert_soa(dig_lookup_t *lookup) { + isc_result_t result; + dns_rdata_soa_t soa; + dns_rdata_t *rdata = NULL; dns_rdatalist_t *rdatalist = NULL; - dns_rdataset_t * rdataset = NULL; - dns_name_t * soaname = NULL; + dns_rdataset_t *rdataset = NULL; + dns_name_t *soaname = NULL; debug("insert_soa()"); soa.mctx = mctx; @@ -2100,8 +2048,7 @@ insert_soa(dig_lookup_t *lookup) } static void -compute_cookie(unsigned char *clientcookie, size_t len) -{ +compute_cookie(unsigned char *clientcookie, size_t len) { /* XXXMPA need to fix, should be per server. */ INSIST(len >= 8U); memmove(clientcookie, cookie_secret, 8); @@ -2114,19 +2061,18 @@ compute_cookie(unsigned char *clientcookie, size_t len) * server list is empty, clone it from the system default list. */ bool -setup_lookup(dig_lookup_t *lookup) -{ - isc_result_t result; - unsigned int len; - dig_server_t * serv; - dig_query_t * query; - isc_buffer_t b; +setup_lookup(dig_lookup_t *lookup) { + isc_result_t result; + unsigned int len; + dig_server_t *serv; + dig_query_t *query; + isc_buffer_t b; dns_compress_t cctx; - char store[MXNAME]; - char ecsbuf[20]; - char cookiebuf[256]; - char * origin = NULL; - char * textname = NULL; + char store[MXNAME]; + char ecsbuf[20]; + char cookiebuf[256]; + char *origin = NULL; + char *textname = NULL; REQUIRE(lookup != NULL); @@ -2228,7 +2174,7 @@ setup_lookup(dig_lookup_t *lookup) dns_name_clone(dns_rootname, lookup->name); } else { dns_fixedname_t fixed; - dns_name_t * name; + dns_name_t *name; name = dns_fixedname_initname(&fixed); len = (unsigned int)strlen(textname); @@ -2302,7 +2248,8 @@ setup_lookup(dig_lookup_t *lookup) } if (lookup->recurse && lookup->rdtype != dns_rdatatype_axfr && - lookup->rdtype != dns_rdatatype_ixfr) { + lookup->rdtype != dns_rdatatype_ixfr) + { debug("recursive query"); lookup->sendmsg->flags |= DNS_MESSAGEFLAG_RD; } @@ -2347,7 +2294,8 @@ setup_lookup(dig_lookup_t *lookup) } if ((lookup->rdtype == dns_rdatatype_axfr) || - (lookup->rdtype == dns_rdatatype_ixfr)) { + (lookup->rdtype == dns_rdatatype_ixfr)) + { /* * Force TCP mode if we're doing an axfr. */ @@ -2392,11 +2340,12 @@ setup_lookup(dig_lookup_t *lookup) &lookup->renderbuf); check_result(result, "dns_message_renderbegin"); if (lookup->udpsize > 0 || lookup->dnssec || lookup->edns > -1 || - lookup->ecs_addr != NULL) { + lookup->ecs_addr != NULL) + { #define MAXOPTS (EDNSOPT_OPTIONS + DNS_EDNSOPTIONS) dns_ednsopt_t opts[MAXOPTS]; - unsigned int flags; - unsigned int i = 0; + unsigned int flags; + unsigned int i = 0; /* * There can't be more than MAXOPTS options to send: @@ -2420,13 +2369,13 @@ setup_lookup(dig_lookup_t *lookup) } if (lookup->ecs_addr != NULL) { - uint8_t addr[16]; - uint16_t family = 0; - uint32_t plen; - struct sockaddr * sa; - struct sockaddr_in * sin; + uint8_t addr[16]; + uint16_t family = 0; + uint32_t plen; + struct sockaddr *sa; + struct sockaddr_in *sin; struct sockaddr_in6 *sin6; - size_t addrl; + size_t addrl; sa = &lookup->ecs_addr->type.sa; plen = lookup->ecs_addr->length; @@ -2591,7 +2540,8 @@ setup_lookup(dig_lookup_t *lookup) lookup->pending = false; for (serv = ISC_LIST_HEAD(lookup->my_server_list); serv != NULL; - serv = ISC_LIST_NEXT(serv, link)) { + serv = ISC_LIST_NEXT(serv, link)) + { query = isc_mem_allocate(mctx, sizeof(dig_query_t)); debug("create query %p linked to lookup %p", query, lookup); query->lookup = lookup; @@ -2646,9 +2596,8 @@ setup_lookup(dig_lookup_t *lookup) * the query if the send was canceled. */ static void -send_done(isc_task_t *_task, isc_event_t *event) -{ - dig_query_t * query, *next; +send_done(isc_task_t *_task, isc_event_t *event) { + dig_query_t *query, *next; dig_lookup_t *l; REQUIRE(event->ev_type == ISC_SOCKEVENT_SENDDONE); @@ -2693,8 +2642,7 @@ send_done(isc_task_t *_task, isc_event_t *event) * query and lookup structures */ static void -cancel_lookup(dig_lookup_t *lookup) -{ +cancel_lookup(dig_lookup_t *lookup) { dig_query_t *query, *next; debug("cancel_lookup()"); @@ -2716,11 +2664,10 @@ cancel_lookup(dig_lookup_t *lookup) } static void -bringup_timer(dig_query_t *query, unsigned int default_timeout) -{ +bringup_timer(dig_query_t *query, unsigned int default_timeout) { dig_lookup_t *l; - unsigned int local_timeout; - isc_result_t result; + unsigned int local_timeout; + isc_result_t result; REQUIRE(DIG_VALID_QUERY(query)); debug("bringup_timer()"); @@ -2730,8 +2677,8 @@ bringup_timer(dig_query_t *query, unsigned int default_timeout) * just reset it. */ l = query->lookup; - if (ISC_LINK_LINKED(query, link) && - ISC_LIST_NEXT(query, link) != NULL) { + if (ISC_LINK_LINKED(query, link) && ISC_LIST_NEXT(query, link) != NULL) + { local_timeout = SERVER_TIMEOUT; } else { if (timeout == 0) { @@ -2752,8 +2699,7 @@ bringup_timer(dig_query_t *query, unsigned int default_timeout) } static void -force_timeout(dig_query_t *query) -{ +force_timeout(dig_query_t *query) { isc_event_t *event; debug("force_timeout ()"); @@ -2772,8 +2718,7 @@ 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 @@ -2781,10 +2726,9 @@ connect_done(isc_task_t *task, isc_event_t *event); * start anew. */ static void -send_tcp_connect(dig_query_t *query) -{ - isc_result_t result; - dig_query_t * next; +send_tcp_connect(dig_query_t *query) { + isc_result_t result; + dig_query_t *next; dig_lookup_t *l; REQUIRE(DIG_VALID_QUERY(query)); @@ -2805,9 +2749,10 @@ send_tcp_connect(dig_query_t *query) } if (!l->mapped && isc_sockaddr_pf(&query->sockaddr) == AF_INET6 && - IN6_IS_ADDR_V4MAPPED(&query->sockaddr.type.sin6.sin6_addr)) { + IN6_IS_ADDR_V4MAPPED(&query->sockaddr.type.sin6.sin6_addr)) + { isc_netaddr_t netaddr; - char buf[ISC_NETADDR_FORMATSIZE]; + char buf[ISC_NETADDR_FORMATSIZE]; isc_netaddr_fromsockaddr(&netaddr, &query->sockaddr); isc_netaddr_format(&netaddr, buf, sizeof(buf)); @@ -2853,8 +2798,8 @@ send_tcp_connect(dig_query_t *query) result = isc_socket_bind(query->sock, &bind_address, ISC_SOCKET_REUSEADDRESS); } else { - if ((isc_sockaddr_pf(&query->sockaddr) == AF_INET) && - have_ipv4) { + if ((isc_sockaddr_pf(&query->sockaddr) == AF_INET) && have_ipv4) + { isc_sockaddr_any(&bind_any); } else { isc_sockaddr_any6(&bind_any); @@ -2887,8 +2832,7 @@ search: } static void -print_query_size(dig_query_t *query) -{ +print_query_size(dig_query_t *query) { if (!yaml) { printf(";; QUERY SIZE: %u\n\n", isc_buffer_usedlength(&query->lookup->renderbuf)); @@ -2901,12 +2845,11 @@ print_query_size(dig_query_t *query) * is properly reset. */ static void -send_udp(dig_query_t *query) -{ - dig_lookup_t * l = NULL; - isc_result_t result; - dig_query_t * next; - isc_region_t r; +send_udp(dig_query_t *query) { + dig_lookup_t *l = NULL; + isc_result_t result; + dig_query_t *next; + isc_region_t r; isc_socketevent_t *sevent; REQUIRE(DIG_VALID_QUERY(query)); @@ -2928,10 +2871,10 @@ send_udp(dig_query_t *query) if (!l->mapped && isc_sockaddr_pf(&query->sockaddr) == AF_INET6 && - IN6_IS_ADDR_V4MAPPED( - &query->sockaddr.type.sin6.sin6_addr)) { + IN6_IS_ADDR_V4MAPPED(&query->sockaddr.type.sin6.sin6_addr)) + { isc_netaddr_t netaddr; - char buf[ISC_NETADDR_FORMATSIZE]; + char buf[ISC_NETADDR_FORMATSIZE]; isc_netaddr_fromsockaddr(&netaddr, &query->sockaddr); isc_netaddr_format(&netaddr, buf, sizeof(buf)); @@ -3009,8 +2952,7 @@ send_udp(dig_query_t *query) * return false. */ static bool -try_next_server(dig_lookup_t *lookup) -{ +try_next_server(dig_lookup_t *lookup) { dig_query_t *current_query, *next_query; current_query = lookup->current_query; @@ -3040,10 +2982,9 @@ try_next_server(dig_lookup_t *lookup) * new TCP lookup. Otherwise, cancel the lookup. */ static void -connect_timeout(isc_task_t *task, isc_event_t *event) -{ +connect_timeout(isc_task_t *task, isc_event_t *event) { dig_lookup_t *l = NULL; - dig_query_t * query = NULL; + dig_query_t *query = NULL; UNUSED(task); REQUIRE(event->ev_type == ISC_TIMEREVENT_IDLE); @@ -3097,7 +3038,7 @@ connect_timeout(isc_task_t *task, isc_event_t *event) } else { if (l->ns_search_only) { isc_netaddr_t netaddr; - char buf[ISC_NETADDR_FORMATSIZE]; + char buf[ISC_NETADDR_FORMATSIZE]; isc_netaddr_fromsockaddr(&netaddr, &query->sockaddr); isc_netaddr_format(&netaddr, buf, sizeof(buf)); @@ -3121,8 +3062,7 @@ connect_timeout(isc_task_t *task, isc_event_t *event) * Called when a peer closes a TCP socket prematurely. */ static void -requeue_or_update_exitcode(dig_lookup_t *lookup) -{ +requeue_or_update_exitcode(dig_lookup_t *lookup) { if (lookup->eoferr == 0U) { /* * Peer closed the connection prematurely for the first time @@ -3144,15 +3084,14 @@ requeue_or_update_exitcode(dig_lookup_t *lookup) * packets. Start the next recv of length bytes. */ static void -tcp_length_done(isc_task_t *task, isc_event_t *event) -{ +tcp_length_done(isc_task_t *task, isc_event_t *event) { isc_socketevent_t *sevent; - isc_buffer_t b; - isc_region_t r; - isc_result_t result; - dig_query_t * query = NULL; - dig_lookup_t * l; - uint16_t length; + isc_buffer_t b; + isc_region_t r; + isc_result_t result; + dig_query_t *query = NULL; + dig_lookup_t *l; + uint16_t length; REQUIRE(event->ev_type == ISC_SOCKEVENT_RECVDONE); INSIST(!free_now); @@ -3234,11 +3173,10 @@ tcp_length_done(isc_task_t *task, isc_event_t *event) * launch the next recv. */ static void -launch_next_query(dig_query_t *query, bool include_question) -{ - isc_result_t result; +launch_next_query(dig_query_t *query, bool include_question) { + isc_result_t result; dig_lookup_t *l; - isc_region_t r; + isc_region_t r; REQUIRE(DIG_VALID_QUERY(query)); INSIST(!free_now); @@ -3307,12 +3245,11 @@ launch_next_query(dig_query_t *query, bool include_question) * question. */ static void -connect_done(isc_task_t *task, isc_event_t *event) -{ - char sockstr[ISC_SOCKADDR_FORMATSIZE]; +connect_done(isc_task_t *task, isc_event_t *event) { + char sockstr[ISC_SOCKADDR_FORMATSIZE]; isc_socketevent_t *sevent = NULL; - dig_query_t * query = NULL, *next; - dig_lookup_t * l; + dig_query_t *query = NULL, *next; + dig_lookup_t *l; UNUSED(task); @@ -3411,15 +3348,14 @@ connect_done(isc_task_t *task, isc_event_t *event) */ static bool check_for_more_data(dig_query_t *query, dns_message_t *msg, - isc_socketevent_t *sevent) -{ + isc_socketevent_t *sevent) { dns_rdataset_t *rdataset = NULL; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_soa_t soa; - uint32_t ixfr_serial = query->lookup->ixfr_serial, serial; - isc_result_t result; - bool ixfr = query->lookup->rdtype == dns_rdatatype_ixfr; - bool axfr = query->lookup->rdtype == dns_rdatatype_axfr; + uint32_t ixfr_serial = query->lookup->ixfr_serial, serial; + isc_result_t result; + bool ixfr = query->lookup->rdtype == dns_rdatatype_ixfr; + bool axfr = query->lookup->rdtype == dns_rdatatype_axfr; if (ixfr) { axfr = query->ixfr_axfr; @@ -3448,7 +3384,8 @@ check_for_more_data(dig_query_t *query, dns_message_t *msg, name = NULL; dns_message_currentname(msg, DNS_SECTION_ANSWER, &name); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { result = dns_rdataset_first(rdataset); if (result != ISC_R_SUCCESS) { continue; @@ -3495,8 +3432,9 @@ check_for_more_data(dig_query_t *query, dns_message_t *msg, query->first_rr_serial = serial; debug("this is the first serial %u", serial); - if (ixfr && isc_serial_ge(ixfr_serial, - serial)) { + if (ixfr && + isc_serial_ge(ixfr_serial, serial)) + { debug("got up to date " "response"); goto doexit; @@ -3549,14 +3487,13 @@ doexit: static void process_cookie(dig_lookup_t *l, dns_message_t *msg, isc_buffer_t *optbuf, - size_t optlen) -{ - char bb[256]; - isc_buffer_t hexbuf; - size_t len; + size_t optlen) { + char bb[256]; + isc_buffer_t hexbuf; + size_t len; const unsigned char *sent; - bool copy = true; - isc_result_t result; + bool copy = true; + isc_result_t result; if (l->cookie != NULL) { isc_buffer_init(&hexbuf, bb, sizeof(bb)); @@ -3600,14 +3537,13 @@ process_cookie(dig_lookup_t *l, dns_message_t *msg, isc_buffer_t *optbuf, } static void -process_opt(dig_lookup_t *l, dns_message_t *msg) -{ - dns_rdata_t rdata; - isc_result_t result; - isc_buffer_t optbuf; - uint16_t optcode, optlen; +process_opt(dig_lookup_t *l, dns_message_t *msg) { + dns_rdata_t rdata; + isc_result_t result; + isc_buffer_t optbuf; + uint16_t optcode, optlen; dns_rdataset_t *opt = msg->opt; - bool seen_cookie = false; + bool seen_cookie = false; result = dns_rdataset_first(opt); if (result == ISC_R_SUCCESS) { @@ -3639,8 +3575,7 @@ process_opt(dig_lookup_t *l, dns_message_t *msg) } static int -ednsvers(dns_rdataset_t *opt) -{ +ednsvers(dns_rdataset_t *opt) { return ((opt->ttl >> 16) & 0xff); } @@ -3649,22 +3584,21 @@ ednsvers(dns_rdataset_t *opt) * based on the specifics of the user's request. */ static void -recv_done(isc_task_t *task, isc_event_t *event) -{ +recv_done(isc_task_t *task, isc_event_t *event) { isc_socketevent_t *sevent = NULL; - isc_region_t r; - dig_query_t * query = NULL; - isc_buffer_t b; - dns_message_t * msg = NULL; - isc_result_t result; - dig_lookup_t * n, *l; - bool docancel = false; - bool match = true; - bool done_process_opt = false; - unsigned int parseflags; - dns_messageid_t id; - unsigned int msgflags; - int newedns; + isc_region_t r; + dig_query_t *query = NULL; + isc_buffer_t b; + dns_message_t *msg = NULL; + isc_result_t result; + dig_lookup_t *n, *l; + bool docancel = false; + bool match = true; + bool done_process_opt = false; + unsigned int parseflags; + dns_messageid_t id; + unsigned int msgflags; + int newedns; UNUSED(task); INSIST(!free_now); @@ -3732,9 +3666,10 @@ recv_done(isc_task_t *task, isc_event_t *event) !isc_sockaddr_compare(&sevent->address, &query->sockaddr, ISC_SOCKADDR_CMPADDR | ISC_SOCKADDR_CMPPORT | ISC_SOCKADDR_CMPSCOPE | - ISC_SOCKADDR_CMPSCOPEZERO)) { - char buf1[ISC_SOCKADDR_FORMATSIZE]; - char buf2[ISC_SOCKADDR_FORMATSIZE]; + ISC_SOCKADDR_CMPSCOPEZERO)) + { + char buf1[ISC_SOCKADDR_FORMATSIZE]; + char buf2[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_t any; if (isc_sockaddr_pf(&query->sockaddr) == AF_INET) { @@ -3751,7 +3686,8 @@ recv_done(isc_task_t *task, isc_event_t *event) if ((!isc_sockaddr_eqaddr(&query->sockaddr, &any) && !isc_sockaddr_ismulticast(&query->sockaddr)) || isc_sockaddr_getport(&query->sockaddr) != - isc_sockaddr_getport(&sevent->address)) { + isc_sockaddr_getport(&sevent->address)) + { isc_sockaddr_format(&sevent->address, buf1, sizeof(buf1)); isc_sockaddr_format(&query->sockaddr, buf2, @@ -3771,8 +3707,8 @@ recv_done(isc_task_t *task, isc_event_t *event) if (l->tcp_mode) { bool fail = true; if (result == ISC_R_SUCCESS) { - if ((!query->first_soa_rcvd || - query->warn_id)) { + if ((!query->first_soa_rcvd || query->warn_id)) + { dighost_warning("%s: ID mismatch: " "expected ID %u, got " "%u", @@ -3869,18 +3805,21 @@ recv_done(isc_task_t *task, isc_event_t *event) match = true; for (result = dns_message_firstname(msg, DNS_SECTION_QUESTION); result == ISC_R_SUCCESS && match; - result = dns_message_nextname(msg, DNS_SECTION_QUESTION)) { - dns_name_t * name = NULL; + result = dns_message_nextname(msg, DNS_SECTION_QUESTION)) + { + dns_name_t *name = NULL; dns_rdataset_t *rdataset; dns_message_currentname(msg, DNS_SECTION_QUESTION, &name); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (l->rdtype != rdataset->type || l->rdclass != rdataset->rdclass || - !dns_name_equal(l->name, name)) { + !dns_name_equal(l->name, name)) + { char namestr[DNS_NAME_FORMATSIZE]; char typebuf[DNS_RDATATYPE_FORMATSIZE]; char classbuf[DNS_RDATACLASS_FORMATSIZE]; @@ -3916,7 +3855,8 @@ recv_done(isc_task_t *task, isc_event_t *event) } } if (msg->rcode == dns_rcode_badvers && msg->opt != NULL && - (newedns = ednsvers(msg->opt)) < l->edns && l->ednsneg) { + (newedns = ednsvers(msg->opt)) < l->edns && l->ednsneg) + { /* * Add minimum EDNS version required checks here if needed. */ @@ -3955,7 +3895,8 @@ recv_done(isc_task_t *task, isc_event_t *event) return; } if (msg->rcode == dns_rcode_badcookie && !l->tcp_mode && - l->sendcookie && l->badcookie) { + l->sendcookie && l->badcookie) + { process_opt(l, msg); if (msg->cc_ok) { dighost_comments(l, "BADCOOKIE, retrying%s.", @@ -3980,8 +3921,8 @@ recv_done(isc_task_t *task, isc_event_t *event) done_process_opt = true; } if ((msg->rcode == dns_rcode_servfail && !l->servfail_stops) || - (check_ra && (msg->flags & DNS_MESSAGEFLAG_RA) == 0 && - l->recurse)) { + (check_ra && (msg->flags & DNS_MESSAGEFLAG_RA) == 0 && l->recurse)) + { dig_query_t *next = ISC_LIST_NEXT(query, link); if (l->current_query == query) { l->current_query = NULL; @@ -4201,11 +4142,10 @@ udp_mismatch: * routines, since they may be using a non-DNS system for these lookups. */ isc_result_t -get_address(char *host, in_port_t myport, isc_sockaddr_t *sockaddr) -{ - int count; +get_address(char *host, in_port_t myport, isc_sockaddr_t *sockaddr) { + int count; isc_result_t result; - bool is_running; + bool is_running; is_running = isc_app_isrunning(); if (is_running) { @@ -4225,14 +4165,13 @@ get_address(char *host, in_port_t myport, isc_sockaddr_t *sockaddr) } int -getaddresses(dig_lookup_t *lookup, const char *host, isc_result_t *resultp) -{ - isc_result_t result; +getaddresses(dig_lookup_t *lookup, const char *host, isc_result_t *resultp) { + isc_result_t result; isc_sockaddr_t sockaddrs[DIG_MAX_ADDRESSES]; - isc_netaddr_t netaddr; - int count, i; - dig_server_t * srv; - char tmp[ISC_NETADDR_FORMATSIZE]; + isc_netaddr_t netaddr; + int count, i; + dig_server_t *srv; + char tmp[ISC_NETADDR_FORMATSIZE]; result = bind9_getaddresses(host, 0, sockaddrs, DIG_MAX_ADDRESSES, &count); @@ -4261,8 +4200,7 @@ getaddresses(dig_lookup_t *lookup, const char *host, isc_result_t *resultp) * Initiate either a TCP or UDP lookup */ void -do_lookup(dig_lookup_t *lookup) -{ +do_lookup(dig_lookup_t *lookup) { dig_query_t *query; REQUIRE(lookup != NULL); @@ -4284,8 +4222,7 @@ do_lookup(dig_lookup_t *lookup) * Start everything in action upon task startup. */ void -onrun_callback(isc_task_t *task, isc_event_t *event) -{ +onrun_callback(isc_task_t *task, isc_event_t *event) { UNUSED(task); isc_event_free(&event); @@ -4299,10 +4236,9 @@ onrun_callback(isc_task_t *task, isc_event_t *event) * SIGINT handler. */ void -cancel_all(void) -{ +cancel_all(void) { dig_lookup_t *l, *n; - dig_query_t * q, *nq; + dig_query_t *q, *nq; debug("cancel_all()"); @@ -4352,8 +4288,7 @@ cancel_all(void) * clean shutdown. */ void -destroy_libs(void) -{ +destroy_libs(void) { #ifdef HAVE_LIBIDN2 isc_result_t result; #endif /* HAVE_LIBIDN2 */ @@ -4436,9 +4371,8 @@ destroy_libs(void) #ifdef HAVE_LIBIDN2 static isc_result_t -idn_output_filter(isc_buffer_t *buffer, unsigned int used_org) -{ - char src[MXNAME], *dst; +idn_output_filter(isc_buffer_t *buffer, unsigned int used_org) { + char src[MXNAME], *dst; size_t srclen, dstlen; /* @@ -4489,11 +4423,10 @@ idn_output_filter(isc_buffer_t *buffer, unsigned int used_org) * 'dst' MUST be large enough to hold any valid domain name. */ static void -idn_locale_to_ace(const char *src, char *dst, size_t dstlen) -{ +idn_locale_to_ace(const char *src, char *dst, size_t dstlen) { const char *final_src; - char * ascii_src; - int res; + char *ascii_src; + int res; /* * We trust libidn2 to return an error if 'src' is too large to be a @@ -4525,10 +4458,9 @@ idn_locale_to_ace(const char *src, char *dst, size_t dstlen) * The caller MUST subsequently release 'dst' using idn2_free(). */ static void -idn_ace_to_locale(const char *src, char **dst) -{ +idn_ace_to_locale(const char *src, char **dst) { char *local_src, *utf8_src; - int res; + int res; /* * We need to: diff --git a/bin/dig/host.c b/bin/dig/host.c index 9f9e9176ea..03d5b45afe 100644 --- a/bin/dig/host.c +++ b/bin/dig/host.c @@ -40,14 +40,14 @@ #include -static bool short_form = true, listed_server = false; -static bool default_lookups = true; -static int seen_error = -1; -static bool list_addresses = true; -static bool list_almost_all = false; +static bool short_form = true, listed_server = false; +static bool default_lookups = true; +static int seen_error = -1; +static bool list_addresses = true; +static bool list_almost_all = false; static dns_rdatatype_t list_type = dns_rdatatype_a; -static bool printed_server = false; -static bool ipv4only = false, ipv6only = false; +static bool printed_server = false; +static bool ipv4only = false, ipv6only = false; static const char *opcodetext[] = { "QUERY", "IQUERY", "STATUS", "RESERVED3", "NOTIFY", "UPDATE", @@ -65,7 +65,7 @@ static const char *rcodetext[] = { "NOERROR", "FORMERR", "SERVFAIL", struct rtype { unsigned int type; - const char * text; + const char *text; }; struct rtype rtypes[] = { { 1, "has address" }, @@ -85,12 +85,11 @@ struct rtype rtypes[] = { { 1, "has address" }, { 0, NULL } }; static char * -rcode_totext(dns_rcode_t rcode) -{ +rcode_totext(dns_rcode_t rcode) { static char buf[sizeof("?65535")]; union { const char *consttext; - char * deconsttext; + char *deconsttext; } totext; if (rcode >= (sizeof(rcodetext) / sizeof(rcodetext[0]))) { @@ -106,8 +105,7 @@ ISC_PLATFORM_NORETURN_PRE static void show_usage(void) ISC_PLATFORM_NORETURN_POST; static void -show_usage(void) -{ +show_usage(void) { fputs("Usage: host [-aCdilrTvVw] [-c class] [-N ndots] [-t type] [-W " "time]\n" " [-R number] [-m flag] hostname [server]\n" @@ -137,16 +135,14 @@ show_usage(void) } static void -host_shutdown(void) -{ +host_shutdown(void) { (void)isc_app_shutdown(); } static void -received(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query) -{ +received(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query) { isc_time_t now; - int diff; + int diff; if (!short_form) { char fromtext[ISC_SOCKADDR_FORMATSIZE]; @@ -159,8 +155,7 @@ received(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query) } static void -trying(char *frm, dig_lookup_t *lookup) -{ +trying(char *frm, dig_lookup_t *lookup) { UNUSED(lookup); if (!short_form) { @@ -170,13 +165,12 @@ trying(char *frm, dig_lookup_t *lookup) static void say_message(dns_name_t *name, const char *msg, dns_rdata_t *rdata, - dig_query_t *query) -{ + dig_query_t *query) { isc_buffer_t *b = NULL; - char namestr[DNS_NAME_FORMATSIZE]; - isc_region_t r; - isc_result_t result; - unsigned int bufsize = BUFSIZ; + char namestr[DNS_NAME_FORMATSIZE]; + isc_region_t r; + isc_result_t result; + unsigned int bufsize = BUFSIZ; dns_name_format(name, namestr, sizeof(namestr)); retry: @@ -202,18 +196,17 @@ retry: static isc_result_t printsection(dns_message_t *msg, dns_section_t sectionid, - const char *section_name, bool headers, dig_query_t *query) -{ - dns_name_t * name, *print_name; + const char *section_name, bool headers, dig_query_t *query) { + dns_name_t *name, *print_name; dns_rdataset_t *rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_buffer_t target; - isc_result_t result, loopresult; - isc_region_t r; - dns_name_t empty_name; - char tbuf[4096]; - bool first; - bool no_rdata; + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_buffer_t target; + isc_result_t result, loopresult; + isc_region_t r; + dns_name_t empty_name; + char tbuf[4096]; + bool first; + bool no_rdata; if (sectionid == DNS_SECTION_QUESTION) { no_rdata = true; @@ -243,7 +236,8 @@ printsection(dns_message_t *msg, dns_section_t sectionid, print_name = name; for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (query->lookup->rdtype == dns_rdatatype_axfr && !((!list_addresses && (list_type == dns_rdatatype_any || @@ -252,13 +246,15 @@ printsection(dns_message_t *msg, dns_section_t sectionid, (rdataset->type == dns_rdatatype_a || rdataset->type == dns_rdatatype_aaaa || rdataset->type == dns_rdatatype_ns || - rdataset->type == dns_rdatatype_ptr)))) { + rdataset->type == dns_rdatatype_ptr)))) + { continue; } if (list_almost_all && (rdataset->type == dns_rdatatype_rrsig || rdataset->type == dns_rdatatype_nsec || - rdataset->type == dns_rdatatype_nsec3)) { + rdataset->type == dns_rdatatype_nsec3)) + { continue; } if (!short_form) { @@ -280,7 +276,7 @@ printsection(dns_message_t *msg, dns_section_t sectionid, loopresult = dns_rdataset_first(rdataset); while (loopresult == ISC_R_SUCCESS) { struct rtype *t; - const char * rtt; + const char *rtt; char typebuf[DNS_RDATATYPE_FORMATSIZE]; char typebuf2[DNS_RDATATYPE_FORMATSIZE + 20]; @@ -330,12 +326,11 @@ printsection(dns_message_t *msg, dns_section_t sectionid, static isc_result_t printrdata(dns_message_t *msg, dns_rdataset_t *rdataset, - const dns_name_t *owner, const char *set_name, bool headers) -{ + const dns_name_t *owner, const char *set_name, bool headers) { isc_buffer_t target; isc_result_t result; isc_region_t r; - char tbuf[4096]; + char tbuf[4096]; UNUSED(msg); if (headers) { @@ -355,13 +350,12 @@ printrdata(dns_message_t *msg, dns_rdataset_t *rdataset, } static void -chase_cnamechain(dns_message_t *msg, dns_name_t *qname) -{ - isc_result_t result; - dns_rdataset_t * rdataset; +chase_cnamechain(dns_message_t *msg, dns_name_t *qname) { + isc_result_t result; + dns_rdataset_t *rdataset; dns_rdata_cname_t cname; - dns_rdata_t rdata = DNS_RDATA_INIT; - unsigned int i = msg->counts[DNS_SECTION_ANSWER]; + dns_rdata_t rdata = DNS_RDATA_INIT; + unsigned int i = msg->counts[DNS_SECTION_ANSWER]; while (i-- > 0) { rdataset = NULL; @@ -384,13 +378,12 @@ chase_cnamechain(dns_message_t *msg, dns_name_t *qname) static isc_result_t printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, - bool headers) -{ - bool did_flag = false; - dns_rdataset_t * opt, *tsig = NULL; + bool headers) { + bool did_flag = false; + dns_rdataset_t *opt, *tsig = NULL; const dns_name_t *tsigname; - isc_result_t result = ISC_R_SUCCESS; - int force_error; + isc_result_t result = ISC_R_SUCCESS; + int force_error; UNUSED(msgbuf); UNUSED(headers); @@ -434,10 +427,10 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, } if (default_lookups && query->lookup->rdtype == dns_rdatatype_a) { - char namestr[DNS_NAME_FORMATSIZE]; - dig_lookup_t * lookup; + char namestr[DNS_NAME_FORMATSIZE]; + dig_lookup_t *lookup; dns_fixedname_t fixed; - dns_name_t * name; + dns_name_t *name; /* Add AAAA and MX lookups. */ name = dns_fixedname_initname(&fixed); @@ -518,8 +511,8 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, printf(";; PSEUDOSECTIONS: TSIG\n"); } } - if (!ISC_LIST_EMPTY(msg->sections[DNS_SECTION_QUESTION]) && - !short_form) { + if (!ISC_LIST_EMPTY(msg->sections[DNS_SECTION_QUESTION]) && !short_form) + { printf("\n"); result = printsection(msg, DNS_SECTION_QUESTION, "QUESTION", true, query); @@ -569,7 +562,8 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, } if (short_form && !default_lookups && - ISC_LIST_EMPTY(msg->sections[DNS_SECTION_ANSWER])) { + ISC_LIST_EMPTY(msg->sections[DNS_SECTION_ANSWER])) + { char namestr[DNS_NAME_FORMATSIZE]; char typestr[DNS_RDATATYPE_FORMATSIZE]; dns_name_format(query->lookup->name, namestr, sizeof(namestr)); @@ -585,22 +579,20 @@ static const char *optstring = "46aAc:dilnm:rst:vVwCDN:R:TUW:"; /*% version */ static void -version(void) -{ +version(void) { fputs("host " VERSION "\n", stderr); } static void -pre_parse_args(int argc, char **argv) -{ +pre_parse_args(int argc, char **argv) { int c; while ((c = isc_commandline_parse(argc, argv, optstring)) != -1) { switch (c) { case 'm': memdebugging = true; - if (strcasecmp("trace", isc_commandline_argument) == - 0) { + if (strcasecmp("trace", isc_commandline_argument) == 0) + { isc_mem_debugging |= ISC_MEM_DEBUGTRACE; } else if (strcasecmp("record", isc_commandline_argument) == 0) { @@ -678,17 +670,16 @@ pre_parse_args(int argc, char **argv) } static void -parse_args(bool is_batchfile, int argc, char **argv) -{ - char hostname[MXNAME]; - dig_lookup_t * lookup; - int c; - char store[MXNAME]; +parse_args(bool is_batchfile, int argc, char **argv) { + char hostname[MXNAME]; + dig_lookup_t *lookup; + int c; + char store[MXNAME]; isc_textregion_t tr; - isc_result_t result = ISC_R_SUCCESS; - dns_rdatatype_t rdtype; + isc_result_t result = ISC_R_SUCCESS; + dns_rdatatype_t rdtype; dns_rdataclass_t rdclass; - uint32_t serial = 0; + uint32_t serial = 0; UNUSED(is_batchfile); @@ -870,8 +861,8 @@ parse_args(bool is_batchfile, int argc, char **argv) } lookup->pending = false; - if (get_reverse(store, sizeof(store), hostname, true) == - ISC_R_SUCCESS) { + if (get_reverse(store, sizeof(store), hostname, true) == ISC_R_SUCCESS) + { strlcpy(lookup->textname, store, sizeof(lookup->textname)); lookup->rdtype = dns_rdatatype_ptr; lookup->rdtypeset = true; @@ -885,8 +876,7 @@ parse_args(bool is_batchfile, int argc, char **argv) } int -main(int argc, char **argv) -{ +main(int argc, char **argv) { isc_result_t result; tries = 2; diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h index 4a6fe71b48..6460dd13c0 100644 --- a/bin/dig/include/dig/dig.h +++ b/bin/dig/include/dig/dig.h @@ -38,9 +38,9 @@ #define MXSERV 20 #define MXNAME (DNS_NAME_MAXTEXT + 1) -#define MXRD 32 +#define MXRD 32 /*% Buffer Size */ -#define BUFSIZE 512 +#define BUFSIZE 512 #define COMMSIZE 0xffff #ifndef RESOLV_CONF /*% location of resolve.conf */ diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c index dbd20d09c8..3790024892 100644 --- a/bin/dig/nslookup.c +++ b/bin/dig/nslookup.c @@ -62,11 +62,11 @@ static bool short_form = true, tcpmode = false, tcpmode_set = false, static bool interactive; -static bool in_use = false; -static char defclass[MXRD] = "IN"; -static char deftype[MXRD] = "A"; +static bool in_use = false; +static char defclass[MXRD] = "IN"; +static char deftype[MXRD] = "A"; static isc_event_t *global_event = NULL; -static int query_error = 1, print_error = 0; +static int query_error = 1, print_error = 0; static char domainopt[DNS_NAME_MAXTEXT]; @@ -124,18 +124,15 @@ 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) -{ +rcode_totext(dns_rcode_t rcode) { static char buf[sizeof("?65535")]; union { const char *consttext; - char * deconsttext; + char *deconsttext; } totext; if (rcode >= (sizeof(rcodetext) / sizeof(rcodetext[0]))) { @@ -148,8 +145,7 @@ rcode_totext(dns_rcode_t rcode) } static void -query_finished(void) -{ +query_finished(void) { isc_event_t *event = global_event; flush_lookup_list(); @@ -164,11 +160,10 @@ query_finished(void) } static void -printsoa(dns_rdata_t *rdata) -{ +printsoa(dns_rdata_t *rdata) { dns_rdata_soa_t soa; - isc_result_t result; - char namebuf[DNS_NAME_FORMATSIZE]; + isc_result_t result; + char namebuf[DNS_NAME_FORMATSIZE]; result = dns_rdata_tostruct(rdata, &soa, NULL); check_result(result, "dns_rdata_tostruct"); @@ -186,8 +181,7 @@ printsoa(dns_rdata_t *rdata) } static void -printaddr(dns_rdata_t *rdata) -{ +printaddr(dns_rdata_t *rdata) { isc_result_t result; char text[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")]; isc_buffer_t b; @@ -200,12 +194,11 @@ printaddr(dns_rdata_t *rdata) } static void -printrdata(dns_rdata_t *rdata) -{ - isc_result_t result; +printrdata(dns_rdata_t *rdata) { + isc_result_t result; isc_buffer_t *b = NULL; - unsigned int size = 1024; - bool done = false; + unsigned int size = 1024; + bool done = false; if (rdata->type < N_KNOWN_RRTYPES) { printf("%s", rtypetext[rdata->type]); @@ -230,13 +223,12 @@ printrdata(dns_rdata_t *rdata) static isc_result_t printsection(dig_query_t *query, dns_message_t *msg, bool headers, - dns_section_t section) -{ - isc_result_t result, loopresult; - dns_name_t * name; + dns_section_t section) { + isc_result_t result, loopresult; + dns_name_t *name; dns_rdataset_t *rdataset = NULL; - dns_rdata_t rdata = DNS_RDATA_INIT; - char namebuf[DNS_NAME_FORMATSIZE]; + dns_rdata_t rdata = DNS_RDATA_INIT; + char namebuf[DNS_NAME_FORMATSIZE]; UNUSED(query); UNUSED(headers); @@ -253,7 +245,8 @@ printsection(dig_query_t *query, dns_message_t *msg, bool headers, name = NULL; dns_message_currentname(msg, section, &name); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { loopresult = dns_rdataset_first(rdataset); while (loopresult == ISC_R_SUCCESS) { dns_rdataset_current(rdataset, &rdata); @@ -298,13 +291,12 @@ printsection(dig_query_t *query, dns_message_t *msg, bool headers, static isc_result_t detailsection(dig_query_t *query, dns_message_t *msg, bool headers, - dns_section_t section) -{ - isc_result_t result, loopresult; - dns_name_t * name; + dns_section_t section) { + isc_result_t result, loopresult; + dns_name_t *name; dns_rdataset_t *rdataset = NULL; - dns_rdata_t rdata = DNS_RDATA_INIT; - char namebuf[DNS_NAME_FORMATSIZE]; + dns_rdata_t rdata = DNS_RDATA_INIT; + char namebuf[DNS_NAME_FORMATSIZE]; UNUSED(query); @@ -337,7 +329,8 @@ detailsection(dig_query_t *query, dns_message_t *msg, bool headers, name = NULL; dns_message_currentname(msg, section, &name); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (section == DNS_SECTION_QUESTION) { dns_name_format(name, namebuf, sizeof(namebuf)); printf("\t%s, ", namebuf); @@ -379,28 +372,25 @@ detailsection(dig_query_t *query, dns_message_t *msg, bool headers, } static void -received(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query) -{ +received(unsigned int bytes, isc_sockaddr_t *from, dig_query_t *query) { UNUSED(bytes); UNUSED(from); UNUSED(query); } static void -trying(char *frm, dig_lookup_t *lookup) -{ +trying(char *frm, dig_lookup_t *lookup) { UNUSED(frm); UNUSED(lookup); } static void -chase_cnamechain(dns_message_t *msg, dns_name_t *qname) -{ - isc_result_t result; - dns_rdataset_t * rdataset; +chase_cnamechain(dns_message_t *msg, dns_name_t *qname) { + isc_result_t result; + dns_rdataset_t *rdataset; dns_rdata_cname_t cname; - dns_rdata_t rdata = DNS_RDATA_INIT; - unsigned int i = msg->counts[DNS_SECTION_ANSWER]; + dns_rdata_t rdata = DNS_RDATA_INIT; + unsigned int i = msg->counts[DNS_SECTION_ANSWER]; while (i-- > 0) { rdataset = NULL; @@ -423,8 +413,7 @@ chase_cnamechain(dns_message_t *msg, dns_name_t *qname) static isc_result_t printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, - bool headers) -{ + bool headers) { char servtext[ISC_SOCKADDR_FORMATSIZE]; UNUSED(msgbuf); @@ -467,10 +456,10 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, } if (default_lookups && query->lookup->rdtype == dns_rdatatype_a) { - char namestr[DNS_NAME_FORMATSIZE]; - dig_lookup_t * lookup; + char namestr[DNS_NAME_FORMATSIZE]; + dig_lookup_t *lookup; dns_fixedname_t fixed; - dns_name_t * name; + dns_name_t *name; /* Add AAAA lookup. */ name = dns_fixedname_initname(&fixed); @@ -490,18 +479,20 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, } if ((msg->flags & DNS_MESSAGEFLAG_AA) == 0 && - (!default_lookups || query->lookup->rdtype == dns_rdatatype_a)) { + (!default_lookups || query->lookup->rdtype == dns_rdatatype_a)) + { puts("Non-authoritative answer:"); } if (!ISC_LIST_EMPTY(msg->sections[DNS_SECTION_ANSWER])) { printsection(query, msg, headers, DNS_SECTION_ANSWER); } else { - if (default_lookups && - query->lookup->rdtype == dns_rdatatype_a) { + if (default_lookups && query->lookup->rdtype == dns_rdatatype_a) + { a_noanswer = true; } else if (!default_lookups || (query->lookup->rdtype == dns_rdatatype_aaaa && - a_noanswer)) { + a_noanswer)) + { printf("*** Can't find %s: No answer\n", query->lookup->textname); } @@ -509,7 +500,8 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, if (((msg->flags & DNS_MESSAGEFLAG_AA) == 0) && (query->lookup->rdtype != dns_rdatatype_a) && - (query->lookup->rdtype != dns_rdatatype_aaaa)) { + (query->lookup->rdtype != dns_rdatatype_aaaa)) + { puts("\nAuthoritative answers can be found from:"); printsection(query, msg, headers, DNS_SECTION_AUTHORITY); printsection(query, msg, headers, DNS_SECTION_ADDITIONAL); @@ -518,12 +510,11 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, } static void -show_settings(bool full, bool serv_only) -{ - dig_server_t * srv; - isc_sockaddr_t sockaddr; +show_settings(bool full, bool serv_only) { + dig_server_t *srv; + isc_sockaddr_t sockaddr; dig_searchlist_t *listent; - isc_result_t result; + isc_result_t result; srv = ISC_LIST_HEAD(server_list); @@ -554,7 +545,8 @@ show_settings(bool full, bool serv_only) printf(" querytype = %-8s\tclass = %s\n", deftype, defclass); printf(" srchlist = "); for (listent = ISC_LIST_HEAD(search_list); listent != NULL; - listent = ISC_LIST_NEXT(listent, link)) { + listent = ISC_LIST_NEXT(listent, link)) + { printf("%s", listent->origin); if (ISC_LIST_NEXT(listent, link) != NULL) { printf("/"); @@ -564,11 +556,10 @@ show_settings(bool full, bool serv_only) } static bool -testtype(char *typetext) -{ - isc_result_t result; +testtype(char *typetext) { + isc_result_t result; isc_textregion_t tr; - dns_rdatatype_t rdtype; + dns_rdatatype_t rdtype; tr.base = typetext; tr.length = strlen(typetext); @@ -582,9 +573,8 @@ testtype(char *typetext) } static bool -testclass(char *typetext) -{ - isc_result_t result; +testclass(char *typetext) { + isc_result_t result; isc_textregion_t tr; dns_rdataclass_t rdclass; @@ -600,9 +590,8 @@ testclass(char *typetext) } static void -set_port(const char *value) -{ - uint32_t n; +set_port(const char *value) { + uint32_t n; isc_result_t result = parse_uint(&n, value, 65535, "port"); if (result == ISC_R_SUCCESS) { port = (uint16_t)n; @@ -610,9 +599,8 @@ set_port(const char *value) } static void -set_timeout(const char *value) -{ - uint32_t n; +set_timeout(const char *value) { + uint32_t n; isc_result_t result = parse_uint(&n, value, UINT_MAX, "timeout"); if (result == ISC_R_SUCCESS) { timeout = n; @@ -620,9 +608,8 @@ set_timeout(const char *value) } static void -set_tries(const char *value) -{ - uint32_t n; +set_tries(const char *value) { + uint32_t n; isc_result_t result = parse_uint(&n, value, INT_MAX, "tries"); if (result == ISC_R_SUCCESS) { tries = n; @@ -630,9 +617,8 @@ set_tries(const char *value) } static void -set_ndots(const char *value) -{ - uint32_t n; +set_ndots(const char *value) { + uint32_t n; isc_result_t result = parse_uint(&n, value, 128, "ndots"); if (result == ISC_R_SUCCESS) { ndots = n; @@ -640,14 +626,12 @@ set_ndots(const char *value) } static void -version(void) -{ +version(void) { fputs("nslookup " VERSION "\n", stderr); } static void -setoption(char *opt) -{ +setoption(char *opt) { size_t l = strlen(opt); #define CHECKOPT(A, N) \ @@ -755,14 +739,13 @@ setoption(char *opt) } static void -addlookup(char *opt) -{ - dig_lookup_t * lookup; - isc_result_t result; +addlookup(char *opt) { + dig_lookup_t *lookup; + isc_result_t result; isc_textregion_t tr; - dns_rdatatype_t rdtype; + dns_rdatatype_t rdtype; dns_rdataclass_t rdclass; - char store[MXNAME]; + char store[MXNAME]; debug("addlookup()"); @@ -826,8 +809,7 @@ addlookup(char *opt) } static void -do_next_command(char *input) -{ +do_next_command(char *input) { char *ptr, *arg, *last; if ((ptr = strtok_r(input, " \t\r\n", &last)) == NULL) { @@ -837,7 +819,8 @@ do_next_command(char *input) if ((strcasecmp(ptr, "set") == 0) && (arg != NULL)) { setoption(arg); } else if ((strcasecmp(ptr, "server") == 0) || - (strcasecmp(ptr, "lserver") == 0)) { + (strcasecmp(ptr, "lserver") == 0)) + { isc_app_block(); set_nameserver(arg); check_ra = false; @@ -849,7 +832,8 @@ do_next_command(char *input) printf("The '%s' command is not yet implemented.\n", ptr); } else if (strcasecmp(ptr, "finger") == 0 || strcasecmp(ptr, "root") == 0 || strcasecmp(ptr, "ls") == 0 || - strcasecmp(ptr, "view") == 0) { + strcasecmp(ptr, "view") == 0) + { printf("The '%s' command is not implemented.\n", ptr); } else { addlookup(ptr); @@ -857,8 +841,7 @@ do_next_command(char *input) } static void -get_next_command(void) -{ +get_next_command(void) { char *buf; char *ptr; @@ -893,12 +876,10 @@ 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) -{ +usage(void) { fprintf(stderr, "Usage:\n"); fprintf(stderr, " nslookup [-opt ...] # interactive mode " "using default server\n"); @@ -912,8 +893,7 @@ usage(void) } static void -parse_args(int argc, char **argv) -{ +parse_args(int argc, char **argv) { bool have_lookup = false; usesearch = true; @@ -945,10 +925,9 @@ parse_args(int argc, char **argv) } static void -flush_lookup_list(void) -{ +flush_lookup_list(void) { dig_lookup_t *l, *lp; - dig_query_t * q, *qp; + dig_query_t *q, *qp; dig_server_t *s, *sp; lookup_counter = 0; @@ -986,8 +965,7 @@ flush_lookup_list(void) } static void -getinput(isc_task_t *task, isc_event_t *event) -{ +getinput(isc_task_t *task, isc_event_t *event) { UNUSED(task); if (global_event == NULL) { global_event = event; @@ -1003,8 +981,7 @@ getinput(isc_task_t *task, isc_event_t *event) } int -main(int argc, char **argv) -{ +main(int argc, char **argv) { isc_result_t result; interactive = isatty(0); diff --git a/bin/dnssec/dnssec-cds.c b/bin/dnssec/dnssec-cds.c index 23fc55a560..dada882f0d 100644 --- a/bin/dnssec/dnssec-cds.c +++ b/bin/dnssec/dnssec-cds.c @@ -70,14 +70,14 @@ static isc_mem_t *mctx = NULL; /* * The domain we are working on */ -static const char * namestr = NULL; -static dns_fixedname_t fixed; -static dns_name_t * name = NULL; +static const char *namestr = NULL; +static dns_fixedname_t fixed; +static dns_name_t *name = NULL; static dns_rdataclass_t rdclass = dns_rdataclass_in; -static const char * startstr = NULL; /* from which we derive notbefore */ -static isc_stdtime_t notbefore = 0; /* restrict sig inception times */ -static dns_rdata_rrsig_t oldestsig; /* for recording inception time */ +static const char *startstr = NULL; /* from which we derive notbefore */ +static isc_stdtime_t notbefore = 0; /* restrict sig inception times */ +static dns_rdata_rrsig_t oldestsig; /* for recording inception time */ static int nkey; /* number of child zone DNSKEY records */ @@ -114,15 +114,15 @@ static int nkey; /* number of child zone DNSKEY records */ * match. */ typedef struct keyinfo { - dns_rdata_t rdata; - dst_key_t * dst; + dns_rdata_t rdata; + dst_key_t *dst; dns_secalg_t algo; dns_keytag_t tag; } 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; @@ -134,11 +134,10 @@ static keyinfo_t *old_key_tbl, *new_key_tbl; isc_buffer_t *new_ds_buf = NULL; /* backing store for new_ds_set */ static void -verbose_time(int level, const char *msg, isc_stdtime_t time) -{ +verbose_time(int level, const char *msg, isc_stdtime_t time) { isc_result_t result; isc_buffer_t timebuf; - char timestr[32]; + char timestr[32]; if (verbose < level) { return; @@ -156,8 +155,7 @@ verbose_time(int level, const char *msg, isc_stdtime_t time) } static void -initname(char *setname) -{ +initname(char *setname) { isc_result_t result; isc_buffer_t buf; @@ -174,8 +172,7 @@ initname(char *setname) static void findset(dns_db_t *db, dns_dbnode_t *node, dns_rdatatype_t type, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { isc_result_t result; dns_rdataset_init(rdataset); @@ -190,18 +187,16 @@ findset(dns_db_t *db, dns_dbnode_t *node, dns_rdatatype_t type, } static void -freeset(dns_rdataset_t *rdataset) -{ +freeset(dns_rdataset_t *rdataset) { if (dns_rdataset_isassociated(rdataset)) { dns_rdataset_disassociate(rdataset); } } static void -freelist(dns_rdataset_t *rdataset) -{ +freelist(dns_rdataset_t *rdataset) { dns_rdatalist_t *rdlist; - dns_rdata_t * rdata; + dns_rdata_t *rdata; if (!dns_rdataset_isassociated(rdataset)) { return; @@ -210,7 +205,8 @@ freelist(dns_rdataset_t *rdataset) dns_rdatalist_fromrdataset(rdataset, &rdlist); for (rdata = ISC_LIST_HEAD(rdlist->rdata); rdata != NULL; - rdata = ISC_LIST_HEAD(rdlist->rdata)) { + rdata = ISC_LIST_HEAD(rdlist->rdata)) + { ISC_LIST_UNLINK(rdlist->rdata, rdata, link); isc_mem_put(mctx, rdata, sizeof(*rdata)); } @@ -219,8 +215,7 @@ freelist(dns_rdataset_t *rdataset) } static void -free_all_sets(void) -{ +free_all_sets(void) { freeset(&cdnskey_set); freeset(&cdnskey_sig); freeset(&cds_set); @@ -235,8 +230,7 @@ free_all_sets(void) } static void -load_db(const char *filename, dns_db_t **dbp, dns_dbnode_t **nodep) -{ +load_db(const char *filename, dns_db_t **dbp, dns_dbnode_t **nodep) { isc_result_t result; result = dns_db_create(mctx, "rbt", name, dns_dbtype_zone, rdclass, 0, @@ -256,16 +250,14 @@ load_db(const char *filename, dns_db_t **dbp, dns_dbnode_t **nodep) } static void -free_db(dns_db_t **dbp, dns_dbnode_t **nodep) -{ +free_db(dns_db_t **dbp, dns_dbnode_t **nodep) { dns_db_detachnode(*dbp, nodep); dns_db_detach(dbp); } static void -load_child_sets(const char *file) -{ - dns_db_t * db = NULL; +load_child_sets(const char *file) { + dns_db_t *db = NULL; dns_dbnode_t *node = NULL; load_db(file, &db, &node); @@ -277,11 +269,10 @@ load_child_sets(const char *file) static void get_dsset_name(char *filename, size_t size, const char *path, - const char *suffix) -{ + const char *suffix) { isc_result_t result; isc_buffer_t buf; - size_t len; + size_t len; isc_buffer_init(&buf, filename, size); @@ -320,13 +311,12 @@ get_dsset_name(char *filename, size_t size, const char *path, } static void -load_parent_set(const char *path) -{ - isc_result_t result; - dns_db_t * db = NULL; +load_parent_set(const char *path) { + isc_result_t result; + dns_db_t *db = NULL; dns_dbnode_t *node = NULL; - isc_time_t modtime; - char filename[PATH_MAX + 1]; + isc_time_t modtime; + char filename[PATH_MAX + 1]; get_dsset_name(filename, sizeof(filename), path, ""); @@ -357,12 +347,11 @@ load_parent_set(const char *path) #define MAX_CDS_RDATA_TEXT_SIZE DNS_RDATA_MAXLENGTH * 2 static isc_buffer_t * -formatset(dns_rdataset_t *rdataset) -{ - isc_result_t result; - isc_buffer_t * buf = NULL; +formatset(dns_rdataset_t *rdataset) { + isc_result_t result; + isc_buffer_t *buf = NULL; dns_master_style_t *style = NULL; - unsigned int styleflags; + unsigned int styleflags; styleflags = (rdataset->ttl == 0) ? DNS_STYLEFLAG_NO_TTL : 0; @@ -393,16 +382,15 @@ formatset(dns_rdataset_t *rdataset) static void write_parent_set(const char *path, const char *inplace, bool nsupdate, - dns_rdataset_t *rdataset) -{ - isc_result_t result; + dns_rdataset_t *rdataset) { + isc_result_t result; isc_buffer_t *buf = NULL; - isc_region_t r; - isc_time_t filetime; - char backname[PATH_MAX + 1]; - char filename[PATH_MAX + 1]; - char tmpname[PATH_MAX + 1]; - FILE * fp = NULL; + isc_region_t r; + isc_time_t filetime; + char backname[PATH_MAX + 1]; + char filename[PATH_MAX + 1]; + char tmpname[PATH_MAX + 1]; + FILE *fp = NULL; if (nsupdate && inplace == NULL) { return; @@ -461,17 +449,17 @@ typedef enum { LOOSE, TIGHT } strictness_t; * Find out if any (C)DS record matches a particular (C)DNSKEY. */ static bool -match_key_dsset(keyinfo_t *ki, dns_rdataset_t *dsset, strictness_t strictness) -{ - isc_result_t result; +match_key_dsset(keyinfo_t *ki, dns_rdataset_t *dsset, strictness_t strictness) { + isc_result_t result; unsigned char dsbuf[DNS_DS_BUFFERSIZE]; for (result = dns_rdataset_first(dsset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(dsset)) { + result = dns_rdataset_next(dsset)) + { dns_rdata_ds_t ds; - dns_rdata_t dsrdata = DNS_RDATA_INIT; - dns_rdata_t newdsrdata = DNS_RDATA_INIT; - bool c; + dns_rdata_t dsrdata = DNS_RDATA_INIT; + dns_rdata_t newdsrdata = DNS_RDATA_INIT; + bool c; dns_rdataset_current(dsset, &dsrdata); result = dns_rdata_tostruct(&dsrdata, &ds, NULL); @@ -523,22 +511,22 @@ match_key_dsset(keyinfo_t *ki, dns_rdataset_t *dsset, strictness_t strictness) */ static keyinfo_t * match_keyset_dsset(dns_rdataset_t *keyset, dns_rdataset_t *dsset, - strictness_t strictness) -{ + strictness_t strictness) { isc_result_t result; - keyinfo_t * keytable; - int i; + keyinfo_t *keytable; + int i; nkey = dns_rdataset_count(keyset); keytable = isc_mem_get(mctx, sizeof(keyinfo_t) * nkey); for (result = dns_rdataset_first(keyset), i = 0; - result == ISC_R_SUCCESS; result = dns_rdataset_next(keyset), i++) { - keyinfo_t * ki; + result == ISC_R_SUCCESS; result = dns_rdataset_next(keyset), i++) + { + keyinfo_t *ki; dns_rdata_dnskey_t dnskey; - dns_rdata_t * keyrdata; - isc_region_t r; + dns_rdata_t *keyrdata; + isc_region_t r; INSIST(i < nkey); ki = &keytable[i]; @@ -559,8 +547,8 @@ match_keyset_dsset(dns_rdataset_t *keyset, dns_rdataset_t *dsset, continue; } - result = - dns_dnssec_keyfromrdata(name, keyrdata, mctx, &ki->dst); + result = dns_dnssec_keyfromrdata(name, keyrdata, mctx, + &ki->dst); if (result != ISC_R_SUCCESS) { vbprintf(3, "dns_dnssec_keyfromrdata(" @@ -573,12 +561,11 @@ match_keyset_dsset(dns_rdataset_t *keyset, dns_rdataset_t *dsset, } static void -free_keytable(keyinfo_t **keytable_p) -{ +free_keytable(keyinfo_t **keytable_p) { keyinfo_t *keytable = *keytable_p; *keytable_p = NULL; keyinfo_t *ki; - int i; + int i; for (i = 0; i < nkey; i++) { ki = &keytable[i]; @@ -601,18 +588,18 @@ free_keytable(keyinfo_t **keytable_p) */ static dns_secalg_t * matching_sigs(keyinfo_t *keytbl, dns_rdataset_t *rdataset, - dns_rdataset_t *sigset) -{ - isc_result_t result; + dns_rdataset_t *sigset) { + isc_result_t result; dns_secalg_t *algo; - int i; + int i; algo = isc_mem_get(mctx, nkey); memset(algo, 0, nkey); for (result = dns_rdataset_first(sigset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(sigset)) { - dns_rdata_t sigrdata = DNS_RDATA_INIT; + result = dns_rdataset_next(sigset)) + { + dns_rdata_t sigrdata = DNS_RDATA_INIT; dns_rdata_rrsig_t sig; dns_rdataset_current(sigset, &sigrdata); @@ -631,7 +618,8 @@ matching_sigs(keyinfo_t *keytbl, dns_rdataset_t *rdataset, for (i = 0; i < nkey; i++) { keyinfo_t *ki = &keytbl[i]; if (sig.keyid != ki->tag || sig.algorithm != ki->algo || - !dns_name_equal(&sig.signer, name)) { + !dns_name_equal(&sig.signer, name)) + { continue; } if (ki->dst == NULL) { @@ -663,8 +651,8 @@ matching_sigs(keyinfo_t *keytbl, dns_rdataset_t *rdataset, * only after the signature has been verified */ if (oldestsig.timesigned == 0 || - isc_serial_lt(sig.timesigned, - oldestsig.timesigned)) { + isc_serial_lt(sig.timesigned, oldestsig.timesigned)) + { verbose_time(2, "this is the oldest so far", sig.timesigned); oldestsig = sig; @@ -680,10 +668,9 @@ matching_sigs(keyinfo_t *keytbl, dns_rdataset_t *rdataset, * fetched from the child zone, any working signature is enough. */ static bool -signed_loose(dns_secalg_t *algo) -{ +signed_loose(dns_secalg_t *algo) { bool ok = false; - int i; + int i; for (i = 0; i < nkey; i++) { if (algo[i] != 0) { ok = true; @@ -700,17 +687,17 @@ signed_loose(dns_secalg_t *algo) * RRset. */ static bool -signed_strict(dns_rdataset_t *dsset, dns_secalg_t *algo) -{ +signed_strict(dns_rdataset_t *dsset, dns_secalg_t *algo) { isc_result_t result; - bool all_ok = true; + bool all_ok = true; for (result = dns_rdataset_first(dsset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(dsset)) { - dns_rdata_t dsrdata = DNS_RDATA_INIT; + result = dns_rdataset_next(dsset)) + { + dns_rdata_t dsrdata = DNS_RDATA_INIT; dns_rdata_ds_t ds; - bool ds_ok; - int i; + bool ds_ok; + int i; dns_rdataset_current(dsset, &dsrdata); result = dns_rdata_tostruct(&dsrdata, &ds, NULL); @@ -736,8 +723,7 @@ signed_strict(dns_rdataset_t *dsset, dns_secalg_t *algo) } static dns_rdata_t * -rdata_get(void) -{ +rdata_get(void) { dns_rdata_t *rdata; rdata = isc_mem_get(mctx, sizeof(*rdata)); @@ -747,8 +733,7 @@ rdata_get(void) } static isc_result_t -rdata_put(isc_result_t result, dns_rdatalist_t *rdlist, dns_rdata_t *rdata) -{ +rdata_put(isc_result_t result, dns_rdatalist_t *rdlist, dns_rdata_t *rdata) { if (result == ISC_R_SUCCESS) { ISC_LIST_APPEND(rdlist->rdata, rdata, link); } else { @@ -764,11 +749,10 @@ rdata_put(isc_result_t result, dns_rdatalist_t *rdlist, dns_rdata_t *rdata) * dns_rdata_cds_t and dns_rdata_ds_t types are aliases. */ static isc_result_t -ds_from_cds(dns_rdatalist_t *dslist, isc_buffer_t *buf, dns_rdata_t *cds) -{ - isc_result_t result; +ds_from_cds(dns_rdatalist_t *dslist, isc_buffer_t *buf, dns_rdata_t *cds) { + isc_result_t result; dns_rdata_ds_t ds; - dns_rdata_t * rdata; + dns_rdata_t *rdata; rdata = rdata_get(); @@ -784,10 +768,9 @@ ds_from_cds(dns_rdatalist_t *dslist, isc_buffer_t *buf, dns_rdata_t *cds) static isc_result_t ds_from_cdnskey(dns_rdatalist_t *dslist, isc_buffer_t *buf, - dns_rdata_t *cdnskey) -{ + dns_rdata_t *cdnskey) { isc_result_t result; - unsigned i, n; + unsigned i, n; n = sizeof(dtype) / sizeof(dtype[0]); for (i = 0; i < n; i++) { @@ -819,11 +802,10 @@ ds_from_cdnskey(dns_rdatalist_t *dslist, isc_buffer_t *buf, static void make_new_ds_set(ds_maker_func_t *ds_from_rdata, uint32_t ttl, - dns_rdataset_t *rdset) -{ + dns_rdataset_t *rdset) { unsigned int size = 16; for (;;) { - isc_result_t result; + isc_result_t result; dns_rdatalist_t *dslist; dslist = isc_mem_get(mctx, sizeof(*dslist)); @@ -840,10 +822,10 @@ make_new_ds_set(ds_maker_func_t *ds_from_rdata, uint32_t ttl, isc_buffer_allocate(mctx, &new_ds_buf, size); for (result = dns_rdataset_first(rdset); - result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdset)) { + result == ISC_R_SUCCESS; result = dns_rdataset_next(rdset)) + { isc_result_t tresult; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(rdset, &rdata); @@ -866,8 +848,7 @@ make_new_ds_set(ds_maker_func_t *ds_from_rdata, uint32_t ttl, } static inline int -rdata_cmp(const void *rdata1, const void *rdata2) -{ +rdata_cmp(const void *rdata1, const void *rdata2) { return (dns_rdata_compare((const dns_rdata_t *)rdata1, (const dns_rdata_t *)rdata2)); } @@ -877,15 +858,14 @@ rdata_cmp(const void *rdata1, const void *rdata2) * digest types. */ static bool -consistent_digests(dns_rdataset_t *dsset) -{ - isc_result_t result; - dns_rdata_t * arrdata; +consistent_digests(dns_rdataset_t *dsset) { + isc_result_t result; + dns_rdata_t *arrdata; dns_rdata_ds_t *ds; - dns_keytag_t key_tag; - dns_secalg_t algorithm; - bool match; - int i, j, n, d; + dns_keytag_t key_tag; + dns_secalg_t algorithm; + bool match; + int i, j, n, d; /* * First sort the dsset. DS rdata fields are tag, algorithm, digest, @@ -897,7 +877,8 @@ consistent_digests(dns_rdataset_t *dsset) arrdata = isc_mem_get(mctx, n * sizeof(dns_rdata_t)); for (result = dns_rdataset_first(dsset), i = 0; result == ISC_R_SUCCESS; - result = dns_rdataset_next(dsset), i++) { + result = dns_rdataset_next(dsset), i++) + { dns_rdata_init(&arrdata[i]); dns_rdataset_current(dsset, &arrdata[i]); } @@ -935,7 +916,8 @@ consistent_digests(dns_rdataset_t *dsset) for (j = 0; j < d && i + j < n; j++) { if (ds[i + j].key_tag != key_tag || ds[i + j].algorithm != algorithm || - ds[i + j].digest_type != ds[j].digest_type) { + ds[i + j].digest_type != ds[j].digest_type) + { match = false; } } @@ -952,12 +934,11 @@ consistent_digests(dns_rdataset_t *dsset) } static void -print_diff(const char *cmd, dns_rdataset_t *rdataset) -{ - isc_buffer_t * buf; - isc_region_t r; +print_diff(const char *cmd, dns_rdataset_t *rdataset) { + isc_buffer_t *buf; + isc_region_t r; unsigned char *nl; - size_t len; + size_t len; buf = formatset(rdataset); isc_buffer_usedregion(buf, &r); @@ -973,14 +954,13 @@ print_diff(const char *cmd, dns_rdataset_t *rdataset) static void update_diff(const char *cmd, uint32_t ttl, dns_rdataset_t *addset, - dns_rdataset_t *delset) -{ - isc_result_t result; - dns_db_t * db; - dns_dbnode_t * node; + dns_rdataset_t *delset) { + isc_result_t result; + dns_db_t *db; + dns_dbnode_t *node; dns_dbversion_t *ver; - dns_rdataset_t diffset; - uint32_t save; + dns_rdataset_t diffset; + uint32_t save; db = NULL; result = dns_db_create(mctx, "rbt", name, dns_dbtype_zone, rdclass, 0, @@ -1020,8 +1000,7 @@ update_diff(const char *cmd, uint32_t ttl, dns_rdataset_t *addset, } static void -nsdiff(uint32_t ttl, dns_rdataset_t *oldset, dns_rdataset_t *newset) -{ +nsdiff(uint32_t ttl, dns_rdataset_t *oldset, dns_rdataset_t *newset) { if (ttl == 0) { vbprintf(1, "warning: no TTL in nsupdate script\n"); } @@ -1037,12 +1016,10 @@ 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) -{ +usage(void) { fprintf(stderr, "Usage:\n"); fprintf(stderr, " %s options [options] -f -d \n", @@ -1069,17 +1046,16 @@ usage(void) } int -main(int argc, char *argv[]) -{ - const char * child_path = NULL; - const char * ds_path = NULL; - const char * inplace = NULL; +main(int argc, char *argv[]) { + const char *child_path = NULL; + const char *ds_path = NULL; + const char *inplace = NULL; isc_result_t result; - bool prefer_cdnskey = false; - bool nsupdate = false; - uint32_t ttl = 0; - int ch; - char * endp; + bool prefer_cdnskey = false; + bool nsupdate = false; + uint32_t ttl = 0; + int ch; + char *endp; isc_mem_create(&mctx); @@ -1195,12 +1171,14 @@ main(int argc, char *argv[]) */ if (!dns_rdataset_isassociated(&dnskey_set) || - !dns_rdataset_isassociated(&dnskey_sig)) { + !dns_rdataset_isassociated(&dnskey_sig)) + { fatal("could not find signed DNSKEY RRset for %s", namestr); } if (dns_rdataset_isassociated(&cdnskey_set) && - !dns_rdataset_isassociated(&cdnskey_sig)) { + !dns_rdataset_isassociated(&cdnskey_sig)) + { fatal("missing RRSIG CDNSKEY records for %s", namestr); } if (dns_rdataset_isassociated(&cds_set) && @@ -1218,8 +1196,8 @@ main(int argc, char *argv[]) */ vbprintf(1, "verify DNSKEY signature(s)\n"); - if (!signed_loose( - matching_sigs(old_key_tbl, &dnskey_set, &dnskey_sig))) { + if (!signed_loose(matching_sigs(old_key_tbl, &dnskey_set, &dnskey_sig))) + { fatal("could not validate child DNSKEY RRset for %s", namestr); } @@ -1259,7 +1237,8 @@ main(int argc, char *argv[]) * RFC 7344 section 4.1 first paragraph */ if (!dns_rdataset_isassociated(&cdnskey_set) && - !dns_rdataset_isassociated(&cds_set)) { + !dns_rdataset_isassociated(&cds_set)) + { vbprintf(1, "%s has neither CDS nor CDNSKEY records\n", namestr); write_parent_set(ds_path, inplace, nsupdate, &old_ds_set); @@ -1293,7 +1272,8 @@ main(int argc, char *argv[]) vbprintf(1, "verify DNSKEY signature(s)\n"); if (!signed_strict(&new_ds_set, matching_sigs(new_key_tbl, &dnskey_set, - &dnskey_sig))) { + &dnskey_sig))) + { fatal("could not validate child DNSKEY RRset " "with new DS records for %s", namestr); diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c index e80a1b4d75..03fc6a9d27 100644 --- a/bin/dnssec/dnssec-dsfromkey.c +++ b/bin/dnssec/dnssec-dsfromkey.c @@ -50,15 +50,14 @@ const char *program = "dnssec-dsfromkey"; static dns_rdataclass_t rdclass; -static dns_fixedname_t fixed; -static dns_name_t * name = NULL; -static isc_mem_t * mctx = NULL; -static uint32_t ttl; -static bool emitttl = false; +static dns_fixedname_t fixed; +static dns_name_t *name = NULL; +static isc_mem_t *mctx = NULL; +static uint32_t ttl; +static bool emitttl = false; static isc_result_t -initname(char *setname) -{ +initname(char *setname) { isc_result_t result; isc_buffer_t buf; @@ -71,9 +70,8 @@ initname(char *setname) } static void -db_load_from_stream(dns_db_t *db, FILE *fp) -{ - isc_result_t result; +db_load_from_stream(dns_db_t *db, FILE *fp) { + isc_result_t result; dns_rdatacallbacks_t callbacks; dns_rdatacallbacks_init(&callbacks); @@ -95,12 +93,11 @@ db_load_from_stream(dns_db_t *db, FILE *fp) } static isc_result_t -loadset(const char *filename, dns_rdataset_t *rdataset) -{ - isc_result_t result; - dns_db_t * db = NULL; +loadset(const char *filename, dns_rdataset_t *rdataset) { + isc_result_t result; + dns_db_t *db = NULL; dns_dbnode_t *node = NULL; - char setname[DNS_NAME_FORMATSIZE]; + char setname[DNS_NAME_FORMATSIZE]; dns_name_format(name, setname, sizeof(setname)); @@ -145,10 +142,9 @@ loadset(const char *filename, dns_rdataset_t *rdataset) } static isc_result_t -loadkeyset(char *dirname, dns_rdataset_t *rdataset) -{ +loadkeyset(char *dirname, dns_rdataset_t *rdataset) { isc_result_t result; - char filename[PATH_MAX + 1]; + char filename[PATH_MAX + 1]; isc_buffer_t buf; dns_rdataset_init(rdataset); @@ -182,10 +178,9 @@ loadkeyset(char *dirname, dns_rdataset_t *rdataset) static void loadkey(char *filename, unsigned char *key_buf, unsigned int key_buf_size, - dns_rdata_t *rdata) -{ + dns_rdata_t *rdata) { isc_result_t result; - dst_key_t * key = NULL; + dst_key_t *key = NULL; isc_buffer_t keyb; isc_region_t r; @@ -225,12 +220,11 @@ loadkey(char *filename, unsigned char *key_buf, unsigned int key_buf_size, } static void -logkey(dns_rdata_t *rdata) -{ +logkey(dns_rdata_t *rdata) { isc_result_t result; - dst_key_t * key = NULL; + dst_key_t *key = NULL; isc_buffer_t buf; - char keystr[DST_KEY_FORMATSIZE]; + char keystr[DST_KEY_FORMATSIZE]; isc_buffer_init(&buf, rdata->data, rdata->length); isc_buffer_add(&buf, rdata->length); @@ -246,16 +240,15 @@ logkey(dns_rdata_t *rdata) } static void -emit(dns_dsdigest_t dt, bool showall, bool cds, dns_rdata_t *rdata) -{ - isc_result_t result; - unsigned char buf[DNS_DS_BUFFERSIZE]; - char text_buf[DST_KEY_MAXTEXTSIZE]; - char name_buf[DNS_NAME_MAXWIRE]; - char class_buf[10]; - isc_buffer_t textb, nameb, classb; - isc_region_t r; - dns_rdata_t ds; +emit(dns_dsdigest_t dt, bool showall, bool cds, dns_rdata_t *rdata) { + isc_result_t result; + unsigned char buf[DNS_DS_BUFFERSIZE]; + char text_buf[DST_KEY_MAXTEXTSIZE]; + char name_buf[DNS_NAME_MAXWIRE]; + char class_buf[10]; + isc_buffer_t textb, nameb, classb; + isc_region_t r; + dns_rdata_t ds; dns_rdata_dnskey_t dnskey; isc_buffer_init(&textb, text_buf, sizeof(text_buf)); @@ -316,8 +309,7 @@ emit(dns_dsdigest_t dt, bool showall, bool cds, dns_rdata_t *rdata) } static void -emits(bool showall, bool cds, dns_rdata_t *rdata) -{ +emits(bool showall, bool cds, dns_rdata_t *rdata) { unsigned i, n; n = sizeof(dtype) / sizeof(dtype[0]); @@ -328,12 +320,10 @@ 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) -{ +usage(void) { fprintf(stderr, "Usage:\n"); fprintf(stderr, " %s [options] keyfile\n\n", program); fprintf(stderr, " %s [options] -f zonefile [zonename]\n\n", program); @@ -363,19 +353,18 @@ usage(void) } int -main(int argc, char **argv) -{ - char * classname = NULL; - char * filename = NULL, *dir = NULL, *namestr; - char * endp, *arg1; - int ch; - bool cds = false; - bool usekeyset = false; - bool showall = false; - isc_result_t result; - isc_log_t * log = NULL; +main(int argc, char **argv) { + char *classname = NULL; + char *filename = NULL, *dir = NULL, *namestr; + char *endp, *arg1; + int ch; + bool cds = false; + bool usekeyset = false; + bool showall = false; + isc_result_t result; + isc_log_t *log = NULL; dns_rdataset_t rdataset; - dns_rdata_t rdata; + dns_rdata_t rdata; dns_rdata_init(&rdata); @@ -533,7 +522,8 @@ main(int argc, char **argv) for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_init(&rdata); dns_rdataset_current(&rdataset, &rdata); diff --git a/bin/dnssec/dnssec-importkey.c b/bin/dnssec/dnssec-importkey.c index 41f4767bf9..9319f99977 100644 --- a/bin/dnssec/dnssec-importkey.c +++ b/bin/dnssec/dnssec-importkey.c @@ -49,20 +49,19 @@ const char *program = "dnssec-importkey"; static dns_rdataclass_t rdclass; -static dns_fixedname_t fixed; -static dns_name_t * name = NULL; -static isc_mem_t * mctx = NULL; -static bool setpub = false, setdel = false; -static bool setttl = false; -static isc_stdtime_t pub = 0, del = 0; -static dns_ttl_t ttl = 0; -static isc_stdtime_t syncadd = 0, syncdel = 0; -static bool setsyncadd = false; -static bool setsyncdel = false; +static dns_fixedname_t fixed; +static dns_name_t *name = NULL; +static isc_mem_t *mctx = NULL; +static bool setpub = false, setdel = false; +static bool setttl = false; +static isc_stdtime_t pub = 0, del = 0; +static dns_ttl_t ttl = 0; +static isc_stdtime_t syncadd = 0, syncdel = 0; +static bool setsyncadd = false; +static bool setsyncdel = false; static isc_result_t -initname(char *setname) -{ +initname(char *setname) { isc_result_t result; isc_buffer_t buf; @@ -75,9 +74,8 @@ initname(char *setname) } static void -db_load_from_stream(dns_db_t *db, FILE *fp) -{ - isc_result_t result; +db_load_from_stream(dns_db_t *db, FILE *fp) { + isc_result_t result; dns_rdatacallbacks_t callbacks; dns_rdatacallbacks_init(&callbacks); @@ -99,12 +97,11 @@ db_load_from_stream(dns_db_t *db, FILE *fp) } static isc_result_t -loadset(const char *filename, dns_rdataset_t *rdataset) -{ - isc_result_t result; - dns_db_t * db = NULL; +loadset(const char *filename, dns_rdataset_t *rdataset) { + isc_result_t result; + dns_db_t *db = NULL; dns_dbnode_t *node = NULL; - char setname[DNS_NAME_FORMATSIZE]; + char setname[DNS_NAME_FORMATSIZE]; dns_name_format(name, setname, sizeof(setname)); @@ -151,10 +148,9 @@ loadset(const char *filename, dns_rdataset_t *rdataset) static void loadkey(char *filename, unsigned char *key_buf, unsigned int key_buf_size, - dns_rdata_t *rdata) -{ + dns_rdata_t *rdata) { isc_result_t result; - dst_key_t * key = NULL; + dst_key_t *key = NULL; isc_buffer_t keyb; isc_region_t r; @@ -194,14 +190,13 @@ loadkey(char *filename, unsigned char *key_buf, unsigned int key_buf_size, } static void -emit(const char *dir, dns_rdata_t *rdata) -{ +emit(const char *dir, dns_rdata_t *rdata) { isc_result_t result; - char keystr[DST_KEY_FORMATSIZE]; - char pubname[1024]; - char priname[1024]; + char keystr[DST_KEY_FORMATSIZE]; + char pubname[1024]; + char priname[1024]; isc_buffer_t buf; - dst_key_t * key = NULL, *tmp = NULL; + dst_key_t *key = NULL, *tmp = NULL; isc_buffer_init(&buf, rdata->data, rdata->length); isc_buffer_add(&buf, rdata->length); @@ -269,12 +264,10 @@ 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) -{ +usage(void) { fprintf(stderr, "Usage:\n"); fprintf(stderr, " %s options [-K dir] keyfile\n\n", program); fprintf(stderr, " %s options -f file [keyname]\n\n", program); @@ -301,17 +294,16 @@ usage(void) } int -main(int argc, char **argv) -{ - char * classname = NULL; - char * filename = NULL, *dir = NULL, *namestr; - char * endp; - int ch; - isc_result_t result; - isc_log_t * log = NULL; +main(int argc, char **argv) { + char *classname = NULL; + char *filename = NULL, *dir = NULL, *namestr; + char *endp; + int ch; + isc_result_t result; + isc_log_t *log = NULL; dns_rdataset_t rdataset; - dns_rdata_t rdata; - isc_stdtime_t now; + dns_rdata_t rdata; + isc_stdtime_t now; dns_rdata_init(&rdata); isc_stdtime_get(&now); @@ -455,7 +447,8 @@ main(int argc, char **argv) for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_init(&rdata); dns_rdataset_current(&rdataset, &rdata); emit(dir, &rdata); diff --git a/bin/dnssec/dnssec-keyfromlabel.c b/bin/dnssec/dnssec-keyfromlabel.c index 52835edc45..4bc2f9f46f 100644 --- a/bin/dnssec/dnssec-keyfromlabel.c +++ b/bin/dnssec/dnssec-keyfromlabel.c @@ -46,12 +46,10 @@ 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) -{ +usage(void) { fprintf(stderr, "Usage:\n"); fprintf(stderr, " %s -l label [options] name\n\n", program); fprintf(stderr, "Version: %s\n", VERSION); @@ -116,52 +114,51 @@ usage(void) } int -main(int argc, char **argv) -{ - char * algname = NULL, *freeit = NULL; - char * nametype = NULL, *type = NULL; - const char * directory = NULL; - const char * predecessor = NULL; - dst_key_t * prevkey = NULL; - const char * engine = NULL; - char * classname = NULL; - char * endp; - dst_key_t * key = NULL; - dns_fixedname_t fname; - dns_name_t * name; - uint16_t flags = 0, kskflag = 0, revflag = 0; - dns_secalg_t alg; - bool oldstyle = false; - isc_mem_t * mctx = NULL; - int ch; - int protocol = -1, signatory = 0; - isc_result_t ret; +main(int argc, char **argv) { + char *algname = NULL, *freeit = NULL; + char *nametype = NULL, *type = NULL; + const char *directory = NULL; + const char *predecessor = NULL; + dst_key_t *prevkey = NULL; + const char *engine = NULL; + char *classname = NULL; + char *endp; + dst_key_t *key = NULL; + dns_fixedname_t fname; + dns_name_t *name; + uint16_t flags = 0, kskflag = 0, revflag = 0; + dns_secalg_t alg; + bool oldstyle = false; + isc_mem_t *mctx = NULL; + int ch; + int protocol = -1, signatory = 0; + isc_result_t ret; isc_textregion_t r; - char filename[255]; - isc_buffer_t buf; - isc_log_t * log = NULL; + char filename[255]; + isc_buffer_t buf; + isc_log_t *log = NULL; dns_rdataclass_t rdclass; - int options = DST_TYPE_PRIVATE | DST_TYPE_PUBLIC; - char * label = NULL; - dns_ttl_t ttl = 0; - isc_stdtime_t publish = 0, activate = 0, revoke = 0; - isc_stdtime_t inactive = 0, deltime = 0; - isc_stdtime_t now; - int prepub = -1; - bool setpub = false, setact = false; - bool setrev = false, setinact = false; - bool setdel = false, setttl = false; - bool unsetpub = false, unsetact = false; - bool unsetrev = false, unsetinact = false; - bool unsetdel = false; - bool genonly = false; - bool use_nsec3 = false; - bool avoid_collisions = true; - bool exact; - unsigned char c; - isc_stdtime_t syncadd = 0, syncdel = 0; - bool unsetsyncadd = false, setsyncadd = false; - bool unsetsyncdel = false, setsyncdel = false; + int options = DST_TYPE_PRIVATE | DST_TYPE_PUBLIC; + char *label = NULL; + dns_ttl_t ttl = 0; + isc_stdtime_t publish = 0, activate = 0, revoke = 0; + isc_stdtime_t inactive = 0, deltime = 0; + isc_stdtime_t now; + int prepub = -1; + bool setpub = false, setact = false; + bool setrev = false, setinact = false; + bool setdel = false, setttl = false; + bool unsetpub = false, unsetact = false; + bool unsetrev = false, unsetinact = false; + bool unsetdel = false; + bool genonly = false; + bool use_nsec3 = false; + bool avoid_collisions = true; + bool exact; + unsigned char c; + isc_stdtime_t syncadd = 0, syncdel = 0; + bool unsetsyncadd = false, setsyncadd = false; + bool unsetsyncdel = false, setsyncdel = false; if (argc == 1) { usage(); @@ -384,7 +381,7 @@ main(int argc, char **argv) if (strchr(label, ':') == NULL) { char *l; - int len; + int len; len = strlen(label) + 8; l = isc_mem_allocate(mctx, len); @@ -467,9 +464,9 @@ main(int argc, char **argv) } } } else { - char keystr[DST_KEY_FORMATSIZE]; + char keystr[DST_KEY_FORMATSIZE]; isc_stdtime_t when; - int major, minor; + int major, minor; if (prepub == -1) { prepub = (30 * 86400); @@ -612,7 +609,8 @@ main(int argc, char **argv) } if ((flags & DNS_KEYFLAG_OWNERMASK) == DNS_KEYOWNER_ZONE && - alg == DNS_KEYALG_DH) { + alg == DNS_KEYALG_DH) + { fatal("a key with algorithm '%s' cannot be a zone key", algname); } @@ -694,7 +692,8 @@ main(int argc, char **argv) } else { if (setpub || setact || setrev || setinact || setdel || unsetpub || unsetact || unsetrev || unsetinact || - unsetdel || genonly || setsyncadd || setsyncdel) { + unsetdel || genonly || setsyncadd || setsyncdel) + { fatal("cannot use -C together with " "-P, -A, -R, -I, -D, or -G options"); } diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c index fadb851bf2..f40e16a6a7 100644 --- a/bin/dnssec/dnssec-keygen.c +++ b/bin/dnssec/dnssec-keygen.c @@ -69,33 +69,31 @@ 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; - const char * policy; - const char * configfile; - const char * directory; - char * algname; - char * nametype; - char * type; - int generator; - int protocol; - int size; - int signatory; + const char *predecessor; + const char *policy; + const char *configfile; + const char *directory; + char *algname; + char *nametype; + char *type; + int generator; + int protocol; + int size; + int signatory; dns_rdataclass_t rdclass; - int options; - int dbits; - dns_ttl_t ttl; - uint16_t kskflag; - uint16_t revflag; - dns_secalg_t alg; + int options; + int dbits; + dns_ttl_t ttl; + uint16_t kskflag; + uint16_t revflag; + dns_secalg_t alg; /* timing data */ - int prepub; + int prepub; isc_stdtime_t now; isc_stdtime_t publish; isc_stdtime_t activate; @@ -104,18 +102,18 @@ struct keygen_ctx { isc_stdtime_t deltime; isc_stdtime_t syncadd; isc_stdtime_t syncdel; - bool setpub; - bool setact; - bool setinact; - bool setrev; - bool setdel; - bool setsyncadd; - bool setsyncdel; - bool unsetpub; - bool unsetact; - bool unsetinact; - bool unsetrev; - bool unsetdel; + bool setpub; + bool setact; + bool setinact; + bool setrev; + bool setdel; + bool setsyncadd; + bool setsyncdel; + bool unsetpub; + bool unsetact; + bool unsetinact; + bool unsetrev; + bool unsetdel; /* how to generate the key */ bool setttl; bool use_nsec3; @@ -125,15 +123,14 @@ struct keygen_ctx { bool oldstyle; /* state */ time_t lifetime; - bool ksk; - bool zsk; + bool ksk; + bool zsk; }; typedef struct keygen_ctx keygen_ctx_t; static void -usage(void) -{ +usage(void) { fprintf(stderr, "Usage:\n"); fprintf(stderr, " %s [options] name\n\n", program); fprintf(stderr, "Version: %s\n", VERSION); @@ -223,8 +220,7 @@ usage(void) } static void -progress(int p) -{ +progress(int p) { char c = '*'; switch (p) { @@ -249,19 +245,19 @@ progress(int p) static void kasp_from_conf(cfg_obj_t *config, isc_mem_t *mctx, const char *name, - dns_kasp_t **kaspp) -{ + dns_kasp_t **kaspp) { const cfg_listelt_t *element; - const cfg_obj_t * kasps = NULL; - dns_kasp_t * kasp = NULL, *kasp_next; - isc_result_t result = ISC_R_NOTFOUND; - dns_kasplist_t kasplist; + const cfg_obj_t *kasps = NULL; + dns_kasp_t *kasp = NULL, *kasp_next; + isc_result_t result = ISC_R_NOTFOUND; + dns_kasplist_t kasplist; ISC_LIST_INIT(kasplist); (void)cfg_map_get(config, "dnssec-policy", &kasps); for (element = cfg_list_first(kasps); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { cfg_obj_t *kconfig = cfg_listelt_value(element); kasp = NULL; if (strcmp(cfg_obj_asstring(cfg_tuple_get(kconfig, "name")), @@ -294,21 +290,20 @@ kasp_from_conf(cfg_obj_t *config, isc_mem_t *mctx, const char *name, } static void -keygen(keygen_ctx_t *ctx, isc_mem_t *mctx, int argc, char **argv) -{ - char filename[255]; - char algstr[DNS_SECALG_FORMATSIZE]; - uint16_t flags = 0; - int param = 0; - bool null_key = false; - bool conflict = false; - bool show_progress = false; - isc_buffer_t buf; - dns_name_t * name; +keygen(keygen_ctx_t *ctx, isc_mem_t *mctx, int argc, char **argv) { + char filename[255]; + char algstr[DNS_SECALG_FORMATSIZE]; + uint16_t flags = 0; + int param = 0; + bool null_key = false; + bool conflict = false; + bool show_progress = false; + isc_buffer_t buf; + dns_name_t *name; dns_fixedname_t fname; - isc_result_t ret; - dst_key_t * key = NULL; - dst_key_t * prevkey = NULL; + isc_result_t ret; + dst_key_t *key = NULL; + dst_key_t *prevkey = NULL; UNUSED(argc); @@ -427,9 +422,9 @@ keygen(keygen_ctx_t *ctx, isc_mem_t *mctx, int argc, char **argv) } } } else { - char keystr[DST_KEY_FORMATSIZE]; + char keystr[DST_KEY_FORMATSIZE]; isc_stdtime_t when; - int major, minor; + int major, minor; if (ctx->prepub == -1) { ctx->prepub = (30 * 86400); @@ -535,14 +530,14 @@ keygen(keygen_ctx_t *ctx, isc_mem_t *mctx, int argc, char **argv) case DNS_KEYALG_RSASHA1: case DNS_KEYALG_NSEC3RSASHA1: case DNS_KEYALG_RSASHA256: - if (ctx->size != 0 && - (ctx->size < 1024 || ctx->size > MAX_RSA)) { + if (ctx->size != 0 && (ctx->size < 1024 || ctx->size > MAX_RSA)) + { fatal("RSA key size %d out of range", ctx->size); } break; case DNS_KEYALG_RSASHA512: - if (ctx->size != 0 && - (ctx->size < 1024 || ctx->size > MAX_RSA)) { + if (ctx->size != 0 && (ctx->size < 1024 || ctx->size > MAX_RSA)) + { fatal("RSA key size %d out of range", ctx->size); } break; @@ -578,7 +573,8 @@ keygen(keygen_ctx_t *ctx, isc_mem_t *mctx, int argc, char **argv) flags |= DNS_KEYOWNER_ZONE; } else if ((ctx->options & DST_TYPE_KEY) != 0) { /* KEY */ if (strcasecmp(ctx->nametype, "host") == 0 || - strcasecmp(ctx->nametype, "entity") == 0) { + strcasecmp(ctx->nametype, "entity") == 0) + { flags |= DNS_KEYOWNER_ENTITY; } else if (strcasecmp(ctx->nametype, "user") == 0) { flags |= DNS_KEYOWNER_USER; @@ -603,7 +599,8 @@ keygen(keygen_ctx_t *ctx, isc_mem_t *mctx, int argc, char **argv) if (ctx->protocol == -1) { ctx->protocol = DNS_KEYPROTO_DNSSEC; } else if ((ctx->options & DST_TYPE_KEY) == 0 && - ctx->protocol != DNS_KEYPROTO_DNSSEC) { + ctx->protocol != DNS_KEYPROTO_DNSSEC) + { fatal("invalid DNSKEY protocol: %d", ctx->protocol); } @@ -617,7 +614,8 @@ keygen(keygen_ctx_t *ctx, isc_mem_t *mctx, int argc, char **argv) } if ((flags & DNS_KEYFLAG_OWNERMASK) == DNS_KEYOWNER_ZONE && - ctx->alg == DNS_KEYALG_DH) { + ctx->alg == DNS_KEYALG_DH) + { fatal("a key with algorithm %s cannot be a zone key", algstr); } @@ -762,7 +760,8 @@ keygen(keygen_ctx_t *ctx, isc_mem_t *mctx, int argc, char **argv) ctx->setinact || ctx->setdel || ctx->unsetpub || ctx->unsetact || ctx->unsetrev || ctx->unsetinact || ctx->unsetdel || ctx->genonly || ctx->setsyncadd || - ctx->setsyncdel) { + ctx->setsyncdel) + { fatal("cannot use -C together with " "-P, -A, -R, -I, -D, or -G options"); } @@ -856,17 +855,16 @@ keygen(keygen_ctx_t *ctx, isc_mem_t *mctx, int argc, char **argv) } int -main(int argc, char **argv) -{ - char * algname = NULL, *freeit = NULL; - char * classname = NULL; - char * endp; - isc_mem_t * mctx = NULL; - isc_result_t ret; +main(int argc, char **argv) { + char *algname = NULL, *freeit = NULL; + char *classname = NULL; + char *endp; + isc_mem_t *mctx = NULL; + isc_result_t ret; isc_textregion_t r; - const char * engine = NULL; - unsigned char c; - int ch; + const char *engine = NULL; + unsigned char c; + int ch; keygen_ctx_t ctx = { .options = DST_TYPE_PRIVATE | DST_TYPE_PUBLIC, @@ -895,16 +893,16 @@ main(int argc, char **argv) while ((ch = isc_commandline_parse(argc, argv, CMDLINE_FLAGS)) != -1) { switch (ch) { case 'm': - if (strcasecmp(isc_commandline_argument, "record") == - 0) { + if (strcasecmp(isc_commandline_argument, "record") == 0) + { isc_mem_debugging |= ISC_MEM_DEBUGRECORD; } - if (strcasecmp(isc_commandline_argument, "trace") == - 0) { + if (strcasecmp(isc_commandline_argument, "trace") == 0) + { isc_mem_debugging |= ISC_MEM_DEBUGTRACE; } - if (strcasecmp(isc_commandline_argument, "usage") == - 0) { + if (strcasecmp(isc_commandline_argument, "usage") == 0) + { isc_mem_debugging |= ISC_MEM_DEBUGUSAGE; } if (strcasecmp(isc_commandline_argument, "size") == 0) { @@ -968,8 +966,8 @@ main(int argc, char **argv) } break; case 'g': - ctx.generator = - strtol(isc_commandline_argument, &endp, 10); + ctx.generator = strtol(isc_commandline_argument, &endp, + 10); if (*endp != '\0' || ctx.generator <= 0) { fatal("-g requires a positive number"); } @@ -998,8 +996,8 @@ main(int argc, char **argv) case 'm': break; case 'p': - ctx.protocol = - strtol(isc_commandline_argument, &endp, 10); + ctx.protocol = strtol(isc_commandline_argument, &endp, + 10); if (*endp != '\0' || ctx.protocol < 0 || ctx.protocol > 255) { fatal("-p must be followed by a number " @@ -1014,8 +1012,8 @@ main(int argc, char **argv) "System random data is always used.\n"); break; case 's': - ctx.signatory = - strtol(isc_commandline_argument, &endp, 10); + ctx.signatory = strtol(isc_commandline_argument, &endp, + 10); if (*endp != '\0' || ctx.signatory < 0 || ctx.signatory > 15) { fatal("-s must be followed by a number " @@ -1027,7 +1025,8 @@ main(int argc, char **argv) ctx.options |= DST_TYPE_KEY; } else if (strcasecmp(isc_commandline_argument, "DNSKE" - "Y") == 0) { + "Y") == 0) + { /* default behavior */ } else { fatal("unknown type '%s'", @@ -1223,7 +1222,8 @@ main(int argc, char **argv) if (ctx.setpub || ctx.setact || ctx.setrev || ctx.setinact || ctx.setdel || ctx.unsetpub || ctx.unsetact || ctx.unsetrev || ctx.unsetinact || ctx.unsetdel || - ctx.setsyncadd || ctx.setsyncdel) { + ctx.setsyncadd || ctx.setsyncdel) + { fatal("cannot use -k together with " "-P, -A, -R, -I, or -D options " "(use dnssec-settime on keys afterwards)"); @@ -1245,16 +1245,17 @@ main(int argc, char **argv) keygen(&ctx, mctx, argc, argv); } else { - cfg_parser_t * parser = NULL; - cfg_obj_t * config = NULL; - dns_kasp_t * kasp = NULL; + cfg_parser_t *parser = NULL; + cfg_obj_t *config = NULL; + dns_kasp_t *kasp = NULL; dns_kasp_key_t *kaspkey = NULL; RUNTIME_CHECK(cfg_parser_create(mctx, lctx, &parser) == ISC_R_SUCCESS); if (cfg_parse_file(parser, ctx.configfile, &cfg_type_namedconf, - &config) != ISC_R_SUCCESS) { + &config) != ISC_R_SUCCESS) + { fatal("unable to load dnssec-policy '%s' from " "'%s'", ctx.policy, ctx.configfile); diff --git a/bin/dnssec/dnssec-revoke.c b/bin/dnssec/dnssec-revoke.c index 82968b6260..d8455e3a67 100644 --- a/bin/dnssec/dnssec-revoke.c +++ b/bin/dnssec/dnssec-revoke.c @@ -40,12 +40,10 @@ 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) -{ +usage(void) { fprintf(stderr, "Usage:\n"); fprintf(stderr, " %s [options] keyfile\n\n", program); fprintf(stderr, "Version: %s\n", VERSION); @@ -72,22 +70,21 @@ usage(void) } int -main(int argc, char **argv) -{ +main(int argc, char **argv) { isc_result_t result; - const char * engine = NULL; - char const * filename = NULL; - char * dir = NULL; - char newname[1024], oldname[1024]; - char keystr[DST_KEY_FORMATSIZE]; - char * endp; - int ch; - dst_key_t * key = NULL; - uint32_t flags; + const char *engine = NULL; + char const *filename = NULL; + char *dir = NULL; + char newname[1024], oldname[1024]; + char keystr[DST_KEY_FORMATSIZE]; + char *endp; + int ch; + dst_key_t *key = NULL; + uint32_t flags; isc_buffer_t buf; - bool force = false; - bool removefile = false; - bool id = false; + bool force = false; + bool removefile = false; + bool id = false; if (argc == 1) { usage(); diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c index 55f70f84cc..526e3f1550 100644 --- a/bin/dnssec/dnssec-settime.c +++ b/bin/dnssec/dnssec-settime.c @@ -43,12 +43,10 @@ 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) -{ +usage(void) { fprintf(stderr, "Usage:\n"); fprintf(stderr, " %s [options] keyfile\n\n", program); fprintf(stderr, "Version: %s\n", VERSION); @@ -113,10 +111,9 @@ usage(void) } static void -printtime(dst_key_t *key, int type, const char *tag, bool epoch, FILE *stream) -{ - isc_result_t result; - const char * output = NULL; +printtime(dst_key_t *key, int type, const char *tag, bool epoch, FILE *stream) { + isc_result_t result; + const char *output = NULL; isc_stdtime_t when; if (tag != NULL) { @@ -136,13 +133,12 @@ printtime(dst_key_t *key, int type, const char *tag, bool epoch, FILE *stream) } static void -writekey(dst_key_t *key, const char *directory, bool write_state) -{ - char newname[1024]; - char keystr[DST_KEY_FORMATSIZE]; +writekey(dst_key_t *key, const char *directory, bool write_state) { + char newname[1024]; + char keystr[DST_KEY_FORMATSIZE]; isc_buffer_t buf; isc_result_t result; - int options = DST_TYPE_PUBLIC | DST_TYPE_PRIVATE; + int options = DST_TYPE_PUBLIC | DST_TYPE_PRIVATE; if (write_state) { options |= DST_TYPE_STATE; @@ -184,57 +180,56 @@ writekey(dst_key_t *key, const char *directory, bool write_state) } int -main(int argc, char **argv) -{ - isc_result_t result; - const char * engine = NULL; - const char * filename = NULL; - char * directory = NULL; - char keystr[DST_KEY_FORMATSIZE]; - char * endp, *p; - int ch; - const char * predecessor = NULL; - dst_key_t * prevkey = NULL; - dst_key_t * key = NULL; - dns_name_t * name = NULL; - dns_secalg_t alg = 0; - unsigned int size = 0; - uint16_t flags = 0; - int prepub = -1; - int options; - dns_ttl_t ttl = 0; - isc_stdtime_t now; - isc_stdtime_t dstime = 0, dnskeytime = 0; - isc_stdtime_t krrsigtime = 0, zrrsigtime = 0; - isc_stdtime_t pub = 0, act = 0, rev = 0, inact = 0, del = 0; - isc_stdtime_t prevact = 0, previnact = 0, prevdel = 0; +main(int argc, char **argv) { + isc_result_t result; + const char *engine = NULL; + const char *filename = NULL; + char *directory = NULL; + char keystr[DST_KEY_FORMATSIZE]; + char *endp, *p; + int ch; + const char *predecessor = NULL; + dst_key_t *prevkey = NULL; + dst_key_t *key = NULL; + dns_name_t *name = NULL; + dns_secalg_t alg = 0; + unsigned int size = 0; + uint16_t flags = 0; + int prepub = -1; + int options; + dns_ttl_t ttl = 0; + isc_stdtime_t now; + isc_stdtime_t dstime = 0, dnskeytime = 0; + isc_stdtime_t krrsigtime = 0, zrrsigtime = 0; + isc_stdtime_t pub = 0, act = 0, rev = 0, inact = 0, del = 0; + isc_stdtime_t prevact = 0, previnact = 0, prevdel = 0; dst_key_state_t goal = DST_KEY_STATE_NA; dst_key_state_t ds = DST_KEY_STATE_NA; dst_key_state_t dnskey = DST_KEY_STATE_NA; dst_key_state_t krrsig = DST_KEY_STATE_NA; dst_key_state_t zrrsig = DST_KEY_STATE_NA; - bool setgoal = false, setds = false, setdnskey = false; - bool setkrrsig = false, setzrrsig = false; - bool setdstime = false, setdnskeytime = false; - bool setkrrsigtime = false, setzrrsigtime = false; - bool setpub = false, setact = false; - bool setrev = false, setinact = false; - bool setdel = false, setttl = false; - bool unsetpub = false, unsetact = false; - bool unsetrev = false, unsetinact = false; - bool unsetdel = false; - bool printcreate = false, printpub = false; - bool printact = false, printrev = false; - bool printinact = false, printdel = false; - bool force = false; - bool epoch = false; - bool changed = false; - bool write_state = false; - isc_log_t * log = NULL; - isc_stdtime_t syncadd = 0, syncdel = 0; - bool unsetsyncadd = false, setsyncadd = false; - bool unsetsyncdel = false, setsyncdel = false; - bool printsyncadd = false, printsyncdel = false; + bool setgoal = false, setds = false, setdnskey = false; + bool setkrrsig = false, setzrrsig = false; + bool setdstime = false, setdnskeytime = false; + bool setkrrsigtime = false, setzrrsigtime = false; + bool setpub = false, setact = false; + bool setrev = false, setinact = false; + bool setdel = false, setttl = false; + bool unsetpub = false, unsetact = false; + bool unsetrev = false, unsetinact = false; + bool unsetdel = false; + bool printcreate = false, printpub = false; + bool printact = false, printrev = false; + bool printinact = false, printdel = false; + bool force = false; + bool epoch = false; + bool changed = false; + bool write_state = false; + isc_log_t *log = NULL; + isc_stdtime_t syncadd = 0, syncdel = 0; + bool unsetsyncadd = false, setsyncadd = false; + bool unsetsyncdel = false, setsyncdel = false; + bool printsyncadd = false, printsyncdel = false; options = DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | DST_TYPE_STATE; @@ -319,7 +314,8 @@ main(int argc, char **argv) goal = strtokeystate(isc_commandline_argument); if (goal != DST_KEY_STATE_NA && goal != DST_KEY_STATE_HIDDEN && - goal != DST_KEY_STATE_OMNIPRESENT) { + goal != DST_KEY_STATE_OMNIPRESENT) + { fatal("-g must be either none, hidden, or " "omnipresent"); } @@ -352,8 +348,8 @@ main(int argc, char **argv) * We don't have to copy it here, but do it to * simplify cleanup later */ - directory = - isc_mem_strdup(mctx, isc_commandline_argument); + directory = isc_mem_strdup(mctx, + isc_commandline_argument); break; case 'k': if (setdnskey) { @@ -545,8 +541,8 @@ main(int argc, char **argv) fatal("Invalid keyfile %s: %s", filename, isc_result_totext(result)); } - if (!dst_key_isprivate(prevkey) && - !dst_key_isexternal(prevkey)) { + if (!dst_key_isprivate(prevkey) && !dst_key_isexternal(prevkey)) + { fatal("%s is not a private key", filename); } @@ -570,8 +566,8 @@ main(int argc, char **argv) "generating a successor."); } - result = - dst_key_gettime(prevkey, DST_TIME_INACTIVE, &previnact); + result = dst_key_gettime(prevkey, DST_TIME_INACTIVE, + &previnact); if (result != ISC_R_SUCCESS) { fatal("Predecessor has no inactivation date. " "You must set one before\n\t" @@ -647,8 +643,8 @@ main(int argc, char **argv) } } - result = - dst_key_fromnamedfile(filename, directory, options, mctx, &key); + result = dst_key_fromnamedfile(filename, directory, options, mctx, + &key); if (result != ISC_R_SUCCESS) { fatal("Invalid keyfile %s: %s", filename, isc_result_totext(result)); @@ -683,7 +679,8 @@ main(int argc, char **argv) (dst_key_gettime(key, DST_TIME_DELETE, &prevdel) == ISC_R_SUCCESS && setinact && !setdel && !unsetdel && prevdel < inact) || (!setdel && !unsetdel && !setinact && !unsetinact && prevdel != 0 && - prevdel < previnact)) { + prevdel < previnact)) + { fprintf(stderr, "%s: warning: Key is scheduled to " "be deleted before it is\n\t" diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index 3cc5a5c341..c107b4aaa5 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -97,87 +97,87 @@ static int nsec_datatype = dns_rdatatype_nsec; check_result((result == DNS_R_NEWORIGIN) ? ISC_R_SUCCESS : result, \ "dns_dbiterator_current()") -#define IS_NSEC3 (nsec_datatype == dns_rdatatype_nsec3) +#define IS_NSEC3 (nsec_datatype == dns_rdatatype_nsec3) #define OPTOUT(x) (((x)&DNS_NSEC3FLAG_OPTOUT) != 0) #define REVOKE(x) ((dst_key_flags(x) & DNS_KEYFLAG_REVOKE) != 0) -#define BUFSIZE 2048 +#define BUFSIZE 2048 #define MAXDSKEYS 8 -#define SIGNER_EVENTCLASS ISC_EVENTCLASS(0x4453) +#define SIGNER_EVENTCLASS ISC_EVENTCLASS(0x4453) #define SIGNER_EVENT_WRITE (SIGNER_EVENTCLASS + 0) -#define SIGNER_EVENT_WORK (SIGNER_EVENTCLASS + 1) +#define SIGNER_EVENT_WORK (SIGNER_EVENTCLASS + 1) -#define SOA_SERIAL_KEEP 0 +#define SOA_SERIAL_KEEP 0 #define SOA_SERIAL_INCREMENT 1 -#define SOA_SERIAL_UNIXTIME 2 -#define SOA_SERIAL_DATE 3 +#define SOA_SERIAL_UNIXTIME 2 +#define SOA_SERIAL_DATE 3 typedef struct signer_event sevent_t; struct signer_event { ISC_EVENT_COMMON(sevent_t); dns_fixedname_t *fname; - dns_dbnode_t * node; + dns_dbnode_t *node; }; static dns_dnsseckeylist_t keylist; -static unsigned int keycount = 0; -isc_rwlock_t keylist_lock; -static isc_stdtime_t starttime = 0, endtime = 0, dnskey_endtime = 0, now; -static int cycle = -1; -static int jitter = 0; -static bool tryverify = false; -static bool printstats = false; -static isc_mem_t * mctx = NULL; -static dns_ttl_t zone_soa_min_ttl; -static dns_ttl_t soa_ttl; -static FILE * outfp = NULL; -static char * tempfile = NULL; +static unsigned int keycount = 0; +isc_rwlock_t keylist_lock; +static isc_stdtime_t starttime = 0, endtime = 0, dnskey_endtime = 0, now; +static int cycle = -1; +static int jitter = 0; +static bool tryverify = false; +static bool printstats = false; +static isc_mem_t *mctx = NULL; +static dns_ttl_t zone_soa_min_ttl; +static dns_ttl_t soa_ttl; +static FILE *outfp = NULL; +static char *tempfile = NULL; static const dns_master_style_t *masterstyle; -static dns_masterformat_t inputformat = dns_masterformat_text; -static dns_masterformat_t outputformat = dns_masterformat_text; -static uint32_t rawversion = 1, serialnum = 0; -static bool snset = false; -static unsigned int nsigned = 0, nretained = 0, ndropped = 0; -static unsigned int nverified = 0, nverifyfailed = 0; -static const char * directory = NULL, *dsdir = NULL; -static isc_mutex_t namelock, statslock; -static isc_taskmgr_t * taskmgr = NULL; -static dns_db_t * gdb; /* The database */ -static dns_dbversion_t * gversion; /* The database version */ -static dns_dbiterator_t * gdbiter; /* The database iterator */ -static dns_rdataclass_t gclass; /* The class */ -static dns_name_t * gorigin; /* The database origin */ -static int nsec3flags = 0; -static dns_iterations_t nsec3iter = 10U; -static unsigned char saltbuf[255]; -static unsigned char * gsalt = saltbuf; -static size_t salt_length = 0; -static isc_task_t * master = NULL; -static unsigned int ntasks = 0; -static atomic_bool shuttingdown; -static atomic_bool finished; -static bool nokeys = false; -static bool removefile = false; -static bool generateds = false; -static bool ignore_kskflag = false; -static bool keyset_kskonly = false; -static dns_master_style_t * dsstyle = NULL; -static unsigned int serialformat = SOA_SERIAL_KEEP; -static unsigned int hash_length = 0; -static bool unknownalg = false; -static bool disable_zone_check = false; -static bool update_chain = false; -static bool set_keyttl = false; -static dns_ttl_t keyttl; -static bool smartsign = false; -static bool remove_orphansigs = false; -static bool remove_inactkeysigs = false; -static bool output_dnssec_only = false; -static bool output_stdout = false; -bool set_maxttl = false; -static dns_ttl_t maxttl = 0; +static dns_masterformat_t inputformat = dns_masterformat_text; +static dns_masterformat_t outputformat = dns_masterformat_text; +static uint32_t rawversion = 1, serialnum = 0; +static bool snset = false; +static unsigned int nsigned = 0, nretained = 0, ndropped = 0; +static unsigned int nverified = 0, nverifyfailed = 0; +static const char *directory = NULL, *dsdir = NULL; +static isc_mutex_t namelock, statslock; +static isc_taskmgr_t *taskmgr = NULL; +static dns_db_t *gdb; /* The database */ +static dns_dbversion_t *gversion; /* The database version */ +static dns_dbiterator_t *gdbiter; /* The database iterator */ +static dns_rdataclass_t gclass; /* The class */ +static dns_name_t *gorigin; /* The database origin */ +static int nsec3flags = 0; +static dns_iterations_t nsec3iter = 10U; +static unsigned char saltbuf[255]; +static unsigned char *gsalt = saltbuf; +static size_t salt_length = 0; +static isc_task_t *master = NULL; +static unsigned int ntasks = 0; +static atomic_bool shuttingdown; +static atomic_bool finished; +static bool nokeys = false; +static bool removefile = false; +static bool generateds = false; +static bool ignore_kskflag = false; +static bool keyset_kskonly = false; +static dns_master_style_t *dsstyle = NULL; +static unsigned int serialformat = SOA_SERIAL_KEEP; +static unsigned int hash_length = 0; +static bool unknownalg = false; +static bool disable_zone_check = false; +static bool update_chain = false; +static bool set_keyttl = false; +static dns_ttl_t keyttl; +static bool smartsign = false; +static bool remove_orphansigs = false; +static bool remove_inactkeysigs = false; +static bool output_dnssec_only = false; +static bool output_stdout = false; +bool set_maxttl = false; +static dns_ttl_t maxttl = 0; #define INCSTAT(counter) \ if (printstats) { \ @@ -186,15 +186,13 @@ 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. */ static dns_name_t * -savezonecut(dns_fixedname_t *fzonecut, dns_name_t *name) -{ +savezonecut(dns_fixedname_t *fzonecut, dns_name_t *name) { dns_name_t *result; result = dns_fixedname_initname(fzonecut); @@ -204,14 +202,13 @@ savezonecut(dns_fixedname_t *fzonecut, dns_name_t *name) } static void -dumpnode(dns_name_t *name, dns_dbnode_t *node) -{ - dns_rdataset_t rds; +dumpnode(dns_name_t *name, dns_dbnode_t *node) { + dns_rdataset_t rds; dns_rdatasetiter_t *iter = NULL; - isc_buffer_t * buffer = NULL; - isc_region_t r; - isc_result_t result; - unsigned bufsize = 4096; + isc_buffer_t *buffer = NULL; + isc_region_t r; + isc_result_t result; + unsigned bufsize = 4096; if (outputformat != dns_masterformat_text) { return; @@ -232,14 +229,16 @@ dumpnode(dns_name_t *name, dns_dbnode_t *node) isc_buffer_allocate(mctx, &buffer, bufsize); for (result = dns_rdatasetiter_first(iter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(iter)) { + result = dns_rdatasetiter_next(iter)) + { dns_rdatasetiter_current(iter, &rds); if (rds.type != dns_rdatatype_rrsig && rds.type != dns_rdatatype_nsec && rds.type != dns_rdatatype_nsec3 && rds.type != dns_rdatatype_nsec3param && - (!smartsign || rds.type != dns_rdatatype_dnskey)) { + (!smartsign || rds.type != dns_rdatatype_dnskey)) + { dns_rdataset_disassociate(&rds); continue; } @@ -275,14 +274,13 @@ dumpnode(dns_name_t *name, dns_dbnode_t *node) */ static void signwithkey(dns_name_t *name, dns_rdataset_t *rdataset, dst_key_t *key, - dns_ttl_t ttl, dns_diff_t *add, const char *logmsg) -{ - isc_result_t result; - isc_stdtime_t jendtime, expiry; - char keystr[DST_KEY_FORMATSIZE]; - dns_rdata_t trdata = DNS_RDATA_INIT; - unsigned char array[BUFSIZE]; - isc_buffer_t b; + dns_ttl_t ttl, dns_diff_t *add, const char *logmsg) { + isc_result_t result; + isc_stdtime_t jendtime, expiry; + char keystr[DST_KEY_FORMATSIZE]; + dns_rdata_t trdata = DNS_RDATA_INIT; + unsigned char array[BUFSIZE]; + isc_buffer_t b; dns_difftuple_t *tuple; dst_key_format(key, keystr, sizeof(keystr)); @@ -324,33 +322,28 @@ signwithkey(dns_name_t *name, dns_rdataset_t *rdataset, dst_key_t *key, } static inline bool -issigningkey(dns_dnsseckey_t *key) -{ +issigningkey(dns_dnsseckey_t *key) { return (key->force_sign || key->hint_sign); } static inline bool -ispublishedkey(dns_dnsseckey_t *key) -{ +ispublishedkey(dns_dnsseckey_t *key) { return ((key->force_publish || key->hint_publish) && !key->hint_remove); } static inline bool -iszonekey(dns_dnsseckey_t *key) -{ +iszonekey(dns_dnsseckey_t *key) { return (dns_name_equal(dst_key_name(key->key), gorigin) && dst_key_iszonekey(key->key)); } static inline bool -isksk(dns_dnsseckey_t *key) -{ +isksk(dns_dnsseckey_t *key) { return (key->ksk); } static inline bool -iszsk(dns_dnsseckey_t *key) -{ +iszsk(dns_dnsseckey_t *key) { return (ignore_kskflag || !key->ksk); } @@ -361,15 +354,15 @@ iszsk(dns_dnsseckey_t *key) * No locking is performed here, this must be done by the caller. */ static dns_dnsseckey_t * -keythatsigned_unlocked(dns_rdata_rrsig_t *rrsig) -{ +keythatsigned_unlocked(dns_rdata_rrsig_t *rrsig) { dns_dnsseckey_t *key; for (key = ISC_LIST_HEAD(keylist); key != NULL; key = ISC_LIST_NEXT(key, link)) { if (rrsig->keyid == dst_key_id(key->key) && rrsig->algorithm == dst_key_alg(key->key) && - dns_name_equal(&rrsig->signer, dst_key_name(key->key))) { + dns_name_equal(&rrsig->signer, dst_key_name(key->key))) + { return (key); } } @@ -381,10 +374,9 @@ keythatsigned_unlocked(dns_rdata_rrsig_t *rrsig) * that we've loaded already, and then see if there's a key on disk. */ static dns_dnsseckey_t * -keythatsigned(dns_rdata_rrsig_t *rrsig) -{ - isc_result_t result; - dst_key_t * pubkey = NULL, *privkey = NULL; +keythatsigned(dns_rdata_rrsig_t *rrsig) { + isc_result_t result; + dst_key_t *pubkey = NULL, *privkey = NULL; dns_dnsseckey_t *key = NULL; isc_rwlock_lock(&keylist_lock, isc_rwlocktype_read); @@ -443,12 +435,11 @@ keythatsigned(dns_rdata_rrsig_t *rrsig) * I'm not sure if this is completely correct, but it seems to work. */ static bool -expecttofindkey(dns_name_t *name) -{ - unsigned int options = DNS_DBFIND_NOWILD; +expecttofindkey(dns_name_t *name) { + unsigned int options = DNS_DBFIND_NOWILD; dns_fixedname_t fname; - isc_result_t result; - char namestr[DNS_NAME_FORMATSIZE]; + isc_result_t result; + char namestr[DNS_NAME_FORMATSIZE]; dns_fixedname_init(&fname); result = dns_db_find(gdb, name, gversion, dns_rdatatype_dnskey, options, @@ -472,8 +463,7 @@ expecttofindkey(dns_name_t *name) static inline bool setverifies(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, - dns_rdata_t *rrsig) -{ + dns_rdata_t *rrsig) { isc_result_t result; result = dns_dnssec_verify(name, set, key, false, 0, mctx, rrsig, NULL); if (result == ISC_R_SUCCESS || result == DNS_R_FROMWILDCARD) { @@ -492,22 +482,21 @@ setverifies(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, */ static void signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name, - dns_rdataset_t *set) -{ - dns_rdataset_t sigset; - dns_rdata_t sigrdata = DNS_RDATA_INIT; + dns_rdataset_t *set) { + dns_rdataset_t sigset; + dns_rdata_t sigrdata = DNS_RDATA_INIT; dns_rdata_rrsig_t rrsig; - dns_dnsseckey_t * key; - isc_result_t result; - bool nosigs = false; - bool * wassignedby, *nowsignedby; - int arraysize; - dns_difftuple_t * tuple; - dns_ttl_t ttl; - int i; - char namestr[DNS_NAME_FORMATSIZE]; - char typestr[DNS_RDATATYPE_FORMATSIZE]; - char sigstr[SIG_FORMATSIZE]; + dns_dnsseckey_t *key; + isc_result_t result; + bool nosigs = false; + bool *wassignedby, *nowsignedby; + int arraysize; + dns_difftuple_t *tuple; + dns_ttl_t ttl; + int i; + char namestr[DNS_NAME_FORMATSIZE]; + char typestr[DNS_RDATATYPE_FORMATSIZE]; + char sigstr[SIG_FORMATSIZE]; dns_name_format(name, namestr, sizeof(namestr)); dns_rdatatype_format(set->type, typestr, sizeof(typestr)); @@ -592,7 +581,8 @@ signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name, wassignedby[key->index] = true; if (!expired && rrsig.originalttl == set->ttl && - setverifies(name, set, key->key, &sigrdata)) { + setverifies(name, set, key->key, &sigrdata)) + { vbprintf(2, "\trrsig by %s retained\n", sigstr); keep = true; } else { @@ -612,7 +602,8 @@ signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name, wassignedby[key->index] = true; if (!expired && rrsig.originalttl == set->ttl && - setverifies(name, set, key->key, &sigrdata)) { + setverifies(name, set, key->key, &sigrdata)) + { vbprintf(2, "\trrsig by %s retained\n", sigstr); keep = true; } else { @@ -695,13 +686,15 @@ signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name, if ((set->type == dns_rdatatype_cds || set->type == dns_rdatatype_cdnskey || set->type == dns_rdatatype_dnskey) && - dns_name_equal(name, gorigin)) { - bool have_ksk; + dns_name_equal(name, gorigin)) + { + bool have_ksk; dns_dnsseckey_t *tmpkey; have_ksk = isksk(key); for (tmpkey = ISC_LIST_HEAD(keylist); tmpkey != NULL; - tmpkey = ISC_LIST_NEXT(tmpkey, link)) { + tmpkey = ISC_LIST_NEXT(tmpkey, link)) + { if (dst_key_alg(key->key) != dst_key_alg(tmpkey->key)) { continue; @@ -730,14 +723,13 @@ signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name, struct hashlist { unsigned char *hashbuf; - size_t entries; - size_t size; - size_t length; + size_t entries; + size_t size; + size_t length; }; static void -hashlist_init(hashlist_t *l, unsigned int nodes, unsigned int length) -{ +hashlist_init(hashlist_t *l, unsigned int nodes, unsigned int length) { l->entries = 0; l->length = length + 1; @@ -754,8 +746,7 @@ hashlist_init(hashlist_t *l, unsigned int nodes, unsigned int length) } static void -hashlist_free(hashlist_t *l) -{ +hashlist_free(hashlist_t *l) { if (l->hashbuf) { free(l->hashbuf); l->hashbuf = NULL; @@ -766,8 +757,7 @@ hashlist_free(hashlist_t *l) } static void -hashlist_add(hashlist_t *l, const unsigned char *hash, size_t len) -{ +hashlist_add(hashlist_t *l, const unsigned char *hash, size_t len) { REQUIRE(len <= l->length); if (l->entries == l->size) { @@ -783,15 +773,14 @@ hashlist_add(hashlist_t *l, const unsigned char *hash, size_t len) } static void -hashlist_add_dns_name(hashlist_t * l, +hashlist_add_dns_name(hashlist_t *l, /*const*/ dns_name_t *name, unsigned int hashalg, unsigned int iterations, const unsigned char *salt, - size_t salt_len, bool speculative) -{ - char nametext[DNS_NAME_FORMATSIZE]; + size_t salt_len, bool speculative) { + char nametext[DNS_NAME_FORMATSIZE]; unsigned char hash[NSEC3_MAX_HASH_LENGTH + 1]; - unsigned int len; - size_t i; + unsigned int len; + size_t i; len = isc_iterated_hash(hash, hashalg, iterations, salt, (int)salt_len, name->ndata, name->length); @@ -807,14 +796,12 @@ hashlist_add_dns_name(hashlist_t * l, } static int -hashlist_comp(const void *a, const void *b) -{ +hashlist_comp(const void *a, const void *b) { return (memcmp(a, b, hash_length + 1)); } static void -hashlist_sort(hashlist_t *l) -{ +hashlist_sort(hashlist_t *l) { INSIST(l->hashbuf != NULL || l->length == 0); if (l->length > 0) { qsort(l->hashbuf, l->entries, l->length, hashlist_comp); @@ -822,11 +809,10 @@ hashlist_sort(hashlist_t *l) } static bool -hashlist_hasdup(hashlist_t *l) -{ +hashlist_hasdup(hashlist_t *l) { unsigned char *current; unsigned char *next = l->hashbuf; - size_t entries = l->entries; + size_t entries = l->entries; /* * Skip initial speculative wild card hashs. @@ -851,12 +837,11 @@ hashlist_hasdup(hashlist_t *l) } static const unsigned char * -hashlist_findnext(const hashlist_t * l, - const unsigned char hash[NSEC3_MAX_HASH_LENGTH]) -{ - size_t entries = l->entries; - const unsigned char *next = - bsearch(hash, l->hashbuf, l->entries, l->length, hashlist_comp); +hashlist_findnext(const hashlist_t *l, + const unsigned char hash[NSEC3_MAX_HASH_LENGTH]) { + size_t entries = l->entries; + const unsigned char *next = bsearch(hash, l->hashbuf, l->entries, + l->length, hashlist_comp); INSIST(next != NULL); do { @@ -874,9 +859,8 @@ hashlist_findnext(const hashlist_t * l, } static bool -hashlist_exists(const hashlist_t * l, - const unsigned char hash[NSEC3_MAX_HASH_LENGTH]) -{ +hashlist_exists(const hashlist_t *l, + const unsigned char hash[NSEC3_MAX_HASH_LENGTH]) { if (bsearch(hash, l->hashbuf, l->entries, l->length, hashlist_comp)) { return (true); } else { @@ -885,16 +869,15 @@ hashlist_exists(const hashlist_t * l, } static void -addnowildcardhash(hashlist_t * l, +addnowildcardhash(hashlist_t *l, /*const*/ dns_name_t *name, unsigned int hashalg, unsigned int iterations, const unsigned char *salt, - size_t salt_len) -{ + size_t salt_len) { dns_fixedname_t fixed; - dns_name_t * wild; - dns_dbnode_t * node = NULL; - isc_result_t result; - char namestr[DNS_NAME_FORMATSIZE]; + dns_name_t *wild; + dns_dbnode_t *node = NULL; + isc_result_t result; + char namestr[DNS_NAME_FORMATSIZE]; wild = dns_fixedname_initname(&fixed); @@ -921,9 +904,8 @@ addnowildcardhash(hashlist_t * l, static void opendb(const char *prefix, dns_name_t *name, dns_rdataclass_t rdclass, - dns_db_t **dbp) -{ - char filename[PATH_MAX]; + dns_db_t **dbp) { + char filename[PATH_MAX]; isc_buffer_t b; isc_result_t result; @@ -967,16 +949,15 @@ opendb(const char *prefix, dns_name_t *name, dns_rdataclass_t rdclass, * dnssec-signzone, and build DS records from that. */ static isc_result_t -loadds(dns_name_t *name, uint32_t ttl, dns_rdataset_t *dsset) -{ - dns_db_t * db = NULL; +loadds(dns_name_t *name, uint32_t ttl, dns_rdataset_t *dsset) { + dns_db_t *db = NULL; dns_dbversion_t *ver = NULL; - dns_dbnode_t * node = NULL; - isc_result_t result; - dns_rdataset_t keyset; - dns_rdata_t key, ds; - unsigned char dsbuf[DNS_DS_BUFFERSIZE]; - dns_diff_t diff; + dns_dbnode_t *node = NULL; + isc_result_t result; + dns_rdataset_t keyset; + dns_rdata_t key, ds; + unsigned char dsbuf[DNS_DS_BUFFERSIZE]; + dns_diff_t diff; dns_difftuple_t *tuple = NULL; opendb("dsset-", name, gclass, &db); @@ -1025,7 +1006,8 @@ loadds(dns_name_t *name, uint32_t ttl, dns_rdataset_t *dsset) dns_diff_init(mctx, &diff); for (result = dns_rdataset_first(&keyset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&keyset)) { + result = dns_rdataset_next(&keyset)) + { dns_rdata_init(&key); dns_rdata_init(&ds); dns_rdataset_current(&keyset, &key); @@ -1056,10 +1038,9 @@ loadds(dns_name_t *name, uint32_t ttl, dns_rdataset_t *dsset) } static bool -secure(dns_name_t *name, dns_dbnode_t *node) -{ +secure(dns_name_t *name, dns_dbnode_t *node) { dns_rdataset_t dsset; - isc_result_t result; + isc_result_t result; if (dns_name_equal(name, gorigin)) { return (false); @@ -1077,10 +1058,9 @@ secure(dns_name_t *name, dns_dbnode_t *node) static bool is_delegation(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *origin, - dns_name_t *name, dns_dbnode_t *node, uint32_t *ttlp) -{ + dns_name_t *name, dns_dbnode_t *node, uint32_t *ttlp) { dns_rdataset_t nsset; - isc_result_t result; + isc_result_t result; if (dns_name_equal(name, origin)) { return (false); @@ -1104,10 +1084,9 @@ is_delegation(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *origin, * 'node'; return false otherwise. */ static bool -has_dname(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node) -{ +has_dname(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node) { dns_rdataset_t dnameset; - isc_result_t result; + isc_result_t result; dns_rdataset_init(&dnameset); result = dns_db_findrdataset(db, node, ver, dns_rdatatype_dname, 0, 0, @@ -1123,14 +1102,13 @@ has_dname(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node) * Signs all records at a name. */ static void -signname(dns_dbnode_t *node, dns_name_t *name) -{ - isc_result_t result; - dns_rdataset_t rdataset; +signname(dns_dbnode_t *node, dns_name_t *name) { + isc_result_t result; + dns_rdataset_t rdataset; dns_rdatasetiter_t *rdsiter; - bool isdelegation = false; - dns_diff_t del, add; - char namestr[DNS_NAME_FORMATSIZE]; + bool isdelegation = false; + dns_diff_t del, add; + char namestr[DNS_NAME_FORMATSIZE]; dns_rdataset_init(&rdataset); dns_name_format(name, namestr, sizeof(namestr)); @@ -1210,16 +1188,15 @@ signname(dns_dbnode_t *node, dns_name_t *name) * caller. Clean out extranous RRSIG records for node. */ static inline bool -active_node(dns_dbnode_t *node) -{ +active_node(dns_dbnode_t *node) { dns_rdatasetiter_t *rdsiter = NULL; dns_rdatasetiter_t *rdsiter2 = NULL; - bool active = false; - isc_result_t result; - dns_rdataset_t rdataset; - dns_rdatatype_t type; - dns_rdatatype_t covers; - bool found; + bool active = false; + isc_result_t result; + dns_rdataset_t rdataset; + dns_rdatatype_t type; + dns_rdatatype_t covers; + bool found; dns_rdataset_init(&rdataset); result = dns_db_allrdatasets(gdb, node, gversion, 0, &rdsiter); @@ -1229,7 +1206,8 @@ active_node(dns_dbnode_t *node) dns_rdatasetiter_current(rdsiter, &rdataset); if (rdataset.type != dns_rdatatype_nsec && rdataset.type != dns_rdatatype_nsec3 && - rdataset.type != dns_rdatatype_rrsig) { + rdataset.type != dns_rdatatype_rrsig) + { active = true; } dns_rdataset_disassociate(&rdataset); @@ -1250,7 +1228,8 @@ active_node(dns_dbnode_t *node) */ for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(rdsiter)) { + result = dns_rdatasetiter_next(rdsiter)) + { dns_rdatasetiter_current(rdsiter, &rdataset); result = dns_db_deleterdataset(gdb, node, gversion, rdataset.type, @@ -1270,7 +1249,8 @@ active_node(dns_dbnode_t *node) check_result(result, "dns_db_allrdatasets()"); for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(rdsiter)) { + result = dns_rdatasetiter_next(rdsiter)) + { dns_rdatasetiter_current(rdsiter, &rdataset); type = rdataset.type; covers = rdataset.covers; @@ -1281,7 +1261,8 @@ active_node(dns_dbnode_t *node) */ if (nsec_datatype == dns_rdatatype_nsec3 && (type == dns_rdatatype_nsec || - covers == dns_rdatatype_nsec)) { + covers == dns_rdatatype_nsec)) + { result = dns_db_deleterdataset( gdb, node, gversion, type, covers); check_result(result, "dns_db_deleterdataset(" @@ -1294,7 +1275,8 @@ active_node(dns_dbnode_t *node) found = false; for (result = dns_rdatasetiter_first(rdsiter2); !found && result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(rdsiter2)) { + result = dns_rdatasetiter_next(rdsiter2)) + { dns_rdatasetiter_current(rdsiter2, &rdataset); if (rdataset.type == covers) { found = true; @@ -1331,13 +1313,12 @@ active_node(dns_dbnode_t *node) * Extracts the minimum TTL from the SOA record, and the SOA record's TTL. */ static void -get_soa_ttls(void) -{ - dns_rdataset_t soaset; +get_soa_ttls(void) { + dns_rdataset_t soaset; dns_fixedname_t fname; - dns_name_t * name; - isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_name_t *name; + isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; name = dns_fixedname_initname(&fname); dns_rdataset_init(&soaset); @@ -1364,13 +1345,12 @@ get_soa_ttls(void) * Increment (or set if nonzero) the SOA serial */ static isc_result_t -setsoaserial(uint32_t serial, dns_updatemethod_t method) -{ - isc_result_t result; - dns_dbnode_t * node = NULL; +setsoaserial(uint32_t serial, dns_updatemethod_t method) { + isc_result_t result; + dns_dbnode_t *node = NULL; dns_rdataset_t rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; - uint32_t old_serial, new_serial; + dns_rdata_t rdata = DNS_RDATA_INIT; + uint32_t old_serial, new_serial; result = dns_db_getoriginnode(gdb, &node); if (result != ISC_R_SUCCESS) { @@ -1413,8 +1393,8 @@ setsoaserial(uint32_t serial, dns_updatemethod_t method) * (2^(32-1))-1. Using u_int32_t arithmetic, we can do a single * comparison. (5 - 6 == (2^32)-1, not negative-one) */ - if (new_serial == old_serial || - (new_serial - old_serial) > 0x7fffffffU) { + if (new_serial == old_serial || (new_serial - old_serial) > 0x7fffffffU) + { fprintf(stderr, "%s: warning: Serial number not advanced, " "zone may not transfer\n", @@ -1450,11 +1430,10 @@ cleanup: * Delete any RRSIG records at a node. */ static void -cleannode(dns_db_t *db, dns_dbversion_t *dbversion, dns_dbnode_t *node) -{ +cleannode(dns_db_t *db, dns_dbversion_t *dbversion, dns_dbnode_t *node) { dns_rdatasetiter_t *rdsiter = NULL; - dns_rdataset_t set; - isc_result_t result, dresult; + dns_rdataset_t set; + isc_result_t result, dresult; if (outputformat != dns_masterformat_text || !disable_zone_check) { return; @@ -1465,7 +1444,7 @@ cleannode(dns_db_t *db, dns_dbversion_t *dbversion, dns_dbnode_t *node) check_result(result, "dns_db_allrdatasets"); result = dns_rdatasetiter_first(rdsiter); while (result == ISC_R_SUCCESS) { - bool destroy = false; + bool destroy = false; dns_rdatatype_t covers = 0; dns_rdatasetiter_current(rdsiter, &set); if (set.type == dns_rdatatype_rrsig) { @@ -1492,8 +1471,7 @@ cleannode(dns_db_t *db, dns_dbversion_t *dbversion, dns_dbnode_t *node) * Set up the iterator and global state before starting the tasks. */ static void -presign(void) -{ +presign(void) { isc_result_t result; gdbiter = NULL; @@ -1505,8 +1483,7 @@ presign(void) * Clean up the iterator and global state after the tasks complete. */ static void -postsign(void) -{ +postsign(void) { dns_dbiterator_destroy(&gdbiter); } @@ -1516,12 +1493,11 @@ postsign(void) * records. */ static void -signapex(void) -{ - dns_dbnode_t * node = NULL; +signapex(void) { + dns_dbnode_t *node = NULL; dns_fixedname_t fixed; - dns_name_t * name; - isc_result_t result; + dns_name_t *name; + isc_result_t result; name = dns_fixedname_initname(&fixed); result = dns_dbiterator_seek(gdbiter, gorigin); @@ -1546,18 +1522,17 @@ signapex(void) * lock. */ static void -assignwork(isc_task_t *task, isc_task_t *worker) -{ - dns_fixedname_t * fname; - dns_name_t * name; - dns_dbnode_t * node; - sevent_t * sevent; - dns_rdataset_t nsec; - bool found; - isc_result_t result; - static dns_name_t * zonecut = NULL; /* Protected by namelock. */ - static dns_fixedname_t fzonecut; /* Protected by namelock. */ - static unsigned int ended = 0; /* Protected by namelock. */ +assignwork(isc_task_t *task, isc_task_t *worker) { + dns_fixedname_t *fname; + dns_name_t *name; + dns_dbnode_t *node; + sevent_t *sevent; + dns_rdataset_t nsec; + bool found; + isc_result_t result; + static dns_name_t *zonecut = NULL; /* Protected by namelock. */ + static dns_fixedname_t fzonecut; /* Protected by namelock. */ + static unsigned int ended = 0; /* Protected by namelock. */ if (atomic_load(&shuttingdown)) { return; @@ -1606,7 +1581,8 @@ assignwork(isc_task_t *task, isc_task_t *worker) } else if (nsec_datatype == dns_rdatatype_nsec3) { if (dns_name_issubdomain(name, gorigin) && (zonecut == NULL || - !dns_name_issubdomain(name, zonecut))) { + !dns_name_issubdomain(name, zonecut))) + { if (is_delegation(gdb, gversion, gorigin, name, node, NULL)) { zonecut = savezonecut(&fzonecut, name); @@ -1661,8 +1637,7 @@ unlock: * Start a worker task */ static void -startworker(isc_task_t *task, isc_event_t *event) -{ +startworker(isc_task_t *task, isc_event_t *event) { isc_task_t *worker; worker = (isc_task_t *)event->ev_arg; @@ -1674,10 +1649,9 @@ startworker(isc_task_t *task, isc_event_t *event) * Write a node to the output file, and restart the worker task. */ static void -writenode(isc_task_t *task, isc_event_t *event) -{ +writenode(isc_task_t *task, isc_event_t *event) { isc_task_t *worker; - sevent_t * sevent = (sevent_t *)event; + sevent_t *sevent = (sevent_t *)event; worker = (isc_task_t *)event->ev_sender; dumpnode(dns_fixedname_name(sevent->fname), sevent->node); @@ -1692,11 +1666,10 @@ writenode(isc_task_t *task, isc_event_t *event) * Sign a database node. */ static void -sign(isc_task_t *task, isc_event_t *event) -{ +sign(isc_task_t *task, isc_event_t *event) { dns_fixedname_t *fname; - dns_dbnode_t * node; - sevent_t * sevent, *wevent; + dns_dbnode_t *node; + sevent_t *sevent, *wevent; sevent = (sevent_t *)event; node = sevent->node; @@ -1716,11 +1689,10 @@ sign(isc_task_t *task, isc_event_t *event) * Update / remove the DS RRset. Preserve RRSIG(DS) if possible. */ static void -add_ds(dns_name_t *name, dns_dbnode_t *node, uint32_t nsttl) -{ +add_ds(dns_name_t *name, dns_dbnode_t *node, uint32_t nsttl) { dns_rdataset_t dsset; dns_rdataset_t sigdsset; - isc_result_t result; + isc_result_t result; dns_rdataset_init(&dsset); dns_rdataset_init(&sigdsset); @@ -1755,12 +1727,11 @@ add_ds(dns_name_t *name, dns_dbnode_t *node, uint32_t nsttl) * Remove records of the given type and their signatures. */ static void -remove_records(dns_dbnode_t *node, dns_rdatatype_t which, bool checknsec) -{ - isc_result_t result; - dns_rdatatype_t type, covers; +remove_records(dns_dbnode_t *node, dns_rdatatype_t which, bool checknsec) { + isc_result_t result; + dns_rdatatype_t type, covers; dns_rdatasetiter_t *rdsiter = NULL; - dns_rdataset_t rdataset; + dns_rdataset_t rdataset; dns_rdataset_init(&rdataset); @@ -1770,7 +1741,8 @@ remove_records(dns_dbnode_t *node, dns_rdatatype_t which, bool checknsec) result = dns_db_allrdatasets(gdb, node, gversion, 0, &rdsiter); check_result(result, "dns_db_allrdatasets()"); for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(rdsiter)) { + result = dns_rdatasetiter_next(rdsiter)) + { dns_rdatasetiter_current(rdsiter, &rdataset); type = rdataset.type; covers = rdataset.covers; @@ -1800,18 +1772,18 @@ remove_records(dns_dbnode_t *node, dns_rdatatype_t which, bool checknsec) * which case remove all signatures except for DS or nsec_datatype */ static void -remove_sigs(dns_dbnode_t *node, bool delegation, dns_rdatatype_t which) -{ - isc_result_t result; - dns_rdatatype_t type, covers; +remove_sigs(dns_dbnode_t *node, bool delegation, dns_rdatatype_t which) { + isc_result_t result; + dns_rdatatype_t type, covers; dns_rdatasetiter_t *rdsiter = NULL; - dns_rdataset_t rdataset; + dns_rdataset_t rdataset; dns_rdataset_init(&rdataset); result = dns_db_allrdatasets(gdb, node, gversion, 0, &rdsiter); check_result(result, "dns_db_allrdatasets()"); for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(rdsiter)) { + result = dns_rdatasetiter_next(rdsiter)) + { dns_rdatasetiter_current(rdsiter, &rdataset); type = rdataset.type; covers = rdataset.covers; @@ -1824,7 +1796,8 @@ remove_sigs(dns_dbnode_t *node, bool delegation, dns_rdatatype_t which) if (which == 0 && delegation && (dns_rdatatype_atparent(covers) || (nsec_datatype == dns_rdatatype_nsec && - covers == nsec_datatype))) { + covers == nsec_datatype))) + { continue; } @@ -1843,18 +1816,17 @@ remove_sigs(dns_dbnode_t *node, bool delegation, dns_rdatatype_t which) * Generate NSEC records for the zone and remove NSEC3/NSEC3PARAM records. */ static void -nsecify(void) -{ - dns_dbiterator_t * dbiter = NULL; - dns_dbnode_t * node = NULL, *nextnode = NULL; - dns_fixedname_t fname, fnextname, fzonecut; - dns_name_t * name, *nextname, *zonecut; - dns_rdataset_t rdataset; +nsecify(void) { + dns_dbiterator_t *dbiter = NULL; + dns_dbnode_t *node = NULL, *nextnode = NULL; + dns_fixedname_t fname, fnextname, fzonecut; + dns_name_t *name, *nextname, *zonecut; + dns_rdataset_t rdataset; dns_rdatasetiter_t *rdsiter = NULL; - dns_rdatatype_t type, covers; - bool done = false; - isc_result_t result; - uint32_t nsttl = 0; + dns_rdatatype_t type, covers; + bool done = false; + isc_result_t result; + uint32_t nsttl = 0; dns_rdataset_init(&rdataset); name = dns_fixedname_initname(&fname); @@ -1867,14 +1839,16 @@ nsecify(void) result = dns_db_createiterator(gdb, DNS_DB_NSEC3ONLY, &dbiter); check_result(result, "dns_db_createiterator()"); for (result = dns_dbiterator_first(dbiter); result == ISC_R_SUCCESS; - result = dns_dbiterator_next(dbiter)) { + result = dns_dbiterator_next(dbiter)) + { result = dns_dbiterator_current(dbiter, &node, name); check_dns_dbiterator_current(result); result = dns_db_allrdatasets(gdb, node, gversion, 0, &rdsiter); check_result(result, "dns_db_allrdatasets()"); for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(rdsiter)) { + result = dns_rdatasetiter_next(rdsiter)) + { dns_rdatasetiter_current(rdsiter, &rdataset); type = rdataset.type; covers = rdataset.covers; @@ -1943,7 +1917,8 @@ nsecify(void) } if (!dns_name_issubdomain(nextname, gorigin) || (zonecut != NULL && - dns_name_issubdomain(nextname, zonecut))) { + dns_name_issubdomain(nextname, zonecut))) + { remove_sigs(nextnode, false, 0); remove_records(nextnode, dns_rdatatype_nsec, false); @@ -1973,16 +1948,15 @@ nsecify(void) static void addnsec3param(const unsigned char *salt, size_t salt_len, - dns_iterations_t iterations) -{ - dns_dbnode_t * node = NULL; + dns_iterations_t iterations) { + dns_dbnode_t *node = NULL; dns_rdata_nsec3param_t nsec3param; - unsigned char nsec3parambuf[5 + 255]; - dns_rdatalist_t rdatalist; - dns_rdataset_t rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_buffer_t b; - isc_result_t result; + unsigned char nsec3parambuf[5 + 255]; + dns_rdatalist_t rdatalist; + dns_rdataset_t rdataset; + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_buffer_t b; + isc_result_t result; dns_rdataset_init(&rdataset); @@ -2032,19 +2006,18 @@ addnsec3param(const unsigned char *salt, size_t salt_len, static void addnsec3(dns_name_t *name, dns_dbnode_t *node, const unsigned char *salt, size_t salt_len, unsigned int iterations, hashlist_t *hashlist, - dns_ttl_t ttl) -{ - unsigned char hash[NSEC3_MAX_HASH_LENGTH]; + dns_ttl_t ttl) { + unsigned char hash[NSEC3_MAX_HASH_LENGTH]; const unsigned char *nexthash; - unsigned char nsec3buffer[DNS_NSEC3_BUFFERSIZE]; - dns_fixedname_t hashname; - dns_rdatalist_t rdatalist; - dns_rdataset_t rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_result_t result; - dns_dbnode_t * nsec3node = NULL; - char namebuf[DNS_NAME_FORMATSIZE]; - size_t hash_len; + unsigned char nsec3buffer[DNS_NSEC3_BUFFERSIZE]; + dns_fixedname_t hashname; + dns_rdatalist_t rdatalist; + dns_rdataset_t rdataset; + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_result_t result; + dns_dbnode_t *nsec3node = NULL; + char namebuf[DNS_NAME_FORMATSIZE]; + size_t hash_len; dns_name_format(name, namebuf, sizeof(namebuf)); @@ -2094,18 +2067,17 @@ addnsec3(dns_name_t *name, dns_dbnode_t *node, const unsigned char *salt, static void nsec3clean(dns_name_t *name, dns_dbnode_t *node, unsigned int hashalg, unsigned int iterations, const unsigned char *salt, size_t salt_len, - hashlist_t *hashlist) -{ - dns_label_t label; + hashlist_t *hashlist) { + dns_label_t label; dns_rdata_nsec3_t nsec3; - dns_rdata_t rdata, delrdata; - dns_rdatalist_t rdatalist; - dns_rdataset_t rdataset, delrdataset; - bool delete_rrsigs = false; - isc_buffer_t target; - isc_result_t result; - unsigned char hash[NSEC3_MAX_HASH_LENGTH + 1]; - bool exists; + dns_rdata_t rdata, delrdata; + dns_rdatalist_t rdatalist; + dns_rdataset_t rdataset, delrdataset; + bool delete_rrsigs = false; + isc_buffer_t target; + isc_result_t result; + unsigned char hash[NSEC3_MAX_HASH_LENGTH + 1]; + bool exists; /* * Get the first label. @@ -2148,7 +2120,8 @@ nsec3clean(dns_name_t *name, dns_dbnode_t *node, unsigned int hashalg, * NSEC3 chain. */ for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_init(&rdata); dns_rdataset_current(&rdataset, &rdata); result = dns_rdata_tostruct(&rdata, &nsec3, NULL); @@ -2156,7 +2129,8 @@ nsec3clean(dns_name_t *name, dns_dbnode_t *node, unsigned int hashalg, if (exists && nsec3.hash == hashalg && nsec3.iterations == iterations && nsec3.salt_length == salt_len && - isc_safe_memequal(nsec3.salt, salt, salt_len)) { + isc_safe_memequal(nsec3.salt, salt, salt_len)) + { continue; } dns_rdatalist_init(&rdatalist); @@ -2198,21 +2172,21 @@ nsec3clean(dns_name_t *name, dns_dbnode_t *node, unsigned int hashalg, static void rrset_cleanup(dns_name_t *name, dns_rdataset_t *rdataset, dns_diff_t *add, - dns_diff_t *del) -{ - isc_result_t result; - unsigned int count1 = 0; + dns_diff_t *del) { + isc_result_t result; + unsigned int count1 = 0; dns_rdataset_t tmprdataset; - char namestr[DNS_NAME_FORMATSIZE]; - char typestr[DNS_RDATATYPE_FORMATSIZE]; + char namestr[DNS_NAME_FORMATSIZE]; + char typestr[DNS_RDATATYPE_FORMATSIZE]; dns_name_format(name, namestr, sizeof(namestr)); dns_rdatatype_format(rdataset->type, typestr, sizeof(typestr)); dns_rdataset_init(&tmprdataset); for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { - dns_rdata_t rdata1 = DNS_RDATA_INIT; + result = dns_rdataset_next(rdataset)) + { + dns_rdata_t rdata1 = DNS_RDATA_INIT; unsigned int count2 = 0; count1++; @@ -2220,8 +2194,9 @@ rrset_cleanup(dns_name_t *name, dns_rdataset_t *rdataset, dns_diff_t *add, dns_rdataset_clone(rdataset, &tmprdataset); for (result = dns_rdataset_first(&tmprdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&tmprdataset)) { - dns_rdata_t rdata2 = DNS_RDATA_INIT; + result = dns_rdataset_next(&tmprdataset)) + { + dns_rdata_t rdata2 = DNS_RDATA_INIT; dns_difftuple_t *tuple = NULL; count2++; dns_rdataset_current(&tmprdataset, &rdata2); @@ -2258,16 +2233,15 @@ rrset_cleanup(dns_name_t *name, dns_rdataset_t *rdataset, dns_diff_t *add, } static void -cleanup_zone(void) -{ - isc_result_t result; - dns_dbiterator_t * dbiter = NULL; +cleanup_zone(void) { + isc_result_t result; + dns_dbiterator_t *dbiter = NULL; dns_rdatasetiter_t *rdsiter = NULL; - dns_diff_t add, del; - dns_dbnode_t * node = NULL; - dns_rdataset_t rdataset; - dns_fixedname_t fname; - dns_name_t * name; + dns_diff_t add, del; + dns_dbnode_t *node = NULL; + dns_rdataset_t rdataset; + dns_fixedname_t fname; + dns_name_t *name; dns_diff_init(mctx, &add); dns_diff_init(mctx, &del); @@ -2278,14 +2252,16 @@ cleanup_zone(void) check_result(result, "dns_db_createiterator()"); for (result = dns_dbiterator_first(dbiter); result == ISC_R_SUCCESS; - result = dns_dbiterator_next(dbiter)) { + result = dns_dbiterator_next(dbiter)) + { result = dns_dbiterator_current(dbiter, &node, name); check_dns_dbiterator_current(result); result = dns_db_allrdatasets(gdb, node, gversion, 0, &rdsiter); check_result(result, "dns_db_allrdatasets()"); for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(rdsiter)) { + result = dns_rdatasetiter_next(rdsiter)) + { dns_rdatasetiter_current(rdsiter, &rdataset); rrset_cleanup(name, &rdataset, &add, &del); dns_rdataset_disassociate(&rdataset); @@ -2316,19 +2292,18 @@ cleanup_zone(void) */ static void nsec3ify(unsigned int hashalg, dns_iterations_t iterations, - const unsigned char *salt, size_t salt_len, hashlist_t *hashlist) -{ + const unsigned char *salt, size_t salt_len, hashlist_t *hashlist) { dns_dbiterator_t *dbiter = NULL; - dns_dbnode_t * node = NULL, *nextnode = NULL; - dns_fixedname_t fname, fnextname, fzonecut; - dns_name_t * name, *nextname, *zonecut; - dns_rdataset_t rdataset; - int order; - bool active; - bool done = false; - isc_result_t result; - uint32_t nsttl = 0; - unsigned int count, nlabels; + dns_dbnode_t *node = NULL, *nextnode = NULL; + dns_fixedname_t fname, fnextname, fzonecut; + dns_name_t *name, *nextname, *zonecut; + dns_rdataset_t rdataset; + int order; + bool active; + bool done = false; + isc_result_t result; + uint32_t nsttl = 0; + unsigned int count, nlabels; dns_rdataset_init(&rdataset); name = dns_fixedname_initname(&fname); @@ -2385,7 +2360,8 @@ nsec3ify(unsigned int hashalg, dns_iterations_t iterations, } if (!dns_name_issubdomain(nextname, gorigin) || (zonecut != NULL && - dns_name_issubdomain(nextname, zonecut))) { + dns_name_issubdomain(nextname, zonecut))) + { remove_sigs(nextnode, false, 0); dns_db_detachnode(gdb, &nextnode); result = dns_dbiterator_next(dbiter); @@ -2472,7 +2448,8 @@ nsec3ify(unsigned int hashalg, dns_iterations_t iterations, check_result(result, "dns_db_createiterator()"); for (result = dns_dbiterator_first(dbiter); result == ISC_R_SUCCESS; - result = dns_dbiterator_next(dbiter)) { + result = dns_dbiterator_next(dbiter)) + { result = dns_dbiterator_current(dbiter, &node, name); check_dns_dbiterator_current(result); nsec3clean(name, node, hashalg, iterations, salt, salt_len, @@ -2525,7 +2502,8 @@ nsec3ify(unsigned int hashalg, dns_iterations_t iterations, } if (!dns_name_issubdomain(nextname, gorigin) || (zonecut != NULL && - dns_name_issubdomain(nextname, zonecut))) { + dns_name_issubdomain(nextname, zonecut))) + { dns_db_detachnode(gdb, &nextnode); result = dns_dbiterator_next(dbiter); continue; @@ -2578,13 +2556,12 @@ nsec3ify(unsigned int hashalg, dns_iterations_t iterations, * Load the zone file from disk */ static void -loadzone(char *file, char *origin, dns_rdataclass_t rdclass, dns_db_t **db) -{ - isc_buffer_t b; - int len; +loadzone(char *file, char *origin, dns_rdataclass_t rdclass, dns_db_t **db) { + isc_buffer_t b; + int len; dns_fixedname_t fname; - dns_name_t * name; - isc_result_t result; + dns_name_t *name; + isc_result_t result; len = strlen(origin); isc_buffer_init(&b, origin, len); @@ -2613,12 +2590,11 @@ loadzone(char *file, char *origin, dns_rdataclass_t rdclass, dns_db_t **db) * private keys from disk. */ static void -loadzonekeys(bool preserve_keys, bool load_public) -{ - dns_dbnode_t * node; +loadzonekeys(bool preserve_keys, bool load_public) { + dns_dbnode_t *node; dns_dbversion_t *currentversion = NULL; - isc_result_t result; - dns_rdataset_t rdataset, keysigs, soasigs; + isc_result_t result; + dns_rdataset_t rdataset, keysigs, soasigs; node = NULL; result = dns_db_findnode(gdb, gorigin, false, &node); @@ -2687,14 +2663,13 @@ cleanup: } static void -loadexplicitkeys(char *keyfiles[], int n, bool setksk) -{ +loadexplicitkeys(char *keyfiles[], int n, bool setksk) { isc_result_t result; - int i; + int i; for (i = 0; i < n; i++) { dns_dnsseckey_t *key = NULL; - dst_key_t * newkey = NULL; + dst_key_t *newkey = NULL; result = dst_key_fromnamedfile( keyfiles[i], directory, @@ -2717,7 +2692,8 @@ loadexplicitkeys(char *keyfiles[], int n, bool setksk) for (key = ISC_LIST_HEAD(keylist); key != NULL; key = ISC_LIST_NEXT(key, link)) { if (dst_key_id(key->key) == dst_key_id(newkey) && - dst_key_alg(key->key) == dst_key_alg(newkey)) { + dst_key_alg(key->key) == dst_key_alg(newkey)) + { break; } } @@ -2742,10 +2718,9 @@ loadexplicitkeys(char *keyfiles[], int n, bool setksk) } static void -report(const char *format, ...) -{ +report(const char *format, ...) { if (!quiet) { - FILE * out = output_stdout ? stderr : stdout; + FILE *out = output_stdout ? stderr : stdout; va_list args; va_start(args, format); vfprintf(out, format, args); @@ -2754,8 +2729,7 @@ report(const char *format, ...) } static void -clear_keylist(dns_dnsseckeylist_t *list) -{ +clear_keylist(dns_dnsseckeylist_t *list) { dns_dnsseckey_t *key; while (!ISC_LIST_EMPTY(*list)) { key = ISC_LIST_HEAD(*list); @@ -2765,15 +2739,14 @@ clear_keylist(dns_dnsseckeylist_t *list) } static void -build_final_keylist(void) -{ - isc_result_t result; - dns_dbnode_t * node = NULL; - dns_dbversion_t * ver = NULL; - dns_diff_t diff; +build_final_keylist(void) { + isc_result_t result; + dns_dbnode_t *node = NULL; + dns_dbversion_t *ver = NULL; + dns_diff_t diff; dns_dnsseckeylist_t rmkeys, matchkeys; - char name[DNS_NAME_FORMATSIZE]; - dns_rdataset_t cdsset, cdnskeyset, soaset; + char name[DNS_NAME_FORMATSIZE]; + dns_rdataset_t cdsset, cdnskeyset, soaset; ISC_LIST_INIT(rmkeys); ISC_LIST_INIT(matchkeys); @@ -2851,15 +2824,14 @@ build_final_keylist(void) } static void -warnifallksk(dns_db_t *db) -{ - dns_dbversion_t * currentversion = NULL; - dns_dbnode_t * node = NULL; - dns_rdataset_t rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_result_t result; +warnifallksk(dns_db_t *db) { + dns_dbversion_t *currentversion = NULL; + dns_dbnode_t *node = NULL; + dns_rdataset_t rdataset; + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_result_t result; dns_rdata_dnskey_t dnskey; - bool have_non_ksk = false; + bool have_non_ksk = false; dns_db_currentversion(db, ¤tversion); @@ -2909,20 +2881,19 @@ warnifallksk(dns_db_t *db) } static void -set_nsec3params(bool update, bool set_salt, bool set_optout, bool set_iter) -{ - isc_result_t result; - dns_dbversion_t * ver = NULL; - dns_dbnode_t * node = NULL; - dns_rdataset_t rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; +set_nsec3params(bool update, bool set_salt, bool set_optout, bool set_iter) { + isc_result_t result; + dns_dbversion_t *ver = NULL; + dns_dbnode_t *node = NULL; + dns_rdataset_t rdataset; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_nsec3_t nsec3; - dns_fixedname_t fname; - dns_name_t * hashname; - unsigned char orig_salt[255]; - size_t orig_saltlen; - dns_hash_t orig_hash; - uint16_t orig_iter; + dns_fixedname_t fname; + dns_name_t *hashname; + unsigned char orig_salt[255]; + size_t orig_saltlen; + dns_hash_t orig_hash; + uint16_t orig_iter; dns_db_currentversion(gdb, &ver); dns_rdataset_init(&rdataset); @@ -2939,7 +2910,8 @@ set_nsec3params(bool update, bool set_salt, bool set_optout, bool set_iter) if (!update && set_salt) { if (salt_length != orig_saltlen || - !isc_safe_memequal(saltbuf, orig_salt, salt_length)) { + !isc_safe_memequal(saltbuf, orig_salt, salt_length)) + { fatal("An NSEC3 chain exists with a different salt. " "Use -u to update it."); } @@ -3011,28 +2983,28 @@ cleanup: } static void -writeset(const char *prefix, dns_rdatatype_t type) -{ - char * filename; - char namestr[DNS_NAME_FORMATSIZE]; - dns_db_t * db = NULL; - dns_dbversion_t * dbversion = NULL; - dns_diff_t diff; - dns_difftuple_t * tuple = NULL; - dns_name_t * name; - dns_rdata_t rdata, ds; - bool have_ksk = false; - bool have_non_ksk = false; - isc_buffer_t b; - isc_buffer_t namebuf; - isc_region_t r; - isc_result_t result; - dns_dnsseckey_t * key, *tmpkey; - unsigned char dsbuf[DNS_DS_BUFFERSIZE]; - unsigned char keybuf[DST_KEY_MAXSIZE]; - unsigned int filenamelen; - const dns_master_style_t *style = - (type == dns_rdatatype_dnskey) ? masterstyle : dsstyle; +writeset(const char *prefix, dns_rdatatype_t type) { + char *filename; + char namestr[DNS_NAME_FORMATSIZE]; + dns_db_t *db = NULL; + dns_dbversion_t *dbversion = NULL; + dns_diff_t diff; + dns_difftuple_t *tuple = NULL; + dns_name_t *name; + dns_rdata_t rdata, ds; + bool have_ksk = false; + bool have_non_ksk = false; + isc_buffer_t b; + isc_buffer_t namebuf; + isc_region_t r; + isc_result_t result; + dns_dnsseckey_t *key, *tmpkey; + unsigned char dsbuf[DNS_DS_BUFFERSIZE]; + unsigned char keybuf[DST_KEY_MAXSIZE]; + unsigned int filenamelen; + const dns_master_style_t *style = (type == dns_rdatatype_dnskey) + ? masterstyle + : dsstyle; isc_buffer_init(&namebuf, namestr, sizeof(namestr)); result = dns_name_tofilenametext(gorigin, false, &namebuf); @@ -3068,7 +3040,8 @@ writeset(const char *prefix, dns_rdatatype_t type) have_non_ksk = true; } for (tmpkey = ISC_LIST_HEAD(keylist); tmpkey != NULL; - tmpkey = ISC_LIST_NEXT(tmpkey, link)) { + tmpkey = ISC_LIST_NEXT(tmpkey, link)) + { if (dst_key_alg(key->key) != dst_key_alg(tmpkey->key)) { continue; } @@ -3130,8 +3103,7 @@ writeset(const char *prefix, dns_rdatatype_t type) } static void -print_time(FILE *fp) -{ +print_time(FILE *fp) { time_t currenttime; if (outputformat != dns_masterformat_text) { @@ -3143,8 +3115,7 @@ print_time(FILE *fp) } static void -print_version(FILE *fp) -{ +print_version(FILE *fp) { if (outputformat != dns_masterformat_text) { return; } @@ -3152,12 +3123,10 @@ 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) -{ +usage(void) { fprintf(stderr, "Usage:\n"); fprintf(stderr, "\t%s [options] zonefile [keys]\n", program); @@ -3253,8 +3222,7 @@ usage(void) } static void -removetempfile(void) -{ +removetempfile(void) { if (removefile) { isc_file_remove(tempfile); } @@ -3262,12 +3230,11 @@ removetempfile(void) static void print_stats(isc_time_t *timer_start, isc_time_t *timer_finish, - isc_time_t *sign_start, isc_time_t *sign_finish) -{ + isc_time_t *sign_start, isc_time_t *sign_finish) { uint64_t time_us; /* Time in microseconds */ uint64_t time_ms; /* Time in milliseconds */ uint64_t sig_ms; /* Signatures per millisecond */ - FILE * out = output_stdout ? stderr : stdout; + FILE *out = output_stdout ? stderr : stdout; fprintf(out, "Signatures generated: %10u\n", nsigned); fprintf(out, "Signatures retained: %10u\n", nretained); @@ -3296,33 +3263,32 @@ print_stats(isc_time_t *timer_start, isc_time_t *timer_finish, } int -main(int argc, char *argv[]) -{ - int i, ch; - char * startstr = NULL, *endstr = NULL, *classname = NULL; - char * dnskey_endstr = NULL; - char * origin = NULL, *file = NULL, *output = NULL; - char * inputformatstr = NULL, *outputformatstr = NULL; - char * serialformatstr = NULL; - char * dskeyfile[MAXDSKEYS]; - int ndskeys = 0; - char * endp; - isc_time_t timer_start, timer_finish; - isc_time_t sign_start, sign_finish; +main(int argc, char *argv[]) { + int i, ch; + char *startstr = NULL, *endstr = NULL, *classname = NULL; + char *dnskey_endstr = NULL; + char *origin = NULL, *file = NULL, *output = NULL; + char *inputformatstr = NULL, *outputformatstr = NULL; + char *serialformatstr = NULL; + char *dskeyfile[MAXDSKEYS]; + int ndskeys = 0; + char *endp; + isc_time_t timer_start, timer_finish; + isc_time_t sign_start, sign_finish; dns_dnsseckey_t *key; - isc_result_t result, vresult; - isc_log_t * log = NULL; - const char * engine = NULL; - bool free_output = false; - int tempfilelen = 0; + isc_result_t result, vresult; + isc_log_t *log = NULL; + const char *engine = NULL; + bool free_output = false; + int tempfilelen = 0; dns_rdataclass_t rdclass; - isc_task_t ** tasks = NULL; - hashlist_t hashlist; - bool make_keyset = false; - bool set_salt = false; - bool set_optout = false; - bool set_iter = false; - bool nonsecify = false; + isc_task_t **tasks = NULL; + hashlist_t hashlist; + bool make_keyset = false; + bool set_salt = false; + bool set_optout = false; + bool set_iter = false; + bool nonsecify = false; atomic_init(&shuttingdown, false); atomic_init(&finished, false); @@ -3338,16 +3304,16 @@ main(int argc, char *argv[]) while ((ch = isc_commandline_parse(argc, argv, CMDLINE_FLAGS)) != -1) { switch (ch) { case 'm': - if (strcasecmp(isc_commandline_argument, "record") == - 0) { + if (strcasecmp(isc_commandline_argument, "record") == 0) + { isc_mem_debugging |= ISC_MEM_DEBUGRECORD; } - if (strcasecmp(isc_commandline_argument, "trace") == - 0) { + if (strcasecmp(isc_commandline_argument, "trace") == 0) + { isc_mem_debugging |= ISC_MEM_DEBUGTRACE; } - if (strcasecmp(isc_commandline_argument, "usage") == - 0) { + if (strcasecmp(isc_commandline_argument, "usage") == 0) + { isc_mem_debugging |= ISC_MEM_DEBUGUSAGE; } if (strcasecmp(isc_commandline_argument, "size") == 0) { @@ -3387,7 +3353,7 @@ main(int argc, char *argv[]) nsec_datatype = dns_rdatatype_nsec3; if (strcmp(isc_commandline_argument, "-") != 0) { isc_buffer_t target; - char * sarg; + char *sarg; sarg = isc_commandline_argument; isc_buffer_init(&target, saltbuf, @@ -3763,7 +3729,8 @@ main(int argc, char *argv[]) if (strcasecmp(serialformatstr, "keep") == 0) { serialformat = SOA_SERIAL_KEEP; } else if (strcasecmp(serialformatstr, "increment") == 0 || - strcasecmp(serialformatstr, "incr") == 0) { + strcasecmp(serialformatstr, "incr") == 0) + { serialformat = SOA_SERIAL_INCREMENT; } else if (strcasecmp(serialformatstr, "unixtime") == 0) { serialformat = SOA_SERIAL_UNIXTIME; @@ -3879,7 +3846,7 @@ main(int argc, char *argv[]) if (IS_NSEC3) { unsigned int max; - bool answer; + bool answer; hash_length = dns_nsec3_hashlength(dns_hash_sha1); hashlist_init(&hashlist, dns_db_nodecount(gdb) * 2, diff --git a/bin/dnssec/dnssec-verify.c b/bin/dnssec/dnssec-verify.c index a6e8388ec3..98d1a74324 100644 --- a/bin/dnssec/dnssec-verify.c +++ b/bin/dnssec/dnssec-verify.c @@ -68,19 +68,18 @@ const char *program = "dnssec-verify"; -static isc_stdtime_t now; -static isc_mem_t * mctx = NULL; +static isc_stdtime_t now; +static isc_mem_t *mctx = NULL; static dns_masterformat_t inputformat = dns_masterformat_text; -static dns_db_t * gdb; /* The database */ -static dns_dbversion_t * gversion; /* The database version */ -static dns_rdataclass_t gclass; /* The class */ -static dns_name_t * gorigin; /* The database origin */ -static bool ignore_kskflag = false; -static bool keyset_kskonly = false; +static dns_db_t *gdb; /* The database */ +static dns_dbversion_t *gversion; /* The database version */ +static dns_rdataclass_t gclass; /* The class */ +static dns_name_t *gorigin; /* The database origin */ +static bool ignore_kskflag = false; +static bool keyset_kskonly = false; static void -report(const char *format, ...) -{ +report(const char *format, ...) { if (!quiet) { va_list args; va_start(args, format); @@ -93,13 +92,12 @@ report(const char *format, ...) * Load the zone file from disk */ static void -loadzone(char *file, char *origin, dns_rdataclass_t rdclass, dns_db_t **db) -{ - isc_buffer_t b; - int len; +loadzone(char *file, char *origin, dns_rdataclass_t rdclass, dns_db_t **db) { + isc_buffer_t b; + int len; dns_fixedname_t fname; - dns_name_t * name; - isc_result_t result; + dns_name_t *name; + isc_result_t result; len = strlen(origin); isc_buffer_init(&b, origin, len); @@ -139,12 +137,10 @@ 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) -{ +usage(void) { fprintf(stderr, "Usage:\n"); fprintf(stderr, "\t%s [options] zonefile [keys]\n", program); @@ -177,17 +173,16 @@ usage(void) } int -main(int argc, char *argv[]) -{ - char * origin = NULL, *file = NULL; - char * inputformatstr = NULL; - isc_result_t result; - isc_log_t * log = NULL; - const char * engine = NULL; - char * classname = NULL; +main(int argc, char *argv[]) { + char *origin = NULL, *file = NULL; + char *inputformatstr = NULL; + isc_result_t result; + isc_log_t *log = NULL; + const char *engine = NULL; + char *classname = NULL; dns_rdataclass_t rdclass; - char * endp; - int ch; + char *endp; + int ch; #define CMDLINE_FLAGS "c:E:hm:o:I:qv:Vxz" @@ -197,16 +192,16 @@ main(int argc, char *argv[]) while ((ch = isc_commandline_parse(argc, argv, CMDLINE_FLAGS)) != -1) { switch (ch) { case 'm': - if (strcasecmp(isc_commandline_argument, "record") == - 0) { + if (strcasecmp(isc_commandline_argument, "record") == 0) + { isc_mem_debugging |= ISC_MEM_DEBUGRECORD; } - if (strcasecmp(isc_commandline_argument, "trace") == - 0) { + if (strcasecmp(isc_commandline_argument, "trace") == 0) + { isc_mem_debugging |= ISC_MEM_DEBUGTRACE; } - if (strcasecmp(isc_commandline_argument, "usage") == - 0) { + if (strcasecmp(isc_commandline_argument, "usage") == 0) + { isc_mem_debugging |= ISC_MEM_DEBUGUSAGE; } if (strcasecmp(isc_commandline_argument, "size") == 0) { diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c index dd39f64684..06ce608e49 100644 --- a/bin/dnssec/dnssectool.c +++ b/bin/dnssec/dnssectool.c @@ -65,15 +65,14 @@ static const char *keystates[KEYSTATES_NVALUES] = { "unretentive", }; -int verbose = 0; -bool quiet = false; +int verbose = 0; +bool quiet = false; uint8_t dtype[8]; static fatalcallback_t *fatalcallback = NULL; void -fatal(const char *format, ...) -{ +fatal(const char *format, ...) { va_list args; fprintf(stderr, "%s: fatal: ", program); @@ -88,22 +87,19 @@ fatal(const char *format, ...) } void -setfatalcallback(fatalcallback_t *callback) -{ +setfatalcallback(fatalcallback_t *callback) { fatalcallback = callback; } void -check_result(isc_result_t result, const char *message) -{ +check_result(isc_result_t result, const char *message) { if (result != ISC_R_SUCCESS) { fatal("%s: %s", message, isc_result_totext(result)); } } void -vbprintf(int level, const char *fmt, ...) -{ +vbprintf(int level, const char *fmt, ...) { va_list ap; if (level > verbose) { return; @@ -115,15 +111,13 @@ vbprintf(int level, const char *fmt, ...) } void -version(const char *name) -{ +version(const char *name) { fprintf(stderr, "%s %s\n", name, VERSION); exit(0); } void -sig_format(dns_rdata_rrsig_t *sig, char *cp, unsigned int size) -{ +sig_format(dns_rdata_rrsig_t *sig, char *cp, unsigned int size) { char namestr[DNS_NAME_FORMATSIZE]; char algstr[DNS_NAME_FORMATSIZE]; @@ -133,13 +127,12 @@ sig_format(dns_rdata_rrsig_t *sig, char *cp, unsigned int size) } void -setup_logging(isc_mem_t *mctx, isc_log_t **logp) -{ - isc_result_t result; +setup_logging(isc_mem_t *mctx, isc_log_t **logp) { + isc_result_t result; isc_logdestination_t destination; - isc_logconfig_t * logconfig = NULL; - isc_log_t * log = NULL; - int level; + isc_logconfig_t *logconfig = NULL; + isc_log_t *log = NULL; + int level; if (verbose < 0) { verbose = 0; @@ -189,8 +182,7 @@ setup_logging(isc_mem_t *mctx, isc_log_t **logp) } void -cleanup_logging(isc_log_t **logp) -{ +cleanup_logging(isc_log_t **logp) { isc_log_t *log; REQUIRE(logp != NULL); @@ -208,8 +200,7 @@ cleanup_logging(isc_log_t **logp) } static isc_stdtime_t -time_units(isc_stdtime_t offset, char *suffix, const char *str) -{ +time_units(isc_stdtime_t offset, char *suffix, const char *str) { switch (suffix[0]) { case 'Y': case 'y': @@ -253,18 +244,16 @@ time_units(isc_stdtime_t offset, char *suffix, const char *str) } static inline bool -isnone(const char *str) -{ +isnone(const char *str) { return ((strcasecmp(str, "none") == 0) || (strcasecmp(str, "never") == 0)); } dns_ttl_t -strtottl(const char *str) -{ +strtottl(const char *str) { const char *orig = str; - dns_ttl_t ttl; - char * endp; + dns_ttl_t ttl; + char *endp; if (isnone(str)) { return ((dns_ttl_t)0); @@ -279,15 +268,14 @@ strtottl(const char *str) } dst_key_state_t -strtokeystate(const char *str) -{ +strtokeystate(const char *str) { if (isnone(str)) { return (DST_KEY_STATE_NA); } for (int i = 0; i < KEYSTATES_NVALUES; i++) { - if (keystates[i] != NULL && - strcasecmp(str, keystates[i]) == 0) { + if (keystates[i] != NULL && strcasecmp(str, keystates[i]) == 0) + { return ((dst_key_state_t)i); } } @@ -295,13 +283,12 @@ strtokeystate(const char *str) } isc_stdtime_t -strtotime(const char *str, int64_t now, int64_t base, bool *setp) -{ - int64_t val, offset; +strtotime(const char *str, int64_t now, int64_t base, bool *setp) { + int64_t val, offset; isc_result_t result; - const char * orig = str; - char * endp; - size_t n; + const char *orig = str; + char *endp; + size_t n; if (isnone(str)) { if (setp != NULL) { @@ -365,11 +352,10 @@ strtotime(const char *str, int64_t now, int64_t base, bool *setp) } dns_rdataclass_t -strtoclass(const char *str) -{ +strtoclass(const char *str) { isc_textregion_t r; dns_rdataclass_t rdclass; - isc_result_t result; + isc_result_t result; if (str == NULL) { return (dns_rdataclass_in); @@ -384,11 +370,10 @@ strtoclass(const char *str) } unsigned int -strtodsdigest(const char *str) -{ +strtodsdigest(const char *str) { isc_textregion_t r; - dns_dsdigest_t alg; - isc_result_t result; + dns_dsdigest_t alg; + isc_result_t result; DE_CONST(str, r.base); r.length = strlen(str); @@ -400,16 +385,14 @@ strtodsdigest(const char *str) } static int -cmp_dtype(const void *ap, const void *bp) -{ +cmp_dtype(const void *ap, const void *bp) { int a = *(const uint8_t *)ap; int b = *(const uint8_t *)bp; return (a - b); } void -add_dtype(unsigned int dt) -{ +add_dtype(unsigned int dt) { unsigned i, n; /* ensure there is space for a zero terminator */ @@ -428,10 +411,9 @@ add_dtype(unsigned int dt) } isc_result_t -try_dir(const char *dirname) -{ +try_dir(const char *dirname) { isc_result_t result; - isc_dir_t d; + isc_dir_t d; isc_dir_init(&d); result = isc_dir_open(&d, dirname); @@ -445,8 +427,7 @@ try_dir(const char *dirname) * Check private key version compatibility. */ void -check_keyversion(dst_key_t *key, char *keystr) -{ +check_keyversion(dst_key_t *key, char *keystr) { int major, minor; dst_key_getprivateformat(key, &major, &minor); INSIST(major <= DST_MAJOR_VERSION); /* invalid private key */ @@ -464,8 +445,7 @@ check_keyversion(dst_key_t *key, char *keystr) } void -set_keyversion(dst_key_t *key) -{ +set_keyversion(dst_key_t *key) { int major, minor; dst_key_getprivateformat(key, &major, &minor); INSIST(major <= DST_MAJOR_VERSION); @@ -488,18 +468,17 @@ set_keyversion(dst_key_t *key) bool key_collision(dst_key_t *dstkey, dns_name_t *name, const char *dir, - isc_mem_t *mctx, bool *exact) -{ - isc_result_t result; - bool conflict = false; + isc_mem_t *mctx, bool *exact) { + isc_result_t result; + bool conflict = false; dns_dnsseckeylist_t matchkeys; - dns_dnsseckey_t * key = NULL; - uint16_t id, oldid; - uint32_t rid, roldid; - dns_secalg_t alg; - char filename[NAME_MAX]; - isc_buffer_t fileb; - isc_stdtime_t now; + dns_dnsseckey_t *key = NULL; + uint16_t id, oldid; + uint32_t rid, roldid; + dns_secalg_t alg; + char filename[NAME_MAX]; + isc_buffer_t fileb; + isc_stdtime_t now; if (exact != NULL) { *exact = false; @@ -576,8 +555,7 @@ key_collision(dst_key_t *dstkey, dns_name_t *name, const char *dir, } bool -isoptarg(const char *arg, char **argv, void (*usage)(void)) -{ +isoptarg(const char *arg, char **argv, void (*usage)(void)) { if (!strcasecmp(isc_commandline_argument, arg)) { if (argv[isc_commandline_index] == NULL) { fprintf(stderr, "%s: missing argument -%c %s\n", @@ -595,11 +573,10 @@ isoptarg(const char *arg, char **argv, void (*usage)(void)) #ifdef _WIN32 void -InitSockets(void) -{ - WORD wVersionRequested; +InitSockets(void) { + WORD wVersionRequested; WSADATA wsaData; - int err; + int err; wVersionRequested = MAKEWORD(2, 0); @@ -611,8 +588,7 @@ InitSockets(void) } void -DestroySockets(void) -{ +DestroySockets(void) { WSACleanup(); } #endif /* ifdef _WIN32 */ diff --git a/bin/named/builtin.c b/bin/named/builtin.c index b776b1accf..b6294cc598 100644 --- a/bin/named/builtin.c +++ b/bin/named/builtin.c @@ -32,18 +32,12 @@ 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 @@ -92,8 +86,7 @@ static const unsigned char hex16[256] = { const unsigned char decimal[] = "0123456789"; static size_t -dns64_rdata(unsigned char *v, size_t start, unsigned char *rdata) -{ +dns64_rdata(unsigned char *v, size_t start, unsigned char *rdata) { size_t i, j = 0; for (i = 0; i < 4U; i++) { @@ -124,12 +117,11 @@ dns64_rdata(unsigned char *v, size_t start, unsigned char *rdata) static isc_result_t dns64_cname(const dns_name_t *zone, const dns_name_t *name, - dns_sdblookup_t *lookup) -{ - size_t zlen, nlen, j, len; - unsigned char v[16], n; - unsigned int i; - unsigned char rdata[sizeof("123.123.123.123.in-addr.arpa.")]; + dns_sdblookup_t *lookup) { + size_t zlen, nlen, j, len; + unsigned char v[16], n; + unsigned int i; + unsigned char rdata[sizeof("123.123.123.123.in-addr.arpa.")]; unsigned char *ndata; /* @@ -298,8 +290,7 @@ dns64_cname(const dns_name_t *zone, const dns_name_t *name, static isc_result_t builtin_lookup(const char *zone, const char *name, void *dbdata, dns_sdblookup_t *lookup, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo) -{ + dns_clientinfo_t *clientinfo) { builtin_t *b = (builtin_t *)dbdata; UNUSED(zone); @@ -316,8 +307,7 @@ builtin_lookup(const char *zone, const char *name, void *dbdata, static isc_result_t dns64_lookup(const dns_name_t *zone, const dns_name_t *name, void *dbdata, dns_sdblookup_t *lookup, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo) -{ + dns_clientinfo_t *clientinfo) { builtin_t *b = (builtin_t *)dbdata; UNUSED(methods); @@ -331,10 +321,9 @@ dns64_lookup(const dns_name_t *zone, const dns_name_t *name, void *dbdata, } static isc_result_t -put_txt(dns_sdblookup_t *lookup, const char *text) -{ +put_txt(dns_sdblookup_t *lookup, const char *text) { unsigned char buf[256]; - unsigned int len = strlen(text); + unsigned int len = strlen(text); if (len > 255) { len = 255; /* Silently truncate */ } @@ -344,8 +333,7 @@ put_txt(dns_sdblookup_t *lookup, const char *text) } static isc_result_t -do_version_lookup(dns_sdblookup_t *lookup) -{ +do_version_lookup(dns_sdblookup_t *lookup) { if (named_g_server->version_set) { if (named_g_server->version == NULL) { return (ISC_R_SUCCESS); @@ -358,8 +346,7 @@ do_version_lookup(dns_sdblookup_t *lookup) } static isc_result_t -do_hostname_lookup(dns_sdblookup_t *lookup) -{ +do_hostname_lookup(dns_sdblookup_t *lookup) { if (named_g_server->hostname_set) { if (named_g_server->hostname == NULL) { return (ISC_R_SUCCESS); @@ -367,7 +354,7 @@ do_hostname_lookup(dns_sdblookup_t *lookup) return (put_txt(lookup, named_g_server->hostname)); } } else { - char buf[256]; + char buf[256]; isc_result_t result = named_os_gethostname(buf, sizeof(buf)); if (result != ISC_R_SUCCESS) { return (result); @@ -377,10 +364,9 @@ do_hostname_lookup(dns_sdblookup_t *lookup) } static isc_result_t -do_authors_lookup(dns_sdblookup_t *lookup) -{ - isc_result_t result; - const char ** p; +do_authors_lookup(dns_sdblookup_t *lookup) { + isc_result_t result; + const char **p; static const char *authors[] = { "Mark Andrews", "Curtis Blackburn", "James Brister", "Ben Cottrell", "John H. DuBois III", "Francis Dupont", @@ -408,10 +394,9 @@ do_authors_lookup(dns_sdblookup_t *lookup) } static isc_result_t -do_id_lookup(dns_sdblookup_t *lookup) -{ +do_id_lookup(dns_sdblookup_t *lookup) { if (named_g_server->sctx->gethostname != NULL) { - char buf[256]; + char buf[256]; isc_result_t result; result = named_g_server->sctx->gethostname(buf, sizeof(buf)); @@ -427,26 +412,23 @@ do_id_lookup(dns_sdblookup_t *lookup) } static isc_result_t -do_dns64_lookup(dns_sdblookup_t *lookup) -{ +do_dns64_lookup(dns_sdblookup_t *lookup) { UNUSED(lookup); return (ISC_R_SUCCESS); } static isc_result_t -do_empty_lookup(dns_sdblookup_t *lookup) -{ +do_empty_lookup(dns_sdblookup_t *lookup) { UNUSED(lookup); return (ISC_R_SUCCESS); } static isc_result_t -builtin_authority(const char *zone, void *dbdata, dns_sdblookup_t *lookup) -{ +builtin_authority(const char *zone, void *dbdata, dns_sdblookup_t *lookup) { isc_result_t result; - const char * contact = "hostmaster"; - const char * server = "@"; - builtin_t * b = (builtin_t *)dbdata; + const char *contact = "hostmaster"; + const char *server = "@"; + builtin_t *b = (builtin_t *)dbdata; UNUSED(zone); UNUSED(dbdata); @@ -478,8 +460,7 @@ builtin_authority(const char *zone, void *dbdata, dns_sdblookup_t *lookup) static isc_result_t builtin_create(const char *zone, int argc, char **argv, void *driverdata, - void **dbdata) -{ + void **dbdata) { REQUIRE(argc >= 1); UNUSED(zone); @@ -504,8 +485,8 @@ builtin_create(const char *zone, int argc, char **argv, void *driverdata, } else if (strcmp(argv[0], "empty") == 0 || strcmp(argv[0], "dns64") == 0) { builtin_t *empty; - char * server; - char * contact; + char *server; + char *contact; /* * We don't want built-in zones to fail. Fallback to * the static configuration if memory allocation fails. @@ -548,8 +529,7 @@ builtin_create(const char *zone, int argc, char **argv, void *driverdata, } static void -builtin_destroy(const char *zone, void *driverdata, void **dbdata) -{ +builtin_destroy(const char *zone, void *driverdata, void **dbdata) { builtin_t *b = (builtin_t *)*dbdata; UNUSED(zone); @@ -560,7 +540,8 @@ builtin_destroy(const char *zone, void *driverdata, void **dbdata) */ if (*dbdata == &version_builtin || *dbdata == &hostname_builtin || *dbdata == &authors_builtin || *dbdata == &id_builtin || - *dbdata == &empty_builtin || *dbdata == &dns64_builtin) { + *dbdata == &empty_builtin || *dbdata == &dns64_builtin) + { return; } @@ -580,8 +561,7 @@ static dns_sdbmethods_t dns64_methods = { }; isc_result_t -named_builtin_init(void) -{ +named_builtin_init(void) { RUNTIME_CHECK(dns_sdb_register("_builtin", &builtin_methods, NULL, DNS_SDBFLAG_RELATIVEOWNER | DNS_SDBFLAG_RELATIVERDATA, @@ -597,8 +577,7 @@ named_builtin_init(void) } void -named_builtin_deinit(void) -{ +named_builtin_deinit(void) { dns_sdb_unregister(&builtin_impl); dns_sdb_unregister(&dns64_impl); } diff --git a/bin/named/config.c b/bin/named/config.c index ce269faecf..478429a4a5 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -316,8 +316,7 @@ masters " DEFAULT_IANA_ROOT_ZONE_MASTERS " {\n\ "; isc_result_t -named_config_parsedefaults(cfg_parser_t *parser, cfg_obj_t **conf) -{ +named_config_parsedefaults(cfg_parser_t *parser, cfg_obj_t **conf) { isc_buffer_t b; isc_buffer_init(&b, defaultconf, sizeof(defaultconf) - 1); @@ -328,8 +327,7 @@ named_config_parsedefaults(cfg_parser_t *parser, cfg_obj_t **conf) isc_result_t named_config_get(cfg_obj_t const *const *maps, const char *name, - const cfg_obj_t **obj) -{ + const cfg_obj_t **obj) { int i; for (i = 0;; i++) { @@ -344,13 +342,12 @@ named_config_get(cfg_obj_t const *const *maps, const char *name, isc_result_t named_checknames_get(const cfg_obj_t **maps, const char *which, - const cfg_obj_t **obj) -{ + const cfg_obj_t **obj) { const cfg_listelt_t *element; - const cfg_obj_t * checknames; - const cfg_obj_t * type; - const cfg_obj_t * value; - int i; + const cfg_obj_t *checknames; + const cfg_obj_t *type; + const cfg_obj_t *value; + int i; for (i = 0;; i++) { if (maps[i] == NULL) { @@ -367,8 +364,8 @@ named_checknames_get(const cfg_obj_t **maps, const char *which, return (ISC_R_SUCCESS); } for (element = cfg_list_first(checknames); - element != NULL; - element = cfg_list_next(element)) { + element != NULL; element = cfg_list_next(element)) + { value = cfg_listelt_value(element); type = cfg_tuple_get(value, "type"); if (strcasecmp(cfg_obj_asstring(type), which) == @@ -382,10 +379,9 @@ named_checknames_get(const cfg_obj_t **maps, const char *which, } int -named_config_listcount(const cfg_obj_t *list) -{ +named_config_listcount(const cfg_obj_t *list) { const cfg_listelt_t *e; - int i = 0; + int i = 0; for (e = cfg_list_first(list); e != NULL; e = cfg_list_next(e)) { i++; @@ -396,10 +392,9 @@ named_config_listcount(const cfg_obj_t *list) isc_result_t named_config_getclass(const cfg_obj_t *classobj, dns_rdataclass_t defclass, - dns_rdataclass_t *classp) -{ + dns_rdataclass_t *classp) { isc_textregion_t r; - isc_result_t result; + isc_result_t result; if (!cfg_obj_isstring(classobj)) { *classp = defclass; @@ -417,10 +412,9 @@ named_config_getclass(const cfg_obj_t *classobj, dns_rdataclass_t defclass, isc_result_t named_config_gettype(const cfg_obj_t *typeobj, dns_rdatatype_t deftype, - dns_rdatatype_t *typep) -{ + dns_rdatatype_t *typep) { isc_textregion_t r; - isc_result_t result; + isc_result_t result; if (!cfg_obj_isstring(typeobj)) { *typep = deftype; @@ -437,10 +431,9 @@ named_config_gettype(const cfg_obj_t *typeobj, dns_rdatatype_t deftype, } dns_zonetype_t -named_config_getzonetype(const cfg_obj_t *zonetypeobj) -{ +named_config_getzonetype(const cfg_obj_t *zonetypeobj) { dns_zonetype_t ztype = dns_zone_none; - const char * str; + const char *str; str = cfg_obj_asstring(zonetypeobj); if (strcasecmp(str, "primary") == 0 || strcasecmp(str, "master") == 0) { @@ -467,16 +460,15 @@ isc_result_t named_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list, in_port_t defport, isc_mem_t *mctx, isc_sockaddr_t **addrsp, isc_dscp_t **dscpsp, - uint32_t *countp) -{ - int count, i = 0; - const cfg_obj_t * addrlist; - const cfg_obj_t * portobj, *dscpobj; + uint32_t *countp) { + int count, i = 0; + const cfg_obj_t *addrlist; + const cfg_obj_t *portobj, *dscpobj; const cfg_listelt_t *element; - isc_sockaddr_t * addrs; - in_port_t port; - isc_dscp_t dscp = -1, *dscps = NULL; - isc_result_t result; + isc_sockaddr_t *addrs; + in_port_t port; + isc_dscp_t dscp = -1, *dscps = NULL; + isc_result_t result; INSIST(addrsp != NULL && *addrsp == NULL); INSIST(dscpsp == NULL || *dscpsp == NULL); @@ -522,7 +514,8 @@ named_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list, addrs = isc_mem_get(mctx, count * sizeof(isc_sockaddr_t)); for (element = cfg_list_first(addrlist); element != NULL; - element = cfg_list_next(element), i++) { + element = cfg_list_next(element), i++) + { const cfg_obj_t *addr; INSIST(i < count); addr = cfg_listelt_value(element); @@ -553,8 +546,7 @@ named_config_getiplist(const cfg_obj_t *config, const cfg_obj_t *list, void named_config_putiplist(isc_mem_t *mctx, isc_sockaddr_t **addrsp, - isc_dscp_t **dscpsp, uint32_t count) -{ + isc_dscp_t **dscpsp, uint32_t count) { INSIST(addrsp != NULL && *addrsp != NULL); INSIST(dscpsp == NULL || *dscpsp != NULL); @@ -569,10 +561,9 @@ named_config_putiplist(isc_mem_t *mctx, isc_sockaddr_t **addrsp, isc_result_t named_config_getmastersdef(const cfg_obj_t *cctx, const char *name, - const cfg_obj_t **ret) -{ - isc_result_t result; - const cfg_obj_t * masters = NULL; + const cfg_obj_t **ret) { + isc_result_t result; + const cfg_obj_t *masters = NULL; const cfg_listelt_t *elt; result = cfg_map_get(cctx, "masters", &masters); @@ -582,7 +573,7 @@ named_config_getmastersdef(const cfg_obj_t *cctx, const char *name, for (elt = cfg_list_first(masters); elt != NULL; elt = cfg_list_next(elt)) { const cfg_obj_t *list; - const char * listname; + const char *listname; list = cfg_listelt_value(elt); listname = cfg_obj_asstring(cfg_tuple_get(list, "name")); @@ -597,29 +588,28 @@ named_config_getmastersdef(const cfg_obj_t *cctx, const char *name, isc_result_t named_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list, - isc_mem_t *mctx, dns_ipkeylist_t *ipkl) -{ - uint32_t addrcount = 0, dscpcount = 0, keycount = 0, i = 0; - uint32_t listcount = 0, l = 0, j; - uint32_t stackcount = 0, pushed = 0; - isc_result_t result; + isc_mem_t *mctx, dns_ipkeylist_t *ipkl) { + uint32_t addrcount = 0, dscpcount = 0, keycount = 0, i = 0; + uint32_t listcount = 0, l = 0, j; + uint32_t stackcount = 0, pushed = 0; + isc_result_t result; const cfg_listelt_t *element; - const cfg_obj_t * addrlist; - const cfg_obj_t * portobj; - const cfg_obj_t * dscpobj; - in_port_t port; - isc_dscp_t dscp = -1; - dns_fixedname_t fname; - isc_sockaddr_t * addrs = NULL; - isc_dscp_t * dscps = NULL; - dns_name_t ** keys = NULL; + const cfg_obj_t *addrlist; + const cfg_obj_t *portobj; + const cfg_obj_t *dscpobj; + in_port_t port; + isc_dscp_t dscp = -1; + dns_fixedname_t fname; + isc_sockaddr_t *addrs = NULL; + isc_dscp_t *dscps = NULL; + dns_name_t **keys = NULL; struct { const char *name; } *lists = NULL; struct { const cfg_listelt_t *element; - in_port_t port; - isc_dscp_t dscp; + in_port_t port; + isc_dscp_t dscp; } *stack = NULL; REQUIRE(ipkl != NULL); @@ -677,22 +667,22 @@ resume: for (; element != NULL; element = cfg_list_next(element)) { const cfg_obj_t *addr; const cfg_obj_t *key; - const char * keystr; - isc_buffer_t b; + const char *keystr; + isc_buffer_t b; addr = cfg_tuple_get(cfg_listelt_value(element), "masterselemen" "t"); key = cfg_tuple_get(cfg_listelt_value(element), "key"); if (!cfg_obj_issockaddr(addr)) { - const char * listname = cfg_obj_asstring(addr); + const char *listname = cfg_obj_asstring(addr); isc_result_t tresult; /* Grow lists? */ if (listcount == l) { - void * tmp; + void *tmp; uint32_t newlen = listcount + 16; - size_t newsize, oldsize; + size_t newsize, oldsize; newsize = newlen * sizeof(*lists); oldsize = listcount * sizeof(*lists); @@ -729,9 +719,9 @@ resume: lists[l++].name = listname; /* Grow stack? */ if (stackcount == pushed) { - void * tmp; + void *tmp; uint32_t newlen = stackcount + 16; - size_t newsize, oldsize; + size_t newsize, oldsize; newsize = newlen * sizeof(*stack); oldsize = stackcount * sizeof(*stack); @@ -755,9 +745,9 @@ resume: } if (i == addrcount) { - void * tmp; + void *tmp; uint32_t newlen = addrcount + 16; - size_t newsize, oldsize; + size_t newsize, oldsize; newsize = newlen * sizeof(isc_sockaddr_t); oldsize = addrcount * sizeof(isc_sockaddr_t); @@ -825,7 +815,7 @@ resume: goto resume; } if (i < addrcount) { - void * tmp; + void *tmp; size_t newsize, oldsize; newsize = i * sizeof(isc_sockaddr_t); @@ -913,13 +903,12 @@ cleanup: } isc_result_t -named_config_getport(const cfg_obj_t *config, in_port_t *portp) -{ +named_config_getport(const cfg_obj_t *config, in_port_t *portp) { const cfg_obj_t *maps[3]; const cfg_obj_t *options = NULL; const cfg_obj_t *portobj = NULL; - isc_result_t result; - int i; + isc_result_t result; + int i; (void)cfg_map_get(config, "options", &options); i = 0; @@ -942,11 +931,10 @@ named_config_getport(const cfg_obj_t *config, in_port_t *portp) } isc_result_t -named_config_getdscp(const cfg_obj_t *config, isc_dscp_t *dscpp) -{ +named_config_getdscp(const cfg_obj_t *config, isc_dscp_t *dscpp) { const cfg_obj_t *options = NULL; const cfg_obj_t *dscpobj = NULL; - isc_result_t result; + isc_result_t result; (void)cfg_map_get(config, "options", &options); if (options == NULL) { @@ -978,7 +966,7 @@ struct keyalgorithms { hmacsha384, hmacsha512 } hmac; unsigned int type; - uint16_t size; + uint16_t size; } algorithms[] = { { "hmac-md5", hmacmd5, DST_ALG_HMACMD5, 128 }, { "hmac-md5.sig-alg.reg.int", hmacmd5, DST_ALG_HMACMD5, 0 }, { "hmac-md5.sig-alg.reg.int.", hmacmd5, DST_ALG_HMACMD5, 0 }, @@ -991,25 +979,24 @@ struct keyalgorithms { isc_result_t named_config_getkeyalgorithm(const char *str, const dns_name_t **name, - uint16_t *digestbits) -{ + uint16_t *digestbits) { return (named_config_getkeyalgorithm2(str, name, NULL, digestbits)); } isc_result_t named_config_getkeyalgorithm2(const char *str, const dns_name_t **name, - unsigned int *typep, uint16_t *digestbits) -{ - int i; - size_t len = 0; - uint16_t bits; + unsigned int *typep, uint16_t *digestbits) { + int i; + size_t len = 0; + uint16_t bits; isc_result_t result; for (i = 0; algorithms[i].str != NULL; i++) { len = strlen(algorithms[i].str); if (strncasecmp(algorithms[i].str, str, len) == 0 && (str[len] == '\0' || - (algorithms[i].size != 0 && str[len] == '-'))) { + (algorithms[i].size != 0 && str[len] == '-'))) + { break; } } diff --git a/bin/named/control.c b/bin/named/control.c index 53b2c109b1..1b52f282bf 100644 --- a/bin/named/control.c +++ b/bin/named/control.c @@ -36,10 +36,9 @@ #endif /* ifdef HAVE_LIBSCF */ static isc_result_t -getcommand(isc_lex_t *lex, char **cmdp) -{ +getcommand(isc_lex_t *lex, char **cmdp) { isc_result_t result; - isc_token_t token; + isc_token_t token; REQUIRE(cmdp != NULL && *cmdp == NULL); @@ -60,8 +59,7 @@ getcommand(isc_lex_t *lex, char **cmdp) } static inline bool -command_compare(const char *str, const char *command) -{ +command_compare(const char *str, const char *command) { return (strcasecmp(str, command) == 0); } @@ -71,15 +69,14 @@ command_compare(const char *str, const char *command) */ isc_result_t named_control_docommand(isccc_sexpr_t *message, bool readonly, - isc_buffer_t **text) -{ + isc_buffer_t **text) { isccc_sexpr_t *data; - char * cmdline = NULL; - char * command = NULL; - isc_result_t result; - int log_level; - isc_buffer_t src; - isc_lex_t * lex = NULL; + char *cmdline = NULL; + char *command = NULL; + isc_result_t result; + int log_level; + isc_buffer_t src; + isc_lex_t *lex = NULL; #ifdef HAVE_LIBSCF named_smf_want_disable = 0; #endif /* ifdef HAVE_LIBSCF */ @@ -122,7 +119,8 @@ named_control_docommand(isccc_sexpr_t *message, bool readonly, */ if ((command_compare(command, NAMED_COMMAND_NULL) && strlen(cmdline) == 4) || - command_compare(command, NAMED_COMMAND_STATUS)) { + command_compare(command, NAMED_COMMAND_STATUS)) + { log_level = ISC_LOG_DEBUG(1); } else { log_level = ISC_LOG_INFO; @@ -138,7 +136,8 @@ named_control_docommand(isccc_sexpr_t *message, bool readonly, !command_compare(command, NAMED_COMMAND_STATUS) && !command_compare(command, NAMED_COMMAND_SHOWZONE) && !command_compare(command, NAMED_COMMAND_TESTGEN) && - !command_compare(command, NAMED_COMMAND_ZONESTATUS)) { + !command_compare(command, NAMED_COMMAND_ZONESTATUS)) + { isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_CONTROL, log_level, "rejecting restricted control channel " @@ -204,12 +203,14 @@ named_control_docommand(isccc_sexpr_t *message, bool readonly, isc_app_shutdown(); result = ISC_R_SUCCESS; } else if (command_compare(command, NAMED_COMMAND_ADDZONE) || - command_compare(command, NAMED_COMMAND_MODZONE)) { + command_compare(command, NAMED_COMMAND_MODZONE)) + { result = named_server_changezone(named_g_server, cmdline, text); } else if (command_compare(command, NAMED_COMMAND_DELZONE)) { result = named_server_delzone(named_g_server, lex, text); } else if (command_compare(command, NAMED_COMMAND_DNSTAP) || - command_compare(command, NAMED_COMMAND_DNSTAPREOPEN)) { + command_compare(command, NAMED_COMMAND_DNSTAPREOPEN)) + { result = named_server_dnstap(named_g_server, lex, text); } else if (command_compare(command, NAMED_COMMAND_DUMPDB)) { named_server_dumpdb(named_g_server, lex, text); @@ -225,7 +226,8 @@ named_control_docommand(isccc_sexpr_t *message, bool readonly, } else if (command_compare(command, NAMED_COMMAND_FREEZE)) { result = named_server_freeze(named_g_server, true, lex, text); } else if (command_compare(command, NAMED_COMMAND_LOADKEYS) || - command_compare(command, NAMED_COMMAND_SIGN)) { + command_compare(command, NAMED_COMMAND_SIGN)) + { result = named_server_rekey(named_g_server, lex, text); } else if (command_compare(command, NAMED_COMMAND_MKEYS)) { result = named_server_mkeys(named_g_server, lex, text); @@ -272,7 +274,8 @@ named_control_docommand(isccc_sexpr_t *message, bool readonly, } else if (command_compare(command, NAMED_COMMAND_TESTGEN)) { result = named_server_testgen(lex, text); } else if (command_compare(command, NAMED_COMMAND_THAW) || - command_compare(command, NAMED_COMMAND_UNFREEZE)) { + command_compare(command, NAMED_COMMAND_UNFREEZE)) + { result = named_server_freeze(named_g_server, false, lex, text); } else if (command_compare(command, NAMED_COMMAND_TIMERPOKE)) { isc_timermgr_poke(named_g_timermgr); diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c index e2718131cb..018327539c 100644 --- a/bin/named/controlconf.c +++ b/bin/named/controlconf.c @@ -63,60 +63,57 @@ typedef struct controllistener controllistener_t; typedef ISC_LIST(controllistener_t) controllistenerlist_t; struct controlkey { - char * keyname; - uint32_t algorithm; + char *keyname; + uint32_t algorithm; isc_region_t secret; ISC_LINK(controlkey_t) link; }; struct controlconnection { - isc_socket_t * sock; - isccc_ccmsg_t ccmsg; - bool ccmsg_valid; - bool sending; - isc_timer_t * timer; - isc_buffer_t * buffer; + isc_socket_t *sock; + isccc_ccmsg_t ccmsg; + bool ccmsg_valid; + bool sending; + isc_timer_t *timer; + isc_buffer_t *buffer; controllistener_t *listener; - uint32_t nonce; + uint32_t nonce; ISC_LINK(controlconnection_t) link; }; struct controllistener { - named_controls_t * controls; - isc_mem_t * mctx; - isc_task_t * task; - isc_sockaddr_t address; - isc_socket_t * sock; - dns_acl_t * acl; - bool listening; - bool exiting; - controlkeylist_t keys; + named_controls_t *controls; + isc_mem_t *mctx; + isc_task_t *task; + isc_sockaddr_t address; + isc_socket_t *sock; + dns_acl_t *acl; + bool listening; + bool exiting; + controlkeylist_t keys; controlconnectionlist_t connections; - isc_sockettype_t type; - uint32_t perm; - uint32_t owner; - uint32_t group; - bool readonly; + isc_sockettype_t type; + uint32_t perm; + uint32_t owner; + uint32_t group; + bool readonly; ISC_LINK(controllistener_t) link; }; struct named_controls { - named_server_t * server; + named_server_t *server; controllistenerlist_t listeners; - bool shuttingdown; - isccc_symtab_t * symtab; + bool shuttingdown; + 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 static void -free_controlkey(controlkey_t *key, isc_mem_t *mctx) -{ +free_controlkey(controlkey_t *key, isc_mem_t *mctx) { if (key->keyname != NULL) { isc_mem_free(mctx, key->keyname); } @@ -127,8 +124,7 @@ free_controlkey(controlkey_t *key, isc_mem_t *mctx) } static void -free_controlkeylist(controlkeylist_t *keylist, isc_mem_t *mctx) -{ +free_controlkeylist(controlkeylist_t *keylist, isc_mem_t *mctx) { while (!ISC_LIST_EMPTY(*keylist)) { controlkey_t *key = ISC_LIST_HEAD(*keylist); ISC_LIST_UNLINK(*keylist, key, link); @@ -137,8 +133,7 @@ free_controlkeylist(controlkeylist_t *keylist, isc_mem_t *mctx) } static void -free_listener(controllistener_t *listener) -{ +free_listener(controllistener_t *listener) { INSIST(listener->exiting); INSIST(!listener->listening); INSIST(ISC_LIST_EMPTY(listener->connections)); @@ -157,17 +152,16 @@ free_listener(controllistener_t *listener) } static void -maybe_free_listener(controllistener_t *listener) -{ +maybe_free_listener(controllistener_t *listener) { if (listener->exiting && !listener->listening && - ISC_LIST_EMPTY(listener->connections)) { + ISC_LIST_EMPTY(listener->connections)) + { free_listener(listener); } } static void -maybe_free_connection(controlconnection_t *conn) -{ +maybe_free_connection(controlconnection_t *conn) { controllistener_t *listener = conn->listener; if (conn->buffer != NULL) { @@ -199,8 +193,7 @@ maybe_free_connection(controlconnection_t *conn) } static void -shutdown_listener(controllistener_t *listener) -{ +shutdown_listener(controllistener_t *listener) { controlconnection_t *conn; controlconnection_t *next; @@ -235,13 +228,12 @@ shutdown_listener(controllistener_t *listener) } static bool -address_ok(isc_sockaddr_t *sockaddr, dns_acl_t *acl) -{ +address_ok(isc_sockaddr_t *sockaddr, dns_acl_t *acl) { dns_aclenv_t *env = ns_interfacemgr_getaclenv(named_g_server->interfacemgr); isc_netaddr_t netaddr; - isc_result_t result; - int match; + isc_result_t result; + int match; isc_netaddr_fromsockaddr(&netaddr, sockaddr); @@ -250,8 +242,7 @@ address_ok(isc_sockaddr_t *sockaddr, dns_acl_t *acl) } static isc_result_t -control_accept(controllistener_t *listener) -{ +control_accept(controllistener_t *listener) { isc_result_t result; result = isc_socket_accept(listener->sock, listener->task, control_newconn, listener); @@ -266,8 +257,7 @@ control_accept(controllistener_t *listener) } static isc_result_t -control_listen(controllistener_t *listener) -{ +control_listen(controllistener_t *listener) { isc_result_t result; result = isc_socket_listen(listener->sock, 0); @@ -280,19 +270,17 @@ control_listen(controllistener_t *listener) } static void -control_next(controllistener_t *listener) -{ +control_next(controllistener_t *listener) { (void)control_accept(listener); } static void -control_senddone(isc_task_t *task, isc_event_t *event) -{ - isc_socketevent_t * sevent = (isc_socketevent_t *)event; +control_senddone(isc_task_t *task, isc_event_t *event) { + isc_socketevent_t *sevent = (isc_socketevent_t *)event; controlconnection_t *conn = event->ev_arg; - controllistener_t * listener = conn->listener; - isc_socket_t * sock = (isc_socket_t *)sevent->ev_sender; - isc_result_t result; + controllistener_t *listener = conn->listener; + isc_socket_t *sock = (isc_socket_t *)sevent->ev_sender; + isc_result_t result; REQUIRE(conn->sending); @@ -300,9 +288,9 @@ control_senddone(isc_task_t *task, isc_event_t *event) conn->sending = false; - if (sevent->result != ISC_R_SUCCESS && - sevent->result != ISC_R_CANCELED) { - char socktext[ISC_SOCKADDR_FORMATSIZE]; + if (sevent->result != ISC_R_SUCCESS && sevent->result != ISC_R_CANCELED) + { + char socktext[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_t peeraddr; (void)isc_socket_getpeername(sock, &peeraddr); @@ -324,9 +312,8 @@ control_senddone(isc_task_t *task, isc_event_t *event) } static inline void -log_invalid(isccc_ccmsg_t *ccmsg, isc_result_t result) -{ - char socktext[ISC_SOCKADDR_FORMATSIZE]; +log_invalid(isccc_ccmsg_t *ccmsg, isc_result_t result) { + char socktext[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_t peeraddr; (void)isc_socket_getpeername(ccmsg->sock, &peeraddr); @@ -338,26 +325,25 @@ log_invalid(isccc_ccmsg_t *ccmsg, isc_result_t result) } static void -control_recvmessage(isc_task_t *task, isc_event_t *event) -{ +control_recvmessage(isc_task_t *task, isc_event_t *event) { controlconnection_t *conn = NULL; - controllistener_t * listener = NULL; - controlkey_t * key = NULL; - isccc_sexpr_t * request = NULL; - isccc_sexpr_t * response = NULL; - uint32_t algorithm; - isccc_region_t secret; - isc_stdtime_t now; - isc_buffer_t b; - isc_region_t r; - isc_buffer_t * text; - isc_result_t result; - isc_result_t eresult; - isccc_sexpr_t * _ctrl = NULL; - isccc_time_t sent; - isccc_time_t exp; - uint32_t nonce; - isccc_sexpr_t * data = NULL; + controllistener_t *listener = NULL; + controlkey_t *key = NULL; + isccc_sexpr_t *request = NULL; + isccc_sexpr_t *response = NULL; + uint32_t algorithm; + isccc_region_t secret; + isc_stdtime_t now; + isc_buffer_t b; + isc_region_t r; + isc_buffer_t *text; + isc_result_t result; + isc_result_t eresult; + isccc_sexpr_t *_ctrl = NULL; + isccc_time_t sent; + isccc_time_t exp; + uint32_t nonce; + isccc_sexpr_t *data = NULL; REQUIRE(event->ev_type == ISCCC_EVENT_CCMSG); @@ -383,7 +369,8 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) request = NULL; for (key = ISC_LIST_HEAD(listener->keys); key != NULL; - key = ISC_LIST_NEXT(key, link)) { + key = ISC_LIST_NEXT(key, link)) + { isccc_region_t ccregion; ccregion.rstart = isc_buffer_base(&conn->ccmsg.buffer); @@ -460,7 +447,8 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) if (conn->nonce != 0 && (isccc_cc_lookupuint32(_ctrl, "_nonce", &nonce) != ISC_R_SUCCESS || - conn->nonce != nonce)) { + conn->nonce != nonce)) + { log_invalid(&conn->ccmsg, ISCCC_R_BADAUTH); goto cleanup_request; } @@ -512,7 +500,8 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) _ctrl = isccc_alist_lookup(response, "_ctrl"); if (_ctrl == NULL || - isccc_cc_defineuint32(_ctrl, "_nonce", conn->nonce) == NULL) { + isccc_cc_defineuint32(_ctrl, "_nonce", conn->nonce) == NULL) + { goto cleanup_response; } @@ -566,8 +555,7 @@ cleanup: } static void -control_timeout(isc_task_t *task, isc_event_t *event) -{ +control_timeout(isc_task_t *task, isc_event_t *event) { controlconnection_t *conn = event->ev_arg; UNUSED(task); @@ -579,11 +567,10 @@ control_timeout(isc_task_t *task, isc_event_t *event) } static isc_result_t -newconnection(controllistener_t *listener, isc_socket_t *sock) -{ +newconnection(controllistener_t *listener, isc_socket_t *sock) { controlconnection_t *conn; - isc_interval_t interval; - isc_result_t result; + isc_interval_t interval; + isc_result_t result; conn = isc_mem_get(listener->mctx, sizeof(*conn)); @@ -636,13 +623,12 @@ cleanup: } static void -control_newconn(isc_task_t *task, isc_event_t *event) -{ +control_newconn(isc_task_t *task, isc_event_t *event) { isc_socket_newconnev_t *nevent = (isc_socket_newconnev_t *)event; - controllistener_t * listener = event->ev_arg; - isc_socket_t * sock; - isc_sockaddr_t peeraddr; - isc_result_t result; + controllistener_t *listener = event->ev_arg; + isc_socket_t *sock; + isc_sockaddr_t peeraddr; + isc_result_t result; UNUSED(task); @@ -660,7 +646,8 @@ control_newconn(isc_task_t *task, isc_event_t *event) isc_socket_setname(sock, "control", NULL); (void)isc_socket_getpeername(sock, &peeraddr); if (listener->type == isc_sockettype_tcp && - !address_ok(&peeraddr, listener->acl)) { + !address_ok(&peeraddr, listener->acl)) + { char socktext[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_format(&peeraddr, socktext, sizeof(socktext)); isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, @@ -690,13 +677,13 @@ cleanup: } static void -controls_shutdown(named_controls_t *controls) -{ +controls_shutdown(named_controls_t *controls) { controllistener_t *listener; controllistener_t *next; for (listener = ISC_LIST_HEAD(controls->listeners); listener != NULL; - listener = next) { + listener = next) + { /* * This is asynchronous. As listeners shut down, they will * call their callbacks. @@ -707,22 +694,21 @@ controls_shutdown(named_controls_t *controls) } void -named_controls_shutdown(named_controls_t *controls) -{ +named_controls_shutdown(named_controls_t *controls) { controls_shutdown(controls); controls->shuttingdown = true; } static isc_result_t cfgkeylist_find(const cfg_obj_t *keylist, const char *keyname, - const cfg_obj_t **objp) -{ + const cfg_obj_t **objp) { const cfg_listelt_t *element; - const char * str; - const cfg_obj_t * obj; + const char *str; + const cfg_obj_t *obj; for (element = cfg_list_first(keylist); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { obj = cfg_listelt_value(element); str = cfg_obj_asstring(cfg_map_getname(obj)); if (strcasecmp(str, keyname) == 0) { @@ -739,16 +725,16 @@ cfgkeylist_find(const cfg_obj_t *keylist, const char *keyname, static void controlkeylist_fromcfg(const cfg_obj_t *keylist, isc_mem_t *mctx, - controlkeylist_t *keyids) -{ + controlkeylist_t *keyids) { const cfg_listelt_t *element; - char * newstr = NULL; - const char * str; - const cfg_obj_t * obj; - controlkey_t * key; + char *newstr = NULL; + const char *str; + const cfg_obj_t *obj; + controlkey_t *key; for (element = cfg_list_first(keylist); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { obj = cfg_listelt_value(element); str = cfg_obj_asstring(obj); newstr = isc_mem_strdup(mctx, str); @@ -765,13 +751,12 @@ controlkeylist_fromcfg(const cfg_obj_t *keylist, isc_mem_t *mctx, static void register_keys(const cfg_obj_t *control, const cfg_obj_t *keylist, - controlkeylist_t *keyids, isc_mem_t *mctx, const char *socktext) -{ - controlkey_t * keyid, *next; + controlkeylist_t *keyids, isc_mem_t *mctx, const char *socktext) { + controlkey_t *keyid, *next; const cfg_obj_t *keydef; - char secret[1024]; - isc_buffer_t b; - isc_result_t result; + char secret[1024]; + isc_buffer_t b; + isc_result_t result; /* * Find the keys corresponding to the keyids used by this listener. @@ -790,9 +775,9 @@ register_keys(const cfg_obj_t *control, const cfg_obj_t *keylist, } else { const cfg_obj_t *algobj = NULL; const cfg_obj_t *secretobj = NULL; - const char * algstr = NULL; - const char * secretstr = NULL; - unsigned int algtype; + const char *algstr = NULL; + const char *secretstr = NULL; + unsigned int algtype; (void)cfg_map_get(keydef, "algorithm", &algobj); (void)cfg_map_get(keydef, "secret", &secretobj); @@ -803,7 +788,8 @@ register_keys(const cfg_obj_t *control, const cfg_obj_t *keylist, if (named_config_getkeyalgorithm2(algstr, NULL, &algtype, NULL) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { cfg_obj_log(control, named_g_lctx, ISC_LOG_WARNING, "unsupported algorithm '%s' in " @@ -832,8 +818,8 @@ register_keys(const cfg_obj_t *control, const cfg_obj_t *keylist, } keyid->secret.length = isc_buffer_usedlength(&b); - keyid->secret.base = - isc_mem_get(mctx, keyid->secret.length); + keyid->secret.base = isc_mem_get(mctx, + keyid->secret.length); memmove(keyid->secret.base, isc_buffer_base(&b), keyid->secret.length); } @@ -848,20 +834,19 @@ register_keys(const cfg_obj_t *control, const cfg_obj_t *keylist, } while (0) static isc_result_t -get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) -{ - isc_result_t result; - cfg_parser_t * pctx = NULL; - cfg_obj_t * config = NULL; +get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) { + isc_result_t result; + cfg_parser_t *pctx = NULL; + cfg_obj_t *config = NULL; const cfg_obj_t *key = NULL; const cfg_obj_t *algobj = NULL; const cfg_obj_t *secretobj = NULL; - const char * algstr = NULL; - const char * secretstr = NULL; - controlkey_t * keyid = NULL; - char secret[1024]; - unsigned int algtype; - isc_buffer_t b; + const char *algstr = NULL; + const char *secretstr = NULL; + controlkey_t *keyid = NULL; + char secret[1024]; + unsigned int algtype; + isc_buffer_t b; isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_CONTROL, ISC_LOG_INFO, @@ -876,8 +861,8 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) CHECK(cfg_map_get(config, "key", &key)); keyid = isc_mem_get(mctx, sizeof(*keyid)); - keyid->keyname = - isc_mem_strdup(mctx, cfg_obj_asstring(cfg_map_getname(key))); + keyid->keyname = isc_mem_strdup(mctx, + cfg_obj_asstring(cfg_map_getname(key))); keyid->secret.base = NULL; keyid->secret.length = 0; keyid->algorithm = DST_ALG_UNKNOWN; @@ -896,7 +881,8 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) secretstr = cfg_obj_asstring(secretobj); if (named_config_getkeyalgorithm2(algstr, NULL, &algtype, NULL) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { cfg_obj_log(key, named_g_lctx, ISC_LOG_WARNING, "unsupported algorithm '%s' in " "key '%s' for use with command " @@ -943,9 +929,8 @@ cleanup: static void get_key_info(const cfg_obj_t *config, const cfg_obj_t *control, const cfg_obj_t **global_keylistp, - const cfg_obj_t **control_keylistp) -{ - isc_result_t result; + const cfg_obj_t **control_keylistp) { + isc_result_t result; const cfg_obj_t *control_keylist = NULL; const cfg_obj_t *global_keylist = NULL; @@ -969,18 +954,18 @@ static void update_listener(named_controls_t *cp, controllistener_t **listenerp, const cfg_obj_t *control, const cfg_obj_t *config, isc_sockaddr_t *addr, cfg_aclconfctx_t *aclconfctx, - const char *socktext, isc_sockettype_t type) -{ + const char *socktext, isc_sockettype_t type) { controllistener_t *listener; - const cfg_obj_t * allow; - const cfg_obj_t * global_keylist = NULL; - const cfg_obj_t * control_keylist = NULL; - dns_acl_t * new_acl = NULL; - controlkeylist_t keys; - isc_result_t result = ISC_R_SUCCESS; + const cfg_obj_t *allow; + const cfg_obj_t *global_keylist = NULL; + const cfg_obj_t *control_keylist = NULL; + dns_acl_t *new_acl = NULL; + controlkeylist_t keys; + isc_result_t result = ISC_R_SUCCESS; for (listener = ISC_LIST_HEAD(cp->listeners); listener != NULL; - listener = ISC_LIST_NEXT(listener, link)) { + listener = ISC_LIST_NEXT(listener, link)) + { if (isc_sockaddr_equal(addr, &listener->address)) { break; } @@ -1097,7 +1082,8 @@ update_listener(named_controls_t *cp, controllistener_t **listenerp, group = cfg_obj_asuint32(cfg_tuple_get(control, "group")); result = ISC_R_SUCCESS; if (listener->perm != perm || listener->owner != owner || - listener->group != group) { + listener->group != group) + { result = isc_socket_permunix(&listener->address, perm, owner, group); } @@ -1120,15 +1106,14 @@ static void add_listener(named_controls_t *cp, controllistener_t **listenerp, const cfg_obj_t *control, const cfg_obj_t *config, isc_sockaddr_t *addr, cfg_aclconfctx_t *aclconfctx, - const char *socktext, isc_sockettype_t type) -{ - isc_mem_t * mctx = cp->server->mctx; + const char *socktext, isc_sockettype_t type) { + isc_mem_t *mctx = cp->server->mctx; controllistener_t *listener; - const cfg_obj_t * allow; - const cfg_obj_t * global_keylist = NULL; - const cfg_obj_t * control_keylist = NULL; - dns_acl_t * new_acl = NULL; - isc_result_t result = ISC_R_SUCCESS; + const cfg_obj_t *allow; + const cfg_obj_t *global_keylist = NULL; + const cfg_obj_t *control_keylist = NULL; + dns_acl_t *new_acl = NULL; + isc_result_t result = ISC_R_SUCCESS; listener = isc_mem_get(mctx, sizeof(*listener)); @@ -1205,7 +1190,8 @@ add_listener(named_controls_t *cp, controllistener_t **listenerp, #ifdef ISC_PLATFORM_HAVESYSUNH (pf == AF_UNIX && isc_net_probeunix() != ISC_R_SUCCESS) || #endif /* ifdef ISC_PLATFORM_HAVESYSUNH */ - (pf == AF_INET6 && isc_net_probeipv6() != ISC_R_SUCCESS)) { + (pf == AF_INET6 && isc_net_probeipv6() != ISC_R_SUCCESS)) + { result = ISC_R_FAMILYNOSUPPORT; } } @@ -1282,13 +1268,12 @@ add_listener(named_controls_t *cp, controllistener_t **listenerp, isc_result_t named_controls_configure(named_controls_t *cp, const cfg_obj_t *config, - cfg_aclconfctx_t *aclconfctx) -{ - controllistener_t * listener; + cfg_aclconfctx_t *aclconfctx) { + controllistener_t *listener; controllistenerlist_t new_listeners; - const cfg_obj_t * controlslist = NULL; - const cfg_listelt_t * element, *element2; - char socktext[ISC_SOCKADDR_FORMATSIZE]; + const cfg_obj_t *controlslist = NULL; + const cfg_listelt_t *element, *element2; + char socktext[ISC_SOCKADDR_FORMATSIZE]; ISC_LIST_INIT(new_listeners); @@ -1307,7 +1292,8 @@ named_controls_configure(named_controls_t *cp, const cfg_obj_t *config, */ if (controlslist != NULL) { for (element = cfg_list_first(controlslist); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *controls; const cfg_obj_t *inetcontrols = NULL; @@ -1319,10 +1305,11 @@ named_controls_configure(named_controls_t *cp, const cfg_obj_t *config, for (element2 = cfg_list_first(inetcontrols); element2 != NULL; - element2 = cfg_list_next(element2)) { + element2 = cfg_list_next(element2)) + { const cfg_obj_t *control; const cfg_obj_t *obj; - isc_sockaddr_t addr; + isc_sockaddr_t addr; /* * The parser handles BIND 8 configuration file @@ -1376,7 +1363,8 @@ named_controls_configure(named_controls_t *cp, const cfg_obj_t *config, } } for (element = cfg_list_first(controlslist); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *controls; const cfg_obj_t *unixcontrols = NULL; @@ -1388,11 +1376,12 @@ named_controls_configure(named_controls_t *cp, const cfg_obj_t *config, for (element2 = cfg_list_first(unixcontrols); element2 != NULL; - element2 = cfg_list_next(element2)) { + element2 = cfg_list_next(element2)) + { const cfg_obj_t *control; const cfg_obj_t *path; - isc_sockaddr_t addr; - isc_result_t result; + isc_sockaddr_t addr; + isc_result_t result; /* * The parser handles BIND 8 configuration file @@ -1518,10 +1507,9 @@ named_controls_configure(named_controls_t *cp, const cfg_obj_t *config, } isc_result_t -named_controls_create(named_server_t *server, named_controls_t **ctrlsp) -{ - isc_mem_t * mctx = server->mctx; - isc_result_t result; +named_controls_create(named_server_t *server, named_controls_t **ctrlsp) { + isc_mem_t *mctx = server->mctx; + isc_result_t result; named_controls_t *controls = isc_mem_get(mctx, sizeof(*controls)); if (controls == NULL) { @@ -1541,8 +1529,7 @@ named_controls_create(named_server_t *server, named_controls_t **ctrlsp) } void -named_controls_destroy(named_controls_t **ctrlsp) -{ +named_controls_destroy(named_controls_t **ctrlsp) { named_controls_t *controls = *ctrlsp; *ctrlsp = NULL; diff --git a/bin/named/fuzz.c b/bin/named/fuzz.c index 69a005e0fd..f79d69df6a 100644 --- a/bin/named/fuzz.c +++ b/bin/named/fuzz.c @@ -40,9 +40,9 @@ * unthreaded version of BIND, where all thread functions are * mocks. Since AFL for now only works on Linux it's not a problem. */ -static pthread_cond_t cond; +static pthread_cond_t cond; static pthread_mutex_t mutex; -static bool ready; +static bool ready; /* * In "client:" mode, this thread reads fuzzed query messages from AFL @@ -51,13 +51,12 @@ static bool ready; * test named from the client side. */ static void * -fuzz_thread_client(void *arg) -{ - char * host; - char * port; +fuzz_thread_client(void *arg) { + char *host; + char *port; struct sockaddr_in servaddr; - int sockfd; - void * buf; + int sockfd; + void *buf; UNUSED(arg); @@ -180,9 +179,8 @@ fuzz_thread_client(void *arg) * named(resolver) when being fuzzed will not cache answers. */ static void * -fuzz_thread_resolver(void *arg) -{ - char * sqtype, *shost, *sport, *rhost, *rport; +fuzz_thread_resolver(void *arg) { + char *sqtype, *shost, *sport, *rhost, *rport; struct sockaddr_in servaddr, recaddr, recvaddr; /* * Query for aaaaaaaaaa.example./A in wire format with RD=1, @@ -267,15 +265,15 @@ fuzz_thread_resolver(void *arg) 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00 }; - int sockfd; - int listenfd; - int loop; - uint16_t qtype; - char * buf, *rbuf; - char * nameptr; + int sockfd; + int listenfd; + int loop; + uint16_t qtype; + char *buf, *rbuf; + char *nameptr; unsigned int i; - uint8_t llen; - uint64_t seed; + uint8_t llen; + uint64_t seed; UNUSED(arg); @@ -354,10 +352,10 @@ fuzz_thread_resolver(void *arg) * the app. */ for (loop = 0; loop < 100000; loop++) { - ssize_t length; - ssize_t sent; + ssize_t length; + ssize_t sent; unsigned short id; - socklen_t socklen; + socklen_t socklen; memset(buf, 0, 12); length = read(0, buf, 65536); @@ -450,7 +448,8 @@ fuzz_thread_resolver(void *arg) /* Skip the name to get to the qtype */ i = 0; while (((llen = nameptr[i]) != 0) && (i < 255) && - (((nameptr + i + 1 + llen) - buf) < length)) { + (((nameptr + i + 1 + llen) - buf) < length)) + { i += 1 + llen; } @@ -477,10 +476,10 @@ fuzz_thread_resolver(void *arg) /* We might get additional questions here (e.g. for CNAME). */ for (;;) { - fd_set fds; + fd_set fds; struct timeval tv; - int rv; - int max; + int rv; + int max; FD_ZERO(&fds); FD_SET(listenfd, &fds); @@ -523,7 +522,8 @@ fuzz_thread_resolver(void *arg) /* Skip the name to get to the qtype */ i = 0; while (((llen = nameptr[i]) != 0) && (i < 255) && - (((nameptr + i + 1 + llen) - buf) < length)) { + (((nameptr + i + 1 + llen) - buf) < length)) + { i += 1 + llen; } @@ -597,14 +597,13 @@ fuzz_thread_resolver(void *arg) * client side. */ static void * -fuzz_thread_tcp(void *arg) -{ - char * host; - char * port; +fuzz_thread_tcp(void *arg) { + char *host; + char *port; struct sockaddr_in servaddr; - int sockfd; - char * buf; - int loop; + int sockfd; + char *buf; + int loop; UNUSED(arg); @@ -645,8 +644,8 @@ fuzz_thread_tcp(void *arg) for (loop = 0; loop < 100000; loop++) { ssize_t length; ssize_t sent; - int yes; - int r; + int yes; + int r; if (named_g_fuzz_type == isc_fuzz_tcpclient) { /* @@ -728,8 +727,7 @@ fuzz_thread_tcp(void *arg) * and process the next item from AFL. */ void -named_fuzz_notify(void) -{ +named_fuzz_notify(void) { #ifdef ENABLE_AFL if (getenv("AFL_CMIN")) { named_server_flushonshutdown(named_g_server, false); @@ -749,8 +747,7 @@ named_fuzz_notify(void) } void -named_fuzz_setup(void) -{ +named_fuzz_setup(void) { #ifdef ENABLE_AFL if (getenv("__AFL_PERSISTENT") || getenv("AFL_CMIN")) { pthread_t thread; diff --git a/bin/named/geoip.c b/bin/named/geoip.c index 97b91e05b3..b5bd3c6d6c 100644 --- a/bin/named/geoip.c +++ b/bin/named/geoip.c @@ -30,11 +30,10 @@ static dns_geoip_databases_t geoip_table; static MMDB_s geoip_country, geoip_city, geoip_as, geoip_isp, geoip_domain; static MMDB_s * -open_geoip2(const char *dir, const char *dbfile, MMDB_s *mmdb) -{ - char pathbuf[PATH_MAX]; +open_geoip2(const char *dir, const char *dbfile, MMDB_s *mmdb) { + char pathbuf[PATH_MAX]; unsigned int n; - int ret; + int ret; n = snprintf(pathbuf, sizeof(pathbuf), "%s/%s", dir, dbfile); if (n >= sizeof(pathbuf)) { @@ -63,8 +62,7 @@ open_geoip2(const char *dir, const char *dbfile, MMDB_s *mmdb) #endif /* HAVE_GEOIP2 */ void -named_geoip_init(void) -{ +named_geoip_init(void) { #if defined(HAVE_GEOIP2) if (named_g_geoip == NULL) { named_g_geoip = &geoip_table; @@ -75,8 +73,7 @@ named_geoip_init(void) } void -named_geoip_load(char *dir) -{ +named_geoip_load(char *dir) { #if defined(HAVE_GEOIP2) REQUIRE(dir != NULL); @@ -84,8 +81,8 @@ named_geoip_load(char *dir) NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "looking for GeoIP2 databases in '%s'", dir); - named_g_geoip->country = - open_geoip2(dir, "GeoIP2-Country.mmdb", &geoip_country); + named_g_geoip->country = open_geoip2(dir, "GeoIP2-Country.mmdb", + &geoip_country); if (named_g_geoip->country == NULL) { named_g_geoip->country = open_geoip2( dir, "GeoLite2-Country.mmdb", &geoip_country); @@ -93,19 +90,19 @@ named_geoip_load(char *dir) named_g_geoip->city = open_geoip2(dir, "GeoIP2-City.mmdb", &geoip_city); if (named_g_geoip->city == NULL) { - named_g_geoip->city = - open_geoip2(dir, "GeoLite2-City.mmdb", &geoip_city); + named_g_geoip->city = open_geoip2(dir, "GeoLite2-City.mmdb", + &geoip_city); } named_g_geoip->as = open_geoip2(dir, "GeoIP2-ASN.mmdb", &geoip_as); if (named_g_geoip->as == NULL) { - named_g_geoip->as = - open_geoip2(dir, "GeoLite2-ASN.mmdb", &geoip_as); + named_g_geoip->as = open_geoip2(dir, "GeoLite2-ASN.mmdb", + &geoip_as); } named_g_geoip->isp = open_geoip2(dir, "GeoIP2-ISP.mmdb", &geoip_isp); - named_g_geoip->domain = - open_geoip2(dir, "GeoIP2-Domain.mmdb", &geoip_domain); + named_g_geoip->domain = open_geoip2(dir, "GeoIP2-Domain.mmdb", + &geoip_domain); #else /* if defined(HAVE_GEOIP2) */ UNUSED(dir); @@ -114,8 +111,7 @@ named_geoip_load(char *dir) } void -named_geoip_unload(void) -{ +named_geoip_unload(void) { #ifdef HAVE_GEOIP2 if (named_g_geoip->country != NULL) { MMDB_close(named_g_geoip->country); @@ -141,8 +137,7 @@ named_geoip_unload(void) } void -named_geoip_shutdown(void) -{ +named_geoip_shutdown(void) { #ifdef HAVE_GEOIP2 named_geoip_unload(); #endif /* HAVE_GEOIP2 */ diff --git a/bin/named/include/named/control.h b/bin/named/include/named/control.h index 1bf7750cf1..99fe916d0e 100644 --- a/bin/named/include/named/control.h +++ b/bin/named/include/named/control.h @@ -26,49 +26,49 @@ #define NAMED_CONTROL_PORT 953 -#define NAMED_COMMAND_STOP "stop" -#define NAMED_COMMAND_HALT "halt" -#define NAMED_COMMAND_RELOAD "reload" -#define NAMED_COMMAND_RECONFIG "reconfig" -#define NAMED_COMMAND_REFRESH "refresh" -#define NAMED_COMMAND_RETRANSFER "retransfer" -#define NAMED_COMMAND_DUMPSTATS "stats" -#define NAMED_COMMAND_QUERYLOG "querylog" -#define NAMED_COMMAND_DUMPDB "dumpdb" -#define NAMED_COMMAND_SECROOTS "secroots" -#define NAMED_COMMAND_TRACE "trace" -#define NAMED_COMMAND_NOTRACE "notrace" -#define NAMED_COMMAND_FLUSH "flush" -#define NAMED_COMMAND_FLUSHNAME "flushname" -#define NAMED_COMMAND_FLUSHTREE "flushtree" -#define NAMED_COMMAND_STATUS "status" -#define NAMED_COMMAND_TSIGLIST "tsig-list" -#define NAMED_COMMAND_TSIGDELETE "tsig-delete" -#define NAMED_COMMAND_FREEZE "freeze" -#define NAMED_COMMAND_UNFREEZE "unfreeze" -#define NAMED_COMMAND_THAW "thaw" -#define NAMED_COMMAND_TIMERPOKE "timerpoke" -#define NAMED_COMMAND_RECURSING "recursing" -#define NAMED_COMMAND_NULL "null" -#define NAMED_COMMAND_NOTIFY "notify" -#define NAMED_COMMAND_VALIDATION "validation" -#define NAMED_COMMAND_SCAN "scan" -#define NAMED_COMMAND_SIGN "sign" -#define NAMED_COMMAND_LOADKEYS "loadkeys" -#define NAMED_COMMAND_ADDZONE "addzone" -#define NAMED_COMMAND_MODZONE "modzone" -#define NAMED_COMMAND_DELZONE "delzone" -#define NAMED_COMMAND_SHOWZONE "showzone" -#define NAMED_COMMAND_SYNC "sync" -#define NAMED_COMMAND_SIGNING "signing" -#define NAMED_COMMAND_ZONESTATUS "zonestatus" -#define NAMED_COMMAND_NTA "nta" -#define NAMED_COMMAND_TESTGEN "testgen" -#define NAMED_COMMAND_MKEYS "managed-keys" +#define NAMED_COMMAND_STOP "stop" +#define NAMED_COMMAND_HALT "halt" +#define NAMED_COMMAND_RELOAD "reload" +#define NAMED_COMMAND_RECONFIG "reconfig" +#define NAMED_COMMAND_REFRESH "refresh" +#define NAMED_COMMAND_RETRANSFER "retransfer" +#define NAMED_COMMAND_DUMPSTATS "stats" +#define NAMED_COMMAND_QUERYLOG "querylog" +#define NAMED_COMMAND_DUMPDB "dumpdb" +#define NAMED_COMMAND_SECROOTS "secroots" +#define NAMED_COMMAND_TRACE "trace" +#define NAMED_COMMAND_NOTRACE "notrace" +#define NAMED_COMMAND_FLUSH "flush" +#define NAMED_COMMAND_FLUSHNAME "flushname" +#define NAMED_COMMAND_FLUSHTREE "flushtree" +#define NAMED_COMMAND_STATUS "status" +#define NAMED_COMMAND_TSIGLIST "tsig-list" +#define NAMED_COMMAND_TSIGDELETE "tsig-delete" +#define NAMED_COMMAND_FREEZE "freeze" +#define NAMED_COMMAND_UNFREEZE "unfreeze" +#define NAMED_COMMAND_THAW "thaw" +#define NAMED_COMMAND_TIMERPOKE "timerpoke" +#define NAMED_COMMAND_RECURSING "recursing" +#define NAMED_COMMAND_NULL "null" +#define NAMED_COMMAND_NOTIFY "notify" +#define NAMED_COMMAND_VALIDATION "validation" +#define NAMED_COMMAND_SCAN "scan" +#define NAMED_COMMAND_SIGN "sign" +#define NAMED_COMMAND_LOADKEYS "loadkeys" +#define NAMED_COMMAND_ADDZONE "addzone" +#define NAMED_COMMAND_MODZONE "modzone" +#define NAMED_COMMAND_DELZONE "delzone" +#define NAMED_COMMAND_SHOWZONE "showzone" +#define NAMED_COMMAND_SYNC "sync" +#define NAMED_COMMAND_SIGNING "signing" +#define NAMED_COMMAND_ZONESTATUS "zonestatus" +#define NAMED_COMMAND_NTA "nta" +#define NAMED_COMMAND_TESTGEN "testgen" +#define NAMED_COMMAND_MKEYS "managed-keys" #define NAMED_COMMAND_DNSTAPREOPEN "dnstap-reopen" -#define NAMED_COMMAND_DNSTAP "dnstap" -#define NAMED_COMMAND_TCPTIMEOUTS "tcp-timeouts" -#define NAMED_COMMAND_SERVESTALE "serve-stale" +#define NAMED_COMMAND_DNSTAP "dnstap" +#define NAMED_COMMAND_TCPTIMEOUTS "tcp-timeouts" +#define NAMED_COMMAND_SERVESTALE "serve-stale" isc_result_t named_controls_create(named_server_t *server, named_controls_t **ctrlsp); diff --git a/bin/named/include/named/log.h b/bin/named/include/named/log.h index 7245130bbc..1cc8414e1f 100644 --- a/bin/named/include/named/log.h +++ b/bin/named/include/named/log.h @@ -29,8 +29,8 @@ */ #define NAMED_LOGCATEGORY_GENERAL ISC_LOGCATEGORY_GENERAL -#define NAMED_LOGMODULE_MAIN (&named_g_modules[0]) -#define NAMED_LOGMODULE_SERVER (&named_g_modules[1]) +#define NAMED_LOGMODULE_MAIN (&named_g_modules[0]) +#define NAMED_LOGMODULE_SERVER (&named_g_modules[1]) #define NAMED_LOGMODULE_CONTROL (&named_g_modules[2]) isc_result_t diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h index d27e8472c0..e89c3b66be 100644 --- a/bin/named/include/named/server.h +++ b/bin/named/include/named/server.h @@ -35,8 +35,8 @@ #include -#define NAMED_EVENTCLASS ISC_EVENTCLASS(0x4E43) -#define NAMED_EVENT_RELOAD (NAMED_EVENTCLASS + 0) +#define NAMED_EVENTCLASS ISC_EVENTCLASS(0x4E43) +#define NAMED_EVENT_RELOAD (NAMED_EVENTCLASS + 0) #define NAMED_EVENT_DELZONE (NAMED_EVENTCLASS + 1) /*% @@ -112,7 +112,7 @@ struct named_server { char *lockfile; }; -#define NAMED_SERVER_MAGIC ISC_MAGIC('S', 'V', 'E', 'R') +#define NAMED_SERVER_MAGIC ISC_MAGIC('S', 'V', 'E', 'R') #define NAMED_SERVER_VALID(s) ISC_MAGIC_VALID(s, NAMED_SERVER_MAGIC) void diff --git a/bin/named/log.c b/bin/named/log.c index 6d0ddb7bab..e36fd0e2f8 100644 --- a/bin/named/log.c +++ b/bin/named/log.c @@ -43,9 +43,8 @@ static isc_logmodule_t modules[] = { }; isc_result_t -named_log_init(bool safe) -{ - isc_result_t result; +named_log_init(bool safe) { + isc_result_t result; isc_logconfig_t *lcfg = NULL; named_g_categories = categories; @@ -96,9 +95,8 @@ cleanup: } isc_result_t -named_log_setdefaultchannels(isc_logconfig_t *lcfg) -{ - isc_result_t result; +named_log_setdefaultchannels(isc_logconfig_t *lcfg) { + isc_result_t result; isc_logdestination_t destination; /* @@ -155,9 +153,8 @@ cleanup: } isc_result_t -named_log_setsafechannels(isc_logconfig_t *lcfg) -{ - isc_result_t result; +named_log_setsafechannels(isc_logconfig_t *lcfg) { + isc_result_t result; isc_logdestination_t destination; if (!named_g_logstderr) { @@ -208,8 +205,7 @@ cleanup: } isc_result_t -named_log_setdefaultcategory(isc_logconfig_t *lcfg) -{ +named_log_setdefaultcategory(isc_logconfig_t *lcfg) { isc_result_t result = ISC_R_SUCCESS; result = isc_log_usechannel(lcfg, "default_debug", @@ -235,8 +231,7 @@ cleanup: } isc_result_t -named_log_setunmatchedcategory(isc_logconfig_t *lcfg) -{ +named_log_setunmatchedcategory(isc_logconfig_t *lcfg) { isc_result_t result; result = isc_log_usechannel(lcfg, "null", NAMED_LOGCATEGORY_UNMATCHED, @@ -245,8 +240,7 @@ named_log_setunmatchedcategory(isc_logconfig_t *lcfg) } void -named_log_shutdown(void) -{ +named_log_shutdown(void) { isc_log_destroy(&named_g_lctx); isc_log_setcontext(NULL); dns_log_setcontext(NULL); diff --git a/bin/named/logconf.c b/bin/named/logconf.c index 8acf59f4b1..798033fbe1 100644 --- a/bin/named/logconf.c +++ b/bin/named/logconf.c @@ -41,13 +41,12 @@ * in 'ccat' and add it to 'logconfig'. */ static isc_result_t -category_fromconf(const cfg_obj_t *ccat, isc_logconfig_t *logconfig) -{ - isc_result_t result; - const char * catname; - isc_logcategory_t * category; - isc_logmodule_t * module; - const cfg_obj_t * destinations = NULL; +category_fromconf(const cfg_obj_t *ccat, isc_logconfig_t *logconfig) { + isc_result_t result; + const char *catname; + isc_logcategory_t *category; + isc_logmodule_t *module; + const cfg_obj_t *destinations = NULL; const cfg_listelt_t *element = NULL; catname = cfg_obj_asstring(cfg_tuple_get(ccat, "name")); @@ -69,9 +68,10 @@ category_fromconf(const cfg_obj_t *ccat, isc_logconfig_t *logconfig) destinations = cfg_tuple_get(ccat, "destinations"); for (element = cfg_list_first(destinations); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *channel = cfg_listelt_value(element); - const char * channelname = cfg_obj_asstring(channel); + const char *channelname = cfg_obj_asstring(channel); result = isc_log_usechannel(logconfig, channelname, category, module); @@ -91,20 +91,19 @@ category_fromconf(const cfg_obj_t *ccat, isc_logconfig_t *logconfig) * in 'cchan' and add it to 'logconfig'. */ static isc_result_t -channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *logconfig) -{ - isc_result_t result; +channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *logconfig) { + isc_result_t result; isc_logdestination_t dest; - unsigned int type; - unsigned int flags = 0; - int level; - const char * channelname; - const cfg_obj_t * fileobj = NULL; - const cfg_obj_t * syslogobj = NULL; - const cfg_obj_t * nullobj = NULL; - const cfg_obj_t * stderrobj = NULL; - const cfg_obj_t * severity = NULL; - int i; + unsigned int type; + unsigned int flags = 0; + int level; + const char *channelname; + const cfg_obj_t *fileobj = NULL; + const cfg_obj_t *syslogobj = NULL; + const cfg_obj_t *nullobj = NULL; + const cfg_obj_t *stderrobj = NULL; + const cfg_obj_t *severity = NULL; + int i; channelname = cfg_obj_asstring(cfg_map_getname(channel)); @@ -143,10 +142,10 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *logconfig) const cfg_obj_t *versionsobj = cfg_tuple_get(fileobj, "version" "s"); const cfg_obj_t *suffixobj = cfg_tuple_get(fileobj, "suffix"); - int32_t versions = ISC_LOG_ROLLNEVER; + int32_t versions = ISC_LOG_ROLLNEVER; isc_log_rollsuffix_t suffix = isc_log_rollsuffix_increment; - isc_offset_t size = 0; - uint64_t maxoffset; + isc_offset_t size = 0; + uint64_t maxoffset; /* * isc_offset_t is a signed integer type, so the maximum @@ -170,17 +169,19 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *logconfig) versions = cfg_obj_asuint32(versionsobj); } else if (versionsobj != NULL && cfg_obj_isstring(versionsobj) && - strcasecmp(cfg_obj_asstring(versionsobj), - "unlimite" - "d") == 0) { + strcasecmp(cfg_obj_asstring(versionsobj), "unlimite" + "d") == 0) + { versions = ISC_LOG_ROLLINFINITE; } if (sizeobj != NULL && cfg_obj_isuint64(sizeobj) && - cfg_obj_asuint64(sizeobj) < maxoffset) { + cfg_obj_asuint64(sizeobj) < maxoffset) + { size = (isc_offset_t)cfg_obj_asuint64(sizeobj); } if (suffixobj != NULL && cfg_obj_isstring(suffixobj) && - strcasecmp(cfg_obj_asstring(suffixobj), "timestamp") == 0) { + strcasecmp(cfg_obj_asstring(suffixobj), "timestamp") == 0) + { suffix = isc_log_rollsuffix_timestamp; } @@ -322,15 +323,14 @@ done: } isc_result_t -named_logconfig(isc_logconfig_t *logconfig, const cfg_obj_t *logstmt) -{ - isc_result_t result; - const cfg_obj_t * channels = NULL; - const cfg_obj_t * categories = NULL; +named_logconfig(isc_logconfig_t *logconfig, const cfg_obj_t *logstmt) { + isc_result_t result; + const cfg_obj_t *channels = NULL; + const cfg_obj_t *categories = NULL; const cfg_listelt_t *element; - bool default_set = false; - bool unmatched_set = false; - const cfg_obj_t * catname; + bool default_set = false; + bool unmatched_set = false; + const cfg_obj_t *catname; if (logconfig != NULL) { CHECK(named_log_setdefaultchannels(logconfig)); @@ -338,14 +338,16 @@ named_logconfig(isc_logconfig_t *logconfig, const cfg_obj_t *logstmt) (void)cfg_map_get(logstmt, "channel", &channels); for (element = cfg_list_first(channels); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *channel = cfg_listelt_value(element); CHECK(channel_fromconf(channel, logconfig)); } (void)cfg_map_get(logstmt, "category", &categories); for (element = cfg_list_first(categories); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *category = cfg_listelt_value(element); CHECK(category_fromconf(category, logconfig)); if (!default_set) { @@ -356,8 +358,8 @@ named_logconfig(isc_logconfig_t *logconfig, const cfg_obj_t *logstmt) } if (!unmatched_set) { catname = cfg_tuple_get(category, "name"); - if (strcmp(cfg_obj_asstring(catname), "unmatched") == - 0) { + if (strcmp(cfg_obj_asstring(catname), "unmatched") == 0) + { unmatched_set = true; } } diff --git a/bin/named/main.c b/bin/named/main.c index f044689f55..7612618c04 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -112,19 +112,19 @@ #define BACKTRACE_MAXFRAME 128 #endif /* ifndef BACKTRACE_MAXFRAME */ -LIBISC_EXTERNAL_DATA extern int isc_dscp_check_value; +LIBISC_EXTERNAL_DATA extern int isc_dscp_check_value; LIBDNS_EXTERNAL_DATA extern unsigned int dns_zone_mkey_hour; LIBDNS_EXTERNAL_DATA extern unsigned int dns_zone_mkey_day; LIBDNS_EXTERNAL_DATA extern unsigned int dns_zone_mkey_month; -static bool want_stats = false; -static char program_name[NAME_MAX] = "named"; -static char absolute_conffile[PATH_MAX]; -static char saved_command_line[4096] = { 0 }; -static char ellipsis[5] = { 0 }; -static char version[512]; +static bool want_stats = false; +static char program_name[NAME_MAX] = "named"; +static char absolute_conffile[PATH_MAX]; +static char saved_command_line[4096] = { 0 }; +static char ellipsis[5] = { 0 }; +static char version[512]; static unsigned int maxsocks = 0; -static int maxudp = 0; +static int maxudp = 0; /* * -T options: @@ -148,8 +148,7 @@ static bool disable6 = false; static bool disable4 = false; void -named_main_earlywarning(const char *format, ...) -{ +named_main_earlywarning(const char *format, ...) { va_list args; va_start(args, format); @@ -167,8 +166,7 @@ named_main_earlywarning(const char *format, ...) } void -named_main_earlyfatal(const char *format, ...) -{ +named_main_earlyfatal(const char *format, ...) { va_list args; va_start(args, format); @@ -196,13 +194,12 @@ assertion_failed(const char *file, int line, isc_assertiontype_t type, static void assertion_failed(const char *file, int line, isc_assertiontype_t type, - const char *cond) -{ - void * tracebuf[BACKTRACE_MAXFRAME]; - int i, nframes; + const char *cond) { + void *tracebuf[BACKTRACE_MAXFRAME]; + int i, nframes; isc_result_t result; - const char * logsuffix = ""; - const char * fname; + const char *logsuffix = ""; + const char *fname; /* * Handle assertion failures. @@ -271,8 +268,7 @@ library_fatal_error(const char *file, int line, const char *format, static void library_fatal_error(const char *file, int line, const char *format, - va_list args) -{ + va_list args) { /* * Handle isc_error_fatal() calls from our libraries. */ @@ -306,14 +302,13 @@ 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, - va_list args) -{ + va_list args) { /* * Handle isc_error_unexpected() calls from our libraries. */ @@ -334,8 +329,7 @@ library_unexpected_error(const char *file, int line, const char *format, } static void -usage(void) -{ +usage(void) { fprintf(stderr, "usage: named [-4|-6] [-c conffile] [-d debuglevel] " "[-E engine] [-f|-g]\n" " [-n number_of_cpus] [-p port] [-s] " @@ -346,23 +340,23 @@ usage(void) } static void -save_command_line(int argc, char *argv[]) -{ - int i; +save_command_line(int argc, char *argv[]) { + int i; char *dst = saved_command_line; char *eob = saved_command_line + sizeof(saved_command_line) - 1; char *rollback = dst; for (i = 1; i < argc && dst < eob; i++) { char *src = argv[i]; - bool quoted = false; + bool quoted = false; rollback = dst; *dst++ = ' '; while (*src != '\0' && dst < eob) { if (isalnum(*src) || *src == ',' || *src == '-' || - *src == '_' || *src == '.' || *src == '/') { + *src == '_' || *src == '.' || *src == '/') + { *dst++ = *src++; } else if (isprint(*src)) { if (dst + 2 >= eob) { @@ -391,8 +385,8 @@ save_command_line(int argc, char *argv[]) continue; } else { char tmp[5]; - int c = snprintf(tmp, sizeof(tmp), - "\\%03o", *src++); + int c = snprintf(tmp, sizeof(tmp), + "\\%03o", *src++); if (dst + c >= eob) { goto add_ellipsis; } @@ -419,10 +413,9 @@ add_ellipsis: } static int -parse_int(char *arg, const char *desc) -{ - char * endp; - int tmp; +parse_int(char *arg, const char *desc) { + char *endp; + int tmp; long int ltmp; ltmp = strtol(arg, &endp, 10); @@ -437,9 +430,9 @@ parse_int(char *arg, const char *desc) } static struct flag_def { - const char * name; + const char *name; unsigned int value; - bool negate; + bool negate; } mem_debug_flags[] = { { "none", 0, false }, { "trace", ISC_MEM_DEBUGTRACE, false }, { "record", ISC_MEM_DEBUGRECORD, false }, @@ -453,14 +446,13 @@ static struct flag_def { { NULL, 0, false } }; static void -set_flags(const char *arg, struct flag_def *defs, unsigned int *ret) -{ +set_flags(const char *arg, struct flag_def *defs, unsigned int *ret) { bool clear = false; for (;;) { const struct flag_def *def; - const char * end = strchr(arg, ','); - int arglen; + const char *end = strchr(arg, ','); + int arglen; if (end == NULL) { end = arg + strlen(arg); } @@ -493,13 +485,12 @@ set_flags(const char *arg, struct flag_def *defs, unsigned int *ret) } static void -printversion(bool verbose) -{ +printversion(bool verbose) { char rndcconf[PATH_MAX], *dot = NULL; #if defined(HAVE_GEOIP2) - isc_mem_t * mctx = NULL; - cfg_parser_t * parser = NULL; - cfg_obj_t * config = NULL; + isc_mem_t *mctx = NULL; + cfg_parser_t *parser = NULL; + cfg_obj_t *config = NULL; const cfg_obj_t *defaults = NULL, *obj = NULL; #endif /* if defined(HAVE_GEOIP2) */ @@ -604,8 +595,7 @@ printversion(bool verbose) } static void -parse_fuzz_arg(void) -{ +parse_fuzz_arg(void) { if (!strncmp(isc_commandline_argument, "client:", 7)) { named_g_fuzz_addr = isc_commandline_argument + 7; named_g_fuzz_type = isc_fuzz_client; @@ -628,10 +618,9 @@ parse_fuzz_arg(void) } static void -parse_T_opt(char *option) -{ +parse_T_opt(char *option) { const char *p; - char * last = NULL; + char *last = NULL; /* * force the server to behave (or misbehave) in * specified ways for testing purposes. @@ -716,10 +705,9 @@ parse_T_opt(char *option) } static void -parse_command_line(int argc, char *argv[]) -{ - int ch; - int port; +parse_command_line(int argc, char *argv[]) { + int ch; + int port; const char *p; save_command_line(argc, argv); @@ -729,8 +717,8 @@ parse_command_line(int argc, char *argv[]) * both by named and by ntservice hooks. */ isc_commandline_errprint = false; - while ((ch = isc_commandline_parse(argc, argv, NAMED_MAIN_ARGS)) != - -1) { + while ((ch = isc_commandline_parse(argc, argv, NAMED_MAIN_ARGS)) != -1) + { switch (ch) { case '4': if (disable4) { @@ -891,8 +879,7 @@ parse_command_line(int argc, char *argv[]) } static isc_result_t -create_managers(void) -{ +create_managers(void) { isc_result_t result; unsigned int socks; @@ -971,8 +958,7 @@ create_managers(void) } static void -destroy_managers(void) -{ +destroy_managers(void) { /* * isc_nm_closedown() closes all active connections, freeing * attached clients and other resources and preventing new @@ -995,12 +981,11 @@ destroy_managers(void) } static void -dump_symboltable(void) -{ - int i; +dump_symboltable(void) { + int i; isc_result_t result; - const char * fname; - const void * addr; + const char *fname; + const void *addr; if (isc__backtrace_nsymbols == 0) { return; @@ -1026,11 +1011,10 @@ dump_symboltable(void) } static void -setup(void) -{ - isc_result_t result; +setup(void) { + isc_result_t result; isc_resourcevalue_t old_openfiles; - ns_server_t * sctx; + ns_server_t *sctx; #ifdef HAVE_LIBSCF char *instance = NULL; #endif /* ifdef HAVE_LIBSCF */ @@ -1360,8 +1344,7 @@ setup(void) } static void -cleanup(void) -{ +cleanup(void) { destroy_managers(); if (named_g_mapped != NULL) { @@ -1398,8 +1381,7 @@ cleanup(void) static char *memstats = NULL; void -named_main_setmemstats(const char *filename) -{ +named_main_setmemstats(const char *filename) { /* * Caller has to ensure locking. */ @@ -1421,11 +1403,10 @@ named_main_setmemstats(const char *filename) * Get FMRI for the named process. */ isc_result_t -named_smf_get_instance(char **ins_name, int debug, isc_mem_t *mctx) -{ +named_smf_get_instance(char **ins_name, int debug, isc_mem_t *mctx) { scf_handle_t *h = NULL; - int namelen; - char * instance; + int namelen; + char *instance; REQUIRE(ins_name != NULL && *ins_name == NULL); @@ -1487,8 +1468,7 @@ named_smf_get_instance(char **ins_name, int debug, isc_mem_t *mctx) /* main entry point, possibly hooked */ int -main(int argc, char *argv[]) -{ +main(int argc, char *argv[]) { isc_result_t result; #ifdef HAVE_LIBSCF char *instance = NULL; @@ -1571,7 +1551,8 @@ main(int argc, char *argv[]) int len = strlen(named_g_chrootdir); if (strncmp(named_g_chrootdir, named_g_conffile, len) == 0 && (named_g_conffile[len] == '/' || - named_g_conffile[len] == '\\')) { + named_g_conffile[len] == '\\')) + { named_main_earlywarning("config filename (-c %s) " "contains chroot path (-t %s)", named_g_conffile, diff --git a/bin/named/server.c b/bin/named/server.c index cd0beff41d..0aded57485 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -127,13 +127,13 @@ #ifdef HAVE_LMDB #include -#define count_newzones count_newzones_db +#define count_newzones count_newzones_db #define configure_newzones configure_newzones_db -#define dumpzone dumpzone_db +#define dumpzone dumpzone_db #else /* HAVE_LMDB */ -#define count_newzones count_newzones_file +#define count_newzones count_newzones_file #define configure_newzones configure_newzones_file -#define dumpzone dumpzone_file +#define dumpzone dumpzone_file #endif /* HAVE_LMDB */ #ifndef SIZE_MAX @@ -146,12 +146,12 @@ #ifdef TUNE_LARGE #define RESOLVER_NTASKS 523 -#define UDPBUFFERS 32768 -#define EXCLBUFFERS 32768 +#define UDPBUFFERS 32768 +#define EXCLBUFFERS 32768 #else /* ifdef TUNE_LARGE */ #define RESOLVER_NTASKS 31 -#define UDPBUFFERS 1000 -#define EXCLBUFFERS 4096 +#define UDPBUFFERS 1000 +#define EXCLBUFFERS 4096 #endif /* TUNE_LARGE */ #define MAX_TCP_TIMEOUT 65535 @@ -216,37 +216,37 @@ #define MAX_ADB_SIZE_FOR_CACHESHARE 8388608U struct named_dispatch { - isc_sockaddr_t addr; - unsigned int dispatchgen; + isc_sockaddr_t addr; + unsigned int dispatchgen; dns_dispatch_t *dispatch; ISC_LINK(struct named_dispatch) link; }; struct named_cache { - dns_cache_t * cache; - dns_view_t * primaryview; - bool needflush; - bool adbsizeadjusted; + dns_cache_t *cache; + dns_view_t *primaryview; + bool needflush; + bool adbsizeadjusted; dns_rdataclass_t rdclass; ISC_LINK(named_cache_t) link; }; struct dumpcontext { isc_mem_t *mctx; - bool dumpcache; - bool dumpzones; - bool dumpadb; - bool dumpbad; - bool dumpfail; - FILE * fp; + bool dumpcache; + bool dumpzones; + bool dumpadb; + bool dumpbad; + bool dumpfail; + FILE *fp; ISC_LIST(struct viewlistentry) viewlist; struct viewlistentry *view; struct zonelistentry *zone; - dns_dumpctx_t * mdctx; - dns_db_t * db; - dns_db_t * cache; - isc_task_t * task; - dns_dbversion_t * version; + dns_dumpctx_t *mdctx; + dns_db_t *db; + dns_db_t *cache; + isc_task_t *task; + dns_dbversion_t *version; }; struct viewlistentry { @@ -265,12 +265,12 @@ struct zonelistentry { * new zones to be added at runtime. */ typedef struct ns_cfgctx { - isc_mem_t * mctx; - cfg_parser_t * conf_parser; - cfg_parser_t * add_parser; - cfg_obj_t * config; - cfg_obj_t * vconfig; - cfg_obj_t * nzf_config; + isc_mem_t *mctx; + cfg_parser_t *conf_parser; + cfg_parser_t *add_parser; + cfg_obj_t *config; + cfg_obj_t *vconfig; + cfg_obj_t *nzf_config; cfg_aclconfctx_t *actx; } ns_cfgctx_t; @@ -287,8 +287,8 @@ typedef isc_result_t (*nzfwriter_t)(const cfg_obj_t *config, dns_view_t *view); */ typedef struct { named_server_t *server; - bool reconfig; - isc_refcount_t refs; + bool reconfig; + isc_refcount_t refs; } ns_zoneload_t; typedef struct { @@ -298,17 +298,17 @@ typedef struct { typedef struct catz_chgzone_event { ISC_EVENT_COMMON(struct catz_chgzone_event); dns_catz_entry_t *entry; - dns_catz_zone_t * origin; - dns_view_t * view; - catz_cb_data_t * cbd; - bool mod; + dns_catz_zone_t *origin; + dns_view_t *view; + catz_cb_data_t *cbd; + bool mod; } catz_chgzone_event_t; typedef struct { unsigned int magic; #define DZARG_MAGIC ISC_MAGIC('D', 'z', 'a', 'r') isc_buffer_t **text; - isc_result_t result; + isc_result_t result; } ns_dzarg_t; /* @@ -383,86 +383,74 @@ 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 */ /*% @@ -473,12 +461,11 @@ static isc_result_t configure_view_acl(const cfg_obj_t *vconfig, const cfg_obj_t *config, const cfg_obj_t *gconfig, const char *aclname, const char *acltuplename, cfg_aclconfctx_t *actx, - isc_mem_t *mctx, dns_acl_t **aclp) -{ - isc_result_t result; + isc_mem_t *mctx, dns_acl_t **aclp) { + isc_result_t result; const cfg_obj_t *maps[4]; const cfg_obj_t *aclobj = NULL; - int i = 0; + int i = 0; if (*aclp != NULL) { dns_acl_detach(aclp); @@ -533,12 +520,11 @@ configure_view_acl(const cfg_obj_t *vconfig, const cfg_obj_t *config, static isc_result_t configure_view_sortlist(const cfg_obj_t *vconfig, const cfg_obj_t *config, cfg_aclconfctx_t *actx, isc_mem_t *mctx, - dns_acl_t **aclp) -{ - isc_result_t result; + dns_acl_t **aclp) { + isc_result_t result; const cfg_obj_t *maps[3]; const cfg_obj_t *aclobj = NULL; - int i = 0; + int i = 0; if (*aclp != NULL) { dns_acl_detach(aclp); @@ -575,18 +561,17 @@ configure_view_sortlist(const cfg_obj_t *vconfig, const cfg_obj_t *config, static isc_result_t configure_view_nametable(const cfg_obj_t *vconfig, const cfg_obj_t *config, const char *confname, const char *conftuplename, - isc_mem_t *mctx, dns_rbt_t **rbtp) -{ - isc_result_t result; - const cfg_obj_t * maps[3]; - const cfg_obj_t * obj = NULL; + isc_mem_t *mctx, dns_rbt_t **rbtp) { + isc_result_t result; + const cfg_obj_t *maps[3]; + const cfg_obj_t *obj = NULL; const cfg_listelt_t *element; - int i = 0; - dns_fixedname_t fixed; - dns_name_t * name; - isc_buffer_t b; - const char * str; - const cfg_obj_t * nameobj; + int i = 0; + dns_fixedname_t fixed; + dns_name_t *name; + isc_buffer_t b; + const char *str; + const cfg_obj_t *nameobj; if (*rbtp != NULL) { dns_rbt_destroy(rbtp); @@ -625,7 +610,8 @@ configure_view_nametable(const cfg_obj_t *vconfig, const cfg_obj_t *config, name = dns_fixedname_initname(&fixed); for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { nameobj = cfg_listelt_value(element); str = cfg_obj_asstring(nameobj); isc_buffer_constinit(&b, str, strlen(str)); @@ -656,22 +642,21 @@ cleanup: static isc_result_t ta_fromconfig(const cfg_obj_t *key, bool *initialp, const char **namestrp, - unsigned char *digest, dns_rdata_ds_t *ds) -{ - isc_result_t result; + unsigned char *digest, dns_rdata_ds_t *ds) { + isc_result_t result; dns_rdata_dnskey_t keystruct; - dns_rdata_t rdata = DNS_RDATA_INIT; - uint32_t rdata1, rdata2, rdata3; - const char * datastr = NULL, *namestr = NULL; - unsigned char data[4096]; - isc_buffer_t databuf; - unsigned char rrdata[4096]; - isc_buffer_t rrdatabuf; - isc_region_t r; - dns_fixedname_t fname; - dns_name_t * name = NULL; - isc_buffer_t namebuf; - const char * atstr = NULL; + dns_rdata_t rdata = DNS_RDATA_INIT; + uint32_t rdata1, rdata2, rdata3; + const char *datastr = NULL, *namestr = NULL; + unsigned char data[4096]; + isc_buffer_t databuf; + unsigned char rrdata[4096]; + isc_buffer_t rrdatabuf; + isc_region_t r; + dns_fixedname_t fname; + dns_name_t *name = NULL; + isc_buffer_t namebuf; + const char *atstr = NULL; enum { INIT_DNSKEY, STATIC_DNSKEY, INIT_DS, @@ -860,16 +845,15 @@ cleanup: static isc_result_t process_key(const cfg_obj_t *key, dns_keytable_t *secroots, const dns_name_t *keyname_match, dns_resolver_t *resolver, - bool managed) -{ + bool managed) { dns_fixedname_t fkeyname; - dns_name_t * keyname = NULL; - const char * namestr = NULL; - dns_rdata_ds_t ds; - isc_result_t result; - bool initializing = managed; - unsigned char digest[ISC_MAX_MD_SIZE]; - isc_buffer_t b; + dns_name_t *keyname = NULL; + const char *namestr = NULL; + dns_rdata_ds_t ds; + isc_result_t result; + bool initializing = managed; + unsigned char digest[ISC_MAX_MD_SIZE]; + isc_buffer_t b; result = ta_fromconfig(key, &initializing, &namestr, digest, &ds); @@ -934,8 +918,8 @@ process_key(const cfg_obj_t *key, dns_keytable_t *secroots, * its owner name. If it does not, do not load the key and log a * warning, but do not prevent further keys from being processed. */ - if (!dns_resolver_algorithm_supported(resolver, keyname, - ds.algorithm)) { + if (!dns_resolver_algorithm_supported(resolver, keyname, ds.algorithm)) + { cfg_obj_log(key, named_g_lctx, ISC_LOG_WARNING, "ignoring %s for '%s': algorithm is disabled", initializing ? "initial-key" : "static-key", @@ -964,17 +948,16 @@ done: */ static isc_result_t load_view_keys(const cfg_obj_t *keys, dns_view_t *view, bool managed, - const dns_name_t *keyname) -{ + const dns_name_t *keyname) { const cfg_listelt_t *elt, *elt2; - const cfg_obj_t * keylist; - isc_result_t result; - dns_keytable_t * secroots = NULL; + const cfg_obj_t *keylist; + isc_result_t result; + dns_keytable_t *secroots = NULL; CHECK(dns_view_getsecroots(view, &secroots)); - for (elt = cfg_list_first(keys); elt != NULL; - elt = cfg_list_next(elt)) { + for (elt = cfg_list_first(keys); elt != NULL; elt = cfg_list_next(elt)) + { keylist = cfg_listelt_value(elt); for (elt2 = cfg_list_first(keylist); elt2 != NULL; @@ -998,11 +981,10 @@ cleanup: * Check whether a key has been successfully loaded. */ static bool -keyloaded(dns_view_t *view, const dns_name_t *name) -{ - isc_result_t result; +keyloaded(dns_view_t *view, const dns_name_t *name) { + isc_result_t result; dns_keytable_t *secroots = NULL; - dns_keynode_t * keynode = NULL; + dns_keynode_t *keynode = NULL; result = dns_view_getsecroots(view, &secroots); if (result != ISC_R_SUCCESS) { @@ -1030,9 +1012,8 @@ keyloaded(dns_view_t *view, const dns_name_t *name) static isc_result_t configure_view_dnsseckeys(dns_view_t *view, const cfg_obj_t *vconfig, const cfg_obj_t *config, const cfg_obj_t *bindkeys, - bool auto_root, isc_mem_t *mctx) -{ - isc_result_t result = ISC_R_SUCCESS; + bool auto_root, isc_mem_t *mctx) { + isc_result_t result = ISC_R_SUCCESS; const cfg_obj_t *view_keys = NULL; const cfg_obj_t *global_keys = NULL; const cfg_obj_t *view_managed_keys = NULL; @@ -1043,8 +1024,8 @@ configure_view_dnsseckeys(dns_view_t *view, const cfg_obj_t *vconfig, const cfg_obj_t *voptions = NULL; const cfg_obj_t *options = NULL; const cfg_obj_t *obj = NULL; - const char * directory; - int i = 0; + const char *directory; + int i = 0; /* We don't need trust anchors for the _bind view */ if (strcmp(view->name, "_bind") == 0 && @@ -1195,20 +1176,20 @@ cleanup: } static isc_result_t -mustbesecure(const cfg_obj_t *mbs, dns_resolver_t *resolver) -{ +mustbesecure(const cfg_obj_t *mbs, dns_resolver_t *resolver) { const cfg_listelt_t *element; - const cfg_obj_t * obj; - const char * str; - dns_fixedname_t fixed; - dns_name_t * name; - bool value; - isc_result_t result; - isc_buffer_t b; + const cfg_obj_t *obj; + const char *str; + dns_fixedname_t fixed; + dns_name_t *name; + bool value; + isc_result_t result; + isc_buffer_t b; name = dns_fixedname_initname(&fixed); for (element = cfg_list_first(mbs); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { obj = cfg_listelt_value(element); str = cfg_obj_asstring(cfg_tuple_get(obj, "name")); isc_buffer_constinit(&b, str, strlen(str)); @@ -1230,15 +1211,14 @@ cleanup: static isc_result_t get_view_querysource_dispatch(const cfg_obj_t **maps, int af, dns_dispatch_t **dispatchp, isc_dscp_t *dscpp, - bool is_firstview) -{ - isc_result_t result = ISC_R_FAILURE; - dns_dispatch_t * disp; - isc_sockaddr_t sa; - unsigned int attrs, attrmask; + bool is_firstview) { + isc_result_t result = ISC_R_FAILURE; + dns_dispatch_t *disp; + isc_sockaddr_t sa; + unsigned int attrs, attrmask; const cfg_obj_t *obj = NULL; - unsigned int maxdispatchbuffers = UDPBUFFERS; - isc_dscp_t dscp = -1; + unsigned int maxdispatchbuffers = UDPBUFFERS; + isc_dscp_t dscp = -1; switch (af) { case AF_INET: @@ -1319,7 +1299,7 @@ get_view_querysource_dispatch(const cfg_obj_t **maps, int af, attrs, attrmask, &disp); if (result != ISC_R_SUCCESS) { isc_sockaddr_t any; - char buf[ISC_SOCKADDR_FORMATSIZE]; + char buf[ISC_SOCKADDR_FORMATSIZE]; switch (af) { case AF_INET: @@ -1346,17 +1326,16 @@ get_view_querysource_dispatch(const cfg_obj_t **maps, int af, } static isc_result_t -configure_order(dns_order_t *order, const cfg_obj_t *ent) -{ +configure_order(dns_order_t *order, const cfg_obj_t *ent) { dns_rdataclass_t rdclass; - dns_rdatatype_t rdtype; + dns_rdatatype_t rdtype; const cfg_obj_t *obj; - dns_fixedname_t fixed; - unsigned int mode = 0; - const char * str; - isc_buffer_t b; - isc_result_t result; - bool addroot; + dns_fixedname_t fixed; + unsigned int mode = 0; + const char *str; + isc_buffer_t b; + isc_result_t result; + bool addroot; result = named_config_getclass(cfg_tuple_get(ent, "class"), dns_rdataclass_any, &rdclass); @@ -1424,14 +1403,13 @@ configure_order(dns_order_t *order, const cfg_obj_t *ent) } static isc_result_t -configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) -{ - isc_netaddr_t na; - dns_peer_t * peer; +configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) { + isc_netaddr_t na; + dns_peer_t *peer; const cfg_obj_t *obj; - const char * str; - isc_result_t result; - unsigned int prefixlen; + const char *str; + isc_result_t result; + unsigned int prefixlen; cfg_obj_asnetprefix(cfg_map_getname(cpeer), &na, &prefixlen); @@ -1601,8 +1579,8 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) (void)cfg_map_get(cpeer, "notify-source-v6", &obj); } if (obj != NULL) { - result = - dns_peer_setnotifysource(peer, cfg_obj_assockaddr(obj)); + result = dns_peer_setnotifysource(peer, + cfg_obj_assockaddr(obj)); if (result != ISC_R_SUCCESS) { goto cleanup; } @@ -1644,11 +1622,10 @@ cleanup: #ifdef HAVE_DLOPEN static isc_result_t configure_dyndb(const cfg_obj_t *dyndb, isc_mem_t *mctx, - const dns_dyndbctx_t *dctx) -{ - isc_result_t result = ISC_R_SUCCESS; + const dns_dyndbctx_t *dctx) { + isc_result_t result = ISC_R_SUCCESS; const cfg_obj_t *obj; - const char * name, *library; + const char *name, *library; /* Get the name of the dyndb instance and the library path . */ name = cfg_obj_asstring(cfg_tuple_get(dyndb, "name")); @@ -1672,15 +1649,14 @@ configure_dyndb(const cfg_obj_t *dyndb, isc_mem_t *mctx, #endif /* ifdef HAVE_DLOPEN */ static isc_result_t -disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) -{ - isc_result_t result; - const cfg_obj_t * algorithms; +disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) { + isc_result_t result; + const cfg_obj_t *algorithms; const cfg_listelt_t *element; - const char * str; - dns_fixedname_t fixed; - dns_name_t * name; - isc_buffer_t b; + const char *str; + dns_fixedname_t fixed; + dns_name_t *name; + isc_buffer_t b; name = dns_fixedname_initname(&fixed); str = cfg_obj_asstring(cfg_tuple_get(disabled, "name")); @@ -1690,9 +1666,10 @@ disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) algorithms = cfg_tuple_get(disabled, "algorithms"); for (element = cfg_list_first(algorithms); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { isc_textregion_t r; - dns_secalg_t alg; + dns_secalg_t alg; DE_CONST(cfg_obj_asstring(cfg_listelt_value(element)), r.base); r.length = strlen(r.base); @@ -1715,15 +1692,14 @@ cleanup: } static isc_result_t -disable_ds_digests(const cfg_obj_t *disabled, dns_resolver_t *resolver) -{ - isc_result_t result; - const cfg_obj_t * digests; +disable_ds_digests(const cfg_obj_t *disabled, dns_resolver_t *resolver) { + isc_result_t result; + const cfg_obj_t *digests; const cfg_listelt_t *element; - const char * str; - dns_fixedname_t fixed; - dns_name_t * name; - isc_buffer_t b; + const char *str; + dns_fixedname_t fixed; + dns_name_t *name; + isc_buffer_t b; name = dns_fixedname_initname(&fixed); str = cfg_obj_asstring(cfg_tuple_get(disabled, "name")); @@ -1733,9 +1709,10 @@ disable_ds_digests(const cfg_obj_t *disabled, dns_resolver_t *resolver) digests = cfg_tuple_get(disabled, "digests"); for (element = cfg_list_first(digests); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { isc_textregion_t r; - dns_dsdigest_t digest; + dns_dsdigest_t digest; DE_CONST(cfg_obj_asstring(cfg_listelt_value(element)), r.base); r.length = strlen(r.base); @@ -1754,20 +1731,20 @@ cleanup: } static bool -on_disable_list(const cfg_obj_t *disablelist, dns_name_t *zonename) -{ +on_disable_list(const cfg_obj_t *disablelist, dns_name_t *zonename) { const cfg_listelt_t *element; - dns_fixedname_t fixed; - dns_name_t * name; - isc_result_t result; - const cfg_obj_t * value; - const char * str; - isc_buffer_t b; + dns_fixedname_t fixed; + dns_name_t *name; + isc_result_t result; + const cfg_obj_t *value; + const char *str; + isc_buffer_t b; name = dns_fixedname_initname(&fixed); for (element = cfg_list_first(disablelist); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { value = cfg_listelt_value(element); str = cfg_obj_asstring(value); isc_buffer_constinit(&b, str, strlen(str)); @@ -1783,9 +1760,8 @@ on_disable_list(const cfg_obj_t *disablelist, dns_name_t *zonename) static isc_result_t check_dbtype(dns_zone_t *zone, unsigned int dbtypec, const char **dbargv, - isc_mem_t *mctx) -{ - char ** argv = NULL; + isc_mem_t *mctx) { + char **argv = NULL; unsigned int i; isc_result_t result = ISC_R_SUCCESS; @@ -1817,8 +1793,7 @@ cleanup: } static isc_result_t -setquerystats(dns_zone_t *zone, isc_mem_t *mctx, dns_zonestat_level_t level) -{ +setquerystats(dns_zone_t *zone, isc_mem_t *mctx, dns_zonestat_level_t level) { isc_result_t result; isc_stats_t *zoneqrystats; @@ -1842,14 +1817,15 @@ setquerystats(dns_zone_t *zone, isc_mem_t *mctx, dns_zonestat_level_t level) static named_cache_t * cachelist_find(named_cachelist_t *cachelist, const char *cachename, - dns_rdataclass_t rdclass) -{ + dns_rdataclass_t rdclass) { named_cache_t *nsc; for (nsc = ISC_LIST_HEAD(*cachelist); nsc != NULL; - nsc = ISC_LIST_NEXT(nsc, link)) { + nsc = ISC_LIST_NEXT(nsc, link)) + { if (nsc->rdclass == rdclass && - strcmp(dns_cache_getname(nsc->cache), cachename) == 0) { + strcmp(dns_cache_getname(nsc->cache), cachename) == 0) + { return (nsc); } } @@ -1859,8 +1835,7 @@ cachelist_find(named_cachelist_t *cachelist, const char *cachename, static bool cache_reusable(dns_view_t *originview, dns_view_t *view, - bool new_zero_no_soattl) -{ + bool new_zero_no_soattl) { if (originview->rdclass != view->rdclass || originview->checknames != view->checknames || dns_resolver_getzeronosoattl(originview->resolver) != @@ -1868,7 +1843,8 @@ cache_reusable(dns_view_t *originview, dns_view_t *view, originview->acceptexpired != view->acceptexpired || originview->enablevalidation != view->enablevalidation || originview->maxcachettl != view->maxcachettl || - originview->maxncachettl != view->maxncachettl) { + originview->maxncachettl != view->maxncachettl) + { return (false); } @@ -1878,8 +1854,7 @@ cache_reusable(dns_view_t *originview, dns_view_t *view, static bool cache_sharable(dns_view_t *originview, dns_view_t *view, bool new_zero_no_soattl, uint64_t new_max_cache_size, - uint32_t new_stale_ttl) -{ + uint32_t new_stale_ttl) { /* * If the cache cannot even reused for the same view, it cannot be * shared with other views. @@ -1893,7 +1868,8 @@ cache_sharable(dns_view_t *originview, dns_view_t *view, * the sharing views. */ if (dns_cache_getservestalettl(originview->cache) != new_stale_ttl || - dns_cache_getcachesize(originview->cache) != new_max_cache_size) { + dns_cache_getcachesize(originview->cache) != new_max_cache_size) + { return (false); } @@ -1904,11 +1880,10 @@ cache_sharable(dns_view_t *originview, dns_view_t *view, * Callback from DLZ configure when the driver sets up a writeable zone */ static isc_result_t -dlzconfigure_callback(dns_view_t *view, dns_dlzdb_t *dlzdb, dns_zone_t *zone) -{ - dns_name_t * origin = dns_zone_getorigin(zone); +dlzconfigure_callback(dns_view_t *view, dns_dlzdb_t *dlzdb, dns_zone_t *zone) { + dns_name_t *origin = dns_zone_getorigin(zone); dns_rdataclass_t zclass = view->rdclass; - isc_result_t result; + isc_result_t result; result = dns_zonemgr_managezone(named_g_server->zonemgr, zone); if (result != ISC_R_SUCCESS) { @@ -1922,20 +1897,19 @@ dlzconfigure_callback(dns_view_t *view, dns_dlzdb_t *dlzdb, dns_zone_t *zone) static isc_result_t dns64_reverse(dns_view_t *view, isc_mem_t *mctx, isc_netaddr_t *na, - unsigned int prefixlen, const char *server, const char *contact) -{ - char reverse[48 + sizeof("ip6.arpa.")] = { 0 }; - char buf[sizeof("x.x.")]; - const char * dns64_dbtype[4] = { "_dns64", "dns64", ".", "." }; - const char * sep = ": view "; - const char * viewname = view->name; + unsigned int prefixlen, const char *server, const char *contact) { + char reverse[48 + sizeof("ip6.arpa.")] = { 0 }; + char buf[sizeof("x.x.")]; + const char *dns64_dbtype[4] = { "_dns64", "dns64", ".", "." }; + const char *sep = ": view "; + const char *viewname = view->name; const unsigned char *s6; - dns_fixedname_t fixed; - dns_name_t * name; - dns_zone_t * zone = NULL; - int dns64_dbtypec = 4; - isc_buffer_t b; - isc_result_t result; + dns_fixedname_t fixed; + dns_name_t *name; + dns_zone_t *zone = NULL; + int dns64_dbtypec = 4; + isc_buffer_t b; + isc_result_t result; REQUIRE(prefixlen == 32 || prefixlen == 40 || prefixlen == 48 || prefixlen == 56 || prefixlen == 64 || prefixlen == 96); @@ -2004,19 +1978,18 @@ cleanup: typedef struct conf_dnsrps_ctx conf_dnsrps_ctx_t; struct conf_dnsrps_ctx { isc_result_t result; - char * cstr; - size_t cstr_size; - isc_mem_t * mctx; + char *cstr; + size_t cstr_size; + isc_mem_t *mctx; }; /* * Add to the DNSRPS configuration string. */ static bool -conf_dnsrps_sadd(conf_dnsrps_ctx_t *ctx, const char *p, ...) -{ - size_t new_len, cur_len, new_cstr_size; - char * new_cstr; +conf_dnsrps_sadd(conf_dnsrps_ctx_t *ctx, const char *p, ...) { + size_t new_len, cur_len, new_cstr_size; + char *new_cstr; va_list args; if (ctx->cstr == NULL) { @@ -2057,8 +2030,8 @@ conf_dnsrps_sadd(conf_dnsrps_ctx_t *ctx, const char *p, ...) */ static bool conf_dnsrps_get(const cfg_obj_t **sub_obj, const cfg_obj_t **maps, - const cfg_obj_t *obj, const char *name, conf_dnsrps_ctx_t *ctx) -{ + const cfg_obj_t *obj, const char *name, + conf_dnsrps_ctx_t *ctx) { if (ctx != NULL && ctx->result != ISC_R_SUCCESS) { *sub_obj = NULL; return (false); @@ -2081,8 +2054,7 @@ conf_dnsrps_get(const cfg_obj_t **sub_obj, const cfg_obj_t **maps, */ static void conf_dnsrps_yes_no(const cfg_obj_t *obj, const char *name, - conf_dnsrps_ctx_t *ctx) -{ + conf_dnsrps_ctx_t *ctx) { const cfg_obj_t *sub_obj; if (!conf_dnsrps_get(&sub_obj, NULL, obj, name, ctx)) { @@ -2102,8 +2074,8 @@ conf_dnsrps_yes_no(const cfg_obj_t *obj, const char *name, } static void -conf_dnsrps_num(const cfg_obj_t *obj, const char *name, conf_dnsrps_ctx_t *ctx) -{ +conf_dnsrps_num(const cfg_obj_t *obj, const char *name, + conf_dnsrps_ctx_t *ctx) { const cfg_obj_t *sub_obj; if (!conf_dnsrps_get(&sub_obj, NULL, obj, name, ctx)) { @@ -2135,20 +2107,20 @@ static isc_result_t conf_dnsrps(dns_view_t *view, const cfg_obj_t **maps, bool nsip_enabled, bool nsdname_enabled, dns_rpz_zbits_t *nsip_on, dns_rpz_zbits_t *nsdname_on, char **rps_cstr, size_t *rps_cstr_size, - const cfg_obj_t *rpz_obj, const cfg_listelt_t *zone_element) -{ + const cfg_obj_t *rpz_obj, const cfg_listelt_t *zone_element) { conf_dnsrps_ctx_t ctx; - const cfg_obj_t * zone_obj, *obj; - dns_rpz_num_t rpz_num; - bool on; - const char * s; + const cfg_obj_t *zone_obj, *obj; + dns_rpz_num_t rpz_num; + bool on; + const char *s; memset(&ctx, 0, sizeof(ctx)); ctx.result = ISC_R_SUCCESS; ctx.mctx = view->mctx; for (rpz_num = 0; zone_element != NULL && ctx.result == ISC_R_SUCCESS; - ++rpz_num) { + ++rpz_num) + { zone_obj = cfg_listelt_value(zone_element); s = cfg_obj_asstring(cfg_tuple_get(zone_obj, "zone name")); @@ -2235,8 +2207,7 @@ conf_dnsrps(dns_view_t *view, const cfg_obj_t **maps, bool nsip_enabled, static isc_result_t configure_rpz_name(dns_view_t *view, const cfg_obj_t *obj, dns_name_t *name, - const char *str, const char *msg) -{ + const char *str, const char *msg) { isc_result_t result; result = dns_name_fromstring(name, str, DNS_NAME_DOWNCASE, view->mctx); @@ -2249,8 +2220,7 @@ configure_rpz_name(dns_view_t *view, const cfg_obj_t *obj, dns_name_t *name, static isc_result_t configure_rpz_name2(dns_view_t *view, const cfg_obj_t *obj, dns_name_t *name, - const char *str, const dns_name_t *origin) -{ + const char *str, const dns_name_t *origin) { isc_result_t result; result = dns_name_fromstring2(name, str, origin, DNS_NAME_DOWNCASE, @@ -2266,13 +2236,12 @@ static isc_result_t configure_rpz_zone(dns_view_t *view, const cfg_listelt_t *element, bool recursive_only_default, bool add_soa_default, dns_ttl_t ttl_default, uint32_t minupdateinterval_default, - const dns_rpz_zone_t *old, bool *old_rpz_okp) -{ + const dns_rpz_zone_t *old, bool *old_rpz_okp) { const cfg_obj_t *rpz_obj, *obj; - const char * str; - dns_rpz_zone_t * zone = NULL; - isc_result_t result; - dns_rpz_num_t rpz_num; + const char *str; + dns_rpz_zone_t *zone = NULL; + isc_result_t result; + dns_rpz_num_t rpz_num; REQUIRE(old != NULL || !*old_rpz_okp); @@ -2412,7 +2381,8 @@ configure_rpz_zone(dns_view_t *view, const cfg_listelt_t *element, } } if (*old_rpz_okp && (zone->policy != old->policy || - !dns_name_equal(&old->cname, &zone->cname))) { + !dns_name_equal(&old->cname, &zone->cname))) + { *old_rpz_okp = false; } @@ -2428,24 +2398,23 @@ configure_rpz_zone(dns_view_t *view, const cfg_listelt_t *element, static isc_result_t configure_rpz(dns_view_t *view, const cfg_obj_t **maps, - const cfg_obj_t *rpz_obj, bool *old_rpz_okp) -{ - bool dnsrps_enabled; - const cfg_listelt_t * zone_element; - char * rps_cstr; - size_t rps_cstr_size; - const cfg_obj_t * sub_obj; - bool recursive_only_default, add_soa_default; - bool nsip_enabled, nsdname_enabled; - dns_rpz_zbits_t nsip_on, nsdname_on; - dns_ttl_t ttl_default; - uint32_t minupdateinterval_default; - dns_rpz_zones_t * zones; + const cfg_obj_t *rpz_obj, bool *old_rpz_okp) { + bool dnsrps_enabled; + const cfg_listelt_t *zone_element; + char *rps_cstr; + size_t rps_cstr_size; + const cfg_obj_t *sub_obj; + bool recursive_only_default, add_soa_default; + bool nsip_enabled, nsdname_enabled; + dns_rpz_zbits_t nsip_on, nsdname_on; + dns_ttl_t ttl_default; + uint32_t minupdateinterval_default; + dns_rpz_zones_t *zones; const dns_rpz_zones_t *old; - dns_view_t * pview; - const dns_rpz_zone_t * old_zone; - isc_result_t result; - int i; + dns_view_t *pview; + const dns_rpz_zone_t *old_zone; + isc_result_t result; + int i; *old_rpz_okp = false; @@ -2596,7 +2565,8 @@ configure_rpz(dns_view_t *view, const cfg_obj_t **maps, } for (i = 0; zone_element != NULL; - ++i, zone_element = cfg_list_next(zone_element)) { + ++i, zone_element = cfg_list_next(zone_element)) + { INSIST(!*old_rpz_okp || old != NULL); if (*old_rpz_okp && i < old->p.num_zones) { old_zone = old->zones[i]; @@ -2629,7 +2599,8 @@ configure_rpz(dns_view_t *view, const cfg_obj_t **maps, (zones->rps_cstr == NULL)) { *old_rpz_okp = false; } else if (old != NULL && zones->rps_cstr != NULL && - strcmp(old->rps_cstr, zones->rps_cstr) != 0) { + strcmp(old->rps_cstr, zones->rps_cstr) != 0) + { *old_rpz_okp = false; } } @@ -2653,18 +2624,17 @@ configure_rpz(dns_view_t *view, const cfg_obj_t **maps, } static void -catz_addmodzone_taskaction(isc_task_t *task, isc_event_t *event0) -{ +catz_addmodzone_taskaction(isc_task_t *task, isc_event_t *event0) { catz_chgzone_event_t *ev = (catz_chgzone_event_t *)event0; - isc_result_t result; - isc_buffer_t namebuf; - isc_buffer_t * confbuf; - char nameb[DNS_NAME_FORMATSIZE]; - const cfg_obj_t * zlist = NULL; - cfg_obj_t * zoneconf = NULL; - cfg_obj_t * zoneobj = NULL; - ns_cfgctx_t * cfg; - dns_zone_t * zone = NULL; + isc_result_t result; + isc_buffer_t namebuf; + isc_buffer_t *confbuf; + char nameb[DNS_NAME_FORMATSIZE]; + const cfg_obj_t *zlist = NULL; + cfg_obj_t *zoneconf = NULL; + cfg_obj_t *zoneobj = NULL; + ns_cfgctx_t *cfg; + dns_zone_t *zone = NULL; cfg = (ns_cfgctx_t *)ev->view->new_zone_config; if (cfg == NULL) { @@ -2833,14 +2803,13 @@ cleanup: } static void -catz_delzone_taskaction(isc_task_t *task, isc_event_t *event0) -{ +catz_delzone_taskaction(isc_task_t *task, isc_event_t *event0) { catz_chgzone_event_t *ev = (catz_chgzone_event_t *)event0; - isc_result_t result; - dns_zone_t * zone = NULL; - dns_db_t * dbp = NULL; - char cname[DNS_NAME_FORMATSIZE]; - const char * file; + isc_result_t result; + dns_zone_t *zone = NULL; + dns_db_t *dbp = NULL; + char cname[DNS_NAME_FORMATSIZE]; + const char *file; result = isc_task_beginexclusive(task); RUNTIME_CHECK(result == ISC_R_SUCCESS); @@ -2907,12 +2876,11 @@ cleanup: static isc_result_t catz_create_chg_task(dns_catz_entry_t *entry, dns_catz_zone_t *origin, dns_view_t *view, isc_taskmgr_t *taskmgr, void *udata, - isc_eventtype_t type) -{ + isc_eventtype_t type) { catz_chgzone_event_t *event; - isc_task_t * task; - isc_result_t result; - isc_taskaction_t action = NULL; + isc_task_t *task; + isc_result_t result; + isc_taskaction_t action = NULL; switch (type) { case DNS_EVENT_CATZADDZONE: @@ -2949,39 +2917,35 @@ catz_create_chg_task(dns_catz_entry_t *entry, dns_catz_zone_t *origin, static isc_result_t catz_addzone(dns_catz_entry_t *entry, dns_catz_zone_t *origin, dns_view_t *view, - isc_taskmgr_t *taskmgr, void *udata) -{ + isc_taskmgr_t *taskmgr, void *udata) { return (catz_create_chg_task(entry, origin, view, taskmgr, udata, DNS_EVENT_CATZADDZONE)); } static isc_result_t catz_delzone(dns_catz_entry_t *entry, dns_catz_zone_t *origin, dns_view_t *view, - isc_taskmgr_t *taskmgr, void *udata) -{ + isc_taskmgr_t *taskmgr, void *udata) { return (catz_create_chg_task(entry, origin, view, taskmgr, udata, DNS_EVENT_CATZDELZONE)); } static isc_result_t catz_modzone(dns_catz_entry_t *entry, dns_catz_zone_t *origin, dns_view_t *view, - isc_taskmgr_t *taskmgr, void *udata) -{ + isc_taskmgr_t *taskmgr, void *udata) { return (catz_create_chg_task(entry, origin, view, taskmgr, udata, DNS_EVENT_CATZMODZONE)); } static isc_result_t configure_catz_zone(dns_view_t *view, const cfg_obj_t *config, - const cfg_listelt_t *element) -{ - const cfg_obj_t * catz_obj, *obj; - dns_catz_zone_t * zone = NULL; - const char * str; - isc_result_t result; - dns_name_t origin; + const cfg_listelt_t *element) { + const cfg_obj_t *catz_obj, *obj; + dns_catz_zone_t *zone = NULL; + const char *str; + isc_result_t result; + dns_name_t origin; dns_catz_options_t *opts; - dns_view_t * pview = NULL; + dns_view_t *pview = NULL; dns_name_init(&origin, NULL); catz_obj = cfg_listelt_value(element); @@ -3035,11 +2999,12 @@ configure_catz_zone(dns_view_t *view, const cfg_obj_t *config, } for (result = isc_ht_iter_first(it); result == ISC_R_SUCCESS; - result = isc_ht_iter_next(it)) { - dns_name_t * name = NULL; - dns_zone_t * dnszone = NULL; + result = isc_ht_iter_next(it)) + { + dns_name_t *name = NULL; + dns_zone_t *dnszone = NULL; dns_catz_entry_t *entry = NULL; - isc_result_t tresult; + isc_result_t tresult; isc_ht_iter_current(it, (void **)&entry); name = dns_catz_entry_getname(entry); @@ -3081,8 +3046,8 @@ configure_catz_zone(dns_view_t *view, const cfg_obj_t *config, obj = cfg_tuple_get(catz_obj, "zone-directory"); if (!opts->in_memory && obj != NULL && cfg_obj_isstring(obj)) { - opts->zonedir = - isc_mem_strdup(view->mctx, cfg_obj_asstring(obj)); + opts->zonedir = isc_mem_strdup(view->mctx, + cfg_obj_asstring(obj)); if (isc_file_isdirectory(opts->zonedir) != ISC_R_SUCCESS) { cfg_obj_log(obj, named_g_lctx, DNS_CATZ_ERROR_LEVEL, "catz: zone-directory '%s' " @@ -3107,19 +3072,18 @@ cleanup: return (result); } -static catz_cb_data_t ns_catz_cbdata; +static catz_cb_data_t ns_catz_cbdata; static dns_catz_zonemodmethods_t ns_catz_zonemodmethods = { catz_addzone, catz_modzone, catz_delzone, &ns_catz_cbdata }; static isc_result_t configure_catz(dns_view_t *view, const cfg_obj_t *config, - const cfg_obj_t *catz_obj) -{ - const cfg_listelt_t * zone_element; + const cfg_obj_t *catz_obj) { + const cfg_listelt_t *zone_element; const dns_catz_zones_t *old = NULL; - dns_view_t * pview = NULL; - isc_result_t result; + dns_view_t *pview = NULL; + isc_result_t result; /* xxxwpk TODO do it cleaner, once, somewhere */ ns_catz_cbdata.server = named_g_server; @@ -3190,12 +3154,11 @@ cleanup: } while (0) static isc_result_t -configure_rrl(dns_view_t *view, const cfg_obj_t *config, const cfg_obj_t *map) -{ +configure_rrl(dns_view_t *view, const cfg_obj_t *config, const cfg_obj_t *map) { const cfg_obj_t *obj; - dns_rrl_t * rrl; - isc_result_t result; - int min_entries, i, j; + dns_rrl_t *rrl; + isc_result_t result; + int min_entries, i, j; /* * Most DNS servers have few clients, but intentinally open @@ -3326,14 +3289,13 @@ cleanup: static isc_result_t add_soa(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, - const dns_name_t *origin, const dns_name_t *contact) -{ - dns_dbnode_t * node = NULL; - dns_rdata_t rdata = DNS_RDATA_INIT; + const dns_name_t *origin, const dns_name_t *contact) { + dns_dbnode_t *node = NULL; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdatalist_t rdatalist; - dns_rdataset_t rdataset; - isc_result_t result; - unsigned char buf[DNS_SOA_BUFFERSIZE]; + dns_rdataset_t rdataset; + isc_result_t result; + unsigned char buf[DNS_SOA_BUFFERSIZE]; CHECK(dns_soa_buildrdata(origin, contact, dns_db_class(db), 0, 28800, 7200, 604800, 86400, buf, &rdata)); @@ -3358,16 +3320,15 @@ cleanup: static isc_result_t add_ns(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, - const dns_name_t *nsname) -{ - dns_dbnode_t * node = NULL; - dns_rdata_ns_t ns; - dns_rdata_t rdata = DNS_RDATA_INIT; + const dns_name_t *nsname) { + dns_dbnode_t *node = NULL; + dns_rdata_ns_t ns; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdatalist_t rdatalist; - dns_rdataset_t rdataset; - isc_result_t result; - isc_buffer_t b; - unsigned char buf[DNS_NAME_MAXWIRE]; + dns_rdataset_t rdataset; + isc_result_t result; + isc_buffer_t b; + unsigned char buf[DNS_NAME_MAXWIRE]; isc_buffer_init(&b, buf, sizeof(buf)); @@ -3400,31 +3361,30 @@ cleanup: static isc_result_t create_empty_zone(dns_zone_t *zone, dns_name_t *name, dns_view_t *view, const cfg_obj_t *zonelist, const char **empty_dbtype, - int empty_dbtypec, dns_zonestat_level_t statlevel) -{ - char namebuf[DNS_NAME_FORMATSIZE]; + int empty_dbtypec, dns_zonestat_level_t statlevel) { + char namebuf[DNS_NAME_FORMATSIZE]; const cfg_listelt_t *element; - const cfg_obj_t * obj; - const cfg_obj_t * zconfig; - const cfg_obj_t * zoptions; - const char * rbt_dbtype[4] = { "rbt" }; - const char * sep = ": view "; - const char * str; - const char * viewname = view->name; - dns_db_t * db = NULL; - dns_dbversion_t * version = NULL; - dns_fixedname_t cfixed; - dns_fixedname_t fixed; - dns_fixedname_t nsfixed; - dns_name_t * contact; - dns_name_t * ns; - dns_name_t * zname; - dns_zone_t * myzone = NULL; - int rbt_dbtypec = 1; - isc_result_t result; - dns_namereln_t namereln; - int order; - unsigned int nlabels; + const cfg_obj_t *obj; + const cfg_obj_t *zconfig; + const cfg_obj_t *zoptions; + const char *rbt_dbtype[4] = { "rbt" }; + const char *sep = ": view "; + const char *str; + const char *viewname = view->name; + dns_db_t *db = NULL; + dns_dbversion_t *version = NULL; + dns_fixedname_t cfixed; + dns_fixedname_t fixed; + dns_fixedname_t nsfixed; + dns_name_t *contact; + dns_name_t *ns; + dns_name_t *zname; + dns_zone_t *myzone = NULL; + int rbt_dbtypec = 1; + isc_result_t result; + dns_namereln_t namereln; + int order; + unsigned int nlabels; zname = dns_fixedname_initname(&fixed); ns = dns_fixedname_initname(&nsfixed); @@ -3435,7 +3395,8 @@ create_empty_zone(dns_zone_t *zone, dns_name_t *name, dns_view_t *view, * create a custom db for the empty zone. */ for (element = cfg_list_first(zonelist); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { zconfig = cfg_listelt_value(element); str = cfg_obj_asstring(cfg_tuple_get(zconfig, "name")); CHECK(dns_name_fromstring(zname, str, 0, NULL)); @@ -3448,8 +3409,9 @@ create_empty_zone(dns_zone_t *zone, dns_name_t *name, dns_view_t *view, obj = NULL; (void)cfg_map_get(zoptions, "type", &obj); - if (obj != NULL && - strcasecmp(cfg_obj_asstring(obj), "forward") == 0) { + if (obj != NULL && strcasecmp(cfg_obj_asstring(obj), "forwar" + "d") == 0) + { obj = NULL; (void)cfg_map_get(zoptions, "forward", &obj); if (obj == NULL) { @@ -3584,15 +3546,14 @@ cleanup: #ifdef HAVE_DNSTAP static isc_result_t -configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) -{ - isc_result_t result; - const cfg_obj_t * obj, *obj2; - const cfg_listelt_t * element; - const char * dpath; - const cfg_obj_t * dlist = NULL; - dns_dtmsgtype_t dttypes = 0; - unsigned int i; +configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) { + isc_result_t result; + const cfg_obj_t *obj, *obj2; + const cfg_listelt_t *element; + const char *dpath; + const cfg_obj_t *dlist = NULL; + dns_dtmsgtype_t dttypes = 0; + unsigned int i; struct fstrm_iothr_options *fopt = NULL; result = named_config_get(maps, "dnstap", &dlist); @@ -3601,8 +3562,9 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) } for (element = cfg_list_first(dlist); element != NULL; - element = cfg_list_next(element)) { - const char * str; + element = cfg_list_next(element)) + { + const char *str; dns_dtmsgtype_t dt = 0; obj = cfg_listelt_value(element); @@ -3642,9 +3604,9 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) } if (named_g_server->dtenv == NULL && dttypes != 0) { - dns_dtmode_t dmode; - uint64_t max_size = 0; - uint32_t rolls = 0; + dns_dtmode_t dmode; + uint64_t max_size = 0; + uint32_t rolls = 0; isc_log_rollsuffix_t suffix = isc_log_rollsuffix_increment; obj = NULL; @@ -3691,7 +3653,8 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) obj2 = cfg_tuple_get(obj, "suffix"); if (obj2 != NULL && cfg_obj_isstring(obj2) && - strcasecmp(cfg_obj_asstring(obj2), "timestamp") == 0) { + strcasecmp(cfg_obj_asstring(obj2), "timestamp") == 0) + { suffix = isc_log_rollsuffix_timestamp; } @@ -3708,8 +3671,8 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) } obj = NULL; - result = - named_config_get(maps, "fstrm-set-flush-timeout", &obj); + result = named_config_get(maps, "fstrm-set-flush-timeout", + &obj); if (result == ISC_R_SUCCESS) { i = cfg_obj_asuint32(obj); fstrm_iothr_options_set_flush_timeout(fopt, i); @@ -3813,12 +3776,11 @@ cleanup: #endif /* HAVE_DNSTAP */ static isc_result_t -create_mapped_acl(void) -{ - isc_result_t result; - dns_acl_t * acl = NULL; +create_mapped_acl(void) { + isc_result_t result; + dns_acl_t *acl = NULL; struct in6_addr in6 = IN6ADDR_V4MAPPED_INIT; - isc_netaddr_t addr; + isc_netaddr_t addr; isc_netaddr_fromin6(&addr, &in6); @@ -3844,14 +3806,13 @@ create_mapped_acl(void) static isc_result_t register_one_plugin(const cfg_obj_t *config, const cfg_obj_t *obj, const char *plugin_path, const char *parameters, - void *callback_data) -{ - dns_view_t * view = callback_data; - char full_path[PATH_MAX]; + void *callback_data) { + dns_view_t *view = callback_data; + char full_path[PATH_MAX]; isc_result_t result; - result = - ns_plugin_expandpath(plugin_path, full_path, sizeof(full_path)); + result = ns_plugin_expandpath(plugin_path, full_path, + sizeof(full_path)); if (result != ISC_R_SUCCESS) { isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, @@ -3887,64 +3848,63 @@ static isc_result_t configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, cfg_obj_t *vconfig, named_cachelist_t *cachelist, dns_kasplist_t *kasplist, const cfg_obj_t *bindkeys, - isc_mem_t *mctx, cfg_aclconfctx_t *actx, bool need_hints) -{ - const cfg_obj_t * maps[4]; - const cfg_obj_t * cfgmaps[3]; - const cfg_obj_t * optionmaps[3]; - const cfg_obj_t * options = NULL; - const cfg_obj_t * voptions = NULL; - const cfg_obj_t * forwardtype; - const cfg_obj_t * forwarders; - const cfg_obj_t * alternates; - const cfg_obj_t * zonelist; - const cfg_obj_t * dlzlist; - const cfg_obj_t * dlz; - unsigned int dlzargc; - char ** dlzargv; - const cfg_obj_t * dyndb_list, *plugin_list; - const cfg_obj_t * disabled; - const cfg_obj_t * obj, *obj2; + isc_mem_t *mctx, cfg_aclconfctx_t *actx, bool need_hints) { + const cfg_obj_t *maps[4]; + const cfg_obj_t *cfgmaps[3]; + const cfg_obj_t *optionmaps[3]; + const cfg_obj_t *options = NULL; + const cfg_obj_t *voptions = NULL; + const cfg_obj_t *forwardtype; + const cfg_obj_t *forwarders; + const cfg_obj_t *alternates; + const cfg_obj_t *zonelist; + const cfg_obj_t *dlzlist; + const cfg_obj_t *dlz; + unsigned int dlzargc; + char **dlzargv; + const cfg_obj_t *dyndb_list, *plugin_list; + const cfg_obj_t *disabled; + const cfg_obj_t *obj, *obj2; const cfg_listelt_t *element; - in_port_t port; - dns_cache_t * cache = NULL; - isc_result_t result; - size_t max_cache_size; - uint32_t max_cache_size_percent = 0; - size_t max_adb_size; - uint32_t lame_ttl, fail_ttl; - uint32_t max_stale_ttl; - dns_tsig_keyring_t * ring = NULL; - dns_view_t * pview = NULL; /* Production view */ - isc_mem_t * cmctx = NULL, *hmctx = NULL; - dns_dispatch_t * dispatch4 = NULL; - dns_dispatch_t * dispatch6 = NULL; - bool reused_cache = false; - bool shared_cache = false; - int i = 0, j = 0, k = 0; - const char * str; - const char * cachename = NULL; - dns_order_t * order = NULL; - uint32_t udpsize; - uint32_t maxbits; - unsigned int resopts = 0; - dns_zone_t * zone = NULL; - uint32_t max_clients_per_query; - bool empty_zones_enable; - const cfg_obj_t * disablelist = NULL; - isc_stats_t * resstats = NULL; - dns_stats_t * resquerystats = NULL; - bool auto_root = false; - named_cache_t * nsc; - bool zero_no_soattl; - dns_acl_t * clients = NULL, *mapped = NULL, *excluded = NULL; - unsigned int query_timeout, ndisp; - bool old_rpz_ok = false; - isc_dscp_t dscp4 = -1, dscp6 = -1; - dns_dyndbctx_t * dctx = NULL; - unsigned int resolver_param; - dns_ntatable_t * ntatable = NULL; - const char * qminmode = NULL; + in_port_t port; + dns_cache_t *cache = NULL; + isc_result_t result; + size_t max_cache_size; + uint32_t max_cache_size_percent = 0; + size_t max_adb_size; + uint32_t lame_ttl, fail_ttl; + uint32_t max_stale_ttl; + dns_tsig_keyring_t *ring = NULL; + dns_view_t *pview = NULL; /* Production view */ + isc_mem_t *cmctx = NULL, *hmctx = NULL; + dns_dispatch_t *dispatch4 = NULL; + dns_dispatch_t *dispatch6 = NULL; + bool reused_cache = false; + bool shared_cache = false; + int i = 0, j = 0, k = 0; + const char *str; + const char *cachename = NULL; + dns_order_t *order = NULL; + uint32_t udpsize; + uint32_t maxbits; + unsigned int resopts = 0; + dns_zone_t *zone = NULL; + uint32_t max_clients_per_query; + bool empty_zones_enable; + const cfg_obj_t *disablelist = NULL; + isc_stats_t *resstats = NULL; + dns_stats_t *resquerystats = NULL; + bool auto_root = false; + named_cache_t *nsc; + bool zero_no_soattl; + dns_acl_t *clients = NULL, *mapped = NULL, *excluded = NULL; + unsigned int query_timeout, ndisp; + bool old_rpz_ok = false; + isc_dscp_t dscp4 = -1, dscp6 = -1; + dns_dyndbctx_t *dctx = NULL; + unsigned int resolver_param; + dns_ntatable_t *ntatable = NULL; + const char *qminmode = NULL; REQUIRE(DNS_VIEW_VALID(view)); @@ -3988,13 +3948,15 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, */ obj = NULL; if (view->rdclass == dns_rdataclass_in && need_hints && - named_config_get(maps, "response-policy", &obj) == ISC_R_SUCCESS) { + named_config_get(maps, "response-policy", &obj) == ISC_R_SUCCESS) + { CHECK(configure_rpz(view, maps, obj, &old_rpz_ok)); } obj = NULL; if (view->rdclass == dns_rdataclass_in && need_hints && - named_config_get(maps, "catalog-zones", &obj) == ISC_R_SUCCESS) { + named_config_get(maps, "catalog-zones", &obj) == ISC_R_SUCCESS) + { CHECK(configure_catz(view, config, obj)); } @@ -4012,7 +3974,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, * Load zone configuration */ for (element = cfg_list_first(zonelist); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *zconfig = cfg_listelt_value(element); CHECK(configure_zone(config, zconfig, vconfig, mctx, view, viewlist, kasplist, actx, false, @@ -4064,13 +4027,14 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, } for (element = cfg_list_first(dlzlist); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { dlz = cfg_listelt_value(element); obj = NULL; (void)cfg_map_get(dlz, "database", &obj); if (obj != NULL) { - dns_dlzdb_t * dlzdb = NULL; + dns_dlzdb_t *dlzdb = NULL; const cfg_obj_t *name, *search = NULL; char *s = isc_mem_strdup(mctx, cfg_obj_asstring(obj)); @@ -4198,10 +4162,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, obj = NULL; result = named_config_get(maps, "dns64", &obj); if (result == ISC_R_SUCCESS && strcmp(view->name, "_bind") && - strcmp(view->name, "_meta")) { - isc_netaddr_t na, suffix, *sp; - unsigned int prefixlen; - const char * server, *contact; + strcmp(view->name, "_meta")) + { + isc_netaddr_t na, suffix, *sp; + unsigned int prefixlen; + const char *server, *contact; const cfg_obj_t *myobj; myobj = NULL; @@ -4221,10 +4186,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, } for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *map = cfg_listelt_value(element); - dns_dns64_t * dns64 = NULL; - unsigned int dns64options = 0; + dns_dns64_t *dns64 = NULL; + unsigned int dns64options = 0; cfg_obj_asnetprefix(cfg_map_getname(map), &na, &prefixlen); @@ -4422,7 +4388,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, nsc = cachelist_find(cachelist, cachename, view->rdclass); if (nsc != NULL) { if (!cache_sharable(nsc->primaryview, view, zero_no_soattl, - max_cache_size, max_stale_ttl)) { + max_cache_size, max_stale_ttl)) + { isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "views %s and %s can't share the cache " @@ -4438,8 +4405,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, result = dns_viewlist_find(&named_g_server->viewlist, cachename, view->rdclass, &pview); - if (result != ISC_R_NOTFOUND && - result != ISC_R_SUCCESS) { + if (result != ISC_R_NOTFOUND && result != ISC_R_SUCCESS) + { goto cleanup; } if (pview != NULL) { @@ -4604,7 +4571,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, */ { uint32_t fps, freq; - double low, high, discount; + double low, high, discount; obj = NULL; result = named_config_get(maps, "fetches-per-server", &obj); @@ -4613,7 +4580,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, fps = cfg_obj_asuint32(obj2); obj2 = cfg_tuple_get(obj, "response"); if (!cfg_obj_isvoid(obj2)) { - const char * resp = cfg_obj_asstring(obj2); + const char *resp = cfg_obj_asstring(obj2); isc_result_t r = DNS_R_SERVFAIL; if (strcasecmp(resp, "drop") == 0) { @@ -4757,7 +4724,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, (void)named_config_get(maps, "disable-algorithms", &disabled); if (disabled != NULL) { for (element = cfg_list_first(disabled); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { CHECK(disable_algorithms(cfg_listelt_value(element), view->resolver)); } @@ -4771,7 +4739,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, (void)named_config_get(maps, "disable-ds-digests", &disabled); if (disabled != NULL) { for (element = cfg_list_first(disabled); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { CHECK(disable_ds_digests(cfg_listelt_value(element), view->resolver)); } @@ -4863,14 +4832,15 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, */ { const cfg_obj_t *peers = NULL; - dns_peerlist_t * newpeers = NULL; + dns_peerlist_t *newpeers = NULL; (void)named_config_get(cfgmaps, "server", &peers); CHECK(dns_peerlist_new(mctx, &newpeers)); for (element = cfg_list_first(peers); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *cpeer = cfg_listelt_value(element); - dns_peer_t * peer; + dns_peer_t *peer; CHECK(configure_peer(cpeer, mctx, &peer)); dns_peerlist_addpeer(newpeers, peer); @@ -4889,7 +4859,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, (void)named_config_get(maps, "rrset-order", &rrsetorder); CHECK(dns_order_create(mctx, &order)); for (element = cfg_list_first(rrsetorder); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *ent = cfg_listelt_value(element); CHECK(configure_order(order, ent)); @@ -5252,7 +5223,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, if (result == ISC_R_SUCCESS) { const cfg_obj_t *padobj = cfg_tuple_get(obj, "block-size"); const cfg_obj_t *aclobj = cfg_tuple_get(obj, "acl"); - uint32_t padding = cfg_obj_asuint32(padobj); + uint32_t padding = cfg_obj_asuint32(padobj); if (padding > 512U) { cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING, @@ -5303,7 +5274,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, dns_resolver_setfetchesperzone(view->resolver, cfg_obj_asuint32(obj2)); obj2 = cfg_tuple_get(obj, "response"); if (!cfg_obj_isvoid(obj2)) { - const char * resp = cfg_obj_asstring(obj2); + const char *resp = cfg_obj_asstring(obj2); isc_result_t r = DNS_R_SERVFAIL; if (strcasecmp(resp, "drop") == 0) { @@ -5395,12 +5366,13 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, } if (result == ISC_R_SUCCESS && !cfg_obj_isvoid(obj)) { const cfg_obj_t *exclude; - dns_fixedname_t fixed; - dns_name_t * name; + dns_fixedname_t fixed; + dns_name_t *name; name = dns_fixedname_initname(&fixed); for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { exclude = cfg_listelt_value(element); CHECK(dns_name_fromstring( name, cfg_obj_asstring(exclude), 0, NULL)); @@ -5422,7 +5394,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, #ifdef HAVE_DLOPEN for (element = cfg_list_first(dyndb_list); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *dyndb = cfg_listelt_value(element); if (dctx == NULL) { @@ -5483,16 +5456,16 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, } if (empty_zones_enable) { - const char * empty; - int empty_zone = 0; + const char *empty; + int empty_zone = 0; dns_fixedname_t fixed; - dns_name_t * name; - isc_buffer_t buffer; - char server[DNS_NAME_FORMATSIZE + 1]; - char contact[DNS_NAME_FORMATSIZE + 1]; - const char * empty_dbtype[4] = { "_builtin", "empty", NULL, - NULL }; - int empty_dbtypec = 4; + dns_name_t *name; + isc_buffer_t buffer; + char server[DNS_NAME_FORMATSIZE + 1]; + char contact[DNS_NAME_FORMATSIZE + 1]; + const char *empty_dbtype[4] = { "_builtin", "empty", NULL, + NULL }; + int empty_dbtypec = 4; dns_zonestat_level_t statlevel = dns_zonestat_none; name = dns_fixedname_initname(&fixed); @@ -5547,7 +5520,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, } for (empty = empty_zones[empty_zone]; empty != NULL; - empty = empty_zones[++empty_zone]) { + empty = empty_zones[++empty_zone]) + { dns_forwarders_t *dnsforwarders = NULL; /* @@ -5585,8 +5559,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, result = dns_viewlist_find(&named_g_server->viewlist, view->name, view->rdclass, &pview); - if (result != ISC_R_NOTFOUND && - result != ISC_R_SUCCESS) { + if (result != ISC_R_NOTFOUND && result != ISC_R_SUCCESS) + { goto cleanup; } @@ -5649,9 +5623,10 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config, } if (result == ISC_R_SUCCESS) { for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { dns_fixedname_t fntaname; - dns_name_t * ntaname; + dns_name_t *ntaname; ntaname = dns_fixedname_initname(&fntaname); obj = cfg_listelt_value(element); @@ -5723,10 +5698,9 @@ cleanup: } static isc_result_t -configure_hints(dns_view_t *view, const char *filename) -{ +configure_hints(dns_view_t *view, const char *filename) { isc_result_t result; - dns_db_t * db; + dns_db_t *db; db = NULL; result = dns_rootns_create(view->mctx, view->rdclass, filename, &db); @@ -5740,13 +5714,12 @@ configure_hints(dns_view_t *view, const char *filename) static isc_result_t configure_alternates(const cfg_obj_t *config, dns_view_t *view, - const cfg_obj_t *alternates) -{ - const cfg_obj_t * portobj; - const cfg_obj_t * addresses; + const cfg_obj_t *alternates) { + const cfg_obj_t *portobj; + const cfg_obj_t *addresses; const cfg_listelt_t *element; - isc_result_t result = ISC_R_SUCCESS; - in_port_t port; + isc_result_t result = ISC_R_SUCCESS; + in_port_t port; /* * Determine which port to send requests to. @@ -5773,18 +5746,19 @@ configure_alternates(const cfg_obj_t *config, dns_view_t *view, } for (element = cfg_list_first(addresses); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *alternate = cfg_listelt_value(element); - isc_sockaddr_t sa; + isc_sockaddr_t sa; if (!cfg_obj_issockaddr(alternate)) { dns_fixedname_t fixed; - dns_name_t * name; - const char * str = + dns_name_t *name; + const char *str = cfg_obj_asstring(cfg_tuple_get(alternate, "nam" "e")); isc_buffer_t buffer; - in_port_t myport = port; + in_port_t myport = port; isc_buffer_constinit(&buffer, str, strlen(str)); isc_buffer_add(&buffer, strlen(str)); @@ -5823,17 +5797,16 @@ cleanup: 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) -{ - const cfg_obj_t * portobj, *dscpobj; - const cfg_obj_t * faddresses; + const cfg_obj_t *forwardtype) { + const cfg_obj_t *portobj, *dscpobj; + const cfg_obj_t *faddresses; const cfg_listelt_t *element; - dns_fwdpolicy_t fwdpolicy = dns_fwdpolicy_none; - dns_forwarderlist_t fwdlist; - dns_forwarder_t * fwd; - isc_result_t result; - in_port_t port; - isc_dscp_t dscp = -1; + dns_fwdpolicy_t fwdpolicy = dns_fwdpolicy_none; + dns_forwarderlist_t fwdlist; + dns_forwarder_t *fwd; + isc_result_t result; + in_port_t port; + isc_dscp_t dscp = -1; ISC_LIST_INIT(fwdlist); @@ -5880,7 +5853,8 @@ configure_forward(const cfg_obj_t *config, dns_view_t *view, } for (element = cfg_list_first(faddresses); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *forwarder = cfg_listelt_value(element); fwd = isc_mem_get(view->mctx, sizeof(dns_forwarder_t)); fwd->addr = *cfg_obj_assockaddr(forwarder); @@ -5944,10 +5918,9 @@ cleanup: static isc_result_t get_viewinfo(const cfg_obj_t *vconfig, const char **namep, - dns_rdataclass_t *classp) -{ - isc_result_t result = ISC_R_SUCCESS; - const char * viewname; + dns_rdataclass_t *classp) { + isc_result_t result = ISC_R_SUCCESS; + const char *viewname; dns_rdataclass_t viewclass; REQUIRE(namep != NULL && *namep == NULL); @@ -5986,12 +5959,11 @@ cleanup: */ static isc_result_t find_view(const cfg_obj_t *vconfig, dns_viewlist_t *viewlist, - dns_view_t **viewp) -{ - isc_result_t result; - const char * viewname = NULL; + dns_view_t **viewp) { + isc_result_t result; + const char *viewname = NULL; dns_rdataclass_t viewclass; - dns_view_t * view = NULL; + dns_view_t *view = NULL; result = get_viewinfo(vconfig, &viewname, &viewclass); if (result != ISC_R_SUCCESS) { @@ -6016,12 +5988,11 @@ find_view(const cfg_obj_t *vconfig, dns_viewlist_t *viewlist, */ static isc_result_t create_view(const cfg_obj_t *vconfig, dns_viewlist_t *viewlist, - dns_view_t **viewp) -{ - isc_result_t result; - const char * viewname = NULL; + dns_view_t **viewp) { + isc_result_t result; + const char *viewname = NULL; dns_rdataclass_t viewclass; - dns_view_t * view = NULL; + dns_view_t *view = NULL; result = get_viewinfo(vconfig, &viewname, &viewclass); if (result != ISC_R_SUCCESS) { @@ -6057,12 +6028,11 @@ 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) -{ - dns_view_t * pview = NULL; /* Production view */ - dns_zone_t * zone = NULL; /* New or reused zone */ - dns_zone_t * raw = NULL; /* New or reused raw zone */ - dns_zone_t * dupzone = NULL; + bool modify) { + dns_view_t *pview = NULL; /* Production view */ + dns_zone_t *zone = NULL; /* New or reused zone */ + dns_zone_t *raw = NULL; /* New or reused raw zone */ + dns_zone_t *dupzone = NULL; const cfg_obj_t *options = NULL; const cfg_obj_t *zoptions = NULL; const cfg_obj_t *typeobj = NULL; @@ -6072,16 +6042,16 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, const cfg_obj_t *only = NULL; const cfg_obj_t *signing = NULL; const cfg_obj_t *viewobj = NULL; - isc_result_t result; - isc_result_t tresult; - isc_buffer_t buffer; - dns_fixedname_t fixorigin; - dns_name_t * origin; - const char * zname; + isc_result_t result; + isc_result_t tresult; + isc_buffer_t buffer; + dns_fixedname_t fixorigin; + dns_name_t *origin; + const char *zname; dns_rdataclass_t zclass; - const char * ztypestr; - dns_rpz_num_t rpz_num; - bool zone_is_catz = false; + const char *ztypestr; + dns_rpz_num_t rpz_num; + bool zone_is_catz = false; options = NULL; (void)cfg_map_get(config, "options", &options); @@ -6201,10 +6171,10 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, * Hint zones may also refer to delegation only points. */ only = NULL; - tresult = - cfg_map_get(zoptions, "delegation-only", &only); - if (tresult == ISC_R_SUCCESS && - cfg_obj_asboolean(only)) { + tresult = cfg_map_get(zoptions, "delegation-only", + &only); + if (tresult == ISC_R_SUCCESS && cfg_obj_asboolean(only)) + { CHECK(dns_view_adddelegationonly(view, origin)); } } else { @@ -6308,12 +6278,13 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, */ for (rpz_num = 0;; ++rpz_num) { if (view->rpzs == NULL || rpz_num >= view->rpzs->p.num_zones || - view->rpzs->p.dnsrps_enabled) { + view->rpzs->p.dnsrps_enabled) + { rpz_num = DNS_RPZ_INVALID_NUM; break; } - if (dns_name_equal(&view->rpzs->zones[rpz_num]->origin, - origin)) { + if (dns_name_equal(&view->rpzs->zones[rpz_num]->origin, origin)) + { break; } } @@ -6352,7 +6323,8 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, } if (zone != NULL && (rpz_num != dns_zone_get_rpz_num(zone) || - (rpz_num != DNS_RPZ_INVALID_NUM && !old_rpz_ok))) { + (rpz_num != DNS_RPZ_INVALID_NUM && !old_rpz_ok))) + { dns_zone_detach(&zone); } @@ -6428,7 +6400,8 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, (cfg_map_get(zoptions, "dnssec-policy", &signing) == ISC_R_SUCCESS && signing != NULL && - strcmp(cfg_obj_asstring(signing), "none") != 0))) { + strcmp(cfg_obj_asstring(signing), "none") != 0))) + { dns_zone_getraw(zone, &raw); if (raw == NULL) { CHECK(dns_zone_create(&raw, mctx)); @@ -6438,7 +6411,8 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig, CHECK(dns_zone_link(zone, raw)); } if (cfg_map_get(zoptions, "ixfr-from-differences", - &ixfrfromdiffs) == ISC_R_SUCCESS) { + &ixfrfromdiffs) == ISC_R_SUCCESS) + { isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, "zone '%s': 'ixfr-from-differences' is " @@ -6499,14 +6473,13 @@ cleanup: * Configure built-in zone for storing managed-key data. */ static isc_result_t -add_keydata_zone(dns_view_t *view, const char *directory, isc_mem_t *mctx) -{ +add_keydata_zone(dns_view_t *view, const char *directory, isc_mem_t *mctx) { isc_result_t result; - dns_view_t * pview = NULL; - dns_zone_t * zone = NULL; - dns_acl_t * none = NULL; - char filename[PATH_MAX]; - bool defaultview; + dns_view_t *pview = NULL; + dns_zone_t *zone = NULL; + dns_acl_t *none = NULL; + char filename[PATH_MAX]; + bool defaultview; REQUIRE(view != NULL); @@ -6586,10 +6559,9 @@ cleanup: */ static void configure_server_quota(const cfg_obj_t **maps, const char *name, - isc_quota_t *quota) -{ + isc_quota_t *quota) { const cfg_obj_t *obj = NULL; - isc_result_t result; + isc_result_t result; result = named_config_get(maps, name, &obj); INSIST(result == ISC_R_SUCCESS); @@ -6601,10 +6573,9 @@ configure_server_quota(const cfg_obj_t **maps, const char *name, * parsed. This can be extended to support other options if necessary. */ static isc_result_t -directory_callback(const char *clausename, const cfg_obj_t *obj, void *arg) -{ +directory_callback(const char *clausename, const cfg_obj_t *obj, void *arg) { isc_result_t result; - const char * directory; + const char *directory; REQUIRE(strcasecmp("directory", clausename) == 0); @@ -6642,19 +6613,19 @@ directory_callback(const char *clausename, const cfg_obj_t *obj, void *arg) static isc_result_t add_listenelt(isc_mem_t *mctx, ns_listenlist_t *list, isc_sockaddr_t *addr, - isc_dscp_t dscp, bool wcardport_ok) -{ + isc_dscp_t dscp, bool wcardport_ok) { ns_listenelt_t *lelt = NULL; - dns_acl_t * src_acl = NULL; - isc_result_t result; - isc_sockaddr_t any_sa6; - isc_netaddr_t netaddr; + dns_acl_t *src_acl = NULL; + isc_result_t result; + isc_sockaddr_t any_sa6; + isc_netaddr_t netaddr; REQUIRE(isc_sockaddr_pf(addr) == AF_INET6); isc_sockaddr_any6(&any_sa6); if (!isc_sockaddr_equal(&any_sa6, addr) && - (wcardport_ok || isc_sockaddr_getport(addr) != 0)) { + (wcardport_ok || isc_sockaddr_getport(addr) != 0)) + { isc_netaddr_fromin6(&netaddr, &addr->type.sin6.sin6_addr); result = dns_acl_create(mctx, 0, &src_acl); @@ -6692,14 +6663,13 @@ clean: * sockets. */ static void -adjust_interfaces(named_server_t *server, isc_mem_t *mctx) -{ - isc_result_t result; +adjust_interfaces(named_server_t *server, isc_mem_t *mctx) { + isc_result_t result; ns_listenlist_t *list = NULL; - dns_view_t * view; - dns_zone_t * zone, *next; - isc_sockaddr_t addr, *addrp; - isc_dscp_t dscp = -1; + dns_view_t *view; + dns_zone_t *zone, *next; + isc_sockaddr_t addr, *addrp; + isc_dscp_t dscp = -1; result = ns_listenlist_create(mctx, &list); if (result != ISC_R_SUCCESS) { @@ -6707,7 +6677,8 @@ adjust_interfaces(named_server_t *server, isc_mem_t *mctx) } for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { dns_dispatch_t *dispatch6; dispatch6 = dns_resolver_dispatchv6(view->resolver); @@ -6737,7 +6708,8 @@ adjust_interfaces(named_server_t *server, isc_mem_t *mctx) zone = NULL; for (result = dns_zone_first(server->zonemgr, &zone); result == ISC_R_SUCCESS; - next = NULL, result = dns_zone_next(zone, &next), zone = next) { + next = NULL, result = dns_zone_next(zone, &next), zone = next) + { dns_view_t *zoneview; /* @@ -6754,7 +6726,8 @@ adjust_interfaces(named_server_t *server, isc_mem_t *mctx) } for (view = ISC_LIST_HEAD(server->viewlist); view != NULL && view != zoneview; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { } if (view == NULL) { continue; @@ -6799,8 +6772,7 @@ fail: */ static void -interface_timer_tick(isc_task_t *task, isc_event_t *event) -{ +interface_timer_tick(isc_task_t *task, isc_event_t *event) { named_server_t *server = (named_server_t *)event->ev_arg; INSIST(task == server->task); UNUSED(task); @@ -6810,10 +6782,9 @@ interface_timer_tick(isc_task_t *task, isc_event_t *event) } static void -heartbeat_timer_tick(isc_task_t *task, isc_event_t *event) -{ +heartbeat_timer_tick(isc_task_t *task, isc_event_t *event) { named_server_t *server = (named_server_t *)event->ev_arg; - dns_view_t * view; + dns_view_t *view; UNUSED(task); isc_event_free(&event); @@ -6825,16 +6796,15 @@ heartbeat_timer_tick(isc_task_t *task, isc_event_t *event) } typedef struct { - isc_mem_t * mctx; - isc_task_t * task; + isc_mem_t *mctx; + isc_task_t *task; dns_rdataset_t rdataset; dns_rdataset_t sigrdataset; - dns_fetch_t * fetch; + dns_fetch_t *fetch; } ns_tat_t; static int -cid(const void *a, const void *b) -{ +cid(const void *a, const void *b) { const uint16_t ida = *(const uint16_t *)a; const uint16_t idb = *(const uint16_t *)b; if (ida < idb) { @@ -6847,10 +6817,9 @@ cid(const void *a, const void *b) } static void -tat_done(isc_task_t *task, isc_event_t *event) -{ +tat_done(isc_task_t *task, isc_event_t *event) { dns_fetchevent_t *devent; - ns_tat_t * tat; + ns_tat_t *tat; UNUSED(task); INSIST(event != NULL && event->ev_type == DNS_EVENT_FETCHDONE); @@ -6894,22 +6863,21 @@ struct dotat_arg { * reported in the TAT query. */ static isc_result_t -get_tat_qname(dns_name_t *target, dns_name_t *keyname, dns_keynode_t *keynode) -{ - dns_rdataset_t * dsset = NULL; - unsigned int i, n = 0; - uint16_t ids[12]; +get_tat_qname(dns_name_t *target, dns_name_t *keyname, dns_keynode_t *keynode) { + dns_rdataset_t *dsset = NULL; + unsigned int i, n = 0; + uint16_t ids[12]; isc_textregion_t r; - char label[64]; - int m; + char label[64]; + int m; if ((dsset = dns_keynode_dsset(keynode)) != NULL) { isc_result_t result; for (result = dns_rdataset_first(dsset); - result == ISC_R_SUCCESS; - result = dns_rdataset_next(dsset)) { - dns_rdata_t rdata = DNS_RDATA_INIT; + result == ISC_R_SUCCESS; result = dns_rdataset_next(dsset)) + { + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_ds_t ds; dns_rdata_reset(&rdata); @@ -6956,17 +6924,16 @@ get_tat_qname(dns_name_t *target, dns_name_t *keyname, dns_keynode_t *keynode) static void dotat(dns_keytable_t *keytable, dns_keynode_t *keynode, dns_name_t *keyname, - void *arg) -{ + void *arg) { struct dotat_arg *dotat_arg = arg; - char namebuf[DNS_NAME_FORMATSIZE]; - dns_fixedname_t fixed, fdomain; - dns_name_t * tatname, *domain; - dns_rdataset_t nameservers; - isc_result_t result; - dns_view_t * view; - isc_task_t * task; - ns_tat_t * tat; + char namebuf[DNS_NAME_FORMATSIZE]; + dns_fixedname_t fixed, fdomain; + dns_name_t *tatname, *domain; + dns_rdataset_t nameservers; + isc_result_t result; + dns_view_t *view; + isc_task_t *task; + ns_tat_t *tat; REQUIRE(keytable != NULL); REQUIRE(keynode != NULL); @@ -7052,18 +7019,18 @@ dotat(dns_keytable_t *keytable, dns_keynode_t *keynode, dns_name_t *keyname, } static void -tat_timer_tick(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result; - named_server_t * server = (named_server_t *)event->ev_arg; +tat_timer_tick(isc_task_t *task, isc_event_t *event) { + isc_result_t result; + named_server_t *server = (named_server_t *)event->ev_arg; struct dotat_arg arg; - dns_view_t * view; - dns_keytable_t * secroots = NULL; + dns_view_t *view; + dns_keytable_t *secroots = NULL; isc_event_free(&event); for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if (!view->trust_anchor_telemetry || !view->enablevalidation) { continue; } @@ -7081,10 +7048,9 @@ tat_timer_tick(isc_task_t *task, isc_event_t *event) } static void -pps_timer_tick(isc_task_t *task, isc_event_t *event) -{ +pps_timer_tick(isc_task_t *task, isc_event_t *event) { static unsigned int oldrequests = 0; - unsigned int requests = atomic_load_relaxed(&ns_client_requests); + unsigned int requests = atomic_load_relaxed(&ns_client_requests); UNUSED(task); isc_event_free(&event); @@ -7102,8 +7068,7 @@ pps_timer_tick(isc_task_t *task, isc_event_t *event) * null-terminated string pointed to by 'value', or NULL. */ static isc_result_t -setstring(named_server_t *server, char **field, const char *value) -{ +setstring(named_server_t *server, char **field, const char *value) { char *copy; if (value != NULL) { @@ -7126,8 +7091,7 @@ setstring(named_server_t *server, char **field, const char *value) * or NULL if whether 'obj' is a string or void value, respectively. */ static isc_result_t -setoptstring(named_server_t *server, char **field, const cfg_obj_t *obj) -{ +setoptstring(named_server_t *server, char **field, const cfg_obj_t *obj) { if (cfg_obj_isvoid(obj)) { return (setstring(server, field, NULL)); } else { @@ -7138,12 +7102,11 @@ setoptstring(named_server_t *server, char **field, const cfg_obj_t *obj) static void set_limit(const cfg_obj_t **maps, const char *configname, const char *description, isc_resource_t resourceid, - isc_resourcevalue_t defaultvalue) -{ - const cfg_obj_t * obj = NULL; - const char * resource; + isc_resourcevalue_t defaultvalue) { + const cfg_obj_t *obj = NULL; + const char *resource; isc_resourcevalue_t value; - isc_result_t result; + isc_result_t result; if (named_config_get(maps, configname, &obj) != ISC_R_SUCCESS) { return; @@ -7174,8 +7137,7 @@ set_limit(const cfg_obj_t **maps, const char *configname, named_g_init##resource) static void -set_limits(const cfg_obj_t **maps) -{ +set_limits(const cfg_obj_t **maps) { SETLIMIT("stacksize", stacksize, "stack size"); SETLIMIT("datasize", datasize, "data size"); SETLIMIT("coresize", coresize, "core size"); @@ -7183,12 +7145,13 @@ set_limits(const cfg_obj_t **maps) } static void -portset_fromconf(isc_portset_t *portset, const cfg_obj_t *ports, bool positive) -{ +portset_fromconf(isc_portset_t *portset, const cfg_obj_t *ports, + bool positive) { const cfg_listelt_t *element; for (element = cfg_list_first(ports); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *obj = cfg_listelt_value(element); if (cfg_obj_isuint32(obj)) { @@ -7201,7 +7164,7 @@ portset_fromconf(isc_portset_t *portset, const cfg_obj_t *ports, bool positive) } } else { const cfg_obj_t *obj_loport, *obj_hiport; - in_port_t loport, hiport; + in_port_t loport, hiport; obj_loport = cfg_tuple_get(obj, "loport"); loport = (in_port_t)cfg_obj_asuint32(obj_loport); @@ -7219,8 +7182,7 @@ portset_fromconf(isc_portset_t *portset, const cfg_obj_t *ports, bool positive) } static isc_result_t -removed(dns_zone_t *zone, void *uap) -{ +removed(dns_zone_t *zone, void *uap) { const char *type; if (dns_zone_getview(zone) != uap) { @@ -7255,8 +7217,7 @@ removed(dns_zone_t *zone, void *uap) } static void -cleanup_session_key(named_server_t *server, isc_mem_t *mctx) -{ +cleanup_session_key(named_server_t *server, isc_mem_t *mctx) { if (server->session_keyfile != NULL) { isc_file_remove(server->session_keyfile); isc_mem_free(mctx, server->session_keyfile); @@ -7283,18 +7244,17 @@ static isc_result_t generate_session_key(const char *filename, const char *keynamestr, const dns_name_t *keyname, const char *algstr, const dns_name_t *algname, unsigned int algtype, - uint16_t bits, isc_mem_t *mctx, dns_tsigkey_t **tsigkeyp) -{ - isc_result_t result = ISC_R_SUCCESS; - dst_key_t * key = NULL; - isc_buffer_t key_txtbuffer; - isc_buffer_t key_rawbuffer; - char key_txtsecret[256]; - char key_rawsecret[64]; - isc_region_t key_rawregion; - isc_stdtime_t now; + uint16_t bits, isc_mem_t *mctx, dns_tsigkey_t **tsigkeyp) { + isc_result_t result = ISC_R_SUCCESS; + dst_key_t *key = NULL; + isc_buffer_t key_txtbuffer; + isc_buffer_t key_rawbuffer; + char key_txtsecret[256]; + char key_rawsecret[64]; + isc_region_t key_rawregion; + isc_stdtime_t now; dns_tsigkey_t *tsigkey = NULL; - FILE * fp = NULL; + FILE *fp = NULL; isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_INFO, @@ -7376,19 +7336,18 @@ cleanup: static isc_result_t configure_session_key(const cfg_obj_t **maps, named_server_t *server, - isc_mem_t *mctx) -{ - const char * keyfile, *keynamestr, *algstr; - unsigned int algtype; - dns_fixedname_t fname; - dns_name_t * keyname; + isc_mem_t *mctx) { + const char *keyfile, *keynamestr, *algstr; + unsigned int algtype; + dns_fixedname_t fname; + dns_name_t *keyname; const dns_name_t *algname; - isc_buffer_t buffer; - uint16_t bits; - const cfg_obj_t * obj; - bool need_deleteold = false; - bool need_createnew = false; - isc_result_t result; + isc_buffer_t buffer; + uint16_t bits; + const cfg_obj_t *obj; + bool need_deleteold = false; + bool need_createnew = false; + isc_result_t result; obj = NULL; result = named_config_get(maps, "session-keyfile", &obj); @@ -7441,7 +7400,8 @@ configure_session_key(const cfg_obj_t **maps, named_server_t *server, } else if (strcmp(keyfile, server->session_keyfile) != 0 || !dns_name_equal(server->session_keyname, keyname) || server->session_keyalg != algtype || - server->session_keybits != bits) { + server->session_keybits != bits) + { need_deleteold = true; need_createnew = true; } @@ -7484,8 +7444,7 @@ cleanup: #ifndef HAVE_LMDB static isc_result_t -count_newzones(dns_view_t *view, ns_cfgctx_t *nzcfg, int *num_zonesp) -{ +count_newzones(dns_view_t *view, ns_cfgctx_t *nzcfg, int *num_zonesp) { isc_result_t result; /* The new zone file may not exist. That is OK. */ @@ -7528,10 +7487,9 @@ count_newzones(dns_view_t *view, ns_cfgctx_t *nzcfg, int *num_zonesp) #else /* HAVE_LMDB */ static isc_result_t -count_newzones(dns_view_t *view, ns_cfgctx_t *nzcfg, int *num_zonesp) -{ +count_newzones(dns_view_t *view, ns_cfgctx_t *nzcfg, int *num_zonesp) { isc_result_t result; - int n; + int n; UNUSED(nzcfg); @@ -7567,19 +7525,18 @@ cleanup: static isc_result_t setup_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, cfg_parser_t *conf_parser, cfg_aclconfctx_t *actx, - int *num_zones) -{ - isc_result_t result = ISC_R_SUCCESS; - bool allow = false; - ns_cfgctx_t * nzcfg = NULL; + int *num_zones) { + isc_result_t result = ISC_R_SUCCESS; + bool allow = false; + ns_cfgctx_t *nzcfg = NULL; const cfg_obj_t *maps[4]; const cfg_obj_t *options = NULL, *voptions = NULL; const cfg_obj_t *nz = NULL; const cfg_obj_t *nzdir = NULL; - const char * dir = NULL; + const char *dir = NULL; const cfg_obj_t *obj = NULL; - int i = 0; - uint64_t mapsize = 0ULL; + int i = 0; + uint64_t mapsize = 0ULL; REQUIRE(config != NULL); @@ -7703,15 +7660,14 @@ setup_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, static void configure_zone_setviewcommit(isc_result_t result, const cfg_obj_t *zconfig, - dns_view_t *view) -{ - const char * zname; + dns_view_t *view) { + const char *zname; dns_fixedname_t fixorigin; - dns_name_t * origin; - isc_result_t result2; - dns_view_t * pview = NULL; - dns_zone_t * zone = NULL; - dns_zone_t * raw = NULL; + dns_name_t *origin; + isc_result_t result2; + dns_view_t *pview = NULL; + dns_zone_t *zone = NULL; + dns_zone_t *raw = NULL; zname = cfg_obj_asstring(cfg_tuple_get(zconfig, "name")); origin = dns_fixedname_initname(&fixorigin); @@ -7759,11 +7715,10 @@ configure_zone_setviewcommit(isc_result_t result, const cfg_obj_t *zconfig, 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) -{ - isc_result_t result; - ns_cfgctx_t * nzctx; - const cfg_obj_t * zonelist; + isc_mem_t *mctx, cfg_aclconfctx_t *actx) { + isc_result_t result; + ns_cfgctx_t *nzctx; + const cfg_obj_t *zonelist; const cfg_listelt_t *element; nzctx = view->new_zone_config; @@ -7779,7 +7734,8 @@ configure_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, cfg_map_get(nzctx->nzf_config, "zone", &zonelist); for (element = cfg_list_first(zonelist); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *zconfig = cfg_listelt_value(element); CHECK(configure_zone(config, zconfig, vconfig, mctx, view, &named_g_server->viewlist, @@ -7791,7 +7747,8 @@ configure_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, cleanup: for (element = cfg_list_first(zonelist); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *zconfig = cfg_listelt_value(element); configure_zone_setviewcommit(result, zconfig, view); } @@ -7803,14 +7760,13 @@ cleanup: static isc_result_t data_to_cfg(dns_view_t *view, MDB_val *key, MDB_val *data, isc_buffer_t **text, - cfg_obj_t **zoneconfig) -{ + cfg_obj_t **zoneconfig) { isc_result_t result; - const char * zone_name; - size_t zone_name_len; - const char * zone_config; - size_t zone_config_len; - cfg_obj_t * zoneconf = NULL; + const char *zone_name; + size_t zone_name_len; + const char *zone_config; + size_t zone_config_len; + cfg_obj_t *zoneconf = NULL; REQUIRE(view != NULL); REQUIRE(key != NULL); @@ -7889,15 +7845,14 @@ typedef isc_result_t (*newzone_cfg_cb_t)(const cfg_obj_t *zconfig, static isc_result_t for_all_newzone_cfgs(newzone_cfg_cb_t callback, cfg_obj_t *config, cfg_obj_t *vconfig, isc_mem_t *mctx, dns_view_t *view, - cfg_aclconfctx_t *actx, MDB_txn *txn, MDB_dbi dbi) -{ + cfg_aclconfctx_t *actx, MDB_txn *txn, MDB_dbi dbi) { const cfg_obj_t *zconfig, *zlist; - isc_result_t result = ISC_R_SUCCESS; - cfg_obj_t * zconfigobj = NULL; - isc_buffer_t * text = NULL; - MDB_cursor * cursor = NULL; - MDB_val data, key; - int status; + isc_result_t result = ISC_R_SUCCESS; + cfg_obj_t *zconfigobj = NULL; + isc_buffer_t *text = NULL; + MDB_cursor *cursor = NULL; + MDB_val data, key; + int status; status = mdb_cursor_open(txn, dbi, &cursor); if (status != MDB_SUCCESS) { @@ -7906,7 +7861,8 @@ for_all_newzone_cfgs(newzone_cfg_cb_t callback, cfg_obj_t *config, for (status = mdb_cursor_get(cursor, &key, &data, MDB_FIRST); status == MDB_SUCCESS; - status = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) { + status = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) + { /* * Create a configuration object from data fetched from NZD. */ @@ -7959,8 +7915,7 @@ for_all_newzone_cfgs(newzone_cfg_cb_t callback, cfg_obj_t *config, static isc_result_t configure_newzone(const cfg_obj_t *zconfig, cfg_obj_t *config, cfg_obj_t *vconfig, isc_mem_t *mctx, dns_view_t *view, - cfg_aclconfctx_t *actx) -{ + cfg_aclconfctx_t *actx) { return (configure_zone( config, zconfig, vconfig, mctx, view, &named_g_server->viewlist, &named_g_server->kasplist, actx, true, false, false)); @@ -7972,8 +7927,7 @@ configure_newzone(const cfg_obj_t *zconfig, cfg_obj_t *config, static isc_result_t configure_newzone_revert(const cfg_obj_t *zconfig, cfg_obj_t *config, cfg_obj_t *vconfig, isc_mem_t *mctx, dns_view_t *view, - cfg_aclconfctx_t *actx) -{ + cfg_aclconfctx_t *actx) { UNUSED(config); UNUSED(vconfig); UNUSED(mctx); @@ -7986,11 +7940,10 @@ configure_newzone_revert(const cfg_obj_t *zconfig, cfg_obj_t *config, 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) -{ + isc_mem_t *mctx, cfg_aclconfctx_t *actx) { isc_result_t result; - MDB_txn * txn = NULL; - MDB_dbi dbi; + MDB_txn *txn = NULL; + MDB_dbi dbi; if (view->new_zone_config == NULL) { return (ISC_R_SUCCESS); @@ -8028,19 +7981,18 @@ configure_newzones(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig, static isc_result_t get_newzone_config(dns_view_t *view, const char *zonename, - cfg_obj_t **zoneconfig) -{ - isc_result_t result; - int status; - cfg_obj_t * zoneconf = NULL; - isc_buffer_t * text = NULL; - MDB_txn * txn = NULL; - MDB_dbi dbi; - MDB_val key, data; - char zname[DNS_NAME_FORMATSIZE]; + cfg_obj_t **zoneconfig) { + isc_result_t result; + int status; + cfg_obj_t *zoneconf = NULL; + isc_buffer_t *text = NULL; + MDB_txn *txn = NULL; + MDB_dbi dbi; + MDB_val key, data; + char zname[DNS_NAME_FORMATSIZE]; dns_fixedname_t fname; - dns_name_t * name; - isc_buffer_t b; + dns_name_t *name; + isc_buffer_t b; INSIST(zoneconfig != NULL && *zoneconfig == NULL); @@ -8090,17 +8042,17 @@ cleanup: #endif /* HAVE_LMDB */ static int -count_zones(const cfg_obj_t *conf) -{ - const cfg_obj_t * zonelist = NULL; +count_zones(const cfg_obj_t *conf) { + const cfg_obj_t *zonelist = NULL; const cfg_listelt_t *element; - int n = 0; + int n = 0; REQUIRE(conf != NULL); cfg_map_get(conf, "zone", &zonelist); for (element = cfg_list_first(zonelist); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { n++; } @@ -8108,14 +8060,14 @@ count_zones(const cfg_obj_t *conf) } static isc_result_t -check_lockfile(named_server_t *server, const cfg_obj_t *config, bool first_time) -{ - isc_result_t result; - const char * filename = NULL; +check_lockfile(named_server_t *server, const cfg_obj_t *config, + bool first_time) { + isc_result_t result; + const char *filename = NULL; const cfg_obj_t *maps[3]; const cfg_obj_t *options; const cfg_obj_t *obj; - int i; + int i; i = 0; options = NULL; @@ -8132,7 +8084,8 @@ check_lockfile(named_server_t *server, const cfg_obj_t *config, bool first_time) if (!first_time) { if (obj != NULL && !cfg_obj_isstring(obj) && server->lockfile != NULL && - strcmp(cfg_obj_asstring(obj), server->lockfile) != 0) { + strcmp(cfg_obj_asstring(obj), server->lockfile) != 0) + { isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING, "changing 'lock-file' " @@ -8158,8 +8111,8 @@ check_lockfile(named_server_t *server, const cfg_obj_t *config, bool first_time) server->mctx, named_g_defaultlockfile); } else { filename = cfg_obj_asstring(obj); - server->lockfile = - isc_mem_strdup(server->mctx, filename); + server->lockfile = isc_mem_strdup(server->mctx, + filename); } if (server->lockfile == NULL) { @@ -8169,8 +8122,8 @@ check_lockfile(named_server_t *server, const cfg_obj_t *config, bool first_time) if (named_g_forcelock && named_g_defaultlockfile != NULL) { INSIST(server->lockfile == NULL); - server->lockfile = - isc_mem_strdup(server->mctx, named_g_defaultlockfile); + server->lockfile = isc_mem_strdup(server->mctx, + named_g_defaultlockfile); } if (server->lockfile == NULL) { @@ -8191,49 +8144,48 @@ check_lockfile(named_server_t *server, const cfg_obj_t *config, bool first_time) static isc_result_t load_configuration(const char *filename, named_server_t *server, - bool first_time) -{ - cfg_obj_t * config = NULL, *bindkeys = NULL; - cfg_parser_t * conf_parser = NULL, *bindkeys_parser = NULL; + bool first_time) { + cfg_obj_t *config = NULL, *bindkeys = NULL; + cfg_parser_t *conf_parser = NULL, *bindkeys_parser = NULL; const cfg_listelt_t *element; - const cfg_obj_t * builtin_views; - const cfg_obj_t * maps[3]; - const cfg_obj_t * obj; - const cfg_obj_t * options; + const cfg_obj_t *builtin_views; + const cfg_obj_t *maps[3]; + const cfg_obj_t *obj; + const cfg_obj_t *options; const cfg_obj_t *usev4ports, *avoidv4ports, *usev6ports, *avoidv6ports; const cfg_obj_t *kasps; - dns_kasp_t * kasp = NULL; - dns_kasp_t * kasp_next = NULL; - dns_kasplist_t tmpkasplist, kasplist; + dns_kasp_t *kasp = NULL; + dns_kasp_t *kasp_next = NULL; + dns_kasplist_t tmpkasplist, kasplist; const cfg_obj_t *views; - dns_view_t * view = NULL; - dns_view_t * view_next = NULL; - dns_viewlist_t tmpviewlist; - dns_viewlist_t viewlist, builtin_viewlist; - in_port_t listen_port, udpport_low, udpport_high; - int i, backlog; - int num_zones = 0; - bool exclusive = false; - isc_interval_t interval; + dns_view_t *view = NULL; + dns_view_t *view_next = NULL; + dns_viewlist_t tmpviewlist; + dns_viewlist_t viewlist, builtin_viewlist; + in_port_t listen_port, udpport_low, udpport_high; + int i, backlog; + int num_zones = 0; + bool exclusive = false; + isc_interval_t interval; isc_logconfig_t *logc = NULL; - isc_portset_t * v4portset = NULL; - isc_portset_t * v6portset = NULL; + isc_portset_t *v4portset = NULL; + isc_portset_t *v6portset = NULL; isc_resourcevalue_t nfiles; - isc_result_t result, tresult; - uint32_t heartbeat_interval; - uint32_t interface_interval; - uint32_t reserved; - uint32_t udpsize; - uint32_t transfer_message_size; - named_cache_t * nsc; - named_cachelist_t cachelist, tmpcachelist; - ns_altsecret_t * altsecret; - ns_altsecretlist_t altsecrets, tmpaltsecrets; - unsigned int maxsocks; - uint32_t softquota = 0; - uint32_t max; - unsigned int initial, idle, keepalive, advertised; - dns_aclenv_t * env = + isc_result_t result, tresult; + uint32_t heartbeat_interval; + uint32_t interface_interval; + uint32_t reserved; + uint32_t udpsize; + uint32_t transfer_message_size; + named_cache_t *nsc; + named_cachelist_t cachelist, tmpcachelist; + ns_altsecret_t *altsecret; + ns_altsecretlist_t altsecrets, tmpaltsecrets; + unsigned int maxsocks; + uint32_t softquota = 0; + uint32_t max; + unsigned int initial, idle, keepalive, advertised; + dns_aclenv_t *env = ns_interfacemgr_getaclenv(named_g_server->interfacemgr); ISC_LIST_INIT(kasplist); @@ -8865,7 +8817,8 @@ load_configuration(const char *filename, named_server_t *server, kasps = NULL; (void)cfg_map_get(config, "dnssec-policy", &kasps); for (element = cfg_list_first(kasps); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { cfg_obj_t *kconfig = cfg_listelt_value(element); kasp = NULL; CHECK(cfg_kasp_fromconfig(kconfig, named_g_mctx, named_g_lctx, @@ -8907,10 +8860,11 @@ load_configuration(const char *filename, named_server_t *server, * waits until after the zone manager's task list has been sized. */ for (element = cfg_list_first(views); element != NULL; - element = cfg_list_next(element)) { - cfg_obj_t * vconfig = cfg_listelt_value(element); + element = cfg_list_next(element)) + { + cfg_obj_t *vconfig = cfg_listelt_value(element); const cfg_obj_t *voptions = cfg_tuple_get(vconfig, "options"); - int nzf_num_zones; + int nzf_num_zones; view = NULL; @@ -8959,7 +8913,8 @@ load_configuration(const char *filename, named_server_t *server, * time, but views with no zones must be created here. */ for (element = cfg_list_first(views); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { cfg_obj_t *vconfig = cfg_listelt_value(element); view = NULL; @@ -8992,7 +8947,8 @@ load_configuration(const char *filename, named_server_t *server, RUNTIME_CHECK(cfg_map_get(named_g_config, "view", &builtin_views) == ISC_R_SUCCESS); for (element = cfg_list_first(builtin_views); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { cfg_obj_t *vconfig = cfg_listelt_value(element); CHECK(create_view(vconfig, &builtin_viewlist, &view)); @@ -9012,7 +8968,8 @@ load_configuration(const char *filename, named_server_t *server, * view. */ for (view = ISC_LIST_HEAD(viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { dns_view_setviewcommit(view); } @@ -9060,7 +9017,8 @@ load_configuration(const char *filename, named_server_t *server, */ if (first_time) { for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { nzd_env_close(view); } } @@ -9090,7 +9048,8 @@ load_configuration(const char *filename, named_server_t *server, */ if (first_time) { for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { nzd_env_reopen(view); } } @@ -9189,9 +9148,10 @@ load_configuration(const char *filename, named_server_t *server, if (categories != NULL) { for (element = cfg_list_first(categories); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *catobj; - const char * str; + const char *str; obj = cfg_listelt_value(element); catobj = cfg_tuple_get(obj, "name"); @@ -9209,7 +9169,8 @@ load_configuration(const char *filename, named_server_t *server, obj = NULL; if (options != NULL && - cfg_map_get(options, "memstatistics", &obj) == ISC_R_SUCCESS) { + cfg_map_get(options, "memstatistics", &obj) == ISC_R_SUCCESS) + { named_g_memstatistics = cfg_obj_asboolean(obj); } else { named_g_memstatistics = @@ -9217,8 +9178,8 @@ load_configuration(const char *filename, named_server_t *server, } obj = NULL; - if (named_config_get(maps, "memstatistics-file", &obj) == - ISC_R_SUCCESS) { + if (named_config_get(maps, "memstatistics-file", &obj) == ISC_R_SUCCESS) + { named_main_setmemstats(cfg_obj_asstring(obj)); } else if (named_g_memstatistics) { named_main_setmemstats("named.memstats"); @@ -9313,14 +9274,15 @@ load_configuration(const char *filename, named_server_t *server, obj = NULL; result = named_config_get(maps, "cookie-secret", &obj); if (result == ISC_R_SUCCESS) { - const char * str; - bool first = true; + const char *str; + bool first = true; isc_buffer_t b; unsigned int usedlength; unsigned int expectedlength; for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { obj = cfg_listelt_value(element); str = cfg_obj_asstring(obj); @@ -9391,7 +9353,8 @@ load_configuration(const char *filename, named_server_t *server, * daemon, dnsrpzd, for each view that uses DNSRPS. */ for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { result = dns_dnsrps_connect(view->rpzs); if (result != ISC_R_SUCCESS) { view = NULL; @@ -9447,8 +9410,8 @@ cleanup: for (view = ISC_LIST_HEAD(viewlist); view != NULL; view = view_next) { view_next = ISC_LIST_NEXT(view, link); ISC_LIST_UNLINK(viewlist, view, link); - if (result == ISC_R_SUCCESS && - strcmp(view->name, "_bind") != 0) { + if (result == ISC_R_SUCCESS && strcmp(view->name, "_bind") != 0) + { dns_view_setviewrevert(view); (void)dns_zt_apply(view->zonetable, false, NULL, removed, view); @@ -9508,12 +9471,11 @@ cleanup: } static isc_result_t -view_loaded(void *arg) -{ - isc_result_t result; - ns_zoneload_t * zl = (ns_zoneload_t *)arg; +view_loaded(void *arg) { + isc_result_t result; + ns_zoneload_t *zl = (ns_zoneload_t *)arg; named_server_t *server = zl->server; - bool reconfig = zl->reconfig; + bool reconfig = zl->reconfig; /* * Force zone maintenance. Do this after loading @@ -9567,10 +9529,9 @@ view_loaded(void *arg) } static isc_result_t -load_zones(named_server_t *server, bool init, bool reconfig) -{ - isc_result_t result; - dns_view_t * view; +load_zones(named_server_t *server, bool init, bool reconfig) { + isc_result_t result; + dns_view_t *view; ns_zoneload_t *zl; zl = isc_mem_get(server->mctx, sizeof(*zl)); @@ -9586,12 +9547,14 @@ load_zones(named_server_t *server, bool init, bool reconfig) * Schedule zones to be loaded from disk. */ for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if (view->managed_keys != NULL) { result = dns_zone_load(view->managed_keys, false); if (result != ISC_R_SUCCESS && result != DNS_R_UPTODATE && - result != DNS_R_CONTINUE) { + result != DNS_R_CONTINUE) + { goto cleanup; } } @@ -9599,7 +9562,8 @@ load_zones(named_server_t *server, bool init, bool reconfig) result = dns_zone_load(view->redirect, false); if (result != ISC_R_SUCCESS && result != DNS_R_UPTODATE && - result != DNS_R_CONTINUE) { + result != DNS_R_CONTINUE) + { goto cleanup; } } @@ -9637,10 +9601,9 @@ cleanup: } static void -run_server(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result; - named_server_t * server = (named_server_t *)event->ev_arg; +run_server(isc_task_t *task, isc_event_t *event) { + isc_result_t result; + named_server_t *server = (named_server_t *)event->ev_arg; dns_geoip_databases_t *geoip; INSIST(task == server->task); @@ -9707,22 +9670,20 @@ run_server(isc_task_t *task, isc_event_t *event) } void -named_server_flushonshutdown(named_server_t *server, bool flush) -{ +named_server_flushonshutdown(named_server_t *server, bool flush) { REQUIRE(NAMED_SERVER_VALID(server)); server->flushonshutdown = flush; } static void -shutdown_server(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result; - dns_view_t * view, *view_next = NULL; - dns_kasp_t * kasp, *kasp_next = NULL; +shutdown_server(isc_task_t *task, isc_event_t *event) { + isc_result_t result; + dns_view_t *view, *view_next = NULL; + dns_kasp_t *kasp, *kasp_next = NULL; named_server_t *server = (named_server_t *)event->ev_arg; - bool flush = server->flushonshutdown; - named_cache_t * nsc; + bool flush = server->flushonshutdown; + named_cache_t *nsc; UNUSED(task); INSIST(task == server->task); @@ -9818,8 +9779,7 @@ shutdown_server(isc_task_t *task, isc_event_t *event) static isc_result_t get_matching_view(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr, dns_message_t *message, dns_aclenv_t *env, - isc_result_t *sigresult, dns_view_t **viewp) -{ + isc_result_t *sigresult, dns_view_t **viewp) { dns_view_t *view; REQUIRE(message != NULL); @@ -9827,7 +9787,8 @@ get_matching_view(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr, REQUIRE(viewp != NULL && *viewp == NULL); for (view = ISC_LIST_HEAD(named_g_server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if (message->rdclass == view->rdclass || message->rdclass == dns_rdataclass_any) { const dns_name_t *tsig = NULL; @@ -9845,7 +9806,8 @@ get_matching_view(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr, dns_acl_allowed(destaddr, tsig, view->matchdestinations, env) && !(view->matchrecursiveonly && - (message->flags & DNS_MESSAGEFLAG_RD) == 0)) { + (message->flags & DNS_MESSAGEFLAG_RD) == 0)) + { dns_view_attach(view, viewp); return (ISC_R_SUCCESS); } @@ -9856,9 +9818,8 @@ get_matching_view(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr, } void -named_server_create(isc_mem_t *mctx, named_server_t **serverp) -{ - isc_result_t result; +named_server_create(isc_mem_t *mctx, named_server_t **serverp) { + isc_result_t result; named_server_t *server = isc_mem_get(mctx, sizeof(*server)); if (server == NULL) { @@ -9953,8 +9914,8 @@ named_server_create(isc_mem_t *mctx, named_server_t **serverp) CHECKFATAL(server->statsfile == NULL ? ISC_R_NOMEMORY : ISC_R_SUCCESS, "isc_mem_strdup"); - server->bindkeysfile = - isc_mem_strdup(server->mctx, named_g_defaultbindkeys); + server->bindkeysfile = isc_mem_strdup(server->mctx, + named_g_defaultbindkeys); CHECKFATAL(server->bindkeysfile == NULL ? ISC_R_NOMEMORY : ISC_R_SUCCESS, "isc_mem_strdup"); @@ -10022,8 +9983,7 @@ named_server_create(isc_mem_t *mctx, named_server_t **serverp) } void -named_server_destroy(named_server_t **serverp) -{ +named_server_destroy(named_server_t **serverp) { named_server_t *server = *serverp; REQUIRE(NAMED_SERVER_VALID(server)); @@ -10081,8 +10041,7 @@ named_server_destroy(named_server_t **serverp) } static void -fatal(named_server_t *server, const char *msg, isc_result_t result) -{ +fatal(named_server_t *server, const char *msg, isc_result_t result) { if (server != NULL) { /* * Prevent races between the OpenSSL on_exit registered @@ -10102,22 +10061,21 @@ fatal(named_server_t *server, const char *msg, isc_result_t result) } static void -start_reserved_dispatches(named_server_t *server) -{ +start_reserved_dispatches(named_server_t *server) { REQUIRE(NAMED_SERVER_VALID(server)); server->dispatchgen++; } static void -end_reserved_dispatches(named_server_t *server, bool all) -{ +end_reserved_dispatches(named_server_t *server, bool all) { named_dispatch_t *dispatch, *nextdispatch; REQUIRE(NAMED_SERVER_VALID(server)); for (dispatch = ISC_LIST_HEAD(server->dispatches); dispatch != NULL; - dispatch = nextdispatch) { + dispatch = nextdispatch) + { nextdispatch = ISC_LIST_NEXT(dispatch, link); if (!all && server->dispatchgen == dispatch->dispatchgen) { continue; @@ -10129,13 +10087,13 @@ end_reserved_dispatches(named_server_t *server, bool all) } void -named_add_reserved_dispatch(named_server_t *server, const isc_sockaddr_t *addr) -{ +named_add_reserved_dispatch(named_server_t *server, + const isc_sockaddr_t *addr) { named_dispatch_t *dispatch; - in_port_t port; - char addrbuf[ISC_SOCKADDR_FORMATSIZE]; - isc_result_t result; - unsigned int attrs, attrmask; + in_port_t port; + char addrbuf[ISC_SOCKADDR_FORMATSIZE]; + isc_result_t result; + unsigned int attrs, attrmask; REQUIRE(NAMED_SERVER_VALID(server)); @@ -10145,7 +10103,8 @@ named_add_reserved_dispatch(named_server_t *server, const isc_sockaddr_t *addr) } for (dispatch = ISC_LIST_HEAD(server->dispatches); dispatch != NULL; - dispatch = ISC_LIST_NEXT(dispatch, link)) { + dispatch = ISC_LIST_NEXT(dispatch, link)) + { if (isc_sockaddr_equal(&dispatch->addr, addr)) { break; } @@ -10202,8 +10161,7 @@ cleanup: } static isc_result_t -loadconfig(named_server_t *server) -{ +loadconfig(named_server_t *server) { isc_result_t result; start_reserved_dispatches(server); result = load_configuration(named_g_conffile, server, false); @@ -10224,8 +10182,7 @@ loadconfig(named_server_t *server) } static isc_result_t -reload(named_server_t *server) -{ +reload(named_server_t *server) { isc_result_t result; server->reload_status = NAMED_RELOAD_IN_PROGRESS; CHECK(loadconfig(server)); @@ -10250,8 +10207,7 @@ cleanup: * Handle a reload event (from SIGHUP). */ static void -named_server_reload(isc_task_t *task, isc_event_t *event) -{ +named_server_reload(isc_task_t *task, isc_event_t *event) { named_server_t *server = (named_server_t *)event->ev_arg; INSIST(task == server->task); @@ -10269,8 +10225,7 @@ named_server_reload(isc_task_t *task, isc_event_t *event) } void -named_server_reloadwanted(named_server_t *server) -{ +named_server_reloadwanted(named_server_t *server) { LOCK(&server->reload_event_lock); if (server->reload_event != NULL) { isc_task_send(server->task, &server->reload_event); @@ -10279,8 +10234,7 @@ named_server_reloadwanted(named_server_t *server) } void -named_server_scan_interfaces(named_server_t *server) -{ +named_server_scan_interfaces(named_server_t *server) { isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_DEBUG(1), "automatic interface rescan"); @@ -10298,10 +10252,9 @@ named_server_scan_interfaces(named_server_t *server) * call to next_token(). */ static char * -next_token(isc_lex_t *lex, isc_buffer_t **text) -{ +next_token(isc_lex_t *lex, isc_buffer_t **text) { isc_result_t result; - isc_token_t token; + isc_token_t token; token.type = isc_tokentype_unknown; result = isc_lex_gettoken(lex, ISC_LEXOPT_EOF | ISC_LEXOPT_QSTRING, @@ -10353,19 +10306,18 @@ next_token(isc_lex_t *lex, isc_buffer_t **text) static isc_result_t zone_from_args(named_server_t *server, isc_lex_t *lex, const char *zonetxt, dns_zone_t **zonep, char *zonename, isc_buffer_t **text, - bool skip) -{ - char * ptr; - char * classtxt; - const char * viewtxt = NULL; - dns_fixedname_t fname; - dns_name_t * name; - isc_result_t result; - dns_view_t * view = NULL; + bool skip) { + char *ptr; + char *classtxt; + const char *viewtxt = NULL; + dns_fixedname_t fname; + dns_name_t *name; + isc_result_t result; + dns_view_t *view = NULL; dns_rdataclass_t rdclass; - char problem[DNS_NAME_FORMATSIZE + 500] = ""; - char zonebuf[DNS_NAME_FORMATSIZE]; - bool redirect = false; + char problem[DNS_NAME_FORMATSIZE + 500] = ""; + char zonebuf[DNS_NAME_FORMATSIZE]; + bool redirect = false; REQUIRE(zonep != NULL && *zonep == NULL); @@ -10501,11 +10453,10 @@ cleanup: */ isc_result_t named_server_retransfercommand(named_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) -{ - isc_result_t result; - dns_zone_t * zone = NULL; - dns_zone_t * raw = NULL; + isc_buffer_t **text) { + isc_result_t result; + dns_zone_t *zone = NULL; + dns_zone_t *raw = NULL; dns_zonetype_t type; result = zone_from_args(server, lex, NULL, &zone, NULL, text, true); @@ -10525,7 +10476,8 @@ named_server_retransfercommand(named_server_t *server, isc_lex_t *lex, if (type == dns_zone_slave || type == dns_zone_mirror || type == dns_zone_stub || (type == dns_zone_redirect && - dns_zone_getredirecttype(zone) == dns_zone_slave)) { + dns_zone_getredirecttype(zone) == dns_zone_slave)) + { dns_zone_forcereload(zone); } else { result = ISC_R_NOTFOUND; @@ -10539,12 +10491,11 @@ named_server_retransfercommand(named_server_t *server, isc_lex_t *lex, */ isc_result_t named_server_reloadcommand(named_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) -{ - isc_result_t result; - dns_zone_t * zone = NULL; + isc_buffer_t **text) { + isc_result_t result; + dns_zone_t *zone = NULL; dns_zonetype_t type; - const char * msg = NULL; + const char *msg = NULL; result = zone_from_args(server, lex, NULL, &zone, NULL, text, true); if (result != ISC_R_SUCCESS) { @@ -10594,8 +10545,7 @@ named_server_reloadcommand(named_server_t *server, isc_lex_t *lex, * Act on a "reconfig" command from the command channel. */ isc_result_t -named_server_reconfigcommand(named_server_t *server) -{ +named_server_reconfigcommand(named_server_t *server) { isc_result_t result; server->reload_status = NAMED_RELOAD_IN_PROGRESS; @@ -10622,11 +10572,10 @@ cleanup: */ isc_result_t named_server_notifycommand(named_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) -{ + isc_buffer_t **text) { isc_result_t result; - dns_zone_t * zone = NULL; - const char msg[] = "zone notify queued"; + dns_zone_t *zone = NULL; + const char msg[] = "zone notify queued"; result = zone_from_args(server, lex, NULL, &zone, NULL, text, true); if (result != ISC_R_SUCCESS) { @@ -10649,12 +10598,11 @@ named_server_notifycommand(named_server_t *server, isc_lex_t *lex, */ isc_result_t named_server_refreshcommand(named_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) -{ - isc_result_t result; - dns_zone_t * zone = NULL, *raw = NULL; - const char msg1[] = "zone refresh queued"; - const char msg2[] = "not a slave, mirror, or stub zone"; + isc_buffer_t **text) { + isc_result_t result; + dns_zone_t *zone = NULL, *raw = NULL; + const char msg1[] = "zone refresh queued"; + const char msg2[] = "not a slave, mirror, or stub zone"; dns_zonetype_t type; result = zone_from_args(server, lex, NULL, &zone, NULL, text, true); @@ -10689,9 +10637,8 @@ named_server_refreshcommand(named_server_t *server, isc_lex_t *lex, } isc_result_t -named_server_togglequerylog(named_server_t *server, isc_lex_t *lex) -{ - bool prev, value; +named_server_togglequerylog(named_server_t *server, isc_lex_t *lex) { + bool prev, value; char *ptr; /* Skip the command name. */ @@ -10706,10 +10653,12 @@ named_server_togglequerylog(named_server_t *server, isc_lex_t *lex) if (ptr == NULL) { value = !prev; } else if (!strcasecmp(ptr, "on") || !strcasecmp(ptr, "yes") || - !strcasecmp(ptr, "enable") || !strcasecmp(ptr, "true")) { + !strcasecmp(ptr, "enable") || !strcasecmp(ptr, "true")) + { value = true; } else if (!strcasecmp(ptr, "off") || !strcasecmp(ptr, "no") || - !strcasecmp(ptr, "disable") || !strcasecmp(ptr, "false")) { + !strcasecmp(ptr, "disable") || !strcasecmp(ptr, "false")) + { value = false; } else { return (DNS_R_SYNTAX); @@ -10730,11 +10679,10 @@ named_server_togglequerylog(named_server_t *server, isc_lex_t *lex) static isc_result_t ns_listenlist_fromconfig(const cfg_obj_t *listenlist, const cfg_obj_t *config, cfg_aclconfctx_t *actx, isc_mem_t *mctx, - uint16_t family, ns_listenlist_t **target) -{ - isc_result_t result; + uint16_t family, ns_listenlist_t **target) { + isc_result_t result; const cfg_listelt_t *element; - ns_listenlist_t * dlist = NULL; + ns_listenlist_t *dlist = NULL; REQUIRE(target != NULL && *target == NULL); @@ -10744,8 +10692,9 @@ ns_listenlist_fromconfig(const cfg_obj_t *listenlist, const cfg_obj_t *config, } for (element = cfg_list_first(listenlist); element != NULL; - element = cfg_list_next(element)) { - ns_listenelt_t * delt = NULL; + element = cfg_list_next(element)) + { + ns_listenelt_t *delt = NULL; const cfg_obj_t *listener = cfg_listelt_value(element); result = ns_listenelt_fromconfig(listener, config, actx, mctx, family, &delt); @@ -10769,13 +10718,12 @@ cleanup: 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) -{ - isc_result_t result; + uint16_t family, ns_listenelt_t **target) { + isc_result_t result; const cfg_obj_t *portobj, *dscpobj; - in_port_t port; - isc_dscp_t dscp = -1; - ns_listenelt_t * delt = NULL; + in_port_t port; + isc_dscp_t dscp = -1; + ns_listenelt_t *delt = NULL; REQUIRE(target != NULL && *target == NULL); portobj = cfg_tuple_get(listener, "port"); @@ -10828,10 +10776,9 @@ ns_listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config, } isc_result_t -named_server_dumpstats(named_server_t *server) -{ +named_server_dumpstats(named_server_t *server) { isc_result_t result; - FILE * fp = NULL; + FILE *fp = NULL; CHECKMF(isc_stdio_open(server->statsfile, "a", &fp), "could not open statistics dump file", server->statsfile); @@ -10856,9 +10803,8 @@ cleanup: } static isc_result_t -add_zone_tolist(dns_zone_t *zone, void *uap) -{ - struct dumpcontext * dctx = uap; +add_zone_tolist(dns_zone_t *zone, void *uap) { + struct dumpcontext *dctx = uap; struct zonelistentry *zle; zle = isc_mem_get(dctx->mctx, sizeof *zle); @@ -10870,16 +10816,16 @@ add_zone_tolist(dns_zone_t *zone, void *uap) } static isc_result_t -add_view_tolist(struct dumpcontext *dctx, dns_view_t *view) -{ +add_view_tolist(struct dumpcontext *dctx, dns_view_t *view) { struct viewlistentry *vle; - isc_result_t result = ISC_R_SUCCESS; + isc_result_t result = ISC_R_SUCCESS; /* * Prevent duplicate views. */ for (vle = ISC_LIST_HEAD(dctx->viewlist); vle != NULL; - vle = ISC_LIST_NEXT(vle, link)) { + vle = ISC_LIST_NEXT(vle, link)) + { if (vle->view == view) { return (ISC_R_SUCCESS); } @@ -10899,8 +10845,7 @@ add_view_tolist(struct dumpcontext *dctx, dns_view_t *view) } static void -dumpcontext_destroy(struct dumpcontext *dctx) -{ +dumpcontext_destroy(struct dumpcontext *dctx) { struct viewlistentry *vle; struct zonelistentry *zle; @@ -10940,10 +10885,9 @@ dumpcontext_destroy(struct dumpcontext *dctx) } static void -dumpdone(void *arg, isc_result_t result) -{ - struct dumpcontext * dctx = arg; - char buf[1024 + 32]; +dumpdone(void *arg, isc_result_t result) { + struct dumpcontext *dctx = arg; + char buf[1024 + 32]; const dns_master_style_t *style; if (result != ISC_R_SUCCESS) { @@ -10968,8 +10912,8 @@ resume: fprintf(dctx->fp, ";\n; Cache of view '%s' is shared as '%s'\n", dctx->view->view->name, dns_cache_getname(dctx->view->view->cache)); - } else if (dctx->zone == NULL && dctx->cache == NULL && - dctx->dumpcache) { + } else if (dctx->zone == NULL && dctx->cache == NULL && dctx->dumpcache) + { style = &dns_master_style_cache; /* start cache dump */ if (dctx->view->view->cachedb != NULL) { @@ -10996,7 +10940,8 @@ resume: } if ((dctx->dumpadb || dctx->dumpbad || dctx->dumpfail) && - dctx->cache == NULL && dctx->view->view->cachedb != NULL) { + dctx->cache == NULL && dctx->view->view->cachedb != NULL) + { dns_db_attach(dctx->view->view->cachedb, &dctx->cache); } @@ -11082,14 +11027,14 @@ cleanup: } isc_result_t -named_server_dumpdb(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) -{ +named_server_dumpdb(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) { struct dumpcontext *dctx = NULL; - dns_view_t * view; - isc_result_t result; - char * ptr; - const char * sep; - bool found; + dns_view_t *view; + isc_result_t result; + char *ptr; + const char *sep; + bool found; /* Skip the command name. */ ptr = next_token(lex, NULL); @@ -11164,7 +11109,8 @@ named_server_dumpdb(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) nextview: found = false; for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if (ptr != NULL && strcmp(view->name, ptr) != 0) { continue; } @@ -11196,18 +11142,17 @@ cleanup: isc_result_t named_server_dumpsecroots(named_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) -{ - dns_view_t * view; + isc_buffer_t **text) { + dns_view_t *view; dns_keytable_t *secroots = NULL; dns_ntatable_t *ntatable = NULL; - isc_result_t result; - char * ptr; - FILE * fp = NULL; - isc_time_t now; - char tbuf[64]; - unsigned int used = isc_buffer_usedlength(*text); - bool first = true; + isc_result_t result; + char *ptr; + FILE *fp = NULL; + isc_time_t now; + char tbuf[64]; + unsigned int used = isc_buffer_usedlength(*text); + bool first = true; /* Skip the command name. */ ptr = next_token(lex, text); @@ -11238,7 +11183,8 @@ named_server_dumpsecroots(named_server_t *server, isc_lex_t *lex, do { for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if (ptr != NULL && strcmp(view->name, ptr) != 0) { continue; } @@ -11315,10 +11261,9 @@ cleanup: } isc_result_t -named_server_dumprecursing(named_server_t *server) -{ - FILE * fp = NULL; - dns_view_t * view; +named_server_dumprecursing(named_server_t *server) { + FILE *fp = NULL; + dns_view_t *view; isc_result_t result; CHECKMF(isc_stdio_open(server->recfile, "w", &fp), @@ -11327,7 +11272,8 @@ named_server_dumprecursing(named_server_t *server) ns_interfacemgr_dumprecursing(fp, server->interfacemgr); for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { fprintf(fp, ";\n; Active fetch domains [view: %s]\n;\n", view->name); dns_resolver_dumpfetches(view->resolver, isc_statsformat_file, @@ -11354,11 +11300,10 @@ cleanup: } isc_result_t -named_server_setdebuglevel(named_server_t *server, isc_lex_t *lex) -{ +named_server_setdebuglevel(named_server_t *server, isc_lex_t *lex) { char *ptr; char *endp; - long newlevel; + long newlevel; UNUSED(server); @@ -11390,13 +11335,12 @@ named_server_setdebuglevel(named_server_t *server, isc_lex_t *lex) isc_result_t named_server_validation(named_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) -{ - char * ptr; - dns_view_t * view; - bool changed = false; + isc_buffer_t **text) { + char *ptr; + dns_view_t *view; + bool changed = false; isc_result_t result; - bool enable = true, set = true, first = true; + bool enable = true, set = true, first = true; /* Skip the command name. */ ptr = next_token(lex, text); @@ -11411,10 +11355,12 @@ named_server_validation(named_server_t *server, isc_lex_t *lex, } if (!strcasecmp(ptr, "on") || !strcasecmp(ptr, "yes") || - !strcasecmp(ptr, "enable") || !strcasecmp(ptr, "true")) { + !strcasecmp(ptr, "enable") || !strcasecmp(ptr, "true")) + { enable = true; } else if (!strcasecmp(ptr, "off") || !strcasecmp(ptr, "no") || - !strcasecmp(ptr, "disable") || !strcasecmp(ptr, "false")) { + !strcasecmp(ptr, "disable") || !strcasecmp(ptr, "false")) + { enable = false; } else if (!strcasecmp(ptr, "check") || !strcasecmp(ptr, "status")) { set = false; @@ -11428,9 +11374,11 @@ named_server_validation(named_server_t *server, isc_lex_t *lex, result = isc_task_beginexclusive(server->task); RUNTIME_CHECK(result == ISC_R_SUCCESS); for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if ((ptr != NULL && strcasecmp(ptr, view->name) != 0) || - strcasecmp("_bind", view->name) == 0) { + strcasecmp("_bind", view->name) == 0) + { continue; } @@ -11467,13 +11415,12 @@ cleanup: } isc_result_t -named_server_flushcache(named_server_t *server, isc_lex_t *lex) -{ - char * ptr; - dns_view_t * view; - bool flushed; - bool found; - isc_result_t result; +named_server_flushcache(named_server_t *server, isc_lex_t *lex) { + char *ptr; + dns_view_t *view; + bool flushed; + bool found; + isc_result_t result; named_cache_t *nsc; /* Skip the command name. */ @@ -11504,13 +11451,15 @@ named_server_flushcache(named_server_t *server, isc_lex_t *lex) * one) views will match. */ for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if (strcasecmp(ptr, view->name) != 0) { continue; } found = true; for (nsc = ISC_LIST_HEAD(server->cachelist); - nsc != NULL; nsc = ISC_LIST_NEXT(nsc, link)) { + nsc != NULL; nsc = ISC_LIST_NEXT(nsc, link)) + { if (nsc->cache == view->cache) { break; } @@ -11524,7 +11473,8 @@ named_server_flushcache(named_server_t *server, isc_lex_t *lex) /* Perform flush */ for (nsc = ISC_LIST_HEAD(server->cachelist); nsc != NULL; - nsc = ISC_LIST_NEXT(nsc, link)) { + nsc = ISC_LIST_NEXT(nsc, link)) + { if (ptr != NULL && !nsc->needflush) { continue; } @@ -11550,12 +11500,14 @@ named_server_flushcache(named_server_t *server, isc_lex_t *lex) * two views. Then this will be a O(n^2/4) operation. */ for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if (!dns_view_iscacheshared(view)) { continue; } for (nsc = ISC_LIST_HEAD(server->cachelist); nsc != NULL; - nsc = ISC_LIST_NEXT(nsc, link)) { + nsc = ISC_LIST_NEXT(nsc, link)) + { if (!nsc->needflush || nsc->cache != view->cache) { continue; } @@ -11574,7 +11526,8 @@ named_server_flushcache(named_server_t *server, isc_lex_t *lex) /* Cleanup the cache list. */ for (nsc = ISC_LIST_HEAD(server->cachelist); nsc != NULL; - nsc = ISC_LIST_NEXT(nsc, link)) { + nsc = ISC_LIST_NEXT(nsc, link)) + { nsc->needflush = false; } @@ -11607,17 +11560,16 @@ named_server_flushcache(named_server_t *server, isc_lex_t *lex) } isc_result_t -named_server_flushnode(named_server_t *server, isc_lex_t *lex, bool tree) -{ - char * ptr, *viewname; - char target[DNS_NAME_FORMATSIZE]; - dns_view_t * view; - bool flushed; - bool found; - isc_result_t result; - isc_buffer_t b; +named_server_flushnode(named_server_t *server, isc_lex_t *lex, bool tree) { + char *ptr, *viewname; + char target[DNS_NAME_FORMATSIZE]; + dns_view_t *view; + bool flushed; + bool found; + isc_result_t result; + isc_buffer_t b; dns_fixedname_t fixed; - dns_name_t * name; + dns_name_t *name; /* Skip the command name. */ ptr = next_token(lex, NULL); @@ -11648,7 +11600,8 @@ named_server_flushnode(named_server_t *server, isc_lex_t *lex, bool tree) flushed = true; found = false; for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if (viewname != NULL && strcasecmp(viewname, view->name) != 0) { continue; } @@ -11699,15 +11652,14 @@ named_server_flushnode(named_server_t *server, isc_lex_t *lex, bool tree) } isc_result_t -named_server_status(named_server_t *server, isc_buffer_t **text) -{ +named_server_status(named_server_t *server, isc_buffer_t **text) { isc_result_t result; unsigned int zonecount, xferrunning, xferdeferred, soaqueries; unsigned int automatic; - const char * ob = "", *cb = "", *alt = ""; - char boottime[ISC_FORMATHTTPTIMESTAMP_SIZE]; - char configtime[ISC_FORMATHTTPTIMESTAMP_SIZE]; - char line[1024], hostname[256]; + const char *ob = "", *cb = "", *alt = ""; + char boottime[ISC_FORMATHTTPTIMESTAMP_SIZE]; + char configtime[ISC_FORMATHTTPTIMESTAMP_SIZE]; + char line[1024], hostname[256]; if (named_g_server->version_set) { ob = " ("; @@ -11723,10 +11675,10 @@ named_server_status(named_server_t *server, isc_buffer_t **text) DNS_ZONESTATE_XFERRUNNING); xferdeferred = dns_zonemgr_getcount(server->zonemgr, DNS_ZONESTATE_XFERDEFERRED); - soaqueries = - dns_zonemgr_getcount(server->zonemgr, DNS_ZONESTATE_SOAQUERY); - automatic = - dns_zonemgr_getcount(server->zonemgr, DNS_ZONESTATE_AUTOMATIC); + soaqueries = dns_zonemgr_getcount(server->zonemgr, + DNS_ZONESTATE_SOAQUERY); + automatic = dns_zonemgr_getcount(server->zonemgr, + DNS_ZONESTATE_AUTOMATIC); isc_time_formathttptimestamp(&named_g_boottime, boottime, sizeof(boottime)); @@ -11829,12 +11781,11 @@ cleanup: } isc_result_t -named_server_testgen(isc_lex_t *lex, isc_buffer_t **text) -{ - isc_result_t result; - char * ptr; - unsigned long count; - unsigned long i; +named_server_testgen(isc_lex_t *lex, isc_buffer_t **text) { + isc_result_t result; + char *ptr; + unsigned long count; + unsigned long i; const unsigned char chars[] = "abcdefghijklmnopqrstuvwxyz0123456789"; /* Skip the command name. */ @@ -11862,16 +11813,16 @@ cleanup: } static isc_result_t -delete_keynames(dns_tsig_keyring_t *ring, char *target, unsigned int *foundkeys) -{ - char namestr[DNS_NAME_FORMATSIZE]; - isc_result_t result; +delete_keynames(dns_tsig_keyring_t *ring, char *target, + unsigned int *foundkeys) { + char namestr[DNS_NAME_FORMATSIZE]; + isc_result_t result; dns_rbtnodechain_t chain; - dns_name_t foundname; - dns_fixedname_t fixedorigin; - dns_name_t * origin; - dns_rbtnode_t * node; - dns_tsigkey_t * tkey; + dns_name_t foundname; + dns_fixedname_t fixedorigin; + dns_name_t *origin; + dns_rbtnode_t *node; + dns_tsigkey_t *tkey; dns_name_init(&foundname, NULL); origin = dns_fixedname_initname(&fixedorigin); @@ -11924,14 +11875,13 @@ again: isc_result_t named_server_tsigdelete(named_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) -{ + isc_buffer_t **text) { isc_result_t result; - dns_view_t * view; + dns_view_t *view; unsigned int foundkeys = 0; - char * ptr, *viewname; - char target[DNS_NAME_FORMATSIZE]; - char fbuf[16]; + char *ptr, *viewname; + char target[DNS_NAME_FORMATSIZE]; + char fbuf[16]; (void)next_token(lex, text); /* skip command name */ @@ -11946,7 +11896,8 @@ named_server_tsigdelete(named_server_t *server, isc_lex_t *lex, result = isc_task_beginexclusive(server->task); RUNTIME_CHECK(result == ISC_R_SUCCESS); for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if (viewname == NULL || strcmp(view->name, viewname) == 0) { RWLOCK(&view->dynamickeys->lock, isc_rwlocktype_write); result = delete_keynames(view->dynamickeys, target, @@ -11973,18 +11924,17 @@ cleanup: static isc_result_t list_keynames(dns_view_t *view, dns_tsig_keyring_t *ring, isc_buffer_t **text, - unsigned int *foundkeys) -{ - char namestr[DNS_NAME_FORMATSIZE]; - char creatorstr[DNS_NAME_FORMATSIZE]; - isc_result_t result; + unsigned int *foundkeys) { + char namestr[DNS_NAME_FORMATSIZE]; + char creatorstr[DNS_NAME_FORMATSIZE]; + isc_result_t result; dns_rbtnodechain_t chain; - dns_name_t foundname; - dns_fixedname_t fixedorigin; - dns_name_t * origin; - dns_rbtnode_t * node; - dns_tsigkey_t * tkey; - const char * viewname; + dns_name_t foundname; + dns_fixedname_t fixedorigin; + dns_name_t *origin; + dns_rbtnode_t *node; + dns_tsigkey_t *tkey; + const char *viewname; if (view != NULL) { viewname = view->name; @@ -12052,19 +12002,19 @@ cleanup: } isc_result_t -named_server_tsiglist(named_server_t *server, isc_buffer_t **text) -{ +named_server_tsiglist(named_server_t *server, isc_buffer_t **text) { isc_result_t result; - dns_view_t * view; + dns_view_t *view; unsigned int foundkeys = 0; result = isc_task_beginexclusive(server->task); RUNTIME_CHECK(result == ISC_R_SUCCESS); for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { RWLOCK(&view->statickeys->lock, isc_rwlocktype_read); - result = - list_keynames(view, view->statickeys, text, &foundkeys); + result = list_keynames(view, view->statickeys, text, + &foundkeys); RWUNLOCK(&view->statickeys->lock, isc_rwlocktype_read); if (result != ISC_R_SUCCESS) { isc_task_endexclusive(server->task); @@ -12097,14 +12047,14 @@ cleanup: * Act on a "sign" or "loadkeys" command from the command channel. */ isc_result_t -named_server_rekey(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) -{ - isc_result_t result; - dns_zone_t * zone = NULL; +named_server_rekey(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) { + isc_result_t result; + dns_zone_t *zone = NULL; dns_zonetype_t type; - uint16_t keyopts; - bool fullsign = false; - char * ptr; + uint16_t keyopts; + bool fullsign = false; + char *ptr; ptr = next_token(lex, text); if (ptr == NULL) { @@ -12151,12 +12101,11 @@ named_server_rekey(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) * Act on a "sync" command from the command channel. */ static isc_result_t -synczone(dns_zone_t *zone, void *uap) -{ - bool cleanup = *(bool *)uap; +synczone(dns_zone_t *zone, void *uap) { + bool cleanup = *(bool *)uap; isc_result_t result; - dns_zone_t * raw = NULL; - char * journal; + dns_zone_t *raw = NULL; + char *journal; dns_zone_getraw(zone, &raw); if (raw != NULL) { @@ -12179,15 +12128,14 @@ synczone(dns_zone_t *zone, void *uap) } isc_result_t -named_server_sync(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) -{ +named_server_sync(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) { isc_result_t result, tresult; - dns_view_t * view; - dns_zone_t * zone = NULL; - char classstr[DNS_RDATACLASS_FORMATSIZE]; - char zonename[DNS_NAME_FORMATSIZE]; - const char * vname, *sep, *arg; - bool cleanup = false; + dns_view_t *view; + dns_zone_t *zone = NULL; + char classstr[DNS_RDATACLASS_FORMATSIZE]; + char zonename[DNS_NAME_FORMATSIZE]; + const char *vname, *sep, *arg; + bool cleanup = false; (void)next_token(lex, text); @@ -12208,11 +12156,12 @@ named_server_sync(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) RUNTIME_CHECK(result == ISC_R_SUCCESS); tresult = ISC_R_SUCCESS; for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { result = dns_zt_apply(view->zonetable, false, NULL, synczone, &cleanup); - if (result != ISC_R_SUCCESS && - tresult == ISC_R_SUCCESS) { + if (result != ISC_R_SUCCESS && tresult == ISC_R_SUCCESS) + { tresult = result; } } @@ -12231,8 +12180,9 @@ named_server_sync(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) isc_task_endexclusive(server->task); view = dns_zone_getview(zone); - if (strcmp(view->name, "_default") == 0 || - strcmp(view->name, "_bind") == 0) { + if (strcmp(view->name, "_default") == 0 || strcmp(view->name, "_bin" + "d") == 0) + { vname = ""; sep = ""; } else { @@ -12256,17 +12206,16 @@ named_server_sync(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) */ isc_result_t named_server_freeze(named_server_t *server, bool freeze, isc_lex_t *lex, - isc_buffer_t **text) -{ - isc_result_t result, tresult; - dns_zone_t * mayberaw = NULL, *raw = NULL; + isc_buffer_t **text) { + isc_result_t result, tresult; + dns_zone_t *mayberaw = NULL, *raw = NULL; dns_zonetype_t type; - char classstr[DNS_RDATACLASS_FORMATSIZE]; - char zonename[DNS_NAME_FORMATSIZE]; - dns_view_t * view; - const char * vname, *sep; - bool frozen; - const char * msg = NULL; + char classstr[DNS_RDATACLASS_FORMATSIZE]; + char zonename[DNS_NAME_FORMATSIZE]; + dns_view_t *view; + const char *vname, *sep; + bool frozen; + const char *msg = NULL; result = zone_from_args(server, lex, NULL, &mayberaw, NULL, text, true); if (result != ISC_R_SUCCESS) { @@ -12277,10 +12226,11 @@ named_server_freeze(named_server_t *server, bool freeze, isc_lex_t *lex, RUNTIME_CHECK(result == ISC_R_SUCCESS); tresult = ISC_R_SUCCESS; for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { result = dns_view_freezezones(view, freeze); - if (result != ISC_R_SUCCESS && - tresult == ISC_R_SUCCESS) { + if (result != ISC_R_SUCCESS && tresult == ISC_R_SUCCESS) + { tresult = result; } } @@ -12355,8 +12305,9 @@ named_server_freeze(named_server_t *server, bool freeze, isc_lex_t *lex, } view = dns_zone_getview(mayberaw); - if (strcmp(view->name, "_default") == 0 || - strcmp(view->name, "_bind") == 0) { + if (strcmp(view->name, "_default") == 0 || strcmp(view->name, "_bin" + "d") == 0) + { vname = ""; sep = ""; } else { @@ -12382,8 +12333,7 @@ named_server_freeze(named_server_t *server, bool freeze, isc_lex_t *lex, * is managed by smf and is also running chroot. */ isc_result_t -named_smf_add_message(isc_buffer_t **text) -{ +named_smf_add_message(isc_buffer_t **text) { return (putstr(text, "use svcadm(1M) to manage named")); } #endif /* HAVE_LIBSCF */ @@ -12399,8 +12349,7 @@ named_smf_add_message(isc_buffer_t **text) "\n# This file contains configuration for zones added by\n" \ "# the 'rndc addzone' command. DO NOT EDIT BY HAND.\n" static isc_result_t -add_comment(FILE *fp, const char *viewname) -{ +add_comment(FILE *fp, const char *viewname) { isc_result_t result; CHECK(isc_stdio_write(HEADER1, sizeof(HEADER1) - 1, 1, fp, NULL)); CHECK(isc_stdio_write(viewname, strlen(viewname), 1, fp, NULL)); @@ -12410,20 +12359,18 @@ cleanup: } static void -dumpzone(void *arg, const char *buf, int len) -{ +dumpzone(void *arg, const char *buf, int len) { FILE *fp = arg; (void)isc_stdio_write(buf, len, 1, fp, NULL); } static isc_result_t -nzf_append(dns_view_t *view, const cfg_obj_t *zconfig) -{ +nzf_append(dns_view_t *view, const cfg_obj_t *zconfig) { isc_result_t result; - off_t offset; - FILE * fp = NULL; - bool offsetok = false; + off_t offset; + FILE *fp = NULL; + bool offsetok = false; LOCK(&view->new_zone_lock); @@ -12449,8 +12396,8 @@ cleanup: if (offsetok) { isc_result_t result2; - result2 = - isc_file_truncate(view->new_zone_file, offset); + result2 = isc_file_truncate(view->new_zone_file, + offset); if (result2 != ISC_R_SUCCESS) { isc_log_write( named_g_lctx, NAMED_LOGCATEGORY_GENERAL, @@ -12468,14 +12415,13 @@ cleanup: } static isc_result_t -nzf_writeconf(const cfg_obj_t *config, dns_view_t *view) -{ - const cfg_obj_t * zl = NULL; - cfg_list_t * list; +nzf_writeconf(const cfg_obj_t *config, dns_view_t *view) { + const cfg_obj_t *zl = NULL; + cfg_list_t *list; const cfg_listelt_t *elt; - FILE * fp = NULL; - char tmp[1024]; + FILE *fp = NULL; + char tmp[1024]; isc_result_t result; result = isc_file_template(view->new_zone_file, "nzf-XXXXXXXX", tmp, @@ -12525,8 +12471,7 @@ cleanup: #else /* HAVE_LMDB */ static void -nzd_setkey(MDB_val *key, dns_name_t *name, char *namebuf, size_t buflen) -{ +nzd_setkey(MDB_val *key, dns_name_t *name, char *namebuf, size_t buflen) { dns_fixedname_t fixed; dns_fixedname_init(&fixed); @@ -12538,9 +12483,8 @@ nzd_setkey(MDB_val *key, dns_name_t *name, char *namebuf, size_t buflen) } static void -dumpzone(void *arg, const char *buf, int len) -{ - ns_dzarg_t * dzarg = arg; +dumpzone(void *arg, const char *buf, int len) { + ns_dzarg_t *dzarg = arg; isc_result_t result; REQUIRE(dzarg != NULL && ISC_MAGIC_VALID(dzarg, DZARG_MAGIC)); @@ -12553,16 +12497,15 @@ dumpzone(void *arg, const char *buf, int len) static isc_result_t nzd_save(MDB_txn **txnp, MDB_dbi dbi, dns_zone_t *zone, - const cfg_obj_t *zconfig) -{ - isc_result_t result; - int status; - dns_view_t * view; - bool commit = false; + const cfg_obj_t *zconfig) { + isc_result_t result; + int status; + dns_view_t *view; + bool commit = false; isc_buffer_t *text = NULL; - char namebuf[1024]; - MDB_val key, data; - ns_dzarg_t dzarg; + char namebuf[1024]; + MDB_val key, data; + ns_dzarg_t dzarg; view = dns_zone_getview(zone); @@ -12659,12 +12602,11 @@ cleanup: } static isc_result_t -nzd_writable(dns_view_t *view) -{ +nzd_writable(dns_view_t *view) { isc_result_t result = ISC_R_SUCCESS; - int status; - MDB_dbi dbi; - MDB_txn * txn = NULL; + int status; + MDB_dbi dbi; + MDB_txn *txn = NULL; REQUIRE(view != NULL); @@ -12689,9 +12631,8 @@ 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) -{ - int status; +nzd_open(dns_view_t *view, unsigned int flags, MDB_txn **txnp, MDB_dbi *dbi) { + int status; MDB_txn *txn = NULL; REQUIRE(view != NULL); @@ -12733,12 +12674,11 @@ cleanup: * root privileges. */ static void -nzd_env_close(dns_view_t *view) -{ +nzd_env_close(dns_view_t *view) { const char *dbpath = NULL; - char dbpath_copy[PATH_MAX]; - char lockpath[PATH_MAX]; - int status, ret; + char dbpath_copy[PATH_MAX]; + char lockpath[PATH_MAX]; + int status, ret; if (view->new_zone_dbenv == NULL) { return; @@ -12766,11 +12706,10 @@ nzd_env_close(dns_view_t *view) } static isc_result_t -nzd_env_reopen(dns_view_t *view) -{ +nzd_env_reopen(dns_view_t *view) { isc_result_t result; - MDB_env * env = NULL; - int status; + MDB_env *env = NULL; + int status; if (view->new_zone_db == NULL) { return (ISC_R_SUCCESS); @@ -12819,10 +12758,9 @@ cleanup: } static isc_result_t -nzd_close(MDB_txn **txnp, bool commit) -{ +nzd_close(MDB_txn **txnp, bool commit) { isc_result_t result = ISC_R_SUCCESS; - int status; + int status; REQUIRE(txnp != NULL); @@ -12842,13 +12780,12 @@ nzd_close(MDB_txn **txnp, bool commit) } static isc_result_t -nzd_count(dns_view_t *view, int *countp) -{ +nzd_count(dns_view_t *view, int *countp) { isc_result_t result; - int status; - MDB_txn * txn = NULL; - MDB_dbi dbi; - MDB_stat statbuf; + int status; + MDB_txn *txn = NULL; + MDB_dbi dbi; + MDB_stat statbuf; REQUIRE(countp != NULL); @@ -12875,20 +12812,19 @@ cleanup: } static isc_result_t -migrate_nzf(dns_view_t *view) -{ - isc_result_t result; - cfg_obj_t * nzf_config = NULL; - int status, n; - isc_buffer_t * text = NULL; - bool commit = false; - const cfg_obj_t * zonelist; +migrate_nzf(dns_view_t *view) { + isc_result_t result; + cfg_obj_t *nzf_config = NULL; + int status, n; + isc_buffer_t *text = NULL; + bool commit = false; + const cfg_obj_t *zonelist; const cfg_listelt_t *element; - char tempname[PATH_MAX]; - MDB_txn * txn = NULL; - MDB_dbi dbi; - MDB_val key, data; - ns_dzarg_t dzarg; + char tempname[PATH_MAX]; + MDB_txn *txn = NULL; + MDB_dbi dbi; + MDB_val key, data; + ns_dzarg_t dzarg; /* * If NZF file doesn't exist, or NZD DB exists and already @@ -12938,14 +12874,15 @@ migrate_nzf(dns_view_t *view) isc_buffer_allocate(view->mctx, &text, 256); for (element = cfg_list_first(zonelist); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *zconfig; const cfg_obj_t *zoptions; - char zname[DNS_NAME_FORMATSIZE]; - dns_fixedname_t fname; - dns_name_t * name; - const char * origin; - isc_buffer_t b; + char zname[DNS_NAME_FORMATSIZE]; + dns_fixedname_t fname; + dns_name_t *name; + const char *origin; + isc_buffer_t b; zconfig = cfg_listelt_value(element); @@ -13040,20 +12977,19 @@ cleanup: static isc_result_t newzone_parse(named_server_t *server, char *command, dns_view_t **viewp, cfg_obj_t **zoneconfp, const cfg_obj_t **zoneobjp, - bool *redirectp, isc_buffer_t **text) -{ - isc_result_t result; - isc_buffer_t argbuf; - bool redirect = false; - cfg_obj_t * zoneconf = NULL; + bool *redirectp, isc_buffer_t **text) { + isc_result_t result; + isc_buffer_t argbuf; + bool redirect = false; + cfg_obj_t *zoneconf = NULL; const cfg_obj_t *zlist = NULL; const cfg_obj_t *zoneobj = NULL; const cfg_obj_t *zoptions = NULL; const cfg_obj_t *obj = NULL; - const char * viewname = NULL; + const char *viewname = NULL; dns_rdataclass_t rdclass; - dns_view_t * view = NULL; - const char * bn = NULL; + dns_view_t *view = NULL; + const char *bn = NULL; REQUIRE(viewp != NULL && *viewp == NULL); REQUIRE(zoneobjp != NULL && *zoneobjp == NULL); @@ -13108,7 +13044,8 @@ newzone_parse(named_server_t *server, char *command, dns_view_t **viewp, if (strcasecmp(cfg_obj_asstring(obj), "hint") == 0 || strcasecmp(cfg_obj_asstring(obj), "forward") == 0 || - strcasecmp(cfg_obj_asstring(obj), "delegation-only") == 0) { + strcasecmp(cfg_obj_asstring(obj), "delegation-only") == 0) + { (void)putstr(text, "'"); (void)putstr(text, cfg_obj_asstring(obj)); (void)putstr(text, "' zones not supported by "); @@ -13162,14 +13099,13 @@ cleanup: static isc_result_t delete_zoneconf(dns_view_t *view, cfg_parser_t *pctx, const cfg_obj_t *config, - const dns_name_t *zname, nzfwriter_t nzfwriter) -{ - isc_result_t result = ISC_R_NOTFOUND; + const dns_name_t *zname, nzfwriter_t nzfwriter) { + isc_result_t result = ISC_R_NOTFOUND; const cfg_listelt_t *elt = NULL; - const cfg_obj_t * zl = NULL; - cfg_list_t * list; - dns_fixedname_t myfixed; - dns_name_t * myname; + const cfg_obj_t *zl = NULL; + cfg_list_t *list; + dns_fixedname_t myfixed; + dns_name_t *myname; REQUIRE(view != NULL); REQUIRE(pctx != NULL); @@ -13191,8 +13127,8 @@ delete_zoneconf(dns_view_t *view, cfg_parser_t *pctx, const cfg_obj_t *config, for (elt = ISC_LIST_HEAD(*list); elt != NULL; elt = ISC_LIST_NEXT(elt, link)) { const cfg_obj_t *zconf = cfg_listelt_value(elt); - const char * zn; - cfg_listelt_t * e; + const char *zn; + cfg_listelt_t *e; zn = cfg_obj_asstring(cfg_tuple_get(zconf, "name")); result = dns_name_fromstring(myname, zn, 0, NULL); @@ -13223,16 +13159,15 @@ cleanup: static isc_result_t do_addzone(named_server_t *server, ns_cfgctx_t *cfg, dns_view_t *view, dns_name_t *name, cfg_obj_t *zoneconf, const cfg_obj_t *zoneobj, - bool redirect, isc_buffer_t **text) -{ + bool redirect, isc_buffer_t **text) { isc_result_t result, tresult; - dns_zone_t * zone = NULL; + dns_zone_t *zone = NULL; #ifndef HAVE_LMDB FILE *fp = NULL; - bool cleanup_config = false; + bool cleanup_config = false; #else /* HAVE_LMDB */ MDB_txn *txn = NULL; - MDB_dbi dbi; + MDB_dbi dbi; UNUSED(zoneconf); #endif /* HAVE_LMDB */ @@ -13400,18 +13335,17 @@ cleanup: static isc_result_t do_modzone(named_server_t *server, ns_cfgctx_t *cfg, dns_view_t *view, dns_name_t *name, const char *zname, const cfg_obj_t *zoneobj, - bool redirect, isc_buffer_t **text) -{ + bool redirect, isc_buffer_t **text) { isc_result_t result, tresult; - dns_zone_t * zone = NULL; - bool added; - bool exclusive = false; + dns_zone_t *zone = NULL; + bool added; + bool exclusive = false; #ifndef HAVE_LMDB - FILE * fp = NULL; + FILE *fp = NULL; cfg_obj_t *z; #else /* HAVE_LMDB */ MDB_txn *txn = NULL; - MDB_dbi dbi; + MDB_dbi dbi; #endif /* HAVE_LMDB */ /* Zone must already exist */ @@ -13516,8 +13450,8 @@ do_modzone(named_server_t *server, ns_cfgctx_t *cfg, dns_view_t *view, view, cfg->conf_parser, cfg->config, dns_zone_getorigin(zone), NULL); } else { - const cfg_obj_t *voptions = - cfg_tuple_get(cfg->vconfig, "options"); + const cfg_obj_t *voptions = cfg_tuple_get(cfg->vconfig, + "options"); result = delete_zoneconf( view, cfg->conf_parser, voptions, dns_zone_getorigin(zone), NULL); @@ -13623,19 +13557,18 @@ cleanup: */ isc_result_t named_server_changezone(named_server_t *server, char *command, - isc_buffer_t **text) -{ - isc_result_t result; - bool addzone; - bool redirect = false; - ns_cfgctx_t * cfg = NULL; - cfg_obj_t * zoneconf = NULL; + isc_buffer_t **text) { + isc_result_t result; + bool addzone; + bool redirect = false; + ns_cfgctx_t *cfg = NULL; + cfg_obj_t *zoneconf = NULL; const cfg_obj_t *zoneobj = NULL; - const char * zonename; - dns_view_t * view = NULL; - isc_buffer_t buf; - dns_fixedname_t fname; - dns_name_t * dnsname; + const char *zonename; + dns_view_t *view = NULL; + isc_buffer_t buf; + dns_fixedname_t fname; + dns_name_t *dnsname; if (strncasecmp(command, "add", 3) == 0) { addzone = true; @@ -13714,8 +13647,7 @@ cleanup: } static bool -inuse(const char *file, bool first, isc_buffer_t **text) -{ +inuse(const char *file, bool first, isc_buffer_t **text) { if (file != NULL && isc_file_exists(file)) { if (first) { (void)putstr(text, "The following files were in use " @@ -13732,26 +13664,25 @@ inuse(const char *file, bool first, isc_buffer_t **text) typedef struct { dns_zone_t *zone; - bool cleanup; + bool cleanup; } ns_dzctx_t; /* * Carry out a zone deletion scheduled by named_server_delzone(). */ static void -rmzone(isc_task_t *task, isc_event_t *event) -{ - ns_dzctx_t * dz = (ns_dzctx_t *)event->ev_arg; - dns_zone_t * zone, *raw = NULL, *mayberaw; - char zonename[DNS_NAME_FORMATSIZE]; - dns_view_t * view; +rmzone(isc_task_t *task, isc_event_t *event) { + ns_dzctx_t *dz = (ns_dzctx_t *)event->ev_arg; + dns_zone_t *zone, *raw = NULL, *mayberaw; + char zonename[DNS_NAME_FORMATSIZE]; + dns_view_t *view; ns_cfgctx_t *cfg; - dns_db_t * dbp = NULL; - bool added; + dns_db_t *dbp = NULL; + bool added; isc_result_t result; #ifdef HAVE_LMDB MDB_txn *txn = NULL; - MDB_dbi dbi; + MDB_dbi dbi; #endif /* ifdef HAVE_LMDB */ REQUIRE(dz != NULL); @@ -13808,8 +13739,8 @@ rmzone(isc_task_t *task, isc_event_t *event) if (!added && cfg != NULL) { if (cfg->vconfig != NULL) { - const cfg_obj_t *voptions = - cfg_tuple_get(cfg->vconfig, "options"); + const cfg_obj_t *voptions = cfg_tuple_get(cfg->vconfig, + "options"); result = delete_zoneconf( view, cfg->conf_parser, voptions, dns_zone_getorigin(zone), NULL); @@ -13899,20 +13830,19 @@ rmzone(isc_task_t *task, isc_event_t *event) */ isc_result_t named_server_delzone(named_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) -{ + isc_buffer_t **text) { isc_result_t result, tresult; - dns_zone_t * zone = NULL; - dns_zone_t * raw = NULL; - dns_zone_t * mayberaw; - dns_view_t * view = NULL; - char zonename[DNS_NAME_FORMATSIZE]; - bool cleanup = false; - const char * ptr; - bool added; - ns_dzctx_t * dz = NULL; + dns_zone_t *zone = NULL; + dns_zone_t *raw = NULL; + dns_zone_t *mayberaw; + dns_view_t *view = NULL; + char zonename[DNS_NAME_FORMATSIZE]; + bool cleanup = false; + const char *ptr; + bool added; + ns_dzctx_t *dz = NULL; isc_event_t *dzevent = NULL; - isc_task_t * task = NULL; + isc_task_t *task = NULL; /* Skip the command name. */ ptr = next_token(lex, text); @@ -13988,8 +13918,9 @@ named_server_delzone(named_server_t *server, isc_lex_t *lex, TCHECK(putstr(text, "' and associated files will be deleted.")); } else if (dns_zone_gettype(mayberaw) == dns_zone_slave || dns_zone_gettype(mayberaw) == dns_zone_mirror || - dns_zone_gettype(mayberaw) == dns_zone_stub) { - bool first; + dns_zone_gettype(mayberaw) == dns_zone_stub) + { + bool first; const char *file; TCHECK(putstr(text, "zone '")); @@ -14037,14 +13968,13 @@ cleanup: static const cfg_obj_t * find_name_in_list_from_map(const cfg_obj_t *config, const char *map_key_for_list, const char *name, - bool redirect) -{ - const cfg_obj_t * list = NULL; + bool redirect) { + const cfg_obj_t *list = NULL; const cfg_listelt_t *element; - const cfg_obj_t * obj = NULL; - dns_fixedname_t fixed1, fixed2; - dns_name_t * name1 = NULL, *name2 = NULL; - isc_result_t result; + const cfg_obj_t *obj = NULL; + dns_fixedname_t fixed1, fixed2; + dns_name_t *name1 = NULL, *name2 = NULL; + isc_result_t result; if (strcmp(map_key_for_list, "zone") == 0) { name1 = dns_fixedname_initname(&fixed1); @@ -14055,7 +13985,8 @@ find_name_in_list_from_map(const cfg_obj_t *config, cfg_map_get(config, map_key_for_list, &list); for (element = cfg_list_first(list); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const char *vname; obj = cfg_listelt_value(element); @@ -14079,7 +14010,8 @@ find_name_in_list_from_map(const cfg_obj_t *config, } if (redirect && typeobj != NULL && strcasecmp(cfg_obj_asstring(typeobj), - "redirect") == 0) { + "redirect") == 0) + { break; } else if (!redirect) { break; @@ -14096,9 +14028,8 @@ find_name_in_list_from_map(const cfg_obj_t *config, } static void -emitzone(void *arg, const char *buf, int len) -{ - ns_dzarg_t * dzarg = arg; +emitzone(void *arg, const char *buf, int len) { + ns_dzarg_t *dzarg = arg; isc_result_t result; REQUIRE(dzarg != NULL && ISC_MAGIC_VALID(dzarg, DZARG_MAGIC)); @@ -14113,20 +14044,19 @@ emitzone(void *arg, const char *buf, int len) */ isc_result_t named_server_showzone(named_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) -{ - isc_result_t result; + isc_buffer_t **text) { + isc_result_t result; const cfg_obj_t *vconfig = NULL, *zconfig = NULL; - char zonename[DNS_NAME_FORMATSIZE]; + char zonename[DNS_NAME_FORMATSIZE]; const cfg_obj_t *map; - dns_view_t * view = NULL; - dns_zone_t * zone = NULL; - ns_cfgctx_t * cfg = NULL; - bool exclusive = false; + dns_view_t *view = NULL; + dns_zone_t *zone = NULL; + ns_cfgctx_t *cfg = NULL; + bool exclusive = false; #ifdef HAVE_LMDB cfg_obj_t *nzconfig = NULL; #endif /* HAVE_LMDB */ - bool added, redirect; + bool added, redirect; ns_dzarg_t dzarg; /* Parse parameters */ @@ -14217,8 +14147,7 @@ cleanup: } static void -newzone_cfgctx_destroy(void **cfgp) -{ +newzone_cfgctx_destroy(void **cfgp) { ns_cfgctx_t *cfg; REQUIRE(cfgp != NULL && *cfgp != NULL); @@ -14250,12 +14179,11 @@ newzone_cfgctx_destroy(void **cfgp) } static isc_result_t -generate_salt(unsigned char *salt, size_t saltlen) -{ +generate_salt(unsigned char *salt, size_t saltlen) { unsigned char text[512 + 1]; - isc_region_t r; - isc_buffer_t buf; - isc_result_t result; + isc_region_t r; + isc_buffer_t buf; + isc_result_t result; if (saltlen > 256U) { return (ISC_R_RANGE); @@ -14280,26 +14208,25 @@ generate_salt(unsigned char *salt, size_t saltlen) isc_result_t named_server_signing(named_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) -{ - isc_result_t result = ISC_R_SUCCESS; - dns_zone_t * zone = NULL; - dns_name_t * origin; - dns_db_t * db = NULL; - dns_dbnode_t * node = NULL; + isc_buffer_t **text) { + isc_result_t result = ISC_R_SUCCESS; + dns_zone_t *zone = NULL; + dns_name_t *origin; + dns_db_t *db = NULL; + dns_dbnode_t *node = NULL; dns_dbversion_t *version = NULL; - dns_rdatatype_t privatetype; - dns_rdataset_t privset; - bool first = true; - bool list = false, clear = false; - bool chain = false; - bool setserial = false; - uint32_t serial = 0; + dns_rdatatype_t privatetype; + dns_rdataset_t privset; + bool first = true; + bool list = false, clear = false; + bool chain = false; + bool setserial = false; + uint32_t serial = 0; char keystr[DNS_SECALG_FORMATSIZE + 7]; /* <5-digit keyid>/ */ unsigned short hash = 0, flags = 0, iter = 0, saltlen = 0; - unsigned char salt[255]; - const char * ptr; - size_t n; + unsigned char salt[255]; + const char *ptr; + size_t n; dns_rdataset_init(&privset); @@ -14435,9 +14362,10 @@ named_server_signing(named_server_t *server, isc_lex_t *lex, for (result = dns_rdataset_first(&privset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&privset)) { - dns_rdata_t priv = DNS_RDATA_INIT; - char output[BUFSIZ]; + result = dns_rdataset_next(&privset)) + { + dns_rdata_t priv = DNS_RDATA_INIT; + char output[BUFSIZ]; isc_buffer_t buf; dns_rdataset_current(&privset, &priv); @@ -14480,8 +14408,7 @@ cleanup: } static isc_result_t -putmem(isc_buffer_t **b, const char *str, size_t len) -{ +putmem(isc_buffer_t **b, const char *str, size_t len) { isc_result_t result; result = isc_buffer_reserve(b, (unsigned int)len); @@ -14494,14 +14421,12 @@ putmem(isc_buffer_t **b, const char *str, size_t len) } static inline isc_result_t -putstr(isc_buffer_t **b, const char *str) -{ +putstr(isc_buffer_t **b, const char *str) { return (putmem(b, str, strlen(str))); } static isc_result_t -putuint8(isc_buffer_t **b, uint8_t val) -{ +putuint8(isc_buffer_t **b, uint8_t val) { isc_result_t result; result = isc_buffer_reserve(b, 1); @@ -14514,36 +14439,34 @@ putuint8(isc_buffer_t **b, uint8_t val) } static inline isc_result_t -putnull(isc_buffer_t **b) -{ +putnull(isc_buffer_t **b) { return (putuint8(b, 0)); } isc_result_t named_server_zonestatus(named_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) -{ + isc_buffer_t **text) { isc_result_t result = ISC_R_SUCCESS; - dns_zone_t * zone = NULL, *raw = NULL, *mayberaw = NULL; - const char * type, *file; - char zonename[DNS_NAME_FORMATSIZE]; - uint32_t serial, signed_serial, nodes; - char serbuf[16], sserbuf[16], nodebuf[16]; + dns_zone_t *zone = NULL, *raw = NULL, *mayberaw = NULL; + const char *type, *file; + char zonename[DNS_NAME_FORMATSIZE]; + uint32_t serial, signed_serial, nodes; + char serbuf[16], sserbuf[16], nodebuf[16]; char resignbuf[DNS_NAME_FORMATSIZE + DNS_RDATATYPE_FORMATSIZE + 2]; char lbuf[ISC_FORMATHTTPTIMESTAMP_SIZE]; char xbuf[ISC_FORMATHTTPTIMESTAMP_SIZE]; char rbuf[ISC_FORMATHTTPTIMESTAMP_SIZE]; char kbuf[ISC_FORMATHTTPTIMESTAMP_SIZE]; char rtbuf[ISC_FORMATHTTPTIMESTAMP_SIZE]; - isc_time_t loadtime, expiretime, refreshtime; - isc_time_t refreshkeytime, resigntime; + isc_time_t loadtime, expiretime, refreshtime; + isc_time_t refreshkeytime, resigntime; dns_zonetype_t zonetype; - bool dynamic = false, frozen = false; - bool hasraw = false; - bool secure, maintain, allow; - dns_db_t * db = NULL, *rawdb = NULL; - char ** incfiles = NULL; - int nfiles = 0; + bool dynamic = false, frozen = false; + bool hasraw = false; + bool secure, maintain, allow; + dns_db_t *db = NULL, *rawdb = NULL; + char **incfiles = NULL; + int nfiles = 0; isc_time_settoepoch(&loadtime); isc_time_settoepoch(&refreshtime); @@ -14634,7 +14557,8 @@ named_server_zonestatus(named_server_t *server, isc_lex_t *lex, /* Refresh/expire times */ if (zonetype == dns_zone_slave || zonetype == dns_zone_mirror || - zonetype == dns_zone_stub || zonetype == dns_zone_redirect) { + zonetype == dns_zone_stub || zonetype == dns_zone_redirect) + { dns_zone_getexpiretime(mayberaw, &expiretime); isc_time_formathttptimestamp(&expiretime, xbuf, sizeof(xbuf)); dns_zone_getrefreshtime(mayberaw, &refreshtime); @@ -14659,10 +14583,11 @@ named_server_zonestatus(named_server_t *server, isc_lex_t *lex, if (secure && (zonetype == dns_zone_master || (zonetype == dns_zone_slave && hasraw)) && - ((dns_zone_getkeyopts(zone) & DNS_ZONEKEY_NORESIGN) == 0)) { - dns_name_t * name; + ((dns_zone_getkeyopts(zone) & DNS_ZONEKEY_NORESIGN) == 0)) + { + dns_name_t *name; dns_fixedname_t fixed; - dns_rdataset_t next; + dns_rdataset_t next; dns_rdataset_init(&next); name = dns_fixedname_initname(&fixed); @@ -14670,8 +14595,8 @@ named_server_zonestatus(named_server_t *server, isc_lex_t *lex, result = dns_db_getsigningtime(db, &next, name); if (result == ISC_R_SUCCESS) { isc_stdtime_t timenow; - char namebuf[DNS_NAME_FORMATSIZE]; - char typebuf[DNS_RDATATYPE_FORMATSIZE]; + char namebuf[DNS_NAME_FORMATSIZE]; + char typebuf[DNS_RDATATYPE_FORMATSIZE]; isc_stdtime_get(&timenow); dns_name_format(name, namebuf, sizeof(namebuf)); @@ -14794,7 +14719,7 @@ cleanup: dns_db_detach(&rawdb); } if (incfiles != NULL && mayberaw != NULL) { - int i; + int i; isc_mem_t *mctx = dns_zone_getmctx(mayberaw); for (i = 0; i < nfiles; i++) { @@ -14814,8 +14739,7 @@ cleanup: } static inline bool -argcheck(char *cmd, const char *full) -{ +argcheck(char *cmd, const char *full) { size_t l; if (cmd == NULL || cmd[0] != '-') { @@ -14833,26 +14757,25 @@ argcheck(char *cmd, const char *full) isc_result_t named_server_nta(named_server_t *server, isc_lex_t *lex, bool readonly, - isc_buffer_t **text) -{ - dns_view_t * view; - dns_ntatable_t * ntatable = NULL; - isc_result_t result = ISC_R_SUCCESS; - char * ptr, *nametext = NULL, *viewname; - char namebuf[DNS_NAME_FORMATSIZE]; - char viewbuf[DNS_NAME_FORMATSIZE]; - isc_stdtime_t now, when; - isc_time_t t; - char tbuf[64]; - const char * msg = NULL; - bool dump = false, force = false; - dns_fixedname_t fn; + isc_buffer_t **text) { + dns_view_t *view; + dns_ntatable_t *ntatable = NULL; + isc_result_t result = ISC_R_SUCCESS; + char *ptr, *nametext = NULL, *viewname; + char namebuf[DNS_NAME_FORMATSIZE]; + char viewbuf[DNS_NAME_FORMATSIZE]; + isc_stdtime_t now, when; + isc_time_t t; + char tbuf[64]; + const char *msg = NULL; + bool dump = false, force = false; + dns_fixedname_t fn; const dns_name_t *ntaname; - dns_name_t * fname; - dns_ttl_t ntattl; - bool ttlset = false, excl = false, viewfound = false; - dns_rdataclass_t rdclass = dns_rdataclass_in; - bool first = true; + dns_name_t *fname; + dns_ttl_t ntattl; + bool ttlset = false, excl = false, viewfound = false; + dns_rdataclass_t rdclass = dns_rdataclass_in; + bool first = true; UNUSED(force); @@ -14933,7 +14856,8 @@ named_server_nta(named_server_t *server, isc_lex_t *lex, bool readonly, */ if (dump) { for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if (ntatable != NULL) { dns_ntatable_detach(&ntatable); } @@ -14995,7 +14919,8 @@ named_server_nta(named_server_t *server, isc_lex_t *lex, bool readonly, RUNTIME_CHECK(result == ISC_R_SUCCESS); excl = true; for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if (viewname != NULL && strcmp(view->name, viewname) != 0) { continue; } @@ -15119,12 +15044,12 @@ cleanup: } isc_result_t -named_server_saventa(named_server_t *server) -{ +named_server_saventa(named_server_t *server) { dns_view_t *view; for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { isc_result_t result = dns_view_saventa(view); if (result != ISC_R_SUCCESS) { @@ -15140,17 +15065,18 @@ named_server_saventa(named_server_t *server) } isc_result_t -named_server_loadnta(named_server_t *server) -{ +named_server_loadnta(named_server_t *server) { dns_view_t *view; for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { isc_result_t result = dns_view_loadnta(view); if ((result != ISC_R_SUCCESS) && (result != ISC_R_FILENOTFOUND) && - (result != ISC_R_NOTFOUND)) { + (result != ISC_R_NOTFOUND)) + { isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "error loading NTA file " @@ -15163,10 +15089,9 @@ named_server_loadnta(named_server_t *server) } static isc_result_t -mkey_refresh(dns_view_t *view, isc_buffer_t **text) -{ +mkey_refresh(dns_view_t *view, isc_buffer_t **text) { isc_result_t result; - char msg[DNS_NAME_FORMATSIZE + 500] = ""; + char msg[DNS_NAME_FORMATSIZE + 500] = ""; snprintf(msg, sizeof(msg), "refreshing managed keys for '%s'", view->name); @@ -15178,15 +15103,14 @@ cleanup: } static isc_result_t -mkey_destroy(named_server_t *server, dns_view_t *view, isc_buffer_t **text) -{ +mkey_destroy(named_server_t *server, dns_view_t *view, isc_buffer_t **text) { isc_result_t result; - char msg[DNS_NAME_FORMATSIZE + 500] = ""; - bool exclusive = false; - const char * file = NULL; - dns_db_t * dbp = NULL; - dns_zone_t * mkzone = NULL; - bool removed_a_file = false; + char msg[DNS_NAME_FORMATSIZE + 500] = ""; + bool exclusive = false; + const char *file = NULL; + dns_db_t *dbp = NULL; + dns_zone_t *mkzone = NULL; + bool removed_a_file = false; if (view->managed_keys == NULL) { CHECK(ISC_R_NOTFOUND); @@ -15250,14 +15174,13 @@ cleanup: } static isc_result_t -mkey_dumpzone(dns_view_t *view, isc_buffer_t **text) -{ - isc_result_t result; - dns_db_t * db = NULL; +mkey_dumpzone(dns_view_t *view, isc_buffer_t **text) { + isc_result_t result; + dns_db_t *db = NULL; dns_dbversion_t *ver = NULL; dns_rriterator_t rrit; - isc_stdtime_t now; - dns_name_t * prevname = NULL; + isc_stdtime_t now; + dns_name_t *prevname = NULL; isc_stdtime_get(&now); @@ -15265,17 +15188,19 @@ mkey_dumpzone(dns_view_t *view, isc_buffer_t **text) dns_db_currentversion(db, &ver); dns_rriterator_init(&rrit, db, ver, 0); for (result = dns_rriterator_first(&rrit); result == ISC_R_SUCCESS; - result = dns_rriterator_nextrrset(&rrit)) { - char buf[DNS_NAME_FORMATSIZE + 500]; - dns_name_t * name = NULL; - dns_rdataset_t * kdset = NULL; - dns_rdata_t rdata = DNS_RDATA_INIT; + result = dns_rriterator_nextrrset(&rrit)) + { + char buf[DNS_NAME_FORMATSIZE + 500]; + dns_name_t *name = NULL; + dns_rdataset_t *kdset = NULL; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_keydata_t kd; - uint32_t ttl; + uint32_t ttl; dns_rriterator_current(&rrit, &name, &ttl, &kdset, NULL); if (kdset == NULL || kdset->type != dns_rdatatype_keydata || - !dns_rdataset_isassociated(kdset)) { + !dns_rdataset_isassociated(kdset)) + { continue; } @@ -15287,14 +15212,14 @@ mkey_dumpzone(dns_view_t *view, isc_buffer_t **text) } for (result = dns_rdataset_first(kdset); - result == ISC_R_SUCCESS; - result = dns_rdataset_next(kdset)) { - char alg[DNS_SECALG_FORMATSIZE]; - char tbuf[ISC_FORMATHTTPTIMESTAMP_SIZE]; + result == ISC_R_SUCCESS; result = dns_rdataset_next(kdset)) + { + char alg[DNS_SECALG_FORMATSIZE]; + char tbuf[ISC_FORMATHTTPTIMESTAMP_SIZE]; dns_keytag_t keyid; isc_region_t r; - isc_time_t t; - bool revoked; + isc_time_t t; + bool revoked; dns_rdata_reset(&rdata); dns_rdataset_current(kdset, &rdata); @@ -15369,11 +15294,10 @@ cleanup: } static isc_result_t -mkey_status(dns_view_t *view, isc_buffer_t **text) -{ +mkey_status(dns_view_t *view, isc_buffer_t **text) { isc_result_t result; - char msg[ISC_FORMATHTTPTIMESTAMP_SIZE]; - isc_time_t t; + char msg[ISC_FORMATHTTPTIMESTAMP_SIZE]; + isc_time_t t; CHECK(putstr(text, "view: ")); CHECK(putstr(text, view->name)); @@ -15395,13 +15319,13 @@ cleanup: } isc_result_t -named_server_mkeys(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) -{ - char * cmd, *classtxt, *viewtxt = NULL; - isc_result_t result = ISC_R_SUCCESS; - dns_view_t * view = NULL; +named_server_mkeys(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) { + char *cmd, *classtxt, *viewtxt = NULL; + isc_result_t result = ISC_R_SUCCESS; + dns_view_t *view = NULL; dns_rdataclass_t rdclass; - char msg[DNS_NAME_FORMATSIZE + 500] = ""; + char msg[DNS_NAME_FORMATSIZE + 500] = ""; enum { NONE, STATUS, REFRESH, SYNC, DESTROY } opt = NONE; bool found = false; bool first = true; @@ -15450,9 +15374,11 @@ named_server_mkeys(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) } for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if (viewtxt != NULL && (rdclass != view->rdclass || - strcmp(view->name, viewtxt) != 0)) { + strcmp(view->name, viewtxt) != 0)) + { continue; } @@ -15515,13 +15441,13 @@ cleanup: } isc_result_t -named_server_dnstap(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) -{ +named_server_dnstap(named_server_t *server, isc_lex_t *lex, + isc_buffer_t **text) { #ifdef HAVE_DNSTAP - char * ptr; + char *ptr; isc_result_t result; - bool reopen = false; - int backups = 0; + bool reopen = false; + int backups = 0; if (server->dtenv == NULL) { return (ISC_R_NOTFOUND); @@ -15573,12 +15499,11 @@ named_server_dnstap(named_server_t *server, isc_lex_t *lex, isc_buffer_t **text) } isc_result_t -named_server_tcptimeouts(isc_lex_t *lex, isc_buffer_t **text) -{ - char * ptr; +named_server_tcptimeouts(isc_lex_t *lex, isc_buffer_t **text) { + char *ptr; isc_result_t result = ISC_R_SUCCESS; unsigned int initial, idle, keepalive, advertised; - char msg[128]; + char msg[128]; /* Skip the command name. */ ptr = next_token(lex, text); @@ -15661,17 +15586,16 @@ cleanup: isc_result_t named_server_servestale(named_server_t *server, isc_lex_t *lex, - isc_buffer_t **text) -{ - char * ptr, *classtxt, *viewtxt = NULL; - char msg[128]; - dns_rdataclass_t rdclass = dns_rdataclass_in; - dns_view_t * view; - bool found = false; + isc_buffer_t **text) { + char *ptr, *classtxt, *viewtxt = NULL; + char msg[128]; + dns_rdataclass_t rdclass = dns_rdataclass_in; + dns_view_t *view; + bool found = false; dns_stale_answer_t staleanswersok = dns_stale_answer_conf; - bool wantstatus = false; - isc_result_t result = ISC_R_SUCCESS; - bool exclusive = false; + bool wantstatus = false; + isc_result_t result = ISC_R_SUCCESS; + bool exclusive = false; /* Skip the command name. */ ptr = next_token(lex, text); @@ -15685,10 +15609,12 @@ named_server_servestale(named_server_t *server, isc_lex_t *lex, } if (!strcasecmp(ptr, "on") || !strcasecmp(ptr, "yes") || - !strcasecmp(ptr, "enable") || !strcasecmp(ptr, "true")) { + !strcasecmp(ptr, "enable") || !strcasecmp(ptr, "true")) + { staleanswersok = dns_stale_answer_yes; } else if (!strcasecmp(ptr, "off") || !strcasecmp(ptr, "no") || - !strcasecmp(ptr, "disable") || !strcasecmp(ptr, "false")) { + !strcasecmp(ptr, "disable") || !strcasecmp(ptr, "false")) + { staleanswersok = dns_stale_answer_no; } else if (strcasecmp(ptr, "reset") == 0) { staleanswersok = dns_stale_answer_conf; @@ -15730,7 +15656,8 @@ named_server_servestale(named_server_t *server, isc_lex_t *lex, exclusive = true; for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { dns_ttl_t stale_ttl = 0; dns_db_t *db = NULL; diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c index 606b373973..606e652eba 100644 --- a/bin/named/statschannel.c +++ b/bin/named/statschannel.c @@ -58,15 +58,15 @@ struct named_statschannel { /* Unlocked */ isc_httpdmgr_t *httpdmgr; - isc_sockaddr_t address; - isc_mem_t * mctx; + isc_sockaddr_t address; + isc_mem_t *mctx; /* * Locked by channel lock: can be referenced and modified by both * the server task and the channel task. */ isc_mutex_t lock; - dns_acl_t * acl; + dns_acl_t *acl; /* Locked by server task */ ISC_LINK(struct named_statschannel) link; @@ -74,11 +74,11 @@ struct named_statschannel { typedef struct stats_dumparg { isc_statsformat_t type; - void * arg; /* type dependent argument */ - int ncounters; /* for general statistics */ - int * counterindices; /* for general statistics */ - uint64_t * countervalues; /* for general statistics */ - isc_result_t result; + void *arg; /* type dependent argument */ + int ncounters; /* for general statistics */ + int *counterindices; /* for general statistics */ + uint64_t *countervalues; /* for general statistics */ + isc_result_t result; } stats_dumparg_t; static isc_once_t once = ISC_ONCE_INIT; @@ -91,13 +91,12 @@ static isc_once_t once = ISC_ONCE_INIT; #ifdef EXTENDED_STATS static const char * -user_zonetype(dns_zone_t *zone) -{ +user_zonetype(dns_zone_t *zone) { dns_zonetype_t ztype; - dns_view_t * view; + dns_view_t *view; static const struct zt { const dns_zonetype_t type; - const char *const string; + const char *const string; } typemap[] = { { dns_zone_none, "none" }, { dns_zone_master, "master" }, { dns_zone_slave, "slave" }, @@ -158,18 +157,18 @@ static const char *tcpoutsizestats_xmldesc[dns_sizecounter_out_max]; static const char *dnstapstats_xmldesc[dns_dnstapcounter_max]; static const char *gluecachestats_xmldesc[dns_gluecachestatscounter_max]; #else /* if defined(EXTENDED_STATS) */ -#define nsstats_xmldesc NULL -#define resstats_xmldesc NULL -#define adbstats_xmldesc NULL -#define zonestats_xmldesc NULL -#define sockstats_xmldesc NULL -#define dnssecstats_xmldesc NULL -#define udpinsizestats_xmldesc NULL +#define nsstats_xmldesc NULL +#define resstats_xmldesc NULL +#define adbstats_xmldesc NULL +#define zonestats_xmldesc NULL +#define sockstats_xmldesc NULL +#define dnssecstats_xmldesc NULL +#define udpinsizestats_xmldesc NULL #define udpoutsizestats_xmldesc NULL -#define tcpinsizestats_xmldesc NULL +#define tcpinsizestats_xmldesc NULL #define tcpoutsizestats_xmldesc NULL -#define dnstapstats_xmldesc NULL -#define gluecachestats_xmldesc NULL +#define dnstapstats_xmldesc NULL +#define gluecachestats_xmldesc NULL #endif /* EXTENDED_STATS */ #define TRY0(a) \ @@ -199,8 +198,7 @@ static int gluecachestats_index[dns_gluecachestatscounter_max]; static inline void set_desc(int counter, int maxcounter, const char *fdesc, const char **fdescs, - const char *xdesc, const char **xdescs) -{ + const char *xdesc, const char **xdescs) { REQUIRE(counter < maxcounter); REQUIRE(fdescs != NULL && fdescs[counter] == NULL); #if defined(EXTENDED_STATS) @@ -217,8 +215,7 @@ set_desc(int counter, int maxcounter, const char *fdesc, const char **fdescs, } static void -init_desc(void) -{ +init_desc(void) { int i; /* Initialize name server statistics */ @@ -1313,8 +1310,7 @@ init_desc(void) * Dump callback functions. */ static void -generalstat_dump(isc_statscounter_t counter, uint64_t val, void *arg) -{ +generalstat_dump(isc_statscounter_t counter, uint64_t val, void *arg) { stats_dumparg_t *dumparg = arg; REQUIRE(counter < dumparg->ncounters); @@ -1324,15 +1320,14 @@ generalstat_dump(isc_statscounter_t counter, uint64_t val, void *arg) static isc_result_t dump_counters(isc_stats_t *stats, isc_statsformat_t type, void *arg, const char *category, const char **desc, int ncounters, - int *indices, uint64_t *values, int options) -{ - int i, idx; - uint64_t value; + int *indices, uint64_t *values, int options) { + int i, idx; + uint64_t value; stats_dumparg_t dumparg; - FILE * fp; + FILE *fp; #ifdef HAVE_LIBXML2 void *writer; - int xmlrc; + int xmlrc; #endif /* ifdef HAVE_LIBXML2 */ #ifdef HAVE_JSON_C json_object *job, *cat, *counter; @@ -1439,15 +1434,14 @@ error: } static void -rdtypestat_dump(dns_rdatastatstype_t type, uint64_t val, void *arg) -{ - char typebuf[64]; - const char * typestr; +rdtypestat_dump(dns_rdatastatstype_t type, uint64_t val, void *arg) { + char typebuf[64]; + const char *typestr; stats_dumparg_t *dumparg = arg; - FILE * fp; + FILE *fp; #ifdef HAVE_LIBXML2 void *writer; - int xmlrc; + int xmlrc; #endif /* ifdef HAVE_LIBXML2 */ #ifdef HAVE_JSON_C json_object *zoneobj, *obj; @@ -1503,35 +1497,34 @@ error: } static bool -rdatastatstype_attr(dns_rdatastatstype_t type, unsigned int attr) -{ +rdatastatstype_attr(dns_rdatastatstype_t type, unsigned int attr) { return ((DNS_RDATASTATSTYPE_ATTR(type) & attr) != 0); } static void -rdatasetstats_dump(dns_rdatastatstype_t type, uint64_t val, void *arg) -{ +rdatasetstats_dump(dns_rdatastatstype_t type, uint64_t val, void *arg) { stats_dumparg_t *dumparg = arg; - FILE * fp; - char typebuf[64]; - const char * typestr; - bool nxrrset = false; - bool stale = false; - bool ancient = false; + FILE *fp; + char typebuf[64]; + const char *typestr; + bool nxrrset = false; + bool stale = false; + bool ancient = false; #ifdef HAVE_LIBXML2 void *writer; - int xmlrc; + int xmlrc; #endif /* ifdef HAVE_LIBXML2 */ #ifdef HAVE_JSON_C json_object *zoneobj, *obj; - char buf[1024]; + char buf[1024]; #endif /* ifdef HAVE_JSON_C */ if ((DNS_RDATASTATSTYPE_ATTR(type) & DNS_RDATASTATSTYPE_ATTR_NXDOMAIN) != 0) { typestr = "NXDOMAIN"; } else if ((DNS_RDATASTATSTYPE_ATTR(type) & - DNS_RDATASTATSTYPE_ATTR_OTHERTYPE) != 0) { + DNS_RDATASTATSTYPE_ATTR_OTHERTYPE) != 0) + { typestr = "Others"; } else { dns_rdatatype_format(DNS_RDATASTATSTYPE_BASE(type), typebuf, @@ -1591,15 +1584,14 @@ error: } static void -opcodestat_dump(dns_opcode_t code, uint64_t val, void *arg) -{ - FILE * fp; - isc_buffer_t b; - char codebuf[64]; +opcodestat_dump(dns_opcode_t code, uint64_t val, void *arg) { + FILE *fp; + isc_buffer_t b; + char codebuf[64]; stats_dumparg_t *dumparg = arg; #ifdef HAVE_LIBXML2 void *writer; - int xmlrc; + int xmlrc; #endif /* ifdef HAVE_LIBXML2 */ #ifdef HAVE_JSON_C json_object *zoneobj, *obj; @@ -1648,15 +1640,14 @@ error: } static void -rcodestat_dump(dns_rcode_t code, uint64_t val, void *arg) -{ - FILE * fp; - isc_buffer_t b; - char codebuf[64]; +rcodestat_dump(dns_rcode_t code, uint64_t val, void *arg) { + FILE *fp; + isc_buffer_t b; + char codebuf[64]; stats_dumparg_t *dumparg = arg; #ifdef HAVE_LIBXML2 void *writer; - int xmlrc; + int xmlrc; #endif /* ifdef HAVE_LIBXML2 */ #ifdef HAVE_JSON_C json_object *zoneobj, *obj; @@ -1706,14 +1697,13 @@ error: #if defined(EXTENDED_STATS) static void -dnssecsignstat_dump(dns_keytag_t tag, uint64_t val, void *arg) -{ - FILE * fp; - char tagbuf[64]; +dnssecsignstat_dump(dns_keytag_t tag, uint64_t val, void *arg) { + FILE *fp; + char tagbuf[64]; stats_dumparg_t *dumparg = arg; #ifdef HAVE_LIBXML2 xmlTextWriterPtr writer; - int xmlrc; + int xmlrc; #endif /* ifdef HAVE_LIBXML2 */ #ifdef HAVE_JSON_C json_object *zoneobj, *obj; @@ -1763,27 +1753,26 @@ error: /* * Which statistics to include when rendering to XML */ -#define STATS_XML_STATUS 0x00 /* display only common statistics */ -#define STATS_XML_SERVER 0x01 -#define STATS_XML_ZONES 0x02 -#define STATS_XML_TASKS 0x04 -#define STATS_XML_NET 0x08 -#define STATS_XML_MEM 0x10 +#define STATS_XML_STATUS 0x00 /* display only common statistics */ +#define STATS_XML_SERVER 0x01 +#define STATS_XML_ZONES 0x02 +#define STATS_XML_TASKS 0x04 +#define STATS_XML_NET 0x08 +#define STATS_XML_MEM 0x10 #define STATS_XML_TRAFFIC 0x20 -#define STATS_XML_ALL 0xff +#define STATS_XML_ALL 0xff static isc_result_t -zone_xmlrender(dns_zone_t *zone, void *arg) -{ +zone_xmlrender(dns_zone_t *zone, void *arg) { isc_result_t result; char buf[1024 + 32]; /* sufficiently large for zone name and class */ - dns_rdataclass_t rdclass; - uint32_t serial; - xmlTextWriterPtr writer = arg; + dns_rdataclass_t rdclass; + uint32_t serial; + xmlTextWriterPtr writer = arg; dns_zonestat_level_t statlevel; - int xmlrc; - stats_dumparg_t dumparg; - const char * ztype; + int xmlrc; + stats_dumparg_t dumparg; + const char *ztype; statlevel = dns_zone_getstatlevel(zone); if (statlevel == dns_zonestat_none) { @@ -1827,7 +1816,7 @@ zone_xmlrender(dns_zone_t *zone, void *arg) dns_stats_t *rcvquerystats; dns_stats_t *dnssecsignstats; dns_stats_t *dnssecrefreshstats; - uint64_t nsstat_values[ns_statscounter_max]; + uint64_t nsstat_values[ns_statscounter_max]; uint64_t gluecachestats_values[dns_gluecachestatscounter_max]; zonestats = dns_zone_getrequeststats(zone); @@ -1946,27 +1935,27 @@ error: } static isc_result_t -generatexml(named_server_t *server, uint32_t flags, int *buflen, xmlChar **buf) -{ - char boottime[sizeof "yyyy-mm-ddThh:mm:ss.sssZ"]; - char configtime[sizeof "yyyy-mm-ddThh:mm:ss.sssZ"]; - char nowstr[sizeof "yyyy-mm-ddThh:mm:ss.sssZ"]; - isc_time_t now; +generatexml(named_server_t *server, uint32_t flags, int *buflen, + xmlChar **buf) { + char boottime[sizeof "yyyy-mm-ddThh:mm:ss.sssZ"]; + char configtime[sizeof "yyyy-mm-ddThh:mm:ss.sssZ"]; + char nowstr[sizeof "yyyy-mm-ddThh:mm:ss.sssZ"]; + isc_time_t now; xmlTextWriterPtr writer = NULL; - xmlDocPtr doc = NULL; - int xmlrc; - dns_view_t * view; - stats_dumparg_t dumparg; - dns_stats_t * cacherrstats; - uint64_t nsstat_values[ns_statscounter_max]; - uint64_t resstat_values[dns_resstatscounter_max]; - uint64_t adbstat_values[dns_adbstats_max]; - uint64_t zonestat_values[dns_zonestatscounter_max]; - uint64_t sockstat_values[isc_sockstatscounter_max]; - uint64_t udpinsizestat_values[dns_sizecounter_in_max]; - uint64_t udpoutsizestat_values[dns_sizecounter_out_max]; - uint64_t tcpinsizestat_values[dns_sizecounter_in_max]; - uint64_t tcpoutsizestat_values[dns_sizecounter_out_max]; + xmlDocPtr doc = NULL; + int xmlrc; + dns_view_t *view; + stats_dumparg_t dumparg; + dns_stats_t *cacherrstats; + uint64_t nsstat_values[ns_statscounter_max]; + uint64_t resstat_values[dns_resstatscounter_max]; + uint64_t adbstat_values[dns_adbstats_max]; + uint64_t zonestat_values[dns_zonestatscounter_max]; + uint64_t sockstat_values[isc_sockstatscounter_max]; + uint64_t udpinsizestat_values[dns_sizecounter_in_max]; + uint64_t udpoutsizestat_values[dns_sizecounter_out_max]; + uint64_t tcpinsizestat_values[dns_sizecounter_in_max]; + uint64_t tcpoutsizestat_values[dns_sizecounter_out_max]; #ifdef HAVE_DNSTAP uint64_t dnstapstat_values[dns_dnstapcounter_max]; #endif /* ifdef HAVE_DNSTAP */ @@ -2411,8 +2400,7 @@ error: } static void -wrap_xmlfree(isc_buffer_t *buffer, void *arg) -{ +wrap_xmlfree(isc_buffer_t *buffer, void *arg) { UNUSED(arg); xmlFree(isc_buffer_base(buffer)); @@ -2422,12 +2410,11 @@ static isc_result_t render_xml(uint32_t flags, const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, - isc_buffer_t *b, isc_httpdfree_t **freecb, void **freecb_args) -{ - unsigned char * msg = NULL; - int msglen; + isc_buffer_t *b, isc_httpdfree_t **freecb, void **freecb_args) { + unsigned char *msg = NULL; + int msglen; named_server_t *server = arg; - isc_result_t result; + isc_result_t result; UNUSED(url); UNUSED(urlinfo); @@ -2458,8 +2445,7 @@ render_xml_all(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, isc_httpdfree_t **freecb, - void **freecb_args) -{ + void **freecb_args) { return (render_xml(STATS_XML_ALL, url, urlinfo, querystring, headers, arg, retcode, retmsg, mimetype, b, freecb, freecb_args)); @@ -2470,8 +2456,7 @@ render_xml_status(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, - isc_httpdfree_t **freecb, void **freecb_args) -{ + isc_httpdfree_t **freecb, void **freecb_args) { return (render_xml(STATS_XML_STATUS, url, urlinfo, querystring, headers, arg, retcode, retmsg, mimetype, b, freecb, freecb_args)); @@ -2482,8 +2467,7 @@ render_xml_server(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, - isc_httpdfree_t **freecb, void **freecb_args) -{ + isc_httpdfree_t **freecb, void **freecb_args) { return (render_xml(STATS_XML_SERVER, url, urlinfo, querystring, headers, arg, retcode, retmsg, mimetype, b, freecb, freecb_args)); @@ -2494,8 +2478,7 @@ render_xml_zones(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, - isc_httpdfree_t **freecb, void **freecb_args) -{ + isc_httpdfree_t **freecb, void **freecb_args) { return (render_xml(STATS_XML_ZONES, url, urlinfo, querystring, headers, arg, retcode, retmsg, mimetype, b, freecb, freecb_args)); @@ -2506,8 +2489,7 @@ render_xml_net(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, isc_httpdfree_t **freecb, - void **freecb_args) -{ + void **freecb_args) { return (render_xml(STATS_XML_NET, url, urlinfo, querystring, headers, arg, retcode, retmsg, mimetype, b, freecb, freecb_args)); @@ -2518,8 +2500,7 @@ render_xml_tasks(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, - isc_httpdfree_t **freecb, void **freecb_args) -{ + isc_httpdfree_t **freecb, void **freecb_args) { return (render_xml(STATS_XML_TASKS, url, urlinfo, querystring, headers, arg, retcode, retmsg, mimetype, b, freecb, freecb_args)); @@ -2530,8 +2511,7 @@ render_xml_mem(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, isc_httpdfree_t **freecb, - void **freecb_args) -{ + void **freecb_args) { return (render_xml(STATS_XML_MEM, url, urlinfo, querystring, headers, arg, retcode, retmsg, mimetype, b, freecb, freecb_args)); @@ -2542,8 +2522,7 @@ render_xml_traffic(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, - isc_httpdfree_t **freecb, void **freecb_args) -{ + isc_httpdfree_t **freecb, void **freecb_args) { return (render_xml(STATS_XML_TRAFFIC, url, urlinfo, querystring, headers, arg, retcode, retmsg, mimetype, b, freecb, freecb_args)); @@ -2555,14 +2534,14 @@ render_xml_traffic(const char *url, isc_httpdurl_t *urlinfo, /* * Which statistics to include when rendering to JSON */ -#define STATS_JSON_STATUS 0x00 /* display only common statistics */ -#define STATS_JSON_SERVER 0x01 -#define STATS_JSON_ZONES 0x02 -#define STATS_JSON_TASKS 0x04 -#define STATS_JSON_NET 0x08 -#define STATS_JSON_MEM 0x10 +#define STATS_JSON_STATUS 0x00 /* display only common statistics */ +#define STATS_JSON_SERVER 0x01 +#define STATS_JSON_ZONES 0x02 +#define STATS_JSON_TASKS 0x04 +#define STATS_JSON_NET 0x08 +#define STATS_JSON_MEM 0x10 #define STATS_JSON_TRAFFIC 0x20 -#define STATS_JSON_ALL 0xff +#define STATS_JSON_ALL 0xff #define CHECK(m) \ do { \ @@ -2580,8 +2559,7 @@ render_xml_traffic(const char *url, isc_httpdurl_t *urlinfo, } while (0) static void -wrap_jsonfree(isc_buffer_t *buffer, void *arg) -{ +wrap_jsonfree(isc_buffer_t *buffer, void *arg) { json_object_put(isc_buffer_base(buffer)); if (arg != NULL) { json_object_put((json_object *)arg); @@ -2590,8 +2568,7 @@ wrap_jsonfree(isc_buffer_t *buffer, void *arg) static json_object * addzone(char *name, char *classname, const char *ztype, uint32_t serial, - bool add_serial) -{ + bool add_serial) { json_object *node = json_object_new_object(); if (node == NULL) { @@ -2613,17 +2590,16 @@ addzone(char *name, char *classname, const char *ztype, uint32_t serial, } static isc_result_t -zone_jsonrender(dns_zone_t *zone, void *arg) -{ +zone_jsonrender(dns_zone_t *zone, void *arg) { isc_result_t result = ISC_R_SUCCESS; - char buf[1024 + 32]; /* sufficiently large for zone name and class */ - char classbuf[64]; /* sufficiently large for class */ + char buf[1024 + 32]; /* sufficiently large for zone name and class */ + char classbuf[64]; /* sufficiently large for class */ char *zone_name_only = NULL; char *class_only = NULL; - dns_rdataclass_t rdclass; - uint32_t serial; - json_object * zonearray = (json_object *)arg; - json_object * zoneobj = NULL; + dns_rdataclass_t rdclass; + uint32_t serial; + json_object *zonearray = (json_object *)arg; + json_object *zoneobj = NULL; dns_zonestat_level_t statlevel; statlevel = dns_zone_getstatlevel(zone); @@ -2656,7 +2632,7 @@ zone_jsonrender(dns_zone_t *zone, void *arg) dns_stats_t *rcvquerystats; dns_stats_t *dnssecsignstats; dns_stats_t *dnssecrefreshstats; - uint64_t nsstat_values[ns_statscounter_max]; + uint64_t nsstat_values[ns_statscounter_max]; uint64_t gluecachestats_values[dns_gluecachestatscounter_max]; zonestats = dns_zone_getrequeststats(zone); @@ -2713,7 +2689,7 @@ zone_jsonrender(dns_zone_t *zone, void *arg) rcvquerystats = dns_zone_getrcvquerystats(zone); if (rcvquerystats != NULL) { stats_dumparg_t dumparg; - json_object * counters = json_object_new_object(); + json_object *counters = json_object_new_object(); CHECKMEM(counters); dumparg.type = isc_statsformat_json; @@ -2737,7 +2713,7 @@ zone_jsonrender(dns_zone_t *zone, void *arg) dnssecsignstats = dns_zone_getdnssecsignstats(zone); if (dnssecsignstats != NULL) { stats_dumparg_t dumparg; - json_object * counters = json_object_new_object(); + json_object *counters = json_object_new_object(); CHECKMEM(counters); dumparg.type = isc_statsformat_json; @@ -2762,7 +2738,7 @@ zone_jsonrender(dns_zone_t *zone, void *arg) dnssecrefreshstats = dns_zone_getdnssecrefreshstats(zone); if (dnssecrefreshstats != NULL) { stats_dumparg_t dumparg; - json_object * counters = json_object_new_object(); + json_object *counters = json_object_new_object(); CHECKMEM(counters); dumparg.type = isc_statsformat_json; @@ -2798,9 +2774,8 @@ error: static isc_result_t generatejson(named_server_t *server, size_t *msglen, const char **msg, - json_object **rootp, uint32_t flags) -{ - dns_view_t * view; + json_object **rootp, uint32_t flags) { + dns_view_t *view; isc_result_t result = ISC_R_SUCCESS; json_object *bindstats, *viewlist, *counters, *obj; json_object *traffic = NULL; @@ -2808,23 +2783,23 @@ generatejson(named_server_t *server, size_t *msglen, const char **msg, json_object *tcpreq4 = NULL, *tcpresp4 = NULL; json_object *udpreq6 = NULL, *udpresp6 = NULL; json_object *tcpreq6 = NULL, *tcpresp6 = NULL; - uint64_t nsstat_values[ns_statscounter_max]; - uint64_t resstat_values[dns_resstatscounter_max]; - uint64_t adbstat_values[dns_adbstats_max]; - uint64_t zonestat_values[dns_zonestatscounter_max]; - uint64_t sockstat_values[isc_sockstatscounter_max]; - uint64_t udpinsizestat_values[dns_sizecounter_in_max]; - uint64_t udpoutsizestat_values[dns_sizecounter_out_max]; - uint64_t tcpinsizestat_values[dns_sizecounter_in_max]; - uint64_t tcpoutsizestat_values[dns_sizecounter_out_max]; + uint64_t nsstat_values[ns_statscounter_max]; + uint64_t resstat_values[dns_resstatscounter_max]; + uint64_t adbstat_values[dns_adbstats_max]; + uint64_t zonestat_values[dns_zonestatscounter_max]; + uint64_t sockstat_values[isc_sockstatscounter_max]; + uint64_t udpinsizestat_values[dns_sizecounter_in_max]; + uint64_t udpoutsizestat_values[dns_sizecounter_out_max]; + uint64_t tcpinsizestat_values[dns_sizecounter_in_max]; + uint64_t tcpoutsizestat_values[dns_sizecounter_out_max]; #ifdef HAVE_DNSTAP uint64_t dnstapstat_values[dns_dnstapcounter_max]; #endif /* ifdef HAVE_DNSTAP */ stats_dumparg_t dumparg; - char boottime[sizeof "yyyy-mm-ddThh:mm:ss.sssZ"]; - char configtime[sizeof "yyyy-mm-ddThh:mm:ss.sssZ"]; - char nowstr[sizeof "yyyy-mm-ddThh:mm:ss.sssZ"]; - isc_time_t now; + char boottime[sizeof "yyyy-mm-ddThh:mm:ss.sssZ"]; + char configtime[sizeof "yyyy-mm-ddThh:mm:ss.sssZ"]; + char nowstr[sizeof "yyyy-mm-ddThh:mm:ss.sssZ"]; + isc_time_t now; REQUIRE(msglen != NULL); REQUIRE(msg != NULL && *msg == NULL); @@ -3377,14 +3352,13 @@ static isc_result_t render_json(uint32_t flags, const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, - isc_buffer_t *b, isc_httpdfree_t **freecb, void **freecb_args) -{ - isc_result_t result; - json_object * bindstats = NULL; + isc_buffer_t *b, isc_httpdfree_t **freecb, void **freecb_args) { + isc_result_t result; + json_object *bindstats = NULL; named_server_t *server = arg; - const char * msg = NULL; - size_t msglen = 0; - char * p; + const char *msg = NULL; + size_t msglen = 0; + char *p; UNUSED(url); UNUSED(urlinfo); @@ -3415,8 +3389,7 @@ render_json_all(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, - isc_httpdfree_t **freecb, void **freecb_args) -{ + isc_httpdfree_t **freecb, void **freecb_args) { return (render_json(STATS_JSON_ALL, url, urlinfo, querystring, headers, arg, retcode, retmsg, mimetype, b, freecb, freecb_args)); @@ -3427,8 +3400,7 @@ render_json_status(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, - isc_httpdfree_t **freecb, void **freecb_args) -{ + isc_httpdfree_t **freecb, void **freecb_args) { return (render_json(STATS_JSON_STATUS, url, urlinfo, querystring, headers, arg, retcode, retmsg, mimetype, b, freecb, freecb_args)); @@ -3439,8 +3411,7 @@ render_json_server(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, - isc_httpdfree_t **freecb, void **freecb_args) -{ + isc_httpdfree_t **freecb, void **freecb_args) { return (render_json(STATS_JSON_SERVER, url, urlinfo, querystring, headers, arg, retcode, retmsg, mimetype, b, freecb, freecb_args)); @@ -3451,8 +3422,7 @@ render_json_zones(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, - isc_httpdfree_t **freecb, void **freecb_args) -{ + isc_httpdfree_t **freecb, void **freecb_args) { return (render_json(STATS_JSON_ZONES, url, urlinfo, querystring, headers, arg, retcode, retmsg, mimetype, b, freecb, freecb_args)); @@ -3463,8 +3433,7 @@ render_json_mem(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, - isc_httpdfree_t **freecb, void **freecb_args) -{ + isc_httpdfree_t **freecb, void **freecb_args) { return (render_json(STATS_JSON_MEM, url, urlinfo, querystring, headers, arg, retcode, retmsg, mimetype, b, freecb, freecb_args)); @@ -3475,8 +3444,7 @@ render_json_tasks(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, - isc_httpdfree_t **freecb, void **freecb_args) -{ + isc_httpdfree_t **freecb, void **freecb_args) { return (render_json(STATS_JSON_TASKS, url, urlinfo, querystring, headers, arg, retcode, retmsg, mimetype, b, freecb, freecb_args)); @@ -3487,8 +3455,7 @@ render_json_net(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, - isc_httpdfree_t **freecb, void **freecb_args) -{ + isc_httpdfree_t **freecb, void **freecb_args) { return (render_json(STATS_JSON_NET, url, urlinfo, querystring, headers, arg, retcode, retmsg, mimetype, b, freecb, freecb_args)); @@ -3499,8 +3466,7 @@ render_json_traffic(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, - isc_httpdfree_t **freecb, void **freecb_args) -{ + isc_httpdfree_t **freecb, void **freecb_args) { return (render_json(STATS_JSON_TRAFFIC, url, urlinfo, querystring, headers, arg, retcode, retmsg, mimetype, b, freecb, freecb_args)); @@ -3512,10 +3478,9 @@ static isc_result_t render_xsl(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *args, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, - isc_httpdfree_t **freecb, void **freecb_args) -{ + isc_httpdfree_t **freecb, void **freecb_args) { isc_result_t result; - char * _headers = NULL; + char *_headers = NULL; UNUSED(url); UNUSED(querystring); @@ -3526,8 +3491,8 @@ render_xsl(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, *mimetype = "text/xslt+xml"; if (urlinfo->isstatic) { - isc_time_t when; - char * line, *saveptr; + isc_time_t when; + char *line, *saveptr; const char *if_modified_since = "If-Modified-Since: "; _headers = strdup(headers); @@ -3537,7 +3502,8 @@ render_xsl(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, saveptr = NULL; for (line = strtok_r(_headers, "\n", &saveptr); line; - line = strtok_r(NULL, "\n", &saveptr)) { + line = strtok_r(NULL, "\n", &saveptr)) + { if (strncasecmp(line, if_modified_since, strlen(if_modified_since)) == 0) { time_t t1, t2; @@ -3581,8 +3547,7 @@ end: } static void -shutdown_listener(named_statschannel_t *listener) -{ +shutdown_listener(named_statschannel_t *listener) { char socktext[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_format(&listener->address, socktext, sizeof(socktext)); isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, @@ -3593,14 +3558,13 @@ shutdown_listener(named_statschannel_t *listener) } static bool -client_ok(const isc_sockaddr_t *fromaddr, void *arg) -{ +client_ok(const isc_sockaddr_t *fromaddr, void *arg) { named_statschannel_t *listener = arg; - dns_aclenv_t * env = + dns_aclenv_t *env = ns_interfacemgr_getaclenv(named_g_server->interfacemgr); isc_netaddr_t netaddr; - char socktext[ISC_SOCKADDR_FORMATSIZE]; - int match; + char socktext[ISC_SOCKADDR_FORMATSIZE]; + int match; REQUIRE(listener != NULL); @@ -3609,7 +3573,8 @@ client_ok(const isc_sockaddr_t *fromaddr, void *arg) LOCK(&listener->lock); if ((dns_acl_match(&netaddr, NULL, listener->acl, env, &match, NULL) == ISC_R_SUCCESS) && - match > 0) { + match > 0) + { UNLOCK(&listener->lock); return (true); } @@ -3624,8 +3589,7 @@ client_ok(const isc_sockaddr_t *fromaddr, void *arg) } static void -destroy_listener(void *arg) -{ +destroy_listener(void *arg) { named_statschannel_t *listener = arg; REQUIRE(listener != NULL); @@ -3642,14 +3606,13 @@ static isc_result_t add_listener(named_server_t *server, named_statschannel_t **listenerp, const cfg_obj_t *listen_params, const cfg_obj_t *config, isc_sockaddr_t *addr, cfg_aclconfctx_t *aclconfctx, - const char *socktext) -{ - isc_result_t result; + const char *socktext) { + isc_result_t result; named_statschannel_t *listener; - isc_task_t * task = NULL; - isc_socket_t * sock = NULL; - const cfg_obj_t * allow; - dns_acl_t * new_acl = NULL; + isc_task_t *task = NULL; + isc_socket_t *sock = NULL; + const cfg_obj_t *allow; + dns_acl_t *new_acl = NULL; listener = isc_mem_get(server->mctx, sizeof(*listener)); @@ -3777,15 +3740,15 @@ static void update_listener(named_server_t *server, named_statschannel_t **listenerp, const cfg_obj_t *listen_params, const cfg_obj_t *config, isc_sockaddr_t *addr, cfg_aclconfctx_t *aclconfctx, - const char *socktext) -{ + const char *socktext) { named_statschannel_t *listener; - const cfg_obj_t * allow = NULL; - dns_acl_t * new_acl = NULL; - isc_result_t result = ISC_R_SUCCESS; + const cfg_obj_t *allow = NULL; + dns_acl_t *new_acl = NULL; + isc_result_t result = ISC_R_SUCCESS; for (listener = ISC_LIST_HEAD(server->statschannels); listener != NULL; - listener = ISC_LIST_NEXT(listener, link)) { + listener = ISC_LIST_NEXT(listener, link)) + { if (isc_sockaddr_equal(addr, &listener->address)) { break; } @@ -3828,13 +3791,12 @@ update_listener(named_server_t *server, named_statschannel_t **listenerp, isc_result_t named_statschannels_configure(named_server_t *server, const cfg_obj_t *config, - cfg_aclconfctx_t *aclconfctx) -{ - named_statschannel_t * listener, *listener_next; + cfg_aclconfctx_t *aclconfctx) { + named_statschannel_t *listener, *listener_next; named_statschannellist_t new_listeners; - const cfg_obj_t * statschannellist = NULL; - const cfg_listelt_t * element, *element2; - char socktext[ISC_SOCKADDR_FORMATSIZE]; + const cfg_obj_t *statschannellist = NULL; + const cfg_listelt_t *element, *element2; + char socktext[ISC_SOCKADDR_FORMATSIZE]; RUNTIME_CHECK(isc_once_do(&once, init_desc) == ISC_R_SUCCESS); @@ -3875,7 +3837,8 @@ named_statschannels_configure(named_server_t *server, const cfg_obj_t *config, #endif /* EXTENDED_STATS */ for (element = cfg_list_first(statschannellist); - element != NULL; element = cfg_list_next(element)) { + element != NULL; element = cfg_list_next(element)) + { const cfg_obj_t *statschannel; const cfg_obj_t *listenercfg = NULL; @@ -3887,10 +3850,11 @@ named_statschannels_configure(named_server_t *server, const cfg_obj_t *config, for (element2 = cfg_list_first(listenercfg); element2 != NULL; - element2 = cfg_list_next(element2)) { + element2 = cfg_list_next(element2)) + { const cfg_obj_t *listen_params; const cfg_obj_t *obj; - isc_sockaddr_t addr; + isc_sockaddr_t addr; listen_params = cfg_listelt_value(element2); @@ -3956,7 +3920,8 @@ named_statschannels_configure(named_server_t *server, const cfg_obj_t *config, } for (listener = ISC_LIST_HEAD(server->statschannels); listener != NULL; - listener = listener_next) { + listener = listener_next) + { listener_next = ISC_LIST_NEXT(listener, link); ISC_LIST_UNLINK(server->statschannels, listener, link); shutdown_listener(listener); @@ -3967,8 +3932,7 @@ named_statschannels_configure(named_server_t *server, const cfg_obj_t *config, } void -named_statschannels_shutdown(named_server_t *server) -{ +named_statschannels_shutdown(named_server_t *server) { named_statschannel_t *listener; while ((listener = ISC_LIST_HEAD(server->statschannels)) != NULL) { @@ -3978,19 +3942,18 @@ named_statschannels_shutdown(named_server_t *server) } isc_result_t -named_stats_dump(named_server_t *server, FILE *fp) -{ - isc_stdtime_t now; - isc_result_t result; - dns_view_t * view; - dns_zone_t * zone, *next; +named_stats_dump(named_server_t *server, FILE *fp) { + isc_stdtime_t now; + isc_result_t result; + dns_view_t *view; + dns_zone_t *zone, *next; stats_dumparg_t dumparg; - uint64_t nsstat_values[ns_statscounter_max]; - uint64_t resstat_values[dns_resstatscounter_max]; - uint64_t adbstat_values[dns_adbstats_max]; - uint64_t zonestat_values[dns_zonestatscounter_max]; - uint64_t sockstat_values[isc_sockstatscounter_max]; - uint64_t gluecachestats_values[dns_gluecachestatscounter_max]; + uint64_t nsstat_values[ns_statscounter_max]; + uint64_t resstat_values[dns_resstatscounter_max]; + uint64_t adbstat_values[dns_adbstats_max]; + uint64_t zonestat_values[dns_zonestatscounter_max]; + uint64_t sockstat_values[isc_sockstatscounter_max]; + uint64_t gluecachestats_values[dns_gluecachestatscounter_max]; RUNTIME_CHECK(isc_once_do(&once, init_desc) == ISC_R_SUCCESS); @@ -4015,7 +3978,8 @@ named_stats_dump(named_server_t *server, FILE *fp) fprintf(fp, "++ Outgoing Queries ++\n"); for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if (view->resquerystats == NULL) { continue; } @@ -4045,7 +4009,8 @@ named_stats_dump(named_server_t *server, FILE *fp) NULL, resstats_desc, dns_resstatscounter_max, resstats_index, resstat_values, 0); for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if (view->resstats == NULL) { continue; } @@ -4062,7 +4027,8 @@ named_stats_dump(named_server_t *server, FILE *fp) fprintf(fp, "++ Cache Statistics ++\n"); for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if (strcmp(view->name, "_default") == 0) { fprintf(fp, "[View: default]\n"); } else { @@ -4080,7 +4046,8 @@ named_stats_dump(named_server_t *server, FILE *fp) fprintf(fp, "++ Cache DB RRsets ++\n"); for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { dns_stats_t *cacherrstats; cacherrstats = dns_db_getrrsetstats(view->cachedb); @@ -4106,7 +4073,8 @@ named_stats_dump(named_server_t *server, FILE *fp) fprintf(fp, "++ ADB stats ++\n"); for (view = ISC_LIST_HEAD(server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if (view->adbstats == NULL) { continue; } @@ -4129,7 +4097,8 @@ named_stats_dump(named_server_t *server, FILE *fp) zone = NULL; for (result = dns_zone_first(server->zonemgr, &zone); result == ISC_R_SUCCESS; - next = NULL, result = dns_zone_next(zone, &next), zone = next) { + next = NULL, result = dns_zone_next(zone, &next), zone = next) + { isc_stats_t *zonestats = dns_zone_getrequeststats(zone); if (zonestats != NULL) { char zonename[DNS_NAME_FORMATSIZE]; @@ -4158,7 +4127,8 @@ named_stats_dump(named_server_t *server, FILE *fp) zone = NULL; for (result = dns_zone_first(server->zonemgr, &zone); result == ISC_R_SUCCESS; - next = NULL, result = dns_zone_next(zone, &next), zone = next) { + next = NULL, result = dns_zone_next(zone, &next), zone = next) + { isc_stats_t *gluecachestats = dns_zone_getgluecachestats(zone); if (gluecachestats != NULL) { char zonename[DNS_NAME_FORMATSIZE]; diff --git a/bin/named/tkeyconf.c b/bin/named/tkeyconf.c index c1d9e7cae3..87caf77234 100644 --- a/bin/named/tkeyconf.c +++ b/bin/named/tkeyconf.c @@ -41,17 +41,16 @@ isc_result_t named_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx, - dns_tkeyctx_t **tctxp) -{ - isc_result_t result; - dns_tkeyctx_t * tctx = NULL; - const char * s; - uint32_t n; - dns_fixedname_t fname; - dns_name_t * name; - isc_buffer_t b; + dns_tkeyctx_t **tctxp) { + isc_result_t result; + dns_tkeyctx_t *tctx = NULL; + const char *s; + uint32_t n; + dns_fixedname_t fname; + dns_name_t *name; + isc_buffer_t b; const cfg_obj_t *obj; - int type; + int type; result = dns_tkeyctx_create(mctx, &tctx); if (result != ISC_R_SUCCESS) { diff --git a/bin/named/tsigconf.c b/bin/named/tsigconf.c index 2fcf04b32b..618efd4907 100644 --- a/bin/named/tsigconf.c +++ b/bin/named/tsigconf.c @@ -30,30 +30,30 @@ static isc_result_t add_initial_keys(const cfg_obj_t *list, dns_tsig_keyring_t *ring, - isc_mem_t *mctx) -{ - dns_tsigkey_t * tsigkey = NULL; + isc_mem_t *mctx) { + dns_tsigkey_t *tsigkey = NULL; const cfg_listelt_t *element; - const cfg_obj_t * key = NULL; - const char * keyid = NULL; - unsigned char * secret = NULL; - int secretalloc = 0; - int secretlen = 0; - isc_result_t ret; - isc_stdtime_t now; - uint16_t bits; + const cfg_obj_t *key = NULL; + const char *keyid = NULL; + unsigned char *secret = NULL; + int secretalloc = 0; + int secretlen = 0; + isc_result_t ret; + isc_stdtime_t now; + uint16_t bits; for (element = cfg_list_first(list); element != NULL; - element = cfg_list_next(element)) { - const cfg_obj_t * algobj = NULL; - const cfg_obj_t * secretobj = NULL; - dns_name_t keyname; + element = cfg_list_next(element)) + { + const cfg_obj_t *algobj = NULL; + const cfg_obj_t *secretobj = NULL; + dns_name_t keyname; const dns_name_t *alg; - const char * algstr; - char keynamedata[1024]; - isc_buffer_t keynamesrc, keynamebuf; - const char * secretstr; - isc_buffer_t secretbuf; + const char *algstr; + char keynamedata[1024]; + isc_buffer_t keynamesrc, keynamebuf; + const char *secretstr; + isc_buffer_t secretbuf; key = cfg_listelt_value(element); keyid = cfg_obj_asstring(cfg_map_getname(key)); @@ -131,13 +131,12 @@ failure: isc_result_t named_tsigkeyring_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig, - isc_mem_t *mctx, dns_tsig_keyring_t **ringp) -{ - const cfg_obj_t * maps[3]; - const cfg_obj_t * keylist; + isc_mem_t *mctx, dns_tsig_keyring_t **ringp) { + const cfg_obj_t *maps[3]; + const cfg_obj_t *keylist; dns_tsig_keyring_t *ring = NULL; - isc_result_t result; - int i; + isc_result_t result; + int i; REQUIRE(ringp != NULL && *ringp == NULL); diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c index 1885412748..5b0e7a5507 100644 --- a/bin/named/unix/dlz_dlopen_driver.c +++ b/bin/named/unix/dlz_dlopen_driver.c @@ -34,31 +34,31 @@ static dns_sdlzimplementation_t *dlz_dlopen = NULL; typedef struct dlopen_data { - isc_mem_t * mctx; - char * dl_path; - char * dlzname; - void * dl_handle; - void * dbdata; + isc_mem_t *mctx; + char *dl_path; + char *dlzname; + void *dl_handle; + void *dbdata; unsigned int flags; - isc_mutex_t lock; - int version; - bool in_configure; + isc_mutex_t lock; + int version; + bool in_configure; - dlz_dlopen_version_t * dlz_version; - dlz_dlopen_create_t * dlz_create; - dlz_dlopen_findzonedb_t * dlz_findzonedb; - dlz_dlopen_lookup_t * dlz_lookup; - dlz_dlopen_authority_t * dlz_authority; - dlz_dlopen_allnodes_t * dlz_allnodes; + dlz_dlopen_version_t *dlz_version; + dlz_dlopen_create_t *dlz_create; + dlz_dlopen_findzonedb_t *dlz_findzonedb; + dlz_dlopen_lookup_t *dlz_lookup; + dlz_dlopen_authority_t *dlz_authority; + dlz_dlopen_allnodes_t *dlz_allnodes; dlz_dlopen_allowzonexfr_t *dlz_allowzonexfr; - dlz_dlopen_newversion_t * dlz_newversion; + 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_destroy_t * dlz_destroy; + 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_destroy_t *dlz_destroy; } dlopen_data_t; /* Modules can choose whether they are lock-safe or not. */ @@ -80,8 +80,7 @@ typedef struct dlopen_data { * Log a message at the given level. */ static void -dlopen_log(int level, const char *fmt, ...) -{ +dlopen_log(int level, const char *fmt, ...) { va_list ap; va_start(ap, fmt); isc_log_vwrite(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DLZ, @@ -95,10 +94,9 @@ dlopen_log(int level, const char *fmt, ...) static isc_result_t dlopen_dlz_allnodes(const char *zone, void *driverarg, void *dbdata, - dns_sdlzallnodes_t *allnodes) -{ + dns_sdlzallnodes_t *allnodes) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -114,10 +112,9 @@ dlopen_dlz_allnodes(const char *zone, void *driverarg, void *dbdata, static isc_result_t dlopen_dlz_allowzonexfr(void *driverarg, void *dbdata, const char *name, - const char *client) -{ + const char *client) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -133,10 +130,9 @@ dlopen_dlz_allowzonexfr(void *driverarg, void *dbdata, const char *name, static isc_result_t dlopen_dlz_authority(const char *zone, void *driverarg, void *dbdata, - dns_sdlzlookup_t *lookup) -{ + dns_sdlzlookup_t *lookup) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -153,10 +149,9 @@ dlopen_dlz_authority(const char *zone, void *driverarg, void *dbdata, static isc_result_t dlopen_dlz_findzonedb(void *driverarg, void *dbdata, const char *name, dns_clientinfomethods_t *methods, - dns_clientinfo_t * clientinfo) -{ + dns_clientinfo_t *clientinfo) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -170,10 +165,9 @@ static isc_result_t dlopen_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_clientinfo_t *clientinfo) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -188,8 +182,7 @@ dlopen_dlz_lookup(const char *zone, const char *name, void *driverarg, * Load a symbol from the library */ static void * -dl_load_symbol(dlopen_data_t *cd, const char *symbol, bool mandatory) -{ +dl_load_symbol(dlopen_data_t *cd, const char *symbol, bool mandatory) { void *ptr = dlsym(cd->dl_handle, symbol); if (ptr == NULL && mandatory) { dlopen_log(ISC_LOG_ERROR, @@ -205,12 +198,11 @@ dl_load_symbol(dlopen_data_t *cd, const char *symbol, bool mandatory) */ static isc_result_t dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[], - void *driverarg, void **dbdata) -{ + void *driverarg, void **dbdata) { dlopen_data_t *cd; - isc_mem_t * mctx = NULL; - isc_result_t result = ISC_R_FAILURE; - int dlopen_flags = 0; + isc_mem_t *mctx = NULL; + isc_result_t result = ISC_R_FAILURE; + int dlopen_flags = 0; UNUSED(driverarg); @@ -264,15 +256,16 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[], /* Find the symbols */ cd->dlz_version = (dlz_dlopen_version_t *)dl_load_symbol(cd, "dlz_version", true); - cd->dlz_create = - (dlz_dlopen_create_t *)dl_load_symbol(cd, "dlz_create", true); - cd->dlz_lookup = - (dlz_dlopen_lookup_t *)dl_load_symbol(cd, "dlz_lookup", true); + cd->dlz_create = (dlz_dlopen_create_t *)dl_load_symbol(cd, "dlz_create", + true); + cd->dlz_lookup = (dlz_dlopen_lookup_t *)dl_load_symbol(cd, "dlz_lookup", + true); cd->dlz_findzonedb = (dlz_dlopen_findzonedb_t *)dl_load_symbol( cd, "dlz_findzonedb", true); if (cd->dlz_create == NULL || cd->dlz_version == NULL || - cd->dlz_lookup == NULL || cd->dlz_findzonedb == NULL) { + cd->dlz_lookup == NULL || cd->dlz_findzonedb == NULL) + { /* We're missing a required symbol */ result = ISC_R_FAILURE; goto failed; @@ -304,7 +297,8 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[], /* Check the version of the API is the same */ cd->version = cd->dlz_version(&cd->flags); if (cd->version < (DLZ_DLOPEN_VERSION - DLZ_DLOPEN_AGE) || - cd->version > DLZ_DLOPEN_VERSION) { + cd->version > DLZ_DLOPEN_VERSION) + { dlopen_log(ISC_LOG_ERROR, "dlz_dlopen: %s: incorrect driver API version %d, " "requires %d", @@ -359,10 +353,9 @@ failed: * Called when bind is shutting down */ static void -dlopen_dlz_destroy(void *driverarg, void *dbdata) -{ +dlopen_dlz_destroy(void *driverarg, void *dbdata) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_mem_t * mctx; + isc_mem_t *mctx; UNUSED(driverarg); @@ -397,10 +390,9 @@ dlopen_dlz_destroy(void *driverarg, void *dbdata) */ static isc_result_t dlopen_dlz_newversion(const char *zone, void *driverarg, void *dbdata, - void **versionp) -{ + void **versionp) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -419,8 +411,7 @@ dlopen_dlz_newversion(const char *zone, void *driverarg, void *dbdata, */ static void dlopen_dlz_closeversion(const char *zone, bool commit, void *driverarg, - void *dbdata, void **versionp) -{ + void *dbdata, void **versionp) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; UNUSED(driverarg); @@ -440,10 +431,9 @@ dlopen_dlz_closeversion(const char *zone, bool commit, void *driverarg, */ static isc_result_t dlopen_dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *driverarg, - void *dbdata) -{ + void *dbdata) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -466,10 +456,9 @@ dlopen_dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *driverarg, static bool dlopen_dlz_ssumatch(const char *signer, const char *name, const char *tcpaddr, const char *type, const char *key, uint32_t keydatalen, - unsigned char *keydata, void *driverarg, void *dbdata) -{ + unsigned char *keydata, void *driverarg, void *dbdata) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - bool ret; + bool ret; UNUSED(driverarg); @@ -490,10 +479,9 @@ dlopen_dlz_ssumatch(const char *signer, const char *name, const char *tcpaddr, */ static isc_result_t dlopen_dlz_addrdataset(const char *name, const char *rdatastr, void *driverarg, - void *dbdata, void *version) -{ + void *dbdata, void *version) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -513,10 +501,9 @@ dlopen_dlz_addrdataset(const char *name, const char *rdatastr, void *driverarg, */ static isc_result_t dlopen_dlz_subrdataset(const char *name, const char *rdatastr, void *driverarg, - void *dbdata, void *version) -{ + void *dbdata, void *version) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -536,10 +523,9 @@ dlopen_dlz_subrdataset(const char *name, const char *rdatastr, void *driverarg, */ static isc_result_t dlopen_dlz_delrdataset(const char *name, const char *type, void *driverarg, - void *dbdata, void *version) -{ + void *dbdata, void *version) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -567,8 +553,7 @@ static dns_sdlzmethods_t dlz_dlopen_methods = { * Register driver with BIND */ isc_result_t -dlz_dlopen_init(isc_mem_t *mctx) -{ +dlz_dlopen_init(isc_mem_t *mctx) { #ifndef ISC_DLZ_DLOPEN UNUSED(mctx); return (ISC_R_NOTIMPLEMENTED); @@ -598,8 +583,7 @@ dlz_dlopen_init(isc_mem_t *mctx) * Unregister the driver */ void -dlz_dlopen_clear(void) -{ +dlz_dlopen_clear(void) { #ifdef ISC_DLZ_DLOPEN dlopen_log(2, "Unregistering DLZ_dlopen driver"); if (dlz_dlopen != NULL) { diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c index 1fb842cadc..98098cf003 100644 --- a/bin/named/unix/os.c +++ b/bin/named/unix/os.c @@ -50,16 +50,16 @@ static char *pidfile = NULL; static char *lockfile = NULL; -static int devnullfd = -1; -static int singletonfd = -1; +static int devnullfd = -1; +static int singletonfd = -1; #ifndef ISC_FACILITY #define ISC_FACILITY LOG_DAEMON #endif /* ifndef ISC_FACILITY */ static struct passwd *runas_pw = NULL; -static bool done_setuid = false; -static int dfd[2] = { -1, -1 }; +static bool done_setuid = false; +static int dfd[2] = { -1, -1 }; #ifdef HAVE_SYS_CAPABILITY_H @@ -70,8 +70,7 @@ static bool non_root_caps = false; #include static void -linux_setcaps(cap_t caps) -{ +linux_setcaps(cap_t caps) { char strbuf[ISC_STRERRORSIZE]; if ((getuid() != 0 && !non_root_caps) || non_root) { @@ -133,13 +132,12 @@ linux_setcaps(cap_t caps) while (0) static void -linux_initialprivs(void) -{ - cap_t caps; - cap_t curcaps; +linux_initialprivs(void) { + cap_t caps; + cap_t curcaps; cap_value_t capval; - char strbuf[ISC_STRERRORSIZE]; - int err; + char strbuf[ISC_STRERRORSIZE]; + int err; /*% * We don't need most privileges, so we drop them right away. @@ -196,13 +194,12 @@ linux_initialprivs(void) } static void -linux_minprivs(void) -{ - cap_t caps; - cap_t curcaps; +linux_minprivs(void) { + cap_t caps; + cap_t curcaps; cap_value_t capval; - char strbuf[ISC_STRERRORSIZE]; - int err; + char strbuf[ISC_STRERRORSIZE]; + int err; INIT_CAP; /*% @@ -230,8 +227,7 @@ linux_minprivs(void) } static void -linux_keepcaps(void) -{ +linux_keepcaps(void) { char strbuf[ISC_STRERRORSIZE]; /*% * Ask the kernel to allow us to keep our capabilities after we @@ -254,8 +250,7 @@ linux_keepcaps(void) #endif /* HAVE_SYS_CAPABILITY_H */ static void -setup_syslog(const char *progname) -{ +setup_syslog(const char *progname) { int options; options = LOG_PID; @@ -266,8 +261,7 @@ setup_syslog(const char *progname) } void -named_os_init(const char *progname) -{ +named_os_init(const char *progname) { setup_syslog(progname); #ifdef HAVE_SYS_CAPABILITY_H linux_initialprivs(); @@ -278,10 +272,9 @@ named_os_init(const char *progname) } void -named_os_daemonize(void) -{ +named_os_daemonize(void) { pid_t pid; - char strbuf[ISC_STRERRORSIZE]; + char strbuf[ISC_STRERRORSIZE]; if (pipe(dfd) == -1) { strerror_r(errno, strbuf, sizeof(strbuf)); @@ -348,8 +341,7 @@ named_os_daemonize(void) } void -named_os_started(void) -{ +named_os_started(void) { char buf = 0; /* @@ -367,24 +359,22 @@ named_os_started(void) } void -named_os_opendevnull(void) -{ +named_os_opendevnull(void) { devnullfd = open("/dev/null", O_RDWR, 0); } void -named_os_closedevnull(void) -{ +named_os_closedevnull(void) { if (devnullfd != STDIN_FILENO && devnullfd != STDOUT_FILENO && - devnullfd != STDERR_FILENO) { + devnullfd != STDERR_FILENO) + { close(devnullfd); devnullfd = -1; } } static bool -all_digits(const char *s) -{ +all_digits(const char *s) { if (*s == '\0') { return (false); } @@ -398,8 +388,7 @@ all_digits(const char *s) } void -named_os_chroot(const char *root) -{ +named_os_chroot(const char *root) { char strbuf[ISC_STRERRORSIZE]; #ifdef HAVE_LIBSCF named_smf_chroot = 0; @@ -425,8 +414,7 @@ named_os_chroot(const char *root) } void -named_os_inituserinfo(const char *username) -{ +named_os_inituserinfo(const char *username) { char strbuf[ISC_STRERRORSIZE]; if (username == NULL) { return; @@ -452,8 +440,7 @@ named_os_inituserinfo(const char *username) } void -named_os_changeuser(void) -{ +named_os_changeuser(void) { char strbuf[ISC_STRERRORSIZE]; if (runas_pw == NULL || done_setuid) { return; @@ -487,8 +474,7 @@ named_os_changeuser(void) } uid_t -ns_os_uid(void) -{ +ns_os_uid(void) { if (runas_pw == NULL) { return (0); } @@ -496,10 +482,9 @@ ns_os_uid(void) } void -named_os_adjustnofile(void) -{ +named_os_adjustnofile(void) { #if defined(__linux__) - isc_result_t result; + isc_result_t result; isc_resourcevalue_t newvalue; /* @@ -516,8 +501,7 @@ named_os_adjustnofile(void) } void -named_os_minprivs(void) -{ +named_os_minprivs(void) { #if defined(HAVE_SYS_CAPABILITY_H) linux_keepcaps(); named_os_changeuser(); @@ -526,9 +510,8 @@ named_os_minprivs(void) } static int -safe_open(const char *filename, mode_t mode, bool append) -{ - int fd; +safe_open(const char *filename, mode_t mode, bool append) { + int fd; struct stat sb; if (stat(filename, &sb) == -1) { @@ -552,8 +535,7 @@ safe_open(const char *filename, mode_t mode, bool append) } static void -cleanup_pidfile(void) -{ +cleanup_pidfile(void) { int n; if (pidfile != NULL) { n = unlink(pidfile); @@ -566,8 +548,7 @@ cleanup_pidfile(void) } static void -cleanup_lockfile(void) -{ +cleanup_lockfile(void) { if (singletonfd != -1) { close(singletonfd); singletonfd = -1; @@ -590,10 +571,9 @@ cleanup_lockfile(void) * nulls. The caller should copy the filename to a fresh buffer first. */ static int -mkdirpath(char *filename, void (*report)(const char *, ...)) -{ - char * slash = strrchr(filename, '/'); - char strbuf[ISC_STRERRORSIZE]; +mkdirpath(char *filename, void (*report)(const char *, ...)) { + char *slash = strrchr(filename, '/'); + char strbuf[ISC_STRERRORSIZE]; unsigned int mode; if (slash != NULL && slash != filename) { @@ -614,7 +594,8 @@ mkdirpath(char *filename, void (*report)(const char *, ...)) * Handle "//", "/./" and "/../" in path. */ if (!strcmp(slash + 1, "") || !strcmp(slash + 1, ".") || - !strcmp(slash + 1, "..")) { + !strcmp(slash + 1, "..")) + { *slash = '/'; return (0); } @@ -629,7 +610,8 @@ mkdirpath(char *filename, void (*report)(const char *, ...)) } if (runas_pw != NULL && chown(filename, runas_pw->pw_uid, - runas_pw->pw_gid) == -1) { + runas_pw->pw_gid) == -1) + { strerror_r(errno, strbuf, sizeof(strbuf)); (*report)("couldn't chown '%s': %s", filename, strbuf); @@ -645,8 +627,7 @@ error: } static void -setperms(uid_t uid, gid_t gid) -{ +setperms(uid_t uid, gid_t gid) { #if defined(HAVE_SETEGID) || defined(HAVE_SETRESGID) char strbuf[ISC_STRERRORSIZE]; #endif /* if defined(HAVE_SETEGID) || defined(HAVE_SETRESGID) */ @@ -694,11 +675,10 @@ setperms(uid_t uid, gid_t gid) } FILE * -named_os_openfile(const char *filename, mode_t mode, bool switch_user) -{ - char strbuf[ISC_STRERRORSIZE], *f; +named_os_openfile(const char *filename, mode_t mode, bool switch_user) { + char strbuf[ISC_STRERRORSIZE], *f; FILE *fp; - int fd; + int fd; /* * Make the containing directory if it doesn't exist. @@ -764,11 +744,10 @@ named_os_openfile(const char *filename, mode_t mode, bool switch_user) } void -named_os_writepidfile(const char *filename, bool first_time) -{ +named_os_writepidfile(const char *filename, bool first_time) { FILE *fh; pid_t pid; - char strbuf[ISC_STRERRORSIZE]; + char strbuf[ISC_STRERRORSIZE]; void (*report)(const char *, ...); /* @@ -813,9 +792,8 @@ named_os_writepidfile(const char *filename, bool first_time) } bool -named_os_issingleton(const char *filename) -{ - char strbuf[ISC_STRERRORSIZE]; +named_os_issingleton(const char *filename) { + char strbuf[ISC_STRERRORSIZE]; struct flock lock; if (singletonfd != -1) { @@ -872,16 +850,14 @@ named_os_issingleton(const char *filename) } void -named_os_shutdown(void) -{ +named_os_shutdown(void) { closelog(); cleanup_pidfile(); cleanup_lockfile(); } isc_result_t -named_os_gethostname(char *buf, size_t len) -{ +named_os_gethostname(char *buf, size_t len) { int n; n = gethostname(buf, len); @@ -889,8 +865,7 @@ named_os_gethostname(char *buf, size_t len) } void -named_os_shutdownmsg(char *command, isc_buffer_t *text) -{ +named_os_shutdownmsg(char *command, isc_buffer_t *text) { char *last, *ptr; pid_t pid; @@ -913,19 +888,17 @@ named_os_shutdownmsg(char *command, isc_buffer_t *text) } void -named_os_tzset(void) -{ +named_os_tzset(void) { #ifdef HAVE_TZSET tzset(); #endif /* ifdef HAVE_TZSET */ } -static char unamebuf[BUFSIZ]; +static char unamebuf[BUFSIZ]; static char *unamep = NULL; static void -getuname(void) -{ +getuname(void) { #ifdef HAVE_UNAME struct utsname uts; @@ -944,8 +917,7 @@ getuname(void) } char * -named_os_uname(void) -{ +named_os_uname(void) { if (unamep == NULL) { getuname(); } diff --git a/bin/named/win32/dlz_dlopen_driver.c b/bin/named/win32/dlz_dlopen_driver.c index 4772d91ef1..1a9c85e14a 100644 --- a/bin/named/win32/dlz_dlopen_driver.c +++ b/bin/named/win32/dlz_dlopen_driver.c @@ -32,31 +32,31 @@ static dns_sdlzimplementation_t *dlz_dlopen = NULL; typedef struct dlopen_data { - isc_mem_t * mctx; - char * dl_path; - char * dlzname; - HMODULE dl_handle; - void * dbdata; + isc_mem_t *mctx; + char *dl_path; + char *dlzname; + HMODULE dl_handle; + void *dbdata; unsigned int flags; - isc_mutex_t lock; - int version; - bool in_configure; + isc_mutex_t lock; + int version; + bool in_configure; - dlz_dlopen_version_t * dlz_version; - dlz_dlopen_create_t * dlz_create; - dlz_dlopen_findzonedb_t * dlz_findzonedb; - dlz_dlopen_lookup_t * dlz_lookup; - dlz_dlopen_authority_t * dlz_authority; - dlz_dlopen_allnodes_t * dlz_allnodes; + dlz_dlopen_version_t *dlz_version; + dlz_dlopen_create_t *dlz_create; + dlz_dlopen_findzonedb_t *dlz_findzonedb; + dlz_dlopen_lookup_t *dlz_lookup; + dlz_dlopen_authority_t *dlz_authority; + dlz_dlopen_allnodes_t *dlz_allnodes; dlz_dlopen_allowzonexfr_t *dlz_allowzonexfr; - dlz_dlopen_newversion_t * dlz_newversion; + 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_destroy_t * dlz_destroy; + 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_destroy_t *dlz_destroy; } dlopen_data_t; /* Modules can choose whether they are lock-safe or not. */ @@ -78,8 +78,7 @@ typedef struct dlopen_data { * Log a message at the given level. */ static void -dlopen_log(int level, const char *fmt, ...) -{ +dlopen_log(int level, const char *fmt, ...) { va_list ap; va_start(ap, fmt); isc_log_vwrite(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DLZ, @@ -93,10 +92,9 @@ dlopen_log(int level, const char *fmt, ...) static isc_result_t dlopen_dlz_allnodes(const char *zone, void *driverarg, void *dbdata, - dns_sdlzallnodes_t *allnodes) -{ + dns_sdlzallnodes_t *allnodes) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -112,10 +110,9 @@ dlopen_dlz_allnodes(const char *zone, void *driverarg, void *dbdata, static isc_result_t dlopen_dlz_allowzonexfr(void *driverarg, void *dbdata, const char *name, - const char *client) -{ + const char *client) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -131,10 +128,9 @@ dlopen_dlz_allowzonexfr(void *driverarg, void *dbdata, const char *name, static isc_result_t dlopen_dlz_authority(const char *zone, void *driverarg, void *dbdata, - dns_sdlzlookup_t *lookup) -{ + dns_sdlzlookup_t *lookup) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -151,10 +147,9 @@ dlopen_dlz_authority(const char *zone, void *driverarg, void *dbdata, static isc_result_t dlopen_dlz_findzonedb(void *driverarg, void *dbdata, const char *name, dns_clientinfomethods_t *methods, - dns_clientinfo_t * clientinfo) -{ + dns_clientinfo_t *clientinfo) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -168,10 +163,9 @@ static isc_result_t dlopen_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_clientinfo_t *clientinfo) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -186,8 +180,7 @@ dlopen_dlz_lookup(const char *zone, const char *name, void *driverarg, * Load a symbol from the library */ static void * -dl_load_symbol(dlopen_data_t *cd, const char *symbol, bool mandatory) -{ +dl_load_symbol(dlopen_data_t *cd, const char *symbol, bool mandatory) { void *ptr = GetProcAddress(cd->dl_handle, symbol); if (ptr == NULL && mandatory) { dlopen_log(ISC_LOG_ERROR, @@ -203,12 +196,11 @@ dl_load_symbol(dlopen_data_t *cd, const char *symbol, bool mandatory) */ static isc_result_t dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[], - void *driverarg, void **dbdata) -{ + void *driverarg, void **dbdata) { dlopen_data_t *cd; - isc_mem_t * mctx = NULL; - isc_result_t result = ISC_R_FAILURE; - bool triedload = false; + isc_mem_t *mctx = NULL; + isc_result_t result = ISC_R_FAILURE; + bool triedload = false; UNUSED(driverarg); @@ -251,15 +243,16 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[], /* Find the symbols */ cd->dlz_version = (dlz_dlopen_version_t *)dl_load_symbol(cd, "dlz_version", true); - cd->dlz_create = - (dlz_dlopen_create_t *)dl_load_symbol(cd, "dlz_create", true); - cd->dlz_lookup = - (dlz_dlopen_lookup_t *)dl_load_symbol(cd, "dlz_lookup", true); + cd->dlz_create = (dlz_dlopen_create_t *)dl_load_symbol(cd, "dlz_create", + true); + cd->dlz_lookup = (dlz_dlopen_lookup_t *)dl_load_symbol(cd, "dlz_lookup", + true); cd->dlz_findzonedb = (dlz_dlopen_findzonedb_t *)dl_load_symbol( cd, "dlz_findzonedb", true); if (cd->dlz_create == NULL || cd->dlz_version == NULL || - cd->dlz_lookup == NULL || cd->dlz_findzonedb == NULL) { + cd->dlz_lookup == NULL || cd->dlz_findzonedb == NULL) + { /* We're missing a required symbol */ result = ISC_R_FAILURE; goto cleanup_lock; @@ -289,7 +282,8 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[], /* Check the version of the API is the same */ cd->version = cd->dlz_version(&cd->flags); if (cd->version < (DLZ_DLOPEN_VERSION - DLZ_DLOPEN_AGE) || - cd->version > DLZ_DLOPEN_VERSION) { + cd->version > DLZ_DLOPEN_VERSION) + { dlopen_log(ISC_LOG_ERROR, "dlz_dlopen: %s: incorrect driver API version %d, " "requires %d", @@ -344,10 +338,9 @@ failed: * Called when bind is shutting down */ static void -dlopen_dlz_destroy(void *driverarg, void *dbdata) -{ +dlopen_dlz_destroy(void *driverarg, void *dbdata) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_mem_t * mctx; + isc_mem_t *mctx; UNUSED(driverarg); @@ -380,10 +373,9 @@ dlopen_dlz_destroy(void *driverarg, void *dbdata) */ static isc_result_t dlopen_dlz_newversion(const char *zone, void *driverarg, void *dbdata, - void **versionp) -{ + void **versionp) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -402,8 +394,7 @@ dlopen_dlz_newversion(const char *zone, void *driverarg, void *dbdata, */ static void dlopen_dlz_closeversion(const char *zone, bool commit, void *driverarg, - void *dbdata, void **versionp) -{ + void *dbdata, void **versionp) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; UNUSED(driverarg); @@ -423,10 +414,9 @@ dlopen_dlz_closeversion(const char *zone, bool commit, void *driverarg, */ static isc_result_t dlopen_dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *driverarg, - void *dbdata) -{ + void *dbdata) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -449,10 +439,9 @@ dlopen_dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *driverarg, static bool dlopen_dlz_ssumatch(const char *signer, const char *name, const char *tcpaddr, const char *type, const char *key, uint32_t keydatalen, - unsigned char *keydata, void *driverarg, void *dbdata) -{ + unsigned char *keydata, void *driverarg, void *dbdata) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - bool ret; + bool ret; UNUSED(driverarg); @@ -473,10 +462,9 @@ dlopen_dlz_ssumatch(const char *signer, const char *name, const char *tcpaddr, */ static isc_result_t dlopen_dlz_addrdataset(const char *name, const char *rdatastr, void *driverarg, - void *dbdata, void *version) -{ + void *dbdata, void *version) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -496,10 +484,9 @@ dlopen_dlz_addrdataset(const char *name, const char *rdatastr, void *driverarg, */ static isc_result_t dlopen_dlz_subrdataset(const char *name, const char *rdatastr, void *driverarg, - void *dbdata, void *version) -{ + void *dbdata, void *version) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -519,10 +506,9 @@ dlopen_dlz_subrdataset(const char *name, const char *rdatastr, void *driverarg, */ static isc_result_t dlopen_dlz_delrdataset(const char *name, const char *type, void *driverarg, - void *dbdata, void *version) -{ + void *dbdata, void *version) { dlopen_data_t *cd = (dlopen_data_t *)dbdata; - isc_result_t result; + isc_result_t result; UNUSED(driverarg); @@ -550,8 +536,7 @@ static dns_sdlzmethods_t dlz_dlopen_methods = { * Register driver with BIND */ isc_result_t -dlz_dlopen_init(isc_mem_t *mctx) -{ +dlz_dlopen_init(isc_mem_t *mctx) { #ifndef ISC_DLZ_DLOPEN UNUSED(mctx); return (ISC_R_NOTIMPLEMENTED); @@ -581,8 +566,7 @@ dlz_dlopen_init(isc_mem_t *mctx) * Unregister the driver */ void -dlz_dlopen_clear(void) -{ +dlz_dlopen_clear(void) { #ifdef ISC_DLZ_DLOPEN dlopen_log(2, "Unregistering DLZ_dlopen driver"); if (dlz_dlopen != NULL) { diff --git a/bin/named/win32/ntservice.c b/bin/named/win32/ntservice.c index d2e427669b..58a723f7cf 100644 --- a/bin/named/win32/ntservice.c +++ b/bin/named/win32/ntservice.c @@ -24,23 +24,20 @@ /* Handle to SCM for updating service status */ static SERVICE_STATUS_HANDLE hServiceStatus = 0; -static BOOL foreground = FALSE; -static char ConsoleTitle[128]; +static BOOL foreground = FALSE; +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. */ void -ntservice_init(void) -{ +ntservice_init(void) { if (!foreground) { /* Register handler with the SCM */ hServiceStatus = RegisterServiceCtrlHandler( @@ -58,16 +55,14 @@ ntservice_init(void) } void -ntservice_shutdown(void) -{ +ntservice_shutdown(void) { UpdateSCM(SERVICE_STOPPED); } /* * Routine to check if this is a service or a foreground program */ BOOL -ntservice_isservice(void) -{ +ntservice_isservice(void) { return (!foreground); } /* @@ -75,8 +70,7 @@ ntservice_isservice(void) * to named. */ void -ServiceControl(DWORD dwCtrlCode) -{ +ServiceControl(DWORD dwCtrlCode) { /* Handle the requested control code */ switch (dwCtrlCode) { case SERVICE_CONTROL_INTERROGATE: @@ -98,10 +92,9 @@ ServiceControl(DWORD dwCtrlCode) * Tell the Service Control Manager the state of the service. */ void -UpdateSCM(DWORD state) -{ +UpdateSCM(DWORD state) { SERVICE_STATUS ss; - static DWORD dwState = SERVICE_STOPPED; + static DWORD dwState = SERVICE_STOPPED; if (hServiceStatus) { if (state) { @@ -135,14 +128,13 @@ UpdateSCM(DWORD state) * as we need to. */ int -main(int argc, char *argv[]) -{ +main(int argc, char *argv[]) { int rc, ch; /* Command line users should put -f in the options. */ isc_commandline_errprint = false; - while ((ch = isc_commandline_parse(argc, argv, NAMED_MAIN_ARGS)) != - -1) { + while ((ch = isc_commandline_parse(argc, argv, NAMED_MAIN_ARGS)) != -1) + { switch (ch) { case 'f': case 'g': diff --git a/bin/named/win32/os.c b/bin/named/win32/os.c index 83850883f0..36617530c4 100644 --- a/bin/named/win32/os.c +++ b/bin/named/win32/os.c @@ -37,8 +37,8 @@ static char *lockfile = NULL; static char *pidfile = NULL; -static int devnullfd = -1; -static int lockfilefd = -1; +static int devnullfd = -1; +static int lockfilefd = -1; static BOOL Initialized = FALSE; @@ -46,8 +46,7 @@ static char *version_error = "named requires Windows 2000 Service Pack 2 or " "later to run correctly"; void -named_paths_init(void) -{ +named_paths_init(void) { if (!Initialized) { isc_ntpaths_init(); } @@ -68,10 +67,10 @@ named_paths_init(void) * warn when it isn't. */ static void -version_check(const char *progname) -{ +version_check(const char *progname) { if ((isc_win32os_versioncheck(4, 0, 0, 0) >= 0) && - (isc_win32os_versioncheck(5, 0, 0, 0) < 0)) { + (isc_win32os_versioncheck(5, 0, 0, 0) < 0)) + { return; /* No problem with Version 4.0 */ } if (isc_win32os_versioncheck(5, 0, 2, 0) < 0) { @@ -84,8 +83,7 @@ version_check(const char *progname) } static void -setup_syslog(const char *progname) -{ +setup_syslog(const char *progname) { int options; options = LOG_PID; @@ -97,8 +95,7 @@ setup_syslog(const char *progname) } void -named_os_init(const char *progname) -{ +named_os_init(const char *progname) { named_paths_init(); setup_syslog(progname); /* @@ -125,8 +122,7 @@ named_os_init(const char *progname) } void -named_os_daemonize(void) -{ +named_os_daemonize(void) { /* * Try to set stdin, stdout, and stderr to /dev/null, but press * on even if it fails. @@ -148,59 +144,47 @@ named_os_daemonize(void) } void -named_os_opendevnull(void) -{ +named_os_opendevnull(void) { devnullfd = open("NUL", O_RDWR, 0); } void -named_os_closedevnull(void) -{ +named_os_closedevnull(void) { if (devnullfd != _fileno(stdin) && devnullfd != _fileno(stdout) && - devnullfd != _fileno(stderr)) { + devnullfd != _fileno(stderr)) + { close(devnullfd); devnullfd = -1; } } void -named_os_chroot(const char *root) -{ +named_os_chroot(const char *root) { if (root != NULL) { named_main_earlyfatal("chroot(): isn't supported by Win32 API"); } } void -named_os_inituserinfo(const char *username) -{ -} +named_os_inituserinfo(const char *username) {} void -named_os_changeuser(void) -{ -} +named_os_changeuser(void) {} unsigned int -ns_os_uid(void) -{ +ns_os_uid(void) { return (0); } void -named_os_adjustnofile(void) -{ -} +named_os_adjustnofile(void) {} void -named_os_minprivs(void) -{ -} +named_os_minprivs(void) {} static int -safe_open(const char *filename, int mode, bool append) -{ - int fd; +safe_open(const char *filename, int mode, bool append) { + int fd; struct stat sb; if (stat(filename, &sb) == -1) { @@ -221,8 +205,7 @@ safe_open(const char *filename, int mode, bool append) } static void -cleanup_pidfile(void) -{ +cleanup_pidfile(void) { if (pidfile != NULL) { (void)unlink(pidfile); free(pidfile); @@ -231,8 +214,7 @@ cleanup_pidfile(void) } static void -cleanup_lockfile(void) -{ +cleanup_lockfile(void) { if (lockfilefd != -1) { close(lockfilefd); lockfilefd = -1; @@ -250,11 +232,10 @@ cleanup_lockfile(void) } FILE * -named_os_openfile(const char *filename, int mode, bool switch_user) -{ - char strbuf[ISC_STRERRORSIZE]; +named_os_openfile(const char *filename, int mode, bool switch_user) { + char strbuf[ISC_STRERRORSIZE]; FILE *fp; - int fd; + int fd; UNUSED(switch_user); fd = safe_open(filename, mode, false); @@ -277,11 +258,10 @@ named_os_openfile(const char *filename, int mode, bool switch_user) } void -named_os_writepidfile(const char *filename, bool first_time) -{ +named_os_writepidfile(const char *filename, bool first_time) { FILE *pidlockfile; pid_t pid; - char strbuf[ISC_STRERRORSIZE]; + char strbuf[ISC_STRERRORSIZE]; void (*report)(const char *, ...); /* @@ -329,9 +309,8 @@ named_os_writepidfile(const char *filename, bool first_time) } bool -named_os_issingleton(const char *filename) -{ - char strbuf[ISC_STRERRORSIZE]; +named_os_issingleton(const char *filename) { + char strbuf[ISC_STRERRORSIZE]; OVERLAPPED o; if (lockfilefd != -1) { @@ -364,7 +343,8 @@ named_os_issingleton(const char *filename) /* Expect ERROR_LOCK_VIOLATION if already locked */ if (!LockFileEx((HANDLE)_get_osfhandle(lockfilefd), LOCKFILE_EXCLUSIVE_LOCK | LOCKFILE_FAIL_IMMEDIATELY, 0, - 0, 1, &o)) { + 0, 1, &o)) + { cleanup_lockfile(); return (false); } @@ -373,8 +353,7 @@ named_os_issingleton(const char *filename) } void -named_os_shutdown(void) -{ +named_os_shutdown(void) { closelog(); cleanup_pidfile(); @@ -388,8 +367,7 @@ named_os_shutdown(void) } isc_result_t -named_os_gethostname(char *buf, size_t len) -{ +named_os_gethostname(char *buf, size_t len) { int n; n = gethostname(buf, (int)len); @@ -397,38 +375,34 @@ named_os_gethostname(char *buf, size_t len) } void -named_os_shutdownmsg(char *command, isc_buffer_t *text) -{ +named_os_shutdownmsg(char *command, isc_buffer_t *text) { UNUSED(command); UNUSED(text); } void -named_os_tzset(void) -{ +named_os_tzset(void) { #ifdef HAVE_TZSET tzset(); #endif /* ifdef HAVE_TZSET */ } void -named_os_started(void) -{ +named_os_started(void) { ntservice_init(); } -static char unamebuf[BUFSIZ]; +static char unamebuf[BUFSIZ]; static char *unamep = NULL; static void -getuname(void) -{ - DWORD fvilen; - char * fvi; +getuname(void) { + DWORD fvilen; + char *fvi; VS_FIXEDFILEINFO *ffi; - UINT ffilen; - SYSTEM_INFO sysinfo; - char * arch; + UINT ffilen; + SYSTEM_INFO sysinfo; + char *arch; fvi = NULL; fvilen = GetFileVersionInfoSize("kernel32.dll", 0); @@ -446,7 +420,8 @@ getuname(void) ffi = NULL; ffilen = 0; if ((VerQueryValue(fvi, "\\", &ffi, &ffilen) == 0) || (ffi == NULL) || - (ffilen == 0)) { + (ffilen == 0)) + { goto err; } memset(&sysinfo, 0, sizeof(sysinfo)); @@ -488,8 +463,7 @@ err: * so we had to switch to the recommended way to get the Windows version. */ char * -named_os_uname(void) -{ +named_os_uname(void) { if (unamep == NULL) { getuname(); } diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index d9a29c6de5..30ec0c430f 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -81,15 +81,14 @@ configure_zone_acl(const cfg_obj_t *zconfig, const cfg_obj_t *vconfig, const cfg_obj_t *config, acl_type_t acltype, cfg_aclconfctx_t *actx, dns_zone_t *zone, void (*setzacl)(dns_zone_t *, dns_acl_t *), - void (*clearzacl)(dns_zone_t *)) -{ - isc_result_t result; + void (*clearzacl)(dns_zone_t *)) { + isc_result_t result; const cfg_obj_t *maps[5] = { NULL, NULL, NULL, NULL, NULL }; const cfg_obj_t *aclobj = NULL; - int i = 0; - dns_acl_t ** aclp = NULL, *acl = NULL; - const char * aclname; - dns_view_t * view; + int i = 0; + dns_acl_t **aclp = NULL, *acl = NULL; + const char *aclname; + dns_view_t *view; view = dns_zone_getview(zone); @@ -196,14 +195,13 @@ parse_acl: */ static isc_result_t configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone, - const char *zname) -{ - const cfg_obj_t * updatepolicy = NULL; + const char *zname) { + const cfg_obj_t *updatepolicy = NULL; const cfg_listelt_t *element, *element2; - dns_ssutable_t * table = NULL; - isc_mem_t * mctx = dns_zone_getmctx(zone); - bool autoddns = false; - isc_result_t result; + dns_ssutable_t *table = NULL; + isc_mem_t *mctx = dns_zone_getmctx(zone); + bool autoddns = false; + isc_result_t result; (void)cfg_map_get(zconfig, "update-policy", &updatepolicy); @@ -213,7 +211,8 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone, } if (cfg_obj_isstring(updatepolicy) && - strcmp("local", cfg_obj_asstring(updatepolicy)) == 0) { + strcmp("local", cfg_obj_asstring(updatepolicy)) == 0) + { autoddns = true; updatepolicy = NULL; } @@ -224,21 +223,22 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone, } for (element = cfg_list_first(updatepolicy); element != NULL; - element = cfg_list_next(element)) { - const cfg_obj_t * stmt = cfg_listelt_value(element); - const cfg_obj_t * mode = cfg_tuple_get(stmt, "mode"); - const cfg_obj_t * identity = cfg_tuple_get(stmt, "identity"); - const cfg_obj_t * matchtype = cfg_tuple_get(stmt, "matchtype"); - const cfg_obj_t * dname = cfg_tuple_get(stmt, "name"); - const cfg_obj_t * typelist = cfg_tuple_get(stmt, "types"); - const char * str; - bool grant = false; - bool usezone = false; + element = cfg_list_next(element)) + { + const cfg_obj_t *stmt = cfg_listelt_value(element); + const cfg_obj_t *mode = cfg_tuple_get(stmt, "mode"); + const cfg_obj_t *identity = cfg_tuple_get(stmt, "identity"); + const cfg_obj_t *matchtype = cfg_tuple_get(stmt, "matchtype"); + const cfg_obj_t *dname = cfg_tuple_get(stmt, "name"); + const cfg_obj_t *typelist = cfg_tuple_get(stmt, "types"); + const char *str; + bool grant = false; + bool usezone = false; dns_ssumatchtype_t mtype = dns_ssumatchtype_name; - dns_fixedname_t fname, fident; - isc_buffer_t b; - dns_rdatatype_t * types; - unsigned int i, n; + dns_fixedname_t fname, fident; + isc_buffer_t b; + dns_rdatatype_t *types; + unsigned int i, n; str = cfg_obj_asstring(mode); if (strcasecmp(str, "grant") == 0) { @@ -295,7 +295,8 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone, i = 0; for (element2 = cfg_list_first(typelist); element2 != NULL; - element2 = cfg_list_next(element2)) { + element2 = cfg_list_next(element2)) + { const cfg_obj_t *typeobj; isc_textregion_t r; @@ -384,20 +385,20 @@ static isc_result_t configure_staticstub_serveraddrs(const cfg_obj_t *zconfig, dns_zone_t *zone, dns_rdatalist_t *rdatalist_ns, dns_rdatalist_t *rdatalist_a, - dns_rdatalist_t *rdatalist_aaaa) -{ + dns_rdatalist_t *rdatalist_aaaa) { const cfg_listelt_t *element; - isc_mem_t * mctx = dns_zone_getmctx(zone); - isc_region_t region, sregion; - dns_rdata_t * rdata; - isc_result_t result = ISC_R_SUCCESS; + isc_mem_t *mctx = dns_zone_getmctx(zone); + isc_region_t region, sregion; + dns_rdata_t *rdata; + isc_result_t result = ISC_R_SUCCESS; for (element = cfg_list_first(zconfig); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const isc_sockaddr_t *sa; - isc_netaddr_t na; - const cfg_obj_t * address = cfg_listelt_value(element); - dns_rdatalist_t * rdatalist; + isc_netaddr_t na; + const cfg_obj_t *address = cfg_listelt_value(element); + dns_rdatalist_t *rdatalist; sa = cfg_obj_assockaddr(address); if (isc_sockaddr_getport(sa) != 0) { @@ -467,21 +468,22 @@ configure_staticstub_serveraddrs(const cfg_obj_t *zconfig, dns_zone_t *zone, */ static isc_result_t configure_staticstub_servernames(const cfg_obj_t *zconfig, dns_zone_t *zone, - dns_rdatalist_t *rdatalist, const char *zname) -{ + dns_rdatalist_t *rdatalist, + const char *zname) { const cfg_listelt_t *element; - isc_mem_t * mctx = dns_zone_getmctx(zone); - dns_rdata_t * rdata; - isc_region_t sregion, region; - isc_result_t result = ISC_R_SUCCESS; + isc_mem_t *mctx = dns_zone_getmctx(zone); + dns_rdata_t *rdata; + isc_region_t sregion, region; + isc_result_t result = ISC_R_SUCCESS; for (element = cfg_list_first(zconfig); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *obj; - const char * str; - dns_fixedname_t fixed_name; - dns_name_t * nsname; - isc_buffer_t b; + const char *str; + dns_fixedname_t fixed_name; + dns_name_t *nsname; + isc_buffer_t b; obj = cfg_listelt_value(element); str = cfg_obj_asstring(obj); @@ -525,22 +527,21 @@ configure_staticstub_servernames(const cfg_obj_t *zconfig, dns_zone_t *zone, */ static isc_result_t configure_staticstub(const cfg_obj_t *zconfig, dns_zone_t *zone, - const char *zname, const char *dbtype) -{ - int i = 0; + const char *zname, const char *dbtype) { + int i = 0; const cfg_obj_t *obj; - isc_mem_t * mctx = dns_zone_getmctx(zone); - dns_db_t * db = NULL; + isc_mem_t *mctx = dns_zone_getmctx(zone); + dns_db_t *db = NULL; dns_dbversion_t *dbversion = NULL; - dns_dbnode_t * apexnode = NULL; - dns_name_t apexname; - isc_result_t result; - dns_rdataset_t rdataset; - dns_rdatalist_t rdatalist_ns, rdatalist_a, rdatalist_aaaa; + dns_dbnode_t *apexnode = NULL; + dns_name_t apexname; + isc_result_t result; + dns_rdataset_t rdataset; + dns_rdatalist_t rdatalist_ns, rdatalist_a, rdatalist_aaaa; dns_rdatalist_t *rdatalists[] = { &rdatalist_ns, &rdatalist_a, &rdatalist_aaaa, NULL }; - dns_rdata_t * rdata; - isc_region_t region; + dns_rdata_t *rdata; + isc_region_t region; /* Create the DB beforehand */ RETERR(dns_db_create(mctx, dbtype, dns_zone_getorigin(zone), @@ -670,10 +671,9 @@ cleanup: * Convert a config file zone type into a server zone type. */ static inline dns_zonetype_t -zonetype_fromconfig(const cfg_obj_t *map) -{ +zonetype_fromconfig(const cfg_obj_t *map) { const cfg_obj_t *obj = NULL; - isc_result_t result; + isc_result_t result; result = cfg_map_get(map, "type", &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); @@ -685,8 +685,7 @@ zonetype_fromconfig(const cfg_obj_t *map) */ static isc_result_t strtoargvsub(isc_mem_t *mctx, char *s, unsigned int *argcp, char ***argvp, - unsigned int n) -{ + unsigned int n) { isc_result_t result; /* Discard leading whitespace. */ @@ -724,15 +723,14 @@ strtoargvsub(isc_mem_t *mctx, char *s, unsigned int *argcp, char ***argvp, * is modified in-place. */ static isc_result_t -strtoargv(isc_mem_t *mctx, char *s, unsigned int *argcp, char ***argvp) -{ +strtoargv(isc_mem_t *mctx, char *s, unsigned int *argcp, char ***argvp) { return (strtoargvsub(mctx, s, argcp, argvp, 0)); } static void -checknames(dns_zonetype_t ztype, const cfg_obj_t **maps, const cfg_obj_t **objp) -{ - const char * zone = NULL; +checknames(dns_zonetype_t ztype, const cfg_obj_t **maps, + const cfg_obj_t **objp) { + const char *zone = NULL; isc_result_t result; switch (ztype) { @@ -761,14 +759,13 @@ checknames(dns_zonetype_t ztype, const cfg_obj_t **maps, const cfg_obj_t **objp) */ static bool isself(dns_view_t *myview, dns_tsigkey_t *mykey, const isc_sockaddr_t *srcaddr, - const isc_sockaddr_t *dstaddr, dns_rdataclass_t rdclass, void *arg) -{ + const isc_sockaddr_t *dstaddr, dns_rdataclass_t rdclass, void *arg) { ns_interfacemgr_t *interfacemgr = (ns_interfacemgr_t *)arg; - dns_aclenv_t * env = ns_interfacemgr_getaclenv(interfacemgr); - dns_view_t * view; - dns_tsigkey_t * key = NULL; - isc_netaddr_t netsrc; - isc_netaddr_t netdst; + dns_aclenv_t *env = ns_interfacemgr_getaclenv(interfacemgr); + dns_view_t *view; + dns_tsigkey_t *key = NULL; + isc_netaddr_t netsrc; + isc_netaddr_t netdst; if (interfacemgr == NULL) { return (true); @@ -782,7 +779,8 @@ isself(dns_view_t *myview, dns_tsigkey_t *mykey, const isc_sockaddr_t *srcaddr, isc_netaddr_fromsockaddr(&netdst, dstaddr); for (view = ISC_LIST_HEAD(named_g_server->viewlist); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { const dns_name_t *tsig = NULL; if (view->matchrecursiveonly) { @@ -794,7 +792,7 @@ isself(dns_view_t *myview, dns_tsigkey_t *mykey, const isc_sockaddr_t *srcaddr, } if (mykey != NULL) { - bool match; + bool match; isc_result_t result; result = dns_view_gettsig(view, &mykey->name, &key); @@ -811,7 +809,8 @@ isself(dns_view_t *myview, dns_tsigkey_t *mykey, const isc_sockaddr_t *srcaddr, if (dns_acl_allowed(&netsrc, tsig, view->matchclients, env) && dns_acl_allowed(&netdst, tsig, view->matchdestinations, - env)) { + env)) + { break; } } @@ -825,8 +824,7 @@ isself(dns_view_t *myview, dns_tsigkey_t *mykey, const isc_sockaddr_t *srcaddr, */ static dns_notifytype_t process_notifytype(dns_notifytype_t ntype, dns_zonetype_t ztype, - const char *zname, const cfg_obj_t **maps) -{ + const char *zname, const cfg_obj_t **maps) { const cfg_obj_t *obj = NULL; /* @@ -855,49 +853,48 @@ isc_result_t named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, const cfg_obj_t *zconfig, cfg_aclconfctx_t *ac, dns_kasplist_t *kasplist, dns_zone_t *zone, - dns_zone_t *raw) -{ - isc_result_t result; - const char * zname; - dns_rdataclass_t zclass; - dns_rdataclass_t vclass; - const cfg_obj_t * maps[5]; - const cfg_obj_t * nodefault[4]; - const cfg_obj_t * zoptions = NULL; - const cfg_obj_t * options = NULL; - const cfg_obj_t * obj; - const char * filename = NULL; - const char * kaspname = NULL; - const char * dupcheck; - dns_notifytype_t notifytype = dns_notifytype_yes; - uint32_t count; - unsigned int dbargc; - char ** dbargv; - static char default_dbtype[] = "rbt"; - static char dlz_dbtype[] = "dlz"; - char * cpval = default_dbtype; - isc_mem_t * mctx = dns_zone_getmctx(zone); - dns_dialuptype_t dialup = dns_dialuptype_no; - dns_zonetype_t ztype; - int i; - int32_t journal_size; - bool multi; - bool alt; - dns_view_t * view = NULL; - dns_kasp_t * kasp = NULL; - bool check = false, fail = false; - bool warn = false, ignore = false; - bool ixfrdiff; - dns_masterformat_t masterformat; + dns_zone_t *raw) { + isc_result_t result; + const char *zname; + dns_rdataclass_t zclass; + dns_rdataclass_t vclass; + const cfg_obj_t *maps[5]; + const cfg_obj_t *nodefault[4]; + const cfg_obj_t *zoptions = NULL; + const cfg_obj_t *options = NULL; + const cfg_obj_t *obj; + const char *filename = NULL; + const char *kaspname = NULL; + const char *dupcheck; + dns_notifytype_t notifytype = dns_notifytype_yes; + uint32_t count; + unsigned int dbargc; + char **dbargv; + static char default_dbtype[] = "rbt"; + static char dlz_dbtype[] = "dlz"; + char *cpval = default_dbtype; + isc_mem_t *mctx = dns_zone_getmctx(zone); + dns_dialuptype_t dialup = dns_dialuptype_no; + dns_zonetype_t ztype; + int i; + int32_t journal_size; + bool multi; + bool alt; + dns_view_t *view = NULL; + dns_kasp_t *kasp = NULL; + bool check = false, fail = false; + bool warn = false, ignore = false; + bool ixfrdiff; + dns_masterformat_t masterformat; const dns_master_style_t *masterstyle = &dns_master_style_default; - isc_stats_t * zoneqrystats; - dns_stats_t * rcvquerystats; - dns_stats_t * dnssecsignstats; - dns_stats_t * dnssecrefreshstats; - dns_zonestat_level_t statlevel = dns_zonestat_none; - int seconds; - dns_zone_t * mayberaw = (raw != NULL) ? raw : zone; - isc_dscp_t dscp; + isc_stats_t *zoneqrystats; + dns_stats_t *rcvquerystats; + dns_stats_t *dnssecsignstats; + dns_stats_t *dnssecrefreshstats; + dns_zonestat_level_t statlevel = dns_zonestat_none; + int seconds; + dns_zone_t *mayberaw = (raw != NULL) ? raw : zone; + isc_dscp_t dscp; i = 0; if (zconfig != NULL) { @@ -961,7 +958,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, result = cfg_map_get(zoptions, "dlz", &obj); if (result == ISC_R_SUCCESS) { const char *dlzname = cfg_obj_asstring(obj); - size_t len; + size_t len; if (cpval != default_dbtype) { isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, @@ -1090,7 +1087,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, if (raw != NULL && filename != NULL) { #define SIGNED ".signed" size_t signedlen = strlen(filename) + sizeof(SIGNED); - char * signedname; + char *signedname; RETERR(dns_zone_setfile(raw, filename, masterformat, masterstyle)); @@ -1225,7 +1222,8 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, * acting as masters (type "slave"), but not to stubs. */ if (ztype != dns_zone_stub && ztype != dns_zone_staticstub && - ztype != dns_zone_redirect) { + ztype != dns_zone_redirect) + { obj = NULL; result = named_config_get(maps, "dnssec-policy", &obj); if (result == ISC_R_SUCCESS) { @@ -1265,8 +1263,8 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, ISC_UNREACHABLE(); } } - notifytype = - process_notifytype(notifytype, ztype, zname, nodefault); + notifytype = process_notifytype(notifytype, ztype, zname, + nodefault); if (raw != NULL) { dns_zone_setnotifytype(raw, dns_notifytype_no); } @@ -1278,7 +1276,8 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, (notifytype == dns_notifytype_yes || notifytype == dns_notifytype_explicit || (notifytype == dns_notifytype_masteronly && - ztype == dns_zone_master))) { + ztype == dns_zone_master))) + { dns_ipkeylist_t ipkl; dns_ipkeylist_init(&ipkl); @@ -1379,12 +1378,14 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, ixfrdiff = cfg_obj_asboolean(obj); } else if ((strcasecmp(cfg_obj_asstring(obj), "primary") == 0 || strcasecmp(cfg_obj_asstring(obj), "master") == 0) && - ztype == dns_zone_master) { + ztype == dns_zone_master) + { ixfrdiff = true; } else if ((strcasecmp(cfg_obj_asstring(obj), "secondary") == 0 || strcasecmp(cfg_obj_asstring(obj), "slave") == 0) && - ztype == dns_zone_slave) { + ztype == dns_zone_slave) + { ixfrdiff = true; } else { ixfrdiff = false; @@ -1525,8 +1526,8 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, if (ztype == dns_zone_master || raw != NULL) { const cfg_obj_t *validity, *resign; - bool allow = false, maint = false; - bool sigvalinsecs; + bool allow = false, maint = false; + bool sigvalinsecs; if (kasp) { seconds = (uint32_t)dns_kasp_sigvalidity_dnskey(kasp); @@ -1725,8 +1726,8 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, */ obj = NULL; if (masterformat != dns_masterformat_map) { - result = - named_config_get(maps, "check-integrity", &obj); + result = named_config_get(maps, "check-integrity", + &obj); INSIST(result == ISC_R_SUCCESS && obj != NULL); dns_zone_setoption(mayberaw, DNS_ZONEOPT_CHECKINTEGRITY, cfg_obj_asboolean(obj)); @@ -1841,7 +1842,8 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, * explicitly specified and this is a root zone mirror. */ if (obj == NULL && ztype == dns_zone_mirror && - dns_name_equal(dns_zone_getorigin(zone), dns_rootname)) { + dns_name_equal(dns_zone_getorigin(zone), dns_rootname)) + { result = named_config_getmastersdef( named_g_config, DEFAULT_IANA_ROOT_ZONE_MASTERS, &obj); @@ -1958,8 +1960,8 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, * on for BIND 8 compatibility. */ view = dns_zone_getview(zone); - if (view != NULL && - strcmp(view->name, "_default") == 0) { + if (view != NULL && strcmp(view->name, "_default") == 0) + { alt = true; } else { alt = false; @@ -1992,10 +1994,9 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig, */ isc_result_t named_zone_configure_writeable_dlz(dns_dlzdb_t *dlzdatabase, dns_zone_t *zone, - dns_rdataclass_t rdclass, dns_name_t *name) -{ - dns_db_t * db = NULL; - isc_time_t now; + dns_rdataclass_t rdclass, dns_name_t *name) { + dns_db_t *db = NULL; + isc_time_t now; isc_result_t result; TIME_NOW(&now); @@ -2011,15 +2012,14 @@ named_zone_configure_writeable_dlz(dns_dlzdb_t *dlzdatabase, dns_zone_t *zone, } bool -named_zone_reusable(dns_zone_t *zone, const cfg_obj_t *zconfig) -{ +named_zone_reusable(dns_zone_t *zone, const cfg_obj_t *zconfig) { const cfg_obj_t *zoptions = NULL; const cfg_obj_t *obj = NULL; - const char * cfilename; - const char * zfilename; - dns_zone_t * raw = NULL; - bool has_raw; - dns_zonetype_t ztype; + const char *cfilename; + const char *zfilename; + dns_zone_t *raw = NULL; + bool has_raw; + dns_zonetype_t ztype; zoptions = cfg_tuple_get(zconfig, "options"); @@ -2073,7 +2073,8 @@ named_zone_reusable(dns_zone_t *zone, const cfg_obj_t *zconfig) } if (!((cfilename == NULL && zfilename == NULL) || (cfilename != NULL && zfilename != NULL && - strcmp(cfilename, zfilename) == 0))) { + strcmp(cfilename, zfilename) == 0))) + { dns_zone_log(zone, ISC_LOG_DEBUG(1), "not reusable: filename mismatch"); return (false); diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index 6e424d26a6..6a2b9d6ce2 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -96,13 +96,13 @@ #endif /* if defined(HAVE_EDIT_READLINE_READLINE_H) */ #endif /* if defined(HAVE_READLINE) */ -#define MAXCMD (128 * 1024) -#define MAXWIRE (64 * 1024) -#define PACKETSIZE ((64 * 1024) - 1) -#define INITTEXT (2 * 1024) -#define MAXTEXT (128 * 1024) +#define MAXCMD (128 * 1024) +#define MAXWIRE (64 * 1024) +#define PACKETSIZE ((64 * 1024) - 1) +#define INITTEXT (2 * 1024) +#define MAXTEXT (128 * 1024) #define FIND_TIMEOUT 5 -#define TTL_MAX 2147483647U /* Maximum signed 32 bit integer. */ +#define TTL_MAX 2147483647U /* Maximum signed 32 bit integer. */ #define DNSDEFAULTPORT 53 @@ -115,122 +115,111 @@ static uint16_t dnsport = DNSDEFAULTPORT; #define RESOLV_CONF "/etc/resolv.conf" #endif /* ifndef RESOLV_CONF */ -static bool debugging = false, ddebugging = false; -static bool memdebugging = false; -static bool have_ipv4 = false; -static bool have_ipv6 = false; -static bool is_dst_up = false; -static bool usevc = false; -static bool usegsstsig = false; -static bool use_win2k_gsstsig = false; -static bool tried_other_gsstsig = false; -static bool local_only = false; -static isc_taskmgr_t * taskmgr = NULL; -static isc_task_t * global_task = NULL; -static isc_event_t * global_event = NULL; -static isc_log_t * glctx = NULL; -static isc_mem_t * gmctx = NULL; -static dns_dispatchmgr_t * dispatchmgr = NULL; -static dns_requestmgr_t * requestmgr = NULL; -static isc_socketmgr_t * socketmgr = NULL; -static isc_timermgr_t * timermgr = NULL; -static dns_dispatch_t * dispatchv4 = NULL; -static dns_dispatch_t * dispatchv6 = NULL; -static dns_message_t * updatemsg = NULL; -static dns_fixedname_t fuserzone; -static dns_fixedname_t fzname; -static dns_name_t * userzone = NULL; -static dns_name_t * zname = NULL; -static dns_name_t tmpzonename = DNS_NAME_INITEMPTY; -static dns_name_t restart_master = DNS_NAME_INITEMPTY; -static dns_tsig_keyring_t * gssring = NULL; -static dns_tsigkey_t * tsigkey = NULL; -static dst_key_t * sig0key = NULL; -static isc_sockaddr_t * servers = NULL; -static isc_sockaddr_t * master_servers = NULL; -static bool default_servers = true; -static int ns_inuse = 0; -static int master_inuse = 0; -static int ns_total = 0; -static int ns_alloc = 0; -static int master_total = 0; -static int master_alloc = 0; -static isc_sockaddr_t * localaddr4 = NULL; -static isc_sockaddr_t * localaddr6 = NULL; -static const char * keyfile = NULL; -static char * keystr = NULL; -static bool shuttingdown = false; -static FILE * input; -static bool interactive = true; -static bool seenerror = false; +static bool debugging = false, ddebugging = false; +static bool memdebugging = false; +static bool have_ipv4 = false; +static bool have_ipv6 = false; +static bool is_dst_up = false; +static bool usevc = false; +static bool usegsstsig = false; +static bool use_win2k_gsstsig = false; +static bool tried_other_gsstsig = false; +static bool local_only = false; +static isc_taskmgr_t *taskmgr = NULL; +static isc_task_t *global_task = NULL; +static isc_event_t *global_event = NULL; +static isc_log_t *glctx = NULL; +static isc_mem_t *gmctx = NULL; +static dns_dispatchmgr_t *dispatchmgr = NULL; +static dns_requestmgr_t *requestmgr = NULL; +static isc_socketmgr_t *socketmgr = NULL; +static isc_timermgr_t *timermgr = NULL; +static dns_dispatch_t *dispatchv4 = NULL; +static dns_dispatch_t *dispatchv6 = NULL; +static dns_message_t *updatemsg = NULL; +static dns_fixedname_t fuserzone; +static dns_fixedname_t fzname; +static dns_name_t *userzone = NULL; +static dns_name_t *zname = NULL; +static dns_name_t tmpzonename = DNS_NAME_INITEMPTY; +static dns_name_t restart_master = DNS_NAME_INITEMPTY; +static dns_tsig_keyring_t *gssring = NULL; +static dns_tsigkey_t *tsigkey = NULL; +static dst_key_t *sig0key = NULL; +static isc_sockaddr_t *servers = NULL; +static isc_sockaddr_t *master_servers = NULL; +static bool default_servers = true; +static int ns_inuse = 0; +static int master_inuse = 0; +static int ns_total = 0; +static int ns_alloc = 0; +static int master_total = 0; +static int master_alloc = 0; +static isc_sockaddr_t *localaddr4 = NULL; +static isc_sockaddr_t *localaddr6 = NULL; +static const char *keyfile = NULL; +static char *keystr = NULL; +static bool shuttingdown = false; +static FILE *input; +static bool interactive = true; +static bool seenerror = false; static const dns_master_style_t *style; -static int requests = 0; -static unsigned int logdebuglevel = 0; -static unsigned int timeout = 300; -static unsigned int udp_timeout = 3; -static unsigned int udp_retries = 3; -static dns_rdataclass_t defaultclass = dns_rdataclass_in; -static dns_rdataclass_t zoneclass = dns_rdataclass_none; -static dns_message_t * answer = NULL; -static uint32_t default_ttl = 0; -static bool default_ttl_set = false; -static bool checknames = true; +static int requests = 0; +static unsigned int logdebuglevel = 0; +static unsigned int timeout = 300; +static unsigned int udp_timeout = 3; +static unsigned int udp_retries = 3; +static dns_rdataclass_t defaultclass = dns_rdataclass_in; +static dns_rdataclass_t zoneclass = dns_rdataclass_none; +static dns_message_t *answer = NULL; +static uint32_t default_ttl = 0; +static bool default_ttl_set = false; +static bool checknames = true; typedef struct nsu_requestinfo { - dns_message_t * msg; + dns_message_t *msg; 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; static isc_sockaddr_t *kserver = NULL; -static char * realm = NULL; -static char servicename[DNS_NAME_FORMATSIZE]; -static dns_name_t * keyname; +static char *realm = NULL; +static char servicename[DNS_NAME_FORMATSIZE]; +static dns_name_t *keyname; typedef struct nsu_gssinfo { - dns_message_t * msg; + dns_message_t *msg; isc_sockaddr_t *addr; - gss_ctx_id_t context; + 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 -#define STATUS_QUIT (uint16_t)2 +#define STATUS_MORE (uint16_t)0 +#define STATUS_SEND (uint16_t)1 +#define STATUS_QUIT (uint16_t)2 #define STATUS_SYNTAX (uint16_t)3 static void -master_from_servers(void) -{ +master_from_servers(void) { if (master_servers != NULL && master_servers != servers) { isc_mem_put(gmctx, master_servers, master_alloc * sizeof(isc_sockaddr_t)); @@ -242,8 +231,7 @@ master_from_servers(void) } static dns_rdataclass_t -getzoneclass(void) -{ +getzoneclass(void) { if (zoneclass == dns_rdataclass_none) { zoneclass = defaultclass; } @@ -251,10 +239,9 @@ getzoneclass(void) } static bool -setzoneclass(dns_rdataclass_t rdclass) -{ - if (zoneclass == dns_rdataclass_none || - rdclass == dns_rdataclass_none) { +setzoneclass(dns_rdataclass_t rdclass) { + if (zoneclass == dns_rdataclass_none || rdclass == dns_rdataclass_none) + { zoneclass = rdclass; } if (zoneclass != rdclass) { @@ -264,8 +251,7 @@ setzoneclass(dns_rdataclass_t rdclass) } static void -fatal(const char *format, ...) -{ +fatal(const char *format, ...) { va_list args; va_start(args, format); @@ -276,8 +262,7 @@ fatal(const char *format, ...) } static void -error(const char *format, ...) -{ +error(const char *format, ...) { va_list args; va_start(args, format); @@ -287,8 +272,7 @@ error(const char *format, ...) } static void -debug(const char *format, ...) -{ +debug(const char *format, ...) { va_list args; if (debugging) { @@ -300,8 +284,7 @@ debug(const char *format, ...) } static void -ddebug(const char *format, ...) -{ +ddebug(const char *format, ...) { va_list args; if (ddebugging) { @@ -313,21 +296,19 @@ ddebug(const char *format, ...) } static inline void -check_result(isc_result_t result, const char *msg) -{ +check_result(isc_result_t result, const char *msg) { if (result != ISC_R_SUCCESS) { fatal("%s: %s", msg, isc_result_totext(result)); } } static char * -nsu_strsep(char **stringp, const char *delim) -{ +nsu_strsep(char **stringp, const char *delim) { char *string = *stringp; *stringp = NULL; - char * s; + char *s; const char *d; - char sc, dc; + char sc, dc; if (string == NULL) { return (NULL); @@ -359,8 +340,7 @@ nsu_strsep(char **stringp, const char *delim) } static void -reset_system(void) -{ +reset_system(void) { isc_result_t result; ddebug("reset_system()"); @@ -386,11 +366,10 @@ reset_system(void) static bool parse_hmac(const dns_name_t **hmac, const char *hmacstr, size_t len, - uint16_t *digestbitsp) -{ - uint16_t digestbits = 0; + uint16_t *digestbitsp) { + uint16_t digestbits = 0; isc_result_t result; - char buf[20]; + char buf[20]; REQUIRE(hmac != NULL && *hmac == NULL); REQUIRE(hmacstr != NULL); @@ -471,8 +450,7 @@ parse_hmac(const dns_name_t **hmac, const char *hmacstr, size_t len, } static int -basenamelen(const char *file) -{ +basenamelen(const char *file) { int len = strlen(file); if (len > 1 && file[len - 1] == '.') { @@ -486,20 +464,19 @@ basenamelen(const char *file) } static void -setup_keystr(void) -{ - unsigned char * secret = NULL; - int secretlen; - isc_buffer_t secretbuf; - isc_result_t result; - isc_buffer_t keynamesrc; - char * secretstr; - char * s, *n; - dns_fixedname_t fkeyname; - dns_name_t * mykeyname; - char * name; +setup_keystr(void) { + unsigned char *secret = NULL; + int secretlen; + isc_buffer_t secretbuf; + isc_result_t result; + isc_buffer_t keynamesrc; + char *secretstr; + char *s, *n; + dns_fixedname_t fkeyname; + dns_name_t *mykeyname; + char *name; const dns_name_t *hmacname = NULL; - uint16_t digestbits = 0; + uint16_t digestbits = 0; mykeyname = dns_fixedname_initname(&fkeyname); @@ -566,18 +543,17 @@ failure: * Get a key from a named.conf format keyfile */ static isc_result_t -read_sessionkey(isc_mem_t *mctx, isc_log_t *lctx) -{ - cfg_parser_t * pctx = NULL; - cfg_obj_t * sessionkey = NULL; +read_sessionkey(isc_mem_t *mctx, isc_log_t *lctx) { + cfg_parser_t *pctx = NULL; + cfg_obj_t *sessionkey = NULL; const cfg_obj_t *key = NULL; const cfg_obj_t *secretobj = NULL; const cfg_obj_t *algorithmobj = NULL; - const char * mykeyname; - const char * secretstr; - const char * algorithm; - isc_result_t result; - int len; + const char *mykeyname; + const char *secretstr; + const char *algorithm; + isc_result_t result; + int len; if (!isc_file_exists(keyfile)) { return (ISC_R_FILENOTFOUND); @@ -630,10 +606,9 @@ cleanup: } static void -setup_keyfile(isc_mem_t *mctx, isc_log_t *lctx) -{ - dst_key_t * dstkey = NULL; - isc_result_t result; +setup_keyfile(isc_mem_t *mctx, isc_log_t *lctx) { + dst_key_t *dstkey = NULL; + isc_result_t result; const dns_name_t *hmacname = NULL; debug("Creating key..."); @@ -700,8 +675,7 @@ setup_keyfile(isc_mem_t *mctx, isc_log_t *lctx) } static void -doshutdown(void) -{ +doshutdown(void) { isc_task_detach(&global_task); /* @@ -762,8 +736,7 @@ doshutdown(void) } static void -maybeshutdown(void) -{ +maybeshutdown(void) { ddebug("Shutting down request manager"); dns_requestmgr_shutdown(requestmgr); @@ -775,8 +748,7 @@ maybeshutdown(void) } static void -shutdown_program(isc_task_t *task, isc_event_t *event) -{ +shutdown_program(isc_task_t *task, isc_event_t *event) { REQUIRE(task == global_task); UNUSED(task); @@ -791,11 +763,10 @@ shutdown_program(isc_task_t *task, isc_event_t *event) * Try honoring the operating system's preferred ephemeral port range. */ static void -set_source_ports(dns_dispatchmgr_t *manager) -{ +set_source_ports(dns_dispatchmgr_t *manager) { isc_portset_t *v4portset = NULL, *v6portset = NULL; - in_port_t udpport_low, udpport_high; - isc_result_t result; + in_port_t udpport_low, udpport_high; + isc_result_t result; result = isc_portset_create(gmctx, &v4portset); check_result(result, "isc_portset_create (v4)"); @@ -817,14 +788,13 @@ set_source_ports(dns_dispatchmgr_t *manager) } static void -setup_system(void) -{ - isc_result_t result; - isc_sockaddr_t bind_any, bind_any6; - unsigned int attrs, attrmask; +setup_system(void) { + isc_result_t result; + isc_sockaddr_t bind_any, bind_any6; + unsigned int attrs, attrmask; isc_sockaddrlist_t *nslist; - isc_logconfig_t * logconfig = NULL; - irs_resconf_t * resconf = NULL; + isc_logconfig_t *logconfig = NULL; + irs_resconf_t *resconf = NULL; ddebug("setup_system()"); @@ -858,7 +828,7 @@ setup_system(void) ns_inuse = 0; if (local_only || ISC_LIST_EMPTY(*nslist)) { - struct in_addr in; + struct in_addr in; struct in6_addr in6; if (local_only && keyfile == NULL) { @@ -882,7 +852,7 @@ setup_system(void) } } else { isc_sockaddr_t *sa; - int i; + int i; /* * Count the nameservers (skipping any that we can't use @@ -1008,9 +978,9 @@ setup_system(void) } static int -get_addresses(char *host, in_port_t port, isc_sockaddr_t *sockaddr, int naddrs) -{ - int count = 0; +get_addresses(char *host, in_port_t port, isc_sockaddr_t *sockaddr, + int naddrs) { + int count = 0; isc_result_t result; isc_app_block(); @@ -1024,21 +994,19 @@ get_addresses(char *host, in_port_t port, isc_sockaddr_t *sockaddr, int naddrs) } static void -version(void) -{ +version(void) { fputs("nsupdate " VERSION "\n", stderr); } #define PARSE_ARGS_FMT "46dDML:y:ghilovk:p:Pr:R::t:Tu:V" static void -pre_parse_args(int argc, char **argv) -{ +pre_parse_args(int argc, char **argv) { dns_rdatatype_t t; - int ch; - char buf[100]; - bool doexit = false; - bool ipv4only = false, ipv6only = false; + int ch; + char buf[100]; + bool doexit = false; + bool ipv4only = false, ipv6only = false; while ((ch = isc_commandline_parse(argc, argv, PARSE_ARGS_FMT)) != -1) { switch (ch) { @@ -1120,12 +1088,11 @@ pre_parse_args(int argc, char **argv) } static void -parse_args(int argc, char **argv) -{ - int ch; - uint32_t i; +parse_args(int argc, char **argv) { + int ch; + uint32_t i; isc_result_t result; - bool force_interactive = false; + bool force_interactive = false; debug("parse_args"); while ((ch = isc_commandline_parse(argc, argv, PARSE_ARGS_FMT)) != -1) { @@ -1287,12 +1254,11 @@ parse_args(int argc, char **argv) } static uint16_t -parse_name(char **cmdlinep, dns_message_t *msg, dns_name_t **namep) -{ - isc_result_t result; - char * word; +parse_name(char **cmdlinep, dns_message_t *msg, dns_name_t **namep) { + isc_result_t result; + char *word; isc_buffer_t *namebuf = NULL; - isc_buffer_t source; + isc_buffer_t source; word = nsu_strsep(cmdlinep, " \t\r\n"); if (word == NULL || *word == 0) { @@ -1321,14 +1287,13 @@ parse_name(char **cmdlinep, dns_message_t *msg, dns_name_t **namep) static uint16_t parse_rdata(char **cmdlinep, dns_rdataclass_t rdataclass, - dns_rdatatype_t rdatatype, dns_message_t *msg, dns_rdata_t *rdata) -{ - char * cmdline = *cmdlinep; - isc_buffer_t source, *buf = NULL, *newbuf = NULL; - isc_region_t r; - isc_lex_t * lex = NULL; + dns_rdatatype_t rdatatype, dns_message_t *msg, dns_rdata_t *rdata) { + char *cmdline = *cmdlinep; + isc_buffer_t source, *buf = NULL, *newbuf = NULL; + isc_region_t r; + isc_lex_t *lex = NULL; dns_rdatacallbacks_t callbacks; - isc_result_t result; + isc_result_t result; if (cmdline == NULL) { rdata->flags = DNS_RDATA_UPDATE; @@ -1374,18 +1339,17 @@ parse_rdata(char **cmdlinep, dns_rdataclass_t rdataclass, } static uint16_t -make_prereq(char *cmdline, bool ispositive, bool isrrset) -{ - isc_result_t result; - char * word; - dns_name_t * name = NULL; +make_prereq(char *cmdline, bool ispositive, bool isrrset) { + isc_result_t result; + char *word; + dns_name_t *name = NULL; isc_textregion_t region; - dns_rdataset_t * rdataset = NULL; + dns_rdataset_t *rdataset = NULL; dns_rdatalist_t *rdatalist = NULL; dns_rdataclass_t rdataclass; - dns_rdatatype_t rdatatype; - dns_rdata_t * rdata = NULL; - uint16_t retval; + dns_rdatatype_t rdatatype; + dns_rdata_t *rdata = NULL; + uint16_t retval; ddebug("make_prereq()"); @@ -1487,10 +1451,9 @@ failure: } static uint16_t -evaluate_prereq(char *cmdline) -{ +evaluate_prereq(char *cmdline) { char *word; - bool ispositive, isrrset; + bool ispositive, isrrset; ddebug("evaluate_prereq()"); word = nsu_strsep(&cmdline, " \t\r\n"); @@ -1518,10 +1481,9 @@ evaluate_prereq(char *cmdline) } static uint16_t -evaluate_server(char *cmdline) -{ +evaluate_server(char *cmdline) { char *word, *server; - long port; + long port; if (local_only) { fprintf(stderr, "cannot reset server in localhost-only mode\n"); @@ -1576,11 +1538,10 @@ evaluate_server(char *cmdline) } static uint16_t -evaluate_local(char *cmdline) -{ - char * word, *local; - long port; - struct in_addr in4; +evaluate_local(char *cmdline) { + char *word, *local; + long port; + struct in_addr in4; struct in6_addr in6; word = nsu_strsep(&cmdline, " \t\r\n"); @@ -1627,20 +1588,19 @@ evaluate_local(char *cmdline) } static uint16_t -evaluate_key(char *cmdline) -{ - char * namestr; - char * secretstr; - isc_buffer_t b; - isc_result_t result; - dns_fixedname_t fkeyname; - dns_name_t * mykeyname; - int secretlen; - unsigned char * secret = NULL; - isc_buffer_t secretbuf; +evaluate_key(char *cmdline) { + char *namestr; + char *secretstr; + isc_buffer_t b; + isc_result_t result; + dns_fixedname_t fkeyname; + dns_name_t *mykeyname; + int secretlen; + unsigned char *secret = NULL; + isc_buffer_t secretbuf; const dns_name_t *hmacname = NULL; - uint16_t digestbits = 0; - char * n; + uint16_t digestbits = 0; + char *n; namestr = nsu_strsep(&cmdline, " \t\r\n"); if (namestr == NULL || *namestr == 0) { @@ -1702,9 +1662,8 @@ evaluate_key(char *cmdline) } static uint16_t -evaluate_zone(char *cmdline) -{ - char * word; +evaluate_zone(char *cmdline) { + char *word; isc_buffer_t b; isc_result_t result; @@ -1728,12 +1687,11 @@ evaluate_zone(char *cmdline) } static uint16_t -evaluate_realm(char *cmdline) -{ +evaluate_realm(char *cmdline) { #ifdef GSSAPI char *word; - char buf[1024]; - int n; + char buf[1024]; + int n; if (realm != NULL) { isc_mem_free(gmctx, realm); @@ -1759,11 +1717,10 @@ evaluate_realm(char *cmdline) } static uint16_t -evaluate_ttl(char *cmdline) -{ - char * word; +evaluate_ttl(char *cmdline) { + char *word; isc_result_t result; - uint32_t ttl; + uint32_t ttl; word = nsu_strsep(&cmdline, " \t\r\n"); if (word == NULL || *word == 0) { @@ -1794,11 +1751,10 @@ evaluate_ttl(char *cmdline) } static uint16_t -evaluate_class(char *cmdline) -{ - char * word; +evaluate_class(char *cmdline) { + char *word; isc_textregion_t r; - isc_result_t result; + isc_result_t result; dns_rdataclass_t rdclass; word = nsu_strsep(&cmdline, " \t\r\n"); @@ -1828,19 +1784,18 @@ evaluate_class(char *cmdline) } static uint16_t -update_addordelete(char *cmdline, bool isdelete) -{ - isc_result_t result; - dns_name_t * name = NULL; - uint32_t ttl; - char * word; +update_addordelete(char *cmdline, bool isdelete) { + isc_result_t result; + dns_name_t *name = NULL; + uint32_t ttl; + char *word; dns_rdataclass_t rdataclass; - dns_rdatatype_t rdatatype; - dns_rdata_t * rdata = NULL; + dns_rdatatype_t rdatatype; + dns_rdata_t *rdata = NULL; dns_rdatalist_t *rdatalist = NULL; - dns_rdataset_t * rdataset = NULL; + dns_rdataset_t *rdataset = NULL; isc_textregion_t region; - uint16_t retval; + uint16_t retval; ddebug("update_addordelete()"); @@ -1977,7 +1932,7 @@ parseclass: if (!isdelete && checknames) { dns_fixedname_t fixed; - dns_name_t * bad; + dns_name_t *bad; if (!dns_rdata_checkowner(name, rdata->rdclass, rdata->type, true)) { @@ -2026,10 +1981,9 @@ failure: } static uint16_t -evaluate_update(char *cmdline) -{ +evaluate_update(char *cmdline) { char *word; - bool isdelete; + bool isdelete; ddebug("evaluate_update()"); word = nsu_strsep(&cmdline, " \t\r\n"); @@ -2051,8 +2005,7 @@ evaluate_update(char *cmdline) } static uint16_t -evaluate_checknames(char *cmdline) -{ +evaluate_checknames(char *cmdline) { char *word; ddebug("evaluate_checknames()"); @@ -2062,11 +2015,13 @@ evaluate_checknames(char *cmdline) return (STATUS_SYNTAX); } if (strcasecmp(word, "yes") == 0 || strcasecmp(word, "true") == 0 || - strcasecmp(word, "on") == 0) { + strcasecmp(word, "on") == 0) + { checknames = true; } else if (strcasecmp(word, "no") == 0 || strcasecmp(word, "false") == 0 || - strcasecmp(word, "off") == 0) { + strcasecmp(word, "off") == 0) + { checknames = false; } else { fprintf(stderr, "incorrect check-names directive: %s\n", word); @@ -2076,10 +2031,9 @@ evaluate_checknames(char *cmdline) } static void -setzone(dns_name_t *zonename) -{ - isc_result_t result; - dns_name_t * name = NULL; +setzone(dns_name_t *zonename) { + isc_result_t result; + dns_name_t *name = NULL; dns_rdataset_t *rdataset = NULL; result = dns_message_firstname(updatemsg, DNS_SECTION_ZONE); @@ -2087,7 +2041,8 @@ setzone(dns_name_t *zonename) dns_message_currentname(updatemsg, DNS_SECTION_ZONE, &name); dns_message_removename(updatemsg, name, DNS_SECTION_ZONE); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_HEAD(name->list)) { + rdataset = ISC_LIST_HEAD(name->list)) + { ISC_LIST_UNLINK(name->list, rdataset, link); dns_rdataset_disassociate(rdataset); dns_message_puttemprdataset(updatemsg, &rdataset); @@ -2111,11 +2066,10 @@ setzone(dns_name_t *zonename) } static void -show_message(FILE *stream, dns_message_t *msg, const char *description) -{ - isc_result_t result; +show_message(FILE *stream, dns_message_t *msg, const char *description) { + isc_result_t result; isc_buffer_t *buf = NULL; - int bufsz; + int bufsz; ddebug("show_message()"); @@ -2147,8 +2101,7 @@ show_message(FILE *stream, dns_message_t *msg, const char *description) } static uint16_t -do_next_command(char *cmdline) -{ +do_next_command(char *cmdline) { char *word; ddebug("do_next_command()"); @@ -2233,9 +2186,9 @@ do_next_command(char *cmdline) if (strcasecmp(word, "realm") == 0) { return (evaluate_realm(cmdline)); } - if (strcasecmp(word, "check-names") == 0 || - strcasecmp(word, "checkname" - "s") == 0) { + if (strcasecmp(word, "check-names") == 0 || strcasecmp(word, "checkname" + "s") == 0) + { return (evaluate_checknames(cmdline)); } if (strcasecmp(word, "gsstsig") == 0) { @@ -2307,11 +2260,10 @@ do_next_command(char *cmdline) } static uint16_t -get_next_command(void) -{ +get_next_command(void) { uint16_t result = STATUS_QUIT; - char cmdlinebuf[MAXCMD]; - char * cmdline; + char cmdlinebuf[MAXCMD]; + char *cmdline; isc_app_block(); if (interactive) { @@ -2349,8 +2301,7 @@ get_next_command(void) } static bool -user_interaction(void) -{ +user_interaction(void) { uint16_t result = STATUS_MORE; ddebug("user_interaction()"); @@ -2367,18 +2318,16 @@ user_interaction(void) } static void -done_update(void) -{ +done_update(void) { isc_event_t *event = global_event; ddebug("done_update()"); isc_task_send(global_task, &event); } static void -check_tsig_error(dns_rdataset_t *rdataset, isc_buffer_t *b) -{ - isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; +check_tsig_error(dns_rdataset_t *rdataset, isc_buffer_t *b) { + isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_any_tsig_t tsig; result = dns_rdataset_first(rdataset); @@ -2403,8 +2352,7 @@ check_tsig_error(dns_rdataset_t *rdataset, isc_buffer_t *b) } static bool -next_master(const char *caller, isc_sockaddr_t *addr, isc_result_t eresult) -{ +next_master(const char *caller, isc_sockaddr_t *addr, isc_result_t eresult) { char addrbuf[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_format(addr, addrbuf, sizeof(addrbuf)); @@ -2418,11 +2366,10 @@ next_master(const char *caller, isc_sockaddr_t *addr, isc_result_t eresult) } static void -update_completed(isc_task_t *task, isc_event_t *event) -{ +update_completed(isc_task_t *task, isc_event_t *event) { dns_requestevent_t *reqev = NULL; - isc_result_t result; - dns_request_t * request; + isc_result_t result; + dns_request_t *request; UNUSED(task); @@ -2443,8 +2390,8 @@ update_completed(isc_task_t *task, isc_event_t *event) if (reqev->result != ISC_R_SUCCESS) { if (!next_master("update_completed", - &master_servers[master_inuse], - reqev->result)) { + &master_servers[master_inuse], reqev->result)) + { seenerror = true; goto done; } @@ -2493,8 +2440,8 @@ update_completed(isc_task_t *task, isc_event_t *event) if (answer->rcode != dns_rcode_noerror) { seenerror = true; if (!debugging) { - char buf[64]; - isc_buffer_t b; + char buf[64]; + isc_buffer_t b; dns_rdataset_t *rds; isc_buffer_init(&b, buf, sizeof(buf) - 1); @@ -2525,11 +2472,10 @@ done: } static void -send_update(dns_name_t *zone, isc_sockaddr_t *master) -{ - isc_result_t result; - dns_request_t * request = NULL; - unsigned int options = DNS_REQUESTOPT_CASE; +send_update(dns_name_t *zone, isc_sockaddr_t *master) { + isc_result_t result; + dns_request_t *request = NULL; + unsigned int options = DNS_REQUESTOPT_CASE; isc_sockaddr_t *srcaddr; ddebug("send_update()"); @@ -2575,8 +2521,7 @@ send_update(dns_name_t *zone, isc_sockaddr_t *master) } static void -next_server(const char *caller, isc_sockaddr_t *addr, isc_result_t eresult) -{ +next_server(const char *caller, isc_sockaddr_t *addr, isc_result_t eresult) { char addrbuf[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_format(addr, addrbuf, sizeof(addrbuf)); @@ -2590,26 +2535,25 @@ next_server(const char *caller, isc_sockaddr_t *addr, isc_result_t eresult) } static void -recvsoa(isc_task_t *task, isc_event_t *event) -{ +recvsoa(isc_task_t *task, isc_event_t *event) { dns_requestevent_t *reqev = NULL; - dns_request_t * request = NULL; - isc_result_t result, eresult; - dns_message_t * rcvmsg = NULL; - dns_section_t section; - dns_name_t * name = NULL; - dns_rdataset_t * soaset = NULL; - dns_rdata_soa_t soa; - dns_rdata_t soarr = DNS_RDATA_INIT; - int pass = 0; - dns_name_t master; - nsu_requestinfo_t * reqinfo; - dns_message_t * soaquery = NULL; - isc_sockaddr_t * addr; - isc_sockaddr_t * srcaddr; - bool seencname = false; - dns_name_t tname; - unsigned int nlabels; + dns_request_t *request = NULL; + isc_result_t result, eresult; + dns_message_t *rcvmsg = NULL; + dns_section_t section; + dns_name_t *name = NULL; + dns_rdataset_t *soaset = NULL; + dns_rdata_soa_t soa; + dns_rdata_t soarr = DNS_RDATA_INIT; + int pass = 0; + dns_name_t master; + nsu_requestinfo_t *reqinfo; + dns_message_t *soaquery = NULL; + isc_sockaddr_t *addr; + isc_sockaddr_t *srcaddr; + bool seencname = false; + dns_name_t tname; + unsigned int nlabels; UNUSED(task); @@ -2734,7 +2678,8 @@ lookforsoa: if (dns_message_findtype(name, dns_rdatatype_cname, 0, &tset) == ISC_R_SUCCESS || dns_message_findtype(name, dns_rdatatype_dname, 0, - &tset) == ISC_R_SUCCESS) { + &tset) == ISC_R_SUCCESS) + { seencname = true; break; } @@ -2787,9 +2732,9 @@ lookforsoa: } if (default_servers) { - char serverstr[DNS_NAME_MAXTEXT + 1]; + char serverstr[DNS_NAME_MAXTEXT + 1]; isc_buffer_t buf; - size_t size; + size_t size; isc_buffer_init(&buf, serverstr, sizeof(serverstr)); result = dns_name_totext(&master, true, &buf); @@ -2861,11 +2806,10 @@ droplabel: static void sendrequest(isc_sockaddr_t *destaddr, dns_message_t *msg, - dns_request_t **request) -{ - isc_result_t result; + dns_request_t **request) { + isc_result_t result; nsu_requestinfo_t *reqinfo; - isc_sockaddr_t * srcaddr; + isc_sockaddr_t *srcaddr; reqinfo = isc_mem_get(gmctx, sizeof(nsu_requestinfo_t)); reqinfo->msg = msg; @@ -2891,14 +2835,13 @@ sendrequest(isc_sockaddr_t *destaddr, dns_message_t *msg, * Get the realm from the users kerberos ticket if possible */ static void -get_ticket_realm(isc_mem_t *mctx) -{ - krb5_context ctx; +get_ticket_realm(isc_mem_t *mctx) { + krb5_context ctx; krb5_error_code rc; - krb5_ccache ccache; - krb5_principal princ; - char * name; - const char * ticket_realm; + krb5_ccache ccache; + krb5_principal princ; + char *name; + const char *ticket_realm; rc = krb5_init_context(&ctx); if (rc != 0) { @@ -2941,8 +2884,7 @@ get_ticket_realm(isc_mem_t *mctx) } static void -failed_gssrequest() -{ +failed_gssrequest() { seenerror = true; dns_name_free(&tmpzonename, gmctx); @@ -2954,19 +2896,18 @@ failed_gssrequest() } static void -start_gssrequest(dns_name_t *master) -{ - gss_ctx_id_t context; - isc_buffer_t buf; - isc_result_t result; - uint32_t val = 0; - dns_message_t * rmsg = NULL; - dns_request_t * request = NULL; - dns_name_t * servname; +start_gssrequest(dns_name_t *master) { + gss_ctx_id_t context; + isc_buffer_t buf; + isc_result_t result; + uint32_t val = 0; + dns_message_t *rmsg = NULL; + dns_request_t *request = NULL; + dns_name_t *servname; dns_fixedname_t fname; - char namestr[DNS_NAME_FORMATSIZE]; - char mykeystr[DNS_NAME_FORMATSIZE]; - char * err_message = NULL; + char namestr[DNS_NAME_FORMATSIZE]; + char mykeystr[DNS_NAME_FORMATSIZE]; + char *err_message = NULL; debug("start_gssrequest"); usevc = true; @@ -3010,8 +2951,8 @@ start_gssrequest(dns_name_t *master) isc_nonce_buf(&val, sizeof(val)); - result = - snprintf(mykeystr, sizeof(mykeystr), "%u.sig-%s", val, namestr); + result = snprintf(mykeystr, sizeof(mykeystr), "%u.sig-%s", val, + namestr); RUNTIME_CHECK(result <= sizeof(mykeystr)); isc_buffer_init(&buf, mykeystr, strlen(mykeystr)); @@ -3063,11 +3004,10 @@ failure: static void send_gssrequest(isc_sockaddr_t *destaddr, dns_message_t *msg, - dns_request_t **request, gss_ctx_id_t context) -{ - isc_result_t result; - nsu_gssinfo_t * reqinfo; - unsigned int options = 0; + dns_request_t **request, gss_ctx_id_t context) { + isc_result_t result; + nsu_gssinfo_t *reqinfo; + unsigned int options = 0; isc_sockaddr_t *srcaddr; debug("send_gssrequest"); @@ -3096,20 +3036,19 @@ send_gssrequest(isc_sockaddr_t *destaddr, dns_message_t *msg, } static void -recvgss(isc_task_t *task, isc_event_t *event) -{ +recvgss(isc_task_t *task, isc_event_t *event) { dns_requestevent_t *reqev = NULL; - dns_request_t * request = NULL; - isc_result_t result, eresult; - dns_message_t * rcvmsg = NULL; - nsu_gssinfo_t * reqinfo; - dns_message_t * tsigquery = NULL; - isc_sockaddr_t * addr; - gss_ctx_id_t context; - isc_buffer_t buf; - dns_name_t * servname; - dns_fixedname_t fname; - char * err_message = NULL; + dns_request_t *request = NULL; + isc_result_t result, eresult; + dns_message_t *rcvmsg = NULL; + nsu_gssinfo_t *reqinfo; + dns_message_t *tsigquery = NULL; + isc_sockaddr_t *addr; + gss_ctx_id_t context; + isc_buffer_t buf; + dns_name_t *servname; + dns_fixedname_t fname; + char *err_message = NULL; UNUSED(task); @@ -3254,15 +3193,14 @@ done: #endif /* ifdef GSSAPI */ static void -start_update(void) -{ - isc_result_t result; +start_update(void) { + isc_result_t result; dns_rdataset_t *rdataset = NULL; - dns_name_t * name = NULL; - dns_request_t * request = NULL; - dns_message_t * soaquery = NULL; - dns_name_t * firstname; - dns_section_t section = DNS_SECTION_UPDATE; + dns_name_t *name = NULL; + dns_request_t *request = NULL; + dns_message_t *soaquery = NULL; + dns_name_t *firstname; + dns_section_t section = DNS_SECTION_UPDATE; ddebug("start_update()"); @@ -3328,7 +3266,8 @@ start_update(void) tmprdataset = ISC_LIST_HEAD(firstname->list); if (section == DNS_SECTION_UPDATE && !dns_name_equal(firstname, dns_rootname) && - tmprdataset->type == dns_rdatatype_ds) { + tmprdataset->type == dns_rdatatype_ds) + { unsigned int labels = dns_name_countlabels(name); dns_name_getlabelsequence(name, 1, labels - 1, name); } @@ -3343,8 +3282,7 @@ start_update(void) } static void -cleanup(void) -{ +cleanup(void) { ddebug("cleanup()"); if (answer != NULL) { @@ -3403,8 +3341,7 @@ cleanup(void) } static void -getinput(isc_task_t *task, isc_event_t *event) -{ +getinput(isc_task_t *task, isc_event_t *event) { bool more; UNUSED(task); @@ -3429,8 +3366,7 @@ getinput(isc_task_t *task, isc_event_t *event) } int -main(int argc, char **argv) -{ +main(int argc, char **argv) { isc_result_t result; style = &dns_master_style_debug; diff --git a/bin/pkcs11/pkcs11-destroy.c b/bin/pkcs11/pkcs11-destroy.c index 3a0b52e8e0..57f0e96674 100644 --- a/bin/pkcs11/pkcs11-destroy.c +++ b/bin/pkcs11/pkcs11-destroy.c @@ -65,25 +65,24 @@ #endif /* ifdef WIN32 */ int -main(int argc, char *argv[]) -{ - isc_result_t result; - CK_RV rv; - CK_SLOT_ID slot = 0; +main(int argc, char *argv[]) { + isc_result_t result; + CK_RV rv; + CK_SLOT_ID slot = 0; CK_SESSION_HANDLE hSession; - CK_BYTE attr_id[2]; - CK_OBJECT_HANDLE akey[50]; - pk11_context_t pctx; - char * lib_name = NULL; - char * label = NULL; - char * pin = NULL; - int error = 0; - unsigned int id = 0, i = 0, wait = 5; - int c, errflg = 0; - CK_ULONG ulObjectCount; - CK_ATTRIBUTE search_template[] = { { CKA_ID, &attr_id, - sizeof(attr_id) } }; - unsigned int j, len; + CK_BYTE attr_id[2]; + CK_OBJECT_HANDLE akey[50]; + pk11_context_t pctx; + char *lib_name = NULL; + char *label = NULL; + char *pin = NULL; + int error = 0; + unsigned int id = 0, i = 0, wait = 5; + int c, errflg = 0; + CK_ULONG ulObjectCount; + CK_ATTRIBUTE search_template[] = { { CKA_ID, &attr_id, + sizeof(attr_id) } }; + unsigned int j, len; while ((c = isc_commandline_parse(argc, argv, ":m:s:i:l:p:w:")) != -1) { switch (c) { @@ -149,7 +148,8 @@ main(int argc, char *argv[]) result = pk11_get_session(&pctx, OP_ANY, false, true, true, (const char *)pin, slot); if (result == PK11_R_NORANDOMSERVICE || - result == PK11_R_NODIGESTSERVICE || result == PK11_R_NOAESSERVICE) { + result == PK11_R_NODIGESTSERVICE || result == PK11_R_NOAESSERVICE) + { fprintf(stderr, "Warning: %s\n", isc_result_totext(result)); fprintf(stderr, "This HSM will not work with BIND 9 " "using native PKCS#11.\n"); @@ -190,12 +190,12 @@ main(int argc, char *argv[]) for (i = 0; i < ulObjectCount; i++) { CK_OBJECT_CLASS oclass = 0; - CK_BYTE labelbuf[64 + 1]; - CK_BYTE idbuf[64]; - CK_ATTRIBUTE attr_template[] = { - { CKA_CLASS, &oclass, sizeof(oclass) }, - { CKA_LABEL, labelbuf, sizeof(labelbuf) - 1 }, - { CKA_ID, idbuf, sizeof(idbuf) } + CK_BYTE labelbuf[64 + 1]; + CK_BYTE idbuf[64]; + CK_ATTRIBUTE attr_template[] = { + { CKA_CLASS, &oclass, sizeof(oclass) }, + { CKA_LABEL, labelbuf, sizeof(labelbuf) - 1 }, + { CKA_ID, idbuf, sizeof(idbuf) } }; memset(labelbuf, 0, sizeof(labelbuf)); diff --git a/bin/pkcs11/pkcs11-keygen.c b/bin/pkcs11/pkcs11-keygen.c index 8425f0cd8b..7c89a5c64c 100644 --- a/bin/pkcs11/pkcs11-keygen.c +++ b/bin/pkcs11/pkcs11-keygen.c @@ -83,15 +83,15 @@ typedef enum { key_unknown, key_rsa, key_ecc, key_ecx } key_class_t; * Private key template: usable for most key classes without * modificaton; override CKA_SIGN with CKA_DERIVE for DH */ -#define PRIVATE_LABEL 0 -#define PRIVATE_SIGN 1 -#define PRIVATE_DERIVE 1 -#define PRIVATE_TOKEN 2 -#define PRIVATE_PRIVATE 3 -#define PRIVATE_SENSITIVE 4 +#define PRIVATE_LABEL 0 +#define PRIVATE_SIGN 1 +#define PRIVATE_DERIVE 1 +#define PRIVATE_TOKEN 2 +#define PRIVATE_PRIVATE 3 +#define PRIVATE_SENSITIVE 4 #define PRIVATE_EXTRACTABLE 5 -#define PRIVATE_ID 6 -#define PRIVATE_ATTRS 7 +#define PRIVATE_ID 6 +#define PRIVATE_ATTRS 7 static CK_ATTRIBUTE private_template[] = { { CKA_LABEL, NULL_PTR, 0 }, { CKA_SIGN, &truevalue, sizeof(truevalue) }, @@ -105,14 +105,14 @@ static CK_ATTRIBUTE private_template[] = { /* * Public key template for RSA keys */ -#define RSA_LABEL 0 -#define RSA_VERIFY 1 -#define RSA_TOKEN 2 -#define RSA_PRIVATE 3 -#define RSA_MODULUS_BITS 4 +#define RSA_LABEL 0 +#define RSA_VERIFY 1 +#define RSA_TOKEN 2 +#define RSA_PRIVATE 3 +#define RSA_MODULUS_BITS 4 #define RSA_PUBLIC_EXPONENT 5 -#define RSA_ID 6 -#define RSA_ATTRS 7 +#define RSA_ID 6 +#define RSA_ATTRS 7 static CK_ATTRIBUTE rsa_template[] = { { CKA_LABEL, NULL_PTR, 0 }, { CKA_VERIFY, &truevalue, sizeof(truevalue) }, @@ -126,13 +126,13 @@ static CK_ATTRIBUTE rsa_template[] = { /* * Public key template for ECC/ECX keys */ -#define ECC_LABEL 0 -#define ECC_VERIFY 1 -#define ECC_TOKEN 2 +#define ECC_LABEL 0 +#define ECC_VERIFY 1 +#define ECC_TOKEN 2 #define ECC_PRIVATE 3 -#define ECC_PARAMS 4 -#define ECC_ID 5 -#define ECC_ATTRS 6 +#define ECC_PARAMS 4 +#define ECC_ID 5 +#define ECC_ATTRS 6 static CK_ATTRIBUTE ecc_template[] = { { CKA_LABEL, NULL_PTR, 0 }, { CKA_VERIFY, &truevalue, sizeof(truevalue) }, @@ -148,8 +148,7 @@ static CK_ATTRIBUTE ecc_template[] = { * NSEC3RSASHA1 maps to RSA. */ static key_class_t -keyclass_fromtext(const char *name) -{ +keyclass_fromtext(const char *name) { if (name == NULL) { return (key_unknown); } @@ -158,7 +157,8 @@ keyclass_fromtext(const char *name) strncasecmp(name, "nsec3rsa", 8) == 0) { return (key_rsa); } else if (strncasecmp(name, "ecc", 3) == 0 || - strncasecmp(name, "ecdsa", 5) == 0) { + strncasecmp(name, "ecdsa", 5) == 0) + { return (key_ecc); } else if (strncasecmp(name, "ecx", 3) == 0 || strncasecmp(name, "ed", 2) == 0) { @@ -169,8 +169,7 @@ keyclass_fromtext(const char *name) } static void -usage(void) -{ +usage(void) { fprintf(stderr, "Usage:\n" "\tpkcs11-keygen -a algorithm -b keysize -l label\n" "\t [-P] [-m module] " @@ -179,33 +178,32 @@ usage(void) } int -main(int argc, char *argv[]) -{ - isc_result_t result; - CK_RV rv; - CK_SLOT_ID slot = 0; - CK_MECHANISM mech; +main(int argc, char *argv[]) { + isc_result_t result; + CK_RV rv; + CK_SLOT_ID slot = 0; + CK_MECHANISM mech; CK_SESSION_HANDLE hSession; - char * lib_name = NULL; - char * pin = NULL; - CK_ULONG bits = 0; - CK_CHAR * label = NULL; - CK_OBJECT_HANDLE privatekey, publickey; - CK_BYTE exponent[5]; - CK_ULONG expsize = 0; - pk11_context_t pctx; - int error = 0; - int c, errflg = 0; - int hide = 1, quiet = 0; - int idlen = 0, id_offset = 0; - unsigned long id = 0; - CK_BYTE idbuf[4]; - CK_ULONG ulObjectCount; - CK_ATTRIBUTE search_template[] = { { CKA_LABEL, NULL_PTR, 0 } }; - CK_ATTRIBUTE * public_template = NULL; - CK_ULONG public_attrcnt = 0, private_attrcnt = PRIVATE_ATTRS; - key_class_t keyclass = key_rsa; - pk11_optype_t op_type = OP_ANY; + char *lib_name = NULL; + char *pin = NULL; + CK_ULONG bits = 0; + CK_CHAR *label = NULL; + CK_OBJECT_HANDLE privatekey, publickey; + CK_BYTE exponent[5]; + CK_ULONG expsize = 0; + pk11_context_t pctx; + int error = 0; + int c, errflg = 0; + int hide = 1, quiet = 0; + int idlen = 0, id_offset = 0; + unsigned long id = 0; + CK_BYTE idbuf[4]; + CK_ULONG ulObjectCount; + CK_ATTRIBUTE search_template[] = { { CKA_LABEL, NULL_PTR, 0 } }; + CK_ATTRIBUTE *public_template = NULL; + CK_ULONG public_attrcnt = 0, private_attrcnt = PRIVATE_ATTRS; + key_class_t keyclass = key_rsa; + pk11_optype_t op_type = OP_ANY; #define OPTIONS ":a:b:ei:l:m:Pp:qSs:" while ((c = isc_commandline_parse(argc, argv, OPTIONS)) != -1) { @@ -411,7 +409,8 @@ main(int argc, char *argv[]) result = pk11_get_session(&pctx, op_type, false, true, true, (const char *)pin, slot); if (result == PK11_R_NORANDOMSERVICE || - result == PK11_R_NODIGESTSERVICE || result == PK11_R_NOAESSERVICE) { + result == PK11_R_NODIGESTSERVICE || result == PK11_R_NOAESSERVICE) + { fprintf(stderr, "Warning: %s\n", isc_result_totext(result)); fprintf(stderr, "This HSM will not work with BIND 9 " "using native PKCS#11.\n"); diff --git a/bin/pkcs11/pkcs11-list.c b/bin/pkcs11/pkcs11-list.c index 5210f0084b..8680a44f5e 100644 --- a/bin/pkcs11/pkcs11-list.c +++ b/bin/pkcs11/pkcs11-list.c @@ -54,24 +54,23 @@ #include int -main(int argc, char *argv[]) -{ - isc_result_t result; - CK_RV rv; - CK_SLOT_ID slot = 0; +main(int argc, char *argv[]) { + isc_result_t result; + CK_RV rv; + CK_SLOT_ID slot = 0; CK_SESSION_HANDLE hSession; - CK_BYTE attr_id[2]; - CK_OBJECT_HANDLE akey[50]; - pk11_context_t pctx; - char * lib_name = NULL; - char * label = NULL; - char * pin = NULL; - bool error = false, logon = true, all = false; - unsigned int i = 0, id = 0; - int c, errflg = 0; - CK_ULONG ulObjectCount; - CK_ATTRIBUTE search_template[] = { { CKA_ID, &attr_id, - sizeof(attr_id) } }; + CK_BYTE attr_id[2]; + CK_OBJECT_HANDLE akey[50]; + pk11_context_t pctx; + char *lib_name = NULL; + char *label = NULL; + char *pin = NULL; + bool error = false, logon = true, all = false; + unsigned int i = 0, id = 0; + int c, errflg = 0; + CK_ULONG ulObjectCount; + CK_ATTRIBUTE search_template[] = { { CKA_ID, &attr_id, + sizeof(attr_id) } }; while ((c = isc_commandline_parse(argc, argv, ":m:s:i:l:p:P")) != -1) { switch (c) { @@ -144,10 +143,11 @@ main(int argc, char *argv[]) pin = getpass("Enter Pin: "); } - result = - pk11_get_session(&pctx, OP_ANY, false, false, logon, pin, slot); + result = pk11_get_session(&pctx, OP_ANY, false, false, logon, pin, + slot); if (result == PK11_R_NORANDOMSERVICE || - result == PK11_R_NODIGESTSERVICE || result == PK11_R_NOAESSERVICE) { + result == PK11_R_NODIGESTSERVICE || result == PK11_R_NOAESSERVICE) + { fprintf(stderr, "Warning: %s\n", isc_result_totext(result)); fprintf(stderr, "This HSM will not work with BIND 9 " "using native PKCS#11.\n"); @@ -188,10 +188,10 @@ main(int argc, char *argv[]) unsigned int j, len; CK_OBJECT_CLASS oclass = 0; - CK_BYTE labelbuf[64 + 1]; - CK_BYTE idbuf[64]; - CK_BBOOL extract = TRUE; - CK_BBOOL never = FALSE; + CK_BYTE labelbuf[64 + 1]; + CK_BYTE idbuf[64]; + CK_BBOOL extract = TRUE; + CK_BBOOL never = FALSE; CK_ATTRIBUTE template[] = { { CKA_CLASS, &oclass, sizeof(oclass) }, { CKA_LABEL, labelbuf, sizeof(labelbuf) - 1 }, @@ -249,7 +249,8 @@ main(int argc, char *argv[]) oclass == CKO_SECRET_KEY) && pkcs_C_GetAttributeValue(hSession, akey[i], priv_template, - 2) == CKR_OK) { + 2) == CKR_OK) + { printf(" E:%s", extract ? "true" : (never ? "never" : "false")); diff --git a/bin/pkcs11/pkcs11-tokens.c b/bin/pkcs11/pkcs11-tokens.c index 4e015b1d48..df80223484 100644 --- a/bin/pkcs11/pkcs11-tokens.c +++ b/bin/pkcs11/pkcs11-tokens.c @@ -30,12 +30,11 @@ #include int -main(int argc, char *argv[]) -{ - isc_result_t result; - char * lib_name = NULL; - int c, errflg = 0; - isc_mem_t * mctx = NULL; +main(int argc, char *argv[]) { + isc_result_t result; + char *lib_name = NULL; + int c, errflg = 0; + isc_mem_t *mctx = NULL; pk11_context_t pctx; while ((c = isc_commandline_parse(argc, argv, ":m:v")) != -1) { @@ -76,7 +75,8 @@ main(int argc, char *argv[]) result = pk11_get_session(&pctx, OP_ANY, true, false, false, NULL, 0); if (result == PK11_R_NORANDOMSERVICE || - result == PK11_R_NODIGESTSERVICE || result == PK11_R_NOAESSERVICE) { + result == PK11_R_NODIGESTSERVICE || result == PK11_R_NOAESSERVICE) + { fprintf(stderr, "Warning: %s\n", isc_result_totext(result)); fprintf(stderr, "This HSM will not work with BIND 9 " "using native PKCS#11.\n\n"); diff --git a/bin/plugins/filter-aaaa.c b/bin/plugins/filter-aaaa.c index 81da33845d..b59fe1ddc9 100644 --- a/bin/plugins/filter-aaaa.c +++ b/bin/plugins/filter-aaaa.c @@ -68,23 +68,23 @@ typedef enum { NONE = 0, FILTER = 1, BREAK_DNSSEC = 2 } filter_aaaa_t; */ typedef struct filter_data { filter_aaaa_t mode; - uint32_t flags; + uint32_t flags; } filter_data_t; typedef struct filter_instance { ns_plugin_t *module; - isc_mem_t * mctx; + isc_mem_t *mctx; /* * Memory pool for use with persistent data. */ isc_mempool_t *datapool; - isc_mutex_t plock; + isc_mutex_t plock; /* * Hash table associating a client object with its persistent data. */ - isc_ht_t * ht; + isc_ht_t *ht; isc_mutex_t hlock; /* @@ -92,36 +92,36 @@ typedef struct filter_instance { */ filter_aaaa_t v4_aaaa; filter_aaaa_t v6_aaaa; - dns_acl_t * aaaa_acl; + dns_acl_t *aaaa_acl; } filter_instance_t; /* * Per-client flags set by this module */ #define FILTER_AAAA_RECURSING 0x0001 /* Recursing for A */ -#define FILTER_AAAA_FILTERED 0x0002 /* AAAA was removed from answer */ +#define FILTER_AAAA_FILTERED 0x0002 /* AAAA was removed from answer */ /* * Client attribute tests. */ -#define WANTDNSSEC(c) (((c)->attributes & NS_CLIENTATTR_WANTDNSSEC) != 0) +#define WANTDNSSEC(c) (((c)->attributes & NS_CLIENTATTR_WANTDNSSEC) != 0) #define RECURSIONOK(c) (((c)->query.attributes & NS_QUERYATTR_RECURSIONOK) != 0) /* * 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 @@ -131,8 +131,7 @@ filter_qctx_destroy(void *arg, void *cbdata, isc_result_t *resp); */ static void install_hooks(ns_hooktable_t *hooktable, isc_mem_t *mctx, - filter_instance_t *inst) -{ + filter_instance_t *inst) { const ns_hook_t filter_init = { .action = filter_qctx_initialize, .action_data = inst, @@ -183,14 +182,12 @@ install_hooks(ns_hooktable_t *hooktable, isc_mem_t *mctx, static const char *filter_aaaa_enums[] = { "break-dnssec", NULL }; static isc_result_t -parse_filter_aaaa(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_filter_aaaa(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { return (cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret)); } static void -doc_filter_aaaa(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_filter_aaaa(cfg_printer_t *pctx, const cfg_type_t *type) { cfg_doc_enum_or_other(pctx, type, &cfg_type_boolean); } @@ -214,10 +211,9 @@ static cfg_type_t cfg_type_parameters = { static isc_result_t parse_filter_aaaa_on(const cfg_obj_t *param_obj, const char *param_name, - filter_aaaa_t *dstp) -{ + filter_aaaa_t *dstp) { const cfg_obj_t *obj = NULL; - isc_result_t result; + isc_result_t result; result = cfg_map_get(param_obj, param_name, &obj); if (result != ISC_R_SUCCESS) { @@ -241,12 +237,11 @@ parse_filter_aaaa_on(const cfg_obj_t *param_obj, const char *param_name, static isc_result_t check_syntax(cfg_obj_t *fmap, const void *cfg, isc_mem_t *mctx, isc_log_t *lctx, - void *actx) -{ - isc_result_t result = ISC_R_SUCCESS; + void *actx) { + isc_result_t result = ISC_R_SUCCESS; const cfg_obj_t *aclobj = NULL; - dns_acl_t * acl = NULL; - filter_aaaa_t f4 = NONE, f6 = NONE; + dns_acl_t *acl = NULL; + filter_aaaa_t f4 = NONE, f6 = NONE; cfg_map_get(fmap, "filter-aaaa", &aclobj); if (aclobj == NULL) { @@ -284,13 +279,12 @@ cleanup: static isc_result_t parse_parameters(filter_instance_t *inst, const char *parameters, const void *cfg, const char *cfg_file, unsigned long cfg_line, - isc_mem_t *mctx, isc_log_t *lctx, void *actx) -{ - isc_result_t result = ISC_R_SUCCESS; - cfg_parser_t * parser = NULL; - cfg_obj_t * param_obj = NULL; + isc_mem_t *mctx, isc_log_t *lctx, void *actx) { + isc_result_t result = ISC_R_SUCCESS; + cfg_parser_t *parser = NULL; + cfg_obj_t *param_obj = NULL; const cfg_obj_t *obj = NULL; - isc_buffer_t b; + isc_buffer_t b; CHECK(cfg_parser_create(mctx, lctx, &parser)); @@ -341,10 +335,9 @@ cleanup: isc_result_t plugin_register(const char *parameters, const void *cfg, const char *cfg_file, unsigned long cfg_line, isc_mem_t *mctx, isc_log_t *lctx, - void *actx, ns_hooktable_t *hooktable, void **instp) -{ + void *actx, ns_hooktable_t *hooktable, void **instp) { filter_instance_t *inst = NULL; - isc_result_t result; + isc_result_t result; isc_log_write(lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_HOOKS, ISC_LOG_INFO, @@ -398,12 +391,11 @@ cleanup: isc_result_t plugin_check(const char *parameters, const void *cfg, const char *cfg_file, unsigned long cfg_line, isc_mem_t *mctx, isc_log_t *lctx, - void *actx) -{ - isc_result_t result = ISC_R_SUCCESS; + void *actx) { + isc_result_t result = ISC_R_SUCCESS; cfg_parser_t *parser = NULL; - cfg_obj_t * param_obj = NULL; - isc_buffer_t b; + cfg_obj_t *param_obj = NULL; + isc_buffer_t b; CHECK(cfg_parser_create(mctx, lctx, &parser)); @@ -429,8 +421,7 @@ cleanup: * the module when it was registered. */ void -plugin_destroy(void **instp) -{ +plugin_destroy(void **instp) { filter_instance_t *inst = (filter_instance_t *)*instp; if (inst->ht != NULL) { @@ -455,8 +446,7 @@ plugin_destroy(void **instp) * Returns plugin API version for compatibility checks. */ int -plugin_version(void) -{ +plugin_version(void) { return (NS_PLUGIN_VERSION); } @@ -468,25 +458,25 @@ plugin_version(void) * Structure describing the filtering to be applied by process_section(). */ typedef struct section_filter { - query_ctx_t * qctx; - filter_aaaa_t mode; - dns_section_t section; + query_ctx_t *qctx; + filter_aaaa_t mode; + dns_section_t section; const dns_name_t *name; - dns_rdatatype_t type; - bool only_if_a_exists; + dns_rdatatype_t type; + bool only_if_a_exists; } section_filter_t; /* * Check whether this is an IPv4 client. */ static bool -is_v4_client(ns_client_t *client) -{ +is_v4_client(ns_client_t *client) { if (isc_sockaddr_pf(&client->peeraddr) == AF_INET) { return (true); } if (isc_sockaddr_pf(&client->peeraddr) == AF_INET6 && - IN6_IS_ADDR_V4MAPPED(&client->peeraddr.type.sin6.sin6_addr)) { + IN6_IS_ADDR_V4MAPPED(&client->peeraddr.type.sin6.sin6_addr)) + { return (true); } return (false); @@ -496,20 +486,19 @@ is_v4_client(ns_client_t *client) * Check whether this is an IPv6 client. */ static bool -is_v6_client(ns_client_t *client) -{ +is_v6_client(ns_client_t *client) { if (isc_sockaddr_pf(&client->peeraddr) == AF_INET6 && - !IN6_IS_ADDR_V4MAPPED(&client->peeraddr.type.sin6.sin6_addr)) { + !IN6_IS_ADDR_V4MAPPED(&client->peeraddr.type.sin6.sin6_addr)) + { return (true); } return (false); } static filter_data_t * -client_state_get(const query_ctx_t *qctx, filter_instance_t *inst) -{ +client_state_get(const query_ctx_t *qctx, filter_instance_t *inst) { filter_data_t *client_state = NULL; - isc_result_t result; + isc_result_t result; LOCK(&inst->hlock); result = isc_ht_find(inst->ht, (const unsigned char *)&qctx->client, @@ -520,10 +509,9 @@ client_state_get(const query_ctx_t *qctx, filter_instance_t *inst) } static void -client_state_create(const query_ctx_t *qctx, filter_instance_t *inst) -{ +client_state_create(const query_ctx_t *qctx, filter_instance_t *inst) { filter_data_t *client_state; - isc_result_t result; + isc_result_t result; client_state = isc_mempool_get(inst->datapool); if (client_state == NULL) { @@ -541,10 +529,9 @@ client_state_create(const query_ctx_t *qctx, filter_instance_t *inst) } static void -client_state_destroy(const query_ctx_t *qctx, filter_instance_t *inst) -{ +client_state_destroy(const query_ctx_t *qctx, filter_instance_t *inst) { filter_data_t *client_state = client_state_get(qctx, inst); - isc_result_t result; + isc_result_t result; if (client_state == NULL) { return; @@ -564,8 +551,7 @@ client_state_destroy(const query_ctx_t *qctx, filter_instance_t *inst) * pointers and non-associated rdatasets. */ static void -mark_as_rendered(dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ +mark_as_rendered(dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { if (rdataset != NULL && dns_rdataset_isassociated(rdataset)) { rdataset->attributes |= DNS_RDATASETATTR_RENDERED; } @@ -585,11 +571,10 @@ mark_as_rendered(dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) */ static bool process_name(query_ctx_t *qctx, filter_aaaa_t mode, const dns_name_t *name, - dns_rdatatype_t type, bool only_if_a_exists) -{ + dns_rdatatype_t type, bool only_if_a_exists) { dns_rdataset_t *rdataset = NULL, *sigrdataset = NULL; - isc_result_t result; - bool modified = false; + isc_result_t result; + bool modified = false; if (only_if_a_exists) { CHECK(dns_message_findtype(name, dns_rdatatype_a, 0, NULL)); @@ -601,7 +586,8 @@ process_name(query_ctx_t *qctx, filter_aaaa_t mode, const dns_name_t *name, if (rdataset != NULL && (sigrdataset == NULL || !WANTDNSSEC(qctx->client) || - mode == BREAK_DNSSEC)) { + mode == BREAK_DNSSEC)) + { /* * An RRset of given 'type' was found at 'name' and at least * one of the following is true: @@ -631,21 +617,21 @@ cleanup: * process_name(). */ static void -process_section(const section_filter_t *filter) -{ - query_ctx_t * qctx = filter->qctx; - filter_aaaa_t mode = filter->mode; - dns_section_t section = filter->section; +process_section(const section_filter_t *filter) { + query_ctx_t *qctx = filter->qctx; + filter_aaaa_t mode = filter->mode; + dns_section_t section = filter->section; const dns_name_t *name = filter->name; - dns_rdatatype_t type = filter->type; - bool only_if_a_exists = filter->only_if_a_exists; + dns_rdatatype_t type = filter->type; + bool only_if_a_exists = filter->only_if_a_exists; dns_message_t *message = qctx->client->message; - isc_result_t result; + isc_result_t result; for (result = dns_message_firstname(message, section); result == ISC_R_SUCCESS; - result = dns_message_nextname(message, section)) { + result = dns_message_nextname(message, section)) + { dns_name_t *cur = NULL; dns_message_currentname(message, section, &cur); if (name != NULL && !dns_name_equal(name, cur)) { @@ -676,11 +662,10 @@ process_section(const section_filter_t *filter) * object persists. */ static ns_hookresult_t -filter_qctx_initialize(void *arg, void *cbdata, isc_result_t *resp) -{ - query_ctx_t * qctx = (query_ctx_t *)arg; +filter_qctx_initialize(void *arg, void *cbdata, isc_result_t *resp) { + query_ctx_t *qctx = (query_ctx_t *)arg; filter_instance_t *inst = (filter_instance_t *)cbdata; - filter_data_t * client_state; + filter_data_t *client_state; *resp = ISC_R_UNSET; @@ -698,12 +683,11 @@ filter_qctx_initialize(void *arg, void *cbdata, isc_result_t *resp) * filter-aaaa-on-v6. */ static ns_hookresult_t -filter_prep_response_begin(void *arg, void *cbdata, isc_result_t *resp) -{ - query_ctx_t * qctx = (query_ctx_t *)arg; +filter_prep_response_begin(void *arg, void *cbdata, isc_result_t *resp) { + query_ctx_t *qctx = (query_ctx_t *)arg; filter_instance_t *inst = (filter_instance_t *)cbdata; - filter_data_t * client_state = client_state_get(qctx, inst); - isc_result_t result; + filter_data_t *client_state = client_state_get(qctx, inst); + isc_result_t result; *resp = ISC_R_UNSET; @@ -715,10 +699,12 @@ filter_prep_response_begin(void *arg, void *cbdata, isc_result_t *resp) result = ns_client_checkaclsilent(qctx->client, NULL, inst->aaaa_acl, true); if (result == ISC_R_SUCCESS && inst->v4_aaaa != NONE && - is_v4_client(qctx->client)) { + is_v4_client(qctx->client)) + { client_state->mode = inst->v4_aaaa; } else if (result == ISC_R_SUCCESS && inst->v6_aaaa != NONE && - is_v6_client(qctx->client)) { + is_v6_client(qctx->client)) + { client_state->mode = inst->v6_aaaa; } } @@ -734,12 +720,11 @@ filter_prep_response_begin(void *arg, void *cbdata, isc_result_t *resp) * queries are handled in filter_respond_any_found().) */ static ns_hookresult_t -filter_respond_begin(void *arg, void *cbdata, isc_result_t *resp) -{ - query_ctx_t * qctx = (query_ctx_t *)arg; +filter_respond_begin(void *arg, void *cbdata, isc_result_t *resp) { + query_ctx_t *qctx = (query_ctx_t *)arg; filter_instance_t *inst = (filter_instance_t *)cbdata; - filter_data_t * client_state = client_state_get(qctx, inst); - isc_result_t result = ISC_R_UNSET; + filter_data_t *client_state = client_state_get(qctx, inst); + isc_result_t result = ISC_R_UNSET; *resp = ISC_R_UNSET; @@ -750,7 +735,8 @@ filter_respond_begin(void *arg, void *cbdata, isc_result_t *resp) if (client_state->mode != BREAK_DNSSEC && (client_state->mode != FILTER || (WANTDNSSEC(qctx->client) && qctx->sigrdataset != NULL && - dns_rdataset_isassociated(qctx->sigrdataset)))) { + dns_rdataset_isassociated(qctx->sigrdataset)))) + { return (NS_HOOK_CONTINUE); } @@ -786,7 +772,8 @@ filter_respond_begin(void *arg, void *cbdata, isc_result_t *resp) client_state->flags |= FILTER_AAAA_FILTERED; } else if (!qctx->authoritative && RECURSIONOK(qctx->client) && (result == DNS_R_DELEGATION || - result == ISC_R_NOTFOUND)) { + result == ISC_R_NOTFOUND)) + { /* * This is an ugly kludge to recurse * for the A and discard the result. @@ -805,7 +792,8 @@ filter_respond_begin(void *arg, void *cbdata, isc_result_t *resp) } } } else if (qctx->qtype == dns_rdatatype_a && - (client_state->flags & FILTER_AAAA_RECURSING) != 0) { + (client_state->flags & FILTER_AAAA_RECURSING) != 0) + { const section_filter_t filter_answer = { .qctx = qctx, .mode = client_state->mode, @@ -832,11 +820,10 @@ filter_respond_begin(void *arg, void *cbdata, isc_result_t *resp) * When answering an ANY query, remove AAAA if A is present. */ static ns_hookresult_t -filter_respond_any_found(void *arg, void *cbdata, isc_result_t *resp) -{ - query_ctx_t * qctx = (query_ctx_t *)arg; +filter_respond_any_found(void *arg, void *cbdata, isc_result_t *resp) { + query_ctx_t *qctx = (query_ctx_t *)arg; filter_instance_t *inst = (filter_instance_t *)cbdata; - filter_data_t * client_state = client_state_get(qctx, inst); + filter_data_t *client_state = client_state_get(qctx, inst); *resp = ISC_R_UNSET; @@ -868,11 +855,10 @@ filter_respond_any_found(void *arg, void *cbdata, isc_result_t *resp) * section. */ static ns_hookresult_t -filter_query_done_send(void *arg, void *cbdata, isc_result_t *resp) -{ - query_ctx_t * qctx = (query_ctx_t *)arg; +filter_query_done_send(void *arg, void *cbdata, isc_result_t *resp) { + query_ctx_t *qctx = (query_ctx_t *)arg; filter_instance_t *inst = (filter_instance_t *)cbdata; - filter_data_t * client_state = client_state_get(qctx, inst); + filter_data_t *client_state = client_state_get(qctx, inst); *resp = ISC_R_UNSET; @@ -905,9 +891,8 @@ filter_query_done_send(void *arg, void *cbdata, isc_result_t *resp) * from hash table and return it to the memory pool. */ static ns_hookresult_t -filter_qctx_destroy(void *arg, void *cbdata, isc_result_t *resp) -{ - query_ctx_t * qctx = (query_ctx_t *)arg; +filter_qctx_destroy(void *arg, void *cbdata, isc_result_t *resp) { + query_ctx_t *qctx = (query_ctx_t *)arg; filter_instance_t *inst = (filter_instance_t *)cbdata; *resp = ISC_R_UNSET; diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c index d88ed764b5..225f29765d 100644 --- a/bin/rndc/rndc.c +++ b/bin/rndc/rndc.c @@ -53,46 +53,44 @@ #define SERVERADDRS 10 const char *progname; -bool verbose; +bool verbose; -static const char * admin_conffile; -static const char * admin_keyfile; -static const char * version = VERSION; -static const char * servername = NULL; -static isc_sockaddr_t serveraddrs[SERVERADDRS]; -static isc_sockaddr_t local4, local6; -static bool local4set = false, local6set = false; -static int nserveraddrs; -static int currentaddr = 0; -static unsigned int remoteport = 0; -static isc_socketmgr_t * socketmgr = NULL; -static isc_buffer_t * databuf; -static isccc_ccmsg_t ccmsg; -static uint32_t algorithm; -static isccc_region_t secret; -static bool failed = false; -static bool c_flag = false; -static isc_mem_t * rndc_mctx; +static const char *admin_conffile; +static const char *admin_keyfile; +static const char *version = VERSION; +static const char *servername = NULL; +static isc_sockaddr_t serveraddrs[SERVERADDRS]; +static isc_sockaddr_t local4, local6; +static bool local4set = false, local6set = false; +static int nserveraddrs; +static int currentaddr = 0; +static unsigned int remoteport = 0; +static isc_socketmgr_t *socketmgr = NULL; +static isc_buffer_t *databuf; +static isccc_ccmsg_t ccmsg; +static uint32_t algorithm; +static isccc_region_t secret; +static bool failed = false; +static bool c_flag = false; +static isc_mem_t *rndc_mctx; static atomic_uint_fast32_t sends = ATOMIC_VAR_INIT(0); static atomic_uint_fast32_t recvs = ATOMIC_VAR_INIT(0); static atomic_uint_fast32_t connects = ATOMIC_VAR_INIT(0); -static char * command; -static char * args; -static char program[256]; -static isc_socket_t * sock = NULL; -static uint32_t serial; -static bool quiet = false; -static bool showresult = false; +static char *command; +static char *args; +static char program[256]; +static isc_socket_t *sock = NULL; +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; static void -usage(int status) -{ +usage(int status) { fprintf(stderr, "\ Usage: %s [-b address] [-c config] [-s server] [-p port]\n\ [-k key-file ] [-y key] [-r] [-V] [-4 | -6] command\n\ @@ -219,10 +217,9 @@ Version: %s\n", #define CMDLINE_FLAGS "46b:c:hk:Mmp:qrs:Vy:" static void -preparse_args(int argc, char **argv) -{ +preparse_args(int argc, char **argv) { bool ipv4only = false, ipv6only = false; - int ch; + int ch; while ((ch = isc_commandline_parse(argc, argv, CMDLINE_FLAGS)) != -1) { switch (ch) { @@ -248,14 +245,13 @@ preparse_args(int argc, char **argv) } static void -get_addresses(const char *host, in_port_t port) -{ +get_addresses(const char *host, in_port_t port) { isc_result_t result; - int found = 0, count; + int found = 0, count; if (*host == '/') { - result = - isc_sockaddr_frompath(&serveraddrs[nserveraddrs], host); + result = isc_sockaddr_frompath(&serveraddrs[nserveraddrs], + host); if (result == ISC_R_SUCCESS) { nserveraddrs++; } @@ -273,8 +269,7 @@ get_addresses(const char *host, in_port_t port) } static void -rndc_senddone(isc_task_t *task, isc_event_t *event) -{ +rndc_senddone(isc_task_t *task, isc_event_t *event) { isc_socketevent_t *sevent = (isc_socketevent_t *)event; UNUSED(task); @@ -284,7 +279,8 @@ rndc_senddone(isc_task_t *task, isc_event_t *event) } isc_event_free(&event); if (atomic_fetch_sub_release(&sends, 1) == 1 && - atomic_load_acquire(&recvs) == 0) { + atomic_load_acquire(&recvs) == 0) + { isc_socket_detach(&sock); isc_task_shutdown(task); isc_app_shutdown(); @@ -292,14 +288,13 @@ rndc_senddone(isc_task_t *task, isc_event_t *event) } static void -rndc_recvdone(isc_task_t *task, isc_event_t *event) -{ +rndc_recvdone(isc_task_t *task, isc_event_t *event) { isccc_sexpr_t *response = NULL; isccc_sexpr_t *data; isccc_region_t source; - char * errormsg = NULL; - char * textmsg = NULL; - isc_result_t result; + char *errormsg = NULL; + char *textmsg = NULL; + isc_result_t result; atomic_fetch_sub_release(&recvs, 1); @@ -369,18 +364,17 @@ rndc_recvdone(isc_task_t *task, isc_event_t *event) } static void -rndc_recvnonce(isc_task_t *task, isc_event_t *event) -{ +rndc_recvnonce(isc_task_t *task, isc_event_t *event) { isccc_sexpr_t *response = NULL; isccc_sexpr_t *_ctrl; isccc_region_t source; - isc_result_t result; - uint32_t nonce; + isc_result_t result; + uint32_t nonce; isccc_sexpr_t *request = NULL; - isccc_time_t now; - isc_region_t r; + isccc_time_t now; + isc_region_t r; isccc_sexpr_t *data; - isc_buffer_t b; + isc_buffer_t b; atomic_fetch_sub_release(&recvs, 1); @@ -463,16 +457,15 @@ rndc_recvnonce(isc_task_t *task, isc_event_t *event) } static void -rndc_connected(isc_task_t *task, isc_event_t *event) -{ - char socktext[ISC_SOCKADDR_FORMATSIZE]; +rndc_connected(isc_task_t *task, isc_event_t *event) { + char socktext[ISC_SOCKADDR_FORMATSIZE]; isc_socketevent_t *sevent = (isc_socketevent_t *)event; - isccc_sexpr_t * request = NULL; - isccc_sexpr_t * data; - isccc_time_t now; - isc_region_t r; - isc_buffer_t b; - isc_result_t result; + isccc_sexpr_t *request = NULL; + isccc_sexpr_t *data; + isccc_time_t now; + isc_region_t r; + isc_buffer_t b; + isc_result_t result; atomic_fetch_sub_release(&connects, 1); @@ -531,10 +524,9 @@ rndc_connected(isc_task_t *task, isc_event_t *event) } static void -rndc_startconnect(isc_sockaddr_t *addr, isc_task_t *task) -{ - isc_result_t result; - int pf; +rndc_startconnect(isc_sockaddr_t *addr, isc_task_t *task) { + isc_result_t result; + int pf; isc_sockettype_t type; char socktext[ISC_SOCKADDR_FORMATSIZE]; @@ -566,8 +558,7 @@ rndc_startconnect(isc_sockaddr_t *addr, isc_task_t *task) } static void -rndc_start(isc_task_t *task, isc_event_t *event) -{ +rndc_start(isc_task_t *task, isc_event_t *event) { isc_event_free(&event); currentaddr = 0; @@ -576,28 +567,27 @@ rndc_start(isc_task_t *task, isc_event_t *event) static void parse_config(isc_mem_t *mctx, isc_log_t *log, const char *keyname, - cfg_parser_t **pctxp, cfg_obj_t **configp) -{ - isc_result_t result; - const char * conffile = admin_conffile; - const cfg_obj_t * addresses = NULL; - const cfg_obj_t * defkey = NULL; - const cfg_obj_t * options = NULL; - const cfg_obj_t * servers = NULL; - const cfg_obj_t * server = NULL; - const cfg_obj_t * keys = NULL; - const cfg_obj_t * key = NULL; - const cfg_obj_t * defport = NULL; - const cfg_obj_t * secretobj = NULL; - const cfg_obj_t * algorithmobj = NULL; - cfg_obj_t * config = NULL; - const cfg_obj_t * address = NULL; + cfg_parser_t **pctxp, cfg_obj_t **configp) { + isc_result_t result; + const char *conffile = admin_conffile; + const cfg_obj_t *addresses = NULL; + const cfg_obj_t *defkey = NULL; + const cfg_obj_t *options = NULL; + const cfg_obj_t *servers = NULL; + const cfg_obj_t *server = NULL; + const cfg_obj_t *keys = NULL; + const cfg_obj_t *key = NULL; + const cfg_obj_t *defport = NULL; + const cfg_obj_t *secretobj = NULL; + const cfg_obj_t *algorithmobj = NULL; + cfg_obj_t *config = NULL; + const cfg_obj_t *address = NULL; const cfg_listelt_t *elt; - const char * secretstr; - const char * algorithmstr; - static char secretarray[1024]; - const cfg_type_t * conftype = &cfg_type_rndcconf; - bool key_only = false; + const char *secretstr; + const char *algorithmstr; + static char secretarray[1024]; + const cfg_type_t *conftype = &cfg_type_rndcconf; + bool key_only = false; const cfg_listelt_t *element; if (!isc_file_exists(conffile)) { @@ -760,13 +750,14 @@ parse_config(isc_mem_t *mctx, isc_log_t *log, const char *keyname, } if (result == ISC_R_SUCCESS) { for (element = cfg_list_first(addresses); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { isc_sockaddr_t sa; address = cfg_listelt_value(element); if (!cfg_obj_issockaddr(address)) { - unsigned int myport; - const char * name; + unsigned int myport; + const char *name; const cfg_obj_t *obj; obj = cfg_tuple_get(address, "name"); @@ -774,8 +765,8 @@ parse_config(isc_mem_t *mctx, isc_log_t *log, const char *keyname, obj = cfg_tuple_get(address, "port"); if (cfg_obj_isuint32(obj)) { myport = cfg_obj_asuint32(obj); - if (myport > UINT16_MAX || - myport == 0) { + if (myport > UINT16_MAX || myport == 0) + { fatal("port %u out of range", myport); } @@ -848,24 +839,23 @@ parse_config(isc_mem_t *mctx, isc_log_t *log, const char *keyname, } int -main(int argc, char **argv) -{ - isc_result_t result = ISC_R_SUCCESS; - bool show_final_mem = false; - isc_taskmgr_t * taskmgr = NULL; - isc_task_t * task = NULL; - isc_log_t * log = NULL; - isc_logconfig_t * logconfig = NULL; +main(int argc, char **argv) { + isc_result_t result = ISC_R_SUCCESS; + bool show_final_mem = false; + isc_taskmgr_t *taskmgr = NULL; + isc_task_t *task = NULL; + isc_log_t *log = NULL; + isc_logconfig_t *logconfig = NULL; isc_logdestination_t logdest; - cfg_parser_t * pctx = NULL; - cfg_obj_t * config = NULL; - const char * keyname = NULL; - struct in_addr in; - struct in6_addr in6; - char * p; - size_t argslen; - int ch; - int i; + cfg_parser_t *pctx = NULL; + cfg_obj_t *config = NULL; + const char *keyname = NULL; + struct in_addr in; + struct in6_addr in6; + char *p; + size_t argslen; + int ch; + int i; result = isc_file_progname(*argv, program, sizeof(program)); if (result != ISC_R_SUCCESS) { @@ -1057,8 +1047,8 @@ main(int argc, char **argv) } if (atomic_load_acquire(&connects) > 0 || - atomic_load_acquire(&sends) > 0 || - atomic_load_acquire(&recvs) > 0) { + atomic_load_acquire(&sends) > 0 || atomic_load_acquire(&recvs) > 0) + { isc_socket_cancel(sock, task, ISC_SOCKCANCEL_ALL); } diff --git a/bin/rndc/util.c b/bin/rndc/util.c index 5b89bc3e4f..a6dc649e33 100644 --- a/bin/rndc/util.c +++ b/bin/rndc/util.c @@ -20,12 +20,11 @@ #include -extern bool verbose; +extern bool verbose; extern const char *progname; void -notify(const char *fmt, ...) -{ +notify(const char *fmt, ...) { va_list ap; if (verbose) { @@ -37,8 +36,7 @@ notify(const char *fmt, ...) } void -fatal(const char *format, ...) -{ +fatal(const char *format, ...) { va_list args; fprintf(stderr, "%s: ", progname); diff --git a/bin/tests/cfg_test.c b/bin/tests/cfg_test.c index 2dc984c6d5..cab9b42a28 100644 --- a/bin/tests/cfg_test.c +++ b/bin/tests/cfg_test.c @@ -26,8 +26,7 @@ #include static void -check_result(isc_result_t result, const char *format, ...) -{ +check_result(isc_result_t result, const char *format, ...) { va_list args; if (result == ISC_R_SUCCESS) { @@ -42,15 +41,13 @@ check_result(isc_result_t result, const char *format, ...) } static void -output(void *closure, const char *text, int textlen) -{ +output(void *closure, const char *text, int textlen) { UNUSED(closure); (void)fwrite(text, 1, textlen, stdout); } static void -usage(void) -{ +usage(void) { fprintf(stderr, "usage: cfg_test --rndc|--named " "[--grammar] [--zonegrammar] [--active] " "[--memstats] conffile\n"); @@ -58,21 +55,20 @@ usage(void) } int -main(int argc, char **argv) -{ - isc_result_t result; - isc_mem_t * mctx = NULL; - isc_log_t * lctx = NULL; - isc_logconfig_t * lcfg = NULL; +main(int argc, char **argv) { + isc_result_t result; + isc_mem_t *mctx = NULL; + isc_log_t *lctx = NULL; + isc_logconfig_t *lcfg = NULL; isc_logdestination_t destination; - cfg_parser_t * pctx = NULL; - cfg_obj_t * cfg = NULL; - cfg_type_t * type = NULL; - bool grammar = false; - bool memstats = false; - char * filename = NULL; - unsigned int zonetype = 0; - unsigned int pflags = 0; + cfg_parser_t *pctx = NULL; + cfg_obj_t *cfg = NULL; + cfg_type_t *type = NULL; + bool grammar = false; + bool memstats = false; + char *filename = NULL; + unsigned int zonetype = 0; + unsigned int pflags = 0; isc_mem_create(&mctx); diff --git a/bin/tests/makejournal.c b/bin/tests/makejournal.c index df4ea26aef..a545738d02 100644 --- a/bin/tests/makejournal.c +++ b/bin/tests/makejournal.c @@ -54,11 +54,10 @@ static isc_logcategory_t categories[] = { { "", 0 }, { NULL, 0 } }; static isc_result_t -loadzone(dns_db_t **db, const char *origin, const char *filename) -{ - isc_result_t result; +loadzone(dns_db_t **db, const char *origin, const char *filename) { + isc_result_t result; dns_fixedname_t fixed; - dns_name_t * name; + dns_name_t *name; name = dns_fixedname_initname(&fixed); @@ -78,13 +77,12 @@ loadzone(dns_db_t **db, const char *origin, const char *filename) } int -main(int argc, char **argv) -{ - isc_result_t result; - char * origin, *file1, *file2, *journal; - dns_db_t * olddb = NULL, *newdb = NULL; +main(int argc, char **argv) { + isc_result_t result; + char *origin, *file1, *file2, *journal; + dns_db_t *olddb = NULL, *newdb = NULL; isc_logdestination_t destination; - isc_logconfig_t * logconfig = NULL; + isc_logconfig_t *logconfig = NULL; if (argc != 5) { printf("usage: %s origin file1 file2 journal\n", argv[0]); diff --git a/bin/tests/optional/adb_test.c b/bin/tests/optional/adb_test.c index 580acbb8e8..ca12fc21e1 100644 --- a/bin/tests/optional/adb_test.c +++ b/bin/tests/optional/adb_test.c @@ -34,35 +34,33 @@ typedef struct client client_t; struct client { - dns_name_t name; + dns_name_t name; const char *target; ISC_LINK(client_t) link; dns_adbfind_t *find; }; -static isc_mem_t * mctx = NULL; -static isc_mempool_t * cmp; -static isc_log_t * lctx; -static isc_logconfig_t * lcfg; -static isc_taskmgr_t * taskmgr; -static isc_socketmgr_t * socketmgr; -static isc_timermgr_t * timermgr; +static isc_mem_t *mctx = NULL; +static isc_mempool_t *cmp; +static isc_log_t *lctx; +static isc_logconfig_t *lcfg; +static isc_taskmgr_t *taskmgr; +static isc_socketmgr_t *socketmgr; +static isc_timermgr_t *timermgr; static dns_dispatchmgr_t *dispatchmgr; -static isc_task_t * t1, *t2; -static dns_view_t * view; -static dns_db_t * rootdb; +static isc_task_t *t1, *t2; +static dns_view_t *view; +static dns_db_t *rootdb; static ISC_LIST(client_t) clients; -static isc_mutex_t client_lock; +static isc_mutex_t client_lock; static isc_stdtime_t now; -static dns_adb_t * adb; +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 -check_result(isc_result_t result, const char *format, ...) -{ +check_result(isc_result_t result, const char *format, ...) { va_list args; if (result == ISC_R_SUCCESS) { @@ -77,8 +75,7 @@ check_result(isc_result_t result, const char *format, ...) } static client_t * -new_client(void) -{ +new_client(void) { client_t *client; client = isc_mempool_get(cmp); @@ -91,8 +88,7 @@ new_client(void) } static void -free_client(client_t **c) -{ +free_client(client_t **c) { client_t *client; INSIST(c != NULL); @@ -107,20 +103,17 @@ free_client(client_t **c) } static inline void -CLOCK(void) -{ +CLOCK(void) { RUNTIME_CHECK(isc_mutex_lock(&client_lock) == ISC_R_SUCCESS); } static inline void -CUNLOCK(void) -{ +CUNLOCK(void) { RUNTIME_CHECK(isc_mutex_unlock(&client_lock) == ISC_R_SUCCESS); } static void -lookup_callback(isc_task_t *task, isc_event_t *ev) -{ +lookup_callback(isc_task_t *task, isc_event_t *ev) { client_t *client; client = ev->ev_arg; @@ -147,8 +140,7 @@ lookup_callback(isc_task_t *task, isc_event_t *ev) } static void -create_managers(void) -{ +create_managers(void) { isc_result_t result; taskmgr = NULL; @@ -169,8 +161,7 @@ create_managers(void) } static void -create_view(void) -{ +create_view(void) { dns_cache_t *cache; isc_result_t result; @@ -193,8 +184,8 @@ create_view(void) dns_cache_detach(&cache); { - unsigned int attrs; - isc_sockaddr_t any4, any6; + unsigned int attrs; + isc_sockaddr_t any4, any6; dns_dispatch_t *disp4 = NULL; dns_dispatch_t *disp6 = NULL; @@ -231,14 +222,13 @@ create_view(void) } static void -lookup(const char *target) -{ - dns_name_t name; +lookup(const char *target) { + dns_name_t name; unsigned char namedata[256]; - client_t * client; - isc_buffer_t t, namebuf; - isc_result_t result; - unsigned int options; + client_t *client; + isc_buffer_t t, namebuf; + isc_result_t result; + unsigned int options; INSIST(target != NULL); @@ -280,9 +270,8 @@ lookup(const char *target) } int -main(int argc, char **argv) -{ - isc_result_t result; +main(int argc, char **argv) { + isc_result_t result; isc_logdestination_t destination; UNUSED(argc); diff --git a/bin/tests/optional/backtrace_test.c b/bin/tests/optional/backtrace_test.c index cc122b7e1e..728c0ca44b 100644 --- a/bin/tests/optional/backtrace_test.c +++ b/bin/tests/optional/backtrace_test.c @@ -19,13 +19,12 @@ const char *expected_symbols[] = { "func3", "func2", "func1", "main" }; static int -func3() -{ - void * tracebuf[16]; - int i, nframes; - int error = 0; - const char * fname; - isc_result_t result; +func3() { + void *tracebuf[16]; + int i, nframes; + int error = 0; + const char *fname; + isc_result_t result; unsigned long offset; result = isc_backtrace_gettrace(tracebuf, 16, &nframes); @@ -72,19 +71,16 @@ func3() } static int -func2() -{ +func2() { return (func3()); } static int -func1() -{ +func1() { return (func2()); } int -main() -{ +main() { return (func1()); } diff --git a/bin/tests/optional/byaddr_test.c b/bin/tests/optional/byaddr_test.c index 1e18393e06..b629d68663 100644 --- a/bin/tests/optional/byaddr_test.c +++ b/bin/tests/optional/byaddr_test.c @@ -34,11 +34,10 @@ #include static void -done(isc_task_t *task, isc_event_t *event) -{ +done(isc_task_t *task, isc_event_t *event) { dns_byaddrevent_t *bevent; - dns_byaddr_t * byaddr; - dns_name_t * name; + dns_byaddr_t *byaddr; + dns_name_t *name; REQUIRE(event->ev_type == DNS_EVENT_BYADDRDONE); bevent = (dns_byaddrevent_t *)event; @@ -49,7 +48,8 @@ done(isc_task_t *task, isc_event_t *event) if (bevent->result == ISC_R_SUCCESS) { for (name = ISC_LIST_HEAD(bevent->names); name != NULL; - name = ISC_LIST_NEXT(name, link)) { + name = ISC_LIST_NEXT(name, link)) + { char text[DNS_NAME_FORMATSIZE]; dns_name_format(name, text, sizeof(text)); printf("%s\n", text); @@ -64,23 +64,22 @@ done(isc_task_t *task, isc_event_t *event) } int -main(int argc, char *argv[]) -{ - isc_mem_t * mctx; - bool verbose = false; - unsigned int workers = 2; - isc_taskmgr_t * taskmgr; - isc_task_t * task; - isc_timermgr_t * timermgr; - dns_view_t * view; - int ch; - isc_socketmgr_t * socketmgr; +main(int argc, char *argv[]) { + isc_mem_t *mctx; + bool verbose = false; + unsigned int workers = 2; + isc_taskmgr_t *taskmgr; + isc_task_t *task; + isc_timermgr_t *timermgr; + dns_view_t *view; + int ch; + isc_socketmgr_t *socketmgr; dns_dispatchmgr_t *dispatchmgr; - isc_netaddr_t na; - dns_byaddr_t * byaddr; - isc_result_t result; - unsigned int options = 0; - dns_cache_t * cache; + isc_netaddr_t na; + dns_byaddr_t *byaddr; + isc_result_t result; + unsigned int options = 0; + dns_cache_t *cache; RUNTIME_CHECK(isc_app_start() == ISC_R_SUCCESS); @@ -137,7 +136,7 @@ main(int argc, char *argv[]) &view) == ISC_R_SUCCESS); { - unsigned int attrs; + unsigned int attrs; dns_dispatch_t *disp4 = NULL; dns_dispatch_t *disp6 = NULL; @@ -183,8 +182,8 @@ main(int argc, char *argv[]) } { - struct in_addr ina; - isc_sockaddr_t sa; + struct in_addr ina; + isc_sockaddr_t sa; isc_sockaddrlist_t sal; ISC_LIST_INIT(sal); diff --git a/bin/tests/optional/byname_test.c b/bin/tests/optional/byname_test.c index 77a89ad16e..ba483cf59a 100644 --- a/bin/tests/optional/byname_test.c +++ b/bin/tests/optional/byname_test.c @@ -34,25 +34,23 @@ #include #include -static isc_mem_t * mctx = NULL; -static isc_taskmgr_t * taskmgr; -static dns_view_t * view = NULL; -static dns_adbfind_t * find = NULL; -static isc_task_t * task = NULL; -static dns_fixedname_t fixed; -static dns_fixedname_t target; -static isc_log_t * lctx; +static isc_mem_t *mctx = NULL; +static isc_taskmgr_t *taskmgr; +static dns_view_t *view = NULL; +static dns_adbfind_t *find = NULL; +static isc_task_t *task = NULL; +static dns_fixedname_t fixed; +static dns_fixedname_t target; +static isc_log_t *lctx; static isc_logconfig_t *lcfg; -static unsigned int level = 0; +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) -{ +log_init(void) { isc_logdestination_t destination; - unsigned int flags; + unsigned int flags; /* * Setup a logging context. @@ -80,14 +78,14 @@ log_init(void) } static void -print_addresses(dns_adbfind_t *adbfind) -{ +print_addresses(dns_adbfind_t *adbfind) { dns_adbaddrinfo_t *address; for (address = ISC_LIST_HEAD(adbfind->list); address != NULL; - address = ISC_LIST_NEXT(address, publink)) { + address = ISC_LIST_NEXT(address, publink)) + { isc_netaddr_t netaddr; - char text[ISC_NETADDR_FORMATSIZE]; + char text[ISC_NETADDR_FORMATSIZE]; isc_netaddr_fromsockaddr(&netaddr, &address->sockaddr); isc_netaddr_format(&netaddr, text, sizeof(text)); printf("%s\n", text); @@ -95,8 +93,7 @@ print_addresses(dns_adbfind_t *adbfind) } static void -print_name(dns_name_t *name) -{ +print_name(dns_name_t *name) { char text[DNS_NAME_FORMATSIZE]; dns_name_format(name, text, sizeof(text)); @@ -104,10 +101,9 @@ print_name(dns_name_t *name) } static void -do_find(bool want_event) -{ +do_find(bool want_event) { isc_result_t result; - bool done = false; + bool done = false; unsigned int options; options = DNS_ADBFIND_INET | DNS_ADBFIND_INET6; @@ -163,8 +159,7 @@ do_find(bool want_event) } static void -adb_callback(isc_task_t *etask, isc_event_t *event) -{ +adb_callback(isc_task_t *etask, isc_event_t *event) { unsigned int type = event->ev_type; REQUIRE(etask == task); @@ -184,24 +179,22 @@ adb_callback(isc_task_t *etask, isc_event_t *event) } static void -run(isc_task_t *xtask, isc_event_t *event) -{ +run(isc_task_t *xtask, isc_event_t *event) { UNUSED(xtask); do_find(true); isc_event_free(&event); } int -main(int argc, char *argv[]) -{ - bool verbose = false; - unsigned int workers = 2; - isc_timermgr_t * timermgr; - int ch; - isc_socketmgr_t * socketmgr; +main(int argc, char *argv[]) { + bool verbose = false; + unsigned int workers = 2; + isc_timermgr_t *timermgr; + int ch; + isc_socketmgr_t *socketmgr; dns_dispatchmgr_t *dispatchmgr; - dns_cache_t * cache; - isc_buffer_t b; + dns_cache_t *cache; + isc_buffer_t b; RUNTIME_CHECK(isc_app_start() == ISC_R_SUCCESS); @@ -258,7 +251,7 @@ main(int argc, char *argv[]) &view) == ISC_R_SUCCESS); { - unsigned int attrs; + unsigned int attrs; dns_dispatch_t *disp4 = NULL; dns_dispatch_t *disp6 = NULL; @@ -303,8 +296,8 @@ main(int argc, char *argv[]) } { - struct in_addr ina; - isc_sockaddr_t sa; + struct in_addr ina; + isc_sockaddr_t sa; isc_sockaddrlist_t sal; ISC_LIST_INIT(sal); diff --git a/bin/tests/optional/db_test.c b/bin/tests/optional/db_test.c index 7e132bd571..465e0d1053 100644 --- a/bin/tests/optional/db_test.c +++ b/bin/tests/optional/db_test.c @@ -33,35 +33,34 @@ #include #include -#define MAXHOLD 100 +#define MAXHOLD 100 #define MAXVERSIONS 100 typedef struct dbinfo { - dns_db_t * db; - dns_dbversion_t * version; - dns_dbversion_t * wversion; - dns_dbversion_t * rversions[MAXVERSIONS]; - int rcount; - dns_dbnode_t * hold_nodes[MAXHOLD]; - int hold_count; + dns_db_t *db; + dns_dbversion_t *version; + dns_dbversion_t *wversion; + dns_dbversion_t *rversions[MAXVERSIONS]; + int rcount; + dns_dbnode_t *hold_nodes[MAXHOLD]; + int hold_count; dns_dbiterator_t *dbiterator; - dns_dbversion_t * iversion; - int pause_every; - bool ascending; + dns_dbversion_t *iversion; + int pause_every; + bool ascending; ISC_LINK(struct dbinfo) link; } dbinfo; -static isc_mem_t * mctx = NULL; -static char dbtype[128]; +static isc_mem_t *mctx = NULL; +static char dbtype[128]; static dns_dbtable_t *dbtable; static ISC_LIST(dbinfo) dbs; static dbinfo *cache_dbi = NULL; -static int pause_every = 0; -static bool ascending = true; +static int pause_every = 0; +static bool ascending = true; static void -print_result(const char *message, isc_result_t result) -{ +print_result(const char *message, isc_result_t result) { if (message == NULL) { message = ""; } @@ -70,10 +69,9 @@ print_result(const char *message, isc_result_t result) } static void -print_rdataset(dns_name_t *name, dns_rdataset_t *rdataset) -{ +print_rdataset(dns_name_t *name, dns_rdataset_t *rdataset) { isc_buffer_t text; - char t[1000]; + char t[1000]; isc_result_t result; isc_region_t r; @@ -88,9 +86,8 @@ print_rdataset(dns_name_t *name, dns_rdataset_t *rdataset) } static void -print_rdatasets(dns_name_t *name, dns_rdatasetiter_t *rdsiter) -{ - isc_result_t result; +print_rdatasets(dns_name_t *name, dns_rdatasetiter_t *rdsiter) { + isc_result_t result; dns_rdataset_t rdataset; dns_rdataset_init(&rdataset); @@ -107,14 +104,13 @@ print_rdatasets(dns_name_t *name, dns_rdatasetiter_t *rdsiter) } static dbinfo * -select_db(char *origintext) -{ +select_db(char *origintext) { dns_fixedname_t forigin; - dns_name_t * origin; - isc_buffer_t source; - size_t len; - dbinfo * dbi; - isc_result_t result; + dns_name_t *origin; + isc_buffer_t source; + size_t len; + dbinfo *dbi; + isc_result_t result; if (strcasecmp(origintext, "cache") == 0) { if (cache_dbi == NULL) { @@ -143,18 +139,17 @@ select_db(char *origintext) } static void -list(dbinfo *dbi, char *seektext) -{ - dns_fixedname_t fname; - dns_name_t * name; - dns_dbnode_t * node; +list(dbinfo *dbi, char *seektext) { + dns_fixedname_t fname; + dns_name_t *name; + dns_dbnode_t *node; dns_rdatasetiter_t *rdsiter; - isc_result_t result; - int i; - size_t len; - dns_fixedname_t fseekname; - dns_name_t * seekname; - isc_buffer_t source; + isc_result_t result; + int i; + size_t len; + dns_fixedname_t fseekname; + dns_name_t *seekname; + isc_buffer_t source; name = dns_fixedname_initname(&fname); @@ -235,15 +230,14 @@ list(dbinfo *dbi, char *seektext) } static isc_result_t -load(const char *filename, const char *origintext, bool cache) -{ +load(const char *filename, const char *origintext, bool cache) { dns_fixedname_t forigin; - dns_name_t * origin; - isc_result_t result; - isc_buffer_t source; - size_t len; - dbinfo * dbi; - unsigned int i; + dns_name_t *origin; + isc_result_t result; + isc_buffer_t source; + size_t len; + dbinfo *dbi; + unsigned int i; dbi = isc_mem_get(mctx, sizeof(*dbi)); @@ -308,8 +302,7 @@ load(const char *filename, const char *origintext, bool cache) } static void -unload_all(void) -{ +unload_all(void) { dbinfo *dbi, *dbi_next; for (dbi = ISC_LIST_HEAD(dbs); dbi != NULL; dbi = dbi_next) { @@ -334,49 +327,48 @@ unload_all(void) } int -main(int argc, char *argv[]) -{ - dns_db_t * db; - dns_dbnode_t * node; - isc_result_t result; - dns_name_t name; - dns_offsets_t offsets; - size_t len; - isc_buffer_t source, target; - char s[1000]; - char b[255]; - dns_rdataset_t rdataset, sigrdataset; - int ch; - dns_rdatatype_t type = 1; - bool printnode = false; - bool addmode = false; - bool delmode = false; - bool holdmode = false; - bool verbose = false; - bool done = false; - bool quiet = false; - bool time_lookups = false; - bool found_as; - bool find_zonecut = false; - bool noexact_zonecut = false; - int i, v; +main(int argc, char *argv[]) { + dns_db_t *db; + dns_dbnode_t *node; + isc_result_t result; + dns_name_t name; + dns_offsets_t offsets; + size_t len; + isc_buffer_t source, target; + char s[1000]; + char b[255]; + dns_rdataset_t rdataset, sigrdataset; + int ch; + dns_rdatatype_t type = 1; + bool printnode = false; + bool addmode = false; + bool delmode = false; + bool holdmode = false; + bool verbose = false; + bool done = false; + bool quiet = false; + bool time_lookups = false; + bool found_as; + bool find_zonecut = false; + bool noexact_zonecut = false; + int i, v; dns_rdatasetiter_t *rdsiter; - char t1[256]; - char t2[256]; - isc_buffer_t tb1, tb2; - isc_region_t r1, r2; - dns_fixedname_t foundname; - dns_name_t * fname; - unsigned int options = 0, zcoptions; - isc_time_t start, finish; - const char * origintext; - dbinfo * dbi; - dns_dbversion_t * version; - const dns_name_t * origin; - dns_trust_t trust = 0; - unsigned int addopts; - isc_log_t * lctx = NULL; - size_t n; + char t1[256]; + char t2[256]; + isc_buffer_t tb1, tb2; + isc_region_t r1, r2; + dns_fixedname_t foundname; + dns_name_t *fname; + unsigned int options = 0, zcoptions; + isc_time_t start, finish; + const char *origintext; + dbinfo *dbi; + dns_dbversion_t *version; + const dns_name_t *origin; + dns_trust_t trust = 0; + unsigned int addopts; + isc_log_t *lctx = NULL; + size_t n; dns_result_register(); @@ -406,8 +398,8 @@ main(int argc, char *argv[]) } break; case 'g': - options |= - (DNS_DBFIND_GLUEOK | DNS_DBFIND_VALIDATEGLUE); + options |= (DNS_DBFIND_GLUEOK | + DNS_DBFIND_VALIDATEGLUE); break; case 'l': RUNTIME_CHECK(isc_log_create(mctx, &lctx, NULL) == @@ -781,8 +773,8 @@ main(int argc, char *argv[]) continue; } isc_buffer_init(&tb1, t1, sizeof(t1)); - result = - dns_name_totext(dns_db_origin(db), false, &tb1); + result = dns_name_totext(dns_db_origin(db), false, + &tb1); if (result != ISC_R_SUCCESS) { printf("\n"); print_result("", result); diff --git a/bin/tests/optional/fsaccess_test.c b/bin/tests/optional/fsaccess_test.c index d3c51798a2..c4e7ae17ea 100644 --- a/bin/tests/optional/fsaccess_test.c +++ b/bin/tests/optional/fsaccess_test.c @@ -25,12 +25,11 @@ #define PATH "/tmp/fsaccess" int -main(void) -{ +main(void) { isc_fsaccess_t access; - isc_result_t result; - FILE * fp; - int n; + isc_result_t result; + FILE *fp; + int n; n = remove(PATH); if (n != 0 && errno != ENOENT) { diff --git a/bin/tests/optional/gsstest.c b/bin/tests/optional/gsstest.c index 4b304be68a..d7d89b4136 100644 --- a/bin/tests/optional/gsstest.c +++ b/bin/tests/optional/gsstest.c @@ -58,32 +58,28 @@ static dns_fixedname_t servername, gssname; -static isc_mem_t * mctx; +static isc_mem_t *mctx; static dns_requestmgr_t *requestmgr; -static isc_sockaddr_t address; +static isc_sockaddr_t address; static dns_tsig_keyring_t *ring; -static dns_tsigkey_t * tsigkey = NULL; -static gss_ctx_id_t gssctx; -static gss_ctx_id_t * gssctxp = &gssctx; +static dns_tsigkey_t *tsigkey = NULL; +static gss_ctx_id_t gssctx; +static gss_ctx_id_t *gssctxp = &gssctx; #define RUNCHECK(x) RUNTIME_CHECK((x) == ISC_R_SUCCESS) -#define PORT 53 +#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) -{ +console(isc_task_t *task, isc_event_t *event) { char buf[32]; - int c; + int c; isc_event_t *ev = NULL; @@ -117,14 +113,13 @@ console(isc_task_t *task, isc_event_t *event) } static void -recvresponse(isc_task_t *task, isc_event_t *event) -{ +recvresponse(isc_task_t *task, isc_event_t *event) { dns_requestevent_t *reqev = (dns_requestevent_t *)event; - isc_result_t result, result2; - dns_message_t * query = NULL, *response = NULL; - isc_buffer_t outtoken; - isc_buffer_t outbuf; - char output[10 * 1024]; + isc_result_t result, result2; + dns_message_t *query = NULL, *response = NULL; + isc_buffer_t outtoken; + isc_buffer_t outbuf; + char output[10 * 1024]; unsigned char array[DNS_NAME_MAXTEXT + 1]; isc_buffer_init(&outtoken, array, sizeof(array)); @@ -180,19 +175,18 @@ end: } static void -sendquery(isc_task_t *task, isc_event_t *event) -{ - dns_request_t * request = NULL; - dns_message_t * message = NULL; - dns_name_t * qname = NULL; +sendquery(isc_task_t *task, isc_event_t *event) { + dns_request_t *request = NULL; + dns_message_t *message = NULL; + dns_name_t *qname = NULL; dns_rdataset_t *qrdataset = NULL; - isc_result_t result; + isc_result_t result; dns_fixedname_t queryname; - isc_buffer_t buf; - isc_buffer_t outbuf; - char output[10 * 1024]; - static char host[256]; - int c; + isc_buffer_t buf; + isc_buffer_t outbuf; + char output[10 * 1024]; + static char host[256]; + int c; isc_event_free(&event); @@ -263,16 +257,15 @@ end: } static void -initctx2(isc_task_t *task, isc_event_t *event) -{ +initctx2(isc_task_t *task, isc_event_t *event) { dns_requestevent_t *reqev = (dns_requestevent_t *)event; - isc_result_t result; - dns_message_t * query = NULL, *response = NULL; - isc_buffer_t outtoken; - unsigned char array[DNS_NAME_MAXTEXT + 1]; - dns_rdataset_t * rdataset; - dns_rdatatype_t qtype; - dns_name_t * question_name; + isc_result_t result; + dns_message_t *query = NULL, *response = NULL; + isc_buffer_t outtoken; + unsigned char array[DNS_NAME_MAXTEXT + 1]; + dns_rdataset_t *rdataset; + dns_rdatatype_t qtype; + dns_name_t *question_name; UNUSED(task); @@ -345,15 +338,14 @@ end: } static void -initctx1(isc_task_t *task, isc_event_t *event) -{ - char gssid[512]; - char contextname[512]; - isc_result_t result; - isc_buffer_t buf; +initctx1(isc_task_t *task, isc_event_t *event) { + char gssid[512]; + char contextname[512]; + isc_result_t result; + isc_buffer_t buf; dns_message_t *query; dns_request_t *request; - int c; + int c; isc_event_free(&event); @@ -416,12 +408,11 @@ end: } static void -setup(void) -{ +setup(void) { for (;;) { - char serveraddress[512]; + char serveraddress[512]; struct in_addr inaddr; - int c; + int c; printf("Server IP => "); c = scanf("%511s", serveraddress); @@ -439,20 +430,19 @@ setup(void) } int -main(int argc, char *argv[]) -{ - isc_taskmgr_t * taskmgr; - isc_timermgr_t * timermgr; - isc_socketmgr_t * socketmgr; - isc_socket_t * sock; - unsigned int attrs, attrmask; - isc_sockaddr_t bind_any; - dns_dispatchmgr_t * dispatchmgr; - dns_dispatch_t * dispatchv4; - dns_view_t * view; - isc_task_t * task; - isc_log_t * lctx = NULL; - isc_logconfig_t * lcfg = NULL; +main(int argc, char *argv[]) { + isc_taskmgr_t *taskmgr; + isc_timermgr_t *timermgr; + isc_socketmgr_t *socketmgr; + isc_socket_t *sock; + unsigned int attrs, attrmask; + isc_sockaddr_t bind_any; + dns_dispatchmgr_t *dispatchmgr; + dns_dispatch_t *dispatchv4; + dns_view_t *view; + isc_task_t *task; + isc_log_t *lctx = NULL; + isc_logconfig_t *lcfg = NULL; isc_logdestination_t destination; UNUSED(argv); @@ -560,8 +550,7 @@ main(int argc, char *argv[]) } #else /* ifdef GSSAPI */ int -main(int argc, char *argv[]) -{ +main(int argc, char *argv[]) { UNUSED(argc); UNUSED(argv); fprintf(stderr, "R:GSSAPIONLY\n"); diff --git a/bin/tests/optional/inter_test.c b/bin/tests/optional/inter_test.c index 540d14d6e9..3d1ab921a7 100644 --- a/bin/tests/optional/inter_test.c +++ b/bin/tests/optional/inter_test.c @@ -19,14 +19,13 @@ #include int -main(int argc, char **argv) -{ - isc_mem_t * mctx = NULL; +main(int argc, char **argv) { + isc_mem_t *mctx = NULL; isc_interfaceiter_t *iter = NULL; - isc_interface_t ifdata; - isc_result_t result; - const char * res; - char buf[128]; + isc_interface_t ifdata; + isc_result_t result; + const char *res; + char buf[128]; UNUSED(argc); UNUSED(argv); diff --git a/bin/tests/optional/lex_test.c b/bin/tests/optional/lex_test.c index 17d07140a9..95aada0815 100644 --- a/bin/tests/optional/lex_test.c +++ b/bin/tests/optional/lex_test.c @@ -23,8 +23,7 @@ isc_lex_t *lex; isc_lexspecials_t specials; static void -print_token(isc_token_t *tokenp, FILE *stream) -{ +print_token(isc_token_t *tokenp, FILE *stream) { switch (tokenp->type) { case isc_tokentype_unknown: fprintf(stream, "UNKNOWN"); @@ -64,16 +63,15 @@ print_token(isc_token_t *tokenp, FILE *stream) } int -main(int argc, char *argv[]) -{ - isc_token_t token; +main(int argc, char *argv[]) { + isc_token_t token; isc_result_t result; - int quiet = 0; - int c; - int masterfile = 1; - int stats = 0; + int quiet = 0; + int c; + int masterfile = 1; + int stats = 0; unsigned int options = 0; - int done = 0; + int done = 0; while ((c = isc_commandline_parse(argc, argv, "qmcs")) != -1) { switch (c) { @@ -128,7 +126,8 @@ main(int argc, char *argv[]) while ((result = isc_lex_gettoken(lex, options, &token)) == ISC_R_SUCCESS && - !done) { + !done) + { if (!quiet) { char *name = isc_lex_getsourcename(lex); print_token(&token, stdout); diff --git a/bin/tests/optional/lfsr_test.c b/bin/tests/optional/lfsr_test.c index d282e6d67c..cd383b63fb 100644 --- a/bin/tests/optional/lfsr_test.c +++ b/bin/tests/optional/lfsr_test.c @@ -21,11 +21,10 @@ uint32_t state[1024 * 64]; int -main(int argc, char **argv) -{ +main(int argc, char **argv) { isc_lfsr_t lfsr1, lfsr2; - int i; - uint32_t temp; + int i; + uint32_t temp; UNUSED(argc); UNUSED(argv); diff --git a/bin/tests/optional/log_test.c b/bin/tests/optional/log_test.c index c22dcc461b..3fdd270546 100644 --- a/bin/tests/optional/log_test.c +++ b/bin/tests/optional/log_test.c @@ -21,8 +21,8 @@ #include -#define TEST_FILE "/tmp/test_log" -#define SYSLOG_FILE "/var/log/daemon.log" +#define TEST_FILE "/tmp/test_log" +#define SYSLOG_FILE "/var/log/daemon.log" #define FILE_VERSIONS 10 char usage[] = "Usage: %s [-m] [-s syslog_logfile] [-r file_versions]\n"; @@ -35,18 +35,17 @@ char usage[] = "Usage: %s [-m] [-s syslog_logfile] [-r file_versions]\n"; } int -main(int argc, char **argv) -{ - const char * progname, *syslog_file, *message; - int ch, i, file_versions, stderr_line; - bool show_final_mem = false; - isc_log_t * lctx; - isc_logconfig_t * lcfg; - isc_mem_t * mctx; - isc_result_t result; - isc_logdestination_t destination; +main(int argc, char **argv) { + const char *progname, *syslog_file, *message; + int ch, i, file_versions, stderr_line; + bool show_final_mem = false; + isc_log_t *lctx; + isc_logconfig_t *lcfg; + isc_mem_t *mctx; + isc_result_t result; + isc_logdestination_t destination; const isc_logcategory_t *category; - const isc_logmodule_t * module; + const isc_logmodule_t *module; progname = strrchr(*argv, '/'); if (progname != NULL) { @@ -70,7 +69,8 @@ main(int argc, char **argv) file_versions = atoi(isc_commandline_argument); if (file_versions < 0 && file_versions != ISC_LOG_ROLLNEVER && - file_versions != ISC_LOG_ROLLINFINITE) { + file_versions != ISC_LOG_ROLLINFINITE) + { fprintf(stderr, "%s: file rotations must be " "%d (ISC_LOG_ROLLNEVER),\n\t" diff --git a/bin/tests/optional/master_test.c b/bin/tests/optional/master_test.c index 27b2dfe4ff..50ced0fc7f 100644 --- a/bin/tests/optional/master_test.c +++ b/bin/tests/optional/master_test.c @@ -26,9 +26,8 @@ isc_mem_t *mctx; static isc_result_t -print_dataset(void *arg, const dns_name_t *owner, dns_rdataset_t *dataset) -{ - char buf[64 * 1024]; +print_dataset(void *arg, const dns_name_t *owner, dns_rdataset_t *dataset) { + char buf[64 * 1024]; isc_buffer_t target; isc_result_t result; @@ -48,13 +47,12 @@ print_dataset(void *arg, const dns_name_t *owner, dns_rdataset_t *dataset) } int -main(int argc, char *argv[]) -{ - isc_result_t result; - dns_name_t origin; - isc_buffer_t source; - isc_buffer_t target; - unsigned char name_buf[255]; +main(int argc, char *argv[]) { + isc_result_t result; + dns_name_t origin; + isc_buffer_t source; + isc_buffer_t target; + unsigned char name_buf[255]; dns_rdatacallbacks_t callbacks; UNUSED(argc); diff --git a/bin/tests/optional/mempool_test.c b/bin/tests/optional/mempool_test.c index 4c06dfba7e..485443c909 100644 --- a/bin/tests/optional/mempool_test.c +++ b/bin/tests/optional/mempool_test.c @@ -15,14 +15,13 @@ isc_mem_t *mctx; int -main(int argc, char *argv[]) -{ - void * items1[50]; - void * items2[50]; - void * tmp; +main(int argc, char *argv[]) { + void *items1[50]; + void *items2[50]; + void *tmp; isc_mempool_t *mp1, *mp2; - unsigned int i, j; - isc_mutex_t lock; + unsigned int i, j; + isc_mutex_t lock; UNUSED(argc); UNUSED(argv); diff --git a/bin/tests/optional/name_test.c b/bin/tests/optional/name_test.c index 7bbd82d4ef..06afedf938 100644 --- a/bin/tests/optional/name_test.c +++ b/bin/tests/optional/name_test.c @@ -21,8 +21,7 @@ #include static void -print_wirename(isc_region_t *name) -{ +print_wirename(isc_region_t *name) { unsigned char *ccurr, *cend; if (name->length == 0) { @@ -38,12 +37,11 @@ print_wirename(isc_region_t *name) } static void -print_name(dns_name_t *name) -{ +print_name(dns_name_t *name) { isc_result_t result; isc_buffer_t source; isc_region_t r; - char s[1000]; + char s[1000]; isc_buffer_init(&source, s, sizeof(s)); if (dns_name_countlabels(name) > 0) { @@ -64,29 +62,28 @@ print_name(dns_name_t *name) } int -main(int argc, char *argv[]) -{ - char s[1000]; - isc_result_t result; - dns_fixedname_t wname, wname2, oname, compname, downname; - isc_buffer_t source; - isc_region_t r; - dns_name_t * name, *comp, *down; +main(int argc, char *argv[]) { + char s[1000]; + isc_result_t result; + dns_fixedname_t wname, wname2, oname, compname, downname; + isc_buffer_t source; + isc_region_t r; + dns_name_t *name, *comp, *down; const dns_name_t *origin; - unsigned int downcase = 0; - size_t len; - bool quiet = false; - bool concatenate = false; - bool got_name = false; - bool check_absolute = false; - bool check_wildcard = false; - bool test_downcase = false; - bool inplace = false; - bool want_split = false; - unsigned int labels, split_label = 0; - dns_fixedname_t fprefix, fsuffix; - dns_name_t * prefix, *suffix; - int ch; + unsigned int downcase = 0; + size_t len; + bool quiet = false; + bool concatenate = false; + bool got_name = false; + bool check_absolute = false; + bool check_wildcard = false; + bool test_downcase = false; + bool inplace = false; + bool want_split = false; + unsigned int labels, split_label = 0; + dns_fixedname_t fprefix, fsuffix; + dns_name_t *prefix, *suffix; + int ch; while ((ch = isc_commandline_parse(argc, argv, "acdiqs:w")) != -1) { switch (ch) { @@ -301,8 +298,8 @@ main(int argc, char *argv[]) } if (comp != NULL && dns_name_countlabels(name) > 0) { - int order; - unsigned int nlabels; + int order; + unsigned int nlabels; dns_namereln_t namereln; namereln = dns_name_fullcompare(name, comp, &order, diff --git a/bin/tests/optional/nsecify.c b/bin/tests/optional/nsecify.c index 7d0f61d87f..c762003376 100644 --- a/bin/tests/optional/nsecify.c +++ b/bin/tests/optional/nsecify.c @@ -30,15 +30,13 @@ ISC_PLATFORM_NORETURN_PRE static inline void fatal(const char *message) ISC_PLATFORM_NORETURN_POST; static inline void -fatal(const char *message) -{ +fatal(const char *message) { fprintf(stderr, "%s\n", message); exit(1); } static inline void -check_result(isc_result_t result, const char *message) -{ +check_result(isc_result_t result, const char *message) { if (result != ISC_R_SUCCESS) { fprintf(stderr, "%s: %s\n", message, isc_result_totext(result)); exit(1); @@ -46,12 +44,11 @@ check_result(isc_result_t result, const char *message) } static inline bool -active_node(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node) -{ +active_node(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node) { dns_rdatasetiter_t *rdsiter; - bool active = false; - isc_result_t result; - dns_rdataset_t rdataset; + bool active = false; + isc_result_t result; + dns_rdataset_t rdataset; dns_rdataset_init(&rdataset); rdsiter = NULL; @@ -92,10 +89,9 @@ active_node(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node) static inline isc_result_t next_active(dns_db_t *db, dns_dbversion_t *version, dns_dbiterator_t *dbiter, - dns_name_t *name, dns_dbnode_t **nodep) -{ + dns_name_t *name, dns_dbnode_t **nodep) { isc_result_t result; - bool active; + bool active; do { active = false; @@ -113,19 +109,18 @@ next_active(dns_db_t *db, dns_dbversion_t *version, dns_dbiterator_t *dbiter, } static void -nsecify(char *filename) -{ - isc_result_t result; - dns_db_t * db; - dns_dbversion_t * wversion; - dns_dbnode_t * node, *nextnode; - const char * origintext; - dns_fixedname_t fname, fnextname; - dns_name_t * name, *nextname, *target; - isc_buffer_t b; - size_t len; +nsecify(char *filename) { + isc_result_t result; + dns_db_t *db; + dns_dbversion_t *wversion; + dns_dbnode_t *node, *nextnode; + const char *origintext; + dns_fixedname_t fname, fnextname; + dns_name_t *name, *nextname, *target; + isc_buffer_t b; + size_t len; dns_dbiterator_t *dbiter; - char newfilename[1024]; + char newfilename[1024]; name = dns_fixedname_initname(&fname); nextname = dns_fixedname_initname(&fnextname); @@ -199,8 +194,7 @@ nsecify(char *filename) } int -main(int argc, char *argv[]) -{ +main(int argc, char *argv[]) { int i; dns_result_register(); diff --git a/bin/tests/optional/ratelimiter_test.c b/bin/tests/optional/ratelimiter_test.c index 9667d6a6d4..03550b97e3 100644 --- a/bin/tests/optional/ratelimiter_test.c +++ b/bin/tests/optional/ratelimiter_test.c @@ -19,17 +19,14 @@ #include isc_ratelimiter_t *rlim = NULL; -isc_taskmgr_t * taskmgr = NULL; -isc_timermgr_t * timermgr = NULL; -isc_task_t * g_task = NULL; -isc_mem_t * mctx = NULL; +isc_taskmgr_t *taskmgr = NULL; +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; @@ -47,8 +44,7 @@ schedule_t schedule[] = { { 100, utick }, { 200, utick }, isc_timer_t *timers[NEVENTS]; static void -ltick(isc_task_t *task, isc_event_t *event) -{ +ltick(isc_task_t *task, isc_event_t *event) { UNUSED(task); printf("** ltick%s **\n", (event->ev_attributes & ISC_EVENTATTR_CANCELED) != 0 ? " (" @@ -59,8 +55,7 @@ ltick(isc_task_t *task, isc_event_t *event) } static void -utick(isc_task_t *task, isc_event_t *event) -{ +utick(isc_task_t *task, isc_event_t *event) { isc_result_t result; UNUSED(task); event->ev_action = ltick; @@ -70,8 +65,7 @@ utick(isc_task_t *task, isc_event_t *event) } static void -shutdown_rl(isc_task_t *task, isc_event_t *event) -{ +shutdown_rl(isc_task_t *task, isc_event_t *event) { UNUSED(task); UNUSED(event); printf("shutdown ratelimiter\n"); @@ -79,8 +73,7 @@ shutdown_rl(isc_task_t *task, isc_event_t *event) } static void -shutdown_all(isc_task_t *task, isc_event_t *event) -{ +shutdown_all(isc_task_t *task, isc_event_t *event) { int i; UNUSED(task); UNUSED(event); @@ -93,10 +86,9 @@ shutdown_all(isc_task_t *task, isc_event_t *event) } int -main(int argc, char *argv[]) -{ +main(int argc, char *argv[]) { isc_interval_t linterval; - int i; + int i; UNUSED(argc); UNUSED(argv); @@ -118,7 +110,7 @@ main(int argc, char *argv[]) for (i = 0; i < NEVENTS; i++) { isc_interval_t uinterval; - int ms = schedule[i].milliseconds; + int ms = schedule[i].milliseconds; isc_interval_set(&uinterval, ms / 1000, (ms % 1000) * 1000000); timers[i] = NULL; RUNTIME_CHECK(isc_timer_create(timermgr, isc_timertype_once, diff --git a/bin/tests/optional/rbt_test.c b/bin/tests/optional/rbt_test.c index b0d5ab0c16..edd8fac6eb 100644 --- a/bin/tests/optional/rbt_test.c +++ b/bin/tests/optional/rbt_test.c @@ -23,16 +23,15 @@ #include const char *progname; -isc_mem_t * mctx; +isc_mem_t *mctx; #define DNSNAMELEN 255 static dns_name_t * -create_name(char *s) -{ - int length; - isc_result_t result; - isc_buffer_t source, target; +create_name(char *s) { + int length; + isc_result_t result; + isc_buffer_t source, target; static dns_name_t *name; if (s == NULL || *s == '\0') { @@ -72,8 +71,7 @@ create_name(char *s) } static void -delete_name(void *data, void *arg) -{ +delete_name(void *data, void *arg) { dns_name_t *name; UNUSED(arg); @@ -82,10 +80,9 @@ delete_name(void *data, void *arg) } static void -print_name(dns_name_t *name) -{ +print_name(dns_name_t *name) { isc_buffer_t target; - char buffer[1024]; + char buffer[1024]; isc_buffer_init(&target, buffer, sizeof(buffer)); @@ -98,14 +95,13 @@ print_name(dns_name_t *name) } static void -detail(dns_rbt_t *rbt, dns_name_t *name) -{ - dns_name_t * foundname, *origin, *fullname; - dns_fixedname_t fixedfoundname, fixedorigin, fixedfullname; - dns_rbtnode_t * node1, *node2; +detail(dns_rbt_t *rbt, dns_name_t *name) { + dns_name_t *foundname, *origin, *fullname; + dns_fixedname_t fixedfoundname, fixedorigin, fixedfullname; + dns_rbtnode_t *node1, *node2; dns_rbtnodechain_t chain; - isc_result_t result; - bool nodes_should_match = false; + isc_result_t result; + bool nodes_should_match = false; dns_rbtnodechain_init(&chain); @@ -155,8 +151,8 @@ detail(dns_rbt_t *rbt, dns_name_t *name) if (result == ISC_R_SUCCESS) { printf("\n name from dns_rbtnodechain_current: "); - result = - dns_name_concatenate(foundname, origin, fullname, NULL); + result = dns_name_concatenate(foundname, origin, fullname, + NULL); if (result == ISC_R_SUCCESS) { print_name(fullname); } else { @@ -181,12 +177,11 @@ detail(dns_rbt_t *rbt, dns_name_t *name) } static void -iterate(dns_rbt_t *rbt, bool forward) -{ - dns_name_t foundname, *origin; +iterate(dns_rbt_t *rbt, bool forward) { + dns_name_t foundname, *origin; dns_rbtnodechain_t chain; - dns_fixedname_t fixedorigin; - isc_result_t result; + dns_fixedname_t fixedorigin; + isc_result_t result; isc_result_t (*move)(dns_rbtnodechain_t * chain, dns_name_t * name, dns_name_t * origin); @@ -199,8 +194,8 @@ iterate(dns_rbt_t *rbt, bool forward) printf("iterating forward\n"); move = dns_rbtnodechain_next; - result = - dns_rbtnodechain_first(&chain, rbt, &foundname, origin); + result = dns_rbtnodechain_first(&chain, rbt, &foundname, + origin); } else { printf("iterating backward\n"); move = dns_rbtnodechain_prev; @@ -241,17 +236,16 @@ iterate(dns_rbt_t *rbt, bool forward) printf("... %s\n", dns_result_totext(r)); int -main(int argc, char **argv) -{ - char * command, *arg, buffer[1024]; - const char * whitespace; - dns_name_t * name, *foundname; +main(int argc, char **argv) { + char *command, *arg, buffer[1024]; + const char *whitespace; + dns_name_t *name, *foundname; dns_fixedname_t fixedname; - dns_rbt_t * rbt = NULL; - int length, ch; - bool show_final_mem = false; - isc_result_t result; - void * data; + dns_rbt_t *rbt = NULL; + int length, ch; + bool show_final_mem = false; + isc_result_t result; + void *data; progname = strrchr(*argv, '/'); if (progname != NULL) { diff --git a/bin/tests/optional/rwlock_test.c b/bin/tests/optional/rwlock_test.c index 33eae38afe..587f025ae5 100644 --- a/bin/tests/optional/rwlock_test.c +++ b/bin/tests/optional/rwlock_test.c @@ -29,8 +29,7 @@ static isc_threadresult_t #ifdef WIN32 WINAPI #endif /* ifdef WIN32 */ - run1(void *arg) -{ + run1(void *arg) { char *message = arg; RUNTIME_CHECK(isc_rwlock_lock(&lock, isc_rwlocktype_read) == @@ -61,8 +60,7 @@ static isc_threadresult_t #ifdef WIN32 WINAPI #endif /* ifdef WIN32 */ - run2(void *arg) -{ + run2(void *arg) { char *message = arg; RUNTIME_CHECK(isc_rwlock_lock(&lock, isc_rwlocktype_write) == @@ -90,13 +88,12 @@ static isc_threadresult_t } int -main(int argc, char *argv[]) -{ +main(int argc, char *argv[]) { unsigned int nworkers; unsigned int i; isc_thread_t workers[100]; - char name[100]; - void * dupname; + char name[100]; + void *dupname; if (argc > 1) { nworkers = atoi(argv[1]); diff --git a/bin/tests/optional/serial_test.c b/bin/tests/optional/serial_test.c index 8780f2aa26..bd901fdd86 100644 --- a/bin/tests/optional/serial_test.c +++ b/bin/tests/optional/serial_test.c @@ -17,11 +17,10 @@ #include int -main() -{ +main() { uint32_t a, b; - char buf[1024]; - char * s, *e; + char buf[1024]; + char *s, *e; while (fgets(buf, sizeof(buf), stdin) != NULL) { buf[sizeof(buf) - 1] = '\0'; diff --git a/bin/tests/optional/shutdown_test.c b/bin/tests/optional/shutdown_test.c index c1f62354ea..234b8867be 100644 --- a/bin/tests/optional/shutdown_test.c +++ b/bin/tests/optional/shutdown_test.c @@ -23,28 +23,27 @@ #include typedef struct { - isc_mem_t * mctx; - isc_task_t * task; + isc_mem_t *mctx; + isc_task_t *task; isc_timer_t *timer; unsigned int ticks; - char name[16]; - bool exiting; - isc_task_t * peer; + char name[16]; + bool exiting; + isc_task_t *peer; } t_info; -#define MAX_TASKS 3 -#define T2_SHUTDOWNOK (ISC_EVENTCLASS(1024) + 0) +#define MAX_TASKS 3 +#define T2_SHUTDOWNOK (ISC_EVENTCLASS(1024) + 0) #define T2_SHUTDOWNDONE (ISC_EVENTCLASS(1024) + 1) -#define FOO_EVENT (ISC_EVENTCLASS(1024) + 2) +#define FOO_EVENT (ISC_EVENTCLASS(1024) + 2) -static t_info tasks[MAX_TASKS]; -static unsigned int task_count; -static isc_taskmgr_t * task_manager; +static t_info tasks[MAX_TASKS]; +static unsigned int task_count; +static isc_taskmgr_t *task_manager; static isc_timermgr_t *timer_manager; static void -t1_shutdown(isc_task_t *task, isc_event_t *event) -{ +t1_shutdown(isc_task_t *task, isc_event_t *event) { t_info *info = event->ev_arg; printf("task %s (%p) t1_shutdown\n", info->name, task); @@ -53,8 +52,7 @@ t1_shutdown(isc_task_t *task, isc_event_t *event) } static void -t2_shutdown(isc_task_t *task, isc_event_t *event) -{ +t2_shutdown(isc_task_t *task, isc_event_t *event) { t_info *info = event->ev_arg; printf("task %s (%p) t2_shutdown\n", info->name, task); @@ -63,9 +61,8 @@ t2_shutdown(isc_task_t *task, isc_event_t *event) } static void -shutdown_action(isc_task_t *task, isc_event_t *event) -{ - t_info * info = event->ev_arg; +shutdown_action(isc_task_t *task, isc_event_t *event) { + t_info *info = event->ev_arg; isc_event_t *nevent; INSIST(event->ev_type == ISC_TASKEVENT_SHUTDOWN); @@ -84,16 +81,14 @@ shutdown_action(isc_task_t *task, isc_event_t *event) } static void -foo_event(isc_task_t *task, isc_event_t *event) -{ +foo_event(isc_task_t *task, isc_event_t *event) { printf("task(%p) foo\n", task); isc_event_free(&event); } static void -tick(isc_task_t *task, isc_event_t *event) -{ - t_info * info = event->ev_arg; +tick(isc_task_t *task, isc_event_t *event) { + t_info *info = event->ev_arg; isc_event_t *nevent; INSIST(event->ev_type == ISC_TIMEREVENT_TICK); @@ -126,10 +121,9 @@ tick(isc_task_t *task, isc_event_t *event) } static t_info * -new_task(isc_mem_t *mctx, const char *name) -{ - t_info * ti; - isc_time_t expires; +new_task(isc_mem_t *mctx, const char *name) { + t_info *ti; + isc_time_t expires; isc_interval_t interval; RUNTIME_CHECK(task_count < MAX_TASKS); @@ -161,12 +155,11 @@ new_task(isc_mem_t *mctx, const char *name) } int -main(int argc, char *argv[]) -{ +main(int argc, char *argv[]) { unsigned int workers; - t_info * t1, *t2; - isc_task_t * task; - isc_mem_t * mctx, *mctx2; + t_info *t1, *t2; + isc_task_t *task; + isc_mem_t *mctx, *mctx2; RUNTIME_CHECK(isc_app_start() == ISC_R_SUCCESS); diff --git a/bin/tests/optional/sig0_test.c b/bin/tests/optional/sig0_test.c index 91acb36ddd..9efcc70b1e 100644 --- a/bin/tests/optional/sig0_test.c +++ b/bin/tests/optional/sig0_test.c @@ -51,24 +51,23 @@ } \ } -isc_mutex_t lock; -dst_key_t * key; -isc_mem_t * mctx; -unsigned char qdata[1024], rdata[1024]; -isc_buffer_t qbuffer, rbuffer; -isc_taskmgr_t * taskmgr; -isc_task_t * task1; -isc_log_t * lctx = NULL; -isc_logconfig_t * logconfig = NULL; -isc_socket_t * s; -isc_sockaddr_t address; -char output[10 * 1024]; -isc_buffer_t outbuf; +isc_mutex_t lock; +dst_key_t *key; +isc_mem_t *mctx; +unsigned char qdata[1024], rdata[1024]; +isc_buffer_t qbuffer, rbuffer; +isc_taskmgr_t *taskmgr; +isc_task_t *task1; +isc_log_t *lctx = NULL; +isc_logconfig_t *logconfig = NULL; +isc_socket_t *s; +isc_sockaddr_t address; +char output[10 * 1024]; +isc_buffer_t outbuf; static const dns_master_style_t *style = &dns_master_style_debug; static void -senddone(isc_task_t *task, isc_event_t *event) -{ +senddone(isc_task_t *task, isc_event_t *event) { isc_socketevent_t *sevent = (isc_socketevent_t *)event; REQUIRE(sevent != NULL); @@ -81,12 +80,11 @@ senddone(isc_task_t *task, isc_event_t *event) } static void -recvdone(isc_task_t *task, isc_event_t *event) -{ +recvdone(isc_task_t *task, isc_event_t *event) { isc_socketevent_t *sevent = (isc_socketevent_t *)event; - isc_buffer_t source; - isc_result_t result; - dns_message_t * response; + isc_buffer_t source; + isc_result_t result; + dns_message_t *response; REQUIRE(sevent != NULL); REQUIRE(sevent->ev_type == ISC_SOCKEVENT_RECVDONE); @@ -120,18 +118,17 @@ recvdone(isc_task_t *task, isc_event_t *event) } static void -buildquery(void) -{ - isc_result_t result; +buildquery(void) { + isc_result_t result; dns_rdataset_t *question = NULL; - dns_name_t * qname = NULL; - isc_region_t r, inr; - dns_message_t * query; - char nametext[] = "host.example"; - isc_buffer_t namesrc, namedst; - unsigned char namedata[256]; - isc_sockaddr_t sa; - dns_compress_t cctx; + dns_name_t *qname = NULL; + isc_region_t r, inr; + dns_message_t *query; + char nametext[] = "host.example"; + isc_buffer_t namesrc, namedst; + unsigned char namedata[256]; + isc_sockaddr_t sa; + dns_compress_t cctx; query = NULL; result = dns_message_create(mctx, DNS_MESSAGE_INTENTRENDER, &query); @@ -181,8 +178,8 @@ buildquery(void) isc_sockaddr_any(&sa); result = isc_socket_bind(s, &sa, 0); CHECK("isc_socket_bind", result); - result = - isc_socket_sendto(s, &r, task1, senddone, NULL, &address, NULL); + result = isc_socket_sendto(s, &r, task1, senddone, NULL, &address, + NULL); CHECK("isc_socket_sendto", result); inr.base = rdata; @@ -193,18 +190,17 @@ buildquery(void) } int -main(int argc, char *argv[]) -{ - bool verbose = false; +main(int argc, char *argv[]) { + bool verbose = false; isc_socketmgr_t *socketmgr; - isc_timermgr_t * timermgr; - struct in_addr inaddr; - dns_fixedname_t fname; - dns_name_t * name; - isc_buffer_t b; - int ch; - isc_result_t result; - in_port_t port = 53; + isc_timermgr_t *timermgr; + struct in_addr inaddr; + dns_fixedname_t fname; + dns_name_t *name; + isc_buffer_t b; + int ch; + isc_result_t result; + in_port_t port = 53; RUNTIME_CHECK(isc_app_start() == ISC_R_SUCCESS); diff --git a/bin/tests/optional/sock_test.c b/bin/tests/optional/sock_test.c index 61891c694d..4cdec293bd 100644 --- a/bin/tests/optional/sock_test.c +++ b/bin/tests/optional/sock_test.c @@ -21,12 +21,11 @@ #include #include -isc_mem_t * mctx; +isc_mem_t *mctx; isc_taskmgr_t *manager; static void -my_shutdown(isc_task_t *task, isc_event_t *event) -{ +my_shutdown(isc_task_t *task, isc_event_t *event) { char *name = event->ev_arg; printf("shutdown %s (%p)\n", name, task); @@ -35,9 +34,8 @@ my_shutdown(isc_task_t *task, isc_event_t *event) } static void -my_send(isc_task_t *task, isc_event_t *event) -{ - isc_socket_t * sock; +my_send(isc_task_t *task, isc_event_t *event) { + isc_socket_t *sock; isc_socketevent_t *dev; sock = event->ev_sender; @@ -61,13 +59,12 @@ my_send(isc_task_t *task, isc_event_t *event) } static void -my_recv(isc_task_t *task, isc_event_t *event) -{ - isc_socket_t * sock; +my_recv(isc_task_t *task, isc_event_t *event) { + isc_socket_t *sock; isc_socketevent_t *dev; - isc_region_t region; - char buf[1024]; - char host[256]; + isc_region_t region; + char buf[1024]; + char host[256]; sock = event->ev_sender; dev = (isc_socketevent_t *)event; @@ -124,9 +121,8 @@ my_recv(isc_task_t *task, isc_event_t *event) } static void -my_http_get(isc_task_t *task, isc_event_t *event) -{ - isc_socket_t * sock; +my_http_get(isc_task_t *task, isc_event_t *event) { + isc_socket_t *sock; isc_socketevent_t *dev; sock = event->ev_sender; @@ -153,12 +149,11 @@ my_http_get(isc_task_t *task, isc_event_t *event) } static void -my_connect(isc_task_t *task, isc_event_t *event) -{ - isc_socket_t * sock; +my_connect(isc_task_t *task, isc_event_t *event) { + isc_socket_t *sock; isc_socket_connev_t *dev; - isc_region_t region; - char buf[1024]; + isc_region_t region; + char buf[1024]; sock = event->ev_sender; dev = (isc_socket_connev_t *)event; @@ -192,13 +187,12 @@ my_connect(isc_task_t *task, isc_event_t *event) } static void -my_listen(isc_task_t *task, isc_event_t *event) -{ - char * name = event->ev_arg; +my_listen(isc_task_t *task, isc_event_t *event) { + char *name = event->ev_arg; isc_socket_newconnev_t *dev; - isc_region_t region; - isc_socket_t * oldsock; - isc_task_t * newtask; + isc_region_t region; + isc_socket_t *oldsock; + isc_task_t *newtask; dev = (isc_socket_newconnev_t *)event; @@ -242,8 +236,7 @@ my_listen(isc_task_t *task, isc_event_t *event) } static void -timeout(isc_task_t *task, isc_event_t *event) -{ +timeout(isc_task_t *task, isc_event_t *event) { isc_socket_t *sock = event->ev_arg; printf("Timeout, canceling IO on socket %p (task %p)\n", sock, task); @@ -259,21 +252,20 @@ static char xso1[] = "so1"; static char xso2[] = "so2"; int -main(int argc, char *argv[]) -{ - isc_task_t * t1, *t2; - isc_timermgr_t * timgr; - isc_time_t expires; - isc_interval_t interval; - isc_timer_t * ti1; - unsigned int workers; +main(int argc, char *argv[]) { + isc_task_t *t1, *t2; + isc_timermgr_t *timgr; + isc_time_t expires; + isc_interval_t interval; + isc_timer_t *ti1; + unsigned int workers; isc_socketmgr_t *socketmgr; - isc_socket_t * so1, *so2; - isc_sockaddr_t sockaddr; - struct in_addr ina; - struct in6_addr in6a; - isc_result_t result; - int pf; + isc_socket_t *so1, *so2; + isc_sockaddr_t sockaddr; + struct in_addr ina; + struct in6_addr in6a; + isc_result_t result; + int pf; if (argc > 1) { workers = atoi(argv[1]); diff --git a/bin/tests/optional/sym_test.c b/bin/tests/optional/sym_test.c index b3d710a0ce..3221892907 100644 --- a/bin/tests/optional/sym_test.c +++ b/bin/tests/optional/sym_test.c @@ -18,12 +18,11 @@ #include #include -isc_mem_t * mctx; +isc_mem_t *mctx; isc_symtab_t *st; static void -undefine_action(char *key, unsigned int type, isc_symvalue_t value, void *arg) -{ +undefine_action(char *key, unsigned int type, isc_symvalue_t value, void *arg) { UNUSED(arg); INSIST(type == 1); @@ -32,16 +31,15 @@ undefine_action(char *key, unsigned int type, isc_symvalue_t value, void *arg) } int -main(int argc, char *argv[]) -{ - char s[1000], *cp, *key; - size_t len; - isc_result_t result; - isc_symvalue_t value; - int trace = 0; - int c; +main(int argc, char *argv[]) { + char s[1000], *cp, *key; + size_t len; + isc_result_t result; + isc_symvalue_t value; + int trace = 0; + int c; isc_symexists_t exists_policy = isc_symexists_reject; - bool case_sensitive = false; + bool case_sensitive = false; while ((c = isc_commandline_parse(argc, argv, "tarc")) != -1) { switch (c) { diff --git a/bin/tests/optional/task_test.c b/bin/tests/optional/task_test.c index 1a3410fea8..68adfbb497 100644 --- a/bin/tests/optional/task_test.c +++ b/bin/tests/optional/task_test.c @@ -22,9 +22,8 @@ isc_mem_t *mctx = NULL; static void -my_callback(isc_task_t *task, isc_event_t *event) -{ - int i, j; +my_callback(isc_task_t *task, isc_event_t *event) { + int i, j; char *name = event->ev_arg; j = 0; @@ -36,8 +35,7 @@ my_callback(isc_task_t *task, isc_event_t *event) } static void -my_shutdown(isc_task_t *task, isc_event_t *event) -{ +my_shutdown(isc_task_t *task, isc_event_t *event) { char *name = event->ev_arg; printf("shutdown %s (%p)\n", name, task); @@ -45,8 +43,7 @@ my_shutdown(isc_task_t *task, isc_event_t *event) } static void -my_tick(isc_task_t *task, isc_event_t *event) -{ +my_tick(isc_task_t *task, isc_event_t *event) { char *name = event->ev_arg; printf("task %p tick %s\n", task, name); @@ -61,15 +58,14 @@ static char foo[] = "foo"; static char bar[] = "bar"; int -main(int argc, char *argv[]) -{ - isc_taskmgr_t * manager = NULL; - isc_task_t * t1 = NULL, *t2 = NULL; - isc_task_t * t3 = NULL, *t4 = NULL; - isc_event_t * event; - unsigned int workers; - isc_timermgr_t * timgr; - isc_timer_t * ti1, *ti2; +main(int argc, char *argv[]) { + isc_taskmgr_t *manager = NULL; + isc_task_t *t1 = NULL, *t2 = NULL; + isc_task_t *t3 = NULL, *t4 = NULL; + isc_event_t *event; + unsigned int workers; + isc_timermgr_t *timgr; + isc_timer_t *ti1, *ti2; struct isc_interval interval; if (argc > 1) { diff --git a/bin/tests/optional/timer_test.c b/bin/tests/optional/timer_test.c index 98784cf7ad..39dc84093b 100644 --- a/bin/tests/optional/timer_test.c +++ b/bin/tests/optional/timer_test.c @@ -20,14 +20,13 @@ #include #include -isc_mem_t * mctx1, *mctx2, *mctx3; -isc_task_t * t1, *t2, *t3; +isc_mem_t *mctx1, *mctx2, *mctx3; +isc_task_t *t1, *t2, *t3; isc_timer_t *ti1, *ti2, *ti3; -int tick_count = 0; +int tick_count = 0; static void -shutdown_task(isc_task_t *task, isc_event_t *event) -{ +shutdown_task(isc_task_t *task, isc_event_t *event) { char *name = event->ev_arg; printf("task %p shutdown %s\n", task, name); @@ -35,8 +34,7 @@ shutdown_task(isc_task_t *task, isc_event_t *event) } static void -tick(isc_task_t *task, isc_event_t *event) -{ +tick(isc_task_t *task, isc_event_t *event) { char *name = event->ev_arg; INSIST(event->ev_type == ISC_TIMEREVENT_TICK); @@ -49,7 +47,7 @@ tick(isc_task_t *task, isc_event_t *event) } if (ti3 != NULL && tick_count == 7) { - isc_time_t expires; + isc_time_t expires; isc_interval_t interval; isc_interval_set(&interval, 5, 0); @@ -65,9 +63,8 @@ tick(isc_task_t *task, isc_event_t *event) } static void -timeout(isc_task_t *task, isc_event_t *event) -{ - char * name = event->ev_arg; +timeout(isc_task_t *task, isc_event_t *event) { + char *name = event->ev_arg; const char *type; INSIST(event->ev_type == ISC_TIMEREVENT_IDLE || @@ -95,13 +92,12 @@ static char two[] = "2"; static char three[] = "3"; int -main(int argc, char *argv[]) -{ - isc_taskmgr_t * manager = NULL; +main(int argc, char *argv[]) { + isc_taskmgr_t *manager = NULL; isc_timermgr_t *timgr = NULL; - unsigned int workers; - isc_time_t expires, now; - isc_interval_t interval; + unsigned int workers; + isc_time_t expires, now; + isc_interval_t interval; if (argc > 1) { workers = atoi(argv[1]); diff --git a/bin/tests/optional/zone_test.c b/bin/tests/optional/zone_test.c index 2a343b5ae5..e87a007f13 100644 --- a/bin/tests/optional/zone_test.c +++ b/bin/tests/optional/zone_test.c @@ -34,17 +34,17 @@ #include #include -static int debug = 0; -static int quiet = 0; -static int stats = 0; +static int debug = 0; +static int quiet = 0; +static int stats = 0; static isc_mem_t *mctx = NULL; -dns_zone_t * zone = NULL; -isc_taskmgr_t * taskmgr = NULL; -isc_timermgr_t * timermgr = NULL; -isc_socketmgr_t * socketmgr = NULL; -dns_zonemgr_t * zonemgr = NULL; -dns_zonetype_t zonetype = dns_zone_master; -isc_sockaddr_t addr; +dns_zone_t *zone = NULL; +isc_taskmgr_t *taskmgr = NULL; +isc_timermgr_t *timermgr = NULL; +isc_socketmgr_t *socketmgr = NULL; +dns_zonemgr_t *zonemgr = NULL; +dns_zonetype_t zonetype = dns_zone_master; +isc_sockaddr_t addr; #define ERRRET(result, function) \ do { \ @@ -64,23 +64,21 @@ isc_sockaddr_t addr; (void)NULL static void -usage(void) -{ +usage(void) { fprintf(stderr, "usage: zone_test [-dqsSM] [-c class] [-f file] " "zone\n"); exit(1); } static void -setup(const char *zonename, const char *filename, const char *classname) -{ - isc_result_t result; - dns_rdataclass_t rdclass; +setup(const char *zonename, const char *filename, const char *classname) { + isc_result_t result; + dns_rdataclass_t rdclass; isc_consttextregion_t region; - isc_buffer_t buffer; - dns_fixedname_t fixorigin; - dns_name_t * origin; - const char * rbt = "rbt"; + isc_buffer_t buffer; + dns_fixedname_t fixorigin; + dns_name_t *origin; + const char *rbt = "rbt"; if (debug) { fprintf(stderr, "loading \"%s\" from \"%s\" class \"%s\"\n", @@ -128,10 +126,9 @@ setup(const char *zonename, const char *filename, const char *classname) } static void -print_rdataset(dns_name_t *name, dns_rdataset_t *rdataset) -{ +print_rdataset(dns_name_t *name, dns_rdataset_t *rdataset) { isc_buffer_t text; - char t[1000]; + char t[1000]; isc_result_t result; isc_region_t r; @@ -146,17 +143,16 @@ print_rdataset(dns_name_t *name, dns_rdataset_t *rdataset) } static void -query(void) -{ - char buf[1024]; +query(void) { + char buf[1024]; dns_fixedname_t name; dns_fixedname_t found; - dns_db_t * db; - isc_buffer_t buffer; - isc_result_t result; - dns_rdataset_t rdataset; - dns_rdataset_t sigset; - fd_set rfdset = { { 0 } }; + dns_db_t *db; + isc_buffer_t buffer; + isc_result_t result; + dns_rdataset_t rdataset; + dns_rdataset_t sigset; + fd_set rfdset = { { 0 } }; db = NULL; result = dns_zone_getdb(zone, &db); @@ -237,10 +233,9 @@ query(void) } int -main(int argc, char **argv) -{ - int c; - char * filename = NULL; +main(int argc, char **argv) { + int c; + char *filename = NULL; const char *classname = "IN"; while ((c = isc_commandline_parse(argc, argv, "cdf:m:qsMS")) != EOF) { diff --git a/bin/tests/pkcs11/benchmarks/create.c b/bin/tests/pkcs11/benchmarks/create.c index 79de82cf82..f937e22d31 100644 --- a/bin/tests/pkcs11/benchmarks/create.c +++ b/bin/tests/pkcs11/benchmarks/create.c @@ -61,14 +61,12 @@ #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) -{ +clock_gettime(int32_t id, struct timespec *tp) { struct timeval tv; - int result; + int result; UNUSED(id); @@ -82,36 +80,35 @@ clock_gettime(int32_t id, struct timespec *tp) #endif /* ifndef HAVE_CLOCK_GETTIME */ CK_BYTE buf[1024]; -char label[16]; +char label[16]; static CK_BBOOL truevalue = TRUE; static CK_BBOOL falsevalue = FALSE; int -main(int argc, char *argv[]) -{ - isc_result_t result; - CK_RV rv; - CK_SLOT_ID slot = 0; +main(int argc, char *argv[]) { + isc_result_t result; + CK_RV rv; + CK_SLOT_ID slot = 0; CK_SESSION_HANDLE hSession = CK_INVALID_HANDLE; CK_OBJECT_HANDLE *hKey; - CK_OBJECT_CLASS kClass = CKO_DATA; - CK_ULONG len = sizeof(buf); - CK_ATTRIBUTE kTemplate[] = { - { CKA_CLASS, &kClass, (CK_ULONG)sizeof(kClass) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_LABEL, (CK_BYTE_PTR)label, (CK_ULONG)sizeof(label) }, - { CKA_VALUE, buf, (CK_ULONG)sizeof(buf) } + CK_OBJECT_CLASS kClass = CKO_DATA; + CK_ULONG len = sizeof(buf); + CK_ATTRIBUTE kTemplate[] = { + { CKA_CLASS, &kClass, (CK_ULONG)sizeof(kClass) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_LABEL, (CK_BYTE_PTR)label, (CK_ULONG)sizeof(label) }, + { CKA_VALUE, buf, (CK_ULONG)sizeof(buf) } }; - pk11_context_t pctx; - char * lib_name = NULL; - char * pin = NULL; - int error = 0; - int c, errflg = 0; - int ontoken = 0; - unsigned int count = 1000; - unsigned int i; + pk11_context_t pctx; + char *lib_name = NULL; + char *pin = NULL; + int error = 0; + int c, errflg = 0; + int ontoken = 0; + unsigned int count = 1000; + unsigned int i; struct timespec starttime; struct timespec endtime; @@ -176,7 +173,8 @@ main(int argc, char *argv[]) (const char *)pin, slot); if ((result != ISC_R_SUCCESS) && (result != PK11_R_NORANDOMSERVICE) && (result != PK11_R_NODIGESTSERVICE) && - (result != PK11_R_NOAESSERVICE)) { + (result != PK11_R_NOAESSERVICE)) + { fprintf(stderr, "Error initializing PKCS#11: %s\n", isc_result_totext(result)); exit(1); diff --git a/bin/tests/pkcs11/benchmarks/find.c b/bin/tests/pkcs11/benchmarks/find.c index 1c1114b13a..a098cc42a7 100644 --- a/bin/tests/pkcs11/benchmarks/find.c +++ b/bin/tests/pkcs11/benchmarks/find.c @@ -61,14 +61,12 @@ #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) -{ +clock_gettime(int32_t id, struct timespec *tp) { struct timeval tv; - int result; + int result; UNUSED(id); @@ -84,27 +82,26 @@ clock_gettime(int32_t id, struct timespec *tp) CK_BYTE label[] = "foo??bar!!"; int -main(int argc, char *argv[]) -{ - isc_result_t result; - CK_RV rv; - CK_SLOT_ID slot = 0; +main(int argc, char *argv[]) { + isc_result_t result; + CK_RV rv; + CK_SLOT_ID slot = 0; CK_SESSION_HANDLE hSession = CK_INVALID_HANDLE; - CK_ATTRIBUTE sTemplate[] = { - { CKA_LABEL, label, (CK_ULONG)sizeof(label) }, + CK_ATTRIBUTE sTemplate[] = { + { CKA_LABEL, label, (CK_ULONG)sizeof(label) }, }; CK_OBJECT_HANDLE sKey = CK_INVALID_HANDLE; - CK_ULONG found = 0; - pk11_context_t pctx; - pk11_optype_t op_type = OP_RSA; - char * lib_name = NULL; - char * pin = NULL; - int error = 0; - int c, errflg = 0; - unsigned int count = 1000; - unsigned int i; - struct timespec starttime; - struct timespec endtime; + CK_ULONG found = 0; + pk11_context_t pctx; + pk11_optype_t op_type = OP_RSA; + char *lib_name = NULL; + char *pin = NULL; + int error = 0; + int c, errflg = 0; + unsigned int count = 1000; + unsigned int i; + struct timespec starttime; + struct timespec endtime; while ((c = isc_commandline_parse(argc, argv, ":m:s:p:n:")) != -1) { switch (c) { @@ -156,7 +153,8 @@ main(int argc, char *argv[]) (const char *)pin, slot); if ((result != ISC_R_SUCCESS) && (result != PK11_R_NORANDOMSERVICE) && (result != PK11_R_NODIGESTSERVICE) && - (result != PK11_R_NOAESSERVICE)) { + (result != PK11_R_NOAESSERVICE)) + { fprintf(stderr, "Error initializing PKCS#11: %s\n", isc_result_totext(result)); exit(1); diff --git a/bin/tests/pkcs11/benchmarks/genrsa.c b/bin/tests/pkcs11/benchmarks/genrsa.c index c827fb8859..2707ec13a9 100644 --- a/bin/tests/pkcs11/benchmarks/genrsa.c +++ b/bin/tests/pkcs11/benchmarks/genrsa.c @@ -61,14 +61,12 @@ #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) -{ +clock_gettime(int32_t id, struct timespec *tp) { struct timeval tv; - int result; + int result; UNUSED(id); @@ -85,28 +83,27 @@ static CK_BBOOL truevalue = TRUE; static CK_BBOOL falsevalue = FALSE; int -main(int argc, char *argv[]) -{ - isc_result_t result; - CK_RV rv; - CK_SLOT_ID slot = 0; +main(int argc, char *argv[]) { + isc_result_t result; + CK_RV rv; + CK_SLOT_ID slot = 0; CK_SESSION_HANDLE hSession = CK_INVALID_HANDLE; - CK_MECHANISM mech = { CKM_RSA_PKCS_KEY_PAIR_GEN, NULL, 0 }; + CK_MECHANISM mech = { CKM_RSA_PKCS_KEY_PAIR_GEN, NULL, 0 }; CK_OBJECT_HANDLE *pubKey; CK_OBJECT_HANDLE *privKey; - CK_OBJECT_CLASS pubClass = CKO_PUBLIC_KEY; - CK_OBJECT_CLASS privClass = CKO_PRIVATE_KEY; - CK_KEY_TYPE kType = CKK_RSA; - CK_ULONG bits = 1024; - CK_BYTE exponent[] = { 0x01, 0x00, 0x01 }; - CK_ATTRIBUTE pubTemplate[] = { - { CKA_CLASS, &pubClass, (CK_ULONG)sizeof(pubClass) }, - { CKA_KEY_TYPE, &kType, (CK_ULONG)sizeof(kType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_MODULUS_BITS, &bits, (CK_ULONG)sizeof(bits) }, - { CKA_PUBLIC_EXPONENT, exponent, (CK_ULONG)sizeof(exponent) } + CK_OBJECT_CLASS pubClass = CKO_PUBLIC_KEY; + CK_OBJECT_CLASS privClass = CKO_PRIVATE_KEY; + CK_KEY_TYPE kType = CKK_RSA; + CK_ULONG bits = 1024; + CK_BYTE exponent[] = { 0x01, 0x00, 0x01 }; + CK_ATTRIBUTE pubTemplate[] = { + { CKA_CLASS, &pubClass, (CK_ULONG)sizeof(pubClass) }, + { CKA_KEY_TYPE, &kType, (CK_ULONG)sizeof(kType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_MODULUS_BITS, &bits, (CK_ULONG)sizeof(bits) }, + { CKA_PUBLIC_EXPONENT, exponent, (CK_ULONG)sizeof(exponent) } }; CK_ATTRIBUTE privTemplate[] = { { CKA_CLASS, &privClass, (CK_ULONG)sizeof(privClass) }, @@ -115,15 +112,15 @@ main(int argc, char *argv[]) { CKA_PRIVATE, &truevalue, (CK_ULONG)sizeof(truevalue) }, { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) }, }; - pk11_context_t pctx; - pk11_optype_t op_type = OP_RSA; - char * lib_name = NULL; - char * pin = NULL; - int error = 0; - int c, errflg = 0; - int ontoken = 0; - unsigned int count = 1000; - unsigned int i; + pk11_context_t pctx; + pk11_optype_t op_type = OP_RSA; + char *lib_name = NULL; + char *pin = NULL; + int error = 0; + int c, errflg = 0; + int ontoken = 0; + unsigned int count = 1000; + unsigned int i; struct timespec starttime; struct timespec endtime; @@ -201,7 +198,8 @@ main(int argc, char *argv[]) (const char *)pin, slot); if ((result != ISC_R_SUCCESS) && (result != PK11_R_NORANDOMSERVICE) && (result != PK11_R_NODIGESTSERVICE) && - (result != PK11_R_NOAESSERVICE)) { + (result != PK11_R_NOAESSERVICE)) + { fprintf(stderr, "Error initializing PKCS#11: %s\n", isc_result_totext(result)); exit(1); diff --git a/bin/tests/pkcs11/benchmarks/login.c b/bin/tests/pkcs11/benchmarks/login.c index b3623658a3..36c4fe8c6e 100644 --- a/bin/tests/pkcs11/benchmarks/login.c +++ b/bin/tests/pkcs11/benchmarks/login.c @@ -61,14 +61,12 @@ #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) -{ +clock_gettime(int32_t id, struct timespec *tp) { struct timeval tv; - int result; + int result; UNUSED(id); @@ -82,19 +80,18 @@ clock_gettime(int32_t id, struct timespec *tp) #endif /* ifndef HAVE_CLOCK_GETTIME */ int -main(int argc, char *argv[]) -{ - CK_RV rv; - CK_SLOT_ID slot = 0; +main(int argc, char *argv[]) { + CK_RV rv; + CK_SLOT_ID slot = 0; CK_SESSION_HANDLE *hSession; - CK_UTF8CHAR * pin = NULL; - char * lib_name = NULL; - int error = 0; - int c, errflg = 0; - unsigned int count = 1000; - unsigned int i, j; - struct timespec starttime; - struct timespec endtime; + CK_UTF8CHAR *pin = NULL; + char *lib_name = NULL; + int error = 0; + int c, errflg = 0; + unsigned int count = 1000; + unsigned int i, j; + struct timespec starttime; + struct timespec endtime; while ((c = isc_commandline_parse(argc, argv, ":m:s:p:n:")) != -1) { switch (c) { diff --git a/bin/tests/pkcs11/benchmarks/privrsa.c b/bin/tests/pkcs11/benchmarks/privrsa.c index b6d873f84a..df23372361 100644 --- a/bin/tests/pkcs11/benchmarks/privrsa.c +++ b/bin/tests/pkcs11/benchmarks/privrsa.c @@ -61,14 +61,12 @@ #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) -{ +clock_gettime(int32_t id, struct timespec *tp) { struct timeval tv; - int result; + int result; UNUSED(id); @@ -150,40 +148,39 @@ static CK_BBOOL truevalue = TRUE; static CK_BBOOL falsevalue = FALSE; int -main(int argc, char *argv[]) -{ - isc_result_t result; - CK_RV rv; - CK_SLOT_ID slot = 0; +main(int argc, char *argv[]) { + isc_result_t result; + CK_RV rv; + CK_SLOT_ID slot = 0; CK_SESSION_HANDLE hSession = CK_INVALID_HANDLE; CK_OBJECT_HANDLE *hKey; - CK_OBJECT_CLASS kClass = CKO_PRIVATE_KEY; - CK_KEY_TYPE kType = CKK_RSA; - CK_ATTRIBUTE kTemplate[] = { - { CKA_CLASS, &kClass, (CK_ULONG)sizeof(kClass) }, - { CKA_KEY_TYPE, &kType, (CK_ULONG)sizeof(kType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_LABEL, (CK_BYTE_PTR)label, (CK_ULONG)sizeof(label) }, - { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_MODULUS, modulus, (CK_ULONG)sizeof(modulus) }, - { CKA_PUBLIC_EXPONENT, pubexp, (CK_ULONG)sizeof(pubexp) }, - { CKA_PRIVATE_EXPONENT, privexp, (CK_ULONG)sizeof(privexp) }, - { CKA_PRIME_1, prime1, (CK_ULONG)sizeof(prime1) }, - { CKA_PRIME_2, prime2, (CK_ULONG)sizeof(prime2) }, - { CKA_EXPONENT_1, exp_1, (CK_ULONG)sizeof(exp_1) }, - { CKA_EXPONENT_2, exp_2, (CK_ULONG)sizeof(exp_2) }, - { CKA_COEFFICIENT, coeff, (CK_ULONG)sizeof(coeff) } + CK_OBJECT_CLASS kClass = CKO_PRIVATE_KEY; + CK_KEY_TYPE kType = CKK_RSA; + CK_ATTRIBUTE kTemplate[] = { + { CKA_CLASS, &kClass, (CK_ULONG)sizeof(kClass) }, + { CKA_KEY_TYPE, &kType, (CK_ULONG)sizeof(kType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_LABEL, (CK_BYTE_PTR)label, (CK_ULONG)sizeof(label) }, + { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_MODULUS, modulus, (CK_ULONG)sizeof(modulus) }, + { CKA_PUBLIC_EXPONENT, pubexp, (CK_ULONG)sizeof(pubexp) }, + { CKA_PRIVATE_EXPONENT, privexp, (CK_ULONG)sizeof(privexp) }, + { CKA_PRIME_1, prime1, (CK_ULONG)sizeof(prime1) }, + { CKA_PRIME_2, prime2, (CK_ULONG)sizeof(prime2) }, + { CKA_EXPONENT_1, exp_1, (CK_ULONG)sizeof(exp_1) }, + { CKA_EXPONENT_2, exp_2, (CK_ULONG)sizeof(exp_2) }, + { CKA_COEFFICIENT, coeff, (CK_ULONG)sizeof(coeff) } }; - pk11_context_t pctx; - pk11_optype_t op_type = OP_RSA; - char * lib_name = NULL; - char * pin = NULL; - int error = 0; - int c, errflg = 0; - int ontoken = 0; - unsigned int count = 1000; - unsigned int i; + pk11_context_t pctx; + pk11_optype_t op_type = OP_RSA; + char *lib_name = NULL; + char *pin = NULL; + int error = 0; + int c, errflg = 0; + int ontoken = 0; + unsigned int count = 1000; + unsigned int i; struct timespec starttime; struct timespec endtime; @@ -249,7 +246,8 @@ main(int argc, char *argv[]) (const char *)pin, slot); if ((result != ISC_R_SUCCESS) && (result != PK11_R_NORANDOMSERVICE) && (result != PK11_R_NODIGESTSERVICE) && - (result != PK11_R_NOAESSERVICE)) { + (result != PK11_R_NOAESSERVICE)) + { fprintf(stderr, "Error initializing PKCS#11: %s\n", isc_result_totext(result)); free(hKey); diff --git a/bin/tests/pkcs11/benchmarks/pubrsa.c b/bin/tests/pkcs11/benchmarks/pubrsa.c index 1ceb014004..5164a2cf4f 100644 --- a/bin/tests/pkcs11/benchmarks/pubrsa.c +++ b/bin/tests/pkcs11/benchmarks/pubrsa.c @@ -61,14 +61,12 @@ #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) -{ +clock_gettime(int32_t id, struct timespec *tp) { struct timeval tv; - int result; + int result; UNUSED(id); @@ -102,34 +100,33 @@ static CK_BBOOL truevalue = TRUE; static CK_BBOOL falsevalue = FALSE; int -main(int argc, char *argv[]) -{ - isc_result_t result; - CK_RV rv; - CK_SLOT_ID slot = 0; +main(int argc, char *argv[]) { + isc_result_t result; + CK_RV rv; + CK_SLOT_ID slot = 0; CK_SESSION_HANDLE hSession = CK_INVALID_HANDLE; CK_OBJECT_HANDLE *hKey; - CK_OBJECT_CLASS kClass = CKO_PUBLIC_KEY; - CK_KEY_TYPE kType = CKK_RSA; - CK_ATTRIBUTE kTemplate[] = { - { CKA_CLASS, &kClass, (CK_ULONG)sizeof(kClass) }, - { CKA_KEY_TYPE, &kType, (CK_ULONG)sizeof(kType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_LABEL, (CK_BYTE_PTR)label, (CK_ULONG)sizeof(label) }, - { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_MODULUS, modulus, (CK_ULONG)sizeof(modulus) }, - { CKA_PUBLIC_EXPONENT, exponent, (CK_ULONG)sizeof(exponent) } + CK_OBJECT_CLASS kClass = CKO_PUBLIC_KEY; + CK_KEY_TYPE kType = CKK_RSA; + CK_ATTRIBUTE kTemplate[] = { + { CKA_CLASS, &kClass, (CK_ULONG)sizeof(kClass) }, + { CKA_KEY_TYPE, &kType, (CK_ULONG)sizeof(kType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_LABEL, (CK_BYTE_PTR)label, (CK_ULONG)sizeof(label) }, + { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_MODULUS, modulus, (CK_ULONG)sizeof(modulus) }, + { CKA_PUBLIC_EXPONENT, exponent, (CK_ULONG)sizeof(exponent) } }; - pk11_context_t pctx; - pk11_optype_t op_type = OP_RSA; - char * lib_name = NULL; - char * pin = NULL; - int error = 0; - int c, errflg = 0; - int ontoken = 0; - unsigned int count = 1000; - unsigned int i; + pk11_context_t pctx; + pk11_optype_t op_type = OP_RSA; + char *lib_name = NULL; + char *pin = NULL; + int error = 0; + int c, errflg = 0; + int ontoken = 0; + unsigned int count = 1000; + unsigned int i; struct timespec starttime; struct timespec endtime; @@ -195,7 +192,8 @@ main(int argc, char *argv[]) (const char *)pin, slot); if ((result != ISC_R_SUCCESS) && (result != PK11_R_NORANDOMSERVICE) && (result != PK11_R_NODIGESTSERVICE) && - (result != PK11_R_NOAESSERVICE)) { + (result != PK11_R_NOAESSERVICE)) + { fprintf(stderr, "Error initializing PKCS#11: %s\n", isc_result_totext(result)); free(hKey); diff --git a/bin/tests/pkcs11/benchmarks/session.c b/bin/tests/pkcs11/benchmarks/session.c index d7c4fd1c22..f36b0577cd 100644 --- a/bin/tests/pkcs11/benchmarks/session.c +++ b/bin/tests/pkcs11/benchmarks/session.c @@ -61,14 +61,12 @@ #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) -{ +clock_gettime(int32_t id, struct timespec *tp) { struct timeval tv; - int result; + int result; UNUSED(id); @@ -82,18 +80,17 @@ clock_gettime(int32_t id, struct timespec *tp) #endif /* ifndef HAVE_CLOCK_GETTIME */ int -main(int argc, char *argv[]) -{ - CK_RV rv; - CK_SLOT_ID slot = 0; +main(int argc, char *argv[]) { + CK_RV rv; + CK_SLOT_ID slot = 0; CK_SESSION_HANDLE *hSession; - char * lib_name = NULL; - int error = 0; - int c, errflg = 0; - unsigned int count = 1000; - unsigned int i; - struct timespec starttime; - struct timespec endtime; + char *lib_name = NULL; + int error = 0; + int c, errflg = 0; + unsigned int count = 1000; + unsigned int i; + struct timespec starttime; + struct timespec endtime; while ((c = isc_commandline_parse(argc, argv, ":m:s:n:")) != -1) { switch (c) { diff --git a/bin/tests/pkcs11/benchmarks/sha1.c b/bin/tests/pkcs11/benchmarks/sha1.c index b4769690dd..03d064ecda 100644 --- a/bin/tests/pkcs11/benchmarks/sha1.c +++ b/bin/tests/pkcs11/benchmarks/sha1.c @@ -61,14 +61,12 @@ #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) -{ +clock_gettime(int32_t id, struct timespec *tp) { struct timeval tv; - int result; + int result; UNUSED(id); @@ -84,23 +82,22 @@ clock_gettime(int32_t id, struct timespec *tp) CK_BYTE buf[1024]; int -main(int argc, char *argv[]) -{ - isc_result_t result; - CK_RV rv; - CK_SLOT_ID slot = 0; +main(int argc, char *argv[]) { + isc_result_t result; + CK_RV rv; + CK_SLOT_ID slot = 0; CK_SESSION_HANDLE hSession = CK_INVALID_HANDLE; - CK_MECHANISM mech = { CKM_SHA_1, NULL, 0 }; - CK_ULONG len = sizeof(buf); - pk11_context_t pctx; - pk11_optype_t op_type = OP_DIGEST; - char * lib_name = NULL; - int error = 0; - int c, errflg = 0; - unsigned int count = 1000; - unsigned int i; - struct timespec starttime; - struct timespec endtime; + CK_MECHANISM mech = { CKM_SHA_1, NULL, 0 }; + CK_ULONG len = sizeof(buf); + pk11_context_t pctx; + pk11_optype_t op_type = OP_DIGEST; + char *lib_name = NULL; + int error = 0; + int c, errflg = 0; + unsigned int count = 1000; + unsigned int i; + struct timespec starttime; + struct timespec endtime; while ((c = isc_commandline_parse(argc, argv, ":m:s:n:")) != -1) { switch (c) { @@ -143,7 +140,8 @@ main(int argc, char *argv[]) result = pk11_get_session(&pctx, op_type, false, false, false, NULL, slot); if ((result != ISC_R_SUCCESS) && (result != PK11_R_NORANDOMSERVICE) && - (result != PK11_R_NOAESSERVICE)) { + (result != PK11_R_NOAESSERVICE)) + { fprintf(stderr, "Error initializing PKCS#11: %s\n", isc_result_totext(result)); exit(1); diff --git a/bin/tests/pkcs11/benchmarks/sign.c b/bin/tests/pkcs11/benchmarks/sign.c index e5c8815085..650aa3a96f 100644 --- a/bin/tests/pkcs11/benchmarks/sign.c +++ b/bin/tests/pkcs11/benchmarks/sign.c @@ -61,14 +61,12 @@ #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) -{ +clock_gettime(int32_t id, struct timespec *tp) { struct timeval tv; - int result; + int result; UNUSED(id); @@ -151,42 +149,41 @@ static CK_BBOOL truevalue = TRUE; static CK_BBOOL falsevalue = FALSE; int -main(int argc, char *argv[]) -{ - isc_result_t result; - CK_RV rv; - CK_SLOT_ID slot = 0; +main(int argc, char *argv[]) { + isc_result_t result; + CK_RV rv; + CK_SLOT_ID slot = 0; CK_SESSION_HANDLE hSession = CK_INVALID_HANDLE; - CK_ULONG len; - CK_ULONG slen; - CK_OBJECT_HANDLE hKey = CK_INVALID_HANDLE; - CK_OBJECT_CLASS kClass = CKO_PRIVATE_KEY; - CK_KEY_TYPE kType = CKK_RSA; - CK_ATTRIBUTE kTemplate[] = { - { CKA_CLASS, &kClass, (CK_ULONG)sizeof(kClass) }, - { CKA_KEY_TYPE, &kType, (CK_ULONG)sizeof(kType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_MODULUS, modulus, (CK_ULONG)sizeof(modulus) }, - { CKA_PUBLIC_EXPONENT, pubexp, (CK_ULONG)sizeof(pubexp) }, - { CKA_PRIVATE_EXPONENT, privexp, (CK_ULONG)sizeof(privexp) }, - { CKA_PRIME_1, prime1, (CK_ULONG)sizeof(prime1) }, - { CKA_PRIME_2, prime2, (CK_ULONG)sizeof(prime2) }, - { CKA_EXPONENT_1, exp_1, (CK_ULONG)sizeof(exp_1) }, - { CKA_EXPONENT_2, exp_2, (CK_ULONG)sizeof(exp_2) }, - { CKA_COEFFICIENT, coeff, (CK_ULONG)sizeof(coeff) } + CK_ULONG len; + CK_ULONG slen; + CK_OBJECT_HANDLE hKey = CK_INVALID_HANDLE; + CK_OBJECT_CLASS kClass = CKO_PRIVATE_KEY; + CK_KEY_TYPE kType = CKK_RSA; + CK_ATTRIBUTE kTemplate[] = { + { CKA_CLASS, &kClass, (CK_ULONG)sizeof(kClass) }, + { CKA_KEY_TYPE, &kType, (CK_ULONG)sizeof(kType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_MODULUS, modulus, (CK_ULONG)sizeof(modulus) }, + { CKA_PUBLIC_EXPONENT, pubexp, (CK_ULONG)sizeof(pubexp) }, + { CKA_PRIVATE_EXPONENT, privexp, (CK_ULONG)sizeof(privexp) }, + { CKA_PRIME_1, prime1, (CK_ULONG)sizeof(prime1) }, + { CKA_PRIME_2, prime2, (CK_ULONG)sizeof(prime2) }, + { CKA_EXPONENT_1, exp_1, (CK_ULONG)sizeof(exp_1) }, + { CKA_EXPONENT_2, exp_2, (CK_ULONG)sizeof(exp_2) }, + { CKA_COEFFICIENT, coeff, (CK_ULONG)sizeof(coeff) } }; - CK_MECHANISM mech = { CKM_SHA1_RSA_PKCS, NULL, 0 }; - pk11_context_t pctx; - pk11_optype_t op_type = OP_RSA; - char * lib_name = NULL; - char * pin = NULL; - int error = 0; - int c, errflg = 0; - int ontoken = 0; - unsigned int count = 1000; - unsigned int i; + CK_MECHANISM mech = { CKM_SHA1_RSA_PKCS, NULL, 0 }; + pk11_context_t pctx; + pk11_optype_t op_type = OP_RSA; + char *lib_name = NULL; + char *pin = NULL; + int error = 0; + int c, errflg = 0; + int ontoken = 0; + unsigned int count = 1000; + unsigned int i; struct timespec starttime; struct timespec endtime; @@ -243,7 +240,8 @@ main(int argc, char *argv[]) (const char *)pin, slot); if ((result != ISC_R_SUCCESS) && (result != PK11_R_NORANDOMSERVICE) && (result != PK11_R_NODIGESTSERVICE) && - (result != PK11_R_NOAESSERVICE)) { + (result != PK11_R_NOAESSERVICE)) + { fprintf(stderr, "Error initializing PKCS#11: %s\n", isc_result_totext(result)); exit(1); diff --git a/bin/tests/pkcs11/benchmarks/verify.c b/bin/tests/pkcs11/benchmarks/verify.c index bb68f46503..daed6102cc 100644 --- a/bin/tests/pkcs11/benchmarks/verify.c +++ b/bin/tests/pkcs11/benchmarks/verify.c @@ -61,14 +61,12 @@ #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) -{ +clock_gettime(int32_t id, struct timespec *tp) { struct timeval tv; - int result; + int result; UNUSED(id); @@ -103,36 +101,35 @@ static CK_BBOOL truevalue = TRUE; static CK_BBOOL falsevalue = FALSE; int -main(int argc, char *argv[]) -{ - isc_result_t result; - CK_RV rv; - CK_SLOT_ID slot = 0; +main(int argc, char *argv[]) { + isc_result_t result; + CK_RV rv; + CK_SLOT_ID slot = 0; CK_SESSION_HANDLE hSession = CK_INVALID_HANDLE; - CK_ULONG len; - CK_ULONG slen; - CK_OBJECT_HANDLE hKey = CK_INVALID_HANDLE; - CK_OBJECT_CLASS kClass = CKO_PUBLIC_KEY; - CK_KEY_TYPE kType = CKK_RSA; - CK_ATTRIBUTE kTemplate[] = { - { CKA_CLASS, &kClass, (CK_ULONG)sizeof(kClass) }, - { CKA_KEY_TYPE, &kType, (CK_ULONG)sizeof(kType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_MODULUS, modulus, (CK_ULONG)sizeof(modulus) }, - { CKA_PUBLIC_EXPONENT, exponent, (CK_ULONG)sizeof(exponent) } + CK_ULONG len; + CK_ULONG slen; + CK_OBJECT_HANDLE hKey = CK_INVALID_HANDLE; + CK_OBJECT_CLASS kClass = CKO_PUBLIC_KEY; + CK_KEY_TYPE kType = CKK_RSA; + CK_ATTRIBUTE kTemplate[] = { + { CKA_CLASS, &kClass, (CK_ULONG)sizeof(kClass) }, + { CKA_KEY_TYPE, &kType, (CK_ULONG)sizeof(kType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_MODULUS, modulus, (CK_ULONG)sizeof(modulus) }, + { CKA_PUBLIC_EXPONENT, exponent, (CK_ULONG)sizeof(exponent) } }; - CK_MECHANISM mech = { CKM_SHA1_RSA_PKCS, NULL, 0 }; - pk11_context_t pctx; - pk11_optype_t op_type = OP_RSA; - char * lib_name = NULL; - char * pin = NULL; - int error = 0; - int c, errflg = 0; - int ontoken = 0; - unsigned int count = 1000; - unsigned int i; + CK_MECHANISM mech = { CKM_SHA1_RSA_PKCS, NULL, 0 }; + pk11_context_t pctx; + pk11_optype_t op_type = OP_RSA; + char *lib_name = NULL; + char *pin = NULL; + int error = 0; + int c, errflg = 0; + int ontoken = 0; + unsigned int count = 1000; + unsigned int i; struct timespec starttime; struct timespec endtime; @@ -189,7 +186,8 @@ main(int argc, char *argv[]) (const char *)pin, slot); if ((result != ISC_R_SUCCESS) && (result != PK11_R_NORANDOMSERVICE) && (result != PK11_R_NODIGESTSERVICE) && - (result != PK11_R_NOAESSERVICE)) { + (result != PK11_R_NOAESSERVICE)) + { fprintf(stderr, "Error initializing PKCS#11: %s\n", isc_result_totext(result)); exit(1); diff --git a/bin/tests/system/dlzexternal/driver.c b/bin/tests/system/dlzexternal/driver.c index eee310fbb1..74ee7d3a14 100644 --- a/bin/tests/system/dlzexternal/driver.c +++ b/bin/tests/system/dlzexternal/driver.c @@ -51,16 +51,15 @@ /* For this simple example, use fixed sized strings */ struct record { - char name[100]; - char type[10]; - char data[200]; + char name[100]; + char type[10]; + char data[200]; dns_ttl_t ttl; }; #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; @@ -73,17 +72,16 @@ struct dlz_example_data { bool transaction_started; /* Helper functions from the dlz_dlopen driver */ - log_t * log; - dns_sdlz_putrr_t * putrr; - dns_sdlz_putnamedrr_t * putnamedrr; + log_t *log; + dns_sdlz_putrr_t *putrr; + dns_sdlz_putnamedrr_t *putnamedrr; dns_dlz_writeablezone_t *writeable_zone; }; static bool -single_valued(const char *type) -{ +single_valued(const char *type) { const char *single[] = { "soa", "cname", NULL }; - int i; + int i; for (i = 0; single[i]; i++) { if (strcasecmp(single[i], type) == 0) { @@ -98,11 +96,10 @@ 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) -{ - int i; + const char *type, dns_ttl_t ttl, const char *data) { + int i; bool single = single_valued(type); - int first_empty = -1; + int first_empty = -1; for (i = 0; i < MAX_RECORDS; i++) { INSIST(list[i].name != NULL); @@ -130,7 +127,8 @@ add_name(struct dlz_example_data *state, struct record *list, const char *name, if (strlen(name) >= sizeof(list[i].name) || strlen(type) >= sizeof(list[i].type) || - strlen(data) >= sizeof(list[i].data)) { + strlen(data) >= sizeof(list[i].data)) + { return (ISC_R_NOSPACE); } @@ -153,8 +151,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); @@ -162,7 +159,8 @@ del_name(struct dlz_example_data *state, struct record *list, const char *name, for (i = 0; i < MAX_RECORDS; i++) { if (strcasecmp(name, list[i].name) == 0 && strcasecmp(type, list[i].type) == 0 && - strcasecmp(data, list[i].data) == 0 && ttl == list[i].ttl) { + strcasecmp(data, list[i].data) == 0 && ttl == list[i].ttl) + { break; } } @@ -174,11 +172,10 @@ 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) -{ - char addr_buf[INET6_ADDRSTRLEN]; +fmt_address(isc_sockaddr_t *addr, char *buffer, size_t size) { + char addr_buf[INET6_ADDRSTRLEN]; const char *ret; - uint16_t port = 0; + uint16_t port = 0; switch (addr->type.sa.sa_family) { case AF_INET: @@ -207,8 +204,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); } @@ -218,8 +214,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; } @@ -239,15 +234,14 @@ 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; - char soa_data[1024]; - const char * extra; - isc_result_t result; - int n; + const char *helper_name; + va_list ap; + char soa_data[1024]; + const char *extra; + isc_result_t result; + int n; UNUSED(dlzname); @@ -318,8 +312,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; loginfo("dlz_example: shutting down zone %s", state->zone_name); @@ -332,17 +325,17 @@ 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]; - char absolute[1024]; + isc_sockaddr_t *src; + char addrbuf[100]; + char absolute[1024]; strcpy(addrbuf, "unknown"); if (methods != NULL && methods->sourceip != NULL && methods->version - methods->age <= DNS_CLIENTINFOMETHODS_VERSION && - DNS_CLIENTINFOMETHODS_VERSION <= methods->version) { + DNS_CLIENTINFOMETHODS_VERSION <= methods->version) + { methods->sourceip(clientinfo, &src); fmt_address(src, addrbuf, sizeof(addrbuf)); } @@ -367,7 +360,8 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, * from 10.53.0.1. */ if (strcasecmp(name, "test.example.net") == 0 && - strncmp(addrbuf, "10.53.0.1", 9) == 0) { + strncmp(addrbuf, "10.53.0.1", 9) == 0) + { return (ISC_R_NOMORE); } @@ -408,18 +402,17 @@ 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) -{ - isc_result_t result; + dns_clientinfo_t *clientinfo) { + isc_result_t result; struct dlz_example_data *state = (struct dlz_example_data *)dbdata; - bool found = false; - void * dbversion = NULL; - isc_sockaddr_t * src; - char full_name[256]; - char buf[512]; - static char last[256]; - static int count = 0; - int i, size; + bool found = false; + void *dbversion = NULL; + isc_sockaddr_t *src; + char full_name[256]; + char buf[512]; + static char last[256]; + static int count = 0; + int i, size; UNUSED(zone); @@ -438,7 +431,8 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, } if (size < 0 || (size_t)size >= sizeof(full_name) || - (size_t)size >= sizeof(last)) { + (size_t)size >= sizeof(last)) + { return (ISC_R_NOSPACE); } @@ -468,8 +462,8 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, * If the DLZ only operates on 'live' data, then version * wouldn't necessarily be needed. */ - if (clientinfo != NULL && - clientinfo->version >= DNS_CLIENTINFO_VERSION) { + if (clientinfo != NULL && clientinfo->version >= DNS_CLIENTINFO_VERSION) + { dbversion = clientinfo->dbversion; if (dbversion != NULL && *(bool *)dbversion) { loginfo("dlz_example: lookup against live transaction"); @@ -481,7 +475,8 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, if (methods != NULL && methods->sourceip != NULL && (methods->version - methods->age <= DNS_CLIENTINFOMETHODS_VERSION) && - DNS_CLIENTINFOMETHODS_VERSION <= methods->version) { + DNS_CLIENTINFOMETHODS_VERSION <= methods->version) + { methods->sourceip(clientinfo, &src); fmt_address(src, buf, sizeof(buf)); } @@ -550,10 +545,9 @@ 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) { struct dlz_example_data *state = (struct dlz_example_data *)dbdata; - isc_result_t result; + isc_result_t result; loginfo("dlz_example: dlz_allowzonexfr called for %s", name); @@ -591,10 +585,9 @@ 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; + int i; UNUSED(zone); @@ -623,8 +616,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) { @@ -643,8 +635,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) { @@ -690,10 +681,9 @@ 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; + isc_result_t result; loginfo("dlz_example: starting configure"); @@ -719,8 +709,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); @@ -740,12 +729,11 @@ 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) -{ - char * full_name, *dclass, *type, *data, *ttlstr, *buf; - char absolute[1024]; + const char *rdatastr, struct record *list) { + char *full_name, *dclass, *type, *data, *ttlstr, *buf; + char absolute[1024]; isc_result_t result; - char * saveptr = NULL; + char *saveptr = NULL; buf = strdup(rdatastr); if (buf == NULL) { @@ -802,8 +790,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) { @@ -817,8 +804,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) { @@ -831,8 +817,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/bin/tests/system/dyndb/driver/db.c b/bin/tests/system/dyndb/driver/db.c index 7fefbc3b6b..c79da577d8 100644 --- a/bin/tests/system/dyndb/driver/db.c +++ b/bin/tests/system/dyndb/driver/db.c @@ -37,8 +37,8 @@ ((sampledb) != NULL && (sampledb)->common.impmagic == SAMPLEDB_MAGIC) struct sampledb { - dns_db_t common; - isc_refcount_t refs; + dns_db_t common; + isc_refcount_t refs; sample_instance_t *inst; /* @@ -61,15 +61,13 @@ typedef struct sampledb sampledb_t; * This should work as long as we use only RBTDB and nothing else. */ static isc_result_t -sample_name_fromnode(dns_dbnode_t *node, dns_name_t *name) -{ +sample_name_fromnode(dns_dbnode_t *node, dns_name_t *name) { dns_rbtnode_t *rbtnode = (dns_rbtnode_t *)node; return (dns_rbt_fullnamefromnode(rbtnode, name)); } static void -attach(dns_db_t *source, dns_db_t **targetp) -{ +attach(dns_db_t *source, dns_db_t **targetp) { sampledb_t *sampledb = (sampledb_t *)source; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -79,8 +77,7 @@ attach(dns_db_t *source, dns_db_t **targetp) } static void -free_sampledb(sampledb_t *sampledb) -{ +free_sampledb(sampledb_t *sampledb) { REQUIRE(VALID_SAMPLEDB(sampledb)); dns_db_detach(&sampledb->rbtdb); @@ -90,8 +87,7 @@ free_sampledb(sampledb_t *sampledb) } static void -detach(dns_db_t **dbp) -{ +detach(dns_db_t **dbp) { REQUIRE(dbp != NULL && VALID_SAMPLEDB((sampledb_t *)(*dbp))); sampledb_t *sampledb = (sampledb_t *)(*dbp); *dbp = NULL; @@ -107,8 +103,7 @@ detach(dns_db_t **dbp) * loaded in the usual sense. */ static isc_result_t -beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) -{ +beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) { UNUSED(db); UNUSED(callbacks); @@ -124,8 +119,7 @@ beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) * loaded in the usual sense. */ static isc_result_t -endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) -{ +endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) { UNUSED(db); UNUSED(callbacks); @@ -136,8 +130,7 @@ endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) } static isc_result_t -serialize(dns_db_t *db, dns_dbversion_t *version, FILE *file) -{ +serialize(dns_db_t *db, dns_dbversion_t *version, FILE *file) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -147,8 +140,7 @@ serialize(dns_db_t *db, dns_dbversion_t *version, FILE *file) static isc_result_t dump(dns_db_t *db, dns_dbversion_t *version, const char *filename, - dns_masterformat_t masterformat) -{ + dns_masterformat_t masterformat) { UNUSED(db); UNUSED(version); UNUSED(filename); @@ -161,8 +153,7 @@ dump(dns_db_t *db, dns_dbversion_t *version, const char *filename, } static void -currentversion(dns_db_t *db, dns_dbversion_t **versionp) -{ +currentversion(dns_db_t *db, dns_dbversion_t **versionp) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -171,8 +162,7 @@ currentversion(dns_db_t *db, dns_dbversion_t **versionp) } static isc_result_t -newversion(dns_db_t *db, dns_dbversion_t **versionp) -{ +newversion(dns_db_t *db, dns_dbversion_t **versionp) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -181,8 +171,8 @@ newversion(dns_db_t *db, dns_dbversion_t **versionp) } static void -attachversion(dns_db_t *db, dns_dbversion_t *source, dns_dbversion_t **targetp) -{ +attachversion(dns_db_t *db, dns_dbversion_t *source, + dns_dbversion_t **targetp) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -191,8 +181,7 @@ attachversion(dns_db_t *db, dns_dbversion_t *source, dns_dbversion_t **targetp) } static void -closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) -{ +closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -202,8 +191,7 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) static isc_result_t findnode(dns_db_t *db, const dns_name_t *name, bool create, - dns_dbnode_t **nodep) -{ + dns_dbnode_t **nodep) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -215,8 +203,7 @@ static isc_result_t find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *sigrdataset) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -229,8 +216,7 @@ static isc_result_t findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_name_t *dcname, dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *sigrdataset) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -240,8 +226,7 @@ findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, } static void -attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) -{ +attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -250,8 +235,7 @@ attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) } static void -detachnode(dns_db_t *db, dns_dbnode_t **targetp) -{ +detachnode(dns_db_t *db, dns_dbnode_t **targetp) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -260,8 +244,7 @@ detachnode(dns_db_t *db, dns_dbnode_t **targetp) } static isc_result_t -expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) -{ +expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -270,8 +253,7 @@ expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) } static void -printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) -{ +printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -280,8 +262,8 @@ printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) } static isc_result_t -createiterator(dns_db_t *db, unsigned int options, dns_dbiterator_t **iteratorp) -{ +createiterator(dns_db_t *db, unsigned int options, + dns_dbiterator_t **iteratorp) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -292,8 +274,7 @@ createiterator(dns_db_t *db, unsigned int options, dns_dbiterator_t **iteratorp) 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) -{ + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -304,8 +285,7 @@ findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, static isc_result_t allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, - isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) -{ + isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -317,10 +297,9 @@ allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, static isc_result_t addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, isc_stdtime_t now, dns_rdataset_t *rdataset, unsigned int options, - dns_rdataset_t *addedrdataset) -{ - sampledb_t * sampledb = (sampledb_t *)db; - isc_result_t result; + dns_rdataset_t *addedrdataset) { + sampledb_t *sampledb = (sampledb_t *)db; + isc_result_t result; dns_fixedname_t name; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -342,10 +321,9 @@ cleanup: static isc_result_t subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdataset_t *rdataset, unsigned int options, - dns_rdataset_t *newrdataset) -{ - sampledb_t * sampledb = (sampledb_t *)db; - isc_result_t result; + dns_rdataset_t *newrdataset) { + sampledb_t *sampledb = (sampledb_t *)db; + isc_result_t result; dns_fixedname_t name; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -374,8 +352,7 @@ cleanup: */ static isc_result_t deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, - dns_rdatatype_t type, dns_rdatatype_t covers) -{ + dns_rdatatype_t type, dns_rdatatype_t covers) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -385,8 +362,7 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, } static bool -issecure(dns_db_t *db) -{ +issecure(dns_db_t *db) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -395,8 +371,7 @@ issecure(dns_db_t *db) } static unsigned int -nodecount(dns_db_t *db) -{ +nodecount(dns_db_t *db) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -409,16 +384,14 @@ nodecount(dns_db_t *db) * Always return true. */ static bool -ispersistent(dns_db_t *db) -{ +ispersistent(dns_db_t *db) { UNUSED(db); return (true); } static void -overmem(dns_db_t *db, bool over) -{ +overmem(dns_db_t *db, bool over) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -427,8 +400,7 @@ overmem(dns_db_t *db, bool over) } static void -settask(dns_db_t *db, isc_task_t *task) -{ +settask(dns_db_t *db, isc_task_t *task) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -437,8 +409,7 @@ settask(dns_db_t *db, isc_task_t *task) } static isc_result_t -getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) -{ +getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -447,8 +418,7 @@ getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) } static void -transfernode(dns_db_t *db, dns_dbnode_t **sourcep, dns_dbnode_t **targetp) -{ +transfernode(dns_db_t *db, dns_dbnode_t **sourcep, dns_dbnode_t **targetp) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -459,8 +429,7 @@ transfernode(dns_db_t *db, dns_dbnode_t **sourcep, dns_dbnode_t **targetp) static isc_result_t getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, dns_hash_t *hash, uint8_t *flags, uint16_t *iterations, unsigned char *salt, - size_t *salt_length) -{ + size_t *salt_length) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -471,8 +440,7 @@ getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, dns_hash_t *hash, static isc_result_t findnsec3node(dns_db_t *db, const dns_name_t *name, bool create, - dns_dbnode_t **nodep) -{ + dns_dbnode_t **nodep) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -481,8 +449,7 @@ findnsec3node(dns_db_t *db, const dns_name_t *name, bool create, } static isc_result_t -setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign) -{ +setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -491,8 +458,7 @@ setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign) } static isc_result_t -getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, dns_name_t *name) -{ +getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, dns_name_t *name) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -501,8 +467,7 @@ getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, dns_name_t *name) } static void -resigned(dns_db_t *db, dns_rdataset_t *rdataset, dns_dbversion_t *version) -{ +resigned(dns_db_t *db, dns_rdataset_t *rdataset, dns_dbversion_t *version) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -511,8 +476,7 @@ resigned(dns_db_t *db, dns_rdataset_t *rdataset, dns_dbversion_t *version) } static bool -isdnssec(dns_db_t *db) -{ +isdnssec(dns_db_t *db) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -521,8 +485,7 @@ isdnssec(dns_db_t *db) } static dns_stats_t * -getrrsetstats(dns_db_t *db) -{ +getrrsetstats(dns_db_t *db) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -533,8 +496,7 @@ getrrsetstats(dns_db_t *db) static isc_result_t findnodeext(dns_db_t *db, const dns_name_t *name, bool create, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, - dns_dbnode_t **nodep) -{ + dns_dbnode_t **nodep) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -548,8 +510,7 @@ findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -560,8 +521,7 @@ findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, } static isc_result_t -setcachestats(dns_db_t *db, isc_stats_t *stats) -{ +setcachestats(dns_db_t *db, isc_stats_t *stats) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -570,8 +530,7 @@ setcachestats(dns_db_t *db, isc_stats_t *stats) } static size_t -hashsize(dns_db_t *db) -{ +hashsize(dns_db_t *db) { sampledb_t *sampledb = (sampledb_t *)db; REQUIRE(VALID_SAMPLEDB(sampledb)); @@ -647,14 +606,13 @@ static dns_dbmethods_t sampledb_methods = { */ static isc_result_t add_soa(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, - const dns_name_t *origin, const dns_name_t *contact) -{ - dns_dbnode_t * node = NULL; - dns_rdata_t rdata = DNS_RDATA_INIT; + const dns_name_t *origin, const dns_name_t *contact) { + dns_dbnode_t *node = NULL; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdatalist_t rdatalist; - dns_rdataset_t rdataset; - isc_result_t result; - unsigned char buf[DNS_SOA_BUFFERSIZE]; + dns_rdataset_t rdataset; + isc_result_t result; + unsigned char buf[DNS_SOA_BUFFERSIZE]; dns_rdataset_init(&rdataset); dns_rdatalist_init(&rdatalist); @@ -677,16 +635,15 @@ cleanup: static isc_result_t add_ns(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, - const dns_name_t *nsname) -{ - dns_dbnode_t * node = NULL; - dns_rdata_ns_t ns; - dns_rdata_t rdata = DNS_RDATA_INIT; + const dns_name_t *nsname) { + dns_dbnode_t *node = NULL; + dns_rdata_ns_t ns; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdatalist_t rdatalist; - dns_rdataset_t rdataset; - isc_result_t result; - isc_buffer_t b; - unsigned char buf[DNS_NAME_MAXWIRE]; + dns_rdataset_t rdataset; + isc_result_t result; + isc_buffer_t b; + unsigned char buf[DNS_NAME_MAXWIRE]; isc_buffer_init(&b, buf, sizeof(buf)); @@ -716,16 +673,15 @@ cleanup: static isc_result_t add_a(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, - struct in_addr addr) -{ - dns_dbnode_t * node = NULL; + struct in_addr addr) { + dns_dbnode_t *node = NULL; dns_rdata_in_a_t a; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdatalist_t rdatalist; - dns_rdataset_t rdataset; - isc_result_t result; - isc_buffer_t b; - unsigned char buf[DNS_NAME_MAXWIRE]; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdatalist_t rdatalist; + dns_rdataset_t rdataset; + isc_result_t result; + isc_buffer_t b; + unsigned char buf[DNS_NAME_MAXWIRE]; isc_buffer_init(&b, buf, sizeof(buf)); @@ -760,12 +716,11 @@ cleanup: isc_result_t create_db(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, dns_rdataclass_t rdclass, unsigned int argc, char *argv[], - void *driverarg, dns_db_t **dbp) -{ - sampledb_t * sampledb = NULL; - isc_result_t result; + void *driverarg, dns_db_t **dbp) { + sampledb_t *sampledb = NULL; + isc_result_t result; dns_dbversion_t *version = NULL; - struct in_addr a_addr; + struct in_addr a_addr; REQUIRE(type == dns_dbtype_zone); REQUIRE(rdclass == dns_rdataclass_in); diff --git a/bin/tests/system/dyndb/driver/driver.c b/bin/tests/system/dyndb/driver/driver.c index 6fb4154c71..22ce9299d1 100644 --- a/bin/tests/system/dyndb/driver/driver.c +++ b/bin/tests/system/dyndb/driver/driver.c @@ -31,9 +31,9 @@ #include "log.h" #include "util.h" -dns_dyndb_destroy_t dyndb_destroy; +dns_dyndb_destroy_t dyndb_destroy; dns_dyndb_register_t dyndb_init; -dns_dyndb_version_t dyndb_version; +dns_dyndb_version_t dyndb_version; /* * Driver init is called for each dyndb section in named.conf @@ -58,12 +58,11 @@ dns_dyndb_version_t dyndb_version; isc_result_t dyndb_init(isc_mem_t *mctx, const char *name, const char *parameters, const char *file, unsigned long line, const dns_dyndbctx_t *dctx, - void **instp) -{ - isc_result_t result; - unsigned int argc; - char ** argv = NULL; - char * s = NULL; + void **instp) { + isc_result_t result; + unsigned int argc; + char **argv = NULL; + char *s = NULL; sample_instance_t *sample_inst = NULL; REQUIRE(name != NULL); @@ -95,8 +94,8 @@ dyndb_init(isc_mem_t *mctx, const char *name, const char *parameters, name, file, line); /* Finally, create the instance. */ - result = - new_sample_instance(mctx, name, argc, argv, dctx, &sample_inst); + result = new_sample_instance(mctx, name, argc, argv, dctx, + &sample_inst); if (result != ISC_R_SUCCESS) { log_write(ISC_LOG_ERROR, "dyndb_init: new_sample_instance -> %s\n", @@ -134,8 +133,7 @@ cleanup: * @param[out] instp Pointer to instance-specific data (for one dyndb section). */ void -dyndb_destroy(void **instp) -{ +dyndb_destroy(void **instp) { destroy_sample_instance((sample_instance_t **)instp); } @@ -144,8 +142,7 @@ dyndb_destroy(void **instp) * is no API mismatch betwen the driver and the caller. */ int -dyndb_version(unsigned int *flags) -{ +dyndb_version(unsigned int *flags) { UNUSED(flags); return (DNS_DYNDB_VERSION); diff --git a/bin/tests/system/dyndb/driver/instance.c b/bin/tests/system/dyndb/driver/instance.c index e5a1cefc0d..bc1f829159 100644 --- a/bin/tests/system/dyndb/driver/instance.c +++ b/bin/tests/system/dyndb/driver/instance.c @@ -36,10 +36,9 @@ */ static isc_result_t parse_params(isc_mem_t *mctx, int argc, char **argv, dns_name_t *z1, - dns_name_t *z2) -{ + dns_name_t *z2) { isc_result_t result; - int i; + int i; REQUIRE(argv != NULL); REQUIRE(z1 != NULL); @@ -84,9 +83,8 @@ cleanup: 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) -{ - isc_result_t result; + sample_instance_t **sample_instp) { + isc_result_t result; sample_instance_t *inst = NULL; REQUIRE(sample_instp != NULL && *sample_instp == NULL); @@ -137,8 +135,7 @@ cleanup: * and add them to inst->view. */ isc_result_t -load_sample_instance_zones(sample_instance_t *inst) -{ +load_sample_instance_zones(sample_instance_t *inst) { isc_result_t result; result = create_zone(inst, inst->zone1_name, &inst->zone1); @@ -176,8 +173,7 @@ cleanup: } void -destroy_sample_instance(sample_instance_t **instp) -{ +destroy_sample_instance(sample_instance_t **instp) { sample_instance_t *inst; REQUIRE(instp != NULL); diff --git a/bin/tests/system/dyndb/driver/lock.c b/bin/tests/system/dyndb/driver/lock.c index 6a407cb330..d8bc33c949 100644 --- a/bin/tests/system/dyndb/driver/lock.c +++ b/bin/tests/system/dyndb/driver/lock.c @@ -29,8 +29,7 @@ * @param[in,out] statep Lock state: ISC_R_SUCCESS or ISC_R_LOCKBUSY */ void -run_exclusive_enter(sample_instance_t *inst, isc_result_t *statep) -{ +run_exclusive_enter(sample_instance_t *inst, isc_result_t *statep) { REQUIRE(statep != NULL); REQUIRE(*statep == ISC_R_IGNORE); @@ -45,8 +44,7 @@ run_exclusive_enter(sample_instance_t *inst, isc_result_t *statep) * @param[in] state Lock state as returned by run_exclusive_enter(). */ void -run_exclusive_exit(sample_instance_t *inst, isc_result_t state) -{ +run_exclusive_exit(sample_instance_t *inst, isc_result_t state) { if (state == ISC_R_SUCCESS) { isc_task_endexclusive(inst->task); } else { diff --git a/bin/tests/system/dyndb/driver/log.c b/bin/tests/system/dyndb/driver/log.c index 8a0d6c4764..1a508fb64d 100644 --- a/bin/tests/system/dyndb/driver/log.c +++ b/bin/tests/system/dyndb/driver/log.c @@ -9,8 +9,7 @@ #include void -log_write(int level, const char *format, ...) -{ +log_write(int level, const char *format, ...) { va_list args; va_start(args, format); diff --git a/bin/tests/system/dyndb/driver/syncptr.c b/bin/tests/system/dyndb/driver/syncptr.c index b231aa1c16..ca3aaa744d 100644 --- a/bin/tests/system/dyndb/driver/syncptr.c +++ b/bin/tests/system/dyndb/driver/syncptr.c @@ -30,12 +30,12 @@ typedef struct syncptrevent syncptrevent_t; struct syncptrevent { ISC_EVENT_COMMON(syncptrevent_t); - isc_mem_t * mctx; - dns_zone_t * zone; - dns_diff_t diff; + isc_mem_t *mctx; + dns_zone_t *zone; + dns_diff_t diff; dns_fixedname_t ptr_target_name; /* referenced by owner name in * tuple */ - isc_buffer_t b; /* referenced by target name in tuple */ + isc_buffer_t b; /* referenced by target name in tuple */ unsigned char buf[DNS_NAME_MAXWIRE]; }; @@ -47,12 +47,11 @@ struct syncptrevent { * */ static void -syncptr_write(isc_task_t *task, isc_event_t *event) -{ - syncptrevent_t * pevent = (syncptrevent_t *)event; +syncptr_write(isc_task_t *task, isc_event_t *event) { + syncptrevent_t *pevent = (syncptrevent_t *)event; dns_dbversion_t *version = NULL; - dns_db_t * db = NULL; - isc_result_t result; + dns_db_t *db = NULL; + isc_result_t result; REQUIRE(event->ev_type == SYNCPTR_WRITE_EVENT); @@ -110,11 +109,10 @@ cleanup: */ static isc_result_t syncptr_find_zone(sample_instance_t *inst, dns_rdata_t *rdata, dns_name_t *name, - dns_zone_t **zone) -{ - isc_result_t result; - isc_netaddr_t isc_ip; /* internal net address representation */ - dns_rdata_in_a_t ipv4; + dns_zone_t **zone) { + isc_result_t result; + isc_netaddr_t isc_ip; /* internal net address representation */ + dns_rdata_in_a_t ipv4; dns_rdata_in_aaaa_t ipv6; REQUIRE(inst != NULL); @@ -197,17 +195,16 @@ cleanup: */ static isc_result_t syncptr(sample_instance_t *inst, dns_name_t *name, dns_rdata_t *addr_rdata, - dns_ttl_t ttl, dns_diffop_t op) -{ - isc_result_t result; - isc_mem_t * mctx = inst->mctx; - dns_fixedname_t ptr_name; - dns_zone_t * ptr_zone = NULL; - dns_rdata_ptr_t ptr_struct; - dns_rdata_t ptr_rdata = DNS_RDATA_INIT; + dns_ttl_t ttl, dns_diffop_t op) { + isc_result_t result; + isc_mem_t *mctx = inst->mctx; + dns_fixedname_t ptr_name; + dns_zone_t *ptr_zone = NULL; + dns_rdata_ptr_t ptr_struct; + dns_rdata_t ptr_rdata = DNS_RDATA_INIT; dns_difftuple_t *tp = NULL; - isc_task_t * task = NULL; - syncptrevent_t * pevent = NULL; + isc_task_t *task = NULL; + syncptrevent_t *pevent = NULL; dns_fixedname_init(&ptr_name); DNS_RDATACOMMON_INIT(&ptr_struct, dns_rdatatype_ptr, dns_rdataclass_in); @@ -291,13 +288,13 @@ cleanup: */ isc_result_t syncptrs(sample_instance_t *inst, dns_name_t *name, dns_rdataset_t *rdataset, - dns_diffop_t op) -{ + dns_diffop_t op) { isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_t rdata = DNS_RDATA_INIT; for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { dns_rdataset_current(rdataset, &rdata); result = syncptr(inst, name, &rdata, rdataset->ttl, op); if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND) { diff --git a/bin/tests/system/dyndb/driver/zone.c b/bin/tests/system/dyndb/driver/zone.c index 75aae55c1c..07509eb3b2 100644 --- a/bin/tests/system/dyndb/driver/zone.c +++ b/bin/tests/system/dyndb/driver/zone.c @@ -28,13 +28,12 @@ extern const char *impname; */ isc_result_t create_zone(sample_instance_t *const inst, dns_name_t *const name, - dns_zone_t **const rawp) -{ + dns_zone_t **const rawp) { isc_result_t result; - dns_zone_t * raw = NULL; - const char * zone_argv[1]; - char zone_name[DNS_NAME_FORMATSIZE]; - dns_acl_t * acl_any = NULL; + dns_zone_t *raw = NULL; + const char *zone_argv[1]; + char zone_name[DNS_NAME_FORMATSIZE]; + dns_acl_t *acl_any = NULL; REQUIRE(inst != NULL); REQUIRE(name != NULL); @@ -104,12 +103,11 @@ cleanup: * to clients. */ static isc_result_t -publish_zone(sample_instance_t *inst, dns_zone_t *zone) -{ +publish_zone(sample_instance_t *inst, dns_zone_t *zone) { isc_result_t result; - bool freeze = false; - dns_zone_t * zone_in_view = NULL; - dns_view_t * view_in_zone = NULL; + bool freeze = false; + dns_zone_t *zone_in_view = NULL; + dns_view_t *view_in_zone = NULL; isc_result_t lock_state = ISC_R_IGNORE; REQUIRE(inst != NULL); @@ -180,15 +178,15 @@ cleanup: * on the secure zone! */ static isc_result_t -load_zone(dns_zone_t *zone) -{ +load_zone(dns_zone_t *zone) { isc_result_t result; - bool zone_dynamic; - uint32_t serial; + bool zone_dynamic; + uint32_t serial; result = dns_zone_load(zone, false); if (result != ISC_R_SUCCESS && result != DNS_R_UPTODATE && - result != DNS_R_DYNAMIC && result != DNS_R_CONTINUE) { + result != DNS_R_DYNAMIC && result != DNS_R_CONTINUE) + { goto cleanup; } zone_dynamic = (result == DNS_R_DYNAMIC); @@ -214,8 +212,7 @@ cleanup: * Add zone to view and call dns_zone_load(). */ isc_result_t -activate_zone(sample_instance_t *inst, dns_zone_t *raw) -{ +activate_zone(sample_instance_t *inst, dns_zone_t *raw) { isc_result_t result; /* diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c index 3538f9a80a..204d612bd7 100644 --- a/bin/tests/system/feature-test.c +++ b/bin/tests/system/feature-test.c @@ -33,8 +33,7 @@ #endif /* ifndef MAXHOSTNAMELEN */ static void -usage() -{ +usage() { fprintf(stderr, "usage: feature-test \n"); fprintf(stderr, "args:\n"); fprintf(stderr, " --edns-version\n"); @@ -51,8 +50,7 @@ usage() } int -main(int argc, char **argv) -{ +main(int argc, char **argv) { if (argc != 2) { usage(); return (1); @@ -77,12 +75,12 @@ main(int argc, char **argv) if (strcmp(argv[1], "--gethostname") == 0) { char hostname[MAXHOSTNAMELEN]; - int n; + int n; #ifdef WIN32 /* From InitSocket() */ - WORD wVersionRequested; + WORD wVersionRequested; WSADATA wsaData; - int err; + int err; wVersionRequested = MAKEWORD(2, 0); err = WSAStartup(wVersionRequested, &wsaData); @@ -164,9 +162,9 @@ main(int argc, char **argv) #ifdef WIN32 return (0); #elif defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY) - int s; - int n = -1; - int v6only = -1; + int s; + int n = -1; + int v6only = -1; socklen_t len = sizeof(v6only); s = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP); diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c index 87f038cf82..cec9de7cb1 100644 --- a/bin/tests/system/pipelined/pipequeries.c +++ b/bin/tests/system/pipelined/pipequeries.c @@ -56,24 +56,23 @@ #define RUNCHECK(x) RUNTIME_CHECK((x) == ISC_R_SUCCESS) -#define PORT 5300 +#define PORT 5300 #define TIMEOUT 30 -static isc_mem_t * mctx; +static isc_mem_t *mctx; static dns_requestmgr_t *requestmgr; -static bool have_src = false; -static isc_sockaddr_t srcaddr; -static isc_sockaddr_t dstaddr; -static int onfly; +static bool have_src = false; +static isc_sockaddr_t srcaddr; +static isc_sockaddr_t dstaddr; +static int onfly; static void -recvresponse(isc_task_t *task, isc_event_t *event) -{ +recvresponse(isc_task_t *task, isc_event_t *event) { dns_requestevent_t *reqev = (dns_requestevent_t *)event; - isc_result_t result; - dns_message_t * query, *response; - isc_buffer_t outbuf; - char output[1024]; + isc_result_t result; + dns_message_t *query, *response; + isc_buffer_t outbuf; + char output[1024]; UNUSED(task); @@ -127,17 +126,16 @@ recvresponse(isc_task_t *task, isc_event_t *event) } static isc_result_t -sendquery(isc_task_t *task) -{ - dns_request_t * request; - dns_message_t * message; - dns_name_t * qname; +sendquery(isc_task_t *task) { + dns_request_t *request; + dns_message_t *message; + dns_name_t *qname; dns_rdataset_t *qrdataset; - isc_result_t result; + isc_result_t result; dns_fixedname_t queryname; - isc_buffer_t buf; - static char host[256]; - int c; + isc_buffer_t buf; + static char host[256]; + int c; c = scanf("%255s", host); if (c == EOF) { @@ -188,8 +186,7 @@ sendquery(isc_task_t *task) } static void -sendqueries(isc_task_t *task, isc_event_t *event) -{ +sendqueries(isc_task_t *task, isc_event_t *event) { isc_result_t result; isc_event_free(&event); @@ -205,23 +202,22 @@ sendqueries(isc_task_t *task, isc_event_t *event) } int -main(int argc, char *argv[]) -{ - isc_sockaddr_t bind_any; - struct in_addr inaddr; - isc_result_t result; - isc_log_t * lctx; - isc_logconfig_t * lcfg; - isc_taskmgr_t * taskmgr; - isc_task_t * task; - isc_timermgr_t * timermgr; - isc_socketmgr_t * socketmgr; +main(int argc, char *argv[]) { + isc_sockaddr_t bind_any; + struct in_addr inaddr; + isc_result_t result; + isc_log_t *lctx; + isc_logconfig_t *lcfg; + isc_taskmgr_t *taskmgr; + isc_task_t *task; + isc_timermgr_t *timermgr; + isc_socketmgr_t *socketmgr; dns_dispatchmgr_t *dispatchmgr; - unsigned int attrs, attrmask; - dns_dispatch_t * dispatchv4; - dns_view_t * view; - uint16_t port = PORT; - int c; + unsigned int attrs, attrmask; + dns_dispatch_t *dispatchv4; + dns_view_t *view; + uint16_t port = PORT; + int c; RUNCHECK(isc_app_start()); diff --git a/bin/tests/system/rndc/gencheck.c b/bin/tests/system/rndc/gencheck.c index b590a869bd..fca84b6742 100644 --- a/bin/tests/system/rndc/gencheck.c +++ b/bin/tests/system/rndc/gencheck.c @@ -22,13 +22,12 @@ #define USAGE "usage: gencheck \n" static int -check(const char *buf, ssize_t count, size_t *start) -{ +check(const char *buf, ssize_t count, size_t *start) { const char chars[] = "abcdefghijklmnopqrstuvwxyz0123456789"; - ssize_t i; + ssize_t i; - for (i = 0; i < count; - i++, *start = (*start + 1) % (sizeof(chars) - 1)) { + for (i = 0; i < count; i++, *start = (*start + 1) % (sizeof(chars) - 1)) + { /* Just ignore the trailing newline */ if (buf[i] == '\n') { continue; @@ -42,14 +41,13 @@ check(const char *buf, ssize_t count, size_t *start) } int -main(int argc, char **argv) -{ - int ret; - int fd; +main(int argc, char **argv) { + int ret; + int fd; ssize_t count; - char buf[1024]; - size_t start; - size_t length; + char buf[1024]; + size_t start; + size_t length; ret = EXIT_FAILURE; fd = -1; diff --git a/bin/tests/system/rpz/dnsrps.c b/bin/tests/system/rpz/dnsrps.c index 368092776f..ea63152da3 100644 --- a/bin/tests/system/rpz/dnsrps.c +++ b/bin/tests/system/rpz/dnsrps.c @@ -46,25 +46,23 @@ 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" int -main(int argc, char **argv) -{ +main(int argc, char **argv) { #ifdef USE_DNSRPS - char cstr[sizeof("zone ") + 1024 + 10]; - librpz_clist_t * clist; + char cstr[sizeof("zone ") + 1024 + 10]; + librpz_clist_t *clist; librpz_client_t *client; - librpz_rsp_t * rsp; - uint32_t serial; + librpz_rsp_t *rsp; + uint32_t serial; #endif /* ifdef USE_DNSRPS */ - double seconds; + double seconds; librpz_emsg_t emsg; - char * p; - int i; + char *p; + int i; while ((i = getopt(argc, argv, "apn:w:")) != -1) { switch (i) { @@ -109,8 +107,8 @@ main(int argc, char **argv) " dnsrpzd-sock dnsrpzd.sock;" " dnsrpzd-rpzf dnsrpzd.rpzf", optarg); - client = - librpz->client_create(&emsg, clist, cstr, true); + client = librpz->client_create(&emsg, clist, cstr, + true); if (client == NULL) { fprintf(stderr, "## %s\n", emsg.c); return (1); @@ -158,8 +156,7 @@ main(int argc, char **argv) } static bool -link_dnsrps(librpz_emsg_t *emsg) -{ +link_dnsrps(librpz_emsg_t *emsg) { #ifdef USE_DNSRPS librpz = librpz_lib_open(emsg, NULL, DNSRPS_LIBRPZ_PATH); if (librpz == NULL) { diff --git a/bin/tests/system/rsabigexponent/bigkey.c b/bin/tests/system/rsabigexponent/bigkey.c index 3e9a3ca56f..5651f5adab 100644 --- a/bin/tests/system/rsabigexponent/bigkey.c +++ b/bin/tests/system/rsabigexponent/bigkey.c @@ -40,21 +40,21 @@ #include #include -dst_key_t * key; -dns_fixedname_t fname; -dns_name_t * name; -unsigned int bits = 1024U; -isc_mem_t * mctx; -isc_log_t * log_; -isc_logconfig_t * logconfig; -int level = ISC_LOG_WARNING; +dst_key_t *key; +dns_fixedname_t fname; +dns_name_t *name; +unsigned int bits = 1024U; +isc_mem_t *mctx; +isc_log_t *log_; +isc_logconfig_t *logconfig; +int level = ISC_LOG_WARNING; isc_logdestination_t destination; -char filename[255]; -isc_result_t result; -isc_buffer_t buf; -RSA * rsa; -BIGNUM * e; -EVP_PKEY * pkey; +char filename[255]; +isc_result_t result; +isc_buffer_t buf; +RSA *rsa; +BIGNUM *e; +EVP_PKEY *pkey; #define CHECK(op, msg) \ do { \ @@ -70,8 +70,7 @@ EVP_PKEY * pkey; } while (0) int -main(int argc, char **argv) -{ +main(int argc, char **argv) { UNUSED(argc); UNUSED(argv); @@ -82,7 +81,8 @@ main(int argc, char **argv) pkey = EVP_PKEY_new(); if ((rsa == NULL) || (e == NULL) || (pkey == NULL) || - !EVP_PKEY_set1_RSA(pkey, rsa)) { + !EVP_PKEY_set1_RSA(pkey, rsa)) + { fprintf(stderr, "fatal error: basic OpenSSL failure\n"); exit(1); } diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c index 09600fa8bc..3830d93dad 100644 --- a/bin/tests/system/tkey/keycreate.c +++ b/bin/tests/system/tkey/keycreate.c @@ -51,27 +51,26 @@ #define RUNCHECK(x) RUNTIME_CHECK((x) == ISC_R_SUCCESS) -#define PORT 5300 +#define PORT 5300 #define TIMEOUT 30 -static dst_key_t * ourkey; -static isc_mem_t * mctx; -static dns_tsigkey_t * tsigkey, *initialkey; +static dst_key_t *ourkey; +static isc_mem_t *mctx; +static dns_tsigkey_t *tsigkey, *initialkey; static dns_tsig_keyring_t *ring; -static unsigned char noncedata[16]; -static isc_buffer_t nonce; -static dns_requestmgr_t * requestmgr; -static const char * ownername_str = "."; +static unsigned char noncedata[16]; +static isc_buffer_t nonce; +static dns_requestmgr_t *requestmgr; +static const char *ownername_str = "."; static void -recvquery(isc_task_t *task, isc_event_t *event) -{ +recvquery(isc_task_t *task, isc_event_t *event) { dns_requestevent_t *reqev = (dns_requestevent_t *)event; - isc_result_t result; - dns_message_t * query, *response; - char keyname[256]; - isc_buffer_t keynamebuf; - int type; + isc_result_t result; + dns_message_t *query, *response; + char keyname[256]; + isc_buffer_t keynamebuf; + int type; UNUSED(task); @@ -125,19 +124,18 @@ recvquery(isc_task_t *task, isc_event_t *event) } static void -sendquery(isc_task_t *task, isc_event_t *event) -{ - struct in_addr inaddr; - isc_sockaddr_t address; - isc_region_t r; - isc_result_t result; +sendquery(isc_task_t *task, isc_event_t *event) { + struct in_addr inaddr; + isc_sockaddr_t address; + isc_region_t r; + isc_result_t result; dns_fixedname_t keyname; dns_fixedname_t ownername; - isc_buffer_t namestr, keybuf; - unsigned char keydata[9]; - dns_message_t * query; - dns_request_t * request; - static char keystr[] = "0123456789ab"; + isc_buffer_t namestr, keybuf; + unsigned char keydata[9]; + dns_message_t *query; + dns_request_t *request; + static char keystr[] = "0123456789ab"; isc_event_free(&event); @@ -191,24 +189,23 @@ sendquery(isc_task_t *task, isc_event_t *event) } int -main(int argc, char *argv[]) -{ - char * ourkeyname; - isc_taskmgr_t * taskmgr; - isc_timermgr_t * timermgr; - isc_socketmgr_t * socketmgr; - isc_socket_t * sock; - unsigned int attrs, attrmask; - isc_sockaddr_t bind_any; +main(int argc, char *argv[]) { + char *ourkeyname; + isc_taskmgr_t *taskmgr; + isc_timermgr_t *timermgr; + isc_socketmgr_t *socketmgr; + isc_socket_t *sock; + unsigned int attrs, attrmask; + isc_sockaddr_t bind_any; dns_dispatchmgr_t *dispatchmgr; - dns_dispatch_t * dispatchv4; - dns_view_t * view; - dns_tkeyctx_t * tctx; - isc_log_t * log; - isc_logconfig_t * logconfig; - isc_task_t * task; - isc_result_t result; - int type; + dns_dispatch_t *dispatchv4; + dns_view_t *view; + dns_tkeyctx_t *tctx; + isc_log_t *log; + isc_logconfig_t *logconfig; + isc_task_t *task; + isc_result_t result; + int type; RUNCHECK(isc_app_start()); diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c index d645406ad6..5ba9571631 100644 --- a/bin/tests/system/tkey/keydelete.c +++ b/bin/tests/system/tkey/keydelete.c @@ -50,20 +50,19 @@ #define RUNCHECK(x) RUNTIME_CHECK((x) == ISC_R_SUCCESS) -#define PORT 5300 +#define PORT 5300 #define TIMEOUT 30 -static isc_mem_t * mctx; -static dns_tsigkey_t * tsigkey; +static isc_mem_t *mctx; +static dns_tsigkey_t *tsigkey; static dns_tsig_keyring_t *ring; -static dns_requestmgr_t * requestmgr; +static dns_requestmgr_t *requestmgr; static void -recvquery(isc_task_t *task, isc_event_t *event) -{ +recvquery(isc_task_t *task, isc_event_t *event) { dns_requestevent_t *reqev = (dns_requestevent_t *)event; - isc_result_t result; - dns_message_t * query, *response; + isc_result_t result; + dns_message_t *query, *response; UNUSED(task); @@ -104,11 +103,10 @@ recvquery(isc_task_t *task, isc_event_t *event) } static void -sendquery(isc_task_t *task, isc_event_t *event) -{ +sendquery(isc_task_t *task, isc_event_t *event) { struct in_addr inaddr; isc_sockaddr_t address; - isc_result_t result; + isc_result_t result; dns_message_t *query; dns_request_t *request; @@ -135,25 +133,24 @@ sendquery(isc_task_t *task, isc_event_t *event) } int -main(int argc, char **argv) -{ - char * keyname; - isc_taskmgr_t * taskmgr; - isc_timermgr_t * timermgr; - isc_socketmgr_t * socketmgr; - isc_socket_t * sock; - unsigned int attrs, attrmask; - isc_sockaddr_t bind_any; +main(int argc, char **argv) { + char *keyname; + isc_taskmgr_t *taskmgr; + isc_timermgr_t *timermgr; + isc_socketmgr_t *socketmgr; + isc_socket_t *sock; + unsigned int attrs, attrmask; + isc_sockaddr_t bind_any; dns_dispatchmgr_t *dispatchmgr; - dns_dispatch_t * dispatchv4; - dns_view_t * view; - dns_tkeyctx_t * tctx; - dst_key_t * dstkey; - isc_log_t * log; - isc_logconfig_t * logconfig; - isc_task_t * task; - isc_result_t result; - int type; + dns_dispatch_t *dispatchv4; + dns_view_t *view; + dns_tkeyctx_t *tctx; + dst_key_t *dstkey; + isc_log_t *log; + isc_logconfig_t *logconfig; + isc_task_t *task; + isc_result_t result; + int type; RUNCHECK(isc_app_start()); diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c index 3cb65f2766..06435a31a3 100644 --- a/bin/tests/wire_test.c +++ b/bin/tests/wire_test.c @@ -24,20 +24,17 @@ #include #include -int parseflags = 0; +int parseflags = 0; isc_mem_t *mctx = NULL; -bool printmemstats = false; -bool dorender = false; +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) -{ +CHECKRESULT(isc_result_t result, const char *msg) { if (result != ISC_R_SUCCESS) { printf("%s: %s\n", msg, dns_result_totext(result)); @@ -46,8 +43,7 @@ CHECKRESULT(isc_result_t result, const char *msg) } static int -fromhex(char c) -{ +fromhex(char c) { if (c >= '0' && c <= '9') { return (c - '0'); } else if (c >= 'a' && c <= 'f') { @@ -62,8 +58,7 @@ fromhex(char c) } static void -usage(void) -{ +usage(void) { fprintf(stderr, "wire_test [-b] [-d] [-p] [-r] [-s]\n"); fprintf(stderr, " [-m {usage|trace|record|size|mctx}]\n"); fprintf(stderr, " [filename]\n\n"); @@ -76,19 +71,18 @@ usage(void) } static isc_result_t -printmessage(dns_message_t *msg) -{ +printmessage(dns_message_t *msg) { isc_buffer_t b; - char * buf = NULL; - int len = 1024; + char *buf = NULL; + int len = 1024; isc_result_t result = ISC_R_SUCCESS; do { buf = isc_mem_get(mctx, len); isc_buffer_init(&b, buf, len); - result = - dns_message_totext(msg, &dns_master_style_debug, 0, &b); + result = dns_message_totext(msg, &dns_master_style_debug, 0, + &b); if (result == ISC_R_NOSPACE) { isc_mem_put(mctx, buf, len); len *= 2; @@ -105,16 +99,15 @@ printmessage(dns_message_t *msg) } int -main(int argc, char *argv[]) -{ +main(int argc, char *argv[]) { isc_buffer_t *input = NULL; - bool need_close = false; - bool tcp = false; - bool rawdata = false; - isc_result_t result; - uint8_t c; - FILE * f; - int ch; + bool need_close = false; + bool tcp = false; + bool rawdata = false; + isc_result_t result; + uint8_t c; + FILE *f; + int ch; #define CMDLINE_FLAGS "bdm:prst" /* @@ -123,16 +116,16 @@ main(int argc, char *argv[]) while ((ch = isc_commandline_parse(argc, argv, CMDLINE_FLAGS)) != -1) { switch (ch) { case 'm': - if (strcasecmp(isc_commandline_argument, "record") == - 0) { + if (strcasecmp(isc_commandline_argument, "record") == 0) + { isc_mem_debugging |= ISC_MEM_DEBUGRECORD; } - if (strcasecmp(isc_commandline_argument, "trace") == - 0) { + if (strcasecmp(isc_commandline_argument, "trace") == 0) + { isc_mem_debugging |= ISC_MEM_DEBUGTRACE; } - if (strcasecmp(isc_commandline_argument, "usage") == - 0) { + if (strcasecmp(isc_commandline_argument, "usage") == 0) + { isc_mem_debugging |= ISC_MEM_DEBUGUSAGE; } if (strcasecmp(isc_commandline_argument, "size") == 0) { @@ -204,7 +197,7 @@ main(int argc, char *argv[]) char s[BUFSIZ]; while (fgets(s, sizeof(s), f) != NULL) { - char * rp = s, *wp = s; + char *rp = s, *wp = s; size_t i, len = 0; while (*rp != '\0') { @@ -276,11 +269,10 @@ main(int argc, char *argv[]) } static void -process_message(isc_buffer_t *source) -{ +process_message(isc_buffer_t *source) { dns_message_t *message; - isc_result_t result; - int i; + isc_result_t result; + int i; message = NULL; result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &message); @@ -300,8 +292,8 @@ process_message(isc_buffer_t *source) } if (dorender) { - unsigned char b2[64 * 1024]; - isc_buffer_t buffer; + unsigned char b2[64 * 1024]; + isc_buffer_t buffer; dns_compress_t cctx; isc_buffer_init(&buffer, b2, sizeof(b2)); diff --git a/bin/tools/arpaname.c b/bin/tools/arpaname.c index a3d9984e8d..b8fac99341 100644 --- a/bin/tools/arpaname.c +++ b/bin/tools/arpaname.c @@ -17,10 +17,9 @@ #define UNUSED(x) (void)(x) int -main(int argc, char *argv[]) -{ +main(int argc, char *argv[]) { unsigned char buf[16]; - int i; + int i; UNUSED(argc); diff --git a/bin/tools/dnstap-read.c b/bin/tools/dnstap-read.c index 3302d3205c..830626f7b7 100644 --- a/bin/tools/dnstap-read.c +++ b/bin/tools/dnstap-read.c @@ -51,10 +51,10 @@ #include isc_mem_t *mctx = NULL; -bool memrecord = false; -bool printmessage = false; -bool hexmessage = false; -bool yaml = false; +bool memrecord = false; +bool printmessage = false; +bool hexmessage = false; +bool yaml = false; const char *program = "dnstap-read"; @@ -68,12 +68,11 @@ 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, ...) -{ +fatal(const char *format, ...) { va_list args; fprintf(stderr, "%s: fatal: ", program); @@ -85,8 +84,7 @@ fatal(const char *format, ...) } static void -usage(void) -{ +usage(void) { fprintf(stderr, "dnstap-read [-mpxy] [filename]\n"); fprintf(stderr, "\t-m\ttrace memory allocations\n"); fprintf(stderr, "\t-p\tprint the full DNS message\n"); @@ -95,9 +93,8 @@ usage(void) } static void -print_dtdata(dns_dtdata_t *dt) -{ - isc_result_t result; +print_dtdata(dns_dtdata_t *dt) { + isc_result_t result; isc_buffer_t *b = NULL; isc_buffer_allocate(mctx, &b, 2048); @@ -116,11 +113,10 @@ cleanup: } static void -print_hex(dns_dtdata_t *dt) -{ +print_hex(dns_dtdata_t *dt) { isc_buffer_t *b = NULL; - isc_result_t result; - size_t textlen; + isc_result_t result; + size_t textlen; if (dt->msg == NULL) { return; @@ -145,10 +141,9 @@ cleanup: } static void -print_packet(dns_dtdata_t *dt, const dns_master_style_t *style) -{ +print_packet(dns_dtdata_t *dt, const dns_master_style_t *style) { isc_buffer_t *b = NULL; - isc_result_t result; + isc_result_t result; if (dt->msg != NULL) { size_t textlen = 2048; @@ -188,12 +183,11 @@ cleanup: } static void -print_yaml(dns_dtdata_t *dt) -{ - Dnstap__Dnstap * frame = dt->frame; - Dnstap__Message * m = frame->message; +print_yaml(dns_dtdata_t *dt) { + Dnstap__Dnstap *frame = dt->frame; + Dnstap__Message *m = frame->message; const ProtobufCEnumValue *ftype, *mtype; - static bool first = true; + static bool first = true; ftype = protobuf_c_enum_descriptor_get_value( &dnstap__dnstap__type__descriptor, frame->type); @@ -265,7 +259,7 @@ print_yaml(dns_dtdata_t *dt) if (m->has_query_address) { ProtobufCBinaryData *ip = &m->query_address; - char buf[100]; + char buf[100]; (void)inet_ntop(ip->len == 4 ? AF_INET : AF_INET6, ip->data, buf, sizeof(buf)); @@ -274,7 +268,7 @@ print_yaml(dns_dtdata_t *dt) if (m->has_response_address) { ProtobufCBinaryData *ip = &m->response_address; - char buf[100]; + char buf[100]; (void)inet_ntop(ip->len == 4 ? AF_INET : AF_INET6, ip->data, buf, sizeof(buf)); @@ -290,10 +284,10 @@ print_yaml(dns_dtdata_t *dt) } if (m->has_query_zone) { - isc_result_t result; - dns_fixedname_t fn; - dns_name_t * name; - isc_buffer_t b; + isc_result_t result; + dns_fixedname_t fn; + dns_name_t *name; + isc_buffer_t b; dns_decompress_t dctx; name = dns_fixedname_initname(&fn); @@ -327,14 +321,13 @@ print_yaml(dns_dtdata_t *dt) } int -main(int argc, char *argv[]) -{ - isc_result_t result; - dns_message_t * message = NULL; - isc_buffer_t * b = NULL; - dns_dtdata_t * dt = NULL; +main(int argc, char *argv[]) { + isc_result_t result; + dns_message_t *message = NULL; + isc_buffer_t *b = NULL; + dns_dtdata_t *dt = NULL; dns_dthandle_t *handle = NULL; - int rv = 0, ch; + int rv = 0, ch; while ((ch = isc_commandline_parse(argc, argv, "mpxy")) != -1) { switch (ch) { @@ -374,8 +367,8 @@ main(int argc, char *argv[]) for (;;) { isc_region_t input; - uint8_t * data; - size_t datalen; + uint8_t *data; + size_t datalen; result = dns_dt_getframe(handle, &data, &datalen); if (result == ISC_R_NOMORE) { diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c index 22206730b8..4af29957e3 100644 --- a/bin/tools/mdig.c +++ b/bin/tools/mdig.c @@ -71,75 +71,75 @@ isc_buffer_putstr(b, s); \ } -#define MXNAME (DNS_NAME_MAXTEXT + 1) -#define COMMSIZE 0xffff -#define OUTPUTBUF 32767 -#define MAXPORT 0xffff -#define PORT 53 +#define MXNAME (DNS_NAME_MAXTEXT + 1) +#define COMMSIZE 0xffff +#define OUTPUTBUF 32767 +#define MAXPORT 0xffff +#define PORT 53 #define MAXTIMEOUT 0xffff #define TCPTIMEOUT 10 #define UDPTIMEOUT 5 -#define MAXTRIES 0xffffffff +#define MAXTRIES 0xffffffff -static isc_mem_t * mctx; +static isc_mem_t *mctx; static dns_requestmgr_t *requestmgr; -static const char * batchname; -static FILE * batchfp; -static bool have_ipv4 = false; -static bool have_ipv6 = false; -static bool have_src = false; -static bool tcp_mode = false; -static bool besteffort = true; -static bool display_short_form = false; -static bool display_headers = true; -static bool display_comments = true; -static int display_rrcomments = 0; -static bool display_ttlunits = true; -static bool display_ttl = true; -static bool display_class = true; -static bool display_crypto = true; -static bool display_multiline = false; -static bool display_question = true; -static bool display_answer = true; -static bool display_authority = true; -static bool display_additional = true; -static bool display_unknown_format = false; -static bool yaml = false; -static bool continue_on_error = false; -static uint32_t display_splitwidth = 0xffffffff; -static isc_sockaddr_t srcaddr; -static char * server; -static isc_sockaddr_t dstaddr; -static in_port_t port = 53; -static isc_dscp_t dscp = -1; -static unsigned char cookie_secret[33]; -static int onfly = 0; -static char hexcookie[81]; +static const char *batchname; +static FILE *batchfp; +static bool have_ipv4 = false; +static bool have_ipv6 = false; +static bool have_src = false; +static bool tcp_mode = false; +static bool besteffort = true; +static bool display_short_form = false; +static bool display_headers = true; +static bool display_comments = true; +static int display_rrcomments = 0; +static bool display_ttlunits = true; +static bool display_ttl = true; +static bool display_class = true; +static bool display_crypto = true; +static bool display_multiline = false; +static bool display_question = true; +static bool display_answer = true; +static bool display_authority = true; +static bool display_additional = true; +static bool display_unknown_format = false; +static bool yaml = false; +static bool continue_on_error = false; +static uint32_t display_splitwidth = 0xffffffff; +static isc_sockaddr_t srcaddr; +static char *server; +static isc_sockaddr_t dstaddr; +static in_port_t port = 53; +static isc_dscp_t dscp = -1; +static unsigned char cookie_secret[33]; +static int onfly = 0; +static char hexcookie[81]; struct query { char textname[MXNAME]; /*% Name we're going to be * looking up */ - bool recurse; - bool have_aaonly; - bool have_adflag; - bool have_cdflag; - bool have_zflag; - bool dnssec; - bool expire; - bool send_cookie; - char * cookie; - bool nsid; - dns_rdatatype_t rdtype; + bool recurse; + bool have_aaonly; + bool have_adflag; + bool have_cdflag; + bool have_zflag; + bool dnssec; + bool expire; + bool send_cookie; + char *cookie; + bool nsid; + dns_rdatatype_t rdtype; dns_rdataclass_t rdclass; - uint16_t udpsize; - int16_t edns; - dns_ednsopt_t * ednsopts; - unsigned int ednsoptscnt; - unsigned int ednsflags; - isc_sockaddr_t * ecs_addr; - unsigned int timeout; - unsigned int udptimeout; - unsigned int udpretries; + uint16_t udpsize; + int16_t edns; + dns_ednsopt_t *ednsopts; + unsigned int ednsoptscnt; + unsigned int ednsflags; + isc_sockaddr_t *ecs_addr; + unsigned int timeout; + unsigned int udptimeout; + unsigned int udpretries; ISC_LINK(struct query) link; }; static struct query default_query; @@ -164,12 +164,11 @@ static const char *const rcodetext[] = { /*% safe rcodetext[] */ static char * -rcode_totext(dns_rcode_t rcode) -{ +rcode_totext(dns_rcode_t rcode) { static char buf[sizeof("?65535")]; union { const char *consttext; - char * deconsttext; + char *deconsttext; } totext; if (rcode >= (sizeof(rcodetext) / sizeof(rcodetext[0]))) { @@ -183,16 +182,15 @@ rcode_totext(dns_rcode_t rcode) /* receive response event handler */ static void -recvresponse(isc_task_t *task, isc_event_t *event) -{ - dns_requestevent_t * reqev = (dns_requestevent_t *)event; - isc_result_t result; - dns_message_t * query = NULL, *response = NULL; - unsigned int parseflags = 0; - isc_buffer_t * msgbuf = NULL, *buf = NULL; - unsigned int len = OUTPUTBUF; - dns_master_style_t * style = NULL; - unsigned int styleflags = 0; +recvresponse(isc_task_t *task, isc_event_t *event) { + dns_requestevent_t *reqev = (dns_requestevent_t *)event; + isc_result_t result; + dns_message_t *query = NULL, *response = NULL; + unsigned int parseflags = 0; + isc_buffer_t *msgbuf = NULL, *buf = NULL; + unsigned int len = OUTPUTBUF; + dns_master_style_t *style = NULL; + unsigned int styleflags = 0; dns_messagetextflag_t flags; UNUSED(task); @@ -291,17 +289,18 @@ recvresponse(isc_task_t *task, isc_event_t *event) isc_buffer_allocate(mctx, &buf, len); if (yaml) { - char sockstr[ISC_SOCKADDR_FORMATSIZE]; + char sockstr[ISC_SOCKADDR_FORMATSIZE]; uint16_t sport; - char * hash; - int pf; + char *hash; + int pf; printf("-\n"); printf(" type: MESSAGE\n"); printf(" message:\n"); if (((response->flags & DNS_MESSAGEFLAG_RD) != 0) && - ((response->flags & DNS_MESSAGEFLAG_RA) != 0)) { + ((response->flags & DNS_MESSAGEFLAG_RA) != 0)) + { printf(" type: RECURSIVE_RESPONSE\n"); } else { printf(" type: AUTH_RESPONSE\n"); @@ -384,7 +383,8 @@ recvresponse(isc_task_t *task, isc_event_t *event) response->counts[DNS_SECTION_ADDITIONAL]); if ((response->flags & DNS_MESSAGEFLAG_RD) != 0 && - (response->flags & DNS_MESSAGEFLAG_RA) == 0) { + (response->flags & DNS_MESSAGEFLAG_RA) == 0) + { printf(";; WARNING: recursion requested " "but not available\n"); } @@ -423,12 +423,12 @@ repopulate_buffer: } CHECK("dns_message_sectiontotext", result); } else if (display_answer) { - dns_name_t * name; + dns_name_t *name; dns_rdataset_t *rdataset; - isc_result_t loopresult; - dns_name_t empty_name; - dns_rdata_t rdata = DNS_RDATA_INIT; - unsigned int answerstyleflags = 0; + isc_result_t loopresult; + dns_name_t empty_name; + dns_rdata_t rdata = DNS_RDATA_INIT; + unsigned int answerstyleflags = 0; if (!display_crypto) { answerstyleflags |= DNS_STYLEFLAG_NOCRYPTO; @@ -454,7 +454,8 @@ repopulate_buffer: for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { loopresult = dns_rdataset_first(rdataset); while (loopresult == ISC_R_SUCCESS) { dns_rdataset_current(rdataset, &rdata); @@ -516,8 +517,8 @@ repopulate_buffer: CHECK("dns_message_pseudosectiontotext", result); } - if (display_headers && display_comments && !display_short_form && - !yaml) { + if (display_headers && display_comments && !display_short_form && !yaml) + { printf("\n"); } @@ -552,10 +553,9 @@ cleanup: */ static void add_opt(dns_message_t *msg, uint16_t udpsize, uint16_t edns, unsigned int flags, - dns_ednsopt_t *opts, size_t count) -{ + dns_ednsopt_t *opts, size_t count) { dns_rdataset_t *rdataset = NULL; - isc_result_t result; + isc_result_t result; result = dns_message_buildopt(msg, &rdataset, edns, udpsize, flags, opts, count); @@ -565,24 +565,22 @@ add_opt(dns_message_t *msg, uint16_t udpsize, uint16_t edns, unsigned int flags, } static void -compute_cookie(unsigned char *cookie, size_t len) -{ +compute_cookie(unsigned char *cookie, size_t len) { /* XXXMPA need to fix, should be per server. */ INSIST(len >= 8U); memmove(cookie, cookie_secret, 8); } static isc_result_t -sendquery(struct query *query, isc_task_t *task) -{ - dns_request_t * request; - dns_message_t * message; - dns_name_t * qname; +sendquery(struct query *query, isc_task_t *task) { + dns_request_t *request; + dns_message_t *message; + dns_name_t *qname; dns_rdataset_t *qrdataset; - isc_result_t result; + isc_result_t result; dns_fixedname_t queryname; - isc_buffer_t buf; - unsigned int options; + isc_buffer_t buf; + unsigned int options; onfly++; @@ -631,11 +629,12 @@ sendquery(struct query *query, isc_task_t *task) dns_message_addname(message, qname, DNS_SECTION_QUESTION); if (query->udpsize > 0 || query->dnssec || query->edns > -1 || - query->ecs_addr != NULL) { + query->ecs_addr != NULL) + { dns_ednsopt_t opts[EDNSOPTS + DNS_EDNSOPTIONS]; - unsigned int flags; - int i = 0; - char ecsbuf[20]; + unsigned int flags; + int i = 0; + char ecsbuf[20]; unsigned char cookie[40]; if (query->udpsize == 0) { @@ -654,13 +653,13 @@ sendquery(struct query *query, isc_task_t *task) } if (query->ecs_addr != NULL) { - uint8_t addr[16], family; - uint32_t plen; - struct sockaddr * sa; - struct sockaddr_in * sin; + uint8_t addr[16], family; + uint32_t plen; + struct sockaddr *sa; + struct sockaddr_in *sin; struct sockaddr_in6 *sin6; - size_t addrl; - isc_buffer_t b; + size_t addrl; + isc_buffer_t b; sa = &query->ecs_addr->type.sa; plen = query->ecs_addr->length; @@ -714,8 +713,8 @@ sendquery(struct query *query, isc_task_t *task) isc_buffer_t b; isc_buffer_init(&b, cookie, sizeof(cookie)); - result = - isc_hex_decodestring(query->cookie, &b); + result = isc_hex_decodestring(query->cookie, + &b); CHECK("isc_hex_decodestring", result); opts[i].value = isc_buffer_base(&b); opts[i].length = isc_buffer_usedlength(&b); @@ -764,8 +763,7 @@ sendquery(struct query *query, isc_task_t *task) } static void -sendqueries(isc_task_t *task, isc_event_t *event) -{ +sendqueries(isc_task_t *task, isc_event_t *event) { struct query *query = (struct query *)event->ev_arg; isc_event_free(&event); @@ -783,12 +781,10 @@ 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) -{ +usage(void) { fputs("Usage: mdig @server {global-opt} host\n" " {local-opt} [ host {local-opt} [...]]\n", stderr); @@ -800,8 +796,7 @@ usage(void) /*% help */ static void -help(void) -{ +help(void) { fputs("Usage: mdig @server {global-opt} host\n" " {local-opt} [ host {local-opt} [...]]\n", stdout); @@ -896,13 +891,11 @@ 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 -fatal(const char *format, ...) -{ +fatal(const char *format, ...) { va_list args; fflush(stdout); @@ -916,9 +909,8 @@ fatal(const char *format, ...) static isc_result_t parse_uint_helper(uint32_t *uip, const char *value, uint32_t max, - const char *desc, int base) -{ - uint32_t n; + const char *desc, int base) { + uint32_t n; isc_result_t result = isc_parse_uint32(&n, value, base); if (result == ISC_R_SUCCESS && n > max) { result = ISC_R_RANGE; @@ -933,20 +925,17 @@ parse_uint_helper(uint32_t *uip, const char *value, uint32_t max, } static isc_result_t -parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc) -{ +parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc) { return (parse_uint_helper(uip, value, max, desc, 10)); } static isc_result_t -parse_xint(uint32_t *uip, const char *value, uint32_t max, const char *desc) -{ +parse_xint(uint32_t *uip, const char *value, uint32_t max, const char *desc) { return (parse_uint_helper(uip, value, max, desc, 0)); } static void -newopts(struct query *query) -{ +newopts(struct query *query) { size_t len = sizeof(query->ednsopts[0]) * EDNSOPTS; size_t i; @@ -960,9 +949,8 @@ newopts(struct query *query) } static void -save_opt(struct query *query, char *code, char *value) -{ - uint32_t num; +save_opt(struct query *query, char *code, char *value) { + uint32_t num; isc_buffer_t b; isc_result_t result; @@ -998,14 +986,13 @@ save_opt(struct query *query, char *code, char *value) } static isc_result_t -parse_netprefix(isc_sockaddr_t **sap, const char *value) -{ +parse_netprefix(isc_sockaddr_t **sap, const char *value) { isc_sockaddr_t *sa = NULL; - struct in_addr in4; + struct in_addr in4; struct in6_addr in6; - uint32_t netmask = 0xffffffff; - char * slash = NULL; - bool parsed = false; + uint32_t netmask = 0xffffffff; + char *slash = NULL; + bool parsed = false; char buf[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:XXX.XXX.XXX.XXX/128")]; if (strlcpy(buf, value, sizeof(buf)) >= sizeof(buf)) { @@ -1070,8 +1057,7 @@ parse_netprefix(isc_sockaddr_t **sap, const char *value) * ISC_R_NOSPACE if that would advance p past 'end'. */ static isc_result_t -append(const char *text, int len, char **p, char *end) -{ +append(const char *text, int len, char **p, char *end) { if (len > end - *p) { return (ISC_R_NOSPACE); } @@ -1081,10 +1067,9 @@ append(const char *text, int len, char **p, char *end) } static isc_result_t -reverse_octets(const char *in, char **p, char *end) -{ +reverse_octets(const char *in, char **p, char *end) { const char *dot = strchr(in, '.'); - int len; + int len; if (dot != NULL) { isc_result_t result; result = reverse_octets(dot + 1, p, end); @@ -1099,10 +1084,9 @@ reverse_octets(const char *in, char **p, char *end) } static void -get_reverse(char *reverse, size_t len, const char *value) -{ - int r; - isc_result_t result; +get_reverse(char *reverse, size_t len, const char *value) { + int r; + isc_result_t result; isc_netaddr_t addr; addr.family = AF_INET6; @@ -1110,8 +1094,8 @@ get_reverse(char *reverse, size_t len, const char *value) if (r > 0) { /* This is a valid IPv6 address. */ dns_fixedname_t fname; - dns_name_t * name; - unsigned int options = 0; + dns_name_t *name; + unsigned int options = 0; name = dns_fixedname_initname(&fname); result = dns_byaddr_createptrname(&addr, options, name); @@ -1145,13 +1129,12 @@ get_reverse(char *reverse, size_t len, const char *value) */ static void -plus_option(char *option, struct query *query, bool global) -{ +plus_option(char *option, struct query *query, bool global) { isc_result_t result; - char * cmd, *value, *last = NULL, *code; - uint32_t num; - bool state = true; - size_t n; + char *cmd, *value, *last = NULL, *code; + uint32_t num; + bool state = true; + size_t n; INSIST(option != NULL); @@ -1672,21 +1655,20 @@ static const char *single_dash_opts = "46himv"; static const char *dash_opts = "46bcfhiptvx"; static bool dash_option(const char *option, char *next, struct query *query, bool global, - bool *setname) -{ - char opt; - const char * value; - isc_result_t result; - bool value_from_next; + bool *setname) { + char opt; + const char *value; + isc_result_t result; + bool value_from_next; isc_consttextregion_t tr; - dns_rdatatype_t rdtype; - dns_rdataclass_t rdclass; - char textname[MXNAME]; - struct in_addr in4; - struct in6_addr in6; - in_port_t srcport; - char * hash; - uint32_t num; + dns_rdatatype_t rdtype; + dns_rdataclass_t rdclass; + char textname[MXNAME]; + struct in_addr in4; + struct in6_addr in6; + in_port_t srcport; + char *hash; + uint32_t num; while (strpbrk(option, single_dash_opts) == &option[0]) { /* @@ -1827,8 +1809,7 @@ dash_option(const char *option, char *next, struct query *query, bool global, } static struct query * -clone_default_query() -{ +clone_default_query() { struct query *query; query = isc_mem_allocate(mctx, sizeof(struct query)); @@ -1857,12 +1838,11 @@ clone_default_query() * by its nature, so it can't be done in the main argument parser. */ static void -preparse_args(int argc, char **argv) -{ - int rc; +preparse_args(int argc, char **argv) { + int rc; char **rv; - char * option; - bool ipv4only = false, ipv6only = false; + char *option; + bool ipv4only = false, ipv6only = false; rc = argc; rv = argv; @@ -1911,16 +1891,15 @@ preparse_args(int argc, char **argv) } static void -parse_args(bool is_batchfile, int argc, char **argv) -{ +parse_args(bool is_batchfile, int argc, char **argv) { struct query *query = NULL; - char batchline[MXNAME]; - int bargc; - char * bargv[64]; - int rc; - char ** rv; - bool global = true; - char * last; + char batchline[MXNAME]; + int bargc; + char *bargv[64]; + int rc; + char **rv; + bool global = true; + char *last; /* * The semantics for parsing the args is a bit complex; if @@ -2038,13 +2017,15 @@ parse_args(bool is_batchfile, int argc, char **argv) } while (fgets(batchline, sizeof(batchline), batchfp) != 0) { if (batchline[0] == '\r' || batchline[0] == '\n' || - batchline[0] == '#' || batchline[0] == ';') { + batchline[0] == '#' || batchline[0] == ';') + { continue; } for (bargc = 1, bargv[bargc] = strtok_r( batchline, " \t\r\n", &last); (bargc < 14) && bargv[bargc]; bargc++, - bargv[bargc] = strtok_r(NULL, " \t\r\n", &last)) { + bargv[bargc] = strtok_r(NULL, " \t\r\n", &last)) + { /* empty body */ } @@ -2065,23 +2046,22 @@ parse_args(bool is_batchfile, int argc, char **argv) /*% Main processing routine for mdig */ int -main(int argc, char *argv[]) -{ - struct query * query; - isc_result_t result; - isc_sockaddr_t bind_any; - isc_log_t * lctx; - isc_logconfig_t * lcfg; - isc_taskmgr_t * taskmgr; - isc_task_t * task; - isc_timermgr_t * timermgr; - isc_socketmgr_t * socketmgr; +main(int argc, char *argv[]) { + struct query *query; + isc_result_t result; + isc_sockaddr_t bind_any; + isc_log_t *lctx; + isc_logconfig_t *lcfg; + isc_taskmgr_t *taskmgr; + isc_task_t *task; + isc_timermgr_t *timermgr; + isc_socketmgr_t *socketmgr; dns_dispatchmgr_t *dispatchmgr; - unsigned int attrs, attrmask; - dns_dispatch_t * dispatchvx; - dns_view_t * view; - int ns; - unsigned int i; + unsigned int attrs, attrmask; + dns_dispatch_t *dispatchvx; + dns_view_t *view; + int ns; + unsigned int i; RUNCHECK(isc_app_start()); diff --git a/bin/tools/named-journalprint.c b/bin/tools/named-journalprint.c index 4f457b0c5b..68bb04f844 100644 --- a/bin/tools/named-journalprint.c +++ b/bin/tools/named-journalprint.c @@ -27,11 +27,10 @@ * Setup logging to use stderr. */ static isc_result_t -setup_logging(isc_mem_t *mctx, FILE *errout, isc_log_t **logp) -{ +setup_logging(isc_mem_t *mctx, FILE *errout, isc_log_t **logp) { isc_logdestination_t destination; - isc_logconfig_t * logconfig = NULL; - isc_log_t * log = NULL; + isc_logconfig_t *logconfig = NULL; + isc_log_t *log = NULL; RUNTIME_CHECK(isc_log_create(mctx, &log, &logconfig) == ISC_R_SUCCESS); isc_log_setcontext(log); @@ -53,12 +52,11 @@ setup_logging(isc_mem_t *mctx, FILE *errout, isc_log_t **logp) } int -main(int argc, char **argv) -{ - char * file; - isc_mem_t * mctx = NULL; +main(int argc, char **argv) { + char *file; + isc_mem_t *mctx = NULL; isc_result_t result; - isc_log_t * lctx = NULL; + isc_log_t *lctx = NULL; if (argc != 2) { printf("usage: %s journal\n", argv[0]); diff --git a/bin/tools/named-nzd2nzf.c b/bin/tools/named-nzd2nzf.c index 342a099695..98d3429b4e 100644 --- a/bin/tools/named-nzd2nzf.c +++ b/bin/tools/named-nzd2nzf.c @@ -22,15 +22,14 @@ #include int -main(int argc, char *argv[]) -{ - int status; +main(int argc, char *argv[]) { + int status; const char *path; - MDB_env * env = NULL; - MDB_txn * txn = NULL; + MDB_env *env = NULL; + MDB_txn *txn = NULL; MDB_cursor *cursor = NULL; - MDB_dbi dbi; - MDB_val key, data; + MDB_dbi dbi; + MDB_val key, data; if (argc != 2) { fprintf(stderr, "Usage: named-nzd2nzf \n"); @@ -76,9 +75,11 @@ main(int argc, char *argv[]) for (status = mdb_cursor_get(cursor, &key, &data, MDB_FIRST); status == MDB_SUCCESS; - status = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) { + status = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) + { if (key.mv_data == NULL || key.mv_size == 0 || - data.mv_data == NULL || data.mv_size == 0) { + data.mv_data == NULL || data.mv_size == 0) + { fprintf(stderr, "named-nzd2nzf: empty column found in " "database '%s'", diff --git a/bin/tools/named-rrchecker.c b/bin/tools/named-rrchecker.c index 15d0f90f01..57a493198f 100644 --- a/bin/tools/named-rrchecker.c +++ b/bin/tools/named-rrchecker.c @@ -32,12 +32,10 @@ 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) -{ +usage(void) { fprintf(stderr, "usage: named-rrchecker [-o origin] [-hpCPTu]\n"); fprintf(stderr, "\t-h: print this help message\n"); fprintf(stderr, "\t-o origin: set origin to be used when " @@ -50,12 +48,11 @@ 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, ...) -{ +fatal(const char *format, ...) { va_list args; fprintf(stderr, "named-rrchecker: "); @@ -67,27 +64,26 @@ fatal(const char *format, ...) } int -main(int argc, char *argv[]) -{ - isc_token_t token; - isc_result_t result; - int c; - unsigned int options = 0; - dns_rdatatype_t rdtype; +main(int argc, char *argv[]) { + isc_token_t token; + isc_result_t result; + int c; + unsigned int options = 0; + dns_rdatatype_t rdtype; dns_rdataclass_t rdclass; - char text[256 * 1024]; - char data[64 * 1024]; - isc_buffer_t tbuf; - isc_buffer_t dbuf; - dns_rdata_t rdata = DNS_RDATA_INIT; - bool doexit = false; - bool once = false; - bool print = false; - bool unknown = false; - unsigned int t; - char * origin = NULL; - dns_fixedname_t fixed; - dns_name_t * name = NULL; + char text[256 * 1024]; + char data[64 * 1024]; + isc_buffer_t tbuf; + isc_buffer_t dbuf; + dns_rdata_t rdata = DNS_RDATA_INIT; + bool doexit = false; + bool once = false; + bool print = false; + bool unknown = false; + unsigned int t; + char *origin = NULL; + dns_fixedname_t fixed; + dns_name_t *name = NULL; while ((c = isc_commandline_parse(argc, argv, "ho:puCPT")) != -1) { switch (c) { @@ -182,7 +178,8 @@ main(int argc, char *argv[]) } while ((result = isc_lex_gettoken(lex, options | ISC_LEXOPT_NUMBER, - &token)) == ISC_R_SUCCESS) { + &token)) == ISC_R_SUCCESS) + { if (token.type == isc_tokentype_eof) { break; } diff --git a/bin/tools/nsec3hash.c b/bin/tools/nsec3hash.c index 11ddec508d..9f0739b0e7 100644 --- a/bin/tools/nsec3hash.c +++ b/bin/tools/nsec3hash.c @@ -32,12 +32,11 @@ 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, ...) -{ +fatal(const char *format, ...) { va_list args; fprintf(stderr, "%s: ", program); @@ -49,16 +48,14 @@ fatal(const char *format, ...) } static void -check_result(isc_result_t result, const char *message) -{ +check_result(isc_result_t result, const char *message) { if (result != ISC_R_SUCCESS) { fatal("%s: %s", message, isc_result_totext(result)); } } static void -usage() -{ +usage() { fprintf(stderr, "Usage: %s salt algorithm iterations domain\n", program); fprintf(stderr, " %s -r algorithm flags iterations salt domain\n", @@ -66,28 +63,27 @@ 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, - const char *iterstr, const char *saltstr, const char *domain) -{ + const char *iterstr, const char *saltstr, const char *domain) { dns_fixedname_t fixed; - dns_name_t * name; - isc_buffer_t buffer; - isc_region_t region; - isc_result_t result; - unsigned char hash[NSEC3_MAX_HASH_LENGTH]; - unsigned char salt[DNS_NSEC3_SALTSIZE]; - unsigned char text[1024]; - unsigned int hash_alg; - unsigned int flags; - unsigned int length; - unsigned int iterations; - unsigned int salt_length; - const char dash[] = "-"; + dns_name_t *name; + isc_buffer_t buffer; + isc_region_t region; + isc_result_t result; + unsigned char hash[NSEC3_MAX_HASH_LENGTH]; + unsigned char salt[DNS_NSEC3_SALTSIZE]; + unsigned char text[1024]; + unsigned int hash_alg; + unsigned int flags; + unsigned int length; + unsigned int iterations; + unsigned int salt_length; + const char dash[] = "-"; if (strcmp(saltstr, "-") == 0) { salt_length = 0; @@ -140,8 +136,7 @@ nsec3hash(nsec3printer *nsec3print, const char *algostr, const char *flagstr, static void nsec3hash_print(unsigned algo, unsigned flags, unsigned iters, - const char *saltstr, const char *domain, const char *digest) -{ + const char *saltstr, const char *domain, const char *digest) { UNUSED(flags); UNUSED(domain); @@ -152,17 +147,15 @@ nsec3hash_print(unsigned algo, unsigned flags, unsigned iters, static void nsec3hash_rdata_print(unsigned algo, unsigned flags, unsigned iters, const char *saltstr, const char *domain, - const char *digest) -{ + const char *digest) { fprintf(stdout, "%s NSEC3 %u %u %u %s %s\n", domain, algo, flags, iters, saltstr, digest); } int -main(int argc, char *argv[]) -{ +main(int argc, char *argv[]) { bool rdata_format = false; - int ch; + int ch; while ((ch = isc_commandline_parse(argc, argv, "-r")) != -1) { switch (ch) { diff --git a/bin/win32/BINDInstall/AccountInfo.h b/bin/win32/BINDInstall/AccountInfo.h index ab7c784a6b..4a23d00970 100644 --- a/bin/win32/BINDInstall/AccountInfo.h +++ b/bin/win32/BINDInstall/AccountInfo.h @@ -9,10 +9,10 @@ * information regarding copyright ownership. */ -#define RTN_OK 0 +#define RTN_OK 0 #define RTN_NOACCOUNT 1 -#define RTN_NOMEMORY 2 -#define RTN_ERROR 10 +#define RTN_NOMEMORY 2 +#define RTN_ERROR 10 #define SE_SERVICE_LOGON_PRIV L"SeServiceLogonRight" diff --git a/bin/win32/BINDInstall/BINDInstall.h b/bin/win32/BINDInstall/BINDInstall.h index 3230f52525..b51497a6b6 100644 --- a/bin/win32/BINDInstall/BINDInstall.h +++ b/bin/win32/BINDInstall/BINDInstall.h @@ -35,8 +35,7 @@ #include "resource.h" /* main symbols */ -class CBINDInstallApp : public CWinApp -{ +class CBINDInstallApp : public CWinApp { public: CBINDInstallApp(); diff --git a/bin/win32/BINDInstall/BINDInstallDlg.h b/bin/win32/BINDInstall/BINDInstallDlg.h index 788db45d75..576ccd2621 100644 --- a/bin/win32/BINDInstall/BINDInstallDlg.h +++ b/bin/win32/BINDInstall/BINDInstallDlg.h @@ -29,8 +29,7 @@ #ifndef BINDINSTALLDLG_H #define BINDINSTALLDLG_H -class CBINDInstallDlg : public CDialog -{ +class CBINDInstallDlg : public CDialog { public: CBINDInstallDlg(CWnd *pParent = NULL); /* standard constructor */ diff --git a/bin/win32/BINDInstall/DirBrowse.h b/bin/win32/BINDInstall/DirBrowse.h index f3b6c61716..1e75dc4b50 100644 --- a/bin/win32/BINDInstall/DirBrowse.h +++ b/bin/win32/BINDInstall/DirBrowse.h @@ -29,16 +29,15 @@ #ifndef DIRBROWSE_H #define DIRBROWSE_H -class CDirBrowse : public CDialog -{ +class CDirBrowse : public CDialog { /* Construction */ public: - CDirBrowse(CString initialDir = "\\", CWnd *pParent = NULL); /* standard - * constructor - */ + CDirBrowse(CString initialDir = "\\", + CWnd * pParent = NULL); /* standard + * constructor + */ CString - GetSelectedDir() - { + GetSelectedDir() { return (m_selectedDir); } diff --git a/bin/win32/BINDInstall/StdAfx.h b/bin/win32/BINDInstall/StdAfx.h index d29163f429..14cc91075c 100644 --- a/bin/win32/BINDInstall/StdAfx.h +++ b/bin/win32/BINDInstall/StdAfx.h @@ -6,7 +6,7 @@ /* * Minimum version is Windows 8 and Windows Server 2012 */ -#define _WIN32_WINNT 0x0602 +#define _WIN32_WINNT 0x0602 #define NTDDI_VERSION 0x06020000 #ifndef _CRT_SECURE_NO_DEPRECATE diff --git a/bin/win32/BINDInstall/VersionInfo.h b/bin/win32/BINDInstall/VersionInfo.h index 712e69b0e6..5191ddb638 100644 --- a/bin/win32/BINDInstall/VersionInfo.h +++ b/bin/win32/BINDInstall/VersionInfo.h @@ -9,14 +9,12 @@ #pragma once #endif /* _MSC_VER > 1000 */ -class CVersionInfo -{ +class CVersionInfo { public: CVersionInfo(CString filename); virtual ~CVersionInfo(); BOOL - IsValid() - { + IsValid() { return (m_isValid); } DWORD @@ -28,8 +26,7 @@ class CVersionInfo CopyFileNoVersion(CVersionInfo &originalFile); const CString & - GetFilename() - { + GetFilename() { return (m_filename); } diff --git a/bin/win32/BINDInstall/resource.h b/bin/win32/BINDInstall/resource.h index 9e5a7780d8..d643b230a0 100644 --- a/bin/win32/BINDInstall/resource.h +++ b/bin/win32/BINDInstall/resource.h @@ -2,104 +2,104 @@ /* Microsoft Developer Studio generated include file. */ /* Used by BINDInstall.rc */ /* */ -#define IDS_MAINFRAME 1 -#define IDS_CREATEDIR 2 -#define IDS_SUCCESS 3 -#define IDS_FAIL 4 -#define IDS_DIREXIST 5 -#define IDS_INSTALL_DIR 6 -#define IDS_INSTALL_FILE 7 -#define IDS_INSTALL_SERVICE 8 -#define IDS_INSTALL_MESSAGE 9 -#define IDS_UNINSTALL 14 -#define IDS_UNINSTALL_DONE 15 -#define IDS_CREATE_KEY 16 -#define IDS_ADD_REMOVE 17 -#define IDS_CLEANUP 18 -#define IDS_INSTALL_DONE 19 -#define IDS_CREATE_DIR 20 -#define IDS_REMOVE_DIR 21 -#define IDS_COPY_FILE 22 -#define IDS_DELETE_FILE 23 -#define IDS_OPEN_SCM 24 -#define IDS_CREATE_SERVICE 25 -#define IDS_OPEN_SERVICE 26 -#define IDS_REMOVE_SERVICE 27 -#define IDS_REGISTER_MESSAGES 28 -#define IDS_UNREGISTER_MESSAGES 29 -#define IDS_STOP_SERVICE 30 -#define IDS_START_SERVICE 31 -#define IDS_UNINSTALL_DIR 32 -#define IDS_UNINSTALL_FILES 33 -#define IDS_UNINSTALL_SERVICE 34 -#define IDS_UNINSTALL_MESSAGE 35 -#define IDS_ERR_OPEN_SCM 36 -#define IDS_ERR_OPEN_SERVICE 37 -#define IDS_ERR_STOP_SERVICE 38 -#define IDS_ERR_NONCRIT_FILE 39 -#define IDS_ERR_CRITICAL_FILE 40 -#define IDS_ERR_COPY_FILE 40 -#define IDS_ERR_CREATE_SERVICE 41 -#define IDS_ERR_REMOVE_SERVICE 42 -#define IDS_REBOOT 43 -#define IDS_BAD_PRIVILEGES 44 -#define IDS_ERR_CREATE_DIR 45 -#define IDS_VERSION 46 -#define IDS_ERR_CREATE_KEY 47 -#define IDS_ERR_SET_VALUE 48 -#define IDS_NO_VERSION 49 -#define IDS_EXISTING_NEWER 50 -#define IDS_FILE_BAD 51 -#define IDS_ERR_TOOPRIVED 52 -#define IDS_ERR_BADACCOUNT 53 -#define IDS_ERR_WRONGPRIV 54 -#define IDS_CREATEACCOUNT_FAILED 55 -#define IDS_ERR_PASSWORD 56 -#define IDS_ERR_UPDATE_SERVICE 57 -#define IDS_ERR_NULLPASSWORD 58 -#define IDS_ERR_WHITESPACE 59 -#define IDD_BINDINSTALL_DIALOG 102 -#define IDR_MAINFRAME 128 -#define IDD_BROWSE 129 -#define IDI_CHECK 130 -#define IDI_X 132 -#define IDC_CURSOR1 142 -#define IDD_DIALOG1 143 -#define IDC_TARGETDIR 1001 -#define IDC_BROWSE 1002 -#define IDC_DIRLIST 1004 -#define IDC_CURDIR 1005 -#define IDC_INSTALL 1006 -#define IDC_COPY_FILE 1007 -#define IDC_REG_SERVICE 1008 -#define IDC_REG_MESSAGE 1009 -#define IDC_CREATE_DIR 1010 -#define IDC_EXIT 1011 -#define IDC_DIR_TAG 1012 -#define IDC_COPY_TAG 1013 -#define IDC_SERVICE_TAG 1014 -#define IDC_MESSAGE_TAG 1015 -#define IDC_AUTO_START 1016 -#define IDC_UNINSTALL 1017 -#define IDC_VERSION 1018 -#define IDC_KEEP_FILES 1019 -#define IDC_CURRENT_TAG 1020 -#define IDC_DRIVES 1021 -#define IDC_CURRENT 1021 -#define IDC_START 1022 -#define IDC_ACCOUNT_NAME 1030 -#define IDC_ACCOUNT_PASSWORD 1031 +#define IDS_MAINFRAME 1 +#define IDS_CREATEDIR 2 +#define IDS_SUCCESS 3 +#define IDS_FAIL 4 +#define IDS_DIREXIST 5 +#define IDS_INSTALL_DIR 6 +#define IDS_INSTALL_FILE 7 +#define IDS_INSTALL_SERVICE 8 +#define IDS_INSTALL_MESSAGE 9 +#define IDS_UNINSTALL 14 +#define IDS_UNINSTALL_DONE 15 +#define IDS_CREATE_KEY 16 +#define IDS_ADD_REMOVE 17 +#define IDS_CLEANUP 18 +#define IDS_INSTALL_DONE 19 +#define IDS_CREATE_DIR 20 +#define IDS_REMOVE_DIR 21 +#define IDS_COPY_FILE 22 +#define IDS_DELETE_FILE 23 +#define IDS_OPEN_SCM 24 +#define IDS_CREATE_SERVICE 25 +#define IDS_OPEN_SERVICE 26 +#define IDS_REMOVE_SERVICE 27 +#define IDS_REGISTER_MESSAGES 28 +#define IDS_UNREGISTER_MESSAGES 29 +#define IDS_STOP_SERVICE 30 +#define IDS_START_SERVICE 31 +#define IDS_UNINSTALL_DIR 32 +#define IDS_UNINSTALL_FILES 33 +#define IDS_UNINSTALL_SERVICE 34 +#define IDS_UNINSTALL_MESSAGE 35 +#define IDS_ERR_OPEN_SCM 36 +#define IDS_ERR_OPEN_SERVICE 37 +#define IDS_ERR_STOP_SERVICE 38 +#define IDS_ERR_NONCRIT_FILE 39 +#define IDS_ERR_CRITICAL_FILE 40 +#define IDS_ERR_COPY_FILE 40 +#define IDS_ERR_CREATE_SERVICE 41 +#define IDS_ERR_REMOVE_SERVICE 42 +#define IDS_REBOOT 43 +#define IDS_BAD_PRIVILEGES 44 +#define IDS_ERR_CREATE_DIR 45 +#define IDS_VERSION 46 +#define IDS_ERR_CREATE_KEY 47 +#define IDS_ERR_SET_VALUE 48 +#define IDS_NO_VERSION 49 +#define IDS_EXISTING_NEWER 50 +#define IDS_FILE_BAD 51 +#define IDS_ERR_TOOPRIVED 52 +#define IDS_ERR_BADACCOUNT 53 +#define IDS_ERR_WRONGPRIV 54 +#define IDS_CREATEACCOUNT_FAILED 55 +#define IDS_ERR_PASSWORD 56 +#define IDS_ERR_UPDATE_SERVICE 57 +#define IDS_ERR_NULLPASSWORD 58 +#define IDS_ERR_WHITESPACE 59 +#define IDD_BINDINSTALL_DIALOG 102 +#define IDR_MAINFRAME 128 +#define IDD_BROWSE 129 +#define IDI_CHECK 130 +#define IDI_X 132 +#define IDC_CURSOR1 142 +#define IDD_DIALOG1 143 +#define IDC_TARGETDIR 1001 +#define IDC_BROWSE 1002 +#define IDC_DIRLIST 1004 +#define IDC_CURDIR 1005 +#define IDC_INSTALL 1006 +#define IDC_COPY_FILE 1007 +#define IDC_REG_SERVICE 1008 +#define IDC_REG_MESSAGE 1009 +#define IDC_CREATE_DIR 1010 +#define IDC_EXIT 1011 +#define IDC_DIR_TAG 1012 +#define IDC_COPY_TAG 1013 +#define IDC_SERVICE_TAG 1014 +#define IDC_MESSAGE_TAG 1015 +#define IDC_AUTO_START 1016 +#define IDC_UNINSTALL 1017 +#define IDC_VERSION 1018 +#define IDC_KEEP_FILES 1019 +#define IDC_CURRENT_TAG 1020 +#define IDC_DRIVES 1021 +#define IDC_CURRENT 1021 +#define IDC_START 1022 +#define IDC_ACCOUNT_NAME 1030 +#define IDC_ACCOUNT_PASSWORD 1031 #define IDC_ACCOUNT_PASSWORD_CONFIRM 1032 -#define IDC_TOOLS_ONLY 1033 -#define IDS_ERR_START_SERVICE 1034 +#define IDC_TOOLS_ONLY 1033 +#define IDS_ERR_START_SERVICE 1034 /* Next default values for new objects */ /* */ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 144 -#define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1027 -#define _APS_NEXT_SYMED_VALUE 104 +#define _APS_NEXT_COMMAND_VALUE 32771 +#define _APS_NEXT_CONTROL_VALUE 1027 +#define _APS_NEXT_SYMED_VALUE 104 #endif /* ifndef APSTUDIO_READONLY_SYMBOLS */ #endif /* ifdef APSTUDIO_INVOKED */ diff --git a/contrib/dlz/bin/dlzbdb/dlzbdb.c b/contrib/dlz/bin/dlzbdb/dlzbdb.c index 4c32ca2ad5..848a4e2423 100644 --- a/contrib/dlz/bin/dlzbdb/dlzbdb.c +++ b/contrib/dlz/bin/dlzbdb/dlzbdb.c @@ -69,47 +69,35 @@ /* 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 @@ -125,9 +113,9 @@ operation_listOrDelete(bool dlt); * database names change them here. */ -#define dlz_data "dns_data" -#define dlz_zone "dns_zone" -#define dlz_host "dns_host" +#define dlz_data "dns_data" +#define dlz_zone "dns_zone" +#define dlz_host "dns_host" #define dlz_client "dns_client" /*% @@ -141,22 +129,22 @@ operation_listOrDelete(bool dlt); /* A struct to hold all the relevant info about the database */ typedef struct bdb_instance { - DB_ENV *dbenv; /* BDB environment */ - DB * data; /* dns_data database handle */ - DBC * cursor; /* database cursor */ - DBC * cursor2; /* second cursor used during list operation. */ - DBC * cursor3; /* third cursor used during list operation */ - DBC * cursor4; /* fourth cursor used during list operation */ - DB * zone; /* zone database handle */ - DB * host; /* host database handle */ - DB * client; /* client database handle */ + DB_ENV *dbenv; /* BDB environment */ + DB *data; /* dns_data database handle */ + DBC *cursor; /* database cursor */ + DBC *cursor2; /* second cursor used during list operation. */ + DBC *cursor3; /* third cursor used during list operation */ + DBC *cursor4; /* fourth cursor used during list operation */ + DB *zone; /* zone database handle */ + DB *host; /* host database handle */ + DB *client; /* client database handle */ } bdb_instance_t; /* Possible operations */ #define list 1 /* list data */ #define dele 2 /* delete data */ -#define add 3 /* add a single piece of data */ +#define add 3 /* add a single piece of data */ #define bulk 4 /* bulk load data */ /*% @@ -234,23 +222,23 @@ typedef struct bdb_instance { int operation = 0; /*%< operation to perform. */ /*% allow new lock files or DB to be created. */ -bool create_allowed = false; +bool create_allowed = false; char *key = NULL; /*%< key to use in list & del operations */ /*% dump DB in DLZBDB bulk format */ -bool list_everything = false; +bool list_everything = false; unsigned int key_val; /*%< key as unsigned int used in list & del operations */ -char * zone = NULL; /*%< zone to use in list operations */ -char * host = NULL; /*%< host to use in list operations */ -char * c_zone = NULL; /*%< client zone to use in list operations */ -char * c_ip = NULL; /*%< client IP to use in list operations */ -char * a_data = NULL; /*%< data in add operation */ -char * bulk_file = NULL; /*%< bulk data file to load */ -char * db_envdir = NULL; /*%< BDB environment location */ -char * db_file = NULL; /*%< BDB database file location. */ +char *zone = NULL; /*%< zone to use in list operations */ +char *host = NULL; /*%< host to use in list operations */ +char *c_zone = NULL; /*%< client zone to use in list operations */ +char *c_ip = NULL; /*%< client IP to use in list operations */ +char *a_data = NULL; /*%< data in add operation */ +char *bulk_file = NULL; /*%< bulk data file to load */ +char *db_envdir = NULL; /*%< BDB environment location */ +char *db_file = NULL; /*%< BDB database file location. */ bdb_instance_t db; /* BDB instance we are operating on */ -isc_lex_t * lexer = NULL; /*%< lexer for use to use in parsing input */ -isc_mem_t * lex_mctx = NULL; /*%< memory context for lexer */ +isc_lex_t *lexer = NULL; /*%< lexer for use to use in parsing input */ +isc_mem_t *lex_mctx = NULL; /*%< memory context for lexer */ char lex_data_buf[max_data_len]; /*%< data array to use for lex_buffer below */ isc_buffer_t lex_buffer; /*%< buffer for lexer during add operation */ @@ -444,7 +432,8 @@ bdb_opendb(DBTYPE db_type, DB **db_out, const char *db_name, int flags) } /* open the database. */ if ((result = (*db_out)->open(*db_out, NULL, db_file, db_name, db_type, - createFlag, 0)) != 0) { + createFlag, 0)) != 0) + { fprintf(stderr, "BDB could not open %s database in %s. BDB error: %s", db_name, db_file, db_strerror(result)); @@ -507,12 +496,12 @@ insert_data(void) * strings */ isc_result_t result; - isc_token_t token; /* token from lexer */ - bool loop = true; - bool have_czone = false; - char data_arr[max_data_len]; + isc_token_t token; /* token from lexer */ + bool loop = true; + bool have_czone = false; + char data_arr[max_data_len]; isc_buffer_t buf; - char data_arr2[max_data_len]; + char data_arr2[max_data_len]; isc_buffer_t buf2; char data_type = 'u'; /* u =unknown, b =bad token, d/D =DNS, c/C =client * IP */ @@ -536,7 +525,8 @@ insert_data(void) * input */ if (strlen(token.value.as_pointer) > 1 || (data_type != 'd' && data_type != 'D' && - data_type != 'c' && data_type != 'C')) { + data_type != 'c' && data_type != 'C')) + { /* if not, set to 'b' so this line is * ignored. */ data_type = 'b'; @@ -575,8 +565,8 @@ insert_data(void) /* add string terminator to buffer */ isc_buffer_putmem(&buf, "\0", 1); put_data(true, NULL, (char *)&data_arr); - } else if (data_type == 'c' || - data_type == 'C') { + } else if (data_type == 'c' || data_type == 'C') + { put_data(false, (char *)&data_arr, (char *)&data_arr2); } else if (data_type == 'b') { @@ -625,7 +615,7 @@ data_cleanup: isc_result_t openBDB(void) { - int bdbres; + int bdbres; isc_result_t result; /* create BDB environment */ @@ -839,11 +829,11 @@ operation_bulk(void) isc_result_t bulk_write(char type, DB *database, DBC *dbcursor, DBT *bdbkey, DBT *bdbdata) { - int bdbres; + int bdbres; db_recno_t recNum; - char * retkey = NULL, *retdata; - size_t retklen = 0, retdlen; - void * p; + char *retkey = NULL, *retdata; + size_t retklen = 0, retdlen; + void *p; /* use a 5MB buffer for the bulk dump */ int buffer_size = 5 * 1024 * 1024; @@ -922,11 +912,11 @@ bulk_write(char type, DB *database, DBC *dbcursor, DBT *bdbkey, DBT *bdbdata) void operation_listOrDelete(bool dlt) { - int bdbres = 0; - DBC * curList[3]; - DBT bdbkey, bdbdata; + int bdbres = 0; + DBC *curList[3]; + DBT bdbkey, bdbdata; db_recno_t recno; - int curIndex = 0; + int curIndex = 0; /* verify that only allowed parameters were passed. */ if (dlt == true) { @@ -1172,7 +1162,7 @@ operation_listOrDelete(bool dlt) int main(int argc, char **argv) { - int ch; + int ch; char *endp; /* there has to be at least 2 args, some operations require more */ diff --git a/contrib/dlz/drivers/dlz_bdb_driver.c b/contrib/dlz/drivers/dlz_bdb_driver.c index 2911d9745c..df9ee3c1fb 100644 --- a/contrib/dlz/drivers/dlz_bdb_driver.c +++ b/contrib/dlz/drivers/dlz_bdb_driver.c @@ -65,9 +65,9 @@ static dns_sdlzimplementation_t *dlz_bdb = NULL; #define bdb_threads DB_THREAD /* BDB database names */ -#define dlz_data "dns_data" -#define dlz_zone "dns_zone" -#define dlz_host "dns_host" +#define dlz_data "dns_data" +#define dlz_zone "dns_zone" +#define dlz_host "dns_host" #define dlz_client "dns_client" /*% @@ -76,27 +76,28 @@ static dns_sdlzimplementation_t *dlz_bdb = NULL; */ typedef struct bdb_instance { - DB_ENV * dbenv; /*%< BDB environment */ - DB * data; /*%< dns_data database handle */ - DB * zone; /*%< zone database handle */ - DB * host; /*%< host database handle */ - DB * client; /*%< client database handle */ - isc_mem_t *mctx; /*%< memory context */ + DB_ENV *dbenv; /*%< BDB environment */ + DB *data; /*%< dns_data database handle */ + DB *zone; /*%< zone database handle */ + DB *host; /*%< host database handle */ + DB *client; /*%< client database handle */ + isc_mem_t *mctx; /*%< memory context */ } bdb_instance_t; typedef struct parsed_data { char *zone; char *host; char *type; - int ttl; + int ttl; char *data; } parsed_data_t; /* 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 @@ -210,10 +211,10 @@ static isc_result_t bdb_allowzonexfr(void *driverarg, void *dbdata, const char *name, const char *client) { - isc_result_t result; + isc_result_t result; bdb_instance_t *db = (bdb_instance_t *)dbdata; - DBC * client_cursor = NULL; - DBT key, data; + DBC *client_cursor = NULL; + DBT key, data; /* check to see if we are authoritative for the zone first. */ result = bdb_findzone(driverarg, dbdata, name, NULL, NULL); @@ -281,14 +282,14 @@ static isc_result_t bdb_allnodes(const char *zone, void *driverarg, void *dbdata, dns_sdlzallnodes_t *allnodes) { - isc_result_t result = ISC_R_NOTFOUND; + isc_result_t result = ISC_R_NOTFOUND; bdb_instance_t *db = (bdb_instance_t *)dbdata; - DBC * zone_cursor = NULL; - DBT key, data; - int flags; - int bdbres; - parsed_data_t pd; - char * tmp = NULL, *tmp_zone; + DBC *zone_cursor = NULL; + DBT key, data; + int flags; + int bdbres; + parsed_data_t pd; + char *tmp = NULL, *tmp_zone; UNUSED(driverarg); @@ -396,10 +397,10 @@ static isc_result_t bdb_findzone(void *driverarg, void *dbdata, const char *name, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { - isc_result_t result; + isc_result_t result; bdb_instance_t *db = (bdb_instance_t *)dbdata; - DBC * zone_cursor = NULL; - DBT key, data; + DBC *zone_cursor = NULL; + DBT key, data; UNUSED(driverarg); UNUSED(methods); @@ -460,17 +461,17 @@ bdb_lookup(const char *zone, const char *name, void *driverarg, void *dbdata, dns_sdlzlookup_t *lookup, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { - isc_result_t result = ISC_R_NOTFOUND; + isc_result_t result = ISC_R_NOTFOUND; bdb_instance_t *db = (bdb_instance_t *)dbdata; - DBC * zone_cursor = NULL; - DBC * host_cursor = NULL; - DBC * join_cursor = NULL; - DBT key, data; - DBC * cur_arr[3]; - int bdbres; - parsed_data_t pd; - char * tmp_zone, *tmp_host = NULL; - char * tmp = NULL; + DBC *zone_cursor = NULL; + DBC *host_cursor = NULL; + DBC *join_cursor = NULL; + DBT key, data; + DBC *cur_arr[3]; + int bdbres; + parsed_data_t pd; + char *tmp_zone, *tmp_host = NULL; + char *tmp = NULL; UNUSED(driverarg); UNUSED(methods); @@ -525,8 +526,8 @@ bdb_lookup(const char *zone, const char *name, void *driverarg, void *dbdata, db->data->join(db->data, cur_arr, &join_cursor, 0); - while ((bdbres = join_cursor->c_get(join_cursor, &key, &data, 0)) == - 0) { + while ((bdbres = join_cursor->c_get(join_cursor, &key, &data, 0)) == 0) + { tmp = realloc(tmp, data.size + 1); if (tmp == NULL) { goto lookup_cleanup; @@ -606,7 +607,8 @@ bdb_opendb(DB_ENV *db_env, DBTYPE db_type, DB **db, const char *db_name, /* open the database. */ if ((result = (*db)->open(*db, NULL, db_file, db_name, db_type, - DB_RDONLY | bdb_threads, 0)) != 0) { + DB_RDONLY | bdb_threads, 0)) != 0) + { isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DLZ, ISC_LOG_ERROR, "BDB could not open %s database in %s. " @@ -622,8 +624,8 @@ static isc_result_t bdb_create(const char *dlzname, unsigned int argc, char *argv[], void *driverarg, void **dbdata) { - isc_result_t result; - int bdbres; + isc_result_t result; + int bdbres; bdb_instance_t *db = NULL; UNUSED(dlzname); diff --git a/contrib/dlz/drivers/dlz_bdbhpt_driver.c b/contrib/dlz/drivers/dlz_bdbhpt_driver.c index 5d9b09b584..ac52f2b815 100644 --- a/contrib/dlz/drivers/dlz_bdbhpt_driver.c +++ b/contrib/dlz/drivers/dlz_bdbhpt_driver.c @@ -65,9 +65,9 @@ static dns_sdlzimplementation_t *dlz_bdbhpt = NULL; #define bdbhpt_threads DB_THREAD /* bdbhpt database names */ -#define dlz_data "dns_data" -#define dlz_zone "dns_zone" -#define dlz_xfr "dns_xfr" +#define dlz_data "dns_data" +#define dlz_zone "dns_zone" +#define dlz_xfr "dns_xfr" #define dlz_client "dns_client" /* This structure contains all the Berkeley DB handles @@ -75,26 +75,27 @@ static dns_sdlzimplementation_t *dlz_bdbhpt = NULL; */ typedef struct bdbhpt_instance { - DB_ENV * dbenv; /*%< bdbhpt environment */ - DB * data; /*%< dns_data database handle */ - DB * zone; /*%< zone database handle */ - DB * xfr; /*%< zone xfr database handle */ - DB * client; /*%< client database handle */ - isc_mem_t *mctx; /*%< memory context */ + DB_ENV *dbenv; /*%< bdbhpt environment */ + DB *data; /*%< dns_data database handle */ + DB *zone; /*%< zone database handle */ + DB *xfr; /*%< zone xfr database handle */ + DB *client; /*%< client database handle */ + isc_mem_t *mctx; /*%< memory context */ } bdbhpt_instance_t; typedef struct bdbhpt_parsed_data { char *host; char *type; - int ttl; + int ttl; char *data; } bdbhpt_parsed_data_t; /* 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. @@ -238,9 +239,9 @@ static isc_result_t bdbhpt_allowzonexfr(void *driverarg, void *dbdata, const char *name, const char *client) { - isc_result_t result; + isc_result_t result; bdbhpt_instance_t *db = (bdbhpt_instance_t *)dbdata; - DBT key, data; + DBT key, data; /* check to see if we are authoritative for the zone first. */ result = bdbhpt_findzone(driverarg, dbdata, name, NULL, NULL); @@ -322,16 +323,16 @@ static isc_result_t bdbhpt_allnodes(const char *zone, void *driverarg, 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; - DBC * dns_cursor = NULL; - DBT xfr_key, xfr_data, dns_key, dns_data; - int xfr_flags; - int dns_flags; - int bdbhptres; + isc_result_t result = ISC_R_NOTFOUND; + bdbhpt_instance_t *db = (bdbhpt_instance_t *)dbdata; + DBC *xfr_cursor = NULL; + DBC *dns_cursor = NULL; + DBT xfr_key, xfr_data, dns_key, dns_data; + int xfr_flags; + int dns_flags; + int bdbhptres; bdbhpt_parsed_data_t pd; - char * tmp = NULL, *tmp_zone, *tmp_zone_host = NULL; + char *tmp = NULL, *tmp_zone, *tmp_zone_host = NULL; UNUSED(driverarg); @@ -363,7 +364,8 @@ bdbhpt_allnodes(const char *zone, void *driverarg, void *dbdata, /* loop through xfr table for specified zone. */ while ((bdbhptres = xfr_cursor->c_get(xfr_cursor, &xfr_key, &xfr_data, - xfr_flags)) == 0) { + xfr_flags)) == 0) + { xfr_flags = DB_NEXT_DUP; /* +1 to allow for space between zone and host names */ @@ -387,7 +389,8 @@ bdbhpt_allnodes(const char *zone, void *driverarg, void *dbdata, while ((bdbhptres = dns_cursor->c_get(dns_cursor, &dns_key, &dns_data, dns_flags)) == - 0) { + 0) + { dns_flags = DB_NEXT_DUP; /* +1 to allow for null term at end of string. */ @@ -489,9 +492,9 @@ static isc_result_t bdbhpt_findzone(void *driverarg, void *dbdata, const char *name, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { - isc_result_t result; + isc_result_t result; bdbhpt_instance_t *db = (bdbhpt_instance_t *)dbdata; - DBT key, data; + DBT key, data; UNUSED(driverarg); UNUSED(methods); @@ -544,16 +547,16 @@ bdbhpt_lookup(const char *zone, const char *name, void *driverarg, void *dbdata, dns_sdlzlookup_t *lookup, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { - isc_result_t result = ISC_R_NOTFOUND; + isc_result_t result = ISC_R_NOTFOUND; bdbhpt_instance_t *db = (bdbhpt_instance_t *)dbdata; - DBC * data_cursor = NULL; - DBT key, data; - int bdbhptres; - int flags; + DBC *data_cursor = NULL; + DBT key, data; + int bdbhptres; + int flags; bdbhpt_parsed_data_t pd; - char * tmp = NULL; - char * keyStr = NULL; + char *tmp = NULL; + char *keyStr = NULL; UNUSED(driverarg); UNUSED(methods); @@ -651,7 +654,8 @@ bdbhpt_opendb(DB_ENV *db_env, DBTYPE db_type, DB **db, const char *db_name, /* open the database. */ if ((result = (*db)->open(*db, NULL, db_file, db_name, db_type, - DB_RDONLY | bdbhpt_threads, 0)) != 0) { + DB_RDONLY | bdbhpt_threads, 0)) != 0) + { isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DLZ, ISC_LOG_ERROR, "bdbhpt could not open %s database in %s. " @@ -667,9 +671,9 @@ static isc_result_t bdbhpt_create(const char *dlzname, unsigned int argc, char *argv[], void *driverarg, void **dbdata) { - isc_result_t result; - int bdbhptres; - int bdbFlags = 0; + isc_result_t result; + int bdbhptres; + int bdbFlags = 0; bdbhpt_instance_t *db = NULL; UNUSED(dlzname); diff --git a/contrib/dlz/drivers/dlz_filesystem_driver.c b/contrib/dlz/drivers/dlz_filesystem_driver.c index 31a9b4f7e7..db10052710 100644 --- a/contrib/dlz/drivers/dlz_filesystem_driver.c +++ b/contrib/dlz/drivers/dlz_filesystem_driver.c @@ -66,15 +66,15 @@ static dns_sdlzimplementation_t *dlz_fs = NULL; typedef struct config_data { - char * basedir; - int basedirsize; - char * datadir; - int datadirsize; - char * xfrdir; - int xfrdirsize; - int splitcnt; - char separator; - char pathsep; + char *basedir; + int basedirsize; + char *datadir; + int datadirsize; + char *xfrdir; + int xfrdirsize; + int splitcnt; + char separator; + char pathsep; isc_mem_t *mctx; } config_data_t; @@ -89,8 +89,7 @@ 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 @@ -170,7 +169,7 @@ create_path_helper(char *out, const char *in, config_data_t *cd) { char *tmpString; char *tmpPtr; - int i; + int i; tmpString = isc_mem_strdup(named_g_mctx, in); @@ -233,9 +232,9 @@ create_path(const char *zone, const char *host, const char *client, config_data_t *cd, char **path) { char *tmpPath; - int pathsize; - int len; - bool isroot = false; + int pathsize; + int len; + bool isroot = false; /* we require a zone & cd parameter */ REQUIRE(zone != NULL); @@ -349,22 +348,22 @@ static isc_result_t process_dir(isc_dir_t *dir, void *passback, config_data_t *cd, dlist_t *dir_list, unsigned int basedirlen) { - char tmp[PATH_MAX + NAME_MAX]; - int astPos; - struct stat sb; + char tmp[PATH_MAX + NAME_MAX]; + int astPos; + struct stat sb; isc_result_t result = ISC_R_FAILURE; - char * endp; - char * type; - char * ttlStr; - char * data; - char host[NAME_MAX]; - char * tmpString; - char * tmpPtr; - int ttl; - int i; - int len; + char *endp; + char *type; + char *ttlStr; + char *data; + char host[NAME_MAX]; + char *tmpString; + char *tmpPtr; + int ttl; + int i; + int len; dir_entry_t *direntry; - bool foundHost; + bool foundHost; tmp[0] = '\0'; /* set 1st byte to '\0' so strcpy works right. */ host[0] = '\0'; @@ -577,9 +576,9 @@ static isc_result_t fs_allowzonexfr(void *driverarg, void *dbdata, const char *name, const char *client) { - isc_result_t result; - char * path; - struct stat sb; + isc_result_t result; + char *path; + struct stat sb; config_data_t *cd; path = NULL; @@ -612,15 +611,15 @@ static isc_result_t fs_allnodes(const char *zone, void *driverarg, void *dbdata, dns_sdlzallnodes_t *allnodes) { - isc_result_t result; - dlist_t * dir_list; + isc_result_t result; + dlist_t *dir_list; config_data_t *cd; - char * basepath; - unsigned int basepathlen; - struct stat sb; - isc_dir_t dir; - dir_entry_t * dir_entry; - dir_entry_t * next_de; + char *basepath; + unsigned int basepathlen; + struct stat sb; + isc_dir_t dir; + dir_entry_t *dir_entry; + dir_entry_t *next_de; basepath = NULL; dir_list = NULL; @@ -728,8 +727,8 @@ fs_findzone(void *driverarg, void *dbdata, const char *name, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { isc_result_t result; - char * path; - struct stat sb; + char *path; + struct stat sb; path = NULL; UNUSED(driverarg); @@ -737,7 +736,8 @@ fs_findzone(void *driverarg, void *dbdata, const char *name, UNUSED(clientinfo); if (create_path(name, NULL, NULL, (config_data_t *)dbdata, &path) != - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { return (ISC_R_NOTFOUND); } @@ -770,9 +770,9 @@ fs_lookup(const char *zone, const char *name, void *driverarg, void *dbdata, dns_clientinfo_t *clientinfo) { isc_result_t result; - char * path; - struct stat sb; - isc_dir_t dir; + char *path; + struct stat sb; + isc_dir_t dir; path = NULL; UNUSED(driverarg); @@ -844,9 +844,9 @@ fs_create(const char *dlzname, unsigned int argc, char *argv[], void *driverarg, void **dbdata) { config_data_t *cd; - char * endp; - int len; - char pathsep; + char *endp; + int len; + char pathsep; UNUSED(driverarg); UNUSED(dlzname); @@ -931,7 +931,7 @@ fs_create(const char *dlzname, unsigned int argc, char *argv[], void *driverarg, static void fs_destroy(void *driverarg, void *dbdata) { - isc_mem_t * mctx; + isc_mem_t *mctx; config_data_t *cd; UNUSED(driverarg); diff --git a/contrib/dlz/drivers/dlz_ldap_driver.c b/contrib/dlz/drivers/dlz_ldap_driver.c index 3da3bf2369..4748d38f63 100644 --- a/contrib/dlz/drivers/dlz_ldap_driver.c +++ b/contrib/dlz/drivers/dlz_ldap_driver.c @@ -70,19 +70,19 @@ #include #define SIMPLE "simple" -#define KRB41 "krb41" -#define KRB42 "krb42" -#define V2 "v2" -#define V3 "v3" +#define KRB41 "krb41" +#define KRB42 "krb42" +#define V2 "v2" +#define V3 "v3" static dns_sdlzimplementation_t *dlz_ldap = NULL; #define dbc_search_limit 30 -#define ALLNODES 1 -#define ALLOWXFR 2 -#define AUTHORITY 3 -#define FINDZONE 4 -#define LOOKUP 5 +#define ALLNODES 1 +#define ALLOWXFR 2 +#define AUTHORITY 3 +#define FINDZONE 4 +#define LOOKUP 5 /*% * Structure to hold everthing needed by this "instance" of the LDAP @@ -91,23 +91,22 @@ static dns_sdlzimplementation_t *dlz_ldap = NULL; */ typedef struct { - db_list_t *db; /*%< handle to a list of DB */ - int method; /*%< security authentication method */ - char * user; /*%< who is authenticating */ - char * cred; /*%< password for simple authentication method */ - int protocol; /*%< LDAP communication protocol version */ - char * hosts; /*%< LDAP server hosts */ + db_list_t *db; /*%< handle to a list of DB */ + int method; /*%< security authentication method */ + char *user; /*%< who is authenticating */ + char *cred; /*%< password for simple authentication method */ + int protocol; /*%< LDAP communication protocol version */ + char *hosts; /*%< LDAP server hosts */ } ldap_instance_t; /* 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 @@ -118,7 +117,7 @@ static isc_result_t dlz_ldap_checkURL(char *URL, int attrCnt, const char *msg) { isc_result_t result = ISC_R_SUCCESS; - int ldap_result; + int ldap_result; LDAPURLDesc *ldap_url = NULL; if (!ldap_is_ldap_url(URL)) { @@ -195,7 +194,7 @@ static isc_result_t dlz_ldap_connect(ldap_instance_t *dbi, dbinstance_t *dbc) { isc_result_t result; - int ldap_result; + int ldap_result; /* if we have a connection, get ride of it. */ if (dbc->dbconn != NULL) { @@ -286,7 +285,7 @@ ldap_find_avail_conn(db_list_t *dblist) { dbinstance_t *dbi = NULL; dbinstance_t *head; - int count = 0; + int count = 0; /* get top of list */ head = dbi = ISC_LIST_HEAD(*dblist); @@ -319,17 +318,17 @@ ldap_process_results(LDAP *dbc, LDAPMessage *msg, char **attrs, void *ptr, bool allnodes) { isc_result_t result = ISC_R_SUCCESS; - int i = 0; - int j; - int len; - char * attribute = NULL; + int i = 0; + int j; + int len; + char *attribute = NULL; LDAPMessage *entry; - char * endp = NULL; - char * host = NULL; - char * type = NULL; - char * data = NULL; - char ** vals = NULL; - int ttl; + char *endp = NULL; + char *host = NULL; + char *type = NULL; + char *data = NULL; + char **vals = NULL; + int ttl; /* make sure there are at least some attributes to process. */ REQUIRE(attrs != NULL || attrs[0] != NULL); @@ -556,14 +555,14 @@ static isc_result_t ldap_get_results(const char *zone, const char *record, const char *client, unsigned int query, void *dbdata, void *ptr) { - isc_result_t result; + isc_result_t result; dbinstance_t *dbi = NULL; - char * querystring = NULL; - LDAPURLDesc * ldap_url = NULL; - int ldap_result = 0; - LDAPMessage * ldap_msg = NULL; - int i; - int entries; + char *querystring = NULL; + LDAPURLDesc *ldap_url = NULL; + int ldap_result = 0; + LDAPMessage *ldap_msg = NULL; + int i; + int entries; /* get db instance / connection */ /* find an available DBI from the list */ @@ -653,8 +652,8 @@ ldap_get_results(const char *zone, const char *record, const char *client, result = ISC_R_FAILURE; goto cleanup; } else { - querystring = - build_querystring(named_g_mctx, dbi->lookup_q); + querystring = build_querystring(named_g_mctx, + dbi->lookup_q); } break; default: @@ -876,7 +875,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); @@ -909,13 +908,13 @@ static isc_result_t dlz_ldap_create(const char *dlzname, unsigned int argc, char *argv[], void *driverarg, void **dbdata) { - isc_result_t result; + isc_result_t result; ldap_instance_t *ldap_inst = NULL; - dbinstance_t * dbi = NULL; - int protocol; - int method; - int dbcount; - char * endp; + dbinstance_t *dbi = NULL; + int protocol; + int method; + int dbcount; + char *endp; /* db_list_t *dblist = NULL; */ int i; diff --git a/contrib/dlz/drivers/dlz_mysql_driver.c b/contrib/dlz/drivers/dlz_mysql_driver.c index 2711bd14dd..57885476f7 100644 --- a/contrib/dlz/drivers/dlz_mysql_driver.c +++ b/contrib/dlz/drivers/dlz_mysql_driver.c @@ -65,12 +65,12 @@ static dns_sdlzimplementation_t *dlz_mysql = NULL; #define dbc_search_limit 30 -#define ALLNODES 1 -#define ALLOWXFR 2 -#define AUTHORITY 3 -#define FINDZONE 4 -#define COUNTZONE 5 -#define LOOKUP 6 +#define ALLNODES 1 +#define ALLOWXFR 2 +#define AUTHORITY 3 +#define FINDZONE 4 +#define COUNTZONE 5 +#define LOOKUP 6 #define safeGet(in) in == NULL ? "" : in @@ -89,7 +89,7 @@ static dns_sdlzimplementation_t *dlz_mysql = NULL; static char * mysqldrv_escape_string(MYSQL *mysql, const char *instr) { - char * outstr; + char *outstr; unsigned int len; if (instr == NULL) { @@ -119,12 +119,12 @@ static isc_result_t mysql_get_resultset(const char *zone, const char *record, const char *client, unsigned int query, void *dbdata, MYSQL_RES **rs) { - isc_result_t result; + isc_result_t result; dbinstance_t *dbi = NULL; - char * querystring = NULL; - unsigned int i = 0; - unsigned int j = 0; - int qres = 0; + char *querystring = NULL; + unsigned int i = 0; + unsigned int j = 0; + int qres = 0; if (query != COUNTZONE) { REQUIRE(*rs == NULL); @@ -228,8 +228,8 @@ mysql_get_resultset(const char *zone, const char *record, const char *client, * queries. */ if (record != NULL) { - dbi->record = - mysqldrv_escape_string((MYSQL *)dbi->dbconn, record); + dbi->record = mysqldrv_escape_string((MYSQL *)dbi->dbconn, + record); if (dbi->record == NULL) { result = ISC_R_NOMEMORY; goto cleanup; @@ -243,8 +243,8 @@ mysql_get_resultset(const char *zone, const char *record, const char *client, * queries. */ if (client != NULL) { - dbi->client = - mysqldrv_escape_string((MYSQL *)dbi->dbconn, client); + dbi->client = mysqldrv_escape_string((MYSQL *)dbi->dbconn, + client); if (dbi->client == NULL) { result = ISC_R_NOMEMORY; goto cleanup; @@ -360,13 +360,13 @@ static isc_result_t mysql_process_rs(dns_sdlzlookup_t *lookup, MYSQL_RES *rs) { isc_result_t result = ISC_R_NOTFOUND; - MYSQL_ROW row; + MYSQL_ROW row; unsigned int fields; unsigned int j; unsigned int len; - char * tmpString; - char * endp; - int ttl; + char *tmpString; + char *endp; + int ttl; row = mysql_fetch_row(rs); /* get a row from the result set */ fields = mysql_num_fields(rs); /* how many columns in result set */ @@ -478,7 +478,7 @@ mysql_findzone(void *driverarg, void *dbdata, const char *name, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { isc_result_t result; - MYSQL_RES * rs = NULL; + MYSQL_RES *rs = NULL; my_ulonglong rows; UNUSED(driverarg); @@ -519,7 +519,7 @@ mysql_allowzonexfr(void *driverarg, void *dbdata, const char *name, const char *client) { isc_result_t result; - MYSQL_RES * rs = NULL; + MYSQL_RES *rs = NULL; my_ulonglong rows; UNUSED(driverarg); @@ -578,14 +578,14 @@ mysql_allnodes(const char *zone, void *driverarg, void *dbdata, dns_sdlzallnodes_t *allnodes) { isc_result_t result; - MYSQL_RES * rs = NULL; - MYSQL_ROW row; + MYSQL_RES *rs = NULL; + MYSQL_ROW row; unsigned int fields; unsigned int j; unsigned int len; - char * tmpString; - char * endp; - int ttl; + char *tmpString; + char *endp; + int ttl; UNUSED(driverarg); @@ -684,7 +684,7 @@ mysql_authority(const char *zone, void *driverarg, void *dbdata, dns_sdlzlookup_t *lookup) { isc_result_t result; - MYSQL_RES * rs = NULL; + MYSQL_RES *rs = NULL; UNUSED(driverarg); @@ -719,7 +719,7 @@ mysql_lookup(const char *zone, const char *name, void *driverarg, void *dbdata, dns_clientinfo_t *clientinfo) { isc_result_t result; - MYSQL_RES * rs = NULL; + MYSQL_RES *rs = NULL; UNUSED(driverarg); UNUSED(methods); @@ -755,19 +755,19 @@ static isc_result_t mysql_create(const char *dlzname, unsigned int argc, char *argv[], void *driverarg, void **dbdata) { - isc_result_t result; + isc_result_t result; dbinstance_t *dbi = NULL; - char * tmp = NULL; - char * dbname = NULL; - char * host = NULL; - char * user = NULL; - char * pass = NULL; - char * socket = NULL; - int port; - MYSQL * dbc; - char * endp; - int j; - unsigned int flags = 0; + char *tmp = NULL; + char *dbname = NULL; + char *host = NULL; + char *user = NULL; + char *pass = NULL; + char *socket = NULL; + int port; + MYSQL *dbc; + char *endp; + int j; + unsigned int flags = 0; #if MYSQL_VERSION_ID >= 50000 my_bool auto_reconnect = 1; #endif /* if MYSQL_VERSION_ID >= 50000 */ @@ -909,7 +909,8 @@ mysql_create(const char *dlzname, unsigned int argc, char *argv[], #if MYSQL_VERSION_ID >= 50000 /* enable automatic reconnection. */ if (mysql_options((MYSQL *)dbi->dbconn, MYSQL_OPT_RECONNECT, - &auto_reconnect) != 0) { + &auto_reconnect) != 0) + { isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DLZ, ISC_LOG_WARNING, "mysql driver failed to set " diff --git a/contrib/dlz/drivers/dlz_odbc_driver.c b/contrib/dlz/drivers/dlz_odbc_driver.c index cb9d9b932a..d2e7cc07c2 100644 --- a/contrib/dlz/drivers/dlz_odbc_driver.c +++ b/contrib/dlz/drivers/dlz_odbc_driver.c @@ -67,11 +67,11 @@ static dns_sdlzimplementation_t *dlz_odbc = NULL; #define dbc_search_limit 30 -#define ALLNODES 1 -#define ALLOWXFR 2 -#define AUTHORITY 3 -#define FINDZONE 4 -#define LOOKUP 5 +#define ALLNODES 1 +#define ALLOWXFR 2 +#define AUTHORITY 3 +#define FINDZONE 4 +#define LOOKUP 5 #define sqlOK(a) ((a == SQL_SUCCESS || a == SQL_SUCCESS_WITH_INFO) ? -1 : 0) @@ -84,7 +84,7 @@ static dns_sdlzimplementation_t *dlz_odbc = NULL; */ typedef struct { - SQLHDBC dbc; + SQLHDBC dbc; SQLHSTMT stmnt; } odbc_db_t; @@ -95,17 +95,16 @@ typedef struct { */ typedef struct { - db_list_t *db; /* handle to a list of DB */ - SQLHENV sql_env; /* handle to SQL environment */ - SQLCHAR * dsn; - SQLCHAR * user; - SQLCHAR * pass; + db_list_t *db; /* handle to a list of DB */ + SQLHENV sql_env; /* handle to SQL environment */ + SQLCHAR *dsn; + SQLCHAR *user; + SQLCHAR *pass; } odbc_instance_t; /* 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 @@ -192,8 +191,8 @@ destroy_odbc_instance(odbc_instance_t *odbc_inst) static isc_result_t odbc_connect(odbc_instance_t *dbi, odbc_db_t **dbc) { - odbc_db_t * ndb = *dbc; - SQLRETURN sqlRes; + odbc_db_t *ndb = *dbc; + SQLRETURN sqlRes; isc_result_t result = ISC_R_SUCCESS; if (ndb != NULL) { @@ -286,7 +285,7 @@ odbc_find_avail_conn(db_list_t *dblist) { dbinstance_t *dbi = NULL; dbinstance_t *head; - int count = 0; + int count = 0; /* get top of list */ head = dbi = ISC_LIST_HEAD(*dblist); @@ -324,7 +323,7 @@ odbc_find_avail_conn(db_list_t *dblist) static char * odbc_escape_string(const char *instr) { - char * outstr; + char *outstr; unsigned int len; if (instr == NULL) { @@ -361,8 +360,8 @@ odbc_escape_string(const char *instr) static size_t odbc_makesafe(char *to, const char *from, size_t length) { - const char * source = from; - char * target = to; + const char *source = from; + char *target = to; unsigned int remaining = length; while (remaining > 0) { @@ -417,11 +416,11 @@ 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) { - isc_result_t result; + isc_result_t result; dbinstance_t *dbi = NULL; - char * querystring = NULL; - unsigned int j = 0; - SQLRETURN sqlRes; + char *querystring = NULL; + unsigned int j = 0; + SQLRETURN sqlRes; REQUIRE(*r_dbi == NULL); @@ -658,7 +657,8 @@ odbc_getField(SQLHSTMT *stmnt, SQLSMALLINT field, char **data) if (sqlOK(SQLColAttribute(stmnt, field, SQL_DESC_DISPLAY_SIZE, NULL, 0, NULL, &size)) && - size > 0) { + size > 0) + { *data = isc_mem_allocate(named_g_mctx, size + 1); if (data != NULL) { if (sqlOK(SQLGetData(stmnt, field, SQL_C_CHAR, *data, @@ -683,11 +683,11 @@ odbc_getManyFields(SQLHSTMT *stmnt, SQLSMALLINT startField, SQLSMALLINT endField, char **retData) { isc_result_t result; - SQLLEN size; - int totSize = 0; - SQLSMALLINT i; - int j = 0; - char * data; + SQLLEN size; + int totSize = 0; + SQLSMALLINT i; + int j = 0; + char *data; REQUIRE(retData != NULL && *retData == NULL); REQUIRE(startField > 0 && startField <= endField); @@ -696,7 +696,8 @@ odbc_getManyFields(SQLHSTMT *stmnt, SQLSMALLINT startField, for (i = startField; i <= endField; i++) { if (sqlOK(SQLColAttribute(stmnt, i, SQL_DESC_DISPLAY_SIZE, NULL, 0, NULL, &size)) && - size > 0) { + size > 0) + { { /* always allow for a " " (space) character */ totSize += (size + 1); @@ -749,13 +750,13 @@ static isc_result_t odbc_process_rs(dns_sdlzlookup_t *lookup, dbinstance_t *dbi) { isc_result_t result; - SQLSMALLINT fields; - SQLHSTMT * stmnt; - char * ttl_s; - char * type; - char * data; - char * endp; - int ttl; + SQLSMALLINT fields; + SQLHSTMT *stmnt; + char *ttl_s; + char *type; + char *data; + char *endp; + int ttl; REQUIRE(dbi != NULL); @@ -800,7 +801,8 @@ odbc_process_rs(dns_sdlzlookup_t *lookup, dbinstance_t *dbi) if ((result = odbc_getField(stmnt, 1, &type)) == ISC_R_SUCCESS && (result = odbc_getField(stmnt, 2, &data)) == - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { result = dns_sdlz_putrr(lookup, type, 86400, data); } @@ -815,9 +817,9 @@ odbc_process_rs(dns_sdlzlookup_t *lookup, dbinstance_t *dbi) ISC_R_SUCCESS && (result = odbc_getField(stmnt, 2, &type)) == ISC_R_SUCCESS && - (result = odbc_getManyFields(stmnt, 3, fields, - &data)) == - ISC_R_SUCCESS) { + (result = odbc_getManyFields( + stmnt, 3, fields, &data)) == ISC_R_SUCCESS) + { /* try to convert ttl string to int */ ttl = strtol(ttl_s, &endp, 10); /* failure converting ttl. */ @@ -884,7 +886,7 @@ static isc_result_t odbc_findzone(void *driverarg, void *dbdata, const char *name, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { - isc_result_t result; + isc_result_t result; dbinstance_t *dbi = NULL; UNUSED(driverarg); @@ -898,7 +900,8 @@ odbc_findzone(void *driverarg, void *dbdata, const char *name, /* Check that we got a result set with data */ if (result == ISC_R_SUCCESS && - !sqlOK(SQLFetch(((odbc_db_t *)(dbi->dbconn))->stmnt))) { + !sqlOK(SQLFetch(((odbc_db_t *)(dbi->dbconn))->stmnt))) + { result = ISC_R_NOTFOUND; } @@ -918,7 +921,7 @@ static isc_result_t odbc_allowzonexfr(void *driverarg, void *dbdata, const char *name, const char *client) { - isc_result_t result; + isc_result_t result; dbinstance_t *dbi = NULL; UNUSED(driverarg); @@ -948,7 +951,8 @@ odbc_allowzonexfr(void *driverarg, void *dbdata, const char *name, /* Check that we got a result set with data */ if (result == ISC_R_SUCCESS && - !sqlOK(SQLFetch(((odbc_db_t *)(dbi->dbconn))->stmnt))) { + !sqlOK(SQLFetch(((odbc_db_t *)(dbi->dbconn))->stmnt))) + { result = ISC_R_NOPERM; } @@ -973,16 +977,16 @@ static isc_result_t odbc_allnodes(const char *zone, void *driverarg, void *dbdata, dns_sdlzallnodes_t *allnodes) { - isc_result_t result; + isc_result_t result; dbinstance_t *dbi = NULL; - SQLHSTMT * stmnt; - SQLSMALLINT fields; - char * data; - char * type; - char * ttl_s; - int ttl; - char * host; - char * endp; + SQLHSTMT *stmnt; + SQLSMALLINT fields; + char *data; + char *type; + char *ttl_s; + int ttl; + char *host; + char *endp; UNUSED(driverarg); @@ -1041,7 +1045,8 @@ odbc_allnodes(const char *zone, void *driverarg, void *dbdata, (result = odbc_getField(stmnt, 3, &host)) == ISC_R_SUCCESS && (result = odbc_getManyFields(stmnt, 4, fields, &data)) == - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { /* convert ttl string to int */ ttl = strtol(ttl_s, &endp, 10); /* failure converting ttl. */ @@ -1105,7 +1110,7 @@ static isc_result_t odbc_authority(const char *zone, void *driverarg, void *dbdata, dns_sdlzlookup_t *lookup) { - isc_result_t result; + isc_result_t result; dbinstance_t *dbi = NULL; UNUSED(driverarg); @@ -1136,7 +1141,7 @@ odbc_lookup(const char *zone, const char *name, void *driverarg, void *dbdata, dns_sdlzlookup_t *lookup, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { - isc_result_t result; + isc_result_t result; dbinstance_t *dbi = NULL; UNUSED(driverarg); @@ -1168,13 +1173,13 @@ static isc_result_t odbc_create(const char *dlzname, unsigned int argc, char *argv[], void *driverarg, void **dbdata) { - isc_result_t result; + isc_result_t result; odbc_instance_t *odbc_inst = NULL; - dbinstance_t * db = NULL; - SQLRETURN sqlRes; - int dbcount; - int i; - char * endp; + dbinstance_t *db = NULL; + SQLRETURN sqlRes; + int dbcount; + int i; + char *endp; UNUSED(dlzname); UNUSED(driverarg); diff --git a/contrib/dlz/drivers/dlz_postgres_driver.c b/contrib/dlz/drivers/dlz_postgres_driver.c index 1499e2a62f..fa9dfa1b2d 100644 --- a/contrib/dlz/drivers/dlz_postgres_driver.c +++ b/contrib/dlz/drivers/dlz_postgres_driver.c @@ -69,11 +69,11 @@ static dns_sdlzimplementation_t *dlz_postgres = NULL; #define dbc_search_limit 30 -#define ALLNODES 1 -#define ALLOWXFR 2 -#define AUTHORITY 3 -#define FINDZONE 4 -#define LOOKUP 5 +#define ALLNODES 1 +#define ALLOWXFR 2 +#define AUTHORITY 3 +#define FINDZONE 4 +#define LOOKUP 5 /* * Private methods @@ -109,8 +109,8 @@ static dns_sdlzimplementation_t *dlz_postgres = NULL; static size_t postgres_makesafe(char *to, const char *from, size_t length) { - const char * source = from; - char * target = to; + const char *source = from; + char *target = to; unsigned int remaining = length; while (remaining > 0) { @@ -190,7 +190,7 @@ postgres_find_avail_conn(db_list_t *dblist) { dbinstance_t *dbi = NULL; dbinstance_t *head; - int count = 0; + int count = 0; /* get top of list */ head = dbi = ISC_LIST_HEAD(*dblist); @@ -229,7 +229,7 @@ postgres_find_avail_conn(db_list_t *dblist) static char * postgres_escape_string(const char *instr) { - char * outstr; + char *outstr; unsigned int len; if (instr == NULL) { @@ -266,11 +266,11 @@ static isc_result_t postgres_get_resultset(const char *zone, const char *record, const char *client, unsigned int query, void *dbdata, PGresult **rs) { - isc_result_t result; + isc_result_t result; dbinstance_t *dbi = NULL; - char * querystring = NULL; - unsigned int i = 0; - unsigned int j = 0; + char *querystring = NULL; + unsigned int i = 0; + unsigned int j = 0; #if 0 /* temporarily get a unique thread # */ @@ -617,9 +617,9 @@ postgres_process_rs(dns_sdlzlookup_t *lookup, PGresult *rs) unsigned int fields; unsigned int j; unsigned int len; - char * tmpString; - char * endp; - int ttl; + char *tmpString; + char *endp; + int ttl; rows = PQntuples(rs); /* how many rows in result set */ fields = PQnfields(rs); /* how many columns in result set */ @@ -730,10 +730,10 @@ 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; + PGresult *rs = NULL; unsigned int rows; UNUSED(driverarg); @@ -741,8 +741,8 @@ postgres_findzone(void *driverarg, void *dbdata, const char *name, UNUSED(clientinfo); /* run the query and get the result set from the database. */ - result = - postgres_get_resultset(name, NULL, NULL, FINDZONE, dbdata, &rs); + result = postgres_get_resultset(name, NULL, NULL, FINDZONE, dbdata, + &rs); /* if we didn't get a result set, log an err msg. */ if (result != ISC_R_SUCCESS) { if (rs != NULL) { @@ -774,7 +774,7 @@ postgres_allowzonexfr(void *driverarg, void *dbdata, const char *name, const char *client) { isc_result_t result; - PGresult * rs = NULL; + PGresult *rs = NULL; unsigned int rows; UNUSED(driverarg); @@ -833,21 +833,21 @@ postgres_allnodes(const char *zone, void *driverarg, void *dbdata, dns_sdlzallnodes_t *allnodes) { isc_result_t result; - PGresult * rs = NULL; + PGresult *rs = NULL; unsigned int i; unsigned int rows; unsigned int fields; unsigned int j; unsigned int len; - char * tmpString; - char * endp; - int ttl; + char *tmpString; + char *endp; + int ttl; UNUSED(driverarg); /* run the query and get the result set from the database. */ - result = - postgres_get_resultset(zone, NULL, NULL, ALLNODES, dbdata, &rs); + result = postgres_get_resultset(zone, NULL, NULL, ALLNODES, dbdata, + &rs); /* if we get "not implemented", send it along */ if (result == ISC_R_NOTIMPLEMENTED) { return (result); @@ -945,7 +945,7 @@ postgres_authority(const char *zone, void *driverarg, void *dbdata, dns_sdlzlookup_t *lookup) { isc_result_t result; - PGresult * rs = NULL; + PGresult *rs = NULL; UNUSED(driverarg); @@ -982,7 +982,7 @@ postgres_lookup(const char *zone, const char *name, void *driverarg, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { isc_result_t result; - PGresult * rs = NULL; + PGresult *rs = NULL; UNUSED(driverarg); UNUSED(methods); @@ -1018,15 +1018,15 @@ static isc_result_t postgres_create(const char *dlzname, unsigned int argc, char *argv[], void *driverarg, void **dbdata) { - isc_result_t result; + isc_result_t result; dbinstance_t *dbi = NULL; - unsigned int j; + unsigned int j; /* if multi-threaded, we need a few extra variables. */ - int dbcount; + int dbcount; db_list_t *dblist = NULL; - int i; - char * endp; + int i; + char *endp; UNUSED(driverarg); UNUSED(dlzname); diff --git a/contrib/dlz/drivers/dlz_stub_driver.c b/contrib/dlz/drivers/dlz_stub_driver.c index 2051c69ed4..f0c78bfa80 100644 --- a/contrib/dlz/drivers/dlz_stub_driver.c +++ b/contrib/dlz/drivers/dlz_stub_driver.c @@ -61,9 +61,9 @@ static dns_sdlzimplementation_t *dlz_stub = NULL; typedef struct config_data { - char * myzone; - char * myname; - char * myip; + char *myzone; + char *myname; + char *myip; isc_mem_t *mctx; } config_data_t; @@ -76,7 +76,7 @@ stub_dlz_allnodes(const char *zone, void *driverarg, void *dbdata, dns_sdlzallnodes_t *allnodes) { config_data_t *cd; - isc_result_t result; + isc_result_t result; UNUSED(zone); UNUSED(driverarg); @@ -121,7 +121,7 @@ static isc_result_t stub_dlz_authority(const char *zone, void *driverarg, void *dbdata, dns_sdlzlookup_t *lookup) { - isc_result_t result; + isc_result_t result; config_data_t *cd; UNUSED(driverarg); @@ -148,7 +148,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; @@ -175,7 +175,7 @@ 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) { - isc_result_t result; + isc_result_t result; config_data_t *cd; UNUSED(zone); @@ -240,7 +240,7 @@ static void stub_dlz_destroy(void *driverarg, void *dbdata) { config_data_t *cd; - isc_mem_t * mctx; + isc_mem_t *mctx; UNUSED(driverarg); diff --git a/contrib/dlz/drivers/include/dlz/sdlz_helper.h b/contrib/dlz/drivers/include/dlz/sdlz_helper.h index a170292c4c..4ffa13836d 100644 --- a/contrib/dlz/drivers/include/dlz/sdlz_helper.h +++ b/contrib/dlz/drivers/include/dlz/sdlz_helper.h @@ -42,9 +42,9 @@ * Types */ #define SDLZH_REQUIRE_CLIENT 0x01 -#define SDLZH_REQUIRE_QUERY 0x02 +#define SDLZH_REQUIRE_QUERY 0x02 #define SDLZH_REQUIRE_RECORD 0x04 -#define SDLZH_REQUIRE_ZONE 0x08 +#define SDLZH_REQUIRE_ZONE 0x08 typedef struct query_segment query_segment_t; typedef ISC_LIST(query_segment_t) query_list_t; @@ -110,8 +110,8 @@ sdlzh_get_parameter_value(isc_mem_t *mctx, const char *input, const char *key); /* Compatability with existing DLZ drivers */ -#define build_querystring sdlzh_build_querystring -#define build_sqldbinstance sdlzh_build_sqldbinstance +#define build_querystring sdlzh_build_querystring +#define build_sqldbinstance sdlzh_build_sqldbinstance #define destroy_sqldbinstance sdlzh_destroy_sqldbinstance #define getParameterValue(x, y) \ diff --git a/contrib/dlz/drivers/sdlz_helper.c b/contrib/dlz/drivers/sdlz_helper.c index 636401bb6b..2c4d50abe9 100644 --- a/contrib/dlz/drivers/sdlz_helper.c +++ b/contrib/dlz/drivers/sdlz_helper.c @@ -102,15 +102,15 @@ build_querylist(isc_mem_t *mctx, const char *query_str, char **zone, char **record, char **client, query_list_t **querylist, unsigned int flags) { - isc_result_t result; - bool foundzone = false; - bool foundrecord = false; - bool foundclient = false; - char * free_me = NULL; - char * temp_str = NULL; - query_list_t * tql; + isc_result_t result; + bool foundzone = false; + bool foundrecord = false; + bool foundclient = false; + char *free_me = NULL; + char *temp_str = NULL; + query_list_t *tql; query_segment_t *tseg = NULL; - char * last = NULL; + char *last = NULL; REQUIRE(querylist != NULL && *querylist == NULL); REQUIRE(mctx != NULL); @@ -271,8 +271,8 @@ char * sdlzh_build_querystring(isc_mem_t *mctx, query_list_t *querylist) { query_segment_t *tseg = NULL; - unsigned int length = 0; - char * qs = NULL; + unsigned int length = 0; + char *qs = NULL; REQUIRE(mctx != NULL); REQUIRE(querylist != NULL); @@ -321,7 +321,7 @@ sdlzh_build_sqldbinstance(isc_mem_t *mctx, const char *allnodes_str, const char *findzone_str, const char *lookup_str, const char *countzone_str, dbinstance_t **dbi) { - isc_result_t result; + isc_result_t result; dbinstance_t *db = NULL; REQUIRE(dbi != NULL && *dbi == NULL); @@ -460,10 +460,10 @@ sdlzh_destroy_sqldbinstance(dbinstance_t *dbi) char * sdlzh_get_parameter_value(isc_mem_t *mctx, const char *input, const char *key) { - int keylen; + int keylen; char *keystart; - char value[255]; - int i; + char value[255]; + int i; if (key == NULL || input == NULL || strlen(input) < 1) { return (NULL); diff --git a/contrib/dlz/example/dlz_example.c b/contrib/dlz/example/dlz_example.c index 37090bddca..a592642897 100644 --- a/contrib/dlz/example/dlz_example.c +++ b/contrib/dlz/example/dlz_example.c @@ -37,9 +37,9 @@ /* For this simple example, use fixed sized strings */ struct record { - char name[100]; - char type[10]; - char data[200]; + char name[100]; + char type[10]; + char data[200]; dns_ttl_t ttl; }; @@ -56,9 +56,9 @@ struct dlz_example_data { bool transaction_started; /* Helper functions from the dlz_dlopen driver */ - log_t * log; - dns_sdlz_putrr_t * putrr; - dns_sdlz_putnamedrr_t * putnamedrr; + log_t *log; + dns_sdlz_putrr_t *putrr; + dns_sdlz_putnamedrr_t *putnamedrr; dns_dlz_writeablezone_t *writeable_zone; }; @@ -66,7 +66,7 @@ static bool single_valued(const char *type) { const char *single[] = { "soa", "cname", NULL }; - int i; + int i; for (i = 0; single[i]; i++) { if (strcasecmp(single[i], type) == 0) { @@ -83,9 +83,9 @@ 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) { - int i; + int i; bool single = single_valued(type); - int first_empty = -1; + int first_empty = -1; for (i = 0; i < MAX_RECORDS; i++) { if (first_empty == -1 && strlen(list[i].name) == 0U) { @@ -115,7 +115,8 @@ add_name(struct dlz_example_data *state, struct record *list, const char *name, if (strlen(name) >= sizeof(list[i].name) || strlen(type) >= sizeof(list[i].type) || - strlen(data) >= sizeof(list[i].data)) { + strlen(data) >= sizeof(list[i].data)) + { return (ISC_R_NOSPACE); } @@ -147,7 +148,8 @@ del_name(struct dlz_example_data *state, struct record *list, const char *name, for (i = 0; i < MAX_RECORDS; i++) { if (strcasecmp(name, list[i].name) == 0 && strcasecmp(type, list[i].type) == 0 && - strcasecmp(data, list[i].data) == 0 && ttl == list[i].ttl) { + strcasecmp(data, list[i].data) == 0 && ttl == list[i].ttl) + { break; } } @@ -161,9 +163,9 @@ 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) { - char addr_buf[100]; + char addr_buf[100]; const char *ret; - uint16_t port = 0; + uint16_t port = 0; switch (addr->type.sa.sa_family) { case AF_INET: @@ -227,12 +229,12 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, ...) { struct dlz_example_data *state; - const char * helper_name; - va_list ap; - char soa_data[200]; - const char * extra; - isc_result_t result; - int n; + const char *helper_name; + va_list ap; + char soa_data[200]; + const char *extra; + isc_result_t result; + int n; UNUSED(dlzname); @@ -329,14 +331,15 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { struct dlz_example_data *state = (struct dlz_example_data *)dbdata; - isc_sockaddr_t * src; - char addrbuf[100]; - char absolute[1024]; + isc_sockaddr_t *src; + char addrbuf[100]; + char absolute[1024]; strcpy(addrbuf, "unknown"); if (methods != NULL && methods->sourceip != NULL && methods->version - methods->age <= DNS_CLIENTINFOMETHODS_VERSION && - DNS_CLIENTINFOMETHODS_VERSION <= methods->version) { + DNS_CLIENTINFOMETHODS_VERSION <= methods->version) + { methods->sourceip(clientinfo, &src); fmt_address(src, addrbuf, sizeof(addrbuf)); } @@ -364,7 +367,8 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, * from 10.53.0.1. */ if (strcasecmp(name, "test.example.net") == 0 && - strncmp(addrbuf, "10.53.0.1", 9) == 0) { + strncmp(addrbuf, "10.53.0.1", 9) == 0) + { return (ISC_R_NOMORE); } @@ -395,14 +399,14 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, dns_sdlzlookup_t *lookup, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { - isc_result_t result; + isc_result_t result; struct dlz_example_data *state = (struct dlz_example_data *)dbdata; - bool found = false; - void * dbversion = NULL; - isc_sockaddr_t * src; - char full_name[256]; - char buf[512]; - int i; + bool found = false; + void *dbversion = NULL; + isc_sockaddr_t *src; + char full_name[256]; + char buf[512]; + int i; UNUSED(zone); @@ -432,8 +436,8 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, * If the DLZ only operates on 'live' data, then version * wouldn't necessarily be needed. */ - if (clientinfo != NULL && - clientinfo->version >= DNS_CLIENTINFO_VERSION) { + if (clientinfo != NULL && clientinfo->version >= DNS_CLIENTINFO_VERSION) + { dbversion = clientinfo->dbversion; if (dbversion != NULL && *(bool *)dbversion) { state->log(ISC_LOG_INFO, "dlz_example: lookup against " @@ -447,7 +451,8 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, if (methods != NULL && methods->sourceip != NULL && (methods->version - methods->age <= DNS_CLIENTINFOMETHODS_VERSION) && - DNS_CLIENTINFOMETHODS_VERSION <= methods->version) { + DNS_CLIENTINFOMETHODS_VERSION <= methods->version) + { methods->sourceip(clientinfo, &src); fmt_address(src, buf, sizeof(buf)); } @@ -511,7 +516,7 @@ isc_result_t dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { struct dlz_example_data *state = (struct dlz_example_data *)dbdata; - int i; + int i; UNUSED(zone); @@ -628,7 +633,7 @@ isc_result_t 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; + isc_result_t result; if (state->log != NULL) { state->log(ISC_LOG_INFO, "dlz_example: starting configure"); @@ -701,8 +706,8 @@ static isc_result_t modrdataset(struct dlz_example_data *state, const char *name, const char *rdatastr, struct record *list) { - char * full_name, *dclass, *type, *data, *ttlstr, *buf; - char absolute[1024]; + char *full_name, *dclass, *type, *data, *ttlstr, *buf; + char absolute[1024]; isc_result_t result; #if defined(WIN32) || defined(_REENTRANT) char *saveptr = NULL; diff --git a/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c b/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c index a792517538..c918219d3f 100644 --- a/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c +++ b/contrib/dlz/modules/bdbhpt/dlz_bdbhpt_dynamic.c @@ -70,9 +70,9 @@ #define bdbhpt_threads DB_THREAD /* bdbhpt database names */ -#define dlz_data "dns_data" -#define dlz_zone "dns_zone" -#define dlz_xfr "dns_xfr" +#define dlz_data "dns_data" +#define dlz_zone "dns_zone" +#define dlz_xfr "dns_xfr" #define dlz_client "dns_client" #define dlz_bdbhpt_dynamic_version "0.1" @@ -83,28 +83,28 @@ * */ typedef struct bdbhpt_instance { - DB_ENV *dbenv; /* bdbhpt environment */ - DB * data; /* dns_data database handle */ - DB * zone; /* zone database handle */ - DB * xfr; /* zone xfr database handle */ - DB * client; /* client database handle */ + DB_ENV *dbenv; /* bdbhpt environment */ + DB *data; /* dns_data database handle */ + DB *zone; /* zone database handle */ + DB *xfr; /* zone xfr database handle */ + DB *client; /* client database handle */ /* Helper functions from the dlz_dlopen driver */ - log_t * log; - dns_sdlz_putrr_t * putrr; - dns_sdlz_putnamedrr_t * putnamedrr; + log_t *log; + dns_sdlz_putrr_t *putrr; + dns_sdlz_putnamedrr_t *putnamedrr; dns_dlz_writeablezone_t *writeable_zone; } bdbhpt_instance_t; typedef struct bdbhpt_parsed_data { char *host; char *type; - int ttl; + int ttl; 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. @@ -244,9 +244,9 @@ bdbhpt_parse_data(log_t *log, char *in, bdbhpt_parsed_data_t *pd) isc_result_t dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { - isc_result_t result; + isc_result_t result; bdbhpt_instance_t *db = (bdbhpt_instance_t *)dbdata; - DBT key, data; + DBT key, data; /* check to see if we are authoritative for the zone first. */ #if DLZ_DLOPEN_VERSION >= 3 @@ -331,16 +331,16 @@ xfr_cleanup: isc_result_t 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; - DBC * dns_cursor = NULL; - DBT xfr_key, xfr_data, dns_key, dns_data; - int xfr_flags; - int dns_flags; - int bdbhptres; + isc_result_t result = ISC_R_NOTFOUND; + bdbhpt_instance_t *db = (bdbhpt_instance_t *)dbdata; + DBC *xfr_cursor = NULL; + DBC *dns_cursor = NULL; + DBT xfr_key, xfr_data, dns_key, dns_data; + int xfr_flags; + int dns_flags; + int bdbhptres; bdbhpt_parsed_data_t pd; - char * tmp = NULL, *tmp_zone, *tmp_zone_host = NULL; + char *tmp = NULL, *tmp_zone, *tmp_zone_host = NULL; memset(&xfr_key, 0, sizeof(DBT)); memset(&xfr_data, 0, sizeof(DBT)); @@ -370,7 +370,8 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) /* loop through xfr table for specified zone. */ while ((bdbhptres = xfr_cursor->c_get(xfr_cursor, &xfr_key, &xfr_data, - xfr_flags)) == 0) { + xfr_flags)) == 0) + { xfr_flags = DB_NEXT_DUP; /* +1 to allow for space between zone and host names */ @@ -394,7 +395,8 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) while ((bdbhptres = dns_cursor->c_get(dns_cursor, &dns_key, &dns_data, dns_flags)) == - 0) { + 0) + { dns_flags = DB_NEXT_DUP; /* +1 to allow for null term at end of string. */ @@ -492,9 +494,9 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) #endif /* if DLZ_DLOPEN_VERSION < 3 */ { - isc_result_t result; + isc_result_t result; bdbhpt_instance_t *db = (bdbhpt_instance_t *)dbdata; - DBT key, data; + DBT key, data; memset(&key, 0, sizeof(DBT)); memset(&data, 0, sizeof(DBT)); @@ -558,16 +560,16 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, dns_clientinfo_t *clientinfo) #endif /* if DLZ_DLOPEN_VERSION == 1 */ { - isc_result_t result = ISC_R_NOTFOUND; + isc_result_t result = ISC_R_NOTFOUND; bdbhpt_instance_t *db = (bdbhpt_instance_t *)dbdata; - DBC * data_cursor = NULL; - DBT key, data; - int bdbhptres; - int flags; + DBC *data_cursor = NULL; + DBT key, data; + int bdbhptres; + int flags; bdbhpt_parsed_data_t pd; - char * tmp = NULL; - char * keyStr = NULL; + char *tmp = NULL; + char *keyStr = NULL; #if DLZ_DLOPEN_VERSION >= 2 UNUSED(methods); @@ -663,7 +665,8 @@ bdbhpt_opendb(log_t *log, DB_ENV *db_env, DBTYPE db_type, DB **db, /* open the database. */ if ((result = (*db)->open(*db, NULL, db_file, db_name, db_type, - DB_RDONLY | bdbhpt_threads, 0)) != 0) { + DB_RDONLY | bdbhpt_threads, 0)) != 0) + { log(ISC_LOG_ERROR, "bdbhpt_dynamic: could not open %s database in %s. " "BerkeleyDB error: %s", @@ -681,13 +684,13 @@ isc_result_t dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, ...) { - isc_result_t result; - int bdbhptres; - int bdbFlags = 0; + isc_result_t result; + int bdbhptres; + int bdbFlags = 0; bdbhpt_instance_t *db = NULL; const char *helper_name; - va_list ap; + va_list ap; UNUSED(dlzname); diff --git a/contrib/dlz/modules/common/dlz_dbi.c b/contrib/dlz/modules/common/dlz_dbi.c index 0bace2381c..3c0c152dda 100644 --- a/contrib/dlz/modules/common/dlz_dbi.c +++ b/contrib/dlz/modules/common/dlz_dbi.c @@ -98,14 +98,14 @@ build_querylist(const char *query_str, char **zone, char **record, char **client, query_list_t **querylist, unsigned int flags, log_t log) { - isc_result_t result; - bool foundzone = false; - bool foundrecord = false; - bool foundclient = false; - char * temp_str = NULL; - char * right_str = NULL; - char * token = NULL; - query_list_t * tql; + isc_result_t result; + bool foundzone = false; + bool foundrecord = false; + bool foundclient = false; + char *temp_str = NULL; + char *right_str = NULL; + char *token = NULL; + query_list_t *tql; query_segment_t *tseg = NULL; /* if query string is null, or zero length */ @@ -139,7 +139,8 @@ build_querylist(const char *query_str, char **zone, char **record, /* loop through the string and chop it up */ for (token = strtok_r(right_str, "$", &temp_str); token; - token = strtok_r(NULL, "$", &temp_str)) { + token = strtok_r(NULL, "$", &temp_str)) + { /* allocate memory for tseg */ tseg = calloc(1, sizeof(query_segment_t)); if (tseg == NULL) { /* no memory, clean everything up. */ @@ -275,8 +276,8 @@ char * build_querystring(query_list_t *querylist) { query_segment_t *tseg = NULL; - unsigned int length = 0; - char * qs = NULL; + unsigned int length = 0; + char *qs = NULL; /* start at the top of the list */ tseg = DLZ_LIST_HEAD(*querylist); @@ -324,9 +325,9 @@ build_dbinstance(const char *allnodes_str, const char *allowxfr_str, const char *lookup_str, const char *countzone_str, dbinstance_t **dbi, log_t log) { - isc_result_t result; + isc_result_t result; dbinstance_t *db = NULL; - int err; + int err; /* allocate and zero memory for driver structure */ db = calloc(1, sizeof(dbinstance_t)); @@ -471,10 +472,10 @@ destroy_dbinstance(dbinstance_t *dbi) char * get_parameter_value(const char *input, const char *key) { - int keylen; + int keylen; char *keystart; - char value[255]; - int i; + char value[255]; + int i; if (key == NULL || input == NULL || *input == '\0') { return (NULL); diff --git a/contrib/dlz/modules/filesystem/dir.c b/contrib/dlz/modules/filesystem/dir.c index 668ff95417..ea394afb16 100644 --- a/contrib/dlz/modules/filesystem/dir.c +++ b/contrib/dlz/modules/filesystem/dir.c @@ -38,7 +38,7 @@ dir_init(dir_t *dir) isc_result_t dir_open(dir_t *dir, const char *dirname) { - char * p; + char *p; isc_result_t result = ISC_R_SUCCESS; if (strlen(dirname) + 3 > sizeof(dir->dirname)) { diff --git a/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c b/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c index 40aef3eb0c..9f6800252d 100644 --- a/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c +++ b/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c @@ -61,19 +61,19 @@ typedef struct config_data { char *basedir; - int basedirsize; + int basedirsize; char *datadir; - int datadirsize; + int datadirsize; char *xfrdir; - int xfrdirsize; - int splitcnt; - char separator; - char pathsep; + int xfrdirsize; + int splitcnt; + char separator; + char pathsep; /* Helper functions from the dlz_dlopen driver */ - log_t * log; - dns_sdlz_putrr_t * putrr; - dns_sdlz_putnamedrr_t * putnamedrr; + log_t *log; + dns_sdlz_putrr_t *putrr; + dns_sdlz_putnamedrr_t *putnamedrr; dns_dlz_writeablezone_t *writeable_zone; } config_data_t; @@ -88,8 +88,8 @@ 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 @@ -168,7 +168,7 @@ create_path_helper(char *out, const char *in, config_data_t *cd) { char *tmpString; char *tmpPtr; - int i; + int i; tmpString = strdup(in); if (tmpString == NULL) { @@ -234,11 +234,11 @@ static isc_result_t create_path(const char *zone, const char *host, const char *client, config_data_t *cd, char **path) { - char * tmpPath; - int pathsize; - int len; + char *tmpPath; + int pathsize; + int len; isc_result_t result; - bool isroot = false; + bool isroot = false; /* special case for root zone */ if (strcmp(zone, ".") == 0) { @@ -363,22 +363,22 @@ static isc_result_t process_dir(dir_t *dir, void *passback, config_data_t *cd, dlist_t *dir_list, unsigned int basedirlen) { - char tmp[DIR_PATHMAX + DIR_NAMEMAX]; - int astPos; - struct stat sb; + char tmp[DIR_PATHMAX + DIR_NAMEMAX]; + int astPos; + struct stat sb; isc_result_t result = ISC_R_FAILURE; - char * endp; - char * type; - char * ttlStr; - char * data; - char host[DIR_NAMEMAX]; - char * tmpString; - char * tmpPtr; - int ttl; - int i; - int len; + char *endp; + char *type; + char *ttlStr; + char *data; + char host[DIR_NAMEMAX]; + char *tmpString; + char *tmpPtr; + int ttl; + int i; + int len; dir_entry_t *direntry; - bool foundHost; + bool foundHost; tmp[0] = '\0'; /* set 1st byte to '\0' so strcpy works right. */ host[0] = '\0'; @@ -584,9 +584,9 @@ process_dir(dir_t *dir, void *passback, config_data_t *cd, dlist_t *dir_list, isc_result_t dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { - isc_result_t result; - char * path; - struct stat sb; + isc_result_t result; + char *path; + struct stat sb; config_data_t *cd; path = NULL; @@ -616,15 +616,15 @@ complete_AXFR: isc_result_t dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { - isc_result_t result; - dlist_t * dir_list; + isc_result_t result; + dlist_t *dir_list; config_data_t *cd = (config_data_t *)dbdata; - char * basepath; - unsigned int basepathlen; - struct stat sb; - dir_t dir; - dir_entry_t * dir_entry; - dir_entry_t * next_de; + char *basepath; + unsigned int basepathlen; + struct stat sb; + dir_t dir; + dir_entry_t *dir_entry; + dir_entry_t *next_de; basepath = NULL; @@ -734,10 +734,10 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) #endif /* if DLZ_DLOPEN_VERSION < 3 */ { - isc_result_t result; + isc_result_t result; config_data_t *cd = (config_data_t *)dbdata; - char * path; - struct stat sb; + char *path; + struct stat sb; path = NULL; #if DLZ_DLOPEN_VERSION >= 3 @@ -781,11 +781,11 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, dns_clientinfo_t *clientinfo) #endif /* if DLZ_DLOPEN_VERSION == 1 */ { - isc_result_t result = ISC_R_NOTFOUND; + isc_result_t result = ISC_R_NOTFOUND; config_data_t *cd = (config_data_t *)dbdata; - char * path; - struct stat sb; - dir_t dir; + char *path; + struct stat sb; + dir_t dir; path = NULL; UNUSED(lookup); @@ -851,13 +851,13 @@ isc_result_t dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, ...) { - isc_result_t result = ISC_R_NOMEMORY; + isc_result_t result = ISC_R_NOMEMORY; config_data_t *cd; - char * endp; - int len; - char pathsep; - const char * helper_name; - va_list ap; + char *endp; + int len; + char pathsep; + const char *helper_name; + va_list ap; UNUSED(dlzname); diff --git a/contrib/dlz/modules/include/dlz_dbi.h b/contrib/dlz/modules/include/dlz_dbi.h index bda147cb69..735359c873 100644 --- a/contrib/dlz/modules/include/dlz_dbi.h +++ b/contrib/dlz/modules/include/dlz_dbi.h @@ -46,9 +46,9 @@ * Types */ #define REQUIRE_CLIENT 0x01 -#define REQUIRE_QUERY 0x02 +#define REQUIRE_QUERY 0x02 #define REQUIRE_RECORD 0x04 -#define REQUIRE_ZONE 0x08 +#define REQUIRE_ZONE 0x08 typedef struct query_segment query_segment_t; typedef DLZ_LIST(query_segment_t) query_list_t; diff --git a/contrib/dlz/modules/include/dlz_minimal.h b/contrib/dlz/modules/include/dlz_minimal.h index befea12bad..bac8ab12d1 100644 --- a/contrib/dlz/modules/include/dlz_minimal.h +++ b/contrib/dlz/modules/include/dlz_minimal.h @@ -47,33 +47,33 @@ typedef uint32_t dns_ttl_t; */ #ifndef DLZ_DLOPEN_VERSION #define DLZ_DLOPEN_VERSION 3 -#define DLZ_DLOPEN_AGE 0 +#define DLZ_DLOPEN_AGE 0 #endif /* ifndef DLZ_DLOPEN_VERSION */ /* return these in flags from dlz_version() */ -#define DNS_SDLZFLAG_THREADSAFE 0x00000001U +#define DNS_SDLZFLAG_THREADSAFE 0x00000001U #define DNS_SDLZFLAG_RELATIVEOWNER 0x00000002U #define DNS_SDLZFLAG_RELATIVERDATA 0x00000004U /* result codes */ -#define ISC_R_SUCCESS 0 -#define ISC_R_NOMEMORY 1 -#define ISC_R_NOPERM 6 -#define ISC_R_NOSPACE 19 -#define ISC_R_NOTFOUND 23 -#define ISC_R_FAILURE 25 +#define ISC_R_SUCCESS 0 +#define ISC_R_NOMEMORY 1 +#define ISC_R_NOPERM 6 +#define ISC_R_NOSPACE 19 +#define ISC_R_NOTFOUND 23 +#define ISC_R_FAILURE 25 #define ISC_R_NOTIMPLEMENTED 27 -#define ISC_R_NOMORE 29 -#define ISC_R_INVALIDFILE 30 -#define ISC_R_UNEXPECTED 34 -#define ISC_R_FILENOTFOUND 38 +#define ISC_R_NOMORE 29 +#define ISC_R_INVALIDFILE 30 +#define ISC_R_UNEXPECTED 34 +#define ISC_R_FILENOTFOUND 38 /* log levels */ -#define ISC_LOG_INFO (-1) -#define ISC_LOG_NOTICE (-2) -#define ISC_LOG_WARNING (-3) -#define ISC_LOG_ERROR (-4) -#define ISC_LOG_CRITICAL (-5) +#define ISC_LOG_INFO (-1) +#define ISC_LOG_NOTICE (-2) +#define ISC_LOG_WARNING (-3) +#define ISC_LOG_ERROR (-4) +#define ISC_LOG_CRITICAL (-5) #define ISC_LOG_DEBUG(level) (level) /* other useful definitions */ @@ -126,7 +126,7 @@ typedef isc_result_t (*dns_clientinfo_version_t)(dns_clientinfo_t *client, void ** addrp); #define DNS_CLIENTINFOMETHODS_VERSION 2 -#define DNS_CLIENTINFOMETHODS_AGE 1 +#define DNS_CLIENTINFOMETHODS_AGE 1 typedef struct dns_clientinfomethods { uint16_t version; uint16_t age; diff --git a/contrib/dlz/modules/include/dlz_pthread.h b/contrib/dlz/modules/include/dlz_pthread.h index 75102774fd..fd8d5fe899 100644 --- a/contrib/dlz/modules/include/dlz_pthread.h +++ b/contrib/dlz/modules/include/dlz_pthread.h @@ -23,19 +23,19 @@ #ifdef PTHREADS #include -#define dlz_mutex_t pthread_mutex_t -#define dlz_mutex_init pthread_mutex_init +#define dlz_mutex_t pthread_mutex_t +#define dlz_mutex_init pthread_mutex_init #define dlz_mutex_destroy pthread_mutex_destroy -#define dlz_mutex_lock pthread_mutex_lock +#define dlz_mutex_lock pthread_mutex_lock #define dlz_mutex_trylock pthread_mutex_trylock -#define dlz_mutex_unlock pthread_mutex_unlock +#define dlz_mutex_unlock pthread_mutex_unlock #else /* !PTHREADS */ -#define dlz_mutex_t void +#define dlz_mutex_t void #define dlz_mutex_init(a, b) (0) #define dlz_mutex_destroy(a) (0) -#define dlz_mutex_lock(a) (0) +#define dlz_mutex_lock(a) (0) #define dlz_mutex_trylock(a) (0) -#define dlz_mutex_unlock(a) (0) +#define dlz_mutex_unlock(a) (0) #endif /* ifdef PTHREADS */ #endif /* DLZ_PTHREAD_H */ diff --git a/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c b/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c index 048a4e97ab..6f8a4b28ba 100644 --- a/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c +++ b/contrib/dlz/modules/ldap/dlz_ldap_dynamic.c @@ -66,17 +66,17 @@ #include #define SIMPLE "simple" -#define KRB41 "krb41" -#define KRB42 "krb42" -#define V2 "v2" -#define V3 "v3" +#define KRB41 "krb41" +#define KRB42 "krb42" +#define V2 "v2" +#define V3 "v3" #define dbc_search_limit 30 -#define ALLNODES 1 -#define ALLOWXFR 2 -#define AUTHORITY 3 -#define FINDZONE 4 -#define LOOKUP 5 +#define ALLNODES 1 +#define ALLOWXFR 2 +#define AUTHORITY 3 +#define FINDZONE 4 +#define LOOKUP 5 /*% * Structure to hold everthing needed by this "instance" of the LDAP @@ -99,28 +99,26 @@ typedef struct { char *hosts; /*%< LDAP server hosts */ /* Helper functions from the dlz_dlopen driver */ - log_t * log; - dns_sdlz_putrr_t * putrr; - dns_sdlz_putnamedrr_t * putnamedrr; + log_t *log; + dns_sdlz_putrr_t *putrr; + dns_sdlz_putnamedrr_t *putnamedrr; dns_dlz_writeablezone_t *writeable_zone; } ldap_instance_t; /* 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 @@ -131,7 +129,7 @@ static isc_result_t ldap_checkURL(ldap_instance_t *db, char *URL, int attrCnt, const char *msg) { isc_result_t result = ISC_R_SUCCESS; - int ldap_result; + int ldap_result; LDAPURLDesc *ldap_url = NULL; if (!ldap_is_ldap_url(URL)) { @@ -197,7 +195,7 @@ static isc_result_t ldap_connect(ldap_instance_t *dbi, dbinstance_t *dbc) { isc_result_t result; - int ldap_result; + int ldap_result; /* if we have a connection, get ride of it. */ if (dbc->dbconn != NULL) { @@ -289,7 +287,7 @@ ldap_find_avail_conn(ldap_instance_t *ldap) { dbinstance_t *dbi = NULL; dbinstance_t *head; - int count = 0; + int count = 0; /* get top of list */ head = dbi = DLZ_LIST_HEAD(*ldap->db); @@ -323,17 +321,17 @@ ldap_process_results(ldap_instance_t *db, LDAP *dbc, LDAPMessage *msg, char **attrs, void *ptr, bool allnodes) { isc_result_t result = ISC_R_SUCCESS; - int i = 0; - int j; - int len; - char * attribute = NULL; + int i = 0; + int j; + int len; + char *attribute = NULL; LDAPMessage *entry; - char * endp = NULL; - char * host = NULL; - char * type = NULL; - char * data = NULL; - char ** vals = NULL; - int ttl; + char *endp = NULL; + char *host = NULL; + char *type = NULL; + char *data = NULL; + char **vals = NULL; + int ttl; /* get the first entry to process */ entry = ldap_first_entry(dbc, msg); @@ -551,15 +549,15 @@ static isc_result_t ldap_get_results(const char *zone, const char *record, const char *client, unsigned int query, void *dbdata, void *ptr) { - isc_result_t result; + isc_result_t result; ldap_instance_t *db = (ldap_instance_t *)dbdata; - dbinstance_t * dbi = NULL; - char * querystring = NULL; - LDAPURLDesc * ldap_url = NULL; - int ldap_result = 0; - LDAPMessage * ldap_msg = NULL; - int i; - int entries; + dbinstance_t *dbi = NULL; + char *querystring = NULL; + LDAPURLDesc *ldap_url = NULL; + int ldap_result = 0; + LDAPMessage *ldap_msg = NULL; + int i; + int entries; /* get db instance / connection */ #if PTHREADS @@ -918,16 +916,16 @@ isc_result_t dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, ...) { - isc_result_t result = ISC_R_FAILURE; + isc_result_t result = ISC_R_FAILURE; ldap_instance_t *ldap = NULL; - dbinstance_t * dbi = NULL; - const char * helper_name; - int protocol; - int method; + dbinstance_t *dbi = NULL; + const char *helper_name; + int protocol; + int method; #if PTHREADS - int dbcount; + int dbcount; char *endp; - int i; + int i; #endif /* PTHREADS */ va_list ap; @@ -1010,8 +1008,8 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, /* check that LDAP URL parameters make sense */ switch (argc) { case 12: - result = - ldap_checkURL(ldap, argv[11], 0, "allow zone transfer"); + result = ldap_checkURL(ldap, argv[11], 0, + "allow zone transfer"); if (result != ISC_R_SUCCESS) { goto cleanup; } diff --git a/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c b/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c index b280ae4940..2a59e32742 100644 --- a/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c +++ b/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c @@ -59,12 +59,12 @@ #include #define dbc_search_limit 30 -#define ALLNODES 1 -#define ALLOWXFR 2 -#define AUTHORITY 3 -#define FINDZONE 4 -#define COUNTZONE 5 -#define LOOKUP 6 +#define ALLNODES 1 +#define ALLOWXFR 2 +#define AUTHORITY 3 +#define FINDZONE 4 +#define COUNTZONE 5 +#define LOOKUP 6 #define safeGet(in) in == NULL ? "" : in @@ -76,36 +76,35 @@ typedef struct { #if PTHREADS db_list_t *db; /*%< handle to a list of DB */ - int dbcount; + int dbcount; #else /* if PTHREADS */ dbinstance_t *db; /*%< handle to DB */ #endif /* if PTHREADS */ unsigned int flags; - char * dbname; - char * host; - char * user; - char * pass; - char * socket; - int port; + char *dbname; + char *host; + char *user; + char *pass; + char *socket; + int port; /* Helper functions from the dlz_dlopen driver */ - log_t * log; - dns_sdlz_putrr_t * putrr; - dns_sdlz_putnamedrr_t * putnamedrr; + log_t *log; + dns_sdlz_putrr_t *putrr; + dns_sdlz_putnamedrr_t *putnamedrr; dns_dlz_writeablezone_t *writeable_zone; } 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 @@ -161,7 +160,7 @@ static dbinstance_t * mysql_find_avail_conn(mysql_instance_t *mysql) { dbinstance_t *dbi = NULL, *head; - int count = 0; + int count = 0; /* get top of list */ head = dbi = DLZ_LIST_HEAD(*(mysql->db)); @@ -200,7 +199,7 @@ mysql_find_avail_conn(mysql_instance_t *mysql) static char * mysqldrv_escape_string(MYSQL *mysql, const char *instr) { - char * outstr; + char *outstr; unsigned int len; if (instr == NULL) { @@ -231,13 +230,13 @@ static isc_result_t mysql_get_resultset(const char *zone, const char *record, const char *client, unsigned int query, void *dbdata, MYSQL_RES **rs) { - isc_result_t result; - dbinstance_t * dbi = NULL; + isc_result_t result; + dbinstance_t *dbi = NULL; mysql_instance_t *db = (mysql_instance_t *)dbdata; - char * querystring = NULL; - unsigned int i = 0; - unsigned int j = 0; - int qres = 0; + char *querystring = NULL; + unsigned int i = 0; + unsigned int j = 0; + int qres = 0; #if PTHREADS /* find an available DBI from the list */ @@ -324,8 +323,8 @@ mysql_get_resultset(const char *zone, const char *record, const char *client, free(dbi->record); } - dbi->record = - mysqldrv_escape_string((MYSQL *)dbi->dbconn, record); + dbi->record = mysqldrv_escape_string((MYSQL *)dbi->dbconn, + record); if (dbi->record == NULL) { result = ISC_R_NOMEMORY; goto cleanup; @@ -339,8 +338,8 @@ mysql_get_resultset(const char *zone, const char *record, const char *client, free(dbi->client); } - dbi->client = - mysqldrv_escape_string((MYSQL *)dbi->dbconn, client); + dbi->client = mysqldrv_escape_string((MYSQL *)dbi->dbconn, + client); if (dbi->client == NULL) { result = ISC_R_NOMEMORY; goto cleanup; @@ -445,12 +444,12 @@ static isc_result_t mysql_process_rs(mysql_instance_t *db, dns_sdlzlookup_t *lookup, MYSQL_RES *rs) { isc_result_t result = ISC_R_NOTFOUND; - MYSQL_ROW row; + MYSQL_ROW row; unsigned int fields; unsigned int j; - char * tmpString; - char * endp; - int ttl; + char *tmpString; + char *endp; + int ttl; fields = mysql_num_fields(rs); /* how many columns in result set */ row = mysql_fetch_row(rs); /* get a row from the result set */ @@ -557,9 +556,9 @@ isc_result_t dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { - isc_result_t result; - MYSQL_RES * rs = NULL; - my_ulonglong rows; + isc_result_t result; + MYSQL_RES *rs = NULL; + my_ulonglong rows; mysql_instance_t *db = (mysql_instance_t *)dbdata; UNUSED(methods); @@ -594,10 +593,10 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, isc_result_t dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { - isc_result_t result; + isc_result_t result; mysql_instance_t *db = (mysql_instance_t *)dbdata; - MYSQL_RES * rs = NULL; - my_ulonglong rows; + MYSQL_RES *rs = NULL; + my_ulonglong rows; /* first check if the zone is supported by the database. */ result = dlz_findzonedb(dbdata, name, NULL, NULL); @@ -646,15 +645,15 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) isc_result_t dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { - isc_result_t result; + isc_result_t result; mysql_instance_t *db = (mysql_instance_t *)dbdata; - MYSQL_RES * rs = NULL; - MYSQL_ROW row; - unsigned int fields; - unsigned int j; - char * tmpString; - char * endp; - int ttl; + MYSQL_RES *rs = NULL; + MYSQL_ROW row; + unsigned int fields; + unsigned int j; + char *tmpString; + char *endp; + int ttl; result = mysql_get_resultset(zone, NULL, NULL, ALLNODES, dbdata, &rs); if (result == ISC_R_NOTIMPLEMENTED) { @@ -750,8 +749,8 @@ cleanup: isc_result_t dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) { - isc_result_t result; - MYSQL_RES * rs = NULL; + isc_result_t result; + MYSQL_RES *rs = NULL; mysql_instance_t *db = (mysql_instance_t *)dbdata; result = mysql_get_resultset(zone, NULL, NULL, AUTHORITY, dbdata, &rs); @@ -781,8 +780,8 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, dns_sdlzlookup_t *lookup, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { - isc_result_t result; - MYSQL_RES * rs = NULL; + isc_result_t result; + MYSQL_RES *rs = NULL; mysql_instance_t *db = (mysql_instance_t *)dbdata; UNUSED(methods); @@ -814,14 +813,14 @@ isc_result_t dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, ...) { - isc_result_t result = ISC_R_FAILURE; + isc_result_t result = ISC_R_FAILURE; mysql_instance_t *mysql = NULL; - dbinstance_t * dbi = NULL; - MYSQL * dbc; - char * tmp = NULL; - char * endp; - int j; - const char * helper_name; + dbinstance_t *dbi = NULL; + MYSQL *dbc; + char *tmp = NULL; + char *endp; + int j; + const char *helper_name; #if MYSQL_VERSION_ID >= 50000 my_bool auto_reconnect = 1; #endif /* if MYSQL_VERSION_ID >= 50000 */ @@ -1025,7 +1024,8 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, #if MYSQL_VERSION_ID >= 50000 /* enable automatic reconnection. */ if (mysql_options((MYSQL *)dbi->dbconn, MYSQL_OPT_RECONNECT, - &auto_reconnect) != 0) { + &auto_reconnect) != 0) + { mysql->log(ISC_LOG_WARNING, "MySQL module failed to " "set " "MYSQL_OPT_RECONNECT " diff --git a/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c b/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c index ddac8b9fd6..b8a15ba4b7 100644 --- a/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c +++ b/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c @@ -191,17 +191,17 @@ typedef struct mysql_record { } mysql_record_t; typedef struct mysql_instance { - int id; - MYSQL * sock; - int connected; + int id; + MYSQL *sock; + int connected; dlz_mutex_t mutex; } mysql_instance_t; typedef struct mysql_transaction mysql_transaction_t; struct mysql_transaction { - char * zone; - char * zone_id; - mysql_instance_t * dbi; + char *zone; + char *zone_id; + mysql_instance_t *dbi; mysql_transaction_t *next; }; @@ -232,9 +232,9 @@ typedef struct mysql_data { dlz_mutex_t tx_mutex; /* Helper functions from the dlz_dlopen driver */ - log_t * log; - dns_sdlz_putrr_t * putrr; - dns_sdlz_putnamedrr_t * putnamedrr; + log_t *log; + dns_sdlz_putrr_t *putrr; + dns_sdlz_putnamedrr_t *putnamedrr; dns_dlz_writeablezone_t *writeable_zone; } mysql_data_t; @@ -371,14 +371,14 @@ static char * build_query(mysql_data_t *state, mysql_instance_t *dbi, const char *command, ...) { - isc_result_t result; - bool localdbi = false; + isc_result_t result; + bool localdbi = false; mysql_arglist_t arglist; - mysql_arg_t * item; - char * p, *q, *tmp = NULL, *querystr = NULL; - char * query = NULL; - size_t len = 0; - va_list ap1; + mysql_arg_t *item; + char *p, *q, *tmp = NULL, *querystr = NULL; + char *query = NULL; + size_t len = 0; + va_list ap1; /* Get a DB instance if needed */ if (dbi == NULL) { @@ -456,7 +456,8 @@ build_query(mysql_data_t *state, mysql_instance_t *dbi, const char *command, *query = '\0'; for (item = DLZ_LIST_HEAD(arglist); item != NULL; - item = DLZ_LIST_NEXT(item, link)) { + item = DLZ_LIST_NEXT(item, link)) + { if (item->arg != NULL) { strcat(query, item->arg); } @@ -466,7 +467,8 @@ fail: va_end(ap1); for (item = DLZ_LIST_HEAD(arglist); item != NULL; - item = DLZ_LIST_NEXT(item, link)) { + item = DLZ_LIST_NEXT(item, link)) + { if (item->arg != NULL) { free(item->arg); } @@ -534,7 +536,7 @@ fqhn(const char *name, const char *zone, char *dest) static char * relname(const char *name, const char *zone) { - size_t nlen, zlen; + size_t nlen, zlen; const char *p; char *new; @@ -556,7 +558,8 @@ relname(const char *name, const char *zone) p = name + nlen - zlen; if (strcasecmp(p, zone) != 0 && - (zone[zlen - 1] != '.' || strncasecmp(p, zone, zlen - 1) != 0)) { + (zone[zlen - 1] != '.' || strncasecmp(p, zone, zlen - 1) != 0)) + { strcpy(new, name); return (new); } @@ -569,7 +572,7 @@ relname(const char *name, const char *zone) static isc_result_t validate_txn(mysql_data_t *state, mysql_transaction_t *txn) { - isc_result_t result = ISC_R_FAILURE; + isc_result_t result = ISC_R_FAILURE; mysql_transaction_t *txp; dlz_mutex_lock(&state->tx_mutex); @@ -619,8 +622,8 @@ static MYSQL_RES * db_query(mysql_data_t *state, mysql_instance_t *dbi, const char *query) { isc_result_t result; - bool localdbi = false; - MYSQL_RES * res = NULL; + bool localdbi = false; + MYSQL_RES *res = NULL; if (query == NULL) { return (NULL); @@ -683,7 +686,7 @@ fail: static unsigned char * make_notify(const char *zone, int *packetlen) { - int i, j; + int i, j; unsigned char *packet = (unsigned char *)malloc(strlen(zone) + 18); if (packet == NULL) { @@ -758,14 +761,14 @@ send_notify(struct sockaddr_in *addr, const unsigned char *p, const int plen) static void notify(mysql_data_t *state, const char *zone, int sn) { - MYSQL_RES * res; - MYSQL_ROW row; - char * query; - unsigned char * packet; - int packetlen; + MYSQL_RES *res; + MYSQL_ROW row; + char *query; + unsigned char *packet; + int packetlen; struct ifaddrs *ifap, *ifa; - char zaddr[INET_ADDRSTRLEN]; - void * addrp = NULL; + char zaddr[INET_ADDRSTRLEN]; + void *addrp = NULL; /* Get the name servers from the NS rrset */ query = build_query(state, NULL, Q_GETNS, zone); @@ -789,8 +792,8 @@ notify(mysql_data_t *state, const char *zone, int sn) /* Tell each nameserver of the update */ while ((row = mysql_fetch_row(res)) != NULL) { - bool local = false; - struct hostent * h; + bool local = false; + struct hostent *h; struct sockaddr_in addr, *sin; /* @@ -851,8 +854,8 @@ static mysql_record_t * 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; + char *real_name, *dclass, *type, *data, *ttlstr, *buf; + dns_ttl_t ttlvalue; new_record = (mysql_record_t *)malloc(sizeof(mysql_record_t)); @@ -965,9 +968,9 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, ...) { mysql_data_t *state; - const char * helper_name; - va_list ap; - int n; + const char *helper_name; + va_list ap; + int n; UNUSED(dlzname); @@ -1067,7 +1070,7 @@ void dlz_destroy(void *dbdata) { mysql_data_t *state = (mysql_data_t *)dbdata; - int i; + int i; if (state->debug && state->log != NULL) { state->log(ISC_LOG_INFO, "%s: shutting down", modname); @@ -1094,10 +1097,10 @@ isc_result_t dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { - isc_result_t result = ISC_R_SUCCESS; + isc_result_t result = ISC_R_SUCCESS; mysql_data_t *state = (mysql_data_t *)dbdata; - MYSQL_RES * res; - char * query; + MYSQL_RES *res; + char *query; /* Query the Zones table to see if this zone is present */ query = build_query(state, NULL, Q_FINDZONE, name); @@ -1127,15 +1130,15 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, dns_sdlzlookup_t *lookup, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { - isc_result_t result; - mysql_data_t * state = (mysql_data_t *)dbdata; - bool found = false; - char * real_name; - MYSQL_RES * res; - MYSQL_ROW row; - char * query; + isc_result_t result; + mysql_data_t *state = (mysql_data_t *)dbdata; + bool found = false; + char *real_name; + MYSQL_RES *res; + MYSQL_ROW row; + char *query; mysql_transaction_t *txn = NULL; - mysql_instance_t * dbi = NULL; + mysql_instance_t *dbi = NULL; if (state->putrr == NULL) { if (state->log != NULL) { @@ -1146,8 +1149,8 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, } /* Are we okay to try to find the txn version? */ - if (clientinfo != NULL && - clientinfo->version >= DNS_CLIENTINFO_VERSION) { + if (clientinfo != NULL && clientinfo->version >= DNS_CLIENTINFO_VERSION) + { txn = (mysql_transaction_t *)clientinfo->dbversion; if (txn != NULL && validate_txn(state, txn) == ISC_R_SUCCESS) { dbi = txn->dbi; @@ -1194,7 +1197,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, while ((row = mysql_fetch_row(res)) != NULL) { char host[1024], admin[1024], data[1024]; - int ttl; + int ttl; sscanf(row[7], "%d", &ttl); fqhn(row[0], zone, host); @@ -1282,11 +1285,11 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) isc_result_t dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { - isc_result_t result = ISC_R_SUCCESS; + isc_result_t result = ISC_R_SUCCESS; mysql_data_t *state = (mysql_data_t *)dbdata; - MYSQL_RES * res; - MYSQL_ROW row; - char * query; + MYSQL_RES *res; + MYSQL_ROW row; + char *query; UNUSED(zone); @@ -1314,7 +1317,7 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) while ((row = mysql_fetch_row(res)) != NULL) { char hostname[1024]; - int ttl; + int ttl; sscanf(row[3], "%d", &ttl); fqhn(row[0], zone, hostname); @@ -1335,12 +1338,12 @@ dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) isc_result_t 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; - MYSQL_ROW row; - char * query; - char zone_id[16]; + isc_result_t result = ISC_R_FAILURE; + mysql_data_t *state = (mysql_data_t *)dbdata; + MYSQL_RES *res; + MYSQL_ROW row; + char *query; + char zone_id[16]; mysql_transaction_t *txn = NULL, *newtx = NULL; /* @@ -1450,13 +1453,13 @@ cleanup: void dlz_closeversion(const char *zone, bool commit, void *dbdata, void **versionp) { - isc_result_t result; - mysql_data_t * state = (mysql_data_t *)dbdata; + isc_result_t result; + mysql_data_t *state = (mysql_data_t *)dbdata; mysql_transaction_t *txn = (mysql_transaction_t *)*versionp; mysql_transaction_t *txp; - char * query; - MYSQL_RES * res; - MYSQL_ROW row; + char *query; + MYSQL_RES *res; + MYSQL_ROW row; /* * Find the transaction @@ -1584,10 +1587,10 @@ dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *dbdata) #endif /* DLZ_DLOPEN_VERSION */ { mysql_data_t *state = (mysql_data_t *)dbdata; - isc_result_t result; - MYSQL_RES * res; - MYSQL_ROW row; - int count; + isc_result_t result; + MYSQL_RES *res; + MYSQL_ROW row; + int count; /* * Seed PRNG (used by Notify code) @@ -1672,11 +1675,11 @@ isc_result_t dlz_addrdataset(const char *name, const char *rdatastr, void *dbdata, void *version) { - mysql_data_t * state = (mysql_data_t *)dbdata; + mysql_data_t *state = (mysql_data_t *)dbdata; mysql_transaction_t *txn = (mysql_transaction_t *)version; - char * new_name, *query; - mysql_record_t * record; - isc_result_t result; + char *new_name, *query; + mysql_record_t *record; + isc_result_t result; if (txn == NULL) { return (ISC_R_FAILURE); @@ -1736,11 +1739,11 @@ isc_result_t dlz_subrdataset(const char *name, const char *rdatastr, void *dbdata, void *version) { - mysql_data_t * state = (mysql_data_t *)dbdata; + mysql_data_t *state = (mysql_data_t *)dbdata; mysql_transaction_t *txn = (mysql_transaction_t *)version; - char * new_name, *query; - mysql_record_t * record; - isc_result_t result; + char *new_name, *query; + mysql_record_t *record; + isc_result_t result; if (txn == NULL) { return (ISC_R_FAILURE); @@ -1787,10 +1790,10 @@ cleanup: isc_result_t dlz_delrdataset(const char *name, const char *type, void *dbdata, void *version) { - mysql_data_t * state = (mysql_data_t *)dbdata; + mysql_data_t *state = (mysql_data_t *)dbdata; mysql_transaction_t *txn = (mysql_transaction_t *)version; - char * new_name, *query; - isc_result_t result; + char *new_name, *query; + isc_result_t result; if (txn == NULL) { return (ISC_R_FAILURE); diff --git a/contrib/dlz/modules/perl/dlz_perl_driver.c b/contrib/dlz/modules/perl/dlz_perl_driver.c index 91c158bd66..41cb6f8b9a 100644 --- a/contrib/dlz/modules/perl/dlz_perl_driver.c +++ b/contrib/dlz/modules/perl/dlz_perl_driver.c @@ -81,18 +81,18 @@ * serious problems arise. We can hack around this, but it's much better to do * it properly and link against a perl compiled with multiplicity. */ static PerlInterpreter *global_perl = NULL; -static int global_perl_dont_free = 0; +static int global_perl_dont_free = 0; #endif /* ifndef MULTIPLICITY */ typedef struct config_data { PerlInterpreter *perl; - char * perl_source; - SV * perl_class; + char *perl_source; + SV *perl_class; /* Functions given to us by bind9 */ - log_t * log; - dns_sdlz_putrr_t * putrr; - dns_sdlz_putnamedrr_t * putnamedrr; + log_t *log; + dns_sdlz_putrr_t *putrr; + dns_sdlz_putnamedrr_t *putnamedrr; dns_dlz_writeablezone_t *writeable_zone; } config_data_t; @@ -101,12 +101,9 @@ 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 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__; @@ -153,13 +150,13 @@ isc_result_t 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; - SV * record_ref; - SV ** rr_name; - SV ** rr_type; - SV ** rr_ttl; - SV ** rr_data; + isc_result_t retval; + int rrcount, r; + SV *record_ref; + SV **rr_name; + SV **rr_type; + SV **rr_ttl; + SV **rr_data; #ifdef MULTIPLICITY PerlInterpreter *my_perl = cd->perl; #endif /* ifdef MULTIPLICITY */ @@ -256,8 +253,8 @@ isc_result_t dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { config_data_t *cd = (config_data_t *)dbdata; - int r; - isc_result_t retval; + int r; + isc_result_t retval; #ifdef MULTIPLICITY PerlInterpreter *my_perl = cd->perl; #endif /* ifdef MULTIPLICITY */ @@ -327,8 +324,8 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, #endif /* if DLZ_DLOPEN_VERSION < 3 */ { config_data_t *cd = (config_data_t *)dbdata; - int r; - isc_result_t retval; + int r; + isc_result_t retval; #ifdef MULTIPLICITY PerlInterpreter *my_perl = cd->perl; #endif /* ifdef MULTIPLICITY */ @@ -399,14 +396,14 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, dns_clientinfo_t *clientinfo) #endif /* if DLZ_DLOPEN_VERSION == 1 */ { - isc_result_t retval; - config_data_t * cd = (config_data_t *)dbdata; - int rrcount, r; + isc_result_t retval; + config_data_t *cd = (config_data_t *)dbdata; + int rrcount, r; dlz_perl_clientinfo_opaque opaque; - SV * record_ref; - SV ** rr_type; - SV ** rr_ttl; - SV ** rr_data; + SV *record_ref; + SV **rr_type; + SV **rr_ttl; + SV **rr_data; #ifdef MULTIPLICITY PerlInterpreter *my_perl = cd->perl; #endif /* ifdef MULTIPLICITY */ @@ -511,10 +508,10 @@ missing_perl_method(const char *perl_class_name, PerlInterpreter *my_perl) missing_perl_method(const char *perl_class_name) #endif /* ifdef MULTIPLICITY */ { - const int BUF_LEN = 64; /* Should be big enough, right? hah */ - char full_name[BUF_LEN]; + const int BUF_LEN = 64; /* Should be big enough, right? hah */ + char full_name[BUF_LEN]; const char *methods[] = { "new", "findzone", "lookup", NULL }; - int i = 0; + int i = 0; while (methods[i] != NULL) { snprintf(full_name, BUF_LEN, "%s::%s", perl_class_name, @@ -534,14 +531,14 @@ 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 }; - char * perl_class_name; - int r; - va_list ap; - const char * helper_name; - const char * missing_method_name; - char * call_argv_args = NULL; + char *init_args[] = { NULL, NULL }; + char *perlrun[] = { "", NULL, "dlz perl", NULL }; + char *perl_class_name; + int r; + va_list ap; + const char *helper_name; + const char *missing_method_name; + char *call_argv_args = NULL; #ifdef MULTIPLICITY PerlInterpreter *my_perl; #endif /* ifdef MULTIPLICITY */ diff --git a/contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c b/contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c index e05a298235..9f9c9a8a7a 100644 --- a/contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c +++ b/contrib/dlz/modules/sqlite3/dlz_sqlite3_dynamic.c @@ -59,12 +59,12 @@ #include #define dbc_search_limit 30 -#define ALLNODES 1 -#define ALLOWXFR 2 -#define AUTHORITY 3 -#define FINDZONE 4 -#define COUNTZONE 5 -#define LOOKUP 6 +#define ALLNODES 1 +#define ALLOWXFR 2 +#define AUTHORITY 3 +#define FINDZONE 4 +#define COUNTZONE 5 +#define LOOKUP 6 #define safeGet(in) in == NULL ? "" : in @@ -76,7 +76,7 @@ typedef struct { #if PTHREADS db_list_t *db; /*%< handle to a list of DB */ - int dbcount; + int dbcount; #else /* if PTHREADS */ dbinstance_t *db; /*%< handle to DB */ #endif /* if PTHREADS */ @@ -84,9 +84,9 @@ typedef struct { char *dbname; /* Helper functions from the dlz_dlopen driver */ - log_t * log; - dns_sdlz_putrr_t * putrr; - dns_sdlz_putnamedrr_t * putnamedrr; + log_t *log; + dns_sdlz_putrr_t *putrr; + dns_sdlz_putnamedrr_t *putnamedrr; dns_dlz_writeablezone_t *writeable_zone; } sqlite3_instance_t; @@ -94,23 +94,22 @@ typedef struct { * SQLite3 result set */ typedef struct { - char ** pazResult; /* Result of the query */ - unsigned int pnRow; /* Number of result rows */ - unsigned int pnColumn; /* Number of result columns */ - unsigned int curRow; /* Current row */ - char * pzErrmsg; /* Error message */ + char **pazResult; /* Result of the query */ + unsigned int pnRow; /* Number of result rows */ + unsigned int pnColumn; /* Number of result columns */ + unsigned int curRow; /* Current row */ + char *pzErrmsg; /* Error message */ } 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 @@ -167,7 +166,7 @@ static dbinstance_t * sqlite3_find_avail(sqlite3_instance_t *sqlite3) { dbinstance_t *dbi = NULL, *head; - int count = 0; + int count = 0; /* get top of list */ head = dbi = DLZ_LIST_HEAD(*(sqlite3->db)); @@ -206,8 +205,8 @@ sqlite3_find_avail(sqlite3_instance_t *sqlite3) static char * escape_string(const char *instr) { - char * outstr; - char * ptr; + char *outstr; + char *ptr; unsigned int len; unsigned int tlen = 0; unsigned int atlen = 0; @@ -255,17 +254,18 @@ 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) { - isc_result_t result; - dbinstance_t * dbi = NULL; + isc_result_t result; + dbinstance_t *dbi = NULL; sqlite3_instance_t *db = (sqlite3_instance_t *)dbdata; - char * querystring = NULL; - sqlite3_res_t * rs = NULL; - unsigned int i = 0; - unsigned int j = 0; - int qres = 0; + char *querystring = NULL; + sqlite3_res_t *rs = NULL; + unsigned int i = 0; + unsigned int j = 0; + int qres = 0; if ((query == COUNTZONE && rsp != NULL) || - (query != COUNTZONE && (rsp == NULL || *rsp != NULL))) { + (query != COUNTZONE && (rsp == NULL || *rsp != NULL))) + { db->log(ISC_LOG_DEBUG(2), "Invalid result set pointer."); result = ISC_R_FAILURE; goto cleanup; @@ -523,12 +523,12 @@ sqlite3_process_rs(sqlite3_instance_t *db, dns_sdlzlookup_t *lookup, sqlite3_res_t *rs) { isc_result_t result = ISC_R_NOTFOUND; - char ** row; + char **row; unsigned int fields; unsigned int i, j; - char * tmpString; - char * endp; - int ttl; + char *tmpString; + char *endp; + int ttl; row = sqlite3_fetch_row(rs); /* get a row from the result set */ fields = sqlite3_num_fields(rs); /* how many columns in result set */ @@ -635,9 +635,9 @@ isc_result_t dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { - isc_result_t result; - sqlite3_res_t * rs = NULL; - sqlite3_uint64 rows; + isc_result_t result; + sqlite3_res_t *rs = NULL; + sqlite3_uint64 rows; sqlite3_instance_t *db = (sqlite3_instance_t *)dbdata; UNUSED(methods); @@ -673,10 +673,10 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, isc_result_t dlz_allowzonexfr(void *dbdata, const char *name, const char *client) { - isc_result_t result; + isc_result_t result; sqlite3_instance_t *db = (sqlite3_instance_t *)dbdata; - sqlite3_res_t * rs = NULL; - sqlite3_uint64 rows; + sqlite3_res_t *rs = NULL; + sqlite3_uint64 rows; /* first check if the zone is supported by the database. */ result = dlz_findzonedb(dbdata, name, NULL, NULL); @@ -726,15 +726,15 @@ dlz_allowzonexfr(void *dbdata, const char *name, const char *client) isc_result_t dlz_allnodes(const char *zone, void *dbdata, dns_sdlzallnodes_t *allnodes) { - isc_result_t result; + isc_result_t result; sqlite3_instance_t *db = (sqlite3_instance_t *)dbdata; - sqlite3_res_t * rs = NULL; - char ** row; - unsigned int fields; - unsigned int j; - char * tmpString; - char * endp; - int ttl; + sqlite3_res_t *rs = NULL; + char **row; + unsigned int fields; + unsigned int j; + char *tmpString; + char *endp; + int ttl; result = sqlite3_get_resultset(zone, NULL, NULL, ALLNODES, dbdata, &rs); if (result == ISC_R_NOTIMPLEMENTED) { @@ -830,12 +830,12 @@ cleanup: isc_result_t dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) { - isc_result_t result; - sqlite3_res_t * rs = NULL; + isc_result_t result; + sqlite3_res_t *rs = NULL; sqlite3_instance_t *db = (sqlite3_instance_t *)dbdata; - result = - sqlite3_get_resultset(zone, NULL, NULL, AUTHORITY, dbdata, &rs); + result = sqlite3_get_resultset(zone, NULL, NULL, AUTHORITY, dbdata, + &rs); if (result == ISC_R_NOTIMPLEMENTED) { return (result); } @@ -862,8 +862,8 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, dns_sdlzlookup_t *lookup, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo) { - isc_result_t result; - sqlite3_res_t * rs = NULL; + isc_result_t result; + sqlite3_res_t *rs = NULL; sqlite3_instance_t *db = (sqlite3_instance_t *)dbdata; UNUSED(methods); @@ -895,13 +895,13 @@ isc_result_t dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, ...) { - isc_result_t result = ISC_R_FAILURE; + isc_result_t result = ISC_R_FAILURE; sqlite3_instance_t *s3 = NULL; - dbinstance_t * dbi = NULL; - sqlite3 * dbc = NULL; - char * tmp = NULL; - char * endp; - const char * helper_name; + dbinstance_t *dbi = NULL; + sqlite3 *dbc = NULL; + char *tmp = NULL; + char *endp; + const char *helper_name; #if SQLITE3_VERSION_ID >= 50000 my_bool auto_reconnect = 1; #endif /* if SQLITE3_VERSION_ID >= 50000 */ diff --git a/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c b/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c index e177263eb3..533fc26b7d 100644 --- a/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c +++ b/contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c @@ -63,7 +63,7 @@ do { \ union { \ const void *k; \ - void * v; \ + void *v; \ } _u; \ _u.k = konst; \ var = _u.v; \ @@ -73,13 +73,13 @@ #define FNM_NOMATCH 1 /* Match failed. */ /* fnmatch() flags. */ -#define FNM_NOESCAPE 0x01 /* Disable backslash escaping. */ -#define FNM_PATHNAME 0x02 /* Slash must be matched by slash. */ -#define FNM_PERIOD 0x04 /* Period must be matched by period. */ +#define FNM_NOESCAPE 0x01 /* Disable backslash escaping. */ +#define FNM_PATHNAME 0x02 /* Slash must be matched by slash. */ +#define FNM_PERIOD 0x04 /* Period must be matched by period. */ #define FNM_LEADING_DIR 0x08 /* Ignore / after Imatch. */ -#define FNM_CASEFOLD 0x10 /* Case insensitive search. */ -#define FNM_IGNORECASE FNM_CASEFOLD -#define FNM_FILE_NAME FNM_PATHNAME +#define FNM_CASEFOLD 0x10 /* Case insensitive search. */ +#define FNM_IGNORECASE FNM_CASEFOLD +#define FNM_FILE_NAME FNM_PATHNAME /* * Our data structures. @@ -89,24 +89,24 @@ typedef struct named_rr nrr_t; typedef DLZ_LIST(nrr_t) rr_list_t; typedef struct config_data { - char * zone_pattern; - char * axfr_pattern; + char *zone_pattern; + char *axfr_pattern; rr_list_t rrs_list; - char * zone; - char * record; - char * client; + char *zone; + char *record; + char *client; /* Helper functions from the dlz_dlopen driver */ - log_t * log; - dns_sdlz_putrr_t * putrr; - dns_sdlz_putnamedrr_t * putnamedrr; + log_t *log; + dns_sdlz_putrr_t *putrr; + dns_sdlz_putnamedrr_t *putnamedrr; dns_dlz_writeablezone_t *writeable_zone; } config_data_t; struct named_rr { - char * name; - char * type; - int ttl; + char *name; + char *type; + int ttl; query_list_t *data; DLZ_LINK(nrr_t) link; }; @@ -114,26 +114,23 @@ 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) { config_data_t *cd = (config_data_t *)dbdata; - isc_result_t result; - char * querystring = NULL; - nrr_t * nrec; - int i = 0; + isc_result_t result; + char *querystring = NULL; + nrr_t *nrec; + int i = 0; DE_CONST(zone, cd->zone); @@ -206,7 +203,7 @@ dlz_findzonedb(void *dbdata, const char *name, dns_clientinfomethods_t *methods, #endif /* if DLZ_DLOPEN_VERSION < 3 */ { config_data_t *cd = (config_data_t *)dbdata; - const char * p; + const char *p; #if DLZ_DLOPEN_VERSION >= 3 UNUSED(methods); @@ -235,13 +232,13 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, dns_clientinfo_t *clientinfo) #endif /* if DLZ_DLOPEN_VERSION == 1 */ { - isc_result_t result; + isc_result_t result; config_data_t *cd = (config_data_t *)dbdata; - char * querystring = NULL; - const char * p; - char * namebuf; - nrr_t * nrec; - bool origin = true; + char *querystring = NULL; + const char *p; + char *namebuf; + nrr_t *nrec; + bool origin = true; #if DLZ_DLOPEN_VERSION >= 2 UNUSED(methods); @@ -256,8 +253,8 @@ dlz_lookup(const char *zone, const char *name, void *dbdata, DE_CONST(name, cd->record); DE_CONST(p, cd->zone); - if ((p != zone) && - (strcmp(name, "@") == 0 || strcmp(name, zone) == 0)) { + if ((p != zone) && (strcmp(name, "@") == 0 || strcmp(name, zone) == 0)) + { size_t len = p - zone; namebuf = malloc(len); if (namebuf == NULL) { @@ -323,11 +320,11 @@ done: isc_result_t dlz_authority(const char *zone, void *dbdata, dns_sdlzlookup_t *lookup) { - isc_result_t result; + isc_result_t result; config_data_t *cd = (config_data_t *)dbdata; - char * querystring = NULL; - nrr_t * nrec; - const char * p, *name = "@"; + char *querystring = NULL; + nrr_t *nrec; + const char *p, *name = "@"; p = shortest_match(cd->zone_pattern, zone); if (p == NULL) { @@ -410,12 +407,12 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata, ...) { config_data_t *cd; - char * endp; - int i, def_ttl; - nrr_t * trec = NULL; - isc_result_t result; - const char * helper_name; - va_list ap; + char *endp; + int i, def_ttl; + nrr_t *trec = NULL; + isc_result_t result; + const char *helper_name; + va_list ap; if (argc < 8 || argc % 4 != 0) { return (ISC_R_FAILURE); @@ -599,16 +596,16 @@ shortest_match(const char *pattern, const char *string) */ #define EOS '\0' -#define RANGE_MATCH 1 +#define RANGE_MATCH 1 #define RANGE_NOMATCH 0 -#define RANGE_ERROR (-1) +#define RANGE_ERROR (-1) static int fnmatch(const char *pattern, const char *string, int flags) { const char *stringstart; - char * newp; - char c, test; + char *newp; + char c, test; for (stringstart = string;;) switch (c = *pattern++) { @@ -625,8 +622,9 @@ fnmatch(const char *pattern, const char *string, int flags) return (FNM_NOMATCH); } if (*string == '.' && (flags & FNM_PERIOD) && - (string == stringstart || ((flags & FNM_PATHNAME) && - *(string - 1) == '/'))) { + (string == stringstart || + ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) + { return (FNM_NOMATCH); } ++string; @@ -639,8 +637,9 @@ fnmatch(const char *pattern, const char *string, int flags) } if (*string == '.' && (flags & FNM_PERIOD) && - (string == stringstart || ((flags & FNM_PATHNAME) && - *(string - 1) == '/'))) { + (string == stringstart || + ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) + { return (FNM_NOMATCH); } @@ -683,8 +682,9 @@ fnmatch(const char *pattern, const char *string, int flags) return (FNM_NOMATCH); } if (*string == '.' && (flags & FNM_PERIOD) && - (string == stringstart || ((flags & FNM_PATHNAME) && - *(string - 1) == '/'))) { + (string == stringstart || + ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) + { return (FNM_NOMATCH); } @@ -712,7 +712,8 @@ fnmatch(const char *pattern, const char *string, int flags) if (c == *string) { } else if ((flags & FNM_CASEFOLD) && (tolower((unsigned char)c) == - tolower((unsigned char)*string))) { + tolower((unsigned char)*string))) + { } else { return (FNM_NOMATCH); } @@ -725,7 +726,7 @@ fnmatch(const char *pattern, const char *string, int flags) static int rangematch(const char *pattern, char test, int flags, char **newp) { - int negate, ok; + int negate, ok; char c, c2; /* diff --git a/lib/bind9/check.c b/lib/bind9/check.c index 229b59cd78..fea0d4ffce 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -60,30 +60,27 @@ #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) -{ +freekey(char *key, unsigned int type, isc_symvalue_t value, void *userarg) { UNUSED(type); UNUSED(value); isc_mem_free(userarg, key); } static isc_result_t -check_orderent(const cfg_obj_t *ent, isc_log_t *logctx) -{ - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; +check_orderent(const cfg_obj_t *ent, isc_log_t *logctx) { + isc_result_t result = ISC_R_SUCCESS; + isc_result_t tresult; isc_textregion_t r; - dns_fixedname_t fixed; + dns_fixedname_t fixed; const cfg_obj_t *obj; dns_rdataclass_t rdclass; - dns_rdatatype_t rdtype; - isc_buffer_t b; - const char * str; + dns_rdatatype_t rdtype; + isc_buffer_t b; + const char *str; dns_fixedname_init(&fixed); obj = cfg_tuple_get(ent, "class"); @@ -155,7 +152,8 @@ check_orderent(const cfg_obj_t *ent, isc_log_t *logctx) #endif /* if !DNS_RDATASET_FIXED */ } else if (strcasecmp(cfg_obj_asstring(obj), "random") != 0 && strcasecmp(cfg_obj_asstring(obj), "cyclic") != 0 && - strcasecmp(cfg_obj_asstring(obj), "none") != 0) { + strcasecmp(cfg_obj_asstring(obj), "none") != 0) + { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "rrset-order: invalid order '%s'", cfg_obj_asstring(obj)); @@ -167,19 +165,19 @@ check_orderent(const cfg_obj_t *ent, isc_log_t *logctx) } static isc_result_t -check_order(const cfg_obj_t *options, isc_log_t *logctx) -{ - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; +check_order(const cfg_obj_t *options, isc_log_t *logctx) { + isc_result_t result = ISC_R_SUCCESS; + isc_result_t tresult; const cfg_listelt_t *element; - const cfg_obj_t * obj = NULL; + const cfg_obj_t *obj = NULL; if (cfg_map_get(options, "rrset-order", &obj) != ISC_R_SUCCESS) { return (result); } for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { tresult = check_orderent(cfg_listelt_value(element), logctx); if (result == ISC_R_SUCCESS && tresult != ISC_R_SUCCESS) { result = tresult; @@ -189,18 +187,17 @@ check_order(const cfg_obj_t *options, isc_log_t *logctx) } static isc_result_t -check_dual_stack(const cfg_obj_t *options, isc_log_t *logctx) -{ +check_dual_stack(const cfg_obj_t *options, isc_log_t *logctx) { const cfg_listelt_t *element; - const cfg_obj_t * alternates = NULL; - const cfg_obj_t * value; - const cfg_obj_t * obj; - const char * str; - dns_fixedname_t fixed; - dns_name_t * name; - isc_buffer_t buffer; - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; + const cfg_obj_t *alternates = NULL; + const cfg_obj_t *value; + const cfg_obj_t *obj; + const char *str; + dns_fixedname_t fixed; + dns_name_t *name; + isc_buffer_t buffer; + isc_result_t result = ISC_R_SUCCESS; + isc_result_t tresult; (void)cfg_map_get(options, "dual-stack-servers", &alternates); @@ -221,7 +218,8 @@ check_dual_stack(const cfg_obj_t *options, isc_log_t *logctx) } obj = cfg_tuple_get(alternates, "addresses"); for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { value = cfg_listelt_value(element); if (cfg_obj_issockaddr(value)) { continue; @@ -231,8 +229,8 @@ check_dual_stack(const cfg_obj_t *options, isc_log_t *logctx) isc_buffer_constinit(&buffer, str, strlen(str)); isc_buffer_add(&buffer, strlen(str)); name = dns_fixedname_initname(&fixed); - tresult = - dns_name_fromtext(name, &buffer, dns_rootname, 0, NULL); + tresult = dns_name_fromtext(name, &buffer, dns_rootname, 0, + NULL); if (tresult != ISC_R_SUCCESS) { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "bad name '%s'", str); @@ -257,8 +255,7 @@ check_dual_stack(const cfg_obj_t *options, isc_log_t *logctx) static isc_result_t check_forward(const cfg_obj_t *options, const cfg_obj_t *global, - isc_log_t *logctx) -{ + isc_log_t *logctx) { const cfg_obj_t *forward = NULL; const cfg_obj_t *forwarders = NULL; @@ -266,7 +263,7 @@ check_forward(const cfg_obj_t *options, const cfg_obj_t *global, (void)cfg_map_get(options, "forwarders", &forwarders); if (forwarders != NULL && global != NULL) { - const char * file = cfg_obj_file(global); + const char *file = cfg_obj_file(global); unsigned int line = cfg_obj_line(global); cfg_obj_log(forwarders, logctx, ISC_LOG_ERROR, "forwarders declared in root zone and " @@ -283,16 +280,15 @@ check_forward(const cfg_obj_t *options, const cfg_obj_t *global, } static isc_result_t -disabled_algorithms(const cfg_obj_t *disabled, isc_log_t *logctx) -{ - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; +disabled_algorithms(const cfg_obj_t *disabled, isc_log_t *logctx) { + isc_result_t result = ISC_R_SUCCESS; + isc_result_t tresult; const cfg_listelt_t *element; - const char * str; - isc_buffer_t b; - dns_fixedname_t fixed; - dns_name_t * name; - const cfg_obj_t * obj; + const char *str; + isc_buffer_t b; + dns_fixedname_t fixed; + dns_name_t *name; + const cfg_obj_t *obj; name = dns_fixedname_initname(&fixed); obj = cfg_tuple_get(disabled, "name"); @@ -309,9 +305,10 @@ disabled_algorithms(const cfg_obj_t *disabled, isc_log_t *logctx) obj = cfg_tuple_get(disabled, "algorithms"); for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { isc_textregion_t r; - dns_secalg_t alg; + dns_secalg_t alg; DE_CONST(cfg_obj_asstring(cfg_listelt_value(element)), r.base); r.length = strlen(r.base); @@ -328,16 +325,15 @@ disabled_algorithms(const cfg_obj_t *disabled, isc_log_t *logctx) } static isc_result_t -disabled_ds_digests(const cfg_obj_t *disabled, isc_log_t *logctx) -{ - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; +disabled_ds_digests(const cfg_obj_t *disabled, isc_log_t *logctx) { + isc_result_t result = ISC_R_SUCCESS; + isc_result_t tresult; const cfg_listelt_t *element; - const char * str; - isc_buffer_t b; - dns_fixedname_t fixed; - dns_name_t * name; - const cfg_obj_t * obj; + const char *str; + isc_buffer_t b; + dns_fixedname_t fixed; + dns_name_t *name; + const cfg_obj_t *obj; name = dns_fixedname_initname(&fixed); obj = cfg_tuple_get(disabled, "name"); @@ -354,9 +350,10 @@ disabled_ds_digests(const cfg_obj_t *disabled, isc_log_t *logctx) obj = cfg_tuple_get(disabled, "digests"); for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { isc_textregion_t r; - dns_dsdigest_t digest; + dns_dsdigest_t digest; DE_CONST(cfg_obj_asstring(cfg_listelt_value(element)), r.base); r.length = strlen(r.base); @@ -376,12 +373,11 @@ disabled_ds_digests(const cfg_obj_t *disabled, isc_log_t *logctx) static isc_result_t nameexist(const cfg_obj_t *obj, const char *name, int value, isc_symtab_t *symtab, const char *fmt, isc_log_t *logctx, - isc_mem_t *mctx) -{ - char * key; - const char * file; - unsigned int line; - isc_result_t result; + isc_mem_t *mctx) { + char *key; + const char *file; + unsigned int line; + isc_result_t result; isc_symvalue_t symvalue; key = isc_mem_strdup(mctx, name); @@ -408,15 +404,14 @@ nameexist(const cfg_obj_t *obj, const char *name, int value, static isc_result_t mustbesecure(const cfg_obj_t *secure, isc_symtab_t *symtab, isc_log_t *logctx, - isc_mem_t *mctx) -{ + isc_mem_t *mctx) { const cfg_obj_t *obj; - char namebuf[DNS_NAME_FORMATSIZE]; - const char * str; - dns_fixedname_t fixed; - dns_name_t * name; - isc_buffer_t b; - isc_result_t result = ISC_R_SUCCESS; + char namebuf[DNS_NAME_FORMATSIZE]; + const char *str; + dns_fixedname_t fixed; + dns_name_t *name; + isc_buffer_t b; + isc_result_t result = ISC_R_SUCCESS; name = dns_fixedname_initname(&fixed); obj = cfg_tuple_get(secure, "name"); @@ -440,12 +435,11 @@ mustbesecure(const cfg_obj_t *secure, isc_symtab_t *symtab, isc_log_t *logctx, static isc_result_t checkacl(const char *aclname, cfg_aclconfctx_t *actx, const cfg_obj_t *zconfig, const cfg_obj_t *voptions, const cfg_obj_t *config, isc_log_t *logctx, - isc_mem_t *mctx) -{ - isc_result_t result; + isc_mem_t *mctx) { + isc_result_t result; const cfg_obj_t *aclobj = NULL; const cfg_obj_t *options; - dns_acl_t * acl = NULL; + dns_acl_t *acl = NULL; if (zconfig != NULL) { options = cfg_tuple_get(zconfig, "options"); @@ -464,8 +458,8 @@ checkacl(const char *aclname, cfg_aclconfctx_t *actx, const cfg_obj_t *zconfig, if (aclobj == NULL) { return (ISC_R_SUCCESS); } - result = - cfg_acl_fromconfig(aclobj, config, logctx, actx, mctx, 0, &acl); + result = cfg_acl_fromconfig(aclobj, config, logctx, actx, mctx, 0, + &acl); if (acl != NULL) { dns_acl_detach(&acl); } @@ -474,10 +468,9 @@ checkacl(const char *aclname, cfg_aclconfctx_t *actx, const cfg_obj_t *zconfig, static isc_result_t check_viewacls(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions, - const cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) -{ + const cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) { isc_result_t result = ISC_R_SUCCESS, tresult; - int i = 0; + int i = 0; static const char *acls[] = { "allow-query", "allow-query-on", @@ -501,17 +494,16 @@ static const unsigned char zeros[16]; static isc_result_t check_dns64(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions, - const cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) -{ - isc_result_t result = ISC_R_SUCCESS; - const cfg_obj_t * dns64 = NULL; - const cfg_obj_t * options; + const cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) { + isc_result_t result = ISC_R_SUCCESS; + const cfg_obj_t *dns64 = NULL; + const cfg_obj_t *options; const cfg_listelt_t *element; - const cfg_obj_t * map, *obj; - isc_netaddr_t na, sa; - unsigned int prefixlen; - int nbytes; - int i; + const cfg_obj_t *map, *obj; + isc_netaddr_t na, sa; + unsigned int prefixlen; + int nbytes; + int i; static const char *acls[] = { "clients", "exclude", "mapped", NULL }; @@ -530,7 +522,8 @@ check_dns64(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions, } for (element = cfg_list_first(dns64); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { map = cfg_listelt_value(element); obj = cfg_map_getname(map); @@ -551,7 +544,8 @@ check_dns64(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions, } if (prefixlen != 32 && prefixlen != 40 && prefixlen != 48 && - prefixlen != 56 && prefixlen != 64 && prefixlen != 96) { + prefixlen != 56 && prefixlen != 64 && prefixlen != 96) + { cfg_obj_log(map, logctx, ISC_LOG_ERROR, "bad prefix length %u [32/40/48/56/64/96]", prefixlen); @@ -563,7 +557,7 @@ check_dns64(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions, obj = NULL; (void)cfg_map_get(map, acls[i], &obj); if (obj != NULL) { - dns_acl_t * acl = NULL; + dns_acl_t *acl = NULL; isc_result_t tresult; tresult = cfg_acl_fromconfig(obj, config, @@ -631,21 +625,20 @@ check_dns64(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions, static isc_result_t check_ratelimit(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions, - const cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) -{ - isc_result_t result = ISC_R_SUCCESS; - isc_result_t mresult; + const cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) { + isc_result_t result = ISC_R_SUCCESS; + isc_result_t mresult; const cfg_obj_t *map = NULL; const cfg_obj_t *options; const cfg_obj_t *obj; - int min_entries, i; - int all_per_second; - int errors_per_second; - int nodata_per_second; - int nxdomains_per_second; - int referrals_per_second; - int responses_per_second; - int slip; + int min_entries, i; + int all_per_second; + int errors_per_second; + int nodata_per_second; + int nxdomains_per_second; + int referrals_per_second; + int responses_per_second; + int slip; if (voptions != NULL) { cfg_map_get(voptions, "rate-limit", &map); @@ -731,7 +724,7 @@ check_ratelimit(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions, obj = NULL; (void)cfg_map_get(map, "exempt-clients", &obj); if (obj != NULL) { - dns_acl_t * acl = NULL; + dns_acl_t *acl = NULL; isc_result_t tresult; tresult = cfg_acl_fromconfig(obj, config, logctx, actx, mctx, 0, @@ -754,14 +747,13 @@ check_ratelimit(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions, static isc_result_t check_recursionacls(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions, const char *viewname, const cfg_obj_t *config, - isc_log_t *logctx, isc_mem_t *mctx) -{ + isc_log_t *logctx, isc_mem_t *mctx) { const cfg_obj_t *options, *aclobj, *obj = NULL; - dns_acl_t * acl = NULL; - isc_result_t result = ISC_R_SUCCESS, tresult; - bool recursion; - const char * forview = " for view "; - int i = 0; + dns_acl_t *acl = NULL; + isc_result_t result = ISC_R_SUCCESS, tresult; + bool recursion; + const char *forview = " for view "; + int i = 0; static const char *acls[] = { "allow-recursion", "allow-recursion-on", NULL }; @@ -832,14 +824,14 @@ check_recursionacls(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions, } typedef struct { - const char * name; + const char *name; unsigned int scale; unsigned int max; } intervaltable; #ifdef HAVE_DNSTAP typedef struct { - const char * name; + const char *name; unsigned int min; unsigned int max; } fstrmtable; @@ -853,9 +845,8 @@ typedef enum { } optlevel_t; static isc_result_t -check_dscp(const cfg_obj_t *options, isc_log_t *logctx) -{ - isc_result_t result = ISC_R_SUCCESS; +check_dscp(const cfg_obj_t *options, isc_log_t *logctx) { + isc_result_t result = ISC_R_SUCCESS; const cfg_obj_t *obj = NULL; /* @@ -876,8 +867,7 @@ check_dscp(const cfg_obj_t *options, isc_log_t *logctx) } static isc_result_t -check_name(const char *str) -{ +check_name(const char *str) { dns_fixedname_t fixed; dns_fixedname_init(&fixed); @@ -885,8 +875,7 @@ check_name(const char *str) } static bool -kasp_name_allowed(const cfg_listelt_t *element) -{ +kasp_name_allowed(const cfg_listelt_t *element) { const char *name = cfg_obj_asstring( cfg_tuple_get(cfg_listelt_value(element), "name")); @@ -901,20 +890,19 @@ kasp_name_allowed(const cfg_listelt_t *element) static isc_result_t check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, - optlevel_t optlevel) -{ - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; - unsigned int i; - const cfg_obj_t * obj = NULL; - const cfg_obj_t * resignobj = NULL; + optlevel_t optlevel) { + isc_result_t result = ISC_R_SUCCESS; + isc_result_t tresult; + unsigned int i; + const cfg_obj_t *obj = NULL; + const cfg_obj_t *resignobj = NULL; const cfg_listelt_t *element; - isc_symtab_t * symtab = NULL; - const char * str; - isc_buffer_t b; - uint32_t lifetime = 3600; - bool has_dnssecpolicy = false; - const char * ccalg = "siphash24"; + isc_symtab_t *symtab = NULL; + const char *str; + isc_buffer_t b; + uint32_t lifetime = 3600; + bool has_dnssecpolicy = false; + const char *ccalg = "siphash24"; /* * { "name", scale, value } @@ -1001,16 +989,17 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, bad_kasp = true; } else if (optlevel == optlevel_config) { dns_kasplist_t list; - dns_kasp_t * kasp = NULL, *kasp_next = NULL; + dns_kasp_t *kasp = NULL, *kasp_next = NULL; ISC_LIST_INIT(list); if (cfg_obj_islist(obj)) { for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { isc_result_t ret; - cfg_obj_t * kconfig = + cfg_obj_t *kconfig = cfg_listelt_value(element); if (!cfg_obj_istuple(kconfig)) { @@ -1108,7 +1097,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, validity); result = ISC_R_RANGE; } else if ((validity > 7 && validity < resign) || - (validity <= 7 && validity * 24 < resign)) { + (validity <= 7 && validity * 24 < resign)) + { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "validity interval (%u days) " "less than re-signing interval " @@ -1153,7 +1143,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, if (obj != NULL) { str = cfg_obj_asstring(obj); if (strcasecmp(str, "a") != 0 && strcasecmp(str, "aaaa") != 0 && - strcasecmp(str, "none") != 0) { + strcasecmp(str, "none") != 0) + { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "preferred-glue unexpected value '%s'", str); @@ -1165,7 +1156,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, if (obj != NULL) { if (!cfg_obj_isvoid(obj)) { for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *exclude; exclude = cfg_listelt_value(element); @@ -1188,7 +1180,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, (void)cfg_map_get(options, "disable-algorithms", &obj); if (obj != NULL) { for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { obj = cfg_listelt_value(element); tresult = disabled_algorithms(obj, logctx); if (tresult != ISC_R_SUCCESS) { @@ -1204,7 +1197,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, (void)cfg_map_get(options, "disable-ds-digests", &obj); if (obj != NULL) { for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { obj = cfg_listelt_value(element); tresult = disabled_ds_digests(obj, logctx); if (tresult != ISC_R_SUCCESS) { @@ -1242,11 +1236,12 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, result = tresult; } for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { obj = cfg_listelt_value(element); tresult = mustbesecure(obj, symtab, logctx, mctx); - if (result == ISC_R_SUCCESS && - tresult != ISC_R_SUCCESS) { + if (result == ISC_R_SUCCESS && tresult != ISC_R_SUCCESS) + { result = tresult; } } @@ -1280,7 +1275,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, obj = NULL; (void)cfg_map_get(options, "disable-empty-zone", &obj); for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { obj = cfg_listelt_value(element); str = cfg_obj_asstring(obj); if (check_name(str) != ISC_R_SUCCESS) { @@ -1300,7 +1296,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, obj = NULL; (void)cfg_map_get(options, "server-id", &obj); if (obj != NULL && cfg_obj_isstring(obj) && - strlen(cfg_obj_asstring(obj)) > 1024U) { + strlen(cfg_obj_asstring(obj)) > 1024U) + { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "'server-id' too big (>1024 bytes)"); if (result == ISC_R_SUCCESS) { @@ -1365,7 +1362,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, unsigned char secret[32]; for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { unsigned int usedlength; obj = cfg_listelt_value(element); @@ -1400,7 +1398,8 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, } } if (strcasecmp(ccalg, "siphash24") == 0 && - usedlength != ISC_SIPHASH24_KEY_LENGTH) { + usedlength != ISC_SIPHASH24_KEY_LENGTH) + { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "SipHash-2-4 cookie-secret must be " "128 bits"); @@ -1466,7 +1465,7 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, (void)cfg_map_get(options, "dnstap-output", &obj); if (obj != NULL) { const cfg_obj_t *obj2; - dns_dtmode_t dmode; + dns_dtmode_t dmode; obj2 = cfg_tuple_get(obj, "mode"); if (obj2 == NULL) { @@ -1569,10 +1568,10 @@ check_options(const cfg_obj_t *options, isc_log_t *logctx, isc_mem_t *mctx, } static isc_result_t -get_masters_def(const cfg_obj_t *cctx, const char *name, const cfg_obj_t **ret) -{ - isc_result_t result; - const cfg_obj_t * masters = NULL; +get_masters_def(const cfg_obj_t *cctx, const char *name, + const cfg_obj_t **ret) { + isc_result_t result; + const cfg_obj_t *masters = NULL; const cfg_listelt_t *elt; result = cfg_map_get(cctx, "masters", &masters); @@ -1582,7 +1581,7 @@ get_masters_def(const cfg_obj_t *cctx, const char *name, const cfg_obj_t **ret) for (elt = cfg_list_first(masters); elt != NULL; elt = cfg_list_next(elt)) { const cfg_obj_t *list; - const char * listname; + const char *listname; list = cfg_listelt_value(elt); listname = cfg_obj_asstring(cfg_tuple_get(list, "name")); @@ -1597,17 +1596,16 @@ get_masters_def(const cfg_obj_t *cctx, const char *name, const cfg_obj_t **ret) static isc_result_t validate_masters(const cfg_obj_t *obj, const cfg_obj_t *config, - uint32_t *countp, isc_log_t *logctx, isc_mem_t *mctx) -{ - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; - uint32_t count = 0; - isc_symtab_t * symtab = NULL; - isc_symvalue_t symvalue; - const cfg_listelt_t * element; + uint32_t *countp, isc_log_t *logctx, isc_mem_t *mctx) { + isc_result_t result = ISC_R_SUCCESS; + isc_result_t tresult; + uint32_t count = 0; + isc_symtab_t *symtab = NULL; + isc_symvalue_t symvalue; + const cfg_listelt_t *element; const cfg_listelt_t **stack = NULL; - uint32_t stackcount = 0, pushed = 0; - const cfg_obj_t * list; + uint32_t stackcount = 0, pushed = 0; + const cfg_obj_t *list; REQUIRE(countp != NULL); result = isc_symtab_create(mctx, 100, NULL, NULL, false, &symtab); @@ -1621,7 +1619,7 @@ newlist: element = cfg_list_first(list); resume: for (; element != NULL; element = cfg_list_next(element)) { - const char * listname; + const char *listname; const cfg_obj_t *addr; const cfg_obj_t *key; @@ -1660,9 +1658,9 @@ resume: } /* Grow stack? */ if (stackcount == pushed) { - void * newstack; + void *newstack; uint32_t newlen = stackcount + 16; - size_t newsize, oldsize; + size_t newsize, oldsize; newsize = newlen * sizeof(*stack); oldsize = stackcount * sizeof(*stack); @@ -1696,17 +1694,16 @@ resume: } static isc_result_t -check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) -{ - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; +check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) { + isc_result_t result = ISC_R_SUCCESS; + isc_result_t tresult; const cfg_listelt_t *element; const cfg_listelt_t *element2; - dns_fixedname_t fixed_id, fixed_name; - dns_name_t * id, *name; - const char * str; - isc_textregion_t r; - dns_rdatatype_t type; + dns_fixedname_t fixed_id, fixed_name; + dns_name_t *id, *name; + const char *str; + isc_textregion_t r; + dns_rdatatype_t type; /* Check for "update-policy local;" */ if (cfg_obj_isstring(policy) && @@ -1716,12 +1713,13 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) /* Now check the grant policy */ for (element = cfg_list_first(policy); element != NULL; - element = cfg_list_next(element)) { - const cfg_obj_t * stmt = cfg_listelt_value(element); - const cfg_obj_t * identity = cfg_tuple_get(stmt, "identity"); - const cfg_obj_t * matchtype = cfg_tuple_get(stmt, "matchtype"); - const cfg_obj_t * dname = cfg_tuple_get(stmt, "name"); - const cfg_obj_t * typelist = cfg_tuple_get(stmt, "types"); + element = cfg_list_next(element)) + { + const cfg_obj_t *stmt = cfg_listelt_value(element); + const cfg_obj_t *identity = cfg_tuple_get(stmt, "identity"); + const cfg_obj_t *matchtype = cfg_tuple_get(stmt, "matchtype"); + const cfg_obj_t *dname = cfg_tuple_get(stmt, "name"); + const cfg_obj_t *typelist = cfg_tuple_get(stmt, "types"); dns_ssumatchtype_t mtype; id = dns_fixedname_initname(&fixed_id); @@ -1762,7 +1760,8 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) if (tresult == ISC_R_SUCCESS && mtype == dns_ssumatchtype_wildcard && - !dns_name_iswildcard(name)) { + !dns_name_iswildcard(name)) + { cfg_obj_log(identity, logctx, ISC_LOG_ERROR, "'%s' is not a wildcard", str); result = ISC_R_FAILURE; @@ -1778,7 +1777,8 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) case dns_ssumatchtype_selfwild: if (tresult == ISC_R_SUCCESS && (!dns_name_equal(id, name) && - !dns_name_equal(dns_rootname, name))) { + !dns_name_equal(dns_rootname, name))) + { cfg_obj_log(identity, logctx, ISC_LOG_ERROR, "identity and name fields are not " "the same"); @@ -1826,7 +1826,8 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) } for (element2 = cfg_list_first(typelist); element2 != NULL; - element2 = cfg_list_next(element2)) { + element2 = cfg_list_next(element2)) + { const cfg_obj_t *typeobj; typeobj = cfg_listelt_value(element2); @@ -1845,16 +1846,15 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) } typedef struct { - const char * name; + const char *name; unsigned int allowed; } optionstable; static isc_result_t -check_nonzero(const cfg_obj_t *options, isc_log_t *logctx) -{ - isc_result_t result = ISC_R_SUCCESS; +check_nonzero(const cfg_obj_t *options, isc_log_t *logctx) { + isc_result_t result = ISC_R_SUCCESS; const cfg_obj_t *obj = NULL; - unsigned int i; + unsigned int i; static const char *nonzero[] = { "max-retry-time", "min-retry-time", "max-refresh-time", @@ -1865,7 +1865,8 @@ check_nonzero(const cfg_obj_t *options, isc_log_t *logctx) for (i = 0; i < sizeof(nonzero) / sizeof(nonzero[0]); i++) { obj = NULL; if (cfg_map_get(options, nonzero[i], &obj) == ISC_R_SUCCESS && - cfg_obj_asuint32(obj) == 0) { + cfg_obj_asuint32(obj) == 0) + { cfg_obj_log(obj, logctx, ISC_LOG_ERROR, "'%s' must not be zero", nonzero[i]); result = ISC_R_FAILURE; @@ -1880,9 +1881,8 @@ check_nonzero(const cfg_obj_t *options, isc_log_t *logctx) */ static bool check_mirror_zone_notify(const cfg_obj_t *zoptions, const char *znamestr, - isc_log_t *logctx) -{ - bool notify_configuration_ok = true; + isc_log_t *logctx) { + bool notify_configuration_ok = true; const cfg_obj_t *obj = NULL; (void)cfg_map_get(zoptions, "notify", &obj); @@ -1931,12 +1931,11 @@ check_mirror_zone_notify(const cfg_obj_t *zoptions, const char *znamestr, static bool check_recursion(const cfg_obj_t *config, const cfg_obj_t *voptions, const cfg_obj_t *goptions, isc_log_t *logctx, - cfg_aclconfctx_t *actx, isc_mem_t *mctx) -{ - dns_acl_t * acl = NULL; + cfg_aclconfctx_t *actx, isc_mem_t *mctx) { + dns_acl_t *acl = NULL; const cfg_obj_t *obj; - isc_result_t result; - bool retval = true; + isc_result_t result; + bool retval = true; /* * Check the "recursion" option first. @@ -1988,37 +1987,36 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, const cfg_obj_t *config, isc_symtab_t *symtab, isc_symtab_t *files, isc_symtab_t *inview, const char *viewname, dns_rdataclass_t defclass, cfg_aclconfctx_t *actx, - isc_log_t *logctx, isc_mem_t *mctx) -{ - const char * znamestr; - const char * typestr = NULL; - const char * target = NULL; - unsigned int ztype; + isc_log_t *logctx, isc_mem_t *mctx) { + const char *znamestr; + const char *typestr = NULL; + const char *target = NULL; + unsigned int ztype; const cfg_obj_t *zoptions, *goptions = NULL; const cfg_obj_t *obj = NULL; const cfg_obj_t *inviewobj = NULL; - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; - unsigned int i; + isc_result_t result = ISC_R_SUCCESS; + isc_result_t tresult; + unsigned int i; dns_rdataclass_t zclass; - dns_fixedname_t fixedname; - dns_name_t * zname = NULL; /* NULL if parsing of zone name fails. */ - isc_buffer_t b; - bool root = false; - bool rfc1918 = false; - bool ula = false; + dns_fixedname_t fixedname; + dns_name_t *zname = NULL; /* NULL if parsing of zone name fails. */ + isc_buffer_t b; + bool root = false; + bool rfc1918 = false; + bool ula = false; const cfg_listelt_t *element; - bool dlz; - dns_masterformat_t masterformat; - bool ddns = false; - bool has_dnssecpolicy = false; - const void * clauses = NULL; - const char * option = NULL; - static const char * acls[] = { - "allow-notify", - "allow-transfer", - "allow-update", - "allow-update-forwarding", + bool dlz; + dns_masterformat_t masterformat; + bool ddns = false; + bool has_dnssecpolicy = false; + const void *clauses = NULL; + const char *option = NULL; + static const char *acls[] = { + "allow-notify", + "allow-transfer", + "allow-update", + "allow-update-forwarding", }; static optionstable dialups[] = { @@ -2055,7 +2053,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, strcasecmp(typestr, "primary") == 0) { ztype = CFG_ZONE_MASTER; } else if (strcasecmp(typestr, "slave") == 0 || - strcasecmp(typestr, "secondary") == 0) { + strcasecmp(typestr, "secondary") == 0) + { ztype = CFG_ZONE_SLAVE; } else if (strcasecmp(typestr, "mirror") == 0) { ztype = CFG_ZONE_MIRROR; @@ -2124,21 +2123,21 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, "zone '%s': is not a valid name", znamestr); result = ISC_R_FAILURE; } else { - char namebuf[DNS_NAME_FORMATSIZE + 128]; - char * tmp = namebuf; + char namebuf[DNS_NAME_FORMATSIZE + 128]; + char *tmp = namebuf; size_t len = sizeof(namebuf); zname = dns_fixedname_name(&fixedname); dns_name_format(zname, namebuf, sizeof(namebuf)); - tresult = - nameexist(zconfig, namebuf, - ztype == CFG_ZONE_HINT - ? 1 - : ztype == CFG_ZONE_REDIRECT ? 2 : 3, - symtab, - "zone '%s': already exists " - "previous definition: %s:%u", - logctx, mctx); + tresult = nameexist(zconfig, namebuf, + ztype == CFG_ZONE_HINT + ? 1 + : ztype == CFG_ZONE_REDIRECT ? 2 + : 3, + symtab, + "zone '%s': already exists " + "previous definition: %s:%u", + logctx, mctx); if (tresult != ISC_R_SUCCESS) { result = tresult; } @@ -2207,7 +2206,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, if (ztype == CFG_ZONE_INVIEW) { const cfg_obj_t *fwd = NULL; - unsigned int maxopts = 1; + unsigned int maxopts = 1; (void)cfg_map_get(zoptions, "forward", &fwd); if (fwd != NULL) { @@ -2244,7 +2243,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, (void)cfg_map_get(zoptions, "dnssec-policy", &obj); if (obj != NULL) { const cfg_obj_t *kasps = NULL; - const char * kaspname = cfg_obj_asstring(obj); + const char *kaspname = cfg_obj_asstring(obj); if (strcmp(kaspname, "default") == 0) { has_dnssecpolicy = true; @@ -2253,7 +2252,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, } else { (void)cfg_map_get(config, "dnssec-policy", &kasps); for (element = cfg_list_first(kasps); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const char *kn = cfg_obj_asstring(cfg_tuple_get( cfg_listelt_value(element), "name")); if (strcmp(kaspname, kn) == 0) { @@ -2281,7 +2281,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, while (option != NULL) { obj = NULL; if (cfg_map_get(zoptions, option, &obj) == ISC_R_SUCCESS && - obj != NULL && !cfg_clause_validforzone(option, ztype)) { + obj != NULL && !cfg_clause_validforzone(option, ztype)) + { cfg_obj_log(obj, logctx, ISC_LOG_WARNING, "option '%s' is not allowed " "in '%s' zone '%s'", @@ -2307,7 +2308,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, * at the zone level for mirror zones. */ if (ztype == CFG_ZONE_MIRROR && - !check_mirror_zone_notify(zoptions, znamestr, logctx)) { + !check_mirror_zone_notify(zoptions, znamestr, logctx)) + { result = ISC_R_FAILURE; } @@ -2316,7 +2318,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, * shouldn't if notify is disabled. */ if (ztype == CFG_ZONE_MASTER || ztype == CFG_ZONE_SLAVE || - ztype == CFG_ZONE_MIRROR) { + ztype == CFG_ZONE_MIRROR) + { bool donotify = true; obj = NULL; @@ -2357,8 +2360,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, uint32_t count; tresult = validate_masters(obj, config, &count, logctx, mctx); - if (tresult != ISC_R_SUCCESS && - result == ISC_R_SUCCESS) { + if (tresult != ISC_R_SUCCESS && result == ISC_R_SUCCESS) + { result = tresult; } } @@ -2371,7 +2374,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, */ if (ztype == CFG_ZONE_SLAVE || ztype == CFG_ZONE_STUB || (ztype == CFG_ZONE_MIRROR && zname != NULL && - !dns_name_equal(zname, dns_rootname))) { + !dns_name_equal(zname, dns_rootname))) + { obj = NULL; if (cfg_map_get(zoptions, "masters", &obj) != ISC_R_SUCCESS) { cfg_obj_log(zoptions, logctx, ISC_LOG_ERROR, @@ -2382,8 +2386,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, uint32_t count; tresult = validate_masters(obj, config, &count, logctx, mctx); - if (tresult != ISC_R_SUCCESS && - result == ISC_R_SUCCESS) { + if (tresult != ISC_R_SUCCESS && result == ISC_R_SUCCESS) + { result = tresult; } if (tresult == ISC_R_SUCCESS && count == 0) { @@ -2400,7 +2404,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, * contradicts the purpose of the former. */ if (ztype == CFG_ZONE_MIRROR && - !check_recursion(config, voptions, goptions, logctx, actx, mctx)) { + !check_recursion(config, voptions, goptions, logctx, actx, mctx)) + { cfg_obj_log(zoptions, logctx, ISC_LOG_ERROR, "zone '%s': mirror zones cannot be used if " "recursion is disabled", @@ -2412,10 +2417,10 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, * Master zones can't have both "allow-update" and "update-policy". */ if (ztype == CFG_ZONE_MASTER || ztype == CFG_ZONE_SLAVE) { - bool signing = false; - isc_result_t res1, res2, res3; + bool signing = false; + isc_result_t res1, res2, res3; const cfg_obj_t *au = NULL; - const char * arg; + const char *arg; obj = NULL; res1 = cfg_map_get(zoptions, "allow-update", &au); @@ -2586,7 +2591,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, * Check the excessively complicated "dialup" option. */ if (ztype == CFG_ZONE_MASTER || ztype == CFG_ZONE_SLAVE || - ztype == CFG_ZONE_STUB) { + ztype == CFG_ZONE_STUB) + { obj = NULL; (void)cfg_map_get(zoptions, "dialup", &obj); if (obj != NULL && cfg_obj_isstring(obj)) { @@ -2668,9 +2674,10 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, (void)cfg_map_get(zoptions, "server-addresses", &obj); if (ztype == CFG_ZONE_STATICSTUB && obj != NULL) { for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { isc_sockaddr_t sa; - isc_netaddr_t na; + isc_netaddr_t na; obj = cfg_listelt_value(element); sa = *cfg_obj_assockaddr(obj); @@ -2692,11 +2699,12 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, (void)cfg_map_get(zoptions, "server-names", &obj); if (zname != NULL && ztype == CFG_ZONE_STATICSTUB && obj != NULL) { for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { - const char * snamestr; + element = cfg_list_next(element)) + { + const char *snamestr; dns_fixedname_t fixed_sname; - isc_buffer_t b2; - dns_name_t * sname; + isc_buffer_t b2; + dns_name_t *sname; obj = cfg_listelt_value(element); snamestr = cfg_obj_asstring(obj); @@ -2820,8 +2828,9 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, } else if (!dlz && (tresult == ISC_R_NOTFOUND || (tresult == ISC_R_SUCCESS && (strcmp("rbt", cfg_obj_asstring(obj)) == 0 || - strcmp("rbt64", cfg_obj_asstring(obj)) == 0)))) { - isc_result_t res1; + strcmp("rbt64", cfg_obj_asstring(obj)) == 0)))) + { + isc_result_t res1; const cfg_obj_t *fileobj = NULL; tresult = cfg_map_get(zoptions, "file", &fileobj); obj = NULL; @@ -2829,21 +2838,23 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, if ((tresult != ISC_R_SUCCESS && (ztype == CFG_ZONE_MASTER || ztype == CFG_ZONE_HINT || (ztype == CFG_ZONE_SLAVE && res1 == ISC_R_SUCCESS && - cfg_obj_asboolean(obj))))) { + cfg_obj_asboolean(obj))))) + { cfg_obj_log(zconfig, logctx, ISC_LOG_ERROR, "zone '%s': missing 'file' entry", znamestr); result = tresult; } else if (tresult == ISC_R_SUCCESS && (ztype == CFG_ZONE_SLAVE || - ztype == CFG_ZONE_MIRROR || ddns)) { + ztype == CFG_ZONE_MIRROR || ddns)) + { tresult = fileexist(fileobj, files, true, logctx); if (tresult != ISC_R_SUCCESS) { result = tresult; } } else if (tresult == ISC_R_SUCCESS && - (ztype == CFG_ZONE_MASTER || - ztype == CFG_ZONE_HINT)) { + (ztype == CFG_ZONE_MASTER || ztype == CFG_ZONE_HINT)) + { tresult = fileexist(fileobj, files, false, logctx); if (tresult != ISC_R_SUCCESS) { result = tresult; @@ -2856,21 +2867,20 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, typedef struct keyalgorithms { const char *name; - uint16_t size; + uint16_t size; } algorithmtable; isc_result_t -bind9_check_key(const cfg_obj_t *key, isc_log_t *logctx) -{ +bind9_check_key(const cfg_obj_t *key, isc_log_t *logctx) { const cfg_obj_t *algobj = NULL; const cfg_obj_t *secretobj = NULL; - const char * keyname = cfg_obj_asstring(cfg_map_getname(key)); - const char * algorithm; - int i; - size_t len = 0; - isc_result_t result; - isc_buffer_t buf; - unsigned char secretbuf[1024]; + const char *keyname = cfg_obj_asstring(cfg_map_getname(key)); + const char *algorithm; + int i; + size_t len = 0; + isc_result_t result; + isc_buffer_t buf; + unsigned char secretbuf[1024]; static const algorithmtable algorithms[] = { { "hmac-md5", 128 }, { "hmac-md5.sig-alg.reg.int", 0 }, @@ -2906,7 +2916,8 @@ bind9_check_key(const cfg_obj_t *key, isc_log_t *logctx) len = strlen(algorithms[i].name); if (strncasecmp(algorithms[i].name, algorithm, len) == 0 && (algorithm[len] == '\0' || - (algorithms[i].size != 0 && algorithm[len] == '-'))) { + (algorithms[i].size != 0 && algorithm[len] == '-'))) + { break; } } @@ -2957,12 +2968,11 @@ bind9_check_key(const cfg_obj_t *key, isc_log_t *logctx) static isc_result_t fileexist(const cfg_obj_t *obj, isc_symtab_t *symtab, bool writeable, - isc_log_t *logctx) -{ - isc_result_t result; + isc_log_t *logctx) { + isc_result_t result; isc_symvalue_t symvalue; - unsigned int line; - const char * file; + unsigned int line; + const char *file; result = isc_symtab_lookup(symtab, cfg_obj_asstring(obj), 0, &symvalue); if (result == ISC_R_SUCCESS) { @@ -3004,23 +3014,23 @@ fileexist(const cfg_obj_t *obj, isc_symtab_t *symtab, bool writeable, */ static isc_result_t check_keylist(const cfg_obj_t *keys, isc_symtab_t *symtab, isc_mem_t *mctx, - isc_log_t *logctx) -{ - char namebuf[DNS_NAME_FORMATSIZE]; - dns_fixedname_t fname; - dns_name_t * name; - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; + isc_log_t *logctx) { + char namebuf[DNS_NAME_FORMATSIZE]; + dns_fixedname_t fname; + dns_name_t *name; + isc_result_t result = ISC_R_SUCCESS; + isc_result_t tresult; const cfg_listelt_t *element; name = dns_fixedname_initname(&fname); for (element = cfg_list_first(keys); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *key = cfg_listelt_value(element); - const char * keyid = cfg_obj_asstring(cfg_map_getname(key)); - isc_symvalue_t symvalue; - isc_buffer_t b; - char * keyname; + const char *keyid = cfg_obj_asstring(cfg_map_getname(key)); + isc_symvalue_t symvalue; + isc_buffer_t b; + char *keyname; isc_buffer_constinit(&b, keyid, strlen(keyid)); isc_buffer_add(&b, strlen(keyid)); @@ -3042,7 +3052,7 @@ check_keylist(const cfg_obj_t *keys, isc_symtab_t *symtab, isc_mem_t *mctx, tresult = isc_symtab_define(symtab, keyname, 1, symvalue, isc_symexists_reject); if (tresult == ISC_R_EXISTS) { - const char * file; + const char *file; unsigned int line; RUNTIME_CHECK(isc_symtab_lookup(symtab, keyname, 1, @@ -3082,18 +3092,18 @@ static struct { * "foo." is different to "foo". */ static bool -rndckey_exists(const cfg_obj_t *keylist, const char *keyname) -{ +rndckey_exists(const cfg_obj_t *keylist, const char *keyname) { const cfg_listelt_t *element; - const cfg_obj_t * obj; - const char * str; + const cfg_obj_t *obj; + const char *str; if (keylist == NULL) { return (false); } for (element = cfg_list_first(keylist); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { obj = cfg_listelt_value(element); str = cfg_obj_asstring(cfg_map_getname(obj)); if (!strcasecmp(str, keyname)) { @@ -3105,24 +3115,23 @@ rndckey_exists(const cfg_obj_t *keylist, const char *keyname) static isc_result_t check_servers(const cfg_obj_t *config, const cfg_obj_t *voptions, - isc_symtab_t *symtab, isc_log_t *logctx) -{ - dns_fixedname_t fname; - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; + isc_symtab_t *symtab, isc_log_t *logctx) { + dns_fixedname_t fname; + isc_result_t result = ISC_R_SUCCESS; + isc_result_t tresult; const cfg_listelt_t *e1, *e2; - const cfg_obj_t * v1, *v2, *keys; - const cfg_obj_t * servers; - isc_netaddr_t n1, n2; - unsigned int p1, p2; - const cfg_obj_t * obj; - char buf[ISC_NETADDR_FORMATSIZE]; - char namebuf[DNS_NAME_FORMATSIZE]; - const char * xfr; - const char * keyval; - isc_buffer_t b; - int source; - dns_name_t * keyname; + const cfg_obj_t *v1, *v2, *keys; + const cfg_obj_t *servers; + isc_netaddr_t n1, n2; + unsigned int p1, p2; + const cfg_obj_t *obj; + char buf[ISC_NETADDR_FORMATSIZE]; + char namebuf[DNS_NAME_FORMATSIZE]; + const char *xfr; + const char *keyval; + isc_buffer_t b; + int source; + dns_name_t *keyname; servers = NULL; if (voptions != NULL) { @@ -3173,7 +3182,7 @@ check_servers(const cfg_obj_t *config, const cfg_obj_t *voptions, v2 = cfg_listelt_value(e2); cfg_obj_asnetprefix(cfg_map_getname(v2), &n2, &p2); if (p1 == p2 && isc_netaddr_equal(&n1, &n2)) { - const char * file = cfg_obj_file(v1); + const char *file = cfg_obj_file(v1); unsigned int line = cfg_obj_line(v1); if (file == NULL) { @@ -3218,26 +3227,25 @@ check_servers(const cfg_obj_t *config, const cfg_obj_t *voptions, return (result); } -#define ROOT_KSK_STATIC 0x01 +#define ROOT_KSK_STATIC 0x01 #define ROOT_KSK_MANAGED 0x02 -#define ROOT_KSK_ANY 0x03 -#define ROOT_KSK_2010 0x04 -#define ROOT_KSK_2017 0x08 +#define ROOT_KSK_ANY 0x03 +#define ROOT_KSK_2010 0x04 +#define ROOT_KSK_2017 0x08 static isc_result_t check_trust_anchor(const cfg_obj_t *key, bool managed, unsigned int *flagsp, - isc_log_t *logctx) -{ - const char * str = NULL, *namestr = NULL; + isc_log_t *logctx) { + const char *str = NULL, *namestr = NULL; dns_fixedname_t fkeyname; - dns_name_t * keyname = NULL; - isc_buffer_t b; - isc_region_t r; - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; - uint32_t rdata1, rdata2, rdata3; - unsigned char data[4096]; - const char * atstr = NULL; + dns_name_t *keyname = NULL; + isc_buffer_t b; + isc_region_t r; + isc_result_t result = ISC_R_SUCCESS; + isc_result_t tresult; + uint32_t rdata1, rdata2, rdata3; + unsigned char data[4096]; + const char *atstr = NULL; enum { INIT_DNSKEY, STATIC_DNSKEY, INIT_DS, @@ -3405,7 +3413,8 @@ check_trust_anchor(const cfg_obj_t *key, bool managed, unsigned int *flagsp, isc_buffer_usedregion(&b, &r); if ((rdata3 == DST_ALG_RSASHA1) && r.length > 1 && - r.base[0] == 1 && r.base[1] == 3) { + r.base[0] == 1 && r.base[1] == 3) + { cfg_obj_log(key, logctx, ISC_LOG_WARNING, "%s '%s' has a weak exponent", atstr, namestr); @@ -3417,14 +3426,15 @@ check_trust_anchor(const cfg_obj_t *key, bool managed, unsigned int *flagsp, /* * Flag any use of a root key, regardless of content. */ - *flagsp |= - (managed ? ROOT_KSK_MANAGED : ROOT_KSK_STATIC); + *flagsp |= (managed ? ROOT_KSK_MANAGED + : ROOT_KSK_STATIC); if (rdata1 == 257 && rdata2 == 3 && rdata3 == 8 && (isc_buffer_usedlength(&b) == sizeof(root_ksk_2010)) && memcmp(data, root_ksk_2010, - sizeof(root_ksk_2010)) == 0) { + sizeof(root_ksk_2010)) == 0) + { *flagsp |= ROOT_KSK_2010; } @@ -3432,7 +3442,8 @@ check_trust_anchor(const cfg_obj_t *key, bool managed, unsigned int *flagsp, (isc_buffer_usedlength(&b) == sizeof(root_ksk_2017)) && memcmp(data, root_ksk_2017, - sizeof(root_ksk_2017)) == 0) { + sizeof(root_ksk_2017)) == 0) + { *flagsp |= ROOT_KSK_2017; } } @@ -3471,14 +3482,15 @@ check_trust_anchor(const cfg_obj_t *key, bool managed, unsigned int *flagsp, /* * Flag any use of a root key, regardless of content. */ - *flagsp |= - (managed ? ROOT_KSK_MANAGED : ROOT_KSK_STATIC); + *flagsp |= (managed ? ROOT_KSK_MANAGED + : ROOT_KSK_STATIC); if (rdata1 == 20326 && rdata2 == 8 && rdata3 == 1 && (isc_buffer_usedlength(&b) == sizeof(root_ds_1_2017)) && memcmp(data, root_ds_1_2017, - sizeof(root_ds_1_2017)) == 0) { + sizeof(root_ds_1_2017)) == 0) + { *flagsp |= ROOT_KSK_2017; } @@ -3486,7 +3498,8 @@ check_trust_anchor(const cfg_obj_t *key, bool managed, unsigned int *flagsp, (isc_buffer_usedlength(&b) == sizeof(root_ds_2_2017)) && memcmp(data, root_ds_2_2017, - sizeof(root_ds_2_2017)) == 0) { + sizeof(root_ds_2_2017)) == 0) + { *flagsp |= ROOT_KSK_2017; } } @@ -3500,19 +3513,18 @@ cleanup: static isc_result_t record_static_keys(isc_symtab_t *symtab, isc_mem_t *mctx, const cfg_obj_t *keylist, isc_log_t *logctx, - bool autovalidation) -{ - isc_result_t result, ret = ISC_R_SUCCESS; + bool autovalidation) { + isc_result_t result, ret = ISC_R_SUCCESS; const cfg_listelt_t *elt; - dns_fixedname_t fixed; - dns_name_t * name; - char namebuf[DNS_NAME_FORMATSIZE], *p = NULL; + dns_fixedname_t fixed; + dns_name_t *name; + char namebuf[DNS_NAME_FORMATSIZE], *p = NULL; name = dns_fixedname_initname(&fixed); for (elt = cfg_list_first(keylist); elt != NULL; elt = cfg_list_next(elt)) { - const char * initmethod; + const char *initmethod; const cfg_obj_t *init = NULL; const cfg_obj_t *obj = cfg_listelt_value(elt); const char *str = cfg_obj_asstring(cfg_tuple_get(obj, "name")); @@ -3564,13 +3576,12 @@ record_static_keys(isc_symtab_t *symtab, isc_mem_t *mctx, static isc_result_t check_initializing_keys(isc_symtab_t *symtab, const cfg_obj_t *keylist, - isc_log_t *logctx) -{ - isc_result_t result, ret = ISC_R_SUCCESS; + isc_log_t *logctx) { + isc_result_t result, ret = ISC_R_SUCCESS; const cfg_listelt_t *elt; - dns_fixedname_t fixed; - dns_name_t * name; - char namebuf[DNS_NAME_FORMATSIZE]; + dns_fixedname_t fixed; + dns_name_t *name; + char namebuf[DNS_NAME_FORMATSIZE]; name = dns_fixedname_initname(&fixed); @@ -3578,13 +3589,14 @@ check_initializing_keys(isc_symtab_t *symtab, const cfg_obj_t *keylist, elt = cfg_list_next(elt)) { const cfg_obj_t *obj = cfg_listelt_value(elt); const cfg_obj_t *init = NULL; - const char * str; - isc_symvalue_t symvalue; + const char *str; + isc_symvalue_t symvalue; init = cfg_tuple_get(obj, "anchortype"); if (cfg_obj_isvoid(init) || strcasecmp(cfg_obj_asstring(init), "static-key") == 0 || - strcasecmp(cfg_obj_asstring(init), "static-ds") == 0) { + strcasecmp(cfg_obj_asstring(init), "static-ds") == 0) + { /* static key, skip it */ continue; } @@ -3598,7 +3610,7 @@ check_initializing_keys(isc_symtab_t *symtab, const cfg_obj_t *keylist, dns_name_format(name, namebuf, sizeof(namebuf)); result = isc_symtab_lookup(symtab, namebuf, 1, &symvalue); if (result == ISC_R_SUCCESS) { - const char * file = cfg_obj_file(symvalue.as_cpointer); + const char *file = cfg_obj_file(symvalue.as_cpointer); unsigned int line = cfg_obj_line(symvalue.as_cpointer); if (file == NULL) { file = ""; @@ -3619,19 +3631,19 @@ check_initializing_keys(isc_symtab_t *symtab, const cfg_obj_t *keylist, } static isc_result_t -record_ds_keys(isc_symtab_t *symtab, isc_mem_t *mctx, const cfg_obj_t *keylist) -{ - isc_result_t result, ret = ISC_R_SUCCESS; +record_ds_keys(isc_symtab_t *symtab, isc_mem_t *mctx, + const cfg_obj_t *keylist) { + isc_result_t result, ret = ISC_R_SUCCESS; const cfg_listelt_t *elt; - dns_fixedname_t fixed; - dns_name_t * name; - char namebuf[DNS_NAME_FORMATSIZE], *p = NULL; + dns_fixedname_t fixed; + dns_name_t *name; + char namebuf[DNS_NAME_FORMATSIZE], *p = NULL; name = dns_fixedname_initname(&fixed); for (elt = cfg_list_first(keylist); elt != NULL; elt = cfg_list_next(elt)) { - const char * initmethod; + const char *initmethod; const cfg_obj_t *init = NULL; const cfg_obj_t *obj = cfg_listelt_value(elt); const char *str = cfg_obj_asstring(cfg_tuple_get(obj, "name")); @@ -3646,7 +3658,8 @@ record_ds_keys(isc_symtab_t *symtab, isc_mem_t *mctx, const cfg_obj_t *keylist) if (!cfg_obj_isvoid(init)) { initmethod = cfg_obj_asstring(init); if (strcasecmp(initmethod, "initial-key") == 0 || - strcasecmp(initmethod, "static-key") == 0) { + strcasecmp(initmethod, "static-key") == 0) + { /* Key-style key, skip it */ continue; } @@ -3675,12 +3688,11 @@ record_ds_keys(isc_symtab_t *symtab, isc_mem_t *mctx, const cfg_obj_t *keylist) static isc_result_t check_ta_conflicts(const cfg_obj_t *global_ta, const cfg_obj_t *view_ta, const cfg_obj_t *global_tkeys, const cfg_obj_t *view_tkeys, - bool autovalidation, isc_mem_t *mctx, isc_log_t *logctx) -{ - isc_result_t result, tresult; + bool autovalidation, isc_mem_t *mctx, isc_log_t *logctx) { + isc_result_t result, tresult; const cfg_listelt_t *elt = NULL; - const cfg_obj_t * keylist = NULL; - isc_symtab_t * statictab = NULL, *dstab = NULL; + const cfg_obj_t *keylist = NULL; + isc_symtab_t *statictab = NULL, *dstab = NULL; result = isc_symtab_create(mctx, 100, freekey, mctx, false, &statictab); if (result != ISC_R_SUCCESS) { @@ -3784,18 +3796,17 @@ typedef enum { special_zonetype_rpz, special_zonetype_catz } special_zonetype_t; static isc_result_t check_rpz_catz(const char *rpz_catz, const cfg_obj_t *rpz_obj, const char *viewname, isc_symtab_t *symtab, isc_log_t *logctx, - special_zonetype_t specialzonetype) -{ + special_zonetype_t specialzonetype) { const cfg_listelt_t *element; - const cfg_obj_t * obj, *nameobj, *zoneobj; - const char * zonename, *zonetype; - const char * forview = " for view "; - isc_symvalue_t value; - isc_result_t result, tresult; - dns_fixedname_t fixed; - dns_name_t * name; - char namebuf[DNS_NAME_FORMATSIZE]; - unsigned int num_zones = 0; + const cfg_obj_t *obj, *nameobj, *zoneobj; + const char *zonename, *zonetype; + const char *forview = " for view "; + isc_symvalue_t value; + isc_result_t result, tresult; + dns_fixedname_t fixed; + dns_name_t *name; + char namebuf[DNS_NAME_FORMATSIZE]; + unsigned int num_zones = 0; if (viewname == NULL) { viewname = ""; @@ -3807,7 +3818,8 @@ check_rpz_catz(const char *rpz_catz, const cfg_obj_t *rpz_obj, obj = cfg_tuple_get(rpz_obj, "zone list"); for (element = cfg_list_first(obj); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { obj = cfg_listelt_value(element); nameobj = cfg_tuple_get(obj, "zone name"); zonename = cfg_obj_asstring(nameobj); @@ -3850,7 +3862,8 @@ check_rpz_catz(const char *rpz_catz, const cfg_obj_t *rpz_obj, if (strcasecmp(zonetype, "primary") != 0 && strcasecmp(zonetype, "master") != 0 && strcasecmp(zonetype, "secondary") != 0 && - strcasecmp(zonetype, "slave") != 0) { + strcasecmp(zonetype, "slave") != 0) + { cfg_obj_log(nameobj, logctx, ISC_LOG_ERROR, "%s '%s'%s%s is not a master or slave zone", rpz_catz, zonename, forview, viewname); @@ -3867,10 +3880,10 @@ check_rpz_catz(const char *rpz_catz, const cfg_obj_t *rpz_obj, * Data structure used for the 'callback_data' argument to check_one_plugin(). */ struct check_one_plugin_data { - isc_mem_t * mctx; - isc_log_t * lctx; + isc_mem_t *mctx; + isc_log_t *lctx; cfg_aclconfctx_t *actx; - isc_result_t * check_result; + isc_result_t *check_result; }; /*% @@ -3883,14 +3896,13 @@ struct check_one_plugin_data { static isc_result_t check_one_plugin(const cfg_obj_t *config, const cfg_obj_t *obj, const char *plugin_path, const char *parameters, - void *callback_data) -{ + void *callback_data) { struct check_one_plugin_data *data = callback_data; - char full_path[PATH_MAX]; - isc_result_t result; + char full_path[PATH_MAX]; + isc_result_t result; - result = - ns_plugin_expandpath(plugin_path, full_path, sizeof(full_path)); + result = ns_plugin_expandpath(plugin_path, full_path, + sizeof(full_path)); if (result != ISC_R_SUCCESS) { cfg_obj_log(obj, data->lctx, ISC_LOG_ERROR, "%s: plugin check failed: " @@ -3915,8 +3927,7 @@ check_one_plugin(const cfg_obj_t *config, const cfg_obj_t *obj, static isc_result_t check_dnstap(const cfg_obj_t *voptions, const cfg_obj_t *config, - isc_log_t *logctx) -{ + isc_log_t *logctx) { #ifdef HAVE_DNSTAP const cfg_obj_t *options = NULL; const cfg_obj_t *obj = NULL; @@ -3955,8 +3966,7 @@ static isc_result_t check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions, const char *viewname, dns_rdataclass_t vclass, isc_symtab_t *files, bool check_plugins, isc_symtab_t *inview, - isc_log_t *logctx, isc_mem_t *mctx) -{ + isc_log_t *logctx, isc_mem_t *mctx) { const cfg_obj_t *zones = NULL; const cfg_obj_t *view_tkeys = NULL, *global_tkeys = NULL; const cfg_obj_t *view_mkeys = NULL, *global_mkeys = NULL; @@ -3967,17 +3977,17 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions, const cfg_obj_t *dyndb = NULL; #endif /* ifndef HAVE_DLOPEN */ const cfg_listelt_t *element, *element2; - isc_symtab_t * symtab = NULL; - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult = ISC_R_SUCCESS; - cfg_aclconfctx_t * actx = NULL; - const cfg_obj_t * obj; - const cfg_obj_t * options = NULL; - const cfg_obj_t * opts = NULL; - const cfg_obj_t * plugin_list = NULL; - bool autovalidation = false; - unsigned int tflags = 0, dflags = 0; - int i; + isc_symtab_t *symtab = NULL; + isc_result_t result = ISC_R_SUCCESS; + isc_result_t tresult = ISC_R_SUCCESS; + cfg_aclconfctx_t *actx = NULL; + const cfg_obj_t *obj; + const cfg_obj_t *options = NULL; + const cfg_obj_t *opts = NULL; + const cfg_obj_t *plugin_list = NULL; + bool autovalidation = false; + unsigned int tflags = 0, dflags = 0; + int i; /* * Get global options block @@ -4011,7 +4021,8 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions, } for (element = cfg_list_first(zones); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *zone = cfg_listelt_value(element); tresult = check_zoneconf(zone, voptions, config, symtab, files, @@ -4048,7 +4059,8 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions, ISC_R_SUCCESS) && (check_rpz_catz("response-policy zone", obj, viewname, symtab, logctx, - special_zonetype_rpz) != ISC_R_SUCCESS)) { + special_zonetype_rpz) != ISC_R_SUCCESS)) + { result = ISC_R_FAILURE; } @@ -4057,7 +4069,8 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions, ISC_R_SUCCESS) && (check_rpz_catz("catalog zone", obj, viewname, symtab, logctx, - special_zonetype_catz) != ISC_R_SUCCESS)) { + special_zonetype_catz) != ISC_R_SUCCESS)) + { result = ISC_R_FAILURE; } } @@ -4067,16 +4080,16 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions, /* * Check that forwarding is reasonable. */ - if (opts != NULL && - check_forward(opts, NULL, logctx) != ISC_R_SUCCESS) { + if (opts != NULL && check_forward(opts, NULL, logctx) != ISC_R_SUCCESS) + { result = ISC_R_FAILURE; } /* * Check non-zero options at the global and view levels. */ - if (options != NULL && - check_nonzero(options, logctx) != ISC_R_SUCCESS) { + if (options != NULL && check_nonzero(options, logctx) != ISC_R_SUCCESS) + { result = ISC_R_FAILURE; } if (voptions != NULL && @@ -4159,13 +4172,14 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions, unsigned int flags = 0; for (element = cfg_list_first(check_keys[i]); - element != NULL; - element = cfg_list_next(element)) { + element != NULL; element = cfg_list_next(element)) + { const cfg_obj_t *keylist = cfg_listelt_value(element); for (element2 = cfg_list_first(keylist); element2 != NULL; - element2 = cfg_list_next(element2)) { + element2 = cfg_list_next(element2)) + { obj = cfg_listelt_value(element2); tresult = check_trust_anchor( obj, false, &flags, logctx); @@ -4193,7 +4207,8 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions, * Check dnssec/managed-keys. (Only one or the other can be used.) */ if ((view_mkeys != NULL || global_mkeys != NULL) && - (view_ta != NULL || global_ta != NULL)) { + (view_ta != NULL || global_ta != NULL)) + { keys = (view_mkeys != NULL) ? view_mkeys : global_mkeys; cfg_obj_log(keys, logctx, ISC_LOG_ERROR, @@ -4214,13 +4229,14 @@ check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions, unsigned int flags = 0; for (element = cfg_list_first(check_keys[i]); - element != NULL; - element = cfg_list_next(element)) { + element != NULL; element = cfg_list_next(element)) + { const cfg_obj_t *keylist = cfg_listelt_value(element); for (element2 = cfg_list_first(keylist); element2 != NULL; - element2 = cfg_list_next(element2)) { + element2 = cfg_list_next(element2)) + { obj = cfg_listelt_value(element2); tresult = check_trust_anchor( obj, true, &flags, logctx); @@ -4366,26 +4382,26 @@ static const char *default_channels[] = { "default_syslog", "default_stderr", "default_debug", "null", NULL }; static isc_result_t -bind9_check_logging(const cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) -{ - const cfg_obj_t * categories = NULL; - const cfg_obj_t * category; - const cfg_obj_t * channels = NULL; - const cfg_obj_t * channel; +bind9_check_logging(const cfg_obj_t *config, isc_log_t *logctx, + isc_mem_t *mctx) { + const cfg_obj_t *categories = NULL; + const cfg_obj_t *category; + const cfg_obj_t *channels = NULL; + const cfg_obj_t *channel; const cfg_listelt_t *element; const cfg_listelt_t *delement; - const char * channelname; - const char * catname; - const cfg_obj_t * fileobj = NULL; - const cfg_obj_t * syslogobj = NULL; - const cfg_obj_t * nullobj = NULL; - const cfg_obj_t * stderrobj = NULL; - const cfg_obj_t * logobj = NULL; - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; - isc_symtab_t * symtab = NULL; - isc_symvalue_t symvalue; - int i; + const char *channelname; + const char *catname; + const cfg_obj_t *fileobj = NULL; + const cfg_obj_t *syslogobj = NULL; + const cfg_obj_t *nullobj = NULL; + const cfg_obj_t *stderrobj = NULL; + const cfg_obj_t *logobj = NULL; + isc_result_t result = ISC_R_SUCCESS; + isc_result_t tresult; + isc_symtab_t *symtab = NULL; + isc_symvalue_t symvalue; + int i; (void)cfg_map_get(config, "logging", &logobj); if (logobj == NULL) { @@ -4409,7 +4425,8 @@ bind9_check_logging(const cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) cfg_map_get(logobj, "channel", &channels); for (element = cfg_list_first(channels); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { channel = cfg_listelt_value(element); channelname = cfg_obj_asstring(cfg_map_getname(channel)); fileobj = syslogobj = nullobj = stderrobj = NULL; @@ -4448,7 +4465,8 @@ bind9_check_logging(const cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) cfg_map_get(logobj, "category", &categories); for (element = cfg_list_first(categories); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { category = cfg_listelt_value(element); catname = cfg_obj_asstring(cfg_tuple_get(category, "name")); if (isc_log_categorybyname(logctx, catname) == NULL) { @@ -4458,7 +4476,8 @@ bind9_check_logging(const cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) } channels = cfg_tuple_get(category, "destinations"); for (delement = cfg_list_first(channels); delement != NULL; - delement = cfg_list_next(delement)) { + delement = cfg_list_next(delement)) + { channel = cfg_listelt_value(delement); channelname = cfg_obj_asstring(channel); tresult = isc_symtab_lookup(symtab, channelname, 1, @@ -4477,13 +4496,12 @@ bind9_check_logging(const cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) static isc_result_t bind9_check_controlskeys(const cfg_obj_t *control, const cfg_obj_t *keylist, - isc_log_t *logctx) -{ - isc_result_t result = ISC_R_SUCCESS; - const cfg_obj_t * control_keylist; + isc_log_t *logctx) { + isc_result_t result = ISC_R_SUCCESS; + const cfg_obj_t *control_keylist; const cfg_listelt_t *element; - const cfg_obj_t * key; - const char * keyval; + const cfg_obj_t *key; + const char *keyval; control_keylist = cfg_tuple_get(control, "keys"); if (cfg_obj_isvoid(control_keylist)) { @@ -4491,7 +4509,8 @@ bind9_check_controlskeys(const cfg_obj_t *control, const cfg_obj_t *keylist, } for (element = cfg_list_first(control_keylist); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { key = cfg_listelt_value(element); keyval = cfg_obj_asstring(key); @@ -4506,23 +4525,22 @@ bind9_check_controlskeys(const cfg_obj_t *control, const cfg_obj_t *keylist, static isc_result_t bind9_check_controls(const cfg_obj_t *config, isc_log_t *logctx, - isc_mem_t *mctx) -{ - isc_result_t result = ISC_R_SUCCESS, tresult; - cfg_aclconfctx_t * actx = NULL; + isc_mem_t *mctx) { + isc_result_t result = ISC_R_SUCCESS, tresult; + cfg_aclconfctx_t *actx = NULL; const cfg_listelt_t *element, *element2; - const cfg_obj_t * allow; - const cfg_obj_t * control; - const cfg_obj_t * controls; - const cfg_obj_t * controlslist = NULL; - const cfg_obj_t * inetcontrols; - const cfg_obj_t * unixcontrols; - const cfg_obj_t * keylist = NULL; - const char * path; - uint32_t perm, mask; - dns_acl_t * acl = NULL; - isc_sockaddr_t addr; - int i; + const cfg_obj_t *allow; + const cfg_obj_t *control; + const cfg_obj_t *controls; + const cfg_obj_t *controlslist = NULL; + const cfg_obj_t *inetcontrols; + const cfg_obj_t *unixcontrols; + const cfg_obj_t *keylist = NULL; + const char *path; + uint32_t perm, mask; + dns_acl_t *acl = NULL; + isc_sockaddr_t addr; + int i; (void)cfg_map_get(config, "controls", &controlslist); if (controlslist == NULL) { @@ -4538,14 +4556,16 @@ bind9_check_controls(const cfg_obj_t *config, isc_log_t *logctx, * UNIX: Check "perm" for sanity, check path length. */ for (element = cfg_list_first(controlslist); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { controls = cfg_listelt_value(element); unixcontrols = NULL; inetcontrols = NULL; (void)cfg_map_get(controls, "unix", &unixcontrols); (void)cfg_map_get(controls, "inet", &inetcontrols); for (element2 = cfg_list_first(inetcontrols); element2 != NULL; - element2 = cfg_list_next(element2)) { + element2 = cfg_list_next(element2)) + { control = cfg_listelt_value(element2); allow = cfg_tuple_get(control, "allow"); tresult = cfg_acl_fromconfig(allow, config, logctx, @@ -4563,7 +4583,8 @@ bind9_check_controls(const cfg_obj_t *config, isc_log_t *logctx, } } for (element2 = cfg_list_first(unixcontrols); element2 != NULL; - element2 = cfg_list_next(element2)) { + element2 = cfg_list_next(element2)) + { control = cfg_listelt_value(element2); path = cfg_obj_asstring(cfg_tuple_get(control, "path")); tresult = isc_sockaddr_frompath(&addr, path); @@ -4608,28 +4629,27 @@ bind9_check_controls(const cfg_obj_t *config, isc_log_t *logctx, isc_result_t bind9_check_namedconf(const cfg_obj_t *config, bool check_plugins, - isc_log_t *logctx, isc_mem_t *mctx) -{ - const cfg_obj_t * options = NULL; - const cfg_obj_t * views = NULL; - const cfg_obj_t * acls = NULL; - const cfg_obj_t * kals = NULL; - const cfg_obj_t * obj; + isc_log_t *logctx, isc_mem_t *mctx) { + const cfg_obj_t *options = NULL; + const cfg_obj_t *views = NULL; + const cfg_obj_t *acls = NULL; + const cfg_obj_t *kals = NULL; + const cfg_obj_t *obj; const cfg_listelt_t *velement; - isc_result_t result = ISC_R_SUCCESS; - isc_result_t tresult; - isc_symtab_t * symtab = NULL; - isc_symtab_t * files = NULL; - isc_symtab_t * inview = NULL; + isc_result_t result = ISC_R_SUCCESS; + isc_result_t tresult; + isc_symtab_t *symtab = NULL; + isc_symtab_t *files = NULL; + isc_symtab_t *inview = NULL; static const char *builtin[] = { "localhost", "localnets", "any", "none" }; (void)cfg_map_get(config, "options", &options); - if (options != NULL && - check_options(options, logctx, mctx, optlevel_options) != - ISC_R_SUCCESS) { + if (options != NULL && check_options(options, logctx, mctx, + optlevel_options) != ISC_R_SUCCESS) + { result = ISC_R_FAILURE; } @@ -4707,15 +4727,16 @@ bind9_check_namedconf(const cfg_obj_t *config, bool check_plugins, goto cleanup; } for (velement = cfg_list_first(views); velement != NULL; - velement = cfg_list_next(velement)) { + velement = cfg_list_next(velement)) + { const cfg_obj_t *view = cfg_listelt_value(velement); const cfg_obj_t *vname = cfg_tuple_get(view, "name"); const cfg_obj_t *voptions = cfg_tuple_get(view, "options"); const cfg_obj_t *vclassobj = cfg_tuple_get(view, "class"); dns_rdataclass_t vclass = dns_rdataclass_in; - const char * key = cfg_obj_asstring(vname); - isc_symvalue_t symvalue; - unsigned int symtype; + const char *key = cfg_obj_asstring(vname); + isc_symvalue_t symvalue; + unsigned int symtype; tresult = ISC_R_SUCCESS; if (cfg_obj_isstring(vclassobj)) { @@ -4737,7 +4758,7 @@ bind9_check_namedconf(const cfg_obj_t *config, bool check_plugins, symvalue, isc_symexists_reject); if (tresult == ISC_R_EXISTS) { - const char * file; + const char *file; unsigned int line; RUNTIME_CHECK(isc_symtab_lookup(symtab, key, symtype, @@ -4755,7 +4776,8 @@ bind9_check_namedconf(const cfg_obj_t *config, bool check_plugins, } else if ((strcasecmp(key, "_bind") == 0 && vclass == dns_rdataclass_ch) || (strcasecmp(key, "_default") == 0 && - vclass == dns_rdataclass_in)) { + vclass == dns_rdataclass_in)) + { cfg_obj_log(view, logctx, ISC_LOG_ERROR, "attempt to redefine builtin view " "'%s'", @@ -4789,13 +4811,13 @@ bind9_check_namedconf(const cfg_obj_t *config, bool check_plugins, if (acls != NULL) { const cfg_listelt_t *elt; const cfg_listelt_t *elt2; - const char * aclname; + const char *aclname; for (elt = cfg_list_first(acls); elt != NULL; elt = cfg_list_next(elt)) { const cfg_obj_t *acl = cfg_listelt_value(elt); - unsigned int line = cfg_obj_line(acl); - unsigned int i; + unsigned int line = cfg_obj_line(acl); + unsigned int i; aclname = cfg_obj_asstring(cfg_tuple_get(acl, "name")); for (i = 0; i < sizeof(builtin) / sizeof(builtin[0]); @@ -4817,7 +4839,7 @@ bind9_check_namedconf(const cfg_obj_t *config, bool check_plugins, for (elt2 = cfg_list_next(elt); elt2 != NULL; elt2 = cfg_list_next(elt2)) { const cfg_obj_t *acl2 = cfg_listelt_value(elt2); - const char * name; + const char *name; name = cfg_obj_asstring( cfg_tuple_get(acl2, "name")); if (strcasecmp(aclname, name) == 0) { @@ -4842,7 +4864,7 @@ bind9_check_namedconf(const cfg_obj_t *config, bool check_plugins, if (tresult == ISC_R_SUCCESS) { const cfg_listelt_t *elt; const cfg_listelt_t *elt2; - const char * aclname; + const char *aclname; for (elt = cfg_list_first(kals); elt != NULL; elt = cfg_list_next(elt)) { @@ -4853,11 +4875,11 @@ bind9_check_namedconf(const cfg_obj_t *config, bool check_plugins, for (elt2 = cfg_list_next(elt); elt2 != NULL; elt2 = cfg_list_next(elt2)) { const cfg_obj_t *acl2 = cfg_listelt_value(elt2); - const char * name; + const char *name; name = cfg_obj_asstring( cfg_tuple_get(acl2, "name")); if (strcasecmp(aclname, name) == 0) { - const char * file = cfg_obj_file(acl); + const char *file = cfg_obj_file(acl); unsigned int line = cfg_obj_line(acl); if (file == NULL) { diff --git a/lib/bind9/getaddresses.c b/lib/bind9/getaddresses.c index 1baddcdfe6..c598dfea4d 100644 --- a/lib/bind9/getaddresses.c +++ b/lib/bind9/getaddresses.c @@ -28,15 +28,14 @@ isc_result_t bind9_getaddresses(const char *hostname, in_port_t port, isc_sockaddr_t *addrs, - int addrsize, int *addrcount) -{ - struct in_addr in4; + int addrsize, int *addrcount) { + struct in_addr in4; struct in6_addr in6; - bool have_ipv4, have_ipv6; - int i; + bool have_ipv4, have_ipv6; + int i; struct addrinfo *ai = NULL, *tmpai, hints; - int result; + int result; REQUIRE(hostname != NULL); REQUIRE(addrs != NULL); @@ -64,7 +63,7 @@ bind9_getaddresses(const char *hostname, in_port_t port, isc_sockaddr_t *addrs, *addrcount = 1; return (ISC_R_SUCCESS); } else if (strlen(hostname) <= 127U) { - char tmpbuf[128], *d; + char tmpbuf[128], *d; uint32_t zone = 0; strlcpy(tmpbuf, hostname, sizeof(tmpbuf)); @@ -137,8 +136,8 @@ again: } for (tmpai = ai, i = 0; tmpai != NULL && i < addrsize; tmpai = tmpai->ai_next) { - if (tmpai->ai_family != AF_INET && - tmpai->ai_family != AF_INET6) { + if (tmpai->ai_family != AF_INET && tmpai->ai_family != AF_INET6) + { continue; } if (tmpai->ai_family == AF_INET) { diff --git a/lib/bind9/win32/DLLMain.c b/lib/bind9/win32/DLLMain.c index 69e68ca22a..e104b8e4f3 100644 --- a/lib/bind9/win32/DLLMain.c +++ b/lib/bind9/win32/DLLMain.c @@ -16,8 +16,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/lib/dns/acl.c b/lib/dns/acl.c index ebcb77efcf..78cd0cc396 100644 --- a/lib/dns/acl.c +++ b/lib/dns/acl.c @@ -28,10 +28,9 @@ * length is 0. */ isc_result_t -dns_acl_create(isc_mem_t *mctx, int n, dns_acl_t **target) -{ +dns_acl_create(isc_mem_t *mctx, int n, dns_acl_t **target) { isc_result_t result; - dns_acl_t * acl; + dns_acl_t *acl; /* * Work around silly limitation of isc_mem_get(). @@ -80,10 +79,9 @@ dns_acl_create(isc_mem_t *mctx, int n, dns_acl_t **target) * "none" is the same as "!any". */ static isc_result_t -dns_acl_anyornone(isc_mem_t *mctx, bool neg, dns_acl_t **target) -{ +dns_acl_anyornone(isc_mem_t *mctx, bool neg, dns_acl_t **target) { isc_result_t result; - dns_acl_t * acl = NULL; + dns_acl_t *acl = NULL; result = dns_acl_create(mctx, 0, &acl); if (result != ISC_R_SUCCESS) { @@ -104,8 +102,7 @@ dns_acl_anyornone(isc_mem_t *mctx, bool neg, dns_acl_t **target) * Create a new ACL that matches everything. */ isc_result_t -dns_acl_any(isc_mem_t *mctx, dns_acl_t **target) -{ +dns_acl_any(isc_mem_t *mctx, dns_acl_t **target) { return (dns_acl_anyornone(mctx, false, target)); } @@ -113,8 +110,7 @@ dns_acl_any(isc_mem_t *mctx, dns_acl_t **target) * Create a new ACL that matches nothing. */ isc_result_t -dns_acl_none(isc_mem_t *mctx, dns_acl_t **target) -{ +dns_acl_none(isc_mem_t *mctx, dns_acl_t **target) { return (dns_acl_anyornone(mctx, true, target)); } @@ -123,12 +119,12 @@ dns_acl_none(isc_mem_t *mctx, dns_acl_t **target) * If pos is false, test whether acl is set to "{ none; }" */ static bool -dns_acl_isanyornone(dns_acl_t *acl, bool pos) -{ +dns_acl_isanyornone(dns_acl_t *acl, bool pos) { /* Should never happen but let's be safe */ if (acl == NULL || acl->iptable == NULL || acl->iptable->radix == NULL || acl->iptable->radix->head == NULL || - acl->iptable->radix->head->prefix == NULL) { + acl->iptable->radix->head->prefix == NULL) + { return (false); } @@ -140,7 +136,8 @@ dns_acl_isanyornone(dns_acl_t *acl, bool pos) acl->iptable->radix->head->data[0] != NULL && acl->iptable->radix->head->data[0] == acl->iptable->radix->head->data[1] && - *(bool *)(acl->iptable->radix->head->data[0]) == pos) { + *(bool *)(acl->iptable->radix->head->data[0]) == pos) + { return (true); } @@ -151,8 +148,7 @@ dns_acl_isanyornone(dns_acl_t *acl, bool pos) * Test whether acl is set to "{ any; }" */ bool -dns_acl_isany(dns_acl_t *acl) -{ +dns_acl_isany(dns_acl_t *acl) { return (dns_acl_isanyornone(acl, true)); } @@ -160,8 +156,7 @@ dns_acl_isany(dns_acl_t *acl) * Test whether acl is set to "{ none; }" */ bool -dns_acl_isnone(dns_acl_t *acl) -{ +dns_acl_isnone(dns_acl_t *acl) { return (dns_acl_isanyornone(acl, false)); } @@ -175,22 +170,22 @@ dns_acl_isnone(dns_acl_t *acl) isc_result_t dns_acl_match(const isc_netaddr_t *reqaddr, const dns_name_t *reqsigner, const dns_acl_t *acl, const dns_aclenv_t *env, int *match, - const dns_aclelement_t **matchelt) -{ - uint16_t bitlen; - isc_prefix_t pfx; - isc_radix_node_t * node = NULL; + const dns_aclelement_t **matchelt) { + uint16_t bitlen; + isc_prefix_t pfx; + isc_radix_node_t *node = NULL; const isc_netaddr_t *addr = reqaddr; - isc_netaddr_t v4addr; - isc_result_t result; - int match_num = -1; - unsigned int i; + isc_netaddr_t v4addr; + isc_result_t result; + int match_num = -1; + unsigned int i; REQUIRE(reqaddr != NULL); REQUIRE(matchelt == NULL || *matchelt == NULL); if (env != NULL && env->match_mapped && addr->family == AF_INET6 && - IN6_IS_ADDR_V4MAPPED(&addr->type.in6)) { + IN6_IS_ADDR_V4MAPPED(&addr->type.in6)) + { isc_netaddr_fromv4mapped(&v4addr, addr); addr = &v4addr; } @@ -227,8 +222,8 @@ dns_acl_match(const isc_netaddr_t *reqaddr, const dns_name_t *reqsigner, break; } - if (dns_aclelement_match(reqaddr, reqsigner, e, env, - matchelt)) { + if (dns_aclelement_match(reqaddr, reqsigner, e, env, matchelt)) + { if (match_num == -1 || e->node_num < match_num) { if (e->negative) { *match = -e->node_num; @@ -253,11 +248,10 @@ dns_acl_match(const isc_netaddr_t *reqaddr, const dns_name_t *reqsigner, * an unexpected positive match in the parent ACL. */ isc_result_t -dns_acl_merge(dns_acl_t *dest, dns_acl_t *source, bool pos) -{ +dns_acl_merge(dns_acl_t *dest, dns_acl_t *source, bool pos) { isc_result_t result; unsigned int newalloc, nelem, i; - int max_node = 0, nodes; + int max_node = 0, nodes; /* Resize the element array if needed. */ if (dest->length + source->length > dest->alloc) { @@ -307,7 +301,8 @@ dns_acl_merge(dns_acl_t *dest, dns_acl_t *source, bool pos) /* Duplicate nested acl. */ if (source->elements[i].type == dns_aclelementtype_nestedacl && - source->elements[i].nestedacl != NULL) { + source->elements[i].nestedacl != NULL) + { dns_acl_attach(source->elements[i].nestedacl, &dest->elements[nelem + i].nestedacl); } @@ -365,16 +360,15 @@ dns_acl_merge(dns_acl_t *dest, dns_acl_t *source, bool pos) bool dns_aclelement_match(const isc_netaddr_t *reqaddr, const dns_name_t *reqsigner, const dns_aclelement_t *e, const dns_aclenv_t *env, - const dns_aclelement_t **matchelt) -{ - dns_acl_t * inner = NULL; - int indirectmatch; + const dns_aclelement_t **matchelt) { + dns_acl_t *inner = NULL; + int indirectmatch; isc_result_t result; switch (e->type) { case dns_aclelementtype_keyname: - if (reqsigner != NULL && - dns_name_equal(reqsigner, &e->keyname)) { + if (reqsigner != NULL && dns_name_equal(reqsigner, &e->keyname)) + { if (matchelt != NULL) { *matchelt = e; } @@ -442,8 +436,7 @@ dns_aclelement_match(const isc_netaddr_t *reqaddr, const dns_name_t *reqsigner, } void -dns_acl_attach(dns_acl_t *source, dns_acl_t **target) -{ +dns_acl_attach(dns_acl_t *source, dns_acl_t **target) { REQUIRE(DNS_ACL_VALID(source)); isc_refcount_increment(&source->refcount); @@ -451,8 +444,7 @@ dns_acl_attach(dns_acl_t *source, dns_acl_t **target) } static void -destroy(dns_acl_t *dacl) -{ +destroy(dns_acl_t *dacl) { unsigned int i; INSIST(!ISC_LINK_LINKED(dacl, nextincache)); @@ -481,8 +473,7 @@ destroy(dns_acl_t *dacl) } void -dns_acl_detach(dns_acl_t **aclp) -{ +dns_acl_detach(dns_acl_t **aclp) { REQUIRE(aclp != NULL && DNS_ACL_VALID(*aclp)); dns_acl_t *acl = *aclp; *aclp = NULL; @@ -492,13 +483,12 @@ dns_acl_detach(dns_acl_t **aclp) } } -static isc_once_t insecure_prefix_once = ISC_ONCE_INIT; +static isc_once_t insecure_prefix_once = ISC_ONCE_INIT; static isc_mutex_t insecure_prefix_lock; -static bool insecure_prefix_found; +static bool insecure_prefix_found; static void -initialize_action(void) -{ +initialize_action(void) { isc_mutex_init(&insecure_prefix_lock); } @@ -507,13 +497,13 @@ initialize_action(void) * insecure. */ static void -is_insecure(isc_prefix_t *prefix, void **data) -{ +is_insecure(isc_prefix_t *prefix, void **data) { /* * If all nonexistent or negative then this node is secure. */ if ((data[0] == NULL || !*(bool *)data[0]) && - (data[1] == NULL || !*(bool *)data[1])) { + (data[1] == NULL || !*(bool *)data[1])) + { return; } @@ -523,12 +513,14 @@ is_insecure(isc_prefix_t *prefix, void **data) */ if (prefix->bitlen == 32 && htonl(prefix->add.sin.s_addr) == INADDR_LOOPBACK && - (data[1] == NULL || !*(bool *)data[1])) { + (data[1] == NULL || !*(bool *)data[1])) + { return; } if (prefix->bitlen == 128 && IN6_IS_ADDR_LOOPBACK(&prefix->add.sin6) && - (data[0] == NULL || !*(bool *)data[0])) { + (data[0] == NULL || !*(bool *)data[0])) + { return; } @@ -546,10 +538,9 @@ is_insecure(isc_prefix_t *prefix, void **data) * this function returns false is safe. */ bool -dns_acl_isinsecure(const dns_acl_t *a) -{ +dns_acl_isinsecure(const dns_acl_t *a) { unsigned int i; - bool insecure; + bool insecure; RUNTIME_CHECK(isc_once_do(&insecure_prefix_once, initialize_action) == ISC_R_SUCCESS); @@ -608,9 +599,8 @@ dns_acl_isinsecure(const dns_acl_t *a) */ bool dns_acl_allowed(isc_netaddr_t *addr, const dns_name_t *signer, dns_acl_t *acl, - dns_aclenv_t *aclenv) -{ - int match; + dns_aclenv_t *aclenv) { + int match; isc_result_t result; if (acl == NULL) { @@ -627,8 +617,7 @@ dns_acl_allowed(isc_netaddr_t *addr, const dns_name_t *signer, dns_acl_t *acl, * Initialize ACL environment, setting up localhost and localnets ACLs */ isc_result_t -dns_aclenv_init(isc_mem_t *mctx, dns_aclenv_t *env) -{ +dns_aclenv_init(isc_mem_t *mctx, dns_aclenv_t *env) { isc_result_t result; env->localhost = NULL; @@ -654,8 +643,7 @@ cleanup_nothing: } void -dns_aclenv_copy(dns_aclenv_t *t, dns_aclenv_t *s) -{ +dns_aclenv_copy(dns_aclenv_t *t, dns_aclenv_t *s) { dns_acl_detach(&t->localhost); dns_acl_attach(s->localhost, &t->localhost); dns_acl_detach(&t->localnets); @@ -667,8 +655,7 @@ dns_aclenv_copy(dns_aclenv_t *t, dns_aclenv_t *s) } void -dns_aclenv_destroy(dns_aclenv_t *env) -{ +dns_aclenv_destroy(dns_aclenv_t *env) { if (env->localhost != NULL) { dns_acl_detach(&env->localhost); } diff --git a/lib/dns/adb.c b/lib/dns/adb.c index 768f9d3d68..4058a38acf 100644 --- a/lib/dns/adb.c +++ b/lib/dns/adb.c @@ -43,20 +43,20 @@ #include #include -#define DNS_ADB_MAGIC ISC_MAGIC('D', 'a', 'd', 'b') -#define DNS_ADB_VALID(x) ISC_MAGIC_VALID(x, DNS_ADB_MAGIC) -#define DNS_ADBNAME_MAGIC ISC_MAGIC('a', 'd', 'b', 'N') -#define DNS_ADBNAME_VALID(x) ISC_MAGIC_VALID(x, DNS_ADBNAME_MAGIC) -#define DNS_ADBNAMEHOOK_MAGIC ISC_MAGIC('a', 'd', 'N', 'H') +#define DNS_ADB_MAGIC ISC_MAGIC('D', 'a', 'd', 'b') +#define DNS_ADB_VALID(x) ISC_MAGIC_VALID(x, DNS_ADB_MAGIC) +#define DNS_ADBNAME_MAGIC ISC_MAGIC('a', 'd', 'b', 'N') +#define DNS_ADBNAME_VALID(x) ISC_MAGIC_VALID(x, DNS_ADBNAME_MAGIC) +#define DNS_ADBNAMEHOOK_MAGIC ISC_MAGIC('a', 'd', 'N', 'H') #define DNS_ADBNAMEHOOK_VALID(x) ISC_MAGIC_VALID(x, DNS_ADBNAMEHOOK_MAGIC) -#define DNS_ADBLAMEINFO_MAGIC ISC_MAGIC('a', 'd', 'b', 'Z') +#define DNS_ADBLAMEINFO_MAGIC ISC_MAGIC('a', 'd', 'b', 'Z') #define DNS_ADBLAMEINFO_VALID(x) ISC_MAGIC_VALID(x, DNS_ADBLAMEINFO_MAGIC) -#define DNS_ADBENTRY_MAGIC ISC_MAGIC('a', 'd', 'b', 'E') -#define DNS_ADBENTRY_VALID(x) ISC_MAGIC_VALID(x, DNS_ADBENTRY_MAGIC) -#define DNS_ADBFETCH_MAGIC ISC_MAGIC('a', 'd', 'F', '4') -#define DNS_ADBFETCH_VALID(x) ISC_MAGIC_VALID(x, DNS_ADBFETCH_MAGIC) -#define DNS_ADBFETCH6_MAGIC ISC_MAGIC('a', 'd', 'F', '6') -#define DNS_ADBFETCH6_VALID(x) ISC_MAGIC_VALID(x, DNS_ADBFETCH6_MAGIC) +#define DNS_ADBENTRY_MAGIC ISC_MAGIC('a', 'd', 'b', 'E') +#define DNS_ADBENTRY_VALID(x) ISC_MAGIC_VALID(x, DNS_ADBENTRY_MAGIC) +#define DNS_ADBFETCH_MAGIC ISC_MAGIC('a', 'd', 'F', '4') +#define DNS_ADBFETCH_VALID(x) ISC_MAGIC_VALID(x, DNS_ADBFETCH_MAGIC) +#define DNS_ADBFETCH6_MAGIC ISC_MAGIC('a', 'd', 'F', '6') +#define DNS_ADBFETCH6_VALID(x) ISC_MAGIC_VALID(x, DNS_ADBFETCH6_MAGIC) /*! * For type 3 negative cache entries, we will remember that the address is @@ -66,7 +66,7 @@ */ #define ADB_CACHE_MINIMUM 10 /*%< seconds */ #define ADB_CACHE_MAXIMUM 86400 /*%< seconds (86400 = 24 hours) */ -#define ADB_ENTRY_WINDOW 1800 /*%< seconds */ +#define ADB_ENTRY_WINDOW 1800 /*%< seconds */ /*% * The period in seconds after which an ADB name entry is regarded as stale @@ -89,7 +89,7 @@ typedef struct dns_adbnamehook dns_adbnamehook_t; typedef ISC_LIST(dns_adbnamehook_t) dns_adbnamehooklist_t; typedef struct dns_adblameinfo dns_adblameinfo_t; typedef ISC_LIST(dns_adbentry_t) dns_adbentrylist_t; -typedef struct dns_adbfetch dns_adbfetch_t; +typedef struct dns_adbfetch dns_adbfetch_t; typedef struct dns_adbfetch6 dns_adbfetch6_t; /*% dns adb structure */ @@ -99,20 +99,20 @@ struct dns_adb { isc_mutex_t lock; isc_mutex_t reflock; /*%< Covers irefcnt, erefcnt */ isc_mutex_t overmemlock; /*%< Covers overmem */ - isc_mem_t * mctx; + isc_mem_t *mctx; dns_view_t *view; isc_taskmgr_t *taskmgr; - isc_task_t * task; - isc_task_t * excl; + isc_task_t *task; + isc_task_t *excl; isc_interval_t tick_interval; - int next_cleanbucket; + int next_cleanbucket; unsigned int irefcnt; unsigned int erefcnt; - isc_mutex_t mplock; + isc_mutex_t mplock; isc_mempool_t *nmp; /*%< dns_adbname_t */ isc_mempool_t *nhmp; /*%< dns_adbnamehook_t */ isc_mempool_t *limp; /*%< dns_adblameinfo_t */ @@ -126,43 +126,43 @@ struct dns_adb { * * XXXRTH Have a per-bucket structure that contains all of these? */ - unsigned int nnames; - isc_mutex_t namescntlock; - unsigned int namescnt; + unsigned int nnames; + isc_mutex_t namescntlock; + unsigned int namescnt; dns_adbnamelist_t *names; dns_adbnamelist_t *deadnames; - isc_mutex_t * namelocks; - bool * name_sd; - unsigned int * name_refcnt; + isc_mutex_t *namelocks; + bool *name_sd; + unsigned int *name_refcnt; /*! * Bucketized locks and lists for entries. * * XXXRTH Have a per-bucket structure that contains all of these? */ - unsigned int nentries; - isc_mutex_t entriescntlock; - unsigned int entriescnt; + unsigned int nentries; + isc_mutex_t entriescntlock; + unsigned int entriescnt; dns_adbentrylist_t *entries; dns_adbentrylist_t *deadentries; - isc_mutex_t * entrylocks; - bool * entry_sd; /*%< shutting down */ - unsigned int * entry_refcnt; + isc_mutex_t *entrylocks; + bool *entry_sd; /*%< shutting down */ + unsigned int *entry_refcnt; - isc_event_t cevent; - bool cevent_out; - bool shutting_down; + isc_event_t cevent; + bool cevent_out; + bool shutting_down; isc_eventlist_t whenshutdown; - isc_event_t growentries; - bool growentries_sent; - isc_event_t grownames; - bool grownames_sent; + isc_event_t growentries; + bool growentries_sent; + isc_event_t grownames; + bool grownames_sent; uint32_t quota; uint32_t atr_freq; - double atr_low; - double atr_high; - double atr_discount; + double atr_low; + double atr_high; + double atr_discount; }; /* @@ -171,24 +171,24 @@ struct dns_adb { /*% dns_adbname structure */ struct dns_adbname { - unsigned int magic; - dns_name_t name; - dns_adb_t * adb; - unsigned int partial_result; - unsigned int flags; - int lock_bucket; - dns_name_t target; - isc_stdtime_t expire_target; - isc_stdtime_t expire_v4; - isc_stdtime_t expire_v6; - unsigned int chains; + unsigned int magic; + dns_name_t name; + dns_adb_t *adb; + unsigned int partial_result; + unsigned int flags; + int lock_bucket; + dns_name_t target; + isc_stdtime_t expire_target; + isc_stdtime_t expire_v4; + isc_stdtime_t expire_v6; + unsigned int chains; dns_adbnamehooklist_t v4; dns_adbnamehooklist_t v6; - dns_adbfetch_t * fetch_a; - dns_adbfetch_t * fetch_aaaa; - unsigned int fetch_err; - unsigned int fetch6_err; - dns_adbfindlist_t finds; + dns_adbfetch_t *fetch_a; + dns_adbfetch_t *fetch_aaaa; + unsigned int fetch_err; + unsigned int fetch6_err; + dns_adbfindlist_t finds; /* for LRU-based management */ isc_stdtime_t last_used; @@ -197,10 +197,10 @@ struct dns_adbname { /*% The adbfetch structure */ struct dns_adbfetch { - unsigned int magic; - dns_fetch_t * fetch; + unsigned int magic; + dns_fetch_t *fetch; dns_rdataset_t rdataset; - unsigned int depth; + unsigned int depth; }; /*% @@ -209,7 +209,7 @@ struct dns_adbfetch { * namehook that will contain the next address this host has. */ struct dns_adbnamehook { - unsigned int magic; + unsigned int magic; dns_adbentry_t *entry; ISC_LINK(dns_adbnamehook_t) plink; }; @@ -222,9 +222,9 @@ struct dns_adbnamehook { struct dns_adblameinfo { unsigned int magic; - dns_name_t qname; + dns_name_t qname; dns_rdatatype_t qtype; - isc_stdtime_t lame_timer; + isc_stdtime_t lame_timer; ISC_LINK(dns_adblameinfo_t) plink; }; @@ -237,35 +237,35 @@ struct dns_adblameinfo { struct dns_adbentry { unsigned int magic; - int lock_bucket; + int lock_bucket; unsigned int refcnt; unsigned int nh; - unsigned int flags; - unsigned int srtt; - uint16_t udpsize; - unsigned int completed; - unsigned int timeouts; + unsigned int flags; + unsigned int srtt; + uint16_t udpsize; + unsigned int completed; + unsigned int timeouts; unsigned char plain; unsigned char plainto; unsigned char edns; unsigned char to4096; /* Our max. */ - uint8_t mode; + uint8_t mode; atomic_uint_fast32_t quota; atomic_uint_fast32_t active; - double atr; + double atr; /* * Allow for encapsulated IPv4/IPv6 UDP packet over ethernet. * Ethernet 1500 - IP(20) - IP6(40) - UDP(8) = 1432. */ - unsigned char to1432; /* Ethernet */ - unsigned char to1232; /* IPv6 nofrag */ - unsigned char to512; /* plain DNS */ + unsigned char to1432; /* Ethernet */ + unsigned char to1232; /* IPv6 nofrag */ + unsigned char to512; /* plain DNS */ isc_sockaddr_t sockaddr; unsigned char *cookie; - uint16_t cookielen; + uint16_t cookielen; isc_stdtime_t expires; isc_stdtime_t lastage; @@ -284,123 +284,83 @@ 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! */ -#define FIND_EVENT_SENT 0x40000000 -#define FIND_EVENT_FREED 0x80000000 -#define FIND_EVENTSENT(h) (((h)->flags & FIND_EVENT_SENT) != 0) +#define FIND_EVENT_SENT 0x40000000 +#define FIND_EVENT_FREED 0x80000000 +#define FIND_EVENTSENT(h) (((h)->flags & FIND_EVENT_SENT) != 0) #define FIND_EVENTFREED(h) (((h)->flags & FIND_EVENT_FREED) != 0) -#define NAME_NEEDS_POKE 0x80000000 -#define NAME_IS_DEAD 0x40000000 -#define NAME_HINT_OK DNS_ADBFIND_HINTOK -#define NAME_GLUE_OK DNS_ADBFIND_GLUEOK -#define NAME_STARTATZONE DNS_ADBFIND_STARTATZONE -#define NAME_DEAD(n) (((n)->flags & NAME_IS_DEAD) != 0) +#define NAME_NEEDS_POKE 0x80000000 +#define NAME_IS_DEAD 0x40000000 +#define NAME_HINT_OK DNS_ADBFIND_HINTOK +#define NAME_GLUE_OK DNS_ADBFIND_GLUEOK +#define NAME_STARTATZONE DNS_ADBFIND_STARTATZONE +#define NAME_DEAD(n) (((n)->flags & NAME_IS_DEAD) != 0) #define NAME_NEEDSPOKE(n) (((n)->flags & NAME_NEEDS_POKE) != 0) -#define NAME_GLUEOK(n) (((n)->flags & NAME_GLUE_OK) != 0) -#define NAME_HINTOK(n) (((n)->flags & NAME_HINT_OK) != 0) +#define NAME_GLUEOK(n) (((n)->flags & NAME_GLUE_OK) != 0) +#define NAME_HINTOK(n) (((n)->flags & NAME_HINT_OK) != 0) /* * Private flag(s) for entries. @@ -412,8 +372,8 @@ log_quota(dns_adbentry_t *entry, const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3); * To the name, address classes are all that really exist. If it has a * V6 address it doesn't care if it came from a AAAA query. */ -#define NAME_HAS_V4(n) (!ISC_LIST_EMPTY((n)->v4)) -#define NAME_HAS_V6(n) (!ISC_LIST_EMPTY((n)->v6)) +#define NAME_HAS_V4(n) (!ISC_LIST_EMPTY((n)->v4)) +#define NAME_HAS_V6(n) (!ISC_LIST_EMPTY((n)->v6)) #define NAME_HAS_ADDRS(n) (NAME_HAS_V4(n) || NAME_HAS_V6(n)) /* @@ -423,29 +383,29 @@ log_quota(dns_adbentry_t *entry, const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3); * Note: since we have removed the support of A6 in adb, FETCH_A and FETCH_AAAA * are now equal to FETCH_V4 and FETCH_V6, respectively. */ -#define NAME_FETCH_A(n) ((n)->fetch_a != NULL) +#define NAME_FETCH_A(n) ((n)->fetch_a != NULL) #define NAME_FETCH_AAAA(n) ((n)->fetch_aaaa != NULL) -#define NAME_FETCH_V4(n) (NAME_FETCH_A(n)) -#define NAME_FETCH_V6(n) (NAME_FETCH_AAAA(n)) -#define NAME_FETCH(n) (NAME_FETCH_V4(n) || NAME_FETCH_V6(n)) +#define NAME_FETCH_V4(n) (NAME_FETCH_A(n)) +#define NAME_FETCH_V6(n) (NAME_FETCH_AAAA(n)) +#define NAME_FETCH(n) (NAME_FETCH_V4(n) || NAME_FETCH_V6(n)) /* * Find options and tests to see if there are addresses on the list. */ -#define FIND_WANTEVENT(fn) (((fn)->options & DNS_ADBFIND_WANTEVENT) != 0) +#define FIND_WANTEVENT(fn) (((fn)->options & DNS_ADBFIND_WANTEVENT) != 0) #define FIND_WANTEMPTYEVENT(fn) (((fn)->options & DNS_ADBFIND_EMPTYEVENT) != 0) -#define FIND_AVOIDFETCHES(fn) (((fn)->options & DNS_ADBFIND_AVOIDFETCHES) != 0) -#define FIND_STARTATZONE(fn) (((fn)->options & DNS_ADBFIND_STARTATZONE) != 0) -#define FIND_HINTOK(fn) (((fn)->options & DNS_ADBFIND_HINTOK) != 0) -#define FIND_GLUEOK(fn) (((fn)->options & DNS_ADBFIND_GLUEOK) != 0) -#define FIND_HAS_ADDRS(fn) (!ISC_LIST_EMPTY((fn)->list)) -#define FIND_RETURNLAME(fn) (((fn)->options & DNS_ADBFIND_RETURNLAME) != 0) +#define FIND_AVOIDFETCHES(fn) (((fn)->options & DNS_ADBFIND_AVOIDFETCHES) != 0) +#define FIND_STARTATZONE(fn) (((fn)->options & DNS_ADBFIND_STARTATZONE) != 0) +#define FIND_HINTOK(fn) (((fn)->options & DNS_ADBFIND_HINTOK) != 0) +#define FIND_GLUEOK(fn) (((fn)->options & DNS_ADBFIND_GLUEOK) != 0) +#define FIND_HAS_ADDRS(fn) (!ISC_LIST_EMPTY((fn)->list)) +#define FIND_RETURNLAME(fn) (((fn)->options & DNS_ADBFIND_RETURNLAME) != 0) /* * These are currently used on simple unsigned ints, so they are * not really associated with any particular type. */ -#define WANT_INET(x) (((x)&DNS_ADBFIND_INET) != 0) +#define WANT_INET(x) (((x)&DNS_ADBFIND_INET) != 0) #define WANT_INET6(x) (((x)&DNS_ADBFIND_INET6) != 0) #define EXPIRE_OK(exp, now) ((exp == INT_MAX) || (exp < now)) @@ -455,16 +415,16 @@ log_quota(dns_adbentry_t *entry, const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3); * glue, and compare this to the appropriate bits set in o, to see if * this is ok. */ -#define GLUE_OK(nf, o) (!NAME_GLUEOK(nf) || (((o)&DNS_ADBFIND_GLUEOK) != 0)) -#define HINT_OK(nf, o) (!NAME_HINTOK(nf) || (((o)&DNS_ADBFIND_HINTOK) != 0)) +#define GLUE_OK(nf, o) (!NAME_GLUEOK(nf) || (((o)&DNS_ADBFIND_GLUEOK) != 0)) +#define HINT_OK(nf, o) (!NAME_HINTOK(nf) || (((o)&DNS_ADBFIND_HINTOK) != 0)) #define GLUEHINT_OK(nf, o) (GLUE_OK(nf, o) || HINT_OK(nf, o)) #define STARTATZONE_MATCHES(nf, o) \ (((nf)->flags & NAME_STARTATZONE) == ((o)&DNS_ADBFIND_STARTATZONE)) -#define ENTER_LEVEL ISC_LOG_DEBUG(50) -#define EXIT_LEVEL ENTER_LEVEL -#define CLEAN_LEVEL ISC_LOG_DEBUG(100) -#define DEF_LEVEL ISC_LOG_DEBUG(5) +#define ENTER_LEVEL ISC_LOG_DEBUG(50) +#define EXIT_LEVEL ENTER_LEVEL +#define CLEAN_LEVEL ISC_LOG_DEBUG(100) +#define DEF_LEVEL ISC_LOG_DEBUG(5) #define NCACHE_LEVEL ISC_LOG_DEBUG(20) #define NCACHE_RESULT(r) \ @@ -480,14 +440,14 @@ log_quota(dns_adbentry_t *entry, const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3); * Error state rankings. */ -#define FIND_ERR_SUCCESS 0 /* highest rank */ -#define FIND_ERR_CANCELED 1 -#define FIND_ERR_FAILURE 2 -#define FIND_ERR_NXDOMAIN 3 -#define FIND_ERR_NXRRSET 4 +#define FIND_ERR_SUCCESS 0 /* highest rank */ +#define FIND_ERR_CANCELED 1 +#define FIND_ERR_FAILURE 2 +#define FIND_ERR_NXDOMAIN 3 +#define FIND_ERR_NXRRSET 4 #define FIND_ERR_UNEXPECTED 5 -#define FIND_ERR_NOTFOUND 6 -#define FIND_ERR_MAX 7 +#define FIND_ERR_NOTFOUND 6 +#define FIND_ERR_MAX 7 static const char *errnames[] = { "success", "canceled", "failure", "nxdomain", "nxrrset", "unexpected", @@ -500,12 +460,10 @@ 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, ...) -{ +DP(int level, const char *format, ...) { va_list args; va_start(args, format); @@ -518,8 +476,7 @@ DP(int level, const char *format, ...) * Increment resolver-related statistics counters. */ static inline void -inc_stats(dns_adb_t *adb, isc_statscounter_t counter) -{ +inc_stats(dns_adb_t *adb, isc_statscounter_t counter) { if (adb->view->resstats != NULL) { isc_stats_increment(adb->view->resstats, counter); } @@ -529,32 +486,28 @@ inc_stats(dns_adb_t *adb, isc_statscounter_t counter) * Set adb-related statistics counters. */ static inline void -set_adbstat(dns_adb_t *adb, uint64_t val, isc_statscounter_t counter) -{ +set_adbstat(dns_adb_t *adb, uint64_t val, isc_statscounter_t counter) { if (adb->view->adbstats != NULL) { isc_stats_set(adb->view->adbstats, val, counter); } } static inline void -dec_adbstats(dns_adb_t *adb, isc_statscounter_t counter) -{ +dec_adbstats(dns_adb_t *adb, isc_statscounter_t counter) { if (adb->view->adbstats != NULL) { isc_stats_decrement(adb->view->adbstats, counter); } } static inline void -inc_adbstats(dns_adb_t *adb, isc_statscounter_t counter) -{ +inc_adbstats(dns_adb_t *adb, isc_statscounter_t counter) { if (adb->view->adbstats != NULL) { isc_stats_increment(adb->view->adbstats, counter); } } static inline dns_ttl_t -ttlclamp(dns_ttl_t ttl) -{ +ttlclamp(dns_ttl_t ttl) { if (ttl < ADB_CACHE_MINIMUM) { ttl = ADB_CACHE_MINIMUM; } @@ -582,17 +535,16 @@ static const unsigned nbuckets[] = { }; static void -grow_entries(isc_task_t *task, isc_event_t *ev) -{ - dns_adb_t * adb; - dns_adbentry_t * e; +grow_entries(isc_task_t *task, isc_event_t *ev) { + dns_adb_t *adb; + dns_adbentry_t *e; dns_adbentrylist_t *newdeadentries = NULL; dns_adbentrylist_t *newentries = NULL; - bool * newentry_sd = NULL; - isc_mutex_t * newentrylocks = NULL; - isc_result_t result; - unsigned int * newentry_refcnt = NULL; - unsigned int i, n, bucket; + bool *newentry_sd = NULL; + isc_mutex_t *newentrylocks = NULL; + isc_result_t result; + unsigned int *newentry_refcnt = NULL; + unsigned int i, n, bucket; adb = ev->ev_arg; INSIST(DNS_ADB_VALID(adb)); @@ -639,7 +591,8 @@ grow_entries(isc_task_t *task, isc_event_t *ev) newentry_refcnt = isc_mem_get(adb->mctx, sizeof(*newentry_refcnt) * n); if (newentries == NULL || newdeadentries == NULL || newentrylocks == NULL || newentry_sd == NULL || - newentry_refcnt == NULL) { + newentry_refcnt == NULL) + { goto cleanup; } @@ -752,17 +705,16 @@ check_exit: } static void -grow_names(isc_task_t *task, isc_event_t *ev) -{ - dns_adb_t * adb; - dns_adbname_t * name; +grow_names(isc_task_t *task, isc_event_t *ev) { + dns_adb_t *adb; + dns_adbname_t *name; dns_adbnamelist_t *newdeadnames = NULL; dns_adbnamelist_t *newnames = NULL; - bool * newname_sd = NULL; - isc_mutex_t * newnamelocks = NULL; - isc_result_t result; - unsigned int * newname_refcnt = NULL; - unsigned int i, n, bucket; + bool *newname_sd = NULL; + isc_mutex_t *newnamelocks = NULL; + isc_result_t result; + unsigned int *newname_refcnt = NULL; + unsigned int i, n, bucket; adb = ev->ev_arg; INSIST(DNS_ADB_VALID(adb)); @@ -808,7 +760,8 @@ grow_names(isc_task_t *task, isc_event_t *ev) newname_sd = isc_mem_get(adb->mctx, sizeof(*newname_sd) * n); newname_refcnt = isc_mem_get(adb->mctx, sizeof(*newname_refcnt) * n); if (newnames == NULL || newdeadnames == NULL || newnamelocks == NULL || - newname_sd == NULL || newname_refcnt == NULL) { + newname_sd == NULL || newname_refcnt == NULL) + { goto cleanup; } @@ -924,21 +877,20 @@ check_exit: */ static isc_result_t import_rdataset(dns_adbname_t *adbname, dns_rdataset_t *rdataset, - isc_stdtime_t now) -{ - isc_result_t result; - dns_adb_t * adb; - dns_adbnamehook_t * nh; - dns_adbnamehook_t * anh; - dns_rdata_t rdata = DNS_RDATA_INIT; - struct in_addr ina; - struct in6_addr in6a; - isc_sockaddr_t sockaddr; - dns_adbentry_t * foundentry; /* NO CLEAN UP! */ - int addr_bucket; - bool new_addresses_added; - dns_rdatatype_t rdtype; - unsigned int findoptions; + isc_stdtime_t now) { + isc_result_t result; + dns_adb_t *adb; + dns_adbnamehook_t *nh; + dns_adbnamehook_t *anh; + dns_rdata_t rdata = DNS_RDATA_INIT; + struct in_addr ina; + struct in6_addr in6a; + isc_sockaddr_t sockaddr; + dns_adbentry_t *foundentry; /* NO CLEAN UP! */ + int addr_bucket; + bool new_addresses_added; + dns_rdatatype_t rdtype; + unsigned int findoptions; dns_adbnamehooklist_t *hookhead; INSIST(DNS_ADBNAME_VALID(adbname)); @@ -981,8 +933,8 @@ import_rdataset(dns_adbname_t *adbname, dns_rdataset_t *rdataset, goto fail; } - foundentry = - find_entry_and_lock(adb, &sockaddr, &addr_bucket, now); + foundentry = find_entry_and_lock(adb, &sockaddr, &addr_bucket, + now); if (foundentry == NULL) { dns_adbentry_t *entry; @@ -1002,7 +954,8 @@ import_rdataset(dns_adbname_t *adbname, dns_rdataset_t *rdataset, link_entry(adb, addr_bucket, entry); } else { for (anh = ISC_LIST_HEAD(*hookhead); anh != NULL; - anh = ISC_LIST_NEXT(anh, plink)) { + anh = ISC_LIST_NEXT(anh, plink)) + { if (anh->entry == foundentry) { break; } @@ -1034,7 +987,8 @@ fail: } if (rdataset->trust == dns_trust_glue || - rdataset->trust == dns_trust_additional) { + rdataset->trust == dns_trust_additional) + { rdataset->ttl = ADB_CACHE_MINIMUM; } else if (rdataset->trust == dns_trust_ultimate) { rdataset->ttl = 0; @@ -1071,13 +1025,12 @@ fail: * Requires the name's bucket be locked. */ static bool -kill_name(dns_adbname_t **n, isc_eventtype_t ev) -{ +kill_name(dns_adbname_t **n, isc_eventtype_t ev) { dns_adbname_t *name; - bool result = false; - bool result4, result6; - int bucket; - dns_adb_t * adb; + bool result = false; + bool result4, result6; + int bucket; + dns_adb_t *adb; INSIST(n != NULL); name = *n; @@ -1138,11 +1091,10 @@ kill_name(dns_adbname_t **n, isc_eventtype_t ev) * Requires the name's bucket be locked and no entry buckets be locked. */ static bool -check_expire_namehooks(dns_adbname_t *name, isc_stdtime_t now) -{ +check_expire_namehooks(dns_adbname_t *name, isc_stdtime_t now) { dns_adb_t *adb; - bool result4 = false; - bool result6 = false; + bool result4 = false; + bool result6 = false; INSIST(DNS_ADBNAME_VALID(name)); adb = name->adb; @@ -1188,8 +1140,7 @@ check_expire_namehooks(dns_adbname_t *name, isc_stdtime_t now) * Requires the name's bucket be locked. */ static inline void -link_name(dns_adb_t *adb, int bucket, dns_adbname_t *name) -{ +link_name(dns_adb_t *adb, int bucket, dns_adbname_t *name) { INSIST(name->lock_bucket == DNS_ADB_INVALIDBUCKET); ISC_LIST_PREPEND(adb->names[bucket], name, plink); @@ -1201,9 +1152,8 @@ link_name(dns_adb_t *adb, int bucket, dns_adbname_t *name) * Requires the name's bucket be locked. */ static inline bool -unlink_name(dns_adb_t *adb, dns_adbname_t *name) -{ - int bucket; +unlink_name(dns_adb_t *adb, dns_adbname_t *name) { + int bucket; bool result = false; bucket = name->lock_bucket; @@ -1227,9 +1177,8 @@ unlink_name(dns_adb_t *adb, dns_adbname_t *name) * Requires the entry's bucket be locked. */ static inline void -link_entry(dns_adb_t *adb, int bucket, dns_adbentry_t *entry) -{ - int i; +link_entry(dns_adb_t *adb, int bucket, dns_adbentry_t *entry) { + int i; dns_adbentry_t *e; if (isc_mem_isovermem(adb->mctx)) { @@ -1259,9 +1208,8 @@ link_entry(dns_adb_t *adb, int bucket, dns_adbentry_t *entry) * Requires the entry's bucket be locked. */ static inline bool -unlink_entry(dns_adb_t *adb, dns_adbentry_t *entry) -{ - int bucket; +unlink_entry(dns_adb_t *adb, dns_adbentry_t *entry) { + int bucket; bool result = false; bucket = entry->lock_bucket; @@ -1282,8 +1230,7 @@ unlink_entry(dns_adb_t *adb, dns_adbentry_t *entry) } static inline void -violate_locking_hierarchy(isc_mutex_t *have, isc_mutex_t *want) -{ +violate_locking_hierarchy(isc_mutex_t *have, isc_mutex_t *want) { if (isc_mutex_trylock(want) != ISC_R_SUCCESS) { UNLOCK(have); LOCK(want); @@ -1296,10 +1243,9 @@ violate_locking_hierarchy(isc_mutex_t *have, isc_mutex_t *want) * checked after calling this function. */ static bool -shutdown_names(dns_adb_t *adb) -{ - unsigned int bucket; - bool result = false; +shutdown_names(dns_adb_t *adb) { + unsigned int bucket; + bool result = false; dns_adbname_t *name; dns_adbname_t *next_name; @@ -1326,8 +1272,8 @@ shutdown_names(dns_adb_t *adb) while (name != NULL) { next_name = ISC_LIST_NEXT(name, plink); INSIST(result == false); - result = - kill_name(&name, DNS_EVENT_ADBSHUTDOWN); + result = kill_name(&name, + DNS_EVENT_ADBSHUTDOWN); name = next_name; } } @@ -1342,10 +1288,9 @@ shutdown_names(dns_adb_t *adb) * checked after calling this function. */ static bool -shutdown_entries(dns_adb_t *adb) -{ - unsigned int bucket; - bool result = false; +shutdown_entries(dns_adb_t *adb) { + unsigned int bucket; + bool result = false; dns_adbentry_t *entry; dns_adbentry_t *next_entry; @@ -1388,8 +1333,7 @@ shutdown_entries(dns_adb_t *adb) * Name bucket must be locked */ static void -cancel_fetches_at_name(dns_adbname_t *name) -{ +cancel_fetches_at_name(dns_adbname_t *name) { if (NAME_FETCH_A(name)) { dns_resolver_cancelfetch(name->fetch_a->fetch); } @@ -1403,13 +1347,12 @@ cancel_fetches_at_name(dns_adbname_t *name) * Assumes the name bucket is locked. */ static bool -clean_namehooks(dns_adb_t *adb, dns_adbnamehooklist_t *namehooks) -{ - dns_adbentry_t * entry; +clean_namehooks(dns_adb_t *adb, dns_adbnamehooklist_t *namehooks) { + dns_adbentry_t *entry; dns_adbnamehook_t *namehook; - int addr_bucket; - bool result = false; - bool overmem = isc_mem_isovermem(adb->mctx); + int addr_bucket; + bool result = false; + bool overmem = isc_mem_isovermem(adb->mctx); addr_bucket = DNS_ADB_INVALIDBUCKET; namehook = ISC_LIST_HEAD(*namehooks); @@ -1453,8 +1396,7 @@ clean_namehooks(dns_adb_t *adb, dns_adbnamehooklist_t *namehooks) } static void -clean_target(dns_adb_t *adb, dns_name_t *target) -{ +clean_target(dns_adb_t *adb, dns_name_t *target) { if (dns_name_countlabels(target) > 0) { dns_name_free(target, adb->mctx); dns_name_init(target, NULL); @@ -1463,15 +1405,14 @@ clean_target(dns_adb_t *adb, dns_name_t *target) static isc_result_t set_target(dns_adb_t *adb, const dns_name_t *name, const dns_name_t *fname, - dns_rdataset_t *rdataset, dns_name_t *target) -{ - isc_result_t result; - dns_namereln_t namereln; - unsigned int nlabels; - int order; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdataset_t *rdataset, dns_name_t *target) { + isc_result_t result; + dns_namereln_t namereln; + unsigned int nlabels; + int order; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_fixedname_t fixed1, fixed2; - dns_name_t * prefix, *new_target; + dns_name_t *prefix, *new_target; REQUIRE(dns_name_countlabels(target) == 0); @@ -1532,8 +1473,7 @@ set_target(dns_adb_t *adb, const dns_name_t *name, const dns_name_t *fname, * Assumes nothing is locked, since this is called by the client. */ static void -event_free(isc_event_t *event) -{ +event_free(isc_event_t *event) { dns_adbfind_t *find; INSIST(event != NULL); @@ -1551,14 +1491,13 @@ event_free(isc_event_t *event) */ static void clean_finds_at_name(dns_adbname_t *name, isc_eventtype_t evtype, - unsigned int addrs) -{ - isc_event_t * ev; - isc_task_t * task; + unsigned int addrs) { + isc_event_t *ev; + isc_task_t *task; dns_adbfind_t *find; dns_adbfind_t *next_find; - bool process; - unsigned int wanted, notify; + bool process; + unsigned int wanted, notify; DP(ENTER_LEVEL, "ENTER clean_finds_at_name, name %p, evtype %08x, addrs %08x", name, @@ -1632,8 +1571,7 @@ clean_finds_at_name(dns_adbname_t *name, isc_eventtype_t evtype, } static inline void -check_exit(dns_adb_t *adb) -{ +check_exit(dns_adb_t *adb) { isc_event_t *event; /* * The caller must be holding the adb lock. @@ -1654,11 +1592,10 @@ check_exit(dns_adb_t *adb) } static inline bool -dec_adb_irefcnt(dns_adb_t *adb) -{ +dec_adb_irefcnt(dns_adb_t *adb) { isc_event_t *event; - isc_task_t * etask; - bool result = false; + isc_task_t *etask; + bool result = false; LOCK(&adb->reflock); @@ -1684,24 +1621,21 @@ dec_adb_irefcnt(dns_adb_t *adb) } static inline void -inc_adb_irefcnt(dns_adb_t *adb) -{ +inc_adb_irefcnt(dns_adb_t *adb) { LOCK(&adb->reflock); adb->irefcnt++; UNLOCK(&adb->reflock); } static inline void -inc_adb_erefcnt(dns_adb_t *adb) -{ +inc_adb_erefcnt(dns_adb_t *adb) { LOCK(&adb->reflock); adb->erefcnt++; UNLOCK(&adb->reflock); } static inline void -inc_entry_refcnt(dns_adb_t *adb, dns_adbentry_t *entry, bool lock) -{ +inc_entry_refcnt(dns_adb_t *adb, dns_adbentry_t *entry, bool lock) { int bucket; bucket = entry->lock_bucket; @@ -1718,9 +1652,9 @@ inc_entry_refcnt(dns_adb_t *adb, dns_adbentry_t *entry, bool lock) } static inline bool -dec_entry_refcnt(dns_adb_t *adb, bool overmem, dns_adbentry_t *entry, bool lock) -{ - int bucket; +dec_entry_refcnt(dns_adb_t *adb, bool overmem, dns_adbentry_t *entry, + bool lock) { + int bucket; bool destroy_entry; bool result = false; @@ -1736,7 +1670,8 @@ dec_entry_refcnt(dns_adb_t *adb, bool overmem, dns_adbentry_t *entry, bool lock) destroy_entry = false; if (entry->refcnt == 0 && (adb->entry_sd[bucket] || entry->expires == 0 || overmem || - (entry->flags & ENTRY_IS_DEAD) != 0)) { + (entry->flags & ENTRY_IS_DEAD) != 0)) + { destroy_entry = true; result = unlink_entry(adb, entry); } @@ -1760,8 +1695,7 @@ dec_entry_refcnt(dns_adb_t *adb, bool overmem, dns_adbentry_t *entry, bool lock) } static inline dns_adbname_t * -new_adbname(dns_adb_t *adb, const dns_name_t *dnsname) -{ +new_adbname(dns_adb_t *adb, const dns_name_t *dnsname) { dns_adbname_t *name; name = isc_mempool_get(adb->nmp); @@ -1794,7 +1728,8 @@ new_adbname(dns_adb_t *adb, const dns_name_t *dnsname) adb->namescnt++; inc_adbstats(adb, dns_adbstats_namescnt); if (!adb->grownames_sent && adb->excl != NULL && - adb->namescnt > (adb->nnames * 8)) { + adb->namescnt > (adb->nnames * 8)) + { isc_event_t *event = &adb->grownames; inc_adb_irefcnt(adb); isc_task_send(adb->excl, &event); @@ -1806,8 +1741,7 @@ new_adbname(dns_adb_t *adb, const dns_name_t *dnsname) } static inline void -free_adbname(dns_adb_t *adb, dns_adbname_t **name) -{ +free_adbname(dns_adb_t *adb, dns_adbname_t **name) { dns_adbname_t *n; INSIST(name != NULL && DNS_ADBNAME_VALID(*name)); @@ -1833,8 +1767,7 @@ free_adbname(dns_adb_t *adb, dns_adbname_t **name) } static inline dns_adbnamehook_t * -new_adbnamehook(dns_adb_t *adb, dns_adbentry_t *entry) -{ +new_adbnamehook(dns_adb_t *adb, dns_adbentry_t *entry) { dns_adbnamehook_t *nh; nh = isc_mempool_get(adb->nhmp); @@ -1850,8 +1783,7 @@ new_adbnamehook(dns_adb_t *adb, dns_adbentry_t *entry) } static inline void -free_adbnamehook(dns_adb_t *adb, dns_adbnamehook_t **namehook) -{ +free_adbnamehook(dns_adb_t *adb, dns_adbnamehook_t **namehook) { dns_adbnamehook_t *nh; INSIST(namehook != NULL && DNS_ADBNAMEHOOK_VALID(*namehook)); @@ -1866,8 +1798,8 @@ free_adbnamehook(dns_adb_t *adb, dns_adbnamehook_t **namehook) } static inline dns_adblameinfo_t * -new_adblameinfo(dns_adb_t *adb, const dns_name_t *qname, dns_rdatatype_t qtype) -{ +new_adblameinfo(dns_adb_t *adb, const dns_name_t *qname, + dns_rdatatype_t qtype) { dns_adblameinfo_t *li; li = isc_mempool_get(adb->limp); @@ -1886,8 +1818,7 @@ new_adblameinfo(dns_adb_t *adb, const dns_name_t *qname, dns_rdatatype_t qtype) } static inline void -free_adblameinfo(dns_adb_t *adb, dns_adblameinfo_t **lameinfo) -{ +free_adblameinfo(dns_adb_t *adb, dns_adblameinfo_t **lameinfo) { dns_adblameinfo_t *li; INSIST(lameinfo != NULL && DNS_ADBLAMEINFO_VALID(*lameinfo)); @@ -1904,8 +1835,7 @@ free_adblameinfo(dns_adb_t *adb, dns_adblameinfo_t **lameinfo) } static inline dns_adbentry_t * -new_adbentry(dns_adb_t *adb) -{ +new_adbentry(dns_adb_t *adb) { dns_adbentry_t *e; e = isc_mempool_get(adb->emp); @@ -1943,7 +1873,8 @@ new_adbentry(dns_adb_t *adb) adb->entriescnt++; inc_adbstats(adb, dns_adbstats_entriescnt); if (!adb->growentries_sent && adb->excl != NULL && - adb->entriescnt > (adb->nentries * 8)) { + adb->entriescnt > (adb->nentries * 8)) + { isc_event_t *event = &adb->growentries; inc_adb_irefcnt(adb); isc_task_send(adb->excl, &event); @@ -1955,9 +1886,8 @@ new_adbentry(dns_adb_t *adb) } static inline void -free_adbentry(dns_adb_t *adb, dns_adbentry_t **entry) -{ - dns_adbentry_t * e; +free_adbentry(dns_adb_t *adb, dns_adbentry_t **entry) { + dns_adbentry_t *e; dns_adblameinfo_t *li; INSIST(entry != NULL && DNS_ADBENTRY_VALID(*entry)); @@ -1989,8 +1919,7 @@ free_adbentry(dns_adb_t *adb, dns_adbentry_t **entry) } static inline dns_adbfind_t * -new_adbfind(dns_adb_t *adb) -{ +new_adbfind(dns_adb_t *adb) { dns_adbfind_t *h; h = isc_mempool_get(adb->ahmp); @@ -2028,8 +1957,7 @@ new_adbfind(dns_adb_t *adb) } static inline dns_adbfetch_t * -new_adbfetch(dns_adb_t *adb) -{ +new_adbfetch(dns_adb_t *adb) { dns_adbfetch_t *f; f = isc_mempool_get(adb->afmp); @@ -2048,8 +1976,7 @@ new_adbfetch(dns_adb_t *adb) } static inline void -free_adbfetch(dns_adb_t *adb, dns_adbfetch_t **fetch) -{ +free_adbfetch(dns_adb_t *adb, dns_adbfetch_t **fetch) { dns_adbfetch_t *f; INSIST(fetch != NULL && DNS_ADBFETCH_VALID(*fetch)); @@ -2066,8 +1993,7 @@ free_adbfetch(dns_adb_t *adb, dns_adbfetch_t **fetch) } static inline bool -free_adbfind(dns_adb_t *adb, dns_adbfind_t **findp) -{ +free_adbfind(dns_adb_t *adb, dns_adbfind_t **findp) { dns_adbfind_t *find; INSIST(findp != NULL && DNS_ADBFIND_VALID(*findp)); @@ -2093,8 +2019,7 @@ free_adbfind(dns_adb_t *adb, dns_adbfind_t **findp) * if this function returns a valid pointer. */ static inline dns_adbaddrinfo_t * -new_adbaddrinfo(dns_adb_t *adb, dns_adbentry_t *entry, in_port_t port) -{ +new_adbaddrinfo(dns_adb_t *adb, dns_adbentry_t *entry, in_port_t port) { dns_adbaddrinfo_t *ai; ai = isc_mempool_get(adb->aimp); @@ -2115,8 +2040,7 @@ new_adbaddrinfo(dns_adb_t *adb, dns_adbentry_t *entry, in_port_t port) } static inline void -free_adbaddrinfo(dns_adb_t *adb, dns_adbaddrinfo_t **ainfo) -{ +free_adbaddrinfo(dns_adb_t *adb, dns_adbaddrinfo_t **ainfo) { dns_adbaddrinfo_t *ai; INSIST(ainfo != NULL && DNS_ADBADDRINFO_VALID(*ainfo)); @@ -2140,10 +2064,9 @@ free_adbaddrinfo(dns_adb_t *adb, dns_adbaddrinfo_t **ainfo) */ static inline dns_adbname_t * find_name_and_lock(dns_adb_t *adb, const dns_name_t *name, unsigned int options, - int *bucketp) -{ + int *bucketp) { dns_adbname_t *adbname; - int bucket; + int bucket; bucket = dns_name_fullhash(name, false) % adb->nnames; @@ -2161,7 +2084,8 @@ find_name_and_lock(dns_adb_t *adb, const dns_name_t *name, unsigned int options, if (!NAME_DEAD(adbname)) { if (dns_name_equal(name, &adbname->name) && GLUEHINT_OK(adbname, options) && - STARTATZONE_MATCHES(adbname, options)) { + STARTATZONE_MATCHES(adbname, options)) + { return (adbname); } } @@ -2183,10 +2107,9 @@ find_name_and_lock(dns_adb_t *adb, const dns_name_t *name, unsigned int options, */ static inline dns_adbentry_t * find_entry_and_lock(dns_adb_t *adb, const isc_sockaddr_t *addr, int *bucketp, - isc_stdtime_t now) -{ + isc_stdtime_t now) { dns_adbentry_t *entry, *entry_next; - int bucket; + int bucket; bucket = isc_sockaddr_hash(addr, true) % adb->nentries; @@ -2201,12 +2124,14 @@ find_entry_and_lock(dns_adb_t *adb, const isc_sockaddr_t *addr, int *bucketp, /* Search the list, while cleaning up expired entries. */ for (entry = ISC_LIST_HEAD(adb->entries[bucket]); entry != NULL; - entry = entry_next) { + entry = entry_next) + { entry_next = ISC_LIST_NEXT(entry, plink); (void)check_expire_entry(adb, &entry, now); if (entry != NULL && (entry->expires == 0 || entry->expires > now) && - isc_sockaddr_equal(addr, &entry->sockaddr)) { + isc_sockaddr_equal(addr, &entry->sockaddr)) + { ISC_LIST_UNLINK(adb->entries[bucket], entry, plink); ISC_LIST_PREPEND(adb->entries[bucket], entry, plink); return (entry); @@ -2221,10 +2146,9 @@ find_entry_and_lock(dns_adb_t *adb, const isc_sockaddr_t *addr, int *bucketp, */ static bool entry_is_lame(dns_adb_t *adb, dns_adbentry_t *entry, const dns_name_t *qname, - dns_rdatatype_t qtype, isc_stdtime_t now) -{ + dns_rdatatype_t qtype, isc_stdtime_t now) { dns_adblameinfo_t *li, *next_li; - bool is_bad; + bool is_bad; is_bad = false; @@ -2250,7 +2174,8 @@ entry_is_lame(dns_adb_t *adb, dns_adbentry_t *entry, const dns_name_t *qname, * we use the loop for house keeping. */ if (li != NULL && !is_bad && li->qtype == qtype && - dns_name_equal(qname, &li->qname)) { + dns_name_equal(qname, &li->qname)) + { is_bad = true; } @@ -2261,11 +2186,10 @@ entry_is_lame(dns_adb_t *adb, dns_adbentry_t *entry, const dns_name_t *qname, } static void -log_quota(dns_adbentry_t *entry, const char *fmt, ...) -{ - va_list ap; - char msgbuf[2048]; - char addrbuf[ISC_NETADDR_FORMATSIZE]; +log_quota(dns_adbentry_t *entry, const char *fmt, ...) { + va_list ap; + char msgbuf[2048]; + char addrbuf[ISC_NETADDR_FORMATSIZE]; isc_netaddr_t netaddr; va_start(ap, fmt); @@ -2285,12 +2209,11 @@ log_quota(dns_adbentry_t *entry, const char *fmt, ...) static void copy_namehook_lists(dns_adb_t *adb, dns_adbfind_t *find, const dns_name_t *qname, dns_rdatatype_t qtype, - dns_adbname_t *name, isc_stdtime_t now) -{ + dns_adbname_t *name, isc_stdtime_t now) { dns_adbnamehook_t *namehook; dns_adbaddrinfo_t *addrinfo; - dns_adbentry_t * entry; - int bucket; + dns_adbentry_t *entry; + int bucket; bucket = DNS_ADB_INVALIDBUCKET; @@ -2375,8 +2298,7 @@ out: } static void -shutdown_task(isc_task_t *task, isc_event_t *ev) -{ +shutdown_task(isc_task_t *task, isc_event_t *ev) { dns_adb_t *adb; UNUSED(task); @@ -2397,10 +2319,9 @@ shutdown_task(isc_task_t *task, isc_event_t *ev) * Name bucket must be locked; adb may be locked; no other locks held. */ static bool -check_expire_name(dns_adbname_t **namep, isc_stdtime_t now) -{ +check_expire_name(dns_adbname_t **namep, isc_stdtime_t now) { dns_adbname_t *name; - bool result = false; + bool result = false; INSIST(namep != NULL && DNS_ADBNAME_VALID(*namep)); name = *namep; @@ -2446,12 +2367,11 @@ check_expire_name(dns_adbname_t **namep, isc_stdtime_t now) * Name bucket must be locked; adb may be locked; no other locks held. */ static void -check_stale_name(dns_adb_t *adb, int bucket, isc_stdtime_t now) -{ - int victims, max_victims; +check_stale_name(dns_adb_t *adb, int bucket, isc_stdtime_t now) { + int victims, max_victims; dns_adbname_t *victim, *next_victim; - bool overmem = isc_mem_isovermem(adb->mctx); - int scans = 0; + bool overmem = isc_mem_isovermem(adb->mctx); + int scans = 0; INSIST(bucket != DNS_ADB_INVALIDBUCKET); @@ -2465,7 +2385,8 @@ check_stale_name(dns_adb_t *adb, int bucket, isc_stdtime_t now) */ victim = ISC_LIST_TAIL(adb->names[bucket]); for (victims = 0; victim != NULL && victims < max_victims && scans < 10; - victim = next_victim) { + victim = next_victim) + { INSIST(!NAME_DEAD(victim)); scans++; next_victim = ISC_LIST_PREV(victim, plink); @@ -2476,7 +2397,8 @@ check_stale_name(dns_adb_t *adb, int bucket, isc_stdtime_t now) } if (!NAME_FETCH(victim) && - (overmem || victim->last_used + ADB_STALE_MARGIN <= now)) { + (overmem || victim->last_used + ADB_STALE_MARGIN <= now)) + { RUNTIME_CHECK( kill_name(&victim, DNS_EVENT_ADBCANCELED) == false); @@ -2494,10 +2416,9 @@ check_stale_name(dns_adb_t *adb, int bucket, isc_stdtime_t now) * Entry bucket must be locked; adb may be locked; no other locks held. */ static bool -check_expire_entry(dns_adb_t *adb, dns_adbentry_t **entryp, isc_stdtime_t now) -{ +check_expire_entry(dns_adb_t *adb, dns_adbentry_t **entryp, isc_stdtime_t now) { dns_adbentry_t *entry; - bool result = false; + bool result = false; INSIST(entryp != NULL && DNS_ADBENTRY_VALID(*entryp)); entry = *entryp; @@ -2528,11 +2449,10 @@ check_expire_entry(dns_adb_t *adb, dns_adbentry_t **entryp, isc_stdtime_t now) * ADB must be locked, and no other locks held. */ static bool -cleanup_names(dns_adb_t *adb, int bucket, isc_stdtime_t now) -{ +cleanup_names(dns_adb_t *adb, int bucket, isc_stdtime_t now) { dns_adbname_t *name; dns_adbname_t *next_name; - bool result = false; + bool result = false; DP(CLEAN_LEVEL, "cleaning name bucket %d", bucket); @@ -2560,10 +2480,9 @@ cleanup_names(dns_adb_t *adb, int bucket, isc_stdtime_t now) * ADB must be locked, and no other locks held. */ static bool -cleanup_entries(dns_adb_t *adb, int bucket, isc_stdtime_t now) -{ +cleanup_entries(dns_adb_t *adb, int bucket, isc_stdtime_t now) { dns_adbentry_t *entry, *next_entry; - bool result = false; + bool result = false; DP(CLEAN_LEVEL, "cleaning entry bucket %d", bucket); @@ -2580,8 +2499,7 @@ cleanup_entries(dns_adb_t *adb, int bucket, isc_stdtime_t now) } static void -destroy(dns_adb_t *adb) -{ +destroy(dns_adb_t *adb) { adb->magic = 0; isc_task_detach(&adb->task); @@ -2636,9 +2554,8 @@ destroy(dns_adb_t *adb) isc_result_t dns_adb_create(isc_mem_t *mem, dns_view_t *view, isc_timermgr_t *timermgr, - isc_taskmgr_t *taskmgr, dns_adb_t **newadb) -{ - dns_adb_t * adb; + isc_taskmgr_t *taskmgr, dns_adb_t **newadb) { + dns_adb_t *adb; isc_result_t result; unsigned int i; @@ -2915,8 +2832,7 @@ fail1: /* clean up only allocated memory */ } void -dns_adb_attach(dns_adb_t *adb, dns_adb_t **adbx) -{ +dns_adb_attach(dns_adb_t *adb, dns_adb_t **adbx) { REQUIRE(DNS_ADB_VALID(adb)); REQUIRE(adbx != NULL && *adbx == NULL); @@ -2925,10 +2841,9 @@ dns_adb_attach(dns_adb_t *adb, dns_adb_t **adbx) } void -dns_adb_detach(dns_adb_t **adbx) -{ +dns_adb_detach(dns_adb_t **adbx) { dns_adb_t *adb; - bool need_exit_check; + bool need_exit_check; REQUIRE(adbx != NULL && DNS_ADB_VALID(*adbx)); @@ -2950,11 +2865,10 @@ dns_adb_detach(dns_adb_t **adbx) } void -dns_adb_whenshutdown(dns_adb_t *adb, isc_task_t *task, isc_event_t **eventp) -{ - isc_task_t * tclone; +dns_adb_whenshutdown(dns_adb_t *adb, isc_task_t *task, isc_event_t **eventp) { + isc_task_t *tclone; isc_event_t *event; - bool zeroirefcnt; + bool zeroirefcnt; /* * Send '*eventp' to 'task' when 'adb' has shutdown. @@ -2972,7 +2886,8 @@ dns_adb_whenshutdown(dns_adb_t *adb, isc_task_t *task, isc_event_t **eventp) zeroirefcnt = (adb->irefcnt == 0); if (adb->shutting_down && zeroirefcnt && - isc_mempool_getallocated(adb->ahmp) == 0) { + isc_mempool_getallocated(adb->ahmp) == 0) + { /* * We're already shutdown. Send the event. */ @@ -2990,8 +2905,7 @@ dns_adb_whenshutdown(dns_adb_t *adb, isc_task_t *task, isc_event_t **eventp) } static void -shutdown_stage2(isc_task_t *task, isc_event_t *event) -{ +shutdown_stage2(isc_task_t *task, isc_event_t *event) { dns_adb_t *adb; UNUSED(task); @@ -3011,8 +2925,7 @@ shutdown_stage2(isc_task_t *task, isc_event_t *event) } void -dns_adb_shutdown(dns_adb_t *adb) -{ +dns_adb_shutdown(dns_adb_t *adb) { isc_event_t *event; /* @@ -3044,17 +2957,17 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, void *arg, const dns_name_t *name, const dns_name_t *qname, dns_rdatatype_t qtype, unsigned int options, isc_stdtime_t now, dns_name_t *target, in_port_t port, - unsigned int depth, isc_counter_t *qc, dns_adbfind_t **findp) -{ + unsigned int depth, isc_counter_t *qc, + dns_adbfind_t **findp) { dns_adbfind_t *find; dns_adbname_t *adbname; - int bucket; - bool want_event, start_at_zone, alias, have_address; - isc_result_t result; - unsigned int wanted_addresses; - unsigned int wanted_fetches; - unsigned int query_pending; - char namebuf[DNS_NAME_FORMATSIZE]; + int bucket; + bool want_event, start_at_zone, alias, have_address; + isc_result_t result; + unsigned int wanted_addresses; + unsigned int wanted_fetches; + unsigned int query_pending; + char namebuf[DNS_NAME_FORMATSIZE]; REQUIRE(DNS_ADB_VALID(adb)); if (task != NULL) { @@ -3195,7 +3108,8 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, * in the database. */ if (!NAME_HAS_V4(adbname) && EXPIRE_OK(adbname->expire_v4, now) && - WANT_INET(wanted_addresses)) { + WANT_INET(wanted_addresses)) + { result = dbfind_name(adbname, now, dns_rdatatype_a); if (result == ISC_R_SUCCESS) { DP(DEF_LEVEL, @@ -3237,7 +3151,8 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, v6: if (!NAME_HAS_V6(adbname) && EXPIRE_OK(adbname->expire_v6, now) && - WANT_INET6(wanted_addresses)) { + WANT_INET6(wanted_addresses)) + { result = dbfind_name(adbname, now, dns_rdatatype_aaaa); if (result == ISC_R_SUCCESS) { DP(DEF_LEVEL, @@ -3272,7 +3187,8 @@ v6: fetch: if ((WANT_INET(wanted_addresses) && NAME_HAS_V4(adbname)) || - (WANT_INET6(wanted_addresses) && NAME_HAS_V6(adbname))) { + (WANT_INET6(wanted_addresses) && NAME_HAS_V6(adbname))) + { have_address = true; } else { have_address = false; @@ -3294,7 +3210,8 @@ fetch: */ if (WANT_INET(wanted_fetches) && fetch_name(adbname, start_at_zone, depth, qc, - dns_rdatatype_a) == ISC_R_SUCCESS) { + dns_rdatatype_a) == ISC_R_SUCCESS) + { DP(DEF_LEVEL, "dns_adb_createfind: " "started A fetch for name %s (%p)", @@ -3306,7 +3223,8 @@ fetch: */ if (WANT_INET6(wanted_fetches) && fetch_name(adbname, start_at_zone, depth, qc, - dns_rdatatype_aaaa) == ISC_R_SUCCESS) { + dns_rdatatype_aaaa) == ISC_R_SUCCESS) + { DP(DEF_LEVEL, "dns_adb_createfind: " "started AAAA fetch for name %s (%p)", @@ -3408,14 +3326,13 @@ out: } void -dns_adb_destroyfind(dns_adbfind_t **findp) -{ - dns_adbfind_t * find; - dns_adbentry_t * entry; +dns_adb_destroyfind(dns_adbfind_t **findp) { + dns_adbfind_t *find; + dns_adbentry_t *entry; dns_adbaddrinfo_t *ai; - int bucket; - dns_adb_t * adb; - bool overmem; + int bucket; + dns_adb_t *adb; + bool overmem; REQUIRE(findp != NULL && DNS_ADBFIND_VALID(*findp)); find = *findp; @@ -3468,13 +3385,12 @@ dns_adb_destroyfind(dns_adbfind_t **findp) } void -dns_adb_cancelfind(dns_adbfind_t *find) -{ +dns_adb_cancelfind(dns_adbfind_t *find) { isc_event_t *ev; - isc_task_t * task; - dns_adb_t * adb; - int bucket; - int unlock_bucket; + isc_task_t *task; + dns_adb_t *adb; + int bucket; + int unlock_bucket; LOCK(&find->lock); @@ -3528,9 +3444,8 @@ cleanup: } void -dns_adb_dump(dns_adb_t *adb, FILE *f) -{ - unsigned int i; +dns_adb_dump(dns_adb_t *adb, FILE *f) { + unsigned int i; isc_stdtime_t now; REQUIRE(DNS_ADB_VALID(adb)); @@ -3558,8 +3473,7 @@ dns_adb_dump(dns_adb_t *adb, FILE *f) } static void -dump_ttl(FILE *f, const char *legend, isc_stdtime_t value, isc_stdtime_t now) -{ +dump_ttl(FILE *f, const char *legend, isc_stdtime_t value, isc_stdtime_t now) { if (value == INT_MAX) { return; } @@ -3567,9 +3481,8 @@ dump_ttl(FILE *f, const char *legend, isc_stdtime_t value, isc_stdtime_t now) } static void -dump_adb(dns_adb_t *adb, FILE *f, bool debug, isc_stdtime_t now) -{ - dns_adbname_t * name; +dump_adb(dns_adb_t *adb, FILE *f, bool debug, isc_stdtime_t now) { + dns_adbname_t *name; dns_adbentry_t *entry; fprintf(f, ";\n; Address database dump\n;\n"); @@ -3686,11 +3599,10 @@ dump_adb(dns_adb_t *adb, FILE *f, bool debug, isc_stdtime_t now) static void dump_entry(FILE *f, dns_adb_t *adb, dns_adbentry_t *entry, bool debug, - isc_stdtime_t now) -{ - char addrbuf[ISC_NETADDR_FORMATSIZE]; - char typebuf[DNS_RDATATYPE_FORMATSIZE]; - isc_netaddr_t netaddr; + isc_stdtime_t now) { + char addrbuf[ISC_NETADDR_FORMATSIZE]; + char typebuf[DNS_RDATATYPE_FORMATSIZE]; + isc_netaddr_t netaddr; dns_adblameinfo_t *li; isc_netaddr_fromsockaddr(&netaddr, &entry->sockaddr); @@ -3728,7 +3640,8 @@ dump_entry(FILE *f, dns_adb_t *adb, dns_adbentry_t *entry, bool debug, fprintf(f, "\n"); for (li = ISC_LIST_HEAD(entry->lameinfo); li != NULL; - li = ISC_LIST_NEXT(li, plink)) { + li = ISC_LIST_NEXT(li, plink)) + { fprintf(f, ";\t\t"); print_dns_name(f, &li->qname); dns_rdatatype_format(li->qtype, typebuf, sizeof(typebuf)); @@ -3738,12 +3651,11 @@ dump_entry(FILE *f, dns_adb_t *adb, dns_adbentry_t *entry, bool debug, } void -dns_adb_dumpfind(dns_adbfind_t *find, FILE *f) -{ - char tmp[512]; - const char * tmpp; +dns_adb_dumpfind(dns_adbfind_t *find, FILE *f) { + char tmp[512]; + const char *tmpp; dns_adbaddrinfo_t *ai; - isc_sockaddr_t * sa; + isc_sockaddr_t *sa; /* * Not used currently, in the API Just In Case we @@ -3794,8 +3706,7 @@ dns_adb_dumpfind(dns_adbfind_t *find, FILE *f) } static void -print_dns_name(FILE *f, const dns_name_t *name) -{ +print_dns_name(FILE *f, const dns_name_t *name) { char buf[DNS_NAME_FORMATSIZE]; INSIST(f != NULL); @@ -3806,8 +3717,8 @@ print_dns_name(FILE *f, const dns_name_t *name) static void print_namehook_list(FILE *f, const char *legend, dns_adb_t *adb, - dns_adbnamehooklist_t *list, bool debug, isc_stdtime_t now) -{ + dns_adbnamehooklist_t *list, bool debug, + isc_stdtime_t now) { dns_adbnamehook_t *nh; for (nh = ISC_LIST_HEAD(*list); nh != NULL; @@ -3820,14 +3731,12 @@ print_namehook_list(FILE *f, const char *legend, dns_adb_t *adb, } static inline void -print_fetch(FILE *f, dns_adbfetch_t *ft, const char *type) -{ +print_fetch(FILE *f, dns_adbfetch_t *ft, const char *type) { fprintf(f, "\t\tFetch(%s): %p -> { fetch %p }\n", type, ft, ft->fetch); } static void -print_fetch_list(FILE *f, dns_adbname_t *n) -{ +print_fetch_list(FILE *f, dns_adbname_t *n) { if (NAME_FETCH_A(n)) { print_fetch(f, n->fetch_a, "A"); } @@ -3837,8 +3746,7 @@ print_fetch_list(FILE *f, dns_adbname_t *n) } static void -print_find_list(FILE *f, dns_adbname_t *name) -{ +print_find_list(FILE *f, dns_adbname_t *name) { dns_adbfind_t *find; find = ISC_LIST_HEAD(name->finds); @@ -3849,13 +3757,12 @@ print_find_list(FILE *f, dns_adbname_t *name) } static isc_result_t -dbfind_name(dns_adbname_t *adbname, isc_stdtime_t now, dns_rdatatype_t rdtype) -{ - isc_result_t result; - dns_rdataset_t rdataset; - dns_adb_t * adb; +dbfind_name(dns_adbname_t *adbname, isc_stdtime_t now, dns_rdatatype_t rdtype) { + isc_result_t result; + dns_rdataset_t rdataset; + dns_adb_t *adb; dns_fixedname_t foundname; - dns_name_t * fname; + dns_name_t *fname; INSIST(DNS_ADBNAME_VALID(adbname)); adb = adbname->adb; @@ -3999,18 +3906,17 @@ dbfind_name(dns_adbname_t *adbname, isc_stdtime_t now, dns_rdatatype_t rdtype) } static void -fetch_callback(isc_task_t *task, isc_event_t *ev) -{ +fetch_callback(isc_task_t *task, isc_event_t *ev) { dns_fetchevent_t *dev; - dns_adbname_t * name; - dns_adb_t * adb; - dns_adbfetch_t * fetch; - int bucket; - isc_eventtype_t ev_status; - isc_stdtime_t now; - isc_result_t result; - unsigned int address_type; - bool want_check_exit = false; + dns_adbname_t *name; + dns_adb_t *adb; + dns_adbfetch_t *fetch; + int bucket; + isc_eventtype_t ev_status; + isc_stdtime_t now; + isc_result_t result; + unsigned int address_type; + bool want_check_exit = false; UNUSED(task); @@ -4189,16 +4095,15 @@ out: static isc_result_t fetch_name(dns_adbname_t *adbname, bool start_at_zone, unsigned int depth, - isc_counter_t *qc, dns_rdatatype_t type) -{ - isc_result_t result; + isc_counter_t *qc, dns_rdatatype_t type) { + isc_result_t result; dns_adbfetch_t *fetch = NULL; - dns_adb_t * adb; + dns_adb_t *adb; dns_fixedname_t fixed; - dns_name_t * name; - dns_rdataset_t rdataset; + dns_name_t *name; + dns_rdataset_t rdataset; dns_rdataset_t *nameservers; - unsigned int options; + unsigned int options; INSIST(DNS_ADBNAME_VALID(adbname)); adb = adbname->adb; @@ -4279,11 +4184,10 @@ cleanup: isc_result_t dns_adb_marklame(dns_adb_t *adb, dns_adbaddrinfo_t *addr, const dns_name_t *qname, dns_rdatatype_t qtype, - isc_stdtime_t expire_time) -{ + isc_stdtime_t expire_time) { dns_adblameinfo_t *li; - int bucket; - isc_result_t result = ISC_R_SUCCESS; + int bucket; + isc_result_t result = ISC_R_SUCCESS; REQUIRE(DNS_ADB_VALID(adb)); REQUIRE(DNS_ADBADDRINFO_VALID(addr)); @@ -4319,9 +4223,8 @@ unlock: void dns_adb_adjustsrtt(dns_adb_t *adb, dns_adbaddrinfo_t *addr, unsigned int rtt, - unsigned int factor) -{ - int bucket; + unsigned int factor) { + int bucket; isc_stdtime_t now = 0; REQUIRE(DNS_ADB_VALID(adb)); @@ -4340,8 +4243,7 @@ dns_adb_adjustsrtt(dns_adb_t *adb, dns_adbaddrinfo_t *addr, unsigned int rtt, } void -dns_adb_agesrtt(dns_adb_t *adb, dns_adbaddrinfo_t *addr, isc_stdtime_t now) -{ +dns_adb_agesrtt(dns_adb_t *adb, dns_adbaddrinfo_t *addr, isc_stdtime_t now) { int bucket; REQUIRE(DNS_ADB_VALID(adb)); @@ -4357,8 +4259,7 @@ dns_adb_agesrtt(dns_adb_t *adb, dns_adbaddrinfo_t *addr, isc_stdtime_t now) static void adjustsrtt(dns_adbaddrinfo_t *addr, unsigned int rtt, unsigned int factor, - isc_stdtime_t now) -{ + isc_stdtime_t now) { uint64_t new_srtt; if (factor == DNS_ADB_RTTADJAGE) { @@ -4386,9 +4287,8 @@ adjustsrtt(dns_adbaddrinfo_t *addr, unsigned int rtt, unsigned int factor, void dns_adb_changeflags(dns_adb_t *adb, dns_adbaddrinfo_t *addr, unsigned int bits, - unsigned int mask) -{ - int bucket; + unsigned int mask) { + int bucket; isc_stdtime_t now; REQUIRE(DNS_ADB_VALID(adb)); @@ -4439,8 +4339,7 @@ static int quota_adj[] = { * Caller must hold adbentry lock */ static void -maybe_adjust_quota(dns_adb_t *adb, dns_adbaddrinfo_t *addr, bool timeout) -{ +maybe_adjust_quota(dns_adb_t *adb, dns_adbaddrinfo_t *addr, bool timeout) { double tr; UNUSED(adb); @@ -4481,7 +4380,8 @@ maybe_adjust_quota(dns_adb_t *adb, dns_adbaddrinfo_t *addr, bool timeout) "atr %0.2f, quota increased to %" PRIuFAST32, addr->entry->atr, new_quota); } else if (addr->entry->atr > adb->atr_high && - addr->entry->mode < (QUOTA_ADJ_SIZE - 1)) { + addr->entry->mode < (QUOTA_ADJ_SIZE - 1)) + { uint_fast32_t new_quota = adb->quota * quota_adj[++addr->entry->mode] / 10000; atomic_store_release(&addr->entry->quota, @@ -4494,9 +4394,8 @@ maybe_adjust_quota(dns_adb_t *adb, dns_adbaddrinfo_t *addr, bool timeout) #define EDNSTOS 3U bool -dns_adb_noedns(dns_adb_t *adb, dns_adbaddrinfo_t *addr) -{ - int bucket; +dns_adb_noedns(dns_adb_t *adb, dns_adbaddrinfo_t *addr) { + int bucket; bool noedns = false; REQUIRE(DNS_ADB_VALID(adb)); @@ -4506,7 +4405,8 @@ dns_adb_noedns(dns_adb_t *adb, dns_adbaddrinfo_t *addr) LOCK(&adb->entrylocks[bucket]); if (addr->entry->edns == 0U && - (addr->entry->plain > EDNSTOS || addr->entry->to4096 > EDNSTOS)) { + (addr->entry->plain > EDNSTOS || addr->entry->to4096 > EDNSTOS)) + { if (((addr->entry->plain + addr->entry->to4096) & 0x3f) != 0) { noedns = true; } else { @@ -4530,8 +4430,7 @@ dns_adb_noedns(dns_adb_t *adb, dns_adbaddrinfo_t *addr) } void -dns_adb_plainresponse(dns_adb_t *adb, dns_adbaddrinfo_t *addr) -{ +dns_adb_plainresponse(dns_adb_t *adb, dns_adbaddrinfo_t *addr) { int bucket; REQUIRE(DNS_ADB_VALID(adb)); @@ -4556,8 +4455,7 @@ dns_adb_plainresponse(dns_adb_t *adb, dns_adbaddrinfo_t *addr) } void -dns_adb_timeout(dns_adb_t *adb, dns_adbaddrinfo_t *addr) -{ +dns_adb_timeout(dns_adb_t *adb, dns_adbaddrinfo_t *addr) { int bucket; REQUIRE(DNS_ADB_VALID(adb)); @@ -4594,8 +4492,7 @@ dns_adb_timeout(dns_adb_t *adb, dns_adbaddrinfo_t *addr) } void -dns_adb_ednsto(dns_adb_t *adb, dns_adbaddrinfo_t *addr, unsigned int size) -{ +dns_adb_ednsto(dns_adb_t *adb, dns_adbaddrinfo_t *addr, unsigned int size) { int bucket; REQUIRE(DNS_ADB_VALID(adb)); @@ -4643,8 +4540,7 @@ dns_adb_ednsto(dns_adb_t *adb, dns_adbaddrinfo_t *addr, unsigned int size) } void -dns_adb_setudpsize(dns_adb_t *adb, dns_adbaddrinfo_t *addr, unsigned int size) -{ +dns_adb_setudpsize(dns_adb_t *adb, dns_adbaddrinfo_t *addr, unsigned int size) { int bucket; REQUIRE(DNS_ADB_VALID(adb)); @@ -4675,9 +4571,8 @@ dns_adb_setudpsize(dns_adb_t *adb, dns_adbaddrinfo_t *addr, unsigned int size) } unsigned int -dns_adb_getudpsize(dns_adb_t *adb, dns_adbaddrinfo_t *addr) -{ - int bucket; +dns_adb_getudpsize(dns_adb_t *adb, dns_adbaddrinfo_t *addr) { + int bucket; unsigned int size; REQUIRE(DNS_ADB_VALID(adb)); @@ -4692,9 +4587,8 @@ dns_adb_getudpsize(dns_adb_t *adb, dns_adbaddrinfo_t *addr) } unsigned int -dns_adb_probesize(dns_adb_t *adb, dns_adbaddrinfo_t *addr, int lookups) -{ - int bucket; +dns_adb_probesize(dns_adb_t *adb, dns_adbaddrinfo_t *addr, int lookups) { + int bucket; unsigned int size; REQUIRE(DNS_ADB_VALID(adb)); @@ -4726,8 +4620,7 @@ dns_adb_probesize(dns_adb_t *adb, dns_adbaddrinfo_t *addr, int lookups) void dns_adb_setcookie(dns_adb_t *adb, dns_adbaddrinfo_t *addr, - const unsigned char *cookie, size_t len) -{ + const unsigned char *cookie, size_t len) { int bucket; REQUIRE(DNS_ADB_VALID(adb)); @@ -4737,7 +4630,8 @@ dns_adb_setcookie(dns_adb_t *adb, dns_adbaddrinfo_t *addr, LOCK(&adb->entrylocks[bucket]); if (addr->entry->cookie != NULL && - (cookie == NULL || len != addr->entry->cookielen)) { + (cookie == NULL || len != addr->entry->cookielen)) + { isc_mem_put(adb->mctx, addr->entry->cookie, addr->entry->cookielen); addr->entry->cookie = NULL; @@ -4757,8 +4651,7 @@ dns_adb_setcookie(dns_adb_t *adb, dns_adbaddrinfo_t *addr, size_t dns_adb_getcookie(dns_adb_t *adb, dns_adbaddrinfo_t *addr, - unsigned char *cookie, size_t len) -{ + unsigned char *cookie, size_t len) { int bucket; REQUIRE(DNS_ADB_VALID(adb)); @@ -4767,7 +4660,8 @@ dns_adb_getcookie(dns_adb_t *adb, dns_adbaddrinfo_t *addr, bucket = addr->entry->lock_bucket; LOCK(&adb->entrylocks[bucket]); if (cookie != NULL && addr->entry->cookie != NULL && - len >= addr->entry->cookielen) { + len >= addr->entry->cookielen) + { memmove(cookie, addr->entry->cookie, addr->entry->cookielen); len = addr->entry->cookielen; } else { @@ -4780,13 +4674,12 @@ dns_adb_getcookie(dns_adb_t *adb, dns_adbaddrinfo_t *addr, isc_result_t dns_adb_findaddrinfo(dns_adb_t *adb, const isc_sockaddr_t *sa, - dns_adbaddrinfo_t **addrp, isc_stdtime_t now) -{ - int bucket; - dns_adbentry_t * entry; + dns_adbaddrinfo_t **addrp, isc_stdtime_t now) { + int bucket; + dns_adbentry_t *entry; dns_adbaddrinfo_t *addr; - isc_result_t result; - in_port_t port; + isc_result_t result; + in_port_t port; REQUIRE(DNS_ADB_VALID(adb)); REQUIRE(addrp != NULL && *addrp == NULL); @@ -4833,14 +4726,13 @@ unlock: } void -dns_adb_freeaddrinfo(dns_adb_t *adb, dns_adbaddrinfo_t **addrp) -{ +dns_adb_freeaddrinfo(dns_adb_t *adb, dns_adbaddrinfo_t **addrp) { dns_adbaddrinfo_t *addr; - dns_adbentry_t * entry; - int bucket; - isc_stdtime_t now; - bool want_check_exit = false; - bool overmem; + dns_adbentry_t *entry; + int bucket; + isc_stdtime_t now; + bool want_check_exit = false; + bool overmem; REQUIRE(DNS_ADB_VALID(adb)); REQUIRE(addrp != NULL); @@ -4875,8 +4767,7 @@ dns_adb_freeaddrinfo(dns_adb_t *adb, dns_adbaddrinfo_t **addrp) } void -dns_adb_flush(dns_adb_t *adb) -{ +dns_adb_flush(dns_adb_t *adb) { unsigned int i; INSIST(DNS_ADB_VALID(adb)); @@ -4901,11 +4792,10 @@ dns_adb_flush(dns_adb_t *adb) } void -dns_adb_flushname(dns_adb_t *adb, const dns_name_t *name) -{ +dns_adb_flushname(dns_adb_t *adb, const dns_name_t *name) { dns_adbname_t *adbname; dns_adbname_t *nextname; - int bucket; + int bucket; REQUIRE(DNS_ADB_VALID(adb)); REQUIRE(name != NULL); @@ -4916,8 +4806,8 @@ dns_adb_flushname(dns_adb_t *adb, const dns_name_t *name) adbname = ISC_LIST_HEAD(adb->names[bucket]); while (adbname != NULL) { nextname = ISC_LIST_NEXT(adbname, plink); - if (!NAME_DEAD(adbname) && - dns_name_equal(name, &adbname->name)) { + if (!NAME_DEAD(adbname) && dns_name_equal(name, &adbname->name)) + { RUNTIME_CHECK( kill_name(&adbname, DNS_EVENT_ADBCANCELED) == false); @@ -4929,10 +4819,9 @@ dns_adb_flushname(dns_adb_t *adb, const dns_name_t *name) } void -dns_adb_flushnames(dns_adb_t *adb, const dns_name_t *name) -{ +dns_adb_flushnames(dns_adb_t *adb, const dns_name_t *name) { dns_adbname_t *adbname, *nextname; - unsigned int i; + unsigned int i; REQUIRE(DNS_ADB_VALID(adb)); REQUIRE(name != NULL); @@ -4958,8 +4847,7 @@ dns_adb_flushnames(dns_adb_t *adb, const dns_name_t *name) } static void -water(void *arg, int mark) -{ +water(void *arg, int mark) { /* * We're going to change the way to handle overmem condition: use * isc_mem_isovermem() instead of storing the state via this callback, @@ -4969,7 +4857,7 @@ water(void *arg, int mark) */ dns_adb_t *adb = arg; - bool overmem = (mark == ISC_MEM_HIWATER); + bool overmem = (mark == ISC_MEM_HIWATER); REQUIRE(DNS_ADB_VALID(adb)); @@ -4978,8 +4866,7 @@ water(void *arg, int mark) } void -dns_adb_setadbsize(dns_adb_t *adb, size_t size) -{ +dns_adb_setadbsize(dns_adb_t *adb, size_t size) { size_t hiwater, lowater; INSIST(DNS_ADB_VALID(adb)); @@ -5000,8 +4887,7 @@ dns_adb_setadbsize(dns_adb_t *adb, size_t size) void dns_adb_setquota(dns_adb_t *adb, uint32_t quota, uint32_t freq, double low, - double high, double discount) -{ + double high, double discount) { REQUIRE(DNS_ADB_VALID(adb)); adb->quota = quota; @@ -5012,8 +4898,7 @@ dns_adb_setquota(dns_adb_t *adb, uint32_t quota, uint32_t freq, double low, } bool -dns_adbentry_overquota(dns_adbentry_t *entry) -{ +dns_adbentry_overquota(dns_adbentry_t *entry) { REQUIRE(DNS_ADBENTRY_VALID(entry)); uint_fast32_t quota = atomic_load_relaxed(&entry->quota); @@ -5023,8 +4908,7 @@ dns_adbentry_overquota(dns_adbentry_t *entry) } void -dns_adb_beginudpfetch(dns_adb_t *adb, dns_adbaddrinfo_t *addr) -{ +dns_adb_beginudpfetch(dns_adb_t *adb, dns_adbaddrinfo_t *addr) { REQUIRE(DNS_ADB_VALID(adb)); REQUIRE(DNS_ADBADDRINFO_VALID(addr)); @@ -5032,8 +4916,7 @@ dns_adb_beginudpfetch(dns_adb_t *adb, dns_adbaddrinfo_t *addr) } void -dns_adb_endudpfetch(dns_adb_t *adb, dns_adbaddrinfo_t *addr) -{ +dns_adb_endudpfetch(dns_adb_t *adb, dns_adbaddrinfo_t *addr) { REQUIRE(DNS_ADB_VALID(adb)); REQUIRE(DNS_ADBADDRINFO_VALID(addr)); diff --git a/lib/dns/badcache.c b/lib/dns/badcache.c index 86903f4cd3..597b71391d 100644 --- a/lib/dns/badcache.c +++ b/lib/dns/badcache.c @@ -34,34 +34,33 @@ typedef struct dns_bcentry dns_bcentry_t; struct dns_badcache { unsigned int magic; - isc_mutex_t lock; - isc_mem_t * mctx; + isc_mutex_t lock; + isc_mem_t *mctx; dns_bcentry_t **table; - unsigned int count; - unsigned int minsize; - unsigned int size; - unsigned int sweep; + unsigned int count; + unsigned int minsize; + unsigned int size; + unsigned int sweep; }; -#define BADCACHE_MAGIC ISC_MAGIC('B', 'd', 'C', 'a') +#define BADCACHE_MAGIC ISC_MAGIC('B', 'd', 'C', 'a') #define VALID_BADCACHE(m) ISC_MAGIC_VALID(m, BADCACHE_MAGIC) struct dns_bcentry { - dns_bcentry_t * next; + dns_bcentry_t *next; dns_rdatatype_t type; - isc_time_t expire; - uint32_t flags; - unsigned int hashval; - dns_name_t name; + isc_time_t expire; + uint32_t flags; + unsigned int hashval; + 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) -{ +dns_badcache_init(isc_mem_t *mctx, unsigned int size, dns_badcache_t **bcp) { dns_badcache_t *bc = NULL; REQUIRE(bcp != NULL && *bcp == NULL); @@ -87,8 +86,7 @@ dns_badcache_init(isc_mem_t *mctx, unsigned int size, dns_badcache_t **bcp) } void -dns_badcache_destroy(dns_badcache_t **bcp) -{ +dns_badcache_destroy(dns_badcache_t **bcp) { dns_badcache_t *bc; REQUIRE(bcp != NULL && *bcp != NULL); @@ -104,10 +102,9 @@ dns_badcache_destroy(dns_badcache_t **bcp) } static isc_result_t -badcache_resize(dns_badcache_t *bc, isc_time_t *now, bool grow) -{ +badcache_resize(dns_badcache_t *bc, isc_time_t *now, bool grow) { dns_bcentry_t **newtable, *bad, *next; - unsigned int newsize, i; + unsigned int newsize, i; if (grow) { newsize = bc->size * 2 + 1; @@ -143,12 +140,11 @@ badcache_resize(dns_badcache_t *bc, isc_time_t *now, bool grow) void dns_badcache_add(dns_badcache_t *bc, const dns_name_t *name, dns_rdatatype_t type, bool update, uint32_t flags, - isc_time_t *expire) -{ - isc_result_t result; - unsigned int i, hashval; + isc_time_t *expire) { + isc_result_t result; + unsigned int i, hashval; dns_bcentry_t *bad, *prev, *next; - isc_time_t now; + isc_time_t now; REQUIRE(VALID_BADCACHE(bc)); REQUIRE(name != NULL); @@ -215,11 +211,10 @@ dns_badcache_add(dns_badcache_t *bc, const dns_name_t *name, bool dns_badcache_find(dns_badcache_t *bc, const dns_name_t *name, - dns_rdatatype_t type, uint32_t *flagp, isc_time_t *now) -{ + dns_rdatatype_t type, uint32_t *flagp, isc_time_t *now) { dns_bcentry_t *bad, *prev, *next; - bool answer = false; - unsigned int i; + bool answer = false; + unsigned int i; REQUIRE(VALID_BADCACHE(bc)); REQUIRE(name != NULL); @@ -289,10 +284,9 @@ skip: } void -dns_badcache_flush(dns_badcache_t *bc) -{ +dns_badcache_flush(dns_badcache_t *bc) { dns_bcentry_t *entry, *next; - unsigned int i; + unsigned int i; REQUIRE(VALID_BADCACHE(bc)); @@ -308,12 +302,11 @@ dns_badcache_flush(dns_badcache_t *bc) } void -dns_badcache_flushname(dns_badcache_t *bc, const dns_name_t *name) -{ +dns_badcache_flushname(dns_badcache_t *bc, const dns_name_t *name) { dns_bcentry_t *bad, *prev, *next; - isc_result_t result; - isc_time_t now; - unsigned int i; + isc_result_t result; + isc_time_t now; + unsigned int i; REQUIRE(VALID_BADCACHE(bc)); REQUIRE(name != NULL); @@ -349,13 +342,12 @@ dns_badcache_flushname(dns_badcache_t *bc, const dns_name_t *name) } void -dns_badcache_flushtree(dns_badcache_t *bc, const dns_name_t *name) -{ +dns_badcache_flushtree(dns_badcache_t *bc, const dns_name_t *name) { dns_bcentry_t *bad, *prev, *next; - unsigned int i; - int n; - isc_time_t now; - isc_result_t result; + unsigned int i; + int n; + isc_time_t now; + isc_result_t result; REQUIRE(VALID_BADCACHE(bc)); REQUIRE(name != NULL); @@ -392,14 +384,13 @@ dns_badcache_flushtree(dns_badcache_t *bc, const dns_name_t *name) } void -dns_badcache_print(dns_badcache_t *bc, const char *cachename, FILE *fp) -{ - char namebuf[DNS_NAME_FORMATSIZE]; - char typebuf[DNS_RDATATYPE_FORMATSIZE]; +dns_badcache_print(dns_badcache_t *bc, const char *cachename, FILE *fp) { + char namebuf[DNS_NAME_FORMATSIZE]; + char typebuf[DNS_RDATATYPE_FORMATSIZE]; dns_bcentry_t *bad, *next, *prev; - isc_time_t now; - unsigned int i; - uint64_t t; + isc_time_t now; + unsigned int i; + uint64_t t; REQUIRE(VALID_BADCACHE(bc)); REQUIRE(cachename != NULL); diff --git a/lib/dns/byaddr.c b/lib/dns/byaddr.c index f46d20bc33..d5b50f02cc 100644 --- a/lib/dns/byaddr.c +++ b/lib/dns/byaddr.c @@ -40,14 +40,13 @@ static char hex_digits[] = { '0', '1', '2', '3', '4', '5', '6', '7', isc_result_t dns_byaddr_createptrname(const isc_netaddr_t *address, unsigned int options, - dns_name_t *name) -{ - char textname[128]; + dns_name_t *name) { + char textname[128]; const unsigned char *bytes; - int i; - char * cp; - isc_buffer_t buffer; - unsigned int len; + int i; + char *cp; + isc_buffer_t buffer; + unsigned int len; REQUIRE(address != NULL); UNUSED(options); @@ -90,29 +89,28 @@ dns_byaddr_createptrname(const isc_netaddr_t *address, unsigned int options, struct dns_byaddr { /* Unlocked. */ - unsigned int magic; - isc_mem_t * mctx; - isc_mutex_t lock; + unsigned int magic; + isc_mem_t *mctx; + isc_mutex_t lock; dns_fixedname_t name; /* Locked by lock. */ - unsigned int options; - dns_lookup_t * lookup; - isc_task_t * task; + unsigned int options; + dns_lookup_t *lookup; + isc_task_t *task; dns_byaddrevent_t *event; - bool canceled; + bool canceled; }; -#define BYADDR_MAGIC ISC_MAGIC('B', 'y', 'A', 'd') +#define BYADDR_MAGIC ISC_MAGIC('B', 'y', 'A', 'd') #define VALID_BYADDR(b) ISC_MAGIC_VALID(b, BYADDR_MAGIC) #define MAX_RESTARTS 16 static inline isc_result_t -copy_ptr_targets(dns_byaddr_t *byaddr, dns_rdataset_t *rdataset) -{ +copy_ptr_targets(dns_byaddr_t *byaddr, dns_rdataset_t *rdataset) { isc_result_t result; - dns_name_t * name; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_name_t *name; + dns_rdata_t rdata = DNS_RDATA_INIT; /* * The caller must be holding the byaddr's lock. @@ -142,11 +140,10 @@ copy_ptr_targets(dns_byaddr_t *byaddr, dns_rdataset_t *rdataset) } static void -lookup_done(isc_task_t *task, isc_event_t *event) -{ - dns_byaddr_t * byaddr = event->ev_arg; +lookup_done(isc_task_t *task, isc_event_t *event) { + dns_byaddr_t *byaddr = event->ev_arg; dns_lookupevent_t *levent; - isc_result_t result; + isc_result_t result; REQUIRE(event->ev_type == DNS_EVENT_LOOKUPDONE); REQUIRE(VALID_BYADDR(byaddr)); @@ -167,11 +164,10 @@ lookup_done(isc_task_t *task, isc_event_t *event) } static void -bevent_destroy(isc_event_t *event) -{ +bevent_destroy(isc_event_t *event) { dns_byaddrevent_t *bevent; - dns_name_t * name, *next_name; - isc_mem_t * mctx; + dns_name_t *name, *next_name; + isc_mem_t *mctx; REQUIRE(event->ev_type == DNS_EVENT_BYADDRDONE); mctx = event->ev_destroy_arg; @@ -190,11 +186,10 @@ bevent_destroy(isc_event_t *event) isc_result_t dns_byaddr_create(isc_mem_t *mctx, const isc_netaddr_t *address, dns_view_t *view, unsigned int options, isc_task_t *task, - isc_taskaction_t action, void *arg, dns_byaddr_t **byaddrp) -{ - isc_result_t result; + isc_taskaction_t action, void *arg, dns_byaddr_t **byaddrp) { + isc_result_t result; dns_byaddr_t *byaddr; - isc_event_t * ievent; + isc_event_t *ievent; byaddr = isc_mem_get(mctx, sizeof(*byaddr)); byaddr->mctx = NULL; @@ -251,8 +246,7 @@ cleanup_lock: } void -dns_byaddr_cancel(dns_byaddr_t *byaddr) -{ +dns_byaddr_cancel(dns_byaddr_t *byaddr) { REQUIRE(VALID_BYADDR(byaddr)); LOCK(&byaddr->lock); @@ -268,8 +262,7 @@ dns_byaddr_cancel(dns_byaddr_t *byaddr) } void -dns_byaddr_destroy(dns_byaddr_t **byaddrp) -{ +dns_byaddr_destroy(dns_byaddr_t **byaddrp) { dns_byaddr_t *byaddr; REQUIRE(byaddrp != NULL); diff --git a/lib/dns/cache.c b/lib/dns/cache.c index 0d50a2aaaa..b607783639 100644 --- a/lib/dns/cache.c +++ b/lib/dns/cache.c @@ -48,7 +48,7 @@ #include "rbtdb.h" -#define CACHE_MAGIC ISC_MAGIC('$', '$', '$', '$') +#define CACHE_MAGIC ISC_MAGIC('$', '$', '$', '$') #define VALID_CACHE(cache) ISC_MAGIC_VALID(cache, CACHE_MAGIC) /*! @@ -104,17 +104,17 @@ struct cache_cleaner { */ dns_cache_t *cache; - isc_task_t * task; + isc_task_t *task; isc_event_t *resched_event; /*% Sent by cleaner task to * itself to reschedule */ isc_event_t *overmem_event; dns_dbiterator_t *iterator; - unsigned int increment; /*% Number of names to - * clean in one increment */ - cleaner_state_t state; /*% Idle/Busy. */ - bool overmem; /*% The cache is in an overmem state. - * */ + unsigned int increment; /*% Number of names to + * clean in one increment */ + cleaner_state_t state; /*% Idle/Busy. */ + bool overmem; /*% The cache is in an overmem state. + * */ bool replaceiterator; }; @@ -124,25 +124,25 @@ struct cache_cleaner { struct dns_cache { /* Unlocked. */ - unsigned int magic; - isc_mutex_t lock; - isc_mutex_t filelock; - isc_mem_t * mctx; /* Main cache memory */ - isc_mem_t * hmctx; /* Heap memory */ - char * name; + unsigned int magic; + isc_mutex_t lock; + isc_mutex_t filelock; + isc_mem_t *mctx; /* Main cache memory */ + isc_mem_t *hmctx; /* Heap memory */ + char *name; isc_refcount_t references; isc_refcount_t live_tasks; /* Locked by 'lock'. */ dns_rdataclass_t rdclass; - dns_db_t * db; - cache_cleaner_t cleaner; - char * db_type; - int db_argc; - char ** db_argv; - size_t size; - dns_ttl_t serve_stale_ttl; - isc_stats_t * stats; + dns_db_t *db; + cache_cleaner_t cleaner; + char *db_type; + int db_argc; + char **db_argv; + size_t size; + dns_ttl_t serve_stale_ttl; + isc_stats_t *stats; /* Locked by 'filelock'. */ char *filename; @@ -153,22 +153,19 @@ 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) -{ +cache_create_db(dns_cache_t *cache, dns_db_t **db) { isc_result_t result; result = dns_db_create(cache->mctx, cache->db_type, dns_rootname, dns_dbtype_cache, cache->rdclass, cache->db_argc, @@ -183,12 +180,11 @@ isc_result_t dns_cache_create(isc_mem_t *cmctx, isc_mem_t *hmctx, isc_taskmgr_t *taskmgr, isc_timermgr_t *timermgr, dns_rdataclass_t rdclass, const char *cachename, const char *db_type, - unsigned int db_argc, char **db_argv, dns_cache_t **cachep) -{ + unsigned int db_argc, char **db_argv, dns_cache_t **cachep) { isc_result_t result; dns_cache_t *cache; - int i, extra = 0; - isc_task_t * dbtask; + int i, extra = 0; + isc_task_t *dbtask; REQUIRE(cachep != NULL); REQUIRE(*cachep == NULL); @@ -237,8 +233,8 @@ dns_cache_create(isc_mem_t *cmctx, isc_mem_t *hmctx, isc_taskmgr_t *taskmgr, cache->db_argv = NULL; if (cache->db_argc != 0) { - cache->db_argv = - isc_mem_get(cmctx, cache->db_argc * sizeof(char *)); + cache->db_argv = isc_mem_get(cmctx, + cache->db_argc * sizeof(char *)); for (i = 0; i < cache->db_argc; i++) { cache->db_argv[i] = NULL; @@ -246,8 +242,8 @@ dns_cache_create(isc_mem_t *cmctx, isc_mem_t *hmctx, isc_taskmgr_t *taskmgr, cache->db_argv[0] = (char *)hmctx; for (i = extra; i < cache->db_argc; i++) { - cache->db_argv[i] = - isc_mem_strdup(cmctx, db_argv[i - extra]); + cache->db_argv[i] = isc_mem_strdup(cmctx, + db_argv[i - extra]); } } @@ -323,8 +319,7 @@ cleanup_filelock: } static void -cache_free(dns_cache_t *cache) -{ +cache_free(dns_cache_t *cache) { REQUIRE(VALID_CACHE(cache)); isc_refcount_destroy(&cache->references); @@ -398,8 +393,7 @@ cache_free(dns_cache_t *cache) } void -dns_cache_attach(dns_cache_t *cache, dns_cache_t **targetp) -{ +dns_cache_attach(dns_cache_t *cache, dns_cache_t **targetp) { REQUIRE(VALID_CACHE(cache)); REQUIRE(targetp != NULL && *targetp == NULL); @@ -409,8 +403,7 @@ dns_cache_attach(dns_cache_t *cache, dns_cache_t **targetp) } void -dns_cache_detach(dns_cache_t **cachep) -{ +dns_cache_detach(dns_cache_t **cachep) { dns_cache_t *cache; REQUIRE(cachep != NULL); @@ -444,8 +437,7 @@ dns_cache_detach(dns_cache_t **cachep) } void -dns_cache_attachdb(dns_cache_t *cache, dns_db_t **dbp) -{ +dns_cache_attachdb(dns_cache_t *cache, dns_db_t **dbp) { REQUIRE(VALID_CACHE(cache)); REQUIRE(dbp != NULL && *dbp == NULL); REQUIRE(cache->db != NULL); @@ -456,8 +448,7 @@ dns_cache_attachdb(dns_cache_t *cache, dns_db_t **dbp) } isc_result_t -dns_cache_setfilename(dns_cache_t *cache, const char *filename) -{ +dns_cache_setfilename(dns_cache_t *cache, const char *filename) { char *newname; REQUIRE(VALID_CACHE(cache)); @@ -476,8 +467,7 @@ dns_cache_setfilename(dns_cache_t *cache, const char *filename) } isc_result_t -dns_cache_load(dns_cache_t *cache) -{ +dns_cache_load(dns_cache_t *cache) { isc_result_t result; REQUIRE(VALID_CACHE(cache)); @@ -495,8 +485,7 @@ dns_cache_load(dns_cache_t *cache) } isc_result_t -dns_cache_dump(dns_cache_t *cache) -{ +dns_cache_dump(dns_cache_t *cache) { isc_result_t result; REQUIRE(VALID_CACHE(cache)); @@ -514,8 +503,7 @@ dns_cache_dump(dns_cache_t *cache) } const char * -dns_cache_getname(dns_cache_t *cache) -{ +dns_cache_getname(dns_cache_t *cache) { REQUIRE(VALID_CACHE(cache)); return (cache->name); @@ -528,8 +516,7 @@ dns_cache_getname(dns_cache_t *cache) static isc_result_t cache_cleaner_init(dns_cache_t *cache, isc_taskmgr_t *taskmgr, - isc_timermgr_t *timermgr, cache_cleaner_t *cleaner) -{ + isc_timermgr_t *timermgr, cache_cleaner_t *cleaner) { isc_result_t result; isc_mutex_init(&cleaner->lock); @@ -605,8 +592,7 @@ cleanup: } static void -begin_cleaning(cache_cleaner_t *cleaner) -{ +begin_cleaning(cache_cleaner_t *cleaner) { isc_result_t result = ISC_R_SUCCESS; REQUIRE(CLEANER_IDLE(cleaner)); @@ -663,8 +649,7 @@ begin_cleaning(cache_cleaner_t *cleaner) } static void -end_cleaning(cache_cleaner_t *cleaner, isc_event_t *event) -{ +end_cleaning(cache_cleaner_t *cleaner, isc_event_t *event) { isc_result_t result; REQUIRE(CLEANER_BUSY(cleaner)); @@ -688,10 +673,9 @@ end_cleaning(cache_cleaner_t *cleaner, isc_event_t *event) * or shrinks beyond its lower limit. */ static void -overmem_cleaning_action(isc_task_t *task, isc_event_t *event) -{ +overmem_cleaning_action(isc_task_t *task, isc_event_t *event) { cache_cleaner_t *cleaner = event->ev_arg; - bool want_cleaning = false; + bool want_cleaning = false; UNUSED(task); @@ -738,12 +722,11 @@ overmem_cleaning_action(isc_task_t *task, isc_event_t *event) * Do incremental cleaning. */ static void -incremental_cleaning_action(isc_task_t *task, isc_event_t *event) -{ +incremental_cleaning_action(isc_task_t *task, isc_event_t *event) { cache_cleaner_t *cleaner = event->ev_arg; - isc_result_t result; - unsigned int n_names; - isc_time_t start; + isc_result_t result; + unsigned int n_names; + isc_time_t start; UNUSED(task); @@ -857,9 +840,8 @@ incremental_cleaning_action(isc_task_t *task, isc_event_t *event) * Do immediate cleaning. */ isc_result_t -dns_cache_clean(dns_cache_t *cache, isc_stdtime_t now) -{ - isc_result_t result; +dns_cache_clean(dns_cache_t *cache, isc_stdtime_t now) { + isc_result_t result; dns_dbiterator_t *iterator = NULL; REQUIRE(VALID_CACHE(cache)); @@ -911,10 +893,9 @@ dns_cache_clean(dns_cache_t *cache, isc_stdtime_t now) } static void -water(void *arg, int mark) -{ +water(void *arg, int mark) { dns_cache_t *cache = arg; - bool overmem = (mark == ISC_MEM_HIWATER); + bool overmem = (mark == ISC_MEM_HIWATER); REQUIRE(VALID_CACHE(cache)); @@ -935,8 +916,7 @@ water(void *arg, int mark) } void -dns_cache_setcachesize(dns_cache_t *cache, size_t size) -{ +dns_cache_setcachesize(dns_cache_t *cache, size_t size) { size_t hiwater, lowater; REQUIRE(VALID_CACHE(cache)); @@ -978,8 +958,7 @@ dns_cache_setcachesize(dns_cache_t *cache, size_t size) } size_t -dns_cache_getcachesize(dns_cache_t *cache) -{ +dns_cache_getcachesize(dns_cache_t *cache) { size_t size; REQUIRE(VALID_CACHE(cache)); @@ -992,8 +971,7 @@ dns_cache_getcachesize(dns_cache_t *cache) } void -dns_cache_setservestalettl(dns_cache_t *cache, dns_ttl_t ttl) -{ +dns_cache_setservestalettl(dns_cache_t *cache, dns_ttl_t ttl) { REQUIRE(VALID_CACHE(cache)); LOCK(&cache->lock); @@ -1004,9 +982,8 @@ dns_cache_setservestalettl(dns_cache_t *cache, dns_ttl_t ttl) } dns_ttl_t -dns_cache_getservestalettl(dns_cache_t *cache) -{ - dns_ttl_t ttl; +dns_cache_getservestalettl(dns_cache_t *cache) { + dns_ttl_t ttl; isc_result_t result; REQUIRE(VALID_CACHE(cache)); @@ -1023,8 +1000,7 @@ dns_cache_getservestalettl(dns_cache_t *cache) * The cleaner task is shutting down; do the necessary cleanup. */ static void -cleaner_shutdown_action(isc_task_t *task, isc_event_t *event) -{ +cleaner_shutdown_action(isc_task_t *task, isc_event_t *event) { dns_cache_t *cache = event->ev_arg; UNUSED(task); @@ -1047,11 +1023,10 @@ cleaner_shutdown_action(isc_task_t *task, isc_event_t *event) } isc_result_t -dns_cache_flush(dns_cache_t *cache) -{ - dns_db_t * db = NULL, *olddb; +dns_cache_flush(dns_cache_t *cache) { + dns_db_t *db = NULL, *olddb; dns_dbiterator_t *dbiterator = NULL, *olddbiterator = NULL; - isc_result_t result; + isc_result_t result; result = cache_create_db(cache, &db); if (result != ISC_R_SUCCESS) { @@ -1094,9 +1069,8 @@ dns_cache_flush(dns_cache_t *cache) } static isc_result_t -clearnode(dns_db_t *db, dns_dbnode_t *node) -{ - isc_result_t result; +clearnode(dns_db_t *db, dns_dbnode_t *node) { + isc_result_t result; dns_rdatasetiter_t *iter = NULL; result = dns_db_allrdatasets(db, node, NULL, (isc_stdtime_t)0, &iter); @@ -1105,7 +1079,8 @@ clearnode(dns_db_t *db, dns_dbnode_t *node) } for (result = dns_rdatasetiter_first(iter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(iter)) { + result = dns_rdatasetiter_next(iter)) + { dns_rdataset_t rdataset; dns_rdataset_init(&rdataset); @@ -1127,13 +1102,12 @@ clearnode(dns_db_t *db, dns_dbnode_t *node) } static isc_result_t -cleartree(dns_db_t *db, const dns_name_t *name) -{ - isc_result_t result, answer = ISC_R_SUCCESS; +cleartree(dns_db_t *db, const dns_name_t *name) { + isc_result_t result, answer = ISC_R_SUCCESS; dns_dbiterator_t *iter = NULL; - dns_dbnode_t * node = NULL, *top = NULL; - dns_fixedname_t fnodename; - dns_name_t * nodename; + dns_dbnode_t *node = NULL, *top = NULL; + dns_fixedname_t fnodename; + dns_name_t *nodename; /* * Create the node if it doesn't exist so dns_dbiterator_seek() @@ -1203,17 +1177,15 @@ cleanup: } isc_result_t -dns_cache_flushname(dns_cache_t *cache, const dns_name_t *name) -{ +dns_cache_flushname(dns_cache_t *cache, const dns_name_t *name) { return (dns_cache_flushnode(cache, name, false)); } isc_result_t -dns_cache_flushnode(dns_cache_t *cache, const dns_name_t *name, bool tree) -{ - isc_result_t result; +dns_cache_flushnode(dns_cache_t *cache, const dns_name_t *name, bool tree) { + isc_result_t result; dns_dbnode_t *node = NULL; - dns_db_t * db = NULL; + dns_db_t *db = NULL; if (tree && dns_name_equal(name, dns_rootname)) { return (dns_cache_flush(cache)); @@ -1249,15 +1221,13 @@ cleanup_db: } isc_stats_t * -dns_cache_getstats(dns_cache_t *cache) -{ +dns_cache_getstats(dns_cache_t *cache) { REQUIRE(VALID_CACHE(cache)); return (cache->stats); } void -dns_cache_updatestats(dns_cache_t *cache, isc_result_t result) -{ +dns_cache_updatestats(dns_cache_t *cache, isc_result_t result) { REQUIRE(VALID_CACHE(cache)); if (cache->stats == NULL) { return; @@ -1287,16 +1257,15 @@ dns_cache_updatestats(dns_cache_t *cache, isc_result_t result) */ typedef struct cache_dumparg { isc_statsformat_t type; - void * arg; /* type dependent argument */ - int ncounters; /* for general statistics */ - int * counterindices; /* for general statistics */ - uint64_t * countervalues; /* for general statistics */ - isc_result_t result; + void *arg; /* type dependent argument */ + int ncounters; /* for general statistics */ + int *counterindices; /* for general statistics */ + uint64_t *countervalues; /* for general statistics */ + isc_result_t result; } cache_dumparg_t; static void -getcounter(isc_statscounter_t counter, uint64_t val, void *arg) -{ +getcounter(isc_statscounter_t counter, uint64_t val, void *arg) { cache_dumparg_t *dumparg = arg; REQUIRE(counter < dumparg->ncounters); @@ -1305,8 +1274,7 @@ getcounter(isc_statscounter_t counter, uint64_t val, void *arg) static void getcounters(isc_stats_t *stats, isc_statsformat_t type, int ncounters, - int *indices, uint64_t *values) -{ + int *indices, uint64_t *values) { cache_dumparg_t dumparg; memset(values, 0, sizeof(values[0]) * ncounters); @@ -1320,9 +1288,8 @@ getcounters(isc_stats_t *stats, isc_statsformat_t type, int ncounters, } void -dns_cache_dumpstats(dns_cache_t *cache, FILE *fp) -{ - int indices[dns_cachestatscounter_max]; +dns_cache_dumpstats(dns_cache_t *cache, FILE *fp) { + int indices[dns_cachestatscounter_max]; uint64_t values[dns_cachestatscounter_max]; REQUIRE(VALID_CACHE(cache)); @@ -1376,8 +1343,7 @@ dns_cache_dumpstats(dns_cache_t *cache, FILE *fp) goto error; \ } while (0) static int -renderstat(const char *name, uint64_t value, xmlTextWriterPtr writer) -{ +renderstat(const char *name, uint64_t value, xmlTextWriterPtr writer) { int xmlrc; TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "counter")); @@ -1391,11 +1357,10 @@ error: } int -dns_cache_renderxml(dns_cache_t *cache, void *writer0) -{ - int indices[dns_cachestatscounter_max]; - uint64_t values[dns_cachestatscounter_max]; - int xmlrc; +dns_cache_renderxml(dns_cache_t *cache, void *writer0) { + int indices[dns_cachestatscounter_max]; + uint64_t values[dns_cachestatscounter_max]; + int xmlrc; xmlTextWriterPtr writer = (xmlTextWriterPtr)writer0; REQUIRE(VALID_CACHE(cache)); @@ -1440,11 +1405,10 @@ error: } while (0) isc_result_t -dns_cache_renderjson(dns_cache_t *cache, void *cstats0) -{ +dns_cache_renderjson(dns_cache_t *cache, void *cstats0) { isc_result_t result = ISC_R_SUCCESS; - int indices[dns_cachestatscounter_max]; - uint64_t values[dns_cachestatscounter_max]; + int indices[dns_cachestatscounter_max]; + uint64_t values[dns_cachestatscounter_max]; json_object *obj; json_object *cstats = (json_object *)cstats0; diff --git a/lib/dns/callbacks.c b/lib/dns/callbacks.c index 8aa2c5d3e3..f1126ee696 100644 --- a/lib/dns/callbacks.c +++ b/lib/dns/callbacks.c @@ -17,25 +17,22 @@ #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 */ static void -stdio_error_warn_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, ...) -{ +stdio_error_warn_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, + ...) { va_list ap; UNUSED(callbacks); @@ -47,8 +44,7 @@ stdio_error_warn_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, ...) } static void -isclog_error_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, ...) -{ +isclog_error_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, ...) { va_list ap; UNUSED(callbacks); @@ -61,8 +57,7 @@ isclog_error_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, ...) } static void -isclog_warn_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, ...) -{ +isclog_warn_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, ...) { va_list ap; UNUSED(callbacks); @@ -76,8 +71,7 @@ isclog_warn_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, ...) } static void -dns_rdatacallbacks_initcommon(dns_rdatacallbacks_t *callbacks) -{ +dns_rdatacallbacks_initcommon(dns_rdatacallbacks_t *callbacks) { REQUIRE(callbacks != NULL); callbacks->magic = DNS_CALLBACK_MAGIC; @@ -94,16 +88,14 @@ dns_rdatacallbacks_initcommon(dns_rdatacallbacks_t *callbacks) */ void -dns_rdatacallbacks_init(dns_rdatacallbacks_t *callbacks) -{ +dns_rdatacallbacks_init(dns_rdatacallbacks_t *callbacks) { dns_rdatacallbacks_initcommon(callbacks); callbacks->error = isclog_error_callback; callbacks->warn = isclog_warn_callback; } void -dns_rdatacallbacks_init_stdio(dns_rdatacallbacks_t *callbacks) -{ +dns_rdatacallbacks_init_stdio(dns_rdatacallbacks_t *callbacks) { dns_rdatacallbacks_initcommon(callbacks); callbacks->error = stdio_error_warn_callback; callbacks->warn = stdio_error_warn_callback; diff --git a/lib/dns/catz.c b/lib/dns/catz.c index 886581c55d..89888b3968 100644 --- a/lib/dns/catz.c +++ b/lib/dns/catz.c @@ -30,11 +30,11 @@ #include #include -#define DNS_CATZ_ZONE_MAGIC ISC_MAGIC('c', 'a', 't', 'z') +#define DNS_CATZ_ZONE_MAGIC ISC_MAGIC('c', 'a', 't', 'z') #define DNS_CATZ_ZONES_MAGIC ISC_MAGIC('c', 'a', 't', 's') #define DNS_CATZ_ENTRY_MAGIC ISC_MAGIC('c', 'a', 't', 'e') -#define DNS_CATZ_ZONE_VALID(catz) ISC_MAGIC_VALID(catz, DNS_CATZ_ZONE_MAGIC) +#define DNS_CATZ_ZONE_VALID(catz) ISC_MAGIC_VALID(catz, DNS_CATZ_ZONE_MAGIC) #define DNS_CATZ_ZONES_VALID(catzs) ISC_MAGIC_VALID(catzs, DNS_CATZ_ZONES_MAGIC) #define DNS_CATZ_ENTRY_VALID(entry) ISC_MAGIC_VALID(entry, DNS_CATZ_ENTRY_MAGIC) @@ -42,20 +42,20 @@ * Single member zone in a catalog */ struct dns_catz_entry { - unsigned int magic; - dns_name_t name; + unsigned int magic; + dns_name_t name; dns_catz_options_t opts; - isc_refcount_t refs; + isc_refcount_t refs; }; /*% * Catalog zone */ struct dns_catz_zone { - unsigned int magic; - dns_name_t name; + unsigned int magic; + dns_name_t name; dns_catz_zones_t *catzs; - dns_rdata_t soa; + dns_rdata_t soa; /* key in entries is 'mhash', not domain name! */ isc_ht_t *entries; /* @@ -64,15 +64,15 @@ struct dns_catz_zone { */ dns_catz_options_t defoptions; dns_catz_options_t zoneoptions; - isc_time_t lastupdated; - bool updatepending; - uint32_t version; + isc_time_t lastupdated; + bool updatepending; + uint32_t version; - dns_db_t * db; + dns_db_t *db; dns_dbversion_t *dbversion; isc_timer_t *updatetimer; - isc_event_t updateevent; + isc_event_t updateevent; bool active; bool db_registered; @@ -80,32 +80,32 @@ 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 */ struct dns_catz_zones { - unsigned int magic; - isc_ht_t * zones; - isc_mem_t * mctx; - isc_refcount_t refs; - isc_mutex_t lock; + unsigned int magic; + isc_ht_t *zones; + isc_mem_t *mctx; + isc_refcount_t refs; + isc_mutex_t lock; dns_catz_zonemodmethods_t *zmm; - isc_taskmgr_t * taskmgr; - isc_timermgr_t * timermgr; - dns_view_t * view; - isc_task_t * updater; + isc_taskmgr_t *taskmgr; + isc_timermgr_t *timermgr; + dns_view_t *view; + isc_task_t *updater; }; void -dns_catz_options_init(dns_catz_options_t *options) -{ +dns_catz_options_init(dns_catz_options_t *options) { REQUIRE(options != NULL); dns_ipkeylist_init(&options->masters); @@ -122,8 +122,7 @@ dns_catz_options_init(dns_catz_options_t *options) } void -dns_catz_options_free(dns_catz_options_t *options, isc_mem_t *mctx) -{ +dns_catz_options_free(dns_catz_options_t *options, isc_mem_t *mctx) { REQUIRE(options != NULL); REQUIRE(mctx != NULL); @@ -144,8 +143,7 @@ dns_catz_options_free(dns_catz_options_t *options, isc_mem_t *mctx) isc_result_t dns_catz_options_copy(isc_mem_t *mctx, const dns_catz_options_t *src, - dns_catz_options_t *dst) -{ + dns_catz_options_t *dst) { REQUIRE(mctx != NULL); REQUIRE(src != NULL); REQUIRE(dst != NULL); @@ -179,8 +177,7 @@ dns_catz_options_copy(isc_mem_t *mctx, const dns_catz_options_t *src, isc_result_t dns_catz_options_setdefault(isc_mem_t *mctx, const dns_catz_options_t *defaults, - dns_catz_options_t *opts) -{ + dns_catz_options_t *opts) { REQUIRE(mctx != NULL); REQUIRE(defaults != NULL); REQUIRE(opts != NULL); @@ -208,8 +205,7 @@ dns_catz_options_setdefault(isc_mem_t *mctx, const dns_catz_options_t *defaults, isc_result_t dns_catz_entry_new(isc_mem_t *mctx, const dns_name_t *domain, - dns_catz_entry_t **nentryp) -{ + dns_catz_entry_t **nentryp) { dns_catz_entry_t *nentry; REQUIRE(mctx != NULL); @@ -230,17 +226,15 @@ dns_catz_entry_new(isc_mem_t *mctx, const dns_name_t *domain, } dns_name_t * -dns_catz_entry_getname(dns_catz_entry_t *entry) -{ +dns_catz_entry_getname(dns_catz_entry_t *entry) { REQUIRE(DNS_CATZ_ENTRY_VALID(entry)); return (&entry->name); } isc_result_t dns_catz_entry_copy(dns_catz_zone_t *zone, const dns_catz_entry_t *entry, - dns_catz_entry_t **nentryp) -{ - isc_result_t result; + dns_catz_entry_t **nentryp) { + isc_result_t result; dns_catz_entry_t *nentry = NULL; REQUIRE(DNS_CATZ_ZONE_VALID(zone)); @@ -263,8 +257,7 @@ dns_catz_entry_copy(dns_catz_zone_t *zone, const dns_catz_entry_t *entry, } void -dns_catz_entry_attach(dns_catz_entry_t *entry, dns_catz_entry_t **entryp) -{ +dns_catz_entry_attach(dns_catz_entry_t *entry, dns_catz_entry_t **entryp) { REQUIRE(DNS_CATZ_ENTRY_VALID(entry)); REQUIRE(entryp != NULL && *entryp == NULL); @@ -273,8 +266,7 @@ dns_catz_entry_attach(dns_catz_entry_t *entry, dns_catz_entry_t **entryp) } void -dns_catz_entry_detach(dns_catz_zone_t *zone, dns_catz_entry_t **entryp) -{ +dns_catz_entry_detach(dns_catz_zone_t *zone, dns_catz_entry_t **entryp) { dns_catz_entry_t *entry; REQUIRE(DNS_CATZ_ZONE_VALID(zone)); @@ -296,8 +288,7 @@ dns_catz_entry_detach(dns_catz_zone_t *zone, dns_catz_entry_t **entryp) } bool -dns_catz_entry_validate(const dns_catz_entry_t *entry) -{ +dns_catz_entry_validate(const dns_catz_entry_t *entry) { REQUIRE(DNS_CATZ_ENTRY_VALID(entry)); UNUSED(entry); @@ -305,8 +296,7 @@ dns_catz_entry_validate(const dns_catz_entry_t *entry) } bool -dns_catz_entry_cmp(const dns_catz_entry_t *ea, const dns_catz_entry_t *eb) -{ +dns_catz_entry_cmp(const dns_catz_entry_t *ea, const dns_catz_entry_t *eb) { isc_region_t ra, rb; REQUIRE(DNS_CATZ_ENTRY_VALID(ea)); @@ -321,7 +311,8 @@ dns_catz_entry_cmp(const dns_catz_entry_t *ea, const dns_catz_entry_t *eb) } if (memcmp(ea->opts.masters.addrs, eb->opts.masters.addrs, - ea->opts.masters.count * sizeof(isc_sockaddr_t))) { + ea->opts.masters.count * sizeof(isc_sockaddr_t))) + { return (false); } @@ -358,24 +349,21 @@ dns_catz_entry_cmp(const dns_catz_entry_t *ea, const dns_catz_entry_t *eb) } dns_name_t * -dns_catz_zone_getname(dns_catz_zone_t *zone) -{ +dns_catz_zone_getname(dns_catz_zone_t *zone) { REQUIRE(DNS_CATZ_ZONE_VALID(zone)); return (&zone->name); } dns_catz_options_t * -dns_catz_zone_getdefoptions(dns_catz_zone_t *zone) -{ +dns_catz_zone_getdefoptions(dns_catz_zone_t *zone) { REQUIRE(DNS_CATZ_ZONE_VALID(zone)); return (&zone->defoptions); } void -dns_catz_zone_resetdefoptions(dns_catz_zone_t *zone) -{ +dns_catz_zone_resetdefoptions(dns_catz_zone_t *zone) { REQUIRE(DNS_CATZ_ZONE_VALID(zone)); dns_catz_options_free(&zone->defoptions, zone->catzs->mctx); @@ -383,15 +371,14 @@ dns_catz_zone_resetdefoptions(dns_catz_zone_t *zone) } isc_result_t -dns_catz_zones_merge(dns_catz_zone_t *target, dns_catz_zone_t *newzone) -{ - isc_result_t result; - isc_ht_iter_t * iter1 = NULL, *iter2 = NULL; - isc_ht_iter_t * iteradd = NULL, *itermod = NULL; - isc_ht_t * toadd = NULL, *tomod = NULL; - bool delcur = false; - char czname[DNS_NAME_FORMATSIZE]; - char zname[DNS_NAME_FORMATSIZE]; +dns_catz_zones_merge(dns_catz_zone_t *target, dns_catz_zone_t *newzone) { + isc_result_t result; + isc_ht_iter_t *iter1 = NULL, *iter2 = NULL; + isc_ht_iter_t *iteradd = NULL, *itermod = NULL; + isc_ht_t *toadd = NULL, *tomod = NULL; + bool delcur = false; + char czname[DNS_NAME_FORMATSIZE]; + char zname[DNS_NAME_FORMATSIZE]; dns_catz_zoneop_fn_t addzone, modzone, delzone; REQUIRE(DNS_CATZ_ZONE_VALID(newzone)); @@ -453,11 +440,12 @@ dns_catz_zones_merge(dns_catz_zone_t *target, dns_catz_zone_t *newzone) */ for (result = isc_ht_iter_first(iter1); result == ISC_R_SUCCESS; result = delcur ? isc_ht_iter_delcurrent_next(iter1) - : isc_ht_iter_next(iter1)) { + : isc_ht_iter_next(iter1)) + { dns_catz_entry_t *nentry = NULL; dns_catz_entry_t *oentry = NULL; - unsigned char * key = NULL; - size_t keysize; + unsigned char *key = NULL; + size_t keysize; delcur = false; isc_ht_iter_current(iter1, (void **)&nentry); @@ -525,7 +513,8 @@ dns_catz_zones_merge(dns_catz_zone_t *target, dns_catz_zone_t *newzone) * Then - walk the old zone; only deleted entries should remain. */ for (result = isc_ht_iter_first(iter2); result == ISC_R_SUCCESS; - result = isc_ht_iter_delcurrent_next(iter2)) { + result = isc_ht_iter_delcurrent_next(iter2)) + { dns_catz_entry_t *entry = NULL; isc_ht_iter_current(iter2, (void **)&entry); @@ -546,7 +535,8 @@ dns_catz_zones_merge(dns_catz_zone_t *target, dns_catz_zone_t *newzone) isc_ht_destroy(&target->entries); for (result = isc_ht_iter_first(iteradd); result == ISC_R_SUCCESS; - result = isc_ht_iter_delcurrent_next(iteradd)) { + result = isc_ht_iter_delcurrent_next(iteradd)) + { dns_catz_entry_t *entry = NULL; isc_ht_iter_current(iteradd, (void **)&entry); @@ -562,7 +552,8 @@ dns_catz_zones_merge(dns_catz_zone_t *target, dns_catz_zone_t *newzone) } for (result = isc_ht_iter_first(itermod); result == ISC_R_SUCCESS; - result = isc_ht_iter_delcurrent_next(itermod)) { + result = isc_ht_iter_delcurrent_next(itermod)) + { dns_catz_entry_t *entry = NULL; isc_ht_iter_current(itermod, (void **)&entry); @@ -607,10 +598,9 @@ cleanup: isc_result_t dns_catz_new_zones(dns_catz_zones_t **catzsp, dns_catz_zonemodmethods_t *zmm, isc_mem_t *mctx, isc_taskmgr_t *taskmgr, - isc_timermgr_t *timermgr) -{ + isc_timermgr_t *timermgr) { dns_catz_zones_t *new_zones; - isc_result_t result; + isc_result_t result; REQUIRE(catzsp != NULL && *catzsp == NULL); REQUIRE(zmm != NULL); @@ -652,8 +642,7 @@ cleanup_refcount: } void -dns_catz_catzs_set_view(dns_catz_zones_t *catzs, dns_view_t *view) -{ +dns_catz_catzs_set_view(dns_catz_zones_t *catzs, dns_view_t *view) { REQUIRE(DNS_CATZ_ZONES_VALID(catzs)); REQUIRE(view != NULL); /* Either it's a new one or it's being reconfigured. */ @@ -664,9 +653,8 @@ dns_catz_catzs_set_view(dns_catz_zones_t *catzs, dns_view_t *view) isc_result_t dns_catz_new_zone(dns_catz_zones_t *catzs, dns_catz_zone_t **zonep, - const dns_name_t *name) -{ - isc_result_t result; + const dns_name_t *name) { + isc_result_t result; dns_catz_zone_t *new_zone; REQUIRE(DNS_CATZ_ZONES_VALID(catzs)); @@ -722,11 +710,10 @@ cleanup_name: isc_result_t dns_catz_add_zone(dns_catz_zones_t *catzs, const dns_name_t *name, - dns_catz_zone_t **zonep) -{ + dns_catz_zone_t **zonep) { dns_catz_zone_t *new_zone = NULL; - isc_result_t result, tresult; - char zname[DNS_NAME_FORMATSIZE]; + isc_result_t result, tresult; + char zname[DNS_NAME_FORMATSIZE]; REQUIRE(DNS_CATZ_ZONES_VALID(catzs)); REQUIRE(ISC_MAGIC_VALID(name, DNS_NAME_MAGIC)); @@ -768,9 +755,8 @@ cleanup: } dns_catz_zone_t * -dns_catz_get_zone(dns_catz_zones_t *catzs, const dns_name_t *name) -{ - isc_result_t result; +dns_catz_get_zone(dns_catz_zones_t *catzs, const dns_name_t *name) { + isc_result_t result; dns_catz_zone_t *found = NULL; REQUIRE(DNS_CATZ_ZONES_VALID(catzs)); @@ -786,8 +772,7 @@ dns_catz_get_zone(dns_catz_zones_t *catzs, const dns_name_t *name) } void -dns_catz_catzs_attach(dns_catz_zones_t *catzs, dns_catz_zones_t **catzsp) -{ +dns_catz_catzs_attach(dns_catz_zones_t *catzs, dns_catz_zones_t **catzsp) { REQUIRE(DNS_CATZ_ZONES_VALID(catzs)); REQUIRE(catzsp != NULL && *catzsp == NULL); @@ -796,8 +781,7 @@ dns_catz_catzs_attach(dns_catz_zones_t *catzs, dns_catz_zones_t **catzsp) } void -dns_catz_zone_attach(dns_catz_zone_t *zone, dns_catz_zone_t **zonep) -{ +dns_catz_zone_attach(dns_catz_zone_t *zone, dns_catz_zone_t **zonep) { REQUIRE(zonep != NULL && *zonep == NULL); isc_refcount_increment(&zone->refs); @@ -805,8 +789,7 @@ dns_catz_zone_attach(dns_catz_zone_t *zone, dns_catz_zone_t **zonep) } void -dns_catz_zone_detach(dns_catz_zone_t **zonep) -{ +dns_catz_zone_detach(dns_catz_zone_t **zonep) { REQUIRE(zonep != NULL && *zonep != NULL); dns_catz_zone_t *zone = *zonep; *zonep = NULL; @@ -816,12 +799,13 @@ dns_catz_zone_detach(dns_catz_zone_t **zonep) isc_refcount_destroy(&zone->refs); if (zone->entries != NULL) { isc_ht_iter_t *iter = NULL; - isc_result_t result; + isc_result_t result; result = isc_ht_iter_create(zone->entries, &iter); INSIST(result == ISC_R_SUCCESS); for (result = isc_ht_iter_first(iter); result == ISC_R_SUCCESS; - result = isc_ht_iter_delcurrent_next(iter)) { + result = isc_ht_iter_delcurrent_next(iter)) + { dns_catz_entry_t *entry = NULL; isc_ht_iter_current(iter, (void **)&entry); @@ -858,8 +842,7 @@ dns_catz_zone_detach(dns_catz_zone_t **zonep) } void -dns_catz_catzs_detach(dns_catz_zones_t **catzsp) -{ +dns_catz_catzs_detach(dns_catz_zones_t **catzsp) { dns_catz_zones_t *catzs; REQUIRE(catzsp != NULL && *catzsp != NULL); @@ -873,7 +856,7 @@ dns_catz_catzs_detach(dns_catz_zones_t **catzsp) isc_mutex_destroy(&catzs->lock); if (catzs->zones != NULL) { isc_ht_iter_t *iter = NULL; - isc_result_t result; + isc_result_t result; result = isc_ht_iter_create(catzs->zones, &iter); INSIST(result == ISC_R_SUCCESS); for (result = isc_ht_iter_first(iter); @@ -903,8 +886,7 @@ typedef enum { } catz_opt_t; static bool -catz_opt_cmp(const dns_label_t *option, const char *opt) -{ +catz_opt_cmp(const dns_label_t *option, const char *opt) { unsigned int l = strlen(opt); if (option->length - 1 == l && memcmp(opt, option->base + 1, l - 1) == 0) { @@ -915,8 +897,7 @@ catz_opt_cmp(const dns_label_t *option, const char *opt) } static catz_opt_t -catz_get_option(const dns_label_t *option) -{ +catz_get_option(const dns_label_t *option) { if (catz_opt_cmp(option, "zones")) { return (CATZ_OPT_ZONES); } else if (catz_opt_cmp(option, "masters")) { @@ -934,10 +915,9 @@ catz_get_option(const dns_label_t *option) static isc_result_t catz_process_zones(dns_catz_zone_t *zone, dns_rdataset_t *value, - dns_name_t *name) -{ + dns_name_t *name) { dns_label_t mhash; - dns_name_t opt; + dns_name_t opt; REQUIRE(DNS_CATZ_ZONE_VALID(zone)); REQUIRE(DNS_RDATASET_VALID(value)); @@ -965,11 +945,10 @@ catz_process_zones(dns_catz_zone_t *zone, dns_rdataset_t *value, static isc_result_t catz_process_zones_entry(dns_catz_zone_t *zone, dns_rdataset_t *value, - dns_label_t *mhash) -{ - isc_result_t result; - dns_rdata_t rdata; - dns_rdata_ptr_t ptr; + dns_label_t *mhash) { + isc_result_t result; + dns_rdata_t rdata; + dns_rdata_ptr_t ptr; dns_catz_entry_t *entry = NULL; /* @@ -1002,8 +981,8 @@ catz_process_zones_entry(dns_catz_zone_t *zone, dns_rdataset_t *value, dns_name_dup(&ptr.ptr, zone->catzs->mctx, &entry->name); } } else { - result = - dns_catz_entry_new(zone->catzs->mctx, &ptr.ptr, &entry); + result = dns_catz_entry_new(zone->catzs->mctx, &ptr.ptr, + &entry); if (result != ISC_R_SUCCESS) { dns_rdata_freestruct(&ptr); return (result); @@ -1024,14 +1003,13 @@ catz_process_zones_entry(dns_catz_zone_t *zone, dns_rdataset_t *value, } static isc_result_t -catz_process_version(dns_catz_zone_t *zone, dns_rdataset_t *value) -{ - isc_result_t result; - dns_rdata_t rdata; - dns_rdata_txt_t rdatatxt; +catz_process_version(dns_catz_zone_t *zone, dns_rdataset_t *value) { + isc_result_t result; + dns_rdata_t rdata; + dns_rdata_txt_t rdatatxt; dns_rdata_txt_string_t rdatastr; - uint32_t tversion; - char t[16]; + uint32_t tversion; + char t[16]; REQUIRE(DNS_CATZ_ZONE_VALID(zone)); REQUIRE(DNS_RDATASET_VALID(value)); @@ -1087,20 +1065,19 @@ cleanup: static isc_result_t catz_process_masters(dns_catz_zone_t *zone, dns_ipkeylist_t *ipkl, - dns_rdataset_t *value, dns_name_t *name) -{ - isc_result_t result; - dns_rdata_t rdata; - dns_rdata_in_a_t rdata_a; - dns_rdata_in_aaaa_t rdata_aaaa; - dns_rdata_txt_t rdata_txt; + dns_rdataset_t *value, dns_name_t *name) { + isc_result_t result; + dns_rdata_t rdata; + dns_rdata_in_a_t rdata_a; + dns_rdata_in_aaaa_t rdata_aaaa; + dns_rdata_txt_t rdata_txt; dns_rdata_txt_string_t rdatastr; - dns_name_t * keyname = NULL; - isc_mem_t * mctx; - char keycbuf[DNS_NAME_FORMATSIZE]; - isc_buffer_t keybuf; - unsigned int rcount; - unsigned int i; + dns_name_t *keyname = NULL; + isc_mem_t *mctx; + char keycbuf[DNS_NAME_FORMATSIZE]; + isc_buffer_t keybuf; + unsigned int rcount; + unsigned int i; REQUIRE(DNS_CATZ_ZONE_VALID(zone)); REQUIRE(ipkl != NULL); @@ -1224,8 +1201,8 @@ catz_process_masters(dns_catz_zone_t *zone, dns_ipkeylist_t *ipkl, } /* else - 'simple' case - without labels */ - if (value->type != dns_rdatatype_a && - value->type != dns_rdatatype_aaaa) { + if (value->type != dns_rdatatype_a && value->type != dns_rdatatype_aaaa) + { return (ISC_R_FAILURE); } @@ -1237,7 +1214,8 @@ catz_process_masters(dns_catz_zone_t *zone, dns_ipkeylist_t *ipkl, } for (result = dns_rdataset_first(value); result == ISC_R_SUCCESS; - result = dns_rdataset_next(value)) { + result = dns_rdataset_next(value)) + { dns_rdata_init(&rdata); dns_rdataset_current(value, &rdata); /* @@ -1264,15 +1242,14 @@ catz_process_masters(dns_catz_zone_t *zone, dns_ipkeylist_t *ipkl, static isc_result_t catz_process_apl(dns_catz_zone_t *zone, isc_buffer_t **aclbp, - dns_rdataset_t *value) -{ - isc_result_t result = ISC_R_SUCCESS; - dns_rdata_t rdata; - dns_rdata_in_apl_t rdata_apl; + dns_rdataset_t *value) { + isc_result_t result = ISC_R_SUCCESS; + dns_rdata_t rdata; + dns_rdata_in_apl_t rdata_apl; dns_rdata_apl_ent_t apl_ent; - isc_netaddr_t addr; - isc_buffer_t * aclb = NULL; - unsigned char buf[256]; /* larger than INET6_ADDRSTRLEN */ + isc_netaddr_t addr; + isc_buffer_t *aclb = NULL; + unsigned char buf[256]; /* larger than INET6_ADDRSTRLEN */ REQUIRE(DNS_CATZ_ZONE_VALID(zone)); REQUIRE(aclbp != NULL); @@ -1302,7 +1279,8 @@ catz_process_apl(dns_catz_zone_t *zone, isc_buffer_t **aclbp, isc_buffer_allocate(zone->catzs->mctx, &aclb, 16); isc_buffer_setautorealloc(aclb, true); for (result = dns_rdata_apl_first(&rdata_apl); result == ISC_R_SUCCESS; - result = dns_rdata_apl_next(&rdata_apl)) { + result = dns_rdata_apl_next(&rdata_apl)) + { result = dns_rdata_apl_current(&rdata_apl, &apl_ent); RUNTIME_CHECK(result == ISC_R_SUCCESS); memset(buf, 0, sizeof(buf)); @@ -1323,7 +1301,8 @@ catz_process_apl(dns_catz_zone_t *zone, isc_buffer_t **aclbp, result = isc_netaddr_totext(&addr, aclb); RUNTIME_CHECK(result == ISC_R_SUCCESS); if ((apl_ent.family == 1 && apl_ent.prefix < 32) || - (apl_ent.family == 2 && apl_ent.prefix < 128)) { + (apl_ent.family == 2 && apl_ent.prefix < 128)) + { isc_buffer_putuint8(aclb, '/'); isc_buffer_putdecint(aclb, apl_ent.prefix); } @@ -1346,13 +1325,12 @@ cleanup: 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) -{ - isc_result_t result; + dns_label_t *mhash, dns_name_t *name) { + isc_result_t result; dns_catz_entry_t *entry = NULL; - dns_label_t option; - dns_name_t prefix; - catz_opt_t opt; + dns_label_t option; + dns_name_t prefix; + catz_opt_t opt; REQUIRE(DNS_CATZ_ZONE_VALID(zone)); REQUIRE(mhash != NULL); @@ -1411,11 +1389,10 @@ catz_process_zones_suboption(dns_catz_zone_t *zone, dns_rdataset_t *value, static isc_result_t catz_process_value(dns_catz_zone_t *zone, dns_name_t *name, - dns_rdataset_t *rdataset) -{ + dns_rdataset_t *rdataset) { dns_label_t option; - dns_name_t prefix; - catz_opt_t opt; + dns_name_t prefix; + catz_opt_t opt; REQUIRE(DNS_CATZ_ZONE_VALID(zone)); REQUIRE(ISC_MAGIC_VALID(name, DNS_NAME_MAGIC)); @@ -1455,15 +1432,14 @@ catz_process_value(dns_catz_zone_t *zone, dns_name_t *name, isc_result_t dns_catz_update_process(dns_catz_zones_t *catzs, dns_catz_zone_t *zone, - const dns_name_t *src_name, dns_rdataset_t *rdataset) -{ - isc_result_t result; - int order; - unsigned int nlabels; - dns_namereln_t nrres; - dns_rdata_t rdata = DNS_RDATA_INIT; + const dns_name_t *src_name, dns_rdataset_t *rdataset) { + isc_result_t result; + int order; + unsigned int nlabels; + dns_namereln_t nrres; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_soa_t soa; - dns_name_t prefix; + dns_name_t prefix; REQUIRE(DNS_CATZ_ZONES_VALID(catzs)); REQUIRE(DNS_CATZ_ZONE_VALID(zone)); @@ -1503,10 +1479,9 @@ dns_catz_update_process(dns_catz_zones_t *catzs, dns_catz_zone_t *zone, static isc_result_t digest2hex(unsigned char *digest, unsigned int digestlen, char *hash, - size_t hashlen) -{ + size_t hashlen) { unsigned int i; - int ret; + int ret; for (i = 0; i < digestlen; i++) { size_t left = hashlen - i * 2; ret = snprintf(hash + i * 2, left, "%02x", digest[i]); @@ -1519,13 +1494,12 @@ digest2hex(unsigned char *digest, unsigned int digestlen, char *hash, isc_result_t dns_catz_generate_masterfilename(dns_catz_zone_t *zone, dns_catz_entry_t *entry, - isc_buffer_t **buffer) -{ + isc_buffer_t **buffer) { isc_buffer_t *tbuf = NULL; - isc_region_t r; - isc_result_t result; - size_t rlen; - bool special = false; + isc_region_t r; + isc_result_t result; + size_t rlen; + bool special = false; REQUIRE(DNS_CATZ_ZONE_VALID(zone)); REQUIRE(entry != NULL); @@ -1581,7 +1555,7 @@ dns_catz_generate_masterfilename(dns_catz_zone_t *zone, dns_catz_entry_t *entry, isc_buffer_putstr(*buffer, "__catz__"); if (special || tbuf->used > ISC_SHA256_DIGESTLENGTH * 2 + 1) { unsigned char digest[ISC_MAX_MD_SIZE]; - unsigned int digestlen; + unsigned int digestlen; /* we can do that because digest string < 2 * DNS_NAME */ result = isc_md(ISC_MD_SHA256, r.base, r.length, digest, @@ -1609,8 +1583,7 @@ cleanup: isc_result_t dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry, - isc_buffer_t **buf) -{ + isc_buffer_t **buf) { /* * We have to generate a text buffer with regular zone config: * zone "foo.bar" { @@ -1619,9 +1592,9 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry, * } */ isc_buffer_t *buffer = NULL; - isc_region_t region; - isc_result_t result; - uint32_t i; + isc_region_t region; + isc_result_t result; + uint32_t i; isc_netaddr_t netaddr; char pbuf[sizeof("65535")]; /* used both for port number and DSCP */ char zname[DNS_NAME_FORMATSIZE]; @@ -1646,8 +1619,8 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry, * for all masters and cannot be overriden for a specific master IP, so * use the DSCP value set for the first master */ - if (entry->opts.masters.count > 0 && - entry->opts.masters.dscps[0] >= 0) { + if (entry->opts.masters.count > 0 && entry->opts.masters.dscps[0] >= 0) + { isc_buffer_putstr(buffer, " dscp "); snprintf(pbuf, sizeof(pbuf), "%hd", entry->opts.masters.dscps[0]); @@ -1728,9 +1701,8 @@ cleanup: } void -dns_catz_update_taskaction(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result; +dns_catz_update_taskaction(isc_task_t *task, isc_event_t *event) { + isc_result_t result; dns_catz_zone_t *zone; (void)task; @@ -1751,14 +1723,13 @@ dns_catz_update_taskaction(isc_task_t *task, isc_event_t *event) } isc_result_t -dns_catz_dbupdate_callback(dns_db_t *db, void *fn_arg) -{ +dns_catz_dbupdate_callback(dns_db_t *db, void *fn_arg) { dns_catz_zones_t *catzs; - dns_catz_zone_t * zone = NULL; - isc_time_t now; - uint64_t tdiff; - isc_result_t result = ISC_R_SUCCESS; - isc_region_t r; + dns_catz_zone_t *zone = NULL; + isc_time_t now; + uint64_t tdiff; + isc_result_t result = ISC_R_SUCCESS; + isc_region_t r; REQUIRE(DNS_DB_VALID(db)); REQUIRE(fn_arg != NULL); @@ -1838,20 +1809,19 @@ cleanup: } void -dns_catz_update_from_db(dns_db_t *db, dns_catz_zones_t *catzs) -{ - dns_catz_zone_t * oldzone = NULL, *newzone = NULL; - isc_result_t result; - isc_region_t r; - dns_dbnode_t * node = NULL; - dns_dbiterator_t * it = NULL; - dns_fixedname_t fixname; - dns_name_t * name; +dns_catz_update_from_db(dns_db_t *db, dns_catz_zones_t *catzs) { + dns_catz_zone_t *oldzone = NULL, *newzone = NULL; + isc_result_t result; + isc_region_t r; + dns_dbnode_t *node = NULL; + dns_dbiterator_t *it = NULL; + dns_fixedname_t fixname; + dns_name_t *name; dns_rdatasetiter_t *rdsiter = NULL; - dns_rdataset_t rdataset; - char bname[DNS_NAME_FORMATSIZE]; - isc_buffer_t ibname; - uint32_t vers; + dns_rdataset_t rdataset; + char bname[DNS_NAME_FORMATSIZE]; + isc_buffer_t ibname; + uint32_t vers; REQUIRE(DNS_DB_VALID(db)); REQUIRE(DNS_CATZ_ZONES_VALID(catzs)); @@ -2022,9 +1992,8 @@ dns_catz_update_from_db(dns_db_t *db, dns_catz_zones_t *catzs) } void -dns_catz_prereconfig(dns_catz_zones_t *catzs) -{ - isc_result_t result; +dns_catz_prereconfig(dns_catz_zones_t *catzs) { + isc_result_t result; isc_ht_iter_t *iter = NULL; REQUIRE(DNS_CATZ_ZONES_VALID(catzs)); @@ -2032,7 +2001,8 @@ dns_catz_prereconfig(dns_catz_zones_t *catzs) result = isc_ht_iter_create(catzs->zones, &iter); INSIST(result == ISC_R_SUCCESS); for (result = isc_ht_iter_first(iter); result == ISC_R_SUCCESS; - result = isc_ht_iter_next(iter)) { + result = isc_ht_iter_next(iter)) + { dns_catz_zone_t *zone = NULL; isc_ht_iter_current(iter, (void **)&zone); zone->active = false; @@ -2042,11 +2012,10 @@ dns_catz_prereconfig(dns_catz_zones_t *catzs) } void -dns_catz_postreconfig(dns_catz_zones_t *catzs) -{ - isc_result_t result; +dns_catz_postreconfig(dns_catz_zones_t *catzs) { + isc_result_t result; dns_catz_zone_t *newzone = NULL; - isc_ht_iter_t * iter = NULL; + isc_ht_iter_t *iter = NULL; REQUIRE(DNS_CATZ_ZONES_VALID(catzs)); @@ -2069,8 +2038,8 @@ dns_catz_postreconfig(dns_catz_zones_t *catzs) * Merge the old zone with an empty one to remove * all members. */ - result = - dns_catz_new_zone(catzs, &newzone, &zone->name); + result = dns_catz_new_zone(catzs, &newzone, + &zone->name); INSIST(result == ISC_R_SUCCESS); dns_catz_zones_merge(zone, newzone); dns_catz_zone_detach(&newzone); @@ -2089,8 +2058,7 @@ dns_catz_postreconfig(dns_catz_zones_t *catzs) } isc_result_t -dns_catz_get_iterator(dns_catz_zone_t *catz, isc_ht_iter_t **itp) -{ +dns_catz_get_iterator(dns_catz_zone_t *catz, isc_ht_iter_t **itp) { REQUIRE(DNS_CATZ_ZONE_VALID(catz)); return (isc_ht_iter_create(catz->entries, itp)); } diff --git a/lib/dns/client.c b/lib/dns/client.c index a6f2d39ac8..33d3cdce14 100644 --- a/lib/dns/client.c +++ b/lib/dns/client.c @@ -50,16 +50,16 @@ #include -#define DNS_CLIENT_MAGIC ISC_MAGIC('D', 'N', 'S', 'c') +#define DNS_CLIENT_MAGIC ISC_MAGIC('D', 'N', 'S', 'c') #define DNS_CLIENT_VALID(c) ISC_MAGIC_VALID(c, DNS_CLIENT_MAGIC) -#define RCTX_MAGIC ISC_MAGIC('R', 'c', 't', 'x') +#define RCTX_MAGIC ISC_MAGIC('R', 'c', 't', 'x') #define RCTX_VALID(c) ISC_MAGIC_VALID(c, RCTX_MAGIC) -#define REQCTX_MAGIC ISC_MAGIC('R', 'q', 'c', 'x') +#define REQCTX_MAGIC ISC_MAGIC('R', 'q', 'c', 'x') #define REQCTX_VALID(c) ISC_MAGIC_VALID(c, REQCTX_MAGIC) -#define UCTX_MAGIC ISC_MAGIC('U', 'c', 't', 'x') +#define UCTX_MAGIC ISC_MAGIC('U', 'c', 't', 'x') #define UCTX_VALID(c) ISC_MAGIC_VALID(c, UCTX_MAGIC) #define MAX_RESTARTS 16 @@ -82,18 +82,18 @@ */ struct dns_client { /* Unlocked */ - unsigned int magic; - unsigned int attributes; - isc_mutex_t lock; - isc_mem_t * mctx; - isc_appctx_t * actx; - isc_taskmgr_t * taskmgr; - isc_task_t * task; - isc_socketmgr_t * socketmgr; - isc_timermgr_t * timermgr; + unsigned int magic; + unsigned int attributes; + isc_mutex_t lock; + isc_mem_t *mctx; + isc_appctx_t *actx; + isc_taskmgr_t *taskmgr; + isc_task_t *task; + isc_socketmgr_t *socketmgr; + isc_timermgr_t *timermgr; dns_dispatchmgr_t *dispatchmgr; - dns_dispatch_t * dispatchv4; - dns_dispatch_t * dispatchv6; + dns_dispatch_t *dispatchv4; + dns_dispatch_t *dispatchv6; unsigned int update_timeout; unsigned int update_udptimeout; @@ -113,12 +113,12 @@ struct dns_client { /*% * Timeout/retry constants for dynamic update borrowed from nsupdate */ -#define DEF_UPDATE_TIMEOUT 300 -#define MIN_UPDATE_TIMEOUT 30 +#define DEF_UPDATE_TIMEOUT 300 +#define MIN_UPDATE_TIMEOUT 30 #define DEF_UPDATE_UDPTIMEOUT 3 #define DEF_UPDATE_UDPRETRIES 3 -#define DEF_FIND_TIMEOUT 5 +#define DEF_FIND_TIMEOUT 5 #define DEF_FIND_UDPRETRIES 3 #define DNS_CLIENTATTR_OWNCTX 0x01 @@ -128,28 +128,28 @@ struct dns_client { */ typedef struct resctx { /* Unlocked */ - unsigned int magic; - isc_mutex_t lock; + unsigned int magic; + isc_mutex_t lock; dns_client_t *client; - bool want_dnssec; - bool want_validation; - bool want_cdflag; - bool want_tcp; + bool want_dnssec; + bool want_validation; + bool want_cdflag; + bool want_tcp; /* Locked */ ISC_LINK(struct resctx) link; - isc_task_t * task; - dns_view_t * view; - unsigned int restarts; - dns_fixedname_t name; - dns_rdatatype_t type; - dns_fetch_t * fetch; - dns_namelist_t namelist; - isc_result_t result; + isc_task_t *task; + dns_view_t *view; + unsigned int restarts; + dns_fixedname_t name; + dns_rdatatype_t type; + dns_fetch_t *fetch; + dns_namelist_t namelist; + isc_result_t result; dns_clientresevent_t *event; - bool canceled; - dns_rdataset_t * rdataset; - dns_rdataset_t * sigrdataset; + bool canceled; + dns_rdataset_t *rdataset; + dns_rdataset_t *sigrdataset; } resctx_t; /*% @@ -159,14 +159,14 @@ typedef struct resarg { /* Unlocked */ isc_appctx_t *actx; dns_client_t *client; - isc_mutex_t lock; + isc_mutex_t lock; /* Locked */ - isc_result_t result; - isc_result_t vresult; - dns_namelist_t * namelist; + isc_result_t result; + isc_result_t vresult; + dns_namelist_t *namelist; dns_clientrestrans_t *trans; - bool canceled; + bool canceled; } resarg_t; /*% @@ -174,16 +174,16 @@ typedef struct resarg { */ typedef struct reqctx { /* Unlocked */ - unsigned int magic; - isc_mutex_t lock; + unsigned int magic; + isc_mutex_t lock; dns_client_t *client; - unsigned int parseoptions; + unsigned int parseoptions; /* Locked */ ISC_LINK(struct reqctx) link; - bool canceled; - dns_tsigkey_t * tsigkey; - dns_request_t * request; + bool canceled; + dns_tsigkey_t *tsigkey; + dns_request_t *request; dns_clientreqevent_t *event; } reqctx_t; @@ -194,12 +194,12 @@ typedef struct reqarg { /* Unlocked */ isc_appctx_t *actx; dns_client_t *client; - isc_mutex_t lock; + isc_mutex_t lock; /* Locked */ - isc_result_t result; + isc_result_t result; dns_clientreqtrans_t *trans; - bool canceled; + bool canceled; } reqarg_t; /*% @@ -209,12 +209,12 @@ typedef struct updatearg { /* Unlocked */ isc_appctx_t *actx; dns_client_t *client; - isc_mutex_t lock; + isc_mutex_t lock; /* Locked */ - isc_result_t result; + isc_result_t result; dns_clientupdatetrans_t *trans; - bool canceled; + bool canceled; } updatearg_t; /*% @@ -222,55 +222,51 @@ typedef struct updatearg { */ typedef struct updatectx { /* Unlocked */ - unsigned int magic; - isc_mutex_t lock; + unsigned int magic; + isc_mutex_t lock; dns_client_t *client; - bool want_tcp; + bool want_tcp; /* Locked */ - dns_request_t * updatereq; - dns_request_t * soareq; + dns_request_t *updatereq; + dns_request_t *soareq; dns_clientrestrans_t *restrans; dns_clientrestrans_t *restrans2; - bool canceled; + bool canceled; /* Task Locked */ ISC_LINK(struct updatectx) link; - dns_clientupdatestate_t state; - dns_rdataclass_t rdclass; - dns_view_t * view; - dns_message_t * updatemsg; - dns_message_t * soaquery; + dns_clientupdatestate_t state; + dns_rdataclass_t rdclass; + dns_view_t *view; + dns_message_t *updatemsg; + dns_message_t *soaquery; dns_clientupdateevent_t *event; - dns_tsigkey_t * tsigkey; - dst_key_t * sig0key; - dns_name_t * firstname; - dns_name_t soaqname; - dns_fixedname_t zonefname; - dns_name_t * zonename; - isc_sockaddrlist_t servers; - unsigned int nservers; - isc_sockaddr_t * currentserver; - struct updatectx * bp4; - struct updatectx * bp6; + dns_tsigkey_t *tsigkey; + dst_key_t *sig0key; + dns_name_t *firstname; + dns_name_t soaqname; + dns_fixedname_t zonefname; + dns_name_t *zonename; + isc_sockaddrlist_t servers; + unsigned int nservers; + isc_sockaddr_t *currentserver; + struct updatectx *bp4; + 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. */ static isc_result_t -setsourceports(isc_mem_t *mctx, dns_dispatchmgr_t *manager) -{ +setsourceports(isc_mem_t *mctx, dns_dispatchmgr_t *manager) { isc_portset_t *v4portset = NULL, *v6portset = NULL; - in_port_t udpport_low, udpport_high; - isc_result_t result; + in_port_t udpport_low, udpport_high; + isc_result_t result; result = isc_portset_create(mctx, &v4portset); if (result != ISC_R_SUCCESS) { @@ -309,13 +305,12 @@ static isc_result_t getudpdispatch(int family, dns_dispatchmgr_t *dispatchmgr, isc_socketmgr_t *socketmgr, isc_taskmgr_t *taskmgr, bool is_shared, dns_dispatch_t **dispp, - const isc_sockaddr_t *localaddr) -{ - unsigned int attrs, attrmask; + const isc_sockaddr_t *localaddr) { + unsigned int attrs, attrmask; dns_dispatch_t *disp; - unsigned buffersize, maxbuffers, maxrequests, buckets, increment; - isc_result_t result; - isc_sockaddr_t anyaddr; + unsigned buffersize, maxbuffers, maxrequests, buckets, increment; + isc_result_t result; + isc_sockaddr_t anyaddr; attrs = 0; attrs |= DNS_DISPATCHATTR_UDP; @@ -364,11 +359,10 @@ createview(isc_mem_t *mctx, dns_rdataclass_t rdclass, unsigned int options, isc_taskmgr_t *taskmgr, unsigned int ntasks, isc_socketmgr_t *socketmgr, isc_timermgr_t *timermgr, dns_dispatchmgr_t *dispatchmgr, dns_dispatch_t *dispatchv4, - dns_dispatch_t *dispatchv6, dns_view_t **viewp) -{ + dns_dispatch_t *dispatchv6, dns_view_t **viewp) { isc_result_t result; - dns_view_t * view = NULL; - const char * dbtype; + dns_view_t *view = NULL; + const char *dbtype; result = dns_view_create(mctx, rdclass, DNS_CLIENTVIEW_NAME, &view); if (result != ISC_R_SUCCESS) { @@ -412,14 +406,13 @@ createview(isc_mem_t *mctx, dns_rdataclass_t rdclass, unsigned int options, } isc_result_t -dns_client_create(dns_client_t **clientp, unsigned int options) -{ - isc_result_t result; - isc_mem_t * mctx = NULL; - isc_appctx_t * actx = NULL; - isc_taskmgr_t * taskmgr = NULL; +dns_client_create(dns_client_t **clientp, unsigned int options) { + isc_result_t result; + isc_mem_t *mctx = NULL; + isc_appctx_t *actx = NULL; + isc_taskmgr_t *taskmgr = NULL; isc_socketmgr_t *socketmgr = NULL; - isc_timermgr_t * timermgr = NULL; + isc_timermgr_t *timermgr = NULL; #if 0 /* XXXMPA add debug logging support */ isc_log_t *lctx = NULL; @@ -498,14 +491,13 @@ dns_client_createx(isc_mem_t *mctx, isc_appctx_t *actx, isc_taskmgr_t *taskmgr, isc_socketmgr_t *socketmgr, isc_timermgr_t *timermgr, unsigned int options, dns_client_t **clientp, const isc_sockaddr_t *localaddr4, - const isc_sockaddr_t *localaddr6) -{ - dns_client_t * client; - isc_result_t result; + const isc_sockaddr_t *localaddr6) { + dns_client_t *client; + isc_result_t result; dns_dispatchmgr_t *dispatchmgr = NULL; - dns_dispatch_t * dispatchv4 = NULL; - dns_dispatch_t * dispatchv6 = NULL; - dns_view_t * view = NULL; + dns_dispatch_t *dispatchv4 = NULL; + dns_dispatch_t *dispatchv6 = NULL; + dns_view_t *view = NULL; REQUIRE(mctx != NULL); REQUIRE(taskmgr != NULL); @@ -619,8 +611,7 @@ cleanup_lock: } static void -destroyclient(dns_client_t *client) -{ +destroyclient(dns_client_t *client) { dns_view_t *view; isc_refcount_destroy(&client->references); @@ -661,8 +652,7 @@ destroyclient(dns_client_t *client) } void -dns_client_destroy(dns_client_t **clientp) -{ +dns_client_destroy(dns_client_t **clientp) { dns_client_t *client; REQUIRE(clientp != NULL); @@ -677,10 +667,9 @@ dns_client_destroy(dns_client_t **clientp) isc_result_t dns_client_setservers(dns_client_t *client, dns_rdataclass_t rdclass, - const dns_name_t *name_space, isc_sockaddrlist_t *addrs) -{ + const dns_name_t *name_space, isc_sockaddrlist_t *addrs) { isc_result_t result; - dns_view_t * view = NULL; + dns_view_t *view = NULL; REQUIRE(DNS_CLIENT_VALID(client)); REQUIRE(addrs != NULL); @@ -708,10 +697,9 @@ dns_client_setservers(dns_client_t *client, dns_rdataclass_t rdclass, isc_result_t dns_client_clearservers(dns_client_t *client, dns_rdataclass_t rdclass, - const dns_name_t *name_space) -{ + const dns_name_t *name_space) { isc_result_t result; - dns_view_t * view = NULL; + dns_view_t *view = NULL; REQUIRE(DNS_CLIENT_VALID(client)); @@ -736,8 +724,7 @@ dns_client_clearservers(dns_client_t *client, dns_rdataclass_t rdclass, } static isc_result_t -getrdataset(isc_mem_t *mctx, dns_rdataset_t **rdatasetp) -{ +getrdataset(isc_mem_t *mctx, dns_rdataset_t **rdatasetp) { dns_rdataset_t *rdataset; REQUIRE(mctx != NULL); @@ -753,8 +740,7 @@ getrdataset(isc_mem_t *mctx, dns_rdataset_t **rdatasetp) } static void -putrdataset(isc_mem_t *mctx, dns_rdataset_t **rdatasetp) -{ +putrdataset(isc_mem_t *mctx, dns_rdataset_t **rdatasetp) { dns_rdataset_t *rdataset; REQUIRE(rdatasetp != NULL); @@ -770,9 +756,8 @@ putrdataset(isc_mem_t *mctx, dns_rdataset_t **rdatasetp) } static void -fetch_done(isc_task_t *task, isc_event_t *event) -{ - resctx_t * rctx = event->ev_arg; +fetch_done(isc_task_t *task, isc_event_t *event) { + resctx_t *rctx = event->ev_arg; dns_fetchevent_t *fevent; REQUIRE(event->ev_type == DNS_EVENT_FETCHDONE); @@ -784,10 +769,9 @@ fetch_done(isc_task_t *task, isc_event_t *event) } static inline isc_result_t -start_fetch(resctx_t *rctx) -{ +start_fetch(resctx_t *rctx) { isc_result_t result; - int fopts = 0; + int fopts = 0; /* * The caller must be holding the rctx's lock. @@ -816,10 +800,9 @@ start_fetch(resctx_t *rctx) static isc_result_t view_find(resctx_t *rctx, dns_db_t **dbp, dns_dbnode_t **nodep, - dns_name_t *foundname) -{ - isc_result_t result; - dns_name_t * name = dns_fixedname_name(&rctx->name); + dns_name_t *foundname) { + isc_result_t result; + dns_name_t *name = dns_fixedname_name(&rctx->name); dns_rdatatype_t type; if (rctx->type == dns_rdatatype_rrsig) { @@ -836,20 +819,19 @@ view_find(resctx_t *rctx, dns_db_t **dbp, dns_dbnode_t **nodep, } static void -client_resfind(resctx_t *rctx, dns_fetchevent_t *event) -{ - isc_mem_t * mctx; - isc_result_t tresult, result = ISC_R_SUCCESS; - isc_result_t vresult = ISC_R_SUCCESS; - bool want_restart; - bool send_event = false; - dns_name_t * name, *prefix; - dns_fixedname_t foundname, fixed; - dns_rdataset_t * trdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; - unsigned int nlabels; - int order; - dns_namereln_t namereln; +client_resfind(resctx_t *rctx, dns_fetchevent_t *event) { + isc_mem_t *mctx; + isc_result_t tresult, result = ISC_R_SUCCESS; + isc_result_t vresult = ISC_R_SUCCESS; + bool want_restart; + bool send_event = false; + dns_name_t *name, *prefix; + dns_fixedname_t foundname, fixed; + dns_rdataset_t *trdataset; + dns_rdata_t rdata = DNS_RDATA_INIT; + unsigned int nlabels; + int order; + dns_namereln_t namereln; dns_rdata_cname_t cname; dns_rdata_dname_t dname; @@ -862,9 +844,9 @@ client_resfind(resctx_t *rctx, dns_fetchevent_t *event) name = dns_fixedname_name(&rctx->name); do { - dns_name_t * fname = NULL; - dns_name_t * ansname = NULL; - dns_db_t * db = NULL; + dns_name_t *fname = NULL; + dns_name_t *ansname = NULL; + dns_db_t *db = NULL; dns_dbnode_t *node = NULL; rctx->restarts++; @@ -1041,7 +1023,7 @@ client_resfind(resctx_t *rctx, dns_fetchevent_t *event) } if (rctx->type == dns_rdatatype_any) { - int n = 0; + int n = 0; dns_rdatasetiter_t *rdsiter = NULL; tresult = dns_db_allrdatasets(db, node, NULL, 0, @@ -1198,8 +1180,7 @@ client_resfind(resctx_t *rctx, dns_fetchevent_t *event) } static void -suspend(isc_task_t *task, isc_event_t *event) -{ +suspend(isc_task_t *task, isc_event_t *event) { isc_appctx_t *actx = event->ev_arg; UNUSED(task); @@ -1209,12 +1190,11 @@ suspend(isc_task_t *task, isc_event_t *event) } static void -resolve_done(isc_task_t *task, isc_event_t *event) -{ - resarg_t * resarg = event->ev_arg; +resolve_done(isc_task_t *task, isc_event_t *event) { + resarg_t *resarg = event->ev_arg; dns_clientresevent_t *rev = (dns_clientresevent_t *)event; - dns_name_t * name; - isc_result_t result; + dns_name_t *name; + isc_result_t result; UNUSED(task); @@ -1258,17 +1238,17 @@ resolve_done(isc_task_t *task, isc_event_t *event) isc_result_t dns_client_resolve(dns_client_t *client, const dns_name_t *name, dns_rdataclass_t rdclass, dns_rdatatype_t type, - unsigned int options, dns_namelist_t *namelist) -{ - isc_result_t result; + unsigned int options, dns_namelist_t *namelist) { + isc_result_t result; isc_appctx_t *actx; - resarg_t * resarg; + resarg_t *resarg; REQUIRE(DNS_CLIENT_VALID(client)); REQUIRE(namelist != NULL && ISC_LIST_EMPTY(*namelist)); if ((client->attributes & DNS_CLIENTATTR_OWNCTX) == 0 && - (options & DNS_CLIENTRESOPT_ALLOWRUN) == 0) { + (options & DNS_CLIENTRESOPT_ALLOWRUN) == 0) + { /* * If the client is run under application's control, we need * to create a new running (sub)environment for this @@ -1342,15 +1322,14 @@ dns_client_startresolve(dns_client_t *client, const dns_name_t *name, dns_rdataclass_t rdclass, dns_rdatatype_t type, unsigned int options, isc_task_t *task, isc_taskaction_t action, void *arg, - dns_clientrestrans_t **transp) -{ - dns_view_t * view = NULL; + dns_clientrestrans_t **transp) { + dns_view_t *view = NULL; dns_clientresevent_t *event = NULL; - resctx_t * rctx = NULL; - isc_task_t * tclone = NULL; - isc_mem_t * mctx; - isc_result_t result; - dns_rdataset_t * rdataset, *sigrdataset; + resctx_t *rctx = NULL; + isc_task_t *tclone = NULL; + isc_mem_t *mctx; + isc_result_t result; + dns_rdataset_t *rdataset, *sigrdataset; bool want_dnssec, want_validation, want_cdflag, want_tcp; REQUIRE(DNS_CLIENT_VALID(client)); @@ -1449,8 +1428,7 @@ cleanup: } void -dns_client_cancelresolve(dns_clientrestrans_t *trans) -{ +dns_client_cancelresolve(dns_clientrestrans_t *trans) { resctx_t *rctx; REQUIRE(trans != NULL); @@ -1470,9 +1448,8 @@ dns_client_cancelresolve(dns_clientrestrans_t *trans) } void -dns_client_freeresanswer(dns_client_t *client, dns_namelist_t *namelist) -{ - dns_name_t * name; +dns_client_freeresanswer(dns_client_t *client, dns_namelist_t *namelist) { + dns_name_t *name; dns_rdataset_t *rdataset; REQUIRE(DNS_CLIENT_VALID(client)); @@ -1490,10 +1467,9 @@ dns_client_freeresanswer(dns_client_t *client, dns_namelist_t *namelist) } void -dns_client_destroyrestrans(dns_clientrestrans_t **transp) -{ - resctx_t * rctx; - isc_mem_t * mctx; +dns_client_destroyrestrans(dns_clientrestrans_t **transp) { + resctx_t *rctx; + isc_mem_t *mctx; dns_client_t *client; REQUIRE(transp != NULL); @@ -1535,18 +1511,17 @@ dns_client_destroyrestrans(dns_clientrestrans_t **transp) isc_result_t dns_client_addtrustedkey(dns_client_t *client, dns_rdataclass_t rdclass, dns_rdatatype_t rdtype, const dns_name_t *keyname, - isc_buffer_t *databuf) -{ - isc_result_t result; - dns_view_t * view = NULL; - dns_keytable_t * secroots = NULL; - dns_name_t * name = NULL; - char dsbuf[DNS_DS_BUFFERSIZE]; - unsigned char digest[ISC_MAX_MD_SIZE]; - dns_rdata_ds_t ds; + isc_buffer_t *databuf) { + isc_result_t result; + dns_view_t *view = NULL; + dns_keytable_t *secroots = NULL; + dns_name_t *name = NULL; + char dsbuf[DNS_DS_BUFFERSIZE]; + unsigned char digest[ISC_MAX_MD_SIZE]; + dns_rdata_ds_t ds; dns_decompress_t dctx; - dns_rdata_t rdata; - isc_buffer_t b; + dns_rdata_t rdata; + isc_buffer_t b; REQUIRE(DNS_CLIENT_VALID(client)); @@ -1596,12 +1571,11 @@ cleanup: * Simple request routines */ static void -request_done(isc_task_t *task, isc_event_t *event) -{ +request_done(isc_task_t *task, isc_event_t *event) { dns_requestevent_t *reqev = NULL; - dns_request_t * request; - isc_result_t result, eresult; - reqctx_t * ctx; + dns_request_t *request; + isc_result_t result, eresult; + reqctx_t *ctx; UNUSED(task); @@ -1638,9 +1612,8 @@ request_done(isc_task_t *task, isc_event_t *event) } static void -localrequest_done(isc_task_t *task, isc_event_t *event) -{ - reqarg_t * reqarg = event->ev_arg; +localrequest_done(isc_task_t *task, isc_event_t *event) { + reqarg_t *reqarg = event->ev_arg; dns_clientreqevent_t *rev = (dns_clientreqevent_t *)event; UNUSED(task); @@ -1674,18 +1647,18 @@ dns_client_request(dns_client_t *client, dns_message_t *qmessage, dns_message_t *rmessage, const isc_sockaddr_t *server, unsigned int options, unsigned int parseoptions, dns_tsec_t *tsec, unsigned int timeout, - unsigned int udptimeout, unsigned int udpretries) -{ + unsigned int udptimeout, unsigned int udpretries) { isc_appctx_t *actx; - reqarg_t * reqarg; - isc_result_t result; + reqarg_t *reqarg; + isc_result_t result; REQUIRE(DNS_CLIENT_VALID(client)); REQUIRE(qmessage != NULL); REQUIRE(rmessage != NULL); if ((client->attributes & DNS_CLIENTATTR_OWNCTX) == 0 && - (options & DNS_CLIENTREQOPT_ALLOWRUN) == 0) { + (options & DNS_CLIENTREQOPT_ALLOWRUN) == 0) + { /* * If the client is run under application's control, we need * to create a new running (sub)environment for this @@ -1753,15 +1726,14 @@ dns_client_startrequest(dns_client_t *client, dns_message_t *qmessage, dns_tsec_t *tsec, unsigned int timeout, unsigned int udptimeout, unsigned int udpretries, isc_task_t *task, isc_taskaction_t action, void *arg, - dns_clientreqtrans_t **transp) -{ - isc_result_t result; - dns_view_t * view = NULL; - isc_task_t * tclone = NULL; + dns_clientreqtrans_t **transp) { + isc_result_t result; + dns_view_t *view = NULL; + isc_task_t *tclone = NULL; dns_clientreqevent_t *event = NULL; - reqctx_t * ctx = NULL; - dns_tsectype_t tsectype = dns_tsectype_none; - unsigned int reqoptions; + reqctx_t *ctx = NULL; + dns_tsectype_t tsectype = dns_tsectype_none; + unsigned int reqoptions; REQUIRE(DNS_CLIENT_VALID(client)); REQUIRE(qmessage != NULL); @@ -1842,8 +1814,7 @@ dns_client_startrequest(dns_client_t *client, dns_message_t *qmessage, } void -dns_client_cancelrequest(dns_clientreqtrans_t *trans) -{ +dns_client_cancelrequest(dns_clientreqtrans_t *trans) { reqctx_t *ctx; REQUIRE(trans != NULL); @@ -1863,10 +1834,9 @@ dns_client_cancelrequest(dns_clientreqtrans_t *trans) } void -dns_client_destroyreqtrans(dns_clientreqtrans_t **transp) -{ - reqctx_t * ctx; - isc_mem_t * mctx; +dns_client_destroyreqtrans(dns_clientreqtrans_t **transp) { + reqctx_t *ctx; + isc_mem_t *mctx; dns_client_t *client; REQUIRE(transp != NULL); @@ -1900,8 +1870,7 @@ dns_client_destroyreqtrans(dns_clientreqtrans_t **transp) * Dynamic update routines */ static isc_result_t -rcode2result(dns_rcode_t rcode) -{ +rcode2result(dns_rcode_t rcode) { /* XXX: isn't there a similar function? */ switch (rcode) { case dns_rcode_formerr: @@ -1932,8 +1901,7 @@ rcode2result(dns_rcode_t rcode) } static void -update_sendevent(updatectx_t *uctx, isc_result_t result) -{ +update_sendevent(updatectx_t *uctx, isc_result_t result) { isc_task_t *task; dns_message_destroy(&uctx->updatemsg); @@ -1956,15 +1924,14 @@ update_sendevent(updatectx_t *uctx, isc_result_t result) } static void -update_done(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result; +update_done(isc_task_t *task, isc_event_t *event) { + isc_result_t result; dns_requestevent_t *reqev = NULL; - dns_request_t * request; - dns_message_t * answer = NULL; - updatectx_t * uctx = event->ev_arg; - dns_client_t * client; - unsigned int timeout, reqoptions; + dns_request_t *request; + dns_message_t *answer = NULL; + updatectx_t *uctx = event->ev_arg; + dns_client_t *client; + unsigned int timeout, reqoptions; UNUSED(task); @@ -2014,7 +1981,8 @@ out: if (result != ISC_R_SUCCESS && result != DNS_R_NXDOMAIN && result != DNS_R_YXDOMAIN && result != DNS_R_YXRRSET && result != DNS_R_NXRRSET && result != DNS_R_NOTZONE && - !uctx->canceled && uctx->currentserver != NULL) { + !uctx->canceled && uctx->currentserver != NULL) + { dns_message_renderreset(uctx->updatemsg); dns_message_settsigkey(uctx->updatemsg, NULL); @@ -2047,13 +2015,12 @@ out: } static isc_result_t -send_update(updatectx_t *uctx) -{ - isc_result_t result; - dns_name_t * name = NULL; +send_update(updatectx_t *uctx) { + isc_result_t result; + dns_name_t *name = NULL; dns_rdataset_t *rdataset = NULL; - dns_client_t * client = uctx->client; - unsigned int timeout, reqoptions; + dns_client_t *client = uctx->client; + unsigned int timeout, reqoptions; REQUIRE(uctx->zonename != NULL && uctx->currentserver != NULL); @@ -2100,16 +2067,15 @@ send_update(updatectx_t *uctx) } static void -resolveaddr_done(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result; - int family; - dns_rdatatype_t qtype; +resolveaddr_done(isc_task_t *task, isc_event_t *event) { + isc_result_t result; + int family; + dns_rdatatype_t qtype; dns_clientresevent_t *rev = (dns_clientresevent_t *)event; - dns_name_t * name; - dns_rdataset_t * rdataset; - updatectx_t * uctx; - bool completed = false; + dns_name_t *name; + dns_rdataset_t *rdataset; + updatectx_t *uctx; + bool completed = false; UNUSED(task); @@ -2138,9 +2104,11 @@ resolveaddr_done(isc_task_t *task, isc_event_t *event) } for (name = ISC_LIST_HEAD(rev->answerlist); name != NULL; - name = ISC_LIST_NEXT(name, link)) { + name = ISC_LIST_NEXT(name, link)) + { for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (!dns_rdataset_isassociated(rdataset)) { continue; } @@ -2150,11 +2118,12 @@ resolveaddr_done(isc_task_t *task, isc_event_t *event) for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { - dns_rdata_t rdata; - dns_rdata_in_a_t rdata_a; + result = dns_rdataset_next(rdataset)) + { + dns_rdata_t rdata; + dns_rdata_in_a_t rdata_a; dns_rdata_in_aaaa_t rdata_aaaa; - isc_sockaddr_t * sa; + isc_sockaddr_t *sa; sa = isc_mem_get(uctx->client->mctx, sizeof(*sa)); @@ -2214,13 +2183,12 @@ done: static isc_result_t process_soa(updatectx_t *uctx, dns_rdataset_t *soaset, - const dns_name_t *soaname) -{ - isc_result_t result; - dns_rdata_t soarr = DNS_RDATA_INIT; + const dns_name_t *soaname) { + isc_result_t result; + dns_rdata_t soarr = DNS_RDATA_INIT; dns_rdata_soa_t soa; - dns_name_t primary; - unsigned int resoptions; + dns_name_t primary; + unsigned int resoptions; result = dns_rdataset_first(soaset); if (result != ISC_R_SUCCESS) { @@ -2275,24 +2243,23 @@ process_soa(updatectx_t *uctx, dns_rdataset_t *soaset, } static void -receive_soa(isc_task_t *task, isc_event_t *event) -{ +receive_soa(isc_task_t *task, isc_event_t *event) { dns_requestevent_t *reqev = NULL; - updatectx_t * uctx; - dns_client_t * client; - isc_result_t result, eresult; - dns_request_t * request; - dns_message_t * rcvmsg = NULL; - dns_section_t section; - dns_rdataset_t * soaset = NULL; - int pass = 0; - dns_name_t * name; - dns_message_t * soaquery = NULL; - isc_sockaddr_t * addr; - bool seencname = false; - bool droplabel = false; - dns_name_t tname; - unsigned int nlabels, reqoptions; + updatectx_t *uctx; + dns_client_t *client; + isc_result_t result, eresult; + dns_request_t *request; + dns_message_t *rcvmsg = NULL; + dns_section_t section; + dns_rdataset_t *soaset = NULL; + int pass = 0; + dns_name_t *name; + dns_message_t *soaquery = NULL; + isc_sockaddr_t *addr; + bool seencname = false; + bool droplabel = false; + dns_name_t tname; + unsigned int nlabels, reqoptions; UNUSED(task); @@ -2386,7 +2353,8 @@ lookforsoa: if (dns_message_findtype(name, dns_rdatatype_cname, 0, &tset) == ISC_R_SUCCESS || dns_message_findtype(name, dns_rdatatype_dname, 0, - &tset) == ISC_R_SUCCESS) { + &tset) == ISC_R_SUCCESS) + { seencname = true; break; } @@ -2456,13 +2424,12 @@ out: } static isc_result_t -request_soa(updatectx_t *uctx) -{ - isc_result_t result; - dns_message_t * soaquery = uctx->soaquery; - dns_name_t * name = NULL; +request_soa(updatectx_t *uctx) { + isc_result_t result; + dns_message_t *soaquery = uctx->soaquery; + dns_name_t *name = NULL; dns_rdataset_t *rdataset = NULL; - unsigned int reqoptions; + unsigned int reqoptions; if (soaquery == NULL) { result = dns_message_create(uctx->client->mctx, @@ -2516,14 +2483,13 @@ fail: } static void -resolvesoa_done(isc_task_t *task, isc_event_t *event) -{ +resolvesoa_done(isc_task_t *task, isc_event_t *event) { dns_clientresevent_t *rev = (dns_clientresevent_t *)event; - updatectx_t * uctx; - dns_name_t * name, tname; - dns_rdataset_t * rdataset = NULL; - isc_result_t result = rev->result; - unsigned int nlabels, resoptions; + updatectx_t *uctx; + dns_name_t *name, tname; + dns_rdataset_t *rdataset = NULL; + isc_result_t result = rev->result; + unsigned int nlabels, resoptions; UNUSED(task); @@ -2536,15 +2502,18 @@ resolvesoa_done(isc_task_t *task, isc_event_t *event) uctx = event->ev_arg; if (result != ISC_R_SUCCESS && result != DNS_R_NCACHENXDOMAIN && - result != DNS_R_NCACHENXRRSET) { + result != DNS_R_NCACHENXRRSET) + { /* XXX: what about DNSSEC failure? */ goto out; } for (name = ISC_LIST_HEAD(rev->answerlist); name != NULL; - name = ISC_LIST_NEXT(name, link)) { + name = ISC_LIST_NEXT(name, link)) + { for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (dns_rdataset_isassociated(rdataset) && rdataset->type == dns_rdatatype_soa) { break; @@ -2587,15 +2556,14 @@ out: static isc_result_t copy_name(isc_mem_t *mctx, dns_message_t *msg, const dns_name_t *name, - dns_name_t **newnamep) -{ - isc_result_t result; - dns_name_t * newname = NULL; - isc_region_t r; - isc_buffer_t * namebuf = NULL, *rdatabuf = NULL; + dns_name_t **newnamep) { + isc_result_t result; + dns_name_t *newname = NULL; + isc_region_t r; + isc_buffer_t *namebuf = NULL, *rdatabuf = NULL; dns_rdatalist_t *rdatalist; - dns_rdataset_t * rdataset, *newrdataset; - dns_rdata_t rdata = DNS_RDATA_INIT, *newrdata; + dns_rdataset_t *rdataset, *newrdataset; + dns_rdata_t rdata = DNS_RDATA_INIT, *newrdata; result = dns_message_gettempname(msg, &newname); if (result != ISC_R_SUCCESS) { @@ -2608,7 +2576,8 @@ copy_name(isc_mem_t *mctx, dns_message_t *msg, const dns_name_t *name, dns_name_copynf(name, newname); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { rdatalist = NULL; result = dns_message_gettemprdatalist(msg, &rdatalist); if (result != ISC_R_SUCCESS) { @@ -2667,9 +2636,8 @@ fail: } static void -internal_update_callback(isc_task_t *task, isc_event_t *event) -{ - updatearg_t * uarg = event->ev_arg; +internal_update_callback(isc_task_t *task, isc_event_t *event) { + updatearg_t *uarg = event->ev_arg; dns_clientupdateevent_t *uev = (dns_clientupdateevent_t *)event; UNUSED(task); @@ -2701,16 +2669,16 @@ isc_result_t dns_client_update(dns_client_t *client, dns_rdataclass_t rdclass, const dns_name_t *zonename, dns_namelist_t *prerequisites, dns_namelist_t *updates, isc_sockaddrlist_t *servers, - dns_tsec_t *tsec, unsigned int options) -{ - isc_result_t result; + dns_tsec_t *tsec, unsigned int options) { + isc_result_t result; isc_appctx_t *actx; - updatearg_t * uarg; + updatearg_t *uarg; REQUIRE(DNS_CLIENT_VALID(client)); if ((client->attributes & DNS_CLIENTATTR_OWNCTX) == 0 && - (options & DNS_CLIENTUPDOPT_ALLOWRUN) == 0) { + (options & DNS_CLIENTUPDOPT_ALLOWRUN) == 0) + { /* * If the client is run under application's control, we need * to create a new running (sub)environment for this @@ -2774,8 +2742,7 @@ dns_client_update(dns_client_t *client, dns_rdataclass_t rdclass, } static void -startupdate(isc_task_t *task, isc_event_t *event) -{ +startupdate(isc_task_t *task, isc_event_t *event) { updatectx_t *uctx; isc_result_t result; unsigned int resoptions; @@ -2826,17 +2793,16 @@ dns_client_startupdate(dns_client_t *client, dns_rdataclass_t rdclass, isc_sockaddrlist_t *servers, dns_tsec_t *tsec, unsigned int options, isc_task_t *task, isc_taskaction_t action, void *arg, - dns_clientupdatetrans_t **transp) -{ - dns_view_t * view = NULL; - isc_result_t result; - dns_name_t * name, *newname; - updatectx_t * uctx; - isc_task_t * tclone = NULL; - dns_section_t section = DNS_SECTION_UPDATE; + dns_clientupdatetrans_t **transp) { + dns_view_t *view = NULL; + isc_result_t result; + dns_name_t *name, *newname; + updatectx_t *uctx; + isc_task_t *tclone = NULL; + dns_section_t section = DNS_SECTION_UPDATE; isc_sockaddr_t *server, *sa = NULL; - dns_tsectype_t tsectype = dns_tsectype_none; - bool want_tcp; + dns_tsectype_t tsectype = dns_tsectype_none; + bool want_tcp; UNUSED(options); @@ -2908,7 +2874,8 @@ dns_client_startupdate(dns_client_t *client, dns_rdataclass_t rdclass, } if (servers != NULL) { for (server = ISC_LIST_HEAD(*servers); server != NULL; - server = ISC_LIST_NEXT(server, link)) { + server = ISC_LIST_NEXT(server, link)) + { sa = isc_mem_get(client->mctx, sizeof(*sa)); sa->type = server->type; sa->length = server->length; @@ -2931,7 +2898,8 @@ dns_client_startupdate(dns_client_t *client, dns_rdataclass_t rdclass, if (prerequisites != NULL) { for (name = ISC_LIST_HEAD(*prerequisites); name != NULL; - name = ISC_LIST_NEXT(name, link)) { + name = ISC_LIST_NEXT(name, link)) + { newname = NULL; result = copy_name(client->mctx, uctx->updatemsg, name, &newname); @@ -2944,7 +2912,8 @@ dns_client_startupdate(dns_client_t *client, dns_rdataclass_t rdclass, } for (name = ISC_LIST_HEAD(*updates); name != NULL; - name = ISC_LIST_NEXT(name, link)) { + name = ISC_LIST_NEXT(name, link)) + { newname = NULL; result = copy_name(client->mctx, uctx->updatemsg, name, &newname); @@ -3020,8 +2989,7 @@ fail: } void -dns_client_cancelupdate(dns_clientupdatetrans_t *trans) -{ +dns_client_cancelupdate(dns_clientupdatetrans_t *trans) { updatectx_t *uctx; REQUIRE(trans != NULL); @@ -3050,11 +3018,10 @@ dns_client_cancelupdate(dns_clientupdatetrans_t *trans) } void -dns_client_destroyupdatetrans(dns_clientupdatetrans_t **transp) -{ - updatectx_t * uctx; - isc_mem_t * mctx; - dns_client_t * client; +dns_client_destroyupdatetrans(dns_clientupdatetrans_t **transp) { + updatectx_t *uctx; + isc_mem_t *mctx; + dns_client_t *client; isc_sockaddr_t *sa; REQUIRE(transp != NULL); @@ -3091,20 +3058,19 @@ dns_client_destroyupdatetrans(dns_clientupdatetrans_t **transp) } isc_mem_t * -dns_client_mctx(dns_client_t *client) -{ +dns_client_mctx(dns_client_t *client) { REQUIRE(DNS_CLIENT_VALID(client)); return (client->mctx); } typedef struct { - isc_buffer_t buffer; - dns_rdataset_t rdataset; + isc_buffer_t buffer; + dns_rdataset_t rdataset; dns_rdatalist_t rdatalist; - dns_rdata_t rdata; - size_t size; - isc_mem_t * mctx; - unsigned char data[FLEXIBLE_ARRAY_MEMBER]; + dns_rdata_t rdata; + size_t size; + isc_mem_t *mctx; + unsigned char data[FLEXIBLE_ARRAY_MEMBER]; } dns_client_updaterec_t; isc_result_t @@ -3112,10 +3078,9 @@ dns_client_updaterec(dns_client_updateop_t op, const dns_name_t *owner, dns_rdatatype_t type, dns_rdata_t *source, dns_ttl_t ttl, dns_name_t *target, dns_rdataset_t *rdataset, dns_rdatalist_t *rdatalist, dns_rdata_t *rdata, - isc_mem_t *mctx) -{ + isc_mem_t *mctx) { dns_client_updaterec_t *updaterec = NULL; - size_t size = offsetof(dns_client_updaterec_t, data); + size_t size = offsetof(dns_client_updaterec_t, data); REQUIRE(op < updateop_max); REQUIRE(owner != NULL); @@ -3210,19 +3175,19 @@ dns_client_updaterec(dns_client_updateop_t op, const dns_name_t *owner, } void -dns_client_freeupdate(dns_name_t **namep) -{ +dns_client_freeupdate(dns_name_t **namep) { dns_client_updaterec_t *updaterec; - dns_rdatalist_t * rdatalist; - dns_rdataset_t * rdataset; - dns_rdata_t * rdata; - dns_name_t * name; + dns_rdatalist_t *rdatalist; + dns_rdataset_t *rdataset; + dns_rdata_t *rdata; + dns_name_t *name; REQUIRE(namep != NULL && *namep != NULL); name = *namep; for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_HEAD(name->list)) { + rdataset = ISC_LIST_HEAD(name->list)) + { ISC_LIST_UNLINK(name->list, rdataset, link); rdatalist = NULL; dns_rdatalist_fromrdataset(rdataset, &rdatalist); @@ -3231,7 +3196,8 @@ dns_client_freeupdate(dns_name_t **namep) continue; } for (rdata = ISC_LIST_HEAD(rdatalist->rdata); rdata != NULL; - rdata = ISC_LIST_HEAD(rdatalist->rdata)) { + rdata = ISC_LIST_HEAD(rdatalist->rdata)) + { ISC_LIST_UNLINK(rdatalist->rdata, rdata, link); } dns_rdataset_disassociate(rdataset); diff --git a/lib/dns/clientinfo.c b/lib/dns/clientinfo.c index f1feee7026..a115b12143 100644 --- a/lib/dns/clientinfo.c +++ b/lib/dns/clientinfo.c @@ -14,17 +14,15 @@ #include void -dns_clientinfomethods_init(dns_clientinfomethods_t * methods, - dns_clientinfo_sourceip_t sourceip) -{ +dns_clientinfomethods_init(dns_clientinfomethods_t *methods, + dns_clientinfo_sourceip_t sourceip) { methods->version = DNS_CLIENTINFOMETHODS_VERSION; methods->age = DNS_CLIENTINFOMETHODS_AGE; methods->sourceip = sourceip; } void -dns_clientinfo_init(dns_clientinfo_t *ci, void *data, void *versionp) -{ +dns_clientinfo_init(dns_clientinfo_t *ci, void *data, void *versionp) { ci->version = DNS_CLIENTINFO_VERSION; ci->data = data; ci->dbversion = versionp; diff --git a/lib/dns/compress.c b/lib/dns/compress.c index 1e0778cc47..7ea40b36a6 100644 --- a/lib/dns/compress.c +++ b/lib/dns/compress.c @@ -25,10 +25,10 @@ #include #include -#define CCTX_MAGIC ISC_MAGIC('C', 'C', 'T', 'X') +#define CCTX_MAGIC ISC_MAGIC('C', 'C', 'T', 'X') #define VALID_CCTX(x) ISC_MAGIC_VALID(x, CCTX_MAGIC) -#define DCTX_MAGIC ISC_MAGIC('D', 'C', 'T', 'X') +#define DCTX_MAGIC ISC_MAGIC('D', 'C', 'T', 'X') #define VALID_DCTX(x) ISC_MAGIC_VALID(x, DCTX_MAGIC) static unsigned char maptolower[] = { @@ -121,8 +121,7 @@ static unsigned char tableindex[256] = { ***/ isc_result_t -dns_compress_init(dns_compress_t *cctx, int edns, isc_mem_t *mctx) -{ +dns_compress_init(dns_compress_t *cctx, int edns, isc_mem_t *mctx) { REQUIRE(cctx != NULL); REQUIRE(mctx != NULL); /* See: rdataset.c:towiresorted(). */ @@ -139,10 +138,9 @@ dns_compress_init(dns_compress_t *cctx, int edns, isc_mem_t *mctx) } void -dns_compress_invalidate(dns_compress_t *cctx) -{ +dns_compress_invalidate(dns_compress_t *cctx) { dns_compressnode_t *node; - unsigned int i; + unsigned int i; REQUIRE(VALID_CCTX(cctx)); @@ -167,8 +165,7 @@ dns_compress_invalidate(dns_compress_t *cctx) } void -dns_compress_setmethods(dns_compress_t *cctx, unsigned int allowed) -{ +dns_compress_setmethods(dns_compress_t *cctx, unsigned int allowed) { REQUIRE(VALID_CCTX(cctx)); cctx->allowed &= ~DNS_COMPRESS_ALL; @@ -176,22 +173,19 @@ dns_compress_setmethods(dns_compress_t *cctx, unsigned int allowed) } unsigned int -dns_compress_getmethods(dns_compress_t *cctx) -{ +dns_compress_getmethods(dns_compress_t *cctx) { REQUIRE(VALID_CCTX(cctx)); return (cctx->allowed & DNS_COMPRESS_ALL); } void -dns_compress_disable(dns_compress_t *cctx) -{ +dns_compress_disable(dns_compress_t *cctx) { REQUIRE(VALID_CCTX(cctx)); cctx->allowed &= ~DNS_COMPRESS_ENABLED; } void -dns_compress_setsensitive(dns_compress_t *cctx, bool sensitive) -{ +dns_compress_setsensitive(dns_compress_t *cctx, bool sensitive) { REQUIRE(VALID_CCTX(cctx)); if (sensitive) { @@ -202,16 +196,14 @@ dns_compress_setsensitive(dns_compress_t *cctx, bool sensitive) } bool -dns_compress_getsensitive(dns_compress_t *cctx) -{ +dns_compress_getsensitive(dns_compress_t *cctx) { REQUIRE(VALID_CCTX(cctx)); return (cctx->allowed & DNS_COMPRESS_CASESENSITIVE); } int -dns_compress_getedns(dns_compress_t *cctx) -{ +dns_compress_getedns(dns_compress_t *cctx) { REQUIRE(VALID_CCTX(cctx)); return (cctx->edns); } @@ -223,13 +215,12 @@ dns_compress_getedns(dns_compress_t *cctx) */ bool dns_compress_findglobal(dns_compress_t *cctx, const dns_name_t *name, - dns_name_t *prefix, uint16_t *offset) -{ - dns_name_t tname; + dns_name_t *prefix, uint16_t *offset) { + dns_name_t tname; dns_compressnode_t *node = NULL; - unsigned int labels, i, n; - unsigned int numlabels; - unsigned char * p; + unsigned int labels, i, n; + unsigned int numlabels; + unsigned char *p; REQUIRE(VALID_CCTX(cctx)); REQUIRE(dns_name_isabsolute(name) == true); @@ -253,7 +244,7 @@ dns_compress_findglobal(dns_compress_t *cctx, const dns_name_t *name, for (n = 0; n < numlabels - 1; n++) { unsigned char ch, llen; - unsigned int firstoffset, length; + unsigned int firstoffset, length; firstoffset = (unsigned int)(p - name->ndata); length = name->length - firstoffset; @@ -280,8 +271,8 @@ dns_compress_findglobal(dns_compress_t *cctx, const dns_name_t *name, } else { for (node = cctx->table[i]; node != NULL; node = node->next) { - unsigned int l, count; - unsigned char c; + unsigned int l, count; + unsigned char c; unsigned char *label1, *label2; if (ISC_UNLIKELY(node->name.length != length)) { @@ -307,23 +298,23 @@ dns_compress_findglobal(dns_compress_t *cctx, const dns_name_t *name, /* Loop unrolled for performance */ while (ISC_LIKELY(count > 3)) { c = maptolower[label1[0]]; - if (c != - maptolower[label2[0]]) { + if (c != maptolower[label2[0]]) + { goto cont1; } c = maptolower[label1[1]]; - if (c != - maptolower[label2[1]]) { + if (c != maptolower[label2[1]]) + { goto cont1; } c = maptolower[label1[2]]; - if (c != - maptolower[label2[2]]) { + if (c != maptolower[label2[2]]) + { goto cont1; } c = maptolower[label1[3]]; - if (c != - maptolower[label2[3]]) { + if (c != maptolower[label2[3]]) + { goto cont1; } count -= 4; @@ -332,8 +323,8 @@ dns_compress_findglobal(dns_compress_t *cctx, const dns_name_t *name, } while (ISC_LIKELY(count-- > 0)) { c = maptolower[*label1++]; - if (c != - maptolower[*label2++]) { + if (c != maptolower[*label2++]) + { goto cont1; } } @@ -371,8 +362,7 @@ found: } static inline unsigned int -name_length(const dns_name_t *name) -{ +name_length(const dns_name_t *name) { isc_region_t r; dns_name_toregion(name, &r); return (r.length); @@ -380,19 +370,18 @@ name_length(const dns_name_t *name) void dns_compress_add(dns_compress_t *cctx, const dns_name_t *name, - const dns_name_t *prefix, uint16_t offset) -{ - dns_name_t tname, xname; - unsigned int start; - unsigned int n; - unsigned int count; - unsigned int i; + const dns_name_t *prefix, uint16_t offset) { + dns_name_t tname, xname; + unsigned int start; + unsigned int n; + unsigned int count; + unsigned int i; dns_compressnode_t *node; - unsigned int length; - unsigned int tlength; - uint16_t toffset; - unsigned char * tmp; - isc_region_t r; + unsigned int length; + unsigned int tlength; + uint16_t toffset; + unsigned char *tmp; + isc_region_t r; REQUIRE(VALID_CCTX(cctx)); REQUIRE(dns_name_isabsolute(name)); @@ -482,9 +471,8 @@ dns_compress_add(dns_compress_t *cctx, const dns_name_t *name, } void -dns_compress_rollback(dns_compress_t *cctx, uint16_t offset) -{ - unsigned int i; +dns_compress_rollback(dns_compress_t *cctx, uint16_t offset) { + unsigned int i; dns_compressnode_t *node; REQUIRE(VALID_CCTX(cctx)); @@ -521,8 +509,8 @@ dns_compress_rollback(dns_compress_t *cctx, uint16_t offset) ***/ void -dns_decompress_init(dns_decompress_t *dctx, int edns, dns_decompresstype_t type) -{ +dns_decompress_init(dns_decompress_t *dctx, int edns, + dns_decompresstype_t type) { REQUIRE(dctx != NULL); REQUIRE(edns >= -1 && edns <= 255); @@ -533,16 +521,14 @@ dns_decompress_init(dns_decompress_t *dctx, int edns, dns_decompresstype_t type) } void -dns_decompress_invalidate(dns_decompress_t *dctx) -{ +dns_decompress_invalidate(dns_decompress_t *dctx) { REQUIRE(VALID_DCTX(dctx)); dctx->magic = 0; } void -dns_decompress_setmethods(dns_decompress_t *dctx, unsigned int allowed) -{ +dns_decompress_setmethods(dns_decompress_t *dctx, unsigned int allowed) { REQUIRE(VALID_DCTX(dctx)); switch (dctx->type) { @@ -559,24 +545,21 @@ dns_decompress_setmethods(dns_decompress_t *dctx, unsigned int allowed) } unsigned int -dns_decompress_getmethods(dns_decompress_t *dctx) -{ +dns_decompress_getmethods(dns_decompress_t *dctx) { REQUIRE(VALID_DCTX(dctx)); return (dctx->allowed); } int -dns_decompress_edns(dns_decompress_t *dctx) -{ +dns_decompress_edns(dns_decompress_t *dctx) { REQUIRE(VALID_DCTX(dctx)); return (dctx->edns); } dns_decompresstype_t -dns_decompress_type(dns_decompress_t *dctx) -{ +dns_decompress_type(dns_decompress_t *dctx) { REQUIRE(VALID_DCTX(dctx)); return (dctx->type); diff --git a/lib/dns/db.c b/lib/dns/db.c index 0691f3160f..e7dbb60984 100644 --- a/lib/dns/db.c +++ b/lib/dns/db.c @@ -41,10 +41,10 @@ ***/ struct dns_dbimplementation { - const char * name; + const char *name; dns_dbcreatefunc_t create; - isc_mem_t * mctx; - void * driverarg; + isc_mem_t *mctx; + void *driverarg; ISC_LINK(dns_dbimplementation_t) link; }; @@ -60,13 +60,12 @@ struct dns_dbimplementation { static ISC_LIST(dns_dbimplementation_t) implementations; static isc_rwlock_t implock; -static isc_once_t once = ISC_ONCE_INIT; +static isc_once_t once = ISC_ONCE_INIT; static dns_dbimplementation_t rbtimp; static void -initialize(void) -{ +initialize(void) { RUNTIME_CHECK(isc_rwlock_init(&implock, 0, 0) == ISC_R_SUCCESS); rbtimp.name = "rbt"; @@ -80,12 +79,12 @@ initialize(void) } static inline dns_dbimplementation_t * -impfind(const char *name) -{ +impfind(const char *name) { dns_dbimplementation_t *imp; for (imp = ISC_LIST_HEAD(implementations); imp != NULL; - imp = ISC_LIST_NEXT(imp, link)) { + imp = ISC_LIST_NEXT(imp, link)) + { if (strcasecmp(name, imp->name) == 0) { return (imp); } @@ -100,8 +99,7 @@ impfind(const char *name) isc_result_t dns_db_create(isc_mem_t *mctx, const char *db_type, const dns_name_t *origin, dns_dbtype_t type, dns_rdataclass_t rdclass, unsigned int argc, - char *argv[], dns_db_t **dbp) -{ + char *argv[], dns_db_t **dbp) { dns_dbimplementation_t *impinfo; RUNTIME_CHECK(isc_once_do(&once, initialize) == ISC_R_SUCCESS); @@ -132,8 +130,7 @@ dns_db_create(isc_mem_t *mctx, const char *db_type, const dns_name_t *origin, } void -dns_db_attach(dns_db_t *source, dns_db_t **targetp) -{ +dns_db_attach(dns_db_t *source, dns_db_t **targetp) { /* * Attach *targetp to source. */ @@ -147,8 +144,7 @@ dns_db_attach(dns_db_t *source, dns_db_t **targetp) } void -dns_db_detach(dns_db_t **dbp) -{ +dns_db_detach(dns_db_t **dbp) { /* * Detach *dbp from its database. */ @@ -162,8 +158,7 @@ dns_db_detach(dns_db_t **dbp) } bool -dns_db_iscache(dns_db_t *db) -{ +dns_db_iscache(dns_db_t *db) { /* * Does 'db' have cache semantics? */ @@ -178,8 +173,7 @@ dns_db_iscache(dns_db_t *db) } bool -dns_db_iszone(dns_db_t *db) -{ +dns_db_iszone(dns_db_t *db) { /* * Does 'db' have zone semantics? */ @@ -194,8 +188,7 @@ dns_db_iszone(dns_db_t *db) } bool -dns_db_isstub(dns_db_t *db) -{ +dns_db_isstub(dns_db_t *db) { /* * Does 'db' have stub semantics? */ @@ -210,8 +203,7 @@ dns_db_isstub(dns_db_t *db) } bool -dns_db_isdnssec(dns_db_t *db) -{ +dns_db_isdnssec(dns_db_t *db) { /* * Is 'db' secure or partially secure? */ @@ -226,8 +218,7 @@ dns_db_isdnssec(dns_db_t *db) } bool -dns_db_issecure(dns_db_t *db) -{ +dns_db_issecure(dns_db_t *db) { /* * Is 'db' secure? */ @@ -239,8 +230,7 @@ dns_db_issecure(dns_db_t *db) } bool -dns_db_ispersistent(dns_db_t *db) -{ +dns_db_ispersistent(dns_db_t *db) { /* * Is 'db' persistent? */ @@ -251,8 +241,7 @@ dns_db_ispersistent(dns_db_t *db) } dns_name_t * -dns_db_origin(dns_db_t *db) -{ +dns_db_origin(dns_db_t *db) { /* * The origin of the database. */ @@ -263,8 +252,7 @@ dns_db_origin(dns_db_t *db) } dns_rdataclass_t -dns_db_class(dns_db_t *db) -{ +dns_db_class(dns_db_t *db) { /* * The class of the database. */ @@ -275,8 +263,7 @@ dns_db_class(dns_db_t *db) } isc_result_t -dns_db_beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) -{ +dns_db_beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) { /* * Begin loading 'db'. */ @@ -288,8 +275,7 @@ dns_db_beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) } isc_result_t -dns_db_endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) -{ +dns_db_endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) { dns_dbonupdatelistener_t *listener; /* @@ -301,7 +287,8 @@ dns_db_endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) REQUIRE(callbacks->add_private != NULL); for (listener = ISC_LIST_HEAD(db->update_listeners); listener != NULL; - listener = ISC_LIST_NEXT(listener, link)) { + listener = ISC_LIST_NEXT(listener, link)) + { listener->onupdate(db, listener->onupdate_arg); } @@ -310,9 +297,8 @@ dns_db_endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) isc_result_t dns_db_load(dns_db_t *db, const char *filename, dns_masterformat_t format, - unsigned int options) -{ - isc_result_t result, eresult; + unsigned int options) { + isc_result_t result, eresult; dns_rdatacallbacks_t callbacks; /* @@ -340,7 +326,8 @@ dns_db_load(dns_db_t *db, const char *filename, dns_masterformat_t format, * failed, we want to return the result code it gave us. */ if (eresult != ISC_R_SUCCESS && - (result == ISC_R_SUCCESS || result == DNS_R_SEENINCLUDE)) { + (result == ISC_R_SUCCESS || result == DNS_R_SEENINCLUDE)) + { result = eresult; } @@ -348,8 +335,7 @@ dns_db_load(dns_db_t *db, const char *filename, dns_masterformat_t format, } isc_result_t -dns_db_serialize(dns_db_t *db, dns_dbversion_t *version, FILE *file) -{ +dns_db_serialize(dns_db_t *db, dns_dbversion_t *version, FILE *file) { REQUIRE(DNS_DB_VALID(db)); if (db->methods->serialize == NULL) { return (ISC_R_NOTIMPLEMENTED); @@ -358,8 +344,7 @@ dns_db_serialize(dns_db_t *db, dns_dbversion_t *version, FILE *file) } isc_result_t -dns_db_dump(dns_db_t *db, dns_dbversion_t *version, const char *filename) -{ +dns_db_dump(dns_db_t *db, dns_dbversion_t *version, const char *filename) { return ((db->methods->dump)(db, version, filename, dns_masterformat_text)); } @@ -369,8 +354,7 @@ dns_db_dump(dns_db_t *db, dns_dbversion_t *version, const char *filename) ***/ void -dns_db_currentversion(dns_db_t *db, dns_dbversion_t **versionp) -{ +dns_db_currentversion(dns_db_t *db, dns_dbversion_t **versionp) { /* * Open the current version for reading. */ @@ -383,8 +367,7 @@ dns_db_currentversion(dns_db_t *db, dns_dbversion_t **versionp) } isc_result_t -dns_db_newversion(dns_db_t *db, dns_dbversion_t **versionp) -{ +dns_db_newversion(dns_db_t *db, dns_dbversion_t **versionp) { /* * Open a new version for reading and writing. */ @@ -398,8 +381,7 @@ dns_db_newversion(dns_db_t *db, dns_dbversion_t **versionp) void dns_db_attachversion(dns_db_t *db, dns_dbversion_t *source, - dns_dbversion_t **targetp) -{ + dns_dbversion_t **targetp) { /* * Attach '*targetp' to 'source'. */ @@ -415,8 +397,7 @@ dns_db_attachversion(dns_db_t *db, dns_dbversion_t *source, } void -dns_db_closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) -{ +dns_db_closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) { dns_dbonupdatelistener_t *listener; /* @@ -431,8 +412,8 @@ dns_db_closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) if (commit == true) { for (listener = ISC_LIST_HEAD(db->update_listeners); - listener != NULL; - listener = ISC_LIST_NEXT(listener, link)) { + listener != NULL; listener = ISC_LIST_NEXT(listener, link)) + { listener->onupdate(db, listener->onupdate_arg); } } @@ -446,8 +427,7 @@ dns_db_closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) isc_result_t dns_db_findnode(dns_db_t *db, const dns_name_t *name, bool create, - dns_dbnode_t **nodep) -{ + dns_dbnode_t **nodep) { /* * Find the node with name 'name'. */ @@ -466,8 +446,7 @@ dns_db_findnode(dns_db_t *db, const dns_name_t *name, bool create, isc_result_t dns_db_findnodeext(dns_db_t *db, const dns_name_t *name, bool create, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo, dns_dbnode_t **nodep) -{ + dns_clientinfo_t *clientinfo, dns_dbnode_t **nodep) { /* * Find the node with name 'name', passing 'arg' to the database * implementation. @@ -486,8 +465,7 @@ dns_db_findnodeext(dns_db_t *db, const dns_name_t *name, bool create, isc_result_t dns_db_findnsec3node(dns_db_t *db, const dns_name_t *name, bool create, - dns_dbnode_t **nodep) -{ + dns_dbnode_t **nodep) { /* * Find the node with name 'name'. */ @@ -502,8 +480,7 @@ isc_result_t dns_db_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { /* * Find the best match for 'name' and 'type' in version 'version' * of 'db'. @@ -535,8 +512,7 @@ dns_db_findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { /* * Find the best match for 'name' and 'type' in version 'version' * of 'db', passing in 'arg'. @@ -567,8 +543,7 @@ isc_result_t dns_db_findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_name_t *dcname, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { /* * Find the deepest known zonecut which encloses 'name' in 'db'. * foundname is the zonecut, dcname is the deepest name we have @@ -589,8 +564,7 @@ dns_db_findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, } void -dns_db_attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) -{ +dns_db_attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) { /* * Attach *targetp to source. */ @@ -603,8 +577,7 @@ dns_db_attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) } void -dns_db_detachnode(dns_db_t *db, dns_dbnode_t **nodep) -{ +dns_db_detachnode(dns_db_t *db, dns_dbnode_t **nodep) { /* * Detach *nodep from its node. */ @@ -619,8 +592,7 @@ dns_db_detachnode(dns_db_t *db, dns_dbnode_t **nodep) void dns_db_transfernode(dns_db_t *db, dns_dbnode_t **sourcep, - dns_dbnode_t **targetp) -{ + dns_dbnode_t **targetp) { REQUIRE(DNS_DB_VALID(db)); REQUIRE(targetp != NULL && *targetp == NULL); /* @@ -643,8 +615,7 @@ dns_db_transfernode(dns_db_t *db, dns_dbnode_t **sourcep, } isc_result_t -dns_db_expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) -{ +dns_db_expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) { /* * Mark as stale all records at 'node' which expire at or before 'now'. */ @@ -657,8 +628,7 @@ dns_db_expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) } void -dns_db_printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) -{ +dns_db_printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) { /* * Print a textual representation of the contents of the node to * 'out'. @@ -676,8 +646,7 @@ dns_db_printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) isc_result_t dns_db_createiterator(dns_db_t *db, unsigned int flags, - dns_dbiterator_t **iteratorp) -{ + dns_dbiterator_t **iteratorp) { /* * Create an iterator for version 'version' of 'db'. */ @@ -696,8 +665,7 @@ isc_result_t dns_db_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) -{ + dns_rdataset_t *sigrdataset) { REQUIRE(DNS_DB_VALID(db)); REQUIRE(node != NULL); REQUIRE(DNS_RDATASET_VALID(rdataset)); @@ -714,8 +682,7 @@ dns_db_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, isc_result_t dns_db_allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, - isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) -{ + isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) { /* * Make '*iteratorp' an rdataset iteratator for all rdatasets at * 'node' in version 'version' of 'db'. @@ -730,8 +697,7 @@ dns_db_allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, isc_result_t dns_db_addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, isc_stdtime_t now, dns_rdataset_t *rdataset, - unsigned int options, dns_rdataset_t *addedrdataset) -{ + unsigned int options, dns_rdataset_t *addedrdataset) { /* * Add 'rdataset' to 'node' in version 'version' of 'db'. */ @@ -757,8 +723,7 @@ dns_db_addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, isc_result_t dns_db_subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdataset_t *rdataset, - unsigned int options, dns_rdataset_t *newrdataset) -{ + unsigned int options, dns_rdataset_t *newrdataset) { /* * Remove any rdata in 'rdataset' from 'node' in version 'version' of * 'db'. @@ -781,8 +746,7 @@ dns_db_subtractrdataset(dns_db_t *db, dns_dbnode_t *node, isc_result_t dns_db_deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdatatype_t type, - dns_rdatatype_t covers) -{ + dns_rdatatype_t covers) { /* * Make it so that no rdataset of type 'type' exists at 'node' in * version version 'version' of 'db'. @@ -797,21 +761,19 @@ dns_db_deleterdataset(dns_db_t *db, dns_dbnode_t *node, } void -dns_db_overmem(dns_db_t *db, bool overmem) -{ +dns_db_overmem(dns_db_t *db, bool overmem) { REQUIRE(DNS_DB_VALID(db)); (db->methods->overmem)(db, overmem); } isc_result_t -dns_db_getsoaserial(dns_db_t *db, dns_dbversion_t *ver, uint32_t *serialp) -{ - isc_result_t result; - dns_dbnode_t * node = NULL; +dns_db_getsoaserial(dns_db_t *db, dns_dbversion_t *ver, uint32_t *serialp) { + isc_result_t result; + dns_dbnode_t *node = NULL; dns_rdataset_t rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_buffer_t buffer; + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_buffer_t buffer; REQUIRE(dns_db_iszone(db) || dns_db_isstub(db)); @@ -852,16 +814,14 @@ freenode: } unsigned int -dns_db_nodecount(dns_db_t *db) -{ +dns_db_nodecount(dns_db_t *db) { REQUIRE(DNS_DB_VALID(db)); return ((db->methods->nodecount)(db)); } size_t -dns_db_hashsize(dns_db_t *db) -{ +dns_db_hashsize(dns_db_t *db) { REQUIRE(DNS_DB_VALID(db)); if (db->methods->hashsize == NULL) { @@ -872,8 +832,7 @@ dns_db_hashsize(dns_db_t *db) } void -dns_db_settask(dns_db_t *db, isc_task_t *task) -{ +dns_db_settask(dns_db_t *db, isc_task_t *task) { REQUIRE(DNS_DB_VALID(db)); (db->methods->settask)(db, task); @@ -881,8 +840,7 @@ dns_db_settask(dns_db_t *db, isc_task_t *task) isc_result_t dns_db_register(const char *name, dns_dbcreatefunc_t create, void *driverarg, - isc_mem_t *mctx, dns_dbimplementation_t **dbimp) -{ + isc_mem_t *mctx, dns_dbimplementation_t **dbimp) { dns_dbimplementation_t *imp; REQUIRE(name != NULL); @@ -913,8 +871,7 @@ dns_db_register(const char *name, dns_dbcreatefunc_t create, void *driverarg, } void -dns_db_unregister(dns_dbimplementation_t **dbimp) -{ +dns_db_unregister(dns_dbimplementation_t **dbimp) { dns_dbimplementation_t *imp; REQUIRE(dbimp != NULL && *dbimp != NULL); @@ -931,8 +888,7 @@ dns_db_unregister(dns_dbimplementation_t **dbimp) } isc_result_t -dns_db_getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) -{ +dns_db_getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) { REQUIRE(DNS_DB_VALID(db)); REQUIRE(dns_db_iszone(db) == true); REQUIRE(nodep != NULL && *nodep == NULL); @@ -945,8 +901,7 @@ dns_db_getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) } dns_stats_t * -dns_db_getrrsetstats(dns_db_t *db) -{ +dns_db_getrrsetstats(dns_db_t *db) { REQUIRE(DNS_DB_VALID(db)); if (db->methods->getrrsetstats != NULL) { @@ -957,8 +912,7 @@ dns_db_getrrsetstats(dns_db_t *db) } isc_result_t -dns_db_setcachestats(dns_db_t *db, isc_stats_t *stats) -{ +dns_db_setcachestats(dns_db_t *db, isc_stats_t *stats) { REQUIRE(DNS_DB_VALID(db)); if (db->methods->setcachestats != NULL) { @@ -972,8 +926,7 @@ isc_result_t dns_db_getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, dns_hash_t *hash, uint8_t *flags, uint16_t *iterations, unsigned char *salt, - size_t *salt_length) -{ + size_t *salt_length) { REQUIRE(DNS_DB_VALID(db)); REQUIRE(dns_db_iszone(db) == true); @@ -988,8 +941,7 @@ dns_db_getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, isc_result_t dns_db_getsize(dns_db_t *db, dns_dbversion_t *version, uint64_t *records, - uint64_t *bytes) -{ + uint64_t *bytes) { REQUIRE(DNS_DB_VALID(db)); REQUIRE(dns_db_iszone(db) == true); @@ -1002,8 +954,7 @@ dns_db_getsize(dns_db_t *db, dns_dbversion_t *version, uint64_t *records, isc_result_t dns_db_setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, - isc_stdtime_t resign) -{ + isc_stdtime_t resign) { if (db->methods->setsigningtime != NULL) { return ((db->methods->setsigningtime)(db, rdataset, resign)); } @@ -1011,8 +962,8 @@ dns_db_setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, } isc_result_t -dns_db_getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, dns_name_t *name) -{ +dns_db_getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, + dns_name_t *name) { if (db->methods->getsigningtime != NULL) { return ((db->methods->getsigningtime)(db, rdataset, name)); } @@ -1021,8 +972,7 @@ dns_db_getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, dns_name_t *name) void dns_db_resigned(dns_db_t *db, dns_rdataset_t *rdataset, - dns_dbversion_t *version) -{ + dns_dbversion_t *version) { if (db->methods->resigned != NULL) { (db->methods->resigned)(db, rdataset, version); } @@ -1034,8 +984,7 @@ dns_db_resigned(dns_db_t *db, dns_rdataset_t *rdataset, * it is dealing with a database that understands response policy zones. */ void -dns_db_rpz_attach(dns_db_t *db, void *rpzs, uint8_t rpz_num) -{ +dns_db_rpz_attach(dns_db_t *db, void *rpzs, uint8_t rpz_num) { REQUIRE(db->methods->rpz_attach != NULL); (db->methods->rpz_attach)(db, rpzs, rpz_num); } @@ -1044,8 +993,7 @@ dns_db_rpz_attach(dns_db_t *db, void *rpzs, uint8_t rpz_num) * Finish loading a response policy zone. */ isc_result_t -dns_db_rpz_ready(dns_db_t *db) -{ +dns_db_rpz_ready(dns_db_t *db) { if (db->methods->rpz_ready == NULL) { return (ISC_R_SUCCESS); } @@ -1057,8 +1005,7 @@ dns_db_rpz_ready(dns_db_t *db) */ isc_result_t dns_db_updatenotify_register(dns_db_t *db, dns_dbupdate_callback_t fn, - void *fn_arg) -{ + void *fn_arg) { dns_dbonupdatelistener_t *listener; REQUIRE(db != NULL); @@ -1077,14 +1024,14 @@ dns_db_updatenotify_register(dns_db_t *db, dns_dbupdate_callback_t fn, isc_result_t dns_db_updatenotify_unregister(dns_db_t *db, dns_dbupdate_callback_t fn, - void *fn_arg) -{ + void *fn_arg) { dns_dbonupdatelistener_t *listener; REQUIRE(db != NULL); for (listener = ISC_LIST_HEAD(db->update_listeners); listener != NULL; - listener = ISC_LIST_NEXT(listener, link)) { + listener = ISC_LIST_NEXT(listener, link)) + { if ((listener->onupdate == fn) && (listener->onupdate_arg == fn_arg)) { ISC_LIST_UNLINK(db->update_listeners, listener, link); @@ -1098,8 +1045,7 @@ dns_db_updatenotify_unregister(dns_db_t *db, dns_dbupdate_callback_t fn, } isc_result_t -dns_db_nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) -{ +dns_db_nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) { REQUIRE(db != NULL); REQUIRE(node != NULL); REQUIRE(name != NULL); @@ -1111,8 +1057,7 @@ dns_db_nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) } isc_result_t -dns_db_setservestalettl(dns_db_t *db, dns_ttl_t ttl) -{ +dns_db_setservestalettl(dns_db_t *db, dns_ttl_t ttl) { REQUIRE(DNS_DB_VALID(db)); REQUIRE((db->attributes & DNS_DBATTR_CACHE) != 0); @@ -1123,8 +1068,7 @@ dns_db_setservestalettl(dns_db_t *db, dns_ttl_t ttl) } isc_result_t -dns_db_getservestalettl(dns_db_t *db, dns_ttl_t *ttl) -{ +dns_db_getservestalettl(dns_db_t *db, dns_ttl_t *ttl) { REQUIRE(DNS_DB_VALID(db)); REQUIRE((db->attributes & DNS_DBATTR_CACHE) != 0); @@ -1135,8 +1079,7 @@ dns_db_getservestalettl(dns_db_t *db, dns_ttl_t *ttl) } isc_result_t -dns_db_setgluecachestats(dns_db_t *db, isc_stats_t *stats) -{ +dns_db_setgluecachestats(dns_db_t *db, isc_stats_t *stats) { REQUIRE(dns_db_iszone(db)); REQUIRE(stats != NULL); diff --git a/lib/dns/dbiterator.c b/lib/dns/dbiterator.c index bc0395a1cf..09059981ef 100644 --- a/lib/dns/dbiterator.c +++ b/lib/dns/dbiterator.c @@ -19,8 +19,7 @@ #include void -dns_dbiterator_destroy(dns_dbiterator_t **iteratorp) -{ +dns_dbiterator_destroy(dns_dbiterator_t **iteratorp) { /* * Destroy '*iteratorp'. */ @@ -34,8 +33,7 @@ dns_dbiterator_destroy(dns_dbiterator_t **iteratorp) } isc_result_t -dns_dbiterator_first(dns_dbiterator_t *iterator) -{ +dns_dbiterator_first(dns_dbiterator_t *iterator) { /* * Move the node cursor to the first node in the database (if any). */ @@ -46,8 +44,7 @@ dns_dbiterator_first(dns_dbiterator_t *iterator) } isc_result_t -dns_dbiterator_last(dns_dbiterator_t *iterator) -{ +dns_dbiterator_last(dns_dbiterator_t *iterator) { /* * Move the node cursor to the first node in the database (if any). */ @@ -58,8 +55,7 @@ dns_dbiterator_last(dns_dbiterator_t *iterator) } isc_result_t -dns_dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name) -{ +dns_dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name) { /* * Move the node cursor to the node with name 'name'. */ @@ -70,8 +66,7 @@ dns_dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name) } isc_result_t -dns_dbiterator_prev(dns_dbiterator_t *iterator) -{ +dns_dbiterator_prev(dns_dbiterator_t *iterator) { /* * Move the node cursor to the previous node in the database (if any). */ @@ -82,8 +77,7 @@ dns_dbiterator_prev(dns_dbiterator_t *iterator) } isc_result_t -dns_dbiterator_next(dns_dbiterator_t *iterator) -{ +dns_dbiterator_next(dns_dbiterator_t *iterator) { /* * Move the node cursor to the next node in the database (if any). */ @@ -95,8 +89,7 @@ dns_dbiterator_next(dns_dbiterator_t *iterator) isc_result_t dns_dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, - dns_name_t *name) -{ + dns_name_t *name) { /* * Return the current node. */ @@ -109,8 +102,7 @@ dns_dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, } isc_result_t -dns_dbiterator_pause(dns_dbiterator_t *iterator) -{ +dns_dbiterator_pause(dns_dbiterator_t *iterator) { /* * Pause iteration. */ @@ -121,8 +113,7 @@ dns_dbiterator_pause(dns_dbiterator_t *iterator) } isc_result_t -dns_dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) -{ +dns_dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) { /* * Return the origin to which returned node names are relative. */ @@ -135,8 +126,7 @@ dns_dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) } void -dns_dbiterator_setcleanmode(dns_dbiterator_t *iterator, bool mode) -{ +dns_dbiterator_setcleanmode(dns_dbiterator_t *iterator, bool mode) { REQUIRE(DNS_DBITERATOR_VALID(iterator)); iterator->cleaning = mode; diff --git a/lib/dns/dbtable.c b/lib/dns/dbtable.c index dc888a5742..53848e4982 100644 --- a/lib/dns/dbtable.c +++ b/lib/dns/dbtable.c @@ -22,23 +22,22 @@ struct dns_dbtable { /* Unlocked. */ - unsigned int magic; - isc_mem_t * mctx; + unsigned int magic; + isc_mem_t *mctx; dns_rdataclass_t rdclass; - isc_rwlock_t tree_lock; + isc_rwlock_t tree_lock; /* Protected by atomics */ isc_refcount_t references; /* Locked by tree_lock. */ dns_rbt_t *rbt; - dns_db_t * default_db; + dns_db_t *default_db; }; -#define DBTABLE_MAGIC ISC_MAGIC('D', 'B', '-', '-') +#define DBTABLE_MAGIC ISC_MAGIC('D', 'B', '-', '-') #define VALID_DBTABLE(dbtable) ISC_MAGIC_VALID(dbtable, DBTABLE_MAGIC) static void -dbdetach(void *data, void *arg) -{ +dbdetach(void *data, void *arg) { dns_db_t *db = data; UNUSED(arg); @@ -48,10 +47,9 @@ dbdetach(void *data, void *arg) isc_result_t dns_dbtable_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, - dns_dbtable_t **dbtablep) -{ + dns_dbtable_t **dbtablep) { dns_dbtable_t *dbtable; - isc_result_t result; + isc_result_t result; REQUIRE(mctx != NULL); REQUIRE(dbtablep != NULL && *dbtablep == NULL); @@ -90,8 +88,7 @@ clean1: } static inline void -dbtable_free(dns_dbtable_t *dbtable) -{ +dbtable_free(dns_dbtable_t *dbtable) { /* * Caller must ensure that it is safe to call. */ @@ -114,8 +111,7 @@ dbtable_free(dns_dbtable_t *dbtable) } void -dns_dbtable_attach(dns_dbtable_t *source, dns_dbtable_t **targetp) -{ +dns_dbtable_attach(dns_dbtable_t *source, dns_dbtable_t **targetp) { REQUIRE(VALID_DBTABLE(source)); REQUIRE(targetp != NULL && *targetp == NULL); @@ -125,8 +121,7 @@ dns_dbtable_attach(dns_dbtable_t *source, dns_dbtable_t **targetp) } void -dns_dbtable_detach(dns_dbtable_t **dbtablep) -{ +dns_dbtable_detach(dns_dbtable_t **dbtablep) { dns_dbtable_t *dbtable; REQUIRE(dbtablep != NULL); @@ -140,10 +135,9 @@ dns_dbtable_detach(dns_dbtable_t **dbtablep) } isc_result_t -dns_dbtable_add(dns_dbtable_t *dbtable, dns_db_t *db) -{ +dns_dbtable_add(dns_dbtable_t *dbtable, dns_db_t *db) { isc_result_t result; - dns_db_t * dbclone; + dns_db_t *dbclone; REQUIRE(VALID_DBTABLE(dbtable)); REQUIRE(dns_db_class(db) == dbtable->rdclass); @@ -159,11 +153,10 @@ dns_dbtable_add(dns_dbtable_t *dbtable, dns_db_t *db) } void -dns_dbtable_remove(dns_dbtable_t *dbtable, dns_db_t *db) -{ - dns_db_t * stored_data = NULL; +dns_dbtable_remove(dns_dbtable_t *dbtable, dns_db_t *db) { + dns_db_t *stored_data = NULL; isc_result_t result; - dns_name_t * name; + dns_name_t *name; REQUIRE(VALID_DBTABLE(dbtable)); @@ -192,8 +185,7 @@ dns_dbtable_remove(dns_dbtable_t *dbtable, dns_db_t *db) } void -dns_dbtable_adddefault(dns_dbtable_t *dbtable, dns_db_t *db) -{ +dns_dbtable_adddefault(dns_dbtable_t *dbtable, dns_db_t *db) { REQUIRE(VALID_DBTABLE(dbtable)); REQUIRE(dbtable->default_db == NULL); REQUIRE(dns_name_compare(dns_db_origin(db), dns_rootname) == 0); @@ -207,8 +199,7 @@ dns_dbtable_adddefault(dns_dbtable_t *dbtable, dns_db_t *db) } void -dns_dbtable_getdefault(dns_dbtable_t *dbtable, dns_db_t **dbp) -{ +dns_dbtable_getdefault(dns_dbtable_t *dbtable, dns_db_t **dbp) { REQUIRE(VALID_DBTABLE(dbtable)); REQUIRE(dbp != NULL && *dbp == NULL); @@ -220,8 +211,7 @@ dns_dbtable_getdefault(dns_dbtable_t *dbtable, dns_db_t **dbp) } void -dns_dbtable_removedefault(dns_dbtable_t *dbtable) -{ +dns_dbtable_removedefault(dns_dbtable_t *dbtable) { REQUIRE(VALID_DBTABLE(dbtable)); RWLOCK(&dbtable->tree_lock, isc_rwlocktype_write); @@ -233,9 +223,8 @@ dns_dbtable_removedefault(dns_dbtable_t *dbtable) isc_result_t dns_dbtable_find(dns_dbtable_t *dbtable, const dns_name_t *name, - unsigned int options, dns_db_t **dbp) -{ - dns_db_t * stored_data = NULL; + unsigned int options, dns_db_t **dbp) { + dns_db_t *stored_data = NULL; isc_result_t result; unsigned int rbtoptions = 0; diff --git a/lib/dns/diff.c b/lib/dns/diff.c index 9010fd1bf5..ffe2838817 100644 --- a/lib/dns/diff.c +++ b/lib/dns/diff.c @@ -44,19 +44,17 @@ dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_DIFF static dns_rdatatype_t -rdata_covers(dns_rdata_t *rdata) -{ +rdata_covers(dns_rdata_t *rdata) { return (rdata->type == dns_rdatatype_rrsig ? dns_rdata_covers(rdata) : 0); } isc_result_t dns_difftuple_create(isc_mem_t *mctx, dns_diffop_t op, const dns_name_t *name, - dns_ttl_t ttl, dns_rdata_t *rdata, dns_difftuple_t **tp) -{ + dns_ttl_t ttl, dns_rdata_t *rdata, dns_difftuple_t **tp) { dns_difftuple_t *t; - unsigned int size; - unsigned char * datap; + unsigned int size; + unsigned char *datap; REQUIRE(tp != NULL && *tp == NULL); @@ -103,8 +101,7 @@ dns_difftuple_create(isc_mem_t *mctx, dns_diffop_t op, const dns_name_t *name, } void -dns_difftuple_free(dns_difftuple_t **tp) -{ +dns_difftuple_free(dns_difftuple_t **tp) { dns_difftuple_t *t = *tp; *tp = NULL; isc_mem_t *mctx; @@ -119,23 +116,20 @@ dns_difftuple_free(dns_difftuple_t **tp) } isc_result_t -dns_difftuple_copy(dns_difftuple_t *orig, dns_difftuple_t **copyp) -{ +dns_difftuple_copy(dns_difftuple_t *orig, dns_difftuple_t **copyp) { return (dns_difftuple_create(orig->mctx, orig->op, &orig->name, orig->ttl, &orig->rdata, copyp)); } void -dns_diff_init(isc_mem_t *mctx, dns_diff_t *diff) -{ +dns_diff_init(isc_mem_t *mctx, dns_diff_t *diff) { diff->mctx = mctx; ISC_LIST_INIT(diff->tuples); diff->magic = DNS_DIFF_MAGIC; } void -dns_diff_clear(dns_diff_t *diff) -{ +dns_diff_clear(dns_diff_t *diff) { dns_difftuple_t *t; REQUIRE(DNS_DIFF_VALID(diff)); while ((t = ISC_LIST_HEAD(diff->tuples)) != NULL) { @@ -146,8 +140,7 @@ dns_diff_clear(dns_diff_t *diff) } void -dns_diff_append(dns_diff_t *diff, dns_difftuple_t **tuplep) -{ +dns_diff_append(dns_diff_t *diff, dns_difftuple_t **tuplep) { ISC_LIST_APPEND(diff->tuples, *tuplep, link); *tuplep = NULL; } @@ -155,8 +148,7 @@ dns_diff_append(dns_diff_t *diff, dns_difftuple_t **tuplep) /* XXX this is O(N) */ void -dns_diff_appendminimal(dns_diff_t *diff, dns_difftuple_t **tuplep) -{ +dns_diff_appendminimal(dns_diff_t *diff, dns_difftuple_t **tuplep) { dns_difftuple_t *ot, *next_ot; REQUIRE(DNS_DIFF_VALID(diff)); @@ -178,7 +170,8 @@ dns_diff_appendminimal(dns_diff_t *diff, dns_difftuple_t **tuplep) next_ot = ISC_LIST_NEXT(ot, link); if (dns_name_caseequal(&ot->name, &(*tuplep)->name) && dns_rdata_compare(&ot->rdata, &(*tuplep)->rdata) == 0 && - ot->ttl == (*tuplep)->ttl) { + ot->ttl == (*tuplep)->ttl) + { ISC_LIST_UNLINK(diff->tuples, ot, link); if ((*tuplep)->op == ot->op) { UNEXPECTED_ERROR(__FILE__, __LINE__, @@ -198,12 +191,11 @@ dns_diff_appendminimal(dns_diff_t *diff, dns_difftuple_t **tuplep) } static isc_stdtime_t -setresign(dns_rdataset_t *modified) -{ - dns_rdata_t rdata = DNS_RDATA_INIT; +setresign(dns_rdataset_t *modified) { + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_rrsig_t sig; - int64_t when; - isc_result_t result; + int64_t when; + isc_result_t result; result = dns_rdataset_first(modified); INSIST(result == ISC_R_SUCCESS); @@ -235,30 +227,27 @@ setresign(dns_rdataset_t *modified) } static void -getownercase(dns_rdataset_t *rdataset, dns_name_t *name) -{ +getownercase(dns_rdataset_t *rdataset, dns_name_t *name) { if (dns_rdataset_isassociated(rdataset)) { dns_rdataset_getownercase(rdataset, name); } } static void -setownercase(dns_rdataset_t *rdataset, const dns_name_t *name) -{ +setownercase(dns_rdataset_t *rdataset, const dns_name_t *name) { if (dns_rdataset_isassociated(rdataset)) { dns_rdataset_setownercase(rdataset, name); } } static isc_result_t -diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver, bool warn) -{ +diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver, bool warn) { dns_difftuple_t *t; - dns_dbnode_t * node = NULL; - isc_result_t result; - char namebuf[DNS_NAME_FORMATSIZE]; - char typebuf[DNS_RDATATYPE_FORMATSIZE]; - char classbuf[DNS_RDATACLASS_FORMATSIZE]; + dns_dbnode_t *node = NULL; + isc_result_t result; + char namebuf[DNS_NAME_FORMATSIZE]; + char typebuf[DNS_RDATATYPE_FORMATSIZE]; + char classbuf[DNS_RDATACLASS_FORMATSIZE]; REQUIRE(DNS_DIFF_VALID(diff)); REQUIRE(DNS_DB_VALID(db)); @@ -280,11 +269,11 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver, bool warn) while (t != NULL && dns_name_equal(&t->name, name)) { dns_rdatatype_t type, covers; - dns_diffop_t op; + dns_diffop_t op; dns_rdatalist_t rdl; - dns_rdataset_t rds; - dns_rdataset_t ardataset; - unsigned int options; + dns_rdataset_t rds; + dns_rdataset_t ardataset; + unsigned int options; op = t->op; type = t->rdata.type; @@ -322,7 +311,8 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver, bool warn) while (t != NULL && dns_name_equal(&t->name, name) && t->op == op && t->rdata.type == type && - rdata_covers(&t->rdata) == covers) { + rdata_covers(&t->rdata) == covers) + { /* * Remember the add name for * dns_rdataset_setownercase. @@ -387,7 +377,8 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver, bool warn) if (result == ISC_R_SUCCESS) { if (rds.type == dns_rdatatype_rrsig && (op == DNS_DIFFOP_DELRESIGN || - op == DNS_DIFFOP_ADDRESIGN)) { + op == DNS_DIFFOP_ADDRESIGN)) + { isc_stdtime_t resign; resign = setresign(&ardataset); dns_db_setsigningtime(db, &ardataset, @@ -464,14 +455,12 @@ failure: } isc_result_t -dns_diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver) -{ +dns_diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver) { return (diff_apply(diff, db, ver, true)); } isc_result_t -dns_diff_applysilently(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver) -{ +dns_diff_applysilently(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver) { return (diff_apply(diff, db, ver, false)); } @@ -479,10 +468,9 @@ dns_diff_applysilently(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver) isc_result_t dns_diff_load(dns_diff_t *diff, dns_addrdatasetfunc_t addfunc, - void *add_private) -{ + void *add_private) { dns_difftuple_t *t; - isc_result_t result; + isc_result_t result; REQUIRE(DNS_DIFF_VALID(diff)); @@ -493,9 +481,9 @@ dns_diff_load(dns_diff_t *diff, dns_addrdatasetfunc_t addfunc, name = &t->name; while (t != NULL && dns_name_caseequal(&t->name, name)) { dns_rdatatype_t type, covers; - dns_diffop_t op; + dns_diffop_t op; dns_rdatalist_t rdl; - dns_rdataset_t rds; + dns_rdataset_t rds; op = t->op; type = t->rdata.type; @@ -510,7 +498,8 @@ dns_diff_load(dns_diff_t *diff, dns_addrdatasetfunc_t addfunc, while (t != NULL && dns_name_caseequal(&t->name, name) && t->op == op && t->rdata.type == type && - rdata_covers(&t->rdata) == covers) { + rdata_covers(&t->rdata) == covers) + { ISC_LIST_APPEND(rdl.rdata, &t->rdata, link); t = ISC_LIST_NEXT(t, link); } @@ -549,12 +538,11 @@ failure: * and perhaps safer wrt thread stack overflow. */ isc_result_t -dns_diff_sort(dns_diff_t *diff, dns_diff_compare_func *compare) -{ - unsigned int length = 0; - unsigned int i; +dns_diff_sort(dns_diff_t *diff, dns_diff_compare_func *compare) { + unsigned int length = 0; + unsigned int i; dns_difftuple_t **v; - dns_difftuple_t * p; + dns_difftuple_t *p; REQUIRE(DNS_DIFF_VALID(diff)); for (p = ISC_LIST_HEAD(diff->tuples); p != NULL; @@ -587,8 +575,7 @@ dns_diff_sort(dns_diff_t *diff, dns_diff_compare_func *compare) static isc_result_t diff_tuple_tordataset(dns_difftuple_t *t, dns_rdata_t *rdata, - dns_rdatalist_t *rdl, dns_rdataset_t *rds) -{ + dns_rdatalist_t *rdl, dns_rdataset_t *rds) { REQUIRE(DNS_DIFFTUPLE_VALID(t)); REQUIRE(rdl != NULL); REQUIRE(rds != NULL); @@ -605,13 +592,12 @@ diff_tuple_tordataset(dns_difftuple_t *t, dns_rdata_t *rdata, } isc_result_t -dns_diff_print(dns_diff_t *diff, FILE *file) -{ - isc_result_t result; +dns_diff_print(dns_diff_t *diff, FILE *file) { + isc_result_t result; dns_difftuple_t *t; - char * mem = NULL; - unsigned int size = 2048; - const char * op = NULL; + char *mem = NULL; + unsigned int size = 2048; + const char *op = NULL; REQUIRE(DNS_DIFF_VALID(diff)); @@ -623,8 +609,8 @@ dns_diff_print(dns_diff_t *diff, FILE *file) isc_region_t r; dns_rdatalist_t rdl; - dns_rdataset_t rds; - dns_rdata_t rd = DNS_RDATA_INIT; + dns_rdataset_t rds; + dns_rdata_t rd = DNS_RDATA_INIT; result = diff_tuple_tordataset(t, &rd, &rdl, &rds); if (result != ISC_R_SUCCESS) { @@ -636,8 +622,8 @@ dns_diff_print(dns_diff_t *diff, FILE *file) } again: isc_buffer_init(&buf, mem, size); - result = - dns_rdataset_totext(&rds, &t->name, false, false, &buf); + result = dns_rdataset_totext(&rds, &t->name, false, false, + &buf); if (result == ISC_R_NOSPACE) { isc_mem_put(diff->mctx, mem, size); diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c index 18678571f9..1d0a89e841 100644 --- a/lib/dns/dispatch.c +++ b/lib/dns/dispatch.c @@ -49,44 +49,44 @@ typedef struct dispportentry dispportentry_t; typedef ISC_LIST(dispportentry_t) dispportlist_t; typedef struct dns_qid { - unsigned int magic; - unsigned int qid_nbuckets; /*%< hash table size */ - unsigned int qid_increment; /*%< id increment on collision */ - isc_mutex_t lock; - dns_displist_t * qid_table; /*%< the table itself */ + unsigned int magic; + unsigned int qid_nbuckets; /*%< hash table size */ + unsigned int qid_increment; /*%< id increment on collision */ + isc_mutex_t lock; + dns_displist_t *qid_table; /*%< the table itself */ dispsocketlist_t *sock_table; /*%< socket table */ } dns_qid_t; struct dns_dispatchmgr { /* Unlocked. */ - unsigned int magic; - isc_mem_t * mctx; - dns_acl_t * blackhole; + unsigned int magic; + isc_mem_t *mctx; + dns_acl_t *blackhole; dns_portlist_t *portlist; - isc_stats_t * stats; + isc_stats_t *stats; /* Locked by "lock". */ - isc_mutex_t lock; + isc_mutex_t lock; unsigned int state; ISC_LIST(dns_dispatch_t) list; /* locked by buffer_lock */ - dns_qid_t * qid; - isc_mutex_t buffer_lock; + dns_qid_t *qid; + isc_mutex_t buffer_lock; unsigned int buffers; /*%< allocated buffers */ unsigned int buffersize; /*%< size of each buffer */ unsigned int maxbuffers; /*%< max buffers */ /* Locked internally. */ - isc_mutex_t depool_lock; + isc_mutex_t depool_lock; isc_mempool_t *depool; /*%< pool for dispatch events */ - isc_mutex_t rpool_lock; + isc_mutex_t rpool_lock; isc_mempool_t *rpool; /*%< pool for replies */ - isc_mutex_t dpool_lock; + isc_mutex_t dpool_lock; isc_mempool_t *dpool; /*%< dispatch allocations */ - isc_mutex_t bpool_lock; + isc_mutex_t bpool_lock; isc_mempool_t *bpool; /*%< pool for buffers */ - isc_mutex_t spool_lock; + isc_mutex_t spool_lock; isc_mempool_t *spool; /*%< pool for dispsocks */ /*% @@ -104,29 +104,29 @@ struct dns_dispatchmgr { * revisit the decision when we want to use it as a separate module for * an environment where memory requirement is severer. */ - in_port_t * v4ports; /*%< available ports for IPv4 */ + in_port_t *v4ports; /*%< available ports for IPv4 */ unsigned int nv4ports; /*%< # of available ports for IPv4 */ - in_port_t * v6ports; /*%< available ports for IPv4 */ + in_port_t *v6ports; /*%< available ports for IPv4 */ unsigned int nv6ports; /*%< # of available ports for IPv4 */ }; -#define MGR_SHUTTINGDOWN 0x00000001U +#define MGR_SHUTTINGDOWN 0x00000001U #define MGR_IS_SHUTTINGDOWN(l) (((l)->state & MGR_SHUTTINGDOWN) != 0) #define IS_PRIVATE(d) (((d)->attributes & DNS_DISPATCHATTR_PRIVATE) != 0) struct dns_dispentry { - unsigned int magic; - dns_dispatch_t * disp; - dns_messageid_t id; - in_port_t port; - unsigned int bucket; - isc_sockaddr_t host; - isc_task_t * task; + unsigned int magic; + dns_dispatch_t *disp; + dns_messageid_t id; + in_port_t port; + unsigned int bucket; + isc_sockaddr_t host; + isc_task_t *task; isc_taskaction_t action; - void * arg; - bool item_out; - dispsocket_t * dispsocket; + void *arg; + bool item_out; + dispsocket_t *dispsocket; ISC_LIST(dns_dispatchevent_t) items; ISC_LINK(dns_dispentry_t) link; }; @@ -153,14 +153,14 @@ struct dns_dispentry { #endif /* ifndef DNS_DISPATCH_SOCKSQUOTA */ struct dispsocket { - unsigned int magic; - isc_socket_t * socket; - dns_dispatch_t * disp; - isc_sockaddr_t host; - in_port_t localport; /* XXX: should be removed later */ + unsigned int magic; + isc_socket_t *socket; + dns_dispatch_t *disp; + isc_sockaddr_t host; + in_port_t localport; /* XXX: should be removed later */ dispportentry_t *portentry; dns_dispentry_t *resp; - isc_task_t * task; + isc_task_t *task; ISC_LINK(dispsocket_t) link; unsigned int bucket; ISC_LINK(dispsocket_t) blink; @@ -172,7 +172,7 @@ struct dispsocket { * destination addresses) using the SO_REUSEADDR socket option. */ struct dispportentry { - in_port_t port; + in_port_t port; isc_refcount_t refs; ISC_LINK(struct dispportentry) link; }; @@ -192,36 +192,36 @@ struct dispportentry { struct dns_dispatch { /* Unlocked. */ - unsigned int magic; /*%< magic */ - dns_dispatchmgr_t *mgr; /*%< dispatch manager */ - int ntasks; + unsigned int magic; /*%< magic */ + dns_dispatchmgr_t *mgr; /*%< dispatch manager */ + int ntasks; /*% * internal task buckets. We use multiple tasks to distribute various * socket events well when using separate dispatch sockets. We use the * 1st task (task[0]) for internal control events. */ - isc_task_t * task[MAX_INTERNAL_TASKS]; - isc_socket_t * socket; /*%< isc socket attached to */ - isc_sockaddr_t local; /*%< local address */ - in_port_t localport; /*%< local UDP port */ - isc_sockaddr_t peer; /*%< peer address (TCP) */ - isc_dscp_t dscp; /*%< "listen-on" DSCP value */ - unsigned int maxrequests; /*%< max requests */ - isc_event_t * ctlevent; + isc_task_t *task[MAX_INTERNAL_TASKS]; + isc_socket_t *socket; /*%< isc socket attached to */ + isc_sockaddr_t local; /*%< local address */ + in_port_t localport; /*%< local UDP port */ + isc_sockaddr_t peer; /*%< peer address (TCP) */ + isc_dscp_t dscp; /*%< "listen-on" DSCP value */ + unsigned int maxrequests; /*%< max requests */ + isc_event_t *ctlevent; - isc_mutex_t sepool_lock; + isc_mutex_t sepool_lock; isc_mempool_t *sepool; /*%< pool for socket events */ /*% Locked by mgr->lock. */ ISC_LINK(dns_dispatch_t) link; /* Locked by "lock". */ - isc_mutex_t lock; /*%< locks all below */ - isc_sockettype_t socktype; - unsigned int attributes; - unsigned int refcount; /*%< number of users */ + isc_mutex_t lock; /*%< locks all below */ + isc_sockettype_t socktype; + unsigned int attributes; + unsigned int refcount; /*%< number of users */ dns_dispatchevent_t *failsafe_ev; /*%< failsafe cancel event */ - unsigned int shutting_down : 1, shutdown_out : 1, connected : 1, + unsigned int shutting_down : 1, shutdown_out : 1, connected : 1, tcpmsg_valid : 1, recv_pending : 1; /*%< is a * recv() * pending? @@ -229,29 +229,29 @@ struct dns_dispatch { isc_result_t shutdown_why; ISC_LIST(dispsocket_t) activesockets; ISC_LIST(dispsocket_t) inactivesockets; - unsigned int nsockets; - unsigned int requests; /*%< how many requests we have */ - unsigned int tcpbuffers; /*%< allocated buffers */ - dns_tcpmsg_t tcpmsg; /*%< for tcp streams */ - dns_qid_t * qid; + unsigned int nsockets; + unsigned int requests; /*%< how many requests we have */ + unsigned int tcpbuffers; /*%< allocated buffers */ + dns_tcpmsg_t tcpmsg; /*%< for tcp streams */ + dns_qid_t *qid; dispportlist_t *port_table; /*%< hold ports 'owned' by us */ - isc_mempool_t * portpool; /*%< port table entries */ + isc_mempool_t *portpool; /*%< port table entries */ }; -#define QID_MAGIC ISC_MAGIC('Q', 'i', 'd', ' ') +#define QID_MAGIC ISC_MAGIC('Q', 'i', 'd', ' ') #define VALID_QID(e) ISC_MAGIC_VALID((e), QID_MAGIC) -#define RESPONSE_MAGIC ISC_MAGIC('D', 'r', 's', 'p') +#define RESPONSE_MAGIC ISC_MAGIC('D', 'r', 's', 'p') #define VALID_RESPONSE(e) ISC_MAGIC_VALID((e), RESPONSE_MAGIC) -#define DISPSOCK_MAGIC ISC_MAGIC('D', 's', 'o', 'c') +#define DISPSOCK_MAGIC ISC_MAGIC('D', 's', 'o', 'c') #define VALID_DISPSOCK(e) ISC_MAGIC_VALID((e), DISPSOCK_MAGIC) -#define DISPATCH_MAGIC ISC_MAGIC('D', 'i', 's', 'p') +#define DISPATCH_MAGIC ISC_MAGIC('D', 'i', 's', 'p') #define VALID_DISPATCH(e) ISC_MAGIC_VALID((e), DISPATCH_MAGIC) #define DNS_DISPATCHMGR_MAGIC ISC_MAGIC('D', 'M', 'g', 'r') -#define VALID_DISPATCHMGR(e) ISC_MAGIC_VALID((e), DNS_DISPATCHMGR_MAGIC) +#define VALID_DISPATCHMGR(e) ISC_MAGIC_VALID((e), DNS_DISPATCHMGR_MAGIC) #define DNS_QID(disp) \ ((disp)->socktype == isc_sockettype_tcp) ? (disp)->qid \ @@ -274,81 +274,58 @@ 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 -mgr_log(dns_dispatchmgr_t *mgr, int level, const char *fmt, ...) -{ - char msgbuf[2048]; +mgr_log(dns_dispatchmgr_t *mgr, int level, const char *fmt, ...) { + char msgbuf[2048]; va_list ap; if (!isc_log_wouldlog(dns_lctx, level)) { @@ -365,29 +342,25 @@ mgr_log(dns_dispatchmgr_t *mgr, int level, const char *fmt, ...) } static inline void -inc_stats(dns_dispatchmgr_t *mgr, isc_statscounter_t counter) -{ +inc_stats(dns_dispatchmgr_t *mgr, isc_statscounter_t counter) { if (mgr->stats != NULL) { isc_stats_increment(mgr->stats, counter); } } static inline void -dec_stats(dns_dispatchmgr_t *mgr, isc_statscounter_t counter) -{ +dec_stats(dns_dispatchmgr_t *mgr, isc_statscounter_t counter) { if (mgr->stats != NULL) { isc_stats_decrement(mgr->stats, 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 -dispatch_log(dns_dispatch_t *disp, int level, const char *fmt, ...) -{ - char msgbuf[2048]; +dispatch_log(dns_dispatch_t *disp, int level, const char *fmt, ...) { + char msgbuf[2048]; va_list ap; if (!isc_log_wouldlog(dns_lctx, level)) { @@ -403,16 +376,14 @@ 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, - const char *fmt, ...) -{ - char msgbuf[2048]; - char peerbuf[256]; + const char *fmt, ...) { + char msgbuf[2048]; + char peerbuf[256]; va_list ap; if (!isc_log_wouldlog(dns_lctx, level)) { @@ -442,8 +413,7 @@ request_log(dns_dispatch_t *disp, dns_dispentry_t *resp, int level, */ static uint32_t dns_hash(dns_qid_t *qid, const isc_sockaddr_t *dest, dns_messageid_t id, - in_port_t port) -{ + in_port_t port) { uint32_t ret; ret = isc_sockaddr_hash(dest, true); @@ -459,10 +429,9 @@ dns_hash(dns_qid_t *qid, const isc_sockaddr_t *dest, dns_messageid_t id, * Find the first entry in 'qid'. Returns NULL if there are no entries. */ static dns_dispentry_t * -linear_first(dns_qid_t *qid) -{ +linear_first(dns_qid_t *qid) { dns_dispentry_t *ret; - unsigned int bucket; + unsigned int bucket; bucket = 0; @@ -482,10 +451,9 @@ linear_first(dns_qid_t *qid) * no more entries. */ static dns_dispentry_t * -linear_next(dns_qid_t *qid, dns_dispentry_t *resp) -{ +linear_next(dns_qid_t *qid, dns_dispentry_t *resp) { dns_dispentry_t *ret; - unsigned int bucket; + unsigned int bucket; ret = ISC_LIST_NEXT(resp, link); if (ret != NULL) { @@ -509,8 +477,7 @@ linear_next(dns_qid_t *qid, dns_dispentry_t *resp) * The dispatch must be locked. */ static bool -destroy_disp_ok(dns_dispatch_t *disp) -{ +destroy_disp_ok(dns_dispatch_t *disp) { if (disp->refcount != 0) { return (false); } @@ -537,13 +504,12 @@ destroy_disp_ok(dns_dispatch_t *disp) * The manager must not be locked. */ static void -destroy_disp(isc_task_t *task, isc_event_t *event) -{ - dns_dispatch_t * disp; +destroy_disp(isc_task_t *task, isc_event_t *event) { + dns_dispatch_t *disp; dns_dispatchmgr_t *mgr; - bool killmgr; - dispsocket_t * dispsocket; - int i; + bool killmgr; + dispsocket_t *dispsocket; + int i; INSIST(event->ev_type == DNS_EVENT_DISPATCHCONTROL); @@ -590,8 +556,7 @@ destroy_disp(isc_task_t *task, isc_event_t *event) * create a new entry, and decrement a given entry with possible clean-up. */ static dispportentry_t * -port_search(dns_dispatch_t *disp, in_port_t port) -{ +port_search(dns_dispatch_t *disp, in_port_t port) { dispportentry_t *portentry; REQUIRE(disp->port_table != NULL); @@ -609,10 +574,9 @@ port_search(dns_dispatch_t *disp, in_port_t port) } static dispportentry_t * -new_portentry(dns_dispatch_t *disp, in_port_t port) -{ +new_portentry(dns_dispatch_t *disp, in_port_t port) { dispportentry_t *portentry; - dns_qid_t * qid; + dns_qid_t *qid; REQUIRE(disp->port_table != NULL); @@ -637,9 +601,8 @@ new_portentry(dns_dispatch_t *disp, in_port_t port) * The caller must not hold the qid->lock. */ static void -deref_portentry(dns_dispatch_t *disp, dispportentry_t **portentryp) -{ - dns_qid_t * qid; +deref_portentry(dns_dispatch_t *disp, dispportentry_t **portentryp) { + dns_qid_t *qid; dispportentry_t *portentry = *portentryp; *portentryp = NULL; @@ -663,8 +626,7 @@ deref_portentry(dns_dispatch_t *disp, dispportentry_t **portentryp) */ static dispsocket_t * socket_search(dns_qid_t *qid, const isc_sockaddr_t *dest, in_port_t port, - unsigned int bucket) -{ + unsigned int bucket) { dispsocket_t *dispsock; REQUIRE(VALID_QID(qid)); @@ -675,7 +637,8 @@ socket_search(dns_qid_t *qid, const isc_sockaddr_t *dest, in_port_t port, while (dispsock != NULL) { if (dispsock->portentry != NULL && dispsock->portentry->port == port && - isc_sockaddr_equal(dest, &dispsock->host)) { + isc_sockaddr_equal(dest, &dispsock->host)) + { return (dispsock); } dispsock = ISC_LIST_NEXT(dispsock, blink); @@ -691,21 +654,20 @@ socket_search(dns_qid_t *qid, const isc_sockaddr_t *dest, in_port_t port, static isc_result_t get_dispsocket(dns_dispatch_t *disp, const isc_sockaddr_t *dest, isc_socketmgr_t *sockmgr, dispsocket_t **dispsockp, - in_port_t *portp) -{ - int i; - dns_dispatchmgr_t * mgr = disp->mgr; - isc_socket_t * sock = NULL; - isc_result_t result = ISC_R_FAILURE; - in_port_t port; - isc_sockaddr_t localaddr; - unsigned int bucket = 0; - dispsocket_t * dispsock; - unsigned int nports; - in_port_t * ports; + in_port_t *portp) { + int i; + dns_dispatchmgr_t *mgr = disp->mgr; + isc_socket_t *sock = NULL; + isc_result_t result = ISC_R_FAILURE; + in_port_t port; + isc_sockaddr_t localaddr; + unsigned int bucket = 0; + dispsocket_t *dispsock; + unsigned int nports; + in_port_t *ports; isc_socket_options_t bindoptions; - dispportentry_t * portentry = NULL; - dns_qid_t * qid; + dispportentry_t *portentry = NULL; + dns_qid_t *qid; if (isc_sockaddr_pf(&disp->local) == AF_INET) { nports = disp->mgr->nv4ports; @@ -820,10 +782,9 @@ get_dispsocket(dns_dispatch_t *disp, const isc_sockaddr_t *dest, * Destroy a dedicated dispatch socket. */ static void -destroy_dispsocket(dns_dispatch_t *disp, dispsocket_t **dispsockp) -{ +destroy_dispsocket(dns_dispatch_t *disp, dispsocket_t **dispsockp) { dispsocket_t *dispsock; - dns_qid_t * qid; + dns_qid_t *qid; /* * The dispatch must be locked. @@ -860,10 +821,9 @@ destroy_dispsocket(dns_dispatch_t *disp, dispsocket_t **dispsockp) * future reuse unless the total number of sockets are exceeding the maximum. */ static void -deactivate_dispsocket(dns_dispatch_t *disp, dispsocket_t *dispsock) -{ +deactivate_dispsocket(dns_dispatch_t *disp, dispsocket_t *dispsock) { isc_result_t result; - dns_qid_t * qid; + dns_qid_t *qid; /* * The dispatch must be locked. @@ -909,8 +869,7 @@ deactivate_dispsocket(dns_dispatch_t *disp, dispsocket_t *dispsock) */ static dns_dispentry_t * entry_search(dns_qid_t *qid, const isc_sockaddr_t *dest, dns_messageid_t id, - in_port_t port, unsigned int bucket) -{ + in_port_t port, unsigned int bucket) { dns_dispentry_t *res; REQUIRE(VALID_QID(qid)); @@ -930,8 +889,7 @@ entry_search(dns_qid_t *qid, const isc_sockaddr_t *dest, dns_messageid_t id, } static void -free_buffer(dns_dispatch_t *disp, void *buf, unsigned int len) -{ +free_buffer(dns_dispatch_t *disp, void *buf, unsigned int len) { isc_mempool_t *bpool; INSIST(buf != NULL && len != 0); @@ -957,10 +915,9 @@ free_buffer(dns_dispatch_t *disp, void *buf, unsigned int len) } static void * -allocate_udp_buffer(dns_dispatch_t *disp) -{ +allocate_udp_buffer(dns_dispatch_t *disp) { isc_mempool_t *bpool; - void * temp; + void *temp; LOCK(&disp->mgr->buffer_lock); if (disp->mgr->buffers >= disp->mgr->maxbuffers) { @@ -983,19 +940,17 @@ allocate_udp_buffer(dns_dispatch_t *disp) } static inline void -free_sevent(isc_event_t *ev) -{ - isc_mempool_t * pool = ev->ev_destroy_arg; +free_sevent(isc_event_t *ev) { + isc_mempool_t *pool = ev->ev_destroy_arg; isc_socketevent_t *sev = (isc_socketevent_t *)ev; isc_mempool_put(pool, sev); } static inline isc_socketevent_t * allocate_sevent(dns_dispatch_t *disp, isc_socket_t *sock, isc_eventtype_t type, - isc_taskaction_t action, const void *arg) -{ + isc_taskaction_t action, const void *arg) { isc_socketevent_t *ev; - void * deconst_arg; + void *deconst_arg; ev = isc_mempool_get(disp->sepool); if (ev == NULL) { @@ -1015,8 +970,7 @@ allocate_sevent(dns_dispatch_t *disp, isc_socket_t *sock, isc_eventtype_t type, } static inline void -free_devent(dns_dispatch_t *disp, dns_dispatchevent_t *ev) -{ +free_devent(dns_dispatch_t *disp, dns_dispatchevent_t *ev) { if (disp->failsafe_ev == ev) { INSIST(disp->shutdown_out == 1); disp->shutdown_out = 0; @@ -1028,8 +982,7 @@ free_devent(dns_dispatch_t *disp, dns_dispatchevent_t *ev) } static inline dns_dispatchevent_t * -allocate_devent(dns_dispatch_t *disp) -{ +allocate_devent(dns_dispatch_t *disp) { dns_dispatchevent_t *ev; ev = isc_mempool_get(disp->mgr->depool); @@ -1043,8 +996,7 @@ allocate_devent(dns_dispatch_t *disp) } static void -udp_exrecv(isc_task_t *task, isc_event_t *ev) -{ +udp_exrecv(isc_task_t *task, isc_event_t *ev) { dispsocket_t *dispsock = ev->ev_arg; UNUSED(task); @@ -1054,8 +1006,7 @@ udp_exrecv(isc_task_t *task, isc_event_t *ev) } static void -udp_shrecv(isc_task_t *task, isc_event_t *ev) -{ +udp_shrecv(isc_task_t *task, isc_event_t *ev) { dns_dispatch_t *disp = ev->ev_arg; UNUSED(task); @@ -1079,24 +1030,23 @@ udp_shrecv(isc_task_t *task, isc_event_t *ev) * restart. */ static void -udp_recv(isc_event_t *ev_in, dns_dispatch_t *disp, dispsocket_t *dispsock) -{ - isc_socketevent_t * ev = (isc_socketevent_t *)ev_in; - dns_messageid_t id; - isc_result_t dres; - isc_buffer_t source; - unsigned int flags; - dns_dispentry_t * resp = NULL; +udp_recv(isc_event_t *ev_in, dns_dispatch_t *disp, dispsocket_t *dispsock) { + isc_socketevent_t *ev = (isc_socketevent_t *)ev_in; + dns_messageid_t id; + isc_result_t dres; + isc_buffer_t source; + unsigned int flags; + dns_dispentry_t *resp = NULL; dns_dispatchevent_t *rev; - unsigned int bucket; - bool killit; - bool queue_response; - dns_dispatchmgr_t * mgr; - dns_qid_t * qid; - isc_netaddr_t netaddr; - int match; - int result; - bool qidlocked = false; + unsigned int bucket; + bool killit; + bool queue_response; + dns_dispatchmgr_t *mgr; + dns_qid_t *qid; + isc_netaddr_t netaddr; + int match; + int result; + bool qidlocked = false; LOCK(&disp->lock); @@ -1120,7 +1070,8 @@ udp_recv(isc_event_t *ev_in, dns_dispatch_t *disp, dispsocket_t *dispsock) } if (dispsock != NULL && - (ev->result == ISC_R_CANCELED || dispsock->resp == NULL)) { + (ev->result == ISC_R_CANCELED || dispsock->resp == NULL)) + { /* * dispsock->resp can be NULL if this transaction was canceled * just after receiving a response. Since this socket is @@ -1191,7 +1142,8 @@ udp_recv(isc_event_t *ev_in, dns_dispatch_t *disp, dispsocket_t *dispsock) if (disp->mgr->blackhole != NULL && dns_acl_match(&netaddr, NULL, disp->mgr->blackhole, NULL, &match, NULL) == ISC_R_SUCCESS && - match > 0) { + match > 0) + { if (isc_log_wouldlog(dns_lctx, LVL(10))) { char netaddrstr[ISC_NETADDR_FORMATSIZE]; isc_netaddr_format(&netaddr, netaddrstr, @@ -1272,7 +1224,8 @@ udp_recv(isc_event_t *ev_in, dns_dispatch_t *disp, dispsocket_t *dispsock) */ if (disp->socktype != resp->disp->socktype || isc_sockaddr_getport(&disp->local) != - isc_sockaddr_getport(&resp->disp->local)) { + isc_sockaddr_getport(&resp->disp->local)) + { free_buffer(disp, ev->region.base, ev->region.length); goto unlock; } @@ -1288,7 +1241,8 @@ udp_recv(isc_event_t *ev_in, dns_dispatch_t *disp, dispsocket_t *dispsock) * via IPv6. */ if (isc_sockaddr_pf(&resp->disp->local) == PF_INET6 && - isc_sockaddr_pf(&disp->local) != PF_INET6) { + isc_sockaddr_pf(&disp->local) != PF_INET6) + { free_buffer(disp, ev->region.base, ev->region.length); goto unlock; } @@ -1296,7 +1250,8 @@ udp_recv(isc_event_t *ev_in, dns_dispatch_t *disp, dispsocket_t *dispsock) isc_sockaddr_anyofpf(&a2, isc_sockaddr_pf(&disp->local)); if (!isc_sockaddr_eqaddr(&disp->local, &resp->disp->local) && !isc_sockaddr_eqaddr(&a1, &resp->disp->local) && - !isc_sockaddr_eqaddr(&a2, &disp->local)) { + !isc_sockaddr_eqaddr(&a2, &disp->local)) + { free_buffer(disp, ev->region.base, ev->region.length); goto unlock; } @@ -1373,21 +1328,20 @@ restart: * restart. */ static void -tcp_recv(isc_task_t *task, isc_event_t *ev_in) -{ - dns_dispatch_t * disp = ev_in->ev_arg; - dns_tcpmsg_t * tcpmsg = &disp->tcpmsg; - dns_messageid_t id; - isc_result_t dres; - unsigned int flags; - dns_dispentry_t * resp; +tcp_recv(isc_task_t *task, isc_event_t *ev_in) { + dns_dispatch_t *disp = ev_in->ev_arg; + dns_tcpmsg_t *tcpmsg = &disp->tcpmsg; + dns_messageid_t id; + isc_result_t dres; + unsigned int flags; + dns_dispentry_t *resp; dns_dispatchevent_t *rev; - unsigned int bucket; - bool killit; - bool queue_response; - dns_qid_t * qid; - int level; - char buf[ISC_SOCKADDR_FORMATSIZE]; + unsigned int bucket; + bool killit; + bool queue_response; + dns_qid_t *qid; + int level; + char buf[ISC_SOCKADDR_FORMATSIZE]; UNUSED(task); @@ -1548,10 +1502,9 @@ restart: * disp must be locked. */ static isc_result_t -startrecv(dns_dispatch_t *disp, dispsocket_t *dispsock) -{ - isc_result_t res; - isc_region_t region; +startrecv(dns_dispatch_t *disp, dispsocket_t *dispsock) { + isc_result_t res; + isc_region_t region; isc_socket_t *sock; if (disp->shutting_down == 1) { @@ -1589,7 +1542,7 @@ startrecv(dns_dispatch_t *disp, dispsocket_t *dispsock) return (ISC_R_NOMEMORY); } if (dispsock != NULL) { - isc_task_t * dt = dispsock->task; + isc_task_t *dt = dispsock->task; isc_socketevent_t *sev = allocate_sevent( disp, sock, ISC_SOCKEVENT_RECVDONE, udp_exrecv, dispsock); @@ -1604,7 +1557,7 @@ startrecv(dns_dispatch_t *disp, dispsocket_t *dispsock) return (res); } } else { - isc_task_t * dt = disp->task[0]; + isc_task_t *dt = disp->task[0]; isc_socketevent_t *sev = allocate_sevent( disp, sock, ISC_SOCKEVENT_RECVDONE, udp_shrecv, disp); @@ -1650,8 +1603,7 @@ startrecv(dns_dispatch_t *disp, dispsocket_t *dispsock) * Mgr must be locked when calling this function. */ static bool -destroy_mgr_ok(dns_dispatchmgr_t *mgr) -{ +destroy_mgr_ok(dns_dispatchmgr_t *mgr) { mgr_log(mgr, LVL(90), "destroy_mgr_ok: shuttingdown=%d, listnonempty=%d, " "depool=%d, rpool=%d, dpool=%d", @@ -1682,8 +1634,7 @@ destroy_mgr_ok(dns_dispatchmgr_t *mgr) * Mgr must be unlocked when calling this function. */ static void -destroy_mgr(dns_dispatchmgr_t **mgrp) -{ +destroy_mgr(dns_dispatchmgr_t **mgrp) { dns_dispatchmgr_t *mgr; mgr = *mgrp; @@ -1737,10 +1688,9 @@ destroy_mgr(dns_dispatchmgr_t **mgrp) 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) -{ + isc_socket_t *dup_socket, bool duponly) { isc_socket_t *sock; - isc_result_t result; + isc_result_t result; sock = *sockp; if (sock != NULL) { @@ -1792,8 +1742,7 @@ open_socket(isc_socketmgr_t *mgr, const isc_sockaddr_t *local, * cases. */ static isc_result_t -create_default_portset(isc_mem_t *mctx, isc_portset_t **portsetp) -{ +create_default_portset(isc_mem_t *mctx, isc_portset_t **portsetp) { isc_result_t result; result = isc_portset_create(mctx, portsetp); @@ -1810,12 +1759,11 @@ create_default_portset(isc_mem_t *mctx, isc_portset_t **portsetp) */ isc_result_t -dns_dispatchmgr_create(isc_mem_t *mctx, dns_dispatchmgr_t **mgrp) -{ +dns_dispatchmgr_create(isc_mem_t *mctx, dns_dispatchmgr_t **mgrp) { dns_dispatchmgr_t *mgr; - isc_result_t result; - isc_portset_t * v4portset = NULL; - isc_portset_t * v6portset = NULL; + isc_result_t result; + isc_portset_t *v4portset = NULL; + isc_portset_t *v6portset = NULL; REQUIRE(mctx != NULL); REQUIRE(mgrp != NULL && *mgrp == NULL); @@ -1916,8 +1864,7 @@ kill_dpool: } void -dns_dispatchmgr_setblackhole(dns_dispatchmgr_t *mgr, dns_acl_t *blackhole) -{ +dns_dispatchmgr_setblackhole(dns_dispatchmgr_t *mgr, dns_acl_t *blackhole) { REQUIRE(VALID_DISPATCHMGR(mgr)); if (mgr->blackhole != NULL) { dns_acl_detach(&mgr->blackhole); @@ -1926,16 +1873,14 @@ dns_dispatchmgr_setblackhole(dns_dispatchmgr_t *mgr, dns_acl_t *blackhole) } dns_acl_t * -dns_dispatchmgr_getblackhole(dns_dispatchmgr_t *mgr) -{ +dns_dispatchmgr_getblackhole(dns_dispatchmgr_t *mgr) { REQUIRE(VALID_DISPATCHMGR(mgr)); return (mgr->blackhole); } void dns_dispatchmgr_setblackportlist(dns_dispatchmgr_t *mgr, - dns_portlist_t * portlist) -{ + dns_portlist_t *portlist) { REQUIRE(VALID_DISPATCHMGR(mgr)); UNUSED(portlist); @@ -1944,17 +1889,15 @@ dns_dispatchmgr_setblackportlist(dns_dispatchmgr_t *mgr, } dns_portlist_t * -dns_dispatchmgr_getblackportlist(dns_dispatchmgr_t *mgr) -{ +dns_dispatchmgr_getblackportlist(dns_dispatchmgr_t *mgr) { REQUIRE(VALID_DISPATCHMGR(mgr)); return (NULL); /* this function is deprecated */ } isc_result_t dns_dispatchmgr_setavailports(dns_dispatchmgr_t *mgr, isc_portset_t *v4portset, - isc_portset_t *v6portset) -{ - in_port_t * v4ports, *v6ports, p; + isc_portset_t *v6portset) { + in_port_t *v4ports, *v6ports, p; unsigned int nv4ports, nv6ports, i4, i6; REQUIRE(VALID_DISPATCHMGR(mgr)); @@ -2008,8 +1951,7 @@ dns_dispatchmgr_setavailports(dns_dispatchmgr_t *mgr, isc_portset_t *v4portset, static isc_result_t dns_dispatchmgr_setudp(dns_dispatchmgr_t *mgr, unsigned int buffersize, unsigned int maxbuffers, unsigned int maxrequests, - unsigned int buckets, unsigned int increment) -{ + unsigned int buckets, unsigned int increment) { isc_result_t result; REQUIRE(VALID_DISPATCHMGR(mgr)); @@ -2100,10 +2042,9 @@ cleanup: } void -dns_dispatchmgr_destroy(dns_dispatchmgr_t **mgrp) -{ +dns_dispatchmgr_destroy(dns_dispatchmgr_t **mgrp) { dns_dispatchmgr_t *mgr; - bool killit; + bool killit; REQUIRE(mgrp != NULL); REQUIRE(VALID_DISPATCHMGR(*mgrp)); @@ -2124,8 +2065,7 @@ dns_dispatchmgr_destroy(dns_dispatchmgr_t **mgrp) } void -dns_dispatchmgr_setstats(dns_dispatchmgr_t *mgr, isc_stats_t *stats) -{ +dns_dispatchmgr_setstats(dns_dispatchmgr_t *mgr, isc_stats_t *stats) { REQUIRE(VALID_DISPATCHMGR(mgr)); REQUIRE(ISC_LIST_EMPTY(mgr->list)); REQUIRE(mgr->stats == NULL); @@ -2134,8 +2074,7 @@ dns_dispatchmgr_setstats(dns_dispatchmgr_t *mgr, isc_stats_t *stats) } static int -port_cmp(const void *key, const void *ent) -{ +port_cmp(const void *key, const void *ent) { in_port_t p1 = *(const in_port_t *)key; in_port_t p2 = *(const in_port_t *)ent; @@ -2150,13 +2089,12 @@ port_cmp(const void *key, const void *ent) static bool portavailable(dns_dispatchmgr_t *mgr, isc_socket_t *sock, - isc_sockaddr_t *sockaddrp) -{ + isc_sockaddr_t *sockaddrp) { isc_sockaddr_t sockaddr; - isc_result_t result; - in_port_t * ports, port; - unsigned int nports; - bool available = false; + isc_result_t result; + in_port_t *ports, port; + unsigned int nports; + bool available = false; REQUIRE(sock != NULL || sockaddrp != NULL); @@ -2181,8 +2119,8 @@ portavailable(dns_dispatchmgr_t *mgr, isc_socket_t *sock, } port = isc_sockaddr_getport(sockaddrp); - if (bsearch(&port, ports, nports, sizeof(in_port_t), port_cmp) != - NULL) { + if (bsearch(&port, ports, nports, sizeof(in_port_t), port_cmp) != NULL) + { available = true; } @@ -2194,10 +2132,9 @@ unlock: #define ATTRMATCH(_a1, _a2, _mask) (((_a1) & (_mask)) == ((_a2) & (_mask))) static bool -local_addr_match(dns_dispatch_t *disp, const isc_sockaddr_t *addr) -{ +local_addr_match(dns_dispatch_t *disp, const isc_sockaddr_t *addr) { isc_sockaddr_t sockaddr; - isc_result_t result; + isc_result_t result; REQUIRE(disp->socket != NULL); @@ -2211,7 +2148,8 @@ local_addr_match(dns_dispatch_t *disp, const isc_sockaddr_t *addr) */ if (isc_sockaddr_getport(addr) == 0 && isc_sockaddr_getport(&disp->local) == 0 && - !portavailable(disp->mgr, disp->socket, NULL)) { + !portavailable(disp->mgr, disp->socket, NULL)) + { return (false); } @@ -2253,10 +2191,9 @@ local_addr_match(dns_dispatch_t *disp, const isc_sockaddr_t *addr) static isc_result_t dispatch_find(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *local, unsigned int attributes, unsigned int mask, - dns_dispatch_t **dispp) -{ + dns_dispatch_t **dispp) { dns_dispatch_t *disp; - isc_result_t result; + isc_result_t result; /* * Make certain that we will not match a private or exclusive dispatch. @@ -2269,7 +2206,8 @@ dispatch_find(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *local, LOCK(&disp->lock); if ((disp->shutting_down == 0) && ATTRMATCH(disp->attributes, attributes, mask) && - local_addr_match(disp, local)) { + local_addr_match(disp, local)) + { break; } UNLOCK(&disp->lock); @@ -2290,9 +2228,8 @@ out: static isc_result_t qid_allocate(dns_dispatchmgr_t *mgr, unsigned int buckets, - unsigned int increment, dns_qid_t **qidp, bool needsocktable) -{ - dns_qid_t * qid; + unsigned int increment, dns_qid_t **qidp, bool needsocktable) { + dns_qid_t *qid; unsigned int i; REQUIRE(VALID_DISPATCHMGR(mgr)); @@ -2302,8 +2239,8 @@ qid_allocate(dns_dispatchmgr_t *mgr, unsigned int buckets, qid = isc_mem_get(mgr->mctx, sizeof(*qid)); - qid->qid_table = - isc_mem_get(mgr->mctx, buckets * sizeof(dns_displist_t)); + qid->qid_table = isc_mem_get(mgr->mctx, + buckets * sizeof(dns_displist_t)); qid->sock_table = NULL; if (needsocktable) { @@ -2328,8 +2265,7 @@ qid_allocate(dns_dispatchmgr_t *mgr, unsigned int buckets, } static void -qid_destroy(isc_mem_t *mctx, dns_qid_t **qidp) -{ +qid_destroy(isc_mem_t *mctx, dns_qid_t **qidp) { dns_qid_t *qid; REQUIRE(qidp != NULL); @@ -2354,10 +2290,9 @@ qid_destroy(isc_mem_t *mctx, dns_qid_t **qidp) */ static isc_result_t dispatch_allocate(dns_dispatchmgr_t *mgr, unsigned int maxrequests, - dns_dispatch_t **dispp) -{ + dns_dispatch_t **dispp) { dns_dispatch_t *disp; - isc_result_t result; + isc_result_t result; REQUIRE(VALID_DISPATCHMGR(mgr)); REQUIRE(dispp != NULL && *dispp == NULL); @@ -2424,9 +2359,8 @@ kill_lock: * MUST be unlocked, and not used by anything. */ static void -dispatch_free(dns_dispatch_t **dispp) -{ - dns_dispatch_t * disp; +dispatch_free(dns_dispatch_t **dispp) { + dns_dispatch_t *disp; dns_dispatchmgr_t *mgr; REQUIRE(VALID_DISPATCH(*dispp)); @@ -2479,9 +2413,8 @@ dns_dispatch_createtcp(dns_dispatchmgr_t *mgr, isc_socket_t *sock, const isc_sockaddr_t *destaddr, unsigned int buffersize, unsigned int maxbuffers, unsigned int maxrequests, unsigned int buckets, unsigned int increment, - unsigned int attributes, dns_dispatch_t **dispp) -{ - isc_result_t result; + unsigned int attributes, dns_dispatch_t **dispp) { + isc_result_t result; dns_dispatch_t *disp; UNUSED(maxbuffers); @@ -2582,14 +2515,13 @@ deallocate_dispatch: isc_result_t dns_dispatch_gettcp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *destaddr, const isc_sockaddr_t *localaddr, bool *connected, - dns_dispatch_t **dispp) -{ + dns_dispatch_t **dispp) { dns_dispatch_t *disp; - isc_result_t result; - isc_sockaddr_t peeraddr; - isc_sockaddr_t sockname; - unsigned int attributes, mask; - bool match = false; + isc_result_t result; + isc_sockaddr_t peeraddr; + isc_sockaddr_t sockname; + unsigned int attributes, mask; + bool match = false; REQUIRE(VALID_DISPATCHMGR(mgr)); REQUIRE(destaddr != NULL); @@ -2607,9 +2539,10 @@ dns_dispatch_gettcp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *destaddr, if ((disp->shutting_down == 0) && ATTRMATCH(disp->attributes, attributes, mask) && (localaddr == NULL || - isc_sockaddr_eqaddr(localaddr, &disp->local))) { - result = - isc_socket_getsockname(disp->socket, &sockname); + isc_sockaddr_eqaddr(localaddr, &disp->local))) + { + result = isc_socket_getsockname(disp->socket, + &sockname); if (result == ISC_R_SUCCESS) { result = isc_socket_getpeername(disp->socket, &peeraddr); @@ -2617,7 +2550,8 @@ dns_dispatch_gettcp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *destaddr, if (result == ISC_R_SUCCESS && isc_sockaddr_equal(destaddr, &peeraddr) && (localaddr == NULL || - isc_sockaddr_eqaddr(localaddr, &sockname))) { + isc_sockaddr_eqaddr(localaddr, &sockname))) + { /* attach */ disp->refcount++; *dispp = disp; @@ -2645,7 +2579,8 @@ dns_dispatch_gettcp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *destaddr, ATTRMATCH(disp->attributes, attributes, mask) && (localaddr == NULL || isc_sockaddr_eqaddr(localaddr, &disp->local)) && - isc_sockaddr_equal(destaddr, &disp->peer)) { + isc_sockaddr_equal(destaddr, &disp->peer)) + { /* attach */ disp->refcount++; *dispp = disp; @@ -2665,9 +2600,8 @@ dns_dispatch_getudp_dup(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr, unsigned int maxrequests, unsigned int buckets, unsigned int increment, unsigned int attributes, unsigned int mask, dns_dispatch_t **dispp, - dns_dispatch_t *dup_dispatch) -{ - isc_result_t result; + dns_dispatch_t *dup_dispatch) { + isc_result_t result; dns_dispatch_t *disp = NULL; REQUIRE(VALID_DISPATCHMGR(mgr)); @@ -2708,7 +2642,8 @@ dns_dispatch_getudp_dup(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr, if ((disp->attributes & DNS_DISPATCHATTR_NOLISTEN) == 0 && - (attributes & DNS_DISPATCHATTR_NOLISTEN) != 0) { + (attributes & DNS_DISPATCHATTR_NOLISTEN) != 0) + { disp->attributes |= DNS_DISPATCHATTR_NOLISTEN; if (disp->recv_pending != 0) { isc_socket_cancel(disp->socket, @@ -2751,8 +2686,7 @@ dns_dispatch_getudp(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr, unsigned int buffersize, unsigned int maxbuffers, unsigned int maxrequests, unsigned int buckets, unsigned int increment, unsigned int attributes, - unsigned int mask, dns_dispatch_t **dispp) -{ + unsigned int mask, dns_dispatch_t **dispp) { return (dns_dispatch_getudp_dup(mgr, sockmgr, taskmgr, localaddr, buffersize, maxbuffers, maxrequests, buckets, increment, attributes, mask, @@ -2770,14 +2704,13 @@ dns_dispatch_getudp(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr, static isc_result_t get_udpsocket(dns_dispatchmgr_t *mgr, dns_dispatch_t *disp, isc_socketmgr_t *sockmgr, const isc_sockaddr_t *localaddr, - isc_socket_t **sockp, isc_socket_t *dup_socket, bool duponly) -{ - unsigned int i, j; - isc_socket_t * held[DNS_DISPATCH_HELD]; + isc_socket_t **sockp, isc_socket_t *dup_socket, bool duponly) { + unsigned int i, j; + isc_socket_t *held[DNS_DISPATCH_HELD]; isc_sockaddr_t localaddr_bound; - isc_socket_t * sock = NULL; - isc_result_t result = ISC_R_SUCCESS; - bool anyport; + isc_socket_t *sock = NULL; + isc_result_t result = ISC_R_SUCCESS; + bool anyport; INSIST(sockp != NULL && *sockp == NULL); @@ -2786,7 +2719,7 @@ get_udpsocket(dns_dispatchmgr_t *mgr, dns_dispatch_t *disp, if (anyport) { unsigned int nports; - in_port_t * ports; + in_port_t *ports; /* * If no port is specified, we first try to pick up a random @@ -2814,8 +2747,8 @@ get_udpsocket(dns_dispatchmgr_t *mgr, dns_dispatch_t *disp, * Continue if the port choosen is already in use * or the OS has reserved it. */ - if (result == ISC_R_NOPERM || - result == ISC_R_ADDRINUSE) { + if (result == ISC_R_NOPERM || result == ISC_R_ADDRINUSE) + { continue; } disp->localport = prt; @@ -2883,12 +2816,11 @@ 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) -{ - isc_result_t result; + dns_dispatch_t **dispp, isc_socket_t *dup_socket) { + isc_result_t result; dns_dispatch_t *disp; - isc_socket_t * sock = NULL; - int i = 0; + isc_socket_t *sock = NULL; + int i = 0; bool duponly = ((attributes & DNS_DISPATCHATTR_CANREUSE) == 0); /* This is an attribute needed only at creation time */ @@ -3023,8 +2955,7 @@ deallocate_dispatch: } void -dns_dispatch_attach(dns_dispatch_t *disp, dns_dispatch_t **dispp) -{ +dns_dispatch_attach(dns_dispatch_t *disp, dns_dispatch_t **dispp) { REQUIRE(VALID_DISPATCH(disp)); REQUIRE(dispp != NULL && *dispp == NULL); @@ -3043,11 +2974,10 @@ dns_dispatch_attach(dns_dispatch_t *disp, dns_dispatch_t **dispp) * to a dispatcher that is in the process of going away. */ void -dns_dispatch_detach(dns_dispatch_t **dispp) -{ +dns_dispatch_detach(dns_dispatch_t **dispp) { dns_dispatch_t *disp; - dispsocket_t * dispsock; - bool killit; + dispsocket_t *dispsock; + bool killit; REQUIRE(dispp != NULL && VALID_DISPATCH(*dispp)); @@ -3064,8 +2994,8 @@ dns_dispatch_detach(dns_dispatch_t **dispp) ISC_SOCKCANCEL_RECV); } for (dispsock = ISC_LIST_HEAD(disp->activesockets); - dispsock != NULL; - dispsock = ISC_LIST_NEXT(dispsock, link)) { + dispsock != NULL; dispsock = ISC_LIST_NEXT(dispsock, link)) + { isc_socket_cancel(dispsock->socket, dispsock->task, ISC_SOCKCANCEL_RECV); } @@ -3086,17 +3016,16 @@ dns_dispatch_addresponse(dns_dispatch_t *disp, unsigned int options, const isc_sockaddr_t *dest, isc_task_t *task, isc_taskaction_t action, void *arg, dns_messageid_t *idp, dns_dispentry_t **resp, - isc_socketmgr_t *sockmgr) -{ + isc_socketmgr_t *sockmgr) { dns_dispentry_t *res; - unsigned int bucket; - in_port_t localport = 0; - dns_messageid_t id; - int i; - bool ok; - dns_qid_t * qid; - dispsocket_t * dispsocket = NULL; - isc_result_t result; + unsigned int bucket; + in_port_t localport = 0; + dns_messageid_t id; + int i; + bool ok; + dns_qid_t *qid; + dispsocket_t *dispsocket = NULL; + isc_result_t result; REQUIRE(VALID_DISPATCH(disp)); REQUIRE(task != NULL); @@ -3120,9 +3049,10 @@ dns_dispatch_addresponse(dns_dispatch_t *disp, unsigned int options, } if ((disp->attributes & DNS_DISPATCHATTR_EXCLUSIVE) != 0 && - disp->nsockets > DNS_DISPATCH_SOCKSQUOTA) { - dispsocket_t * oldestsocket; - dns_dispentry_t * oldestresp; + disp->nsockets > DNS_DISPATCH_SOCKSQUOTA) + { + dispsocket_t *oldestsocket; + dns_dispentry_t *oldestresp; dns_dispatchevent_t *rev; /* @@ -3246,7 +3176,8 @@ dns_dispatch_addresponse(dns_dispatch_t *disp, unsigned int options, request_log(disp, res, LVL(90), "attached to task %p", res->task); if (((disp->attributes & DNS_DISPATCHATTR_UDP) != 0) || - ((disp->attributes & DNS_DISPATCHATTR_CONNECTED) != 0)) { + ((disp->attributes & DNS_DISPATCHATTR_CONNECTED) != 0)) + { result = startrecv(disp, dispsocket); if (result != ISC_R_SUCCESS) { LOCK(&qid->lock); @@ -3289,8 +3220,7 @@ dns_dispatch_addresponse(dns_dispatch_t *disp, unsigned int options, } void -dns_dispatch_starttcp(dns_dispatch_t *disp) -{ +dns_dispatch_starttcp(dns_dispatch_t *disp) { REQUIRE(VALID_DISPATCH(disp)); dispatch_log(disp, LVL(90), "starttcp %p", disp->task[0]); @@ -3304,9 +3234,8 @@ dns_dispatch_starttcp(dns_dispatch_t *disp) } isc_result_t -dns_dispatch_getnext(dns_dispentry_t *resp, dns_dispatchevent_t **sockevent) -{ - dns_dispatch_t * disp; +dns_dispatch_getnext(dns_dispentry_t *resp, dns_dispatchevent_t **sockevent) { + dns_dispatch_t *disp; dns_dispatchevent_t *ev; REQUIRE(VALID_RESPONSE(resp)); @@ -3348,19 +3277,18 @@ dns_dispatch_getnext(dns_dispentry_t *resp, dns_dispatchevent_t **sockevent) } void -dns_dispatch_removeresponse(dns_dispentry_t ** resp, - dns_dispatchevent_t **sockevent) -{ - dns_dispatchmgr_t * mgr; - dns_dispatch_t * disp; - dns_dispentry_t * res; - dispsocket_t * dispsock; +dns_dispatch_removeresponse(dns_dispentry_t **resp, + dns_dispatchevent_t **sockevent) { + dns_dispatchmgr_t *mgr; + dns_dispatch_t *disp; + dns_dispentry_t *res; + dispsocket_t *dispsock; dns_dispatchevent_t *ev; - unsigned int bucket; - bool killit; - unsigned int n; - isc_eventlist_t events; - dns_qid_t * qid; + unsigned int bucket; + bool killit; + unsigned int n; + isc_eventlist_t events; + dns_qid_t *qid; REQUIRE(resp != NULL); REQUIRE(VALID_RESPONSE(*resp)); @@ -3398,8 +3326,8 @@ dns_dispatch_removeresponse(dns_dispentry_t ** resp, ISC_SOCKCANCEL_RECV); } for (dispsock = ISC_LIST_HEAD(disp->activesockets); - dispsock != NULL; - dispsock = ISC_LIST_NEXT(dispsock, link)) { + dispsock != NULL; dispsock = ISC_LIST_NEXT(dispsock, link)) + { isc_socket_cancel(dispsock->socket, dispsock->task, ISC_SOCKCANCEL_RECV); } @@ -3476,11 +3404,10 @@ dns_dispatch_removeresponse(dns_dispentry_t ** resp, * disp must be locked. */ static void -do_cancel(dns_dispatch_t *disp) -{ +do_cancel(dns_dispatch_t *disp) { dns_dispatchevent_t *ev; - dns_dispentry_t * resp; - dns_qid_t * qid; + dns_dispentry_t *resp; + dns_qid_t *qid; if (disp->shutdown_out == 1) { return; @@ -3494,7 +3421,8 @@ do_cancel(dns_dispatch_t *disp) */ LOCK(&qid->lock); for (resp = linear_first(qid); resp != NULL && resp->item_out; - /* Empty. */) { + /* Empty. */) + { resp = linear_next(qid, resp); } @@ -3524,16 +3452,14 @@ unlock: } isc_socket_t * -dns_dispatch_getsocket(dns_dispatch_t *disp) -{ +dns_dispatch_getsocket(dns_dispatch_t *disp) { REQUIRE(VALID_DISPATCH(disp)); return (disp->socket); } isc_socket_t * -dns_dispatch_getentrysocket(dns_dispentry_t *resp) -{ +dns_dispatch_getentrysocket(dns_dispentry_t *resp) { REQUIRE(VALID_RESPONSE(resp)); if (resp->dispsocket != NULL) { @@ -3544,8 +3470,7 @@ dns_dispatch_getentrysocket(dns_dispentry_t *resp) } isc_result_t -dns_dispatch_getlocaladdress(dns_dispatch_t *disp, isc_sockaddr_t *addrp) -{ +dns_dispatch_getlocaladdress(dns_dispatch_t *disp, isc_sockaddr_t *addrp) { REQUIRE(VALID_DISPATCH(disp)); REQUIRE(addrp != NULL); @@ -3557,8 +3482,7 @@ dns_dispatch_getlocaladdress(dns_dispatch_t *disp, isc_sockaddr_t *addrp) } void -dns_dispatch_cancel(dns_dispatch_t *disp) -{ +dns_dispatch_cancel(dns_dispatch_t *disp) { REQUIRE(VALID_DISPATCH(disp)); LOCK(&disp->lock); @@ -3578,8 +3502,7 @@ dns_dispatch_cancel(dns_dispatch_t *disp) } unsigned int -dns_dispatch_getattributes(dns_dispatch_t *disp) -{ +dns_dispatch_getattributes(dns_dispatch_t *disp) { REQUIRE(VALID_DISPATCH(disp)); /* @@ -3591,8 +3514,7 @@ dns_dispatch_getattributes(dns_dispatch_t *disp) void dns_dispatch_changeattributes(dns_dispatch_t *disp, unsigned int attributes, - unsigned int mask) -{ + unsigned int mask) { REQUIRE(VALID_DISPATCH(disp)); /* Exclusive attribute can only be set on creation */ REQUIRE((attributes & DNS_DISPATCHATTR_EXCLUSIVE) == 0); @@ -3608,12 +3530,14 @@ dns_dispatch_changeattributes(dns_dispatch_t *disp, unsigned int attributes, if ((mask & DNS_DISPATCHATTR_NOLISTEN) != 0) { if ((disp->attributes & DNS_DISPATCHATTR_NOLISTEN) != 0 && - (attributes & DNS_DISPATCHATTR_NOLISTEN) == 0) { + (attributes & DNS_DISPATCHATTR_NOLISTEN) == 0) + { disp->attributes &= ~DNS_DISPATCHATTR_NOLISTEN; (void)startrecv(disp, NULL); } else if ((disp->attributes & DNS_DISPATCHATTR_NOLISTEN) == 0 && - (attributes & DNS_DISPATCHATTR_NOLISTEN) != 0) { + (attributes & DNS_DISPATCHATTR_NOLISTEN) != 0) + { disp->attributes |= DNS_DISPATCHATTR_NOLISTEN; if (disp->recv_pending != 0) { isc_socket_cancel(disp->socket, disp->task[0], @@ -3628,9 +3552,8 @@ dns_dispatch_changeattributes(dns_dispatch_t *disp, unsigned int attributes, } void -dns_dispatch_importrecv(dns_dispatch_t *disp, isc_event_t *event) -{ - void * buf; +dns_dispatch_importrecv(dns_dispatch_t *disp, isc_event_t *event) { + void *buf; isc_socketevent_t *sevent, *newsevent; REQUIRE(VALID_DISPATCH(disp)); @@ -3666,8 +3589,7 @@ dns_dispatch_importrecv(dns_dispatch_t *disp, isc_event_t *event) } dns_dispatch_t * -dns_dispatchset_get(dns_dispatchset_t *dset) -{ +dns_dispatchset_get(dns_dispatchset_t *dset) { dns_dispatch_t *disp; /* check that dispatch set is configured */ @@ -3689,12 +3611,11 @@ dns_dispatchset_get(dns_dispatchset_t *dset) isc_result_t dns_dispatchset_create(isc_mem_t *mctx, isc_socketmgr_t *sockmgr, isc_taskmgr_t *taskmgr, dns_dispatch_t *source, - dns_dispatchset_t **dsetp, int n) -{ - isc_result_t result; + dns_dispatchset_t **dsetp, int n) { + isc_result_t result; dns_dispatchset_t *dset; dns_dispatchmgr_t *mgr; - int i, j; + int i, j; REQUIRE(VALID_DISPATCH(source)); REQUIRE((source->attributes & DNS_DISPATCHATTR_UDP) != 0); @@ -3750,8 +3671,7 @@ fail: } void -dns_dispatchset_cancelall(dns_dispatchset_t *dset, isc_task_t *task) -{ +dns_dispatchset_cancelall(dns_dispatchset_t *dset, isc_task_t *task) { int i; REQUIRE(dset != NULL); @@ -3764,10 +3684,9 @@ dns_dispatchset_cancelall(dns_dispatchset_t *dset, isc_task_t *task) } void -dns_dispatchset_destroy(dns_dispatchset_t **dsetp) -{ +dns_dispatchset_destroy(dns_dispatchset_t **dsetp) { dns_dispatchset_t *dset; - int i; + int i; REQUIRE(dsetp != NULL && *dsetp != NULL); @@ -3783,15 +3702,13 @@ dns_dispatchset_destroy(dns_dispatchset_t **dsetp) } void -dns_dispatch_setdscp(dns_dispatch_t *disp, isc_dscp_t dscp) -{ +dns_dispatch_setdscp(dns_dispatch_t *disp, isc_dscp_t dscp) { REQUIRE(VALID_DISPATCH(disp)); disp->dscp = dscp; } isc_dscp_t -dns_dispatch_getdscp(dns_dispatch_t *disp) -{ +dns_dispatch_getdscp(dns_dispatch_t *disp) { REQUIRE(VALID_DISPATCH(disp)); return (disp->dscp); } diff --git a/lib/dns/dlz.c b/lib/dns/dlz.c index f9523c9a60..31342a0559 100644 --- a/lib/dns/dlz.c +++ b/lib/dns/dlz.c @@ -75,11 +75,10 @@ static ISC_LIST(dns_dlzimplementation_t) dlz_implementations; static isc_rwlock_t dlz_implock; -static isc_once_t once = ISC_ONCE_INIT; +static isc_once_t once = ISC_ONCE_INIT; static void -dlz_initialize(void) -{ +dlz_initialize(void) { RUNTIME_CHECK(isc_rwlock_init(&dlz_implock, 0, 0) == ISC_R_SUCCESS); ISC_LIST_INIT(dlz_implementations); } @@ -88,12 +87,12 @@ dlz_initialize(void) * Searches the dlz_implementations list for a driver matching name. */ static inline dns_dlzimplementation_t * -dlz_impfind(const char *name) -{ +dlz_impfind(const char *name) { dns_dlzimplementation_t *imp; for (imp = ISC_LIST_HEAD(dlz_implementations); imp != NULL; - imp = ISC_LIST_NEXT(imp, link)) { + imp = ISC_LIST_NEXT(imp, link)) + { if (strcasecmp(name, imp->name) == 0) { return (imp); } @@ -107,11 +106,10 @@ dlz_impfind(const char *name) isc_result_t dns_dlzallowzonexfr(dns_view_t *view, const dns_name_t *name, - const isc_sockaddr_t *clientaddr, dns_db_t **dbp) -{ - isc_result_t result = ISC_R_NOTFOUND; + const isc_sockaddr_t *clientaddr, dns_db_t **dbp) { + isc_result_t result = ISC_R_NOTFOUND; dns_dlzallowzonexfr_t allowzonexfr; - dns_dlzdb_t * dlzdb; + dns_dlzdb_t *dlzdb; /* * Performs checks to make sure data is as we expect it to be. @@ -123,7 +121,8 @@ dns_dlzallowzonexfr(dns_view_t *view, const dns_name_t *name, * Find a driver in which the zone exists and transfer is supported */ for (dlzdb = ISC_LIST_HEAD(view->dlz_searched); dlzdb != NULL; - dlzdb = ISC_LIST_NEXT(dlzdb, link)) { + dlzdb = ISC_LIST_NEXT(dlzdb, link)) + { REQUIRE(DNS_DLZ_VALID(dlzdb)); allowzonexfr = dlzdb->implementation->methods->allowzonexfr; @@ -154,11 +153,10 @@ dns_dlzallowzonexfr(dns_view_t *view, const dns_name_t *name, isc_result_t dns_dlzcreate(isc_mem_t *mctx, const char *dlzname, const char *drivername, - unsigned int argc, char *argv[], dns_dlzdb_t **dbp) -{ + unsigned int argc, char *argv[], dns_dlzdb_t **dbp) { dns_dlzimplementation_t *impinfo; - isc_result_t result; - dns_dlzdb_t * db = NULL; + isc_result_t result; + dns_dlzdb_t *db = NULL; /* * initialize the dlz_implementations list, this is guaranteed @@ -235,10 +233,9 @@ dns_dlzcreate(isc_mem_t *mctx, const char *dlzname, const char *drivername, } void -dns_dlzdestroy(dns_dlzdb_t **dbp) -{ +dns_dlzdestroy(dns_dlzdb_t **dbp) { dns_dlzdestroy_t destroy; - dns_dlzdb_t * db; + dns_dlzdb_t *db; /* Write debugging message to log */ isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DLZ, @@ -273,8 +270,7 @@ dns_dlzdestroy(dns_dlzdb_t **dbp) isc_result_t dns_dlzregister(const char *drivername, const dns_dlzmethods_t *methods, void *driverarg, isc_mem_t *mctx, - dns_dlzimplementation_t **dlzimp) -{ + dns_dlzimplementation_t **dlzimp) { dns_dlzimplementation_t *dlz_imp; /* Write debugging message to log */ @@ -357,8 +353,7 @@ dns_dlzregister(const char *drivername, const dns_dlzmethods_t *methods, * is modified in-place. */ isc_result_t -dns_dlzstrtoargv(isc_mem_t *mctx, char *s, unsigned int *argcp, char ***argvp) -{ +dns_dlzstrtoargv(isc_mem_t *mctx, char *s, unsigned int *argcp, char ***argvp) { return (isc_commandline_strtoargv(mctx, s, argcp, argvp, 0)); } @@ -367,8 +362,7 @@ dns_dlzstrtoargv(isc_mem_t *mctx, char *s, unsigned int *argcp, char ***argvp) * driver from the list of available drivers in the dlz_implementations list. */ void -dns_dlzunregister(dns_dlzimplementation_t **dlzimp) -{ +dns_dlzunregister(dns_dlzimplementation_t **dlzimp) { dns_dlzimplementation_t *dlz_imp; /* Write debugging message to log */ @@ -415,14 +409,13 @@ dns_dlzunregister(dns_dlzimplementation_t **dlzimp) */ isc_result_t dns_dlz_writeablezone(dns_view_t *view, dns_dlzdb_t *dlzdb, - const char *zone_name) -{ - dns_zone_t * zone = NULL; - dns_zone_t * dupzone = NULL; - isc_result_t result; - isc_buffer_t buffer; + const char *zone_name) { + dns_zone_t *zone = NULL; + dns_zone_t *dupzone = NULL; + isc_result_t result; + isc_buffer_t buffer; dns_fixedname_t fixorigin; - dns_name_t * origin; + dns_name_t *origin; REQUIRE(DNS_DLZ_VALID(dlzdb)); @@ -500,10 +493,9 @@ cleanup: */ isc_result_t dns_dlzconfigure(dns_view_t *view, dns_dlzdb_t *dlzdb, - dlzconfigure_callback_t callback) -{ + dlzconfigure_callback_t callback) { dns_dlzimplementation_t *impl; - isc_result_t result; + isc_result_t result; REQUIRE(DNS_DLZ_VALID(dlzdb)); REQUIRE(dlzdb->implementation != NULL); @@ -524,10 +516,9 @@ dns_dlzconfigure(dns_view_t *view, dns_dlzdb_t *dlzdb, bool dns_dlz_ssumatch(dns_dlzdb_t *dlzdatabase, const dns_name_t *signer, const dns_name_t *name, const isc_netaddr_t *tcpaddr, - dns_rdatatype_t type, const dst_key_t *key) -{ + dns_rdatatype_t type, const dst_key_t *key) { dns_dlzimplementation_t *impl; - bool r; + bool r; REQUIRE(dlzdatabase != NULL); REQUIRE(dlzdatabase->implementation != NULL); diff --git a/lib/dns/dns64.c b/lib/dns/dns64.c index eda30ac129..0a30829a22 100644 --- a/lib/dns/dns64.c +++ b/lib/dns/dns64.c @@ -43,7 +43,7 @@ struct dns_dns64 { * Start of mapped address. */ unsigned int flags; - isc_mem_t * mctx; + isc_mem_t *mctx; ISC_LINK(dns_dns64_t) link; }; @@ -51,8 +51,7 @@ isc_result_t dns_dns64_create(isc_mem_t *mctx, const isc_netaddr_t *prefix, unsigned int prefixlen, const isc_netaddr_t *suffix, dns_acl_t *clients, dns_acl_t *mapped, dns_acl_t *excluded, - unsigned int flags, dns_dns64_t **dns64p) -{ + unsigned int flags, dns_dns64_t **dns64p) { dns_dns64_t *dns64; unsigned int nbytes = 16; @@ -103,8 +102,7 @@ dns_dns64_create(isc_mem_t *mctx, const isc_netaddr_t *prefix, } void -dns_dns64_destroy(dns_dns64_t **dns64p) -{ +dns_dns64_destroy(dns_dns64_t **dns64p) { dns_dns64_t *dns64; REQUIRE(dns64p != NULL && *dns64p != NULL); @@ -129,19 +127,20 @@ dns_dns64_destroy(dns_dns64_t **dns64p) isc_result_t dns_dns64_aaaafroma(const dns_dns64_t *dns64, const isc_netaddr_t *reqaddr, const dns_name_t *reqsigner, const dns_aclenv_t *env, - unsigned int flags, unsigned char *a, unsigned char *aaaa) -{ + unsigned int flags, unsigned char *a, unsigned char *aaaa) { unsigned int nbytes, i; isc_result_t result; - int match; + int match; if ((dns64->flags & DNS_DNS64_RECURSIVE_ONLY) != 0 && - (flags & DNS_DNS64_RECURSIVE) == 0) { + (flags & DNS_DNS64_RECURSIVE) == 0) + { return (DNS_R_DISALLOWED); } if ((dns64->flags & DNS_DNS64_BREAK_DNSSEC) == 0 && - (flags & DNS_DNS64_DNSSEC) != 0) { + (flags & DNS_DNS64_DNSSEC) != 0) + { return (DNS_R_DISALLOWED); } @@ -158,7 +157,7 @@ dns_dns64_aaaafroma(const dns_dns64_t *dns64, const isc_netaddr_t *reqaddr, if (dns64->mapped != NULL) { struct in_addr ina; - isc_netaddr_t netaddr; + isc_netaddr_t netaddr; memmove(&ina.s_addr, a, 4); isc_netaddr_fromin(&netaddr, &ina); @@ -194,21 +193,18 @@ dns_dns64_aaaafroma(const dns_dns64_t *dns64, const isc_netaddr_t *reqaddr, } dns_dns64_t * -dns_dns64_next(dns_dns64_t *dns64) -{ +dns_dns64_next(dns_dns64_t *dns64) { dns64 = ISC_LIST_NEXT(dns64, link); return (dns64); } void -dns_dns64_append(dns_dns64list_t *list, dns_dns64_t *dns64) -{ +dns_dns64_append(dns_dns64list_t *list, dns_dns64_t *dns64) { ISC_LIST_APPEND(*list, dns64, link); } void -dns_dns64_unlink(dns_dns64list_t *list, dns_dns64_t *dns64) -{ +dns_dns64_unlink(dns_dns64list_t *list, dns_dns64_t *dns64) { ISC_LIST_UNLINK(*list, dns64, link); } @@ -216,15 +212,14 @@ bool dns_dns64_aaaaok(const dns_dns64_t *dns64, const isc_netaddr_t *reqaddr, const dns_name_t *reqsigner, const dns_aclenv_t *env, unsigned int flags, dns_rdataset_t *rdataset, bool *aaaaok, - size_t aaaaoklen) -{ + size_t aaaaoklen) { struct in6_addr in6; - isc_netaddr_t netaddr; - isc_result_t result; - int match; - bool answer = false; - bool found = false; - unsigned int i, ok; + isc_netaddr_t netaddr; + isc_result_t result; + int match; + bool answer = false; + bool found = false; + unsigned int i, ok; REQUIRE(rdataset != NULL); REQUIRE(rdataset->type == dns_rdatatype_aaaa); @@ -235,12 +230,14 @@ dns_dns64_aaaaok(const dns_dns64_t *dns64, const isc_netaddr_t *reqaddr, for (; dns64 != NULL; dns64 = ISC_LIST_NEXT(dns64, link)) { if ((dns64->flags & DNS_DNS64_RECURSIVE_ONLY) != 0 && - (flags & DNS_DNS64_RECURSIVE) == 0) { + (flags & DNS_DNS64_RECURSIVE) == 0) + { continue; } if ((dns64->flags & DNS_DNS64_BREAK_DNSSEC) == 0 && - (flags & DNS_DNS64_DNSSEC) != 0) { + (flags & DNS_DNS64_DNSSEC) != 0) + { continue; } /* @@ -284,7 +281,8 @@ dns_dns64_aaaaok(const dns_dns64_t *dns64, const isc_netaddr_t *reqaddr, ok = 0; for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; if (aaaaok == NULL || !aaaaok[i]) { dns_rdataset_current(rdataset, &rdata); diff --git a/lib/dns/dnsrps.c b/lib/dns/dnsrps.c index 0f88fb2b46..973e9c997c 100644 --- a/lib/dns/dnsrps.c +++ b/lib/dns/dnsrps.c @@ -30,29 +30,29 @@ #include #include -librpz_t * librpz; +librpz_t *librpz; librpz_emsg_t librpz_lib_open_emsg; -static void * librpz_handle; +static void *librpz_handle; -#define RPSDB_MAGIC ISC_MAGIC('R', 'P', 'Z', 'F') +#define RPSDB_MAGIC ISC_MAGIC('R', 'P', 'Z', 'F') #define VALID_RPSDB(rpsdb) ((rpsdb)->common.impmagic == RPSDB_MAGIC) -#define RD_DB(r) ((r)->private1) -#define RD_CUR_RR(r) ((r)->private2) +#define RD_DB(r) ((r)->private1) +#define RD_CUR_RR(r) ((r)->private2) #define RD_NEXT_RR(r) ((r)->resign) -#define RD_COUNT(r) ((r)->privateuint4) +#define RD_COUNT(r) ((r)->privateuint4) typedef struct { dns_rdatasetiter_t common; - dns_rdatatype_t type; + dns_rdatatype_t type; dns_rdataclass_t class; - uint32_t ttl; - uint count; + uint32_t ttl; + uint count; librpz_idx_t next_rr; } rpsdb_rdatasetiter_t; -static dns_dbmethods_t rpsdb_db_methods; -static dns_rdatasetmethods_t rpsdb_rdataset_methods; +static dns_dbmethods_t rpsdb_db_methods; +static dns_rdatasetmethods_t rpsdb_rdataset_methods; static dns_rdatasetitermethods_t rpsdb_rdatasetiter_methods; static librpz_clist_t *clist; @@ -60,32 +60,28 @@ static librpz_clist_t *clist; static isc_mutex_t dnsrps_mutex; static void -dnsrps_lock(void *mutex0) -{ +dnsrps_lock(void *mutex0) { isc_mutex_t *mutex = mutex0; LOCK(mutex); } static void -dnsrps_unlock(void *mutex0) -{ +dnsrps_unlock(void *mutex0) { isc_mutex_t *mutex = mutex0; UNLOCK(mutex); } static void -dnsrps_mutex_destroy(void *mutex0) -{ +dnsrps_mutex_destroy(void *mutex0) { isc_mutex_t *mutex = mutex0; isc_mutex_destroy(mutex); } static void -dnsrps_log_fnc(librpz_log_level_t level, void *ctxt, const char *buf) -{ +dnsrps_log_fnc(librpz_log_level_t level, void *ctxt, const char *buf) { int isc_level; UNUSED(ctxt); @@ -93,7 +89,8 @@ dnsrps_log_fnc(librpz_log_level_t level, void *ctxt, const char *buf) /* Setting librpz_log_level in the configuration overrides the * BIND9 logging levels. */ if (level > LIBRPZ_LOG_TRACE1 && - level <= librpz->log_level_val(LIBRPZ_LOG_INVALID)) { + level <= librpz->log_level_val(LIBRPZ_LOG_INVALID)) + { level = LIBRPZ_LOG_TRACE1; } @@ -129,8 +126,7 @@ dnsrps_log_fnc(librpz_log_level_t level, void *ctxt, const char *buf) * This is not thread safe, but it is called by a single thread. */ isc_result_t -dns_dnsrps_server_create(void) -{ +dns_dnsrps_server_create(void) { librpz_emsg_t emsg; INSIST(clist == NULL); @@ -172,8 +168,7 @@ dns_dnsrps_server_create(void) * This is not thread safe. */ void -dns_dnsrps_server_destroy(void) -{ +dns_dnsrps_server_destroy(void) { if (clist != NULL) { librpz->clist_detach(&clist); } @@ -195,8 +190,7 @@ dns_dnsrps_server_destroy(void) * Ready dnsrps for a view. */ isc_result_t -dns_dnsrps_view_init(dns_rpz_zones_t *new, char *rps_cstr) -{ +dns_dnsrps_view_init(dns_rpz_zones_t *new, char *rps_cstr) { librpz_emsg_t emsg; isc_log_write(dns_lctx, DNS_LOGCATEGORY_RPZ, DNS_LOGMODULE_RBTDB, @@ -220,8 +214,7 @@ dns_dnsrps_view_init(dns_rpz_zones_t *new, char *rps_cstr) * Connect to and start the dnsrps daemon, dnsrpzd. */ isc_result_t -dns_dnsrps_connect(dns_rpz_zones_t *rpzs) -{ +dns_dnsrps_connect(dns_rpz_zones_t *rpzs) { librpz_emsg_t emsg; if (rpzs == NULL || !rpzs->p.dnsrps_enabled) { @@ -258,15 +251,15 @@ dns_dnsrps_connect(dns_rpz_zones_t *rpzs) isc_result_t dns_dnsrps_rewrite_init(librpz_emsg_t *emsg, dns_rpz_st_t *st, dns_rpz_zones_t *rpzs, const dns_name_t *qname, - isc_mem_t *mctx, bool have_rd) -{ + isc_mem_t *mctx, bool have_rd) { rpsdb_t *rpsdb; rpsdb = isc_mem_get(mctx, sizeof(*rpsdb)); memset(rpsdb, 0, sizeof(*rpsdb)); if (!librpz->rsp_create(emsg, &rpsdb->rsp, NULL, rpzs->rps_client, - have_rd, false)) { + have_rd, false)) + { isc_mem_put(mctx, rpsdb, sizeof(*rpsdb)); return (DNS_R_SERVFAIL); } @@ -293,8 +286,7 @@ dns_dnsrps_rewrite_init(librpz_emsg_t *emsg, dns_rpz_st_t *st, * Convert a dnsrps policy to a classic BIND9 RPZ policy. */ dns_rpz_policy_t -dns_dnsrps_2policy(librpz_policy_t rps_policy) -{ +dns_dnsrps_2policy(librpz_policy_t rps_policy) { switch (rps_policy) { case LIBRPZ_POLICY_UNDEFINED: return (DNS_RPZ_POLICY_MISS); @@ -325,8 +317,7 @@ dns_dnsrps_2policy(librpz_policy_t rps_policy) * Convert a dnsrps trigger to a classic BIND9 RPZ rewrite or trigger type. */ dns_rpz_type_t -dns_dnsrps_trig2type(librpz_trig_t trig) -{ +dns_dnsrps_trig2type(librpz_trig_t trig) { switch (trig) { case LIBRPZ_TRIG_BAD: default: @@ -348,8 +339,7 @@ dns_dnsrps_trig2type(librpz_trig_t trig) * Convert a classic BIND9 RPZ rewrite or trigger type to a librpz trigger type. */ librpz_trig_t -dns_dnsrps_type2trig(dns_rpz_type_t type) -{ +dns_dnsrps_type2trig(dns_rpz_type_t type) { switch (type) { case DNS_RPZ_TYPE_BAD: default: @@ -368,8 +358,7 @@ dns_dnsrps_type2trig(dns_rpz_type_t type) } static void -rpsdb_attach(dns_db_t *source, dns_db_t **targetp) -{ +rpsdb_attach(dns_db_t *source, dns_db_t **targetp) { rpsdb_t *rpsdb = (rpsdb_t *)source; REQUIRE(VALID_RPSDB(rpsdb)); @@ -382,8 +371,7 @@ rpsdb_attach(dns_db_t *source, dns_db_t **targetp) } static void -rpsdb_detach(dns_db_t **dbp) -{ +rpsdb_detach(dns_db_t **dbp) { rpsdb_t *rpsdb = (rpsdb_t *)*dbp; REQUIRE(VALID_RPSDB(rpsdb)); @@ -404,8 +392,7 @@ rpsdb_detach(dns_db_t **dbp) } static void -rpsdb_attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) -{ +rpsdb_attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) { rpsdb_t *rpsdb = (rpsdb_t *)db; REQUIRE(VALID_RPSDB(rpsdb)); @@ -420,8 +407,7 @@ rpsdb_attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) } static void -rpsdb_detachnode(dns_db_t *db, dns_dbnode_t **targetp) -{ +rpsdb_detachnode(dns_db_t *db, dns_dbnode_t **targetp) { rpsdb_t *rpsdb = (rpsdb_t *)db; REQUIRE(VALID_RPSDB(rpsdb)); @@ -434,9 +420,8 @@ rpsdb_detachnode(dns_db_t *db, dns_dbnode_t **targetp) static isc_result_t rpsdb_findnode(dns_db_t *db, const dns_name_t *name, bool create, - dns_dbnode_t **nodep) -{ - rpsdb_t * rpsdb = (rpsdb_t *)db; + dns_dbnode_t **nodep) { + rpsdb_t *rpsdb = (rpsdb_t *)db; dns_db_t *dbp; REQUIRE(VALID_RPSDB(rpsdb)); @@ -462,8 +447,7 @@ rpsdb_findnode(dns_db_t *db, const dns_name_t *name, bool create, static void rpsdb_bind_rdataset(dns_rdataset_t *rdataset, uint count, librpz_idx_t next_rr, dns_rdatatype_t type, uint16_t class, uint32_t ttl, - rpsdb_t *rpsdb) -{ + rpsdb_t *rpsdb) { dns_db_t *dbp; INSIST(rdataset->methods == NULL); /* We must be disassociated. */ @@ -482,9 +466,8 @@ rpsdb_bind_rdataset(dns_rdataset_t *rdataset, uint count, librpz_idx_t next_rr, } static isc_result_t -rpsdb_bind_soa(dns_rdataset_t *rdataset, rpsdb_t *rpsdb) -{ - uint32_t ttl; +rpsdb_bind_soa(dns_rdataset_t *rdataset, rpsdb_t *rpsdb) { + uint32_t ttl; librpz_emsg_t emsg; if (!librpz->rsp_soa(&emsg, &ttl, NULL, NULL, &rpsdb->result, @@ -506,13 +489,12 @@ static isc_result_t rpsdb_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) -{ - rpsdb_t * rpsdb = (rpsdb_t *)db; + dns_rdataset_t *sigrdataset) { + rpsdb_t *rpsdb = (rpsdb_t *)db; dns_rdatatype_t foundtype; dns_rdataclass_t class; - uint32_t ttl; - uint count; + uint32_t ttl; + uint count; librpz_emsg_t emsg; UNUSED(version); @@ -581,7 +563,8 @@ rpsdb_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, } if (!librpz->rsp_rr(&emsg, &foundtype, &class, &ttl, NULL, &rpsdb->result, rpsdb->qname->ndata, - rpsdb->qname->length, rpsdb->rsp)) { + rpsdb->qname->length, rpsdb->rsp)) + { librpz->log(LIBRPZ_LOG_ERROR, NULL, "%s", emsg.c); return (DNS_R_SERVFAIL); } @@ -598,7 +581,8 @@ rpsdb_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, if (!librpz->rsp_rr(&emsg, &foundtype, NULL, NULL, NULL, &rpsdb->result, rpsdb->qname->ndata, - rpsdb->qname->length, rpsdb->rsp)) { + rpsdb->qname->length, rpsdb->rsp)) + { librpz->log(LIBRPZ_LOG_ERROR, NULL, "%s", emsg.c); return (DNS_R_SERVFAIL); } @@ -615,8 +599,7 @@ static isc_result_t rpsdb_finddb(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { dns_dbnode_t *node; UNUSED(version); @@ -636,9 +619,8 @@ rpsdb_finddb(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, static isc_result_t rpsdb_allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, - isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) -{ - rpsdb_t * rpsdb = (rpsdb_t *)db; + isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) { + rpsdb_t *rpsdb = (rpsdb_t *)db; rpsdb_rdatasetiter_t *rpsdb_iter; UNUSED(version); @@ -661,16 +643,14 @@ rpsdb_allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, } static bool -rpsdb_issecure(dns_db_t *db) -{ +rpsdb_issecure(dns_db_t *db) { UNUSED(db); return (false); } static isc_result_t -rpsdb_getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) -{ +rpsdb_getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) { rpsdb_t *rpsdb = (rpsdb_t *)db; REQUIRE(VALID_RPSDB(rpsdb)); @@ -681,8 +661,7 @@ rpsdb_getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) } static void -rpsdb_rdataset_disassociate(dns_rdataset_t *rdataset) -{ +rpsdb_rdataset_disassociate(dns_rdataset_t *rdataset) { dns_db_t *db; /* @@ -699,12 +678,11 @@ rpsdb_rdataset_disassociate(dns_rdataset_t *rdataset) } static isc_result_t -rpsdb_rdataset_next(dns_rdataset_t *rdataset) -{ +rpsdb_rdataset_next(dns_rdataset_t *rdataset) { rpsdb_t *rpsdb; uint16_t type; dns_rdataclass_t class; - librpz_rr_t * rr; + librpz_rr_t *rr; librpz_emsg_t emsg; rpsdb = RD_DB(rdataset); @@ -739,7 +717,8 @@ rpsdb_rdataset_next(dns_rdataset_t *rdataset) for (;;) { if (!librpz->rsp_rr(&emsg, &type, &class, NULL, &rr, &rpsdb->result, rpsdb->qname->ndata, - rpsdb->qname->length, rpsdb->rsp)) { + rpsdb->qname->length, rpsdb->rsp)) + { librpz->log(LIBRPZ_LOG_ERROR, NULL, "%s", emsg.c); return (DNS_R_SERVFAIL); } @@ -756,9 +735,8 @@ rpsdb_rdataset_next(dns_rdataset_t *rdataset) } static isc_result_t -rpsdb_rdataset_first(dns_rdataset_t *rdataset) -{ - rpsdb_t * rpsdb; +rpsdb_rdataset_first(dns_rdataset_t *rdataset) { + rpsdb_t *rpsdb; librpz_emsg_t emsg; rpsdb = RD_DB(rdataset); @@ -783,9 +761,8 @@ rpsdb_rdataset_first(dns_rdataset_t *rdataset) } static void -rpsdb_rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) -{ - rpsdb_t * rpsdb; +rpsdb_rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) { + rpsdb_t *rpsdb; librpz_rr_t *rr; isc_region_t r; @@ -800,9 +777,8 @@ rpsdb_rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) } static void -rpsdb_rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) -{ - rpsdb_t * rpsdb; +rpsdb_rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) { + rpsdb_t *rpsdb; dns_db_t *dbp; INSIST(!ISC_LINK_LINKED(target, link)); @@ -818,8 +794,7 @@ rpsdb_rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) } static unsigned int -rpsdb_rdataset_count(dns_rdataset_t *rdataset) -{ +rpsdb_rdataset_count(dns_rdataset_t *rdataset) { rpsdb_t *rpsdb; rpsdb = RD_DB(rdataset); @@ -829,11 +804,10 @@ rpsdb_rdataset_count(dns_rdataset_t *rdataset) } static void -rpsdb_rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) -{ - rpsdb_t * rpsdb; +rpsdb_rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) { + rpsdb_t *rpsdb; dns_rdatasetiter_t *iterator; - isc_mem_t * mctx; + isc_mem_t *mctx; iterator = *iteratorp; *iteratorp = NULL; @@ -846,14 +820,13 @@ rpsdb_rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) } static isc_result_t -rpsdb_rdatasetiter_next(dns_rdatasetiter_t *iter) -{ - rpsdb_t * rpsdb; +rpsdb_rdatasetiter_next(dns_rdatasetiter_t *iter) { + rpsdb_t *rpsdb; rpsdb_rdatasetiter_t *rpsdb_iter; - dns_rdatatype_t next_type, type; - dns_rdataclass_t next_class, class; - uint32_t ttl; - librpz_emsg_t emsg; + dns_rdatatype_t next_type, type; + dns_rdataclass_t next_class, class; + uint32_t ttl; + librpz_emsg_t emsg; rpsdb = (rpsdb_t *)iter->db; REQUIRE(VALID_RPSDB(rpsdb)); @@ -878,7 +851,8 @@ rpsdb_rdatasetiter_next(dns_rdatasetiter_t *iter) for (;;) { if (!librpz->rsp_rr(&emsg, &type, &class, &ttl, NULL, &rpsdb->result, rpsdb->qname->ndata, - rpsdb->qname->length, rpsdb->rsp)) { + rpsdb->qname->length, rpsdb->rsp)) + { librpz->log(LIBRPZ_LOG_ERROR, NULL, "%s", emsg.c); return (DNS_R_SERVFAIL); } @@ -894,11 +868,13 @@ rpsdb_rdatasetiter_next(dns_rdatasetiter_t *iter) * Skip RRs with the current class and type or before. */ if (rpsdb_iter->class > class || - (rpsdb_iter->class = class && rpsdb_iter->type >= type)) { + (rpsdb_iter->class = class && rpsdb_iter->type >= type)) + { continue; } if (next_type == dns_rdatatype_none || next_class > class || - (next_class == class && next_type > type)) { + (next_class == class && next_type > type)) + { /* * This is the first of a subsequent class and type. */ @@ -914,9 +890,8 @@ rpsdb_rdatasetiter_next(dns_rdatasetiter_t *iter) } static isc_result_t -rpsdb_rdatasetiter_first(dns_rdatasetiter_t *iterator) -{ - rpsdb_t * rpsdb; +rpsdb_rdatasetiter_first(dns_rdatasetiter_t *iterator) { + rpsdb_t *rpsdb; rpsdb_rdatasetiter_t *rpsdb_iter; rpsdb = (rpsdb_t *)iterator->db; @@ -930,9 +905,8 @@ rpsdb_rdatasetiter_first(dns_rdatasetiter_t *iterator) static void rpsdb_rdatasetiter_current(dns_rdatasetiter_t *iterator, - dns_rdataset_t * rdataset) -{ - rpsdb_t * rpsdb; + dns_rdataset_t *rdataset) { + rpsdb_t *rpsdb; rpsdb_rdatasetiter_t *rpsdb_iter; rpsdb = (rpsdb_t *)iterator->db; diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c index 4a8b2ee822..3827d3e780 100644 --- a/lib/dns/dnssec.c +++ b/lib/dns/dnssec.c @@ -53,30 +53,26 @@ LIBDNS_EXTERNAL_DATA isc_stats_t *dns_dnssec_stats; goto failure; \ } while (0) -#define TYPE_SIGN 0 +#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) -{ +digest_callback(void *arg, isc_region_t *data) { dst_context_t *ctx = arg; return (dst_context_adddata(ctx, data)); } static inline void -inc_stat(isc_statscounter_t counter) -{ +inc_stat(isc_statscounter_t counter) { if (dns_dnssec_stats != NULL) { isc_stats_increment(dns_dnssec_stats, counter); } @@ -86,8 +82,7 @@ inc_stat(isc_statscounter_t counter) * Make qsort happy. */ static int -rdata_compare_wrapper(const void *rdata1, const void *rdata2) -{ +rdata_compare_wrapper(const void *rdata1, const void *rdata2) { return (dns_rdata_compare((const dns_rdata_t *)rdata1, (const dns_rdata_t *)rdata2)); } @@ -97,11 +92,10 @@ 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) -{ - isc_result_t ret; - int i = 0, n; - dns_rdata_t * data; + dns_rdata_t **rdata, int *nrdata) { + isc_result_t ret; + int i = 0, n; + dns_rdata_t *data; dns_rdataset_t rdataset; n = dns_rdataset_count(set); @@ -137,8 +131,7 @@ rdataset_to_sortedarray(dns_rdataset_t *set, isc_mem_t *mctx, isc_result_t dns_dnssec_keyfromrdata(const dns_name_t *name, const dns_rdata_t *rdata, - isc_mem_t *mctx, dst_key_t **key) -{ + isc_mem_t *mctx, dst_key_t **key) { isc_buffer_t b; isc_region_t r; @@ -158,10 +151,9 @@ dns_dnssec_keyfromrdata(const dns_name_t *name, const dns_rdata_t *rdata, static isc_result_t digest_sig(dst_context_t *ctx, bool downcase, dns_rdata_t *sigrdata, - dns_rdata_rrsig_t *rrsig) -{ - isc_region_t r; - isc_result_t ret; + dns_rdata_rrsig_t *rrsig) { + isc_region_t r; + isc_result_t ret; dns_fixedname_t fname; dns_rdata_toregion(sigrdata, &r); @@ -189,22 +181,21 @@ digest_sig(dst_context_t *ctx, bool downcase, dns_rdata_t *sigrdata, isc_result_t dns_dnssec_sign(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, isc_stdtime_t *inception, isc_stdtime_t *expire, - isc_mem_t *mctx, isc_buffer_t *buffer, dns_rdata_t *sigrdata) -{ + isc_mem_t *mctx, isc_buffer_t *buffer, dns_rdata_t *sigrdata) { dns_rdata_rrsig_t sig; - dns_rdata_t tmpsigrdata; - dns_rdata_t * rdatas; - int nrdatas, i; - isc_buffer_t sigbuf, envbuf; - isc_region_t r; - dst_context_t * ctx = NULL; - isc_result_t ret; - isc_buffer_t * databuf = NULL; - char data[256 + 8]; - uint32_t flags; - unsigned int sigsize; - dns_fixedname_t fnewname; - dns_fixedname_t fsigner; + dns_rdata_t tmpsigrdata; + dns_rdata_t *rdatas; + int nrdatas, i; + isc_buffer_t sigbuf, envbuf; + isc_region_t r; + dst_context_t *ctx = NULL; + isc_result_t ret; + isc_buffer_t *databuf = NULL; + char data[256 + 8]; + uint32_t flags; + unsigned int sigsize; + dns_fixedname_t fnewname; + dns_fixedname_t fsigner; REQUIRE(name != NULL); REQUIRE(dns_name_countlabels(name) <= 255); @@ -311,15 +302,15 @@ dns_dnssec_sign(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, isc_buffer_usedregion(&envbuf, &r); for (i = 0; i < nrdatas; i++) { - uint16_t len; + uint16_t len; isc_buffer_t lenbuf; isc_region_t lenr; /* * Skip duplicates. */ - if (i > 0 && - dns_rdata_compare(&rdatas[i], &rdatas[i - 1]) == 0) { + if (i > 0 && dns_rdata_compare(&rdatas[i], &rdatas[i - 1]) == 0) + { continue; } @@ -380,21 +371,20 @@ cleanup_databuf: isc_result_t dns_dnssec_verify(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key, bool ignoretime, unsigned int maxbits, isc_mem_t *mctx, - dns_rdata_t *sigrdata, dns_name_t *wild) -{ + dns_rdata_t *sigrdata, dns_name_t *wild) { dns_rdata_rrsig_t sig; - dns_fixedname_t fnewname; - isc_region_t r; - isc_buffer_t envbuf; - dns_rdata_t * rdatas; - int nrdatas, i; - isc_stdtime_t now; - isc_result_t ret; - unsigned char data[300]; - dst_context_t * ctx = NULL; - int labels = 0; - uint32_t flags; - bool downcase = false; + dns_fixedname_t fnewname; + isc_region_t r; + isc_buffer_t envbuf; + dns_rdata_t *rdatas; + int nrdatas, i; + isc_stdtime_t now; + isc_result_t ret; + unsigned char data[300]; + dst_context_t *ctx = NULL; + int labels = 0; + uint32_t flags; + bool downcase = false; REQUIRE(name != NULL); REQUIRE(set != NULL); @@ -524,15 +514,15 @@ again: isc_buffer_usedregion(&envbuf, &r); for (i = 0; i < nrdatas; i++) { - uint16_t len; + uint16_t len; isc_buffer_t lenbuf; isc_region_t lenr; /* * Skip duplicates. */ - if (i > 0 && - dns_rdata_compare(&rdatas[i], &rdatas[i - 1]) == 0) { + if (i > 0 && dns_rdata_compare(&rdatas[i], &rdatas[i - 1]) == 0) + { continue; } @@ -614,12 +604,11 @@ cleanup_struct: } bool -dns_dnssec_keyactive(dst_key_t *key, isc_stdtime_t now) -{ - isc_result_t result; +dns_dnssec_keyactive(dst_key_t *key, isc_stdtime_t now) { + isc_result_t result; isc_stdtime_t publish, active, revoke, remove; bool hint_publish, hint_zsign, hint_ksign, hint_revoke, hint_remove; - int major, minor; + int major, minor; bool ksk = false, zsk = false; isc_result_t ret; @@ -678,13 +667,12 @@ dns_dnssec_keyactive(dst_key_t *key, isc_stdtime_t now) * - SyncDelete is unset or in the future */ static bool -syncpublish(dst_key_t *key, isc_stdtime_t now) -{ - isc_result_t result; - isc_stdtime_t when; +syncpublish(dst_key_t *key, isc_stdtime_t now) { + isc_result_t result; + isc_stdtime_t when; dst_key_state_t state; - int major, minor; - bool publish; + int major, minor; + bool publish; /* * Is this an old-style key? @@ -730,12 +718,11 @@ syncpublish(dst_key_t *key, isc_stdtime_t now) * - SyncDelete is set and in the past. */ static bool -syncdelete(dst_key_t *key, isc_stdtime_t now) -{ - isc_result_t result; - isc_stdtime_t when; +syncdelete(dst_key_t *key, isc_stdtime_t now) { + isc_result_t result; + isc_stdtime_t when; dst_key_state_t state; - int major, minor; + int major, minor; /* * Is this an old-style key? @@ -776,13 +763,12 @@ dns_dnssec_findzonekeys(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node, const dns_name_t *name, const char *directory, isc_stdtime_t now, isc_mem_t *mctx, unsigned int maxkeys, dst_key_t **keys, - unsigned int *nkeys) -{ + unsigned int *nkeys) { dns_rdataset_t rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_result_t result; - dst_key_t * pubkey = NULL; - unsigned int count = 0; + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_result_t result; + dst_key_t *pubkey = NULL; + unsigned int count = 0; REQUIRE(nkeys != NULL); REQUIRE(keys != NULL); @@ -841,7 +827,7 @@ dns_dnssec_findzonekeys(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node, } if (result != ISC_R_SUCCESS) { - char filename[DNS_NAME_FORMATSIZE + + char filename[DNS_NAME_FORMATSIZE + DNS_SECALG_FORMATSIZE + sizeof("key file for //65535")]; isc_result_t result2; @@ -942,23 +928,22 @@ failure: } isc_result_t -dns_dnssec_signmessage(dns_message_t *msg, dst_key_t *key) -{ - dns_rdata_sig_t sig; /* SIG(0) */ - unsigned char data[512]; - unsigned char header[DNS_MESSAGE_HEADERLEN]; - isc_buffer_t headerbuf, databuf, sigbuf; - unsigned int sigsize; - isc_buffer_t * dynbuf = NULL; - dns_rdata_t * rdata; +dns_dnssec_signmessage(dns_message_t *msg, dst_key_t *key) { + dns_rdata_sig_t sig; /* SIG(0) */ + unsigned char data[512]; + unsigned char header[DNS_MESSAGE_HEADERLEN]; + isc_buffer_t headerbuf, databuf, sigbuf; + unsigned int sigsize; + isc_buffer_t *dynbuf = NULL; + dns_rdata_t *rdata; dns_rdatalist_t *datalist; - dns_rdataset_t * dataset; - isc_region_t r; - isc_stdtime_t now; - dst_context_t * ctx = NULL; - isc_mem_t * mctx; - isc_result_t result; - bool signeedsfree = true; + dns_rdataset_t *dataset; + isc_region_t r; + isc_stdtime_t now; + dst_context_t *ctx = NULL; + isc_mem_t *mctx; + isc_result_t result; + bool signeedsfree = true; REQUIRE(msg != NULL); REQUIRE(key != NULL); @@ -1080,18 +1065,17 @@ failure: isc_result_t dns_dnssec_verifymessage(isc_buffer_t *source, dns_message_t *msg, - dst_key_t *key) -{ + dst_key_t *key) { dns_rdata_sig_t sig; /* SIG(0) */ - unsigned char header[DNS_MESSAGE_HEADERLEN]; - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_region_t r, source_r, sig_r, header_r; - isc_stdtime_t now; - dst_context_t * ctx = NULL; - isc_mem_t * mctx; - isc_result_t result; - uint16_t addcount, addcount_n; - bool signeedsfree = false; + unsigned char header[DNS_MESSAGE_HEADERLEN]; + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_region_t r, source_r, sig_r, header_r; + isc_stdtime_t now; + dst_context_t *ctx = NULL; + isc_mem_t *mctx; + isc_result_t result; + uint16_t addcount, addcount_n; + bool signeedsfree = false; REQUIRE(source != NULL); REQUIRE(msg != NULL); @@ -1222,8 +1206,7 @@ failure: bool dns_dnssec_selfsigns(dns_rdata_t *rdata, const dns_name_t *name, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, - bool ignoretime, isc_mem_t *mctx) -{ + bool ignoretime, isc_mem_t *mctx) { INSIST(rdataset->type == dns_rdatatype_key || rdataset->type == dns_rdatatype_dnskey); if (rdataset->type == dns_rdatatype_key) { @@ -1241,14 +1224,13 @@ dns_dnssec_selfsigns(dns_rdata_t *rdata, const dns_name_t *name, bool dns_dnssec_signs(dns_rdata_t *rdata, const dns_name_t *name, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, - bool ignoretime, isc_mem_t *mctx) -{ - dst_key_t * dstkey = NULL; - dns_keytag_t keytag; + bool ignoretime, isc_mem_t *mctx) { + dst_key_t *dstkey = NULL; + dns_keytag_t keytag; dns_rdata_dnskey_t key; - dns_rdata_rrsig_t sig; - dns_rdata_t sigrdata = DNS_RDATA_INIT; - isc_result_t result; + dns_rdata_rrsig_t sig; + dns_rdata_t sigrdata = DNS_RDATA_INIT; + isc_result_t result; INSIST(sigrdataset->type == dns_rdatatype_rrsig); if (sigrdataset->covers != rdataset->type) { @@ -1264,7 +1246,8 @@ dns_dnssec_signs(dns_rdata_t *rdata, const dns_name_t *name, keytag = dst_key_id(dstkey); for (result = dns_rdataset_first(sigrdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(sigrdataset)) { + result = dns_rdataset_next(sigrdataset)) + { dns_rdata_reset(&sigrdata); dns_rdataset_current(sigrdataset, &sigrdata); result = dns_rdata_tostruct(&sigrdata, &sig, NULL); @@ -1285,11 +1268,11 @@ dns_dnssec_signs(dns_rdata_t *rdata, const dns_name_t *name, } isc_result_t -dns_dnsseckey_create(isc_mem_t *mctx, dst_key_t **dstkey, dns_dnsseckey_t **dkp) -{ - isc_result_t result; +dns_dnsseckey_create(isc_mem_t *mctx, dst_key_t **dstkey, + dns_dnsseckey_t **dkp) { + isc_result_t result; dns_dnsseckey_t *dk; - int major, minor; + int major, minor; REQUIRE(dkp != NULL && *dkp == NULL); dk = isc_mem_get(mctx, sizeof(dns_dnsseckey_t)); @@ -1331,8 +1314,7 @@ dns_dnsseckey_create(isc_mem_t *mctx, dst_key_t **dstkey, dns_dnsseckey_t **dkp) } void -dns_dnsseckey_destroy(isc_mem_t *mctx, dns_dnsseckey_t **dkp) -{ +dns_dnsseckey_destroy(isc_mem_t *mctx, dns_dnsseckey_t **dkp) { dns_dnsseckey_t *dk; REQUIRE(dkp != NULL && *dkp != NULL); @@ -1345,15 +1327,14 @@ dns_dnsseckey_destroy(isc_mem_t *mctx, dns_dnsseckey_t **dkp) } void -dns_dnssec_get_hints(dns_dnsseckey_t *key, isc_stdtime_t now) -{ +dns_dnssec_get_hints(dns_dnsseckey_t *key, isc_stdtime_t now) { isc_stdtime_t publish = 0, active = 0, revoke = 0, remove = 0; REQUIRE(key != NULL && key->key != NULL); key->hint_publish = dst_key_is_published(key->key, now, &publish); - key->hint_sign = - dst_key_is_signing(key->key, DST_BOOL_ZSK, now, &active); + key->hint_sign = dst_key_is_signing(key->key, DST_BOOL_ZSK, now, + &active); key->hint_revoke = dst_key_is_revoked(key->key, now, &revoke); key->hint_remove = dst_key_is_removed(key->key, now, &remove); @@ -1412,17 +1393,16 @@ dns_dnssec_get_hints(dns_dnsseckey_t *key, isc_stdtime_t now) isc_result_t dns_dnssec_findmatchingkeys(const dns_name_t *origin, const char *directory, isc_stdtime_t now, isc_mem_t *mctx, - dns_dnsseckeylist_t *keylist) -{ - isc_result_t result = ISC_R_SUCCESS; - bool dir_open = false; + dns_dnsseckeylist_t *keylist) { + isc_result_t result = ISC_R_SUCCESS; + bool dir_open = false; dns_dnsseckeylist_t list; - isc_dir_t dir; - dns_dnsseckey_t * key = NULL; - dst_key_t * dstkey = NULL; - char namebuf[DNS_NAME_FORMATSIZE]; - isc_buffer_t b; - unsigned int len, i, alg; + isc_dir_t dir; + dns_dnsseckey_t *key = NULL; + dst_key_t *dstkey = NULL; + char namebuf[DNS_NAME_FORMATSIZE]; + isc_buffer_t b; + unsigned int len, i, alg; REQUIRE(keylist != NULL); ISC_LIST_INIT(list); @@ -1442,14 +1422,15 @@ dns_dnssec_findmatchingkeys(const dns_name_t *origin, const char *directory, while (isc_dir_read(&dir) == ISC_R_SUCCESS) { if (dir.entry.name[0] != 'K' || dir.entry.length < len + 1 || dir.entry.name[len + 1] != '+' || - strncasecmp(dir.entry.name + 1, namebuf, len) != 0) { + strncasecmp(dir.entry.name + 1, namebuf, len) != 0) + { continue; } alg = 0; for (i = len + 1 + 1; i < dir.entry.length; i++) { - if (dir.entry.name[i] < '0' || - dir.entry.name[i] > '9') { + if (dir.entry.name[i] < '0' || dir.entry.name[i] > '9') + { break; } alg *= 10; @@ -1467,8 +1448,8 @@ dns_dnssec_findmatchingkeys(const dns_name_t *origin, const char *directory, } for (i++; i < dir.entry.length; i++) { - if (dir.entry.name[i] < '0' || - dir.entry.name[i] > '9') { + if (dir.entry.name[i] < '0' || dir.entry.name[i] > '9') + { break; /* @@ -1485,7 +1466,8 @@ dns_dnssec_findmatchingkeys(const dns_name_t *origin, const char *directory, * Did we correctly terminate? */ if (i != len + 1 + 1 + 3 + 1 + 5 || i >= dir.entry.length || - strcmp(dir.entry.name + i, ".private") != 0) { + strcmp(dir.entry.name + i, ".private") != 0) + { continue; } @@ -1562,10 +1544,9 @@ failure: */ static isc_result_t addkey(dns_dnsseckeylist_t *keylist, dst_key_t **newkey, bool savekeys, - isc_mem_t *mctx) -{ + isc_mem_t *mctx) { dns_dnsseckey_t *key; - isc_result_t result; + isc_result_t result; /* Skip duplicates */ for (key = ISC_LIST_HEAD(*keylist); key != NULL; @@ -1573,7 +1554,8 @@ addkey(dns_dnsseckeylist_t *keylist, dst_key_t **newkey, bool savekeys, if (dst_key_id(key->key) == dst_key_id(*newkey) && dst_key_alg(key->key) == dst_key_alg(*newkey) && dns_name_equal(dst_key_name(key->key), - dst_key_name(*newkey))) { + dst_key_name(*newkey))) + { break; } } @@ -1615,11 +1597,10 @@ addkey(dns_dnsseckeylist_t *keylist, dst_key_t **newkey, bool savekeys, * for future reference. */ static isc_result_t -mark_active_keys(dns_dnsseckeylist_t *keylist, dns_rdataset_t *rrsigs) -{ - isc_result_t result = ISC_R_SUCCESS; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdataset_t sigs; +mark_active_keys(dns_dnsseckeylist_t *keylist, dns_rdataset_t *rrsigs) { + isc_result_t result = ISC_R_SUCCESS; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdataset_t sigs; dns_dnsseckey_t *key; REQUIRE(rrsigs != NULL && dns_rdataset_isassociated(rrsigs)); @@ -1628,14 +1609,14 @@ mark_active_keys(dns_dnsseckeylist_t *keylist, dns_rdataset_t *rrsigs) dns_rdataset_clone(rrsigs, &sigs); for (key = ISC_LIST_HEAD(*keylist); key != NULL; key = ISC_LIST_NEXT(key, link)) { - uint16_t keyid, sigid; + uint16_t keyid, sigid; dns_secalg_t keyalg, sigalg; keyid = dst_key_id(key->key); keyalg = dst_key_alg(key->key); for (result = dns_rdataset_first(&sigs); - result == ISC_R_SUCCESS; - result = dns_rdataset_next(&sigs)) { + result == ISC_R_SUCCESS; result = dns_rdataset_next(&sigs)) + { dns_rdata_rrsig_t sig; dns_rdata_reset(&rdata); @@ -1669,12 +1650,11 @@ dns_dnssec_keylistfromrdataset(const dns_name_t *origin, const char *directory, isc_mem_t *mctx, dns_rdataset_t *keyset, dns_rdataset_t *keysigs, dns_rdataset_t *soasigs, bool savekeys, bool publickey, - dns_dnsseckeylist_t *keylist) -{ + dns_dnsseckeylist_t *keylist) { dns_rdataset_t keys; - dns_rdata_t rdata = DNS_RDATA_INIT; - dst_key_t * pubkey = NULL, *privkey = NULL; - isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; + dst_key_t *pubkey = NULL, *privkey = NULL; + isc_result_t result; REQUIRE(keyset != NULL && dns_rdataset_isassociated(keyset)); @@ -1682,7 +1662,8 @@ dns_dnssec_keylistfromrdataset(const dns_name_t *origin, const char *directory, dns_rdataset_clone(keyset, &keys); for (result = dns_rdataset_first(&keys); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&keys)) { + result = dns_rdataset_next(&keys)) + { dns_rdata_reset(&rdata); dns_rdataset_current(&keys, &rdata); @@ -1737,8 +1718,8 @@ dns_dnssec_keylistfromrdataset(const dns_name_t *origin, const char *directory, DST_TYPE_STATE), directory, mctx, &privkey); if (result == ISC_R_SUCCESS && - dst_key_pubcompare(pubkey, privkey, - false)) { + dst_key_pubcompare(pubkey, privkey, false)) + { dst_key_setflags(privkey, flags); } dst_key_setflags(pubkey, flags); @@ -1746,7 +1727,7 @@ dns_dnssec_keylistfromrdataset(const dns_name_t *origin, const char *directory, } if (result != ISC_R_SUCCESS) { - char filename[DNS_NAME_FORMATSIZE + + char filename[DNS_NAME_FORMATSIZE + DNS_SECALG_FORMATSIZE + sizeof("key file for //65535")]; isc_result_t result2; @@ -1835,8 +1816,7 @@ failure: static isc_result_t make_dnskey(dst_key_t *key, unsigned char *buf, int bufsize, - dns_rdata_t *target) -{ + dns_rdata_t *target) { isc_result_t result; isc_buffer_t b; isc_region_t r; @@ -1856,9 +1836,8 @@ make_dnskey(dst_key_t *key, unsigned char *buf, int bufsize, static isc_result_t addrdata(dns_rdata_t *rdata, dns_diff_t *diff, const dns_name_t *origin, - dns_ttl_t ttl, isc_mem_t *mctx) -{ - isc_result_t result; + dns_ttl_t ttl, isc_mem_t *mctx) { + isc_result_t result; dns_difftuple_t *tuple = NULL; RETERR(dns_difftuple_create(mctx, DNS_DIFFOP_ADD, origin, ttl, rdata, @@ -1871,9 +1850,8 @@ failure: static isc_result_t delrdata(dns_rdata_t *rdata, dns_diff_t *diff, const dns_name_t *origin, - dns_ttl_t ttl, isc_mem_t *mctx) -{ - isc_result_t result; + dns_ttl_t ttl, isc_mem_t *mctx) { + isc_result_t result; dns_difftuple_t *tuple = NULL; RETERR(dns_difftuple_create(mctx, DNS_DIFFOP_DEL, origin, ttl, rdata, @@ -1886,12 +1864,11 @@ failure: static isc_result_t publish_key(dns_diff_t *diff, dns_dnsseckey_t *key, const dns_name_t *origin, - dns_ttl_t ttl, isc_mem_t *mctx, void (*report)(const char *, ...)) -{ - isc_result_t result; + dns_ttl_t ttl, isc_mem_t *mctx, void (*report)(const char *, ...)) { + isc_result_t result; unsigned char buf[DST_KEY_MAXSIZE]; - char keystr[DST_KEY_FORMATSIZE]; - dns_rdata_t dnskey = DNS_RDATA_INIT; + char keystr[DST_KEY_FORMATSIZE]; + dns_rdata_t dnskey = DNS_RDATA_INIT; dns_rdata_reset(&dnskey); RETERR(make_dnskey(key->key, buf, sizeof(buf), &dnskey)); @@ -1921,12 +1898,11 @@ failure: static isc_result_t remove_key(dns_diff_t *diff, dns_dnsseckey_t *key, const dns_name_t *origin, dns_ttl_t ttl, isc_mem_t *mctx, const char *reason, - void (*report)(const char *, ...)) -{ - isc_result_t result; + void (*report)(const char *, ...)) { + isc_result_t result; unsigned char buf[DST_KEY_MAXSIZE]; - dns_rdata_t dnskey = DNS_RDATA_INIT; - char alg[80]; + dns_rdata_t dnskey = DNS_RDATA_INIT; + char alg[80]; dns_secalg_format(dst_key_alg(key->key), alg, sizeof(alg)); report("Removing %s key %d/%s from DNSKEY RRset.", reason, @@ -1940,15 +1916,15 @@ failure: } static bool -exists(dns_rdataset_t *rdataset, dns_rdata_t *rdata) -{ - isc_result_t result; +exists(dns_rdataset_t *rdataset, dns_rdata_t *rdata) { + isc_result_t result; dns_rdataset_t trdataset; dns_rdataset_init(&trdataset); dns_rdataset_clone(rdataset, &trdataset); for (result = dns_rdataset_first(&trdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&trdataset)) { + result = dns_rdataset_next(&trdataset)) + { dns_rdata_t current = DNS_RDATA_INIT; dns_rdataset_current(&trdataset, ¤t); @@ -1965,12 +1941,11 @@ isc_result_t dns_dnssec_syncupdate(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *rmkeys, dns_rdataset_t *cds, dns_rdataset_t *cdnskey, isc_stdtime_t now, dns_ttl_t ttl, dns_diff_t *diff, - isc_mem_t *mctx) -{ - unsigned char dsbuf1[DNS_DS_BUFFERSIZE]; - unsigned char dsbuf2[DNS_DS_BUFFERSIZE]; - unsigned char keybuf[DST_KEY_MAXSIZE]; - isc_result_t result; + isc_mem_t *mctx) { + unsigned char dsbuf1[DNS_DS_BUFFERSIZE]; + unsigned char dsbuf2[DNS_DS_BUFFERSIZE]; + unsigned char keybuf[DST_KEY_MAXSIZE]; + isc_result_t result; dns_dnsseckey_t *key; for (key = ISC_LIST_HEAD(*keys); key != NULL; @@ -2019,8 +1994,8 @@ dns_dnssec_syncupdate(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *rmkeys, } } - if (dns_rdataset_isassociated(cds) && - syncdelete(key->key, now)) { + if (dns_rdataset_isassociated(cds) && syncdelete(key->key, now)) + { /* Delete both SHA-1 and SHA-256 */ if (exists(cds, &cds_sha1)) { RETERR(delrdata(&cds_sha1, diff, origin, @@ -2100,12 +2075,11 @@ isc_result_t dns_dnssec_updatekeys(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *newkeys, dns_dnsseckeylist_t *removed, const dns_name_t *origin, dns_ttl_t hint_ttl, dns_diff_t *diff, isc_mem_t *mctx, - void (*report)(const char *, ...)) -{ - isc_result_t result; + void (*report)(const char *, ...)) { + isc_result_t result; dns_dnsseckey_t *key, *key1, *key2, *next; - bool found_ttl = false; - dns_ttl_t ttl = hint_ttl; + bool found_ttl = false; + dns_ttl_t ttl = hint_ttl; /* * First, look through the existing key list to find keys @@ -2118,7 +2092,8 @@ dns_dnssec_updatekeys(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *newkeys, for (key = ISC_LIST_HEAD(*keys); key != NULL; key = ISC_LIST_NEXT(key, link)) { if (key->source == dns_keysource_user && - (key->hint_publish || key->force_publish)) { + (key->hint_publish || key->force_publish)) + { RETERR(publish_key(diff, key, origin, ttl, mctx, report)); } @@ -2161,14 +2136,16 @@ dns_dnssec_updatekeys(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *newkeys, next = ISC_LIST_NEXT(key1, link); for (key2 = ISC_LIST_HEAD(*keys); key2 != NULL; - key2 = ISC_LIST_NEXT(key2, link)) { + key2 = ISC_LIST_NEXT(key2, link)) + { int f1 = dst_key_flags(key1->key); int f2 = dst_key_flags(key2->key); int nr1 = f1 & ~DNS_KEYFLAG_REVOKE; int nr2 = f2 & ~DNS_KEYFLAG_REVOKE; if (nr1 == nr2 && dst_key_alg(key1->key) == dst_key_alg(key2->key) && - dst_key_pubcompare(key1->key, key2->key, true)) { + dst_key_pubcompare(key1->key, key2->key, true)) + { int r1, r2; r1 = dst_key_flags(key1->key) & DNS_KEYFLAG_REVOKE; @@ -2188,7 +2165,8 @@ dns_dnssec_updatekeys(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *newkeys, ISC_LIST_APPEND(*keys, key1, link); if (key1->source != dns_keysource_zoneapex && - (key1->hint_publish || key1->force_publish)) { + (key1->hint_publish || key1->force_publish)) + { RETERR(publish_key(diff, key1, origin, ttl, mctx, report)); isc_log_write( @@ -2241,8 +2219,9 @@ dns_dnssec_updatekeys(dns_dnsseckeylist_t *keys, dns_dnsseckeylist_t *newkeys, } else { dns_dnsseckey_destroy(mctx, &key2); } - } else if (key_revoked && (dst_key_flags(key1->key) & - DNS_KEYFLAG_REVOKE) != 0) { + } else if (key_revoked && + (dst_key_flags(key1->key) & DNS_KEYFLAG_REVOKE) != 0) + { /* * A previously valid key has been revoked. * We need to remove the old version and pull @@ -2322,20 +2301,20 @@ failure: isc_result_t dns_dnssec_matchdskey(dns_name_t *name, dns_rdata_t *dsrdata, - dns_rdataset_t *keyset, dns_rdata_t *keyrdata) -{ - isc_result_t result; - unsigned char buf[DNS_DS_BUFFERSIZE]; - dns_keytag_t keytag; + dns_rdataset_t *keyset, dns_rdata_t *keyrdata) { + isc_result_t result; + unsigned char buf[DNS_DS_BUFFERSIZE]; + dns_keytag_t keytag; dns_rdata_dnskey_t key; - dns_rdata_ds_t ds; - isc_region_t r; + dns_rdata_ds_t ds; + isc_region_t r; result = dns_rdata_tostruct(dsrdata, &ds, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); for (result = dns_rdataset_first(keyset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(keyset)) { + result = dns_rdataset_next(keyset)) + { dns_rdata_t newdsrdata = DNS_RDATA_INIT; dns_rdata_reset(keyrdata); diff --git a/lib/dns/dnstap.c b/lib/dns/dnstap.c index 8060a573c2..7207cdf672 100644 --- a/lib/dns/dnstap.c +++ b/lib/dns/dnstap.c @@ -80,32 +80,32 @@ #include -#define DTENV_MAGIC ISC_MAGIC('D', 't', 'n', 'v') +#define DTENV_MAGIC ISC_MAGIC('D', 't', 'n', 'v') #define VALID_DTENV(env) ISC_MAGIC_VALID(env, DTENV_MAGIC) -#define DNSTAP_CONTENT_TYPE "protobuf:dnstap.Dnstap" +#define DNSTAP_CONTENT_TYPE "protobuf:dnstap.Dnstap" #define DNSTAP_INITIAL_BUF_SIZE 256 struct dns_dtmsg { - void * buf; - size_t len; - Dnstap__Dnstap d; + void *buf; + size_t len; + Dnstap__Dnstap d; Dnstap__Message m; }; struct dns_dthandle { - dns_dtmode_t mode; + dns_dtmode_t mode; struct fstrm_reader *reader; - isc_mem_t * mctx; + isc_mem_t *mctx; }; struct dns_dtenv { - unsigned int magic; + unsigned int magic; isc_refcount_t refcount; isc_mem_t *mctx; - struct fstrm_iothr * iothr; + struct fstrm_iothr *iothr; struct fstrm_iothr_options *fopt; isc_task_t *reopen_task; @@ -113,14 +113,14 @@ struct dns_dtenv { * */ bool reopen_queued; - isc_region_t identity; - isc_region_t version; - char * path; - dns_dtmode_t mode; - isc_offset_t max_size; - int rolls; + isc_region_t identity; + isc_region_t version; + char *path; + dns_dtmode_t mode; + isc_offset_t max_size; + int rolls; isc_log_rollsuffix_t suffix; - isc_stats_t * stats; + isc_stats_t *stats; }; #define CHECK(x) \ @@ -131,7 +131,7 @@ struct dns_dtenv { } while (0) typedef struct ioq { - unsigned int generation; + unsigned int generation; struct fstrm_iothr_queue *ioq; } dt__ioq_t; @@ -142,15 +142,14 @@ static atomic_uint_fast32_t global_generation; isc_result_t dns_dt_create(isc_mem_t *mctx, dns_dtmode_t mode, const char *path, struct fstrm_iothr_options **foptp, isc_task_t *reopen_task, - dns_dtenv_t **envp) -{ - isc_result_t result = ISC_R_SUCCESS; - fstrm_res res; + dns_dtenv_t **envp) { + isc_result_t result = ISC_R_SUCCESS; + fstrm_res res; struct fstrm_unix_writer_options *fuwopt = NULL; - struct fstrm_file_options * ffwopt = NULL; - struct fstrm_writer_options * fwopt = NULL; - struct fstrm_writer * fw = NULL; - dns_dtenv_t * env = NULL; + struct fstrm_file_options *ffwopt = NULL; + struct fstrm_writer_options *fwopt = NULL; + struct fstrm_writer *fw = NULL; + dns_dtenv_t *env = NULL; REQUIRE(path != NULL); REQUIRE(envp != NULL && *envp == NULL); @@ -248,8 +247,7 @@ cleanup: isc_result_t dns_dt_setupfile(dns_dtenv_t *env, uint64_t max_size, int rolls, - isc_log_rollsuffix_t suffix) -{ + isc_log_rollsuffix_t suffix) { REQUIRE(VALID_DTENV(env)); /* @@ -258,7 +256,8 @@ dns_dt_setupfile(dns_dtenv_t *env, uint64_t max_size, int rolls, */ if (env->mode == dns_dtmode_unix) { if (max_size == 0 && rolls == ISC_LOG_ROLLINFINITE && - suffix == isc_log_rollsuffix_increment) { + suffix == isc_log_rollsuffix_increment) + { return (ISC_R_SUCCESS); } else { return (ISC_R_INVALIDFILE); @@ -273,15 +272,14 @@ dns_dt_setupfile(dns_dtenv_t *env, uint64_t max_size, int rolls, } isc_result_t -dns_dt_reopen(dns_dtenv_t *env, int roll) -{ - isc_result_t result = ISC_R_SUCCESS; - fstrm_res res; - isc_logfile_t file; +dns_dt_reopen(dns_dtenv_t *env, int roll) { + isc_result_t result = ISC_R_SUCCESS; + fstrm_res res; + isc_logfile_t file; struct fstrm_unix_writer_options *fuwopt = NULL; - struct fstrm_file_options * ffwopt = NULL; - struct fstrm_writer_options * fwopt = NULL; - struct fstrm_writer * fw = NULL; + struct fstrm_file_options *ffwopt = NULL; + struct fstrm_writer_options *fwopt = NULL; + struct fstrm_writer *fw = NULL; REQUIRE(VALID_DTENV(env)); @@ -391,8 +389,7 @@ cleanup: } static isc_result_t -toregion(dns_dtenv_t *env, isc_region_t *r, const char *str) -{ +toregion(dns_dtenv_t *env, isc_region_t *r, const char *str) { unsigned char *p = NULL; REQUIRE(r != NULL); @@ -415,31 +412,27 @@ toregion(dns_dtenv_t *env, isc_region_t *r, const char *str) } isc_result_t -dns_dt_setidentity(dns_dtenv_t *env, const char *identity) -{ +dns_dt_setidentity(dns_dtenv_t *env, const char *identity) { REQUIRE(VALID_DTENV(env)); return (toregion(env, &env->identity, identity)); } isc_result_t -dns_dt_setversion(dns_dtenv_t *env, const char *version) -{ +dns_dt_setversion(dns_dtenv_t *env, const char *version) { REQUIRE(VALID_DTENV(env)); return (toregion(env, &env->version, version)); } static void -set_dt_ioq(unsigned int generation, struct fstrm_iothr_queue *ioq) -{ +set_dt_ioq(unsigned int generation, struct fstrm_iothr_queue *ioq) { dt_ioq.generation = generation; dt_ioq.ioq = ioq; } static struct fstrm_iothr_queue * -dt_queue(dns_dtenv_t *env) -{ +dt_queue(dns_dtenv_t *env) { REQUIRE(VALID_DTENV(env)); unsigned int generation; @@ -462,8 +455,7 @@ dt_queue(dns_dtenv_t *env) } void -dns_dt_attach(dns_dtenv_t *source, dns_dtenv_t **destp) -{ +dns_dt_attach(dns_dtenv_t *source, dns_dtenv_t **destp) { REQUIRE(VALID_DTENV(source)); REQUIRE(destp != NULL && *destp == NULL); @@ -472,8 +464,7 @@ dns_dt_attach(dns_dtenv_t *source, dns_dtenv_t **destp) } isc_result_t -dns_dt_getstats(dns_dtenv_t *env, isc_stats_t **statsp) -{ +dns_dt_getstats(dns_dtenv_t *env, isc_stats_t **statsp) { REQUIRE(VALID_DTENV(env)); REQUIRE(statsp != NULL && *statsp == NULL); @@ -485,8 +476,7 @@ dns_dt_getstats(dns_dtenv_t *env, isc_stats_t **statsp) } static void -destroy(dns_dtenv_t *env) -{ +destroy(dns_dtenv_t *env) { isc_log_write(dns_lctx, DNS_LOGCATEGORY_DNSTAP, DNS_LOGMODULE_DNSTAP, ISC_LOG_INFO, "closing dnstap"); env->magic = 0; @@ -519,8 +509,7 @@ destroy(dns_dtenv_t *env) } void -dns_dt_detach(dns_dtenv_t **envp) -{ +dns_dt_detach(dns_dtenv_t **envp) { REQUIRE(envp != NULL && VALID_DTENV(*envp)); dns_dtenv_t *env = *envp; *envp = NULL; @@ -532,8 +521,7 @@ dns_dt_detach(dns_dtenv_t **envp) } static isc_result_t -pack_dt(const Dnstap__Dnstap *d, void **buf, size_t *sz) -{ +pack_dt(const Dnstap__Dnstap *d, void **buf, size_t *sz) { ProtobufCBufferSimple sbuf; REQUIRE(d != NULL); @@ -561,10 +549,9 @@ pack_dt(const Dnstap__Dnstap *d, void **buf, size_t *sz) } static void -send_dt(dns_dtenv_t *env, void *buf, size_t len) -{ +send_dt(dns_dtenv_t *env, void *buf, size_t len) { struct fstrm_iothr_queue *ioq; - fstrm_res res; + fstrm_res res; REQUIRE(env != NULL); @@ -594,8 +581,7 @@ send_dt(dns_dtenv_t *env, void *buf, size_t len) } static void -init_msg(dns_dtenv_t *env, dns_dtmsg_t *dm, Dnstap__Message__Type mtype) -{ +init_msg(dns_dtenv_t *env, dns_dtmsg_t *dm, Dnstap__Message__Type mtype) { memset(dm, 0, sizeof(*dm)); dm->d.base.descriptor = &dnstap__dnstap__descriptor; dm->m.base.descriptor = &dnstap__message__descriptor; @@ -617,8 +603,7 @@ init_msg(dns_dtenv_t *env, dns_dtmsg_t *dm, Dnstap__Message__Type mtype) } static Dnstap__Message__Type -dnstap_type(dns_dtmsgtype_t msgtype) -{ +dnstap_type(dns_dtmsgtype_t msgtype) { switch (msgtype) { case DNS_DTTYPE_SQ: return (DNSTAP__MESSAGE__TYPE__STUB_QUERY); @@ -655,8 +640,7 @@ dnstap_type(dns_dtmsgtype_t msgtype) } static void -cpbuf(isc_buffer_t *buf, ProtobufCBinaryData *p, protobuf_c_boolean *has) -{ +cpbuf(isc_buffer_t *buf, ProtobufCBinaryData *p, protobuf_c_boolean *has) { p->data = isc_buffer_base(buf); p->len = isc_buffer_usedlength(buf); *has = 1; @@ -665,8 +649,7 @@ cpbuf(isc_buffer_t *buf, ProtobufCBinaryData *p, protobuf_c_boolean *has) static void setaddr(dns_dtmsg_t *dm, isc_sockaddr_t *sa, bool tcp, ProtobufCBinaryData *addr, protobuf_c_boolean *has_addr, uint32_t *port, - protobuf_c_boolean *has_port) -{ + protobuf_c_boolean *has_port) { int family = isc_sockaddr_pf(sa); if (family != AF_INET6 && family != AF_INET) { @@ -703,8 +686,7 @@ setaddr(dns_dtmsg_t *dm, isc_sockaddr_t *sa, bool tcp, * of the dnstap environment structure. */ static void -perform_reopen(isc_task_t *task, isc_event_t *event) -{ +perform_reopen(isc_task_t *task, isc_event_t *event) { dns_dtenv_t *env; REQUIRE(event != NULL); @@ -739,11 +721,10 @@ perform_reopen(isc_task_t *task, isc_event_t *event) * actual roll happens asynchronously). */ static void -check_file_size_and_maybe_reopen(dns_dtenv_t *env) -{ - isc_task_t * reopen_task = NULL; +check_file_size_and_maybe_reopen(dns_dtenv_t *env) { + isc_task_t *reopen_task = NULL; isc_event_t *event; - struct stat statbuf; + struct stat statbuf; /* * If the task from which the output file should be reopened was not @@ -760,7 +741,8 @@ check_file_size_and_maybe_reopen(dns_dtenv_t *env) */ LOCK(&env->reopen_lock); if (env->reopen_queued || stat(env->path, &statbuf) < 0 || - statbuf.st_size <= env->max_size) { + statbuf.st_size <= env->max_size) + { goto unlock_and_return; } @@ -783,9 +765,8 @@ unlock_and_return: void dns_dt_send(dns_view_t *view, dns_dtmsgtype_t msgtype, isc_sockaddr_t *qaddr, isc_sockaddr_t *raddr, bool tcp, isc_region_t *zone, - isc_time_t *qtime, isc_time_t *rtime, isc_buffer_t *buf) -{ - isc_time_t now, *t; + isc_time_t *qtime, isc_time_t *rtime, isc_buffer_t *buf) { + isc_time_t now, *t; dns_dtmsg_t dm; REQUIRE(DNS_VIEW_VALID(view)); @@ -894,8 +875,7 @@ dns_dt_send(dns_view_t *view, dns_dtmsgtype_t msgtype, isc_sockaddr_t *qaddr, } static isc_result_t -putstr(isc_buffer_t **b, const char *str) -{ +putstr(isc_buffer_t **b, const char *str) { isc_result_t result; result = isc_buffer_reserve(b, strlen(str)); @@ -908,8 +888,7 @@ putstr(isc_buffer_t **b, const char *str) } static isc_result_t -putaddr(isc_buffer_t **b, isc_region_t *ip) -{ +putaddr(isc_buffer_t **b, isc_region_t *ip) { char buf[64]; if (ip->length == 4) { @@ -928,11 +907,10 @@ putaddr(isc_buffer_t **b, isc_region_t *ip) } static bool -dnstap_file(struct fstrm_reader *r) -{ - fstrm_res res; +dnstap_file(struct fstrm_reader *r) { + fstrm_res res; const struct fstrm_control *control = NULL; - const uint8_t * rtype = NULL; + const uint8_t *rtype = NULL; size_t dlen = strlen(DNSTAP_CONTENT_TYPE), rlen = 0; size_t n = 0; @@ -966,12 +944,11 @@ dnstap_file(struct fstrm_reader *r) isc_result_t dns_dt_open(const char *filename, dns_dtmode_t mode, isc_mem_t *mctx, - dns_dthandle_t **handlep) -{ - isc_result_t result; + dns_dthandle_t **handlep) { + isc_result_t result; struct fstrm_file_options *fopt = NULL; - fstrm_res res; - dns_dthandle_t * handle; + fstrm_res res; + dns_dthandle_t *handle; REQUIRE(handlep != NULL && *handlep == NULL); @@ -1030,10 +1007,9 @@ cleanup: } isc_result_t -dns_dt_getframe(dns_dthandle_t *handle, uint8_t **bufp, size_t *sizep) -{ +dns_dt_getframe(dns_dthandle_t *handle, uint8_t **bufp, size_t *sizep) { const uint8_t *data; - fstrm_res res; + fstrm_res res; REQUIRE(handle != NULL); REQUIRE(bufp != NULL); @@ -1057,8 +1033,7 @@ dns_dt_getframe(dns_dthandle_t *handle, uint8_t **bufp, size_t *sizep) } void -dns_dt_close(dns_dthandle_t **handlep) -{ +dns_dt_close(dns_dthandle_t **handlep) { dns_dthandle_t *handle; REQUIRE(handlep != NULL && *handlep != NULL); @@ -1074,13 +1049,12 @@ dns_dt_close(dns_dthandle_t **handlep) } isc_result_t -dns_dt_parse(isc_mem_t *mctx, isc_region_t *src, dns_dtdata_t **destp) -{ - isc_result_t result; - Dnstap__Dnstap * frame; +dns_dt_parse(isc_mem_t *mctx, isc_region_t *src, dns_dtdata_t **destp) { + isc_result_t result; + Dnstap__Dnstap *frame; Dnstap__Message *m; - dns_dtdata_t * d = NULL; - isc_buffer_t b; + dns_dtdata_t *d = NULL; + isc_buffer_t b; REQUIRE(src != NULL); REQUIRE(destp != NULL && *destp == NULL); @@ -1214,8 +1188,8 @@ dns_dt_parse(isc_mem_t *mctx, isc_region_t *src, dns_dtdata_t **destp) protobuf_c_enum_descriptor_get_value( &dnstap__socket_protocol__descriptor, m->socket_protocol); - if (type != NULL && - type->value == DNSTAP__SOCKET_PROTOCOL__TCP) { + if (type != NULL && type->value == DNSTAP__SOCKET_PROTOCOL__TCP) + { d->tcp = true; } else { d->tcp = false; @@ -1224,7 +1198,7 @@ dns_dt_parse(isc_mem_t *mctx, isc_region_t *src, dns_dtdata_t **destp) /* Query tuple */ if (d->msg != NULL) { - dns_name_t * name = NULL; + dns_name_t *name = NULL; dns_rdataset_t *rdataset; CHECK(dns_message_firstname(d->msg, DNS_SECTION_QUESTION)); @@ -1249,10 +1223,9 @@ cleanup: } isc_result_t -dns_dt_datatotext(dns_dtdata_t *d, isc_buffer_t **dest) -{ +dns_dt_datatotext(dns_dtdata_t *d, isc_buffer_t **dest) { isc_result_t result; - char buf[100]; + char buf[100]; REQUIRE(d != NULL); REQUIRE(dest != NULL && *dest != NULL); @@ -1388,8 +1361,7 @@ cleanup: } void -dns_dtdata_free(dns_dtdata_t **dp) -{ +dns_dtdata_free(dns_dtdata_t **dp) { dns_dtdata_t *d; REQUIRE(dp != NULL && *dp != NULL); diff --git a/lib/dns/ds.c b/lib/dns/ds.c index 5f264bb0a5..93ce59f3f9 100644 --- a/lib/dns/ds.c +++ b/lib/dns/ds.c @@ -30,15 +30,14 @@ isc_result_t dns_ds_fromkeyrdata(const dns_name_t *owner, dns_rdata_t *key, dns_dsdigest_t digest_type, unsigned char *digest, - dns_rdata_ds_t *dsrdata) -{ - isc_result_t result; + dns_rdata_ds_t *dsrdata) { + isc_result_t result; dns_fixedname_t fname; - dns_name_t * name; - unsigned int digestlen; - isc_region_t r; - isc_md_t * md; - isc_md_type_t md_type = 0; + dns_name_t *name; + unsigned int digestlen; + isc_region_t r; + isc_md_t *md; + isc_md_type_t md_type = 0; REQUIRE(key != NULL); REQUIRE(key->type == dns_rdatatype_dnskey || @@ -116,12 +115,11 @@ end: isc_result_t dns_ds_buildrdata(dns_name_t *owner, dns_rdata_t *key, dns_dsdigest_t digest_type, unsigned char *buffer, - dns_rdata_t *rdata) -{ - isc_result_t result; - unsigned char digest[ISC_MAX_MD_SIZE]; + dns_rdata_t *rdata) { + isc_result_t result; + unsigned char digest[ISC_MAX_MD_SIZE]; dns_rdata_ds_t ds; - isc_buffer_t b; + isc_buffer_t b; result = dns_ds_fromkeyrdata(owner, key, digest_type, digest, &ds); if (result != ISC_R_SUCCESS) { diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c index 5d73a4a361..b9c560d29e 100644 --- a/lib/dns/dst_api.c +++ b/lib/dns/dst_api.c @@ -127,7 +127,7 @@ static const char *keystates[KEYSTATES_NVALUES] = { }; #define STATE_ALGORITHM_STR "Algorithm:" -#define STATE_LENGTH_STR "Length:" +#define STATE_LENGTH_STR "Length:" #define MAX_NTAGS \ (DST_MAX_NUMERIC + DST_MAX_BOOLEAN + DST_MAX_TIMES + DST_MAX_KEYSTATES) @@ -135,36 +135,32 @@ 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 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 algorithm_status(unsigned int alg); -static isc_result_t -addsuffix(char *filename, int len, const char *dirname, const char *ofilename, - const char *suffix); +static isc_result_t addsuffix(char *filename, int len, const char *dirname, + const char *ofilename, const char *suffix); #define RETERR(x) \ do { \ @@ -182,8 +178,7 @@ addsuffix(char *filename, int len, const char *dirname, const char *ofilename, } while (0); isc_result_t -dst_lib_init(isc_mem_t *mctx, const char *engine) -{ +dst_lib_init(isc_mem_t *mctx, const char *engine) { isc_result_t result; REQUIRE(mctx != NULL); @@ -251,8 +246,7 @@ out: } void -dst_lib_destroy(void) -{ +dst_lib_destroy(void) { int i; RUNTIME_CHECK(dst_initialized == true); dst_initialized = false; @@ -269,8 +263,7 @@ dst_lib_destroy(void) } bool -dst_algorithm_supported(unsigned int alg) -{ +dst_algorithm_supported(unsigned int alg) { REQUIRE(dst_initialized == true); if (alg >= DST_MAX_ALGS || dst_t_func[alg] == NULL) { @@ -280,8 +273,7 @@ dst_algorithm_supported(unsigned int alg) } bool -dst_ds_digest_supported(unsigned int digest_type) -{ +dst_ds_digest_supported(unsigned int digest_type) { return (digest_type == DNS_DSDIGEST_SHA1 || digest_type == DNS_DSDIGEST_SHA256 || digest_type == DNS_DSDIGEST_SHA384); @@ -289,10 +281,9 @@ dst_ds_digest_supported(unsigned int digest_type) isc_result_t dst_context_create(dst_key_t *key, isc_mem_t *mctx, isc_logcategory_t *category, - bool useforsigning, int maxbits, dst_context_t **dctxp) -{ + bool useforsigning, int maxbits, dst_context_t **dctxp) { dst_context_t *dctx; - isc_result_t result; + isc_result_t result; REQUIRE(dst_initialized == true); REQUIRE(VALID_KEY(key)); @@ -334,8 +325,7 @@ dst_context_create(dst_key_t *key, isc_mem_t *mctx, isc_logcategory_t *category, } void -dst_context_destroy(dst_context_t **dctxp) -{ +dst_context_destroy(dst_context_t **dctxp) { dst_context_t *dctx; REQUIRE(dctxp != NULL && VALID_CTX(*dctxp)); @@ -352,8 +342,7 @@ dst_context_destroy(dst_context_t **dctxp) } isc_result_t -dst_context_adddata(dst_context_t *dctx, const isc_region_t *data) -{ +dst_context_adddata(dst_context_t *dctx, const isc_region_t *data) { REQUIRE(VALID_CTX(dctx)); REQUIRE(data != NULL); INSIST(dctx->key->func->adddata != NULL); @@ -362,8 +351,7 @@ dst_context_adddata(dst_context_t *dctx, const isc_region_t *data) } isc_result_t -dst_context_sign(dst_context_t *dctx, isc_buffer_t *sig) -{ +dst_context_sign(dst_context_t *dctx, isc_buffer_t *sig) { dst_key_t *key; REQUIRE(VALID_CTX(dctx)); @@ -378,8 +366,8 @@ dst_context_sign(dst_context_t *dctx, isc_buffer_t *sig) if (key->func->sign == NULL) { return (DST_R_NOTPRIVATEKEY); } - if (key->func->isprivate == NULL || - key->func->isprivate(key) == false) { + if (key->func->isprivate == NULL || key->func->isprivate(key) == false) + { return (DST_R_NOTPRIVATEKEY); } @@ -387,8 +375,7 @@ dst_context_sign(dst_context_t *dctx, isc_buffer_t *sig) } isc_result_t -dst_context_verify(dst_context_t *dctx, isc_region_t *sig) -{ +dst_context_verify(dst_context_t *dctx, isc_region_t *sig) { REQUIRE(VALID_CTX(dctx)); REQUIRE(sig != NULL); @@ -405,8 +392,7 @@ dst_context_verify(dst_context_t *dctx, isc_region_t *sig) isc_result_t dst_context_verify2(dst_context_t *dctx, unsigned int maxbits, - isc_region_t *sig) -{ + isc_region_t *sig) { REQUIRE(VALID_CTX(dctx)); REQUIRE(sig != NULL); @@ -414,8 +400,8 @@ dst_context_verify2(dst_context_t *dctx, unsigned int maxbits, if (dctx->key->keydata.generic == NULL) { return (DST_R_NULLKEY); } - if (dctx->key->func->verify == NULL && - dctx->key->func->verify2 == NULL) { + if (dctx->key->func->verify == NULL && dctx->key->func->verify2 == NULL) + { return (DST_R_NOTPUBLICKEY); } @@ -426,8 +412,7 @@ dst_context_verify2(dst_context_t *dctx, unsigned int maxbits, isc_result_t dst_key_computesecret(const dst_key_t *pub, const dst_key_t *priv, - isc_buffer_t *secret) -{ + isc_buffer_t *secret) { REQUIRE(dst_initialized == true); REQUIRE(VALID_KEY(pub) && VALID_KEY(priv)); REQUIRE(secret != NULL); @@ -440,7 +425,8 @@ dst_key_computesecret(const dst_key_t *pub, const dst_key_t *priv, } if (pub->key_alg != priv->key_alg || pub->func->computesecret == NULL || - priv->func->computesecret == NULL) { + priv->func->computesecret == NULL) + { return (DST_R_KEYCANNOTCOMPUTESECRET); } @@ -452,8 +438,7 @@ dst_key_computesecret(const dst_key_t *pub, const dst_key_t *priv, } isc_result_t -dst_key_tofile(const dst_key_t *key, int type, const char *directory) -{ +dst_key_tofile(const dst_key_t *key, int type, const char *directory) { isc_result_t ret = ISC_R_SUCCESS; REQUIRE(dst_initialized == true); @@ -482,29 +467,27 @@ dst_key_tofile(const dst_key_t *key, int type, const char *directory) } if (((type & DST_TYPE_PRIVATE) != 0) && - (key->key_flags & DNS_KEYFLAG_TYPEMASK) != DNS_KEYTYPE_NOKEY) { + (key->key_flags & DNS_KEYFLAG_TYPEMASK) != DNS_KEYTYPE_NOKEY) + { return (key->func->tofile(key, directory)); } return (ISC_R_SUCCESS); } void -dst_key_setexternal(dst_key_t *key, bool value) -{ +dst_key_setexternal(dst_key_t *key, bool value) { key->external = value; } bool -dst_key_isexternal(dst_key_t *key) -{ +dst_key_isexternal(dst_key_t *key) { return (key->external); } isc_result_t dst_key_getfilename(dns_name_t *name, dns_keytag_t id, unsigned int alg, int type, const char *directory, isc_mem_t *mctx, - isc_buffer_t *buf) -{ + isc_buffer_t *buf) { isc_result_t result; REQUIRE(dst_initialized == true); @@ -530,12 +513,11 @@ dst_key_getfilename(dns_name_t *name, dns_keytag_t id, unsigned int alg, isc_result_t dst_key_fromfile(dns_name_t *name, dns_keytag_t id, unsigned int alg, int type, - const char *directory, isc_mem_t *mctx, dst_key_t **keyp) -{ + const char *directory, isc_mem_t *mctx, dst_key_t **keyp) { isc_result_t result; - char filename[NAME_MAX]; + char filename[NAME_MAX]; isc_buffer_t buf; - dst_key_t * key; + dst_key_t *key; REQUIRE(dst_initialized == true); REQUIRE(dns_name_isabsolute(name)); @@ -564,7 +546,8 @@ dst_key_fromfile(dns_name_t *name, dns_keytag_t id, unsigned int alg, int type, } if (!dns_name_equal(name, key->key_name) || id != key->key_id || - alg != key->key_alg) { + alg != key->key_alg) + { result = DST_R_INVALIDPRIVATEKEY; goto out; } @@ -582,13 +565,12 @@ out: isc_result_t dst_key_fromnamedfile(const char *filename, const char *dirname, int type, - isc_mem_t *mctx, dst_key_t **keyp) -{ + isc_mem_t *mctx, dst_key_t **keyp) { isc_result_t result; - dst_key_t * pubkey = NULL, *key = NULL; - char * newfilename = NULL; - int newfilenamelen = 0; - isc_lex_t * lex = NULL; + dst_key_t *pubkey = NULL, *key = NULL; + char *newfilename = NULL; + int newfilenamelen = 0; + isc_lex_t *lex = NULL; REQUIRE(dst_initialized == true); REQUIRE(filename != NULL); @@ -622,7 +604,8 @@ dst_key_fromnamedfile(const char *filename, const char *dirname, int type, RETERR(result); if ((type & (DST_TYPE_PRIVATE | DST_TYPE_PUBLIC)) == DST_TYPE_PUBLIC || - (pubkey->key_flags & DNS_KEYFLAG_TYPEMASK) == DNS_KEYTYPE_NOKEY) { + (pubkey->key_flags & DNS_KEYFLAG_TYPEMASK) == DNS_KEYTYPE_NOKEY) + { result = computeid(pubkey); if (result != ISC_R_SUCCESS) { dst_key_free(&pubkey); @@ -719,8 +702,7 @@ out: } isc_result_t -dst_key_todns(const dst_key_t *key, isc_buffer_t *target) -{ +dst_key_todns(const dst_key_t *key, isc_buffer_t *target) { REQUIRE(dst_initialized == true); REQUIRE(VALID_KEY(key)); REQUIRE(target != NULL); @@ -755,11 +737,10 @@ dst_key_todns(const dst_key_t *key, isc_buffer_t *target) isc_result_t dst_key_fromdns(const dns_name_t *name, dns_rdataclass_t rdclass, - isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp) -{ - uint8_t alg, proto; - uint32_t flags, extflags; - dst_key_t * key = NULL; + isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp) { + uint8_t alg, proto; + uint32_t flags, extflags; + dst_key_t *key = NULL; dns_keytag_t id, rid; isc_region_t r; isc_result_t result; @@ -801,9 +782,8 @@ dst_key_fromdns(const dns_name_t *name, dns_rdataclass_t rdclass, isc_result_t dst_key_frombuffer(const dns_name_t *name, unsigned int alg, unsigned int flags, unsigned int protocol, dns_rdataclass_t rdclass, - isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp) -{ - dst_key_t * key = NULL; + isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp) { + dst_key_t *key = NULL; isc_result_t result; REQUIRE(dst_initialized); @@ -825,8 +805,7 @@ dst_key_frombuffer(const dns_name_t *name, unsigned int alg, unsigned int flags, } isc_result_t -dst_key_tobuffer(const dst_key_t *key, isc_buffer_t *target) -{ +dst_key_tobuffer(const dst_key_t *key, isc_buffer_t *target) { REQUIRE(dst_initialized == true); REQUIRE(VALID_KEY(key)); REQUIRE(target != NULL); @@ -841,9 +820,8 @@ dst_key_tobuffer(const dst_key_t *key, isc_buffer_t *target) } isc_result_t -dst_key_privatefrombuffer(dst_key_t *key, isc_buffer_t *buffer) -{ - isc_lex_t * lex = NULL; +dst_key_privatefrombuffer(dst_key_t *key, isc_buffer_t *buffer) { + isc_lex_t *lex = NULL; isc_result_t result = ISC_R_SUCCESS; REQUIRE(dst_initialized == true); @@ -866,8 +844,7 @@ out: } gss_ctx_id_t -dst_key_getgssctx(const dst_key_t *key) -{ +dst_key_getgssctx(const dst_key_t *key) { REQUIRE(key != NULL); return (key->keydata.gssctx); @@ -875,9 +852,8 @@ dst_key_getgssctx(const dst_key_t *key) isc_result_t dst_key_fromgssapi(const dns_name_t *name, gss_ctx_id_t gssctx, isc_mem_t *mctx, - dst_key_t **keyp, isc_region_t *intoken) -{ - dst_key_t * key; + dst_key_t **keyp, isc_region_t *intoken) { + dst_key_t *key; isc_result_t result; REQUIRE(gssctx != NULL); @@ -913,9 +889,8 @@ isc_result_t dst_key_buildinternal(const dns_name_t *name, unsigned int alg, unsigned int bits, unsigned int flags, unsigned int protocol, dns_rdataclass_t rdclass, - void *data, isc_mem_t *mctx, dst_key_t **keyp) -{ - dst_key_t * key; + void *data, isc_mem_t *mctx, dst_key_t **keyp) { + dst_key_t *key; isc_result_t result; REQUIRE(dst_initialized == true); @@ -948,9 +923,8 @@ isc_result_t dst_key_fromlabel(const dns_name_t *name, int alg, unsigned int flags, unsigned int protocol, dns_rdataclass_t rdclass, const char *engine, const char *label, const char *pin, - isc_mem_t *mctx, dst_key_t **keyp) -{ - dst_key_t * key; + isc_mem_t *mctx, dst_key_t **keyp) { + dst_key_t *key; isc_result_t result; REQUIRE(dst_initialized == true); @@ -991,9 +965,8 @@ isc_result_t dst_key_generate(const dns_name_t *name, unsigned int alg, unsigned int bits, unsigned int param, unsigned int flags, unsigned int protocol, dns_rdataclass_t rdclass, isc_mem_t *mctx, dst_key_t **keyp, - void (*callback)(int)) -{ - dst_key_t * key; + void (*callback)(int)) { + dst_key_t *key; isc_result_t ret; REQUIRE(dst_initialized == true); @@ -1037,8 +1010,7 @@ dst_key_generate(const dns_name_t *name, unsigned int alg, unsigned int bits, } isc_result_t -dst_key_getbool(const dst_key_t *key, int type, bool *valuep) -{ +dst_key_getbool(const dst_key_t *key, int type, bool *valuep) { REQUIRE(VALID_KEY(key)); REQUIRE(valuep != NULL); REQUIRE(type <= DST_MAX_BOOLEAN); @@ -1050,8 +1022,7 @@ dst_key_getbool(const dst_key_t *key, int type, bool *valuep) } void -dst_key_setbool(dst_key_t *key, int type, bool value) -{ +dst_key_setbool(dst_key_t *key, int type, bool value) { REQUIRE(VALID_KEY(key)); REQUIRE(type <= DST_MAX_BOOLEAN); key->bools[type] = value; @@ -1059,16 +1030,14 @@ dst_key_setbool(dst_key_t *key, int type, bool value) } void -dst_key_unsetbool(dst_key_t *key, int type) -{ +dst_key_unsetbool(dst_key_t *key, int type) { REQUIRE(VALID_KEY(key)); REQUIRE(type <= DST_MAX_BOOLEAN); key->boolset[type] = false; } isc_result_t -dst_key_getnum(const dst_key_t *key, int type, uint32_t *valuep) -{ +dst_key_getnum(const dst_key_t *key, int type, uint32_t *valuep) { REQUIRE(VALID_KEY(key)); REQUIRE(valuep != NULL); REQUIRE(type <= DST_MAX_NUMERIC); @@ -1080,8 +1049,7 @@ dst_key_getnum(const dst_key_t *key, int type, uint32_t *valuep) } void -dst_key_setnum(dst_key_t *key, int type, uint32_t value) -{ +dst_key_setnum(dst_key_t *key, int type, uint32_t value) { REQUIRE(VALID_KEY(key)); REQUIRE(type <= DST_MAX_NUMERIC); key->nums[type] = value; @@ -1089,16 +1057,14 @@ dst_key_setnum(dst_key_t *key, int type, uint32_t value) } void -dst_key_unsetnum(dst_key_t *key, int type) -{ +dst_key_unsetnum(dst_key_t *key, int type) { REQUIRE(VALID_KEY(key)); REQUIRE(type <= DST_MAX_NUMERIC); key->numset[type] = false; } isc_result_t -dst_key_gettime(const dst_key_t *key, int type, isc_stdtime_t *timep) -{ +dst_key_gettime(const dst_key_t *key, int type, isc_stdtime_t *timep) { REQUIRE(VALID_KEY(key)); REQUIRE(timep != NULL); REQUIRE(type <= DST_MAX_TIMES); @@ -1110,8 +1076,7 @@ dst_key_gettime(const dst_key_t *key, int type, isc_stdtime_t *timep) } void -dst_key_settime(dst_key_t *key, int type, isc_stdtime_t when) -{ +dst_key_settime(dst_key_t *key, int type, isc_stdtime_t when) { REQUIRE(VALID_KEY(key)); REQUIRE(type <= DST_MAX_TIMES); key->times[type] = when; @@ -1119,16 +1084,14 @@ dst_key_settime(dst_key_t *key, int type, isc_stdtime_t when) } void -dst_key_unsettime(dst_key_t *key, int type) -{ +dst_key_unsettime(dst_key_t *key, int type) { REQUIRE(VALID_KEY(key)); REQUIRE(type <= DST_MAX_TIMES); key->timeset[type] = false; } isc_result_t -dst_key_getstate(const dst_key_t *key, int type, dst_key_state_t *statep) -{ +dst_key_getstate(const dst_key_t *key, int type, dst_key_state_t *statep) { REQUIRE(VALID_KEY(key)); REQUIRE(statep != NULL); REQUIRE(type <= DST_MAX_KEYSTATES); @@ -1140,8 +1103,7 @@ dst_key_getstate(const dst_key_t *key, int type, dst_key_state_t *statep) } void -dst_key_setstate(dst_key_t *key, int type, dst_key_state_t state) -{ +dst_key_setstate(dst_key_t *key, int type, dst_key_state_t state) { REQUIRE(VALID_KEY(key)); REQUIRE(type <= DST_MAX_KEYSTATES); key->keystates[type] = state; @@ -1149,16 +1111,14 @@ dst_key_setstate(dst_key_t *key, int type, dst_key_state_t state) } void -dst_key_unsetstate(dst_key_t *key, int type) -{ +dst_key_unsetstate(dst_key_t *key, int type) { REQUIRE(VALID_KEY(key)); REQUIRE(type <= DST_MAX_KEYSTATES); key->keystateset[type] = false; } isc_result_t -dst_key_getprivateformat(const dst_key_t *key, int *majorp, int *minorp) -{ +dst_key_getprivateformat(const dst_key_t *key, int *majorp, int *minorp) { REQUIRE(VALID_KEY(key)); REQUIRE(majorp != NULL); REQUIRE(minorp != NULL); @@ -1168,8 +1128,7 @@ dst_key_getprivateformat(const dst_key_t *key, int *majorp, int *minorp) } void -dst_key_setprivateformat(dst_key_t *key, int major, int minor) -{ +dst_key_setprivateformat(dst_key_t *key, int major, int minor) { REQUIRE(VALID_KEY(key)); key->fmt_major = major; key->fmt_minor = minor; @@ -1178,8 +1137,7 @@ dst_key_setprivateformat(dst_key_t *key, int major, int minor) static bool comparekeys(const dst_key_t *key1, const dst_key_t *key2, bool match_revoked_key, - bool (*compare)(const dst_key_t *key1, const dst_key_t *key2)) -{ + bool (*compare)(const dst_key_t *key1, const dst_key_t *key2)) { REQUIRE(dst_initialized == true); REQUIRE(VALID_KEY(key1)); REQUIRE(VALID_KEY(key2)); @@ -1197,7 +1155,8 @@ comparekeys(const dst_key_t *key1, const dst_key_t *key2, return (false); } if ((key1->key_flags & DNS_KEYFLAG_REVOKE) == - (key2->key_flags & DNS_KEYFLAG_REVOKE)) { + (key2->key_flags & DNS_KEYFLAG_REVOKE)) + { return (false); } if (key1->key_id != key2->key_rid && @@ -1218,12 +1177,11 @@ comparekeys(const dst_key_t *key1, const dst_key_t *key2, * both to wire format and comparing the results. */ static bool -pub_compare(const dst_key_t *key1, const dst_key_t *key2) -{ - isc_result_t result; +pub_compare(const dst_key_t *key1, const dst_key_t *key2) { + isc_result_t result; unsigned char buf1[DST_KEY_MAXSIZE], buf2[DST_KEY_MAXSIZE]; - isc_buffer_t b1, b2; - isc_region_t r1, r2; + isc_buffer_t b1, b2; + isc_region_t r1, r2; isc_buffer_init(&b1, buf1, sizeof(buf1)); result = dst_key_todns(key1, &b1); @@ -1264,21 +1222,18 @@ pub_compare(const dst_key_t *key1, const dst_key_t *key2) } bool -dst_key_compare(const dst_key_t *key1, const dst_key_t *key2) -{ +dst_key_compare(const dst_key_t *key1, const dst_key_t *key2) { return (comparekeys(key1, key2, false, key1->func->compare)); } bool dst_key_pubcompare(const dst_key_t *key1, const dst_key_t *key2, - bool match_revoked_key) -{ + bool match_revoked_key) { return (comparekeys(key1, key2, match_revoked_key, pub_compare)); } bool -dst_key_paramcompare(const dst_key_t *key1, const dst_key_t *key2) -{ +dst_key_paramcompare(const dst_key_t *key1, const dst_key_t *key2) { REQUIRE(dst_initialized == true); REQUIRE(VALID_KEY(key1)); REQUIRE(VALID_KEY(key2)); @@ -1288,7 +1243,8 @@ dst_key_paramcompare(const dst_key_t *key1, const dst_key_t *key2) } if (key1->key_alg == key2->key_alg && key1->func->paramcompare != NULL && - key1->func->paramcompare(key1, key2) == true) { + key1->func->paramcompare(key1, key2) == true) + { return (true); } else { return (false); @@ -1296,8 +1252,7 @@ dst_key_paramcompare(const dst_key_t *key1, const dst_key_t *key2) } void -dst_key_attach(dst_key_t *source, dst_key_t **target) -{ +dst_key_attach(dst_key_t *source, dst_key_t **target) { REQUIRE(dst_initialized == true); REQUIRE(target != NULL && *target == NULL); REQUIRE(VALID_KEY(source)); @@ -1307,8 +1262,7 @@ dst_key_attach(dst_key_t *source, dst_key_t **target) } void -dst_key_free(dst_key_t **keyp) -{ +dst_key_free(dst_key_t **keyp) { REQUIRE(dst_initialized == true); REQUIRE(keyp != NULL && VALID_KEY(*keyp)); dst_key_t *key = *keyp; @@ -1338,8 +1292,7 @@ dst_key_free(dst_key_t **keyp) } bool -dst_key_isprivate(const dst_key_t *key) -{ +dst_key_isprivate(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); INSIST(key->func->isprivate != NULL); return (key->func->isprivate(key)); @@ -1347,8 +1300,7 @@ dst_key_isprivate(const dst_key_t *key) isc_result_t dst_key_buildfilename(const dst_key_t *key, int type, const char *directory, - isc_buffer_t *out) -{ + isc_buffer_t *out) { REQUIRE(VALID_KEY(key)); REQUIRE(type == DST_TYPE_PRIVATE || type == DST_TYPE_PUBLIC || type == DST_TYPE_STATE || type == 0); @@ -1358,8 +1310,7 @@ dst_key_buildfilename(const dst_key_t *key, int type, const char *directory, } isc_result_t -dst_key_sigsize(const dst_key_t *key, unsigned int *n) -{ +dst_key_sigsize(const dst_key_t *key, unsigned int *n) { REQUIRE(dst_initialized == true); REQUIRE(VALID_KEY(key)); REQUIRE(n != NULL); @@ -1413,8 +1364,7 @@ dst_key_sigsize(const dst_key_t *key, unsigned int *n) } isc_result_t -dst_key_secretsize(const dst_key_t *key, unsigned int *n) -{ +dst_key_secretsize(const dst_key_t *key, unsigned int *n) { REQUIRE(dst_initialized == true); REQUIRE(VALID_KEY(key)); REQUIRE(n != NULL); @@ -1430,16 +1380,14 @@ dst_key_secretsize(const dst_key_t *key, unsigned int *n) * Set the flags on a key, then recompute the key ID */ isc_result_t -dst_key_setflags(dst_key_t *key, uint32_t flags) -{ +dst_key_setflags(dst_key_t *key, uint32_t flags) { REQUIRE(VALID_KEY(key)); key->key_flags = flags; return (computeid(key)); } void -dst_key_format(const dst_key_t *key, char *cp, unsigned int size) -{ +dst_key_format(const dst_key_t *key, char *cp, unsigned int size) { char namestr[DNS_NAME_FORMATSIZE]; char algstr[DNS_NAME_FORMATSIZE]; @@ -1450,8 +1398,7 @@ dst_key_format(const dst_key_t *key, char *cp, unsigned int size) } isc_result_t -dst_key_dump(dst_key_t *key, isc_mem_t *mctx, char **buffer, int *length) -{ +dst_key_dump(dst_key_t *key, isc_mem_t *mctx, char **buffer, int *length) { REQUIRE(buffer != NULL && *buffer == NULL); REQUIRE(length != NULL && *length == 0); REQUIRE(VALID_KEY(key)); @@ -1465,10 +1412,9 @@ dst_key_dump(dst_key_t *key, isc_mem_t *mctx, char **buffer, int *length) isc_result_t dst_key_restore(dns_name_t *name, unsigned int alg, unsigned int flags, unsigned int protocol, dns_rdataclass_t rdclass, - isc_mem_t *mctx, const char *keystr, dst_key_t **keyp) -{ + isc_mem_t *mctx, const char *keystr, dst_key_t **keyp) { isc_result_t result; - dst_key_t * key; + dst_key_t *key; REQUIRE(dst_initialized == true); REQUIRE(keyp != NULL && *keyp == NULL); @@ -1506,10 +1452,9 @@ dst_key_restore(dns_name_t *name, unsigned int alg, unsigned int flags, 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) -{ + dns_rdataclass_t rdclass, dns_ttl_t ttl, isc_mem_t *mctx) { dst_key_t *key; - int i; + int i; key = isc_mem_get(mctx, sizeof(dst_key_t)); @@ -1542,16 +1487,14 @@ get_key_struct(const dns_name_t *name, unsigned int alg, unsigned int flags, } bool -dst_key_inactive(const dst_key_t *key) -{ +dst_key_inactive(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); return (key->inactive); } void -dst_key_setinactive(dst_key_t *key, bool inactive) -{ +dst_key_setinactive(dst_key_t *key, bool inactive) { REQUIRE(VALID_KEY(key)); key->inactive = inactive; @@ -1562,21 +1505,20 @@ dst_key_setinactive(dst_key_t *key, bool inactive) */ isc_result_t dst_key_read_public(const char *filename, int type, isc_mem_t *mctx, - dst_key_t **keyp) -{ - u_char rdatabuf[DST_KEY_MAXSIZE]; - isc_buffer_t b; - dns_fixedname_t name; - isc_lex_t * lex = NULL; - isc_token_t token; - isc_result_t ret; - dns_rdata_t rdata = DNS_RDATA_INIT; - unsigned int opt = ISC_LEXOPT_DNSMULTILINE; - dns_rdataclass_t rdclass = dns_rdataclass_in; + dst_key_t **keyp) { + u_char rdatabuf[DST_KEY_MAXSIZE]; + isc_buffer_t b; + dns_fixedname_t name; + isc_lex_t *lex = NULL; + isc_token_t token; + isc_result_t ret; + dns_rdata_t rdata = DNS_RDATA_INIT; + unsigned int opt = ISC_LEXOPT_DNSMULTILINE; + dns_rdataclass_t rdclass = dns_rdataclass_in; isc_lexspecials_t specials; - uint32_t ttl = 0; - isc_result_t result; - dns_rdatatype_t keytype; + uint32_t ttl = 0; + isc_result_t result; + dns_rdatatype_t keytype; /* * Open the file and read its formatted contents @@ -1660,7 +1602,8 @@ dst_key_read_public(const char *filename, int type, isc_mem_t *mctx, } if (((type & DST_TYPE_KEY) != 0 && keytype != dns_rdatatype_key) || - ((type & DST_TYPE_KEY) == 0 && keytype != dns_rdatatype_dnskey)) { + ((type & DST_TYPE_KEY) == 0 && keytype != dns_rdatatype_dnskey)) + { ret = DST_R_BADKEYTYPE; goto cleanup; } @@ -1688,8 +1631,7 @@ cleanup: } static int -find_metadata(const char *s, const char *tags[], int ntags) -{ +find_metadata(const char *s, const char *tags[], int ntags) { for (int i = 0; i < ntags; i++) { if (tags[i] != NULL && strcasecmp(s, tags[i]) == 0) { return (i); @@ -1699,32 +1641,27 @@ find_metadata(const char *s, const char *tags[], int ntags) } static int -find_numericdata(const char *s) -{ +find_numericdata(const char *s) { return (find_metadata(s, numerictags, NUMERIC_NTAGS)); } static int -find_booleandata(const char *s) -{ +find_booleandata(const char *s) { return (find_metadata(s, booleantags, BOOLEAN_NTAGS)); } static int -find_timingdata(const char *s) -{ +find_timingdata(const char *s) { return (find_metadata(s, timingtags, TIMING_NTAGS)); } static int -find_keystatedata(const char *s) -{ +find_keystatedata(const char *s) { return (find_metadata(s, keystatestags, KEYSTATES_NTAGS)); } static isc_result_t -keystate_fromtext(const char *s, dst_key_state_t *state) -{ +keystate_fromtext(const char *s, dst_key_state_t *state) { for (int i = 0; i < KEYSTATES_NVALUES; i++) { if (keystates[i] != NULL && strcasecmp(s, keystates[i]) == 0) { *state = (dst_key_state_t)i; @@ -1738,10 +1675,9 @@ keystate_fromtext(const char *s, dst_key_state_t *state) * Reads a key state from disk. */ isc_result_t -dst_key_read_state(const char *filename, isc_mem_t *mctx, dst_key_t **keyp) -{ - isc_lex_t * lex = NULL; - isc_token_t token; +dst_key_read_state(const char *filename, isc_mem_t *mctx, dst_key_t **keyp) { + isc_lex_t *lex = NULL; + isc_token_t token; isc_result_t ret; unsigned int opt = ISC_LEXOPT_EOL; @@ -1766,13 +1702,15 @@ dst_key_read_state(const char *filename, isc_mem_t *mctx, dst_key_t **keyp) */ NEXTTOKEN(lex, opt, &token); if (token.type != isc_tokentype_string || - strcmp(DST_AS_STR(token), STATE_ALGORITHM_STR) != 0) { + strcmp(DST_AS_STR(token), STATE_ALGORITHM_STR) != 0) + { BADTOKEN(); } NEXTTOKEN(lex, opt | ISC_LEXOPT_NUMBER, &token); if (token.type != isc_tokentype_number || - token.value.as_ulong != (unsigned long)dst_key_alg(*keyp)) { + token.value.as_ulong != (unsigned long)dst_key_alg(*keyp)) + { BADTOKEN(); } @@ -1783,13 +1721,15 @@ dst_key_read_state(const char *filename, isc_mem_t *mctx, dst_key_t **keyp) */ NEXTTOKEN(lex, opt, &token); if (token.type != isc_tokentype_string || - strcmp(DST_AS_STR(token), STATE_LENGTH_STR) != 0) { + strcmp(DST_AS_STR(token), STATE_LENGTH_STR) != 0) + { BADTOKEN(); } NEXTTOKEN(lex, opt | ISC_LEXOPT_NUMBER, &token); if (token.type != isc_tokentype_number || - token.value.as_ulong != (unsigned long)dst_key_size(*keyp)) { + token.value.as_ulong != (unsigned long)dst_key_size(*keyp)) + { BADTOKEN(); } @@ -1900,8 +1840,7 @@ cleanup: } static bool -issymmetric(const dst_key_t *key) -{ +issymmetric(const dst_key_t *key) { REQUIRE(dst_initialized == true); REQUIRE(VALID_KEY(key)); @@ -1934,10 +1873,9 @@ issymmetric(const dst_key_t *key) * Write key boolean metadata to a file pointer, preceded by 'tag' */ static void -printbool(const dst_key_t *key, int type, const char *tag, FILE *stream) -{ +printbool(const dst_key_t *key, int type, const char *tag, FILE *stream) { isc_result_t result; - bool value = 0; + bool value = 0; result = dst_key_getbool(key, type, &value); if (result != ISC_R_SUCCESS) { @@ -1950,10 +1888,9 @@ printbool(const dst_key_t *key, int type, const char *tag, FILE *stream) * Write key numeric metadata to a file pointer, preceded by 'tag' */ static void -printnum(const dst_key_t *key, int type, const char *tag, FILE *stream) -{ +printnum(const dst_key_t *key, int type, const char *tag, FILE *stream) { isc_result_t result; - uint32_t value = 0; + uint32_t value = 0; result = dst_key_getnum(key, type, &value); if (result != ISC_R_SUCCESS) { @@ -1966,15 +1903,14 @@ printnum(const dst_key_t *key, int type, const char *tag, FILE *stream) * Write key timing metadata to a file pointer, preceded by 'tag' */ static void -printtime(const dst_key_t *key, int type, const char *tag, FILE *stream) -{ +printtime(const dst_key_t *key, int type, const char *tag, FILE *stream) { isc_result_t result; char output[26]; /* Minimum buffer as per ctime_r() specification. */ isc_stdtime_t when; - time_t t; - char utc[sizeof("YYYYMMDDHHSSMM")]; - isc_buffer_t b; - isc_region_t r; + time_t t; + char utc[sizeof("YYYYMMDDHHSSMM")]; + isc_buffer_t b; + isc_region_t r; result = dst_key_gettime(key, type, &when); if (result == ISC_R_NOTFOUND) { @@ -2012,9 +1948,8 @@ error: * Write key state metadata to a file pointer, preceded by 'tag' */ static void -printstate(const dst_key_t *key, int type, const char *tag, FILE *stream) -{ - isc_result_t result; +printstate(const dst_key_t *key, int type, const char *tag, FILE *stream) { + isc_result_t result; dst_key_state_t value = 0; result = dst_key_getstate(key, type, &value); @@ -2028,12 +1963,11 @@ printstate(const dst_key_t *key, int type, const char *tag, FILE *stream) * Writes a key state to disk. */ static isc_result_t -write_key_state(const dst_key_t *key, int type, const char *directory) -{ - FILE * fp; - isc_buffer_t fileb; - char filename[NAME_MAX]; - isc_result_t ret; +write_key_state(const dst_key_t *key, int type, const char *directory) { + FILE *fp; + isc_buffer_t fileb; + char filename[NAME_MAX]; + isc_result_t ret; isc_fsaccess_t access; REQUIRE(VALID_KEY(key)); @@ -2114,17 +2048,16 @@ write_key_state(const dst_key_t *key, int type, const char *directory) * Writes a public key to disk in DNS format. */ static isc_result_t -write_public_key(const dst_key_t *key, int type, const char *directory) -{ - FILE * fp; - isc_buffer_t keyb, textb, fileb, classb; - isc_region_t r; - char filename[NAME_MAX]; - unsigned char key_array[DST_KEY_MAXSIZE]; - char text_array[DST_KEY_MAXTEXTSIZE]; - char class_array[10]; - isc_result_t ret; - dns_rdata_t rdata = DNS_RDATA_INIT; +write_public_key(const dst_key_t *key, int type, const char *directory) { + FILE *fp; + isc_buffer_t keyb, textb, fileb, classb; + isc_region_t r; + char filename[NAME_MAX]; + unsigned char key_array[DST_KEY_MAXSIZE]; + char text_array[DST_KEY_MAXTEXTSIZE]; + char class_array[10]; + isc_result_t ret; + dns_rdata_t rdata = DNS_RDATA_INIT; isc_fsaccess_t access; REQUIRE(VALID_KEY(key)); @@ -2236,9 +2169,8 @@ write_public_key(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) -{ - const char * suffix = ""; + unsigned int type, const char *directory, isc_buffer_t *out) { + const char *suffix = ""; isc_result_t result; REQUIRE(out != NULL); @@ -2273,12 +2205,11 @@ buildfilename(dns_name_t *name, dns_keytag_t id, unsigned int alg, } static isc_result_t -computeid(dst_key_t *key) -{ - isc_buffer_t dnsbuf; +computeid(dst_key_t *key) { + isc_buffer_t dnsbuf; unsigned char dns_array[DST_KEY_MAXSIZE]; - isc_region_t r; - isc_result_t ret; + isc_region_t r; + isc_result_t ret; isc_buffer_init(&dnsbuf, dns_array, sizeof(dns_array)); ret = dst_key_todns(key, &dnsbuf); @@ -2295,9 +2226,8 @@ 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) -{ - dst_key_t * key; + isc_buffer_t *source, isc_mem_t *mctx, dst_key_t **keyp) { + dst_key_t *key; isc_result_t ret; REQUIRE(dns_name_isabsolute(name)); @@ -2333,8 +2263,7 @@ frombuffer(const dns_name_t *name, unsigned int alg, unsigned int flags, } static isc_result_t -algorithm_status(unsigned int alg) -{ +algorithm_status(unsigned int alg) { REQUIRE(dst_initialized == true); if (dst_algorithm_supported(alg)) { @@ -2345,8 +2274,7 @@ algorithm_status(unsigned int alg) static isc_result_t addsuffix(char *filename, int len, const char *odirname, const char *ofilename, - const char *suffix) -{ + const char *suffix) { int olen = strlen(ofilename); int n; @@ -2374,8 +2302,7 @@ addsuffix(char *filename, int len, const char *odirname, const char *ofilename, } isc_buffer_t * -dst_key_tkeytoken(const dst_key_t *key) -{ +dst_key_tkeytoken(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); return (key->key_tkeytoken); } @@ -2386,12 +2313,11 @@ dst_key_tkeytoken(const dst_key_t *key) * */ bool -dst_key_is_unused(dst_key_t *key) -{ - isc_stdtime_t val; +dst_key_is_unused(dst_key_t *key) { + isc_stdtime_t val; dst_key_state_t st; - int state_type; - bool state_type_set; + int state_type; + bool state_type_set; REQUIRE(VALID_KEY(key)); @@ -2456,8 +2382,7 @@ dst_key_is_unused(dst_key_t *key) } static void -get_ksk_zsk(dst_key_t *key, bool *ksk, bool *zsk) -{ +get_ksk_zsk(dst_key_t *key, bool *ksk, bool *zsk) { bool k = false, z = false; if (dst_key_getbool(key, DST_BOOL_KSK, &k) == ISC_R_SUCCESS) { @@ -2475,12 +2400,12 @@ get_ksk_zsk(dst_key_t *key, bool *ksk, bool *zsk) /* Hints on key whether it can be published and/or used for signing. */ bool -dst_key_is_published(dst_key_t *key, isc_stdtime_t now, isc_stdtime_t *publish) -{ +dst_key_is_published(dst_key_t *key, isc_stdtime_t now, + isc_stdtime_t *publish) { dst_key_state_t state; - isc_result_t result; - isc_stdtime_t when; - bool state_ok = true, time_ok = false; + isc_result_t result; + isc_stdtime_t when; + bool state_ok = true, time_ok = false; REQUIRE(VALID_KEY(key)); @@ -2509,13 +2434,12 @@ dst_key_is_published(dst_key_t *key, isc_stdtime_t now, isc_stdtime_t *publish) } bool -dst_key_is_active(dst_key_t *key, isc_stdtime_t now) -{ +dst_key_is_active(dst_key_t *key, isc_stdtime_t now) { dst_key_state_t state; - isc_result_t result; - isc_stdtime_t when = 0; - bool ksk = false, zsk = false, inactive = false; - bool ds_ok = true, zrrsig_ok = true, time_ok = false; + isc_result_t result; + isc_stdtime_t when = 0; + bool ksk = false, zsk = false, inactive = false; + bool ds_ok = true, zrrsig_ok = true, time_ok = false; REQUIRE(VALID_KEY(key)); @@ -2570,13 +2494,12 @@ dst_key_is_active(dst_key_t *key, isc_stdtime_t now) bool dst_key_is_signing(dst_key_t *key, int role, isc_stdtime_t now, - isc_stdtime_t *active) -{ + isc_stdtime_t *active) { dst_key_state_t state; - isc_result_t result; - isc_stdtime_t when = 0; - bool ksk = false, zsk = false, inactive = false; - bool krrsig_ok = true, zrrsig_ok = true, time_ok = false; + isc_result_t result; + isc_stdtime_t when = 0; + bool ksk = false, zsk = false, inactive = false; + bool krrsig_ok = true, zrrsig_ok = true, time_ok = false; REQUIRE(VALID_KEY(key)); @@ -2626,11 +2549,10 @@ dst_key_is_signing(dst_key_t *key, int role, isc_stdtime_t now, } bool -dst_key_is_revoked(dst_key_t *key, isc_stdtime_t now, isc_stdtime_t *revoke) -{ - isc_result_t result; +dst_key_is_revoked(dst_key_t *key, isc_stdtime_t now, isc_stdtime_t *revoke) { + isc_result_t result; isc_stdtime_t when = 0; - bool time_ok = false; + bool time_ok = false; REQUIRE(VALID_KEY(key)); @@ -2644,12 +2566,11 @@ dst_key_is_revoked(dst_key_t *key, isc_stdtime_t now, isc_stdtime_t *revoke) } bool -dst_key_is_removed(dst_key_t *key, isc_stdtime_t now, isc_stdtime_t *remove) -{ +dst_key_is_removed(dst_key_t *key, isc_stdtime_t now, isc_stdtime_t *remove) { dst_key_state_t state; - isc_result_t result; - isc_stdtime_t when = 0; - bool state_ok = true, time_ok = false; + isc_result_t result; + isc_stdtime_t when = 0; + bool state_ok = true, time_ok = false; REQUIRE(VALID_KEY(key)); @@ -2683,10 +2604,9 @@ dst_key_is_removed(dst_key_t *key, isc_stdtime_t now, isc_stdtime_t *remove) } dst_key_state_t -dst_key_goal(dst_key_t *key) -{ +dst_key_goal(dst_key_t *key) { dst_key_state_t state; - isc_result_t result; + isc_result_t result; result = dst_key_getstate(key, DST_KEY_GOAL, &state); if (result == ISC_R_SUCCESS) { @@ -2696,13 +2616,12 @@ dst_key_goal(dst_key_t *key) } void -dst_key_copy_metadata(dst_key_t *to, dst_key_t *from) -{ +dst_key_copy_metadata(dst_key_t *to, dst_key_t *from) { dst_key_state_t state; - isc_stdtime_t when; - uint32_t num; - bool yesno; - isc_result_t result; + isc_stdtime_t when; + uint32_t num; + bool yesno; + isc_result_t result; REQUIRE(VALID_KEY(to)); REQUIRE(VALID_KEY(from)); diff --git a/lib/dns/dst_openssl.h b/lib/dns/dst_openssl.h index d4e74390ca..05fc34915e 100644 --- a/lib/dns/dst_openssl.h +++ b/lib/dns/dst_openssl.h @@ -32,8 +32,8 @@ * _cb; * #endif */ -#define BN_GENCB_free(x) ((void)0) -#define BN_GENCB_new() (&_cb) +#define BN_GENCB_free(x) ((void)0) +#define BN_GENCB_new() (&_cb) #define BN_GENCB_get_arg(x) ((x)->arg) #endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || \ * defined(LIBRESSL_VERSION_NUMBER) */ diff --git a/lib/dns/dst_parse.c b/lib/dns/dst_parse.c index 3612b08feb..a6e01d5adc 100644 --- a/lib/dns/dst_parse.c +++ b/lib/dns/dst_parse.c @@ -50,7 +50,7 @@ #define DST_AS_STR(t) ((t).value.as_textregion.base) #define PRIVATE_KEY_STR "Private-key-format:" -#define ALGORITHM_STR "Algorithm:" +#define ALGORITHM_STR "Algorithm:" #define TIMING_NTAGS (DST_MAX_TIMES + 1) static const char *timetags[TIMING_NTAGS] = { @@ -66,7 +66,7 @@ static const char *numerictags[NUMERIC_NTAGS] = { }; struct parse_map { - const int value; + const int value; const char *tag; }; @@ -116,8 +116,7 @@ static struct parse_map map[] = { { TAG_RSA_MODULUS, "Modulus:" }, { 0, NULL } }; static int -find_value(const char *s, const unsigned int alg) -{ +find_value(const char *s, const unsigned int alg) { int i; for (i = 0; map[i].tag != NULL; i++) { @@ -130,8 +129,7 @@ find_value(const char *s, const unsigned int alg) } static const char * -find_tag(const int value) -{ +find_tag(const int value) { int i; for (i = 0;; i++) { @@ -144,8 +142,7 @@ find_tag(const int value) } static int -find_metadata(const char *s, const char *tags[], int ntags) -{ +find_metadata(const char *s, const char *tags[], int ntags) { int i; for (i = 0; i < ntags; i++) { @@ -158,23 +155,20 @@ find_metadata(const char *s, const char *tags[], int ntags) } static int -find_timedata(const char *s) -{ +find_timedata(const char *s) { return (find_metadata(s, timetags, TIMING_NTAGS)); } static int -find_numericdata(const char *s) -{ +find_numericdata(const char *s) { return (find_metadata(s, numerictags, NUMERIC_NTAGS)); } static int -check_rsa(const dst_private_t *priv, bool external) -{ - int i, j; - bool have[RSA_NTAGS]; - bool ok; +check_rsa(const dst_private_t *priv, bool external) { + int i, j; + bool have[RSA_NTAGS]; + bool ok; unsigned int mask; if (external) { @@ -217,8 +211,7 @@ check_rsa(const dst_private_t *priv, bool external) } static int -check_dh(const dst_private_t *priv) -{ +check_dh(const dst_private_t *priv) { int i, j; if (priv->nelements != DH_NTAGS) { return (-1); @@ -237,11 +230,10 @@ check_dh(const dst_private_t *priv) } static int -check_ecdsa(const dst_private_t *priv, bool external) -{ - int i, j; - bool have[ECDSA_NTAGS]; - bool ok; +check_ecdsa(const dst_private_t *priv, bool external) { + int i, j; + bool have[ECDSA_NTAGS]; + bool ok; unsigned int mask; if (external) { @@ -274,11 +266,10 @@ check_ecdsa(const dst_private_t *priv, bool external) } static int -check_eddsa(const dst_private_t *priv, bool external) -{ - int i, j; - bool have[EDDSA_NTAGS]; - bool ok; +check_eddsa(const dst_private_t *priv, bool external) { + int i, j; + bool have[EDDSA_NTAGS]; + bool ok; unsigned int mask; if (external) { @@ -311,8 +302,7 @@ check_eddsa(const dst_private_t *priv, bool external) } static int -check_hmac_md5(const dst_private_t *priv, bool old) -{ +check_hmac_md5(const dst_private_t *priv, bool old) { int i, j; if (priv->nelements != HMACMD5_NTAGS) { @@ -321,7 +311,8 @@ check_hmac_md5(const dst_private_t *priv, bool old) * the old format return success. */ if (old && priv->nelements == OLD_HMACMD5_NTAGS && - priv->elements[0].tag == TAG_HMACMD5_KEY) { + priv->elements[0].tag == TAG_HMACMD5_KEY) + { return (0); } return (-1); @@ -343,8 +334,8 @@ check_hmac_md5(const dst_private_t *priv, bool old) } static int -check_hmac_sha(const dst_private_t *priv, unsigned int ntags, unsigned int alg) -{ +check_hmac_sha(const dst_private_t *priv, unsigned int ntags, + unsigned int alg) { unsigned int i, j; if (priv->nelements != ntags) { return (-1); @@ -364,8 +355,7 @@ check_hmac_sha(const dst_private_t *priv, unsigned int ntags, unsigned int alg) static int check_data(const dst_private_t *priv, const unsigned int alg, bool old, - bool external) -{ + bool external) { /* XXXVIX this switch statement is too sparse to gen a jump table. */ switch (alg) { case DST_ALG_RSA: @@ -400,8 +390,7 @@ check_data(const dst_private_t *priv, const unsigned int alg, bool old, } void -dst__privstruct_free(dst_private_t *priv, isc_mem_t *mctx) -{ +dst__privstruct_free(dst_private_t *priv, isc_mem_t *mctx) { int i; if (priv == NULL) { @@ -419,16 +408,15 @@ dst__privstruct_free(dst_private_t *priv, isc_mem_t *mctx) isc_result_t dst__privstruct_parse(dst_key_t *key, unsigned int alg, isc_lex_t *lex, - isc_mem_t *mctx, dst_private_t *priv) -{ - int n = 0, major, minor, check; - isc_buffer_t b; - isc_token_t token; + isc_mem_t *mctx, dst_private_t *priv) { + int n = 0, major, minor, check; + isc_buffer_t b; + isc_token_t token; unsigned char *data = NULL; - unsigned int opt = ISC_LEXOPT_EOL; - isc_stdtime_t when; - isc_result_t ret; - bool external = false; + unsigned int opt = ISC_LEXOPT_EOL; + isc_stdtime_t when; + isc_result_t ret; + bool external = false; REQUIRE(priv != NULL); @@ -456,14 +444,15 @@ dst__privstruct_parse(dst_key_t *key, unsigned int alg, isc_lex_t *lex, */ NEXTTOKEN(lex, opt, &token); if (token.type != isc_tokentype_string || - strcmp(DST_AS_STR(token), PRIVATE_KEY_STR) != 0) { + strcmp(DST_AS_STR(token), PRIVATE_KEY_STR) != 0) + { ret = DST_R_INVALIDPRIVATEKEY; goto fail; } NEXTTOKEN(lex, opt, &token); - if (token.type != isc_tokentype_string || - (DST_AS_STR(token))[0] != 'v') { + if (token.type != isc_tokentype_string || (DST_AS_STR(token))[0] != 'v') + { ret = DST_R_INVALIDPRIVATEKEY; goto fail; } @@ -489,14 +478,16 @@ dst__privstruct_parse(dst_key_t *key, unsigned int alg, isc_lex_t *lex, */ NEXTTOKEN(lex, opt, &token); if (token.type != isc_tokentype_string || - strcmp(DST_AS_STR(token), ALGORITHM_STR) != 0) { + strcmp(DST_AS_STR(token), ALGORITHM_STR) != 0) + { ret = DST_R_INVALIDPRIVATEKEY; goto fail; } NEXTTOKEN(lex, opt | ISC_LEXOPT_NUMBER, &token); if (token.type != isc_tokentype_number || - token.value.as_ulong != (unsigned long)dst_key_alg(key)) { + token.value.as_ulong != (unsigned long)dst_key_alg(key)) + { ret = DST_R_INVALIDPRIVATEKEY; goto fail; } @@ -507,7 +498,7 @@ dst__privstruct_parse(dst_key_t *key, unsigned int alg, isc_lex_t *lex, * Read the key data. */ for (n = 0; n < MAXFIELDS; n++) { - int tag; + int tag; isc_region_t r; do { ret = isc_lex_gettoken(lex, opt, &token); @@ -624,20 +615,19 @@ fail: isc_result_t dst__privstruct_writefile(const dst_key_t *key, const dst_private_t *priv, - const char *directory) -{ - FILE * fp; - isc_result_t result; - char filename[NAME_MAX]; - char buffer[MAXFIELDSIZE * 2]; + const char *directory) { + FILE *fp; + isc_result_t result; + char filename[NAME_MAX]; + char buffer[MAXFIELDSIZE * 2]; isc_fsaccess_t access; - isc_stdtime_t when; - uint32_t value; - isc_buffer_t b; - isc_region_t r; - int major, minor; - mode_t mode; - int i, ret; + isc_stdtime_t when; + uint32_t value; + isc_buffer_t b; + isc_region_t r; + int major, minor; + mode_t mode; + int i, ret; REQUIRE(priv != NULL); diff --git a/lib/dns/dst_parse.h b/lib/dns/dst_parse.h index 5e57596d97..e22beb277a 100644 --- a/lib/dns/dst_parse.h +++ b/lib/dns/dst_parse.h @@ -39,62 +39,62 @@ */ #define MAXFIELDS 12 + 6 -#define TAG_SHIFT 4 -#define TAG_ALG(tag) ((unsigned int)(tag) >> TAG_SHIFT) +#define TAG_SHIFT 4 +#define TAG_ALG(tag) ((unsigned int)(tag) >> TAG_SHIFT) #define TAG(alg, off) (((alg) << TAG_SHIFT) + (off)) /* These are used by RSA-SHA1, RSASHA256 and RSASHA512 */ -#define RSA_NTAGS 11 -#define TAG_RSA_MODULUS ((DST_ALG_RSA << TAG_SHIFT) + 0) -#define TAG_RSA_PUBLICEXPONENT ((DST_ALG_RSA << TAG_SHIFT) + 1) +#define RSA_NTAGS 11 +#define TAG_RSA_MODULUS ((DST_ALG_RSA << TAG_SHIFT) + 0) +#define TAG_RSA_PUBLICEXPONENT ((DST_ALG_RSA << TAG_SHIFT) + 1) #define TAG_RSA_PRIVATEEXPONENT ((DST_ALG_RSA << TAG_SHIFT) + 2) -#define TAG_RSA_PRIME1 ((DST_ALG_RSA << TAG_SHIFT) + 3) -#define TAG_RSA_PRIME2 ((DST_ALG_RSA << TAG_SHIFT) + 4) -#define TAG_RSA_EXPONENT1 ((DST_ALG_RSA << TAG_SHIFT) + 5) -#define TAG_RSA_EXPONENT2 ((DST_ALG_RSA << TAG_SHIFT) + 6) -#define TAG_RSA_COEFFICIENT ((DST_ALG_RSA << TAG_SHIFT) + 7) -#define TAG_RSA_ENGINE ((DST_ALG_RSA << TAG_SHIFT) + 8) -#define TAG_RSA_LABEL ((DST_ALG_RSA << TAG_SHIFT) + 9) +#define TAG_RSA_PRIME1 ((DST_ALG_RSA << TAG_SHIFT) + 3) +#define TAG_RSA_PRIME2 ((DST_ALG_RSA << TAG_SHIFT) + 4) +#define TAG_RSA_EXPONENT1 ((DST_ALG_RSA << TAG_SHIFT) + 5) +#define TAG_RSA_EXPONENT2 ((DST_ALG_RSA << TAG_SHIFT) + 6) +#define TAG_RSA_COEFFICIENT ((DST_ALG_RSA << TAG_SHIFT) + 7) +#define TAG_RSA_ENGINE ((DST_ALG_RSA << TAG_SHIFT) + 8) +#define TAG_RSA_LABEL ((DST_ALG_RSA << TAG_SHIFT) + 9) -#define DH_NTAGS 4 -#define TAG_DH_PRIME ((DST_ALG_DH << TAG_SHIFT) + 0) +#define DH_NTAGS 4 +#define TAG_DH_PRIME ((DST_ALG_DH << TAG_SHIFT) + 0) #define TAG_DH_GENERATOR ((DST_ALG_DH << TAG_SHIFT) + 1) -#define TAG_DH_PRIVATE ((DST_ALG_DH << TAG_SHIFT) + 2) -#define TAG_DH_PUBLIC ((DST_ALG_DH << TAG_SHIFT) + 3) +#define TAG_DH_PRIVATE ((DST_ALG_DH << TAG_SHIFT) + 2) +#define TAG_DH_PUBLIC ((DST_ALG_DH << TAG_SHIFT) + 3) -#define ECDSA_NTAGS 4 +#define ECDSA_NTAGS 4 #define TAG_ECDSA_PRIVATEKEY ((DST_ALG_ECDSA256 << TAG_SHIFT) + 0) -#define TAG_ECDSA_ENGINE ((DST_ALG_ECDSA256 << TAG_SHIFT) + 1) -#define TAG_ECDSA_LABEL ((DST_ALG_ECDSA256 << TAG_SHIFT) + 2) +#define TAG_ECDSA_ENGINE ((DST_ALG_ECDSA256 << TAG_SHIFT) + 1) +#define TAG_ECDSA_LABEL ((DST_ALG_ECDSA256 << TAG_SHIFT) + 2) -#define EDDSA_NTAGS 4 +#define EDDSA_NTAGS 4 #define TAG_EDDSA_PRIVATEKEY ((DST_ALG_ED25519 << TAG_SHIFT) + 0) -#define TAG_EDDSA_ENGINE ((DST_ALG_ED25519 << TAG_SHIFT) + 1) -#define TAG_EDDSA_LABEL ((DST_ALG_ED25519 << TAG_SHIFT) + 2) +#define TAG_EDDSA_ENGINE ((DST_ALG_ED25519 << TAG_SHIFT) + 1) +#define TAG_EDDSA_LABEL ((DST_ALG_ED25519 << TAG_SHIFT) + 2) #define OLD_HMACMD5_NTAGS 1 -#define HMACMD5_NTAGS 2 -#define TAG_HMACMD5_KEY ((DST_ALG_HMACMD5 << TAG_SHIFT) + 0) -#define TAG_HMACMD5_BITS ((DST_ALG_HMACMD5 << TAG_SHIFT) + 1) +#define HMACMD5_NTAGS 2 +#define TAG_HMACMD5_KEY ((DST_ALG_HMACMD5 << TAG_SHIFT) + 0) +#define TAG_HMACMD5_BITS ((DST_ALG_HMACMD5 << TAG_SHIFT) + 1) -#define HMACSHA1_NTAGS 2 -#define TAG_HMACSHA1_KEY ((DST_ALG_HMACSHA1 << TAG_SHIFT) + 0) +#define HMACSHA1_NTAGS 2 +#define TAG_HMACSHA1_KEY ((DST_ALG_HMACSHA1 << TAG_SHIFT) + 0) #define TAG_HMACSHA1_BITS ((DST_ALG_HMACSHA1 << TAG_SHIFT) + 1) -#define HMACSHA224_NTAGS 2 -#define TAG_HMACSHA224_KEY ((DST_ALG_HMACSHA224 << TAG_SHIFT) + 0) +#define HMACSHA224_NTAGS 2 +#define TAG_HMACSHA224_KEY ((DST_ALG_HMACSHA224 << TAG_SHIFT) + 0) #define TAG_HMACSHA224_BITS ((DST_ALG_HMACSHA224 << TAG_SHIFT) + 1) -#define HMACSHA256_NTAGS 2 -#define TAG_HMACSHA256_KEY ((DST_ALG_HMACSHA256 << TAG_SHIFT) + 0) +#define HMACSHA256_NTAGS 2 +#define TAG_HMACSHA256_KEY ((DST_ALG_HMACSHA256 << TAG_SHIFT) + 0) #define TAG_HMACSHA256_BITS ((DST_ALG_HMACSHA256 << TAG_SHIFT) + 1) -#define HMACSHA384_NTAGS 2 -#define TAG_HMACSHA384_KEY ((DST_ALG_HMACSHA384 << TAG_SHIFT) + 0) +#define HMACSHA384_NTAGS 2 +#define TAG_HMACSHA384_KEY ((DST_ALG_HMACSHA384 << TAG_SHIFT) + 0) #define TAG_HMACSHA384_BITS ((DST_ALG_HMACSHA384 << TAG_SHIFT) + 1) -#define HMACSHA512_NTAGS 2 -#define TAG_HMACSHA512_KEY ((DST_ALG_HMACSHA512 << TAG_SHIFT) + 0) +#define HMACSHA512_NTAGS 2 +#define TAG_HMACSHA512_KEY ((DST_ALG_HMACSHA512 << TAG_SHIFT) + 0) #define TAG_HMACSHA512_BITS ((DST_ALG_HMACSHA512 << TAG_SHIFT) + 1) struct dst_private_element { diff --git a/lib/dns/dst_result.c b/lib/dns/dst_result.c index 77b016dbef..5a9f958cb2 100644 --- a/lib/dns/dst_result.c +++ b/lib/dns/dst_result.c @@ -71,8 +71,7 @@ static const char *ids[DST_R_NRESULTS] = { static isc_once_t once = ISC_ONCE_INIT; static void -initialize_action(void) -{ +initialize_action(void) { isc_result_t result; result = isc_result_register(ISC_RESULTCLASS_DST, DST_R_NRESULTS, text, @@ -90,22 +89,19 @@ initialize_action(void) } static void -initialize(void) -{ +initialize(void) { RUNTIME_CHECK(isc_once_do(&once, initialize_action) == ISC_R_SUCCESS); } const char * -dst_result_totext(isc_result_t result) -{ +dst_result_totext(isc_result_t result) { initialize(); return (isc_result_totext(result)); } void -dst_result_register(void) -{ +dst_result_register(void) { initialize(); } diff --git a/lib/dns/dyndb.c b/lib/dns/dyndb.c index 5dfab9ee82..fdc8ea59f8 100644 --- a/lib/dns/dyndb.c +++ b/lib/dns/dyndb.c @@ -42,12 +42,12 @@ typedef struct dyndb_implementation dyndb_implementation_t; struct dyndb_implementation { - isc_mem_t * mctx; - void * handle; + isc_mem_t *mctx; + void *handle; dns_dyndb_register_t *register_func; - dns_dyndb_destroy_t * destroy_func; - char * name; - void * inst; + dns_dyndb_destroy_t *destroy_func; + char *name; + void *inst; LINK(dyndb_implementation_t) link; }; @@ -61,22 +61,21 @@ static LIST(dyndb_implementation_t) dyndb_implementations; /* Locks dyndb_implementations. */ static isc_mutex_t dyndb_lock; -static isc_once_t once = ISC_ONCE_INIT; +static isc_once_t once = ISC_ONCE_INIT; static void -dyndb_initialize(void) -{ +dyndb_initialize(void) { isc_mutex_init(&dyndb_lock); INIT_LIST(dyndb_implementations); } static dyndb_implementation_t * -impfind(const char *name) -{ +impfind(const char *name) { dyndb_implementation_t *imp; for (imp = ISC_LIST_HEAD(dyndb_implementations); imp != NULL; - imp = ISC_LIST_NEXT(imp, link)) { + imp = ISC_LIST_NEXT(imp, link)) + { if (strcasecmp(name, imp->name) == 0) { return (imp); } @@ -87,10 +86,9 @@ impfind(const char *name) #if HAVE_DLFCN_H && HAVE_DLOPEN static isc_result_t load_symbol(void *handle, const char *filename, const char *symbol_name, - void **symbolp) -{ + void **symbolp) { const char *errmsg; - void * symbol; + void *symbol; REQUIRE(handle != NULL); REQUIRE(symbolp != NULL && *symbolp == NULL); @@ -117,15 +115,14 @@ load_symbol(void *handle, const char *filename, const char *symbol_name, static isc_result_t load_library(isc_mem_t *mctx, const char *filename, const char *instname, - dyndb_implementation_t **impp) -{ - isc_result_t result; - void * handle = NULL; + dyndb_implementation_t **impp) { + isc_result_t result; + void *handle = NULL; dyndb_implementation_t *imp = NULL; - dns_dyndb_register_t * register_func = NULL; - dns_dyndb_destroy_t * destroy_func = NULL; - dns_dyndb_version_t * version_func = NULL; - int version, flags; + dns_dyndb_register_t *register_func = NULL; + dns_dyndb_destroy_t *destroy_func = NULL; + dns_dyndb_version_t *version_func = NULL; + int version, flags; REQUIRE(impp != NULL && *impp == NULL); @@ -151,7 +148,8 @@ load_library(isc_mem_t *mctx, const char *filename, const char *instname, version = version_func(NULL); if (version < (DNS_DYNDB_VERSION - DNS_DYNDB_AGE) || - version > DNS_DYNDB_VERSION) { + version > DNS_DYNDB_VERSION) + { isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DYNDB, ISC_LOG_ERROR, "driver API version mismatch: %d/%d", version, @@ -200,8 +198,7 @@ cleanup: } static void -unload_library(dyndb_implementation_t **impp) -{ +unload_library(dyndb_implementation_t **impp) { dyndb_implementation_t *imp; REQUIRE(impp != NULL && *impp != NULL); @@ -215,8 +212,7 @@ unload_library(dyndb_implementation_t **impp) #elif _WIN32 static isc_result_t load_symbol(HMODULE handle, const char *filename, const char *symbol_name, - void **symbolp) -{ + void **symbolp) { void *symbol; REQUIRE(handle != NULL); @@ -240,15 +236,14 @@ load_symbol(HMODULE handle, const char *filename, const char *symbol_name, static isc_result_t load_library(isc_mem_t *mctx, const char *filename, const char *instname, - dyndb_implementation_t **impp) -{ - isc_result_t result; - HMODULE handle; + dyndb_implementation_t **impp) { + isc_result_t result; + HMODULE handle; dyndb_implementation_t *imp = NULL; - dns_dyndb_register_t * register_func = NULL; - dns_dyndb_destroy_t * destroy_func = NULL; - dns_dyndb_version_t * version_func = NULL; - int version; + dns_dyndb_register_t *register_func = NULL; + dns_dyndb_destroy_t *destroy_func = NULL; + dns_dyndb_version_t *version_func = NULL; + int version; REQUIRE(impp != NULL && *impp == NULL); @@ -266,7 +261,8 @@ load_library(isc_mem_t *mctx, const char *filename, const char *instname, version = version_func(NULL); if (version < (DNS_DYNDB_VERSION - DNS_DYNDB_AGE) || - version > DNS_DYNDB_VERSION) { + version > DNS_DYNDB_VERSION) + { isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DYNDB, ISC_LOG_ERROR, "driver API version mismatch: %d/%d", version, @@ -315,8 +311,7 @@ cleanup: } static void -unload_library(dyndb_implementation_t **impp) -{ +unload_library(dyndb_implementation_t **impp) { dyndb_implementation_t *imp; REQUIRE(impp != NULL && *impp != NULL); @@ -330,8 +325,7 @@ unload_library(dyndb_implementation_t **impp) #else /* HAVE_DLFCN_H || _WIN32 */ static isc_result_t load_library(isc_mem_t *mctx, const char *filename, const char *instname, - dyndb_implementation_t **impp) -{ + dyndb_implementation_t **impp) { UNUSED(mctx); UNUSED(filename); UNUSED(instname); @@ -345,8 +339,7 @@ load_library(isc_mem_t *mctx, const char *filename, const char *instname, } static void -unload_library(dyndb_implementation_t **impp) -{ +unload_library(dyndb_implementation_t **impp) { UNUSED(impp); } #endif /* HAVE_DLFCN_H */ @@ -354,9 +347,8 @@ unload_library(dyndb_implementation_t **impp) isc_result_t dns_dyndb_load(const char *libname, const char *name, const char *parameters, const char *file, unsigned long line, isc_mem_t *mctx, - const dns_dyndbctx_t *dctx) -{ - isc_result_t result; + const dns_dyndbctx_t *dctx) { + isc_result_t result; dyndb_implementation_t *implementation = NULL; REQUIRE(DNS_DYNDBCTX_VALID(dctx)); @@ -390,8 +382,7 @@ cleanup: } void -dns_dyndb_cleanup(bool exiting) -{ +dns_dyndb_cleanup(bool exiting) { dyndb_implementation_t *elem; dyndb_implementation_t *prev; @@ -420,8 +411,7 @@ dns_dyndb_cleanup(bool exiting) isc_result_t dns_dyndb_createctx(isc_mem_t *mctx, const void *hashinit, isc_log_t *lctx, dns_view_t *view, dns_zonemgr_t *zmgr, isc_task_t *task, - isc_timermgr_t *tmgr, dns_dyndbctx_t **dctxp) -{ + isc_timermgr_t *tmgr, dns_dyndbctx_t **dctxp) { dns_dyndbctx_t *dctx; REQUIRE(dctxp != NULL && *dctxp == NULL); @@ -452,8 +442,7 @@ dns_dyndb_createctx(isc_mem_t *mctx, const void *hashinit, isc_log_t *lctx, } void -dns_dyndb_destroyctx(dns_dyndbctx_t **dctxp) -{ +dns_dyndb_destroyctx(dns_dyndbctx_t **dctxp) { dns_dyndbctx_t *dctx; REQUIRE(dctxp != NULL && DNS_DYNDBCTX_VALID(*dctxp)); diff --git a/lib/dns/ecdb.c b/lib/dns/ecdb.c index d97a6bf890..746cb935b5 100644 --- a/lib/dns/ecdb.c +++ b/lib/dns/ecdb.c @@ -24,10 +24,10 @@ #include #include -#define ECDB_MAGIC ISC_MAGIC('E', 'C', 'D', 'B') +#define ECDB_MAGIC ISC_MAGIC('E', 'C', 'D', 'B') #define VALID_ECDB(db) ((db) != NULL && (db)->common.impmagic == ECDB_MAGIC) -#define ECDBNODE_MAGIC ISC_MAGIC('E', 'C', 'D', 'N') +#define ECDBNODE_MAGIC ISC_MAGIC('E', 'C', 'D', 'N') #define VALID_ECDBNODE(ecdbn) ISC_MAGIC_VALID(ecdbn, ECDBNODE_MAGIC) /*% @@ -40,7 +40,7 @@ typedef struct dns_ecdb { /* Unlocked */ - dns_db_t common; + dns_db_t common; isc_mutex_t lock; /* Protected by atomics */ @@ -53,9 +53,9 @@ typedef struct dns_ecdb { typedef struct dns_ecdbnode { /* Unlocked */ unsigned int magic; - isc_mutex_t lock; - dns_ecdb_t * ecdb; - dns_name_t name; + isc_mutex_t lock; + dns_ecdb_t *ecdb; + dns_name_t name; ISC_LINK(struct dns_ecdbnode) link; /* Locked */ @@ -67,10 +67,10 @@ typedef struct dns_ecdbnode { typedef struct rdatasetheader { dns_rdatatype_t type; - dns_ttl_t ttl; - dns_trust_t trust; + dns_ttl_t ttl; + dns_trust_t trust; dns_rdatatype_t covers; - unsigned int attributes; + unsigned int attributes; ISC_LINK(struct rdatasetheader) link; } rdatasetheader_t; @@ -78,28 +78,21 @@ typedef struct rdatasetheader { /* Copied from rbtdb.c */ #define RDATASET_ATTR_NXDOMAIN 0x0010 #define RDATASET_ATTR_NEGATIVE 0x0100 -#define NXDOMAIN(header) (((header)->attributes & RDATASET_ATTR_NXDOMAIN) != 0) -#define NEGATIVE(header) (((header)->attributes & RDATASET_ATTR_NEGATIVE) != 0) +#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 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 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, @@ -122,17 +115,14 @@ static dns_rdatasetmethods_t rdataset_methods = { typedef struct ecdb_rdatasetiter { dns_rdatasetiter_t common; - rdatasetheader_t * current; + 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, @@ -140,8 +130,7 @@ static dns_rdatasetitermethods_t rdatasetiter_methods = { }; isc_result_t -dns_ecdb_register(isc_mem_t *mctx, dns_dbimplementation_t **dbimp) -{ +dns_ecdb_register(isc_mem_t *mctx, dns_dbimplementation_t **dbimp) { REQUIRE(mctx != NULL); REQUIRE(dbimp != NULL && *dbimp == NULL); @@ -149,8 +138,7 @@ dns_ecdb_register(isc_mem_t *mctx, dns_dbimplementation_t **dbimp) } void -dns_ecdb_unregister(dns_dbimplementation_t **dbimp) -{ +dns_ecdb_unregister(dns_dbimplementation_t **dbimp) { REQUIRE(dbimp != NULL && *dbimp != NULL); dns_db_unregister(dbimp); @@ -161,8 +149,7 @@ dns_ecdb_unregister(dns_dbimplementation_t **dbimp) */ static void -attach(dns_db_t *source, dns_db_t **targetp) -{ +attach(dns_db_t *source, dns_db_t **targetp) { dns_ecdb_t *ecdb = (dns_ecdb_t *)source; REQUIRE(VALID_ECDB(ecdb)); @@ -174,8 +161,7 @@ attach(dns_db_t *source, dns_db_t **targetp) } static void -destroy_ecdb(dns_ecdb_t *ecdb) -{ +destroy_ecdb(dns_ecdb_t *ecdb) { if (isc_refcount_decrement(&ecdb->references) == 1) { isc_refcount_destroy(&ecdb->references); @@ -195,8 +181,7 @@ destroy_ecdb(dns_ecdb_t *ecdb) } static void -detach(dns_db_t **dbp) -{ +detach(dns_db_t **dbp) { dns_ecdb_t *ecdb; REQUIRE(dbp != NULL); @@ -209,9 +194,8 @@ detach(dns_db_t **dbp) } static void -attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) -{ - dns_ecdb_t * ecdb = (dns_ecdb_t *)db; +attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) { + dns_ecdb_t *ecdb = (dns_ecdb_t *)db; dns_ecdbnode_t *node = (dns_ecdbnode_t *)source; REQUIRE(VALID_ECDB(ecdb)); @@ -225,10 +209,9 @@ attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) } static void -destroynode(dns_ecdbnode_t *node) -{ - isc_mem_t * mctx; - dns_ecdb_t * ecdb = node->ecdb; +destroynode(dns_ecdbnode_t *node) { + isc_mem_t *mctx; + dns_ecdb_t *ecdb = node->ecdb; rdatasetheader_t *header; mctx = ecdb->common.mctx; @@ -258,9 +241,8 @@ destroynode(dns_ecdbnode_t *node) } static void -detachnode(dns_db_t *db, dns_dbnode_t **nodep) -{ - dns_ecdb_t * ecdb = (dns_ecdb_t *)db; +detachnode(dns_db_t *db, dns_dbnode_t **nodep) { + dns_ecdb_t *ecdb = (dns_ecdb_t *)db; dns_ecdbnode_t *node; REQUIRE(VALID_ECDB(ecdb)); @@ -278,8 +260,7 @@ static isc_result_t find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *sigrdataset) { dns_ecdb_t *ecdb = (dns_ecdb_t *)db; REQUIRE(VALID_ECDB(ecdb)); @@ -301,8 +282,7 @@ static isc_result_t findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_name_t *dcname, dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *sigrdataset) { dns_ecdb_t *ecdb = (dns_ecdb_t *)db; REQUIRE(VALID_ECDB(ecdb)); @@ -321,10 +301,9 @@ findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, static isc_result_t findnode(dns_db_t *db, const dns_name_t *name, bool create, - dns_dbnode_t **nodep) -{ - dns_ecdb_t * ecdb = (dns_ecdb_t *)db; - isc_mem_t * mctx; + dns_dbnode_t **nodep) { + dns_ecdb_t *ecdb = (dns_ecdb_t *)db; + isc_mem_t *mctx; dns_ecdbnode_t *node; REQUIRE(VALID_ECDB(ecdb)); @@ -366,8 +345,7 @@ findnode(dns_db_t *db, const dns_name_t *name, bool create, static void bind_rdataset(dns_ecdb_t *ecdb, dns_ecdbnode_t *node, rdatasetheader_t *header, - dns_rdataset_t *rdataset) -{ + dns_rdataset_t *rdataset) { unsigned char *raw; /* @@ -407,13 +385,12 @@ bind_rdataset(dns_ecdb_t *ecdb, dns_ecdbnode_t *node, rdatasetheader_t *header, static isc_result_t addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, isc_stdtime_t now, dns_rdataset_t *rdataset, unsigned int options, - dns_rdataset_t *addedrdataset) -{ - dns_ecdb_t * ecdb = (dns_ecdb_t *)db; - isc_region_t r; - isc_result_t result = ISC_R_SUCCESS; - isc_mem_t * mctx; - dns_ecdbnode_t * ecdbnode = (dns_ecdbnode_t *)node; + dns_rdataset_t *addedrdataset) { + dns_ecdb_t *ecdb = (dns_ecdb_t *)db; + isc_region_t r; + isc_result_t result = ISC_R_SUCCESS; + isc_mem_t *mctx; + dns_ecdbnode_t *ecdbnode = (dns_ecdbnode_t *)node; rdatasetheader_t *header; REQUIRE(VALID_ECDB(ecdb)); @@ -432,7 +409,8 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, * existing rdataset of the same type. */ for (header = ISC_LIST_HEAD(ecdbnode->rdatasets); header != NULL; - header = ISC_LIST_NEXT(header, link)) { + header = ISC_LIST_NEXT(header, link)) + { INSIST(header->type != rdataset->type || header->covers != rdataset->covers); } @@ -472,8 +450,7 @@ unlock: static isc_result_t deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, - dns_rdatatype_t type, dns_rdatatype_t covers) -{ + dns_rdatatype_t type, dns_rdatatype_t covers) { UNUSED(db); UNUSED(node); UNUSED(version); @@ -484,8 +461,8 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, } static isc_result_t -createiterator(dns_db_t *db, unsigned int options, dns_dbiterator_t **iteratorp) -{ +createiterator(dns_db_t *db, unsigned int options, + dns_dbiterator_t **iteratorp) { UNUSED(db); UNUSED(options); UNUSED(iteratorp); @@ -495,11 +472,10 @@ createiterator(dns_db_t *db, unsigned int options, dns_dbiterator_t **iteratorp) static isc_result_t allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, - isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) -{ - dns_ecdb_t * ecdb = (dns_ecdb_t *)db; - dns_ecdbnode_t * ecdbnode = (dns_ecdbnode_t *)node; - isc_mem_t * mctx; + isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) { + dns_ecdb_t *ecdb = (dns_ecdb_t *)db; + dns_ecdbnode_t *ecdbnode = (dns_ecdbnode_t *)node; + isc_mem_t *mctx; ecdb_rdatasetiter_t *iterator; REQUIRE(VALID_ECDB(ecdb)); @@ -576,9 +552,8 @@ static dns_dbmethods_t ecdb_methods = { 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) -{ - dns_ecdb_t * ecdb; + void *driverarg, dns_db_t **dbp) { + dns_ecdb_t *ecdb; isc_result_t result; REQUIRE(mctx != NULL); @@ -622,19 +597,17 @@ dns_ecdb_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, */ static void -rdataset_disassociate(dns_rdataset_t *rdataset) -{ - dns_db_t * db = rdataset->private1; +rdataset_disassociate(dns_rdataset_t *rdataset) { + dns_db_t *db = rdataset->private1; dns_dbnode_t *node = rdataset->private2; dns_db_detachnode(db, &node); } static isc_result_t -rdataset_first(dns_rdataset_t *rdataset) -{ +rdataset_first(dns_rdataset_t *rdataset) { unsigned char *raw = rdataset->private3; - unsigned int count; + unsigned int count; count = raw[0] * 256 + raw[1]; if (count == 0) { @@ -659,10 +632,9 @@ rdataset_first(dns_rdataset_t *rdataset) } static isc_result_t -rdataset_next(dns_rdataset_t *rdataset) -{ - unsigned int count; - unsigned int length; +rdataset_next(dns_rdataset_t *rdataset) { + unsigned int count; + unsigned int length; unsigned char *raw; count = rdataset->privateuint4; @@ -684,12 +656,11 @@ rdataset_next(dns_rdataset_t *rdataset) } static void -rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) -{ +rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) { unsigned char *raw = rdataset->private5; - isc_region_t r; - unsigned int length; - unsigned int flags = 0; + isc_region_t r; + unsigned int length; + unsigned int flags = 0; REQUIRE(raw != NULL); @@ -713,9 +684,8 @@ rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) } static void -rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) -{ - dns_db_t * db = source->private1; +rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) { + dns_db_t *db = source->private1; dns_dbnode_t *node = source->private2; dns_dbnode_t *cloned_node = NULL; @@ -730,10 +700,9 @@ rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) } static unsigned int -rdataset_count(dns_rdataset_t *rdataset) -{ +rdataset_count(dns_rdataset_t *rdataset) { unsigned char *raw = rdataset->private3; - unsigned int count; + unsigned int count; count = raw[0] * 256 + raw[1]; @@ -741,8 +710,7 @@ rdataset_count(dns_rdataset_t *rdataset) } static void -rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust) -{ +rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust) { rdatasetheader_t *header = rdataset->private3; header--; @@ -754,11 +722,10 @@ rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust) */ static void -rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) -{ +rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) { isc_mem_t *mctx; union { - dns_rdatasetiter_t * rdatasetiterator; + dns_rdatasetiter_t *rdatasetiterator; ecdb_rdatasetiter_t *ecdbiterator; } u; @@ -777,12 +744,11 @@ rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) } static isc_result_t -rdatasetiter_first(dns_rdatasetiter_t *iterator) -{ +rdatasetiter_first(dns_rdatasetiter_t *iterator) { REQUIRE(DNS_RDATASETITER_VALID(iterator)); ecdb_rdatasetiter_t *ecdbiterator = (ecdb_rdatasetiter_t *)iterator; - dns_ecdbnode_t * ecdbnode = (dns_ecdbnode_t *)iterator->node; + dns_ecdbnode_t *ecdbnode = (dns_ecdbnode_t *)iterator->node; if (ISC_LIST_EMPTY(ecdbnode->rdatasets)) { return (ISC_R_NOMORE); @@ -792,8 +758,7 @@ rdatasetiter_first(dns_rdatasetiter_t *iterator) } static isc_result_t -rdatasetiter_next(dns_rdatasetiter_t *iterator) -{ +rdatasetiter_next(dns_rdatasetiter_t *iterator) { REQUIRE(DNS_RDATASETITER_VALID(iterator)); ecdb_rdatasetiter_t *ecdbiterator = (ecdb_rdatasetiter_t *)iterator; @@ -807,10 +772,9 @@ rdatasetiter_next(dns_rdatasetiter_t *iterator) } static void -rdatasetiter_current(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset) -{ +rdatasetiter_current(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset) { ecdb_rdatasetiter_t *ecdbiterator = (ecdb_rdatasetiter_t *)iterator; - dns_ecdb_t * ecdb; + dns_ecdb_t *ecdb; ecdb = (dns_ecdb_t *)iterator->db; REQUIRE(VALID_ECDB(ecdb)); diff --git a/lib/dns/ecs.c b/lib/dns/ecs.c index 2b5ebeed73..1b75eb37f5 100644 --- a/lib/dns/ecs.c +++ b/lib/dns/ecs.c @@ -21,8 +21,7 @@ #include void -dns_ecs_init(dns_ecs_t *ecs) -{ +dns_ecs_init(dns_ecs_t *ecs) { isc_netaddr_unspec(&ecs->addr); ecs->source = 0; /* @@ -33,8 +32,7 @@ dns_ecs_init(dns_ecs_t *ecs) } void -dns_ecs_format(dns_ecs_t *ecs, char *buf, size_t size) -{ +dns_ecs_format(dns_ecs_t *ecs, char *buf, size_t size) { size_t len; REQUIRE(ecs != NULL); diff --git a/lib/dns/fixedname.c b/lib/dns/fixedname.c index 782a3b4918..6513458576 100644 --- a/lib/dns/fixedname.c +++ b/lib/dns/fixedname.c @@ -14,28 +14,24 @@ #include void -dns_fixedname_init(dns_fixedname_t *fixed) -{ +dns_fixedname_init(dns_fixedname_t *fixed) { dns_name_init(&fixed->name, fixed->offsets); isc_buffer_init(&fixed->buffer, fixed->data, DNS_NAME_MAXWIRE); dns_name_setbuffer(&fixed->name, &fixed->buffer); } void -dns_fixedname_invalidate(dns_fixedname_t *fixed) -{ +dns_fixedname_invalidate(dns_fixedname_t *fixed) { dns_name_invalidate(&fixed->name); } dns_name_t * -dns_fixedname_name(dns_fixedname_t *fixed) -{ +dns_fixedname_name(dns_fixedname_t *fixed) { return (&fixed->name); } dns_name_t * -dns_fixedname_initname(dns_fixedname_t *fixed) -{ +dns_fixedname_initname(dns_fixedname_t *fixed) { dns_fixedname_init(fixed); return (dns_fixedname_name(fixed)); } diff --git a/lib/dns/forward.c b/lib/dns/forward.c index 443b0df3e5..ddc2391f89 100644 --- a/lib/dns/forward.c +++ b/lib/dns/forward.c @@ -24,23 +24,21 @@ struct dns_fwdtable { /* Unlocked. */ unsigned int magic; - isc_mem_t * mctx; + isc_mem_t *mctx; isc_rwlock_t rwlock; /* Locked by lock. */ dns_rbt_t *table; }; -#define FWDTABLEMAGIC ISC_MAGIC('F', 'w', 'd', 'T') +#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) -{ +dns_fwdtable_create(isc_mem_t *mctx, dns_fwdtable_t **fwdtablep) { dns_fwdtable_t *fwdtable; - isc_result_t result; + isc_result_t result; REQUIRE(fwdtablep != NULL && *fwdtablep == NULL); @@ -75,11 +73,10 @@ cleanup_fwdtable: isc_result_t dns_fwdtable_addfwd(dns_fwdtable_t *fwdtable, const dns_name_t *name, - dns_forwarderlist_t *fwdrs, dns_fwdpolicy_t fwdpolicy) -{ - isc_result_t result; + dns_forwarderlist_t *fwdrs, dns_fwdpolicy_t fwdpolicy) { + isc_result_t result; dns_forwarders_t *forwarders; - dns_forwarder_t * fwd, *nfwd; + dns_forwarder_t *fwd, *nfwd; REQUIRE(VALID_FWDTABLE(fwdtable)); @@ -117,12 +114,11 @@ cleanup: isc_result_t dns_fwdtable_add(dns_fwdtable_t *fwdtable, const dns_name_t *name, - isc_sockaddrlist_t *addrs, dns_fwdpolicy_t fwdpolicy) -{ - isc_result_t result; + isc_sockaddrlist_t *addrs, dns_fwdpolicy_t fwdpolicy) { + isc_result_t result; dns_forwarders_t *forwarders; - dns_forwarder_t * fwd; - isc_sockaddr_t * sa; + dns_forwarder_t *fwd; + isc_sockaddr_t *sa; REQUIRE(VALID_FWDTABLE(fwdtable)); @@ -160,8 +156,7 @@ cleanup: } isc_result_t -dns_fwdtable_delete(dns_fwdtable_t *fwdtable, const dns_name_t *name) -{ +dns_fwdtable_delete(dns_fwdtable_t *fwdtable, const dns_name_t *name) { isc_result_t result; REQUIRE(VALID_FWDTABLE(fwdtable)); @@ -179,8 +174,7 @@ dns_fwdtable_delete(dns_fwdtable_t *fwdtable, const dns_name_t *name) isc_result_t dns_fwdtable_find(dns_fwdtable_t *fwdtable, const dns_name_t *name, - dns_name_t *foundname, dns_forwarders_t **forwardersp) -{ + dns_name_t *foundname, dns_forwarders_t **forwardersp) { isc_result_t result; REQUIRE(VALID_FWDTABLE(fwdtable)); @@ -199,8 +193,7 @@ dns_fwdtable_find(dns_fwdtable_t *fwdtable, const dns_name_t *name, } void -dns_fwdtable_destroy(dns_fwdtable_t **fwdtablep) -{ +dns_fwdtable_destroy(dns_fwdtable_t **fwdtablep) { dns_fwdtable_t *fwdtable; REQUIRE(fwdtablep != NULL && VALID_FWDTABLE(*fwdtablep)); @@ -220,11 +213,10 @@ dns_fwdtable_destroy(dns_fwdtable_t **fwdtablep) ***/ static void -auto_detach(void *data, void *arg) -{ +auto_detach(void *data, void *arg) { dns_forwarders_t *forwarders = data; - dns_fwdtable_t * fwdtable = arg; - dns_forwarder_t * fwd; + dns_fwdtable_t *fwdtable = arg; + dns_forwarder_t *fwd; UNUSED(arg); diff --git a/lib/dns/gen-unix.h b/lib/dns/gen-unix.h index d6a50d1d7a..31168f3e3e 100644 --- a/lib/dns/gen-unix.h +++ b/lib/dns/gen-unix.h @@ -39,7 +39,7 @@ extern char *optarg; #endif /* ifdef NEED_OPTARG */ -#define isc_commandline_parse getopt +#define isc_commandline_parse getopt #define isc_commandline_argument optarg typedef struct { @@ -50,8 +50,7 @@ typedef struct { ISC_LANG_BEGINDECLS static bool -start_directory(const char *path, isc_dir_t *dir) -{ +start_directory(const char *path, isc_dir_t *dir) { dir->handle = opendir(path); if (dir->handle != NULL) { @@ -62,8 +61,7 @@ start_directory(const char *path, isc_dir_t *dir) } static bool -next_file(isc_dir_t *dir) -{ +next_file(isc_dir_t *dir) { struct dirent *dirent; dir->filename = NULL; @@ -88,8 +86,7 @@ next_file(isc_dir_t *dir) } static void -end_directory(isc_dir_t *dir) -{ +end_directory(isc_dir_t *dir) { if (dir->handle != NULL) { (void)closedir(dir->handle); } diff --git a/lib/dns/gen-win32.h b/lib/dns/gen-win32.h index f602edac8c..2ea2d75c1a 100644 --- a/lib/dns/gen-win32.h +++ b/lib/dns/gen-win32.h @@ -86,8 +86,7 @@ ISC_LANG_BEGINDECLS * Parse argc/argv argument vector. */ int -isc_commandline_parse(int argc, char *const *argv, const char *options) -{ +isc_commandline_parse(int argc, char *const *argv, const char *options) { static char *place = ENDOPT; char * option; /* Index into *options of option. */ @@ -103,7 +102,8 @@ isc_commandline_parse(int argc, char *const *argv, const char *options) } if (isc_commandline_index >= argc || - *(place = argv[isc_commandline_index]) != '-') { + *(place = argv[isc_commandline_index]) != '-') + { /* * Index out of range or points to non-option. */ @@ -214,8 +214,7 @@ typedef struct { } isc_dir_t; bool -start_directory(const char *path, isc_dir_t *dir) -{ +start_directory(const char *path, isc_dir_t *dir) { char pattern[_MAX_PATH], *p; /* @@ -251,8 +250,7 @@ start_directory(const char *path, isc_dir_t *dir) } bool -next_file(isc_dir_t *dir) -{ +next_file(isc_dir_t *dir) { if (dir->first_file) { dir->first_file = false; } else if (dir->handle != INVALID_HANDLE_VALUE) { @@ -273,8 +271,7 @@ next_file(isc_dir_t *dir) } void -end_directory(isc_dir_t *dir) -{ +end_directory(isc_dir_t *dir) { if (dir->handle != INVALID_HANDLE_VALUE) { FindClose(dir->handle); } diff --git a/lib/dns/gen.c b/lib/dns/gen.c index 41a659607d..43a37d6715 100644 --- a/lib/dns/gen.c +++ b/lib/dns/gen.c @@ -56,65 +56,65 @@ abort(); \ } -#define FROMTEXTARGS "rdclass, type, lexer, origin, options, target, callbacks" +#define FROMTEXTARGS "rdclass, type, lexer, origin, options, target, callbacks" #define FROMTEXTCLASS "rdclass" -#define FROMTEXTTYPE "type" -#define FROMTEXTDEF "result = DNS_R_UNKNOWN" +#define FROMTEXTTYPE "type" +#define FROMTEXTDEF "result = DNS_R_UNKNOWN" -#define TOTEXTARGS "rdata, tctx, target" +#define TOTEXTARGS "rdata, tctx, target" #define TOTEXTCLASS "rdata->rdclass" -#define TOTEXTTYPE "rdata->type" -#define TOTEXTDEF "use_default = true" +#define TOTEXTTYPE "rdata->type" +#define TOTEXTDEF "use_default = true" -#define FROMWIREARGS "rdclass, type, source, dctx, options, target" +#define FROMWIREARGS "rdclass, type, source, dctx, options, target" #define FROMWIRECLASS "rdclass" -#define FROMWIRETYPE "type" -#define FROMWIREDEF "use_default = true" +#define FROMWIRETYPE "type" +#define FROMWIREDEF "use_default = true" -#define TOWIREARGS "rdata, cctx, target" +#define TOWIREARGS "rdata, cctx, target" #define TOWIRECLASS "rdata->rdclass" -#define TOWIRETYPE "rdata->type" -#define TOWIREDEF "use_default = true" +#define TOWIRETYPE "rdata->type" +#define TOWIREDEF "use_default = true" -#define FROMSTRUCTARGS "rdclass, type, source, target" +#define FROMSTRUCTARGS "rdclass, type, source, target" #define FROMSTRUCTCLASS "rdclass" -#define FROMSTRUCTTYPE "type" -#define FROMSTRUCTDEF "use_default = true" +#define FROMSTRUCTTYPE "type" +#define FROMSTRUCTDEF "use_default = true" -#define TOSTRUCTARGS "rdata, target, mctx" +#define TOSTRUCTARGS "rdata, target, mctx" #define TOSTRUCTCLASS "rdata->rdclass" -#define TOSTRUCTTYPE "rdata->type" -#define TOSTRUCTDEF "use_default = true" +#define TOSTRUCTTYPE "rdata->type" +#define TOSTRUCTDEF "use_default = true" -#define FREESTRUCTARGS "source" +#define FREESTRUCTARGS "source" #define FREESTRUCTCLASS "common->rdclass" -#define FREESTRUCTTYPE "common->rdtype" -#define FREESTRUCTDEF NULL +#define FREESTRUCTTYPE "common->rdtype" +#define FREESTRUCTDEF NULL -#define COMPAREARGS "rdata1, rdata2" +#define COMPAREARGS "rdata1, rdata2" #define COMPARECLASS "rdata1->rdclass" -#define COMPARETYPE "rdata1->type" -#define COMPAREDEF "use_default = true" +#define COMPARETYPE "rdata1->type" +#define COMPAREDEF "use_default = true" -#define ADDITIONALDATAARGS "rdata, add, arg" +#define ADDITIONALDATAARGS "rdata, add, arg" #define ADDITIONALDATACLASS "rdata->rdclass" -#define ADDITIONALDATATYPE "rdata->type" -#define ADDITIONALDATADEF "use_default = true" +#define ADDITIONALDATATYPE "rdata->type" +#define ADDITIONALDATADEF "use_default = true" -#define DIGESTARGS "rdata, digest, arg" +#define DIGESTARGS "rdata, digest, arg" #define DIGESTCLASS "rdata->rdclass" -#define DIGESTTYPE "rdata->type" -#define DIGESTDEF "use_default = true" +#define DIGESTTYPE "rdata->type" +#define DIGESTDEF "use_default = true" -#define CHECKOWNERARGS "name, rdclass, type, wildcard" +#define CHECKOWNERARGS "name, rdclass, type, wildcard" #define CHECKOWNERCLASS "rdclass" -#define CHECKOWNERTYPE "type" -#define CHECKOWNERDEF "result = true" +#define CHECKOWNERTYPE "type" +#define CHECKOWNERDEF "result = true" -#define CHECKNAMESARGS "rdata, owner, bad" +#define CHECKNAMESARGS "rdata, owner, bad" #define CHECKNAMESCLASS "rdata->rdclass" -#define CHECKNAMESTYPE "rdata->type" -#define CHECKNAMESDEF "result = true" +#define CHECKNAMESTYPE "rdata->type" +#define CHECKNAMESDEF "result = true" static const char copyright[] = "/*\n" " * Copyright (C) 1998%s Internet Systems " @@ -140,63 +140,56 @@ static const char copyright[] = "/*\n" "\n"; #define STR_EXPAND(tok) #tok -#define STR(tok) STR_EXPAND(tok) +#define STR(tok) STR_EXPAND(tok) -#define TYPENAMES 256 -#define TYPECLASSLEN 20 /* DNS mnemonic size. Must be less than 100. */ -#define TYPECLASSBUF (TYPECLASSLEN + 1) -#define TYPECLASSFMT "%" STR(TYPECLASSLEN) "[-0-9a-z]_%d" +#define TYPENAMES 256 +#define TYPECLASSLEN 20 /* DNS mnemonic size. Must be less than 100. */ +#define TYPECLASSBUF (TYPECLASSLEN + 1) +#define TYPECLASSFMT "%" STR(TYPECLASSLEN) "[-0-9a-z]_%d" #define ATTRIBUTESIZE 256 static struct cc { struct cc *next; - int rdclass; - char classbuf[TYPECLASSBUF]; + int rdclass; + char classbuf[TYPECLASSBUF]; } * classes; static struct tt { struct tt *next; - uint16_t rdclass; - uint16_t type; - char classbuf[TYPECLASSBUF]; - char typebuf[TYPECLASSBUF]; - char dirbuf[PATH_MAX - 30]; + uint16_t rdclass; + uint16_t type; + char classbuf[TYPECLASSBUF]; + char typebuf[TYPECLASSBUF]; + char dirbuf[PATH_MAX - 30]; } * types; static struct ttnam { - char typebuf[TYPECLASSBUF]; - char macroname[TYPECLASSBUF]; - char attr[ATTRIBUTESIZE]; + char typebuf[TYPECLASSBUF]; + char macroname[TYPECLASSBUF]; + char attr[ATTRIBUTESIZE]; unsigned int sorted; - uint16_t type; + uint16_t type; } typenames[TYPENAMES]; 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. */ static char * -upper(char *s) -{ - static int buf_to_use = 0; +upper(char *s) { + static int buf_to_use = 0; static char buf[10][256]; - char * b; - int c; + char *b; + int c; buf_to_use++; if (buf_to_use > 9) { @@ -214,10 +207,9 @@ upper(char *s) } static char * -funname(const char *s, char *buf) -{ +funname(const char *s, char *buf) { char *b = buf; - char c; + char c; INSIST(strlen(s) < TYPECLASSBUF); while ((c = *s++)) { @@ -229,13 +221,12 @@ funname(const char *s, char *buf) static void doswitch(const char *name, const char *function, const char *args, - const char *tsw, const char *csw, const char *res) -{ - struct tt * tt; - int first = 1; - int lasttype = 0; - int subswitch = 0; - char buf1[TYPECLASSBUF], buf2[TYPECLASSBUF]; + const char *tsw, const char *csw, const char *res) { + struct tt *tt; + int first = 1; + int lasttype = 0; + int subswitch = 0; + char buf1[TYPECLASSBUF], buf2[TYPECLASSBUF]; const char *result = " result ="; if (res == NULL) { @@ -303,8 +294,7 @@ doswitch(const char *name, const char *function, const char *args, } static struct ttnam * -find_typename(int type) -{ +find_typename(int type) { int i; for (i = 0; i < TYPENAMES; i++) { @@ -316,17 +306,17 @@ find_typename(int type) } static void -insert_into_typenames(int type, const char *typebuf, const char *attr) -{ +insert_into_typenames(int type, const char *typebuf, const char *attr) { struct ttnam *ttn = NULL; - size_t c; - int i, n; - char tmp[256]; + size_t c; + int i, n; + char tmp[256]; INSIST(strlen(typebuf) < TYPECLASSBUF); for (i = 0; i < TYPENAMES; i++) { if (typenames[i].typebuf[0] != 0 && typenames[i].type == type && - strcmp(typebuf, typenames[i].typebuf) != 0) { + strcmp(typebuf, typenames[i].typebuf) != 0) + { fprintf(stderr, "Error: type %d has two names: %s, %s\n", type, typenames[i].typebuf, typebuf); @@ -394,8 +384,7 @@ insert_into_typenames(int type, const char *typebuf, const char *attr) static void add(int rdclass, const char *classbuf, int type, const char *typebuf, - const char *dirbuf) -{ + const char *dirbuf) { struct tt *newtt = (struct tt *)malloc(sizeof(*newtt)); struct tt *tt, *oldtt; struct cc *newcc; @@ -492,11 +481,10 @@ add(int rdclass, const char *classbuf, int type, const char *typebuf, } static void -sd(int rdclass, const char *classbuf, const char *dirbuf, char filetype) -{ - char buf[TYPECLASSLEN + sizeof("_65535.h")]; - char typebuf[TYPECLASSBUF]; - int type, n; +sd(int rdclass, const char *classbuf, const char *dirbuf, char filetype) { + char buf[TYPECLASSLEN + sizeof("_65535.h")]; + char typebuf[TYPECLASSBUF]; + int type, n; isc_dir_t dir; if (!start_directory(dirbuf, &dir)) { @@ -524,9 +512,8 @@ sd(int rdclass, const char *classbuf, const char *dirbuf, char filetype) } static unsigned int -HASH(char *string) -{ - size_t n; +HASH(char *string) { + size_t n; unsigned char a, b; n = strlen(string); @@ -541,35 +528,34 @@ HASH(char *string) } int -main(int argc, char **argv) -{ - char buf[PATH_MAX]; - char srcdir[PATH_MAX]; - int rdclass; - char classbuf[TYPECLASSBUF]; - struct tt * tt; - struct cc * cc; - struct ttnam * ttn, *ttn2; - unsigned int hash; - time_t now; - char year[11]; - int lasttype; - int code = 1; - int class_enum = 0; - int type_enum = 0; - int structs = 0; - int depend = 0; - int c, i, j, n; - char buf1[TYPECLASSBUF]; - char filetype = 'c'; - FILE * fd; - char * prefix = NULL; - char * suffix = NULL; - char * file = NULL; - char * source_date_epoch; +main(int argc, char **argv) { + char buf[PATH_MAX]; + char srcdir[PATH_MAX]; + int rdclass; + char classbuf[TYPECLASSBUF]; + struct tt *tt; + struct cc *cc; + struct ttnam *ttn, *ttn2; + unsigned int hash; + time_t now; + char year[11]; + int lasttype; + int code = 1; + int class_enum = 0; + int type_enum = 0; + int structs = 0; + int depend = 0; + int c, i, j, n; + char buf1[TYPECLASSBUF]; + char filetype = 'c'; + FILE *fd; + char *prefix = NULL; + char *suffix = NULL; + char *file = NULL; + char *source_date_epoch; unsigned long long epoch; - char * endptr; - isc_dir_t dir; + char *endptr; + isc_dir_t dir; for (i = 0; i < TYPENAMES; i++) { memset(&typenames[i], 0, sizeof(typenames[i])); @@ -613,7 +599,8 @@ main(int argc, char **argv) case 's': if (strlen(isc_commandline_argument) > PATH_MAX - 2 * TYPECLASSLEN - - sizeof("/rdata/_65535_65535")) { + sizeof("/rdata/_65535_65535")) + { fprintf(stderr, "\"%s\" too long\n", isc_commandline_argument); exit(1); @@ -644,8 +631,8 @@ main(int argc, char **argv) } while (next_file(&dir)) { - if (sscanf(dir.filename, TYPECLASSFMT, classbuf, &rdclass) != - 2) { + if (sscanf(dir.filename, TYPECLASSFMT, classbuf, &rdclass) != 2) + { continue; } if ((rdclass > 65535) || (rdclass < 0)) { @@ -670,7 +657,8 @@ main(int argc, char **argv) errno = 0; epoch = strtoull(source_date_epoch, &endptr, 10); if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) || - (errno != 0 && epoch == 0)) { + (errno != 0 && epoch == 0)) + { fprintf(stderr, "Environment variable " "$SOURCE_DATE_EPOCH: strtoull: %s\n", @@ -780,7 +768,7 @@ main(int argc, char **argv) "DNS_RDATATYPEATTR_META | " \ "DNS_RDATATYPEATTR_QUESTIONONLY" #define RESERVEDNAME "0" -#define RESERVED "DNS_RDATATYPEATTR_RESERVED" +#define RESERVED "DNS_RDATATYPEATTR_RESERVED" /* * Add in reserved/special types. This will let us @@ -954,7 +942,7 @@ main(int argc, char **argv) fprintf(stdout, "\n#endif /* DNS_ENUMTYPE_H */\n"); } else if (class_enum) { char *s; - int classnum; + int classnum; fprintf(stdout, "#ifndef DNS_ENUMCLASS_H\n"); fprintf(stdout, "#define DNS_ENUMCLASS_H 1\n\n"); diff --git a/lib/dns/geoip2.c b/lib/dns/geoip2.c index f5503e8b59..9e7e6d49f0 100644 --- a/lib/dns/geoip2.c +++ b/lib/dns/geoip2.c @@ -63,19 +63,18 @@ */ typedef struct geoip_state { - uint16_t subtype; - const MMDB_s * db; - isc_netaddr_t addr; + uint16_t subtype; + const MMDB_s *db; + isc_netaddr_t addr; MMDB_lookup_result_s mmresult; - MMDB_entry_s entry; + MMDB_entry_s entry; } geoip_state_t; ISC_THREAD_LOCAL geoip_state_t geoip_state = { 0 }; static void set_state(const MMDB_s *db, const isc_netaddr_t *addr, - MMDB_lookup_result_s mmresult, MMDB_entry_s entry) -{ + MMDB_lookup_result_s mmresult, MMDB_entry_s entry) { geoip_state.db = db; geoip_state.addr = *addr; geoip_state.mmresult = mmresult; @@ -83,14 +82,13 @@ set_state(const MMDB_s *db, const isc_netaddr_t *addr, } static geoip_state_t * -get_entry_for(MMDB_s *const db, const isc_netaddr_t *addr) -{ - isc_sockaddr_t sa; +get_entry_for(MMDB_s *const db, const isc_netaddr_t *addr) { + isc_sockaddr_t sa; MMDB_lookup_result_s match; - int err; + int err; - if (db == geoip_state.db && - isc_netaddr_equal(addr, &geoip_state.addr)) { + if (db == geoip_state.db && isc_netaddr_equal(addr, &geoip_state.addr)) + { return (&geoip_state); } @@ -106,8 +104,7 @@ get_entry_for(MMDB_s *const db, const isc_netaddr_t *addr) } static dns_geoip_subtype_t -fix_subtype(const dns_geoip_databases_t *geoip, dns_geoip_subtype_t subtype) -{ +fix_subtype(const dns_geoip_databases_t *geoip, dns_geoip_subtype_t subtype) { dns_geoip_subtype_t ret = subtype; switch (subtype) { @@ -156,8 +153,8 @@ fix_subtype(const dns_geoip_databases_t *geoip, dns_geoip_subtype_t subtype) } static MMDB_s * -geoip2_database(const dns_geoip_databases_t *geoip, dns_geoip_subtype_t subtype) -{ +geoip2_database(const dns_geoip_databases_t *geoip, + dns_geoip_subtype_t subtype) { switch (subtype) { case dns_geoip_country_code: case dns_geoip_country_name: @@ -197,13 +194,13 @@ geoip2_database(const dns_geoip_databases_t *geoip, dns_geoip_subtype_t subtype) } static bool -match_string(MMDB_entry_data_s *value, const char *str) -{ +match_string(MMDB_entry_data_s *value, const char *str) { REQUIRE(str != NULL); if (value == NULL || !value->has_data || value->type != MMDB_DATA_TYPE_UTF8_STRING || - value->utf8_string == NULL) { + value->utf8_string == NULL) + { return (false); } @@ -211,11 +208,11 @@ match_string(MMDB_entry_data_s *value, const char *str) } static bool -match_int(MMDB_entry_data_s *value, const uint32_t ui32) -{ +match_int(MMDB_entry_data_s *value, const uint32_t ui32) { if (value == NULL || !value->has_data || (value->type != MMDB_DATA_TYPE_UINT32 && - value->type != MMDB_DATA_TYPE_UINT16)) { + value->type != MMDB_DATA_TYPE_UINT16)) + { return (false); } @@ -223,15 +220,15 @@ match_int(MMDB_entry_data_s *value, const uint32_t ui32) } bool -dns_geoip_match(const isc_netaddr_t * reqaddr, - const dns_geoip_databases_t *geoip, const dns_geoip_elem_t *elt) -{ - MMDB_s * db = NULL; - MMDB_entry_data_s value; - geoip_state_t * state = NULL; +dns_geoip_match(const isc_netaddr_t *reqaddr, + const dns_geoip_databases_t *geoip, + const dns_geoip_elem_t *elt) { + MMDB_s *db = NULL; + MMDB_entry_data_s value; + geoip_state_t *state = NULL; dns_geoip_subtype_t subtype; - const char * s = NULL; - int ret; + const char *s = NULL; + int ret; REQUIRE(reqaddr != NULL); REQUIRE(elt != NULL); diff --git a/lib/dns/gssapi_link.c b/lib/dns/gssapi_link.c index f786d28ff6..8159426fed 100644 --- a/lib/dns/gssapi_link.c +++ b/lib/dns/gssapi_link.c @@ -27,7 +27,7 @@ #include #define INITIAL_BUFFER_SIZE 1024 -#define BUFFER_EXTRA 1024 +#define BUFFER_EXTRA 1024 #define REGION_TO_GBUFFER(r, gb) \ do { \ @@ -50,8 +50,7 @@ struct dst_gssapi_signverifyctx { * or verifying. */ static isc_result_t -gssapi_create_signverify_ctx(dst_key_t *key, dst_context_t *dctx) -{ +gssapi_create_signverify_ctx(dst_key_t *key, dst_context_t *dctx) { dst_gssapi_signverifyctx_t *ctx; UNUSED(key); @@ -69,8 +68,7 @@ gssapi_create_signverify_ctx(dst_key_t *key, dst_context_t *dctx) * Destroy the temporary sign/verify context. */ static void -gssapi_destroy_signverify_ctx(dst_context_t *dctx) -{ +gssapi_destroy_signverify_ctx(dst_context_t *dctx) { dst_gssapi_signverifyctx_t *ctx = dctx->ctxdata.gssctx; if (ctx != NULL) { @@ -90,13 +88,12 @@ gssapi_destroy_signverify_ctx(dst_context_t *dctx) * buffer and copy old+new into it, and free the old buffer. */ static isc_result_t -gssapi_adddata(dst_context_t *dctx, const isc_region_t *data) -{ +gssapi_adddata(dst_context_t *dctx, const isc_region_t *data) { dst_gssapi_signverifyctx_t *ctx = dctx->ctxdata.gssctx; - isc_buffer_t * newbuffer = NULL; - isc_region_t r; - unsigned int length; - isc_result_t result; + isc_buffer_t *newbuffer = NULL; + isc_region_t r; + unsigned int length; + isc_result_t result; result = isc_buffer_copyregion(ctx->buffer, data); if (result == ISC_R_SUCCESS) { @@ -121,14 +118,13 @@ gssapi_adddata(dst_context_t *dctx, const isc_region_t *data) * Sign. */ static isc_result_t -gssapi_sign(dst_context_t *dctx, isc_buffer_t *sig) -{ +gssapi_sign(dst_context_t *dctx, isc_buffer_t *sig) { dst_gssapi_signverifyctx_t *ctx = dctx->ctxdata.gssctx; - isc_region_t message; - gss_buffer_desc gmessage, gsig; - OM_uint32 minor, gret; - gss_ctx_id_t gssctx = dctx->key->keydata.gssctx; - char buf[1024]; + isc_region_t message; + gss_buffer_desc gmessage, gsig; + OM_uint32 minor, gret; + gss_ctx_id_t gssctx = dctx->key->keydata.gssctx; + char buf[1024]; /* * Convert the data we wish to sign into a structure gssapi can @@ -177,15 +173,14 @@ gssapi_sign(dst_context_t *dctx, isc_buffer_t *sig) * Verify. */ static isc_result_t -gssapi_verify(dst_context_t *dctx, const isc_region_t *sig) -{ +gssapi_verify(dst_context_t *dctx, const isc_region_t *sig) { dst_gssapi_signverifyctx_t *ctx = dctx->ctxdata.gssctx; - isc_region_t message, r; - gss_buffer_desc gmessage, gsig; - OM_uint32 minor, gret; - gss_ctx_id_t gssctx = dctx->key->keydata.gssctx; - unsigned char buf[sig->length]; - char err[1024]; + isc_region_t message, r; + gss_buffer_desc gmessage, gsig; + OM_uint32 minor, gret; + gss_ctx_id_t gssctx = dctx->key->keydata.gssctx; + unsigned char buf[sig->length]; + char err[1024]; /* * Convert the data we wish to sign into a structure gssapi can @@ -214,7 +209,8 @@ gssapi_verify(dst_context_t *dctx, const isc_region_t *sig) gret == GSS_S_DUPLICATE_TOKEN || gret == GSS_S_OLD_TOKEN || gret == GSS_S_UNSEQ_TOKEN || gret == GSS_S_GAP_TOKEN || gret == GSS_S_CONTEXT_EXPIRED || gret == GSS_S_NO_CONTEXT || - gret == GSS_S_FAILURE) { + gret == GSS_S_FAILURE) + { return (DST_R_VERIFYFAILURE); } else { return (ISC_R_FAILURE); @@ -225,8 +221,7 @@ gssapi_verify(dst_context_t *dctx, const isc_region_t *sig) } static bool -gssapi_compare(const dst_key_t *key1, const dst_key_t *key2) -{ +gssapi_compare(const dst_key_t *key1, const dst_key_t *key2) { gss_ctx_id_t gsskey1 = key1->keydata.gssctx; gss_ctx_id_t gsskey2 = key2->keydata.gssctx; @@ -235,8 +230,7 @@ gssapi_compare(const dst_key_t *key1, const dst_key_t *key2) } static isc_result_t -gssapi_generate(dst_key_t *key, int unused, void (*callback)(int)) -{ +gssapi_generate(dst_key_t *key, int unused, void (*callback)(int)) { UNUSED(key); UNUSED(unused); UNUSED(callback); @@ -246,29 +240,26 @@ gssapi_generate(dst_key_t *key, int unused, void (*callback)(int)) } static bool -gssapi_isprivate(const dst_key_t *key) -{ +gssapi_isprivate(const dst_key_t *key) { UNUSED(key); return (true); } static void -gssapi_destroy(dst_key_t *key) -{ +gssapi_destroy(dst_key_t *key) { REQUIRE(key != NULL); dst_gssapi_deletectx(key->mctx, &key->keydata.gssctx); key->keydata.gssctx = NULL; } static isc_result_t -gssapi_restore(dst_key_t *key, const char *keystr) -{ - OM_uint32 major, minor; - unsigned int len; - isc_buffer_t * b = NULL; - isc_region_t r; +gssapi_restore(dst_key_t *key, const char *keystr) { + OM_uint32 major, minor; + unsigned int len; + isc_buffer_t *b = NULL; + isc_region_t r; gss_buffer_desc gssbuffer; - isc_result_t result; + isc_result_t result; len = strlen(keystr); if ((len % 4) != 0U) { @@ -299,15 +290,14 @@ gssapi_restore(dst_key_t *key, const char *keystr) } static isc_result_t -gssapi_dump(dst_key_t *key, isc_mem_t *mctx, char **buffer, int *length) -{ - OM_uint32 major, minor; +gssapi_dump(dst_key_t *key, isc_mem_t *mctx, char **buffer, int *length) { + OM_uint32 major, minor; gss_buffer_desc gssbuffer; - size_t len; - char * buf; - isc_buffer_t b; - isc_region_t r; - isc_result_t result; + size_t len; + char *buf; + isc_buffer_t b; + isc_region_t r; + isc_result_t result; major = gss_export_sec_context(&minor, &key->keydata.gssctx, &gssbuffer); @@ -356,8 +346,7 @@ static dst_func_t gssapi_functions = { }; isc_result_t -dst__gssapi_init(dst_func_t **funcp) -{ +dst__gssapi_init(dst_func_t **funcp) { REQUIRE(funcp != NULL); if (*funcp == NULL) { *funcp = &gssapi_functions; diff --git a/lib/dns/gssapictx.c b/lib/dns/gssapictx.c index 5fb329e79d..6eb5fee34e 100644 --- a/lib/dns/gssapictx.c +++ b/lib/dns/gssapictx.c @@ -49,7 +49,7 @@ #if defined(GSSAPI) && defined(USE_ISC_SPNEGO) #include "spnego.h" #define gss_accept_sec_context gss_accept_sec_context_spnego -#define gss_init_sec_context gss_init_sec_context_spnego +#define gss_init_sec_context gss_init_sec_context_spnego #endif /* if defined(GSSAPI) && defined(USE_ISC_SPNEGO) */ /* @@ -109,12 +109,11 @@ static gss_OID_set_desc mech_oid_set = { sizeof(mech_oid_set_array) / #ifdef GSSAPI static inline void name_to_gbuffer(const dns_name_t *name, isc_buffer_t *buffer, - gss_buffer_desc *gbuffer) -{ - dns_name_t tname; + gss_buffer_desc *gbuffer) { + dns_name_t tname; const dns_name_t *namep; - isc_region_t r; - isc_result_t result; + isc_region_t r; + isc_result_t result; if (!dns_name_isabsolute(name)) { namep = name; @@ -134,14 +133,13 @@ name_to_gbuffer(const dns_name_t *name, isc_buffer_t *buffer, } static void -log_cred(const gss_cred_id_t cred) -{ - OM_uint32 gret, minor, lifetime; - gss_name_t gname; - gss_buffer_desc gbuffer; +log_cred(const gss_cred_id_t cred) { + OM_uint32 gret, minor, lifetime; + gss_name_t gname; + gss_buffer_desc gbuffer; gss_cred_usage_t usage; - const char * usage_text; - char buf[1024]; + const char *usage_text; + char buf[1024]; gret = gss_inquire_cred(&minor, cred, &gname, &lifetime, &usage, NULL); if (gret != GSS_S_COMPLETE) { @@ -204,11 +202,10 @@ log_cred(const gss_cred_id_t cred) * are not performed, and runtime errors from gssapi are used instead */ static void -check_config(const char *gss_name) -{ - const char * p; +check_config(const char *gss_name) { + const char *p; krb5_context krb5_ctx; - char * krb5_realm_name = NULL; + char *krb5_realm_name = NULL; if (strncasecmp(gss_name, "DNS/", 4) != 0) { gss_log(ISC_LOG_ERROR, @@ -250,18 +247,17 @@ check_config(const char *gss_name) isc_result_t dst_gssapi_acquirecred(const dns_name_t *name, bool initiate, - gss_cred_id_t *cred) -{ + gss_cred_id_t *cred) { #ifdef GSSAPI - isc_result_t result; - isc_buffer_t namebuf; - gss_name_t gname; - gss_buffer_desc gnamebuf; - unsigned char array[DNS_NAME_MAXTEXT + 1]; - OM_uint32 gret, minor; - OM_uint32 lifetime; + isc_result_t result; + isc_buffer_t namebuf; + gss_name_t gname; + gss_buffer_desc gnamebuf; + unsigned char array[DNS_NAME_MAXTEXT + 1]; + OM_uint32 gret, minor; + OM_uint32 lifetime; gss_cred_usage_t usage; - char buf[1024]; + char buf[1024]; REQUIRE(cred != NULL && *cred == NULL); @@ -352,13 +348,12 @@ cleanup: bool dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer, const dns_name_t *name, - const dns_name_t *realm, bool subdomain) -{ + const dns_name_t *realm, bool subdomain) { #ifdef GSSAPI - char sbuf[DNS_NAME_FORMATSIZE]; - char rbuf[DNS_NAME_FORMATSIZE]; - char * sname; - char * rname; + char sbuf[DNS_NAME_FORMATSIZE]; + char rbuf[DNS_NAME_FORMATSIZE]; + char *sname; + char *rname; isc_buffer_t buffer; isc_result_t result; @@ -412,7 +407,7 @@ dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer, */ if (name != NULL) { dns_fixedname_t fixed; - dns_name_t * machine; + dns_name_t *machine; machine = dns_fixedname_initname(&fixed); result = dns_name_fromstring(machine, sname, 0, NULL); @@ -438,13 +433,12 @@ dst_gssapi_identitymatchesrealmkrb5(const dns_name_t *signer, bool dst_gssapi_identitymatchesrealmms(const dns_name_t *signer, const dns_name_t *name, - const dns_name_t *realm, bool subdomain) -{ + const dns_name_t *realm, bool subdomain) { #ifdef GSSAPI - char sbuf[DNS_NAME_FORMATSIZE]; - char rbuf[DNS_NAME_FORMATSIZE]; - char * sname; - char * rname; + char sbuf[DNS_NAME_FORMATSIZE]; + char rbuf[DNS_NAME_FORMATSIZE]; + char *sname; + char *rname; isc_buffer_t buffer; isc_result_t result; @@ -501,7 +495,7 @@ dst_gssapi_identitymatchesrealmms(const dns_name_t *signer, */ if (name != NULL) { dns_fixedname_t fixed; - dns_name_t * machine; + dns_name_t *machine; machine = dns_fixedname_initname(&fixed); result = dns_name_fromstring2(machine, sbuf, realm, 0, NULL); @@ -525,11 +519,10 @@ dst_gssapi_identitymatchesrealmms(const dns_name_t *signer, } isc_result_t -dst_gssapi_releasecred(gss_cred_id_t *cred) -{ +dst_gssapi_releasecred(gss_cred_id_t *cred) { #ifdef GSSAPI OM_uint32 gret, minor; - char buf[1024]; + char buf[1024]; REQUIRE(cred != NULL && *cred != NULL); @@ -557,9 +550,8 @@ dst_gssapi_releasecred(gss_cred_id_t *cred) */ static void gss_err_message(isc_mem_t *mctx, uint32_t major, uint32_t minor, - char **err_message) -{ - char buf[1024]; + char **err_message) { + char buf[1024]; char *estr; if (err_message == NULL || mctx == NULL) { @@ -577,17 +569,16 @@ gss_err_message(isc_mem_t *mctx, uint32_t major, uint32_t minor, isc_result_t dst_gssapi_initctx(const dns_name_t *name, isc_buffer_t *intoken, isc_buffer_t *outtoken, gss_ctx_id_t *gssctx, - isc_mem_t *mctx, char **err_message) -{ + isc_mem_t *mctx, char **err_message) { #ifdef GSSAPI - isc_region_t r; - isc_buffer_t namebuf; - gss_name_t gname; - OM_uint32 gret, minor, ret_flags, flags; + isc_region_t r; + isc_buffer_t namebuf; + gss_name_t gname; + OM_uint32 gret, minor, ret_flags, flags; gss_buffer_desc gintoken, *gintokenp, gouttoken = GSS_C_EMPTY_BUFFER; - isc_result_t result; + isc_result_t result; gss_buffer_desc gnamebuf; - unsigned char array[DNS_NAME_MAXTEXT + 1]; + unsigned char array[DNS_NAME_MAXTEXT + 1]; /* Client must pass us a valid gss_ctx_id_t here */ REQUIRE(gssctx != NULL); @@ -677,18 +668,17 @@ isc_result_t dst_gssapi_acceptctx(gss_cred_id_t cred, const char *gssapi_keytab, isc_region_t *intoken, isc_buffer_t **outtoken, gss_ctx_id_t *ctxout, dns_name_t *principal, - isc_mem_t *mctx) -{ + isc_mem_t *mctx) { #ifdef GSSAPI - isc_region_t r; - isc_buffer_t namebuf; + isc_region_t r; + isc_buffer_t namebuf; gss_buffer_desc gnamebuf = GSS_C_EMPTY_BUFFER, gintoken, gouttoken = GSS_C_EMPTY_BUFFER; - OM_uint32 gret, minor; + OM_uint32 gret, minor; gss_ctx_id_t context = GSS_C_NO_CONTEXT; - gss_name_t gname = NULL; + gss_name_t gname = NULL; isc_result_t result; - char buf[1024]; + char buf[1024]; REQUIRE(outtoken != NULL && *outtoken == NULL); @@ -719,7 +709,7 @@ dst_gssapi_acceptctx(gss_cred_id_t cred, const char *gssapi_keytab, const char *old = getenv("KRB5_KTNAME"); if (old == NULL || strcmp(old, gssapi_keytab) != 0) { size_t size; - char * kt; + char *kt; size = strlen(gssapi_keytab) + 13; kt = malloc(size); @@ -789,7 +779,8 @@ dst_gssapi_acceptctx(gss_cred_id_t cred, const char *gssapi_keytab, * contain null characters. */ if (gnamebuf.length > 0U && - ((char *)gnamebuf.value)[gnamebuf.length - 1] == '\0') { + ((char *)gnamebuf.value)[gnamebuf.length - 1] == '\0') + { gnamebuf.length--; } @@ -842,11 +833,10 @@ out: } isc_result_t -dst_gssapi_deletectx(isc_mem_t *mctx, gss_ctx_id_t *gssctx) -{ +dst_gssapi_deletectx(isc_mem_t *mctx, gss_ctx_id_t *gssctx) { #ifdef GSSAPI OM_uint32 gret, minor; - char buf[1024]; + char buf[1024]; UNUSED(mctx); @@ -868,8 +858,7 @@ dst_gssapi_deletectx(isc_mem_t *mctx, gss_ctx_id_t *gssctx) } char * -gss_error_tostring(uint32_t major, uint32_t minor, char *buf, size_t buflen) -{ +gss_error_tostring(uint32_t major, uint32_t minor, char *buf, size_t buflen) { #ifdef GSSAPI gss_buffer_desc msg_minor = GSS_C_EMPTY_BUFFER, msg_major = GSS_C_EMPTY_BUFFER; @@ -904,8 +893,7 @@ gss_error_tostring(uint32_t major, uint32_t minor, char *buf, size_t buflen) } void -gss_log(int level, const char *fmt, ...) -{ +gss_log(int level, const char *fmt, ...) { va_list ap; va_start(ap, fmt); diff --git a/lib/dns/hmac_link.c b/lib/dns/hmac_link.c index e851fb28bb..16dd5d65ae 100644 --- a/lib/dns/hmac_link.c +++ b/lib/dns/hmac_link.c @@ -47,73 +47,61 @@ #endif /* ifdef HAVE_FIPS_MODE */ #include "dst_parse.h" -#define ISC_MD_md5 ISC_MD_MD5 -#define ISC_MD_sha1 ISC_MD_SHA1 +#define ISC_MD_md5 ISC_MD_MD5 +#define ISC_MD_sha1 ISC_MD_SHA1 #define ISC_MD_sha224 ISC_MD_SHA224 #define ISC_MD_sha256 ISC_MD_SHA256 #define ISC_MD_sha384 ISC_MD_SHA384 #define ISC_MD_sha512 ISC_MD_SHA512 #define hmac_register_algorithm(alg) \ - static isc_result_t hmac##alg##_createctx(dst_key_t * key, \ - dst_context_t *dctx) \ - { \ + static isc_result_t hmac##alg##_createctx(dst_key_t *key, \ + dst_context_t *dctx) { \ return (hmac_createctx(ISC_MD_##alg, key, dctx)); \ } \ - static void hmac##alg##_destroyctx(dst_context_t *dctx) \ - { \ + static void hmac##alg##_destroyctx(dst_context_t *dctx) { \ hmac_destroyctx(dctx); \ } \ - static isc_result_t hmac##alg##_adddata(dst_context_t * dctx, \ - const isc_region_t *data) \ - { \ + static isc_result_t hmac##alg##_adddata(dst_context_t *dctx, \ + const isc_region_t *data) { \ return (hmac_adddata(dctx, data)); \ } \ static isc_result_t hmac##alg##_sign(dst_context_t *dctx, \ - isc_buffer_t * sig) \ - { \ + isc_buffer_t *sig) { \ return (hmac_sign(dctx, sig)); \ } \ - static isc_result_t hmac##alg##_verify(dst_context_t * dctx, \ - const isc_region_t *sig) \ - { \ + static isc_result_t hmac##alg##_verify(dst_context_t *dctx, \ + const isc_region_t *sig) { \ return (hmac_verify(dctx, sig)); \ } \ static bool hmac##alg##_compare(const dst_key_t *key1, \ - const dst_key_t *key2) \ - { \ + const dst_key_t *key2) { \ return (hmac_compare(ISC_MD_##alg, key1, key2)); \ } \ static isc_result_t hmac##alg##_generate( \ - dst_key_t *key, int pseudorandom_ok, void (*callback)(int)) \ - { \ + dst_key_t *key, int pseudorandom_ok, void (*callback)(int)) { \ UNUSED(pseudorandom_ok); \ UNUSED(callback); \ return (hmac_generate(ISC_MD_##alg, key)); \ } \ - static bool hmac##alg##_isprivate(const dst_key_t *key) \ - { \ + static bool hmac##alg##_isprivate(const dst_key_t *key) { \ return (hmac_isprivate(key)); \ } \ static void hmac##alg##_destroy(dst_key_t *key) { hmac_destroy(key); } \ static isc_result_t hmac##alg##_todns(const dst_key_t *key, \ - isc_buffer_t * data) \ - { \ + isc_buffer_t *data) { \ return (hmac_todns(key, data)); \ } \ - static isc_result_t hmac##alg##_fromdns(dst_key_t * key, \ - isc_buffer_t *data) \ - { \ + static isc_result_t hmac##alg##_fromdns(dst_key_t *key, \ + isc_buffer_t *data) { \ return (hmac_fromdns(ISC_MD_##alg, key, data)); \ } \ static isc_result_t hmac##alg##_tofile(const dst_key_t *key, \ - const char * directory) \ - { \ + const char *directory) { \ return (hmac_tofile(ISC_MD_##alg, key, directory)); \ } \ static isc_result_t hmac##alg##_parse( \ - dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) \ - { \ + dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) { \ return (hmac_parse(ISC_MD_##alg, key, lexer, pub)); \ } \ static dst_func_t hmac##alg##_functions = { \ @@ -139,8 +127,7 @@ NULL, /*%< dump */ \ NULL, /*%< restore */ \ }; \ - isc_result_t dst__hmac##alg##_init(dst_func_t **funcp) \ - { \ + isc_result_t dst__hmac##alg##_init(dst_func_t **funcp) { \ REQUIRE(funcp != NULL); \ if (*funcp == NULL) { \ *funcp = &hmac##alg##_functions; \ @@ -148,16 +135,15 @@ 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]; }; static inline isc_result_t -getkeybits(dst_key_t *key, struct dst_private_element *element) -{ +getkeybits(dst_key_t *key, struct dst_private_element *element) { uint16_t *bits = (uint16_t *)element->data; if (element->length != 2) { @@ -170,9 +156,8 @@ getkeybits(dst_key_t *key, struct dst_private_element *element) } static inline isc_result_t -hmac_createctx(isc_md_type_t type, const dst_key_t *key, dst_context_t *dctx) -{ - isc_result_t result; +hmac_createctx(isc_md_type_t type, const dst_key_t *key, dst_context_t *dctx) { + isc_result_t result; const dst_hmac_key_t *hkey = key->keydata.hmac_key; isc_hmac_t *ctx = isc_hmac_new(); /* Either returns or abort()s */ @@ -187,8 +172,7 @@ hmac_createctx(isc_md_type_t type, const dst_key_t *key, dst_context_t *dctx) } static inline void -hmac_destroyctx(dst_context_t *dctx) -{ +hmac_destroyctx(dst_context_t *dctx) { isc_hmac_t *ctx = dctx->ctxdata.hmac_ctx; REQUIRE(ctx != NULL); @@ -197,10 +181,9 @@ hmac_destroyctx(dst_context_t *dctx) } static inline isc_result_t -hmac_adddata(const dst_context_t *dctx, const isc_region_t *data) -{ +hmac_adddata(const dst_context_t *dctx, const isc_region_t *data) { isc_result_t result; - isc_hmac_t * ctx = dctx->ctxdata.hmac_ctx; + isc_hmac_t *ctx = dctx->ctxdata.hmac_ctx; REQUIRE(ctx != NULL); @@ -213,11 +196,10 @@ hmac_adddata(const dst_context_t *dctx, const isc_region_t *data) } static inline isc_result_t -hmac_sign(const dst_context_t *dctx, isc_buffer_t *sig) -{ +hmac_sign(const dst_context_t *dctx, isc_buffer_t *sig) { isc_hmac_t *ctx = dctx->ctxdata.hmac_ctx; REQUIRE(ctx != NULL); - unsigned int digestlen; + unsigned int digestlen; unsigned char digest[ISC_MAX_MD_SIZE]; if (isc_hmac_final(ctx, digest, &digestlen) != ISC_R_SUCCESS) { @@ -238,10 +220,9 @@ hmac_sign(const dst_context_t *dctx, isc_buffer_t *sig) } static inline isc_result_t -hmac_verify(const dst_context_t *dctx, const isc_region_t *sig) -{ - isc_hmac_t * ctx = dctx->ctxdata.hmac_ctx; - unsigned int digestlen; +hmac_verify(const dst_context_t *dctx, const isc_region_t *sig) { + isc_hmac_t *ctx = dctx->ctxdata.hmac_ctx; + unsigned int digestlen; unsigned char digest[ISC_MAX_MD_SIZE]; REQUIRE(ctx != NULL); @@ -264,8 +245,7 @@ hmac_verify(const dst_context_t *dctx, const isc_region_t *sig) } static inline bool -hmac_compare(isc_md_type_t type, const dst_key_t *key1, const dst_key_t *key2) -{ +hmac_compare(isc_md_type_t type, const dst_key_t *key1, const dst_key_t *key2) { dst_hmac_key_t *hkey1, *hkey2; hkey1 = key1->keydata.hmac_key; @@ -282,11 +262,10 @@ hmac_compare(isc_md_type_t type, const dst_key_t *key1, const dst_key_t *key2) } static inline isc_result_t -hmac_generate(isc_md_type_t type, dst_key_t *key) -{ - isc_buffer_t b; - isc_result_t ret; - unsigned int bytes, len; +hmac_generate(isc_md_type_t type, dst_key_t *key) { + isc_buffer_t b; + isc_result_t ret; + unsigned int bytes, len; unsigned char data[ISC_MAX_MD_SIZE] = { 0 }; len = isc_md_type_get_block_size(type); @@ -311,15 +290,13 @@ hmac_generate(isc_md_type_t type, dst_key_t *key) } static inline bool -hmac_isprivate(const dst_key_t *key) -{ +hmac_isprivate(const dst_key_t *key) { UNUSED(key); return (true); } static inline void -hmac_destroy(dst_key_t *key) -{ +hmac_destroy(dst_key_t *key) { dst_hmac_key_t *hkey = key->keydata.hmac_key; isc_safe_memwipe(hkey, sizeof(*hkey)); isc_mem_put(key->mctx, hkey, sizeof(*hkey)); @@ -327,10 +304,9 @@ hmac_destroy(dst_key_t *key) } static inline isc_result_t -hmac_todns(const dst_key_t *key, isc_buffer_t *data) -{ +hmac_todns(const dst_key_t *key, isc_buffer_t *data) { dst_hmac_key_t *hkey = key->keydata.hmac_key; - unsigned int bytes; + unsigned int bytes; REQUIRE(hkey != NULL); @@ -344,11 +320,10 @@ hmac_todns(const dst_key_t *key, isc_buffer_t *data) } static inline isc_result_t -hmac_fromdns(isc_md_type_t type, dst_key_t *key, isc_buffer_t *data) -{ +hmac_fromdns(isc_md_type_t type, dst_key_t *key, isc_buffer_t *data) { dst_hmac_key_t *hkey; - unsigned int keylen; - isc_region_t r; + unsigned int keylen; + isc_region_t r; isc_buffer_remainingregion(data, &r); if (r.length == 0) { @@ -380,8 +355,7 @@ hmac_fromdns(isc_md_type_t type, dst_key_t *key, isc_buffer_t *data) } static inline int -hmac__get_tag_key(isc_md_type_t type) -{ +hmac__get_tag_key(isc_md_type_t type) { if (type == ISC_MD_MD5) { return (TAG_HMACMD5_KEY); } else if (type == ISC_MD_SHA1) { @@ -401,8 +375,7 @@ hmac__get_tag_key(isc_md_type_t type) } static inline int -hmac__get_tag_bits(isc_md_type_t type) -{ +hmac__get_tag_bits(isc_md_type_t type) { if (type == ISC_MD_MD5) { return (TAG_HMACMD5_BITS); } else if (type == ISC_MD_SHA1) { @@ -422,12 +395,11 @@ hmac__get_tag_bits(isc_md_type_t type) } static inline isc_result_t -hmac_tofile(isc_md_type_t type, const dst_key_t *key, const char *directory) -{ +hmac_tofile(isc_md_type_t type, const dst_key_t *key, const char *directory) { dst_hmac_key_t *hkey; - dst_private_t priv; - int bytes = (key->key_size + 7) / 8; - uint16_t bits; + dst_private_t priv; + int bytes = (key->key_size + 7) / 8; + uint16_t bits; if (key->keydata.hmac_key == NULL) { return (DST_R_NULLKEY); @@ -455,8 +427,7 @@ hmac_tofile(isc_md_type_t type, const dst_key_t *key, const char *directory) } static inline int -hmac__to_dst_alg(isc_md_type_t type) -{ +hmac__to_dst_alg(isc_md_type_t type) { if (type == ISC_MD_MD5) { return (DST_ALG_HMACMD5); } else if (type == ISC_MD_SHA1) { @@ -476,13 +447,13 @@ hmac__to_dst_alg(isc_md_type_t type) } static inline isc_result_t -hmac_parse(isc_md_type_t type, dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) -{ +hmac_parse(isc_md_type_t type, dst_key_t *key, isc_lex_t *lexer, + dst_key_t *pub) { dst_private_t priv; - isc_result_t result, tresult; - isc_buffer_t b; - isc_mem_t * mctx = key->mctx; - unsigned int i; + isc_result_t result, tresult; + isc_buffer_t b; + isc_mem_t *mctx = key->mctx; + unsigned int i; UNUSED(pub); /* read private key file */ diff --git a/lib/dns/include/dns/acl.h b/lib/dns/include/dns/acl.h index d7699ba386..3d573d1191 100644 --- a/lib/dns/include/dns/acl.h +++ b/lib/dns/include/dns/acl.h @@ -95,7 +95,7 @@ struct dns_aclenv { #endif /* HAVE_GEOIP2 */ }; -#define DNS_ACL_MAGIC ISC_MAGIC('D', 'a', 'c', 'l') +#define DNS_ACL_MAGIC ISC_MAGIC('D', 'a', 'c', 'l') #define DNS_ACL_VALID(a) ISC_MAGIC_VALID(a, DNS_ACL_MAGIC) /*** diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h index c44102d8ed..3a53a1dce9 100644 --- a/lib/dns/include/dns/adb.h +++ b/lib/dns/include/dns/adb.h @@ -82,9 +82,9 @@ ISC_LANG_BEGINDECLS *** Magic number checks ***/ -#define DNS_ADBFIND_MAGIC ISC_MAGIC('a', 'd', 'b', 'H') -#define DNS_ADBFIND_VALID(x) ISC_MAGIC_VALID(x, DNS_ADBFIND_MAGIC) -#define DNS_ADBADDRINFO_MAGIC ISC_MAGIC('a', 'd', 'A', 'I') +#define DNS_ADBFIND_MAGIC ISC_MAGIC('a', 'd', 'b', 'H') +#define DNS_ADBFIND_VALID(x) ISC_MAGIC_VALID(x, DNS_ADBFIND_MAGIC) +#define DNS_ADBADDRINFO_MAGIC ISC_MAGIC('a', 'd', 'A', 'I') #define DNS_ADBADDRINFO_VALID(x) ISC_MAGIC_VALID(x, DNS_ADBADDRINFO_MAGIC) /*** @@ -159,7 +159,7 @@ struct dns_adbfind { /*% Return addresses of type INET. */ #define DNS_ADBFIND_INET 0x00000001 /*% Return addresses of type INET6. */ -#define DNS_ADBFIND_INET6 0x00000002 +#define DNS_ADBFIND_INET6 0x00000002 #define DNS_ADBFIND_ADDRESSMASK 0x00000003 /*% * Only schedule an event if no addresses are known. @@ -518,9 +518,9 @@ dns_adb_marklame(dns_adb_t *adb, dns_adbaddrinfo_t *addr, * Adjusting the scaling factors is fine, as long as they all remain * unique values.) */ -#define DNS_ADB_RTTADJDEFAULT 7 /*%< default scale */ -#define DNS_ADB_RTTADJREPLACE 0 /*%< replace with our rtt */ -#define DNS_ADB_RTTADJAGE 10 /*%< age this rtt */ +#define DNS_ADB_RTTADJDEFAULT 7 /*%< default scale */ +#define DNS_ADB_RTTADJREPLACE 0 /*%< replace with our rtt */ +#define DNS_ADB_RTTADJAGE 10 /*%< age this rtt */ void dns_adb_adjustsrtt(dns_adb_t *adb, dns_adbaddrinfo_t *addr, unsigned int rtt, diff --git a/lib/dns/include/dns/bit.h b/lib/dns/include/dns/bit.h index 29038d4a32..395f10a8e1 100644 --- a/lib/dns/include/dns/bit.h +++ b/lib/dns/include/dns/bit.h @@ -18,7 +18,7 @@ typedef uint64_t dns_bitset_t; -#define DNS_BIT_SET(bit, bitset) (*(bitset) |= ((dns_bitset_t)1 << (bit))) +#define DNS_BIT_SET(bit, bitset) (*(bitset) |= ((dns_bitset_t)1 << (bit))) #define DNS_BIT_CLEAR(bit, bitset) (*(bitset) &= ~((dns_bitset_t)1 << (bit))) #define DNS_BIT_CHECK(bit, bitset) \ ((*(bitset) & ((dns_bitset_t)1 << (bit))) == ((dns_bitset_t)1 << (bit))) diff --git a/lib/dns/include/dns/callbacks.h b/lib/dns/include/dns/callbacks.h index 010cf407dd..9c2c1caa49 100644 --- a/lib/dns/include/dns/callbacks.h +++ b/lib/dns/include/dns/callbacks.h @@ -29,7 +29,7 @@ ISC_LANG_BEGINDECLS *** Types ***/ -#define DNS_CALLBACK_MAGIC ISC_MAGIC('C', 'L', 'L', 'B') +#define DNS_CALLBACK_MAGIC ISC_MAGIC('C', 'L', 'L', 'B') #define DNS_CALLBACK_VALID(cb) ISC_MAGIC_VALID(cb, DNS_CALLBACK_MAGIC) struct dns_rdatacallbacks { diff --git a/lib/dns/include/dns/catz.h b/lib/dns/include/dns/catz.h index c6f51f062b..941700506e 100644 --- a/lib/dns/include/dns/catz.h +++ b/lib/dns/include/dns/catz.h @@ -30,12 +30,12 @@ ISC_LANG_BEGINDECLS -#define DNS_CATZ_ERROR_LEVEL ISC_LOG_WARNING -#define DNS_CATZ_INFO_LEVEL ISC_LOG_INFO +#define DNS_CATZ_ERROR_LEVEL ISC_LOG_WARNING +#define DNS_CATZ_INFO_LEVEL ISC_LOG_INFO #define DNS_CATZ_DEBUG_LEVEL1 ISC_LOG_DEBUG(1) #define DNS_CATZ_DEBUG_LEVEL2 ISC_LOG_DEBUG(2) #define DNS_CATZ_DEBUG_LEVEL3 ISC_LOG_DEBUG(3) -#define DNS_CATZ_DEBUG_QUIET (DNS_CATZ_DEBUG_LEVEL3 + 1) +#define DNS_CATZ_DEBUG_QUIET (DNS_CATZ_DEBUG_LEVEL3 + 1) /* * Catalog Zones functions and structures. diff --git a/lib/dns/include/dns/clientinfo.h b/lib/dns/include/dns/clientinfo.h index 376bb6cd07..617525d3b2 100644 --- a/lib/dns/include/dns/clientinfo.h +++ b/lib/dns/include/dns/clientinfo.h @@ -58,7 +58,7 @@ typedef isc_result_t (*dns_clientinfo_sourceip_t)(dns_clientinfo_t *client, isc_sockaddr_t ** addrp); #define DNS_CLIENTINFOMETHODS_VERSION 2 -#define DNS_CLIENTINFOMETHODS_AGE 1 +#define DNS_CLIENTINFOMETHODS_AGE 1 typedef struct dns_clientinfomethods { uint16_t version; diff --git a/lib/dns/include/dns/compress.h b/lib/dns/include/dns/compress.h index 178a9b3a2c..b458bc51cf 100644 --- a/lib/dns/include/dns/compress.h +++ b/lib/dns/include/dns/compress.h @@ -38,19 +38,19 @@ ISC_LANG_BEGINDECLS * used by a nameserver's configuration manager. */ -#define DNS_COMPRESS_NONE 0x00 /*%< no compression */ -#define DNS_COMPRESS_GLOBAL14 0x01 /*%< "normal" compression. */ -#define DNS_COMPRESS_ALL 0x01 /*%< all compression. */ +#define DNS_COMPRESS_NONE 0x00 /*%< no compression */ +#define DNS_COMPRESS_GLOBAL14 0x01 /*%< "normal" compression. */ +#define DNS_COMPRESS_ALL 0x01 /*%< all compression. */ #define DNS_COMPRESS_CASESENSITIVE 0x02 /*%< case sensitive compression. */ -#define DNS_COMPRESS_ENABLED 0x04 +#define DNS_COMPRESS_ENABLED 0x04 /* * DNS_COMPRESS_TABLESIZE must be a power of 2. The compress code * utilizes this assumption. */ -#define DNS_COMPRESS_TABLEBITS 6 -#define DNS_COMPRESS_TABLESIZE (1U << DNS_COMPRESS_TABLEBITS) -#define DNS_COMPRESS_TABLEMASK (DNS_COMPRESS_TABLESIZE - 1) +#define DNS_COMPRESS_TABLEBITS 6 +#define DNS_COMPRESS_TABLESIZE (1U << DNS_COMPRESS_TABLEBITS) +#define DNS_COMPRESS_TABLEMASK (DNS_COMPRESS_TABLESIZE - 1) #define DNS_COMPRESS_INITIALNODES 16 typedef struct dns_compressnode dns_compressnode_t; diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h index 48947f43e8..9a06f69ff7 100644 --- a/lib/dns/include/dns/db.h +++ b/lib/dns/include/dns/db.h @@ -190,7 +190,7 @@ typedef isc_result_t (*dns_dbcreatefunc_t)(isc_mem_t * mctx, typedef isc_result_t (*dns_dbupdate_callback_t)(dns_db_t *db, void *fn_arg); -#define DNS_DB_MAGIC ISC_MAGIC('D', 'N', 'S', 'D') +#define DNS_DB_MAGIC ISC_MAGIC('D', 'N', 'S', 'D') #define DNS_DB_VALID(db) ISC_MAGIC_VALID(db, DNS_DB_MAGIC) /*% @@ -214,7 +214,7 @@ struct dns_db { }; #define DNS_DBATTR_CACHE 0x01 -#define DNS_DBATTR_STUB 0x02 +#define DNS_DBATTR_STUB 0x02 struct dns_dbonupdatelistener { dns_dbupdate_callback_t onupdate; @@ -226,26 +226,26 @@ struct dns_dbonupdatelistener { /*% * Options that can be specified for dns_db_find(). */ -#define DNS_DBFIND_GLUEOK 0x0001 +#define DNS_DBFIND_GLUEOK 0x0001 #define DNS_DBFIND_VALIDATEGLUE 0x0002 -#define DNS_DBFIND_NOWILD 0x0004 -#define DNS_DBFIND_PENDINGOK 0x0008 -#define DNS_DBFIND_NOEXACT 0x0010 -#define DNS_DBFIND_FORCENSEC 0x0020 +#define DNS_DBFIND_NOWILD 0x0004 +#define DNS_DBFIND_PENDINGOK 0x0008 +#define DNS_DBFIND_NOEXACT 0x0010 +#define DNS_DBFIND_FORCENSEC 0x0020 #define DNS_DBFIND_COVERINGNSEC 0x0040 -#define DNS_DBFIND_FORCENSEC3 0x0080 +#define DNS_DBFIND_FORCENSEC3 0x0080 #define DNS_DBFIND_ADDITIONALOK 0x0100 -#define DNS_DBFIND_NOZONECUT 0x0200 -#define DNS_DBFIND_STALEOK 0x0400 +#define DNS_DBFIND_NOZONECUT 0x0200 +#define DNS_DBFIND_STALEOK 0x0400 /*@}*/ /*@{*/ /*% * Options that can be specified for dns_db_addrdataset(). */ -#define DNS_DBADD_MERGE 0x01 -#define DNS_DBADD_FORCE 0x02 -#define DNS_DBADD_EXACT 0x04 +#define DNS_DBADD_MERGE 0x01 +#define DNS_DBADD_FORCE 0x02 +#define DNS_DBADD_EXACT 0x04 #define DNS_DBADD_EXACTTTL 0x08 #define DNS_DBADD_PREFETCH 0x10 /*@}*/ @@ -253,7 +253,7 @@ struct dns_dbonupdatelistener { /*% * Options that can be specified for dns_db_subtractrdataset(). */ -#define DNS_DBSUB_EXACT 0x01 +#define DNS_DBSUB_EXACT 0x01 #define DNS_DBSUB_WANTOLD 0x02 /*@{*/ @@ -261,8 +261,8 @@ struct dns_dbonupdatelistener { * Iterator options */ #define DNS_DB_RELATIVENAMES 0x1 -#define DNS_DB_NSEC3ONLY 0x2 -#define DNS_DB_NONSEC3 0x4 +#define DNS_DB_NSEC3ONLY 0x2 +#define DNS_DB_NONSEC3 0x4 /*@}*/ /***** diff --git a/lib/dns/include/dns/dbiterator.h b/lib/dns/include/dns/dbiterator.h index cc54036da7..1f2a9a6178 100644 --- a/lib/dns/include/dns/dbiterator.h +++ b/lib/dns/include/dns/dbiterator.h @@ -80,7 +80,7 @@ typedef struct dns_dbiteratormethods { isc_result_t (*origin)(dns_dbiterator_t *iterator, dns_name_t *name); } dns_dbiteratormethods_t; -#define DNS_DBITERATOR_MAGIC ISC_MAGIC('D', 'N', 'S', 'I') +#define DNS_DBITERATOR_MAGIC ISC_MAGIC('D', 'N', 'S', 'I') #define DNS_DBITERATOR_VALID(dbi) ISC_MAGIC_VALID(dbi, DNS_DBITERATOR_MAGIC) /*% * This structure is actually just the common prefix of a DNS db diff --git a/lib/dns/include/dns/diff.h b/lib/dns/include/dns/diff.h index 2e63055fa7..41c79f5d31 100644 --- a/lib/dns/include/dns/diff.h +++ b/lib/dns/include/dns/diff.h @@ -67,7 +67,7 @@ typedef enum { typedef struct dns_difftuple dns_difftuple_t; -#define DNS_DIFFTUPLE_MAGIC ISC_MAGIC('D', 'I', 'F', 'T') +#define DNS_DIFFTUPLE_MAGIC ISC_MAGIC('D', 'I', 'F', 'T') #define DNS_DIFFTUPLE_VALID(t) ISC_MAGIC_VALID(t, DNS_DIFFTUPLE_MAGIC) struct dns_difftuple { @@ -88,7 +88,7 @@ struct dns_difftuple { */ typedef struct dns_diff dns_diff_t; -#define DNS_DIFF_MAGIC ISC_MAGIC('D', 'I', 'F', 'F') +#define DNS_DIFF_MAGIC ISC_MAGIC('D', 'I', 'F', 'F') #define DNS_DIFF_VALID(t) ISC_MAGIC_VALID(t, DNS_DIFF_MAGIC) struct dns_diff { diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h index 240ce7e9ef..384f300c30 100644 --- a/lib/dns/include/dns/dispatch.h +++ b/lib/dns/include/dns/dispatch.h @@ -130,17 +130,17 @@ struct dns_dispatchset { * _EXCLUSIVE * A separate socket will be used on-demand for each transaction. */ -#define DNS_DISPATCHATTR_PRIVATE 0x00000001U -#define DNS_DISPATCHATTR_TCP 0x00000002U -#define DNS_DISPATCHATTR_UDP 0x00000004U -#define DNS_DISPATCHATTR_IPV4 0x00000008U -#define DNS_DISPATCHATTR_IPV6 0x00000010U -#define DNS_DISPATCHATTR_NOLISTEN 0x00000020U +#define DNS_DISPATCHATTR_PRIVATE 0x00000001U +#define DNS_DISPATCHATTR_TCP 0x00000002U +#define DNS_DISPATCHATTR_UDP 0x00000004U +#define DNS_DISPATCHATTR_IPV4 0x00000008U +#define DNS_DISPATCHATTR_IPV6 0x00000010U +#define DNS_DISPATCHATTR_NOLISTEN 0x00000020U #define DNS_DISPATCHATTR_MAKEQUERY 0x00000040U #define DNS_DISPATCHATTR_CONNECTED 0x00000080U -#define DNS_DISPATCHATTR_FIXEDID 0x00000100U +#define DNS_DISPATCHATTR_FIXEDID 0x00000100U #define DNS_DISPATCHATTR_EXCLUSIVE 0x00000200U -#define DNS_DISPATCHATTR_CANREUSE 0x00000400U +#define DNS_DISPATCHATTR_CANREUSE 0x00000400U /*@}*/ /* diff --git a/lib/dns/include/dns/dlz.h b/lib/dns/include/dns/dlz.h index 68fc273abb..46c8731eac 100644 --- a/lib/dns/include/dns/dlz.h +++ b/lib/dns/include/dns/dlz.h @@ -93,7 +93,7 @@ ISC_LANG_BEGINDECLS *** Types ***/ -#define DNS_DLZ_MAGIC ISC_MAGIC('D', 'L', 'Z', 'D') +#define DNS_DLZ_MAGIC ISC_MAGIC('D', 'L', 'Z', 'D') #define DNS_DLZ_VALID(dlz) ISC_MAGIC_VALID(dlz, DNS_DLZ_MAGIC) typedef isc_result_t (*dns_dlzallowzonexfr_t)(void *driverarg, void *dbdata, diff --git a/lib/dns/include/dns/dlz_dlopen.h b/lib/dns/include/dns/dlz_dlopen.h index 47e856c4ee..159648d816 100644 --- a/lib/dns/include/dns/dlz_dlopen.h +++ b/lib/dns/include/dns/dlz_dlopen.h @@ -27,7 +27,7 @@ ISC_LANG_BEGINDECLS */ #define DLZ_DLOPEN_VERSION 3 -#define DLZ_DLOPEN_AGE 0 +#define DLZ_DLOPEN_AGE 0 /* * dlz_dlopen_version() is required for all DLZ external drivers. It diff --git a/lib/dns/include/dns/dns64.h b/lib/dns/include/dns/dns64.h index 7e4f9f757e..4ebec37c7c 100644 --- a/lib/dns/include/dns/dns64.h +++ b/lib/dns/include/dns/dns64.h @@ -39,7 +39,7 @@ ISC_LANG_BEGINDECLS * dns_dns64_aaaaok() and dns_dns64_aaaafroma() flags. */ #define DNS_DNS64_RECURSIVE 0x01 /* Recursive query. */ -#define DNS_DNS64_DNSSEC 0x02 /* DNSSEC sensitive query. */ +#define DNS_DNS64_DNSSEC 0x02 /* DNSSEC sensitive query. */ isc_result_t dns_dns64_create(isc_mem_t *mctx, const isc_netaddr_t *prefix, diff --git a/lib/dns/include/dns/ds.h b/lib/dns/include/dns/ds.h index 5c5b360147..573c40094a 100644 --- a/lib/dns/include/dns/ds.h +++ b/lib/dns/include/dns/ds.h @@ -17,9 +17,9 @@ #include #include -#define DNS_DSDIGEST_SHA1 (1) +#define DNS_DSDIGEST_SHA1 (1) #define DNS_DSDIGEST_SHA256 (2) -#define DNS_DSDIGEST_GOST (3) +#define DNS_DSDIGEST_GOST (3) #define DNS_DSDIGEST_SHA384 (4) /* diff --git a/lib/dns/include/dns/dyndb.h b/lib/dns/include/dns/dyndb.h index 469d1a8545..0ebb145699 100644 --- a/lib/dns/include/dns/dyndb.h +++ b/lib/dns/include/dns/dyndb.h @@ -43,7 +43,7 @@ struct dns_dyndbctx { bool * refvar; }; -#define DNS_DYNDBCTX_MAGIC ISC_MAGIC('D', 'd', 'b', 'c') +#define DNS_DYNDBCTX_MAGIC ISC_MAGIC('D', 'd', 'b', 'c') #define DNS_DYNDBCTX_VALID(d) ISC_MAGIC_VALID(d, DNS_DYNDBCTX_MAGIC) /* @@ -56,7 +56,7 @@ struct dns_dyndbctx { */ #ifndef DNS_DYNDB_VERSION #define DNS_DYNDB_VERSION 1 -#define DNS_DYNDB_AGE 0 +#define DNS_DYNDB_AGE 0 #endif /* ifndef DNS_DYNDB_VERSION */ typedef isc_result_t diff --git a/lib/dns/include/dns/events.h b/lib/dns/include/dns/events.h index 3898c6dc57..9d1d80a9d9 100644 --- a/lib/dns/include/dns/events.h +++ b/lib/dns/include/dns/events.h @@ -19,67 +19,67 @@ * Registry of DNS event numbers. */ -#define DNS_EVENT_FETCHCONTROL (ISC_EVENTCLASS_DNS + 0) -#define DNS_EVENT_FETCHDONE (ISC_EVENTCLASS_DNS + 1) -#define DNS_EVENT_VIEWRESSHUTDOWN (ISC_EVENTCLASS_DNS + 2) -#define DNS_EVENT_VIEWADBSHUTDOWN (ISC_EVENTCLASS_DNS + 3) -#define DNS_EVENT_UPDATE (ISC_EVENTCLASS_DNS + 4) -#define DNS_EVENT_UPDATEDONE (ISC_EVENTCLASS_DNS + 5) -#define DNS_EVENT_DISPATCH (ISC_EVENTCLASS_DNS + 6) -#define DNS_EVENT_TCPMSG (ISC_EVENTCLASS_DNS + 7) -#define DNS_EVENT_ADBMOREADDRESSES (ISC_EVENTCLASS_DNS + 8) +#define DNS_EVENT_FETCHCONTROL (ISC_EVENTCLASS_DNS + 0) +#define DNS_EVENT_FETCHDONE (ISC_EVENTCLASS_DNS + 1) +#define DNS_EVENT_VIEWRESSHUTDOWN (ISC_EVENTCLASS_DNS + 2) +#define DNS_EVENT_VIEWADBSHUTDOWN (ISC_EVENTCLASS_DNS + 3) +#define DNS_EVENT_UPDATE (ISC_EVENTCLASS_DNS + 4) +#define DNS_EVENT_UPDATEDONE (ISC_EVENTCLASS_DNS + 5) +#define DNS_EVENT_DISPATCH (ISC_EVENTCLASS_DNS + 6) +#define DNS_EVENT_TCPMSG (ISC_EVENTCLASS_DNS + 7) +#define DNS_EVENT_ADBMOREADDRESSES (ISC_EVENTCLASS_DNS + 8) #define DNS_EVENT_ADBNOMOREADDRESSES (ISC_EVENTCLASS_DNS + 9) -#define DNS_EVENT_ADBCANCELED (ISC_EVENTCLASS_DNS + 10) -#define DNS_EVENT_ADBNAMEDELETED (ISC_EVENTCLASS_DNS + 11) -#define DNS_EVENT_ADBSHUTDOWN (ISC_EVENTCLASS_DNS + 12) -#define DNS_EVENT_ADBEXPIRED (ISC_EVENTCLASS_DNS + 13) -#define DNS_EVENT_ADBCONTROL (ISC_EVENTCLASS_DNS + 14) -#define DNS_EVENT_CACHECLEAN (ISC_EVENTCLASS_DNS + 15) -#define DNS_EVENT_BYADDRDONE (ISC_EVENTCLASS_DNS + 16) -#define DNS_EVENT_ZONECONTROL (ISC_EVENTCLASS_DNS + 17) -#define DNS_EVENT_DBDESTROYED (ISC_EVENTCLASS_DNS + 18) -#define DNS_EVENT_VALIDATORDONE (ISC_EVENTCLASS_DNS + 19) -#define DNS_EVENT_REQUESTDONE (ISC_EVENTCLASS_DNS + 20) -#define DNS_EVENT_VALIDATORSTART (ISC_EVENTCLASS_DNS + 21) -#define DNS_EVENT_VIEWREQSHUTDOWN (ISC_EVENTCLASS_DNS + 22) -#define DNS_EVENT_NOTIFYSENDTOADDR (ISC_EVENTCLASS_DNS + 23) -#define DNS_EVENT_ZONE (ISC_EVENTCLASS_DNS + 24) -#define DNS_EVENT_ZONESTARTXFRIN (ISC_EVENTCLASS_DNS + 25) -#define DNS_EVENT_MASTERQUANTUM (ISC_EVENTCLASS_DNS + 26) -#define DNS_EVENT_CACHEOVERMEM (ISC_EVENTCLASS_DNS + 27) -#define DNS_EVENT_MASTERNEXTZONE (ISC_EVENTCLASS_DNS + 28) -#define DNS_EVENT_IOREADY (ISC_EVENTCLASS_DNS + 29) -#define DNS_EVENT_LOOKUPDONE (ISC_EVENTCLASS_DNS + 30) -#define DNS_EVENT_RBTDEADNODES (ISC_EVENTCLASS_DNS + 31) -#define DNS_EVENT_DISPATCHCONTROL (ISC_EVENTCLASS_DNS + 32) -#define DNS_EVENT_REQUESTCONTROL (ISC_EVENTCLASS_DNS + 33) -#define DNS_EVENT_DUMPQUANTUM (ISC_EVENTCLASS_DNS + 34) -#define DNS_EVENT_IMPORTRECVDONE (ISC_EVENTCLASS_DNS + 35) -#define DNS_EVENT_FREESTORAGE (ISC_EVENTCLASS_DNS + 36) +#define DNS_EVENT_ADBCANCELED (ISC_EVENTCLASS_DNS + 10) +#define DNS_EVENT_ADBNAMEDELETED (ISC_EVENTCLASS_DNS + 11) +#define DNS_EVENT_ADBSHUTDOWN (ISC_EVENTCLASS_DNS + 12) +#define DNS_EVENT_ADBEXPIRED (ISC_EVENTCLASS_DNS + 13) +#define DNS_EVENT_ADBCONTROL (ISC_EVENTCLASS_DNS + 14) +#define DNS_EVENT_CACHECLEAN (ISC_EVENTCLASS_DNS + 15) +#define DNS_EVENT_BYADDRDONE (ISC_EVENTCLASS_DNS + 16) +#define DNS_EVENT_ZONECONTROL (ISC_EVENTCLASS_DNS + 17) +#define DNS_EVENT_DBDESTROYED (ISC_EVENTCLASS_DNS + 18) +#define DNS_EVENT_VALIDATORDONE (ISC_EVENTCLASS_DNS + 19) +#define DNS_EVENT_REQUESTDONE (ISC_EVENTCLASS_DNS + 20) +#define DNS_EVENT_VALIDATORSTART (ISC_EVENTCLASS_DNS + 21) +#define DNS_EVENT_VIEWREQSHUTDOWN (ISC_EVENTCLASS_DNS + 22) +#define DNS_EVENT_NOTIFYSENDTOADDR (ISC_EVENTCLASS_DNS + 23) +#define DNS_EVENT_ZONE (ISC_EVENTCLASS_DNS + 24) +#define DNS_EVENT_ZONESTARTXFRIN (ISC_EVENTCLASS_DNS + 25) +#define DNS_EVENT_MASTERQUANTUM (ISC_EVENTCLASS_DNS + 26) +#define DNS_EVENT_CACHEOVERMEM (ISC_EVENTCLASS_DNS + 27) +#define DNS_EVENT_MASTERNEXTZONE (ISC_EVENTCLASS_DNS + 28) +#define DNS_EVENT_IOREADY (ISC_EVENTCLASS_DNS + 29) +#define DNS_EVENT_LOOKUPDONE (ISC_EVENTCLASS_DNS + 30) +#define DNS_EVENT_RBTDEADNODES (ISC_EVENTCLASS_DNS + 31) +#define DNS_EVENT_DISPATCHCONTROL (ISC_EVENTCLASS_DNS + 32) +#define DNS_EVENT_REQUESTCONTROL (ISC_EVENTCLASS_DNS + 33) +#define DNS_EVENT_DUMPQUANTUM (ISC_EVENTCLASS_DNS + 34) +#define DNS_EVENT_IMPORTRECVDONE (ISC_EVENTCLASS_DNS + 35) +#define DNS_EVENT_FREESTORAGE (ISC_EVENTCLASS_DNS + 36) #define DNS_EVENT_VIEWACACHESHUTDOWN (ISC_EVENTCLASS_DNS + 37) -#define DNS_EVENT_ACACHECONTROL (ISC_EVENTCLASS_DNS + 38) -#define DNS_EVENT_ACACHECLEAN (ISC_EVENTCLASS_DNS + 39) -#define DNS_EVENT_ACACHEOVERMEM (ISC_EVENTCLASS_DNS + 40) -#define DNS_EVENT_RBTPRUNE (ISC_EVENTCLASS_DNS + 41) -#define DNS_EVENT_MANAGEKEYS (ISC_EVENTCLASS_DNS + 42) -#define DNS_EVENT_CLIENTRESDONE (ISC_EVENTCLASS_DNS + 43) -#define DNS_EVENT_CLIENTREQDONE (ISC_EVENTCLASS_DNS + 44) -#define DNS_EVENT_ADBGROWENTRIES (ISC_EVENTCLASS_DNS + 45) -#define DNS_EVENT_ADBGROWNAMES (ISC_EVENTCLASS_DNS + 46) -#define DNS_EVENT_ZONESECURESERIAL (ISC_EVENTCLASS_DNS + 47) -#define DNS_EVENT_ZONESECUREDB (ISC_EVENTCLASS_DNS + 48) -#define DNS_EVENT_ZONELOAD (ISC_EVENTCLASS_DNS + 49) -#define DNS_EVENT_KEYDONE (ISC_EVENTCLASS_DNS + 50) -#define DNS_EVENT_SETNSEC3PARAM (ISC_EVENTCLASS_DNS + 51) -#define DNS_EVENT_SETSERIAL (ISC_EVENTCLASS_DNS + 52) -#define DNS_EVENT_CATZUPDATED (ISC_EVENTCLASS_DNS + 53) -#define DNS_EVENT_CATZADDZONE (ISC_EVENTCLASS_DNS + 54) -#define DNS_EVENT_CATZMODZONE (ISC_EVENTCLASS_DNS + 55) -#define DNS_EVENT_CATZDELZONE (ISC_EVENTCLASS_DNS + 56) -#define DNS_EVENT_RPZUPDATED (ISC_EVENTCLASS_DNS + 57) -#define DNS_EVENT_STARTUPDATE (ISC_EVENTCLASS_DNS + 58) +#define DNS_EVENT_ACACHECONTROL (ISC_EVENTCLASS_DNS + 38) +#define DNS_EVENT_ACACHECLEAN (ISC_EVENTCLASS_DNS + 39) +#define DNS_EVENT_ACACHEOVERMEM (ISC_EVENTCLASS_DNS + 40) +#define DNS_EVENT_RBTPRUNE (ISC_EVENTCLASS_DNS + 41) +#define DNS_EVENT_MANAGEKEYS (ISC_EVENTCLASS_DNS + 42) +#define DNS_EVENT_CLIENTRESDONE (ISC_EVENTCLASS_DNS + 43) +#define DNS_EVENT_CLIENTREQDONE (ISC_EVENTCLASS_DNS + 44) +#define DNS_EVENT_ADBGROWENTRIES (ISC_EVENTCLASS_DNS + 45) +#define DNS_EVENT_ADBGROWNAMES (ISC_EVENTCLASS_DNS + 46) +#define DNS_EVENT_ZONESECURESERIAL (ISC_EVENTCLASS_DNS + 47) +#define DNS_EVENT_ZONESECUREDB (ISC_EVENTCLASS_DNS + 48) +#define DNS_EVENT_ZONELOAD (ISC_EVENTCLASS_DNS + 49) +#define DNS_EVENT_KEYDONE (ISC_EVENTCLASS_DNS + 50) +#define DNS_EVENT_SETNSEC3PARAM (ISC_EVENTCLASS_DNS + 51) +#define DNS_EVENT_SETSERIAL (ISC_EVENTCLASS_DNS + 52) +#define DNS_EVENT_CATZUPDATED (ISC_EVENTCLASS_DNS + 53) +#define DNS_EVENT_CATZADDZONE (ISC_EVENTCLASS_DNS + 54) +#define DNS_EVENT_CATZMODZONE (ISC_EVENTCLASS_DNS + 55) +#define DNS_EVENT_CATZDELZONE (ISC_EVENTCLASS_DNS + 56) +#define DNS_EVENT_RPZUPDATED (ISC_EVENTCLASS_DNS + 57) +#define DNS_EVENT_STARTUPDATE (ISC_EVENTCLASS_DNS + 58) #define DNS_EVENT_FIRSTEVENT (ISC_EVENTCLASS_DNS + 0) -#define DNS_EVENT_LASTEVENT (ISC_EVENTCLASS_DNS + 65535) +#define DNS_EVENT_LASTEVENT (ISC_EVENTCLASS_DNS + 65535) #endif /* DNS_EVENTS_H */ diff --git a/lib/dns/include/dns/iptable.h b/lib/dns/include/dns/iptable.h index eead55ed02..e4be92ba94 100644 --- a/lib/dns/include/dns/iptable.h +++ b/lib/dns/include/dns/iptable.h @@ -29,7 +29,7 @@ struct dns_iptable { ISC_LINK(dns_iptable_t) nextincache; }; -#define DNS_IPTABLE_MAGIC ISC_MAGIC('T', 'a', 'b', 'l') +#define DNS_IPTABLE_MAGIC ISC_MAGIC('T', 'a', 'b', 'l') #define DNS_IPTABLE_VALID(a) ISC_MAGIC_VALID(a, DNS_IPTABLE_MAGIC) /*** diff --git a/lib/dns/include/dns/journal.h b/lib/dns/include/dns/journal.h index c771381830..f05e6ce3cb 100644 --- a/lib/dns/include/dns/journal.h +++ b/lib/dns/include/dns/journal.h @@ -41,9 +41,9 @@ ***/ #define DNS_JOURNALOPT_RESIGN 0x00000001 -#define DNS_JOURNAL_READ 0x00000000 /* false */ +#define DNS_JOURNAL_READ 0x00000000 /* false */ #define DNS_JOURNAL_CREATE 0x00000001 /* true */ -#define DNS_JOURNAL_WRITE 0x00000002 +#define DNS_JOURNAL_WRITE 0x00000002 #define DNS_JOURNAL_SIZE_MAX INT32_MAX #define DNS_JOURNAL_SIZE_MIN 4096 diff --git a/lib/dns/include/dns/kasp.h b/lib/dns/include/dns/kasp.h index 38f64e5527..36e36911e6 100644 --- a/lib/dns/include/dns/kasp.h +++ b/lib/dns/include/dns/kasp.h @@ -91,21 +91,21 @@ struct dns_kasp { /* TODO: The rest of the KASP configuration */ }; -#define DNS_KASP_MAGIC ISC_MAGIC('K', 'A', 'S', 'P') +#define DNS_KASP_MAGIC ISC_MAGIC('K', 'A', 'S', 'P') #define DNS_KASP_VALID(kasp) ISC_MAGIC_VALID(kasp, DNS_KASP_MAGIC) /* Defaults */ -#define DNS_KASP_SIG_REFRESH (86400 * 5) -#define DNS_KASP_SIG_VALIDITY (86400 * 14) +#define DNS_KASP_SIG_REFRESH (86400 * 5) +#define DNS_KASP_SIG_VALIDITY (86400 * 14) #define DNS_KASP_SIG_VALIDITY_DNSKEY (86400 * 14) -#define DNS_KASP_KEY_TTL (3600) -#define DNS_KASP_DS_TTL (86400) -#define DNS_KASP_PUBLISH_SAFETY (3600) -#define DNS_KASP_RETIRE_SAFETY (3600) -#define DNS_KASP_ZONE_MAXTTL (86400) -#define DNS_KASP_ZONE_PROPDELAY (300) -#define DNS_KASP_PARENT_PROPDELAY (3600) -#define DNS_KASP_PARENT_REGDELAY (86400) +#define DNS_KASP_KEY_TTL (3600) +#define DNS_KASP_DS_TTL (86400) +#define DNS_KASP_PUBLISH_SAFETY (3600) +#define DNS_KASP_RETIRE_SAFETY (3600) +#define DNS_KASP_ZONE_MAXTTL (86400) +#define DNS_KASP_ZONE_PROPDELAY (300) +#define DNS_KASP_PARENT_PROPDELAY (3600) +#define DNS_KASP_PARENT_REGDELAY (86400) /* Key roles */ #define DNS_KASP_KEY_ROLE_KSK 0x01 diff --git a/lib/dns/include/dns/keyvalues.h b/lib/dns/include/dns/keyvalues.h index 980049bf24..ab03887815 100644 --- a/lib/dns/include/dns/keyvalues.h +++ b/lib/dns/include/dns/keyvalues.h @@ -21,21 +21,21 @@ #define DNS_KEYTYPE_AUTHCONF 0x0000 /*%< Key usable for both */ #define DNS_KEYTYPE_CONFONLY 0x8000 /*%< Key usable for confidentiality */ #define DNS_KEYTYPE_AUTHONLY 0x4000 /*%< Key usable for authentication */ -#define DNS_KEYTYPE_NOKEY 0xC000 /*%< No key usable for either; no key */ -#define DNS_KEYTYPE_NOAUTH DNS_KEYTYPE_CONFONLY -#define DNS_KEYTYPE_NOCONF DNS_KEYTYPE_AUTHONLY +#define DNS_KEYTYPE_NOKEY 0xC000 /*%< No key usable for either; no key */ +#define DNS_KEYTYPE_NOAUTH DNS_KEYTYPE_CONFONLY +#define DNS_KEYTYPE_NOCONF DNS_KEYTYPE_AUTHONLY -#define DNS_KEYFLAG_RESERVED2 0x2000 /*%< reserved - must be zero */ -#define DNS_KEYFLAG_EXTENDED 0x1000 /*%< key has extended flags */ -#define DNS_KEYFLAG_RESERVED4 0x0800 /*%< reserved - must be zero */ -#define DNS_KEYFLAG_RESERVED5 0x0400 /*%< reserved - must be zero */ -#define DNS_KEYFLAG_OWNERMASK 0x0300 /*%< these bits determine the type */ -#define DNS_KEYOWNER_USER 0x0000 /*%< key is assoc. with user */ -#define DNS_KEYOWNER_ENTITY 0x0200 /*%< key is assoc. with entity eg host */ -#define DNS_KEYOWNER_ZONE 0x0100 /*%< key is zone key */ -#define DNS_KEYOWNER_RESERVED 0x0300 /*%< reserved meaning */ -#define DNS_KEYFLAG_REVOKE 0x0080 /*%< key revoked (per rfc5011) */ -#define DNS_KEYFLAG_RESERVED9 0x0040 /*%< reserved - must be zero */ +#define DNS_KEYFLAG_RESERVED2 0x2000 /*%< reserved - must be zero */ +#define DNS_KEYFLAG_EXTENDED 0x1000 /*%< key has extended flags */ +#define DNS_KEYFLAG_RESERVED4 0x0800 /*%< reserved - must be zero */ +#define DNS_KEYFLAG_RESERVED5 0x0400 /*%< reserved - must be zero */ +#define DNS_KEYFLAG_OWNERMASK 0x0300 /*%< these bits determine the type */ +#define DNS_KEYOWNER_USER 0x0000 /*%< key is assoc. with user */ +#define DNS_KEYOWNER_ENTITY 0x0200 /*%< key is assoc. with entity eg host */ +#define DNS_KEYOWNER_ZONE 0x0100 /*%< key is zone key */ +#define DNS_KEYOWNER_RESERVED 0x0300 /*%< reserved meaning */ +#define DNS_KEYFLAG_REVOKE 0x0080 /*%< key revoked (per rfc5011) */ +#define DNS_KEYFLAG_RESERVED9 0x0040 /*%< reserved - must be zero */ #define DNS_KEYFLAG_RESERVED10 0x0020 /*%< reserved - must be zero */ #define DNS_KEYFLAG_RESERVED11 0x0010 /*%< reserved - must be zero */ #define DNS_KEYFLAG_SIGNATORYMASK \ @@ -51,33 +51,33 @@ #define DNS_KEYFLAG_RESERVEDMASK2 0xFFFF /*%< no bits defined here */ /* The Algorithm field of the KEY and SIG RR's is an integer, {1..254} */ -#define DNS_KEYALG_RSAMD5 1 /*%< RSA with MD5 */ -#define DNS_KEYALG_RSA 1 /*%< Used just for tagging */ -#define DNS_KEYALG_DH 2 /*%< Diffie Hellman KEY */ -#define DNS_KEYALG_DSA 3 /*%< DSA KEY */ -#define DNS_KEYALG_NSEC3DSA 6 -#define DNS_KEYALG_DSS DNS_ALG_DSA -#define DNS_KEYALG_ECC 4 -#define DNS_KEYALG_RSASHA1 5 +#define DNS_KEYALG_RSAMD5 1 /*%< RSA with MD5 */ +#define DNS_KEYALG_RSA 1 /*%< Used just for tagging */ +#define DNS_KEYALG_DH 2 /*%< Diffie Hellman KEY */ +#define DNS_KEYALG_DSA 3 /*%< DSA KEY */ +#define DNS_KEYALG_NSEC3DSA 6 +#define DNS_KEYALG_DSS DNS_ALG_DSA +#define DNS_KEYALG_ECC 4 +#define DNS_KEYALG_RSASHA1 5 #define DNS_KEYALG_NSEC3RSASHA1 7 -#define DNS_KEYALG_RSASHA256 8 -#define DNS_KEYALG_RSASHA512 10 -#define DNS_KEYALG_ECCGOST 12 -#define DNS_KEYALG_ECDSA256 13 -#define DNS_KEYALG_ECDSA384 14 -#define DNS_KEYALG_ED25519 15 -#define DNS_KEYALG_ED448 16 -#define DNS_KEYALG_INDIRECT 252 -#define DNS_KEYALG_PRIVATEDNS 253 -#define DNS_KEYALG_PRIVATEOID 254 /*%< Key begins with OID giving alg */ +#define DNS_KEYALG_RSASHA256 8 +#define DNS_KEYALG_RSASHA512 10 +#define DNS_KEYALG_ECCGOST 12 +#define DNS_KEYALG_ECDSA256 13 +#define DNS_KEYALG_ECDSA384 14 +#define DNS_KEYALG_ED25519 15 +#define DNS_KEYALG_ED448 16 +#define DNS_KEYALG_INDIRECT 252 +#define DNS_KEYALG_PRIVATEDNS 253 +#define DNS_KEYALG_PRIVATEOID 254 /*%< Key begins with OID giving alg */ /* Protocol values */ #define DNS_KEYPROTO_RESERVED 0 -#define DNS_KEYPROTO_TLS 1 -#define DNS_KEYPROTO_EMAIL 2 -#define DNS_KEYPROTO_DNSSEC 3 -#define DNS_KEYPROTO_IPSEC 4 -#define DNS_KEYPROTO_ANY 255 +#define DNS_KEYPROTO_TLS 1 +#define DNS_KEYPROTO_EMAIL 2 +#define DNS_KEYPROTO_DNSSEC 3 +#define DNS_KEYPROTO_IPSEC 4 +#define DNS_KEYPROTO_ANY 255 /* Signatures */ #define DNS_SIG_RSAMINBITS 512 /*%< Size of a mod or exp in bits */ @@ -86,8 +86,8 @@ #define DNS_SIG_RSAMAXBYTES ((DNS_SIG_RSAMAXBITS + 7 / 8) * 2 + 3) /*%< Max length of text sig block */ #define DNS_SIG_RSAMAXBASE64 (((DNS_SIG_RSAMAXBYTES + 2) / 3) * 4) -#define DNS_SIG_RSAMINSIZE ((DNS_SIG_RSAMINBITS + 7) / 8) -#define DNS_SIG_RSAMAXSIZE ((DNS_SIG_RSAMAXBITS + 7) / 8) +#define DNS_SIG_RSAMINSIZE ((DNS_SIG_RSAMINBITS + 7) / 8) +#define DNS_SIG_RSAMAXSIZE ((DNS_SIG_RSAMAXBITS + 7) / 8) #define DNS_SIG_ECDSA256SIZE 64 #define DNS_SIG_ECDSA384SIZE 96 @@ -96,9 +96,9 @@ #define DNS_KEY_ECDSA384SIZE 96 #define DNS_SIG_ED25519SIZE 64 -#define DNS_SIG_ED448SIZE 114 +#define DNS_SIG_ED448SIZE 114 #define DNS_KEY_ED25519SIZE 32 -#define DNS_KEY_ED448SIZE 57 +#define DNS_KEY_ED448SIZE 57 #endif /* DNS_KEYVALUES_H */ diff --git a/lib/dns/include/dns/librpz.h b/lib/dns/include/dns/librpz.h index 30c548df3a..d586f4f8e8 100644 --- a/lib/dns/include/dns/librpz.h +++ b/lib/dns/include/dns/librpz.h @@ -49,7 +49,7 @@ */ #ifdef LIBRPZ_INTERNAL #define LIBDEF(t, s) extern t s; -#define LIBDEF_F(f) LIBDEF(librpz_##f##_t, librpz_##f) +#define LIBDEF_F(f) LIBDEF(librpz_##f##_t, librpz_##f) #else /* ifdef LIBRPZ_INTERNAL */ #define LIBDEF(t, s) #define LIBDEF_F(f) @@ -99,9 +99,9 @@ typedef enum { * NXDOMAIN is signaled by a CNAME with a "." target. * NODATA is signaled by a CNAME with a "*." target. */ -#define LIBRPZ_RPZ_PREFIX "rpz-" +#define LIBRPZ_RPZ_PREFIX "rpz-" #define LIBRPZ_RPZ_PASSTHRU LIBRPZ_RPZ_PREFIX "passthru" -#define LIBRPZ_RPZ_DROP LIBRPZ_RPZ_PREFIX "drop" +#define LIBRPZ_RPZ_DROP LIBRPZ_RPZ_PREFIX "drop" #define LIBRPZ_RPZ_TCP_ONLY LIBRPZ_RPZ_PREFIX "tcp-only" typedef uint16_t librpz_dznum_t; /* dnsrpzd zone # in [0,DZNUM_MAX] */ @@ -154,8 +154,8 @@ typedef struct { */ typedef uint32_t librpz_idx_t; #define LIBRPZ_IDX_NULL 0 -#define LIBRPZ_IDX_MIN 1 -#define LIBRPZ_IDX_BAD ((librpz_idx_t)-1) +#define LIBRPZ_IDX_MIN 1 +#define LIBRPZ_IDX_BAD ((librpz_idx_t)-1) /** * Partial decoded results of a set of RPZ queries for a single DNS response * or iteration through the mapped file. @@ -214,9 +214,9 @@ typedef struct { } librpz_emsg_t; #ifdef LIBRPZ_HAVE_ATTR -#define LIBRPZ_UNUSED __attribute__((unused)) +#define LIBRPZ_UNUSED __attribute__((unused)) #define LIBRPZ_PF(f, l) __attribute__((format(printf, f, l))) -#define LIBRPZ_NORET __attribute__((__noreturn__)) +#define LIBRPZ_NORET __attribute__((__noreturn__)) #else /* ifdef LIBRPZ_HAVE_ATTR */ #define LIBRPZ_UNUSED #define LIBRPZ_PF(f, l) @@ -224,10 +224,10 @@ typedef struct { #endif /* ifdef LIBRPZ_HAVE_ATTR */ #ifdef HAVE_BUILTIN_EXPECT -#define LIBRPZ_LIKELY(c) __builtin_expect(!!(c), 1) +#define LIBRPZ_LIKELY(c) __builtin_expect(!!(c), 1) #define LIBRPZ_UNLIKELY(c) __builtin_expect(!!(c), 0) #else /* ifdef HAVE_BUILTIN_EXPECT */ -#define LIBRPZ_LIKELY(c) (c) +#define LIBRPZ_LIKELY(c) (c) #define LIBRPZ_UNLIKELY(c) (c) #endif /* ifdef HAVE_BUILTIN_EXPECT */ @@ -847,7 +847,7 @@ extern librpz_0_t librpz_def_0; * Future versions can be upward compatible by defining LIBRPZ_DEF as * librpz_X_t. */ -#define LIBRPZ_DEF librpz_def_0 +#define LIBRPZ_DEF librpz_def_0 #define LIBRPZ_DEF_STR "librpz_def_0" typedef librpz_0_t librpz_t; @@ -864,8 +864,7 @@ extern librpz_t * librpz; * @return address of interface structure or NULL on failure */ static inline librpz_t * -librpz_lib_open(librpz_emsg_t *emsg, void **dl_handle, const char *path) -{ +librpz_lib_open(librpz_emsg_t *emsg, void **dl_handle, const char *path) { void * handle; librpz_t *new_librpz; @@ -934,8 +933,7 @@ librpz_lib_open(librpz_emsg_t *emsg, void **dl_handle, const char *path) * Statically link to the librpz.so DSO on systems without dlopen() */ static inline librpz_t * -librpz_lib_open(librpz_emsg_t *emsg, void **dl_handle, const char *path) -{ +librpz_lib_open(librpz_emsg_t *emsg, void **dl_handle, const char *path) { (void)(path); if (dl_handle != NULL) { diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h index 4154ec236d..a687fbfc9f 100644 --- a/lib/dns/include/dns/log.h +++ b/lib/dns/include/dns/log.h @@ -22,62 +22,62 @@ LIBDNS_EXTERNAL_DATA extern isc_log_t * dns_lctx; LIBDNS_EXTERNAL_DATA extern isc_logcategory_t dns_categories[]; LIBDNS_EXTERNAL_DATA extern isc_logmodule_t dns_modules[]; -#define DNS_LOGCATEGORY_NOTIFY (&dns_categories[0]) +#define DNS_LOGCATEGORY_NOTIFY (&dns_categories[0]) #define DNS_LOGCATEGORY_DATABASE (&dns_categories[1]) #define DNS_LOGCATEGORY_SECURITY (&dns_categories[2]) /* DNS_LOGCATEGORY_CONFIG superseded by CFG_LOGCATEGORY_CONFIG */ -#define DNS_LOGCATEGORY_DNSSEC (&dns_categories[4]) -#define DNS_LOGCATEGORY_RESOLVER (&dns_categories[5]) -#define DNS_LOGCATEGORY_XFER_IN (&dns_categories[6]) -#define DNS_LOGCATEGORY_XFER_OUT (&dns_categories[7]) -#define DNS_LOGCATEGORY_DISPATCH (&dns_categories[8]) -#define DNS_LOGCATEGORY_LAME_SERVERS (&dns_categories[9]) +#define DNS_LOGCATEGORY_DNSSEC (&dns_categories[4]) +#define DNS_LOGCATEGORY_RESOLVER (&dns_categories[5]) +#define DNS_LOGCATEGORY_XFER_IN (&dns_categories[6]) +#define DNS_LOGCATEGORY_XFER_OUT (&dns_categories[7]) +#define DNS_LOGCATEGORY_DISPATCH (&dns_categories[8]) +#define DNS_LOGCATEGORY_LAME_SERVERS (&dns_categories[9]) #define DNS_LOGCATEGORY_DELEGATION_ONLY (&dns_categories[10]) -#define DNS_LOGCATEGORY_EDNS_DISABLED (&dns_categories[11]) -#define DNS_LOGCATEGORY_RPZ (&dns_categories[12]) -#define DNS_LOGCATEGORY_RRL (&dns_categories[13]) -#define DNS_LOGCATEGORY_CNAME (&dns_categories[14]) -#define DNS_LOGCATEGORY_SPILL (&dns_categories[15]) -#define DNS_LOGCATEGORY_DNSTAP (&dns_categories[16]) -#define DNS_LOGCATEGORY_ZONELOAD (&dns_categories[17]) -#define DNS_LOGCATEGORY_NSID (&dns_categories[18]) +#define DNS_LOGCATEGORY_EDNS_DISABLED (&dns_categories[11]) +#define DNS_LOGCATEGORY_RPZ (&dns_categories[12]) +#define DNS_LOGCATEGORY_RRL (&dns_categories[13]) +#define DNS_LOGCATEGORY_CNAME (&dns_categories[14]) +#define DNS_LOGCATEGORY_SPILL (&dns_categories[15]) +#define DNS_LOGCATEGORY_DNSTAP (&dns_categories[16]) +#define DNS_LOGCATEGORY_ZONELOAD (&dns_categories[17]) +#define DNS_LOGCATEGORY_NSID (&dns_categories[18]) /* Backwards compatibility. */ #define DNS_LOGCATEGORY_GENERAL ISC_LOGCATEGORY_GENERAL -#define DNS_LOGMODULE_DB (&dns_modules[0]) -#define DNS_LOGMODULE_RBTDB (&dns_modules[1]) -#define DNS_LOGMODULE_RBT (&dns_modules[2]) -#define DNS_LOGMODULE_RDATA (&dns_modules[3]) -#define DNS_LOGMODULE_MASTER (&dns_modules[4]) -#define DNS_LOGMODULE_MESSAGE (&dns_modules[5]) -#define DNS_LOGMODULE_CACHE (&dns_modules[6]) -#define DNS_LOGMODULE_CONFIG (&dns_modules[7]) -#define DNS_LOGMODULE_RESOLVER (&dns_modules[8]) -#define DNS_LOGMODULE_ZONE (&dns_modules[9]) -#define DNS_LOGMODULE_JOURNAL (&dns_modules[10]) -#define DNS_LOGMODULE_ADB (&dns_modules[11]) -#define DNS_LOGMODULE_XFER_IN (&dns_modules[12]) -#define DNS_LOGMODULE_XFER_OUT (&dns_modules[13]) -#define DNS_LOGMODULE_ACL (&dns_modules[14]) -#define DNS_LOGMODULE_VALIDATOR (&dns_modules[15]) -#define DNS_LOGMODULE_DISPATCH (&dns_modules[16]) -#define DNS_LOGMODULE_REQUEST (&dns_modules[17]) +#define DNS_LOGMODULE_DB (&dns_modules[0]) +#define DNS_LOGMODULE_RBTDB (&dns_modules[1]) +#define DNS_LOGMODULE_RBT (&dns_modules[2]) +#define DNS_LOGMODULE_RDATA (&dns_modules[3]) +#define DNS_LOGMODULE_MASTER (&dns_modules[4]) +#define DNS_LOGMODULE_MESSAGE (&dns_modules[5]) +#define DNS_LOGMODULE_CACHE (&dns_modules[6]) +#define DNS_LOGMODULE_CONFIG (&dns_modules[7]) +#define DNS_LOGMODULE_RESOLVER (&dns_modules[8]) +#define DNS_LOGMODULE_ZONE (&dns_modules[9]) +#define DNS_LOGMODULE_JOURNAL (&dns_modules[10]) +#define DNS_LOGMODULE_ADB (&dns_modules[11]) +#define DNS_LOGMODULE_XFER_IN (&dns_modules[12]) +#define DNS_LOGMODULE_XFER_OUT (&dns_modules[13]) +#define DNS_LOGMODULE_ACL (&dns_modules[14]) +#define DNS_LOGMODULE_VALIDATOR (&dns_modules[15]) +#define DNS_LOGMODULE_DISPATCH (&dns_modules[16]) +#define DNS_LOGMODULE_REQUEST (&dns_modules[17]) #define DNS_LOGMODULE_MASTERDUMP (&dns_modules[18]) -#define DNS_LOGMODULE_TSIG (&dns_modules[19]) -#define DNS_LOGMODULE_TKEY (&dns_modules[20]) -#define DNS_LOGMODULE_SDB (&dns_modules[21]) -#define DNS_LOGMODULE_DIFF (&dns_modules[22]) -#define DNS_LOGMODULE_HINTS (&dns_modules[23]) -#define DNS_LOGMODULE_UNUSED1 (&dns_modules[24]) -#define DNS_LOGMODULE_DLZ (&dns_modules[25]) -#define DNS_LOGMODULE_DNSSEC (&dns_modules[26]) -#define DNS_LOGMODULE_CRYPTO (&dns_modules[27]) -#define DNS_LOGMODULE_PACKETS (&dns_modules[28]) -#define DNS_LOGMODULE_NTA (&dns_modules[29]) -#define DNS_LOGMODULE_DYNDB (&dns_modules[30]) -#define DNS_LOGMODULE_DNSTAP (&dns_modules[31]) -#define DNS_LOGMODULE_SSU (&dns_modules[32]) +#define DNS_LOGMODULE_TSIG (&dns_modules[19]) +#define DNS_LOGMODULE_TKEY (&dns_modules[20]) +#define DNS_LOGMODULE_SDB (&dns_modules[21]) +#define DNS_LOGMODULE_DIFF (&dns_modules[22]) +#define DNS_LOGMODULE_HINTS (&dns_modules[23]) +#define DNS_LOGMODULE_UNUSED1 (&dns_modules[24]) +#define DNS_LOGMODULE_DLZ (&dns_modules[25]) +#define DNS_LOGMODULE_DNSSEC (&dns_modules[26]) +#define DNS_LOGMODULE_CRYPTO (&dns_modules[27]) +#define DNS_LOGMODULE_PACKETS (&dns_modules[28]) +#define DNS_LOGMODULE_NTA (&dns_modules[29]) +#define DNS_LOGMODULE_DYNDB (&dns_modules[30]) +#define DNS_LOGMODULE_DNSTAP (&dns_modules[31]) +#define DNS_LOGMODULE_SSU (&dns_modules[32]) ISC_LANG_BEGINDECLS diff --git a/lib/dns/include/dns/master.h b/lib/dns/include/dns/master.h index f695964306..1a3f10f040 100644 --- a/lib/dns/include/dns/master.h +++ b/lib/dns/include/dns/master.h @@ -33,9 +33,9 @@ 0x00000002 /*%< Continue processing on errors. \ */ #define DNS_MASTER_NOINCLUDE 0x00000004 /*%< Disallow $INCLUDE directives. */ -#define DNS_MASTER_ZONE 0x00000008 /*%< Loading a zone master file. */ -#define DNS_MASTER_HINT 0x00000010 /*%< Loading a hint master file. */ -#define DNS_MASTER_SLAVE 0x00000020 /*%< Loading a slave master file. */ +#define DNS_MASTER_ZONE 0x00000008 /*%< Loading a zone master file. */ +#define DNS_MASTER_HINT 0x00000010 /*%< Loading a hint master file. */ +#define DNS_MASTER_SLAVE 0x00000020 /*%< Loading a slave master file. */ #define DNS_MASTER_CHECKNS \ 0x00000040 /*%< \ * Check NS records to see \ @@ -46,17 +46,17 @@ * Treat DNS_MASTER_CHECKNS \ * matches as fatal \ */ -#define DNS_MASTER_CHECKNAMES 0x00000100 +#define DNS_MASTER_CHECKNAMES 0x00000100 #define DNS_MASTER_CHECKNAMESFAIL 0x00000200 #define DNS_MASTER_CHECKWILDCARD \ 0x00000400 /* Check for internal wildcards. \ */ -#define DNS_MASTER_CHECKMX 0x00000800 +#define DNS_MASTER_CHECKMX 0x00000800 #define DNS_MASTER_CHECKMXFAIL 0x00001000 -#define DNS_MASTER_RESIGN 0x00002000 -#define DNS_MASTER_KEY 0x00004000 /*%< Loading a key zone master file. */ -#define DNS_MASTER_NOTTL 0x00008000 /*%< Don't require ttl. */ +#define DNS_MASTER_RESIGN 0x00002000 +#define DNS_MASTER_KEY 0x00004000 /*%< Loading a key zone master file. */ +#define DNS_MASTER_NOTTL 0x00008000 /*%< Don't require ttl. */ #define DNS_MASTER_CHECKTTL 0x00010000 /*%< Check max-zone-ttl */ ISC_LANG_BEGINDECLS @@ -72,9 +72,9 @@ ISC_LANG_BEGINDECLS /* * Flags to indicate the status of the data in the raw file header */ -#define DNS_MASTERRAW_COMPAT 0x01 +#define DNS_MASTERRAW_COMPAT 0x01 #define DNS_MASTERRAW_SOURCESERIALSET 0x02 -#define DNS_MASTERRAW_LASTXFRINSET 0x04 +#define DNS_MASTERRAW_LASTXFRINSET 0x04 /* Common header */ struct dns_masterrawheader { diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h index 71f1fa328f..e2eef88c06 100644 --- a/lib/dns/include/dns/message.h +++ b/lib/dns/include/dns/message.h @@ -99,28 +99,28 @@ #define DNS_MESSAGEEXTFLAG_DO 0x8000U /*%< EDNS0 extended OPT codes */ -#define DNS_OPT_LLQ 1 /*%< LLQ opt code */ -#define DNS_OPT_NSID 3 /*%< NSID opt code */ +#define DNS_OPT_LLQ 1 /*%< LLQ opt code */ +#define DNS_OPT_NSID 3 /*%< NSID opt code */ #define DNS_OPT_CLIENT_SUBNET 8 /*%< client subnet opt code */ -#define DNS_OPT_EXPIRE 9 /*%< EXPIRE opt code */ -#define DNS_OPT_COOKIE 10 /*%< COOKIE opt code */ +#define DNS_OPT_EXPIRE 9 /*%< EXPIRE opt code */ +#define DNS_OPT_COOKIE 10 /*%< COOKIE opt code */ #define DNS_OPT_TCP_KEEPALIVE 11 /*%< TCP keepalive opt code */ -#define DNS_OPT_PAD 12 /*%< PAD opt code */ -#define DNS_OPT_KEY_TAG 14 /*%< Key tag opt code */ -#define DNS_OPT_CLIENT_TAG 16 /*%< Client tag opt code */ -#define DNS_OPT_SERVER_TAG 17 /*%< Server tag opt code */ +#define DNS_OPT_PAD 12 /*%< PAD opt code */ +#define DNS_OPT_KEY_TAG 14 /*%< Key tag opt code */ +#define DNS_OPT_CLIENT_TAG 16 /*%< Client tag opt code */ +#define DNS_OPT_SERVER_TAG 17 /*%< Server tag opt code */ /*%< Experimental options [65001...65534] as per RFC6891 */ /*%< The number of EDNS options we know about. */ #define DNS_EDNSOPTIONS 7 -#define DNS_MESSAGE_REPLYPRESERVE (DNS_MESSAGEFLAG_RD | DNS_MESSAGEFLAG_CD) +#define DNS_MESSAGE_REPLYPRESERVE (DNS_MESSAGEFLAG_RD | DNS_MESSAGEFLAG_CD) #define DNS_MESSAGEEXTFLAG_REPLYPRESERVE (DNS_MESSAGEEXTFLAG_DO) #define DNS_MESSAGE_HEADERLEN 12 /*%< 6 uint16_t's */ -#define DNS_MESSAGE_MAGIC ISC_MAGIC('M', 'S', 'G', '@') +#define DNS_MESSAGE_MAGIC ISC_MAGIC('M', 'S', 'G', '@') #define DNS_MESSAGE_VALID(msg) ISC_MAGIC_VALID(msg, DNS_MESSAGE_MAGIC) /* @@ -128,39 +128,39 @@ * and DNS_SECTION_MAX must be one greater than the last used section. */ typedef int dns_section_t; -#define DNS_SECTION_ANY (-1) -#define DNS_SECTION_QUESTION 0 -#define DNS_SECTION_ANSWER 1 -#define DNS_SECTION_AUTHORITY 2 +#define DNS_SECTION_ANY (-1) +#define DNS_SECTION_QUESTION 0 +#define DNS_SECTION_ANSWER 1 +#define DNS_SECTION_AUTHORITY 2 #define DNS_SECTION_ADDITIONAL 3 -#define DNS_SECTION_MAX 4 +#define DNS_SECTION_MAX 4 typedef int dns_pseudosection_t; -#define DNS_PSEUDOSECTION_ANY (-1) -#define DNS_PSEUDOSECTION_OPT 0 +#define DNS_PSEUDOSECTION_ANY (-1) +#define DNS_PSEUDOSECTION_OPT 0 #define DNS_PSEUDOSECTION_TSIG 1 #define DNS_PSEUDOSECTION_SIG0 2 -#define DNS_PSEUDOSECTION_MAX 3 +#define DNS_PSEUDOSECTION_MAX 3 typedef int dns_messagetextflag_t; #define DNS_MESSAGETEXTFLAG_NOCOMMENTS 0x0001 -#define DNS_MESSAGETEXTFLAG_NOHEADERS 0x0002 -#define DNS_MESSAGETEXTFLAG_ONESOA 0x0004 -#define DNS_MESSAGETEXTFLAG_OMITSOA 0x0008 +#define DNS_MESSAGETEXTFLAG_NOHEADERS 0x0002 +#define DNS_MESSAGETEXTFLAG_ONESOA 0x0004 +#define DNS_MESSAGETEXTFLAG_OMITSOA 0x0008 /* * Dynamic update names for these sections. */ -#define DNS_SECTION_ZONE DNS_SECTION_QUESTION +#define DNS_SECTION_ZONE DNS_SECTION_QUESTION #define DNS_SECTION_PREREQUISITE DNS_SECTION_ANSWER -#define DNS_SECTION_UPDATE DNS_SECTION_AUTHORITY +#define DNS_SECTION_UPDATE DNS_SECTION_AUTHORITY /* * These tell the message library how the created dns_message_t will be used. */ #define DNS_MESSAGE_INTENTUNKNOWN 0 /*%< internal use only */ -#define DNS_MESSAGE_INTENTPARSE 1 /*%< parsing messages */ -#define DNS_MESSAGE_INTENTRENDER 2 /*%< rendering */ +#define DNS_MESSAGE_INTENTPARSE 1 /*%< parsing messages */ +#define DNS_MESSAGE_INTENTRENDER 2 /*%< rendering */ /* * Control behavior of parsing @@ -180,8 +180,8 @@ typedef int dns_messagetextflag_t; /* * Control behavior of rendering */ -#define DNS_MESSAGERENDER_ORDERED 0x0001 /*%< don't change order */ -#define DNS_MESSAGERENDER_PARTIAL 0x0002 /*%< allow a partial rdataset */ +#define DNS_MESSAGERENDER_ORDERED 0x0001 /*%< don't change order */ +#define DNS_MESSAGERENDER_PARTIAL 0x0002 /*%< allow a partial rdataset */ #define DNS_MESSAGERENDER_OMITDNSSEC 0x0004 /*%< omit DNSSEC records */ #define DNS_MESSAGERENDER_PREFER_A \ 0x0008 /*%< prefer A records in \ diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h index 287ad69821..2c1dfe946f 100644 --- a/lib/dns/include/dns/name.h +++ b/lib/dns/include/dns/name.h @@ -114,33 +114,33 @@ struct dns_name { #define DNS_NAME_MAGIC ISC_MAGIC('D', 'N', 'S', 'n') -#define DNS_NAMEATTR_ABSOLUTE 0x00000001 -#define DNS_NAMEATTR_READONLY 0x00000002 -#define DNS_NAMEATTR_DYNAMIC 0x00000004 +#define DNS_NAMEATTR_ABSOLUTE 0x00000001 +#define DNS_NAMEATTR_READONLY 0x00000002 +#define DNS_NAMEATTR_DYNAMIC 0x00000004 #define DNS_NAMEATTR_DYNOFFSETS 0x00000008 #define DNS_NAMEATTR_NOCOMPRESS 0x00000010 /* * Attributes below 0x0100 reserved for name.c usage. */ -#define DNS_NAMEATTR_CACHE 0x00000100 /*%< Used by resolver. */ -#define DNS_NAMEATTR_ANSWER 0x00000200 /*%< Used by resolver. */ -#define DNS_NAMEATTR_NCACHE 0x00000400 /*%< Used by resolver. */ -#define DNS_NAMEATTR_CHAINING 0x00000800 /*%< Used by resolver. */ -#define DNS_NAMEATTR_CHASE 0x00001000 /*%< Used by resolver. */ -#define DNS_NAMEATTR_WILDCARD 0x00002000 /*%< Used by server. */ +#define DNS_NAMEATTR_CACHE 0x00000100 /*%< Used by resolver. */ +#define DNS_NAMEATTR_ANSWER 0x00000200 /*%< Used by resolver. */ +#define DNS_NAMEATTR_NCACHE 0x00000400 /*%< Used by resolver. */ +#define DNS_NAMEATTR_CHAINING 0x00000800 /*%< Used by resolver. */ +#define DNS_NAMEATTR_CHASE 0x00001000 /*%< Used by resolver. */ +#define DNS_NAMEATTR_WILDCARD 0x00002000 /*%< Used by server. */ #define DNS_NAMEATTR_PREREQUISITE 0x00004000 /*%< Used by client. */ -#define DNS_NAMEATTR_UPDATE 0x00008000 /*%< Used by client. */ +#define DNS_NAMEATTR_UPDATE 0x00008000 /*%< Used by client. */ #define DNS_NAMEATTR_HASUPDATEREC 0x00010000 /*%< Used by client. */ /* * Various flags. */ -#define DNS_NAME_DOWNCASE 0x0001 -#define DNS_NAME_CHECKNAMES 0x0002 /*%< Used by rdata. */ +#define DNS_NAME_DOWNCASE 0x0001 +#define DNS_NAME_CHECKNAMES 0x0002 /*%< Used by rdata. */ #define DNS_NAME_CHECKNAMESFAIL 0x0004 /*%< Used by rdata. */ -#define DNS_NAME_CHECKREVERSE 0x0008 /*%< Used by rdata. */ -#define DNS_NAME_CHECKMX 0x0010 /*%< Used by rdata. */ -#define DNS_NAME_CHECKMXFAIL 0x0020 /*%< Used by rdata. */ +#define DNS_NAME_CHECKREVERSE 0x0008 /*%< Used by rdata. */ +#define DNS_NAME_CHECKMX 0x0010 /*%< Used by rdata. */ +#define DNS_NAME_CHECKMXFAIL 0x0020 /*%< Used by rdata. */ LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_rootname; LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_wildcardname; @@ -169,8 +169,7 @@ LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_wildcardname; { \ DNS_NAME_MAGIC, A, (sizeof(A) - 1), sizeof(B), \ DNS_NAMEATTR_READONLY, B, NULL, \ - { (void *)-1, (void *)-1 }, \ - { \ + { (void *)-1, (void *)-1 }, { \ NULL, NULL \ } \ } @@ -179,8 +178,7 @@ LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_wildcardname; { \ DNS_NAME_MAGIC, A, sizeof(A), sizeof(B), \ DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, B, \ - NULL, { (void *)-1, (void *)-1 }, \ - { \ + NULL, { (void *)-1, (void *)-1 }, { \ NULL, NULL \ } \ } @@ -188,8 +186,7 @@ LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_wildcardname; #define DNS_NAME_INITEMPTY \ { \ DNS_NAME_MAGIC, NULL, 0, 0, 0, NULL, NULL, \ - { (void *)-1, (void *)-1 }, \ - { \ + { (void *)-1, (void *)-1 }, { \ NULL, NULL \ } \ } @@ -833,7 +830,7 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source, */ #define DNS_NAME_OMITFINALDOT 0x01U -#define DNS_NAME_MASTERFILE 0x02U /* escape $ and @ */ +#define DNS_NAME_MASTERFILE 0x02U /* escape $ and @ */ isc_result_t dns_name_toprincipal(const dns_name_t *name, isc_buffer_t *target); @@ -1391,12 +1388,12 @@ ISC_LANG_ENDDECLS #ifdef DNS_NAME_USEINLINE -#define dns_name_init(n, o) DNS_NAME_INIT(n, o) -#define dns_name_reset(n) DNS_NAME_RESET(n) -#define dns_name_setbuffer(n, b) DNS_NAME_SETBUFFER(n, b) -#define dns_name_countlabels(n) DNS_NAME_COUNTLABELS(n) -#define dns_name_isabsolute(n) DNS_NAME_ISABSOLUTE(n) -#define dns_name_toregion(n, r) DNS_NAME_TOREGION(n, r) +#define dns_name_init(n, o) DNS_NAME_INIT(n, o) +#define dns_name_reset(n) DNS_NAME_RESET(n) +#define dns_name_setbuffer(n, b) DNS_NAME_SETBUFFER(n, b) +#define dns_name_countlabels(n) DNS_NAME_COUNTLABELS(n) +#define dns_name_isabsolute(n) DNS_NAME_ISABSOLUTE(n) +#define dns_name_toregion(n, r) DNS_NAME_TOREGION(n, r) #define dns_name_split(n, l, p, s) DNS_NAME_SPLIT(n, l, p, s) #endif /* DNS_NAME_USEINLINE */ diff --git a/lib/dns/include/dns/nta.h b/lib/dns/include/dns/nta.h index 923d4b10ea..c67da1ca17 100644 --- a/lib/dns/include/dns/nta.h +++ b/lib/dns/include/dns/nta.h @@ -56,7 +56,7 @@ struct dns_ntatable { dns_rbt_t *table; }; -#define NTATABLE_MAGIC ISC_MAGIC('N', 'T', 'A', 't') +#define NTATABLE_MAGIC ISC_MAGIC('N', 'T', 'A', 't') #define VALID_NTATABLE(nt) ISC_MAGIC_VALID(nt, NTATABLE_MAGIC) isc_result_t diff --git a/lib/dns/include/dns/peer.h b/lib/dns/include/dns/peer.h index 9b39445543..03185cf0fb 100644 --- a/lib/dns/include/dns/peer.h +++ b/lib/dns/include/dns/peer.h @@ -36,10 +36,10 @@ #include #define DNS_PEERLIST_MAGIC ISC_MAGIC('s', 'e', 'R', 'L') -#define DNS_PEER_MAGIC ISC_MAGIC('S', 'E', 'r', 'v') +#define DNS_PEER_MAGIC ISC_MAGIC('S', 'E', 'r', 'v') #define DNS_PEERLIST_VALID(ptr) ISC_MAGIC_VALID(ptr, DNS_PEERLIST_MAGIC) -#define DNS_PEER_VALID(ptr) ISC_MAGIC_VALID(ptr, DNS_PEER_MAGIC) +#define DNS_PEER_VALID(ptr) ISC_MAGIC_VALID(ptr, DNS_PEER_MAGIC) /*** *** Types diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h index 5083d11766..aaf5f58ca5 100644 --- a/lib/dns/include/dns/rbt.h +++ b/lib/dns/include/dns/rbt.h @@ -32,9 +32,9 @@ ISC_LANG_BEGINDECLS * Option values for dns_rbt_findnode() and dns_rbt_findname(). * These are used to form a bitmask. */ -#define DNS_RBTFIND_NOOPTIONS 0x00 -#define DNS_RBTFIND_EMPTYDATA 0x01 -#define DNS_RBTFIND_NOEXACT 0x02 +#define DNS_RBTFIND_NOOPTIONS 0x00 +#define DNS_RBTFIND_EMPTYDATA 0x01 +#define DNS_RBTFIND_NOEXACT 0x02 #define DNS_RBTFIND_NOPREDECESSOR 0x04 /*@}*/ diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h index 609eabd9b6..684a4d7e13 100644 --- a/lib/dns/include/dns/rdata.h +++ b/lib/dns/include/dns/rdata.h @@ -135,7 +135,7 @@ struct dns_rdata { #endif /* ifdef ISC_LIST_CHECKINIT */ #endif /* ifdef DNS_RDATA_CHECKINITIALIZED */ -#define DNS_RDATA_UPDATE 0x0001 /*%< update pseudo record. */ +#define DNS_RDATA_UPDATE 0x0001 /*%< update pseudo record. */ #define DNS_RDATA_OFFLINE 0x0002 /*%< RRSIG has a offline key. */ #define DNS_RDATA_VALIDFLAGS(rdata) \ @@ -163,7 +163,7 @@ struct dns_rdata { #define DNS_STYLEFLAG_MULTILINE 0x00000001ULL /*% Output explanatory comments. */ -#define DNS_STYLEFLAG_COMMENT 0x00000002ULL +#define DNS_STYLEFLAG_COMMENT 0x00000002ULL #define DNS_STYLEFLAG_RRCOMMENT 0x00000004ULL /*% Output KEYDATA in human readable format. */ @@ -175,13 +175,13 @@ struct dns_rdata { /*% Print AAAA record fully expanded */ #define DNS_STYLEFLAG_EXPANDAAAA 0x00000020ULL -#define DNS_RDATA_DOWNCASE DNS_NAME_DOWNCASE -#define DNS_RDATA_CHECKNAMES DNS_NAME_CHECKNAMES +#define DNS_RDATA_DOWNCASE DNS_NAME_DOWNCASE +#define DNS_RDATA_CHECKNAMES DNS_NAME_CHECKNAMES #define DNS_RDATA_CHECKNAMESFAIL DNS_NAME_CHECKNAMESFAIL -#define DNS_RDATA_CHECKREVERSE DNS_NAME_CHECKREVERSE -#define DNS_RDATA_CHECKMX DNS_NAME_CHECKMX -#define DNS_RDATA_CHECKMXFAIL DNS_NAME_CHECKMXFAIL -#define DNS_RDATA_UNKNOWNESCAPE 0x80000000 +#define DNS_RDATA_CHECKREVERSE DNS_NAME_CHECKREVERSE +#define DNS_RDATA_CHECKMX DNS_NAME_CHECKMX +#define DNS_RDATA_CHECKMXFAIL DNS_NAME_CHECKMXFAIL +#define DNS_RDATA_UNKNOWNESCAPE 0x80000000 /*** *** Initialization diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h index 1b742c91e2..05877f77c7 100644 --- a/lib/dns/include/dns/rdataset.h +++ b/lib/dns/include/dns/rdataset.h @@ -85,7 +85,7 @@ typedef struct dns_rdatasetmethods { dns_dbversion_t *version, dns_message_t *msg); } dns_rdatasetmethods_t; -#define DNS_RDATASET_MAGIC ISC_MAGIC('D', 'N', 'S', 'R') +#define DNS_RDATASET_MAGIC ISC_MAGIC('D', 'N', 'S', 'R') #define DNS_RDATASET_VALID(set) ISC_MAGIC_VALID(set, DNS_RDATASET_MAGIC) /*% @@ -161,33 +161,33 @@ struct dns_rdataset { * Output the RRset in load order. */ -#define DNS_RDATASETATTR_NONE 0x00000000 /*%< No ordering. */ -#define DNS_RDATASETATTR_QUESTION 0x00000001 -#define DNS_RDATASETATTR_RENDERED 0x00000002 /*%< Used by message.c */ -#define DNS_RDATASETATTR_ANSWERED 0x00000004 /*%< Used by server. */ -#define DNS_RDATASETATTR_CACHE 0x00000008 /*%< Used by resolver. */ -#define DNS_RDATASETATTR_ANSWER 0x00000010 /*%< Used by resolver. */ -#define DNS_RDATASETATTR_ANSWERSIG 0x00000020 /*%< Used by resolver. */ -#define DNS_RDATASETATTR_EXTERNAL 0x00000040 /*%< Used by resolver. */ -#define DNS_RDATASETATTR_NCACHE 0x00000080 /*%< Used by resolver. */ -#define DNS_RDATASETATTR_CHAINING 0x00000100 /*%< Used by resolver. */ -#define DNS_RDATASETATTR_TTLADJUSTED 0x00000200 /*%< Used by message.c */ -#define DNS_RDATASETATTR_FIXEDORDER 0x00000400 /*%< Fixed ordering. */ -#define DNS_RDATASETATTR_RANDOMIZE 0x00000800 /*%< Random ordering. */ -#define DNS_RDATASETATTR_CHASE 0x00001000 /*%< Used by resolver. */ -#define DNS_RDATASETATTR_NXDOMAIN 0x00002000 -#define DNS_RDATASETATTR_NOQNAME 0x00004000 -#define DNS_RDATASETATTR_CHECKNAMES 0x00008000 /*%< Used by resolver. */ -#define DNS_RDATASETATTR_REQUIRED 0x00010000 +#define DNS_RDATASETATTR_NONE 0x00000000 /*%< No ordering. */ +#define DNS_RDATASETATTR_QUESTION 0x00000001 +#define DNS_RDATASETATTR_RENDERED 0x00000002 /*%< Used by message.c */ +#define DNS_RDATASETATTR_ANSWERED 0x00000004 /*%< Used by server. */ +#define DNS_RDATASETATTR_CACHE 0x00000008 /*%< Used by resolver. */ +#define DNS_RDATASETATTR_ANSWER 0x00000010 /*%< Used by resolver. */ +#define DNS_RDATASETATTR_ANSWERSIG 0x00000020 /*%< Used by resolver. */ +#define DNS_RDATASETATTR_EXTERNAL 0x00000040 /*%< Used by resolver. */ +#define DNS_RDATASETATTR_NCACHE 0x00000080 /*%< Used by resolver. */ +#define DNS_RDATASETATTR_CHAINING 0x00000100 /*%< Used by resolver. */ +#define DNS_RDATASETATTR_TTLADJUSTED 0x00000200 /*%< Used by message.c */ +#define DNS_RDATASETATTR_FIXEDORDER 0x00000400 /*%< Fixed ordering. */ +#define DNS_RDATASETATTR_RANDOMIZE 0x00000800 /*%< Random ordering. */ +#define DNS_RDATASETATTR_CHASE 0x00001000 /*%< Used by resolver. */ +#define DNS_RDATASETATTR_NXDOMAIN 0x00002000 +#define DNS_RDATASETATTR_NOQNAME 0x00004000 +#define DNS_RDATASETATTR_CHECKNAMES 0x00008000 /*%< Used by resolver. */ +#define DNS_RDATASETATTR_REQUIRED 0x00010000 #define DNS_RDATASETATTR_REQUIREDGLUE DNS_RDATASETATTR_REQUIRED -#define DNS_RDATASETATTR_LOADORDER 0x00020000 -#define DNS_RDATASETATTR_RESIGN 0x00040000 -#define DNS_RDATASETATTR_CLOSEST 0x00080000 -#define DNS_RDATASETATTR_OPTOUT 0x00100000 /*%< OPTOUT proof */ -#define DNS_RDATASETATTR_NEGATIVE 0x00200000 -#define DNS_RDATASETATTR_PREFETCH 0x00400000 -#define DNS_RDATASETATTR_CYCLIC 0x00800000 /*%< Cyclic ordering. */ -#define DNS_RDATASETATTR_STALE 0x01000000 +#define DNS_RDATASETATTR_LOADORDER 0x00020000 +#define DNS_RDATASETATTR_RESIGN 0x00040000 +#define DNS_RDATASETATTR_CLOSEST 0x00080000 +#define DNS_RDATASETATTR_OPTOUT 0x00100000 /*%< OPTOUT proof */ +#define DNS_RDATASETATTR_NEGATIVE 0x00200000 +#define DNS_RDATASETATTR_PREFETCH 0x00400000 +#define DNS_RDATASETATTR_CYCLIC 0x00800000 /*%< Cyclic ordering. */ +#define DNS_RDATASETATTR_STALE 0x01000000 /*% * _OMITDNSSEC: diff --git a/lib/dns/include/dns/rdatasetiter.h b/lib/dns/include/dns/rdatasetiter.h index 8257052a24..096a46a34f 100644 --- a/lib/dns/include/dns/rdatasetiter.h +++ b/lib/dns/include/dns/rdatasetiter.h @@ -72,7 +72,7 @@ typedef struct dns_rdatasetitermethods { void (*current)(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset); } dns_rdatasetitermethods_t; -#define DNS_RDATASETITER_MAGIC ISC_MAGIC('D', 'N', 'S', 'i') +#define DNS_RDATASETITER_MAGIC ISC_MAGIC('D', 'N', 'S', 'i') #define DNS_RDATASETITER_VALID(i) ISC_MAGIC_VALID(i, DNS_RDATASETITER_MAGIC) /*% diff --git a/lib/dns/include/dns/request.h b/lib/dns/include/dns/request.h index d238e7c6b5..0fb690d26d 100644 --- a/lib/dns/include/dns/request.h +++ b/lib/dns/include/dns/request.h @@ -40,10 +40,10 @@ #include -#define DNS_REQUESTOPT_TCP 0x00000001U -#define DNS_REQUESTOPT_CASE 0x00000002U +#define DNS_REQUESTOPT_TCP 0x00000001U +#define DNS_REQUESTOPT_CASE 0x00000002U #define DNS_REQUESTOPT_FIXEDID 0x00000004U -#define DNS_REQUESTOPT_SHARE 0x00000008U +#define DNS_REQUESTOPT_SHARE 0x00000008U typedef struct dns_requestevent { ISC_EVENT_COMMON(struct dns_requestevent); diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h index a2ed53aa6c..79b4886fca 100644 --- a/lib/dns/include/dns/resolver.h +++ b/lib/dns/include/dns/resolver.h @@ -88,19 +88,19 @@ typedef enum { dns_quotatype_zone = 0, dns_quotatype_server } dns_quotatype_t; /* * Options that modify how a 'fetch' is done. */ -#define DNS_FETCHOPT_TCP 0x00000001 /*%< Use TCP. */ -#define DNS_FETCHOPT_UNSHARED 0x00000002 /*%< See below. */ -#define DNS_FETCHOPT_RECURSIVE 0x00000004 /*%< Set RD? */ -#define DNS_FETCHOPT_NOEDNS0 0x00000008 /*%< Do not use EDNS. */ +#define DNS_FETCHOPT_TCP 0x00000001 /*%< Use TCP. */ +#define DNS_FETCHOPT_UNSHARED 0x00000002 /*%< See below. */ +#define DNS_FETCHOPT_RECURSIVE 0x00000004 /*%< Set RD? */ +#define DNS_FETCHOPT_NOEDNS0 0x00000008 /*%< Do not use EDNS. */ #define DNS_FETCHOPT_FORWARDONLY 0x00000010 /*%< Only use forwarders. */ -#define DNS_FETCHOPT_NOVALIDATE 0x00000020 /*%< Disable validation. */ +#define DNS_FETCHOPT_NOVALIDATE 0x00000020 /*%< Disable validation. */ #define DNS_FETCHOPT_EDNS512 \ 0x00000040 /*%< Advertise a 512 byte \ * UDP buffer. */ #define DNS_FETCHOPT_WANTNSID 0x00000080 /*%< Request NSID */ #define DNS_FETCHOPT_PREFETCH 0x00000100 /*%< Do prefetch */ #define DNS_FETCHOPT_NOCDFLAG 0x00000200 /*%< Don't set CD flag. */ -#define DNS_FETCHOPT_NONTA 0x00000400 /*%< Ignore NTA table. */ +#define DNS_FETCHOPT_NONTA 0x00000400 /*%< Ignore NTA table. */ /* RESERVED ECS 0x00000000 */ /* RESERVED ECS 0x00001000 */ /* RESERVED ECS 0x00002000 */ @@ -131,23 +131,23 @@ typedef enum { dns_quotatype_zone = 0, dns_quotatype_server } dns_quotatype_t; * if possible. */ /* Reserved in use by adb.c 0x00400000 */ -#define DNS_FETCHOPT_EDNSVERSIONSET 0x00800000 -#define DNS_FETCHOPT_EDNSVERSIONMASK 0xff000000 +#define DNS_FETCHOPT_EDNSVERSIONSET 0x00800000 +#define DNS_FETCHOPT_EDNSVERSIONMASK 0xff000000 #define DNS_FETCHOPT_EDNSVERSIONSHIFT 24 /* * Upper bounds of class of query RTT (ms). Corresponds to * dns_resstatscounter_queryrttX statistics counters. */ -#define DNS_RESOLVER_QRYRTTCLASS0 10 +#define DNS_RESOLVER_QRYRTTCLASS0 10 #define DNS_RESOLVER_QRYRTTCLASS0STR "10" -#define DNS_RESOLVER_QRYRTTCLASS1 100 +#define DNS_RESOLVER_QRYRTTCLASS1 100 #define DNS_RESOLVER_QRYRTTCLASS1STR "100" -#define DNS_RESOLVER_QRYRTTCLASS2 500 +#define DNS_RESOLVER_QRYRTTCLASS2 500 #define DNS_RESOLVER_QRYRTTCLASS2STR "500" -#define DNS_RESOLVER_QRYRTTCLASS3 800 +#define DNS_RESOLVER_QRYRTTCLASS3 800 #define DNS_RESOLVER_QRYRTTCLASS3STR "800" -#define DNS_RESOLVER_QRYRTTCLASS4 1600 +#define DNS_RESOLVER_QRYRTTCLASS4 1600 #define DNS_RESOLVER_QRYRTTCLASS4STR "1600" /* @@ -155,12 +155,12 @@ typedef enum { dns_quotatype_zone = 0, dns_quotatype_server } dns_quotatype_t; * _dns_resolver_create()). */ -#define DNS_RESOLVER_CHECKNAMES 0x01 +#define DNS_RESOLVER_CHECKNAMES 0x01 #define DNS_RESOLVER_CHECKNAMESFAIL 0x02 -#define DNS_QMIN_MAXLABELS 7 +#define DNS_QMIN_MAXLABELS 7 #define DNS_QMIN_MAX_NO_DELEGATION 3 -#define DNS_MAX_LABELS 127 +#define DNS_MAX_LABELS 127 isc_result_t dns_resolver_create(dns_view_t *view, isc_taskmgr_t *taskmgr, diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h index 04a6595d9c..d0df43ac14 100644 --- a/lib/dns/include/dns/result.h +++ b/lib/dns/include/dns/result.h @@ -31,7 +31,7 @@ * DNS library result codes */ #define DNS_R_LABELTOOLONG (ISC_RESULTCLASS_DNS + 0) -#define DNS_R_BADESCAPE (ISC_RESULTCLASS_DNS + 1) +#define DNS_R_BADESCAPE (ISC_RESULTCLASS_DNS + 1) /* * Since we dropped the support of bitstring labels, deprecate the related * result codes too. @@ -39,121 +39,121 @@ #define DNS_R_BADBITSTRING (ISC_RESULTCLASS_DNS + 2) #define DNS_R_BITSTRINGTOOLONG (ISC_RESULTCLASS_DNS + 3) */ -#define DNS_R_EMPTYLABEL (ISC_RESULTCLASS_DNS + 4) -#define DNS_R_BADDOTTEDQUAD (ISC_RESULTCLASS_DNS + 5) -#define DNS_R_INVALIDNS (ISC_RESULTCLASS_DNS + 6) -#define DNS_R_UNKNOWN (ISC_RESULTCLASS_DNS + 7) -#define DNS_R_BADLABELTYPE (ISC_RESULTCLASS_DNS + 8) -#define DNS_R_BADPOINTER (ISC_RESULTCLASS_DNS + 9) -#define DNS_R_TOOMANYHOPS (ISC_RESULTCLASS_DNS + 10) -#define DNS_R_DISALLOWED (ISC_RESULTCLASS_DNS + 11) -#define DNS_R_EXTRATOKEN (ISC_RESULTCLASS_DNS + 12) -#define DNS_R_EXTRADATA (ISC_RESULTCLASS_DNS + 13) -#define DNS_R_TEXTTOOLONG (ISC_RESULTCLASS_DNS + 14) -#define DNS_R_NOTZONETOP (ISC_RESULTCLASS_DNS + 15) -#define DNS_R_SYNTAX (ISC_RESULTCLASS_DNS + 16) -#define DNS_R_BADCKSUM (ISC_RESULTCLASS_DNS + 17) -#define DNS_R_BADAAAA (ISC_RESULTCLASS_DNS + 18) -#define DNS_R_NOOWNER (ISC_RESULTCLASS_DNS + 19) -#define DNS_R_NOTTL (ISC_RESULTCLASS_DNS + 20) -#define DNS_R_BADCLASS (ISC_RESULTCLASS_DNS + 21) -#define DNS_R_NAMETOOLONG (ISC_RESULTCLASS_DNS + 22) -#define DNS_R_PARTIALMATCH (ISC_RESULTCLASS_DNS + 23) -#define DNS_R_NEWORIGIN (ISC_RESULTCLASS_DNS + 24) -#define DNS_R_UNCHANGED (ISC_RESULTCLASS_DNS + 25) -#define DNS_R_BADTTL (ISC_RESULTCLASS_DNS + 26) -#define DNS_R_NOREDATA (ISC_RESULTCLASS_DNS + 27) -#define DNS_R_CONTINUE (ISC_RESULTCLASS_DNS + 28) -#define DNS_R_DELEGATION (ISC_RESULTCLASS_DNS + 29) -#define DNS_R_GLUE (ISC_RESULTCLASS_DNS + 30) -#define DNS_R_DNAME (ISC_RESULTCLASS_DNS + 31) -#define DNS_R_CNAME (ISC_RESULTCLASS_DNS + 32) -#define DNS_R_BADDB (ISC_RESULTCLASS_DNS + 33) -#define DNS_R_ZONECUT (ISC_RESULTCLASS_DNS + 34) -#define DNS_R_BADZONE (ISC_RESULTCLASS_DNS + 35) -#define DNS_R_MOREDATA (ISC_RESULTCLASS_DNS + 36) -#define DNS_R_UPTODATE (ISC_RESULTCLASS_DNS + 37) +#define DNS_R_EMPTYLABEL (ISC_RESULTCLASS_DNS + 4) +#define DNS_R_BADDOTTEDQUAD (ISC_RESULTCLASS_DNS + 5) +#define DNS_R_INVALIDNS (ISC_RESULTCLASS_DNS + 6) +#define DNS_R_UNKNOWN (ISC_RESULTCLASS_DNS + 7) +#define DNS_R_BADLABELTYPE (ISC_RESULTCLASS_DNS + 8) +#define DNS_R_BADPOINTER (ISC_RESULTCLASS_DNS + 9) +#define DNS_R_TOOMANYHOPS (ISC_RESULTCLASS_DNS + 10) +#define DNS_R_DISALLOWED (ISC_RESULTCLASS_DNS + 11) +#define DNS_R_EXTRATOKEN (ISC_RESULTCLASS_DNS + 12) +#define DNS_R_EXTRADATA (ISC_RESULTCLASS_DNS + 13) +#define DNS_R_TEXTTOOLONG (ISC_RESULTCLASS_DNS + 14) +#define DNS_R_NOTZONETOP (ISC_RESULTCLASS_DNS + 15) +#define DNS_R_SYNTAX (ISC_RESULTCLASS_DNS + 16) +#define DNS_R_BADCKSUM (ISC_RESULTCLASS_DNS + 17) +#define DNS_R_BADAAAA (ISC_RESULTCLASS_DNS + 18) +#define DNS_R_NOOWNER (ISC_RESULTCLASS_DNS + 19) +#define DNS_R_NOTTL (ISC_RESULTCLASS_DNS + 20) +#define DNS_R_BADCLASS (ISC_RESULTCLASS_DNS + 21) +#define DNS_R_NAMETOOLONG (ISC_RESULTCLASS_DNS + 22) +#define DNS_R_PARTIALMATCH (ISC_RESULTCLASS_DNS + 23) +#define DNS_R_NEWORIGIN (ISC_RESULTCLASS_DNS + 24) +#define DNS_R_UNCHANGED (ISC_RESULTCLASS_DNS + 25) +#define DNS_R_BADTTL (ISC_RESULTCLASS_DNS + 26) +#define DNS_R_NOREDATA (ISC_RESULTCLASS_DNS + 27) +#define DNS_R_CONTINUE (ISC_RESULTCLASS_DNS + 28) +#define DNS_R_DELEGATION (ISC_RESULTCLASS_DNS + 29) +#define DNS_R_GLUE (ISC_RESULTCLASS_DNS + 30) +#define DNS_R_DNAME (ISC_RESULTCLASS_DNS + 31) +#define DNS_R_CNAME (ISC_RESULTCLASS_DNS + 32) +#define DNS_R_BADDB (ISC_RESULTCLASS_DNS + 33) +#define DNS_R_ZONECUT (ISC_RESULTCLASS_DNS + 34) +#define DNS_R_BADZONE (ISC_RESULTCLASS_DNS + 35) +#define DNS_R_MOREDATA (ISC_RESULTCLASS_DNS + 36) +#define DNS_R_UPTODATE (ISC_RESULTCLASS_DNS + 37) #define DNS_R_TSIGVERIFYFAILURE (ISC_RESULTCLASS_DNS + 38) -#define DNS_R_TSIGERRORSET (ISC_RESULTCLASS_DNS + 39) -#define DNS_R_SIGINVALID (ISC_RESULTCLASS_DNS + 40) -#define DNS_R_SIGEXPIRED (ISC_RESULTCLASS_DNS + 41) -#define DNS_R_SIGFUTURE (ISC_RESULTCLASS_DNS + 42) -#define DNS_R_KEYUNAUTHORIZED (ISC_RESULTCLASS_DNS + 43) -#define DNS_R_INVALIDTIME (ISC_RESULTCLASS_DNS + 44) -#define DNS_R_EXPECTEDTSIG (ISC_RESULTCLASS_DNS + 45) -#define DNS_R_UNEXPECTEDTSIG (ISC_RESULTCLASS_DNS + 46) -#define DNS_R_INVALIDTKEY (ISC_RESULTCLASS_DNS + 47) -#define DNS_R_HINT (ISC_RESULTCLASS_DNS + 48) -#define DNS_R_DROP (ISC_RESULTCLASS_DNS + 49) -#define DNS_R_NOTLOADED (ISC_RESULTCLASS_DNS + 50) -#define DNS_R_NCACHENXDOMAIN (ISC_RESULTCLASS_DNS + 51) -#define DNS_R_NCACHENXRRSET (ISC_RESULTCLASS_DNS + 52) -#define DNS_R_WAIT (ISC_RESULTCLASS_DNS + 53) -#define DNS_R_NOTVERIFIEDYET (ISC_RESULTCLASS_DNS + 54) -#define DNS_R_NOIDENTITY (ISC_RESULTCLASS_DNS + 55) -#define DNS_R_NOJOURNAL (ISC_RESULTCLASS_DNS + 56) -#define DNS_R_ALIAS (ISC_RESULTCLASS_DNS + 57) -#define DNS_R_USETCP (ISC_RESULTCLASS_DNS + 58) -#define DNS_R_NOVALIDSIG (ISC_RESULTCLASS_DNS + 59) -#define DNS_R_NOVALIDNSEC (ISC_RESULTCLASS_DNS + 60) -#define DNS_R_NOTINSECURE (ISC_RESULTCLASS_DNS + 61) -#define DNS_R_UNKNOWNSERVICE (ISC_RESULTCLASS_DNS + 62) -#define DNS_R_RECOVERABLE (ISC_RESULTCLASS_DNS + 63) -#define DNS_R_UNKNOWNOPT (ISC_RESULTCLASS_DNS + 64) -#define DNS_R_UNEXPECTEDID (ISC_RESULTCLASS_DNS + 65) -#define DNS_R_SEENINCLUDE (ISC_RESULTCLASS_DNS + 66) -#define DNS_R_NOTEXACT (ISC_RESULTCLASS_DNS + 67) -#define DNS_R_BLACKHOLED (ISC_RESULTCLASS_DNS + 68) -#define DNS_R_BADALG (ISC_RESULTCLASS_DNS + 69) -#define DNS_R_METATYPE (ISC_RESULTCLASS_DNS + 70) -#define DNS_R_CNAMEANDOTHER (ISC_RESULTCLASS_DNS + 71) -#define DNS_R_SINGLETON (ISC_RESULTCLASS_DNS + 72) -#define DNS_R_HINTNXRRSET (ISC_RESULTCLASS_DNS + 73) -#define DNS_R_NOMASTERFILE (ISC_RESULTCLASS_DNS + 74) -#define DNS_R_UNKNOWNPROTO (ISC_RESULTCLASS_DNS + 75) -#define DNS_R_CLOCKSKEW (ISC_RESULTCLASS_DNS + 76) -#define DNS_R_BADIXFR (ISC_RESULTCLASS_DNS + 77) -#define DNS_R_NOTAUTHORITATIVE (ISC_RESULTCLASS_DNS + 78) -#define DNS_R_NOVALIDKEY (ISC_RESULTCLASS_DNS + 79) -#define DNS_R_OBSOLETE (ISC_RESULTCLASS_DNS + 80) -#define DNS_R_FROZEN (ISC_RESULTCLASS_DNS + 81) -#define DNS_R_UNKNOWNFLAG (ISC_RESULTCLASS_DNS + 82) -#define DNS_R_EXPECTEDRESPONSE (ISC_RESULTCLASS_DNS + 83) -#define DNS_R_NOVALIDDS (ISC_RESULTCLASS_DNS + 84) -#define DNS_R_NSISADDRESS (ISC_RESULTCLASS_DNS + 85) -#define DNS_R_REMOTEFORMERR (ISC_RESULTCLASS_DNS + 86) -#define DNS_R_TRUNCATEDTCP (ISC_RESULTCLASS_DNS + 87) -#define DNS_R_LAME (ISC_RESULTCLASS_DNS + 88) -#define DNS_R_UNEXPECTEDRCODE (ISC_RESULTCLASS_DNS + 89) -#define DNS_R_UNEXPECTEDOPCODE (ISC_RESULTCLASS_DNS + 90) -#define DNS_R_CHASEDSSERVERS (ISC_RESULTCLASS_DNS + 91) -#define DNS_R_EMPTYNAME (ISC_RESULTCLASS_DNS + 92) -#define DNS_R_EMPTYWILD (ISC_RESULTCLASS_DNS + 93) -#define DNS_R_BADBITMAP (ISC_RESULTCLASS_DNS + 94) -#define DNS_R_FROMWILDCARD (ISC_RESULTCLASS_DNS + 95) -#define DNS_R_BADOWNERNAME (ISC_RESULTCLASS_DNS + 96) -#define DNS_R_BADNAME (ISC_RESULTCLASS_DNS + 97) -#define DNS_R_DYNAMIC (ISC_RESULTCLASS_DNS + 98) -#define DNS_R_UNKNOWNCOMMAND (ISC_RESULTCLASS_DNS + 99) -#define DNS_R_MUSTBESECURE (ISC_RESULTCLASS_DNS + 100) -#define DNS_R_COVERINGNSEC (ISC_RESULTCLASS_DNS + 101) -#define DNS_R_MXISADDRESS (ISC_RESULTCLASS_DNS + 102) -#define DNS_R_DUPLICATE (ISC_RESULTCLASS_DNS + 103) -#define DNS_R_INVALIDNSEC3 (ISC_RESULTCLASS_DNS + 104) -#define DNS_R_NOTMASTER (ISC_RESULTCLASS_DNS + 105) -#define DNS_R_BROKENCHAIN (ISC_RESULTCLASS_DNS + 106) -#define DNS_R_EXPIRED (ISC_RESULTCLASS_DNS + 107) -#define DNS_R_NOTDYNAMIC (ISC_RESULTCLASS_DNS + 108) -#define DNS_R_BADEUI (ISC_RESULTCLASS_DNS + 109) -#define DNS_R_NTACOVERED (ISC_RESULTCLASS_DNS + 110) -#define DNS_R_BADCDS (ISC_RESULTCLASS_DNS + 111) -#define DNS_R_BADCDNSKEY (ISC_RESULTCLASS_DNS + 112) -#define DNS_R_OPTERR (ISC_RESULTCLASS_DNS + 113) -#define DNS_R_BADDNSTAP (ISC_RESULTCLASS_DNS + 114) -#define DNS_R_BADTSIG (ISC_RESULTCLASS_DNS + 115) -#define DNS_R_BADSIG0 (ISC_RESULTCLASS_DNS + 116) -#define DNS_R_TOOMANYRECORDS (ISC_RESULTCLASS_DNS + 117) -#define DNS_R_VERIFYFAILURE (ISC_RESULTCLASS_DNS + 118) +#define DNS_R_TSIGERRORSET (ISC_RESULTCLASS_DNS + 39) +#define DNS_R_SIGINVALID (ISC_RESULTCLASS_DNS + 40) +#define DNS_R_SIGEXPIRED (ISC_RESULTCLASS_DNS + 41) +#define DNS_R_SIGFUTURE (ISC_RESULTCLASS_DNS + 42) +#define DNS_R_KEYUNAUTHORIZED (ISC_RESULTCLASS_DNS + 43) +#define DNS_R_INVALIDTIME (ISC_RESULTCLASS_DNS + 44) +#define DNS_R_EXPECTEDTSIG (ISC_RESULTCLASS_DNS + 45) +#define DNS_R_UNEXPECTEDTSIG (ISC_RESULTCLASS_DNS + 46) +#define DNS_R_INVALIDTKEY (ISC_RESULTCLASS_DNS + 47) +#define DNS_R_HINT (ISC_RESULTCLASS_DNS + 48) +#define DNS_R_DROP (ISC_RESULTCLASS_DNS + 49) +#define DNS_R_NOTLOADED (ISC_RESULTCLASS_DNS + 50) +#define DNS_R_NCACHENXDOMAIN (ISC_RESULTCLASS_DNS + 51) +#define DNS_R_NCACHENXRRSET (ISC_RESULTCLASS_DNS + 52) +#define DNS_R_WAIT (ISC_RESULTCLASS_DNS + 53) +#define DNS_R_NOTVERIFIEDYET (ISC_RESULTCLASS_DNS + 54) +#define DNS_R_NOIDENTITY (ISC_RESULTCLASS_DNS + 55) +#define DNS_R_NOJOURNAL (ISC_RESULTCLASS_DNS + 56) +#define DNS_R_ALIAS (ISC_RESULTCLASS_DNS + 57) +#define DNS_R_USETCP (ISC_RESULTCLASS_DNS + 58) +#define DNS_R_NOVALIDSIG (ISC_RESULTCLASS_DNS + 59) +#define DNS_R_NOVALIDNSEC (ISC_RESULTCLASS_DNS + 60) +#define DNS_R_NOTINSECURE (ISC_RESULTCLASS_DNS + 61) +#define DNS_R_UNKNOWNSERVICE (ISC_RESULTCLASS_DNS + 62) +#define DNS_R_RECOVERABLE (ISC_RESULTCLASS_DNS + 63) +#define DNS_R_UNKNOWNOPT (ISC_RESULTCLASS_DNS + 64) +#define DNS_R_UNEXPECTEDID (ISC_RESULTCLASS_DNS + 65) +#define DNS_R_SEENINCLUDE (ISC_RESULTCLASS_DNS + 66) +#define DNS_R_NOTEXACT (ISC_RESULTCLASS_DNS + 67) +#define DNS_R_BLACKHOLED (ISC_RESULTCLASS_DNS + 68) +#define DNS_R_BADALG (ISC_RESULTCLASS_DNS + 69) +#define DNS_R_METATYPE (ISC_RESULTCLASS_DNS + 70) +#define DNS_R_CNAMEANDOTHER (ISC_RESULTCLASS_DNS + 71) +#define DNS_R_SINGLETON (ISC_RESULTCLASS_DNS + 72) +#define DNS_R_HINTNXRRSET (ISC_RESULTCLASS_DNS + 73) +#define DNS_R_NOMASTERFILE (ISC_RESULTCLASS_DNS + 74) +#define DNS_R_UNKNOWNPROTO (ISC_RESULTCLASS_DNS + 75) +#define DNS_R_CLOCKSKEW (ISC_RESULTCLASS_DNS + 76) +#define DNS_R_BADIXFR (ISC_RESULTCLASS_DNS + 77) +#define DNS_R_NOTAUTHORITATIVE (ISC_RESULTCLASS_DNS + 78) +#define DNS_R_NOVALIDKEY (ISC_RESULTCLASS_DNS + 79) +#define DNS_R_OBSOLETE (ISC_RESULTCLASS_DNS + 80) +#define DNS_R_FROZEN (ISC_RESULTCLASS_DNS + 81) +#define DNS_R_UNKNOWNFLAG (ISC_RESULTCLASS_DNS + 82) +#define DNS_R_EXPECTEDRESPONSE (ISC_RESULTCLASS_DNS + 83) +#define DNS_R_NOVALIDDS (ISC_RESULTCLASS_DNS + 84) +#define DNS_R_NSISADDRESS (ISC_RESULTCLASS_DNS + 85) +#define DNS_R_REMOTEFORMERR (ISC_RESULTCLASS_DNS + 86) +#define DNS_R_TRUNCATEDTCP (ISC_RESULTCLASS_DNS + 87) +#define DNS_R_LAME (ISC_RESULTCLASS_DNS + 88) +#define DNS_R_UNEXPECTEDRCODE (ISC_RESULTCLASS_DNS + 89) +#define DNS_R_UNEXPECTEDOPCODE (ISC_RESULTCLASS_DNS + 90) +#define DNS_R_CHASEDSSERVERS (ISC_RESULTCLASS_DNS + 91) +#define DNS_R_EMPTYNAME (ISC_RESULTCLASS_DNS + 92) +#define DNS_R_EMPTYWILD (ISC_RESULTCLASS_DNS + 93) +#define DNS_R_BADBITMAP (ISC_RESULTCLASS_DNS + 94) +#define DNS_R_FROMWILDCARD (ISC_RESULTCLASS_DNS + 95) +#define DNS_R_BADOWNERNAME (ISC_RESULTCLASS_DNS + 96) +#define DNS_R_BADNAME (ISC_RESULTCLASS_DNS + 97) +#define DNS_R_DYNAMIC (ISC_RESULTCLASS_DNS + 98) +#define DNS_R_UNKNOWNCOMMAND (ISC_RESULTCLASS_DNS + 99) +#define DNS_R_MUSTBESECURE (ISC_RESULTCLASS_DNS + 100) +#define DNS_R_COVERINGNSEC (ISC_RESULTCLASS_DNS + 101) +#define DNS_R_MXISADDRESS (ISC_RESULTCLASS_DNS + 102) +#define DNS_R_DUPLICATE (ISC_RESULTCLASS_DNS + 103) +#define DNS_R_INVALIDNSEC3 (ISC_RESULTCLASS_DNS + 104) +#define DNS_R_NOTMASTER (ISC_RESULTCLASS_DNS + 105) +#define DNS_R_BROKENCHAIN (ISC_RESULTCLASS_DNS + 106) +#define DNS_R_EXPIRED (ISC_RESULTCLASS_DNS + 107) +#define DNS_R_NOTDYNAMIC (ISC_RESULTCLASS_DNS + 108) +#define DNS_R_BADEUI (ISC_RESULTCLASS_DNS + 109) +#define DNS_R_NTACOVERED (ISC_RESULTCLASS_DNS + 110) +#define DNS_R_BADCDS (ISC_RESULTCLASS_DNS + 111) +#define DNS_R_BADCDNSKEY (ISC_RESULTCLASS_DNS + 112) +#define DNS_R_OPTERR (ISC_RESULTCLASS_DNS + 113) +#define DNS_R_BADDNSTAP (ISC_RESULTCLASS_DNS + 114) +#define DNS_R_BADTSIG (ISC_RESULTCLASS_DNS + 115) +#define DNS_R_BADSIG0 (ISC_RESULTCLASS_DNS + 116) +#define DNS_R_TOOMANYRECORDS (ISC_RESULTCLASS_DNS + 117) +#define DNS_R_VERIFYFAILURE (ISC_RESULTCLASS_DNS + 118) #define DNS_R_NRESULTS 119 /*%< Number of results */ @@ -163,23 +163,23 @@ * By making these their own class we can easily convert them into the * wire-format rcode value simply by masking off the resultclass. */ -#define DNS_R_NOERROR (ISC_RESULTCLASS_DNSRCODE + 0) -#define DNS_R_FORMERR (ISC_RESULTCLASS_DNSRCODE + 1) +#define DNS_R_NOERROR (ISC_RESULTCLASS_DNSRCODE + 0) +#define DNS_R_FORMERR (ISC_RESULTCLASS_DNSRCODE + 1) #define DNS_R_SERVFAIL (ISC_RESULTCLASS_DNSRCODE + 2) #define DNS_R_NXDOMAIN (ISC_RESULTCLASS_DNSRCODE + 3) -#define DNS_R_NOTIMP (ISC_RESULTCLASS_DNSRCODE + 4) -#define DNS_R_REFUSED (ISC_RESULTCLASS_DNSRCODE + 5) +#define DNS_R_NOTIMP (ISC_RESULTCLASS_DNSRCODE + 4) +#define DNS_R_REFUSED (ISC_RESULTCLASS_DNSRCODE + 5) #define DNS_R_YXDOMAIN (ISC_RESULTCLASS_DNSRCODE + 6) -#define DNS_R_YXRRSET (ISC_RESULTCLASS_DNSRCODE + 7) -#define DNS_R_NXRRSET (ISC_RESULTCLASS_DNSRCODE + 8) -#define DNS_R_NOTAUTH (ISC_RESULTCLASS_DNSRCODE + 9) -#define DNS_R_NOTZONE (ISC_RESULTCLASS_DNSRCODE + 10) -#define DNS_R_RCODE11 (ISC_RESULTCLASS_DNSRCODE + 11) -#define DNS_R_RCODE12 (ISC_RESULTCLASS_DNSRCODE + 12) -#define DNS_R_RCODE13 (ISC_RESULTCLASS_DNSRCODE + 13) -#define DNS_R_RCODE14 (ISC_RESULTCLASS_DNSRCODE + 14) -#define DNS_R_RCODE15 (ISC_RESULTCLASS_DNSRCODE + 15) -#define DNS_R_BADVERS (ISC_RESULTCLASS_DNSRCODE + 16) +#define DNS_R_YXRRSET (ISC_RESULTCLASS_DNSRCODE + 7) +#define DNS_R_NXRRSET (ISC_RESULTCLASS_DNSRCODE + 8) +#define DNS_R_NOTAUTH (ISC_RESULTCLASS_DNSRCODE + 9) +#define DNS_R_NOTZONE (ISC_RESULTCLASS_DNSRCODE + 10) +#define DNS_R_RCODE11 (ISC_RESULTCLASS_DNSRCODE + 11) +#define DNS_R_RCODE12 (ISC_RESULTCLASS_DNSRCODE + 12) +#define DNS_R_RCODE13 (ISC_RESULTCLASS_DNSRCODE + 13) +#define DNS_R_RCODE14 (ISC_RESULTCLASS_DNSRCODE + 14) +#define DNS_R_RCODE15 (ISC_RESULTCLASS_DNSRCODE + 15) +#define DNS_R_BADVERS (ISC_RESULTCLASS_DNSRCODE + 16) #define DNS_R_NRCODERESULTS 17 /*%< Number of rcode results */ diff --git a/lib/dns/include/dns/rpz.h b/lib/dns/include/dns/rpz.h index bbab50b3e0..4e834d7fe4 100644 --- a/lib/dns/include/dns/rpz.h +++ b/lib/dns/include/dns/rpz.h @@ -35,14 +35,14 @@ ISC_LANG_BEGINDECLS * Sub-zones of various trigger types. */ #define DNS_RPZ_CLIENT_IP_ZONE DNS_RPZ_PREFIX "client-ip" -#define DNS_RPZ_IP_ZONE DNS_RPZ_PREFIX "ip" -#define DNS_RPZ_NSIP_ZONE DNS_RPZ_PREFIX "nsip" -#define DNS_RPZ_NSDNAME_ZONE DNS_RPZ_PREFIX "nsdname" +#define DNS_RPZ_IP_ZONE DNS_RPZ_PREFIX "ip" +#define DNS_RPZ_NSIP_ZONE DNS_RPZ_PREFIX "nsip" +#define DNS_RPZ_NSDNAME_ZONE DNS_RPZ_PREFIX "nsdname" /* * Special policies. */ #define DNS_RPZ_PASSTHRU_NAME DNS_RPZ_PREFIX "passthru" -#define DNS_RPZ_DROP_NAME DNS_RPZ_PREFIX "drop" +#define DNS_RPZ_DROP_NAME DNS_RPZ_PREFIX "drop" #define DNS_RPZ_TCP_ONLY_NAME DNS_RPZ_PREFIX "tcp-only" typedef uint8_t dns_rpz_prefix_t; @@ -279,14 +279,14 @@ struct dns_rpz_zones { */ typedef struct { unsigned int state; -#define DNS_RPZ_REWRITTEN 0x0001 +#define DNS_RPZ_REWRITTEN 0x0001 #define DNS_RPZ_DONE_CLIENT_IP 0x0002 /* client IP address checked */ -#define DNS_RPZ_DONE_QNAME 0x0004 /* qname checked */ -#define DNS_RPZ_DONE_QNAME_IP 0x0008 /* IP addresses of qname checked */ -#define DNS_RPZ_DONE_NSDNAME 0x0010 /* NS name missed; checking addresses */ -#define DNS_RPZ_DONE_IPv4 0x0020 -#define DNS_RPZ_RECURSING 0x0040 -#define DNS_RPZ_ACTIVE 0x0080 +#define DNS_RPZ_DONE_QNAME 0x0004 /* qname checked */ +#define DNS_RPZ_DONE_QNAME_IP 0x0008 /* IP addresses of qname checked */ +#define DNS_RPZ_DONE_NSDNAME 0x0010 /* NS name missed; checking addresses */ +#define DNS_RPZ_DONE_IPv4 0x0020 +#define DNS_RPZ_RECURSING 0x0040 +#define DNS_RPZ_ACTIVE 0x0080 /* * Best match so far. */ @@ -358,19 +358,19 @@ typedef struct { dns_fixedname_t _fnamef; } dns_rpz_st_t; -#define DNS_RPZ_TTL_DEFAULT 5 -#define DNS_RPZ_MAX_TTL_DEFAULT DNS_RPZ_TTL_DEFAULT +#define DNS_RPZ_TTL_DEFAULT 5 +#define DNS_RPZ_MAX_TTL_DEFAULT DNS_RPZ_TTL_DEFAULT #define DNS_RPZ_MINUPDATEINTERVAL_DEFAULT 60 /* * So various response policy zone messages can be turned up or down. */ -#define DNS_RPZ_ERROR_LEVEL ISC_LOG_WARNING -#define DNS_RPZ_INFO_LEVEL ISC_LOG_INFO +#define DNS_RPZ_ERROR_LEVEL ISC_LOG_WARNING +#define DNS_RPZ_INFO_LEVEL ISC_LOG_INFO #define DNS_RPZ_DEBUG_LEVEL1 ISC_LOG_DEBUG(1) #define DNS_RPZ_DEBUG_LEVEL2 ISC_LOG_DEBUG(2) #define DNS_RPZ_DEBUG_LEVEL3 ISC_LOG_DEBUG(3) -#define DNS_RPZ_DEBUG_QUIET (DNS_RPZ_DEBUG_LEVEL3 + 1) +#define DNS_RPZ_DEBUG_QUIET (DNS_RPZ_DEBUG_LEVEL3 + 1) const char * dns_rpz_type2str(dns_rpz_type_t type); diff --git a/lib/dns/include/dns/rriterator.h b/lib/dns/include/dns/rriterator.h index 6c70233578..a5a6040674 100644 --- a/lib/dns/include/dns/rriterator.h +++ b/lib/dns/include/dns/rriterator.h @@ -65,7 +65,7 @@ typedef struct dns_rriterator { dns_rdata_t rdata; } dns_rriterator_t; -#define RRITERATOR_MAGIC ISC_MAGIC('R', 'R', 'I', 't') +#define RRITERATOR_MAGIC ISC_MAGIC('R', 'R', 'I', 't') #define VALID_RRITERATOR(m) ISC_MAGIC_VALID(m, RRITERATOR_MAGIC) isc_result_t diff --git a/lib/dns/include/dns/rrl.h b/lib/dns/include/dns/rrl.h index d33c9a32f8..f670def9e5 100644 --- a/lib/dns/include/dns/rrl.h +++ b/lib/dns/include/dns/rrl.h @@ -127,11 +127,11 @@ struct dns_rrl_entry { }; #define DNS_RRL_MAX_TIME_TRAVEL 5 -#define DNS_RRL_FOREVER (1 << DNS_RRL_TS_BITS) -#define DNS_RRL_MAX_TS (DNS_RRL_FOREVER - 1) +#define DNS_RRL_FOREVER (1 << DNS_RRL_TS_BITS) +#define DNS_RRL_MAX_TS (DNS_RRL_FOREVER - 1) #define DNS_RRL_MAX_RESPONSES ((1 << (DNS_RRL_RESPONSE_BITS - 1)) - 1) -#define DNS_RRL_MAX_WINDOW 3600 +#define DNS_RRL_MAX_WINDOW 3600 #if DNS_RRL_MAX_WINDOW >= DNS_RRL_MAX_TS #error "DNS_RRL_MAX_WINDOW is too large" #endif /* if DNS_RRL_MAX_WINDOW >= DNS_RRL_MAX_TS */ diff --git a/lib/dns/include/dns/sdb.h b/lib/dns/include/dns/sdb.h index 5187772ed8..bfa7be2a86 100644 --- a/lib/dns/include/dns/sdb.h +++ b/lib/dns/include/dns/sdb.h @@ -93,8 +93,8 @@ ISC_LANG_BEGINDECLS #define DNS_SDBFLAG_RELATIVEOWNER 0x00000001U #define DNS_SDBFLAG_RELATIVERDATA 0x00000002U -#define DNS_SDBFLAG_THREADSAFE 0x00000004U -#define DNS_SDBFLAG_DNS64 0x00000008U +#define DNS_SDBFLAG_THREADSAFE 0x00000004U +#define DNS_SDBFLAG_DNS64 0x00000008U isc_result_t dns_sdb_register(const char *drivername, const dns_sdbmethods_t *methods, diff --git a/lib/dns/include/dns/sdlz.h b/lib/dns/include/dns/sdlz.h index 5e46514d16..b672f8fd27 100644 --- a/lib/dns/include/dns/sdlz.h +++ b/lib/dns/include/dns/sdlz.h @@ -57,7 +57,7 @@ ISC_LANG_BEGINDECLS -#define DNS_SDLZFLAG_THREADSAFE 0x00000001U +#define DNS_SDLZFLAG_THREADSAFE 0x00000001U #define DNS_SDLZFLAG_RELATIVEOWNER 0x00000002U #define DNS_SDLZFLAG_RELATIVERDATA 0x00000004U diff --git a/lib/dns/include/dns/stats.h b/lib/dns/include/dns/stats.h index f4374e9bd7..4526e68e2d 100644 --- a/lib/dns/include/dns/stats.h +++ b/lib/dns/include/dns/stats.h @@ -479,16 +479,16 @@ LIBDNS_EXTERNAL_DATA extern const char *dns_statscounter_names[]; * removal. */ #define DNS_RDATASTATSTYPE_ATTR_OTHERTYPE 0x0001 -#define DNS_RDATASTATSTYPE_ATTR_NXRRSET 0x0002 -#define DNS_RDATASTATSTYPE_ATTR_NXDOMAIN 0x0004 -#define DNS_RDATASTATSTYPE_ATTR_STALE 0x0008 -#define DNS_RDATASTATSTYPE_ATTR_ANCIENT 0x0010 +#define DNS_RDATASTATSTYPE_ATTR_NXRRSET 0x0002 +#define DNS_RDATASTATSTYPE_ATTR_NXDOMAIN 0x0004 +#define DNS_RDATASTATSTYPE_ATTR_STALE 0x0008 +#define DNS_RDATASTATSTYPE_ATTR_ANCIENT 0x0010 /*%< * Conversion macros among dns_rdatatype_t, attributes and isc_statscounter_t. */ -#define DNS_RDATASTATSTYPE_BASE(type) ((dns_rdatatype_t)((type)&0xFFFF)) -#define DNS_RDATASTATSTYPE_ATTR(type) ((type) >> 16) +#define DNS_RDATASTATSTYPE_BASE(type) ((dns_rdatatype_t)((type)&0xFFFF)) +#define DNS_RDATASTATSTYPE_ATTR(type) ((type) >> 16) #define DNS_RDATASTATSTYPE_VALUE(b, a) (((a) << 16) | (b)) /*%< diff --git a/lib/dns/include/dns/tkey.h b/lib/dns/include/dns/tkey.h index e5dd4462a3..b87595ad47 100644 --- a/lib/dns/include/dns/tkey.h +++ b/lib/dns/include/dns/tkey.h @@ -27,11 +27,11 @@ ISC_LANG_BEGINDECLS /* Key agreement modes */ -#define DNS_TKEYMODE_SERVERASSIGNED 1 -#define DNS_TKEYMODE_DIFFIEHELLMAN 2 -#define DNS_TKEYMODE_GSSAPI 3 +#define DNS_TKEYMODE_SERVERASSIGNED 1 +#define DNS_TKEYMODE_DIFFIEHELLMAN 2 +#define DNS_TKEYMODE_GSSAPI 3 #define DNS_TKEYMODE_RESOLVERASSIGNED 4 -#define DNS_TKEYMODE_DELETE 5 +#define DNS_TKEYMODE_DELETE 5 struct dns_tkeyctx { dst_key_t * dhkey; diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h index 5939906a4d..e20e1e505c 100644 --- a/lib/dns/include/dns/types.h +++ b/lib/dns/include/dns/types.h @@ -348,7 +348,7 @@ enum { ((x) == dns_trust_pending_answer || (x) == dns_trust_pending_additional) #define DNS_TRUST_ADDITIONAL(x) \ ((x) == dns_trust_additional || (x) == dns_trust_pending_additional) -#define DNS_TRUST_GLUE(x) ((x) == dns_trust_glue) +#define DNS_TRUST_GLUE(x) ((x) == dns_trust_glue) #define DNS_TRUST_ANSWER(x) ((x) == dns_trust_answer) /*% diff --git a/lib/dns/include/dns/validator.h b/lib/dns/include/dns/validator.h index c56e376190..5959e008db 100644 --- a/lib/dns/include/dns/validator.h +++ b/lib/dns/include/dns/validator.h @@ -102,8 +102,8 @@ typedef struct dns_validatorevent { bool secure; } dns_validatorevent_t; -#define DNS_VALIDATOR_NOQNAMEPROOF 0 -#define DNS_VALIDATOR_NODATAPROOF 1 +#define DNS_VALIDATOR_NOQNAMEPROOF 0 +#define DNS_VALIDATOR_NODATAPROOF 1 #define DNS_VALIDATOR_NOWILDCARDPROOF 2 #define DNS_VALIDATOR_CLOSESTENCLOSER 3 @@ -154,9 +154,9 @@ struct dns_validator { * dns_validator_create() options. */ /* obsolete: #define DNS_VALIDATOR_DLV 0x0001U */ -#define DNS_VALIDATOR_DEFER 0x0002U +#define DNS_VALIDATOR_DEFER 0x0002U #define DNS_VALIDATOR_NOCDFLAG 0x0004U -#define DNS_VALIDATOR_NONTA 0x0008U /*% Ignore NTA table */ +#define DNS_VALIDATOR_NONTA 0x0008U /*% Ignore NTA table */ ISC_LANG_BEGINDECLS diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h index 4a7932fd10..2c5675676b 100644 --- a/lib/dns/include/dns/view.h +++ b/lib/dns/include/dns/view.h @@ -242,7 +242,7 @@ struct dns_view { void (*hooktable_free)(isc_mem_t *, void **); }; -#define DNS_VIEW_MAGIC ISC_MAGIC('V', 'i', 'e', 'w') +#define DNS_VIEW_MAGIC ISC_MAGIC('V', 'i', 'e', 'w') #define DNS_VIEW_VALID(view) ISC_MAGIC_VALID(view, DNS_VIEW_MAGIC) #define DNS_VIEWATTR_RESSHUTDOWN 0x01 diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h index 9c0b3058b1..f209e95bf0 100644 --- a/lib/dns/include/dns/zone.h +++ b/lib/dns/include/dns/zone.h @@ -123,11 +123,11 @@ typedef enum { * exponential backoff */ #endif /* ifndef DNS_ZONE_DEFAULTRETRY */ -#define DNS_ZONESTATE_XFERRUNNING 1 +#define DNS_ZONESTATE_XFERRUNNING 1 #define DNS_ZONESTATE_XFERDEFERRED 2 -#define DNS_ZONESTATE_SOAQUERY 3 -#define DNS_ZONESTATE_ANY 4 -#define DNS_ZONESTATE_AUTOMATIC 5 +#define DNS_ZONESTATE_SOAQUERY 3 +#define DNS_ZONESTATE_ANY 4 +#define DNS_ZONESTATE_AUTOMATIC 5 ISC_LANG_BEGINDECLS diff --git a/lib/dns/include/dns/zt.h b/lib/dns/include/dns/zt.h index b6494deafd..c37437c076 100644 --- a/lib/dns/include/dns/zt.h +++ b/lib/dns/include/dns/zt.h @@ -21,7 +21,7 @@ #include #define DNS_ZTFIND_NOEXACT 0x01 -#define DNS_ZTFIND_MIRROR 0x02 +#define DNS_ZTFIND_MIRROR 0x02 ISC_LANG_BEGINDECLS diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h index 6d5c03523d..d98ac6f504 100644 --- a/lib/dns/include/dst/dst.h +++ b/lib/dns/include/dst/dst.h @@ -77,32 +77,32 @@ typedef enum dst_key_state { } dst_key_state_t; /* DST algorithm codes */ -#define DST_ALG_UNKNOWN 0 -#define DST_ALG_RSA 1 /* Used for parsing RSASHA1, RSASHA256 and RSASHA512 */ -#define DST_ALG_RSAMD5 1 -#define DST_ALG_DH 2 -#define DST_ALG_DSA 3 -#define DST_ALG_ECC 4 -#define DST_ALG_RSASHA1 5 -#define DST_ALG_NSEC3DSA 6 +#define DST_ALG_UNKNOWN 0 +#define DST_ALG_RSA 1 /* Used for parsing RSASHA1, RSASHA256 and RSASHA512 */ +#define DST_ALG_RSAMD5 1 +#define DST_ALG_DH 2 +#define DST_ALG_DSA 3 +#define DST_ALG_ECC 4 +#define DST_ALG_RSASHA1 5 +#define DST_ALG_NSEC3DSA 6 #define DST_ALG_NSEC3RSASHA1 7 -#define DST_ALG_RSASHA256 8 -#define DST_ALG_RSASHA512 10 -#define DST_ALG_ECCGOST 12 -#define DST_ALG_ECDSA256 13 -#define DST_ALG_ECDSA384 14 -#define DST_ALG_ED25519 15 -#define DST_ALG_ED448 16 -#define DST_ALG_HMACMD5 157 -#define DST_ALG_GSSAPI 160 -#define DST_ALG_HMACSHA1 161 /* XXXMPA */ -#define DST_ALG_HMACSHA224 162 /* XXXMPA */ -#define DST_ALG_HMACSHA256 163 /* XXXMPA */ -#define DST_ALG_HMACSHA384 164 /* XXXMPA */ -#define DST_ALG_HMACSHA512 165 /* XXXMPA */ -#define DST_ALG_INDIRECT 252 -#define DST_ALG_PRIVATE 254 -#define DST_MAX_ALGS 256 +#define DST_ALG_RSASHA256 8 +#define DST_ALG_RSASHA512 10 +#define DST_ALG_ECCGOST 12 +#define DST_ALG_ECDSA256 13 +#define DST_ALG_ECDSA384 14 +#define DST_ALG_ED25519 15 +#define DST_ALG_ED448 16 +#define DST_ALG_HMACMD5 157 +#define DST_ALG_GSSAPI 160 +#define DST_ALG_HMACSHA1 161 /* XXXMPA */ +#define DST_ALG_HMACSHA224 162 /* XXXMPA */ +#define DST_ALG_HMACSHA256 163 /* XXXMPA */ +#define DST_ALG_HMACSHA384 164 /* XXXMPA */ +#define DST_ALG_HMACSHA512 165 /* XXXMPA */ +#define DST_ALG_INDIRECT 252 +#define DST_ALG_PRIVATE 254 +#define DST_MAX_ALGS 256 /*% A buffer of this size is large enough to hold any key */ #define DST_KEY_MAXSIZE 1280 @@ -114,46 +114,46 @@ typedef enum dst_key_state { #define DST_KEY_MAXTEXTSIZE 2048 /*% 'Type' for dst_read_key() */ -#define DST_TYPE_KEY 0x1000000 /* KEY key */ +#define DST_TYPE_KEY 0x1000000 /* KEY key */ #define DST_TYPE_PRIVATE 0x2000000 -#define DST_TYPE_PUBLIC 0x4000000 -#define DST_TYPE_STATE 0x8000000 +#define DST_TYPE_PUBLIC 0x4000000 +#define DST_TYPE_STATE 0x8000000 /* Key timing metadata definitions */ -#define DST_TIME_CREATED 0 -#define DST_TIME_PUBLISH 1 -#define DST_TIME_ACTIVATE 2 -#define DST_TIME_REVOKE 3 -#define DST_TIME_INACTIVE 4 -#define DST_TIME_DELETE 5 -#define DST_TIME_DSPUBLISH 6 +#define DST_TIME_CREATED 0 +#define DST_TIME_PUBLISH 1 +#define DST_TIME_ACTIVATE 2 +#define DST_TIME_REVOKE 3 +#define DST_TIME_INACTIVE 4 +#define DST_TIME_DELETE 5 +#define DST_TIME_DSPUBLISH 6 #define DST_TIME_SYNCPUBLISH 7 -#define DST_TIME_SYNCDELETE 8 -#define DST_TIME_DNSKEY 9 -#define DST_TIME_ZRRSIG 10 -#define DST_TIME_KRRSIG 11 -#define DST_TIME_DS 12 -#define DST_MAX_TIMES 12 +#define DST_TIME_SYNCDELETE 8 +#define DST_TIME_DNSKEY 9 +#define DST_TIME_ZRRSIG 10 +#define DST_TIME_KRRSIG 11 +#define DST_TIME_DS 12 +#define DST_MAX_TIMES 12 /* Numeric metadata definitions */ #define DST_NUM_PREDECESSOR 0 -#define DST_NUM_SUCCESSOR 1 -#define DST_NUM_MAXTTL 2 -#define DST_NUM_ROLLPERIOD 3 -#define DST_NUM_LIFETIME 4 -#define DST_MAX_NUMERIC 4 +#define DST_NUM_SUCCESSOR 1 +#define DST_NUM_MAXTTL 2 +#define DST_NUM_ROLLPERIOD 3 +#define DST_NUM_LIFETIME 4 +#define DST_MAX_NUMERIC 4 /* Boolean metadata definitions */ -#define DST_BOOL_KSK 0 -#define DST_BOOL_ZSK 1 +#define DST_BOOL_KSK 0 +#define DST_BOOL_ZSK 1 #define DST_MAX_BOOLEAN 1 /* Key state metadata definitions */ -#define DST_KEY_DNSKEY 0 -#define DST_KEY_ZRRSIG 1 -#define DST_KEY_KRRSIG 2 -#define DST_KEY_DS 3 -#define DST_KEY_GOAL 4 +#define DST_KEY_DNSKEY 0 +#define DST_KEY_ZRRSIG 1 +#define DST_KEY_KRRSIG 2 +#define DST_KEY_DS 3 +#define DST_KEY_GOAL 4 #define DST_MAX_KEYSTATES 4 /* diff --git a/lib/dns/include/dst/result.h b/lib/dns/include/dst/result.h index ab072a8046..48e76584fc 100644 --- a/lib/dns/include/dst/result.h +++ b/lib/dns/include/dst/result.h @@ -26,30 +26,30 @@ #include /* Contractual promise. */ #define DST_R_UNSUPPORTEDALG (ISC_RESULTCLASS_DST + 0) -#define DST_R_CRYPTOFAILURE (ISC_RESULTCLASS_DST + 1) +#define DST_R_CRYPTOFAILURE (ISC_RESULTCLASS_DST + 1) /* compat */ -#define DST_R_OPENSSLFAILURE DST_R_CRYPTOFAILURE -#define DST_R_NOCRYPTO (ISC_RESULTCLASS_DST + 2) -#define DST_R_NULLKEY (ISC_RESULTCLASS_DST + 3) -#define DST_R_INVALIDPUBLICKEY (ISC_RESULTCLASS_DST + 4) +#define DST_R_OPENSSLFAILURE DST_R_CRYPTOFAILURE +#define DST_R_NOCRYPTO (ISC_RESULTCLASS_DST + 2) +#define DST_R_NULLKEY (ISC_RESULTCLASS_DST + 3) +#define DST_R_INVALIDPUBLICKEY (ISC_RESULTCLASS_DST + 4) #define DST_R_INVALIDPRIVATEKEY (ISC_RESULTCLASS_DST + 5) /* 6 is unused */ -#define DST_R_WRITEERROR (ISC_RESULTCLASS_DST + 7) +#define DST_R_WRITEERROR (ISC_RESULTCLASS_DST + 7) #define DST_R_INVALIDPARAM (ISC_RESULTCLASS_DST + 8) /* 9 is unused */ /* 10 is unused */ #define DST_R_SIGNFAILURE (ISC_RESULTCLASS_DST + 11) /* 12 is unused */ /* 13 is unused */ -#define DST_R_VERIFYFAILURE (ISC_RESULTCLASS_DST + 14) -#define DST_R_NOTPUBLICKEY (ISC_RESULTCLASS_DST + 15) -#define DST_R_NOTPRIVATEKEY (ISC_RESULTCLASS_DST + 16) +#define DST_R_VERIFYFAILURE (ISC_RESULTCLASS_DST + 14) +#define DST_R_NOTPUBLICKEY (ISC_RESULTCLASS_DST + 15) +#define DST_R_NOTPRIVATEKEY (ISC_RESULTCLASS_DST + 16) #define DST_R_KEYCANNOTCOMPUTESECRET (ISC_RESULTCLASS_DST + 17) -#define DST_R_COMPUTESECRETFAILURE (ISC_RESULTCLASS_DST + 18) -#define DST_R_NORANDOMNESS (ISC_RESULTCLASS_DST + 19) -#define DST_R_BADKEYTYPE (ISC_RESULTCLASS_DST + 20) -#define DST_R_NOENGINE (ISC_RESULTCLASS_DST + 21) -#define DST_R_EXTERNALKEY (ISC_RESULTCLASS_DST + 22) +#define DST_R_COMPUTESECRETFAILURE (ISC_RESULTCLASS_DST + 18) +#define DST_R_NORANDOMNESS (ISC_RESULTCLASS_DST + 19) +#define DST_R_BADKEYTYPE (ISC_RESULTCLASS_DST + 20) +#define DST_R_NOENGINE (ISC_RESULTCLASS_DST + 21) +#define DST_R_EXTERNALKEY (ISC_RESULTCLASS_DST + 22) #define DST_R_NRESULTS 23 /* Number of results */ diff --git a/lib/dns/ipkeylist.c b/lib/dns/ipkeylist.c index 7d8af68b81..df79973b94 100644 --- a/lib/dns/ipkeylist.c +++ b/lib/dns/ipkeylist.c @@ -20,8 +20,7 @@ #include void -dns_ipkeylist_init(dns_ipkeylist_t *ipkl) -{ +dns_ipkeylist_init(dns_ipkeylist_t *ipkl) { ipkl->count = 0; ipkl->allocated = 0; ipkl->addrs = NULL; @@ -31,8 +30,7 @@ dns_ipkeylist_init(dns_ipkeylist_t *ipkl) } void -dns_ipkeylist_clear(isc_mem_t *mctx, dns_ipkeylist_t *ipkl) -{ +dns_ipkeylist_clear(isc_mem_t *mctx, dns_ipkeylist_t *ipkl) { uint32_t i; REQUIRE(ipkl != NULL); @@ -84,10 +82,9 @@ dns_ipkeylist_clear(isc_mem_t *mctx, dns_ipkeylist_t *ipkl) isc_result_t dns_ipkeylist_copy(isc_mem_t *mctx, const dns_ipkeylist_t *src, - dns_ipkeylist_t *dst) -{ + dns_ipkeylist_t *dst) { isc_result_t result = ISC_R_SUCCESS; - uint32_t i; + uint32_t i; REQUIRE(dst != NULL); /* dst might be preallocated, we don't care, but it must be empty */ @@ -112,8 +109,8 @@ dns_ipkeylist_copy(isc_mem_t *mctx, const dns_ipkeylist_t *src, if (src->keys != NULL) { for (i = 0; i < src->count; i++) { if (src->keys[i] != NULL) { - dst->keys[i] = - isc_mem_get(mctx, sizeof(dns_name_t)); + dst->keys[i] = isc_mem_get(mctx, + sizeof(dns_name_t)); dns_name_init(dst->keys[i], NULL); dns_name_dup(src->keys[i], mctx, dst->keys[i]); } else { @@ -140,12 +137,11 @@ dns_ipkeylist_copy(isc_mem_t *mctx, const dns_ipkeylist_t *src, } isc_result_t -dns_ipkeylist_resize(isc_mem_t *mctx, dns_ipkeylist_t *ipkl, unsigned int n) -{ +dns_ipkeylist_resize(isc_mem_t *mctx, dns_ipkeylist_t *ipkl, unsigned int n) { isc_sockaddr_t *addrs = NULL; - isc_dscp_t * dscps = NULL; - dns_name_t ** keys = NULL; - dns_name_t ** labels = NULL; + isc_dscp_t *dscps = NULL; + dns_name_t **keys = NULL; + dns_name_t **labels = NULL; REQUIRE(ipkl != NULL); REQUIRE(n > ipkl->count); diff --git a/lib/dns/iptable.c b/lib/dns/iptable.c index b8a6601e8b..c16862e634 100644 --- a/lib/dns/iptable.c +++ b/lib/dns/iptable.c @@ -18,16 +18,14 @@ #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 */ isc_result_t -dns_iptable_create(isc_mem_t *mctx, dns_iptable_t **target) -{ - isc_result_t result; +dns_iptable_create(isc_mem_t *mctx, dns_iptable_t **target) { + isc_result_t result; dns_iptable_t *tab; tab = isc_mem_get(mctx, sizeof(*tab)); @@ -58,12 +56,11 @@ static bool dns_iptable_pos = true; */ isc_result_t dns_iptable_addprefix(dns_iptable_t *tab, const isc_netaddr_t *addr, - uint16_t bitlen, bool pos) -{ - isc_result_t result; - isc_prefix_t pfx; + uint16_t bitlen, bool pos) { + isc_result_t result; + isc_prefix_t pfx; isc_radix_node_t *node = NULL; - int i; + int i; INSIST(DNS_IPTABLE_VALID(tab)); INSIST(tab->radix != NULL); @@ -103,14 +100,12 @@ dns_iptable_addprefix(dns_iptable_t *tab, const isc_netaddr_t *addr, * Merge one IP table into another one. */ isc_result_t -dns_iptable_merge(dns_iptable_t *tab, dns_iptable_t *source, bool pos) -{ - isc_result_t result; +dns_iptable_merge(dns_iptable_t *tab, dns_iptable_t *source, bool pos) { + isc_result_t result; isc_radix_node_t *node, *new_node; - int i, max_node = 0; + int i, max_node = 0; - RADIX_WALK(source->radix->head, node) - { + RADIX_WALK(source->radix->head, node) { new_node = NULL; result = isc_radix_insert(tab->radix, &new_node, node, NULL); @@ -144,16 +139,14 @@ dns_iptable_merge(dns_iptable_t *tab, dns_iptable_t *source, bool pos) } void -dns_iptable_attach(dns_iptable_t *source, dns_iptable_t **target) -{ +dns_iptable_attach(dns_iptable_t *source, dns_iptable_t **target) { REQUIRE(DNS_IPTABLE_VALID(source)); isc_refcount_increment(&source->refcount); *target = source; } void -dns_iptable_detach(dns_iptable_t **tabp) -{ +dns_iptable_detach(dns_iptable_t **tabp) { REQUIRE(tabp != NULL && DNS_IPTABLE_VALID(*tabp)); dns_iptable_t *tab = *tabp; *tabp = NULL; @@ -165,8 +158,7 @@ dns_iptable_detach(dns_iptable_t **tabp) } static void -destroy_iptable(dns_iptable_t *dtab) -{ +destroy_iptable(dns_iptable_t *dtab) { REQUIRE(DNS_IPTABLE_VALID(dtab)); if (dtab->radix != NULL) { diff --git a/lib/dns/journal.c b/lib/dns/journal.c index 60f271a2c3..96c3ce1442 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -103,18 +103,15 @@ #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) -{ +decode_uint32(unsigned char *p) { return ((p[0] << 24) + (p[1] << 16) + (p[2] << 8) + (p[3] << 0)); } static inline void -encode_uint32(uint32_t val, unsigned char *p) -{ +encode_uint32(uint32_t val, unsigned char *p) { p[0] = (uint8_t)(val >> 24); p[1] = (uint8_t)(val >> 16); p[2] = (uint8_t)(val >> 8); @@ -123,14 +120,13 @@ encode_uint32(uint32_t val, unsigned char *p) isc_result_t dns_db_createsoatuple(dns_db_t *db, dns_dbversion_t *ver, isc_mem_t *mctx, - dns_diffop_t op, dns_difftuple_t **tp) -{ - isc_result_t result; - dns_dbnode_t * node; - dns_rdataset_t rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_diffop_t op, dns_difftuple_t **tp) { + isc_result_t result; + dns_dbnode_t *node; + dns_rdataset_t rdataset; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_fixedname_t fixed; - dns_name_t * zonename; + dns_name_t *zonename; zonename = dns_fixedname_initname(&fixed); dns_name_copynf(dns_db_origin(db), zonename); @@ -240,20 +236,20 @@ typedef struct { * The in-core representation of the journal header. */ typedef struct { - uint32_t serial; + uint32_t serial; isc_offset_t offset; } journal_pos_t; -#define POS_VALID(pos) ((pos).offset != 0) +#define POS_VALID(pos) ((pos).offset != 0) #define POS_INVALIDATE(pos) ((pos).offset = 0, (pos).serial = 0) typedef struct { unsigned char format[16]; journal_pos_t begin; journal_pos_t end; - uint32_t index_size; - uint32_t sourceserial; - bool serialset; + uint32_t index_size; + uint32_t sourceserial; + bool serialset; } journal_header_t; /*% @@ -299,21 +295,21 @@ typedef enum { } journal_state_t; struct dns_journal { - unsigned int magic; /*%< JOUR */ - isc_mem_t * mctx; /*%< Memory context */ - journal_state_t state; - char * filename; /*%< Journal file name */ - FILE * fp; /*%< File handle */ - isc_offset_t offset; /*%< Current file offset */ - journal_header_t header; /*%< In-core journal header */ - unsigned char * rawindex; /*%< In-core buffer for journal index - * in - * on-disk format */ - journal_pos_t *index; /*%< In-core journal index */ + unsigned int magic; /*%< JOUR */ + isc_mem_t *mctx; /*%< Memory context */ + journal_state_t state; + char *filename; /*%< Journal file name */ + FILE *fp; /*%< File handle */ + isc_offset_t offset; /*%< Current file offset */ + journal_header_t header; /*%< In-core journal header */ + unsigned char *rawindex; /*%< In-core buffer for journal index + * in + * on-disk format */ + journal_pos_t *index; /*%< In-core journal index */ /*% Current transaction state (when writing). */ struct { - unsigned int n_soa; /*%< Number of SOAs seen */ + unsigned int n_soa; /*%< Number of SOAs seen */ journal_pos_t pos[2]; /*%< Begin/end position */ } x; @@ -329,35 +325,32 @@ struct dns_journal { isc_buffer_t target; /*%< Data from _fromwire check * */ dns_decompress_t dctx; /*%< Dummy decompression ctx */ - dns_name_t name; /*%< Current domain name */ - dns_rdata_t rdata; /*%< Current rdata */ - uint32_t ttl; /*%< Current TTL */ - unsigned int xsize; /*%< Size of transaction data */ - unsigned int xpos; /*%< Current position in it */ - isc_result_t result; /*%< Result of last call */ + dns_name_t name; /*%< Current domain name */ + dns_rdata_t rdata; /*%< Current rdata */ + uint32_t ttl; /*%< Current TTL */ + unsigned int xsize; /*%< Size of transaction data */ + unsigned int xpos; /*%< Current position in it */ + isc_result_t result; /*%< Result of last call */ } it; }; -#define DNS_JOURNAL_MAGIC ISC_MAGIC('J', 'O', 'U', 'R') +#define DNS_JOURNAL_MAGIC ISC_MAGIC('J', 'O', 'U', 'R') #define DNS_JOURNAL_VALID(t) ISC_MAGIC_VALID(t, DNS_JOURNAL_MAGIC) static void -journal_pos_decode(journal_rawpos_t *raw, journal_pos_t *cooked) -{ +journal_pos_decode(journal_rawpos_t *raw, journal_pos_t *cooked) { cooked->serial = decode_uint32(raw->serial); cooked->offset = decode_uint32(raw->offset); } static void -journal_pos_encode(journal_rawpos_t *raw, journal_pos_t *cooked) -{ +journal_pos_encode(journal_rawpos_t *raw, journal_pos_t *cooked) { encode_uint32(cooked->serial, raw->serial); encode_uint32(cooked->offset, raw->offset); } static void -journal_header_decode(journal_rawheader_t *raw, journal_header_t *cooked) -{ +journal_header_decode(journal_rawheader_t *raw, journal_header_t *cooked) { INSIST(sizeof(cooked->format) == sizeof(raw->h.format)); memmove(cooked->format, raw->h.format, sizeof(cooked->format)); journal_pos_decode(&raw->h.begin, &cooked->begin); @@ -368,8 +361,7 @@ journal_header_decode(journal_rawheader_t *raw, journal_header_t *cooked) } static void -journal_header_encode(journal_header_t *cooked, journal_rawheader_t *raw) -{ +journal_header_encode(journal_header_t *cooked, journal_rawheader_t *raw) { unsigned char flags = 0; INSIST(sizeof(cooked->format) == sizeof(raw->h.format)); @@ -389,8 +381,7 @@ journal_header_encode(journal_header_t *cooked, journal_rawheader_t *raw) * Journal file I/O subroutines, with error checking and reporting. */ static isc_result_t -journal_seek(dns_journal_t *j, uint32_t offset) -{ +journal_seek(dns_journal_t *j, uint32_t offset) { isc_result_t result; result = isc_stdio_seek(j->fp, (off_t)offset, SEEK_SET); @@ -405,8 +396,7 @@ journal_seek(dns_journal_t *j, uint32_t offset) } static isc_result_t -journal_read(dns_journal_t *j, void *mem, size_t nbytes) -{ +journal_read(dns_journal_t *j, void *mem, size_t nbytes) { isc_result_t result; result = isc_stdio_read(mem, 1, nbytes, j->fp, NULL); @@ -424,8 +414,7 @@ journal_read(dns_journal_t *j, void *mem, size_t nbytes) } static isc_result_t -journal_write(dns_journal_t *j, void *mem, size_t nbytes) -{ +journal_write(dns_journal_t *j, void *mem, size_t nbytes) { isc_result_t result; result = isc_stdio_write(mem, 1, nbytes, j->fp, NULL); @@ -440,8 +429,7 @@ journal_write(dns_journal_t *j, void *mem, size_t nbytes) } static isc_result_t -journal_fsync(dns_journal_t *j) -{ +journal_fsync(dns_journal_t *j) { isc_result_t result; result = isc_stdio_flush(j->fp); if (result != ISC_R_SUCCESS) { @@ -465,10 +453,9 @@ journal_fsync(dns_journal_t *j) */ static isc_result_t -journal_read_xhdr(dns_journal_t *j, journal_xhdr_t *xhdr) -{ +journal_read_xhdr(dns_journal_t *j, journal_xhdr_t *xhdr) { journal_rawxhdr_t raw; - isc_result_t result; + isc_result_t result; result = journal_read(j, &raw, sizeof(raw)); if (result != ISC_R_SUCCESS) { return (result); @@ -481,8 +468,7 @@ journal_read_xhdr(dns_journal_t *j, journal_xhdr_t *xhdr) static isc_result_t journal_write_xhdr(dns_journal_t *j, uint32_t size, uint32_t serial0, - uint32_t serial1) -{ + uint32_t serial1) { journal_rawxhdr_t raw; encode_uint32(size, raw.size); encode_uint32(serial0, raw.serial0); @@ -495,10 +481,9 @@ journal_write_xhdr(dns_journal_t *j, uint32_t size, uint32_t serial0, */ static isc_result_t -journal_read_rrhdr(dns_journal_t *j, journal_rrhdr_t *rrhdr) -{ +journal_read_rrhdr(dns_journal_t *j, journal_rrhdr_t *rrhdr) { journal_rawrrhdr_t raw; - isc_result_t result; + isc_result_t result; result = journal_read(j, &raw, sizeof(raw)); if (result != ISC_R_SUCCESS) { return (result); @@ -508,15 +493,14 @@ journal_read_rrhdr(dns_journal_t *j, journal_rrhdr_t *rrhdr) } static isc_result_t -journal_file_create(isc_mem_t *mctx, const char *filename) -{ - FILE * fp = NULL; - isc_result_t result; - journal_header_t header; +journal_file_create(isc_mem_t *mctx, const char *filename) { + FILE *fp = NULL; + isc_result_t result; + journal_header_t header; journal_rawheader_t rawheader; - int index_size = 56; /* XXX configurable */ - int size; - void * mem; /* Memory for temporary index image. */ + int index_size = 56; /* XXX configurable */ + int size; + void *mem; /* Memory for temporary index image. */ INSIST(sizeof(journal_rawheader_t) == JOURNAL_HEADER_SIZE); @@ -565,12 +549,11 @@ journal_file_create(isc_mem_t *mctx, const char *filename) static isc_result_t journal_open(isc_mem_t *mctx, const char *filename, bool writable, bool create, - dns_journal_t **journalp) -{ - FILE * fp = NULL; - isc_result_t result; + dns_journal_t **journalp) { + FILE *fp = NULL; + isc_result_t result; journal_rawheader_t rawheader; - dns_journal_t * j; + dns_journal_t *j; INSIST(journalp != NULL && *journalp == NULL); j = isc_mem_get(mctx, sizeof(*j)); @@ -622,7 +605,8 @@ journal_open(isc_mem_t *mctx, const char *filename, bool writable, bool create, CHECK(journal_read(j, &rawheader, sizeof(rawheader))); if (memcmp(rawheader.h.format, initial_journal_header.format, - sizeof(initial_journal_header.format)) != 0) { + sizeof(initial_journal_header.format)) != 0) + { isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR, "%s: journal format not recognized", j->filename); FAIL(ISC_R_UNEXPECTED); @@ -634,8 +618,8 @@ journal_open(isc_mem_t *mctx, const char *filename, bool writable, bool create, * allocated buffer and then convert it into a cooked index. */ if (j->header.index_size != 0) { - unsigned int i; - unsigned int rawbytes; + unsigned int i; + unsigned int rawbytes; unsigned char *p; rawbytes = j->header.index_size * sizeof(journal_rawpos_t); @@ -699,12 +683,11 @@ failure: isc_result_t dns_journal_open(isc_mem_t *mctx, const char *filename, unsigned int mode, - dns_journal_t **journalp) -{ + dns_journal_t **journalp) { isc_result_t result; - size_t namelen; - char backup[1024]; - bool writable, create; + size_t namelen; + char backup[1024]; + bool writable, create; create = ((mode & DNS_JOURNAL_CREATE) != 0); writable = ((mode & (DNS_JOURNAL_WRITE | DNS_JOURNAL_CREATE)) != 0); @@ -712,8 +695,8 @@ dns_journal_open(isc_mem_t *mctx, const char *filename, unsigned int mode, result = journal_open(mctx, filename, writable, create, journalp); if (result == ISC_R_NOTFOUND) { namelen = strlen(filename); - if (namelen > 4U && - strcmp(filename + namelen - 4, ".jnl") == 0) { + if (namelen > 4U && strcmp(filename + namelen - 4, ".jnl") == 0) + { namelen -= 4; } @@ -741,14 +724,13 @@ dns_journal_open(isc_mem_t *mctx, const char *filename, unsigned int mode, * rdataset merging it has to do. */ static int -ixfr_order(const void *av, const void *bv) -{ +ixfr_order(const void *av, const void *bv) { dns_difftuple_t const *const *ap = av; dns_difftuple_t const *const *bp = bv; - dns_difftuple_t const * a = *ap; - dns_difftuple_t const * b = *bp; - int r; - int bop = 0, aop = 0; + dns_difftuple_t const *a = *ap; + dns_difftuple_t const *b = *bp; + int r; + int bop = 0, aop = 0; switch (a->op) { case DNS_DIFFOP_DEL: @@ -810,9 +792,8 @@ ixfr_order(const void *av, const void *bv) * Other results due to file errors are possible. */ static isc_result_t -journal_next(dns_journal_t *j, journal_pos_t *pos) -{ - isc_result_t result; +journal_next(dns_journal_t *j, journal_pos_t *pos) { + isc_result_t result; journal_xhdr_t xhdr; REQUIRE(DNS_JOURNAL_VALID(j)); @@ -848,7 +829,8 @@ journal_next(dns_journal_t *j, journal_pos_t *pos) * Check for offset wraparound. */ if ((isc_offset_t)(pos->offset + sizeof(journal_rawxhdr_t) + - xhdr.size) < pos->offset) { + xhdr.size) < pos->offset) + { isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR, "%s: offset too large", j->filename); return (ISC_R_UNEXPECTED); @@ -867,8 +849,7 @@ journal_next(dns_journal_t *j, journal_pos_t *pos) * but not greater than 'serial'. */ static void -index_find(dns_journal_t *j, uint32_t serial, journal_pos_t *best_guess) -{ +index_find(dns_journal_t *j, uint32_t serial, journal_pos_t *best_guess) { unsigned int i; if (j->index == NULL) { return; @@ -876,7 +857,8 @@ index_find(dns_journal_t *j, uint32_t serial, journal_pos_t *best_guess) for (i = 0; i < j->header.index_size; i++) { if (POS_VALID(j->index[i]) && DNS_SERIAL_GE(serial, j->index[i].serial) && - DNS_SERIAL_GT(j->index[i].serial, best_guess->serial)) { + DNS_SERIAL_GT(j->index[i].serial, best_guess->serial)) + { *best_guess = j->index[i]; } } @@ -892,8 +874,7 @@ index_find(dns_journal_t *j, uint32_t serial, journal_pos_t *best_guess) * recent versions more often than old ones. */ static void -index_add(dns_journal_t *j, journal_pos_t *pos) -{ +index_add(dns_journal_t *j, journal_pos_t *pos) { unsigned int i; if (j->index == NULL) { return; @@ -934,8 +915,7 @@ index_add(dns_journal_t *j, journal_pos_t *pos) * ambiguous when a new transaction with number 'serial' is added. */ static void -index_invalidate(dns_journal_t *j, uint32_t serial) -{ +index_invalidate(dns_journal_t *j, uint32_t serial) { unsigned int i; if (j->index == NULL) { return; @@ -967,9 +947,8 @@ index_invalidate(dns_journal_t *j, uint32_t serial) * */ static isc_result_t -journal_find(dns_journal_t *j, uint32_t serial, journal_pos_t *pos) -{ - isc_result_t result; +journal_find(dns_journal_t *j, uint32_t serial, journal_pos_t *pos) { + isc_result_t result; journal_pos_t current_pos; REQUIRE(DNS_JOURNAL_VALID(j)); @@ -1001,10 +980,9 @@ journal_find(dns_journal_t *j, uint32_t serial, journal_pos_t *pos) } isc_result_t -dns_journal_begin_transaction(dns_journal_t *j) -{ - uint32_t offset; - isc_result_t result; +dns_journal_begin_transaction(dns_journal_t *j) { + uint32_t offset; + isc_result_t result; journal_rawxhdr_t hdr; REQUIRE(DNS_JOURNAL_VALID(j)); @@ -1043,14 +1021,13 @@ failure: } isc_result_t -dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) -{ +dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) { dns_difftuple_t *t; - isc_buffer_t buffer; - void * mem = NULL; - uint64_t size; - isc_result_t result; - isc_region_t used; + isc_buffer_t buffer; + void *mem = NULL; + uint64_t size; + isc_result_t result; + isc_region_t used; REQUIRE(DNS_DIFF_VALID(diff)); REQUIRE(j->state == JOURNAL_STATE_TRANSACTION); @@ -1133,11 +1110,10 @@ failure: } isc_result_t -dns_journal_commit(dns_journal_t *j) -{ - isc_result_t result; +dns_journal_commit(dns_journal_t *j) { + isc_result_t result; journal_rawheader_t rawheader; - uint64_t total; + uint64_t total; REQUIRE(DNS_JOURNAL_VALID(j)); REQUIRE(j->state == JOURNAL_STATE_TRANSACTION || @@ -1271,8 +1247,7 @@ failure: } isc_result_t -dns_journal_write_transaction(dns_journal_t *j, dns_diff_t *diff) -{ +dns_journal_write_transaction(dns_journal_t *j, dns_diff_t *diff) { isc_result_t result; CHECK(dns_diff_sort(diff, ixfr_order)); CHECK(dns_journal_begin_transaction(j)); @@ -1284,8 +1259,7 @@ failure: } void -dns_journal_destroy(dns_journal_t **journalp) -{ +dns_journal_destroy(dns_journal_t **journalp) { dns_journal_t *j = *journalp; *journalp = NULL; REQUIRE(DNS_JOURNAL_VALID(j)); @@ -1325,19 +1299,18 @@ dns_journal_destroy(dns_journal_t **journalp) /* XXX Share code with incoming IXFR? */ static isc_result_t -roll_forward(dns_journal_t *j, dns_db_t *db, unsigned int options) -{ - isc_buffer_t source; /* Transaction data from disk */ - isc_buffer_t target; /* Ditto after _fromwire check */ - uint32_t db_serial; /* Database SOA serial */ - uint32_t end_serial; /* Last journal SOA serial */ - isc_result_t result; +roll_forward(dns_journal_t *j, dns_db_t *db, unsigned int options) { + isc_buffer_t source; /* Transaction data from disk */ + isc_buffer_t target; /* Ditto after _fromwire check */ + uint32_t db_serial; /* Database SOA serial */ + uint32_t end_serial; /* Last journal SOA serial */ + isc_result_t result; dns_dbversion_t *ver = NULL; - journal_pos_t pos; - dns_diff_t diff; - unsigned int n_soa = 0; - unsigned int n_put = 0; - dns_diffop_t op; + journal_pos_t pos; + dns_diff_t diff; + unsigned int n_soa = 0; + unsigned int n_put = 0; + dns_diffop_t op; REQUIRE(DNS_JOURNAL_VALID(j)); REQUIRE(DNS_DB_VALID(db)); @@ -1384,10 +1357,11 @@ roll_forward(dns_journal_t *j, dns_db_t *db, unsigned int options) CHECK(dns_journal_iter_init(j, db_serial, end_serial)); for (result = dns_journal_first_rr(j); result == ISC_R_SUCCESS; - result = dns_journal_next_rr(j)) { - dns_name_t * name; - uint32_t ttl; - dns_rdata_t * rdata; + result = dns_journal_next_rr(j)) + { + dns_name_t *name; + uint32_t ttl; + dns_rdata_t *rdata; dns_difftuple_t *tuple = NULL; name = NULL; @@ -1468,10 +1442,9 @@ failure: isc_result_t dns_journal_rollforward(isc_mem_t *mctx, dns_db_t *db, unsigned int options, - const char *filename) -{ + const char *filename) { dns_journal_t *j; - isc_result_t result; + isc_result_t result; REQUIRE(DNS_DB_VALID(db)); REQUIRE(filename != NULL); @@ -1498,17 +1471,16 @@ dns_journal_rollforward(isc_mem_t *mctx, dns_db_t *db, unsigned int options, } isc_result_t -dns_journal_print(isc_mem_t *mctx, const char *filename, FILE *file) -{ +dns_journal_print(isc_mem_t *mctx, const char *filename, FILE *file) { dns_journal_t *j; - isc_buffer_t source; /* Transaction data from disk */ - isc_buffer_t target; /* Ditto after _fromwire check */ - uint32_t start_serial; /* Database SOA serial */ - uint32_t end_serial; /* Last journal SOA serial */ - isc_result_t result; - dns_diff_t diff; - unsigned int n_soa = 0; - unsigned int n_put = 0; + isc_buffer_t source; /* Transaction data from disk */ + isc_buffer_t target; /* Ditto after _fromwire check */ + uint32_t start_serial; /* Database SOA serial */ + uint32_t end_serial; /* Last journal SOA serial */ + isc_result_t result; + dns_diff_t diff; + unsigned int n_soa = 0; + unsigned int n_put = 0; REQUIRE(filename != NULL); @@ -1545,10 +1517,11 @@ dns_journal_print(isc_mem_t *mctx, const char *filename, FILE *file) CHECK(dns_journal_iter_init(j, start_serial, end_serial)); for (result = dns_journal_first_rr(j); result == ISC_R_SUCCESS; - result = dns_journal_next_rr(j)) { - dns_name_t * name; - uint32_t ttl; - dns_rdata_t * rdata; + result = dns_journal_next_rr(j)) + { + dns_name_t *name; + uint32_t ttl; + dns_rdata_t *rdata; dns_difftuple_t *tuple = NULL; name = NULL; @@ -1617,26 +1590,22 @@ cleanup: * Miscellaneous accessors. */ bool -dns_journal_empty(dns_journal_t *j) -{ +dns_journal_empty(dns_journal_t *j) { return (JOURNAL_EMPTY(&j->header)); } uint32_t -dns_journal_first_serial(dns_journal_t *j) -{ +dns_journal_first_serial(dns_journal_t *j) { return (j->header.begin.serial); } uint32_t -dns_journal_last_serial(dns_journal_t *j) -{ +dns_journal_last_serial(dns_journal_t *j) { return (j->header.end.serial); } void -dns_journal_set_sourceserial(dns_journal_t *j, uint32_t sourceserial) -{ +dns_journal_set_sourceserial(dns_journal_t *j, uint32_t sourceserial) { REQUIRE(j->state == JOURNAL_STATE_WRITE || j->state == JOURNAL_STATE_INLINE || j->state == JOURNAL_STATE_TRANSACTION); @@ -1649,8 +1618,7 @@ dns_journal_set_sourceserial(dns_journal_t *j, uint32_t sourceserial) } bool -dns_journal_get_sourceserial(dns_journal_t *j, uint32_t *sourceserial) -{ +dns_journal_get_sourceserial(dns_journal_t *j, uint32_t *sourceserial) { REQUIRE(sourceserial != NULL); if (!j->header.serialset) { @@ -1672,8 +1640,7 @@ 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 @@ -1685,8 +1652,7 @@ read_one_rr(dns_journal_t *j); */ static isc_result_t -size_buffer(isc_mem_t *mctx, isc_buffer_t *b, unsigned size) -{ +size_buffer(isc_mem_t *mctx, isc_buffer_t *b, unsigned size) { if (b->length < size) { void *mem = isc_mem_get(mctx, size); if (mem == NULL) { @@ -1704,8 +1670,7 @@ size_buffer(isc_mem_t *mctx, isc_buffer_t *b, unsigned size) isc_result_t dns_journal_iter_init(dns_journal_t *j, uint32_t begin_serial, - uint32_t end_serial) -{ + uint32_t end_serial) { isc_result_t result; CHECK(journal_find(j, begin_serial, &j->it.bpos)); @@ -1721,8 +1686,7 @@ failure: } isc_result_t -dns_journal_first_rr(dns_journal_t *j) -{ +dns_journal_first_rr(dns_journal_t *j) { isc_result_t result; /* @@ -1742,16 +1706,15 @@ failure: } static isc_result_t -read_one_rr(dns_journal_t *j) -{ +read_one_rr(dns_journal_t *j) { isc_result_t result; - dns_rdatatype_t rdtype; + dns_rdatatype_t rdtype; dns_rdataclass_t rdclass; - unsigned int rdlen; - uint32_t ttl; - journal_xhdr_t xhdr; - journal_rrhdr_t rrhdr; + unsigned int rdlen; + uint32_t ttl; + journal_xhdr_t xhdr; + journal_rrhdr_t rrhdr; if (j->offset > j->it.epos.offset) { isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR, @@ -1864,16 +1827,14 @@ failure: } isc_result_t -dns_journal_next_rr(dns_journal_t *j) -{ +dns_journal_next_rr(dns_journal_t *j) { j->it.result = read_one_rr(j); return (j->it.result); } void dns_journal_current_rr(dns_journal_t *j, dns_name_t **name, uint32_t *ttl, - dns_rdata_t **rdata) -{ + dns_rdata_t **rdata) { REQUIRE(j->it.result == ISC_R_SUCCESS); *name = &j->it.name; *ttl = j->it.ttl; @@ -1897,12 +1858,11 @@ dns_journal_current_rr(dns_journal_t *j, dns_name_t **name, uint32_t *ttl, static isc_result_t get_name_diff(dns_db_t *db, dns_dbversion_t *ver, isc_stdtime_t now, dns_dbiterator_t *dbit, dns_name_t *name, dns_diffop_t op, - dns_diff_t *diff) -{ - isc_result_t result; - dns_dbnode_t * node = NULL; + dns_diff_t *diff) { + isc_result_t result; + dns_dbnode_t *node = NULL; dns_rdatasetiter_t *rdsiter = NULL; - dns_difftuple_t * tuple = NULL; + dns_difftuple_t *tuple = NULL; result = dns_dbiterator_current(dbit, &node, name); if (result != ISC_R_SUCCESS) { @@ -1915,7 +1875,8 @@ get_name_diff(dns_db_t *db, dns_dbversion_t *ver, isc_stdtime_t now, } for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(rdsiter)) { + result = dns_rdatasetiter_next(rdsiter)) + { dns_rdataset_t rdataset; dns_rdataset_init(&rdataset); @@ -1923,7 +1884,8 @@ get_name_diff(dns_db_t *db, dns_dbversion_t *ver, isc_stdtime_t now, for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &rdata); result = dns_difftuple_create(diff->mctx, op, name, @@ -1962,13 +1924,12 @@ cleanup_node: * it is known to be the same for all tuples. */ static int -rdata_order(const void *av, const void *bv) -{ +rdata_order(const void *av, const void *bv) { dns_difftuple_t const *const *ap = av; dns_difftuple_t const *const *bp = bv; - dns_difftuple_t const * a = *ap; - dns_difftuple_t const * b = *bp; - int r; + dns_difftuple_t const *a = *ap; + dns_difftuple_t const *b = *bp; + int r; r = (b->rdata.type - a->rdata.type); if (r != 0) { return (r); @@ -1978,12 +1939,11 @@ rdata_order(const void *av, const void *bv) } static isc_result_t -dns_diff_subtract(dns_diff_t diff[2], dns_diff_t *r) -{ - isc_result_t result; +dns_diff_subtract(dns_diff_t diff[2], dns_diff_t *r) { + isc_result_t result; dns_difftuple_t *p[2]; - int i, t; - bool append; + int i, t; + bool append; CHECK(dns_diff_sort(&diff[0], rdata_order)); CHECK(dns_diff_sort(&diff[1], rdata_order)); @@ -2040,16 +2000,15 @@ failure: static isc_result_t diff_namespace(dns_db_t *dba, dns_dbversion_t *dbvera, dns_db_t *dbb, dns_dbversion_t *dbverb, unsigned int options, - dns_diff_t *resultdiff) -{ - dns_db_t * db[2]; - dns_dbversion_t * ver[2]; + dns_diff_t *resultdiff) { + dns_db_t *db[2]; + dns_dbversion_t *ver[2]; dns_dbiterator_t *dbit[2] = { NULL, NULL }; - bool have[2] = { false, false }; - dns_fixedname_t fixname[2]; - isc_result_t result, itresult[2]; - dns_diff_t diff[2]; - int i, t; + bool have[2] = { false, false }; + dns_fixedname_t fixname[2]; + isc_result_t result, itresult[2]; + dns_diff_t diff[2]; + int i, t; db[0] = dba, db[1] = dbb; ver[0] = dbvera, ver[1] = dbverb; @@ -2153,10 +2112,9 @@ cleanup_iterator: */ isc_result_t dns_db_diff(isc_mem_t *mctx, dns_db_t *dba, dns_dbversion_t *dbvera, - dns_db_t *dbb, dns_dbversion_t *dbverb, const char *filename) -{ + dns_db_t *dbb, dns_dbversion_t *dbverb, const char *filename) { isc_result_t result; - dns_diff_t diff; + dns_diff_t diff; dns_diff_init(mctx, &diff); @@ -2169,9 +2127,8 @@ dns_db_diff(isc_mem_t *mctx, dns_db_t *dba, dns_dbversion_t *dbvera, isc_result_t dns_db_diffx(dns_diff_t *diff, dns_db_t *dba, dns_dbversion_t *dbvera, - dns_db_t *dbb, dns_dbversion_t *dbverb, const char *filename) -{ - isc_result_t result; + dns_db_t *dbb, dns_dbversion_t *dbverb, const char *filename) { + isc_result_t result; dns_journal_t *journal = NULL; if (filename != NULL) { @@ -2202,23 +2159,22 @@ failure: isc_result_t dns_journal_compact(isc_mem_t *mctx, char *filename, uint32_t serial, - uint32_t target_size) -{ - unsigned int i; - journal_pos_t best_guess; - journal_pos_t current_pos; - dns_journal_t * j1 = NULL; - dns_journal_t * j2 = NULL; + uint32_t target_size) { + unsigned int i; + journal_pos_t best_guess; + journal_pos_t current_pos; + dns_journal_t *j1 = NULL; + dns_journal_t *j2 = NULL; journal_rawheader_t rawheader; - unsigned int copy_length; - size_t namelen; - char * buf = NULL; - unsigned int size = 0; - isc_result_t result; - unsigned int indexend; - char newname[PATH_MAX]; - char backup[PATH_MAX]; - bool is_backup = false; + unsigned int copy_length; + size_t namelen; + char *buf = NULL; + unsigned int size = 0; + isc_result_t result; + unsigned int indexend; + char newname[PATH_MAX]; + char backup[PATH_MAX]; + bool is_backup = false; REQUIRE(filename != NULL); @@ -2250,7 +2206,8 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, uint32_t serial, } if (DNS_SERIAL_GT(j1->header.begin.serial, serial) || - DNS_SERIAL_GT(serial, j1->header.end.serial)) { + DNS_SERIAL_GT(serial, j1->header.end.serial)) + { dns_journal_destroy(&j1); return (ISC_R_RANGE); } @@ -2293,7 +2250,8 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, uint32_t serial, DNS_SERIAL_GE(serial, j1->index[i].serial) && ((uint32_t)(j1->header.end.offset - j1->index[i].offset) >= target_size / 2) && - j1->index[i].offset > best_guess.offset) { + j1->index[i].offset > best_guess.offset) + { best_guess = j1->index[i]; } } @@ -2308,7 +2266,8 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, uint32_t serial, if (DNS_SERIAL_GE(serial, current_pos.serial) && ((uint32_t)(j1->header.end.offset - current_pos.offset) >= (target_size / 2)) && - current_pos.offset > best_guess.offset) { + current_pos.offset > best_guess.offset) + { best_guess = current_pos; } else { break; @@ -2442,14 +2401,13 @@ failure: } static isc_result_t -index_to_disk(dns_journal_t *j) -{ +index_to_disk(dns_journal_t *j) { isc_result_t result = ISC_R_SUCCESS; if (j->header.index_size != 0) { - unsigned int i; + unsigned int i; unsigned char *p; - unsigned int rawbytes; + unsigned int rawbytes; rawbytes = j->header.index_size * sizeof(journal_rawpos_t); diff --git a/lib/dns/kasp.c b/lib/dns/kasp.c index 8ae10bb999..1d9bbb27f4 100644 --- a/lib/dns/kasp.c +++ b/lib/dns/kasp.c @@ -24,8 +24,7 @@ #include isc_result_t -dns_kasp_create(isc_mem_t *mctx, const char *name, dns_kasp_t **kaspp) -{ +dns_kasp_create(isc_mem_t *mctx, const char *name, dns_kasp_t **kaspp) { dns_kasp_t *kasp; REQUIRE(name != NULL); @@ -69,8 +68,7 @@ dns_kasp_create(isc_mem_t *mctx, const char *name, dns_kasp_t **kaspp) } void -dns_kasp_attach(dns_kasp_t *source, dns_kasp_t **targetp) -{ +dns_kasp_attach(dns_kasp_t *source, dns_kasp_t **targetp) { REQUIRE(DNS_KASP_VALID(source)); REQUIRE(targetp != NULL && *targetp == NULL); @@ -79,8 +77,7 @@ dns_kasp_attach(dns_kasp_t *source, dns_kasp_t **targetp) } static inline void -destroy(dns_kasp_t *kasp) -{ +destroy(dns_kasp_t *kasp) { dns_kasp_key_t *key; dns_kasp_key_t *key_next; @@ -98,8 +95,7 @@ destroy(dns_kasp_t *kasp) } void -dns_kasp_detach(dns_kasp_t **kaspp) -{ +dns_kasp_detach(dns_kasp_t **kaspp) { REQUIRE(kaspp != NULL && DNS_KASP_VALID(*kaspp)); dns_kasp_t *kasp = *kaspp; @@ -111,16 +107,14 @@ dns_kasp_detach(dns_kasp_t **kaspp) } const char * -dns_kasp_getname(dns_kasp_t *kasp) -{ +dns_kasp_getname(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); return (kasp->name); } void -dns_kasp_freeze(dns_kasp_t *kasp) -{ +dns_kasp_freeze(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(!kasp->frozen); @@ -128,8 +122,7 @@ dns_kasp_freeze(dns_kasp_t *kasp) } void -dns_kasp_thaw(dns_kasp_t *kasp) -{ +dns_kasp_thaw(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); @@ -137,8 +130,7 @@ dns_kasp_thaw(dns_kasp_t *kasp) } uint32_t -dns_kasp_signdelay(dns_kasp_t *kasp) -{ +dns_kasp_signdelay(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); @@ -146,8 +138,7 @@ dns_kasp_signdelay(dns_kasp_t *kasp) } uint32_t -dns_kasp_sigrefresh(dns_kasp_t *kasp) -{ +dns_kasp_sigrefresh(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); @@ -155,8 +146,7 @@ dns_kasp_sigrefresh(dns_kasp_t *kasp) } void -dns_kasp_setsigrefresh(dns_kasp_t *kasp, uint32_t value) -{ +dns_kasp_setsigrefresh(dns_kasp_t *kasp, uint32_t value) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(!kasp->frozen); @@ -164,8 +154,7 @@ dns_kasp_setsigrefresh(dns_kasp_t *kasp, uint32_t value) } uint32_t -dns_kasp_sigvalidity(dns_kasp_t *kasp) -{ +dns_kasp_sigvalidity(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); @@ -173,8 +162,7 @@ dns_kasp_sigvalidity(dns_kasp_t *kasp) } void -dns_kasp_setsigvalidity(dns_kasp_t *kasp, uint32_t value) -{ +dns_kasp_setsigvalidity(dns_kasp_t *kasp, uint32_t value) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(!kasp->frozen); @@ -182,8 +170,7 @@ dns_kasp_setsigvalidity(dns_kasp_t *kasp, uint32_t value) } uint32_t -dns_kasp_sigvalidity_dnskey(dns_kasp_t *kasp) -{ +dns_kasp_sigvalidity_dnskey(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); @@ -191,8 +178,7 @@ dns_kasp_sigvalidity_dnskey(dns_kasp_t *kasp) } void -dns_kasp_setsigvalidity_dnskey(dns_kasp_t *kasp, uint32_t value) -{ +dns_kasp_setsigvalidity_dnskey(dns_kasp_t *kasp, uint32_t value) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(!kasp->frozen); @@ -200,8 +186,7 @@ dns_kasp_setsigvalidity_dnskey(dns_kasp_t *kasp, uint32_t value) } dns_ttl_t -dns_kasp_dnskeyttl(dns_kasp_t *kasp) -{ +dns_kasp_dnskeyttl(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); @@ -209,8 +194,7 @@ dns_kasp_dnskeyttl(dns_kasp_t *kasp) } void -dns_kasp_setdnskeyttl(dns_kasp_t *kasp, dns_ttl_t ttl) -{ +dns_kasp_setdnskeyttl(dns_kasp_t *kasp, dns_ttl_t ttl) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(!kasp->frozen); @@ -218,8 +202,7 @@ dns_kasp_setdnskeyttl(dns_kasp_t *kasp, dns_ttl_t ttl) } uint32_t -dns_kasp_publishsafety(dns_kasp_t *kasp) -{ +dns_kasp_publishsafety(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); @@ -227,8 +210,7 @@ dns_kasp_publishsafety(dns_kasp_t *kasp) } void -dns_kasp_setpublishsafety(dns_kasp_t *kasp, uint32_t value) -{ +dns_kasp_setpublishsafety(dns_kasp_t *kasp, uint32_t value) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(!kasp->frozen); @@ -236,8 +218,7 @@ dns_kasp_setpublishsafety(dns_kasp_t *kasp, uint32_t value) } uint32_t -dns_kasp_retiresafety(dns_kasp_t *kasp) -{ +dns_kasp_retiresafety(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); @@ -245,8 +226,7 @@ dns_kasp_retiresafety(dns_kasp_t *kasp) } void -dns_kasp_setretiresafety(dns_kasp_t *kasp, uint32_t value) -{ +dns_kasp_setretiresafety(dns_kasp_t *kasp, uint32_t value) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(!kasp->frozen); @@ -254,8 +234,7 @@ dns_kasp_setretiresafety(dns_kasp_t *kasp, uint32_t value) } dns_ttl_t -dns_kasp_zonemaxttl(dns_kasp_t *kasp) -{ +dns_kasp_zonemaxttl(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); @@ -263,8 +242,7 @@ dns_kasp_zonemaxttl(dns_kasp_t *kasp) } void -dns_kasp_setzonemaxttl(dns_kasp_t *kasp, dns_ttl_t ttl) -{ +dns_kasp_setzonemaxttl(dns_kasp_t *kasp, dns_ttl_t ttl) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(!kasp->frozen); @@ -272,8 +250,7 @@ dns_kasp_setzonemaxttl(dns_kasp_t *kasp, dns_ttl_t ttl) } uint32_t -dns_kasp_zonepropagationdelay(dns_kasp_t *kasp) -{ +dns_kasp_zonepropagationdelay(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); @@ -281,8 +258,7 @@ dns_kasp_zonepropagationdelay(dns_kasp_t *kasp) } void -dns_kasp_setzonepropagationdelay(dns_kasp_t *kasp, uint32_t value) -{ +dns_kasp_setzonepropagationdelay(dns_kasp_t *kasp, uint32_t value) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(!kasp->frozen); @@ -290,8 +266,7 @@ dns_kasp_setzonepropagationdelay(dns_kasp_t *kasp, uint32_t value) } dns_ttl_t -dns_kasp_dsttl(dns_kasp_t *kasp) -{ +dns_kasp_dsttl(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); @@ -299,8 +274,7 @@ dns_kasp_dsttl(dns_kasp_t *kasp) } void -dns_kasp_setdsttl(dns_kasp_t *kasp, dns_ttl_t ttl) -{ +dns_kasp_setdsttl(dns_kasp_t *kasp, dns_ttl_t ttl) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(!kasp->frozen); @@ -308,8 +282,7 @@ dns_kasp_setdsttl(dns_kasp_t *kasp, dns_ttl_t ttl) } uint32_t -dns_kasp_parentpropagationdelay(dns_kasp_t *kasp) -{ +dns_kasp_parentpropagationdelay(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); @@ -317,8 +290,7 @@ dns_kasp_parentpropagationdelay(dns_kasp_t *kasp) } void -dns_kasp_setparentpropagationdelay(dns_kasp_t *kasp, uint32_t value) -{ +dns_kasp_setparentpropagationdelay(dns_kasp_t *kasp, uint32_t value) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(!kasp->frozen); @@ -326,8 +298,7 @@ dns_kasp_setparentpropagationdelay(dns_kasp_t *kasp, uint32_t value) } uint32_t -dns_kasp_parentregistrationdelay(dns_kasp_t *kasp) -{ +dns_kasp_parentregistrationdelay(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); @@ -335,8 +306,7 @@ dns_kasp_parentregistrationdelay(dns_kasp_t *kasp) } void -dns_kasp_setparentregistrationdelay(dns_kasp_t *kasp, uint32_t value) -{ +dns_kasp_setparentregistrationdelay(dns_kasp_t *kasp, uint32_t value) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(!kasp->frozen); @@ -344,8 +314,7 @@ dns_kasp_setparentregistrationdelay(dns_kasp_t *kasp, uint32_t value) } isc_result_t -dns_kasplist_find(dns_kasplist_t *list, const char *name, dns_kasp_t **kaspp) -{ +dns_kasplist_find(dns_kasplist_t *list, const char *name, dns_kasp_t **kaspp) { dns_kasp_t *kasp = NULL; REQUIRE(kaspp != NULL && *kaspp == NULL); @@ -355,7 +324,8 @@ dns_kasplist_find(dns_kasplist_t *list, const char *name, dns_kasp_t **kaspp) } for (kasp = ISC_LIST_HEAD(*list); kasp != NULL; - kasp = ISC_LIST_NEXT(kasp, link)) { + kasp = ISC_LIST_NEXT(kasp, link)) + { if (strcmp(kasp->name, name) == 0) { break; } @@ -370,8 +340,7 @@ dns_kasplist_find(dns_kasplist_t *list, const char *name, dns_kasp_t **kaspp) } dns_kasp_keylist_t -dns_kasp_keys(dns_kasp_t *kasp) -{ +dns_kasp_keys(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(kasp->frozen); @@ -379,16 +348,14 @@ dns_kasp_keys(dns_kasp_t *kasp) } bool -dns_kasp_keylist_empty(dns_kasp_t *kasp) -{ +dns_kasp_keylist_empty(dns_kasp_t *kasp) { REQUIRE(DNS_KASP_VALID(kasp)); return (ISC_LIST_EMPTY(kasp->keys)); } void -dns_kasp_addkey(dns_kasp_t *kasp, dns_kasp_key_t *key) -{ +dns_kasp_addkey(dns_kasp_t *kasp, dns_kasp_key_t *key) { REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(!kasp->frozen); REQUIRE(key != NULL); @@ -397,8 +364,7 @@ dns_kasp_addkey(dns_kasp_t *kasp, dns_kasp_key_t *key) } isc_result_t -dns_kasp_key_create(dns_kasp_t *kasp, dns_kasp_key_t **keyp) -{ +dns_kasp_key_create(dns_kasp_t *kasp, dns_kasp_key_t **keyp) { dns_kasp_key_t *key; REQUIRE(DNS_KASP_VALID(kasp)); @@ -419,24 +385,21 @@ dns_kasp_key_create(dns_kasp_t *kasp, dns_kasp_key_t **keyp) } void -dns_kasp_key_destroy(dns_kasp_key_t *key) -{ +dns_kasp_key_destroy(dns_kasp_key_t *key) { REQUIRE(key != NULL); isc_mem_putanddetach(&key->mctx, key, sizeof(*key)); } uint32_t -dns_kasp_key_algorithm(dns_kasp_key_t *key) -{ +dns_kasp_key_algorithm(dns_kasp_key_t *key) { REQUIRE(key != NULL); return (key->algorithm); } unsigned int -dns_kasp_key_size(dns_kasp_key_t *key) -{ +dns_kasp_key_size(dns_kasp_key_t *key) { unsigned int size = 0; unsigned int min = 0; @@ -480,24 +443,21 @@ dns_kasp_key_size(dns_kasp_key_t *key) } uint32_t -dns_kasp_key_lifetime(dns_kasp_key_t *key) -{ +dns_kasp_key_lifetime(dns_kasp_key_t *key) { REQUIRE(key != NULL); return (key->lifetime); } bool -dns_kasp_key_ksk(dns_kasp_key_t *key) -{ +dns_kasp_key_ksk(dns_kasp_key_t *key) { REQUIRE(key != NULL); return (key->role & DNS_KASP_KEY_ROLE_KSK); } bool -dns_kasp_key_zsk(dns_kasp_key_t *key) -{ +dns_kasp_key_zsk(dns_kasp_key_t *key) { REQUIRE(key != NULL); return (key->role & DNS_KASP_KEY_ROLE_ZSK); diff --git a/lib/dns/key.c b/lib/dns/key.c index afd3655e58..bc3da5f75c 100644 --- a/lib/dns/key.c +++ b/lib/dns/key.c @@ -24,11 +24,10 @@ #include uint16_t -dst_region_computeid(const isc_region_t *source) -{ - uint32_t ac; +dst_region_computeid(const isc_region_t *source) { + uint32_t ac; const unsigned char *p; - int size; + int size; REQUIRE(source != NULL); REQUIRE(source->length >= 4); @@ -49,11 +48,10 @@ dst_region_computeid(const isc_region_t *source) } uint16_t -dst_region_computerid(const isc_region_t *source) -{ - uint32_t ac; +dst_region_computerid(const isc_region_t *source) { + uint32_t ac; const unsigned char *p; - int size; + int size; REQUIRE(source != NULL); REQUIRE(source->length >= 4); @@ -76,64 +74,55 @@ dst_region_computerid(const isc_region_t *source) } dns_name_t * -dst_key_name(const dst_key_t *key) -{ +dst_key_name(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); return (key->key_name); } unsigned int -dst_key_size(const dst_key_t *key) -{ +dst_key_size(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); return (key->key_size); } unsigned int -dst_key_proto(const dst_key_t *key) -{ +dst_key_proto(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); return (key->key_proto); } unsigned int -dst_key_alg(const dst_key_t *key) -{ +dst_key_alg(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); return (key->key_alg); } uint32_t -dst_key_flags(const dst_key_t *key) -{ +dst_key_flags(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); return (key->key_flags); } dns_keytag_t -dst_key_id(const dst_key_t *key) -{ +dst_key_id(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); return (key->key_id); } dns_keytag_t -dst_key_rid(const dst_key_t *key) -{ +dst_key_rid(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); return (key->key_rid); } dns_rdataclass_t -dst_key_class(const dst_key_t *key) -{ +dst_key_class(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); return (key->key_class); } bool -dst_key_iszonekey(const dst_key_t *key) -{ +dst_key_iszonekey(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); if ((key->key_flags & DNS_KEYTYPE_NOAUTH) != 0) { @@ -150,8 +139,7 @@ dst_key_iszonekey(const dst_key_t *key) } bool -dst_key_isnullkey(const dst_key_t *key) -{ +dst_key_isnullkey(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); if ((key->key_flags & DNS_KEYFLAG_TYPEMASK) != DNS_KEYTYPE_NOKEY) { @@ -168,8 +156,7 @@ dst_key_isnullkey(const dst_key_t *key) } void -dst_key_setbits(dst_key_t *key, uint16_t bits) -{ +dst_key_setbits(dst_key_t *key, uint16_t bits) { unsigned int maxbits; REQUIRE(VALID_KEY(key)); if (bits != 0) { @@ -181,22 +168,19 @@ dst_key_setbits(dst_key_t *key, uint16_t bits) } uint16_t -dst_key_getbits(const dst_key_t *key) -{ +dst_key_getbits(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); return (key->key_bits); } void -dst_key_setttl(dst_key_t *key, dns_ttl_t ttl) -{ +dst_key_setttl(dst_key_t *key, dns_ttl_t ttl) { REQUIRE(VALID_KEY(key)); key->key_ttl = ttl; } dns_ttl_t -dst_key_getttl(const dst_key_t *key) -{ +dst_key_getttl(const dst_key_t *key) { REQUIRE(VALID_KEY(key)); return (key->key_ttl); } diff --git a/lib/dns/keydata.c b/lib/dns/keydata.c index 0024c5f034..aba16349d8 100644 --- a/lib/dns/keydata.c +++ b/lib/dns/keydata.c @@ -24,8 +24,7 @@ isc_result_t dns_keydata_todnskey(dns_rdata_keydata_t *keydata, dns_rdata_dnskey_t *dnskey, - isc_mem_t *mctx) -{ + isc_mem_t *mctx) { REQUIRE(keydata != NULL && dnskey != NULL); dnskey->common.rdtype = dns_rdatatype_dnskey; @@ -50,8 +49,7 @@ dns_keydata_todnskey(dns_rdata_keydata_t *keydata, dns_rdata_dnskey_t *dnskey, isc_result_t dns_keydata_fromdnskey(dns_rdata_keydata_t *keydata, dns_rdata_dnskey_t *dnskey, uint32_t refresh, uint32_t addhd, uint32_t removehd, - isc_mem_t *mctx) -{ + isc_mem_t *mctx) { REQUIRE(keydata != NULL && dnskey != NULL); keydata->common.rdtype = dns_rdatatype_keydata; diff --git a/lib/dns/keymgr.c b/lib/dns/keymgr.c index 21324645dc..40d38ff835 100644 --- a/lib/dns/keymgr.c +++ b/lib/dns/keymgr.c @@ -55,11 +55,11 @@ } while (0) /* Shorter keywords for better readability. */ -#define HIDDEN DST_KEY_STATE_HIDDEN -#define RUMOURED DST_KEY_STATE_RUMOURED +#define HIDDEN DST_KEY_STATE_HIDDEN +#define RUMOURED DST_KEY_STATE_RUMOURED #define OMNIPRESENT DST_KEY_STATE_OMNIPRESENT #define UNRETENTIVE DST_KEY_STATE_UNRETENTIVE -#define NA DST_KEY_STATE_NA +#define NA DST_KEY_STATE_NA /* Quickly get key state timing metadata. */ #define NUM_KEYSTATES (DST_MAX_KEYSTATES) @@ -76,8 +76,7 @@ static const char *keystatestrings[4] = { "HIDDEN", "RUMOURED", "OMNIPRESENT", * */ static const char * -keymgr_keyrole(dst_key_t *key) -{ +keymgr_keyrole(dst_key_t *key) { bool ksk, zsk; dst_key_getbool(key, DST_BOOL_KSK, &ksk); dst_key_getbool(key, DST_BOOL_ZSK, &zsk); @@ -104,11 +103,10 @@ keymgr_keyrole(dst_key_t *key) */ static isc_stdtime_t keymgr_prepublication_time(dns_dnsseckey_t *key, dns_kasp_t *kasp, - uint32_t lifetime, isc_stdtime_t now) -{ - isc_result_t ret; + uint32_t lifetime, isc_stdtime_t now) { + isc_result_t ret; isc_stdtime_t active, retire, prepub; - bool ksk = false; + bool ksk = false; REQUIRE(key != NULL); REQUIRE(key->key != NULL); @@ -160,11 +158,10 @@ keymgr_prepublication_time(dns_dnsseckey_t *key, dns_kasp_t *kasp, } static void -keymgr_key_retire(dns_dnsseckey_t *key, isc_stdtime_t now) -{ - char keystr[DST_KEY_FORMATSIZE]; +keymgr_key_retire(dns_dnsseckey_t *key, isc_stdtime_t now) { + char keystr[DST_KEY_FORMATSIZE]; dst_key_state_t s; - bool ksk, zsk; + bool ksk, zsk; REQUIRE(key != NULL); REQUIRE(key->key != NULL); @@ -188,8 +185,8 @@ keymgr_key_retire(dns_dnsseckey_t *key, isc_stdtime_t now) dst_key_setstate(key->key, DST_KEY_KRRSIG, OMNIPRESENT); dst_key_settime(key->key, DST_TIME_KRRSIG, now); } - if (dst_key_getstate(key->key, DST_KEY_DS, &s) != - ISC_R_SUCCESS) { + if (dst_key_getstate(key->key, DST_KEY_DS, &s) != ISC_R_SUCCESS) + { dst_key_setstate(key->key, DST_KEY_DS, OMNIPRESENT); dst_key_settime(key->key, DST_TIME_DS, now); } @@ -216,11 +213,10 @@ keymgr_key_retire(dns_dnsseckey_t *key, isc_stdtime_t now) * */ static bool -keymgr_dnsseckey_kaspkey_match(dns_dnsseckey_t *dkey, dns_kasp_key_t *kkey) -{ - dst_key_t * key; +keymgr_dnsseckey_kaspkey_match(dns_dnsseckey_t *dkey, dns_kasp_key_t *kkey) { + dst_key_t *key; isc_result_t ret; - bool role = false; + bool role = false; REQUIRE(dkey != NULL); REQUIRE(kkey != NULL); @@ -258,18 +254,17 @@ keymgr_dnsseckey_kaspkey_match(dns_dnsseckey_t *dkey, dns_kasp_key_t *kkey) static isc_result_t keymgr_createkey(dns_kasp_key_t *kkey, const dns_name_t *origin, dns_rdataclass_t rdclass, isc_mem_t *mctx, - dns_dnsseckeylist_t *keylist, dst_key_t **dst_key) -{ - bool conflict; - int keyflags = DNS_KEYOWNER_ZONE; + dns_dnsseckeylist_t *keylist, dst_key_t **dst_key) { + bool conflict; + int keyflags = DNS_KEYOWNER_ZONE; isc_result_t result = ISC_R_SUCCESS; - dst_key_t * newkey = NULL; + dst_key_t *newkey = NULL; do { uint16_t id; uint32_t rid; uint32_t algo = dns_kasp_key_algorithm(kkey); - int size = dns_kasp_key_size(kkey); + int size = dns_kasp_key_size(kkey); conflict = false; @@ -284,14 +279,16 @@ keymgr_createkey(dns_kasp_key_t *kkey, const dns_name_t *origin, id = dst_key_id(newkey); rid = dst_key_rid(newkey); for (dns_dnsseckey_t *dkey = ISC_LIST_HEAD(*keylist); - dkey != NULL; dkey = ISC_LIST_NEXT(dkey, link)) { + dkey != NULL; dkey = ISC_LIST_NEXT(dkey, link)) + { if (dst_key_alg(dkey->key) != algo) { continue; } if (dst_key_id(dkey->key) == id || dst_key_rid(dkey->key) == id || dst_key_id(dkey->key) == rid || - dst_key_rid(dkey->key) == rid) { + dst_key_rid(dkey->key) == rid) + { /* Try again. */ conflict = true; isc_log_write(dns_lctx, DNS_LOGCATEGORY_DNSSEC, @@ -340,8 +337,7 @@ failure: * */ static dst_key_state_t -keymgr_desiredstate(dns_dnsseckey_t *key, dst_key_state_t state) -{ +keymgr_desiredstate(dns_dnsseckey_t *key, dst_key_state_t state) { dst_key_state_t goal; if (dst_key_getstate(key->key, DST_KEY_GOAL, &goal) != ISC_R_SUCCESS) { @@ -387,8 +383,7 @@ keymgr_desiredstate(dns_dnsseckey_t *key, dst_key_state_t state) */ static bool keymgr_key_match_state(dst_key_t *key, dst_key_t *subject, int type, - dst_key_state_t next_state, dst_key_state_t states[4]) -{ + dst_key_state_t next_state, dst_key_state_t states[4]) { REQUIRE(key != NULL); for (int i = 0; i < 4; i++) { @@ -422,8 +417,7 @@ keymgr_key_match_state(dst_key_t *key, dst_key_t *subject, int type, * */ static bool -keymgr_key_is_successor(dst_key_t *k1, dst_key_t *k2) -{ +keymgr_key_is_successor(dst_key_t *k1, dst_key_t *k2) { uint32_t suc = 0, pre = 0; if (dst_key_getnum(k1, DST_NUM_SUCCESSOR, &suc) != ISC_R_SUCCESS) { return (false); @@ -448,10 +442,10 @@ keymgr_key_exists_with_state(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, int type, dst_key_state_t next_state, dst_key_state_t states[4], dst_key_state_t states2[4], bool check_successor, - bool match_algorithms) -{ + bool match_algorithms) { for (dns_dnsseckey_t *dkey = ISC_LIST_HEAD(*keyring); dkey != NULL; - dkey = ISC_LIST_NEXT(dkey, link)) { + dkey = ISC_LIST_NEXT(dkey, link)) + { if (match_algorithms && (dst_key_alg(dkey->key) != dst_key_alg(key->key))) { continue; @@ -459,10 +453,12 @@ keymgr_key_exists_with_state(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, if (check_successor && keymgr_key_match_state(dkey->key, key->key, type, - next_state, states2)) { + next_state, states2)) + { /* Found a possible successor, look for predecessor. */ for (dns_dnsseckey_t *pkey = ISC_LIST_HEAD(*keyring); - pkey != NULL; pkey = ISC_LIST_NEXT(pkey, link)) { + pkey != NULL; pkey = ISC_LIST_NEXT(pkey, link)) + { if (pkey == dkey) { continue; } @@ -485,7 +481,8 @@ keymgr_key_exists_with_state(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, if (!check_successor && keymgr_key_match_state(dkey->key, key->key, type, - next_state, states)) { + next_state, states)) + { return (true); } } @@ -497,8 +494,7 @@ keymgr_key_exists_with_state(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, * Check if a key has a successor. */ static bool -keymgr_key_has_successor(dns_dnsseckey_t *key, dns_dnsseckeylist_t *keyring) -{ +keymgr_key_has_successor(dns_dnsseckey_t *key, dns_dnsseckeylist_t *keyring) { /* Don't worry about key states. */ dst_key_state_t na[4] = { NA, NA, NA, NA }; return (keymgr_key_exists_with_state(keyring, key, DST_KEY_DNSKEY, NA, @@ -517,15 +513,15 @@ keymgr_key_has_successor(dns_dnsseckey_t *key, dns_dnsseckeylist_t *keyring) static bool keymgr_ds_hidden_or_chained(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, int type, dst_key_state_t next_state, - bool match_algorithms, bool must_be_hidden) -{ + bool match_algorithms, bool must_be_hidden) { dst_key_state_t dnskey_omnipresent[4] = { OMNIPRESENT, NA, OMNIPRESENT, NA }; /* (3e) */ dst_key_state_t ds_hidden[4] = { NA, NA, NA, HIDDEN }; /* (3e) */ dst_key_state_t na[4] = { NA, NA, NA, NA }; /* successor n/a */ for (dns_dnsseckey_t *dkey = ISC_LIST_HEAD(*keyring); dkey != NULL; - dkey = ISC_LIST_NEXT(dkey, link)) { + dkey = ISC_LIST_NEXT(dkey, link)) + { char keystr[DST_KEY_FORMATSIZE]; dst_key_format(dkey->key, keystr, sizeof(keystr)); @@ -554,7 +550,8 @@ keymgr_ds_hidden_or_chained(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, &dnskey_omnipresent[DST_KEY_DS]); if (!keymgr_key_exists_with_state( keyring, key, type, next_state, dnskey_omnipresent, - na, false, match_algorithms)) { + na, false, match_algorithms)) + { /* There is no chain of trust. */ return (false); } @@ -576,22 +573,23 @@ static bool keymgr_dnskey_hidden_or_chained(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, int type, dst_key_state_t next_state, - bool match_algorithms) -{ + bool match_algorithms) { dst_key_state_t rrsig_omnipresent[4] = { NA, OMNIPRESENT, NA, NA }; /* (3i) */ dst_key_state_t dnskey_hidden[4] = { HIDDEN, NA, NA, NA }; /* (3i) */ dst_key_state_t na[4] = { NA, NA, NA, NA }; /* successor n/a */ for (dns_dnsseckey_t *dkey = ISC_LIST_HEAD(*keyring); dkey != NULL; - dkey = ISC_LIST_NEXT(dkey, link)) { + dkey = ISC_LIST_NEXT(dkey, link)) + { if (match_algorithms && (dst_key_alg(dkey->key) != dst_key_alg(key->key))) { continue; } if (keymgr_key_match_state(dkey->key, key->key, type, - next_state, dnskey_hidden)) { + next_state, dnskey_hidden)) + { /* This key has its DNSKEY hidden. */ continue; } @@ -604,9 +602,10 @@ keymgr_dnskey_hidden_or_chained(dns_dnsseckeylist_t *keyring, rrsig_omnipresent[DST_KEY_DNSKEY] = NA; (void)dst_key_getstate(dkey->key, DST_KEY_DNSKEY, &rrsig_omnipresent[DST_KEY_DNSKEY]); - if (!keymgr_key_exists_with_state( - keyring, key, type, next_state, rrsig_omnipresent, - na, false, match_algorithms)) { + if (!keymgr_key_exists_with_state(keyring, key, type, + next_state, rrsig_omnipresent, + na, false, match_algorithms)) + { /* There is no chain of trust. */ return (false); } @@ -621,8 +620,7 @@ keymgr_dnskey_hidden_or_chained(dns_dnsseckeylist_t *keyring, */ static bool keymgr_have_ds(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, int type, - dst_key_state_t next_state) -{ + dst_key_state_t next_state) { dst_key_state_t states[2][4] = { /* DNSKEY, ZRRSIG, KRRSIG, DS */ { NA, NA, NA, OMNIPRESENT }, /* DS present */ @@ -647,8 +645,7 @@ keymgr_have_ds(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, int type, */ static bool keymgr_have_dnskey(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, int type, - dst_key_state_t next_state) -{ + dst_key_state_t next_state) { dst_key_state_t states[9][4] = { /* DNSKEY, ZRRSIG, KRRSIG, DS */ { OMNIPRESENT, NA, OMNIPRESENT, OMNIPRESENT }, /* (3b) */ @@ -739,8 +736,7 @@ keymgr_have_dnskey(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, int type, */ static bool keymgr_have_rrsig(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, int type, - dst_key_state_t next_state) -{ + dst_key_state_t next_state) { dst_key_state_t states[11][4] = { /* DNSKEY, ZRRSIG, KRRSIG, DS */ { OMNIPRESENT, OMNIPRESENT, NA, NA }, /* (3f) */ @@ -806,8 +802,7 @@ keymgr_have_rrsig(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, int type, */ static bool keymgr_policy_approval(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, - int type, dst_key_state_t next) -{ + int type, dst_key_state_t next) { dst_key_state_t dnskeystate = HIDDEN; dst_key_state_t ksk_present[4] = { OMNIPRESENT, NA, OMNIPRESENT, OMNIPRESENT }; @@ -871,8 +866,7 @@ keymgr_policy_approval(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, */ static bool keymgr_transition_allowed(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, - int type, dst_key_state_t next_state) -{ + int type, dst_key_state_t next_state) { /* Debug logging. */ if (isc_log_wouldlog(dns_lctx, ISC_LOG_DEBUG(1))) { bool rule1a, rule1b, rule2a, rule2b, rule3a, rule3b; @@ -928,9 +922,8 @@ keymgr_transition_allowed(dns_dnsseckeylist_t *keyring, dns_dnsseckey_t *key, static void keymgr_transition_time(dns_dnsseckey_t *key, int type, dst_key_state_t next_state, dns_kasp_t *kasp, - isc_stdtime_t now, isc_stdtime_t *when) -{ - isc_result_t ret; + isc_stdtime_t now, isc_stdtime_t *when) { + isc_result_t ret; isc_stdtime_t lastchange, nexttime = now; /* @@ -1065,8 +1058,7 @@ keymgr_transition_time(dns_dnsseckey_t *key, int type, */ static isc_result_t keymgr_update(dns_dnsseckeylist_t *keyring, dns_kasp_t *kasp, isc_stdtime_t now, - isc_stdtime_t *nexttime) -{ + isc_stdtime_t *nexttime) { bool changed; /* Repeat until nothing changed. */ @@ -1075,14 +1067,15 @@ transition: /* For all keys in the zone. */ for (dns_dnsseckey_t *dkey = ISC_LIST_HEAD(*keyring); dkey != NULL; - dkey = ISC_LIST_NEXT(dkey, link)) { + dkey = ISC_LIST_NEXT(dkey, link)) + { char keystr[DST_KEY_FORMATSIZE]; dst_key_format(dkey->key, keystr, sizeof(keystr)); /* For all records related to this key. */ for (int i = 0; i < NUM_KEYSTATES; i++) { - isc_result_t ret; - isc_stdtime_t when; + isc_result_t ret; + isc_stdtime_t when; dst_key_state_t state, next_state; ret = dst_key_getstate(dkey->key, i, &state); @@ -1213,9 +1206,8 @@ transition: * */ static void -keymgr_key_init_role(dns_dnsseckey_t *key) -{ - bool ksk, zsk; +keymgr_key_init_role(dns_dnsseckey_t *key) { + bool ksk, zsk; isc_result_t ret; REQUIRE(key != NULL); @@ -1241,17 +1233,16 @@ isc_result_t dns_keymgr_run(const dns_name_t *origin, dns_rdataclass_t rdclass, const char *directory, isc_mem_t *mctx, dns_dnsseckeylist_t *keyring, dns_kasp_t *kasp, - isc_stdtime_t now, isc_stdtime_t *nexttime) -{ - isc_result_t result = ISC_R_SUCCESS; + isc_stdtime_t now, isc_stdtime_t *nexttime) { + isc_result_t result = ISC_R_SUCCESS; dns_dnsseckeylist_t newkeys; - dns_kasp_key_t * kkey; - dns_dnsseckey_t * candidate = NULL; - dns_dnsseckey_t * newkey = NULL; - dst_key_t * dst_key = NULL; - isc_dir_t dir; - bool dir_open = false; - int options = (DST_TYPE_PRIVATE | DST_TYPE_PUBLIC | DST_TYPE_STATE); + dns_kasp_key_t *kkey; + dns_dnsseckey_t *candidate = NULL; + dns_dnsseckey_t *newkey = NULL; + dst_key_t *dst_key = NULL; + isc_dir_t dir; + bool dir_open = false; + int options = (DST_TYPE_PRIVATE | DST_TYPE_PUBLIC | DST_TYPE_STATE); char keystr[DST_KEY_FORMATSIZE]; REQUIRE(DNS_KASP_VALID(kasp)); @@ -1281,7 +1272,8 @@ dns_keymgr_run(const dns_name_t *origin, dns_rdataclass_t rdclass, } for (dns_dnsseckey_t *dkey = ISC_LIST_HEAD(*keyring); - dkey != NULL; dkey = ISC_LIST_NEXT(dkey, link)) { + dkey != NULL; dkey = ISC_LIST_NEXT(dkey, link)) + { dst_key_format(dkey->key, keystr, sizeof(keystr)); isc_log_write(dns_lctx, DNS_LOGCATEGORY_DNSSEC, DNS_LOGMODULE_DNSSEC, ISC_LOG_DEBUG(1), @@ -1292,14 +1284,16 @@ dns_keymgr_run(const dns_name_t *origin, dns_rdataclass_t rdclass, /* Create keys according to the policy, if come in short. */ for (kkey = ISC_LIST_HEAD(dns_kasp_keys(kasp)); kkey != NULL; - kkey = ISC_LIST_NEXT(kkey, link)) { - isc_stdtime_t retire = 0, active = 0, prepub = 0; - uint32_t lifetime = dns_kasp_key_lifetime(kkey); + kkey = ISC_LIST_NEXT(kkey, link)) + { + isc_stdtime_t retire = 0, active = 0, prepub = 0; + uint32_t lifetime = dns_kasp_key_lifetime(kkey); dns_dnsseckey_t *active_key = NULL; /* Do we have keys available for this kasp key? */ for (dns_dnsseckey_t *dkey = ISC_LIST_HEAD(*keyring); - dkey != NULL; dkey = ISC_LIST_NEXT(dkey, link)) { + dkey != NULL; dkey = ISC_LIST_NEXT(dkey, link)) + { /* Make sure this key knows about roles. */ keymgr_key_init_role(dkey); @@ -1391,9 +1385,11 @@ dns_keymgr_run(const dns_name_t *origin, dns_rdataclass_t rdclass, * may have been pregenerated with dnssec-keygen. */ for (candidate = ISC_LIST_HEAD(*keyring); candidate != NULL; - candidate = ISC_LIST_NEXT(candidate, link)) { + candidate = ISC_LIST_NEXT(candidate, link)) + { if (keymgr_dnsseckey_kaspkey_match(candidate, kkey) && - dst_key_is_unused(candidate->key)) { + dst_key_is_unused(candidate->key)) + { /* Found a candidate in keyring. */ break; } @@ -1474,7 +1470,8 @@ dns_keymgr_run(const dns_name_t *origin, dns_rdataclass_t rdclass, /* Initialize key states (for keys that don't have them yet). */ for (dns_dnsseckey_t *dkey = ISC_LIST_HEAD(*keyring); dkey != NULL; - dkey = ISC_LIST_NEXT(dkey, link)) { + dkey = ISC_LIST_NEXT(dkey, link)) + { bool ksk = false, zsk = false; /* Set key states for all keys that do not have them. */ @@ -1497,7 +1494,8 @@ dns_keymgr_run(const dns_name_t *origin, dns_rdataclass_t rdclass, /* Store key states and update hints. */ for (dns_dnsseckey_t *dkey = ISC_LIST_HEAD(*keyring); dkey != NULL; - dkey = ISC_LIST_NEXT(dkey, link)) { + dkey = ISC_LIST_NEXT(dkey, link)) + { dns_dnssec_get_hints(dkey, now); RETERR(dst_key_tofile(dkey->key, options, directory)); } diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c index 8251fe109e..75654a7dc5 100644 --- a/lib/dns/keytable.c +++ b/lib/dns/keytable.c @@ -30,42 +30,40 @@ #include #include -#define KEYTABLE_MAGIC ISC_MAGIC('K', 'T', 'b', 'l') +#define KEYTABLE_MAGIC ISC_MAGIC('K', 'T', 'b', 'l') #define VALID_KEYTABLE(kt) ISC_MAGIC_VALID(kt, KEYTABLE_MAGIC) -#define KEYNODE_MAGIC ISC_MAGIC('K', 'N', 'o', 'd') +#define KEYNODE_MAGIC ISC_MAGIC('K', 'N', 'o', 'd') #define VALID_KEYNODE(kn) ISC_MAGIC_VALID(kn, KEYNODE_MAGIC) struct dns_keytable { /* Unlocked. */ - unsigned int magic; - isc_mem_t * mctx; + unsigned int magic; + isc_mem_t *mctx; isc_refcount_t references; - isc_rwlock_t rwlock; + isc_rwlock_t rwlock; /* Locked by rwlock. */ dns_rbt_t *table; }; struct dns_keynode { - unsigned int magic; - isc_refcount_t refcount; + unsigned int magic; + isc_refcount_t refcount; dns_rdatalist_t *dslist; - dns_rdataset_t dsset; - bool managed; - bool initial; + dns_rdataset_t dsset; + bool managed; + bool initial; }; static void -keynode_attach(dns_keynode_t *source, dns_keynode_t **target) -{ +keynode_attach(dns_keynode_t *source, dns_keynode_t **target) { REQUIRE(VALID_KEYNODE(source)); isc_refcount_increment(&source->refcount); *target = source; } static void -keynode_detach(isc_mem_t *mctx, dns_keynode_t **keynodep) -{ +keynode_detach(isc_mem_t *mctx, dns_keynode_t **keynodep) { REQUIRE(keynodep != NULL && VALID_KEYNODE(*keynodep)); dns_keynode_t *knode = *keynodep; *keynodep = NULL; @@ -80,7 +78,8 @@ keynode_detach(isc_mem_t *mctx, dns_keynode_t **keynodep) for (rdata = ISC_LIST_HEAD(knode->dslist->rdata); rdata != NULL; - rdata = ISC_LIST_HEAD(knode->dslist->rdata)) { + rdata = ISC_LIST_HEAD(knode->dslist->rdata)) + { ISC_LIST_UNLINK(knode->dslist->rdata, rdata, link); isc_mem_put(mctx, rdata->data, @@ -97,19 +96,17 @@ keynode_detach(isc_mem_t *mctx, dns_keynode_t **keynodep) } static void -free_keynode(void *node, void *arg) -{ +free_keynode(void *node, void *arg) { dns_keynode_t *keynode = node; - isc_mem_t * mctx = arg; + isc_mem_t *mctx = arg; keynode_detach(mctx, &keynode); } isc_result_t -dns_keytable_create(isc_mem_t *mctx, dns_keytable_t **keytablep) -{ +dns_keytable_create(isc_mem_t *mctx, dns_keytable_t **keytablep) { dns_keytable_t *keytable; - isc_result_t result; + isc_result_t result; /* * Create a keytable. @@ -149,8 +146,7 @@ cleanup_keytable: } void -dns_keytable_attach(dns_keytable_t *source, dns_keytable_t **targetp) -{ +dns_keytable_attach(dns_keytable_t *source, dns_keytable_t **targetp) { REQUIRE(VALID_KEYTABLE(source)); REQUIRE(targetp != NULL && *targetp == NULL); @@ -160,8 +156,7 @@ dns_keytable_attach(dns_keytable_t *source, dns_keytable_t **targetp) } void -dns_keytable_detach(dns_keytable_t **keytablep) -{ +dns_keytable_detach(dns_keytable_t **keytablep) { REQUIRE(keytablep != NULL && VALID_KEYTABLE(*keytablep)); dns_keytable_t *keytable = *keytablep; *keytablep = NULL; @@ -177,12 +172,11 @@ dns_keytable_detach(dns_keytable_t **keytablep) } static isc_result_t -add_ds(dns_keynode_t *knode, dns_rdata_ds_t *ds, isc_mem_t *mctx) -{ +add_ds(dns_keynode_t *knode, dns_rdata_ds_t *ds, isc_mem_t *mctx) { isc_result_t result; dns_rdata_t *dsrdata = NULL, *rdata = NULL; - void * data = NULL; - bool exists = false; + void *data = NULL; + bool exists = false; isc_buffer_t b; if (knode->dslist == NULL) { @@ -205,7 +199,8 @@ add_ds(dns_keynode_t *knode, dns_rdata_ds_t *ds, isc_mem_t *mctx) } for (rdata = ISC_LIST_HEAD(knode->dslist->rdata); rdata != NULL; - rdata = ISC_LIST_NEXT(rdata, link)) { + rdata = ISC_LIST_NEXT(rdata, link)) + { if (dns_rdata_compare(rdata, dsrdata) == 0) { exists = true; break; @@ -234,14 +229,13 @@ add_ds(dns_keynode_t *knode, dns_rdata_ds_t *ds, isc_mem_t *mctx) } static isc_result_t -delete_ds(dns_keynode_t *knode, dns_rdata_ds_t *ds, isc_mem_t *mctx) -{ - isc_result_t result; - dns_rdata_t dsrdata = DNS_RDATA_INIT; - dns_rdata_t * rdata = NULL; +delete_ds(dns_keynode_t *knode, dns_rdata_ds_t *ds, isc_mem_t *mctx) { + isc_result_t result; + dns_rdata_t dsrdata = DNS_RDATA_INIT; + dns_rdata_t *rdata = NULL; unsigned char data[DNS_DS_BUFFERSIZE]; - bool found = false; - isc_buffer_t b; + bool found = false; + isc_buffer_t b; if (knode->dslist == NULL) { return (ISC_R_SUCCESS); @@ -256,7 +250,8 @@ delete_ds(dns_keynode_t *knode, dns_rdata_ds_t *ds, isc_mem_t *mctx) } for (rdata = ISC_LIST_HEAD(knode->dslist->rdata); rdata != NULL; - rdata = ISC_LIST_NEXT(rdata, link)) { + rdata = ISC_LIST_NEXT(rdata, link)) + { if (dns_rdata_compare(rdata, &dsrdata) == 0) { ISC_LIST_UNLINK(knode->dslist->rdata, rdata, link); isc_mem_put(mctx, rdata->data, DNS_DS_BUFFERSIZE); @@ -284,10 +279,9 @@ delete_ds(dns_keynode_t *knode, dns_rdata_ds_t *ds, isc_mem_t *mctx) */ static isc_result_t new_keynode(dns_rdata_ds_t *ds, dns_rbtnode_t *node, dns_keytable_t *keytable, - bool managed, bool initial) -{ + bool managed, bool initial) { dns_keynode_t *knode = NULL; - isc_result_t result; + isc_result_t result; REQUIRE(VALID_KEYTABLE(keytable)); REQUIRE(!initial || managed); @@ -325,10 +319,9 @@ new_keynode(dns_rdata_ds_t *ds, dns_rbtnode_t *node, dns_keytable_t *keytable, */ static isc_result_t insert(dns_keytable_t *keytable, bool managed, bool initial, - const dns_name_t *keyname, dns_rdata_ds_t *ds) -{ + const dns_name_t *keyname, dns_rdata_ds_t *ds) { dns_rbtnode_t *node = NULL; - isc_result_t result; + isc_result_t result; REQUIRE(VALID_KEYTABLE(keytable)); @@ -375,8 +368,7 @@ insert(dns_keytable_t *keytable, bool managed, bool initial, isc_result_t dns_keytable_add(dns_keytable_t *keytable, bool managed, bool initial, - dns_name_t *name, dns_rdata_ds_t *ds) -{ + dns_name_t *name, dns_rdata_ds_t *ds) { REQUIRE(ds != NULL); REQUIRE(!initial || managed); @@ -384,15 +376,13 @@ dns_keytable_add(dns_keytable_t *keytable, bool managed, bool initial, } isc_result_t -dns_keytable_marksecure(dns_keytable_t *keytable, const dns_name_t *name) -{ +dns_keytable_marksecure(dns_keytable_t *keytable, const dns_name_t *name) { return (insert(keytable, true, false, name, NULL)); } isc_result_t -dns_keytable_delete(dns_keytable_t *keytable, const dns_name_t *keyname) -{ - isc_result_t result; +dns_keytable_delete(dns_keytable_t *keytable, const dns_name_t *keyname) { + isc_result_t result; dns_rbtnode_t *node = NULL; REQUIRE(VALID_KEYTABLE(keytable)); @@ -418,15 +408,14 @@ dns_keytable_delete(dns_keytable_t *keytable, const dns_name_t *keyname) isc_result_t dns_keytable_deletekey(dns_keytable_t *keytable, const dns_name_t *keyname, - dns_rdata_dnskey_t *dnskey) -{ - isc_result_t result; + dns_rdata_dnskey_t *dnskey) { + isc_result_t result; dns_rbtnode_t *node = NULL; dns_keynode_t *knode = NULL; - dns_rdata_t rdata = DNS_RDATA_INIT; - unsigned char data[4096], digest[DNS_DS_BUFFERSIZE]; + dns_rdata_t rdata = DNS_RDATA_INIT; + unsigned char data[4096], digest[DNS_DS_BUFFERSIZE]; dns_rdata_ds_t ds; - isc_buffer_t b; + isc_buffer_t b; REQUIRE(VALID_KEYTABLE(keytable)); REQUIRE(dnskey != NULL); @@ -473,9 +462,8 @@ finish: isc_result_t dns_keytable_find(dns_keytable_t *keytable, const dns_name_t *keyname, - dns_keynode_t **keynodep) -{ - isc_result_t result; + dns_keynode_t **keynodep) { + isc_result_t result; dns_rbtnode_t *node = NULL; REQUIRE(VALID_KEYTABLE(keytable)); @@ -501,10 +489,9 @@ dns_keytable_find(dns_keytable_t *keytable, const dns_name_t *keyname, isc_result_t dns_keytable_finddeepestmatch(dns_keytable_t *keytable, const dns_name_t *name, - dns_name_t *foundname) -{ + dns_name_t *foundname) { isc_result_t result; - void * data; + void *data; /* * Search for the deepest match in 'keytable'. @@ -529,8 +516,7 @@ dns_keytable_finddeepestmatch(dns_keytable_t *keytable, const dns_name_t *name, } void -dns_keytable_detachkeynode(dns_keytable_t *keytable, dns_keynode_t **keynodep) -{ +dns_keytable_detachkeynode(dns_keytable_t *keytable, dns_keynode_t **keynodep) { /* * Give back a keynode found via dns_keytable_findkeynode(). */ @@ -543,9 +529,8 @@ dns_keytable_detachkeynode(dns_keytable_t *keytable, dns_keynode_t **keynodep) isc_result_t dns_keytable_issecuredomain(dns_keytable_t *keytable, const dns_name_t *name, - dns_name_t *foundname, bool *wantdnssecp) -{ - isc_result_t result; + dns_name_t *foundname, bool *wantdnssecp) { + isc_result_t result; dns_rbtnode_t *node = NULL; /* @@ -575,8 +560,7 @@ dns_keytable_issecuredomain(dns_keytable_t *keytable, const dns_name_t *name, } static isc_result_t -putstr(isc_buffer_t **b, const char *str) -{ +putstr(isc_buffer_t **b, const char *str) { isc_result_t result; result = isc_buffer_reserve(b, strlen(str)); @@ -589,9 +573,8 @@ putstr(isc_buffer_t **b, const char *str) } isc_result_t -dns_keytable_dump(dns_keytable_t *keytable, FILE *fp) -{ - isc_result_t result; +dns_keytable_dump(dns_keytable_t *keytable, FILE *fp) { + isc_result_t result; isc_buffer_t *text = NULL; REQUIRE(VALID_KEYTABLE(keytable)); @@ -619,11 +602,10 @@ dns_keytable_dump(dns_keytable_t *keytable, FILE *fp) static isc_result_t keynode_dslist_totext(dns_name_t *name, dns_keynode_t *keynode, - isc_buffer_t **text) -{ - isc_result_t result; - char namebuf[DNS_NAME_FORMATSIZE]; - char obuf[DNS_NAME_FORMATSIZE + 200]; + isc_buffer_t **text) { + isc_result_t result; + char namebuf[DNS_NAME_FORMATSIZE]; + char obuf[DNS_NAME_FORMATSIZE + 200]; dns_rdataset_t *dsset = NULL; dns_name_format(name, namebuf, sizeof(namebuf)); @@ -631,9 +613,10 @@ keynode_dslist_totext(dns_name_t *name, dns_keynode_t *keynode, dsset = dns_keynode_dsset(keynode); for (result = dns_rdataset_first(dsset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(dsset)) { - char algbuf[DNS_SECALG_FORMATSIZE]; - dns_rdata_t rdata = DNS_RDATA_INIT; + result = dns_rdataset_next(dsset)) + { + char algbuf[DNS_SECALG_FORMATSIZE]; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_ds_t ds; dns_rdataset_current(dsset, &rdata); @@ -657,14 +640,13 @@ keynode_dslist_totext(dns_name_t *name, dns_keynode_t *keynode, } isc_result_t -dns_keytable_totext(dns_keytable_t *keytable, isc_buffer_t **text) -{ - isc_result_t result; - dns_keynode_t * knode; - dns_rbtnode_t * node; +dns_keytable_totext(dns_keytable_t *keytable, isc_buffer_t **text) { + isc_result_t result; + dns_keynode_t *knode; + dns_rbtnode_t *node; dns_rbtnodechain_t chain; - dns_name_t * foundname, *origin, *fullname; - dns_fixedname_t fixedfoundname, fixedorigin, fixedfullname; + dns_name_t *foundname, *origin, *fullname; + dns_fixedname_t fixedfoundname, fixedorigin, fixedfullname; REQUIRE(VALID_KEYTABLE(keytable)); REQUIRE(text != NULL && *text != NULL); @@ -718,13 +700,12 @@ isc_result_t dns_keytable_forall(dns_keytable_t *keytable, void (*func)(dns_keytable_t *, dns_keynode_t *, dns_name_t *, void *), - void *arg) -{ - isc_result_t result; - dns_rbtnode_t * node; + void *arg) { + isc_result_t result; + dns_rbtnode_t *node; dns_rbtnodechain_t chain; - dns_fixedname_t fixedfoundname, fixedorigin, fixedfullname; - dns_name_t * foundname, *origin, *fullname; + dns_fixedname_t fixedfoundname, fixedorigin, fixedfullname; + dns_name_t *foundname, *origin, *fullname; REQUIRE(VALID_KEYTABLE(keytable)); @@ -766,8 +747,7 @@ cleanup: } dns_rdataset_t * -dns_keynode_dsset(dns_keynode_t *keynode) -{ +dns_keynode_dsset(dns_keynode_t *keynode) { REQUIRE(VALID_KEYNODE(keynode)); if (keynode->dslist != NULL) { @@ -778,24 +758,21 @@ dns_keynode_dsset(dns_keynode_t *keynode) } bool -dns_keynode_managed(dns_keynode_t *keynode) -{ +dns_keynode_managed(dns_keynode_t *keynode) { REQUIRE(VALID_KEYNODE(keynode)); return (keynode->managed); } bool -dns_keynode_initial(dns_keynode_t *keynode) -{ +dns_keynode_initial(dns_keynode_t *keynode) { REQUIRE(VALID_KEYNODE(keynode)); return (keynode->initial); } void -dns_keynode_trust(dns_keynode_t *keynode) -{ +dns_keynode_trust(dns_keynode_t *keynode) { REQUIRE(VALID_KEYNODE(keynode)); keynode->initial = false; diff --git a/lib/dns/lib.c b/lib/dns/lib.c index b9e8d8100f..b4e7f1c6d5 100644 --- a/lib/dns/lib.c +++ b/lib/dns/lib.c @@ -38,15 +38,14 @@ LIBDNS_EXTERNAL_DATA unsigned int dns_pps = 0U; *** Functions ***/ -static isc_once_t init_once = ISC_ONCE_INIT; -static isc_mem_t * dns_g_mctx = NULL; +static isc_once_t init_once = ISC_ONCE_INIT; +static isc_mem_t *dns_g_mctx = NULL; static dns_dbimplementation_t *dbimp = NULL; -static bool initialize_done = false; -static isc_refcount_t references; +static bool initialize_done = false; +static isc_refcount_t references; static void -initialize(void) -{ +initialize(void) { isc_result_t result; REQUIRE(initialize_done == false); @@ -79,8 +78,7 @@ cleanup_mctx: } isc_result_t -dns_lib_init(void) -{ +dns_lib_init(void) { isc_result_t result; /* @@ -103,8 +101,7 @@ dns_lib_init(void) } void -dns_lib_shutdown(void) -{ +dns_lib_shutdown(void) { if (isc_refcount_decrement(&references) == 1) { dst_lib_destroy(); diff --git a/lib/dns/log.c b/lib/dns/log.c index 869260784e..5964d1ba49 100644 --- a/lib/dns/log.c +++ b/lib/dns/log.c @@ -69,8 +69,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns_modules[] = { LIBDNS_EXTERNAL_DATA isc_log_t *dns_lctx = NULL; void -dns_log_init(isc_log_t *lctx) -{ +dns_log_init(isc_log_t *lctx) { REQUIRE(lctx != NULL); isc_log_registercategories(lctx, dns_categories); @@ -78,7 +77,6 @@ dns_log_init(isc_log_t *lctx) } void -dns_log_setcontext(isc_log_t *lctx) -{ +dns_log_setcontext(isc_log_t *lctx) { dns_lctx = lctx; } diff --git a/lib/dns/lookup.c b/lib/dns/lookup.c index d71b5417ef..6b58625bb4 100644 --- a/lib/dns/lookup.c +++ b/lib/dns/lookup.c @@ -31,35 +31,33 @@ struct dns_lookup { /* Unlocked. */ - unsigned int magic; - isc_mem_t * mctx; - isc_mutex_t lock; + unsigned int magic; + isc_mem_t *mctx; + isc_mutex_t lock; dns_rdatatype_t type; dns_fixedname_t name; /* Locked by lock. */ - unsigned int options; - isc_task_t * task; - dns_view_t * view; + unsigned int options; + isc_task_t *task; + dns_view_t *view; dns_lookupevent_t *event; - dns_fetch_t * fetch; - unsigned int restarts; - bool canceled; - dns_rdataset_t rdataset; - dns_rdataset_t sigrdataset; + dns_fetch_t *fetch; + unsigned int restarts; + bool canceled; + dns_rdataset_t rdataset; + dns_rdataset_t sigrdataset; }; -#define LOOKUP_MAGIC ISC_MAGIC('l', 'o', 'o', 'k') +#define LOOKUP_MAGIC ISC_MAGIC('l', 'o', 'o', 'k') #define VALID_LOOKUP(l) ISC_MAGIC_VALID((l), LOOKUP_MAGIC) #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) -{ - dns_lookup_t * lookup = event->ev_arg; +fetch_done(isc_task_t *task, isc_event_t *event) { + dns_lookup_t *lookup = event->ev_arg; dns_fetchevent_t *fevent; UNUSED(task); @@ -73,8 +71,7 @@ fetch_done(isc_task_t *task, isc_event_t *event) } static inline isc_result_t -start_fetch(dns_lookup_t *lookup) -{ +start_fetch(dns_lookup_t *lookup) { isc_result_t result; /* @@ -93,9 +90,8 @@ start_fetch(dns_lookup_t *lookup) } static isc_result_t -build_event(dns_lookup_t *lookup) -{ - dns_name_t * name = NULL; +build_event(dns_lookup_t *lookup) { + dns_name_t *name = NULL; dns_rdataset_t *rdataset = NULL; dns_rdataset_t *sigrdataset = NULL; @@ -123,10 +119,9 @@ build_event(dns_lookup_t *lookup) } static isc_result_t -view_find(dns_lookup_t *lookup, dns_name_t *foundname) -{ - isc_result_t result; - dns_name_t * name = dns_fixedname_name(&lookup->name); +view_find(dns_lookup_t *lookup, dns_name_t *foundname) { + isc_result_t result; + dns_name_t *name = dns_fixedname_name(&lookup->name); dns_rdatatype_t type; if (lookup->type == dns_rdatatype_rrsig) { @@ -143,17 +138,16 @@ view_find(dns_lookup_t *lookup, dns_name_t *foundname) } static void -lookup_find(dns_lookup_t *lookup, dns_fetchevent_t *event) -{ - isc_result_t result; - bool want_restart; - bool send_event; - dns_name_t * name, *fname, *prefix; - dns_fixedname_t foundname, fixed; - dns_rdata_t rdata = DNS_RDATA_INIT; - unsigned int nlabels; - int order; - dns_namereln_t namereln; +lookup_find(dns_lookup_t *lookup, dns_fetchevent_t *event) { + isc_result_t result; + bool want_restart; + bool send_event; + dns_name_t *name, *fname, *prefix; + dns_fixedname_t foundname, fixed; + dns_rdata_t rdata = DNS_RDATA_INIT; + unsigned int nlabels; + int order; + dns_namereln_t namereln; dns_rdata_cname_t cname; dns_rdata_dname_t dname; @@ -331,10 +325,9 @@ lookup_find(dns_lookup_t *lookup, dns_fetchevent_t *event) } static void -levent_destroy(isc_event_t *event) -{ +levent_destroy(isc_event_t *event) { dns_lookupevent_t *levent; - isc_mem_t * mctx; + isc_mem_t *mctx; REQUIRE(event->ev_type == DNS_EVENT_LOOKUPDONE); mctx = event->ev_destroy_arg; @@ -366,10 +359,9 @@ levent_destroy(isc_event_t *event) isc_result_t dns_lookup_create(isc_mem_t *mctx, const dns_name_t *name, dns_rdatatype_t type, dns_view_t *view, unsigned int options, isc_task_t *task, - isc_taskaction_t action, void *arg, dns_lookup_t **lookupp) -{ + isc_taskaction_t action, void *arg, dns_lookup_t **lookupp) { dns_lookup_t *lookup; - isc_event_t * ievent; + isc_event_t *ievent; lookup = isc_mem_get(mctx, sizeof(*lookup)); lookup->mctx = NULL; @@ -415,8 +407,7 @@ dns_lookup_create(isc_mem_t *mctx, const dns_name_t *name, dns_rdatatype_t type, } void -dns_lookup_cancel(dns_lookup_t *lookup) -{ +dns_lookup_cancel(dns_lookup_t *lookup) { REQUIRE(VALID_LOOKUP(lookup)); LOCK(&lookup->lock); @@ -433,8 +424,7 @@ dns_lookup_cancel(dns_lookup_t *lookup) } void -dns_lookup_destroy(dns_lookup_t **lookupp) -{ +dns_lookup_destroy(dns_lookup_t **lookupp) { dns_lookup_t *lookup; REQUIRE(lookupp != NULL); diff --git a/lib/dns/master.c b/lib/dns/master.c index 092b4e6823..d93a9bdaa9 100644 --- a/lib/dns/master.c +++ b/lib/dns/master.c @@ -57,7 +57,7 @@ */ #define RDSZ 512 -#define NBUFS 4 +#define NBUFS 4 #define MAXWIRESZ 255 /*% @@ -97,14 +97,14 @@ typedef struct dns_incctx dns_incctx_t; */ struct dns_loadctx { - unsigned int magic; - isc_mem_t * mctx; + unsigned int magic; + isc_mem_t *mctx; dns_masterformat_t format; dns_rdatacallbacks_t *callbacks; - isc_task_t * task; - dns_loaddonefunc_t done; - void * done_arg; + isc_task_t *task; + dns_loaddonefunc_t done; + void *done_arg; /* Common methods */ isc_result_t (*openfile)(dns_loadctx_t *lctx, const char *filename); @@ -114,24 +114,24 @@ struct dns_loadctx { uint32_t maxttl; /* Members specific to the text format: */ - isc_lex_t * lex; - bool keep_lex; - unsigned int options; - bool ttl_known; - bool default_ttl_known; - bool warn_1035; - bool warn_tcr; - bool warn_sigexpired; - bool seen_include; - uint32_t ttl; - uint32_t default_ttl; + isc_lex_t *lex; + bool keep_lex; + unsigned int options; + bool ttl_known; + bool default_ttl_known; + bool warn_1035; + bool warn_tcr; + bool warn_sigexpired; + bool seen_include; + uint32_t ttl; + uint32_t default_ttl; dns_rdataclass_t zclass; - dns_fixedname_t fixed_top; - dns_name_t * top; /*%< top of zone */ + dns_fixedname_t fixed_top; + dns_name_t *top; /*%< top of zone */ /* Members specific to the raw format: */ - FILE * f; - bool first; + FILE *f; + bool first; dns_masterrawheader_t header; /* Which fixed buffers we are using? */ @@ -141,82 +141,71 @@ struct dns_loadctx { /* Atomic */ isc_refcount_t references; - atomic_bool canceled; + atomic_bool canceled; /* locked by lock */ dns_incctx_t *inc; - uint32_t resign; + uint32_t resign; isc_stdtime_t now; dns_masterincludecb_t include_cb; - void * include_arg; + void *include_arg; }; struct dns_incctx { - dns_incctx_t * parent; - dns_name_t * origin; - dns_name_t * current; - dns_name_t * glue; - dns_fixedname_t fixed[NBUFS]; /* working buffers */ - unsigned int in_use[NBUFS]; /* covert to bitmap? */ - int glue_in_use; - int current_in_use; - int origin_in_use; - bool origin_changed; - bool drop; - unsigned int glue_line; - unsigned int current_line; + dns_incctx_t *parent; + dns_name_t *origin; + dns_name_t *current; + dns_name_t *glue; + dns_fixedname_t fixed[NBUFS]; /* working buffers */ + unsigned int in_use[NBUFS]; /* covert to bitmap? */ + int glue_in_use; + int current_in_use; + int origin_in_use; + bool origin_changed; + bool drop; + unsigned int glue_line; + unsigned int current_line; }; -#define DNS_LCTX_MAGIC ISC_MAGIC('L', 'c', 't', 'x') +#define DNS_LCTX_MAGIC ISC_MAGIC('L', 'c', 't', 'x') #define DNS_LCTX_VALID(lctx) ISC_MAGIC_VALID(lctx, DNS_LCTX_MAGIC) #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 { \ @@ -324,25 +313,24 @@ loadctx_destroy(dns_loadctx_t *lctx); "dns_master_load", source, line, \ dns_result_totext(result)) -static unsigned char in_addr_arpa_data[] = "\007IN-ADDR\004ARPA"; -static unsigned char in_addr_arpa_offsets[] = { 0, 8, 13 }; +static unsigned char in_addr_arpa_data[] = "\007IN-ADDR\004ARPA"; +static unsigned char in_addr_arpa_offsets[] = { 0, 8, 13 }; static dns_name_t const in_addr_arpa = DNS_NAME_INITABSOLUTE(in_addr_arpa_data, in_addr_arpa_offsets); -static unsigned char ip6_int_data[] = "\003IP6\003INT"; -static unsigned char ip6_int_offsets[] = { 0, 4, 8 }; -static dns_name_t const ip6_int = - DNS_NAME_INITABSOLUTE(ip6_int_data, ip6_int_offsets); +static unsigned char ip6_int_data[] = "\003IP6\003INT"; +static unsigned char ip6_int_offsets[] = { 0, 4, 8 }; +static dns_name_t const ip6_int = DNS_NAME_INITABSOLUTE(ip6_int_data, + ip6_int_offsets); -static unsigned char ip6_arpa_data[] = "\003IP6\004ARPA"; -static unsigned char ip6_arpa_offsets[] = { 0, 4, 9 }; -static dns_name_t const ip6_arpa = - DNS_NAME_INITABSOLUTE(ip6_arpa_data, ip6_arpa_offsets); +static unsigned char ip6_arpa_data[] = "\003IP6\004ARPA"; +static unsigned char ip6_arpa_offsets[] = { 0, 4, 9 }; +static dns_name_t const ip6_arpa = DNS_NAME_INITABSOLUTE(ip6_arpa_data, + ip6_arpa_offsets); static inline isc_result_t gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *token, bool eol, - dns_rdatacallbacks_t *callbacks) -{ + dns_rdatacallbacks_t *callbacks) { isc_result_t result; options |= ISC_LEXOPT_EOL | ISC_LEXOPT_EOF | ISC_LEXOPT_DNSMULTILINE | @@ -368,8 +356,8 @@ gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *token, bool eol, token->type == isc_tokentype_eof) { { unsigned long int line; - const char * what; - const char * file; + const char *what; + const char *file; file = isc_lex_getsourcename(lex); line = isc_lex_getsourceline(lex); if (token->type == isc_tokentype_eol) { @@ -390,8 +378,7 @@ gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *token, bool eol, } void -dns_loadctx_attach(dns_loadctx_t *source, dns_loadctx_t **target) -{ +dns_loadctx_attach(dns_loadctx_t *source, dns_loadctx_t **target) { REQUIRE(target != NULL && *target == NULL); REQUIRE(DNS_LCTX_VALID(source)); @@ -401,8 +388,7 @@ dns_loadctx_attach(dns_loadctx_t *source, dns_loadctx_t **target) } void -dns_loadctx_detach(dns_loadctx_t **lctxp) -{ +dns_loadctx_detach(dns_loadctx_t **lctxp) { dns_loadctx_t *lctx; REQUIRE(lctxp != NULL); @@ -416,8 +402,7 @@ dns_loadctx_detach(dns_loadctx_t **lctxp) } static void -incctx_destroy(isc_mem_t *mctx, dns_incctx_t *ictx) -{ +incctx_destroy(isc_mem_t *mctx, dns_incctx_t *ictx) { dns_incctx_t *parent; again: @@ -433,8 +418,7 @@ again: } static void -loadctx_destroy(dns_loadctx_t *lctx) -{ +loadctx_destroy(dns_loadctx_t *lctx) { REQUIRE(DNS_LCTX_VALID(lctx)); isc_refcount_destroy(&lctx->references); @@ -466,11 +450,10 @@ loadctx_destroy(dns_loadctx_t *lctx) } static isc_result_t -incctx_create(isc_mem_t *mctx, dns_name_t *origin, dns_incctx_t **ictxp) -{ +incctx_create(isc_mem_t *mctx, dns_name_t *origin, dns_incctx_t **ictxp) { dns_incctx_t *ictx; - isc_region_t r; - int i; + isc_region_t r; + int i; ictx = isc_mem_get(mctx, sizeof(*ictx)); @@ -505,11 +488,10 @@ loadctx_create(dns_masterformat_t format, isc_mem_t *mctx, unsigned int options, dns_name_t *origin, dns_rdatacallbacks_t *callbacks, isc_task_t *task, dns_loaddonefunc_t done, void *done_arg, dns_masterincludecb_t include_cb, void *include_arg, - isc_lex_t *lex, dns_loadctx_t **lctxp) -{ - dns_loadctx_t * lctx; - isc_result_t result; - isc_region_t r; + isc_lex_t *lex, dns_loadctx_t **lctxp) { + dns_loadctx_t *lctx; + isc_result_t result; + isc_region_t r; isc_lexspecials_t specials; REQUIRE(lctxp != NULL && *lctxp == NULL); @@ -635,8 +617,7 @@ static const char *hex = "0123456789abcdef0123456789ABCDEF"; * counting the terminating NUL. */ static unsigned int -nibbles(char *numbuf, size_t length, unsigned int width, char mode, int value) -{ +nibbles(char *numbuf, size_t length, unsigned int width, char mode, int value) { unsigned int count = 0; /* @@ -679,17 +660,16 @@ nibbles(char *numbuf, size_t length, unsigned int width, char mode, int value) } static isc_result_t -genname(char *name, int it, char *buffer, size_t length) -{ - char fmt[sizeof("%04000000000d")]; - char numbuf[128]; - char * cp; - char mode[2]; - int delta = 0; +genname(char *name, int it, char *buffer, size_t length) { + char fmt[sizeof("%04000000000d")]; + char numbuf[128]; + char *cp; + char mode[2]; + int delta = 0; isc_textregion_t r; - unsigned int n; - unsigned int width; - bool nibblemode; + unsigned int n; + unsigned int width; + bool nibblemode; r.base = buffer; r.length = (unsigned int)length; @@ -785,26 +765,25 @@ genname(char *name, int it, char *buffer, size_t length) static isc_result_t generate(dns_loadctx_t *lctx, char *range, char *lhs, char *gtype, char *rhs, - const char *source, unsigned int line) -{ - char * target_mem = NULL; - char * lhsbuf = NULL; - char * rhsbuf = NULL; - dns_fixedname_t ownerfixed; - dns_name_t * owner; - dns_rdata_t rdata = DNS_RDATA_INIT; + const char *source, unsigned int line) { + char *target_mem = NULL; + char *lhsbuf = NULL; + char *rhsbuf = NULL; + dns_fixedname_t ownerfixed; + dns_name_t *owner; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdatacallbacks_t *callbacks; - dns_rdatalist_t rdatalist; - dns_rdatatype_t type; - rdatalist_head_t head; - int target_size = MINTSIZ; /* only one rdata at a time */ - isc_buffer_t buffer; - isc_buffer_t target; - isc_result_t result; + dns_rdatalist_t rdatalist; + dns_rdatatype_t type; + rdatalist_head_t head; + int target_size = MINTSIZ; /* only one rdata at a time */ + isc_buffer_t buffer; + isc_buffer_t target; + isc_result_t result; isc_textregion_t r; - int i, n, start, stop, step = 0; - dns_incctx_t * ictx; - char dummy[2]; + int i, n, start, stop, step = 0; + dns_incctx_t *ictx; + char dummy[2]; ictx = lctx->inc; callbacks = lctx->callbacks; @@ -822,7 +801,8 @@ generate(dns_loadctx_t *lctx, char *range, char *lhs, char *gtype, char *rhs, n = sscanf(range, "%d-%d%1[/]%d", &start, &stop, dummy, &step); if ((n != 2 && n != 4) || (start < 0) || (stop < 0) || - (n == 4 && step < 1) || (stop < start)) { + (n == 4 && step < 1) || (stop < start)) + { (*callbacks->error)(callbacks, "%s: %s:%lu: invalid range '%s'", "$GENERATE", source, line, range); result = DNS_R_SYNTAX; @@ -851,7 +831,8 @@ generate(dns_loadctx_t *lctx, char *range, char *lhs, char *gtype, char *rhs, */ if ((lctx->options & DNS_MASTER_ZONE) != 0 && (lctx->options & DNS_MASTER_SLAVE) == 0 && - dns_rdatatype_ismeta(type)) { + dns_rdatatype_ismeta(type)) + { (*callbacks->error)(callbacks, "%s: %s:%lu: meta RR type '%s'", "$GENERATE", source, line, gtype); result = DNS_R_METATYPE; @@ -880,7 +861,8 @@ generate(dns_loadctx_t *lctx, char *range, char *lhs, char *gtype, char *rhs, if ((lctx->options & DNS_MASTER_ZONE) != 0 && (lctx->options & DNS_MASTER_SLAVE) == 0 && (lctx->options & DNS_MASTER_KEY) == 0 && - !dns_name_issubdomain(owner, lctx->top)) { + !dns_name_issubdomain(owner, lctx->top)) + { char namebuf[DNS_NAME_FORMATSIZE]; dns_name_format(owner, namebuf, sizeof(namebuf)); /* @@ -954,8 +936,7 @@ cleanup: static void limit_ttl(dns_rdatacallbacks_t *callbacks, const char *source, - unsigned int line, uint32_t *ttlp) -{ + unsigned int line, uint32_t *ttlp) { if (*ttlp > 0x7fffffffUL) { (callbacks->warn)(callbacks, "%s: %s:%lu: " @@ -968,9 +949,8 @@ limit_ttl(dns_rdatacallbacks_t *callbacks, const char *source, static isc_result_t check_ns(dns_loadctx_t *lctx, isc_token_t *token, const char *source, - unsigned long line) -{ - char * tmp = NULL; + unsigned long line) { + char *tmp = NULL; isc_result_t result = ISC_R_SUCCESS; void (*callback)(struct dns_rdatacallbacks *, const char *, ...); @@ -981,7 +961,7 @@ check_ns(dns_loadctx_t *lctx, isc_token_t *token, const char *source, } if (token->type == isc_tokentype_string) { - struct in_addr addr; + struct in_addr addr; struct in6_addr addr6; tmp = isc_mem_strdup(lctx->mctx, DNS_AS_STR(*token)); @@ -992,7 +972,8 @@ check_ns(dns_loadctx_t *lctx, isc_token_t *token, const char *source, tmp[strlen(tmp) - 1] = '\0'; } if (inet_pton(AF_INET, tmp, &addr) == 1 || - inet_pton(AF_INET6, tmp, &addr6) == 1) { + inet_pton(AF_INET6, tmp, &addr6) == 1) + { result = DNS_R_NSISADDRESS; } } @@ -1010,8 +991,7 @@ check_ns(dns_loadctx_t *lctx, isc_token_t *token, const char *source, static void check_wildcard(dns_incctx_t *ictx, const char *source, unsigned long line, - dns_rdatacallbacks_t *callbacks) -{ + dns_rdatacallbacks_t *callbacks) { dns_name_t *name; name = (ictx->glue != NULL) ? ictx->glue : ictx->current; @@ -1027,14 +1007,12 @@ check_wildcard(dns_incctx_t *ictx, const char *source, unsigned long line, } static isc_result_t -openfile_text(dns_loadctx_t *lctx, const char *master_file) -{ +openfile_text(dns_loadctx_t *lctx, const char *master_file) { return (isc_lex_openfile(lctx->lex, master_file)); } static int -find_free_name(dns_incctx_t *incctx) -{ +find_free_name(dns_incctx_t *incctx) { int i; for (i = 0; i < (NBUFS - 1); i++) { @@ -1047,55 +1025,54 @@ find_free_name(dns_incctx_t *incctx) } static isc_result_t -load_text(dns_loadctx_t *lctx) -{ +load_text(dns_loadctx_t *lctx) { dns_rdataclass_t rdclass; - dns_rdatatype_t type, covers; - uint32_t ttl_offset = 0; - dns_name_t * new_name; - bool current_has_delegation = false; - bool done = false; - bool finish_origin = false; - bool finish_include = false; - bool read_till_eol = false; - bool initialws; - char * include_file = NULL; - isc_token_t token; - isc_result_t result = ISC_R_UNEXPECTED; + dns_rdatatype_t type, covers; + uint32_t ttl_offset = 0; + dns_name_t *new_name; + bool current_has_delegation = false; + bool done = false; + bool finish_origin = false; + bool finish_include = false; + bool read_till_eol = false; + bool initialws; + char *include_file = NULL; + isc_token_t token; + isc_result_t result = ISC_R_UNEXPECTED; rdatalist_head_t glue_list; rdatalist_head_t current_list; dns_rdatalist_t *this; - dns_rdatalist_t * rdatalist = NULL; - dns_rdatalist_t * new_rdatalist; - int rdlcount = 0; - int rdlcount_save = 0; - int rdatalist_size = 0; - isc_buffer_t buffer; - isc_buffer_t target; - isc_buffer_t target_ft; - isc_buffer_t target_save; - dns_rdata_t * rdata = NULL; - dns_rdata_t * new_rdata; - int rdcount = 0; - int rdcount_save = 0; - int rdata_size = 0; - unsigned char * target_mem = NULL; - int target_size = TSIZ; - int new_in_use; - unsigned int loop_cnt = 0; - isc_mem_t * mctx; + dns_rdatalist_t *rdatalist = NULL; + dns_rdatalist_t *new_rdatalist; + int rdlcount = 0; + int rdlcount_save = 0; + int rdatalist_size = 0; + isc_buffer_t buffer; + isc_buffer_t target; + isc_buffer_t target_ft; + isc_buffer_t target_save; + dns_rdata_t *rdata = NULL; + dns_rdata_t *new_rdata; + int rdcount = 0; + int rdcount_save = 0; + int rdata_size = 0; + unsigned char *target_mem = NULL; + int target_size = TSIZ; + int new_in_use; + unsigned int loop_cnt = 0; + isc_mem_t *mctx; dns_rdatacallbacks_t *callbacks; - dns_incctx_t * ictx; - char * range = NULL; - char * lhs = NULL; - char * gtype = NULL; - char * rhs = NULL; - const char * source = ""; - unsigned long line = 0; - bool explicit_ttl; - char classname1[DNS_RDATACLASS_FORMATSIZE]; - char classname2[DNS_RDATACLASS_FORMATSIZE]; - unsigned int options = 0; + dns_incctx_t *ictx; + char *range = NULL; + char *lhs = NULL; + char *gtype = NULL; + char *rhs = NULL; + const char *source = ""; + unsigned long line = 0; + bool explicit_ttl; + char classname1[DNS_RDATACLASS_FORMATSIZE]; + char classname2[DNS_RDATACLASS_FORMATSIZE]; + unsigned int options = 0; REQUIRE(DNS_LCTX_VALID(lctx)); callbacks = lctx->callbacks; @@ -1170,7 +1147,8 @@ load_text(dns_loadctx_t *lctx) */ initialws = true; } else if (token.type == isc_tokentype_string || - token.type == isc_tokentype_qstring) { + token.type == isc_tokentype_qstring) + { /* * "$" Support. * @@ -1202,8 +1180,8 @@ load_text(dns_loadctx_t *lctx) } else if (strcasecmp(DNS_AS_STR(token), "$INCLUDE") == 0) { COMMITALL; - if ((lctx->options & DNS_MASTER_NOINCLUDE) != - 0) { + if ((lctx->options & DNS_MASTER_NOINCLUDE) != 0) + { (callbacks->error)(callbacks, "%s: %s:%lu: " "$INCLUDE not " @@ -1264,9 +1242,9 @@ load_text(dns_loadctx_t *lctx) * the actual inclusion later. */ finish_include = true; - } else if (strcasecmp(DNS_AS_STR(token), "$DATE") == - 0) { - int64_t dump_time64; + } else if (strcasecmp(DNS_AS_STR(token), "$DATE") == 0) + { + int64_t dump_time64; isc_stdtime_t dump_time, current_time; GETTOKEN(lctx->lex, 0, &token, false); isc_stdtime_get(¤t_time); @@ -1332,7 +1310,8 @@ load_text(dns_loadctx_t *lctx) if (dns_rdataclass_fromtext( &rdclass, &token.value.as_textregion) == - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { GETTOKEN(lctx->lex, 0, &token, false); } /* TTL? */ @@ -1350,7 +1329,8 @@ load_text(dns_loadctx_t *lctx) dns_rdataclass_fromtext( &rdclass, &token.value.as_textregion) == - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { GETTOKEN(lctx->lex, 0, &token, false); } /* TYPE */ @@ -1394,8 +1374,8 @@ load_text(dns_loadctx_t *lctx) } EXPECTEOL; continue; - } else if (strncasecmp(DNS_AS_STR(token), "$", 1) == - 0) { + } else if (strncasecmp(DNS_AS_STR(token), "$", 1) == 0) + { (callbacks->error)(callbacks, "%s: %s:%lu: " "unknown $ directive '%s'", @@ -1506,7 +1486,8 @@ load_text(dns_loadctx_t *lctx) */ if ((ictx->glue == NULL) && (ictx->current == NULL || - !dns_name_caseequal(ictx->current, new_name))) { + !dns_name_caseequal(ictx->current, new_name))) + { if (current_has_delegation && is_glue(¤t_list, new_name)) { rdcount_save = rdcount; @@ -1552,7 +1533,8 @@ load_text(dns_loadctx_t *lctx) if ((lctx->options & DNS_MASTER_ZONE) != 0 && (lctx->options & DNS_MASTER_SLAVE) == 0 && (lctx->options & DNS_MASTER_KEY) == 0 && - !dns_name_issubdomain(new_name, lctx->top)) { + !dns_name_issubdomain(new_name, lctx->top)) + { char namebuf[DNS_NAME_FORMATSIZE]; dns_name_format(new_name, namebuf, sizeof(namebuf)); @@ -1646,7 +1628,8 @@ load_text(dns_loadctx_t *lctx) if (dns_rdataclass_fromtext(&rdclass, &token.value.as_textregion) == - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { GETTOKEN(lctx->lex, 0, &token, false); } @@ -1677,7 +1660,8 @@ load_text(dns_loadctx_t *lctx) if (rdclass == 0 && dns_rdataclass_fromtext(&rdclass, &token.value.as_textregion) == - ISC_R_SUCCESS) { + ISC_R_SUCCESS) + { GETTOKEN(lctx->lex, 0, &token, false); } @@ -1747,7 +1731,8 @@ load_text(dns_loadctx_t *lctx) */ if ((lctx->options & DNS_MASTER_ZONE) != 0 && (lctx->options & DNS_MASTER_SLAVE) == 0 && - (type == dns_rdatatype_md || type == dns_rdatatype_mf)) { + (type == dns_rdatatype_md || type == dns_rdatatype_mf)) + { char typebuf[DNS_RDATATYPE_FORMATSIZE]; result = DNS_R_OBSOLETE; @@ -1769,7 +1754,8 @@ load_text(dns_loadctx_t *lctx) */ if ((lctx->options & DNS_MASTER_ZONE) != 0 && (lctx->options & DNS_MASTER_SLAVE) == 0 && - dns_rdatatype_ismeta(type)) { + dns_rdatatype_ismeta(type)) + { char typebuf[DNS_RDATATYPE_FORMATSIZE]; result = DNS_R_METATYPE; @@ -1805,7 +1791,8 @@ load_text(dns_loadctx_t *lctx) */ if (type == dns_rdatatype_ns && lctx->zclass == dns_rdataclass_in && - (lctx->options & DNS_MASTER_CHECKNS) != 0) { + (lctx->options & DNS_MASTER_CHECKNS) != 0) + { GETTOKEN(lctx->lex, 0, &token, false); result = check_ns(lctx, &token, source, line); isc_lex_ungettoken(lctx->lex, &token); @@ -1823,7 +1810,7 @@ load_text(dns_loadctx_t *lctx) */ options &= ~DNS_RDATA_CHECKREVERSE; if ((lctx->options & DNS_MASTER_CHECKNAMES) != 0) { - bool ok; + bool ok; dns_name_t *name; name = (ictx->glue != NULL) ? ictx->glue @@ -1831,7 +1818,7 @@ load_text(dns_loadctx_t *lctx) ok = dns_rdata_checkowner(name, lctx->zclass, type, true); if (!ok) { - char namebuf[DNS_NAME_FORMATSIZE]; + char namebuf[DNS_NAME_FORMATSIZE]; const char *desc; dns_name_format(name, namebuf, sizeof(namebuf)); result = DNS_R_BADOWNERNAME; @@ -1856,7 +1843,8 @@ load_text(dns_loadctx_t *lctx) !dns_name_isdnssd(name) && (dns_name_issubdomain(name, &in_addr_arpa) || dns_name_issubdomain(name, &ip6_arpa) || - dns_name_issubdomain(name, &ip6_int))) { + dns_name_issubdomain(name, &ip6_int))) + { options |= DNS_RDATA_CHECKREVERSE; } } @@ -1883,7 +1871,8 @@ load_text(dns_loadctx_t *lctx) if (type == dns_rdatatype_soa && (lctx->options & DNS_MASTER_ZONE) != 0 && - !dns_name_equal(ictx->current, lctx->top)) { + !dns_name_equal(ictx->current, lctx->top)) + { char namebuf[DNS_NAME_FORMATSIZE]; dns_name_format(ictx->current, namebuf, sizeof(namebuf)); @@ -1950,8 +1939,8 @@ load_text(dns_loadctx_t *lctx) if (type == dns_rdatatype_rrsig && lctx->warn_sigexpired) { dns_rdata_rrsig_t sig; - result = - dns_rdata_tostruct(&rdata[rdcount], &sig, NULL); + result = dns_rdata_tostruct(&rdata[rdcount], &sig, + NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); if (isc_serial_lt(sig.timeexpire, lctx->now)) { (*callbacks->warn)(callbacks, @@ -1964,7 +1953,8 @@ load_text(dns_loadctx_t *lctx) if ((type == dns_rdatatype_sig || type == dns_rdatatype_nxt) && lctx->warn_tcr && (lctx->options & DNS_MASTER_ZONE) != 0 && - (lctx->options & DNS_MASTER_SLAVE) == 0) { + (lctx->options & DNS_MASTER_SLAVE) == 0) + { (*callbacks->warn)(callbacks, "%s:%lu: old style DNSSEC " " zone detected", @@ -2140,12 +2130,11 @@ cleanup: } static isc_result_t -pushfile(const char *master_file, dns_name_t *origin, dns_loadctx_t *lctx) -{ - isc_result_t result; +pushfile(const char *master_file, dns_name_t *origin, dns_loadctx_t *lctx) { + isc_result_t result; dns_incctx_t *ictx; dns_incctx_t *newctx = NULL; - isc_region_t r; + isc_region_t r; REQUIRE(master_file != NULL); REQUIRE(DNS_LCTX_VALID(lctx)); @@ -2198,8 +2187,7 @@ cleanup: */ static inline isc_result_t read_and_check(bool do_read, isc_buffer_t *buffer, size_t len, FILE *f, - uint32_t *totallen) -{ + uint32_t *totallen) { isc_result_t result; REQUIRE(totallen != NULL); @@ -2224,20 +2212,20 @@ read_and_check(bool do_read, isc_buffer_t *buffer, size_t len, FILE *f, } static isc_result_t -load_header(dns_loadctx_t *lctx) -{ - isc_result_t result = ISC_R_SUCCESS; +load_header(dns_loadctx_t *lctx) { + isc_result_t result = ISC_R_SUCCESS; dns_masterrawheader_t header; dns_rdatacallbacks_t *callbacks; size_t commonlen = sizeof(header.format) + sizeof(header.version); size_t remainder; unsigned char data[sizeof(header)]; - isc_buffer_t target; + isc_buffer_t target; REQUIRE(DNS_LCTX_VALID(lctx)); if (lctx->format != dns_masterformat_raw && - lctx->format != dns_masterformat_map) { + lctx->format != dns_masterformat_map) + { return (ISC_R_NOTIMPLEMENTED); } @@ -2306,8 +2294,7 @@ load_header(dns_loadctx_t *lctx) } static isc_result_t -openfile_map(dns_loadctx_t *lctx, const char *master_file) -{ +openfile_map(dns_loadctx_t *lctx, const char *master_file) { isc_result_t result; result = isc_stdio_open(master_file, "rb", &lctx->f); @@ -2324,9 +2311,8 @@ openfile_map(dns_loadctx_t *lctx, const char *master_file) * Load a map format file, using mmap() to access RBT trees directly */ static isc_result_t -load_map(dns_loadctx_t *lctx) -{ - isc_result_t result = ISC_R_SUCCESS; +load_map(dns_loadctx_t *lctx) { + isc_result_t result = ISC_R_SUCCESS; dns_rdatacallbacks_t *callbacks; REQUIRE(DNS_LCTX_VALID(lctx)); @@ -2348,8 +2334,7 @@ load_map(dns_loadctx_t *lctx) } static isc_result_t -openfile_raw(dns_loadctx_t *lctx, const char *master_file) -{ +openfile_raw(dns_loadctx_t *lctx, const char *master_file) { isc_result_t result; result = isc_stdio_open(master_file, "rb", &lctx->f); @@ -2363,24 +2348,23 @@ openfile_raw(dns_loadctx_t *lctx, const char *master_file) } static isc_result_t -load_raw(dns_loadctx_t *lctx) -{ - isc_result_t result = ISC_R_SUCCESS; - bool done = false; - unsigned int loop_cnt = 0; +load_raw(dns_loadctx_t *lctx) { + isc_result_t result = ISC_R_SUCCESS; + bool done = false; + unsigned int loop_cnt = 0; dns_rdatacallbacks_t *callbacks; - unsigned char namebuf[DNS_NAME_MAXWIRE]; - dns_fixedname_t fixed; - dns_name_t * name; - rdatalist_head_t head, dummy; - dns_rdatalist_t rdatalist; - isc_mem_t * mctx = lctx->mctx; - dns_rdata_t * rdata = NULL; - unsigned int rdata_size = 0; - int target_size = TSIZ; - isc_buffer_t target, buf; - unsigned char * target_mem = NULL; - dns_decompress_t dctx; + unsigned char namebuf[DNS_NAME_MAXWIRE]; + dns_fixedname_t fixed; + dns_name_t *name; + rdatalist_head_t head, dummy; + dns_rdatalist_t rdatalist; + isc_mem_t *mctx = lctx->mctx; + dns_rdata_t *rdata = NULL; + unsigned int rdata_size = 0; + int target_size = TSIZ; + isc_buffer_t target, buf; + unsigned char *target_mem = NULL; + dns_decompress_t dctx; callbacks = lctx->callbacks; dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_NONE); @@ -2413,12 +2397,13 @@ load_raw(dns_loadctx_t *lctx) * does not really make sense. */ for (loop_cnt = 0; (lctx->loop_cnt == 0 || loop_cnt < lctx->loop_cnt); - loop_cnt++) { + loop_cnt++) + { unsigned int i, rdcount; - uint16_t namelen; - uint32_t totallen; - size_t minlen, readlen; - bool sequential_read = false; + uint16_t namelen; + uint32_t totallen; + size_t minlen, readlen; + bool sequential_read = false; /* Read the data length */ isc_buffer_clear(&target); @@ -2669,10 +2654,9 @@ dns_master_loadfile(const char *master_file, dns_name_t *top, dns_rdatacallbacks_t *callbacks, dns_masterincludecb_t include_cb, void *include_arg, isc_mem_t *mctx, dns_masterformat_t format, - dns_ttl_t maxttl) -{ + dns_ttl_t maxttl) { dns_loadctx_t *lctx = NULL; - isc_result_t result; + isc_result_t result; result = loadctx_create(format, mctx, options, resign, top, zclass, origin, callbacks, NULL, NULL, NULL, include_cb, @@ -2704,10 +2688,9 @@ dns_master_loadfileinc(const char *master_file, dns_name_t *top, dns_loaddonefunc_t done, void *done_arg, dns_loadctx_t **lctxp, dns_masterincludecb_t include_cb, void *include_arg, isc_mem_t *mctx, - dns_masterformat_t format, uint32_t maxttl) -{ + dns_masterformat_t format, uint32_t maxttl) { dns_loadctx_t *lctx = NULL; - isc_result_t result; + isc_result_t result; REQUIRE(task != NULL); REQUIRE(done != NULL); @@ -2740,9 +2723,8 @@ cleanup: isc_result_t dns_master_loadstream(FILE *stream, dns_name_t *top, dns_name_t *origin, dns_rdataclass_t zclass, unsigned int options, - dns_rdatacallbacks_t *callbacks, isc_mem_t *mctx) -{ - isc_result_t result; + dns_rdatacallbacks_t *callbacks, isc_mem_t *mctx) { + isc_result_t result; dns_loadctx_t *lctx = NULL; REQUIRE(stream != NULL); @@ -2774,9 +2756,8 @@ dns_master_loadstreaminc(FILE *stream, dns_name_t *top, dns_name_t *origin, dns_rdataclass_t zclass, unsigned int options, dns_rdatacallbacks_t *callbacks, isc_task_t *task, dns_loaddonefunc_t done, void *done_arg, - dns_loadctx_t **lctxp, isc_mem_t *mctx) -{ - isc_result_t result; + dns_loadctx_t **lctxp, isc_mem_t *mctx) { + isc_result_t result; dns_loadctx_t *lctx = NULL; REQUIRE(stream != NULL); @@ -2811,9 +2792,8 @@ cleanup: isc_result_t dns_master_loadbuffer(isc_buffer_t *buffer, dns_name_t *top, dns_name_t *origin, dns_rdataclass_t zclass, unsigned int options, - dns_rdatacallbacks_t *callbacks, isc_mem_t *mctx) -{ - isc_result_t result; + dns_rdatacallbacks_t *callbacks, isc_mem_t *mctx) { + isc_result_t result; dns_loadctx_t *lctx = NULL; REQUIRE(buffer != NULL); @@ -2843,9 +2823,9 @@ dns_master_loadbufferinc(isc_buffer_t *buffer, dns_name_t *top, dns_name_t *origin, dns_rdataclass_t zclass, unsigned int options, dns_rdatacallbacks_t *callbacks, isc_task_t *task, dns_loaddonefunc_t done, - void *done_arg, dns_loadctx_t **lctxp, isc_mem_t *mctx) -{ - isc_result_t result; + void *done_arg, dns_loadctx_t **lctxp, + isc_mem_t *mctx) { + isc_result_t result; dns_loadctx_t *lctx = NULL; REQUIRE(buffer != NULL); @@ -2878,9 +2858,8 @@ cleanup: isc_result_t dns_master_loadlexer(isc_lex_t *lex, dns_name_t *top, dns_name_t *origin, dns_rdataclass_t zclass, unsigned int options, - dns_rdatacallbacks_t *callbacks, isc_mem_t *mctx) -{ - isc_result_t result; + dns_rdatacallbacks_t *callbacks, isc_mem_t *mctx) { + isc_result_t result; dns_loadctx_t *lctx = NULL; REQUIRE(lex != NULL); @@ -2904,9 +2883,8 @@ dns_master_loadlexerinc(isc_lex_t *lex, dns_name_t *top, dns_name_t *origin, dns_rdataclass_t zclass, unsigned int options, dns_rdatacallbacks_t *callbacks, isc_task_t *task, dns_loaddonefunc_t done, void *done_arg, - dns_loadctx_t **lctxp, isc_mem_t *mctx) -{ - isc_result_t result; + dns_loadctx_t **lctxp, isc_mem_t *mctx) { + isc_result_t result; dns_loadctx_t *lctx = NULL; REQUIRE(lex != NULL); @@ -2937,10 +2915,9 @@ dns_master_loadlexerinc(isc_lex_t *lex, dns_name_t *top, dns_name_t *origin, static dns_rdatalist_t * grow_rdatalist(int new_len, dns_rdatalist_t *oldlist, int old_len, rdatalist_head_t *current, rdatalist_head_t *glue, - isc_mem_t *mctx) -{ + isc_mem_t *mctx) { dns_rdatalist_t *newlist; - int rdlcount = 0; + int rdlcount = 0; ISC_LIST(dns_rdatalist_t) save; dns_rdatalist_t *this; @@ -2988,10 +2965,9 @@ grow_rdatalist(int new_len, dns_rdatalist_t *oldlist, int old_len, */ static dns_rdata_t * grow_rdata(int new_len, dns_rdata_t *oldlist, int old_len, - rdatalist_head_t *current, rdatalist_head_t *glue, isc_mem_t *mctx) -{ + rdatalist_head_t *current, rdatalist_head_t *glue, isc_mem_t *mctx) { dns_rdata_t *newlist; - int rdcount = 0; + int rdcount = 0; ISC_LIST(dns_rdata_t) save; dns_rdatalist_t *this; dns_rdata_t *rdata; @@ -3049,11 +3025,10 @@ grow_rdata(int new_len, dns_rdata_t *oldlist, int old_len, } static uint32_t -resign_fromlist(dns_rdatalist_t *this, dns_loadctx_t *lctx) -{ - dns_rdata_t * rdata; +resign_fromlist(dns_rdatalist_t *this, dns_loadctx_t *lctx) { + dns_rdata_t *rdata; dns_rdata_rrsig_t sig; - uint32_t when; + uint32_t when; rdata = ISC_LIST_HEAD(this->rdata); INSIST(rdata != NULL); @@ -3085,12 +3060,11 @@ resign_fromlist(dns_rdatalist_t *this, dns_loadctx_t *lctx) static isc_result_t commit(dns_rdatacallbacks_t *callbacks, dns_loadctx_t *lctx, rdatalist_head_t *head, dns_name_t *owner, const char *source, - unsigned int line) -{ + unsigned int line) { dns_rdatalist_t *this; dns_rdataset_t dataset; - isc_result_t result; - char namebuf[DNS_NAME_FORMATSIZE]; + isc_result_t result; + char namebuf[DNS_NAME_FORMATSIZE]; void (*error)(struct dns_rdatacallbacks *, const char *, ...); this = ISC_LIST_HEAD(*head); @@ -3108,7 +3082,8 @@ commit(dns_rdatacallbacks_t *callbacks, dns_loadctx_t *lctx, * If this is a secure dynamic zone set the re-signing time. */ if (dataset.type == dns_rdatatype_rrsig && - (lctx->options & DNS_MASTER_RESIGN) != 0) { + (lctx->options & DNS_MASTER_RESIGN) != 0) + { dataset.attributes |= DNS_RDATASETATTR_RESIGN; dataset.resign = resign_fromlist(this, lctx); } @@ -3145,12 +3120,11 @@ commit(dns_rdatacallbacks_t *callbacks, dns_loadctx_t *lctx, */ static bool -is_glue(rdatalist_head_t *head, dns_name_t *owner) -{ +is_glue(rdatalist_head_t *head, dns_name_t *owner) { dns_rdatalist_t *this; dns_rdata_t *rdata; isc_region_t region; - dns_name_t name; + dns_name_t name; /* * Find NS rrset. @@ -3180,9 +3154,8 @@ is_glue(rdatalist_head_t *head, dns_name_t *owner) } static void -load_quantum(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result; +load_quantum(isc_task_t *task, isc_event_t *event) { + isc_result_t result; dns_loadctx_t *lctx; REQUIRE(event != NULL); @@ -3205,8 +3178,7 @@ load_quantum(isc_task_t *task, isc_event_t *event) } static isc_result_t -task_send(dns_loadctx_t *lctx) -{ +task_send(dns_loadctx_t *lctx) { isc_event_t *event; event = isc_event_allocate(lctx->mctx, NULL, DNS_EVENT_MASTERQUANTUM, @@ -3216,15 +3188,13 @@ task_send(dns_loadctx_t *lctx) } void -dns_loadctx_cancel(dns_loadctx_t *lctx) -{ +dns_loadctx_cancel(dns_loadctx_t *lctx) { REQUIRE(DNS_LCTX_VALID(lctx)); atomic_store_release(&lctx->canceled, true); } void -dns_master_initrawheader(dns_masterrawheader_t *header) -{ +dns_master_initrawheader(dns_masterrawheader_t *header) { memset(header, 0, sizeof(dns_masterrawheader_t)); } diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c index 2462d3fb01..ea69a05a33 100644 --- a/lib/dns/masterdump.c +++ b/lib/dns/masterdump.c @@ -48,7 +48,7 @@ #include #include -#define DNS_DCTX_MAGIC ISC_MAGIC('D', 'c', 't', 'x') +#define DNS_DCTX_MAGIC ISC_MAGIC('D', 'c', 't', 'x') #define DNS_DCTX_VALID(d) ISC_MAGIC_VALID(d, DNS_DCTX_MAGIC) #define RETERR(x) \ @@ -66,13 +66,13 @@ struct dns_master_style { dns_masterstyle_flags_t flags; /* DNS_STYLEFLAG_* */ - unsigned int ttl_column; - unsigned int class_column; - unsigned int type_column; - unsigned int rdata_column; - unsigned int line_length; - unsigned int tab_width; - unsigned int split_width; + unsigned int ttl_column; + unsigned int class_column; + unsigned int type_column; + unsigned int rdata_column; + unsigned int line_length; + unsigned int tab_width; + unsigned int split_width; }; /*% @@ -91,16 +91,16 @@ struct dns_master_style { */ typedef struct dns_totext_ctx { dns_master_style_t style; - bool class_printed; - char * linebreak; - char linebreak_buf[DNS_TOTEXT_LINEBREAK_MAXLEN]; - dns_name_t * origin; - dns_name_t * neworigin; - dns_fixedname_t origin_fixname; - uint32_t current_ttl; - bool current_ttl_valid; - dns_ttl_t serve_stale_ttl; - dns_indent_t indent; + bool class_printed; + char *linebreak; + char linebreak_buf[DNS_TOTEXT_LINEBREAK_MAXLEN]; + dns_name_t *origin; + dns_name_t *neworigin; + dns_fixedname_t origin_fixname; + uint32_t current_ttl; + bool current_ttl_valid; + dns_ttl_t serve_stale_ttl; + dns_indent_t indent; } dns_totext_ctx_t; LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_keyzone = { @@ -232,27 +232,27 @@ static char spaces[N_SPACES + 1] = " "; static char tabs[N_TABS + 1] = "\t\t\t\t\t\t\t\t\t\t"; struct dns_dumpctx { - unsigned int magic; - isc_mem_t * mctx; - isc_mutex_t lock; - isc_refcount_t references; - atomic_bool canceled; - bool first; - bool do_date; - isc_stdtime_t now; - FILE * f; - dns_db_t * db; - dns_dbversion_t * version; - dns_dbiterator_t * dbiter; - dns_totext_ctx_t tctx; - isc_task_t * task; + unsigned int magic; + isc_mem_t *mctx; + isc_mutex_t lock; + isc_refcount_t references; + atomic_bool canceled; + bool first; + bool do_date; + isc_stdtime_t now; + FILE *f; + dns_db_t *db; + dns_dbversion_t *version; + dns_dbiterator_t *dbiter; + dns_totext_ctx_t tctx; + isc_task_t *task; dns_dumpdonefunc_t done; - void * done_arg; - unsigned int nodes; + void *done_arg; + unsigned int nodes; /* dns_master_dumpinc() */ - char * file; - char * tmpfile; - dns_masterformat_t format; + char *file; + char *tmpfile; + dns_masterformat_t format; dns_masterrawheader_t header; isc_result_t (*dumpsets)(isc_mem_t *mctx, const dns_name_t *name, dns_rdatasetiter_t *rdsiter, @@ -272,12 +272,11 @@ static const dns_indent_t default_yamlindent = { " ", 1 }; */ static isc_result_t indent(unsigned int *current, unsigned int to, int tabwidth, - isc_buffer_t *target) -{ - isc_region_t r; + isc_buffer_t *target) { + isc_region_t r; unsigned char *p; - unsigned int from; - int ntabs, nspaces, t; + unsigned int from; + int ntabs, nspaces, t; from = *current; @@ -338,8 +337,7 @@ indent(unsigned int *current, unsigned int to, int tabwidth, static isc_result_t totext_ctx_init(const dns_master_style_t *style, const dns_indent_t *indentctx, - dns_totext_ctx_t *ctx) -{ + dns_totext_ctx_t *ctx) { isc_result_t result; REQUIRE(style->tab_width != 0); @@ -376,7 +374,8 @@ totext_ctx_init(const dns_master_style_t *style, const dns_indent_t *indentctx, isc_buffer_add(&buf, 1); if ((ctx->style.flags & DNS_STYLEFLAG_INDENT) != 0 || - (ctx->style.flags & DNS_STYLEFLAG_YAML) != 0) { + (ctx->style.flags & DNS_STYLEFLAG_YAML) != 0) + { unsigned int i, len = strlen(indentctx->string); for (i = 0; i < indentctx->count; i++) { if (isc_buffer_availablelength(&buf) < len) { @@ -445,8 +444,7 @@ totext_ctx_init(const dns_master_style_t *style, const dns_indent_t *indentctx, } while (0) static isc_result_t -str_totext(const char *source, isc_buffer_t *target) -{ +str_totext(const char *source, isc_buffer_t *target) { unsigned int l; isc_region_t region; @@ -464,11 +462,10 @@ str_totext(const char *source, isc_buffer_t *target) static isc_result_t ncache_summary(dns_rdataset_t *rdataset, bool omit_final_dot, - dns_totext_ctx_t *ctx, isc_buffer_t *target) -{ - isc_result_t result = ISC_R_SUCCESS; + dns_totext_ctx_t *ctx, isc_buffer_t *target) { + isc_result_t result = ISC_R_SUCCESS; dns_rdataset_t rds; - dns_name_t name; + dns_name_t name; dns_rdataset_init(&rds); dns_name_init(&name, NULL); @@ -476,9 +473,11 @@ ncache_summary(dns_rdataset_t *rdataset, bool omit_final_dot, do { dns_ncache_current(rdataset, &name, &rds); for (result = dns_rdataset_first(&rds); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rds)) { + result = dns_rdataset_next(&rds)) + { if ((ctx->style.flags & DNS_STYLEFLAG_INDENT) != 0 || - (ctx->style.flags & DNS_STYLEFLAG_YAML) != 0) { + (ctx->style.flags & DNS_STYLEFLAG_YAML) != 0) + { unsigned int i; for (i = 0; i < ctx->indent.count; i++) { CHECK(str_totext(ctx->indent.string, @@ -534,18 +533,17 @@ cleanup: static isc_result_t rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, dns_totext_ctx_t *ctx, bool omit_final_dot, - isc_buffer_t *target) -{ - isc_result_t result; - unsigned int column; - bool first = true; - uint32_t current_ttl; - bool current_ttl_valid; + isc_buffer_t *target) { + isc_result_t result; + unsigned int column; + bool first = true; + uint32_t current_ttl; + bool current_ttl_valid; dns_rdatatype_t type; - unsigned int type_start; + unsigned int type_start; dns_fixedname_t fixed; - dns_name_t * name = NULL; - unsigned int i; + dns_name_t *name = NULL; + unsigned int i; REQUIRE(DNS_RDATASET_VALID(rdataset)); @@ -568,7 +566,8 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, * Indent? */ if ((ctx->style.flags & DNS_STYLEFLAG_INDENT) != 0 || - (ctx->style.flags & DNS_STYLEFLAG_YAML) != 0) { + (ctx->style.flags & DNS_STYLEFLAG_YAML) != 0) + { for (i = 0; i < ctx->indent.count; i++) { RETERR(str_totext(ctx->indent.string, target)); } @@ -579,8 +578,8 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, */ if ((ctx->style.flags & DNS_STYLEFLAG_YAML) != 0) { RETERR(str_totext("- ", target)); - } else if ((ctx->style.flags & DNS_STYLEFLAG_COMMENTDATA) != - 0) { + } else if ((ctx->style.flags & DNS_STYLEFLAG_COMMENTDATA) != 0) + { RETERR(str_totext(";", target)); } @@ -589,7 +588,8 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, */ if (name != NULL && !((ctx->style.flags & DNS_STYLEFLAG_OMIT_OWNER) != 0 && - !first)) { + !first)) + { unsigned int name_start = target->used; RETERR(dns_name_totext(name, omit_final_dot, target)); column += target->used - name_start; @@ -600,8 +600,9 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, */ if ((ctx->style.flags & DNS_STYLEFLAG_NO_TTL) == 0 && !((ctx->style.flags & DNS_STYLEFLAG_OMIT_TTL) != 0 && - current_ttl_valid && rdataset->ttl == current_ttl)) { - char ttlbuf[64]; + current_ttl_valid && rdataset->ttl == current_ttl)) + { + char ttlbuf[64]; isc_region_t r; unsigned int length; @@ -642,7 +643,8 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, */ if ((ctx->style.flags & DNS_STYLEFLAG_NO_CLASS) == 0 && ((ctx->style.flags & DNS_STYLEFLAG_OMIT_CLASS) == 0 || - ctx->class_printed == false)) { + ctx->class_printed == false)) + { unsigned int class_start; INDENT_TO(class_column); class_start = target->used; @@ -719,7 +721,7 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, target)); break; } else { - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_t rdata = DNS_RDATA_INIT; isc_region_t r; dns_rdataset_current(rdataset, &rdata); @@ -769,8 +771,7 @@ rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, static isc_result_t question_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, dns_totext_ctx_t *ctx, bool omit_final_dot, - isc_buffer_t *target) -{ + isc_buffer_t *target) { unsigned int column; isc_result_t result; isc_region_t r; @@ -835,10 +836,9 @@ question_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, isc_result_t dns_rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, - bool omit_final_dot, bool question, isc_buffer_t *target) -{ + bool omit_final_dot, bool question, isc_buffer_t *target) { dns_totext_ctx_t ctx; - isc_result_t result; + isc_result_t result; result = totext_ctx_init(&dns_master_style_debug, NULL, &ctx); if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR(__FILE__, __LINE__, @@ -866,13 +866,12 @@ dns_rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name, } isc_result_t -dns_master_rdatasettotext(const dns_name_t * owner_name, - dns_rdataset_t * rdataset, +dns_master_rdatasettotext(const dns_name_t *owner_name, + dns_rdataset_t *rdataset, const dns_master_style_t *style, dns_indent_t *indent, - isc_buffer_t *target) -{ + isc_buffer_t *target) { dns_totext_ctx_t ctx; - isc_result_t result; + isc_result_t result; result = totext_ctx_init(style, indent, &ctx); if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR(__FILE__, __LINE__, @@ -884,12 +883,12 @@ dns_master_rdatasettotext(const dns_name_t * owner_name, } isc_result_t -dns_master_questiontotext(const dns_name_t * owner_name, - dns_rdataset_t * rdataset, - const dns_master_style_t *style, isc_buffer_t *target) -{ +dns_master_questiontotext(const dns_name_t *owner_name, + dns_rdataset_t *rdataset, + const dns_master_style_t *style, + isc_buffer_t *target) { dns_totext_ctx_t ctx; - isc_result_t result; + isc_result_t result; result = totext_ctx_init(style, NULL, &ctx); if (result != ISC_R_SUCCESS) { UNEXPECTED_ERROR(__FILE__, __LINE__, @@ -909,8 +908,7 @@ dns_master_questiontotext(const dns_name_t * owner_name, static isc_result_t dump_rdataset(isc_mem_t *mctx, const dns_name_t *name, dns_rdataset_t *rdataset, - dns_totext_ctx_t *ctx, isc_buffer_t *buffer, FILE *f) -{ + dns_totext_ctx_t *ctx, isc_buffer_t *buffer, FILE *f) { isc_region_t r; isc_result_t result; @@ -946,7 +944,7 @@ dump_rdataset(isc_mem_t *mctx, const dns_name_t *name, dns_rdataset_t *rdataset, * the buffer. If the buffer is too small, grow it. */ for (;;) { - int newlength; + int newlength; void *newmem; result = rdataset_totext(rdataset, name, ctx, false, buffer); if (result != ISC_R_NOSPACE) { @@ -988,8 +986,7 @@ dump_rdataset(isc_mem_t *mctx, const dns_name_t *name, dns_rdataset_t *rdataset, */ static int -dump_order(const dns_rdataset_t *rds) -{ +dump_order(const dns_rdataset_t *rds) { int t; int sig; if (rds->type == dns_rdatatype_rrsig) { @@ -1014,8 +1011,7 @@ dump_order(const dns_rdataset_t *rds) } static int -dump_order_compare(const void *a, const void *b) -{ +dump_order_compare(const void *a, const void *b) { return (dump_order(*((const dns_rdataset_t *const *)a)) - dump_order(*((const dns_rdataset_t *const *)b))); } @@ -1035,13 +1031,12 @@ dump_order_compare(const void *a, const void *b) static isc_result_t dump_rdatasets_text(isc_mem_t *mctx, const dns_name_t *name, dns_rdatasetiter_t *rdsiter, dns_totext_ctx_t *ctx, - isc_buffer_t *buffer, FILE *f) -{ - isc_result_t itresult, dumpresult; - isc_region_t r; - dns_rdataset_t rdatasets[MAXSORT]; + isc_buffer_t *buffer, FILE *f) { + isc_result_t itresult, dumpresult; + isc_region_t r; + dns_rdataset_t rdatasets[MAXSORT]; dns_rdataset_t *sorted[MAXSORT]; - int i, n; + int i, n; itresult = dns_rdatasetiter_first(rdsiter); dumpresult = ISC_R_SUCCESS; @@ -1057,7 +1052,8 @@ dump_rdatasets_text(isc_mem_t *mctx, const dns_name_t *name, again: for (i = 0; itresult == ISC_R_SUCCESS && i < MAXSORT; - itresult = dns_rdatasetiter_next(rdsiter), i++) { + itresult = dns_rdatasetiter_next(rdsiter), i++) + { dns_rdataset_init(&rdatasets[i]); dns_rdatasetiter_current(rdsiter, &rdatasets[i]); sorted[i] = &rdatasets[i]; @@ -1071,7 +1067,8 @@ again: dns_rdataset_t *rds = sorted[i]; if ((ctx->style.flags & DNS_STYLEFLAG_TRUST) != 0) { if ((ctx->style.flags & DNS_STYLEFLAG_INDENT) != 0 || - (ctx->style.flags & DNS_STYLEFLAG_YAML) != 0) { + (ctx->style.flags & DNS_STYLEFLAG_YAML) != 0) + { unsigned int j; for (j = 0; j < ctx->indent.count; j++) { fprintf(f, "%s", ctx->indent.string); @@ -1080,7 +1077,8 @@ again: fprintf(f, "; %s\n", dns_trust_totext(rds->trust)); } if (((rds->attributes & DNS_RDATASETATTR_NEGATIVE) != 0) && - (ctx->style.flags & DNS_STYLEFLAG_NCACHE) == 0) { + (ctx->style.flags & DNS_STYLEFLAG_NCACHE) == 0) + { /* Omit negative cache entries */ } else { isc_result_t result; @@ -1095,20 +1093,22 @@ again: if (result != ISC_R_SUCCESS) { dumpresult = result; } - if ((ctx->style.flags & DNS_STYLEFLAG_OMIT_OWNER) != - 0) { + if ((ctx->style.flags & DNS_STYLEFLAG_OMIT_OWNER) != 0) + { name = NULL; } } if (((ctx->style.flags & DNS_STYLEFLAG_RESIGN) != 0) && - ((rds->attributes & DNS_RDATASETATTR_RESIGN) != 0)) { + ((rds->attributes & DNS_RDATASETATTR_RESIGN) != 0)) + { isc_buffer_t b; - char buf[sizeof("YYYYMMDDHHMMSS")]; + char buf[sizeof("YYYYMMDDHHMMSS")]; memset(buf, 0, sizeof(buf)); isc_buffer_init(&b, buf, sizeof(buf) - 1); dns_time64_totext((uint64_t)rds->resign, &b); if ((ctx->style.flags & DNS_STYLEFLAG_INDENT) != 0 || - (ctx->style.flags & DNS_STYLEFLAG_YAML) != 0) { + (ctx->style.flags & DNS_STYLEFLAG_YAML) != 0) + { unsigned int j; for (j = 0; j < ctx->indent.count; j++) { fprintf(f, "%s", ctx->indent.string); @@ -1143,11 +1143,10 @@ again: */ static isc_result_t dump_rdataset_raw(isc_mem_t *mctx, const dns_name_t *name, - dns_rdataset_t *rdataset, isc_buffer_t *buffer, FILE *f) -{ + dns_rdataset_t *rdataset, isc_buffer_t *buffer, FILE *f) { isc_result_t result; - uint32_t totallen; - uint16_t dlen; + uint32_t totallen; + uint16_t dlen; isc_region_t r, r_hdr; REQUIRE(buffer->length > 0); @@ -1200,7 +1199,7 @@ restart: */ if (isc_buffer_availablelength(buffer) < sizeof(dlen) + r.length) { - int newlength; + int newlength; void *newmem; newlength = buffer->length * 2; @@ -1249,24 +1248,25 @@ restart: static isc_result_t dump_rdatasets_raw(isc_mem_t *mctx, const dns_name_t *owner_name, dns_rdatasetiter_t *rdsiter, dns_totext_ctx_t *ctx, - isc_buffer_t *buffer, FILE *f) -{ - isc_result_t result; - dns_rdataset_t rdataset; + isc_buffer_t *buffer, FILE *f) { + isc_result_t result; + dns_rdataset_t rdataset; dns_fixedname_t fixed; - dns_name_t * name; + dns_name_t *name; name = dns_fixedname_initname(&fixed); dns_name_copynf(owner_name, name); for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(rdsiter)) { + result = dns_rdatasetiter_next(rdsiter)) + { dns_rdataset_init(&rdataset); dns_rdatasetiter_current(rdsiter, &rdataset); dns_rdataset_getownercase(&rdataset, name); if (((rdataset.attributes & DNS_RDATASETATTR_NEGATIVE) != 0) && - (ctx->style.flags & DNS_STYLEFLAG_NCACHE) == 0) { + (ctx->style.flags & DNS_STYLEFLAG_NCACHE) == 0) + { /* Omit negative cache entries */ } else { result = dump_rdataset_raw(mctx, name, &rdataset, @@ -1288,8 +1288,7 @@ dump_rdatasets_raw(isc_mem_t *mctx, const dns_name_t *owner_name, static isc_result_t dump_rdatasets_map(isc_mem_t *mctx, const dns_name_t *name, dns_rdatasetiter_t *rdsiter, dns_totext_ctx_t *ctx, - isc_buffer_t *buffer, FILE *f) -{ + isc_buffer_t *buffer, FILE *f) { UNUSED(mctx); UNUSED(name); UNUSED(rdsiter); @@ -1312,12 +1311,10 @@ 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) -{ +dumpctx_destroy(dns_dumpctx_t *dctx) { dctx->magic = 0; isc_mutex_destroy(&dctx->lock); dns_dbiterator_destroy(&dctx->dbiter); @@ -1338,8 +1335,7 @@ dumpctx_destroy(dns_dumpctx_t *dctx) } void -dns_dumpctx_attach(dns_dumpctx_t *source, dns_dumpctx_t **target) -{ +dns_dumpctx_attach(dns_dumpctx_t *source, dns_dumpctx_t **target) { REQUIRE(DNS_DCTX_VALID(source)); REQUIRE(target != NULL && *target == NULL); @@ -1349,8 +1345,7 @@ dns_dumpctx_attach(dns_dumpctx_t *source, dns_dumpctx_t **target) } void -dns_dumpctx_detach(dns_dumpctx_t **dctxp) -{ +dns_dumpctx_detach(dns_dumpctx_t **dctxp) { dns_dumpctx_t *dctx; REQUIRE(dctxp != NULL); @@ -1364,30 +1359,26 @@ dns_dumpctx_detach(dns_dumpctx_t **dctxp) } dns_dbversion_t * -dns_dumpctx_version(dns_dumpctx_t *dctx) -{ +dns_dumpctx_version(dns_dumpctx_t *dctx) { REQUIRE(DNS_DCTX_VALID(dctx)); return (dctx->version); } dns_db_t * -dns_dumpctx_db(dns_dumpctx_t *dctx) -{ +dns_dumpctx_db(dns_dumpctx_t *dctx) { REQUIRE(DNS_DCTX_VALID(dctx)); return (dctx->db); } void -dns_dumpctx_cancel(dns_dumpctx_t *dctx) -{ +dns_dumpctx_cancel(dns_dumpctx_t *dctx) { REQUIRE(DNS_DCTX_VALID(dctx)); atomic_store_release(&dctx->canceled, true); } static isc_result_t -flushandsync(FILE *f, isc_result_t result, const char *temp) -{ +flushandsync(FILE *f, isc_result_t result, const char *temp) { bool logit = (result == ISC_R_SUCCESS); if (result == ISC_R_SUCCESS) { @@ -1428,10 +1419,10 @@ flushandsync(FILE *f, isc_result_t result, const char *temp) } static isc_result_t -closeandrename(FILE *f, isc_result_t result, const char *temp, const char *file) -{ +closeandrename(FILE *f, isc_result_t result, const char *temp, + const char *file) { isc_result_t tresult; - bool logit = (result == ISC_R_SUCCESS); + bool logit = (result == ISC_R_SUCCESS); result = flushandsync(f, result, temp); if (result != ISC_R_SUCCESS) { @@ -1464,10 +1455,9 @@ closeandrename(FILE *f, isc_result_t result, const char *temp, const char *file) } static void -dump_quantum(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result; - isc_result_t tresult; +dump_quantum(isc_task_t *task, isc_event_t *event) { + isc_result_t result; + isc_result_t tresult; dns_dumpctx_t *dctx; REQUIRE(event != NULL); @@ -1499,8 +1489,7 @@ dump_quantum(isc_task_t *task, isc_event_t *event) } static isc_result_t -task_send(dns_dumpctx_t *dctx) -{ +task_send(dns_dumpctx_t *dctx) { isc_event_t *event; event = isc_event_allocate(dctx->mctx, NULL, DNS_EVENT_DUMPQUANTUM, @@ -1512,11 +1501,10 @@ task_send(dns_dumpctx_t *dctx) static isc_result_t dumpctx_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, const dns_master_style_t *style, FILE *f, dns_dumpctx_t **dctxp, - dns_masterformat_t format, dns_masterrawheader_t *header) -{ + dns_masterformat_t format, dns_masterrawheader_t *header) { dns_dumpctx_t *dctx; - isc_result_t result; - unsigned int options; + isc_result_t result; + unsigned int options; dctx = isc_mem_get(mctx, sizeof(*dctx)); @@ -1578,7 +1566,8 @@ dumpctx_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, } if (dctx->format == dns_masterformat_text && - (dctx->tctx.style.flags & DNS_STYLEFLAG_REL_OWNER) != 0) { + (dctx->tctx.style.flags & DNS_STYLEFLAG_REL_OWNER) != 0) + { options = DNS_DB_RELATIVENAMES; } else { options = 0; @@ -1614,14 +1603,13 @@ cleanup: } static isc_result_t -writeheader(dns_dumpctx_t *dctx) -{ - isc_result_t result = ISC_R_SUCCESS; - isc_buffer_t buffer; - char * bufmem; - isc_region_t r; +writeheader(dns_dumpctx_t *dctx) { + isc_result_t result = ISC_R_SUCCESS; + isc_buffer_t buffer; + char *bufmem; + isc_region_t r; dns_masterrawheader_t rawheader; - uint32_t rawversion, now32; + uint32_t rawversion, now32; bufmem = isc_mem_get(dctx->mctx, initial_buffer_length); @@ -1688,15 +1676,14 @@ writeheader(dns_dumpctx_t *dctx) } static isc_result_t -dumptostreaminc(dns_dumpctx_t *dctx) -{ - isc_result_t result = ISC_R_SUCCESS; - isc_buffer_t buffer; - char * bufmem; - dns_name_t * name; +dumptostreaminc(dns_dumpctx_t *dctx) { + isc_result_t result = ISC_R_SUCCESS; + isc_buffer_t buffer; + char *bufmem; + dns_name_t *name; dns_fixedname_t fixname; - unsigned int nodes; - isc_time_t start; + unsigned int nodes; + isc_time_t start; bufmem = isc_mem_get(dctx->mctx, initial_buffer_length); @@ -1733,7 +1720,7 @@ dumptostreaminc(dns_dumpctx_t *dctx) isc_time_now(&start); while (result == ISC_R_SUCCESS && (dctx->nodes == 0 || nodes--)) { dns_rdatasetiter_t *rdsiter = NULL; - dns_dbnode_t * node = NULL; + dns_dbnode_t *node = NULL; result = dns_dbiterator_current(dctx->dbiter, &node, name); if (result != ISC_R_SUCCESS && result != DNS_R_NEWORIGIN) { @@ -1776,8 +1763,8 @@ dumptostreaminc(dns_dumpctx_t *dctx) if (dctx->nodes != 0 && result == ISC_R_SUCCESS) { unsigned int pps = dns_pps; /* packets per second */ unsigned int interval; - uint64_t usecs; - isc_time_t end; + uint64_t usecs; + isc_time_t end; isc_time_now(&end); if (pps < 100) { @@ -1823,13 +1810,12 @@ cleanup: isc_result_t dns_master_dumptostreaminc(isc_mem_t *mctx, dns_db_t *db, - dns_dbversion_t * version, + dns_dbversion_t *version, const dns_master_style_t *style, FILE *f, isc_task_t *task, dns_dumpdonefunc_t done, - void *done_arg, dns_dumpctx_t **dctxp) -{ + void *done_arg, dns_dumpctx_t **dctxp) { dns_dumpctx_t *dctx = NULL; - isc_result_t result; + isc_result_t result; REQUIRE(task != NULL); REQUIRE(f != NULL); @@ -1858,11 +1844,10 @@ dns_master_dumptostreaminc(isc_mem_t *mctx, dns_db_t *db, isc_result_t dns_master_dumptostream(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, const dns_master_style_t *style, - dns_masterformat_t format, - dns_masterrawheader_t *header, FILE *f) -{ + dns_masterformat_t format, + dns_masterrawheader_t *header, FILE *f) { dns_dumpctx_t *dctx = NULL; - isc_result_t result; + isc_result_t result; result = dumpctx_create(mctx, db, version, style, f, &dctx, format, header); @@ -1880,12 +1865,11 @@ dns_master_dumptostream(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, static isc_result_t opentmp(isc_mem_t *mctx, dns_masterformat_t format, const char *file, - char **tempp, FILE **fp) -{ - FILE * f = NULL; + char **tempp, FILE **fp) { + FILE *f = NULL; isc_result_t result; - char * tempname = NULL; - int tempnamelen; + char *tempname = NULL; + int tempnamelen; tempnamelen = strlen(file) + 20; tempname = isc_mem_allocate(mctx, tempnamelen); @@ -1921,12 +1905,11 @@ dns_master_dumpinc(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, const dns_master_style_t *style, const char *filename, isc_task_t *task, dns_dumpdonefunc_t done, void *done_arg, dns_dumpctx_t **dctxp, dns_masterformat_t format, - dns_masterrawheader_t *header) -{ - FILE * f = NULL; - isc_result_t result; - char * tempname = NULL; - char * file = NULL; + dns_masterrawheader_t *header) { + FILE *f = NULL; + isc_result_t result; + char *tempname = NULL; + char *file = NULL; dns_dumpctx_t *dctx = NULL; file = isc_mem_strdup(mctx, filename); @@ -1975,11 +1958,10 @@ cleanup: isc_result_t dns_master_dump(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, const dns_master_style_t *style, const char *filename, - dns_masterformat_t format, dns_masterrawheader_t *header) -{ - FILE * f = NULL; - isc_result_t result; - char * tempname; + dns_masterformat_t format, dns_masterrawheader_t *header) { + FILE *f = NULL; + isc_result_t result; + char *tempname; dns_dumpctx_t *dctx = NULL; result = opentmp(mctx, format, filename, &tempname, &f); @@ -2011,14 +1993,13 @@ cleanup: isc_result_t dns_master_dumpnodetostream(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, - const dns_name_t * name, - const dns_master_style_t *style, FILE *f) -{ - isc_result_t result; - isc_buffer_t buffer; - char * bufmem; - isc_stdtime_t now; - dns_totext_ctx_t ctx; + const dns_name_t *name, + const dns_master_style_t *style, FILE *f) { + isc_result_t result; + isc_buffer_t buffer; + char *bufmem; + isc_stdtime_t now; + dns_totext_ctx_t ctx; dns_rdatasetiter_t *rdsiter = NULL; result = totext_ctx_init(style, NULL, &ctx); @@ -2054,9 +2035,8 @@ failure: isc_result_t dns_master_dumpnode(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, const dns_name_t *name, - const dns_master_style_t *style, const char *filename) -{ - FILE * f = NULL; + const dns_master_style_t *style, const char *filename) { + FILE *f = NULL; isc_result_t result; result = isc_stdio_open(filename, "w", &f); @@ -2092,20 +2072,18 @@ dns_master_dumpnode(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, } dns_masterstyle_flags_t -dns_master_styleflags(const dns_master_style_t *style) -{ +dns_master_styleflags(const dns_master_style_t *style) { REQUIRE(style != NULL); return (style->flags); } isc_result_t -dns_master_stylecreate(dns_master_style_t ** stylep, +dns_master_stylecreate(dns_master_style_t **stylep, dns_masterstyle_flags_t flags, unsigned int ttl_column, unsigned int class_column, unsigned int type_column, unsigned int rdata_column, unsigned int line_length, unsigned int tab_width, unsigned int split_width, - isc_mem_t *mctx) -{ + isc_mem_t *mctx) { dns_master_style_t *style; REQUIRE(stylep != NULL && *stylep == NULL); @@ -2124,8 +2102,7 @@ dns_master_stylecreate(dns_master_style_t ** stylep, } void -dns_master_styledestroy(dns_master_style_t **stylep, isc_mem_t *mctx) -{ +dns_master_styledestroy(dns_master_style_t **stylep, isc_mem_t *mctx) { dns_master_style_t *style; REQUIRE(stylep != NULL && *stylep != NULL); diff --git a/lib/dns/message.c b/lib/dns/message.c index 5217e207d2..8890d1974d 100644 --- a/lib/dns/message.c +++ b/lib/dns/message.c @@ -43,10 +43,9 @@ #ifdef SKAN_MSG_DEBUG static void -hexdump(const char *msg, const char *msg2, void *base, size_t len) -{ +hexdump(const char *msg, const char *msg2, void *base, size_t len) { unsigned char *p; - unsigned int cnt; + unsigned int cnt; p = base; cnt = 0; @@ -74,13 +73,13 @@ hexdump(const char *msg, const char *msg2, void *base, size_t len) } #endif /* ifdef SKAN_MSG_DEBUG */ -#define DNS_MESSAGE_OPCODE_MASK 0x7800U -#define DNS_MESSAGE_OPCODE_SHIFT 11 -#define DNS_MESSAGE_RCODE_MASK 0x000fU -#define DNS_MESSAGE_FLAG_MASK 0x8ff0U -#define DNS_MESSAGE_EDNSRCODE_MASK 0xff000000U -#define DNS_MESSAGE_EDNSRCODE_SHIFT 24 -#define DNS_MESSAGE_EDNSVERSION_MASK 0x00ff0000U +#define DNS_MESSAGE_OPCODE_MASK 0x7800U +#define DNS_MESSAGE_OPCODE_SHIFT 11 +#define DNS_MESSAGE_RCODE_MASK 0x000fU +#define DNS_MESSAGE_FLAG_MASK 0x8ff0U +#define DNS_MESSAGE_EDNSRCODE_MASK 0xff000000U +#define DNS_MESSAGE_EDNSRCODE_SHIFT 24 +#define DNS_MESSAGE_EDNSVERSION_MASK 0x00ff0000U #define DNS_MESSAGE_EDNSVERSION_SHIFT 16 #define VALID_NAMED_SECTION(s) \ @@ -105,11 +104,11 @@ hexdump(const char *msg, const char *msg2, void *base, size_t len) * XXXMLG These should come from a config setting. */ #define SCRATCHPAD_SIZE 512 -#define NAME_COUNT 64 -#define OFFSET_COUNT 4 -#define RDATA_COUNT 8 +#define NAME_COUNT 64 +#define OFFSET_COUNT 4 +#define RDATA_COUNT 8 #define RDATALIST_COUNT 8 -#define RDATASET_COUNT 64 +#define RDATASET_COUNT 64 /*% * Text representation of the different items, for message_totext @@ -139,36 +138,33 @@ 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 * is free, return NULL. */ static inline dns_msgblock_t * -msgblock_allocate(isc_mem_t *mctx, unsigned int sizeof_type, unsigned int count) -{ +msgblock_allocate(isc_mem_t *mctx, unsigned int sizeof_type, + unsigned int count) { dns_msgblock_t *block; - unsigned int length; + unsigned int length; length = sizeof(dns_msgblock_t) + (sizeof_type * count); @@ -187,8 +183,7 @@ msgblock_allocate(isc_mem_t *mctx, unsigned int sizeof_type, unsigned int count) * NULL. */ static inline void * -msgblock_internalget(dns_msgblock_t *block, unsigned int sizeof_type) -{ +msgblock_internalget(dns_msgblock_t *block, unsigned int sizeof_type) { void *ptr; if (block == NULL || block->remaining == 0) { @@ -204,8 +199,7 @@ msgblock_internalget(dns_msgblock_t *block, unsigned int sizeof_type) } static inline void -msgblock_reset(dns_msgblock_t *block) -{ +msgblock_reset(dns_msgblock_t *block) { block->remaining = block->count; } @@ -213,8 +207,8 @@ msgblock_reset(dns_msgblock_t *block) * Release memory associated with a message block. */ static inline void -msgblock_free(isc_mem_t *mctx, dns_msgblock_t *block, unsigned int sizeof_type) -{ +msgblock_free(isc_mem_t *mctx, dns_msgblock_t *block, + unsigned int sizeof_type) { unsigned int length; length = sizeof(dns_msgblock_t) + (sizeof_type * block->count); @@ -228,8 +222,7 @@ msgblock_free(isc_mem_t *mctx, dns_msgblock_t *block, unsigned int sizeof_type) * uses) */ static inline isc_result_t -newbuffer(dns_message_t *msg, unsigned int size) -{ +newbuffer(dns_message_t *msg, unsigned int size) { isc_buffer_t *dynbuf; dynbuf = NULL; @@ -240,8 +233,7 @@ newbuffer(dns_message_t *msg, unsigned int size) } static inline isc_buffer_t * -currentbuffer(dns_message_t *msg) -{ +currentbuffer(dns_message_t *msg) { isc_buffer_t *dynbuf; dynbuf = ISC_LIST_TAIL(msg->scratchpad); @@ -251,16 +243,14 @@ currentbuffer(dns_message_t *msg) } static inline void -releaserdata(dns_message_t *msg, dns_rdata_t *rdata) -{ +releaserdata(dns_message_t *msg, dns_rdata_t *rdata) { ISC_LIST_PREPEND(msg->freerdata, rdata, link); } static inline dns_rdata_t * -newrdata(dns_message_t *msg) -{ +newrdata(dns_message_t *msg) { dns_msgblock_t *msgblock; - dns_rdata_t * rdata; + dns_rdata_t *rdata; rdata = ISC_LIST_HEAD(msg->freerdata); if (rdata != NULL) { @@ -287,15 +277,13 @@ newrdata(dns_message_t *msg) } static inline void -releaserdatalist(dns_message_t *msg, dns_rdatalist_t *rdatalist) -{ +releaserdatalist(dns_message_t *msg, dns_rdatalist_t *rdatalist) { ISC_LIST_PREPEND(msg->freerdatalist, rdatalist, link); } static inline dns_rdatalist_t * -newrdatalist(dns_message_t *msg) -{ - dns_msgblock_t * msgblock; +newrdatalist(dns_message_t *msg) { + dns_msgblock_t *msgblock; dns_rdatalist_t *rdatalist; rdatalist = ISC_LIST_HEAD(msg->freerdatalist); @@ -326,10 +314,9 @@ out: } static inline dns_offsets_t * -newoffsets(dns_message_t *msg) -{ +newoffsets(dns_message_t *msg) { dns_msgblock_t *msgblock; - dns_offsets_t * offsets; + dns_offsets_t *offsets; msgblock = ISC_LIST_TAIL(msg->offsets); offsets = msgblock_get(msgblock, dns_offsets_t); @@ -349,8 +336,7 @@ newoffsets(dns_message_t *msg) } static inline void -msginitheader(dns_message_t *m) -{ +msginitheader(dns_message_t *m) { m->id = 0; m->flags = 0; m->rcode = 0; @@ -359,8 +345,7 @@ msginitheader(dns_message_t *m) } static inline void -msginitprivate(dns_message_t *m) -{ +msginitprivate(dns_message_t *m) { unsigned int i; for (i = 0; i < DNS_SECTION_MAX; i++) { @@ -382,8 +367,7 @@ msginitprivate(dns_message_t *m) } static inline void -msginittsig(dns_message_t *m) -{ +msginittsig(dns_message_t *m) { m->tsigstatus = dns_rcode_noerror; m->querytsigstatus = dns_rcode_noerror; m->tsigkey = NULL; @@ -399,8 +383,7 @@ msginittsig(dns_message_t *m) * and when resetting one. */ static inline void -msginit(dns_message_t *m) -{ +msginit(dns_message_t *m) { msginitheader(m); msginitprivate(m); msginittsig(m); @@ -429,10 +412,9 @@ msginit(dns_message_t *m) } static inline void -msgresetnames(dns_message_t *msg, unsigned int first_section) -{ - unsigned int i; - dns_name_t * name, *next_name; +msgresetnames(dns_message_t *msg, unsigned int first_section) { + unsigned int i; + dns_name_t *name, *next_name; dns_rdataset_t *rds, *next_rds; /* @@ -464,8 +446,7 @@ msgresetnames(dns_message_t *msg, unsigned int first_section) } static void -msgresetopt(dns_message_t *msg) -{ +msgresetopt(dns_message_t *msg) { if (msg->opt != NULL) { if (msg->opt_reserved > 0) { dns_message_renderrelease(msg, msg->opt_reserved); @@ -481,8 +462,7 @@ msgresetopt(dns_message_t *msg) } static void -msgresetsigs(dns_message_t *msg, bool replying) -{ +msgresetsigs(dns_message_t *msg, bool replying) { if (msg->sig_reserved > 0) { dns_message_renderrelease(msg, msg->sig_reserved); msg->sig_reserved = 0; @@ -532,11 +512,10 @@ msgresetsigs(dns_message_t *msg, bool replying) * both dns_message_reset() and dns_message_destroy(). */ static void -msgreset(dns_message_t *msg, bool everything) -{ - dns_msgblock_t * msgblock, *next_msgblock; - isc_buffer_t * dynbuf, *next_dynbuf; - dns_rdata_t * rdata; +msgreset(dns_message_t *msg, bool everything) { + dns_msgblock_t *msgblock, *next_msgblock; + isc_buffer_t *dynbuf, *next_dynbuf; + dns_rdata_t *rdata; dns_rdatalist_t *rdatalist; msgresetnames(msg, 0); @@ -666,8 +645,7 @@ msgreset(dns_message_t *msg, bool everything) } static unsigned int -spacefortsig(dns_tsigkey_t *key, int otherlen) -{ +spacefortsig(dns_tsigkey_t *key, int otherlen) { isc_region_t r1, r2; unsigned int x; isc_result_t result; @@ -707,11 +685,10 @@ spacefortsig(dns_tsigkey_t *key, int otherlen) } isc_result_t -dns_message_create(isc_mem_t *mctx, unsigned int intent, dns_message_t **msgp) -{ +dns_message_create(isc_mem_t *mctx, unsigned int intent, dns_message_t **msgp) { dns_message_t *m; - isc_buffer_t * dynbuf; - unsigned int i; + isc_buffer_t *dynbuf; + unsigned int i; REQUIRE(mctx != NULL); REQUIRE(msgp != NULL); @@ -772,8 +749,7 @@ dns_message_create(isc_mem_t *mctx, unsigned int intent, dns_message_t **msgp) } void -dns_message_reset(dns_message_t *msg, unsigned int intent) -{ +dns_message_reset(dns_message_t *msg, unsigned int intent) { REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(intent == DNS_MESSAGE_INTENTPARSE || intent == DNS_MESSAGE_INTENTRENDER); @@ -783,8 +759,7 @@ dns_message_reset(dns_message_t *msg, unsigned int intent) } void -dns_message_destroy(dns_message_t **msgp) -{ +dns_message_destroy(dns_message_t **msgp) { dns_message_t *msg; REQUIRE(msgp != NULL); @@ -802,12 +777,12 @@ dns_message_destroy(dns_message_t **msgp) static isc_result_t findname(dns_name_t **foundname, const dns_name_t *target, - dns_namelist_t *section) -{ + dns_namelist_t *section) { dns_name_t *curr; for (curr = ISC_LIST_TAIL(*section); curr != NULL; - curr = ISC_LIST_PREV(curr, link)) { + curr = ISC_LIST_PREV(curr, link)) + { if (dns_name_equal(curr, target)) { if (foundname != NULL) { *foundname = curr; @@ -822,15 +797,15 @@ findname(dns_name_t **foundname, const dns_name_t *target, isc_result_t dns_message_find(const dns_name_t *name, dns_rdataclass_t rdclass, dns_rdatatype_t type, dns_rdatatype_t covers, - dns_rdataset_t **rdataset) -{ + dns_rdataset_t **rdataset) { dns_rdataset_t *curr; REQUIRE(name != NULL); REQUIRE(rdataset == NULL || *rdataset == NULL); for (curr = ISC_LIST_TAIL(name->list); curr != NULL; - curr = ISC_LIST_PREV(curr, link)) { + curr = ISC_LIST_PREV(curr, link)) + { if (curr->rdclass == rdclass && curr->type == type && curr->covers == covers) { if (rdataset != NULL) { @@ -845,15 +820,15 @@ dns_message_find(const dns_name_t *name, dns_rdataclass_t rdclass, isc_result_t dns_message_findtype(const dns_name_t *name, dns_rdatatype_t type, - dns_rdatatype_t covers, dns_rdataset_t **rdataset) -{ + dns_rdatatype_t covers, dns_rdataset_t **rdataset) { dns_rdataset_t *curr; REQUIRE(name != NULL); REQUIRE(rdataset == NULL || *rdataset == NULL); for (curr = ISC_LIST_TAIL(name->list); curr != NULL; - curr = ISC_LIST_PREV(curr, link)) { + curr = ISC_LIST_PREV(curr, link)) + { if (curr->type == type && curr->covers == covers) { if (ISC_UNLIKELY(rdataset != NULL)) { *rdataset = curr; @@ -870,11 +845,10 @@ dns_message_findtype(const dns_name_t *name, dns_rdatatype_t type, */ static isc_result_t getname(dns_name_t *name, isc_buffer_t *source, dns_message_t *msg, - dns_decompress_t *dctx) -{ + dns_decompress_t *dctx) { isc_buffer_t *scratch; - isc_result_t result; - unsigned int tries; + isc_result_t result; + unsigned int tries; scratch = currentbuffer(msg); @@ -908,12 +882,11 @@ getname(dns_name_t *name, isc_buffer_t *source, dns_message_t *msg, static isc_result_t getrdata(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, dns_rdataclass_t rdclass, dns_rdatatype_t rdtype, - unsigned int rdatalen, dns_rdata_t *rdata) -{ + unsigned int rdatalen, dns_rdata_t *rdata) { isc_buffer_t *scratch; - isc_result_t result; - unsigned int tries; - unsigned int trysize; + isc_result_t result; + unsigned int tries; + unsigned int trysize; scratch = currentbuffer(msg); @@ -972,22 +945,21 @@ getrdata(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, static isc_result_t getquestions(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, - unsigned int options) -{ - isc_region_t r; - unsigned int count; - dns_name_t * name; - dns_name_t * name2; - dns_offsets_t * offsets; - dns_rdataset_t * rdataset; + unsigned int options) { + isc_region_t r; + unsigned int count; + dns_name_t *name; + dns_name_t *name2; + dns_offsets_t *offsets; + dns_rdataset_t *rdataset; dns_rdatalist_t *rdatalist; - isc_result_t result; - dns_rdatatype_t rdtype; + isc_result_t result; + dns_rdatatype_t rdtype; dns_rdataclass_t rdclass; - dns_namelist_t * section; - bool free_name; - bool best_effort; - bool seen_problem; + dns_namelist_t *section; + bool free_name; + bool best_effort; + bool seen_problem; section = &msg->sections[DNS_SECTION_QUESTION]; @@ -1146,8 +1118,7 @@ cleanup: } static bool -update(dns_section_t section, dns_rdataclass_t rdclass) -{ +update(dns_section_t section, dns_rdataclass_t rdclass) { if (section == DNS_SECTION_PREREQUISITE) { return (rdclass == dns_rdataclass_any || rdclass == dns_rdataclass_none); @@ -1163,17 +1134,18 @@ update(dns_section_t section, dns_rdataclass_t rdclass) * covering RRSIGs. */ static bool -auth_signed(dns_namelist_t *section) -{ +auth_signed(dns_namelist_t *section) { dns_name_t *name; for (name = ISC_LIST_HEAD(*section); name != NULL; - name = ISC_LIST_NEXT(name, link)) { - int auth_dnssec = 0, auth_rrsig = 0; + name = ISC_LIST_NEXT(name, link)) + { + int auth_dnssec = 0, auth_rrsig = 0; dns_rdataset_t *rds; for (rds = ISC_LIST_HEAD(name->list); rds != NULL; - rds = ISC_LIST_NEXT(rds, link)) { + rds = ISC_LIST_NEXT(rds, link)) + { switch (rds->type) { case dns_rdatatype_ds: auth_dnssec |= 0x1; @@ -1215,24 +1187,23 @@ auth_signed(dns_namelist_t *section) static isc_result_t getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, - dns_section_t sectionid, unsigned int options) -{ - isc_region_t r; - unsigned int count, rdatalen; - dns_name_t * name = NULL; - dns_name_t * name2 = NULL; - dns_offsets_t * offsets; - dns_rdataset_t * rdataset; + dns_section_t sectionid, unsigned int options) { + isc_region_t r; + unsigned int count, rdatalen; + dns_name_t *name = NULL; + dns_name_t *name2 = NULL; + dns_offsets_t *offsets; + dns_rdataset_t *rdataset; dns_rdatalist_t *rdatalist; - isc_result_t result; - dns_rdatatype_t rdtype, covers; + isc_result_t result; + dns_rdatatype_t rdtype, covers; dns_rdataclass_t rdclass; - dns_rdata_t * rdata; - dns_ttl_t ttl; - dns_namelist_t * section; - bool free_name = false, free_rdataset = false; - bool preserve_order, best_effort, seen_problem; - bool isedns, issigzero, istsig; + dns_rdata_t *rdata; + dns_ttl_t ttl; + dns_namelist_t *section; + bool free_name = false, free_rdataset = false; + bool preserve_order, best_effort, seen_problem; + bool isedns, issigzero, istsig; preserve_order = ((options & DNS_MESSAGEPARSE_PRESERVEORDER) != 0); best_effort = ((options & DNS_MESSAGEPARSE_BESTEFFORT) != 0); @@ -1241,7 +1212,7 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, section = &msg->sections[sectionid]; for (count = 0; count < msg->counts[sectionid]; count++) { - int recstart = source->current; + int recstart = source->current; bool skip_name_search, skip_type_search; skip_name_search = false; @@ -1294,7 +1265,8 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, if (msg->rdclass_set == 0 && rdtype != dns_rdatatype_opt && /* class is UDP SIZE */ rdtype != dns_rdatatype_tsig && /* class is ANY */ - rdtype != dns_rdatatype_tkey) { /* class is undefined */ + rdtype != dns_rdatatype_tkey) + { /* class is undefined */ msg->rdclass = rdclass; msg->rdclass_set = 1; } @@ -1310,7 +1282,8 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, rdtype != dns_rdatatype_sig && /* SIG(0) */ rdtype != dns_rdatatype_tkey && /* Win2000 TKEY */ msg->rdclass != dns_rdataclass_any && - msg->rdclass != rdclass) { + msg->rdclass != rdclass) + { DO_ERROR(DNS_R_FORMERR); } @@ -1321,7 +1294,8 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, if (msg->opcode != dns_opcode_update && !msg->tkey && rdtype == dns_rdatatype_key && msg->rdclass != dns_rdataclass_any && - msg->rdclass != rdclass) { + msg->rdclass != rdclass) + { DO_ERROR(DNS_R_FORMERR); } @@ -1335,7 +1309,8 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, */ if (sectionid != DNS_SECTION_ADDITIONAL || rdclass != dns_rdataclass_any || - count != msg->counts[sectionid] - 1) { + count != msg->counts[sectionid] - 1) + { DO_ERROR(DNS_R_BADTSIG); } else { skip_name_search = true; @@ -1350,7 +1325,8 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, */ if (!dns_name_equal(dns_rootname, name) || sectionid != DNS_SECTION_ADDITIONAL || - msg->opt != NULL) { + msg->opt != NULL) + { DO_ERROR(DNS_R_FORMERR); } else { skip_name_search = true; @@ -1421,7 +1397,8 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, result = ISC_R_SUCCESS; } else if (rdclass == dns_rdataclass_none && msg->opcode == dns_opcode_update && - sectionid == DNS_SECTION_UPDATE) { + sectionid == DNS_SECTION_UPDATE) + { result = getrdata(source, msg, dctx, msg->rdclass, rdtype, rdatalen, rdata); } else { @@ -1463,7 +1440,8 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, * Check the ownername of NSEC3 records */ if (rdtype == dns_rdatatype_nsec3 && - !dns_rdata_checkowner(name, msg->rdclass, rdtype, false)) { + !dns_rdata_checkowner(name, msg->rdclass, rdtype, false)) + { result = DNS_R_BADOWNERNAME; goto cleanup; } @@ -1657,7 +1635,8 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx, msg->opcode == dns_opcode_query && ((msg->flags & DNS_MESSAGEFLAG_QR) != 0) && ((msg->flags & DNS_MESSAGEFLAG_TC) == 0) && !preserve_order && - !auth_signed(section)) { + !auth_signed(section)) + { DO_ERROR(DNS_R_FORMERR); } @@ -1679,15 +1658,14 @@ cleanup: isc_result_t dns_message_parse(dns_message_t *msg, isc_buffer_t *source, - unsigned int options) -{ - isc_region_t r; + unsigned int options) { + isc_region_t r; dns_decompress_t dctx; - isc_result_t ret; - uint16_t tmpflags; - isc_buffer_t origsource; - bool seen_problem; - bool ignore_tc; + isc_result_t ret; + uint16_t tmpflags; + isc_buffer_t origsource; + bool seen_problem; + bool ignore_tc; REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(source != NULL); @@ -1806,8 +1784,7 @@ truncated: isc_result_t dns_message_renderbegin(dns_message_t *msg, dns_compress_t *cctx, - isc_buffer_t *buffer) -{ + isc_buffer_t *buffer) { isc_region_t r; REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -1846,8 +1823,7 @@ dns_message_renderbegin(dns_message_t *msg, dns_compress_t *cctx, } isc_result_t -dns_message_renderchangebuffer(dns_message_t *msg, isc_buffer_t *buffer) -{ +dns_message_renderchangebuffer(dns_message_t *msg, isc_buffer_t *buffer) { isc_region_t r, rn; REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -1876,8 +1852,7 @@ dns_message_renderchangebuffer(dns_message_t *msg, isc_buffer_t *buffer) } void -dns_message_renderrelease(dns_message_t *msg, unsigned int space) -{ +dns_message_renderrelease(dns_message_t *msg, unsigned int space) { REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(space <= msg->reserved); @@ -1885,8 +1860,7 @@ dns_message_renderrelease(dns_message_t *msg, unsigned int space) } isc_result_t -dns_message_renderreserve(dns_message_t *msg, unsigned int space) -{ +dns_message_renderreserve(dns_message_t *msg, unsigned int space) { isc_region_t r; REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -1904,8 +1878,7 @@ dns_message_renderreserve(dns_message_t *msg, unsigned int space) } static inline bool -wrong_priority(dns_rdataset_t *rds, int pass, dns_rdatatype_t preferred_glue) -{ +wrong_priority(dns_rdataset_t *rds, int pass, dns_rdatatype_t preferred_glue) { int pass_needed; /* @@ -1942,8 +1915,7 @@ wrong_priority(dns_rdataset_t *rds, int pass, dns_rdatatype_t preferred_glue) static isc_result_t renderset(dns_rdataset_t *rdataset, const dns_name_t *owner_name, dns_compress_t *cctx, isc_buffer_t *target, unsigned int reserved, - unsigned int options, unsigned int *countp) -{ + unsigned int options, unsigned int *countp) { isc_result_t result; /* @@ -1962,29 +1934,28 @@ renderset(dns_rdataset_t *rdataset, const dns_name_t *owner_name, } static void -maybe_clear_ad(dns_message_t *msg, dns_section_t sectionid) -{ +maybe_clear_ad(dns_message_t *msg, dns_section_t sectionid) { if (msg->counts[sectionid] == 0 && (sectionid == DNS_SECTION_ANSWER || (sectionid == DNS_SECTION_AUTHORITY && - msg->counts[DNS_SECTION_ANSWER] == 0))) { + msg->counts[DNS_SECTION_ANSWER] == 0))) + { msg->flags &= ~DNS_MESSAGEFLAG_AD; } } isc_result_t dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, - unsigned int options) -{ + unsigned int options) { dns_namelist_t *section; - dns_name_t * name, *next_name; + dns_name_t *name, *next_name; dns_rdataset_t *rdataset, *next_rdataset; - unsigned int count, total; - isc_result_t result; - isc_buffer_t st; /* for rollbacks */ - int pass; - bool partial = false; - unsigned int rd_options; + unsigned int count, total; + isc_result_t result; + isc_buffer_t st; /* for rollbacks */ + int pass; + bool partial = false; + unsigned int rd_options; dns_rdatatype_t preferred_glue = 0; REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -1994,7 +1965,8 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, section = &msg->sections[sectionid]; if ((sectionid == DNS_SECTION_ADDITIONAL) && - (options & DNS_MESSAGERENDER_ORDERED) == 0) { + (options & DNS_MESSAGERENDER_ORDERED) == 0) + { if ((options & DNS_MESSAGERENDER_PREFER_A) != 0) { preferred_glue = dns_rdatatype_a; pass = 4; @@ -2036,7 +2008,8 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, if (rdataset != NULL && (rdataset->attributes & DNS_RDATASETATTR_REQUIREDGLUE) != 0 && - (rdataset->attributes & DNS_RDATASETATTR_RENDERED) == 0) { + (rdataset->attributes & DNS_RDATASETATTR_RENDERED) == 0) + { const void *order_arg = &msg->order_arg; st = *(msg->buffer); count = 0; @@ -2098,7 +2071,8 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, 0) && (sectionid == DNS_SECTION_ADDITIONAL) && wrong_priority(rdataset, pass, - preferred_glue)) { + preferred_glue)) + { goto next; } @@ -2156,7 +2130,8 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, */ if (rdataset->trust != dns_trust_secure && (sectionid == DNS_SECTION_ANSWER || - sectionid == DNS_SECTION_AUTHORITY)) { + sectionid == DNS_SECTION_AUTHORITY)) + { msg->flags &= ~DNS_MESSAGEFLAG_AD; } if (OPTOUT(rdataset)) { @@ -2181,9 +2156,8 @@ dns_message_rendersection(dns_message_t *msg, dns_section_t sectionid, } void -dns_message_renderheader(dns_message_t *msg, isc_buffer_t *target) -{ - uint16_t tmp; +dns_message_renderheader(dns_message_t *msg, isc_buffer_t *target) { + uint16_t tmp; isc_region_t r; REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -2215,11 +2189,10 @@ dns_message_renderheader(dns_message_t *msg, isc_buffer_t *target) } isc_result_t -dns_message_renderend(dns_message_t *msg) -{ +dns_message_renderend(dns_message_t *msg) { isc_buffer_t tmpbuf; isc_region_t r; - int result; + int result; unsigned int count; REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -2239,7 +2212,8 @@ dns_message_renderend(dns_message_t *msg) * fit, don't include it. */ if ((msg->tsigkey != NULL || msg->sig0key != NULL || msg->opt) && - (msg->flags & DNS_MESSAGEFLAG_TC) != 0) { + (msg->flags & DNS_MESSAGEFLAG_TC) != 0) + { isc_buffer_t *buf; msgresetnames(msg, DNS_SECTION_ANSWER); @@ -2249,8 +2223,8 @@ dns_message_renderend(dns_message_t *msg) isc_buffer_clear(msg->buffer); isc_buffer_add(msg->buffer, DNS_MESSAGE_HEADERLEN); dns_compress_rollback(msg->cctx, 0); - result = - dns_message_rendersection(msg, DNS_SECTION_QUESTION, 0); + result = dns_message_rendersection(msg, DNS_SECTION_QUESTION, + 0); if (result != ISC_R_SUCCESS && result != ISC_R_NOSPACE) { return (result); } @@ -2266,8 +2240,8 @@ dns_message_renderend(dns_message_t *msg) * Set the extended rcode. */ msg->opt->ttl &= ~DNS_MESSAGE_EDNSRCODE_MASK; - msg->opt->ttl |= - ((msg->rcode << 20) & DNS_MESSAGE_EDNSRCODE_MASK); + msg->opt->ttl |= ((msg->rcode << 20) & + DNS_MESSAGE_EDNSRCODE_MASK); /* * Render. */ @@ -2288,8 +2262,8 @@ dns_message_renderend(dns_message_t *msg) */ if (msg->padding_off > 0) { unsigned char *cp = isc_buffer_used(msg->buffer); - unsigned int used, remaining; - uint16_t len, padsize = 0; + unsigned int used, remaining; + uint16_t len, padsize = 0; /* Check PAD */ if ((cp[-4] != 0) || (cp[-3] != DNS_OPT_PAD) || (cp[-2] != 0) || @@ -2305,8 +2279,8 @@ dns_message_renderend(dns_message_t *msg) /* Aligned used length + reserved to padding block */ used = isc_buffer_usedlength(msg->buffer); if (msg->padding != 0) { - padsize = - ((uint16_t)used + msg->reserved) % msg->padding; + padsize = ((uint16_t)used + msg->reserved) % + msg->padding; } if (padsize != 0) { padsize = msg->padding - padsize; @@ -2383,10 +2357,9 @@ dns_message_renderend(dns_message_t *msg) } void -dns_message_renderreset(dns_message_t *msg) -{ - unsigned int i; - dns_name_t * name; +dns_message_renderreset(dns_message_t *msg) { + unsigned int i; + dns_name_t *name; dns_rdataset_t *rds; /* @@ -2402,9 +2375,11 @@ dns_message_renderreset(dns_message_t *msg) msg->cursors[i] = NULL; msg->counts[i] = 0; for (name = ISC_LIST_HEAD(msg->sections[i]); name != NULL; - name = ISC_LIST_NEXT(name, link)) { + name = ISC_LIST_NEXT(name, link)) + { for (rds = ISC_LIST_HEAD(name->list); rds != NULL; - rds = ISC_LIST_NEXT(rds, link)) { + rds = ISC_LIST_NEXT(rds, link)) + { rds->attributes &= ~DNS_RDATASETATTR_RENDERED; } } @@ -2423,8 +2398,7 @@ dns_message_renderreset(dns_message_t *msg) } isc_result_t -dns_message_firstname(dns_message_t *msg, dns_section_t section) -{ +dns_message_firstname(dns_message_t *msg, dns_section_t section) { REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(VALID_NAMED_SECTION(section)); @@ -2438,8 +2412,7 @@ dns_message_firstname(dns_message_t *msg, dns_section_t section) } isc_result_t -dns_message_nextname(dns_message_t *msg, dns_section_t section) -{ +dns_message_nextname(dns_message_t *msg, dns_section_t section) { REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(VALID_NAMED_SECTION(section)); REQUIRE(msg->cursors[section] != NULL); @@ -2455,8 +2428,7 @@ dns_message_nextname(dns_message_t *msg, dns_section_t section) void dns_message_currentname(dns_message_t *msg, dns_section_t section, - dns_name_t **name) -{ + dns_name_t **name) { REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(VALID_NAMED_SECTION(section)); REQUIRE(name != NULL && *name == NULL); @@ -2469,9 +2441,8 @@ isc_result_t dns_message_findname(dns_message_t *msg, dns_section_t section, const dns_name_t *target, dns_rdatatype_t type, dns_rdatatype_t covers, dns_name_t **name, - dns_rdataset_t **rdataset) -{ - dns_name_t * foundname; + dns_rdataset_t **rdataset) { + dns_name_t *foundname; isc_result_t result; /* @@ -2520,8 +2491,7 @@ dns_message_findname(dns_message_t *msg, dns_section_t section, void dns_message_movename(dns_message_t *msg, dns_name_t *name, - dns_section_t fromsection, dns_section_t tosection) -{ + dns_section_t fromsection, dns_section_t tosection) { REQUIRE(msg != NULL); REQUIRE(msg->from_to_wire == DNS_MESSAGE_INTENTRENDER); REQUIRE(name != NULL); @@ -2536,8 +2506,8 @@ dns_message_movename(dns_message_t *msg, dns_name_t *name, } void -dns_message_addname(dns_message_t *msg, dns_name_t *name, dns_section_t section) -{ +dns_message_addname(dns_message_t *msg, dns_name_t *name, + dns_section_t section) { REQUIRE(msg != NULL); REQUIRE(msg->from_to_wire == DNS_MESSAGE_INTENTRENDER); REQUIRE(name != NULL); @@ -2548,8 +2518,7 @@ dns_message_addname(dns_message_t *msg, dns_name_t *name, dns_section_t section) void dns_message_removename(dns_message_t *msg, dns_name_t *name, - dns_section_t section) -{ + dns_section_t section) { REQUIRE(msg != NULL); REQUIRE(msg->from_to_wire == DNS_MESSAGE_INTENTRENDER); REQUIRE(name != NULL); @@ -2559,8 +2528,7 @@ dns_message_removename(dns_message_t *msg, dns_name_t *name, } isc_result_t -dns_message_gettempname(dns_message_t *msg, dns_name_t **item) -{ +dns_message_gettempname(dns_message_t *msg, dns_name_t **item) { REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(item != NULL && *item == NULL); @@ -2574,8 +2542,7 @@ dns_message_gettempname(dns_message_t *msg, dns_name_t **item) } isc_result_t -dns_message_gettempoffsets(dns_message_t *msg, dns_offsets_t **item) -{ +dns_message_gettempoffsets(dns_message_t *msg, dns_offsets_t **item) { REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(item != NULL && *item == NULL); @@ -2588,8 +2555,7 @@ dns_message_gettempoffsets(dns_message_t *msg, dns_offsets_t **item) } isc_result_t -dns_message_gettemprdata(dns_message_t *msg, dns_rdata_t **item) -{ +dns_message_gettemprdata(dns_message_t *msg, dns_rdata_t **item) { REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(item != NULL && *item == NULL); @@ -2602,8 +2568,7 @@ dns_message_gettemprdata(dns_message_t *msg, dns_rdata_t **item) } isc_result_t -dns_message_gettemprdataset(dns_message_t *msg, dns_rdataset_t **item) -{ +dns_message_gettemprdataset(dns_message_t *msg, dns_rdataset_t **item) { REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(item != NULL && *item == NULL); @@ -2618,8 +2583,7 @@ dns_message_gettemprdataset(dns_message_t *msg, dns_rdataset_t **item) } isc_result_t -dns_message_gettemprdatalist(dns_message_t *msg, dns_rdatalist_t **item) -{ +dns_message_gettemprdatalist(dns_message_t *msg, dns_rdatalist_t **item) { REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(item != NULL && *item == NULL); @@ -2632,8 +2596,7 @@ dns_message_gettemprdatalist(dns_message_t *msg, dns_rdatalist_t **item) } void -dns_message_puttempname(dns_message_t *msg, dns_name_t **itemp) -{ +dns_message_puttempname(dns_message_t *msg, dns_name_t **itemp) { dns_name_t *item; REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -2650,8 +2613,7 @@ dns_message_puttempname(dns_message_t *msg, dns_name_t **itemp) } void -dns_message_puttemprdata(dns_message_t *msg, dns_rdata_t **item) -{ +dns_message_puttemprdata(dns_message_t *msg, dns_rdata_t **item) { REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(item != NULL && *item != NULL); @@ -2660,8 +2622,7 @@ dns_message_puttemprdata(dns_message_t *msg, dns_rdata_t **item) } void -dns_message_puttemprdataset(dns_message_t *msg, dns_rdataset_t **item) -{ +dns_message_puttemprdataset(dns_message_t *msg, dns_rdataset_t **item) { REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(item != NULL && *item != NULL); @@ -2671,8 +2632,7 @@ dns_message_puttemprdataset(dns_message_t *msg, dns_rdataset_t **item) } void -dns_message_puttemprdatalist(dns_message_t *msg, dns_rdatalist_t **item) -{ +dns_message_puttemprdatalist(dns_message_t *msg, dns_rdatalist_t **item) { REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(item != NULL && *item != NULL); @@ -2682,12 +2642,11 @@ dns_message_puttemprdatalist(dns_message_t *msg, dns_rdatalist_t **item) isc_result_t dns_message_peekheader(isc_buffer_t *source, dns_messageid_t *idp, - unsigned int *flagsp) -{ - isc_region_t r; - isc_buffer_t buffer; + unsigned int *flagsp) { + isc_region_t r; + isc_buffer_t buffer; dns_messageid_t id; - unsigned int flags; + unsigned int flags; REQUIRE(source != NULL); @@ -2713,8 +2672,7 @@ dns_message_peekheader(isc_buffer_t *source, dns_messageid_t *idp, } isc_result_t -dns_message_reply(dns_message_t *msg, bool want_question_section) -{ +dns_message_reply(dns_message_t *msg, bool want_question_section) { unsigned int clear_from; isc_result_t result; @@ -2724,8 +2682,8 @@ dns_message_reply(dns_message_t *msg, bool want_question_section) if (!msg->header_ok) { return (DNS_R_FORMERR); } - if (msg->opcode != dns_opcode_query && - msg->opcode != dns_opcode_notify) { + if (msg->opcode != dns_opcode_query && msg->opcode != dns_opcode_notify) + { want_question_section = false; } if (msg->opcode == dns_opcode_update) { @@ -2785,8 +2743,7 @@ dns_message_reply(dns_message_t *msg, bool want_question_section) } dns_rdataset_t * -dns_message_getopt(dns_message_t *msg) -{ +dns_message_getopt(dns_message_t *msg) { /* * Get the OPT record for 'msg'. */ @@ -2797,10 +2754,9 @@ dns_message_getopt(dns_message_t *msg) } isc_result_t -dns_message_setopt(dns_message_t *msg, dns_rdataset_t *opt) -{ +dns_message_setopt(dns_message_t *msg, dns_rdataset_t *opt) { isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_t rdata = DNS_RDATA_INIT; /* * Set the OPT record for 'msg'. @@ -2850,8 +2806,7 @@ cleanup: } dns_rdataset_t * -dns_message_gettsig(dns_message_t *msg, const dns_name_t **owner) -{ +dns_message_gettsig(dns_message_t *msg, const dns_name_t **owner) { /* * Get the TSIG record and owner for 'msg'. */ @@ -2866,8 +2821,7 @@ dns_message_gettsig(dns_message_t *msg, const dns_name_t **owner) } isc_result_t -dns_message_settsigkey(dns_message_t *msg, dns_tsigkey_t *key) -{ +dns_message_settsigkey(dns_message_t *msg, dns_tsigkey_t *key) { isc_result_t result; /* @@ -2901,8 +2855,7 @@ dns_message_settsigkey(dns_message_t *msg, dns_tsigkey_t *key) } dns_tsigkey_t * -dns_message_gettsigkey(dns_message_t *msg) -{ +dns_message_gettsigkey(dns_message_t *msg) { /* * Get the TSIG key for 'msg' */ @@ -2913,14 +2866,13 @@ dns_message_gettsigkey(dns_message_t *msg) } isc_result_t -dns_message_setquerytsig(dns_message_t *msg, isc_buffer_t *querytsig) -{ - dns_rdata_t * rdata = NULL; +dns_message_setquerytsig(dns_message_t *msg, isc_buffer_t *querytsig) { + dns_rdata_t *rdata = NULL; dns_rdatalist_t *list = NULL; - dns_rdataset_t * set = NULL; - isc_buffer_t * buf = NULL; - isc_region_t r; - isc_result_t result; + dns_rdataset_t *set = NULL; + isc_buffer_t *buf = NULL; + isc_region_t r; + isc_result_t result; REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(msg->querytsig == NULL); @@ -2975,10 +2927,9 @@ cleanup: isc_result_t dns_message_getquerytsig(dns_message_t *msg, isc_mem_t *mctx, - isc_buffer_t **querytsig) -{ + isc_buffer_t **querytsig) { isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_t rdata = DNS_RDATA_INIT; isc_region_t r; REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -3002,8 +2953,7 @@ dns_message_getquerytsig(dns_message_t *msg, isc_mem_t *mctx, } dns_rdataset_t * -dns_message_getsig0(dns_message_t *msg, const dns_name_t **owner) -{ +dns_message_getsig0(dns_message_t *msg, const dns_name_t **owner) { /* * Get the SIG(0) record for 'msg'. */ @@ -3026,8 +2976,7 @@ dns_message_getsig0(dns_message_t *msg, const dns_name_t **owner) } isc_result_t -dns_message_setsig0key(dns_message_t *msg, dst_key_t *key) -{ +dns_message_setsig0key(dns_message_t *msg, dst_key_t *key) { isc_region_t r; unsigned int x; isc_result_t result; @@ -3079,8 +3028,7 @@ dns_message_setsig0key(dns_message_t *msg, dst_key_t *key) } dst_key_t * -dns_message_getsig0key(dns_message_t *msg) -{ +dns_message_getsig0key(dns_message_t *msg) { /* * Get the SIG(0) key for 'msg' */ @@ -3091,8 +3039,7 @@ dns_message_getsig0key(dns_message_t *msg) } void -dns_message_takebuffer(dns_message_t *msg, isc_buffer_t **buffer) -{ +dns_message_takebuffer(dns_message_t *msg, isc_buffer_t **buffer) { REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(buffer != NULL); REQUIRE(ISC_BUFFER_VALID(*buffer)); @@ -3102,10 +3049,9 @@ dns_message_takebuffer(dns_message_t *msg, isc_buffer_t **buffer) } isc_result_t -dns_message_signer(dns_message_t *msg, dns_name_t *signer) -{ +dns_message_signer(dns_message_t *msg, dns_name_t *signer) { isc_result_t result = ISC_R_SUCCESS; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_t rdata = DNS_RDATA_INIT; REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(signer != NULL); @@ -3146,7 +3092,7 @@ dns_message_signer(dns_message_t *msg, dns_name_t *signer) dns_name_clone(&sig.signer, signer); dns_rdata_freestruct(&sig); } else { - const dns_name_t * identity; + const dns_name_t *identity; dns_rdata_any_tsig_t tsig; result = dns_rdataset_first(msg->tsig); @@ -3156,7 +3102,8 @@ dns_message_signer(dns_message_t *msg, dns_name_t *signer) result = dns_rdata_tostruct(&rdata, &tsig, NULL); INSIST(result == ISC_R_SUCCESS); if (msg->verified_sig && msg->tsigstatus == dns_rcode_noerror && - tsig.error == dns_rcode_noerror) { + tsig.error == dns_rcode_noerror) + { result = ISC_R_SUCCESS; } else if ((!msg->verified_sig) || (msg->tsigstatus != dns_rcode_noerror)) { @@ -3191,8 +3138,7 @@ dns_message_signer(dns_message_t *msg, dns_name_t *signer) } void -dns_message_resetsig(dns_message_t *msg) -{ +dns_message_resetsig(dns_message_t *msg) { REQUIRE(DNS_MESSAGE_VALID(msg)); msg->verified_sig = 0; msg->verify_attempted = 0; @@ -3206,19 +3152,17 @@ dns_message_resetsig(dns_message_t *msg) } isc_result_t -dns_message_rechecksig(dns_message_t *msg, dns_view_t *view) -{ +dns_message_rechecksig(dns_message_t *msg, dns_view_t *view) { dns_message_resetsig(msg); return (dns_message_checksig(msg, view)); } #ifdef SKAN_MSG_DEBUG void -dns_message_dumpsig(dns_message_t *msg, char *txt1) -{ - dns_rdata_t querytsigrdata = DNS_RDATA_INIT; +dns_message_dumpsig(dns_message_t *msg, char *txt1) { + dns_rdata_t querytsigrdata = DNS_RDATA_INIT; dns_rdata_any_tsig_t querytsig; - isc_result_t result; + isc_result_t result; if (msg->tsig != NULL) { result = dns_rdataset_first(msg->tsig); @@ -3242,8 +3186,7 @@ dns_message_dumpsig(dns_message_t *msg, char *txt1) #endif /* ifdef SKAN_MSG_DEBUG */ isc_result_t -dns_message_checksig(dns_message_t *msg, dns_view_t *view) -{ +dns_message_checksig(dns_message_t *msg, dns_view_t *view) { isc_buffer_t b, msgb; REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -3265,10 +3208,10 @@ dns_message_checksig(dns_message_t *msg, dns_view_t *view) return (dns_tsig_verify(&msgb, msg, NULL, NULL)); } } else { - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_sig_t sig; - dns_rdataset_t keyset; - isc_result_t result; + dns_rdataset_t keyset; + isc_result_t result; result = dns_rdataset_first(msg->sig0); INSIST(result == ISC_R_SUCCESS); @@ -3326,7 +3269,8 @@ dns_message_checksig(dns_message_t *msg, dns_view_t *view) if (dst_key_alg(key) != sig.algorithm || dst_key_id(key) != sig.keyid || !(dst_key_proto(key) == DNS_KEYPROTO_DNSSEC || - dst_key_proto(key) == DNS_KEYPROTO_ANY)) { + dst_key_proto(key) == DNS_KEYPROTO_ANY)) + { dst_key_free(&key); continue; } @@ -3351,7 +3295,7 @@ dns_message_checksig(dns_message_t *msg, dns_view_t *view) #define INDENT(sp) \ do { \ - unsigned int __i; \ + unsigned int __i; \ dns_masterstyle_flags_t __flags = dns_master_styleflags(sp); \ if ((__flags & DNS_STYLEFLAG_INDENT) == 0ULL && \ (__flags & DNS_STYLEFLAG_YAML) == 0ULL) \ @@ -3364,13 +3308,12 @@ dns_message_checksig(dns_message_t *msg, dns_view_t *view) isc_result_t dns_message_sectiontotext(dns_message_t *msg, dns_section_t section, const dns_master_style_t *style, - dns_messagetextflag_t flags, isc_buffer_t *target) -{ - dns_name_t * name, empty_name; - dns_rdataset_t * rdataset; - isc_result_t result = ISC_R_SUCCESS; - bool seensoa = false; - size_t saved_count; + dns_messagetextflag_t flags, isc_buffer_t *target) { + dns_name_t *name, empty_name; + dns_rdataset_t *rdataset; + isc_result_t result = ISC_R_SUCCESS; + bool seensoa = false; + size_t saved_count; dns_masterstyle_flags_t sflags; REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -3415,11 +3358,12 @@ dns_message_sectiontotext(dns_message_t *msg, dns_section_t section, name = NULL; dns_message_currentname(msg, section, &name); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (section == DNS_SECTION_ANSWER && rdataset->type == dns_rdatatype_soa) { - if ((flags & DNS_MESSAGETEXTFLAG_OMITSOA) != - 0) { + if ((flags & DNS_MESSAGETEXTFLAG_OMITSOA) != 0) + { continue; } if (seensoa && @@ -3453,7 +3397,8 @@ dns_message_sectiontotext(dns_message_t *msg, dns_section_t section, } if ((flags & DNS_MESSAGETEXTFLAG_NOHEADERS) == 0 && (flags & DNS_MESSAGETEXTFLAG_NOCOMMENTS) == 0 && - (sflags & DNS_STYLEFLAG_YAML) == 0) { + (sflags & DNS_STYLEFLAG_YAML) == 0) + { INDENT(style); ADD_STRING(target, "\n"); } @@ -3467,12 +3412,11 @@ cleanup: } static isc_result_t -render_ecs(isc_buffer_t *ecsbuf, isc_buffer_t *target) -{ - int i; - char addr[16], addr_text[64]; - uint16_t family; - uint8_t addrlen, addrbytes, scopelen; +render_ecs(isc_buffer_t *ecsbuf, isc_buffer_t *target) { + int i; + char addr[16], addr_text[64]; + uint16_t family; + uint8_t addrlen, addrbytes, scopelen; isc_result_t result; /* @@ -3535,12 +3479,11 @@ cleanup: } static isc_result_t -render_llq(isc_buffer_t *optbuf, isc_buffer_t *target) -{ - char buf[sizeof("18446744073709551615")]; /* 2^64-1 */ +render_llq(isc_buffer_t *optbuf, isc_buffer_t *target) { + char buf[sizeof("18446744073709551615")]; /* 2^64-1 */ isc_result_t result = ISC_R_SUCCESS; - uint32_t u; - uint64_t q; + uint32_t u; + uint64_t q; u = isc_buffer_getuint16(optbuf); ADD_STRING(target, " Version: "); @@ -3575,19 +3518,18 @@ cleanup: static isc_result_t dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section, const dns_master_style_t *style, - dns_messagetextflag_t flags, - isc_buffer_t * target) -{ - dns_rdataset_t * ps = NULL; + dns_messagetextflag_t flags, + isc_buffer_t *target) { + dns_rdataset_t *ps = NULL; const dns_name_t *name = NULL; - isc_result_t result = ISC_R_SUCCESS; - char buf[sizeof("1234567890")]; - uint32_t mbz; - dns_rdata_t rdata; - isc_buffer_t optbuf; - uint16_t optcode, optlen; - size_t saved_count; - unsigned char * optdata; + isc_result_t result = ISC_R_SUCCESS; + char buf[sizeof("1234567890")]; + uint32_t mbz; + dns_rdata_t rdata; + isc_buffer_t optbuf; + uint16_t optcode, optlen; + size_t saved_count; + unsigned char *optdata; REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(target != NULL); @@ -3733,7 +3675,7 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section, ADD_STRING(target, "KEY-TAG:"); if (optlen > 0U && (optlen % 2U) == 0U) { const char *sep = ""; - uint16_t id; + uint16_t id; while (optlen > 0U) { id = isc_buffer_getuint16( &optbuf); @@ -3835,8 +3777,8 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section, * version */ ADD_STRING(target, "(\""); - if (isc_buffer_availablelength(target) < - optlen) { + if (isc_buffer_availablelength(target) < optlen) + { result = ISC_R_NOSPACE; goto cleanup; } @@ -3877,7 +3819,8 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section, result = dns_master_rdatasettotext(name, ps, style, &msg->indent, target); if ((flags & DNS_MESSAGETEXTFLAG_NOHEADERS) == 0 && - (flags & DNS_MESSAGETEXTFLAG_NOCOMMENTS) == 0) { + (flags & DNS_MESSAGETEXTFLAG_NOCOMMENTS) == 0) + { ADD_STRING(target, "\n"); } goto cleanup; @@ -3893,18 +3836,17 @@ cleanup: isc_result_t dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section, const dns_master_style_t *style, - dns_messagetextflag_t flags, - isc_buffer_t * target) -{ - dns_rdataset_t * ps = NULL; + dns_messagetextflag_t flags, + isc_buffer_t *target) { + dns_rdataset_t *ps = NULL; const dns_name_t *name = NULL; - isc_result_t result; - char buf[sizeof(" (65000 bytes)")]; - uint32_t mbz; - dns_rdata_t rdata; - isc_buffer_t optbuf; - uint16_t optcode, optlen; - unsigned char * optdata; + isc_result_t result; + char buf[sizeof(" (65000 bytes)")]; + uint32_t mbz; + dns_rdata_t rdata; + isc_buffer_t optbuf; + uint16_t optcode, optlen; + unsigned char *optdata; REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(target != NULL); @@ -4046,7 +3988,7 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section, ADD_STRING(target, "; KEY-TAG:"); if (optlen > 0U && (optlen % 2U) == 0U) { const char *sep = ""; - uint16_t id; + uint16_t id; while (optlen > 0U) { id = isc_buffer_getuint16( &optbuf); @@ -4145,8 +4087,8 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section, * version */ ADD_STRING(target, "(\""); - if (isc_buffer_availablelength(target) < - optlen) { + if (isc_buffer_availablelength(target) < optlen) + { return (ISC_R_NOSPACE); } for (i = 0; i < optlen; i++) { @@ -4174,7 +4116,8 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section, result = dns_master_rdatasettotext(name, ps, style, &msg->indent, target); if ((flags & DNS_MESSAGETEXTFLAG_NOHEADERS) == 0 && - (flags & DNS_MESSAGETEXTFLAG_NOCOMMENTS) == 0) { + (flags & DNS_MESSAGETEXTFLAG_NOCOMMENTS) == 0) + { ADD_STRING(target, "\n"); } return (result); @@ -4190,7 +4133,8 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section, result = dns_master_rdatasettotext(name, ps, style, &msg->indent, target); if ((flags & DNS_MESSAGETEXTFLAG_NOHEADERS) == 0 && - (flags & DNS_MESSAGETEXTFLAG_NOCOMMENTS) == 0) { + (flags & DNS_MESSAGETEXTFLAG_NOCOMMENTS) == 0) + { ADD_STRING(target, "\n"); } return (result); @@ -4202,9 +4146,8 @@ cleanup: isc_result_t dns_message_headertotext(dns_message_t *msg, const dns_master_style_t *style, - dns_messagetextflag_t flags, isc_buffer_t *target) -{ - char buf[sizeof("1234567890")]; + dns_messagetextflag_t flags, isc_buffer_t *target) { + char buf[sizeof("1234567890")]; isc_result_t result; REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -4383,8 +4326,7 @@ cleanup: isc_result_t dns_message_totext(dns_message_t *msg, const dns_master_style_t *style, - dns_messagetextflag_t flags, isc_buffer_t *target) -{ + dns_messagetextflag_t flags, isc_buffer_t *target) { isc_result_t result; REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -4437,8 +4379,7 @@ dns_message_totext(dns_message_t *msg, const dns_master_style_t *style, } isc_region_t * -dns_message_getrawmessage(dns_message_t *msg) -{ +dns_message_getrawmessage(dns_message_t *msg) { REQUIRE(DNS_MESSAGE_VALID(msg)); return (&msg->saved); } @@ -4446,8 +4387,7 @@ dns_message_getrawmessage(dns_message_t *msg) void dns_message_setsortorder(dns_message_t *msg, dns_rdatasetorderfunc_t order, dns_aclenv_t *env, const dns_acl_t *acl, - const dns_aclelement_t *elem) -{ + const dns_aclelement_t *elem) { REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE((order == NULL) == (env == NULL)); REQUIRE(env == NULL || (acl != NULL || elem != NULL)); @@ -4459,22 +4399,19 @@ dns_message_setsortorder(dns_message_t *msg, dns_rdatasetorderfunc_t order, } void -dns_message_settimeadjust(dns_message_t *msg, int timeadjust) -{ +dns_message_settimeadjust(dns_message_t *msg, int timeadjust) { REQUIRE(DNS_MESSAGE_VALID(msg)); msg->timeadjust = timeadjust; } int -dns_message_gettimeadjust(dns_message_t *msg) -{ +dns_message_gettimeadjust(dns_message_t *msg) { REQUIRE(DNS_MESSAGE_VALID(msg)); return (msg->timeadjust); } isc_result_t -dns_opcode_totext(dns_opcode_t opcode, isc_buffer_t *target) -{ +dns_opcode_totext(dns_opcode_t opcode, isc_buffer_t *target) { REQUIRE(opcode < 16); if (isc_buffer_availablelength(target) < strlen(opcodetext[opcode])) { @@ -4488,8 +4425,7 @@ void dns_message_logpacket(dns_message_t *message, const char *description, const isc_sockaddr_t *address, isc_logcategory_t *category, isc_logmodule_t *module, - int level, isc_mem_t *mctx) -{ + int level, isc_mem_t *mctx) { REQUIRE(address != NULL); logfmtpacket(message, description, address, category, module, @@ -4501,8 +4437,7 @@ dns_message_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) -{ + isc_mem_t *mctx) { REQUIRE(address != NULL); logfmtpacket(message, description, address, category, module, style, @@ -4513,14 +4448,13 @@ 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) -{ - char addrbuf[ISC_SOCKADDR_FORMATSIZE] = { 0 }; - const char * newline = "\n"; - const char * space = " "; + int level, isc_mem_t *mctx) { + char addrbuf[ISC_SOCKADDR_FORMATSIZE] = { 0 }; + const char *newline = "\n"; + const char *space = " "; isc_buffer_t buffer; - char * buf = NULL; - int len = 1024; + char *buf = NULL; + int len = 1024; isc_result_t result; if (!isc_log_wouldlog(dns_lctx, level)) { @@ -4561,13 +4495,12 @@ logfmtpacket(dns_message_t *message, const char *description, isc_result_t dns_message_buildopt(dns_message_t *message, dns_rdataset_t **rdatasetp, unsigned int version, uint16_t udpsize, unsigned int flags, - dns_ednsopt_t *ednsopts, size_t count) -{ - dns_rdataset_t * rdataset = NULL; + dns_ednsopt_t *ednsopts, size_t count) { + dns_rdataset_t *rdataset = NULL; dns_rdatalist_t *rdatalist = NULL; - dns_rdata_t * rdata = NULL; - isc_result_t result; - unsigned int len = 0, i; + dns_rdata_t *rdata = NULL; + isc_result_t result; + unsigned int len = 0, i; REQUIRE(DNS_MESSAGE_VALID(message)); REQUIRE(rdatasetp != NULL && *rdatasetp == NULL); @@ -4603,7 +4536,7 @@ dns_message_buildopt(dns_message_t *message, dns_rdataset_t **rdatasetp, */ if (count != 0U) { isc_buffer_t *buf = NULL; - bool seenpad = false; + bool seenpad = false; for (i = 0; i < count; i++) { len += ednsopts[i].length + 4; } @@ -4670,8 +4603,7 @@ cleanup: } void -dns_message_setclass(dns_message_t *msg, dns_rdataclass_t rdclass) -{ +dns_message_setclass(dns_message_t *msg, dns_rdataclass_t rdclass) { REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(msg->from_to_wire == DNS_MESSAGE_INTENTPARSE); REQUIRE(msg->state == DNS_SECTION_ANY); @@ -4682,8 +4614,7 @@ dns_message_setclass(dns_message_t *msg, dns_rdataclass_t rdclass) } void -dns_message_setpadding(dns_message_t *msg, uint16_t padding) -{ +dns_message_setpadding(dns_message_t *msg, uint16_t padding) { REQUIRE(DNS_MESSAGE_VALID(msg)); /* Avoid silly large padding */ diff --git a/lib/dns/name.c b/lib/dns/name.c index c24a5c876e..08cf8112ec 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -140,8 +140,8 @@ LIBDNS_EXTERNAL_DATA const dns_name_t *dns_rootname = &root; static unsigned char wild_ndata[] = { "\001*" }; static unsigned char wild_offsets[] = { 0 }; -static dns_name_t const wild = - DNS_NAME_INITNONABSOLUTE(wild_ndata, wild_offsets); +static dns_name_t const wild = DNS_NAME_INITNONABSOLUTE(wild_ndata, + wild_offsets); LIBDNS_EXTERNAL_DATA const dns_name_t *dns_wildcardname = &wild; @@ -150,13 +150,11 @@ 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) -{ +dns_name_init(dns_name_t *name, unsigned char *offsets) { /* * Initialize 'name'. */ @@ -164,8 +162,7 @@ dns_name_init(dns_name_t *name, unsigned char *offsets) } void -dns_name_reset(dns_name_t *name) -{ +dns_name_reset(dns_name_t *name) { REQUIRE(VALID_NAME(name)); REQUIRE(BINDABLE(name)); @@ -173,8 +170,7 @@ dns_name_reset(dns_name_t *name) } void -dns_name_invalidate(dns_name_t *name) -{ +dns_name_invalidate(dns_name_t *name) { /* * Make 'name' invalid. */ @@ -192,10 +188,9 @@ dns_name_invalidate(dns_name_t *name) } bool -dns_name_isvalid(const dns_name_t *name) -{ +dns_name_isvalid(const dns_name_t *name) { unsigned char *ndata, *offsets; - unsigned int offset, count, length, nlabels; + unsigned int offset, count, length, nlabels; if (!VALID_NAME(name)) { return (false); @@ -240,8 +235,7 @@ dns_name_isvalid(const dns_name_t *name) } void -dns_name_setbuffer(dns_name_t *name, isc_buffer_t *buffer) -{ +dns_name_setbuffer(dns_name_t *name, isc_buffer_t *buffer) { /* * Dedicate a buffer for use with 'name'. */ @@ -253,8 +247,7 @@ dns_name_setbuffer(dns_name_t *name, isc_buffer_t *buffer) } bool -dns_name_hasbuffer(const dns_name_t *name) -{ +dns_name_hasbuffer(const dns_name_t *name) { /* * Does 'name' have a dedicated buffer? */ @@ -269,8 +262,7 @@ dns_name_hasbuffer(const dns_name_t *name) } bool -dns_name_isabsolute(const dns_name_t *name) -{ +dns_name_isabsolute(const dns_name_t *name) { /* * Does 'name' end in the root label? */ @@ -284,20 +276,19 @@ dns_name_isabsolute(const dns_name_t *name) } #define hyphenchar(c) ((c) == 0x2d) -#define asterchar(c) ((c) == 0x2a) +#define asterchar(c) ((c) == 0x2a) #define alphachar(c) \ (((c) >= 0x41 && (c) <= 0x5a) || ((c) >= 0x61 && (c) <= 0x7a)) -#define digitchar(c) ((c) >= 0x30 && (c) <= 0x39) +#define digitchar(c) ((c) >= 0x30 && (c) <= 0x39) #define borderchar(c) (alphachar(c) || digitchar(c)) #define middlechar(c) (borderchar(c) || hyphenchar(c)) #define domainchar(c) ((c) > 0x20 && (c) < 0x7f) bool -dns_name_ismailbox(const dns_name_t *name) -{ +dns_name_ismailbox(const dns_name_t *name) { unsigned char *ndata, ch; - unsigned int n; - bool first; + unsigned int n; + bool first; REQUIRE(VALID_NAME(name)); REQUIRE(name->labels > 0); @@ -349,11 +340,10 @@ dns_name_ismailbox(const dns_name_t *name) } bool -dns_name_ishostname(const dns_name_t *name, bool wildcard) -{ +dns_name_ishostname(const dns_name_t *name, bool wildcard) { unsigned char *ndata, ch; - unsigned int n; - bool first; + unsigned int n; + bool first; REQUIRE(VALID_NAME(name)); REQUIRE(name->labels > 0); @@ -399,8 +389,7 @@ dns_name_ishostname(const dns_name_t *name, bool wildcard) } bool -dns_name_iswildcard(const dns_name_t *name) -{ +dns_name_iswildcard(const dns_name_t *name) { unsigned char *ndata; /* @@ -421,11 +410,10 @@ dns_name_iswildcard(const dns_name_t *name) } bool -dns_name_internalwildcard(const dns_name_t *name) -{ +dns_name_internalwildcard(const dns_name_t *name) { unsigned char *ndata; - unsigned int count; - unsigned int label; + unsigned int count; + unsigned int label; /* * Does 'name' contain a internal wildcard? @@ -458,8 +446,7 @@ dns_name_internalwildcard(const dns_name_t *name) } unsigned int -dns_name_hash(const dns_name_t *name, bool case_sensitive) -{ +dns_name_hash(const dns_name_t *name, bool case_sensitive) { unsigned int length; /* @@ -480,8 +467,7 @@ dns_name_hash(const dns_name_t *name, bool case_sensitive) } unsigned int -dns_name_fullhash(const dns_name_t *name, bool case_sensitive) -{ +dns_name_fullhash(const dns_name_t *name, bool case_sensitive) { /* * Provide a hash value for 'name'. */ @@ -496,13 +482,12 @@ dns_name_fullhash(const dns_name_t *name, bool case_sensitive) dns_namereln_t dns_name_fullcompare(const dns_name_t *name1, const dns_name_t *name2, - int *orderp, unsigned int *nlabelsp) -{ - unsigned int l1, l2, l, count1, count2, count, nlabels; - int cdiff, ldiff, chdiff; + int *orderp, unsigned int *nlabelsp) { + unsigned int l1, l2, l, count1, count2, count, nlabels; + int cdiff, ldiff, chdiff; unsigned char *label1, *label2; unsigned char *offsets1, *offsets2; - dns_offsets_t odata1, odata2; + dns_offsets_t odata1, odata2; dns_namereln_t namereln = dns_namereln_none; /* @@ -637,9 +622,8 @@ done: } int -dns_name_compare(const dns_name_t *name1, const dns_name_t *name2) -{ - int order; +dns_name_compare(const dns_name_t *name1, const dns_name_t *name2) { + int order; unsigned int nlabels; /* @@ -658,10 +642,9 @@ dns_name_compare(const dns_name_t *name1, const dns_name_t *name2) } bool -dns_name_equal(const dns_name_t *name1, const dns_name_t *name2) -{ - unsigned int l, count; - unsigned char c; +dns_name_equal(const dns_name_t *name1, const dns_name_t *name2) { + unsigned int l, count; + unsigned char c; unsigned char *label1, *label2; /* @@ -739,8 +722,7 @@ dns_name_equal(const dns_name_t *name1, const dns_name_t *name2) } bool -dns_name_caseequal(const dns_name_t *name1, const dns_name_t *name2) -{ +dns_name_caseequal(const dns_name_t *name1, const dns_name_t *name2) { /* * Are 'name1' and 'name2' equal? * @@ -770,10 +752,9 @@ dns_name_caseequal(const dns_name_t *name1, const dns_name_t *name2) } int -dns_name_rdatacompare(const dns_name_t *name1, const dns_name_t *name2) -{ - unsigned int l1, l2, l, count1, count2, count; - unsigned char c1, c2; +dns_name_rdatacompare(const dns_name_t *name1, const dns_name_t *name2) { + unsigned int l1, l2, l, count1, count2, count; + unsigned char c1, c2; unsigned char *label1, *label2; /* @@ -831,10 +812,9 @@ dns_name_rdatacompare(const dns_name_t *name1, const dns_name_t *name2) } bool -dns_name_issubdomain(const dns_name_t *name1, const dns_name_t *name2) -{ - int order; - unsigned int nlabels; +dns_name_issubdomain(const dns_name_t *name1, const dns_name_t *name2) { + int order; + unsigned int nlabels; dns_namereln_t namereln; /* @@ -856,11 +836,10 @@ dns_name_issubdomain(const dns_name_t *name1, const dns_name_t *name2) } bool -dns_name_matcheswildcard(const dns_name_t *name, const dns_name_t *wname) -{ - int order; +dns_name_matcheswildcard(const dns_name_t *name, const dns_name_t *wname) { + int order; unsigned int nlabels, labels; - dns_name_t tname; + dns_name_t tname; REQUIRE(VALID_NAME(name)); REQUIRE(name->labels > 0); @@ -878,15 +857,15 @@ dns_name_matcheswildcard(const dns_name_t *name, const dns_name_t *wname) DNS_NAME_INIT(&tname, NULL); dns_name_getlabelsequence(wname, 1, labels - 1, &tname); if (dns_name_fullcompare(name, &tname, &order, &nlabels) == - dns_namereln_subdomain) { + dns_namereln_subdomain) + { return (true); } return (false); } unsigned int -dns_name_countlabels(const dns_name_t *name) -{ +dns_name_countlabels(const dns_name_t *name) { /* * How many labels does 'name' have? */ @@ -899,10 +878,9 @@ dns_name_countlabels(const dns_name_t *name) } void -dns_name_getlabel(const dns_name_t *name, unsigned int n, dns_label_t *label) -{ +dns_name_getlabel(const dns_name_t *name, unsigned int n, dns_label_t *label) { unsigned char *offsets; - dns_offsets_t odata; + dns_offsets_t odata; /* * Make 'label' refer to the 'n'th least significant label of 'name'. @@ -925,11 +903,10 @@ dns_name_getlabel(const dns_name_t *name, unsigned int n, dns_label_t *label) void dns_name_getlabelsequence(const dns_name_t *source, unsigned int first, - unsigned int n, dns_name_t *target) -{ + unsigned int n, dns_name_t *target) { unsigned char *p, l; - unsigned int firstoffset, endoffset; - unsigned int i; + unsigned int firstoffset, endoffset; + unsigned int i; /* * Make 'target' refer to the 'n' labels including and following @@ -967,7 +944,8 @@ dns_name_getlabelsequence(const dns_name_t *source, unsigned int first, target->length = endoffset - firstoffset; if (first + n == source->labels && n > 0 && - (source->attributes & DNS_NAMEATTR_ABSOLUTE) != 0) { + (source->attributes & DNS_NAMEATTR_ABSOLUTE) != 0) + { target->attributes |= DNS_NAMEATTR_ABSOLUTE; } else { target->attributes &= ~DNS_NAMEATTR_ABSOLUTE; @@ -986,8 +964,7 @@ dns_name_getlabelsequence(const dns_name_t *source, unsigned int first, } void -dns_name_clone(const dns_name_t *source, dns_name_t *target) -{ +dns_name_clone(const dns_name_t *source, dns_name_t *target) { /* * Make 'target' refer to the same name as 'source'. */ @@ -999,10 +976,10 @@ dns_name_clone(const dns_name_t *source, dns_name_t *target) target->ndata = source->ndata; target->length = source->length; target->labels = source->labels; - target->attributes = - source->attributes & - (unsigned int)~(DNS_NAMEATTR_READONLY | DNS_NAMEATTR_DYNAMIC | - DNS_NAMEATTR_DYNOFFSETS); + target->attributes = source->attributes & + (unsigned int)~(DNS_NAMEATTR_READONLY | + DNS_NAMEATTR_DYNAMIC | + DNS_NAMEATTR_DYNOFFSETS); if (target->offsets != NULL && source->labels > 0) { if (source->offsets != NULL) { memmove(target->offsets, source->offsets, @@ -1014,12 +991,11 @@ dns_name_clone(const dns_name_t *source, dns_name_t *target) } void -dns_name_fromregion(dns_name_t *name, const isc_region_t *r) -{ +dns_name_fromregion(dns_name_t *name, const isc_region_t *r) { unsigned char *offsets; - dns_offsets_t odata; - unsigned int len; - isc_region_t r2; + dns_offsets_t odata; + unsigned int len; + isc_region_t r2; /* * Make 'name' refer to region 'r'. @@ -1063,8 +1039,7 @@ dns_name_fromregion(dns_name_t *name, const isc_region_t *r) } void -dns_name_toregion(const dns_name_t *name, isc_region_t *r) -{ +dns_name_toregion(const dns_name_t *name, isc_region_t *r) { /* * Make 'r' refer to 'name'. */ @@ -1078,19 +1053,18 @@ dns_name_toregion(const dns_name_t *name, isc_region_t *r) isc_result_t dns_name_fromtext(dns_name_t *name, isc_buffer_t *source, const dns_name_t *origin, unsigned int options, - isc_buffer_t *target) -{ + isc_buffer_t *target) { unsigned char *ndata, *label = NULL; - char * tdata; - char c; - ft_state state; - unsigned int value = 0, count = 0; - unsigned int n1 = 0, n2 = 0; - unsigned int tlen, nrem, nused, digits = 0, labels, tused; - bool done; + char *tdata; + char c; + ft_state state; + unsigned int value = 0, count = 0; + unsigned int n1 = 0, n2 = 0; + unsigned int tlen, nrem, nused, digits = 0, labels, tused; + bool done; unsigned char *offsets; - dns_offsets_t odata; - bool downcase; + dns_offsets_t odata; + bool downcase; /* * Convert the textual representation of a DNS name at source @@ -1340,8 +1314,7 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source, isc_result_t dns_name_totext(const dns_name_t *name, bool omit_final_dot, - isc_buffer_t *target) -{ + isc_buffer_t *target) { unsigned int options = DNS_NAME_MASTERFILE; if (omit_final_dot) { @@ -1351,23 +1324,21 @@ dns_name_totext(const dns_name_t *name, bool omit_final_dot, } isc_result_t -dns_name_toprincipal(const dns_name_t *name, isc_buffer_t *target) -{ +dns_name_toprincipal(const dns_name_t *name, isc_buffer_t *target) { return (dns_name_totext2(name, DNS_NAME_OMITFINALDOT, target)); } isc_result_t dns_name_totext2(const dns_name_t *name, unsigned int options, - isc_buffer_t *target) -{ + isc_buffer_t *target) { unsigned char *ndata; - char * tdata; - unsigned int nlen, tlen; - unsigned char c; - unsigned int trem, count; - unsigned int labels; - bool saw_root = false; - unsigned int oused; + char *tdata; + unsigned int nlen, tlen; + unsigned char c; + unsigned int trem, count; + unsigned int labels; + bool saw_root = false; + unsigned int oused; bool omit_final_dot = ((options & DNS_NAME_OMITFINALDOT) != 0); /* @@ -1483,10 +1454,10 @@ dns_name_totext2(const dns_name_t *name, unsigned int options, return (ISC_R_NOSPACE); } *tdata++ = 0x5c; - *tdata++ = - 0x30 + ((c / 100) % 10); - *tdata++ = - 0x30 + ((c / 10) % 10); + *tdata++ = 0x30 + + ((c / 100) % 10); + *tdata++ = 0x30 + + ((c / 10) % 10); *tdata++ = 0x30 + (c % 10); trem -= 4; ndata++; @@ -1536,14 +1507,13 @@ dns_name_totext2(const dns_name_t *name, unsigned int options, isc_result_t dns_name_tofilenametext(const dns_name_t *name, bool omit_final_dot, - isc_buffer_t *target) -{ + isc_buffer_t *target) { unsigned char *ndata; - char * tdata; - unsigned int nlen, tlen; - unsigned char c; - unsigned int trem, count; - unsigned int labels; + char *tdata; + unsigned int nlen, tlen; + unsigned char c; + unsigned int trem, count; + unsigned int labels; /* * This function assumes the name is in proper uncompressed @@ -1654,11 +1624,10 @@ dns_name_tofilenametext(const dns_name_t *name, bool omit_final_dot, isc_result_t dns_name_downcase(const dns_name_t *source, dns_name_t *name, - isc_buffer_t *target) -{ + isc_buffer_t *target) { unsigned char *sndata, *ndata; - unsigned int nlen, count, labels; - isc_buffer_t buffer; + unsigned int nlen, count, labels; + isc_buffer_t buffer; /* * Downcase 'source'. @@ -1731,11 +1700,10 @@ dns_name_downcase(const dns_name_t *source, dns_name_t *name, static void set_offsets(const dns_name_t *name, unsigned char *offsets, - dns_name_t *set_name) -{ - unsigned int offset, count, length, nlabels; + dns_name_t *set_name) { + unsigned int offset, count, length, nlabels; unsigned char *ndata; - bool absolute; + bool absolute; ndata = name->ndata; length = name->length; @@ -1773,19 +1741,18 @@ set_offsets(const dns_name_t *name, unsigned char *offsets, isc_result_t dns_name_fromwire(dns_name_t *name, isc_buffer_t *source, dns_decompress_t *dctx, unsigned int options, - isc_buffer_t *target) -{ + isc_buffer_t *target) { unsigned char *cdata, *ndata; - unsigned int cused; /* Bytes of compressed name data used */ - unsigned int nused, labels, n, nmax; - unsigned int current, new_current, biggest_pointer; - bool done; - fw_state state = fw_start; - unsigned int c; + unsigned int cused; /* Bytes of compressed name data used */ + unsigned int nused, labels, n, nmax; + unsigned int current, new_current, biggest_pointer; + bool done; + fw_state state = fw_start; + unsigned int c; unsigned char *offsets; - dns_offsets_t odata; - bool downcase; - bool seen_pointer; + dns_offsets_t odata; + bool downcase; + bool seen_pointer; /* * Copy the possibly-compressed name at source into target, @@ -1956,22 +1923,20 @@ full: isc_result_t dns_name_towire(const dns_name_t *name, dns_compress_t *cctx, - isc_buffer_t *target) -{ + isc_buffer_t *target) { return (dns_name_towire2(name, cctx, target, NULL)); } isc_result_t dns_name_towire2(const dns_name_t *name, dns_compress_t *cctx, - isc_buffer_t *target, uint16_t *comp_offsetp) -{ - unsigned int methods; - uint16_t offset; - dns_name_t gp; /* Global compression prefix */ - bool gf; /* Global compression target found */ - uint16_t go; /* Global compression offset */ + isc_buffer_t *target, uint16_t *comp_offsetp) { + unsigned int methods; + uint16_t offset; + dns_name_t gp; /* Global compression prefix */ + bool gf; /* Global compression target found */ + uint16_t go; /* Global compression offset */ dns_offsets_t clo; - dns_name_t clname; + dns_name_t clname; /* * Convert 'name' into wire format, compressing it as specified by the @@ -1990,7 +1955,8 @@ dns_name_towire2(const dns_name_t *name, dns_compress_t *cctx, methods = dns_compress_getmethods(cctx); if (comp_offsetp != NULL && *comp_offsetp < 0x4000 && (name->attributes & DNS_NAMEATTR_NOCOMPRESS) == 0 && - (methods & DNS_COMPRESS_GLOBAL14) != 0) { + (methods & DNS_COMPRESS_GLOBAL14) != 0) + { if (ISC_UNLIKELY(target->length - target->used < 2)) { return (ISC_R_NOSPACE); } @@ -2020,7 +1986,8 @@ dns_name_towire2(const dns_name_t *name, dns_compress_t *cctx, offset = target->used; /*XXX*/ if ((name->attributes & DNS_NAMEATTR_NOCOMPRESS) == 0 && - (methods & DNS_COMPRESS_GLOBAL14) != 0) { + (methods & DNS_COMPRESS_GLOBAL14) != 0) + { gf = dns_compress_findglobal(cctx, name, &gp, &go); } else { gf = false; @@ -2064,8 +2031,8 @@ dns_name_towire2(const dns_name_t *name, dns_compress_t *cctx, *comp_offsetp = go; } } else { - if (ISC_UNLIKELY(target->length - target->used < - name->length)) { + if (ISC_UNLIKELY(target->length - target->used < name->length)) + { return (ISC_R_NOSPACE); } if (name->length != 0) { @@ -2085,15 +2052,14 @@ dns_name_towire2(const dns_name_t *name, dns_compress_t *cctx, isc_result_t dns_name_concatenate(const dns_name_t *prefix, const dns_name_t *suffix, - dns_name_t *name, isc_buffer_t *target) -{ + dns_name_t *name, isc_buffer_t *target) { unsigned char *ndata, *offsets; - unsigned int nrem, labels, prefix_length, length; - bool copy_prefix = true; - bool copy_suffix = true; - bool absolute = false; - dns_name_t tmp_name; - dns_offsets_t odata; + unsigned int nrem, labels, prefix_length, length; + bool copy_prefix = true; + bool copy_suffix = true; + bool absolute = false; + dns_name_t tmp_name; + dns_offsets_t odata; /* * Concatenate 'prefix' and 'suffix'. @@ -2220,8 +2186,7 @@ dns_name_split(const dns_name_t *name, unsigned int suffixlabels, } void -dns_name_dup(const dns_name_t *source, isc_mem_t *mctx, dns_name_t *target) -{ +dns_name_dup(const dns_name_t *source, isc_mem_t *mctx, dns_name_t *target) { /* * Make 'target' a dynamically allocated copy of 'source'. */ @@ -2258,8 +2223,7 @@ dns_name_dup(const dns_name_t *source, isc_mem_t *mctx, dns_name_t *target) isc_result_t dns_name_dupwithoffsets(const dns_name_t *source, isc_mem_t *mctx, - dns_name_t *target) -{ + dns_name_t *target) { /* * Make 'target' a read-only dynamically allocated copy of 'source'. * 'target' will also have a dynamically allocated offsets table. @@ -2298,8 +2262,7 @@ dns_name_dupwithoffsets(const dns_name_t *source, isc_mem_t *mctx, } void -dns_name_free(dns_name_t *name, isc_mem_t *mctx) -{ +dns_name_free(dns_name_t *name, isc_mem_t *mctx) { size_t size; /* @@ -2318,13 +2281,12 @@ dns_name_free(dns_name_t *name, isc_mem_t *mctx) } isc_result_t -dns_name_digest(const dns_name_t *name, dns_digestfunc_t digest, void *arg) -{ - dns_name_t downname; +dns_name_digest(const dns_name_t *name, dns_digestfunc_t digest, void *arg) { + dns_name_t downname; unsigned char data[256]; - isc_buffer_t buffer; - isc_result_t result; - isc_region_t r; + isc_buffer_t buffer; + isc_result_t result; + isc_region_t r; /* * Send 'name' in DNSSEC canonical form to 'digest'. @@ -2354,8 +2316,7 @@ dns_name_digest(const dns_name_t *name, dns_digestfunc_t digest, void *arg) } bool -dns_name_dynamic(const dns_name_t *name) -{ +dns_name_dynamic(const dns_name_t *name) { REQUIRE(VALID_NAME(name)); /* @@ -2366,12 +2327,11 @@ dns_name_dynamic(const dns_name_t *name) } isc_result_t -dns_name_print(const dns_name_t *name, FILE *stream) -{ +dns_name_print(const dns_name_t *name, FILE *stream) { isc_result_t result; isc_buffer_t b; isc_region_t r; - char t[1024]; + char t[1024]; /* * Print 'name' on 'stream'. @@ -2391,8 +2351,7 @@ dns_name_print(const dns_name_t *name, FILE *stream) } isc_result_t -dns_name_settotextfilter(dns_name_totextfilter_t *proc) -{ +dns_name_settotextfilter(dns_name_totextfilter_t *proc) { /* * If we already have been here set / clear as appropriate. */ @@ -2412,8 +2371,7 @@ dns_name_settotextfilter(dns_name_totextfilter_t *proc) } void -dns_name_format(const dns_name_t *name, char *cp, unsigned int size) -{ +dns_name_format(const dns_name_t *name, char *cp, unsigned int size) { isc_result_t result; isc_buffer_t buf; @@ -2436,12 +2394,11 @@ dns_name_format(const dns_name_t *name, char *cp, unsigned int size) * memory. */ isc_result_t -dns_name_tostring(const dns_name_t *name, char **target, isc_mem_t *mctx) -{ +dns_name_tostring(const dns_name_t *name, char **target, isc_mem_t *mctx) { isc_result_t result; isc_buffer_t buf; isc_region_t reg; - char * p, txt[DNS_NAME_FORMATSIZE]; + char *p, txt[DNS_NAME_FORMATSIZE]; REQUIRE(VALID_NAME(name)); REQUIRE(target != NULL && *target == NULL); @@ -2467,20 +2424,18 @@ dns_name_tostring(const dns_name_t *name, char **target, isc_mem_t *mctx) */ isc_result_t dns_name_fromstring(dns_name_t *target, const char *src, unsigned int options, - isc_mem_t *mctx) -{ + isc_mem_t *mctx) { return (dns_name_fromstring2(target, src, dns_rootname, options, mctx)); } isc_result_t dns_name_fromstring2(dns_name_t *target, const char *src, const dns_name_t *origin, unsigned int options, - isc_mem_t *mctx) -{ - isc_result_t result; - isc_buffer_t buf; + isc_mem_t *mctx) { + isc_result_t result; + isc_buffer_t buf; dns_fixedname_t fn; - dns_name_t * name; + dns_name_t *name; REQUIRE(src != NULL); @@ -2504,8 +2459,7 @@ dns_name_fromstring2(dns_name_t *target, const char *src, } static isc_result_t -name_copy(const dns_name_t *source, dns_name_t *dest, isc_buffer_t *target) -{ +name_copy(const dns_name_t *source, dns_name_t *dest, isc_buffer_t *target) { unsigned char *ndata; /* @@ -2551,8 +2505,8 @@ name_copy(const dns_name_t *source, dns_name_t *dest, isc_buffer_t *target) } isc_result_t -dns_name_copy(const dns_name_t *source, dns_name_t *dest, isc_buffer_t *target) -{ +dns_name_copy(const dns_name_t *source, dns_name_t *dest, + isc_buffer_t *target) { REQUIRE(VALID_NAME(source)); REQUIRE(VALID_NAME(dest)); REQUIRE(target != NULL); @@ -2561,8 +2515,7 @@ dns_name_copy(const dns_name_t *source, dns_name_t *dest, isc_buffer_t *target) } void -dns_name_copynf(const dns_name_t *source, dns_name_t *dest) -{ +dns_name_copynf(const dns_name_t *source, dns_name_t *dest) { REQUIRE(VALID_NAME(source)); REQUIRE(VALID_NAME(dest)); REQUIRE(dest->buffer != NULL); @@ -2594,9 +2547,8 @@ static dns_name_t const dns_sd[] = { }; bool -dns_name_isdnssd(const dns_name_t *name) -{ - size_t i; +dns_name_isdnssd(const dns_name_t *name) { + size_t i; dns_name_t prefix; if (dns_name_countlabels(name) > 3U) { @@ -2659,8 +2611,7 @@ static dns_name_t const rfc1918names[] = { }; bool -dns_name_isrfc1918(const dns_name_t *name) -{ +dns_name_isrfc1918(const dns_name_t *name) { size_t i; for (i = 0; i < (sizeof(rfc1918names) / sizeof(*rfc1918names)); i++) { @@ -2680,8 +2631,7 @@ static dns_name_t const ulanames[] = { DNS_NAME_INITABSOLUTE(ip6fc, ulaoffsets), ulaoffsets) }; bool -dns_name_isula(const dns_name_t *name) -{ +dns_name_isula(const dns_name_t *name) { size_t i; for (i = 0; i < (sizeof(ulanames) / sizeof(*ulanames)); i++) { @@ -2706,9 +2656,8 @@ const char ishex[256] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; bool -dns_name_istat(const dns_name_t *name) -{ - unsigned char len; +dns_name_istat(const dns_name_t *name) { + unsigned char len; const unsigned char *ndata; REQUIRE(VALID_NAME(name)); @@ -2731,7 +2680,8 @@ dns_name_istat(const dns_name_t *name) } if (ndata[0] != '_' || maptolower[ndata[1]] != 't' || - maptolower[ndata[2]] != 'a') { + maptolower[ndata[2]] != 'a') + { return (false); } ndata += 3; @@ -2740,7 +2690,8 @@ dns_name_istat(const dns_name_t *name) while (len > 0) { INSIST(len >= 5); if (ndata[0] != '-' || !ishex[ndata[1]] || !ishex[ndata[2]] || - !ishex[ndata[3]] || !ishex[ndata[4]]) { + !ishex[ndata[3]] || !ishex[ndata[4]]) + { return (false); } ndata += 5; diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c index 8ec36ab10a..13fcaaeb10 100644 --- a/lib/dns/ncache.c +++ b/lib/dns/ncache.c @@ -40,19 +40,18 @@ * */ -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) -{ +copy_rdataset(dns_rdataset_t *rdataset, isc_buffer_t *buffer) { isc_result_t result; unsigned int count; isc_region_t ar, r; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_t rdata = DNS_RDATA_INIT; /* * Copy the rdataset count to the buffer. @@ -98,8 +97,7 @@ copy_rdataset(dns_rdataset_t *rdataset, isc_buffer_t *buffer) isc_result_t dns_ncache_add(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, dns_rdataset_t *addedrdataset) -{ + dns_ttl_t maxttl, dns_rdataset_t *addedrdataset) { return (addoptout(message, cache, node, covers, now, minttl, maxttl, false, false, addedrdataset)); } @@ -108,8 +106,7 @@ isc_result_t dns_ncache_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, dns_rdataset_t *addedrdataset) -{ + bool optout, dns_rdataset_t *addedrdataset) { return (addoptout(message, cache, node, covers, now, minttl, maxttl, optout, true, addedrdataset)); } @@ -118,21 +115,20 @@ 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) -{ - isc_result_t result; - isc_buffer_t buffer; - isc_region_t r; + dns_rdataset_t *addedrdataset) { + isc_result_t result; + isc_buffer_t buffer; + isc_region_t r; dns_rdataset_t *rdataset; dns_rdatatype_t type; - dns_name_t * name; - dns_ttl_t ttl; - dns_trust_t trust; - dns_rdata_t rdata[DNS_NCACHE_RDATA]; - dns_rdataset_t ncrdataset; + dns_name_t *name; + dns_ttl_t ttl; + dns_trust_t trust; + dns_rdata_t rdata[DNS_NCACHE_RDATA]; + dns_rdataset_t ncrdataset; dns_rdatalist_t ncrdatalist; - unsigned char data[65536]; - unsigned int next = 0; + unsigned char data[65536]; + unsigned int next = 0; /* * Convert the authority data from 'message' into a negative cache @@ -171,7 +167,8 @@ addoptout(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node, if ((name->attributes & DNS_NAMEATTR_NCACHE) != 0) { for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if ((rdataset->attributes & DNS_RDATASETATTR_NCACHE) == 0) { continue; @@ -182,7 +179,8 @@ addoptout(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node, } if (type == dns_rdatatype_soa || type == dns_rdatatype_nsec || - type == dns_rdatatype_nsec3) { + type == dns_rdatatype_nsec3) + { if (ttl > rdataset->ttl) { ttl = rdataset->ttl; } @@ -248,7 +246,8 @@ addoptout(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node, if (trust == 0xffff) { if ((message->flags & DNS_MESSAGEFLAG_AA) != 0 && - message->counts[DNS_SECTION_ANSWER] == 0) { + message->counts[DNS_SECTION_ANSWER] == 0) + { /* * The response has aa set and we haven't followed * any CNAME or DNAME chains. @@ -286,15 +285,14 @@ addoptout(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node, isc_result_t dns_ncache_towire(dns_rdataset_t *rdataset, dns_compress_t *cctx, isc_buffer_t *target, unsigned int options, - unsigned int *countp) -{ - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_result_t result; - isc_region_t remaining, tavailable; - isc_buffer_t source, savedbuffer, rdlen; - dns_name_t name; + unsigned int *countp) { + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_result_t result; + isc_region_t remaining, tavailable; + isc_buffer_t source, savedbuffer, rdlen; + dns_name_t name; dns_rdatatype_t type; - unsigned int i, rcount, count; + unsigned int i, rcount, count; /* * Convert the negative caching rdataset 'rdataset' to wire format, @@ -343,7 +341,8 @@ dns_ncache_towire(dns_rdataset_t *rdataset, dns_compress_t *cctx, isc_buffer_forward(&source, rdata.length); if ((options & DNS_NCACHETOWIRE_OMITDNSSEC) != 0 && - dns_rdatatype_isdnssec(type)) { + dns_rdatatype_isdnssec(type)) + { continue; } @@ -417,16 +416,14 @@ rollback: } static void -rdataset_disassociate(dns_rdataset_t *rdataset) -{ +rdataset_disassociate(dns_rdataset_t *rdataset) { UNUSED(rdataset); } static isc_result_t -rdataset_first(dns_rdataset_t *rdataset) -{ +rdataset_first(dns_rdataset_t *rdataset) { unsigned char *raw = rdataset->private3; - unsigned int count; + unsigned int count; count = raw[0] * 256 + raw[1]; if (count == 0) { @@ -447,10 +444,9 @@ rdataset_first(dns_rdataset_t *rdataset) } static isc_result_t -rdataset_next(dns_rdataset_t *rdataset) -{ - unsigned int count; - unsigned int length; +rdataset_next(dns_rdataset_t *rdataset) { + unsigned int count; + unsigned int length; unsigned char *raw; count = rdataset->privateuint4; @@ -468,10 +464,9 @@ rdataset_next(dns_rdataset_t *rdataset) } static void -rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) -{ +rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) { unsigned char *raw = rdataset->private5; - isc_region_t r; + isc_region_t r; REQUIRE(raw != NULL); @@ -482,8 +477,7 @@ rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) } static void -rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) -{ +rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) { *target = *source; /* @@ -494,10 +488,9 @@ rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) } static unsigned int -rdataset_count(dns_rdataset_t *rdataset) -{ +rdataset_count(dns_rdataset_t *rdataset) { unsigned char *raw = rdataset->private3; - unsigned int count; + unsigned int count; count = raw[0] * 256 + raw[1]; @@ -505,8 +498,7 @@ rdataset_count(dns_rdataset_t *rdataset) } static void -rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust) -{ +rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust) { unsigned char *raw = rdataset->private3; raw[-1] = (unsigned char)trust; @@ -533,16 +525,15 @@ static dns_rdatasetmethods_t rdataset_methods = { isc_result_t dns_ncache_getrdataset(dns_rdataset_t *ncacherdataset, dns_name_t *name, - dns_rdatatype_t type, dns_rdataset_t *rdataset) -{ - isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_region_t remaining; - isc_buffer_t source; - dns_name_t tname; + dns_rdatatype_t type, dns_rdataset_t *rdataset) { + isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_region_t remaining; + isc_buffer_t source; + dns_name_t tname; dns_rdatatype_t ttype; - dns_trust_t trust = dns_trust_none; - dns_rdataset_t rclone; + dns_trust_t trust = dns_trust_none; + dns_rdataset_t rclone; REQUIRE(ncacherdataset != NULL); REQUIRE(ncacherdataset->type == 0); @@ -609,19 +600,18 @@ dns_ncache_getrdataset(dns_rdataset_t *ncacherdataset, dns_name_t *name, isc_result_t dns_ncache_getsigrdataset(dns_rdataset_t *ncacherdataset, dns_name_t *name, - dns_rdatatype_t covers, dns_rdataset_t *rdataset) -{ - dns_name_t tname; + dns_rdatatype_t covers, dns_rdataset_t *rdataset) { + dns_name_t tname; dns_rdata_rrsig_t rrsig; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdataset_t rclone; - dns_rdatatype_t type; - dns_trust_t trust = dns_trust_none; - isc_buffer_t source; - isc_region_t remaining, sigregion; - isc_result_t result; - unsigned char * raw; - unsigned int count; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdataset_t rclone; + dns_rdatatype_t type; + dns_trust_t trust = dns_trust_none; + isc_buffer_t source; + isc_region_t remaining, sigregion; + isc_result_t result; + unsigned char *raw; + unsigned int count; REQUIRE(ncacherdataset != NULL); REQUIRE(ncacherdataset->type == 0); @@ -710,17 +700,16 @@ dns_ncache_getsigrdataset(dns_rdataset_t *ncacherdataset, dns_name_t *name, void dns_ncache_current(dns_rdataset_t *ncacherdataset, dns_name_t *found, - dns_rdataset_t *rdataset) -{ - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_trust_t trust; - isc_region_t remaining, sigregion; - isc_buffer_t source; - dns_name_t tname; - dns_rdatatype_t type; - unsigned int count; + dns_rdataset_t *rdataset) { + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_trust_t trust; + isc_region_t remaining, sigregion; + isc_buffer_t source; + dns_name_t tname; + dns_rdatatype_t type; + unsigned int count; dns_rdata_rrsig_t rrsig; - unsigned char * raw; + unsigned char *raw; REQUIRE(ncacherdataset != NULL); REQUIRE(ncacherdataset->type == 0); diff --git a/lib/dns/nsec.c b/lib/dns/nsec.c index 66484f3e8d..6411613211 100644 --- a/lib/dns/nsec.c +++ b/lib/dns/nsec.c @@ -36,8 +36,7 @@ } while (0) void -dns_nsec_setbit(unsigned char *array, unsigned int type, unsigned int bit) -{ +dns_nsec_setbit(unsigned char *array, unsigned int type, unsigned int bit) { unsigned int shift, mask; shift = 7 - (type % 8); @@ -51,8 +50,7 @@ dns_nsec_setbit(unsigned char *array, unsigned int type, unsigned int bit) } bool -dns_nsec_isset(const unsigned char *array, unsigned int type) -{ +dns_nsec_isset(const unsigned char *array, unsigned int type) { unsigned int byte, shift, mask; byte = array[type / 8]; @@ -64,11 +62,10 @@ dns_nsec_isset(const unsigned char *array, unsigned int type) unsigned int dns_nsec_compressbitmap(unsigned char *map, const unsigned char *raw, - unsigned int max_type) -{ + unsigned int max_type) { unsigned char *start = map; - unsigned int window; - int octet; + unsigned int window; + int octet; if (raw == NULL) { return (0); @@ -102,15 +99,14 @@ dns_nsec_compressbitmap(unsigned char *map, const unsigned char *raw, isc_result_t dns_nsec_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, const dns_name_t *target, unsigned char *buffer, - dns_rdata_t *rdata) -{ - isc_result_t result; + dns_rdata_t *rdata) { + isc_result_t result; dns_rdataset_t rdataset; - isc_region_t r; - unsigned int i; + isc_region_t r; + unsigned int i; - unsigned char * nsec_bits, *bm; - unsigned int max_type; + unsigned char *nsec_bits, *bm; + unsigned int max_type; dns_rdatasetiter_t *rdsiter; REQUIRE(target != NULL); @@ -135,11 +131,13 @@ dns_nsec_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, return (result); } for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(rdsiter)) { + result = dns_rdatasetiter_next(rdsiter)) + { dns_rdatasetiter_current(rdsiter, &rdataset); if (rdataset.type != dns_rdatatype_nsec && rdataset.type != dns_rdatatype_nsec3 && - rdataset.type != dns_rdatatype_rrsig) { + rdataset.type != dns_rdatatype_rrsig) + { if (rdataset.type > max_type) { max_type = rdataset.type; } @@ -152,7 +150,8 @@ dns_nsec_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, * At zone cuts, deny the existence of glue in the parent zone. */ if (dns_nsec_isset(bm, dns_rdatatype_ns) && - !dns_nsec_isset(bm, dns_rdatatype_soa)) { + !dns_nsec_isset(bm, dns_rdatatype_soa)) + { for (i = 0; i <= max_type; i++) { if (dns_nsec_isset(bm, i) && !dns_rdatatype_iszonecutauth((dns_rdatatype_t)i)) { @@ -177,13 +176,12 @@ dns_nsec_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, isc_result_t dns_nsec_build(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, - const dns_name_t *target, dns_ttl_t ttl) -{ - isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; - unsigned char data[DNS_NSEC_BUFFERSIZE]; + const dns_name_t *target, dns_ttl_t ttl) { + isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; + unsigned char data[DNS_NSEC_BUFFERSIZE]; dns_rdatalist_t rdatalist; - dns_rdataset_t rdataset; + dns_rdataset_t rdataset; dns_rdataset_init(&rdataset); dns_rdata_init(&rdata); @@ -209,12 +207,11 @@ failure: } bool -dns_nsec_typepresent(dns_rdata_t *nsec, dns_rdatatype_t type) -{ +dns_nsec_typepresent(dns_rdata_t *nsec, dns_rdatatype_t type) { dns_rdata_nsec_t nsecstruct; - isc_result_t result; - bool present; - unsigned int i, len, window; + isc_result_t result; + bool present; + unsigned int i, len, window; REQUIRE(nsec != NULL); REQUIRE(nsec->type == dns_rdatatype_nsec); @@ -248,12 +245,11 @@ dns_nsec_typepresent(dns_rdata_t *nsec, dns_rdatatype_t type) } isc_result_t -dns_nsec_nseconly(dns_db_t *db, dns_dbversion_t *version, bool *answer) -{ - dns_dbnode_t * node = NULL; - dns_rdataset_t rdataset; +dns_nsec_nseconly(dns_db_t *db, dns_dbversion_t *version, bool *answer) { + dns_dbnode_t *node = NULL; + dns_rdataset_t rdataset; dns_rdata_dnskey_t dnskey; - isc_result_t result; + isc_result_t result; REQUIRE(answer != NULL); @@ -275,7 +271,8 @@ dns_nsec_nseconly(dns_db_t *db, dns_dbversion_t *version, bool *answer) return (result); } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &rdata); @@ -309,17 +306,16 @@ isc_result_t dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, const dns_name_t *nsecname, dns_rdataset_t *nsecset, bool *exists, bool *data, dns_name_t *wild, - dns_nseclog_t logit, void *arg) -{ - int order; - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_result_t result; - dns_namereln_t relation; - unsigned int olabels, nlabels, labels; + dns_nseclog_t logit, void *arg) { + int order; + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_result_t result; + dns_namereln_t relation; + unsigned int olabels, nlabels, labels; dns_rdata_nsec_t nsec; - bool atparent; - bool ns; - bool soa; + bool atparent; + bool ns; + bool soa; REQUIRE(exists != NULL); REQUIRE(data != NULL); @@ -373,7 +369,8 @@ dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, } if (type == dns_rdatatype_cname || type == dns_rdatatype_nxt || type == dns_rdatatype_nsec || type == dns_rdatatype_key || - !dns_nsec_typepresent(&rdata, dns_rdatatype_cname)) { + !dns_nsec_typepresent(&rdata, dns_rdatatype_cname)) + { *exists = true; *data = dns_nsec_typepresent(&rdata, type); (*logit)(arg, ISC_LOG_DEBUG(3), @@ -387,7 +384,8 @@ dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, if (relation == dns_namereln_subdomain && dns_nsec_typepresent(&rdata, dns_rdatatype_ns) && - !dns_nsec_typepresent(&rdata, dns_rdatatype_soa)) { + !dns_nsec_typepresent(&rdata, dns_rdatatype_soa)) + { /* * This NSEC record is from somewhere higher in * the DNS, and at the parent of a delegation or @@ -399,7 +397,8 @@ dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, } if (relation == dns_namereln_subdomain && - dns_nsec_typepresent(&rdata, dns_rdatatype_dname)) { + dns_nsec_typepresent(&rdata, dns_rdatatype_dname)) + { (*logit)(arg, ISC_LOG_DEBUG(3), "nsec proves covered by dname"); *exists = false; return (DNS_R_DNAME); diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c index 294b2847e7..a8853ec797 100644 --- a/lib/dns/nsec3.c +++ b/lib/dns/nsec3.c @@ -46,10 +46,10 @@ goto failure; \ } while (0) -#define OPTOUT(x) (((x)&DNS_NSEC3FLAG_OPTOUT) != 0) -#define CREATE(x) (((x)&DNS_NSEC3FLAG_CREATE) != 0) +#define OPTOUT(x) (((x)&DNS_NSEC3FLAG_OPTOUT) != 0) +#define CREATE(x) (((x)&DNS_NSEC3FLAG_CREATE) != 0) #define INITIAL(x) (((x)&DNS_NSEC3FLAG_INITIAL) != 0) -#define REMOVE(x) (((x)&DNS_NSEC3FLAG_REMOVE) != 0) +#define REMOVE(x) (((x)&DNS_NSEC3FLAG_REMOVE) != 0) isc_result_t dns_nsec3_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, @@ -57,20 +57,19 @@ dns_nsec3_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, unsigned int iterations, const unsigned char *salt, size_t salt_length, const unsigned char *nexthash, size_t hash_length, unsigned char *buffer, - dns_rdata_t *rdata) -{ - isc_result_t result; + dns_rdata_t *rdata) { + isc_result_t result; dns_rdataset_t rdataset; - isc_region_t r; - unsigned int i; - bool found; - bool found_ns; - bool need_rrsig; + isc_region_t r; + unsigned int i; + bool found; + bool found_ns; + bool need_rrsig; - unsigned char * nsec_bits, *bm; - unsigned int max_type; + unsigned char *nsec_bits, *bm; + unsigned int max_type; dns_rdatasetiter_t *rdsiter; - unsigned char * p; + unsigned char *p; REQUIRE(salt_length < 256U); REQUIRE(hash_length < 256U); @@ -123,11 +122,13 @@ dns_nsec3_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, } found = found_ns = need_rrsig = false; for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(rdsiter)) { + result = dns_rdatasetiter_next(rdsiter)) + { dns_rdatasetiter_current(rdsiter, &rdataset); if (rdataset.type != dns_rdatatype_nsec && rdataset.type != dns_rdatatype_nsec3 && - rdataset.type != dns_rdatatype_rrsig) { + rdataset.type != dns_rdatatype_rrsig) + { if (rdataset.type > max_type) { max_type = rdataset.type; } @@ -163,7 +164,8 @@ dns_nsec3_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, * At zone cuts, deny the existence of glue in the parent zone. */ if (dns_nsec_isset(bm, dns_rdatatype_ns) && - !dns_nsec_isset(bm, dns_rdatatype_soa)) { + !dns_nsec_isset(bm, dns_rdatatype_soa)) + { for (i = 0; i <= max_type; i++) { if (dns_nsec_isset(bm, i) && !dns_rdatatype_iszonecutauth((dns_rdatatype_t)i)) { @@ -187,12 +189,11 @@ collapse_bitmap: } bool -dns_nsec3_typepresent(dns_rdata_t *rdata, dns_rdatatype_t type) -{ +dns_nsec3_typepresent(dns_rdata_t *rdata, dns_rdatatype_t type) { dns_rdata_nsec3_t nsec3; - isc_result_t result; - bool present; - unsigned int i, len, window; + isc_result_t result; + bool present; + unsigned int i, len, window; REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_nsec3); @@ -216,8 +217,8 @@ dns_nsec3_typepresent(dns_rdata_t *rdata, dns_rdatatype_t type) continue; } if (type < (window * 256) + len * 8) { - present = - dns_nsec_isset(&nsec3.typebits[i], type % 256); + present = dns_nsec_isset(&nsec3.typebits[i], + type % 256); } break; } @@ -227,19 +228,18 @@ dns_nsec3_typepresent(dns_rdata_t *rdata, dns_rdatatype_t type) isc_result_t dns_nsec3_hashname(dns_fixedname_t *result, - unsigned char rethash[NSEC3_MAX_HASH_LENGTH], + unsigned char rethash[NSEC3_MAX_HASH_LENGTH], size_t *hash_length, const dns_name_t *name, const dns_name_t *origin, dns_hash_t hashalg, unsigned int iterations, const unsigned char *salt, - size_t saltlength) -{ - unsigned char hash[NSEC3_MAX_HASH_LENGTH]; - unsigned char nametext[DNS_NAME_FORMATSIZE]; + size_t saltlength) { + unsigned char hash[NSEC3_MAX_HASH_LENGTH]; + unsigned char nametext[DNS_NAME_FORMATSIZE]; dns_fixedname_t fixed; - dns_name_t * downcased; - isc_buffer_t namebuffer; - isc_region_t region; - size_t len; + dns_name_t *downcased; + isc_buffer_t namebuffer; + isc_region_t region; + size_t len; if (rethash == NULL) { rethash = hash; @@ -275,8 +275,7 @@ dns_nsec3_hashname(dns_fixedname_t *result, } unsigned int -dns_nsec3_hashlength(dns_hash_t hash) -{ +dns_nsec3_hashlength(dns_hash_t hash) { switch (hash) { case dns_hash_sha1: return (ISC_SHA1_DIGESTLENGTH); @@ -285,8 +284,7 @@ dns_nsec3_hashlength(dns_hash_t hash) } bool -dns_nsec3_supportedhash(dns_hash_t hash) -{ +dns_nsec3_supportedhash(dns_hash_t hash) { switch (hash) { case dns_hash_sha1: return (true); @@ -304,9 +302,8 @@ dns_nsec3_supportedhash(dns_hash_t hash) */ static isc_result_t do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver, - dns_diff_t *diff) -{ - dns_diff_t temp_diff; + dns_diff_t *diff) { + dns_diff_t temp_diff; isc_result_t result; /* @@ -341,10 +338,9 @@ do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver, */ static isc_result_t name_exists(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, - bool *exists) -{ - isc_result_t result; - dns_dbnode_t * node = NULL; + bool *exists) { + isc_result_t result; + dns_dbnode_t *node = NULL; dns_rdatasetiter_t *iter = NULL; result = dns_db_findnode(db, name, false, &node); @@ -356,8 +352,8 @@ name_exists(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, return (result); } - result = - dns_db_allrdatasets(db, node, version, (isc_stdtime_t)0, &iter); + result = dns_db_allrdatasets(db, node, version, (isc_stdtime_t)0, + &iter); if (result != ISC_R_SUCCESS) { goto cleanup_node; } @@ -379,13 +375,13 @@ cleanup_node: } static bool -match_nsec3param(const dns_rdata_nsec3_t * nsec3, - const dns_rdata_nsec3param_t *nsec3param) -{ +match_nsec3param(const dns_rdata_nsec3_t *nsec3, + const dns_rdata_nsec3param_t *nsec3param) { if (nsec3->hash == nsec3param->hash && nsec3->iterations == nsec3param->iterations && nsec3->salt_length == nsec3param->salt_length && - !memcmp(nsec3->salt, nsec3param->salt, nsec3->salt_length)) { + !memcmp(nsec3->salt, nsec3param->salt, nsec3->salt_length)) + { return (true); } return (false); @@ -397,13 +393,12 @@ match_nsec3param(const dns_rdata_nsec3_t * nsec3, */ static isc_result_t delnsec3(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, - const dns_rdata_nsec3param_t *nsec3param, dns_diff_t *diff) -{ - dns_dbnode_t * node = NULL; - dns_difftuple_t * tuple = NULL; + const dns_rdata_nsec3param_t *nsec3param, dns_diff_t *diff) { + dns_dbnode_t *node = NULL; + dns_difftuple_t *tuple = NULL; dns_rdata_nsec3_t nsec3; - dns_rdataset_t rdataset; - isc_result_t result; + dns_rdataset_t rdataset; + isc_result_t result; result = dns_db_findnsec3node(db, name, false, &node); if (result == ISC_R_NOTFOUND) { @@ -426,7 +421,8 @@ delnsec3(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &rdata); CHECK(dns_rdata_tostruct(&rdata, &nsec3, NULL)); @@ -459,10 +455,9 @@ cleanup_node: } static bool -better_param(dns_rdataset_t *nsec3paramset, dns_rdata_t *param) -{ +better_param(dns_rdataset_t *nsec3paramset, dns_rdata_t *param) { dns_rdataset_t rdataset; - isc_result_t result; + isc_result_t result; if (REMOVE(param->data[1])) { return (true); @@ -471,8 +466,9 @@ better_param(dns_rdataset_t *nsec3paramset, dns_rdata_t *param) dns_rdataset_init(&rdataset); dns_rdataset_clone(nsec3paramset, &rdataset); for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { - dns_rdata_t rdata = DNS_RDATA_INIT; + result = dns_rdataset_next(&rdataset)) + { + dns_rdata_t rdata = DNS_RDATA_INIT; unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE]; if (rdataset.type != dns_rdatatype_nsec3param) { @@ -493,7 +489,8 @@ better_param(dns_rdataset_t *nsec3paramset, dns_rdata_t *param) rdata.data[2] != param->data[2] || rdata.data[3] != param->data[3] || rdata.data[4] != param->data[4] || - memcmp(&rdata.data[5], ¶m->data[5], param->data[4])) { + memcmp(&rdata.data[5], ¶m->data[5], param->data[4])) + { continue; } if (CREATE(rdata.data[1]) && !CREATE(param->data[1])) { @@ -507,11 +504,11 @@ better_param(dns_rdataset_t *nsec3paramset, dns_rdata_t *param) static isc_result_t find_nsec3(dns_rdata_nsec3_t *nsec3, dns_rdataset_t *rdataset, - const dns_rdata_nsec3param_t *nsec3param) -{ + const dns_rdata_nsec3param_t *nsec3param) { isc_result_t result; for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(rdataset, &rdata); @@ -527,39 +524,38 @@ failure: isc_result_t dns_nsec3_addnsec3(dns_db_t *db, dns_dbversion_t *version, - const dns_name_t * name, + const dns_name_t *name, const dns_rdata_nsec3param_t *nsec3param, dns_ttl_t nsecttl, - bool unsecure, dns_diff_t *diff) -{ + bool unsecure, dns_diff_t *diff) { dns_dbiterator_t *dbit = NULL; - dns_dbnode_t * node = NULL; - dns_dbnode_t * newnode = NULL; - dns_difftuple_t * tuple = NULL; - dns_fixedname_t fixed; - dns_fixedname_t fprev; - dns_hash_t hash; - dns_name_t * hashname; - dns_name_t * origin; - dns_name_t * prev; - dns_name_t empty; + dns_dbnode_t *node = NULL; + dns_dbnode_t *newnode = NULL; + dns_difftuple_t *tuple = NULL; + dns_fixedname_t fixed; + dns_fixedname_t fprev; + dns_hash_t hash; + dns_name_t *hashname; + dns_name_t *origin; + dns_name_t *prev; + dns_name_t empty; dns_rdata_nsec3_t nsec3; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdataset_t rdataset; - int pass; - bool exists = false; - bool maybe_remove_unsecure = false; - uint8_t flags; - isc_buffer_t buffer; - isc_result_t result; - unsigned char * old_next; - unsigned char * salt; - unsigned char nexthash[NSEC3_MAX_HASH_LENGTH]; - unsigned char nsec3buf[DNS_NSEC3_BUFFERSIZE]; - unsigned int iterations; - unsigned int labels; - size_t next_length; - unsigned int old_length; - unsigned int salt_length; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdataset_t rdataset; + int pass; + bool exists = false; + bool maybe_remove_unsecure = false; + uint8_t flags; + isc_buffer_t buffer; + isc_result_t result; + unsigned char *old_next; + unsigned char *salt; + unsigned char nexthash[NSEC3_MAX_HASH_LENGTH]; + unsigned char nsec3buf[DNS_NSEC3_BUFFERSIZE]; + unsigned int iterations; + unsigned int labels; + size_t next_length; + unsigned int old_length; + unsigned int salt_length; hashname = dns_fixedname_initname(&fixed); prev = dns_fixedname_initname(&fprev); @@ -899,12 +895,11 @@ failure: isc_result_t dns_nsec3_addnsec3s(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, dns_ttl_t nsecttl, bool unsecure, - dns_diff_t *diff) -{ - dns_dbnode_t * node = NULL; + dns_diff_t *diff) { + dns_dbnode_t *node = NULL; dns_rdata_nsec3param_t nsec3param; - dns_rdataset_t rdataset; - isc_result_t result; + dns_rdataset_t rdataset; + isc_result_t result; dns_rdataset_init(&rdataset); @@ -931,7 +926,8 @@ dns_nsec3_addnsec3s(dns_db_t *db, dns_dbversion_t *version, * Update each active NSEC3 chain. */ for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &rdata); @@ -963,12 +959,11 @@ failure: bool dns_nsec3param_fromprivate(dns_rdata_t *src, dns_rdata_t *target, - unsigned char *buf, size_t buflen) -{ + unsigned char *buf, size_t buflen) { dns_decompress_t dctx; - isc_result_t result; - isc_buffer_t buf1; - isc_buffer_t buf2; + isc_result_t result; + isc_buffer_t buf1; + isc_buffer_t buf2; /* * Algorithm 0 (reserved by RFC 4034) is used to identify @@ -994,8 +989,7 @@ dns_nsec3param_fromprivate(dns_rdata_t *src, dns_rdata_t *target, void dns_nsec3param_toprivate(dns_rdata_t *src, dns_rdata_t *target, dns_rdatatype_t privatetype, unsigned char *buf, - size_t buflen) -{ + size_t buflen) { REQUIRE(buflen >= src->length + 1); REQUIRE(DNS_RDATA_INITIALIZED(target)); @@ -1012,11 +1006,10 @@ dns_nsec3param_toprivate(dns_rdata_t *src, dns_rdata_t *target, static isc_result_t rr_exists(dns_db_t *db, dns_dbversion_t *ver, const dns_name_t *name, - const dns_rdata_t *rdata, bool *flag) -{ + const dns_rdata_t *rdata, bool *flag) { dns_rdataset_t rdataset; - dns_dbnode_t * node = NULL; - isc_result_t result; + dns_dbnode_t *node = NULL; + isc_result_t result; dns_rdataset_init(&rdataset); if (rdata->type == dns_rdatatype_nsec3) { @@ -1033,7 +1026,8 @@ rr_exists(dns_db_t *db, dns_dbversion_t *ver, const dns_name_t *name, } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t myrdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &myrdata); if (!dns_rdata_casecompare(&myrdata, rdata)) { @@ -1057,8 +1051,7 @@ failure: isc_result_t dns_nsec3param_salttotext(dns_rdata_nsec3param_t *nsec3param, char *dst, - size_t dstlen) -{ + size_t dstlen) { isc_result_t result; isc_region_t r; isc_buffer_t b; @@ -1093,18 +1086,17 @@ dns_nsec3param_salttotext(dns_rdata_nsec3param_t *nsec3param, char *dst, isc_result_t dns_nsec3param_deletechains(dns_db_t *db, dns_dbversion_t *ver, - dns_zone_t *zone, bool nonsec, dns_diff_t *diff) -{ - dns_dbnode_t * node = NULL; + dns_zone_t *zone, bool nonsec, dns_diff_t *diff) { + dns_dbnode_t *node = NULL; dns_difftuple_t *tuple = NULL; - dns_name_t next; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdataset_t rdataset; - bool flag; - isc_result_t result = ISC_R_SUCCESS; - unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE + 1]; - dns_name_t * origin = dns_zone_getorigin(zone); - dns_rdatatype_t privatetype = dns_zone_getprivatetype(zone); + dns_name_t next; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdataset_t rdataset; + bool flag; + isc_result_t result = ISC_R_SUCCESS; + unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE + 1]; + dns_name_t *origin = dns_zone_getorigin(zone); + dns_rdatatype_t privatetype = dns_zone_getprivatetype(zone); dns_name_init(&next, NULL); dns_rdataset_init(&rdataset); @@ -1127,7 +1119,8 @@ dns_nsec3param_deletechains(dns_db_t *db, dns_dbversion_t *ver, } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t private = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &rdata); @@ -1175,7 +1168,8 @@ try_private: } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_reset(&rdata); dns_rdataset_current(&rdataset, &rdata); INSIST(rdata.length <= sizeof(buf)); @@ -1187,7 +1181,8 @@ try_private: */ if (rdata.length < 6 || buf[0] != 0 || (buf[2] & DNS_NSEC3FLAG_REMOVE) != 0 || - (nonsec && (buf[2] & DNS_NSEC3FLAG_NONSEC) != 0)) { + (nonsec && (buf[2] & DNS_NSEC3FLAG_NONSEC) != 0)) + { continue; } @@ -1228,13 +1223,12 @@ failure: isc_result_t dns_nsec3_addnsec3sx(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, dns_ttl_t nsecttl, bool unsecure, - dns_rdatatype_t type, dns_diff_t *diff) -{ - dns_dbnode_t * node = NULL; + dns_rdatatype_t type, dns_diff_t *diff) { + dns_dbnode_t *node = NULL; dns_rdata_nsec3param_t nsec3param; - dns_rdataset_t rdataset; - dns_rdataset_t prdataset; - isc_result_t result; + dns_rdataset_t rdataset; + dns_rdataset_t prdataset; + isc_result_t result; dns_rdataset_init(&rdataset); dns_rdataset_init(&prdataset); @@ -1267,7 +1261,8 @@ dns_nsec3_addnsec3sx(dns_db_t *db, dns_dbversion_t *version, * Update each active NSEC3 chain. */ for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &rdata); @@ -1297,9 +1292,10 @@ try_private: * Update each active NSEC3 chain. */ for (result = dns_rdataset_first(&prdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&prdataset)) { - dns_rdata_t rdata1 = DNS_RDATA_INIT; - dns_rdata_t rdata2 = DNS_RDATA_INIT; + result = dns_rdataset_next(&prdataset)) + { + dns_rdata_t rdata1 = DNS_RDATA_INIT; + dns_rdata_t rdata2 = DNS_RDATA_INIT; unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE]; dns_rdataset_current(&prdataset, &rdata1); @@ -1348,9 +1344,8 @@ failure: */ static isc_result_t deleteit(dns_db_t *db, dns_dbversion_t *ver, const dns_name_t *name, - bool *yesno) -{ - isc_result_t result; + bool *yesno) { + isc_result_t result; dns_fixedname_t foundname; dns_fixedname_init(&foundname); @@ -1359,12 +1354,14 @@ deleteit(dns_db_t *db, dns_dbversion_t *ver, const dns_name_t *name, (isc_stdtime_t)0, NULL, dns_fixedname_name(&foundname), NULL, NULL); if (result == DNS_R_EMPTYNAME || result == ISC_R_SUCCESS || - result == DNS_R_ZONECUT) { + result == DNS_R_ZONECUT) + { *yesno = false; return (ISC_R_SUCCESS); } if (result == DNS_R_GLUE || result == DNS_R_DNAME || - result == DNS_R_DELEGATION || result == DNS_R_NXDOMAIN) { + result == DNS_R_DELEGATION || result == DNS_R_NXDOMAIN) + { *yesno = true; return (ISC_R_SUCCESS); } @@ -1377,33 +1374,32 @@ deleteit(dns_db_t *db, dns_dbversion_t *ver, const dns_name_t *name, isc_result_t dns_nsec3_delnsec3(dns_db_t *db, dns_dbversion_t *version, - const dns_name_t * name, - const dns_rdata_nsec3param_t *nsec3param, dns_diff_t *diff) -{ + const dns_name_t *name, + const dns_rdata_nsec3param_t *nsec3param, dns_diff_t *diff) { dns_dbiterator_t *dbit = NULL; - dns_dbnode_t * node = NULL; - dns_difftuple_t * tuple = NULL; - dns_fixedname_t fixed; - dns_fixedname_t fprev; - dns_hash_t hash; - dns_name_t * hashname; - dns_name_t * origin; - dns_name_t * prev; - dns_name_t empty; + dns_dbnode_t *node = NULL; + dns_difftuple_t *tuple = NULL; + dns_fixedname_t fixed; + dns_fixedname_t fprev; + dns_hash_t hash; + dns_name_t *hashname; + dns_name_t *origin; + dns_name_t *prev; + dns_name_t empty; dns_rdata_nsec3_t nsec3; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdataset_t rdataset; - int pass; - bool yesno; - isc_buffer_t buffer; - isc_result_t result; - unsigned char * salt; - unsigned char nexthash[NSEC3_MAX_HASH_LENGTH]; - unsigned char nsec3buf[DNS_NSEC3_BUFFERSIZE]; - unsigned int iterations; - unsigned int labels; - size_t next_length; - unsigned int salt_length; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdataset_t rdataset; + int pass; + bool yesno; + isc_buffer_t buffer; + isc_result_t result; + unsigned char *salt; + unsigned char nexthash[NSEC3_MAX_HASH_LENGTH]; + unsigned char nsec3buf[DNS_NSEC3_BUFFERSIZE]; + unsigned int iterations; + unsigned int labels; + size_t next_length; + unsigned int salt_length; hashname = dns_fixedname_initname(&fixed); prev = dns_fixedname_initname(&fprev); @@ -1654,20 +1650,18 @@ failure: isc_result_t dns_nsec3_delnsec3s(dns_db_t *db, dns_dbversion_t *version, - const dns_name_t *name, dns_diff_t *diff) -{ + const dns_name_t *name, dns_diff_t *diff) { return (dns_nsec3_delnsec3sx(db, version, name, 0, diff)); } isc_result_t dns_nsec3_delnsec3sx(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, dns_rdatatype_t privatetype, - dns_diff_t *diff) -{ - dns_dbnode_t * node = NULL; + dns_diff_t *diff) { + dns_dbnode_t *node = NULL; dns_rdata_nsec3param_t nsec3param; - dns_rdataset_t rdataset; - isc_result_t result; + dns_rdataset_t rdataset; + isc_result_t result; dns_rdataset_init(&rdataset); @@ -1693,7 +1687,8 @@ dns_nsec3_delnsec3sx(dns_db_t *db, dns_dbversion_t *version, * Update each active NSEC3 chain. */ for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &rdata); @@ -1726,9 +1721,10 @@ try_private: * Update each NSEC3 chain being built. */ for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { - dns_rdata_t rdata1 = DNS_RDATA_INIT; - dns_rdata_t rdata2 = DNS_RDATA_INIT; + result = dns_rdataset_next(&rdataset)) + { + dns_rdata_t rdata1 = DNS_RDATA_INIT; + dns_rdata_t rdata2 = DNS_RDATA_INIT; unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE]; dns_rdataset_current(&rdataset, &rdata1); @@ -1768,19 +1764,17 @@ failure: isc_result_t dns_nsec3_active(dns_db_t *db, dns_dbversion_t *version, bool complete, - bool *answer) -{ + bool *answer) { return (dns_nsec3_activex(db, version, complete, 0, answer)); } isc_result_t dns_nsec3_activex(dns_db_t *db, dns_dbversion_t *version, bool complete, - dns_rdatatype_t privatetype, bool *answer) -{ - dns_dbnode_t * node = NULL; - dns_rdataset_t rdataset; + dns_rdatatype_t privatetype, bool *answer) { + dns_dbnode_t *node = NULL; + dns_rdataset_t rdataset; dns_rdata_nsec3param_t nsec3param; - isc_result_t result; + isc_result_t result; REQUIRE(answer != NULL); @@ -1804,7 +1798,8 @@ dns_nsec3_activex(dns_db_t *db, dns_dbversion_t *version, bool complete, return (result); } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &rdata); @@ -1843,9 +1838,10 @@ try_private: } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { - dns_rdata_t rdata1 = DNS_RDATA_INIT; - dns_rdata_t rdata2 = DNS_RDATA_INIT; + result = dns_rdataset_next(&rdataset)) + { + dns_rdata_t rdata1 = DNS_RDATA_INIT; + dns_rdata_t rdata2 = DNS_RDATA_INIT; unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE]; dns_rdataset_current(&rdataset, &rdata1); @@ -1875,14 +1871,13 @@ try_private: isc_result_t dns_nsec3_maxiterations(dns_db_t *db, dns_dbversion_t *version, isc_mem_t *mctx, - unsigned int *iterationsp) -{ - dns_dbnode_t * node = NULL; + unsigned int *iterationsp) { + dns_dbnode_t *node = NULL; dns_rdataset_t rdataset; - dst_key_t * key = NULL; - isc_buffer_t buffer; - isc_result_t result; - unsigned int bits, minbits = 4096; + dst_key_t *key = NULL; + isc_buffer_t buffer; + isc_result_t result; + unsigned int bits, minbits = 4096; result = dns_db_getoriginnode(db, &node); if (result != ISC_R_SUCCESS) { @@ -1902,7 +1897,8 @@ dns_nsec3_maxiterations(dns_db_t *db, dns_dbversion_t *version, isc_mem_t *mctx, } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &rdata); @@ -1953,30 +1949,29 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, dns_name_t *zonename, bool *exists, bool *data, bool *optout, bool *unknown, bool *setclosest, bool *setnearest, dns_name_t *closest, - dns_name_t *nearest, dns_nseclog_t logit, void *arg) -{ - char namebuf[DNS_NAME_FORMATSIZE]; - dns_fixedname_t fzone; - dns_fixedname_t qfixed; - dns_label_t hashlabel; - dns_name_t * qname; - dns_name_t * zone; + dns_name_t *nearest, dns_nseclog_t logit, void *arg) { + char namebuf[DNS_NAME_FORMATSIZE]; + dns_fixedname_t fzone; + dns_fixedname_t qfixed; + dns_label_t hashlabel; + dns_name_t *qname; + dns_name_t *zone; dns_rdata_nsec3_t nsec3; - dns_rdata_t rdata = DNS_RDATA_INIT; - int order; - int scope; - bool atparent; - bool first; - bool ns; - bool soa; - isc_buffer_t buffer; - isc_result_t answer = ISC_R_IGNORE; - isc_result_t result; - unsigned char hash[NSEC3_MAX_HASH_LENGTH]; - unsigned char owner[NSEC3_MAX_HASH_LENGTH]; - unsigned int length; - unsigned int qlabels; - unsigned int zlabels; + dns_rdata_t rdata = DNS_RDATA_INIT; + int order; + int scope; + bool atparent; + bool first; + bool ns; + bool soa; + isc_buffer_t buffer; + isc_result_t answer = ISC_R_IGNORE; + isc_result_t result; + unsigned char hash[NSEC3_MAX_HASH_LENGTH]; + unsigned char owner[NSEC3_MAX_HASH_LENGTH]; + unsigned int length; + unsigned int qlabels; + unsigned int zlabels; REQUIRE((exists == NULL && data == NULL) || (exists != NULL && data != NULL)); @@ -2133,8 +2128,8 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, type == dns_rdatatype_nxt || type == dns_rdatatype_nsec || type == dns_rdatatype_key || - !dns_nsec3_typepresent(&rdata, - dns_rdatatype_cname)) { + !dns_nsec3_typepresent(&rdata, dns_rdatatype_cname)) + { *exists = true; *data = dns_nsec3_typepresent(&rdata, type); (*logit)(arg, ISC_LOG_DEBUG(3), @@ -2150,7 +2145,8 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, if (order == 0 && dns_nsec3_typepresent(&rdata, dns_rdatatype_ns) && - !dns_nsec3_typepresent(&rdata, dns_rdatatype_soa)) { + !dns_nsec3_typepresent(&rdata, dns_rdatatype_soa)) + { /* * This NSEC3 record is from somewhere higher in * the DNS, and at the parent of a delegation. @@ -2172,8 +2168,8 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, !dns_nsec3_typepresent(&rdata, dns_rdatatype_dname) && (dns_nsec3_typepresent(&rdata, dns_rdatatype_soa) || - !dns_nsec3_typepresent(&rdata, - dns_rdatatype_ns))) { + !dns_nsec3_typepresent(&rdata, dns_rdatatype_ns))) + { dns_name_format(qname, namebuf, sizeof(namebuf)); (*logit)(arg, ISC_LOG_DEBUG(3), @@ -2203,7 +2199,8 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, if ((scope < 0 && order > 0 && memcmp(hash, nsec3.next, length) < 0) || (scope >= 0 && - (order > 0 || memcmp(hash, nsec3.next, length) < 0))) { + (order > 0 || memcmp(hash, nsec3.next, length) < 0))) + { dns_name_format(qname, namebuf, sizeof(namebuf)); (*logit)(arg, ISC_LOG_DEBUG(3), "NSEC3 proves " @@ -2211,7 +2208,8 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name, namebuf); if (nearest != NULL && (dns_name_countlabels(nearest) == 0 || - dns_name_issubdomain(nearest, qname))) { + dns_name_issubdomain(nearest, qname))) + { dns_name_copynf(qname, nearest); *setnearest = true; } diff --git a/lib/dns/nta.c b/lib/dns/nta.c index b97f80db3b..525bdabdb7 100644 --- a/lib/dns/nta.c +++ b/lib/dns/nta.c @@ -37,20 +37,20 @@ #include struct dns_nta { - unsigned int magic; - isc_refcount_t refcount; + unsigned int magic; + isc_refcount_t refcount; dns_ntatable_t *ntatable; - bool forced; - isc_timer_t * timer; - dns_fetch_t * fetch; - dns_rdataset_t rdataset; - dns_rdataset_t sigrdataset; + bool forced; + isc_timer_t *timer; + dns_fetch_t *fetch; + dns_rdataset_t rdataset; + dns_rdataset_t sigrdataset; dns_fixedname_t fn; - dns_name_t * name; - isc_stdtime_t expiry; + dns_name_t *name; + isc_stdtime_t expiry; }; -#define NTA_MAGIC ISC_MAGIC('N', 'T', 'A', 'n') +#define NTA_MAGIC ISC_MAGIC('N', 'T', 'A', 'n') #define VALID_NTA(nn) ISC_MAGIC_VALID(nn, NTA_MAGIC) /* @@ -58,14 +58,12 @@ struct dns_nta { * nta_detach. */ static void -nta_ref(dns_nta_t *nta) -{ +nta_ref(dns_nta_t *nta) { isc_refcount_increment(&nta->refcount); } static void -nta_detach(isc_mem_t *mctx, dns_nta_t **ntap) -{ +nta_detach(isc_mem_t *mctx, dns_nta_t **ntap) { REQUIRE(ntap != NULL && VALID_NTA(*ntap)); dns_nta_t *nta = *ntap; *ntap = NULL; @@ -94,8 +92,7 @@ nta_detach(isc_mem_t *mctx, dns_nta_t **ntap) } static void -free_nta(void *data, void *arg) -{ +free_nta(void *data, void *arg) { dns_nta_t *nta = (dns_nta_t *)data; isc_mem_t *mctx = (isc_mem_t *)arg; @@ -104,10 +101,9 @@ free_nta(void *data, void *arg) isc_result_t dns_ntatable_create(dns_view_t *view, isc_taskmgr_t *taskmgr, - isc_timermgr_t *timermgr, dns_ntatable_t **ntatablep) -{ + isc_timermgr_t *timermgr, dns_ntatable_t **ntatablep) { dns_ntatable_t *ntatable; - isc_result_t result; + isc_result_t result; REQUIRE(ntatablep != NULL && *ntatablep == NULL); @@ -156,8 +152,7 @@ cleanup_ntatable: } void -dns_ntatable_attach(dns_ntatable_t *source, dns_ntatable_t **targetp) -{ +dns_ntatable_attach(dns_ntatable_t *source, dns_ntatable_t **targetp) { REQUIRE(VALID_NTATABLE(source)); REQUIRE(targetp != NULL && *targetp == NULL); @@ -167,8 +162,7 @@ dns_ntatable_attach(dns_ntatable_t *source, dns_ntatable_t **targetp) } void -dns_ntatable_detach(dns_ntatable_t **ntatablep) -{ +dns_ntatable_detach(dns_ntatable_t **ntatablep) { dns_ntatable_t *ntatable; REQUIRE(ntatablep != NULL && VALID_NTATABLE(*ntatablep)); @@ -191,14 +185,13 @@ dns_ntatable_detach(dns_ntatable_t **ntatablep) } static void -fetch_done(isc_task_t *task, isc_event_t *event) -{ +fetch_done(isc_task_t *task, isc_event_t *event) { dns_fetchevent_t *devent = (dns_fetchevent_t *)event; - dns_nta_t * nta = devent->ev_arg; - isc_result_t eresult = devent->result; - dns_ntatable_t * ntatable = nta->ntatable; - dns_view_t * view = ntatable->view; - isc_stdtime_t now; + dns_nta_t *nta = devent->ev_arg; + isc_result_t eresult = devent->result; + dns_ntatable_t *ntatable = nta->ntatable; + dns_view_t *view = ntatable->view; + isc_stdtime_t now; UNUSED(task); @@ -249,12 +242,11 @@ fetch_done(isc_task_t *task, isc_event_t *event) } static void -checkbogus(isc_task_t *task, isc_event_t *event) -{ - dns_nta_t * nta = event->ev_arg; +checkbogus(isc_task_t *task, isc_event_t *event) { + dns_nta_t *nta = event->ev_arg; dns_ntatable_t *ntatable = nta->ntatable; - dns_view_t * view = ntatable->view; - isc_result_t result; + dns_view_t *view = ntatable->view; + isc_result_t result; if (nta->fetch != NULL) { dns_resolver_cancelfetch(nta->fetch); @@ -280,11 +272,10 @@ checkbogus(isc_task_t *task, isc_event_t *event) } static isc_result_t -settimer(dns_ntatable_t *ntatable, dns_nta_t *nta, uint32_t lifetime) -{ - isc_result_t result; +settimer(dns_ntatable_t *ntatable, dns_nta_t *nta, uint32_t lifetime) { + isc_result_t result; isc_interval_t interval; - dns_view_t * view; + dns_view_t *view; REQUIRE(VALID_NTATABLE(ntatable)); REQUIRE(VALID_NTA(nta)); @@ -306,9 +297,9 @@ settimer(dns_ntatable_t *ntatable, dns_nta_t *nta, uint32_t lifetime) } static isc_result_t -nta_create(dns_ntatable_t *ntatable, const dns_name_t *name, dns_nta_t **target) -{ - dns_nta_t * nta = NULL; +nta_create(dns_ntatable_t *ntatable, const dns_name_t *name, + dns_nta_t **target) { + dns_nta_t *nta = NULL; dns_view_t *view; REQUIRE(VALID_NTATABLE(ntatable)); @@ -338,12 +329,11 @@ nta_create(dns_ntatable_t *ntatable, const dns_name_t *name, dns_nta_t **target) isc_result_t dns_ntatable_add(dns_ntatable_t *ntatable, const dns_name_t *name, bool force, - isc_stdtime_t now, uint32_t lifetime) -{ - isc_result_t result; - dns_nta_t * nta = NULL; + isc_stdtime_t now, uint32_t lifetime) { + isc_result_t result; + dns_nta_t *nta = NULL; dns_rbtnode_t *node; - dns_view_t * view; + dns_view_t *view; REQUIRE(VALID_NTATABLE(ntatable)); @@ -395,9 +385,8 @@ dns_ntatable_add(dns_ntatable_t *ntatable, const dns_name_t *name, bool force, * Caller must hold a write lock on rwlock. */ static isc_result_t -deletenode(dns_ntatable_t *ntatable, const dns_name_t *name) -{ - isc_result_t result; +deletenode(dns_ntatable_t *ntatable, const dns_name_t *name) { + isc_result_t result; dns_rbtnode_t *node = NULL; REQUIRE(VALID_NTATABLE(ntatable)); @@ -420,8 +409,7 @@ deletenode(dns_ntatable_t *ntatable, const dns_name_t *name) } isc_result_t -dns_ntatable_delete(dns_ntatable_t *ntatable, const dns_name_t *name) -{ +dns_ntatable_delete(dns_ntatable_t *ntatable, const dns_name_t *name) { isc_result_t result; RWLOCK(&ntatable->rwlock, isc_rwlocktype_write); @@ -433,14 +421,13 @@ dns_ntatable_delete(dns_ntatable_t *ntatable, const dns_name_t *name) bool dns_ntatable_covered(dns_ntatable_t *ntatable, isc_stdtime_t now, - const dns_name_t *name, const dns_name_t *anchor) -{ - isc_result_t result; - dns_fixedname_t fn; - dns_rbtnode_t * node; - dns_name_t * foundname; - dns_nta_t * nta = NULL; - bool answer = false; + const dns_name_t *name, const dns_name_t *anchor) { + isc_result_t result; + dns_fixedname_t fn; + dns_rbtnode_t *node; + dns_name_t *foundname; + dns_nta_t *nta = NULL; + bool answer = false; isc_rwlocktype_t locktype = isc_rwlocktype_read; REQUIRE(ntatable == NULL || VALID_NTATABLE(ntatable)); @@ -505,8 +492,7 @@ again: } static isc_result_t -putstr(isc_buffer_t **b, const char *str) -{ +putstr(isc_buffer_t **b, const char *str) { isc_result_t result; result = isc_buffer_reserve(b, strlen(str)); @@ -520,13 +506,12 @@ putstr(isc_buffer_t **b, const char *str) isc_result_t dns_ntatable_totext(dns_ntatable_t *ntatable, const char *view, - isc_buffer_t **buf) -{ - isc_result_t result; - dns_rbtnode_t * node; + isc_buffer_t **buf) { + isc_result_t result; + dns_rbtnode_t *node; dns_rbtnodechain_t chain; - bool first = true; - isc_stdtime_t now; + bool first = true; + isc_stdtime_t now; REQUIRE(VALID_NTATABLE(ntatable)); @@ -544,15 +529,15 @@ dns_ntatable_totext(dns_ntatable_t *ntatable, const char *view, for (;;) { dns_rbtnodechain_current(&chain, NULL, NULL, &node); if (node->data != NULL) { - dns_nta_t * n = (dns_nta_t *)node->data; - char nbuf[DNS_NAME_FORMATSIZE]; - char tbuf[ISC_FORMATHTTPTIMESTAMP_SIZE]; - char obuf[DNS_NAME_FORMATSIZE + - ISC_FORMATHTTPTIMESTAMP_SIZE + - sizeof("expired: \n")]; + dns_nta_t *n = (dns_nta_t *)node->data; + char nbuf[DNS_NAME_FORMATSIZE]; + char tbuf[ISC_FORMATHTTPTIMESTAMP_SIZE]; + char obuf[DNS_NAME_FORMATSIZE + + ISC_FORMATHTTPTIMESTAMP_SIZE + + sizeof("expired: \n")]; dns_fixedname_t fn; - dns_name_t * name; - isc_time_t t; + dns_name_t *name; + isc_time_t t; /* * Skip "validate-except" entries. @@ -595,11 +580,10 @@ cleanup: } isc_result_t -dns_ntatable_dump(dns_ntatable_t *ntatable, FILE *fp) -{ - isc_result_t result; +dns_ntatable_dump(dns_ntatable_t *ntatable, FILE *fp) { + isc_result_t result; isc_buffer_t *text = NULL; - int len = 4096; + int len = 4096; isc_buffer_allocate(ntatable->view->mctx, &text, len); @@ -621,13 +605,12 @@ dns_ntatable_dump(dns_ntatable_t *ntatable, FILE *fp) } isc_result_t -dns_ntatable_save(dns_ntatable_t *ntatable, FILE *fp) -{ - isc_result_t result; - dns_rbtnode_t * node; +dns_ntatable_save(dns_ntatable_t *ntatable, FILE *fp) { + isc_result_t result; + dns_rbtnode_t *node; dns_rbtnodechain_t chain; - isc_stdtime_t now; - bool written = false; + isc_stdtime_t now; + bool written = false; REQUIRE(VALID_NTATABLE(ntatable)); @@ -643,11 +626,11 @@ dns_ntatable_save(dns_ntatable_t *ntatable, FILE *fp) for (;;) { dns_rbtnodechain_current(&chain, NULL, NULL, &node); if (node->data != NULL) { - isc_buffer_t b; - char nbuf[DNS_NAME_FORMATSIZE + 1], tbuf[80]; + isc_buffer_t b; + char nbuf[DNS_NAME_FORMATSIZE + 1], tbuf[80]; dns_fixedname_t fn; - dns_name_t * name; - dns_nta_t * n = (dns_nta_t *)node->data; + dns_name_t *name; + dns_nta_t *n = (dns_nta_t *)node->data; /* * Skip this node if the expiry is already in the diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c index 7593b10310..7760cf2e2c 100644 --- a/lib/dns/openssl_link.c +++ b/lib/dns/openssl_link.c @@ -46,7 +46,7 @@ static isc_mem_t *dst__mctx = NULL; #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) static isc_mutex_t *locks = NULL; -static int nlocks; +static int nlocks; #endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || \ * defined(LIBRESSL_VERSION_NUMBER) */ @@ -55,8 +55,7 @@ static ENGINE *e = NULL; #endif /* if !defined(OPENSSL_NO_ENGINE) */ static void -enable_fips_mode(void) -{ +enable_fips_mode(void) { #ifdef HAVE_FIPS_MODE if (FIPS_mode() != 0) { /* @@ -74,8 +73,7 @@ enable_fips_mode(void) #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) static void -lock_callback(int mode, int type, const char *file, int line) -{ +lock_callback(int mode, int type, const char *file, int line) { UNUSED(file); UNUSED(line); if ((mode & CRYPTO_LOCK) != 0) { @@ -89,23 +87,20 @@ lock_callback(int mode, int type, const char *file, int line) #if defined(LIBRESSL_VERSION_NUMBER) static unsigned long -id_callback(void) -{ +id_callback(void) { return ((unsigned long)isc_thread_self()); } #endif /* if defined(LIBRESSL_VERSION_NUMBER) */ #if OPENSSL_VERSION_NUMBER < 0x10100000L static void -_set_thread_id(CRYPTO_THREADID *id) -{ +_set_thread_id(CRYPTO_THREADID *id) { CRYPTO_THREADID_set_numeric(id, (unsigned long)isc_thread_self()); } #endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L */ isc_result_t -dst__openssl_init(isc_mem_t *mctx, const char *engine) -{ +dst__openssl_init(isc_mem_t *mctx, const char *engine) { isc_result_t result; REQUIRE(dst__mctx == NULL); @@ -194,8 +189,7 @@ cleanup_rm: } void -dst__openssl_destroy(void) -{ +dst__openssl_destroy(void) { #if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) /* * Sequence taken from apps_shutdown() in . @@ -235,9 +229,8 @@ dst__openssl_destroy(void) } static isc_result_t -toresult(isc_result_t fallback) -{ - isc_result_t result = fallback; +toresult(isc_result_t fallback) { + isc_result_t result = fallback; unsigned long err = ERR_peek_error(); #if defined(ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED) int lib = ERR_GET_LIB(err); @@ -267,8 +260,7 @@ toresult(isc_result_t fallback) } isc_result_t -dst__openssl_toresult(isc_result_t fallback) -{ +dst__openssl_toresult(isc_result_t fallback) { isc_result_t result; result = toresult(fallback); @@ -278,21 +270,19 @@ dst__openssl_toresult(isc_result_t fallback) } isc_result_t -dst__openssl_toresult2(const char *funcname, isc_result_t fallback) -{ +dst__openssl_toresult2(const char *funcname, isc_result_t fallback) { return (dst__openssl_toresult3(DNS_LOGCATEGORY_GENERAL, funcname, fallback)); } isc_result_t dst__openssl_toresult3(isc_logcategory_t *category, const char *funcname, - isc_result_t fallback) -{ - isc_result_t result; + isc_result_t fallback) { + isc_result_t result; unsigned long err; - const char * file, *data; - int line, flags; - char buf[256]; + const char *file, *data; + int line, flags; + char buf[256]; result = toresult(fallback); @@ -321,8 +311,7 @@ done: #if !defined(OPENSSL_NO_ENGINE) ENGINE * -dst__openssl_getengine(const char *engine) -{ +dst__openssl_getengine(const char *engine) { if (engine == NULL) { return (NULL); } diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c index de9ff8b0d8..785fb3ce53 100644 --- a/lib/dns/openssldh_link.c +++ b/lib/dns/openssldh_link.c @@ -66,8 +66,7 @@ "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; @@ -77,8 +76,7 @@ static BIGNUM *bn2 = NULL, *bn768 = NULL, *bn1024 = NULL, *bn1536 = NULL; * are from OpenSSL 1.1.0. */ static void -DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key) -{ +DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key) { if (pub_key != NULL) { *pub_key = dh->pub_key; } @@ -88,8 +86,7 @@ DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key) } static int -DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key) -{ +DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key) { if (pub_key != NULL) { BN_free(dh->pub_key); dh->pub_key = pub_key; @@ -104,8 +101,8 @@ DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key) } static void -DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) -{ +DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, + const BIGNUM **g) { if (p != NULL) { *p = dh->p; } @@ -118,8 +115,7 @@ DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) } static int -DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) -{ +DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) { /* If the fields p and g in d are NULL, the corresponding input * parameters MUST be non-NULL. q may remain NULL. */ @@ -153,13 +149,12 @@ DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) static isc_result_t openssldh_computesecret(const dst_key_t *pub, const dst_key_t *priv, - isc_buffer_t *secret) -{ - DH * dhpub, *dhpriv; + isc_buffer_t *secret) { + DH *dhpub, *dhpriv; const BIGNUM *pub_key = NULL; - int ret; - isc_region_t r; - unsigned int len; + int ret; + isc_region_t r; + unsigned int len; REQUIRE(pub->keydata.dh != NULL); REQUIRE(priv->keydata.dh != NULL); @@ -184,9 +179,8 @@ openssldh_computesecret(const dst_key_t *pub, const dst_key_t *priv, } static bool -openssldh_compare(const dst_key_t *key1, const dst_key_t *key2) -{ - DH * dh1, *dh2; +openssldh_compare(const dst_key_t *key1, const dst_key_t *key2) { + DH *dh1, *dh2; const BIGNUM *pub_key1 = NULL, *pub_key2 = NULL; const BIGNUM *priv_key1 = NULL, *priv_key2 = NULL; const BIGNUM *p1 = NULL, *g1 = NULL, *p2 = NULL, *g2 = NULL; @@ -206,7 +200,8 @@ openssldh_compare(const dst_key_t *key1, const dst_key_t *key2) DH_get0_pqg(dh2, &p2, NULL, &g2); if (BN_cmp(p1, p2) != 0 || BN_cmp(g1, g2) != 0 || - BN_cmp(pub_key1, pub_key2) != 0) { + BN_cmp(pub_key1, pub_key2) != 0) + { return (false); } @@ -222,9 +217,8 @@ openssldh_compare(const dst_key_t *key1, const dst_key_t *key2) } static bool -openssldh_paramcompare(const dst_key_t *key1, const dst_key_t *key2) -{ - DH * dh1, *dh2; +openssldh_paramcompare(const dst_key_t *key1, const dst_key_t *key2) { + DH *dh1, *dh2; const BIGNUM *p1 = NULL, *g1 = NULL, *p2 = NULL, *g2 = NULL; dh1 = key1->keydata.dh; @@ -246,8 +240,7 @@ openssldh_paramcompare(const dst_key_t *key1, const dst_key_t *key2) } static int -progress_cb(int p, int n, BN_GENCB *cb) -{ +progress_cb(int p, int n, BN_GENCB *cb) { union { void *dptr; void (*fptr)(int); @@ -263,9 +256,8 @@ progress_cb(int p, int n, BN_GENCB *cb) } static isc_result_t -openssldh_generate(dst_key_t *key, int generator, void (*callback)(int)) -{ - DH * dh = NULL; +openssldh_generate(dst_key_t *key, int generator, void (*callback)(int)) { + DH *dh = NULL; BN_GENCB *cb; #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) BN_GENCB _cb; @@ -351,9 +343,8 @@ openssldh_generate(dst_key_t *key, int generator, void (*callback)(int)) } static bool -openssldh_isprivate(const dst_key_t *key) -{ - DH * dh = key->keydata.dh; +openssldh_isprivate(const dst_key_t *key) { + DH *dh = key->keydata.dh; const BIGNUM *priv_key = NULL; DH_get0_key(dh, NULL, &priv_key); @@ -361,8 +352,7 @@ openssldh_isprivate(const dst_key_t *key) } static void -openssldh_destroy(dst_key_t *key) -{ +openssldh_destroy(dst_key_t *key) { DH *dh = key->keydata.dh; if (dh == NULL) { @@ -374,8 +364,7 @@ openssldh_destroy(dst_key_t *key) } static void -uint16_toregion(uint16_t val, isc_region_t *region) -{ +uint16_toregion(uint16_t val, isc_region_t *region) { *region->base = (val & 0xff00) >> 8; isc_region_consume(region, 1); *region->base = (val & 0x00ff); @@ -383,9 +372,8 @@ uint16_toregion(uint16_t val, isc_region_t *region) } static uint16_t -uint16_fromregion(isc_region_t *region) -{ - uint16_t val; +uint16_fromregion(isc_region_t *region) { + uint16_t val; unsigned char *cp = region->base; val = ((unsigned int)(cp[0])) << 8; @@ -397,12 +385,11 @@ uint16_fromregion(isc_region_t *region) } static isc_result_t -openssldh_todns(const dst_key_t *key, isc_buffer_t *data) -{ - DH * dh; +openssldh_todns(const dst_key_t *key, isc_buffer_t *data) { + DH *dh; const BIGNUM *pub_key = NULL, *p = NULL, *g = NULL; - isc_region_t r; - uint16_t dnslen, plen, glen, publen; + isc_region_t r; + uint16_t dnslen, plen, glen, publen; REQUIRE(key->keydata.dh != NULL); @@ -413,7 +400,8 @@ openssldh_todns(const dst_key_t *key, isc_buffer_t *data) DH_get0_pqg(dh, &p, NULL, &g); if (BN_cmp(g, bn2) == 0 && (BN_cmp(p, bn768) == 0 || BN_cmp(p, bn1024) == 0 || - BN_cmp(p, bn1536) == 0)) { + BN_cmp(p, bn1536) == 0)) + { plen = 1; glen = 0; } else { @@ -457,13 +445,12 @@ openssldh_todns(const dst_key_t *key, isc_buffer_t *data) } static isc_result_t -openssldh_fromdns(dst_key_t *key, isc_buffer_t *data) -{ - DH * dh; - BIGNUM * pub_key = NULL, *p = NULL, *g = NULL; +openssldh_fromdns(dst_key_t *key, isc_buffer_t *data) { + DH *dh; + BIGNUM *pub_key = NULL, *p = NULL, *g = NULL; isc_region_t r; - uint16_t plen, glen, publen; - int special = 0; + uint16_t plen, glen, publen; + int special = 0; isc_buffer_remainingregion(data, &r); if (r.length == 0) { @@ -601,14 +588,13 @@ openssldh_fromdns(dst_key_t *key, isc_buffer_t *data) } static isc_result_t -openssldh_tofile(const dst_key_t *key, const char *directory) -{ - int i; - DH * dh; - const BIGNUM * pub_key = NULL, *priv_key = NULL, *p = NULL, *g = NULL; - dst_private_t priv; +openssldh_tofile(const dst_key_t *key, const char *directory) { + int i; + DH *dh; + const BIGNUM *pub_key = NULL, *priv_key = NULL, *p = NULL, *g = NULL; + dst_private_t priv; unsigned char *bufs[4]; - isc_result_t result; + isc_result_t result; if (key->keydata.dh == NULL) { return (DST_R_NULLKEY); @@ -666,14 +652,13 @@ openssldh_tofile(const dst_key_t *key, const char *directory) } static isc_result_t -openssldh_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) -{ +openssldh_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) { dst_private_t priv; - isc_result_t ret; - int i; - DH * dh = NULL; - BIGNUM * pub_key = NULL, *priv_key = NULL, *p = NULL, *g = NULL; - isc_mem_t * mctx; + isc_result_t ret; + int i; + DH *dh = NULL; + BIGNUM *pub_key = NULL, *priv_key = NULL, *p = NULL, *g = NULL; + isc_mem_t *mctx; #define DST_RET(a) \ { \ ret = a; \ @@ -750,8 +735,7 @@ err: } static void -openssldh_cleanup(void) -{ +openssldh_cleanup(void) { BN_free(bn2); bn2 = NULL; @@ -790,8 +774,7 @@ static dst_func_t openssldh_functions = { }; isc_result_t -dst__openssldh_init(dst_func_t **funcp) -{ +dst__openssldh_init(dst_func_t **funcp) { REQUIRE(funcp != NULL); if (*funcp == NULL) { if (BN_hex2bn(&bn2, PRIME2) == 0 || bn2 == NULL) { diff --git a/lib/dns/opensslecdsa_link.c b/lib/dns/opensslecdsa_link.c index efd2f8e362..f5fbe35b6b 100644 --- a/lib/dns/opensslecdsa_link.c +++ b/lib/dns/opensslecdsa_link.c @@ -48,8 +48,7 @@ #if !HAVE_ECDSA_SIG_GET0 /* From OpenSSL 1.1 */ static void -ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps) -{ +ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps) { if (pr != NULL) { *pr = sig->r; } @@ -59,8 +58,7 @@ ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps) } static int -ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s) -{ +ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s) { if (r == NULL || s == NULL) { return (0); } @@ -74,13 +72,12 @@ 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) -{ - EVP_MD_CTX * evp_md_ctx; +opensslecdsa_createctx(dst_key_t *key, dst_context_t *dctx) { + EVP_MD_CTX *evp_md_ctx; const EVP_MD *type = NULL; UNUSED(key); @@ -109,8 +106,7 @@ opensslecdsa_createctx(dst_key_t *key, dst_context_t *dctx) } static void -opensslecdsa_destroyctx(dst_context_t *dctx) -{ +opensslecdsa_destroyctx(dst_context_t *dctx) { EVP_MD_CTX *evp_md_ctx = dctx->ctxdata.evp_md_ctx; REQUIRE(dctx->key->key_alg == DST_ALG_ECDSA256 || @@ -123,8 +119,7 @@ opensslecdsa_destroyctx(dst_context_t *dctx) } static isc_result_t -opensslecdsa_adddata(dst_context_t *dctx, const isc_region_t *data) -{ +opensslecdsa_adddata(dst_context_t *dctx, const isc_region_t *data) { EVP_MD_CTX *evp_md_ctx = dctx->ctxdata.evp_md_ctx; REQUIRE(dctx->key->key_alg == DST_ALG_ECDSA256 || @@ -139,8 +134,7 @@ opensslecdsa_adddata(dst_context_t *dctx, const isc_region_t *data) } static int -BN_bn2bin_fixed(const BIGNUM *bn, unsigned char *buf, int size) -{ +BN_bn2bin_fixed(const BIGNUM *bn, unsigned char *buf, int size) { int bytes = size - BN_num_bytes(bn); while (bytes-- > 0) { @@ -151,16 +145,15 @@ BN_bn2bin_fixed(const BIGNUM *bn, unsigned char *buf, int size) } static isc_result_t -opensslecdsa_sign(dst_context_t *dctx, isc_buffer_t *sig) -{ - isc_result_t ret; - dst_key_t * key = dctx->key; - isc_region_t region; - ECDSA_SIG * ecdsasig; - EVP_MD_CTX * evp_md_ctx = dctx->ctxdata.evp_md_ctx; - EVP_PKEY * pkey = key->keydata.pkey; - EC_KEY * eckey = EVP_PKEY_get1_EC_KEY(pkey); - unsigned int dgstlen, siglen; +opensslecdsa_sign(dst_context_t *dctx, isc_buffer_t *sig) { + isc_result_t ret; + dst_key_t *key = dctx->key; + isc_region_t region; + ECDSA_SIG *ecdsasig; + EVP_MD_CTX *evp_md_ctx = dctx->ctxdata.evp_md_ctx; + EVP_PKEY *pkey = key->keydata.pkey; + EC_KEY *eckey = EVP_PKEY_get1_EC_KEY(pkey); + unsigned int dgstlen, siglen; unsigned char digest[EVP_MAX_MD_SIZE]; const BIGNUM *r, *s; @@ -207,19 +200,18 @@ err: } static isc_result_t -opensslecdsa_verify(dst_context_t *dctx, const isc_region_t *sig) -{ - isc_result_t ret; - dst_key_t * key = dctx->key; - int status; +opensslecdsa_verify(dst_context_t *dctx, const isc_region_t *sig) { + isc_result_t ret; + dst_key_t *key = dctx->key; + int status; unsigned char *cp = sig->base; - ECDSA_SIG * ecdsasig = NULL; - EVP_MD_CTX * evp_md_ctx = dctx->ctxdata.evp_md_ctx; - EVP_PKEY * pkey = key->keydata.pkey; - EC_KEY * eckey = EVP_PKEY_get1_EC_KEY(pkey); - unsigned int dgstlen, siglen; - unsigned char digest[EVP_MAX_MD_SIZE]; - BIGNUM * r = NULL, *s = NULL; + ECDSA_SIG *ecdsasig = NULL; + EVP_MD_CTX *evp_md_ctx = dctx->ctxdata.evp_md_ctx; + EVP_PKEY *pkey = key->keydata.pkey; + EC_KEY *eckey = EVP_PKEY_get1_EC_KEY(pkey); + unsigned int dgstlen, siglen; + unsigned char digest[EVP_MAX_MD_SIZE]; + BIGNUM *r = NULL, *s = NULL; REQUIRE(key->key_alg == DST_ALG_ECDSA256 || key->key_alg == DST_ALG_ECDSA384); @@ -276,14 +268,13 @@ err: } static bool -opensslecdsa_compare(const dst_key_t *key1, const dst_key_t *key2) -{ - bool ret; - int status; - EVP_PKEY * pkey1 = key1->keydata.pkey; - EVP_PKEY * pkey2 = key2->keydata.pkey; - EC_KEY * eckey1 = NULL; - EC_KEY * eckey2 = NULL; +opensslecdsa_compare(const dst_key_t *key1, const dst_key_t *key2) { + bool ret; + int status; + EVP_PKEY *pkey1 = key1->keydata.pkey; + EVP_PKEY *pkey2 = key2->keydata.pkey; + EC_KEY *eckey1 = NULL; + EC_KEY *eckey2 = NULL; const BIGNUM *priv1, *priv2; if (pkey1 == NULL && pkey2 == NULL) { @@ -328,12 +319,11 @@ err: } static isc_result_t -opensslecdsa_generate(dst_key_t *key, int unused, void (*callback)(int)) -{ +opensslecdsa_generate(dst_key_t *key, int unused, void (*callback)(int)) { isc_result_t ret; - EVP_PKEY * pkey; - EC_KEY * eckey = NULL; - int group_nid; + EVP_PKEY *pkey; + EC_KEY *eckey = NULL; + int group_nid; REQUIRE(key->key_alg == DST_ALG_ECDSA256 || key->key_alg == DST_ALG_ECDSA384); @@ -376,11 +366,10 @@ err: } static bool -opensslecdsa_isprivate(const dst_key_t *key) -{ - bool ret; +opensslecdsa_isprivate(const dst_key_t *key) { + bool ret; EVP_PKEY *pkey = key->keydata.pkey; - EC_KEY * eckey = EVP_PKEY_get1_EC_KEY(pkey); + EC_KEY *eckey = EVP_PKEY_get1_EC_KEY(pkey); ret = (eckey != NULL && EC_KEY_get0_private_key(eckey) != NULL); if (eckey != NULL) { @@ -390,8 +379,7 @@ opensslecdsa_isprivate(const dst_key_t *key) } static void -opensslecdsa_destroy(dst_key_t *key) -{ +opensslecdsa_destroy(dst_key_t *key) { EVP_PKEY *pkey = key->keydata.pkey; EVP_PKEY_free(pkey); @@ -399,15 +387,14 @@ opensslecdsa_destroy(dst_key_t *key) } static isc_result_t -opensslecdsa_todns(const dst_key_t *key, isc_buffer_t *data) -{ - isc_result_t ret; - EVP_PKEY * pkey; - EC_KEY * eckey = NULL; - isc_region_t r; - int len; +opensslecdsa_todns(const dst_key_t *key, isc_buffer_t *data) { + isc_result_t ret; + EVP_PKEY *pkey; + EC_KEY *eckey = NULL; + isc_region_t r; + int len; unsigned char *cp; - unsigned char buf[DNS_KEY_ECDSA384SIZE + 1]; + unsigned char buf[DNS_KEY_ECDSA384SIZE + 1]; REQUIRE(key->keydata.pkey != NULL); @@ -438,16 +425,15 @@ err: } static isc_result_t -opensslecdsa_fromdns(dst_key_t *key, isc_buffer_t *data) -{ - isc_result_t ret; - EVP_PKEY * pkey; - EC_KEY * eckey = NULL; - isc_region_t r; - int group_nid; - unsigned int len; +opensslecdsa_fromdns(dst_key_t *key, isc_buffer_t *data) { + isc_result_t ret; + EVP_PKEY *pkey; + EC_KEY *eckey = NULL; + isc_region_t r; + int group_nid; + unsigned int len; const unsigned char *cp; - unsigned char buf[DNS_KEY_ECDSA384SIZE + 1]; + unsigned char buf[DNS_KEY_ECDSA384SIZE + 1]; REQUIRE(key->key_alg == DST_ALG_ECDSA256 || key->key_alg == DST_ALG_ECDSA384); @@ -506,13 +492,12 @@ err: } static isc_result_t -opensslecdsa_tofile(const dst_key_t *key, const char *directory) -{ - isc_result_t ret; - EVP_PKEY * pkey; - EC_KEY * eckey = NULL; - const BIGNUM * privkey; - dst_private_t priv; +opensslecdsa_tofile(const dst_key_t *key, const char *directory) { + isc_result_t ret; + EVP_PKEY *pkey; + EC_KEY *eckey = NULL; + const BIGNUM *privkey; + dst_private_t priv; unsigned char *buf = NULL; if (key->keydata.pkey == NULL) { @@ -552,11 +537,10 @@ err: } static isc_result_t -ecdsa_check(EC_KEY *eckey, dst_key_t *pub) -{ - isc_result_t ret = ISC_R_FAILURE; - EVP_PKEY * pkey; - EC_KEY * pubeckey = NULL; +ecdsa_check(EC_KEY *eckey, dst_key_t *pub) { + isc_result_t ret = ISC_R_FAILURE; + EVP_PKEY *pkey; + EC_KEY *pubeckey = NULL; const EC_POINT *pubkey; if (pub == NULL) { @@ -587,15 +571,14 @@ err: } static isc_result_t -opensslecdsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) -{ +opensslecdsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) { dst_private_t priv; - isc_result_t ret; - EVP_PKEY * pkey; - EC_KEY * eckey = NULL; - BIGNUM * privkey = NULL; - int group_nid; - isc_mem_t * mctx = key->mctx; + isc_result_t ret; + EVP_PKEY *pkey; + EC_KEY *eckey = NULL; + BIGNUM *privkey = NULL; + int group_nid; + isc_mem_t *mctx = key->mctx; REQUIRE(key->key_alg == DST_ALG_ECDSA256 || key->key_alg == DST_ALG_ECDSA384); @@ -631,8 +614,8 @@ opensslecdsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); } - privkey = - BN_bin2bn(priv.elements[0].data, priv.elements[0].length, NULL); + privkey = BN_bin2bn(priv.elements[0].data, priv.elements[0].length, + NULL); if (privkey == NULL) { DST_RET(ISC_R_NOMEMORY); } @@ -696,8 +679,7 @@ static dst_func_t opensslecdsa_functions = { }; isc_result_t -dst__opensslecdsa_init(dst_func_t **funcp) -{ +dst__opensslecdsa_init(dst_func_t **funcp) { REQUIRE(funcp != NULL); if (*funcp == NULL) { *funcp = &opensslecdsa_functions; diff --git a/lib/dns/openssleddsa_link.c b/lib/dns/openssleddsa_link.c index 08777a31b7..2bcbbd20a5 100644 --- a/lib/dns/openssleddsa_link.c +++ b/lib/dns/openssleddsa_link.c @@ -55,9 +55,8 @@ static const unsigned char ed25519_pub_prefix[] = { 0x30, 0x2a, 0x30, 0x05, 0x70, 0x03, 0x21, 0x00 }; static EVP_PKEY * -pub_ed25519_to_ossl(const unsigned char *key) -{ - unsigned char buf[PUBPREFIXLEN + DNS_KEY_ED25519SIZE]; +pub_ed25519_to_ossl(const unsigned char *key) { + unsigned char buf[PUBPREFIXLEN + DNS_KEY_ED25519SIZE]; const unsigned char *p; memmove(buf, ed25519_pub_prefix, PUBPREFIXLEN); @@ -67,11 +66,10 @@ pub_ed25519_to_ossl(const unsigned char *key) } static isc_result_t -pub_ed25519_from_ossl(EVP_PKEY *pkey, unsigned char *key) -{ - unsigned char buf[PUBPREFIXLEN + DNS_KEY_ED25519SIZE]; +pub_ed25519_from_ossl(EVP_PKEY *pkey, unsigned char *key) { + unsigned char buf[PUBPREFIXLEN + DNS_KEY_ED25519SIZE]; unsigned char *p; - int len; + int len; len = i2d_PUBKEY(pkey, NULL); if ((len <= DNS_KEY_ED25519SIZE) || @@ -96,9 +94,8 @@ static const unsigned char ed25519_priv_prefix[] = { 0x30, 0x2e, 0x02, 0x01, 0x04, 0x22, 0x04, 0x20 }; static EVP_PKEY * -priv_ed25519_to_ossl(const unsigned char *key) -{ - unsigned char buf[PRIVPREFIXLEN + DNS_KEY_ED25519SIZE]; +priv_ed25519_to_ossl(const unsigned char *key) { + unsigned char buf[PRIVPREFIXLEN + DNS_KEY_ED25519SIZE]; const unsigned char *p; memmove(buf, ed25519_priv_prefix, PRIVPREFIXLEN); @@ -109,11 +106,10 @@ priv_ed25519_to_ossl(const unsigned char *key) } static isc_result_t -priv_ed25519_from_ossl(EVP_PKEY *pkey, unsigned char *key) -{ - unsigned char buf[PRIVPREFIXLEN + DNS_KEY_ED25519SIZE]; +priv_ed25519_from_ossl(EVP_PKEY *pkey, unsigned char *key) { + unsigned char buf[PRIVPREFIXLEN + DNS_KEY_ED25519SIZE]; unsigned char *p; - int len; + int len; len = i2d_PrivateKey(pkey, NULL); if ((len <= DNS_KEY_ED25519SIZE) || @@ -133,30 +129,26 @@ priv_ed25519_from_ossl(EVP_PKEY *pkey, unsigned char *key) #else /* HAVE_OPENSSL_ED25519 */ static EVP_PKEY * -pub_ed25519_to_ossl(const unsigned char *key) -{ +pub_ed25519_to_ossl(const unsigned char *key) { UNUSED(key); return (NULL); } static isc_result_t -pub_ed25519_from_ossl(EVP_PKEY *pkey, unsigned char *key) -{ +pub_ed25519_from_ossl(EVP_PKEY *pkey, unsigned char *key) { UNUSED(pkey); UNUSED(key); return (ISC_R_NOTIMPLEMENTED); } static EVP_PKEY * -priv_ed25519_to_ossl(const unsigned char *key) -{ +priv_ed25519_to_ossl(const unsigned char *key) { UNUSED(key); return (NULL); } static isc_result_t -priv_ed25519_from_ossl(EVP_PKEY *pkey, unsigned char *key) -{ +priv_ed25519_from_ossl(EVP_PKEY *pkey, unsigned char *key) { UNUSED(pkey); UNUSED(key); return (ISC_R_NOTIMPLEMENTED); @@ -175,9 +167,8 @@ static const unsigned char ed448_pub_prefix[] = { 0x30, 0x43, 0x30, 0x05, 0x71, 0x03, 0x3a, 0x00 }; static EVP_PKEY * -pub_ed448_to_ossl(const unsigned char *key) -{ - unsigned char buf[PUBPREFIXLEN + DNS_KEY_ED448SIZE]; +pub_ed448_to_ossl(const unsigned char *key) { + unsigned char buf[PUBPREFIXLEN + DNS_KEY_ED448SIZE]; const unsigned char *p; memmove(buf, ed448_pub_prefix, PUBPREFIXLEN); @@ -187,11 +178,10 @@ pub_ed448_to_ossl(const unsigned char *key) } static isc_result_t -pub_ed448_from_ossl(EVP_PKEY *pkey, unsigned char *key) -{ - unsigned char buf[PUBPREFIXLEN + DNS_KEY_ED448SIZE]; +pub_ed448_from_ossl(EVP_PKEY *pkey, unsigned char *key) { + unsigned char buf[PUBPREFIXLEN + DNS_KEY_ED448SIZE]; unsigned char *p; - int len; + int len; len = i2d_PUBKEY(pkey, NULL); if ((len <= DNS_KEY_ED448SIZE) || @@ -214,9 +204,8 @@ static const unsigned char ed448_priv_prefix[] = { 0x30, 0x47, 0x02, 0x01, 0x04, 0x3b, 0x04, 0x39 }; static EVP_PKEY * -priv_ed448_to_ossl(const unsigned char *key) -{ - unsigned char buf[PRIVPREFIXLEN + DNS_KEY_ED448SIZE]; +priv_ed448_to_ossl(const unsigned char *key) { + unsigned char buf[PRIVPREFIXLEN + DNS_KEY_ED448SIZE]; const unsigned char *p; memmove(buf, ed448_priv_prefix, PRIVPREFIXLEN); @@ -227,11 +216,10 @@ priv_ed448_to_ossl(const unsigned char *key) } static isc_result_t -priv_ed448_from_ossl(EVP_PKEY *pkey, unsigned char *key) -{ - unsigned char buf[PRIVPREFIXLEN + DNS_KEY_ED448SIZE]; +priv_ed448_from_ossl(EVP_PKEY *pkey, unsigned char *key) { + unsigned char buf[PRIVPREFIXLEN + DNS_KEY_ED448SIZE]; unsigned char *p; - int len; + int len; len = i2d_PrivateKey(pkey, NULL); if ((len <= DNS_KEY_ED448SIZE) || @@ -251,30 +239,26 @@ priv_ed448_from_ossl(EVP_PKEY *pkey, unsigned char *key) #else /* HAVE_OPENSSL_ED448 */ static EVP_PKEY * -pub_ed448_to_ossl(const unsigned char *key) -{ +pub_ed448_to_ossl(const unsigned char *key) { UNUSED(key); return (NULL); } static isc_result_t -pub_ed448_from_ossl(EVP_PKEY *pkey, unsigned char *key) -{ +pub_ed448_from_ossl(EVP_PKEY *pkey, unsigned char *key) { UNUSED(pkey); UNUSED(key); return (ISC_R_NOTIMPLEMENTED); } static EVP_PKEY * -priv_ed448_to_ossl(const unsigned char *key) -{ +priv_ed448_to_ossl(const unsigned char *key) { UNUSED(key); return (NULL); } static isc_result_t -priv_ed448_from_ossl(EVP_PKEY *pkey, unsigned char *key) -{ +priv_ed448_from_ossl(EVP_PKEY *pkey, unsigned char *key) { UNUSED(pkey); UNUSED(key); return (ISC_R_NOTIMPLEMENTED); @@ -282,12 +266,11 @@ 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) -{ +openssleddsa_createctx(dst_key_t *key, dst_context_t *dctx) { isc_buffer_t *buf = NULL; UNUSED(key); @@ -301,8 +284,7 @@ openssleddsa_createctx(dst_key_t *key, dst_context_t *dctx) } static void -openssleddsa_destroyctx(dst_context_t *dctx) -{ +openssleddsa_destroyctx(dst_context_t *dctx) { isc_buffer_t *buf = (isc_buffer_t *)dctx->ctxdata.generic; REQUIRE(dctx->key->key_alg == DST_ALG_ED25519 || @@ -314,13 +296,12 @@ openssleddsa_destroyctx(dst_context_t *dctx) } static isc_result_t -openssleddsa_adddata(dst_context_t *dctx, const isc_region_t *data) -{ +openssleddsa_adddata(dst_context_t *dctx, const isc_region_t *data) { isc_buffer_t *buf = (isc_buffer_t *)dctx->ctxdata.generic; isc_buffer_t *nbuf = NULL; - isc_region_t r; - unsigned int length; - isc_result_t result; + isc_region_t r; + unsigned int length; + isc_result_t result; REQUIRE(dctx->key->key_alg == DST_ALG_ED25519 || dctx->key->key_alg == DST_ALG_ED448); @@ -342,16 +323,15 @@ openssleddsa_adddata(dst_context_t *dctx, const isc_region_t *data) } static isc_result_t -openssleddsa_sign(dst_context_t *dctx, isc_buffer_t *sig) -{ - isc_result_t ret; - dst_key_t * key = dctx->key; - isc_region_t tbsreg; - isc_region_t sigreg; - EVP_PKEY * pkey = key->keydata.pkey; - EVP_MD_CTX * ctx = EVP_MD_CTX_new(); +openssleddsa_sign(dst_context_t *dctx, isc_buffer_t *sig) { + isc_result_t ret; + dst_key_t *key = dctx->key; + isc_region_t tbsreg; + isc_region_t sigreg; + EVP_PKEY *pkey = key->keydata.pkey; + EVP_MD_CTX *ctx = EVP_MD_CTX_new(); isc_buffer_t *buf = (isc_buffer_t *)dctx->ctxdata.generic; - size_t siglen; + size_t siglen; REQUIRE(key->key_alg == DST_ALG_ED25519 || key->key_alg == DST_ALG_ED448); @@ -394,16 +374,15 @@ err: } static isc_result_t -openssleddsa_verify(dst_context_t *dctx, const isc_region_t *sig) -{ - isc_result_t ret; - dst_key_t * key = dctx->key; - int status; - isc_region_t tbsreg; - EVP_PKEY * pkey = key->keydata.pkey; - EVP_MD_CTX * ctx = EVP_MD_CTX_new(); +openssleddsa_verify(dst_context_t *dctx, const isc_region_t *sig) { + isc_result_t ret; + dst_key_t *key = dctx->key; + int status; + isc_region_t tbsreg; + EVP_PKEY *pkey = key->keydata.pkey; + EVP_MD_CTX *ctx = EVP_MD_CTX_new(); isc_buffer_t *buf = (isc_buffer_t *)dctx->ctxdata.generic; - unsigned int siglen = 0; + unsigned int siglen = 0; REQUIRE(key->key_alg == DST_ALG_ED25519 || key->key_alg == DST_ALG_ED448); @@ -462,9 +441,8 @@ err: } static bool -openssleddsa_compare(const dst_key_t *key1, const dst_key_t *key2) -{ - int status; +openssleddsa_compare(const dst_key_t *key1, const dst_key_t *key2) { + int status; EVP_PKEY *pkey1 = key1->keydata.pkey; EVP_PKEY *pkey2 = key2->keydata.pkey; @@ -482,12 +460,11 @@ openssleddsa_compare(const dst_key_t *key1, const dst_key_t *key2) } static isc_result_t -openssleddsa_generate(dst_key_t *key, int unused, void (*callback)(int)) -{ - isc_result_t ret; - EVP_PKEY * pkey = NULL; +openssleddsa_generate(dst_key_t *key, int unused, void (*callback)(int)) { + isc_result_t ret; + EVP_PKEY *pkey = NULL; EVP_PKEY_CTX *ctx = NULL; - int nid = 0, status; + int nid = 0, status; REQUIRE(key->key_alg == DST_ALG_ED25519 || key->key_alg == DST_ALG_ED448); @@ -537,10 +514,9 @@ err: } static bool -openssleddsa_isprivate(const dst_key_t *key) -{ - EVP_PKEY * pkey = key->keydata.pkey; - int len; +openssleddsa_isprivate(const dst_key_t *key) { + EVP_PKEY *pkey = key->keydata.pkey; + int len; unsigned long err; if (pkey == NULL) { @@ -560,8 +536,7 @@ openssleddsa_isprivate(const dst_key_t *key) } static void -openssleddsa_destroy(dst_key_t *key) -{ +openssleddsa_destroy(dst_key_t *key) { EVP_PKEY *pkey = key->keydata.pkey; EVP_PKEY_free(pkey); @@ -569,9 +544,8 @@ openssleddsa_destroy(dst_key_t *key) } static isc_result_t -openssleddsa_todns(const dst_key_t *key, isc_buffer_t *data) -{ - EVP_PKEY * pkey = key->keydata.pkey; +openssleddsa_todns(const dst_key_t *key, isc_buffer_t *data) { + EVP_PKEY *pkey = key->keydata.pkey; isc_region_t r; isc_result_t result; @@ -606,9 +580,8 @@ openssleddsa_todns(const dst_key_t *key, isc_buffer_t *data) } static isc_result_t -openssleddsa_fromdns(dst_key_t *key, isc_buffer_t *data) -{ - EVP_PKEY * pkey; +openssleddsa_fromdns(dst_key_t *key, isc_buffer_t *data) { + EVP_PKEY *pkey; isc_region_t r; unsigned int len; @@ -642,13 +615,12 @@ openssleddsa_fromdns(dst_key_t *key, isc_buffer_t *data) } static isc_result_t -openssleddsa_tofile(const dst_key_t *key, const char *directory) -{ - isc_result_t ret; - EVP_PKEY * pkey; - dst_private_t priv; +openssleddsa_tofile(const dst_key_t *key, const char *directory) { + isc_result_t ret; + EVP_PKEY *pkey; + dst_private_t priv; unsigned char *buf = NULL; - unsigned int len; + unsigned int len; REQUIRE(key->key_alg == DST_ALG_ED25519 || key->key_alg == DST_ALG_ED448); @@ -697,8 +669,7 @@ err: } static isc_result_t -eddsa_check(EVP_PKEY *privkey, dst_key_t *pub) -{ +eddsa_check(EVP_PKEY *privkey, dst_key_t *pub) { EVP_PKEY *pkey; if (pub == NULL) { @@ -715,13 +686,12 @@ eddsa_check(EVP_PKEY *privkey, dst_key_t *pub) } static isc_result_t -openssleddsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) -{ +openssleddsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) { dst_private_t priv; - isc_result_t ret; - EVP_PKEY * pkey = NULL; - unsigned int len; - isc_mem_t * mctx = key->mctx; + isc_result_t ret; + EVP_PKEY *pkey = NULL; + unsigned int len; + isc_mem_t *mctx = key->mctx; REQUIRE(key->key_alg == DST_ALG_ED25519 || key->key_alg == DST_ALG_ED448); @@ -801,8 +771,7 @@ static dst_func_t openssleddsa_functions = { }; isc_result_t -dst__openssleddsa_init(dst_func_t **funcp) -{ +dst__openssleddsa_init(dst_func_t **funcp) { REQUIRE(funcp != NULL); if (*funcp == NULL) { *funcp = &openssleddsa_functions; diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c index d7eae209fa..9455424722 100644 --- a/lib/dns/opensslrsa_link.c +++ b/lib/dns/opensslrsa_link.c @@ -57,8 +57,7 @@ #if !HAVE_RSA_SET0_KEY /* From OpenSSL 1.1.0 */ static int -RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) -{ +RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) { /* * If the fields n and e in r are NULL, the corresponding input * parameters MUST be non-NULL for n and e. d may be @@ -85,8 +84,7 @@ RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) } static int -RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q) -{ +RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q) { /* * If the fields p and q in r are NULL, the corresponding input * parameters MUST be non-NULL. @@ -108,15 +106,15 @@ RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q) } static int -RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp) -{ +RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp) { /* * If the fields dmp1, dmq1 and iqmp in r are NULL, the * corresponding input parameters MUST be non-NULL. */ if ((r->dmp1 == NULL && dmp1 == NULL) || (r->dmq1 == NULL && dmq1 == NULL) || - (r->iqmp == NULL && iqmp == NULL)) { + (r->iqmp == NULL && iqmp == NULL)) + { return (0); } @@ -137,8 +135,8 @@ RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp) } static void -RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) -{ +RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, + const BIGNUM **d) { if (n != NULL) { *n = r->n; } @@ -151,8 +149,7 @@ RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) } static void -RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q) -{ +RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q) { if (p != NULL) { *p = r->p; } @@ -163,8 +160,7 @@ RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q) static void RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const BIGNUM **dmq1, - const BIGNUM **iqmp) -{ + const BIGNUM **iqmp) { if (dmp1 != NULL) { *dmp1 = r->dmp1; } @@ -177,20 +173,17 @@ RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const BIGNUM **dmq1, } static int -RSA_test_flags(const RSA *r, int flags) -{ +RSA_test_flags(const RSA *r, int flags) { return (r->flags & 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) -{ - EVP_MD_CTX * evp_md_ctx; +opensslrsa_createctx(dst_key_t *key, dst_context_t *dctx) { + EVP_MD_CTX *evp_md_ctx; const EVP_MD *type = NULL; UNUSED(key); @@ -212,8 +205,8 @@ opensslrsa_createctx(dst_key_t *key, dst_context_t *dctx) break; case DST_ALG_RSASHA256: /* From RFC 5702 */ - if ((dctx->key->key_size < 512) || - (dctx->key->key_size > 4096)) { + if ((dctx->key->key_size < 512) || (dctx->key->key_size > 4096)) + { return (ISC_R_FAILURE); } break; @@ -261,8 +254,7 @@ opensslrsa_createctx(dst_key_t *key, dst_context_t *dctx) } static void -opensslrsa_destroyctx(dst_context_t *dctx) -{ +opensslrsa_destroyctx(dst_context_t *dctx) { EVP_MD_CTX *evp_md_ctx = dctx->ctxdata.evp_md_ctx; REQUIRE(dctx->key->key_alg == DST_ALG_RSASHA1 || @@ -277,8 +269,7 @@ opensslrsa_destroyctx(dst_context_t *dctx) } static isc_result_t -opensslrsa_adddata(dst_context_t *dctx, const isc_region_t *data) -{ +opensslrsa_adddata(dst_context_t *dctx, const isc_region_t *data) { EVP_MD_CTX *evp_md_ctx = dctx->ctxdata.evp_md_ctx; REQUIRE(dctx->key->key_alg == DST_ALG_RSASHA1 || @@ -294,13 +285,12 @@ opensslrsa_adddata(dst_context_t *dctx, const isc_region_t *data) } static isc_result_t -opensslrsa_sign(dst_context_t *dctx, isc_buffer_t *sig) -{ - dst_key_t * key = dctx->key; +opensslrsa_sign(dst_context_t *dctx, isc_buffer_t *sig) { + dst_key_t *key = dctx->key; isc_region_t r; unsigned int siglen = 0; - EVP_MD_CTX * evp_md_ctx = dctx->ctxdata.evp_md_ctx; - EVP_PKEY * pkey = key->keydata.pkey; + EVP_MD_CTX *evp_md_ctx = dctx->ctxdata.evp_md_ctx; + EVP_PKEY *pkey = key->keydata.pkey; REQUIRE(dctx->key->key_alg == DST_ALG_RSASHA1 || dctx->key->key_alg == DST_ALG_NSEC3RSASHA1 || @@ -324,15 +314,14 @@ opensslrsa_sign(dst_context_t *dctx, isc_buffer_t *sig) } static isc_result_t -opensslrsa_verify2(dst_context_t *dctx, int maxbits, const isc_region_t *sig) -{ - dst_key_t * key = dctx->key; - int status = 0; +opensslrsa_verify2(dst_context_t *dctx, int maxbits, const isc_region_t *sig) { + dst_key_t *key = dctx->key; + int status = 0; const BIGNUM *e = NULL; - EVP_MD_CTX * evp_md_ctx = dctx->ctxdata.evp_md_ctx; - EVP_PKEY * pkey = key->keydata.pkey; - RSA * rsa; - int bits; + EVP_MD_CTX *evp_md_ctx = dctx->ctxdata.evp_md_ctx; + EVP_PKEY *pkey = key->keydata.pkey; + RSA *rsa; + int bits; REQUIRE(dctx->key->key_alg == DST_ALG_RSASHA1 || dctx->key->key_alg == DST_ALG_NSEC3RSASHA1 || @@ -364,22 +353,20 @@ opensslrsa_verify2(dst_context_t *dctx, int maxbits, const isc_region_t *sig) } static isc_result_t -opensslrsa_verify(dst_context_t *dctx, const isc_region_t *sig) -{ +opensslrsa_verify(dst_context_t *dctx, const isc_region_t *sig) { return (opensslrsa_verify2(dctx, 0, sig)); } static bool -opensslrsa_compare(const dst_key_t *key1, const dst_key_t *key2) -{ - int status; - RSA * rsa1 = NULL, *rsa2 = NULL; +opensslrsa_compare(const dst_key_t *key1, const dst_key_t *key2) { + int status; + RSA *rsa1 = NULL, *rsa2 = NULL; const BIGNUM *n1 = NULL, *n2 = NULL; const BIGNUM *e1 = NULL, *e2 = NULL; const BIGNUM *d1 = NULL, *d2 = NULL; const BIGNUM *p1 = NULL, *p2 = NULL; const BIGNUM *q1 = NULL, *q2 = NULL; - EVP_PKEY * pkey1, *pkey2; + EVP_PKEY *pkey1, *pkey2; pkey1 = key1->keydata.pkey; pkey2 = key2->keydata.pkey; @@ -411,9 +398,11 @@ opensslrsa_compare(const dst_key_t *key1, const dst_key_t *key2) } if (RSA_test_flags(rsa1, RSA_FLAG_EXT_PKEY) != 0 || - RSA_test_flags(rsa2, RSA_FLAG_EXT_PKEY) != 0) { + RSA_test_flags(rsa2, RSA_FLAG_EXT_PKEY) != 0) + { if (RSA_test_flags(rsa1, RSA_FLAG_EXT_PKEY) == 0 || - RSA_test_flags(rsa2, RSA_FLAG_EXT_PKEY) == 0) { + RSA_test_flags(rsa2, RSA_FLAG_EXT_PKEY) == 0) + { return (false); } /* @@ -438,8 +427,7 @@ opensslrsa_compare(const dst_key_t *key1, const dst_key_t *key2) } static int -progress_cb(int p, int n, BN_GENCB *cb) -{ +progress_cb(int p, int n, BN_GENCB *cb) { union { void *dptr; void (*fptr)(int); @@ -455,14 +443,13 @@ progress_cb(int p, int n, BN_GENCB *cb) } static isc_result_t -opensslrsa_generate(dst_key_t *key, int exp, void (*callback)(int)) -{ +opensslrsa_generate(dst_key_t *key, int exp, void (*callback)(int)) { isc_result_t ret = DST_R_OPENSSLFAILURE; union { void *dptr; void (*fptr)(int); } u; - RSA * rsa = RSA_new(); + RSA *rsa = RSA_new(); BIGNUM *e = BN_new(); #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) BN_GENCB _cb; @@ -559,10 +546,9 @@ err: } static bool -opensslrsa_isprivate(const dst_key_t *key) -{ +opensslrsa_isprivate(const dst_key_t *key) { const BIGNUM *d = NULL; - RSA * rsa = EVP_PKEY_get1_RSA(key->keydata.pkey); + RSA *rsa = EVP_PKEY_get1_RSA(key->keydata.pkey); INSIST(rsa != NULL); RSA_free(rsa); /* key->keydata.pkey still has a reference so rsa is still valid. */ @@ -574,22 +560,20 @@ opensslrsa_isprivate(const dst_key_t *key) } static void -opensslrsa_destroy(dst_key_t *key) -{ +opensslrsa_destroy(dst_key_t *key) { EVP_PKEY *pkey = key->keydata.pkey; EVP_PKEY_free(pkey); key->keydata.pkey = NULL; } static isc_result_t -opensslrsa_todns(const dst_key_t *key, isc_buffer_t *data) -{ - isc_region_t r; - unsigned int e_bytes; - unsigned int mod_bytes; - isc_result_t ret; - RSA * rsa; - EVP_PKEY * pkey; +opensslrsa_todns(const dst_key_t *key, isc_buffer_t *data) { + isc_region_t r; + unsigned int e_bytes; + unsigned int mod_bytes; + isc_result_t ret; + RSA *rsa; + EVP_PKEY *pkey; const BIGNUM *e = NULL, *n = NULL; REQUIRE(key->keydata.pkey != NULL); @@ -639,14 +623,13 @@ err: } static isc_result_t -opensslrsa_fromdns(dst_key_t *key, isc_buffer_t *data) -{ - RSA * rsa; +opensslrsa_fromdns(dst_key_t *key, isc_buffer_t *data) { + RSA *rsa; isc_region_t r; unsigned int e_bytes; unsigned int length; - EVP_PKEY * pkey; - BIGNUM * e = NULL, *n = NULL; + EVP_PKEY *pkey; + BIGNUM *e = NULL, *n = NULL; isc_buffer_remainingregion(data, &r); if (r.length == 0) { @@ -715,16 +698,15 @@ opensslrsa_fromdns(dst_key_t *key, isc_buffer_t *data) } static isc_result_t -opensslrsa_tofile(const dst_key_t *key, const char *directory) -{ - int i; - RSA * rsa; - dst_private_t priv; +opensslrsa_tofile(const dst_key_t *key, const char *directory) { + int i; + RSA *rsa; + dst_private_t priv; unsigned char *bufs[8]; - isc_result_t result; - const BIGNUM * n = NULL, *e = NULL, *d = NULL; - const BIGNUM * p = NULL, *q = NULL; - const BIGNUM * dmp1 = NULL, *dmq1 = NULL, *iqmp = NULL; + isc_result_t result; + const BIGNUM *n = NULL, *e = NULL, *d = NULL; + const BIGNUM *p = NULL, *q = NULL; + const BIGNUM *dmp1 = NULL, *dmq1 = NULL, *iqmp = NULL; if (key->keydata.pkey == NULL) { return (DST_R_NULLKEY); @@ -813,16 +795,16 @@ opensslrsa_tofile(const dst_key_t *key, const char *directory) if (key->engine != NULL) { priv.elements[i].tag = TAG_RSA_ENGINE; - priv.elements[i].length = - (unsigned short)strlen(key->engine) + 1; + priv.elements[i].length = (unsigned short)strlen(key->engine) + + 1; priv.elements[i].data = (unsigned char *)key->engine; i++; } if (key->label != NULL) { priv.elements[i].tag = TAG_RSA_LABEL; - priv.elements[i].length = - (unsigned short)strlen(key->label) + 1; + priv.elements[i].length = (unsigned short)strlen(key->label) + + 1; priv.elements[i].data = (unsigned char *)key->label; i++; } @@ -841,11 +823,10 @@ fail: } static isc_result_t -rsa_check(RSA *rsa, RSA *pub) -{ +rsa_check(RSA *rsa, RSA *pub) { const BIGNUM *n1 = NULL, *n2 = NULL; const BIGNUM *e1 = NULL, *e2 = NULL; - BIGNUM * n = NULL, *e = NULL; + BIGNUM *n = NULL, *e = NULL; /* * Public parameters should be the same but if they are not set @@ -885,22 +866,21 @@ rsa_check(RSA *rsa, RSA *pub) } static isc_result_t -opensslrsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) -{ +opensslrsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) { dst_private_t priv; - isc_result_t ret; - int i; - RSA * rsa = NULL, *pubrsa = NULL; + isc_result_t ret; + int i; + RSA *rsa = NULL, *pubrsa = NULL; #if !defined(OPENSSL_NO_ENGINE) - ENGINE * ep = NULL; + ENGINE *ep = NULL; const BIGNUM *ex = NULL; #endif /* if !defined(OPENSSL_NO_ENGINE) */ - isc_mem_t * mctx = key->mctx; + isc_mem_t *mctx = key->mctx; const char *engine = NULL, *label = NULL; - EVP_PKEY * pkey = NULL; - BIGNUM * n = NULL, *e = NULL, *d = NULL; - BIGNUM * p = NULL, *q = NULL; - BIGNUM * dmp1 = NULL, *dmq1 = NULL, *iqmp = NULL; + EVP_PKEY *pkey = NULL; + BIGNUM *n = NULL, *e = NULL, *d = NULL; + BIGNUM *p = NULL, *q = NULL; + BIGNUM *dmp1 = NULL, *dmq1 = NULL, *iqmp = NULL; /* read private key file */ ret = dst__privstruct_parse(key, DST_ALG_RSA, lexer, mctx, &priv); @@ -1107,13 +1087,12 @@ err: static isc_result_t opensslrsa_fromlabel(dst_key_t *key, const char *engine, const char *label, - const char *pin) -{ + const char *pin) { #if !defined(OPENSSL_NO_ENGINE) - ENGINE * e = NULL; - isc_result_t ret; - EVP_PKEY * pkey = NULL; - RSA * rsa = NULL, *pubrsa = NULL; + ENGINE *e = NULL; + isc_result_t ret; + EVP_PKEY *pkey = NULL; + RSA *rsa = NULL, *pubrsa = NULL; const BIGNUM *ex = NULL; UNUSED(pin); @@ -1204,8 +1183,7 @@ static dst_func_t opensslrsa_functions = { }; isc_result_t -dst__opensslrsa_init(dst_func_t **funcp, unsigned char algorithm) -{ +dst__opensslrsa_init(dst_func_t **funcp, unsigned char algorithm) { REQUIRE(funcp != NULL); UNUSED(algorithm); diff --git a/lib/dns/order.c b/lib/dns/order.c index ea986dcb34..6508bcb928 100644 --- a/lib/dns/order.c +++ b/lib/dns/order.c @@ -27,26 +27,25 @@ typedef struct dns_order_ent dns_order_ent_t; struct dns_order_ent { - dns_fixedname_t name; + dns_fixedname_t name; dns_rdataclass_t rdclass; - dns_rdatatype_t rdtype; - unsigned int mode; + dns_rdatatype_t rdtype; + unsigned int mode; ISC_LINK(dns_order_ent_t) link; }; struct dns_order { - unsigned int magic; + unsigned int magic; isc_refcount_t references; ISC_LIST(dns_order_ent_t) ents; isc_mem_t *mctx; }; -#define DNS_ORDER_MAGIC ISC_MAGIC('O', 'r', 'd', 'r') +#define DNS_ORDER_MAGIC ISC_MAGIC('O', 'r', 'd', 'r') #define DNS_ORDER_VALID(order) ISC_MAGIC_VALID(order, DNS_ORDER_MAGIC) isc_result_t -dns_order_create(isc_mem_t *mctx, dns_order_t **orderp) -{ +dns_order_create(isc_mem_t *mctx, dns_order_t **orderp) { dns_order_t *order; REQUIRE(orderp != NULL && *orderp == NULL); @@ -68,8 +67,7 @@ dns_order_create(isc_mem_t *mctx, dns_order_t **orderp) isc_result_t dns_order_add(dns_order_t *order, const dns_name_t *name, dns_rdatatype_t rdtype, dns_rdataclass_t rdclass, - unsigned int mode) -{ + unsigned int mode) { dns_order_ent_t *ent; REQUIRE(DNS_ORDER_VALID(order)); @@ -90,8 +88,7 @@ dns_order_add(dns_order_t *order, const dns_name_t *name, } static inline bool -match(const dns_name_t *name1, const dns_name_t *name2) -{ +match(const dns_name_t *name1, const dns_name_t *name2) { if (dns_name_iswildcard(name2)) { return (dns_name_matcheswildcard(name1, name2)); } @@ -100,13 +97,13 @@ match(const dns_name_t *name1, const dns_name_t *name2) unsigned int dns_order_find(dns_order_t *order, const dns_name_t *name, - dns_rdatatype_t rdtype, dns_rdataclass_t rdclass) -{ + dns_rdatatype_t rdtype, dns_rdataclass_t rdclass) { dns_order_ent_t *ent; REQUIRE(DNS_ORDER_VALID(order)); for (ent = ISC_LIST_HEAD(order->ents); ent != NULL; - ent = ISC_LIST_NEXT(ent, link)) { + ent = ISC_LIST_NEXT(ent, link)) + { if (ent->rdtype != rdtype && ent->rdtype != dns_rdatatype_any) { continue; } @@ -122,8 +119,7 @@ dns_order_find(dns_order_t *order, const dns_name_t *name, } void -dns_order_attach(dns_order_t *source, dns_order_t **target) -{ +dns_order_attach(dns_order_t *source, dns_order_t **target) { REQUIRE(DNS_ORDER_VALID(source)); REQUIRE(target != NULL && *target == NULL); isc_refcount_increment(&source->references); @@ -131,8 +127,7 @@ dns_order_attach(dns_order_t *source, dns_order_t **target) } void -dns_order_detach(dns_order_t **orderp) -{ +dns_order_detach(dns_order_t **orderp) { REQUIRE(orderp != NULL && DNS_ORDER_VALID(*orderp)); dns_order_t *order; order = *orderp; diff --git a/lib/dns/peer.c b/lib/dns/peer.c index 7596bbb5a0..cf11ddf188 100644 --- a/lib/dns/peer.c +++ b/lib/dns/peer.c @@ -27,34 +27,31 @@ /*% * Bit positions in the dns_peer_t structure flags field */ -#define BOGUS_BIT 0 +#define BOGUS_BIT 0 #define SERVER_TRANSFER_FORMAT_BIT 1 -#define TRANSFERS_BIT 2 -#define PROVIDE_IXFR_BIT 3 -#define REQUEST_IXFR_BIT 4 -#define SUPPORT_EDNS_BIT 5 -#define SERVER_UDPSIZE_BIT 6 -#define SERVER_MAXUDP_BIT 7 -#define REQUEST_NSID_BIT 8 -#define SEND_COOKIE_BIT 9 -#define NOTIFY_DSCP_BIT 10 -#define TRANSFER_DSCP_BIT 11 -#define QUERY_DSCP_BIT 12 -#define REQUEST_EXPIRE_BIT 13 -#define EDNS_VERSION_BIT 14 -#define FORCE_TCP_BIT 15 -#define SERVER_PADDING_BIT 16 -#define REQUEST_TCP_KEEPALIVE_BIT 17 +#define TRANSFERS_BIT 2 +#define PROVIDE_IXFR_BIT 3 +#define REQUEST_IXFR_BIT 4 +#define SUPPORT_EDNS_BIT 5 +#define SERVER_UDPSIZE_BIT 6 +#define SERVER_MAXUDP_BIT 7 +#define REQUEST_NSID_BIT 8 +#define SEND_COOKIE_BIT 9 +#define NOTIFY_DSCP_BIT 10 +#define TRANSFER_DSCP_BIT 11 +#define QUERY_DSCP_BIT 12 +#define REQUEST_EXPIRE_BIT 13 +#define EDNS_VERSION_BIT 14 +#define FORCE_TCP_BIT 15 +#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) -{ +dns_peerlist_new(isc_mem_t *mem, dns_peerlist_t **list) { dns_peerlist_t *l; REQUIRE(list != NULL); @@ -72,8 +69,7 @@ dns_peerlist_new(isc_mem_t *mem, dns_peerlist_t **list) } void -dns_peerlist_attach(dns_peerlist_t *source, dns_peerlist_t **target) -{ +dns_peerlist_attach(dns_peerlist_t *source, dns_peerlist_t **target) { REQUIRE(DNS_PEERLIST_VALID(source)); REQUIRE(target != NULL); REQUIRE(*target == NULL); @@ -84,8 +80,7 @@ dns_peerlist_attach(dns_peerlist_t *source, dns_peerlist_t **target) } void -dns_peerlist_detach(dns_peerlist_t **list) -{ +dns_peerlist_detach(dns_peerlist_t **list) { dns_peerlist_t *plist; REQUIRE(list != NULL); @@ -101,10 +96,9 @@ dns_peerlist_detach(dns_peerlist_t **list) } static void -peerlist_delete(dns_peerlist_t **list) -{ +peerlist_delete(dns_peerlist_t **list) { dns_peerlist_t *l; - dns_peer_t * server, *stmp; + dns_peer_t *server, *stmp; REQUIRE(list != NULL); REQUIRE(DNS_PEERLIST_VALID(*list)); @@ -127,8 +121,7 @@ peerlist_delete(dns_peerlist_t **list) } void -dns_peerlist_addpeer(dns_peerlist_t *peers, dns_peer_t *peer) -{ +dns_peerlist_addpeer(dns_peerlist_t *peers, dns_peer_t *peer) { dns_peer_t *p = NULL; dns_peer_attach(peer, &p); @@ -152,9 +145,8 @@ dns_peerlist_addpeer(dns_peerlist_t *peers, dns_peer_t *peer) isc_result_t dns_peerlist_peerbyaddr(dns_peerlist_t *servers, const isc_netaddr_t *addr, - dns_peer_t **retval) -{ - dns_peer_t * server; + dns_peer_t **retval) { + dns_peer_t *server; isc_result_t res; REQUIRE(retval != NULL); @@ -181,8 +173,7 @@ dns_peerlist_peerbyaddr(dns_peerlist_t *servers, const isc_netaddr_t *addr, } isc_result_t -dns_peerlist_currpeer(dns_peerlist_t *peers, dns_peer_t **retval) -{ +dns_peerlist_currpeer(dns_peerlist_t *peers, dns_peer_t **retval) { dns_peer_t *p = NULL; p = ISC_LIST_TAIL(peers->elements); @@ -193,8 +184,7 @@ dns_peerlist_currpeer(dns_peerlist_t *peers, dns_peer_t **retval) } isc_result_t -dns_peer_new(isc_mem_t *mem, const isc_netaddr_t *addr, dns_peer_t **peerptr) -{ +dns_peer_new(isc_mem_t *mem, const isc_netaddr_t *addr, dns_peer_t **peerptr) { unsigned int prefixlen = 0; REQUIRE(peerptr != NULL); @@ -215,8 +205,7 @@ dns_peer_new(isc_mem_t *mem, const isc_netaddr_t *addr, dns_peer_t **peerptr) isc_result_t dns_peer_newprefix(isc_mem_t *mem, const isc_netaddr_t *addr, - unsigned int prefixlen, dns_peer_t **peerptr) -{ + unsigned int prefixlen, dns_peer_t **peerptr) { dns_peer_t *peer; REQUIRE(peerptr != NULL && *peerptr == NULL); @@ -241,8 +230,7 @@ dns_peer_newprefix(isc_mem_t *mem, const isc_netaddr_t *addr, } void -dns_peer_attach(dns_peer_t *source, dns_peer_t **target) -{ +dns_peer_attach(dns_peer_t *source, dns_peer_t **target) { REQUIRE(DNS_PEER_VALID(source)); REQUIRE(target != NULL); REQUIRE(*target == NULL); @@ -253,8 +241,7 @@ dns_peer_attach(dns_peer_t *source, dns_peer_t **target) } void -dns_peer_detach(dns_peer_t **peer) -{ +dns_peer_detach(dns_peer_t **peer) { dns_peer_t *p; REQUIRE(peer != NULL); @@ -270,10 +257,9 @@ dns_peer_detach(dns_peer_t **peer) } static void -peer_delete(dns_peer_t **peer) -{ +peer_delete(dns_peer_t **peer) { dns_peer_t *p; - isc_mem_t * mem; + isc_mem_t *mem; REQUIRE(peer != NULL); REQUIRE(DNS_PEER_VALID(*peer)); @@ -309,8 +295,7 @@ peer_delete(dns_peer_t **peer) } isc_result_t -dns_peer_setbogus(dns_peer_t *peer, bool newval) -{ +dns_peer_setbogus(dns_peer_t *peer, bool newval) { bool existed; REQUIRE(DNS_PEER_VALID(peer)); @@ -324,8 +309,7 @@ dns_peer_setbogus(dns_peer_t *peer, bool newval) } isc_result_t -dns_peer_getbogus(dns_peer_t *peer, bool *retval) -{ +dns_peer_getbogus(dns_peer_t *peer, bool *retval) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(retval != NULL); @@ -338,8 +322,7 @@ dns_peer_getbogus(dns_peer_t *peer, bool *retval) } isc_result_t -dns_peer_setprovideixfr(dns_peer_t *peer, bool newval) -{ +dns_peer_setprovideixfr(dns_peer_t *peer, bool newval) { bool existed; REQUIRE(DNS_PEER_VALID(peer)); @@ -353,8 +336,7 @@ dns_peer_setprovideixfr(dns_peer_t *peer, bool newval) } isc_result_t -dns_peer_getprovideixfr(dns_peer_t *peer, bool *retval) -{ +dns_peer_getprovideixfr(dns_peer_t *peer, bool *retval) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(retval != NULL); @@ -367,8 +349,7 @@ dns_peer_getprovideixfr(dns_peer_t *peer, bool *retval) } isc_result_t -dns_peer_setrequestixfr(dns_peer_t *peer, bool newval) -{ +dns_peer_setrequestixfr(dns_peer_t *peer, bool newval) { bool existed; REQUIRE(DNS_PEER_VALID(peer)); @@ -382,8 +363,7 @@ dns_peer_setrequestixfr(dns_peer_t *peer, bool newval) } isc_result_t -dns_peer_getrequestixfr(dns_peer_t *peer, bool *retval) -{ +dns_peer_getrequestixfr(dns_peer_t *peer, bool *retval) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(retval != NULL); @@ -396,8 +376,7 @@ dns_peer_getrequestixfr(dns_peer_t *peer, bool *retval) } isc_result_t -dns_peer_setsupportedns(dns_peer_t *peer, bool newval) -{ +dns_peer_setsupportedns(dns_peer_t *peer, bool newval) { bool existed; REQUIRE(DNS_PEER_VALID(peer)); @@ -411,8 +390,7 @@ dns_peer_setsupportedns(dns_peer_t *peer, bool newval) } isc_result_t -dns_peer_getsupportedns(dns_peer_t *peer, bool *retval) -{ +dns_peer_getsupportedns(dns_peer_t *peer, bool *retval) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(retval != NULL); @@ -425,8 +403,7 @@ dns_peer_getsupportedns(dns_peer_t *peer, bool *retval) } isc_result_t -dns_peer_setrequestnsid(dns_peer_t *peer, bool newval) -{ +dns_peer_setrequestnsid(dns_peer_t *peer, bool newval) { bool existed; REQUIRE(DNS_PEER_VALID(peer)); @@ -440,8 +417,7 @@ dns_peer_setrequestnsid(dns_peer_t *peer, bool newval) } isc_result_t -dns_peer_getrequestnsid(dns_peer_t *peer, bool *retval) -{ +dns_peer_getrequestnsid(dns_peer_t *peer, bool *retval) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(retval != NULL); @@ -454,8 +430,7 @@ dns_peer_getrequestnsid(dns_peer_t *peer, bool *retval) } isc_result_t -dns_peer_setsendcookie(dns_peer_t *peer, bool newval) -{ +dns_peer_setsendcookie(dns_peer_t *peer, bool newval) { bool existed; REQUIRE(DNS_PEER_VALID(peer)); @@ -469,8 +444,7 @@ dns_peer_setsendcookie(dns_peer_t *peer, bool newval) } isc_result_t -dns_peer_getsendcookie(dns_peer_t *peer, bool *retval) -{ +dns_peer_getsendcookie(dns_peer_t *peer, bool *retval) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(retval != NULL); @@ -483,8 +457,7 @@ dns_peer_getsendcookie(dns_peer_t *peer, bool *retval) } isc_result_t -dns_peer_setrequestexpire(dns_peer_t *peer, bool newval) -{ +dns_peer_setrequestexpire(dns_peer_t *peer, bool newval) { bool existed; REQUIRE(DNS_PEER_VALID(peer)); @@ -498,8 +471,7 @@ dns_peer_setrequestexpire(dns_peer_t *peer, bool newval) } isc_result_t -dns_peer_getrequestexpire(dns_peer_t *peer, bool *retval) -{ +dns_peer_getrequestexpire(dns_peer_t *peer, bool *retval) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(retval != NULL); @@ -512,8 +484,7 @@ dns_peer_getrequestexpire(dns_peer_t *peer, bool *retval) } isc_result_t -dns_peer_setforcetcp(dns_peer_t *peer, bool newval) -{ +dns_peer_setforcetcp(dns_peer_t *peer, bool newval) { bool existed; REQUIRE(DNS_PEER_VALID(peer)); @@ -527,8 +498,7 @@ dns_peer_setforcetcp(dns_peer_t *peer, bool newval) } isc_result_t -dns_peer_getforcetcp(dns_peer_t *peer, bool *retval) -{ +dns_peer_getforcetcp(dns_peer_t *peer, bool *retval) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(retval != NULL); @@ -541,8 +511,7 @@ dns_peer_getforcetcp(dns_peer_t *peer, bool *retval) } isc_result_t -dns_peer_settcpkeepalive(dns_peer_t *peer, bool newval) -{ +dns_peer_settcpkeepalive(dns_peer_t *peer, bool newval) { bool existed; REQUIRE(DNS_PEER_VALID(peer)); @@ -556,8 +525,7 @@ dns_peer_settcpkeepalive(dns_peer_t *peer, bool newval) } isc_result_t -dns_peer_gettcpkeepalive(dns_peer_t *peer, bool *retval) -{ +dns_peer_gettcpkeepalive(dns_peer_t *peer, bool *retval) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(retval != NULL); @@ -570,8 +538,7 @@ dns_peer_gettcpkeepalive(dns_peer_t *peer, bool *retval) } isc_result_t -dns_peer_settransfers(dns_peer_t *peer, uint32_t newval) -{ +dns_peer_settransfers(dns_peer_t *peer, uint32_t newval) { bool existed; REQUIRE(DNS_PEER_VALID(peer)); @@ -585,8 +552,7 @@ dns_peer_settransfers(dns_peer_t *peer, uint32_t newval) } isc_result_t -dns_peer_gettransfers(dns_peer_t *peer, uint32_t *retval) -{ +dns_peer_gettransfers(dns_peer_t *peer, uint32_t *retval) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(retval != NULL); @@ -599,8 +565,7 @@ dns_peer_gettransfers(dns_peer_t *peer, uint32_t *retval) } isc_result_t -dns_peer_settransferformat(dns_peer_t *peer, dns_transfer_format_t newval) -{ +dns_peer_settransferformat(dns_peer_t *peer, dns_transfer_format_t newval) { bool existed; REQUIRE(DNS_PEER_VALID(peer)); @@ -614,8 +579,7 @@ dns_peer_settransferformat(dns_peer_t *peer, dns_transfer_format_t newval) } isc_result_t -dns_peer_gettransferformat(dns_peer_t *peer, dns_transfer_format_t *retval) -{ +dns_peer_gettransferformat(dns_peer_t *peer, dns_transfer_format_t *retval) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(retval != NULL); @@ -628,8 +592,7 @@ dns_peer_gettransferformat(dns_peer_t *peer, dns_transfer_format_t *retval) } isc_result_t -dns_peer_getkey(dns_peer_t *peer, dns_name_t **retval) -{ +dns_peer_getkey(dns_peer_t *peer, dns_name_t **retval) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(retval != NULL); @@ -641,8 +604,7 @@ dns_peer_getkey(dns_peer_t *peer, dns_name_t **retval) } isc_result_t -dns_peer_setkey(dns_peer_t *peer, dns_name_t **keyval) -{ +dns_peer_setkey(dns_peer_t *peer, dns_name_t **keyval) { bool exists = false; if (peer->key != NULL) { @@ -658,12 +620,11 @@ dns_peer_setkey(dns_peer_t *peer, dns_name_t **keyval) } isc_result_t -dns_peer_setkeybycharp(dns_peer_t *peer, const char *keyval) -{ - isc_buffer_t b; +dns_peer_setkeybycharp(dns_peer_t *peer, const char *keyval) { + isc_buffer_t b; dns_fixedname_t fname; - dns_name_t * name; - isc_result_t result; + dns_name_t *name; + isc_result_t result; dns_fixedname_init(&fname); isc_buffer_constinit(&b, keyval, strlen(keyval)); @@ -688,9 +649,8 @@ dns_peer_setkeybycharp(dns_peer_t *peer, const char *keyval) } isc_result_t -dns_peer_settransfersource(dns_peer_t * peer, - const isc_sockaddr_t *transfer_source) -{ +dns_peer_settransfersource(dns_peer_t *peer, + const isc_sockaddr_t *transfer_source) { REQUIRE(DNS_PEER_VALID(peer)); if (peer->transfer_source != NULL) { @@ -708,8 +668,7 @@ dns_peer_settransfersource(dns_peer_t * peer, } isc_result_t -dns_peer_gettransfersource(dns_peer_t *peer, isc_sockaddr_t *transfer_source) -{ +dns_peer_gettransfersource(dns_peer_t *peer, isc_sockaddr_t *transfer_source) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(transfer_source != NULL); @@ -721,8 +680,8 @@ dns_peer_gettransfersource(dns_peer_t *peer, isc_sockaddr_t *transfer_source) } isc_result_t -dns_peer_setnotifysource(dns_peer_t *peer, const isc_sockaddr_t *notify_source) -{ +dns_peer_setnotifysource(dns_peer_t *peer, + const isc_sockaddr_t *notify_source) { REQUIRE(DNS_PEER_VALID(peer)); if (peer->notify_source != NULL) { @@ -731,8 +690,8 @@ dns_peer_setnotifysource(dns_peer_t *peer, const isc_sockaddr_t *notify_source) peer->notify_source = NULL; } if (notify_source != NULL) { - peer->notify_source = - isc_mem_get(peer->mem, sizeof(*peer->notify_source)); + peer->notify_source = isc_mem_get(peer->mem, + sizeof(*peer->notify_source)); *peer->notify_source = *notify_source; } @@ -740,8 +699,7 @@ dns_peer_setnotifysource(dns_peer_t *peer, const isc_sockaddr_t *notify_source) } isc_result_t -dns_peer_getnotifysource(dns_peer_t *peer, isc_sockaddr_t *notify_source) -{ +dns_peer_getnotifysource(dns_peer_t *peer, isc_sockaddr_t *notify_source) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(notify_source != NULL); @@ -753,8 +711,7 @@ dns_peer_getnotifysource(dns_peer_t *peer, isc_sockaddr_t *notify_source) } isc_result_t -dns_peer_setquerysource(dns_peer_t *peer, const isc_sockaddr_t *query_source) -{ +dns_peer_setquerysource(dns_peer_t *peer, const isc_sockaddr_t *query_source) { REQUIRE(DNS_PEER_VALID(peer)); if (peer->query_source != NULL) { @@ -763,8 +720,8 @@ dns_peer_setquerysource(dns_peer_t *peer, const isc_sockaddr_t *query_source) peer->query_source = NULL; } if (query_source != NULL) { - peer->query_source = - isc_mem_get(peer->mem, sizeof(*peer->query_source)); + peer->query_source = isc_mem_get(peer->mem, + sizeof(*peer->query_source)); *peer->query_source = *query_source; } @@ -772,8 +729,7 @@ dns_peer_setquerysource(dns_peer_t *peer, const isc_sockaddr_t *query_source) } isc_result_t -dns_peer_getquerysource(dns_peer_t *peer, isc_sockaddr_t *query_source) -{ +dns_peer_getquerysource(dns_peer_t *peer, isc_sockaddr_t *query_source) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(query_source != NULL); @@ -785,8 +741,7 @@ dns_peer_getquerysource(dns_peer_t *peer, isc_sockaddr_t *query_source) } isc_result_t -dns_peer_setudpsize(dns_peer_t *peer, uint16_t udpsize) -{ +dns_peer_setudpsize(dns_peer_t *peer, uint16_t udpsize) { bool existed; REQUIRE(DNS_PEER_VALID(peer)); @@ -800,8 +755,7 @@ dns_peer_setudpsize(dns_peer_t *peer, uint16_t udpsize) } isc_result_t -dns_peer_getudpsize(dns_peer_t *peer, uint16_t *udpsize) -{ +dns_peer_getudpsize(dns_peer_t *peer, uint16_t *udpsize) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(udpsize != NULL); @@ -814,8 +768,7 @@ dns_peer_getudpsize(dns_peer_t *peer, uint16_t *udpsize) } isc_result_t -dns_peer_setmaxudp(dns_peer_t *peer, uint16_t maxudp) -{ +dns_peer_setmaxudp(dns_peer_t *peer, uint16_t maxudp) { bool existed; REQUIRE(DNS_PEER_VALID(peer)); @@ -829,8 +782,7 @@ dns_peer_setmaxudp(dns_peer_t *peer, uint16_t maxudp) } isc_result_t -dns_peer_getmaxudp(dns_peer_t *peer, uint16_t *maxudp) -{ +dns_peer_getmaxudp(dns_peer_t *peer, uint16_t *maxudp) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(maxudp != NULL); @@ -843,8 +795,7 @@ dns_peer_getmaxudp(dns_peer_t *peer, uint16_t *maxudp) } isc_result_t -dns_peer_setpadding(dns_peer_t *peer, uint16_t padding) -{ +dns_peer_setpadding(dns_peer_t *peer, uint16_t padding) { bool existed; REQUIRE(DNS_PEER_VALID(peer)); @@ -861,8 +812,7 @@ dns_peer_setpadding(dns_peer_t *peer, uint16_t padding) } isc_result_t -dns_peer_getpadding(dns_peer_t *peer, uint16_t *padding) -{ +dns_peer_getpadding(dns_peer_t *peer, uint16_t *padding) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(padding != NULL); @@ -875,8 +825,7 @@ dns_peer_getpadding(dns_peer_t *peer, uint16_t *padding) } isc_result_t -dns_peer_setnotifydscp(dns_peer_t *peer, isc_dscp_t dscp) -{ +dns_peer_setnotifydscp(dns_peer_t *peer, isc_dscp_t dscp) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(dscp < 64); @@ -886,8 +835,7 @@ dns_peer_setnotifydscp(dns_peer_t *peer, isc_dscp_t dscp) } isc_result_t -dns_peer_getnotifydscp(dns_peer_t *peer, isc_dscp_t *dscpp) -{ +dns_peer_getnotifydscp(dns_peer_t *peer, isc_dscp_t *dscpp) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(dscpp != NULL); @@ -899,8 +847,7 @@ dns_peer_getnotifydscp(dns_peer_t *peer, isc_dscp_t *dscpp) } isc_result_t -dns_peer_settransferdscp(dns_peer_t *peer, isc_dscp_t dscp) -{ +dns_peer_settransferdscp(dns_peer_t *peer, isc_dscp_t dscp) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(dscp < 64); @@ -910,8 +857,7 @@ dns_peer_settransferdscp(dns_peer_t *peer, isc_dscp_t dscp) } isc_result_t -dns_peer_gettransferdscp(dns_peer_t *peer, isc_dscp_t *dscpp) -{ +dns_peer_gettransferdscp(dns_peer_t *peer, isc_dscp_t *dscpp) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(dscpp != NULL); @@ -923,8 +869,7 @@ dns_peer_gettransferdscp(dns_peer_t *peer, isc_dscp_t *dscpp) } isc_result_t -dns_peer_setquerydscp(dns_peer_t *peer, isc_dscp_t dscp) -{ +dns_peer_setquerydscp(dns_peer_t *peer, isc_dscp_t dscp) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(dscp < 64); @@ -934,8 +879,7 @@ dns_peer_setquerydscp(dns_peer_t *peer, isc_dscp_t dscp) } isc_result_t -dns_peer_getquerydscp(dns_peer_t *peer, isc_dscp_t *dscpp) -{ +dns_peer_getquerydscp(dns_peer_t *peer, isc_dscp_t *dscpp) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(dscpp != NULL); @@ -947,8 +891,7 @@ dns_peer_getquerydscp(dns_peer_t *peer, isc_dscp_t *dscpp) } isc_result_t -dns_peer_setednsversion(dns_peer_t *peer, uint8_t ednsversion) -{ +dns_peer_setednsversion(dns_peer_t *peer, uint8_t ednsversion) { REQUIRE(DNS_PEER_VALID(peer)); peer->ednsversion = ednsversion; @@ -958,8 +901,7 @@ dns_peer_setednsversion(dns_peer_t *peer, uint8_t ednsversion) } isc_result_t -dns_peer_getednsversion(dns_peer_t *peer, uint8_t *ednsversion) -{ +dns_peer_getednsversion(dns_peer_t *peer, uint8_t *ednsversion) { REQUIRE(DNS_PEER_VALID(peer)); REQUIRE(ednsversion != NULL); diff --git a/lib/dns/pkcs11.c b/lib/dns/pkcs11.c index 250570920e..03489e16c7 100644 --- a/lib/dns/pkcs11.c +++ b/lib/dns/pkcs11.c @@ -24,8 +24,7 @@ isc_result_t dst__pkcs11_toresult(const char *funcname, const char *file, int line, - isc_result_t fallback, CK_RV rv) -{ + isc_result_t fallback, CK_RV rv) { isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_CRYPTO, ISC_LOG_WARNING, "%s:%d: %s: Error = 0x%.8lX\n", file, line, funcname, rv); diff --git a/lib/dns/pkcs11ecdsa_link.c b/lib/dns/pkcs11ecdsa_link.c index 05bc025842..9c4ac6e184 100644 --- a/lib/dns/pkcs11ecdsa_link.c +++ b/lib/dns/pkcs11ecdsa_link.c @@ -53,7 +53,7 @@ */ #define TAG_OCTECT_STRING 0x04 -#define UNCOMPRESSED 0x04 +#define UNCOMPRESSED 0x04 #define DST_RET(a) \ { \ @@ -64,23 +64,19 @@ 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) -{ - CK_RV rv; - CK_MECHANISM mech = { 0, NULL, 0 }; - CK_SLOT_ID slotid; +pkcs11ecdsa_createctx(dst_key_t *key, dst_context_t *dctx) { + CK_RV rv; + CK_MECHANISM mech = { 0, NULL, 0 }; + CK_SLOT_ID slotid; pk11_context_t *pk11_ctx; - pk11_object_t * ec = key->keydata.pkey; - isc_result_t ret; + pk11_object_t *ec = key->keydata.pkey; + isc_result_t ret; REQUIRE(dctx->key->key_alg == DST_ALG_ECDSA256 || dctx->key->key_alg == DST_ALG_ECDSA384); @@ -118,10 +114,9 @@ err: } static void -pkcs11ecdsa_destroyctx(dst_context_t *dctx) -{ - CK_BYTE garbage[ISC_SHA384_DIGESTLENGTH]; - CK_ULONG len = ISC_SHA384_DIGESTLENGTH; +pkcs11ecdsa_destroyctx(dst_context_t *dctx) { + CK_BYTE garbage[ISC_SHA384_DIGESTLENGTH]; + CK_ULONG len = ISC_SHA384_DIGESTLENGTH; pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx; REQUIRE(dctx->key->key_alg == DST_ALG_ECDSA256 || @@ -138,11 +133,10 @@ pkcs11ecdsa_destroyctx(dst_context_t *dctx) } static isc_result_t -pkcs11ecdsa_adddata(dst_context_t *dctx, const isc_region_t *data) -{ - CK_RV rv; +pkcs11ecdsa_adddata(dst_context_t *dctx, const isc_region_t *data) { + CK_RV rv; pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx; - isc_result_t ret = ISC_R_SUCCESS; + isc_result_t ret = ISC_R_SUCCESS; REQUIRE(dctx->key->key_alg == DST_ALG_ECDSA256 || dctx->key->key_alg == DST_ALG_ECDSA384); @@ -156,32 +150,31 @@ pkcs11ecdsa_adddata(dst_context_t *dctx, const isc_region_t *data) } static isc_result_t -pkcs11ecdsa_sign(dst_context_t *dctx, isc_buffer_t *sig) -{ - CK_RV rv; - CK_MECHANISM mech = { CKM_ECDSA, NULL, 0 }; +pkcs11ecdsa_sign(dst_context_t *dctx, isc_buffer_t *sig) { + CK_RV rv; + CK_MECHANISM mech = { CKM_ECDSA, NULL, 0 }; CK_OBJECT_HANDLE hKey = CK_INVALID_HANDLE; - CK_OBJECT_CLASS keyClass = CKO_PRIVATE_KEY; - CK_KEY_TYPE keyType = CKK_EC; - CK_ATTRIBUTE keyTemplate[] = { - { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_EC_PARAMS, NULL, 0 }, - { CKA_VALUE, NULL, 0 } + CK_OBJECT_CLASS keyClass = CKO_PRIVATE_KEY; + CK_KEY_TYPE keyType = CKK_EC; + CK_ATTRIBUTE keyTemplate[] = { + { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_EC_PARAMS, NULL, 0 }, + { CKA_VALUE, NULL, 0 } }; - CK_ATTRIBUTE * attr; - CK_BYTE digest[ISC_SHA384_DIGESTLENGTH]; - CK_ULONG dgstlen; - CK_ULONG siglen; + CK_ATTRIBUTE *attr; + CK_BYTE digest[ISC_SHA384_DIGESTLENGTH]; + CK_ULONG dgstlen; + CK_ULONG siglen; pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx; - dst_key_t * key = dctx->key; - pk11_object_t * ec = key->keydata.pkey; - isc_region_t r; - isc_result_t ret = ISC_R_SUCCESS; - unsigned int i; + dst_key_t *key = dctx->key; + pk11_object_t *ec = key->keydata.pkey; + isc_region_t r; + isc_result_t ret = ISC_R_SUCCESS; + unsigned int i; REQUIRE(key->key_alg == DST_ALG_ECDSA256 || key->key_alg == DST_ALG_ECDSA384); @@ -214,16 +207,16 @@ pkcs11ecdsa_sign(dst_context_t *dctx, isc_buffer_t *sig) switch (attr->type) { case CKA_EC_PARAMS: INSIST(keyTemplate[5].type == attr->type); - keyTemplate[5].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[5].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[5].pValue, attr->pValue, attr->ulValueLen); keyTemplate[5].ulValueLen = attr->ulValueLen; break; case CKA_VALUE: INSIST(keyTemplate[6].type == attr->type); - keyTemplate[6].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[6].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[6].pValue, attr->pValue, attr->ulValueLen); keyTemplate[6].ulValueLen = attr->ulValueLen; @@ -273,30 +266,29 @@ err: } static isc_result_t -pkcs11ecdsa_verify(dst_context_t *dctx, const isc_region_t *sig) -{ - CK_RV rv; - CK_MECHANISM mech = { CKM_ECDSA, NULL, 0 }; +pkcs11ecdsa_verify(dst_context_t *dctx, const isc_region_t *sig) { + CK_RV rv; + CK_MECHANISM mech = { CKM_ECDSA, NULL, 0 }; CK_OBJECT_HANDLE hKey = CK_INVALID_HANDLE; - CK_OBJECT_CLASS keyClass = CKO_PUBLIC_KEY; - CK_KEY_TYPE keyType = CKK_EC; - CK_ATTRIBUTE keyTemplate[] = { - { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_EC_PARAMS, NULL, 0 }, - { CKA_EC_POINT, NULL, 0 } + CK_OBJECT_CLASS keyClass = CKO_PUBLIC_KEY; + CK_KEY_TYPE keyType = CKK_EC; + CK_ATTRIBUTE keyTemplate[] = { + { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_EC_PARAMS, NULL, 0 }, + { CKA_EC_POINT, NULL, 0 } }; - CK_ATTRIBUTE * attr; - CK_BYTE digest[ISC_SHA384_DIGESTLENGTH]; - CK_ULONG dgstlen; + CK_ATTRIBUTE *attr; + CK_BYTE digest[ISC_SHA384_DIGESTLENGTH]; + CK_ULONG dgstlen; pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx; - dst_key_t * key = dctx->key; - pk11_object_t * ec = key->keydata.pkey; - isc_result_t ret = ISC_R_SUCCESS; - unsigned int i; + dst_key_t *key = dctx->key; + pk11_object_t *ec = key->keydata.pkey; + isc_result_t ret = ISC_R_SUCCESS; + unsigned int i; REQUIRE(key->key_alg == DST_ALG_ECDSA256 || key->key_alg == DST_ALG_ECDSA384); @@ -316,16 +308,16 @@ pkcs11ecdsa_verify(dst_context_t *dctx, const isc_region_t *sig) switch (attr->type) { case CKA_EC_PARAMS: INSIST(keyTemplate[5].type == attr->type); - keyTemplate[5].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[5].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[5].pValue, attr->pValue, attr->ulValueLen); keyTemplate[5].ulValueLen = attr->ulValueLen; break; case CKA_EC_POINT: INSIST(keyTemplate[6].type == attr->type); - keyTemplate[6].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[6].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[6].pValue, attr->pValue, attr->ulValueLen); keyTemplate[6].ulValueLen = attr->ulValueLen; @@ -369,10 +361,9 @@ err: } static bool -pkcs11ecdsa_compare(const dst_key_t *key1, const dst_key_t *key2) -{ +pkcs11ecdsa_compare(const dst_key_t *key1, const dst_key_t *key2) { pk11_object_t *ec1, *ec2; - CK_ATTRIBUTE * attr1, *attr2; + CK_ATTRIBUTE *attr1, *attr2; ec1 = key1->keydata.pkey; ec2 = key2->keydata.pkey; @@ -390,7 +381,8 @@ pkcs11ecdsa_compare(const dst_key_t *key1, const dst_key_t *key2) } else if ((attr1 == NULL) || (attr2 == NULL) || (attr1->ulValueLen != attr2->ulValueLen) || !isc_safe_memequal(attr1->pValue, attr2->pValue, - attr1->ulValueLen)) { + attr1->ulValueLen)) + { return (false); } @@ -401,7 +393,8 @@ pkcs11ecdsa_compare(const dst_key_t *key1, const dst_key_t *key2) } else if ((attr1 == NULL) || (attr2 == NULL) || (attr1->ulValueLen != attr2->ulValueLen) || !isc_safe_memequal(attr1->pValue, attr2->pValue, - attr1->ulValueLen)) { + attr1->ulValueLen)) + { return (false); } @@ -411,35 +404,36 @@ pkcs11ecdsa_compare(const dst_key_t *key1, const dst_key_t *key2) ((attr1 == NULL) || (attr2 == NULL) || (attr1->ulValueLen != attr2->ulValueLen) || !isc_safe_memequal(attr1->pValue, attr2->pValue, - attr1->ulValueLen))) { + attr1->ulValueLen))) + { return (false); } if (!ec1->ontoken && !ec2->ontoken) { return (true); - } else if (ec1->ontoken || ec2->ontoken || - (ec1->object != ec2->object)) { + } else if (ec1->ontoken || ec2->ontoken || (ec1->object != ec2->object)) + { return (false); } return (true); } -#define SETCURVE() \ - if (key->key_alg == DST_ALG_ECDSA256) { \ - attr->pValue = \ - isc_mem_get(key->mctx, sizeof(pk11_ecc_prime256v1)); \ - \ - memmove(attr->pValue, pk11_ecc_prime256v1, \ - sizeof(pk11_ecc_prime256v1)); \ - attr->ulValueLen = sizeof(pk11_ecc_prime256v1); \ - } else { \ - attr->pValue = \ - isc_mem_get(key->mctx, sizeof(pk11_ecc_secp384r1)); \ - \ - memmove(attr->pValue, pk11_ecc_secp384r1, \ - sizeof(pk11_ecc_secp384r1)); \ - attr->ulValueLen = sizeof(pk11_ecc_secp384r1); \ +#define SETCURVE() \ + if (key->key_alg == DST_ALG_ECDSA256) { \ + attr->pValue = isc_mem_get(key->mctx, \ + sizeof(pk11_ecc_prime256v1)); \ + \ + memmove(attr->pValue, pk11_ecc_prime256v1, \ + sizeof(pk11_ecc_prime256v1)); \ + attr->ulValueLen = sizeof(pk11_ecc_prime256v1); \ + } else { \ + attr->pValue = isc_mem_get(key->mctx, \ + sizeof(pk11_ecc_secp384r1)); \ + \ + memmove(attr->pValue, pk11_ecc_secp384r1, \ + sizeof(pk11_ecc_secp384r1)); \ + attr->ulValueLen = sizeof(pk11_ecc_secp384r1); \ } #define FREECURVE() \ @@ -450,36 +444,35 @@ pkcs11ecdsa_compare(const dst_key_t *key1, const dst_key_t *key2) } static isc_result_t -pkcs11ecdsa_generate(dst_key_t *key, int unused, void (*callback)(int)) -{ - CK_RV rv; - CK_MECHANISM mech = { CKM_EC_KEY_PAIR_GEN, NULL, 0 }; +pkcs11ecdsa_generate(dst_key_t *key, int unused, void (*callback)(int)) { + CK_RV rv; + CK_MECHANISM mech = { CKM_EC_KEY_PAIR_GEN, NULL, 0 }; CK_OBJECT_HANDLE pub = CK_INVALID_HANDLE; - CK_OBJECT_CLASS pubClass = CKO_PUBLIC_KEY; - CK_KEY_TYPE keyType = CKK_EC; - CK_ATTRIBUTE pubTemplate[] = { - { CKA_CLASS, &pubClass, (CK_ULONG)sizeof(pubClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_EC_PARAMS, NULL, 0 } + CK_OBJECT_CLASS pubClass = CKO_PUBLIC_KEY; + CK_KEY_TYPE keyType = CKK_EC; + CK_ATTRIBUTE pubTemplate[] = { + { CKA_CLASS, &pubClass, (CK_ULONG)sizeof(pubClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_EC_PARAMS, NULL, 0 } }; CK_OBJECT_HANDLE priv = CK_INVALID_HANDLE; CK_OBJECT_HANDLE privClass = CKO_PRIVATE_KEY; - CK_ATTRIBUTE privTemplate[] = { - { CKA_CLASS, &privClass, (CK_ULONG)sizeof(privClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_SENSITIVE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_EXTRACTABLE, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) } + CK_ATTRIBUTE privTemplate[] = { + { CKA_CLASS, &privClass, (CK_ULONG)sizeof(privClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_SENSITIVE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_EXTRACTABLE, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) } }; - CK_ATTRIBUTE * attr; - pk11_object_t * ec; + CK_ATTRIBUTE *attr; + pk11_object_t *ec; pk11_context_t *pk11_ctx; - isc_result_t ret; + isc_result_t ret; REQUIRE(key->key_alg == DST_ALG_ECDSA256 || key->key_alg == DST_ALG_ECDSA384); @@ -565,10 +558,9 @@ err: } static bool -pkcs11ecdsa_isprivate(const dst_key_t *key) -{ +pkcs11ecdsa_isprivate(const dst_key_t *key) { pk11_object_t *ec = key->keydata.pkey; - CK_ATTRIBUTE * attr; + CK_ATTRIBUTE *attr; if (ec == NULL) { return (false); @@ -578,10 +570,9 @@ pkcs11ecdsa_isprivate(const dst_key_t *key) } static void -pkcs11ecdsa_destroy(dst_key_t *key) -{ +pkcs11ecdsa_destroy(dst_key_t *key) { pk11_object_t *ec = key->keydata.pkey; - CK_ATTRIBUTE * attr; + CK_ATTRIBUTE *attr; if (ec == NULL) { return; @@ -610,12 +601,11 @@ pkcs11ecdsa_destroy(dst_key_t *key) } static isc_result_t -pkcs11ecdsa_todns(const dst_key_t *key, isc_buffer_t *data) -{ +pkcs11ecdsa_todns(const dst_key_t *key, isc_buffer_t *data) { pk11_object_t *ec; - isc_region_t r; - unsigned int len; - CK_ATTRIBUTE * attr; + isc_region_t r; + unsigned int len; + CK_ATTRIBUTE *attr; REQUIRE(key->keydata.pkey != NULL); @@ -630,7 +620,8 @@ pkcs11ecdsa_todns(const dst_key_t *key, isc_buffer_t *data) if ((attr == NULL) || (attr->ulValueLen != len + 3) || (((CK_BYTE_PTR)attr->pValue)[0] != TAG_OCTECT_STRING) || (((CK_BYTE_PTR)attr->pValue)[1] != len + 1) || - (((CK_BYTE_PTR)attr->pValue)[2] != UNCOMPRESSED)) { + (((CK_BYTE_PTR)attr->pValue)[2] != UNCOMPRESSED)) + { return (ISC_R_FAILURE); } @@ -645,12 +636,11 @@ pkcs11ecdsa_todns(const dst_key_t *key, isc_buffer_t *data) } static isc_result_t -pkcs11ecdsa_fromdns(dst_key_t *key, isc_buffer_t *data) -{ +pkcs11ecdsa_fromdns(dst_key_t *key, isc_buffer_t *data) { pk11_object_t *ec; - isc_region_t r; - unsigned int len; - CK_ATTRIBUTE * attr; + isc_region_t r; + unsigned int len; + CK_ATTRIBUTE *attr; REQUIRE(key->key_alg == DST_ALG_ECDSA256 || key->key_alg == DST_ALG_ECDSA384); @@ -677,14 +667,14 @@ pkcs11ecdsa_fromdns(dst_key_t *key, isc_buffer_t *data) attr = ec->repr; attr->type = CKA_EC_PARAMS; if (key->key_alg == DST_ALG_ECDSA256) { - attr->pValue = - isc_mem_get(key->mctx, sizeof(pk11_ecc_prime256v1)); + attr->pValue = isc_mem_get(key->mctx, + sizeof(pk11_ecc_prime256v1)); memmove(attr->pValue, pk11_ecc_prime256v1, sizeof(pk11_ecc_prime256v1)); attr->ulValueLen = sizeof(pk11_ecc_prime256v1); } else { - attr->pValue = - isc_mem_get(key->mctx, sizeof(pk11_ecc_secp384r1)); + attr->pValue = isc_mem_get(key->mctx, + sizeof(pk11_ecc_secp384r1)); memmove(attr->pValue, pk11_ecc_secp384r1, sizeof(pk11_ecc_secp384r1)); attr->ulValueLen = sizeof(pk11_ecc_secp384r1); @@ -707,14 +697,13 @@ pkcs11ecdsa_fromdns(dst_key_t *key, isc_buffer_t *data) } static isc_result_t -pkcs11ecdsa_tofile(const dst_key_t *key, const char *directory) -{ - isc_result_t ret; +pkcs11ecdsa_tofile(const dst_key_t *key, const char *directory) { + isc_result_t ret; pk11_object_t *ec; - dst_private_t priv; + dst_private_t priv; unsigned char *buf = NULL; - unsigned int i = 0; - CK_ATTRIBUTE * attr; + unsigned int i = 0; + CK_ATTRIBUTE *attr; if (key->keydata.pkey == NULL) { return (DST_R_NULLKEY); @@ -762,24 +751,23 @@ pkcs11ecdsa_tofile(const dst_key_t *key, const char *directory) static isc_result_t pkcs11ecdsa_fetch(dst_key_t *key, const char *engine, const char *label, - dst_key_t *pub) -{ - CK_RV rv; + dst_key_t *pub) { + CK_RV rv; CK_OBJECT_CLASS keyClass = CKO_PRIVATE_KEY; - CK_KEY_TYPE keyType = CKK_EC; - CK_ATTRIBUTE searchTemplate[] = { - { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_LABEL, NULL, 0 } + CK_KEY_TYPE keyType = CKK_EC; + CK_ATTRIBUTE searchTemplate[] = { + { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_LABEL, NULL, 0 } }; - CK_ULONG cnt; - CK_ATTRIBUTE * attr; - CK_ATTRIBUTE * pubattr; - pk11_object_t * ec; - pk11_object_t * pubec; + CK_ULONG cnt; + CK_ATTRIBUTE *attr; + CK_ATTRIBUTE *pubattr; + pk11_object_t *ec; + pk11_object_t *pubec; pk11_context_t *pk11_ctx = NULL; - isc_result_t ret; + isc_result_t ret; if (label == NULL) { return (DST_R_NOENGINE); @@ -867,15 +855,14 @@ err: } static isc_result_t -pkcs11ecdsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) -{ - dst_private_t priv; - isc_result_t ret; +pkcs11ecdsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) { + dst_private_t priv; + isc_result_t ret; pk11_object_t *ec = NULL; - CK_ATTRIBUTE * attr, *pattr; - isc_mem_t * mctx = key->mctx; - unsigned int i; - const char * engine = NULL, *label = NULL; + CK_ATTRIBUTE *attr, *pattr; + isc_mem_t *mctx = key->mctx; + unsigned int i; + const char *engine = NULL, *label = NULL; REQUIRE(key->key_alg == DST_ALG_ECDSA256 || key->key_alg == DST_ALG_ECDSA384); @@ -977,24 +964,23 @@ err: static isc_result_t pkcs11ecdsa_fromlabel(dst_key_t *key, const char *engine, const char *label, - const char *pin) -{ - CK_RV rv; + const char *pin) { + CK_RV rv; CK_OBJECT_HANDLE hKey = CK_INVALID_HANDLE; - CK_OBJECT_CLASS keyClass = CKO_PUBLIC_KEY; - CK_KEY_TYPE keyType = CKK_EC; - CK_ATTRIBUTE searchTemplate[] = { - { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_LABEL, NULL, 0 } + CK_OBJECT_CLASS keyClass = CKO_PUBLIC_KEY; + CK_KEY_TYPE keyType = CKK_EC; + CK_ATTRIBUTE searchTemplate[] = { + { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_LABEL, NULL, 0 } }; - CK_ULONG cnt; - CK_ATTRIBUTE * attr; - pk11_object_t * ec; + CK_ULONG cnt; + CK_ATTRIBUTE *attr; + pk11_object_t *ec; pk11_context_t *pk11_ctx = NULL; - isc_result_t ret; - unsigned int i; + isc_result_t ret; + unsigned int i; UNUSED(pin); @@ -1123,8 +1109,7 @@ static dst_func_t pkcs11ecdsa_functions = { }; isc_result_t -dst__pkcs11ecdsa_init(dst_func_t **funcp) -{ +dst__pkcs11ecdsa_init(dst_func_t **funcp) { REQUIRE(funcp != NULL); if (*funcp == NULL) { *funcp = &pkcs11ecdsa_functions; diff --git a/lib/dns/pkcs11eddsa_link.c b/lib/dns/pkcs11eddsa_link.c index 9dd12f55a8..77b13e991a 100644 --- a/lib/dns/pkcs11eddsa_link.c +++ b/lib/dns/pkcs11eddsa_link.c @@ -61,19 +61,15 @@ 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) -{ +pkcs11eddsa_createctx(dst_key_t *key, dst_context_t *dctx) { isc_buffer_t *buf = NULL; - isc_result_t result; + isc_result_t result; UNUSED(key); REQUIRE(dctx->key->key_alg == DST_ALG_ED25519 || @@ -87,8 +83,7 @@ pkcs11eddsa_createctx(dst_key_t *key, dst_context_t *dctx) } static void -pkcs11eddsa_destroyctx(dst_context_t *dctx) -{ +pkcs11eddsa_destroyctx(dst_context_t *dctx) { isc_buffer_t *buf = (isc_buffer_t *)dctx->ctxdata.generic; REQUIRE(dctx->key->key_alg == DST_ALG_ED25519 || @@ -100,13 +95,12 @@ pkcs11eddsa_destroyctx(dst_context_t *dctx) } static isc_result_t -pkcs11eddsa_adddata(dst_context_t *dctx, const isc_region_t *data) -{ +pkcs11eddsa_adddata(dst_context_t *dctx, const isc_region_t *data) { isc_buffer_t *buf = (isc_buffer_t *)dctx->ctxdata.generic; isc_buffer_t *nbuf = NULL; - isc_region_t r; - unsigned int length; - isc_result_t result; + isc_region_t r; + unsigned int length; + isc_result_t result; REQUIRE(dctx->key->key_alg == DST_ALG_ED25519 || dctx->key->key_alg == DST_ALG_ED448); @@ -128,33 +122,32 @@ pkcs11eddsa_adddata(dst_context_t *dctx, const isc_region_t *data) } static isc_result_t -pkcs11eddsa_sign(dst_context_t *dctx, isc_buffer_t *sig) -{ - isc_buffer_t * buf = (isc_buffer_t *)dctx->ctxdata.generic; - CK_RV rv; - CK_MECHANISM mech = { CKM_EDDSA, NULL, 0 }; +pkcs11eddsa_sign(dst_context_t *dctx, isc_buffer_t *sig) { + isc_buffer_t *buf = (isc_buffer_t *)dctx->ctxdata.generic; + CK_RV rv; + CK_MECHANISM mech = { CKM_EDDSA, NULL, 0 }; CK_OBJECT_HANDLE hKey = CK_INVALID_HANDLE; - CK_OBJECT_CLASS keyClass = CKO_PRIVATE_KEY; - CK_KEY_TYPE keyType = CKK_EDDSA; - CK_ATTRIBUTE keyTemplate[] = { - { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_EC_PARAMS, NULL, 0 }, - { CKA_VALUE, NULL, 0 } + CK_OBJECT_CLASS keyClass = CKO_PRIVATE_KEY; + CK_KEY_TYPE keyType = CKK_EDDSA; + CK_ATTRIBUTE keyTemplate[] = { + { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_EC_PARAMS, NULL, 0 }, + { CKA_VALUE, NULL, 0 } }; - CK_ATTRIBUTE * attr; - CK_ULONG siglen; - CK_SLOT_ID slotid; + CK_ATTRIBUTE *attr; + CK_ULONG siglen; + CK_SLOT_ID slotid; pk11_context_t *pk11_ctx; - dst_key_t * key = dctx->key; - pk11_object_t * ec = key->keydata.pkey; - isc_region_t t; - isc_region_t r; - isc_result_t ret = ISC_R_SUCCESS; - unsigned int i; + dst_key_t *key = dctx->key; + pk11_object_t *ec = key->keydata.pkey; + isc_region_t t; + isc_region_t r; + isc_result_t ret = ISC_R_SUCCESS; + unsigned int i; REQUIRE(key->key_alg == DST_ALG_ED25519 || key->key_alg == DST_ALG_ED448); @@ -195,16 +188,16 @@ pkcs11eddsa_sign(dst_context_t *dctx, isc_buffer_t *sig) switch (attr->type) { case CKA_EC_PARAMS: INSIST(keyTemplate[5].type == attr->type); - keyTemplate[5].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[5].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[5].pValue, attr->pValue, attr->ulValueLen); keyTemplate[5].ulValueLen = attr->ulValueLen; break; case CKA_VALUE: INSIST(keyTemplate[6].type == attr->type); - keyTemplate[6].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[6].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[6].pValue, attr->pValue, attr->ulValueLen); keyTemplate[6].ulValueLen = attr->ulValueLen; @@ -257,31 +250,30 @@ err: } static isc_result_t -pkcs11eddsa_verify(dst_context_t *dctx, const isc_region_t *sig) -{ - isc_buffer_t * buf = (isc_buffer_t *)dctx->ctxdata.generic; - CK_RV rv; - CK_MECHANISM mech = { CKM_EDDSA, NULL, 0 }; +pkcs11eddsa_verify(dst_context_t *dctx, const isc_region_t *sig) { + isc_buffer_t *buf = (isc_buffer_t *)dctx->ctxdata.generic; + CK_RV rv; + CK_MECHANISM mech = { CKM_EDDSA, NULL, 0 }; CK_OBJECT_HANDLE hKey = CK_INVALID_HANDLE; - CK_OBJECT_CLASS keyClass = CKO_PUBLIC_KEY; - CK_KEY_TYPE keyType = CKK_EDDSA; - CK_ATTRIBUTE keyTemplate[] = { - { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_EC_PARAMS, NULL, 0 }, - { CKA_VALUE, NULL, 0 } + CK_OBJECT_CLASS keyClass = CKO_PUBLIC_KEY; + CK_KEY_TYPE keyType = CKK_EDDSA; + CK_ATTRIBUTE keyTemplate[] = { + { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_EC_PARAMS, NULL, 0 }, + { CKA_VALUE, NULL, 0 } }; - CK_ATTRIBUTE * attr; - CK_SLOT_ID slotid; + CK_ATTRIBUTE *attr; + CK_SLOT_ID slotid; pk11_context_t *pk11_ctx; - dst_key_t * key = dctx->key; - pk11_object_t * ec = key->keydata.pkey; - isc_region_t t; - isc_result_t ret = ISC_R_SUCCESS; - unsigned int i; + dst_key_t *key = dctx->key; + pk11_object_t *ec = key->keydata.pkey; + isc_region_t t; + isc_result_t ret = ISC_R_SUCCESS; + unsigned int i; REQUIRE(key->key_alg == DST_ALG_ED25519 || key->key_alg == DST_ALG_ED448); @@ -305,16 +297,16 @@ pkcs11eddsa_verify(dst_context_t *dctx, const isc_region_t *sig) switch (attr->type) { case CKA_EC_PARAMS: INSIST(keyTemplate[5].type == attr->type); - keyTemplate[5].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[5].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[5].pValue, attr->pValue, attr->ulValueLen); keyTemplate[5].ulValueLen = attr->ulValueLen; break; case CKA_EC_POINT: /* keyTemplate[6].type is CKA_VALUE */ - keyTemplate[6].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[6].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[6].pValue, attr->pValue, attr->ulValueLen); keyTemplate[6].ulValueLen = attr->ulValueLen; @@ -361,10 +353,9 @@ err: } static bool -pkcs11eddsa_compare(const dst_key_t *key1, const dst_key_t *key2) -{ +pkcs11eddsa_compare(const dst_key_t *key1, const dst_key_t *key2) { pk11_object_t *ec1, *ec2; - CK_ATTRIBUTE * attr1, *attr2; + CK_ATTRIBUTE *attr1, *attr2; ec1 = key1->keydata.pkey; ec2 = key2->keydata.pkey; @@ -382,7 +373,8 @@ pkcs11eddsa_compare(const dst_key_t *key1, const dst_key_t *key2) } else if ((attr1 == NULL) || (attr2 == NULL) || (attr1->ulValueLen != attr2->ulValueLen) || !isc_safe_memequal(attr1->pValue, attr2->pValue, - attr1->ulValueLen)) { + attr1->ulValueLen)) + { return (false); } @@ -393,7 +385,8 @@ pkcs11eddsa_compare(const dst_key_t *key1, const dst_key_t *key2) } else if ((attr1 == NULL) || (attr2 == NULL) || (attr1->ulValueLen != attr2->ulValueLen) || !isc_safe_memequal(attr1->pValue, attr2->pValue, - attr1->ulValueLen)) { + attr1->ulValueLen)) + { return (false); } @@ -403,14 +396,15 @@ pkcs11eddsa_compare(const dst_key_t *key1, const dst_key_t *key2) ((attr1 == NULL) || (attr2 == NULL) || (attr1->ulValueLen != attr2->ulValueLen) || !isc_safe_memequal(attr1->pValue, attr2->pValue, - attr1->ulValueLen))) { + attr1->ulValueLen))) + { return (false); } if (!ec1->ontoken && !ec2->ontoken) { return (true); - } else if (ec1->ontoken || ec2->ontoken || - (ec1->object != ec2->object)) { + } else if (ec1->ontoken || ec2->ontoken || (ec1->object != ec2->object)) + { return (false); } @@ -419,8 +413,8 @@ pkcs11eddsa_compare(const dst_key_t *key1, const dst_key_t *key2) #define SETCURVE() \ if (key->key_alg == DST_ALG_ED25519) { \ - attr->pValue = \ - isc_mem_get(key->mctx, sizeof(pk11_ecc_ed25519)); \ + attr->pValue = isc_mem_get(key->mctx, \ + sizeof(pk11_ecc_ed25519)); \ \ memmove(attr->pValue, pk11_ecc_ed25519, \ sizeof(pk11_ecc_ed25519)); \ @@ -440,36 +434,35 @@ pkcs11eddsa_compare(const dst_key_t *key1, const dst_key_t *key2) } static isc_result_t -pkcs11eddsa_generate(dst_key_t *key, int unused, void (*callback)(int)) -{ - CK_RV rv; - CK_MECHANISM mech = { CKM_EDDSA_KEY_PAIR_GEN, NULL, 0 }; +pkcs11eddsa_generate(dst_key_t *key, int unused, void (*callback)(int)) { + CK_RV rv; + CK_MECHANISM mech = { CKM_EDDSA_KEY_PAIR_GEN, NULL, 0 }; CK_OBJECT_HANDLE pub = CK_INVALID_HANDLE; - CK_OBJECT_CLASS pubClass = CKO_PUBLIC_KEY; - CK_KEY_TYPE keyType = CKK_EDDSA; - CK_ATTRIBUTE pubTemplate[] = { - { CKA_CLASS, &pubClass, (CK_ULONG)sizeof(pubClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_EC_PARAMS, NULL, 0 } + CK_OBJECT_CLASS pubClass = CKO_PUBLIC_KEY; + CK_KEY_TYPE keyType = CKK_EDDSA; + CK_ATTRIBUTE pubTemplate[] = { + { CKA_CLASS, &pubClass, (CK_ULONG)sizeof(pubClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_EC_PARAMS, NULL, 0 } }; CK_OBJECT_HANDLE priv = CK_INVALID_HANDLE; CK_OBJECT_HANDLE privClass = CKO_PRIVATE_KEY; - CK_ATTRIBUTE privTemplate[] = { - { CKA_CLASS, &privClass, (CK_ULONG)sizeof(privClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_SENSITIVE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_EXTRACTABLE, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) } + CK_ATTRIBUTE privTemplate[] = { + { CKA_CLASS, &privClass, (CK_ULONG)sizeof(privClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_SENSITIVE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_EXTRACTABLE, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) } }; - CK_ATTRIBUTE * attr; - pk11_object_t * ec; + CK_ATTRIBUTE *attr; + pk11_object_t *ec; pk11_context_t *pk11_ctx; - isc_result_t ret; + isc_result_t ret; REQUIRE(key->key_alg == DST_ALG_ED25519 || key->key_alg == DST_ALG_ED448); @@ -556,10 +549,9 @@ err: } static bool -pkcs11eddsa_isprivate(const dst_key_t *key) -{ +pkcs11eddsa_isprivate(const dst_key_t *key) { pk11_object_t *ec = key->keydata.pkey; - CK_ATTRIBUTE * attr; + CK_ATTRIBUTE *attr; if (ec == NULL) { return (false); @@ -569,10 +561,9 @@ pkcs11eddsa_isprivate(const dst_key_t *key) } static void -pkcs11eddsa_destroy(dst_key_t *key) -{ +pkcs11eddsa_destroy(dst_key_t *key) { pk11_object_t *ec = key->keydata.pkey; - CK_ATTRIBUTE * attr; + CK_ATTRIBUTE *attr; if (ec == NULL) { return; @@ -601,12 +592,11 @@ pkcs11eddsa_destroy(dst_key_t *key) } static isc_result_t -pkcs11eddsa_todns(const dst_key_t *key, isc_buffer_t *data) -{ +pkcs11eddsa_todns(const dst_key_t *key, isc_buffer_t *data) { pk11_object_t *ec; - isc_region_t r; - unsigned int len; - CK_ATTRIBUTE * attr; + isc_region_t r; + unsigned int len; + CK_ATTRIBUTE *attr; REQUIRE(key->keydata.pkey != NULL); @@ -633,12 +623,11 @@ pkcs11eddsa_todns(const dst_key_t *key, isc_buffer_t *data) } static isc_result_t -pkcs11eddsa_fromdns(dst_key_t *key, isc_buffer_t *data) -{ +pkcs11eddsa_fromdns(dst_key_t *key, isc_buffer_t *data) { pk11_object_t *ec; - isc_region_t r; - unsigned int len; - CK_ATTRIBUTE * attr; + isc_region_t r; + unsigned int len; + CK_ATTRIBUTE *attr; REQUIRE(key->key_alg == DST_ALG_ED25519 || key->key_alg == DST_ALG_ED448); @@ -705,14 +694,13 @@ nomemory: } static isc_result_t -pkcs11eddsa_tofile(const dst_key_t *key, const char *directory) -{ - isc_result_t ret; +pkcs11eddsa_tofile(const dst_key_t *key, const char *directory) { + isc_result_t ret; pk11_object_t *ec; - dst_private_t priv; + dst_private_t priv; unsigned char *buf = NULL; - unsigned int i = 0; - CK_ATTRIBUTE * attr; + unsigned int i = 0; + CK_ATTRIBUTE *attr; if (key->keydata.pkey == NULL) { return (DST_R_NULLKEY); @@ -760,24 +748,23 @@ pkcs11eddsa_tofile(const dst_key_t *key, const char *directory) static isc_result_t pkcs11eddsa_fetch(dst_key_t *key, const char *engine, const char *label, - dst_key_t *pub) -{ - CK_RV rv; + dst_key_t *pub) { + CK_RV rv; CK_OBJECT_CLASS keyClass = CKO_PRIVATE_KEY; - CK_KEY_TYPE keyType = CKK_EDDSA; - CK_ATTRIBUTE searchTemplate[] = { - { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_LABEL, NULL, 0 } + CK_KEY_TYPE keyType = CKK_EDDSA; + CK_ATTRIBUTE searchTemplate[] = { + { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_LABEL, NULL, 0 } }; - CK_ULONG cnt; - CK_ATTRIBUTE * attr; - CK_ATTRIBUTE * pubattr; - pk11_object_t * ec; - pk11_object_t * pubec; + CK_ULONG cnt; + CK_ATTRIBUTE *attr; + CK_ATTRIBUTE *pubattr; + pk11_object_t *ec; + pk11_object_t *pubec; pk11_context_t *pk11_ctx = NULL; - isc_result_t ret; + isc_result_t ret; if (label == NULL) { return (DST_R_NOENGINE); @@ -863,15 +850,14 @@ err: } static isc_result_t -pkcs11eddsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) -{ - dst_private_t priv; - isc_result_t ret; +pkcs11eddsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) { + dst_private_t priv; + isc_result_t ret; pk11_object_t *ec = NULL; - CK_ATTRIBUTE * attr, *pattr; - isc_mem_t * mctx = key->mctx; - unsigned int i; - const char * engine = NULL, *label = NULL; + CK_ATTRIBUTE *attr, *pattr; + isc_mem_t *mctx = key->mctx; + unsigned int i; + const char *engine = NULL, *label = NULL; REQUIRE(key->key_alg == DST_ALG_ED25519 || key->key_alg == DST_ALG_ED448); @@ -973,24 +959,23 @@ err: static isc_result_t pkcs11eddsa_fromlabel(dst_key_t *key, const char *engine, const char *label, - const char *pin) -{ - CK_RV rv; + const char *pin) { + CK_RV rv; CK_OBJECT_HANDLE hKey = CK_INVALID_HANDLE; - CK_OBJECT_CLASS keyClass = CKO_PUBLIC_KEY; - CK_KEY_TYPE keyType = CKK_EDDSA; - CK_ATTRIBUTE searchTemplate[] = { - { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_LABEL, NULL, 0 } + CK_OBJECT_CLASS keyClass = CKO_PUBLIC_KEY; + CK_KEY_TYPE keyType = CKK_EDDSA; + CK_ATTRIBUTE searchTemplate[] = { + { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_LABEL, NULL, 0 } }; - CK_ULONG cnt; - CK_ATTRIBUTE * attr; - pk11_object_t * ec; + CK_ULONG cnt; + CK_ATTRIBUTE *attr; + pk11_object_t *ec; pk11_context_t *pk11_ctx = NULL; - isc_result_t ret; - unsigned int i; + isc_result_t ret; + unsigned int i; UNUSED(pin); @@ -1120,8 +1105,7 @@ static dst_func_t pkcs11eddsa_functions = { }; isc_result_t -dst__pkcs11eddsa_init(dst_func_t **funcp) -{ +dst__pkcs11eddsa_init(dst_func_t **funcp) { REQUIRE(funcp != NULL); if (*funcp == NULL) { *funcp = &pkcs11eddsa_functions; diff --git a/lib/dns/pkcs11rsa_link.c b/lib/dns/pkcs11rsa_link.c index 19bf39243e..0e29c692ea 100644 --- a/lib/dns/pkcs11rsa_link.c +++ b/lib/dns/pkcs11rsa_link.c @@ -45,45 +45,41 @@ 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 static isc_result_t -pkcs11rsa_createctx_sign(dst_key_t *key, dst_context_t *dctx) -{ - CK_RV rv; - CK_MECHANISM mech = { 0, NULL, 0 }; +pkcs11rsa_createctx_sign(dst_key_t *key, dst_context_t *dctx) { + CK_RV rv; + CK_MECHANISM mech = { 0, NULL, 0 }; CK_OBJECT_CLASS keyClass = CKO_PRIVATE_KEY; - CK_KEY_TYPE keyType = CKK_RSA; - CK_ATTRIBUTE keyTemplate[] = { - { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_SENSITIVE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_MODULUS, NULL, 0 }, - { CKA_PUBLIC_EXPONENT, NULL, 0 }, - { CKA_PRIVATE_EXPONENT, NULL, 0 }, - { CKA_PRIME_1, NULL, 0 }, - { CKA_PRIME_2, NULL, 0 }, - { CKA_EXPONENT_1, NULL, 0 }, - { CKA_EXPONENT_2, NULL, 0 }, - { CKA_COEFFICIENT, NULL, 0 } + CK_KEY_TYPE keyType = CKK_RSA; + CK_ATTRIBUTE keyTemplate[] = { + { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_SENSITIVE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_MODULUS, NULL, 0 }, + { CKA_PUBLIC_EXPONENT, NULL, 0 }, + { CKA_PRIVATE_EXPONENT, NULL, 0 }, + { CKA_PRIME_1, NULL, 0 }, + { CKA_PRIME_2, NULL, 0 }, + { CKA_EXPONENT_1, NULL, 0 }, + { CKA_EXPONENT_2, NULL, 0 }, + { CKA_COEFFICIENT, NULL, 0 } }; - CK_ATTRIBUTE * attr; - CK_SLOT_ID slotid; - pk11_object_t * rsa; + CK_ATTRIBUTE *attr; + CK_SLOT_ID slotid; + pk11_object_t *rsa; pk11_context_t *pk11_ctx; - isc_result_t ret; - unsigned int i; + isc_result_t ret; + unsigned int i; REQUIRE(key->key_alg == DST_ALG_RSASHA1 || key->key_alg == DST_ALG_NSEC3RSASHA1 || @@ -103,8 +99,8 @@ pkcs11rsa_createctx_sign(dst_key_t *key, dst_context_t *dctx) break; case DST_ALG_RSASHA256: /* From RFC 5702 */ - if ((dctx->key->key_size < 512) || - (dctx->key->key_size > 4096)) { + if ((dctx->key->key_size < 512) || (dctx->key->key_size > 4096)) + { return (ISC_R_FAILURE); } break; @@ -146,64 +142,64 @@ pkcs11rsa_createctx_sign(dst_key_t *key, dst_context_t *dctx) switch (attr->type) { case CKA_MODULUS: INSIST(keyTemplate[6].type == attr->type); - keyTemplate[6].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[6].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[6].pValue, attr->pValue, attr->ulValueLen); keyTemplate[6].ulValueLen = attr->ulValueLen; break; case CKA_PUBLIC_EXPONENT: INSIST(keyTemplate[7].type == attr->type); - keyTemplate[7].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[7].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[7].pValue, attr->pValue, attr->ulValueLen); keyTemplate[7].ulValueLen = attr->ulValueLen; break; case CKA_PRIVATE_EXPONENT: INSIST(keyTemplate[8].type == attr->type); - keyTemplate[8].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[8].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[8].pValue, attr->pValue, attr->ulValueLen); keyTemplate[8].ulValueLen = attr->ulValueLen; break; case CKA_PRIME_1: INSIST(keyTemplate[9].type == attr->type); - keyTemplate[9].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[9].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[9].pValue, attr->pValue, attr->ulValueLen); keyTemplate[9].ulValueLen = attr->ulValueLen; break; case CKA_PRIME_2: INSIST(keyTemplate[10].type == attr->type); - keyTemplate[10].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[10].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[10].pValue, attr->pValue, attr->ulValueLen); keyTemplate[10].ulValueLen = attr->ulValueLen; break; case CKA_EXPONENT_1: INSIST(keyTemplate[11].type == attr->type); - keyTemplate[11].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[11].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[11].pValue, attr->pValue, attr->ulValueLen); keyTemplate[11].ulValueLen = attr->ulValueLen; break; case CKA_EXPONENT_2: INSIST(keyTemplate[12].type == attr->type); - keyTemplate[12].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[12].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[12].pValue, attr->pValue, attr->ulValueLen); keyTemplate[12].ulValueLen = attr->ulValueLen; break; case CKA_COEFFICIENT: INSIST(keyTemplate[13].type == attr->type); - keyTemplate[13].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[13].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[13].pValue, attr->pValue, attr->ulValueLen); keyTemplate[13].ulValueLen = attr->ulValueLen; @@ -275,26 +271,25 @@ err: static isc_result_t pkcs11rsa_createctx_verify(dst_key_t *key, unsigned int maxbits, - dst_context_t *dctx) -{ - CK_RV rv; - CK_MECHANISM mech = { 0, NULL, 0 }; + dst_context_t *dctx) { + CK_RV rv; + CK_MECHANISM mech = { 0, NULL, 0 }; CK_OBJECT_CLASS keyClass = CKO_PUBLIC_KEY; - CK_KEY_TYPE keyType = CKK_RSA; - CK_ATTRIBUTE keyTemplate[] = { - { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_MODULUS, NULL, 0 }, - { CKA_PUBLIC_EXPONENT, NULL, 0 }, + CK_KEY_TYPE keyType = CKK_RSA; + CK_ATTRIBUTE keyTemplate[] = { + { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_MODULUS, NULL, 0 }, + { CKA_PUBLIC_EXPONENT, NULL, 0 }, }; - CK_ATTRIBUTE * attr; - pk11_object_t * rsa; + CK_ATTRIBUTE *attr; + pk11_object_t *rsa; pk11_context_t *pk11_ctx; - isc_result_t ret; - unsigned int i; + isc_result_t ret; + unsigned int i; REQUIRE(key->key_alg == DST_ALG_RSASHA1 || key->key_alg == DST_ALG_NSEC3RSASHA1 || @@ -314,8 +309,8 @@ pkcs11rsa_createctx_verify(dst_key_t *key, unsigned int maxbits, break; case DST_ALG_RSASHA256: /* From RFC 5702 */ - if ((dctx->key->key_size < 512) || - (dctx->key->key_size > 4096)) { + if ((dctx->key->key_size < 512) || (dctx->key->key_size > 4096)) + { return (ISC_R_FAILURE); } break; @@ -345,16 +340,16 @@ pkcs11rsa_createctx_verify(dst_key_t *key, unsigned int maxbits, switch (attr->type) { case CKA_MODULUS: INSIST(keyTemplate[5].type == attr->type); - keyTemplate[5].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[5].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[5].pValue, attr->pValue, attr->ulValueLen); keyTemplate[5].ulValueLen = attr->ulValueLen; break; case CKA_PUBLIC_EXPONENT: INSIST(keyTemplate[6].type == attr->type); - keyTemplate[6].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[6].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[6].pValue, attr->pValue, attr->ulValueLen); keyTemplate[6].ulValueLen = attr->ulValueLen; @@ -428,8 +423,7 @@ err: } static isc_result_t -pkcs11rsa_createctx(dst_key_t *key, dst_context_t *dctx) -{ +pkcs11rsa_createctx(dst_key_t *key, dst_context_t *dctx) { if (dctx->use == DO_SIGN) { return (pkcs11rsa_createctx_sign(key, dctx)); } else { @@ -438,8 +432,7 @@ pkcs11rsa_createctx(dst_key_t *key, dst_context_t *dctx) } static isc_result_t -pkcs11rsa_createctx2(dst_key_t *key, int maxbits, dst_context_t *dctx) -{ +pkcs11rsa_createctx2(dst_key_t *key, int maxbits, dst_context_t *dctx) { if (dctx->use == DO_SIGN) { return (pkcs11rsa_createctx_sign(key, dctx)); } else { @@ -449,8 +442,7 @@ pkcs11rsa_createctx2(dst_key_t *key, int maxbits, dst_context_t *dctx) } static void -pkcs11rsa_destroyctx(dst_context_t *dctx) -{ +pkcs11rsa_destroyctx(dst_context_t *dctx) { pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx; if (pk11_ctx != NULL) { @@ -467,11 +459,10 @@ pkcs11rsa_destroyctx(dst_context_t *dctx) } static isc_result_t -pkcs11rsa_adddata(dst_context_t *dctx, const isc_region_t *data) -{ - CK_RV rv; +pkcs11rsa_adddata(dst_context_t *dctx, const isc_region_t *data) { + CK_RV rv; pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx; - isc_result_t ret = ISC_R_SUCCESS; + isc_result_t ret = ISC_R_SUCCESS; if (dctx->use == DO_SIGN) { PK11_CALL(pkcs_C_SignUpdate, @@ -488,13 +479,12 @@ pkcs11rsa_adddata(dst_context_t *dctx, const isc_region_t *data) } static isc_result_t -pkcs11rsa_sign(dst_context_t *dctx, isc_buffer_t *sig) -{ - CK_RV rv; - CK_ULONG siglen = 0; - isc_region_t r; +pkcs11rsa_sign(dst_context_t *dctx, isc_buffer_t *sig) { + CK_RV rv; + CK_ULONG siglen = 0; + isc_region_t r; pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx; - isc_result_t ret = ISC_R_SUCCESS; + isc_result_t ret = ISC_R_SUCCESS; PK11_RET(pkcs_C_SignFinal, (pk11_ctx->session, NULL, &siglen), DST_R_SIGNFAILURE); @@ -516,11 +506,10 @@ err: } static isc_result_t -pkcs11rsa_verify(dst_context_t *dctx, const isc_region_t *sig) -{ - CK_RV rv; +pkcs11rsa_verify(dst_context_t *dctx, const isc_region_t *sig) { + CK_RV rv; pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx; - isc_result_t ret = ISC_R_SUCCESS; + isc_result_t ret = ISC_R_SUCCESS; PK11_CALL(pkcs_C_VerifyFinal, (pk11_ctx->session, (CK_BYTE_PTR)sig->base, @@ -546,18 +535,17 @@ CK_BYTE sha256_der[] = { 0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, CK_BYTE sha512_der[] = { 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03, 0x05, 0x00, 0x04, 0x40 }; -#define MAX_DER_SIZE 19 +#define MAX_DER_SIZE 19 #define MIN_PKCS1_PADLEN 11 static isc_result_t -pkcs11rsa_createctx(dst_key_t *key, dst_context_t *dctx) -{ - CK_RV rv; - CK_MECHANISM mech = { 0, NULL, 0 }; - CK_SLOT_ID slotid; - pk11_object_t * rsa = key->keydata.pkey; +pkcs11rsa_createctx(dst_key_t *key, dst_context_t *dctx) { + CK_RV rv; + CK_MECHANISM mech = { 0, NULL, 0 }; + CK_SLOT_ID slotid; + pk11_object_t *rsa = key->keydata.pkey; pk11_context_t *pk11_ctx; - isc_result_t ret; + isc_result_t ret; REQUIRE(key->key_alg == DST_ALG_RSASHA1 || key->key_alg == DST_ALG_NSEC3RSASHA1 || @@ -578,8 +566,8 @@ pkcs11rsa_createctx(dst_key_t *key, dst_context_t *dctx) break; case DST_ALG_RSASHA256: /* From RFC 5702 */ - if ((dctx->key->key_size < 512) || - (dctx->key->key_size > 4096)) { + if ((dctx->key->key_size < 512) || (dctx->key->key_size > 4096)) + { return (ISC_R_FAILURE); } break; @@ -637,10 +625,9 @@ err: } static void -pkcs11rsa_destroyctx(dst_context_t *dctx) -{ - CK_BYTE garbage[ISC_SHA512_DIGESTLENGTH]; - CK_ULONG len = ISC_SHA512_DIGESTLENGTH; +pkcs11rsa_destroyctx(dst_context_t *dctx) { + CK_BYTE garbage[ISC_SHA512_DIGESTLENGTH]; + CK_ULONG len = ISC_SHA512_DIGESTLENGTH; pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx; if (pk11_ctx != NULL) { @@ -654,11 +641,10 @@ pkcs11rsa_destroyctx(dst_context_t *dctx) } static isc_result_t -pkcs11rsa_adddata(dst_context_t *dctx, const isc_region_t *data) -{ - CK_RV rv; +pkcs11rsa_adddata(dst_context_t *dctx, const isc_region_t *data) { + CK_RV rv; pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx; - isc_result_t ret = ISC_R_SUCCESS; + isc_result_t ret = ISC_R_SUCCESS; PK11_CALL(pkcs_C_DigestUpdate, (pk11_ctx->session, (CK_BYTE_PTR)data->base, @@ -669,42 +655,41 @@ pkcs11rsa_adddata(dst_context_t *dctx, const isc_region_t *data) } static isc_result_t -pkcs11rsa_sign(dst_context_t *dctx, isc_buffer_t *sig) -{ - CK_RV rv; - CK_MECHANISM mech = { CKM_RSA_PKCS, NULL, 0 }; +pkcs11rsa_sign(dst_context_t *dctx, isc_buffer_t *sig) { + CK_RV rv; + CK_MECHANISM mech = { CKM_RSA_PKCS, NULL, 0 }; CK_OBJECT_HANDLE hKey = CK_INVALID_HANDLE; - CK_OBJECT_CLASS keyClass = CKO_PRIVATE_KEY; - CK_KEY_TYPE keyType = CKK_RSA; - CK_ATTRIBUTE keyTemplate[] = { - { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_SENSITIVE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_MODULUS, NULL, 0 }, - { CKA_PUBLIC_EXPONENT, NULL, 0 }, - { CKA_PRIVATE_EXPONENT, NULL, 0 }, - { CKA_PRIME_1, NULL, 0 }, - { CKA_PRIME_2, NULL, 0 }, - { CKA_EXPONENT_1, NULL, 0 }, - { CKA_EXPONENT_2, NULL, 0 }, - { CKA_COEFFICIENT, NULL, 0 } + CK_OBJECT_CLASS keyClass = CKO_PRIVATE_KEY; + CK_KEY_TYPE keyType = CKK_RSA; + CK_ATTRIBUTE keyTemplate[] = { + { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_SENSITIVE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_MODULUS, NULL, 0 }, + { CKA_PUBLIC_EXPONENT, NULL, 0 }, + { CKA_PRIVATE_EXPONENT, NULL, 0 }, + { CKA_PRIME_1, NULL, 0 }, + { CKA_PRIME_2, NULL, 0 }, + { CKA_EXPONENT_1, NULL, 0 }, + { CKA_EXPONENT_2, NULL, 0 }, + { CKA_COEFFICIENT, NULL, 0 } }; - CK_ATTRIBUTE * attr; - CK_BYTE digest[MAX_DER_SIZE + ISC_SHA512_DIGESTLENGTH]; - CK_BYTE * der; - CK_ULONG derlen; - CK_ULONG hashlen; - CK_ULONG dgstlen; - CK_ULONG siglen = 0; + CK_ATTRIBUTE *attr; + CK_BYTE digest[MAX_DER_SIZE + ISC_SHA512_DIGESTLENGTH]; + CK_BYTE *der; + CK_ULONG derlen; + CK_ULONG hashlen; + CK_ULONG dgstlen; + CK_ULONG siglen = 0; pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx; - dst_key_t * key = dctx->key; - pk11_object_t * rsa = key->keydata.pkey; - isc_region_t r; - isc_result_t ret = ISC_R_SUCCESS; - unsigned int i; + dst_key_t *key = dctx->key; + pk11_object_t *rsa = key->keydata.pkey; + isc_region_t r; + isc_result_t ret = ISC_R_SUCCESS; + unsigned int i; REQUIRE(key->key_alg == DST_ALG_RSASHA1 || key->key_alg == DST_ALG_NSEC3RSASHA1 || @@ -725,8 +710,8 @@ pkcs11rsa_sign(dst_context_t *dctx, isc_buffer_t *sig) break; case DST_ALG_RSASHA256: /* From RFC 5702 */ - if ((dctx->key->key_size < 512) || - (dctx->key->key_size > 4096)) { + if ((dctx->key->key_size < 512) || (dctx->key->key_size > 4096)) + { return (ISC_R_FAILURE); } break; @@ -787,64 +772,64 @@ pkcs11rsa_sign(dst_context_t *dctx, isc_buffer_t *sig) switch (attr->type) { case CKA_MODULUS: INSIST(keyTemplate[6].type == attr->type); - keyTemplate[6].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[6].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[6].pValue, attr->pValue, attr->ulValueLen); keyTemplate[6].ulValueLen = attr->ulValueLen; break; case CKA_PUBLIC_EXPONENT: INSIST(keyTemplate[7].type == attr->type); - keyTemplate[7].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[7].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[7].pValue, attr->pValue, attr->ulValueLen); keyTemplate[7].ulValueLen = attr->ulValueLen; break; case CKA_PRIVATE_EXPONENT: INSIST(keyTemplate[8].type == attr->type); - keyTemplate[8].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[8].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[8].pValue, attr->pValue, attr->ulValueLen); keyTemplate[8].ulValueLen = attr->ulValueLen; break; case CKA_PRIME_1: INSIST(keyTemplate[9].type == attr->type); - keyTemplate[9].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[9].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[9].pValue, attr->pValue, attr->ulValueLen); keyTemplate[9].ulValueLen = attr->ulValueLen; break; case CKA_PRIME_2: INSIST(keyTemplate[10].type == attr->type); - keyTemplate[10].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[10].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[10].pValue, attr->pValue, attr->ulValueLen); keyTemplate[10].ulValueLen = attr->ulValueLen; break; case CKA_EXPONENT_1: INSIST(keyTemplate[11].type == attr->type); - keyTemplate[11].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[11].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[11].pValue, attr->pValue, attr->ulValueLen); keyTemplate[11].ulValueLen = attr->ulValueLen; break; case CKA_EXPONENT_2: INSIST(keyTemplate[12].type == attr->type); - keyTemplate[12].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[12].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[12].pValue, attr->pValue, attr->ulValueLen); keyTemplate[12].ulValueLen = attr->ulValueLen; break; case CKA_COEFFICIENT: INSIST(keyTemplate[13].type == attr->type); - keyTemplate[13].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[13].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[13].pValue, attr->pValue, attr->ulValueLen); keyTemplate[13].ulValueLen = attr->ulValueLen; @@ -901,33 +886,32 @@ err: } static isc_result_t -pkcs11rsa_verify(dst_context_t *dctx, const isc_region_t *sig) -{ - CK_RV rv; - CK_MECHANISM mech = { CKM_RSA_PKCS, NULL, 0 }; +pkcs11rsa_verify(dst_context_t *dctx, const isc_region_t *sig) { + CK_RV rv; + CK_MECHANISM mech = { CKM_RSA_PKCS, NULL, 0 }; CK_OBJECT_HANDLE hKey = CK_INVALID_HANDLE; - CK_OBJECT_CLASS keyClass = CKO_PUBLIC_KEY; - CK_KEY_TYPE keyType = CKK_RSA; - CK_ATTRIBUTE keyTemplate[] = { - { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_MODULUS, NULL, 0 }, - { CKA_PUBLIC_EXPONENT, NULL, 0 }, + CK_OBJECT_CLASS keyClass = CKO_PUBLIC_KEY; + CK_KEY_TYPE keyType = CKK_RSA; + CK_ATTRIBUTE keyTemplate[] = { + { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_MODULUS, NULL, 0 }, + { CKA_PUBLIC_EXPONENT, NULL, 0 }, }; - CK_ATTRIBUTE * attr; - CK_BYTE digest[MAX_DER_SIZE + ISC_SHA512_DIGESTLENGTH]; - CK_BYTE * der; - CK_ULONG derlen; - CK_ULONG hashlen; - CK_ULONG dgstlen; + CK_ATTRIBUTE *attr; + CK_BYTE digest[MAX_DER_SIZE + ISC_SHA512_DIGESTLENGTH]; + CK_BYTE *der; + CK_ULONG derlen; + CK_ULONG hashlen; + CK_ULONG dgstlen; pk11_context_t *pk11_ctx = dctx->ctxdata.pk11_ctx; - dst_key_t * key = dctx->key; - pk11_object_t * rsa = key->keydata.pkey; - isc_result_t ret = ISC_R_SUCCESS; - unsigned int i; + dst_key_t *key = dctx->key; + pk11_object_t *rsa = key->keydata.pkey; + isc_result_t ret = ISC_R_SUCCESS; + unsigned int i; REQUIRE(key->key_alg == DST_ALG_RSASHA1 || key->key_alg == DST_ALG_NSEC3RSASHA1 || @@ -969,16 +953,16 @@ pkcs11rsa_verify(dst_context_t *dctx, const isc_region_t *sig) switch (attr->type) { case CKA_MODULUS: INSIST(keyTemplate[5].type == attr->type); - keyTemplate[5].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[5].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[5].pValue, attr->pValue, attr->ulValueLen); keyTemplate[5].ulValueLen = attr->ulValueLen; break; case CKA_PUBLIC_EXPONENT: INSIST(keyTemplate[6].type == attr->type); - keyTemplate[6].pValue = - isc_mem_get(dctx->mctx, attr->ulValueLen); + keyTemplate[6].pValue = isc_mem_get(dctx->mctx, + attr->ulValueLen); memmove(keyTemplate[6].pValue, attr->pValue, attr->ulValueLen); keyTemplate[6].ulValueLen = attr->ulValueLen; @@ -1026,10 +1010,9 @@ err: #endif /* ifndef PK11_RSA_PKCS_REPLACE */ static bool -pkcs11rsa_compare(const dst_key_t *key1, const dst_key_t *key2) -{ +pkcs11rsa_compare(const dst_key_t *key1, const dst_key_t *key2) { pk11_object_t *rsa1, *rsa2; - CK_ATTRIBUTE * attr1, *attr2; + CK_ATTRIBUTE *attr1, *attr2; rsa1 = key1->keydata.pkey; rsa2 = key2->keydata.pkey; @@ -1047,7 +1030,8 @@ pkcs11rsa_compare(const dst_key_t *key1, const dst_key_t *key2) } else if ((attr1 == NULL) || (attr2 == NULL) || (attr1->ulValueLen != attr2->ulValueLen) || !isc_safe_memequal(attr1->pValue, attr2->pValue, - attr1->ulValueLen)) { + attr1->ulValueLen)) + { return (false); } @@ -1058,7 +1042,8 @@ pkcs11rsa_compare(const dst_key_t *key1, const dst_key_t *key2) } else if ((attr1 == NULL) || (attr2 == NULL) || (attr1->ulValueLen != attr2->ulValueLen) || !isc_safe_memequal(attr1->pValue, attr2->pValue, - attr1->ulValueLen)) { + attr1->ulValueLen)) + { return (false); } @@ -1068,7 +1053,8 @@ pkcs11rsa_compare(const dst_key_t *key1, const dst_key_t *key2) ((attr1 == NULL) || (attr2 == NULL) || (attr1->ulValueLen != attr2->ulValueLen) || !isc_safe_memequal(attr1->pValue, attr2->pValue, - attr1->ulValueLen))) { + attr1->ulValueLen))) + { return (false); } @@ -1083,40 +1069,39 @@ pkcs11rsa_compare(const dst_key_t *key1, const dst_key_t *key2) } static isc_result_t -pkcs11rsa_generate(dst_key_t *key, int exp, void (*callback)(int)) -{ - CK_RV rv; - CK_MECHANISM mech = { CKM_RSA_PKCS_KEY_PAIR_GEN, NULL, 0 }; +pkcs11rsa_generate(dst_key_t *key, int exp, void (*callback)(int)) { + CK_RV rv; + CK_MECHANISM mech = { CKM_RSA_PKCS_KEY_PAIR_GEN, NULL, 0 }; CK_OBJECT_HANDLE pub = CK_INVALID_HANDLE; - CK_ULONG bits = 0; - CK_BYTE pubexp[5]; - CK_OBJECT_CLASS pubClass = CKO_PUBLIC_KEY; - CK_KEY_TYPE keyType = CKK_RSA; - CK_ATTRIBUTE pubTemplate[] = { - { CKA_CLASS, &pubClass, (CK_ULONG)sizeof(pubClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_MODULUS_BITS, &bits, (CK_ULONG)sizeof(bits) }, - { CKA_PUBLIC_EXPONENT, &pubexp, (CK_ULONG)sizeof(pubexp) } + CK_ULONG bits = 0; + CK_BYTE pubexp[5]; + CK_OBJECT_CLASS pubClass = CKO_PUBLIC_KEY; + CK_KEY_TYPE keyType = CKK_RSA; + CK_ATTRIBUTE pubTemplate[] = { + { CKA_CLASS, &pubClass, (CK_ULONG)sizeof(pubClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_VERIFY, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_MODULUS_BITS, &bits, (CK_ULONG)sizeof(bits) }, + { CKA_PUBLIC_EXPONENT, &pubexp, (CK_ULONG)sizeof(pubexp) } }; CK_OBJECT_HANDLE priv = CK_INVALID_HANDLE; - CK_OBJECT_CLASS privClass = CKO_PRIVATE_KEY; - CK_ATTRIBUTE privTemplate[] = { - { CKA_CLASS, &privClass, (CK_ULONG)sizeof(privClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_SENSITIVE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, - { CKA_EXTRACTABLE, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) }, + CK_OBJECT_CLASS privClass = CKO_PRIVATE_KEY; + CK_ATTRIBUTE privTemplate[] = { + { CKA_CLASS, &privClass, (CK_ULONG)sizeof(privClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_PRIVATE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_SENSITIVE, &falsevalue, (CK_ULONG)sizeof(falsevalue) }, + { CKA_EXTRACTABLE, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_SIGN, &truevalue, (CK_ULONG)sizeof(truevalue) }, }; - CK_ATTRIBUTE * attr; - pk11_object_t * rsa; + CK_ATTRIBUTE *attr; + pk11_object_t *rsa; pk11_context_t *pk11_ctx; - isc_result_t ret; - unsigned int i; + isc_result_t ret; + unsigned int i; UNUSED(callback); @@ -1237,10 +1222,9 @@ err: } static bool -pkcs11rsa_isprivate(const dst_key_t *key) -{ +pkcs11rsa_isprivate(const dst_key_t *key) { pk11_object_t *rsa = key->keydata.pkey; - CK_ATTRIBUTE * attr; + CK_ATTRIBUTE *attr; if (rsa == NULL) { return (false); @@ -1250,10 +1234,9 @@ pkcs11rsa_isprivate(const dst_key_t *key) } static void -pkcs11rsa_destroy(dst_key_t *key) -{ +pkcs11rsa_destroy(dst_key_t *key) { pk11_object_t *rsa = key->keydata.pkey; - CK_ATTRIBUTE * attr; + CK_ATTRIBUTE *attr; if (rsa == NULL) { return; @@ -1292,13 +1275,12 @@ pkcs11rsa_destroy(dst_key_t *key) } static isc_result_t -pkcs11rsa_todns(const dst_key_t *key, isc_buffer_t *data) -{ +pkcs11rsa_todns(const dst_key_t *key, isc_buffer_t *data) { pk11_object_t *rsa; - CK_ATTRIBUTE * attr; - isc_region_t r; - unsigned int e_bytes = 0, mod_bytes = 0; - CK_BYTE * exponent = NULL, *modulus = NULL; + CK_ATTRIBUTE *attr; + isc_region_t r; + unsigned int e_bytes = 0, mod_bytes = 0; + CK_BYTE *exponent = NULL, *modulus = NULL; REQUIRE(key->keydata.pkey != NULL); @@ -1349,14 +1331,13 @@ pkcs11rsa_todns(const dst_key_t *key, isc_buffer_t *data) } static isc_result_t -pkcs11rsa_fromdns(dst_key_t *key, isc_buffer_t *data) -{ +pkcs11rsa_fromdns(dst_key_t *key, isc_buffer_t *data) { pk11_object_t *rsa; - isc_region_t r; - unsigned int e_bytes, mod_bytes; - CK_BYTE * exponent = NULL, *modulus = NULL; - CK_ATTRIBUTE * attr; - unsigned int length; + isc_region_t r; + unsigned int e_bytes, mod_bytes; + CK_BYTE *exponent = NULL, *modulus = NULL; + CK_ATTRIBUTE *attr; + unsigned int length; isc_buffer_remainingregion(data, &r); if (r.length == 0) { @@ -1416,17 +1397,16 @@ pkcs11rsa_fromdns(dst_key_t *key, isc_buffer_t *data) } static isc_result_t -pkcs11rsa_tofile(const dst_key_t *key, const char *directory) -{ - int i; +pkcs11rsa_tofile(const dst_key_t *key, const char *directory) { + int i; pk11_object_t *rsa; - CK_ATTRIBUTE * attr; - CK_ATTRIBUTE * modulus = NULL, *exponent = NULL; - CK_ATTRIBUTE * d = NULL, *p = NULL, *q = NULL; - CK_ATTRIBUTE * dmp1 = NULL, *dmq1 = NULL, *iqmp = NULL; - dst_private_t priv; + CK_ATTRIBUTE *attr; + CK_ATTRIBUTE *modulus = NULL, *exponent = NULL; + CK_ATTRIBUTE *d = NULL, *p = NULL, *q = NULL; + CK_ATTRIBUTE *dmp1 = NULL, *dmq1 = NULL, *iqmp = NULL; + dst_private_t priv; unsigned char *bufs[10]; - isc_result_t result; + isc_result_t result; if (key->keydata.pkey == NULL) { return (DST_R_NULLKEY); @@ -1542,16 +1522,16 @@ pkcs11rsa_tofile(const dst_key_t *key, const char *directory) if (key->engine != NULL) { priv.elements[i].tag = TAG_RSA_ENGINE; - priv.elements[i].length = - (unsigned short)strlen(key->engine) + 1; + priv.elements[i].length = (unsigned short)strlen(key->engine) + + 1; priv.elements[i].data = (unsigned char *)key->engine; i++; } if (key->label != NULL) { priv.elements[i].tag = TAG_RSA_LABEL; - priv.elements[i].length = - (unsigned short)strlen(key->label) + 1; + priv.elements[i].length = (unsigned short)strlen(key->label) + + 1; priv.elements[i].data = (unsigned char *)key->label; i++; } @@ -1570,24 +1550,23 @@ pkcs11rsa_tofile(const dst_key_t *key, const char *directory) static isc_result_t pkcs11rsa_fetch(dst_key_t *key, const char *engine, const char *label, - dst_key_t *pub) -{ - CK_RV rv; + dst_key_t *pub) { + CK_RV rv; CK_OBJECT_CLASS keyClass = CKO_PRIVATE_KEY; - CK_KEY_TYPE keyType = CKK_RSA; - CK_ATTRIBUTE searchTemplate[] = { - { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_LABEL, NULL, 0 } + CK_KEY_TYPE keyType = CKK_RSA; + CK_ATTRIBUTE searchTemplate[] = { + { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_LABEL, NULL, 0 } }; - CK_ULONG cnt; - CK_ATTRIBUTE * attr; - CK_ATTRIBUTE * pubattr; - pk11_object_t * rsa; - pk11_object_t * pubrsa; + CK_ULONG cnt; + CK_ATTRIBUTE *attr; + CK_ATTRIBUTE *pubattr; + pk11_object_t *rsa; + pk11_object_t *pubrsa; pk11_context_t *pk11_ctx = NULL; - isc_result_t ret; + isc_result_t ret; if (label == NULL) { return (DST_R_NOENGINE); @@ -1681,13 +1660,12 @@ err: } static isc_result_t -rsa_check(pk11_object_t *rsa, pk11_object_t *pubrsa) -{ +rsa_check(pk11_object_t *rsa, pk11_object_t *pubrsa) { CK_ATTRIBUTE *pubattr, *privattr; - CK_BYTE * priv_exp = NULL, *priv_mod = NULL; - CK_BYTE * pub_exp = NULL, *pub_mod = NULL; - unsigned int priv_explen = 0, priv_modlen = 0; - unsigned int pub_explen = 0, pub_modlen = 0; + CK_BYTE *priv_exp = NULL, *priv_mod = NULL; + CK_BYTE *pub_exp = NULL, *pub_mod = NULL; + unsigned int priv_explen = 0, priv_modlen = 0; + unsigned int pub_explen = 0, pub_modlen = 0; REQUIRE(rsa != NULL && pubrsa != NULL); @@ -1751,15 +1729,14 @@ rsa_check(pk11_object_t *rsa, pk11_object_t *pubrsa) } static isc_result_t -pkcs11rsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) -{ - dst_private_t priv; - isc_result_t ret; - int i; +pkcs11rsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) { + dst_private_t priv; + isc_result_t ret; + int i; pk11_object_t *rsa; - CK_ATTRIBUTE * attr; - isc_mem_t * mctx = key->mctx; - const char * engine = NULL, *label = NULL; + CK_ATTRIBUTE *attr; + isc_mem_t *mctx = key->mctx; + const char *engine = NULL, *label = NULL; /* read private key file */ ret = dst__privstruct_parse(key, DST_ALG_RSA, lexer, mctx, &priv); @@ -1901,8 +1878,8 @@ pkcs11rsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) attr = pk11_attribute_bytype(rsa, CKA_PUBLIC_EXPONENT); INSIST(attr != NULL); - if (pk11_numbits(attr->pValue, attr->ulValueLen) > - RSA_MAX_PUBEXP_BITS) { + if (pk11_numbits(attr->pValue, attr->ulValueLen) > RSA_MAX_PUBEXP_BITS) + { DST_RET(ISC_R_RANGE); } @@ -1920,24 +1897,23 @@ err: static isc_result_t pkcs11rsa_fromlabel(dst_key_t *key, const char *engine, const char *label, - const char *pin) -{ - CK_RV rv; + const char *pin) { + CK_RV rv; CK_OBJECT_HANDLE hKey = CK_INVALID_HANDLE; - CK_OBJECT_CLASS keyClass = CKO_PUBLIC_KEY; - CK_KEY_TYPE keyType = CKK_RSA; - CK_ATTRIBUTE searchTemplate[] = { - { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, - { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, - { CKA_TOKEN, &truevalue, (CK_ULONG)sizeof(truevalue) }, - { CKA_LABEL, NULL, 0 } + CK_OBJECT_CLASS keyClass = CKO_PUBLIC_KEY; + CK_KEY_TYPE keyType = CKK_RSA; + CK_ATTRIBUTE searchTemplate[] = { + { CKA_CLASS, &keyClass, (CK_ULONG)sizeof(keyClass) }, + { CKA_KEY_TYPE, &keyType, (CK_ULONG)sizeof(keyType) }, + { CKA_TOKEN, &truevalue, (CK_ULONG)sizeof(truevalue) }, + { CKA_LABEL, NULL, 0 } }; - CK_ULONG cnt; - CK_ATTRIBUTE * attr; - pk11_object_t * rsa; + CK_ULONG cnt; + CK_ATTRIBUTE *attr; + pk11_object_t *rsa; pk11_context_t *pk11_ctx = NULL; - isc_result_t ret; - unsigned int i; + isc_result_t ret; + unsigned int i; UNUSED(pin); @@ -2023,8 +1999,8 @@ pkcs11rsa_fromlabel(dst_key_t *key, const char *engine, const char *label, attr = pk11_attribute_bytype(rsa, CKA_PUBLIC_EXPONENT); INSIST(attr != NULL); - if (pk11_numbits(attr->pValue, attr->ulValueLen) > - RSA_MAX_PUBEXP_BITS) { + if (pk11_numbits(attr->pValue, attr->ulValueLen) > RSA_MAX_PUBEXP_BITS) + { DST_RET(ISC_R_RANGE); } @@ -2078,8 +2054,7 @@ static dst_func_t pkcs11rsa_functions = { }; isc_result_t -dst__pkcs11rsa_init(dst_func_t **funcp) -{ +dst__pkcs11rsa_init(dst_func_t **funcp) { REQUIRE(funcp != NULL); if (*funcp == NULL) { diff --git a/lib/dns/portlist.c b/lib/dns/portlist.c index 7e2fcde46f..cc65f4de51 100644 --- a/lib/dns/portlist.c +++ b/lib/dns/portlist.c @@ -28,31 +28,30 @@ #include #include -#define DNS_PORTLIST_MAGIC ISC_MAGIC('P', 'L', 'S', 'T') +#define DNS_PORTLIST_MAGIC ISC_MAGIC('P', 'L', 'S', 'T') #define DNS_VALID_PORTLIST(p) ISC_MAGIC_VALID(p, DNS_PORTLIST_MAGIC) typedef struct dns_element { in_port_t port; - uint16_t flags; + uint16_t flags; } dns_element_t; struct dns_portlist { - unsigned int magic; - isc_mem_t * mctx; + unsigned int magic; + isc_mem_t *mctx; isc_refcount_t refcount; - isc_mutex_t lock; + isc_mutex_t lock; dns_element_t *list; - unsigned int allocated; - unsigned int active; + unsigned int allocated; + unsigned int active; }; -#define DNS_PL_INET 0x0001 -#define DNS_PL_INET6 0x0002 +#define DNS_PL_INET 0x0001 +#define DNS_PL_INET6 0x0002 #define DNS_PL_ALLOCATE 16 static int -compare(const void *arg1, const void *arg2) -{ +compare(const void *arg1, const void *arg2) { const dns_element_t *e1 = (const dns_element_t *)arg1; const dns_element_t *e2 = (const dns_element_t *)arg2; @@ -66,8 +65,7 @@ compare(const void *arg1, const void *arg2) } isc_result_t -dns_portlist_create(isc_mem_t *mctx, dns_portlist_t **portlistp) -{ +dns_portlist_create(isc_mem_t *mctx, dns_portlist_t **portlistp) { dns_portlist_t *portlist; REQUIRE(portlistp != NULL && *portlistp == NULL); @@ -86,8 +84,7 @@ dns_portlist_create(isc_mem_t *mctx, dns_portlist_t **portlistp) } static dns_element_t * -find_port(dns_element_t *list, unsigned int len, in_port_t port) -{ +find_port(dns_element_t *list, unsigned int len, in_port_t port) { unsigned int xtry = len / 2; unsigned int min = 0; unsigned int max = len - 1; @@ -125,10 +122,9 @@ find_port(dns_element_t *list, unsigned int len, in_port_t port) } isc_result_t -dns_portlist_add(dns_portlist_t *portlist, int af, in_port_t port) -{ +dns_portlist_add(dns_portlist_t *portlist, int af, in_port_t port) { dns_element_t *el; - isc_result_t result; + isc_result_t result; REQUIRE(DNS_VALID_PORTLIST(portlist)); REQUIRE(af == AF_INET || af == AF_INET6); @@ -175,8 +171,7 @@ unlock: } void -dns_portlist_remove(dns_portlist_t *portlist, int af, in_port_t port) -{ +dns_portlist_remove(dns_portlist_t *portlist, int af, in_port_t port) { dns_element_t *el; REQUIRE(DNS_VALID_PORTLIST(portlist)); @@ -203,10 +198,9 @@ dns_portlist_remove(dns_portlist_t *portlist, int af, in_port_t port) } bool -dns_portlist_match(dns_portlist_t *portlist, int af, in_port_t port) -{ +dns_portlist_match(dns_portlist_t *portlist, int af, in_port_t port) { dns_element_t *el; - bool result = false; + bool result = false; REQUIRE(DNS_VALID_PORTLIST(portlist)); REQUIRE(af == AF_INET || af == AF_INET6); @@ -227,8 +221,7 @@ dns_portlist_match(dns_portlist_t *portlist, int af, in_port_t port) } void -dns_portlist_attach(dns_portlist_t *portlist, dns_portlist_t **portlistp) -{ +dns_portlist_attach(dns_portlist_t *portlist, dns_portlist_t **portlistp) { REQUIRE(DNS_VALID_PORTLIST(portlist)); REQUIRE(portlistp != NULL && *portlistp == NULL); @@ -237,8 +230,7 @@ dns_portlist_attach(dns_portlist_t *portlist, dns_portlist_t **portlistp) } void -dns_portlist_detach(dns_portlist_t **portlistp) -{ +dns_portlist_detach(dns_portlist_t **portlistp) { REQUIRE(portlistp != NULL && DNS_VALID_PORTLIST(*portlistp)); dns_portlist_t *portlist = *portlistp; *portlistp = NULL; diff --git a/lib/dns/private.c b/lib/dns/private.c index 5673d09883..bd93189dd6 100644 --- a/lib/dns/private.c +++ b/lib/dns/private.c @@ -37,10 +37,10 @@ * been requested to be built otherwise a NSEC chain needs to be built. */ -#define REMOVE(x) (((x)&DNS_NSEC3FLAG_REMOVE) != 0) -#define CREATE(x) (((x)&DNS_NSEC3FLAG_CREATE) != 0) +#define REMOVE(x) (((x)&DNS_NSEC3FLAG_REMOVE) != 0) +#define CREATE(x) (((x)&DNS_NSEC3FLAG_CREATE) != 0) #define INITIAL(x) (((x)&DNS_NSEC3FLAG_INITIAL) != 0) -#define NONSEC(x) (((x)&DNS_NSEC3FLAG_NONSEC) != 0) +#define NONSEC(x) (((x)&DNS_NSEC3FLAG_NONSEC) != 0) #define CHECK(x) \ do { \ @@ -58,12 +58,12 @@ */ static bool -ignore(dns_rdata_t *param, dns_rdataset_t *privateset) -{ +ignore(dns_rdata_t *param, dns_rdataset_t *privateset) { isc_result_t result; for (result = dns_rdataset_first(privateset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(privateset)) { + result = dns_rdataset_next(privateset)) + { unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE]; dns_rdata_t private = DNS_RDATA_INIT; dns_rdata_t rdata = DNS_RDATA_INIT; @@ -84,7 +84,8 @@ ignore(dns_rdata_t *param, dns_rdataset_t *privateset) rdata.data[2] != param->data[2] || rdata.data[3] != param->data[3] || rdata.data[4] != param->data[4] || - memcmp(&rdata.data[5], ¶m->data[5], param->data[4])) { + memcmp(&rdata.data[5], ¶m->data[5], param->data[4])) + { continue; } /* @@ -103,15 +104,14 @@ ignore(dns_rdata_t *param, dns_rdataset_t *privateset) isc_result_t dns_private_chains(dns_db_t *db, dns_dbversion_t *ver, dns_rdatatype_t privatetype, bool *build_nsec, - bool *build_nsec3) -{ - dns_dbnode_t * node; + bool *build_nsec3) { + dns_dbnode_t *node; dns_rdataset_t nsecset, nsec3paramset, privateset; - bool nsec3chain; - bool signing; - isc_result_t result; - unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE]; - unsigned int count; + bool nsec3chain; + bool signing; + isc_result_t result; + unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE]; + unsigned int count; node = NULL; dns_rdataset_init(&nsecset); @@ -134,7 +134,8 @@ dns_private_chains(dns_db_t *db, dns_dbversion_t *ver, } if (dns_rdataset_isassociated(&nsecset) && - dns_rdataset_isassociated(&nsec3paramset)) { + dns_rdataset_isassociated(&nsec3paramset)) + { if (build_nsec != NULL) { *build_nsec = true; } @@ -168,7 +169,8 @@ dns_private_chains(dns_db_t *db, dns_dbversion_t *ver, } for (result = dns_rdataset_first(&privateset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&privateset)) { + result = dns_rdataset_next(&privateset)) + { dns_rdata_t private = DNS_RDATA_INIT; dns_rdata_t rdata = DNS_RDATA_INIT; @@ -204,7 +206,8 @@ dns_private_chains(dns_db_t *db, dns_dbversion_t *ver, */ for (result = dns_rdataset_first(&privateset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&privateset)) { + result = dns_rdataset_next(&privateset)) + { dns_rdata_t private = DNS_RDATA_INIT; dns_rdata_t rdata = DNS_RDATA_INIT; @@ -225,7 +228,8 @@ dns_private_chains(dns_db_t *db, dns_dbversion_t *ver, count = 0; for (result = dns_rdataset_first(&nsec3paramset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&nsec3paramset)) { + result = dns_rdataset_next(&nsec3paramset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; /* @@ -270,7 +274,8 @@ dns_private_chains(dns_db_t *db, dns_dbversion_t *ver, nsec3chain = false; for (result = dns_rdataset_first(&privateset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&privateset)) { + result = dns_rdataset_next(&privateset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_t private = DNS_RDATA_INIT; @@ -282,7 +287,8 @@ dns_private_chains(dns_db_t *db, dns_dbversion_t *ver, * zone with a key. */ if (private.length == 5 && private.data[0] != 0 && - private.data[3] == 0 && private.data[4] == 0) { + private.data[3] == 0 && private.data[4] == 0) + { signing = true; } } else { @@ -323,8 +329,7 @@ failure: } isc_result_t -dns_private_totext(dns_rdata_t *private, isc_buffer_t *buf) -{ +dns_private_totext(dns_rdata_t *private, isc_buffer_t *buf) { isc_result_t result; if (private->length < 5) { @@ -332,12 +337,12 @@ dns_private_totext(dns_rdata_t *private, isc_buffer_t *buf) } if (private->data[0] == 0) { - unsigned char nsec3buf[DNS_NSEC3PARAM_BUFFERSIZE]; - unsigned char newbuf[DNS_NSEC3PARAM_BUFFERSIZE]; - dns_rdata_t rdata = DNS_RDATA_INIT; + unsigned char nsec3buf[DNS_NSEC3PARAM_BUFFERSIZE]; + unsigned char newbuf[DNS_NSEC3PARAM_BUFFERSIZE]; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_nsec3param_t nsec3param; - bool del, init, nonsec; - isc_buffer_t b; + bool del, init, nonsec; + isc_buffer_t b; if (!dns_nsec3param_fromprivate(private, &rdata, nsec3buf, sizeof(nsec3buf))) { @@ -376,9 +381,9 @@ dns_private_totext(dns_rdata_t *private, isc_buffer_t *buf) } else if (private->length == 5) { unsigned char alg = private->data[0]; dns_keytag_t keyid = (private->data[2] | private->data[1] << 8); - char keybuf[BUFSIZ], algbuf[DNS_SECALG_FORMATSIZE]; - bool del = private->data[3]; - bool complete = private->data[4]; + char keybuf[BUFSIZ], algbuf[DNS_SECALG_FORMATSIZE]; + bool del = private->data[3]; + bool complete = private->data[4]; if (del && complete) { isc_buffer_putstr(buf, "Done removing signatures for "); diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c index affbec0486..d459846a5b 100644 --- a/lib/dns/rbt.c +++ b/lib/dns/rbt.c @@ -50,7 +50,7 @@ goto cleanup; \ } while (0) -#define RBT_MAGIC ISC_MAGIC('R', 'B', 'T', '+') +#define RBT_MAGIC ISC_MAGIC('R', 'B', 'T', '+') #define VALID_RBT(rbt) ISC_MAGIC_VALID(rbt, RBT_MAGIC) /* @@ -58,7 +58,7 @@ * chain junk, and replace with dns_rbt_firstnode, _previousnode, _nextnode, * _lastnode. This would involve pretty major change to the API. */ -#define CHAIN_MAGIC ISC_MAGIC('0', '-', '0', '-') +#define CHAIN_MAGIC ISC_MAGIC('0', '-', '0', '-') #define VALID_CHAIN(chain) ISC_MAGIC_VALID(chain, CHAIN_MAGIC) #define RBT_HASH_SIZE 64 @@ -69,18 +69,18 @@ #endif /* ifdef RBT_MEM_TEST */ struct dns_rbt { - unsigned int magic; - isc_mem_t * mctx; + unsigned int magic; + isc_mem_t *mctx; dns_rbtnode_t *root; void (*data_deleter)(void *, void *); - void * deleter_arg; - unsigned int nodecount; - size_t hashsize; + void *deleter_arg; + unsigned int nodecount; + size_t hashsize; dns_rbtnode_t **hashtable; - void * mmap_location; + void *mmap_location; }; -#define RED 0 +#define RED 0 #define BLACK 1 /* @@ -98,20 +98,20 @@ static char FILE_VERSION[32] = "\0"; #define HEADER_LENGTH 1024 struct file_header { - char version1[32]; + char version1[32]; uint64_t first_node_offset; /* usually 1024 */ /* * information about the system on which the map file was generated * will be used to tell if we can load the map file or not */ - uint32_t ptrsize; + uint32_t ptrsize; unsigned int bigendian : 1; /* big or little endian system */ unsigned int rdataset_fixed : 1; /* compiled with * --enable-rrset-fixed */ unsigned int nodecount; /* shadow from rbt structure */ - uint64_t crc; - char version2[32]; /* repeated; must match version1 */ + uint64_t crc; + char version2[32]; /* repeated; must match version1 */ }; /* @@ -133,24 +133,23 @@ 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 @@ -158,8 +157,7 @@ serialize_nodes(FILE *file, dns_rbtnode_t *node, uintptr_t parent, * relative or not */ static inline dns_rbtnode_t * -getparent(dns_rbtnode_t *node, file_header_t *header) -{ +getparent(dns_rbtnode_t *node, file_header_t *header) { char *adjusted_address = (char *)(node->parent); adjusted_address += node->parent_is_relative * (uintptr_t)header; @@ -167,8 +165,7 @@ getparent(dns_rbtnode_t *node, file_header_t *header) } static inline dns_rbtnode_t * -getleft(dns_rbtnode_t *node, file_header_t *header) -{ +getleft(dns_rbtnode_t *node, file_header_t *header) { char *adjusted_address = (char *)(node->left); adjusted_address += node->left_is_relative * (uintptr_t)header; @@ -176,8 +173,7 @@ getleft(dns_rbtnode_t *node, file_header_t *header) } static inline dns_rbtnode_t * -getright(dns_rbtnode_t *node, file_header_t *header) -{ +getright(dns_rbtnode_t *node, file_header_t *header) { char *adjusted_address = (char *)(node->right); adjusted_address += node->right_is_relative * (uintptr_t)header; @@ -185,8 +181,7 @@ getright(dns_rbtnode_t *node, file_header_t *header) } static inline dns_rbtnode_t * -getdown(dns_rbtnode_t *node, file_header_t *header) -{ +getdown(dns_rbtnode_t *node, file_header_t *header) { char *adjusted_address = (char *)(node->down); adjusted_address += node->down_is_relative * (uintptr_t)header; @@ -194,8 +189,7 @@ getdown(dns_rbtnode_t *node, file_header_t *header) } static inline dns_rbtnode_t * -getdata(dns_rbtnode_t *node, file_header_t *header) -{ +getdata(dns_rbtnode_t *node, file_header_t *header) { char *adjusted_address = (char *)(node->data); adjusted_address += node->data_is_relative * (uintptr_t)header; @@ -205,29 +199,29 @@ getdata(dns_rbtnode_t *node, file_header_t *header) /*% * Elements of the rbtnode structure. */ -#define PARENT(node) ((node)->parent) -#define LEFT(node) ((node)->left) -#define RIGHT(node) ((node)->right) -#define DOWN(node) ((node)->down) -#define UPPERNODE(node) ((node)->uppernode) -#define DATA(node) ((node)->data) -#define IS_EMPTY(node) ((node)->data == NULL) -#define HASHNEXT(node) ((node)->hashnext) -#define HASHVAL(node) ((node)->hashval) -#define COLOR(node) ((node)->color) -#define NAMELEN(node) ((node)->namelen) -#define OLDNAMELEN(node) ((node)->oldnamelen) -#define OFFSETLEN(node) ((node)->offsetlen) -#define ATTRS(node) ((node)->attributes) -#define IS_ROOT(node) ((node)->is_root) +#define PARENT(node) ((node)->parent) +#define LEFT(node) ((node)->left) +#define RIGHT(node) ((node)->right) +#define DOWN(node) ((node)->down) +#define UPPERNODE(node) ((node)->uppernode) +#define DATA(node) ((node)->data) +#define IS_EMPTY(node) ((node)->data == NULL) +#define HASHNEXT(node) ((node)->hashnext) +#define HASHVAL(node) ((node)->hashval) +#define COLOR(node) ((node)->color) +#define NAMELEN(node) ((node)->namelen) +#define OLDNAMELEN(node) ((node)->oldnamelen) +#define OFFSETLEN(node) ((node)->offsetlen) +#define ATTRS(node) ((node)->attributes) +#define IS_ROOT(node) ((node)->is_root) #define FINDCALLBACK(node) ((node)->find_callback) /*% * Structure elements from the rbtdb.c, not * used as part of the rbt.c algorithms. */ -#define DIRTY(node) ((node)->dirty) -#define WILD(node) ((node)->wild) +#define DIRTY(node) ((node)->dirty) +#define WILD(node) ((node)->wild) #define LOCKNUM(node) ((node)->locknum) /*% @@ -243,8 +237,8 @@ getdata(dns_rbtnode_t *node, file_header_t *header) * was created. */ -#define NAME(node) ((unsigned char *)((node) + 1)) -#define OFFSETS(node) (NAME(node) + OLDNAMELEN(node) + 1) +#define NAME(node) ((unsigned char *)((node) + 1)) +#define OFFSETS(node) (NAME(node) + OLDNAMELEN(node) + 1) #define OLDOFFSETLEN(node) (OFFSETS(node)[-1]) #define NODE_SIZE(node) \ @@ -253,9 +247,9 @@ getdata(dns_rbtnode_t *node, file_header_t *header) /*% * Color management. */ -#define IS_RED(node) ((node) != NULL && (node)->color == RED) -#define IS_BLACK(node) ((node) == NULL || (node)->color == BLACK) -#define MAKE_RED(node) ((node)->color = RED) +#define IS_RED(node) ((node) != NULL && (node)->color == RED) +#define IS_BLACK(node) ((node) == NULL || (node)->color == BLACK) +#define MAKE_RED(node) ((node)->color = RED) #define MAKE_BLACK(node) ((node)->color = BLACK) /*% @@ -278,8 +272,7 @@ getdata(dns_rbtnode_t *node, file_header_t *header) */ static inline void -NODENAME(dns_rbtnode_t *node, dns_name_t *name) -{ +NODENAME(dns_rbtnode_t *node, dns_name_t *name) { name->length = NAMELEN(node); name->labels = OFFSETLEN(node); name->ndata = NAME(node); @@ -289,8 +282,7 @@ NODENAME(dns_rbtnode_t *node, dns_name_t *name) } void -dns_rbtnode_nodename(dns_rbtnode_t *node, dns_name_t *name) -{ +dns_rbtnode_nodename(dns_rbtnode_t *node, dns_name_t *name) { name->length = NAMELEN(node); name->labels = OFFSETLEN(node); name->ndata = NAME(node); @@ -300,8 +292,7 @@ dns_rbtnode_nodename(dns_rbtnode_t *node, dns_name_t *name) } dns_rbtnode_t * -dns_rbt_root(dns_rbt_t *rbt) -{ +dns_rbt_root(dns_rbt_t *rbt) { return (rbt->root); } @@ -310,11 +301,9 @@ 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) -{ +Name(dns_rbtnode_t *node) { dns_name_t name; dns_name_init(&name, NULL); @@ -326,13 +315,12 @@ Name(dns_rbtnode_t *node) } static void -hexdump(const char *desc, unsigned char *data, size_t size) -{ - char hexdump[BUFSIZ * 2 + 1]; +hexdump(const char *desc, unsigned char *data, size_t size) { + char hexdump[BUFSIZ * 2 + 1]; isc_buffer_t b; isc_region_t r; isc_result_t result; - size_t bytes; + size_t bytes; fprintf(stderr, "%s: ", desc); do { @@ -355,14 +343,12 @@ hexdump(const char *desc, unsigned char *data, size_t size) * subtree. The passed node must not be NULL. */ static inline dns_rbtnode_t * -get_upper_node(dns_rbtnode_t *node) -{ +get_upper_node(dns_rbtnode_t *node) { return (UPPERNODE(node)); } static void -fixup_uppernodes_helper(dns_rbtnode_t *node, dns_rbtnode_t *uppernode) -{ +fixup_uppernodes_helper(dns_rbtnode_t *node, dns_rbtnode_t *uppernode) { if (node == NULL) { return; } @@ -379,14 +365,12 @@ fixup_uppernodes_helper(dns_rbtnode_t *node, dns_rbtnode_t *uppernode) * after deserialization. */ static void -fixup_uppernodes(dns_rbt_t *rbt) -{ +fixup_uppernodes(dns_rbt_t *rbt) { fixup_uppernodes_helper(rbt->root, NULL); } size_t -dns__rbtnode_getdistance(dns_rbtnode_t *node) -{ +dns__rbtnode_getdistance(dns_rbtnode_t *node) { size_t nodes = 1; while (node != NULL) { @@ -403,57 +387,46 @@ 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 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 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 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 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 printnodename(dns_rbtnode_t *node, bool quoted, FILE *f); + +static void freenode(dns_rbt_t *rbt, dns_rbtnode_t **nodep); 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 -unhash_node(dns_rbt_t *rbt, dns_rbtnode_t *node); - -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 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 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 -printnodename(dns_rbtnode_t *node, bool quoted, FILE *f); - -static void -freenode(dns_rbt_t *rbt, dns_rbtnode_t **nodep); - -static isc_result_t -dns_rbt_zero_header(FILE *file) -{ +dns_rbt_zero_header(FILE *file) { /* * Write out a zeroed header as a placeholder. Doing this ensures * that the file will not read while it is partially written, should * writing fail or be interrupted. */ - char buffer[HEADER_LENGTH]; + char buffer[HEADER_LENGTH]; isc_result_t result; memset(buffer, 0, HEADER_LENGTH); @@ -473,8 +446,7 @@ dns_rbt_zero_header(FILE *file) static isc_once_t once = ISC_ONCE_INIT; static void -init_file_version(void) -{ +init_file_version(void) { int n; memset(FILE_VERSION, 0, sizeof(FILE_VERSION)); @@ -492,11 +464,10 @@ init_file_version(void) */ static isc_result_t write_header(FILE *file, dns_rbt_t *rbt, uint64_t first_node_offset, - uint64_t crc) -{ + uint64_t crc) { file_header_t header; - isc_result_t result; - off_t location; + isc_result_t result; + off_t location; RUNTIME_CHECK(isc_once_do(&once, init_file_version) == ISC_R_SUCCESS); @@ -531,14 +502,14 @@ cleanup: } static bool -match_header_version(file_header_t *header) -{ +match_header_version(file_header_t *header) { RUNTIME_CHECK(isc_once_do(&once, init_file_version) == ISC_R_SUCCESS); if (memcmp(header->version1, FILE_VERSION, sizeof(header->version1)) != 0 || memcmp(header->version2, FILE_VERSION, sizeof(header->version1)) != - 0) { + 0) + { return (false); } @@ -547,13 +518,13 @@ 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) -{ - dns_rbtnode_t temp_node; - off_t file_position; + uintptr_t down, uintptr_t parent, uintptr_t data, + uint64_t *crc) { + dns_rbtnode_t temp_node; + off_t file_position; unsigned char *node_data; - size_t datasize; - isc_result_t result; + size_t datasize; + isc_result_t result; #ifdef DEBUG dns_name_t nodename; #endif /* ifdef DEBUG */ @@ -628,10 +599,9 @@ cleanup: 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) -{ - uintptr_t left = 0, right = 0, down = 0, data = 0; - off_t location = 0, offset_adjust; + uintptr_t *where, uint64_t *crc) { + uintptr_t left = 0, right = 0, down = 0, data = 0; + off_t location = 0, offset_adjust; isc_result_t result; if (node == NULL) { @@ -691,8 +661,7 @@ cleanup: } off_t -dns_rbt_serialize_align(off_t target) -{ +dns_rbt_serialize_align(off_t target) { off_t offset = target % 8; if (offset == 0) { @@ -705,11 +674,10 @@ dns_rbt_serialize_align(off_t target) isc_result_t dns_rbt_serialize_tree(FILE *file, dns_rbt_t *rbt, dns_rbtdatawriter_t datawriter, void *writer_arg, - off_t *offset) -{ + off_t *offset) { isc_result_t result; - off_t header_position, node_position, end_position; - uint64_t crc; + off_t header_position, node_position, end_position; + uint64_t crc; REQUIRE(file != NULL); @@ -762,14 +730,13 @@ cleanup: static isc_result_t treefix(dns_rbt_t *rbt, void *base, size_t filesize, dns_rbtnode_t *n, const dns_name_t *name, dns_rbtdatafixer_t datafixer, void *fixer_arg, - uint64_t *crc) -{ - isc_result_t result = ISC_R_SUCCESS; + uint64_t *crc) { + isc_result_t result = ISC_R_SUCCESS; dns_fixedname_t fixed; - dns_name_t nodename, *fullname; - unsigned char * node_data; - dns_rbtnode_t header; - size_t datasize, nodemax = filesize - sizeof(dns_rbtnode_t); + dns_name_t nodename, *fullname; + unsigned char *node_data; + dns_rbtnode_t header; + size_t datasize, nodemax = filesize - sizeof(dns_rbtnode_t); if (n == NULL) { return (ISC_R_SUCCESS); @@ -883,13 +850,12 @@ dns_rbt_deserialize_tree(void *base_address, size_t filesize, off_t header_offset, isc_mem_t *mctx, dns_rbtdeleter_t deleter, void *deleter_arg, dns_rbtdatafixer_t datafixer, void *fixer_arg, - dns_rbtnode_t **originp, dns_rbt_t **rbtp) -{ - isc_result_t result = ISC_R_SUCCESS; + dns_rbtnode_t **originp, dns_rbt_t **rbtp) { + isc_result_t result = ISC_R_SUCCESS; file_header_t *header; - dns_rbt_t * rbt = NULL; - uint64_t crc; - unsigned int host_big_endian; + dns_rbt_t *rbt = NULL; + uint64_t crc; + unsigned int host_big_endian; REQUIRE(originp == NULL || *originp == NULL); REQUIRE(rbtp != NULL && *rbtp == NULL); @@ -981,10 +947,9 @@ cleanup: */ isc_result_t dns_rbt_create(isc_mem_t *mctx, dns_rbtdeleter_t deleter, void *deleter_arg, - dns_rbt_t **rbtp) -{ + dns_rbt_t **rbtp) { isc_result_t result; - dns_rbt_t * rbt; + dns_rbt_t *rbt; REQUIRE(mctx != NULL); REQUIRE(rbtp != NULL && *rbtp == NULL); @@ -1019,14 +984,12 @@ dns_rbt_create(isc_mem_t *mctx, dns_rbtdeleter_t deleter, void *deleter_arg, * Deallocate a red/black tree of trees. */ void -dns_rbt_destroy(dns_rbt_t **rbtp) -{ +dns_rbt_destroy(dns_rbt_t **rbtp) { RUNTIME_CHECK(dns_rbt_destroy2(rbtp, 0) == ISC_R_SUCCESS); } isc_result_t -dns_rbt_destroy2(dns_rbt_t **rbtp, unsigned int quantum) -{ +dns_rbt_destroy2(dns_rbt_t **rbtp, unsigned int quantum) { dns_rbt_t *rbt; REQUIRE(rbtp != NULL && VALID_RBT(*rbtp)); @@ -1056,27 +1019,25 @@ dns_rbt_destroy2(dns_rbt_t **rbtp, unsigned int quantum) } unsigned int -dns_rbt_nodecount(dns_rbt_t *rbt) -{ +dns_rbt_nodecount(dns_rbt_t *rbt) { REQUIRE(VALID_RBT(rbt)); return (rbt->nodecount); } size_t -dns_rbt_hashsize(dns_rbt_t *rbt) -{ +dns_rbt_hashsize(dns_rbt_t *rbt) { REQUIRE(VALID_RBT(rbt)); return (rbt->hashsize); } static inline isc_result_t -chain_name(dns_rbtnodechain_t *chain, dns_name_t *name, bool include_chain_end) -{ - dns_name_t nodename; +chain_name(dns_rbtnodechain_t *chain, dns_name_t *name, + bool include_chain_end) { + dns_name_t nodename; isc_result_t result = ISC_R_SUCCESS; - int i; + int i; dns_name_init(&nodename, NULL); @@ -1099,8 +1060,7 @@ chain_name(dns_rbtnodechain_t *chain, dns_name_t *name, bool include_chain_end) } static inline isc_result_t -move_chain_to_last(dns_rbtnodechain_t *chain, dns_rbtnode_t *node) -{ +move_chain_to_last(dns_rbtnodechain_t *chain, dns_rbtnode_t *node) { do { /* * Go as far right and then down as much as possible, @@ -1128,21 +1088,20 @@ move_chain_to_last(dns_rbtnodechain_t *chain, dns_rbtnode_t *node) */ isc_result_t -dns_rbt_addnode(dns_rbt_t *rbt, const dns_name_t *name, dns_rbtnode_t **nodep) -{ +dns_rbt_addnode(dns_rbt_t *rbt, const dns_name_t *name, dns_rbtnode_t **nodep) { /* * Does this thing have too many variables or what? */ dns_rbtnode_t **root, *parent, *child, *current, *new_current; - dns_name_t * add_name, *new_name, current_name, *prefix, *suffix; + dns_name_t *add_name, *new_name, current_name, *prefix, *suffix; dns_fixedname_t fixedcopy, fixedprefix, fixedsuffix, fnewname; - dns_offsets_t current_offsets; - dns_namereln_t compared; - isc_result_t result = ISC_R_SUCCESS; - unsigned int level_count; - unsigned int common_labels; - unsigned int nlabels, hlabels; - int order; + dns_offsets_t current_offsets; + dns_namereln_t compared; + isc_result_t result = ISC_R_SUCCESS; + unsigned int level_count; + unsigned int common_labels; + unsigned int nlabels, hlabels; + int order; REQUIRE(VALID_RBT(rbt)); REQUIRE(dns_name_isabsolute(name)); @@ -1444,9 +1403,8 @@ dns_rbt_addnode(dns_rbt_t *rbt, const dns_name_t *name, dns_rbtnode_t **nodep) * Add a name to the tree of trees, associating it with some data. */ isc_result_t -dns_rbt_addname(dns_rbt_t *rbt, const dns_name_t *name, void *data) -{ - isc_result_t result; +dns_rbt_addname(dns_rbt_t *rbt, const dns_name_t *name, void *data) { + isc_result_t result; dns_rbtnode_t *node; REQUIRE(VALID_RBT(rbt)); @@ -1478,17 +1436,16 @@ isc_result_t dns_rbt_findnode(dns_rbt_t *rbt, const dns_name_t *name, dns_name_t *foundname, dns_rbtnode_t **node, dns_rbtnodechain_t *chain, unsigned int options, dns_rbtfindcallback_t callback, - void *callback_arg) -{ - dns_rbtnode_t * current, *last_compared; + void *callback_arg) { + dns_rbtnode_t *current, *last_compared; dns_rbtnodechain_t localchain; - dns_name_t * search_name, current_name, *callback_name; - dns_fixedname_t fixedcallbackname, fixedsearchname; - dns_namereln_t compared; - isc_result_t result, saved_result; - unsigned int common_labels; - unsigned int hlabels = 0; - int order; + dns_name_t *search_name, current_name, *callback_name; + dns_fixedname_t fixedcallbackname, fixedsearchname; + dns_namereln_t compared; + isc_result_t result, saved_result; + unsigned int common_labels; + unsigned int hlabels = 0; + int order; REQUIRE(VALID_RBT(rbt)); REQUIRE(dns_name_isabsolute(name)); @@ -1566,12 +1523,12 @@ dns_rbt_findnode(dns_rbt_t *rbt, const dns_name_t *name, dns_name_t *foundname, * or (b). */ - dns_name_t hash_name; + dns_name_t hash_name; dns_rbtnode_t *hnode; dns_rbtnode_t *up_current; - unsigned int nlabels; - unsigned int tlabels = 1; - unsigned int hash; + unsigned int nlabels; + unsigned int tlabels = 1; + unsigned int hash; /* * The case of current not being a subtree root, @@ -1615,7 +1572,8 @@ dns_rbt_findnode(dns_rbt_t *rbt, const dns_name_t *name, dns_name_t *foundname, * by the computed hash value. */ for (hnode = rbt->hashtable[hash % rbt->hashsize]; - hnode != NULL; hnode = hnode->hashnext) { + hnode != NULL; hnode = hnode->hashnext) + { dns_name_t hnode_name; if (ISC_LIKELY(hash != HASHVAL(hnode))) { @@ -1767,7 +1725,8 @@ dns_rbt_findnode(dns_rbt_t *rbt, const dns_name_t *name, dns_name_t *foundname, * ISC_R_SUCCESS to indicate an exact match. */ if (current != NULL && (options & DNS_RBTFIND_NOEXACT) == 0 && - ((options & DNS_RBTFIND_EMPTYDATA) != 0 || DATA(current) != NULL)) { + ((options & DNS_RBTFIND_EMPTYDATA) != 0 || DATA(current) != NULL)) + { /* * Found an exact match. */ @@ -1992,10 +1951,9 @@ dns_rbt_findnode(dns_rbt_t *rbt, const dns_name_t *name, dns_name_t *foundname, */ isc_result_t dns_rbt_findname(dns_rbt_t *rbt, const dns_name_t *name, unsigned int options, - dns_name_t *foundname, void **data) -{ + dns_name_t *foundname, void **data) { dns_rbtnode_t *node = NULL; - isc_result_t result; + isc_result_t result; REQUIRE(data != NULL && *data == NULL); @@ -2003,7 +1961,8 @@ dns_rbt_findname(dns_rbt_t *rbt, const dns_name_t *name, unsigned int options, NULL, NULL); if (node != NULL && - (DATA(node) != NULL || (options & DNS_RBTFIND_EMPTYDATA) != 0)) { + (DATA(node) != NULL || (options & DNS_RBTFIND_EMPTYDATA) != 0)) + { *data = DATA(node); } else { result = ISC_R_NOTFOUND; @@ -2016,10 +1975,9 @@ dns_rbt_findname(dns_rbt_t *rbt, const dns_name_t *name, unsigned int options, * Delete a name from the tree of trees. */ isc_result_t -dns_rbt_deletename(dns_rbt_t *rbt, const dns_name_t *name, bool recurse) -{ +dns_rbt_deletename(dns_rbt_t *rbt, const dns_name_t *name, bool recurse) { dns_rbtnode_t *node = NULL; - isc_result_t result; + isc_result_t result; REQUIRE(VALID_RBT(rbt)); REQUIRE(dns_name_isabsolute(name)); @@ -2091,8 +2049,7 @@ dns_rbt_deletename(dns_rbt_t *rbt, const dns_name_t *name, bool recurse) * succeeds. It still returns isc_result_t, though, so the API wouldn't change. */ isc_result_t -dns_rbt_deletenode(dns_rbt_t *rbt, dns_rbtnode_t *node, bool recurse) -{ +dns_rbt_deletenode(dns_rbt_t *rbt, dns_rbtnode_t *node, bool recurse) { dns_rbtnode_t *parent; REQUIRE(VALID_RBT(rbt)); @@ -2154,8 +2111,7 @@ dns_rbt_deletenode(dns_rbt_t *rbt, dns_rbtnode_t *node, bool recurse) } void -dns_rbt_namefromnode(dns_rbtnode_t *node, dns_name_t *name) -{ +dns_rbt_namefromnode(dns_rbtnode_t *node, dns_name_t *name) { REQUIRE(DNS_RBTNODE_VALID(node)); REQUIRE(name != NULL); REQUIRE(name->offsets == NULL); @@ -2164,9 +2120,8 @@ dns_rbt_namefromnode(dns_rbtnode_t *node, dns_name_t *name) } isc_result_t -dns_rbt_fullnamefromnode(dns_rbtnode_t *node, dns_name_t *name) -{ - dns_name_t current; +dns_rbt_fullnamefromnode(dns_rbtnode_t *node, dns_name_t *name) { + dns_name_t current; isc_result_t result; REQUIRE(DNS_RBTNODE_VALID(node)); @@ -2193,11 +2148,11 @@ dns_rbt_fullnamefromnode(dns_rbtnode_t *node, dns_name_t *name) } char * -dns_rbt_formatnodename(dns_rbtnode_t *node, char *printname, unsigned int size) -{ +dns_rbt_formatnodename(dns_rbtnode_t *node, char *printname, + unsigned int size) { dns_fixedname_t fixedname; - dns_name_t * name; - isc_result_t result; + dns_name_t *name; + isc_result_t result; REQUIRE(DNS_RBTNODE_VALID(node)); REQUIRE(printname != NULL); @@ -2215,12 +2170,11 @@ dns_rbt_formatnodename(dns_rbtnode_t *node, char *printname, unsigned int size) } static isc_result_t -create_node(isc_mem_t *mctx, const dns_name_t *name, dns_rbtnode_t **nodep) -{ +create_node(isc_mem_t *mctx, const dns_name_t *name, dns_rbtnode_t **nodep) { dns_rbtnode_t *node; - isc_region_t region; - unsigned int labels; - size_t nodelen; + isc_region_t region; + unsigned int labels; + size_t nodelen; REQUIRE(name->offsets != NULL); @@ -2296,8 +2250,7 @@ create_node(isc_mem_t *mctx, const dns_name_t *name, dns_rbtnode_t **nodep) * Add a node to the hash table */ static inline void -hash_add_node(dns_rbt_t *rbt, dns_rbtnode_t *node, const dns_name_t *name) -{ +hash_add_node(dns_rbt_t *rbt, dns_rbtnode_t *node, const dns_name_t *name) { unsigned int hash; REQUIRE(name != NULL); @@ -2314,8 +2267,7 @@ hash_add_node(dns_rbt_t *rbt, dns_rbtnode_t *node, const dns_name_t *name) * Initialize hash table */ static isc_result_t -inithash(dns_rbt_t *rbt) -{ +inithash(dns_rbt_t *rbt) { unsigned int bytes; rbt->hashsize = RBT_HASH_SIZE; @@ -2331,14 +2283,13 @@ inithash(dns_rbt_t *rbt) * Rebuild the hashtable to reduce the load factor */ static void -rehash(dns_rbt_t *rbt, unsigned int newcount) -{ - unsigned int oldsize; +rehash(dns_rbt_t *rbt, unsigned int newcount) { + unsigned int oldsize; dns_rbtnode_t **oldtable; - dns_rbtnode_t * node; - dns_rbtnode_t * nextnode; - unsigned int hash; - unsigned int i; + dns_rbtnode_t *node; + dns_rbtnode_t *nextnode; + unsigned int hash; + unsigned int i; oldsize = (unsigned int)rbt->hashsize; oldtable = rbt->hashtable; @@ -2346,8 +2297,8 @@ rehash(dns_rbt_t *rbt, unsigned int newcount) INSIST((rbt->hashsize * 2 + 1) > rbt->hashsize); rbt->hashsize = rbt->hashsize * 2 + 1; } while (newcount >= (rbt->hashsize * 3)); - rbt->hashtable = - isc_mem_get(rbt->mctx, rbt->hashsize * sizeof(dns_rbtnode_t *)); + rbt->hashtable = isc_mem_get(rbt->mctx, + rbt->hashsize * sizeof(dns_rbtnode_t *)); for (i = 0; i < rbt->hashsize; i++) { rbt->hashtable[i] = NULL; @@ -2370,8 +2321,7 @@ rehash(dns_rbt_t *rbt, unsigned int newcount) * rises above a critical level. */ static inline void -hash_node(dns_rbt_t *rbt, dns_rbtnode_t *node, const dns_name_t *name) -{ +hash_node(dns_rbt_t *rbt, dns_rbtnode_t *node, const dns_name_t *name) { REQUIRE(DNS_RBTNODE_VALID(node)); if (rbt->nodecount >= (rbt->hashsize * 3)) { @@ -2385,9 +2335,8 @@ hash_node(dns_rbt_t *rbt, dns_rbtnode_t *node, const dns_name_t *name) * Remove a node from the hash table */ static inline void -unhash_node(dns_rbt_t *rbt, dns_rbtnode_t *node) -{ - unsigned int bucket; +unhash_node(dns_rbt_t *rbt, dns_rbtnode_t *node) { + unsigned int bucket; dns_rbtnode_t *bucket_node; REQUIRE(DNS_RBTNODE_VALID(node)); @@ -2407,8 +2356,7 @@ unhash_node(dns_rbt_t *rbt, dns_rbtnode_t *node) } static inline void -rotate_left(dns_rbtnode_t *node, dns_rbtnode_t **rootp) -{ +rotate_left(dns_rbtnode_t *node, dns_rbtnode_t **rootp) { dns_rbtnode_t *child; REQUIRE(DNS_RBTNODE_VALID(node)); @@ -2441,8 +2389,7 @@ rotate_left(dns_rbtnode_t *node, dns_rbtnode_t **rootp) } static inline void -rotate_right(dns_rbtnode_t *node, dns_rbtnode_t **rootp) -{ +rotate_right(dns_rbtnode_t *node, dns_rbtnode_t **rootp) { dns_rbtnode_t *child; REQUIRE(DNS_RBTNODE_VALID(node)); @@ -2480,11 +2427,10 @@ 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) -{ + dns_rbtnode_t **rootp) { dns_rbtnode_t *child, *root, *parent, *grandparent; - dns_name_t add_name, current_name; - dns_offsets_t add_offsets, current_offsets; + dns_name_t add_name, current_name; + dns_offsets_t add_offsets, current_offsets; REQUIRE(rootp != NULL); REQUIRE(DNS_RBTNODE_VALID(node) && LEFT(node) == NULL && @@ -2586,8 +2532,7 @@ addonlevel(dns_rbtnode_t *node, dns_rbtnode_t *current, int order, * true red/black tree on a single level. */ static void -deletefromlevel(dns_rbtnode_t *item, dns_rbtnode_t **rootp) -{ +deletefromlevel(dns_rbtnode_t *item, dns_rbtnode_t **rootp) { dns_rbtnode_t *child, *sibling, *parent; dns_rbtnode_t *successor; @@ -2826,8 +2771,7 @@ deletefromlevel(dns_rbtnode_t *item, dns_rbtnode_t **rootp) } static void -freenode(dns_rbt_t *rbt, dns_rbtnode_t **nodep) -{ +freenode(dns_rbt_t *rbt, dns_rbtnode_t **nodep) { dns_rbtnode_t *node = *nodep; *nodep = NULL; @@ -2840,8 +2784,7 @@ freenode(dns_rbt_t *rbt, dns_rbtnode_t **nodep) static void deletetreeflat(dns_rbt_t *rbt, unsigned int quantum, bool unhash, - dns_rbtnode_t **nodep) -{ + dns_rbtnode_t **nodep) { dns_rbtnode_t *root = *nodep; while (root != NULL) { @@ -2893,8 +2836,7 @@ deletetreeflat(dns_rbt_t *rbt, unsigned int quantum, bool unhash, } static size_t -getheight_helper(dns_rbtnode_t *node) -{ +getheight_helper(dns_rbtnode_t *node) { size_t dl, dr; size_t this_height, down_height; @@ -2912,14 +2854,12 @@ getheight_helper(dns_rbtnode_t *node) } size_t -dns__rbt_getheight(dns_rbt_t *rbt) -{ +dns__rbt_getheight(dns_rbt_t *rbt) { return (getheight_helper(rbt->root)); } static bool -check_properties_helper(dns_rbtnode_t *node) -{ +check_properties_helper(dns_rbtnode_t *node) { if (node == NULL) { return (true); } @@ -2966,8 +2906,7 @@ check_properties_helper(dns_rbtnode_t *node) } static bool -check_black_distance_helper(dns_rbtnode_t *node, size_t *distance) -{ +check_black_distance_helper(dns_rbtnode_t *node, size_t *distance) { size_t dl, dr, dd; if (node == NULL) { @@ -3005,8 +2944,7 @@ check_black_distance_helper(dns_rbtnode_t *node, size_t *distance) } bool -dns__rbt_checkproperties(dns_rbt_t *rbt) -{ +dns__rbt_checkproperties(dns_rbt_t *rbt) { size_t dd; if (!check_properties_helper(rbt->root)) { @@ -3022,8 +2960,7 @@ dns__rbt_checkproperties(dns_rbt_t *rbt) } static void -dns_rbt_indent(FILE *f, int depth) -{ +dns_rbt_indent(FILE *f, int depth) { int i; fprintf(f, "%4d ", depth); @@ -3034,8 +2971,7 @@ dns_rbt_indent(FILE *f, int depth) } void -dns_rbt_printnodeinfo(dns_rbtnode_t *n, FILE *f) -{ +dns_rbt_printnodeinfo(dns_rbtnode_t *n, FILE *f) { if (n == NULL) { fprintf(f, "Null node\n"); return; @@ -3064,11 +3000,10 @@ dns_rbt_printnodeinfo(dns_rbtnode_t *n, FILE *f) } static void -printnodename(dns_rbtnode_t *node, bool quoted, FILE *f) -{ - isc_region_t r; - dns_name_t name; - char buffer[DNS_NAME_FORMATSIZE]; +printnodename(dns_rbtnode_t *node, bool quoted, FILE *f) { + isc_region_t r; + dns_name_t name; + char buffer[DNS_NAME_FORMATSIZE]; dns_offsets_t offsets; r.length = NAMELEN(node); @@ -3089,8 +3024,7 @@ printnodename(dns_rbtnode_t *node, bool quoted, FILE *f) static void print_text_helper(dns_rbtnode_t *root, dns_rbtnode_t *parent, int depth, const char *direction, void (*data_printer)(FILE *, void *), - FILE * f) -{ + FILE *f) { dns_rbt_indent(f, depth); if (root != NULL) { @@ -3103,8 +3037,8 @@ print_text_helper(dns_rbtnode_t *root, dns_rbtnode_t *parent, int depth, COLOR(root) == RED ? "RED" : "BLACK"); if ((!IS_ROOT(root) && PARENT(root) != parent) || - (IS_ROOT(root) && depth > 0 && - DOWN(PARENT(root)) != root)) { + (IS_ROOT(root) && depth > 0 && DOWN(PARENT(root)) != root)) + { fprintf(f, " (BAD parent pointer! -> "); if (PARENT(root) != NULL) { printnodename(PARENT(root), true, f); @@ -3151,8 +3085,8 @@ print_text_helper(dns_rbtnode_t *root, dns_rbtnode_t *parent, int depth, } void -dns_rbt_printtext(dns_rbt_t *rbt, void (*data_printer)(FILE *, void *), FILE *f) -{ +dns_rbt_printtext(dns_rbt_t *rbt, void (*data_printer)(FILE *, void *), + FILE *f) { REQUIRE(VALID_RBT(rbt)); print_text_helper(rbt->root, NULL, 0, "root", data_printer, f); @@ -3160,8 +3094,7 @@ dns_rbt_printtext(dns_rbt_t *rbt, void (*data_printer)(FILE *, void *), FILE *f) static int print_dot_helper(dns_rbtnode_t *node, unsigned int *nodecount, - bool show_pointers, FILE *f) -{ + bool show_pointers, FILE *f) { unsigned int l, r, d; if (node == NULL) { @@ -3220,8 +3153,7 @@ print_dot_helper(dns_rbtnode_t *node, unsigned int *nodecount, } void -dns_rbt_printdot(dns_rbt_t *rbt, bool show_pointers, FILE *f) -{ +dns_rbt_printdot(dns_rbt_t *rbt, bool show_pointers, FILE *f) { unsigned int nodecount = 0; REQUIRE(VALID_RBT(rbt)); @@ -3237,8 +3169,7 @@ dns_rbt_printdot(dns_rbt_t *rbt, bool show_pointers, FILE *f) */ void -dns_rbtnodechain_init(dns_rbtnodechain_t *chain) -{ +dns_rbtnodechain_init(dns_rbtnodechain_t *chain) { REQUIRE(chain != NULL); /* @@ -3254,8 +3185,7 @@ dns_rbtnodechain_init(dns_rbtnodechain_t *chain) isc_result_t dns_rbtnodechain_current(dns_rbtnodechain_t *chain, dns_name_t *name, - dns_name_t *origin, dns_rbtnode_t **node) -{ + dns_name_t *origin, dns_rbtnode_t **node) { isc_result_t result = ISC_R_SUCCESS; REQUIRE(VALID_CHAIN(chain)); @@ -3300,11 +3230,10 @@ dns_rbtnodechain_current(dns_rbtnodechain_t *chain, dns_name_t *name, isc_result_t dns_rbtnodechain_prev(dns_rbtnodechain_t *chain, dns_name_t *name, - dns_name_t *origin) -{ + dns_name_t *origin) { dns_rbtnode_t *current, *previous, *predecessor; - isc_result_t result = ISC_R_SUCCESS; - bool new_origin = false; + isc_result_t result = ISC_R_SUCCESS; + bool new_origin = false; REQUIRE(VALID_CHAIN(chain) && chain->end != NULL); @@ -3420,11 +3349,10 @@ dns_rbtnodechain_prev(dns_rbtnodechain_t *chain, dns_name_t *name, isc_result_t dns_rbtnodechain_down(dns_rbtnodechain_t *chain, dns_name_t *name, - dns_name_t *origin) -{ + dns_name_t *origin) { dns_rbtnode_t *current, *successor; - isc_result_t result = ISC_R_SUCCESS; - bool new_origin = false; + isc_result_t result = ISC_R_SUCCESS; + bool new_origin = false; REQUIRE(VALID_CHAIN(chain) && chain->end != NULL); @@ -3487,10 +3415,9 @@ dns_rbtnodechain_down(dns_rbtnodechain_t *chain, dns_name_t *name, } isc_result_t -dns_rbtnodechain_nextflat(dns_rbtnodechain_t *chain, dns_name_t *name) -{ +dns_rbtnodechain_nextflat(dns_rbtnodechain_t *chain, dns_name_t *name) { dns_rbtnode_t *current, *previous, *successor; - isc_result_t result = ISC_R_SUCCESS; + isc_result_t result = ISC_R_SUCCESS; REQUIRE(VALID_CHAIN(chain) && chain->end != NULL); @@ -3535,11 +3462,10 @@ dns_rbtnodechain_nextflat(dns_rbtnodechain_t *chain, dns_name_t *name) isc_result_t dns_rbtnodechain_next(dns_rbtnodechain_t *chain, dns_name_t *name, - dns_name_t *origin) -{ + dns_name_t *origin) { dns_rbtnode_t *current, *previous, *successor; - isc_result_t result = ISC_R_SUCCESS; - bool new_origin = false; + isc_result_t result = ISC_R_SUCCESS; + bool new_origin = false; REQUIRE(VALID_CHAIN(chain) && chain->end != NULL); @@ -3723,8 +3649,7 @@ dns_rbtnodechain_last(dns_rbtnodechain_t *chain, dns_rbt_t *rbt, } void -dns_rbtnodechain_reset(dns_rbtnodechain_t *chain) -{ +dns_rbtnodechain_reset(dns_rbtnodechain_t *chain) { REQUIRE(VALID_CHAIN(chain)); /* @@ -3737,8 +3662,7 @@ dns_rbtnodechain_reset(dns_rbtnodechain_t *chain) } void -dns_rbtnodechain_invalidate(dns_rbtnodechain_t *chain) -{ +dns_rbtnodechain_invalidate(dns_rbtnodechain_t *chain) { /* * Free any dynamic storage associated with 'chain', and then * invalidate 'chain'. diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index 14e6f8082f..815fd71fdf 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -66,10 +66,10 @@ #ifndef WIN32 #include #else /* ifndef WIN32 */ -#define PROT_READ 0x01 -#define PROT_WRITE 0x02 +#define PROT_READ 0x01 +#define PROT_WRITE 0x02 #define MAP_PRIVATE 0x0002 -#define MAP_FAILED ((void *)-1) +#define MAP_FAILED ((void *)-1) #endif /* ifndef WIN32 */ #include "rbtdb.h" @@ -95,12 +95,12 @@ typedef struct rbtdb_file_header rbtdb_file_header_t; #define RBTDB_HEADER_LENGTH 1024 struct rbtdb_file_header { - char version1[32]; - uint32_t ptrsize; + char version1[32]; + uint32_t ptrsize; unsigned int bigendian : 1; - uint64_t tree; - uint64_t nsec; - uint64_t nsec3; + uint64_t tree; + uint64_t nsec; + uint64_t nsec3; char version2[32]; /* repeated; must match version1 */ }; @@ -116,7 +116,7 @@ typedef uint32_t rbtdb_serial_t; typedef uint32_t rbtdb_rdatatype_t; #define RBTDB_RDATATYPE_BASE(type) ((dns_rdatatype_t)((type)&0xFFFF)) -#define RBTDB_RDATATYPE_EXT(type) ((dns_rdatatype_t)((type) >> 16)) +#define RBTDB_RDATATYPE_EXT(type) ((dns_rdatatype_t)((type) >> 16)) #define RBTDB_RDATATYPE_VALUE(base, ext) \ ((rbtdb_rdatatype_t)(((uint32_t)ext) << 16) | \ (((uint32_t)base) & 0xffff)) @@ -135,10 +135,10 @@ typedef uint32_t rbtdb_rdatatype_t; RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig, dns_rdatatype_ds) #define RBTDB_RDATATYPE_NCACHEANY RBTDB_RDATATYPE_VALUE(0, dns_rdatatype_any) -#define RBTDB_INITLOCK(l) isc_rwlock_init((l), 0, 0) +#define RBTDB_INITLOCK(l) isc_rwlock_init((l), 0, 0) #define RBTDB_DESTROYLOCK(l) isc_rwlock_destroy(l) -#define RBTDB_LOCK(l, t) RWLOCK((l), (t)) -#define RBTDB_UNLOCK(l, t) RWUNLOCK((l), (t)) +#define RBTDB_LOCK(l, t) RWLOCK((l), (t)) +#define RBTDB_UNLOCK(l, t) RWUNLOCK((l), (t)) /* * Since node locking is sensitive to both performance and memory footprint, @@ -161,12 +161,12 @@ typedef uint32_t rbtdb_rdatatype_t; */ typedef isc_rwlock_t nodelock_t; -#define NODE_INITLOCK(l) isc_rwlock_init((l), 0, 0) +#define NODE_INITLOCK(l) isc_rwlock_init((l), 0, 0) #define NODE_DESTROYLOCK(l) isc_rwlock_destroy(l) -#define NODE_LOCK(l, t) RWLOCK((l), (t)) -#define NODE_UNLOCK(l, t) RWUNLOCK((l), (t)) -#define NODE_TRYUPGRADE(l) isc_rwlock_tryupgrade(l) -#define NODE_DOWNGRADE(l) isc_rwlock_downgrade(l) +#define NODE_LOCK(l, t) RWLOCK((l), (t)) +#define NODE_UNLOCK(l, t) RWUNLOCK((l), (t)) +#define NODE_TRYUPGRADE(l) isc_rwlock_tryupgrade(l) +#define NODE_DOWNGRADE(l) isc_rwlock_downgrade(l) /*% * Whether to rate-limit updating the LRU to avoid possible thread contention. @@ -184,9 +184,9 @@ typedef isc_rwlock_t nodelock_t; #define RBTDB_VIRTUAL 300 struct noqname { - dns_name_t name; - void * neg; - void * negsig; + dns_name_t name; + void *neg; + void *negsig; dns_rdatatype_t type; }; @@ -194,17 +194,17 @@ typedef struct rdatasetheader { /*% * Locked by the owning node's lock. */ - rbtdb_serial_t serial; - dns_ttl_t rdh_ttl; + rbtdb_serial_t serial; + dns_ttl_t rdh_ttl; rbtdb_rdatatype_t type; - uint16_t attributes; - dns_trust_t trust; - struct noqname * noqname; - struct noqname * closest; - unsigned int is_mmapped : 1; - unsigned int next_is_relative : 1; - unsigned int node_is_relative : 1; - unsigned int resign_lsb : 1; + uint16_t attributes; + dns_trust_t trust; + struct noqname *noqname; + struct noqname *closest; + unsigned int is_mmapped : 1; + unsigned int next_is_relative : 1; + unsigned int node_is_relative : 1; + unsigned int resign_lsb : 1; /*%< * We don't use the LIST macros, because the LIST structure has * both head and tail pointers, and is doubly linked. @@ -232,7 +232,7 @@ typedef struct rdatasetheader { */ dns_rbtnode_t *node; - isc_stdtime_t last_used; + isc_stdtime_t last_used; ISC_LINK(struct rdatasetheader) link; unsigned int heap_index; @@ -253,17 +253,17 @@ typedef ISC_LIST(dns_rbtnode_t) rbtnodelist_t; #define RDATASET_ATTR_NONEXISTENT 0x0001 /*%< May be potentially served as stale data. */ -#define RDATASET_ATTR_STALE 0x0002 -#define RDATASET_ATTR_IGNORE 0x0004 -#define RDATASET_ATTR_RETAIN 0x0008 -#define RDATASET_ATTR_NXDOMAIN 0x0010 -#define RDATASET_ATTR_RESIGN 0x0020 -#define RDATASET_ATTR_STATCOUNT 0x0040 -#define RDATASET_ATTR_OPTOUT 0x0080 -#define RDATASET_ATTR_NEGATIVE 0x0100 -#define RDATASET_ATTR_PREFETCH 0x0200 -#define RDATASET_ATTR_CASESET 0x0400 -#define RDATASET_ATTR_ZEROTTL 0x0800 +#define RDATASET_ATTR_STALE 0x0002 +#define RDATASET_ATTR_IGNORE 0x0004 +#define RDATASET_ATTR_RETAIN 0x0008 +#define RDATASET_ATTR_NXDOMAIN 0x0010 +#define RDATASET_ATTR_RESIGN 0x0020 +#define RDATASET_ATTR_STATCOUNT 0x0040 +#define RDATASET_ATTR_OPTOUT 0x0080 +#define RDATASET_ATTR_NEGATIVE 0x0100 +#define RDATASET_ATTR_PREFETCH 0x0200 +#define RDATASET_ATTR_CASESET 0x0400 +#define RDATASET_ATTR_ZEROTTL 0x0800 #define RDATASET_ATTR_CASEFULLYLOWER 0x1000 /*%< Ancient - awaiting cleanup. */ #define RDATASET_ATTR_ANCIENT 0x2000 @@ -281,16 +281,16 @@ typedef ISC_LIST(dns_rbtnode_t) rbtnodelist_t; #define EXISTS(header) (((header)->attributes & RDATASET_ATTR_NONEXISTENT) == 0) #define NONEXISTENT(header) \ (((header)->attributes & RDATASET_ATTR_NONEXISTENT) != 0) -#define IGNORE(header) (((header)->attributes & RDATASET_ATTR_IGNORE) != 0) -#define RETAIN(header) (((header)->attributes & RDATASET_ATTR_RETAIN) != 0) +#define IGNORE(header) (((header)->attributes & RDATASET_ATTR_IGNORE) != 0) +#define RETAIN(header) (((header)->attributes & RDATASET_ATTR_RETAIN) != 0) #define NXDOMAIN(header) (((header)->attributes & RDATASET_ATTR_NXDOMAIN) != 0) -#define STALE(header) (((header)->attributes & RDATASET_ATTR_STALE) != 0) -#define RESIGN(header) (((header)->attributes & RDATASET_ATTR_RESIGN) != 0) -#define OPTOUT(header) (((header)->attributes & RDATASET_ATTR_OPTOUT) != 0) +#define STALE(header) (((header)->attributes & RDATASET_ATTR_STALE) != 0) +#define RESIGN(header) (((header)->attributes & RDATASET_ATTR_RESIGN) != 0) +#define OPTOUT(header) (((header)->attributes & RDATASET_ATTR_OPTOUT) != 0) #define NEGATIVE(header) (((header)->attributes & RDATASET_ATTR_NEGATIVE) != 0) #define PREFETCH(header) (((header)->attributes & RDATASET_ATTR_PREFETCH) != 0) -#define CASESET(header) (((header)->attributes & RDATASET_ATTR_CASESET) != 0) -#define ZEROTTL(header) (((header)->attributes & RDATASET_ATTR_ZEROTTL) != 0) +#define CASESET(header) (((header)->attributes & RDATASET_ATTR_CASESET) != 0) +#define ZEROTTL(header) (((header)->attributes & RDATASET_ATTR_ZEROTTL) != 0) #define CASEFULLYLOWER(header) \ (((header)->attributes & RDATASET_ATTR_CASEFULLYLOWER) != 0) #define ANCIENT(header) (((header)->attributes & RDATASET_ATTR_ANCIENT) != 0) @@ -299,7 +299,7 @@ typedef ISC_LIST(dns_rbtnode_t) rbtnodelist_t; (((header)->rdh_ttl > (now)) || \ ((header)->rdh_ttl == (now) && ZEROTTL(header))) -#define DEFAULT_NODE_LOCK_COUNT 7 /*%< Should be prime. */ +#define DEFAULT_NODE_LOCK_COUNT 7 /*%< Should be prime. */ #define RBTDB_GLUE_TABLE_INIT_SIZE 2U /*% @@ -332,7 +332,7 @@ typedef struct { typedef struct rbtdb_changed { dns_rbtnode_t *node; - bool dirty; + bool dirty; ISC_LINK(struct rbtdb_changed) link; } rbtdb_changed_t; @@ -349,8 +349,8 @@ typedef struct rbtdb_glue rbtdb_glue_t; typedef struct rbtdb_glue_table_node { struct rbtdb_glue_table_node *next; - dns_rbtnode_t * node; - rbtdb_glue_t * glue_list; + dns_rbtnode_t *node; + rbtdb_glue_t *glue_list; } rbtdb_glue_table_node_t; typedef enum { @@ -362,7 +362,7 @@ typedef enum { typedef struct rbtdb_version { /* Not locked */ rbtdb_serial_t serial; - dns_rbtdb_t * rbtdb; + dns_rbtdb_t *rbtdb; /* * Protected in the refcount routines. * XXXJT: should we change the lock policy based on the refcount @@ -370,30 +370,30 @@ typedef struct rbtdb_version { */ isc_refcount_t references; /* Locked by database lock. */ - bool writer; - bool commit_ok; - rbtdb_changedlist_t changed_list; + bool writer; + bool commit_ok; + rbtdb_changedlist_t changed_list; rdatasetheaderlist_t resigned_list; ISC_LINK(struct rbtdb_version) link; dns_db_secure_t secure; - bool havensec3; + bool havensec3; /* NSEC3 parameters */ - dns_hash_t hash; - uint8_t flags; - uint16_t iterations; - uint8_t salt_length; + dns_hash_t hash; + uint8_t flags; + uint16_t iterations; + uint8_t salt_length; unsigned char salt[DNS_NSEC3_SALTSIZE]; /* * records and bytes are covered by rwlock. */ isc_rwlock_t rwlock; - uint64_t records; - uint64_t bytes; + uint64_t records; + uint64_t bytes; - isc_rwlock_t glue_rwlock; - size_t glue_table_size; - size_t glue_table_nodecount; + isc_rwlock_t glue_rwlock; + size_t glue_table_size; + size_t glue_table_nodecount; rbtdb_glue_table_node_t **glue_table; } rbtdb_version_t; @@ -407,26 +407,26 @@ struct dns_rbtdb { /* Locks the tree structure (prevents nodes appearing/disappearing) */ isc_rwlock_t tree_lock; /* Locks for individual tree nodes */ - unsigned int node_lock_count; + unsigned int node_lock_count; rbtdb_nodelock_t *node_locks; - dns_rbtnode_t * origin_node; - dns_rbtnode_t * nsec3_origin_node; - dns_stats_t * rrsetstats; /* cache DB only */ - isc_stats_t * cachestats; /* cache DB only */ - isc_stats_t * gluecachestats; /* zone DB only */ + dns_rbtnode_t *origin_node; + dns_rbtnode_t *nsec3_origin_node; + dns_stats_t *rrsetstats; /* cache DB only */ + isc_stats_t *cachestats; /* cache DB only */ + isc_stats_t *gluecachestats; /* zone DB only */ /* Locked by lock. */ - unsigned int active; - isc_refcount_t references; - unsigned int attributes; - rbtdb_serial_t current_serial; - rbtdb_serial_t least_serial; - rbtdb_serial_t next_serial; - rbtdb_version_t * current_version; - rbtdb_version_t * future_version; + unsigned int active; + isc_refcount_t references; + unsigned int attributes; + rbtdb_serial_t current_serial; + rbtdb_serial_t least_serial; + rbtdb_serial_t next_serial; + rbtdb_version_t *current_version; + rbtdb_version_t *future_version; rbtdb_versionlist_t open_versions; - isc_task_t * task; - dns_dbnode_t * soanode; - dns_dbnode_t * nsnode; + isc_task_t *task; + dns_dbnode_t *soanode; + dns_dbnode_t *nsnode; /* * Maximum length of time to keep using a stale answer past its @@ -453,13 +453,13 @@ struct dns_rbtdb { * context to use for the heap (which differs from the main * database memory context in the case of a cache). */ - isc_mem_t * hmctx; + isc_mem_t *hmctx; isc_heap_t **heaps; /* * Base values for the mmap() code. */ - void * mmap_location; + void *mmap_location; size_t mmap_size; /* Locked by tree_lock. */ @@ -471,7 +471,7 @@ struct dns_rbtdb { unsigned int quantum; }; -#define RBTDB_ATTR_LOADED 0x01 +#define RBTDB_ATTR_LOADED 0x01 #define RBTDB_ATTR_LOADING 0x02 #define KEEPSTALE(rbtdb) ((rbtdb)->serve_stale_ttl > 0) @@ -480,81 +480,66 @@ struct dns_rbtdb { * Search Context */ typedef struct { - dns_rbtdb_t * rbtdb; - rbtdb_version_t * rbtversion; - rbtdb_serial_t serial; - unsigned int options; + dns_rbtdb_t *rbtdb; + rbtdb_version_t *rbtversion; + rbtdb_serial_t serial; + unsigned int options; dns_rbtnodechain_t chain; - bool copy_name; - bool need_cleanup; - bool wild; - dns_rbtnode_t * zonecut; - rdatasetheader_t * zonecut_rdataset; - rdatasetheader_t * zonecut_sigrdataset; - dns_fixedname_t zonecut_name; - isc_stdtime_t now; + bool copy_name; + bool need_cleanup; + bool wild; + dns_rbtnode_t *zonecut; + rdatasetheader_t *zonecut_rdataset; + rdatasetheader_t *zonecut_sigrdataset; + dns_fixedname_t zonecut_name; + isc_stdtime_t now; } rbtdb_search_t; /*% * Load Context */ typedef struct { - dns_rbtdb_t * rbtdb; + dns_rbtdb_t *rbtdb; 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, @@ -592,14 +577,11 @@ 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, @@ -608,7 +590,7 @@ static dns_rdatasetitermethods_t rdatasetiter_methods = { typedef struct rbtdb_rdatasetiter { dns_rdatasetiter_t common; - rdatasetheader_t * current; + rdatasetheader_t *current; } rbtdb_rdatasetiter_t; /* @@ -620,25 +602,18 @@ 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, @@ -652,37 +627,32 @@ static dns_dbiteratormethods_t dbiterator_methods = { * If 'paused' is true, then the tree lock is not being held. */ typedef struct rbtdb_dbiterator { - dns_dbiterator_t common; - bool paused; - bool new_origin; - isc_rwlocktype_t tree_locked; - isc_result_t result; - dns_fixedname_t name; - dns_fixedname_t origin; - dns_rbtnodechain_t chain; - dns_rbtnodechain_t nsec3chain; + dns_dbiterator_t common; + bool paused; + bool new_origin; + isc_rwlocktype_t tree_locked; + isc_result_t result; + dns_fixedname_t name; + dns_fixedname_t origin; + dns_rbtnodechain_t chain; + dns_rbtnodechain_t nsec3chain; dns_rbtnodechain_t *current; - dns_rbtnode_t * node; - dns_rbtnode_t * deletions[DELETION_BATCH_MAX]; - int delcnt; - bool nsec3only; - bool nonsec3; + dns_rbtnode_t *node; + dns_rbtnode_t *deletions[DELETION_BATCH_MAX]; + int delcnt; + bool nsec3only; + bool nonsec3; } rbtdb_dbiterator_t; -#define IS_STUB(rbtdb) (((rbtdb)->common.attributes & DNS_DBATTR_STUB) != 0) +#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"; @@ -727,13 +697,12 @@ static atomic_uint_fast32_t init_count; */ #ifdef DEBUG static void -hexdump(const char *desc, unsigned char *data, size_t size) -{ - char hexdump[BUFSIZ * 2 + 1]; +hexdump(const char *desc, unsigned char *data, size_t size) { + char hexdump[BUFSIZ * 2 + 1]; isc_buffer_t b; isc_region_t r; isc_result_t result; - size_t bytes; + size_t bytes; fprintf(stderr, "%s: ", desc); do { @@ -768,8 +737,7 @@ hexdump(const char *desc, unsigned char *data, size_t size) */ static void -attach(dns_db_t *source, dns_db_t **targetp) -{ +attach(dns_db_t *source, dns_db_t **targetp) { dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)source; REQUIRE(VALID_RBTDB(rbtdb)); @@ -780,8 +748,7 @@ attach(dns_db_t *source, dns_db_t **targetp) } static void -free_rbtdb_callback(isc_task_t *task, isc_event_t *event) -{ +free_rbtdb_callback(isc_task_t *task, isc_event_t *event) { dns_rbtdb_t *rbtdb = event->ev_arg; UNUSED(task); @@ -790,8 +757,7 @@ free_rbtdb_callback(isc_task_t *task, isc_event_t *event) } static void -update_cachestats(dns_rbtdb_t *rbtdb, isc_result_t result) -{ +update_cachestats(dns_rbtdb_t *rbtdb, isc_result_t result) { INSIST(IS_CACHE(rbtdb)); if (rbtdb->cachestats == NULL) { @@ -815,15 +781,14 @@ update_cachestats(dns_rbtdb_t *rbtdb, isc_result_t result) } static bool -do_stats(rdatasetheader_t *header) -{ +do_stats(rdatasetheader_t *header) { return (EXISTS(header) && (header->attributes & RDATASET_ATTR_STATCOUNT) != 0); } static void -update_rrsetstats(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, bool increment) -{ +update_rrsetstats(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, + bool increment) { dns_rdatastatstype_t statattributes = 0; dns_rdatastatstype_t base = 0; dns_rdatastatstype_t type; @@ -862,11 +827,10 @@ update_rrsetstats(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, bool increment) } static void -set_ttl(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, dns_ttl_t newttl) -{ - int idx; +set_ttl(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, dns_ttl_t newttl) { + int idx; isc_heap_t *heap; - dns_ttl_t oldttl; + dns_ttl_t oldttl; if (!IS_CACHE(rbtdb)) { header->rdh_ttl = newttl; @@ -902,8 +866,7 @@ set_ttl(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, dns_ttl_t newttl) * element. It returns true if v1 happens "sooner" than v2. */ static bool -ttl_sooner(void *v1, void *v2) -{ +ttl_sooner(void *v1, void *v2) { rdatasetheader_t *h1 = v1; rdatasetheader_t *h2 = v2; @@ -911,8 +874,7 @@ ttl_sooner(void *v1, void *v2) } static bool -resign_sooner(void *v1, void *v2) -{ +resign_sooner(void *v1, void *v2) { rdatasetheader_t *h1 = v1; rdatasetheader_t *h2 = v2; @@ -924,8 +886,7 @@ resign_sooner(void *v1, void *v2) * This function sets the heap index into the header. */ static void -set_index(void *what, unsigned int idx) -{ +set_index(void *what, unsigned int idx) { rdatasetheader_t *h = what; h->heap_index = idx; @@ -938,12 +899,11 @@ set_index(void *what, unsigned int idx) * iteration. */ static unsigned int -adjust_quantum(unsigned int old, isc_time_t *start) -{ +adjust_quantum(unsigned int old, isc_time_t *start) { unsigned int pps = dns_pps; /* packets per second */ unsigned int interval; - uint64_t usecs; - isc_time_t end; + uint64_t usecs; + isc_time_t end; unsigned int nodes; if (pps < 100) { @@ -988,13 +948,12 @@ adjust_quantum(unsigned int old, isc_time_t *start) } static void -free_rbtdb(dns_rbtdb_t *rbtdb, bool log, isc_event_t *event) -{ - unsigned int i; - isc_result_t result; - char buf[DNS_NAME_FORMATSIZE]; - dns_rbt_t ** treep; - isc_time_t start; +free_rbtdb(dns_rbtdb_t *rbtdb, bool log, isc_event_t *event) { + unsigned int i; + isc_result_t result; + char buf[DNS_NAME_FORMATSIZE]; + dns_rbt_t **treep; + isc_time_t start; dns_dbonupdatelistener_t *listener, *listener_next; if (IS_CACHE(rbtdb) && rbtdb->common.rdclass == dns_rdataclass_in) { @@ -1057,8 +1016,8 @@ free_rbtdb(dns_rbtdb_t *rbtdb, bool log, isc_event_t *event) if (result == ISC_R_QUOTA) { INSIST(rbtdb->task != NULL); if (rbtdb->quantum != 0) { - rbtdb->quantum = - adjust_quantum(rbtdb->quantum, &start); + rbtdb->quantum = adjust_quantum(rbtdb->quantum, + &start); } if (event == NULL) { event = isc_event_allocate( @@ -1155,7 +1114,8 @@ free_rbtdb(dns_rbtdb_t *rbtdb, bool log, isc_event_t *event) } for (listener = ISC_LIST_HEAD(rbtdb->common.update_listeners); - listener != NULL; listener = listener_next) { + listener != NULL; listener = listener_next) + { listener_next = ISC_LIST_NEXT(listener, link); ISC_LIST_UNLINK(rbtdb->common.update_listeners, listener, link); isc_mem_put(rbtdb->common.mctx, listener, @@ -1166,9 +1126,8 @@ free_rbtdb(dns_rbtdb_t *rbtdb, bool log, isc_event_t *event) } static inline void -maybe_free_rbtdb(dns_rbtdb_t *rbtdb) -{ - bool want_free = false; +maybe_free_rbtdb(dns_rbtdb_t *rbtdb) { + bool want_free = false; unsigned int i; unsigned int inactive = 0; @@ -1198,8 +1157,8 @@ maybe_free_rbtdb(dns_rbtdb_t *rbtdb) NODE_LOCK(&rbtdb->node_locks[i].lock, isc_rwlocktype_write); rbtdb->node_locks[i].exiting = true; NODE_UNLOCK(&rbtdb->node_locks[i].lock, isc_rwlocktype_write); - if (isc_refcount_current(&rbtdb->node_locks[i].references) == - 0) { + if (isc_refcount_current(&rbtdb->node_locks[i].references) == 0) + { inactive++; } } @@ -1228,8 +1187,7 @@ maybe_free_rbtdb(dns_rbtdb_t *rbtdb) } static void -detach(dns_db_t **dbp) -{ +detach(dns_db_t **dbp) { REQUIRE(dbp != NULL && VALID_RBTDB((dns_rbtdb_t *)(*dbp))); dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)(*dbp); *dbp = NULL; @@ -1240,9 +1198,8 @@ detach(dns_db_t **dbp) } static void -currentversion(dns_db_t *db, dns_dbversion_t **versionp) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; +currentversion(dns_db_t *db, dns_dbversion_t **versionp) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; rbtdb_version_t *version; REQUIRE(VALID_RBTDB(rbtdb)); @@ -1257,11 +1214,10 @@ currentversion(dns_db_t *db, dns_dbversion_t **versionp) static inline rbtdb_version_t * allocate_version(isc_mem_t *mctx, rbtdb_serial_t serial, - unsigned int references, bool writer) -{ - isc_result_t result; + unsigned int references, bool writer) { + isc_result_t result; rbtdb_version_t *version; - size_t i; + size_t i; version = isc_mem_get(mctx, sizeof(*version)); version->serial = serial; @@ -1294,10 +1250,9 @@ allocate_version(isc_mem_t *mctx, rbtdb_serial_t serial, } static isc_result_t -newversion(dns_db_t *db, dns_dbversion_t **versionp) -{ - isc_result_t result; - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; +newversion(dns_db_t *db, dns_dbversion_t **versionp) { + isc_result_t result; + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; rbtdb_version_t *version; REQUIRE(VALID_RBTDB(rbtdb)); @@ -1362,9 +1317,9 @@ newversion(dns_db_t *db, dns_dbversion_t **versionp) } static void -attachversion(dns_db_t *db, dns_dbversion_t *source, dns_dbversion_t **targetp) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; +attachversion(dns_db_t *db, dns_dbversion_t *source, + dns_dbversion_t **targetp) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; rbtdb_version_t *rbtversion = source; REQUIRE(VALID_RBTDB(rbtdb)); @@ -1376,8 +1331,7 @@ attachversion(dns_db_t *db, dns_dbversion_t *source, dns_dbversion_t **targetp) } static rbtdb_changed_t * -add_changed(dns_rbtdb_t *rbtdb, rbtdb_version_t *version, dns_rbtnode_t *node) -{ +add_changed(dns_rbtdb_t *rbtdb, rbtdb_version_t *version, dns_rbtnode_t *node) { rbtdb_changed_t *changed; /* @@ -1406,8 +1360,7 @@ add_changed(dns_rbtdb_t *rbtdb, rbtdb_version_t *version, dns_rbtnode_t *node) } static inline void -free_noqname(isc_mem_t *mctx, struct noqname **noqname) -{ +free_noqname(isc_mem_t *mctx, struct noqname **noqname) { if (dns_name_dynamic(&(*noqname)->name)) { dns_name_free(&(*noqname)->name, mctx); } @@ -1424,8 +1377,7 @@ free_noqname(isc_mem_t *mctx, struct noqname **noqname) } static inline void -init_rdataset(dns_rbtdb_t *rbtdb, rdatasetheader_t *h) -{ +init_rdataset(dns_rbtdb_t *rbtdb, rdatasetheader_t *h) { ISC_LINK_INIT(h, link); h->heap_index = 0; h->is_mmapped = 0; @@ -1445,8 +1397,7 @@ init_rdataset(dns_rbtdb_t *rbtdb, rdatasetheader_t *h) * Update the copied values of 'next' and 'node' if they are relative. */ static void -update_newheader(rdatasetheader_t *newh, rdatasetheader_t *old) -{ +update_newheader(rdatasetheader_t *newh, rdatasetheader_t *old) { char *p; if (old->next_is_relative) { @@ -1470,8 +1421,7 @@ update_newheader(rdatasetheader_t *newh, rdatasetheader_t *old) } static inline rdatasetheader_t * -new_rdataset(dns_rbtdb_t *rbtdb, isc_mem_t *mctx) -{ +new_rdataset(dns_rbtdb_t *rbtdb, isc_mem_t *mctx) { rdatasetheader_t *h; h = isc_mem_get(mctx, sizeof(*h)); @@ -1488,10 +1438,9 @@ new_rdataset(dns_rbtdb_t *rbtdb, isc_mem_t *mctx) } static inline void -free_rdataset(dns_rbtdb_t *rbtdb, isc_mem_t *mctx, rdatasetheader_t *rdataset) -{ +free_rdataset(dns_rbtdb_t *rbtdb, isc_mem_t *mctx, rdatasetheader_t *rdataset) { unsigned int size; - int idx; + int idx; update_rrsetstats(rbtdb, rdataset, false); @@ -1528,10 +1477,9 @@ free_rdataset(dns_rbtdb_t *rbtdb, isc_mem_t *mctx, rdatasetheader_t *rdataset) } static inline void -rollback_node(dns_rbtnode_t *node, rbtdb_serial_t serial) -{ +rollback_node(dns_rbtnode_t *node, rbtdb_serial_t serial) { rdatasetheader_t *header, *dcurrent; - bool make_dirty = false; + bool make_dirty = false; /* * Caller must hold the node lock. @@ -1561,8 +1509,7 @@ rollback_node(dns_rbtnode_t *node, rbtdb_serial_t serial) } static inline void -mark_header_ancient(dns_rbtdb_t *rbtdb, rdatasetheader_t *header) -{ +mark_header_ancient(dns_rbtdb_t *rbtdb, rdatasetheader_t *header) { /* * If we are already ancient there is nothing to do. */ @@ -1586,8 +1533,7 @@ mark_header_ancient(dns_rbtdb_t *rbtdb, rdatasetheader_t *header) } static inline void -mark_header_stale(dns_rbtdb_t *rbtdb, rdatasetheader_t *header) -{ +mark_header_stale(dns_rbtdb_t *rbtdb, rdatasetheader_t *header) { /* * If we are already stale there is nothing to do. */ @@ -1609,8 +1555,8 @@ mark_header_stale(dns_rbtdb_t *rbtdb, rdatasetheader_t *header) } static inline void -clean_stale_headers(dns_rbtdb_t *rbtdb, isc_mem_t *mctx, rdatasetheader_t *top) -{ +clean_stale_headers(dns_rbtdb_t *rbtdb, isc_mem_t *mctx, + rdatasetheader_t *top) { rdatasetheader_t *d, *down_next; for (d = top->down; d != NULL; d = down_next) { @@ -1621,10 +1567,9 @@ clean_stale_headers(dns_rbtdb_t *rbtdb, isc_mem_t *mctx, rdatasetheader_t *top) } static inline void -clean_cache_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) -{ +clean_cache_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) { rdatasetheader_t *current, *top_prev, *top_next; - isc_mem_t * mctx = rbtdb->common.mctx; + isc_mem_t *mctx = rbtdb->common.mctx; /* * Caller must be holding the node lock. @@ -1639,7 +1584,8 @@ clean_cache_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) * we are not keeping stale, we can clean it up. */ if (NONEXISTENT(current) || ANCIENT(current) || - (STALE(current) && !KEEPSTALE(rbtdb))) { + (STALE(current) && !KEEPSTALE(rbtdb))) + { if (top_prev != NULL) { top_prev->next = current->next; } else { @@ -1655,12 +1601,11 @@ clean_cache_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) static inline void clean_zone_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, - rbtdb_serial_t least_serial) -{ + rbtdb_serial_t least_serial) { rdatasetheader_t *current, *dcurrent, *down_next, *dparent; rdatasetheader_t *top_prev, *top_next; - isc_mem_t * mctx = rbtdb->common.mctx; - bool still_dirty = false; + isc_mem_t *mctx = rbtdb->common.mctx; + bool still_dirty = false; /* * Caller must be holding the node lock. @@ -1789,12 +1734,11 @@ clean_zone_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, * tree_lock(write) must be held. */ static void -delete_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) -{ - dns_rbtnode_t * nsecnode; +delete_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) { + dns_rbtnode_t *nsecnode; dns_fixedname_t fname; - dns_name_t * name; - isc_result_t result = ISC_R_UNEXPECTED; + dns_name_t *name; + isc_result_t result = ISC_R_UNEXPECTED; INSIST(!ISC_LINK_LINKED(node, deadlink)); @@ -1870,8 +1814,7 @@ delete_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) * Caller must be holding the node lock. */ static inline void -new_reference(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) -{ +new_reference(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) { INSIST(!ISC_LINK_LINKED(node, deadlink)); if (isc_refcount_increment0(&node->references) == 0) { /* this is the first reference to the node */ @@ -1884,17 +1827,15 @@ new_reference(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) * The tree lock must be held for the result to be valid. */ static inline bool -is_leaf(dns_rbtnode_t *node) -{ +is_leaf(dns_rbtnode_t *node) { return (node->parent != NULL && node->parent->down == node && node->left == NULL && node->right == NULL); } static inline void -send_to_prune_tree(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) -{ +send_to_prune_tree(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) { isc_event_t *ev; - dns_db_t * db; + dns_db_t *db; ev = isc_event_allocate(rbtdb->common.mctx, NULL, DNS_EVENT_RBTPRUNE, prune_tree, node, sizeof(isc_event_t)); @@ -1914,10 +1855,9 @@ send_to_prune_tree(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node) * The caller must hold a tree write lock and bucketnum'th node (write) lock. */ static void -cleanup_dead_nodes(dns_rbtdb_t *rbtdb, int bucketnum) -{ +cleanup_dead_nodes(dns_rbtdb_t *rbtdb, int bucketnum) { dns_rbtnode_t *node; - int count = 10; /* XXXJT: should be adjustable */ + int count = 10; /* XXXJT: should be adjustable */ node = ISC_LIST_HEAD(rbtdb->deadnodes[bucketnum]); while (node != NULL && count > 0) { @@ -1967,11 +1907,10 @@ cleanup_dead_nodes(dns_rbtdb_t *rbtdb, int bucketnum) */ static inline void reactivate_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, - isc_rwlocktype_t treelocktype) -{ + isc_rwlocktype_t treelocktype) { isc_rwlocktype_t locktype = isc_rwlocktype_read; - nodelock_t * nodelock = &rbtdb->node_locks[node->locknum].lock; - bool maybe_cleanup = false; + nodelock_t *nodelock = &rbtdb->node_locks[node->locknum].lock; + bool maybe_cleanup = false; POST(locktype); @@ -1982,7 +1921,8 @@ reactivate_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, * the node lock below to perform the cleanup. */ if (!ISC_LIST_EMPTY(rbtdb->deadnodes[node->locknum]) && - treelocktype == isc_rwlocktype_write) { + treelocktype == isc_rwlocktype_write) + { maybe_cleanup = true; } @@ -2025,15 +1965,14 @@ reactivate_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, static bool decrement_reference(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, rbtdb_serial_t least_serial, isc_rwlocktype_t nlock, - isc_rwlocktype_t tlock, bool pruning) -{ - isc_result_t result; - bool write_locked; - bool locked = tlock != isc_rwlocktype_none; + isc_rwlocktype_t tlock, bool pruning) { + isc_result_t result; + bool write_locked; + bool locked = tlock != isc_rwlocktype_none; rbtdb_nodelock_t *nodelock; - int bucket = node->locknum; - bool no_reference = true; - uint_fast32_t refs; + int bucket = node->locknum; + bool no_reference = true; + uint_fast32_t refs; nodelock = &rbtdb->node_locks[bucket]; @@ -2182,12 +2121,11 @@ restore_locks: * acceptable for a single event. */ static void -prune_tree(isc_task_t *task, isc_event_t *event) -{ - dns_rbtdb_t * rbtdb = event->ev_sender; +prune_tree(isc_task_t *task, isc_event_t *event) { + dns_rbtdb_t *rbtdb = event->ev_sender; dns_rbtnode_t *node = event->ev_arg; dns_rbtnode_t *parent; - unsigned int locknum; + unsigned int locknum; UNUSED(task); @@ -2242,8 +2180,7 @@ prune_tree(isc_task_t *task, isc_event_t *event) static inline void make_least_version(dns_rbtdb_t *rbtdb, rbtdb_version_t *version, - rbtdb_changedlist_t *cleanup_list) -{ + rbtdb_changedlist_t *cleanup_list) { /* * Caller must be holding the database lock. */ @@ -2254,8 +2191,7 @@ make_least_version(dns_rbtdb_t *rbtdb, rbtdb_version_t *version, } static inline void -cleanup_nondirty(rbtdb_version_t *version, rbtdb_changedlist_t *cleanup_list) -{ +cleanup_nondirty(rbtdb_version_t *version, rbtdb_changedlist_t *cleanup_list) { rbtdb_changed_t *changed, *next_changed; /* @@ -2273,7 +2209,8 @@ cleanup_nondirty(rbtdb_version_t *version, rbtdb_changedlist_t *cleanup_list) * The caller must be holding the database lock. */ for (changed = HEAD(version->changed_list); changed != NULL; - changed = next_changed) { + changed = next_changed) + { next_changed = NEXT(changed, link); if (!changed->dirty) { UNLINK(version->changed_list, changed, link); @@ -2283,13 +2220,12 @@ cleanup_nondirty(rbtdb_version_t *version, rbtdb_changedlist_t *cleanup_list) } static void -iszonesecure(dns_db_t *db, rbtdb_version_t *version, dns_dbnode_t *origin) -{ +iszonesecure(dns_db_t *db, rbtdb_version_t *version, dns_dbnode_t *origin) { dns_rdataset_t keyset; dns_rdataset_t nsecset, signsecset; - bool haszonekey = false; - bool hasnsec = false; - isc_result_t result; + bool haszonekey = false; + bool hasnsec = false; + isc_result_t result; dns_rdataset_init(&keyset); result = dns_db_findrdataset(db, origin, version, dns_rdatatype_dnskey, @@ -2342,17 +2278,16 @@ iszonesecure(dns_db_t *db, rbtdb_version_t *version, dns_dbnode_t *origin) * Cache the nsec3 parameters. */ static void -setnsec3parameters(dns_db_t *db, rbtdb_version_t *version) -{ - dns_rbtnode_t * node; +setnsec3parameters(dns_db_t *db, rbtdb_version_t *version) { + dns_rbtnode_t *node; dns_rdata_nsec3param_t nsec3param; - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_region_t region; - isc_result_t result; - rdatasetheader_t * header, *header_next; - unsigned char * raw; /* RDATASLAB */ - unsigned int count, length; - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_region_t region; + isc_result_t result; + rdatasetheader_t *header, *header_next; + unsigned char *raw; /* RDATASLAB */ + unsigned int count, length; + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_read); version->havensec3 = false; @@ -2396,7 +2331,8 @@ setnsec3parameters(dns_db_t *db, rbtdb_version_t *version) dns_rdata_reset(&rdata); if (nsec3param.hash != DNS_NSEC3_UNKNOWNALG && - !dns_nsec3_supportedhash(nsec3param.hash)) { + !dns_nsec3_supportedhash(nsec3param.hash)) + { continue; } @@ -2428,10 +2364,9 @@ unlock: } static void -cleanup_dead_nodes_callback(isc_task_t *task, isc_event_t *event) -{ +cleanup_dead_nodes_callback(isc_task_t *task, isc_event_t *event) { dns_rbtdb_t *rbtdb = event->ev_arg; - bool again = false; + bool again = false; unsigned int locknum; RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_write); @@ -2458,17 +2393,16 @@ cleanup_dead_nodes_callback(isc_task_t *task, isc_event_t *event) } static void -closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; - rbtdb_version_t * version, *cleanup_version, *least_greater; - bool rollback = false; - rbtdb_changedlist_t cleanup_list; +closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; + rbtdb_version_t *version, *cleanup_version, *least_greater; + bool rollback = false; + rbtdb_changedlist_t cleanup_list; rdatasetheaderlist_t resigned_list; - rbtdb_changed_t * changed, *next_changed; - rbtdb_serial_t serial, least_serial; - dns_rbtnode_t * rbtnode; - rdatasetheader_t * header; + rbtdb_changed_t *changed, *next_changed; + rbtdb_serial_t serial, least_serial; + dns_rbtnode_t *rbtnode; + rdatasetheader_t *header; REQUIRE(VALID_RBTDB(rbtdb)); version = (rbtdb_version_t *)*versionp; @@ -2500,7 +2434,7 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) serial = version->serial; if (version->writer) { if (commit) { - unsigned cur_ref; + unsigned cur_ref; rbtdb_version_t *cur_version; INSIST(version->commit_ok); @@ -2516,8 +2450,8 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) if (cur_ref == 1) { (void)isc_refcount_current( &cur_version->references); - if (cur_version->serial == - rbtdb->least_serial) { + if (cur_version->serial == rbtdb->least_serial) + { INSIST(EMPTY( cur_version->changed_list)); } @@ -2673,7 +2607,7 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) } if (!EMPTY(cleanup_list)) { - isc_event_t * event = NULL; + isc_event_t *event = NULL; isc_rwlocktype_t tlock = isc_rwlocktype_none; if (rbtdb->task != NULL) { @@ -2752,12 +2686,11 @@ end: * tree_lock(write) must be held. */ static isc_result_t -add_wildcard_magic(dns_rbtdb_t *rbtdb, const dns_name_t *name) -{ - isc_result_t result; - dns_name_t foundname; - dns_offsets_t offsets; - unsigned int n; +add_wildcard_magic(dns_rbtdb_t *rbtdb, const dns_name_t *name) { + isc_result_t result; + dns_name_t foundname; + dns_offsets_t offsets; + unsigned int n; dns_rbtnode_t *node = NULL; dns_name_init(&foundname, offsets); @@ -2781,12 +2714,11 @@ add_wildcard_magic(dns_rbtdb_t *rbtdb, const dns_name_t *name) * tree_lock(write) must be held. */ static isc_result_t -add_empty_wildcards(dns_rbtdb_t *rbtdb, const dns_name_t *name) -{ - isc_result_t result; - dns_name_t foundname; +add_empty_wildcards(dns_rbtdb_t *rbtdb, const dns_name_t *name) { + isc_result_t result; + dns_name_t foundname; dns_offsets_t offsets; - unsigned int n, l, i; + unsigned int n, l, i; dns_name_init(&foundname, offsets); n = dns_name_countlabels(name); @@ -2800,8 +2732,8 @@ add_empty_wildcards(dns_rbtdb_t *rbtdb, const dns_name_t *name) if (result != ISC_R_SUCCESS) { return (result); } - result = - dns_rbt_addnode(rbtdb->tree, &foundname, &node); + result = dns_rbt_addnode(rbtdb->tree, &foundname, + &node); if (result != ISC_R_SUCCESS && result != ISC_R_EXISTS) { return (result); } @@ -2816,11 +2748,10 @@ add_empty_wildcards(dns_rbtdb_t *rbtdb, const dns_name_t *name) static isc_result_t findnodeintree(dns_rbtdb_t *rbtdb, dns_rbt_t *tree, const dns_name_t *name, - bool create, dns_dbnode_t **nodep) -{ - dns_rbtnode_t * node = NULL; - dns_name_t nodename; - isc_result_t result; + bool create, dns_dbnode_t **nodep) { + dns_rbtnode_t *node = NULL; + dns_name_t nodename; + isc_result_t result; isc_rwlocktype_t locktype = isc_rwlocktype_read; INSIST(tree == rbtdb->tree || tree == rbtdb->nsec3); @@ -2852,8 +2783,8 @@ findnodeintree(dns_rbtdb_t *rbtdb, dns_rbt_t *tree, const dns_name_t *name, add_empty_wildcards(rbtdb, name); if (dns_name_iswildcard(name)) { - result = - add_wildcard_magic(rbtdb, name); + result = add_wildcard_magic(rbtdb, + name); if (result != ISC_R_SUCCESS) { RWUNLOCK(&rbtdb->tree_lock, locktype); @@ -2885,8 +2816,7 @@ findnodeintree(dns_rbtdb_t *rbtdb, dns_rbt_t *tree, const dns_name_t *name, static isc_result_t findnode(dns_db_t *db, const dns_name_t *name, bool create, - dns_dbnode_t **nodep) -{ + dns_dbnode_t **nodep) { dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; REQUIRE(VALID_RBTDB(rbtdb)); @@ -2896,8 +2826,7 @@ findnode(dns_db_t *db, const dns_name_t *name, bool create, static isc_result_t findnsec3node(dns_db_t *db, const dns_name_t *name, bool create, - dns_dbnode_t **nodep) -{ + dns_dbnode_t **nodep) { dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; REQUIRE(VALID_RBTDB(rbtdb)); @@ -2906,14 +2835,13 @@ findnsec3node(dns_db_t *db, const dns_name_t *name, bool create, } static isc_result_t -zone_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) -{ - rbtdb_search_t * search = arg; +zone_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) { + rbtdb_search_t *search = arg; rdatasetheader_t *header, *header_next; rdatasetheader_t *dname_header, *sigdname_header, *ns_header; rdatasetheader_t *found; - isc_result_t result; - dns_rbtnode_t * onode; + isc_result_t result; + dns_rbtnode_t *onode; /* * We only want to remember the topmost zone cut, since it's the one @@ -2941,7 +2869,8 @@ zone_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) header_next = header->next; if (header->type == dns_rdatatype_ns || header->type == dns_rdatatype_dname || - header->type == RBTDB_RDATATYPE_SIGDNAME) { + header->type == RBTDB_RDATATYPE_SIGDNAME) + { do { if (header->serial <= search->serial && !IGNORE(header)) { @@ -3055,8 +2984,7 @@ zone_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) static inline void bind_rdataset(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, rdatasetheader_t *header, - isc_stdtime_t now, dns_rdataset_t *rdataset) -{ + isc_stdtime_t now, dns_rdataset_t *rdataset) { unsigned char *raw; /* RDATASLAB */ /* @@ -3140,11 +3068,10 @@ bind_rdataset(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, rdatasetheader_t *header, static inline isc_result_t setup_delegation(rbtdb_search_t *search, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset) -{ - dns_name_t * zcname; + dns_rdataset_t *sigrdataset) { + dns_name_t *zcname; rbtdb_rdatatype_t type; - dns_rbtnode_t * node; + dns_rbtnode_t *node; /* * The caller MUST NOT be holding any node locks. @@ -3178,8 +3105,8 @@ setup_delegation(rbtdb_search_t *search, dns_dbnode_t **nodep, isc_rwlocktype_read); bind_rdataset(search->rbtdb, node, search->zonecut_rdataset, search->now, rdataset); - if (sigrdataset != NULL && - search->zonecut_sigrdataset != NULL) { + if (sigrdataset != NULL && search->zonecut_sigrdataset != NULL) + { bind_rdataset(search->rbtdb, node, search->zonecut_sigrdataset, search->now, sigrdataset); @@ -3196,14 +3123,13 @@ setup_delegation(rbtdb_search_t *search, dns_dbnode_t **nodep, static inline bool valid_glue(rbtdb_search_t *search, dns_name_t *name, rbtdb_rdatatype_t type, - dns_rbtnode_t *node) -{ - unsigned char * raw; /* RDATASLAB */ - unsigned int count, size; - dns_name_t ns_name; - bool valid = false; - dns_offsets_t offsets; - isc_region_t region; + dns_rbtnode_t *node) { + unsigned char *raw; /* RDATASLAB */ + unsigned int count, size; + dns_name_t ns_name; + bool valid = false; + dns_offsets_t offsets; + isc_region_t region; rdatasetheader_t *header; /* @@ -3219,7 +3145,8 @@ valid_glue(rbtdb_search_t *search, dns_name_t *name, rbtdb_rdatatype_t type, return (false); } } else if (type != dns_rdatatype_a && type != dns_rdatatype_aaaa && - type != dns_rdatatype_a6) { + type != dns_rdatatype_a6) + { return (false); } @@ -3252,17 +3179,16 @@ valid_glue(rbtdb_search_t *search, dns_name_t *name, rbtdb_rdatatype_t type, static inline bool activeempty(rbtdb_search_t *search, dns_rbtnodechain_t *chain, - const dns_name_t *name) -{ - dns_fixedname_t fnext; - dns_fixedname_t forigin; - dns_name_t * next; - dns_name_t * origin; - dns_name_t prefix; - dns_rbtdb_t * rbtdb; - dns_rbtnode_t * node; - isc_result_t result; - bool answer = false; + const dns_name_t *name) { + dns_fixedname_t fnext; + dns_fixedname_t forigin; + dns_name_t *next; + dns_name_t *origin; + dns_name_t prefix; + dns_rbtdb_t *rbtdb; + dns_rbtnode_t *node; + isc_result_t result; + bool answer = false; rdatasetheader_t *header; rbtdb = search->rbtdb; @@ -3274,15 +3200,15 @@ activeempty(rbtdb_search_t *search, dns_rbtnodechain_t *chain, result = dns_rbtnodechain_next(chain, NULL, NULL); while (result == ISC_R_SUCCESS || result == DNS_R_NEWORIGIN) { node = NULL; - result = - dns_rbtnodechain_current(chain, &prefix, origin, &node); + result = dns_rbtnodechain_current(chain, &prefix, origin, + &node); if (result != ISC_R_SUCCESS) { break; } NODE_LOCK(&(rbtdb->node_locks[node->locknum].lock), isc_rwlocktype_read); - for (header = node->data; header != NULL; - header = header->next) { + for (header = node->data; header != NULL; header = header->next) + { if (header->serial <= search->serial && !IGNORE(header) && EXISTS(header)) { break; @@ -3306,26 +3232,25 @@ activeempty(rbtdb_search_t *search, dns_rbtnodechain_t *chain, static inline bool activeemtpynode(rbtdb_search_t *search, const dns_name_t *qname, - dns_name_t *wname) -{ - dns_fixedname_t fnext; - dns_fixedname_t forigin; - dns_fixedname_t fprev; - dns_name_t * next; - dns_name_t * origin; - dns_name_t * prev; - dns_name_t name; - dns_name_t rname; - dns_name_t tname; - dns_rbtdb_t * rbtdb; - dns_rbtnode_t * node; + dns_name_t *wname) { + dns_fixedname_t fnext; + dns_fixedname_t forigin; + dns_fixedname_t fprev; + dns_name_t *next; + dns_name_t *origin; + dns_name_t *prev; + dns_name_t name; + dns_name_t rname; + dns_name_t tname; + dns_rbtdb_t *rbtdb; + dns_rbtnode_t *node; dns_rbtnodechain_t chain; - bool check_next = true; - bool check_prev = true; - bool answer = false; - isc_result_t result; - rdatasetheader_t * header; - unsigned int n; + bool check_next = true; + bool check_prev = true; + bool answer = false; + isc_result_t result; + rdatasetheader_t *header; + unsigned int n; rbtdb = search->rbtdb; @@ -3350,8 +3275,8 @@ activeemtpynode(rbtdb_search_t *search, const dns_name_t *qname, } NODE_LOCK(&(rbtdb->node_locks[node->locknum].lock), isc_rwlocktype_read); - for (header = node->data; header != NULL; - header = header->next) { + for (header = node->data; header != NULL; header = header->next) + { if (header->serial <= search->serial && !IGNORE(header) && EXISTS(header)) { break; @@ -3380,8 +3305,8 @@ activeemtpynode(rbtdb_search_t *search, const dns_name_t *qname, } NODE_LOCK(&(rbtdb->node_locks[node->locknum].lock), isc_rwlocktype_read); - for (header = node->data; header != NULL; - header = header->next) { + for (header = node->data; header != NULL; header = header->next) + { if (header->serial <= search->serial && !IGNORE(header) && EXISTS(header)) { break; @@ -3411,7 +3336,8 @@ activeemtpynode(rbtdb_search_t *search, const dns_name_t *qname, do { if ((check_prev && dns_name_issubdomain(prev, &rname)) || - (check_next && dns_name_issubdomain(next, &rname))) { + (check_next && dns_name_issubdomain(next, &rname))) + { answer = true; break; } @@ -3426,17 +3352,16 @@ activeemtpynode(rbtdb_search_t *search, const dns_name_t *qname, static inline isc_result_t find_wildcard(rbtdb_search_t *search, dns_rbtnode_t **nodep, - const dns_name_t *qname) -{ - unsigned int i, j; - dns_rbtnode_t * node, *level_node, *wnode; - rdatasetheader_t * header; - isc_result_t result = ISC_R_NOTFOUND; - dns_name_t name; - dns_name_t * wname; - dns_fixedname_t fwname; - dns_rbtdb_t * rbtdb; - bool done, wild, active; + const dns_name_t *qname) { + unsigned int i, j; + dns_rbtnode_t *node, *level_node, *wnode; + rdatasetheader_t *header; + isc_result_t result = ISC_R_NOTFOUND; + dns_name_t name; + dns_name_t *wname; + dns_fixedname_t fwname; + dns_rbtdb_t *rbtdb; + bool done, wild, active; dns_rbtnodechain_t wchain; /* @@ -3468,8 +3393,8 @@ find_wildcard(rbtdb_search_t *search, dns_rbtnode_t **nodep, * may not need the information, because it simplifies the * locking and code flow. */ - for (header = node->data; header != NULL; - header = header->next) { + for (header = node->data; header != NULL; header = header->next) + { if (header->serial <= search->serial && !IGNORE(header) && EXISTS(header)) { break; @@ -3581,14 +3506,13 @@ find_wildcard(rbtdb_search_t *search, dns_rbtnode_t **nodep, } static bool -matchparams(rdatasetheader_t *header, rbtdb_search_t *search) -{ - dns_rdata_t rdata = DNS_RDATA_INIT; +matchparams(rdatasetheader_t *header, rbtdb_search_t *search) { + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_nsec3_t nsec3; - unsigned char * raw; /* RDATASLAB */ - unsigned int rdlen, count; - isc_region_t region; - isc_result_t result; + unsigned char *raw; /* RDATASLAB */ + unsigned int rdlen, count; + isc_region_t region; + isc_result_t result; REQUIRE(header->type == dns_rdatatype_nsec3); @@ -3610,7 +3534,8 @@ matchparams(rdatasetheader_t *header, rbtdb_search_t *search) nsec3.iterations == search->rbtversion->iterations && nsec3.salt_length == search->rbtversion->salt_length && memcmp(nsec3.salt, search->rbtversion->salt, - nsec3.salt_length) == 0) { + nsec3.salt_length) == 0) + { return (true); } dns_rdata_reset(&rdata); @@ -3625,12 +3550,11 @@ static inline isc_result_t previous_closest_nsec(dns_rdatatype_t type, rbtdb_search_t *search, dns_name_t *name, dns_name_t *origin, dns_rbtnode_t **nodep, dns_rbtnodechain_t *nsecchain, - bool *firstp) -{ + bool *firstp) { dns_fixedname_t ftarget; - dns_name_t * target; - dns_rbtnode_t * nsecnode; - isc_result_t result; + dns_name_t *target; + dns_rbtnode_t *nsecnode; + isc_result_t result; REQUIRE(nodep != NULL && *nodep == NULL); @@ -3741,20 +3665,19 @@ static inline isc_result_t find_closest_nsec(rbtdb_search_t *search, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, dns_rbt_t *tree, - dns_db_secure_t secure) -{ - dns_rbtnode_t * node, *prevnode; - rdatasetheader_t * header, *header_next, *found, *foundsig; + dns_db_secure_t secure) { + dns_rbtnode_t *node, *prevnode; + rdatasetheader_t *header, *header_next, *found, *foundsig; dns_rbtnodechain_t nsecchain; - bool empty_node; - isc_result_t result; - dns_fixedname_t fname, forigin; - dns_name_t * name, *origin; - dns_rdatatype_t type; - rbtdb_rdatatype_t sigtype; - bool wraps; - bool first = true; - bool need_sig = (secure == dns_db_secure); + bool empty_node; + isc_result_t result; + dns_fixedname_t fname, forigin; + dns_name_t *name, *origin; + dns_rdatatype_t type; + rbtdb_rdatatype_t sigtype; + bool wraps; + bool first = true; + bool need_sig = (secure == dns_db_secure); if (tree == search->rbtdb->nsec3) { type = dns_rdatatype_nsec3; @@ -3785,8 +3708,8 @@ again: found = NULL; foundsig = NULL; empty_node = true; - for (header = node->data; header != NULL; - header = header_next) { + for (header = node->data; header != NULL; header = header_next) + { header_next = header->next; /* * Look for an active, extant NSEC or RRSIG NSEC. @@ -3828,7 +3751,8 @@ again: if (!empty_node) { if (found != NULL && search->rbtversion->havensec3 && found->type == dns_rdatatype_nsec3 && - !matchparams(found, search)) { + !matchparams(found, search)) + { empty_node = true; found = NULL; foundsig = NULL; @@ -3904,8 +3828,8 @@ again: } if (result == ISC_R_NOMORE && wraps) { - result = - dns_rbtnodechain_last(&search->chain, tree, NULL, NULL); + result = dns_rbtnodechain_last(&search->chain, tree, NULL, + NULL); if (result == ISC_R_SUCCESS || result == DNS_R_NEWORIGIN) { wraps = false; goto again; @@ -3928,24 +3852,23 @@ static isc_result_t zone_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset) -{ - dns_rbtnode_t * node = NULL; - isc_result_t result; - rbtdb_search_t search; - bool cname_ok = true; - bool close_version = false; - bool maybe_zonecut = false; - bool at_zonecut = false; - bool wild; - bool empty_node; - rdatasetheader_t * header, *header_next, *found, *nsecheader; - rdatasetheader_t * foundsig, *cnamesig, *nsecsig; - rbtdb_rdatatype_t sigtype; - bool active; + dns_rdataset_t *sigrdataset) { + dns_rbtnode_t *node = NULL; + isc_result_t result; + rbtdb_search_t search; + bool cname_ok = true; + bool close_version = false; + bool maybe_zonecut = false; + bool at_zonecut = false; + bool wild; + bool empty_node; + rdatasetheader_t *header, *header_next, *found, *nsecheader; + rdatasetheader_t *foundsig, *cnamesig, *nsecsig; + rbtdb_rdatatype_t sigtype; + bool active; dns_rbtnodechain_t chain; - nodelock_t * lock; - dns_rbt_t * tree; + nodelock_t *lock; + dns_rbt_t *tree; search.rbtdb = (dns_rbtdb_t *)db; @@ -4031,7 +3954,8 @@ zone_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, if ((search.rbtversion->secure == dns_db_secure && !search.rbtversion->havensec3) || (search.options & DNS_DBFIND_FORCENSEC) != 0 || - (search.options & DNS_DBFIND_FORCENSEC3) != 0) { + (search.options & DNS_DBFIND_FORCENSEC3) != 0) + { result = find_closest_nsec(&search, nodep, foundname, rdataset, sigrdataset, tree, search.rbtversion->secure); @@ -4073,7 +3997,8 @@ found: if (node->find_callback && ((node != search.rbtdb->origin_node && !dns_rdatatype_atparent(type)) || - IS_STUB(search.rbtdb))) { + IS_STUB(search.rbtdb))) + { maybe_zonecut = true; } } @@ -4109,8 +4034,8 @@ found: * Look for an active, extant rdataset. */ do { - if (header->serial <= search.serial && - !IGNORE(header)) { + if (header->serial <= search.serial && !IGNORE(header)) + { /* * Is this a "this rdataset doesn't * exist" record? @@ -4154,7 +4079,8 @@ found: */ if ((search.options & DNS_DBFIND_GLUEOK) == 0 && type != dns_rdatatype_nsec && - type != dns_rdatatype_key) { + type != dns_rdatatype_key) + { /* * Glue is not OK, but any answer we * could return would be glue. Return @@ -4182,7 +4108,8 @@ found: * remember it. */ if (header->type == type || type == dns_rdatatype_any || - (header->type == dns_rdatatype_cname && cname_ok)) { + (header->type == dns_rdatatype_cname && cname_ok)) + { /* * We've found the answer! */ @@ -4231,7 +4158,8 @@ found: */ nsecheader = header; } else if (header->type == RBTDB_RDATATYPE_SIGNSEC && - !search.rbtversion->havensec3) { + !search.rbtversion->havensec3) + { /* * If we need the NSEC rdataset, we'll also * need its signature. @@ -4283,7 +4211,8 @@ found: result = DNS_R_NXRRSET; if (search.rbtversion->secure == dns_db_secure && !search.rbtversion->havensec3 && - (nsecheader == NULL || nsecsig == NULL)) { + (nsecheader == NULL || nsecsig == NULL)) + { /* * The zone is secure but there's no NSEC, * or the NSEC has no signature! @@ -4318,7 +4247,8 @@ found: } if ((search.rbtversion->secure == dns_db_secure && !search.rbtversion->havensec3) || - (search.options & DNS_DBFIND_FORCENSEC) != 0) { + (search.options & DNS_DBFIND_FORCENSEC) != 0) + { bind_rdataset(search.rbtdb, node, nsecheader, 0, rdataset); if (nsecsig != NULL) { @@ -4337,7 +4267,8 @@ found: */ if (type != found->type && type != dns_rdatatype_any && - found->type == dns_rdatatype_cname) { + found->type == dns_rdatatype_cname) + { /* * We weren't doing an ANY query and we found a CNAME instead * of the type we were looking for, so we need to indicate @@ -4359,7 +4290,8 @@ found: */ if (type == dns_rdatatype_nsec || type == dns_rdatatype_nsec3 || - type == dns_rdatatype_key) { + type == dns_rdatatype_key) + { result = ISC_R_SUCCESS; } else if (type == dns_rdatatype_any) { result = DNS_R_ZONECUT; @@ -4378,7 +4310,8 @@ found: */ if (result == DNS_R_GLUE && (search.options & DNS_DBFIND_VALIDATEGLUE) != 0 && - !valid_glue(&search, foundname, type, node)) { + !valid_glue(&search, foundname, type, node)) + { NODE_UNLOCK(lock, isc_rwlocktype_read); result = setup_delegation(&search, nodep, foundname, rdataset, sigrdataset); @@ -4446,8 +4379,7 @@ static isc_result_t zone_findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_name_t *dcname, dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *sigrdataset) { UNUSED(db); UNUSED(name); UNUSED(options); @@ -4467,11 +4399,10 @@ zone_findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, static bool check_stale_header(dns_rbtnode_t *node, rdatasetheader_t *header, isc_rwlocktype_t *locktype, nodelock_t *lock, - rbtdb_search_t *search, rdatasetheader_t **header_prev) -{ + rbtdb_search_t *search, rdatasetheader_t **header_prev) { if (!ACTIVE(header, search->now)) { - dns_ttl_t stale = - header->rdh_ttl + search->rbtdb->serve_stale_ttl; + dns_ttl_t stale = header->rdh_ttl + + search->rbtdb->serve_stale_ttl; /* * If this data is in the stale window keep it and if * DNS_DBFIND_STALEOK is not set we tell the caller to @@ -4491,7 +4422,8 @@ check_stale_header(dns_rbtnode_t *node, rdatasetheader_t *header, */ if ((header->rdh_ttl < search->now - RBTDB_VIRTUAL) && (*locktype == isc_rwlocktype_write || - NODE_TRYUPGRADE(lock) == ISC_R_SUCCESS)) { + NODE_TRYUPGRADE(lock) == ISC_R_SUCCESS)) + { /* * We update the node's status only when we can * get write access; otherwise, we leave others @@ -4535,14 +4467,13 @@ check_stale_header(dns_rbtnode_t *node, rdatasetheader_t *header, } static isc_result_t -cache_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) -{ - rbtdb_search_t * search = arg; +cache_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) { + rbtdb_search_t *search = arg; rdatasetheader_t *header, *header_prev, *header_next; rdatasetheader_t *dname_header, *sigdname_header; - isc_result_t result; - nodelock_t * lock; - isc_rwlocktype_t locktype; + isc_result_t result; + nodelock_t *lock; + isc_rwlocktype_t locktype; /* XXX comment */ @@ -4583,7 +4514,8 @@ cache_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) if (dname_header != NULL && (!DNS_TRUST_PENDING(dname_header->trust) || - (search->options & DNS_DBFIND_PENDINGOK) != 0)) { + (search->options & DNS_DBFIND_PENDINGOK) != 0)) + { /* * We increment the reference count on node to ensure that * search->zonecut_rdataset will still be valid later. @@ -4607,18 +4539,17 @@ cache_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) static inline isc_result_t find_deepest_zonecut(rbtdb_search_t *search, dns_rbtnode_t *node, dns_dbnode_t **nodep, dns_name_t *foundname, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ - unsigned int i; - dns_rbtnode_t * level_node; + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { + unsigned int i; + dns_rbtnode_t *level_node; rdatasetheader_t *header, *header_prev, *header_next; rdatasetheader_t *found, *foundsig; - isc_result_t result = ISC_R_NOTFOUND; - dns_name_t name; - dns_rbtdb_t * rbtdb; - bool done; - nodelock_t * lock; - isc_rwlocktype_t locktype; + isc_result_t result = ISC_R_NOTFOUND; + dns_name_t name; + dns_rbtdb_t *rbtdb; + bool done; + nodelock_t *lock; + isc_rwlocktype_t locktype; /* * Caller must be holding the tree lock. @@ -4638,8 +4569,8 @@ find_deepest_zonecut(rbtdb_search_t *search, dns_rbtnode_t *node, found = NULL; foundsig = NULL; header_prev = NULL; - for (header = node->data; header != NULL; - header = header_next) { + for (header = node->data; header != NULL; header = header_next) + { header_next = header->next; if (check_stale_header(node, header, &locktype, lock, search, &header_prev)) { @@ -4709,7 +4640,8 @@ find_deepest_zonecut(rbtdb_search_t *search, dns_rbtnode_t *node, } if (need_headerupdate(found, search->now) || (foundsig != NULL && - need_headerupdate(foundsig, search->now))) { + need_headerupdate(foundsig, search->now))) + { if (locktype != isc_rwlocktype_write) { NODE_UNLOCK(lock, locktype); NODE_LOCK(lock, isc_rwlocktype_write); @@ -4745,25 +4677,24 @@ find_deepest_zonecut(rbtdb_search_t *search, dns_rbtnode_t *node, static isc_result_t find_coveringnsec(rbtdb_search_t *search, dns_dbnode_t **nodep, isc_stdtime_t now, dns_name_t *foundname, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ - dns_rbtnode_t * node; - rdatasetheader_t * header, *header_next, *header_prev; - rdatasetheader_t * found, *foundsig; - bool empty_node; - isc_result_t result; - dns_fixedname_t fname, forigin; - dns_name_t * name, *origin; - rbtdb_rdatatype_t matchtype, sigmatchtype; - nodelock_t * lock; - isc_rwlocktype_t locktype; + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { + dns_rbtnode_t *node; + rdatasetheader_t *header, *header_next, *header_prev; + rdatasetheader_t *found, *foundsig; + bool empty_node; + isc_result_t result; + dns_fixedname_t fname, forigin; + dns_name_t *name, *origin; + rbtdb_rdatatype_t matchtype, sigmatchtype; + nodelock_t *lock; + isc_rwlocktype_t locktype; dns_rbtnodechain_t chain; chain = search->chain; matchtype = RBTDB_RDATATYPE_VALUE(dns_rdatatype_nsec, 0); - sigmatchtype = - RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig, dns_rdatatype_nsec); + sigmatchtype = RBTDB_RDATATYPE_VALUE(dns_rdatatype_rrsig, + dns_rdatatype_nsec); do { node = NULL; @@ -4780,8 +4711,8 @@ find_coveringnsec(rbtdb_search_t *search, dns_dbnode_t **nodep, foundsig = NULL; empty_node = true; header_prev = NULL; - for (header = node->data; header != NULL; - header = header_next) { + for (header = node->data; header != NULL; header = header_next) + { header_next = header->next; if (check_stale_header(node, header, &locktype, lock, search, &header_prev)) { @@ -4797,7 +4728,8 @@ find_coveringnsec(rbtdb_search_t *search, dns_dbnode_t **nodep, */ if (header->noqname == NULL && RBTDB_RDATATYPE_BASE(header->type) != - dns_rdatatype_rrsig) { + dns_rdatatype_rrsig) + { empty_node = false; } if (header->type == matchtype) { @@ -4837,15 +4769,14 @@ static isc_result_t cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ - dns_rbtnode_t * node = NULL; - isc_result_t result; - rbtdb_search_t search; - bool cname_ok = true; - bool empty_node; - nodelock_t * lock; - isc_rwlocktype_t locktype; + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { + dns_rbtnode_t *node = NULL; + isc_result_t result; + rbtdb_search_t search; + bool cname_ok = true; + bool empty_node; + nodelock_t *lock; + isc_rwlocktype_t locktype; rdatasetheader_t *header, *header_prev, *header_next; rdatasetheader_t *found, *nsheader; rdatasetheader_t *foundsig, *nssig, *cnamesig; @@ -4961,7 +4892,8 @@ cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, if (header->type == type || (type == dns_rdatatype_any && RBTDB_RDATATYPE_BASE(header->type) != 0) || - (cname_ok && header->type == dns_rdatatype_cname)) { + (cname_ok && header->type == dns_rdatatype_cname)) + { /* * We've found the answer. */ @@ -5036,7 +4968,8 @@ cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, (found->trust == dns_trust_glue && ((options & DNS_DBFIND_GLUEOK) == 0)) || (DNS_TRUST_PENDING(found->trust) && - ((options & DNS_DBFIND_PENDINGOK) == 0))) { + ((options & DNS_DBFIND_PENDINGOK) == 0))) + { /* * Return covering NODATA NSEC record. */ @@ -5116,7 +5049,8 @@ cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, result = DNS_R_NCACHENXRRSET; } } else if (type != found->type && type != dns_rdatatype_any && - found->type == dns_rdatatype_cname) { + found->type == dns_rdatatype_cname) + { /* * We weren't doing an ANY query and we found a CNAME instead * of the type we were looking for, so we need to indicate @@ -5131,7 +5065,8 @@ cache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, } if (type != dns_rdatatype_any || result == DNS_R_NCACHENXDOMAIN || - result == DNS_R_NCACHENXRRSET) { + result == DNS_R_NCACHENXRRSET) + { bind_rdataset(search.rbtdb, node, found, search.now, rdataset); if (need_headerupdate(found, search.now)) { update = found; @@ -5190,17 +5125,16 @@ static isc_result_t cache_findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_name_t *dcname, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ - dns_rbtnode_t * node = NULL; - nodelock_t * lock; - isc_result_t result; - rbtdb_search_t search; + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { + dns_rbtnode_t *node = NULL; + nodelock_t *lock; + isc_result_t result; + rbtdb_search_t search; rdatasetheader_t *header, *header_prev, *header_next; rdatasetheader_t *found, *foundsig; - unsigned int rbtoptions = DNS_RBTFIND_EMPTYDATA; - isc_rwlocktype_t locktype; - bool dcnull = (dcname == NULL); + unsigned int rbtoptions = DNS_RBTFIND_EMPTYDATA; + isc_rwlocktype_t locktype; + bool dcnull = (dcname == NULL); search.rbtdb = (dns_rbtdb_t *)db; @@ -5310,7 +5244,8 @@ cache_findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, } if (need_headerupdate(found, search.now) || - (foundsig != NULL && need_headerupdate(foundsig, search.now))) { + (foundsig != NULL && need_headerupdate(foundsig, search.now))) + { if (locktype != isc_rwlocktype_write) { NODE_UNLOCK(lock, locktype); NODE_LOCK(lock, isc_rwlocktype_write); @@ -5320,8 +5255,8 @@ cache_findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, if (need_headerupdate(found, search.now)) { update_header(search.rbtdb, found, search.now); } - if (foundsig != NULL && - need_headerupdate(foundsig, search.now)) { + if (foundsig != NULL && need_headerupdate(foundsig, search.now)) + { update_header(search.rbtdb, foundsig, search.now); } } @@ -5343,9 +5278,8 @@ tree_exit: } static void -attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; +attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; dns_rbtnode_t *node = (dns_rbtnode_t *)source; REQUIRE(VALID_RBTDB(rbtdb)); @@ -5357,12 +5291,11 @@ attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) } static void -detachnode(dns_db_t *db, dns_dbnode_t **targetp) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; - dns_rbtnode_t * node; - bool want_free = false; - bool inactive = false; +detachnode(dns_db_t *db, dns_dbnode_t **targetp) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; + dns_rbtnode_t *node; + bool want_free = false; + bool inactive = false; rbtdb_nodelock_t *nodelock; REQUIRE(VALID_RBTDB(rbtdb)); @@ -5374,7 +5307,8 @@ detachnode(dns_db_t *db, dns_dbnode_t **targetp) NODE_LOCK(&nodelock->lock, isc_rwlocktype_read); if (decrement_reference(rbtdb, node, 0, isc_rwlocktype_read, - isc_rwlocktype_none, false)) { + isc_rwlocktype_none, false)) + { if (isc_refcount_current(&nodelock->references) == 0 && nodelock->exiting) { inactive = true; @@ -5409,20 +5343,19 @@ detachnode(dns_db_t *db, dns_dbnode_t **targetp) } static isc_result_t -expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; - dns_rbtnode_t * rbtnode = node; +expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; + dns_rbtnode_t *rbtnode = node; rdatasetheader_t *header; - bool force_expire = false; + bool force_expire = false; /* * These are the category and module used by the cache cleaner. */ - bool log = false; + bool log = false; isc_logcategory_t *category = DNS_LOGCATEGORY_DATABASE; - isc_logmodule_t * module = DNS_LOGMODULE_CACHE; - int level = ISC_LOG_DEBUG(2); - char printname[DNS_NAME_FORMATSIZE]; + isc_logmodule_t *module = DNS_LOGMODULE_CACHE; + int level = ISC_LOG_DEBUG(2); + char printname[DNS_NAME_FORMATSIZE]; REQUIRE(VALID_RBTDB(rbtdb)); @@ -5439,8 +5372,8 @@ expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) * Force expire with 25% probability. * XXXDCL Could stand to have a better policy, like LRU. */ - force_expire = - (rbtnode->down == NULL && (isc_random32() % 4) == 0); + force_expire = (rbtnode->down == NULL && + (isc_random32() % 4) == 0); /* * Note that 'log' can be true IFF overmem is also true. @@ -5502,8 +5435,7 @@ expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) } static void -overmem(dns_db_t *db, bool over) -{ +overmem(dns_db_t *db, bool over) { /* This is an empty callback. See adb.c:water() */ UNUSED(db); @@ -5513,12 +5445,11 @@ overmem(dns_db_t *db, bool over) } static void -printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; +printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; dns_rbtnode_t *rbtnode = node; - bool first; - uint32_t refs; + bool first; + uint32_t refs; REQUIRE(VALID_RBTDB(rbtdb)); @@ -5562,9 +5493,9 @@ printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) } static isc_result_t -createiterator(dns_db_t *db, unsigned int options, dns_dbiterator_t **iteratorp) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; +createiterator(dns_db_t *db, unsigned int options, + dns_dbiterator_t **iteratorp) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; rbtdb_dbiterator_t *rbtdbiter; REQUIRE(VALID_RBTDB(rbtdb)); @@ -5574,8 +5505,8 @@ createiterator(dns_db_t *db, unsigned int options, dns_dbiterator_t **iteratorp) rbtdbiter->common.methods = &dbiterator_methods; rbtdbiter->common.db = NULL; dns_db_attach(db, &rbtdbiter->common.db); - rbtdbiter->common.relative_names = - ((options & DNS_DB_RELATIVENAMES) != 0); + rbtdbiter->common.relative_names = ((options & DNS_DB_RELATIVENAMES) != + 0); rbtdbiter->common.magic = DNS_DBITERATOR_MAGIC; rbtdbiter->common.cleaning = false; rbtdbiter->paused = true; @@ -5605,14 +5536,13 @@ static isc_result_t zone_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) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; - dns_rbtnode_t * rbtnode = (dns_rbtnode_t *)node; + dns_rdataset_t *sigrdataset) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; + dns_rbtnode_t *rbtnode = (dns_rbtnode_t *)node; rdatasetheader_t *header, *header_next, *found, *foundsig; - rbtdb_serial_t serial; - rbtdb_version_t * rbtversion = version; - bool close_version = false; + rbtdb_serial_t serial; + rbtdb_version_t *rbtversion = version; + bool close_version = false; rbtdb_rdatatype_t matchtype, sigmatchtype; REQUIRE(VALID_RBTDB(rbtdb)); @@ -5699,15 +5629,14 @@ static isc_result_t cache_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) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; - dns_rbtnode_t * rbtnode = (dns_rbtnode_t *)node; + dns_rdataset_t *sigrdataset) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; + dns_rbtnode_t *rbtnode = (dns_rbtnode_t *)node; rdatasetheader_t *header, *header_next, *found, *foundsig; rbtdb_rdatatype_t matchtype, sigmatchtype, negtype; - isc_result_t result; - nodelock_t * lock; - isc_rwlocktype_t locktype; + isc_result_t result; + nodelock_t *lock; + isc_rwlocktype_t locktype; REQUIRE(VALID_RBTDB(rbtdb)); REQUIRE(type != dns_rdatatype_any); @@ -5739,7 +5668,8 @@ cache_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, if (!ACTIVE(header, now)) { if ((header->rdh_ttl < now - RBTDB_VIRTUAL) && (locktype == isc_rwlocktype_write || - NODE_TRYUPGRADE(lock) == ISC_R_SUCCESS)) { + NODE_TRYUPGRADE(lock) == ISC_R_SUCCESS)) + { /* * We update the node's status only when we * can get write access. @@ -5798,11 +5728,10 @@ cache_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, static isc_result_t allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, - isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; - dns_rbtnode_t * rbtnode = (dns_rbtnode_t *)node; - rbtdb_version_t * rbtversion = version; + isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; + dns_rbtnode_t *rbtnode = (dns_rbtnode_t *)node; + rbtdb_version_t *rbtversion = version; rbtdb_rdatasetiter_t *iterator; REQUIRE(VALID_RBTDB(rbtdb)); @@ -5843,11 +5772,10 @@ allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, } static bool -cname_and_other_data(dns_rbtnode_t *node, rbtdb_serial_t serial) -{ +cname_and_other_data(dns_rbtnode_t *node, rbtdb_serial_t serial) { rdatasetheader_t *header, *header_next; - bool cname, other_data; - dns_rdatatype_t rdtype; + bool cname, other_data; + dns_rdatatype_t rdtype; /* * The caller must hold the node lock. @@ -5865,8 +5793,8 @@ cname_and_other_data(dns_rbtnode_t *node, rbtdb_serial_t serial) * Look for an active extant CNAME. */ do { - if (header->serial <= serial && - !IGNORE(header)) { + if (header->serial <= serial && !IGNORE(header)) + { /* * Is this a "this rdataset doesn't * exist" record? @@ -5893,7 +5821,8 @@ cname_and_other_data(dns_rbtnode_t *node, rbtdb_serial_t serial) if (rdtype != dns_rdatatype_key && rdtype != dns_rdatatype_sig && rdtype != dns_rdatatype_nsec && - rdtype != dns_rdatatype_rrsig) { + rdtype != dns_rdatatype_rrsig) + { /* * Is it active and extant? */ @@ -5927,8 +5856,7 @@ cname_and_other_data(dns_rbtnode_t *node, rbtdb_serial_t serial) } static isc_result_t -resign_insert(dns_rbtdb_t *rbtdb, int idx, rdatasetheader_t *newheader) -{ +resign_insert(dns_rbtdb_t *rbtdb, int idx, rdatasetheader_t *newheader) { isc_result_t result; INSIST(!IS_CACHE(rbtdb)); @@ -5941,8 +5869,7 @@ 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) -{ + rdatasetheader_t *header) { /* * Remove the old header from the heap */ @@ -5959,10 +5886,9 @@ resign_delete(dns_rbtdb_t *rbtdb, rbtdb_version_t *version, static void update_recordsandbytes(bool add, rbtdb_version_t *rbtversion, - rdatasetheader_t *header) -{ + rdatasetheader_t *header) { unsigned char *hdr = (unsigned char *)header; - size_t hdrsize = sizeof(*header); + size_t hdrsize = sizeof(*header); RWLOCK(&rbtversion->rwlock, isc_rwlocktype_write); if (add) { @@ -5978,19 +5904,18 @@ update_recordsandbytes(bool add, rbtdb_version_t *rbtversion, static isc_result_t add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion, rdatasetheader_t *newheader, unsigned int options, bool loading, - dns_rdataset_t *addedrdataset, isc_stdtime_t now) -{ - rbtdb_changed_t * changed = NULL; + dns_rdataset_t *addedrdataset, isc_stdtime_t now) { + rbtdb_changed_t *changed = NULL; rdatasetheader_t *topheader, *topheader_prev, *header, *sigheader; - unsigned char * merged; - isc_result_t result; - bool header_nx; - bool newheader_nx; - bool merge; - dns_rdatatype_t rdtype, covers; + unsigned char *merged; + isc_result_t result; + bool header_nx; + bool newheader_nx; + bool merge; + dns_rdatatype_t rdtype, covers; rbtdb_rdatatype_t negtype, sigtype; - dns_trust_t trust; - int idx; + dns_trust_t trust; + int idx; /* * Add an rdatasetheader_t to a node. @@ -6081,8 +6006,9 @@ add32(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion, if ((topheader->type == RBTDB_RDATATYPE_NCACHEANY) || (newheader->type == sigtype && - topheader->type == RBTDB_RDATATYPE_VALUE( - 0, covers))) { + topheader->type == + RBTDB_RDATATYPE_VALUE(0, covers))) + { break; } } @@ -6156,7 +6082,8 @@ find_header: * policy is here. */ if (rbtversion == NULL && trust < header->trust && - (ACTIVE(header, now) || header_nx)) { + (ACTIVE(header, now) || header_nx)) + { free_rdataset(rbtdb, rbtdb->common.mctx, newheader); if (addedrdataset != NULL) { bind_rdataset(rbtdb, rbtnode, header, now, @@ -6190,7 +6117,8 @@ find_header: * merge is only done with zonedbs. */ if ((options & DNS_DBADD_EXACTTTL) != 0 && - newheader->rdh_ttl != header->rdh_ttl) { + newheader->rdh_ttl != header->rdh_ttl) + { result = DNS_R_NOTEXACT; } else if (newheader->rdh_ttl != header->rdh_ttl) { flags |= DNS_RDATASLAB_FORCE; @@ -6221,7 +6149,8 @@ find_header: update_newheader(newheader, header); if (loading && RESIGN(newheader) && RESIGN(header) && - resign_sooner(header, newheader)) { + resign_sooner(header, newheader)) + { newheader->resign = header->resign; newheader->resign_lsb = header->resign_lsb; @@ -6247,7 +6176,8 @@ find_header: (unsigned char *)newheader, (unsigned int)(sizeof(*newheader)), rbtdb->common.rdclass, - (dns_rdatatype_t)header->type)) { + (dns_rdatatype_t)header->type)) + { /* * Honour the new ttl if it is less than the * older one. @@ -6279,7 +6209,8 @@ find_header: */ if (IS_CACHE(rbtdb) && ACTIVE(header, now) && header->type == dns_rdatatype_ns && !header_nx && - !newheader_nx && header->trust <= newheader->trust) { + !newheader_nx && header->trust <= newheader->trust) + { if (newheader->rdh_ttl > header->rdh_ttl) { newheader->rdh_ttl = header->rdh_ttl; } @@ -6294,7 +6225,8 @@ find_header: header->trust >= newheader->trust && dns_rdataslab_equal((unsigned char *)header, (unsigned char *)newheader, - (unsigned int)(sizeof(*newheader)))) { + (unsigned int)(sizeof(*newheader)))) + { /* * Honour the new ttl if it is less than the * older one. @@ -6516,8 +6448,8 @@ find_header: } static inline bool -delegating_type(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, rbtdb_rdatatype_t type) -{ +delegating_type(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, + rbtdb_rdatatype_t type) { if (IS_CACHE(rbtdb)) { if (type == dns_rdatatype_dname) { return (true); @@ -6526,7 +6458,8 @@ delegating_type(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, rbtdb_rdatatype_t type) } } else if (type == dns_rdatatype_dname || (type == dns_rdatatype_ns && - (node != rbtdb->origin_node || IS_STUB(rbtdb)))) { + (node != rbtdb->origin_node || IS_STUB(rbtdb)))) + { return (true); } return (false); @@ -6534,14 +6467,13 @@ delegating_type(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, rbtdb_rdatatype_t type) static inline isc_result_t addnoqname(dns_rbtdb_t *rbtdb, rdatasetheader_t *newheader, - dns_rdataset_t *rdataset) -{ + dns_rdataset_t *rdataset) { struct noqname *noqname; - isc_mem_t * mctx = rbtdb->common.mctx; - dns_name_t name; - dns_rdataset_t neg, negsig; - isc_result_t result; - isc_region_t r; + isc_mem_t *mctx = rbtdb->common.mctx; + dns_name_t name; + dns_rdataset_t neg, negsig; + isc_result_t result; + isc_region_t r; dns_name_init(&name, NULL); dns_rdataset_init(&neg); @@ -6580,14 +6512,13 @@ cleanup: static inline isc_result_t addclosest(dns_rbtdb_t *rbtdb, rdatasetheader_t *newheader, - dns_rdataset_t *rdataset) -{ + dns_rdataset_t *rdataset) { struct noqname *closest; - isc_mem_t * mctx = rbtdb->common.mctx; - dns_name_t name; - dns_rdataset_t neg, negsig; - isc_result_t result; - isc_region_t r; + isc_mem_t *mctx = rbtdb->common.mctx; + dns_name_t name; + dns_rdataset_t neg, negsig; + isc_result_t result; + isc_region_t r; dns_name_init(&name, NULL); dns_rdataset_init(&neg); @@ -6629,21 +6560,20 @@ static dns_dbmethods_t zone_methods; static isc_result_t addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, isc_stdtime_t now, dns_rdataset_t *rdataset, unsigned int options, - dns_rdataset_t *addedrdataset) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; - dns_rbtnode_t * rbtnode = (dns_rbtnode_t *)node; - rbtdb_version_t * rbtversion = version; - isc_region_t region; + dns_rdataset_t *addedrdataset) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; + dns_rbtnode_t *rbtnode = (dns_rbtnode_t *)node; + rbtdb_version_t *rbtversion = version; + isc_region_t region; rdatasetheader_t *newheader; rdatasetheader_t *header; - isc_result_t result; - bool delegating; - bool newnsec; - bool tree_locked = false; - bool cache_is_overmem = false; - dns_fixedname_t fixed; - dns_name_t * name; + isc_result_t result; + bool delegating; + bool newnsec; + bool tree_locked = false; + bool cache_is_overmem = false; + dns_fixedname_t fixed; + dns_name_t *name; REQUIRE(VALID_RBTDB(rbtdb)); INSIST(rbtversion == NULL || rbtversion->rbtdb == rbtdb); @@ -6683,8 +6613,8 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, init_rdataset(rbtdb, newheader); setownercase(newheader, name); set_ttl(rbtdb, newheader, rdataset->ttl + now); - newheader->type = - RBTDB_RDATATYPE_VALUE(rdataset->type, rdataset->covers); + newheader->type = RBTDB_RDATATYPE_VALUE(rdataset->type, + rdataset->covers); newheader->attributes = 0; if (rdataset->ttl == 0U) { newheader->attributes |= RDATASET_ATTR_ZEROTTL; @@ -6759,7 +6689,8 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, */ RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_read); if (rbtnode->nsec != DNS_RBT_NSEC_HAS_NSEC && - rdataset->type == dns_rdatatype_nsec) { + rdataset->type == dns_rdatatype_nsec) + { newnsec = true; } else { newnsec = false; @@ -6858,16 +6789,15 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, static isc_result_t subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdataset_t *rdataset, unsigned int options, - dns_rdataset_t *newrdataset) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; - dns_rbtnode_t * rbtnode = (dns_rbtnode_t *)node; - rbtdb_version_t * rbtversion = version; + dns_rdataset_t *newrdataset) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; + dns_rbtnode_t *rbtnode = (dns_rbtnode_t *)node; + rbtdb_version_t *rbtversion = version; rdatasetheader_t *topheader, *topheader_prev, *header, *newheader; - unsigned char * subresult; - isc_region_t region; - isc_result_t result; - rbtdb_changed_t * changed; + unsigned char *subresult; + isc_region_t region; + isc_result_t result; + rbtdb_changed_t *changed; REQUIRE(VALID_RBTDB(rbtdb)); REQUIRE(rbtversion != NULL && rbtversion->rbtdb == rbtdb); @@ -6891,8 +6821,8 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, newheader = (rdatasetheader_t *)region.base; init_rdataset(rbtdb, newheader); set_ttl(rbtdb, newheader, rdataset->ttl); - newheader->type = - RBTDB_RDATATYPE_VALUE(rdataset->type, rdataset->covers); + newheader->type = RBTDB_RDATATYPE_VALUE(rdataset->type, + rdataset->covers); newheader->attributes = 0; newheader->serial = rbtversion->serial; newheader->trust = 0; @@ -7052,7 +6982,8 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, } if (result == DNS_R_NXRRSET && newrdataset != NULL && - (options & DNS_DBSUB_WANTOLD) != 0) { + (options & DNS_DBSUB_WANTOLD) != 0) + { bind_rdataset(rbtdb, rbtnode, header, 0, newrdataset); } @@ -7076,12 +7007,11 @@ unlock: static isc_result_t deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, - dns_rdatatype_t type, dns_rdatatype_t covers) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; - dns_rbtnode_t * rbtnode = (dns_rbtnode_t *)node; - rbtdb_version_t * rbtversion = version; - isc_result_t result; + dns_rdatatype_t type, dns_rdatatype_t covers) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; + dns_rbtnode_t *rbtnode = (dns_rbtnode_t *)node; + rbtdb_version_t *rbtversion = version; + isc_result_t result; rdatasetheader_t *newheader; REQUIRE(VALID_RBTDB(rbtdb)); @@ -7142,9 +7072,8 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, */ static isc_result_t loadnode(dns_rbtdb_t *rbtdb, const dns_name_t *name, dns_rbtnode_t **nodep, - bool hasnsec) -{ - isc_result_t noderesult, nsecresult, tmpresult; + bool hasnsec) { + isc_result_t noderesult, nsecresult, tmpresult; dns_rbtnode_t *nsecnode = NULL, *node = NULL; noderesult = dns_rbt_addnode(rbtdb->tree, name, &node); @@ -7218,13 +7147,13 @@ done: } static isc_result_t -loading_addrdataset(void *arg, const dns_name_t *name, dns_rdataset_t *rdataset) -{ - rbtdb_load_t * loadctx = arg; - dns_rbtdb_t * rbtdb = loadctx->rbtdb; - dns_rbtnode_t * node; - isc_result_t result; - isc_region_t region; +loading_addrdataset(void *arg, const dns_name_t *name, + dns_rdataset_t *rdataset) { + rbtdb_load_t *loadctx = arg; + dns_rbtdb_t *rbtdb = loadctx->rbtdb; + dns_rbtnode_t *node; + isc_result_t result; + isc_region_t region; rdatasetheader_t *newheader; REQUIRE(rdataset->rdclass == rbtdb->common.rdclass); @@ -7239,12 +7168,14 @@ loading_addrdataset(void *arg, const dns_name_t *name, dns_rdataset_t *rdataset) * SOA records are only allowed at top of zone. */ if (rdataset->type == dns_rdatatype_soa && !IS_CACHE(rbtdb) && - !dns_name_equal(name, &rbtdb->common.origin)) { + !dns_name_equal(name, &rbtdb->common.origin)) + { return (DNS_R_NOTZONETOP); } if (rdataset->type != dns_rdatatype_nsec3 && - rdataset->covers != dns_rdatatype_nsec3) { + rdataset->covers != dns_rdatatype_nsec3) + { add_empty_wildcards(rbtdb, name); } @@ -7269,7 +7200,8 @@ loading_addrdataset(void *arg, const dns_name_t *name, dns_rdataset_t *rdataset) node = NULL; if (rdataset->type == dns_rdatatype_nsec3 || - rdataset->covers == dns_rdatatype_nsec3) { + rdataset->covers == dns_rdatatype_nsec3) + { result = dns_rbt_addnode(rbtdb->nsec3, name, &node); if (result == ISC_R_SUCCESS) { node->nsec = DNS_RBT_NSEC_NSEC3; @@ -7298,8 +7230,8 @@ loading_addrdataset(void *arg, const dns_name_t *name, dns_rdataset_t *rdataset) init_rdataset(rbtdb, newheader); set_ttl(rbtdb, newheader, rdataset->ttl + loadctx->now); /* XXX overflow * check */ - newheader->type = - RBTDB_RDATATYPE_VALUE(rdataset->type, rdataset->covers); + newheader->type = RBTDB_RDATATYPE_VALUE(rdataset->type, + rdataset->covers); newheader->attributes = 0; newheader->trust = rdataset->trust; newheader->serial = 1; @@ -7341,19 +7273,18 @@ loading_addrdataset(void *arg, const dns_name_t *name, dns_rdataset_t *rdataset) static isc_result_t rbt_datafixer(dns_rbtnode_t *rbtnode, void *base, size_t filesize, void *arg, - uint64_t *crc) -{ - isc_result_t result; - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)arg; + uint64_t *crc) { + isc_result_t result; + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)arg; rdatasetheader_t *header; - unsigned char * limit = ((unsigned char *)base) + filesize; + unsigned char *limit = ((unsigned char *)base) + filesize; REQUIRE(rbtnode != NULL); REQUIRE(VALID_RBTDB(rbtdb)); for (header = rbtnode->data; header != NULL; header = header->next) { unsigned char *p = (unsigned char *)header; - size_t size = dns_rdataslab_size(p, sizeof(*header)); + size_t size = dns_rdataslab_size(p, sizeof(*header)); isc_crc64_update(crc, p, size); #ifdef DEBUG hexdump("hashing header", p, sizeof(rdatasetheader_t)); @@ -7383,7 +7314,8 @@ rbt_datafixer(dns_rbtnode_t *rbtnode, void *base, size_t filesize, void *arg, header->next = (rdatasetheader_t *)(p + cooked); header->next_is_relative = 0; if ((header->next < (rdatasetheader_t *)base) || - (header->next > (rdatasetheader_t *)limit)) { + (header->next > (rdatasetheader_t *)limit)) + { return (ISC_R_INVALIDFILE); } } @@ -7397,18 +7329,17 @@ rbt_datafixer(dns_rbtnode_t *rbtnode, void *base, size_t filesize, void *arg, * Load the RBT database from the image in 'f' */ static isc_result_t -deserialize32(void *arg, FILE *f, off_t offset) -{ - isc_result_t result; - rbtdb_load_t * loadctx = arg; - dns_rbtdb_t * rbtdb = loadctx->rbtdb; +deserialize32(void *arg, FILE *f, off_t offset) { + isc_result_t result; + rbtdb_load_t *loadctx = arg; + dns_rbtdb_t *rbtdb = loadctx->rbtdb; rbtdb_file_header_t *header; - int fd; - off_t filesize = 0; - char * base; - dns_rbt_t * tree = NULL, *nsec = NULL, *nsec3 = NULL; - int protect, flags; - dns_rbtnode_t * origin_node = NULL; + int fd; + off_t filesize = 0; + char *base; + dns_rbt_t *tree = NULL, *nsec = NULL, *nsec3 = NULL; + int protect, flags; + dns_rbtnode_t *origin_node = NULL; REQUIRE(VALID_RBTDB(rbtdb)); @@ -7516,10 +7447,9 @@ cleanup: } static isc_result_t -beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) -{ +beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) { rbtdb_load_t *loadctx; - dns_rbtdb_t * rbtdb; + dns_rbtdb_t *rbtdb; rbtdb = (dns_rbtdb_t *)db; REQUIRE(DNS_CALLBACK_VALID(callbacks)); @@ -7551,10 +7481,9 @@ beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) } static isc_result_t -endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) -{ +endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) { rbtdb_load_t *loadctx; - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; REQUIRE(VALID_RBTDB(rbtdb)); REQUIRE(DNS_CALLBACK_VALID(callbacks)); @@ -7597,18 +7526,17 @@ endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) * by the void *data pointer in the dns_rbtnode */ static isc_result_t -rbt_datawriter(FILE *rbtfile, unsigned char *data, void *arg, uint64_t *crc) -{ - rbtdb_version_t * version = (rbtdb_version_t *)arg; - rbtdb_serial_t serial; - rdatasetheader_t newheader; +rbt_datawriter(FILE *rbtfile, unsigned char *data, void *arg, uint64_t *crc) { + rbtdb_version_t *version = (rbtdb_version_t *)arg; + rbtdb_serial_t serial; + rdatasetheader_t newheader; rdatasetheader_t *header = (rdatasetheader_t *)data, *next; - off_t where; - size_t cooked, size; - unsigned char * p; - isc_result_t result = ISC_R_SUCCESS; - char pad[sizeof(char *)]; - uintptr_t off; + off_t where; + size_t cooked, size; + unsigned char *p; + isc_result_t result = ISC_R_SUCCESS; + char pad[sizeof(char *)]; + uintptr_t off; REQUIRE(rbtfile != NULL); REQUIRE(data != NULL); @@ -7695,9 +7623,8 @@ failure: * writing fail or be interrupted. */ static isc_result_t -rbtdb_zero_header(FILE *rbtfile) -{ - char buffer[RBTDB_HEADER_LENGTH]; +rbtdb_zero_header(FILE *rbtfile) { + char buffer[RBTDB_HEADER_LENGTH]; isc_result_t result; memset(buffer, 0, RBTDB_HEADER_LENGTH); @@ -7710,8 +7637,7 @@ rbtdb_zero_header(FILE *rbtfile) static isc_once_t once = ISC_ONCE_INIT; static void -init_file_version(void) -{ +init_file_version(void) { int n; memset(FILE_VERSION, 0, sizeof(FILE_VERSION)); @@ -7728,10 +7654,9 @@ init_file_version(void) */ static isc_result_t rbtdb_write_header(FILE *rbtfile, off_t tree_location, off_t nsec_location, - off_t nsec3_location) -{ + off_t nsec3_location) { rbtdb_file_header_t header; - isc_result_t result; + isc_result_t result; RUNTIME_CHECK(isc_once_do(&once, init_file_version) == ISC_R_SUCCESS); @@ -7751,14 +7676,14 @@ rbtdb_write_header(FILE *rbtfile, off_t tree_location, off_t nsec_location, } static bool -match_header_version(rbtdb_file_header_t *header) -{ +match_header_version(rbtdb_file_header_t *header) { RUNTIME_CHECK(isc_once_do(&once, init_file_version) == ISC_R_SUCCESS); if (memcmp(header->version1, FILE_VERSION, sizeof(header->version1)) != 0 || memcmp(header->version2, FILE_VERSION, sizeof(header->version1)) != - 0) { + 0) + { return (false); } @@ -7766,11 +7691,10 @@ match_header_version(rbtdb_file_header_t *header) } static isc_result_t -serialize(dns_db_t *db, dns_dbversion_t *ver, FILE *rbtfile) -{ +serialize(dns_db_t *db, dns_dbversion_t *ver, FILE *rbtfile) { rbtdb_version_t *version = (rbtdb_version_t *)ver; - dns_rbtdb_t * rbtdb; - isc_result_t result; + dns_rbtdb_t *rbtdb; + isc_result_t result; off_t tree_location, nsec_location, nsec3_location, header_location; rbtdb = (dns_rbtdb_t *)db; @@ -7811,9 +7735,8 @@ failure: static isc_result_t dump(dns_db_t *db, dns_dbversion_t *version, const char *filename, - dns_masterformat_t masterformat) -{ - dns_rbtdb_t * rbtdb; + dns_masterformat_t masterformat) { + dns_rbtdb_t *rbtdb; rbtdb_version_t *rbtversion = version; rbtdb = (dns_rbtdb_t *)db; @@ -7827,11 +7750,10 @@ dump(dns_db_t *db, dns_dbversion_t *version, const char *filename, } static void -delete_callback(void *data, void *arg) -{ - dns_rbtdb_t * rbtdb = arg; +delete_callback(void *data, void *arg) { + dns_rbtdb_t *rbtdb = arg; rdatasetheader_t *current, *next; - unsigned int locknum; + unsigned int locknum; current = data; locknum = current->node->locknum; @@ -7845,10 +7767,9 @@ delete_callback(void *data, void *arg) } static bool -issecure(dns_db_t *db) -{ +issecure(dns_db_t *db) { dns_rbtdb_t *rbtdb; - bool secure; + bool secure; rbtdb = (dns_rbtdb_t *)db; @@ -7862,10 +7783,9 @@ issecure(dns_db_t *db) } static bool -isdnssec(dns_db_t *db) -{ +isdnssec(dns_db_t *db) { dns_rbtdb_t *rbtdb; - bool dnssec; + bool dnssec; rbtdb = (dns_rbtdb_t *)db; @@ -7879,8 +7799,7 @@ isdnssec(dns_db_t *db) } static unsigned int -nodecount(dns_db_t *db) -{ +nodecount(dns_db_t *db) { dns_rbtdb_t *rbtdb; unsigned int count; @@ -7896,10 +7815,9 @@ nodecount(dns_db_t *db) } static size_t -hashsize(dns_db_t *db) -{ +hashsize(dns_db_t *db) { dns_rbtdb_t *rbtdb; - size_t size; + size_t size; rbtdb = (dns_rbtdb_t *)db; @@ -7913,8 +7831,7 @@ hashsize(dns_db_t *db) } static void -settask(dns_db_t *db, isc_task_t *task) -{ +settask(dns_db_t *db, isc_task_t *task) { dns_rbtdb_t *rbtdb; rbtdb = (dns_rbtdb_t *)db; @@ -7932,18 +7849,16 @@ settask(dns_db_t *db, isc_task_t *task) } static bool -ispersistent(dns_db_t *db) -{ +ispersistent(dns_db_t *db) { UNUSED(db); return (false); } static isc_result_t -getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; +getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; dns_rbtnode_t *onode; - isc_result_t result = ISC_R_SUCCESS; + isc_result_t result = ISC_R_SUCCESS; REQUIRE(VALID_RBTDB(rbtdb)); REQUIRE(nodep != NULL && *nodep == NULL); @@ -7965,10 +7880,9 @@ getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) static isc_result_t getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, dns_hash_t *hash, uint8_t *flags, uint16_t *iterations, unsigned char *salt, - size_t *salt_length) -{ - dns_rbtdb_t * rbtdb; - isc_result_t result = ISC_R_NOTFOUND; + size_t *salt_length) { + dns_rbtdb_t *rbtdb; + isc_result_t result = ISC_R_NOTFOUND; rbtdb_version_t *rbtversion = version; rbtdb = (dns_rbtdb_t *)db; @@ -8008,10 +7922,9 @@ getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, dns_hash_t *hash, static isc_result_t getsize(dns_db_t *db, dns_dbversion_t *version, uint64_t *records, - uint64_t *bytes) -{ - dns_rbtdb_t * rbtdb; - isc_result_t result = ISC_R_SUCCESS; + uint64_t *bytes) { + dns_rbtdb_t *rbtdb; + isc_result_t result = ISC_R_SUCCESS; rbtdb_version_t *rbtversion = version; rbtdb = (dns_rbtdb_t *)db; @@ -8039,10 +7952,9 @@ getsize(dns_db_t *db, dns_dbversion_t *version, uint64_t *records, } static isc_result_t -setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; - isc_result_t result = ISC_R_SUCCESS; +setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; + isc_result_t result = ISC_R_SUCCESS; rdatasetheader_t *header, oldheader; REQUIRE(VALID_RBTDB(rbtdb)); @@ -8062,8 +7974,8 @@ setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign) * or isc_heap_decreased. */ if (resign != 0) { - header->resign = - (isc_stdtime_t)(dns_time64_from32(resign) >> 1); + header->resign = (isc_stdtime_t)(dns_time64_from32(resign) >> + 1); header->resign_lsb = resign & 0x1; } if (header->heap_index != 0) { @@ -8089,13 +8001,12 @@ setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign) } static isc_result_t -getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, dns_name_t *foundname) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; +getsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, dns_name_t *foundname) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; rdatasetheader_t *header = NULL, *this; - unsigned int i; - isc_result_t result = ISC_R_NOTFOUND; - unsigned int locknum; + unsigned int i; + isc_result_t result = ISC_R_NOTFOUND; + unsigned int locknum; REQUIRE(VALID_RBTDB(rbtdb)); @@ -8144,11 +8055,10 @@ unlock: } static void -resigned(dns_db_t *db, dns_rdataset_t *rdataset, dns_dbversion_t *version) -{ - rbtdb_version_t * rbtversion = (rbtdb_version_t *)version; - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; - dns_rbtnode_t * node; +resigned(dns_db_t *db, dns_rdataset_t *rdataset, dns_dbversion_t *version) { + rbtdb_version_t *rbtversion = (rbtdb_version_t *)version; + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; + dns_rbtnode_t *node; rdatasetheader_t *header; REQUIRE(VALID_RBTDB(rbtdb)); @@ -8182,8 +8092,7 @@ resigned(dns_db_t *db, dns_rdataset_t *rdataset, dns_dbversion_t *version) } static isc_result_t -setcachestats(dns_db_t *db, isc_stats_t *stats) -{ +setcachestats(dns_db_t *db, isc_stats_t *stats) { dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; REQUIRE(VALID_RBTDB(rbtdb)); @@ -8195,8 +8104,7 @@ setcachestats(dns_db_t *db, isc_stats_t *stats) } static isc_result_t -setgluecachestats(dns_db_t *db, isc_stats_t *stats) -{ +setgluecachestats(dns_db_t *db, isc_stats_t *stats) { dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; REQUIRE(VALID_RBTDB(rbtdb)); @@ -8208,8 +8116,7 @@ setgluecachestats(dns_db_t *db, isc_stats_t *stats) } static dns_stats_t * -getrrsetstats(dns_db_t *db) -{ +getrrsetstats(dns_db_t *db) { dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; REQUIRE(VALID_RBTDB(rbtdb)); @@ -8219,11 +8126,10 @@ getrrsetstats(dns_db_t *db) } static isc_result_t -nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)db; +nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; dns_rbtnode_t *rbtnode = (dns_rbtnode_t *)node; - isc_result_t result; + isc_result_t result; REQUIRE(VALID_RBTDB(rbtdb)); REQUIRE(node != NULL); @@ -8237,8 +8143,7 @@ nodefullname(dns_db_t *db, dns_dbnode_t *node, dns_name_t *name) } static isc_result_t -setservestalettl(dns_db_t *db, dns_ttl_t ttl) -{ +setservestalettl(dns_db_t *db, dns_ttl_t ttl) { dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; REQUIRE(VALID_RBTDB(rbtdb)); @@ -8250,8 +8155,7 @@ setservestalettl(dns_db_t *db, dns_ttl_t ttl) } static isc_result_t -getservestalettl(dns_db_t *db, dns_ttl_t *ttl) -{ +getservestalettl(dns_db_t *db, dns_ttl_t *ttl) { dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; REQUIRE(VALID_RBTDB(rbtdb)); @@ -8362,12 +8266,11 @@ static dns_dbmethods_t cache_methods = { attach, isc_result_t dns_rbtdb_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) -{ + void *driverarg, dns_db_t **dbp) { dns_rbtdb_t *rbtdb; isc_result_t result; - int i; - dns_name_t name; + int i; + dns_name_t name; bool (*sooner)(void *, void *); isc_mem_t *hmctx = mctx; @@ -8439,9 +8342,9 @@ dns_rbtdb_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, if (result != ISC_R_SUCCESS) { goto cleanup_node_locks; } - rbtdb->rdatasets = - isc_mem_get(mctx, rbtdb->node_lock_count * - sizeof(rdatasetheaderlist_t)); + rbtdb->rdatasets = isc_mem_get( + mctx, + rbtdb->node_lock_count * sizeof(rdatasetheaderlist_t)); for (i = 0; i < (int)rbtdb->node_lock_count; i++) { ISC_LIST_INIT(rbtdb->rdatasets[i]); } @@ -8560,8 +8463,8 @@ dns_rbtdb_create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type, */ dns_name_init(&name, NULL); dns_rbt_namefromnode(rbtdb->origin_node, &name); - rbtdb->origin_node->locknum = - rbtdb->origin_node->hashval % rbtdb->node_lock_count; + rbtdb->origin_node->locknum = rbtdb->origin_node->hashval % + rbtdb->node_lock_count; /* * Add an apex node to the NSEC3 tree so that NSEC3 searches * return partial matches when there is only a single NSEC3 @@ -8689,19 +8592,17 @@ cleanup_rbtdb: */ static void -rdataset_disassociate(dns_rdataset_t *rdataset) -{ - dns_db_t * db = rdataset->private1; +rdataset_disassociate(dns_rdataset_t *rdataset) { + dns_db_t *db = rdataset->private1; dns_dbnode_t *node = rdataset->private2; detachnode(db, &node); } static isc_result_t -rdataset_first(dns_rdataset_t *rdataset) -{ +rdataset_first(dns_rdataset_t *rdataset) { unsigned char *raw = rdataset->private3; /* RDATASLAB */ - unsigned int count; + unsigned int count; count = raw[0] * 256 + raw[1]; if (count == 0) { @@ -8732,10 +8633,9 @@ rdataset_first(dns_rdataset_t *rdataset) } static isc_result_t -rdataset_next(dns_rdataset_t *rdataset) -{ - unsigned int count; - unsigned int length; +rdataset_next(dns_rdataset_t *rdataset) { + unsigned int count; + unsigned int length; unsigned char *raw; /* RDATASLAB */ count = rdataset->privateuint4; @@ -8763,12 +8663,11 @@ rdataset_next(dns_rdataset_t *rdataset) } static void -rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) -{ +rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) { unsigned char *raw = rdataset->private5; /* RDATASLAB */ - unsigned int length; - isc_region_t r; - unsigned int flags = 0; + unsigned int length; + isc_region_t r; + unsigned int flags = 0; REQUIRE(raw != NULL); @@ -8804,9 +8703,8 @@ rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) } static void -rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) -{ - dns_db_t * db = source->private1; +rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) { + dns_db_t *db = source->private1; dns_dbnode_t *node = source->private2; dns_dbnode_t *cloned_node = NULL; @@ -8823,10 +8721,9 @@ rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) } static unsigned int -rdataset_count(dns_rdataset_t *rdataset) -{ +rdataset_count(dns_rdataset_t *rdataset) { unsigned char *raw = rdataset->private3; /* RDATASLAB */ - unsigned int count; + unsigned int count; count = raw[0] * 256 + raw[1]; @@ -8835,11 +8732,10 @@ rdataset_count(dns_rdataset_t *rdataset) static isc_result_t rdataset_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, - dns_rdataset_t *nsec, dns_rdataset_t *nsecsig) -{ - dns_db_t * db = rdataset->private1; - dns_dbnode_t * node = rdataset->private2; - dns_dbnode_t * cloned_node; + dns_rdataset_t *nsec, dns_rdataset_t *nsecsig) { + dns_db_t *db = rdataset->private1; + dns_dbnode_t *node = rdataset->private2; + dns_dbnode_t *cloned_node; const struct noqname *noqname = rdataset->private6; cloned_node = NULL; @@ -8881,11 +8777,10 @@ rdataset_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, static isc_result_t rdataset_getclosest(dns_rdataset_t *rdataset, dns_name_t *name, - dns_rdataset_t *nsec, dns_rdataset_t *nsecsig) -{ - dns_db_t * db = rdataset->private1; - dns_dbnode_t * node = rdataset->private2; - dns_dbnode_t * cloned_node; + dns_rdataset_t *nsec, dns_rdataset_t *nsecsig) { + dns_db_t *db = rdataset->private1; + dns_dbnode_t *node = rdataset->private2; + dns_dbnode_t *cloned_node; const struct noqname *closest = rdataset->private7; cloned_node = NULL; @@ -8926,10 +8821,9 @@ rdataset_getclosest(dns_rdataset_t *rdataset, dns_name_t *name, } static void -rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust) -{ - dns_rbtdb_t * rbtdb = rdataset->private1; - dns_rbtnode_t * rbtnode = rdataset->private2; +rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust) { + dns_rbtdb_t *rbtdb = rdataset->private1; + dns_rbtnode_t *rbtnode = rdataset->private2; rdatasetheader_t *header = rdataset->private3; header--; @@ -8941,10 +8835,9 @@ rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust) } static void -rdataset_expire(dns_rdataset_t *rdataset) -{ - dns_rbtdb_t * rbtdb = rdataset->private1; - dns_rbtnode_t * rbtnode = rdataset->private2; +rdataset_expire(dns_rdataset_t *rdataset) { + dns_rbtdb_t *rbtdb = rdataset->private1; + dns_rbtnode_t *rbtnode = rdataset->private2; rdatasetheader_t *header = rdataset->private3; header--; @@ -8956,10 +8849,9 @@ rdataset_expire(dns_rdataset_t *rdataset) } static void -rdataset_clearprefetch(dns_rdataset_t *rdataset) -{ - dns_rbtdb_t * rbtdb = rdataset->private1; - dns_rbtnode_t * rbtnode = rdataset->private2; +rdataset_clearprefetch(dns_rdataset_t *rdataset) { + dns_rbtdb_t *rbtdb = rdataset->private1; + dns_rbtnode_t *rbtnode = rdataset->private2; rdatasetheader_t *header = rdataset->private3; header--; @@ -8975,8 +8867,7 @@ rdataset_clearprefetch(dns_rdataset_t *rdataset) */ static void -rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) -{ +rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) { rbtdb_rdatasetiter_t *rbtiterator; rbtiterator = (rbtdb_rdatasetiter_t *)(*iteratorp); @@ -8993,15 +8884,14 @@ rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) } static isc_result_t -rdatasetiter_first(dns_rdatasetiter_t *iterator) -{ +rdatasetiter_first(dns_rdatasetiter_t *iterator) { rbtdb_rdatasetiter_t *rbtiterator = (rbtdb_rdatasetiter_t *)iterator; - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)(rbtiterator->common.db); - dns_rbtnode_t * rbtnode = rbtiterator->common.node; - rbtdb_version_t * rbtversion = rbtiterator->common.version; - rdatasetheader_t * header, *top_next; - rbtdb_serial_t serial; - isc_stdtime_t now; + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)(rbtiterator->common.db); + dns_rbtnode_t *rbtnode = rbtiterator->common.node; + rbtdb_version_t *rbtversion = rbtiterator->common.version; + rdatasetheader_t *header, *top_next; + rbtdb_serial_t serial; + isc_stdtime_t now; if (IS_CACHE(rbtdb)) { serial = 1; @@ -9031,7 +8921,8 @@ rdatasetiter_first(dns_rdatasetiter_t *iterator) if (NONEXISTENT(header) || (now != 0 && now > header->rdh_ttl + - rbtdb->serve_stale_ttl)) { + rbtdb->serve_stale_ttl)) + { header = NULL; } break; @@ -9057,17 +8948,16 @@ rdatasetiter_first(dns_rdatasetiter_t *iterator) } static isc_result_t -rdatasetiter_next(dns_rdatasetiter_t *iterator) -{ +rdatasetiter_next(dns_rdatasetiter_t *iterator) { rbtdb_rdatasetiter_t *rbtiterator = (rbtdb_rdatasetiter_t *)iterator; - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)(rbtiterator->common.db); - dns_rbtnode_t * rbtnode = rbtiterator->common.node; - rbtdb_version_t * rbtversion = rbtiterator->common.version; - rdatasetheader_t * header, *top_next; - rbtdb_serial_t serial; - isc_stdtime_t now; - rbtdb_rdatatype_t type, negtype; - dns_rdatatype_t rdtype, covers; + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)(rbtiterator->common.db); + dns_rbtnode_t *rbtnode = rbtiterator->common.node; + rbtdb_version_t *rbtversion = rbtiterator->common.version; + rdatasetheader_t *header, *top_next; + rbtdb_serial_t serial; + isc_stdtime_t now; + rbtdb_rdatatype_t type, negtype; + dns_rdatatype_t rdtype, covers; header = rbtiterator->current; if (header == NULL) { @@ -9100,8 +8990,8 @@ rdatasetiter_next(dns_rdatasetiter_t *iterator) */ if (header->type != type && header->type != negtype) { do { - if (header->serial <= serial && - !IGNORE(header)) { + if (header->serial <= serial && !IGNORE(header)) + { /* * Is this a "this rdataset doesn't * exist" record? @@ -9113,8 +9003,8 @@ rdatasetiter_next(dns_rdatasetiter_t *iterator) * rdatasets to work. */ if (NONEXISTENT(header) || - (now != 0 && - now > header->rdh_ttl)) { + (now != 0 && now > header->rdh_ttl)) + { header = NULL; } break; @@ -9141,12 +9031,11 @@ rdatasetiter_next(dns_rdatasetiter_t *iterator) } static void -rdatasetiter_current(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset) -{ +rdatasetiter_current(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset) { rbtdb_rdatasetiter_t *rbtiterator = (rbtdb_rdatasetiter_t *)iterator; - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)(rbtiterator->common.db); - dns_rbtnode_t * rbtnode = rbtiterator->common.node; - rdatasetheader_t * header; + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)(rbtiterator->common.db); + dns_rbtnode_t *rbtnode = rbtiterator->common.node; + rdatasetheader_t *header; header = rbtiterator->current; REQUIRE(header != NULL); @@ -9166,9 +9055,8 @@ rdatasetiter_current(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset) */ static inline void -reference_iter_node(rbtdb_dbiterator_t *rbtdbiter) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)rbtdbiter->common.db; +reference_iter_node(rbtdb_dbiterator_t *rbtdbiter) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)rbtdbiter->common.db; dns_rbtnode_t *node = rbtdbiter->node; if (node == NULL) { @@ -9180,11 +9068,10 @@ reference_iter_node(rbtdb_dbiterator_t *rbtdbiter) } static inline void -dereference_iter_node(rbtdb_dbiterator_t *rbtdbiter) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)rbtdbiter->common.db; +dereference_iter_node(rbtdb_dbiterator_t *rbtdbiter) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)rbtdbiter->common.db; dns_rbtnode_t *node = rbtdbiter->node; - nodelock_t * lock; + nodelock_t *lock; if (node == NULL) { return; @@ -9200,13 +9087,12 @@ dereference_iter_node(rbtdb_dbiterator_t *rbtdbiter) } static void -flush_deletions(rbtdb_dbiterator_t *rbtdbiter) -{ +flush_deletions(rbtdb_dbiterator_t *rbtdbiter) { dns_rbtnode_t *node; - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)rbtdbiter->common.db; - bool was_read_locked = false; - nodelock_t * lock; - int i; + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)rbtdbiter->common.db; + bool was_read_locked = false; + nodelock_t *lock; + int i; if (rbtdbiter->delcnt != 0) { /* @@ -9251,8 +9137,7 @@ flush_deletions(rbtdb_dbiterator_t *rbtdbiter) } static inline void -resume_iteration(rbtdb_dbiterator_t *rbtdbiter) -{ +resume_iteration(rbtdb_dbiterator_t *rbtdbiter) { dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)rbtdbiter->common.db; REQUIRE(rbtdbiter->paused); @@ -9265,11 +9150,10 @@ resume_iteration(rbtdb_dbiterator_t *rbtdbiter) } static void -dbiterator_destroy(dns_dbiterator_t **iteratorp) -{ +dbiterator_destroy(dns_dbiterator_t **iteratorp) { rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)(*iteratorp); - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)rbtdbiter->common.db; - dns_db_t * db = NULL; + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)rbtdbiter->common.db; + dns_db_t *db = NULL; if (rbtdbiter->tree_locked == isc_rwlocktype_read) { RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_read); @@ -9294,17 +9178,17 @@ dbiterator_destroy(dns_dbiterator_t **iteratorp) } static isc_result_t -dbiterator_first(dns_dbiterator_t *iterator) -{ - isc_result_t result; +dbiterator_first(dns_dbiterator_t *iterator) { + isc_result_t result; rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator; - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)iterator->db; - dns_name_t * name, *origin; + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)iterator->db; + dns_name_t *name, *origin; if (rbtdbiter->result != ISC_R_SUCCESS && rbtdbiter->result != ISC_R_NOTFOUND && rbtdbiter->result != DNS_R_PARTIALMATCH && - rbtdbiter->result != ISC_R_NOMORE) { + rbtdbiter->result != ISC_R_NOMORE) + { return (rbtdbiter->result); } @@ -9355,17 +9239,17 @@ dbiterator_first(dns_dbiterator_t *iterator) } static isc_result_t -dbiterator_last(dns_dbiterator_t *iterator) -{ - isc_result_t result; +dbiterator_last(dns_dbiterator_t *iterator) { + isc_result_t result; rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator; - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)iterator->db; - dns_name_t * name, *origin; + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)iterator->db; + dns_name_t *name, *origin; if (rbtdbiter->result != ISC_R_SUCCESS && rbtdbiter->result != ISC_R_NOTFOUND && rbtdbiter->result != DNS_R_PARTIALMATCH && - rbtdbiter->result != ISC_R_NOMORE) { + rbtdbiter->result != ISC_R_NOMORE) + { return (rbtdbiter->result); } @@ -9409,17 +9293,17 @@ dbiterator_last(dns_dbiterator_t *iterator) } static isc_result_t -dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name) -{ - isc_result_t result, tresult; +dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name) { + isc_result_t result, tresult; rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator; - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)iterator->db; - dns_name_t * iname, *origin; + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)iterator->db; + dns_name_t *iname, *origin; if (rbtdbiter->result != ISC_R_SUCCESS && rbtdbiter->result != ISC_R_NOTFOUND && rbtdbiter->result != DNS_R_PARTIALMATCH && - rbtdbiter->result != ISC_R_NOMORE) { + rbtdbiter->result != ISC_R_NOMORE) + { return (rbtdbiter->result); } @@ -9487,12 +9371,11 @@ dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name) } static isc_result_t -dbiterator_prev(dns_dbiterator_t *iterator) -{ - isc_result_t result; +dbiterator_prev(dns_dbiterator_t *iterator) { + isc_result_t result; rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator; - dns_name_t * name, *origin; - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)iterator->db; + dns_name_t *name, *origin; + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)iterator->db; REQUIRE(rbtdbiter->node != NULL); @@ -9508,8 +9391,8 @@ dbiterator_prev(dns_dbiterator_t *iterator) origin = dns_fixedname_name(&rbtdbiter->origin); result = dns_rbtnodechain_prev(rbtdbiter->current, name, origin); if (result == ISC_R_NOMORE && !rbtdbiter->nsec3only && - !rbtdbiter->nonsec3 && - &rbtdbiter->nsec3chain == rbtdbiter->current) { + !rbtdbiter->nonsec3 && &rbtdbiter->nsec3chain == rbtdbiter->current) + { rbtdbiter->current = &rbtdbiter->chain; dns_rbtnodechain_reset(rbtdbiter->current); result = dns_rbtnodechain_last(rbtdbiter->current, rbtdb->tree, @@ -9537,12 +9420,11 @@ dbiterator_prev(dns_dbiterator_t *iterator) } static isc_result_t -dbiterator_next(dns_dbiterator_t *iterator) -{ - isc_result_t result; +dbiterator_next(dns_dbiterator_t *iterator) { + isc_result_t result; rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator; - dns_name_t * name, *origin; - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)iterator->db; + dns_name_t *name, *origin; + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)iterator->db; REQUIRE(rbtdbiter->node != NULL); @@ -9558,7 +9440,8 @@ dbiterator_next(dns_dbiterator_t *iterator) origin = dns_fixedname_name(&rbtdbiter->origin); result = dns_rbtnodechain_next(rbtdbiter->current, name, origin); if (result == ISC_R_NOMORE && !rbtdbiter->nsec3only && - !rbtdbiter->nonsec3 && &rbtdbiter->chain == rbtdbiter->current) { + !rbtdbiter->nonsec3 && &rbtdbiter->chain == rbtdbiter->current) + { rbtdbiter->current = &rbtdbiter->nsec3chain; dns_rbtnodechain_reset(rbtdbiter->current); result = dns_rbtnodechain_first(rbtdbiter->current, @@ -9586,14 +9469,13 @@ dbiterator_next(dns_dbiterator_t *iterator) static isc_result_t dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, - dns_name_t *name) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)iterator->db; + dns_name_t *name) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)iterator->db; rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator; - dns_rbtnode_t * node = rbtdbiter->node; - isc_result_t result; - dns_name_t * nodename = dns_fixedname_name(&rbtdbiter->name); - dns_name_t * origin = dns_fixedname_name(&rbtdbiter->origin); + dns_rbtnode_t *node = rbtdbiter->node; + isc_result_t result; + dns_name_t *nodename = dns_fixedname_name(&rbtdbiter->name); + dns_name_t *origin = dns_fixedname_name(&rbtdbiter->origin); REQUIRE(rbtdbiter->result == ISC_R_SUCCESS); REQUIRE(rbtdbiter->node != NULL); @@ -9648,15 +9530,15 @@ dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, } static isc_result_t -dbiterator_pause(dns_dbiterator_t *iterator) -{ - dns_rbtdb_t * rbtdb = (dns_rbtdb_t *)iterator->db; +dbiterator_pause(dns_dbiterator_t *iterator) { + dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)iterator->db; rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator; if (rbtdbiter->result != ISC_R_SUCCESS && rbtdbiter->result != ISC_R_NOTFOUND && rbtdbiter->result != DNS_R_PARTIALMATCH && - rbtdbiter->result != ISC_R_NOMORE) { + rbtdbiter->result != ISC_R_NOMORE) + { return (rbtdbiter->result); } @@ -9678,10 +9560,9 @@ dbiterator_pause(dns_dbiterator_t *iterator) } static isc_result_t -dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) -{ +dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) { rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator; - dns_name_t * origin = dns_fixedname_name(&rbtdbiter->origin); + dns_name_t *origin = dns_fixedname_name(&rbtdbiter->origin); if (rbtdbiter->result != ISC_R_SUCCESS) { return (rbtdbiter->result); @@ -9692,10 +9573,9 @@ dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) } static void -setownercase(rdatasetheader_t *header, const dns_name_t *name) -{ +setownercase(rdatasetheader_t *header, const dns_name_t *name) { unsigned int i; - bool fully_lower; + bool fully_lower; /* * We do not need to worry about label lengths as they are all @@ -9718,11 +9598,10 @@ setownercase(rdatasetheader_t *header, const dns_name_t *name) } static void -rdataset_setownercase(dns_rdataset_t *rdataset, const dns_name_t *name) -{ - dns_rbtdb_t * rbtdb = rdataset->private1; - dns_rbtnode_t * rbtnode = rdataset->private2; - unsigned char * raw = rdataset->private3; /* RDATASLAB */ +rdataset_setownercase(dns_rdataset_t *rdataset, const dns_name_t *name) { + dns_rbtdb_t *rbtdb = rdataset->private1; + dns_rbtnode_t *rbtnode = rdataset->private2; + unsigned char *raw = rdataset->private3; /* RDATASLAB */ rdatasetheader_t *header; header = (struct rdatasetheader *)(raw - sizeof(*header)); @@ -9785,15 +9664,14 @@ static const unsigned char maptolower[] = { }; static void -rdataset_getownercase(const dns_rdataset_t *rdataset, dns_name_t *name) -{ - dns_rbtdb_t * rbtdb = rdataset->private1; - dns_rbtnode_t * rbtnode = rdataset->private2; - const unsigned char * raw = rdataset->private3; /* RDATASLAB */ +rdataset_getownercase(const dns_rdataset_t *rdataset, dns_name_t *name) { + dns_rbtdb_t *rbtdb = rdataset->private1; + dns_rbtnode_t *rbtnode = rdataset->private2; + const unsigned char *raw = rdataset->private3; /* RDATASLAB */ const rdatasetheader_t *header; - unsigned int i, j; - unsigned char bits; - unsigned char c, flip; + unsigned int i, j; + unsigned char bits; + unsigned char c, flip; header = (const struct rdatasetheader *)(raw - sizeof(*header)); @@ -9890,22 +9768,21 @@ unlock: struct rbtdb_glue { struct rbtdb_glue *next; - dns_fixedname_t fixedname; - dns_rdataset_t rdataset_a; - dns_rdataset_t sigrdataset_a; - dns_rdataset_t rdataset_aaaa; - dns_rdataset_t sigrdataset_aaaa; + dns_fixedname_t fixedname; + dns_rdataset_t rdataset_a; + dns_rdataset_t sigrdataset_a; + dns_rdataset_t rdataset_aaaa; + dns_rdataset_t sigrdataset_aaaa; }; typedef struct { - rbtdb_glue_t * glue_list; - dns_rbtdb_t * rbtdb; + rbtdb_glue_t *glue_list; + dns_rbtdb_t *rbtdb; rbtdb_version_t *rbtversion; } rbtdb_glue_additionaldata_ctx_t; static void -free_gluelist(rbtdb_glue_t *glue_list, dns_rbtdb_t *rbtdb) -{ +free_gluelist(rbtdb_glue_t *glue_list, dns_rbtdb_t *rbtdb) { rbtdb_glue_t *cur, *cur_next; if (glue_list == (void *)-1) { @@ -9941,10 +9818,9 @@ free_gluelist(rbtdb_glue_t *glue_list, dns_rbtdb_t *rbtdb) } static void -free_gluetable(rbtdb_version_t *version) -{ +free_gluetable(rbtdb_version_t *version) { dns_rbtdb_t *rbtdb; - size_t i; + size_t i; RWLOCK(&version->glue_rwlock, isc_rwlocktype_write); @@ -9973,13 +9849,12 @@ free_gluetable(rbtdb_version_t *version) } static bool -rehash_gluetable(rbtdb_version_t *version) -{ - size_t oldsize, i; +rehash_gluetable(rbtdb_version_t *version) { + size_t oldsize, i; rbtdb_glue_table_node_t **oldtable; - rbtdb_glue_table_node_t * gluenode; - rbtdb_glue_table_node_t * nextgluenode; - uint32_t hash; + rbtdb_glue_table_node_t *gluenode; + rbtdb_glue_table_node_t *nextgluenode; + uint32_t hash; if (ISC_LIKELY(version->glue_table_nodecount < (version->glue_table_size * 3U))) { @@ -10034,20 +9909,19 @@ rehash_gluetable(rbtdb_version_t *version) } static isc_result_t -glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) -{ +glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) { rbtdb_glue_additionaldata_ctx_t *ctx; - isc_result_t result; - dns_fixedname_t fixedname_a; - dns_name_t * name_a = NULL; - dns_rdataset_t rdataset_a, sigrdataset_a; - dns_rbtnode_t * node_a = NULL; - dns_fixedname_t fixedname_aaaa; - dns_name_t * name_aaaa = NULL; - dns_rdataset_t rdataset_aaaa, sigrdataset_aaaa; - dns_rbtnode_t * node_aaaa = NULL; - rbtdb_glue_t * glue = NULL; - dns_name_t * gluename = NULL; + isc_result_t result; + dns_fixedname_t fixedname_a; + dns_name_t *name_a = NULL; + dns_rdataset_t rdataset_a, sigrdataset_a; + dns_rbtnode_t *node_a = NULL; + dns_fixedname_t fixedname_aaaa; + dns_name_t *name_aaaa = NULL; + dns_rdataset_t rdataset_aaaa, sigrdataset_aaaa; + dns_rbtnode_t *node_aaaa = NULL; + rbtdb_glue_t *glue = NULL; + dns_name_t *gluename = NULL; /* * NS records want addresses in additional records. @@ -10147,18 +10021,17 @@ glue_nsdname_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) static isc_result_t rdataset_addglue(dns_rdataset_t *rdataset, dns_dbversion_t *version, - dns_message_t *msg) -{ - dns_rbtdb_t * rbtdb = rdataset->private1; - dns_rbtnode_t * node = rdataset->private2; - rbtdb_version_t * rbtversion = version; - uint32_t idx; - rbtdb_glue_table_node_t * cur; - bool found = false; - bool restarted = false; - rbtdb_glue_t * ge; + dns_message_t *msg) { + dns_rbtdb_t *rbtdb = rdataset->private1; + dns_rbtnode_t *node = rdataset->private2; + rbtdb_version_t *rbtversion = version; + uint32_t idx; + rbtdb_glue_table_node_t *cur; + bool found = false; + bool restarted = false; + rbtdb_glue_t *ge; rbtdb_glue_additionaldata_ctx_t ctx; - isc_result_t result; + isc_result_t result; REQUIRE(rdataset->type == dns_rdatatype_ns); REQUIRE(rbtdb == rbtversion->rbtdb); @@ -10222,13 +10095,13 @@ restart: } for (; ge != NULL; ge = ge->next) { - isc_buffer_t * buffer = NULL; - dns_name_t * name = NULL; + isc_buffer_t *buffer = NULL; + dns_name_t *name = NULL; dns_rdataset_t *rdataset_a = NULL; dns_rdataset_t *sigrdataset_a = NULL; dns_rdataset_t *rdataset_aaaa = NULL; dns_rdataset_t *sigrdataset_aaaa = NULL; - dns_name_t * gluename = dns_fixedname_name(&ge->fixedname); + dns_name_t *gluename = dns_fixedname_name(&ge->fixedname); isc_buffer_allocate(msg->mctx, &buffer, 512); @@ -10418,11 +10291,11 @@ no_glue: * Caller must hold the node (read or write) lock. */ static inline bool -need_headerupdate(rdatasetheader_t *header, isc_stdtime_t now) -{ +need_headerupdate(rdatasetheader_t *header, isc_stdtime_t now) { if ((header->attributes & (RDATASET_ATTR_NONEXISTENT | RDATASET_ATTR_ANCIENT | - RDATASET_ATTR_ZEROTTL)) != 0) { + RDATASET_ATTR_ZEROTTL)) != 0) + { return (false); } @@ -10430,7 +10303,8 @@ need_headerupdate(rdatasetheader_t *header, isc_stdtime_t now) if (header->type == dns_rdatatype_ns || (header->trust == dns_trust_glue && (header->type == dns_rdatatype_a || - header->type == dns_rdatatype_aaaa))) { + header->type == dns_rdatatype_aaaa))) + { /* * Glue records are updated if at least 60 seconds have passed * since the previous update time. @@ -10456,8 +10330,7 @@ need_headerupdate(rdatasetheader_t *header, isc_stdtime_t now) * Note that the we do NOT touch the heap here, as the TTL has not changed. */ static void -update_header(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, isc_stdtime_t now) -{ +update_header(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, isc_stdtime_t now) { INSIST(IS_CACHE(rbtdb)); /* To be checked: can we really assume this? XXXMLG */ @@ -10480,15 +10353,15 @@ update_header(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, isc_stdtime_t now) */ static void overmem_purge(dns_rbtdb_t *rbtdb, unsigned int locknum_start, isc_stdtime_t now, - bool tree_locked) -{ + bool tree_locked) { rdatasetheader_t *header, *header_prev; - unsigned int locknum; - int purgecount = 2; + unsigned int locknum; + int purgecount = 2; for (locknum = (locknum_start + 1) % rbtdb->node_lock_count; locknum != locknum_start && purgecount > 0; - locknum = (locknum + 1) % rbtdb->node_lock_count) { + locknum = (locknum + 1) % rbtdb->node_lock_count) + { NODE_LOCK(&rbtdb->node_locks[locknum].lock, isc_rwlocktype_write); @@ -10499,7 +10372,8 @@ overmem_purge(dns_rbtdb_t *rbtdb, unsigned int locknum_start, isc_stdtime_t now, } for (header = ISC_LIST_TAIL(rbtdb->rdatasets[locknum]); - header != NULL && purgecount > 0; header = header_prev) { + header != NULL && purgecount > 0; header = header_prev) + { header_prev = ISC_LIST_PREV(header, link); /* * Unlink the entry at this point to avoid checking it @@ -10521,8 +10395,7 @@ overmem_purge(dns_rbtdb_t *rbtdb, unsigned int locknum_start, isc_stdtime_t now, static void expire_header(dns_rbtdb_t *rbtdb, rdatasetheader_t *header, bool tree_locked, - expire_t reason) -{ + expire_t reason) { set_ttl(rbtdb, header, 0); mark_header_ancient(rbtdb, header); diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c index dce734cbab..7a8f6fac2d 100644 --- a/lib/dns/rcode.c +++ b/lib/dns/rcode.c @@ -67,25 +67,23 @@ { 14, "RESERVED14", TOTEXTONLY }, \ { 15, "RESERVED15", TOTEXTONLY }, -#define ERCODENAMES \ - /* extended rcodes */ \ - { dns_rcode_badvers, "BADVERS", 0 }, \ - { dns_rcode_badcookie, "BADCOOKIE", 0 }, \ - { \ - 0, NULL, 0 \ +#define ERCODENAMES \ + /* extended rcodes */ \ + { dns_rcode_badvers, "BADVERS", 0 }, \ + { dns_rcode_badcookie, "BADCOOKIE", 0 }, { \ + 0, NULL, 0 \ } -#define TSIGRCODENAMES \ - /* extended rcodes */ \ - { dns_tsigerror_badsig, "BADSIG", 0 }, \ - { dns_tsigerror_badkey, "BADKEY", 0 }, \ - { dns_tsigerror_badtime, "BADTIME", 0 }, \ - { dns_tsigerror_badmode, "BADMODE", 0 }, \ - { dns_tsigerror_badname, "BADNAME", 0 }, \ - { dns_tsigerror_badalg, "BADALG", 0 }, \ - { dns_tsigerror_badtrunc, "BADTRUNC", 0 }, \ - { \ - 0, NULL, 0 \ +#define TSIGRCODENAMES \ + /* extended rcodes */ \ + { dns_tsigerror_badsig, "BADSIG", 0 }, \ + { dns_tsigerror_badkey, "BADKEY", 0 }, \ + { dns_tsigerror_badtime, "BADTIME", 0 }, \ + { dns_tsigerror_badmode, "BADMODE", 0 }, \ + { dns_tsigerror_badname, "BADNAME", 0 }, \ + { dns_tsigerror_badalg, "BADALG", 0 }, \ + { dns_tsigerror_badtrunc, "BADTRUNC", 0 }, { \ + 0, NULL, 0 \ } /* RFC4398 section 2.1 */ @@ -94,8 +92,7 @@ { 1, "PKIX", 0 }, { 2, "SPKI", 0 }, { 3, "PGP", 0 }, \ { 4, "IPKIX", 0 }, { 5, "ISPKI", 0 }, { 6, "IPGP", 0 }, \ { 7, "ACPKIX", 0 }, { 8, "IACPKIX", 0 }, { 253, "URI", 0 }, \ - { 254, "OID", 0 }, \ - { \ + { 254, "OID", 0 }, { \ 0, NULL, 0 \ } @@ -118,18 +115,16 @@ { DNS_KEYALG_ED448, "ED448", 0 }, \ { DNS_KEYALG_INDIRECT, "INDIRECT", 0 }, \ { DNS_KEYALG_PRIVATEDNS, "PRIVATEDNS", 0 }, \ - { DNS_KEYALG_PRIVATEOID, "PRIVATEOID", 0 }, \ - { \ + { DNS_KEYALG_PRIVATEOID, "PRIVATEOID", 0 }, { \ 0, NULL, 0 \ } /* RFC2535 section 7.1 */ -#define SECPROTONAMES \ - { 0, "NONE", 0 }, { 1, "TLS", 0 }, { 2, "EMAIL", 0 }, \ - { 3, "DNSSEC", 0 }, { 4, "IPSEC", 0 }, { 255, "ALL", 0 }, \ - { \ - 0, NULL, 0 \ +#define SECPROTONAMES \ + { 0, "NONE", 0 }, { 1, "TLS", 0 }, { 2, "EMAIL", 0 }, \ + { 3, "DNSSEC", 0 }, { 4, "IPSEC", 0 }, { 255, "ALL", 0 }, { \ + 0, NULL, 0 \ } #define HASHALGNAMES \ @@ -143,15 +138,14 @@ { DNS_DSDIGEST_SHA256, "SHA256", 0 }, \ { DNS_DSDIGEST_GOST, "GOST", 0 }, \ { DNS_DSDIGEST_SHA384, "SHA-384", 0 }, \ - { DNS_DSDIGEST_SHA384, "SHA384", 0 }, \ - { \ + { DNS_DSDIGEST_SHA384, "SHA384", 0 }, { \ 0, NULL, 0 \ } struct tbl { unsigned int value; - const char * name; - int flags; + const char *name; + int flags; }; static struct tbl rcodes[] = { RCODENAMES ERCODENAMES }; @@ -163,7 +157,7 @@ static struct tbl hashalgs[] = { HASHALGNAMES }; static struct tbl dsdigests[] = { DSDIGESTNAMES }; static struct keyflag { - const char * name; + const char *name; unsigned int value; unsigned int mask; } keyflags[] = { { "NOCONF", 0x4000, 0xC000 }, @@ -201,8 +195,7 @@ static struct keyflag { { NULL, 0, 0 } }; static isc_result_t -str_totext(const char *source, isc_buffer_t *target) -{ +str_totext(const char *source, isc_buffer_t *target) { unsigned int l; isc_region_t region; @@ -220,15 +213,14 @@ str_totext(const char *source, isc_buffer_t *target) static isc_result_t maybe_numeric(unsigned int *valuep, isc_textregion_t *source, unsigned int max, - bool hex_allowed) -{ + bool hex_allowed) { isc_result_t result; - uint32_t n; - char buffer[NUMBERSIZE]; - int v; + uint32_t n; + char buffer[NUMBERSIZE]; + int v; - if (!isdigit(source->base[0] & 0xff) || - source->length > NUMBERSIZE - 1) { + if (!isdigit(source->base[0] & 0xff) || source->length > NUMBERSIZE - 1) + { return (ISC_R_BADNUMBER); } @@ -260,10 +252,9 @@ maybe_numeric(unsigned int *valuep, isc_textregion_t *source, unsigned int max, static isc_result_t dns_mnemonic_fromtext(unsigned int *valuep, isc_textregion_t *source, - struct tbl *table, unsigned int max) -{ + struct tbl *table, unsigned int max) { isc_result_t result; - int i; + int i; result = maybe_numeric(valuep, source, max, false); if (result != ISC_R_BADNUMBER) { @@ -274,7 +265,8 @@ dns_mnemonic_fromtext(unsigned int *valuep, isc_textregion_t *source, unsigned int n; n = strlen(table[i].name); if (n == source->length && (table[i].flags & TOTEXTONLY) == 0 && - strncasecmp(source->base, table[i].name, n) == 0) { + strncasecmp(source->base, table[i].name, n) == 0) + { *valuep = table[i].value; return (ISC_R_SUCCESS); } @@ -283,9 +275,9 @@ dns_mnemonic_fromtext(unsigned int *valuep, isc_textregion_t *source, } static isc_result_t -dns_mnemonic_totext(unsigned int value, isc_buffer_t *target, struct tbl *table) -{ - int i = 0; +dns_mnemonic_totext(unsigned int value, isc_buffer_t *target, + struct tbl *table) { + int i = 0; char buf[sizeof("4294967296")]; while (table[i].name != NULL) { if (table[i].value == value) { @@ -298,8 +290,7 @@ dns_mnemonic_totext(unsigned int value, isc_buffer_t *target, struct tbl *table) } isc_result_t -dns_rcode_fromtext(dns_rcode_t *rcodep, isc_textregion_t *source) -{ +dns_rcode_fromtext(dns_rcode_t *rcodep, isc_textregion_t *source) { unsigned int value; RETERR(dns_mnemonic_fromtext(&value, source, rcodes, 0xffff)); *rcodep = value; @@ -307,14 +298,12 @@ dns_rcode_fromtext(dns_rcode_t *rcodep, isc_textregion_t *source) } isc_result_t -dns_rcode_totext(dns_rcode_t rcode, isc_buffer_t *target) -{ +dns_rcode_totext(dns_rcode_t rcode, isc_buffer_t *target) { return (dns_mnemonic_totext(rcode, target, rcodes)); } isc_result_t -dns_tsigrcode_fromtext(dns_rcode_t *rcodep, isc_textregion_t *source) -{ +dns_tsigrcode_fromtext(dns_rcode_t *rcodep, isc_textregion_t *source) { unsigned int value; RETERR(dns_mnemonic_fromtext(&value, source, tsigrcodes, 0xffff)); *rcodep = value; @@ -322,14 +311,12 @@ dns_tsigrcode_fromtext(dns_rcode_t *rcodep, isc_textregion_t *source) } isc_result_t -dns_tsigrcode_totext(dns_rcode_t rcode, isc_buffer_t *target) -{ +dns_tsigrcode_totext(dns_rcode_t rcode, isc_buffer_t *target) { return (dns_mnemonic_totext(rcode, target, tsigrcodes)); } isc_result_t -dns_cert_fromtext(dns_cert_t *certp, isc_textregion_t *source) -{ +dns_cert_fromtext(dns_cert_t *certp, isc_textregion_t *source) { unsigned int value; RETERR(dns_mnemonic_fromtext(&value, source, certs, 0xffff)); *certp = value; @@ -337,14 +324,12 @@ dns_cert_fromtext(dns_cert_t *certp, isc_textregion_t *source) } isc_result_t -dns_cert_totext(dns_cert_t cert, isc_buffer_t *target) -{ +dns_cert_totext(dns_cert_t cert, isc_buffer_t *target) { return (dns_mnemonic_totext(cert, target, certs)); } isc_result_t -dns_secalg_fromtext(dns_secalg_t *secalgp, isc_textregion_t *source) -{ +dns_secalg_fromtext(dns_secalg_t *secalgp, isc_textregion_t *source) { unsigned int value; RETERR(dns_mnemonic_fromtext(&value, source, secalgs, 0xff)); *secalgp = value; @@ -352,14 +337,12 @@ dns_secalg_fromtext(dns_secalg_t *secalgp, isc_textregion_t *source) } isc_result_t -dns_secalg_totext(dns_secalg_t secalg, isc_buffer_t *target) -{ +dns_secalg_totext(dns_secalg_t secalg, isc_buffer_t *target) { return (dns_mnemonic_totext(secalg, target, secalgs)); } void -dns_secalg_format(dns_secalg_t alg, char *cp, unsigned int size) -{ +dns_secalg_format(dns_secalg_t alg, char *cp, unsigned int size) { isc_buffer_t b; isc_region_t r; isc_result_t result; @@ -375,8 +358,7 @@ dns_secalg_format(dns_secalg_t alg, char *cp, unsigned int size) } isc_result_t -dns_secproto_fromtext(dns_secproto_t *secprotop, isc_textregion_t *source) -{ +dns_secproto_fromtext(dns_secproto_t *secprotop, isc_textregion_t *source) { unsigned int value; RETERR(dns_mnemonic_fromtext(&value, source, secprotos, 0xff)); *secprotop = value; @@ -384,14 +366,12 @@ dns_secproto_fromtext(dns_secproto_t *secprotop, isc_textregion_t *source) } isc_result_t -dns_secproto_totext(dns_secproto_t secproto, isc_buffer_t *target) -{ +dns_secproto_totext(dns_secproto_t secproto, isc_buffer_t *target) { return (dns_mnemonic_totext(secproto, target, secprotos)); } isc_result_t -dns_hashalg_fromtext(unsigned char *hashalg, isc_textregion_t *source) -{ +dns_hashalg_fromtext(unsigned char *hashalg, isc_textregion_t *source) { unsigned int value; RETERR(dns_mnemonic_fromtext(&value, source, hashalgs, 0xff)); *hashalg = value; @@ -399,10 +379,9 @@ dns_hashalg_fromtext(unsigned char *hashalg, isc_textregion_t *source) } isc_result_t -dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source) -{ +dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source) { isc_result_t result; - char * text, *end; + char *text, *end; unsigned int value = 0; #ifdef notyet unsigned int mask = 0; @@ -422,8 +401,8 @@ dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source) while (text < end) { struct keyflag *p; - unsigned int len; - char * delim = memchr(text, '|', end - text); + unsigned int len; + char *delim = memchr(text, '|', end - text); if (delim != NULL) { len = (unsigned int)(delim - text); } else { @@ -454,8 +433,7 @@ dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source) } isc_result_t -dns_dsdigest_fromtext(dns_dsdigest_t *dsdigestp, isc_textregion_t *source) -{ +dns_dsdigest_fromtext(dns_dsdigest_t *dsdigestp, isc_textregion_t *source) { unsigned int value; RETERR(dns_mnemonic_fromtext(&value, source, dsdigests, 0xff)); *dsdigestp = value; @@ -463,14 +441,12 @@ dns_dsdigest_fromtext(dns_dsdigest_t *dsdigestp, isc_textregion_t *source) } isc_result_t -dns_dsdigest_totext(dns_dsdigest_t dsdigest, isc_buffer_t *target) -{ +dns_dsdigest_totext(dns_dsdigest_t dsdigest, isc_buffer_t *target) { return (dns_mnemonic_totext(dsdigest, target, dsdigests)); } void -dns_dsdigest_format(dns_dsdigest_t typ, char *cp, unsigned int size) -{ +dns_dsdigest_format(dns_dsdigest_t typ, char *cp, unsigned int size) { isc_buffer_t b; isc_region_t r; isc_result_t result; @@ -490,13 +466,13 @@ dns_dsdigest_format(dns_dsdigest_t typ, char *cp, unsigned int size) * add classes? */ isc_result_t -dns_rdataclass_fromtext(dns_rdataclass_t *classp, isc_textregion_t *source) -{ -#define COMPARE(string, rdclass) \ - if (((sizeof(string) - 1) == source->length) && \ - (strncasecmp(source->base, string, source->length) == 0)) { \ - *classp = rdclass; \ - return (ISC_R_SUCCESS); \ +dns_rdataclass_fromtext(dns_rdataclass_t *classp, isc_textregion_t *source) { +#define COMPARE(string, rdclass) \ + if (((sizeof(string) - 1) == source->length) && \ + (strncasecmp(source->base, string, source->length) == 0)) \ + { \ + *classp = rdclass; \ + return (ISC_R_SUCCESS); \ } switch (tolower((unsigned char)source->base[0])) { @@ -514,9 +490,10 @@ dns_rdataclass_fromtext(dns_rdataclass_t *classp, isc_textregion_t *source) if (source->length > 5 && source->length < (5 + sizeof("65000")) && - strncasecmp("class", source->base, 5) == 0) { - char buf[sizeof("65000")]; - char * endp; + strncasecmp("class", source->base, 5) == 0) + { + char buf[sizeof("65000")]; + char *endp; unsigned int val; /* @@ -553,8 +530,7 @@ dns_rdataclass_fromtext(dns_rdataclass_t *classp, isc_textregion_t *source) } isc_result_t -dns_rdataclass_totext(dns_rdataclass_t rdclass, isc_buffer_t *target) -{ +dns_rdataclass_totext(dns_rdataclass_t rdclass, isc_buffer_t *target) { switch (rdclass) { case dns_rdataclass_any: return (str_totext("ANY", target)); @@ -574,8 +550,7 @@ dns_rdataclass_totext(dns_rdataclass_t rdclass, isc_buffer_t *target) } isc_result_t -dns_rdataclass_tounknowntext(dns_rdataclass_t rdclass, isc_buffer_t *target) -{ +dns_rdataclass_tounknowntext(dns_rdataclass_t rdclass, isc_buffer_t *target) { char buf[sizeof("CLASS65535")]; snprintf(buf, sizeof(buf), "CLASS%u", rdclass); @@ -583,8 +558,8 @@ dns_rdataclass_tounknowntext(dns_rdataclass_t rdclass, isc_buffer_t *target) } void -dns_rdataclass_format(dns_rdataclass_t rdclass, char *array, unsigned int size) -{ +dns_rdataclass_format(dns_rdataclass_t rdclass, char *array, + unsigned int size) { isc_result_t result; isc_buffer_t buf; diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c index 3b8f316c14..d9bce925d7 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -120,80 +120,64 @@ * conversion. */ typedef struct dns_rdata_textctx { - const dns_name_t * origin; /*%< Current origin, or NULL. */ - dns_masterstyle_flags_t flags; /*%< DNS_STYLEFLAG_* */ - unsigned int width; /*%< Width of rdata column. */ - const char * linebreak; /*%< Line break string. */ + const dns_name_t *origin; /*%< Current origin, or NULL. */ + dns_masterstyle_flags_t flags; /*%< DNS_STYLEFLAG_* */ + unsigned int width; /*%< Width of rdata column. */ + 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 @@ -201,27 +185,22 @@ 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); @@ -247,14 +226,12 @@ 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); @@ -289,8 +266,8 @@ static void generic_freestruct_tlsa(ARGS_FREESTRUCT); static unsigned char gc_msdcs_data[] = "\002gc\006_msdcs"; static unsigned char gc_msdcs_offset[] = { 0, 3 }; -static dns_name_t const gc_msdcs = - DNS_NAME_INITNONABSOLUTE(gc_msdcs_data, gc_msdcs_offset); +static dns_name_t const gc_msdcs = DNS_NAME_INITNONABSOLUTE(gc_msdcs_data, + gc_msdcs_offset); /*% * convert presentation level address to network order binary form. @@ -300,15 +277,14 @@ static dns_name_t const gc_msdcs = * (1) does not touch `dst' unless it's returning 1. */ static inline int -locator_pton(const char *src, unsigned char *dst) -{ +locator_pton(const char *src, unsigned char *dst) { static const char xdigits_l[] = "0123456789abcdef", xdigits_u[] = "0123456789ABCDEF"; - unsigned char tmp[NS_LOCATORSZ]; + unsigned char tmp[NS_LOCATORSZ]; unsigned char *tp = tmp, *endp; - const char * xdigits; - int ch, seen_xdigits; - unsigned int val; + const char *xdigits; + int ch, seen_xdigits; + unsigned int val; memset(tp, '\0', NS_LOCATORSZ); endp = tp + NS_LOCATORSZ; @@ -359,8 +335,7 @@ locator_pton(const char *src, unsigned char *dst) } static inline isc_result_t -name_duporclone(const dns_name_t *source, isc_mem_t *mctx, dns_name_t *target) -{ +name_duporclone(const dns_name_t *source, isc_mem_t *mctx, dns_name_t *target) { if (mctx != NULL) { dns_name_dup(source, mctx, target); } else { @@ -370,8 +345,7 @@ name_duporclone(const dns_name_t *source, isc_mem_t *mctx, dns_name_t *target) } static inline void * -mem_maybedup(isc_mem_t *mctx, void *source, size_t length) -{ +mem_maybedup(isc_mem_t *mctx, void *source, size_t length) { void *copy; if (mctx == NULL) { @@ -384,15 +358,14 @@ mem_maybedup(isc_mem_t *mctx, void *source, size_t length) } static inline isc_result_t -typemap_fromtext(isc_lex_t *lexer, isc_buffer_t *target, bool allow_empty) -{ - isc_token_t token; - unsigned char bm[8 * 1024]; /* 64k bits */ +typemap_fromtext(isc_lex_t *lexer, isc_buffer_t *target, bool allow_empty) { + isc_token_t token; + unsigned char bm[8 * 1024]; /* 64k bits */ dns_rdatatype_t covered, max_used; - int octet; - unsigned int max_octet, newend, end; - int window; - bool first = true; + int octet; + unsigned int max_octet, newend, end; + int window; + bool first = true; max_used = 0; bm[0] = 0; @@ -454,11 +427,10 @@ typemap_fromtext(isc_lex_t *lexer, isc_buffer_t *target, bool allow_empty) static inline isc_result_t typemap_totext(isc_region_t *sr, dns_rdata_textctx_t *tctx, - isc_buffer_t *target) -{ + isc_buffer_t *target) { unsigned int i, j, k; unsigned int window, len; - bool first = true; + bool first = true; for (i = 0; i < sr->length; i += len) { if (tctx != NULL && @@ -500,11 +472,10 @@ typemap_totext(isc_region_t *sr, dns_rdata_textctx_t *tctx, } static isc_result_t -typemap_test(isc_region_t *sr, bool allow_empty) -{ +typemap_test(isc_region_t *sr, bool allow_empty) { unsigned int window, lastwindow = 0; unsigned int len; - bool first = true; + bool first = true; unsigned int i; for (i = 0; i < sr->length; i += len) { @@ -558,7 +529,7 @@ static const char decdigits[] = "0123456789"; #include "code.h" -#define META 0x0001 +#define META 0x0001 #define RESERVED 0x0002 /*** @@ -566,8 +537,7 @@ static const char decdigits[] = "0123456789"; ***/ void -dns_rdata_init(dns_rdata_t *rdata) -{ +dns_rdata_init(dns_rdata_t *rdata) { REQUIRE(rdata != NULL); rdata->data = NULL; @@ -580,8 +550,7 @@ dns_rdata_init(dns_rdata_t *rdata) } void -dns_rdata_reset(dns_rdata_t *rdata) -{ +dns_rdata_reset(dns_rdata_t *rdata) { REQUIRE(rdata != NULL); REQUIRE(!ISC_LINK_LINKED(rdata, link)); @@ -599,8 +568,7 @@ dns_rdata_reset(dns_rdata_t *rdata) ***/ void -dns_rdata_clone(const dns_rdata_t *src, dns_rdata_t *target) -{ +dns_rdata_clone(const dns_rdata_t *src, dns_rdata_t *target) { REQUIRE(src != NULL); REQUIRE(target != NULL); @@ -621,9 +589,8 @@ dns_rdata_clone(const dns_rdata_t *src, dns_rdata_t *target) ***/ int -dns_rdata_compare(const dns_rdata_t *rdata1, const dns_rdata_t *rdata2) -{ - int result = 0; +dns_rdata_compare(const dns_rdata_t *rdata1, const dns_rdata_t *rdata2) { + int result = 0; bool use_default = false; REQUIRE(rdata1 != NULL); @@ -655,9 +622,8 @@ dns_rdata_compare(const dns_rdata_t *rdata1, const dns_rdata_t *rdata2) } int -dns_rdata_casecompare(const dns_rdata_t *rdata1, const dns_rdata_t *rdata2) -{ - int result = 0; +dns_rdata_casecompare(const dns_rdata_t *rdata1, const dns_rdata_t *rdata2) { + int result = 0; bool use_default = false; REQUIRE(rdata1 != NULL); @@ -694,8 +660,7 @@ dns_rdata_casecompare(const dns_rdata_t *rdata1, const dns_rdata_t *rdata2) void dns_rdata_fromregion(dns_rdata_t *rdata, dns_rdataclass_t rdclass, - dns_rdatatype_t type, isc_region_t *r) -{ + dns_rdatatype_t type, isc_region_t *r) { REQUIRE(rdata != NULL); REQUIRE(DNS_RDATA_INITIALIZED(rdata)); REQUIRE(r != NULL); @@ -710,8 +675,7 @@ dns_rdata_fromregion(dns_rdata_t *rdata, dns_rdataclass_t rdclass, } void -dns_rdata_toregion(const dns_rdata_t *rdata, isc_region_t *r) -{ +dns_rdata_toregion(const dns_rdata_t *rdata, isc_region_t *r) { REQUIRE(rdata != NULL); REQUIRE(r != NULL); REQUIRE(DNS_RDATA_VALIDFLAGS(rdata)); @@ -724,14 +688,13 @@ isc_result_t dns_rdata_fromwire(dns_rdata_t *rdata, dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, unsigned int options, - isc_buffer_t *target) -{ + isc_buffer_t *target) { isc_result_t result = ISC_R_NOTIMPLEMENTED; isc_region_t region; isc_buffer_t ss; isc_buffer_t st; - bool use_default = false; - uint32_t activelength; + bool use_default = false; + uint32_t activelength; unsigned int length; REQUIRE(dctx != NULL); @@ -795,10 +758,10 @@ dns_rdata_fromwire(dns_rdata_t *rdata, dns_rdataclass_t rdclass, } isc_result_t -dns_rdata_towire(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) -{ +dns_rdata_towire(dns_rdata_t *rdata, dns_compress_t *cctx, + isc_buffer_t *target) { isc_result_t result = ISC_R_NOTIMPLEMENTED; - bool use_default = false; + bool use_default = false; isc_region_t tr; isc_buffer_t st; @@ -841,10 +804,9 @@ dns_rdata_towire(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) */ static isc_result_t rdata_validate(isc_buffer_t *src, isc_buffer_t *dest, dns_rdataclass_t rdclass, - dns_rdatatype_t type) -{ + dns_rdatatype_t type) { dns_decompress_t dctx; - isc_result_t result; + isc_result_t result; dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_NONE); isc_buffer_setactive(src, isc_buffer_usedlength(src)); @@ -856,11 +818,10 @@ rdata_validate(isc_buffer_t *src, isc_buffer_t *dest, dns_rdataclass_t rdclass, static isc_result_t unknown_fromtext(dns_rdataclass_t rdclass, dns_rdatatype_t type, - isc_lex_t *lexer, isc_mem_t *mctx, isc_buffer_t *target) -{ - isc_result_t result; + isc_lex_t *lexer, isc_mem_t *mctx, isc_buffer_t *target) { + isc_result_t result; isc_buffer_t *buf = NULL; - isc_token_t token; + isc_token_t token; if (type == 0 || dns_rdatatype_ismeta(type)) { return (DNS_R_METATYPE); @@ -909,20 +870,19 @@ dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, const dns_name_t *origin, unsigned int options, isc_mem_t *mctx, isc_buffer_t *target, - dns_rdatacallbacks_t *callbacks) -{ + dns_rdatacallbacks_t *callbacks) { isc_result_t result = ISC_R_NOTIMPLEMENTED; isc_region_t region; isc_buffer_t st; - isc_token_t token; + isc_token_t token; unsigned int lexoptions = ISC_LEXOPT_EOL | ISC_LEXOPT_EOF | ISC_LEXOPT_DNSMULTILINE | ISC_LEXOPT_ESCAPE; - char * name; + char *name; unsigned long line; void (*callback)(dns_rdatacallbacks_t *, const char *, ...); isc_result_t tresult; unsigned int length; - bool unknown; + bool unknown; REQUIRE(origin == NULL || dns_name_isabsolute(origin) == true); if (rdata != NULL) { @@ -1040,10 +1000,9 @@ dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass, static isc_result_t unknown_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, - isc_buffer_t *target) -{ + isc_buffer_t *target) { isc_result_t result; - char buf[sizeof("65535")]; + char buf[sizeof("65535")]; isc_region_t sr; strlcpy(buf, "\\# ", sizeof(buf)); @@ -1087,10 +1046,9 @@ unknown_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, static isc_result_t rdata_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, - isc_buffer_t *target) -{ + isc_buffer_t *target) { isc_result_t result = ISC_R_NOTIMPLEMENTED; - bool use_default = false; + bool use_default = false; unsigned int cur; REQUIRE(rdata != NULL); @@ -1126,8 +1084,7 @@ rdata_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_result_t dns_rdata_totext(dns_rdata_t *rdata, const dns_name_t *origin, - isc_buffer_t *target) -{ + isc_buffer_t *target) { dns_rdata_textctx_t tctx; REQUIRE(DNS_RDATA_VALIDFLAGS(rdata)); @@ -1146,8 +1103,7 @@ isc_result_t dns_rdata_tofmttext(dns_rdata_t *rdata, const dns_name_t *origin, dns_masterstyle_flags_t flags, unsigned int width, unsigned int split_width, const char *linebreak, - isc_buffer_t *target) -{ + isc_buffer_t *target) { dns_rdata_textctx_t tctx; REQUIRE(DNS_RDATA_VALIDFLAGS(rdata)); @@ -1176,12 +1132,11 @@ dns_rdata_tofmttext(dns_rdata_t *rdata, const dns_name_t *origin, isc_result_t dns_rdata_fromstruct(dns_rdata_t *rdata, dns_rdataclass_t rdclass, - dns_rdatatype_t type, void *source, isc_buffer_t *target) -{ + dns_rdatatype_t type, void *source, isc_buffer_t *target) { isc_result_t result = ISC_R_NOTIMPLEMENTED; isc_buffer_t st; isc_region_t region; - bool use_default = false; + bool use_default = false; unsigned int length; REQUIRE(source != NULL); @@ -1215,10 +1170,9 @@ dns_rdata_fromstruct(dns_rdata_t *rdata, dns_rdataclass_t rdclass, } isc_result_t -dns_rdata_tostruct(const dns_rdata_t *rdata, void *target, isc_mem_t *mctx) -{ +dns_rdata_tostruct(const dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { isc_result_t result = ISC_R_NOTIMPLEMENTED; - bool use_default = false; + bool use_default = false; REQUIRE(rdata != NULL); REQUIRE(DNS_RDATA_VALIDFLAGS(rdata)); @@ -1233,8 +1187,7 @@ dns_rdata_tostruct(const dns_rdata_t *rdata, void *target, isc_mem_t *mctx) } void -dns_rdata_freestruct(void *source) -{ +dns_rdata_freestruct(void *source) { dns_rdatacommon_t *common = source; REQUIRE(common != NULL); @@ -1243,10 +1196,9 @@ dns_rdata_freestruct(void *source) isc_result_t dns_rdata_additionaldata(dns_rdata_t *rdata, dns_additionaldatafunc_t add, - void *arg) -{ + void *arg) { isc_result_t result = ISC_R_NOTIMPLEMENTED; - bool use_default = false; + bool use_default = false; /* * Call 'add' for each name and type from 'rdata' which is subject to @@ -1268,10 +1220,9 @@ dns_rdata_additionaldata(dns_rdata_t *rdata, dns_additionaldatafunc_t add, } isc_result_t -dns_rdata_digest(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) -{ +dns_rdata_digest(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_result_t result = ISC_R_NOTIMPLEMENTED; - bool use_default = false; + bool use_default = false; isc_region_t r; /* @@ -1294,8 +1245,7 @@ dns_rdata_digest(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) bool dns_rdata_checkowner(const dns_name_t *name, dns_rdataclass_t rdclass, - dns_rdatatype_t type, bool wildcard) -{ + dns_rdatatype_t type, bool wildcard) { bool result; CHECKOWNERSWITCH @@ -1304,8 +1254,7 @@ dns_rdata_checkowner(const dns_name_t *name, dns_rdataclass_t rdclass, bool dns_rdata_checknames(dns_rdata_t *rdata, const dns_name_t *owner, - dns_name_t *bad) -{ + dns_name_t *bad) { bool result; CHECKNAMESSWITCH @@ -1313,8 +1262,7 @@ dns_rdata_checknames(dns_rdata_t *rdata, const dns_name_t *owner, } unsigned int -dns_rdatatype_attributes(dns_rdatatype_t type) -{ +dns_rdatatype_attributes(dns_rdatatype_t type) { RDATATYPE_ATTRIBUTE_SW if (type >= (dns_rdatatype_t)128 && type < (dns_rdatatype_t)255) { return (DNS_RDATATYPEATTR_UNKNOWN | DNS_RDATATYPEATTR_META); @@ -1323,10 +1271,9 @@ dns_rdatatype_attributes(dns_rdatatype_t type) } isc_result_t -dns_rdatatype_fromtext(dns_rdatatype_t *typep, isc_textregion_t *source) -{ - unsigned int hash; - unsigned int n; +dns_rdatatype_fromtext(dns_rdatatype_t *typep, isc_textregion_t *source) { + unsigned int hash; + unsigned int n; unsigned char a, b; n = source->length; @@ -1348,9 +1295,10 @@ dns_rdatatype_fromtext(dns_rdatatype_t *typep, isc_textregion_t *source) RDATATYPE_FROMTEXT_SW(hash, source->base, n, typep); if (source->length > 4 && source->length < (4 + sizeof("65000")) && - strncasecmp("type", source->base, 4) == 0) { - char buf[sizeof("65000")]; - char * endp; + strncasecmp("type", source->base, 4) == 0) + { + char buf[sizeof("65000")]; + char *endp; unsigned int val; /* @@ -1370,16 +1318,14 @@ dns_rdatatype_fromtext(dns_rdatatype_t *typep, isc_textregion_t *source) } isc_result_t -dns_rdatatype_totext(dns_rdatatype_t type, isc_buffer_t *target) -{ +dns_rdatatype_totext(dns_rdatatype_t type, isc_buffer_t *target) { RDATATYPE_TOTEXT_SW return (dns_rdatatype_tounknowntext(type, target)); } isc_result_t -dns_rdatatype_tounknowntext(dns_rdatatype_t type, isc_buffer_t *target) -{ +dns_rdatatype_tounknowntext(dns_rdatatype_t type, isc_buffer_t *target) { char buf[sizeof("TYPE65535")]; snprintf(buf, sizeof(buf), "TYPE%u", type); @@ -1387,8 +1333,7 @@ dns_rdatatype_tounknowntext(dns_rdatatype_t type, isc_buffer_t *target) } void -dns_rdatatype_format(dns_rdatatype_t rdtype, char *array, unsigned int size) -{ +dns_rdatatype_format(dns_rdatatype_t rdtype, char *array, unsigned int size) { isc_result_t result; isc_buffer_t buf; @@ -1418,19 +1363,17 @@ dns_rdatatype_format(dns_rdatatype_t rdtype, char *array, unsigned int size) */ static unsigned int -name_length(const dns_name_t *name) -{ +name_length(const dns_name_t *name) { return (name->length); } static isc_result_t -txt_totext(isc_region_t *source, bool quote, isc_buffer_t *target) -{ - unsigned int tl; - unsigned int n; +txt_totext(isc_region_t *source, bool quote, isc_buffer_t *target) { + unsigned int tl; + unsigned int n; unsigned char *sp; - char * tp; - isc_region_t region; + char *tp; + isc_region_t region; isc_buffer_availableregion(target, ®ion); sp = source->base; @@ -1500,15 +1443,14 @@ 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) -{ - isc_region_t tregion; - bool escape; - unsigned int n, nrem; - char * s; +txt_fromtext(isc_textregion_t *source, isc_buffer_t *target) { + isc_region_t tregion; + bool escape; + unsigned int n, nrem; + char *s; unsigned char *t; - int d; - int c; + int d; + int c; isc_buffer_availableregion(target, &tregion); s = source->base; @@ -1576,8 +1518,7 @@ txt_fromtext(isc_textregion_t *source, isc_buffer_t *target) } static isc_result_t -txt_fromwire(isc_buffer_t *source, isc_buffer_t *target) -{ +txt_fromwire(isc_buffer_t *source, isc_buffer_t *target) { unsigned int n; isc_region_t sregion; isc_region_t tregion; @@ -1608,13 +1549,12 @@ txt_fromwire(isc_buffer_t *source, isc_buffer_t *target) * Conversion of TXT-like rdata fields without length limits. */ static isc_result_t -multitxt_totext(isc_region_t *source, isc_buffer_t *target) -{ - unsigned int tl; - unsigned int n0, n; +multitxt_totext(isc_region_t *source, isc_buffer_t *target) { + unsigned int tl; + unsigned int n0, n; unsigned char *sp; - char * tp; - isc_region_t region; + char *tp; + isc_region_t region; isc_buffer_availableregion(target, ®ion); sp = source->base; @@ -1670,15 +1610,14 @@ multitxt_totext(isc_region_t *source, isc_buffer_t *target) } static isc_result_t -multitxt_fromtext(isc_textregion_t *source, isc_buffer_t *target) -{ - isc_region_t tregion; - bool escape; - unsigned int n, nrem; - char * s; +multitxt_fromtext(isc_textregion_t *source, isc_buffer_t *target) { + isc_region_t tregion; + bool escape; + unsigned int n, nrem; + char *s; unsigned char *t0, *t; - int d; - int c; + int d; + int c; s = source->base; n = source->length; @@ -1739,8 +1678,7 @@ 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) -{ +name_prefix(dns_name_t *name, const dns_name_t *origin, dns_name_t *target) { int l1, l2; if (origin == NULL) { @@ -1777,8 +1715,7 @@ return_false: } static isc_result_t -str_totext(const char *source, isc_buffer_t *target) -{ +str_totext(const char *source, isc_buffer_t *target) { unsigned int l; isc_region_t region; @@ -1795,8 +1732,7 @@ 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) -{ +inet_totext(int af, isc_region_t *src, isc_buffer_t *target) { char tmpbuf[64]; /* Note - inet_ntop doesn't do size checking on its input. */ @@ -1811,22 +1747,19 @@ inet_totext(int af, isc_region_t *src, isc_buffer_t *target) } static bool -buffer_empty(isc_buffer_t *source) -{ +buffer_empty(isc_buffer_t *source) { return ((source->current == source->active) ? true : false); } static void -buffer_fromregion(isc_buffer_t *buffer, isc_region_t *region) -{ +buffer_fromregion(isc_buffer_t *buffer, isc_region_t *region) { isc_buffer_init(buffer, region->base, region->length); isc_buffer_add(buffer, region->length); isc_buffer_setactive(buffer, region->length); } static isc_result_t -uint32_tobuffer(uint32_t value, isc_buffer_t *target) -{ +uint32_tobuffer(uint32_t value, isc_buffer_t *target) { isc_region_t region; isc_buffer_availableregion(target, ®ion); @@ -1838,8 +1771,7 @@ uint32_tobuffer(uint32_t value, isc_buffer_t *target) } static isc_result_t -uint16_tobuffer(uint32_t value, isc_buffer_t *target) -{ +uint16_tobuffer(uint32_t value, isc_buffer_t *target) { isc_region_t region; if (value > 0xffff) { @@ -1854,8 +1786,7 @@ uint16_tobuffer(uint32_t value, isc_buffer_t *target) } static isc_result_t -uint8_tobuffer(uint32_t value, isc_buffer_t *target) -{ +uint8_tobuffer(uint32_t value, isc_buffer_t *target) { isc_region_t region; if (value > 0xff) { @@ -1870,16 +1801,14 @@ uint8_tobuffer(uint32_t value, isc_buffer_t *target) } static isc_result_t -name_tobuffer(const dns_name_t *name, isc_buffer_t *target) -{ +name_tobuffer(const dns_name_t *name, isc_buffer_t *target) { isc_region_t r; dns_name_toregion(name, &r); return (isc_buffer_copyregion(target, &r)); } static uint32_t -uint32_fromregion(isc_region_t *region) -{ +uint32_fromregion(isc_region_t *region) { uint32_t value; REQUIRE(region->length >= 4); @@ -1891,8 +1820,7 @@ uint32_fromregion(isc_region_t *region) } static uint16_t -uint16_consume_fromregion(isc_region_t *region) -{ +uint16_consume_fromregion(isc_region_t *region) { uint16_t r = uint16_fromregion(region); isc_region_consume(region, 2); @@ -1900,24 +1828,21 @@ uint16_consume_fromregion(isc_region_t *region) } static uint16_t -uint16_fromregion(isc_region_t *region) -{ +uint16_fromregion(isc_region_t *region) { REQUIRE(region->length >= 2); return ((region->base[0] << 8) | region->base[1]); } static uint8_t -uint8_fromregion(isc_region_t *region) -{ +uint8_fromregion(isc_region_t *region) { REQUIRE(region->length >= 1); return (region->base[0]); } static uint8_t -uint8_consume_fromregion(isc_region_t *region) -{ +uint8_consume_fromregion(isc_region_t *region) { uint8_t r = uint8_fromregion(region); isc_region_consume(region, 1); @@ -1925,8 +1850,7 @@ uint8_consume_fromregion(isc_region_t *region) } static isc_result_t -mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) -{ +mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) { isc_region_t tr; if (length == 0U) { @@ -1945,9 +1869,8 @@ mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) } static int -hexvalue(char value) -{ - const char * s; +hexvalue(char value) { + const char *s; unsigned char c; c = (unsigned char)value; @@ -1965,8 +1888,7 @@ hexvalue(char value) } static int -decvalue(char value) -{ +decvalue(char value) { const char *s; /* @@ -1983,8 +1905,8 @@ decvalue(char value) } static void -default_fromtext_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, ...) -{ +default_fromtext_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, + ...) { va_list ap; UNUSED(callbacks); @@ -1996,8 +1918,7 @@ default_fromtext_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, ...) } static void -fromtext_warneof(isc_lex_t *lexer, dns_rdatacallbacks_t *callbacks) -{ +fromtext_warneof(isc_lex_t *lexer, dns_rdatacallbacks_t *callbacks) { if (isc_lex_isfile(lexer) && callbacks != NULL) { const char *name = isc_lex_getsourcename(lexer); if (name == NULL) { @@ -2011,9 +1932,8 @@ fromtext_warneof(isc_lex_t *lexer, dns_rdatacallbacks_t *callbacks) static void warn_badmx(isc_token_t *token, isc_lex_t *lexer, - dns_rdatacallbacks_t *callbacks) -{ - const char * file; + dns_rdatacallbacks_t *callbacks) { + const char *file; unsigned long line; if (lexer != NULL) { @@ -2027,11 +1947,10 @@ warn_badmx(isc_token_t *token, isc_lex_t *lexer, static void warn_badname(const dns_name_t *name, isc_lex_t *lexer, - dns_rdatacallbacks_t *callbacks) -{ - const char * file; + dns_rdatacallbacks_t *callbacks) { + const char *file; unsigned long line; - char namebuf[DNS_NAME_FORMATSIZE]; + char namebuf[DNS_NAME_FORMATSIZE]; if (lexer != NULL) { file = isc_lex_getsourcename(lexer); @@ -2046,8 +1965,7 @@ warn_badname(const dns_name_t *name, isc_lex_t *lexer, static void 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) -{ + unsigned long line, isc_token_t *token, isc_result_t result) { if (name == NULL) { name = "UNKNOWN"; } @@ -2090,8 +2008,7 @@ fromtext_error(void (*callback)(dns_rdatacallbacks_t *, const char *, ...), } dns_rdatatype_t -dns_rdata_covers(dns_rdata_t *rdata) -{ +dns_rdata_covers(dns_rdata_t *rdata) { if (rdata->type == dns_rdatatype_rrsig) { return (covers_rrsig(rdata)); } @@ -2099,8 +2016,7 @@ dns_rdata_covers(dns_rdata_t *rdata) } bool -dns_rdatatype_ismeta(dns_rdatatype_t type) -{ +dns_rdatatype_ismeta(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_META) != 0) { return (true); } @@ -2108,18 +2024,16 @@ dns_rdatatype_ismeta(dns_rdatatype_t type) } bool -dns_rdatatype_issingleton(dns_rdatatype_t type) -{ - if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_SINGLETON) != - 0) { +dns_rdatatype_issingleton(dns_rdatatype_t type) { + if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_SINGLETON) != 0) + { return (true); } return (false); } bool -dns_rdatatype_notquestion(dns_rdatatype_t type) -{ +dns_rdatatype_notquestion(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_NOTQUESTION) != 0) { return (true); @@ -2128,8 +2042,7 @@ dns_rdatatype_notquestion(dns_rdatatype_t type) } bool -dns_rdatatype_questiononly(dns_rdatatype_t type) -{ +dns_rdatatype_questiononly(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_QUESTIONONLY) != 0) { return (true); @@ -2138,8 +2051,7 @@ dns_rdatatype_questiononly(dns_rdatatype_t type) } bool -dns_rdatatype_atcname(dns_rdatatype_t type) -{ +dns_rdatatype_atcname(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_ATCNAME) != 0) { return (true); } @@ -2147,20 +2059,19 @@ dns_rdatatype_atcname(dns_rdatatype_t type) } bool -dns_rdatatype_atparent(dns_rdatatype_t type) -{ - if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_ATPARENT) != - 0) { +dns_rdatatype_atparent(dns_rdatatype_t type) { + if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_ATPARENT) != 0) + { return (true); } return (false); } bool -dns_rdataclass_ismeta(dns_rdataclass_t rdclass) -{ +dns_rdataclass_ismeta(dns_rdataclass_t rdclass) { if (rdclass == dns_rdataclass_reserved0 || - rdclass == dns_rdataclass_none || rdclass == dns_rdataclass_any) { + rdclass == dns_rdataclass_none || rdclass == dns_rdataclass_any) + { return (true); } @@ -2168,8 +2079,7 @@ dns_rdataclass_ismeta(dns_rdataclass_t rdclass) } bool -dns_rdatatype_isdnssec(dns_rdatatype_t type) -{ +dns_rdatatype_isdnssec(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_DNSSEC) != 0) { return (true); } @@ -2177,8 +2087,7 @@ dns_rdatatype_isdnssec(dns_rdatatype_t type) } bool -dns_rdatatype_iszonecutauth(dns_rdatatype_t type) -{ +dns_rdatatype_iszonecutauth(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_ZONECUTAUTH) != 0) { return (true); @@ -2187,8 +2096,7 @@ dns_rdatatype_iszonecutauth(dns_rdatatype_t type) } bool -dns_rdatatype_isknown(dns_rdatatype_t type) -{ +dns_rdatatype_isknown(dns_rdatatype_t type) { if ((dns_rdatatype_attributes(type) & DNS_RDATATYPEATTR_UNKNOWN) == 0) { return (true); } @@ -2196,8 +2104,7 @@ dns_rdatatype_isknown(dns_rdatatype_t type) } void -dns_rdata_exists(dns_rdata_t *rdata, dns_rdatatype_t type) -{ +dns_rdata_exists(dns_rdata_t *rdata, dns_rdatatype_t type) { REQUIRE(rdata != NULL); REQUIRE(DNS_RDATA_INITIALIZED(rdata)); @@ -2209,8 +2116,7 @@ dns_rdata_exists(dns_rdata_t *rdata, dns_rdatatype_t type) } void -dns_rdata_notexist(dns_rdata_t *rdata, dns_rdatatype_t type) -{ +dns_rdata_notexist(dns_rdata_t *rdata, dns_rdatatype_t type) { REQUIRE(rdata != NULL); REQUIRE(DNS_RDATA_INITIALIZED(rdata)); @@ -2222,8 +2128,7 @@ dns_rdata_notexist(dns_rdata_t *rdata, dns_rdatatype_t type) } void -dns_rdata_deleterrset(dns_rdata_t *rdata, dns_rdatatype_t type) -{ +dns_rdata_deleterrset(dns_rdata_t *rdata, dns_rdatatype_t type) { REQUIRE(rdata != NULL); REQUIRE(DNS_RDATA_INITIALIZED(rdata)); @@ -2235,16 +2140,14 @@ dns_rdata_deleterrset(dns_rdata_t *rdata, dns_rdatatype_t type) } void -dns_rdata_makedelete(dns_rdata_t *rdata) -{ +dns_rdata_makedelete(dns_rdata_t *rdata) { REQUIRE(rdata != NULL); rdata->rdclass = dns_rdataclass_none; } const char * -dns_rdata_updateop(dns_rdata_t *rdata, dns_section_t section) -{ +dns_rdata_updateop(dns_rdata_t *rdata, dns_section_t section) { REQUIRE(rdata != NULL); REQUIRE(DNS_RDATA_INITIALIZED(rdata)); diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c index 5a7dca061f..859f89193d 100644 --- a/lib/dns/rdata/any_255/tsig_250.c +++ b/lib/dns/rdata/any_255/tsig_250.c @@ -15,15 +15,15 @@ #define RRTYPE_TSIG_ATTRIBUTES \ (DNS_RDATATYPEATTR_META | DNS_RDATATYPEATTR_NOTQUESTION) -static inline isc_result_t fromtext_any_tsig(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; - uint64_t sigtime; +static inline isc_result_t +fromtext_any_tsig(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; + uint64_t sigtime; isc_buffer_t buffer; - dns_rcode_t rcode; - long i; - char * e; + dns_rcode_t rcode; + long i; + char *e; REQUIRE(type == dns_rdatatype_tsig); REQUIRE(rdclass == dns_rdataclass_any); @@ -128,16 +128,16 @@ static inline isc_result_t fromtext_any_tsig(ARGS_FROMTEXT) return (isc_base64_tobuffer(lexer, target, (int)token.value.as_ulong)); } -static inline isc_result_t totext_any_tsig(ARGS_TOTEXT) -{ - isc_region_t sr; - isc_region_t sigr; - char buf[sizeof(" 281474976710655 ")]; - char * bufp; - dns_name_t name; - dns_name_t prefix; - bool sub; - uint64_t sigtime; +static inline isc_result_t +totext_any_tsig(ARGS_TOTEXT) { + isc_region_t sr; + isc_region_t sigr; + char buf[sizeof(" 281474976710655 ")]; + char *bufp; + dns_name_t name; + dns_name_t prefix; + bool sub; + uint64_t sigtime; unsigned short n; REQUIRE(rdata->type == dns_rdatatype_tsig); @@ -249,10 +249,10 @@ static inline isc_result_t totext_any_tsig(ARGS_TOTEXT) } } -static inline isc_result_t fromwire_any_tsig(ARGS_FROMWIRE) -{ - isc_region_t sr; - dns_name_t name; +static inline isc_result_t +fromwire_any_tsig(ARGS_FROMWIRE) { + isc_region_t sr; + dns_name_t name; unsigned long n; REQUIRE(type == dns_rdatatype_tsig); @@ -318,10 +318,10 @@ static inline isc_result_t fromwire_any_tsig(ARGS_FROMWIRE) return (mem_tobuffer(target, sr.base, n + 2)); } -static inline isc_result_t towire_any_tsig(ARGS_TOWIRE) -{ - isc_region_t sr; - dns_name_t name; +static inline isc_result_t +towire_any_tsig(ARGS_TOWIRE) { + isc_region_t sr; + dns_name_t name; dns_offsets_t offsets; REQUIRE(rdata->type == dns_rdatatype_tsig); @@ -337,13 +337,13 @@ static inline isc_result_t towire_any_tsig(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_any_tsig(ARGS_COMPARE) -{ +static inline int +compare_any_tsig(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; - dns_name_t name1; - dns_name_t name2; - int order; + dns_name_t name1; + dns_name_t name2; + int order; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); @@ -367,10 +367,10 @@ static inline int compare_any_tsig(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_any_tsig(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_any_tsig(ARGS_FROMSTRUCT) { dns_rdata_any_tsig_t *tsig = source; - isc_region_t tr; + isc_region_t tr; REQUIRE(type == dns_rdatatype_tsig); REQUIRE(rdclass == dns_rdataclass_any); @@ -439,11 +439,11 @@ static inline isc_result_t fromstruct_any_tsig(ARGS_FROMSTRUCT) return (mem_tobuffer(target, tsig->other, tsig->otherlen)); } -static inline isc_result_t tostruct_any_tsig(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_any_tsig(ARGS_TOSTRUCT) { dns_rdata_any_tsig_t *tsig; - dns_name_t alg; - isc_region_t sr; + dns_name_t alg; + isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_tsig); REQUIRE(rdata->rdclass == dns_rdataclass_any); @@ -470,10 +470,11 @@ static inline isc_result_t tostruct_any_tsig(ARGS_TOSTRUCT) * Time Signed. */ INSIST(sr.length >= 6); - tsig->timesigned = - ((uint64_t)sr.base[0] << 40) | ((uint64_t)sr.base[1] << 32) | - ((uint64_t)sr.base[2] << 24) | ((uint64_t)sr.base[3] << 16) | - ((uint64_t)sr.base[4] << 8) | (uint64_t)sr.base[5]; + tsig->timesigned = ((uint64_t)sr.base[0] << 40) | + ((uint64_t)sr.base[1] << 32) | + ((uint64_t)sr.base[2] << 24) | + ((uint64_t)sr.base[3] << 16) | + ((uint64_t)sr.base[4] << 8) | (uint64_t)sr.base[5]; isc_region_consume(&sr, 6); /* @@ -538,8 +539,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_any_tsig(ARGS_FREESTRUCT) -{ +static inline void +freestruct_any_tsig(ARGS_FREESTRUCT) { dns_rdata_any_tsig_t *tsig = (dns_rdata_any_tsig_t *)source; REQUIRE(tsig != NULL); @@ -560,8 +561,8 @@ static inline void freestruct_any_tsig(ARGS_FREESTRUCT) tsig->mctx = NULL; } -static inline isc_result_t additionaldata_any_tsig(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_any_tsig(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_tsig); REQUIRE(rdata->rdclass == dns_rdataclass_any); @@ -572,8 +573,8 @@ static inline isc_result_t additionaldata_any_tsig(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_any_tsig(ARGS_DIGEST) -{ +static inline isc_result_t +digest_any_tsig(ARGS_DIGEST) { REQUIRE(rdata->type == dns_rdatatype_tsig); REQUIRE(rdata->rdclass == dns_rdataclass_any); @@ -584,8 +585,8 @@ static inline isc_result_t digest_any_tsig(ARGS_DIGEST) return (ISC_R_NOTIMPLEMENTED); } -static inline bool checkowner_any_tsig(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_any_tsig(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_tsig); REQUIRE(rdclass == dns_rdataclass_any); @@ -597,8 +598,8 @@ static inline bool checkowner_any_tsig(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_any_tsig(ARGS_CHECKNAMES) -{ +static inline bool +checknames_any_tsig(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_tsig); REQUIRE(rdata->rdclass == dns_rdataclass_any); @@ -609,8 +610,8 @@ static inline bool checknames_any_tsig(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_any_tsig(ARGS_COMPARE) -{ +static inline int +casecompare_any_tsig(ARGS_COMPARE) { return (compare_any_tsig(rdata1, rdata2)); } diff --git a/lib/dns/rdata/ch_3/a_1.c b/lib/dns/rdata/ch_3/a_1.c index 45c7833f49..e5dfe14b9e 100644 --- a/lib/dns/rdata/ch_3/a_1.c +++ b/lib/dns/rdata/ch_3/a_1.c @@ -19,10 +19,10 @@ #define RRTYPE_A_ATTRIBUTES (0) -static inline isc_result_t fromtext_ch_a(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_ch_a(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; REQUIRE(type == dns_rdatatype_a); @@ -42,7 +42,8 @@ static inline isc_result_t fromtext_ch_a(ARGS_FROMTEXT) } RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target)); if ((options & DNS_RDATA_CHECKNAMES) != 0 && - (options & DNS_RDATA_CHECKREVERSE) != 0) { + (options & DNS_RDATA_CHECKREVERSE) != 0) + { bool ok; ok = dns_name_ishostname(&name, false); if (!ok && (options & DNS_RDATA_CHECKNAMESFAIL) != 0) { @@ -61,14 +62,14 @@ static inline isc_result_t fromtext_ch_a(ARGS_FROMTEXT) return (uint16_tobuffer(token.value.as_ulong, target)); } -static inline isc_result_t totext_ch_a(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_ch_a(ARGS_TOTEXT) { isc_region_t region; - dns_name_t name; - dns_name_t prefix; - bool sub; - char buf[sizeof("0177777")]; - uint16_t addr; + dns_name_t name; + dns_name_t prefix; + bool sub; + char buf[sizeof("0177777")]; + uint16_t addr; REQUIRE(rdata->type == dns_rdatatype_a); REQUIRE(rdata->rdclass == dns_rdataclass_ch); /* 3 */ @@ -90,11 +91,11 @@ static inline isc_result_t totext_ch_a(ARGS_TOTEXT) return (str_totext(buf, target)); } -static inline isc_result_t fromwire_ch_a(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_ch_a(ARGS_FROMWIRE) { isc_region_t sregion; isc_region_t tregion; - dns_name_t name; + dns_name_t name; REQUIRE(type == dns_rdatatype_a); REQUIRE(rdclass == dns_rdataclass_ch); @@ -124,12 +125,12 @@ static inline isc_result_t fromwire_ch_a(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_ch_a(ARGS_TOWIRE) -{ - dns_name_t name; +static inline isc_result_t +towire_ch_a(ARGS_TOWIRE) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t sregion; - isc_region_t tregion; + isc_region_t sregion; + isc_region_t tregion; REQUIRE(rdata->type == dns_rdatatype_a); REQUIRE(rdata->rdclass == dns_rdataclass_ch); @@ -155,13 +156,13 @@ static inline isc_result_t towire_ch_a(ARGS_TOWIRE) return (ISC_R_SUCCESS); } -static inline int compare_ch_a(ARGS_COMPARE) -{ - dns_name_t name1; - dns_name_t name2; +static inline int +compare_ch_a(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; - int order; + int order; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); @@ -193,10 +194,10 @@ static inline int compare_ch_a(ARGS_COMPARE) return (order); } -static inline isc_result_t fromstruct_ch_a(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_ch_a(ARGS_FROMSTRUCT) { dns_rdata_ch_a_t *a = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_a); REQUIRE(a != NULL); @@ -212,11 +213,11 @@ static inline isc_result_t fromstruct_ch_a(ARGS_FROMSTRUCT) return (uint16_tobuffer(ntohs(a->ch_addr), target)); } -static inline isc_result_t tostruct_ch_a(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_ch_a(ARGS_TOSTRUCT) { dns_rdata_ch_a_t *a = target; - isc_region_t region; - dns_name_t name; + isc_region_t region; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_a); REQUIRE(rdata->rdclass == dns_rdataclass_ch); @@ -239,8 +240,8 @@ static inline isc_result_t tostruct_ch_a(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_ch_a(ARGS_FREESTRUCT) -{ +static inline void +freestruct_ch_a(ARGS_FREESTRUCT) { dns_rdata_ch_a_t *a = source; REQUIRE(a != NULL); @@ -254,8 +255,8 @@ static inline void freestruct_ch_a(ARGS_FREESTRUCT) a->mctx = NULL; } -static inline isc_result_t additionaldata_ch_a(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_ch_a(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_a); REQUIRE(rdata->rdclass == dns_rdataclass_ch); @@ -266,10 +267,10 @@ static inline isc_result_t additionaldata_ch_a(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_ch_a(ARGS_DIGEST) -{ +static inline isc_result_t +digest_ch_a(ARGS_DIGEST) { isc_region_t r; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_a); REQUIRE(rdata->rdclass == dns_rdataclass_ch); @@ -282,8 +283,8 @@ static inline isc_result_t digest_ch_a(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_ch_a(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_ch_a(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_a); REQUIRE(rdclass == dns_rdataclass_ch); @@ -292,10 +293,10 @@ static inline bool checkowner_ch_a(ARGS_CHECKOWNER) return (dns_name_ishostname(name, wildcard)); } -static inline bool checknames_ch_a(ARGS_CHECKNAMES) -{ +static inline bool +checknames_ch_a(ARGS_CHECKNAMES) { isc_region_t region; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_a); REQUIRE(rdata->rdclass == dns_rdataclass_ch); @@ -315,8 +316,8 @@ static inline bool checknames_ch_a(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_ch_a(ARGS_COMPARE) -{ +static inline int +casecompare_ch_a(ARGS_COMPARE) { return (compare_ch_a(rdata1, rdata2)); } #endif /* RDATA_CH_3_A_1_C */ diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c index 1e874645b1..ef00e7df4e 100644 --- a/lib/dns/rdata/generic/afsdb_18.c +++ b/lib/dns/rdata/generic/afsdb_18.c @@ -16,12 +16,12 @@ #define RRTYPE_AFSDB_ATTRIBUTES (0) -static inline isc_result_t fromtext_afsdb(ARGS_FROMTEXT) -{ - isc_token_t token; +static inline isc_result_t +fromtext_afsdb(ARGS_FROMTEXT) { + isc_token_t token; isc_buffer_t buffer; - dns_name_t name; - bool ok; + dns_name_t name; + bool ok; REQUIRE(type == dns_rdatatype_afsdb); @@ -63,13 +63,13 @@ static inline isc_result_t fromtext_afsdb(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_afsdb(ARGS_TOTEXT) -{ - dns_name_t name; - dns_name_t prefix; +static inline isc_result_t +totext_afsdb(ARGS_TOTEXT) { + dns_name_t name; + dns_name_t prefix; isc_region_t region; - char buf[sizeof("64000 ")]; - bool sub; + char buf[sizeof("64000 ")]; + bool sub; unsigned int num; REQUIRE(rdata->type == dns_rdatatype_afsdb); @@ -88,9 +88,9 @@ static inline isc_result_t totext_afsdb(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_afsdb(ARGS_FROMWIRE) -{ - dns_name_t name; +static inline isc_result_t +fromwire_afsdb(ARGS_FROMWIRE) { + dns_name_t name; isc_region_t sr; isc_region_t tr; @@ -117,11 +117,11 @@ static inline isc_result_t fromwire_afsdb(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_afsdb(ARGS_TOWIRE) -{ - isc_region_t tr; - isc_region_t sr; - dns_name_t name; +static inline isc_result_t +towire_afsdb(ARGS_TOWIRE) { + isc_region_t tr; + isc_region_t sr; + dns_name_t name; dns_offsets_t offsets; REQUIRE(rdata->type == dns_rdatatype_afsdb); @@ -143,11 +143,11 @@ static inline isc_result_t towire_afsdb(ARGS_TOWIRE) return (dns_name_towire(&name, cctx, target)); } -static inline int compare_afsdb(ARGS_COMPARE) -{ - int result; - dns_name_t name1; - dns_name_t name2; +static inline int +compare_afsdb(ARGS_COMPARE) { + int result; + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; @@ -177,10 +177,10 @@ static inline int compare_afsdb(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_afsdb(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_afsdb(ARGS_FROMSTRUCT) { dns_rdata_afsdb_t *afsdb = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_afsdb); REQUIRE(afsdb != NULL); @@ -195,11 +195,11 @@ static inline isc_result_t fromstruct_afsdb(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_afsdb(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_afsdb(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_afsdb_t *afsdb = target; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_afsdb); REQUIRE(afsdb != NULL); @@ -224,8 +224,8 @@ static inline isc_result_t tostruct_afsdb(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_afsdb(ARGS_FREESTRUCT) -{ +static inline void +freestruct_afsdb(ARGS_FREESTRUCT) { dns_rdata_afsdb_t *afsdb = source; REQUIRE(afsdb != NULL); @@ -239,11 +239,11 @@ static inline void freestruct_afsdb(ARGS_FREESTRUCT) afsdb->mctx = NULL; } -static inline isc_result_t additionaldata_afsdb(ARGS_ADDLDATA) -{ - dns_name_t name; +static inline isc_result_t +additionaldata_afsdb(ARGS_ADDLDATA) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_afsdb); @@ -255,10 +255,10 @@ static inline isc_result_t additionaldata_afsdb(ARGS_ADDLDATA) return ((add)(arg, &name, dns_rdatatype_a)); } -static inline isc_result_t digest_afsdb(ARGS_DIGEST) -{ +static inline isc_result_t +digest_afsdb(ARGS_DIGEST) { isc_region_t r1, r2; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_afsdb); @@ -273,8 +273,8 @@ static inline isc_result_t digest_afsdb(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_afsdb(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_afsdb(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_afsdb); UNUSED(name); @@ -285,10 +285,10 @@ static inline bool checkowner_afsdb(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_afsdb(ARGS_CHECKNAMES) -{ +static inline bool +checknames_afsdb(ARGS_CHECKNAMES) { isc_region_t region; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_afsdb); @@ -307,8 +307,8 @@ static inline bool checknames_afsdb(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_afsdb(ARGS_COMPARE) -{ +static inline int +casecompare_afsdb(ARGS_COMPARE) { return (compare_afsdb(rdata1, rdata2)); } #endif /* RDATA_GENERIC_AFSDB_18_C */ diff --git a/lib/dns/rdata/generic/amtrelay_260.c b/lib/dns/rdata/generic/amtrelay_260.c index c69cd24c4d..e14215d5f7 100644 --- a/lib/dns/rdata/generic/amtrelay_260.c +++ b/lib/dns/rdata/generic/amtrelay_260.c @@ -18,16 +18,16 @@ #define RRTYPE_AMTRELAY_ATTRIBUTES (0) -static inline isc_result_t fromtext_amtrelay(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; - isc_buffer_t buffer; - unsigned int discovery; - unsigned int gateway; +static inline isc_result_t +fromtext_amtrelay(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; + isc_buffer_t buffer; + unsigned int discovery; + unsigned int gateway; struct in_addr addr; - unsigned char addr6[16]; - isc_region_t region; + unsigned char addr6[16]; + isc_region_t region; REQUIRE(type == dns_rdatatype_amtrelay); @@ -119,15 +119,15 @@ static inline isc_result_t fromtext_amtrelay(ARGS_FROMTEXT) } } -static inline isc_result_t totext_amtrelay(ARGS_TOTEXT) -{ - isc_region_t region; - dns_name_t name; - char buf[sizeof("0 255 ")]; +static inline isc_result_t +totext_amtrelay(ARGS_TOTEXT) { + isc_region_t region; + dns_name_t name; + char buf[sizeof("0 255 ")]; unsigned char precedence; unsigned char discovery; unsigned char gateway; - const char * space; + const char *space; UNUSED(tctx); @@ -182,9 +182,9 @@ static inline isc_result_t totext_amtrelay(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_amtrelay(ARGS_FROMWIRE) -{ - dns_name_t name; +static inline isc_result_t +fromwire_amtrelay(ARGS_FROMWIRE) { + dns_name_t name; isc_region_t region; REQUIRE(type == dns_rdatatype_amtrelay); @@ -234,8 +234,8 @@ static inline isc_result_t fromwire_amtrelay(ARGS_FROMWIRE) } } -static inline isc_result_t towire_amtrelay(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_amtrelay(ARGS_TOWIRE) { isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_amtrelay); @@ -247,8 +247,8 @@ static inline isc_result_t towire_amtrelay(ARGS_TOWIRE) return (mem_tobuffer(target, region.base, region.length)); } -static inline int compare_amtrelay(ARGS_COMPARE) -{ +static inline int +compare_amtrelay(ARGS_COMPARE) { isc_region_t region1; isc_region_t region2; @@ -264,11 +264,11 @@ static inline int compare_amtrelay(ARGS_COMPARE) return (isc_region_compare(®ion1, ®ion2)); } -static inline isc_result_t fromstruct_amtrelay(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_amtrelay(ARGS_FROMSTRUCT) { dns_rdata_amtrelay_t *amtrelay = source; - isc_region_t region; - uint32_t n; + isc_region_t region; + uint32_t n; REQUIRE(type == dns_rdatatype_amtrelay); REQUIRE(amtrelay != NULL); @@ -304,12 +304,12 @@ static inline isc_result_t fromstruct_amtrelay(ARGS_FROMSTRUCT) } } -static inline isc_result_t tostruct_amtrelay(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_amtrelay(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_amtrelay_t *amtrelay = target; - dns_name_t name; - uint32_t n; + dns_name_t name; + uint32_t n; REQUIRE(rdata->type == dns_rdatatype_amtrelay); REQUIRE(amtrelay != NULL); @@ -356,8 +356,8 @@ static inline isc_result_t tostruct_amtrelay(ARGS_TOSTRUCT) default: if (region.length != 0) { - amtrelay->data = - mem_maybedup(mctx, region.base, region.length); + amtrelay->data = mem_maybedup(mctx, region.base, + region.length); if (amtrelay->data == NULL) { return (ISC_R_NOMEMORY); } @@ -368,8 +368,8 @@ static inline isc_result_t tostruct_amtrelay(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_amtrelay(ARGS_FREESTRUCT) -{ +static inline void +freestruct_amtrelay(ARGS_FREESTRUCT) { dns_rdata_amtrelay_t *amtrelay = source; REQUIRE(amtrelay != NULL); @@ -390,8 +390,8 @@ static inline void freestruct_amtrelay(ARGS_FREESTRUCT) amtrelay->mctx = NULL; } -static inline isc_result_t additionaldata_amtrelay(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_amtrelay(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_amtrelay); UNUSED(rdata); @@ -401,8 +401,8 @@ static inline isc_result_t additionaldata_amtrelay(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_amtrelay(ARGS_DIGEST) -{ +static inline isc_result_t +digest_amtrelay(ARGS_DIGEST) { isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_amtrelay); @@ -411,8 +411,8 @@ static inline isc_result_t digest_amtrelay(ARGS_DIGEST) return ((digest)(arg, ®ion)); } -static inline bool checkowner_amtrelay(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_amtrelay(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_amtrelay); UNUSED(name); @@ -423,8 +423,8 @@ static inline bool checkowner_amtrelay(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_amtrelay(ARGS_CHECKNAMES) -{ +static inline bool +checknames_amtrelay(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_amtrelay); UNUSED(rdata); @@ -434,12 +434,12 @@ static inline bool checknames_amtrelay(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_amtrelay(ARGS_COMPARE) -{ +static inline int +casecompare_amtrelay(ARGS_COMPARE) { isc_region_t region1; isc_region_t region2; - dns_name_t name1; - dns_name_t name2; + dns_name_t name1; + dns_name_t name2; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); diff --git a/lib/dns/rdata/generic/avc_258.c b/lib/dns/rdata/generic/avc_258.c index 4167afc18f..d148ddba19 100644 --- a/lib/dns/rdata/generic/avc_258.c +++ b/lib/dns/rdata/generic/avc_258.c @@ -14,8 +14,8 @@ #define RRTYPE_AVC_ATTRIBUTES (0) -static inline isc_result_t fromtext_avc(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_avc(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_avc); UNUSED(type); @@ -28,8 +28,8 @@ static inline isc_result_t fromtext_avc(ARGS_FROMTEXT) target, callbacks)); } -static inline isc_result_t totext_avc(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_avc(ARGS_TOTEXT) { UNUSED(tctx); REQUIRE(rdata->type == dns_rdatatype_avc); @@ -37,8 +37,8 @@ static inline isc_result_t totext_avc(ARGS_TOTEXT) return (generic_totext_txt(rdata, tctx, target)); } -static inline isc_result_t fromwire_avc(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_avc(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_avc); UNUSED(type); @@ -50,8 +50,8 @@ static inline isc_result_t fromwire_avc(ARGS_FROMWIRE) target)); } -static inline isc_result_t towire_avc(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_avc(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_avc); UNUSED(cctx); @@ -59,8 +59,8 @@ static inline isc_result_t towire_avc(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_avc(ARGS_COMPARE) -{ +static inline int +compare_avc(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -73,15 +73,15 @@ static inline int compare_avc(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_avc(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_avc(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_avc); return (generic_fromstruct_txt(rdclass, type, source, target)); } -static inline isc_result_t tostruct_avc(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_avc(ARGS_TOSTRUCT) { dns_rdata_avc_t *avc = target; REQUIRE(rdata->type == dns_rdatatype_avc); @@ -94,8 +94,8 @@ static inline isc_result_t tostruct_avc(ARGS_TOSTRUCT) return (generic_tostruct_txt(rdata, target, mctx)); } -static inline void freestruct_avc(ARGS_FREESTRUCT) -{ +static inline void +freestruct_avc(ARGS_FREESTRUCT) { dns_rdata_avc_t *avc = source; REQUIRE(avc != NULL); @@ -104,8 +104,8 @@ static inline void freestruct_avc(ARGS_FREESTRUCT) generic_freestruct_txt(source); } -static inline isc_result_t additionaldata_avc(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_avc(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_avc); UNUSED(rdata); @@ -115,8 +115,8 @@ static inline isc_result_t additionaldata_avc(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_avc(ARGS_DIGEST) -{ +static inline isc_result_t +digest_avc(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_avc); @@ -126,8 +126,8 @@ static inline isc_result_t digest_avc(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_avc(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_avc(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_avc); UNUSED(name); @@ -138,8 +138,8 @@ static inline bool checkowner_avc(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_avc(ARGS_CHECKNAMES) -{ +static inline bool +checknames_avc(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_avc); UNUSED(rdata); @@ -149,8 +149,8 @@ static inline bool checknames_avc(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_avc(ARGS_COMPARE) -{ +static inline int +casecompare_avc(ARGS_COMPARE) { return (compare_avc(rdata1, rdata2)); } #endif /* RDATA_GENERIC_AVC_258_C */ diff --git a/lib/dns/rdata/generic/caa_257.c b/lib/dns/rdata/generic/caa_257.c index fe70ffeed9..144276d598 100644 --- a/lib/dns/rdata/generic/caa_257.c +++ b/lib/dns/rdata/generic/caa_257.c @@ -273,12 +273,12 @@ static unsigned char const alphanumeric[256] = { 0, }; -static inline isc_result_t fromtext_caa(ARGS_FROMTEXT) -{ - isc_token_t token; +static inline isc_result_t +fromtext_caa(ARGS_FROMTEXT) { + isc_token_t token; isc_textregion_t tr; - uint8_t flags; - unsigned int i; + uint8_t flags; + unsigned int i; REQUIRE(type == dns_rdatatype_caa); @@ -324,11 +324,11 @@ static inline isc_result_t fromtext_caa(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_caa(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_caa(ARGS_TOTEXT) { isc_region_t region; - uint8_t flags; - char buf[256]; + uint8_t flags; + char buf[256]; UNUSED(tctx); @@ -358,8 +358,8 @@ static inline isc_result_t totext_caa(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_caa(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_caa(ARGS_FROMWIRE) { isc_region_t sr; unsigned int len, i; @@ -409,8 +409,8 @@ static inline isc_result_t fromwire_caa(ARGS_FROMWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline isc_result_t towire_caa(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_caa(ARGS_TOWIRE) { isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_caa); @@ -423,8 +423,8 @@ static inline isc_result_t towire_caa(ARGS_TOWIRE) return (mem_tobuffer(target, region.base, region.length)); } -static inline int compare_caa(ARGS_COMPARE) -{ +static inline int +compare_caa(ARGS_COMPARE) { isc_region_t r1, r2; REQUIRE(rdata1->type == rdata2->type); @@ -440,11 +440,11 @@ static inline int compare_caa(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_caa(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_caa(ARGS_FROMSTRUCT) { dns_rdata_caa_t *caa = source; - isc_region_t region; - unsigned int i; + isc_region_t region; + unsigned int i; REQUIRE(type == dns_rdatatype_caa); REQUIRE(caa != NULL); @@ -486,10 +486,10 @@ static inline isc_result_t fromstruct_caa(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_caa(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_caa(ARGS_TOSTRUCT) { dns_rdata_caa_t *caa = target; - isc_region_t sr; + isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_caa); REQUIRE(caa != NULL); @@ -545,8 +545,8 @@ static inline isc_result_t tostruct_caa(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_caa(ARGS_FREESTRUCT) -{ +static inline void +freestruct_caa(ARGS_FREESTRUCT) { dns_rdata_caa_t *caa = (dns_rdata_caa_t *)source; REQUIRE(caa != NULL); @@ -565,8 +565,8 @@ static inline void freestruct_caa(ARGS_FREESTRUCT) caa->mctx = NULL; } -static inline isc_result_t additionaldata_caa(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_caa(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_caa); REQUIRE(rdata->data != NULL); REQUIRE(rdata->length >= 3U); @@ -578,8 +578,8 @@ static inline isc_result_t additionaldata_caa(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_caa(ARGS_DIGEST) -{ +static inline isc_result_t +digest_caa(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_caa); @@ -591,8 +591,8 @@ static inline isc_result_t digest_caa(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_caa(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_caa(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_caa); UNUSED(name); @@ -603,8 +603,8 @@ static inline bool checkowner_caa(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_caa(ARGS_CHECKNAMES) -{ +static inline bool +checknames_caa(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_caa); REQUIRE(rdata->data != NULL); REQUIRE(rdata->length >= 3U); @@ -616,8 +616,8 @@ static inline bool checknames_caa(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_caa(ARGS_COMPARE) -{ +static inline int +casecompare_caa(ARGS_COMPARE) { return (compare_caa(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/cdnskey_60.c b/lib/dns/rdata/generic/cdnskey_60.c index 4919e9909f..fbcb402168 100644 --- a/lib/dns/rdata/generic/cdnskey_60.c +++ b/lib/dns/rdata/generic/cdnskey_60.c @@ -18,32 +18,32 @@ #define RRTYPE_CDNSKEY_ATTRIBUTES 0 -static inline isc_result_t fromtext_cdnskey(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_cdnskey(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_cdnskey); return (generic_fromtext_key(rdclass, type, lexer, origin, options, target, callbacks)); } -static inline isc_result_t totext_cdnskey(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_cdnskey(ARGS_TOTEXT) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_cdnskey); return (generic_totext_key(rdata, tctx, target)); } -static inline isc_result_t fromwire_cdnskey(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_cdnskey(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_cdnskey); return (generic_fromwire_key(rdclass, type, source, dctx, options, target)); } -static inline isc_result_t towire_cdnskey(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_cdnskey(ARGS_TOWIRE) { isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_cdnskey); @@ -55,8 +55,8 @@ static inline isc_result_t towire_cdnskey(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_cdnskey(ARGS_COMPARE) -{ +static inline int +compare_cdnskey(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -73,15 +73,15 @@ static inline int compare_cdnskey(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_cdnskey(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_cdnskey(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_cdnskey); return (generic_fromstruct_key(rdclass, type, source, target)); } -static inline isc_result_t tostruct_cdnskey(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_cdnskey(ARGS_TOSTRUCT) { dns_rdata_cdnskey_t *dnskey = target; REQUIRE(dnskey != NULL); @@ -95,8 +95,8 @@ static inline isc_result_t tostruct_cdnskey(ARGS_TOSTRUCT) return (generic_tostruct_key(rdata, target, mctx)); } -static inline void freestruct_cdnskey(ARGS_FREESTRUCT) -{ +static inline void +freestruct_cdnskey(ARGS_FREESTRUCT) { dns_rdata_cdnskey_t *dnskey = (dns_rdata_cdnskey_t *)source; REQUIRE(dnskey != NULL); @@ -105,8 +105,8 @@ static inline void freestruct_cdnskey(ARGS_FREESTRUCT) generic_freestruct_key(source); } -static inline isc_result_t additionaldata_cdnskey(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_cdnskey(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_cdnskey); UNUSED(rdata); @@ -116,8 +116,8 @@ static inline isc_result_t additionaldata_cdnskey(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_cdnskey(ARGS_DIGEST) -{ +static inline isc_result_t +digest_cdnskey(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata != NULL); @@ -128,8 +128,8 @@ static inline isc_result_t digest_cdnskey(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_cdnskey(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_cdnskey(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_cdnskey); UNUSED(name); @@ -140,8 +140,8 @@ static inline bool checkowner_cdnskey(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_cdnskey(ARGS_CHECKNAMES) -{ +static inline bool +checknames_cdnskey(ARGS_CHECKNAMES) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_cdnskey); @@ -152,8 +152,8 @@ static inline bool checknames_cdnskey(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_cdnskey(ARGS_COMPARE) -{ +static inline int +casecompare_cdnskey(ARGS_COMPARE) { /* * Treat ALG 253 (private DNS) subtype name case sensistively. */ diff --git a/lib/dns/rdata/generic/cds_59.c b/lib/dns/rdata/generic/cds_59.c index 3e47066801..47f90777bf 100644 --- a/lib/dns/rdata/generic/cds_59.c +++ b/lib/dns/rdata/generic/cds_59.c @@ -18,31 +18,31 @@ #include -static inline isc_result_t fromtext_cds(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_cds(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_cds); return (generic_fromtext_ds(rdclass, type, lexer, origin, options, target, callbacks)); } -static inline isc_result_t totext_cds(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_cds(ARGS_TOTEXT) { REQUIRE(rdata->type == dns_rdatatype_cds); return (generic_totext_ds(rdata, tctx, target)); } -static inline isc_result_t fromwire_cds(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_cds(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_cds); return (generic_fromwire_ds(rdclass, type, source, dctx, options, target)); } -static inline isc_result_t towire_cds(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_cds(ARGS_TOWIRE) { isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_cds); @@ -54,8 +54,8 @@ static inline isc_result_t towire_cds(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_cds(ARGS_COMPARE) -{ +static inline int +compare_cds(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -70,15 +70,15 @@ static inline int compare_cds(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_cds(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_cds(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_cds); return (generic_fromstruct_ds(rdclass, type, source, target)); } -static inline isc_result_t tostruct_cds(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_cds(ARGS_TOSTRUCT) { dns_rdata_cds_t *cds = target; REQUIRE(rdata->type == dns_rdatatype_cds); @@ -95,8 +95,8 @@ static inline isc_result_t tostruct_cds(ARGS_TOSTRUCT) return (generic_tostruct_ds(rdata, target, mctx)); } -static inline void freestruct_cds(ARGS_FREESTRUCT) -{ +static inline void +freestruct_cds(ARGS_FREESTRUCT) { dns_rdata_cds_t *cds = source; REQUIRE(cds != NULL); @@ -112,8 +112,8 @@ static inline void freestruct_cds(ARGS_FREESTRUCT) cds->mctx = NULL; } -static inline isc_result_t additionaldata_cds(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_cds(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_cds); UNUSED(rdata); @@ -123,8 +123,8 @@ static inline isc_result_t additionaldata_cds(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_cds(ARGS_DIGEST) -{ +static inline isc_result_t +digest_cds(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_cds); @@ -134,8 +134,8 @@ static inline isc_result_t digest_cds(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_cds(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_cds(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_cds); UNUSED(name); @@ -146,8 +146,8 @@ static inline bool checkowner_cds(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_cds(ARGS_CHECKNAMES) -{ +static inline bool +checknames_cds(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_cds); UNUSED(rdata); @@ -157,8 +157,8 @@ static inline bool checknames_cds(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_cds(ARGS_COMPARE) -{ +static inline int +casecompare_cds(ARGS_COMPARE) { return (compare_cds(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c index d39eda0b6b..fedba9034f 100644 --- a/lib/dns/rdata/generic/cert_37.c +++ b/lib/dns/rdata/generic/cert_37.c @@ -16,11 +16,11 @@ #define RRTYPE_CERT_ATTRIBUTES (0) -static inline isc_result_t fromtext_cert(ARGS_FROMTEXT) -{ - isc_token_t token; +static inline isc_result_t +fromtext_cert(ARGS_FROMTEXT) { + isc_token_t token; dns_secalg_t secalg; - dns_cert_t cert; + dns_cert_t cert; REQUIRE(type == dns_rdatatype_cert); @@ -59,10 +59,10 @@ static inline isc_result_t fromtext_cert(ARGS_FROMTEXT) return (isc_base64_tobuffer(lexer, target, -2)); } -static inline isc_result_t totext_cert(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_cert(ARGS_TOTEXT) { isc_region_t sr; - char buf[sizeof("64000 ")]; + char buf[sizeof("64000 ")]; unsigned int n; REQUIRE(rdata->type == dns_rdatatype_cert); @@ -113,8 +113,8 @@ static inline isc_result_t totext_cert(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_cert(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_cert(ARGS_FROMWIRE) { isc_region_t sr; REQUIRE(type == dns_rdatatype_cert); @@ -133,8 +133,8 @@ static inline isc_result_t fromwire_cert(ARGS_FROMWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline isc_result_t towire_cert(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_cert(ARGS_TOWIRE) { isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_cert); @@ -146,8 +146,8 @@ static inline isc_result_t towire_cert(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_cert(ARGS_COMPARE) -{ +static inline int +compare_cert(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -162,8 +162,8 @@ static inline int compare_cert(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_cert(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_cert(ARGS_FROMSTRUCT) { dns_rdata_cert_t *cert = source; REQUIRE(type == dns_rdatatype_cert); @@ -181,10 +181,10 @@ static inline isc_result_t fromstruct_cert(ARGS_FROMSTRUCT) return (mem_tobuffer(target, cert->certificate, cert->length)); } -static inline isc_result_t tostruct_cert(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_cert(ARGS_TOSTRUCT) { dns_rdata_cert_t *cert = target; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_cert); REQUIRE(cert != NULL); @@ -213,8 +213,8 @@ static inline isc_result_t tostruct_cert(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_cert(ARGS_FREESTRUCT) -{ +static inline void +freestruct_cert(ARGS_FREESTRUCT) { dns_rdata_cert_t *cert = source; REQUIRE(cert != NULL); @@ -230,8 +230,8 @@ static inline void freestruct_cert(ARGS_FREESTRUCT) cert->mctx = NULL; } -static inline isc_result_t additionaldata_cert(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_cert(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_cert); UNUSED(rdata); @@ -241,8 +241,8 @@ static inline isc_result_t additionaldata_cert(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_cert(ARGS_DIGEST) -{ +static inline isc_result_t +digest_cert(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_cert); @@ -252,8 +252,8 @@ static inline isc_result_t digest_cert(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_cert(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_cert(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_cert); UNUSED(name); @@ -264,8 +264,8 @@ static inline bool checkowner_cert(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_cert(ARGS_CHECKNAMES) -{ +static inline bool +checknames_cert(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_cert); UNUSED(rdata); @@ -275,8 +275,8 @@ static inline bool checknames_cert(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_cert(ARGS_COMPARE) -{ +static inline int +casecompare_cert(ARGS_COMPARE) { return (compare_cert(rdata1, rdata2)); } #endif /* RDATA_GENERIC_CERT_37_C */ diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c index 6ec523b4b2..a3548b25a8 100644 --- a/lib/dns/rdata/generic/cname_5.c +++ b/lib/dns/rdata/generic/cname_5.c @@ -15,10 +15,10 @@ #define RRTYPE_CNAME_ATTRIBUTES \ (DNS_RDATATYPEATTR_EXCLUSIVE | DNS_RDATATYPEATTR_SINGLETON) -static inline isc_result_t fromtext_cname(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_cname(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; REQUIRE(type == dns_rdatatype_cname); @@ -39,12 +39,12 @@ static inline isc_result_t fromtext_cname(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_cname(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_cname(ARGS_TOTEXT) { isc_region_t region; - dns_name_t name; - dns_name_t prefix; - bool sub; + dns_name_t name; + dns_name_t prefix; + bool sub; REQUIRE(rdata->type == dns_rdatatype_cname); REQUIRE(rdata->length != 0); @@ -60,8 +60,8 @@ static inline isc_result_t totext_cname(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_cname(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_cname(ARGS_FROMWIRE) { dns_name_t name; REQUIRE(type == dns_rdatatype_cname); @@ -75,11 +75,11 @@ static inline isc_result_t fromwire_cname(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_cname(ARGS_TOWIRE) -{ - dns_name_t name; +static inline isc_result_t +towire_cname(ARGS_TOWIRE) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_cname); REQUIRE(rdata->length != 0); @@ -93,10 +93,10 @@ static inline isc_result_t towire_cname(ARGS_TOWIRE) return (dns_name_towire(&name, cctx, target)); } -static inline int compare_cname(ARGS_COMPARE) -{ - dns_name_t name1; - dns_name_t name2; +static inline int +compare_cname(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; @@ -118,10 +118,10 @@ static inline int compare_cname(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_cname(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_cname(ARGS_FROMSTRUCT) { dns_rdata_cname_t *cname = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_cname); REQUIRE(cname != NULL); @@ -135,11 +135,11 @@ static inline isc_result_t fromstruct_cname(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_cname(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_cname(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_cname_t *cname = target; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_cname); REQUIRE(cname != NULL); @@ -158,8 +158,8 @@ static inline isc_result_t tostruct_cname(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_cname(ARGS_FREESTRUCT) -{ +static inline void +freestruct_cname(ARGS_FREESTRUCT) { dns_rdata_cname_t *cname = source; REQUIRE(cname != NULL); @@ -172,8 +172,8 @@ static inline void freestruct_cname(ARGS_FREESTRUCT) cname->mctx = NULL; } -static inline isc_result_t additionaldata_cname(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_cname(ARGS_ADDLDATA) { UNUSED(rdata); UNUSED(add); UNUSED(arg); @@ -183,10 +183,10 @@ static inline isc_result_t additionaldata_cname(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_cname(ARGS_DIGEST) -{ +static inline isc_result_t +digest_cname(ARGS_DIGEST) { isc_region_t r; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_cname); @@ -197,8 +197,8 @@ static inline isc_result_t digest_cname(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_cname(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_cname(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_cname); UNUSED(name); @@ -209,8 +209,8 @@ static inline bool checkowner_cname(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_cname(ARGS_CHECKNAMES) -{ +static inline bool +checknames_cname(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_cname); UNUSED(rdata); @@ -220,8 +220,8 @@ static inline bool checknames_cname(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_cname(ARGS_COMPARE) -{ +static inline int +casecompare_cname(ARGS_COMPARE) { return (compare_cname(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/csync_62.c b/lib/dns/rdata/generic/csync_62.c index 637a9581c4..7441eaba5d 100644 --- a/lib/dns/rdata/generic/csync_62.c +++ b/lib/dns/rdata/generic/csync_62.c @@ -16,8 +16,8 @@ #define RRTYPE_CSYNC_ATTRIBUTES 0 -static inline isc_result_t fromtext_csync(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_csync(ARGS_FROMTEXT) { isc_token_t token; REQUIRE(type == dns_rdatatype_csync); @@ -45,11 +45,11 @@ static inline isc_result_t fromtext_csync(ARGS_FROMTEXT) return (typemap_fromtext(lexer, target, true)); } -static inline isc_result_t totext_csync(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_csync(ARGS_TOTEXT) { unsigned long num; - char buf[sizeof("0123456789")]; /* Also TYPE65535 */ - isc_region_t sr; + char buf[sizeof("0123456789")]; /* Also TYPE65535 */ + isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_csync); REQUIRE(rdata->length >= 6); @@ -79,8 +79,8 @@ static inline isc_result_t totext_csync(ARGS_TOTEXT) return (typemap_totext(&sr, NULL, target)); } -static /* inline */ isc_result_t fromwire_csync(ARGS_FROMWIRE) -{ +static /* inline */ isc_result_t +fromwire_csync(ARGS_FROMWIRE) { isc_region_t sr; REQUIRE(type == dns_rdatatype_csync); @@ -109,8 +109,8 @@ static /* inline */ isc_result_t fromwire_csync(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_csync(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_csync(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_csync); REQUIRE(rdata->length >= 6); @@ -119,8 +119,8 @@ static inline isc_result_t towire_csync(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_csync(ARGS_COMPARE) -{ +static inline int +compare_csync(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -135,10 +135,10 @@ static inline int compare_csync(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_csync(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_csync(ARGS_FROMSTRUCT) { dns_rdata_csync_t *csync = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_csync); REQUIRE(csync != NULL); @@ -158,9 +158,9 @@ static inline isc_result_t fromstruct_csync(ARGS_FROMSTRUCT) return (mem_tobuffer(target, csync->typebits, csync->len)); } -static inline isc_result_t tostruct_csync(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_csync(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_csync_t *csync = target; REQUIRE(rdata->type == dns_rdatatype_csync); @@ -192,8 +192,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_csync(ARGS_FREESTRUCT) -{ +static inline void +freestruct_csync(ARGS_FREESTRUCT) { dns_rdata_csync_t *csync = source; REQUIRE(csync != NULL); @@ -209,8 +209,8 @@ static inline void freestruct_csync(ARGS_FREESTRUCT) csync->mctx = NULL; } -static inline isc_result_t additionaldata_csync(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_csync(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_csync); UNUSED(rdata); @@ -220,8 +220,8 @@ static inline isc_result_t additionaldata_csync(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_csync(ARGS_DIGEST) -{ +static inline isc_result_t +digest_csync(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_csync); @@ -230,8 +230,8 @@ static inline isc_result_t digest_csync(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_csync(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_csync(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_csync); UNUSED(name); @@ -242,8 +242,8 @@ static inline bool checkowner_csync(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_csync(ARGS_CHECKNAMES) -{ +static inline bool +checknames_csync(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_csync); UNUSED(rdata); @@ -253,8 +253,8 @@ static inline bool checknames_csync(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_csync(ARGS_COMPARE) -{ +static inline int +casecompare_csync(ARGS_COMPARE) { isc_region_t region1; isc_region_t region2; diff --git a/lib/dns/rdata/generic/dlv_32769.c b/lib/dns/rdata/generic/dlv_32769.c index e24f8aaa43..f6bfcc94cc 100644 --- a/lib/dns/rdata/generic/dlv_32769.c +++ b/lib/dns/rdata/generic/dlv_32769.c @@ -18,31 +18,31 @@ #include -static inline isc_result_t fromtext_dlv(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_dlv(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_dlv); return (generic_fromtext_ds(rdclass, type, lexer, origin, options, target, callbacks)); } -static inline isc_result_t totext_dlv(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_dlv(ARGS_TOTEXT) { REQUIRE(rdata->type == dns_rdatatype_dlv); return (generic_totext_ds(rdata, tctx, target)); } -static inline isc_result_t fromwire_dlv(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_dlv(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_dlv); return (generic_fromwire_ds(rdclass, type, source, dctx, options, target)); } -static inline isc_result_t towire_dlv(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_dlv(ARGS_TOWIRE) { isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_dlv); @@ -54,8 +54,8 @@ static inline isc_result_t towire_dlv(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_dlv(ARGS_COMPARE) -{ +static inline int +compare_dlv(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -70,15 +70,15 @@ static inline int compare_dlv(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_dlv(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_dlv(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_dlv); return (generic_fromstruct_ds(rdclass, type, source, target)); } -static inline isc_result_t tostruct_dlv(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_dlv(ARGS_TOSTRUCT) { dns_rdata_dlv_t *dlv = target; REQUIRE(rdata->type == dns_rdatatype_dlv); @@ -91,8 +91,8 @@ static inline isc_result_t tostruct_dlv(ARGS_TOSTRUCT) return (generic_tostruct_ds(rdata, target, mctx)); } -static inline void freestruct_dlv(ARGS_FREESTRUCT) -{ +static inline void +freestruct_dlv(ARGS_FREESTRUCT) { dns_rdata_dlv_t *dlv = source; REQUIRE(dlv != NULL); @@ -108,8 +108,8 @@ static inline void freestruct_dlv(ARGS_FREESTRUCT) dlv->mctx = NULL; } -static inline isc_result_t additionaldata_dlv(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_dlv(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_dlv); UNUSED(rdata); @@ -119,8 +119,8 @@ static inline isc_result_t additionaldata_dlv(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_dlv(ARGS_DIGEST) -{ +static inline isc_result_t +digest_dlv(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_dlv); @@ -130,8 +130,8 @@ static inline isc_result_t digest_dlv(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_dlv(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_dlv(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_dlv); UNUSED(name); @@ -142,8 +142,8 @@ static inline bool checkowner_dlv(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_dlv(ARGS_CHECKNAMES) -{ +static inline bool +checknames_dlv(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_dlv); UNUSED(rdata); @@ -153,8 +153,8 @@ static inline bool checknames_dlv(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_dlv(ARGS_COMPARE) -{ +static inline int +casecompare_dlv(ARGS_COMPARE) { return (compare_dlv(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c index a667d896c3..4a58aef16a 100644 --- a/lib/dns/rdata/generic/dname_39.c +++ b/lib/dns/rdata/generic/dname_39.c @@ -16,10 +16,10 @@ #define RRTYPE_DNAME_ATTRIBUTES (DNS_RDATATYPEATTR_SINGLETON) -static inline isc_result_t fromtext_dname(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_dname(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; REQUIRE(type == dns_rdatatype_dname); @@ -40,12 +40,12 @@ static inline isc_result_t fromtext_dname(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_dname(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_dname(ARGS_TOTEXT) { isc_region_t region; - dns_name_t name; - dns_name_t prefix; - bool sub; + dns_name_t name; + dns_name_t prefix; + bool sub; REQUIRE(rdata->type == dns_rdatatype_dname); REQUIRE(rdata->length != 0); @@ -61,8 +61,8 @@ static inline isc_result_t totext_dname(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_dname(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_dname(ARGS_FROMWIRE) { dns_name_t name; REQUIRE(type == dns_rdatatype_dname); @@ -76,11 +76,11 @@ static inline isc_result_t fromwire_dname(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_dname(ARGS_TOWIRE) -{ - dns_name_t name; +static inline isc_result_t +towire_dname(ARGS_TOWIRE) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_dname); REQUIRE(rdata->length != 0); @@ -93,10 +93,10 @@ static inline isc_result_t towire_dname(ARGS_TOWIRE) return (dns_name_towire(&name, cctx, target)); } -static inline int compare_dname(ARGS_COMPARE) -{ - dns_name_t name1; - dns_name_t name2; +static inline int +compare_dname(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; @@ -118,10 +118,10 @@ static inline int compare_dname(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_dname(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_dname(ARGS_FROMSTRUCT) { dns_rdata_dname_t *dname = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_dname); REQUIRE(dname != NULL); @@ -135,11 +135,11 @@ static inline isc_result_t fromstruct_dname(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_dname(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_dname(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_dname_t *dname = target; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_dname); REQUIRE(dname != NULL); @@ -158,8 +158,8 @@ static inline isc_result_t tostruct_dname(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_dname(ARGS_FREESTRUCT) -{ +static inline void +freestruct_dname(ARGS_FREESTRUCT) { dns_rdata_dname_t *dname = source; REQUIRE(dname != NULL); @@ -173,8 +173,8 @@ static inline void freestruct_dname(ARGS_FREESTRUCT) dname->mctx = NULL; } -static inline isc_result_t additionaldata_dname(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_dname(ARGS_ADDLDATA) { UNUSED(rdata); UNUSED(add); UNUSED(arg); @@ -184,10 +184,10 @@ static inline isc_result_t additionaldata_dname(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_dname(ARGS_DIGEST) -{ +static inline isc_result_t +digest_dname(ARGS_DIGEST) { isc_region_t r; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_dname); @@ -198,8 +198,8 @@ static inline isc_result_t digest_dname(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_dname(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_dname(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_dname); UNUSED(name); @@ -210,8 +210,8 @@ static inline bool checkowner_dname(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_dname(ARGS_CHECKNAMES) -{ +static inline bool +checknames_dname(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_dname); UNUSED(rdata); @@ -221,8 +221,8 @@ static inline bool checknames_dname(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_dname(ARGS_COMPARE) -{ +static inline int +casecompare_dname(ARGS_COMPARE) { return (compare_dname(rdata1, rdata2)); } #endif /* RDATA_GENERIC_DNAME_39_C */ diff --git a/lib/dns/rdata/generic/dnskey_48.c b/lib/dns/rdata/generic/dnskey_48.c index ed307eaa68..12007e08a6 100644 --- a/lib/dns/rdata/generic/dnskey_48.c +++ b/lib/dns/rdata/generic/dnskey_48.c @@ -18,32 +18,32 @@ #define RRTYPE_DNSKEY_ATTRIBUTES (DNS_RDATATYPEATTR_DNSSEC) -static inline isc_result_t fromtext_dnskey(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_dnskey(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_dnskey); return (generic_fromtext_key(rdclass, type, lexer, origin, options, target, callbacks)); } -static inline isc_result_t totext_dnskey(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_dnskey(ARGS_TOTEXT) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_dnskey); return (generic_totext_key(rdata, tctx, target)); } -static inline isc_result_t fromwire_dnskey(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_dnskey(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_dnskey); return (generic_fromwire_key(rdclass, type, source, dctx, options, target)); } -static inline isc_result_t towire_dnskey(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_dnskey(ARGS_TOWIRE) { isc_region_t sr; REQUIRE(rdata != NULL); @@ -56,8 +56,8 @@ static inline isc_result_t towire_dnskey(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_dnskey(ARGS_COMPARE) -{ +static inline int +compare_dnskey(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -74,15 +74,15 @@ static inline int compare_dnskey(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_dnskey(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_dnskey(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_dnskey); return (generic_fromstruct_key(rdclass, type, source, target)); } -static inline isc_result_t tostruct_dnskey(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_dnskey(ARGS_TOSTRUCT) { dns_rdata_dnskey_t *dnskey = target; REQUIRE(dnskey != NULL); @@ -96,8 +96,8 @@ static inline isc_result_t tostruct_dnskey(ARGS_TOSTRUCT) return (generic_tostruct_key(rdata, target, mctx)); } -static inline void freestruct_dnskey(ARGS_FREESTRUCT) -{ +static inline void +freestruct_dnskey(ARGS_FREESTRUCT) { dns_rdata_dnskey_t *dnskey = (dns_rdata_dnskey_t *)source; REQUIRE(dnskey != NULL); @@ -106,8 +106,8 @@ static inline void freestruct_dnskey(ARGS_FREESTRUCT) generic_freestruct_key(source); } -static inline isc_result_t additionaldata_dnskey(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_dnskey(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_dnskey); UNUSED(rdata); @@ -117,8 +117,8 @@ static inline isc_result_t additionaldata_dnskey(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_dnskey(ARGS_DIGEST) -{ +static inline isc_result_t +digest_dnskey(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata != NULL); @@ -129,8 +129,8 @@ static inline isc_result_t digest_dnskey(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_dnskey(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_dnskey(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_dnskey); UNUSED(name); @@ -141,8 +141,8 @@ static inline bool checkowner_dnskey(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_dnskey(ARGS_CHECKNAMES) -{ +static inline bool +checknames_dnskey(ARGS_CHECKNAMES) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_dnskey); @@ -153,8 +153,8 @@ static inline bool checknames_dnskey(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_dnskey(ARGS_COMPARE) -{ +static inline int +casecompare_dnskey(ARGS_COMPARE) { /* * Treat ALG 253 (private DNS) subtype name case sensistively. */ diff --git a/lib/dns/rdata/generic/doa_259.c b/lib/dns/rdata/generic/doa_259.c index 177eae40ce..c892e80ae1 100644 --- a/lib/dns/rdata/generic/doa_259.c +++ b/lib/dns/rdata/generic/doa_259.c @@ -14,8 +14,8 @@ #define RRTYPE_DOA_ATTRIBUTES (0) -static inline isc_result_t fromtext_doa(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_doa(ARGS_FROMTEXT) { isc_token_t token; REQUIRE(type == dns_rdatatype_doa); @@ -69,11 +69,11 @@ static inline isc_result_t fromtext_doa(ARGS_FROMTEXT) } } -static inline isc_result_t totext_doa(ARGS_TOTEXT) -{ - char buf[sizeof("4294967295 ")]; +static inline isc_result_t +totext_doa(ARGS_TOTEXT) { + char buf[sizeof("4294967295 ")]; isc_region_t region; - uint32_t n; + uint32_t n; REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_doa); @@ -123,8 +123,8 @@ static inline isc_result_t totext_doa(ARGS_TOTEXT) } } -static inline isc_result_t fromwire_doa(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_doa(ARGS_FROMWIRE) { isc_region_t region; UNUSED(rdclass); @@ -154,8 +154,8 @@ static inline isc_result_t fromwire_doa(ARGS_FROMWIRE) return (mem_tobuffer(target, region.base, region.length)); } -static inline isc_result_t towire_doa(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_doa(ARGS_TOWIRE) { isc_region_t region; UNUSED(cctx); @@ -168,8 +168,8 @@ static inline isc_result_t towire_doa(ARGS_TOWIRE) return (mem_tobuffer(target, region.base, region.length)); } -static inline int compare_doa(ARGS_COMPARE) -{ +static inline int +compare_doa(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -186,8 +186,8 @@ static inline int compare_doa(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_doa(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_doa(ARGS_FROMSTRUCT) { dns_rdata_doa_t *doa = source; REQUIRE(type == dns_rdatatype_doa); @@ -203,10 +203,10 @@ static inline isc_result_t fromstruct_doa(ARGS_FROMSTRUCT) return (mem_tobuffer(target, doa->data, doa->data_len)); } -static inline isc_result_t tostruct_doa(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_doa(ARGS_TOSTRUCT) { dns_rdata_doa_t *doa = target; - isc_region_t region; + isc_region_t region; REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_doa); @@ -285,8 +285,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_doa(ARGS_FREESTRUCT) -{ +static inline void +freestruct_doa(ARGS_FREESTRUCT) { dns_rdata_doa_t *doa = source; REQUIRE(doa != NULL); @@ -306,8 +306,8 @@ static inline void freestruct_doa(ARGS_FREESTRUCT) doa->mctx = NULL; } -static inline isc_result_t additionaldata_doa(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_doa(ARGS_ADDLDATA) { UNUSED(rdata); UNUSED(add); UNUSED(arg); @@ -317,8 +317,8 @@ static inline isc_result_t additionaldata_doa(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_doa(ARGS_DIGEST) -{ +static inline isc_result_t +digest_doa(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_doa); @@ -328,8 +328,8 @@ static inline isc_result_t digest_doa(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_doa(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_doa(ARGS_CHECKOWNER) { UNUSED(name); UNUSED(type); UNUSED(rdclass); @@ -340,8 +340,8 @@ static inline bool checkowner_doa(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_doa(ARGS_CHECKNAMES) -{ +static inline bool +checknames_doa(ARGS_CHECKNAMES) { UNUSED(rdata); UNUSED(owner); UNUSED(bad); @@ -351,8 +351,8 @@ static inline bool checknames_doa(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_doa(ARGS_COMPARE) -{ +static inline int +casecompare_doa(ARGS_COMPARE) { return (compare_doa(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/ds_43.c b/lib/dns/rdata/generic/ds_43.c index 04165b2604..047e82a768 100644 --- a/lib/dns/rdata/generic/ds_43.c +++ b/lib/dns/rdata/generic/ds_43.c @@ -22,11 +22,11 @@ #include -static inline isc_result_t generic_fromtext_ds(ARGS_FROMTEXT) -{ - isc_token_t token; +static inline isc_result_t +generic_fromtext_ds(ARGS_FROMTEXT) { + isc_token_t token; unsigned char c; - int length; + int length; UNUSED(type); UNUSED(rdclass); @@ -80,18 +80,18 @@ static inline isc_result_t generic_fromtext_ds(ARGS_FROMTEXT) return (isc_hex_tobuffer(lexer, target, length)); } -static inline isc_result_t fromtext_ds(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_ds(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_ds); return (generic_fromtext_ds(rdclass, type, lexer, origin, options, target, callbacks)); } -static inline isc_result_t generic_totext_ds(ARGS_TOTEXT) -{ +static inline isc_result_t +generic_totext_ds(ARGS_TOTEXT) { isc_region_t sr; - char buf[sizeof("64000 ")]; + char buf[sizeof("64000 ")]; unsigned int n; REQUIRE(rdata->length != 0); @@ -147,15 +147,15 @@ static inline isc_result_t generic_totext_ds(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_ds(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_ds(ARGS_TOTEXT) { REQUIRE(rdata->type == dns_rdatatype_ds); return (generic_totext_ds(rdata, tctx, target)); } -static inline isc_result_t generic_fromwire_ds(ARGS_FROMWIRE) -{ +static inline isc_result_t +generic_fromwire_ds(ARGS_FROMWIRE) { isc_region_t sr; UNUSED(type); @@ -174,7 +174,8 @@ static inline isc_result_t generic_fromwire_ds(ARGS_FROMWIRE) (sr.base[3] == DNS_DSDIGEST_SHA256 && sr.length < 4 + ISC_SHA256_DIGESTLENGTH) || (sr.base[3] == DNS_DSDIGEST_SHA384 && - sr.length < 4 + ISC_SHA384_DIGESTLENGTH)) { + sr.length < 4 + ISC_SHA384_DIGESTLENGTH)) + { return (ISC_R_UNEXPECTEDEND); } @@ -195,16 +196,16 @@ static inline isc_result_t generic_fromwire_ds(ARGS_FROMWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline isc_result_t fromwire_ds(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_ds(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_ds); return (generic_fromwire_ds(rdclass, type, source, dctx, options, target)); } -static inline isc_result_t towire_ds(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_ds(ARGS_TOWIRE) { isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_ds); @@ -216,8 +217,8 @@ static inline isc_result_t towire_ds(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_ds(ARGS_COMPARE) -{ +static inline int +compare_ds(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -232,8 +233,8 @@ static inline int compare_ds(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t generic_fromstruct_ds(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +generic_fromstruct_ds(ARGS_FROMSTRUCT) { dns_rdata_ds_t *ds = source; REQUIRE(ds != NULL); @@ -262,17 +263,17 @@ static inline isc_result_t generic_fromstruct_ds(ARGS_FROMSTRUCT) return (mem_tobuffer(target, ds->digest, ds->length)); } -static inline isc_result_t fromstruct_ds(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_ds(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_ds); return (generic_fromstruct_ds(rdclass, type, source, target)); } -static inline isc_result_t generic_tostruct_ds(ARGS_TOSTRUCT) -{ +static inline isc_result_t +generic_tostruct_ds(ARGS_TOSTRUCT) { dns_rdata_ds_t *ds = target; - isc_region_t region; + isc_region_t region; REQUIRE(ds != NULL); REQUIRE(rdata->length != 0); @@ -299,8 +300,8 @@ static inline isc_result_t generic_tostruct_ds(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline isc_result_t tostruct_ds(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_ds(ARGS_TOSTRUCT) { dns_rdata_ds_t *ds = target; REQUIRE(rdata->type == dns_rdatatype_ds); @@ -313,8 +314,8 @@ static inline isc_result_t tostruct_ds(ARGS_TOSTRUCT) return (generic_tostruct_ds(rdata, target, mctx)); } -static inline void freestruct_ds(ARGS_FREESTRUCT) -{ +static inline void +freestruct_ds(ARGS_FREESTRUCT) { dns_rdata_ds_t *ds = source; REQUIRE(ds != NULL); @@ -330,8 +331,8 @@ static inline void freestruct_ds(ARGS_FREESTRUCT) ds->mctx = NULL; } -static inline isc_result_t additionaldata_ds(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_ds(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_ds); UNUSED(rdata); @@ -341,8 +342,8 @@ static inline isc_result_t additionaldata_ds(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_ds(ARGS_DIGEST) -{ +static inline isc_result_t +digest_ds(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_ds); @@ -352,8 +353,8 @@ static inline isc_result_t digest_ds(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_ds(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_ds(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_ds); UNUSED(name); @@ -364,8 +365,8 @@ static inline bool checkowner_ds(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_ds(ARGS_CHECKNAMES) -{ +static inline bool +checknames_ds(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_ds); UNUSED(rdata); @@ -375,8 +376,8 @@ static inline bool checknames_ds(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_ds(ARGS_COMPARE) -{ +static inline int +casecompare_ds(ARGS_COMPARE) { return (compare_ds(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/eui48_108.c b/lib/dns/rdata/generic/eui48_108.c index f86d1fe9bf..22be772f0e 100644 --- a/lib/dns/rdata/generic/eui48_108.c +++ b/lib/dns/rdata/generic/eui48_108.c @@ -16,12 +16,12 @@ #define RRTYPE_EUI48_ATTRIBUTES (0) -static inline isc_result_t fromtext_eui48(ARGS_FROMTEXT) -{ - isc_token_t token; +static inline isc_result_t +fromtext_eui48(ARGS_FROMTEXT) { + isc_token_t token; unsigned char eui48[6]; - unsigned int l0, l1, l2, l3, l4, l5; - int n; + unsigned int l0, l1, l2, l3, l4, l5; + int n; REQUIRE(type == dns_rdatatype_eui48); @@ -36,7 +36,8 @@ static inline isc_result_t fromtext_eui48(ARGS_FROMTEXT) n = sscanf(DNS_AS_STR(token), "%2x-%2x-%2x-%2x-%2x-%2x", &l0, &l1, &l2, &l3, &l4, &l5); if (n != 6 || l0 > 255U || l1 > 255U || l2 > 255U || l3 > 255U || - l4 > 255U || l5 > 255U) { + l4 > 255U || l5 > 255U) + { return (DNS_R_BADEUI); } @@ -49,8 +50,8 @@ static inline isc_result_t fromtext_eui48(ARGS_FROMTEXT) return (mem_tobuffer(target, eui48, sizeof(eui48))); } -static inline isc_result_t totext_eui48(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_eui48(ARGS_TOTEXT) { char buf[sizeof("xx-xx-xx-xx-xx-xx")]; REQUIRE(rdata->type == dns_rdatatype_eui48); @@ -64,8 +65,8 @@ static inline isc_result_t totext_eui48(ARGS_TOTEXT) return (str_totext(buf, target)); } -static inline isc_result_t fromwire_eui48(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_eui48(ARGS_FROMWIRE) { isc_region_t sregion; REQUIRE(type == dns_rdatatype_eui48); @@ -83,8 +84,8 @@ static inline isc_result_t fromwire_eui48(ARGS_FROMWIRE) return (mem_tobuffer(target, sregion.base, sregion.length)); } -static inline isc_result_t towire_eui48(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_eui48(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_eui48); REQUIRE(rdata->length == 6); @@ -93,8 +94,8 @@ static inline isc_result_t towire_eui48(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_eui48(ARGS_COMPARE) -{ +static inline int +compare_eui48(ARGS_COMPARE) { isc_region_t region1; isc_region_t region2; @@ -109,8 +110,8 @@ static inline int compare_eui48(ARGS_COMPARE) return (isc_region_compare(®ion1, ®ion2)); } -static inline isc_result_t fromstruct_eui48(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_eui48(ARGS_FROMSTRUCT) { dns_rdata_eui48_t *eui48 = source; REQUIRE(type == dns_rdatatype_eui48); @@ -124,8 +125,8 @@ static inline isc_result_t fromstruct_eui48(ARGS_FROMSTRUCT) return (mem_tobuffer(target, eui48->eui48, sizeof(eui48->eui48))); } -static inline isc_result_t tostruct_eui48(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_eui48(ARGS_TOSTRUCT) { dns_rdata_eui48_t *eui48 = target; REQUIRE(rdata->type == dns_rdatatype_eui48); @@ -142,8 +143,8 @@ static inline isc_result_t tostruct_eui48(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_eui48(ARGS_FREESTRUCT) -{ +static inline void +freestruct_eui48(ARGS_FREESTRUCT) { dns_rdata_eui48_t *eui48 = source; REQUIRE(eui48 != NULL); @@ -152,8 +153,8 @@ static inline void freestruct_eui48(ARGS_FREESTRUCT) return; } -static inline isc_result_t additionaldata_eui48(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_eui48(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_eui48); REQUIRE(rdata->length == 6); @@ -164,8 +165,8 @@ static inline isc_result_t additionaldata_eui48(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_eui48(ARGS_DIGEST) -{ +static inline isc_result_t +digest_eui48(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_eui48); @@ -176,8 +177,8 @@ static inline isc_result_t digest_eui48(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_eui48(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_eui48(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_eui48); UNUSED(name); @@ -188,8 +189,8 @@ static inline bool checkowner_eui48(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_eui48(ARGS_CHECKNAMES) -{ +static inline bool +checknames_eui48(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_eui48); REQUIRE(rdata->length == 6); @@ -200,8 +201,8 @@ static inline bool checknames_eui48(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_eui48(ARGS_COMPARE) -{ +static inline int +casecompare_eui48(ARGS_COMPARE) { return (compare_eui48(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/eui64_109.c b/lib/dns/rdata/generic/eui64_109.c index 3a0973d79e..48404ae090 100644 --- a/lib/dns/rdata/generic/eui64_109.c +++ b/lib/dns/rdata/generic/eui64_109.c @@ -16,12 +16,12 @@ #define RRTYPE_EUI64_ATTRIBUTES (0) -static inline isc_result_t fromtext_eui64(ARGS_FROMTEXT) -{ - isc_token_t token; +static inline isc_result_t +fromtext_eui64(ARGS_FROMTEXT) { + isc_token_t token; unsigned char eui64[8]; - unsigned int l0, l1, l2, l3, l4, l5, l6, l7; - int n; + unsigned int l0, l1, l2, l3, l4, l5, l6, l7; + int n; REQUIRE(type == dns_rdatatype_eui64); @@ -36,7 +36,8 @@ static inline isc_result_t fromtext_eui64(ARGS_FROMTEXT) n = sscanf(DNS_AS_STR(token), "%2x-%2x-%2x-%2x-%2x-%2x-%2x-%2x", &l0, &l1, &l2, &l3, &l4, &l5, &l6, &l7); if (n != 8 || l0 > 255U || l1 > 255U || l2 > 255U || l3 > 255U || - l4 > 255U || l5 > 255U || l6 > 255U || l7 > 255U) { + l4 > 255U || l5 > 255U || l6 > 255U || l7 > 255U) + { return (DNS_R_BADEUI); } @@ -51,8 +52,8 @@ static inline isc_result_t fromtext_eui64(ARGS_FROMTEXT) return (mem_tobuffer(target, eui64, sizeof(eui64))); } -static inline isc_result_t totext_eui64(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_eui64(ARGS_TOTEXT) { char buf[sizeof("xx-xx-xx-xx-xx-xx-xx-xx")]; REQUIRE(rdata->type == dns_rdatatype_eui64); @@ -67,8 +68,8 @@ static inline isc_result_t totext_eui64(ARGS_TOTEXT) return (str_totext(buf, target)); } -static inline isc_result_t fromwire_eui64(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_eui64(ARGS_FROMWIRE) { isc_region_t sregion; REQUIRE(type == dns_rdatatype_eui64); @@ -86,8 +87,8 @@ static inline isc_result_t fromwire_eui64(ARGS_FROMWIRE) return (mem_tobuffer(target, sregion.base, sregion.length)); } -static inline isc_result_t towire_eui64(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_eui64(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_eui64); REQUIRE(rdata->length == 8); @@ -96,8 +97,8 @@ static inline isc_result_t towire_eui64(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_eui64(ARGS_COMPARE) -{ +static inline int +compare_eui64(ARGS_COMPARE) { isc_region_t region1; isc_region_t region2; @@ -112,8 +113,8 @@ static inline int compare_eui64(ARGS_COMPARE) return (isc_region_compare(®ion1, ®ion2)); } -static inline isc_result_t fromstruct_eui64(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_eui64(ARGS_FROMSTRUCT) { dns_rdata_eui64_t *eui64 = source; REQUIRE(type == dns_rdatatype_eui64); @@ -127,8 +128,8 @@ static inline isc_result_t fromstruct_eui64(ARGS_FROMSTRUCT) return (mem_tobuffer(target, eui64->eui64, sizeof(eui64->eui64))); } -static inline isc_result_t tostruct_eui64(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_eui64(ARGS_TOSTRUCT) { dns_rdata_eui64_t *eui64 = target; REQUIRE(rdata->type == dns_rdatatype_eui64); @@ -145,8 +146,8 @@ static inline isc_result_t tostruct_eui64(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_eui64(ARGS_FREESTRUCT) -{ +static inline void +freestruct_eui64(ARGS_FREESTRUCT) { dns_rdata_eui64_t *eui64 = source; REQUIRE(eui64 != NULL); @@ -155,8 +156,8 @@ static inline void freestruct_eui64(ARGS_FREESTRUCT) return; } -static inline isc_result_t additionaldata_eui64(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_eui64(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_eui64); REQUIRE(rdata->length == 8); @@ -167,8 +168,8 @@ static inline isc_result_t additionaldata_eui64(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_eui64(ARGS_DIGEST) -{ +static inline isc_result_t +digest_eui64(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_eui64); @@ -179,8 +180,8 @@ static inline isc_result_t digest_eui64(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_eui64(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_eui64(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_eui64); UNUSED(name); @@ -191,8 +192,8 @@ static inline bool checkowner_eui64(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_eui64(ARGS_CHECKNAMES) -{ +static inline bool +checknames_eui64(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_eui64); REQUIRE(rdata->length == 8); @@ -203,8 +204,8 @@ static inline bool checknames_eui64(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_eui64(ARGS_COMPARE) -{ +static inline int +casecompare_eui64(ARGS_COMPARE) { return (compare_eui64(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/gpos_27.c b/lib/dns/rdata/generic/gpos_27.c index e6431b7909..aae23ca1ea 100644 --- a/lib/dns/rdata/generic/gpos_27.c +++ b/lib/dns/rdata/generic/gpos_27.c @@ -16,10 +16,10 @@ #define RRTYPE_GPOS_ATTRIBUTES (0) -static inline isc_result_t fromtext_gpos(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_gpos(ARGS_FROMTEXT) { isc_token_t token; - int i; + int i; REQUIRE(type == dns_rdatatype_gpos); @@ -37,10 +37,10 @@ static inline isc_result_t fromtext_gpos(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_gpos(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_gpos(ARGS_TOTEXT) { isc_region_t region; - int i; + int i; REQUIRE(rdata->type == dns_rdatatype_gpos); REQUIRE(rdata->length != 0); @@ -59,8 +59,8 @@ static inline isc_result_t totext_gpos(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_gpos(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_gpos(ARGS_FROMWIRE) { int i; REQUIRE(type == dns_rdatatype_gpos); @@ -75,8 +75,8 @@ static inline isc_result_t fromwire_gpos(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_gpos(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_gpos(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_gpos); REQUIRE(rdata->length != 0); @@ -85,8 +85,8 @@ static inline isc_result_t towire_gpos(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_gpos(ARGS_COMPARE) -{ +static inline int +compare_gpos(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -101,8 +101,8 @@ static inline int compare_gpos(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_gpos(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_gpos(ARGS_FROMSTRUCT) { dns_rdata_gpos_t *gpos = source; REQUIRE(type == dns_rdatatype_gpos); @@ -121,10 +121,10 @@ static inline isc_result_t fromstruct_gpos(ARGS_FROMSTRUCT) return (mem_tobuffer(target, gpos->altitude, gpos->alt_len)); } -static inline isc_result_t tostruct_gpos(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_gpos(ARGS_TOSTRUCT) { dns_rdata_gpos_t *gpos = target; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_gpos); REQUIRE(gpos != NULL); @@ -177,8 +177,8 @@ cleanup_longitude: return (ISC_R_NOMEMORY); } -static inline void freestruct_gpos(ARGS_FREESTRUCT) -{ +static inline void +freestruct_gpos(ARGS_FREESTRUCT) { dns_rdata_gpos_t *gpos = source; REQUIRE(gpos != NULL); @@ -200,8 +200,8 @@ static inline void freestruct_gpos(ARGS_FREESTRUCT) gpos->mctx = NULL; } -static inline isc_result_t additionaldata_gpos(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_gpos(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_gpos); UNUSED(rdata); @@ -211,8 +211,8 @@ static inline isc_result_t additionaldata_gpos(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_gpos(ARGS_DIGEST) -{ +static inline isc_result_t +digest_gpos(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_gpos); @@ -222,8 +222,8 @@ static inline isc_result_t digest_gpos(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_gpos(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_gpos(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_gpos); UNUSED(name); @@ -234,8 +234,8 @@ static inline bool checkowner_gpos(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_gpos(ARGS_CHECKNAMES) -{ +static inline bool +checknames_gpos(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_gpos); UNUSED(rdata); @@ -245,8 +245,8 @@ static inline bool checknames_gpos(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_gpos(ARGS_COMPARE) -{ +static inline int +casecompare_gpos(ARGS_COMPARE) { return (compare_gpos(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/hinfo_13.c b/lib/dns/rdata/generic/hinfo_13.c index b55176b3cb..38ba4a3005 100644 --- a/lib/dns/rdata/generic/hinfo_13.c +++ b/lib/dns/rdata/generic/hinfo_13.c @@ -14,10 +14,10 @@ #define RRTYPE_HINFO_ATTRIBUTES (0) -static inline isc_result_t fromtext_hinfo(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_hinfo(ARGS_FROMTEXT) { isc_token_t token; - int i; + int i; UNUSED(type); UNUSED(rdclass); @@ -35,8 +35,8 @@ static inline isc_result_t fromtext_hinfo(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_hinfo(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_hinfo(ARGS_TOTEXT) { isc_region_t region; UNUSED(tctx); @@ -50,8 +50,8 @@ static inline isc_result_t totext_hinfo(ARGS_TOTEXT) return (txt_totext(®ion, true, target)); } -static inline isc_result_t fromwire_hinfo(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_hinfo(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_hinfo); UNUSED(type); @@ -63,8 +63,8 @@ static inline isc_result_t fromwire_hinfo(ARGS_FROMWIRE) return (txt_fromwire(source, target)); } -static inline isc_result_t towire_hinfo(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_hinfo(ARGS_TOWIRE) { UNUSED(cctx); REQUIRE(rdata->type == dns_rdatatype_hinfo); @@ -73,8 +73,8 @@ static inline isc_result_t towire_hinfo(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_hinfo(ARGS_COMPARE) -{ +static inline int +compare_hinfo(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -89,8 +89,8 @@ static inline int compare_hinfo(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_hinfo(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_hinfo(ARGS_FROMSTRUCT) { dns_rdata_hinfo_t *hinfo = source; REQUIRE(type == dns_rdatatype_hinfo); @@ -107,10 +107,10 @@ static inline isc_result_t fromstruct_hinfo(ARGS_FROMSTRUCT) return (mem_tobuffer(target, hinfo->os, hinfo->os_len)); } -static inline isc_result_t tostruct_hinfo(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_hinfo(ARGS_TOSTRUCT) { dns_rdata_hinfo_t *hinfo = target; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_hinfo); REQUIRE(hinfo != NULL); @@ -146,8 +146,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_hinfo(ARGS_FREESTRUCT) -{ +static inline void +freestruct_hinfo(ARGS_FREESTRUCT) { dns_rdata_hinfo_t *hinfo = source; REQUIRE(hinfo != NULL); @@ -165,8 +165,8 @@ static inline void freestruct_hinfo(ARGS_FREESTRUCT) hinfo->mctx = NULL; } -static inline isc_result_t additionaldata_hinfo(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_hinfo(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_hinfo); UNUSED(add); @@ -176,8 +176,8 @@ static inline isc_result_t additionaldata_hinfo(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_hinfo(ARGS_DIGEST) -{ +static inline isc_result_t +digest_hinfo(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_hinfo); @@ -187,8 +187,8 @@ static inline isc_result_t digest_hinfo(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_hinfo(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_hinfo(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_hinfo); UNUSED(name); @@ -199,8 +199,8 @@ static inline bool checkowner_hinfo(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_hinfo(ARGS_CHECKNAMES) -{ +static inline bool +checknames_hinfo(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_hinfo); UNUSED(rdata); @@ -210,8 +210,8 @@ static inline bool checknames_hinfo(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_hinfo(ARGS_COMPARE) -{ +static inline int +casecompare_hinfo(ARGS_COMPARE) { return (compare_hinfo(rdata1, rdata2)); } #endif /* RDATA_GENERIC_HINFO_13_C */ diff --git a/lib/dns/rdata/generic/hip_55.c b/lib/dns/rdata/generic/hip_55.c index 7d2dde0f63..c114c0c915 100644 --- a/lib/dns/rdata/generic/hip_55.c +++ b/lib/dns/rdata/generic/hip_55.c @@ -16,15 +16,15 @@ #define RRTYPE_HIP_ATTRIBUTES (0) -static inline isc_result_t fromtext_hip(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; - isc_buffer_t buffer; - isc_buffer_t hit_len; - isc_buffer_t key_len; +static inline isc_result_t +fromtext_hip(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; + isc_buffer_t buffer; + isc_buffer_t hit_len; + isc_buffer_t key_len; unsigned char *start; - size_t len; + size_t len; REQUIRE(type == dns_rdatatype_hip); @@ -115,13 +115,13 @@ static inline isc_result_t fromtext_hip(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_hip(ARGS_TOTEXT) -{ - isc_region_t region; - dns_name_t name; - unsigned int length, key_len, hit_len; +static inline isc_result_t +totext_hip(ARGS_TOTEXT) { + isc_region_t region; + dns_name_t name; + unsigned int length, key_len, hit_len; unsigned char algorithm; - char buf[sizeof("225 ")]; + char buf[sizeof("225 ")]; REQUIRE(rdata->type == dns_rdatatype_hip); REQUIRE(rdata->length != 0); @@ -186,12 +186,12 @@ static inline isc_result_t totext_hip(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_hip(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_hip(ARGS_FROMWIRE) { isc_region_t region, rr; - dns_name_t name; - uint8_t hit_len; - uint16_t key_len; + dns_name_t name; + uint8_t hit_len; + uint16_t key_len; REQUIRE(type == dns_rdatatype_hip); @@ -229,8 +229,8 @@ static inline isc_result_t fromwire_hip(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_hip(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_hip(ARGS_TOWIRE) { isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_hip); @@ -242,8 +242,8 @@ static inline isc_result_t towire_hip(ARGS_TOWIRE) return (mem_tobuffer(target, region.base, region.length)); } -static inline int compare_hip(ARGS_COMPARE) -{ +static inline int +compare_hip(ARGS_COMPARE) { isc_region_t region1; isc_region_t region2; @@ -258,11 +258,11 @@ static inline int compare_hip(ARGS_COMPARE) return (isc_region_compare(®ion1, ®ion2)); } -static inline isc_result_t fromstruct_hip(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_hip(ARGS_FROMSTRUCT) { dns_rdata_hip_t *hip = source; - dns_rdata_hip_t myhip; - isc_result_t result; + dns_rdata_hip_t myhip; + isc_result_t result; REQUIRE(type == dns_rdatatype_hip); REQUIRE(hip != NULL); @@ -290,9 +290,9 @@ static inline isc_result_t fromstruct_hip(ARGS_FROMSTRUCT) return (mem_tobuffer(target, hip->servers, hip->servers_len)); } -static inline isc_result_t tostruct_hip(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_hip(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_hip_t *hip = target; REQUIRE(rdata->type == dns_rdatatype_hip); @@ -355,8 +355,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_hip(ARGS_FREESTRUCT) -{ +static inline void +freestruct_hip(ARGS_FREESTRUCT) { dns_rdata_hip_t *hip = source; REQUIRE(hip != NULL); @@ -373,8 +373,8 @@ static inline void freestruct_hip(ARGS_FREESTRUCT) hip->mctx = NULL; } -static inline isc_result_t additionaldata_hip(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_hip(ARGS_ADDLDATA) { UNUSED(rdata); UNUSED(add); UNUSED(arg); @@ -384,8 +384,8 @@ static inline isc_result_t additionaldata_hip(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_hip(ARGS_DIGEST) -{ +static inline isc_result_t +digest_hip(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_hip); @@ -394,8 +394,8 @@ static inline isc_result_t digest_hip(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_hip(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_hip(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_hip); UNUSED(name); @@ -406,8 +406,8 @@ static inline bool checkowner_hip(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_hip(ARGS_CHECKNAMES) -{ +static inline bool +checknames_hip(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_hip); UNUSED(rdata); @@ -418,8 +418,7 @@ static inline bool checknames_hip(ARGS_CHECKNAMES) } isc_result_t -dns_rdata_hip_first(dns_rdata_hip_t *hip) -{ +dns_rdata_hip_first(dns_rdata_hip_t *hip) { if (hip->servers_len == 0) { return (ISC_R_NOMORE); } @@ -428,10 +427,9 @@ dns_rdata_hip_first(dns_rdata_hip_t *hip) } isc_result_t -dns_rdata_hip_next(dns_rdata_hip_t *hip) -{ +dns_rdata_hip_next(dns_rdata_hip_t *hip) { isc_region_t region; - dns_name_t name; + dns_name_t name; if (hip->offset >= hip->servers_len) { return (ISC_R_NOMORE); @@ -447,8 +445,7 @@ dns_rdata_hip_next(dns_rdata_hip_t *hip) } void -dns_rdata_hip_current(dns_rdata_hip_t *hip, dns_name_t *name) -{ +dns_rdata_hip_current(dns_rdata_hip_t *hip, dns_name_t *name) { isc_region_t region; REQUIRE(hip->offset < hip->servers_len); @@ -460,15 +457,15 @@ dns_rdata_hip_current(dns_rdata_hip_t *hip, dns_name_t *name) INSIST(name->length + hip->offset <= hip->servers_len); } -static inline int casecompare_hip(ARGS_COMPARE) -{ +static inline int +casecompare_hip(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; - dns_name_t name1; - dns_name_t name2; - int order; - uint8_t hit_len; - uint16_t key_len; + dns_name_t name1; + dns_name_t name2; + int order; + uint8_t hit_len; + uint16_t key_len; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); diff --git a/lib/dns/rdata/generic/ipseckey_45.c b/lib/dns/rdata/generic/ipseckey_45.c index 5e80c82c84..dfbec4b716 100644 --- a/lib/dns/rdata/generic/ipseckey_45.c +++ b/lib/dns/rdata/generic/ipseckey_45.c @@ -18,15 +18,15 @@ #define RRTYPE_IPSECKEY_ATTRIBUTES (0) -static inline isc_result_t fromtext_ipseckey(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; - isc_buffer_t buffer; - unsigned int gateway; +static inline isc_result_t +fromtext_ipseckey(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; + isc_buffer_t buffer; + unsigned int gateway; struct in_addr addr; - unsigned char addr6[16]; - isc_region_t region; + unsigned char addr6[16]; + isc_region_t region; REQUIRE(type == dns_rdatatype_ipseckey); @@ -119,11 +119,11 @@ static inline isc_result_t fromtext_ipseckey(ARGS_FROMTEXT) return (isc_base64_tobuffer(lexer, target, -2)); } -static inline isc_result_t totext_ipseckey(ARGS_TOTEXT) -{ - isc_region_t region; - dns_name_t name; - char buf[sizeof("255 ")]; +static inline isc_result_t +totext_ipseckey(ARGS_TOTEXT) { + isc_region_t region; + dns_name_t name; + char buf[sizeof("255 ")]; unsigned short num; unsigned short gateway; @@ -209,9 +209,9 @@ static inline isc_result_t totext_ipseckey(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_ipseckey(ARGS_FROMWIRE) -{ - dns_name_t name; +static inline isc_result_t +fromwire_ipseckey(ARGS_FROMWIRE) { + dns_name_t name; isc_region_t region; REQUIRE(type == dns_rdatatype_ipseckey); @@ -260,8 +260,8 @@ static inline isc_result_t fromwire_ipseckey(ARGS_FROMWIRE) } } -static inline isc_result_t towire_ipseckey(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_ipseckey(ARGS_TOWIRE) { isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_ipseckey); @@ -273,8 +273,8 @@ static inline isc_result_t towire_ipseckey(ARGS_TOWIRE) return (mem_tobuffer(target, region.base, region.length)); } -static inline int compare_ipseckey(ARGS_COMPARE) -{ +static inline int +compare_ipseckey(ARGS_COMPARE) { isc_region_t region1; isc_region_t region2; @@ -290,11 +290,11 @@ static inline int compare_ipseckey(ARGS_COMPARE) return (isc_region_compare(®ion1, ®ion2)); } -static inline isc_result_t fromstruct_ipseckey(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_ipseckey(ARGS_FROMSTRUCT) { dns_rdata_ipseckey_t *ipseckey = source; - isc_region_t region; - uint32_t n; + isc_region_t region; + uint32_t n; REQUIRE(type == dns_rdatatype_ipseckey); REQUIRE(ipseckey != NULL); @@ -334,12 +334,12 @@ static inline isc_result_t fromstruct_ipseckey(ARGS_FROMSTRUCT) return (mem_tobuffer(target, ipseckey->key, ipseckey->keylength)); } -static inline isc_result_t tostruct_ipseckey(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_ipseckey(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_ipseckey_t *ipseckey = target; - dns_name_t name; - uint32_t n; + dns_name_t name; + uint32_t n; REQUIRE(rdata->type == dns_rdatatype_ipseckey); REQUIRE(ipseckey != NULL); @@ -390,8 +390,8 @@ static inline isc_result_t tostruct_ipseckey(ARGS_TOSTRUCT) ipseckey->keylength = region.length; if (ipseckey->keylength != 0U) { - ipseckey->key = - mem_maybedup(mctx, region.base, ipseckey->keylength); + ipseckey->key = mem_maybedup(mctx, region.base, + ipseckey->keylength); if (ipseckey->key == NULL) { if (ipseckey->gateway_type == 3) { dns_name_free(&ipseckey->gateway, @@ -407,8 +407,8 @@ static inline isc_result_t tostruct_ipseckey(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_ipseckey(ARGS_FREESTRUCT) -{ +static inline void +freestruct_ipseckey(ARGS_FREESTRUCT) { dns_rdata_ipseckey_t *ipseckey = source; REQUIRE(ipseckey != NULL); @@ -429,8 +429,8 @@ static inline void freestruct_ipseckey(ARGS_FREESTRUCT) ipseckey->mctx = NULL; } -static inline isc_result_t additionaldata_ipseckey(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_ipseckey(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_ipseckey); UNUSED(rdata); @@ -440,8 +440,8 @@ static inline isc_result_t additionaldata_ipseckey(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_ipseckey(ARGS_DIGEST) -{ +static inline isc_result_t +digest_ipseckey(ARGS_DIGEST) { isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_ipseckey); @@ -450,8 +450,8 @@ static inline isc_result_t digest_ipseckey(ARGS_DIGEST) return ((digest)(arg, ®ion)); } -static inline bool checkowner_ipseckey(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_ipseckey(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_ipseckey); UNUSED(name); @@ -462,8 +462,8 @@ static inline bool checkowner_ipseckey(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_ipseckey(ARGS_CHECKNAMES) -{ +static inline bool +checknames_ipseckey(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_ipseckey); UNUSED(rdata); @@ -473,13 +473,13 @@ static inline bool checknames_ipseckey(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_ipseckey(ARGS_COMPARE) -{ +static inline int +casecompare_ipseckey(ARGS_COMPARE) { isc_region_t region1; isc_region_t region2; - dns_name_t name1; - dns_name_t name2; - int order; + dns_name_t name1; + dns_name_t name2; + int order; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); @@ -490,8 +490,8 @@ static inline int casecompare_ipseckey(ARGS_COMPARE) dns_rdata_toregion(rdata1, ®ion1); dns_rdata_toregion(rdata2, ®ion2); - if (memcmp(region1.base, region2.base, 3) != 0 || - region1.base[1] != 3) { + if (memcmp(region1.base, region2.base, 3) != 0 || region1.base[1] != 3) + { return (isc_region_compare(®ion1, ®ion2)); } diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c index 10ebdcef89..c1d8a69af2 100644 --- a/lib/dns/rdata/generic/isdn_20.c +++ b/lib/dns/rdata/generic/isdn_20.c @@ -16,8 +16,8 @@ #define RRTYPE_ISDN_ATTRIBUTES (0) -static inline isc_result_t fromtext_isdn(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_isdn(ARGS_FROMTEXT) { isc_token_t token; REQUIRE(type == dns_rdatatype_isdn); @@ -45,8 +45,8 @@ static inline isc_result_t fromtext_isdn(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_isdn(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_isdn(ARGS_TOTEXT) { isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_isdn); @@ -63,8 +63,8 @@ static inline isc_result_t totext_isdn(ARGS_TOTEXT) return (txt_totext(®ion, true, target)); } -static inline isc_result_t fromwire_isdn(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_isdn(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_isdn); UNUSED(type); @@ -79,8 +79,8 @@ static inline isc_result_t fromwire_isdn(ARGS_FROMWIRE) return (txt_fromwire(source, target)); } -static inline isc_result_t towire_isdn(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_isdn(ARGS_TOWIRE) { UNUSED(cctx); REQUIRE(rdata->type == dns_rdatatype_isdn); @@ -89,8 +89,8 @@ static inline isc_result_t towire_isdn(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_isdn(ARGS_COMPARE) -{ +static inline int +compare_isdn(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -105,8 +105,8 @@ static inline int compare_isdn(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_isdn(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_isdn(ARGS_FROMSTRUCT) { dns_rdata_isdn_t *isdn = source; REQUIRE(type == dns_rdatatype_isdn); @@ -126,10 +126,10 @@ static inline isc_result_t fromstruct_isdn(ARGS_FROMSTRUCT) return (mem_tobuffer(target, isdn->subaddress, isdn->subaddress_len)); } -static inline isc_result_t tostruct_isdn(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_isdn(ARGS_TOSTRUCT) { dns_rdata_isdn_t *isdn = target; - isc_region_t r; + isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_isdn); REQUIRE(isdn != NULL); @@ -155,8 +155,8 @@ static inline isc_result_t tostruct_isdn(ARGS_TOSTRUCT) } else { isdn->subaddress_len = uint8_fromregion(&r); isc_region_consume(&r, 1); - isdn->subaddress = - mem_maybedup(mctx, r.base, isdn->subaddress_len); + isdn->subaddress = mem_maybedup(mctx, r.base, + isdn->subaddress_len); if (isdn->subaddress == NULL) { goto cleanup; } @@ -172,8 +172,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_isdn(ARGS_FREESTRUCT) -{ +static inline void +freestruct_isdn(ARGS_FREESTRUCT) { dns_rdata_isdn_t *isdn = source; REQUIRE(isdn != NULL); @@ -191,8 +191,8 @@ static inline void freestruct_isdn(ARGS_FREESTRUCT) isdn->mctx = NULL; } -static inline isc_result_t additionaldata_isdn(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_isdn(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_isdn); UNUSED(rdata); @@ -202,8 +202,8 @@ static inline isc_result_t additionaldata_isdn(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_isdn(ARGS_DIGEST) -{ +static inline isc_result_t +digest_isdn(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_isdn); @@ -213,8 +213,8 @@ static inline isc_result_t digest_isdn(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_isdn(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_isdn(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_isdn); UNUSED(name); @@ -225,8 +225,8 @@ static inline bool checkowner_isdn(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_isdn(ARGS_CHECKNAMES) -{ +static inline bool +checknames_isdn(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_isdn); UNUSED(rdata); @@ -236,8 +236,8 @@ static inline bool checknames_isdn(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_isdn(ARGS_COMPARE) -{ +static inline int +casecompare_isdn(ARGS_COMPARE) { return (compare_isdn(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c index ee744e2985..da79886240 100644 --- a/lib/dns/rdata/generic/key_25.c +++ b/lib/dns/rdata/generic/key_25.c @@ -30,8 +30,7 @@ * RKEY - draft-reid-dnsext-rkey-00 */ static inline bool -generic_key_nokey(dns_rdatatype_t type, unsigned int flags) -{ +generic_key_nokey(dns_rdatatype_t type, unsigned int flags) { switch (type) { case dns_rdatatype_cdnskey: case dns_rdatatype_dnskey: @@ -43,10 +42,10 @@ generic_key_nokey(dns_rdatatype_t type, unsigned int flags) } } -static inline isc_result_t generic_fromtext_key(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_secalg_t alg; +static inline isc_result_t +generic_fromtext_key(ARGS_FROMTEXT) { + isc_token_t token; + dns_secalg_t alg; dns_secproto_t proto; dns_keyflags_t flags; @@ -84,15 +83,15 @@ static inline isc_result_t generic_fromtext_key(ARGS_FROMTEXT) return (isc_base64_tobuffer(lexer, target, -2)); } -static inline isc_result_t generic_totext_key(ARGS_TOTEXT) -{ - isc_region_t sr; - char buf[sizeof("[key id = 64000]")]; - unsigned int flags; +static inline isc_result_t +generic_totext_key(ARGS_TOTEXT) { + isc_region_t sr; + char buf[sizeof("[key id = 64000]")]; + unsigned int flags; unsigned char algorithm; - char algbuf[DNS_NAME_FORMATSIZE]; - const char * keyinfo; - isc_region_t tmpr; + char algbuf[DNS_NAME_FORMATSIZE]; + const char *keyinfo; + isc_region_t tmpr; REQUIRE(rdata->length != 0); @@ -132,7 +131,8 @@ static inline isc_result_t generic_totext_key(ARGS_TOTEXT) } if ((tctx->flags & DNS_STYLEFLAG_RRCOMMENT) != 0 && - algorithm == DNS_KEYALG_PRIVATEDNS) { + algorithm == DNS_KEYALG_PRIVATEDNS) + { dns_name_t name; dns_name_init(&name, NULL); dns_name_fromregion(&name, &sr); @@ -188,11 +188,11 @@ static inline isc_result_t generic_totext_key(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t generic_fromwire_key(ARGS_FROMWIRE) -{ +static inline isc_result_t +generic_fromwire_key(ARGS_FROMWIRE) { unsigned char algorithm; - uint16_t flags; - isc_region_t sr; + uint16_t flags; + isc_region_t sr; UNUSED(rdclass); UNUSED(dctx); @@ -232,32 +232,32 @@ static inline isc_result_t generic_fromwire_key(ARGS_FROMWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline isc_result_t fromtext_key(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_key(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_key); return (generic_fromtext_key(rdclass, type, lexer, origin, options, target, callbacks)); } -static inline isc_result_t totext_key(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_key(ARGS_TOTEXT) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_key); return (generic_totext_key(rdata, tctx, target)); } -static inline isc_result_t fromwire_key(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_key(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_key); return (generic_fromwire_key(rdclass, type, source, dctx, options, target)); } -static inline isc_result_t towire_key(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_key(ARGS_TOWIRE) { isc_region_t sr; REQUIRE(rdata != NULL); @@ -270,8 +270,8 @@ static inline isc_result_t towire_key(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_key(ARGS_COMPARE) -{ +static inline int +compare_key(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -288,8 +288,8 @@ static inline int compare_key(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t generic_fromstruct_key(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +generic_fromstruct_key(ARGS_FROMSTRUCT) { dns_rdata_key_t *key = source; REQUIRE(key != NULL); @@ -316,10 +316,10 @@ static inline isc_result_t generic_fromstruct_key(ARGS_FROMSTRUCT) return (mem_tobuffer(target, key->data, key->datalen)); } -static inline isc_result_t generic_tostruct_key(ARGS_TOSTRUCT) -{ +static inline isc_result_t +generic_tostruct_key(ARGS_TOSTRUCT) { dns_rdata_key_t *key = target; - isc_region_t sr; + isc_region_t sr; REQUIRE(key != NULL); REQUIRE(rdata->length != 0); @@ -363,8 +363,8 @@ static inline isc_result_t generic_tostruct_key(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void generic_freestruct_key(ARGS_FREESTRUCT) -{ +static inline void +generic_freestruct_key(ARGS_FREESTRUCT) { dns_rdata_key_t *key = (dns_rdata_key_t *)source; REQUIRE(key != NULL); @@ -379,15 +379,15 @@ static inline void generic_freestruct_key(ARGS_FREESTRUCT) key->mctx = NULL; } -static inline isc_result_t fromstruct_key(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_key(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_key); return (generic_fromstruct_key(rdclass, type, source, target)); } -static inline isc_result_t tostruct_key(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_key(ARGS_TOSTRUCT) { dns_rdata_key_t *key = target; REQUIRE(key != NULL); @@ -401,8 +401,8 @@ static inline isc_result_t tostruct_key(ARGS_TOSTRUCT) return (generic_tostruct_key(rdata, target, mctx)); } -static inline void freestruct_key(ARGS_FREESTRUCT) -{ +static inline void +freestruct_key(ARGS_FREESTRUCT) { dns_rdata_key_t *key = (dns_rdata_key_t *)source; REQUIRE(key != NULL); @@ -411,8 +411,8 @@ static inline void freestruct_key(ARGS_FREESTRUCT) generic_freestruct_key(source); } -static inline isc_result_t additionaldata_key(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_key(ARGS_ADDLDATA) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_key); @@ -423,8 +423,8 @@ static inline isc_result_t additionaldata_key(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_key(ARGS_DIGEST) -{ +static inline isc_result_t +digest_key(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata != NULL); @@ -435,8 +435,8 @@ static inline isc_result_t digest_key(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_key(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_key(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_key); UNUSED(name); @@ -447,8 +447,8 @@ static inline bool checkowner_key(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_key(ARGS_CHECKNAMES) -{ +static inline bool +checknames_key(ARGS_CHECKNAMES) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_key); @@ -459,8 +459,8 @@ static inline bool checknames_key(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_key(ARGS_COMPARE) -{ +static inline int +casecompare_key(ARGS_COMPARE) { return (compare_key(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/keydata_65533.c b/lib/dns/rdata/generic/keydata_65533.c index a71969c138..3b43f56a76 100644 --- a/lib/dns/rdata/generic/keydata_65533.c +++ b/lib/dns/rdata/generic/keydata_65533.c @@ -19,13 +19,13 @@ #define RRTYPE_KEYDATA_ATTRIBUTES (0) -static inline isc_result_t fromtext_keydata(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_secalg_t alg; +static inline isc_result_t +fromtext_keydata(ARGS_FROMTEXT) { + isc_token_t token; + dns_secalg_t alg; dns_secproto_t proto; dns_keyflags_t flags; - uint32_t refresh, addhd, removehd; + uint32_t refresh, addhd, removehd; REQUIRE(type == dns_rdatatype_keydata); @@ -79,15 +79,15 @@ static inline isc_result_t fromtext_keydata(ARGS_FROMTEXT) return (isc_base64_tobuffer(lexer, target, -2)); } -static inline isc_result_t totext_keydata(ARGS_TOTEXT) -{ - isc_region_t sr; - char buf[sizeof("64000")]; - unsigned int flags; +static inline isc_result_t +totext_keydata(ARGS_TOTEXT) { + isc_region_t sr; + char buf[sizeof("64000")]; + unsigned int flags; unsigned char algorithm; unsigned long refresh, add, deltime; - char algbuf[DNS_NAME_FORMATSIZE]; - const char * keyinfo; + char algbuf[DNS_NAME_FORMATSIZE]; + const char *keyinfo; REQUIRE(rdata->type == dns_rdatatype_keydata); @@ -172,10 +172,10 @@ static inline isc_result_t totext_keydata(ARGS_TOTEXT) if ((tctx->flags & DNS_STYLEFLAG_RRCOMMENT) != 0) { isc_region_t tmpr; - char rbuf[ISC_FORMATHTTPTIMESTAMP_SIZE]; - char abuf[ISC_FORMATHTTPTIMESTAMP_SIZE]; - char dbuf[ISC_FORMATHTTPTIMESTAMP_SIZE]; - isc_time_t t; + char rbuf[ISC_FORMATHTTPTIMESTAMP_SIZE]; + char abuf[ISC_FORMATHTTPTIMESTAMP_SIZE]; + char dbuf[ISC_FORMATHTTPTIMESTAMP_SIZE]; + isc_time_t t; RETERR(str_totext(" ; ", target)); RETERR(str_totext(keyinfo, target)); @@ -233,8 +233,8 @@ static inline isc_result_t totext_keydata(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_keydata(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_keydata(ARGS_FROMWIRE) { isc_region_t sr; REQUIRE(type == dns_rdatatype_keydata); @@ -249,8 +249,8 @@ static inline isc_result_t fromwire_keydata(ARGS_FROMWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline isc_result_t towire_keydata(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_keydata(ARGS_TOWIRE) { isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_keydata); @@ -261,8 +261,8 @@ static inline isc_result_t towire_keydata(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_keydata(ARGS_COMPARE) -{ +static inline int +compare_keydata(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -275,8 +275,8 @@ static inline int compare_keydata(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_keydata(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_keydata(ARGS_FROMSTRUCT) { dns_rdata_keydata_t *keydata = source; REQUIRE(type == dns_rdatatype_keydata); @@ -309,10 +309,10 @@ static inline isc_result_t fromstruct_keydata(ARGS_FROMSTRUCT) return (mem_tobuffer(target, keydata->data, keydata->datalen)); } -static inline isc_result_t tostruct_keydata(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_keydata(ARGS_TOSTRUCT) { dns_rdata_keydata_t *keydata = target; - isc_region_t sr; + isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_keydata); REQUIRE(keydata != NULL); @@ -376,8 +376,8 @@ static inline isc_result_t tostruct_keydata(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_keydata(ARGS_FREESTRUCT) -{ +static inline void +freestruct_keydata(ARGS_FREESTRUCT) { dns_rdata_keydata_t *keydata = (dns_rdata_keydata_t *)source; REQUIRE(keydata != NULL); @@ -393,8 +393,8 @@ static inline void freestruct_keydata(ARGS_FREESTRUCT) keydata->mctx = NULL; } -static inline isc_result_t additionaldata_keydata(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_keydata(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_keydata); UNUSED(rdata); @@ -404,8 +404,8 @@ static inline isc_result_t additionaldata_keydata(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_keydata(ARGS_DIGEST) -{ +static inline isc_result_t +digest_keydata(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_keydata); @@ -415,8 +415,8 @@ static inline isc_result_t digest_keydata(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_keydata(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_keydata(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_keydata); UNUSED(name); @@ -427,8 +427,8 @@ static inline bool checkowner_keydata(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_keydata(ARGS_CHECKNAMES) -{ +static inline bool +checknames_keydata(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_keydata); UNUSED(rdata); @@ -438,8 +438,8 @@ static inline bool checknames_keydata(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_keydata(ARGS_COMPARE) -{ +static inline int +casecompare_keydata(ARGS_COMPARE) { return (compare_keydata(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/l32_105.c b/lib/dns/rdata/generic/l32_105.c index e643ee3e65..2cb5007c27 100644 --- a/lib/dns/rdata/generic/l32_105.c +++ b/lib/dns/rdata/generic/l32_105.c @@ -18,11 +18,11 @@ #define RRTYPE_L32_ATTRIBUTES (0) -static inline isc_result_t fromtext_l32(ARGS_FROMTEXT) -{ - isc_token_t token; +static inline isc_result_t +fromtext_l32(ARGS_FROMTEXT) { + isc_token_t token; struct in_addr addr; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_l32); @@ -54,10 +54,10 @@ static inline isc_result_t fromtext_l32(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_l32(ARGS_TOTEXT) -{ - isc_region_t region; - char buf[sizeof("65000")]; +static inline isc_result_t +totext_l32(ARGS_TOTEXT) { + isc_region_t region; + char buf[sizeof("65000")]; unsigned short num; REQUIRE(rdata->type == dns_rdatatype_l32); @@ -76,8 +76,8 @@ static inline isc_result_t totext_l32(ARGS_TOTEXT) return (inet_totext(AF_INET, ®ion, target)); } -static inline isc_result_t fromwire_l32(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_l32(ARGS_FROMWIRE) { isc_region_t sregion; REQUIRE(type == dns_rdatatype_l32); @@ -95,8 +95,8 @@ static inline isc_result_t fromwire_l32(ARGS_FROMWIRE) return (mem_tobuffer(target, sregion.base, sregion.length)); } -static inline isc_result_t towire_l32(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_l32(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_l32); REQUIRE(rdata->length == 6); @@ -105,8 +105,8 @@ static inline isc_result_t towire_l32(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_l32(ARGS_COMPARE) -{ +static inline int +compare_l32(ARGS_COMPARE) { isc_region_t region1; isc_region_t region2; @@ -121,10 +121,10 @@ static inline int compare_l32(ARGS_COMPARE) return (isc_region_compare(®ion1, ®ion2)); } -static inline isc_result_t fromstruct_l32(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_l32(ARGS_FROMSTRUCT) { dns_rdata_l32_t *l32 = source; - uint32_t n; + uint32_t n; REQUIRE(type == dns_rdatatype_l32); REQUIRE(l32 != NULL); @@ -139,11 +139,11 @@ static inline isc_result_t fromstruct_l32(ARGS_FROMSTRUCT) return (uint32_tobuffer(n, target)); } -static inline isc_result_t tostruct_l32(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_l32(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_l32_t *l32 = target; - uint32_t n; + uint32_t n; REQUIRE(rdata->type == dns_rdatatype_l32); REQUIRE(l32 != NULL); @@ -162,8 +162,8 @@ static inline isc_result_t tostruct_l32(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_l32(ARGS_FREESTRUCT) -{ +static inline void +freestruct_l32(ARGS_FREESTRUCT) { dns_rdata_l32_t *l32 = source; REQUIRE(l32 != NULL); @@ -172,8 +172,8 @@ static inline void freestruct_l32(ARGS_FREESTRUCT) return; } -static inline isc_result_t additionaldata_l32(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_l32(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_l32); REQUIRE(rdata->length == 6); @@ -184,8 +184,8 @@ static inline isc_result_t additionaldata_l32(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_l32(ARGS_DIGEST) -{ +static inline isc_result_t +digest_l32(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_l32); @@ -196,8 +196,8 @@ static inline isc_result_t digest_l32(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_l32(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_l32(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_l32); UNUSED(name); @@ -208,8 +208,8 @@ static inline bool checkowner_l32(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_l32(ARGS_CHECKNAMES) -{ +static inline bool +checknames_l32(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_l32); REQUIRE(rdata->length == 6); @@ -220,8 +220,8 @@ static inline bool checknames_l32(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_l32(ARGS_COMPARE) -{ +static inline int +casecompare_l32(ARGS_COMPARE) { return (compare_l32(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/l64_106.c b/lib/dns/rdata/generic/l64_106.c index bf31cd557e..6f96831164 100644 --- a/lib/dns/rdata/generic/l64_106.c +++ b/lib/dns/rdata/generic/l64_106.c @@ -18,9 +18,9 @@ #define RRTYPE_L64_ATTRIBUTES (0) -static inline isc_result_t fromtext_l64(ARGS_FROMTEXT) -{ - isc_token_t token; +static inline isc_result_t +fromtext_l64(ARGS_FROMTEXT) { + isc_token_t token; unsigned char locator[NS_LOCATORSZ]; REQUIRE(type == dns_rdatatype_l64); @@ -47,10 +47,10 @@ static inline isc_result_t fromtext_l64(ARGS_FROMTEXT) return (mem_tobuffer(target, locator, NS_LOCATORSZ)); } -static inline isc_result_t totext_l64(ARGS_TOTEXT) -{ - isc_region_t region; - char buf[sizeof("xxxx:xxxx:xxxx:xxxx")]; +static inline isc_result_t +totext_l64(ARGS_TOTEXT) { + isc_region_t region; + char buf[sizeof("xxxx:xxxx:xxxx:xxxx")]; unsigned short num; REQUIRE(rdata->type == dns_rdatatype_l64); @@ -74,8 +74,8 @@ static inline isc_result_t totext_l64(ARGS_TOTEXT) return (str_totext(buf, target)); } -static inline isc_result_t fromwire_l64(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_l64(ARGS_FROMWIRE) { isc_region_t sregion; REQUIRE(type == dns_rdatatype_l64); @@ -93,8 +93,8 @@ static inline isc_result_t fromwire_l64(ARGS_FROMWIRE) return (mem_tobuffer(target, sregion.base, sregion.length)); } -static inline isc_result_t towire_l64(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_l64(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_l64); REQUIRE(rdata->length == 10); @@ -103,8 +103,8 @@ static inline isc_result_t towire_l64(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_l64(ARGS_COMPARE) -{ +static inline int +compare_l64(ARGS_COMPARE) { isc_region_t region1; isc_region_t region2; @@ -119,8 +119,8 @@ static inline int compare_l64(ARGS_COMPARE) return (isc_region_compare(®ion1, ®ion2)); } -static inline isc_result_t fromstruct_l64(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_l64(ARGS_FROMSTRUCT) { dns_rdata_l64_t *l64 = source; REQUIRE(type == dns_rdatatype_l64); @@ -135,9 +135,9 @@ static inline isc_result_t fromstruct_l64(ARGS_FROMSTRUCT) return (mem_tobuffer(target, l64->l64, sizeof(l64->l64))); } -static inline isc_result_t tostruct_l64(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_l64(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_l64_t *l64 = target; REQUIRE(rdata->type == dns_rdatatype_l64); @@ -156,8 +156,8 @@ static inline isc_result_t tostruct_l64(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_l64(ARGS_FREESTRUCT) -{ +static inline void +freestruct_l64(ARGS_FREESTRUCT) { dns_rdata_l64_t *l64 = source; REQUIRE(l64 != NULL); @@ -166,8 +166,8 @@ static inline void freestruct_l64(ARGS_FREESTRUCT) return; } -static inline isc_result_t additionaldata_l64(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_l64(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_l64); REQUIRE(rdata->length == 10); @@ -178,8 +178,8 @@ static inline isc_result_t additionaldata_l64(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_l64(ARGS_DIGEST) -{ +static inline isc_result_t +digest_l64(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_l64); @@ -190,8 +190,8 @@ static inline isc_result_t digest_l64(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_l64(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_l64(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_l64); UNUSED(name); @@ -202,8 +202,8 @@ static inline bool checkowner_l64(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_l64(ARGS_CHECKNAMES) -{ +static inline bool +checknames_l64(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_l64); REQUIRE(rdata->length == 10); @@ -214,8 +214,8 @@ static inline bool checknames_l64(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_l64(ARGS_COMPARE) -{ +static inline int +casecompare_l64(ARGS_COMPARE) { return (compare_l64(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c index 53e84f5fc8..26e6381942 100644 --- a/lib/dns/rdata/generic/loc_29.c +++ b/lib/dns/rdata/generic/loc_29.c @@ -16,26 +16,26 @@ #define RRTYPE_LOC_ATTRIBUTES (0) -static inline isc_result_t fromtext_loc(ARGS_FROMTEXT) -{ - isc_token_t token; - int d1, m1, s1; - int d2, m2, s2; +static inline isc_result_t +fromtext_loc(ARGS_FROMTEXT) { + isc_token_t token; + int d1, m1, s1; + int d2, m2, s2; unsigned char size; unsigned char hp; unsigned char vp; unsigned char version; - bool east = false; - bool north = false; - long tmp; - long m; - long cm; - long poweroften[8] = { 1, 10, 100, 1000, - 10000, 100000, 1000000, 10000000 }; - int man; - int exp; - char * e; - int i; + bool east = false; + bool north = false; + long tmp; + long m; + long cm; + long poweroften[8] = { 1, 10, 100, 1000, + 10000, 100000, 1000000, 10000000 }; + int man; + int exp; + char *e; + int i; unsigned long latitude; unsigned long longitude; unsigned long altitude; @@ -128,7 +128,7 @@ static inline isc_result_t fromtext_loc(ARGS_FROMTEXT) } } if (*l != '\0' && callbacks != NULL) { - const char * file = isc_lex_getsourcename(lexer); + const char *file = isc_lex_getsourcename(lexer); unsigned long line = isc_lex_getsourceline(lexer); if (file == NULL) { @@ -232,7 +232,7 @@ getlong: } } if (*l != '\0' && callbacks != NULL) { - const char * file = isc_lex_getsourcename(lexer); + const char *file = isc_lex_getsourcename(lexer); unsigned long line = isc_lex_getsourceline(lexer); if (file == NULL) { @@ -320,8 +320,8 @@ getalt: */ RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, true)); - if (token.type == isc_tokentype_eol || - token.type == isc_tokentype_eof) { + if (token.type == isc_tokentype_eol || token.type == isc_tokentype_eof) + { isc_lex_ungettoken(lexer, &token); goto encode; } @@ -381,8 +381,8 @@ getalt: */ RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, true)); - if (token.type == isc_tokentype_eol || - token.type == isc_tokentype_eof) { + if (token.type == isc_tokentype_eol || token.type == isc_tokentype_eof) + { isc_lex_ungettoken(lexer, &token); goto encode; } @@ -440,8 +440,8 @@ getalt: */ RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, true)); - if (token.type == isc_tokentype_eol || - token.type == isc_tokentype_eof) { + if (token.type == isc_tokentype_eol || token.type == isc_tokentype_eof) + { isc_lex_ungettoken(lexer, &token); goto encode; } @@ -516,20 +516,20 @@ encode: return (uint32_tobuffer(altitude, target)); } -static inline isc_result_t totext_loc(ARGS_TOTEXT) -{ - int d1, m1, s1, fs1; - int d2, m2, s2, fs2; +static inline isc_result_t +totext_loc(ARGS_TOTEXT) { + int d1, m1, s1, fs1; + int d2, m2, s2, fs2; unsigned long latitude; unsigned long longitude; unsigned long altitude; - bool north; - bool east; - bool below; - isc_region_t sr; - char sbuf[sizeof("90000000m")]; - char hbuf[sizeof("90000000m")]; - char vbuf[sizeof("90000000m")]; + bool north; + bool east; + bool below; + isc_region_t sr; + char sbuf[sizeof("90000000m")]; + char hbuf[sizeof("90000000m")]; + char vbuf[sizeof("90000000m")]; /* "89 59 59.999 N 179 59 59.999 E " */ /* "-42849672.95m 90000000m 90000000m 90000000m"; */ char buf[8 * 6 + 12 * 1 + 2 * 10 + sizeof(sbuf) + sizeof(hbuf) + @@ -635,9 +635,9 @@ static inline isc_result_t totext_loc(ARGS_TOTEXT) return (str_totext(buf, target)); } -static inline isc_result_t fromwire_loc(ARGS_FROMWIRE) -{ - isc_region_t sr; +static inline isc_result_t +fromwire_loc(ARGS_FROMWIRE) { + isc_region_t sr; unsigned char c; unsigned long latitude; unsigned long longitude; @@ -709,7 +709,8 @@ static inline isc_result_t fromwire_loc(ARGS_FROMWIRE) */ latitude = uint32_fromregion(&sr); if (latitude < (0x80000000UL - 90 * 3600000) || - latitude > (0x80000000UL + 90 * 3600000)) { + latitude > (0x80000000UL + 90 * 3600000)) + { return (ISC_R_RANGE); } isc_region_consume(&sr, 4); @@ -719,7 +720,8 @@ static inline isc_result_t fromwire_loc(ARGS_FROMWIRE) */ longitude = uint32_fromregion(&sr); if (longitude < (0x80000000UL - 180 * 3600000) || - longitude > (0x80000000UL + 180 * 3600000)) { + longitude > (0x80000000UL + 180 * 3600000)) + { return (ISC_R_RANGE); } @@ -733,8 +735,8 @@ static inline isc_result_t fromwire_loc(ARGS_FROMWIRE) return (mem_tobuffer(target, sr.base, 16)); } -static inline isc_result_t towire_loc(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_loc(ARGS_TOWIRE) { UNUSED(cctx); REQUIRE(rdata->type == dns_rdatatype_loc); @@ -743,8 +745,8 @@ static inline isc_result_t towire_loc(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_loc(ARGS_COMPARE) -{ +static inline int +compare_loc(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -759,10 +761,10 @@ static inline int compare_loc(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_loc(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_loc(ARGS_FROMSTRUCT) { dns_rdata_loc_t *loc = source; - uint8_t c; + uint8_t c; REQUIRE(type == dns_rdatatype_loc); REQUIRE(loc != NULL); @@ -796,24 +798,26 @@ static inline isc_result_t fromstruct_loc(ARGS_FROMSTRUCT) RETERR(uint8_tobuffer(loc->v.v0.vertical, target)); if (loc->v.v0.latitude < (0x80000000UL - 90 * 3600000) || - loc->v.v0.latitude > (0x80000000UL + 90 * 3600000)) { + loc->v.v0.latitude > (0x80000000UL + 90 * 3600000)) + { return (ISC_R_RANGE); } RETERR(uint32_tobuffer(loc->v.v0.latitude, target)); if (loc->v.v0.longitude < (0x80000000UL - 180 * 3600000) || - loc->v.v0.longitude > (0x80000000UL + 180 * 3600000)) { + loc->v.v0.longitude > (0x80000000UL + 180 * 3600000)) + { return (ISC_R_RANGE); } RETERR(uint32_tobuffer(loc->v.v0.longitude, target)); return (uint32_tobuffer(loc->v.v0.altitude, target)); } -static inline isc_result_t tostruct_loc(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_loc(ARGS_TOSTRUCT) { dns_rdata_loc_t *loc = target; - isc_region_t r; - uint8_t version; + isc_region_t r; + uint8_t version; REQUIRE(rdata->type == dns_rdatatype_loc); REQUIRE(loc != NULL); @@ -848,8 +852,8 @@ static inline isc_result_t tostruct_loc(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_loc(ARGS_FREESTRUCT) -{ +static inline void +freestruct_loc(ARGS_FREESTRUCT) { dns_rdata_loc_t *loc = source; REQUIRE(loc != NULL); @@ -859,8 +863,8 @@ static inline void freestruct_loc(ARGS_FREESTRUCT) UNUSED(loc); } -static inline isc_result_t additionaldata_loc(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_loc(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_loc); UNUSED(rdata); @@ -870,8 +874,8 @@ static inline isc_result_t additionaldata_loc(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_loc(ARGS_DIGEST) -{ +static inline isc_result_t +digest_loc(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_loc); @@ -881,8 +885,8 @@ static inline isc_result_t digest_loc(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_loc(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_loc(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_loc); UNUSED(name); @@ -893,8 +897,8 @@ static inline bool checkowner_loc(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_loc(ARGS_CHECKNAMES) -{ +static inline bool +checknames_loc(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_loc); UNUSED(rdata); @@ -904,8 +908,8 @@ static inline bool checknames_loc(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_loc(ARGS_COMPARE) -{ +static inline int +casecompare_loc(ARGS_COMPARE) { return (compare_loc(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/lp_107.c b/lib/dns/rdata/generic/lp_107.c index df22c0ed26..4c9eb10934 100644 --- a/lib/dns/rdata/generic/lp_107.c +++ b/lib/dns/rdata/generic/lp_107.c @@ -18,10 +18,10 @@ #define RRTYPE_LP_ATTRIBUTES (0) -static inline isc_result_t fromtext_lp(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_lp(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; REQUIRE(type == dns_rdatatype_lp); @@ -48,13 +48,13 @@ static inline isc_result_t fromtext_lp(ARGS_FROMTEXT) return (dns_name_fromtext(&name, &buffer, origin, options, target)); } -static inline isc_result_t totext_lp(ARGS_TOTEXT) -{ - isc_region_t region; - dns_name_t name; - dns_name_t prefix; - bool sub; - char buf[sizeof("64000")]; +static inline isc_result_t +totext_lp(ARGS_TOTEXT) { + isc_region_t region; + dns_name_t name; + dns_name_t prefix; + bool sub; + char buf[sizeof("64000")]; unsigned short num; REQUIRE(rdata->type == dns_rdatatype_lp); @@ -76,9 +76,9 @@ static inline isc_result_t totext_lp(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_lp(ARGS_FROMWIRE) -{ - dns_name_t name; +static inline isc_result_t +fromwire_lp(ARGS_FROMWIRE) { + dns_name_t name; isc_region_t sregion; REQUIRE(type == dns_rdatatype_lp); @@ -99,8 +99,8 @@ static inline isc_result_t fromwire_lp(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_lp(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_lp(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_lp); REQUIRE(rdata->length != 0); @@ -109,8 +109,8 @@ static inline isc_result_t towire_lp(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_lp(ARGS_COMPARE) -{ +static inline int +compare_lp(ARGS_COMPARE) { isc_region_t region1; isc_region_t region2; @@ -126,10 +126,10 @@ static inline int compare_lp(ARGS_COMPARE) return (isc_region_compare(®ion1, ®ion2)); } -static inline isc_result_t fromstruct_lp(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_lp(ARGS_FROMSTRUCT) { dns_rdata_lp_t *lp = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_lp); REQUIRE(lp != NULL); @@ -144,11 +144,11 @@ static inline isc_result_t fromstruct_lp(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_lp(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_lp(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_lp_t *lp = target; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_lp); REQUIRE(lp != NULL); @@ -169,8 +169,8 @@ static inline isc_result_t tostruct_lp(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_lp(ARGS_FREESTRUCT) -{ +static inline void +freestruct_lp(ARGS_FREESTRUCT) { dns_rdata_lp_t *lp = source; REQUIRE(lp != NULL); @@ -184,12 +184,12 @@ static inline void freestruct_lp(ARGS_FREESTRUCT) lp->mctx = NULL; } -static inline isc_result_t additionaldata_lp(ARGS_ADDLDATA) -{ - dns_name_t name; +static inline isc_result_t +additionaldata_lp(ARGS_ADDLDATA) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; - isc_result_t result; + isc_region_t region; + isc_result_t result; REQUIRE(rdata->type == dns_rdatatype_lp); @@ -205,8 +205,8 @@ static inline isc_result_t additionaldata_lp(ARGS_ADDLDATA) return ((add)(arg, &name, dns_rdatatype_l64)); } -static inline isc_result_t digest_lp(ARGS_DIGEST) -{ +static inline isc_result_t +digest_lp(ARGS_DIGEST) { isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_lp); @@ -215,8 +215,8 @@ static inline isc_result_t digest_lp(ARGS_DIGEST) return ((digest)(arg, ®ion)); } -static inline bool checkowner_lp(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_lp(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_lp); UNUSED(type); @@ -227,8 +227,8 @@ static inline bool checkowner_lp(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_lp(ARGS_CHECKNAMES) -{ +static inline bool +checknames_lp(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_lp); UNUSED(bad); @@ -237,13 +237,13 @@ static inline bool checknames_lp(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_lp(ARGS_COMPARE) -{ - dns_name_t name1; - dns_name_t name2; +static inline int +casecompare_lp(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; - int order; + int order; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c index 022607c295..cfd0d33c2d 100644 --- a/lib/dns/rdata/generic/mb_7.c +++ b/lib/dns/rdata/generic/mb_7.c @@ -14,10 +14,10 @@ #define RRTYPE_MB_ATTRIBUTES (0) -static inline isc_result_t fromtext_mb(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_mb(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; REQUIRE(type == dns_rdatatype_mb); @@ -38,12 +38,12 @@ static inline isc_result_t fromtext_mb(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_mb(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_mb(ARGS_TOTEXT) { isc_region_t region; - dns_name_t name; - dns_name_t prefix; - bool sub; + dns_name_t name; + dns_name_t prefix; + bool sub; REQUIRE(rdata->type == dns_rdatatype_mb); REQUIRE(rdata->length != 0); @@ -59,8 +59,8 @@ static inline isc_result_t totext_mb(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_mb(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_mb(ARGS_FROMWIRE) { dns_name_t name; REQUIRE(type == dns_rdatatype_mb); @@ -74,11 +74,11 @@ static inline isc_result_t fromwire_mb(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_mb(ARGS_TOWIRE) -{ - dns_name_t name; +static inline isc_result_t +towire_mb(ARGS_TOWIRE) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_mb); REQUIRE(rdata->length != 0); @@ -92,10 +92,10 @@ static inline isc_result_t towire_mb(ARGS_TOWIRE) return (dns_name_towire(&name, cctx, target)); } -static inline int compare_mb(ARGS_COMPARE) -{ - dns_name_t name1; - dns_name_t name2; +static inline int +compare_mb(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; @@ -117,10 +117,10 @@ static inline int compare_mb(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_mb(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_mb(ARGS_FROMSTRUCT) { dns_rdata_mb_t *mb = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_mb); REQUIRE(mb != NULL); @@ -134,11 +134,11 @@ static inline isc_result_t fromstruct_mb(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_mb(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_mb(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_mb_t *mb = target; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_mb); REQUIRE(mb != NULL); @@ -157,8 +157,8 @@ static inline isc_result_t tostruct_mb(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_mb(ARGS_FREESTRUCT) -{ +static inline void +freestruct_mb(ARGS_FREESTRUCT) { dns_rdata_mb_t *mb = source; REQUIRE(mb != NULL); @@ -171,11 +171,11 @@ static inline void freestruct_mb(ARGS_FREESTRUCT) mb->mctx = NULL; } -static inline isc_result_t additionaldata_mb(ARGS_ADDLDATA) -{ - dns_name_t name; +static inline isc_result_t +additionaldata_mb(ARGS_ADDLDATA) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_mb); @@ -186,10 +186,10 @@ static inline isc_result_t additionaldata_mb(ARGS_ADDLDATA) return ((add)(arg, &name, dns_rdatatype_a)); } -static inline isc_result_t digest_mb(ARGS_DIGEST) -{ +static inline isc_result_t +digest_mb(ARGS_DIGEST) { isc_region_t r; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_mb); @@ -200,8 +200,8 @@ static inline isc_result_t digest_mb(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_mb(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_mb(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_mb); UNUSED(type); @@ -211,8 +211,8 @@ static inline bool checkowner_mb(ARGS_CHECKOWNER) return (dns_name_ismailbox(name)); } -static inline bool checknames_mb(ARGS_CHECKNAMES) -{ +static inline bool +checknames_mb(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_mb); UNUSED(rdata); @@ -222,8 +222,8 @@ static inline bool checknames_mb(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_mb(ARGS_COMPARE) -{ +static inline int +casecompare_mb(ARGS_COMPARE) { return (compare_mb(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c index f48d7467bb..c23d29b3d8 100644 --- a/lib/dns/rdata/generic/md_3.c +++ b/lib/dns/rdata/generic/md_3.c @@ -14,10 +14,10 @@ #define RRTYPE_MD_ATTRIBUTES (0) -static inline isc_result_t fromtext_md(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_md(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; REQUIRE(type == dns_rdatatype_md); @@ -38,12 +38,12 @@ static inline isc_result_t fromtext_md(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_md(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_md(ARGS_TOTEXT) { isc_region_t region; - dns_name_t name; - dns_name_t prefix; - bool sub; + dns_name_t name; + dns_name_t prefix; + bool sub; REQUIRE(rdata->type == dns_rdatatype_md); REQUIRE(rdata->length != 0); @@ -59,8 +59,8 @@ static inline isc_result_t totext_md(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_md(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_md(ARGS_FROMWIRE) { dns_name_t name; REQUIRE(type == dns_rdatatype_md); @@ -74,11 +74,11 @@ static inline isc_result_t fromwire_md(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_md(ARGS_TOWIRE) -{ - dns_name_t name; +static inline isc_result_t +towire_md(ARGS_TOWIRE) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_md); REQUIRE(rdata->length != 0); @@ -92,10 +92,10 @@ static inline isc_result_t towire_md(ARGS_TOWIRE) return (dns_name_towire(&name, cctx, target)); } -static inline int compare_md(ARGS_COMPARE) -{ - dns_name_t name1; - dns_name_t name2; +static inline int +compare_md(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; @@ -117,10 +117,10 @@ static inline int compare_md(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_md(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_md(ARGS_FROMSTRUCT) { dns_rdata_md_t *md = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_md); REQUIRE(md != NULL); @@ -134,11 +134,11 @@ static inline isc_result_t fromstruct_md(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_md(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_md(ARGS_TOSTRUCT) { dns_rdata_md_t *md = target; - isc_region_t r; - dns_name_t name; + isc_region_t r; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_md); REQUIRE(md != NULL); @@ -157,8 +157,8 @@ static inline isc_result_t tostruct_md(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_md(ARGS_FREESTRUCT) -{ +static inline void +freestruct_md(ARGS_FREESTRUCT) { dns_rdata_md_t *md = source; REQUIRE(md != NULL); @@ -172,11 +172,11 @@ static inline void freestruct_md(ARGS_FREESTRUCT) md->mctx = NULL; } -static inline isc_result_t additionaldata_md(ARGS_ADDLDATA) -{ - dns_name_t name; +static inline isc_result_t +additionaldata_md(ARGS_ADDLDATA) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_md); @@ -187,10 +187,10 @@ static inline isc_result_t additionaldata_md(ARGS_ADDLDATA) return ((add)(arg, &name, dns_rdatatype_a)); } -static inline isc_result_t digest_md(ARGS_DIGEST) -{ +static inline isc_result_t +digest_md(ARGS_DIGEST) { isc_region_t r; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_md); @@ -201,8 +201,8 @@ static inline isc_result_t digest_md(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_md(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_md(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_md); UNUSED(name); @@ -213,8 +213,8 @@ static inline bool checkowner_md(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_md(ARGS_CHECKNAMES) -{ +static inline bool +checknames_md(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_md); UNUSED(rdata); @@ -224,8 +224,8 @@ static inline bool checknames_md(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_md(ARGS_COMPARE) -{ +static inline int +casecompare_md(ARGS_COMPARE) { return (compare_md(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c index 3d872d1072..f07fbcccae 100644 --- a/lib/dns/rdata/generic/mf_4.c +++ b/lib/dns/rdata/generic/mf_4.c @@ -14,10 +14,10 @@ #define RRTYPE_MF_ATTRIBUTES (0) -static inline isc_result_t fromtext_mf(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_mf(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; REQUIRE(type == dns_rdatatype_mf); @@ -38,12 +38,12 @@ static inline isc_result_t fromtext_mf(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_mf(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_mf(ARGS_TOTEXT) { isc_region_t region; - dns_name_t name; - dns_name_t prefix; - bool sub; + dns_name_t name; + dns_name_t prefix; + bool sub; REQUIRE(rdata->type == dns_rdatatype_mf); REQUIRE(rdata->length != 0); @@ -59,8 +59,8 @@ static inline isc_result_t totext_mf(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_mf(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_mf(ARGS_FROMWIRE) { dns_name_t name; REQUIRE(type == dns_rdatatype_mf); @@ -74,11 +74,11 @@ static inline isc_result_t fromwire_mf(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_mf(ARGS_TOWIRE) -{ - dns_name_t name; +static inline isc_result_t +towire_mf(ARGS_TOWIRE) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_mf); REQUIRE(rdata->length != 0); @@ -92,10 +92,10 @@ static inline isc_result_t towire_mf(ARGS_TOWIRE) return (dns_name_towire(&name, cctx, target)); } -static inline int compare_mf(ARGS_COMPARE) -{ - dns_name_t name1; - dns_name_t name2; +static inline int +compare_mf(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; @@ -117,10 +117,10 @@ static inline int compare_mf(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_mf(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_mf(ARGS_FROMSTRUCT) { dns_rdata_mf_t *mf = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_mf); REQUIRE(mf != NULL); @@ -134,11 +134,11 @@ static inline isc_result_t fromstruct_mf(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_mf(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_mf(ARGS_TOSTRUCT) { dns_rdata_mf_t *mf = target; - isc_region_t r; - dns_name_t name; + isc_region_t r; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_mf); REQUIRE(mf != NULL); @@ -157,8 +157,8 @@ static inline isc_result_t tostruct_mf(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_mf(ARGS_FREESTRUCT) -{ +static inline void +freestruct_mf(ARGS_FREESTRUCT) { dns_rdata_mf_t *mf = source; REQUIRE(mf != NULL); @@ -171,11 +171,11 @@ static inline void freestruct_mf(ARGS_FREESTRUCT) mf->mctx = NULL; } -static inline isc_result_t additionaldata_mf(ARGS_ADDLDATA) -{ - dns_name_t name; +static inline isc_result_t +additionaldata_mf(ARGS_ADDLDATA) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_mf); @@ -186,10 +186,10 @@ static inline isc_result_t additionaldata_mf(ARGS_ADDLDATA) return ((add)(arg, &name, dns_rdatatype_a)); } -static inline isc_result_t digest_mf(ARGS_DIGEST) -{ +static inline isc_result_t +digest_mf(ARGS_DIGEST) { isc_region_t r; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_mf); @@ -200,8 +200,8 @@ static inline isc_result_t digest_mf(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_mf(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_mf(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_mf); UNUSED(name); @@ -212,8 +212,8 @@ static inline bool checkowner_mf(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_mf(ARGS_CHECKNAMES) -{ +static inline bool +checknames_mf(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_mf); UNUSED(rdata); @@ -223,8 +223,8 @@ static inline bool checknames_mf(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_mf(ARGS_COMPARE) -{ +static inline int +casecompare_mf(ARGS_COMPARE) { return (compare_mf(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c index e21eb76b00..fb5fb8da45 100644 --- a/lib/dns/rdata/generic/mg_8.c +++ b/lib/dns/rdata/generic/mg_8.c @@ -14,10 +14,10 @@ #define RRTYPE_MG_ATTRIBUTES (0) -static inline isc_result_t fromtext_mg(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_mg(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; REQUIRE(type == dns_rdatatype_mg); @@ -38,12 +38,12 @@ static inline isc_result_t fromtext_mg(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_mg(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_mg(ARGS_TOTEXT) { isc_region_t region; - dns_name_t name; - dns_name_t prefix; - bool sub; + dns_name_t name; + dns_name_t prefix; + bool sub; REQUIRE(rdata->type == dns_rdatatype_mg); REQUIRE(rdata->length != 0); @@ -59,8 +59,8 @@ static inline isc_result_t totext_mg(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_mg(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_mg(ARGS_FROMWIRE) { dns_name_t name; REQUIRE(type == dns_rdatatype_mg); @@ -74,11 +74,11 @@ static inline isc_result_t fromwire_mg(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_mg(ARGS_TOWIRE) -{ - dns_name_t name; +static inline isc_result_t +towire_mg(ARGS_TOWIRE) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_mg); REQUIRE(rdata->length != 0); @@ -92,10 +92,10 @@ static inline isc_result_t towire_mg(ARGS_TOWIRE) return (dns_name_towire(&name, cctx, target)); } -static inline int compare_mg(ARGS_COMPARE) -{ - dns_name_t name1; - dns_name_t name2; +static inline int +compare_mg(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; @@ -117,10 +117,10 @@ static inline int compare_mg(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_mg(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_mg(ARGS_FROMSTRUCT) { dns_rdata_mg_t *mg = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_mg); REQUIRE(mg != NULL); @@ -134,11 +134,11 @@ static inline isc_result_t fromstruct_mg(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_mg(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_mg(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_mg_t *mg = target; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_mg); REQUIRE(mg != NULL); @@ -157,8 +157,8 @@ static inline isc_result_t tostruct_mg(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_mg(ARGS_FREESTRUCT) -{ +static inline void +freestruct_mg(ARGS_FREESTRUCT) { dns_rdata_mg_t *mg = source; REQUIRE(mg != NULL); @@ -171,8 +171,8 @@ static inline void freestruct_mg(ARGS_FREESTRUCT) mg->mctx = NULL; } -static inline isc_result_t additionaldata_mg(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_mg(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_mg); UNUSED(add); @@ -182,10 +182,10 @@ static inline isc_result_t additionaldata_mg(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_mg(ARGS_DIGEST) -{ +static inline isc_result_t +digest_mg(ARGS_DIGEST) { isc_region_t r; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_mg); @@ -196,8 +196,8 @@ static inline isc_result_t digest_mg(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_mg(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_mg(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_mg); UNUSED(type); @@ -207,8 +207,8 @@ static inline bool checkowner_mg(ARGS_CHECKOWNER) return (dns_name_ismailbox(name)); } -static inline bool checknames_mg(ARGS_CHECKNAMES) -{ +static inline bool +checknames_mg(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_mg); UNUSED(rdata); @@ -218,8 +218,8 @@ static inline bool checknames_mg(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_mg(ARGS_COMPARE) -{ +static inline int +casecompare_mg(ARGS_COMPARE) { return (compare_mg(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c index 92f59a0888..be302f1eaf 100644 --- a/lib/dns/rdata/generic/minfo_14.c +++ b/lib/dns/rdata/generic/minfo_14.c @@ -14,13 +14,13 @@ #define RRTYPE_MINFO_ATTRIBUTES (0) -static inline isc_result_t fromtext_minfo(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_minfo(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; - int i; - bool ok; + int i; + bool ok; REQUIRE(type == dns_rdatatype_minfo); @@ -53,13 +53,13 @@ static inline isc_result_t fromtext_minfo(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_minfo(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_minfo(ARGS_TOTEXT) { isc_region_t region; - dns_name_t rmail; - dns_name_t email; - dns_name_t prefix; - bool sub; + dns_name_t rmail; + dns_name_t email; + dns_name_t prefix; + bool sub; REQUIRE(rdata->type == dns_rdatatype_minfo); REQUIRE(rdata->length != 0); @@ -86,8 +86,8 @@ static inline isc_result_t totext_minfo(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_minfo(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_minfo(ARGS_FROMWIRE) { dns_name_t rmail; dns_name_t email; @@ -105,11 +105,11 @@ static inline isc_result_t fromwire_minfo(ARGS_FROMWIRE) return (dns_name_fromwire(&email, source, dctx, options, target)); } -static inline isc_result_t towire_minfo(ARGS_TOWIRE) -{ - isc_region_t region; - dns_name_t rmail; - dns_name_t email; +static inline isc_result_t +towire_minfo(ARGS_TOWIRE) { + isc_region_t region; + dns_name_t rmail; + dns_name_t email; dns_offsets_t roffsets; dns_offsets_t eoffsets; @@ -134,13 +134,13 @@ static inline isc_result_t towire_minfo(ARGS_TOWIRE) return (dns_name_towire(&rmail, cctx, target)); } -static inline int compare_minfo(ARGS_COMPARE) -{ +static inline int +compare_minfo(ARGS_COMPARE) { isc_region_t region1; isc_region_t region2; - dns_name_t name1; - dns_name_t name2; - int order; + dns_name_t name1; + dns_name_t name2; + int order; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); @@ -175,10 +175,10 @@ static inline int compare_minfo(ARGS_COMPARE) return (order); } -static inline isc_result_t fromstruct_minfo(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_minfo(ARGS_FROMSTRUCT) { dns_rdata_minfo_t *minfo = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_minfo); REQUIRE(minfo != NULL); @@ -194,12 +194,12 @@ static inline isc_result_t fromstruct_minfo(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_minfo(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_minfo(ARGS_TOSTRUCT) { dns_rdata_minfo_t *minfo = target; - isc_region_t region; - dns_name_t name; - isc_result_t result; + isc_region_t region; + dns_name_t name; + isc_result_t result; REQUIRE(rdata->type == dns_rdatatype_minfo); REQUIRE(minfo != NULL); @@ -232,8 +232,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_minfo(ARGS_FREESTRUCT) -{ +static inline void +freestruct_minfo(ARGS_FREESTRUCT) { dns_rdata_minfo_t *minfo = source; REQUIRE(minfo != NULL); @@ -248,8 +248,8 @@ static inline void freestruct_minfo(ARGS_FREESTRUCT) minfo->mctx = NULL; } -static inline isc_result_t additionaldata_minfo(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_minfo(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_minfo); UNUSED(rdata); @@ -259,10 +259,10 @@ static inline isc_result_t additionaldata_minfo(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_minfo(ARGS_DIGEST) -{ +static inline isc_result_t +digest_minfo(ARGS_DIGEST) { isc_region_t r; - dns_name_t name; + dns_name_t name; isc_result_t result; REQUIRE(rdata->type == dns_rdatatype_minfo); @@ -281,8 +281,8 @@ static inline isc_result_t digest_minfo(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_minfo(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_minfo(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_minfo); UNUSED(name); @@ -293,10 +293,10 @@ static inline bool checkowner_minfo(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_minfo(ARGS_CHECKNAMES) -{ +static inline bool +checknames_minfo(ARGS_CHECKNAMES) { isc_region_t region; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_minfo); @@ -322,8 +322,8 @@ static inline bool checknames_minfo(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_minfo(ARGS_COMPARE) -{ +static inline int +casecompare_minfo(ARGS_COMPARE) { return (compare_minfo(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c index 30062c34da..f5daf41176 100644 --- a/lib/dns/rdata/generic/mr_9.c +++ b/lib/dns/rdata/generic/mr_9.c @@ -14,10 +14,10 @@ #define RRTYPE_MR_ATTRIBUTES (0) -static inline isc_result_t fromtext_mr(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_mr(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; REQUIRE(type == dns_rdatatype_mr); @@ -38,12 +38,12 @@ static inline isc_result_t fromtext_mr(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_mr(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_mr(ARGS_TOTEXT) { isc_region_t region; - dns_name_t name; - dns_name_t prefix; - bool sub; + dns_name_t name; + dns_name_t prefix; + bool sub; REQUIRE(rdata->type == dns_rdatatype_mr); REQUIRE(rdata->length != 0); @@ -59,8 +59,8 @@ static inline isc_result_t totext_mr(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_mr(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_mr(ARGS_FROMWIRE) { dns_name_t name; REQUIRE(type == dns_rdatatype_mr); @@ -74,11 +74,11 @@ static inline isc_result_t fromwire_mr(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_mr(ARGS_TOWIRE) -{ - dns_name_t name; +static inline isc_result_t +towire_mr(ARGS_TOWIRE) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_mr); REQUIRE(rdata->length != 0); @@ -92,10 +92,10 @@ static inline isc_result_t towire_mr(ARGS_TOWIRE) return (dns_name_towire(&name, cctx, target)); } -static inline int compare_mr(ARGS_COMPARE) -{ - dns_name_t name1; - dns_name_t name2; +static inline int +compare_mr(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; @@ -117,10 +117,10 @@ static inline int compare_mr(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_mr(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_mr(ARGS_FROMSTRUCT) { dns_rdata_mr_t *mr = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_mr); REQUIRE(mr != NULL); @@ -134,11 +134,11 @@ static inline isc_result_t fromstruct_mr(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_mr(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_mr(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_mr_t *mr = target; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_mr); REQUIRE(mr != NULL); @@ -157,8 +157,8 @@ static inline isc_result_t tostruct_mr(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_mr(ARGS_FREESTRUCT) -{ +static inline void +freestruct_mr(ARGS_FREESTRUCT) { dns_rdata_mr_t *mr = source; REQUIRE(mr != NULL); @@ -171,8 +171,8 @@ static inline void freestruct_mr(ARGS_FREESTRUCT) mr->mctx = NULL; } -static inline isc_result_t additionaldata_mr(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_mr(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_mr); UNUSED(rdata); @@ -182,10 +182,10 @@ static inline isc_result_t additionaldata_mr(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_mr(ARGS_DIGEST) -{ +static inline isc_result_t +digest_mr(ARGS_DIGEST) { isc_region_t r; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_mr); @@ -196,8 +196,8 @@ static inline isc_result_t digest_mr(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_mr(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_mr(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_mr); UNUSED(name); @@ -208,8 +208,8 @@ static inline bool checkowner_mr(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_mr(ARGS_CHECKNAMES) -{ +static inline bool +checknames_mr(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_mr); UNUSED(rdata); @@ -219,8 +219,8 @@ static inline bool checknames_mr(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_mr(ARGS_COMPARE) -{ +static inline int +casecompare_mr(ARGS_COMPARE) { return (compare_mr(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c index f0b5de8929..6d6d2b50fc 100644 --- a/lib/dns/rdata/generic/mx_15.c +++ b/lib/dns/rdata/generic/mx_15.c @@ -21,10 +21,9 @@ #define RRTYPE_MX_ATTRIBUTES (0) static bool -check_mx(isc_token_t *token) -{ +check_mx(isc_token_t *token) { char tmp[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:123.123.123.123.")]; - struct in_addr addr; + struct in_addr addr; struct in6_addr addr6; if (strlcpy(tmp, DNS_AS_STR(*token), sizeof(tmp)) >= sizeof(tmp)) { @@ -35,19 +34,20 @@ check_mx(isc_token_t *token) tmp[strlen(tmp) - 1] = '\0'; } if (inet_pton(AF_INET, tmp, &addr) == 1 || - inet_pton(AF_INET6, tmp, &addr6) == 1) { + inet_pton(AF_INET6, tmp, &addr6) == 1) + { return (false); } return (true); } -static inline isc_result_t fromtext_mx(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_mx(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; - bool ok; + bool ok; REQUIRE(type == dns_rdatatype_mx); @@ -94,13 +94,13 @@ static inline isc_result_t fromtext_mx(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_mx(ARGS_TOTEXT) -{ - isc_region_t region; - dns_name_t name; - dns_name_t prefix; - bool sub; - char buf[sizeof("64000")]; +static inline isc_result_t +totext_mx(ARGS_TOTEXT) { + isc_region_t region; + dns_name_t name; + dns_name_t prefix; + bool sub; + char buf[sizeof("64000")]; unsigned short num; REQUIRE(rdata->type == dns_rdatatype_mx); @@ -122,9 +122,9 @@ static inline isc_result_t totext_mx(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_mx(ARGS_FROMWIRE) -{ - dns_name_t name; +static inline isc_result_t +fromwire_mx(ARGS_FROMWIRE) { + dns_name_t name; isc_region_t sregion; REQUIRE(type == dns_rdatatype_mx); @@ -145,11 +145,11 @@ static inline isc_result_t fromwire_mx(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_mx(ARGS_TOWIRE) -{ - dns_name_t name; +static inline isc_result_t +towire_mx(ARGS_TOWIRE) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_mx); REQUIRE(rdata->length != 0); @@ -166,13 +166,13 @@ static inline isc_result_t towire_mx(ARGS_TOWIRE) return (dns_name_towire(&name, cctx, target)); } -static inline int compare_mx(ARGS_COMPARE) -{ - dns_name_t name1; - dns_name_t name2; +static inline int +compare_mx(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; - int order; + int order; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); @@ -200,10 +200,10 @@ static inline int compare_mx(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_mx(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_mx(ARGS_FROMSTRUCT) { dns_rdata_mx_t *mx = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_mx); REQUIRE(mx != NULL); @@ -218,11 +218,11 @@ static inline isc_result_t fromstruct_mx(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_mx(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_mx(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_mx_t *mx = target; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_mx); REQUIRE(mx != NULL); @@ -243,8 +243,8 @@ static inline isc_result_t tostruct_mx(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_mx(ARGS_FREESTRUCT) -{ +static inline void +freestruct_mx(ARGS_FREESTRUCT) { dns_rdata_mx_t *mx = source; REQUIRE(mx != NULL); @@ -260,16 +260,16 @@ static inline void freestruct_mx(ARGS_FREESTRUCT) static unsigned char port25_offset[] = { 0, 3 }; static unsigned char port25_ndata[] = "\003_25\004_tcp"; -static dns_name_t port25 = - DNS_NAME_INITNONABSOLUTE(port25_ndata, port25_offset); +static dns_name_t port25 = DNS_NAME_INITNONABSOLUTE(port25_ndata, + port25_offset); -static inline isc_result_t additionaldata_mx(ARGS_ADDLDATA) -{ - isc_result_t result; +static inline isc_result_t +additionaldata_mx(ARGS_ADDLDATA) { + isc_result_t result; dns_fixedname_t fixed; - dns_name_t name; - dns_offsets_t offsets; - isc_region_t region; + dns_name_t name; + dns_offsets_t offsets; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_mx); @@ -297,10 +297,10 @@ static inline isc_result_t additionaldata_mx(ARGS_ADDLDATA) return ((add)(arg, dns_fixedname_name(&fixed), dns_rdatatype_tlsa)); } -static inline isc_result_t digest_mx(ARGS_DIGEST) -{ +static inline isc_result_t +digest_mx(ARGS_DIGEST) { isc_region_t r1, r2; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_mx); @@ -314,8 +314,8 @@ static inline isc_result_t digest_mx(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_mx(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_mx(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_mx); UNUSED(type); @@ -324,10 +324,10 @@ static inline bool checkowner_mx(ARGS_CHECKOWNER) return (dns_name_ishostname(name, wildcard)); } -static inline bool checknames_mx(ARGS_CHECKNAMES) -{ +static inline bool +checknames_mx(ARGS_CHECKNAMES) { isc_region_t region; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_mx); @@ -346,8 +346,8 @@ static inline bool checknames_mx(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_mx(ARGS_COMPARE) -{ +static inline int +casecompare_mx(ARGS_COMPARE) { return (compare_mx(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/naptr_35.c b/lib/dns/rdata/generic/naptr_35.c index 025d6ba34c..6544bc399d 100644 --- a/lib/dns/rdata/generic/naptr_35.c +++ b/lib/dns/rdata/generic/naptr_35.c @@ -23,17 +23,16 @@ * Don't allow embeded NUL's. */ static inline isc_result_t -txt_valid_regex(const unsigned char *txt) -{ - unsigned int nsub = 0; - char regex[256]; - char * cp; - bool flags = false; - bool replace = false; +txt_valid_regex(const unsigned char *txt) { + unsigned int nsub = 0; + char regex[256]; + char *cp; + bool flags = false; + bool replace = false; unsigned char c; unsigned char delim; - unsigned int len; - int n; + unsigned int len; + int n; len = *txt++; if (len == 0U) { @@ -168,11 +167,11 @@ txt_valid_regex(const unsigned char *txt) return (ISC_R_SUCCESS); } -static inline isc_result_t fromtext_naptr(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; - isc_buffer_t buffer; +static inline isc_result_t +fromtext_naptr(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; + isc_buffer_t buffer; unsigned char *regex; REQUIRE(type == dns_rdatatype_naptr); @@ -238,13 +237,13 @@ static inline isc_result_t fromtext_naptr(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_naptr(ARGS_TOTEXT) -{ - isc_region_t region; - dns_name_t name; - dns_name_t prefix; - bool sub; - char buf[sizeof("64000")]; +static inline isc_result_t +totext_naptr(ARGS_TOTEXT) { + isc_region_t region; + dns_name_t name; + dns_name_t prefix; + bool sub; + char buf[sizeof("64000")]; unsigned short num; REQUIRE(rdata->type == dns_rdatatype_naptr); @@ -299,10 +298,10 @@ static inline isc_result_t totext_naptr(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_naptr(ARGS_FROMWIRE) -{ - dns_name_t name; - isc_region_t sr; +static inline isc_result_t +fromwire_naptr(ARGS_FROMWIRE) { + dns_name_t name; + isc_region_t sr; unsigned char *regex; REQUIRE(type == dns_rdatatype_naptr); @@ -347,11 +346,11 @@ static inline isc_result_t fromwire_naptr(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_naptr(ARGS_TOWIRE) -{ - dns_name_t name; +static inline isc_result_t +towire_naptr(ARGS_TOWIRE) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t sr; + isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_naptr); REQUIRE(rdata->length != 0); @@ -390,13 +389,13 @@ static inline isc_result_t towire_naptr(ARGS_TOWIRE) return (dns_name_towire(&name, cctx, target)); } -static inline int compare_naptr(ARGS_COMPARE) -{ - dns_name_t name1; - dns_name_t name2; +static inline int +compare_naptr(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; - int order, len; + int order, len; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); @@ -462,10 +461,10 @@ static inline int compare_naptr(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_naptr(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_naptr(ARGS_FROMSTRUCT) { dns_rdata_naptr_t *naptr = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_naptr); REQUIRE(naptr != NULL); @@ -490,12 +489,12 @@ static inline isc_result_t fromstruct_naptr(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_naptr(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_naptr(ARGS_TOSTRUCT) { dns_rdata_naptr_t *naptr = target; - isc_region_t r; - isc_result_t result; - dns_name_t name; + isc_region_t r; + isc_result_t result; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_naptr); REQUIRE(naptr != NULL); @@ -567,8 +566,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_naptr(ARGS_FREESTRUCT) -{ +static inline void +freestruct_naptr(ARGS_FREESTRUCT) { dns_rdata_naptr_t *naptr = source; REQUIRE(naptr != NULL); @@ -591,14 +590,14 @@ static inline void freestruct_naptr(ARGS_FREESTRUCT) naptr->mctx = NULL; } -static inline isc_result_t additionaldata_naptr(ARGS_ADDLDATA) -{ - dns_name_t name; - dns_offsets_t offsets; - isc_region_t sr; +static inline isc_result_t +additionaldata_naptr(ARGS_ADDLDATA) { + dns_name_t name; + dns_offsets_t offsets; + isc_region_t sr; dns_rdatatype_t atype; - unsigned int i, flagslen; - char * cp; + unsigned int i, flagslen; + char *cp; REQUIRE(rdata->type == dns_rdatatype_naptr); @@ -649,12 +648,12 @@ static inline isc_result_t additionaldata_naptr(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_naptr(ARGS_DIGEST) -{ +static inline isc_result_t +digest_naptr(ARGS_DIGEST) { isc_region_t r1, r2; unsigned int length, n; isc_result_t result; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_naptr); @@ -708,8 +707,8 @@ static inline isc_result_t digest_naptr(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_naptr(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_naptr(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_naptr); UNUSED(name); @@ -720,8 +719,8 @@ static inline bool checkowner_naptr(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_naptr(ARGS_CHECKNAMES) -{ +static inline bool +checknames_naptr(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_naptr); UNUSED(rdata); @@ -731,8 +730,8 @@ static inline bool checknames_naptr(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_naptr(ARGS_COMPARE) -{ +static inline int +casecompare_naptr(ARGS_COMPARE) { return (compare_naptr(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/nid_104.c b/lib/dns/rdata/generic/nid_104.c index 001bbc724e..401a9e3b8f 100644 --- a/lib/dns/rdata/generic/nid_104.c +++ b/lib/dns/rdata/generic/nid_104.c @@ -18,9 +18,9 @@ #define RRTYPE_NID_ATTRIBUTES (0) -static inline isc_result_t fromtext_nid(ARGS_FROMTEXT) -{ - isc_token_t token; +static inline isc_result_t +fromtext_nid(ARGS_FROMTEXT) { + isc_token_t token; unsigned char locator[NS_LOCATORSZ]; REQUIRE(type == dns_rdatatype_nid); @@ -47,10 +47,10 @@ static inline isc_result_t fromtext_nid(ARGS_FROMTEXT) return (mem_tobuffer(target, locator, NS_LOCATORSZ)); } -static inline isc_result_t totext_nid(ARGS_TOTEXT) -{ - isc_region_t region; - char buf[sizeof("xxxx:xxxx:xxxx:xxxx")]; +static inline isc_result_t +totext_nid(ARGS_TOTEXT) { + isc_region_t region; + char buf[sizeof("xxxx:xxxx:xxxx:xxxx")]; unsigned short num; REQUIRE(rdata->type == dns_rdatatype_nid); @@ -74,8 +74,8 @@ static inline isc_result_t totext_nid(ARGS_TOTEXT) return (str_totext(buf, target)); } -static inline isc_result_t fromwire_nid(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_nid(ARGS_FROMWIRE) { isc_region_t sregion; REQUIRE(type == dns_rdatatype_nid); @@ -93,8 +93,8 @@ static inline isc_result_t fromwire_nid(ARGS_FROMWIRE) return (mem_tobuffer(target, sregion.base, sregion.length)); } -static inline isc_result_t towire_nid(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_nid(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_nid); REQUIRE(rdata->length == 10); @@ -103,8 +103,8 @@ static inline isc_result_t towire_nid(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_nid(ARGS_COMPARE) -{ +static inline int +compare_nid(ARGS_COMPARE) { isc_region_t region1; isc_region_t region2; @@ -119,8 +119,8 @@ static inline int compare_nid(ARGS_COMPARE) return (isc_region_compare(®ion1, ®ion2)); } -static inline isc_result_t fromstruct_nid(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_nid(ARGS_FROMSTRUCT) { dns_rdata_nid_t *nid = source; REQUIRE(type == dns_rdatatype_nid); @@ -135,9 +135,9 @@ static inline isc_result_t fromstruct_nid(ARGS_FROMSTRUCT) return (mem_tobuffer(target, nid->nid, sizeof(nid->nid))); } -static inline isc_result_t tostruct_nid(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_nid(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_nid_t *nid = target; REQUIRE(rdata->type == dns_rdatatype_nid); @@ -156,8 +156,8 @@ static inline isc_result_t tostruct_nid(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_nid(ARGS_FREESTRUCT) -{ +static inline void +freestruct_nid(ARGS_FREESTRUCT) { dns_rdata_nid_t *nid = source; REQUIRE(nid != NULL); @@ -166,8 +166,8 @@ static inline void freestruct_nid(ARGS_FREESTRUCT) return; } -static inline isc_result_t additionaldata_nid(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_nid(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_nid); REQUIRE(rdata->length == 10); @@ -178,8 +178,8 @@ static inline isc_result_t additionaldata_nid(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_nid(ARGS_DIGEST) -{ +static inline isc_result_t +digest_nid(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_nid); @@ -190,8 +190,8 @@ static inline isc_result_t digest_nid(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_nid(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_nid(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_nid); UNUSED(name); @@ -202,8 +202,8 @@ static inline bool checkowner_nid(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_nid(ARGS_CHECKNAMES) -{ +static inline bool +checknames_nid(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_nid); REQUIRE(rdata->length == 10); @@ -214,8 +214,8 @@ static inline bool checknames_nid(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_nid(ARGS_COMPARE) -{ +static inline int +casecompare_nid(ARGS_COMPARE) { return (compare_nid(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/ninfo_56.c b/lib/dns/rdata/generic/ninfo_56.c index 22d2f8d145..a081c52b94 100644 --- a/lib/dns/rdata/generic/ninfo_56.c +++ b/lib/dns/rdata/generic/ninfo_56.c @@ -14,8 +14,8 @@ #define RRTYPE_NINFO_ATTRIBUTES (0) -static inline isc_result_t fromtext_ninfo(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_ninfo(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_ninfo); UNUSED(type); @@ -28,8 +28,8 @@ static inline isc_result_t fromtext_ninfo(ARGS_FROMTEXT) target, callbacks)); } -static inline isc_result_t totext_ninfo(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_ninfo(ARGS_TOTEXT) { UNUSED(tctx); REQUIRE(rdata->type == dns_rdatatype_ninfo); @@ -37,8 +37,8 @@ static inline isc_result_t totext_ninfo(ARGS_TOTEXT) return (generic_totext_txt(rdata, tctx, target)); } -static inline isc_result_t fromwire_ninfo(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_ninfo(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_ninfo); UNUSED(type); @@ -50,8 +50,8 @@ static inline isc_result_t fromwire_ninfo(ARGS_FROMWIRE) target)); } -static inline isc_result_t towire_ninfo(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_ninfo(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_ninfo); UNUSED(cctx); @@ -59,8 +59,8 @@ static inline isc_result_t towire_ninfo(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_ninfo(ARGS_COMPARE) -{ +static inline int +compare_ninfo(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -73,15 +73,15 @@ static inline int compare_ninfo(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_ninfo(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_ninfo(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_ninfo); return (generic_fromstruct_txt(rdclass, type, source, target)); } -static inline isc_result_t tostruct_ninfo(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_ninfo(ARGS_TOSTRUCT) { dns_rdata_ninfo_t *ninfo = target; REQUIRE(rdata->type == dns_rdatatype_ninfo); @@ -94,8 +94,8 @@ static inline isc_result_t tostruct_ninfo(ARGS_TOSTRUCT) return (generic_tostruct_txt(rdata, target, mctx)); } -static inline void freestruct_ninfo(ARGS_FREESTRUCT) -{ +static inline void +freestruct_ninfo(ARGS_FREESTRUCT) { dns_rdata_ninfo_t *ninfo = source; REQUIRE(ninfo != NULL); @@ -104,8 +104,8 @@ static inline void freestruct_ninfo(ARGS_FREESTRUCT) generic_freestruct_txt(source); } -static inline isc_result_t additionaldata_ninfo(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_ninfo(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_ninfo); UNUSED(rdata); @@ -115,8 +115,8 @@ static inline isc_result_t additionaldata_ninfo(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_ninfo(ARGS_DIGEST) -{ +static inline isc_result_t +digest_ninfo(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_ninfo); @@ -126,8 +126,8 @@ static inline isc_result_t digest_ninfo(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_ninfo(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_ninfo(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_ninfo); UNUSED(name); @@ -138,8 +138,8 @@ static inline bool checkowner_ninfo(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_ninfo(ARGS_CHECKNAMES) -{ +static inline bool +checknames_ninfo(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_ninfo); UNUSED(rdata); @@ -149,14 +149,13 @@ static inline bool checknames_ninfo(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_ninfo(ARGS_COMPARE) -{ +static inline int +casecompare_ninfo(ARGS_COMPARE) { return (compare_ninfo(rdata1, rdata2)); } isc_result_t -dns_rdata_ninfo_first(dns_rdata_ninfo_t *ninfo) -{ +dns_rdata_ninfo_first(dns_rdata_ninfo_t *ninfo) { REQUIRE(ninfo != NULL); REQUIRE(ninfo->common.rdtype == dns_rdatatype_ninfo); @@ -164,8 +163,7 @@ dns_rdata_ninfo_first(dns_rdata_ninfo_t *ninfo) } isc_result_t -dns_rdata_ninfo_next(dns_rdata_ninfo_t *ninfo) -{ +dns_rdata_ninfo_next(dns_rdata_ninfo_t *ninfo) { REQUIRE(ninfo != NULL); REQUIRE(ninfo->common.rdtype == dns_rdatatype_ninfo); @@ -173,9 +171,8 @@ dns_rdata_ninfo_next(dns_rdata_ninfo_t *ninfo) } isc_result_t -dns_rdata_ninfo_current(dns_rdata_ninfo_t * ninfo, - dns_rdata_ninfo_string_t *string) -{ +dns_rdata_ninfo_current(dns_rdata_ninfo_t *ninfo, + dns_rdata_ninfo_string_t *string) { REQUIRE(ninfo != NULL); REQUIRE(ninfo->common.rdtype == dns_rdatatype_ninfo); diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c index e74613be22..34cde074c5 100644 --- a/lib/dns/rdata/generic/ns_2.c +++ b/lib/dns/rdata/generic/ns_2.c @@ -14,12 +14,12 @@ #define RRTYPE_NS_ATTRIBUTES (DNS_RDATATYPEATTR_ZONECUTAUTH) -static inline isc_result_t fromtext_ns(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_ns(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; - bool ok; + bool ok; REQUIRE(type == dns_rdatatype_ns); @@ -49,12 +49,12 @@ static inline isc_result_t fromtext_ns(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_ns(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_ns(ARGS_TOTEXT) { isc_region_t region; - dns_name_t name; - dns_name_t prefix; - bool sub; + dns_name_t name; + dns_name_t prefix; + bool sub; REQUIRE(rdata->type == dns_rdatatype_ns); REQUIRE(rdata->length != 0); @@ -70,8 +70,8 @@ static inline isc_result_t totext_ns(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_ns(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_ns(ARGS_FROMWIRE) { dns_name_t name; REQUIRE(type == dns_rdatatype_ns); @@ -85,11 +85,11 @@ static inline isc_result_t fromwire_ns(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_ns(ARGS_TOWIRE) -{ - dns_name_t name; +static inline isc_result_t +towire_ns(ARGS_TOWIRE) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_ns); REQUIRE(rdata->length != 0); @@ -103,10 +103,10 @@ static inline isc_result_t towire_ns(ARGS_TOWIRE) return (dns_name_towire(&name, cctx, target)); } -static inline int compare_ns(ARGS_COMPARE) -{ - dns_name_t name1; - dns_name_t name2; +static inline int +compare_ns(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; @@ -128,10 +128,10 @@ static inline int compare_ns(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_ns(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_ns(ARGS_FROMSTRUCT) { dns_rdata_ns_t *ns = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_ns); REQUIRE(ns != NULL); @@ -145,11 +145,11 @@ static inline isc_result_t fromstruct_ns(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_ns(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_ns(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_ns_t *ns = target; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_ns); REQUIRE(ns != NULL); @@ -168,8 +168,8 @@ static inline isc_result_t tostruct_ns(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_ns(ARGS_FREESTRUCT) -{ +static inline void +freestruct_ns(ARGS_FREESTRUCT) { dns_rdata_ns_t *ns = source; REQUIRE(ns != NULL); @@ -182,11 +182,11 @@ static inline void freestruct_ns(ARGS_FREESTRUCT) ns->mctx = NULL; } -static inline isc_result_t additionaldata_ns(ARGS_ADDLDATA) -{ - dns_name_t name; +static inline isc_result_t +additionaldata_ns(ARGS_ADDLDATA) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_ns); @@ -197,10 +197,10 @@ static inline isc_result_t additionaldata_ns(ARGS_ADDLDATA) return ((add)(arg, &name, dns_rdatatype_a)); } -static inline isc_result_t digest_ns(ARGS_DIGEST) -{ +static inline isc_result_t +digest_ns(ARGS_DIGEST) { isc_region_t r; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_ns); @@ -211,8 +211,8 @@ static inline isc_result_t digest_ns(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_ns(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_ns(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_ns); UNUSED(name); @@ -223,10 +223,10 @@ static inline bool checkowner_ns(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_ns(ARGS_CHECKNAMES) -{ +static inline bool +checknames_ns(ARGS_CHECKNAMES) { isc_region_t region; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_ns); @@ -244,8 +244,8 @@ static inline bool checknames_ns(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_ns(ARGS_COMPARE) -{ +static inline int +casecompare_ns(ARGS_COMPARE) { return (compare_ns(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/nsec3_50.c b/lib/dns/rdata/generic/nsec3_50.c index 71aa3e04ed..95d04213ba 100644 --- a/lib/dns/rdata/generic/nsec3_50.c +++ b/lib/dns/rdata/generic/nsec3_50.c @@ -35,12 +35,12 @@ #define RRTYPE_NSEC3_ATTRIBUTES DNS_RDATATYPEATTR_DNSSEC -static inline isc_result_t fromtext_nsec3(ARGS_FROMTEXT) -{ - isc_token_t token; - unsigned int flags; +static inline isc_result_t +fromtext_nsec3(ARGS_FROMTEXT) { + isc_token_t token; + unsigned int flags; unsigned char hashalg; - isc_buffer_t b; + isc_buffer_t b; unsigned char buf[256]; REQUIRE(type == dns_rdatatype_nsec3); @@ -103,14 +103,14 @@ static inline isc_result_t fromtext_nsec3(ARGS_FROMTEXT) return (typemap_fromtext(lexer, target, true)); } -static inline isc_result_t totext_nsec3(ARGS_TOTEXT) -{ - isc_region_t sr; - unsigned int i, j; +static inline isc_result_t +totext_nsec3(ARGS_TOTEXT) { + isc_region_t sr; + unsigned int i, j; unsigned char hash; unsigned char flags; - char buf[sizeof("TYPE65535")]; - uint32_t iterations; + char buf[sizeof("TYPE65535")]; + uint32_t iterations; REQUIRE(rdata->type == dns_rdatatype_nsec3); REQUIRE(rdata->length != 0); @@ -179,8 +179,8 @@ static inline isc_result_t totext_nsec3(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_nsec3(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_nsec3(ARGS_FROMWIRE) { isc_region_t sr, rr; unsigned int saltlen, hashlen; @@ -224,8 +224,8 @@ static inline isc_result_t fromwire_nsec3(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_nsec3(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_nsec3(ARGS_TOWIRE) { isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_nsec3); @@ -237,8 +237,8 @@ static inline isc_result_t towire_nsec3(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_nsec3(ARGS_COMPARE) -{ +static inline int +compare_nsec3(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -253,10 +253,10 @@ static inline int compare_nsec3(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_nsec3(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_nsec3(ARGS_FROMSTRUCT) { dns_rdata_nsec3_t *nsec3 = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_nsec3); REQUIRE(nsec3 != NULL); @@ -282,9 +282,9 @@ static inline isc_result_t fromstruct_nsec3(ARGS_FROMSTRUCT) return (mem_tobuffer(target, nsec3->typebits, nsec3->len)); } -static inline isc_result_t tostruct_nsec3(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_nsec3(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_nsec3_t *nsec3 = target; REQUIRE(rdata->type == dns_rdatatype_nsec3); @@ -332,8 +332,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_nsec3(ARGS_FREESTRUCT) -{ +static inline void +freestruct_nsec3(ARGS_FREESTRUCT) { dns_rdata_nsec3_t *nsec3 = source; REQUIRE(nsec3 != NULL); @@ -355,8 +355,8 @@ static inline void freestruct_nsec3(ARGS_FREESTRUCT) nsec3->mctx = NULL; } -static inline isc_result_t additionaldata_nsec3(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_nsec3(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_nsec3); UNUSED(rdata); @@ -366,8 +366,8 @@ static inline isc_result_t additionaldata_nsec3(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_nsec3(ARGS_DIGEST) -{ +static inline isc_result_t +digest_nsec3(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_nsec3); @@ -376,11 +376,11 @@ static inline isc_result_t digest_nsec3(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_nsec3(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_nsec3(ARGS_CHECKOWNER) { unsigned char owner[NSEC3_MAX_HASH_LENGTH]; - isc_buffer_t buffer; - dns_label_t label; + isc_buffer_t buffer; + dns_label_t label; REQUIRE(type == dns_rdatatype_nsec3); @@ -401,8 +401,8 @@ static inline bool checkowner_nsec3(ARGS_CHECKOWNER) return (false); } -static inline bool checknames_nsec3(ARGS_CHECKNAMES) -{ +static inline bool +checknames_nsec3(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_nsec3); UNUSED(rdata); @@ -412,8 +412,8 @@ static inline bool checknames_nsec3(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_nsec3(ARGS_COMPARE) -{ +static inline int +casecompare_nsec3(ARGS_COMPARE) { return (compare_nsec3(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/nsec3param_51.c b/lib/dns/rdata/generic/nsec3param_51.c index c9361abf9a..a064d43cc6 100644 --- a/lib/dns/rdata/generic/nsec3param_51.c +++ b/lib/dns/rdata/generic/nsec3param_51.c @@ -35,10 +35,10 @@ #define RRTYPE_NSEC3PARAM_ATTRIBUTES (DNS_RDATATYPEATTR_DNSSEC) -static inline isc_result_t fromtext_nsec3param(ARGS_FROMTEXT) -{ - isc_token_t token; - unsigned int flags = 0; +static inline isc_result_t +fromtext_nsec3param(ARGS_FROMTEXT) { + isc_token_t token; + unsigned int flags = 0; unsigned char hashalg; REQUIRE(type == dns_rdatatype_nsec3param); @@ -88,14 +88,14 @@ static inline isc_result_t fromtext_nsec3param(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_nsec3param(ARGS_TOTEXT) -{ - isc_region_t sr; - unsigned int i, j; +static inline isc_result_t +totext_nsec3param(ARGS_TOTEXT) { + isc_region_t sr; + unsigned int i, j; unsigned char hash; unsigned char flags; - char buf[sizeof("65535 ")]; - uint32_t iterations; + char buf[sizeof("65535 ")]; + uint32_t iterations; REQUIRE(rdata->type == dns_rdatatype_nsec3param); REQUIRE(rdata->length != 0); @@ -138,8 +138,8 @@ static inline isc_result_t totext_nsec3param(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_nsec3param(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_nsec3param(ARGS_FROMWIRE) { isc_region_t sr, rr; unsigned int saltlen; @@ -169,8 +169,8 @@ static inline isc_result_t fromwire_nsec3param(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_nsec3param(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_nsec3param(ARGS_TOWIRE) { isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_nsec3param); @@ -182,8 +182,8 @@ static inline isc_result_t towire_nsec3param(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_nsec3param(ARGS_COMPARE) -{ +static inline int +compare_nsec3param(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -198,8 +198,8 @@ static inline int compare_nsec3param(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_nsec3param(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_nsec3param(ARGS_FROMSTRUCT) { dns_rdata_nsec3param_t *nsec3param = source; REQUIRE(type == dns_rdatatype_nsec3param); @@ -218,9 +218,9 @@ static inline isc_result_t fromstruct_nsec3param(ARGS_FROMSTRUCT) return (ISC_R_SUCCESS); } -static inline isc_result_t tostruct_nsec3param(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_nsec3param(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_nsec3param_t *nsec3param = target; REQUIRE(rdata->type == dns_rdatatype_nsec3param); @@ -238,8 +238,8 @@ static inline isc_result_t tostruct_nsec3param(ARGS_TOSTRUCT) nsec3param->iterations = uint16_consume_fromregion(®ion); nsec3param->salt_length = uint8_consume_fromregion(®ion); - nsec3param->salt = - mem_maybedup(mctx, region.base, nsec3param->salt_length); + nsec3param->salt = mem_maybedup(mctx, region.base, + nsec3param->salt_length); if (nsec3param->salt == NULL) { return (ISC_R_NOMEMORY); } @@ -249,8 +249,8 @@ static inline isc_result_t tostruct_nsec3param(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_nsec3param(ARGS_FREESTRUCT) -{ +static inline void +freestruct_nsec3param(ARGS_FREESTRUCT) { dns_rdata_nsec3param_t *nsec3param = source; REQUIRE(nsec3param != NULL); @@ -266,8 +266,8 @@ static inline void freestruct_nsec3param(ARGS_FREESTRUCT) nsec3param->mctx = NULL; } -static inline isc_result_t additionaldata_nsec3param(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_nsec3param(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_nsec3param); UNUSED(rdata); @@ -277,8 +277,8 @@ static inline isc_result_t additionaldata_nsec3param(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_nsec3param(ARGS_DIGEST) -{ +static inline isc_result_t +digest_nsec3param(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_nsec3param); @@ -287,8 +287,8 @@ static inline isc_result_t digest_nsec3param(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_nsec3param(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_nsec3param(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_nsec3param); UNUSED(name); @@ -299,8 +299,8 @@ static inline bool checkowner_nsec3param(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_nsec3param(ARGS_CHECKNAMES) -{ +static inline bool +checknames_nsec3param(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_nsec3param); UNUSED(rdata); @@ -310,8 +310,8 @@ static inline bool checknames_nsec3param(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_nsec3param(ARGS_COMPARE) -{ +static inline int +casecompare_nsec3param(ARGS_COMPARE) { return (compare_nsec3param(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/nsec_47.c b/lib/dns/rdata/generic/nsec_47.c index d51c91ad21..f60f672a17 100644 --- a/lib/dns/rdata/generic/nsec_47.c +++ b/lib/dns/rdata/generic/nsec_47.c @@ -22,10 +22,10 @@ (DNS_RDATATYPEATTR_DNSSEC | DNS_RDATATYPEATTR_ZONECUTAUTH | \ DNS_RDATATYPEATTR_ATCNAME) -static inline isc_result_t fromtext_nsec(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_nsec(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; REQUIRE(type == dns_rdatatype_nsec); @@ -49,10 +49,10 @@ static inline isc_result_t fromtext_nsec(ARGS_FROMTEXT) return (typemap_fromtext(lexer, target, false)); } -static inline isc_result_t totext_nsec(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_nsec(ARGS_TOTEXT) { isc_region_t sr; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_nsec); REQUIRE(rdata->length != 0); @@ -73,10 +73,10 @@ static inline isc_result_t totext_nsec(ARGS_TOTEXT) return (typemap_totext(&sr, NULL, target)); } -static /* inline */ isc_result_t fromwire_nsec(ARGS_FROMWIRE) -{ +static /* inline */ isc_result_t +fromwire_nsec(ARGS_FROMWIRE) { isc_region_t sr; - dns_name_t name; + dns_name_t name; REQUIRE(type == dns_rdatatype_nsec); @@ -95,10 +95,10 @@ static /* inline */ isc_result_t fromwire_nsec(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_nsec(ARGS_TOWIRE) -{ - isc_region_t sr; - dns_name_t name; +static inline isc_result_t +towire_nsec(ARGS_TOWIRE) { + isc_region_t sr; + dns_name_t name; dns_offsets_t offsets; REQUIRE(rdata->type == dns_rdatatype_nsec); @@ -114,8 +114,8 @@ static inline isc_result_t towire_nsec(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_nsec(ARGS_COMPARE) -{ +static inline int +compare_nsec(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -130,10 +130,10 @@ static inline int compare_nsec(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_nsec(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_nsec(ARGS_FROMSTRUCT) { dns_rdata_nsec_t *nsec = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_nsec); REQUIRE(nsec != NULL); @@ -153,11 +153,11 @@ static inline isc_result_t fromstruct_nsec(ARGS_FROMSTRUCT) return (mem_tobuffer(target, nsec->typebits, nsec->len)); } -static inline isc_result_t tostruct_nsec(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_nsec(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_nsec_t *nsec = target; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_nsec); REQUIRE(nsec != NULL); @@ -190,8 +190,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_nsec(ARGS_FREESTRUCT) -{ +static inline void +freestruct_nsec(ARGS_FREESTRUCT) { dns_rdata_nsec_t *nsec = source; REQUIRE(nsec != NULL); @@ -208,8 +208,8 @@ static inline void freestruct_nsec(ARGS_FREESTRUCT) nsec->mctx = NULL; } -static inline isc_result_t additionaldata_nsec(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_nsec(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_nsec); UNUSED(rdata); @@ -219,8 +219,8 @@ static inline isc_result_t additionaldata_nsec(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_nsec(ARGS_DIGEST) -{ +static inline isc_result_t +digest_nsec(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_nsec); @@ -229,8 +229,8 @@ static inline isc_result_t digest_nsec(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_nsec(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_nsec(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_nsec); UNUSED(name); @@ -241,8 +241,8 @@ static inline bool checkowner_nsec(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_nsec(ARGS_CHECKNAMES) -{ +static inline bool +checknames_nsec(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_nsec); UNUSED(rdata); @@ -252,13 +252,13 @@ static inline bool checknames_nsec(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_nsec(ARGS_COMPARE) -{ +static inline int +casecompare_nsec(ARGS_COMPARE) { isc_region_t region1; isc_region_t region2; - dns_name_t name1; - dns_name_t name2; - int order; + dns_name_t name1; + dns_name_t name2; + int order; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c index e26882ca2c..315a7ad88e 100644 --- a/lib/dns/rdata/generic/null_10.c +++ b/lib/dns/rdata/generic/null_10.c @@ -14,8 +14,8 @@ #define RRTYPE_NULL_ATTRIBUTES (0) -static inline isc_result_t fromtext_null(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_null(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_null); UNUSED(rdclass); @@ -29,15 +29,15 @@ static inline isc_result_t fromtext_null(ARGS_FROMTEXT) return (DNS_R_SYNTAX); } -static inline isc_result_t totext_null(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_null(ARGS_TOTEXT) { REQUIRE(rdata->type == dns_rdatatype_null); return (unknown_totext(rdata, tctx, target)); } -static inline isc_result_t fromwire_null(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_null(ARGS_FROMWIRE) { isc_region_t sr; REQUIRE(type == dns_rdatatype_null); @@ -52,8 +52,8 @@ static inline isc_result_t fromwire_null(ARGS_FROMWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline isc_result_t towire_null(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_null(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_null); UNUSED(cctx); @@ -61,8 +61,8 @@ static inline isc_result_t towire_null(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_null(ARGS_COMPARE) -{ +static inline int +compare_null(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -75,8 +75,8 @@ static inline int compare_null(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_null(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_null(ARGS_FROMSTRUCT) { dns_rdata_null_t *null = source; REQUIRE(type == dns_rdatatype_null); @@ -91,10 +91,10 @@ static inline isc_result_t fromstruct_null(ARGS_FROMSTRUCT) return (mem_tobuffer(target, null->data, null->length)); } -static inline isc_result_t tostruct_null(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_null(ARGS_TOSTRUCT) { dns_rdata_null_t *null = target; - isc_region_t r; + isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_null); REQUIRE(null != NULL); @@ -114,8 +114,8 @@ static inline isc_result_t tostruct_null(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_null(ARGS_FREESTRUCT) -{ +static inline void +freestruct_null(ARGS_FREESTRUCT) { dns_rdata_null_t *null = source; REQUIRE(null != NULL); @@ -131,8 +131,8 @@ static inline void freestruct_null(ARGS_FREESTRUCT) null->mctx = NULL; } -static inline isc_result_t additionaldata_null(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_null(ARGS_ADDLDATA) { UNUSED(rdata); UNUSED(add); UNUSED(arg); @@ -142,8 +142,8 @@ static inline isc_result_t additionaldata_null(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_null(ARGS_DIGEST) -{ +static inline isc_result_t +digest_null(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_null); @@ -153,8 +153,8 @@ static inline isc_result_t digest_null(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_null(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_null(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_null); UNUSED(name); @@ -165,8 +165,8 @@ static inline bool checkowner_null(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_null(ARGS_CHECKNAMES) -{ +static inline bool +checknames_null(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_null); UNUSED(rdata); @@ -176,8 +176,8 @@ static inline bool checknames_null(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_null(ARGS_COMPARE) -{ +static inline int +casecompare_null(ARGS_COMPARE) { return (compare_null(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c index 9ac4684127..9d39f22d21 100644 --- a/lib/dns/rdata/generic/nxt_30.c +++ b/lib/dns/rdata/generic/nxt_30.c @@ -20,17 +20,17 @@ */ #define RRTYPE_NXT_ATTRIBUTES (0) -static inline isc_result_t fromtext_nxt(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; - isc_buffer_t buffer; - char * e; - unsigned char bm[8 * 1024]; /* 64k bits */ +static inline isc_result_t +fromtext_nxt(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; + isc_buffer_t buffer; + char *e; + unsigned char bm[8 * 1024]; /* 64k bits */ dns_rdatatype_t covered; dns_rdatatype_t maxcovered = 0; - bool first = true; - long n; + bool first = true; + long n; REQUIRE(type == dns_rdatatype_nxt); @@ -62,7 +62,8 @@ static inline isc_result_t fromtext_nxt(ARGS_FROMTEXT) covered = (dns_rdatatype_t)n; } else if (dns_rdatatype_fromtext(&covered, &token.value.as_textregion) == - DNS_R_UNKNOWN) { + DNS_R_UNKNOWN) + { RETTOK(DNS_R_UNKNOWN); } /* @@ -85,13 +86,13 @@ static inline isc_result_t fromtext_nxt(ARGS_FROMTEXT) return (mem_tobuffer(target, bm, n)); } -static inline isc_result_t totext_nxt(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_nxt(ARGS_TOTEXT) { isc_region_t sr; unsigned int i, j; - dns_name_t name; - dns_name_t prefix; - bool sub; + dns_name_t name; + dns_name_t prefix; + bool sub; REQUIRE(rdata->type == dns_rdatatype_nxt); REQUIRE(rdata->length != 0); @@ -131,10 +132,10 @@ static inline isc_result_t totext_nxt(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_nxt(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_nxt(ARGS_FROMWIRE) { isc_region_t sr; - dns_name_t name; + dns_name_t name; REQUIRE(type == dns_rdatatype_nxt); @@ -148,7 +149,8 @@ static inline isc_result_t fromwire_nxt(ARGS_FROMWIRE) isc_buffer_activeregion(source, &sr); if (sr.length > 0 && (sr.base[0] & 0x80) == 0 && - ((sr.length > 16) || sr.base[sr.length - 1] == 0)) { + ((sr.length > 16) || sr.base[sr.length - 1] == 0)) + { return (DNS_R_BADBITMAP); } RETERR(mem_tobuffer(target, sr.base, sr.length)); @@ -156,10 +158,10 @@ static inline isc_result_t fromwire_nxt(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_nxt(ARGS_TOWIRE) -{ - isc_region_t sr; - dns_name_t name; +static inline isc_result_t +towire_nxt(ARGS_TOWIRE) { + isc_region_t sr; + dns_name_t name; dns_offsets_t offsets; REQUIRE(rdata->type == dns_rdatatype_nxt); @@ -175,13 +177,13 @@ static inline isc_result_t towire_nxt(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_nxt(ARGS_COMPARE) -{ +static inline int +compare_nxt(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; - dns_name_t name1; - dns_name_t name2; - int order; + dns_name_t name1; + dns_name_t name2; + int order; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); @@ -206,10 +208,10 @@ static inline int compare_nxt(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_nxt(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_nxt(ARGS_FROMSTRUCT) { dns_rdata_nxt_t *nxt = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_nxt); REQUIRE(nxt != NULL); @@ -230,11 +232,11 @@ static inline isc_result_t fromstruct_nxt(ARGS_FROMSTRUCT) return (mem_tobuffer(target, nxt->typebits, nxt->len)); } -static inline isc_result_t tostruct_nxt(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_nxt(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_nxt_t *nxt = target; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_nxt); REQUIRE(nxt != NULL); @@ -267,8 +269,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_nxt(ARGS_FREESTRUCT) -{ +static inline void +freestruct_nxt(ARGS_FREESTRUCT) { dns_rdata_nxt_t *nxt = source; REQUIRE(nxt != NULL); @@ -285,8 +287,8 @@ static inline void freestruct_nxt(ARGS_FREESTRUCT) nxt->mctx = NULL; } -static inline isc_result_t additionaldata_nxt(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_nxt(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_nxt); UNUSED(rdata); @@ -296,10 +298,10 @@ static inline isc_result_t additionaldata_nxt(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_nxt(ARGS_DIGEST) -{ +static inline isc_result_t +digest_nxt(ARGS_DIGEST) { isc_region_t r; - dns_name_t name; + dns_name_t name; isc_result_t result; REQUIRE(rdata->type == dns_rdatatype_nxt); @@ -316,8 +318,8 @@ static inline isc_result_t digest_nxt(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_nxt(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_nxt(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_nxt); UNUSED(name); @@ -328,8 +330,8 @@ static inline bool checkowner_nxt(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_nxt(ARGS_CHECKNAMES) -{ +static inline bool +checknames_nxt(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_nxt); UNUSED(rdata); @@ -339,8 +341,8 @@ static inline bool checknames_nxt(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_nxt(ARGS_COMPARE) -{ +static inline int +casecompare_nxt(ARGS_COMPARE) { return (compare_nxt(rdata1, rdata2)); } #endif /* RDATA_GENERIC_NXT_30_C */ diff --git a/lib/dns/rdata/generic/openpgpkey_61.c b/lib/dns/rdata/generic/openpgpkey_61.c index 3ffca3667d..bdfd63cc82 100644 --- a/lib/dns/rdata/generic/openpgpkey_61.c +++ b/lib/dns/rdata/generic/openpgpkey_61.c @@ -14,8 +14,8 @@ #define RRTYPE_OPENPGPKEY_ATTRIBUTES 0 -static inline isc_result_t fromtext_openpgpkey(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_openpgpkey(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_openpgpkey); UNUSED(type); @@ -30,8 +30,8 @@ static inline isc_result_t fromtext_openpgpkey(ARGS_FROMTEXT) return (isc_base64_tobuffer(lexer, target, -2)); } -static inline isc_result_t totext_openpgpkey(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_openpgpkey(ARGS_TOTEXT) { isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_openpgpkey); @@ -64,8 +64,8 @@ static inline isc_result_t totext_openpgpkey(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_openpgpkey(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_openpgpkey(ARGS_FROMWIRE) { isc_region_t sr; REQUIRE(type == dns_rdatatype_openpgpkey); @@ -86,8 +86,8 @@ static inline isc_result_t fromwire_openpgpkey(ARGS_FROMWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline isc_result_t towire_openpgpkey(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_openpgpkey(ARGS_TOWIRE) { isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_openpgpkey); @@ -99,8 +99,8 @@ static inline isc_result_t towire_openpgpkey(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_openpgpkey(ARGS_COMPARE) -{ +static inline int +compare_openpgpkey(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -115,8 +115,8 @@ static inline int compare_openpgpkey(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_openpgpkey(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_openpgpkey(ARGS_FROMSTRUCT) { dns_rdata_openpgpkey_t *sig = source; REQUIRE(type == dns_rdatatype_openpgpkey); @@ -134,9 +134,9 @@ static inline isc_result_t fromstruct_openpgpkey(ARGS_FROMSTRUCT) return (mem_tobuffer(target, sig->keyring, sig->length)); } -static inline isc_result_t tostruct_openpgpkey(ARGS_TOSTRUCT) -{ - isc_region_t sr; +static inline isc_result_t +tostruct_openpgpkey(ARGS_TOSTRUCT) { + isc_region_t sr; dns_rdata_openpgpkey_t *sig = target; REQUIRE(rdata->type == dns_rdatatype_openpgpkey); @@ -165,8 +165,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_openpgpkey(ARGS_FREESTRUCT) -{ +static inline void +freestruct_openpgpkey(ARGS_FREESTRUCT) { dns_rdata_openpgpkey_t *sig = (dns_rdata_openpgpkey_t *)source; REQUIRE(sig != NULL); @@ -182,8 +182,8 @@ static inline void freestruct_openpgpkey(ARGS_FREESTRUCT) sig->mctx = NULL; } -static inline isc_result_t additionaldata_openpgpkey(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_openpgpkey(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_openpgpkey); UNUSED(rdata); @@ -193,8 +193,8 @@ static inline isc_result_t additionaldata_openpgpkey(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_openpgpkey(ARGS_DIGEST) -{ +static inline isc_result_t +digest_openpgpkey(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_openpgpkey); @@ -204,8 +204,8 @@ static inline isc_result_t digest_openpgpkey(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_openpgpkey(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_openpgpkey(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_openpgpkey); UNUSED(name); @@ -216,8 +216,8 @@ static inline bool checkowner_openpgpkey(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_openpgpkey(ARGS_CHECKNAMES) -{ +static inline bool +checknames_openpgpkey(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_openpgpkey); UNUSED(rdata); @@ -227,8 +227,8 @@ static inline bool checknames_openpgpkey(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_openpgpkey(ARGS_COMPARE) -{ +static inline int +casecompare_openpgpkey(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c index 38e1d098f0..22c3f472e6 100644 --- a/lib/dns/rdata/generic/opt_41.c +++ b/lib/dns/rdata/generic/opt_41.c @@ -18,8 +18,8 @@ (DNS_RDATATYPEATTR_SINGLETON | DNS_RDATATYPEATTR_META | \ DNS_RDATATYPEATTR_NOTQUESTION) -static inline isc_result_t fromtext_opt(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_opt(ARGS_FROMTEXT) { /* * OPT records do not have a text format. */ @@ -37,13 +37,13 @@ static inline isc_result_t fromtext_opt(ARGS_FROMTEXT) return (ISC_R_NOTIMPLEMENTED); } -static inline isc_result_t totext_opt(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_opt(ARGS_TOTEXT) { isc_region_t r; isc_region_t or ; uint16_t option; uint16_t length; - char buf[sizeof("64000 64000")]; + char buf[sizeof("64000 64000")]; /* * OPT records do not have a text format. @@ -87,12 +87,12 @@ static inline isc_result_t totext_opt(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_opt(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_opt(ARGS_FROMWIRE) { isc_region_t sregion; isc_region_t tregion; - uint16_t opt; - uint16_t length; + uint16_t opt; + uint16_t length; unsigned int total; REQUIRE(type == dns_rdatatype_opt); @@ -128,9 +128,9 @@ static inline isc_result_t fromwire_opt(ARGS_FROMWIRE) break; case DNS_OPT_CLIENT_SUBNET: { uint16_t family; - uint8_t addrlen; - uint8_t scope; - uint8_t addrbytes; + uint8_t addrlen; + uint8_t scope; + uint8_t addrbytes; if (length < 4) { return (DNS_R_OPTERR); @@ -233,8 +233,8 @@ static inline isc_result_t fromwire_opt(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_opt(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_opt(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_opt); UNUSED(cctx); @@ -242,8 +242,8 @@ static inline isc_result_t towire_opt(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_opt(ARGS_COMPARE) -{ +static inline int +compare_opt(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -256,11 +256,11 @@ static inline int compare_opt(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_opt(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_opt(ARGS_FROMSTRUCT) { dns_rdata_opt_t *opt = source; - isc_region_t region; - uint16_t length; + isc_region_t region; + uint16_t length; REQUIRE(type == dns_rdatatype_opt); REQUIRE(opt != NULL); @@ -289,10 +289,10 @@ static inline isc_result_t fromstruct_opt(ARGS_FROMSTRUCT) return (mem_tobuffer(target, opt->options, opt->length)); } -static inline isc_result_t tostruct_opt(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_opt(ARGS_TOSTRUCT) { dns_rdata_opt_t *opt = target; - isc_region_t r; + isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_opt); REQUIRE(opt != NULL); @@ -313,8 +313,8 @@ static inline isc_result_t tostruct_opt(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_opt(ARGS_FREESTRUCT) -{ +static inline void +freestruct_opt(ARGS_FREESTRUCT) { dns_rdata_opt_t *opt = source; REQUIRE(opt != NULL); @@ -330,8 +330,8 @@ static inline void freestruct_opt(ARGS_FREESTRUCT) opt->mctx = NULL; } -static inline isc_result_t additionaldata_opt(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_opt(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_opt); UNUSED(rdata); @@ -341,8 +341,8 @@ static inline isc_result_t additionaldata_opt(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_opt(ARGS_DIGEST) -{ +static inline isc_result_t +digest_opt(ARGS_DIGEST) { /* * OPT records are not digested. */ @@ -356,8 +356,8 @@ static inline isc_result_t digest_opt(ARGS_DIGEST) return (ISC_R_NOTIMPLEMENTED); } -static inline bool checkowner_opt(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_opt(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_opt); UNUSED(type); @@ -367,8 +367,8 @@ static inline bool checkowner_opt(ARGS_CHECKOWNER) return (dns_name_equal(name, dns_rootname)); } -static inline bool checknames_opt(ARGS_CHECKNAMES) -{ +static inline bool +checknames_opt(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_opt); UNUSED(rdata); @@ -378,14 +378,13 @@ static inline bool checknames_opt(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_opt(ARGS_COMPARE) -{ +static inline int +casecompare_opt(ARGS_COMPARE) { return (compare_opt(rdata1, rdata2)); } isc_result_t -dns_rdata_opt_first(dns_rdata_opt_t *opt) -{ +dns_rdata_opt_first(dns_rdata_opt_t *opt) { REQUIRE(opt != NULL); REQUIRE(opt->common.rdtype == dns_rdatatype_opt); REQUIRE(opt->options != NULL || opt->length == 0); @@ -399,10 +398,9 @@ dns_rdata_opt_first(dns_rdata_opt_t *opt) } isc_result_t -dns_rdata_opt_next(dns_rdata_opt_t *opt) -{ +dns_rdata_opt_next(dns_rdata_opt_t *opt) { isc_region_t r; - uint16_t length; + uint16_t length; REQUIRE(opt != NULL); REQUIRE(opt->common.rdtype == dns_rdatatype_opt); @@ -422,8 +420,7 @@ dns_rdata_opt_next(dns_rdata_opt_t *opt) } isc_result_t -dns_rdata_opt_current(dns_rdata_opt_t *opt, dns_rdata_opt_opcode_t *opcode) -{ +dns_rdata_opt_current(dns_rdata_opt_t *opt, dns_rdata_opt_opcode_t *opcode) { isc_region_t r; REQUIRE(opt != NULL); diff --git a/lib/dns/rdata/generic/proforma.c b/lib/dns/rdata/generic/proforma.c index 12ff91244e..b44c656ebc 100644 --- a/lib/dns/rdata/generic/proforma.c +++ b/lib/dns/rdata/generic/proforma.c @@ -14,8 +14,7 @@ #define RRTYPE_ #_ATTRIBUTES(0) -static inline isc_result_t fromtext_ #(ARGS_FROMTEXT) -{ +static inline isc_result_t fromtext_ #(ARGS_FROMTEXT) { isc_token_t token; REQUIRE(type == dns_rdatatype_proforma.c #); @@ -27,8 +26,7 @@ static inline isc_result_t fromtext_ #(ARGS_FROMTEXT) return (ISC_R_NOTIMPLEMENTED); } -static inline isc_result_t totext_ #(ARGS_TOTEXT) -{ +static inline isc_result_t totext_ #(ARGS_TOTEXT) { REQUIRE(rdata->type == dns_rdatatype_proforma.c #); REQUIRE(rdata->rdclass == #); REQUIRE(rdata->length != 0); /* XXX */ @@ -36,8 +34,7 @@ static inline isc_result_t totext_ #(ARGS_TOTEXT) return (ISC_R_NOTIMPLEMENTED); } -static inline isc_result_t fromwire_ #(ARGS_FROMWIRE) -{ +static inline isc_result_t fromwire_ #(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_proforma.c #); REQUIRE(rdclass == #); @@ -47,8 +44,7 @@ static inline isc_result_t fromwire_ #(ARGS_FROMWIRE) return (ISC_R_NOTIMPLEMENTED); } -static inline isc_result_t towire_ #(ARGS_TOWIRE) -{ +static inline isc_result_t towire_ #(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_proforma.c #); REQUIRE(rdata->rdclass == #); REQUIRE(rdata->length != 0); /* XXX */ @@ -59,8 +55,7 @@ static inline isc_result_t towire_ #(ARGS_TOWIRE) return (ISC_R_NOTIMPLEMENTED); } -static inline int compare_ #(ARGS_COMPARE) -{ +static inline int compare_ #(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -76,8 +71,7 @@ static inline int compare_ #(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_ #(ARGS_FROMSTRUCT) -{ +static inline isc_result_t fromstruct_ #(ARGS_FROMSTRUCT) { dns_rdata_ #_t *# = source; REQUIRE(type == dns_rdatatype_proforma.c #); @@ -89,8 +83,7 @@ static inline isc_result_t fromstruct_ #(ARGS_FROMSTRUCT) return (ISC_R_NOTIMPLEMENTED); } -static inline isc_result_t tostruct_ #(ARGS_TOSTRUCT) -{ +static inline isc_result_t tostruct_ #(ARGS_TOSTRUCT) { REQUIRE(rdata->type == dns_rdatatype_proforma.c #); REQUIRE(rdata->rdclass == #); REQUIRE(rdata->length != 0); /* XXX */ @@ -98,8 +91,7 @@ static inline isc_result_t tostruct_ #(ARGS_TOSTRUCT) return (ISC_R_NOTIMPLEMENTED); } -static inline void freestruct_ #(ARGS_FREESTRUCT) -{ +static inline void freestruct_ #(ARGS_FREESTRUCT) { dns_rdata_ #_t *# = source; REQUIRE(# != NULL); @@ -107,8 +99,7 @@ static inline void freestruct_ #(ARGS_FREESTRUCT) REQUIRE(#->common.rdclass == #); } -static inline isc_result_t additionaldata_ #(ARGS_ADDLDATA) -{ +static inline isc_result_t additionaldata_ #(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_proforma.c #); REQUIRE(rdata->rdclass == #); @@ -118,8 +109,7 @@ static inline isc_result_t additionaldata_ #(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_ #(ARGS_DIGEST) -{ +static inline isc_result_t digest_ #(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_proforma.c #); @@ -130,8 +120,7 @@ static inline isc_result_t digest_ #(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_ #(ARGS_CHECKOWNER) -{ +static inline bool checkowner_ #(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_proforma.c #); REQUIRE(rdclass == #); @@ -143,8 +132,7 @@ static inline bool checkowner_ #(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_ #(ARGS_CHECKNAMES) -{ +static inline bool checknames_ #(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_proforma.c #); REQUIRE(rdata->rdclass == #); @@ -155,8 +143,7 @@ static inline bool checknames_ #(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_ #(ARGS_COMPARE) -{ +static inline int casecompare_ #(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; diff --git a/lib/dns/rdata/generic/proforma.h b/lib/dns/rdata/generic/proforma.h index bd9901f8fb..550a3b2489 100644 --- a/lib/dns/rdata/generic/proforma.h +++ b/lib/dns/rdata/generic/proforma.h @@ -13,8 +13,7 @@ #ifndef GENERIC_PROFORMA_H #define GENERIC_PROFORMA_H 1 -typedef struct dns_rdata_ # -{ +typedef struct dns_rdata_ #{ dns_rdatacommon_t common; isc_mem_t * mctx; /* if required */ /* type & class specific elements */ diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c index d36fe0e578..af1cba987c 100644 --- a/lib/dns/rdata/generic/ptr_12.c +++ b/lib/dns/rdata/generic/ptr_12.c @@ -14,10 +14,10 @@ #define RRTYPE_PTR_ATTRIBUTES (0) -static inline isc_result_t fromtext_ptr(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_ptr(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; REQUIRE(type == dns_rdatatype_ptr); @@ -37,7 +37,8 @@ static inline isc_result_t fromtext_ptr(ARGS_FROMTEXT) RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target)); if (rdclass == dns_rdataclass_in && (options & DNS_RDATA_CHECKNAMES) != 0 && - (options & DNS_RDATA_CHECKREVERSE) != 0) { + (options & DNS_RDATA_CHECKREVERSE) != 0) + { bool ok; ok = dns_name_ishostname(&name, false); if (!ok && (options & DNS_RDATA_CHECKNAMESFAIL) != 0) { @@ -50,12 +51,12 @@ static inline isc_result_t fromtext_ptr(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_ptr(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_ptr(ARGS_TOTEXT) { isc_region_t region; - dns_name_t name; - dns_name_t prefix; - bool sub; + dns_name_t name; + dns_name_t prefix; + bool sub; REQUIRE(rdata->type == dns_rdatatype_ptr); REQUIRE(rdata->length != 0); @@ -71,8 +72,8 @@ static inline isc_result_t totext_ptr(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_ptr(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_ptr(ARGS_FROMWIRE) { dns_name_t name; REQUIRE(type == dns_rdatatype_ptr); @@ -86,11 +87,11 @@ static inline isc_result_t fromwire_ptr(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_ptr(ARGS_TOWIRE) -{ - dns_name_t name; +static inline isc_result_t +towire_ptr(ARGS_TOWIRE) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_ptr); REQUIRE(rdata->length != 0); @@ -104,10 +105,10 @@ static inline isc_result_t towire_ptr(ARGS_TOWIRE) return (dns_name_towire(&name, cctx, target)); } -static inline int compare_ptr(ARGS_COMPARE) -{ - dns_name_t name1; - dns_name_t name2; +static inline int +compare_ptr(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; @@ -129,10 +130,10 @@ static inline int compare_ptr(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_ptr(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_ptr(ARGS_FROMSTRUCT) { dns_rdata_ptr_t *ptr = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_ptr); REQUIRE(ptr != NULL); @@ -146,11 +147,11 @@ static inline isc_result_t fromstruct_ptr(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_ptr(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_ptr(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_ptr_t *ptr = target; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_ptr); REQUIRE(ptr != NULL); @@ -169,8 +170,8 @@ static inline isc_result_t tostruct_ptr(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_ptr(ARGS_FREESTRUCT) -{ +static inline void +freestruct_ptr(ARGS_FREESTRUCT) { dns_rdata_ptr_t *ptr = source; REQUIRE(ptr != NULL); @@ -184,8 +185,8 @@ static inline void freestruct_ptr(ARGS_FREESTRUCT) ptr->mctx = NULL; } -static inline isc_result_t additionaldata_ptr(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_ptr(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_ptr); UNUSED(rdata); @@ -195,10 +196,10 @@ static inline isc_result_t additionaldata_ptr(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_ptr(ARGS_DIGEST) -{ +static inline isc_result_t +digest_ptr(ARGS_DIGEST) { isc_region_t r; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_ptr); @@ -209,8 +210,8 @@ static inline isc_result_t digest_ptr(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_ptr(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_ptr(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_ptr); UNUSED(name); @@ -221,25 +222,25 @@ static inline bool checkowner_ptr(ARGS_CHECKOWNER) return (true); } -static unsigned char ip6_arpa_data[] = "\003IP6\004ARPA"; -static unsigned char ip6_arpa_offsets[] = { 0, 4, 9 }; -static const dns_name_t ip6_arpa = - DNS_NAME_INITABSOLUTE(ip6_arpa_data, ip6_arpa_offsets); +static unsigned char ip6_arpa_data[] = "\003IP6\004ARPA"; +static unsigned char ip6_arpa_offsets[] = { 0, 4, 9 }; +static const dns_name_t ip6_arpa = DNS_NAME_INITABSOLUTE(ip6_arpa_data, + ip6_arpa_offsets); -static unsigned char ip6_int_data[] = "\003IP6\003INT"; -static unsigned char ip6_int_offsets[] = { 0, 4, 8 }; -static const dns_name_t ip6_int = - DNS_NAME_INITABSOLUTE(ip6_int_data, ip6_int_offsets); +static unsigned char ip6_int_data[] = "\003IP6\003INT"; +static unsigned char ip6_int_offsets[] = { 0, 4, 8 }; +static const dns_name_t ip6_int = DNS_NAME_INITABSOLUTE(ip6_int_data, + ip6_int_offsets); -static unsigned char in_addr_arpa_data[] = "\007IN-ADDR\004ARPA"; -static unsigned char in_addr_arpa_offsets[] = { 0, 8, 13 }; +static unsigned char in_addr_arpa_data[] = "\007IN-ADDR\004ARPA"; +static unsigned char in_addr_arpa_offsets[] = { 0, 8, 13 }; static const dns_name_t in_addr_arpa = DNS_NAME_INITABSOLUTE(in_addr_arpa_data, in_addr_arpa_offsets); -static inline bool checknames_ptr(ARGS_CHECKNAMES) -{ +static inline bool +checknames_ptr(ARGS_CHECKNAMES) { isc_region_t region; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_ptr); @@ -253,7 +254,8 @@ static inline bool checknames_ptr(ARGS_CHECKNAMES) if (dns_name_issubdomain(owner, &in_addr_arpa) || dns_name_issubdomain(owner, &ip6_arpa) || - dns_name_issubdomain(owner, &ip6_int)) { + dns_name_issubdomain(owner, &ip6_int)) + { dns_rdata_toregion(rdata, ®ion); dns_name_init(&name, NULL); dns_name_fromregion(&name, ®ion); @@ -267,8 +269,8 @@ static inline bool checknames_ptr(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_ptr(ARGS_COMPARE) -{ +static inline int +casecompare_ptr(ARGS_COMPARE) { return (compare_ptr(rdata1, rdata2)); } #endif /* RDATA_GENERIC_PTR_12_C */ diff --git a/lib/dns/rdata/generic/rkey_57.c b/lib/dns/rdata/generic/rkey_57.c index d73c47ca8f..caeeed35a7 100644 --- a/lib/dns/rdata/generic/rkey_57.c +++ b/lib/dns/rdata/generic/rkey_57.c @@ -14,32 +14,32 @@ #define RRTYPE_RKEY_ATTRIBUTES 0 -static inline isc_result_t fromtext_rkey(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_rkey(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_rkey); return (generic_fromtext_key(rdclass, type, lexer, origin, options, target, callbacks)); } -static inline isc_result_t totext_rkey(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_rkey(ARGS_TOTEXT) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_rkey); return (generic_totext_key(rdata, tctx, target)); } -static inline isc_result_t fromwire_rkey(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_rkey(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_rkey); return (generic_fromwire_key(rdclass, type, source, dctx, options, target)); } -static inline isc_result_t towire_rkey(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_rkey(ARGS_TOWIRE) { isc_region_t sr; REQUIRE(rdata != NULL); @@ -52,8 +52,8 @@ static inline isc_result_t towire_rkey(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_rkey(ARGS_COMPARE) -{ +static inline int +compare_rkey(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -70,15 +70,15 @@ static inline int compare_rkey(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_rkey(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_rkey(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_rkey); return (generic_fromstruct_key(rdclass, type, source, target)); } -static inline isc_result_t tostruct_rkey(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_rkey(ARGS_TOSTRUCT) { dns_rdata_rkey_t *rkey = target; REQUIRE(rkey != NULL); @@ -92,8 +92,8 @@ static inline isc_result_t tostruct_rkey(ARGS_TOSTRUCT) return (generic_tostruct_key(rdata, target, mctx)); } -static inline void freestruct_rkey(ARGS_FREESTRUCT) -{ +static inline void +freestruct_rkey(ARGS_FREESTRUCT) { dns_rdata_rkey_t *rkey = (dns_rdata_rkey_t *)source; REQUIRE(rkey != NULL); @@ -102,8 +102,8 @@ static inline void freestruct_rkey(ARGS_FREESTRUCT) generic_freestruct_key(source); } -static inline isc_result_t additionaldata_rkey(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_rkey(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_rkey); UNUSED(rdata); @@ -113,8 +113,8 @@ static inline isc_result_t additionaldata_rkey(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_rkey(ARGS_DIGEST) -{ +static inline isc_result_t +digest_rkey(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata != NULL); @@ -125,8 +125,8 @@ static inline isc_result_t digest_rkey(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_rkey(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_rkey(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_rkey); UNUSED(name); @@ -137,8 +137,8 @@ static inline bool checkowner_rkey(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_rkey(ARGS_CHECKNAMES) -{ +static inline bool +checknames_rkey(ARGS_CHECKNAMES) { REQUIRE(rdata != NULL); REQUIRE(rdata->type == dns_rdatatype_rkey); @@ -149,8 +149,8 @@ static inline bool checknames_rkey(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_rkey(ARGS_COMPARE) -{ +static inline int +casecompare_rkey(ARGS_COMPARE) { /* * Treat ALG 253 (private DNS) subtype name case sensistively. */ diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c index 9141f83ab2..e4a7e47b75 100644 --- a/lib/dns/rdata/generic/rp_17.c +++ b/lib/dns/rdata/generic/rp_17.c @@ -16,13 +16,13 @@ #define RRTYPE_RP_ATTRIBUTES (0) -static inline isc_result_t fromtext_rp(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_rp(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; - int i; - bool ok; + int i; + bool ok; REQUIRE(type == dns_rdatatype_rp); @@ -55,13 +55,13 @@ static inline isc_result_t fromtext_rp(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_rp(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_rp(ARGS_TOTEXT) { isc_region_t region; - dns_name_t rmail; - dns_name_t email; - dns_name_t prefix; - bool sub; + dns_name_t rmail; + dns_name_t email; + dns_name_t prefix; + bool sub; REQUIRE(rdata->type == dns_rdatatype_rp); REQUIRE(rdata->length != 0); @@ -87,8 +87,8 @@ static inline isc_result_t totext_rp(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_rp(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_rp(ARGS_FROMWIRE) { dns_name_t rmail; dns_name_t email; @@ -106,11 +106,11 @@ static inline isc_result_t fromwire_rp(ARGS_FROMWIRE) return (dns_name_fromwire(&email, source, dctx, options, target)); } -static inline isc_result_t towire_rp(ARGS_TOWIRE) -{ - isc_region_t region; - dns_name_t rmail; - dns_name_t email; +static inline isc_result_t +towire_rp(ARGS_TOWIRE) { + isc_region_t region; + dns_name_t rmail; + dns_name_t email; dns_offsets_t roffsets; dns_offsets_t eoffsets; @@ -134,13 +134,13 @@ static inline isc_result_t towire_rp(ARGS_TOWIRE) return (dns_name_towire(&rmail, cctx, target)); } -static inline int compare_rp(ARGS_COMPARE) -{ +static inline int +compare_rp(ARGS_COMPARE) { isc_region_t region1; isc_region_t region2; - dns_name_t name1; - dns_name_t name2; - int order; + dns_name_t name1; + dns_name_t name2; + int order; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); @@ -174,10 +174,10 @@ static inline int compare_rp(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_rp(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_rp(ARGS_FROMSTRUCT) { dns_rdata_rp_t *rp = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_rp); REQUIRE(rp != NULL); @@ -193,12 +193,12 @@ static inline isc_result_t fromstruct_rp(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_rp(ARGS_TOSTRUCT) -{ - isc_result_t result; - isc_region_t region; +static inline isc_result_t +tostruct_rp(ARGS_TOSTRUCT) { + isc_result_t result; + isc_region_t region; dns_rdata_rp_t *rp = target; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_rp); REQUIRE(rp != NULL); @@ -231,8 +231,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_rp(ARGS_FREESTRUCT) -{ +static inline void +freestruct_rp(ARGS_FREESTRUCT) { dns_rdata_rp_t *rp = source; REQUIRE(rp != NULL); @@ -247,8 +247,8 @@ static inline void freestruct_rp(ARGS_FREESTRUCT) rp->mctx = NULL; } -static inline isc_result_t additionaldata_rp(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_rp(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_rp); UNUSED(rdata); @@ -258,10 +258,10 @@ static inline isc_result_t additionaldata_rp(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_rp(ARGS_DIGEST) -{ +static inline isc_result_t +digest_rp(ARGS_DIGEST) { isc_region_t r; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_rp); @@ -278,8 +278,8 @@ static inline isc_result_t digest_rp(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_rp(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_rp(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_rp); UNUSED(name); @@ -290,10 +290,10 @@ static inline bool checkowner_rp(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_rp(ARGS_CHECKNAMES) -{ +static inline bool +checknames_rp(ARGS_CHECKNAMES) { isc_region_t region; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_rp); @@ -311,8 +311,8 @@ static inline bool checknames_rp(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_rp(ARGS_COMPARE) -{ +static inline int +casecompare_rp(ARGS_COMPARE) { return (compare_rp(rdata1, rdata2)); } #endif /* RDATA_GENERIC_RP_17_C */ diff --git a/lib/dns/rdata/generic/rrsig_46.c b/lib/dns/rdata/generic/rrsig_46.c index 581dff721b..0c63e1e9c4 100644 --- a/lib/dns/rdata/generic/rrsig_46.c +++ b/lib/dns/rdata/generic/rrsig_46.c @@ -18,17 +18,17 @@ (DNS_RDATATYPEATTR_DNSSEC | DNS_RDATATYPEATTR_ZONECUTAUTH | \ DNS_RDATATYPEATTR_ATCNAME) -static inline isc_result_t fromtext_rrsig(ARGS_FROMTEXT) -{ - isc_token_t token; - unsigned char c; - long i; +static inline isc_result_t +fromtext_rrsig(ARGS_FROMTEXT) { + isc_token_t token; + unsigned char c; + long i; dns_rdatatype_t covered; - char * e; - isc_result_t result; - dns_name_t name; - isc_buffer_t buffer; - uint32_t time_signed, time_expire; + char *e; + isc_result_t result; + dns_name_t name; + isc_buffer_t buffer; + uint32_t time_signed, time_expire; REQUIRE(type == dns_rdatatype_rrsig); @@ -86,10 +86,11 @@ static inline isc_result_t fromtext_rrsig(ARGS_FROMTEXT) RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, false)); if (strlen(DNS_AS_STR(token)) <= 10U && *DNS_AS_STR(token) != '-' && - *DNS_AS_STR(token) != '+') { - char * end; + *DNS_AS_STR(token) != '+') + { + char *end; unsigned long u; - uint64_t u64; + uint64_t u64; u64 = u = strtoul(DNS_AS_STR(token), &end, 10); if (u == ULONG_MAX || *end != 0) { @@ -110,10 +111,11 @@ static inline isc_result_t fromtext_rrsig(ARGS_FROMTEXT) RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, false)); if (strlen(DNS_AS_STR(token)) <= 10U && *DNS_AS_STR(token) != '-' && - *DNS_AS_STR(token) != '+') { - char * end; + *DNS_AS_STR(token) != '+') + { + char *end; unsigned long u; - uint64_t u64; + uint64_t u64; u64 = u = strtoul(DNS_AS_STR(token), &end, 10); if (u == ULONG_MAX || *end != 0) { @@ -153,16 +155,16 @@ static inline isc_result_t fromtext_rrsig(ARGS_FROMTEXT) return (isc_base64_tobuffer(lexer, target, -2)); } -static inline isc_result_t totext_rrsig(ARGS_TOTEXT) -{ - isc_region_t sr; - char buf[sizeof("4294967295")]; /* Also TYPE65000. */ +static inline isc_result_t +totext_rrsig(ARGS_TOTEXT) { + isc_region_t sr; + char buf[sizeof("4294967295")]; /* Also TYPE65000. */ dns_rdatatype_t covered; - unsigned long ttl; - unsigned long when; - unsigned long exp; - unsigned long foot; - dns_name_t name; + unsigned long ttl; + unsigned long when; + unsigned long exp; + unsigned long foot; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_rrsig); REQUIRE(rdata->length != 0); @@ -270,10 +272,10 @@ static inline isc_result_t totext_rrsig(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_rrsig(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_rrsig(ARGS_FROMWIRE) { isc_region_t sr; - dns_name_t name; + dns_name_t name; REQUIRE(type == dns_rdatatype_rrsig); @@ -313,10 +315,10 @@ static inline isc_result_t fromwire_rrsig(ARGS_FROMWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline isc_result_t towire_rrsig(ARGS_TOWIRE) -{ - isc_region_t sr; - dns_name_t name; +static inline isc_result_t +towire_rrsig(ARGS_TOWIRE) { + isc_region_t sr; + dns_name_t name; dns_offsets_t offsets; REQUIRE(rdata->type == dns_rdatatype_rrsig); @@ -350,8 +352,8 @@ static inline isc_result_t towire_rrsig(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_rrsig(ARGS_COMPARE) -{ +static inline int +compare_rrsig(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -366,8 +368,8 @@ static inline int compare_rrsig(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_rrsig(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_rrsig(ARGS_FROMSTRUCT) { dns_rdata_rrsig_t *sig = source; REQUIRE(type == dns_rdatatype_rrsig); @@ -425,11 +427,11 @@ static inline isc_result_t fromstruct_rrsig(ARGS_FROMSTRUCT) return (mem_tobuffer(target, sig->signature, sig->siglen)); } -static inline isc_result_t tostruct_rrsig(ARGS_TOSTRUCT) -{ - isc_region_t sr; +static inline isc_result_t +tostruct_rrsig(ARGS_TOSTRUCT) { + isc_region_t sr; dns_rdata_rrsig_t *sig = target; - dns_name_t signer; + dns_name_t signer; REQUIRE(rdata->type == dns_rdatatype_rrsig); REQUIRE(sig != NULL); @@ -508,8 +510,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_rrsig(ARGS_FREESTRUCT) -{ +static inline void +freestruct_rrsig(ARGS_FREESTRUCT) { dns_rdata_rrsig_t *sig = (dns_rdata_rrsig_t *)source; REQUIRE(sig != NULL); @@ -526,8 +528,8 @@ static inline void freestruct_rrsig(ARGS_FREESTRUCT) sig->mctx = NULL; } -static inline isc_result_t additionaldata_rrsig(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_rrsig(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_rrsig); UNUSED(rdata); @@ -537,8 +539,8 @@ static inline isc_result_t additionaldata_rrsig(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_rrsig(ARGS_DIGEST) -{ +static inline isc_result_t +digest_rrsig(ARGS_DIGEST) { REQUIRE(rdata->type == dns_rdatatype_rrsig); UNUSED(rdata); @@ -549,10 +551,9 @@ static inline isc_result_t digest_rrsig(ARGS_DIGEST) } static inline dns_rdatatype_t -covers_rrsig(dns_rdata_t *rdata) -{ +covers_rrsig(dns_rdata_t *rdata) { dns_rdatatype_t type; - isc_region_t r; + isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_rrsig); @@ -562,8 +563,8 @@ covers_rrsig(dns_rdata_t *rdata) return (type); } -static inline bool checkowner_rrsig(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_rrsig(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_rrsig); UNUSED(name); @@ -574,8 +575,8 @@ static inline bool checkowner_rrsig(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_rrsig(ARGS_CHECKNAMES) -{ +static inline bool +checknames_rrsig(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_rrsig); UNUSED(rdata); @@ -585,13 +586,13 @@ static inline bool checknames_rrsig(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_rrsig(ARGS_COMPARE) -{ +static inline int +casecompare_rrsig(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; - dns_name_t name1; - dns_name_t name2; - int order; + dns_name_t name1; + dns_name_t name2; + int order; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c index a00b867dae..876a8d92eb 100644 --- a/lib/dns/rdata/generic/rt_21.c +++ b/lib/dns/rdata/generic/rt_21.c @@ -16,12 +16,12 @@ #define RRTYPE_RT_ATTRIBUTES (0) -static inline isc_result_t fromtext_rt(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_rt(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; - bool ok; + bool ok; REQUIRE(type == dns_rdatatype_rt); @@ -58,13 +58,13 @@ static inline isc_result_t fromtext_rt(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_rt(ARGS_TOTEXT) -{ - isc_region_t region; - dns_name_t name; - dns_name_t prefix; - bool sub; - char buf[sizeof("64000")]; +static inline isc_result_t +totext_rt(ARGS_TOTEXT) { + isc_region_t region; + dns_name_t name; + dns_name_t prefix; + bool sub; + char buf[sizeof("64000")]; unsigned short num; REQUIRE(rdata->type == dns_rdatatype_rt); @@ -84,9 +84,9 @@ static inline isc_result_t totext_rt(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_rt(ARGS_FROMWIRE) -{ - dns_name_t name; +static inline isc_result_t +fromwire_rt(ARGS_FROMWIRE) { + dns_name_t name; isc_region_t sregion; isc_region_t tregion; @@ -113,12 +113,12 @@ static inline isc_result_t fromwire_rt(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_rt(ARGS_TOWIRE) -{ - dns_name_t name; +static inline isc_result_t +towire_rt(ARGS_TOWIRE) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; - isc_region_t tr; + isc_region_t region; + isc_region_t tr; REQUIRE(rdata->type == dns_rdatatype_rt); REQUIRE(rdata->length != 0); @@ -139,13 +139,13 @@ static inline isc_result_t towire_rt(ARGS_TOWIRE) return (dns_name_towire(&name, cctx, target)); } -static inline int compare_rt(ARGS_COMPARE) -{ - dns_name_t name1; - dns_name_t name2; +static inline int +compare_rt(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; - int order; + int order; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); @@ -173,10 +173,10 @@ static inline int compare_rt(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_rt(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_rt(ARGS_FROMSTRUCT) { dns_rdata_rt_t *rt = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_rt); REQUIRE(rt != NULL); @@ -191,11 +191,11 @@ static inline isc_result_t fromstruct_rt(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_rt(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_rt(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_rt_t *rt = target; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_rt); REQUIRE(rt != NULL); @@ -217,8 +217,8 @@ static inline isc_result_t tostruct_rt(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_rt(ARGS_FREESTRUCT) -{ +static inline void +freestruct_rt(ARGS_FREESTRUCT) { dns_rdata_rt_t *rt = source; REQUIRE(rt != NULL); @@ -232,12 +232,12 @@ static inline void freestruct_rt(ARGS_FREESTRUCT) rt->mctx = NULL; } -static inline isc_result_t additionaldata_rt(ARGS_ADDLDATA) -{ - dns_name_t name; +static inline isc_result_t +additionaldata_rt(ARGS_ADDLDATA) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; - isc_result_t result; + isc_region_t region; + isc_result_t result; REQUIRE(rdata->type == dns_rdatatype_rt); @@ -257,11 +257,11 @@ static inline isc_result_t additionaldata_rt(ARGS_ADDLDATA) return ((add)(arg, &name, dns_rdatatype_a)); } -static inline isc_result_t digest_rt(ARGS_DIGEST) -{ +static inline isc_result_t +digest_rt(ARGS_DIGEST) { isc_region_t r1, r2; isc_result_t result; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_rt); @@ -278,8 +278,8 @@ static inline isc_result_t digest_rt(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_rt(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_rt(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_rt); UNUSED(name); @@ -290,10 +290,10 @@ static inline bool checkowner_rt(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_rt(ARGS_CHECKNAMES) -{ +static inline bool +checknames_rt(ARGS_CHECKNAMES) { isc_region_t region; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_rt); @@ -312,8 +312,8 @@ static inline bool checknames_rt(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_rt(ARGS_COMPARE) -{ +static inline int +casecompare_rt(ARGS_COMPARE) { return (compare_rt(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c index 4f46f73191..f4a237fe14 100644 --- a/lib/dns/rdata/generic/sig_24.c +++ b/lib/dns/rdata/generic/sig_24.c @@ -16,17 +16,17 @@ #define RRTYPE_SIG_ATTRIBUTES (0) -static inline isc_result_t fromtext_sig(ARGS_FROMTEXT) -{ - isc_token_t token; - unsigned char c; - long i; +static inline isc_result_t +fromtext_sig(ARGS_FROMTEXT) { + isc_token_t token; + unsigned char c; + long i; dns_rdatatype_t covered; - char * e; - isc_result_t result; - dns_name_t name; - isc_buffer_t buffer; - uint32_t time_signed, time_expire; + char *e; + isc_result_t result; + dns_name_t name; + isc_buffer_t buffer; + uint32_t time_signed, time_expire; REQUIRE(type == dns_rdatatype_sig); @@ -119,18 +119,18 @@ static inline isc_result_t fromtext_sig(ARGS_FROMTEXT) return (isc_base64_tobuffer(lexer, target, -2)); } -static inline isc_result_t totext_sig(ARGS_TOTEXT) -{ - isc_region_t sr; - char buf[sizeof("4294967295")]; +static inline isc_result_t +totext_sig(ARGS_TOTEXT) { + isc_region_t sr; + char buf[sizeof("4294967295")]; dns_rdatatype_t covered; - unsigned long ttl; - unsigned long when; - unsigned long exp; - unsigned long foot; - dns_name_t name; - dns_name_t prefix; - bool sub; + unsigned long ttl; + unsigned long when; + unsigned long exp; + unsigned long foot; + dns_name_t name; + dns_name_t prefix; + bool sub; REQUIRE(rdata->type == dns_rdatatype_sig); REQUIRE(rdata->length != 0); @@ -235,10 +235,10 @@ static inline isc_result_t totext_sig(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_sig(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_sig(ARGS_FROMWIRE) { isc_region_t sr; - dns_name_t name; + dns_name_t name; REQUIRE(type == dns_rdatatype_sig); @@ -278,10 +278,10 @@ static inline isc_result_t fromwire_sig(ARGS_FROMWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline isc_result_t towire_sig(ARGS_TOWIRE) -{ - isc_region_t sr; - dns_name_t name; +static inline isc_result_t +towire_sig(ARGS_TOWIRE) { + isc_region_t sr; + dns_name_t name; dns_offsets_t offsets; REQUIRE(rdata->type == dns_rdatatype_sig); @@ -315,13 +315,13 @@ static inline isc_result_t towire_sig(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_sig(ARGS_COMPARE) -{ +static inline int +compare_sig(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; - dns_name_t name1; - dns_name_t name2; - int order; + dns_name_t name1; + dns_name_t name2; + int order; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); @@ -360,8 +360,8 @@ static inline int compare_sig(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_sig(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_sig(ARGS_FROMSTRUCT) { dns_rdata_sig_t *sig = source; REQUIRE(type == dns_rdatatype_sig); @@ -419,11 +419,11 @@ static inline isc_result_t fromstruct_sig(ARGS_FROMSTRUCT) return (mem_tobuffer(target, sig->signature, sig->siglen)); } -static inline isc_result_t tostruct_sig(ARGS_TOSTRUCT) -{ - isc_region_t sr; +static inline isc_result_t +tostruct_sig(ARGS_TOSTRUCT) { + isc_region_t sr; dns_rdata_sig_t *sig = target; - dns_name_t signer; + dns_name_t signer; REQUIRE(rdata->type == dns_rdatatype_sig); REQUIRE(sig != NULL); @@ -502,8 +502,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_sig(ARGS_FREESTRUCT) -{ +static inline void +freestruct_sig(ARGS_FREESTRUCT) { dns_rdata_sig_t *sig = (dns_rdata_sig_t *)source; REQUIRE(sig != NULL); @@ -520,8 +520,8 @@ static inline void freestruct_sig(ARGS_FREESTRUCT) sig->mctx = NULL; } -static inline isc_result_t additionaldata_sig(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_sig(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_sig); UNUSED(rdata); @@ -531,8 +531,8 @@ static inline isc_result_t additionaldata_sig(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_sig(ARGS_DIGEST) -{ +static inline isc_result_t +digest_sig(ARGS_DIGEST) { REQUIRE(rdata->type == dns_rdatatype_sig); UNUSED(rdata); @@ -543,10 +543,9 @@ static inline isc_result_t digest_sig(ARGS_DIGEST) } static inline dns_rdatatype_t -covers_sig(dns_rdata_t *rdata) -{ +covers_sig(dns_rdata_t *rdata) { dns_rdatatype_t type; - isc_region_t r; + isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_sig); @@ -556,8 +555,8 @@ covers_sig(dns_rdata_t *rdata) return (type); } -static inline bool checkowner_sig(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_sig(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_sig); UNUSED(name); @@ -568,8 +567,8 @@ static inline bool checkowner_sig(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_sig(ARGS_CHECKNAMES) -{ +static inline bool +checknames_sig(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_sig); UNUSED(rdata); @@ -579,8 +578,8 @@ static inline bool checknames_sig(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_sig(ARGS_COMPARE) -{ +static inline int +casecompare_sig(ARGS_COMPARE) { return (compare_sig(rdata1, rdata2)); } #endif /* RDATA_GENERIC_SIG_24_C */ diff --git a/lib/dns/rdata/generic/sink_40.c b/lib/dns/rdata/generic/sink_40.c index 88b8b5c24a..d8f2bc06bd 100644 --- a/lib/dns/rdata/generic/sink_40.c +++ b/lib/dns/rdata/generic/sink_40.c @@ -16,8 +16,8 @@ #define RRTYPE_SINK_ATTRIBUTES (0) -static inline isc_result_t fromtext_sink(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_sink(ARGS_FROMTEXT) { isc_token_t token; REQUIRE(type == dns_rdatatype_sink); @@ -55,11 +55,11 @@ static inline isc_result_t fromtext_sink(ARGS_FROMTEXT) return (isc_base64_tobuffer(lexer, target, -1)); } -static inline isc_result_t totext_sink(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_sink(ARGS_TOTEXT) { isc_region_t sr; - char buf[sizeof("255 255 255")]; - uint8_t meaning, coding, subcoding; + char buf[sizeof("255 255 255")]; + uint8_t meaning, coding, subcoding; REQUIRE(rdata->type == dns_rdatatype_sink); REQUIRE(rdata->length >= 3); @@ -101,8 +101,8 @@ static inline isc_result_t totext_sink(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_sink(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_sink(ARGS_FROMWIRE) { isc_region_t sr; REQUIRE(type == dns_rdatatype_sink); @@ -122,8 +122,8 @@ static inline isc_result_t fromwire_sink(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_sink(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_sink(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_sink); REQUIRE(rdata->length >= 3); @@ -132,8 +132,8 @@ static inline isc_result_t towire_sink(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_sink(ARGS_COMPARE) -{ +static inline int +compare_sink(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -148,8 +148,8 @@ static inline int compare_sink(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_sink(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_sink(ARGS_FROMSTRUCT) { dns_rdata_sink_t *sink = source; REQUIRE(type == dns_rdatatype_sink); @@ -173,10 +173,10 @@ static inline isc_result_t fromstruct_sink(ARGS_FROMSTRUCT) return (mem_tobuffer(target, sink->data, sink->datalen)); } -static inline isc_result_t tostruct_sink(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_sink(ARGS_TOSTRUCT) { dns_rdata_sink_t *sink = target; - isc_region_t sr; + isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_sink); REQUIRE(sink != NULL); @@ -220,8 +220,8 @@ static inline isc_result_t tostruct_sink(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_sink(ARGS_FREESTRUCT) -{ +static inline void +freestruct_sink(ARGS_FREESTRUCT) { dns_rdata_sink_t *sink = (dns_rdata_sink_t *)source; REQUIRE(sink != NULL); @@ -237,8 +237,8 @@ static inline void freestruct_sink(ARGS_FREESTRUCT) sink->mctx = NULL; } -static inline isc_result_t additionaldata_sink(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_sink(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_sink); UNUSED(rdata); @@ -248,8 +248,8 @@ static inline isc_result_t additionaldata_sink(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_sink(ARGS_DIGEST) -{ +static inline isc_result_t +digest_sink(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_sink); @@ -259,8 +259,8 @@ static inline isc_result_t digest_sink(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_sink(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_sink(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_sink); UNUSED(name); @@ -271,8 +271,8 @@ static inline bool checkowner_sink(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_sink(ARGS_CHECKNAMES) -{ +static inline bool +checknames_sink(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_sink); UNUSED(rdata); @@ -282,8 +282,8 @@ static inline bool checknames_sink(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_sink(ARGS_COMPARE) -{ +static inline int +casecompare_sink(ARGS_COMPARE) { return (compare_sink(rdata1, rdata2)); } #endif /* RDATA_GENERIC_SINK_40_C */ diff --git a/lib/dns/rdata/generic/smimea_53.c b/lib/dns/rdata/generic/smimea_53.c index 28f4a5b10d..0c39bf12a3 100644 --- a/lib/dns/rdata/generic/smimea_53.c +++ b/lib/dns/rdata/generic/smimea_53.c @@ -14,31 +14,31 @@ #define RRTYPE_SMIMEA_ATTRIBUTES 0 -static inline isc_result_t fromtext_smimea(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_smimea(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_smimea); return (generic_fromtext_tlsa(rdclass, type, lexer, origin, options, target, callbacks)); } -static inline isc_result_t totext_smimea(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_smimea(ARGS_TOTEXT) { REQUIRE(rdata->type == dns_rdatatype_smimea); return (generic_totext_tlsa(rdata, tctx, target)); } -static inline isc_result_t fromwire_smimea(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_smimea(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_smimea); return (generic_fromwire_tlsa(rdclass, type, source, dctx, options, target)); } -static inline isc_result_t towire_smimea(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_smimea(ARGS_TOWIRE) { isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_smimea); @@ -50,8 +50,8 @@ static inline isc_result_t towire_smimea(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_smimea(ARGS_COMPARE) -{ +static inline int +compare_smimea(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -66,15 +66,15 @@ static inline int compare_smimea(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_smimea(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_smimea(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_smimea); return (generic_fromstruct_tlsa(rdclass, type, source, target)); } -static inline isc_result_t tostruct_smimea(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_smimea(ARGS_TOSTRUCT) { dns_rdata_smimea_t *smimea = target; REQUIRE(rdata != NULL); @@ -88,8 +88,8 @@ static inline isc_result_t tostruct_smimea(ARGS_TOSTRUCT) return (generic_tostruct_tlsa(rdata, target, mctx)); } -static inline void freestruct_smimea(ARGS_FREESTRUCT) -{ +static inline void +freestruct_smimea(ARGS_FREESTRUCT) { dns_rdata_smimea_t *smimea = source; REQUIRE(smimea != NULL); @@ -98,8 +98,8 @@ static inline void freestruct_smimea(ARGS_FREESTRUCT) generic_freestruct_tlsa(source); } -static inline isc_result_t additionaldata_smimea(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_smimea(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_smimea); UNUSED(rdata); @@ -109,8 +109,8 @@ static inline isc_result_t additionaldata_smimea(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_smimea(ARGS_DIGEST) -{ +static inline isc_result_t +digest_smimea(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_smimea); @@ -120,8 +120,8 @@ static inline isc_result_t digest_smimea(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_smimea(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_smimea(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_smimea); UNUSED(name); @@ -132,8 +132,8 @@ static inline bool checkowner_smimea(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_smimea(ARGS_CHECKNAMES) -{ +static inline bool +checknames_smimea(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_smimea); UNUSED(rdata); @@ -143,8 +143,8 @@ static inline bool checknames_smimea(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_smimea(ARGS_COMPARE) -{ +static inline int +casecompare_smimea(ARGS_COMPARE) { return (compare_smimea(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c index dcc1212c2c..0339b7f560 100644 --- a/lib/dns/rdata/generic/soa_6.c +++ b/lib/dns/rdata/generic/soa_6.c @@ -14,14 +14,14 @@ #define RRTYPE_SOA_ATTRIBUTES (DNS_RDATATYPEATTR_SINGLETON) -static inline isc_result_t fromtext_soa(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_soa(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; - int i; - uint32_t n; - bool ok; + int i; + uint32_t n; + bool ok; REQUIRE(type == dns_rdatatype_soa); @@ -77,16 +77,16 @@ static inline isc_result_t fromtext_soa(ARGS_FROMTEXT) static const char *soa_fieldnames[5] = { "serial", "refresh", "retry", "expire", "minimum" }; -static inline isc_result_t totext_soa(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_soa(ARGS_TOTEXT) { isc_region_t dregion; - dns_name_t mname; - dns_name_t rname; - dns_name_t prefix; - bool sub; - int i; - bool multiline; - bool comm; + dns_name_t mname; + dns_name_t rname; + dns_name_t prefix; + bool sub; + int i; + bool multiline; + bool comm; REQUIRE(rdata->type == dns_rdatatype_soa); REQUIRE(rdata->length != 0); @@ -124,7 +124,7 @@ static inline isc_result_t totext_soa(ARGS_TOTEXT) RETERR(str_totext(tctx->linebreak, target)); for (i = 0; i < 5; i++) { - char buf[sizeof("0123456789 ; ")]; + char buf[sizeof("0123456789 ; ")]; unsigned long num; num = uint32_fromregion(&dregion); isc_region_consume(&dregion, 4); @@ -151,10 +151,10 @@ static inline isc_result_t totext_soa(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_soa(ARGS_FROMWIRE) -{ - dns_name_t mname; - dns_name_t rname; +static inline isc_result_t +fromwire_soa(ARGS_FROMWIRE) { + dns_name_t mname; + dns_name_t rname; isc_region_t sregion; isc_region_t tregion; @@ -188,12 +188,12 @@ static inline isc_result_t fromwire_soa(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_soa(ARGS_TOWIRE) -{ - isc_region_t sregion; - isc_region_t tregion; - dns_name_t mname; - dns_name_t rname; +static inline isc_result_t +towire_soa(ARGS_TOWIRE) { + isc_region_t sregion; + isc_region_t tregion; + dns_name_t mname; + dns_name_t rname; dns_offsets_t moffsets; dns_offsets_t roffsets; @@ -225,13 +225,13 @@ static inline isc_result_t towire_soa(ARGS_TOWIRE) return (ISC_R_SUCCESS); } -static inline int compare_soa(ARGS_COMPARE) -{ +static inline int +compare_soa(ARGS_COMPARE) { isc_region_t region1; isc_region_t region2; - dns_name_t name1; - dns_name_t name2; - int order; + dns_name_t name1; + dns_name_t name2; + int order; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); @@ -273,10 +273,10 @@ static inline int compare_soa(ARGS_COMPARE) return (isc_region_compare(®ion1, ®ion2)); } -static inline isc_result_t fromstruct_soa(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_soa(ARGS_FROMSTRUCT) { dns_rdata_soa_t *soa = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_soa); REQUIRE(soa != NULL); @@ -297,12 +297,12 @@ static inline isc_result_t fromstruct_soa(ARGS_FROMSTRUCT) return (uint32_tobuffer(soa->minimum, target)); } -static inline isc_result_t tostruct_soa(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_soa(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_soa_t *soa = target; - dns_name_t name; - isc_result_t result; + dns_name_t name; + isc_result_t result; REQUIRE(rdata->type == dns_rdatatype_soa); REQUIRE(soa != NULL); @@ -352,8 +352,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_soa(ARGS_FREESTRUCT) -{ +static inline void +freestruct_soa(ARGS_FREESTRUCT) { dns_rdata_soa_t *soa = source; REQUIRE(soa != NULL); @@ -368,8 +368,8 @@ static inline void freestruct_soa(ARGS_FREESTRUCT) soa->mctx = NULL; } -static inline isc_result_t additionaldata_soa(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_soa(ARGS_ADDLDATA) { UNUSED(rdata); UNUSED(add); UNUSED(arg); @@ -379,10 +379,10 @@ static inline isc_result_t additionaldata_soa(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_soa(ARGS_DIGEST) -{ +static inline isc_result_t +digest_soa(ARGS_DIGEST) { isc_region_t r; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_soa); @@ -401,8 +401,8 @@ static inline isc_result_t digest_soa(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_soa(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_soa(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_soa); UNUSED(name); @@ -413,10 +413,10 @@ static inline bool checkowner_soa(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_soa(ARGS_CHECKNAMES) -{ +static inline bool +checknames_soa(ARGS_CHECKNAMES) { isc_region_t region; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_soa); @@ -442,8 +442,8 @@ static inline bool checknames_soa(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_soa(ARGS_COMPARE) -{ +static inline int +casecompare_soa(ARGS_COMPARE) { return (compare_soa(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/spf_99.c b/lib/dns/rdata/generic/spf_99.c index fb418dbf03..a8c7c4f252 100644 --- a/lib/dns/rdata/generic/spf_99.c +++ b/lib/dns/rdata/generic/spf_99.c @@ -14,8 +14,8 @@ #define RRTYPE_SPF_ATTRIBUTES (0) -static inline isc_result_t fromtext_spf(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_spf(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_spf); UNUSED(type); @@ -28,8 +28,8 @@ static inline isc_result_t fromtext_spf(ARGS_FROMTEXT) target, callbacks)); } -static inline isc_result_t totext_spf(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_spf(ARGS_TOTEXT) { UNUSED(tctx); REQUIRE(rdata->type == dns_rdatatype_spf); @@ -37,8 +37,8 @@ static inline isc_result_t totext_spf(ARGS_TOTEXT) return (generic_totext_txt(rdata, tctx, target)); } -static inline isc_result_t fromwire_spf(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_spf(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_spf); UNUSED(type); @@ -50,8 +50,8 @@ static inline isc_result_t fromwire_spf(ARGS_FROMWIRE) target)); } -static inline isc_result_t towire_spf(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_spf(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_spf); UNUSED(cctx); @@ -59,8 +59,8 @@ static inline isc_result_t towire_spf(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_spf(ARGS_COMPARE) -{ +static inline int +compare_spf(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -73,15 +73,15 @@ static inline int compare_spf(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_spf(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_spf(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_spf); return (generic_fromstruct_txt(rdclass, type, source, target)); } -static inline isc_result_t tostruct_spf(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_spf(ARGS_TOSTRUCT) { dns_rdata_spf_t *spf = target; REQUIRE(spf != NULL); @@ -95,8 +95,8 @@ static inline isc_result_t tostruct_spf(ARGS_TOSTRUCT) return (generic_tostruct_txt(rdata, target, mctx)); } -static inline void freestruct_spf(ARGS_FREESTRUCT) -{ +static inline void +freestruct_spf(ARGS_FREESTRUCT) { dns_rdata_spf_t *spf = source; REQUIRE(spf != NULL); @@ -105,8 +105,8 @@ static inline void freestruct_spf(ARGS_FREESTRUCT) generic_freestruct_txt(source); } -static inline isc_result_t additionaldata_spf(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_spf(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_spf); UNUSED(rdata); @@ -116,8 +116,8 @@ static inline isc_result_t additionaldata_spf(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_spf(ARGS_DIGEST) -{ +static inline isc_result_t +digest_spf(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_spf); @@ -127,8 +127,8 @@ static inline isc_result_t digest_spf(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_spf(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_spf(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_spf); UNUSED(name); @@ -139,8 +139,8 @@ static inline bool checkowner_spf(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_spf(ARGS_CHECKNAMES) -{ +static inline bool +checknames_spf(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_spf); UNUSED(rdata); @@ -150,8 +150,8 @@ static inline bool checknames_spf(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_spf(ARGS_COMPARE) -{ +static inline int +casecompare_spf(ARGS_COMPARE) { return (compare_spf(rdata1, rdata2)); } #endif /* RDATA_GENERIC_SPF_99_C */ diff --git a/lib/dns/rdata/generic/sshfp_44.c b/lib/dns/rdata/generic/sshfp_44.c index b92c900241..1028294a20 100644 --- a/lib/dns/rdata/generic/sshfp_44.c +++ b/lib/dns/rdata/generic/sshfp_44.c @@ -16,10 +16,10 @@ #define RRTYPE_SSHFP_ATTRIBUTES (0) -static inline isc_result_t fromtext_sshfp(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_sshfp(ARGS_FROMTEXT) { isc_token_t token; - int len = -1; + int len = -1; REQUIRE(type == dns_rdatatype_sshfp); @@ -69,10 +69,10 @@ static inline isc_result_t fromtext_sshfp(ARGS_FROMTEXT) return (isc_hex_tobuffer(lexer, target, len)); } -static inline isc_result_t totext_sshfp(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_sshfp(ARGS_TOTEXT) { isc_region_t sr; - char buf[sizeof("64000 ")]; + char buf[sizeof("64000 ")]; unsigned int n; REQUIRE(rdata->type == dns_rdatatype_sshfp); @@ -121,8 +121,8 @@ static inline isc_result_t totext_sshfp(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_sshfp(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_sshfp(ARGS_FROMWIRE) { isc_region_t sr; REQUIRE(type == dns_rdatatype_sshfp); @@ -138,7 +138,8 @@ static inline isc_result_t fromwire_sshfp(ARGS_FROMWIRE) } if ((sr.base[1] == 1 && sr.length != ISC_SHA1_DIGESTLENGTH + 2) || - (sr.base[1] == 2 && sr.length != ISC_SHA256_DIGESTLENGTH + 2)) { + (sr.base[1] == 2 && sr.length != ISC_SHA256_DIGESTLENGTH + 2)) + { return (DNS_R_FORMERR); } @@ -146,8 +147,8 @@ static inline isc_result_t fromwire_sshfp(ARGS_FROMWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline isc_result_t towire_sshfp(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_sshfp(ARGS_TOWIRE) { isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_sshfp); @@ -159,8 +160,8 @@ static inline isc_result_t towire_sshfp(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_sshfp(ARGS_COMPARE) -{ +static inline int +compare_sshfp(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -175,8 +176,8 @@ static inline int compare_sshfp(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_sshfp(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_sshfp(ARGS_FROMSTRUCT) { dns_rdata_sshfp_t *sshfp = source; REQUIRE(type == dns_rdatatype_sshfp); @@ -193,10 +194,10 @@ static inline isc_result_t fromstruct_sshfp(ARGS_FROMSTRUCT) return (mem_tobuffer(target, sshfp->digest, sshfp->length)); } -static inline isc_result_t tostruct_sshfp(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_sshfp(ARGS_TOSTRUCT) { dns_rdata_sshfp_t *sshfp = target; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_sshfp); REQUIRE(sshfp != NULL); @@ -223,8 +224,8 @@ static inline isc_result_t tostruct_sshfp(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_sshfp(ARGS_FREESTRUCT) -{ +static inline void +freestruct_sshfp(ARGS_FREESTRUCT) { dns_rdata_sshfp_t *sshfp = source; REQUIRE(sshfp != NULL); @@ -240,8 +241,8 @@ static inline void freestruct_sshfp(ARGS_FREESTRUCT) sshfp->mctx = NULL; } -static inline isc_result_t additionaldata_sshfp(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_sshfp(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_sshfp); UNUSED(rdata); @@ -251,8 +252,8 @@ static inline isc_result_t additionaldata_sshfp(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_sshfp(ARGS_DIGEST) -{ +static inline isc_result_t +digest_sshfp(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_sshfp); @@ -262,8 +263,8 @@ static inline isc_result_t digest_sshfp(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_sshfp(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_sshfp(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_sshfp); UNUSED(name); @@ -274,8 +275,8 @@ static inline bool checkowner_sshfp(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_sshfp(ARGS_CHECKNAMES) -{ +static inline bool +checknames_sshfp(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_sshfp); UNUSED(rdata); @@ -285,8 +286,8 @@ static inline bool checknames_sshfp(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_sshfp(ARGS_COMPARE) -{ +static inline int +casecompare_sshfp(ARGS_COMPARE) { return (compare_sshfp(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/ta_32768.c b/lib/dns/rdata/generic/ta_32768.c index b56b98e605..6c57b711e4 100644 --- a/lib/dns/rdata/generic/ta_32768.c +++ b/lib/dns/rdata/generic/ta_32768.c @@ -16,31 +16,31 @@ #define RRTYPE_TA_ATTRIBUTES 0 -static inline isc_result_t fromtext_ta(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_ta(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_ta); return (generic_fromtext_ds(rdclass, type, lexer, origin, options, target, callbacks)); } -static inline isc_result_t totext_ta(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_ta(ARGS_TOTEXT) { REQUIRE(rdata->type == dns_rdatatype_ta); return (generic_totext_ds(rdata, tctx, target)); } -static inline isc_result_t fromwire_ta(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_ta(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_ta); return (generic_fromwire_ds(rdclass, type, source, dctx, options, target)); } -static inline isc_result_t towire_ta(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_ta(ARGS_TOWIRE) { isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_ta); @@ -52,8 +52,8 @@ static inline isc_result_t towire_ta(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_ta(ARGS_COMPARE) -{ +static inline int +compare_ta(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -68,15 +68,15 @@ static inline int compare_ta(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_ta(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_ta(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_ta); return (generic_fromstruct_ds(rdclass, type, source, target)); } -static inline isc_result_t tostruct_ta(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_ta(ARGS_TOSTRUCT) { dns_rdata_ds_t *ds = target; REQUIRE(rdata->type == dns_rdatatype_ta); @@ -92,8 +92,8 @@ static inline isc_result_t tostruct_ta(ARGS_TOSTRUCT) return (generic_tostruct_ds(rdata, target, mctx)); } -static inline void freestruct_ta(ARGS_FREESTRUCT) -{ +static inline void +freestruct_ta(ARGS_FREESTRUCT) { dns_rdata_ta_t *ds = source; REQUIRE(ds != NULL); @@ -109,8 +109,8 @@ static inline void freestruct_ta(ARGS_FREESTRUCT) ds->mctx = NULL; } -static inline isc_result_t additionaldata_ta(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_ta(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_ta); UNUSED(rdata); @@ -120,8 +120,8 @@ static inline isc_result_t additionaldata_ta(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_ta(ARGS_DIGEST) -{ +static inline isc_result_t +digest_ta(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_ta); @@ -131,8 +131,8 @@ static inline isc_result_t digest_ta(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_ta(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_ta(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_ta); UNUSED(name); @@ -143,8 +143,8 @@ static inline bool checkowner_ta(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_ta(ARGS_CHECKNAMES) -{ +static inline bool +checknames_ta(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_ta); UNUSED(rdata); @@ -154,8 +154,8 @@ static inline bool checknames_ta(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_ta(ARGS_COMPARE) -{ +static inline int +casecompare_ta(ARGS_COMPARE) { return (compare_ta(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/talink_58.c b/lib/dns/rdata/generic/talink_58.c index 76dae5b891..8305ed10d1 100644 --- a/lib/dns/rdata/generic/talink_58.c +++ b/lib/dns/rdata/generic/talink_58.c @@ -14,12 +14,12 @@ #define RRTYPE_TALINK_ATTRIBUTES 0 -static inline isc_result_t fromtext_talink(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_talink(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; - int i; + int i; REQUIRE(type == dns_rdatatype_talink); @@ -44,13 +44,13 @@ static inline isc_result_t fromtext_talink(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_talink(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_talink(ARGS_TOTEXT) { isc_region_t dregion; - dns_name_t prev; - dns_name_t next; - dns_name_t prefix; - bool sub; + dns_name_t prev; + dns_name_t next; + dns_name_t prefix; + bool sub; REQUIRE(rdata->type == dns_rdatatype_talink); REQUIRE(rdata->length != 0); @@ -76,8 +76,8 @@ static inline isc_result_t totext_talink(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_talink(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_talink(ARGS_FROMWIRE) { dns_name_t prev; dns_name_t next; @@ -95,11 +95,11 @@ static inline isc_result_t fromwire_talink(ARGS_FROMWIRE) return (dns_name_fromwire(&next, source, dctx, options, target)); } -static inline isc_result_t towire_talink(ARGS_TOWIRE) -{ - isc_region_t sregion; - dns_name_t prev; - dns_name_t next; +static inline isc_result_t +towire_talink(ARGS_TOWIRE) { + isc_region_t sregion; + dns_name_t prev; + dns_name_t next; dns_offsets_t moffsets; dns_offsets_t roffsets; @@ -122,8 +122,8 @@ static inline isc_result_t towire_talink(ARGS_TOWIRE) return (dns_name_towire(&next, cctx, target)); } -static inline int compare_talink(ARGS_COMPARE) -{ +static inline int +compare_talink(ARGS_COMPARE) { isc_region_t region1; isc_region_t region2; @@ -138,10 +138,10 @@ static inline int compare_talink(ARGS_COMPARE) return (isc_region_compare(®ion1, ®ion2)); } -static inline isc_result_t fromstruct_talink(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_talink(ARGS_FROMSTRUCT) { dns_rdata_talink_t *talink = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_talink); REQUIRE(talink != NULL); @@ -157,12 +157,12 @@ static inline isc_result_t fromstruct_talink(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_talink(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_talink(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_talink_t *talink = target; - dns_name_t name; - isc_result_t result; + dns_name_t name; + isc_result_t result; REQUIRE(rdata->type == dns_rdatatype_talink); REQUIRE(talink != NULL); @@ -198,8 +198,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_talink(ARGS_FREESTRUCT) -{ +static inline void +freestruct_talink(ARGS_FREESTRUCT) { dns_rdata_talink_t *talink = source; REQUIRE(talink != NULL); @@ -214,8 +214,8 @@ static inline void freestruct_talink(ARGS_FREESTRUCT) talink->mctx = NULL; } -static inline isc_result_t additionaldata_talink(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_talink(ARGS_ADDLDATA) { UNUSED(rdata); UNUSED(add); UNUSED(arg); @@ -225,8 +225,8 @@ static inline isc_result_t additionaldata_talink(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_talink(ARGS_DIGEST) -{ +static inline isc_result_t +digest_talink(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_talink); @@ -235,8 +235,8 @@ static inline isc_result_t digest_talink(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_talink(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_talink(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_talink); UNUSED(name); @@ -247,8 +247,8 @@ static inline bool checkowner_talink(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_talink(ARGS_CHECKNAMES) -{ +static inline bool +checknames_talink(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_talink); UNUSED(bad); @@ -257,8 +257,8 @@ static inline bool checknames_talink(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_talink(ARGS_COMPARE) -{ +static inline int +casecompare_talink(ARGS_COMPARE) { return (compare_talink(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c index f63df5a9c1..2df03b3c00 100644 --- a/lib/dns/rdata/generic/tkey_249.c +++ b/lib/dns/rdata/generic/tkey_249.c @@ -16,14 +16,14 @@ #define RRTYPE_TKEY_ATTRIBUTES (DNS_RDATATYPEATTR_META) -static inline isc_result_t fromtext_tkey(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_rcode_t rcode; - dns_name_t name; +static inline isc_result_t +fromtext_tkey(ARGS_FROMTEXT) { + isc_token_t token; + dns_rcode_t rcode; + dns_name_t name; isc_buffer_t buffer; - long i; - char * e; + long i; + char *e; REQUIRE(type == dns_rdatatype_tkey); @@ -116,14 +116,14 @@ static inline isc_result_t fromtext_tkey(ARGS_FROMTEXT) return (isc_base64_tobuffer(lexer, target, (int)token.value.as_ulong)); } -static inline isc_result_t totext_tkey(ARGS_TOTEXT) -{ - isc_region_t sr, dr; - char buf[sizeof("4294967295 ")]; +static inline isc_result_t +totext_tkey(ARGS_TOTEXT) { + isc_region_t sr, dr; + char buf[sizeof("4294967295 ")]; unsigned long n; - dns_name_t name; - dns_name_t prefix; - bool sub; + dns_name_t name; + dns_name_t prefix; + bool sub; REQUIRE(rdata->type == dns_rdatatype_tkey); REQUIRE(rdata->length != 0); @@ -240,11 +240,11 @@ static inline isc_result_t totext_tkey(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_tkey(ARGS_FROMWIRE) -{ - isc_region_t sr; +static inline isc_result_t +fromwire_tkey(ARGS_FROMWIRE) { + isc_region_t sr; unsigned long n; - dns_name_t name; + dns_name_t name; REQUIRE(type == dns_rdatatype_tkey); @@ -301,10 +301,10 @@ static inline isc_result_t fromwire_tkey(ARGS_FROMWIRE) return (mem_tobuffer(target, sr.base, n + 2)); } -static inline isc_result_t towire_tkey(ARGS_TOWIRE) -{ - isc_region_t sr; - dns_name_t name; +static inline isc_result_t +towire_tkey(ARGS_TOWIRE) { + isc_region_t sr; + dns_name_t name; dns_offsets_t offsets; REQUIRE(rdata->type == dns_rdatatype_tkey); @@ -323,13 +323,13 @@ static inline isc_result_t towire_tkey(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_tkey(ARGS_COMPARE) -{ +static inline int +compare_tkey(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; - dns_name_t name1; - dns_name_t name2; - int order; + dns_name_t name1; + dns_name_t name2; + int order; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); @@ -354,8 +354,8 @@ static inline int compare_tkey(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_tkey(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_tkey(ARGS_FROMSTRUCT) { dns_rdata_tkey_t *tkey = source; REQUIRE(type == dns_rdatatype_tkey); @@ -412,11 +412,11 @@ static inline isc_result_t fromstruct_tkey(ARGS_FROMSTRUCT) return (mem_tobuffer(target, tkey->other, tkey->otherlen)); } -static inline isc_result_t tostruct_tkey(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_tkey(ARGS_TOSTRUCT) { dns_rdata_tkey_t *tkey = target; - dns_name_t alg; - isc_region_t sr; + dns_name_t alg; + isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_tkey); REQUIRE(tkey != NULL); @@ -505,8 +505,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_tkey(ARGS_FREESTRUCT) -{ +static inline void +freestruct_tkey(ARGS_FREESTRUCT) { dns_rdata_tkey_t *tkey = (dns_rdata_tkey_t *)source; REQUIRE(tkey != NULL); @@ -525,8 +525,8 @@ static inline void freestruct_tkey(ARGS_FREESTRUCT) tkey->mctx = NULL; } -static inline isc_result_t additionaldata_tkey(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_tkey(ARGS_ADDLDATA) { UNUSED(rdata); UNUSED(add); UNUSED(arg); @@ -536,8 +536,8 @@ static inline isc_result_t additionaldata_tkey(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_tkey(ARGS_DIGEST) -{ +static inline isc_result_t +digest_tkey(ARGS_DIGEST) { UNUSED(rdata); UNUSED(digest); UNUSED(arg); @@ -547,8 +547,8 @@ static inline isc_result_t digest_tkey(ARGS_DIGEST) return (ISC_R_NOTIMPLEMENTED); } -static inline bool checkowner_tkey(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_tkey(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_tkey); UNUSED(name); @@ -559,8 +559,8 @@ static inline bool checkowner_tkey(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_tkey(ARGS_CHECKNAMES) -{ +static inline bool +checknames_tkey(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_tkey); UNUSED(rdata); @@ -570,8 +570,8 @@ static inline bool checknames_tkey(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_tkey(ARGS_COMPARE) -{ +static inline int +casecompare_tkey(ARGS_COMPARE) { return (compare_tkey(rdata1, rdata2)); } #endif /* RDATA_GENERIC_TKEY_249_C */ diff --git a/lib/dns/rdata/generic/tlsa_52.c b/lib/dns/rdata/generic/tlsa_52.c index d8c0e72793..1140bc01cd 100644 --- a/lib/dns/rdata/generic/tlsa_52.c +++ b/lib/dns/rdata/generic/tlsa_52.c @@ -16,8 +16,8 @@ #define RRTYPE_TLSA_ATTRIBUTES 0 -static inline isc_result_t generic_fromtext_tlsa(ARGS_FROMTEXT) -{ +static inline isc_result_t +generic_fromtext_tlsa(ARGS_FROMTEXT) { isc_token_t token; UNUSED(type); @@ -62,10 +62,10 @@ static inline isc_result_t generic_fromtext_tlsa(ARGS_FROMTEXT) return (isc_hex_tobuffer(lexer, target, -2)); } -static inline isc_result_t generic_totext_tlsa(ARGS_TOTEXT) -{ +static inline isc_result_t +generic_totext_tlsa(ARGS_TOTEXT) { isc_region_t sr; - char buf[sizeof("64000 ")]; + char buf[sizeof("64000 ")]; unsigned int n; REQUIRE(rdata->length != 0); @@ -117,8 +117,8 @@ static inline isc_result_t generic_totext_tlsa(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t generic_fromwire_tlsa(ARGS_FROMWIRE) -{ +static inline isc_result_t +generic_fromwire_tlsa(ARGS_FROMWIRE) { isc_region_t sr; UNUSED(type); @@ -136,31 +136,31 @@ static inline isc_result_t generic_fromwire_tlsa(ARGS_FROMWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline isc_result_t fromtext_tlsa(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_tlsa(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_tlsa); return (generic_fromtext_tlsa(rdclass, type, lexer, origin, options, target, callbacks)); } -static inline isc_result_t totext_tlsa(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_tlsa(ARGS_TOTEXT) { REQUIRE(rdata->type == dns_rdatatype_tlsa); return (generic_totext_tlsa(rdata, tctx, target)); } -static inline isc_result_t fromwire_tlsa(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_tlsa(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_tlsa); return (generic_fromwire_tlsa(rdclass, type, source, dctx, options, target)); } -static inline isc_result_t towire_tlsa(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_tlsa(ARGS_TOWIRE) { isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_tlsa); @@ -172,8 +172,8 @@ static inline isc_result_t towire_tlsa(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_tlsa(ARGS_COMPARE) -{ +static inline int +compare_tlsa(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -188,8 +188,8 @@ static inline int compare_tlsa(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t generic_fromstruct_tlsa(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +generic_fromstruct_tlsa(ARGS_FROMSTRUCT) { dns_rdata_tlsa_t *tlsa = source; REQUIRE(tlsa != NULL); @@ -206,10 +206,10 @@ static inline isc_result_t generic_fromstruct_tlsa(ARGS_FROMSTRUCT) return (mem_tobuffer(target, tlsa->data, tlsa->length)); } -static inline isc_result_t generic_tostruct_tlsa(ARGS_TOSTRUCT) -{ +static inline isc_result_t +generic_tostruct_tlsa(ARGS_TOSTRUCT) { dns_rdata_tlsa_t *tlsa = target; - isc_region_t region; + isc_region_t region; REQUIRE(tlsa != NULL); REQUIRE(rdata->length != 0); @@ -238,8 +238,8 @@ static inline isc_result_t generic_tostruct_tlsa(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void generic_freestruct_tlsa(ARGS_FREESTRUCT) -{ +static inline void +generic_freestruct_tlsa(ARGS_FREESTRUCT) { dns_rdata_tlsa_t *tlsa = source; REQUIRE(tlsa != NULL); @@ -254,15 +254,15 @@ static inline void generic_freestruct_tlsa(ARGS_FREESTRUCT) tlsa->mctx = NULL; } -static inline isc_result_t fromstruct_tlsa(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_tlsa(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_tlsa); return (generic_fromstruct_tlsa(rdclass, type, source, target)); } -static inline isc_result_t tostruct_tlsa(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_tlsa(ARGS_TOSTRUCT) { dns_rdata_tlsa_t *tlsa = target; REQUIRE(rdata->type == dns_rdatatype_tlsa); @@ -275,8 +275,8 @@ static inline isc_result_t tostruct_tlsa(ARGS_TOSTRUCT) return (generic_tostruct_tlsa(rdata, target, mctx)); } -static inline void freestruct_tlsa(ARGS_FREESTRUCT) -{ +static inline void +freestruct_tlsa(ARGS_FREESTRUCT) { dns_rdata_tlsa_t *tlsa = source; REQUIRE(tlsa != NULL); @@ -285,8 +285,8 @@ static inline void freestruct_tlsa(ARGS_FREESTRUCT) generic_freestruct_tlsa(source); } -static inline isc_result_t additionaldata_tlsa(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_tlsa(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_tlsa); UNUSED(rdata); @@ -296,8 +296,8 @@ static inline isc_result_t additionaldata_tlsa(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_tlsa(ARGS_DIGEST) -{ +static inline isc_result_t +digest_tlsa(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_tlsa); @@ -307,8 +307,8 @@ static inline isc_result_t digest_tlsa(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_tlsa(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_tlsa(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_tlsa); UNUSED(name); @@ -319,8 +319,8 @@ static inline bool checkowner_tlsa(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_tlsa(ARGS_CHECKNAMES) -{ +static inline bool +checknames_tlsa(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_tlsa); UNUSED(rdata); @@ -330,8 +330,8 @@ static inline bool checknames_tlsa(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_tlsa(ARGS_COMPARE) -{ +static inline int +casecompare_tlsa(ARGS_COMPARE) { return (compare_tlsa(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c index 4a91c4c412..6ef403aaf3 100644 --- a/lib/dns/rdata/generic/txt_16.c +++ b/lib/dns/rdata/generic/txt_16.c @@ -14,10 +14,10 @@ #define RRTYPE_TXT_ATTRIBUTES (0) -static inline isc_result_t generic_fromtext_txt(ARGS_FROMTEXT) -{ +static inline isc_result_t +generic_fromtext_txt(ARGS_FROMTEXT) { isc_token_t token; - int strings; + int strings; UNUSED(type); UNUSED(rdclass); @@ -48,8 +48,8 @@ static inline isc_result_t generic_fromtext_txt(ARGS_FROMTEXT) return (strings == 0 ? ISC_R_UNEXPECTEDEND : ISC_R_SUCCESS); } -static inline isc_result_t generic_totext_txt(ARGS_TOTEXT) -{ +static inline isc_result_t +generic_totext_txt(ARGS_TOTEXT) { isc_region_t region; UNUSED(tctx); @@ -66,8 +66,8 @@ static inline isc_result_t generic_totext_txt(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t generic_fromwire_txt(ARGS_FROMWIRE) -{ +static inline isc_result_t +generic_fromwire_txt(ARGS_FROMWIRE) { isc_result_t result; UNUSED(type); @@ -84,31 +84,31 @@ static inline isc_result_t generic_fromwire_txt(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t fromtext_txt(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_txt(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_txt); return (generic_fromtext_txt(rdclass, type, lexer, origin, options, target, callbacks)); } -static inline isc_result_t totext_txt(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_txt(ARGS_TOTEXT) { REQUIRE(rdata->type == dns_rdatatype_txt); return (generic_totext_txt(rdata, tctx, target)); } -static inline isc_result_t fromwire_txt(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_txt(ARGS_FROMWIRE) { REQUIRE(type == dns_rdatatype_txt); return (generic_fromwire_txt(rdclass, type, source, dctx, options, target)); } -static inline isc_result_t towire_txt(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_txt(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_txt); UNUSED(cctx); @@ -116,8 +116,8 @@ static inline isc_result_t towire_txt(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_txt(ARGS_COMPARE) -{ +static inline int +compare_txt(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -130,11 +130,11 @@ static inline int compare_txt(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t generic_fromstruct_txt(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +generic_fromstruct_txt(ARGS_FROMSTRUCT) { dns_rdata_txt_t *txt = source; - isc_region_t region; - uint8_t length; + isc_region_t region; + uint8_t length; REQUIRE(txt != NULL); REQUIRE(txt->common.rdtype == type); @@ -158,10 +158,10 @@ static inline isc_result_t generic_fromstruct_txt(ARGS_FROMSTRUCT) return (mem_tobuffer(target, txt->txt, txt->txt_len)); } -static inline isc_result_t generic_tostruct_txt(ARGS_TOSTRUCT) -{ +static inline isc_result_t +generic_tostruct_txt(ARGS_TOSTRUCT) { dns_rdata_txt_t *txt = target; - isc_region_t r; + isc_region_t r; REQUIRE(txt != NULL); REQUIRE(txt->common.rdclass == rdata->rdclass); @@ -180,8 +180,8 @@ static inline isc_result_t generic_tostruct_txt(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void generic_freestruct_txt(ARGS_FREESTRUCT) -{ +static inline void +generic_freestruct_txt(ARGS_FREESTRUCT) { dns_rdata_txt_t *txt = source; REQUIRE(txt != NULL); @@ -196,15 +196,15 @@ static inline void generic_freestruct_txt(ARGS_FREESTRUCT) txt->mctx = NULL; } -static inline isc_result_t fromstruct_txt(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_txt(ARGS_FROMSTRUCT) { REQUIRE(type == dns_rdatatype_txt); return (generic_fromstruct_txt(rdclass, type, source, target)); } -static inline isc_result_t tostruct_txt(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_txt(ARGS_TOSTRUCT) { dns_rdata_txt_t *txt = target; REQUIRE(rdata->type == dns_rdatatype_txt); @@ -217,8 +217,8 @@ static inline isc_result_t tostruct_txt(ARGS_TOSTRUCT) return (generic_tostruct_txt(rdata, target, mctx)); } -static inline void freestruct_txt(ARGS_FREESTRUCT) -{ +static inline void +freestruct_txt(ARGS_FREESTRUCT) { dns_rdata_txt_t *txt = source; REQUIRE(txt != NULL); @@ -227,8 +227,8 @@ static inline void freestruct_txt(ARGS_FREESTRUCT) generic_freestruct_txt(source); } -static inline isc_result_t additionaldata_txt(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_txt(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_txt); UNUSED(rdata); @@ -238,8 +238,8 @@ static inline isc_result_t additionaldata_txt(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_txt(ARGS_DIGEST) -{ +static inline isc_result_t +digest_txt(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_txt); @@ -249,8 +249,8 @@ static inline isc_result_t digest_txt(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_txt(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_txt(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_txt); UNUSED(name); @@ -261,8 +261,8 @@ static inline bool checkowner_txt(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_txt(ARGS_CHECKNAMES) -{ +static inline bool +checknames_txt(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_txt); UNUSED(rdata); @@ -272,14 +272,13 @@ static inline bool checknames_txt(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_txt(ARGS_COMPARE) -{ +static inline int +casecompare_txt(ARGS_COMPARE) { return (compare_txt(rdata1, rdata2)); } static isc_result_t -generic_txt_first(dns_rdata_txt_t *txt) -{ +generic_txt_first(dns_rdata_txt_t *txt) { REQUIRE(txt != NULL); REQUIRE(txt->txt != NULL || txt->txt_len == 0); @@ -292,10 +291,9 @@ generic_txt_first(dns_rdata_txt_t *txt) } static isc_result_t -generic_txt_next(dns_rdata_txt_t *txt) -{ +generic_txt_next(dns_rdata_txt_t *txt) { isc_region_t r; - uint8_t length; + uint8_t length; REQUIRE(txt != NULL); REQUIRE(txt->txt != NULL && txt->txt_len != 0); @@ -313,8 +311,7 @@ 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) -{ +generic_txt_current(dns_rdata_txt_t *txt, dns_rdata_txt_string_t *string) { isc_region_t r; REQUIRE(txt != NULL); @@ -335,8 +332,7 @@ generic_txt_current(dns_rdata_txt_t *txt, dns_rdata_txt_string_t *string) } isc_result_t -dns_rdata_txt_first(dns_rdata_txt_t *txt) -{ +dns_rdata_txt_first(dns_rdata_txt_t *txt) { REQUIRE(txt != NULL); REQUIRE(txt->common.rdtype == dns_rdatatype_txt); @@ -344,8 +340,7 @@ dns_rdata_txt_first(dns_rdata_txt_t *txt) } isc_result_t -dns_rdata_txt_next(dns_rdata_txt_t *txt) -{ +dns_rdata_txt_next(dns_rdata_txt_t *txt) { REQUIRE(txt != NULL); REQUIRE(txt->common.rdtype == dns_rdatatype_txt); @@ -353,8 +348,7 @@ dns_rdata_txt_next(dns_rdata_txt_t *txt) } isc_result_t -dns_rdata_txt_current(dns_rdata_txt_t *txt, dns_rdata_txt_string_t *string) -{ +dns_rdata_txt_current(dns_rdata_txt_t *txt, dns_rdata_txt_string_t *string) { REQUIRE(txt != NULL); REQUIRE(txt->common.rdtype == dns_rdatatype_txt); diff --git a/lib/dns/rdata/generic/uri_256.c b/lib/dns/rdata/generic/uri_256.c index 4b5f5cf5bb..0962c222a3 100644 --- a/lib/dns/rdata/generic/uri_256.c +++ b/lib/dns/rdata/generic/uri_256.c @@ -14,8 +14,8 @@ #define RRTYPE_URI_ATTRIBUTES (0) -static inline isc_result_t fromtext_uri(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_uri(ARGS_FROMTEXT) { isc_token_t token; REQUIRE(type == dns_rdatatype_uri); @@ -58,11 +58,11 @@ static inline isc_result_t fromtext_uri(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_uri(ARGS_TOTEXT) -{ - isc_region_t region; +static inline isc_result_t +totext_uri(ARGS_TOTEXT) { + isc_region_t region; unsigned short priority, weight; - char buf[sizeof("65000 ")]; + char buf[sizeof("65000 ")]; UNUSED(tctx); @@ -94,8 +94,8 @@ static inline isc_result_t totext_uri(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_uri(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_uri(ARGS_FROMWIRE) { isc_region_t region; REQUIRE(type == dns_rdatatype_uri); @@ -120,8 +120,8 @@ static inline isc_result_t fromwire_uri(ARGS_FROMWIRE) return (mem_tobuffer(target, region.base, region.length)); } -static inline isc_result_t towire_uri(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_uri(ARGS_TOWIRE) { isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_uri); @@ -133,11 +133,11 @@ static inline isc_result_t towire_uri(ARGS_TOWIRE) return (mem_tobuffer(target, region.base, region.length)); } -static inline int compare_uri(ARGS_COMPARE) -{ +static inline int +compare_uri(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; - int order; + int order; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); @@ -171,8 +171,8 @@ static inline int compare_uri(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_uri(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_uri(ARGS_FROMSTRUCT) { dns_rdata_uri_t *uri = source; REQUIRE(type == dns_rdatatype_uri); @@ -200,10 +200,10 @@ static inline isc_result_t fromstruct_uri(ARGS_FROMSTRUCT) return (mem_tobuffer(target, uri->target, uri->tgt_len)); } -static inline isc_result_t tostruct_uri(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_uri(ARGS_TOSTRUCT) { dns_rdata_uri_t *uri = target; - isc_region_t sr; + isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_uri); REQUIRE(uri != NULL); @@ -246,8 +246,8 @@ static inline isc_result_t tostruct_uri(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_uri(ARGS_FREESTRUCT) -{ +static inline void +freestruct_uri(ARGS_FREESTRUCT) { dns_rdata_uri_t *uri = (dns_rdata_uri_t *)source; REQUIRE(uri != NULL); @@ -263,8 +263,8 @@ static inline void freestruct_uri(ARGS_FREESTRUCT) uri->mctx = NULL; } -static inline isc_result_t additionaldata_uri(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_uri(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_uri); UNUSED(rdata); @@ -274,8 +274,8 @@ static inline isc_result_t additionaldata_uri(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_uri(ARGS_DIGEST) -{ +static inline isc_result_t +digest_uri(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_uri); @@ -285,8 +285,8 @@ static inline isc_result_t digest_uri(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_uri(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_uri(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_uri); UNUSED(name); @@ -297,8 +297,8 @@ static inline bool checkowner_uri(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_uri(ARGS_CHECKNAMES) -{ +static inline bool +checknames_uri(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_uri); UNUSED(rdata); @@ -308,8 +308,8 @@ static inline bool checknames_uri(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_uri(ARGS_COMPARE) -{ +static inline int +casecompare_uri(ARGS_COMPARE) { return (compare_uri(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c index 1ba36dc6a1..4c53621478 100644 --- a/lib/dns/rdata/generic/x25_19.c +++ b/lib/dns/rdata/generic/x25_19.c @@ -16,9 +16,9 @@ #define RRTYPE_X25_ATTRIBUTES (0) -static inline isc_result_t fromtext_x25(ARGS_FROMTEXT) -{ - isc_token_t token; +static inline isc_result_t +fromtext_x25(ARGS_FROMTEXT) { + isc_token_t token; unsigned int i; REQUIRE(type == dns_rdatatype_x25); @@ -43,8 +43,8 @@ static inline isc_result_t fromtext_x25(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_x25(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_x25(ARGS_TOTEXT) { isc_region_t region; UNUSED(tctx); @@ -56,8 +56,8 @@ static inline isc_result_t totext_x25(ARGS_TOTEXT) return (txt_totext(®ion, true, target)); } -static inline isc_result_t fromwire_x25(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_x25(ARGS_FROMWIRE) { isc_region_t sr; REQUIRE(type == dns_rdatatype_x25); @@ -74,8 +74,8 @@ static inline isc_result_t fromwire_x25(ARGS_FROMWIRE) return (txt_fromwire(source, target)); } -static inline isc_result_t towire_x25(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_x25(ARGS_TOWIRE) { UNUSED(cctx); REQUIRE(rdata->type == dns_rdatatype_x25); @@ -84,8 +84,8 @@ static inline isc_result_t towire_x25(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_x25(ARGS_COMPARE) -{ +static inline int +compare_x25(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -100,10 +100,10 @@ static inline int compare_x25(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_x25(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_x25(ARGS_FROMSTRUCT) { dns_rdata_x25_t *x25 = source; - uint8_t i; + uint8_t i; REQUIRE(type == dns_rdatatype_x25); REQUIRE(x25 != NULL); @@ -128,10 +128,10 @@ static inline isc_result_t fromstruct_x25(ARGS_FROMSTRUCT) return (mem_tobuffer(target, x25->x25, x25->x25_len)); } -static inline isc_result_t tostruct_x25(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_x25(ARGS_TOSTRUCT) { dns_rdata_x25_t *x25 = target; - isc_region_t r; + isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_x25); REQUIRE(x25 != NULL); @@ -153,8 +153,8 @@ static inline isc_result_t tostruct_x25(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_x25(ARGS_FREESTRUCT) -{ +static inline void +freestruct_x25(ARGS_FREESTRUCT) { dns_rdata_x25_t *x25 = source; REQUIRE(x25 != NULL); @@ -170,8 +170,8 @@ static inline void freestruct_x25(ARGS_FREESTRUCT) x25->mctx = NULL; } -static inline isc_result_t additionaldata_x25(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_x25(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_x25); UNUSED(rdata); @@ -181,8 +181,8 @@ static inline isc_result_t additionaldata_x25(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_x25(ARGS_DIGEST) -{ +static inline isc_result_t +digest_x25(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_x25); @@ -192,8 +192,8 @@ static inline isc_result_t digest_x25(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_x25(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_x25(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_x25); UNUSED(name); @@ -204,8 +204,8 @@ static inline bool checkowner_x25(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_x25(ARGS_CHECKNAMES) -{ +static inline bool +checknames_x25(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_x25); UNUSED(rdata); @@ -215,8 +215,8 @@ static inline bool checknames_x25(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_x25(ARGS_COMPARE) -{ +static inline int +casecompare_x25(ARGS_COMPARE) { return (compare_x25(rdata1, rdata2)); } diff --git a/lib/dns/rdata/generic/zonemd_63.c b/lib/dns/rdata/generic/zonemd_63.c index c63e2f5256..af2b89217a 100644 --- a/lib/dns/rdata/generic/zonemd_63.c +++ b/lib/dns/rdata/generic/zonemd_63.c @@ -16,10 +16,10 @@ #define RRTYPE_ZONEMD_ATTRIBUTES 0 -static inline isc_result_t fromtext_zonemd(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_zonemd(ARGS_FROMTEXT) { isc_token_t token; - int digest_type, length; + int digest_type, length; UNUSED(type); UNUSED(rdclass); @@ -64,10 +64,10 @@ static inline isc_result_t fromtext_zonemd(ARGS_FROMTEXT) return (isc_hex_tobuffer(lexer, target, length)); } -static inline isc_result_t totext_zonemd(ARGS_TOTEXT) -{ - isc_region_t sr; - char buf[sizeof("0123456789")]; +static inline isc_result_t +totext_zonemd(ARGS_TOTEXT) { + isc_region_t sr; + char buf[sizeof("0123456789")]; unsigned long num; REQUIRE(rdata->length > 6); @@ -126,8 +126,8 @@ static inline isc_result_t totext_zonemd(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_zonemd(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_zonemd(ARGS_FROMWIRE) { isc_region_t sr; UNUSED(type); @@ -145,7 +145,8 @@ static inline isc_result_t fromwire_zonemd(ARGS_FROMWIRE) * correct length. */ if (sr.length < 7 || (sr.base[4] == DNS_ZONEMD_DIGEST_SHA384 && - sr.length < 6 + ISC_SHA384_DIGESTLENGTH)) { + sr.length < 6 + ISC_SHA384_DIGESTLENGTH)) + { return (ISC_R_UNEXPECTEDEND); } @@ -163,8 +164,8 @@ static inline isc_result_t fromwire_zonemd(ARGS_FROMWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline isc_result_t towire_zonemd(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_zonemd(ARGS_TOWIRE) { isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_zonemd); @@ -176,8 +177,8 @@ static inline isc_result_t towire_zonemd(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_zonemd(ARGS_COMPARE) -{ +static inline int +compare_zonemd(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -192,8 +193,8 @@ static inline int compare_zonemd(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_zonemd(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_zonemd(ARGS_FROMSTRUCT) { dns_rdata_zonemd_t *zonemd = source; REQUIRE(zonemd != NULL); @@ -216,10 +217,10 @@ static inline isc_result_t fromstruct_zonemd(ARGS_FROMSTRUCT) return (mem_tobuffer(target, zonemd->digest, zonemd->length)); } -static inline isc_result_t tostruct_zonemd(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_zonemd(ARGS_TOSTRUCT) { dns_rdata_zonemd_t *zonemd = target; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_zonemd); REQUIRE(zonemd != NULL); @@ -248,8 +249,8 @@ static inline isc_result_t tostruct_zonemd(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_zonemd(ARGS_FREESTRUCT) -{ +static inline void +freestruct_zonemd(ARGS_FREESTRUCT) { dns_rdata_zonemd_t *zonemd = source; REQUIRE(zonemd != NULL); @@ -265,8 +266,8 @@ static inline void freestruct_zonemd(ARGS_FREESTRUCT) zonemd->mctx = NULL; } -static inline isc_result_t additionaldata_zonemd(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_zonemd(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_zonemd); UNUSED(rdata); @@ -276,8 +277,8 @@ static inline isc_result_t additionaldata_zonemd(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_zonemd(ARGS_DIGEST) -{ +static inline isc_result_t +digest_zonemd(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_zonemd); @@ -287,8 +288,8 @@ static inline isc_result_t digest_zonemd(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_zonemd(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_zonemd(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_zonemd); UNUSED(name); @@ -299,8 +300,8 @@ static inline bool checkowner_zonemd(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_zonemd(ARGS_CHECKNAMES) -{ +static inline bool +checknames_zonemd(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_zonemd); UNUSED(rdata); @@ -310,8 +311,8 @@ static inline bool checknames_zonemd(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_zonemd(ARGS_COMPARE) -{ +static inline int +casecompare_zonemd(ARGS_COMPARE) { return (compare_zonemd(rdata1, rdata2)); } diff --git a/lib/dns/rdata/hs_4/a_1.c b/lib/dns/rdata/hs_4/a_1.c index cec4e4d005..82403a30e3 100644 --- a/lib/dns/rdata/hs_4/a_1.c +++ b/lib/dns/rdata/hs_4/a_1.c @@ -16,11 +16,11 @@ #define RRTYPE_A_ATTRIBUTES (0) -static inline isc_result_t fromtext_hs_a(ARGS_FROMTEXT) -{ - isc_token_t token; +static inline isc_result_t +fromtext_hs_a(ARGS_FROMTEXT) { + isc_token_t token; struct in_addr addr; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_a); REQUIRE(rdclass == dns_rdataclass_hs); @@ -46,8 +46,8 @@ static inline isc_result_t fromtext_hs_a(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_hs_a(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_hs_a(ARGS_TOTEXT) { isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_a); @@ -60,8 +60,8 @@ static inline isc_result_t totext_hs_a(ARGS_TOTEXT) return (inet_totext(AF_INET, ®ion, target)); } -static inline isc_result_t fromwire_hs_a(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_hs_a(ARGS_FROMWIRE) { isc_region_t sregion; isc_region_t tregion; @@ -88,8 +88,8 @@ static inline isc_result_t fromwire_hs_a(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_hs_a(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_hs_a(ARGS_TOWIRE) { isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_a); @@ -107,8 +107,8 @@ static inline isc_result_t towire_hs_a(ARGS_TOWIRE) return (ISC_R_SUCCESS); } -static inline int compare_hs_a(ARGS_COMPARE) -{ +static inline int +compare_hs_a(ARGS_COMPARE) { int order; REQUIRE(rdata1->type == rdata2->type); @@ -126,10 +126,10 @@ static inline int compare_hs_a(ARGS_COMPARE) return (order); } -static inline isc_result_t fromstruct_hs_a(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_hs_a(ARGS_FROMSTRUCT) { dns_rdata_hs_a_t *a = source; - uint32_t n; + uint32_t n; REQUIRE(type == dns_rdatatype_a); REQUIRE(rdclass == dns_rdataclass_hs); @@ -145,11 +145,11 @@ static inline isc_result_t fromstruct_hs_a(ARGS_FROMSTRUCT) return (uint32_tobuffer(n, target)); } -static inline isc_result_t tostruct_hs_a(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_hs_a(ARGS_TOSTRUCT) { dns_rdata_hs_a_t *a = target; - uint32_t n; - isc_region_t region; + uint32_t n; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_a); REQUIRE(rdata->rdclass == dns_rdataclass_hs); @@ -169,15 +169,15 @@ static inline isc_result_t tostruct_hs_a(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_hs_a(ARGS_FREESTRUCT) -{ +static inline void +freestruct_hs_a(ARGS_FREESTRUCT) { UNUSED(source); REQUIRE(source != NULL); } -static inline isc_result_t additionaldata_hs_a(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_hs_a(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_a); REQUIRE(rdata->rdclass == dns_rdataclass_hs); @@ -188,8 +188,8 @@ static inline isc_result_t additionaldata_hs_a(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_hs_a(ARGS_DIGEST) -{ +static inline isc_result_t +digest_hs_a(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_a); @@ -200,8 +200,8 @@ static inline isc_result_t digest_hs_a(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_hs_a(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_hs_a(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_a); REQUIRE(rdclass == dns_rdataclass_hs); @@ -213,8 +213,8 @@ static inline bool checkowner_hs_a(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_hs_a(ARGS_CHECKNAMES) -{ +static inline bool +checknames_hs_a(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_a); REQUIRE(rdata->rdclass == dns_rdataclass_hs); @@ -225,8 +225,8 @@ static inline bool checknames_hs_a(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_hs_a(ARGS_COMPARE) -{ +static inline int +casecompare_hs_a(ARGS_COMPARE) { return (compare_hs_a(rdata1, rdata2)); } diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c index 33d1a7db21..5e3b80adba 100644 --- a/lib/dns/rdata/in_1/a6_38.c +++ b/lib/dns/rdata/in_1/a6_38.c @@ -18,16 +18,16 @@ #define RRTYPE_A6_ATTRIBUTES (0) -static inline isc_result_t fromtext_in_a6(ARGS_FROMTEXT) -{ - isc_token_t token; +static inline isc_result_t +fromtext_in_a6(ARGS_FROMTEXT) { + isc_token_t token; unsigned char addr[16]; unsigned char prefixlen; unsigned char octets; unsigned char mask; - dns_name_t name; - isc_buffer_t buffer; - bool ok; + dns_name_t name; + isc_buffer_t buffer; + bool ok; REQUIRE(type == dns_rdatatype_a6); REQUIRE(rdclass == dns_rdataclass_in); @@ -94,17 +94,17 @@ static inline isc_result_t fromtext_in_a6(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_in_a6(ARGS_TOTEXT) -{ - isc_region_t sr, ar; +static inline isc_result_t +totext_in_a6(ARGS_TOTEXT) { + isc_region_t sr, ar; unsigned char addr[16]; unsigned char prefixlen; unsigned char octets; unsigned char mask; - char buf[sizeof("128")]; - dns_name_t name; - dns_name_t prefix; - bool sub; + char buf[sizeof("128")]; + dns_name_t name; + dns_name_t prefix; + bool sub; REQUIRE(rdata->type == dns_rdatatype_a6); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -142,13 +142,13 @@ static inline isc_result_t totext_in_a6(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_in_a6(ARGS_FROMWIRE) -{ - isc_region_t sr; +static inline isc_result_t +fromwire_in_a6(ARGS_FROMWIRE) { + isc_region_t sr; unsigned char prefixlen; unsigned char octets; unsigned char mask; - dns_name_t name; + dns_name_t name; REQUIRE(type == dns_rdatatype_a6); REQUIRE(rdclass == dns_rdataclass_in); @@ -195,10 +195,10 @@ static inline isc_result_t fromwire_in_a6(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_in_a6(ARGS_TOWIRE) -{ - isc_region_t sr; - dns_name_t name; +static inline isc_result_t +towire_in_a6(ARGS_TOWIRE) { + isc_region_t sr; + dns_name_t name; dns_offsets_t offsets; unsigned char prefixlen; unsigned char octets; @@ -225,15 +225,15 @@ static inline isc_result_t towire_in_a6(ARGS_TOWIRE) return (dns_name_towire(&name, cctx, target)); } -static inline int compare_in_a6(ARGS_COMPARE) -{ - int order; +static inline int +compare_in_a6(ARGS_COMPARE) { + int order; unsigned char prefixlen1, prefixlen2; unsigned char octets; - dns_name_t name1; - dns_name_t name2; - isc_region_t region1; - isc_region_t region2; + dns_name_t name1; + dns_name_t name2; + isc_region_t region1; + isc_region_t region2; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); @@ -282,14 +282,14 @@ static inline int compare_in_a6(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_in_a6(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_in_a6(ARGS_FROMSTRUCT) { dns_rdata_in_a6_t *a6 = source; - isc_region_t region; - int octets; - uint8_t bits; - uint8_t first; - uint8_t mask; + isc_region_t region; + int octets; + uint8_t bits; + uint8_t first; + uint8_t mask; REQUIRE(type == dns_rdatatype_a6); REQUIRE(rdclass == dns_rdataclass_in); @@ -330,12 +330,12 @@ static inline isc_result_t fromstruct_in_a6(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_in_a6(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_in_a6(ARGS_TOSTRUCT) { dns_rdata_in_a6_t *a6 = target; - unsigned char octets; - dns_name_t name; - isc_region_t r; + unsigned char octets; + dns_name_t name; + isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_a6); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -375,8 +375,8 @@ static inline isc_result_t tostruct_in_a6(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_in_a6(ARGS_FREESTRUCT) -{ +static inline void +freestruct_in_a6(ARGS_FREESTRUCT) { dns_rdata_in_a6_t *a6 = source; REQUIRE(a6 != NULL); @@ -393,8 +393,8 @@ static inline void freestruct_in_a6(ARGS_FREESTRUCT) a6->mctx = NULL; } -static inline isc_result_t additionaldata_in_a6(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_in_a6(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_a6); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -405,12 +405,12 @@ static inline isc_result_t additionaldata_in_a6(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_in_a6(ARGS_DIGEST) -{ - isc_region_t r1, r2; +static inline isc_result_t +digest_in_a6(ARGS_DIGEST) { + isc_region_t r1, r2; unsigned char prefixlen, octets; - isc_result_t result; - dns_name_t name; + isc_result_t result; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_a6); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -435,8 +435,8 @@ static inline isc_result_t digest_in_a6(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_in_a6(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_in_a6(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_a6); REQUIRE(rdclass == dns_rdataclass_in); @@ -446,10 +446,10 @@ static inline bool checkowner_in_a6(ARGS_CHECKOWNER) return (dns_name_ishostname(name, wildcard)); } -static inline bool checknames_in_a6(ARGS_CHECKNAMES) -{ +static inline bool +checknames_in_a6(ARGS_CHECKNAMES) { isc_region_t region; - dns_name_t name; + dns_name_t name; unsigned int prefixlen; REQUIRE(rdata->type == dns_rdatatype_a6); @@ -474,8 +474,8 @@ static inline bool checknames_in_a6(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_in_a6(ARGS_COMPARE) -{ +static inline int +casecompare_in_a6(ARGS_COMPARE) { return (compare_in_a6(rdata1, rdata2)); } diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c index 916a79f6df..aa41818753 100644 --- a/lib/dns/rdata/in_1/a_1.c +++ b/lib/dns/rdata/in_1/a_1.c @@ -18,11 +18,11 @@ #define RRTYPE_A_ATTRIBUTES (0) -static inline isc_result_t fromtext_in_a(ARGS_FROMTEXT) -{ - isc_token_t token; +static inline isc_result_t +fromtext_in_a(ARGS_FROMTEXT) { + isc_token_t token; struct in_addr addr; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_a); REQUIRE(rdclass == dns_rdataclass_in); @@ -48,8 +48,8 @@ static inline isc_result_t fromtext_in_a(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_in_a(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_in_a(ARGS_TOTEXT) { isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_a); @@ -62,8 +62,8 @@ static inline isc_result_t totext_in_a(ARGS_TOTEXT) return (inet_totext(AF_INET, ®ion, target)); } -static inline isc_result_t fromwire_in_a(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_in_a(ARGS_FROMWIRE) { isc_region_t sregion; isc_region_t tregion; @@ -90,8 +90,8 @@ static inline isc_result_t fromwire_in_a(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_in_a(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_in_a(ARGS_TOWIRE) { isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_a); @@ -109,8 +109,8 @@ static inline isc_result_t towire_in_a(ARGS_TOWIRE) return (ISC_R_SUCCESS); } -static inline int compare_in_a(ARGS_COMPARE) -{ +static inline int +compare_in_a(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -126,10 +126,10 @@ static inline int compare_in_a(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_in_a(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_in_a(ARGS_FROMSTRUCT) { dns_rdata_in_a_t *a = source; - uint32_t n; + uint32_t n; REQUIRE(type == dns_rdatatype_a); REQUIRE(rdclass == dns_rdataclass_in); @@ -145,11 +145,11 @@ static inline isc_result_t fromstruct_in_a(ARGS_FROMSTRUCT) return (uint32_tobuffer(n, target)); } -static inline isc_result_t tostruct_in_a(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_in_a(ARGS_TOSTRUCT) { dns_rdata_in_a_t *a = target; - uint32_t n; - isc_region_t region; + uint32_t n; + isc_region_t region; REQUIRE(a != NULL); REQUIRE(rdata->type == dns_rdatatype_a); @@ -169,8 +169,8 @@ static inline isc_result_t tostruct_in_a(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_in_a(ARGS_FREESTRUCT) -{ +static inline void +freestruct_in_a(ARGS_FREESTRUCT) { dns_rdata_in_a_t *a = source; REQUIRE(a != NULL); @@ -180,8 +180,8 @@ static inline void freestruct_in_a(ARGS_FREESTRUCT) UNUSED(a); } -static inline isc_result_t additionaldata_in_a(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_in_a(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_a); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -192,8 +192,8 @@ static inline isc_result_t additionaldata_in_a(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_in_a(ARGS_DIGEST) -{ +static inline isc_result_t +digest_in_a(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_a); @@ -204,8 +204,8 @@ static inline isc_result_t digest_in_a(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_in_a(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_in_a(ARGS_CHECKOWNER) { dns_name_t prefix, suffix; REQUIRE(type == dns_rdatatype_a); @@ -231,8 +231,8 @@ static inline bool checkowner_in_a(ARGS_CHECKOWNER) return (dns_name_ishostname(name, wildcard)); } -static inline bool checknames_in_a(ARGS_CHECKNAMES) -{ +static inline bool +checknames_in_a(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_a); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -243,8 +243,8 @@ static inline bool checknames_in_a(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_in_a(ARGS_COMPARE) -{ +static inline int +casecompare_in_a(ARGS_COMPARE) { return (compare_in_a(rdata1, rdata2)); } diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c index d3af610693..384b8dd0b8 100644 --- a/lib/dns/rdata/in_1/aaaa_28.c +++ b/lib/dns/rdata/in_1/aaaa_28.c @@ -18,11 +18,11 @@ #define RRTYPE_AAAA_ATTRIBUTES (0) -static inline isc_result_t fromtext_in_aaaa(ARGS_FROMTEXT) -{ - isc_token_t token; +static inline isc_result_t +fromtext_in_aaaa(ARGS_FROMTEXT) { + isc_token_t token; unsigned char addr[16]; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_aaaa); REQUIRE(rdclass == dns_rdataclass_in); @@ -48,8 +48,8 @@ static inline isc_result_t fromtext_in_aaaa(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_in_aaaa(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_in_aaaa(ARGS_TOTEXT) { isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_aaaa); @@ -57,9 +57,9 @@ static inline isc_result_t totext_in_aaaa(ARGS_TOTEXT) REQUIRE(rdata->length == 16); if ((tctx->flags & DNS_STYLEFLAG_EXPANDAAAA) != 0) { - char buf[5 * 8]; - const char * sep = ""; - int i, n; + char buf[5 * 8]; + const char *sep = ""; + int i, n; unsigned int len = 0; for (i = 0; i < 16; i += 2) { @@ -78,8 +78,8 @@ static inline isc_result_t totext_in_aaaa(ARGS_TOTEXT) return (inet_totext(AF_INET6, ®ion, target)); } -static inline isc_result_t fromwire_in_aaaa(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_in_aaaa(ARGS_FROMWIRE) { isc_region_t sregion; isc_region_t tregion; @@ -106,8 +106,8 @@ static inline isc_result_t fromwire_in_aaaa(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_in_aaaa(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_in_aaaa(ARGS_TOWIRE) { isc_region_t region; UNUSED(cctx); @@ -125,8 +125,8 @@ static inline isc_result_t towire_in_aaaa(ARGS_TOWIRE) return (ISC_R_SUCCESS); } -static inline int compare_in_aaaa(ARGS_COMPARE) -{ +static inline int +compare_in_aaaa(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -142,8 +142,8 @@ static inline int compare_in_aaaa(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_in_aaaa(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_in_aaaa(ARGS_FROMSTRUCT) { dns_rdata_in_aaaa_t *aaaa = source; REQUIRE(type == dns_rdatatype_aaaa); @@ -158,10 +158,10 @@ static inline isc_result_t fromstruct_in_aaaa(ARGS_FROMSTRUCT) return (mem_tobuffer(target, aaaa->in6_addr.s6_addr, 16)); } -static inline isc_result_t tostruct_in_aaaa(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_in_aaaa(ARGS_TOSTRUCT) { dns_rdata_in_aaaa_t *aaaa = target; - isc_region_t r; + isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_aaaa); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -181,8 +181,8 @@ static inline isc_result_t tostruct_in_aaaa(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_in_aaaa(ARGS_FREESTRUCT) -{ +static inline void +freestruct_in_aaaa(ARGS_FREESTRUCT) { dns_rdata_in_aaaa_t *aaaa = source; REQUIRE(aaaa != NULL); @@ -192,8 +192,8 @@ static inline void freestruct_in_aaaa(ARGS_FREESTRUCT) UNUSED(aaaa); } -static inline isc_result_t additionaldata_in_aaaa(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_in_aaaa(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_aaaa); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -204,8 +204,8 @@ static inline isc_result_t additionaldata_in_aaaa(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_in_aaaa(ARGS_DIGEST) -{ +static inline isc_result_t +digest_in_aaaa(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_aaaa); @@ -216,8 +216,8 @@ static inline isc_result_t digest_in_aaaa(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_in_aaaa(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_in_aaaa(ARGS_CHECKOWNER) { dns_name_t prefix, suffix; REQUIRE(type == dns_rdatatype_aaaa); @@ -243,8 +243,8 @@ static inline bool checkowner_in_aaaa(ARGS_CHECKOWNER) return (dns_name_ishostname(name, wildcard)); } -static inline bool checknames_in_aaaa(ARGS_CHECKNAMES) -{ +static inline bool +checknames_in_aaaa(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_aaaa); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -255,8 +255,8 @@ static inline bool checknames_in_aaaa(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_in_aaaa(ARGS_COMPARE) -{ +static inline int +casecompare_in_aaaa(ARGS_COMPARE) { return (compare_in_aaaa(rdata1, rdata2)); } #endif /* RDATA_IN_1_AAAA_28_C */ diff --git a/lib/dns/rdata/in_1/apl_42.c b/lib/dns/rdata/in_1/apl_42.c index 90835ce6f0..0b0c48620e 100644 --- a/lib/dns/rdata/in_1/apl_42.c +++ b/lib/dns/rdata/in_1/apl_42.c @@ -16,16 +16,16 @@ #define RRTYPE_APL_ATTRIBUTES (0) -static inline isc_result_t fromtext_in_apl(ARGS_FROMTEXT) -{ - isc_token_t token; +static inline isc_result_t +fromtext_in_apl(ARGS_FROMTEXT) { + isc_token_t token; unsigned char addr[16]; unsigned long afi; - uint8_t prefix; - uint8_t len; - bool neg; - char * cp, *ap, *slash; - int n; + uint8_t prefix; + uint8_t len; + bool neg; + char *cp, *ap, *slash; + int n; REQUIRE(type == dns_rdatatype_apl); REQUIRE(rdclass == dns_rdataclass_in); @@ -112,18 +112,18 @@ static inline isc_result_t fromtext_in_apl(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_in_apl(ARGS_TOTEXT) -{ - isc_region_t sr; - isc_region_t ir; - uint16_t afi; - uint8_t prefix; - uint8_t len; - bool neg; +static inline isc_result_t +totext_in_apl(ARGS_TOTEXT) { + isc_region_t sr; + isc_region_t ir; + uint16_t afi; + uint8_t prefix; + uint8_t len; + bool neg; unsigned char buf[16]; - char txt[sizeof(" !64000:")]; - const char * sep = ""; - int n; + char txt[sizeof(" !64000:")]; + const char *sep = ""; + int n; REQUIRE(rdata->type == dns_rdatatype_apl); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -177,13 +177,13 @@ static inline isc_result_t totext_in_apl(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_in_apl(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_in_apl(ARGS_FROMWIRE) { isc_region_t sr, sr2; isc_region_t tr; - uint16_t afi; - uint8_t prefix; - uint8_t len; + uint16_t afi; + uint8_t prefix; + uint8_t len; REQUIRE(type == dns_rdatatype_apl); REQUIRE(rdclass == dns_rdataclass_in); @@ -234,8 +234,8 @@ static inline isc_result_t fromwire_in_apl(ARGS_FROMWIRE) return (mem_tobuffer(target, sr2.base, sr2.length)); } -static inline isc_result_t towire_in_apl(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_in_apl(ARGS_TOWIRE) { UNUSED(cctx); REQUIRE(rdata->type == dns_rdatatype_apl); @@ -244,8 +244,8 @@ static inline isc_result_t towire_in_apl(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_in_apl(ARGS_COMPARE) -{ +static inline int +compare_in_apl(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -259,10 +259,10 @@ static inline int compare_in_apl(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_in_apl(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_in_apl(ARGS_FROMSTRUCT) { dns_rdata_in_apl_t *apl = source; - isc_buffer_t b; + isc_buffer_t b; REQUIRE(type == dns_rdatatype_apl); REQUIRE(rdclass == dns_rdataclass_in); @@ -277,10 +277,10 @@ static inline isc_result_t fromstruct_in_apl(ARGS_FROMSTRUCT) return (fromwire_in_apl(rdclass, type, &b, NULL, false, target)); } -static inline isc_result_t tostruct_in_apl(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_in_apl(ARGS_TOSTRUCT) { dns_rdata_in_apl_t *apl = target; - isc_region_t r; + isc_region_t r; REQUIRE(apl != NULL); REQUIRE(rdata->type == dns_rdatatype_apl); @@ -302,8 +302,8 @@ static inline isc_result_t tostruct_in_apl(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_in_apl(ARGS_FREESTRUCT) -{ +static inline void +freestruct_in_apl(ARGS_FREESTRUCT) { dns_rdata_in_apl_t *apl = source; REQUIRE(apl != NULL); @@ -320,8 +320,7 @@ static inline void freestruct_in_apl(ARGS_FREESTRUCT) } isc_result_t -dns_rdata_apl_first(dns_rdata_in_apl_t *apl) -{ +dns_rdata_apl_first(dns_rdata_in_apl_t *apl) { uint32_t length; REQUIRE(apl != NULL); @@ -348,8 +347,7 @@ dns_rdata_apl_first(dns_rdata_in_apl_t *apl) } isc_result_t -dns_rdata_apl_next(dns_rdata_in_apl_t *apl) -{ +dns_rdata_apl_next(dns_rdata_in_apl_t *apl) { uint32_t length; REQUIRE(apl != NULL); @@ -382,8 +380,7 @@ dns_rdata_apl_next(dns_rdata_in_apl_t *apl) } isc_result_t -dns_rdata_apl_current(dns_rdata_in_apl_t *apl, dns_rdata_apl_ent_t *ent) -{ +dns_rdata_apl_current(dns_rdata_in_apl_t *apl, dns_rdata_apl_ent_t *ent) { uint32_t length; REQUIRE(apl != NULL); @@ -422,13 +419,12 @@ dns_rdata_apl_current(dns_rdata_in_apl_t *apl, dns_rdata_apl_ent_t *ent) } unsigned int -dns_rdata_apl_count(const dns_rdata_in_apl_t *apl) -{ +dns_rdata_apl_count(const dns_rdata_in_apl_t *apl) { return (apl->apl_len); } -static inline isc_result_t additionaldata_in_apl(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_in_apl(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_apl); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -438,8 +434,8 @@ static inline isc_result_t additionaldata_in_apl(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_in_apl(ARGS_DIGEST) -{ +static inline isc_result_t +digest_in_apl(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_apl); @@ -450,8 +446,8 @@ static inline isc_result_t digest_in_apl(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_in_apl(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_in_apl(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_apl); REQUIRE(rdclass == dns_rdataclass_in); @@ -463,8 +459,8 @@ static inline bool checkowner_in_apl(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_in_apl(ARGS_CHECKNAMES) -{ +static inline bool +checknames_in_apl(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_apl); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -475,8 +471,8 @@ static inline bool checknames_in_apl(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_in_apl(ARGS_COMPARE) -{ +static inline int +casecompare_in_apl(ARGS_COMPARE) { return (compare_in_apl(rdata1, rdata2)); } diff --git a/lib/dns/rdata/in_1/atma_34.c b/lib/dns/rdata/in_1/atma_34.c index 429dd160e1..6ba3276068 100644 --- a/lib/dns/rdata/in_1/atma_34.c +++ b/lib/dns/rdata/in_1/atma_34.c @@ -16,14 +16,14 @@ #define RRTYPE_ATMA_ATTRIBUTES (0) -static inline isc_result_t fromtext_in_atma(ARGS_FROMTEXT) -{ - isc_token_t token; +static inline isc_result_t +fromtext_in_atma(ARGS_FROMTEXT) { + isc_token_t token; isc_textregion_t *sr; - int n; - bool valid = false; - bool lastwasperiod = true; /* leading periods not allowed */ - int digits = 0; + int n; + bool valid = false; + bool lastwasperiod = true; /* leading periods not allowed */ + int digits = 0; unsigned char c = 0; REQUIRE(type == dns_rdatatype_atma); @@ -105,10 +105,10 @@ static inline isc_result_t fromtext_in_atma(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_in_atma(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_in_atma(ARGS_TOTEXT) { isc_region_t region; - char buf[sizeof("xx")]; + char buf[sizeof("xx")]; REQUIRE(rdata->type == dns_rdatatype_atma); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -138,8 +138,8 @@ static inline isc_result_t totext_in_atma(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_in_atma(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_in_atma(ARGS_FROMWIRE) { isc_region_t region; REQUIRE(type == dns_rdatatype_atma); @@ -167,8 +167,8 @@ static inline isc_result_t fromwire_in_atma(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_in_atma(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_in_atma(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_atma); REQUIRE(rdata->rdclass == dns_rdataclass_in); REQUIRE(rdata->length != 0); @@ -178,8 +178,8 @@ static inline isc_result_t towire_in_atma(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_in_atma(ARGS_COMPARE) -{ +static inline int +compare_in_atma(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -195,8 +195,8 @@ static inline int compare_in_atma(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_in_atma(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_in_atma(ARGS_FROMSTRUCT) { dns_rdata_in_atma_t *atma = source; REQUIRE(type == dns_rdatatype_atma); @@ -213,10 +213,10 @@ static inline isc_result_t fromstruct_in_atma(ARGS_FROMSTRUCT) return (mem_tobuffer(target, atma->atma, atma->atma_len)); } -static inline isc_result_t tostruct_in_atma(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_in_atma(ARGS_TOSTRUCT) { dns_rdata_in_atma_t *atma = target; - isc_region_t r; + isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_atma); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -240,8 +240,8 @@ static inline isc_result_t tostruct_in_atma(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_in_atma(ARGS_FREESTRUCT) -{ +static inline void +freestruct_in_atma(ARGS_FREESTRUCT) { dns_rdata_in_atma_t *atma = source; REQUIRE(atma != NULL); @@ -258,8 +258,8 @@ static inline void freestruct_in_atma(ARGS_FREESTRUCT) atma->mctx = NULL; } -static inline isc_result_t additionaldata_in_atma(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_in_atma(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_atma); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -270,8 +270,8 @@ static inline isc_result_t additionaldata_in_atma(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_in_atma(ARGS_DIGEST) -{ +static inline isc_result_t +digest_in_atma(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_atma); @@ -282,8 +282,8 @@ static inline isc_result_t digest_in_atma(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_in_atma(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_in_atma(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_atma); REQUIRE(rdclass == dns_rdataclass_in); @@ -295,8 +295,8 @@ static inline bool checkowner_in_atma(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_in_atma(ARGS_CHECKNAMES) -{ +static inline bool +checknames_in_atma(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_atma); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -307,8 +307,8 @@ static inline bool checknames_in_atma(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_in_atma(ARGS_COMPARE) -{ +static inline int +casecompare_in_atma(ARGS_COMPARE) { return (compare_in_atma(rdata1, rdata2)); } diff --git a/lib/dns/rdata/in_1/dhcid_49.c b/lib/dns/rdata/in_1/dhcid_49.c index 77ff578f06..4eff28dc46 100644 --- a/lib/dns/rdata/in_1/dhcid_49.c +++ b/lib/dns/rdata/in_1/dhcid_49.c @@ -16,8 +16,8 @@ #define RRTYPE_DHCID_ATTRIBUTES 0 -static inline isc_result_t fromtext_in_dhcid(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_in_dhcid(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_dhcid); REQUIRE(rdclass == dns_rdataclass_in); @@ -30,8 +30,8 @@ static inline isc_result_t fromtext_in_dhcid(ARGS_FROMTEXT) return (isc_base64_tobuffer(lexer, target, -2)); } -static inline isc_result_t totext_in_dhcid(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_in_dhcid(ARGS_TOTEXT) { isc_region_t sr, sr2; /* " ; 64000 255 64000" */ char buf[5 + 3 * 11 + 1]; @@ -64,8 +64,8 @@ static inline isc_result_t totext_in_dhcid(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_in_dhcid(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_in_dhcid(ARGS_FROMWIRE) { isc_region_t sr; REQUIRE(type == dns_rdatatype_dhcid); @@ -85,8 +85,8 @@ static inline isc_result_t fromwire_in_dhcid(ARGS_FROMWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline isc_result_t towire_in_dhcid(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_in_dhcid(ARGS_TOWIRE) { isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_dhcid); @@ -99,8 +99,8 @@ static inline isc_result_t towire_in_dhcid(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_in_dhcid(ARGS_COMPARE) -{ +static inline int +compare_in_dhcid(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -116,8 +116,8 @@ static inline int compare_in_dhcid(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_in_dhcid(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_in_dhcid(ARGS_FROMSTRUCT) { dns_rdata_in_dhcid_t *dhcid = source; REQUIRE(type == dns_rdatatype_dhcid); @@ -133,10 +133,10 @@ static inline isc_result_t fromstruct_in_dhcid(ARGS_FROMSTRUCT) return (mem_tobuffer(target, dhcid->dhcid, dhcid->length)); } -static inline isc_result_t tostruct_in_dhcid(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_in_dhcid(ARGS_TOSTRUCT) { dns_rdata_in_dhcid_t *dhcid = target; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_dhcid); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -158,8 +158,8 @@ static inline isc_result_t tostruct_in_dhcid(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_in_dhcid(ARGS_FREESTRUCT) -{ +static inline void +freestruct_in_dhcid(ARGS_FREESTRUCT) { dns_rdata_in_dhcid_t *dhcid = source; REQUIRE(dhcid != NULL); @@ -176,8 +176,8 @@ static inline void freestruct_in_dhcid(ARGS_FREESTRUCT) dhcid->mctx = NULL; } -static inline isc_result_t additionaldata_in_dhcid(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_in_dhcid(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_dhcid); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -188,8 +188,8 @@ static inline isc_result_t additionaldata_in_dhcid(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_in_dhcid(ARGS_DIGEST) -{ +static inline isc_result_t +digest_in_dhcid(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_dhcid); @@ -200,8 +200,8 @@ static inline isc_result_t digest_in_dhcid(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_in_dhcid(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_in_dhcid(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_dhcid); REQUIRE(rdclass == dns_rdataclass_in); @@ -213,8 +213,8 @@ static inline bool checkowner_in_dhcid(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_in_dhcid(ARGS_CHECKNAMES) -{ +static inline bool +checknames_in_dhcid(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_dhcid); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -225,8 +225,8 @@ static inline bool checknames_in_dhcid(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_in_dhcid(ARGS_COMPARE) -{ +static inline int +casecompare_in_dhcid(ARGS_COMPARE) { return (compare_in_dhcid(rdata1, rdata2)); } diff --git a/lib/dns/rdata/in_1/eid_31.c b/lib/dns/rdata/in_1/eid_31.c index d136727d30..d64891c154 100644 --- a/lib/dns/rdata/in_1/eid_31.c +++ b/lib/dns/rdata/in_1/eid_31.c @@ -16,8 +16,8 @@ #define RRTYPE_EID_ATTRIBUTES (0) -static inline isc_result_t fromtext_in_eid(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_in_eid(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_eid); REQUIRE(rdclass == dns_rdataclass_in); @@ -30,8 +30,8 @@ static inline isc_result_t fromtext_in_eid(ARGS_FROMTEXT) return (isc_hex_tobuffer(lexer, target, -2)); } -static inline isc_result_t totext_in_eid(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_in_eid(ARGS_TOTEXT) { isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_eid); @@ -55,8 +55,8 @@ static inline isc_result_t totext_in_eid(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_in_eid(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_in_eid(ARGS_FROMWIRE) { isc_region_t region; REQUIRE(type == dns_rdatatype_eid); @@ -77,8 +77,8 @@ static inline isc_result_t fromwire_in_eid(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_in_eid(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_in_eid(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_eid); REQUIRE(rdata->rdclass == dns_rdataclass_in); REQUIRE(rdata->length != 0); @@ -88,8 +88,8 @@ static inline isc_result_t towire_in_eid(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_in_eid(ARGS_COMPARE) -{ +static inline int +compare_in_eid(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -105,8 +105,8 @@ static inline int compare_in_eid(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_in_eid(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_in_eid(ARGS_FROMSTRUCT) { dns_rdata_in_eid_t *eid = source; REQUIRE(type == dns_rdatatype_eid); @@ -122,10 +122,10 @@ static inline isc_result_t fromstruct_in_eid(ARGS_FROMSTRUCT) return (mem_tobuffer(target, eid->eid, eid->eid_len)); } -static inline isc_result_t tostruct_in_eid(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_in_eid(ARGS_TOSTRUCT) { dns_rdata_in_eid_t *eid = target; - isc_region_t r; + isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_eid); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -147,8 +147,8 @@ static inline isc_result_t tostruct_in_eid(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_in_eid(ARGS_FREESTRUCT) -{ +static inline void +freestruct_in_eid(ARGS_FREESTRUCT) { dns_rdata_in_eid_t *eid = source; REQUIRE(eid != NULL); @@ -165,8 +165,8 @@ static inline void freestruct_in_eid(ARGS_FREESTRUCT) eid->mctx = NULL; } -static inline isc_result_t additionaldata_in_eid(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_in_eid(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_eid); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -177,8 +177,8 @@ static inline isc_result_t additionaldata_in_eid(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_in_eid(ARGS_DIGEST) -{ +static inline isc_result_t +digest_in_eid(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_eid); @@ -189,8 +189,8 @@ static inline isc_result_t digest_in_eid(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_in_eid(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_in_eid(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_eid); REQUIRE(rdclass == dns_rdataclass_in); @@ -202,8 +202,8 @@ static inline bool checkowner_in_eid(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_in_eid(ARGS_CHECKNAMES) -{ +static inline bool +checknames_in_eid(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_eid); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -214,8 +214,8 @@ static inline bool checknames_in_eid(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_in_eid(ARGS_COMPARE) -{ +static inline int +casecompare_in_eid(ARGS_COMPARE) { return (compare_in_eid(rdata1, rdata2)); } diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c index 388214268b..dc47ed93a5 100644 --- a/lib/dns/rdata/in_1/kx_36.c +++ b/lib/dns/rdata/in_1/kx_36.c @@ -16,10 +16,10 @@ #define RRTYPE_KX_ATTRIBUTES (0) -static inline isc_result_t fromtext_in_kx(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_in_kx(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; REQUIRE(type == dns_rdatatype_kx); @@ -47,13 +47,13 @@ static inline isc_result_t fromtext_in_kx(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_in_kx(ARGS_TOTEXT) -{ - isc_region_t region; - dns_name_t name; - dns_name_t prefix; - bool sub; - char buf[sizeof("64000")]; +static inline isc_result_t +totext_in_kx(ARGS_TOTEXT) { + isc_region_t region; + dns_name_t name; + dns_name_t prefix; + bool sub; + char buf[sizeof("64000")]; unsigned short num; REQUIRE(rdata->type == dns_rdatatype_kx); @@ -76,9 +76,9 @@ static inline isc_result_t totext_in_kx(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_in_kx(ARGS_FROMWIRE) -{ - dns_name_t name; +static inline isc_result_t +fromwire_in_kx(ARGS_FROMWIRE) { + dns_name_t name; isc_region_t sregion; REQUIRE(type == dns_rdatatype_kx); @@ -100,11 +100,11 @@ static inline isc_result_t fromwire_in_kx(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_in_kx(ARGS_TOWIRE) -{ - dns_name_t name; +static inline isc_result_t +towire_in_kx(ARGS_TOWIRE) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_kx); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -121,13 +121,13 @@ static inline isc_result_t towire_in_kx(ARGS_TOWIRE) return (dns_name_towire(&name, cctx, target)); } -static inline int compare_in_kx(ARGS_COMPARE) -{ - dns_name_t name1; - dns_name_t name2; +static inline int +compare_in_kx(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; - int order; + int order; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); @@ -156,10 +156,10 @@ static inline int compare_in_kx(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_in_kx(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_in_kx(ARGS_FROMSTRUCT) { dns_rdata_in_kx_t *kx = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_kx); REQUIRE(rdclass == dns_rdataclass_in); @@ -175,11 +175,11 @@ static inline isc_result_t fromstruct_in_kx(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_in_kx(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_in_kx(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_in_kx_t *kx = target; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_kx); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -203,8 +203,8 @@ static inline isc_result_t tostruct_in_kx(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_in_kx(ARGS_FREESTRUCT) -{ +static inline void +freestruct_in_kx(ARGS_FREESTRUCT) { dns_rdata_in_kx_t *kx = source; REQUIRE(kx != NULL); @@ -219,11 +219,11 @@ static inline void freestruct_in_kx(ARGS_FREESTRUCT) kx->mctx = NULL; } -static inline isc_result_t additionaldata_in_kx(ARGS_ADDLDATA) -{ - dns_name_t name; +static inline isc_result_t +additionaldata_in_kx(ARGS_ADDLDATA) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_kx); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -236,10 +236,10 @@ static inline isc_result_t additionaldata_in_kx(ARGS_ADDLDATA) return ((add)(arg, &name, dns_rdatatype_a)); } -static inline isc_result_t digest_in_kx(ARGS_DIGEST) -{ +static inline isc_result_t +digest_in_kx(ARGS_DIGEST) { isc_region_t r1, r2; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_kx); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -254,8 +254,8 @@ static inline isc_result_t digest_in_kx(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_in_kx(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_in_kx(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_kx); REQUIRE(rdclass == dns_rdataclass_in); @@ -267,8 +267,8 @@ static inline bool checkowner_in_kx(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_in_kx(ARGS_CHECKNAMES) -{ +static inline bool +checknames_in_kx(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_kx); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -279,8 +279,8 @@ static inline bool checknames_in_kx(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_in_kx(ARGS_COMPARE) -{ +static inline int +casecompare_in_kx(ARGS_COMPARE) { return (compare_in_kx(rdata1, rdata2)); } diff --git a/lib/dns/rdata/in_1/nimloc_32.c b/lib/dns/rdata/in_1/nimloc_32.c index a87a0fa538..cba7c49baa 100644 --- a/lib/dns/rdata/in_1/nimloc_32.c +++ b/lib/dns/rdata/in_1/nimloc_32.c @@ -16,8 +16,8 @@ #define RRTYPE_NIMLOC_ATTRIBUTES (0) -static inline isc_result_t fromtext_in_nimloc(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_in_nimloc(ARGS_FROMTEXT) { REQUIRE(type == dns_rdatatype_nimloc); REQUIRE(rdclass == dns_rdataclass_in); @@ -30,8 +30,8 @@ static inline isc_result_t fromtext_in_nimloc(ARGS_FROMTEXT) return (isc_hex_tobuffer(lexer, target, -2)); } -static inline isc_result_t totext_in_nimloc(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_in_nimloc(ARGS_TOTEXT) { isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_nimloc); @@ -55,8 +55,8 @@ static inline isc_result_t totext_in_nimloc(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_in_nimloc(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_in_nimloc(ARGS_FROMWIRE) { isc_region_t region; REQUIRE(type == dns_rdatatype_nimloc); @@ -77,8 +77,8 @@ static inline isc_result_t fromwire_in_nimloc(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_in_nimloc(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_in_nimloc(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_nimloc); REQUIRE(rdata->rdclass == dns_rdataclass_in); REQUIRE(rdata->length != 0); @@ -88,8 +88,8 @@ static inline isc_result_t towire_in_nimloc(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_in_nimloc(ARGS_COMPARE) -{ +static inline int +compare_in_nimloc(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -105,8 +105,8 @@ static inline int compare_in_nimloc(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_in_nimloc(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_in_nimloc(ARGS_FROMSTRUCT) { dns_rdata_in_nimloc_t *nimloc = source; REQUIRE(type == dns_rdatatype_nimloc); @@ -122,10 +122,10 @@ static inline isc_result_t fromstruct_in_nimloc(ARGS_FROMSTRUCT) return (mem_tobuffer(target, nimloc->nimloc, nimloc->nimloc_len)); } -static inline isc_result_t tostruct_in_nimloc(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_in_nimloc(ARGS_TOSTRUCT) { dns_rdata_in_nimloc_t *nimloc = target; - isc_region_t r; + isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_nimloc); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -147,8 +147,8 @@ static inline isc_result_t tostruct_in_nimloc(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_in_nimloc(ARGS_FREESTRUCT) -{ +static inline void +freestruct_in_nimloc(ARGS_FREESTRUCT) { dns_rdata_in_nimloc_t *nimloc = source; REQUIRE(nimloc != NULL); @@ -165,8 +165,8 @@ static inline void freestruct_in_nimloc(ARGS_FREESTRUCT) nimloc->mctx = NULL; } -static inline isc_result_t additionaldata_in_nimloc(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_in_nimloc(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_nimloc); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -177,8 +177,8 @@ static inline isc_result_t additionaldata_in_nimloc(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_in_nimloc(ARGS_DIGEST) -{ +static inline isc_result_t +digest_in_nimloc(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_nimloc); @@ -189,8 +189,8 @@ static inline isc_result_t digest_in_nimloc(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_in_nimloc(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_in_nimloc(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_nimloc); REQUIRE(rdclass == dns_rdataclass_in); @@ -202,8 +202,8 @@ static inline bool checkowner_in_nimloc(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_in_nimloc(ARGS_CHECKNAMES) -{ +static inline bool +checknames_in_nimloc(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_nimloc); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -214,8 +214,8 @@ static inline bool checknames_in_nimloc(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_in_nimloc(ARGS_COMPARE) -{ +static inline int +casecompare_in_nimloc(ARGS_COMPARE) { return (compare_in_nimloc(rdata1, rdata2)); } diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c index b2de76e840..53b479dfca 100644 --- a/lib/dns/rdata/in_1/nsap-ptr_23.c +++ b/lib/dns/rdata/in_1/nsap-ptr_23.c @@ -16,10 +16,10 @@ #define RRTYPE_NSAP_PTR_ATTRIBUTES (0) -static inline isc_result_t fromtext_in_nsap_ptr(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_in_nsap_ptr(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; REQUIRE(type == dns_rdatatype_nsap_ptr); @@ -41,12 +41,12 @@ static inline isc_result_t fromtext_in_nsap_ptr(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_in_nsap_ptr(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_in_nsap_ptr(ARGS_TOTEXT) { isc_region_t region; - dns_name_t name; - dns_name_t prefix; - bool sub; + dns_name_t name; + dns_name_t prefix; + bool sub; REQUIRE(rdata->type == dns_rdatatype_nsap_ptr); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -63,8 +63,8 @@ static inline isc_result_t totext_in_nsap_ptr(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_in_nsap_ptr(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_in_nsap_ptr(ARGS_FROMWIRE) { dns_name_t name; REQUIRE(type == dns_rdatatype_nsap_ptr); @@ -79,11 +79,11 @@ static inline isc_result_t fromwire_in_nsap_ptr(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_in_nsap_ptr(ARGS_TOWIRE) -{ - dns_name_t name; +static inline isc_result_t +towire_in_nsap_ptr(ARGS_TOWIRE) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_nsap_ptr); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -97,10 +97,10 @@ static inline isc_result_t towire_in_nsap_ptr(ARGS_TOWIRE) return (dns_name_towire(&name, cctx, target)); } -static inline int compare_in_nsap_ptr(ARGS_COMPARE) -{ - dns_name_t name1; - dns_name_t name2; +static inline int +compare_in_nsap_ptr(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; @@ -123,10 +123,10 @@ static inline int compare_in_nsap_ptr(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_in_nsap_ptr(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_in_nsap_ptr(ARGS_FROMSTRUCT) { dns_rdata_in_nsap_ptr_t *nsap_ptr = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_nsap_ptr); REQUIRE(rdclass == dns_rdataclass_in); @@ -141,11 +141,11 @@ static inline isc_result_t fromstruct_in_nsap_ptr(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_in_nsap_ptr(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_in_nsap_ptr(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_in_nsap_ptr_t *nsap_ptr = target; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_nsap_ptr); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -165,8 +165,8 @@ static inline isc_result_t tostruct_in_nsap_ptr(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_in_nsap_ptr(ARGS_FREESTRUCT) -{ +static inline void +freestruct_in_nsap_ptr(ARGS_FREESTRUCT) { dns_rdata_in_nsap_ptr_t *nsap_ptr = source; REQUIRE(nsap_ptr != NULL); @@ -181,8 +181,8 @@ static inline void freestruct_in_nsap_ptr(ARGS_FREESTRUCT) nsap_ptr->mctx = NULL; } -static inline isc_result_t additionaldata_in_nsap_ptr(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_in_nsap_ptr(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_nsap_ptr); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -193,10 +193,10 @@ static inline isc_result_t additionaldata_in_nsap_ptr(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_in_nsap_ptr(ARGS_DIGEST) -{ +static inline isc_result_t +digest_in_nsap_ptr(ARGS_DIGEST) { isc_region_t r; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_nsap_ptr); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -208,8 +208,8 @@ static inline isc_result_t digest_in_nsap_ptr(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_in_nsap_ptr(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_in_nsap_ptr(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_nsap_ptr); REQUIRE(rdclass == dns_rdataclass_in); @@ -221,8 +221,8 @@ static inline bool checkowner_in_nsap_ptr(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_in_nsap_ptr(ARGS_CHECKNAMES) -{ +static inline bool +checknames_in_nsap_ptr(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_nsap_ptr); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -233,8 +233,8 @@ static inline bool checknames_in_nsap_ptr(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_in_nsap_ptr(ARGS_COMPARE) -{ +static inline int +casecompare_in_nsap_ptr(ARGS_COMPARE) { return (compare_in_nsap_ptr(rdata1, rdata2)); } diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c index 15e0382c46..3d6e3561e8 100644 --- a/lib/dns/rdata/in_1/nsap_22.c +++ b/lib/dns/rdata/in_1/nsap_22.c @@ -16,14 +16,14 @@ #define RRTYPE_NSAP_ATTRIBUTES (0) -static inline isc_result_t fromtext_in_nsap(ARGS_FROMTEXT) -{ - isc_token_t token; +static inline isc_result_t +fromtext_in_nsap(ARGS_FROMTEXT) { + isc_token_t token; isc_textregion_t *sr; - int n; - bool valid = false; - int digits = 0; - unsigned char c = 0; + int n; + bool valid = false; + int digits = 0; + unsigned char c = 0; REQUIRE(type == dns_rdatatype_nsap); REQUIRE(rdclass == dns_rdataclass_in); @@ -69,10 +69,10 @@ static inline isc_result_t fromtext_in_nsap(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_in_nsap(ARGS_TOTEXT) -{ +static inline isc_result_t +totext_in_nsap(ARGS_TOTEXT) { isc_region_t region; - char buf[sizeof("xx")]; + char buf[sizeof("xx")]; REQUIRE(rdata->type == dns_rdatatype_nsap); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -90,8 +90,8 @@ static inline isc_result_t totext_in_nsap(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_in_nsap(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_in_nsap(ARGS_FROMWIRE) { isc_region_t region; REQUIRE(type == dns_rdatatype_nsap); @@ -112,8 +112,8 @@ static inline isc_result_t fromwire_in_nsap(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_in_nsap(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_in_nsap(ARGS_TOWIRE) { REQUIRE(rdata->type == dns_rdatatype_nsap); REQUIRE(rdata->rdclass == dns_rdataclass_in); REQUIRE(rdata->length != 0); @@ -123,8 +123,8 @@ static inline isc_result_t towire_in_nsap(ARGS_TOWIRE) return (mem_tobuffer(target, rdata->data, rdata->length)); } -static inline int compare_in_nsap(ARGS_COMPARE) -{ +static inline int +compare_in_nsap(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -140,8 +140,8 @@ static inline int compare_in_nsap(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_in_nsap(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_in_nsap(ARGS_FROMSTRUCT) { dns_rdata_in_nsap_t *nsap = source; REQUIRE(type == dns_rdatatype_nsap); @@ -157,10 +157,10 @@ static inline isc_result_t fromstruct_in_nsap(ARGS_FROMSTRUCT) return (mem_tobuffer(target, nsap->nsap, nsap->nsap_len)); } -static inline isc_result_t tostruct_in_nsap(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_in_nsap(ARGS_TOSTRUCT) { dns_rdata_in_nsap_t *nsap = target; - isc_region_t r; + isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_nsap); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -182,8 +182,8 @@ static inline isc_result_t tostruct_in_nsap(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_in_nsap(ARGS_FREESTRUCT) -{ +static inline void +freestruct_in_nsap(ARGS_FREESTRUCT) { dns_rdata_in_nsap_t *nsap = source; REQUIRE(nsap != NULL); @@ -200,8 +200,8 @@ static inline void freestruct_in_nsap(ARGS_FREESTRUCT) nsap->mctx = NULL; } -static inline isc_result_t additionaldata_in_nsap(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_in_nsap(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_nsap); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -212,8 +212,8 @@ static inline isc_result_t additionaldata_in_nsap(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_in_nsap(ARGS_DIGEST) -{ +static inline isc_result_t +digest_in_nsap(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_nsap); @@ -224,8 +224,8 @@ static inline isc_result_t digest_in_nsap(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_in_nsap(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_in_nsap(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_nsap); REQUIRE(rdclass == dns_rdataclass_in); @@ -237,8 +237,8 @@ static inline bool checkowner_in_nsap(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_in_nsap(ARGS_CHECKNAMES) -{ +static inline bool +checknames_in_nsap(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_nsap); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -249,8 +249,8 @@ static inline bool checknames_in_nsap(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_in_nsap(ARGS_COMPARE) -{ +static inline int +casecompare_in_nsap(ARGS_COMPARE) { return (compare_in_nsap(rdata1, rdata2)); } diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c index 1bba436708..7394dc3083 100644 --- a/lib/dns/rdata/in_1/px_26.c +++ b/lib/dns/rdata/in_1/px_26.c @@ -16,10 +16,10 @@ #define RRTYPE_PX_ATTRIBUTES (0) -static inline isc_result_t fromtext_in_px(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_in_px(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; REQUIRE(type == dns_rdatatype_px); @@ -63,13 +63,13 @@ static inline isc_result_t fromtext_in_px(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_in_px(ARGS_TOTEXT) -{ - isc_region_t region; - dns_name_t name; - dns_name_t prefix; - bool sub; - char buf[sizeof("64000")]; +static inline isc_result_t +totext_in_px(ARGS_TOTEXT) { + isc_region_t region; + dns_name_t name; + dns_name_t prefix; + bool sub; + char buf[sizeof("64000")]; unsigned short num; REQUIRE(rdata->type == dns_rdatatype_px); @@ -106,9 +106,9 @@ static inline isc_result_t totext_in_px(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_in_px(ARGS_FROMWIRE) -{ - dns_name_t name; +static inline isc_result_t +fromwire_in_px(ARGS_FROMWIRE) { + dns_name_t name; isc_region_t sregion; REQUIRE(type == dns_rdatatype_px); @@ -142,11 +142,11 @@ static inline isc_result_t fromwire_in_px(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_in_px(ARGS_TOWIRE) -{ - dns_name_t name; +static inline isc_result_t +towire_in_px(ARGS_TOWIRE) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t region; + isc_region_t region; REQUIRE(rdata->type == dns_rdatatype_px); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -176,13 +176,13 @@ static inline isc_result_t towire_in_px(ARGS_TOWIRE) return (dns_name_towire(&name, cctx, target)); } -static inline int compare_in_px(ARGS_COMPARE) -{ - dns_name_t name1; - dns_name_t name2; +static inline int +compare_in_px(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; - int order; + int order; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); @@ -222,10 +222,10 @@ static inline int compare_in_px(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_in_px(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_in_px(ARGS_FROMSTRUCT) { dns_rdata_in_px_t *px = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_px); REQUIRE(rdclass == dns_rdataclass_in); @@ -243,12 +243,12 @@ static inline isc_result_t fromstruct_in_px(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_in_px(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_in_px(ARGS_TOSTRUCT) { dns_rdata_in_px_t *px = target; - dns_name_t name; - isc_region_t region; - isc_result_t result; + dns_name_t name; + isc_region_t region; + isc_result_t result; REQUIRE(rdata->type == dns_rdatatype_px); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -285,8 +285,8 @@ cleanup: return (ISC_R_NOMEMORY); } -static inline void freestruct_in_px(ARGS_FREESTRUCT) -{ +static inline void +freestruct_in_px(ARGS_FREESTRUCT) { dns_rdata_in_px_t *px = source; REQUIRE(px != NULL); @@ -302,8 +302,8 @@ static inline void freestruct_in_px(ARGS_FREESTRUCT) px->mctx = NULL; } -static inline isc_result_t additionaldata_in_px(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_in_px(ARGS_ADDLDATA) { REQUIRE(rdata->type == dns_rdatatype_px); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -314,10 +314,10 @@ static inline isc_result_t additionaldata_in_px(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_in_px(ARGS_DIGEST) -{ +static inline isc_result_t +digest_in_px(ARGS_DIGEST) { isc_region_t r1, r2; - dns_name_t name; + dns_name_t name; isc_result_t result; REQUIRE(rdata->type == dns_rdatatype_px); @@ -344,8 +344,8 @@ static inline isc_result_t digest_in_px(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_in_px(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_in_px(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_px); REQUIRE(rdclass == dns_rdataclass_in); @@ -357,8 +357,8 @@ static inline bool checkowner_in_px(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_in_px(ARGS_CHECKNAMES) -{ +static inline bool +checknames_in_px(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_px); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -369,8 +369,8 @@ static inline bool checknames_in_px(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_in_px(ARGS_COMPARE) -{ +static inline int +casecompare_in_px(ARGS_COMPARE) { return (compare_in_px(rdata1, rdata2)); } diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c index d15d312a97..6afe1ae46e 100644 --- a/lib/dns/rdata/in_1/srv_33.c +++ b/lib/dns/rdata/in_1/srv_33.c @@ -16,12 +16,12 @@ #define RRTYPE_SRV_ATTRIBUTES (0) -static inline isc_result_t fromtext_in_srv(ARGS_FROMTEXT) -{ - isc_token_t token; - dns_name_t name; +static inline isc_result_t +fromtext_in_srv(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; isc_buffer_t buffer; - bool ok; + bool ok; REQUIRE(type == dns_rdatatype_srv); REQUIRE(rdclass == dns_rdataclass_in); @@ -84,13 +84,13 @@ static inline isc_result_t fromtext_in_srv(ARGS_FROMTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t totext_in_srv(ARGS_TOTEXT) -{ - isc_region_t region; - dns_name_t name; - dns_name_t prefix; - bool sub; - char buf[sizeof("64000")]; +static inline isc_result_t +totext_in_srv(ARGS_TOTEXT) { + isc_region_t region; + dns_name_t name; + dns_name_t prefix; + bool sub; + char buf[sizeof("64000")]; unsigned short num; REQUIRE(rdata->type == dns_rdatatype_srv); @@ -136,9 +136,9 @@ static inline isc_result_t totext_in_srv(ARGS_TOTEXT) return (dns_name_totext(&prefix, sub, target)); } -static inline isc_result_t fromwire_in_srv(ARGS_FROMWIRE) -{ - dns_name_t name; +static inline isc_result_t +fromwire_in_srv(ARGS_FROMWIRE) { + dns_name_t name; isc_region_t sr; REQUIRE(type == dns_rdatatype_srv); @@ -167,11 +167,11 @@ static inline isc_result_t fromwire_in_srv(ARGS_FROMWIRE) return (dns_name_fromwire(&name, source, dctx, options, target)); } -static inline isc_result_t towire_in_srv(ARGS_TOWIRE) -{ - dns_name_t name; +static inline isc_result_t +towire_in_srv(ARGS_TOWIRE) { + dns_name_t name; dns_offsets_t offsets; - isc_region_t sr; + isc_region_t sr; REQUIRE(rdata->type == dns_rdatatype_srv); REQUIRE(rdata->length != 0); @@ -192,13 +192,13 @@ static inline isc_result_t towire_in_srv(ARGS_TOWIRE) return (dns_name_towire(&name, cctx, target)); } -static inline int compare_in_srv(ARGS_COMPARE) -{ - dns_name_t name1; - dns_name_t name2; +static inline int +compare_in_srv(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; isc_region_t region1; isc_region_t region2; - int order; + int order; REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); @@ -233,10 +233,10 @@ static inline int compare_in_srv(ARGS_COMPARE) return (dns_name_rdatacompare(&name1, &name2)); } -static inline isc_result_t fromstruct_in_srv(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_in_srv(ARGS_FROMSTRUCT) { dns_rdata_in_srv_t *srv = source; - isc_region_t region; + isc_region_t region; REQUIRE(type == dns_rdatatype_srv); REQUIRE(rdclass == dns_rdataclass_in); @@ -254,11 +254,11 @@ static inline isc_result_t fromstruct_in_srv(ARGS_FROMSTRUCT) return (isc_buffer_copyregion(target, ®ion)); } -static inline isc_result_t tostruct_in_srv(ARGS_TOSTRUCT) -{ - isc_region_t region; +static inline isc_result_t +tostruct_in_srv(ARGS_TOSTRUCT) { + isc_region_t region; dns_rdata_in_srv_t *srv = target; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->rdclass == dns_rdataclass_in); REQUIRE(rdata->type == dns_rdatatype_srv); @@ -284,8 +284,8 @@ static inline isc_result_t tostruct_in_srv(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_in_srv(ARGS_FREESTRUCT) -{ +static inline void +freestruct_in_srv(ARGS_FREESTRUCT) { dns_rdata_in_srv_t *srv = source; REQUIRE(srv != NULL); @@ -300,15 +300,15 @@ static inline void freestruct_in_srv(ARGS_FREESTRUCT) srv->mctx = NULL; } -static inline isc_result_t additionaldata_in_srv(ARGS_ADDLDATA) -{ - char buf[sizeof("_65000._tcp")]; +static inline isc_result_t +additionaldata_in_srv(ARGS_ADDLDATA) { + char buf[sizeof("_65000._tcp")]; dns_fixedname_t fixed; - dns_name_t name; - dns_offsets_t offsets; - isc_region_t region; - uint16_t port; - isc_result_t result; + dns_name_t name; + dns_offsets_t offsets; + isc_region_t region; + uint16_t port; + isc_result_t result; REQUIRE(rdata->type == dns_rdatatype_srv); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -346,10 +346,10 @@ static inline isc_result_t additionaldata_in_srv(ARGS_ADDLDATA) return ((add)(arg, dns_fixedname_name(&fixed), dns_rdatatype_tlsa)); } -static inline isc_result_t digest_in_srv(ARGS_DIGEST) -{ +static inline isc_result_t +digest_in_srv(ARGS_DIGEST) { isc_region_t r1, r2; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_srv); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -364,8 +364,8 @@ static inline isc_result_t digest_in_srv(ARGS_DIGEST) return (dns_name_digest(&name, digest, arg)); } -static inline bool checkowner_in_srv(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_in_srv(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_srv); REQUIRE(rdclass == dns_rdataclass_in); @@ -377,10 +377,10 @@ static inline bool checkowner_in_srv(ARGS_CHECKOWNER) return (true); } -static inline bool checknames_in_srv(ARGS_CHECKNAMES) -{ +static inline bool +checknames_in_srv(ARGS_CHECKNAMES) { isc_region_t region; - dns_name_t name; + dns_name_t name; REQUIRE(rdata->type == dns_rdatatype_srv); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -400,8 +400,8 @@ static inline bool checknames_in_srv(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_in_srv(ARGS_COMPARE) -{ +static inline int +casecompare_in_srv(ARGS_COMPARE) { return (compare_in_srv(rdata1, rdata2)); } diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c index 3fd07a5720..ca606e25a1 100644 --- a/lib/dns/rdata/in_1/wks_11.c +++ b/lib/dns/rdata/in_1/wks_11.c @@ -36,14 +36,12 @@ static isc_mutex_t wks_lock; static void -init_lock(void) -{ +init_lock(void) { isc_mutex_init(&wks_lock); } static bool -mygetprotobyname(const char *name, long *proto) -{ +mygetprotobyname(const char *name, long *proto) { struct protoent *pe; LOCK(&wks_lock); @@ -56,8 +54,7 @@ mygetprotobyname(const char *name, long *proto) } static bool -mygetservbyname(const char *name, const char *proto, long *port) -{ +mygetservbyname(const char *name, const char *proto, long *port) { struct servent *se; LOCK(&wks_lock); @@ -75,22 +72,22 @@ mygetservbyname(const char *name, const char *proto, long *port) #include #endif /* ifdef _WIN32 */ -static inline isc_result_t fromtext_in_wks(ARGS_FROMTEXT) -{ +static inline isc_result_t +fromtext_in_wks(ARGS_FROMTEXT) { static isc_once_t once = ISC_ONCE_INIT; - isc_token_t token; - isc_region_t region; - struct in_addr addr; - char * e; - long proto; - unsigned char bm[8 * 1024]; /* 64k bits */ - long port; - long maxport = -1; - const char * ps = NULL; - unsigned int n; - char service[32]; - int i; - isc_result_t result; + isc_token_t token; + isc_region_t region; + struct in_addr addr; + char *e; + long proto; + unsigned char bm[8 * 1024]; /* 64k bits */ + long port; + long maxport = -1; + const char *ps = NULL; + unsigned int n; + char service[32]; + int i; + isc_result_t result; REQUIRE(type == dns_rdatatype_wks); REQUIRE(rdclass == dns_rdataclass_in); @@ -105,9 +102,9 @@ static inline isc_result_t fromtext_in_wks(ARGS_FROMTEXT) #ifdef _WIN32 { - WORD wVersionRequested; + WORD wVersionRequested; WSADATA wsaData; - int err; + int err; wVersionRequested = MAKEWORD(2, 0); @@ -180,7 +177,8 @@ static inline isc_result_t fromtext_in_wks(ARGS_FROMTEXT) port = strtol(DNS_AS_STR(token), &e, 10); if (*e == 0) { } else if (!mygetservbyname(service, ps, &port) && - !mygetservbyname(DNS_AS_STR(token), ps, &port)) { + !mygetservbyname(DNS_AS_STR(token), ps, &port)) + { CHECKTOK(DNS_R_UNKNOWNSERVICE); } if (port < 0 || port > 0xffff) { @@ -208,12 +206,12 @@ cleanup: return (result); } -static inline isc_result_t totext_in_wks(ARGS_TOTEXT) -{ - isc_region_t sr; +static inline isc_result_t +totext_in_wks(ARGS_TOTEXT) { + isc_region_t sr; unsigned short proto; - char buf[sizeof("65535")]; - unsigned int i, j; + char buf[sizeof("65535")]; + unsigned int i, j; UNUSED(tctx); @@ -250,8 +248,8 @@ static inline isc_result_t totext_in_wks(ARGS_TOTEXT) return (ISC_R_SUCCESS); } -static inline isc_result_t fromwire_in_wks(ARGS_FROMWIRE) -{ +static inline isc_result_t +fromwire_in_wks(ARGS_FROMWIRE) { isc_region_t sr; isc_region_t tr; @@ -283,8 +281,8 @@ static inline isc_result_t fromwire_in_wks(ARGS_FROMWIRE) return (ISC_R_SUCCESS); } -static inline isc_result_t towire_in_wks(ARGS_TOWIRE) -{ +static inline isc_result_t +towire_in_wks(ARGS_TOWIRE) { isc_region_t sr; UNUSED(cctx); @@ -297,8 +295,8 @@ static inline isc_result_t towire_in_wks(ARGS_TOWIRE) return (mem_tobuffer(target, sr.base, sr.length)); } -static inline int compare_in_wks(ARGS_COMPARE) -{ +static inline int +compare_in_wks(ARGS_COMPARE) { isc_region_t r1; isc_region_t r2; @@ -314,10 +312,10 @@ static inline int compare_in_wks(ARGS_COMPARE) return (isc_region_compare(&r1, &r2)); } -static inline isc_result_t fromstruct_in_wks(ARGS_FROMSTRUCT) -{ +static inline isc_result_t +fromstruct_in_wks(ARGS_FROMSTRUCT) { dns_rdata_in_wks_t *wks = source; - uint32_t a; + uint32_t a; REQUIRE(type == dns_rdatatype_wks); REQUIRE(rdclass == dns_rdataclass_in); @@ -336,11 +334,11 @@ static inline isc_result_t fromstruct_in_wks(ARGS_FROMSTRUCT) return (mem_tobuffer(target, wks->map, wks->map_len)); } -static inline isc_result_t tostruct_in_wks(ARGS_TOSTRUCT) -{ +static inline isc_result_t +tostruct_in_wks(ARGS_TOSTRUCT) { dns_rdata_in_wks_t *wks = target; - uint32_t n; - isc_region_t region; + uint32_t n; + isc_region_t region; REQUIRE(wks != NULL); REQUIRE(rdata->type == dns_rdatatype_wks); @@ -366,8 +364,8 @@ static inline isc_result_t tostruct_in_wks(ARGS_TOSTRUCT) return (ISC_R_SUCCESS); } -static inline void freestruct_in_wks(ARGS_FREESTRUCT) -{ +static inline void +freestruct_in_wks(ARGS_FREESTRUCT) { dns_rdata_in_wks_t *wks = source; REQUIRE(wks != NULL); @@ -384,8 +382,8 @@ static inline void freestruct_in_wks(ARGS_FREESTRUCT) wks->mctx = NULL; } -static inline isc_result_t additionaldata_in_wks(ARGS_ADDLDATA) -{ +static inline isc_result_t +additionaldata_in_wks(ARGS_ADDLDATA) { UNUSED(rdata); UNUSED(add); UNUSED(arg); @@ -396,8 +394,8 @@ static inline isc_result_t additionaldata_in_wks(ARGS_ADDLDATA) return (ISC_R_SUCCESS); } -static inline isc_result_t digest_in_wks(ARGS_DIGEST) -{ +static inline isc_result_t +digest_in_wks(ARGS_DIGEST) { isc_region_t r; REQUIRE(rdata->type == dns_rdatatype_wks); @@ -408,8 +406,8 @@ static inline isc_result_t digest_in_wks(ARGS_DIGEST) return ((digest)(arg, &r)); } -static inline bool checkowner_in_wks(ARGS_CHECKOWNER) -{ +static inline bool +checkowner_in_wks(ARGS_CHECKOWNER) { REQUIRE(type == dns_rdatatype_wks); REQUIRE(rdclass == dns_rdataclass_in); @@ -419,8 +417,8 @@ static inline bool checkowner_in_wks(ARGS_CHECKOWNER) return (dns_name_ishostname(name, wildcard)); } -static inline bool checknames_in_wks(ARGS_CHECKNAMES) -{ +static inline bool +checknames_in_wks(ARGS_CHECKNAMES) { REQUIRE(rdata->type == dns_rdatatype_wks); REQUIRE(rdata->rdclass == dns_rdataclass_in); @@ -431,8 +429,8 @@ static inline bool checknames_in_wks(ARGS_CHECKNAMES) return (true); } -static inline int casecompare_in_wks(ARGS_COMPARE) -{ +static inline int +casecompare_in_wks(ARGS_COMPARE) { return (compare_in_wks(rdata1, rdata2)); } diff --git a/lib/dns/rdatalist.c b/lib/dns/rdatalist.c index 88ba7af01d..2cbd9e5dcd 100644 --- a/lib/dns/rdatalist.c +++ b/lib/dns/rdatalist.c @@ -44,8 +44,7 @@ static dns_rdatasetmethods_t methods = { }; void -dns_rdatalist_init(dns_rdatalist_t *rdatalist) -{ +dns_rdatalist_init(dns_rdatalist_t *rdatalist) { REQUIRE(rdatalist != NULL); /* @@ -66,8 +65,7 @@ dns_rdatalist_init(dns_rdatalist_t *rdatalist) } isc_result_t -dns_rdatalist_tordataset(dns_rdatalist_t *rdatalist, dns_rdataset_t *rdataset) -{ +dns_rdatalist_tordataset(dns_rdatalist_t *rdatalist, dns_rdataset_t *rdataset) { /* * Make 'rdataset' refer to the rdata in 'rdatalist'. */ @@ -95,9 +93,8 @@ dns_rdatalist_tordataset(dns_rdatalist_t *rdatalist, dns_rdataset_t *rdataset) } isc_result_t -dns_rdatalist_fromrdataset(dns_rdataset_t * rdataset, - dns_rdatalist_t **rdatalist) -{ +dns_rdatalist_fromrdataset(dns_rdataset_t *rdataset, + dns_rdatalist_t **rdatalist) { REQUIRE(rdatalist != NULL && rdataset != NULL); *rdatalist = rdataset->private1; @@ -105,14 +102,12 @@ dns_rdatalist_fromrdataset(dns_rdataset_t * rdataset, } void -isc__rdatalist_disassociate(dns_rdataset_t *rdataset) -{ +isc__rdatalist_disassociate(dns_rdataset_t *rdataset) { UNUSED(rdataset); } isc_result_t -isc__rdatalist_first(dns_rdataset_t *rdataset) -{ +isc__rdatalist_first(dns_rdataset_t *rdataset) { dns_rdatalist_t *rdatalist; rdatalist = rdataset->private1; @@ -126,8 +121,7 @@ isc__rdatalist_first(dns_rdataset_t *rdataset) } isc_result_t -isc__rdatalist_next(dns_rdataset_t *rdataset) -{ +isc__rdatalist_next(dns_rdataset_t *rdataset) { dns_rdata_t *rdata; REQUIRE(rdataset != NULL); @@ -147,8 +141,7 @@ isc__rdatalist_next(dns_rdataset_t *rdataset) } void -isc__rdatalist_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) -{ +isc__rdatalist_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) { dns_rdata_t *list_rdata; REQUIRE(rdataset != NULL); @@ -160,8 +153,7 @@ isc__rdatalist_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) } void -isc__rdatalist_clone(dns_rdataset_t *source, dns_rdataset_t *target) -{ +isc__rdatalist_clone(dns_rdataset_t *source, dns_rdataset_t *target) { REQUIRE(source != NULL); REQUIRE(target != NULL); @@ -174,11 +166,10 @@ isc__rdatalist_clone(dns_rdataset_t *source, dns_rdataset_t *target) } unsigned int -isc__rdatalist_count(dns_rdataset_t *rdataset) -{ +isc__rdatalist_count(dns_rdataset_t *rdataset) { dns_rdatalist_t *rdatalist; - dns_rdata_t * rdata; - unsigned int count; + dns_rdata_t *rdata; + unsigned int count; REQUIRE(rdataset != NULL); @@ -186,7 +177,8 @@ isc__rdatalist_count(dns_rdataset_t *rdataset) count = 0; for (rdata = ISC_LIST_HEAD(rdatalist->rdata); rdata != NULL; - rdata = ISC_LIST_NEXT(rdata, link)) { + rdata = ISC_LIST_NEXT(rdata, link)) + { count++; } @@ -194,17 +186,17 @@ isc__rdatalist_count(dns_rdataset_t *rdataset) } isc_result_t -isc__rdatalist_addnoqname(dns_rdataset_t *rdataset, const dns_name_t *name) -{ +isc__rdatalist_addnoqname(dns_rdataset_t *rdataset, const dns_name_t *name) { dns_rdataset_t *neg = NULL; dns_rdataset_t *negsig = NULL; dns_rdataset_t *rdset; - dns_ttl_t ttl; + dns_ttl_t ttl; REQUIRE(rdataset != NULL); for (rdset = ISC_LIST_HEAD(name->list); rdset != NULL; - rdset = ISC_LIST_NEXT(rdset, link)) { + rdset = ISC_LIST_NEXT(rdset, link)) + { if (rdset->rdclass != rdataset->rdclass) { continue; } @@ -218,7 +210,8 @@ isc__rdatalist_addnoqname(dns_rdataset_t *rdataset, const dns_name_t *name) } for (rdset = ISC_LIST_HEAD(name->list); rdset != NULL; - rdset = ISC_LIST_NEXT(rdset, link)) { + rdset = ISC_LIST_NEXT(rdset, link)) + { if (rdset->type == dns_rdatatype_rrsig && rdset->covers == neg->type) { negsig = rdset; @@ -246,11 +239,10 @@ isc__rdatalist_addnoqname(dns_rdataset_t *rdataset, const dns_name_t *name) isc_result_t isc__rdatalist_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, - dns_rdataset_t *neg, dns_rdataset_t *negsig) -{ - dns_rdataclass_t rdclass; - dns_rdataset_t * tneg = NULL; - dns_rdataset_t * tnegsig = NULL; + dns_rdataset_t *neg, dns_rdataset_t *negsig) { + dns_rdataclass_t rdclass; + dns_rdataset_t *tneg = NULL; + dns_rdataset_t *tnegsig = NULL; const dns_name_t *noqname; REQUIRE(rdataset != NULL); @@ -262,12 +254,14 @@ isc__rdatalist_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, (void)dns_name_dynamic(noqname); /* Sanity Check. */ for (rdataset = ISC_LIST_HEAD(noqname->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (rdataset->rdclass != rdclass) { continue; } if (rdataset->type == dns_rdatatype_nsec || - rdataset->type == dns_rdatatype_nsec3) { + rdataset->type == dns_rdatatype_nsec3) + { tneg = rdataset; } } @@ -276,7 +270,8 @@ isc__rdatalist_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, } for (rdataset = ISC_LIST_HEAD(noqname->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (rdataset->type == dns_rdatatype_rrsig && rdataset->covers == tneg->type) { tnegsig = rdataset; @@ -293,17 +288,17 @@ isc__rdatalist_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, } isc_result_t -isc__rdatalist_addclosest(dns_rdataset_t *rdataset, const dns_name_t *name) -{ +isc__rdatalist_addclosest(dns_rdataset_t *rdataset, const dns_name_t *name) { dns_rdataset_t *neg = NULL; dns_rdataset_t *negsig = NULL; dns_rdataset_t *rdset; - dns_ttl_t ttl; + dns_ttl_t ttl; REQUIRE(rdataset != NULL); for (rdset = ISC_LIST_HEAD(name->list); rdset != NULL; - rdset = ISC_LIST_NEXT(rdset, link)) { + rdset = ISC_LIST_NEXT(rdset, link)) + { if (rdset->rdclass != rdataset->rdclass) { continue; } @@ -317,7 +312,8 @@ isc__rdatalist_addclosest(dns_rdataset_t *rdataset, const dns_name_t *name) } for (rdset = ISC_LIST_HEAD(name->list); rdset != NULL; - rdset = ISC_LIST_NEXT(rdset, link)) { + rdset = ISC_LIST_NEXT(rdset, link)) + { if (rdset->type == dns_rdatatype_rrsig && rdset->covers == neg->type) { negsig = rdset; @@ -345,11 +341,10 @@ isc__rdatalist_addclosest(dns_rdataset_t *rdataset, const dns_name_t *name) isc_result_t isc__rdatalist_getclosest(dns_rdataset_t *rdataset, dns_name_t *name, - dns_rdataset_t *neg, dns_rdataset_t *negsig) -{ - dns_rdataclass_t rdclass; - dns_rdataset_t * tneg = NULL; - dns_rdataset_t * tnegsig = NULL; + dns_rdataset_t *neg, dns_rdataset_t *negsig) { + dns_rdataclass_t rdclass; + dns_rdataset_t *tneg = NULL; + dns_rdataset_t *tnegsig = NULL; const dns_name_t *closest; REQUIRE(rdataset != NULL); @@ -361,12 +356,14 @@ isc__rdatalist_getclosest(dns_rdataset_t *rdataset, dns_name_t *name, (void)dns_name_dynamic(closest); /* Sanity Check. */ for (rdataset = ISC_LIST_HEAD(closest->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (rdataset->rdclass != rdclass) { continue; } if (rdataset->type == dns_rdatatype_nsec || - rdataset->type == dns_rdatatype_nsec3) { + rdataset->type == dns_rdatatype_nsec3) + { tneg = rdataset; } } @@ -375,7 +372,8 @@ isc__rdatalist_getclosest(dns_rdataset_t *rdataset, dns_name_t *name, } for (rdataset = ISC_LIST_HEAD(closest->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (rdataset->type == dns_rdatatype_rrsig && rdataset->covers == tneg->type) { tnegsig = rdataset; @@ -392,10 +390,9 @@ isc__rdatalist_getclosest(dns_rdataset_t *rdataset, dns_name_t *name, } void -isc__rdatalist_setownercase(dns_rdataset_t *rdataset, const dns_name_t *name) -{ +isc__rdatalist_setownercase(dns_rdataset_t *rdataset, const dns_name_t *name) { dns_rdatalist_t *rdatalist; - unsigned int i; + unsigned int i; /* * We do not need to worry about label lengths as they are all @@ -418,10 +415,9 @@ isc__rdatalist_setownercase(dns_rdataset_t *rdataset, const dns_name_t *name) } void -isc__rdatalist_getownercase(const dns_rdataset_t *rdataset, dns_name_t *name) -{ +isc__rdatalist_getownercase(const dns_rdataset_t *rdataset, dns_name_t *name) { dns_rdatalist_t *rdatalist; - unsigned int i; + unsigned int i; rdatalist = rdataset->private1; if ((rdatalist->upper[0] & 0x01) == 0) { @@ -432,10 +428,12 @@ isc__rdatalist_getownercase(const dns_rdataset_t *rdataset, dns_name_t *name) * Set the case bit if it does not match the recorded bit. */ if (name->ndata[i] >= 0x61 && name->ndata[i] <= 0x7a && - (rdatalist->upper[i / 8] & (1 << (i % 8))) != 0) { + (rdatalist->upper[i / 8] & (1 << (i % 8))) != 0) + { name->ndata[i] &= ~0x20; /* clear the lower case bit */ } else if (name->ndata[i] >= 0x41 && name->ndata[i] <= 0x5a && - (rdatalist->upper[i / 8] & (1 << (i % 8))) == 0) { + (rdatalist->upper[i / 8] & (1 << (i % 8))) == 0) + { name->ndata[i] |= 0x20; /* set the lower case bit */ } } diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c index 0ed4a29cb8..8f44568a39 100644 --- a/lib/dns/rdataset.c +++ b/lib/dns/rdataset.c @@ -37,8 +37,7 @@ static const char *trustnames[] = { }; const char * -dns_trust_totext(dns_trust_t trust) -{ +dns_trust_totext(dns_trust_t trust) { if (trust >= sizeof(trustnames) / sizeof(*trustnames)) { return ("bad"); } @@ -48,8 +47,7 @@ dns_trust_totext(dns_trust_t trust) #define DNS_RDATASET_COUNT_UNDEFINED UINT32_MAX void -dns_rdataset_init(dns_rdataset_t *rdataset) -{ +dns_rdataset_init(dns_rdataset_t *rdataset) { /* * Make 'rdataset' a valid, disassociated rdataset. */ @@ -77,8 +75,7 @@ dns_rdataset_init(dns_rdataset_t *rdataset) } void -dns_rdataset_invalidate(dns_rdataset_t *rdataset) -{ +dns_rdataset_invalidate(dns_rdataset_t *rdataset) { /* * Invalidate 'rdataset'. */ @@ -103,8 +100,7 @@ dns_rdataset_invalidate(dns_rdataset_t *rdataset) } void -dns_rdataset_disassociate(dns_rdataset_t *rdataset) -{ +dns_rdataset_disassociate(dns_rdataset_t *rdataset) { /* * Disassociate 'rdataset' from its rdata, allowing it to be reused. */ @@ -131,8 +127,7 @@ dns_rdataset_disassociate(dns_rdataset_t *rdataset) } bool -dns_rdataset_isassociated(dns_rdataset_t *rdataset) -{ +dns_rdataset_isassociated(dns_rdataset_t *rdataset) { /* * Is 'rdataset' associated? */ @@ -147,22 +142,19 @@ dns_rdataset_isassociated(dns_rdataset_t *rdataset) } static void -question_disassociate(dns_rdataset_t *rdataset) -{ +question_disassociate(dns_rdataset_t *rdataset) { UNUSED(rdataset); } static isc_result_t -question_cursor(dns_rdataset_t *rdataset) -{ +question_cursor(dns_rdataset_t *rdataset) { UNUSED(rdataset); return (ISC_R_NOMORE); } static void -question_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) -{ +question_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) { /* * This routine should never be called. */ @@ -173,14 +165,12 @@ question_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) } static void -question_clone(dns_rdataset_t *source, dns_rdataset_t *target) -{ +question_clone(dns_rdataset_t *source, dns_rdataset_t *target) { *target = *source; } static unsigned int -question_count(dns_rdataset_t *rdataset) -{ +question_count(dns_rdataset_t *rdataset) { /* * This routine should never be called. */ @@ -211,8 +201,7 @@ static dns_rdatasetmethods_t question_methods = { void dns_rdataset_makequestion(dns_rdataset_t *rdataset, dns_rdataclass_t rdclass, - dns_rdatatype_t type) -{ + dns_rdatatype_t type) { /* * Make 'rdataset' a valid, associated, question rdataset, with a * question class of 'rdclass' and type 'type'. @@ -228,8 +217,7 @@ dns_rdataset_makequestion(dns_rdataset_t *rdataset, dns_rdataclass_t rdclass, } unsigned int -dns_rdataset_count(dns_rdataset_t *rdataset) -{ +dns_rdataset_count(dns_rdataset_t *rdataset) { /* * Return the number of records in 'rdataset'. */ @@ -241,8 +229,7 @@ dns_rdataset_count(dns_rdataset_t *rdataset) } void -dns_rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) -{ +dns_rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) { /* * Make 'target' refer to the same rdataset as 'source'. */ @@ -256,8 +243,7 @@ dns_rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) } isc_result_t -dns_rdataset_first(dns_rdataset_t *rdataset) -{ +dns_rdataset_first(dns_rdataset_t *rdataset) { /* * Move the rdata cursor to the first rdata in the rdataset (if any). */ @@ -269,8 +255,7 @@ dns_rdataset_first(dns_rdataset_t *rdataset) } isc_result_t -dns_rdataset_next(dns_rdataset_t *rdataset) -{ +dns_rdataset_next(dns_rdataset_t *rdataset) { /* * Move the rdata cursor to the next rdata in the rdataset (if any). */ @@ -282,8 +267,7 @@ dns_rdataset_next(dns_rdataset_t *rdataset) } void -dns_rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) -{ +dns_rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) { /* * Make 'rdata' refer to the current rdata. */ @@ -294,27 +278,25 @@ dns_rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) (rdataset->methods->current)(rdataset, rdata); } -#define MAX_SHUFFLE 32 -#define WANT_FIXED(r) (((r)->attributes & DNS_RDATASETATTR_FIXEDORDER) != 0) +#define MAX_SHUFFLE 32 +#define WANT_FIXED(r) (((r)->attributes & DNS_RDATASETATTR_FIXEDORDER) != 0) #define WANT_RANDOM(r) (((r)->attributes & DNS_RDATASETATTR_RANDOMIZE) != 0) #define WANT_CYCLIC(r) (((r)->attributes & DNS_RDATASETATTR_CYCLIC) != 0) struct towire_sort { - int key; + int key; dns_rdata_t *rdata; }; static int -towire_compare(const void *av, const void *bv) -{ +towire_compare(const void *av, const void *bv) { const struct towire_sort *a = (const struct towire_sort *)av; const struct towire_sort *b = (const struct towire_sort *)bv; return (a->key - b->key); } static inline void -swap_rdata(dns_rdata_t *in, unsigned int a, unsigned int b) -{ +swap_rdata(dns_rdata_t *in, unsigned int a, unsigned int b) { dns_rdata_t rdata = in[a]; in[a] = in[b]; in[b] = rdata; @@ -324,23 +306,22 @@ static isc_result_t towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name, dns_compress_t *cctx, isc_buffer_t *target, dns_rdatasetorderfunc_t order, const void *order_arg, bool partial, - unsigned int options, unsigned int *countp, void **state) -{ - isc_region_t r; - isc_result_t result; - unsigned int i, count = 0, added; - isc_buffer_t savedbuffer, rdlen, rrbuffer; - unsigned int headlen; - bool question = false; - bool shuffle = false, sort = false; - bool want_random, want_cyclic; - dns_rdata_t in_fixed[MAX_SHUFFLE]; - dns_rdata_t * in = in_fixed; - struct towire_sort out_fixed[MAX_SHUFFLE]; + unsigned int options, unsigned int *countp, void **state) { + isc_region_t r; + isc_result_t result; + unsigned int i, count = 0, added; + isc_buffer_t savedbuffer, rdlen, rrbuffer; + unsigned int headlen; + bool question = false; + bool shuffle = false, sort = false; + bool want_random, want_cyclic; + dns_rdata_t in_fixed[MAX_SHUFFLE]; + dns_rdata_t *in = in_fixed; + struct towire_sort out_fixed[MAX_SHUFFLE]; struct towire_sort *out = out_fixed; - dns_fixedname_t fixed; - dns_name_t * name; - uint16_t offset; + dns_fixedname_t fixed; + dns_name_t *name; + uint16_t offset; UNUSED(state); @@ -406,7 +387,7 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name, } if ((shuffle || sort)) { - uint32_t seed = 0; + uint32_t seed = 0; unsigned int j = 0; /* @@ -430,7 +411,8 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name, } if (ISC_UNLIKELY(want_cyclic) && - (rdataset->count != DNS_RDATASET_COUNT_UNDEFINED)) { + (rdataset->count != DNS_RDATASET_COUNT_UNDEFINED)) + { j = rdataset->count % count; } @@ -564,23 +546,21 @@ cleanup: } isc_result_t -dns_rdataset_towiresorted(dns_rdataset_t * rdataset, +dns_rdataset_towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name, dns_compress_t *cctx, isc_buffer_t *target, dns_rdatasetorderfunc_t order, const void *order_arg, unsigned int options, - unsigned int *countp) -{ + unsigned int *countp) { return (towiresorted(rdataset, owner_name, cctx, target, order, order_arg, false, options, countp, NULL)); } isc_result_t -dns_rdataset_towirepartial(dns_rdataset_t * rdataset, +dns_rdataset_towirepartial(dns_rdataset_t *rdataset, const dns_name_t *owner_name, dns_compress_t *cctx, isc_buffer_t *target, dns_rdatasetorderfunc_t order, const void *order_arg, unsigned int options, - unsigned int *countp, void **state) -{ + unsigned int *countp, void **state) { REQUIRE(state == NULL); /* XXX remove when implemented */ return (towiresorted(rdataset, owner_name, cctx, target, order, order_arg, true, options, countp, state)); @@ -589,17 +569,15 @@ dns_rdataset_towirepartial(dns_rdataset_t * rdataset, isc_result_t dns_rdataset_towire(dns_rdataset_t *rdataset, const dns_name_t *owner_name, dns_compress_t *cctx, isc_buffer_t *target, - unsigned int options, unsigned int *countp) -{ + unsigned int options, unsigned int *countp) { return (towiresorted(rdataset, owner_name, cctx, target, NULL, NULL, false, options, countp, NULL)); } isc_result_t -dns_rdataset_additionaldata(dns_rdataset_t * rdataset, - dns_additionaldatafunc_t add, void *arg) -{ - dns_rdata_t rdata = DNS_RDATA_INIT; +dns_rdataset_additionaldata(dns_rdataset_t *rdataset, + dns_additionaldatafunc_t add, void *arg) { + dns_rdata_t rdata = DNS_RDATA_INIT; isc_result_t result; /* @@ -632,8 +610,7 @@ dns_rdataset_additionaldata(dns_rdataset_t * rdataset, } isc_result_t -dns_rdataset_addnoqname(dns_rdataset_t *rdataset, dns_name_t *name) -{ +dns_rdataset_addnoqname(dns_rdataset_t *rdataset, dns_name_t *name) { REQUIRE(DNS_RDATASET_VALID(rdataset)); REQUIRE(rdataset->methods != NULL); if (rdataset->methods->addnoqname == NULL) { @@ -644,8 +621,7 @@ dns_rdataset_addnoqname(dns_rdataset_t *rdataset, dns_name_t *name) isc_result_t dns_rdataset_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, - dns_rdataset_t *neg, dns_rdataset_t *negsig) -{ + dns_rdataset_t *neg, dns_rdataset_t *negsig) { REQUIRE(DNS_RDATASET_VALID(rdataset)); REQUIRE(rdataset->methods != NULL); @@ -656,8 +632,7 @@ dns_rdataset_getnoqname(dns_rdataset_t *rdataset, dns_name_t *name, } isc_result_t -dns_rdataset_addclosest(dns_rdataset_t *rdataset, const dns_name_t *name) -{ +dns_rdataset_addclosest(dns_rdataset_t *rdataset, const dns_name_t *name) { REQUIRE(DNS_RDATASET_VALID(rdataset)); REQUIRE(rdataset->methods != NULL); if (rdataset->methods->addclosest == NULL) { @@ -668,8 +643,7 @@ dns_rdataset_addclosest(dns_rdataset_t *rdataset, const dns_name_t *name) isc_result_t dns_rdataset_getclosest(dns_rdataset_t *rdataset, dns_name_t *name, - dns_rdataset_t *neg, dns_rdataset_t *negsig) -{ + dns_rdataset_t *neg, dns_rdataset_t *negsig) { REQUIRE(DNS_RDATASET_VALID(rdataset)); REQUIRE(rdataset->methods != NULL); @@ -680,8 +654,7 @@ dns_rdataset_getclosest(dns_rdataset_t *rdataset, dns_name_t *name, } void -dns_rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust) -{ +dns_rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust) { REQUIRE(DNS_RDATASET_VALID(rdataset)); REQUIRE(rdataset->methods != NULL); @@ -693,8 +666,7 @@ dns_rdataset_settrust(dns_rdataset_t *rdataset, dns_trust_t trust) } void -dns_rdataset_expire(dns_rdataset_t *rdataset) -{ +dns_rdataset_expire(dns_rdataset_t *rdataset) { REQUIRE(DNS_RDATASET_VALID(rdataset)); REQUIRE(rdataset->methods != NULL); @@ -704,8 +676,7 @@ dns_rdataset_expire(dns_rdataset_t *rdataset) } void -dns_rdataset_clearprefetch(dns_rdataset_t *rdataset) -{ +dns_rdataset_clearprefetch(dns_rdataset_t *rdataset) { REQUIRE(DNS_RDATASET_VALID(rdataset)); REQUIRE(rdataset->methods != NULL); @@ -715,8 +686,7 @@ dns_rdataset_clearprefetch(dns_rdataset_t *rdataset) } void -dns_rdataset_setownercase(dns_rdataset_t *rdataset, const dns_name_t *name) -{ +dns_rdataset_setownercase(dns_rdataset_t *rdataset, const dns_name_t *name) { REQUIRE(DNS_RDATASET_VALID(rdataset)); REQUIRE(rdataset->methods != NULL); @@ -726,8 +696,7 @@ dns_rdataset_setownercase(dns_rdataset_t *rdataset, const dns_name_t *name) } void -dns_rdataset_getownercase(const dns_rdataset_t *rdataset, dns_name_t *name) -{ +dns_rdataset_getownercase(const dns_rdataset_t *rdataset, dns_name_t *name) { REQUIRE(DNS_RDATASET_VALID(rdataset)); REQUIRE(rdataset->methods != NULL); @@ -739,8 +708,7 @@ dns_rdataset_getownercase(const dns_rdataset_t *rdataset, dns_name_t *name) void dns_rdataset_trimttl(dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, dns_rdata_rrsig_t *rrsig, isc_stdtime_t now, - bool acceptexpired) -{ + bool acceptexpired) { uint32_t ttl = 0; REQUIRE(DNS_RDATASET_VALID(rdataset)); @@ -752,7 +720,8 @@ dns_rdataset_trimttl(dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, */ if (acceptexpired && (isc_serial_le(rrsig->timeexpire, ((now + 120) & 0xffffffff)) || - isc_serial_le(rrsig->timeexpire, now))) { + isc_serial_le(rrsig->timeexpire, now))) + { ttl = 120; } else if (isc_serial_ge(rrsig->timeexpire, now)) { ttl = rrsig->timeexpire - now; @@ -766,8 +735,7 @@ dns_rdataset_trimttl(dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, isc_result_t dns_rdataset_addglue(dns_rdataset_t *rdataset, dns_dbversion_t *version, - dns_message_t *msg) -{ + dns_message_t *msg) { REQUIRE(DNS_RDATASET_VALID(rdataset)); REQUIRE(rdataset->methods != NULL); REQUIRE(rdataset->type == dns_rdatatype_ns); diff --git a/lib/dns/rdatasetiter.c b/lib/dns/rdatasetiter.c index 992d12a5eb..6408ac2a51 100644 --- a/lib/dns/rdatasetiter.c +++ b/lib/dns/rdatasetiter.c @@ -19,8 +19,7 @@ #include void -dns_rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) -{ +dns_rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) { /* * Destroy '*iteratorp'. */ @@ -34,8 +33,7 @@ dns_rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) } isc_result_t -dns_rdatasetiter_first(dns_rdatasetiter_t *iterator) -{ +dns_rdatasetiter_first(dns_rdatasetiter_t *iterator) { /* * Move the rdataset cursor to the first rdataset at the node (if any). */ @@ -46,8 +44,7 @@ dns_rdatasetiter_first(dns_rdatasetiter_t *iterator) } isc_result_t -dns_rdatasetiter_next(dns_rdatasetiter_t *iterator) -{ +dns_rdatasetiter_next(dns_rdatasetiter_t *iterator) { /* * Move the rdataset cursor to the next rdataset at the node (if any). */ @@ -58,8 +55,8 @@ dns_rdatasetiter_next(dns_rdatasetiter_t *iterator) } void -dns_rdatasetiter_current(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset) -{ +dns_rdatasetiter_current(dns_rdatasetiter_t *iterator, + dns_rdataset_t *rdataset) { /* * Return the current rdataset. */ diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c index 0dd2be15dd..6398283723 100644 --- a/lib/dns/rdataslab.c +++ b/lib/dns/rdataslab.c @@ -67,14 +67,13 @@ */ struct xrdata { - dns_rdata_t rdata; + dns_rdata_t rdata; unsigned int order; }; /*% Note: the "const void *" are just to make qsort happy. */ static int -compare_rdata(const void *p1, const void *p2) -{ +compare_rdata(const void *p1, const void *p2) { const struct xrdata *x1 = p1; const struct xrdata *x2 = p2; return (dns_rdata_compare(&x1->rdata, &x2->rdata)); @@ -83,9 +82,8 @@ compare_rdata(const void *p1, const void *p2) #if DNS_RDATASET_FIXED static void fillin_offsets(unsigned char *offsetbase, unsigned int *offsettable, - unsigned length) -{ - unsigned int i, j; + unsigned length) { + unsigned int i, j; unsigned char *raw; for (i = 0, j = 0; i < length; i++) { @@ -114,15 +112,14 @@ fillin_offsets(unsigned char *offsetbase, unsigned int *offsettable, isc_result_t dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx, - isc_region_t *region, unsigned int reservelen) -{ + isc_region_t *region, unsigned int reservelen) { /* * Use &removed as a sentinal pointer for duplicate * rdata as rdata.data == NULL is valid. */ static unsigned char removed; - struct xrdata * x; - unsigned char * rawbuf; + struct xrdata *x; + unsigned char *rawbuf; #if DNS_RDATASET_FIXED unsigned char *offsetbase; #endif /* if DNS_RDATASET_FIXED */ @@ -338,9 +335,8 @@ free_rdatas: } unsigned int -dns_rdataslab_size(unsigned char *slab, unsigned int reservelen) -{ - unsigned int count, length; +dns_rdataslab_size(unsigned char *slab, unsigned int reservelen) { + unsigned int count, length; unsigned char *current; REQUIRE(slab != NULL); @@ -366,9 +362,8 @@ dns_rdataslab_size(unsigned char *slab, unsigned int reservelen) } unsigned int -dns_rdataslab_count(unsigned char *slab, unsigned int reservelen) -{ - unsigned int count; +dns_rdataslab_count(unsigned char *slab, unsigned int reservelen) { + unsigned int count; unsigned char *current; REQUIRE(slab != NULL); @@ -387,12 +382,11 @@ dns_rdataslab_count(unsigned char *slab, unsigned int reservelen) */ static inline void rdata_from_slab(unsigned char **current, dns_rdataclass_t rdclass, - dns_rdatatype_t type, dns_rdata_t *rdata) -{ + dns_rdatatype_t type, dns_rdata_t *rdata) { unsigned char *tcurrent = *current; - isc_region_t region; - unsigned int length; - bool offline = false; + isc_region_t region; + unsigned int length; + bool offline = false; length = *tcurrent++ * 256; length += *tcurrent++; @@ -425,12 +419,11 @@ rdata_from_slab(unsigned char **current, dns_rdataclass_t rdclass, static inline bool rdata_in_slab(unsigned char *slab, unsigned int reservelen, dns_rdataclass_t rdclass, dns_rdatatype_t type, - dns_rdata_t *rdata) -{ - unsigned int count, i; + dns_rdata_t *rdata) { + unsigned int count, i; unsigned char *current; - dns_rdata_t trdata = DNS_RDATA_INIT; - int n; + dns_rdata_t trdata = DNS_RDATA_INIT; + int n; current = slab + reservelen; count = *current++ * 256; @@ -459,22 +452,21 @@ isc_result_t dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab, unsigned int reservelen, isc_mem_t *mctx, dns_rdataclass_t rdclass, dns_rdatatype_t type, - unsigned int flags, unsigned char **tslabp) -{ + unsigned int flags, unsigned char **tslabp) { unsigned char *ocurrent, *ostart, *ncurrent, *tstart, *tcurrent, *data; - unsigned int ocount, ncount, count, olength, tlength, tcount, length; - dns_rdata_t ordata = DNS_RDATA_INIT; - dns_rdata_t nrdata = DNS_RDATA_INIT; - bool added_something = false; - unsigned int oadded = 0; - unsigned int nadded = 0; - unsigned int nncount = 0; + unsigned int ocount, ncount, count, olength, tlength, tcount, length; + dns_rdata_t ordata = DNS_RDATA_INIT; + dns_rdata_t nrdata = DNS_RDATA_INIT; + bool added_something = false; + unsigned int oadded = 0; + unsigned int nadded = 0; + unsigned int nncount = 0; #if DNS_RDATASET_FIXED - unsigned int oncount; - unsigned int norder = 0; - unsigned int oorder = 0; + unsigned int oncount; + unsigned int norder = 0; + unsigned int oorder = 0; unsigned char *offsetbase; - unsigned int * offsettable; + unsigned int *offsettable; #endif /* if DNS_RDATASET_FIXED */ /* @@ -557,8 +549,8 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab, } while (ncount > 0); ncount = nncount; - if (((flags & DNS_RDATASLAB_EXACT) != 0) && - (tcount != ncount + ocount)) { + if (((flags & DNS_RDATASLAB_EXACT) != 0) && (tcount != ncount + ocount)) + { return (DNS_R_NOTEXACT); } @@ -603,8 +595,8 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab, */ tcurrent += (tcount * 4); - offsettable = - isc_mem_get(mctx, (ocount + oncount) * sizeof(unsigned int)); + offsettable = isc_mem_get(mctx, + (ocount + oncount) * sizeof(unsigned int)); memset(offsettable, 0, (ocount + oncount) * sizeof(unsigned int)); #endif /* if DNS_RDATASET_FIXED */ @@ -695,8 +687,8 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab, do { dns_rdata_reset(&nrdata); #if DNS_RDATASET_FIXED - norder = - ncurrent[2] * 256 + ncurrent[3]; + norder = ncurrent[2] * 256 + + ncurrent[3]; INSIST(norder < oncount); #endif /* if DNS_RDATASET_FIXED */ rdata_from_slab(&ncurrent, rdclass, @@ -725,16 +717,15 @@ isc_result_t dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab, unsigned int reservelen, isc_mem_t *mctx, dns_rdataclass_t rdclass, dns_rdatatype_t type, - unsigned int flags, unsigned char **tslabp) -{ + unsigned int flags, unsigned char **tslabp) { unsigned char *mcurrent, *sstart, *scurrent, *tstart, *tcurrent; - unsigned int mcount, scount, rcount, count, tlength, tcount, i; - dns_rdata_t srdata = DNS_RDATA_INIT; - dns_rdata_t mrdata = DNS_RDATA_INIT; + unsigned int mcount, scount, rcount, count, tlength, tcount, i; + dns_rdata_t srdata = DNS_RDATA_INIT; + dns_rdata_t mrdata = DNS_RDATA_INIT; #if DNS_RDATASET_FIXED unsigned char *offsetbase; - unsigned int * offsettable; - unsigned int order; + unsigned int *offsettable; + unsigned int order; #endif /* if DNS_RDATASET_FIXED */ REQUIRE(tslabp != NULL && *tslabp == NULL); @@ -897,11 +888,10 @@ dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab, bool dns_rdataslab_equal(unsigned char *slab1, unsigned char *slab2, - unsigned int reservelen) -{ + unsigned int reservelen) { unsigned char *current1, *current2; - unsigned int count1, count2; - unsigned int length1, length2; + unsigned int count1, count2; + unsigned int length1, length2; current1 = slab1 + reservelen; count1 = *current1++ * 256; @@ -948,12 +938,11 @@ dns_rdataslab_equal(unsigned char *slab1, unsigned char *slab2, bool dns_rdataslab_equalx(unsigned char *slab1, unsigned char *slab2, unsigned int reservelen, dns_rdataclass_t rdclass, - dns_rdatatype_t type) -{ + dns_rdatatype_t type) { unsigned char *current1, *current2; - unsigned int count1, count2; - dns_rdata_t rdata1 = DNS_RDATA_INIT; - dns_rdata_t rdata2 = DNS_RDATA_INIT; + unsigned int count1, count2; + dns_rdata_t rdata1 = DNS_RDATA_INIT; + dns_rdata_t rdata2 = DNS_RDATA_INIT; current1 = slab1 + reservelen; count1 = *current1++ * 256; diff --git a/lib/dns/request.c b/lib/dns/request.c index 97043d73ea..1805745282 100644 --- a/lib/dns/request.c +++ b/lib/dns/request.c @@ -32,10 +32,10 @@ #include #include -#define REQUESTMGR_MAGIC ISC_MAGIC('R', 'q', 'u', 'M') +#define REQUESTMGR_MAGIC ISC_MAGIC('R', 'q', 'u', 'M') #define VALID_REQUESTMGR(mgr) ISC_MAGIC_VALID(mgr, REQUESTMGR_MAGIC) -#define REQUEST_MAGIC ISC_MAGIC('R', 'q', 'u', '!') +#define REQUEST_MAGIC ISC_MAGIC('R', 'q', 'u', '!') #define VALID_REQUEST(request) ISC_MAGIC_VALID(request, REQUEST_MAGIC) typedef ISC_LIST(dns_request_t) dns_requestlist_t; @@ -44,95 +44,80 @@ typedef ISC_LIST(dns_request_t) dns_requestlist_t; struct dns_requestmgr { unsigned int magic; - isc_mutex_t lock; - isc_mem_t * mctx; + isc_mutex_t lock; + isc_mem_t *mctx; /* locked */ - int32_t eref; - int32_t iref; - isc_timermgr_t * timermgr; - isc_socketmgr_t * socketmgr; - isc_taskmgr_t * taskmgr; + int32_t eref; + int32_t iref; + isc_timermgr_t *timermgr; + isc_socketmgr_t *socketmgr; + isc_taskmgr_t *taskmgr; dns_dispatchmgr_t *dispatchmgr; - dns_dispatch_t * dispatchv4; - dns_dispatch_t * dispatchv6; - bool exiting; - isc_eventlist_t whenshutdown; - unsigned int hash; - isc_mutex_t locks[DNS_REQUEST_NLOCKS]; - dns_requestlist_t requests; + dns_dispatch_t *dispatchv4; + dns_dispatch_t *dispatchv6; + bool exiting; + isc_eventlist_t whenshutdown; + unsigned int hash; + isc_mutex_t locks[DNS_REQUEST_NLOCKS]; + dns_requestlist_t requests; }; struct dns_request { unsigned int magic; unsigned int hash; - isc_mem_t * mctx; - int32_t flags; + isc_mem_t *mctx; + int32_t flags; ISC_LINK(dns_request_t) link; - isc_buffer_t * query; - isc_buffer_t * answer; + isc_buffer_t *query; + isc_buffer_t *answer; dns_requestevent_t *event; - dns_dispatch_t * dispatch; - dns_dispentry_t * dispentry; - isc_timer_t * timer; - dns_requestmgr_t * requestmgr; - isc_buffer_t * tsig; - dns_tsigkey_t * tsigkey; - isc_event_t ctlevent; - bool canceling; /* ctlevent outstanding */ - isc_sockaddr_t destaddr; - unsigned int udpcount; - isc_dscp_t dscp; + dns_dispatch_t *dispatch; + dns_dispentry_t *dispentry; + isc_timer_t *timer; + dns_requestmgr_t *requestmgr; + isc_buffer_t *tsig; + dns_tsigkey_t *tsigkey; + isc_event_t ctlevent; + bool canceling; /* ctlevent outstanding */ + isc_sockaddr_t destaddr; + unsigned int udpcount; + isc_dscp_t dscp; }; #define DNS_REQUEST_F_CONNECTING 0x0001 -#define DNS_REQUEST_F_SENDING 0x0002 -#define DNS_REQUEST_F_CANCELED \ - 0x0004 /*%< ctlevent received, or otherwise \ - * synchronously canceled */ -#define DNS_REQUEST_F_TIMEDOUT 0x0008 /*%< canceled due to a timeout */ -#define DNS_REQUEST_F_TCP 0x0010 /*%< This request used TCP */ -#define DNS_REQUEST_CANCELED(r) (((r)->flags & DNS_REQUEST_F_CANCELED) != 0) +#define DNS_REQUEST_F_SENDING 0x0002 +#define DNS_REQUEST_F_CANCELED \ + 0x0004 /*%< ctlevent received, or otherwise \ + * synchronously canceled */ +#define DNS_REQUEST_F_TIMEDOUT 0x0008 /*%< canceled due to a timeout */ +#define DNS_REQUEST_F_TCP 0x0010 /*%< This request used TCP */ +#define DNS_REQUEST_CANCELED(r) (((r)->flags & DNS_REQUEST_F_CANCELED) != 0) #define DNS_REQUEST_CONNECTING(r) (((r)->flags & DNS_REQUEST_F_CONNECTING) != 0) -#define DNS_REQUEST_SENDING(r) (((r)->flags & DNS_REQUEST_F_SENDING) != 0) -#define DNS_REQUEST_TIMEDOUT(r) (((r)->flags & DNS_REQUEST_F_TIMEDOUT) != 0) +#define DNS_REQUEST_SENDING(r) (((r)->flags & DNS_REQUEST_F_SENDING) != 0) +#define DNS_REQUEST_TIMEDOUT(r) (((r)->flags & DNS_REQUEST_F_TIMEDOUT) != 0) /*** *** 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 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 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 @@ -143,12 +128,11 @@ dns_requestmgr_create(isc_mem_t *mctx, isc_timermgr_t *timermgr, isc_socketmgr_t *socketmgr, isc_taskmgr_t *taskmgr, dns_dispatchmgr_t *dispatchmgr, dns_dispatch_t *dispatchv4, dns_dispatch_t *dispatchv6, - dns_requestmgr_t **requestmgrp) -{ + dns_requestmgr_t **requestmgrp) { dns_requestmgr_t *requestmgr; - isc_socket_t * sock; - int i; - unsigned int dispattr; + isc_socket_t *sock; + int i; + unsigned int dispattr; req_log(ISC_LOG_DEBUG(3), "dns_requestmgr_create"); @@ -204,9 +188,8 @@ dns_requestmgr_create(isc_mem_t *mctx, isc_timermgr_t *timermgr, void dns_requestmgr_whenshutdown(dns_requestmgr_t *requestmgr, isc_task_t *task, - isc_event_t **eventp) -{ - isc_task_t * tclone; + isc_event_t **eventp) { + isc_task_t *tclone; isc_event_t *event; req_log(ISC_LOG_DEBUG(3), "dns_requestmgr_whenshutdown"); @@ -235,8 +218,7 @@ dns_requestmgr_whenshutdown(dns_requestmgr_t *requestmgr, isc_task_t *task, } void -dns_requestmgr_shutdown(dns_requestmgr_t *requestmgr) -{ +dns_requestmgr_shutdown(dns_requestmgr_t *requestmgr) { REQUIRE(VALID_REQUESTMGR(requestmgr)); req_log(ISC_LOG_DEBUG(3), "dns_requestmgr_shutdown: %p", requestmgr); @@ -247,8 +229,7 @@ dns_requestmgr_shutdown(dns_requestmgr_t *requestmgr) } static void -mgr_shutdown(dns_requestmgr_t *requestmgr) -{ +mgr_shutdown(dns_requestmgr_t *requestmgr) { dns_request_t *request; /* @@ -257,7 +238,8 @@ mgr_shutdown(dns_requestmgr_t *requestmgr) if (!requestmgr->exiting) { requestmgr->exiting = true; for (request = ISC_LIST_HEAD(requestmgr->requests); - request != NULL; request = ISC_LIST_NEXT(request, link)) { + request != NULL; request = ISC_LIST_NEXT(request, link)) + { dns_request_cancel(request); } if (requestmgr->iref == 0) { @@ -268,8 +250,7 @@ mgr_shutdown(dns_requestmgr_t *requestmgr) } static void -requestmgr_attach(dns_requestmgr_t *source, dns_requestmgr_t **targetp) -{ +requestmgr_attach(dns_requestmgr_t *source, dns_requestmgr_t **targetp) { /* * Locked by caller. */ @@ -287,10 +268,9 @@ requestmgr_attach(dns_requestmgr_t *source, dns_requestmgr_t **targetp) } static void -requestmgr_detach(dns_requestmgr_t **requestmgrp) -{ +requestmgr_detach(dns_requestmgr_t **requestmgrp) { dns_requestmgr_t *requestmgr; - bool need_destroy = false; + bool need_destroy = false; REQUIRE(requestmgrp != NULL); requestmgr = *requestmgrp; @@ -319,8 +299,7 @@ requestmgr_detach(dns_requestmgr_t **requestmgrp) } void -dns_requestmgr_attach(dns_requestmgr_t *source, dns_requestmgr_t **targetp) -{ +dns_requestmgr_attach(dns_requestmgr_t *source, dns_requestmgr_t **targetp) { REQUIRE(VALID_REQUESTMGR(source)); REQUIRE(targetp != NULL && *targetp == NULL); REQUIRE(!source->exiting); @@ -335,10 +314,9 @@ dns_requestmgr_attach(dns_requestmgr_t *source, dns_requestmgr_t **targetp) } void -dns_requestmgr_detach(dns_requestmgr_t **requestmgrp) -{ +dns_requestmgr_detach(dns_requestmgr_t **requestmgrp) { dns_requestmgr_t *requestmgr; - bool need_destroy = false; + bool need_destroy = false; REQUIRE(requestmgrp != NULL); requestmgr = *requestmgrp; @@ -365,10 +343,9 @@ dns_requestmgr_detach(dns_requestmgr_t **requestmgrp) } static void -send_shutdown_events(dns_requestmgr_t *requestmgr) -{ +send_shutdown_events(dns_requestmgr_t *requestmgr) { isc_event_t *event, *next_event; - isc_task_t * etask; + isc_task_t *etask; req_log(ISC_LOG_DEBUG(3), "send_shutdown_events: %p", requestmgr); @@ -376,7 +353,8 @@ send_shutdown_events(dns_requestmgr_t *requestmgr) * Caller must be holding the manager lock. */ for (event = ISC_LIST_HEAD(requestmgr->whenshutdown); event != NULL; - event = next_event) { + event = next_event) + { next_event = ISC_LIST_NEXT(event, ev_link); ISC_LIST_UNLINK(requestmgr->whenshutdown, event, ev_link); etask = event->ev_sender; @@ -386,8 +364,7 @@ send_shutdown_events(dns_requestmgr_t *requestmgr) } static void -mgr_destroy(dns_requestmgr_t *requestmgr) -{ +mgr_destroy(dns_requestmgr_t *requestmgr) { int i; req_log(ISC_LOG_DEBUG(3), "mgr_destroy"); @@ -411,8 +388,7 @@ mgr_destroy(dns_requestmgr_t *requestmgr) } static unsigned int -mgr_gethash(dns_requestmgr_t *requestmgr) -{ +mgr_gethash(dns_requestmgr_t *requestmgr) { req_log(ISC_LOG_DEBUG(3), "mgr_gethash"); /* * Locked by caller. @@ -423,12 +399,11 @@ mgr_gethash(dns_requestmgr_t *requestmgr) static inline isc_result_t req_send(dns_request_t *request, isc_task_t *task, - const isc_sockaddr_t *address) -{ - isc_region_t r; - isc_socket_t * sock; + const isc_sockaddr_t *address) { + isc_region_t r; + isc_socket_t *sock; isc_socketevent_t *sendevent; - isc_result_t result; + isc_result_t result; req_log(ISC_LOG_DEBUG(3), "req_send: request %p", request); @@ -455,15 +430,14 @@ req_send(dns_request_t *request, isc_task_t *task, } request->flags |= DNS_REQUEST_F_SENDING; - result = - isc_socket_sendto2(sock, &r, task, address, NULL, sendevent, 0); + result = isc_socket_sendto2(sock, &r, task, address, NULL, sendevent, + 0); INSIST(result == ISC_R_SUCCESS); return (result); } static isc_result_t -new_request(isc_mem_t *mctx, dns_request_t **requestp) -{ +new_request(isc_mem_t *mctx, dns_request_t **requestp) { dns_request_t *request; request = isc_mem_get(mctx, sizeof(*request)); @@ -499,20 +473,20 @@ new_request(isc_mem_t *mctx, dns_request_t **requestp) } static bool -isblackholed(dns_dispatchmgr_t *dispatchmgr, const isc_sockaddr_t *destaddr) -{ - dns_acl_t * blackhole; +isblackholed(dns_dispatchmgr_t *dispatchmgr, const isc_sockaddr_t *destaddr) { + dns_acl_t *blackhole; isc_netaddr_t netaddr; - int match; - bool drop = false; - char netaddrstr[ISC_NETADDR_FORMATSIZE]; + int match; + bool drop = false; + char netaddrstr[ISC_NETADDR_FORMATSIZE]; blackhole = dns_dispatchmgr_getblackhole(dispatchmgr); if (blackhole != NULL) { isc_netaddr_fromsockaddr(&netaddr, destaddr); if (dns_acl_match(&netaddr, NULL, blackhole, NULL, &match, NULL) == ISC_R_SUCCESS && - match > 0) { + match > 0) + { drop = true; } } @@ -527,12 +501,11 @@ static isc_result_t create_tcp_dispatch(bool newtcp, bool share, dns_requestmgr_t *requestmgr, const isc_sockaddr_t *srcaddr, const isc_sockaddr_t *destaddr, isc_dscp_t dscp, - bool *connected, dns_dispatch_t **dispatchp) -{ - isc_result_t result; - isc_socket_t * sock = NULL; + bool *connected, dns_dispatch_t **dispatchp) { + isc_result_t result; + isc_socket_t *sock = NULL; isc_sockaddr_t src; - unsigned int attrs; + unsigned int attrs; isc_sockaddr_t bind_any; if (!newtcp && share) { @@ -604,10 +577,9 @@ cleanup: static isc_result_t find_udp_dispatch(dns_requestmgr_t *requestmgr, const isc_sockaddr_t *srcaddr, - const isc_sockaddr_t *destaddr, dns_dispatch_t **dispatchp) -{ + const isc_sockaddr_t *destaddr, dns_dispatch_t **dispatchp) { dns_dispatch_t *disp = NULL; - unsigned int attrs, attrmask; + unsigned int attrs, attrmask; if (srcaddr == NULL) { switch (isc_sockaddr_pf(destaddr)) { @@ -656,8 +628,7 @@ find_udp_dispatch(dns_requestmgr_t *requestmgr, const isc_sockaddr_t *srcaddr, static isc_result_t get_dispatch(bool tcp, bool newtcp, bool share, dns_requestmgr_t *requestmgr, const isc_sockaddr_t *srcaddr, const isc_sockaddr_t *destaddr, - isc_dscp_t dscp, bool *connected, dns_dispatch_t **dispatchp) -{ + isc_dscp_t dscp, bool *connected, dns_dispatch_t **dispatchp) { isc_result_t result; if (tcp) { @@ -672,11 +643,10 @@ get_dispatch(bool tcp, bool newtcp, bool share, dns_requestmgr_t *requestmgr, } static isc_result_t -set_timer(isc_timer_t *timer, unsigned int timeout, unsigned int udpresend) -{ - isc_time_t expires; - isc_interval_t interval; - isc_result_t result; +set_timer(isc_timer_t *timer, unsigned int timeout, unsigned int udpresend) { + isc_time_t expires; + isc_interval_t interval; + isc_result_t result; isc_timertype_t timertype; isc_interval_set(&interval, timeout, 0); @@ -698,20 +668,19 @@ dns_request_createraw(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf, unsigned int options, unsigned int timeout, unsigned int udptimeout, unsigned int udpretries, isc_task_t *task, isc_taskaction_t action, void *arg, - dns_request_t **requestp) -{ - dns_request_t * request = NULL; - isc_task_t * tclone = NULL; - isc_socket_t * sock = NULL; - isc_result_t result; - isc_mem_t * mctx; + dns_request_t **requestp) { + dns_request_t *request = NULL; + isc_task_t *tclone = NULL; + isc_socket_t *sock = NULL; + isc_result_t result; + isc_mem_t *mctx; dns_messageid_t id; - bool tcp = false; - bool newtcp = false; - bool share = false; - isc_region_t r; - bool connected = false; - unsigned int dispopt = 0; + bool tcp = false; + bool newtcp = false; + bool share = false; + isc_region_t r; + bool connected = false; + unsigned int dispopt = 0; REQUIRE(VALID_REQUESTMGR(requestmgr)); REQUIRE(msgbuf != NULL); @@ -875,8 +844,8 @@ isc_result_t dns_request_create(dns_requestmgr_t *requestmgr, dns_message_t *message, const isc_sockaddr_t *address, unsigned int options, dns_tsigkey_t *key, unsigned int timeout, isc_task_t *task, - isc_taskaction_t action, void *arg, dns_request_t **requestp) -{ + isc_taskaction_t action, void *arg, + dns_request_t **requestp) { return (dns_request_createvia(requestmgr, message, NULL, address, -1, options, key, timeout, 0, 0, task, action, arg, requestp)); @@ -890,18 +859,17 @@ dns_request_createvia(dns_requestmgr_t *requestmgr, dns_message_t *message, unsigned int timeout, unsigned int udptimeout, unsigned int udpretries, isc_task_t *task, isc_taskaction_t action, void *arg, - dns_request_t **requestp) -{ - dns_request_t * request = NULL; - isc_task_t * tclone = NULL; - isc_socket_t * sock = NULL; - isc_result_t result; - isc_mem_t * mctx; + dns_request_t **requestp) { + dns_request_t *request = NULL; + isc_task_t *tclone = NULL; + isc_socket_t *sock = NULL; + isc_result_t result; + isc_mem_t *mctx; dns_messageid_t id; - bool tcp; - bool share; - bool settsigkey = true; - bool connected = false; + bool tcp; + bool share; + bool settsigkey = true; + bool connected = false; REQUIRE(VALID_REQUESTMGR(requestmgr)); REQUIRE(message != NULL); @@ -1059,15 +1027,14 @@ cleanup: static isc_result_t req_render(dns_message_t *message, isc_buffer_t **bufferp, unsigned int options, - isc_mem_t *mctx) -{ - isc_buffer_t * buf1 = NULL; - isc_buffer_t * buf2 = NULL; - isc_result_t result; - isc_region_t r; - bool tcp = false; + isc_mem_t *mctx) { + isc_buffer_t *buf1 = NULL; + isc_buffer_t *buf2 = NULL; + isc_result_t result; + isc_region_t r; + bool tcp = false; dns_compress_t cctx; - bool cleanup_cctx = false; + bool cleanup_cctx = false; REQUIRE(bufferp != NULL && *bufferp == NULL); @@ -1168,8 +1135,7 @@ cleanup: * 'request' is locked by the caller. */ static void -send_if_done(dns_request_t *request, isc_result_t result) -{ +send_if_done(dns_request_t *request, isc_result_t result) { if (request->event != NULL && !request->canceling) { req_sendevent(request, result); } @@ -1179,8 +1145,7 @@ send_if_done(dns_request_t *request, isc_result_t result) * Handle the control event. */ static void -do_cancel(isc_task_t *task, isc_event_t *event) -{ +do_cancel(isc_task_t *task, isc_event_t *event) { dns_request_t *request = event->ev_arg; UNUSED(task); INSIST(event->ev_type == DNS_EVENT_REQUESTCONTROL); @@ -1194,8 +1159,7 @@ do_cancel(isc_task_t *task, isc_event_t *event) } void -dns_request_cancel(dns_request_t *request) -{ +dns_request_cancel(dns_request_t *request) { REQUIRE(VALID_REQUEST(request)); req_log(ISC_LOG_DEBUG(3), "dns_request_cancel: request %p", request); @@ -1213,8 +1177,7 @@ dns_request_cancel(dns_request_t *request) isc_result_t dns_request_getresponse(dns_request_t *request, dns_message_t *message, - unsigned int options) -{ + unsigned int options) { isc_result_t result; REQUIRE(VALID_REQUEST(request)); @@ -1242,24 +1205,21 @@ dns_request_getresponse(dns_request_t *request, dns_message_t *message, } isc_buffer_t * -dns_request_getanswer(dns_request_t *request) -{ +dns_request_getanswer(dns_request_t *request) { REQUIRE(VALID_REQUEST(request)); return (request->answer); } bool -dns_request_usedtcp(dns_request_t *request) -{ +dns_request_usedtcp(dns_request_t *request) { REQUIRE(VALID_REQUEST(request)); return ((request->flags & DNS_REQUEST_F_TCP) != 0); } void -dns_request_destroy(dns_request_t **requestp) -{ +dns_request_destroy(dns_request_t **requestp) { dns_request_t *request; REQUIRE(requestp != NULL && VALID_REQUEST(*requestp)); @@ -1294,9 +1254,8 @@ dns_request_destroy(dns_request_t **requestp) ***/ static isc_socket_t * -req_getsocket(dns_request_t *request) -{ - unsigned int dispattr; +req_getsocket(dns_request_t *request) { + unsigned int dispattr; isc_socket_t *sock; dispattr = dns_dispatch_getattributes(request->dispatch); @@ -1311,11 +1270,10 @@ req_getsocket(dns_request_t *request) } static void -req_connected(isc_task_t *task, isc_event_t *event) -{ +req_connected(isc_task_t *task, isc_event_t *event) { isc_socketevent_t *sevent = (isc_socketevent_t *)event; - isc_result_t result; - dns_request_t * request = event->ev_arg; + isc_result_t result; + dns_request_t *request = event->ev_arg; REQUIRE(event->ev_type == ISC_SOCKEVENT_CONNECT); REQUIRE(VALID_REQUEST(request)); @@ -1352,10 +1310,9 @@ req_connected(isc_task_t *task, isc_event_t *event) } static void -req_senddone(isc_task_t *task, isc_event_t *event) -{ +req_senddone(isc_task_t *task, isc_event_t *event) { isc_socketevent_t *sevent = (isc_socketevent_t *)event; - dns_request_t * request = event->ev_arg; + dns_request_t *request = event->ev_arg; REQUIRE(event->ev_type == ISC_SOCKEVENT_SENDDONE); REQUIRE(VALID_REQUEST(request)); @@ -1387,12 +1344,11 @@ req_senddone(isc_task_t *task, isc_event_t *event) } static void -req_response(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result; - dns_request_t * request = event->ev_arg; +req_response(isc_task_t *task, isc_event_t *event) { + isc_result_t result; + dns_request_t *request = event->ev_arg; dns_dispatchevent_t *devent = (dns_dispatchevent_t *)event; - isc_region_t r; + isc_region_t r; REQUIRE(VALID_REQUEST(request)); REQUIRE(event->ev_type == DNS_EVENT_DISPATCH); @@ -1431,10 +1387,9 @@ done: } static void -req_timeout(isc_task_t *task, isc_event_t *event) -{ +req_timeout(isc_task_t *task, isc_event_t *event) { dns_request_t *request = event->ev_arg; - isc_result_t result; + isc_result_t result; REQUIRE(VALID_REQUEST(request)); @@ -1460,8 +1415,7 @@ req_timeout(isc_task_t *task, isc_event_t *event) } static void -req_sendevent(dns_request_t *request, isc_result_t result) -{ +req_sendevent(dns_request_t *request, isc_result_t result) { isc_task_t *task; REQUIRE(VALID_REQUEST(request)); @@ -1478,8 +1432,7 @@ req_sendevent(dns_request_t *request, isc_result_t result) } static void -req_destroy(dns_request_t *request) -{ +req_destroy(dns_request_t *request) { REQUIRE(VALID_REQUEST(request)); req_log(ISC_LOG_DEBUG(3), "req_destroy: request %p", request); @@ -1519,10 +1472,9 @@ req_destroy(dns_request_t *request) * Stop the current request. Must be called from the request's task. */ static void -req_cancel(dns_request_t *request) -{ +req_cancel(dns_request_t *request) { isc_socket_t *sock; - unsigned int dispattr; + unsigned int dispattr; REQUIRE(VALID_REQUEST(request)); @@ -1561,8 +1513,7 @@ req_cancel(dns_request_t *request) } static void -req_log(int level, const char *fmt, ...) -{ +req_log(int level, const char *fmt, ...) { va_list ap; va_start(ap, fmt); diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index c618d8cd3b..91af980cfd 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -150,12 +150,12 @@ } while (0) #endif /* WANT_QUERYTRACE */ -#define US_PER_SEC 1000000U +#define US_PER_SEC 1000000U #define US_PER_MSEC 1000U /* * The maximum time we will wait for a single query. */ -#define MAX_SINGLE_QUERY_TIMEOUT 9000U +#define MAX_SINGLE_QUERY_TIMEOUT 9000U #define MAX_SINGLE_QUERY_TIMEOUT_US (MAX_SINGLE_QUERY_TIMEOUT * US_PER_MSEC) /* @@ -208,46 +208,46 @@ typedef struct fetchctx fetchctx_t; typedef struct query { /* Locked by task event serialization. */ - unsigned int magic; - fetchctx_t * fctx; - isc_mem_t * mctx; + unsigned int magic; + fetchctx_t *fctx; + isc_mem_t *mctx; dns_dispatchmgr_t *dispatchmgr; - dns_dispatch_t * dispatch; - bool exclusivesocket; + dns_dispatch_t *dispatch; + bool exclusivesocket; dns_adbaddrinfo_t *addrinfo; - isc_socket_t * tcpsocket; - isc_time_t start; - dns_messageid_t id; - dns_dispentry_t * dispentry; + isc_socket_t *tcpsocket; + isc_time_t start; + dns_messageid_t id; + dns_dispentry_t *dispentry; ISC_LINK(struct query) link; - isc_buffer_t buffer; - isc_buffer_t * tsig; - dns_tsigkey_t * tsigkey; - isc_socketevent_t sendevent; - isc_dscp_t dscp; - int ednsversion; - unsigned int options; + isc_buffer_t buffer; + isc_buffer_t *tsig; + dns_tsigkey_t *tsigkey; + isc_socketevent_t sendevent; + isc_dscp_t dscp; + int ednsversion; + unsigned int options; isc_sockeventattr_t attributes; - unsigned int sends; - unsigned int connects; - unsigned int udpsize; - unsigned char data[512]; + unsigned int sends; + unsigned int connects; + unsigned int udpsize; + unsigned char data[512]; } resquery_t; struct tried { isc_sockaddr_t addr; - unsigned int count; + unsigned int count; ISC_LINK(struct tried) link; }; -#define QUERY_MAGIC ISC_MAGIC('Q', '!', '!', '!') +#define QUERY_MAGIC ISC_MAGIC('Q', '!', '!', '!') #define VALID_QUERY(query) ISC_MAGIC_VALID(query, QUERY_MAGIC) #define RESQUERY_ATTR_CANCELED 0x02 #define RESQUERY_CONNECTING(q) ((q)->connects > 0) -#define RESQUERY_CANCELED(q) (((q)->attributes & RESQUERY_ATTR_CANCELED) != 0) -#define RESQUERY_SENDING(q) ((q)->sends > 0) +#define RESQUERY_CANCELED(q) (((q)->attributes & RESQUERY_ATTR_CANCELED) != 0) +#define RESQUERY_SENDING(q) ((q)->sends > 0) typedef enum { fetchstate_init = 0, /*%< Start event has not run yet. */ @@ -264,68 +264,68 @@ typedef enum { struct fetchctx { /*% Not locked. */ - unsigned int magic; + unsigned int magic; dns_resolver_t *res; - dns_name_t name; + dns_name_t name; dns_rdatatype_t type; - unsigned int options; - unsigned int bucketnum; - unsigned int dbucketnum; - char * info; - isc_mem_t * mctx; - isc_stdtime_t now; + unsigned int options; + unsigned int bucketnum; + unsigned int dbucketnum; + char *info; + isc_mem_t *mctx; + isc_stdtime_t now; /* Atomic */ isc_refcount_t references; /*% Locked by appropriate bucket lock. */ - fetchstate state; - bool want_shutdown; - bool cloned; - bool spilled; + fetchstate state; + bool want_shutdown; + bool cloned; + bool spilled; isc_event_t control_event; ISC_LINK(struct fetchctx) link; ISC_LIST(dns_fetchevent_t) events; /*% Locked by task event serialization. */ - dns_name_t domain; - dns_rdataset_t nameservers; + dns_name_t domain; + dns_rdataset_t nameservers; atomic_uint_fast32_t attributes; - isc_timer_t * timer; - isc_time_t expires; - isc_interval_t interval; - dns_message_t * qmessage; - dns_message_t * rmessage; + isc_timer_t *timer; + isc_time_t expires; + isc_interval_t interval; + dns_message_t *qmessage; + dns_message_t *rmessage; ISC_LIST(resquery_t) queries; - dns_adbfindlist_t finds; - dns_adbfind_t * find; - dns_adbfindlist_t altfinds; - dns_adbfind_t * altfind; + dns_adbfindlist_t finds; + dns_adbfind_t *find; + dns_adbfindlist_t altfinds; + dns_adbfind_t *altfind; dns_adbaddrinfolist_t forwaddrs; dns_adbaddrinfolist_t altaddrs; - dns_forwarderlist_t forwarders; - dns_fwdpolicy_t fwdpolicy; - isc_sockaddrlist_t bad; + dns_forwarderlist_t forwarders; + dns_fwdpolicy_t fwdpolicy; + isc_sockaddrlist_t bad; ISC_LIST(struct tried) edns; ISC_LIST(struct tried) edns512; isc_sockaddrlist_t bad_edns; - dns_validator_t * validator; + dns_validator_t *validator; ISC_LIST(dns_validator_t) validators; - dns_db_t * cache; - dns_adb_t * adb; - bool ns_ttl_ok; - uint32_t ns_ttl; - isc_counter_t * qc; - bool minimized; - unsigned int qmin_labels; - isc_result_t qmin_warning; - bool ip6arpaskip; - bool forwarding; - dns_name_t qminname; + dns_db_t *cache; + dns_adb_t *adb; + bool ns_ttl_ok; + uint32_t ns_ttl; + isc_counter_t *qc; + bool minimized; + unsigned int qmin_labels; + isc_result_t qmin_warning; + bool ip6arpaskip; + bool forwarding; + dns_name_t qminname; dns_rdatatype_t qmintype; - dns_fetch_t * qminfetch; - dns_rdataset_t qminrrset; - dns_name_t qmindcname; + dns_fetch_t *qminfetch; + dns_rdataset_t qminrrset; + dns_name_t qmindcname; /*% * The number of events we're waiting for. @@ -352,8 +352,8 @@ struct fetchctx { /*% * Look aside state for DS lookups. */ - dns_name_t nsname; - dns_fetch_t * nsfetch; + dns_name_t nsname; + dns_fetch_t *nsfetch; dns_rdataset_t nsrrset; /*% @@ -376,40 +376,40 @@ struct fetchctx { /*% * Fetch-local statistics for detailed logging. */ - isc_result_t result; /*%< fetch result */ - isc_result_t vresult; /*%< validation result */ - int exitline; - isc_time_t start; - uint64_t duration; - bool logged; - unsigned int querysent; - unsigned int referrals; - unsigned int lamecount; - unsigned int quotacount; - unsigned int neterr; - unsigned int badresp; - unsigned int adberr; - unsigned int findfail; - unsigned int valfail; - bool timeout; - dns_adbaddrinfo_t * addrinfo; + isc_result_t result; /*%< fetch result */ + isc_result_t vresult; /*%< validation result */ + int exitline; + isc_time_t start; + uint64_t duration; + bool logged; + unsigned int querysent; + unsigned int referrals; + unsigned int lamecount; + unsigned int quotacount; + unsigned int neterr; + unsigned int badresp; + unsigned int adberr; + unsigned int findfail; + unsigned int valfail; + bool timeout; + dns_adbaddrinfo_t *addrinfo; const isc_sockaddr_t *client; - dns_messageid_t id; - unsigned int depth; + dns_messageid_t id; + unsigned int depth; }; -#define FCTX_MAGIC ISC_MAGIC('F', '!', '!', '!') +#define FCTX_MAGIC ISC_MAGIC('F', '!', '!', '!') #define VALID_FCTX(fctx) ISC_MAGIC_VALID(fctx, FCTX_MAGIC) -#define FCTX_ATTR_HAVEANSWER 0x0001 -#define FCTX_ATTR_GLUING 0x0002 -#define FCTX_ATTR_ADDRWAIT 0x0004 +#define FCTX_ATTR_HAVEANSWER 0x0001 +#define FCTX_ATTR_GLUING 0x0002 +#define FCTX_ATTR_ADDRWAIT 0x0004 #define FCTX_ATTR_SHUTTINGDOWN 0x0008 /* Bucket lock */ -#define FCTX_ATTR_WANTCACHE 0x0010 -#define FCTX_ATTR_WANTNCACHE 0x0020 -#define FCTX_ATTR_NEEDEDNS0 0x0040 -#define FCTX_ATTR_TRIEDFIND 0x0080 -#define FCTX_ATTR_TRIEDALT 0x0100 +#define FCTX_ATTR_WANTCACHE 0x0010 +#define FCTX_ATTR_WANTNCACHE 0x0020 +#define FCTX_ATTR_NEEDEDNS0 0x0040 +#define FCTX_ATTR_TRIEDFIND 0x0080 +#define FCTX_ATTR_TRIEDALT 0x0100 #define HAVE_ANSWER(f) \ ((atomic_load_acquire(&(f)->attributes) & FCTX_ATTR_HAVEANSWER) != 0) @@ -435,16 +435,16 @@ struct fetchctx { typedef struct { dns_adbaddrinfo_t *addrinfo; - fetchctx_t * fctx; + fetchctx_t *fctx; } dns_valarg_t; struct dns_fetch { unsigned int magic; - isc_mem_t * mctx; + isc_mem_t *mctx; fetchctx_t *private; }; -#define DNS_FETCH_MAGIC ISC_MAGIC('F', 't', 'c', 'h') +#define DNS_FETCH_MAGIC ISC_MAGIC('F', 't', 'c', 'h') #define DNS_FETCH_VALID(fetch) ISC_MAGIC_VALID(fetch, DNS_FETCH_MAGIC) typedef struct fctxbucket { @@ -452,23 +452,23 @@ typedef struct fctxbucket { isc_mutex_t lock; ISC_LIST(fetchctx_t) fctxs; atomic_bool exiting; - isc_mem_t * mctx; + isc_mem_t *mctx; } fctxbucket_t; typedef struct fctxcount fctxcount_t; struct fctxcount { dns_fixedname_t fdname; - dns_name_t * domain; - uint32_t count; - uint32_t allowed; - uint32_t dropped; - isc_stdtime_t logged; + dns_name_t *domain; + uint32_t count; + uint32_t allowed; + uint32_t dropped; + isc_stdtime_t logged; ISC_LINK(fctxcount_t) link; }; typedef struct zonebucket { isc_mutex_t lock; - isc_mem_t * mctx; + isc_mem_t *mctx; ISC_LIST(fctxcount_t) list; } zonebucket_t; @@ -478,7 +478,7 @@ typedef struct alternate { isc_sockaddr_t addr; struct { dns_name_t name; - in_port_t port; + in_port_t port; } _n; } _u; ISC_LINK(struct alternate) link; @@ -486,28 +486,28 @@ typedef struct alternate { struct dns_resolver { /* Unlocked. */ - unsigned int magic; - isc_mem_t * mctx; - isc_mutex_t lock; - isc_mutex_t primelock; - dns_rdataclass_t rdclass; - isc_socketmgr_t * socketmgr; - isc_timermgr_t * timermgr; - isc_taskmgr_t * taskmgr; - dns_view_t * view; - bool frozen; - unsigned int options; + unsigned int magic; + isc_mem_t *mctx; + isc_mutex_t lock; + isc_mutex_t primelock; + dns_rdataclass_t rdclass; + isc_socketmgr_t *socketmgr; + isc_timermgr_t *timermgr; + isc_taskmgr_t *taskmgr; + dns_view_t *view; + bool frozen; + unsigned int options; dns_dispatchmgr_t *dispatchmgr; dns_dispatchset_t *dispatches4; - bool exclusivev4; + bool exclusivev4; dns_dispatchset_t *dispatches6; - isc_dscp_t querydscp4; - isc_dscp_t querydscp6; - bool exclusivev6; - unsigned int nbuckets; - fctxbucket_t * buckets; - zonebucket_t * dbuckets; - uint32_t lame_ttl; + isc_dscp_t querydscp4; + isc_dscp_t querydscp6; + bool exclusivev6; + unsigned int nbuckets; + fctxbucket_t *buckets; + zonebucket_t *dbuckets; + uint32_t lame_ttl; ISC_LIST(alternate_t) alternates; uint16_t udpsize; #if USE_ALGLOCK @@ -518,11 +518,11 @@ struct dns_resolver { #if USE_MBSLOCK isc_rwlock_t mbslock; #endif /* if USE_MBSLOCK */ - dns_rbt_t * mustbesecure; + dns_rbt_t *mustbesecure; unsigned int spillatmax; unsigned int spillatmin; isc_timer_t *spillattimer; - bool zero_no_soa_ttl; + bool zero_no_soa_ttl; unsigned int query_timeout; unsigned int maxdepth; unsigned int maxqueries; @@ -533,15 +533,15 @@ struct dns_resolver { unsigned int nonbackofftries; /* Atomic */ - isc_refcount_t references; + isc_refcount_t references; atomic_uint_fast32_t zspill; /* fetches-per-zone */ - atomic_bool exiting; + atomic_bool exiting; /* Locked by lock. */ isc_eventlist_t whenshutdown; - unsigned int activebuckets; - bool priming; - unsigned int spillat; /* clients-per-query */ + unsigned int activebuckets; + bool priming; + unsigned int spillat; /* clients-per-query */ dns_badcache_t *badcache; /* Bad cache. */ @@ -552,24 +552,24 @@ struct dns_resolver { atomic_uint_fast32_t nfctx; }; -#define RES_MAGIC ISC_MAGIC('R', 'e', 's', '!') +#define RES_MAGIC ISC_MAGIC('R', 'e', 's', '!') #define VALID_RESOLVER(res) ISC_MAGIC_VALID(res, RES_MAGIC) /*% * Private addrinfo flags. These must not conflict with DNS_FETCHOPT_NOEDNS0 * (0x008) which we also use as an addrinfo flag. */ -#define FCTX_ADDRINFO_MARK 0x00001 +#define FCTX_ADDRINFO_MARK 0x00001 #define FCTX_ADDRINFO_FORWARDER 0x01000 -#define FCTX_ADDRINFO_EDNSOK 0x04000 -#define FCTX_ADDRINFO_NOCOOKIE 0x08000 +#define FCTX_ADDRINFO_EDNSOK 0x04000 +#define FCTX_ADDRINFO_NOCOOKIE 0x08000 #define FCTX_ADDRINFO_BADCOOKIE 0x10000 -#define UNMARKED(a) (((a)->flags & FCTX_ADDRINFO_MARK) == 0) +#define UNMARKED(a) (((a)->flags & FCTX_ADDRINFO_MARK) == 0) #define ISFORWARDER(a) (((a)->flags & FCTX_ADDRINFO_FORWARDER) != 0) -#define NOCOOKIE(a) (((a)->flags & FCTX_ADDRINFO_NOCOOKIE) != 0) -#define EDNSOK(a) (((a)->flags & FCTX_ADDRINFO_EDNSOK) != 0) -#define BADCOOKIE(a) (((a)->flags & FCTX_ADDRINFO_BADCOOKIE) != 0) +#define NOCOOKIE(a) (((a)->flags & FCTX_ADDRINFO_NOCOOKIE) != 0) +#define EDNSOK(a) (((a)->flags & FCTX_ADDRINFO_EDNSOK) != 0) +#define BADCOOKIE(a) (((a)->flags & FCTX_ADDRINFO_BADCOOKIE) != 0) #define NXDOMAIN(r) (((r)->attributes & DNS_RDATASETATTR_NXDOMAIN) != 0) #define NEGATIVE(r) (((r)->attributes & DNS_RDATASETATTR_NEGATIVE) != 0) @@ -583,61 +583,45 @@ struct dns_resolver { #ifdef ENABLE_AFL bool dns_fuzzing_resolver = false; void -dns_resolver_setfuzzing() -{ +dns_resolver_setfuzzing() { dns_fuzzing_resolver = true; } #endif /* ifdef ENABLE_AFL */ -static unsigned char ip6_arpa_data[] = "\003IP6\004ARPA"; -static unsigned char ip6_arpa_offsets[] = { 0, 4, 9 }; -static const dns_name_t ip6_arpa = - DNS_NAME_INITABSOLUTE(ip6_arpa_data, ip6_arpa_offsets); +static unsigned char ip6_arpa_data[] = "\003IP6\004ARPA"; +static unsigned char ip6_arpa_offsets[] = { 0, 4, 9 }; +static const dns_name_t ip6_arpa = DNS_NAME_INITABSOLUTE(ip6_arpa_data, + ip6_arpa_offsets); -static unsigned char underscore_data[] = "\001_"; -static unsigned char underscore_offsets[] = { 0 }; +static unsigned char underscore_data[] = "\001_"; +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 @@ -707,21 +691,21 @@ resume_qmin(isc_task_t *task, isc_event_t *event); */ typedef struct respctx { - isc_task_t * task; + isc_task_t *task; dns_dispatchevent_t *devent; - resquery_t * query; - fetchctx_t * fctx; - isc_result_t result; - unsigned int retryopts; /* updated options to pass to - * fctx_query() when resending */ + resquery_t *query; + fetchctx_t *fctx; + isc_result_t result; + unsigned int retryopts; /* updated options to pass to + * fctx_query() when resending */ - dns_rdatatype_t type; /* type being sought (set to - * ANY if qtype was SIG or RRSIG) */ - bool aa; /* authoritative answer? */ - dns_trust_t trust; /* answer trust level */ - bool chaining; /* CNAME/DNAME processing? */ - bool next_server; /* give up, try the next server - * */ + dns_rdatatype_t type; /* type being sought (set to + * ANY if qtype was SIG or RRSIG) */ + bool aa; /* authoritative answer? */ + dns_trust_t trust; /* answer trust level */ + bool chaining; /* CNAME/DNAME processing? */ + bool next_server; /* give up, try the next server + * */ badnstype_t broken_type; /* type of name server problem * */ @@ -741,24 +725,24 @@ typedef struct respctx { bool negative; /* is this a negative response? */ isc_stdtime_t now; /* time info */ - isc_time_t tnow; - isc_time_t * finish; + isc_time_t tnow; + isc_time_t *finish; unsigned int dname_labels; unsigned int domain_labels; /* range of permissible number * of * labels in a DNAME */ - dns_name_t * aname; /* answer name */ + dns_name_t *aname; /* answer name */ dns_rdataset_t *ardataset; /* answer rdataset */ - dns_name_t * cname; /* CNAME name */ + dns_name_t *cname; /* CNAME name */ dns_rdataset_t *crdataset; /* CNAME rdataset */ - dns_name_t * dname; /* DNAME name */ + dns_name_t *dname; /* DNAME name */ dns_rdataset_t *drdataset; /* DNAME rdataset */ - dns_name_t * ns_name; /* NS name */ + dns_name_t *ns_name; /* NS name */ dns_rdataset_t *ns_rdataset; /* NS rdataset */ dns_name_t *soa_name; /* SOA name in a negative answer */ @@ -772,109 +756,79 @@ 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. */ static inline void -inc_stats(dns_resolver_t *res, isc_statscounter_t counter) -{ +inc_stats(dns_resolver_t *res, isc_statscounter_t counter) { if (res->view->resstats != NULL) { isc_stats_increment(res->view->resstats, counter); } } static inline void -dec_stats(dns_resolver_t *res, isc_statscounter_t counter) -{ +dec_stats(dns_resolver_t *res, isc_statscounter_t counter) { if (res->view->resstats != NULL) { isc_stats_decrement(res->view->resstats, counter); } @@ -884,11 +838,10 @@ static isc_result_t valcreate(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, dns_name_t *name, dns_rdatatype_t type, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, unsigned int valoptions, - isc_task_t *task) -{ + isc_task_t *task) { dns_validator_t *validator = NULL; - dns_valarg_t * valarg; - isc_result_t result; + dns_valarg_t *valarg; + isc_result_t result; valarg = isc_mem_get(fctx->mctx, sizeof(*valarg)); @@ -918,17 +871,17 @@ valcreate(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, dns_name_t *name, } static bool -rrsig_fromchildzone(fetchctx_t *fctx, dns_rdataset_t *rdataset) -{ - dns_namereln_t namereln; +rrsig_fromchildzone(fetchctx_t *fctx, dns_rdataset_t *rdataset) { + dns_namereln_t namereln; dns_rdata_rrsig_t rrsig; - dns_rdata_t rdata = DNS_RDATA_INIT; - int order; - isc_result_t result; - unsigned int labels; + dns_rdata_t rdata = DNS_RDATA_INIT; + int order; + isc_result_t result; + unsigned int labels; for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { dns_rdataset_current(rdataset, &rdata); result = dns_rdata_tostruct(&rdata, &rrsig, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); @@ -943,14 +896,13 @@ rrsig_fromchildzone(fetchctx_t *fctx, dns_rdataset_t *rdataset) } static bool -fix_mustbedelegationornxdomain(dns_message_t *message, fetchctx_t *fctx) -{ - dns_name_t * name; - dns_name_t * domain = &fctx->domain; +fix_mustbedelegationornxdomain(dns_message_t *message, fetchctx_t *fctx) { + dns_name_t *name; + dns_name_t *domain = &fctx->domain; dns_rdataset_t *rdataset; dns_rdatatype_t type; - isc_result_t result; - bool keep_auth = false; + isc_result_t result; + bool keep_auth = false; if (message->rcode == dns_rcode_nxdomain) { return (false); @@ -992,7 +944,8 @@ fix_mustbedelegationornxdomain(dns_message_t *message, fetchctx_t *fctx) fctx->type == dns_rdatatype_soa || fctx->type == dns_rdatatype_any || fctx->type == dns_rdatatype_rrsig || - fctx->type == dns_rdatatype_dnskey)) { + fctx->type == dns_rdatatype_dnskey)) + { result = dns_message_firstname(message, DNS_SECTION_ANSWER); while (result == ISC_R_SUCCESS) { name = NULL; @@ -1000,7 +953,8 @@ fix_mustbedelegationornxdomain(dns_message_t *message, fetchctx_t *fctx) &name); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (!dns_name_equal(name, &fctx->name)) { continue; } @@ -1019,7 +973,8 @@ fix_mustbedelegationornxdomain(dns_message_t *message, fetchctx_t *fctx) (type == dns_rdatatype_ds || type == dns_rdatatype_ns || type == dns_rdatatype_soa || - type == dns_rdatatype_dnskey)) { + type == dns_rdatatype_dnskey)) + { return (false); } /* @@ -1029,7 +984,8 @@ fix_mustbedelegationornxdomain(dns_message_t *message, fetchctx_t *fctx) (type == dns_rdatatype_ns || type == dns_rdatatype_ds || type == dns_rdatatype_soa || - type == dns_rdatatype_dnskey)) { + type == dns_rdatatype_dnskey)) + { return (false); } } @@ -1056,7 +1012,8 @@ fix_mustbedelegationornxdomain(dns_message_t *message, fetchctx_t *fctx) name = NULL; dns_message_currentname(message, DNS_SECTION_AUTHORITY, &name); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { type = rdataset->type; if (type == dns_rdatatype_soa && dns_name_equal(name, domain)) { @@ -1065,7 +1022,8 @@ fix_mustbedelegationornxdomain(dns_message_t *message, fetchctx_t *fctx) if (type != dns_rdatatype_ns && type != dns_rdatatype_soa && - type != dns_rdatatype_rrsig) { + type != dns_rdatatype_rrsig) + { continue; } @@ -1111,8 +1069,7 @@ munge: } static inline isc_result_t -fctx_starttimer(fetchctx_t *fctx) -{ +fctx_starttimer(fetchctx_t *fctx) { /* * Start the lifetime timer for fctx. * @@ -1125,8 +1082,7 @@ fctx_starttimer(fetchctx_t *fctx) } static inline void -fctx_stoptimer(fetchctx_t *fctx) -{ +fctx_stoptimer(fetchctx_t *fctx) { isc_result_t result; /* @@ -1144,8 +1100,7 @@ fctx_stoptimer(fetchctx_t *fctx) } static inline isc_result_t -fctx_startidletimer(fetchctx_t *fctx, isc_interval_t *interval) -{ +fctx_startidletimer(fetchctx_t *fctx, isc_interval_t *interval) { /* * Start the idle timer for fctx. The lifetime timer continues * to be in effect. @@ -1161,13 +1116,12 @@ fctx_startidletimer(fetchctx_t *fctx, isc_interval_t *interval) #define fctx_stopidletimer fctx_starttimer static inline void -resquery_destroy(resquery_t **queryp) -{ +resquery_destroy(resquery_t **queryp) { dns_resolver_t *res; - bool empty; - resquery_t * query; - fetchctx_t * fctx; - unsigned int bucket; + bool empty; + resquery_t *query; + fetchctx_t *fctx; + unsigned int bucket; REQUIRE(queryp != NULL); query = *queryp; @@ -1198,8 +1152,7 @@ resquery_destroy(resquery_t **queryp) * query sent to it. */ static void -update_edns_stats(resquery_t *query) -{ +update_edns_stats(resquery_t *query) { fetchctx_t *fctx = query->fctx; if ((query->options & DNS_FETCHOPT_TCP) != 0) { @@ -1215,16 +1168,15 @@ update_edns_stats(resquery_t *query) static void fctx_cancelquery(resquery_t **queryp, dns_dispatchevent_t **deventp, - isc_time_t *finish, bool no_response, bool age_untried) -{ - fetchctx_t * fctx; - resquery_t * query; - unsigned int rtt, rttms; - unsigned int factor; - dns_adbfind_t * find; + isc_time_t *finish, bool no_response, bool age_untried) { + fetchctx_t *fctx; + resquery_t *query; + unsigned int rtt, rttms; + unsigned int factor; + dns_adbfind_t *find; dns_adbaddrinfo_t *addrinfo; - isc_socket_t * sock; - isc_stdtime_t now; + isc_socket_t *sock; + isc_stdtime_t now; query = *queryp; fctx = query->fctx; @@ -1342,7 +1294,8 @@ fctx_cancelquery(resquery_t **queryp, dns_dispatchevent_t **deventp, if (finish != NULL || age_untried) { for (addrinfo = ISC_LIST_HEAD(fctx->forwaddrs); addrinfo != NULL; - addrinfo = ISC_LIST_NEXT(addrinfo, publink)) { + addrinfo = ISC_LIST_NEXT(addrinfo, publink)) + { if (UNMARKED(addrinfo)) { dns_adb_agesrtt(fctx->adb, addrinfo, now); } @@ -1351,10 +1304,12 @@ fctx_cancelquery(resquery_t **queryp, dns_dispatchevent_t **deventp, if ((finish != NULL || age_untried) && TRIEDFIND(fctx)) { for (find = ISC_LIST_HEAD(fctx->finds); find != NULL; - find = ISC_LIST_NEXT(find, publink)) { + find = ISC_LIST_NEXT(find, publink)) + { for (addrinfo = ISC_LIST_HEAD(find->list); addrinfo != NULL; - addrinfo = ISC_LIST_NEXT(addrinfo, publink)) { + addrinfo = ISC_LIST_NEXT(addrinfo, publink)) + { if (UNMARKED(addrinfo)) { dns_adb_agesrtt(fctx->adb, addrinfo, now); @@ -1365,16 +1320,19 @@ fctx_cancelquery(resquery_t **queryp, dns_dispatchevent_t **deventp, if ((finish != NULL || age_untried) && TRIEDALT(fctx)) { for (addrinfo = ISC_LIST_HEAD(fctx->altaddrs); addrinfo != NULL; - addrinfo = ISC_LIST_NEXT(addrinfo, publink)) { + addrinfo = ISC_LIST_NEXT(addrinfo, publink)) + { if (UNMARKED(addrinfo)) { dns_adb_agesrtt(fctx->adb, addrinfo, now); } } for (find = ISC_LIST_HEAD(fctx->altfinds); find != NULL; - find = ISC_LIST_NEXT(find, publink)) { + find = ISC_LIST_NEXT(find, publink)) + { for (addrinfo = ISC_LIST_HEAD(find->list); addrinfo != NULL; - addrinfo = ISC_LIST_NEXT(addrinfo, publink)) { + addrinfo = ISC_LIST_NEXT(addrinfo, publink)) + { if (UNMARKED(addrinfo)) { dns_adb_agesrtt(fctx->adb, addrinfo, now); @@ -1446,8 +1404,7 @@ fctx_cancelquery(resquery_t **queryp, dns_dispatchevent_t **deventp, } static void -fctx_cancelqueries(fetchctx_t *fctx, bool no_response, bool age_untried) -{ +fctx_cancelqueries(fetchctx_t *fctx, bool no_response, bool age_untried) { resquery_t *query, *next_query; FCTXTRACE("cancelqueries"); @@ -1460,14 +1417,13 @@ fctx_cancelqueries(fetchctx_t *fctx, bool no_response, bool age_untried) } static void -fctx_cleanupfinds(fetchctx_t *fctx) -{ +fctx_cleanupfinds(fetchctx_t *fctx) { dns_adbfind_t *find, *next_find; REQUIRE(ISC_LIST_EMPTY(fctx->queries)); - for (find = ISC_LIST_HEAD(fctx->finds); find != NULL; - find = next_find) { + for (find = ISC_LIST_HEAD(fctx->finds); find != NULL; find = next_find) + { next_find = ISC_LIST_NEXT(find, publink); ISC_LIST_UNLINK(fctx->finds, find, publink); dns_adb_destroyfind(&find); @@ -1476,8 +1432,7 @@ fctx_cleanupfinds(fetchctx_t *fctx) } static void -fctx_cleanupaltfinds(fetchctx_t *fctx) -{ +fctx_cleanupaltfinds(fetchctx_t *fctx) { dns_adbfind_t *find, *next_find; REQUIRE(ISC_LIST_EMPTY(fctx->queries)); @@ -1492,8 +1447,7 @@ fctx_cleanupaltfinds(fetchctx_t *fctx) } static void -fctx_cleanupforwaddrs(fetchctx_t *fctx) -{ +fctx_cleanupforwaddrs(fetchctx_t *fctx) { dns_adbaddrinfo_t *addr, *next_addr; REQUIRE(ISC_LIST_EMPTY(fctx->queries)); @@ -1507,8 +1461,7 @@ fctx_cleanupforwaddrs(fetchctx_t *fctx) } static void -fctx_cleanupaltaddrs(fetchctx_t *fctx) -{ +fctx_cleanupaltaddrs(fetchctx_t *fctx) { dns_adbaddrinfo_t *addr, *next_addr; REQUIRE(ISC_LIST_EMPTY(fctx->queries)); @@ -1522,16 +1475,14 @@ fctx_cleanupaltaddrs(fetchctx_t *fctx) } static inline void -fctx_stopqueries(fetchctx_t *fctx, bool no_response, bool age_untried) -{ +fctx_stopqueries(fetchctx_t *fctx, bool no_response, bool age_untried) { FCTXTRACE("stopqueries"); fctx_cancelqueries(fctx, no_response, age_untried); fctx_stoptimer(fctx); } static inline void -fctx_cleanupall(fetchctx_t *fctx) -{ +fctx_cleanupall(fetchctx_t *fctx) { fctx_cleanupfinds(fctx); fctx_cleanupaltfinds(fctx); fctx_cleanupforwaddrs(fctx); @@ -1539,9 +1490,8 @@ fctx_cleanupall(fetchctx_t *fctx) } static void -fcount_logspill(fetchctx_t *fctx, fctxcount_t *counter) -{ - char dbuf[DNS_NAME_FORMATSIZE]; +fcount_logspill(fetchctx_t *fctx, fctxcount_t *counter) { + char dbuf[DNS_NAME_FORMATSIZE]; isc_stdtime_t now; if (!isc_log_wouldlog(dns_lctx, ISC_LOG_INFO)) { @@ -1565,25 +1515,25 @@ fcount_logspill(fetchctx_t *fctx, fctxcount_t *counter) } static isc_result_t -fcount_incr(fetchctx_t *fctx, bool force) -{ - isc_result_t result = ISC_R_SUCCESS; +fcount_incr(fetchctx_t *fctx, bool force) { + isc_result_t result = ISC_R_SUCCESS; zonebucket_t *dbucket; - fctxcount_t * counter; - unsigned int bucketnum; + fctxcount_t *counter; + unsigned int bucketnum; REQUIRE(fctx != NULL); REQUIRE(fctx->res != NULL); INSIST(fctx->dbucketnum == RES_NOBUCKET); - bucketnum = - dns_name_fullhash(&fctx->domain, false) % RES_DOMAIN_BUCKETS; + bucketnum = dns_name_fullhash(&fctx->domain, false) % + RES_DOMAIN_BUCKETS; dbucket = &fctx->res->dbuckets[bucketnum]; LOCK(&dbucket->lock); for (counter = ISC_LIST_HEAD(dbucket->list); counter != NULL; - counter = ISC_LIST_NEXT(counter, link)) { + counter = ISC_LIST_NEXT(counter, link)) + { if (dns_name_equal(counter->domain, &fctx->domain)) { break; } @@ -1623,10 +1573,9 @@ fcount_incr(fetchctx_t *fctx, bool force) } static void -fcount_decr(fetchctx_t *fctx) -{ +fcount_decr(fetchctx_t *fctx) { zonebucket_t *dbucket; - fctxcount_t * counter; + fctxcount_t *counter; REQUIRE(fctx != NULL); @@ -1638,7 +1587,8 @@ fcount_decr(fetchctx_t *fctx) LOCK(&dbucket->lock); for (counter = ISC_LIST_HEAD(dbucket->list); counter != NULL; - counter = ISC_LIST_NEXT(counter, link)) { + counter = ISC_LIST_NEXT(counter, link)) + { if (dns_name_equal(counter->domain, &fctx->domain)) { break; } @@ -1659,17 +1609,16 @@ fcount_decr(fetchctx_t *fctx) } static inline void -fctx_sendevents(fetchctx_t *fctx, isc_result_t result, int line) -{ +fctx_sendevents(fetchctx_t *fctx, isc_result_t result, int line) { dns_fetchevent_t *event, *next_event; - isc_task_t * task; - unsigned int count = 0; - isc_interval_t i; - bool logit = false; - isc_time_t now; - unsigned int old_spillat; - unsigned int new_spillat = 0; /* initialized to silence - * compiler warnings */ + isc_task_t *task; + unsigned int count = 0; + isc_interval_t i; + bool logit = false; + isc_time_t now; + unsigned int old_spillat; + unsigned int new_spillat = 0; /* initialized to silence + * compiler warnings */ /* * Caller must be holding the appropriate bucket lock. @@ -1717,7 +1666,8 @@ fctx_sendevents(fetchctx_t *fctx, isc_result_t result, int line) } if (HAVE_ANSWER(fctx) && fctx->spilled && - (count < fctx->res->spillatmax || fctx->res->spillatmax == 0)) { + (count < fctx->res->spillatmax || fctx->res->spillatmax == 0)) + { LOCK(&fctx->res->lock); if (count == fctx->res->spillat && !atomic_load_acquire(&fctx->res->exiting)) { @@ -1748,8 +1698,7 @@ fctx_sendevents(fetchctx_t *fctx, isc_result_t result, int line) } static inline void -log_edns(fetchctx_t *fctx) -{ +log_edns(fetchctx_t *fctx) { char domainbuf[DNS_NAME_FORMATSIZE]; if (fctx->reason == NULL) { @@ -1768,11 +1717,10 @@ log_edns(fetchctx_t *fctx) } static void -fctx_done(fetchctx_t *fctx, isc_result_t result, int line) -{ +fctx_done(fetchctx_t *fctx, isc_result_t result, int line) { dns_resolver_t *res; - bool no_response = false; - bool age_untried = false; + bool no_response = false; + bool age_untried = false; REQUIRE(line >= 0); @@ -1814,13 +1762,12 @@ fctx_done(fetchctx_t *fctx, isc_result_t result, int line) } static void -process_sendevent(resquery_t *query, isc_event_t *event) -{ +process_sendevent(resquery_t *query, isc_event_t *event) { isc_socketevent_t *sevent = (isc_socketevent_t *)event; - bool destroy_query = false; - bool retry = false; - isc_result_t result; - fetchctx_t * fctx; + bool destroy_query = false; + bool retry = false; + isc_result_t result; + fetchctx_t *fctx; fctx = query->fctx; @@ -1892,8 +1839,7 @@ process_sendevent(resquery_t *query, isc_event_t *event) } static void -resquery_udpconnected(isc_task_t *task, isc_event_t *event) -{ +resquery_udpconnected(isc_task_t *task, isc_event_t *event) { resquery_t *query = event->ev_arg; REQUIRE(event->ev_type == ISC_SOCKEVENT_CONNECT); @@ -1910,8 +1856,7 @@ resquery_udpconnected(isc_task_t *task, isc_event_t *event) } static void -resquery_senddone(isc_task_t *task, isc_event_t *event) -{ +resquery_senddone(isc_task_t *task, isc_event_t *event) { resquery_t *query = event->ev_arg; REQUIRE(event->ev_type == ISC_SOCKEVENT_SENDDONE); @@ -1937,10 +1882,9 @@ resquery_senddone(isc_task_t *task, isc_event_t *event) static inline isc_result_t fctx_addopt(dns_message_t *message, unsigned int version, uint16_t udpsize, - dns_ednsopt_t *ednsopts, size_t count) -{ + dns_ednsopt_t *ednsopts, size_t count) { dns_rdataset_t *rdataset = NULL; - isc_result_t result; + isc_result_t result; result = dns_message_buildopt(message, &rdataset, version, udpsize, DNS_MESSAGEEXTFLAG_DO, ednsopts, count); @@ -1951,8 +1895,7 @@ fctx_addopt(dns_message_t *message, unsigned int version, uint16_t udpsize, } static inline void -fctx_setretryinterval(fetchctx_t *fctx, unsigned int rtt) -{ +fctx_setretryinterval(fetchctx_t *fctx, unsigned int rtt) { unsigned int seconds; unsigned int us; @@ -2000,17 +1943,17 @@ fctx_setretryinterval(fetchctx_t *fctx, unsigned int rtt) } static isc_result_t -fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, unsigned int options) -{ +fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, + unsigned int options) { dns_resolver_t *res; - isc_task_t * task; - isc_result_t result; - resquery_t * query; - isc_sockaddr_t addr; - bool have_addr = false; - unsigned int srtt; - isc_dscp_t dscp = -1; - unsigned int bucketnum; + isc_task_t *task; + isc_result_t result; + resquery_t *query; + isc_sockaddr_t addr; + bool have_addr = false; + unsigned int srtt; + isc_dscp_t dscp = -1; + unsigned int bucketnum; FCTXTRACE("query"); @@ -2071,9 +2014,9 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, unsigned int options) query->exclusivesocket = false; query->tcpsocket = NULL; if (res->view->peers != NULL) { - dns_peer_t * peer = NULL; + dns_peer_t *peer = NULL; isc_netaddr_t dstip; - bool usetcp = false; + bool usetcp = false; isc_netaddr_fromsockaddr(&dstip, &addrinfo->sockaddr); result = dns_peerlist_peerbyaddr(res->view->peers, &dstip, &peer); @@ -2279,12 +2222,12 @@ cleanup_query: } static bool -bad_edns(fetchctx_t *fctx, isc_sockaddr_t *address) -{ +bad_edns(fetchctx_t *fctx, isc_sockaddr_t *address) { isc_sockaddr_t *sa; for (sa = ISC_LIST_HEAD(fctx->bad_edns); sa != NULL; - sa = ISC_LIST_NEXT(sa, link)) { + sa = ISC_LIST_NEXT(sa, link)) + { if (isc_sockaddr_equal(sa, address)) { return (true); } @@ -2294,8 +2237,7 @@ bad_edns(fetchctx_t *fctx, isc_sockaddr_t *address) } static void -add_bad_edns(fetchctx_t *fctx, isc_sockaddr_t *address) -{ +add_bad_edns(fetchctx_t *fctx, isc_sockaddr_t *address) { isc_sockaddr_t *sa; #ifdef ENABLE_AFL @@ -2314,12 +2256,12 @@ add_bad_edns(fetchctx_t *fctx, isc_sockaddr_t *address) } static struct tried * -triededns(fetchctx_t *fctx, isc_sockaddr_t *address) -{ +triededns(fetchctx_t *fctx, isc_sockaddr_t *address) { struct tried *tried; for (tried = ISC_LIST_HEAD(fctx->edns); tried != NULL; - tried = ISC_LIST_NEXT(tried, link)) { + tried = ISC_LIST_NEXT(tried, link)) + { if (isc_sockaddr_equal(&tried->addr, address)) { return (tried); } @@ -2329,8 +2271,7 @@ triededns(fetchctx_t *fctx, isc_sockaddr_t *address) } static void -add_triededns(fetchctx_t *fctx, isc_sockaddr_t *address) -{ +add_triededns(fetchctx_t *fctx, isc_sockaddr_t *address) { struct tried *tried; tried = triededns(fctx, address); @@ -2347,12 +2288,12 @@ add_triededns(fetchctx_t *fctx, isc_sockaddr_t *address) } static struct tried * -triededns512(fetchctx_t *fctx, isc_sockaddr_t *address) -{ +triededns512(fetchctx_t *fctx, isc_sockaddr_t *address) { struct tried *tried; for (tried = ISC_LIST_HEAD(fctx->edns512); tried != NULL; - tried = ISC_LIST_NEXT(tried, link)) { + tried = ISC_LIST_NEXT(tried, link)) + { if (isc_sockaddr_equal(&tried->addr, address)) { return (tried); } @@ -2362,8 +2303,7 @@ triededns512(fetchctx_t *fctx, isc_sockaddr_t *address) } static void -add_triededns512(fetchctx_t *fctx, isc_sockaddr_t *address) -{ +add_triededns512(fetchctx_t *fctx, isc_sockaddr_t *address) { struct tried *tried; tried = triededns512(fctx, address); @@ -2380,8 +2320,7 @@ add_triededns512(fetchctx_t *fctx, isc_sockaddr_t *address) } static inline size_t -addr2buf(void *buf, const size_t bufsize, const isc_sockaddr_t *sockaddr) -{ +addr2buf(void *buf, const size_t bufsize, const isc_sockaddr_t *sockaddr) { isc_netaddr_t netaddr; isc_netaddr_fromsockaddr(&netaddr, sockaddr); switch (netaddr.family) { @@ -2401,8 +2340,7 @@ addr2buf(void *buf, const size_t bufsize, const isc_sockaddr_t *sockaddr) } static inline isc_socket_t * -query2sock(const resquery_t *query) -{ +query2sock(const resquery_t *query) { if (query->exclusivesocket) { return (dns_dispatch_getentrysocket(query->dispentry)); } else { @@ -2411,23 +2349,21 @@ query2sock(const resquery_t *query) } static inline size_t -add_serveraddr(uint8_t *buf, const size_t bufsize, const resquery_t *query) -{ +add_serveraddr(uint8_t *buf, const size_t bufsize, const resquery_t *query) { return (addr2buf(buf, bufsize, &query->addrinfo->sockaddr)); } #define CLIENT_COOKIE_SIZE 8U static void -compute_cc(const resquery_t *query, uint8_t *cookie, const size_t len) -{ +compute_cc(const resquery_t *query, uint8_t *cookie, const size_t len) { INSIST(len >= CLIENT_COOKIE_SIZE); STATIC_ASSERT(sizeof(query->fctx->res->view->secret) >= ISC_SIPHASH24_KEY_LENGTH, "The view->secret size can't fit SipHash 2-4 key length"); uint8_t buf[16] ISC_NONSTRING = { 0 }; - size_t buflen = add_serveraddr(buf, sizeof(buf), query); + size_t buflen = add_serveraddr(buf, sizeof(buf), query); uint8_t digest[ISC_SIPHASH24_TAG_LENGTH] ISC_NONSTRING = { 0 }; isc_siphash24(query->fctx->res->view->secret, buf, buflen, digest); @@ -2436,9 +2372,8 @@ compute_cc(const resquery_t *query, uint8_t *cookie, const size_t len) static isc_result_t issecuredomain(dns_view_t *view, const dns_name_t *name, dns_rdatatype_t type, - isc_stdtime_t now, bool checknta, bool *ntap, bool *issecure) -{ - dns_name_t suffix; + isc_stdtime_t now, bool checknta, bool *ntap, bool *issecure) { + dns_name_t suffix; unsigned int labels; /* @@ -2459,36 +2394,35 @@ issecuredomain(dns_view_t *view, const dns_name_t *name, dns_rdatatype_t type, } static isc_result_t -resquery_send(resquery_t *query) -{ - fetchctx_t * fctx; - isc_result_t result; - dns_name_t * qname = NULL; +resquery_send(resquery_t *query) { + fetchctx_t *fctx; + isc_result_t result; + dns_name_t *qname = NULL; dns_rdataset_t *qrdataset = NULL; - isc_region_t r; + isc_region_t r; dns_resolver_t *res; - isc_task_t * task; - isc_socket_t * sock; - isc_buffer_t tcpbuffer; + isc_task_t *task; + isc_socket_t *sock; + isc_buffer_t tcpbuffer; isc_sockaddr_t *address; - isc_buffer_t * buffer; - isc_netaddr_t ipaddr; - dns_tsigkey_t * tsigkey = NULL; - dns_peer_t * peer = NULL; - bool useedns; - dns_compress_t cctx; - bool cleanup_cctx = false; - bool secure_domain; - bool tcp = ((query->options & DNS_FETCHOPT_TCP) != 0); - dns_ednsopt_t ednsopts[DNS_EDNSOPTIONS]; - unsigned ednsopt = 0; - uint16_t hint = 0, udpsize = 0; /* No EDNS */ + isc_buffer_t *buffer; + isc_netaddr_t ipaddr; + dns_tsigkey_t *tsigkey = NULL; + dns_peer_t *peer = NULL; + bool useedns; + dns_compress_t cctx; + bool cleanup_cctx = false; + bool secure_domain; + bool tcp = ((query->options & DNS_FETCHOPT_TCP) != 0); + dns_ednsopt_t ednsopts[DNS_EDNSOPTIONS]; + unsigned ednsopt = 0; + uint16_t hint = 0, udpsize = 0; /* No EDNS */ #ifdef HAVE_DNSTAP - isc_sockaddr_t localaddr, *la = NULL; - unsigned char zone[DNS_NAME_MAXWIRE]; + isc_sockaddr_t localaddr, *la = NULL; + unsigned char zone[DNS_NAME_MAXWIRE]; dns_dtmsgtype_t dtmsgtype; - isc_region_t zr; - isc_buffer_t zb; + isc_region_t zr; + isc_buffer_t zb; #endif /* HAVE_DNSTAP */ fctx = query->fctx; @@ -2550,7 +2484,8 @@ resquery_send(resquery_t *query) * or if we're sending to a forwarder. */ if ((query->options & DNS_FETCHOPT_RECURSIVE) != 0 || - ISFORWARDER(query->addrinfo)) { + ISFORWARDER(query->addrinfo)) + { fctx->qmessage->flags |= DNS_MESSAGEFLAG_RD; } @@ -2564,7 +2499,8 @@ resquery_send(resquery_t *query) } else if ((query->options & DNS_FETCHOPT_NOVALIDATE) != 0) { fctx->qmessage->flags |= DNS_MESSAGEFLAG_CD; } else if (res->view->enablevalidation && - ((fctx->qmessage->flags & DNS_MESSAGEFLAG_RD) != 0)) { + ((fctx->qmessage->flags & DNS_MESSAGEFLAG_RD) != 0)) + { bool checknta = ((query->options & DNS_FETCHOPT_NONTA) == 0); bool ntacovered = false; result = issecuredomain(res->view, &fctx->name, fctx->type, @@ -2615,7 +2551,8 @@ resquery_send(resquery_t *query) if ((query->addrinfo->flags & DNS_FETCHOPT_NOEDNS0) == 0 && peer != NULL && dns_peer_getsupportedns(peer, &useedns) == ISC_R_SUCCESS && - !useedns) { + !useedns) + { query->options |= DNS_FETCHOPT_NOEDNS0; dns_adb_changeflags(fctx->adb, query->addrinfo, DNS_FETCHOPT_NOEDNS0, DNS_FETCHOPT_NOEDNS0); @@ -2628,7 +2565,7 @@ resquery_send(resquery_t *query) if (fctx->timeout && (query->options & DNS_FETCHOPT_NOEDNS0) == 0) { isc_sockaddr_t *sockaddr = &query->addrinfo->sockaddr; - struct tried * tried; + struct tried *tried; if ((tried = triededns(fctx, sockaddr)) != NULL) { if (tried->count == 1U) { @@ -2649,16 +2586,17 @@ resquery_send(resquery_t *query) */ if ((query->options & DNS_FETCHOPT_NOEDNS0) == 0) { if ((query->addrinfo->flags & DNS_FETCHOPT_NOEDNS0) == 0) { - unsigned int version = DNS_EDNS_VERSION; - unsigned int flags = query->addrinfo->flags; - bool reqnsid = res->view->requestnsid; - bool sendcookie = res->view->sendcookie; - bool tcpkeepalive = false; + unsigned int version = DNS_EDNS_VERSION; + unsigned int flags = query->addrinfo->flags; + bool reqnsid = res->view->requestnsid; + bool sendcookie = res->view->sendcookie; + bool tcpkeepalive = false; unsigned char cookie[64]; - uint16_t padding = 0; + uint16_t padding = 0; if ((flags & FCTX_ADDRINFO_EDNSOK) != 0 && - (query->options & DNS_FETCHOPT_EDNS512) == 0) { + (query->options & DNS_FETCHOPT_EDNS512) == 0) + { udpsize = dns_adb_probesize(fctx->adb, query->addrinfo, fctx->timeouts); @@ -2993,15 +2931,14 @@ cleanup_temps: } static void -resquery_connected(isc_task_t *task, isc_event_t *event) -{ +resquery_connected(isc_task_t *task, isc_event_t *event) { isc_socketevent_t *sevent = (isc_socketevent_t *)event; - resquery_t * query = event->ev_arg; - bool retry = false; - isc_interval_t interval; - isc_result_t result; - unsigned int attrs; - fetchctx_t * fctx; + resquery_t *query = event->ev_arg; + bool retry = false; + isc_interval_t interval; + isc_result_t result; + unsigned int attrs; + fetchctx_t *fctx; REQUIRE(event->ev_type == ISC_SOCKEVENT_CONNECT); REQUIRE(VALID_QUERY(query)); @@ -3151,16 +3088,15 @@ resquery_connected(isc_task_t *task, isc_event_t *event) } static void -fctx_finddone(isc_task_t *task, isc_event_t *event) -{ - fetchctx_t * fctx; - dns_adbfind_t * find; +fctx_finddone(isc_task_t *task, isc_event_t *event) { + fetchctx_t *fctx; + dns_adbfind_t *find; dns_resolver_t *res; - bool want_try = false; - bool want_done = false; - bool bucket_empty = false; - unsigned int bucketnum; - bool dodestroy = false; + bool want_try = false; + bool want_done = false; + bool bucket_empty = false; + unsigned int bucketnum; + bool dodestroy = false; find = event->ev_sender; fctx = event->ev_arg; @@ -3198,7 +3134,8 @@ fctx_finddone(isc_task_t *task, isc_event_t *event) } } } else if (SHUTTINGDOWN(fctx) && fctx->pending == 0 && - fctx->nqueries == 0 && ISC_LIST_EMPTY(fctx->validators)) { + fctx->nqueries == 0 && ISC_LIST_EMPTY(fctx->validators)) + { if (isc_refcount_current(&fctx->references) == 0) { bucket_empty = fctx_unlink(fctx); dodestroy = true; @@ -3223,8 +3160,7 @@ fctx_finddone(isc_task_t *task, isc_event_t *event) } static inline bool -bad_server(fetchctx_t *fctx, isc_sockaddr_t *address) -{ +bad_server(fetchctx_t *fctx, isc_sockaddr_t *address) { isc_sockaddr_t *sa; for (sa = ISC_LIST_HEAD(fctx->bad); sa != NULL; @@ -3238,11 +3174,10 @@ bad_server(fetchctx_t *fctx, isc_sockaddr_t *address) } static inline bool -mark_bad(fetchctx_t *fctx) -{ - dns_adbfind_t * curr; +mark_bad(fetchctx_t *fctx) { + dns_adbfind_t *curr; dns_adbaddrinfo_t *addrinfo; - bool all_bad = true; + bool all_bad = true; #ifdef ENABLE_AFL if (dns_fuzzing_resolver) { @@ -3259,9 +3194,11 @@ mark_bad(fetchctx_t *fctx) * Mark any bad nameservers. */ for (curr = ISC_LIST_HEAD(fctx->finds); curr != NULL; - curr = ISC_LIST_NEXT(curr, publink)) { + curr = ISC_LIST_NEXT(curr, publink)) + { for (addrinfo = ISC_LIST_HEAD(curr->list); addrinfo != NULL; - addrinfo = ISC_LIST_NEXT(addrinfo, publink)) { + addrinfo = ISC_LIST_NEXT(addrinfo, publink)) + { if (bad_server(fctx, &addrinfo->sockaddr)) { addrinfo->flags |= FCTX_ADDRINFO_MARK; } else { @@ -3274,7 +3211,8 @@ mark_bad(fetchctx_t *fctx) * Mark any bad forwarders. */ for (addrinfo = ISC_LIST_HEAD(fctx->forwaddrs); addrinfo != NULL; - addrinfo = ISC_LIST_NEXT(addrinfo, publink)) { + addrinfo = ISC_LIST_NEXT(addrinfo, publink)) + { if (bad_server(fctx, &addrinfo->sockaddr)) { addrinfo->flags |= FCTX_ADDRINFO_MARK; } else { @@ -3286,9 +3224,11 @@ mark_bad(fetchctx_t *fctx) * Mark any bad alternates. */ for (curr = ISC_LIST_HEAD(fctx->altfinds); curr != NULL; - curr = ISC_LIST_NEXT(curr, publink)) { + curr = ISC_LIST_NEXT(curr, publink)) + { for (addrinfo = ISC_LIST_HEAD(curr->list); addrinfo != NULL; - addrinfo = ISC_LIST_NEXT(addrinfo, publink)) { + addrinfo = ISC_LIST_NEXT(addrinfo, publink)) + { if (bad_server(fctx, &addrinfo->sockaddr)) { addrinfo->flags |= FCTX_ADDRINFO_MARK; } else { @@ -3298,7 +3238,8 @@ mark_bad(fetchctx_t *fctx) } for (addrinfo = ISC_LIST_HEAD(fctx->altaddrs); addrinfo != NULL; - addrinfo = ISC_LIST_NEXT(addrinfo, publink)) { + addrinfo = ISC_LIST_NEXT(addrinfo, publink)) + { if (bad_server(fctx, &addrinfo->sockaddr)) { addrinfo->flags |= FCTX_ADDRINFO_MARK; } else { @@ -3311,16 +3252,15 @@ mark_bad(fetchctx_t *fctx) static void add_bad(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, isc_result_t reason, - badnstype_t badtype) -{ - char namebuf[DNS_NAME_FORMATSIZE]; - char addrbuf[ISC_SOCKADDR_FORMATSIZE]; - char classbuf[64]; - char typebuf[64]; - char code[64]; - isc_buffer_t b; + badnstype_t badtype) { + char namebuf[DNS_NAME_FORMATSIZE]; + char addrbuf[ISC_SOCKADDR_FORMATSIZE]; + char classbuf[64]; + char typebuf[64]; + char code[64]; + isc_buffer_t b; isc_sockaddr_t *sa; - const char * spc = ""; + const char *spc = ""; isc_sockaddr_t *address = &addrinfo->sockaddr; #ifdef ENABLE_AFL @@ -3369,7 +3309,8 @@ add_bad(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, isc_result_t reason, if (reason == DNS_R_UNEXPECTEDRCODE && fctx->rmessage->rcode == dns_rcode_servfail && - ISFORWARDER(addrinfo)) { + ISFORWARDER(addrinfo)) + { return; } @@ -3400,11 +3341,10 @@ add_bad(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, isc_result_t reason, * Sort addrinfo list by RTT. */ static void -sort_adbfind(dns_adbfind_t *find, unsigned int bias) -{ - dns_adbaddrinfo_t * best, *curr; +sort_adbfind(dns_adbfind_t *find, unsigned int bias) { + dns_adbaddrinfo_t *best, *curr; dns_adbaddrinfolist_t sorted; - unsigned int best_srtt, curr_srtt; + unsigned int best_srtt, curr_srtt; /* Lame N^2 bubble sort. */ ISC_LIST_INIT(sorted); @@ -3436,16 +3376,16 @@ sort_adbfind(dns_adbfind_t *find, unsigned int bias) * Sort a list of finds by server RTT. */ static void -sort_finds(dns_adbfindlist_t *findlist, unsigned int bias) -{ - dns_adbfind_t * best, *curr; - dns_adbfindlist_t sorted; +sort_finds(dns_adbfindlist_t *findlist, unsigned int bias) { + dns_adbfind_t *best, *curr; + dns_adbfindlist_t sorted; dns_adbaddrinfo_t *addrinfo, *bestaddrinfo; - unsigned int best_srtt, curr_srtt; + unsigned int best_srtt, curr_srtt; /* Sort each find's addrinfo list by SRTT. */ for (curr = ISC_LIST_HEAD(*findlist); curr != NULL; - curr = ISC_LIST_NEXT(curr, publink)) { + curr = ISC_LIST_NEXT(curr, publink)) + { sort_adbfind(curr, bias); } @@ -3482,13 +3422,12 @@ sort_finds(dns_adbfindlist_t *findlist, unsigned int bias) static void findname(fetchctx_t *fctx, const dns_name_t *name, in_port_t port, unsigned int options, unsigned int flags, isc_stdtime_t now, - bool *overquota, bool *need_alternate) -{ + bool *overquota, bool *need_alternate) { dns_adbaddrinfo_t *ai; - dns_adbfind_t * find; - dns_resolver_t * res; - bool unshared; - isc_result_t result; + dns_adbfind_t *find; + dns_resolver_t *res; + bool unshared; + isc_result_t result; FCTXTRACE("FINDNAME"); res = fctx->res; @@ -3543,7 +3482,8 @@ findname(fetchctx_t *fctx, const dns_name_t *name, in_port_t port, INSIST((find->options & DNS_ADBFIND_WANTEVENT) == 0); if (flags != 0 || port != 0) { for (ai = ISC_LIST_HEAD(find->list); ai != NULL; - ai = ISC_LIST_NEXT(ai, publink)) { + ai = ISC_LIST_NEXT(ai, publink)) + { ai->flags |= flags; if (port != 0) { isc_sockaddr_setport(&ai->sockaddr, @@ -3575,7 +3515,8 @@ findname(fetchctx_t *fctx, const dns_name_t *name, in_port_t port, ((res->dispatches4 == NULL && find->result_v6 != DNS_R_NXDOMAIN) || (res->dispatches6 == NULL && - find->result_v4 != DNS_R_NXDOMAIN))) { + find->result_v4 != DNS_R_NXDOMAIN))) + { *need_alternate = true; } } else { @@ -3600,7 +3541,8 @@ findname(fetchctx_t *fctx, const dns_name_t *name, in_port_t port, ((res->dispatches4 == NULL && find->result_v6 == DNS_R_NXRRSET) || (res->dispatches6 == NULL && - find->result_v4 == DNS_R_NXRRSET))) { + find->result_v4 == DNS_R_NXRRSET))) + { *need_alternate = true; } dns_adb_destroyfind(&find); @@ -3609,10 +3551,9 @@ findname(fetchctx_t *fctx, const dns_name_t *name, in_port_t port, } static bool -isstrictsubdomain(const dns_name_t *name1, const dns_name_t *name2) -{ - int order; - unsigned int nlabels; +isstrictsubdomain(const dns_name_t *name1, const dns_name_t *name2) { + int order; + unsigned int nlabels; dns_namereln_t namereln; namereln = dns_name_fullcompare(name1, name2, &order, &nlabels); @@ -3620,19 +3561,18 @@ isstrictsubdomain(const dns_name_t *name1, const dns_name_t *name2) } static isc_result_t -fctx_getaddresses(fetchctx_t *fctx, bool badcache) -{ - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_result_t result; - dns_resolver_t * res; - isc_stdtime_t now; - unsigned int stdoptions = 0; - dns_forwarder_t * fwd; +fctx_getaddresses(fetchctx_t *fctx, bool badcache) { + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_result_t result; + dns_resolver_t *res; + isc_stdtime_t now; + unsigned int stdoptions = 0; + dns_forwarder_t *fwd; dns_adbaddrinfo_t *ai; - bool all_bad; - dns_rdata_ns_t ns; - bool need_alternate = false; - bool all_spilled = true; + bool all_bad; + dns_rdata_ns_t ns; + bool need_alternate = false; + bool all_spilled = true; FCTXTRACE5("getaddresses", "fctx->depth=", fctx->depth); @@ -3670,7 +3610,8 @@ fctx_getaddresses(fetchctx_t *fctx, bool badcache) * gets root servers' IP addresses in ADDITIONAL section. */ if ((fctx->options & DNS_FETCHOPT_NOFORWARD) != 0 && - (fctx->fwdpolicy != dns_fwdpolicy_only)) { + (fctx->fwdpolicy != dns_fwdpolicy_only)) + { goto normal_nses; } @@ -3682,11 +3623,11 @@ fctx_getaddresses(fetchctx_t *fctx, bool badcache) fwd = ISC_LIST_HEAD(fctx->forwarders); if (fwd == NULL) { dns_forwarders_t *forwarders = NULL; - dns_name_t * name = &fctx->name; - dns_name_t suffix; - unsigned int labels; - dns_fixedname_t fixed; - dns_name_t * domain; + dns_name_t *name = &fctx->name; + dns_name_t suffix; + unsigned int labels; + dns_fixedname_t fixed; + dns_name_t *domain; /* * DS records are found in the parent server. @@ -3707,7 +3648,8 @@ fctx_getaddresses(fetchctx_t *fctx, bool badcache) fwd = ISC_LIST_HEAD(forwarders->fwdrs); fctx->fwdpolicy = forwarders->fwdpolicy; if (fctx->fwdpolicy == dns_fwdpolicy_only && - isstrictsubdomain(domain, &fctx->domain)) { + isstrictsubdomain(domain, &fctx->domain)) + { fcount_decr(fctx); dns_name_free(&fctx->domain, fctx->mctx); dns_name_init(&fctx->domain, NULL); @@ -3724,7 +3666,8 @@ fctx_getaddresses(fetchctx_t *fctx, bool badcache) if ((isc_sockaddr_pf(&fwd->addr) == AF_INET && res->dispatches4 == NULL) || (isc_sockaddr_pf(&fwd->addr) == AF_INET6 && - res->dispatches6 == NULL)) { + res->dispatches6 == NULL)) + { fwd = ISC_LIST_NEXT(fwd, link); continue; } @@ -3793,7 +3736,8 @@ normal_nses: for (result = dns_rdataset_first(&fctx->nameservers); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&fctx->nameservers)) { + result = dns_rdataset_next(&fctx->nameservers)) + { bool overquota = false; dns_rdataset_current(&fctx->nameservers, &rdata); @@ -3823,7 +3767,7 @@ normal_nses: * Do we need to use 6 to 4? */ if (need_alternate) { - int family; + int family; alternate_t *a; family = (res->dispatches6 != NULL) ? AF_INET6 : AF_INET; for (a = ISC_LIST_HEAD(res->alternates); a != NULL; @@ -3878,7 +3822,7 @@ out: */ result = DNS_R_WAIT; } else { - isc_time_t expire; + isc_time_t expire; isc_interval_t i; /* * We've lost completely. We don't know any @@ -3891,7 +3835,8 @@ out: if (badcache && (fctx->type == dns_rdatatype_dnskey || fctx->type == dns_rdatatype_ds) && - result == ISC_R_SUCCESS) { + result == ISC_R_SUCCESS) + { dns_resolver_addbadcache(res, &fctx->name, fctx->type, &expire); } @@ -3922,18 +3867,17 @@ out: } static inline void -possibly_mark(fetchctx_t *fctx, dns_adbaddrinfo_t *addr) -{ - isc_netaddr_t na; - char buf[ISC_NETADDR_FORMATSIZE]; +possibly_mark(fetchctx_t *fctx, dns_adbaddrinfo_t *addr) { + isc_netaddr_t na; + char buf[ISC_NETADDR_FORMATSIZE]; isc_sockaddr_t *sa; - bool aborted = false; - bool bogus; - dns_acl_t * blackhole; - isc_netaddr_t ipaddr; - dns_peer_t * peer = NULL; + bool aborted = false; + bool bogus; + dns_acl_t *blackhole; + isc_netaddr_t ipaddr; + dns_peer_t *peer = NULL; dns_resolver_t *res; - const char * msg = NULL; + const char *msg = NULL; sa = &addr->sockaddr; @@ -3947,7 +3891,8 @@ possibly_mark(fetchctx_t *fctx, dns_adbaddrinfo_t *addr) if ((dns_acl_match(&ipaddr, NULL, blackhole, &res->view->aclenv, &match, NULL) == ISC_R_SUCCESS) && - match > 0) { + match > 0) + { aborted = true; } } @@ -3989,9 +3934,8 @@ possibly_mark(fetchctx_t *fctx, dns_adbaddrinfo_t *addr) } static inline dns_adbaddrinfo_t * -fctx_nextaddress(fetchctx_t *fctx) -{ - dns_adbfind_t * find, *start; +fctx_nextaddress(fetchctx_t *fctx) { + dns_adbfind_t *find, *start; dns_adbaddrinfo_t *addrinfo; dns_adbaddrinfo_t *faddrinfo; @@ -4003,7 +3947,8 @@ fctx_nextaddress(fetchctx_t *fctx) * Find the first unmarked forwarder (if any). */ for (addrinfo = ISC_LIST_HEAD(fctx->forwaddrs); addrinfo != NULL; - addrinfo = ISC_LIST_NEXT(addrinfo, publink)) { + addrinfo = ISC_LIST_NEXT(addrinfo, publink)) + { if (!UNMARKED(addrinfo)) { continue; } @@ -4041,7 +3986,8 @@ fctx_nextaddress(fetchctx_t *fctx) do { for (addrinfo = ISC_LIST_HEAD(find->list); addrinfo != NULL; - addrinfo = ISC_LIST_NEXT(addrinfo, publink)) { + addrinfo = ISC_LIST_NEXT(addrinfo, publink)) + { if (!UNMARKED(addrinfo)) { continue; } @@ -4091,7 +4037,8 @@ fctx_nextaddress(fetchctx_t *fctx) do { for (addrinfo = ISC_LIST_HEAD(find->list); addrinfo != NULL; - addrinfo = ISC_LIST_NEXT(addrinfo, publink)) { + addrinfo = ISC_LIST_NEXT(addrinfo, publink)) + { if (!UNMARKED(addrinfo)) { continue; } @@ -4118,13 +4065,15 @@ fctx_nextaddress(fetchctx_t *fctx) */ for (addrinfo = ISC_LIST_HEAD(fctx->altaddrs); addrinfo != NULL; - addrinfo = ISC_LIST_NEXT(addrinfo, publink)) { + addrinfo = ISC_LIST_NEXT(addrinfo, publink)) + { if (!UNMARKED(addrinfo)) { continue; } possibly_mark(fctx, addrinfo); if (UNMARKED(addrinfo) && - (faddrinfo == NULL || addrinfo->srtt < faddrinfo->srtt)) { + (faddrinfo == NULL || addrinfo->srtt < faddrinfo->srtt)) + { if (faddrinfo != NULL) { faddrinfo->flags &= ~FCTX_ADDRINFO_MARK; } @@ -4142,14 +4091,13 @@ fctx_nextaddress(fetchctx_t *fctx) } static void -fctx_try(fetchctx_t *fctx, bool retrying, bool badcache) -{ - isc_result_t result; +fctx_try(fetchctx_t *fctx, bool retrying, bool badcache) { + isc_result_t result; dns_adbaddrinfo_t *addrinfo = NULL; - dns_resolver_t * res; - isc_task_t * task; - unsigned int bucketnum; - bool bucket_empty; + dns_resolver_t *res; + isc_task_t *task; + unsigned int bucketnum; + bool bucket_empty; FCTXTRACE5("try", "fctx->qc=", isc_counter_used(fctx->qc)); @@ -4301,17 +4249,16 @@ fctx_try(fetchctx_t *fctx, bool retrying, bool badcache) } static void -resume_qmin(isc_task_t *task, isc_event_t *event) -{ +resume_qmin(isc_task_t *task, isc_event_t *event) { dns_fetchevent_t *fevent; - dns_resolver_t * res; - fetchctx_t * fctx; - isc_result_t result; - bool bucket_empty; - unsigned int bucketnum; - unsigned int findoptions = 0; - dns_name_t * fname, *dcname; - dns_fixedname_t ffixed, dcfixed; + dns_resolver_t *res; + fetchctx_t *fctx; + isc_result_t result; + bool bucket_empty; + unsigned int bucketnum; + unsigned int findoptions = 0; + dns_name_t *fname, *dcname; + dns_fixedname_t ffixed, dcfixed; fname = dns_fixedname_initname(&ffixed); dcname = dns_fixedname_initname(&dcfixed); @@ -4373,7 +4320,8 @@ resume_qmin(isc_task_t *task, isc_event_t *event) if ((NXDOMAIN_RESULT(result) && (fctx->options & DNS_FETCHOPT_QMIN_USE_A) == 0) || result == DNS_R_FORMERR || result == DNS_R_REMOTEFORMERR || - result == ISC_R_FAILURE) { + result == ISC_R_FAILURE) + { if ((fctx->options & DNS_FETCHOPT_QMIN_STRICT) == 0) { fctx->qmin_labels = DNS_MAX_LABELS + 1; /* @@ -4449,10 +4397,9 @@ cleanup: } static bool -fctx_unlink(fetchctx_t *fctx) -{ +fctx_unlink(fetchctx_t *fctx) { dns_resolver_t *res; - unsigned int bucketnum; + unsigned int bucketnum; /* * Caller must be holding the bucket lock. @@ -4482,7 +4429,8 @@ fctx_unlink(fetchctx_t *fctx) dec_stats(res, dns_resstatscounter_nfetch); if (atomic_load_acquire(&res->buckets[bucketnum].exiting) && - ISC_LIST_EMPTY(res->buckets[bucketnum].fctxs)) { + ISC_LIST_EMPTY(res->buckets[bucketnum].fctxs)) + { return (true); } @@ -4490,10 +4438,9 @@ fctx_unlink(fetchctx_t *fctx) } static void -fctx_destroy(fetchctx_t *fctx) -{ +fctx_destroy(fetchctx_t *fctx) { isc_sockaddr_t *sa, *next_sa; - struct tried * tried; + struct tried *tried; REQUIRE(VALID_FCTX(fctx)); REQUIRE(fctx->state == fetchstate_done || @@ -4520,13 +4467,15 @@ fctx_destroy(fetchctx_t *fctx) } for (tried = ISC_LIST_HEAD(fctx->edns); tried != NULL; - tried = ISC_LIST_HEAD(fctx->edns)) { + tried = ISC_LIST_HEAD(fctx->edns)) + { ISC_LIST_UNLINK(fctx->edns, tried, link); isc_mem_put(fctx->mctx, tried, sizeof(*tried)); } for (tried = ISC_LIST_HEAD(fctx->edns512); tried != NULL; - tried = ISC_LIST_HEAD(fctx->edns512)) { + tried = ISC_LIST_HEAD(fctx->edns512)) + { ISC_LIST_UNLINK(fctx->edns512, tried, link); isc_mem_put(fctx->mctx, tried, sizeof(*tried)); } @@ -4562,11 +4511,10 @@ fctx_destroy(fetchctx_t *fctx) */ static void -fctx_timeout(isc_task_t *task, isc_event_t *event) -{ - fetchctx_t * fctx = event->ev_arg; +fctx_timeout(isc_task_t *task, isc_event_t *event) { + fetchctx_t *fctx = event->ev_arg; isc_timerevent_t *tevent = (isc_timerevent_t *)event; - resquery_t * query; + resquery_t *query; REQUIRE(VALID_FCTX(fctx)); @@ -4619,8 +4567,7 @@ fctx_timeout(isc_task_t *task, isc_event_t *event) } static void -fctx_shutdown(fetchctx_t *fctx) -{ +fctx_shutdown(fetchctx_t *fctx) { isc_event_t *cevent; /* @@ -4653,14 +4600,13 @@ fctx_shutdown(fetchctx_t *fctx) } static void -fctx_doshutdown(isc_task_t *task, isc_event_t *event) -{ - fetchctx_t * fctx = event->ev_arg; - bool bucket_empty = false; - dns_resolver_t * res; - unsigned int bucketnum; +fctx_doshutdown(isc_task_t *task, isc_event_t *event) { + fetchctx_t *fctx = event->ev_arg; + bool bucket_empty = false; + dns_resolver_t *res; + unsigned int bucketnum; dns_validator_t *validator; - bool dodestroy = false; + bool dodestroy = false; REQUIRE(VALID_FCTX(fctx)); @@ -4717,7 +4663,8 @@ fctx_doshutdown(isc_task_t *task, isc_event_t *event) if (isc_refcount_current(&fctx->references) == 0 && fctx->pending == 0 && fctx->nqueries == 0 && - ISC_LIST_EMPTY(fctx->validators)) { + ISC_LIST_EMPTY(fctx->validators)) + { bucket_empty = fctx_unlink(fctx); dodestroy = true; } @@ -4733,13 +4680,12 @@ fctx_doshutdown(isc_task_t *task, isc_event_t *event) } static void -fctx_start(isc_task_t *task, isc_event_t *event) -{ - fetchctx_t * fctx = event->ev_arg; - bool done = false, bucket_empty = false; +fctx_start(isc_task_t *task, isc_event_t *event) { + fetchctx_t *fctx = event->ev_arg; + bool done = false, bucket_empty = false; dns_resolver_t *res; - unsigned int bucketnum; - bool dodestroy = false; + unsigned int bucketnum; + bool dodestroy = false; REQUIRE(VALID_FCTX(fctx)); @@ -4822,9 +4768,8 @@ static inline isc_result_t fctx_join(fetchctx_t *fctx, isc_task_t *task, const isc_sockaddr_t *client, dns_messageid_t id, isc_taskaction_t action, void *arg, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, - dns_fetch_t *fetch) -{ - isc_task_t * tclone; + dns_fetch_t *fetch) { + isc_task_t *tclone; dns_fetchevent_t *event; FCTXTRACE("join"); @@ -4869,8 +4814,7 @@ fctx_join(fetchctx_t *fctx, isc_task_t *task, const isc_sockaddr_t *client, } static inline void -log_ns_ttl(fetchctx_t *fctx, const char *where) -{ +log_ns_ttl(fetchctx_t *fctx, const char *where) { char namebuf[DNS_NAME_FORMATSIZE]; char domainbuf[DNS_NAME_FORMATSIZE]; @@ -4887,16 +4831,15 @@ fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type, const dns_name_t *domain, dns_rdataset_t *nameservers, const isc_sockaddr_t *client, unsigned int options, unsigned int bucketnum, unsigned int depth, isc_counter_t *qc, - fetchctx_t **fctxp) -{ - fetchctx_t * fctx; - isc_result_t result; - isc_result_t iresult; + fetchctx_t **fctxp) { + fetchctx_t *fctx; + isc_result_t result; + isc_result_t iresult; isc_interval_t interval; - unsigned int findoptions = 0; - char buf[DNS_NAME_FORMATSIZE + DNS_RDATATYPE_FORMATSIZE]; - char typebuf[DNS_RDATATYPE_FORMATSIZE]; - isc_mem_t * mctx; + unsigned int findoptions = 0; + char buf[DNS_NAME_FORMATSIZE + DNS_RDATATYPE_FORMATSIZE]; + char typebuf[DNS_RDATATYPE_FORMATSIZE]; + isc_mem_t *mctx; /* * Caller must be holding the lock for bucket number 'bucketnum'. @@ -5010,11 +4953,11 @@ fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type, if (domain == NULL) { dns_forwarders_t *forwarders = NULL; - dns_fixedname_t fixed; - unsigned int labels; + dns_fixedname_t fixed; + unsigned int labels; const dns_name_t *fwdname = name; - dns_name_t suffix; - dns_name_t * fname; + dns_name_t suffix; + dns_name_t *fname; /* * DS records are found in the parent server. Strip one @@ -5039,7 +4982,7 @@ fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type, if (fctx->fwdpolicy != dns_fwdpolicy_only) { dns_fixedname_t dcfixed; - dns_name_t * dcname; + dns_name_t *dcname; dcname = dns_fixedname_initname(&dcfixed); /* * The caller didn't supply a query domain and @@ -5227,16 +5170,16 @@ cleanup_fetch: * Handle Responses */ static inline bool -is_lame(fetchctx_t *fctx) -{ - dns_message_t * message = fctx->rmessage; - dns_name_t * name; +is_lame(fetchctx_t *fctx) { + dns_message_t *message = fctx->rmessage; + dns_name_t *name; dns_rdataset_t *rdataset; - isc_result_t result; + isc_result_t result; if (message->rcode != dns_rcode_noerror && message->rcode != dns_rcode_yxdomain && - message->rcode != dns_rcode_nxdomain) { + message->rcode != dns_rcode_nxdomain) + { return (false); } @@ -5253,17 +5196,19 @@ is_lame(fetchctx_t *fctx) name = NULL; dns_message_currentname(message, DNS_SECTION_AUTHORITY, &name); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { dns_namereln_t namereln; - int order; - unsigned int labels; + int order; + unsigned int labels; if (rdataset->type != dns_rdatatype_ns) { continue; } namereln = dns_name_fullcompare(name, &fctx->domain, &order, &labels); if (namereln == dns_namereln_equal && - (message->flags & DNS_MESSAGEFLAG_AA) != 0) { + (message->flags & DNS_MESSAGEFLAG_AA) != 0) + { return (false); } if (namereln == dns_namereln_subdomain) { @@ -5278,8 +5223,7 @@ is_lame(fetchctx_t *fctx) } static inline void -log_lame(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo) -{ +log_lame(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo) { char namebuf[DNS_NAME_FORMATSIZE]; char domainbuf[DNS_NAME_FORMATSIZE]; char addrbuf[ISC_SOCKADDR_FORMATSIZE]; @@ -5294,13 +5238,12 @@ log_lame(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo) } static inline void -log_formerr(fetchctx_t *fctx, const char *format, ...) -{ - char nsbuf[ISC_SOCKADDR_FORMATSIZE]; - char clbuf[ISC_SOCKADDR_FORMATSIZE]; +log_formerr(fetchctx_t *fctx, const char *format, ...) { + char nsbuf[ISC_SOCKADDR_FORMATSIZE]; + char clbuf[ISC_SOCKADDR_FORMATSIZE]; const char *clmsg = ""; - char msgbuf[2048]; - va_list args; + char msgbuf[2048]; + va_list args; va_start(args, format); vsnprintf(msgbuf, sizeof(msgbuf), format, args); @@ -5322,11 +5265,10 @@ log_formerr(fetchctx_t *fctx, const char *format, ...) } static isc_result_t -same_question(fetchctx_t *fctx) -{ - isc_result_t result; - dns_message_t * message = fctx->rmessage; - dns_name_t * name; +same_question(fetchctx_t *fctx) { + isc_result_t result; + dns_message_t *message = fctx->rmessage; + dns_name_t *name; dns_rdataset_t *rdataset; /* @@ -5377,7 +5319,8 @@ same_question(fetchctx_t *fctx) if (fctx->type != rdataset->type || fctx->res->rdclass != rdataset->rdclass || - !dns_name_equal(&fctx->name, name)) { + !dns_name_equal(&fctx->name, name)) + { char namebuf[DNS_NAME_FORMATSIZE]; char classbuf[DNS_RDATACLASS_FORMATSIZE]; char typebuf[DNS_RDATATYPE_FORMATSIZE]; @@ -5395,10 +5338,9 @@ same_question(fetchctx_t *fctx) } static void -clone_results(fetchctx_t *fctx) -{ +clone_results(fetchctx_t *fctx) { dns_fetchevent_t *event, *hevent; - dns_name_t * name, *hname; + dns_name_t *name, *hname; FCTXTRACE("clone_results"); @@ -5416,7 +5358,8 @@ clone_results(fetchctx_t *fctx) } hname = dns_fixedname_name(&hevent->foundname); for (event = ISC_LIST_NEXT(hevent, ev_link); event != NULL; - event = ISC_LIST_NEXT(event, ev_link)) { + event = ISC_LIST_NEXT(event, ev_link)) + { name = dns_fixedname_name(&event->foundname); dns_name_copynf(hname, name); event->result = hevent->result; @@ -5431,19 +5374,20 @@ clone_results(fetchctx_t *fctx) event->sigrdataset != NULL)); if (hevent->sigrdataset != NULL && dns_rdataset_isassociated(hevent->sigrdataset) && - event->sigrdataset != NULL) { + event->sigrdataset != NULL) + { dns_rdataset_clone(hevent->sigrdataset, event->sigrdataset); } } } -#define CACHE(r) (((r)->attributes & DNS_RDATASETATTR_CACHE) != 0) -#define ANSWER(r) (((r)->attributes & DNS_RDATASETATTR_ANSWER) != 0) -#define ANSWERSIG(r) (((r)->attributes & DNS_RDATASETATTR_ANSWERSIG) != 0) -#define EXTERNAL(r) (((r)->attributes & DNS_RDATASETATTR_EXTERNAL) != 0) -#define CHAINING(r) (((r)->attributes & DNS_RDATASETATTR_CHAINING) != 0) -#define CHASE(r) (((r)->attributes & DNS_RDATASETATTR_CHASE) != 0) +#define CACHE(r) (((r)->attributes & DNS_RDATASETATTR_CACHE) != 0) +#define ANSWER(r) (((r)->attributes & DNS_RDATASETATTR_ANSWER) != 0) +#define ANSWERSIG(r) (((r)->attributes & DNS_RDATASETATTR_ANSWERSIG) != 0) +#define EXTERNAL(r) (((r)->attributes & DNS_RDATASETATTR_EXTERNAL) != 0) +#define CHAINING(r) (((r)->attributes & DNS_RDATASETATTR_CHAINING) != 0) +#define CHASE(r) (((r)->attributes & DNS_RDATASETATTR_CHASE) != 0) #define CHECKNAMES(r) (((r)->attributes & DNS_RDATASETATTR_CHECKNAMES) != 0) /* @@ -5457,13 +5401,12 @@ clone_results(fetchctx_t *fctx) * true if the resolver is exiting and this is the last fctx in the bucket. */ static bool -maybe_destroy(fetchctx_t *fctx, bool locked) -{ - unsigned int bucketnum; - bool bucket_empty = false; - dns_resolver_t * res = fctx->res; +maybe_destroy(fetchctx_t *fctx, bool locked) { + unsigned int bucketnum; + bool bucket_empty = false; + dns_resolver_t *res = fctx->res; dns_validator_t *validator, *next_validator; - bool dodestroy = false; + bool dodestroy = false; bucketnum = fctx->bucketnum; if (!locked) { @@ -5477,13 +5420,15 @@ maybe_destroy(fetchctx_t *fctx, bool locked) } for (validator = ISC_LIST_HEAD(fctx->validators); validator != NULL; - validator = next_validator) { + validator = next_validator) + { next_validator = ISC_LIST_NEXT(validator, link); dns_validator_cancel(validator); } if (isc_refcount_current(&fctx->references) == 0 && - ISC_LIST_EMPTY(fctx->validators)) { + ISC_LIST_EMPTY(fctx->validators)) + { bucket_empty = fctx_unlink(fctx); dodestroy = true; } @@ -5501,32 +5446,31 @@ unlock: * The validator has finished. */ static void -validated(isc_task_t *task, isc_event_t *event) -{ - dns_adbaddrinfo_t * addrinfo; - dns_dbnode_t * node = NULL; - dns_dbnode_t * nsnode = NULL; - dns_fetchevent_t * hevent; - dns_name_t * name; - dns_rdataset_t * ardataset = NULL; - dns_rdataset_t * asigrdataset = NULL; - dns_rdataset_t * rdataset; - dns_rdataset_t * sigrdataset; - dns_resolver_t * res; - dns_valarg_t * valarg; +validated(isc_task_t *task, isc_event_t *event) { + dns_adbaddrinfo_t *addrinfo; + dns_dbnode_t *node = NULL; + dns_dbnode_t *nsnode = NULL; + dns_fetchevent_t *hevent; + dns_name_t *name; + dns_rdataset_t *ardataset = NULL; + dns_rdataset_t *asigrdataset = NULL; + dns_rdataset_t *rdataset; + dns_rdataset_t *sigrdataset; + dns_resolver_t *res; + dns_valarg_t *valarg; dns_validatorevent_t *vevent; - fetchctx_t * fctx; - bool chaining; - bool negative; - bool sentresponse; - isc_result_t eresult = ISC_R_SUCCESS; - isc_result_t result = ISC_R_SUCCESS; - isc_stdtime_t now; - uint32_t ttl; - unsigned options; - uint32_t bucketnum; - dns_fixedname_t fwild; - dns_name_t * wild = NULL; + fetchctx_t *fctx; + bool chaining; + bool negative; + bool sentresponse; + isc_result_t eresult = ISC_R_SUCCESS; + isc_result_t result = ISC_R_SUCCESS; + isc_stdtime_t now; + uint32_t ttl; + unsigned options; + uint32_t bucketnum; + dns_fixedname_t fwild; + dns_name_t *wild = NULL; UNUSED(task); /* for now */ @@ -5587,7 +5531,8 @@ validated(isc_task_t *task, isc_event_t *event) * returned, and that the rdatasets are bound. */ if (vevent->result == ISC_R_SUCCESS && !negative && - vevent->rdataset != NULL && CHAINING(vevent->rdataset)) { + vevent->rdataset != NULL && CHAINING(vevent->rdataset)) + { if (vevent->rdataset->type == dns_rdatatype_cname) { eresult = DNS_R_CNAME; } else { @@ -5610,7 +5555,8 @@ validated(isc_task_t *task, isc_event_t *event) if (!negative && !chaining && (fctx->type == dns_rdatatype_any || fctx->type == dns_rdatatype_rrsig || - fctx->type == dns_rdatatype_sig)) { + fctx->type == dns_rdatatype_sig)) + { /* * Don't bind rdatasets; the caller * will iterate the node. @@ -5682,8 +5628,8 @@ validated(isc_task_t *task, isc_event_t *event) } else if (sentresponse) { fctx_done(fctx, result, __LINE__); /* Locks bucket. */ } else if (result == DNS_R_BROKENCHAIN) { - isc_result_t tresult; - isc_time_t expire; + isc_result_t tresult; + isc_time_t expire; isc_interval_t i; isc_interval_set(&i, DNS_RESOLVER_BADCACHETTL(fctx), 0); @@ -5691,7 +5637,8 @@ validated(isc_task_t *task, isc_event_t *event) if (negative && (fctx->type == dns_rdatatype_dnskey || fctx->type == dns_rdatatype_ds) && - tresult == ISC_R_SUCCESS) { + tresult == ISC_R_SUCCESS) + { dns_resolver_addbadcache(res, &fctx->name, fctx->type, &expire); } @@ -5712,14 +5659,15 @@ validated(isc_task_t *task, isc_event_t *event) * Cache DS NXDOMAIN seperately to other types. */ if (fctx->rmessage->rcode == dns_rcode_nxdomain && - fctx->type != dns_rdatatype_ds) { + fctx->type != dns_rdatatype_ds) + { covers = dns_rdatatype_any; } else { covers = fctx->type; } - result = - dns_db_findnode(fctx->cache, vevent->name, true, &node); + result = dns_db_findnode(fctx->cache, vevent->name, true, + &node); if (result != ISC_R_SUCCESS) { goto noanswer_response; } @@ -5731,7 +5679,8 @@ validated(isc_task_t *task, isc_event_t *event) */ ttl = res->view->maxncachettl; if (fctx->type == dns_rdatatype_soa && - covers == dns_rdatatype_any && res->zero_no_soa_ttl) { + covers == dns_rdatatype_any && res->zero_no_soa_ttl) + { ttl = 0; } @@ -5763,9 +5712,10 @@ validated(isc_task_t *task, isc_event_t *event) RUNTIME_CHECK(result == ISC_R_SUCCESS); } } else if (vevent->rdataset->trust == dns_trust_answer && - vevent->rdataset->type != dns_rdatatype_rrsig) { + vevent->rdataset->type != dns_rdatatype_rrsig) + { isc_result_t tresult; - dns_name_t * noqname = NULL; + dns_name_t *noqname = NULL; tresult = findnoqname(fctx, vevent->name, vevent->rdataset->type, &noqname); if (tresult == ISC_R_SUCCESS && noqname != NULL) { @@ -5853,18 +5803,22 @@ answer_response: dns_message_currentname(fctx->rmessage, DNS_SECTION_AUTHORITY, &name); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if ((rdataset->type != dns_rdatatype_ns && rdataset->type != dns_rdatatype_soa && rdataset->type != dns_rdatatype_nsec) || - rdataset->trust != dns_trust_secure) { + rdataset->trust != dns_trust_secure) + { continue; } for (sigrdataset = ISC_LIST_HEAD(name->list); sigrdataset != NULL; - sigrdataset = ISC_LIST_NEXT(sigrdataset, link)) { + sigrdataset = ISC_LIST_NEXT(sigrdataset, link)) + { if (sigrdataset->type != dns_rdatatype_rrsig || - sigrdataset->covers != rdataset->type) { + sigrdataset->covers != rdataset->type) + { continue; } break; @@ -5904,7 +5858,8 @@ answer_response: vevent->rdataset->trust == dns_trust_secure && vevent->sigrdataset != NULL && dns_rdataset_isassociated(vevent->sigrdataset) && - vevent->sigrdataset->trust == dns_trust_secure && wild != NULL) { + vevent->sigrdataset->trust == dns_trust_secure && wild != NULL) + { dns_dbnode_t *wnode = NULL; result = dns_db_findnode(fctx->cache, wild, true, &wnode); @@ -5963,10 +5918,9 @@ cleanup_event: } static void -fctx_log(void *arg, int level, const char *fmt, ...) -{ - char msgbuf[2048]; - va_list args; +fctx_log(void *arg, int level, const char *fmt, ...) { + char msgbuf[2048]; + va_list args; fetchctx_t *fctx = arg; va_start(args, fmt); @@ -5980,21 +5934,20 @@ fctx_log(void *arg, int level, const char *fmt, ...) static inline isc_result_t findnoqname(fetchctx_t *fctx, dns_name_t *name, dns_rdatatype_t type, - dns_name_t **noqnamep) -{ - dns_rdataset_t * nrdataset, *next, *sigrdataset; + dns_name_t **noqnamep) { + dns_rdataset_t *nrdataset, *next, *sigrdataset; dns_rdata_rrsig_t rrsig; - isc_result_t result; - unsigned int labels; - dns_section_t section; - dns_name_t * zonename; - dns_fixedname_t fzonename; - dns_name_t * closest; - dns_fixedname_t fclosest; - dns_name_t * nearest; - dns_fixedname_t fnearest; - dns_rdatatype_t found = dns_rdatatype_none; - dns_name_t * noqname = NULL; + isc_result_t result; + unsigned int labels; + dns_section_t section; + dns_name_t *zonename; + dns_fixedname_t fzonename; + dns_name_t *closest; + dns_fixedname_t fclosest; + dns_name_t *nearest; + dns_fixedname_t fnearest; + dns_rdatatype_t found = dns_rdatatype_none; + dns_name_t *noqname = NULL; FCTXTRACE("findnoqname"); @@ -6004,7 +5957,8 @@ findnoqname(fetchctx_t *fctx, dns_name_t *name, dns_rdatatype_t type, * Find the SIG for this rdataset, if we have it. */ for (sigrdataset = ISC_LIST_HEAD(name->list); sigrdataset != NULL; - sigrdataset = ISC_LIST_NEXT(sigrdataset, link)) { + sigrdataset = ISC_LIST_NEXT(sigrdataset, link)) + { if (sigrdataset->type == dns_rdatatype_rrsig && sigrdataset->covers == type) { break; @@ -6018,7 +5972,8 @@ findnoqname(fetchctx_t *fctx, dns_name_t *name, dns_rdatatype_t type, labels = dns_name_countlabels(name); for (result = dns_rdataset_first(sigrdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(sigrdataset)) { + result = dns_rdataset_next(sigrdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(sigrdataset, &rdata); result = dns_rdata_tostruct(&rdata, &rrsig, NULL); @@ -6046,7 +6001,8 @@ findnoqname(fetchctx_t *fctx, dns_name_t *name, dns_rdatatype_t type, section = DNS_SECTION_AUTHORITY; for (result = dns_message_firstname(fctx->rmessage, section); result == ISC_R_SUCCESS; - result = dns_message_nextname(fctx->rmessage, section)) { + result = dns_message_nextname(fctx->rmessage, section)) + { dns_name_t *nsec = NULL; dns_message_currentname(fctx->rmessage, section, &nsec); for (nrdataset = ISC_LIST_HEAD(nsec->list); nrdataset != NULL; @@ -6058,14 +6014,16 @@ findnoqname(fetchctx_t *fctx, dns_name_t *name, dns_rdatatype_t type, next = ISC_LIST_NEXT(nrdataset, link); if (nrdataset->type != dns_rdatatype_nsec && - nrdataset->type != dns_rdatatype_nsec3) { + nrdataset->type != dns_rdatatype_nsec3) + { continue; } if (nrdataset->type == dns_rdatatype_nsec && NXND(dns_nsec_noexistnodata( type, name, nsec, nrdataset, &exists, &data, - NULL, fctx_log, fctx))) { + NULL, fctx_log, fctx))) + { if (!exists) { noqname = nsec; found = dns_rdatatype_nsec; @@ -6077,7 +6035,8 @@ findnoqname(fetchctx_t *fctx, dns_name_t *name, dns_rdatatype_t type, type, name, nsec, nrdataset, zonename, &exists, &data, &optout, &unknown, &setclosest, &setnearest, closest, nearest, - fctx_log, fctx))) { + fctx_log, fctx))) + { if (!exists && setnearest) { noqname = nsec; found = dns_rdatatype_nsec3; @@ -6091,7 +6050,8 @@ findnoqname(fetchctx_t *fctx, dns_name_t *name, dns_rdatatype_t type, if (noqname != NULL) { for (sigrdataset = ISC_LIST_HEAD(noqname->list); sigrdataset != NULL; - sigrdataset = ISC_LIST_NEXT(sigrdataset, link)) { + sigrdataset = ISC_LIST_NEXT(sigrdataset, link)) + { if (sigrdataset->type == dns_rdatatype_rrsig && sigrdataset->covers == found) { break; @@ -6106,26 +6066,25 @@ findnoqname(fetchctx_t *fctx, dns_name_t *name, dns_rdatatype_t type, static inline isc_result_t cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo, - isc_stdtime_t now) -{ - dns_rdataset_t * rdataset = NULL, *sigrdataset = NULL; - dns_rdataset_t * addedrdataset = NULL; - dns_rdataset_t * ardataset = NULL, *asigrdataset = NULL; - dns_rdataset_t * valrdataset = NULL, *valsigrdataset = NULL; - dns_dbnode_t * node = NULL, **anodep = NULL; - dns_db_t ** adbp = NULL; - dns_name_t * aname = NULL; - dns_resolver_t * res = fctx->res; - bool need_validation = false; - bool secure_domain = false; - bool have_answer = false; - isc_result_t result, eresult = ISC_R_SUCCESS; + isc_stdtime_t now) { + dns_rdataset_t *rdataset = NULL, *sigrdataset = NULL; + dns_rdataset_t *addedrdataset = NULL; + dns_rdataset_t *ardataset = NULL, *asigrdataset = NULL; + dns_rdataset_t *valrdataset = NULL, *valsigrdataset = NULL; + dns_dbnode_t *node = NULL, **anodep = NULL; + dns_db_t **adbp = NULL; + dns_name_t *aname = NULL; + dns_resolver_t *res = fctx->res; + bool need_validation = false; + bool secure_domain = false; + bool have_answer = false; + isc_result_t result, eresult = ISC_R_SUCCESS; dns_fetchevent_t *event = NULL; - unsigned int options; - isc_task_t * task; - bool fail; - unsigned int valoptions = 0; - bool checknta = true; + unsigned int options; + isc_task_t *task; + bool fail; + unsigned int valoptions = 0; + bool checknta = true; FCTXTRACE("cache_name"); @@ -6179,7 +6138,8 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo, if ((fctx->type != dns_rdatatype_any && fctx->type != dns_rdatatype_rrsig && fctx->type != dns_rdatatype_sig) || - (name->attributes & DNS_NAMEATTR_CHAINING) != 0) { + (name->attributes & DNS_NAMEATTR_CHAINING) != 0) + { ardataset = event->rdataset; asigrdataset = event->sigrdataset; } @@ -6200,7 +6160,8 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo, */ fail = ((fctx->res->options & DNS_RESOLVER_CHECKNAMESFAIL) != 0); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (!CACHE(rdataset)) { continue; } @@ -6254,9 +6215,11 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo, */ for (sigrdataset = ISC_LIST_HEAD(name->list); sigrdataset != NULL; - sigrdataset = ISC_LIST_NEXT(sigrdataset, link)) { + sigrdataset = ISC_LIST_NEXT(sigrdataset, link)) + { if (sigrdataset->type == dns_rdatatype_rrsig && - sigrdataset->covers == rdataset->type) { + sigrdataset->covers == rdataset->type) + { break; } } @@ -6304,8 +6267,8 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo, /* * Mark the rdataset as being prefetch eligible. */ - if (rdataset->ttl > - fctx->res->view->prefetch_eligible) { + if (rdataset->ttl > fctx->res->view->prefetch_eligible) + { rdataset->attributes |= DNS_RDATASETATTR_PREFETCH; } @@ -6331,7 +6294,7 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo, if (ANSWER(rdataset) && rdataset->type != dns_rdatatype_rrsig) { isc_result_t tresult; - dns_name_t * noqname = NULL; + dns_name_t *noqname = NULL; tresult = findnoqname(fctx, name, rdataset->type, &noqname); @@ -6404,7 +6367,8 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo, if (ANSWER(rdataset) && need_validation) { if (fctx->type != dns_rdatatype_any && fctx->type != dns_rdatatype_rrsig && - fctx->type != dns_rdatatype_sig) { + fctx->type != dns_rdatatype_sig) + { /* * This is The Answer. We will * validate it, but first we cache @@ -6463,7 +6427,8 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo, if (rdataset->trust == dns_trust_glue && (rdataset->type == dns_rdatatype_ns || (rdataset->type == dns_rdatatype_rrsig && - rdataset->covers == dns_rdatatype_ns))) { + rdataset->covers == dns_rdatatype_ns))) + { /* * If the trust level is 'dns_trust_glue' * then we are adding data from a referral @@ -6472,8 +6437,8 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo, * over the existing cache contents. */ options = DNS_DBADD_FORCE; - } else if ((fctx->options & DNS_FETCHOPT_PREFETCH) != - 0) { + } else if ((fctx->options & DNS_FETCHOPT_PREFETCH) != 0) + { options = DNS_DBADD_PREFETCH; } else { options = 0; @@ -6482,11 +6447,11 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo, if (ANSWER(rdataset) && rdataset->type != dns_rdatatype_rrsig) { isc_result_t tresult; - dns_name_t * noqname = NULL; + dns_name_t *noqname = NULL; tresult = findnoqname(fctx, name, rdataset->type, &noqname); - if (tresult == ISC_R_SUCCESS && - noqname != NULL) { + if (tresult == ISC_R_SUCCESS && noqname != NULL) + { (void)dns_rdataset_addnoqname(rdataset, noqname); } @@ -6566,11 +6531,11 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo, } static inline isc_result_t -cache_message(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, isc_stdtime_t now) -{ - isc_result_t result; +cache_message(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, + isc_stdtime_t now) { + isc_result_t result; dns_section_t section; - dns_name_t * name; + dns_name_t *name; FCTXTRACE("cache_message"); @@ -6612,9 +6577,8 @@ 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) -{ - isc_result_t result; + dns_rdataset_t *ardataset, isc_result_t *eresultp) { + isc_result_t result; dns_rdataset_t rdataset; if (ardataset == NULL) { @@ -6667,20 +6631,19 @@ ncache_adderesult(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node, static inline isc_result_t ncache_message(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, - dns_rdatatype_t covers, isc_stdtime_t now) -{ - isc_result_t result, eresult; - dns_name_t * name; - dns_resolver_t * res; - dns_db_t ** adbp; - dns_dbnode_t * node, **anodep; - dns_rdataset_t * ardataset; - bool need_validation, secure_domain; - dns_name_t * aname; + dns_rdatatype_t covers, isc_stdtime_t now) { + isc_result_t result, eresult; + dns_name_t *name; + dns_resolver_t *res; + dns_db_t **adbp; + dns_dbnode_t *node, **anodep; + dns_rdataset_t *ardataset; + bool need_validation, secure_domain; + dns_name_t *aname; dns_fetchevent_t *event; - uint32_t ttl; - unsigned int valoptions = 0; - bool checknta = true; + uint32_t ttl; + unsigned int valoptions = 0; + bool checknta = true; FCTXTRACE("ncache_message"); @@ -6731,7 +6694,7 @@ ncache_message(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, * Mark all rdatasets as pending. */ dns_rdataset_t *trdataset; - dns_name_t * tname; + dns_name_t *tname; result = dns_message_firstname(fctx->rmessage, DNS_SECTION_AUTHORITY); @@ -6741,7 +6704,8 @@ ncache_message(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, DNS_SECTION_AUTHORITY, &tname); for (trdataset = ISC_LIST_HEAD(tname->list); trdataset != NULL; - trdataset = ISC_LIST_NEXT(trdataset, link)) { + trdataset = ISC_LIST_NEXT(trdataset, link)) + { trdataset->trust = dns_trust_pending_answer; } result = dns_message_nextname(fctx->rmessage, @@ -6798,7 +6762,8 @@ ncache_message(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, */ ttl = fctx->res->view->maxncachettl; if (fctx->type == dns_rdatatype_soa && covers == dns_rdatatype_any && - fctx->res->zero_no_soa_ttl) { + fctx->res->zero_no_soa_ttl) + { ttl = 0; } @@ -6837,8 +6802,7 @@ unlock: static inline void mark_related(dns_name_t *name, dns_rdataset_t *rdataset, bool external, - bool gluing) -{ + bool gluing) { name->attributes |= DNS_NAMEATTR_CACHE; if (gluing) { rdataset->trust = dns_trust_glue; @@ -6867,15 +6831,14 @@ mark_related(dns_name_t *name, dns_rdataset_t *rdataset, bool external, static isc_result_t check_section(void *arg, const dns_name_t *addname, dns_rdatatype_t type, - dns_section_t section) -{ - fetchctx_t * fctx = arg; - isc_result_t result; - dns_name_t * name = NULL; + dns_section_t section) { + fetchctx_t *fctx = arg; + isc_result_t result; + dns_name_t *name = NULL; dns_rdataset_t *rdataset = NULL; - bool external; + bool external; dns_rdatatype_t rtype; - bool gluing; + bool gluing; REQUIRE(VALID_FCTX(fctx)); @@ -6895,7 +6858,8 @@ check_section(void *arg, const dns_name_t *addname, dns_rdatatype_t type, if (type == dns_rdatatype_a) { for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (rdataset->type == dns_rdatatype_rrsig) { rtype = rdataset->covers; } else { @@ -6930,8 +6894,7 @@ check_section(void *arg, const dns_name_t *addname, dns_rdatatype_t type, } static isc_result_t -check_related(void *arg, const dns_name_t *addname, dns_rdatatype_t type) -{ +check_related(void *arg, const dns_name_t *addname, dns_rdatatype_t type) { return (check_section(arg, addname, type, DNS_SECTION_ADDITIONAL)); } @@ -6941,26 +6904,24 @@ check_related(void *arg, const dns_name_t *addname, dns_rdatatype_t type) #if CHECK_FOR_GLUE_IN_ANSWER static isc_result_t -check_answer(void *arg, const dns_name_t *addname, dns_rdatatype_t type) -{ +check_answer(void *arg, const dns_name_t *addname, dns_rdatatype_t type) { return (check_section(arg, addname, type, DNS_SECTION_ANSWER)); } #endif /* if CHECK_FOR_GLUE_IN_ANSWER */ static bool is_answeraddress_allowed(dns_view_t *view, dns_name_t *name, - dns_rdataset_t *rdataset) -{ - isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; - struct in_addr ina; + dns_rdataset_t *rdataset) { + isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; + struct in_addr ina; struct in6_addr in6a; - isc_netaddr_t netaddr; - char addrbuf[ISC_NETADDR_FORMATSIZE]; - char namebuf[DNS_NAME_FORMATSIZE]; - char classbuf[64]; - char typebuf[64]; - int match; + isc_netaddr_t netaddr; + char addrbuf[ISC_NETADDR_FORMATSIZE]; + char namebuf[DNS_NAME_FORMATSIZE]; + char classbuf[64]; + char typebuf[64]; + int match; /* By default, we allow any addresses. */ if (view->denyansweracl == NULL) { @@ -6988,7 +6949,8 @@ is_answeraddress_allowed(dns_view_t *view, dns_name_t *name, * so should the entire answer. */ for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { dns_rdata_reset(&rdata); dns_rdataset_current(rdataset, &rdata); if (rdataset->type == dns_rdatatype_a) { @@ -7023,23 +6985,22 @@ is_answeraddress_allowed(dns_view_t *view, dns_name_t *name, static bool is_answertarget_allowed(fetchctx_t *fctx, dns_name_t *qname, dns_name_t *rname, - dns_rdataset_t *rdataset, bool *chainingp) -{ - isc_result_t result; - dns_rbtnode_t * node = NULL; - char qnamebuf[DNS_NAME_FORMATSIZE]; - char tnamebuf[DNS_NAME_FORMATSIZE]; - char classbuf[64]; - char typebuf[64]; - dns_name_t * tname = NULL; + dns_rdataset_t *rdataset, bool *chainingp) { + isc_result_t result; + dns_rbtnode_t *node = NULL; + char qnamebuf[DNS_NAME_FORMATSIZE]; + char tnamebuf[DNS_NAME_FORMATSIZE]; + char classbuf[64]; + char typebuf[64]; + dns_name_t *tname = NULL; dns_rdata_cname_t cname; dns_rdata_dname_t dname; - dns_view_t * view = fctx->res->view; - dns_rdata_t rdata = DNS_RDATA_INIT; - unsigned int nlabels; - dns_fixedname_t fixed; - dns_name_t prefix; - int order; + dns_view_t *view = fctx->res->view; + dns_rdata_t rdata = DNS_RDATA_INIT; + unsigned int nlabels; + dns_fixedname_t fixed; + dns_name_t prefix; + int order; REQUIRE(rdataset != NULL); REQUIRE(rdataset->type == dns_rdatatype_cname || @@ -7064,7 +7025,8 @@ is_answertarget_allowed(fetchctx_t *fctx, dns_name_t *qname, dns_name_t *rname, break; case dns_rdatatype_dname: if (dns_name_fullcompare(qname, rname, &order, &nlabels) != - dns_namereln_subdomain) { + dns_namereln_subdomain) + { return (true); } result = dns_rdata_tostruct(&rdata, &dname, NULL); @@ -7137,8 +7099,7 @@ is_answertarget_allowed(fetchctx_t *fctx, dns_name_t *qname, dns_name_t *rname, } static void -trim_ns_ttl(fetchctx_t *fctx, dns_name_t *name, dns_rdataset_t *rdataset) -{ +trim_ns_ttl(fetchctx_t *fctx, dns_name_t *name, dns_rdataset_t *rdataset) { char ns_namebuf[DNS_NAME_FORMATSIZE]; char namebuf[DNS_NAME_FORMATSIZE]; char tbuf[DNS_RDATATYPE_FORMATSIZE]; @@ -7159,8 +7120,7 @@ trim_ns_ttl(fetchctx_t *fctx, dns_name_t *name, dns_rdataset_t *rdataset) } static bool -validinanswer(dns_rdataset_t *rdataset, fetchctx_t *fctx) -{ +validinanswer(dns_rdataset_t *rdataset, fetchctx_t *fctx) { if (rdataset->type == dns_rdatatype_nsec3) { /* * NSEC3 records are not allowed to @@ -7185,8 +7145,7 @@ validinanswer(dns_rdataset_t *rdataset, fetchctx_t *fctx) } static void -fctx_increference(fetchctx_t *fctx) -{ +fctx_increference(fetchctx_t *fctx) { REQUIRE(VALID_FCTX(fctx)); isc_refcount_increment0(&fctx->references); @@ -7196,8 +7155,7 @@ fctx_increference(fetchctx_t *fctx) * Requires bucket lock to be held. */ static bool -fctx_decreference(fetchctx_t *fctx) -{ +fctx_decreference(fetchctx_t *fctx) { bool bucket_empty = false; REQUIRE(VALID_FCTX(fctx)); @@ -7207,7 +7165,8 @@ fctx_decreference(fetchctx_t *fctx) * No one cares about the result of this fetch anymore. */ if (fctx->pending == 0 && fctx->nqueries == 0 && - ISC_LIST_EMPTY(fctx->validators) && SHUTTINGDOWN(fctx)) { + ISC_LIST_EMPTY(fctx->validators) && SHUTTINGDOWN(fctx)) + { /* * This fctx is already shutdown; we were just * waiting for the last reference to go away. @@ -7225,16 +7184,15 @@ fctx_decreference(fetchctx_t *fctx) } static void -resume_dslookup(isc_task_t *task, isc_event_t *event) -{ +resume_dslookup(isc_task_t *task, isc_event_t *event) { dns_fetchevent_t *fevent; - dns_resolver_t * res; - fetchctx_t * fctx; - isc_result_t result; - bool bucket_empty; - dns_rdataset_t nameservers; - dns_fixedname_t fixed; - dns_name_t * domain; + dns_resolver_t *res; + fetchctx_t *fctx; + isc_result_t result; + bool bucket_empty; + dns_rdataset_t nameservers; + dns_fixedname_t fixed; + dns_name_t *domain; REQUIRE(event->ev_type == DNS_EVENT_FETCHDONE); fevent = (dns_fetchevent_t *)event; @@ -7302,7 +7260,7 @@ resume_dslookup(isc_task_t *task, isc_event_t *event) */ fctx_try(fctx, true, false); } else { - unsigned int n; + unsigned int n; dns_rdataset_t *nsrdataset = NULL; /* @@ -7377,27 +7335,30 @@ cleanup: } static inline void -checknamessection(dns_message_t *message, dns_section_t section) -{ - isc_result_t result; - dns_name_t * name; - dns_rdata_t rdata = DNS_RDATA_INIT; +checknamessection(dns_message_t *message, dns_section_t section) { + isc_result_t result; + dns_name_t *name; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_t *rdataset; for (result = dns_message_firstname(message, section); result == ISC_R_SUCCESS; - result = dns_message_nextname(message, section)) { + result = dns_message_nextname(message, section)) + { name = NULL; dns_message_currentname(message, section, &name); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { dns_rdataset_current(rdataset, &rdata); if (!dns_rdata_checkowner(name, rdata.rdclass, rdata.type, false) || - !dns_rdata_checknames(&rdata, name, NULL)) { + !dns_rdata_checknames(&rdata, name, NULL)) + { rdataset->attributes |= DNS_RDATASETATTR_CHECKNAMES; } @@ -7408,8 +7369,7 @@ checknamessection(dns_message_t *message, dns_section_t section) } static void -checknames(dns_message_t *message) -{ +checknames(dns_message_t *message) { checknamessection(message, DNS_SECTION_ANSWER); checknamessection(message, DNS_SECTION_AUTHORITY); checknamessection(message, DNS_SECTION_ADDITIONAL); @@ -7420,13 +7380,12 @@ checknames(dns_message_t *message) */ static void log_nsid(isc_buffer_t *opt, size_t nsid_len, resquery_t *query, int level, - isc_mem_t *mctx) -{ + isc_mem_t *mctx) { static const char hex[17] = "0123456789abcdef"; - char addrbuf[ISC_SOCKADDR_FORMATSIZE]; - size_t buflen; - unsigned char * p, *nsid; - unsigned char * buf = NULL, *pbuf = NULL; + char addrbuf[ISC_SOCKADDR_FORMATSIZE]; + size_t buflen; + unsigned char *p, *nsid; + unsigned char *buf = NULL, *pbuf = NULL; REQUIRE(nsid_len <= UINT16_MAX); @@ -7462,8 +7421,7 @@ log_nsid(isc_buffer_t *opt, size_t nsid_len, resquery_t *query, int level, } static bool -iscname(fetchctx_t *fctx) -{ +iscname(fetchctx_t *fctx) { isc_result_t result; result = dns_message_findname(fctx->rmessage, DNS_SECTION_ANSWER, @@ -7473,23 +7431,24 @@ iscname(fetchctx_t *fctx) } static bool -betterreferral(fetchctx_t *fctx) -{ - isc_result_t result; - dns_name_t * name; +betterreferral(fetchctx_t *fctx) { + isc_result_t result; + dns_name_t *name; dns_rdataset_t *rdataset; - dns_message_t * message = fctx->rmessage; + dns_message_t *message = fctx->rmessage; for (result = dns_message_firstname(message, DNS_SECTION_AUTHORITY); result == ISC_R_SUCCESS; - result = dns_message_nextname(message, DNS_SECTION_AUTHORITY)) { + result = dns_message_nextname(message, DNS_SECTION_AUTHORITY)) + { name = NULL; dns_message_currentname(message, DNS_SECTION_AUTHORITY, &name); if (!isstrictsubdomain(name, &fctx->domain)) { continue; } for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (rdataset->type == dns_rdatatype_ns) { return (true); } @@ -7504,13 +7463,12 @@ betterreferral(fetchctx_t *fctx) * resquery_send(). Sets up a response context (respctx_t). */ static void -resquery_response(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result = ISC_R_SUCCESS; - resquery_t * query = event->ev_arg; +resquery_response(isc_task_t *task, isc_event_t *event) { + isc_result_t result = ISC_R_SUCCESS; + resquery_t *query = event->ev_arg; dns_dispatchevent_t *devent = (dns_dispatchevent_t *)event; - fetchctx_t * fctx; - respctx_t rctx; + fetchctx_t *fctx; + respctx_t rctx; REQUIRE(VALID_QUERY(query)); fctx = query->fctx; @@ -7606,8 +7564,8 @@ resquery_response(isc_task_t *task, isc_event_t *event) rctx_opt(&rctx); } - if (fctx->rmessage->cc_bad && - (rctx.retryopts & DNS_FETCHOPT_TCP) == 0) { + if (fctx->rmessage->cc_bad && (rctx.retryopts & DNS_FETCHOPT_TCP) == 0) + { /* * If the COOKIE is bad, assume it is an attack and * keep listening for a good answer. @@ -7783,14 +7741,16 @@ resquery_response(isc_task_t *task, isc_event_t *event) if (fctx->rmessage->counts[DNS_SECTION_ANSWER] > 0 && (fctx->rmessage->rcode == dns_rcode_noerror || fctx->rmessage->rcode == dns_rcode_yxdomain || - fctx->rmessage->rcode == dns_rcode_nxdomain)) { + fctx->rmessage->rcode == dns_rcode_nxdomain)) + { result = rctx_answer(&rctx); if (result == ISC_R_COMPLETE) { return; } } else if (fctx->rmessage->counts[DNS_SECTION_AUTHORITY] > 0 || fctx->rmessage->rcode == dns_rcode_noerror || - fctx->rmessage->rcode == dns_rcode_nxdomain) { + fctx->rmessage->rcode == dns_rcode_nxdomain) + { /* * This might be an NXDOMAIN, NXRRSET, or referral. * Call rctx_answer_none() to determine which it is. @@ -7863,8 +7823,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) */ static void rctx_respinit(isc_task_t *task, dns_dispatchevent_t *devent, resquery_t *query, - fetchctx_t *fctx, respctx_t *rctx) -{ + fetchctx_t *fctx, respctx_t *rctx) { memset(rctx, 0, sizeof(*rctx)); rctx->task = task; @@ -7892,8 +7851,7 @@ rctx_respinit(isc_task_t *task, dns_dispatchevent_t *devent, resquery_t *query, * there are no cases in which this occurs). */ static void -rctx_answer_init(respctx_t *rctx) -{ +rctx_answer_init(respctx_t *rctx) { fetchctx_t *fctx = rctx->fctx; rctx->aa = ((fctx->rmessage->flags & DNS_MESSAGEFLAG_AA) != 0); @@ -7943,18 +7901,18 @@ rctx_answer_init(respctx_t *rctx) * Handle the case where the dispatcher failed */ static isc_result_t -rctx_dispfail(respctx_t *rctx) -{ +rctx_dispfail(respctx_t *rctx) { dns_dispatchevent_t *devent = rctx->devent; - fetchctx_t * fctx = rctx->fctx; - resquery_t * query = rctx->query; + fetchctx_t *fctx = rctx->fctx; + resquery_t *query = rctx->query; if (devent->result == ISC_R_SUCCESS) { return (ISC_R_SUCCESS); } if (devent->result == ISC_R_EOF && - (rctx->retryopts & DNS_FETCHOPT_NOEDNS0) == 0) { + (rctx->retryopts & DNS_FETCHOPT_NOEDNS0) == 0) + { /* * The problem might be that they don't understand EDNS0. * Turn it off and try again. @@ -7979,7 +7937,8 @@ rctx_dispfail(respctx_t *rctx) (devent->result == ISC_R_HOSTUNREACH || devent->result == ISC_R_NETUNREACH || devent->result == ISC_R_CONNREFUSED || - devent->result == ISC_R_CANCELED)) { + devent->result == ISC_R_CANCELED)) + { rctx->broken_server = devent->result; rctx->broken_type = badns_unreachable; rctx->finish = NULL; @@ -7996,11 +7955,10 @@ rctx_dispfail(respctx_t *rctx) * Parse the response message. */ static isc_result_t -rctx_parse(respctx_t *rctx) -{ +rctx_parse(respctx_t *rctx) { isc_result_t result; - fetchctx_t * fctx = rctx->fctx; - resquery_t * query = rctx->query; + fetchctx_t *fctx = rctx->fctx; + resquery_t *query = rctx->query; result = dns_message_parse(fctx->rmessage, &rctx->devent->buffer, 0); if (result == ISC_R_SUCCESS) { @@ -8013,7 +7971,8 @@ rctx_parse(respctx_t *rctx) case ISC_R_UNEXPECTEDEND: if (fctx->rmessage->question_ok && (fctx->rmessage->flags & DNS_MESSAGEFLAG_TC) != 0 && - (rctx->retryopts & DNS_FETCHOPT_TCP) == 0) { + (rctx->retryopts & DNS_FETCHOPT_TCP) == 0) + { /* * We defer retrying via TCP for a bit so we can * check out this message further. @@ -8082,20 +8041,19 @@ rctx_parse(respctx_t *rctx) * Process the OPT record in the response. */ static void -rctx_opt(respctx_t *rctx) -{ - resquery_t * query = rctx->query; - fetchctx_t * fctx = rctx->fctx; - dns_rdata_t rdata; - isc_buffer_t optbuf; - isc_result_t result; - uint16_t optcode; - uint16_t optlen; - unsigned char * optvalue; +rctx_opt(respctx_t *rctx) { + resquery_t *query = rctx->query; + fetchctx_t *fctx = rctx->fctx; + dns_rdata_t rdata; + isc_buffer_t optbuf; + isc_result_t result; + uint16_t optcode; + uint16_t optlen; + unsigned char *optvalue; dns_adbaddrinfo_t *addrinfo; - unsigned char cookie[8]; - bool seen_cookie = false; - bool seen_nsid = false; + unsigned char cookie[8]; + bool seen_cookie = false; + bool seen_nsid = false; result = dns_rdataset_first(rctx->opt); if (result == ISC_R_SUCCESS) { @@ -8109,9 +8067,9 @@ rctx_opt(respctx_t *rctx) INSIST(optlen <= isc_buffer_remaininglength(&optbuf)); switch (optcode) { case DNS_OPT_NSID: - if (!seen_nsid && - (query->options & DNS_FETCHOPT_WANTNSID) != - 0) { + if (!seen_nsid && (query->options & + DNS_FETCHOPT_WANTNSID) != 0) + { log_nsid(&optbuf, optlen, query, ISC_LOG_INFO, fctx->res->mctx); } @@ -8161,8 +8119,7 @@ rctx_opt(respctx_t *rctx) * incorrectly and record that information if needed. */ static void -rctx_edns(respctx_t *rctx) -{ +rctx_edns(respctx_t *rctx) { resquery_t *query = rctx->query; fetchctx_t *fctx = rctx->fctx; @@ -8177,7 +8134,8 @@ rctx_edns(respctx_t *rctx) fctx->rmessage->rcode == dns_rcode_nxdomain || fctx->rmessage->rcode == dns_rcode_refused || fctx->rmessage->rcode == dns_rcode_yxdomain) && - bad_edns(fctx, &query->addrinfo->sockaddr)) { + bad_edns(fctx, &query->addrinfo->sockaddr)) + { dns_message_logpacket( fctx->rmessage, "received packet (bad edns) from", &query->addrinfo->sockaddr, DNS_LOGCATEGORY_RESOLVER, @@ -8190,7 +8148,8 @@ rctx_edns(respctx_t *rctx) !EDNSOK(query->addrinfo) && (fctx->rmessage->rcode == dns_rcode_noerror || fctx->rmessage->rcode == dns_rcode_nxdomain) && - (rctx->retryopts & DNS_FETCHOPT_NOEDNS0) == 0) { + (rctx->retryopts & DNS_FETCHOPT_NOEDNS0) == 0) + { /* * We didn't get a OPT record in response to a EDNS query. * @@ -8220,7 +8179,8 @@ rctx_edns(respctx_t *rctx) (fctx->rmessage->rcode == dns_rcode_noerror || fctx->rmessage->rcode == dns_rcode_nxdomain || fctx->rmessage->rcode == dns_rcode_refused || - fctx->rmessage->rcode == dns_rcode_yxdomain)) { + fctx->rmessage->rcode == dns_rcode_yxdomain)) + { dns_adb_changeflags(fctx->adb, query->addrinfo, FCTX_ADDRINFO_EDNSOK, FCTX_ADDRINFO_EDNSOK); } @@ -8233,20 +8193,21 @@ rctx_edns(respctx_t *rctx) * rctx_answer_none() as appropriate. */ static isc_result_t -rctx_answer(respctx_t *rctx) -{ +rctx_answer(respctx_t *rctx) { isc_result_t result; - fetchctx_t * fctx = rctx->fctx; - resquery_t * query = rctx->query; + fetchctx_t *fctx = rctx->fctx; + resquery_t *query = rctx->query; if ((fctx->rmessage->flags & DNS_MESSAGEFLAG_AA) != 0 || - ISFORWARDER(query->addrinfo)) { + ISFORWARDER(query->addrinfo)) + { result = rctx_answer_positive(rctx); if (result != ISC_R_SUCCESS) { FCTXTRACE3("rctx_answer_positive (AA/fwd)", result); } } else if (iscname(fctx) && fctx->type != dns_rdatatype_any && - fctx->type != dns_rdatatype_cname) { + fctx->type != dns_rdatatype_cname) + { /* * A BIND8 server could return a non-authoritative * answer when a CNAME is followed. We should treat @@ -8337,10 +8298,9 @@ rctx_answer(respctx_t *rctx) * rctx_answer_dname(), rctx_answer_any()). */ static isc_result_t -rctx_answer_positive(respctx_t *rctx) -{ +rctx_answer_positive(respctx_t *rctx) { isc_result_t result; - fetchctx_t * fctx = rctx->fctx; + fetchctx_t *fctx = rctx->fctx; FCTXTRACE("rctx_answer"); @@ -8409,7 +8369,8 @@ rctx_answer_positive(respctx_t *rctx) if (rctx->ns_rdataset != NULL && dns_name_equal(&fctx->domain, rctx->ns_name) && - !dns_name_equal(rctx->ns_name, dns_rootname)) { + !dns_name_equal(rctx->ns_name, dns_rootname)) + { trim_ns_ttl(fctx, rctx->ns_name, rctx->ns_rdataset); } @@ -8425,20 +8386,19 @@ rctx_answer_positive(respctx_t *rctx) * shortest DNAME, 2) the first matching answer, or 3) the first CNAME. */ static void -rctx_answer_scan(respctx_t *rctx) -{ - isc_result_t result; - fetchctx_t * fctx = rctx->fctx; +rctx_answer_scan(respctx_t *rctx) { + isc_result_t result; + fetchctx_t *fctx = rctx->fctx; dns_rdataset_t *rdataset = NULL; for (result = dns_message_firstname(fctx->rmessage, DNS_SECTION_ANSWER); result == ISC_R_SUCCESS; - result = - dns_message_nextname(fctx->rmessage, DNS_SECTION_ANSWER)) { - int order; - unsigned int nlabels; + result = dns_message_nextname(fctx->rmessage, DNS_SECTION_ANSWER)) + { + int order; + unsigned int nlabels; dns_namereln_t namereln; - dns_name_t * name = NULL; + dns_name_t *name = NULL; dns_message_currentname(fctx->rmessage, DNS_SECTION_ANSWER, &name); @@ -8448,7 +8408,8 @@ rctx_answer_scan(respctx_t *rctx) case dns_namereln_equal: for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (rdataset->type == rctx->type || rctx->type == dns_rdatatype_any) { rctx->aname = name; @@ -8483,7 +8444,8 @@ rctx_answer_scan(respctx_t *rctx) */ for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (rdataset->type != dns_rdatatype_dname) { continue; } @@ -8522,13 +8484,13 @@ rctx_answer_scan(respctx_t *rctx) * section, and the rdata isn't filtered, cache it. */ static isc_result_t -rctx_answer_any(respctx_t *rctx) -{ +rctx_answer_any(respctx_t *rctx) { dns_rdataset_t *rdataset = NULL; - fetchctx_t * fctx = rctx->fctx; + fetchctx_t *fctx = rctx->fctx; for (rdataset = ISC_LIST_HEAD(rctx->aname->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (!validinanswer(rdataset, fctx)) { rctx->result = DNS_R_FORMERR; return (ISC_R_COMPLETE); @@ -8536,14 +8498,16 @@ rctx_answer_any(respctx_t *rctx) if ((fctx->type == dns_rdatatype_sig || fctx->type == dns_rdatatype_rrsig) && - rdataset->type != fctx->type) { + rdataset->type != fctx->type) + { continue; } if ((rdataset->type == dns_rdatatype_a || rdataset->type == dns_rdatatype_aaaa) && !is_answeraddress_allowed(fctx->res->view, rctx->aname, - rdataset)) { + rdataset)) + { rctx->result = DNS_R_SERVFAIL; return (ISC_R_COMPLETE); } @@ -8551,7 +8515,8 @@ rctx_answer_any(respctx_t *rctx) if ((rdataset->type == dns_rdatatype_cname || rdataset->type == dns_rdatatype_dname) && !is_answertarget_allowed(fctx, &fctx->name, rctx->aname, - rdataset, NULL)) { + rdataset, NULL)) + { rctx->result = DNS_R_SERVFAIL; return (ISC_R_COMPLETE); } @@ -8577,10 +8542,9 @@ rctx_answer_any(respctx_t *rctx) * to the answer, it can be cached as well. */ static isc_result_t -rctx_answer_match(respctx_t *rctx) -{ +rctx_answer_match(respctx_t *rctx) { dns_rdataset_t *sigrdataset = NULL; - fetchctx_t * fctx = rctx->fctx; + fetchctx_t *fctx = rctx->fctx; if (!validinanswer(rctx->ardataset, fctx)) { rctx->result = DNS_R_FORMERR; @@ -8590,7 +8554,8 @@ rctx_answer_match(respctx_t *rctx) if ((rctx->ardataset->type == dns_rdatatype_a || rctx->ardataset->type == dns_rdatatype_aaaa) && !is_answeraddress_allowed(fctx->res->view, rctx->aname, - rctx->ardataset)) { + rctx->ardataset)) + { rctx->result = DNS_R_SERVFAIL; return (ISC_R_COMPLETE); } @@ -8599,7 +8564,8 @@ rctx_answer_match(respctx_t *rctx) rctx->type != rctx->ardataset->type && rctx->type != dns_rdatatype_any && !is_answertarget_allowed(fctx, &fctx->name, rctx->aname, - rctx->ardataset, NULL)) { + rctx->ardataset, NULL)) + { rctx->result = DNS_R_SERVFAIL; return (ISC_R_COMPLETE); } @@ -8613,14 +8579,16 @@ rctx_answer_match(respctx_t *rctx) for (sigrdataset = ISC_LIST_HEAD(rctx->aname->list); sigrdataset != NULL; - sigrdataset = ISC_LIST_NEXT(sigrdataset, link)) { + sigrdataset = ISC_LIST_NEXT(sigrdataset, link)) + { if (!validinanswer(sigrdataset, fctx)) { rctx->result = DNS_R_FORMERR; return (ISC_R_COMPLETE); } if (sigrdataset->type != dns_rdatatype_rrsig || - sigrdataset->covers != rctx->type) { + sigrdataset->covers != rctx->type) + { continue; } @@ -8639,10 +8607,9 @@ rctx_answer_match(respctx_t *rctx) * there may be additional chain answers to find. */ static isc_result_t -rctx_answer_cname(respctx_t *rctx) -{ +rctx_answer_cname(respctx_t *rctx) { dns_rdataset_t *sigrdataset = NULL; - fetchctx_t * fctx = rctx->fctx; + fetchctx_t *fctx = rctx->fctx; if (!validinanswer(rctx->crdataset, fctx)) { rctx->result = DNS_R_FORMERR; @@ -8650,8 +8617,8 @@ rctx_answer_cname(respctx_t *rctx) } if (rctx->type == dns_rdatatype_rrsig || - rctx->type == dns_rdatatype_key || - rctx->type == dns_rdatatype_nsec) { + rctx->type == dns_rdatatype_key || rctx->type == dns_rdatatype_nsec) + { char buf[DNS_RDATATYPE_FORMATSIZE]; dns_rdatatype_format(rctx->type, buf, sizeof(buf)); log_formerr(fctx, "CNAME response for %s RR", buf); @@ -8660,7 +8627,8 @@ rctx_answer_cname(respctx_t *rctx) } if (!is_answertarget_allowed(fctx, &fctx->name, rctx->cname, - rctx->crdataset, NULL)) { + rctx->crdataset, NULL)) + { rctx->result = DNS_R_SERVFAIL; return (ISC_R_COMPLETE); } @@ -8675,14 +8643,16 @@ rctx_answer_cname(respctx_t *rctx) for (sigrdataset = ISC_LIST_HEAD(rctx->cname->list); sigrdataset != NULL; - sigrdataset = ISC_LIST_NEXT(sigrdataset, link)) { + sigrdataset = ISC_LIST_NEXT(sigrdataset, link)) + { if (!validinanswer(sigrdataset, fctx)) { rctx->result = DNS_R_FORMERR; return (ISC_R_COMPLETE); } if (sigrdataset->type != dns_rdatatype_rrsig || - sigrdataset->covers != dns_rdatatype_cname) { + sigrdataset->covers != dns_rdatatype_cname) + { continue; } @@ -8701,10 +8671,9 @@ rctx_answer_cname(respctx_t *rctx) * Handle responses with covering DNAME records. */ static isc_result_t -rctx_answer_dname(respctx_t *rctx) -{ +rctx_answer_dname(respctx_t *rctx) { dns_rdataset_t *sigrdataset = NULL; - fetchctx_t * fctx = rctx->fctx; + fetchctx_t *fctx = rctx->fctx; if (!validinanswer(rctx->drdataset, fctx)) { rctx->result = DNS_R_FORMERR; @@ -8712,7 +8681,8 @@ rctx_answer_dname(respctx_t *rctx) } if (!is_answertarget_allowed(fctx, &fctx->name, rctx->dname, - rctx->drdataset, &rctx->chaining)) { + rctx->drdataset, &rctx->chaining)) + { rctx->result = DNS_R_SERVFAIL; return (ISC_R_COMPLETE); } @@ -8727,14 +8697,16 @@ rctx_answer_dname(respctx_t *rctx) for (sigrdataset = ISC_LIST_HEAD(rctx->dname->list); sigrdataset != NULL; - sigrdataset = ISC_LIST_NEXT(sigrdataset, link)) { + sigrdataset = ISC_LIST_NEXT(sigrdataset, link)) + { if (!validinanswer(sigrdataset, fctx)) { rctx->result = DNS_R_FORMERR; return (ISC_R_COMPLETE); } if (sigrdataset->type != dns_rdatatype_rrsig || - sigrdataset->covers != dns_rdatatype_dname) { + sigrdataset->covers != dns_rdatatype_dname) + { continue; } @@ -8759,16 +8731,15 @@ rctx_answer_dname(respctx_t *rctx) * (depending on whether the AA bit was set on the answer). */ static void -rctx_authority_positive(respctx_t *rctx) -{ - fetchctx_t * fctx = rctx->fctx; - bool done = false; +rctx_authority_positive(respctx_t *rctx) { + fetchctx_t *fctx = rctx->fctx; + bool done = false; isc_result_t result; result = dns_message_firstname(fctx->rmessage, DNS_SECTION_AUTHORITY); while (!done && result == ISC_R_SUCCESS) { dns_name_t *name = NULL; - bool external; + bool external; dns_message_currentname(fctx->rmessage, DNS_SECTION_AUTHORITY, &name); @@ -8783,10 +8754,12 @@ rctx_authority_positive(respctx_t *rctx) */ for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (rdataset->type == dns_rdatatype_ns || (rdataset->type == dns_rdatatype_rrsig && - rdataset->covers == dns_rdatatype_ns)) { + rdataset->covers == dns_rdatatype_ns)) + { name->attributes |= DNS_NAMEATTR_CACHE; rdataset->attributes |= DNS_RDATASETATTR_CACHE; @@ -8799,8 +8772,8 @@ rctx_authority_positive(respctx_t *rctx) dns_trust_additional; } - if (rdataset->type == - dns_rdatatype_ns) { + if (rdataset->type == dns_rdatatype_ns) + { rctx->ns_name = name; rctx->ns_rdataset = rdataset; } @@ -8828,10 +8801,9 @@ rctx_authority_positive(respctx_t *rctx) * DNSSEC proof of nonexistence, or else call rctx_referral(). */ static isc_result_t -rctx_answer_none(respctx_t *rctx) -{ +rctx_answer_none(respctx_t *rctx) { isc_result_t result; - fetchctx_t * fctx = rctx->fctx; + fetchctx_t *fctx = rctx->fctx; FCTXTRACE("rctx_answer_none"); @@ -8843,7 +8815,8 @@ rctx_answer_none(respctx_t *rctx) */ if (fctx->rmessage->rcode == dns_rcode_nxdomain || (fctx->rmessage->counts[DNS_SECTION_ANSWER] == 0 && - fctx->rmessage->counts[DNS_SECTION_AUTHORITY] == 0)) { + fctx->rmessage->counts[DNS_SECTION_AUTHORITY] == 0)) + { rctx->negative = true; } @@ -8859,7 +8832,8 @@ rctx_answer_none(respctx_t *rctx) if (rctx->ns_rdataset != NULL && dns_name_equal(&fctx->domain, rctx->ns_name) && - !dns_name_equal(rctx->ns_name, dns_rootname)) { + !dns_name_equal(rctx->ns_name, dns_rootname)) + { trim_ns_ttl(fctx, rctx->ns_name, rctx->ns_rdataset); } @@ -8890,7 +8864,8 @@ rctx_answer_none(respctx_t *rctx) if (rctx->negative && fctx->rmessage->rcode == dns_rcode_noerror && fctx->type == dns_rdatatype_ds && rctx->soa_name != NULL && dns_name_equal(rctx->soa_name, &fctx->name) && - !dns_name_equal(&fctx->name, dns_rootname)) { + !dns_name_equal(&fctx->name, dns_rootname)) + { return (DNS_R_CHASEDSSERVERS); } @@ -8929,7 +8904,8 @@ rctx_answer_none(respctx_t *rctx) * If we found both NS and SOA, they should be the same name. */ if (rctx->ns_name != NULL && rctx->soa_name != NULL && - rctx->ns_name != rctx->soa_name) { + rctx->ns_name != rctx->soa_name) + { log_formerr(fctx, "NS/SOA mismatch"); return (DNS_R_FORMERR); } @@ -8965,13 +8941,12 @@ rctx_answer_none(respctx_t *rctx) * rctx_authority_dnssec() below.) */ static isc_result_t -rctx_authority_negative(respctx_t *rctx) -{ - isc_result_t result; - fetchctx_t * fctx = rctx->fctx; - dns_section_t section; +rctx_authority_negative(respctx_t *rctx) { + isc_result_t result; + fetchctx_t *fctx = rctx->fctx; + dns_section_t section; dns_rdataset_t *rdataset = NULL; - bool finished = false; + bool finished = false; if (rctx->ns_in_answer) { INSIST(fctx->type == dns_rdatatype_ns); @@ -8999,14 +8974,16 @@ rctx_authority_negative(respctx_t *rctx) } for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { dns_rdatatype_t type = rdataset->type; if (type == dns_rdatatype_rrsig) { type = rdataset->covers; } if (((type == dns_rdatatype_ns || type == dns_rdatatype_soa) && - !dns_name_issubdomain(&fctx->name, name))) { + !dns_name_issubdomain(&fctx->name, name))) + { char qbuf[DNS_NAME_FORMATSIZE]; char nbuf[DNS_NAME_FORMATSIZE]; char tbuf[DNS_RDATATYPE_FORMATSIZE]; @@ -9091,11 +9068,10 @@ rctx_authority_negative(respctx_t *rctx) * also cause work to be queued to the DNSSEC validator. */ static void -rctx_ncache(respctx_t *rctx) -{ - isc_result_t result; +rctx_ncache(respctx_t *rctx) { + isc_result_t result; dns_rdatatype_t covers; - fetchctx_t * fctx = rctx->fctx; + fetchctx_t *fctx = rctx->fctx; if (!WANTNCACHE(fctx)) { return; @@ -9105,7 +9081,8 @@ rctx_ncache(respctx_t *rctx) * Cache DS NXDOMAIN seperately to other types. */ if (fctx->rmessage->rcode == dns_rcode_nxdomain && - fctx->type != dns_rdatatype_ds) { + fctx->type != dns_rdatatype_ds) + { covers = dns_rdatatype_any; } else { covers = fctx->type; @@ -9127,12 +9104,11 @@ rctx_ncache(respctx_t *rctx) * handling DNSSEC records (i.e. NSEC, NSEC3, DS). */ static isc_result_t -rctx_authority_dnssec(respctx_t *rctx) -{ - isc_result_t result; - fetchctx_t * fctx = rctx->fctx; +rctx_authority_dnssec(respctx_t *rctx) { + isc_result_t result; + fetchctx_t *fctx = rctx->fctx; dns_rdataset_t *rdataset = NULL; - bool finished = false; + bool finished = false; REQUIRE(!rctx->ns_in_answer && !rctx->glue_in_answer); @@ -9160,9 +9136,10 @@ rctx_authority_dnssec(respctx_t *rctx) } for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { - bool checknta = true; - bool secure_domain = false; + rdataset = ISC_LIST_NEXT(rdataset, link)) + { + bool checknta = true; + bool secure_domain = false; dns_rdatatype_t type = rdataset->type; if (type == dns_rdatatype_rrsig) { @@ -9264,10 +9241,9 @@ rctx_authority_dnssec(respctx_t *rctx) * and update the fetch context to follow the delegation. */ static isc_result_t -rctx_referral(respctx_t *rctx) -{ +rctx_referral(respctx_t *rctx) { isc_result_t result; - fetchctx_t * fctx = rctx->fctx; + fetchctx_t *fctx = rctx->fctx; if (rctx->negative || rctx->ns_name == NULL) { return (ISC_R_SUCCESS); @@ -9314,8 +9290,9 @@ rctx_referral(respctx_t *rctx) * additional section that are in the answer section or if * the record gets dropped due to message size constraints. */ - if (rctx->glue_in_answer && (fctx->type == dns_rdatatype_aaaa || - fctx->type == dns_rdatatype_a)) { + if (rctx->glue_in_answer && + (fctx->type == dns_rdatatype_aaaa || fctx->type == dns_rdatatype_a)) + { (void)dns_rdataset_additionaldata(rctx->ns_rdataset, check_answer, fctx); } @@ -9401,20 +9378,20 @@ rctx_referral(respctx_t *rctx) * to answers we were interested in. */ static void -rctx_additional(respctx_t *rctx) -{ - fetchctx_t * fctx = rctx->fctx; - bool rescan; +rctx_additional(respctx_t *rctx) { + fetchctx_t *fctx = rctx->fctx; + bool rescan; dns_section_t section = DNS_SECTION_ADDITIONAL; - isc_result_t result; + isc_result_t result; again: rescan = false; for (result = dns_message_firstname(fctx->rmessage, section); result == ISC_R_SUCCESS; - result = dns_message_nextname(fctx->rmessage, section)) { - dns_name_t * name = NULL; + result = dns_message_nextname(fctx->rmessage, section)) + { + dns_name_t *name = NULL; dns_rdataset_t *rdataset; dns_message_currentname(fctx->rmessage, DNS_SECTION_ADDITIONAL, &name); @@ -9423,7 +9400,8 @@ again: } name->attributes &= ~DNS_NAMEATTR_CHASE; for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (CHASE(rdataset)) { rdataset->attributes &= ~DNS_RDATASETATTR_CHASE; (void)dns_rdataset_additionaldata( @@ -9444,8 +9422,7 @@ again: */ static void rctx_nextserver(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo, - isc_result_t result) -{ + isc_result_t result) { fetchctx_t *fctx = rctx->fctx; if (result == DNS_R_FORMERR) { @@ -9461,8 +9438,8 @@ rctx_nextserver(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo, if (rctx->get_nameservers) { dns_fixedname_t foundname, founddc; - dns_name_t * name, *fname, *dcname; - unsigned int findoptions = 0; + dns_name_t *name, *fname, *dcname; + unsigned int findoptions = 0; fname = dns_fixedname_initname(&foundname); dcname = dns_fixedname_initname(&founddc); @@ -9530,13 +9507,12 @@ rctx_nextserver(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo, * updated since the last time fctx_query() was called). */ static void -rctx_resend(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo) -{ - isc_result_t result; - fetchctx_t * fctx = rctx->fctx; - bool bucket_empty; +rctx_resend(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo) { + isc_result_t result; + fetchctx_t *fctx = rctx->fctx; + bool bucket_empty; dns_resolver_t *res = fctx->res; - unsigned int bucketnum; + unsigned int bucketnum; FCTXTRACE("resend"); inc_stats(fctx->res, dns_resstatscounter_retry); @@ -9564,8 +9540,7 @@ rctx_resend(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo) * wanted. */ static void -rctx_next(respctx_t *rctx) -{ +rctx_next(respctx_t *rctx) { #ifdef WANT_QUERYTRACE fetchctx_t *fctx = rctx->fctx; #endif /* ifdef WANT_QUERYTRACE */ @@ -9586,9 +9561,9 @@ rctx_next(respctx_t *rctx) * Look up the parent zone's NS records so that DS records can be fetched. */ static void -rctx_chaseds(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo, isc_result_t result) -{ - fetchctx_t * fctx = rctx->fctx; +rctx_chaseds(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo, + isc_result_t result) { + fetchctx_t *fctx = rctx->fctx; unsigned int n; add_bad(fctx, addrinfo, result, rctx->broken_type); @@ -9627,10 +9602,9 @@ rctx_chaseds(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo, isc_result_t result) * same server, resend to a new server, or clean up and shut down the fetch. */ static void -rctx_done(respctx_t *rctx, isc_result_t result) -{ - resquery_t * query = rctx->query; - fetchctx_t * fctx = rctx->fctx; +rctx_done(respctx_t *rctx, isc_result_t result) { + resquery_t *query = rctx->query; + fetchctx_t *fctx = rctx->fctx; dns_adbaddrinfo_t *addrinfo = query->addrinfo; FCTXTRACE4("query canceled in response(); ", @@ -9648,7 +9622,8 @@ rctx_done(respctx_t *rctx, isc_result_t result) #ifdef ENABLE_AFL if (dns_fuzzing_resolver && - (rctx->next_server || rctx->resend || rctx->nextitem)) { + (rctx->next_server || rctx->resend || rctx->nextitem)) + { if (rctx->nextitem) { fctx_cancelquery(&query, &rctx->devent, rctx->finish, rctx->no_response, false); @@ -9657,7 +9632,8 @@ rctx_done(respctx_t *rctx, isc_result_t result) return; } else #endif /* ifdef ENABLE_AFL */ - if (rctx->next_server) { + if (rctx->next_server) + { rctx_nextserver(rctx, addrinfo, result); } else if (rctx->resend) { rctx_resend(rctx, addrinfo); @@ -9693,18 +9669,17 @@ rctx_done(respctx_t *rctx, isc_result_t result) * Log the incoming packet; also log to DNSTAP if configured. */ static void -rctx_logpacket(respctx_t *rctx) -{ +rctx_logpacket(respctx_t *rctx) { #ifdef HAVE_DNSTAP - isc_result_t result; - fetchctx_t * fctx = rctx->fctx; - isc_socket_t * sock = NULL; - isc_sockaddr_t localaddr, *la = NULL; - unsigned char zone[DNS_NAME_MAXWIRE]; + isc_result_t result; + fetchctx_t *fctx = rctx->fctx; + isc_socket_t *sock = NULL; + isc_sockaddr_t localaddr, *la = NULL; + unsigned char zone[DNS_NAME_MAXWIRE]; dns_dtmsgtype_t dtmsgtype; - dns_compress_t cctx; - isc_region_t zr; - isc_buffer_t zb; + dns_compress_t cctx; + isc_region_t zr; + isc_buffer_t zb; #endif /* HAVE_DNSTAP */ dns_message_logfmtpacket( @@ -9756,21 +9731,22 @@ rctx_logpacket(respctx_t *rctx) * Is the remote server broken, or does it dislike us? */ static isc_result_t -rctx_badserver(respctx_t *rctx, isc_result_t result) -{ - fetchctx_t * fctx = rctx->fctx; - resquery_t * query = rctx->query; +rctx_badserver(respctx_t *rctx, isc_result_t result) { + fetchctx_t *fctx = rctx->fctx; + resquery_t *query = rctx->query; isc_buffer_t b; - char code[64]; + char code[64]; if (fctx->rmessage->rcode == dns_rcode_noerror || fctx->rmessage->rcode == dns_rcode_yxdomain || - fctx->rmessage->rcode == dns_rcode_nxdomain) { + fctx->rmessage->rcode == dns_rcode_nxdomain) + { return (ISC_R_SUCCESS); } if ((fctx->rmessage->rcode == dns_rcode_formerr) && - (rctx->retryopts & DNS_FETCHOPT_NOEDNS0) == 0) { + (rctx->retryopts & DNS_FETCHOPT_NOEDNS0) == 0) + { /* * It's very likely they don't like EDNS0. * If the response code is SERVFAIL, also check if the @@ -9856,7 +9832,8 @@ rctx_badserver(respctx_t *rctx, isc_result_t result) rctx->next_server = true; #endif /* if DNS_EDNS_VERSION > 0 */ } else if (fctx->rmessage->rcode == dns_rcode_badcookie && - fctx->rmessage->cc_ok) { + fctx->rmessage->cc_ok) + { /* * We have recorded the new cookie. */ @@ -9884,11 +9861,10 @@ rctx_badserver(respctx_t *rctx, isc_result_t result) * Is the server lame? */ static isc_result_t -rctx_lameserver(respctx_t *rctx) -{ +rctx_lameserver(respctx_t *rctx) { isc_result_t result; - fetchctx_t * fctx = rctx->fctx; - resquery_t * query = rctx->query; + fetchctx_t *fctx = rctx->fctx; + resquery_t *query = rctx->query; if (fctx->res->lame_ttl == 0 || ISFORWARDER(query->addrinfo) || !is_lame(fctx)) { @@ -9918,19 +9894,19 @@ rctx_lameserver(respctx_t *rctx) * Handle delegation-only zones like NET and COM. */ static void -rctx_delonly_zone(respctx_t *rctx) -{ +rctx_delonly_zone(respctx_t *rctx) { fetchctx_t *fctx = rctx->fctx; - char namebuf[DNS_NAME_FORMATSIZE]; - char domainbuf[DNS_NAME_FORMATSIZE]; - char addrbuf[ISC_SOCKADDR_FORMATSIZE]; - char classbuf[64]; - char typebuf[64]; + char namebuf[DNS_NAME_FORMATSIZE]; + char domainbuf[DNS_NAME_FORMATSIZE]; + char addrbuf[ISC_SOCKADDR_FORMATSIZE]; + char classbuf[64]; + char typebuf[64]; if (ISFORWARDER(rctx->query->addrinfo) || !dns_view_isdelegationonly(fctx->res->view, &fctx->domain) || dns_name_equal(&fctx->domain, &fctx->name) || - !fix_mustbedelegationornxdomain(fctx->rmessage, fctx)) { + !fix_mustbedelegationornxdomain(fctx->rmessage, fctx)) + { return; } @@ -9951,8 +9927,7 @@ rctx_delonly_zone(respctx_t *rctx) *** Resolver Methods ***/ static void -destroy(dns_resolver_t *res) -{ +destroy(dns_resolver_t *res) { unsigned int i; alternate_t *a; @@ -10011,17 +9986,17 @@ destroy(dns_resolver_t *res) } static void -send_shutdown_events(dns_resolver_t *res) -{ +send_shutdown_events(dns_resolver_t *res) { isc_event_t *event, *next_event; - isc_task_t * etask; + isc_task_t *etask; /* * Caller must be holding the resolver lock. */ for (event = ISC_LIST_HEAD(res->whenshutdown); event != NULL; - event = next_event) { + event = next_event) + { next_event = ISC_LIST_NEXT(event, ev_link); ISC_LIST_UNLINK(res->whenshutdown, event, ev_link); etask = event->ev_sender; @@ -10031,8 +10006,7 @@ send_shutdown_events(dns_resolver_t *res) } static void -empty_bucket(dns_resolver_t *res) -{ +empty_bucket(dns_resolver_t *res) { RTRACE("empty_bucket"); LOCK(&res->lock); @@ -10047,12 +10021,11 @@ empty_bucket(dns_resolver_t *res) } static void -spillattimer_countdown(isc_task_t *task, isc_event_t *event) -{ +spillattimer_countdown(isc_task_t *task, isc_event_t *event) { dns_resolver_t *res = event->ev_arg; - isc_result_t result; - unsigned int count; - bool logit = false; + isc_result_t result; + unsigned int count; + bool logit = false; REQUIRE(VALID_RESOLVER(res)); @@ -10087,14 +10060,13 @@ dns_resolver_create(dns_view_t *view, isc_taskmgr_t *taskmgr, isc_socketmgr_t *socketmgr, isc_timermgr_t *timermgr, unsigned int options, dns_dispatchmgr_t *dispatchmgr, dns_dispatch_t *dispatchv4, dns_dispatch_t *dispatchv6, - dns_resolver_t **resp) -{ + dns_resolver_t **resp) { dns_resolver_t *res; - isc_result_t result = ISC_R_SUCCESS; - unsigned int i, buckets_created = 0, dbuckets_created = 0; - isc_task_t * task = NULL; - char name[16]; - unsigned dispattr; + isc_result_t result = ISC_R_SUCCESS; + unsigned int i, buckets_created = 0, dbuckets_created = 0; + isc_task_t *task = NULL; + char name[16]; + unsigned dispattr; /* * Create a resolver. @@ -10305,12 +10277,11 @@ cleanup_res: } static void -prime_done(isc_task_t *task, isc_event_t *event) -{ - dns_resolver_t * res; +prime_done(isc_task_t *task, isc_event_t *event) { + dns_resolver_t *res; dns_fetchevent_t *fevent; - dns_fetch_t * fetch; - dns_db_t * db = NULL; + dns_fetch_t *fetch; + dns_db_t *db = NULL; REQUIRE(event->ev_type == DNS_EVENT_FETCHDONE); fevent = (dns_fetchevent_t *)event; @@ -10335,7 +10306,8 @@ prime_done(isc_task_t *task, isc_event_t *event) UNLOCK(&res->lock); if (fevent->result == ISC_R_SUCCESS && res->view->cache != NULL && - res->view->hints != NULL) { + res->view->hints != NULL) + { dns_cache_attachdb(res->view->cache, &db); dns_root_checkhints(res->view, res->view->hints, db); dns_db_detach(&db); @@ -10359,11 +10331,10 @@ prime_done(isc_task_t *task, isc_event_t *event) } void -dns_resolver_prime(dns_resolver_t *res) -{ - bool want_priming = false; +dns_resolver_prime(dns_resolver_t *res) { + bool want_priming = false; dns_rdataset_t *rdataset; - isc_result_t result; + isc_result_t result; REQUIRE(VALID_RESOLVER(res)); REQUIRE(res->frozen); @@ -10413,8 +10384,7 @@ dns_resolver_prime(dns_resolver_t *res) } void -dns_resolver_freeze(dns_resolver_t *res) -{ +dns_resolver_freeze(dns_resolver_t *res) { /* * Freeze resolver. */ @@ -10425,8 +10395,7 @@ dns_resolver_freeze(dns_resolver_t *res) } void -dns_resolver_attach(dns_resolver_t *source, dns_resolver_t **targetp) -{ +dns_resolver_attach(dns_resolver_t *source, dns_resolver_t **targetp) { REQUIRE(VALID_RESOLVER(source)); REQUIRE(targetp != NULL && *targetp == NULL); @@ -10442,9 +10411,8 @@ dns_resolver_attach(dns_resolver_t *source, dns_resolver_t **targetp) void dns_resolver_whenshutdown(dns_resolver_t *res, isc_task_t *task, - isc_event_t **eventp) -{ - isc_task_t * tclone; + isc_event_t **eventp) { + isc_task_t *tclone; isc_event_t *event; REQUIRE(VALID_RESOLVER(res)); @@ -10472,12 +10440,11 @@ dns_resolver_whenshutdown(dns_resolver_t *res, isc_task_t *task, } void -dns_resolver_shutdown(dns_resolver_t *res) -{ +dns_resolver_shutdown(dns_resolver_t *res) { unsigned int i; - fetchctx_t * fctx; + fetchctx_t *fctx; isc_result_t result; - bool is_false = false; + bool is_false = false; REQUIRE(VALID_RESOLVER(res)); @@ -10490,7 +10457,8 @@ dns_resolver_shutdown(dns_resolver_t *res) for (i = 0; i < res->nbuckets; i++) { LOCK(&res->buckets[i].lock); for (fctx = ISC_LIST_HEAD(res->buckets[i].fctxs); - fctx != NULL; fctx = ISC_LIST_NEXT(fctx, link)) { + fctx != NULL; fctx = ISC_LIST_NEXT(fctx, link)) + { fctx_shutdown(fctx); } if (res->dispatches4 != NULL && !res->exclusivev4) { @@ -10520,8 +10488,7 @@ dns_resolver_shutdown(dns_resolver_t *res) } void -dns_resolver_detach(dns_resolver_t **resp) -{ +dns_resolver_detach(dns_resolver_t **resp) { dns_resolver_t *res; REQUIRE(resp != NULL); @@ -10542,13 +10509,13 @@ dns_resolver_detach(dns_resolver_t **resp) static inline bool fctx_match(fetchctx_t *fctx, const dns_name_t *name, dns_rdatatype_t type, - unsigned int options) -{ + unsigned int options) { /* * Don't match fetch contexts that are shutting down. */ if (fctx->cloned || fctx->state == fetchstate_done || - ISC_LIST_EMPTY(fctx->events)) { + ISC_LIST_EMPTY(fctx->events)) + { return (false); } @@ -10559,11 +10526,10 @@ fctx_match(fetchctx_t *fctx, const dns_name_t *name, dns_rdatatype_t type, } static inline void -log_fetch(const dns_name_t *name, dns_rdatatype_t type) -{ +log_fetch(const dns_name_t *name, dns_rdatatype_t type) { char namebuf[DNS_NAME_FORMATSIZE]; char typebuf[DNS_RDATATYPE_FORMATSIZE]; - int level = ISC_LOG_DEBUG(1); + int level = ISC_LOG_DEBUG(1); /* * If there's no chance of logging it, don't render (format) the @@ -10582,8 +10548,7 @@ log_fetch(const dns_name_t *name, dns_rdatatype_t type) } static isc_result_t -fctx_minimize_qname(fetchctx_t *fctx) -{ +fctx_minimize_qname(fetchctx_t *fctx) { isc_result_t result = ISC_R_SUCCESS; unsigned int dlabels, nlabels; @@ -10630,14 +10595,14 @@ fctx_minimize_qname(fetchctx_t *fctx) * We want to query for qmin_labels from fctx->name */ dns_fixedname_t fname; - dns_name_t * name = dns_fixedname_initname(&fname); + dns_name_t *name = dns_fixedname_initname(&fname); dns_name_split(&fctx->name, fctx->qmin_labels, NULL, dns_fixedname_name(&fname)); if ((fctx->options & DNS_FETCHOPT_QMIN_USE_A) != 0) { - isc_buffer_t dbuf; + isc_buffer_t dbuf; dns_fixedname_t tmpname; dns_name_t *tname = dns_fixedname_initname(&tmpname); - char ndata[DNS_NAME_MAXWIRE]; + char ndata[DNS_NAME_MAXWIRE]; isc_buffer_init(&dbuf, ndata, DNS_NAME_MAXWIRE); dns_fixedname_init(&tmpname); @@ -10675,25 +10640,24 @@ fctx_minimize_qname(fetchctx_t *fctx) isc_result_t dns_resolver_createfetch(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type, const dns_name_t *domain, - dns_rdataset_t * nameservers, - dns_forwarders_t * forwarders, + dns_rdataset_t *nameservers, + dns_forwarders_t *forwarders, const isc_sockaddr_t *client, dns_messageid_t id, unsigned int options, unsigned int depth, isc_counter_t *qc, isc_task_t *task, isc_taskaction_t action, void *arg, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, - dns_fetch_t **fetchp) -{ + dns_fetch_t **fetchp) { dns_fetch_t *fetch; - fetchctx_t * fctx = NULL; + fetchctx_t *fctx = NULL; isc_result_t result = ISC_R_SUCCESS; unsigned int bucketnum; - bool new_fctx = false; + bool new_fctx = false; isc_event_t *event; unsigned int count = 0; unsigned int spillat; unsigned int spillatmin; - bool dodestroy = false; + bool dodestroy = false; UNUSED(forwarders); @@ -10735,7 +10699,8 @@ dns_resolver_createfetch(dns_resolver_t *res, const dns_name_t *name, if ((options & DNS_FETCHOPT_UNSHARED) == 0) { for (fctx = ISC_LIST_HEAD(res->buckets[bucketnum].fctxs); - fctx != NULL; fctx = ISC_LIST_NEXT(fctx, link)) { + fctx != NULL; fctx = ISC_LIST_NEXT(fctx, link)) + { if (fctx_match(fctx, name, type, options)) { break; } @@ -10748,9 +10713,11 @@ dns_resolver_createfetch(dns_resolver_t *res, const dns_name_t *name, if (fctx != NULL && client != NULL) { dns_fetchevent_t *fevent; for (fevent = ISC_LIST_HEAD(fctx->events); fevent != NULL; - fevent = ISC_LIST_NEXT(fevent, ev_link)) { + fevent = ISC_LIST_NEXT(fevent, ev_link)) + { if (fevent->client != NULL && fevent->id == id && - isc_sockaddr_equal(fevent->client, client)) { + isc_sockaddr_equal(fevent->client, client)) + { result = DNS_R_DUPLICATE; goto unlock; } @@ -10820,12 +10787,11 @@ unlock: } void -dns_resolver_cancelfetch(dns_fetch_t *fetch) -{ - fetchctx_t * fctx; - dns_resolver_t * res; +dns_resolver_cancelfetch(dns_fetch_t *fetch) { + fetchctx_t *fctx; + dns_resolver_t *res; dns_fetchevent_t *event, *next_event; - isc_task_t * etask; + isc_task_t *etask; REQUIRE(DNS_FETCH_VALID(fetch)); fctx = fetch->private; @@ -10867,14 +10833,13 @@ dns_resolver_cancelfetch(dns_fetch_t *fetch) } void -dns_resolver_destroyfetch(dns_fetch_t **fetchp) -{ - dns_fetch_t * fetch; - dns_resolver_t * res; +dns_resolver_destroyfetch(dns_fetch_t **fetchp) { + dns_fetch_t *fetch; + dns_resolver_t *res; dns_fetchevent_t *event, *next_event; - fetchctx_t * fctx; - unsigned int bucketnum; - bool bucket_empty; + fetchctx_t *fctx; + unsigned int bucketnum; + bool bucket_empty; REQUIRE(fetchp != NULL); fetch = *fetchp; @@ -10915,11 +10880,10 @@ dns_resolver_destroyfetch(dns_fetch_t **fetchp) void dns_resolver_logfetch(dns_fetch_t *fetch, isc_log_t *lctx, isc_logcategory_t *category, isc_logmodule_t *module, - int level, bool duplicateok) -{ - fetchctx_t * fctx; + int level, bool duplicateok) { + fetchctx_t *fctx; dns_resolver_t *res; - char domainbuf[DNS_NAME_FORMATSIZE]; + char domainbuf[DNS_NAME_FORMATSIZE]; REQUIRE(DNS_FETCH_VALID(fetch)); fctx = fetch->private; @@ -10954,58 +10918,50 @@ dns_resolver_logfetch(dns_fetch_t *fetch, isc_log_t *lctx, } dns_dispatchmgr_t * -dns_resolver_dispatchmgr(dns_resolver_t *resolver) -{ +dns_resolver_dispatchmgr(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); return (resolver->dispatchmgr); } dns_dispatch_t * -dns_resolver_dispatchv4(dns_resolver_t *resolver) -{ +dns_resolver_dispatchv4(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); return (dns_dispatchset_get(resolver->dispatches4)); } dns_dispatch_t * -dns_resolver_dispatchv6(dns_resolver_t *resolver) -{ +dns_resolver_dispatchv6(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); return (dns_dispatchset_get(resolver->dispatches6)); } isc_socketmgr_t * -dns_resolver_socketmgr(dns_resolver_t *resolver) -{ +dns_resolver_socketmgr(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); return (resolver->socketmgr); } isc_taskmgr_t * -dns_resolver_taskmgr(dns_resolver_t *resolver) -{ +dns_resolver_taskmgr(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); return (resolver->taskmgr); } uint32_t -dns_resolver_getlamettl(dns_resolver_t *resolver) -{ +dns_resolver_getlamettl(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); return (resolver->lame_ttl); } void -dns_resolver_setlamettl(dns_resolver_t *resolver, uint32_t lame_ttl) -{ +dns_resolver_setlamettl(dns_resolver_t *resolver, uint32_t lame_ttl) { REQUIRE(VALID_RESOLVER(resolver)); resolver->lame_ttl = lame_ttl; } isc_result_t dns_resolver_addalternate(dns_resolver_t *resolver, const isc_sockaddr_t *alt, - const dns_name_t *name, in_port_t port) -{ + const dns_name_t *name, in_port_t port) { alternate_t *a; REQUIRE(VALID_RESOLVER(resolver)); @@ -11029,22 +10985,19 @@ dns_resolver_addalternate(dns_resolver_t *resolver, const isc_sockaddr_t *alt, } void -dns_resolver_setudpsize(dns_resolver_t *resolver, uint16_t udpsize) -{ +dns_resolver_setudpsize(dns_resolver_t *resolver, uint16_t udpsize) { REQUIRE(VALID_RESOLVER(resolver)); resolver->udpsize = udpsize; } uint16_t -dns_resolver_getudpsize(dns_resolver_t *resolver) -{ +dns_resolver_getudpsize(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); return (resolver->udpsize); } void -dns_resolver_flushbadcache(dns_resolver_t *resolver, const dns_name_t *name) -{ +dns_resolver_flushbadcache(dns_resolver_t *resolver, const dns_name_t *name) { if (name != NULL) { dns_badcache_flushname(resolver->badcache, name); } else { @@ -11053,15 +11006,13 @@ dns_resolver_flushbadcache(dns_resolver_t *resolver, const dns_name_t *name) } void -dns_resolver_flushbadnames(dns_resolver_t *resolver, const dns_name_t *name) -{ +dns_resolver_flushbadnames(dns_resolver_t *resolver, const dns_name_t *name) { dns_badcache_flushtree(resolver->badcache, name); } void dns_resolver_addbadcache(dns_resolver_t *resolver, const dns_name_t *name, - dns_rdatatype_t type, isc_time_t *expire) -{ + dns_rdatatype_t type, isc_time_t *expire) { #ifdef ENABLE_AFL if (!dns_fuzzing_resolver) #endif /* ifdef ENABLE_AFL */ @@ -11073,29 +11024,25 @@ dns_resolver_addbadcache(dns_resolver_t *resolver, const dns_name_t *name, bool dns_resolver_getbadcache(dns_resolver_t *resolver, const dns_name_t *name, - dns_rdatatype_t type, isc_time_t *now) -{ + dns_rdatatype_t type, isc_time_t *now) { return (dns_badcache_find(resolver->badcache, name, type, NULL, now)); } void -dns_resolver_printbadcache(dns_resolver_t *resolver, FILE *fp) -{ +dns_resolver_printbadcache(dns_resolver_t *resolver, FILE *fp) { (void)dns_badcache_print(resolver->badcache, "Bad cache", fp); } static void -free_algorithm(void *node, void *arg) -{ +free_algorithm(void *node, void *arg) { unsigned char *algorithms = node; - isc_mem_t * mctx = arg; + isc_mem_t *mctx = arg; isc_mem_put(mctx, algorithms, *algorithms); } void -dns_resolver_reset_algorithms(dns_resolver_t *resolver) -{ +dns_resolver_reset_algorithms(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); #if USE_ALGLOCK @@ -11111,12 +11058,11 @@ dns_resolver_reset_algorithms(dns_resolver_t *resolver) isc_result_t dns_resolver_disable_algorithm(dns_resolver_t *resolver, const dns_name_t *name, - unsigned int alg) -{ - unsigned int len, mask; + unsigned int alg) { + unsigned int len, mask; unsigned char *tmp; unsigned char *algorithms; - isc_result_t result; + isc_result_t result; dns_rbtnode_t *node = NULL; /* @@ -11186,14 +11132,13 @@ cleanup: } bool -dns_resolver_algorithm_supported(dns_resolver_t * resolver, - const dns_name_t *name, unsigned int alg) -{ - unsigned int len, mask; +dns_resolver_algorithm_supported(dns_resolver_t *resolver, + const dns_name_t *name, unsigned int alg) { + unsigned int len, mask; unsigned char *algorithms; - void * data = NULL; - isc_result_t result; - bool found = false; + void *data = NULL; + isc_result_t result; + bool found = false; REQUIRE(VALID_RESOLVER(resolver)); @@ -11231,17 +11176,15 @@ unlock: } static void -free_digest(void *node, void *arg) -{ +free_digest(void *node, void *arg) { unsigned char *digests = node; - isc_mem_t * mctx = arg; + isc_mem_t *mctx = arg; isc_mem_put(mctx, digests, *digests); } void -dns_resolver_reset_ds_digests(dns_resolver_t *resolver) -{ +dns_resolver_reset_ds_digests(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); #if USE_ALGLOCK @@ -11257,12 +11200,11 @@ dns_resolver_reset_ds_digests(dns_resolver_t *resolver) isc_result_t dns_resolver_disable_ds_digest(dns_resolver_t *resolver, const dns_name_t *name, - unsigned int digest_type) -{ - unsigned int len, mask; + unsigned int digest_type) { + unsigned int len, mask; unsigned char *tmp; unsigned char *digests; - isc_result_t result; + isc_result_t result; dns_rbtnode_t *node = NULL; /* @@ -11327,15 +11269,14 @@ cleanup: } bool -dns_resolver_ds_digest_supported(dns_resolver_t * resolver, +dns_resolver_ds_digest_supported(dns_resolver_t *resolver, const dns_name_t *name, - unsigned int digest_type) -{ - unsigned int len, mask; + unsigned int digest_type) { + unsigned int len, mask; unsigned char *digests; - void * data = NULL; - isc_result_t result; - bool found = false; + void *data = NULL; + isc_result_t result; + bool found = false; REQUIRE(VALID_RESOLVER(resolver)); @@ -11365,8 +11306,7 @@ unlock: } void -dns_resolver_resetmustbesecure(dns_resolver_t *resolver) -{ +dns_resolver_resetmustbesecure(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); #if USE_MBSLOCK @@ -11384,8 +11324,7 @@ static bool yes = true, no = false; isc_result_t dns_resolver_setmustbesecure(dns_resolver_t *resolver, const dns_name_t *name, - bool value) -{ + bool value) { isc_result_t result; REQUIRE(VALID_RESOLVER(resolver)); @@ -11410,10 +11349,9 @@ cleanup: } bool -dns_resolver_getmustbesecure(dns_resolver_t *resolver, const dns_name_t *name) -{ - void * data = NULL; - bool value = false; +dns_resolver_getmustbesecure(dns_resolver_t *resolver, const dns_name_t *name) { + void *data = NULL; + bool value = false; isc_result_t result; REQUIRE(VALID_RESOLVER(resolver)); @@ -11437,8 +11375,7 @@ unlock: void dns_resolver_getclientsperquery(dns_resolver_t *resolver, uint32_t *cur, - uint32_t *min, uint32_t *max) -{ + uint32_t *min, uint32_t *max) { REQUIRE(VALID_RESOLVER(resolver)); LOCK(&resolver->lock); @@ -11456,8 +11393,7 @@ dns_resolver_getclientsperquery(dns_resolver_t *resolver, uint32_t *cur, void dns_resolver_setclientsperquery(dns_resolver_t *resolver, uint32_t min, - uint32_t max) -{ + uint32_t max) { REQUIRE(VALID_RESOLVER(resolver)); LOCK(&resolver->lock); @@ -11467,48 +11403,42 @@ dns_resolver_setclientsperquery(dns_resolver_t *resolver, uint32_t min, } void -dns_resolver_setfetchesperzone(dns_resolver_t *resolver, uint32_t clients) -{ +dns_resolver_setfetchesperzone(dns_resolver_t *resolver, uint32_t clients) { REQUIRE(VALID_RESOLVER(resolver)); atomic_store_release(&resolver->zspill, clients); } bool -dns_resolver_getzeronosoattl(dns_resolver_t *resolver) -{ +dns_resolver_getzeronosoattl(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); return (resolver->zero_no_soa_ttl); } void -dns_resolver_setzeronosoattl(dns_resolver_t *resolver, bool state) -{ +dns_resolver_setzeronosoattl(dns_resolver_t *resolver, bool state) { REQUIRE(VALID_RESOLVER(resolver)); resolver->zero_no_soa_ttl = state; } unsigned int -dns_resolver_getoptions(dns_resolver_t *resolver) -{ +dns_resolver_getoptions(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); return (resolver->options); } unsigned int -dns_resolver_gettimeout(dns_resolver_t *resolver) -{ +dns_resolver_gettimeout(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); return (resolver->query_timeout); } void -dns_resolver_settimeout(dns_resolver_t *resolver, unsigned int timeout) -{ +dns_resolver_settimeout(dns_resolver_t *resolver, unsigned int timeout) { REQUIRE(VALID_RESOLVER(resolver)); if (timeout <= 300) { @@ -11529,67 +11459,58 @@ dns_resolver_settimeout(dns_resolver_t *resolver, unsigned int timeout) } void -dns_resolver_setquerydscp4(dns_resolver_t *resolver, isc_dscp_t dscp) -{ +dns_resolver_setquerydscp4(dns_resolver_t *resolver, isc_dscp_t dscp) { REQUIRE(VALID_RESOLVER(resolver)); resolver->querydscp4 = dscp; } isc_dscp_t -dns_resolver_getquerydscp4(dns_resolver_t *resolver) -{ +dns_resolver_getquerydscp4(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); return (resolver->querydscp4); } void -dns_resolver_setquerydscp6(dns_resolver_t *resolver, isc_dscp_t dscp) -{ +dns_resolver_setquerydscp6(dns_resolver_t *resolver, isc_dscp_t dscp) { REQUIRE(VALID_RESOLVER(resolver)); resolver->querydscp6 = dscp; } isc_dscp_t -dns_resolver_getquerydscp6(dns_resolver_t *resolver) -{ +dns_resolver_getquerydscp6(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); return (resolver->querydscp6); } void -dns_resolver_setmaxdepth(dns_resolver_t *resolver, unsigned int maxdepth) -{ +dns_resolver_setmaxdepth(dns_resolver_t *resolver, unsigned int maxdepth) { REQUIRE(VALID_RESOLVER(resolver)); resolver->maxdepth = maxdepth; } unsigned int -dns_resolver_getmaxdepth(dns_resolver_t *resolver) -{ +dns_resolver_getmaxdepth(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); return (resolver->maxdepth); } void -dns_resolver_setmaxqueries(dns_resolver_t *resolver, unsigned int queries) -{ +dns_resolver_setmaxqueries(dns_resolver_t *resolver, unsigned int queries) { REQUIRE(VALID_RESOLVER(resolver)); resolver->maxqueries = queries; } unsigned int -dns_resolver_getmaxqueries(dns_resolver_t *resolver) -{ +dns_resolver_getmaxqueries(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); return (resolver->maxqueries); } void dns_resolver_dumpfetches(dns_resolver_t *resolver, isc_statsformat_t format, - FILE *fp) -{ + FILE *fp) { int i; REQUIRE(VALID_RESOLVER(resolver)); @@ -11600,7 +11521,8 @@ dns_resolver_dumpfetches(dns_resolver_t *resolver, isc_statsformat_t format, fctxcount_t *fc; LOCK(&resolver->dbuckets[i].lock); for (fc = ISC_LIST_HEAD(resolver->dbuckets[i].list); fc != NULL; - fc = ISC_LIST_NEXT(fc, link)) { + fc = ISC_LIST_NEXT(fc, link)) + { dns_name_print(fc->domain, fp); fprintf(fp, ": %u active (%u spilled, %u allowed)\n", fc->count, fc->dropped, fc->allowed); @@ -11611,8 +11533,7 @@ dns_resolver_dumpfetches(dns_resolver_t *resolver, isc_statsformat_t format, void dns_resolver_setquotaresponse(dns_resolver_t *resolver, dns_quotatype_t which, - isc_result_t resp) -{ + isc_result_t resp) { REQUIRE(VALID_RESOLVER(resolver)); REQUIRE(which == dns_quotatype_zone || which == dns_quotatype_server); REQUIRE(resp == DNS_R_DROP || resp == DNS_R_SERVFAIL); @@ -11621,8 +11542,7 @@ dns_resolver_setquotaresponse(dns_resolver_t *resolver, dns_quotatype_t which, } isc_result_t -dns_resolver_getquotaresponse(dns_resolver_t *resolver, dns_quotatype_t which) -{ +dns_resolver_getquotaresponse(dns_resolver_t *resolver, dns_quotatype_t which) { REQUIRE(VALID_RESOLVER(resolver)); REQUIRE(which == dns_quotatype_zone || which == dns_quotatype_server); @@ -11630,16 +11550,14 @@ dns_resolver_getquotaresponse(dns_resolver_t *resolver, dns_quotatype_t which) } unsigned int -dns_resolver_getretryinterval(dns_resolver_t *resolver) -{ +dns_resolver_getretryinterval(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); return (resolver->retryinterval); } void -dns_resolver_setretryinterval(dns_resolver_t *resolver, unsigned int interval) -{ +dns_resolver_setretryinterval(dns_resolver_t *resolver, unsigned int interval) { REQUIRE(VALID_RESOLVER(resolver)); REQUIRE(interval > 0); @@ -11647,16 +11565,14 @@ dns_resolver_setretryinterval(dns_resolver_t *resolver, unsigned int interval) } unsigned int -dns_resolver_getnonbackofftries(dns_resolver_t *resolver) -{ +dns_resolver_getnonbackofftries(dns_resolver_t *resolver) { REQUIRE(VALID_RESOLVER(resolver)); return (resolver->nonbackofftries); } void -dns_resolver_setnonbackofftries(dns_resolver_t *resolver, unsigned int tries) -{ +dns_resolver_setnonbackofftries(dns_resolver_t *resolver, unsigned int tries) { REQUIRE(VALID_RESOLVER(resolver)); REQUIRE(tries > 0); diff --git a/lib/dns/result.c b/lib/dns/result.c index a4ef2bdb38..d1457ef43a 100644 --- a/lib/dns/result.c +++ b/lib/dns/result.c @@ -323,14 +323,13 @@ static const char *rcode_ids[DNS_R_NRCODERESULTS] = { "DNS_R_BADVERS", }; -#define DNS_RESULT_RESULTSET 2 +#define DNS_RESULT_RESULTSET 2 #define DNS_RESULT_RCODERESULTSET 3 static isc_once_t once = ISC_ONCE_INIT; static void -initialize_action(void) -{ +initialize_action(void) { isc_result_t result; result = isc_result_register(ISC_RESULTCLASS_DNS, DNS_R_NRESULTS, text, @@ -359,28 +358,24 @@ initialize_action(void) } static void -initialize(void) -{ +initialize(void) { RUNTIME_CHECK(isc_once_do(&once, initialize_action) == ISC_R_SUCCESS); } const char * -dns_result_totext(isc_result_t result) -{ +dns_result_totext(isc_result_t result) { initialize(); return (isc_result_totext(result)); } void -dns_result_register(void) -{ +dns_result_register(void) { initialize(); } dns_rcode_t -dns_result_torcode(isc_result_t result) -{ +dns_result_torcode(isc_result_t result) { dns_rcode_t rcode = dns_rcode_servfail; if (DNS_RESULT_ISRCODE(result)) { diff --git a/lib/dns/rootns.c b/lib/dns/rootns.c index ef3e575bbf..4ee255c8d8 100644 --- a/lib/dns/rootns.c +++ b/lib/dns/rootns.c @@ -78,10 +78,9 @@ static char root_ns[] = "M.ROOT-SERVERS.NET. 3600000 IN AAAA 2001:DC3::35\n"; static isc_result_t -in_rootns(dns_rdataset_t *rootns, dns_name_t *name) -{ - isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; +in_rootns(dns_rdataset_t *rootns, dns_name_t *name) { + isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_ns_t ns; if (!dns_rdataset_isassociated(rootns)) { @@ -109,9 +108,8 @@ in_rootns(dns_rdataset_t *rootns, dns_name_t *name) static isc_result_t check_node(dns_rdataset_t *rootns, dns_name_t *name, - dns_rdatasetiter_t *rdsiter) -{ - isc_result_t result; + dns_rdatasetiter_t *rdsiter) { + isc_result_t result; dns_rdataset_t rdataset; dns_rdataset_init(&rdataset); @@ -149,15 +147,14 @@ cleanup: } static isc_result_t -check_hints(dns_db_t *db) -{ - isc_result_t result; - dns_rdataset_t rootns; - dns_dbiterator_t * dbiter = NULL; - dns_dbnode_t * node = NULL; - isc_stdtime_t now; - dns_fixedname_t fixname; - dns_name_t * name; +check_hints(dns_db_t *db) { + isc_result_t result; + dns_rdataset_t rootns; + dns_dbiterator_t *dbiter = NULL; + dns_dbnode_t *node = NULL; + isc_stdtime_t now; + dns_fixedname_t fixname; + dns_name_t *name; dns_rdatasetiter_t *rdsiter = NULL; isc_stdtime_get(&now); @@ -211,13 +208,12 @@ cleanup: isc_result_t dns_rootns_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, - const char *filename, dns_db_t **target) -{ - isc_result_t result, eresult; - isc_buffer_t source; - unsigned int len; + const char *filename, dns_db_t **target) { + isc_result_t result, eresult; + isc_buffer_t source; + unsigned int len; dns_rdatacallbacks_t callbacks; - dns_db_t * db = NULL; + dns_db_t *db = NULL; REQUIRE(target != NULL && *target == NULL); @@ -286,17 +282,17 @@ failure: } static void -report(dns_view_t *view, dns_name_t *name, bool missing, dns_rdata_t *rdata) -{ +report(dns_view_t *view, dns_name_t *name, bool missing, dns_rdata_t *rdata) { const char *viewname = "", *sep = ""; - char namebuf[DNS_NAME_FORMATSIZE]; - char typebuf[DNS_RDATATYPE_FORMATSIZE]; + char namebuf[DNS_NAME_FORMATSIZE]; + char typebuf[DNS_RDATATYPE_FORMATSIZE]; char databuf[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:123.123.123.123")]; isc_buffer_t buffer; isc_result_t result; if (strcmp(view->name, "_bind") != 0 && strcmp(view->name, "_defaul" - "t") != 0) { + "t") != 0) + { viewname = view->name; sep = ": view "; } @@ -323,10 +319,9 @@ report(dns_view_t *view, dns_name_t *name, bool missing, dns_rdata_t *rdata) } static bool -inrrset(dns_rdataset_t *rrset, dns_rdata_t *rdata) -{ +inrrset(dns_rdataset_t *rrset, dns_rdata_t *rdata) { isc_result_t result; - dns_rdata_t current = DNS_RDATA_INIT; + dns_rdata_t current = DNS_RDATA_INIT; result = dns_rdataset_first(rrset); while (result == ISC_R_SUCCESS) { @@ -348,12 +343,11 @@ inrrset(dns_rdataset_t *rrset, dns_rdata_t *rdata) static void check_address_records(dns_view_t *view, dns_db_t *hints, dns_db_t *db, - dns_name_t *name, isc_stdtime_t now) -{ - isc_result_t hresult, rresult, result; - dns_rdataset_t hintrrset, rootrrset; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_name_t * foundname; + dns_name_t *name, isc_stdtime_t now) { + isc_result_t hresult, rresult, result; + dns_rdataset_t hintrrset, rootrrset; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_name_t *foundname; dns_fixedname_t fixed; dns_rdataset_init(&hintrrset); @@ -366,7 +360,8 @@ check_address_records(dns_view_t *view, dns_db_t *hints, dns_db_t *db, DNS_DBFIND_GLUEOK, now, NULL, foundname, &rootrrset, NULL); if (hresult == ISC_R_SUCCESS && - (rresult == ISC_R_SUCCESS || rresult == DNS_R_GLUE)) { + (rresult == ISC_R_SUCCESS || rresult == DNS_R_GLUE)) + { result = dns_rdataset_first(&rootrrset); while (result == ISC_R_SUCCESS) { dns_rdata_reset(&rdata); @@ -387,7 +382,8 @@ check_address_records(dns_view_t *view, dns_db_t *hints, dns_db_t *db, } } if (hresult == ISC_R_NOTFOUND && - (rresult == ISC_R_SUCCESS || rresult == DNS_R_GLUE)) { + (rresult == ISC_R_SUCCESS || rresult == DNS_R_GLUE)) + { result = dns_rdataset_first(&rootrrset); while (result == ISC_R_SUCCESS) { dns_rdata_reset(&rdata); @@ -412,7 +408,8 @@ check_address_records(dns_view_t *view, dns_db_t *hints, dns_db_t *db, DNS_DBFIND_GLUEOK, now, NULL, foundname, &rootrrset, NULL); if (hresult == ISC_R_SUCCESS && - (rresult == ISC_R_SUCCESS || rresult == DNS_R_GLUE)) { + (rresult == ISC_R_SUCCESS || rresult == DNS_R_GLUE)) + { result = dns_rdataset_first(&rootrrset); while (result == ISC_R_SUCCESS) { dns_rdata_reset(&rdata); @@ -435,7 +432,8 @@ check_address_records(dns_view_t *view, dns_db_t *hints, dns_db_t *db, } } if (hresult == ISC_R_NOTFOUND && - (rresult == ISC_R_SUCCESS || rresult == DNS_R_GLUE)) { + (rresult == ISC_R_SUCCESS || rresult == DNS_R_GLUE)) + { result = dns_rdataset_first(&rootrrset); while (result == ISC_R_SUCCESS) { dns_rdata_reset(&rdata); @@ -454,15 +452,14 @@ check_address_records(dns_view_t *view, dns_db_t *hints, dns_db_t *db, } void -dns_root_checkhints(dns_view_t *view, dns_db_t *hints, dns_db_t *db) -{ - isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdata_ns_t ns; - dns_rdataset_t hintns, rootns; - const char * viewname = "", *sep = ""; - isc_stdtime_t now; - dns_name_t * name; +dns_root_checkhints(dns_view_t *view, dns_db_t *hints, dns_db_t *db) { + isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_ns_t ns; + dns_rdataset_t hintns, rootns; + const char *viewname = "", *sep = ""; + isc_stdtime_t now; + dns_name_t *name; dns_fixedname_t fixed; REQUIRE(hints != NULL); @@ -472,7 +469,8 @@ dns_root_checkhints(dns_view_t *view, dns_db_t *hints, dns_db_t *db) isc_stdtime_get(&now); if (strcmp(view->name, "_bind") != 0 && strcmp(view->name, "_defaul" - "t") != 0) { + "t") != 0) + { viewname = view->name; sep = ": view "; } diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c index 6551b38bab..9367848da4 100644 --- a/lib/dns/rpz.c +++ b/lib/dns/rpz.c @@ -91,11 +91,9 @@ */ #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 @@ -103,8 +101,8 @@ dns_rpz_update_taskaction(isc_task_t *task, isc_event_t *event); */ typedef uint32_t dns_rpz_cidr_word_t; #define DNS_RPZ_CIDR_WORD_BITS ((int)sizeof(dns_rpz_cidr_word_t) * 8) -#define DNS_RPZ_CIDR_KEY_BITS ((int)sizeof(dns_rpz_cidr_key_t) * 8) -#define DNS_RPZ_CIDR_WORDS (128 / DNS_RPZ_CIDR_WORD_BITS) +#define DNS_RPZ_CIDR_KEY_BITS ((int)sizeof(dns_rpz_cidr_key_t) * 8) +#define DNS_RPZ_CIDR_WORDS (128 / DNS_RPZ_CIDR_WORD_BITS) typedef struct { dns_rpz_cidr_word_t w[DNS_RPZ_CIDR_WORDS]; } dns_rpz_cidr_key_t; @@ -143,8 +141,8 @@ struct dns_rpz_addr_zbits { struct dns_rpz_cidr_node { dns_rpz_cidr_node_t *parent; dns_rpz_cidr_node_t *child[2]; - dns_rpz_cidr_key_t ip; - dns_rpz_prefix_t prefix; + dns_rpz_cidr_key_t ip; + dns_rpz_prefix_t prefix; dns_rpz_addr_zbits_t set; dns_rpz_addr_zbits_t sum; }; @@ -170,11 +168,9 @@ 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 /* @@ -196,8 +192,7 @@ catch_name(const dns_name_t *src_name, const char *tgt, const char *str) { #endif /* if 0 */ const char * -dns_rpz_type2str(dns_rpz_type_t type) -{ +dns_rpz_type2str(dns_rpz_type_t type) { switch (type) { case DNS_RPZ_TYPE_CLIENT_IP: return ("CLIENT-IP"); @@ -217,10 +212,9 @@ dns_rpz_type2str(dns_rpz_type_t type) } dns_rpz_policy_t -dns_rpz_str2policy(const char *str) -{ +dns_rpz_str2policy(const char *str) { static struct { - const char * str; + const char *str; dns_rpz_policy_t policy; } tbl[] = { { "given", DNS_RPZ_POLICY_GIVEN }, @@ -247,8 +241,7 @@ dns_rpz_str2policy(const char *str) } const char * -dns_rpz_policy2str(dns_rpz_policy_t policy) -{ +dns_rpz_policy2str(dns_rpz_policy_t policy) { const char *str; switch (policy) { @@ -292,8 +285,7 @@ dns_rpz_policy2str(dns_rpz_policy_t policy) * (for example, 0x01 returns 0, 0xFF returns 7, etc.) */ static int -zbit_to_num(dns_rpz_zbits_t zbit) -{ +zbit_to_num(dns_rpz_zbits_t zbit) { dns_rpz_num_t rpz_num; REQUIRE(zbit != 0); @@ -329,8 +321,7 @@ zbit_to_num(dns_rpz_zbits_t zbit) */ static void make_addr_set(dns_rpz_addr_zbits_t *tgt_set, dns_rpz_zbits_t zbits, - dns_rpz_type_t type) -{ + dns_rpz_type_t type) { switch (type) { case DNS_RPZ_TYPE_CLIENT_IP: tgt_set->client_ip = zbits; @@ -355,8 +346,7 @@ make_addr_set(dns_rpz_addr_zbits_t *tgt_set, dns_rpz_zbits_t zbits, static void make_nm_set(dns_rpz_nm_zbits_t *tgt_set, dns_rpz_num_t rpz_num, - dns_rpz_type_t type) -{ + dns_rpz_type_t type) { switch (type) { case DNS_RPZ_TYPE_QNAME: tgt_set->qname = DNS_RPZ_ZBIT(rpz_num); @@ -376,8 +366,7 @@ make_nm_set(dns_rpz_nm_zbits_t *tgt_set, dns_rpz_num_t rpz_num, * Mark a node and all of its parents as having client-IP, IP, or NSIP data */ static void -set_sum_pair(dns_rpz_cidr_node_t *cnode) -{ +set_sum_pair(dns_rpz_cidr_node_t *cnode) { dns_rpz_cidr_node_t *child; dns_rpz_addr_zbits_t sum; @@ -399,7 +388,8 @@ set_sum_pair(dns_rpz_cidr_node_t *cnode) } if (cnode->sum.client_ip == sum.client_ip && - cnode->sum.ip == sum.ip && cnode->sum.nsip == sum.nsip) { + cnode->sum.ip == sum.ip && cnode->sum.nsip == sum.nsip) + { break; } cnode->sum = sum; @@ -409,8 +399,7 @@ set_sum_pair(dns_rpz_cidr_node_t *cnode) /* Caller must hold rpzs->maint_lock */ static void -fix_qname_skip_recurse(dns_rpz_zones_t *rpzs) -{ +fix_qname_skip_recurse(dns_rpz_zones_t *rpzs) { dns_rpz_zbits_t mask; /* @@ -580,10 +569,9 @@ set: static void adj_trigger_cnt(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, dns_rpz_type_t rpz_type, const dns_rpz_cidr_key_t *tgt_ip, - dns_rpz_prefix_t tgt_prefix, bool inc) -{ + dns_rpz_prefix_t tgt_prefix, bool inc) { dns_rpz_trigger_counter_t *cnt = NULL; - dns_rpz_zbits_t * have = NULL; + dns_rpz_zbits_t *have = NULL; switch (rpz_type) { case DNS_RPZ_TYPE_CLIENT_IP: @@ -645,10 +633,9 @@ adj_trigger_cnt(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, static dns_rpz_cidr_node_t * new_node(dns_rpz_zones_t *rpzs, const dns_rpz_cidr_key_t *ip, - dns_rpz_prefix_t prefix, const dns_rpz_cidr_node_t *child) -{ + dns_rpz_prefix_t prefix, const dns_rpz_cidr_node_t *child) { dns_rpz_cidr_node_t *node; - int i, words, wlen; + int i, words, wlen; node = isc_mem_get(rpzs->mctx, sizeof(*node)); memset(node, 0, sizeof(*node)); @@ -677,8 +664,7 @@ new_node(dns_rpz_zones_t *rpzs, const dns_rpz_cidr_key_t *ip, } static void -badname(int level, const dns_name_t *name, const char *str1, const char *str2) -{ +badname(int level, const dns_name_t *name, const char *str1, const char *str2) { char namebuf[DNS_NAME_FORMATSIZE]; /* @@ -706,17 +692,16 @@ badname(int level, const dns_name_t *name, const char *str1, const char *str2) */ static isc_result_t ip2name(const dns_rpz_cidr_key_t *tgt_ip, dns_rpz_prefix_t tgt_prefix, - const dns_name_t *base_name, dns_name_t *ip_name) -{ + const dns_name_t *base_name, dns_name_t *ip_name) { #ifndef INET6_ADDRSTRLEN #define INET6_ADDRSTRLEN 46 #endif /* ifndef INET6_ADDRSTRLEN */ - int w[DNS_RPZ_CIDR_WORDS * 2]; - char str[1 + 8 + 1 + INET6_ADDRSTRLEN + 1]; + int w[DNS_RPZ_CIDR_WORDS * 2]; + char str[1 + 8 + 1 + INET6_ADDRSTRLEN + 1]; isc_buffer_t buffer; isc_result_t result; - int best_first, best_len, cur_first, cur_len; - int i, n, len; + int best_first, best_len, cur_first, cur_len; + int i, n, len; if (KEY_IS_IPV4(tgt_prefix, tgt_ip)) { len = snprintf(str, sizeof(str), "%u.%u.%u.%u.%u", @@ -787,8 +772,7 @@ ip2name(const dns_rpz_cidr_key_t *tgt_ip, dns_rpz_prefix_t tgt_prefix, */ static dns_rpz_type_t type_from_name(const dns_rpz_zones_t *rpzs, dns_rpz_zone_t *rpz, - const dns_name_t *name) -{ + const dns_name_t *name) { if (dns_name_issubdomain(name, &rpz->ip)) { return (DNS_RPZ_TYPE_IP); } @@ -798,12 +782,14 @@ type_from_name(const dns_rpz_zones_t *rpzs, dns_rpz_zone_t *rpz, } if ((rpzs->p.nsip_on & DNS_RPZ_ZBIT(rpz->num)) != 0 && - dns_name_issubdomain(name, &rpz->nsip)) { + dns_name_issubdomain(name, &rpz->nsip)) + { return (DNS_RPZ_TYPE_NSIP); } if ((rpzs->p.nsdname_on & DNS_RPZ_ZBIT(rpz->num)) != 0 && - dns_name_issubdomain(name, &rpz->nsdname)) { + dns_name_issubdomain(name, &rpz->nsdname)) + { return (DNS_RPZ_TYPE_NSDNAME); } @@ -819,20 +805,19 @@ static isc_result_t name2ipkey(int log_level, const dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, dns_rpz_type_t rpz_type, const dns_name_t *src_name, dns_rpz_cidr_key_t *tgt_ip, dns_rpz_prefix_t *tgt_prefix, - dns_rpz_addr_zbits_t *new_set) -{ + dns_rpz_addr_zbits_t *new_set) { dns_rpz_zone_t *rpz; - char ip_str[DNS_NAME_FORMATSIZE], ip2_str[DNS_NAME_FORMATSIZE]; + char ip_str[DNS_NAME_FORMATSIZE], ip2_str[DNS_NAME_FORMATSIZE]; dns_offsets_t ip_name_offsets; - dns_fixedname_t ip_name2f; - dns_name_t ip_name, *ip_name2; - const char * prefix_str, *cp, *end; - char * cp2; - int ip_labels; + dns_fixedname_t ip_name2f; + dns_name_t ip_name, *ip_name2; + const char *prefix_str, *cp, *end; + char *cp2; + int ip_labels; dns_rpz_prefix_t prefix; - unsigned long prefix_num, l; - isc_result_t result; - int i; + unsigned long prefix_num, l; + isc_result_t result; + int i; REQUIRE(rpzs != NULL && rpz_num < rpzs->p.num_zones); rpz = rpzs->zones[rpz_num]; @@ -1000,12 +985,11 @@ name2ipkey(int log_level, const dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, static void name2data(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, dns_rpz_type_t rpz_type, const dns_name_t *src_name, dns_name_t *trig_name, - dns_rpz_nm_data_t *new_data) -{ + dns_rpz_nm_data_t *new_data) { dns_rpz_zone_t *rpz; - dns_offsets_t tmp_name_offsets; - dns_name_t tmp_name; - unsigned int prefix_len, n; + dns_offsets_t tmp_name_offsets; + dns_name_t tmp_name; + unsigned int prefix_len, n; REQUIRE(rpzs != NULL && rpz_num < rpzs->p.num_zones); rpz = rpzs->zones[rpz_num]; @@ -1044,8 +1028,7 @@ name2data(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, dns_rpz_type_t rpz_type, * bit. */ static inline unsigned int -clz(dns_rpz_cidr_word_t w) -{ +clz(dns_rpz_cidr_word_t w) { unsigned int bit; bit = DNS_RPZ_CIDR_WORD_BITS - 1; @@ -1083,11 +1066,10 @@ clz(dns_rpz_cidr_word_t w) */ static int diff_keys(const dns_rpz_cidr_key_t *key1, dns_rpz_prefix_t prefix1, - const dns_rpz_cidr_key_t *key2, dns_rpz_prefix_t prefix2) -{ + const dns_rpz_cidr_key_t *key2, dns_rpz_prefix_t prefix2) { dns_rpz_cidr_word_t delta; - dns_rpz_prefix_t maxbit, bit; - int i; + dns_rpz_prefix_t maxbit, bit; + int i; bit = 0; maxbit = ISC_MIN(prefix1, prefix2); @@ -1114,8 +1096,7 @@ diff_keys(const dns_rpz_cidr_key_t *key1, dns_rpz_prefix_t prefix1, * clear all bits for higher numbered zones. */ static inline dns_rpz_zbits_t -trim_zbits(dns_rpz_zbits_t zbits, dns_rpz_zbits_t found) -{ +trim_zbits(dns_rpz_zbits_t zbits, dns_rpz_zbits_t found) { dns_rpz_zbits_t x; /* @@ -1139,13 +1120,12 @@ trim_zbits(dns_rpz_zbits_t zbits, dns_rpz_zbits_t found) static isc_result_t search(dns_rpz_zones_t *rpzs, const dns_rpz_cidr_key_t *tgt_ip, dns_rpz_prefix_t tgt_prefix, const dns_rpz_addr_zbits_t *tgt_set, - bool create, dns_rpz_cidr_node_t **found) -{ + bool create, dns_rpz_cidr_node_t **found) { dns_rpz_cidr_node_t *cur, *parent, *child, *new_parent, *sibling; dns_rpz_addr_zbits_t set; - int cur_num, child_num; - dns_rpz_prefix_t dbit; - isc_result_t find_result; + int cur_num, child_num; + dns_rpz_prefix_t dbit; + isc_result_t find_result; set = *tgt_set; find_result = ISC_R_NOTFOUND; @@ -1183,7 +1163,8 @@ search(dns_rpz_zones_t *rpzs, const dns_rpz_cidr_key_t *tgt_ip, if ((cur->sum.client_ip & set.client_ip) == 0 && (cur->sum.ip & set.ip) == 0 && - (cur->sum.nsip & set.nsip) == 0) { + (cur->sum.nsip & set.nsip) == 0) + { /* * This node has no relevant data * and is in none of the target trees. @@ -1209,7 +1190,8 @@ search(dns_rpz_zones_t *rpzs, const dns_rpz_cidr_key_t *tgt_ip, */ if ((cur->set.client_ip & set.client_ip) != 0 || (cur->set.ip & set.ip) != 0 || - (cur->set.nsip & set.nsip) != 0) { + (cur->set.nsip & set.nsip) != 0) + { /* * It is the answer if it has data. */ @@ -1266,7 +1248,8 @@ search(dns_rpz_zones_t *rpzs, const dns_rpz_cidr_key_t *tgt_ip, if (dbit == cur->prefix) { if ((cur->set.client_ip & set.client_ip) != 0 || (cur->set.ip & set.ip) != 0 || - (cur->set.nsip & set.nsip) != 0) { + (cur->set.nsip & set.nsip) != 0) + { /* * We have a partial match between of all of the * current node but only part of the target. @@ -1328,13 +1311,12 @@ search(dns_rpz_zones_t *rpzs, const dns_rpz_cidr_key_t *tgt_ip, */ static isc_result_t add_cidr(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, dns_rpz_type_t rpz_type, - const dns_name_t *src_name) -{ - dns_rpz_cidr_key_t tgt_ip; - dns_rpz_prefix_t tgt_prefix; + const dns_name_t *src_name) { + dns_rpz_cidr_key_t tgt_ip; + dns_rpz_prefix_t tgt_prefix; dns_rpz_addr_zbits_t set; dns_rpz_cidr_node_t *found; - isc_result_t result; + isc_result_t result; result = name2ipkey(DNS_RPZ_ERROR_LEVEL, rpzs, rpz_num, rpz_type, src_name, &tgt_ip, &tgt_prefix, &set); @@ -1374,11 +1356,10 @@ add_cidr(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, dns_rpz_type_t rpz_type, static isc_result_t add_nm(dns_rpz_zones_t *rpzs, dns_name_t *trig_name, - const dns_rpz_nm_data_t *new_data) -{ - dns_rbtnode_t * nmnode; + const dns_rpz_nm_data_t *new_data) { + dns_rbtnode_t *nmnode; dns_rpz_nm_data_t *nm_data; - isc_result_t result; + isc_result_t result; nmnode = NULL; result = dns_rbt_addnode(rpzs->rbt, trig_name, &nmnode); @@ -1403,7 +1384,8 @@ add_nm(dns_rpz_zones_t *rpzs, dns_name_t *trig_name, if ((nm_data->set.qname & new_data->set.qname) != 0 || (nm_data->set.ns & new_data->set.ns) != 0 || (nm_data->wild.qname & new_data->wild.qname) != 0 || - (nm_data->wild.ns & new_data->wild.ns) != 0) { + (nm_data->wild.ns & new_data->wild.ns) != 0) + { return (ISC_R_EXISTS); } @@ -1416,12 +1398,11 @@ add_nm(dns_rpz_zones_t *rpzs, dns_name_t *trig_name, static isc_result_t add_name(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, dns_rpz_type_t rpz_type, - const dns_name_t *src_name) -{ + const dns_name_t *src_name) { dns_rpz_nm_data_t new_data; - dns_fixedname_t trig_namef; - dns_name_t * trig_name; - isc_result_t result; + dns_fixedname_t trig_namef; + dns_name_t *trig_name; + isc_result_t result; /* * We need a summary database of names even with 1 policy zone, @@ -1450,8 +1431,7 @@ add_name(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, dns_rpz_type_t rpz_type, * Callback to free the data for a node in the summary RBT database. */ static void -rpz_node_deleter(void *nm_data, void *mctx) -{ +rpz_node_deleter(void *nm_data, void *mctx) { isc_mem_put(mctx, nm_data, sizeof(dns_rpz_nm_data_t)); } @@ -1461,10 +1441,9 @@ rpz_node_deleter(void *nm_data, void *mctx) isc_result_t dns_rpz_new_zones(dns_rpz_zones_t **rpzsp, char *rps_cstr, size_t rps_cstr_size, isc_mem_t *mctx, isc_taskmgr_t *taskmgr, - isc_timermgr_t *timermgr) -{ + isc_timermgr_t *timermgr) { dns_rpz_zones_t *zones; - isc_result_t result; + isc_result_t result; REQUIRE(rpzsp != NULL && *rpzsp == NULL); @@ -1530,10 +1509,9 @@ cleanup_rwlock: } isc_result_t -dns_rpz_new_zone(dns_rpz_zones_t *rpzs, dns_rpz_zone_t **rpzp) -{ +dns_rpz_new_zone(dns_rpz_zones_t *rpzs, dns_rpz_zone_t **rpzp) { dns_rpz_zone_t *zone; - isc_result_t result; + isc_result_t result; REQUIRE(rpzp != NULL && *rpzp == NULL); REQUIRE(rpzs != NULL); @@ -1609,13 +1587,12 @@ cleanup_timer: } isc_result_t -dns_rpz_dbupdate_callback(dns_db_t *db, void *fn_arg) -{ +dns_rpz_dbupdate_callback(dns_db_t *db, void *fn_arg) { dns_rpz_zone_t *zone = (dns_rpz_zone_t *)fn_arg; - isc_time_t now; - uint64_t tdiff; - isc_result_t result = ISC_R_SUCCESS; - char dname[DNS_NAME_FORMATSIZE]; + isc_time_t now; + uint64_t tdiff; + isc_result_t result = ISC_R_SUCCESS; + char dname[DNS_NAME_FORMATSIZE]; REQUIRE(DNS_DB_VALID(db)); REQUIRE(zone != NULL); @@ -1694,9 +1671,8 @@ cleanup: } static void -dns_rpz_update_taskaction(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result; +dns_rpz_update_taskaction(isc_task_t *task, isc_event_t *event) { + isc_result_t result; dns_rpz_zone_t *zone; REQUIRE(event != NULL); @@ -1718,12 +1694,11 @@ dns_rpz_update_taskaction(isc_task_t *task, isc_event_t *event) } static isc_result_t -setup_update(dns_rpz_zone_t *rpz) -{ +setup_update(dns_rpz_zone_t *rpz) { isc_result_t result; - char domain[DNS_NAME_FORMATSIZE]; + char domain[DNS_NAME_FORMATSIZE]; unsigned int nodecount; - uint32_t hashsize; + uint32_t hashsize; dns_name_format(&rpz->origin, domain, DNS_NAME_FORMATSIZE); isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_MASTER, @@ -1796,14 +1771,13 @@ cleanup: } static void -finish_update(dns_rpz_zone_t *rpz) -{ - isc_result_t result; - isc_ht_t * tmpht = NULL; - isc_ht_iter_t * iter = NULL; +finish_update(dns_rpz_zone_t *rpz) { + isc_result_t result; + isc_ht_t *tmpht = NULL; + isc_ht_iter_t *iter = NULL; dns_fixedname_t fname; - char dname[DNS_NAME_FORMATSIZE]; - dns_name_t * name; + char dname[DNS_NAME_FORMATSIZE]; + dns_name_t *name; /* * Iterate over old ht with existing nodes deleted to delete @@ -1824,10 +1798,11 @@ finish_update(dns_rpz_zone_t *rpz) name = dns_fixedname_initname(&fname); for (result = isc_ht_iter_first(iter); result == ISC_R_SUCCESS; - result = isc_ht_iter_delcurrent_next(iter)) { - isc_region_t region; + result = isc_ht_iter_delcurrent_next(iter)) + { + isc_region_t region; unsigned char *key = NULL; - size_t keysize; + size_t keysize; isc_ht_iter_currentkey(iter, &key, &keysize); region.base = key; @@ -1847,7 +1822,7 @@ finish_update(dns_rpz_zone_t *rpz) */ if (rpz->updatepending == true) { if (rpz->min_update_interval > 0) { - uint64_t defer = rpz->min_update_interval; + uint64_t defer = rpz->min_update_interval; isc_interval_t interval; dns_name_format(&rpz->origin, dname, DNS_NAME_FORMATSIZE); @@ -1881,15 +1856,14 @@ cleanup: } static void -update_quantum(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result = ISC_R_SUCCESS; - dns_dbnode_t * node = NULL; +update_quantum(isc_task_t *task, isc_event_t *event) { + isc_result_t result = ISC_R_SUCCESS; + dns_dbnode_t *node = NULL; dns_rpz_zone_t *rpz; - char domain[DNS_NAME_FORMATSIZE]; + char domain[DNS_NAME_FORMATSIZE]; dns_fixedname_t fixname; - dns_name_t * name; - int count = 0; + dns_name_t *name; + int count = 0; UNUSED(task); @@ -1907,7 +1881,7 @@ update_quantum(isc_task_t *task, isc_event_t *event) dns_name_format(&rpz->origin, domain, DNS_NAME_FORMATSIZE); while (result == ISC_R_SUCCESS && count++ < DNS_RPZ_QUANTUM) { - char namebuf[DNS_NAME_FORMATSIZE]; + char namebuf[DNS_NAME_FORMATSIZE]; dns_rdatasetiter_t *rdsiter = NULL; result = dns_dbiterator_current(rpz->updbit, &node, name); @@ -2033,8 +2007,7 @@ update_quantum(isc_task_t *task, isc_event_t *event) } static void -dns_rpz_update_from_db(dns_rpz_zone_t *rpz) -{ +dns_rpz_update_from_db(dns_rpz_zone_t *rpz) { isc_result_t result; isc_event_t *event; @@ -2079,8 +2052,7 @@ cleanup: * Free the radix tree of a response policy database. */ static void -cidr_free(dns_rpz_zones_t *rpzs) -{ +cidr_free(dns_rpz_zones_t *rpzs) { dns_rpz_cidr_node_t *cur, *child, *parent; cur = rpzs->cidr; @@ -2114,9 +2086,8 @@ cidr_free(dns_rpz_zones_t *rpzs) * before discarding the overall rpz structure. */ static void -rpz_detach(dns_rpz_zone_t **rpzp) -{ - dns_rpz_zone_t * rpz; +rpz_detach(dns_rpz_zone_t **rpzp) { + dns_rpz_zone_t *rpz; dns_rpz_zones_t *rpzs; REQUIRE(rpzp != NULL && *rpzp != NULL); @@ -2190,8 +2161,7 @@ rpz_detach(dns_rpz_zone_t **rpzp) } void -dns_rpz_attach_rpzs(dns_rpz_zones_t *rpzs, dns_rpz_zones_t **rpzsp) -{ +dns_rpz_attach_rpzs(dns_rpz_zones_t *rpzs, dns_rpz_zones_t **rpzsp) { REQUIRE(rpzsp != NULL && *rpzsp == NULL); isc_refcount_increment(&rpzs->refs); *rpzsp = rpzs; @@ -2201,8 +2171,7 @@ dns_rpz_attach_rpzs(dns_rpz_zones_t *rpzs, dns_rpz_zones_t **rpzsp) * Forget a view's policy zones. */ void -dns_rpz_detach_rpzs(dns_rpz_zones_t **rpzsp) -{ +dns_rpz_detach_rpzs(dns_rpz_zones_t **rpzsp) { REQUIRE(rpzsp != NULL && *rpzsp != NULL); dns_rpz_zones_t *rpzs = *rpzsp; *rpzsp = NULL; @@ -2227,8 +2196,7 @@ dns_rpz_detach_rpzs(dns_rpz_zones_t **rpzsp) } static void -rpz_detach_rpzs(dns_rpz_zones_t **rpzsp) -{ +rpz_detach_rpzs(dns_rpz_zones_t **rpzsp) { REQUIRE(rpzsp != NULL && *rpzsp != NULL); dns_rpz_zones_t *rpzs = *rpzsp; *rpzsp = NULL; @@ -2258,8 +2226,7 @@ rpz_detach_rpzs(dns_rpz_zones_t **rpzsp) */ isc_result_t dns_rpz_beginload(dns_rpz_zones_t **load_rpzsp, dns_rpz_zones_t *rpzs, - dns_rpz_num_t rpz_num) -{ + dns_rpz_num_t rpz_num) { UNUSED(load_rpzsp); UNUSED(rpzs); UNUSED(rpz_num); @@ -2272,8 +2239,7 @@ dns_rpz_beginload(dns_rpz_zones_t **load_rpzsp, dns_rpz_zones_t *rpzs, */ isc_result_t dns_rpz_ready(dns_rpz_zones_t *rpzs, dns_rpz_zones_t **load_rpzsp, - dns_rpz_num_t rpz_num) -{ + dns_rpz_num_t rpz_num) { UNUSED(rpzs); UNUSED(load_rpzsp); UNUSED(rpz_num); @@ -2286,11 +2252,10 @@ dns_rpz_ready(dns_rpz_zones_t *rpzs, dns_rpz_zones_t **load_rpzsp, */ isc_result_t dns_rpz_add(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, - const dns_name_t *src_name) -{ + const dns_name_t *src_name) { dns_rpz_zone_t *rpz; - dns_rpz_type_t rpz_type; - isc_result_t result = ISC_R_FAILURE; + dns_rpz_type_t rpz_type; + isc_result_t result = ISC_R_FAILURE; REQUIRE(rpzs != NULL && rpz_num < rpzs->p.num_zones); rpz = rpzs->zones[rpz_num]; @@ -2322,11 +2287,10 @@ dns_rpz_add(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, */ static void del_cidr(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, dns_rpz_type_t rpz_type, - const dns_name_t *src_name) -{ - isc_result_t result; - dns_rpz_cidr_key_t tgt_ip; - dns_rpz_prefix_t tgt_prefix; + const dns_name_t *src_name) { + isc_result_t result; + dns_rpz_cidr_key_t tgt_ip; + dns_rpz_prefix_t tgt_prefix; dns_rpz_addr_zbits_t tgt_set; dns_rpz_cidr_node_t *tgt, *parent, *child; @@ -2412,15 +2376,14 @@ del_cidr(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, dns_rpz_type_t rpz_type, static void del_name(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, dns_rpz_type_t rpz_type, - const dns_name_t *src_name) -{ - char namebuf[DNS_NAME_FORMATSIZE]; - dns_fixedname_t trig_namef; - dns_name_t * trig_name; - dns_rbtnode_t * nmnode; + const dns_name_t *src_name) { + char namebuf[DNS_NAME_FORMATSIZE]; + dns_fixedname_t trig_namef; + dns_name_t *trig_name; + dns_rbtnode_t *nmnode; dns_rpz_nm_data_t *nm_data, del_data; - isc_result_t result; - bool exists; + isc_result_t result; + bool exists; /* * We need a summary database of names even with 1 policy zone, @@ -2472,7 +2435,8 @@ del_name(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, dns_rpz_type_t rpz_type, nm_data->wild.ns &= ~del_data.wild.ns; if (nm_data->set.qname == 0 && nm_data->set.ns == 0 && - nm_data->wild.qname == 0 && nm_data->wild.ns == 0) { + nm_data->wild.qname == 0 && nm_data->wild.ns == 0) + { result = dns_rbt_deletenode(rpzs->rbt, nmnode, false); if (result != ISC_R_SUCCESS) { /* @@ -2497,10 +2461,9 @@ del_name(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, dns_rpz_type_t rpz_type, */ void dns_rpz_delete(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, - const dns_name_t *src_name) -{ + const dns_name_t *src_name) { dns_rpz_zone_t *rpz; - dns_rpz_type_t rpz_type; + dns_rpz_type_t rpz_type; REQUIRE(rpzs != NULL && rpz_num < rpzs->p.num_zones); rpz = rpzs->zones[rpz_num]; @@ -2538,15 +2501,14 @@ dns_rpz_delete(dns_rpz_zones_t *rpzs, dns_rpz_num_t rpz_num, dns_rpz_num_t dns_rpz_find_ip(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type, dns_rpz_zbits_t zbits, const isc_netaddr_t *netaddr, - dns_name_t *ip_name, dns_rpz_prefix_t *prefixp) -{ - dns_rpz_cidr_key_t tgt_ip; + dns_name_t *ip_name, dns_rpz_prefix_t *prefixp) { + dns_rpz_cidr_key_t tgt_ip; dns_rpz_addr_zbits_t tgt_set; dns_rpz_cidr_node_t *found; - isc_result_t result; - dns_rpz_num_t rpz_num = 0; - dns_rpz_have_t have; - int i; + isc_result_t result; + dns_rpz_num_t rpz_num = 0; + dns_rpz_have_t have; + int i; RWLOCK(&rpzs->search_lock, isc_rwlocktype_read); have = rpzs->have; @@ -2659,15 +2621,14 @@ dns_rpz_find_ip(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type, */ dns_rpz_zbits_t dns_rpz_find_name(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type, - dns_rpz_zbits_t zbits, dns_name_t *trig_name) -{ - char namebuf[DNS_NAME_FORMATSIZE]; - dns_rbtnode_t * nmnode; + dns_rpz_zbits_t zbits, dns_name_t *trig_name) { + char namebuf[DNS_NAME_FORMATSIZE]; + dns_rbtnode_t *nmnode; const dns_rpz_nm_data_t *nm_data; - dns_rpz_zbits_t found_zbits; - dns_rbtnodechain_t chain; - isc_result_t result; - int i; + dns_rpz_zbits_t found_zbits; + dns_rbtnodechain_t chain; + isc_result_t result; + int i; if (zbits == 0) { return (0); @@ -2736,11 +2697,10 @@ dns_rpz_find_name(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type, */ dns_rpz_policy_t dns_rpz_decode_cname(dns_rpz_zone_t *rpz, dns_rdataset_t *rdataset, - dns_name_t *selfname) -{ - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_name_t *selfname) { + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_cname_t cname; - isc_result_t result; + isc_result_t result; result = dns_rdataset_first(rdataset); INSIST(result == ISC_R_SUCCESS); diff --git a/lib/dns/rriterator.c b/lib/dns/rriterator.c index a8972d2ed7..6a603a3070 100644 --- a/lib/dns/rriterator.c +++ b/lib/dns/rriterator.c @@ -34,8 +34,7 @@ isc_result_t dns_rriterator_init(dns_rriterator_t *it, dns_db_t *db, dns_dbversion_t *ver, - isc_stdtime_t now) -{ + isc_stdtime_t now) { isc_result_t result; it->magic = RRITERATOR_MAGIC; it->db = db; @@ -57,8 +56,7 @@ dns_rriterator_init(dns_rriterator_t *it, dns_db_t *db, dns_dbversion_t *ver, } isc_result_t -dns_rriterator_first(dns_rriterator_t *it) -{ +dns_rriterator_first(dns_rriterator_t *it) { REQUIRE(VALID_RRITERATOR(it)); /* Reset state */ if (dns_rdataset_isassociated(&it->rdataset)) { @@ -111,8 +109,7 @@ dns_rriterator_first(dns_rriterator_t *it) } isc_result_t -dns_rriterator_nextrrset(dns_rriterator_t *it) -{ +dns_rriterator_nextrrset(dns_rriterator_t *it) { REQUIRE(VALID_RRITERATOR(it)); if (dns_rdataset_isassociated(&it->rdataset)) { dns_rdataset_disassociate(&it->rdataset); @@ -158,8 +155,7 @@ dns_rriterator_nextrrset(dns_rriterator_t *it) } isc_result_t -dns_rriterator_next(dns_rriterator_t *it) -{ +dns_rriterator_next(dns_rriterator_t *it) { REQUIRE(VALID_RRITERATOR(it)); if (it->result != ISC_R_SUCCESS) { return (it->result); @@ -177,15 +173,13 @@ dns_rriterator_next(dns_rriterator_t *it) } void -dns_rriterator_pause(dns_rriterator_t *it) -{ +dns_rriterator_pause(dns_rriterator_t *it) { REQUIRE(VALID_RRITERATOR(it)); RUNTIME_CHECK(dns_dbiterator_pause(it->dbit) == ISC_R_SUCCESS); } void -dns_rriterator_destroy(dns_rriterator_t *it) -{ +dns_rriterator_destroy(dns_rriterator_t *it) { REQUIRE(VALID_RRITERATOR(it)); if (dns_rdataset_isassociated(&it->rdataset)) { dns_rdataset_disassociate(&it->rdataset); @@ -201,8 +195,7 @@ dns_rriterator_destroy(dns_rriterator_t *it) void dns_rriterator_current(dns_rriterator_t *it, dns_name_t **name, uint32_t *ttl, - dns_rdataset_t **rdataset, dns_rdata_t **rdata) -{ + dns_rdataset_t **rdataset, dns_rdata_t **rdata) { REQUIRE(name != NULL && *name == NULL); REQUIRE(VALID_RRITERATOR(it)); REQUIRE(it->result == ISC_R_SUCCESS); diff --git a/lib/dns/rrl.c b/lib/dns/rrl.c index b4419d9a4e..b4602f0aa5 100644 --- a/lib/dns/rrl.c +++ b/lib/dns/rrl.c @@ -34,9 +34,8 @@ #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 @@ -47,8 +46,7 @@ log_end(dns_rrl_t *rrl, dns_rrl_entry_t *e, bool early, char *log_buf, * times the square of the last prime and better than a multiplicative hash. */ static int -hash_divisor(unsigned int initial) -{ +hash_divisor(unsigned int initial) { static uint16_t primes[] = { 3, 5, @@ -89,9 +87,9 @@ hash_divisor(unsigned int initial) 929, 937, 941, 947, 953, 967, 971, 977, 983, 991, 997, 1009, #endif /* if 0 */ }; - int divisions, tries; + int divisions, tries; unsigned int result; - uint16_t * pp, p; + uint16_t *pp, p; result = initial; @@ -135,8 +133,7 @@ hash_divisor(unsigned int initial) * Convert a timestamp to a number of seconds in the past. */ static inline int -delta_rrl_time(isc_stdtime_t ts, isc_stdtime_t now) -{ +delta_rrl_time(isc_stdtime_t ts, isc_stdtime_t now) { int delta; delta = now - ts; @@ -158,8 +155,7 @@ delta_rrl_time(isc_stdtime_t ts, isc_stdtime_t now) } static inline int -get_age(const dns_rrl_t *rrl, const dns_rrl_entry_t *e, isc_stdtime_t now) -{ +get_age(const dns_rrl_t *rrl, const dns_rrl_entry_t *e, isc_stdtime_t now) { if (!e->ts_valid) { return (DNS_RRL_FOREVER); } @@ -167,11 +163,10 @@ get_age(const dns_rrl_t *rrl, const dns_rrl_entry_t *e, isc_stdtime_t now) } static inline void -set_age(dns_rrl_t *rrl, dns_rrl_entry_t *e, isc_stdtime_t now) -{ +set_age(dns_rrl_t *rrl, dns_rrl_entry_t *e, isc_stdtime_t now) { dns_rrl_entry_t *e_old; - unsigned int ts_gen; - int i, ts; + unsigned int ts_gen; + int i, ts; ts_gen = rrl->ts_gen; ts = now - rrl->ts_bases[ts_gen]; @@ -200,7 +195,8 @@ set_age(dns_rrl_t *rrl, dns_rrl_entry_t *e, isc_stdtime_t now) for (e_old = ISC_LIST_TAIL(rrl->lru), i = 0; e_old != NULL && (e_old->ts_gen == ts_gen || !ISC_LINK_LINKED(e_old, hlink)); - e_old = ISC_LIST_PREV(e_old, lru), ++i) { + e_old = ISC_LIST_PREV(e_old, lru), ++i) + { e_old->ts_valid = false; } if (i != 0) { @@ -225,13 +221,12 @@ set_age(dns_rrl_t *rrl, dns_rrl_entry_t *e, isc_stdtime_t now) } static isc_result_t -expand_entries(dns_rrl_t *rrl, int newsize) -{ - unsigned int bsize; +expand_entries(dns_rrl_t *rrl, int newsize) { + unsigned int bsize; dns_rrl_block_t *b; dns_rrl_entry_t *e; - double rate; - int i; + double rate; + int i; if (rrl->num_entries + newsize >= rrl->max_entries && rrl->max_entries != 0) { @@ -276,22 +271,21 @@ expand_entries(dns_rrl_t *rrl, int newsize) } static inline dns_rrl_bin_t * -get_bin(dns_rrl_hash_t *hash, unsigned int hval) -{ +get_bin(dns_rrl_hash_t *hash, unsigned int hval) { INSIST(hash != NULL); return (&hash->bins[hval % hash->length]); } static void -free_old_hash(dns_rrl_t *rrl) -{ - dns_rrl_hash_t * old_hash; - dns_rrl_bin_t * old_bin; +free_old_hash(dns_rrl_t *rrl) { + dns_rrl_hash_t *old_hash; + dns_rrl_bin_t *old_bin; dns_rrl_entry_t *e, *e_next; old_hash = rrl->old_hash; for (old_bin = &old_hash->bins[0]; - old_bin < &old_hash->bins[old_hash->length]; ++old_bin) { + old_bin < &old_hash->bins[old_hash->length]; ++old_bin) + { for (e = ISC_LIST_HEAD(*old_bin); e != NULL; e = e_next) { e_next = ISC_LIST_NEXT(e, hlink); ISC_LINK_INIT(e, hlink); @@ -305,11 +299,10 @@ free_old_hash(dns_rrl_t *rrl) } static isc_result_t -expand_rrl_hash(dns_rrl_t *rrl, isc_stdtime_t now) -{ +expand_rrl_hash(dns_rrl_t *rrl, isc_stdtime_t now) { dns_rrl_hash_t *hash; - int old_bins, new_bins, hsize; - double rate; + int old_bins, new_bins, hsize; + double rate; if (rrl->old_hash != NULL) { free_old_hash(rrl); @@ -355,8 +348,7 @@ expand_rrl_hash(dns_rrl_t *rrl, isc_stdtime_t now) } static void -ref_entry(dns_rrl_t *rrl, dns_rrl_entry_t *e, int probes, isc_stdtime_t now) -{ +ref_entry(dns_rrl_t *rrl, dns_rrl_entry_t *e, int probes, isc_stdtime_t now) { /* * Make the entry most recently used. */ @@ -388,8 +380,7 @@ ref_entry(dns_rrl_t *rrl, dns_rrl_entry_t *e, int probes, isc_stdtime_t now) } static inline bool -key_cmp(const dns_rrl_key_t *a, const dns_rrl_key_t *b) -{ +key_cmp(const dns_rrl_key_t *a, const dns_rrl_key_t *b) { if (memcmp(a, b, sizeof(dns_rrl_key_t)) == 0) { return (true); } @@ -397,10 +388,9 @@ key_cmp(const dns_rrl_key_t *a, const dns_rrl_key_t *b) } static inline uint32_t -hash_key(const dns_rrl_key_t *key) -{ +hash_key(const dns_rrl_key_t *key) { uint32_t hval; - int i; + int i; hval = key->w[0]; for (i = sizeof(key->w) / sizeof(key->w[0]) - 1; i >= 0; --i) { @@ -422,11 +412,10 @@ static void make_key(const dns_rrl_t *rrl, dns_rrl_key_t *key, const isc_sockaddr_t *client_addr, dns_rdatatype_t qtype, const dns_name_t *qname, dns_rdataclass_t qclass, - dns_rrl_rtype_t rtype) -{ - dns_name_t base; + dns_rrl_rtype_t rtype) { + dns_name_t base; dns_offsets_t base_offsets; - int labels, i; + int labels, i; memset(key, 0, sizeof(*key)); @@ -448,7 +437,8 @@ make_key(const dns_rrl_t *rrl, dns_rrl_key_t *key, * Ignore the first label of wildcards. */ if ((qname->attributes & DNS_NAMEATTR_WILDCARD) != 0 && - (labels = dns_name_countlabels(qname)) > 1) { + (labels = dns_name_countlabels(qname)) > 1) + { dns_name_init(&base, base_offsets); dns_name_getlabelsequence(qname, 1, labels - 1, &base); key->s.qname_hash = dns_name_fullhash(&base, false); @@ -474,8 +464,7 @@ make_key(const dns_rrl_t *rrl, dns_rrl_key_t *key, } static inline dns_rrl_rate_t * -get_rate(dns_rrl_t *rrl, dns_rrl_rtype_t rtype) -{ +get_rate(dns_rrl_t *rrl, dns_rrl_rtype_t rtype) { switch (rtype) { case DNS_RRL_RTYPE_QUERY: return (&rrl->responses_per_second); @@ -496,10 +485,9 @@ get_rate(dns_rrl_t *rrl, dns_rrl_rtype_t rtype) } static int -response_balance(dns_rrl_t *rrl, const dns_rrl_entry_t *e, int age) -{ +response_balance(dns_rrl_t *rrl, const dns_rrl_entry_t *e, int age) { dns_rrl_rate_t *ratep; - int balance, rate; + int balance, rate; if (e->key.s.rtype == DNS_RRL_RTYPE_TCP) { rate = 1; @@ -522,14 +510,13 @@ static dns_rrl_entry_t * get_entry(dns_rrl_t *rrl, const isc_sockaddr_t *client_addr, dns_rdataclass_t qclass, dns_rdatatype_t qtype, const dns_name_t *qname, dns_rrl_rtype_t rtype, isc_stdtime_t now, - bool create, char *log_buf, unsigned int log_buf_len) -{ - dns_rrl_key_t key; - uint32_t hval; + bool create, char *log_buf, unsigned int log_buf_len) { + dns_rrl_key_t key; + uint32_t hval; dns_rrl_entry_t *e; - dns_rrl_hash_t * hash; - dns_rrl_bin_t * new_bin, *old_bin; - int probes, age; + dns_rrl_hash_t *hash; + dns_rrl_bin_t *new_bin, *old_bin; + int probes, age; make_key(rrl, &key, client_addr, qtype, qname, qclass, rtype); hval = hash_key(&key); @@ -585,8 +572,8 @@ get_entry(dns_rrl_t *rrl, const isc_sockaddr_t *client_addr, * Try to make more entries if none are idle. * Steal the oldest entry if we cannot create more. */ - for (e = ISC_LIST_TAIL(rrl->lru); e != NULL; - e = ISC_LIST_PREV(e, lru)) { + for (e = ISC_LIST_TAIL(rrl->lru); e != NULL; e = ISC_LIST_PREV(e, lru)) + { if (!ISC_LINK_LINKED(e, hlink)) { break; } @@ -624,9 +611,8 @@ get_entry(dns_rrl_t *rrl, const isc_sockaddr_t *client_addr, } static void -debit_log(const dns_rrl_entry_t *e, int age, const char *action) -{ - char buf[sizeof("age=2147483647")]; +debit_log(const dns_rrl_entry_t *e, int age, const char *action) { + char buf[sizeof("age=2147483647")]; const char *age_str; if (age == DNS_RRL_FOREVER) { @@ -643,9 +629,8 @@ debit_log(const dns_rrl_entry_t *e, int age, const char *action) static inline dns_rrl_result_t debit_rrl_entry(dns_rrl_t *rrl, dns_rrl_entry_t *e, double qps, double scale, const isc_sockaddr_t *client_addr, isc_stdtime_t now, - char *log_buf, unsigned int log_buf_len) -{ - int rate, new_rate, slip, new_slip, age, log_secs, min; + char *log_buf, unsigned int log_buf_len) { + int rate, new_rate, slip, new_slip, age, log_secs, min; dns_rrl_rate_t *ratep; dns_rrl_entry_t const *credit_e; @@ -785,8 +770,7 @@ debit_rrl_entry(dns_rrl_t *rrl, dns_rrl_entry_t *e, double qps, double scale, } static inline dns_rrl_qname_buf_t * -get_qname(dns_rrl_t *rrl, const dns_rrl_entry_t *e) -{ +get_qname(dns_rrl_t *rrl, const dns_rrl_entry_t *e) { dns_rrl_qname_buf_t *qbuf; qbuf = rrl->qnames[e->log_qname]; @@ -797,8 +781,7 @@ get_qname(dns_rrl_t *rrl, const dns_rrl_entry_t *e) } static inline void -free_qname(dns_rrl_t *rrl, dns_rrl_entry_t *e) -{ +free_qname(dns_rrl_t *rrl, dns_rrl_entry_t *e) { dns_rrl_qname_buf_t *qbuf; qbuf = get_qname(rrl, e); @@ -809,8 +792,7 @@ free_qname(dns_rrl_t *rrl, dns_rrl_entry_t *e) } static void -add_log_str(isc_buffer_t *lb, const char *str, unsigned int str_len) -{ +add_log_str(isc_buffer_t *lb, const char *str, unsigned int str_len) { isc_region_t region; isc_buffer_availableregion(lb, ®ion); @@ -833,13 +815,13 @@ static void make_log_buf(dns_rrl_t *rrl, dns_rrl_entry_t *e, const char *str1, const char *str2, bool plural, const dns_name_t *qname, bool save_qname, dns_rrl_result_t rrl_result, - isc_result_t resp_result, char *log_buf, unsigned int log_buf_len) -{ - isc_buffer_t lb; + isc_result_t resp_result, char *log_buf, + unsigned int log_buf_len) { + isc_buffer_t lb; dns_rrl_qname_buf_t *qbuf; - isc_netaddr_t cidr; - char strbuf[ISC_MAX(sizeof("/123"), sizeof(" (12345678)"))]; - const char * rstr; + isc_netaddr_t cidr; + char strbuf[ISC_MAX(sizeof("/123"), sizeof(" (12345678)"))]; + const char *rstr; isc_result_t msg_result; if (log_buf_len <= 1) { @@ -926,7 +908,8 @@ make_log_buf(dns_rrl_t *rrl, dns_rrl_entry_t *e, const char *str1, if (e->key.s.rtype == DNS_RRL_RTYPE_QUERY || e->key.s.rtype == DNS_RRL_RTYPE_REFERRAL || e->key.s.rtype == DNS_RRL_RTYPE_NODATA || - e->key.s.rtype == DNS_RRL_RTYPE_NXDOMAIN) { + e->key.s.rtype == DNS_RRL_RTYPE_NXDOMAIN) + { qbuf = get_qname(rrl, e); if (save_qname && qbuf == NULL && qname != NULL && dns_name_isabsolute(qname)) { @@ -983,8 +966,7 @@ make_log_buf(dns_rrl_t *rrl, dns_rrl_entry_t *e, const char *str1, static void log_end(dns_rrl_t *rrl, dns_rrl_entry_t *e, bool early, char *log_buf, - unsigned int log_buf_len) -{ + unsigned int log_buf_len) { if (e->logged) { make_log_buf(rrl, e, early ? "*" : NULL, rrl->log_only ? "would stop limiting " @@ -1005,10 +987,9 @@ log_end(dns_rrl_t *rrl, dns_rrl_entry_t *e, bool early, char *log_buf, */ static void log_stops(dns_rrl_t *rrl, isc_stdtime_t now, int limit, char *log_buf, - unsigned int log_buf_len) -{ + unsigned int log_buf_len) { dns_rrl_entry_t *e; - int age; + int age; for (e = rrl->last_logged; e != NULL; e = ISC_LIST_PREV(e, lru)) { if (!e->logged) { @@ -1049,16 +1030,15 @@ dns_rrl_result_t dns_rrl(dns_view_t *view, const isc_sockaddr_t *client_addr, bool is_tcp, dns_rdataclass_t qclass, dns_rdatatype_t qtype, const dns_name_t *qname, isc_result_t resp_result, isc_stdtime_t now, bool wouldlog, - char *log_buf, unsigned int log_buf_len) -{ - dns_rrl_t * rrl; - dns_rrl_rtype_t rtype; + char *log_buf, unsigned int log_buf_len) { + dns_rrl_t *rrl; + dns_rrl_rtype_t rtype; dns_rrl_entry_t *e; - isc_netaddr_t netclient; - int secs; - double qps, scale; - int exempt_match; - isc_result_t result; + isc_netaddr_t netclient; + int secs; + double qps, scale; + int exempt_match; + isc_result_t result; dns_rrl_result_t rrl_result; INSIST(log_buf != NULL && log_buf_len > 0); @@ -1227,7 +1207,8 @@ dns_rrl(dns_view_t *view, const isc_sockaddr_t *client_addr, bool is_tcp, * Log occassionally in the rate-limit category. */ if ((!e->logged || e->log_secs >= DNS_RRL_MAX_LOG_SECS) && - isc_log_wouldlog(dns_lctx, DNS_RRL_LOG_DROP)) { + isc_log_wouldlog(dns_lctx, DNS_RRL_LOG_DROP)) + { make_log_buf(rrl, e, rrl->log_only ? "would " : NULL, e->logged ? "continue limiting " : "limit ", true, qname, true, DNS_RRL_RESULT_OK, resp_result, @@ -1278,13 +1259,12 @@ dns_rrl(dns_view_t *view, const isc_sockaddr_t *client_addr, bool is_tcp, } void -dns_rrl_view_destroy(dns_view_t *view) -{ - dns_rrl_t * rrl; +dns_rrl_view_destroy(dns_view_t *view) { + dns_rrl_t *rrl; dns_rrl_block_t *b; - dns_rrl_hash_t * h; - char log_buf[DNS_RRL_LOG_BUF_LEN]; - int i; + dns_rrl_hash_t *h; + char log_buf[DNS_RRL_LOG_BUF_LEN]; + int i; rrl = view->rrl; if (rrl == NULL) { @@ -1335,9 +1315,8 @@ dns_rrl_view_destroy(dns_view_t *view) } isc_result_t -dns_rrl_init(dns_rrl_t **rrlp, dns_view_t *view, int min_entries) -{ - dns_rrl_t * rrl; +dns_rrl_init(dns_rrl_t **rrlp, dns_view_t *view, int min_entries) { + dns_rrl_t *rrl; isc_result_t result; *rrlp = NULL; diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c index 4a2df5adf8..dc54fef5cb 100644 --- a/lib/dns/sdb.c +++ b/lib/dns/sdb.c @@ -44,19 +44,19 @@ struct dns_sdbimplementation { const dns_sdbmethods_t *methods; - void * driverdata; - unsigned int flags; - isc_mem_t * mctx; - isc_mutex_t driverlock; + void *driverdata; + unsigned int flags; + isc_mem_t *mctx; + isc_mutex_t driverlock; dns_dbimplementation_t *dbimp; }; struct dns_sdb { /* Unlocked */ - dns_db_t common; - char * zone; + dns_db_t common; + char *zone; dns_sdbimplementation_t *implementation; - void * dbdata; + void *dbdata; /* Atomic */ isc_refcount_t references; @@ -65,7 +65,7 @@ struct dns_sdb { struct dns_sdblookup { /* Unlocked */ unsigned int magic; - dns_sdb_t * sdb; + dns_sdb_t *sdb; ISC_LIST(dns_rdatalist_t) lists; ISC_LIST(isc_buffer_t) buffers; dns_name_t *name; @@ -89,7 +89,7 @@ typedef dns_sdballnodes_t sdb_dbiterator_t; typedef struct sdb_rdatasetiter { dns_rdatasetiter_t common; - dns_rdatalist_t * current; + dns_rdatalist_t *current; } sdb_rdatasetiter_t; #define SDB_MAGIC ISC_MAGIC('S', 'D', 'B', '-') @@ -100,21 +100,21 @@ typedef struct sdb_rdatasetiter { */ #define VALID_SDB(sdb) ((sdb) != NULL && (sdb)->common.impmagic == SDB_MAGIC) -#define SDBLOOKUP_MAGIC ISC_MAGIC('S', 'D', 'B', 'L') +#define SDBLOOKUP_MAGIC ISC_MAGIC('S', 'D', 'B', 'L') #define VALID_SDBLOOKUP(sdbl) ISC_MAGIC_VALID(sdbl, SDBLOOKUP_MAGIC) -#define VALID_SDBNODE(sdbn) VALID_SDBLOOKUP(sdbn) +#define VALID_SDBNODE(sdbn) VALID_SDBLOOKUP(sdbn) /* These values are taken from RFC1537 */ -#define SDB_DEFAULT_REFRESH 28800U /* 8 hours */ -#define SDB_DEFAULT_RETRY 7200U /* 2 hours */ -#define SDB_DEFAULT_EXPIRE 604800U /* 7 days */ -#define SDB_DEFAULT_MINIMUM 86400U /* 1 day */ +#define SDB_DEFAULT_REFRESH 28800U /* 8 hours */ +#define SDB_DEFAULT_RETRY 7200U /* 2 hours */ +#define SDB_DEFAULT_EXPIRE 604800U /* 7 days */ +#define SDB_DEFAULT_MINIMUM 86400U /* 1 day */ /* This is a reasonable value */ #define SDB_DEFAULT_TTL (60 * 60 * 24) #ifdef __COVERITY__ -#define MAYBE_LOCK(sdb) LOCK(&sdb->implementation->driverlock) +#define MAYBE_LOCK(sdb) LOCK(&sdb->implementation->driverlock) #define MAYBE_UNLOCK(sdb) UNLOCK(&sdb->implementation->driverlock) #else /* ifdef __COVERITY__ */ #define MAYBE_LOCK(sdb) \ @@ -134,48 +134,38 @@ 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 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 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 isc_result_t createnode(dns_sdb_t *sdb, dns_sdbnode_t **nodep); -static void -destroynode(dns_sdbnode_t *node); +static void destroynode(dns_sdbnode_t *node); -static void -detachnode(dns_db_t *db, dns_dbnode_t **targetp); +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 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 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, @@ -183,14 +173,11 @@ 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, @@ -203,10 +190,9 @@ static dns_rdatasetitermethods_t rdatasetiter_methods = { isc_result_t dns_sdb_register(const char *drivername, const dns_sdbmethods_t *methods, void *driverdata, unsigned int flags, isc_mem_t *mctx, - dns_sdbimplementation_t **sdbimp) -{ + dns_sdbimplementation_t **sdbimp) { dns_sdbimplementation_t *imp; - isc_result_t result; + isc_result_t result; REQUIRE(drivername != NULL); REQUIRE(methods != NULL); @@ -242,8 +228,7 @@ cleanup_mutex: } void -dns_sdb_unregister(dns_sdbimplementation_t **sdbimp) -{ +dns_sdb_unregister(dns_sdbimplementation_t **sdbimp) { dns_sdbimplementation_t *imp; REQUIRE(sdbimp != NULL && *sdbimp != NULL); @@ -257,8 +242,7 @@ dns_sdb_unregister(dns_sdbimplementation_t **sdbimp) } static inline unsigned int -initial_size(unsigned int len) -{ +initial_size(unsigned int len) { unsigned int size; for (size = 1024; size < (64 * 1024); size *= 2) { @@ -271,13 +255,13 @@ initial_size(unsigned int len) isc_result_t dns_sdb_putrdata(dns_sdblookup_t *lookup, dns_rdatatype_t typeval, - dns_ttl_t ttl, const unsigned char *rdatap, unsigned int rdlen) -{ + dns_ttl_t ttl, const unsigned char *rdatap, + unsigned int rdlen) { dns_rdatalist_t *rdatalist; - dns_rdata_t * rdata; - isc_buffer_t * rdatabuf = NULL; - isc_mem_t * mctx; - isc_region_t region; + dns_rdata_t *rdata; + isc_buffer_t *rdatabuf = NULL; + isc_mem_t *mctx; + isc_region_t region; mctx = lookup->sdb->common.mctx; @@ -318,20 +302,19 @@ dns_sdb_putrdata(dns_sdblookup_t *lookup, dns_rdatatype_t typeval, isc_result_t dns_sdb_putrr(dns_sdblookup_t *lookup, const char *type, dns_ttl_t ttl, - const char *data) -{ - unsigned int datalen; - dns_rdatatype_t typeval; + const char *data) { + unsigned int datalen; + dns_rdatatype_t typeval; isc_textregion_t r; - isc_lex_t * lex = NULL; - isc_result_t result; - unsigned char * p = NULL; - unsigned int size = 0; /* Init to suppress compiler warning */ - isc_mem_t * mctx; + isc_lex_t *lex = NULL; + isc_result_t result; + unsigned char *p = NULL; + unsigned int size = 0; /* Init to suppress compiler warning */ + isc_mem_t *mctx; dns_sdbimplementation_t *imp; - const dns_name_t * origin; - isc_buffer_t b; - isc_buffer_t rb; + const dns_name_t *origin; + isc_buffer_t b; + isc_buffer_t rb; REQUIRE(VALID_SDBLOOKUP(lookup)); REQUIRE(type != NULL); @@ -409,17 +392,16 @@ failure: } static isc_result_t -getnode(dns_sdballnodes_t *allnodes, const char *name, dns_sdbnode_t **nodep) -{ - dns_name_t * newname; - const dns_name_t * origin; - dns_fixedname_t fnewname; - dns_sdb_t * sdb = (dns_sdb_t *)allnodes->common.db; +getnode(dns_sdballnodes_t *allnodes, const char *name, dns_sdbnode_t **nodep) { + dns_name_t *newname; + const dns_name_t *origin; + dns_fixedname_t fnewname; + dns_sdb_t *sdb = (dns_sdb_t *)allnodes->common.db; dns_sdbimplementation_t *imp = sdb->implementation; - dns_sdbnode_t * sdbnode; - isc_mem_t * mctx = sdb->common.mctx; - isc_buffer_t b; - isc_result_t result; + dns_sdbnode_t *sdbnode; + isc_mem_t *mctx = sdb->common.mctx; + isc_buffer_t b; + isc_result_t result; newname = dns_fixedname_initname(&fnewname); @@ -464,9 +446,8 @@ getnode(dns_sdballnodes_t *allnodes, const char *name, dns_sdbnode_t **nodep) isc_result_t dns_sdb_putnamedrr(dns_sdballnodes_t *allnodes, const char *name, - const char *type, dns_ttl_t ttl, const char *data) -{ - isc_result_t result; + const char *type, dns_ttl_t ttl, const char *data) { + isc_result_t result; dns_sdbnode_t *sdbnode = NULL; result = getnode(allnodes, name, &sdbnode); if (result != ISC_R_SUCCESS) { @@ -478,9 +459,8 @@ dns_sdb_putnamedrr(dns_sdballnodes_t *allnodes, const char *name, isc_result_t dns_sdb_putnamedrdata(dns_sdballnodes_t *allnodes, const char *name, dns_rdatatype_t type, dns_ttl_t ttl, const void *rdata, - unsigned int rdlen) -{ - isc_result_t result; + unsigned int rdlen) { + isc_result_t result; dns_sdbnode_t *sdbnode = NULL; result = getnode(allnodes, name, &sdbnode); if (result != ISC_R_SUCCESS) { @@ -491,10 +471,9 @@ dns_sdb_putnamedrdata(dns_sdballnodes_t *allnodes, const char *name, isc_result_t dns_sdb_putsoa(dns_sdblookup_t *lookup, const char *mname, const char *rname, - uint32_t serial) -{ + uint32_t serial) { char str[2 * DNS_NAME_MAXTEXT + 5 * (sizeof("2147483647")) + 7]; - int n; + int n; REQUIRE(mname != NULL); REQUIRE(rname != NULL); @@ -513,8 +492,7 @@ dns_sdb_putsoa(dns_sdblookup_t *lookup, const char *mname, const char *rname, */ static void -attach(dns_db_t *source, dns_db_t **targetp) -{ +attach(dns_db_t *source, dns_db_t **targetp) { dns_sdb_t *sdb = (dns_sdb_t *)source; REQUIRE(VALID_SDB(sdb)); @@ -525,8 +503,7 @@ attach(dns_db_t *source, dns_db_t **targetp) } static void -destroy(dns_sdb_t *sdb) -{ +destroy(dns_sdb_t *sdb) { dns_sdbimplementation_t *imp = sdb->implementation; isc_refcount_destroy(&sdb->references); @@ -548,8 +525,7 @@ destroy(dns_sdb_t *sdb) } static void -detach(dns_db_t **dbp) -{ +detach(dns_db_t **dbp) { dns_sdb_t *sdb = (dns_sdb_t *)(*dbp); REQUIRE(VALID_SDB(sdb)); @@ -562,16 +538,14 @@ detach(dns_db_t **dbp) } static isc_result_t -beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) -{ +beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) { UNUSED(db); UNUSED(callbacks); return (ISC_R_NOTIMPLEMENTED); } static isc_result_t -endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) -{ +endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) { UNUSED(db); UNUSED(callbacks); return (ISC_R_NOTIMPLEMENTED); @@ -579,8 +553,7 @@ endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) static isc_result_t dump(dns_db_t *db, dns_dbversion_t *version, const char *filename, - dns_masterformat_t masterformat) -{ + dns_masterformat_t masterformat) { UNUSED(db); UNUSED(version); UNUSED(filename); @@ -589,8 +562,7 @@ dump(dns_db_t *db, dns_dbversion_t *version, const char *filename, } static void -currentversion(dns_db_t *db, dns_dbversion_t **versionp) -{ +currentversion(dns_db_t *db, dns_dbversion_t **versionp) { REQUIRE(versionp != NULL && *versionp == NULL); UNUSED(db); @@ -600,8 +572,7 @@ currentversion(dns_db_t *db, dns_dbversion_t **versionp) } static isc_result_t -newversion(dns_db_t *db, dns_dbversion_t **versionp) -{ +newversion(dns_db_t *db, dns_dbversion_t **versionp) { UNUSED(db); UNUSED(versionp); @@ -609,8 +580,8 @@ newversion(dns_db_t *db, dns_dbversion_t **versionp) } static void -attachversion(dns_db_t *db, dns_dbversion_t *source, dns_dbversion_t **targetp) -{ +attachversion(dns_db_t *db, dns_dbversion_t *source, + dns_dbversion_t **targetp) { REQUIRE(source != NULL && source == (void *)&dummy); REQUIRE(targetp != NULL && *targetp == NULL); @@ -620,8 +591,7 @@ attachversion(dns_db_t *db, dns_dbversion_t *source, dns_dbversion_t **targetp) } static void -closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) -{ +closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) { REQUIRE(versionp != NULL && *versionp == (void *)&dummy); REQUIRE(commit == false); @@ -632,8 +602,7 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) } static isc_result_t -createnode(dns_sdb_t *sdb, dns_sdbnode_t **nodep) -{ +createnode(dns_sdb_t *sdb, dns_sdbnode_t **nodep) { dns_sdbnode_t *node; node = isc_mem_get(sdb->common.mctx, sizeof(dns_sdbnode_t)); @@ -655,13 +624,12 @@ createnode(dns_sdb_t *sdb, dns_sdbnode_t **nodep) } static void -destroynode(dns_sdbnode_t *node) -{ +destroynode(dns_sdbnode_t *node) { dns_rdatalist_t *list; - dns_rdata_t * rdata; - isc_buffer_t * b; - dns_sdb_t * sdb; - isc_mem_t * mctx; + dns_rdata_t *rdata; + isc_buffer_t *b; + dns_sdb_t *sdb; + isc_mem_t *mctx; sdb = node->sdb; mctx = sdb->common.mctx; @@ -694,16 +662,15 @@ destroynode(dns_sdbnode_t *node) } static isc_result_t -getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) -{ - dns_sdb_t * sdb = (dns_sdb_t *)db; - dns_sdbnode_t * node = NULL; - isc_result_t result; - isc_buffer_t b; - char namestr[DNS_NAME_MAXTEXT + 1]; +getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) { + dns_sdb_t *sdb = (dns_sdb_t *)db; + dns_sdbnode_t *node = NULL; + isc_result_t result; + isc_buffer_t b; + char namestr[DNS_NAME_MAXTEXT + 1]; dns_sdbimplementation_t *imp; - dns_name_t relname; - dns_name_t * name; + dns_name_t relname; + dns_name_t *name; REQUIRE(VALID_SDB(sdb)); REQUIRE(nodep != NULL && *nodep == NULL); @@ -748,7 +715,8 @@ getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) } MAYBE_UNLOCK(sdb); if (result != ISC_R_SUCCESS && - !(result == ISC_R_NOTFOUND && imp->methods->authority != NULL)) { + !(result == ISC_R_NOTFOUND && imp->methods->authority != NULL)) + { destroynode(node); return (result); } @@ -770,17 +738,16 @@ getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) static isc_result_t findnodeext(dns_db_t *db, const dns_name_t *name, bool create, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, - dns_dbnode_t **nodep) -{ - dns_sdb_t * sdb = (dns_sdb_t *)db; - dns_sdbnode_t * node = NULL; - isc_result_t result; - isc_buffer_t b; - char namestr[DNS_NAME_MAXTEXT + 1]; - bool isorigin; + dns_dbnode_t **nodep) { + dns_sdb_t *sdb = (dns_sdb_t *)db; + dns_sdbnode_t *node = NULL; + isc_result_t result; + isc_buffer_t b; + char namestr[DNS_NAME_MAXTEXT + 1]; + bool isorigin; dns_sdbimplementation_t *imp; - dns_name_t relname; - unsigned int labels; + dns_name_t relname; + unsigned int labels; REQUIRE(VALID_SDB(sdb)); REQUIRE(create == false); @@ -837,7 +804,8 @@ findnodeext(dns_db_t *db, const dns_name_t *name, bool create, } MAYBE_UNLOCK(sdb); if (result != ISC_R_SUCCESS && !(result == ISC_R_NOTFOUND && isorigin && - imp->methods->authority != NULL)) { + imp->methods->authority != NULL)) + { destroynode(node); return (result); } @@ -861,17 +829,16 @@ findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ - dns_sdb_t * sdb = (dns_sdb_t *)db; - dns_dbnode_t * node = NULL; + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { + dns_sdb_t *sdb = (dns_sdb_t *)db; + dns_dbnode_t *node = NULL; dns_fixedname_t fname; - dns_rdataset_t xrdataset; - dns_name_t * xname; - unsigned int nlabels, olabels; - isc_result_t result; - unsigned int i; - unsigned int flags; + dns_rdataset_t xrdataset; + dns_name_t *xname; + unsigned int nlabels, olabels; + isc_result_t result; + unsigned int i; + unsigned int flags; REQUIRE(VALID_SDB(sdb)); REQUIRE(nodep == NULL || *nodep == NULL); @@ -1036,8 +1003,7 @@ static isc_result_t findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_name_t *dcname, dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *sigrdataset) { UNUSED(db); UNUSED(name); UNUSED(options); @@ -1052,9 +1018,8 @@ findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, } static void -attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) -{ - dns_sdb_t * sdb = (dns_sdb_t *)db; +attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) { + dns_sdb_t *sdb = (dns_sdb_t *)db; dns_sdbnode_t *node = (dns_sdbnode_t *)source; REQUIRE(VALID_SDB(sdb)); @@ -1067,9 +1032,8 @@ attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) } static void -detachnode(dns_db_t *db, dns_dbnode_t **targetp) -{ - dns_sdb_t * sdb = (dns_sdb_t *)db; +detachnode(dns_db_t *db, dns_dbnode_t **targetp) { + dns_sdb_t *sdb = (dns_sdb_t *)db; dns_sdbnode_t *node; REQUIRE(VALID_SDB(sdb)); @@ -1087,8 +1051,7 @@ detachnode(dns_db_t *db, dns_dbnode_t **targetp) } static isc_result_t -expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) -{ +expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) { UNUSED(db); UNUSED(node); UNUSED(now); @@ -1097,8 +1060,7 @@ expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) } static void -printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) -{ +printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) { UNUSED(db); UNUSED(node); UNUSED(out); @@ -1106,13 +1068,13 @@ printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) } static isc_result_t -createiterator(dns_db_t *db, unsigned int options, dns_dbiterator_t **iteratorp) -{ +createiterator(dns_db_t *db, unsigned int options, + dns_dbiterator_t **iteratorp) { dns_sdb_t *sdb = (dns_sdb_t *)db; REQUIRE(VALID_SDB(sdb)); - sdb_dbiterator_t * sdbiter; - isc_result_t result; + sdb_dbiterator_t *sdbiter; + isc_result_t result; dns_sdbimplementation_t *imp = sdb->implementation; if (imp->methods->allnodes == NULL) { @@ -1129,8 +1091,8 @@ createiterator(dns_db_t *db, unsigned int options, dns_dbiterator_t **iteratorp) sdbiter->common.methods = &dbiterator_methods; sdbiter->common.db = NULL; dns_db_attach(db, &sdbiter->common.db); - sdbiter->common.relative_names = - ((options & DNS_DB_RELATIVENAMES) != 0); + sdbiter->common.relative_names = ((options & DNS_DB_RELATIVENAMES) != + 0); sdbiter->common.magic = DNS_DBITERATOR_MAGIC; ISC_LIST_INIT(sdbiter->nodelist); sdbiter->current = NULL; @@ -1157,12 +1119,11 @@ createiterator(dns_db_t *db, unsigned int options, dns_dbiterator_t **iteratorp) 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) -{ + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { REQUIRE(VALID_SDBNODE(node)); dns_rdatalist_t *list; - dns_sdbnode_t * sdbnode = (dns_sdbnode_t *)node; + dns_sdbnode_t *sdbnode = (dns_sdbnode_t *)node; UNUSED(db); UNUSED(version); @@ -1192,8 +1153,7 @@ findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, static isc_result_t allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, - isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) -{ + isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) { sdb_rdatasetiter_t *iterator; REQUIRE(version == NULL || version == &dummy); @@ -1219,8 +1179,7 @@ allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, static isc_result_t addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, isc_stdtime_t now, dns_rdataset_t *rdataset, unsigned int options, - dns_rdataset_t *addedrdataset) -{ + dns_rdataset_t *addedrdataset) { UNUSED(db); UNUSED(node); UNUSED(version); @@ -1235,8 +1194,7 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, static isc_result_t subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdataset_t *rdataset, unsigned int options, - dns_rdataset_t *newrdataset) -{ + dns_rdataset_t *newrdataset) { UNUSED(db); UNUSED(node); UNUSED(version); @@ -1249,8 +1207,7 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, static isc_result_t deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, - dns_rdatatype_t type, dns_rdatatype_t covers) -{ + dns_rdatatype_t type, dns_rdatatype_t covers) { UNUSED(db); UNUSED(node); UNUSED(version); @@ -1261,38 +1218,33 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, } static bool -issecure(dns_db_t *db) -{ +issecure(dns_db_t *db) { UNUSED(db); return (false); } static unsigned int -nodecount(dns_db_t *db) -{ +nodecount(dns_db_t *db) { UNUSED(db); return (0); } static bool -ispersistent(dns_db_t *db) -{ +ispersistent(dns_db_t *db) { UNUSED(db); return (true); } static void -overmem(dns_db_t *db, bool over) -{ +overmem(dns_db_t *db, bool over) { UNUSED(db); UNUSED(over); } static void -settask(dns_db_t *db, isc_task_t *task) -{ +settask(dns_db_t *db, isc_task_t *task) { UNUSED(db); UNUSED(task); } @@ -1351,12 +1303,11 @@ static dns_dbmethods_t sdb_methods = { 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) -{ - dns_sdb_t * sdb; - isc_result_t result; - char zonestr[DNS_NAME_MAXTEXT + 1]; - isc_buffer_t b; + void *driverarg, dns_db_t **dbp) { + dns_sdb_t *sdb; + isc_result_t result; + char zonestr[DNS_NAME_MAXTEXT + 1]; + isc_buffer_t b; dns_sdbimplementation_t *imp; REQUIRE(driverarg != NULL); @@ -1428,23 +1379,21 @@ cleanup_lock: */ static void -disassociate(dns_rdataset_t *rdataset) -{ - dns_dbnode_t * node = rdataset->private5; +disassociate(dns_rdataset_t *rdataset) { + dns_dbnode_t *node = rdataset->private5; dns_sdbnode_t *sdbnode = (dns_sdbnode_t *)node; - dns_db_t * db = (dns_db_t *)sdbnode->sdb; + dns_db_t *db = (dns_db_t *)sdbnode->sdb; detachnode(db, &node); isc__rdatalist_disassociate(rdataset); } static void -rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) -{ - dns_dbnode_t * node = source->private5; +rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) { + dns_dbnode_t *node = source->private5; dns_sdbnode_t *sdbnode = (dns_sdbnode_t *)node; - dns_db_t * db = (dns_db_t *)sdbnode->sdb; - dns_dbnode_t * tempdb = NULL; + dns_db_t *db = (dns_db_t *)sdbnode->sdb; + dns_dbnode_t *tempdb = NULL; isc__rdatalist_clone(source, target); attachnode(db, node, &tempdb); @@ -1472,8 +1421,7 @@ static dns_rdatasetmethods_t sdb_rdataset_methods = { static void list_tordataset(dns_rdatalist_t *rdatalist, dns_db_t *db, dns_dbnode_t *node, - dns_rdataset_t *rdataset) -{ + dns_rdataset_t *rdataset) { /* * The sdb rdataset is an rdatalist with some additions. * - private1 & private2 are used by the rdatalist. @@ -1493,10 +1441,9 @@ list_tordataset(dns_rdatalist_t *rdatalist, dns_db_t *db, dns_dbnode_t *node, * Database Iterator Methods */ static void -dbiterator_destroy(dns_dbiterator_t **iteratorp) -{ +dbiterator_destroy(dns_dbiterator_t **iteratorp) { sdb_dbiterator_t *sdbiter = (sdb_dbiterator_t *)(*iteratorp); - dns_sdb_t * sdb = (dns_sdb_t *)sdbiter->common.db; + dns_sdb_t *sdb = (dns_sdb_t *)sdbiter->common.db; while (!ISC_LIST_EMPTY(sdbiter->nodelist)) { dns_sdbnode_t *node; @@ -1512,8 +1459,7 @@ dbiterator_destroy(dns_dbiterator_t **iteratorp) } static isc_result_t -dbiterator_first(dns_dbiterator_t *iterator) -{ +dbiterator_first(dns_dbiterator_t *iterator) { sdb_dbiterator_t *sdbiter = (sdb_dbiterator_t *)iterator; sdbiter->current = ISC_LIST_HEAD(sdbiter->nodelist); @@ -1525,8 +1471,7 @@ dbiterator_first(dns_dbiterator_t *iterator) } static isc_result_t -dbiterator_last(dns_dbiterator_t *iterator) -{ +dbiterator_last(dns_dbiterator_t *iterator) { sdb_dbiterator_t *sdbiter = (sdb_dbiterator_t *)iterator; sdbiter->current = ISC_LIST_TAIL(sdbiter->nodelist); @@ -1538,8 +1483,7 @@ dbiterator_last(dns_dbiterator_t *iterator) } static isc_result_t -dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name) -{ +dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name) { sdb_dbiterator_t *sdbiter = (sdb_dbiterator_t *)iterator; sdbiter->current = ISC_LIST_HEAD(sdbiter->nodelist); @@ -1553,8 +1497,7 @@ dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name) } static isc_result_t -dbiterator_prev(dns_dbiterator_t *iterator) -{ +dbiterator_prev(dns_dbiterator_t *iterator) { sdb_dbiterator_t *sdbiter = (sdb_dbiterator_t *)iterator; sdbiter->current = ISC_LIST_PREV(sdbiter->current, link); @@ -1566,8 +1509,7 @@ dbiterator_prev(dns_dbiterator_t *iterator) } static isc_result_t -dbiterator_next(dns_dbiterator_t *iterator) -{ +dbiterator_next(dns_dbiterator_t *iterator) { sdb_dbiterator_t *sdbiter = (sdb_dbiterator_t *)iterator; sdbiter->current = ISC_LIST_NEXT(sdbiter->current, link); @@ -1580,8 +1522,7 @@ dbiterator_next(dns_dbiterator_t *iterator) static isc_result_t dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, - dns_name_t *name) -{ + dns_name_t *name) { sdb_dbiterator_t *sdbiter = (sdb_dbiterator_t *)iterator; attachnode(iterator->db, sdbiter->current, nodep); @@ -1593,15 +1534,13 @@ dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, } static isc_result_t -dbiterator_pause(dns_dbiterator_t *iterator) -{ +dbiterator_pause(dns_dbiterator_t *iterator) { UNUSED(iterator); return (ISC_R_SUCCESS); } static isc_result_t -dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) -{ +dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) { UNUSED(iterator); dns_name_copynf(dns_rootname, name); return (ISC_R_SUCCESS); @@ -1612,8 +1551,7 @@ dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) */ static void -rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) -{ +rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) { sdb_rdatasetiter_t *sdbiterator = (sdb_rdatasetiter_t *)(*iteratorp); detachnode(sdbiterator->common.db, &sdbiterator->common.node); isc_mem_put(sdbiterator->common.db->mctx, sdbiterator, @@ -1622,10 +1560,9 @@ rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) } static isc_result_t -rdatasetiter_first(dns_rdatasetiter_t *iterator) -{ +rdatasetiter_first(dns_rdatasetiter_t *iterator) { sdb_rdatasetiter_t *sdbiterator = (sdb_rdatasetiter_t *)iterator; - dns_sdbnode_t * sdbnode = (dns_sdbnode_t *)iterator->node; + dns_sdbnode_t *sdbnode = (dns_sdbnode_t *)iterator->node; if (ISC_LIST_EMPTY(sdbnode->lists)) { return (ISC_R_NOMORE); @@ -1635,8 +1572,7 @@ rdatasetiter_first(dns_rdatasetiter_t *iterator) } static isc_result_t -rdatasetiter_next(dns_rdatasetiter_t *iterator) -{ +rdatasetiter_next(dns_rdatasetiter_t *iterator) { sdb_rdatasetiter_t *sdbiterator = (sdb_rdatasetiter_t *)iterator; sdbiterator->current = ISC_LIST_NEXT(sdbiterator->current, link); @@ -1648,8 +1584,7 @@ rdatasetiter_next(dns_rdatasetiter_t *iterator) } static void -rdatasetiter_current(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset) -{ +rdatasetiter_current(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset) { sdb_rdatasetiter_t *sdbiterator = (sdb_rdatasetiter_t *)iterator; list_tordataset(sdbiterator->current, iterator->db, iterator->node, diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c index 8916d8b129..5afaffe5e7 100644 --- a/lib/dns/sdlz.c +++ b/lib/dns/sdlz.c @@ -86,17 +86,17 @@ struct dns_sdlzimplementation { const dns_sdlzmethods_t *methods; - isc_mem_t * mctx; - void * driverarg; - unsigned int flags; - isc_mutex_t driverlock; + isc_mem_t *mctx; + void *driverarg; + unsigned int flags; + isc_mutex_t driverlock; dns_dlzimplementation_t *dlz_imp; }; struct dns_sdlz_db { /* Unlocked */ - dns_db_t common; - void * dbdata; + dns_db_t common; + void *dbdata; dns_sdlzimplementation_t *dlzimp; /* Atomic */ @@ -104,12 +104,12 @@ struct dns_sdlz_db { /* Locked */ dns_dbversion_t *future_version; - int dummy_version; + int dummy_version; }; struct dns_sdlzlookup { /* Unlocked */ - unsigned int magic; + unsigned int magic; dns_sdlz_db_t *sdlz; ISC_LIST(dns_rdatalist_t) lists; ISC_LIST(isc_buffer_t) buffers; @@ -134,7 +134,7 @@ typedef dns_sdlzallnodes_t sdlz_dbiterator_t; typedef struct sdlz_rdatasetiter { dns_rdatasetiter_t common; - dns_rdatalist_t * current; + dns_rdatalist_t *current; } sdlz_rdatasetiter_t; #define SDLZDB_MAGIC ISC_MAGIC('D', 'L', 'Z', 'S') @@ -147,21 +147,21 @@ typedef struct sdlz_rdatasetiter { #define VALID_SDLZDB(sdlzdb) \ ((sdlzdb) != NULL && (sdlzdb)->common.impmagic == SDLZDB_MAGIC) -#define SDLZLOOKUP_MAGIC ISC_MAGIC('D', 'L', 'Z', 'L') +#define SDLZLOOKUP_MAGIC ISC_MAGIC('D', 'L', 'Z', 'L') #define VALID_SDLZLOOKUP(sdlzl) ISC_MAGIC_VALID(sdlzl, SDLZLOOKUP_MAGIC) -#define VALID_SDLZNODE(sdlzn) VALID_SDLZLOOKUP(sdlzn) +#define VALID_SDLZNODE(sdlzn) VALID_SDLZLOOKUP(sdlzn) /* These values are taken from RFC 1537 */ -#define SDLZ_DEFAULT_REFRESH 28800U /* 8 hours */ -#define SDLZ_DEFAULT_RETRY 7200U /* 2 hours */ -#define SDLZ_DEFAULT_EXPIRE 604800U /* 7 days */ -#define SDLZ_DEFAULT_MINIMUM 86400U /* 1 day */ +#define SDLZ_DEFAULT_REFRESH 28800U /* 8 hours */ +#define SDLZ_DEFAULT_RETRY 7200U /* 2 hours */ +#define SDLZ_DEFAULT_EXPIRE 604800U /* 7 days */ +#define SDLZ_DEFAULT_MINIMUM 86400U /* 1 day */ /* This is a reasonable value */ #define SDLZ_DEFAULT_TTL (60 * 60 * 24) #ifdef __COVERITY__ -#define MAYBE_LOCK(imp) LOCK(&imp->driverlock) +#define MAYBE_LOCK(imp) LOCK(&imp->driverlock) #define MAYBE_UNLOCK(imp) UNLOCK(&imp->driverlock) #else /* ifdef __COVERITY__ */ #define MAYBE_LOCK(imp) \ @@ -182,37 +182,29 @@ 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 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 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 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 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, @@ -228,8 +220,7 @@ static dns_dbiteratormethods_t dbiterator_methods = { * Log a message at the given level */ static void -sdlz_log(int level, const char *fmt, ...) -{ +sdlz_log(int level, const char *fmt, ...) { va_list ap; va_start(ap, fmt); isc_log_vwrite(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DLZ, @@ -239,8 +230,7 @@ sdlz_log(int level, const char *fmt, ...) /*% Converts the input string to lowercase, in place. */ static void -dns_sdlz_tolower(char *str) -{ +dns_sdlz_tolower(char *str) { unsigned int len = strlen(str); unsigned int i; @@ -252,8 +242,7 @@ dns_sdlz_tolower(char *str) } static inline unsigned int -initial_size(const char *data) -{ +initial_size(const char *data) { unsigned int len = (strlen(data) / 64) + 1; return (len * 64 + 64); } @@ -264,8 +253,7 @@ initial_size(const char *data) */ static void -rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) -{ +rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) { sdlz_rdatasetiter_t *sdlziterator = (sdlz_rdatasetiter_t *)(*iteratorp); detachnode(sdlziterator->common.db, &sdlziterator->common.node); @@ -275,10 +263,9 @@ rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) } static isc_result_t -rdatasetiter_first(dns_rdatasetiter_t *iterator) -{ +rdatasetiter_first(dns_rdatasetiter_t *iterator) { sdlz_rdatasetiter_t *sdlziterator = (sdlz_rdatasetiter_t *)iterator; - dns_sdlznode_t * sdlznode = (dns_sdlznode_t *)iterator->node; + dns_sdlznode_t *sdlznode = (dns_sdlznode_t *)iterator->node; if (ISC_LIST_EMPTY(sdlznode->lists)) { return (ISC_R_NOMORE); @@ -288,8 +275,7 @@ rdatasetiter_first(dns_rdatasetiter_t *iterator) } static isc_result_t -rdatasetiter_next(dns_rdatasetiter_t *iterator) -{ +rdatasetiter_next(dns_rdatasetiter_t *iterator) { sdlz_rdatasetiter_t *sdlziterator = (sdlz_rdatasetiter_t *)iterator; sdlziterator->current = ISC_LIST_NEXT(sdlziterator->current, link); @@ -301,8 +287,7 @@ rdatasetiter_next(dns_rdatasetiter_t *iterator) } static void -rdatasetiter_current(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset) -{ +rdatasetiter_current(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset) { sdlz_rdatasetiter_t *sdlziterator = (sdlz_rdatasetiter_t *)iterator; list_tordataset(sdlziterator->current, iterator->db, iterator->node, @@ -320,8 +305,7 @@ static dns_rdatasetitermethods_t rdatasetiter_methods = { */ static void -attach(dns_db_t *source, dns_db_t **targetp) -{ +attach(dns_db_t *source, dns_db_t **targetp) { dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)source; REQUIRE(VALID_SDLZDB(sdlz)); @@ -332,8 +316,7 @@ attach(dns_db_t *source, dns_db_t **targetp) } static void -destroy(dns_sdlz_db_t *sdlz) -{ +destroy(dns_sdlz_db_t *sdlz) { sdlz->common.magic = 0; sdlz->common.impmagic = 0; @@ -344,8 +327,7 @@ destroy(dns_sdlz_db_t *sdlz) } static void -detach(dns_db_t **dbp) -{ +detach(dns_db_t **dbp) { dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)(*dbp); REQUIRE(VALID_SDLZDB(sdlz)); @@ -358,16 +340,14 @@ detach(dns_db_t **dbp) } static isc_result_t -beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) -{ +beginload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) { UNUSED(db); UNUSED(callbacks); return (ISC_R_NOTIMPLEMENTED); } static isc_result_t -endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) -{ +endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) { UNUSED(db); UNUSED(callbacks); return (ISC_R_NOTIMPLEMENTED); @@ -375,8 +355,7 @@ endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) static isc_result_t dump(dns_db_t *db, dns_dbversion_t *version, const char *filename, - dns_masterformat_t masterformat) -{ + dns_masterformat_t masterformat) { UNUSED(db); UNUSED(version); UNUSED(filename); @@ -385,8 +364,7 @@ dump(dns_db_t *db, dns_dbversion_t *version, const char *filename, } static void -currentversion(dns_db_t *db, dns_dbversion_t **versionp) -{ +currentversion(dns_db_t *db, dns_dbversion_t **versionp) { dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)db; REQUIRE(VALID_SDLZDB(sdlz)); REQUIRE(versionp != NULL && *versionp == NULL); @@ -396,11 +374,10 @@ currentversion(dns_db_t *db, dns_dbversion_t **versionp) } static isc_result_t -newversion(dns_db_t *db, dns_dbversion_t **versionp) -{ +newversion(dns_db_t *db, dns_dbversion_t **versionp) { dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)db; - char origin[DNS_NAME_MAXTEXT + 1]; - isc_result_t result; + char origin[DNS_NAME_MAXTEXT + 1]; + isc_result_t result; REQUIRE(VALID_SDLZDB(sdlz)); @@ -424,8 +401,8 @@ newversion(dns_db_t *db, dns_dbversion_t **versionp) } static void -attachversion(dns_db_t *db, dns_dbversion_t *source, dns_dbversion_t **targetp) -{ +attachversion(dns_db_t *db, dns_dbversion_t *source, + dns_dbversion_t **targetp) { dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)db; REQUIRE(VALID_SDLZDB(sdlz)); @@ -435,10 +412,9 @@ attachversion(dns_db_t *db, dns_dbversion_t *source, dns_dbversion_t **targetp) } static void -closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) -{ +closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) { dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)db; - char origin[DNS_NAME_MAXTEXT + 1]; + char origin[DNS_NAME_MAXTEXT + 1]; REQUIRE(VALID_SDLZDB(sdlz)); REQUIRE(versionp != NULL); @@ -465,8 +441,7 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, bool commit) } static isc_result_t -createnode(dns_sdlz_db_t *sdlz, dns_sdlznode_t **nodep) -{ +createnode(dns_sdlz_db_t *sdlz, dns_sdlznode_t **nodep) { dns_sdlznode_t *node; node = isc_mem_get(sdlz->common.mctx, sizeof(dns_sdlznode_t)); @@ -487,14 +462,13 @@ createnode(dns_sdlz_db_t *sdlz, dns_sdlznode_t **nodep) } static void -destroynode(dns_sdlznode_t *node) -{ +destroynode(dns_sdlznode_t *node) { dns_rdatalist_t *list; - dns_rdata_t * rdata; - isc_buffer_t * b; - dns_sdlz_db_t * sdlz; - dns_db_t * db; - isc_mem_t * mctx; + dns_rdata_t *rdata; + isc_buffer_t *b; + dns_sdlz_db_t *sdlz; + dns_db_t *db; + isc_mem_t *mctx; isc_refcount_destroy(&node->references); @@ -532,16 +506,15 @@ destroynode(dns_sdlznode_t *node) 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) -{ - dns_sdlz_db_t * sdlz = (dns_sdlz_db_t *)db; - dns_sdlznode_t * node = NULL; - isc_result_t result; - isc_buffer_t b; - char namestr[DNS_NAME_MAXTEXT + 1]; - isc_buffer_t b2; - char zonestr[DNS_NAME_MAXTEXT + 1]; - bool isorigin; + dns_clientinfo_t *clientinfo, dns_dbnode_t **nodep) { + dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)db; + dns_sdlznode_t *node = NULL; + isc_result_t result; + isc_buffer_t b; + char namestr[DNS_NAME_MAXTEXT + 1]; + isc_buffer_t b2; + char zonestr[DNS_NAME_MAXTEXT + 1]; + bool isorigin; dns_sdlzauthorityfunc_t authority; REQUIRE(VALID_SDLZDB(sdlz)); @@ -553,7 +526,7 @@ getnodedata(dns_db_t *db, const dns_name_t *name, bool create, isc_buffer_init(&b, namestr, sizeof(namestr)); if ((sdlz->dlzimp->flags & DNS_SDLZFLAG_RELATIVEOWNER) != 0) { - dns_name_t relname; + dns_name_t relname; unsigned int labels; labels = dns_name_countlabels(name) - @@ -612,8 +585,8 @@ getnodedata(dns_db_t *db, const dns_name_t *name, bool create, nlabels = dns_name_countlabels(name); dlabels = nlabels - dns_name_countlabels(&sdlz->common.origin); for (i = 0; i < dlabels; i++) { - char wildstr[DNS_NAME_MAXTEXT + 1]; - dns_fixedname_t fixed; + char wildstr[DNS_NAME_MAXTEXT + 1]; + dns_fixedname_t fixed; const dns_name_t *wild; dns_fixedname_init(&fixed); @@ -688,15 +661,13 @@ getnodedata(dns_db_t *db, const dns_name_t *name, bool create, static isc_result_t findnodeext(dns_db_t *db, const dns_name_t *name, bool create, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, - dns_dbnode_t **nodep) -{ + dns_dbnode_t **nodep) { return (getnodedata(db, name, create, 0, methods, clientinfo, nodep)); } static isc_result_t findnode(dns_db_t *db, const dns_name_t *name, bool create, - dns_dbnode_t **nodep) -{ + dns_dbnode_t **nodep) { return (getnodedata(db, name, create, 0, NULL, NULL, nodep)); } @@ -704,8 +675,7 @@ static isc_result_t findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_name_t *dcname, dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *sigrdataset) { UNUSED(db); UNUSED(name); UNUSED(options); @@ -720,9 +690,8 @@ findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options, } static void -attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) -{ - dns_sdlz_db_t * sdlz = (dns_sdlz_db_t *)db; +attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) { + dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)db; dns_sdlznode_t *node = (dns_sdlznode_t *)source; REQUIRE(VALID_SDLZDB(sdlz)); @@ -735,9 +704,8 @@ attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) } static void -detachnode(dns_db_t *db, dns_dbnode_t **targetp) -{ - dns_sdlz_db_t * sdlz = (dns_sdlz_db_t *)db; +detachnode(dns_db_t *db, dns_dbnode_t **targetp) { + dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)db; dns_sdlznode_t *node; REQUIRE(VALID_SDLZDB(sdlz)); @@ -754,8 +722,7 @@ detachnode(dns_db_t *db, dns_dbnode_t **targetp) } static isc_result_t -expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) -{ +expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) { UNUSED(db); UNUSED(node); UNUSED(now); @@ -764,8 +731,7 @@ expirenode(dns_db_t *db, dns_dbnode_t *node, isc_stdtime_t now) } static void -printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) -{ +printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) { UNUSED(db); UNUSED(node); UNUSED(out); @@ -773,13 +739,13 @@ printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) } static isc_result_t -createiterator(dns_db_t *db, unsigned int options, dns_dbiterator_t **iteratorp) -{ - dns_sdlz_db_t * sdlz = (dns_sdlz_db_t *)db; +createiterator(dns_db_t *db, unsigned int options, + dns_dbiterator_t **iteratorp) { + dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)db; sdlz_dbiterator_t *sdlziter; - isc_result_t result; - isc_buffer_t b; - char zonestr[DNS_NAME_MAXTEXT + 1]; + isc_result_t result; + isc_buffer_t b; + char zonestr[DNS_NAME_MAXTEXT + 1]; REQUIRE(VALID_SDLZDB(sdlz)); @@ -804,8 +770,8 @@ createiterator(dns_db_t *db, unsigned int options, dns_dbiterator_t **iteratorp) sdlziter->common.methods = &dbiterator_methods; sdlziter->common.db = NULL; dns_db_attach(db, &sdlziter->common.db); - sdlziter->common.relative_names = - ((options & DNS_DB_RELATIVENAMES) != 0); + sdlziter->common.relative_names = ((options & DNS_DB_RELATIVENAMES) != + 0); sdlziter->common.magic = DNS_DBITERATOR_MAGIC; ISC_LIST_INIT(sdlziter->nodelist); sdlziter->current = NULL; @@ -837,11 +803,10 @@ createiterator(dns_db_t *db, unsigned int options, dns_dbiterator_t **iteratorp) 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) -{ + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { REQUIRE(VALID_SDLZNODE(node)); dns_rdatalist_t *list; - dns_sdlznode_t * sdlznode = (dns_sdlznode_t *)node; + dns_sdlznode_t *sdlznode = (dns_sdlznode_t *)node; UNUSED(db); UNUSED(version); @@ -874,16 +839,15 @@ findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ - dns_sdlz_db_t * sdlz = (dns_sdlz_db_t *)db; - dns_dbnode_t * node = NULL; + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { + dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)db; + dns_dbnode_t *node = NULL; dns_fixedname_t fname; - dns_rdataset_t xrdataset; - dns_name_t * xname; - unsigned int nlabels, olabels; - isc_result_t result; - unsigned int i; + dns_rdataset_t xrdataset; + dns_name_t *xname; + unsigned int nlabels, olabels; + isc_result_t result; + unsigned int i; REQUIRE(VALID_SDLZDB(sdlz)); REQUIRE(nodep == NULL || *nodep == NULL); @@ -951,7 +915,8 @@ findext(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, * origin, glue is ok, or there are known to be no zone cuts. */ if (i != olabels && (options & DNS_DBFIND_GLUEOK) == 0 && - (options & DNS_DBFIND_NOZONECUT) == 0) { + (options & DNS_DBFIND_NOZONECUT) == 0) + { result = findrdataset(db, node, version, dns_rdatatype_ns, 0, now, rdataset, sigrdataset); @@ -1036,17 +1001,15 @@ static isc_result_t find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, dns_rdatatype_t type, unsigned int options, isc_stdtime_t now, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *sigrdataset) { return (findext(db, name, version, type, options, now, nodep, foundname, NULL, NULL, rdataset, sigrdataset)); } static isc_result_t allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, - isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) -{ - dns_sdlz_db_t * sdlz = (dns_sdlz_db_t *)db; + isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) { + dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)db; sdlz_rdatasetiter_t *iterator; REQUIRE(VALID_SDLZDB(sdlz)); @@ -1075,16 +1038,15 @@ allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, static isc_result_t modrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdataset_t *rdataset, unsigned int options, - dns_sdlzmodrdataset_t mod_function) -{ - dns_sdlz_db_t * sdlz = (dns_sdlz_db_t *)db; + dns_sdlzmodrdataset_t mod_function) { + dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)db; dns_master_style_t *style = NULL; - isc_result_t result; - isc_buffer_t * buffer = NULL; - isc_mem_t * mctx; - dns_sdlznode_t * sdlznode; - char * rdatastr = NULL; - char name[DNS_NAME_MAXTEXT + 1]; + isc_result_t result; + isc_buffer_t *buffer = NULL; + isc_mem_t *mctx; + dns_sdlznode_t *sdlznode; + char *rdatastr = NULL; + char name[DNS_NAME_MAXTEXT + 1]; REQUIRE(VALID_SDLZDB(sdlz)); @@ -1143,10 +1105,9 @@ cleanup: static isc_result_t addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, isc_stdtime_t now, dns_rdataset_t *rdataset, unsigned int options, - dns_rdataset_t *addedrdataset) -{ + dns_rdataset_t *addedrdataset) { dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)db; - isc_result_t result; + isc_result_t result; UNUSED(now); UNUSED(addedrdataset); @@ -1164,10 +1125,9 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, static isc_result_t subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdataset_t *rdataset, unsigned int options, - dns_rdataset_t *newrdataset) -{ + dns_rdataset_t *newrdataset) { dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)db; - isc_result_t result; + isc_result_t result; UNUSED(newrdataset); REQUIRE(VALID_SDLZDB(sdlz)); @@ -1183,13 +1143,12 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, static isc_result_t deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, - dns_rdatatype_t type, dns_rdatatype_t covers) -{ - dns_sdlz_db_t * sdlz = (dns_sdlz_db_t *)db; - char name[DNS_NAME_MAXTEXT + 1]; - char b_type[DNS_RDATATYPE_FORMATSIZE]; + dns_rdatatype_t type, dns_rdatatype_t covers) { + dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)db; + char name[DNS_NAME_MAXTEXT + 1]; + char b_type[DNS_RDATATYPE_FORMATSIZE]; dns_sdlznode_t *sdlznode; - isc_result_t result; + isc_result_t result; UNUSED(covers); @@ -1212,38 +1171,33 @@ deleterdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, } static bool -issecure(dns_db_t *db) -{ +issecure(dns_db_t *db) { UNUSED(db); return (false); } static unsigned int -nodecount(dns_db_t *db) -{ +nodecount(dns_db_t *db) { UNUSED(db); return (0); } static bool -ispersistent(dns_db_t *db) -{ +ispersistent(dns_db_t *db) { UNUSED(db); return (true); } static void -overmem(dns_db_t *db, bool over) -{ +overmem(dns_db_t *db, bool over) { UNUSED(db); UNUSED(over); } static void -settask(dns_db_t *db, isc_task_t *task) -{ +settask(dns_db_t *db, isc_task_t *task) { UNUSED(db); UNUSED(task); } @@ -1253,10 +1207,9 @@ settask(dns_db_t *db, isc_task_t *task) * dns_rdatatype_dnskey record for a zone */ static isc_result_t -getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) -{ +getoriginnode(dns_db_t *db, dns_dbnode_t **nodep) { dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)db; - isc_result_t result; + isc_result_t result; REQUIRE(VALID_SDLZDB(sdlz)); if (sdlz->dlzimp->methods->newversion == NULL) { @@ -1329,10 +1282,9 @@ static dns_dbmethods_t sdlzdb_methods = { */ static void -dbiterator_destroy(dns_dbiterator_t **iteratorp) -{ +dbiterator_destroy(dns_dbiterator_t **iteratorp) { sdlz_dbiterator_t *sdlziter = (sdlz_dbiterator_t *)(*iteratorp); - dns_sdlz_db_t * sdlz = (dns_sdlz_db_t *)sdlziter->common.db; + dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)sdlziter->common.db; while (!ISC_LIST_EMPTY(sdlziter->nodelist)) { dns_sdlznode_t *node; @@ -1349,8 +1301,7 @@ dbiterator_destroy(dns_dbiterator_t **iteratorp) } static isc_result_t -dbiterator_first(dns_dbiterator_t *iterator) -{ +dbiterator_first(dns_dbiterator_t *iterator) { sdlz_dbiterator_t *sdlziter = (sdlz_dbiterator_t *)iterator; sdlziter->current = ISC_LIST_HEAD(sdlziter->nodelist); @@ -1362,8 +1313,7 @@ dbiterator_first(dns_dbiterator_t *iterator) } static isc_result_t -dbiterator_last(dns_dbiterator_t *iterator) -{ +dbiterator_last(dns_dbiterator_t *iterator) { sdlz_dbiterator_t *sdlziter = (sdlz_dbiterator_t *)iterator; sdlziter->current = ISC_LIST_TAIL(sdlziter->nodelist); @@ -1375,8 +1325,7 @@ dbiterator_last(dns_dbiterator_t *iterator) } static isc_result_t -dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name) -{ +dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name) { sdlz_dbiterator_t *sdlziter = (sdlz_dbiterator_t *)iterator; sdlziter->current = ISC_LIST_HEAD(sdlziter->nodelist); @@ -1390,8 +1339,7 @@ dbiterator_seek(dns_dbiterator_t *iterator, const dns_name_t *name) } static isc_result_t -dbiterator_prev(dns_dbiterator_t *iterator) -{ +dbiterator_prev(dns_dbiterator_t *iterator) { sdlz_dbiterator_t *sdlziter = (sdlz_dbiterator_t *)iterator; sdlziter->current = ISC_LIST_PREV(sdlziter->current, link); @@ -1403,8 +1351,7 @@ dbiterator_prev(dns_dbiterator_t *iterator) } static isc_result_t -dbiterator_next(dns_dbiterator_t *iterator) -{ +dbiterator_next(dns_dbiterator_t *iterator) { sdlz_dbiterator_t *sdlziter = (sdlz_dbiterator_t *)iterator; sdlziter->current = ISC_LIST_NEXT(sdlziter->current, link); @@ -1417,8 +1364,7 @@ dbiterator_next(dns_dbiterator_t *iterator) static isc_result_t dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, - dns_name_t *name) -{ + dns_name_t *name) { sdlz_dbiterator_t *sdlziter = (sdlz_dbiterator_t *)iterator; attachnode(iterator->db, sdlziter->current, nodep); @@ -1430,15 +1376,13 @@ dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep, } static isc_result_t -dbiterator_pause(dns_dbiterator_t *iterator) -{ +dbiterator_pause(dns_dbiterator_t *iterator) { UNUSED(iterator); return (ISC_R_SUCCESS); } static isc_result_t -dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) -{ +dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) { UNUSED(iterator); dns_name_copynf(dns_rootname, name); return (ISC_R_SUCCESS); @@ -1450,23 +1394,21 @@ dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) */ static void -disassociate(dns_rdataset_t *rdataset) -{ - dns_dbnode_t * node = rdataset->private5; +disassociate(dns_rdataset_t *rdataset) { + dns_dbnode_t *node = rdataset->private5; dns_sdlznode_t *sdlznode = (dns_sdlznode_t *)node; - dns_db_t * db = (dns_db_t *)sdlznode->sdlz; + dns_db_t *db = (dns_db_t *)sdlznode->sdlz; detachnode(db, &node); isc__rdatalist_disassociate(rdataset); } static void -rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) -{ - dns_dbnode_t * node = source->private5; +rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) { + dns_dbnode_t *node = source->private5; dns_sdlznode_t *sdlznode = (dns_sdlznode_t *)node; - dns_db_t * db = (dns_db_t *)sdlznode->sdlz; - dns_dbnode_t * tempdb = NULL; + dns_db_t *db = (dns_db_t *)sdlznode->sdlz; + dns_dbnode_t *tempdb = NULL; isc__rdatalist_clone(source, target); attachnode(db, node, &tempdb); @@ -1494,8 +1436,7 @@ static dns_rdatasetmethods_t rdataset_methods = { static void list_tordataset(dns_rdatalist_t *rdatalist, dns_db_t *db, dns_dbnode_t *node, - dns_rdataset_t *rdataset) -{ + dns_rdataset_t *rdataset) { /* * The sdlz rdataset is an rdatalist with some additions. * - private1 & private2 are used by the rdatalist. @@ -1525,10 +1466,9 @@ list_tordataset(dns_rdatalist_t *rdatalist, dns_db_t *db, dns_dbnode_t *node, static isc_result_t dns_sdlzcreateDBP(isc_mem_t *mctx, void *driverarg, void *dbdata, const dns_name_t *name, dns_rdataclass_t rdclass, - dns_db_t **dbp) -{ - isc_result_t result; - dns_sdlz_db_t * sdlzdb; + dns_db_t **dbp) { + isc_result_t result; + dns_sdlz_db_t *sdlzdb; dns_sdlzimplementation_t *imp; /* check that things are as we expect */ @@ -1574,16 +1514,15 @@ mem_cleanup: static isc_result_t dns_sdlzallowzonexfr(void *driverarg, void *dbdata, isc_mem_t *mctx, dns_rdataclass_t rdclass, const dns_name_t *name, - const isc_sockaddr_t *clientaddr, dns_db_t **dbp) -{ + const isc_sockaddr_t *clientaddr, dns_db_t **dbp) { isc_buffer_t b; isc_buffer_t b2; - char namestr[DNS_NAME_MAXTEXT + 1]; + char namestr[DNS_NAME_MAXTEXT + 1]; char clientstr[(sizeof "xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255." "255") + 1]; - isc_netaddr_t netaddr; - isc_result_t result; + isc_netaddr_t netaddr; + isc_result_t result; dns_sdlzimplementation_t *imp; /* @@ -1644,10 +1583,9 @@ dns_sdlzallowzonexfr(void *driverarg, void *dbdata, isc_mem_t *mctx, static isc_result_t dns_sdlzcreate(isc_mem_t *mctx, const char *dlzname, unsigned int argc, - char *argv[], void *driverarg, void **dbdata) -{ + char *argv[], void *driverarg, void **dbdata) { dns_sdlzimplementation_t *imp; - isc_result_t result = ISC_R_NOTFOUND; + isc_result_t result = ISC_R_NOTFOUND; /* Write debugging message to log */ sdlz_log(ISC_LOG_DEBUG(2), "Loading SDLZ driver."); @@ -1681,8 +1619,7 @@ dns_sdlzcreate(isc_mem_t *mctx, const char *dlzname, unsigned int argc, } static void -dns_sdlzdestroy(void *driverdata, void **dbdata) -{ +dns_sdlzdestroy(void *driverdata, void **dbdata) { dns_sdlzimplementation_t *imp; /* Write debugging message to log */ @@ -1702,11 +1639,10 @@ static isc_result_t dns_sdlzfindzone(void *driverarg, void *dbdata, isc_mem_t *mctx, dns_rdataclass_t rdclass, const dns_name_t *name, dns_clientinfomethods_t *methods, dns_clientinfo_t *clientinfo, - dns_db_t **dbp) -{ - isc_buffer_t b; - char namestr[DNS_NAME_MAXTEXT + 1]; - isc_result_t result; + dns_db_t **dbp) { + isc_buffer_t b; + char namestr[DNS_NAME_MAXTEXT + 1]; + isc_result_t result; dns_sdlzimplementation_t *imp; /* @@ -1749,9 +1685,8 @@ dns_sdlzfindzone(void *driverarg, void *dbdata, isc_mem_t *mctx, static isc_result_t dns_sdlzconfigure(void *driverarg, void *dbdata, dns_view_t *view, - dns_dlzdb_t *dlzdb) -{ - isc_result_t result; + dns_dlzdb_t *dlzdb) { + isc_result_t result; dns_sdlzimplementation_t *imp; REQUIRE(driverarg != NULL); @@ -1774,18 +1709,17 @@ dns_sdlzconfigure(void *driverarg, void *dbdata, dns_view_t *view, static bool dns_sdlzssumatch(const dns_name_t *signer, const dns_name_t *name, const isc_netaddr_t *tcpaddr, dns_rdatatype_t type, - const dst_key_t *key, void *driverarg, void *dbdata) -{ + const dst_key_t *key, void *driverarg, void *dbdata) { dns_sdlzimplementation_t *imp; - char b_signer[DNS_NAME_FORMATSIZE]; - char b_name[DNS_NAME_FORMATSIZE]; - char b_addr[ISC_NETADDR_FORMATSIZE]; - char b_type[DNS_RDATATYPE_FORMATSIZE]; - char b_key[DST_KEY_FORMATSIZE]; - isc_buffer_t * tkey_token = NULL; - isc_region_t token_region = { NULL, 0 }; - uint32_t token_len = 0; - bool ret; + char b_signer[DNS_NAME_FORMATSIZE]; + char b_name[DNS_NAME_FORMATSIZE]; + char b_addr[ISC_NETADDR_FORMATSIZE]; + char b_type[DNS_RDATATYPE_FORMATSIZE]; + char b_key[DST_KEY_FORMATSIZE]; + isc_buffer_t *tkey_token = NULL; + isc_region_t token_region = { NULL, 0 }; + uint32_t token_len = 0; + bool ret; REQUIRE(driverarg != NULL); @@ -1845,19 +1779,18 @@ static dns_dlzmethods_t sdlzmethods = { dns_sdlzcreate, dns_sdlzdestroy, isc_result_t dns_sdlz_putrr(dns_sdlzlookup_t *lookup, const char *type, dns_ttl_t ttl, - const char *data) -{ - dns_rdatalist_t * rdatalist; - dns_rdata_t * rdata; - dns_rdatatype_t typeval; + const char *data) { + dns_rdatalist_t *rdatalist; + dns_rdata_t *rdata; + dns_rdatatype_t typeval; isc_consttextregion_t r; - isc_buffer_t b; - isc_buffer_t * rdatabuf = NULL; - isc_lex_t * lex; - isc_result_t result; - unsigned int size; - isc_mem_t * mctx; - const dns_name_t * origin; + isc_buffer_t b; + isc_buffer_t *rdatabuf = NULL; + isc_lex_t *lex; + isc_result_t result; + unsigned int size; + isc_mem_t *mctx; + const dns_name_t *origin; REQUIRE(VALID_SDLZLOOKUP(lookup)); REQUIRE(type != NULL); @@ -1969,16 +1902,15 @@ failure: isc_result_t dns_sdlz_putnamedrr(dns_sdlzallnodes_t *allnodes, const char *name, - const char *type, dns_ttl_t ttl, const char *data) -{ - dns_name_t * newname; + const char *type, dns_ttl_t ttl, const char *data) { + dns_name_t *newname; const dns_name_t *origin; - dns_fixedname_t fnewname; - dns_sdlz_db_t * sdlz = (dns_sdlz_db_t *)allnodes->common.db; - dns_sdlznode_t * sdlznode; - isc_mem_t * mctx = sdlz->common.mctx; - isc_buffer_t b; - isc_result_t result; + dns_fixedname_t fnewname; + dns_sdlz_db_t *sdlz = (dns_sdlz_db_t *)allnodes->common.db; + dns_sdlznode_t *sdlznode; + isc_mem_t *mctx = sdlz->common.mctx; + isc_buffer_t b; + isc_result_t result; newname = dns_fixedname_initname(&fnewname); @@ -2022,10 +1954,9 @@ dns_sdlz_putnamedrr(dns_sdlzallnodes_t *allnodes, const char *name, isc_result_t dns_sdlz_putsoa(dns_sdlzlookup_t *lookup, const char *mname, const char *rname, - uint32_t serial) -{ + uint32_t serial) { char str[2 * DNS_NAME_MAXTEXT + 5 * (sizeof("2147483647")) + 7]; - int n; + int n; REQUIRE(mname != NULL); REQUIRE(rname != NULL); @@ -2042,10 +1973,9 @@ dns_sdlz_putsoa(dns_sdlzlookup_t *lookup, const char *mname, const char *rname, isc_result_t dns_sdlzregister(const char *drivername, const dns_sdlzmethods_t *methods, void *driverarg, unsigned int flags, isc_mem_t *mctx, - dns_sdlzimplementation_t **sdlzimp) -{ + dns_sdlzimplementation_t **sdlzimp) { dns_sdlzimplementation_t *imp; - isc_result_t result; + isc_result_t result; /* * Performs checks to make sure data is as we expect it to be. @@ -2120,8 +2050,7 @@ cleanup_mutex: } void -dns_sdlzunregister(dns_sdlzimplementation_t **sdlzimp) -{ +dns_sdlzunregister(dns_sdlzimplementation_t **sdlzimp) { dns_sdlzimplementation_t *imp; /* Write debugging message to log */ @@ -2150,8 +2079,7 @@ dns_sdlzunregister(dns_sdlzimplementation_t **sdlzimp) isc_result_t dns_sdlz_setdb(dns_dlzdb_t *dlzdatabase, dns_rdataclass_t rdclass, - const dns_name_t *name, dns_db_t **dbp) -{ + const dns_name_t *name, dns_db_t **dbp) { isc_result_t result; result = dns_sdlzcreateDBP(dlzdatabase->mctx, diff --git a/lib/dns/soa.c b/lib/dns/soa.c index 26b9944523..65cc88adc7 100644 --- a/lib/dns/soa.c +++ b/lib/dns/soa.c @@ -22,14 +22,12 @@ #include static inline uint32_t -decode_uint32(unsigned char *p) -{ +decode_uint32(unsigned char *p) { return ((p[0] << 24) + (p[1] << 16) + (p[2] << 8) + (p[3] << 0)); } static inline void -encode_uint32(uint32_t val, unsigned char *p) -{ +encode_uint32(uint32_t val, unsigned char *p) { p[0] = (uint8_t)(val >> 24); p[1] = (uint8_t)(val >> 16); p[2] = (uint8_t)(val >> 8); @@ -37,8 +35,7 @@ encode_uint32(uint32_t val, unsigned char *p) } static uint32_t -soa_get(dns_rdata_t *rdata, int offset) -{ +soa_get(dns_rdata_t *rdata, int offset) { INSIST(rdata->type == dns_rdatatype_soa); /* * Locate the field within the SOA RDATA based @@ -59,10 +56,9 @@ isc_result_t dns_soa_buildrdata(const dns_name_t *origin, const dns_name_t *contact, dns_rdataclass_t rdclass, uint32_t serial, uint32_t refresh, uint32_t retry, uint32_t expire, uint32_t minimum, - unsigned char *buffer, dns_rdata_t *rdata) -{ + unsigned char *buffer, dns_rdata_t *rdata) { dns_rdata_soa_t soa; - isc_buffer_t rdatabuf; + isc_buffer_t rdatabuf; REQUIRE(origin != NULL); REQUIRE(contact != NULL); @@ -88,34 +84,28 @@ dns_soa_buildrdata(const dns_name_t *origin, const dns_name_t *contact, } uint32_t -dns_soa_getserial(dns_rdata_t *rdata) -{ +dns_soa_getserial(dns_rdata_t *rdata) { return (soa_get(rdata, 0)); } uint32_t -dns_soa_getrefresh(dns_rdata_t *rdata) -{ +dns_soa_getrefresh(dns_rdata_t *rdata) { return (soa_get(rdata, 4)); } uint32_t -dns_soa_getretry(dns_rdata_t *rdata) -{ +dns_soa_getretry(dns_rdata_t *rdata) { return (soa_get(rdata, 8)); } uint32_t -dns_soa_getexpire(dns_rdata_t *rdata) -{ +dns_soa_getexpire(dns_rdata_t *rdata) { return (soa_get(rdata, 12)); } uint32_t -dns_soa_getminimum(dns_rdata_t *rdata) -{ +dns_soa_getminimum(dns_rdata_t *rdata) { return (soa_get(rdata, 16)); } static void -soa_set(dns_rdata_t *rdata, uint32_t val, int offset) -{ +soa_set(dns_rdata_t *rdata, uint32_t val, int offset) { INSIST(rdata->type == dns_rdatatype_soa); INSIST(rdata->length >= 20); INSIST(offset >= 0 && offset <= 16); @@ -123,27 +113,22 @@ soa_set(dns_rdata_t *rdata, uint32_t val, int offset) } void -dns_soa_setserial(uint32_t val, dns_rdata_t *rdata) -{ +dns_soa_setserial(uint32_t val, dns_rdata_t *rdata) { soa_set(rdata, val, 0); } void -dns_soa_setrefresh(uint32_t val, dns_rdata_t *rdata) -{ +dns_soa_setrefresh(uint32_t val, dns_rdata_t *rdata) { soa_set(rdata, val, 4); } void -dns_soa_setretry(uint32_t val, dns_rdata_t *rdata) -{ +dns_soa_setretry(uint32_t val, dns_rdata_t *rdata) { soa_set(rdata, val, 8); } void -dns_soa_setexpire(uint32_t val, dns_rdata_t *rdata) -{ +dns_soa_setexpire(uint32_t val, dns_rdata_t *rdata) { soa_set(rdata, val, 12); } void -dns_soa_setminimum(uint32_t val, dns_rdata_t *rdata) -{ +dns_soa_setminimum(uint32_t val, dns_rdata_t *rdata) { soa_set(rdata, val, 16); } diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c index da81ecd516..fd3f81a247 100644 --- a/lib/dns/spnego.c +++ b/lib/dns/spnego.c @@ -187,7 +187,7 @@ typedef enum asn1_error_number { typedef struct octet_string { size_t length; - void * data; + void *data; } octet_string; typedef char *general_string; @@ -195,7 +195,7 @@ typedef char *general_string; typedef char *utf8_string; typedef struct oid { - size_t length; + size_t length; unsigned *components; } oid; @@ -230,73 +230,57 @@ 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. @@ -310,11 +294,11 @@ fix_dce(size_t reallen, size_t *len); */ typedef union { unsigned char b[8]; - uint64_t _align; + uint64_t _align; } aligned8; typedef union { unsigned char b[16]; - uint64_t _align[2]; + uint64_t _align[2]; } aligned16; static aligned16 gss_krb5_mech_oid_bytes = { { 0x2a, 0x86, 0x48, 0x86, 0xf7, @@ -342,21 +326,19 @@ 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 */ static bool -cmp_gss_type(gss_buffer_t token, gss_OID gssoid) -{ +cmp_gss_type(gss_buffer_t token, gss_OID gssoid) { unsigned char *p; - size_t len; + size_t len; if (token->length == 0U) { return (GSS_S_DEFECTIVE_TOKEN); @@ -392,11 +374,10 @@ cmp_gss_type(gss_buffer_t token, gss_OID gssoid) static OM_uint32 code_NegTokenArg(OM_uint32 *minor_status, const NegTokenResp *resp, - unsigned char **outbuf, size_t *outbuf_size) -{ + unsigned char **outbuf, size_t *outbuf_size) { OM_uint32 ret; - u_char * buf; - size_t buf_size, buf_len = 0; + u_char *buf; + size_t buf_size, buf_len = 0; buf_size = 1024; buf = malloc(buf_size); @@ -453,10 +434,9 @@ code_NegTokenArg(OM_uint32 *minor_status, const NegTokenResp *resp, } static OM_uint32 -send_reject(OM_uint32 *minor_status, gss_buffer_t output_token) -{ +send_reject(OM_uint32 *minor_status, gss_buffer_t output_token) { NegTokenResp resp; - OM_uint32 ret; + OM_uint32 ret; resp.negState = malloc(sizeof(*resp.negState)); if (resp.negState == NULL) { @@ -482,10 +462,9 @@ send_reject(OM_uint32 *minor_status, gss_buffer_t output_token) static OM_uint32 send_accept(OM_uint32 *minor_status, gss_buffer_t output_token, - gss_buffer_t mech_token, const gss_OID pref) -{ + gss_buffer_t mech_token, const gss_OID pref) { NegTokenResp resp; - OM_uint32 ret; + OM_uint32 ret; memset(&resp, 0, sizeof(resp)); resp.negState = malloc(sizeof(*resp.negState)); @@ -535,28 +514,27 @@ send_accept(OM_uint32 *minor_status, gss_buffer_t output_token, } OM_uint32 -gss_accept_sec_context_spnego(OM_uint32 * minor_status, - gss_ctx_id_t * context_handle, - const gss_cred_id_t acceptor_cred_handle, - const gss_buffer_t input_token_buffer, +gss_accept_sec_context_spnego(OM_uint32 *minor_status, + gss_ctx_id_t *context_handle, + const gss_cred_id_t acceptor_cred_handle, + const gss_buffer_t input_token_buffer, const gss_channel_bindings_t input_chan_bindings, gss_name_t *src_name, gss_OID *mech_type, gss_buffer_t output_token, OM_uint32 *ret_flags, - OM_uint32 * time_rec, - gss_cred_id_t *delegated_cred_handle) -{ - NegTokenInit init_token; - OM_uint32 major_status = GSS_S_COMPLETE; - OM_uint32 minor_status2; + OM_uint32 *time_rec, + gss_cred_id_t *delegated_cred_handle) { + NegTokenInit init_token; + OM_uint32 major_status = GSS_S_COMPLETE; + OM_uint32 minor_status2; gss_buffer_desc ibuf, obuf; - gss_buffer_t ot = NULL; - gss_OID pref = GSS_KRB5_MECH; - unsigned char * buf; - size_t buf_size; - size_t len, taglen, ni_len; - int found = 0; - int ret; - unsigned i; + gss_buffer_t ot = NULL; + gss_OID pref = GSS_KRB5_MECH; + unsigned char *buf; + size_t buf_size; + size_t len, taglen, ni_len; + int found = 0; + int ret; + unsigned i; /* * Before doing anything else, see whether this is a SPNEGO @@ -597,7 +575,7 @@ gss_accept_sec_context_spnego(OM_uint32 * minor_status, for (i = 0; !found && i < init_token.mechTypes.len; ++i) { unsigned char mechbuf[17]; - size_t mech_len; + size_t mech_len; ret = der_put_oid(mechbuf + sizeof(mechbuf) - 1, sizeof(mechbuf), &init_token.mechTypes.val[i], @@ -609,14 +587,16 @@ gss_accept_sec_context_spnego(OM_uint32 * minor_status, if (mech_len == GSS_KRB5_MECH->length && isc_safe_memequal(GSS_KRB5_MECH->elements, mechbuf + sizeof(mechbuf) - mech_len, - mech_len)) { + mech_len)) + { found = 1; break; } if (mech_len == GSS_MSKRB5_MECH->length && isc_safe_memequal(GSS_MSKRB5_MECH->elements, mechbuf + sizeof(mechbuf) - mech_len, - mech_len)) { + mech_len)) + { found = 1; if (i == 0) { pref = GSS_MSKRB5_MECH; @@ -657,10 +637,9 @@ gss_accept_sec_context_spnego(OM_uint32 * minor_status, /* decapsulate.c */ static OM_uint32 -gssapi_verify_mech_header(u_char **str, size_t total_len, const gss_OID mech) -{ - size_t len, len_len, mech_len, foo; - int e; +gssapi_verify_mech_header(u_char **str, size_t total_len, const gss_OID mech) { + size_t len, len_len, mech_len, foo; + int e; u_char *p = *str; if (total_len < 1U) { @@ -699,11 +678,10 @@ gssapi_verify_mech_header(u_char **str, size_t total_len, const gss_OID mech) */ static OM_uint32 -gssapi_spnego_decapsulate(OM_uint32 * minor_status, +gssapi_spnego_decapsulate(OM_uint32 *minor_status, gss_buffer_t input_token_buffer, unsigned char **buf, - size_t *buf_len, const gss_OID mech) -{ - u_char * p; + size_t *buf_len, const gss_OID mech) { + u_char *p; OM_uint32 ret; p = input_token_buffer->value; @@ -721,15 +699,13 @@ gssapi_spnego_decapsulate(OM_uint32 * minor_status, /* der_free.c */ static void -free_octet_string(octet_string *k) -{ +free_octet_string(octet_string *k) { free(k->data); k->data = NULL; } static void -free_oid(oid *k) -{ +free_oid(oid *k) { free(k->components); k->components = NULL; } @@ -745,10 +721,9 @@ free_oid(oid *k) static int der_get_unsigned(const unsigned char *p, size_t len, unsigned *ret, - size_t *size) -{ + size_t *size) { unsigned val = 0; - size_t oldlen = len; + size_t oldlen = len; while (len--) { val = val * 256 + *p++; @@ -761,9 +736,8 @@ der_get_unsigned(const unsigned char *p, size_t len, unsigned *ret, } static int -der_get_int(const unsigned char *p, size_t len, int *ret, size_t *size) -{ - int val = 0; +der_get_int(const unsigned char *p, size_t len, int *ret, size_t *size) { + int val = 0; size_t oldlen = len; if (len > 0U) { @@ -780,8 +754,7 @@ der_get_int(const unsigned char *p, size_t len, int *ret, size_t *size) } static int -der_get_length(const unsigned char *p, size_t len, size_t *val, size_t *size) -{ +der_get_length(const unsigned char *p, size_t len, size_t *val, size_t *size) { size_t v; if (len <= 0U) { @@ -795,8 +768,8 @@ der_get_length(const unsigned char *p, size_t len, size_t *val, size_t *size) *size = 1; } } else { - int e; - size_t l; + int e; + size_t l; unsigned tmp; if (v == 0x80U) { @@ -824,8 +797,7 @@ 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) -{ + size_t *size) { data->length = len; if (len != 0U) { data->data = malloc(len); @@ -843,9 +815,8 @@ der_get_octet_string(const unsigned char *p, size_t len, octet_string *data, } static int -der_get_oid(const unsigned char *p, size_t len, oid *data, size_t *size) -{ - int n; +der_get_oid(const unsigned char *p, size_t len, oid *data, size_t *size) { + int n; size_t oldlen = len; data->components = NULL; @@ -884,8 +855,7 @@ 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) -{ + Der_type *type, int *tag, size_t *size) { if (len < 1U) { return (ASN1_OVERRUN); } @@ -900,13 +870,12 @@ der_get_tag(const unsigned char *p, size_t len, Der_class *xclass, static int der_match_tag(const unsigned char *p, size_t len, Der_class xclass, - Der_type type, int tag, size_t *size) -{ - size_t l; + Der_type type, int tag, size_t *size) { + size_t l; Der_class thisclass; - Der_type thistype; - int thistag; - int e; + Der_type thistype; + int thistag; + int e; e = der_get_tag(p, len, &thisclass, &thistype, &thistag, &l); if (e) { @@ -930,10 +899,9 @@ der_match_tag(const unsigned char *p, size_t len, Der_class xclass, 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) -{ + size_t *size) { size_t l, ret = 0; - int e; + int e; e = der_match_tag(p, len, xclass, type, tag, &l); if (e) { @@ -957,11 +925,10 @@ der_match_tag_and_length(const unsigned char *p, size_t len, Der_class xclass, } static int -decode_enumerated(const unsigned char *p, size_t len, void *num, size_t *size) -{ +decode_enumerated(const unsigned char *p, size_t len, void *num, size_t *size) { size_t ret = 0; size_t l, reallen; - int e; + int e; e = der_match_tag(p, len, ASN1_C_UNIV, PRIM, UT_Enumerated, &l); if (e) { @@ -994,11 +961,10 @@ decode_enumerated(const unsigned char *p, size_t len, void *num, size_t *size) static int decode_octet_string(const unsigned char *p, size_t len, octet_string *k, - size_t *size) -{ + size_t *size) { size_t ret = 0; size_t l; - int e; + int e; size_t slen; k->data = NULL; @@ -1039,11 +1005,10 @@ decode_octet_string(const unsigned char *p, size_t len, octet_string *k, } static int -decode_oid(const unsigned char *p, size_t len, oid *k, size_t *size) -{ +decode_oid(const unsigned char *p, size_t len, oid *k, size_t *size) { size_t ret = 0; size_t l; - int e; + int e; size_t slen; e = der_match_tag(p, len, ASN1_C_UNIV, PRIM, UT_OID, &l); @@ -1081,8 +1046,7 @@ decode_oid(const unsigned char *p, size_t len, oid *k, size_t *size) } static int -fix_dce(size_t reallen, size_t *len) -{ +fix_dce(size_t reallen, size_t *len) { if (reallen == ASN1_INDEFINITE) { return (1); } @@ -1096,8 +1060,7 @@ fix_dce(size_t reallen, size_t *len) /* der_length.c */ static size_t -len_unsigned(unsigned val) -{ +len_unsigned(unsigned val) { size_t ret = 0; do { @@ -1108,8 +1071,7 @@ len_unsigned(unsigned val) } static size_t -length_len(size_t len) -{ +length_len(size_t len) { if (len < 128U) { return (1); } else { @@ -1127,8 +1089,7 @@ length_len(size_t len) */ static int -der_put_unsigned(unsigned char *p, size_t len, unsigned val, size_t *size) -{ +der_put_unsigned(unsigned char *p, size_t len, unsigned val, size_t *size) { unsigned char *base = p; if (val) { @@ -1153,8 +1114,7 @@ der_put_unsigned(unsigned char *p, size_t len, unsigned val, size_t *size) } static int -der_put_int(unsigned char *p, size_t len, int val, size_t *size) -{ +der_put_int(unsigned char *p, size_t len, int val, size_t *size) { unsigned char *base = p; if (val >= 0) { @@ -1198,8 +1158,7 @@ der_put_int(unsigned char *p, size_t len, int val, size_t *size) } static int -der_put_length(unsigned char *p, size_t len, size_t val, size_t *size) -{ +der_put_length(unsigned char *p, size_t len, size_t val, size_t *size) { if (len < 1U) { return (ASN1_OVERFLOW); } @@ -1209,7 +1168,7 @@ der_put_length(unsigned char *p, size_t len, size_t val, size_t *size) return (0); } else { size_t l; - int e; + int e; e = der_put_unsigned(p, len - 1, (unsigned int)val, &l); if (e) { @@ -1224,8 +1183,7 @@ der_put_length(unsigned char *p, size_t len, size_t val, size_t *size) static int der_put_octet_string(unsigned char *p, size_t len, const octet_string *data, - size_t *size) -{ + size_t *size) { if (len < data->length) { return (ASN1_OVERFLOW); } @@ -1238,10 +1196,9 @@ der_put_octet_string(unsigned char *p, size_t len, const octet_string *data, } static int -der_put_oid(unsigned char *p, size_t len, const oid *data, size_t *size) -{ +der_put_oid(unsigned char *p, size_t len, const oid *data, size_t *size) { unsigned char *base = p; - size_t n; + size_t n; for (n = data->length; n >= 3u; --n) { unsigned u = data->components[n - 1]; @@ -1271,8 +1228,7 @@ 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 *size) -{ + int tag, size_t *size) { if (len < 1U) { return (ASN1_OVERFLOW); } @@ -1283,11 +1239,10 @@ der_put_tag(unsigned char *p, size_t len, Der_class xclass, Der_type type, static int der_put_length_and_tag(unsigned char *p, size_t len, size_t len_val, - Der_class xclass, Der_type type, int tag, size_t *size) -{ + Der_class xclass, Der_type type, int tag, size_t *size) { size_t ret = 0; size_t l; - int e; + int e; e = der_put_length(p, len, len_val, &l); if (e) { @@ -1310,12 +1265,12 @@ der_put_length_and_tag(unsigned char *p, size_t len, size_t len_val, } static int -encode_enumerated(unsigned char *p, size_t len, const void *data, size_t *size) -{ +encode_enumerated(unsigned char *p, size_t len, const void *data, + size_t *size) { unsigned num = *(const unsigned *)data; - size_t ret = 0; - size_t l; - int e; + size_t ret = 0; + size_t l; + int e; e = der_put_int(p, len, num, &l); if (e) { @@ -1340,11 +1295,10 @@ encode_enumerated(unsigned char *p, size_t len, const void *data, size_t *size) static int encode_octet_string(unsigned char *p, size_t len, const octet_string *k, - size_t *size) -{ + size_t *size) { size_t ret = 0; size_t l; - int e; + int e; e = der_put_octet_string(p, len, k, &l); if (e) { @@ -1368,11 +1322,10 @@ encode_octet_string(unsigned char *p, size_t len, const octet_string *k, } static int -encode_oid(unsigned char *p, size_t len, const oid *k, size_t *size) -{ +encode_oid(unsigned char *p, size_t len, const oid *k, size_t *size) { size_t ret = 0; size_t l; - int e; + int e; e = der_put_oid(p, len, k, &l); if (e) { @@ -1398,8 +1351,7 @@ encode_oid(unsigned char *p, size_t len, const oid *k, size_t *size) static void gssapi_encap_length(size_t data_len, size_t *len, size_t *total_len, - const gss_OID mech) -{ + const gss_OID mech) { size_t len_len; *len = 1 + 1 + mech->length + data_len; @@ -1410,9 +1362,8 @@ gssapi_encap_length(size_t data_len, size_t *len, size_t *total_len, } static u_char * -gssapi_mech_make_header(u_char *p, size_t len, const gss_OID mech) -{ - int e; +gssapi_mech_make_header(u_char *p, size_t len, const gss_OID mech) { + int e; size_t len_len, foo; *p++ = 0x60; @@ -1436,9 +1387,8 @@ gssapi_mech_make_header(u_char *p, size_t len, const gss_OID mech) static OM_uint32 gssapi_spnego_encapsulate(OM_uint32 *minor_status, unsigned char *buf, size_t buf_size, gss_buffer_t output_token, - const gss_OID mech) -{ - size_t len, outer_len; + const gss_OID mech) { + size_t len, outer_len; u_char *p; gssapi_encap_length(buf_size, &len, &outer_len, mech); @@ -1467,10 +1417,9 @@ gssapi_spnego_encapsulate(OM_uint32 *minor_status, unsigned char *buf, */ static int -add_mech(MechTypeList *mech_list, gss_OID mech) -{ +add_mech(MechTypeList *mech_list, gss_OID mech) { MechType *tmp; - int ret; + int ret; tmp = realloc(mech_list->val, (mech_list->len + 1) * sizeof(*tmp)); if (tmp == NULL) { @@ -1495,11 +1444,10 @@ add_mech(MechTypeList *mech_list, gss_OID mech) static ssize_t gssapi_krb5_get_mech(const u_char *ptr, size_t total_len, - const u_char **mech_ret) -{ - size_t len, len_len, mech_len, foo; + const u_char **mech_ret) { + size_t len, len_len, mech_len, foo; const u_char *p = ptr; - int e; + int e; if (total_len < 1U) { return (-1); @@ -1525,22 +1473,21 @@ gssapi_krb5_get_mech(const u_char *ptr, size_t total_len, } static OM_uint32 -spnego_initial(OM_uint32 * minor_status, +spnego_initial(OM_uint32 *minor_status, const gss_cred_id_t initiator_cred_handle, gss_ctx_id_t *context_handle, const gss_name_t target_name, const gss_OID mech_type, OM_uint32 req_flags, OM_uint32 time_req, const gss_channel_bindings_t input_chan_bindings, const gss_buffer_t input_token, gss_OID *actual_mech_type, gss_buffer_t output_token, OM_uint32 *ret_flags, - OM_uint32 *time_rec) -{ - NegTokenInit token_init; - OM_uint32 major_status, minor_status2; + OM_uint32 *time_rec) { + NegTokenInit token_init; + OM_uint32 major_status, minor_status2; gss_buffer_desc krb5_output_token = GSS_C_EMPTY_BUFFER; - unsigned char * buf = NULL; - size_t buf_size; - size_t len; - int ret; + unsigned char *buf = NULL; + size_t buf_size; + size_t len; + int ret; (void)mech_type; @@ -1647,18 +1594,17 @@ spnego_reply(OM_uint32 *minor_status, const gss_cred_id_t initiator_cred_handle, const gss_channel_bindings_t input_chan_bindings, const gss_buffer_t input_token, gss_OID *actual_mech_type, gss_buffer_t output_token, OM_uint32 *ret_flags, - OM_uint32 *time_rec) -{ - OM_uint32 ret; - NegTokenResp resp; - unsigned char * buf; - size_t buf_size; - u_char oidbuf[17]; - size_t oidlen; + OM_uint32 *time_rec) { + OM_uint32 ret; + NegTokenResp resp; + unsigned char *buf; + size_t buf_size; + u_char oidbuf[17]; + size_t oidlen; gss_buffer_desc sub_token; - ssize_t mech_len; - const u_char * p; - size_t len, taglen; + ssize_t mech_len; + const u_char *p; + size_t len, taglen; (void)mech_type; @@ -1677,14 +1623,16 @@ spnego_reply(OM_uint32 *minor_status, const gss_cred_id_t initiator_cred_handle, buf = input_token->value; buf_size = input_token->length; } else if ((size_t)mech_len == GSS_KRB5_MECH->length && - isc_safe_memequal(GSS_KRB5_MECH->elements, p, mech_len)) { + isc_safe_memequal(GSS_KRB5_MECH->elements, p, mech_len)) + { return (gss_init_sec_context( minor_status, initiator_cred_handle, context_handle, target_name, GSS_KRB5_MECH, req_flags, time_req, input_chan_bindings, input_token, actual_mech_type, output_token, ret_flags, time_rec)); } else if ((size_t)mech_len == GSS_SPNEGO_MECH->length && - isc_safe_memequal(GSS_SPNEGO_MECH->elements, p, mech_len)) { + isc_safe_memequal(GSS_SPNEGO_MECH->elements, p, mech_len)) + { ret = gssapi_spnego_decapsulate(minor_status, input_token, &buf, &buf_size, GSS_SPNEGO_MECH); if (ret) { @@ -1712,7 +1660,8 @@ spnego_reply(OM_uint32 *minor_status, const gss_cred_id_t initiator_cred_handle, } if (resp.negState == NULL || *(resp.negState) == reject || - resp.supportedMech == NULL) { + resp.supportedMech == NULL) + { free_NegTokenResp(&resp); return (GSS_S_BAD_MECH); } @@ -1721,7 +1670,8 @@ spnego_reply(OM_uint32 *minor_status, const gss_cred_id_t initiator_cred_handle, resp.supportedMech, &oidlen); if (ret || oidlen != GSS_KRB5_MECH->length || !isc_safe_memequal(oidbuf + sizeof(oidbuf) - oidlen, - GSS_KRB5_MECH->elements, oidlen)) { + GSS_KRB5_MECH->elements, oidlen)) + { free_NegTokenResp(&resp); return (GSS_S_BAD_MECH); } @@ -1763,8 +1713,7 @@ gss_init_sec_context_spnego( const gss_OID mech_type, OM_uint32 req_flags, OM_uint32 time_req, const gss_channel_bindings_t input_chan_bindings, const gss_buffer_t input_token, gss_OID *actual_mech_type, - gss_buffer_t output_token, OM_uint32 *ret_flags, OM_uint32 *time_rec) -{ + gss_buffer_t output_token, OM_uint32 *ret_flags, OM_uint32 *time_rec) { /* Dirty trick to suppress compiler warnings */ /* Figure out whether we're starting over or processing a reply */ diff --git a/lib/dns/spnego_asn1.c b/lib/dns/spnego_asn1.c index f0b6f12ed6..01604ff618 100644 --- a/lib/dns/spnego_asn1.c +++ b/lib/dns/spnego_asn1.c @@ -25,7 +25,7 @@ typedef struct octet_string { size_t length; - void * data; + void *data; } octet_string; typedef char *general_string; @@ -33,7 +33,7 @@ typedef char *general_string; typedef char *utf8_string; typedef struct oid { - size_t length; + size_t length; unsigned *components; } oid; @@ -61,12 +61,9 @@ 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,15 +73,14 @@ free_MechType(MechType *); typedef struct MechTypeList { unsigned int len; - MechType * val; + 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 */ @@ -103,12 +99,11 @@ 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 */ @@ -122,18 +117,17 @@ free_ContextFlags(ContextFlags *); */ typedef struct NegTokenInit { - MechTypeList mechTypes; + MechTypeList mechTypes; ContextFlags *reqFlags; octet_string *mechToken; 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 */ @@ -151,17 +145,16 @@ typedef struct NegTokenResp { request_mic = 3 } * negState; - MechType * supportedMech; + MechType *supportedMech; octet_string *responseToken; 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 */ @@ -181,11 +174,10 @@ free_NegTokenResp(NegTokenResp *); static int encode_MechType(unsigned char *p, size_t len, const MechType *data, - size_t *size) -{ + size_t *size) { size_t ret = 0; size_t l; - int e; + int e; e = encode_oid(p, len, data, &l); BACK; @@ -205,11 +197,10 @@ encode_MechType(unsigned char *p, size_t len, const MechType *data, static int decode_MechType(const unsigned char *p, size_t len, MechType *data, - size_t *size) -{ + size_t *size) { size_t ret = 0; size_t l; - int e; + int e; memset(data, 0, sizeof(*data)); e = decode_oid(p, len, data, &l); @@ -224,8 +215,7 @@ fail: } static void -free_MechType(MechType *data) -{ +free_MechType(MechType *data) { free_oid(data); } @@ -238,11 +228,10 @@ free_MechType(MechType *data) static int encode_MechTypeList(unsigned char *p, size_t len, const MechTypeList *data, - size_t *size) -{ + size_t *size) { size_t ret = 0; size_t l; - int i, e; + int i, e; for (i = (data)->len - 1; i >= 0; --i) { size_t oldret = ret; @@ -260,11 +249,10 @@ encode_MechTypeList(unsigned char *p, size_t len, const MechTypeList *data, static int decode_MechTypeList(const unsigned char *p, size_t len, MechTypeList *data, - size_t *size) -{ + size_t *size) { size_t ret = 0, reallen; size_t l; - int e; + int e; memset(data, 0, sizeof(*data)); reallen = 0; @@ -309,8 +297,7 @@ fail: } static void -free_MechTypeList(MechTypeList *data) -{ +free_MechTypeList(MechTypeList *data) { while ((data)->len) { free_MechType(&(data)->val[(data)->len - 1]); (data)->len--; @@ -328,11 +315,10 @@ free_MechTypeList(MechTypeList *data) static int encode_ContextFlags(unsigned char *p, size_t len, const ContextFlags *data, - size_t *size) -{ + size_t *size) { size_t ret = 0; size_t l; - int e; + int e; { unsigned char c = 0; @@ -384,11 +370,10 @@ encode_ContextFlags(unsigned char *p, size_t len, const ContextFlags *data, static int decode_ContextFlags(const unsigned char *p, size_t len, ContextFlags *data, - size_t *size) -{ + size_t *size) { size_t ret = 0, reallen; size_t l; - int e; + int e; memset(data, 0, sizeof(*data)); reallen = 0; @@ -421,8 +406,7 @@ fail: } static void -free_ContextFlags(ContextFlags *data) -{ +free_ContextFlags(ContextFlags *data) { (void)data; } @@ -443,11 +427,10 @@ free_ContextFlags(ContextFlags *data) static int encode_NegTokenInit(unsigned char *p, size_t len, const NegTokenInit *data, - size_t *size) -{ + size_t *size) { size_t ret = 0; size_t l; - int e; + int e; if ((data)->mechListMIC) { size_t oldret = ret; @@ -498,11 +481,10 @@ encode_NegTokenInit(unsigned char *p, size_t len, const NegTokenInit *data, static int decode_NegTokenInit(const unsigned char *p, size_t len, NegTokenInit *data, - size_t *size) -{ + size_t *size) { size_t ret = 0, reallen; size_t l; - int e; + int e; memset(data, 0, sizeof(*data)); reallen = 0; @@ -687,8 +669,7 @@ fail: } static void -free_NegTokenInit(NegTokenInit *data) -{ +free_NegTokenInit(NegTokenInit *data) { free_MechTypeList(&(data)->mechTypes); if ((data)->reqFlags) { free_ContextFlags((data)->reqFlags); @@ -716,11 +697,10 @@ free_NegTokenInit(NegTokenInit *data) static int encode_NegTokenResp(unsigned char *p, size_t len, const NegTokenResp *data, - size_t *size) -{ + size_t *size) { size_t ret = 0; size_t l; - int e; + int e; if ((data)->mechListMIC) { size_t oldret = ret; @@ -771,11 +751,10 @@ encode_NegTokenResp(unsigned char *p, size_t len, const NegTokenResp *data, static int decode_NegTokenResp(const unsigned char *p, size_t len, NegTokenResp *data, - size_t *size) -{ + size_t *size) { size_t ret = 0, reallen; size_t l; - int e; + int e; /* cppcheck-suppress uninitvar */ memset(data, 0, sizeof(*data)); @@ -964,8 +943,7 @@ fail: } static void -free_NegTokenResp(NegTokenResp *data) -{ +free_NegTokenResp(NegTokenResp *data) { if ((data)->negState) { free((data)->negState); (data)->negState = NULL; diff --git a/lib/dns/ssu.c b/lib/dns/ssu.c index 2dba4d6536..47758b8cf6 100644 --- a/lib/dns/ssu.c +++ b/lib/dns/ssu.c @@ -30,20 +30,20 @@ #include #include -#define SSUTABLEMAGIC ISC_MAGIC('S', 'S', 'U', 'T') +#define SSUTABLEMAGIC ISC_MAGIC('S', 'S', 'U', 'T') #define VALID_SSUTABLE(table) ISC_MAGIC_VALID(table, SSUTABLEMAGIC) -#define SSURULEMAGIC ISC_MAGIC('S', 'S', 'U', 'R') +#define SSURULEMAGIC ISC_MAGIC('S', 'S', 'U', 'R') #define VALID_SSURULE(table) ISC_MAGIC_VALID(table, SSURULEMAGIC) struct dns_ssurule { - unsigned int magic; - bool grant; /*%< is this a grant or a deny? */ + unsigned int magic; + bool grant; /*%< is this a grant or a deny? */ dns_ssumatchtype_t matchtype; /*%< which type of pattern match? * */ - dns_name_t * identity; /*%< the identity to match */ - dns_name_t * name; /*%< the name being updated */ - unsigned int ntypes; /*%< number of data types covered */ + dns_name_t *identity; /*%< the identity to match */ + dns_name_t *name; /*%< the name being updated */ + unsigned int ntypes; /*%< number of data types covered */ dns_rdatatype_t *types; /*%< the data types. Can include */ /* ANY. if NULL, defaults to all */ /* types except SIG, SOA, and NS */ @@ -51,16 +51,15 @@ struct dns_ssurule { }; struct dns_ssutable { - unsigned int magic; - isc_mem_t * mctx; + unsigned int magic; + isc_mem_t *mctx; isc_refcount_t references; - dns_dlzdb_t * dlzdatabase; + dns_dlzdb_t *dlzdatabase; ISC_LIST(dns_ssurule_t) rules; }; isc_result_t -dns_ssutable_create(isc_mem_t *mctx, dns_ssutable_t **tablep) -{ +dns_ssutable_create(isc_mem_t *mctx, dns_ssutable_t **tablep) { dns_ssutable_t *table; REQUIRE(tablep != NULL && *tablep == NULL); @@ -77,8 +76,7 @@ dns_ssutable_create(isc_mem_t *mctx, dns_ssutable_t **tablep) } static inline void -destroy(dns_ssutable_t *table) -{ +destroy(dns_ssutable_t *table) { isc_mem_t *mctx; REQUIRE(VALID_SSUTABLE(table)); @@ -108,8 +106,7 @@ destroy(dns_ssutable_t *table) } void -dns_ssutable_attach(dns_ssutable_t *source, dns_ssutable_t **targetp) -{ +dns_ssutable_attach(dns_ssutable_t *source, dns_ssutable_t **targetp) { REQUIRE(VALID_SSUTABLE(source)); REQUIRE(targetp != NULL && *targetp == NULL); @@ -119,8 +116,7 @@ dns_ssutable_attach(dns_ssutable_t *source, dns_ssutable_t **targetp) } void -dns_ssutable_detach(dns_ssutable_t **tablep) -{ +dns_ssutable_detach(dns_ssutable_t **tablep) { dns_ssutable_t *table; REQUIRE(tablep != NULL); @@ -137,10 +133,9 @@ isc_result_t dns_ssutable_addrule(dns_ssutable_t *table, bool grant, const dns_name_t *identity, dns_ssumatchtype_t matchtype, const dns_name_t *name, unsigned int ntypes, - dns_rdatatype_t *types) -{ + dns_rdatatype_t *types) { dns_ssurule_t *rule; - isc_mem_t * mctx; + isc_mem_t *mctx; REQUIRE(VALID_SSUTABLE(table)); REQUIRE(dns_name_isabsolute(identity)); @@ -174,8 +169,8 @@ dns_ssutable_addrule(dns_ssutable_t *table, bool grant, rule->ntypes = ntypes; if (ntypes > 0) { - rule->types = - isc_mem_get(mctx, ntypes * sizeof(dns_rdatatype_t)); + rule->types = isc_mem_get(mctx, + ntypes * sizeof(dns_rdatatype_t)); memmove(rule->types, types, ntypes * sizeof(dns_rdatatype_t)); } else { rule->types = NULL; @@ -188,20 +183,18 @@ dns_ssutable_addrule(dns_ssutable_t *table, bool grant, } static inline bool -isusertype(dns_rdatatype_t type) -{ +isusertype(dns_rdatatype_t type) { return (type != dns_rdatatype_ns && type != dns_rdatatype_soa && type != dns_rdatatype_rrsig); } static void -reverse_from_address(dns_name_t *tcpself, const isc_netaddr_t *tcpaddr) -{ - char buf[16 * 4 + sizeof("IP6.ARPA.")]; - isc_result_t result; +reverse_from_address(dns_name_t *tcpself, const isc_netaddr_t *tcpaddr) { + char buf[16 * 4 + sizeof("IP6.ARPA.")]; + isc_result_t result; const unsigned char *ap; - isc_buffer_t b; - unsigned long l; + isc_buffer_t b; + unsigned long l; switch (tcpaddr->family) { case AF_INET: @@ -246,13 +239,12 @@ reverse_from_address(dns_name_t *tcpself, const isc_netaddr_t *tcpaddr) } static void -stf_from_address(dns_name_t *stfself, const isc_netaddr_t *tcpaddr) -{ - char buf[sizeof("X.X.X.X.Y.Y.Y.Y.2.0.0.2.IP6.ARPA.")]; - isc_result_t result; +stf_from_address(dns_name_t *stfself, const isc_netaddr_t *tcpaddr) { + char buf[sizeof("X.X.X.X.Y.Y.Y.Y.2.0.0.2.IP6.ARPA.")]; + isc_result_t result; const unsigned char *ap; - isc_buffer_t b; - unsigned long l; + isc_buffer_t b; + unsigned long l; switch (tcpaddr->family) { case AF_INET: @@ -292,16 +284,15 @@ bool dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, const dns_name_t *name, const isc_netaddr_t *addr, bool tcp, const dns_aclenv_t *env, dns_rdatatype_t type, - const dst_key_t *key) -{ - dns_ssurule_t * rule; - unsigned int i; + const dst_key_t *key) { + dns_ssurule_t *rule; + unsigned int i; dns_fixedname_t fixed; - dns_name_t * wildcard; - dns_name_t * tcpself; - dns_name_t * stfself; - isc_result_t result; - int match; + dns_name_t *wildcard; + dns_name_t *tcpself; + dns_name_t *stfself; + isc_result_t result; + int match; REQUIRE(VALID_SSUTABLE(table)); REQUIRE(signer == NULL || dns_name_isabsolute(signer)); @@ -313,7 +304,8 @@ dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, } for (rule = ISC_LIST_HEAD(table->rules); rule != NULL; - rule = ISC_LIST_NEXT(rule, link)) { + rule = ISC_LIST_NEXT(rule, link)) + { switch (rule->matchtype) { case dns_ssumatchtype_name: case dns_ssumatchtype_local: @@ -496,7 +488,8 @@ dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, case dns_ssumatchtype_external: if (!dns_ssu_external_match(rule->identity, signer, name, addr, type, key, - table->mctx)) { + table->mctx)) + { continue; } break; @@ -536,36 +529,31 @@ dns_ssutable_checkrules(dns_ssutable_t *table, const dns_name_t *signer, } bool -dns_ssurule_isgrant(const dns_ssurule_t *rule) -{ +dns_ssurule_isgrant(const dns_ssurule_t *rule) { REQUIRE(VALID_SSURULE(rule)); return (rule->grant); } dns_name_t * -dns_ssurule_identity(const dns_ssurule_t *rule) -{ +dns_ssurule_identity(const dns_ssurule_t *rule) { REQUIRE(VALID_SSURULE(rule)); return (rule->identity); } unsigned int -dns_ssurule_matchtype(const dns_ssurule_t *rule) -{ +dns_ssurule_matchtype(const dns_ssurule_t *rule) { REQUIRE(VALID_SSURULE(rule)); return (rule->matchtype); } dns_name_t * -dns_ssurule_name(const dns_ssurule_t *rule) -{ +dns_ssurule_name(const dns_ssurule_t *rule) { REQUIRE(VALID_SSURULE(rule)); return (rule->name); } unsigned int -dns_ssurule_types(const dns_ssurule_t *rule, dns_rdatatype_t **types) -{ +dns_ssurule_types(const dns_ssurule_t *rule, dns_rdatatype_t **types) { REQUIRE(VALID_SSURULE(rule)); REQUIRE(types != NULL && *types != NULL); *types = rule->types; @@ -573,8 +561,7 @@ dns_ssurule_types(const dns_ssurule_t *rule, dns_rdatatype_t **types) } isc_result_t -dns_ssutable_firstrule(const dns_ssutable_t *table, dns_ssurule_t **rule) -{ +dns_ssutable_firstrule(const dns_ssutable_t *table, dns_ssurule_t **rule) { REQUIRE(VALID_SSUTABLE(table)); REQUIRE(rule != NULL && *rule == NULL); *rule = ISC_LIST_HEAD(table->rules); @@ -582,8 +569,7 @@ dns_ssutable_firstrule(const dns_ssutable_t *table, dns_ssurule_t **rule) } isc_result_t -dns_ssutable_nextrule(dns_ssurule_t *rule, dns_ssurule_t **nextrule) -{ +dns_ssutable_nextrule(dns_ssurule_t *rule, dns_ssurule_t **nextrule) { REQUIRE(VALID_SSURULE(rule)); REQUIRE(nextrule != NULL && *nextrule == NULL); *nextrule = ISC_LIST_NEXT(rule, link); @@ -595,10 +581,9 @@ dns_ssutable_nextrule(dns_ssurule_t *rule, dns_ssurule_t **nextrule) */ isc_result_t dns_ssutable_createdlz(isc_mem_t *mctx, dns_ssutable_t **tablep, - dns_dlzdb_t *dlzdatabase) -{ - isc_result_t result; - dns_ssurule_t * rule; + dns_dlzdb_t *dlzdatabase) { + isc_result_t result; + dns_ssurule_t *rule; dns_ssutable_t *table = NULL; REQUIRE(tablep != NULL && *tablep == NULL); @@ -627,8 +612,7 @@ dns_ssutable_createdlz(isc_mem_t *mctx, dns_ssutable_t **tablep, } isc_result_t -dns_ssu_mtypefromstring(const char *str, dns_ssumatchtype_t *mtype) -{ +dns_ssu_mtypefromstring(const char *str, dns_ssumatchtype_t *mtype) { REQUIRE(str != NULL); REQUIRE(mtype != NULL); diff --git a/lib/dns/ssu_external.c b/lib/dns/ssu_external.c index 1ba2eef4ed..f690beea31 100644 --- a/lib/dns/ssu_external.c +++ b/lib/dns/ssu_external.c @@ -43,8 +43,7 @@ #include static void -ssu_e_log(int level, const char *fmt, ...) -{ +ssu_e_log(int level, const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -57,8 +56,7 @@ ssu_e_log(int level, const char *fmt, ...) * Connect to a UNIX domain socket. */ static int -ux_socket_connect(const char *path) -{ +ux_socket_connect(const char *path) { int fd = -1; #ifdef ISC_PLATFORM_HAVESYSUNH struct sockaddr_un addr; @@ -117,24 +115,23 @@ bool dns_ssu_external_match(const dns_name_t *identity, const dns_name_t *signer, const dns_name_t *name, const isc_netaddr_t *tcpaddr, dns_rdatatype_t type, const dst_key_t *key, - isc_mem_t *mctx) -{ - char b_identity[DNS_NAME_FORMATSIZE]; - char b_signer[DNS_NAME_FORMATSIZE]; - char b_name[DNS_NAME_FORMATSIZE]; - char b_addr[ISC_NETADDR_FORMATSIZE]; - char b_type[DNS_RDATATYPE_FORMATSIZE]; - char b_key[DST_KEY_FORMATSIZE]; - isc_buffer_t * tkey_token = NULL; - int fd; - const char * sock_path; - unsigned int req_len; - isc_region_t token_region = { NULL, 0 }; + isc_mem_t *mctx) { + char b_identity[DNS_NAME_FORMATSIZE]; + char b_signer[DNS_NAME_FORMATSIZE]; + char b_name[DNS_NAME_FORMATSIZE]; + char b_addr[ISC_NETADDR_FORMATSIZE]; + char b_type[DNS_RDATATYPE_FORMATSIZE]; + char b_key[DST_KEY_FORMATSIZE]; + isc_buffer_t *tkey_token = NULL; + int fd; + const char *sock_path; + unsigned int req_len; + isc_region_t token_region = { NULL, 0 }; unsigned char *data; - isc_buffer_t buf; - uint32_t token_len = 0; - uint32_t reply; - ssize_t ret; + isc_buffer_t buf; + uint32_t token_len = 0; + uint32_t reply; + ssize_t ret; /* The identity contains local:/path/to/socket */ dns_name_format(identity, b_identity, sizeof(b_identity)); diff --git a/lib/dns/stats.c b/lib/dns/stats.c index fa9cd652c5..50f9308f23 100644 --- a/lib/dns/stats.c +++ b/lib/dns/stats.c @@ -24,7 +24,7 @@ #include #include -#define DNS_STATS_MAGIC ISC_MAGIC('D', 's', 't', 't') +#define DNS_STATS_MAGIC ISC_MAGIC('D', 's', 't', 't') #define DNS_STATS_VALID(x) ISC_MAGIC_VALID(x, DNS_STATS_MAGIC) /*% @@ -72,8 +72,8 @@ typedef enum { * Since a counter cannot be stale and ancient at the same time, we * treat S = 0x11 as a special case to deal with NXDOMAIN counters. */ -#define RDTYPECOUNTER_STALE (1 << 9) -#define RDTYPECOUNTER_ANCIENT (1 << 10) +#define RDTYPECOUNTER_STALE (1 << 9) +#define RDTYPECOUNTER_ANCIENT (1 << 10) #define RDTYPECOUNTER_NXDOMAIN ((1 << 9) | (1 << 10)) /* @@ -85,7 +85,7 @@ typedef enum { * RRType = 2 (0b02) means Ancient * */ -#define RDTYPECOUNTER_NXDOMAIN_STALE 1 +#define RDTYPECOUNTER_NXDOMAIN_STALE 1 #define RDTYPECOUNTER_NXDOMAIN_ANCIENT 2 /* @@ -97,35 +97,34 @@ typedef enum { static int dnssec_keyid_max = 65535; struct dns_stats { - unsigned int magic; + unsigned int magic; dns_statstype_t type; - isc_mem_t * mctx; - isc_stats_t * counters; - isc_refcount_t references; + isc_mem_t *mctx; + isc_stats_t *counters; + isc_refcount_t references; }; typedef struct rdatadumparg { dns_rdatatypestats_dumper_t fn; - void * arg; + void *arg; } rdatadumparg_t; typedef struct opcodedumparg { dns_opcodestats_dumper_t fn; - void * arg; + void *arg; } opcodedumparg_t; typedef struct rcodedumparg { dns_rcodestats_dumper_t fn; - void * arg; + void *arg; } rcodedumparg_t; typedef struct dnssecsigndumparg { dns_dnssecsignstats_dumper_t fn; - void * arg; + void *arg; } dnssecsigndumparg_t; void -dns_stats_attach(dns_stats_t *stats, dns_stats_t **statsp) -{ +dns_stats_attach(dns_stats_t *stats, dns_stats_t **statsp) { REQUIRE(DNS_STATS_VALID(stats)); REQUIRE(statsp != NULL && *statsp == NULL); @@ -135,8 +134,7 @@ dns_stats_attach(dns_stats_t *stats, dns_stats_t **statsp) } void -dns_stats_detach(dns_stats_t **statsp) -{ +dns_stats_detach(dns_stats_t **statsp) { dns_stats_t *stats; REQUIRE(statsp != NULL && DNS_STATS_VALID(*statsp)); @@ -156,8 +154,7 @@ dns_stats_detach(dns_stats_t **statsp) */ static isc_result_t create_stats(isc_mem_t *mctx, dns_statstype_t type, int ncounters, - dns_stats_t **statsp) -{ + dns_stats_t **statsp) { dns_stats_t *stats; isc_result_t result; @@ -186,16 +183,14 @@ clean_mutex: } isc_result_t -dns_generalstats_create(isc_mem_t *mctx, dns_stats_t **statsp, int ncounters) -{ +dns_generalstats_create(isc_mem_t *mctx, dns_stats_t **statsp, int ncounters) { REQUIRE(statsp != NULL && *statsp == NULL); return (create_stats(mctx, dns_statstype_general, ncounters, statsp)); } isc_result_t -dns_rdatatypestats_create(isc_mem_t *mctx, dns_stats_t **statsp) -{ +dns_rdatatypestats_create(isc_mem_t *mctx, dns_stats_t **statsp) { REQUIRE(statsp != NULL && *statsp == NULL); /* @@ -207,8 +202,7 @@ dns_rdatatypestats_create(isc_mem_t *mctx, dns_stats_t **statsp) } isc_result_t -dns_rdatasetstats_create(isc_mem_t *mctx, dns_stats_t **statsp) -{ +dns_rdatasetstats_create(isc_mem_t *mctx, dns_stats_t **statsp) { REQUIRE(statsp != NULL && *statsp == NULL); return (create_stats(mctx, dns_statstype_rdataset, @@ -216,16 +210,14 @@ dns_rdatasetstats_create(isc_mem_t *mctx, dns_stats_t **statsp) } isc_result_t -dns_opcodestats_create(isc_mem_t *mctx, dns_stats_t **statsp) -{ +dns_opcodestats_create(isc_mem_t *mctx, dns_stats_t **statsp) { REQUIRE(statsp != NULL && *statsp == NULL); return (create_stats(mctx, dns_statstype_opcode, 16, statsp)); } isc_result_t -dns_rcodestats_create(isc_mem_t *mctx, dns_stats_t **statsp) -{ +dns_rcodestats_create(isc_mem_t *mctx, dns_stats_t **statsp) { REQUIRE(statsp != NULL && *statsp == NULL); return (create_stats(mctx, dns_statstype_rcode, dns_rcode_badcookie + 1, @@ -233,8 +225,7 @@ dns_rcodestats_create(isc_mem_t *mctx, dns_stats_t **statsp) } isc_result_t -dns_dnssecsignstats_create(isc_mem_t *mctx, dns_stats_t **statsp) -{ +dns_dnssecsignstats_create(isc_mem_t *mctx, dns_stats_t **statsp) { REQUIRE(statsp != NULL && *statsp == NULL); return (create_stats(mctx, dns_statstype_dnssec, dnssec_keyid_max, @@ -245,16 +236,14 @@ dns_dnssecsignstats_create(isc_mem_t *mctx, dns_stats_t **statsp) * Increment/Decrement methods */ void -dns_generalstats_increment(dns_stats_t *stats, isc_statscounter_t counter) -{ +dns_generalstats_increment(dns_stats_t *stats, isc_statscounter_t counter) { REQUIRE(DNS_STATS_VALID(stats) && stats->type == dns_statstype_general); isc_stats_increment(stats->counters, counter); } inline static isc_statscounter_t -rdatatype2counter(dns_rdatatype_t type) -{ +rdatatype2counter(dns_rdatatype_t type) { if (type > (dns_rdatatype_t)RDTYPECOUNTER_MAXTYPE) { return (0); } @@ -262,8 +251,7 @@ rdatatype2counter(dns_rdatatype_t type) } void -dns_rdatatypestats_increment(dns_stats_t *stats, dns_rdatatype_t type) -{ +dns_rdatatypestats_increment(dns_stats_t *stats, dns_rdatatype_t type) { isc_statscounter_t counter; REQUIRE(DNS_STATS_VALID(stats) && stats->type == dns_statstype_rdtype); @@ -274,12 +262,12 @@ dns_rdatatypestats_increment(dns_stats_t *stats, dns_rdatatype_t type) static inline void update_rdatasetstats(dns_stats_t *stats, dns_rdatastatstype_t rrsettype, - bool increment) -{ + bool increment) { isc_statscounter_t counter; if ((DNS_RDATASTATSTYPE_ATTR(rrsettype) & - DNS_RDATASTATSTYPE_ATTR_NXDOMAIN) != 0) { + DNS_RDATASTATSTYPE_ATTR_NXDOMAIN) != 0) + { counter = RDTYPECOUNTER_NXDOMAIN; /* @@ -290,7 +278,8 @@ update_rdatasetstats(dns_stats_t *stats, dns_rdatastatstype_t rrsettype, DNS_RDATASTATSTYPE_ATTR_ANCIENT) != 0) { counter |= RDTYPECOUNTER_NXDOMAIN_ANCIENT; } else if ((DNS_RDATASTATSTYPE_ATTR(rrsettype) & - DNS_RDATASTATSTYPE_ATTR_STALE) != 0) { + DNS_RDATASTATSTYPE_ATTR_STALE) != 0) + { counter += RDTYPECOUNTER_NXDOMAIN_STALE; } } else { @@ -305,7 +294,8 @@ update_rdatasetstats(dns_stats_t *stats, dns_rdatastatstype_t rrsettype, DNS_RDATASTATSTYPE_ATTR_ANCIENT) != 0) { counter |= RDTYPECOUNTER_ANCIENT; } else if ((DNS_RDATASTATSTYPE_ATTR(rrsettype) & - DNS_RDATASTATSTYPE_ATTR_STALE) != 0) { + DNS_RDATASTATSTYPE_ATTR_STALE) != 0) + { counter |= RDTYPECOUNTER_STALE; } } @@ -318,8 +308,8 @@ update_rdatasetstats(dns_stats_t *stats, dns_rdatastatstype_t rrsettype, } void -dns_rdatasetstats_increment(dns_stats_t *stats, dns_rdatastatstype_t rrsettype) -{ +dns_rdatasetstats_increment(dns_stats_t *stats, + dns_rdatastatstype_t rrsettype) { REQUIRE(DNS_STATS_VALID(stats) && stats->type == dns_statstype_rdataset); @@ -327,8 +317,8 @@ dns_rdatasetstats_increment(dns_stats_t *stats, dns_rdatastatstype_t rrsettype) } void -dns_rdatasetstats_decrement(dns_stats_t *stats, dns_rdatastatstype_t rrsettype) -{ +dns_rdatasetstats_decrement(dns_stats_t *stats, + dns_rdatastatstype_t rrsettype) { REQUIRE(DNS_STATS_VALID(stats) && stats->type == dns_statstype_rdataset); @@ -336,16 +326,14 @@ dns_rdatasetstats_decrement(dns_stats_t *stats, dns_rdatastatstype_t rrsettype) } void -dns_opcodestats_increment(dns_stats_t *stats, dns_opcode_t code) -{ +dns_opcodestats_increment(dns_stats_t *stats, dns_opcode_t code) { REQUIRE(DNS_STATS_VALID(stats) && stats->type == dns_statstype_opcode); isc_stats_increment(stats->counters, (isc_statscounter_t)code); } void -dns_rcodestats_increment(dns_stats_t *stats, dns_rcode_t code) -{ +dns_rcodestats_increment(dns_stats_t *stats, dns_rcode_t code) { REQUIRE(DNS_STATS_VALID(stats) && stats->type == dns_statstype_rcode); if (code <= dns_rcode_badcookie) { @@ -354,8 +342,7 @@ dns_rcodestats_increment(dns_stats_t *stats, dns_rcode_t code) } void -dns_dnssecsignstats_increment(dns_stats_t *stats, dns_keytag_t id) -{ +dns_dnssecsignstats_increment(dns_stats_t *stats, dns_keytag_t id) { REQUIRE(DNS_STATS_VALID(stats) && stats->type == dns_statstype_dnssec); isc_stats_increment(stats->counters, (isc_statscounter_t)id); @@ -366,8 +353,7 @@ dns_dnssecsignstats_increment(dns_stats_t *stats, dns_keytag_t id) */ void dns_generalstats_dump(dns_stats_t *stats, dns_generalstats_dumper_t dump_fn, - void *arg, unsigned int options) -{ + void *arg, unsigned int options) { REQUIRE(DNS_STATS_VALID(stats) && stats->type == dns_statstype_general); isc_stats_dump(stats->counters, (isc_stats_dumper_t)dump_fn, arg, @@ -376,9 +362,8 @@ dns_generalstats_dump(dns_stats_t *stats, dns_generalstats_dumper_t dump_fn, static void dump_rdentry(int rdcounter, uint64_t value, dns_rdatastatstype_t attributes, - dns_rdatatypestats_dumper_t dump_fn, void *arg) -{ - dns_rdatatype_t rdtype = dns_rdatatype_none; /* sentinel */ + dns_rdatatypestats_dumper_t dump_fn, void *arg) { + dns_rdatatype_t rdtype = dns_rdatatype_none; /* sentinel */ dns_rdatastatstype_t type; if ((rdcounter & RDTYPECOUNTER_MAXTYPE) == 0) { @@ -392,8 +377,7 @@ dump_rdentry(int rdcounter, uint64_t value, dns_rdatastatstype_t attributes, } static void -rdatatype_dumpcb(isc_statscounter_t counter, uint64_t value, void *arg) -{ +rdatatype_dumpcb(isc_statscounter_t counter, uint64_t value, void *arg) { rdatadumparg_t *rdatadumparg = arg; dump_rdentry(counter, value, 0, rdatadumparg->fn, rdatadumparg->arg); @@ -401,8 +385,7 @@ rdatatype_dumpcb(isc_statscounter_t counter, uint64_t value, void *arg) void dns_rdatatypestats_dump(dns_stats_t *stats, dns_rdatatypestats_dumper_t dump_fn, - void *arg0, unsigned int options) -{ + void *arg0, unsigned int options) { rdatadumparg_t arg; REQUIRE(DNS_STATS_VALID(stats) && stats->type == dns_statstype_rdtype); @@ -412,10 +395,9 @@ dns_rdatatypestats_dump(dns_stats_t *stats, dns_rdatatypestats_dumper_t dump_fn, } static void -rdataset_dumpcb(isc_statscounter_t counter, uint64_t value, void *arg) -{ +rdataset_dumpcb(isc_statscounter_t counter, uint64_t value, void *arg) { rdatadumparg_t *rdatadumparg = arg; - unsigned int attributes = 0; + unsigned int attributes = 0; if ((counter & RDTYPECOUNTER_NXDOMAIN) == RDTYPECOUNTER_NXDOMAIN) { attributes |= DNS_RDATASTATSTYPE_ATTR_NXDOMAIN; @@ -452,8 +434,7 @@ rdataset_dumpcb(isc_statscounter_t counter, uint64_t value, void *arg) void dns_rdatasetstats_dump(dns_stats_t *stats, dns_rdatatypestats_dumper_t dump_fn, - void *arg0, unsigned int options) -{ + void *arg0, unsigned int options) { rdatadumparg_t arg; REQUIRE(DNS_STATS_VALID(stats) && @@ -465,18 +446,16 @@ dns_rdatasetstats_dump(dns_stats_t *stats, dns_rdatatypestats_dumper_t dump_fn, } static void -dnssec_dumpcb(isc_statscounter_t counter, uint64_t value, void *arg) -{ +dnssec_dumpcb(isc_statscounter_t counter, uint64_t value, void *arg) { dnssecsigndumparg_t *dnssecarg = arg; dnssecarg->fn((dns_keytag_t)counter, value, dnssecarg->arg); } void -dns_dnssecsignstats_dump(dns_stats_t * stats, +dns_dnssecsignstats_dump(dns_stats_t *stats, dns_dnssecsignstats_dumper_t dump_fn, void *arg0, - unsigned int options) -{ + unsigned int options) { dnssecsigndumparg_t arg; REQUIRE(DNS_STATS_VALID(stats) && stats->type == dns_statstype_dnssec); @@ -487,16 +466,14 @@ dns_dnssecsignstats_dump(dns_stats_t * stats, } static void -opcode_dumpcb(isc_statscounter_t counter, uint64_t value, void *arg) -{ +opcode_dumpcb(isc_statscounter_t counter, uint64_t value, void *arg) { opcodedumparg_t *opcodearg = arg; opcodearg->fn((dns_opcode_t)counter, value, opcodearg->arg); } static void -rcode_dumpcb(isc_statscounter_t counter, uint64_t value, void *arg) -{ +rcode_dumpcb(isc_statscounter_t counter, uint64_t value, void *arg) { rcodedumparg_t *rcodearg = arg; rcodearg->fn((dns_rcode_t)counter, value, rcodearg->arg); @@ -504,8 +481,7 @@ rcode_dumpcb(isc_statscounter_t counter, uint64_t value, void *arg) void dns_opcodestats_dump(dns_stats_t *stats, dns_opcodestats_dumper_t dump_fn, - void *arg0, unsigned int options) -{ + void *arg0, unsigned int options) { opcodedumparg_t arg; REQUIRE(DNS_STATS_VALID(stats) && stats->type == dns_statstype_opcode); @@ -517,8 +493,7 @@ dns_opcodestats_dump(dns_stats_t *stats, dns_opcodestats_dumper_t dump_fn, void dns_rcodestats_dump(dns_stats_t *stats, dns_rcodestats_dumper_t dump_fn, - void *arg0, unsigned int options) -{ + void *arg0, unsigned int options) { rcodedumparg_t arg; REQUIRE(DNS_STATS_VALID(stats) && stats->type == dns_statstype_rcode); @@ -537,9 +512,8 @@ LIBDNS_EXTERNAL_DATA const char *dns_statscounter_names[DNS_STATS_NCOUNTERS] = { }; isc_result_t -dns_stats_alloccounters(isc_mem_t *mctx, uint64_t **ctrp) -{ - int i; +dns_stats_alloccounters(isc_mem_t *mctx, uint64_t **ctrp) { + int i; uint64_t *p = isc_mem_get(mctx, DNS_STATS_NCOUNTERS * sizeof(uint64_t)); if (p == NULL) { return (ISC_R_NOMEMORY); @@ -552,8 +526,7 @@ dns_stats_alloccounters(isc_mem_t *mctx, uint64_t **ctrp) } void -dns_stats_freecounters(isc_mem_t *mctx, uint64_t **ctrp) -{ +dns_stats_freecounters(isc_mem_t *mctx, uint64_t **ctrp) { isc_mem_put(mctx, *ctrp, DNS_STATS_NCOUNTERS * sizeof(uint64_t)); *ctrp = NULL; } diff --git a/lib/dns/tcpmsg.c b/lib/dns/tcpmsg.c index 403a25e388..9499c640a4 100644 --- a/lib/dns/tcpmsg.c +++ b/lib/dns/tcpmsg.c @@ -29,22 +29,19 @@ #define XDEBUG(x) #endif /* ifdef TCPMSG_DEBUG */ -#define TCPMSG_MAGIC ISC_MAGIC('T', 'C', 'P', 'm') +#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) -{ +recv_length(isc_task_t *task, isc_event_t *ev_in) { isc_socketevent_t *ev = (isc_socketevent_t *)ev_in; - isc_event_t * dev; - dns_tcpmsg_t * tcpmsg = ev_in->ev_arg; - isc_region_t region; - isc_result_t result; + isc_event_t *dev; + dns_tcpmsg_t *tcpmsg = ev_in->ev_arg; + isc_region_t region; + isc_result_t result; INSIST(VALID_TCPMSG(tcpmsg)); @@ -96,11 +93,10 @@ send_and_free: } static void -recv_message(isc_task_t *task, isc_event_t *ev_in) -{ +recv_message(isc_task_t *task, isc_event_t *ev_in) { isc_socketevent_t *ev = (isc_socketevent_t *)ev_in; - isc_event_t * dev; - dns_tcpmsg_t * tcpmsg = ev_in->ev_arg; + isc_event_t *dev; + dns_tcpmsg_t *tcpmsg = ev_in->ev_arg; (void)task; @@ -126,8 +122,7 @@ send_and_free: } void -dns_tcpmsg_init(isc_mem_t *mctx, isc_socket_t *sock, dns_tcpmsg_t *tcpmsg) -{ +dns_tcpmsg_init(isc_mem_t *mctx, isc_socket_t *sock, dns_tcpmsg_t *tcpmsg) { REQUIRE(mctx != NULL); REQUIRE(sock != NULL); REQUIRE(tcpmsg != NULL); @@ -141,14 +136,12 @@ dns_tcpmsg_init(isc_mem_t *mctx, isc_socket_t *sock, dns_tcpmsg_t *tcpmsg) tcpmsg->sock = sock; tcpmsg->task = NULL; /* None yet. */ tcpmsg->result = ISC_R_UNEXPECTED; /* None yet. */ - /* - * Should probably initialize the event here, but it can wait. - */ + + /* Should probably initialize the event here, but it can wait. */ } void -dns_tcpmsg_setmaxsize(dns_tcpmsg_t *tcpmsg, unsigned int maxsize) -{ +dns_tcpmsg_setmaxsize(dns_tcpmsg_t *tcpmsg, unsigned int maxsize) { REQUIRE(VALID_TCPMSG(tcpmsg)); REQUIRE(maxsize < 65536); @@ -157,8 +150,7 @@ dns_tcpmsg_setmaxsize(dns_tcpmsg_t *tcpmsg, unsigned int maxsize) isc_result_t dns_tcpmsg_readmessage(dns_tcpmsg_t *tcpmsg, isc_task_t *task, - isc_taskaction_t action, void *arg) -{ + isc_taskaction_t action, void *arg) { isc_result_t result; isc_region_t region; @@ -194,16 +186,14 @@ dns_tcpmsg_readmessage(dns_tcpmsg_t *tcpmsg, isc_task_t *task, } void -dns_tcpmsg_cancelread(dns_tcpmsg_t *tcpmsg) -{ +dns_tcpmsg_cancelread(dns_tcpmsg_t *tcpmsg) { REQUIRE(VALID_TCPMSG(tcpmsg)); isc_socket_cancel(tcpmsg->sock, NULL, ISC_SOCKCANCEL_RECV); } void -dns_tcpmsg_keepbuffer(dns_tcpmsg_t *tcpmsg, isc_buffer_t *buffer) -{ +dns_tcpmsg_keepbuffer(dns_tcpmsg_t *tcpmsg, isc_buffer_t *buffer) { REQUIRE(VALID_TCPMSG(tcpmsg)); REQUIRE(buffer != NULL); @@ -228,8 +218,7 @@ dns_tcpmsg_freebuffer(dns_tcpmsg_t *tcpmsg) { #endif /* if 0 */ void -dns_tcpmsg_invalidate(dns_tcpmsg_t *tcpmsg) -{ +dns_tcpmsg_invalidate(dns_tcpmsg_t *tcpmsg) { REQUIRE(VALID_TCPMSG(tcpmsg)); tcpmsg->magic = 0; diff --git a/lib/dns/tests/acl_test.c b/lib/dns/tests/acl_test.c index f6edc40d51..365e7275a9 100644 --- a/lib/dns/tests/acl_test.c +++ b/lib/dns/tests/acl_test.c @@ -32,8 +32,7 @@ #include "dnstest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -45,8 +44,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -54,22 +52,21 @@ _teardown(void **state) return (0); } -#define BUFLEN 255 -#define BIGBUFLEN (70 * 1024) +#define BUFLEN 255 +#define BIGBUFLEN (70 * 1024) #define TEST_ORIGIN "test" /* test that dns_acl_isinsecure works */ static void -dns_acl_isinsecure_test(void **state) -{ +dns_acl_isinsecure_test(void **state) { isc_result_t result; - dns_acl_t * any = NULL; - dns_acl_t * none = NULL; - dns_acl_t * notnone = NULL; - dns_acl_t * notany = NULL; + dns_acl_t *any = NULL; + dns_acl_t *none = NULL; + dns_acl_t *notnone = NULL; + dns_acl_t *notany = NULL; #if defined(HAVE_GEOIP2) - dns_acl_t * geoip = NULL; - dns_acl_t * notgeoip = NULL; + dns_acl_t *geoip = NULL; + dns_acl_t *notgeoip = NULL; dns_aclelement_t *de; #endif /* HAVE_GEOIP2 */ @@ -137,8 +134,7 @@ dns_acl_isinsecure_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(dns_acl_isinsecure_test, _setup, _teardown), @@ -152,8 +148,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/db_test.c b/lib/dns/tests/db_test.c index 2547138336..9d918a33a8 100644 --- a/lib/dns/tests/db_test.c +++ b/lib/dns/tests/db_test.c @@ -30,8 +30,7 @@ #include "dnstest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -43,8 +42,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -52,8 +50,8 @@ _teardown(void **state) return (0); } -#define BUFLEN 255 -#define BIGBUFLEN (64 * 1024) +#define BUFLEN 255 +#define BIGBUFLEN (64 * 1024) #define TEST_ORIGIN "test" /* @@ -62,12 +60,11 @@ _teardown(void **state) /* test multiple calls to dns_db_getoriginnode */ static void -getoriginnode_test(void **state) -{ - dns_db_t * db = NULL; +getoriginnode_test(void **state) { + dns_db_t *db = NULL; dns_dbnode_t *node = NULL; - isc_mem_t * mctx = NULL; - isc_result_t result; + isc_mem_t *mctx = NULL; + isc_result_t result; UNUSED(state); @@ -91,12 +88,11 @@ getoriginnode_test(void **state) /* test getservestalettl and setservestalettl */ static void -getsetservestalettl_test(void **state) -{ - dns_db_t * db = NULL; - isc_mem_t * mctx = NULL; +getsetservestalettl_test(void **state) { + dns_db_t *db = NULL; + isc_mem_t *mctx = NULL; isc_result_t result; - dns_ttl_t ttl; + dns_ttl_t ttl; UNUSED(state); @@ -126,21 +122,20 @@ getsetservestalettl_test(void **state) /* check DNS_DBFIND_STALEOK works */ static void -dns_dbfind_staleok_test(void **state) -{ - dns_db_t * db = NULL; - dns_dbnode_t * node = NULL; +dns_dbfind_staleok_test(void **state) { + dns_db_t *db = NULL; + dns_dbnode_t *node = NULL; dns_fixedname_t example_fixed; dns_fixedname_t found_fixed; - dns_name_t * example; - dns_name_t * found; + dns_name_t *example; + dns_name_t *found; dns_rdatalist_t rdatalist; - dns_rdataset_t rdataset; - int count; - int pass; - isc_mem_t * mctx = NULL; - isc_result_t result; - unsigned char data[] = { 0x0a, 0x00, 0x00, 0x01 }; + dns_rdataset_t rdataset; + int count; + int pass; + isc_mem_t *mctx = NULL; + isc_result_t result; + unsigned char data[] = { 0x0a, 0x00, 0x00, 0x01 }; UNUSED(state); @@ -282,10 +277,9 @@ dns_dbfind_staleok_test(void **state) /* database class */ static void -class_test(void **state) -{ +class_test(void **state) { isc_result_t result; - dns_db_t * db = NULL; + dns_db_t *db = NULL; UNUSED(state); @@ -304,10 +298,9 @@ class_test(void **state) /* database type */ static void -dbtype_test(void **state) -{ +dbtype_test(void **state) { isc_result_t result; - dns_db_t * db = NULL; + dns_db_t *db = NULL; UNUSED(state); @@ -336,15 +329,14 @@ dbtype_test(void **state) /* database versions */ static void -version_test(void **state) -{ - isc_result_t result; - dns_fixedname_t fname, ffound; - dns_name_t * name, *foundname; - dns_db_t * db = NULL; +version_test(void **state) { + isc_result_t result; + dns_fixedname_t fname, ffound; + dns_name_t *name, *foundname; + dns_db_t *db = NULL; dns_dbversion_t *ver = NULL, *new = NULL; - dns_dbnode_t * node = NULL; - dns_rdataset_t rdataset; + dns_dbnode_t *node = NULL; + dns_rdataset_t rdataset; UNUSED(state); @@ -404,8 +396,7 @@ version_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(getoriginnode_test), cmocka_unit_test(getsetservestalettl_test), @@ -424,8 +415,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/dbdiff_test.c b/lib/dns/tests/dbdiff_test.c index 86ddaec84a..5e7a9f0d1b 100644 --- a/lib/dns/tests/dbdiff_test.c +++ b/lib/dns/tests/dbdiff_test.c @@ -31,13 +31,12 @@ #include "dnstest.h" -#define BUFLEN 255 -#define BIGBUFLEN (64 * 1024) +#define BUFLEN 255 +#define BIGBUFLEN (64 * 1024) #define TEST_ORIGIN "test" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -49,8 +48,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -60,8 +58,7 @@ _teardown(void **state) static void test_create(const char *oldfile, dns_db_t **old, const char *newfile, - dns_db_t **newdb) -{ + dns_db_t **newdb) { isc_result_t result; result = dns_test_loaddb(old, dns_dbtype_zone, TEST_ORIGIN, oldfile); @@ -73,11 +70,10 @@ test_create(const char *oldfile, dns_db_t **old, const char *newfile, /* dns_db_diffx of identical content */ static void -diffx_same(void **state) -{ - dns_db_t * newdb = NULL, *olddb = NULL; +diffx_same(void **state) { + dns_db_t *newdb = NULL, *olddb = NULL; isc_result_t result; - dns_diff_t diff; + dns_diff_t diff; UNUSED(state); @@ -98,13 +94,12 @@ diffx_same(void **state) /* dns_db_diffx of zone with record added */ static void -diffx_add(void **state) -{ - dns_db_t * newdb = NULL, *olddb = NULL; +diffx_add(void **state) { + dns_db_t *newdb = NULL, *olddb = NULL; dns_difftuple_t *tuple; - isc_result_t result; - dns_diff_t diff; - int count = 0; + isc_result_t result; + dns_diff_t diff; + int count = 0; UNUSED(state); @@ -118,7 +113,8 @@ diffx_add(void **state) assert_false(ISC_LIST_EMPTY(diff.tuples)); for (tuple = ISC_LIST_HEAD(diff.tuples); tuple != NULL; - tuple = ISC_LIST_NEXT(tuple, link)) { + tuple = ISC_LIST_NEXT(tuple, link)) + { assert_int_equal(tuple->op, DNS_DIFFOP_ADD); count++; } @@ -131,13 +127,12 @@ diffx_add(void **state) /* dns_db_diffx of zone with record removed */ static void -diffx_remove(void **state) -{ - dns_db_t * newdb = NULL, *olddb = NULL; +diffx_remove(void **state) { + dns_db_t *newdb = NULL, *olddb = NULL; dns_difftuple_t *tuple; - isc_result_t result; - dns_diff_t diff; - int count = 0; + isc_result_t result; + dns_diff_t diff; + int count = 0; UNUSED(state); @@ -151,7 +146,8 @@ diffx_remove(void **state) assert_false(ISC_LIST_EMPTY(diff.tuples)); for (tuple = ISC_LIST_HEAD(diff.tuples); tuple != NULL; - tuple = ISC_LIST_NEXT(tuple, link)) { + tuple = ISC_LIST_NEXT(tuple, link)) + { assert_int_equal(tuple->op, DNS_DIFFOP_DEL); count++; } @@ -163,8 +159,7 @@ diffx_remove(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(diffx_same, _setup, _teardown), cmocka_unit_test_setup_teardown(diffx_add, _setup, _teardown), @@ -180,8 +175,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/dbiterator_test.c b/lib/dns/tests/dbiterator_test.c index e150c9fb7b..26824fd448 100644 --- a/lib/dns/tests/dbiterator_test.c +++ b/lib/dns/tests/dbiterator_test.c @@ -30,13 +30,12 @@ #include "dnstest.h" -#define BUFLEN 255 -#define BIGBUFLEN (64 * 1024) +#define BUFLEN 255 +#define BIGBUFLEN (64 * 1024) #define TEST_ORIGIN "test" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -48,8 +47,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -58,8 +56,7 @@ _teardown(void **state) } static isc_result_t -make_name(const char *src, dns_name_t *name) -{ +make_name(const char *src, dns_name_t *name) { isc_buffer_t b; isc_buffer_constinit(&b, src, strlen(src)); isc_buffer_add(&b, strlen(src)); @@ -68,10 +65,9 @@ make_name(const char *src, dns_name_t *name) /* create: make sure we can create a dbiterator */ static void -test_create(const char *filename) -{ - isc_result_t result; - dns_db_t * db = NULL; +test_create(const char *filename) { + isc_result_t result; + dns_db_t *db = NULL; dns_dbiterator_t *iter = NULL; result = dns_test_loaddb(&db, dns_dbtype_cache, TEST_ORIGIN, filename); @@ -85,16 +81,14 @@ test_create(const char *filename) } static void -create(void **state) -{ +create(void **state) { UNUSED(state); test_create("testdata/dbiterator/zone1.data"); } static void -create_nsec3(void **state) -{ +create_nsec3(void **state) { UNUSED(state); test_create("testdata/dbiterator/zone2.data"); @@ -102,15 +96,14 @@ create_nsec3(void **state) /* walk: walk a database */ static void -test_walk(const char *filename, int nodes) -{ - isc_result_t result; - dns_db_t * db = NULL; +test_walk(const char *filename, int nodes) { + isc_result_t result; + dns_db_t *db = NULL; dns_dbiterator_t *iter = NULL; - dns_dbnode_t * node = NULL; - dns_name_t * name; - dns_fixedname_t f; - int i = 0; + dns_dbnode_t *node = NULL; + dns_name_t *name; + dns_fixedname_t f; + int i = 0; name = dns_fixedname_initname(&f); @@ -121,7 +114,8 @@ test_walk(const char *filename, int nodes) assert_int_equal(result, ISC_R_SUCCESS); for (result = dns_dbiterator_first(iter); result == ISC_R_SUCCESS; - result = dns_dbiterator_next(iter)) { + result = dns_dbiterator_next(iter)) + { result = dns_dbiterator_current(iter, &node, name); if (result == DNS_R_NEWORIGIN) { result = ISC_R_SUCCESS; @@ -138,16 +132,14 @@ test_walk(const char *filename, int nodes) } static void -walk(void **state) -{ +walk(void **state) { UNUSED(state); test_walk("testdata/dbiterator/zone1.data", 12); } static void -walk_nsec3(void **state) -{ +walk_nsec3(void **state) { UNUSED(state); test_walk("testdata/dbiterator/zone2.data", 33); @@ -155,15 +147,14 @@ walk_nsec3(void **state) /* reverse: walk database backwards */ static void -test_reverse(const char *filename) -{ - isc_result_t result; - dns_db_t * db = NULL; +test_reverse(const char *filename) { + isc_result_t result; + dns_db_t *db = NULL; dns_dbiterator_t *iter = NULL; - dns_dbnode_t * node = NULL; - dns_name_t * name; - dns_fixedname_t f; - int i = 0; + dns_dbnode_t *node = NULL; + dns_name_t *name; + dns_fixedname_t f; + int i = 0; name = dns_fixedname_initname(&f); @@ -174,7 +165,8 @@ test_reverse(const char *filename) assert_int_equal(result, ISC_R_SUCCESS); for (result = dns_dbiterator_last(iter); result == ISC_R_SUCCESS; - result = dns_dbiterator_prev(iter)) { + result = dns_dbiterator_prev(iter)) + { result = dns_dbiterator_current(iter, &node, name); if (result == DNS_R_NEWORIGIN) { result = ISC_R_SUCCESS; @@ -191,16 +183,14 @@ test_reverse(const char *filename) } static void -reverse(void **state) -{ +reverse(void **state) { UNUSED(state); test_reverse("testdata/dbiterator/zone1.data"); } static void -reverse_nsec3(void **state) -{ +reverse_nsec3(void **state) { UNUSED(state); test_reverse("testdata/dbiterator/zone2.data"); @@ -208,15 +198,14 @@ reverse_nsec3(void **state) /* seek: walk database starting at a particular node */ static void -test_seek_node(const char *filename, int nodes) -{ - isc_result_t result; - dns_db_t * db = NULL; +test_seek_node(const char *filename, int nodes) { + isc_result_t result; + dns_db_t *db = NULL; dns_dbiterator_t *iter = NULL; - dns_dbnode_t * node = NULL; - dns_name_t * name, *seekname; - dns_fixedname_t f1, f2; - int i = 0; + dns_dbnode_t *node = NULL; + dns_name_t *name, *seekname; + dns_fixedname_t f1, f2; + int i = 0; name = dns_fixedname_initname(&f1); seekname = dns_fixedname_initname(&f2); @@ -251,16 +240,14 @@ test_seek_node(const char *filename, int nodes) } static void -seek_node(void **state) -{ +seek_node(void **state) { UNUSED(state); test_seek_node("testdata/dbiterator/zone1.data", 9); } static void -seek_node_nsec3(void **state) -{ +seek_node_nsec3(void **state) { UNUSED(state); test_seek_node("testdata/dbiterator/zone2.data", 30); @@ -271,13 +258,12 @@ seek_node_nsec3(void **state) * (should fail) */ static void -test_seek_empty(const char *filename) -{ - isc_result_t result; - dns_db_t * db = NULL; +test_seek_empty(const char *filename) { + isc_result_t result; + dns_db_t *db = NULL; dns_dbiterator_t *iter = NULL; - dns_name_t * seekname; - dns_fixedname_t f1; + dns_name_t *seekname; + dns_fixedname_t f1; seekname = dns_fixedname_initname(&f1); @@ -298,16 +284,14 @@ test_seek_empty(const char *filename) } static void -seek_empty(void **state) -{ +seek_empty(void **state) { UNUSED(state); test_seek_empty("testdata/dbiterator/zone1.data"); } static void -seek_empty_nsec3(void **state) -{ +seek_empty_nsec3(void **state) { UNUSED(state); test_seek_empty("testdata/dbiterator/zone2.data"); @@ -317,13 +301,12 @@ seek_empty_nsec3(void **state) * seek_nx: walk database starting at a nonexistent node */ static void -test_seek_nx(const char *filename) -{ - isc_result_t result; - dns_db_t * db = NULL; +test_seek_nx(const char *filename) { + isc_result_t result; + dns_db_t *db = NULL; dns_dbiterator_t *iter = NULL; - dns_name_t * seekname; - dns_fixedname_t f1; + dns_name_t *seekname; + dns_fixedname_t f1; seekname = dns_fixedname_initname(&f1); @@ -350,16 +333,14 @@ test_seek_nx(const char *filename) } static void -seek_nx(void **state) -{ +seek_nx(void **state) { UNUSED(state); test_seek_nx("testdata/dbiterator/zone1.data"); } static void -seek_nx_nsec3(void **state) -{ +seek_nx_nsec3(void **state) { UNUSED(state); test_seek_nx("testdata/dbiterator/zone2.data"); @@ -374,8 +355,7 @@ seek_nx_nsec3(void **state) * dns_dbiterator_setcleanmode */ int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(create, _setup, _teardown), cmocka_unit_test_setup_teardown(create_nsec3, _setup, @@ -404,8 +384,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/dbversion_test.c b/lib/dns/tests/dbversion_test.c index 8ebf73112d..a34d193660 100644 --- a/lib/dns/tests/dbversion_test.c +++ b/lib/dns/tests/dbversion_test.c @@ -37,8 +37,8 @@ #include "dnstest.h" -static char tempname[11] = "dtXXXXXXXX"; -static dns_db_t * db1 = NULL, *db2 = NULL; +static char tempname[11] = "dtXXXXXXXX"; +static dns_db_t *db1 = NULL, *db2 = NULL; static dns_dbversion_t *v1 = NULL, *v2 = NULL; /* @@ -62,8 +62,7 @@ jmp_buf assertion; static void local_callback(const char *file, int line, isc_assertiontype_t type, - const char *cond) -{ + const char *cond) { UNUSED(type); mock_assert(1, cond, file, line); @@ -71,8 +70,7 @@ local_callback(const char *file, int line, isc_assertiontype_t type, } static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t res; UNUSED(state); @@ -98,8 +96,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); if (strcmp(tempname, "dtXXXXXXXX") != 0) { @@ -134,8 +131,7 @@ _teardown(void **state) * asserts with mis-matching db and version. */ static void -attachversion(void **state) -{ +attachversion(void **state) { dns_dbversion_t *v = NULL; UNUSED(state); @@ -153,8 +149,7 @@ attachversion(void **state) * asserts with mis-matching db and version. */ static void -closeversion(void **state) -{ +closeversion(void **state) { UNUSED(state); assert_non_null(v1); @@ -169,12 +164,11 @@ closeversion(void **state) * asserts with mis-matching db and version. */ static void -find(void **state) -{ - isc_result_t res; - dns_rdataset_t rdataset; +find(void **state) { + isc_result_t res; + dns_rdataset_t rdataset; dns_fixedname_t fixed; - dns_name_t * name = NULL; + dns_name_t *name = NULL; UNUSED(state); @@ -200,10 +194,9 @@ find(void **state) * asserts with mis-matching db and version. */ static void -allrdatasets(void **state) -{ - isc_result_t res; - dns_dbnode_t * node = NULL; +allrdatasets(void **state) { + isc_result_t res; + dns_dbnode_t *node = NULL; dns_rdatasetiter_t *iterator = NULL; UNUSED(state); @@ -228,11 +221,10 @@ allrdatasets(void **state) * asserts with mis-matching db and version. */ static void -findrdataset(void **state) -{ - isc_result_t res; +findrdataset(void **state) { + isc_result_t res; dns_rdataset_t rdataset; - dns_dbnode_t * node = NULL; + dns_dbnode_t *node = NULL; UNUSED(state); @@ -261,9 +253,8 @@ findrdataset(void **state) * asserts with mis-matching db and version. */ static void -deleterdataset(void **state) -{ - isc_result_t res; +deleterdataset(void **state) { + isc_result_t res; dns_dbnode_t *node = NULL; UNUSED(state); @@ -285,12 +276,11 @@ deleterdataset(void **state) * asserts with mis-matching db and version. */ static void -subtract(void **state) -{ - isc_result_t res; - dns_rdataset_t rdataset; +subtract(void **state) { + isc_result_t res; + dns_rdataset_t rdataset; dns_rdatalist_t rdatalist; - dns_dbnode_t * node = NULL; + dns_dbnode_t *node = NULL; UNUSED(state); @@ -328,10 +318,9 @@ subtract(void **state) * asserts with mis-matching db and version. */ static void -dump(void **state) -{ +dump(void **state) { isc_result_t res; - FILE * f = NULL; + FILE *f = NULL; UNUSED(state); @@ -350,11 +339,10 @@ dump(void **state) * asserts with mis-matching db and version. */ static void -addrdataset(void **state) -{ - isc_result_t res; - dns_rdataset_t rdataset; - dns_dbnode_t * node = NULL; +addrdataset(void **state) { + isc_result_t res; + dns_rdataset_t rdataset; + dns_dbnode_t *node = NULL; dns_rdatalist_t rdatalist; UNUSED(state); @@ -385,14 +373,13 @@ addrdataset(void **state) * and asserts with mis-matching db and version. */ static void -getnsec3parameters(void **state) -{ - isc_result_t res; - dns_hash_t hash; - uint8_t flags; - uint16_t iterations; +getnsec3parameters(void **state) { + isc_result_t res; + dns_hash_t hash; + uint8_t flags; + uint16_t iterations; unsigned char salt[DNS_NSEC3_SALTSIZE]; - size_t salt_length = sizeof(salt); + size_t salt_length = sizeof(salt); UNUSED(state); @@ -409,16 +396,15 @@ getnsec3parameters(void **state) * asserts with mis-matching db and version. */ static void -resigned(void **state) -{ - isc_result_t res; - dns_rdataset_t rdataset, added; - dns_dbnode_t * node = NULL; - dns_rdatalist_t rdatalist; +resigned(void **state) { + isc_result_t res; + dns_rdataset_t rdataset, added; + dns_dbnode_t *node = NULL; + dns_rdatalist_t rdatalist; dns_rdata_rrsig_t rrsig; - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_buffer_t b; - unsigned char buf[1024]; + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_buffer_t b; + unsigned char buf[1024]; UNUSED(state); @@ -474,8 +460,7 @@ resigned(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(dump, _setup, _teardown), cmocka_unit_test_setup_teardown(find, _setup, _teardown), @@ -504,8 +489,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/dh_test.c b/lib/dns/tests/dh_test.c index f6739897bc..473c1749ad 100644 --- a/lib/dns/tests/dh_test.c +++ b/lib/dns/tests/dh_test.c @@ -35,8 +35,7 @@ #if USE_OPENSSL static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -48,8 +47,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -59,14 +57,13 @@ _teardown(void **state) /* OpenSSL DH_compute_key() failure */ static void -dh_computesecret(void **state) -{ - dst_key_t * key = NULL; - isc_buffer_t buf; - unsigned char array[1024]; - isc_result_t result; +dh_computesecret(void **state) { + dst_key_t *key = NULL; + isc_buffer_t buf; + unsigned char array[1024]; + isc_result_t result; dns_fixedname_t fname; - dns_name_t * name; + dns_name_t *name; UNUSED(state); @@ -92,8 +89,7 @@ dh_computesecret(void **state) #endif /* USE_OPENSSL */ int -main(void) -{ +main(void) { #if USE_OPENSSL const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(dh_computesecret, _setup, @@ -111,8 +107,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/dispatch_test.c b/lib/dns/tests/dispatch_test.c index e9329295cb..f255a7b5e2 100644 --- a/lib/dns/tests/dispatch_test.c +++ b/lib/dns/tests/dispatch_test.c @@ -42,8 +42,7 @@ dns_dispatchmgr_t *dispatchmgr = NULL; dns_dispatchset_t *dset = NULL; static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -55,8 +54,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -65,11 +63,10 @@ _teardown(void **state) } static isc_result_t -make_dispatchset(unsigned int ndisps) -{ - isc_result_t result; - isc_sockaddr_t any; - unsigned int attrs; +make_dispatchset(unsigned int ndisps) { + isc_result_t result; + isc_sockaddr_t any; + unsigned int attrs; dns_dispatch_t *disp = NULL; result = dns_dispatchmgr_create(dt_mctx, &dispatchmgr); @@ -93,8 +90,7 @@ make_dispatchset(unsigned int ndisps) } static void -reset(void) -{ +reset(void) { if (dset != NULL) { dns_dispatchset_destroy(&dset); } @@ -105,8 +101,7 @@ reset(void) /* create dispatch set */ static void -dispatchset_create(void **state) -{ +dispatchset_create(void **state) { isc_result_t result; UNUSED(state); @@ -122,9 +117,8 @@ dispatchset_create(void **state) /* test dispatch set round-robin */ static void -dispatchset_get(void **state) -{ - isc_result_t result; +dispatchset_get(void **state) { + isc_result_t result; dns_dispatch_t *d1, *d2, *d3, *d4, *d5; UNUSED(state); @@ -164,8 +158,7 @@ dispatchset_get(void **state) } static void -senddone(isc_task_t *task, isc_event_t *event) -{ +senddone(isc_task_t *task, isc_event_t *event) { isc_socket_t *sock = event->ev_arg; UNUSED(task); @@ -175,13 +168,12 @@ senddone(isc_task_t *task, isc_event_t *event) } static void -nameserver(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result; - isc_region_t region; - isc_socket_t * dummy; - isc_socket_t * sock = event->ev_arg; - isc_socketevent_t * ev = (isc_socketevent_t *)event; +nameserver(isc_task_t *task, isc_event_t *event) { + isc_result_t result; + isc_region_t region; + isc_socket_t *dummy; + isc_socket_t *sock = event->ev_arg; + isc_socketevent_t *ev = (isc_socketevent_t *)event; static unsigned char buf1[16]; static unsigned char buf2[16]; @@ -221,17 +213,16 @@ nameserver(isc_task_t *task, isc_event_t *event) isc_event_free(&event); } -static dns_dispatch_t * dispatch = NULL; -static dns_dispentry_t * dispentry = NULL; -static atomic_bool first = ATOMIC_VAR_INIT(true); -static isc_sockaddr_t local; +static dns_dispatch_t *dispatch = NULL; +static dns_dispentry_t *dispentry = NULL; +static atomic_bool first = ATOMIC_VAR_INIT(true); +static isc_sockaddr_t local; static atomic_uint_fast32_t responses; static void -response(isc_task_t *task, isc_event_t *event) -{ +response(isc_task_t *task, isc_event_t *event) { dns_dispatchevent_t *devent = (dns_dispatchevent_t *)event; - bool exp_true = true; + bool exp_true = true; UNUSED(task); @@ -246,9 +237,8 @@ response(isc_task_t *task, isc_event_t *event) } static void -startit(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result; +startit(isc_task_t *task, isc_event_t *event) { + isc_result_t result; isc_socket_t *sock = NULL; isc_socket_attach(dns_dispatch_getsocket(dispatch), &sock); @@ -260,17 +250,16 @@ startit(isc_task_t *task, isc_event_t *event) /* test dispatch getnext */ static void -dispatch_getnext(void **state) -{ - isc_region_t region; - isc_result_t result; - isc_socket_t * sock = NULL; - isc_task_t * task = NULL; - uint16_t id; +dispatch_getnext(void **state) { + isc_region_t region; + isc_result_t result; + isc_socket_t *sock = NULL; + isc_task_t *task = NULL; + uint16_t id; struct in_addr ina; - unsigned char message[12]; - unsigned int attrs; - unsigned char rbuf[12]; + unsigned char message[12]; + unsigned int attrs; + unsigned char rbuf[12]; UNUSED(state); @@ -343,8 +332,7 @@ dispatch_getnext(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(dispatchset_create, _setup, _teardown), @@ -362,8 +350,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/dnstap_test.c b/lib/dns/tests/dnstap_test.c index 86ce24c222..165c8f7aa8 100644 --- a/lib/dns/tests/dnstap_test.c +++ b/lib/dns/tests/dnstap_test.c @@ -43,11 +43,10 @@ #define TAPSOCK "testdata/dnstap/dnstap.sock" #define TAPSAVED "testdata/dnstap/dnstap.saved" -#define TAPTEXT "testdata/dnstap/dnstap.text" +#define TAPTEXT "testdata/dnstap/dnstap.text" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -59,8 +58,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -69,18 +67,16 @@ _teardown(void **state) } static void -cleanup() -{ +cleanup() { (void)isc_file_remove(TAPFILE); (void)isc_file_remove(TAPSOCK); } /* set up dnstap environment */ static void -create_test(void **state) -{ - isc_result_t result; - dns_dtenv_t * dtenv = NULL; +create_test(void **state) { + isc_result_t result; + dns_dtenv_t *dtenv = NULL; struct fstrm_iothr_options *fopt; UNUSED(state); @@ -139,29 +135,28 @@ create_test(void **state) /* send dnstap messages */ static void -send_test(void **state) -{ - isc_result_t result; - dns_dtenv_t * dtenv = NULL; - dns_dthandle_t * handle = NULL; - uint8_t * data; - size_t dsize; - unsigned char zone[DNS_NAME_MAXWIRE]; - unsigned char qambuffer[4096], rambuffer[4096]; - unsigned char qrmbuffer[4096], rrmbuffer[4096]; - isc_buffer_t zb, qamsg, ramsg, qrmsg, rrmsg; - size_t qasize, qrsize, rasize, rrsize; - dns_fixedname_t zfname; - dns_name_t * zname; - dns_dtmsgtype_t dt; - dns_view_t * view = NULL; - dns_compress_t cctx; - isc_region_t zr; - isc_sockaddr_t qaddr; - isc_sockaddr_t raddr; - struct in_addr in; - isc_stdtime_t now; - isc_time_t p, f; +send_test(void **state) { + isc_result_t result; + dns_dtenv_t *dtenv = NULL; + dns_dthandle_t *handle = NULL; + uint8_t *data; + size_t dsize; + unsigned char zone[DNS_NAME_MAXWIRE]; + unsigned char qambuffer[4096], rambuffer[4096]; + unsigned char qrmbuffer[4096], rrmbuffer[4096]; + isc_buffer_t zb, qamsg, ramsg, qrmsg, rrmsg; + size_t qasize, qrsize, rasize, rrsize; + dns_fixedname_t zfname; + dns_name_t *zname; + dns_dtmsgtype_t dt; + dns_view_t *view = NULL; + dns_compress_t cctx; + isc_region_t zr; + isc_sockaddr_t qaddr; + isc_sockaddr_t raddr; + struct in_addr in; + isc_stdtime_t now; + isc_time_t p, f; struct fstrm_iothr_options *fopt; UNUSED(state); @@ -235,7 +230,7 @@ send_test(void **state) isc_buffer_add(&rrmsg, rrsize); for (dt = DNS_DTTYPE_SQ; dt <= DNS_DTTYPE_TR; dt <<= 1) { - isc_buffer_t * m; + isc_buffer_t *m; isc_sockaddr_t *q = &qaddr, *r = &raddr; switch (dt) { @@ -271,10 +266,10 @@ send_test(void **state) assert_int_equal(result, ISC_R_SUCCESS); while (dns_dt_getframe(handle, &data, &dsize) == ISC_R_SUCCESS) { - dns_dtdata_t * dtdata = NULL; - isc_region_t r; + dns_dtdata_t *dtdata = NULL; + isc_region_t r; static dns_dtmsgtype_t expected = DNS_DTTYPE_SQ; - static int n = 0; + static int n = 0; r.base = data; r.length = dsize; @@ -305,13 +300,12 @@ send_test(void **state) /* dnstap message to text */ static void -totext_test(void **state) -{ - isc_result_t result; +totext_test(void **state) { + isc_result_t result; dns_dthandle_t *handle = NULL; - uint8_t * data; - size_t dsize; - FILE * fp = NULL; + uint8_t *data; + size_t dsize; + FILE *fp = NULL; UNUSED(state); @@ -324,8 +318,8 @@ totext_test(void **state) while (dns_dt_getframe(handle, &data, &dsize) == ISC_R_SUCCESS) { dns_dtdata_t *dtdata = NULL; isc_buffer_t *b = NULL; - isc_region_t r; - char s[BUFSIZ], *p; + isc_region_t r; + char s[BUFSIZ], *p; r.base = data; r.length = dsize; @@ -373,8 +367,7 @@ totext_test(void **state) #endif /* HAVE_DNSTAP */ int -main(void) -{ +main(void) { #if HAVE_DNSTAP const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(create_test, _setup, _teardown), @@ -396,8 +389,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c index 8696bc9ace..9b5740b4bb 100644 --- a/lib/dns/tests/dnstest.c +++ b/lib/dns/tests/dnstest.c @@ -61,16 +61,16 @@ } \ } while (0) -isc_mem_t * dt_mctx = NULL; -isc_log_t * lctx = NULL; -isc_taskmgr_t * taskmgr = NULL; -isc_task_t * maintask = NULL; -isc_timermgr_t * timermgr = NULL; +isc_mem_t *dt_mctx = NULL; +isc_log_t *lctx = NULL; +isc_taskmgr_t *taskmgr = NULL; +isc_task_t *maintask = NULL; +isc_timermgr_t *timermgr = NULL; isc_socketmgr_t *socketmgr = NULL; -dns_zonemgr_t * zonemgr = NULL; -bool app_running = false; -int ncpus; -bool debug_mem_record = true; +dns_zonemgr_t *zonemgr = NULL; +bool app_running = false; +int ncpus; +bool debug_mem_record = true; static bool dst_active = false; static bool test_running = false; @@ -89,8 +89,7 @@ static isc_logcategory_t categories[] = { { "", 0 }, { NULL, 0 } }; static void -cleanup_managers(void) -{ +cleanup_managers(void) { if (maintask != NULL) { isc_task_shutdown(maintask); isc_task_destroy(&maintask); @@ -110,8 +109,7 @@ cleanup_managers(void) } static isc_result_t -create_managers(void) -{ +create_managers(void) { isc_result_t result; ncpus = isc_os_ncpus(); @@ -127,8 +125,7 @@ cleanup: } isc_result_t -dns_test_begin(FILE *logfile, bool start_managers) -{ +dns_test_begin(FILE *logfile, bool start_managers) { isc_result_t result; INSIST(!test_running); @@ -153,7 +150,7 @@ dns_test_begin(FILE *logfile, bool start_managers) if (logfile != NULL) { isc_logdestination_t destination; - isc_logconfig_t * logconfig = NULL; + isc_logconfig_t *logconfig = NULL; INSIST(lctx == NULL); CHECK(isc_log_create(dt_mctx, &lctx, &logconfig)); @@ -196,8 +193,7 @@ cleanup: } void -dns_test_end(void) -{ +dns_test_end(void) { cleanup_managers(); dst_lib_destroy(); @@ -218,10 +214,9 @@ dns_test_end(void) * Create a view. */ isc_result_t -dns_test_makeview(const char *name, dns_view_t **viewp) -{ +dns_test_makeview(const char *name, dns_view_t **viewp) { isc_result_t result; - dns_view_t * view = NULL; + dns_view_t *view = NULL; CHECK(dns_view_create(dt_mctx, dns_rdataclass_in, name, &view)); *viewp = view; @@ -237,12 +232,11 @@ cleanup: isc_result_t dns_test_makezone(const char *name, dns_zone_t **zonep, dns_view_t *view, - bool createview) -{ + bool createview) { dns_fixedname_t fixed_origin; - dns_zone_t * zone = NULL; - isc_result_t result; - dns_name_t * origin; + dns_zone_t *zone = NULL; + isc_result_t result; + dns_name_t *origin; REQUIRE(view == NULL || !createview); @@ -301,8 +295,7 @@ detach_zone: } isc_result_t -dns_test_setupzonemgr(void) -{ +dns_test_setupzonemgr(void) { isc_result_t result; REQUIRE(zonemgr == NULL); @@ -312,8 +305,7 @@ dns_test_setupzonemgr(void) } isc_result_t -dns_test_managezone(dns_zone_t *zone) -{ +dns_test_managezone(dns_zone_t *zone) { isc_result_t result; REQUIRE(zonemgr != NULL); @@ -327,15 +319,13 @@ dns_test_managezone(dns_zone_t *zone) } void -dns_test_releasezone(dns_zone_t *zone) -{ +dns_test_releasezone(dns_zone_t *zone) { REQUIRE(zonemgr != NULL); dns_zonemgr_releasezone(zonemgr, zone); } void -dns_test_closezonemgr(void) -{ +dns_test_closezonemgr(void) { REQUIRE(zonemgr != NULL); dns_zonemgr_shutdown(zonemgr); @@ -346,8 +336,7 @@ dns_test_closezonemgr(void) * Sleep for 'usec' microseconds. */ void -dns_test_nap(uint32_t usec) -{ +dns_test_nap(uint32_t usec) { #ifdef HAVE_NANOSLEEP struct timespec ts; @@ -367,11 +356,10 @@ dns_test_nap(uint32_t usec) isc_result_t dns_test_loaddb(dns_db_t **db, dns_dbtype_t dbtype, const char *origin, - const char *testfile) -{ - isc_result_t result; + const char *testfile) { + isc_result_t result; dns_fixedname_t fixed; - dns_name_t * name; + dns_name_t *name; name = dns_fixedname_initname(&fixed); @@ -391,8 +379,7 @@ dns_test_loaddb(dns_db_t **db, dns_dbtype_t dbtype, const char *origin, } static int -fromhex(char c) -{ +fromhex(char c) { if (c >= '0' && c <= '9') { return (c - '0'); } else if (c >= 'a' && c <= 'f') { @@ -412,11 +399,11 @@ fromhex(char c) * times 'len'. Always returns 'buf'. */ char * -dns_test_tohex(const unsigned char *data, size_t len, char *buf, size_t buflen) -{ +dns_test_tohex(const unsigned char *data, size_t len, char *buf, + size_t buflen) { isc_constregion_t source = { .base = data, .length = len }; - isc_buffer_t target; - isc_result_t result; + isc_buffer_t target; + isc_result_t result; memset(buf, 0, buflen); isc_buffer_init(&target, buf, buflen); @@ -428,15 +415,14 @@ dns_test_tohex(const unsigned char *data, size_t len, char *buf, size_t buflen) isc_result_t dns_test_getdata(const char *file, unsigned char *buf, size_t bufsiz, - size_t *sizep) -{ - isc_result_t result; + size_t *sizep) { + isc_result_t result; unsigned char *bp; - char * rp, *wp; - char s[BUFSIZ]; - size_t len, i; - FILE * f = NULL; - int n; + char *rp, *wp; + char s[BUFSIZ]; + size_t len, i; + FILE *f = NULL; + int n; result = isc_stdio_open(file, "r", &f); if (result != ISC_R_SUCCESS) { @@ -487,8 +473,7 @@ cleanup: } static void -nullmsg(dns_rdatacallbacks_t *cb, const char *fmt, ...) -{ +nullmsg(dns_rdatacallbacks_t *cb, const char *fmt, ...) { UNUSED(cb); UNUSED(fmt); } @@ -496,14 +481,13 @@ nullmsg(dns_rdatacallbacks_t *cb, const char *fmt, ...) isc_result_t dns_test_rdatafromstring(dns_rdata_t *rdata, dns_rdataclass_t rdclass, dns_rdatatype_t rdtype, unsigned char *dst, - size_t dstlen, const char *src, bool warnings) -{ + size_t dstlen, const char *src, bool warnings) { dns_rdatacallbacks_t callbacks; - isc_buffer_t source, target; - isc_lex_t * lex = NULL; - isc_lexspecials_t specials = { 0 }; - isc_result_t result; - size_t length; + isc_buffer_t source, target; + isc_lex_t *lex = NULL; + isc_lexspecials_t specials = { 0 }; + isc_result_t result; + size_t length; REQUIRE(rdata != NULL); REQUIRE(DNS_RDATA_INITIALIZED(rdata)); @@ -575,12 +559,11 @@ destroy_lexer: } void -dns_test_namefromstring(const char *namestr, dns_fixedname_t *fname) -{ - size_t length; +dns_test_namefromstring(const char *namestr, dns_fixedname_t *fname) { + size_t length; isc_buffer_t *b = NULL; - isc_result_t result; - dns_name_t * name; + isc_result_t result; + dns_name_t *name; length = strlen(namestr); @@ -597,17 +580,16 @@ dns_test_namefromstring(const char *namestr, dns_fixedname_t *fname) isc_result_t dns_test_difffromchanges(dns_diff_t *diff, const zonechange_t *changes, - bool warnings) -{ - isc_result_t result = ISC_R_SUCCESS; - unsigned char rdata_buf[1024]; - dns_difftuple_t * tuple = NULL; + bool warnings) { + isc_result_t result = ISC_R_SUCCESS; + unsigned char rdata_buf[1024]; + dns_difftuple_t *tuple = NULL; isc_consttextregion_t region; - dns_rdatatype_t rdatatype; - dns_fixedname_t fixedname; - dns_rdata_t rdata; - dns_name_t * name; - size_t i; + dns_rdatatype_t rdatatype; + dns_fixedname_t fixedname; + dns_rdata_t rdata; + dns_name_t *name; + size_t i; REQUIRE(diff != NULL); REQUIRE(changes != NULL); @@ -619,8 +601,8 @@ dns_test_difffromchanges(dns_diff_t *diff, const zonechange_t *changes, * Parse owner name. */ name = dns_fixedname_initname(&fixedname); - result = - dns_name_fromstring(name, changes[i].owner, 0, dt_mctx); + result = dns_name_fromstring(name, changes[i].owner, 0, + dt_mctx); if (result != ISC_R_SUCCESS) { break; } diff --git a/lib/dns/tests/dst_test.c b/lib/dns/tests/dst_test.c index 7a4eb16b2e..4438800456 100644 --- a/lib/dns/tests/dst_test.c +++ b/lib/dns/tests/dst_test.c @@ -35,8 +35,7 @@ #include static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -48,8 +47,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -59,14 +57,13 @@ _teardown(void **state) /* Read sig in file at path to buf. Check signature ineffability */ static isc_result_t -sig_fromfile(const char *path, isc_buffer_t *buf) -{ - isc_result_t result; - size_t rval, len; - FILE * fp = NULL; +sig_fromfile(const char *path, isc_buffer_t *buf) { + isc_result_t result; + size_t rval, len; + FILE *fp = NULL; unsigned char val; - char * p, *data; - off_t size; + char *p, *data; + off_t size; result = isc_stdio_open(path, "rb", &fp); assert_int_equal(result, ISC_R_SUCCESS); @@ -130,22 +127,21 @@ err: static void check_sig(const char *datapath, const char *sigpath, const char *keyname, - dns_keytag_t id, dns_secalg_t alg, int type, bool expect) -{ - isc_result_t result; - size_t rval, len; - FILE * fp; - dst_key_t * key = NULL; - unsigned char sig[512]; - unsigned char * p; - unsigned char * data; - off_t size; - isc_buffer_t b; - isc_buffer_t databuf, sigbuf; - isc_region_t datareg, sigreg; + dns_keytag_t id, dns_secalg_t alg, int type, bool expect) { + isc_result_t result; + size_t rval, len; + FILE *fp; + dst_key_t *key = NULL; + unsigned char sig[512]; + unsigned char *p; + unsigned char *data; + off_t size; + isc_buffer_t b; + isc_buffer_t databuf, sigbuf; + isc_region_t datareg, sigreg; dns_fixedname_t fname; - dns_name_t * name; - dst_context_t * ctx = NULL; + dns_name_t *name; + dst_context_t *ctx = NULL; /* * Read data from file in a form usable by dst_verify. @@ -216,7 +212,7 @@ check_sig(const char *datapath, const char *sigpath, const char *keyname, result2 = dst_context_adddata(ctx, &datareg); assert_int_equal(result2, ISC_R_SUCCESS); - char sigbuf2[4096]; + char sigbuf2[4096]; isc_buffer_t sigb; isc_buffer_init(&sigb, sigbuf2, sizeof(sigbuf2)); @@ -226,7 +222,7 @@ check_sig(const char *datapath, const char *sigpath, const char *keyname, isc_region_t r; isc_buffer_usedregion(&sigb, &r); - char hexbuf[4096] = { 0 }; + char hexbuf[4096] = { 0 }; isc_buffer_t hb; isc_buffer_init(&hb, hexbuf, sizeof(hexbuf)); @@ -248,17 +244,16 @@ check_sig(const char *datapath, const char *sigpath, const char *keyname, } static void -sig_test(void **state) -{ +sig_test(void **state) { UNUSED(state); struct { - const char * datapath; - const char * sigpath; - const char * keyname; + const char *datapath; + const char *sigpath; + const char *keyname; dns_keytag_t keyid; dns_secalg_t alg; - bool expect; + bool expect; } testcases[] = { { "testdata/dst/test1.data", "testdata/dst/test1.ecdsa256sig", "test.", 49130, DST_ALG_ECDSA256, true }, @@ -286,8 +281,7 @@ sig_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(sig_test, _setup, _teardown), }; @@ -300,8 +294,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/geoip_test.c b/lib/dns/tests/geoip_test.c index f993cd6e2d..cd77ce273c 100644 --- a/lib/dns/tests/geoip_test.c +++ b/lib/dns/tests/geoip_test.c @@ -44,14 +44,11 @@ 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) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -66,8 +63,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); close_geoip(); @@ -78,10 +74,9 @@ _teardown(void **state) } static MMDB_s * -open_geoip2(const char *dir, const char *dbfile, MMDB_s *mmdb) -{ +open_geoip2(const char *dir, const char *dbfile, MMDB_s *mmdb) { char pathbuf[PATH_MAX]; - int ret; + int ret; snprintf(pathbuf, sizeof(pathbuf), "%s/%s", dir, dbfile); ret = MMDB_open(pathbuf, MMDB_MODE_MMAP, mmdb); @@ -93,8 +88,7 @@ open_geoip2(const char *dir, const char *dbfile, MMDB_s *mmdb) } static void -load_geoip(const char *dir) -{ +load_geoip(const char *dir) { geoip.country = open_geoip2(dir, "GeoIP2-Country.mmdb", &geoip_country); geoip.city = open_geoip2(dir, "GeoIP2-City.mmdb", &geoip_city); geoip.as = open_geoip2(dir, "GeoLite2-ASN.mmdb", &geoip_as); @@ -103,8 +97,7 @@ load_geoip(const char *dir) } static void -close_geoip(void) -{ +close_geoip(void) { MMDB_close(&geoip_country); MMDB_close(&geoip_city); MMDB_close(&geoip_as); @@ -114,12 +107,11 @@ close_geoip(void) static bool /* Check if an MMDB entry of a given subtype exists for the given IP */ -entry_exists(dns_geoip_subtype_t subtype, const char *addr) -{ +entry_exists(dns_geoip_subtype_t subtype, const char *addr) { struct in6_addr in6; - struct in_addr in4; - isc_netaddr_t na; - MMDB_s * db; + struct in_addr in4; + isc_netaddr_t na; + MMDB_s *db; if (inet_pton(AF_INET6, addr, &in6) == 1) { isc_netaddr_fromin6(&na, &in6); @@ -143,8 +135,7 @@ entry_exists(dns_geoip_subtype_t subtype, const char *addr) * database, ::1 should be absent from all databases). */ static void -baseline(void **state) -{ +baseline(void **state) { dns_geoip_subtype_t subtype; UNUSED(state); @@ -187,11 +178,10 @@ baseline(void **state) static bool do_lookup_string(const char *addr, dns_geoip_subtype_t subtype, - const char *string) -{ + const char *string) { dns_geoip_elem_t elt; - struct in_addr in4; - isc_netaddr_t na; + struct in_addr in4; + isc_netaddr_t na; inet_pton(AF_INET, addr, &in4); isc_netaddr_fromin(&na, &in4); @@ -204,11 +194,10 @@ do_lookup_string(const char *addr, dns_geoip_subtype_t subtype, static bool do_lookup_string_v6(const char *addr, dns_geoip_subtype_t subtype, - const char *string) -{ + const char *string) { dns_geoip_elem_t elt; - struct in6_addr in6; - isc_netaddr_t na; + struct in6_addr in6; + isc_netaddr_t na; inet_pton(AF_INET6, addr, &in6); isc_netaddr_fromin6(&na, &in6); @@ -221,8 +210,7 @@ do_lookup_string_v6(const char *addr, dns_geoip_subtype_t subtype, /* GeoIP country matching */ static void -country(void **state) -{ +country(void **state) { bool match; UNUSED(state); @@ -248,8 +236,7 @@ country(void **state) /* GeoIP country (ipv6) matching */ static void -country_v6(void **state) -{ +country_v6(void **state) { bool match; UNUSED(state); @@ -269,8 +256,7 @@ country_v6(void **state) /* GeoIP city (ipv4) matching */ static void -city(void **state) -{ +city(void **state) { bool match; UNUSED(state); @@ -308,8 +294,7 @@ city(void **state) /* GeoIP city (ipv6) matching */ static void -city_v6(void **state) -{ +city_v6(void **state) { bool match; UNUSED(state); @@ -350,8 +335,7 @@ city_v6(void **state) /* GeoIP asnum matching */ static void -asnum(void **state) -{ +asnum(void **state) { bool match; UNUSED(state); @@ -366,8 +350,7 @@ asnum(void **state) /* GeoIP isp matching */ static void -isp(void **state) -{ +isp(void **state) { bool match; UNUSED(state); @@ -383,8 +366,7 @@ isp(void **state) /* GeoIP org matching */ static void -org(void **state) -{ +org(void **state) { bool match; UNUSED(state); @@ -400,8 +382,7 @@ org(void **state) /* GeoIP domain matching */ static void -domain(void **state) -{ +domain(void **state) { bool match; UNUSED(state); @@ -416,8 +397,7 @@ domain(void **state) #endif /* HAVE_GEOIP2 */ int -main(void) -{ +main(void) { #if defined(HAVE_GEOIP2) const struct CMUnitTest tests[] = { cmocka_unit_test(baseline), cmocka_unit_test(country), @@ -438,8 +418,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/keytable_test.c b/lib/dns/tests/keytable_test.c index 03f4b36725..740a16ef1e 100644 --- a/lib/dns/tests/keytable_test.c +++ b/lib/dns/tests/keytable_test.c @@ -43,8 +43,7 @@ #include static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -56,8 +55,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -96,12 +94,11 @@ static dns_view_t *view = NULL; * static data, and so is not thread safe. */ static dns_name_t * -str2name(const char *namestr) -{ +str2name(const char *namestr) { static dns_fixedname_t fname; - static dns_name_t * name; - static isc_buffer_t namebuf; - void * deconst_namestr; + static dns_name_t *name; + static isc_buffer_t namebuf; + void *deconst_namestr; name = dns_fixedname_initname(&fname); DE_CONST(namestr, deconst_namestr); /* OK, since we don't modify it */ @@ -116,11 +113,10 @@ str2name(const char *namestr) static void create_keystruct(uint16_t flags, uint8_t proto, uint8_t alg, const char *keystr, - dns_rdata_dnskey_t *keystruct) -{ - unsigned char keydata[4096]; - isc_buffer_t keydatabuf; - isc_region_t r; + dns_rdata_dnskey_t *keystruct) { + unsigned char keydata[4096]; + isc_buffer_t keydatabuf; + isc_region_t r; const dns_rdataclass_t rdclass = dns_rdataclass_in; keystruct->common.rdclass = rdclass; @@ -143,12 +139,11 @@ create_keystruct(uint16_t flags, uint8_t proto, uint8_t alg, const char *keystr, static void create_dsstruct(dns_name_t *name, uint16_t flags, uint8_t proto, uint8_t alg, const char *keystr, unsigned char *digest, - dns_rdata_ds_t *dsstruct) -{ - isc_result_t result; - unsigned char rrdata[4096]; - isc_buffer_t rrdatabuf; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_ds_t *dsstruct) { + isc_result_t result; + unsigned char rrdata[4096]; + isc_buffer_t rrdatabuf; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_dnskey_t dnskey; /* @@ -177,14 +172,13 @@ create_dsstruct(dns_name_t *name, uint16_t flags, uint8_t proto, uint8_t alg, /* Common setup: create a keytable and ntatable to test with a few keys */ static void -create_tables() -{ - isc_result_t result; - unsigned char digest[ISC_MAX_MD_SIZE]; - dns_rdata_ds_t ds; +create_tables() { + isc_result_t result; + unsigned char digest[ISC_MAX_MD_SIZE]; + dns_rdata_ds_t ds; dns_fixedname_t fn; - dns_name_t * keyname = dns_fixedname_name(&fn); - isc_stdtime_t now; + dns_name_t *keyname = dns_fixedname_name(&fn); + isc_stdtime_t now; result = dns_test_makeview("view", &view); assert_int_equal(result, ISC_R_SUCCESS); @@ -221,8 +215,7 @@ create_tables() } static void -destroy_tables() -{ +destroy_tables() { if (ntatable != NULL) { dns_ntatable_detach(&ntatable); } @@ -235,14 +228,13 @@ destroy_tables() /* add keys to the keytable */ static void -add_test(void **state) -{ - dns_keynode_t * keynode = NULL; - dns_keynode_t * null_keynode = NULL; - unsigned char digest[ISC_MAX_MD_SIZE]; - dns_rdata_ds_t ds; +add_test(void **state) { + dns_keynode_t *keynode = NULL; + dns_keynode_t *null_keynode = NULL; + unsigned char digest[ISC_MAX_MD_SIZE]; + dns_rdata_ds_t ds; dns_fixedname_t fn; - dns_name_t * keyname = dns_fixedname_name(&fn); + dns_name_t *keyname = dns_fixedname_name(&fn); UNUSED(state); @@ -387,8 +379,7 @@ add_test(void **state) /* delete keys from the keytable */ static void -delete_test(void **state) -{ +delete_test(void **state) { UNUSED(state); create_tables(); @@ -417,11 +408,10 @@ delete_test(void **state) /* delete key nodes from the keytable */ static void -deletekey_test(void **state) -{ +deletekey_test(void **state) { dns_rdata_dnskey_t dnskey; - dns_fixedname_t fn; - dns_name_t * keyname = dns_fixedname_name(&fn); + dns_fixedname_t fn; + dns_name_t *keyname = dns_fixedname_name(&fn); UNUSED(state); @@ -484,11 +474,10 @@ deletekey_test(void **state) /* check find-variant operations */ static void -find_test(void **state) -{ - dns_keynode_t * keynode = NULL; +find_test(void **state) { + dns_keynode_t *keynode = NULL; dns_fixedname_t fname; - dns_name_t * name; + dns_name_t *name; UNUSED(state); @@ -540,12 +529,11 @@ find_test(void **state) /* check issecuredomain() */ static void -issecuredomain_test(void **state) -{ - bool issecure; +issecuredomain_test(void **state) { + bool issecure; const char **n; - const char * names[] = { "example.com", "sub.example.com", - "null.example", "sub.null.example", NULL }; + const char *names[] = { "example.com", "sub.example.com", + "null.example", "sub.null.example", NULL }; UNUSED(state); create_tables(); @@ -579,8 +567,7 @@ issecuredomain_test(void **state) /* check dns_keytable_dump() */ static void -dump_test(void **state) -{ +dump_test(void **state) { FILE *f = fopen("/dev/null", "w"); UNUSED(state); @@ -599,16 +586,15 @@ dump_test(void **state) /* check negative trust anchors */ static void -nta_test(void **state) -{ - isc_result_t result; - bool issecure, covered; +nta_test(void **state) { + isc_result_t result; + bool issecure, covered; dns_fixedname_t fn; - dns_name_t * keyname = dns_fixedname_name(&fn); - unsigned char digest[ISC_MAX_MD_SIZE]; - dns_rdata_ds_t ds; - dns_view_t * myview = NULL; - isc_stdtime_t now; + dns_name_t *keyname = dns_fixedname_name(&fn); + unsigned char digest[ISC_MAX_MD_SIZE]; + dns_rdata_ds_t ds; + dns_view_t *myview = NULL; + isc_stdtime_t now; UNUSED(state); @@ -705,8 +691,7 @@ nta_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(add_test), cmocka_unit_test(delete_test), @@ -725,8 +710,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/master_test.c b/lib/dns/tests/master_test.c index f11ef4fb4a..55ecea351e 100644 --- a/lib/dns/tests/master_test.c +++ b/lib/dns/tests/master_test.c @@ -40,8 +40,7 @@ #include "dnstest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -53,8 +52,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -63,32 +61,29 @@ _teardown(void **state) } static void -nullmsg(dns_rdatacallbacks_t *cb, const char *fmt, ...) -{ +nullmsg(dns_rdatacallbacks_t *cb, const char *fmt, ...) { UNUSED(cb); UNUSED(fmt); } -#define BUFLEN 255 -#define BIGBUFLEN (70 * 1024) +#define BUFLEN 255 +#define BIGBUFLEN (70 * 1024) #define TEST_ORIGIN "test" static dns_masterrawheader_t header; -static bool headerset; +static bool headerset; -dns_name_t dns_origin; -char origin[sizeof(TEST_ORIGIN)]; -unsigned char name_buf[BUFLEN]; +dns_name_t dns_origin; +char origin[sizeof(TEST_ORIGIN)]; +unsigned char name_buf[BUFLEN]; dns_rdatacallbacks_t callbacks; -char * include_file = NULL; +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) -{ - char buf[BIGBUFLEN]; +add_callback(void *arg, const dns_name_t *owner, dns_rdataset_t *dataset) { + char buf[BIGBUFLEN]; isc_buffer_t target; isc_result_t result; @@ -100,8 +95,7 @@ add_callback(void *arg, const dns_name_t *owner, dns_rdataset_t *dataset) } static void -rawdata_callback(dns_zone_t *zone, dns_masterrawheader_t *h) -{ +rawdata_callback(dns_zone_t *zone, dns_masterrawheader_t *h) { UNUSED(zone); header = *h; headerset = true; @@ -109,10 +103,9 @@ rawdata_callback(dns_zone_t *zone, dns_masterrawheader_t *h) static isc_result_t setup_master(void (*warn)(struct dns_rdatacallbacks *, const char *, ...), - void (*error)(struct dns_rdatacallbacks *, const char *, ...)) -{ + void (*error)(struct dns_rdatacallbacks *, const char *, ...)) { isc_result_t result; - int len; + int len; isc_buffer_t source; isc_buffer_t target; @@ -148,8 +141,7 @@ setup_master(void (*warn)(struct dns_rdatacallbacks *, const char *, ...), static isc_result_t test_master(const char *testfile, dns_masterformat_t format, void (*warn)(struct dns_rdatacallbacks *, const char *, ...), - void (*error)(struct dns_rdatacallbacks *, const char *, ...)) -{ + void (*error)(struct dns_rdatacallbacks *, const char *, ...)) { isc_result_t result; result = setup_master(warn, error); @@ -175,8 +167,7 @@ test_master(const char *testfile, dns_masterformat_t format, } static void -include_callback(const char *filename, void *arg) -{ +include_callback(const char *filename, void *arg) { char **argp = (char **)arg; *argp = isc_mem_strdup(dt_mctx, filename); } @@ -186,8 +177,7 @@ include_callback(const char *filename, void *arg) * dns_master_loadfile() loads a valid master file and returns success */ static void -load_test(void **state) -{ +load_test(void **state) { isc_result_t result; UNUSED(state); @@ -202,8 +192,7 @@ load_test(void **state) * dns_master_loadfile() returns DNS_R_UNEXPECTED when file ends too soon */ static void -unexpected_test(void **state) -{ +unexpected_test(void **state) { isc_result_t result; UNUSED(state); @@ -219,8 +208,7 @@ unexpected_test(void **state) * if it is an SOA */ static void -noowner_test(void **state) -{ +noowner_test(void **state) { isc_result_t result; UNUSED(state); @@ -236,8 +224,7 @@ noowner_test(void **state) * specified */ static void -nottl_test(void **state) -{ +nottl_test(void **state) { isc_result_t result; UNUSED(state); @@ -253,8 +240,7 @@ nottl_test(void **state) * match zone class */ static void -badclass_test(void **state) -{ +badclass_test(void **state) { isc_result_t result; UNUSED(state); @@ -269,8 +255,7 @@ badclass_test(void **state) * dns_master_loadfile() returns ISC_R_NOSPACE when record is too big */ static void -toobig_test(void **state) -{ +toobig_test(void **state) { isc_result_t result; UNUSED(state); @@ -285,8 +270,7 @@ toobig_test(void **state) * dns_master_loadfile() returns ISC_R_SUCCESS when record is maximum size */ static void -maxrdata_test(void **state) -{ +maxrdata_test(void **state) { isc_result_t result; UNUSED(state); @@ -301,8 +285,7 @@ maxrdata_test(void **state) * dns_master_loadfile() understands DNSKEY with key material */ static void -dnskey_test(void **state) -{ +dnskey_test(void **state) { isc_result_t result; UNUSED(state); @@ -320,8 +303,7 @@ dnskey_test(void **state) * be rejected. */ static void -dnsnokey_test(void **state) -{ +dnsnokey_test(void **state) { isc_result_t result; UNUSED(state); @@ -336,8 +318,7 @@ dnsnokey_test(void **state) * dns_master_loadfile() understands $INCLUDE */ static void -include_test(void **state) -{ +include_test(void **state) { isc_result_t result; UNUSED(state); @@ -352,10 +333,9 @@ include_test(void **state) * dns_master_loadfile4() returns names of included file */ static void -master_includelist_test(void **state) -{ +master_includelist_test(void **state) { isc_result_t result; - char * filename = NULL; + char *filename = NULL; UNUSED(state); @@ -379,8 +359,7 @@ master_includelist_test(void **state) * dns_master_loadfile() understands $INCLUDE failures */ static void -includefail_test(void **state) -{ +includefail_test(void **state) { isc_result_t result; UNUSED(state); @@ -395,8 +374,7 @@ includefail_test(void **state) * dns_master_loadfile() handles non-empty blank lines */ static void -blanklines_test(void **state) -{ +blanklines_test(void **state) { isc_result_t result; UNUSED(state); @@ -412,8 +390,7 @@ blanklines_test(void **state) */ static void -leadingzero_test(void **state) -{ +leadingzero_test(void **state) { isc_result_t result; UNUSED(state); @@ -425,13 +402,12 @@ leadingzero_test(void **state) /* masterfile totext tests */ static void -totext_test(void **state) -{ - isc_result_t result; - dns_rdataset_t rdataset; +totext_test(void **state) { + isc_result_t result; + dns_rdataset_t rdataset; dns_rdatalist_t rdatalist; - isc_buffer_t target; - unsigned char buf[BIGBUFLEN]; + isc_buffer_t target; + unsigned char buf[BIGBUFLEN]; UNUSED(state); @@ -464,8 +440,7 @@ totext_test(void **state) * dns_master_loadfile() loads a valid raw file and returns success */ static void -loadraw_test(void **state) -{ +loadraw_test(void **state) { isc_result_t result; UNUSED(state); @@ -498,16 +473,15 @@ loadraw_test(void **state) * dns_master_dump*() functions dump valid raw files */ static void -dumpraw_test(void **state) -{ - isc_result_t result; - dns_db_t * db = NULL; +dumpraw_test(void **state) { + isc_result_t result; + dns_db_t *db = NULL; dns_dbversion_t *version = NULL; - char myorigin[sizeof(TEST_ORIGIN)]; - dns_name_t dnsorigin; - isc_buffer_t source, target; - unsigned char namebuf[BUFLEN]; - int len; + char myorigin[sizeof(TEST_ORIGIN)]; + dns_name_t dnsorigin; + isc_buffer_t source, target; + unsigned char namebuf[BUFLEN]; + int len; UNUSED(state); @@ -566,12 +540,11 @@ dumpraw_test(void **state) } static const char *warn_expect_value; -static bool warn_expect_result; +static bool warn_expect_result; static void -warn_expect(struct dns_rdatacallbacks *mycallbacks, const char *fmt, ...) -{ - char buf[4096]; +warn_expect(struct dns_rdatacallbacks *mycallbacks, const char *fmt, ...) { + char buf[4096]; va_list ap; UNUSED(mycallbacks); @@ -582,8 +555,8 @@ warn_expect(struct dns_rdatacallbacks *mycallbacks, const char *fmt, ...) vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); - if (warn_expect_value != NULL && - strstr(buf, warn_expect_value) != NULL) { + if (warn_expect_value != NULL && strstr(buf, warn_expect_value) != NULL) + { warn_expect_result = true; } } @@ -593,8 +566,7 @@ warn_expect(struct dns_rdatacallbacks *mycallbacks, const char *fmt, ...) * dns_master_loadfile() rejects zones with inherited name following $ORIGIN */ static void -neworigin_test(void **state) -{ +neworigin_test(void **state) { isc_result_t result; UNUSED(state); @@ -607,8 +579,7 @@ neworigin_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(load_test, _setup, _teardown), cmocka_unit_test_setup_teardown(unexpected_test, _setup, @@ -651,8 +622,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/name_test.c b/lib/dns/tests/name_test.c index 3fcd7e4492..f0d2145500 100644 --- a/lib/dns/tests/name_test.c +++ b/lib/dns/tests/name_test.c @@ -42,8 +42,7 @@ static bool verbose = false; static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -55,8 +54,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -66,21 +64,20 @@ _teardown(void **state) /* dns_name_fullcompare test */ static void -fullcompare_test(void **state) -{ +fullcompare_test(void **state) { dns_fixedname_t fixed1; dns_fixedname_t fixed2; - dns_name_t * name1; - dns_name_t * name2; - dns_namereln_t relation; - int i; - isc_result_t result; + dns_name_t *name1; + dns_name_t *name2; + dns_namereln_t relation; + int i; + isc_result_t result; struct { - const char * name1; - const char * name2; + const char *name1; + const char *name2; dns_namereln_t relation; - int order; - unsigned int nlabels; + int order; + unsigned int nlabels; } data[] = { /* relative */ { "", "", dns_namereln_equal, 0, 0 }, @@ -113,7 +110,7 @@ fullcompare_test(void **state) name1 = dns_fixedname_initname(&fixed1); name2 = dns_fixedname_initname(&fixed2); for (i = 0; data[i].name1 != NULL; i++) { - int order = 3000; + int order = 3000; unsigned int nlabels = 3000; if (data[i].name1[0] == 0) { @@ -149,11 +146,10 @@ fullcompare_test(void **state) static void compress_test(dns_name_t *name1, dns_name_t *name2, dns_name_t *name3, unsigned char *expected, unsigned int length, - dns_compress_t *cctx, dns_decompress_t *dctx) -{ - isc_buffer_t source; - isc_buffer_t target; - dns_name_t name; + dns_compress_t *cctx, dns_decompress_t *dctx) { + isc_buffer_t source; + isc_buffer_t target; + dns_name_t name; unsigned char buf1[1024]; unsigned char buf2[1024]; @@ -185,19 +181,18 @@ compress_test(dns_name_t *name1, dns_name_t *name2, dns_name_t *name3, /* name compression test */ static void -compression_test(void **state) -{ - unsigned int allowed; - dns_compress_t cctx; +compression_test(void **state) { + unsigned int allowed; + dns_compress_t cctx; dns_decompress_t dctx; - dns_name_t name1; - dns_name_t name2; - dns_name_t name3; - isc_region_t r; - unsigned char plain1[] = "\003yyy\003foo"; - unsigned char plain2[] = "\003bar\003yyy\003foo"; - unsigned char plain3[] = "\003xxx\003bar\003foo"; - unsigned char plain[] = "\003yyy\003foo\0\003bar\003yyy\003foo\0\003" + dns_name_t name1; + dns_name_t name2; + dns_name_t name3; + isc_region_t r; + unsigned char plain1[] = "\003yyy\003foo"; + unsigned char plain2[] = "\003bar\003yyy\003foo"; + unsigned char plain3[] = "\003xxx\003bar\003foo"; + unsigned char plain[] = "\003yyy\003foo\0\003bar\003yyy\003foo\0\003" "bar\003yyy\003foo\0\003xxx\003bar\003foo"; UNUSED(state); @@ -301,15 +296,14 @@ compression_test(void **state) /* is trust-anchor-telemetry test */ static void -istat_test(void **state) -{ +istat_test(void **state) { dns_fixedname_t fixed; - dns_name_t * name; - isc_result_t result; - size_t i; + dns_name_t *name; + isc_result_t result; + size_t i; struct { const char *name; - bool istat; + bool istat; } data[] = { { ".", false }, { "_ta-", false }, { "_ta-1234", true }, @@ -346,9 +340,8 @@ istat_test(void **state) /* dns_nane_init */ static void -init_test(void **state) -{ - dns_name_t name; +init_test(void **state) { + dns_name_t name; unsigned char offsets[1]; UNUSED(state); @@ -365,9 +358,8 @@ init_test(void **state) /* dns_nane_invalidate */ static void -invalidate_test(void **state) -{ - dns_name_t name; +invalidate_test(void **state) { + dns_name_t name; unsigned char offsets[1]; UNUSED(state); @@ -385,11 +377,10 @@ invalidate_test(void **state) /* dns_nane_setbuffer/hasbuffer */ static void -buffer_test(void **state) -{ - dns_name_t name; +buffer_test(void **state) { + dns_name_t name; unsigned char buf[BUFSIZ]; - isc_buffer_t b; + isc_buffer_t b; UNUSED(state); @@ -402,11 +393,10 @@ buffer_test(void **state) /* dns_nane_isabsolute */ static void -isabsolute_test(void **state) -{ +isabsolute_test(void **state) { struct { const char *namestr; - bool expect; + bool expect; } testcases[] = { { "x", false }, { "a.b.c.d.", true }, { "x.z", false } }; @@ -415,11 +405,11 @@ isabsolute_test(void **state) UNUSED(state); for (i = 0; i < (sizeof(testcases) / sizeof(testcases[0])); i++) { - isc_result_t result; - dns_name_t name; + isc_result_t result; + dns_name_t name; unsigned char data[BUFSIZ]; - isc_buffer_t b, nb; - size_t len; + isc_buffer_t b, nb; + size_t len; len = strlen(testcases[i].namestr); isc_buffer_constinit(&b, testcases[i].namestr, len); @@ -438,13 +428,12 @@ isabsolute_test(void **state) /* dns_nane_hash */ static void -hash_test(void **state) -{ +hash_test(void **state) { struct { const char *name1; const char *name2; - bool expect; - bool expecti; + bool expect; + bool expecti; } testcases[] = { { "a.b.c.d", "A.B.C.D", true, false }, { "a.b.c.d.", "A.B.C.D.", true, false }, @@ -458,10 +447,10 @@ hash_test(void **state) UNUSED(state); for (i = 0; i < (sizeof(testcases) / sizeof(testcases[0])); i++) { - isc_result_t result; + isc_result_t result; dns_fixedname_t f1, f2; - dns_name_t * n1, *n2; - unsigned int h1, h2; + dns_name_t *n1, *n2; + unsigned int h1, h2; n1 = dns_fixedname_initname(&f1); n2 = dns_fixedname_initname(&f2); @@ -503,12 +492,11 @@ hash_test(void **state) /* dns_nane_issubdomain */ static void -issubdomain_test(void **state) -{ +issubdomain_test(void **state) { struct { const char *name1; const char *name2; - bool expect; + bool expect; } testcases[] = { { "c.d", "a.b.c.d", false }, { "c.d.", "a.b.c.d.", false }, { "b.c.d", "c.d", true }, { "a.b.c.d.", "c.d.", true }, @@ -520,9 +508,9 @@ issubdomain_test(void **state) UNUSED(state); for (i = 0; i < (sizeof(testcases) / sizeof(testcases[0])); i++) { - isc_result_t result; + isc_result_t result; dns_fixedname_t f1, f2; - dns_name_t * n1, *n2; + dns_name_t *n1, *n2; n1 = dns_fixedname_initname(&f1); n2 = dns_fixedname_initname(&f2); @@ -548,10 +536,9 @@ issubdomain_test(void **state) /* dns_nane_countlabels */ static void -countlabels_test(void **state) -{ +countlabels_test(void **state) { struct { - const char * namestr; + const char *namestr; unsigned int expect; } testcases[] = { { "c.d", 2 }, { "c.d.", 3 }, { "a.b.c.d.", 5 }, @@ -562,9 +549,9 @@ countlabels_test(void **state) UNUSED(state); for (i = 0; i < (sizeof(testcases) / sizeof(testcases[0])); i++) { - isc_result_t result; + isc_result_t result; dns_fixedname_t fname; - dns_name_t * name; + dns_name_t *name; name = dns_fixedname_initname(&fname); @@ -585,12 +572,11 @@ countlabels_test(void **state) /* dns_nane_getlabel */ static void -getlabel_test(void **state) -{ +getlabel_test(void **state) { struct { - const char * name1; + const char *name1; unsigned int pos1; - const char * name2; + const char *name2; unsigned int pos2; } testcases[] = { { "c.d", 1, "a.b.c.d", 3 }, @@ -602,11 +588,11 @@ getlabel_test(void **state) UNUSED(state); for (i = 0; i < (sizeof(testcases) / sizeof(testcases[0])); i++) { - isc_result_t result; + isc_result_t result; dns_fixedname_t f1, f2; - dns_name_t * n1, *n2; - dns_label_t l1, l2; - unsigned int j; + dns_name_t *n1, *n2; + dns_label_t l1, l2; + unsigned int j; n1 = dns_fixedname_initname(&f1); n2 = dns_fixedname_initname(&f2); @@ -630,12 +616,11 @@ getlabel_test(void **state) /* dns_nane_getlabelsequence */ static void -getlabelsequence_test(void **state) -{ +getlabelsequence_test(void **state) { struct { - const char * name1; + const char *name1; unsigned int pos1; - const char * name2; + const char *name2; unsigned int pos2; unsigned int range; } testcases[] = { @@ -648,10 +633,10 @@ getlabelsequence_test(void **state) UNUSED(state); for (i = 0; i < (sizeof(testcases) / sizeof(testcases[0])); i++) { - isc_result_t result; - dns_name_t t1, t2; + isc_result_t result; + dns_name_t t1, t2; dns_fixedname_t f1, f2; - dns_name_t * n1, *n2; + dns_name_t *n1, *n2; /* target names */ dns_name_init(&t1, NULL); @@ -687,15 +672,14 @@ getlabelsequence_test(void **state) /* Benchmark dns_name_fromwire() implementation */ static void * -fromwire_thread(void *arg) -{ - unsigned int maxval = 32000000; - uint8_t data[] = { 3, 'w', 'w', 'w', 7, 'e', 'x', - 'a', 'm', 'p', 'l', 'e', 7, 'i', - 'n', 'v', 'a', 'l', 'i', 'd', 0 }; - unsigned char output_data[DNS_NAME_MAXWIRE]; - isc_buffer_t source, target; - unsigned int i; +fromwire_thread(void *arg) { + unsigned int maxval = 32000000; + uint8_t data[] = { 3, 'w', 'w', 'w', 7, 'e', 'x', + 'a', 'm', 'p', 'l', 'e', 7, 'i', + 'n', 'v', 'a', 'l', 'i', 'd', 0 }; + unsigned char output_data[DNS_NAME_MAXWIRE]; + isc_buffer_t source, target; + unsigned int i; dns_decompress_t dctx; UNUSED(arg); @@ -724,12 +708,11 @@ fromwire_thread(void *arg) } static void -benchmark_test(void **state) -{ +benchmark_test(void **state) { isc_result_t result; unsigned int i; - isc_time_t ts1, ts2; - double t; + isc_time_t ts1, ts2; + double t; unsigned int nthreads; isc_thread_t threads[32]; @@ -763,8 +746,7 @@ benchmark_test(void **state) #endif /* DNS_BENCHMARK_TESTS */ int -main(int argc, char **argv) -{ +main(int argc, char **argv) { const struct CMUnitTest tests[] = { cmocka_unit_test(fullcompare_test), cmocka_unit_test_setup_teardown(compression_test, _setup, @@ -804,8 +786,7 @@ main(int argc, char **argv) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/nsec3_test.c b/lib/dns/tests/nsec3_test.c index 648ed943ed..19803b999c 100644 --- a/lib/dns/tests/nsec3_test.c +++ b/lib/dns/tests/nsec3_test.c @@ -31,8 +31,7 @@ #include "dnstest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -44,8 +43,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -54,10 +52,9 @@ _teardown(void **state) } static void -iteration_test(const char *file, unsigned int expected) -{ +iteration_test(const char *file, unsigned int expected) { isc_result_t result; - dns_db_t * db = NULL; + dns_db_t *db = NULL; unsigned int iterations; result = dns_test_loaddb(&db, dns_dbtype_zone, "test", file); @@ -88,14 +85,13 @@ typedef struct { * invalid NSEC3PARAM RDATA is out of scope of this unit test. */ static void -nsec3param_salttotext_test(const nsec3param_salttotext_test_params_t *params) -{ - dns_rdata_t rdata = DNS_RDATA_INIT; +nsec3param_salttotext_test(const nsec3param_salttotext_test_params_t *params) { + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_nsec3param_t nsec3param; - unsigned char buf[1024]; - isc_result_t result; - char salt[64]; - size_t length; + unsigned char buf[1024]; + isc_result_t result; + char salt[64]; + size_t length; /* * Prepare a dns_rdata_nsec3param_t structure for testing. @@ -138,8 +134,7 @@ nsec3param_salttotext_test(const nsec3param_salttotext_test_params_t *params) * key size mixes */ static void -max_iterations(void **state) -{ +max_iterations(void **state) { UNUSED(state); iteration_test("testdata/nsec3/1024.db", 150); @@ -151,8 +146,7 @@ max_iterations(void **state) /* check dns_nsec3param_salttotext() */ static void -nsec3param_salttotext(void **state) -{ +nsec3param_salttotext(void **state) { size_t i; const nsec3param_salttotext_test_params_t tests[] = { @@ -177,8 +171,7 @@ nsec3param_salttotext(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(max_iterations, _setup, _teardown), @@ -194,8 +187,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/peer_test.c b/lib/dns/tests/peer_test.c index 91f08856ba..81df1be6c6 100644 --- a/lib/dns/tests/peer_test.c +++ b/lib/dns/tests/peer_test.c @@ -29,8 +29,7 @@ #include "dnstest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -42,8 +41,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -53,13 +51,12 @@ _teardown(void **state) /* Test DSCP set/get functions */ static void -dscp(void **state) -{ - isc_result_t result; - isc_netaddr_t netaddr; +dscp(void **state) { + isc_result_t result; + isc_netaddr_t netaddr; struct in_addr ina; - dns_peer_t * peer = NULL; - isc_dscp_t dscp; + dns_peer_t *peer = NULL; + isc_dscp_t dscp; UNUSED(state); @@ -155,8 +152,7 @@ dscp(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(dscp, _setup, _teardown), }; @@ -169,8 +165,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/private_test.c b/lib/dns/tests/private_test.c index 9766b5b79f..6ea06ab922 100644 --- a/lib/dns/tests/private_test.c +++ b/lib/dns/tests/private_test.c @@ -38,8 +38,7 @@ static dns_rdatatype_t privatetype = 65534; static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -51,8 +50,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -62,25 +60,24 @@ _teardown(void **state) typedef struct { unsigned char alg; - dns_keytag_t keyid; - bool remove; - bool complete; + dns_keytag_t keyid; + bool remove; + bool complete; } signing_testcase_t; typedef struct { unsigned char hash; unsigned char flags; - unsigned int iterations; + unsigned int iterations; unsigned long salt; - bool remove; - bool pending; - bool nonsec; + bool remove; + bool pending; + bool nonsec; } nsec3_testcase_t; static void make_signing(signing_testcase_t *testcase, dns_rdata_t *private, - unsigned char *buf, size_t len) -{ + unsigned char *buf, size_t len) { dns_rdata_init(private); buf[0] = testcase->alg; @@ -100,15 +97,14 @@ make_signing(signing_testcase_t *testcase, dns_rdata_t *private, static void make_nsec3(nsec3_testcase_t *testcase, dns_rdata_t *private, - unsigned char * pbuf) -{ + unsigned char *pbuf) { dns_rdata_nsec3param_t params; - dns_rdata_t nsec3param = DNS_RDATA_INIT; - unsigned char bufdata[BUFSIZ]; - isc_buffer_t buf; - uint32_t salt; - unsigned char * sp; - int slen = 4; + dns_rdata_t nsec3param = DNS_RDATA_INIT; + unsigned char bufdata[BUFSIZ]; + isc_buffer_t buf; + uint32_t salt; + unsigned char *sp; + int slen = 4; /* for simplicity, we're using a maximum salt length of 4 */ salt = htonl(testcase->salt); @@ -150,8 +146,7 @@ make_nsec3(nsec3_testcase_t *testcase, dns_rdata_t *private, /* convert private signing records to text */ static void -private_signing_totext_test(void **state) -{ +private_signing_totext_test(void **state) { dns_rdata_t private; int i; @@ -160,19 +155,19 @@ private_signing_totext_test(void **state) { DST_ALG_NSEC3RSASHA1, 22222, 0, 1 }, { DST_ALG_RSASHA1, 33333, 1, 1 } }; - const char * results[] = { "Signing with key 12345/RSASHA512", - "Removing signatures for key 54321/RSASHA256", - "Done signing with key 22222/NSEC3RSASHA1", - "Done removing signatures for key " - "33333/RSASHA1" }; - int ncases = 4; + const char *results[] = { "Signing with key 12345/RSASHA512", + "Removing signatures for key 54321/RSASHA256", + "Done signing with key 22222/NSEC3RSASHA1", + "Done removing signatures for key " + "33333/RSASHA1" }; + int ncases = 4; UNUSED(state); for (i = 0; i < ncases; i++) { unsigned char data[5]; - char output[BUFSIZ]; - isc_buffer_t buf; + char output[BUFSIZ]; + isc_buffer_t buf; isc_buffer_init(&buf, output, sizeof(output)); @@ -184,8 +179,7 @@ private_signing_totext_test(void **state) /* convert private chain records to text */ static void -private_nsec3_totext_test(void **state) -{ +private_nsec3_totext_test(void **state) { dns_rdata_t private; int i; @@ -202,14 +196,14 @@ private_nsec3_totext_test(void **state) "Removing NSEC3 chain 1 0 30 DEAF / creating " "NSEC chain", "Removing NSEC3 chain 1 0 100 FEEDABEE" }; - int ncases = 5; + int ncases = 5; UNUSED(state); for (i = 0; i < ncases; i++) { unsigned char data[DNS_NSEC3PARAM_BUFFERSIZE + 1]; - char output[BUFSIZ]; - isc_buffer_t buf; + char output[BUFSIZ]; + isc_buffer_t buf; isc_buffer_init(&buf, output, sizeof(output)); @@ -220,8 +214,7 @@ private_nsec3_totext_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(private_signing_totext_test, _setup, _teardown), @@ -237,8 +230,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/rbt_serialize_test.c b/lib/dns/tests/rbt_serialize_test.c index 45af262bbc..9ca45031af 100644 --- a/lib/dns/tests/rbt_serialize_test.c +++ b/lib/dns/tests/rbt_serialize_test.c @@ -60,8 +60,7 @@ static bool verbose = false; static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -73,8 +72,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -83,13 +81,13 @@ _teardown(void **state) } typedef struct data_holder { - int len; + int len; const char *data; } data_holder_t; typedef struct rbt_testdata { - const char * name; - size_t name_len; + const char *name; + size_t name_len; data_holder_t data; } rbt_testdata_t; @@ -123,20 +121,18 @@ rbt_testdata_t testdata[] = { DATA_ITEM("first.com."), { NULL, 0, { 0, NULL } } }; static void -delete_data(void *data, void *arg) -{ +delete_data(void *data, void *arg) { UNUSED(arg); UNUSED(data); } static isc_result_t -write_data(FILE *file, unsigned char *datap, void *arg, uint64_t *crc) -{ - isc_result_t result; - size_t ret = 0; +write_data(FILE *file, unsigned char *datap, void *arg, uint64_t *crc) { + isc_result_t result; + size_t ret = 0; data_holder_t *data; - data_holder_t temp; - off_t where; + data_holder_t temp; + off_t where; UNUSED(arg); @@ -174,10 +170,9 @@ write_data(FILE *file, unsigned char *datap, void *arg, uint64_t *crc) } static isc_result_t -fix_data(dns_rbtnode_t *p, void *base, size_t max, void *arg, uint64_t *crc) -{ +fix_data(dns_rbtnode_t *p, void *base, size_t max, void *arg, uint64_t *crc) { data_holder_t *data; - size_t size; + size_t size; UNUSED(base); UNUSED(max); @@ -189,7 +184,8 @@ fix_data(dns_rbtnode_t *p, void *base, size_t max, void *arg, uint64_t *crc) data = p->data; if (data == NULL || (data->len == 0 && data->data != NULL) || - (data->len != 0 && data->data == NULL)) { + (data->len != 0 && data->data == NULL)) + { return (ISC_R_INVALIDFILE); } @@ -217,14 +213,13 @@ fix_data(dns_rbtnode_t *p, void *base, size_t max, void *arg, uint64_t *crc) * Load test data into the RBT. */ static void -add_test_data(isc_mem_t *mctx, dns_rbt_t *rbt) -{ - char buffer[1024]; - isc_buffer_t b; - isc_result_t result; +add_test_data(isc_mem_t *mctx, dns_rbt_t *rbt) { + char buffer[1024]; + isc_buffer_t b; + isc_result_t result; dns_fixedname_t fname; - dns_name_t * name; - dns_compress_t cctx; + dns_name_t *name; + dns_compress_t cctx; rbt_testdata_t *testdatap = testdata; dns_compress_init(&cctx, -1, mctx); @@ -255,17 +250,16 @@ add_test_data(isc_mem_t *mctx, dns_rbt_t *rbt) * Walk the tree and ensure that all the test nodes are present. */ static void -check_test_data(dns_rbt_t *rbt) -{ - char buffer[1024]; - char * arg; +check_test_data(dns_rbt_t *rbt) { + char buffer[1024]; + char *arg; dns_fixedname_t fname; dns_fixedname_t fixed; - dns_name_t * name; - isc_buffer_t b; - data_holder_t * data; - isc_result_t result; - dns_name_t * foundname; + dns_name_t *name; + isc_buffer_t b; + data_holder_t *data; + isc_result_t result; + dns_name_t *foundname; rbt_testdata_t *testdatap = testdata; foundname = dns_fixedname_initname(&fixed); @@ -293,8 +287,7 @@ check_test_data(dns_rbt_t *rbt) } static void -data_printer(FILE *out, void *datap) -{ +data_printer(FILE *out, void *datap) { data_holder_t *data = (data_holder_t *)datap; fprintf(out, "%d bytes, %s", data->len, data->data); @@ -302,16 +295,15 @@ data_printer(FILE *out, void *datap) /* Test writing an rbt to file */ static void -serialize_test(void **state) -{ - dns_rbt_t * rbt = NULL; +serialize_test(void **state) { + dns_rbt_t *rbt = NULL; isc_result_t result; - FILE * rbtfile = NULL; - dns_rbt_t * rbt_deserialized = NULL; - off_t offset; - int fd; - off_t filesize = 0; - char * base; + FILE *rbtfile = NULL; + dns_rbt_t *rbt_deserialized = NULL; + off_t offset; + int fd; + off_t filesize = 0; + char *base; UNUSED(state); @@ -331,8 +323,8 @@ serialize_test(void **state) */ rbtfile = fopen("./zone.bin", "w+b"); assert_non_null(rbtfile); - result = - dns_rbt_serialize_tree(rbtfile, rbt, write_data, NULL, &offset); + result = dns_rbt_serialize_tree(rbtfile, rbt, write_data, NULL, + &offset); assert_true(result == ISC_R_SUCCESS); dns_rbt_destroy(&rbt); @@ -371,16 +363,15 @@ serialize_test(void **state) /* Test reading a corrupt map file */ static void -deserialize_corrupt_test(void **state) -{ - dns_rbt_t * rbt = NULL; +deserialize_corrupt_test(void **state) { + dns_rbt_t *rbt = NULL; isc_result_t result; - FILE * rbtfile = NULL; - off_t offset; - int fd; - off_t filesize = 0; - char * base, *p, *q; - int i; + FILE *rbtfile = NULL; + off_t offset; + int fd; + off_t filesize = 0; + char *base, *p, *q; + int i; UNUSED(state); @@ -393,8 +384,8 @@ deserialize_corrupt_test(void **state) add_test_data(dt_mctx, rbt); rbtfile = fopen("./zone.bin", "w+b"); assert_non_null(rbtfile); - result = - dns_rbt_serialize_tree(rbtfile, rbt, write_data, NULL, &offset); + result = dns_rbt_serialize_tree(rbtfile, rbt, write_data, NULL, + &offset); assert_true(result == ISC_R_SUCCESS); dns_rbt_destroy(&rbt); @@ -443,8 +434,7 @@ deserialize_corrupt_test(void **state) /* Test the dns_rbt_serialize_align() function */ static void -serialize_align_test(void **state) -{ +serialize_align_test(void **state) { UNUSED(state); assert_true(dns_rbt_serialize_align(0) == 0); @@ -462,8 +452,7 @@ serialize_align_test(void **state) } int -main(int argc, char **argv) -{ +main(int argc, char **argv) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(serialize_test, _setup, _teardown), @@ -491,8 +480,7 @@ main(int argc, char **argv) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/rbt_test.c b/lib/dns/tests/rbt_test.c index 486227b333..5f7f8344f5 100644 --- a/lib/dns/tests/rbt_test.c +++ b/lib/dns/tests/rbt_test.c @@ -127,8 +127,7 @@ static const size_t ordered_names_count = (sizeof(ordered_names) / sizeof(*ordered_names)); static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -140,8 +139,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -149,19 +147,17 @@ _teardown(void **state) return (0); } static void -delete_data(void *data, void *arg) -{ +delete_data(void *data, void *arg) { UNUSED(arg); isc_mem_put(dt_mctx, data, sizeof(size_t)); } static test_context_t * -test_context_setup(void) -{ +test_context_setup(void) { test_context_t *ctx; - isc_result_t result; - size_t i; + isc_result_t result; + size_t i; ctx = isc_mem_get(dt_mctx, sizeof(*ctx)); assert_non_null(ctx); @@ -171,14 +167,14 @@ test_context_setup(void) assert_int_equal(result, ISC_R_SUCCESS); ctx->rbt_distances = NULL; - result = - dns_rbt_create(dt_mctx, delete_data, NULL, &ctx->rbt_distances); + result = dns_rbt_create(dt_mctx, delete_data, NULL, + &ctx->rbt_distances); assert_int_equal(result, ISC_R_SUCCESS); for (i = 0; i < domain_names_count; i++) { - size_t * n; + size_t *n; dns_fixedname_t fname; - dns_name_t * name; + dns_name_t *name; dns_test_namefromstring(domain_names[i], &fname); @@ -201,8 +197,7 @@ test_context_setup(void) } static void -test_context_teardown(test_context_t *ctx) -{ +test_context_teardown(test_context_t *ctx) { dns_rbt_destroy(&ctx->rbt); dns_rbt_destroy(&ctx->rbt_distances); @@ -213,19 +208,18 @@ test_context_teardown(test_context_t *ctx) * Walk the tree and ensure that all the test nodes are present. */ static void -check_test_data(dns_rbt_t *rbt) -{ +check_test_data(dns_rbt_t *rbt) { dns_fixedname_t fixed; - isc_result_t result; - dns_name_t * foundname; - size_t i; + isc_result_t result; + dns_name_t *foundname; + size_t i; foundname = dns_fixedname_initname(&fixed); for (i = 0; i < domain_names_count; i++) { dns_fixedname_t fname; - dns_name_t * name; - size_t * n; + dns_name_t *name; + size_t *n; dns_test_namefromstring(domain_names[i], &fname); @@ -239,10 +233,9 @@ check_test_data(dns_rbt_t *rbt) /* Test the creation of an rbt */ static void -rbt_create(void **state) -{ +rbt_create(void **state) { test_context_t *ctx; - bool tree_ok; + bool tree_ok; UNUSED(state); @@ -260,8 +253,7 @@ rbt_create(void **state) /* Test dns_rbt_nodecount() on a tree */ static void -rbt_nodecount(void **state) -{ +rbt_nodecount(void **state) { test_context_t *ctx; UNUSED(state); @@ -277,14 +269,13 @@ rbt_nodecount(void **state) /* Test dns_rbtnode_get_distance() on a tree */ static void -rbtnode_get_distance(void **state) -{ - isc_result_t result; - test_context_t * ctx; - const char * name_str = "a"; - dns_fixedname_t fname; - dns_name_t * name; - dns_rbtnode_t * node = NULL; +rbtnode_get_distance(void **state) { + isc_result_t result; + test_context_t *ctx; + const char *name_str = "a"; + dns_fixedname_t fname; + dns_name_t *name; + dns_rbtnode_t *node = NULL; dns_rbtnodechain_t chain; UNUSED(state); @@ -331,13 +322,12 @@ rbtnode_get_distance(void **state) * 2log(n). This check verifies that the tree is balanced. */ static void -rbt_check_distance_random(void **state) -{ - dns_rbt_t * mytree = NULL; +rbt_check_distance_random(void **state) { + dns_rbt_t *mytree = NULL; const unsigned int log_num_nodes = 16; - isc_result_t result; - bool tree_ok; - int i; + isc_result_t result; + bool tree_ok; + int i; UNUSED(state); @@ -358,16 +348,16 @@ rbt_check_distance_random(void **state) */ for (i = 0; i < (1 << log_num_nodes); i++) { size_t *n; - char namebuf[34]; + char namebuf[34]; n = isc_mem_get(dt_mctx, sizeof(size_t)); assert_non_null(n); *n = i + 1; while (1) { - int j; + int j; dns_fixedname_t fname; - dns_name_t * name; + dns_name_t *name; for (j = 0; j < 32; j++) { uint32_t v = isc_random_uniform(26); @@ -410,13 +400,12 @@ rbt_check_distance_random(void **state) * 2log(n). This check verifies that the tree is balanced. */ static void -rbt_check_distance_ordered(void **state) -{ - dns_rbt_t * mytree = NULL; +rbt_check_distance_ordered(void **state) { + dns_rbt_t *mytree = NULL; const unsigned int log_num_nodes = 16; - isc_result_t result; - bool tree_ok; - int i; + isc_result_t result; + bool tree_ok; + int i; UNUSED(state); @@ -436,10 +425,10 @@ rbt_check_distance_ordered(void **state) * name00000003. */ for (i = 0; i < (1 << log_num_nodes); i++) { - size_t * n; - char namebuf[14]; + size_t *n; + char namebuf[14]; dns_fixedname_t fname; - dns_name_t * name; + dns_name_t *name; n = isc_mem_get(dt_mctx, sizeof(size_t)); assert_non_null(n); @@ -469,10 +458,9 @@ rbt_check_distance_ordered(void **state) } static isc_result_t -insert_helper(dns_rbt_t *rbt, const char *namestr, dns_rbtnode_t **node) -{ +insert_helper(dns_rbt_t *rbt, const char *namestr, dns_rbtnode_t **node) { dns_fixedname_t fname; - dns_name_t * name; + dns_name_t *name; dns_test_namefromstring(namestr, &fname); name = dns_fixedname_name(&fname); @@ -481,12 +469,11 @@ insert_helper(dns_rbt_t *rbt, const char *namestr, dns_rbtnode_t **node) } static bool -compare_labelsequences(dns_rbtnode_t *node, const char *labelstr) -{ - dns_name_t name; +compare_labelsequences(dns_rbtnode_t *node, const char *labelstr) { + dns_name_t name; isc_result_t result; - char * nodestr = NULL; - bool is_equal; + char *nodestr = NULL; + bool is_equal; dns_name_init(&name, NULL); dns_rbt_namefromnode(node, &name); @@ -503,11 +490,10 @@ compare_labelsequences(dns_rbtnode_t *node, const char *labelstr) /* Test insertion into a tree */ static void -rbt_insert(void **state) -{ - isc_result_t result; +rbt_insert(void **state) { + isc_result_t result; test_context_t *ctx; - dns_rbtnode_t * node; + dns_rbtnode_t *node; UNUSED(state); @@ -667,10 +653,9 @@ rbt_insert(void **state) * have data. */ static void -rbt_remove(void **state) -{ +rbt_remove(void **state) { isc_result_t result; - size_t j; + size_t j; UNUSED(state); @@ -680,13 +665,13 @@ rbt_remove(void **state) * Delete single nodes and check if the rest of the nodes exist. */ for (j = 0; j < ordered_names_count; j++) { - dns_rbt_t * mytree = NULL; - dns_rbtnode_t * node; - size_t i; - size_t * n; - bool tree_ok; + dns_rbt_t *mytree = NULL; + dns_rbtnode_t *node; + size_t i; + size_t *n; + bool tree_ok; dns_rbtnodechain_t chain; - size_t start_node; + size_t start_node; /* Create a tree. */ result = dns_rbt_create(dt_mctx, delete_data, NULL, &mytree); @@ -702,7 +687,7 @@ rbt_remove(void **state) /* Check that all names exist in order. */ for (i = 0; i < ordered_names_count; i++) { dns_fixedname_t fname; - dns_name_t * name; + dns_name_t *name; dns_test_namefromstring(ordered_names[i], &fname); @@ -727,7 +712,7 @@ rbt_remove(void **state) /* Now, delete the j'th node from the tree. */ { dns_fixedname_t fname; - dns_name_t * name; + dns_name_t *name; dns_test_namefromstring(ordered_names[j], &fname); @@ -750,7 +735,7 @@ rbt_remove(void **state) * above. We start from node 1. */ dns_fixedname_t fname; - dns_name_t * name; + dns_name_t *name; dns_test_namefromstring(ordered_names[0], &fname); name = dns_fixedname_name(&fname); @@ -769,7 +754,7 @@ rbt_remove(void **state) } else { /* Start from node 0. */ dns_fixedname_t fname; - dns_name_t * name; + dns_name_t *name; dns_test_namefromstring(ordered_names[0], &fname); name = dns_fixedname_name(&fname); @@ -786,7 +771,7 @@ rbt_remove(void **state) */ for (i = start_node; i < ordered_names_count; i++) { dns_fixedname_t fname_j, fname_i; - dns_name_t * name_j, *name_i; + dns_name_t *name_j, *name_i; dns_test_namefromstring(ordered_names[j], &fname_j); name_j = dns_fixedname_name(&fname_j); @@ -849,14 +834,13 @@ rbt_remove(void **state) static void insert_nodes(dns_rbt_t *mytree, char **names, size_t *names_count, - uint32_t num_names) -{ - uint32_t i; + uint32_t num_names) { + uint32_t i; dns_rbtnode_t *node; for (i = 0; i < num_names; i++) { size_t *n; - char namebuf[34]; + char namebuf[34]; n = isc_mem_get(dt_mctx, sizeof(size_t)); assert_non_null(n); @@ -864,10 +848,10 @@ insert_nodes(dns_rbt_t *mytree, char **names, size_t *names_count, *n = i; /* Unused value */ while (1) { - int j; + int j; dns_fixedname_t fname; - dns_name_t * name; - isc_result_t result; + dns_name_t *name; + isc_result_t result; for (j = 0; j < 32; j++) { uint32_t v = isc_random_uniform(26); @@ -883,8 +867,8 @@ insert_nodes(dns_rbt_t *mytree, char **names, size_t *names_count, result = dns_rbt_addnode(mytree, name, &node); if (result == ISC_R_SUCCESS) { node->data = n; - names[*names_count] = - isc_mem_strdup(dt_mctx, namebuf); + names[*names_count] = isc_mem_strdup(dt_mctx, + namebuf); assert_non_null(names[*names_count]); *names_count += 1; break; @@ -895,17 +879,16 @@ insert_nodes(dns_rbt_t *mytree, char **names, size_t *names_count, static void remove_nodes(dns_rbt_t *mytree, char **names, size_t *names_count, - uint32_t num_names) -{ + uint32_t num_names) { uint32_t i; UNUSED(mytree); for (i = 0; i < num_names; i++) { - uint32_t node; + uint32_t node; dns_fixedname_t fname; - dns_name_t * name; - isc_result_t result; + dns_name_t *name; + isc_result_t result; node = isc_random_uniform(*names_count); @@ -925,8 +908,7 @@ remove_nodes(dns_rbt_t *mytree, char **names, size_t *names_count, } static void -check_tree(dns_rbt_t *mytree, char **names, size_t names_count) -{ +check_tree(dns_rbt_t *mytree, char **names, size_t names_count) { bool tree_ok; UNUSED(names); @@ -962,14 +944,13 @@ check_tree(dns_rbt_t *mytree, char **names, size_t names_count) * over 1024. */ static void -rbt_insert_and_remove(void **state) -{ +rbt_insert_and_remove(void **state) { isc_result_t result; - dns_rbt_t * mytree = NULL; - size_t * n; - char * names[1024]; - size_t names_count; - int i; + dns_rbt_t *mytree = NULL; + size_t *n; + char *names[1024]; + size_t names_count; + int i; UNUSED(state); @@ -1030,13 +1011,12 @@ rbt_insert_and_remove(void **state) /* Test findname return values */ static void -rbt_findname(void **state) -{ - isc_result_t result; +rbt_findname(void **state) { + isc_result_t result; test_context_t *ctx = NULL; dns_fixedname_t fname, found; - dns_name_t * name = NULL, *foundname = NULL; - size_t * n = NULL; + dns_name_t *name = NULL, *foundname = NULL; + size_t *n = NULL; UNUSED(state); @@ -1079,13 +1059,12 @@ rbt_findname(void **state) /* Test addname return values */ static void -rbt_addname(void **state) -{ - isc_result_t result; +rbt_addname(void **state) { + isc_result_t result; test_context_t *ctx = NULL; dns_fixedname_t fname; - dns_name_t * name = NULL; - size_t * n; + dns_name_t *name = NULL; + size_t *n; UNUSED(state); @@ -1117,12 +1096,11 @@ rbt_addname(void **state) /* Test deletename return values */ static void -rbt_deletename(void **state) -{ - isc_result_t result; +rbt_deletename(void **state) { + isc_result_t result; test_context_t *ctx = NULL; dns_fixedname_t fname; - dns_name_t * name = NULL; + dns_name_t *name = NULL; UNUSED(state); @@ -1147,13 +1125,12 @@ rbt_deletename(void **state) /* Test nodechain */ static void -rbt_nodechain(void **state) -{ - isc_result_t result; - test_context_t * ctx; - dns_fixedname_t fname, found, expect; - dns_name_t * name, *foundname, *expected; - dns_rbtnode_t * node = NULL; +rbt_nodechain(void **state) { + isc_result_t result; + test_context_t *ctx; + dns_fixedname_t fname, found, expect; + dns_name_t *name, *foundname, *expected; + dns_rbtnode_t *node = NULL; dns_rbtnodechain_t chain; UNUSED(state); @@ -1215,17 +1192,16 @@ rbt_nodechain(void **state) */ static dns_fixedname_t *fnames; -static dns_name_t ** names; -static int * values; +static dns_name_t **names; +static int *values; static void * -find_thread(void *arg) -{ - dns_rbt_t * mytree; - isc_result_t result; +find_thread(void *arg) { + dns_rbt_t *mytree; + isc_result_t result; dns_rbtnode_t *node; - unsigned int j, i; - unsigned int start = 0; + unsigned int j, i; + unsigned int start = 0; mytree = (dns_rbt_t *)arg; while (start == 0) { @@ -1250,19 +1226,18 @@ find_thread(void *arg) /* Benchmark RBT implementation */ static void -benchmark(void **state) -{ - isc_result_t result; - char namestr[sizeof("name18446744073709551616.example.org.")]; - unsigned int r; - dns_rbt_t * mytree; +benchmark(void **state) { + isc_result_t result; + char namestr[sizeof("name18446744073709551616.example.org.")]; + unsigned int r; + dns_rbt_t *mytree; dns_rbtnode_t *node; - unsigned int i; - unsigned int maxvalue = 1000000; - isc_time_t ts1, ts2; - double t; - unsigned int nthreads; - isc_thread_t threads[32]; + unsigned int i; + unsigned int maxvalue = 1000000; + isc_time_t ts1, ts2; + double t; + unsigned int nthreads; + isc_thread_t threads[32]; UNUSED(state); @@ -1327,8 +1302,7 @@ benchmark(void **state) #endif /* defined(DNS_BENCHMARK_TESTS) && !defined(__SANITIZE_THREAD__) */ int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(rbt_create, _setup, _teardown), cmocka_unit_test_setup_teardown(rbt_nodecount, _setup, @@ -1363,8 +1337,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/rdata_test.c b/lib/dns/tests/rdata_test.c index 69ebbd1163..a24ab393ec 100644 --- a/lib/dns/tests/rdata_test.c +++ b/lib/dns/tests/rdata_test.c @@ -40,16 +40,15 @@ static bool debug = false; * An array of these structures is passed to compare_ok(). */ struct compare_ok { - const char *text1; /* text passed to fromtext_*() */ - const char *text2; /* text passed to fromtext_*() */ - int answer; /* -1, 0, 1 */ - int lineno; /* source line defining this RDATA */ + const char *text1; /* text passed to fromtext_*() */ + const char *text2; /* text passed to fromtext_*() */ + int answer; /* -1, 0, 1 */ + int lineno; /* source line defining this RDATA */ }; typedef struct compare_ok compare_ok_t; static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -61,8 +60,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -84,8 +82,8 @@ typedef struct text_ok { */ typedef struct wire_ok { unsigned char data[512]; /* RDATA in wire format */ - size_t len; /* octets of data to parse */ - bool ok; /* is this RDATA valid? */ + size_t len; /* octets of data to parse */ + bool ok; /* is this RDATA valid? */ } wire_ok_t; #define COMPARE(r1, r2, answer) \ @@ -124,7 +122,7 @@ typedef struct wire_ok { * RR type or not. */ #define WIRE_INVALID(FIRST, ...) WIRE_TEST(false, FIRST, __VA_ARGS__) -#define WIRE_SENTINEL() WIRE_TEST(false) +#define WIRE_SENTINEL() WIRE_TEST(false) /* * Call dns_rdata_fromwire() for data in 'src', which is 'srclen' octets in @@ -135,11 +133,10 @@ typedef struct wire_ok { static isc_result_t wire_to_rdata(const unsigned char *src, size_t srclen, dns_rdataclass_t rdclass, dns_rdatatype_t type, unsigned char *dst, size_t dstlen, - dns_rdata_t *rdata) -{ - isc_buffer_t source, target; + dns_rdata_t *rdata) { + isc_buffer_t source, target; dns_decompress_t dctx; - isc_result_t result; + isc_result_t result; /* * Set up len-octet buffer pointing at data. @@ -169,11 +166,10 @@ wire_to_rdata(const unsigned char *src, size_t srclen, dns_rdataclass_t rdclass, */ static isc_result_t rdata_towire(dns_rdata_t *rdata, unsigned char *dst, size_t dstlen, - size_t *length) -{ - isc_buffer_t target; + size_t *length) { + isc_buffer_t target; dns_compress_t cctx; - isc_result_t result; + isc_result_t result; /* * Initialize target buffer. @@ -193,8 +189,7 @@ rdata_towire(dns_rdata_t *rdata, unsigned char *dst, size_t dstlen, } static isc_result_t -additionaldata_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) -{ +additionaldata_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) { UNUSED(arg); UNUSED(name); UNUSED(qtype); @@ -205,8 +200,7 @@ additionaldata_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) * call dns_rdata_additionaldata() for rdata. */ static isc_result_t -rdata_additionadata(dns_rdata_t *rdata) -{ +rdata_additionadata(dns_rdata_t *rdata) { return (dns_rdata_additionaldata(rdata, additionaldata_cb, NULL)); } @@ -221,11 +215,10 @@ rdata_additionadata(dns_rdata_t *rdata) * result and the expected value of 'bad'. */ static void -rdata_checknames(dns_rdata_t *rdata) -{ +rdata_checknames(dns_rdata_t *rdata) { dns_fixedname_t fixed, bfixed; - dns_name_t * name, *bad; - isc_result_t result; + dns_name_t *name, *bad; + isc_result_t result; name = dns_fixedname_initname(&fixed); bad = dns_fixedname_initname(&bfixed); @@ -259,14 +252,13 @@ rdata_checknames(dns_rdata_t *rdata) * check_text_ok_single() and check_wire_ok_single(). */ static void -check_struct_conversions(dns_rdata_t *rdata, size_t structsize) -{ +check_struct_conversions(dns_rdata_t *rdata, size_t structsize) { dns_rdataclass_t rdclass = rdata->rdclass; - dns_rdatatype_t type = rdata->type; - isc_result_t result; - isc_buffer_t target; - void * rdata_struct; - char buf[1024]; + dns_rdatatype_t type = rdata->type; + isc_result_t result; + isc_buffer_t target; + void *rdata_struct; + char buf[1024]; rdata_struct = isc_mem_allocate(dt_mctx, structsize); assert_non_null(rdata_struct); @@ -302,14 +294,13 @@ check_struct_conversions(dns_rdata_t *rdata, size_t structsize) */ static void check_text_ok_single(const text_ok_t *text_ok, dns_rdataclass_t rdclass, - dns_rdatatype_t type, size_t structsize) -{ + dns_rdatatype_t type, size_t structsize) { unsigned char buf_fromtext[1024], buf_fromwire[1024], buf_towire[1024]; - dns_rdata_t rdata = DNS_RDATA_INIT, rdata2 = DNS_RDATA_INIT; - char buf_totext[1024] = { 0 }; - isc_buffer_t target; - isc_result_t result; - size_t length = 0; + dns_rdata_t rdata = DNS_RDATA_INIT, rdata2 = DNS_RDATA_INIT; + char buf_totext[1024] = { 0 }; + isc_buffer_t target; + isc_result_t result; + size_t length = 0; /* * Try converting text form RDATA into uncompressed wire form. @@ -404,13 +395,12 @@ check_text_ok_single(const text_ok_t *text_ok, dns_rdataclass_t rdclass, * by check_wire_ok_single() and whose type is not a meta-type. */ static void -check_text_conversions(dns_rdata_t *rdata) -{ - char buf_totext[1024] = { 0 }; +check_text_conversions(dns_rdata_t *rdata) { + char buf_totext[1024] = { 0 }; unsigned char buf_fromtext[1024]; - isc_result_t result; - isc_buffer_t target; - dns_rdata_t rdata2 = DNS_RDATA_INIT; + isc_result_t result; + isc_buffer_t target; + dns_rdata_t rdata2 = DNS_RDATA_INIT; /* * Convert uncompressed wire form RDATA into text form. This @@ -451,14 +441,13 @@ check_text_conversions(dns_rdata_t *rdata) * by check_wire_ok_single() and whose type is not a meta-type. */ static void -check_multiline_text_conversions(dns_rdata_t *rdata) -{ - char buf_totext[1024] = { 0 }; +check_multiline_text_conversions(dns_rdata_t *rdata) { + char buf_totext[1024] = { 0 }; unsigned char buf_fromtext[1024]; - isc_result_t result; - isc_buffer_t target; - dns_rdata_t rdata2 = DNS_RDATA_INIT; - unsigned int flags; + isc_result_t result; + isc_buffer_t target; + dns_rdata_t rdata2 = DNS_RDATA_INIT; + unsigned int flags; /* * Convert uncompressed wire form RDATA into multi-line text form. @@ -498,12 +487,11 @@ check_multiline_text_conversions(dns_rdata_t *rdata) */ static void check_wire_ok_single(const wire_ok_t *wire_ok, dns_rdataclass_t rdclass, - dns_rdatatype_t type, size_t structsize) -{ + dns_rdatatype_t type, size_t structsize) { unsigned char buf[1024], buf_towire[1024]; - isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; - size_t length = 0; + isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; + size_t length = 0; /* * Try converting wire data into uncompressed wire form. @@ -567,8 +555,7 @@ check_wire_ok_single(const wire_ok_t *wire_ok, dns_rdataclass_t rdclass, */ static void check_text_ok(const text_ok_t *text_ok, dns_rdataclass_t rdclass, - dns_rdatatype_t type, size_t structsize) -{ + dns_rdatatype_t type, size_t structsize) { size_t i; /* @@ -588,10 +575,9 @@ check_text_ok(const text_ok_t *text_ok, dns_rdataclass_t rdclass, */ static void check_wire_ok(const wire_ok_t *wire_ok, bool empty_ok, dns_rdataclass_t rdclass, - dns_rdatatype_t type, size_t structsize) -{ + dns_rdatatype_t type, size_t structsize) { wire_ok_t empty_wire = WIRE_TEST(empty_ok); - size_t i; + size_t i; /* * Check all entries in the supplied array. @@ -611,12 +597,11 @@ check_wire_ok(const wire_ok_t *wire_ok, bool empty_ok, dns_rdataclass_t rdclass, */ static void check_compare_ok_single(const compare_ok_t *compare_ok, - dns_rdataclass_t rdclass, dns_rdatatype_t type) -{ - dns_rdata_t rdata1 = DNS_RDATA_INIT, rdata2 = DNS_RDATA_INIT; + dns_rdataclass_t rdclass, dns_rdatatype_t type) { + dns_rdata_t rdata1 = DNS_RDATA_INIT, rdata2 = DNS_RDATA_INIT; unsigned char buf1[1024], buf2[1024]; - isc_result_t result; - int answer; + isc_result_t result; + int answer; result = dns_test_rdatafromstring(&rdata1, rdclass, type, buf1, sizeof(buf1), compare_ok->text1, @@ -665,8 +650,7 @@ check_compare_ok_single(const compare_ok_t *compare_ok, */ static void check_compare_ok(const compare_ok_t *compare_ok, dns_rdataclass_t rdclass, - dns_rdatatype_t type) -{ + dns_rdatatype_t type) { size_t i; /* * Check all entries in the supplied array. @@ -689,8 +673,7 @@ check_compare_ok(const compare_ok_t *compare_ok, dns_rdataclass_t rdclass, static void check_rdata(const text_ok_t *text_ok, const wire_ok_t *wire_ok, const compare_ok_t *compare_ok, bool empty_ok, - dns_rdataclass_t rdclass, dns_rdatatype_t type, size_t structsize) -{ + dns_rdataclass_t rdclass, dns_rdatatype_t type, size_t structsize) { if (text_ok != NULL) { check_text_ok(text_ok, rdclass, type, structsize); } @@ -710,8 +693,7 @@ check_rdata(const text_ok_t *text_ok, const wire_ok_t *wire_ok, * - RKEY (draft-reid-dnsext-rkey-00) */ static void -key_required(void **state, dns_rdatatype_t type, size_t size) -{ +key_required(void **state, dns_rdatatype_t type, size_t size) { wire_ok_t wire_ok[] = { /* * RDATA must be at least 5 octets in size: * @@ -742,8 +724,7 @@ key_required(void **state, dns_rdatatype_t type, size_t size) /* APL RDATA manipulations */ static void -apl(void **state) -{ +apl(void **state) { text_ok_t text_ok[] = { /* empty list */ TEXT_VALID(""), @@ -828,8 +809,7 @@ apl(void **state) * ATMA RRs cause no additional section processing. */ static void -atma(void **state) -{ +atma(void **state) { text_ok_t text_ok[] = { TEXT_VALID("00"), TEXT_VALID_CHANGED("0.0", "00"), /* @@ -900,8 +880,7 @@ atma(void **state) /* AMTRELAY RDATA manipulations */ static void -amtrelay(void **state) -{ +amtrelay(void **state) { text_ok_t text_ok[] = { TEXT_INVALID(""), TEXT_INVALID("0"), TEXT_INVALID("0 0"), /* gatway type 0 */ @@ -980,8 +959,7 @@ amtrelay(void **state) } static void -cdnskey(void **state) -{ +cdnskey(void **state) { key_required(state, dns_rdatatype_cdnskey, sizeof(dns_rdata_cdnskey_t)); } @@ -1050,8 +1028,7 @@ cdnskey(void **state) * Map field that has been set to 1. */ static void -csync(void **state) -{ +csync(void **state) { text_ok_t text_ok[] = { TEXT_INVALID(""), TEXT_INVALID("0"), TEXT_VALID("0 0"), @@ -1113,8 +1090,7 @@ csync(void **state) } static void -dnskey(void **state) -{ +dnskey(void **state) { key_required(state, dns_rdatatype_dnskey, sizeof(dns_rdata_dnskey_t)); } @@ -1179,8 +1155,7 @@ dnskey(void **state) * data. */ static void -doa(void **state) -{ +doa(void **state) { text_ok_t text_ok[] = { /* * Valid, non-empty DOA-DATA. @@ -1396,8 +1371,7 @@ doa(void **state) * digest algorithm is SHA-1, which produces a 20 octet digest. */ static void -ds(void **state) -{ +ds(void **state) { text_ok_t text_ok[] = { /* * Invalid, empty record. @@ -1666,8 +1640,7 @@ ds(void **state) * Data Notation). */ static void -edns_client_subnet(void **state) -{ +edns_client_subnet(void **state) { wire_ok_t wire_ok[] = { /* * Option code with no content. @@ -1757,8 +1730,7 @@ edns_client_subnet(void **state) * field and should be ignored when reading a master file. */ static void -eid(void **state) -{ +eid(void **state) { text_ok_t text_ok[] = { TEXT_VALID("AABBCC"), TEXT_VALID_CHANGED("AA bb cc", "AABBCC"), TEXT_INVALID("aab"), @@ -1782,15 +1754,14 @@ eid(void **state) * test that an oversized HIP record will be rejected */ static void -hip(void **state) -{ +hip(void **state) { unsigned char hipwire[DNS_RDATA_MAXLENGTH] = { 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x04, 0x41, 0x42, 0x43, 0x44, 0x00 }; unsigned char buf[1024 * 1024]; - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_result_t result; - size_t i; + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_result_t result; + size_t i; UNUSED(state); @@ -1869,8 +1840,7 @@ hip(void **state) * characters. */ static void -isdn(void **state) -{ +isdn(void **state) { wire_ok_t wire_ok[] = { /* * "". */ @@ -1903,8 +1873,7 @@ isdn(void **state) * KEY tests. */ static void -key(void **state) -{ +key(void **state) { wire_ok_t wire_ok[] = { /* * RDATA is comprised of: * @@ -1945,8 +1914,7 @@ key(void **state) * field and should be ignored when reading a master file. */ static void -nimloc(void **state) -{ +nimloc(void **state) { text_ok_t text_ok[] = { TEXT_VALID("AABBCC"), TEXT_VALID_CHANGED("AA bb cc", "AABBCC"), TEXT_INVALID("aab"), @@ -2033,8 +2001,7 @@ nimloc(void **state) * in zone data. If encountered, they MUST be ignored upon being read. */ static void -nsec(void **state) -{ +nsec(void **state) { text_ok_t text_ok[] = { TEXT_INVALID(""), TEXT_INVALID("."), TEXT_VALID(". RRSIG"), TEXT_SENTINEL() }; wire_ok_t wire_ok[] = { WIRE_INVALID(0x00), WIRE_INVALID(0x00, 0x00), @@ -2054,8 +2021,7 @@ nsec(void **state) * RFC 5155. */ static void -nsec3(void **state) -{ +nsec3(void **state) { text_ok_t text_ok[] = { TEXT_INVALID(""), TEXT_INVALID("."), TEXT_INVALID(". RRSIG"), @@ -2083,8 +2049,7 @@ nsec3(void **state) /* NXT RDATA manipulations */ static void -nxt(void **state) -{ +nxt(void **state) { compare_ok_t compare_ok[] = { COMPARE("a. A SIG", "a. A SIG", 0), /* @@ -2110,8 +2075,7 @@ nxt(void **state) } static void -rkey(void **state) -{ +rkey(void **state) { text_ok_t text_ok[] = { /* * Valid, flags set to 0 and a key is present. */ @@ -2147,8 +2111,7 @@ rkey(void **state) /* SSHFP RDATA manipulations */ static void -sshfp(void **state) -{ +sshfp(void **state) { text_ok_t text_ok[] = { TEXT_INVALID(""), /* too short */ TEXT_INVALID("0"), /* reserved, too short */ TEXT_VALID("0 0"), /* no finger print */ @@ -2271,8 +2234,7 @@ sshfp(void **state) * address. */ static void -wks(void **state) -{ +wks(void **state) { text_ok_t text_ok[] = { /* * Valid, IPv4 address in dotted-quad form. */ @@ -2359,8 +2321,7 @@ wks(void **state) */ static void -zonemd(void **state) -{ +zonemd(void **state) { text_ok_t text_ok[] = { TEXT_INVALID(""), TEXT_INVALID("0"), TEXT_INVALID("0 0"), @@ -2456,8 +2417,7 @@ zonemd(void **state) } static void -atcname(void **state) -{ +atcname(void **state) { unsigned int i; UNUSED(state); #define UNR "# Unexpected result from dns_rdatatype_atcname for type %u\n" @@ -2484,8 +2444,7 @@ atcname(void **state) } static void -atparent(void **state) -{ +atparent(void **state) { unsigned int i; UNUSED(state); #define UNR "# Unexpected result from dns_rdatatype_atparent for type %u\n" @@ -2510,8 +2469,7 @@ atparent(void **state) } static void -iszonecutauth(void **state) -{ +iszonecutauth(void **state) { unsigned int i; UNUSED(state); #define UNR "# Unexpected result from dns_rdatatype_iszonecutauth for type %u\n" @@ -2540,8 +2498,7 @@ iszonecutauth(void **state) } int -main(int argc, char **argv) -{ +main(int argc, char **argv) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(amtrelay, _setup, _teardown), cmocka_unit_test_setup_teardown(apl, _setup, _teardown), @@ -2584,8 +2541,7 @@ main(int argc, char **argv) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/rdataset_test.c b/lib/dns/tests/rdataset_test.c index dc1b46bde9..98429d366a 100644 --- a/lib/dns/tests/rdataset_test.c +++ b/lib/dns/tests/rdataset_test.c @@ -30,8 +30,7 @@ #include "dnstest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -43,8 +42,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -54,11 +52,10 @@ _teardown(void **state) /* test trimming of rdataset TTLs */ static void -trimttl(void **state) -{ - dns_rdataset_t rdataset, sigrdataset; +trimttl(void **state) { + dns_rdataset_t rdataset, sigrdataset; dns_rdata_rrsig_t rrsig; - isc_stdtime_t ttltimenow, ttltimeexpire; + isc_stdtime_t ttltimenow, ttltimeexpire; ttltimenow = 10000000; ttltimeexpire = ttltimenow + 800; @@ -126,8 +123,7 @@ trimttl(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(trimttl, _setup, _teardown), }; @@ -140,8 +136,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/rdatasetstats_test.c b/lib/dns/tests/rdatasetstats_test.c index cb167c7e14..d82f6031ff 100644 --- a/lib/dns/tests/rdatasetstats_test.c +++ b/lib/dns/tests/rdatasetstats_test.c @@ -32,8 +32,7 @@ #include "dnstest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -45,8 +44,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -55,10 +53,9 @@ _teardown(void **state) } static void -set_typestats(dns_stats_t *stats, dns_rdatatype_t type) -{ +set_typestats(dns_stats_t *stats, dns_rdatatype_t type) { dns_rdatastatstype_t which; - unsigned int attributes; + unsigned int attributes; attributes = 0; which = DNS_RDATASTATSTYPE_VALUE(type, attributes); @@ -70,10 +67,9 @@ set_typestats(dns_stats_t *stats, dns_rdatatype_t type) } static void -set_nxdomainstats(dns_stats_t *stats) -{ +set_nxdomainstats(dns_stats_t *stats) { dns_rdatastatstype_t which; - unsigned int attributes; + unsigned int attributes; attributes = DNS_RDATASTATSTYPE_ATTR_NXDOMAIN; which = DNS_RDATASTATSTYPE_VALUE(0, attributes); @@ -81,10 +77,9 @@ set_nxdomainstats(dns_stats_t *stats) } static void -mark_stale(dns_stats_t *stats, dns_rdatatype_t type, int from, int to) -{ +mark_stale(dns_stats_t *stats, dns_rdatatype_t type, int from, int to) { dns_rdatastatstype_t which; - unsigned int attributes; + unsigned int attributes; attributes = from; which = DNS_RDATASTATSTYPE_VALUE(type, attributes); @@ -104,10 +99,9 @@ mark_stale(dns_stats_t *stats, dns_rdatatype_t type, int from, int to) } static void -mark_nxdomain_stale(dns_stats_t *stats, int from, int to) -{ +mark_nxdomain_stale(dns_stats_t *stats, int from, int to) { dns_rdatastatstype_t which; - unsigned int attributes; + unsigned int attributes; attributes = DNS_RDATASTATSTYPE_ATTR_NXDOMAIN | from; which = DNS_RDATASTATSTYPE_VALUE(0, attributes); @@ -120,8 +114,7 @@ mark_nxdomain_stale(dns_stats_t *stats, int from, int to) #define ATTRIBUTE_SET(y) ((attributes & (y)) != 0) static void -verify_active_counters(dns_rdatastatstype_t which, uint64_t value, void *arg) -{ +verify_active_counters(dns_rdatastatstype_t which, uint64_t value, void *arg) { unsigned int attributes; #if debug unsigned int type; @@ -143,7 +136,8 @@ verify_active_counters(dns_rdatastatstype_t which, uint64_t value, void *arg) type, (unsigned)value); #endif /* if debug */ if ((attributes & DNS_RDATASTATSTYPE_ATTR_ANCIENT) == 0 && - (attributes & DNS_RDATASTATSTYPE_ATTR_STALE) == 0) { + (attributes & DNS_RDATASTATSTYPE_ATTR_STALE) == 0) + { assert_int_equal(value, 1); } else { assert_int_equal(value, 0); @@ -151,8 +145,7 @@ verify_active_counters(dns_rdatastatstype_t which, uint64_t value, void *arg) } static void -verify_stale_counters(dns_rdatastatstype_t which, uint64_t value, void *arg) -{ +verify_stale_counters(dns_rdatastatstype_t which, uint64_t value, void *arg) { unsigned int attributes; #if debug unsigned int type; @@ -181,8 +174,7 @@ verify_stale_counters(dns_rdatastatstype_t which, uint64_t value, void *arg) } static void -verify_ancient_counters(dns_rdatastatstype_t which, uint64_t value, void *arg) -{ +verify_ancient_counters(dns_rdatastatstype_t which, uint64_t value, void *arg) { unsigned int attributes; #if debug unsigned int type; @@ -218,8 +210,7 @@ verify_ancient_counters(dns_rdatastatstype_t which, uint64_t value, void *arg) * active -> stale -> ancient. */ static void -rdatasetstats(void **state, bool servestale) -{ +rdatasetstats(void **state, bool servestale) { unsigned int i; unsigned int from = 0; dns_stats_t *stats = NULL; @@ -280,8 +271,7 @@ rdatasetstats(void **state, bool servestale) * active -> stale -> ancient. */ static void -test_rdatasetstats_active_stale_ancient(void **state) -{ +test_rdatasetstats_active_stale_ancient(void **state) { rdatasetstats(state, true); } @@ -290,14 +280,12 @@ test_rdatasetstats_active_stale_ancient(void **state) * active -> ancient. */ static void -test_rdatasetstats_active_ancient(void **state) -{ +test_rdatasetstats_active_ancient(void **state) { rdatasetstats(state, false); } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown( test_rdatasetstats_active_stale_ancient, _setup, @@ -314,8 +302,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/resolver_test.c b/lib/dns/tests/resolver_test.c index 1ab9c8a8b5..8a329afb84 100644 --- a/lib/dns/tests/resolver_test.c +++ b/lib/dns/tests/resolver_test.c @@ -37,13 +37,12 @@ #include "dnstest.h" static dns_dispatchmgr_t *dispatchmgr = NULL; -static dns_dispatch_t * dispatch = NULL; -static dns_view_t * view = NULL; +static dns_dispatch_t *dispatch = NULL; +static dns_view_t *view = NULL; static int -_setup(void **state) -{ - isc_result_t result; +_setup(void **state) { + isc_result_t result; isc_sockaddr_t local; UNUSED(state); @@ -66,8 +65,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_dispatch_detach(&dispatch); @@ -79,8 +77,7 @@ _teardown(void **state) } static void -mkres(dns_resolver_t **resolverp) -{ +mkres(dns_resolver_t **resolverp) { isc_result_t result; result = dns_resolver_create(view, taskmgr, 1, 1, socketmgr, timermgr, @@ -89,16 +86,14 @@ mkres(dns_resolver_t **resolverp) } static void -destroy_resolver(dns_resolver_t **resolverp) -{ +destroy_resolver(dns_resolver_t **resolverp) { dns_resolver_shutdown(*resolverp); dns_resolver_detach(resolverp); } /* dns_resolver_create */ static void -create_test(void **state) -{ +create_test(void **state) { dns_resolver_t *resolver = NULL; UNUSED(state); @@ -109,10 +104,9 @@ create_test(void **state) /* dns_resolver_gettimeout */ static void -gettimeout_test(void **state) -{ +gettimeout_test(void **state) { dns_resolver_t *resolver = NULL; - unsigned int timeout; + unsigned int timeout; UNUSED(state); @@ -126,10 +120,9 @@ gettimeout_test(void **state) /* dns_resolver_settimeout */ static void -settimeout_test(void **state) -{ +settimeout_test(void **state) { dns_resolver_t *resolver = NULL; - unsigned int default_timeout, timeout; + unsigned int default_timeout, timeout; UNUSED(state); @@ -145,10 +138,9 @@ settimeout_test(void **state) /* dns_resolver_settimeout */ static void -settimeout_default_test(void **state) -{ +settimeout_default_test(void **state) { dns_resolver_t *resolver = NULL; - unsigned int default_timeout, timeout; + unsigned int default_timeout, timeout; UNUSED(state); @@ -169,10 +161,9 @@ settimeout_default_test(void **state) /* dns_resolver_settimeout below minimum */ static void -settimeout_belowmin_test(void **state) -{ +settimeout_belowmin_test(void **state) { dns_resolver_t *resolver = NULL; - unsigned int default_timeout, timeout; + unsigned int default_timeout, timeout; UNUSED(state); @@ -189,10 +180,9 @@ settimeout_belowmin_test(void **state) /* dns_resolver_settimeout over maximum */ static void -settimeout_overmax_test(void **state) -{ +settimeout_overmax_test(void **state) { dns_resolver_t *resolver = NULL; - unsigned int timeout; + unsigned int timeout; UNUSED(state); @@ -205,8 +195,7 @@ settimeout_overmax_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(create_test, _setup, _teardown), cmocka_unit_test_setup_teardown(gettimeout_test, _setup, @@ -229,8 +218,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/result_test.c b/lib/dns/tests/result_test.c index 7fcabc9fd8..db3c403da5 100644 --- a/lib/dns/tests/result_test.c +++ b/lib/dns/tests/result_test.c @@ -32,9 +32,8 @@ * Check ids array is populated. */ static void -ids(void **state) -{ - const char * str; +ids(void **state) { + const char *str; isc_result_t result; UNUSED(state); @@ -43,7 +42,8 @@ ids(void **state) dst_result_register(); for (result = ISC_RESULTCLASS_DNS; - result < (ISC_RESULTCLASS_DNS + DNS_R_NRESULTS); result++) { + result < (ISC_RESULTCLASS_DNS + DNS_R_NRESULTS); result++) + { str = isc_result_toid(result); assert_non_null(str); assert_string_not_equal(str, "(result code text not " @@ -64,7 +64,8 @@ ids(void **state) assert_string_equal(str, "(result code text not available)"); for (result = ISC_RESULTCLASS_DST; - result < (ISC_RESULTCLASS_DST + DST_R_NRESULTS); result++) { + result < (ISC_RESULTCLASS_DST + DST_R_NRESULTS); result++) + { str = isc_result_toid(result); assert_non_null(str); assert_string_not_equal(str, "(result code text not " @@ -86,7 +87,8 @@ ids(void **state) for (result = ISC_RESULTCLASS_DNSRCODE; result < (ISC_RESULTCLASS_DNSRCODE + DNS_R_NRCODERESULTS); - result++) { + result++) + { str = isc_result_toid(result); assert_non_null(str); assert_string_not_equal(str, "(result code text not " @@ -108,8 +110,7 @@ ids(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(ids), }; @@ -122,8 +123,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/rsa_test.c b/lib/dns/tests/rsa_test.c index d834c29552..61e02f28de 100644 --- a/lib/dns/tests/rsa_test.c +++ b/lib/dns/tests/rsa_test.c @@ -32,8 +32,7 @@ #include static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -45,8 +44,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -134,15 +132,14 @@ static unsigned char sigsha512[512] = { /* RSA verify */ static void -isc_rsa_verify_test(void **state) -{ - isc_result_t ret; +isc_rsa_verify_test(void **state) { + isc_result_t ret; dns_fixedname_t fname; - isc_buffer_t buf; - dns_name_t * name; - dst_key_t * key = NULL; - dst_context_t * ctx = NULL; - isc_region_t r; + isc_buffer_t buf; + dns_name_t *name; + dst_key_t *key = NULL; + dst_context_t *ctx = NULL; + isc_region_t r; UNUSED(state); @@ -218,8 +215,7 @@ isc_rsa_verify_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(isc_rsa_verify_test, _setup, _teardown), @@ -233,8 +229,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/sigs_test.c b/lib/dns/tests/sigs_test.c index cf2a0d707f..1b9f299398 100644 --- a/lib/dns/tests/sigs_test.c +++ b/lib/dns/tests/sigs_test.c @@ -48,8 +48,7 @@ #include static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -61,8 +60,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -76,9 +74,9 @@ _teardown(void **state) */ typedef struct { dns_diffop_t op; - const char * owner; - dns_ttl_t ttl; - const char * type; + const char *owner; + dns_ttl_t ttl; + const char *type; } zonediff_t; #define ZONEDIFF_SENTINEL \ @@ -90,10 +88,10 @@ typedef struct { * Structure defining a dns__zone_updatesigs() test. */ typedef struct { - const char * description; /* test description */ - const zonechange_t *changes; /* array of "raw" zone changes */ - const zonediff_t * zonediff; /* array of "processed" zone changes - * */ + const char *description; /* test description */ + const zonechange_t *changes; /* array of "raw" zone changes */ + const zonediff_t *zonediff; /* array of "processed" zone changes + * */ } updatesigs_test_params_t; /*% @@ -101,18 +99,18 @@ typedef struct { * the 'index'th tuple output by dns__zone_updatesigs() in test 'test'. */ static void -compare_tuples(const zonediff_t *expected, dns_difftuple_t *found, size_t index) -{ - char found_covers[DNS_RDATATYPE_FORMATSIZE] = {}; - char found_type[DNS_RDATATYPE_FORMATSIZE] = {}; - char found_name[DNS_NAME_FORMATSIZE]; +compare_tuples(const zonediff_t *expected, dns_difftuple_t *found, + size_t index) { + char found_covers[DNS_RDATATYPE_FORMATSIZE] = {}; + char found_type[DNS_RDATATYPE_FORMATSIZE] = {}; + char found_name[DNS_NAME_FORMATSIZE]; isc_consttextregion_t typeregion; - dns_fixedname_t expected_fname; - dns_rdatatype_t expected_type; - dns_name_t * expected_name; - dns_rdata_rrsig_t rrsig; - isc_buffer_t typebuf; - isc_result_t result; + dns_fixedname_t expected_fname; + dns_rdatatype_t expected_type; + dns_name_t *expected_name; + dns_rdata_rrsig_t rrsig; + isc_buffer_t typebuf; + isc_result_t result; REQUIRE(expected != NULL); REQUIRE(found != NULL); @@ -127,8 +125,8 @@ compare_tuples(const zonediff_t *expected, dns_difftuple_t *found, size_t index) * Check owner name. */ expected_name = dns_fixedname_initname(&expected_fname); - result = - dns_name_fromstring(expected_name, expected->owner, 0, dt_mctx); + result = dns_name_fromstring(expected_name, expected->owner, 0, + dt_mctx); assert_int_equal(result, ISC_R_SUCCESS); dns_name_format(&found->name, found_name, sizeof(found_name)); assert_true(dns_name_equal(expected_name, &found->name)); @@ -194,14 +192,13 @@ compare_tuples(const zonediff_t *expected, dns_difftuple_t *found, size_t index) static void updatesigs_test(const updatesigs_test_params_t *test, dns_zone_t *zone, dns_db_t *db, dst_key_t *zone_keys[], unsigned int nkeys, - isc_stdtime_t now) -{ - size_t tuples_expected, tuples_found, index; - dns_dbversion_t * version = NULL; - dns_diff_t raw_diff, zone_diff; + isc_stdtime_t now) { + size_t tuples_expected, tuples_found, index; + dns_dbversion_t *version = NULL; + dns_diff_t raw_diff, zone_diff; const zonediff_t *expected; - dns_difftuple_t * found; - isc_result_t result; + dns_difftuple_t *found; + isc_result_t result; dns__zonediff_t zonediff = { .diff = &zone_diff, @@ -260,7 +257,8 @@ updatesigs_test(const updatesigs_test_params_t *test, dns_zone_t *zone, tuples_found = 0; for (found = ISC_LIST_HEAD(zone_diff.tuples); found != NULL; - found = ISC_LIST_NEXT(found, link)) { + found = ISC_LIST_NEXT(found, link)) + { tuples_found++; } @@ -272,7 +270,8 @@ updatesigs_test(const updatesigs_test_params_t *test, dns_zone_t *zone, expected = test->zonediff; index = 1; for (found = ISC_LIST_HEAD(zone_diff.tuples); found != NULL; - found = ISC_LIST_NEXT(found, link)) { + found = ISC_LIST_NEXT(found, link)) + { compare_tuples(expected, found, index); expected++; index++; @@ -288,15 +287,14 @@ updatesigs_test(const updatesigs_test_params_t *test, dns_zone_t *zone, /* dns__zone_updatesigs() tests */ static void -updatesigs_next_test(void **state) -{ - dst_key_t * zone_keys[DNS_MAXZONEKEYS]; - dns_zone_t * zone = NULL; - dns_db_t * db = NULL; - isc_result_t result; - unsigned int nkeys; +updatesigs_next_test(void **state) { + dst_key_t *zone_keys[DNS_MAXZONEKEYS]; + dns_zone_t *zone = NULL; + dns_db_t *db = NULL; + isc_result_t result; + unsigned int nkeys; isc_stdtime_t now; - size_t i; + size_t i; UNUSED(state); @@ -440,8 +438,7 @@ updatesigs_next_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(updatesigs_next_test, _setup, _teardown), @@ -455,8 +452,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/time_test.c b/lib/dns/tests/time_test.c index 5e6abcbdce..58a9048a12 100644 --- a/lib/dns/tests/time_test.c +++ b/lib/dns/tests/time_test.c @@ -32,8 +32,7 @@ #define TEST_ORIGIN "test" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -45,8 +44,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -56,14 +54,13 @@ _teardown(void **state) /* value = 0xfffffffff <-> 19691231235959 */ static void -epoch_minus_one_test(void **state) -{ - const char * test_text = "19691231235959"; +epoch_minus_one_test(void **state) { + const char *test_text = "19691231235959"; const uint32_t test_time = 0xffffffff; - isc_result_t result; - isc_buffer_t target; - uint32_t when; - char buf[128]; + isc_result_t result; + isc_buffer_t target; + uint32_t when; + char buf[128]; UNUSED(state); @@ -79,14 +76,13 @@ epoch_minus_one_test(void **state) /* value = 0x000000000 <-> 19700101000000*/ static void -epoch_test(void **state) -{ - const char * test_text = "19700101000000"; +epoch_test(void **state) { + const char *test_text = "19700101000000"; const uint32_t test_time = 0x00000000; - isc_result_t result; - isc_buffer_t target; - uint32_t when; - char buf[128]; + isc_result_t result; + isc_buffer_t target; + uint32_t when; + char buf[128]; UNUSED(state); @@ -102,14 +98,13 @@ epoch_test(void **state) /* value = 0x7fffffff <-> 20380119031407 */ static void -half_maxint_test(void **state) -{ - const char * test_text = "20380119031407"; +half_maxint_test(void **state) { + const char *test_text = "20380119031407"; const uint32_t test_time = 0x7fffffff; - isc_result_t result; - isc_buffer_t target; - uint32_t when; - char buf[128]; + isc_result_t result; + isc_buffer_t target; + uint32_t when; + char buf[128]; UNUSED(state); @@ -125,14 +120,13 @@ half_maxint_test(void **state) /* value = 0x80000000 <-> 20380119031408 */ static void -half_plus_one_test(void **state) -{ - const char * test_text = "20380119031408"; +half_plus_one_test(void **state) { + const char *test_text = "20380119031408"; const uint32_t test_time = 0x80000000; - isc_result_t result; - isc_buffer_t target; - uint32_t when; - char buf[128]; + isc_result_t result; + isc_buffer_t target; + uint32_t when; + char buf[128]; UNUSED(state); @@ -148,14 +142,13 @@ half_plus_one_test(void **state) /* value = 0xef68f5d0 <-> 19610307130000 */ static void -fifty_before_test(void **state) -{ - isc_result_t result; - const char * test_text = "19610307130000"; +fifty_before_test(void **state) { + isc_result_t result; + const char *test_text = "19610307130000"; const uint32_t test_time = 0xef68f5d0; - isc_buffer_t target; - uint32_t when; - char buf[128]; + isc_buffer_t target; + uint32_t when; + char buf[128]; UNUSED(state); @@ -171,14 +164,13 @@ fifty_before_test(void **state) /* value = 0x4d74d6d0 <-> 20110307130000 */ static void -some_ago_test(void **state) -{ - const char * test_text = "20110307130000"; +some_ago_test(void **state) { + const char *test_text = "20110307130000"; const uint32_t test_time = 0x4d74d6d0; - isc_result_t result; - isc_buffer_t target; - uint32_t when; - char buf[128]; + isc_result_t result; + isc_buffer_t target; + uint32_t when; + char buf[128]; UNUSED(state); @@ -193,8 +185,7 @@ some_ago_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(epoch_minus_one_test, _setup, _teardown), @@ -217,8 +208,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/tsig_test.c b/lib/dns/tests/tsig_test.c index c93ad3edb5..b75e9c9936 100644 --- a/lib/dns/tests/tsig_test.c +++ b/lib/dns/tests/tsig_test.c @@ -44,8 +44,7 @@ #define TEST_ORIGIN "test" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -57,8 +56,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -69,14 +67,13 @@ _teardown(void **state) static int debug = 0; static isc_result_t -add_mac(dst_context_t *tsigctx, isc_buffer_t *buf) -{ +add_mac(dst_context_t *tsigctx, isc_buffer_t *buf) { dns_rdata_any_tsig_t tsig; - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_buffer_t databuf; - isc_region_t r; - isc_result_t result; - unsigned char tsigbuf[1024]; + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_buffer_t databuf; + isc_region_t r; + isc_result_t result; + unsigned char tsigbuf[1024]; isc_buffer_usedregion(buf, &r); dns_rdata_fromregion(&rdata, dns_rdataclass_any, dns_rdatatype_tsig, @@ -93,23 +90,22 @@ cleanup: } static isc_result_t -add_tsig(dst_context_t *tsigctx, dns_tsigkey_t *key, isc_buffer_t *target) -{ - dns_compress_t cctx; +add_tsig(dst_context_t *tsigctx, dns_tsigkey_t *key, isc_buffer_t *target) { + dns_compress_t cctx; dns_rdata_any_tsig_t tsig; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdatalist_t rdatalist; - dns_rdataset_t rdataset; - isc_buffer_t * dynbuf = NULL; - isc_buffer_t databuf; - isc_buffer_t sigbuf; - isc_region_t r; - isc_result_t result = ISC_R_SUCCESS; - isc_stdtime_t now; - unsigned char tsigbuf[1024]; - unsigned int count; - unsigned int sigsize = 0; - bool invalidate_ctx = false; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdatalist_t rdatalist; + dns_rdataset_t rdataset; + isc_buffer_t *dynbuf = NULL; + isc_buffer_t databuf; + isc_buffer_t sigbuf; + isc_region_t r; + isc_result_t result = ISC_R_SUCCESS; + isc_stdtime_t now; + unsigned char tsigbuf[1024]; + unsigned int count; + unsigned int sigsize = 0; + bool invalidate_ctx = false; memset(&tsig, 0, sizeof(tsig)); @@ -177,11 +173,10 @@ cleanup: } static void -printmessage(dns_message_t *msg) -{ +printmessage(dns_message_t *msg) { isc_buffer_t b; - char * buf = NULL; - int len = 1024; + char *buf = NULL; + int len = 1024; isc_result_t result = ISC_R_SUCCESS; if (!debug) { @@ -192,8 +187,8 @@ printmessage(dns_message_t *msg) buf = isc_mem_get(dt_mctx, len); isc_buffer_init(&b, buf, len); - result = - dns_message_totext(msg, &dns_master_style_debug, 0, &b); + result = dns_message_totext(msg, &dns_master_style_debug, 0, + &b); if (result == ISC_R_NOSPACE) { isc_mem_put(dt_mctx, buf, len); len *= 2; @@ -209,11 +204,10 @@ printmessage(dns_message_t *msg) static void render(isc_buffer_t *buf, unsigned flags, dns_tsigkey_t *key, - isc_buffer_t **tsigin, isc_buffer_t **tsigout, dst_context_t *tsigctx) -{ + isc_buffer_t **tsigin, isc_buffer_t **tsigout, dst_context_t *tsigctx) { dns_message_t *msg = NULL; dns_compress_t cctx; - isc_result_t result; + isc_result_t result; result = dns_message_create(dt_mctx, DNS_MESSAGE_INTENTRENDER, &msg); assert_int_equal(result, ISC_R_SUCCESS); @@ -278,22 +272,21 @@ render(isc_buffer_t *buf, unsigned flags, dns_tsigkey_t *key, * correctly verifies. */ static void -tsig_tcp_test(void **state) -{ - const dns_name_t * tsigowner = NULL; - dns_fixedname_t fkeyname; - dns_message_t * msg = NULL; - dns_name_t * keyname; +tsig_tcp_test(void **state) { + const dns_name_t *tsigowner = NULL; + dns_fixedname_t fkeyname; + dns_message_t *msg = NULL; + dns_name_t *keyname; dns_tsig_keyring_t *ring = NULL; - dns_tsigkey_t * key = NULL; - isc_buffer_t * buf = NULL; - isc_buffer_t * querytsig = NULL; - isc_buffer_t * tsigin = NULL; - isc_buffer_t * tsigout = NULL; - isc_result_t result; - unsigned char secret[16] = { 0 }; - dst_context_t * tsigctx = NULL; - dst_context_t * outctx = NULL; + dns_tsigkey_t *key = NULL; + isc_buffer_t *buf = NULL; + isc_buffer_t *querytsig = NULL; + isc_buffer_t *tsigin = NULL; + isc_buffer_t *tsigout = NULL; + isc_result_t result; + unsigned char secret[16] = { 0 }; + dst_context_t *tsigctx = NULL; + dst_context_t *outctx = NULL; UNUSED(state); @@ -489,8 +482,7 @@ tsig_tcp_test(void **state) /* Tests the dns__tsig_algvalid function */ static void -algvalid_test(void **state) -{ +algvalid_test(void **state) { UNUSED(state); assert_true(dns__tsig_algvalid(DST_ALG_HMACMD5)); @@ -506,8 +498,7 @@ algvalid_test(void **state) /* Tests the dns__tsig_algfromname function */ static void -algfromname_test(void **state) -{ +algfromname_test(void **state) { UNUSED(state); assert_int_equal(dns__tsig_algfromname(DNS_TSIG_HMACMD5_NAME), @@ -539,8 +530,7 @@ algfromname_test(void **state) * static table of known algorithms. */ static void -test_name(const char *name_string, const dns_name_t *expected) -{ +test_name(const char *name_string, const dns_name_t *expected) { dns_name_t name; dns_name_init(&name, NULL); assert_int_equal(dns_name_fromstring(&name, name_string, 0, dt_mctx), @@ -550,8 +540,7 @@ test_name(const char *name_string, const dns_name_t *expected) } static void -algnamefromname_test(void **state) -{ +algnamefromname_test(void **state) { UNUSED(state); /* test the standard algorithms */ @@ -571,8 +560,7 @@ algnamefromname_test(void **state) /* Tests the dns__tsig_algallocated function */ static void -algallocated_test(void **state) -{ +algallocated_test(void **state) { UNUSED(state); /* test the standard algorithms */ @@ -591,8 +579,7 @@ algallocated_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(tsig_tcp_test, _setup, _teardown), @@ -611,8 +598,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/update_test.c b/lib/dns/tests/update_test.c index 7a52ded1bf..da4b065816 100644 --- a/lib/dns/tests/update_test.c +++ b/lib/dns/tests/update_test.c @@ -40,8 +40,7 @@ #include "../update.c" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -55,8 +54,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -67,8 +65,7 @@ _teardown(void **state) static uint32_t mystdtime; static void -set_mystdtime(int year, int month, int day) -{ +set_mystdtime(int year, int month, int day) { struct tm tm; memset(&tm, 0, sizeof(tm)); @@ -79,15 +76,13 @@ set_mystdtime(int year, int month, int day) } void -isc_stdtime_get(isc_stdtime_t *now) -{ +isc_stdtime_get(isc_stdtime_t *now) { *now = mystdtime; } /* simple increment by 1 */ static void -increment_test(void **state) -{ +increment_test(void **state) { uint32_t old = 50; uint32_t serial; @@ -101,8 +96,7 @@ increment_test(void **state) /* increment past zero, 0xfffffffff -> 1 */ static void -increment_past_zero_test(void **state) -{ +increment_past_zero_test(void **state) { uint32_t old = 0xffffffffu; uint32_t serial; @@ -116,8 +110,7 @@ increment_past_zero_test(void **state) /* past to unixtime */ static void -past_to_unix_test(void **state) -{ +past_to_unix_test(void **state) { uint32_t old; uint32_t serial; @@ -134,8 +127,7 @@ past_to_unix_test(void **state) /* now to unixtime */ static void -now_to_unix_test(void **state) -{ +now_to_unix_test(void **state) { uint32_t old; uint32_t serial; @@ -152,8 +144,7 @@ now_to_unix_test(void **state) /* future to unixtime */ static void -future_to_unix_test(void **state) -{ +future_to_unix_test(void **state) { uint32_t old; uint32_t serial; @@ -170,8 +161,7 @@ future_to_unix_test(void **state) /* undefined plus 1 to unixtime */ static void -undefined_plus1_to_unix_test(void **state) -{ +undefined_plus1_to_unix_test(void **state) { uint32_t old; uint32_t serial; @@ -189,8 +179,7 @@ undefined_plus1_to_unix_test(void **state) /* undefined minus 1 to unixtime */ static void -undefined_minus1_to_unix_test(void **state) -{ +undefined_minus1_to_unix_test(void **state) { uint32_t old; uint32_t serial; @@ -208,8 +197,7 @@ undefined_minus1_to_unix_test(void **state) /* undefined to unixtime */ static void -undefined_to_unix_test(void **state) -{ +undefined_to_unix_test(void **state) { uint32_t old; uint32_t serial; @@ -226,8 +214,7 @@ undefined_to_unix_test(void **state) /* handle unixtime being zero */ static void -unixtime_zero_test(void **state) -{ +unixtime_zero_test(void **state) { uint32_t old; uint32_t serial; @@ -244,8 +231,7 @@ unixtime_zero_test(void **state) /* past to date */ static void -past_to_date_test(void **state) -{ +past_to_date_test(void **state) { uint32_t old, serial; UNUSED(state); @@ -263,8 +249,7 @@ past_to_date_test(void **state) /* now to date */ static void -now_to_date_test(void **state) -{ +now_to_date_test(void **state) { uint32_t old; uint32_t serial; @@ -281,8 +266,7 @@ now_to_date_test(void **state) /* future to date */ static void -future_to_date_test(void **state) -{ +future_to_date_test(void **state) { uint32_t old; uint32_t serial; @@ -299,8 +283,7 @@ future_to_date_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(increment_test, _setup, _teardown), @@ -336,8 +319,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/zonemgr_test.c b/lib/dns/tests/zonemgr_test.c index 185942a40f..8414406bfe 100644 --- a/lib/dns/tests/zonemgr_test.c +++ b/lib/dns/tests/zonemgr_test.c @@ -34,8 +34,7 @@ #include "dnstest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -47,8 +46,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -58,10 +56,9 @@ _teardown(void **state) /* create zone manager */ static void -zonemgr_create(void **state) -{ +zonemgr_create(void **state) { dns_zonemgr_t *myzonemgr = NULL; - isc_result_t result; + isc_result_t result; UNUSED(state); @@ -76,11 +73,10 @@ zonemgr_create(void **state) /* manage and release a zone */ static void -zonemgr_managezone(void **state) -{ +zonemgr_managezone(void **state) { dns_zonemgr_t *myzonemgr = NULL; - dns_zone_t * zone = NULL; - isc_result_t result; + dns_zone_t *zone = NULL; + isc_result_t result; UNUSED(state); @@ -118,11 +114,10 @@ zonemgr_managezone(void **state) /* create and release a zone */ static void -zonemgr_createzone(void **state) -{ +zonemgr_createzone(void **state) { dns_zonemgr_t *myzonemgr = NULL; - dns_zone_t * zone = NULL; - isc_result_t result; + dns_zone_t *zone = NULL; + isc_result_t result; UNUSED(state); @@ -153,14 +148,13 @@ zonemgr_createzone(void **state) /* manage and release a zone */ static void -zonemgr_unreachable(void **state) -{ +zonemgr_unreachable(void **state) { dns_zonemgr_t *myzonemgr = NULL; - dns_zone_t * zone = NULL; + dns_zone_t *zone = NULL; isc_sockaddr_t addr1, addr2; struct in_addr in; - isc_result_t result; - isc_time_t now; + isc_result_t result; + isc_time_t now; UNUSED(state); @@ -241,8 +235,7 @@ zonemgr_unreachable(void **state) */ int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(zonemgr_create, _setup, _teardown), @@ -262,8 +255,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/tests/zt_test.c b/lib/dns/tests/zt_test.c index 4028d96fb4..bada937953 100644 --- a/lib/dns/tests/zt_test.c +++ b/lib/dns/tests/zt_test.c @@ -42,12 +42,11 @@ struct args { void *arg1; void *arg2; - bool arg3; + bool arg3; }; static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -59,8 +58,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); dns_test_end(); @@ -69,8 +67,7 @@ _teardown(void **state) } static isc_result_t -count_zone(dns_zone_t *zone, void *uap) -{ +count_zone(dns_zone_t *zone, void *uap) { int *nzones = (int *)uap; UNUSED(zone); @@ -80,8 +77,7 @@ count_zone(dns_zone_t *zone, void *uap) } static isc_result_t -load_done(dns_zt_t *zt, dns_zone_t *zone, isc_task_t *task) -{ +load_done(dns_zt_t *zt, dns_zone_t *zone, isc_task_t *task) { /* We treat zt as a pointer to a boolean for testing purposes */ atomic_bool *done = (atomic_bool *)zt; @@ -94,8 +90,7 @@ load_done(dns_zt_t *zt, dns_zone_t *zone, isc_task_t *task) } static isc_result_t -all_done(void *arg) -{ +all_done(void *arg) { atomic_bool *done = (atomic_bool *)arg; atomic_store(done, true); @@ -104,8 +99,7 @@ all_done(void *arg) } static void -start_zt_asyncload(isc_task_t *task, isc_event_t *event) -{ +start_zt_asyncload(isc_task_t *task, isc_event_t *event) { struct args *args = (struct args *)(event->ev_arg); UNUSED(task); @@ -116,8 +110,7 @@ start_zt_asyncload(isc_task_t *task, isc_event_t *event) } static void -start_zone_asyncload(isc_task_t *task, isc_event_t *event) -{ +start_zone_asyncload(isc_task_t *task, isc_event_t *event) { struct args *args = (struct args *)(event->ev_arg); UNUSED(task); @@ -128,12 +121,11 @@ start_zone_asyncload(isc_task_t *task, isc_event_t *event) /* apply a function to a zone table */ static void -apply(void **state) -{ +apply(void **state) { isc_result_t result; - dns_zone_t * zone = NULL; - dns_view_t * view = NULL; - int nzones = 0; + dns_zone_t *zone = NULL; + dns_view_t *view = NULL; + int nzones = 0; UNUSED(state); @@ -144,8 +136,8 @@ apply(void **state) assert_non_null(view->zonetable); assert_int_equal(nzones, 0); - result = - dns_zt_apply(view->zonetable, false, NULL, count_zone, &nzones); + result = dns_zt_apply(view->zonetable, false, NULL, count_zone, + &nzones); assert_int_equal(result, ISC_R_SUCCESS); assert_int_equal(nzones, 1); @@ -164,18 +156,17 @@ apply(void **state) /* asynchronous zone load */ static void -asyncload_zone(void **state) -{ +asyncload_zone(void **state) { isc_result_t result; - int n; - dns_zone_t * zone = NULL; - dns_view_t * view = NULL; - dns_db_t * db = NULL; - FILE * zonefile, *origfile; - char buf[4096]; - atomic_bool done; - int i = 0; - struct args args; + int n; + dns_zone_t *zone = NULL; + dns_view_t *view = NULL; + dns_db_t *db = NULL; + FILE *zonefile, *origfile; + char buf[4096]; + atomic_bool done; + int i = 0; + struct args args; UNUSED(state); @@ -274,16 +265,15 @@ asyncload_zone(void **state) /* asynchronous zone table load */ static void -asyncload_zt(void **state) -{ +asyncload_zt(void **state) { isc_result_t result; - dns_zone_t * zone1 = NULL, *zone2 = NULL, *zone3 = NULL; - dns_view_t * view; - dns_zt_t * zt = NULL; - dns_db_t * db = NULL; - atomic_bool done; - int i = 0; - struct args args; + dns_zone_t *zone1 = NULL, *zone2 = NULL, *zone3 = NULL; + dns_view_t *view; + dns_zt_t *zt = NULL; + dns_db_t *db = NULL; + atomic_bool done; + int i = 0; + struct args args; UNUSED(state); @@ -359,8 +349,7 @@ asyncload_zt(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(apply, _setup, _teardown), cmocka_unit_test_setup_teardown(asyncload_zone, _setup, @@ -377,8 +366,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/dns/time.c b/lib/dns/time.c index 523d304b01..5360d171b2 100644 --- a/lib/dns/time.c +++ b/lib/dns/time.c @@ -29,20 +29,19 @@ static const int days[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; isc_result_t -dns_time64_totext(int64_t t, isc_buffer_t *target) -{ +dns_time64_totext(int64_t t, isc_buffer_t *target) { struct tm tm; char buf[sizeof("!!!!!!YYYY!!!!!!!!MM!!!!!!!!DD!!!!!!!!HH!!!!!!!!MM!!!!" "!!!!SS")]; - int secs; + int secs; unsigned int l; isc_region_t region; /* * Warning. Do NOT use arguments with side effects with these macros. */ -#define is_leap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0) -#define year_secs(y) ((is_leap(y) ? 366 : 365) * 86400) +#define is_leap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0) +#define year_secs(y) ((is_leap(y) ? 366 : 365) * 86400) #define month_secs(m, y) ((days[m] + ((m == 1 && is_leap(y)) ? 1 : 0)) * 86400) tm.tm_year = 70; @@ -100,11 +99,10 @@ dns_time64_totext(int64_t t, isc_buffer_t *target) } int64_t -dns_time64_from32(uint32_t value) -{ +dns_time64_from32(uint32_t value) { isc_stdtime_t now; - int64_t start; - int64_t t; + int64_t start; + int64_t t; /* * Adjust the time to the closest epoch. This should be changed @@ -124,18 +122,16 @@ dns_time64_from32(uint32_t value) } isc_result_t -dns_time32_totext(uint32_t value, isc_buffer_t *target) -{ +dns_time32_totext(uint32_t value, isc_buffer_t *target) { return (dns_time64_totext(dns_time64_from32(value), target)); } isc_result_t -dns_time64_fromtext(const char *source, int64_t *target) -{ - int year, month, day, hour, minute, second; +dns_time64_fromtext(const char *source, int64_t *target) { + int year, month, day, hour, minute, second; int64_t value; - int secs; - int i; + int secs; + int i; #define RANGE(min, max, value) \ do { \ @@ -156,7 +152,8 @@ dns_time64_fromtext(const char *source, int64_t *target) } } if (sscanf(source, "%4d%2d%2d%2d%2d%2d", &year, &month, &day, &hour, - &minute, &second) != 6) { + &minute, &second) != 6) + { return (DNS_R_SYNTAX); } @@ -204,9 +201,8 @@ dns_time64_fromtext(const char *source, int64_t *target) } isc_result_t -dns_time32_fromtext(const char *source, uint32_t *target) -{ - int64_t value64; +dns_time32_fromtext(const char *source, uint32_t *target) { + int64_t value64; isc_result_t result; result = dns_time64_fromtext(source, &value64); if (result != ISC_R_SUCCESS) { diff --git a/lib/dns/timer.c b/lib/dns/timer.c index 9d76bc92cc..2ee8365515 100644 --- a/lib/dns/timer.c +++ b/lib/dns/timer.c @@ -29,11 +29,10 @@ isc_result_t dns_timer_setidle(isc_timer_t *timer, unsigned int maxtime, - unsigned int idletime, bool purge) -{ - isc_result_t result; + unsigned int idletime, bool purge) { + isc_result_t result; isc_interval_t maxinterval, idleinterval; - isc_time_t expires; + isc_time_t expires; /* Compute the time of expiry. */ isc_interval_set(&maxinterval, maxtime, 0); diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c index be0c33007e..504063e7a8 100644 --- a/lib/dns/tkey.c +++ b/lib/dns/tkey.c @@ -43,7 +43,7 @@ #include #include -#define TEMP_BUFFER_SZ 8192 +#define TEMP_BUFFER_SZ 8192 #define TKEY_RANDOM_AMOUNT 16 #if USE_PKCS11 @@ -57,12 +57,10 @@ 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, ...) -{ +tkey_log(const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -72,12 +70,11 @@ tkey_log(const char *fmt, ...) } static void -dumpmessage(dns_message_t *msg) -{ - isc_buffer_t outbuf; +dumpmessage(dns_message_t *msg) { + isc_buffer_t outbuf; unsigned char *output; - int len = TEMP_BUFFER_SZ; - isc_result_t result; + int len = TEMP_BUFFER_SZ; + isc_result_t result; for (;;) { output = isc_mem_get(msg->mctx, len); @@ -107,8 +104,7 @@ dumpmessage(dns_message_t *msg) } isc_result_t -dns_tkeyctx_create(isc_mem_t *mctx, dns_tkeyctx_t **tctxp) -{ +dns_tkeyctx_create(isc_mem_t *mctx, dns_tkeyctx_t **tctxp) { dns_tkeyctx_t *tctx; REQUIRE(mctx != NULL); @@ -127,9 +123,8 @@ dns_tkeyctx_create(isc_mem_t *mctx, dns_tkeyctx_t **tctxp) } void -dns_tkeyctx_destroy(dns_tkeyctx_t **tctxp) -{ - isc_mem_t * mctx; +dns_tkeyctx_destroy(dns_tkeyctx_t **tctxp) { + isc_mem_t *mctx; dns_tkeyctx_t *tctx; REQUIRE(tctxp != NULL && *tctxp != NULL); @@ -158,15 +153,14 @@ dns_tkeyctx_destroy(dns_tkeyctx_t **tctxp) static isc_result_t add_rdata_to_list(dns_message_t *msg, dns_name_t *name, dns_rdata_t *rdata, - uint32_t ttl, dns_namelist_t *namelist) -{ - isc_result_t result; - isc_region_t r, newr; - dns_rdata_t * newrdata = NULL; - dns_name_t * newname = NULL; + uint32_t ttl, dns_namelist_t *namelist) { + isc_result_t result; + isc_region_t r, newr; + dns_rdata_t *newrdata = NULL; + dns_name_t *newname = NULL; dns_rdatalist_t *newlist = NULL; - dns_rdataset_t * newset = NULL; - isc_buffer_t * tmprdatabuf = NULL; + dns_rdataset_t *newset = NULL; + isc_buffer_t *tmprdatabuf = NULL; RETERR(dns_message_gettemprdata(msg, &newrdata)); @@ -219,9 +213,8 @@ failure: } static void -free_namelist(dns_message_t *msg, dns_namelist_t *namelist) -{ - dns_name_t * name; +free_namelist(dns_message_t *msg, dns_namelist_t *namelist) { + dns_name_t *name; dns_rdataset_t *set; while (!ISC_LIST_EMPTY(*namelist)) { @@ -238,15 +231,14 @@ free_namelist(dns_message_t *msg, dns_namelist_t *namelist) static isc_result_t compute_secret(isc_buffer_t *shared, isc_region_t *queryrandomness, - isc_region_t *serverrandomness, isc_buffer_t *secret) -{ - isc_md_t * md; - isc_region_t r, r2; - unsigned char digests[ISC_MAX_MD_SIZE * 2]; + isc_region_t *serverrandomness, isc_buffer_t *secret) { + isc_md_t *md; + isc_region_t r, r2; + unsigned char digests[ISC_MAX_MD_SIZE * 2]; unsigned char *digest1, *digest2; - unsigned int digestslen, digestlen1 = 0, digestlen2 = 0; - unsigned int i; - isc_result_t result; + unsigned int digestslen, digestlen1 = 0, digestlen2 = 0; + unsigned int i; + isc_result_t result; isc_buffer_usedregion(shared, &r); @@ -350,21 +342,20 @@ static isc_result_t process_dhtkey(dns_message_t *msg, dns_name_t *signer, dns_name_t *name, dns_rdata_tkey_t *tkeyin, dns_tkeyctx_t *tctx, dns_rdata_tkey_t *tkeyout, dns_tsig_keyring_t *ring, - dns_namelist_t *namelist) -{ - isc_result_t result = ISC_R_SUCCESS; - dns_name_t * keyname, ourname; + dns_namelist_t *namelist) { + isc_result_t result = ISC_R_SUCCESS; + dns_name_t *keyname, ourname; dns_rdataset_t *keyset = NULL; - dns_rdata_t keyrdata = DNS_RDATA_INIT, ourkeyrdata = DNS_RDATA_INIT; - bool found_key = false, found_incompatible = false; - dst_key_t * pubkey = NULL; - isc_buffer_t ourkeybuf, *shared = NULL; - isc_region_t r, r2, ourkeyr; - unsigned char keydata[DST_KEY_MAXSIZE]; - unsigned int sharedsize; - isc_buffer_t secret; - unsigned char * randomdata = NULL, secretdata[256]; - dns_ttl_t ttl = 0; + dns_rdata_t keyrdata = DNS_RDATA_INIT, ourkeyrdata = DNS_RDATA_INIT; + bool found_key = false, found_incompatible = false; + dst_key_t *pubkey = NULL; + isc_buffer_t ourkeybuf, *shared = NULL; + isc_region_t r, r2, ourkeyr; + unsigned char keydata[DST_KEY_MAXSIZE]; + unsigned int sharedsize; + isc_buffer_t secret; + unsigned char *randomdata = NULL, secretdata[256]; + dns_ttl_t ttl = 0; if (tctx->dhkey == NULL) { tkey_log("process_dhtkey: tkey-dhkey not defined"); @@ -384,7 +375,8 @@ process_dhtkey(dns_message_t *msg, dns_name_t *signer, dns_name_t *name, */ for (result = dns_message_firstname(msg, DNS_SECTION_ADDITIONAL); result == ISC_R_SUCCESS && !found_key; - result = dns_message_nextname(msg, DNS_SECTION_ADDITIONAL)) { + result = dns_message_nextname(msg, DNS_SECTION_ADDITIONAL)) + { keyname = NULL; dns_message_currentname(msg, DNS_SECTION_ADDITIONAL, &keyname); keyset = NULL; @@ -396,7 +388,8 @@ process_dhtkey(dns_message_t *msg, dns_name_t *signer, dns_name_t *name, for (result = dns_rdataset_first(keyset); result == ISC_R_SUCCESS && !found_key; - result = dns_rdataset_next(keyset)) { + result = dns_rdataset_next(keyset)) + { dns_rdataset_current(keyset, &keyrdata); pubkey = NULL; result = dns_dnssec_keyfromrdata(keyname, &keyrdata, @@ -503,17 +496,16 @@ failure: static isc_result_t process_gsstkey(dns_message_t *msg, dns_name_t *name, dns_rdata_tkey_t *tkeyin, dns_tkeyctx_t *tctx, dns_rdata_tkey_t *tkeyout, - dns_tsig_keyring_t *ring) -{ - isc_result_t result = ISC_R_SUCCESS; - dst_key_t * dstkey = NULL; - dns_tsigkey_t * tsigkey = NULL; + dns_tsig_keyring_t *ring) { + isc_result_t result = ISC_R_SUCCESS; + dst_key_t *dstkey = NULL; + dns_tsigkey_t *tsigkey = NULL; dns_fixedname_t fixed; - dns_name_t * principal; - isc_stdtime_t now; - isc_region_t intoken; - isc_buffer_t * outtoken = NULL; - gss_ctx_id_t gss_ctx = NULL; + dns_name_t *principal; + isc_stdtime_t now; + isc_region_t intoken; + isc_buffer_t *outtoken = NULL; + gss_ctx_id_t gss_ctx = NULL; /* * You have to define either a gss credential (principal) to @@ -528,7 +520,8 @@ process_gsstkey(dns_message_t *msg, dns_name_t *name, dns_rdata_tkey_t *tkeyin, } if (!dns_name_equal(&tkeyin->algorithm, DNS_TSIG_GSSAPI_NAME) && - !dns_name_equal(&tkeyin->algorithm, DNS_TSIG_GSSAPIMS_NAME)) { + !dns_name_equal(&tkeyin->algorithm, DNS_TSIG_GSSAPIMS_NAME)) + { tkeyout->error = dns_tsigerror_badalg; tkey_log("process_gsstkey(): dns_tsigerror_badalg"); /* XXXSRA */ @@ -661,10 +654,9 @@ failure: static isc_result_t process_deletetkey(dns_name_t *signer, dns_name_t *name, dns_rdata_tkey_t *tkeyin, dns_rdata_tkey_t *tkeyout, - dns_tsig_keyring_t *ring) -{ - isc_result_t result; - dns_tsigkey_t * tsigkey = NULL; + dns_tsig_keyring_t *ring) { + isc_result_t result; + dns_tsigkey_t *tsigkey = NULL; const dns_name_t *identity; result = dns_tsigkey_find(&tsigkey, name, &tkeyin->algorithm, ring); @@ -698,18 +690,17 @@ process_deletetkey(dns_name_t *signer, dns_name_t *name, isc_result_t dns_tkey_processquery(dns_message_t *msg, dns_tkeyctx_t *tctx, - dns_tsig_keyring_t *ring) -{ - isc_result_t result = ISC_R_SUCCESS; + dns_tsig_keyring_t *ring) { + isc_result_t result = ISC_R_SUCCESS; dns_rdata_tkey_t tkeyin, tkeyout; - bool freetkeyin = false; - dns_name_t * qname, *name, *keyname, *signer, tsigner; - dns_fixedname_t fkeyname; - dns_rdataset_t * tkeyset; - dns_rdata_t rdata; - dns_namelist_t namelist; - char tkeyoutdata[512]; - isc_buffer_t tkeyoutbuf; + bool freetkeyin = false; + dns_name_t *qname, *name, *keyname, *signer, tsigner; + dns_fixedname_t fkeyname; + dns_rdataset_t *tkeyset; + dns_rdata_t rdata; + dns_namelist_t namelist; + char tkeyoutdata[512]; + isc_buffer_t tkeyoutbuf; REQUIRE(msg != NULL); REQUIRE(tctx != NULL); @@ -743,7 +734,8 @@ dns_tkey_processquery(dns_message_t *msg, dns_tkeyctx_t *tctx, name = NULL; if (dns_message_findname(msg, DNS_SECTION_ANSWER, qname, dns_rdatatype_tkey, 0, &name, - &tkeyset) != ISC_R_SUCCESS) { + &tkeyset) != ISC_R_SUCCESS) + { result = DNS_R_FORMERR; tkey_log("dns_tkey_processquery: couldn't find a TKEY " "matching the question"); @@ -811,8 +803,8 @@ dns_tkey_processquery(dns_message_t *msg, dns_tkeyctx_t *tctx, if (tkeyin.mode != DNS_TKEYMODE_DELETE) { dns_tsigkey_t *tsigkey = NULL; - if (tctx->domain == NULL && - tkeyin.mode != DNS_TKEYMODE_GSSAPI) { + if (tctx->domain == NULL && tkeyin.mode != DNS_TKEYMODE_GSSAPI) + { tkey_log("dns_tkey_processquery: tkey-domain not set"); result = DNS_R_REFUSED; goto failure; @@ -825,14 +817,14 @@ dns_tkey_processquery(dns_message_t *msg, dns_tkeyctx_t *tctx, dns_name_copynf(qname, keyname); dns_name_getlabelsequence(keyname, 0, n - 1, keyname); } else { - static char hexdigits[16] = { '0', '1', '2', '3', - '4', '5', '6', '7', - '8', '9', 'A', 'B', - 'C', 'D', 'E', 'F' }; + static char hexdigits[16] = { '0', '1', '2', '3', + '4', '5', '6', '7', + '8', '9', 'A', 'B', + 'C', 'D', 'E', 'F' }; unsigned char randomdata[16]; - char randomtext[32]; - isc_buffer_t b; - unsigned int i, j; + char randomtext[32]; + isc_buffer_t b; + unsigned int i, j; isc_nonce_buf(randomdata, sizeof(randomdata)); @@ -951,15 +943,14 @@ failure: static isc_result_t buildquery(dns_message_t *msg, const dns_name_t *name, dns_rdata_tkey_t *tkey, - bool win2k) -{ - dns_name_t * qname = NULL, *aname = NULL; - dns_rdataset_t * question = NULL, *tkeyset = NULL; + bool win2k) { + dns_name_t *qname = NULL, *aname = NULL; + dns_rdataset_t *question = NULL, *tkeyset = NULL; dns_rdatalist_t *tkeylist = NULL; - dns_rdata_t * rdata = NULL; - isc_buffer_t * dynbuf = NULL, *anamebuf = NULL, *qnamebuf = NULL; - isc_result_t result; - unsigned int len; + dns_rdata_t *rdata = NULL; + isc_buffer_t *dynbuf = NULL, *anamebuf = NULL, *qnamebuf = NULL; + isc_result_t result; + unsigned int len; REQUIRE(msg != NULL); REQUIRE(name != NULL); @@ -1041,17 +1032,16 @@ failure: isc_result_t dns_tkey_builddhquery(dns_message_t *msg, dst_key_t *key, const dns_name_t *name, const dns_name_t *algorithm, - isc_buffer_t *nonce, uint32_t lifetime) -{ + isc_buffer_t *nonce, uint32_t lifetime) { dns_rdata_tkey_t tkey; - dns_rdata_t * rdata = NULL; - isc_buffer_t * dynbuf = NULL; - isc_region_t r; - dns_name_t keyname; - dns_namelist_t namelist; - isc_result_t result; - isc_stdtime_t now; - dns_name_t * item; + dns_rdata_t *rdata = NULL; + isc_buffer_t *dynbuf = NULL; + isc_region_t r; + dns_name_t keyname; + dns_namelist_t namelist; + isc_result_t result; + isc_stdtime_t now; + dns_name_t *item; REQUIRE(msg != NULL); REQUIRE(key != NULL); @@ -1118,13 +1108,12 @@ isc_result_t dns_tkey_buildgssquery(dns_message_t *msg, const dns_name_t *name, const dns_name_t *gname, isc_buffer_t *intoken, uint32_t lifetime, gss_ctx_id_t *context, bool win2k, - isc_mem_t *mctx, char **err_message) -{ + isc_mem_t *mctx, char **err_message) { dns_rdata_tkey_t tkey; - isc_result_t result; - isc_stdtime_t now; - isc_buffer_t token; - unsigned char array[TEMP_BUFFER_SZ]; + isc_result_t result; + isc_stdtime_t now; + isc_buffer_t token; + unsigned char array[TEMP_BUFFER_SZ]; UNUSED(intoken); @@ -1167,8 +1156,7 @@ dns_tkey_buildgssquery(dns_message_t *msg, const dns_name_t *name, } isc_result_t -dns_tkey_builddeletequery(dns_message_t *msg, dns_tsigkey_t *key) -{ +dns_tkey_builddeletequery(dns_message_t *msg, dns_tsigkey_t *key) { dns_rdata_tkey_t tkey; REQUIRE(msg != NULL); @@ -1191,10 +1179,9 @@ dns_tkey_builddeletequery(dns_message_t *msg, dns_tsigkey_t *key) static isc_result_t find_tkey(dns_message_t *msg, dns_name_t **name, dns_rdata_t *rdata, - int section) -{ + int section) { dns_rdataset_t *tkeyset; - isc_result_t result; + isc_result_t result; result = dns_message_firstname(msg, section); while (result == ISC_R_SUCCESS) { @@ -1222,20 +1209,19 @@ find_tkey(dns_message_t *msg, dns_name_t **name, dns_rdata_t *rdata, isc_result_t dns_tkey_processdhresponse(dns_message_t *qmsg, dns_message_t *rmsg, dst_key_t *key, isc_buffer_t *nonce, - dns_tsigkey_t **outkey, dns_tsig_keyring_t *ring) -{ + dns_tsigkey_t **outkey, dns_tsig_keyring_t *ring) { dns_rdata_t qtkeyrdata = DNS_RDATA_INIT, rtkeyrdata = DNS_RDATA_INIT; - dns_name_t keyname, *tkeyname, *theirkeyname, *ourkeyname, *tempname; - dns_rdataset_t * theirkeyset = NULL, *ourkeyset = NULL; - dns_rdata_t theirkeyrdata = DNS_RDATA_INIT; - dst_key_t * theirkey = NULL; + dns_name_t keyname, *tkeyname, *theirkeyname, *ourkeyname, *tempname; + dns_rdataset_t *theirkeyset = NULL, *ourkeyset = NULL; + dns_rdata_t theirkeyrdata = DNS_RDATA_INIT; + dst_key_t *theirkey = NULL; dns_rdata_tkey_t qtkey, rtkey; - unsigned char secretdata[256]; - unsigned int sharedsize; - isc_buffer_t * shared = NULL, secret; - isc_region_t r, r2; - isc_result_t result; - bool freertkey = false; + unsigned char secretdata[256]; + unsigned int sharedsize; + isc_buffer_t *shared = NULL, secret; + isc_region_t r, r2; + isc_result_t result; + bool freertkey = false; REQUIRE(qmsg != NULL); REQUIRE(rmsg != NULL); @@ -1260,7 +1246,8 @@ dns_tkey_processdhresponse(dns_message_t *qmsg, dns_message_t *rmsg, rtkey.mode != DNS_TKEYMODE_DIFFIEHELLMAN || rtkey.mode != qtkey.mode || !dns_name_equal(&rtkey.algorithm, &qtkey.algorithm) || - rmsg->rcode != dns_rcode_noerror) { + rmsg->rcode != dns_rcode_noerror) + { tkey_log("dns_tkey_processdhresponse: tkey mode invalid " "or error set(1)"); result = DNS_R_INVALIDTKEY; @@ -1355,15 +1342,14 @@ isc_result_t dns_tkey_processgssresponse(dns_message_t *qmsg, dns_message_t *rmsg, const dns_name_t *gname, gss_ctx_id_t *context, isc_buffer_t *outtoken, dns_tsigkey_t **outkey, - dns_tsig_keyring_t *ring, char **err_message) -{ + dns_tsig_keyring_t *ring, char **err_message) { dns_rdata_t rtkeyrdata = DNS_RDATA_INIT, qtkeyrdata = DNS_RDATA_INIT; dns_name_t *tkeyname; dns_rdata_tkey_t rtkey, qtkey; - dst_key_t * dstkey = NULL; - isc_buffer_t intoken; - isc_result_t result; - unsigned char array[TEMP_BUFFER_SZ]; + dst_key_t *dstkey = NULL; + isc_buffer_t intoken; + isc_result_t result; + unsigned char array[TEMP_BUFFER_SZ]; REQUIRE(outtoken != NULL); REQUIRE(qmsg != NULL); @@ -1385,8 +1371,8 @@ dns_tkey_processgssresponse(dns_message_t *qmsg, dns_message_t *rmsg, * specifies it should be in the ADDITIONAL section. Check first * where it should be, and then where it may be. */ - result = - find_tkey(qmsg, &tkeyname, &qtkeyrdata, DNS_SECTION_ADDITIONAL); + result = find_tkey(qmsg, &tkeyname, &qtkeyrdata, + DNS_SECTION_ADDITIONAL); if (result == ISC_R_NOTFOUND) { result = find_tkey(qmsg, &tkeyname, &qtkeyrdata, DNS_SECTION_ANSWER); @@ -1399,7 +1385,8 @@ dns_tkey_processgssresponse(dns_message_t *qmsg, dns_message_t *rmsg, if (rtkey.error != dns_rcode_noerror || rtkey.mode != DNS_TKEYMODE_GSSAPI || - !dns_name_equal(&rtkey.algorithm, &qtkey.algorithm)) { + !dns_name_equal(&rtkey.algorithm, &qtkey.algorithm)) + { tkey_log("dns_tkey_processgssresponse: tkey mode invalid " "or error set(2) %d", rtkey.error); @@ -1436,13 +1423,12 @@ failure: isc_result_t dns_tkey_processdeleteresponse(dns_message_t *qmsg, dns_message_t *rmsg, - dns_tsig_keyring_t *ring) -{ + dns_tsig_keyring_t *ring) { dns_rdata_t qtkeyrdata = DNS_RDATA_INIT, rtkeyrdata = DNS_RDATA_INIT; dns_name_t *tkeyname, *tempname; dns_rdata_tkey_t qtkey, rtkey; - dns_tsigkey_t * tsigkey = NULL; - isc_result_t result; + dns_tsigkey_t *tsigkey = NULL; + isc_result_t result; REQUIRE(qmsg != NULL); REQUIRE(rmsg != NULL); @@ -1460,7 +1446,8 @@ dns_tkey_processdeleteresponse(dns_message_t *qmsg, dns_message_t *rmsg, if (rtkey.error != dns_rcode_noerror || rtkey.mode != DNS_TKEYMODE_DELETE || rtkey.mode != qtkey.mode || !dns_name_equal(&rtkey.algorithm, &qtkey.algorithm) || - rmsg->rcode != dns_rcode_noerror) { + rmsg->rcode != dns_rcode_noerror) + { tkey_log("dns_tkey_processdeleteresponse: tkey mode invalid " "or error set(3)"); result = DNS_R_INVALIDTKEY; @@ -1492,16 +1479,15 @@ isc_result_t dns_tkey_gssnegotiate(dns_message_t *qmsg, dns_message_t *rmsg, const dns_name_t *server, gss_ctx_id_t *context, dns_tsigkey_t **outkey, dns_tsig_keyring_t *ring, - bool win2k, char **err_message) -{ + bool win2k, char **err_message) { dns_rdata_t rtkeyrdata = DNS_RDATA_INIT, qtkeyrdata = DNS_RDATA_INIT; dns_name_t *tkeyname; dns_rdata_tkey_t rtkey, qtkey, tkey; - isc_buffer_t intoken, outtoken; - dst_key_t * dstkey = NULL; - isc_result_t result; - unsigned char array[TEMP_BUFFER_SZ]; - bool freertkey = false; + isc_buffer_t intoken, outtoken; + dst_key_t *dstkey = NULL; + isc_result_t result; + unsigned char array[TEMP_BUFFER_SZ]; + bool freertkey = false; REQUIRE(qmsg != NULL); REQUIRE(rmsg != NULL); @@ -1530,7 +1516,8 @@ dns_tkey_gssnegotiate(dns_message_t *qmsg, dns_message_t *rmsg, if (rtkey.error != dns_rcode_noerror || rtkey.mode != DNS_TKEYMODE_GSSAPI || - !dns_name_equal(&rtkey.algorithm, &qtkey.algorithm)) { + !dns_name_equal(&rtkey.algorithm, &qtkey.algorithm)) + { tkey_log("dns_tkey_processdhresponse: tkey mode invalid " "or error set(4)"); result = DNS_R_INVALIDTKEY; diff --git a/lib/dns/tsec.c b/lib/dns/tsec.c index c597e49b08..05e2e27935 100644 --- a/lib/dns/tsec.c +++ b/lib/dns/tsec.c @@ -19,7 +19,7 @@ #include #include -#define DNS_TSEC_MAGIC ISC_MAGIC('T', 's', 'e', 'c') +#define DNS_TSEC_MAGIC ISC_MAGIC('T', 's', 'e', 'c') #define DNS_TSEC_VALID(t) ISC_MAGIC_VALID(t, DNS_TSEC_MAGIC) /*% @@ -27,22 +27,21 @@ * multiple threads, and so the structure does not contain a lock. */ struct dns_tsec { - unsigned int magic; + unsigned int magic; dns_tsectype_t type; - isc_mem_t * mctx; + isc_mem_t *mctx; union { dns_tsigkey_t *tsigkey; - dst_key_t * key; + dst_key_t *key; } ukey; }; isc_result_t dns_tsec_create(isc_mem_t *mctx, dns_tsectype_t type, dst_key_t *key, - dns_tsec_t **tsecp) -{ - isc_result_t result; - dns_tsec_t * tsec; - dns_tsigkey_t * tsigkey = NULL; + dns_tsec_t **tsecp) { + isc_result_t result; + dns_tsec_t *tsec; + dns_tsigkey_t *tsigkey = NULL; const dns_name_t *algname; REQUIRE(mctx != NULL); @@ -102,8 +101,7 @@ dns_tsec_create(isc_mem_t *mctx, dns_tsectype_t type, dst_key_t *key, } void -dns_tsec_destroy(dns_tsec_t **tsecp) -{ +dns_tsec_destroy(dns_tsec_t **tsecp) { dns_tsec_t *tsec; REQUIRE(tsecp != NULL && *tsecp != NULL); @@ -128,16 +126,14 @@ dns_tsec_destroy(dns_tsec_t **tsecp) } dns_tsectype_t -dns_tsec_gettype(dns_tsec_t *tsec) -{ +dns_tsec_gettype(dns_tsec_t *tsec) { REQUIRE(DNS_TSEC_VALID(tsec)); return (tsec->type); } void -dns_tsec_getkey(dns_tsec_t *tsec, void *keyp) -{ +dns_tsec_getkey(dns_tsec_t *tsec, void *keyp) { REQUIRE(DNS_TSEC_VALID(tsec)); REQUIRE(keyp != NULL); diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c index 979b7afa32..017c701bcb 100644 --- a/lib/dns/tsig.c +++ b/lib/dns/tsig.c @@ -41,7 +41,7 @@ #include #include -#define TSIG_MAGIC ISC_MAGIC('T', 'S', 'I', 'G') +#define TSIG_MAGIC ISC_MAGIC('T', 'S', 'I', 'G') #define VALID_TSIG_KEY(x) ISC_MAGIC_VALID(x, TSIG_MAGIC) #ifndef DNS_TSIG_MAXGENERATEDKEYS @@ -55,59 +55,59 @@ static unsigned char hmacmd5_ndata[] = "\010hmac-md5\007sig-alg\003reg\003int"; static unsigned char hmacmd5_offsets[] = { 0, 9, 17, 21, 25 }; -static dns_name_t const hmacmd5 = - DNS_NAME_INITABSOLUTE(hmacmd5_ndata, hmacmd5_offsets); +static dns_name_t const hmacmd5 = DNS_NAME_INITABSOLUTE(hmacmd5_ndata, + hmacmd5_offsets); LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacmd5_name = &hmacmd5; -static unsigned char gsstsig_ndata[] = "\010gss-tsig"; -static unsigned char gsstsig_offsets[] = { 0, 9 }; -static dns_name_t const gsstsig = - DNS_NAME_INITABSOLUTE(gsstsig_ndata, gsstsig_offsets); +static unsigned char gsstsig_ndata[] = "\010gss-tsig"; +static unsigned char gsstsig_offsets[] = { 0, 9 }; +static dns_name_t const gsstsig = DNS_NAME_INITABSOLUTE(gsstsig_ndata, + gsstsig_offsets); LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_gssapi_name = &gsstsig; /* * Since Microsoft doesn't follow its own standard, we will use this * alternate name as a second guess. */ -static unsigned char gsstsigms_ndata[] = "\003gss\011microsoft\003com"; -static unsigned char gsstsigms_offsets[] = { 0, 4, 14, 18 }; -static dns_name_t const gsstsigms = - DNS_NAME_INITABSOLUTE(gsstsigms_ndata, gsstsigms_offsets); +static unsigned char gsstsigms_ndata[] = "\003gss\011microsoft\003com"; +static unsigned char gsstsigms_offsets[] = { 0, 4, 14, 18 }; +static dns_name_t const gsstsigms = DNS_NAME_INITABSOLUTE(gsstsigms_ndata, + gsstsigms_offsets); LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_gssapims_name = &gsstsigms; -static unsigned char hmacsha1_ndata[] = "\011hmac-sha1"; -static unsigned char hmacsha1_offsets[] = { 0, 10 }; -static dns_name_t const hmacsha1 = - DNS_NAME_INITABSOLUTE(hmacsha1_ndata, hmacsha1_offsets); +static unsigned char hmacsha1_ndata[] = "\011hmac-sha1"; +static unsigned char hmacsha1_offsets[] = { 0, 10 }; +static dns_name_t const hmacsha1 = DNS_NAME_INITABSOLUTE(hmacsha1_ndata, + hmacsha1_offsets); LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha1_name = &hmacsha1; -static unsigned char hmacsha224_ndata[] = "\013hmac-sha224"; -static unsigned char hmacsha224_offsets[] = { 0, 12 }; -static dns_name_t const hmacsha224 = - DNS_NAME_INITABSOLUTE(hmacsha224_ndata, hmacsha224_offsets); +static unsigned char hmacsha224_ndata[] = "\013hmac-sha224"; +static unsigned char hmacsha224_offsets[] = { 0, 12 }; +static dns_name_t const hmacsha224 = DNS_NAME_INITABSOLUTE(hmacsha224_ndata, + hmacsha224_offsets); LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha224_name = &hmacsha224; -static unsigned char hmacsha256_ndata[] = "\013hmac-sha256"; -static unsigned char hmacsha256_offsets[] = { 0, 12 }; -static dns_name_t const hmacsha256 = - DNS_NAME_INITABSOLUTE(hmacsha256_ndata, hmacsha256_offsets); +static unsigned char hmacsha256_ndata[] = "\013hmac-sha256"; +static unsigned char hmacsha256_offsets[] = { 0, 12 }; +static dns_name_t const hmacsha256 = DNS_NAME_INITABSOLUTE(hmacsha256_ndata, + hmacsha256_offsets); LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha256_name = &hmacsha256; -static unsigned char hmacsha384_ndata[] = "\013hmac-sha384"; -static unsigned char hmacsha384_offsets[] = { 0, 12 }; -static dns_name_t const hmacsha384 = - DNS_NAME_INITABSOLUTE(hmacsha384_ndata, hmacsha384_offsets); +static unsigned char hmacsha384_ndata[] = "\013hmac-sha384"; +static unsigned char hmacsha384_offsets[] = { 0, 12 }; +static dns_name_t const hmacsha384 = DNS_NAME_INITABSOLUTE(hmacsha384_ndata, + hmacsha384_offsets); LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha384_name = &hmacsha384; -static unsigned char hmacsha512_ndata[] = "\013hmac-sha512"; -static unsigned char hmacsha512_offsets[] = { 0, 12 }; -static dns_name_t const hmacsha512 = - DNS_NAME_INITABSOLUTE(hmacsha512_ndata, hmacsha512_offsets); +static unsigned char hmacsha512_ndata[] = "\013hmac-sha512"; +static unsigned char hmacsha512_offsets[] = { 0, 12 }; +static dns_name_t const hmacsha512 = DNS_NAME_INITABSOLUTE(hmacsha512_ndata, + hmacsha512_offsets); LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha512_name = &hmacsha512; static const struct { const dns_name_t *name; - unsigned int dstalg; + unsigned int dstalg; } known_algs[] = { { &hmacmd5, DST_ALG_HMACMD5 }, { &gsstsig, DST_ALG_GSSAPI }, { &gsstsigms, DST_ALG_GSSAPI }, @@ -117,33 +117,27 @@ 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) -{ +dns__tsig_algvalid(unsigned int alg) { return (alg == DST_ALG_HMACMD5 || alg == DST_ALG_HMACSHA1 || alg == DST_ALG_HMACSHA224 || alg == DST_ALG_HMACSHA256 || alg == DST_ALG_HMACSHA384 || alg == DST_ALG_HMACSHA512); } static void -tsig_log(dns_tsigkey_t *key, int level, const char *fmt, ...) -{ +tsig_log(dns_tsigkey_t *key, int level, const char *fmt, ...) { va_list ap; - char message[4096]; - char namestr[DNS_NAME_FORMATSIZE]; - char creatorstr[DNS_NAME_FORMATSIZE]; + char message[4096]; + char namestr[DNS_NAME_FORMATSIZE]; + char creatorstr[DNS_NAME_FORMATSIZE]; if (isc_log_wouldlog(dns_lctx, level) == false) { return; @@ -176,8 +170,7 @@ tsig_log(dns_tsigkey_t *key, int level, const char *fmt, ...) } static void -remove_fromring(dns_tsigkey_t *tkey) -{ +remove_fromring(dns_tsigkey_t *tkey) { if (tkey->generated) { ISC_LIST_UNLINK(tkey->ring->lru, tkey, link); tkey->ring->generated--; @@ -186,16 +179,15 @@ remove_fromring(dns_tsigkey_t *tkey) } static void -adjust_lru(dns_tsigkey_t *tkey) -{ +adjust_lru(dns_tsigkey_t *tkey) { if (tkey->generated) { RWLOCK(&tkey->ring->lock, isc_rwlocktype_write); /* * We may have been removed from the LRU list between * removing the read lock and aquiring the write lock. */ - if (ISC_LINK_LINKED(tkey, link) && - tkey->ring->lru.tail != tkey) { + if (ISC_LINK_LINKED(tkey, link) && tkey->ring->lru.tail != tkey) + { ISC_LIST_UNLINK(tkey->ring->lru, tkey, link); ISC_LIST_APPEND(tkey->ring->lru, tkey, link); } @@ -212,8 +204,7 @@ adjust_lru(dns_tsigkey_t *tkey) */ static isc_result_t keyring_add(dns_tsig_keyring_t *ring, const dns_name_t *name, - dns_tsigkey_t *tkey) -{ + dns_tsigkey_t *tkey) { isc_result_t result; RWLOCK(&ring->lock, isc_rwlocktype_write); @@ -249,12 +240,11 @@ dns_tsigkey_createfromkey(const dns_name_t *name, const dns_name_t *algorithm, dst_key_t *dstkey, bool generated, const dns_name_t *creator, isc_stdtime_t inception, isc_stdtime_t expire, isc_mem_t *mctx, - dns_tsig_keyring_t *ring, dns_tsigkey_t **key) -{ + dns_tsig_keyring_t *ring, dns_tsigkey_t **key) { dns_tsigkey_t *tkey; - isc_result_t ret; - unsigned int refs = 0; - unsigned int dstalg = 0; + isc_result_t ret; + unsigned int refs = 0; + unsigned int dstalg = 0; REQUIRE(key == NULL || *key == NULL); REQUIRE(name != NULL); @@ -384,16 +374,15 @@ cleanup_name: * Find a few nodes to destroy if possible. */ static void -cleanup_ring(dns_tsig_keyring_t *ring) -{ - isc_result_t result; +cleanup_ring(dns_tsig_keyring_t *ring) { + isc_result_t result; dns_rbtnodechain_t chain; - dns_name_t foundname; - dns_fixedname_t fixedorigin; - dns_name_t * origin; - isc_stdtime_t now; - dns_rbtnode_t * node; - dns_tsigkey_t * tkey; + dns_name_t foundname; + dns_fixedname_t fixedorigin; + dns_name_t *origin; + isc_stdtime_t now; + dns_rbtnode_t *node; + dns_tsigkey_t *tkey; /* * Start up a new iterator each time. @@ -418,7 +407,8 @@ again: if (tkey->generated && isc_refcount_current(&tkey->refs) == 1 && tkey->inception != tkey->expire && - tkey->expire < now) { + tkey->expire < now) + { tsig_log(tkey, 2, "tsig expire: deleting"); /* delete the key */ dns_rbtnodechain_invalidate(&chain); @@ -435,8 +425,7 @@ again: } static void -destroyring(dns_tsig_keyring_t *ring) -{ +destroyring(dns_tsig_keyring_t *ring) { isc_refcount_destroy(&ring->references); dns_rbt_destroy(&ring->keys); isc_rwlock_destroy(&ring->lock); @@ -447,8 +436,7 @@ destroyring(dns_tsig_keyring_t *ring) * Look up the DST_ALG_ constant for a given name. */ unsigned int -dns__tsig_algfromname(const dns_name_t *algorithm) -{ +dns__tsig_algfromname(const dns_name_t *algorithm) { int i; int n = sizeof(known_algs) / sizeof(*known_algs); for (i = 0; i < n; ++i) { @@ -465,8 +453,7 @@ dns__tsig_algfromname(const dns_name_t *algorithm) * corresponding pre-defined dns_name_t structure. */ const dns_name_t * -dns__tsig_algnamefromname(const dns_name_t *algorithm) -{ +dns__tsig_algnamefromname(const dns_name_t *algorithm) { int i; int n = sizeof(known_algs) / sizeof(*known_algs); for (i = 0; i < n; ++i) { @@ -487,8 +474,7 @@ dns__tsig_algnamefromname(const dns_name_t *algorithm) * dns_name_t that happens to match one of the pre-defined names. */ bool -dns__tsig_algallocated(const dns_name_t *algorithm) -{ +dns__tsig_algallocated(const dns_name_t *algorithm) { int i; int n = sizeof(known_algs) / sizeof(*known_algs); for (i = 0; i < n; ++i) { @@ -501,20 +487,19 @@ dns__tsig_algallocated(const dns_name_t *algorithm) } static isc_result_t -restore_key(dns_tsig_keyring_t *ring, isc_stdtime_t now, FILE *fp) -{ - dst_key_t * dstkey = NULL; - char namestr[1024]; - char creatorstr[1024]; - char algorithmstr[1024]; - char keystr[4096]; - unsigned int inception, expire; - int n; - isc_buffer_t b; - dns_name_t * name, *creator, *algorithm; +restore_key(dns_tsig_keyring_t *ring, isc_stdtime_t now, FILE *fp) { + dst_key_t *dstkey = NULL; + char namestr[1024]; + char creatorstr[1024]; + char algorithmstr[1024]; + char keystr[4096]; + unsigned int inception, expire; + int n; + isc_buffer_t b; + dns_name_t *name, *creator, *algorithm; dns_fixedname_t fname, fcreator, falgorithm; - isc_result_t result; - unsigned int dstalg; + isc_result_t result; + unsigned int dstalg; n = fscanf(fp, "%1023s %1023s %u %u %1023s %4095s\n", namestr, creatorstr, &inception, &expire, algorithmstr, keystr); @@ -575,13 +560,12 @@ restore_key(dns_tsig_keyring_t *ring, isc_stdtime_t now, FILE *fp) } static void -dump_key(dns_tsigkey_t *tkey, FILE *fp) -{ - char * buffer = NULL; - int length = 0; - char namestr[DNS_NAME_FORMATSIZE]; - char creatorstr[DNS_NAME_FORMATSIZE]; - char algorithmstr[DNS_NAME_FORMATSIZE]; +dump_key(dns_tsigkey_t *tkey, FILE *fp) { + char *buffer = NULL; + int length = 0; + char namestr[DNS_NAME_FORMATSIZE]; + char creatorstr[DNS_NAME_FORMATSIZE]; + char algorithmstr[DNS_NAME_FORMATSIZE]; isc_result_t result; REQUIRE(tkey != NULL); @@ -602,16 +586,15 @@ dump_key(dns_tsigkey_t *tkey, FILE *fp) } isc_result_t -dns_tsigkeyring_dumpanddetach(dns_tsig_keyring_t **ringp, FILE *fp) -{ - isc_result_t result; - dns_rbtnodechain_t chain; - dns_name_t foundname; - dns_fixedname_t fixedorigin; - dns_name_t * origin; - isc_stdtime_t now; - dns_rbtnode_t * node; - dns_tsigkey_t * tkey; +dns_tsigkeyring_dumpanddetach(dns_tsig_keyring_t **ringp, FILE *fp) { + isc_result_t result; + dns_rbtnodechain_t chain; + dns_name_t foundname; + dns_fixedname_t fixedorigin; + dns_name_t *origin; + isc_stdtime_t now; + dns_rbtnode_t *node; + dns_tsigkey_t *tkey; dns_tsig_keyring_t *ring; REQUIRE(ringp != NULL && *ringp != NULL); @@ -656,8 +639,7 @@ destroy: } const dns_name_t * -dns_tsigkey_identity(const dns_tsigkey_t *tsigkey) -{ +dns_tsigkey_identity(const dns_tsigkey_t *tsigkey) { REQUIRE(tsigkey == NULL || VALID_TSIG_KEY(tsigkey)); if (tsigkey == NULL) { @@ -675,9 +657,8 @@ dns_tsigkey_create(const dns_name_t *name, const dns_name_t *algorithm, unsigned char *secret, int length, bool generated, const dns_name_t *creator, isc_stdtime_t inception, isc_stdtime_t expire, isc_mem_t *mctx, - dns_tsig_keyring_t *ring, dns_tsigkey_t **key) -{ - dst_key_t * dstkey = NULL; + dns_tsig_keyring_t *ring, dns_tsigkey_t **key) { + dst_key_t *dstkey = NULL; isc_result_t result; unsigned int dstalg = 0; @@ -715,8 +696,7 @@ dns_tsigkey_create(const dns_name_t *name, const dns_name_t *algorithm, } void -dns_tsigkey_attach(dns_tsigkey_t *source, dns_tsigkey_t **targetp) -{ +dns_tsigkey_attach(dns_tsigkey_t *source, dns_tsigkey_t **targetp) { REQUIRE(VALID_TSIG_KEY(source)); REQUIRE(targetp != NULL && *targetp == NULL); @@ -725,8 +705,7 @@ dns_tsigkey_attach(dns_tsigkey_t *source, dns_tsigkey_t **targetp) } static void -tsigkey_free(dns_tsigkey_t *key) -{ +tsigkey_free(dns_tsigkey_t *key) { REQUIRE(VALID_TSIG_KEY(key)); key->magic = 0; @@ -748,8 +727,7 @@ tsigkey_free(dns_tsigkey_t *key) } void -dns_tsigkey_detach(dns_tsigkey_t **keyp) -{ +dns_tsigkey_detach(dns_tsigkey_t **keyp) { REQUIRE(keyp != NULL && VALID_TSIG_KEY(*keyp)); dns_tsigkey_t *key = *keyp; *keyp = NULL; @@ -761,8 +739,7 @@ dns_tsigkey_detach(dns_tsigkey_t **keyp) } void -dns_tsigkey_setdeleted(dns_tsigkey_t *key) -{ +dns_tsigkey_setdeleted(dns_tsigkey_t *key) { REQUIRE(VALID_TSIG_KEY(key)); REQUIRE(key->ring != NULL); @@ -772,25 +749,24 @@ dns_tsigkey_setdeleted(dns_tsigkey_t *key) } isc_result_t -dns_tsig_sign(dns_message_t *msg) -{ - dns_tsigkey_t * key = NULL; +dns_tsig_sign(dns_message_t *msg) { + dns_tsigkey_t *key = NULL; dns_rdata_any_tsig_t tsig, querytsig; - unsigned char data[128]; - isc_buffer_t databuf, sigbuf; - isc_buffer_t * dynbuf = NULL; - dns_name_t * owner; - dns_rdata_t * rdata = NULL; - dns_rdatalist_t * datalist = NULL; - dns_rdataset_t * dataset = NULL; - isc_region_t r; - isc_stdtime_t now; - isc_mem_t * mctx; - dst_context_t * ctx = NULL; - isc_result_t ret; - unsigned char badtimedata[BADTIMELEN]; - unsigned int sigsize = 0; - bool response; + unsigned char data[128]; + isc_buffer_t databuf, sigbuf; + isc_buffer_t *dynbuf = NULL; + dns_name_t *owner; + dns_rdata_t *rdata = NULL; + dns_rdatalist_t *datalist = NULL; + dns_rdataset_t *dataset = NULL; + isc_region_t r; + isc_stdtime_t now; + isc_mem_t *mctx; + dst_context_t *ctx = NULL; + isc_result_t ret; + unsigned char badtimedata[BADTIMELEN]; + unsigned int sigsize = 0; + bool response; REQUIRE(msg != NULL); key = dns_message_gettsigkey(msg); @@ -843,11 +819,12 @@ dns_tsig_sign(dns_message_t *msg) } if ((key->key != NULL) && (tsig.error != dns_tsigerror_badsig) && - (tsig.error != dns_tsigerror_badkey)) { + (tsig.error != dns_tsigerror_badkey)) + { unsigned char header[DNS_MESSAGE_HEADERLEN]; - isc_buffer_t headerbuf; - uint16_t digestbits; - bool querytsig_ok = false; + isc_buffer_t headerbuf; + uint16_t digestbits; + bool querytsig_ok = false; /* * If it is a response, we assume that the request MAC @@ -1087,25 +1064,24 @@ cleanup_context: isc_result_t dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, - dns_tsig_keyring_t *ring1, dns_tsig_keyring_t *ring2) -{ + dns_tsig_keyring_t *ring1, dns_tsig_keyring_t *ring2) { dns_rdata_any_tsig_t tsig, querytsig; - isc_region_t r, source_r, header_r, sig_r; - isc_buffer_t databuf; - unsigned char data[32]; - dns_name_t * keyname; - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_stdtime_t now; - isc_result_t ret; - dns_tsigkey_t * tsigkey; - dst_key_t * key = NULL; - unsigned char header[DNS_MESSAGE_HEADERLEN]; - dst_context_t * ctx = NULL; - isc_mem_t * mctx; - uint16_t addcount, id; - unsigned int siglen; - unsigned int alg; - bool response; + isc_region_t r, source_r, header_r, sig_r; + isc_buffer_t databuf; + unsigned char data[32]; + dns_name_t *keyname; + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_stdtime_t now; + isc_result_t ret; + dns_tsigkey_t *tsigkey; + dst_key_t *key = NULL; + unsigned char header[DNS_MESSAGE_HEADERLEN]; + dst_context_t *ctx = NULL; + isc_mem_t *mctx; + uint16_t addcount, id; + unsigned int siglen; + unsigned int alg; + bool response; REQUIRE(source != NULL); REQUIRE(DNS_MESSAGE_VALID(msg)); @@ -1173,7 +1149,8 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, (__clang_major__ == 3 && __clang_minor__ < 2) || \ (__clang_major__ == 4 && __clang_minor__ < 2)) /* false positive: http://llvm.org/bugs/show_bug.cgi?id=14461 */ - else { + else + { memset(&querytsig, 0, sizeof(querytsig)); } #endif /* if defined(__clang__) && (__clang_major__ < 3 || (__clang_major__ == \ @@ -1186,7 +1163,8 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, */ if (response && (!dns_name_equal(keyname, &tsigkey->name) || - !dns_name_equal(&tsig.algorithm, &querytsig.algorithm))) { + !dns_name_equal(&tsig.algorithm, &querytsig.algorithm))) + { msg->tsigstatus = dns_tsigerror_badkey; tsig_log(msg->tsigkey, 2, "key name and algorithm do not match"); @@ -1378,7 +1356,8 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, } msg->verified_sig = 1; } else if (tsig.error != dns_tsigerror_badsig && - tsig.error != dns_tsigerror_badkey) { + tsig.error != dns_tsigerror_badkey) + { tsig_log(msg->tsigkey, 2, "signature was empty"); return (DNS_R_TSIGVERIFYFAILURE); } @@ -1416,8 +1395,8 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, ret = DNS_R_TSIGVERIFYFAILURE; goto cleanup_context; } - if (tsig.siglen > 0 && digestbits == 0 && - tsig.siglen < siglen) { + if (tsig.siglen > 0 && digestbits == 0 && tsig.siglen < siglen) + { msg->tsigstatus = dns_tsigerror_badtrunc; tsig_log(msg->tsigkey, 2, "signature length too small"); ret = DNS_R_TSIGVERIFYFAILURE; @@ -1447,24 +1426,23 @@ cleanup_context: } static isc_result_t -tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) -{ +tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) { dns_rdata_any_tsig_t tsig, querytsig; - isc_region_t r, source_r, header_r, sig_r; - isc_buffer_t databuf; - unsigned char data[32]; - dns_name_t * keyname; - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_stdtime_t now; - isc_result_t ret; - dns_tsigkey_t * tsigkey; - dst_key_t * key = NULL; - unsigned char header[DNS_MESSAGE_HEADERLEN]; - uint16_t addcount, id; - bool has_tsig = false; - isc_mem_t * mctx; - unsigned int siglen; - unsigned int alg; + isc_region_t r, source_r, header_r, sig_r; + isc_buffer_t databuf; + unsigned char data[32]; + dns_name_t *keyname; + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_stdtime_t now; + isc_result_t ret; + dns_tsigkey_t *tsigkey; + dst_key_t *key = NULL; + unsigned char header[DNS_MESSAGE_HEADERLEN]; + uint16_t addcount, id; + bool has_tsig = false; + isc_mem_t *mctx; + unsigned int siglen; + unsigned int alg; REQUIRE(source != NULL); REQUIRE(msg != NULL); @@ -1519,7 +1497,8 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) * Do the key name and algorithm match that of the query? */ if (!dns_name_equal(keyname, &tsigkey->name) || - !dns_name_equal(&tsig.algorithm, &querytsig.algorithm)) { + !dns_name_equal(&tsig.algorithm, &querytsig.algorithm)) + { msg->tsigstatus = dns_tsigerror_badkey; ret = DNS_R_TSIGVERIFYFAILURE; tsig_log(msg->tsigkey, 2, @@ -1697,8 +1676,8 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) tsig_log(msg->tsigkey, 2, "signature has expired"); ret = DNS_R_CLOCKSKEW; goto cleanup_context; - } else if (now + msg->timeadjust < - tsig.timesigned - tsig.fudge) { + } else if (now + msg->timeadjust < tsig.timesigned - tsig.fudge) + { msg->tsigstatus = dns_tsigerror_badtime; tsig_log(msg->tsigkey, 2, "signature is in the future"); ret = DNS_R_CLOCKSKEW; @@ -1764,11 +1743,10 @@ cleanup_querystruct: isc_result_t dns_tsigkey_find(dns_tsigkey_t **tsigkey, const dns_name_t *name, - const dns_name_t *algorithm, dns_tsig_keyring_t *ring) -{ + const dns_name_t *algorithm, dns_tsig_keyring_t *ring) { dns_tsigkey_t *key; - isc_stdtime_t now; - isc_result_t result; + isc_stdtime_t now; + isc_result_t result; REQUIRE(tsigkey != NULL); REQUIRE(*tsigkey == NULL); @@ -1820,8 +1798,7 @@ dns_tsigkey_find(dns_tsigkey_t **tsigkey, const dns_name_t *name, } static void -free_tsignode(void *node, void *_unused) -{ +free_tsignode(void *node, void *_unused) { dns_tsigkey_t *key; REQUIRE(node != NULL); @@ -1838,9 +1815,8 @@ free_tsignode(void *node, void *_unused) } isc_result_t -dns_tsigkeyring_create(isc_mem_t *mctx, dns_tsig_keyring_t **ringp) -{ - isc_result_t result; +dns_tsigkeyring_create(isc_mem_t *mctx, dns_tsig_keyring_t **ringp) { + isc_result_t result; dns_tsig_keyring_t *ring; REQUIRE(mctx != NULL); @@ -1877,8 +1853,7 @@ dns_tsigkeyring_create(isc_mem_t *mctx, dns_tsig_keyring_t **ringp) isc_result_t dns_tsigkeyring_add(dns_tsig_keyring_t *ring, const dns_name_t *name, - dns_tsigkey_t *tkey) -{ + dns_tsigkey_t *tkey) { isc_result_t result; result = keyring_add(ring, name, tkey); @@ -1890,8 +1865,8 @@ dns_tsigkeyring_add(dns_tsig_keyring_t *ring, const dns_name_t *name, } void -dns_tsigkeyring_attach(dns_tsig_keyring_t *source, dns_tsig_keyring_t **target) -{ +dns_tsigkeyring_attach(dns_tsig_keyring_t *source, + dns_tsig_keyring_t **target) { REQUIRE(source != NULL); REQUIRE(target != NULL && *target == NULL); @@ -1901,8 +1876,7 @@ dns_tsigkeyring_attach(dns_tsig_keyring_t *source, dns_tsig_keyring_t **target) } void -dns_tsigkeyring_detach(dns_tsig_keyring_t **ringp) -{ +dns_tsigkeyring_detach(dns_tsig_keyring_t **ringp) { dns_tsig_keyring_t *ring; REQUIRE(ringp != NULL); @@ -1917,10 +1891,9 @@ dns_tsigkeyring_detach(dns_tsig_keyring_t **ringp) } void -dns_keyring_restore(dns_tsig_keyring_t *ring, FILE *fp) -{ +dns_keyring_restore(dns_tsig_keyring_t *ring, FILE *fp) { isc_stdtime_t now; - isc_result_t result; + isc_result_t result; isc_stdtime_get(&now); do { diff --git a/lib/dns/ttl.c b/lib/dns/ttl.c index 0b3b67ec19..983fb4dbe1 100644 --- a/lib/dns/ttl.c +++ b/lib/dns/ttl.c @@ -35,17 +35,15 @@ 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(). */ static isc_result_t ttlfmt(unsigned int t, const char *s, bool verbose, bool space, - isc_buffer_t *target) -{ - char tmp[60]; + isc_buffer_t *target) { + char tmp[60]; unsigned int len; isc_region_t region; @@ -71,8 +69,7 @@ ttlfmt(unsigned int t, const char *s, bool verbose, bool space, * Derived from bind8 ns_format_ttl(). */ isc_result_t -dns_ttl_totext(uint32_t src, bool verbose, bool upcase, isc_buffer_t *target) -{ +dns_ttl_totext(uint32_t src, bool verbose, bool upcase, isc_buffer_t *target) { unsigned secs, mins, hours, days, weeks, x; secs = src % 60; @@ -131,14 +128,12 @@ dns_ttl_totext(uint32_t src, bool verbose, bool upcase, isc_buffer_t *target) } isc_result_t -dns_counter_fromtext(isc_textregion_t *source, uint32_t *ttl) -{ +dns_counter_fromtext(isc_textregion_t *source, uint32_t *ttl) { return (bind_ttl(source, ttl)); } isc_result_t -dns_ttl_fromtext(isc_textregion_t *source, uint32_t *ttl) -{ +dns_ttl_fromtext(isc_textregion_t *source, uint32_t *ttl) { isc_result_t result; result = bind_ttl(source, ttl); @@ -149,13 +144,12 @@ dns_ttl_fromtext(isc_textregion_t *source, uint32_t *ttl) } static isc_result_t -bind_ttl(isc_textregion_t *source, uint32_t *ttl) -{ +bind_ttl(isc_textregion_t *source, uint32_t *ttl) { uint64_t tmp = 0ULL; uint32_t n; - char * s; - char buf[64]; - char nbuf[64]; /* Number buffer */ + char *s; + char buf[64]; + char nbuf[64]; /* Number buffer */ /* * Copy the buffer as it may not be NULL terminated. diff --git a/lib/dns/update.c b/lib/dns/update.c index f8e7301027..272ab19e3b 100644 --- a/lib/dns/update.c +++ b/lib/dns/update.c @@ -59,7 +59,7 @@ /**************************************************************************/ -#define STATE_MAGIC ISC_MAGIC('S', 'T', 'T', 'E') +#define STATE_MAGIC ISC_MAGIC('S', 'T', 'T', 'E') #define DNS_STATE_VALID(state) ISC_MAGIC_VALID(state, STATE_MAGIC) /*% @@ -188,7 +188,7 @@ typedef struct rr rr_t; struct rr { /* dns_name_t name; */ - uint32_t ttl; + uint32_t ttl; dns_rdata_t rdata; }; @@ -196,16 +196,14 @@ 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, - const char *fmt, ...) -{ + const char *fmt, ...) { va_list ap; - char message[4096]; + char message[4096]; if (callback == NULL) { return; @@ -232,9 +230,8 @@ update_log(dns_update_log_t *callback, dns_zone_t *zone, int level, */ static isc_result_t do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver, - dns_diff_t *diff) -{ - dns_diff_t temp_diff; + dns_diff_t *diff) { + dns_diff_t temp_diff; isc_result_t result; /* @@ -267,10 +264,9 @@ do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver, 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) -{ + dns_rdata_t *rdata) { dns_difftuple_t *tuple = NULL; - isc_result_t result; + isc_result_t result; result = dns_difftuple_create(diff->mctx, op, name, ttl, rdata, &tuple); if (result != ISC_R_SUCCESS) { return (result); @@ -301,33 +297,31 @@ 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(). */ typedef struct { rr_func *rr_action; - void * rr_action_data; + void *rr_action_data; } foreach_node_rr_ctx_t; /*% * Internal helper function for foreach_node_rr(). */ static isc_result_t -foreach_node_rr_action(void *data, dns_rdataset_t *rdataset) -{ - isc_result_t result; +foreach_node_rr_action(void *data, dns_rdataset_t *rdataset) { + isc_result_t result; foreach_node_rr_ctx_t *ctx = data; for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { rr_t rr = { 0, DNS_RDATA_INIT }; dns_rdataset_current(rdataset, &rr.rdata); @@ -352,10 +346,9 @@ foreach_node_rr_action(void *data, dns_rdataset_t *rdataset) */ static isc_result_t foreach_rrset(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, - rrset_func *action, void *action_data) -{ - isc_result_t result; - dns_dbnode_t * node; + rrset_func *action, void *action_data) { + isc_result_t result; + dns_dbnode_t *node; dns_rdatasetiter_t *iter; node = NULL; @@ -374,7 +367,8 @@ foreach_rrset(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, } for (result = dns_rdatasetiter_first(iter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(iter)) { + result = dns_rdatasetiter_next(iter)) + { dns_rdataset_t rdataset; dns_rdataset_init(&rdataset); @@ -410,8 +404,7 @@ cleanup_node: */ static isc_result_t foreach_node_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, - rr_func *rr_action, void *rr_action_data) -{ + rr_func *rr_action, void *rr_action_data) { foreach_node_rr_ctx_t ctx; ctx.rr_action = rr_action; ctx.rr_action_data = rr_action_data; @@ -430,10 +423,9 @@ foreach_node_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, static isc_result_t foreach_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_rdatatype_t type, dns_rdatatype_t covers, rr_func *rr_action, - void *rr_action_data) -{ - isc_result_t result; - dns_dbnode_t * node; + void *rr_action_data) { + isc_result_t result; + dns_dbnode_t *node; dns_rdataset_t rdataset; if (type == dns_rdatatype_any) { @@ -443,7 +435,8 @@ foreach_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, node = NULL; if (type == dns_rdatatype_nsec3 || - (type == dns_rdatatype_rrsig && covers == dns_rdatatype_nsec3)) { + (type == dns_rdatatype_rrsig && covers == dns_rdatatype_nsec3)) + { result = dns_db_findnsec3node(db, name, false, &node); } else { result = dns_db_findnode(db, name, false, &node); @@ -467,7 +460,8 @@ foreach_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { rr_t rr = { 0, DNS_RDATA_INIT }; dns_rdataset_current(&rdataset, &rr.rdata); rr.ttl = rdataset.ttl; @@ -498,15 +492,13 @@ 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(). */ static isc_result_t -rrset_exists_action(void *data, rr_t *rr) -{ +rrset_exists_action(void *data, rr_t *rr) { UNUSED(data); UNUSED(rr); return (ISC_R_EXISTS); @@ -538,8 +530,7 @@ rrset_exists_action(void *data, rr_t *rr) */ static isc_result_t rrset_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, - dns_rdatatype_t type, dns_rdatatype_t covers, bool *exists) -{ + dns_rdatatype_t type, dns_rdatatype_t covers, bool *exists) { isc_result_t result; result = foreach_rr(db, ver, name, type, covers, rrset_exists_action, NULL); @@ -553,9 +544,8 @@ rrset_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, */ static isc_result_t rrset_visible(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, - dns_rdatatype_t type, bool *visible) -{ - isc_result_t result; + dns_rdatatype_t type, bool *visible) { + isc_result_t result; dns_fixedname_t fixed; dns_fixedname_init(&fixed); @@ -591,8 +581,7 @@ rrset_visible(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, */ static isc_result_t -name_exists_action(void *data, dns_rdataset_t *rrset) -{ +name_exists_action(void *data, dns_rdataset_t *rrset) { UNUSED(data); UNUSED(rrset); return (ISC_R_EXISTS); @@ -602,8 +591,8 @@ name_exists_action(void *data, dns_rdataset_t *rrset) * Set '*exists' to true iff the given name exists, to false otherwise. */ static isc_result_t -name_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, bool *exists) -{ +name_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, + bool *exists) { isc_result_t result; result = foreach_rrset(db, ver, name, name_exists_action, NULL); RETURN_EXISTENCE_FLAG; @@ -626,13 +615,12 @@ name_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, bool *exists) * followed by the type and rdata. */ static int -temp_order(const void *av, const void *bv) -{ +temp_order(const void *av, const void *bv) { dns_difftuple_t const *const *ap = av; dns_difftuple_t const *const *bp = bv; - dns_difftuple_t const * a = *ap; - dns_difftuple_t const * b = *bp; - int r; + dns_difftuple_t const *a = *ap; + dns_difftuple_t const *b = *bp; + int r; r = dns_name_compare(&a->name, &b->name); if (r != 0) { return (r); @@ -655,12 +643,12 @@ temp_order(const void *av, const void *bv) */ typedef struct { - rr_predicate * predicate; - dns_db_t * db; + rr_predicate *predicate; + dns_db_t *db; dns_dbversion_t *ver; - dns_diff_t * diff; - dns_name_t * name; - dns_rdata_t * update_rr; + dns_diff_t *diff; + dns_name_t *name; + dns_rdata_t *update_rr; } conditional_delete_ctx_t; /*% @@ -671,8 +659,7 @@ typedef struct { * Return true always. */ static bool -true_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) -{ +true_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { UNUSED(update_rr); UNUSED(db_rr); return (true); @@ -682,8 +669,7 @@ true_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) * Return true if the record is a RRSIG. */ static bool -rrsig_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) -{ +rrsig_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { UNUSED(update_rr); return ((db_rr->type == dns_rdatatype_rrsig) ? true : false); } @@ -692,8 +678,7 @@ rrsig_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) * Internal helper function for delete_if(). */ static isc_result_t -delete_if_action(void *data, rr_t *rr) -{ +delete_if_action(void *data, rr_t *rr) { conditional_delete_ctx_t *ctx = data; if ((*ctx->predicate)(ctx->update_rr, &rr->rdata)) { isc_result_t result; @@ -716,8 +701,7 @@ delete_if_action(void *data, rr_t *rr) static isc_result_t delete_if(rr_predicate *predicate, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_rdatatype_t type, dns_rdatatype_t covers, - dns_rdata_t *update_rr, dns_diff_t *diff) -{ + dns_rdata_t *update_rr, dns_diff_t *diff) { conditional_delete_ctx_t ctx; ctx.predicate = predicate; ctx.db = db; @@ -739,10 +723,9 @@ delete_if(rr_predicate *predicate, dns_db_t *db, dns_dbversion_t *ver, * affected by the update. */ static isc_result_t -namelist_append_name(dns_diff_t *list, dns_name_t *name) -{ - isc_result_t result; - dns_difftuple_t * tuple = NULL; +namelist_append_name(dns_diff_t *list, dns_name_t *name) { + isc_result_t result; + dns_difftuple_t *tuple = NULL; static dns_rdata_t dummy_rdata = DNS_RDATA_INIT; CHECK(dns_difftuple_create(list->mctx, DNS_DIFFOP_EXISTS, name, 0, @@ -753,11 +736,11 @@ failure: } static isc_result_t -namelist_append_subdomain(dns_db_t *db, dns_name_t *name, dns_diff_t *affected) -{ - isc_result_t result; - dns_fixedname_t fixedname; - dns_name_t * child; +namelist_append_subdomain(dns_db_t *db, dns_name_t *name, + dns_diff_t *affected) { + isc_result_t result; + dns_fixedname_t fixedname; + dns_name_t *child; dns_dbiterator_t *dbit = NULL; child = dns_fixedname_initname(&fixedname); @@ -765,7 +748,8 @@ namelist_append_subdomain(dns_db_t *db, dns_name_t *name, dns_diff_t *affected) CHECK(dns_db_createiterator(db, DNS_DB_NONSEC3, &dbit)); for (result = dns_dbiterator_seek(dbit, name); result == ISC_R_SUCCESS; - result = dns_dbiterator_next(dbit)) { + result = dns_dbiterator_next(dbit)) + { dns_dbnode_t *node = NULL; CHECK(dns_dbiterator_current(dbit, &node, child)); dns_db_detachnode(db, &node); @@ -788,14 +772,14 @@ failure: * Helper function for non_nsec_rrset_exists(). */ static isc_result_t -is_non_nsec_action(void *data, dns_rdataset_t *rrset) -{ +is_non_nsec_action(void *data, dns_rdataset_t *rrset) { UNUSED(data); if (!(rrset->type == dns_rdatatype_nsec || rrset->type == dns_rdatatype_nsec3 || (rrset->type == dns_rdatatype_rrsig && (rrset->covers == dns_rdatatype_nsec || - rrset->covers == dns_rdatatype_nsec3)))) { + rrset->covers == dns_rdatatype_nsec3)))) + { return (ISC_R_EXISTS); } return (ISC_R_SUCCESS); @@ -811,8 +795,7 @@ is_non_nsec_action(void *data, dns_rdataset_t *rrset) */ static isc_result_t non_nsec_rrset_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, - bool *exists) -{ + bool *exists) { isc_result_t result; result = foreach_rrset(db, ver, name, is_non_nsec_action, NULL); RETURN_EXISTENCE_FLAG; @@ -822,19 +805,17 @@ non_nsec_rrset_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, * A comparison function for sorting dns_diff_t:s by name. */ static int -name_order(const void *av, const void *bv) -{ +name_order(const void *av, const void *bv) { dns_difftuple_t const *const *ap = av; dns_difftuple_t const *const *bp = bv; - dns_difftuple_t const * a = *ap; - dns_difftuple_t const * b = *bp; + dns_difftuple_t const *a = *ap; + dns_difftuple_t const *b = *bp; return (dns_name_compare(&a->name, &b->name)); } static isc_result_t -uniqify_name_list(dns_diff_t *list) -{ - isc_result_t result; +uniqify_name_list(dns_diff_t *list) { + isc_result_t result; dns_difftuple_t *p, *q; CHECK(dns_diff_sort(list, name_order)); @@ -857,9 +838,8 @@ failure: static isc_result_t is_active(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, bool *flag, - bool *cut, bool *unsecure) -{ - isc_result_t result; + bool *cut, bool *unsecure) { + isc_result_t result; dns_fixedname_t foundname; dns_fixedname_init(&foundname); result = dns_db_find(db, name, ver, dns_rdatatype_any, @@ -884,7 +864,8 @@ is_active(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, bool *flag, if (dns_db_find(db, name, ver, dns_rdatatype_ds, 0, (isc_stdtime_t)0, NULL, dns_fixedname_name(&foundname), NULL, - NULL) == DNS_R_NXRRSET) { + NULL) == DNS_R_NXRRSET) + { *unsecure = true; } else { *unsecure = false; @@ -892,7 +873,8 @@ is_active(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, bool *flag, } return (ISC_R_SUCCESS); } else if (result == DNS_R_GLUE || result == DNS_R_DNAME || - result == DNS_R_DELEGATION || result == DNS_R_NXDOMAIN) { + result == DNS_R_DELEGATION || result == DNS_R_NXDOMAIN) + { *flag = false; *cut = false; if (unsecure != NULL) { @@ -921,13 +903,12 @@ is_active(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, bool *flag, static isc_result_t next_active(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *oldname, dns_name_t *newname, - bool forward) -{ - isc_result_t result; + bool forward) { + isc_result_t result; dns_dbiterator_t *dbit = NULL; - bool has_nsec = false; - unsigned int wraps = 0; - bool secure = dns_db_issecure(db); + bool has_nsec = false; + unsigned int wraps = 0; + bool secure = dns_db_issecure(db); CHECK(dns_db_createiterator(db, 0, &dbit)); @@ -972,7 +953,7 @@ next_active(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, 0, &has_nsec)); } else { dns_fixedname_t ffound; - dns_name_t * found; + dns_name_t *found; found = dns_fixedname_initname(&ffound); result = dns_db_find( db, newname, ver, dns_rdatatype_soa, @@ -981,7 +962,8 @@ next_active(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, result == DNS_R_EMPTYNAME || result == DNS_R_NXRRSET || result == DNS_R_CNAME || (result == DNS_R_DELEGATION && - dns_name_equal(newname, found))) { + dns_name_equal(newname, found))) + { has_nsec = true; result = ISC_R_SUCCESS; } else if (result != DNS_R_NXDOMAIN) { @@ -1004,15 +986,14 @@ failure: static isc_result_t add_nsec(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_ttl_t nsecttl, - dns_diff_t *diff) -{ - isc_result_t result; - dns_dbnode_t * node = NULL; - unsigned char buffer[DNS_NSEC_BUFFERSIZE]; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_diff_t *diff) { + isc_result_t result; + dns_dbnode_t *node = NULL; + unsigned char buffer[DNS_NSEC_BUFFERSIZE]; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_difftuple_t *tuple = NULL; - dns_fixedname_t fixedname; - dns_name_t * target; + dns_fixedname_t fixedname; + dns_name_t *target; target = dns_fixedname_initname(&fixedname); @@ -1054,13 +1035,12 @@ failure: */ static isc_result_t add_placeholder_nsec(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, - dns_diff_t *diff) -{ - isc_result_t result; + dns_diff_t *diff) { + isc_result_t result; dns_difftuple_t *tuple = NULL; - isc_region_t r; - unsigned char data[1] = { 0 }; /* The root domain, no bits. */ - dns_rdata_t rdata = DNS_RDATA_INIT; + isc_region_t r; + unsigned char data[1] = { 0 }; /* The root domain, no bits. */ + dns_rdata_t rdata = DNS_RDATA_INIT; r.base = data; r.length = sizeof(data); @@ -1075,12 +1055,11 @@ failure: static isc_result_t find_zone_keys(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, isc_mem_t *mctx, unsigned int maxkeys, dst_key_t **keys, - unsigned int *nkeys) -{ - isc_result_t result; + unsigned int *nkeys) { + isc_result_t result; isc_stdtime_t now; dns_dbnode_t *node = NULL; - const char * directory = dns_zone_getkeydirectory(zone); + const char *directory = dns_zone_getkeydirectory(zone); CHECK(dns_db_findnode(db, dns_db_origin(db), false, &node)); isc_stdtime_get(&now); CHECK(dns_dnssec_findzonekeys(db, ver, node, dns_db_origin(db), @@ -1101,19 +1080,18 @@ add_sigs(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_rdatatype_t type, dns_diff_t *diff, dst_key_t **keys, unsigned int nkeys, isc_stdtime_t inception, isc_stdtime_t expire, bool check_ksk, - bool keyset_kskonly) -{ - isc_result_t result; - dns_dbnode_t * node = NULL; - dns_kasp_t * kasp = dns_zone_getkasp(zone); + bool keyset_kskonly) { + isc_result_t result; + dns_dbnode_t *node = NULL; + dns_kasp_t *kasp = dns_zone_getkasp(zone); dns_rdataset_t rdataset; - dns_rdata_t sig_rdata = DNS_RDATA_INIT; - dns_stats_t * dnssecsignstats = dns_zone_getdnssecsignstats(zone); - isc_buffer_t buffer; - unsigned char data[1024]; /* XXX */ - unsigned int i, j; - bool added_sig = false; - isc_mem_t * mctx = diff->mctx; + dns_rdata_t sig_rdata = DNS_RDATA_INIT; + dns_stats_t *dnssecsignstats = dns_zone_getdnssecsignstats(zone); + isc_buffer_t buffer; + unsigned char data[1024]; /* XXX */ + unsigned int i, j; + bool added_sig = false; + isc_mem_t *mctx = diff->mctx; if (kasp != NULL) { check_ksk = false; @@ -1134,8 +1112,8 @@ add_sigs(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, dns_db_detachnode(db, &node); #define REVOKE(x) ((dst_key_flags(x) & DNS_KEYFLAG_REVOKE) != 0) -#define KSK(x) ((dst_key_flags(x) & DNS_KEYFLAG_KSK) != 0) -#define ALG(x) dst_key_alg(x) +#define KSK(x) ((dst_key_flags(x) & DNS_KEYFLAG_KSK) != 0) +#define ALG(x) dst_key_alg(x) /* * If we are honoring KSK flags then we need to check that we @@ -1197,9 +1175,9 @@ add_sigs(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, * key should sign. */ isc_stdtime_t when; - isc_result_t kresult; - bool ksk = false; - bool zsk = false; + isc_result_t kresult; + bool ksk = false; + bool zsk = false; kresult = dst_key_getbool(keys[i], DST_BOOL_KSK, &ksk); if (kresult != ISC_R_SUCCESS) { @@ -1216,7 +1194,8 @@ add_sigs(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, if (type == dns_rdatatype_dnskey || type == dns_rdatatype_cdnskey || - type == dns_rdatatype_cds) { + type == dns_rdatatype_cds) + { /* * DNSKEY RRset is signed with KSK. * CDS and CDNSKEY RRsets too (RFC 7344, 4.1). @@ -1251,7 +1230,8 @@ add_sigs(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, */ if (type == dns_rdatatype_dnskey || type == dns_rdatatype_cdnskey || - type == dns_rdatatype_cds) { + type == dns_rdatatype_cds) + { if (!KSK(keys[i]) && keyset_kskonly) { continue; } @@ -1302,15 +1282,14 @@ failure: */ static isc_result_t del_keysigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, - dns_diff_t *diff, dst_key_t **keys, unsigned int nkeys) -{ - isc_result_t result; - dns_dbnode_t * node = NULL; - dns_rdataset_t rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; - unsigned int i; + dns_diff_t *diff, dst_key_t **keys, unsigned int nkeys) { + isc_result_t result; + dns_dbnode_t *node = NULL; + dns_rdataset_t rdataset; + dns_rdata_t rdata = DNS_RDATA_INIT; + unsigned int i; dns_rdata_rrsig_t rrsig; - bool found; + bool found; dns_rdataset_init(&rdataset); @@ -1334,7 +1313,8 @@ del_keysigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdataset_current(&rdataset, &rdata); result = dns_rdata_tostruct(&rdata, &rrsig, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); @@ -1385,10 +1365,9 @@ add_exposed_sigs(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, bool cut, dns_diff_t *diff, dst_key_t **keys, unsigned int nkeys, isc_stdtime_t inception, isc_stdtime_t expire, bool check_ksk, - bool keyset_kskonly, unsigned int *sigs) -{ - isc_result_t result; - dns_dbnode_t * node; + bool keyset_kskonly, unsigned int *sigs) { + isc_result_t result; + dns_dbnode_t *node; dns_rdatasetiter_t *iter; node = NULL; @@ -1407,10 +1386,11 @@ add_exposed_sigs(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, } for (result = dns_rdatasetiter_first(iter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(iter)) { - dns_rdataset_t rdataset; + result = dns_rdatasetiter_next(iter)) + { + dns_rdataset_t rdataset; dns_rdatatype_t type; - bool flag; + bool flag; dns_rdataset_init(&rdataset); dns_rdatasetiter_current(iter, &rdataset); @@ -1468,25 +1448,24 @@ cleanup_node: isc_result_t dns_update_signatures(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *oldver, dns_dbversion_t *newver, - dns_diff_t *diff, uint32_t sigvalidityinterval) -{ + dns_diff_t *diff, uint32_t sigvalidityinterval) { return (dns_update_signaturesinc(log, zone, db, oldver, newver, diff, sigvalidityinterval, NULL)); } struct dns_update_state { - unsigned int magic; - dns_diff_t diffnames; - dns_diff_t affected; - dns_diff_t sig_diff; - dns_diff_t nsec_diff; - dns_diff_t nsec_mindiff; - dns_diff_t work; - dst_key_t * zone_keys[DNS_MAXZONEKEYS]; - unsigned int nkeys; + unsigned int magic; + dns_diff_t diffnames; + dns_diff_t affected; + dns_diff_t sig_diff; + dns_diff_t nsec_diff; + dns_diff_t nsec_mindiff; + dns_diff_t work; + dst_key_t *zone_keys[DNS_MAXZONEKEYS]; + unsigned int nkeys; isc_stdtime_t inception, expire, keyexpire; - dns_ttl_t nsecttl; - bool check_ksk, keyset_kskonly, build_nsec3; + dns_ttl_t nsecttl; + bool check_ksk, keyset_kskonly, build_nsec3; enum { sign_updates, remove_orphaned, build_chain, @@ -1498,8 +1477,7 @@ struct dns_update_state { }; static uint32_t -dns__jitter_expire(dns_zone_t *zone, uint32_t sigvalidityinterval) -{ +dns__jitter_expire(dns_zone_t *zone, uint32_t sigvalidityinterval) { /* Spread out signatures over time */ if (sigvalidityinterval >= 3600U) { uint32_t expiryinterval = @@ -1522,24 +1500,23 @@ isc_result_t dns_update_signaturesinc(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *oldver, dns_dbversion_t *newver, dns_diff_t *diff, uint32_t sigvalidityinterval, - dns_update_state_t **statep) -{ - isc_result_t result = ISC_R_SUCCESS; + dns_update_state_t **statep) { + isc_result_t result = ISC_R_SUCCESS; dns_update_state_t mystate, *state; dns_difftuple_t *t, *next; - bool flag, build_nsec; - unsigned int i; - isc_stdtime_t now; - dns_rdata_soa_t soa; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdataset_t rdataset; - dns_dbnode_t * node = NULL; - bool unsecure; - bool cut; - dns_rdatatype_t privatetype = dns_zone_getprivatetype(zone); - unsigned int sigs = 0; - unsigned int maxsigs = dns_zone_getsignatures(zone); + bool flag, build_nsec; + unsigned int i; + isc_stdtime_t now; + dns_rdata_soa_t soa; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdataset_t rdataset; + dns_dbnode_t *node = NULL; + bool unsecure; + bool cut; + dns_rdatatype_t privatetype = dns_zone_getprivatetype(zone); + unsigned int sigs = 0; + unsigned int maxsigs = dns_zone_getsignatures(zone); if (statep == NULL || *statep == NULL) { if (statep == NULL) { @@ -1569,8 +1546,8 @@ dns_update_signaturesinc(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db, isc_stdtime_get(&now); state->inception = now - 3600; /* Allow for some clock skew. */ - state->expire = - now + dns__jitter_expire(zone, sigvalidityinterval); + state->expire = now + + dns__jitter_expire(zone, sigvalidityinterval); state->keyexpire = dns_zone_getkeyvalidityinterval(zone); if (state->keyexpire == 0) { state->keyexpire = state->expire; @@ -1677,7 +1654,8 @@ next_state: isc_stdtime_t exp; if (type == dns_rdatatype_dnskey || type == dns_rdatatype_cdnskey || - type == dns_rdatatype_cds) { + type == dns_rdatatype_cds) + { exp = state->keyexpire; } else { exp = state->expire; @@ -1718,7 +1696,8 @@ next_state: /* Remove orphaned NSECs and RRSIG NSECs. */ for (t = ISC_LIST_HEAD(state->diffnames.tuples); t != NULL; - t = ISC_LIST_NEXT(t, link)) { + t = ISC_LIST_NEXT(t, link)) + { CHECK(non_nsec_rrset_exists(db, newver, &t->name, &flag)); if (!flag) { @@ -1751,10 +1730,11 @@ next_state: * have its NSEC updated. */ for (t = ISC_LIST_HEAD(state->diffnames.tuples); t != NULL; - t = ISC_LIST_NEXT(t, link)) { - bool existed, exists; + t = ISC_LIST_NEXT(t, link)) + { + bool existed, exists; dns_fixedname_t fixedname; - dns_name_t * prevname; + dns_name_t *prevname; prevname = dns_fixedname_initname(&fixedname); @@ -1791,7 +1771,8 @@ next_state: * removing one). */ for (t = ISC_LIST_HEAD(state->diffnames.tuples); t != NULL; - t = ISC_LIST_NEXT(t, link)) { + t = ISC_LIST_NEXT(t, link)) + { bool ns_existed, dname_existed; bool ns_exists, dname_exists; @@ -1843,7 +1824,7 @@ next_state: * should be part of the NSEC chain. */ while ((t = ISC_LIST_HEAD(state->affected.tuples)) != NULL) { - bool exists; + bool exists; dns_name_t *name = &t->name; CHECK(name_exists(db, newver, name, &exists)); @@ -1904,7 +1885,8 @@ next_state: * Make them all point at their correct targets. */ for (t = ISC_LIST_HEAD(state->affected.tuples); t != NULL; - t = ISC_LIST_NEXT(t, link)) { + t = ISC_LIST_NEXT(t, link)) + { CHECK(rrset_exists(db, newver, &t->name, dns_rdatatype_nsec, 0, &flag)); if (flag) { @@ -1950,8 +1932,8 @@ next_state: case sign_nsec: state->state = sign_nsec; /* Update RRSIG NSECs. */ - while ((t = ISC_LIST_HEAD(state->nsec_mindiff.tuples)) != - NULL) { + while ((t = ISC_LIST_HEAD(state->nsec_mindiff.tuples)) != NULL) + { if (t->op == DNS_DIFFOP_DEL) { CHECK(delete_if(true_p, db, newver, &t->name, dns_rdatatype_rrsig, @@ -1987,8 +1969,8 @@ next_state: ISC_LIST_UNLINK(state->sig_diff.tuples, t, link); dns_diff_appendminimal(diff, &t); } - while ((t = ISC_LIST_HEAD(state->nsec_mindiff.tuples)) != - NULL) { + while ((t = ISC_LIST_HEAD(state->nsec_mindiff.tuples)) != NULL) + { ISC_LIST_UNLINK(state->nsec_mindiff.tuples, t, link); dns_diff_appendminimal(diff, &t); } @@ -2125,8 +2107,8 @@ next_state: case sign_nsec3: state->state = sign_nsec3; /* Update RRSIG NSEC3s. */ - while ((t = ISC_LIST_HEAD(state->nsec_mindiff.tuples)) != - NULL) { + while ((t = ISC_LIST_HEAD(state->nsec_mindiff.tuples)) != NULL) + { if (t->op == DNS_DIFFOP_DEL) { CHECK(delete_if(true_p, db, newver, &t->name, dns_rdatatype_rrsig, @@ -2159,8 +2141,8 @@ next_state: ISC_LIST_UNLINK(state->sig_diff.tuples, t, link); dns_diff_appendminimal(diff, &t); } - while ((t = ISC_LIST_HEAD(state->nsec_mindiff.tuples)) != - NULL) { + while ((t = ISC_LIST_HEAD(state->nsec_mindiff.tuples)) != NULL) + { ISC_LIST_UNLINK(state->nsec_mindiff.tuples, t, link); dns_diff_appendminimal(diff, &t); } @@ -2201,8 +2183,7 @@ failure: } static isc_stdtime_t -epoch_to_yyyymmdd(time_t when) -{ +epoch_to_yyyymmdd(time_t when) { struct tm *tm; #if !defined(WIN32) @@ -2216,10 +2197,9 @@ epoch_to_yyyymmdd(time_t when) } uint32_t -dns_update_soaserial(uint32_t serial, dns_updatemethod_t method) -{ +dns_update_soaserial(uint32_t serial, dns_updatemethod_t method) { isc_stdtime_t now; - uint32_t new_serial; + uint32_t new_serial; switch (method) { case dns_updatemethod_none: diff --git a/lib/dns/validator.c b/lib/dns/validator.c index dd3d4e5994..db245c9fa0 100644 --- a/lib/dns/validator.c +++ b/lib/dns/validator.c @@ -60,7 +60,7 @@ * validate_nx: attempt to prove a negative response. */ -#define VALIDATOR_MAGIC ISC_MAGIC('V', 'a', 'l', '?') +#define VALIDATOR_MAGIC ISC_MAGIC('V', 'a', 'l', '?') #define VALID_VALIDATOR(v) ISC_MAGIC_VALID(v, VALIDATOR_MAGIC) #define VALATTR_SHUTDOWN 0x0001 /*%< Shutting down. */ @@ -73,28 +73,28 @@ /*! * NSEC proofs to be looked for. */ -#define VALATTR_NEEDNOQNAME 0x00000100 +#define VALATTR_NEEDNOQNAME 0x00000100 #define VALATTR_NEEDNOWILDCARD 0x00000200 -#define VALATTR_NEEDNODATA 0x00000400 +#define VALATTR_NEEDNODATA 0x00000400 /*! * NSEC proofs that have been found. */ -#define VALATTR_FOUNDNOQNAME 0x00001000 +#define VALATTR_FOUNDNOQNAME 0x00001000 #define VALATTR_FOUNDNOWILDCARD 0x00002000 -#define VALATTR_FOUNDNODATA 0x00004000 -#define VALATTR_FOUNDCLOSEST 0x00008000 -#define VALATTR_FOUNDOPTOUT 0x00010000 -#define VALATTR_FOUNDUNKNOWN 0x00020000 +#define VALATTR_FOUNDNODATA 0x00004000 +#define VALATTR_FOUNDCLOSEST 0x00008000 +#define VALATTR_FOUNDOPTOUT 0x00010000 +#define VALATTR_FOUNDUNKNOWN 0x00020000 -#define NEEDNODATA(val) ((val->attributes & VALATTR_NEEDNODATA) != 0) -#define NEEDNOQNAME(val) ((val->attributes & VALATTR_NEEDNOQNAME) != 0) -#define NEEDNOWILDCARD(val) ((val->attributes & VALATTR_NEEDNOWILDCARD) != 0) -#define FOUNDNODATA(val) ((val->attributes & VALATTR_FOUNDNODATA) != 0) -#define FOUNDNOQNAME(val) ((val->attributes & VALATTR_FOUNDNOQNAME) != 0) +#define NEEDNODATA(val) ((val->attributes & VALATTR_NEEDNODATA) != 0) +#define NEEDNOQNAME(val) ((val->attributes & VALATTR_NEEDNOQNAME) != 0) +#define NEEDNOWILDCARD(val) ((val->attributes & VALATTR_NEEDNOWILDCARD) != 0) +#define FOUNDNODATA(val) ((val->attributes & VALATTR_FOUNDNODATA) != 0) +#define FOUNDNOQNAME(val) ((val->attributes & VALATTR_FOUNDNOQNAME) != 0) #define FOUNDNOWILDCARD(val) ((val->attributes & VALATTR_FOUNDNOWILDCARD) != 0) -#define FOUNDCLOSEST(val) ((val->attributes & VALATTR_FOUNDCLOSEST) != 0) -#define FOUNDOPTOUT(val) ((val->attributes & VALATTR_FOUNDOPTOUT) != 0) +#define FOUNDCLOSEST(val) ((val->attributes & VALATTR_FOUNDCLOSEST) != 0) +#define FOUNDOPTOUT(val) ((val->attributes & VALATTR_FOUNDOPTOUT) != 0) #define SHUTDOWN(v) (((v)->attributes & VALATTR_SHUTDOWN) != 0) #define CANCELED(v) (((v)->attributes & VALATTR_CANCELED) != 0) @@ -102,44 +102,36 @@ #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. */ static void -expire_rdatasets(dns_validator_t *val) -{ +expire_rdatasets(dns_validator_t *val) { if (dns_rdataset_isassociated(&val->frdataset)) { dns_rdataset_expire(&val->frdataset); } @@ -152,8 +144,7 @@ expire_rdatasets(dns_validator_t *val) * Ensure the validator's rdatasets are disassociated. */ static void -disassociate_rdatasets(dns_validator_t *val) -{ +disassociate_rdatasets(dns_validator_t *val) { if (dns_rdataset_isassociated(&val->frdataset)) { dns_rdataset_disassociate(&val->frdataset); } @@ -170,8 +161,7 @@ disassociate_rdatasets(dns_validator_t *val) * warning and return DNS_R_MUSTBESECURE instead. */ static inline isc_result_t -markanswer(dns_validator_t *val, const char *where, const char *mbstext) -{ +markanswer(dns_validator_t *val, const char *where, const char *mbstext) { if (val->mustbesecure && mbstext != NULL) { validator_log(val, ISC_LOG_WARNING, "must be secure failure, %s", mbstext); @@ -194,8 +184,7 @@ markanswer(dns_validator_t *val, const char *where, const char *mbstext) * Mark the RRsets in val->event with trust level secure. */ static inline void -marksecure(dns_validatorevent_t *event) -{ +marksecure(dns_validatorevent_t *event) { dns_rdataset_settrust(event->rdataset, dns_trust_secure); if (event->sigrdataset != NULL) { dns_rdataset_settrust(event->sigrdataset, dns_trust_secure); @@ -208,8 +197,7 @@ marksecure(dns_validatorevent_t *event) * that called dns_validator_create(), with result `result`. */ static void -validator_done(dns_validator_t *val, isc_result_t result) -{ +validator_done(dns_validator_t *val, isc_result_t result) { isc_task_t *task; if (val->event == NULL) { @@ -233,8 +221,7 @@ validator_done(dns_validator_t *val, isc_result_t result) * Called when deciding whether to destroy validator 'val'. */ static inline bool -exit_check(dns_validator_t *val) -{ +exit_check(dns_validator_t *val) { /* * Caller must be holding the lock. */ @@ -256,22 +243,22 @@ exit_check(dns_validator_t *val) * a NS RRset at this name. If it is found we are at a delegation point. */ static bool -isdelegation(dns_name_t *name, dns_rdataset_t *rdataset, isc_result_t dbresult) -{ - dns_fixedname_t fixed; - dns_label_t hashlabel; - dns_name_t nsec3name; +isdelegation(dns_name_t *name, dns_rdataset_t *rdataset, + isc_result_t dbresult) { + dns_fixedname_t fixed; + dns_label_t hashlabel; + dns_name_t nsec3name; dns_rdata_nsec3_t nsec3; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdataset_t set; - int order; - int scope; - bool found; - isc_buffer_t buffer; - isc_result_t result; - unsigned char hash[NSEC3_MAX_HASH_LENGTH]; - unsigned char owner[NSEC3_MAX_HASH_LENGTH]; - unsigned int length; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdataset_t set; + int order; + int scope; + bool found; + isc_buffer_t buffer; + isc_result_t result; + unsigned char hash[NSEC3_MAX_HASH_LENGTH]; + unsigned char owner[NSEC3_MAX_HASH_LENGTH]; + unsigned int length; REQUIRE(dbresult == DNS_R_NXRRSET || dbresult == DNS_R_NCACHENXRRSET); @@ -311,7 +298,8 @@ trynsec3: dns_name_downcase(name, dns_fixedname_name(&fixed), NULL); name = dns_fixedname_name(&fixed); for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { dns_ncache_current(rdataset, &nsec3name, &set); if (set.type != dns_rdatatype_nsec3) { dns_rdataset_disassociate(&set); @@ -326,7 +314,8 @@ trynsec3: continue; } for (result = dns_rdataset_first(&set); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&set)) { + result = dns_rdataset_next(&set)) + { dns_rdata_reset(&rdata); dns_rdataset_current(&set, &rdata); (void)dns_rdata_tostruct(&rdata, &nsec3, NULL); @@ -357,7 +346,8 @@ trynsec3: memcmp(hash, nsec3.next, length) < 0) || (scope >= 0 && (order > 0 || - memcmp(hash, nsec3.next, length) < 0))) { + memcmp(hash, nsec3.next, length) < 0))) + { dns_rdataset_disassociate(&set); return (true); } @@ -373,16 +363,15 @@ trynsec3: * If not found, fail the validation process. */ static void -fetch_callback_dnskey(isc_task_t *task, isc_event_t *event) -{ +fetch_callback_dnskey(isc_task_t *task, isc_event_t *event) { dns_fetchevent_t *devent; - dns_validator_t * val; - dns_rdataset_t * rdataset; - bool want_destroy; - isc_result_t result; - isc_result_t eresult; - isc_result_t saved_result; - dns_fetch_t * fetch; + dns_validator_t *val; + dns_rdataset_t *rdataset; + bool want_destroy; + isc_result_t result; + isc_result_t eresult; + isc_result_t saved_result; + dns_fetch_t *fetch; UNUSED(task); INSIST(event->ev_type == DNS_EVENT_FETCHDONE); @@ -465,15 +454,14 @@ fetch_callback_dnskey(isc_task_t *task, isc_event_t *event) * walking a trust chain, or an insecurity proof. */ static void -fetch_callback_ds(isc_task_t *task, isc_event_t *event) -{ +fetch_callback_ds(isc_task_t *task, isc_event_t *event) { dns_fetchevent_t *devent; - dns_validator_t * val; - dns_rdataset_t * rdataset; - bool want_destroy, trustchain; - isc_result_t result; - isc_result_t eresult; - dns_fetch_t * fetch; + dns_validator_t *val; + dns_rdataset_t *rdataset; + bool want_destroy, trustchain; + isc_result_t result; + isc_result_t eresult; + dns_fetch_t *fetch; UNUSED(task); INSIST(event->ev_type == DNS_EVENT_FETCHDONE); @@ -573,7 +561,8 @@ fetch_callback_ds(isc_task_t *task, isc_event_t *event) goto unexpected; } else if (eresult != DNS_R_CNAME && isdelegation(dns_fixedname_name(&devent->foundname), - &val->frdataset, eresult)) { + &val->frdataset, eresult)) + { /* * Failed to find a DS while trying to prove * insecurity. If this is a zone cut, that @@ -626,14 +615,13 @@ done: * Resumes the stalled validation process. */ static void -validator_callback_dnskey(isc_task_t *task, isc_event_t *event) -{ +validator_callback_dnskey(isc_task_t *task, isc_event_t *event) { dns_validatorevent_t *devent; - dns_validator_t * val; - bool want_destroy; - isc_result_t result; - isc_result_t eresult; - isc_result_t saved_result; + dns_validator_t *val; + bool want_destroy; + isc_result_t result; + isc_result_t eresult; + isc_result_t saved_result; UNUSED(task); INSIST(event->ev_type == DNS_EVENT_VALIDATORDONE); @@ -697,13 +685,12 @@ validator_callback_dnskey(isc_task_t *task, isc_event_t *event) * Resumes validation of the zone key or the unsecure zone proof. */ static void -validator_callback_ds(isc_task_t *task, isc_event_t *event) -{ +validator_callback_ds(isc_task_t *task, isc_event_t *event) { dns_validatorevent_t *devent; - dns_validator_t * val; - bool want_destroy; - isc_result_t result; - isc_result_t eresult; + dns_validator_t *val; + bool want_destroy; + isc_result_t result; + isc_result_t eresult; UNUSED(task); INSIST(event->ev_type == DNS_EVENT_VALIDATORDONE); @@ -722,7 +709,7 @@ validator_callback_ds(isc_task_t *task, isc_event_t *event) if (CANCELED(val)) { validator_done(val, ISC_R_CANCELED); } else if (eresult == ISC_R_SUCCESS) { - bool have_dsset; + bool have_dsset; dns_name_t *name; validator_log(val, ISC_LOG_DEBUG(3), "%s with trust %s", val->frdataset.type == dns_rdatatype_ds ? "dsset" @@ -736,7 +723,8 @@ validator_callback_ds(isc_task_t *task, isc_event_t *event) if ((val->attributes & VALATTR_INSECURITY) != 0 && val->frdataset.covers == dns_rdatatype_ds && NEGATIVE(&val->frdataset) && - isdelegation(name, &val->frdataset, DNS_R_NCACHENXRRSET)) { + isdelegation(name, &val->frdataset, DNS_R_NCACHENXRRSET)) + { result = markanswer(val, "validator_callback_ds", "no DS and this is a delegation"); } else if ((val->attributes & VALATTR_INSECURITY) != 0) { @@ -770,13 +758,12 @@ validator_callback_ds(isc_task_t *task, isc_event_t *event) * Resumes validation of the unsecure zone proof. */ static void -validator_callback_cname(isc_task_t *task, isc_event_t *event) -{ +validator_callback_cname(isc_task_t *task, isc_event_t *event) { dns_validatorevent_t *devent; - dns_validator_t * val; - bool want_destroy; - isc_result_t result; - isc_result_t eresult; + dns_validator_t *val; + bool want_destroy; + isc_result_t result; + isc_result_t eresult; UNUSED(task); INSIST(event->ev_type == DNS_EVENT_VALIDATORDONE); @@ -827,14 +814,13 @@ validator_callback_cname(isc_task_t *task, isc_event_t *event) * Resumes the negative response validation by calling validate_nx(). */ static void -validator_callback_nsec(isc_task_t *task, isc_event_t *event) -{ +validator_callback_nsec(isc_task_t *task, isc_event_t *event) { dns_validatorevent_t *devent; - dns_validator_t * val; - dns_rdataset_t * rdataset; - bool want_destroy; - isc_result_t result; - bool exists, data; + dns_validator_t *val; + dns_rdataset_t *rdataset; + bool want_destroy; + isc_result_t result; + bool exists, data; UNUSED(task); INSIST(event->ev_type == DNS_EVENT_VALIDATORDONE); @@ -868,7 +854,7 @@ validator_callback_nsec(isc_task_t *task, isc_event_t *event) } } else { dns_name_t **proofs = val->event->proofs; - dns_name_t * wild = dns_fixedname_name(&val->wild); + dns_name_t *wild = dns_fixedname_name(&val->wild); if (rdataset->type == dns_rdatatype_nsec && rdataset->trust == dns_trust_secure && @@ -877,7 +863,8 @@ validator_callback_nsec(isc_task_t *task, isc_event_t *event) dns_nsec_noexistnodata(val->event->type, val->event->name, devent->name, rdataset, &exists, &data, wild, validator_log, - val) == ISC_R_SUCCESS) { + val) == ISC_R_SUCCESS) + { if (exists && !data) { val->attributes |= VALATTR_FOUNDNODATA; if (NEEDNODATA(val)) { @@ -886,7 +873,7 @@ validator_callback_nsec(isc_task_t *task, isc_event_t *event) } } if (!exists) { - dns_name_t * closest; + dns_name_t *closest; unsigned int clabels; val->attributes |= VALATTR_FOUNDNOQNAME; @@ -946,20 +933,20 @@ validator_callback_nsec(isc_task_t *task, isc_event_t *event) * \li DNS_R_BROKENCHAIN */ static inline isc_result_t -view_find(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type) -{ +view_find(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type) { dns_fixedname_t fixedname; - dns_name_t * foundname; - isc_result_t result; - unsigned int options; - isc_time_t now; - char namebuf[DNS_NAME_FORMATSIZE]; - char typebuf[DNS_RDATATYPE_FORMATSIZE]; + dns_name_t *foundname; + isc_result_t result; + unsigned int options; + isc_time_t now; + char namebuf[DNS_NAME_FORMATSIZE]; + char typebuf[DNS_RDATATYPE_FORMATSIZE]; disassociate_rdatasets(val); if (isc_time_now(&now) == ISC_R_SUCCESS && - dns_resolver_getbadcache(val->view->resolver, name, type, &now)) { + dns_resolver_getbadcache(val->view->resolver, name, type, &now)) + { dns_name_format(name, namebuf, sizeof(namebuf)); dns_rdatatype_format(type, typebuf, sizeof(typebuf)); validator_log(val, ISC_LOG_INFO, "bad cache hit (%s/%s)", @@ -977,7 +964,8 @@ view_find(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type) goto notfound; } else if (result != ISC_R_SUCCESS && result != DNS_R_NCACHENXDOMAIN && result != DNS_R_NCACHENXRRSET && result != DNS_R_EMPTYNAME && - result != DNS_R_NXRRSET && result != ISC_R_NOTFOUND) { + result != DNS_R_NXRRSET && result != ISC_R_NOTFOUND) + { result = ISC_R_NOTFOUND; goto notfound; } @@ -996,8 +984,7 @@ notfound: */ static inline bool check_deadlock(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { dns_validator_t *parent; for (parent = val; parent != NULL; parent = parent->parent) { @@ -1012,7 +999,8 @@ check_deadlock(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type, rdataset == NULL || sigrdataset == NULL || parent->event->message == NULL || parent->event->rdataset != NULL || - parent->event->sigrdataset != NULL)) { + parent->event->sigrdataset != NULL)) + { validator_log(val, ISC_LOG_DEBUG(3), "continuing validation would lead to " "deadlock: aborting validation"); @@ -1027,8 +1015,7 @@ check_deadlock(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type, */ static inline isc_result_t create_fetch(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type, - isc_taskaction_t callback, const char *caller) -{ + isc_taskaction_t callback, const char *caller) { unsigned int fopts = 0; disassociate_rdatasets(val); @@ -1060,10 +1047,9 @@ create_fetch(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type, static inline isc_result_t create_validator(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, - isc_taskaction_t action, const char *caller) -{ - isc_result_t result; - unsigned int vopts = 0; + isc_taskaction_t action, const char *caller) { + isc_result_t result; + unsigned int vopts = 0; dns_rdataset_t *sig = NULL; if (sigrdataset != NULL && dns_rdataset_isassociated(sigrdataset)) { @@ -1077,8 +1063,8 @@ create_validator(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type, } /* OK to clear other options, but preserve NOCDFLAG and NONTA. */ - vopts |= - (val->options & (DNS_VALIDATOR_NOCDFLAG | DNS_VALIDATOR_NONTA)); + vopts |= (val->options & + (DNS_VALIDATOR_NOCDFLAG | DNS_VALIDATOR_NONTA)); validator_logcreate(val, name, type, caller, "validator"); result = dns_validator_create(val->view, name, type, rdataset, sig, @@ -1104,14 +1090,13 @@ create_validator(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type, * ISC_R_NOTFOUND if not. Any other value indicates error. */ static isc_result_t -select_signing_key(dns_validator_t *val, dns_rdataset_t *rdataset) -{ - isc_result_t result; +select_signing_key(dns_validator_t *val, dns_rdataset_t *rdataset) { + isc_result_t result; dns_rdata_rrsig_t *siginfo = val->siginfo; - isc_buffer_t b; - dns_rdata_t rdata = DNS_RDATA_INIT; - dst_key_t * oldkey = val->key; - bool foundold; + isc_buffer_t b; + dns_rdata_t rdata = DNS_RDATA_INIT; + dst_key_t *oldkey = val->key; + bool foundold; if (oldkey == NULL) { foundold = true; @@ -1137,7 +1122,8 @@ select_signing_key(dns_validator_t *val, dns_rdataset_t *rdataset) } if (siginfo->algorithm == (dns_secalg_t)dst_key_alg(val->key) && siginfo->keyid == (dns_keytag_t)dst_key_id(val->key) && - dst_key_iszonekey(val->key)) { + dst_key_iszonekey(val->key)) + { if (foundold) { /* * This is the key we're looking for. @@ -1169,13 +1155,12 @@ failure: * Get the key that generated the signature in val->siginfo. */ static isc_result_t -seek_dnskey(dns_validator_t *val) -{ - isc_result_t result; +seek_dnskey(dns_validator_t *val) { + isc_result_t result; dns_rdata_rrsig_t *siginfo = val->siginfo; - unsigned int nlabels; - int order; - dns_namereln_t namereln; + unsigned int nlabels; + int order; + dns_namereln_t namereln; /* * Is the signer name appropriate for this signature? @@ -1212,7 +1197,8 @@ seek_dnskey(dns_validator_t *val) * the same name. */ if (val->event->rdataset->type == dns_rdatatype_soa || - val->event->rdataset->type == dns_rdatatype_ns) { + val->event->rdataset->type == dns_rdatatype_ns) + { const char *type; if (val->event->rdataset->type == dns_rdatatype_soa) { @@ -1238,7 +1224,8 @@ seek_dnskey(dns_validator_t *val) val->keyset = &val->frdataset; if ((DNS_TRUST_PENDING(val->frdataset.trust) || DNS_TRUST_ANSWER(val->frdataset.trust)) && - dns_rdataset_isassociated(&val->fsigrdataset)) { + dns_rdataset_isassociated(&val->fsigrdataset)) + { /* * We know the key but haven't validated it yet or * we have a key of trust answer but a DS @@ -1315,7 +1302,8 @@ seek_dnskey(dns_validator_t *val) } if (dns_rdataset_isassociated(&val->frdataset) && - val->keyset != &val->frdataset) { + val->keyset != &val->frdataset) + { dns_rdataset_disassociate(&val->frdataset); } if (dns_rdataset_isassociated(&val->fsigrdataset)) { @@ -1329,8 +1317,7 @@ seek_dnskey(dns_validator_t *val) * Compute the tag for a key represented in a DNSKEY rdata. */ static dns_keytag_t -compute_keytag(dns_rdata_t *rdata) -{ +compute_keytag(dns_rdata_t *rdata) { isc_region_t r; dns_rdata_toregion(rdata, &r); @@ -1341,26 +1328,26 @@ compute_keytag(dns_rdata_t *rdata) * Is the DNSKEY rrset in val->event->rdataset self-signed? */ static bool -selfsigned_dnskey(dns_validator_t *val) -{ +selfsigned_dnskey(dns_validator_t *val) { dns_rdataset_t *rdataset = val->event->rdataset; dns_rdataset_t *sigrdataset = val->event->sigrdataset; - dns_name_t * name = val->event->name; - isc_result_t result; - isc_mem_t * mctx = val->view->mctx; - bool answer = false; + dns_name_t *name = val->event->name; + isc_result_t result; + isc_mem_t *mctx = val->view->mctx; + bool answer = false; if (rdataset->type != dns_rdatatype_dnskey) { return (false); } for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { - dns_rdata_t keyrdata = DNS_RDATA_INIT; - dns_rdata_t sigrdata = DNS_RDATA_INIT; + result = dns_rdataset_next(rdataset)) + { + dns_rdata_t keyrdata = DNS_RDATA_INIT; + dns_rdata_t sigrdata = DNS_RDATA_INIT; dns_rdata_dnskey_t key; - dns_rdata_rrsig_t sig; - dns_keytag_t keytag; + dns_rdata_rrsig_t sig; + dns_keytag_t keytag; dns_rdata_reset(&keyrdata); dns_rdataset_current(rdataset, &keyrdata); @@ -1370,7 +1357,8 @@ selfsigned_dnskey(dns_validator_t *val) for (result = dns_rdataset_first(sigrdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(sigrdataset)) { + result = dns_rdataset_next(sigrdataset)) + { dst_key_t *dstkey = NULL; dns_rdata_reset(&sigrdata); @@ -1380,7 +1368,8 @@ selfsigned_dnskey(dns_validator_t *val) if (sig.algorithm != key.algorithm || sig.keyid != keytag || - !dns_name_equal(name, &sig.signer)) { + !dns_name_equal(name, &sig.signer)) + { continue; } @@ -1420,12 +1409,12 @@ selfsigned_dnskey(dns_validator_t *val) * \li Others if the verification fails. */ static isc_result_t -verify(dns_validator_t *val, dst_key_t *key, dns_rdata_t *rdata, uint16_t keyid) -{ - isc_result_t result; +verify(dns_validator_t *val, dst_key_t *key, dns_rdata_t *rdata, + uint16_t keyid) { + isc_result_t result; dns_fixedname_t fixed; - bool ignore = false; - dns_name_t * wild; + bool ignore = false; + dns_name_t *wild; val->attributes |= VALATTR_TRIEDVERIFY; wild = dns_fixedname_initname(&fixed); @@ -1434,13 +1423,14 @@ again: ignore, val->view->maxbits, val->view->mctx, rdata, wild); if ((result == DNS_R_SIGEXPIRED || result == DNS_R_SIGFUTURE) && - val->view->acceptexpired) { + val->view->acceptexpired) + { ignore = true; goto again; } - if (ignore && - (result == ISC_R_SUCCESS || result == DNS_R_FROMWILDCARD)) { + if (ignore && (result == ISC_R_SUCCESS || result == DNS_R_FROMWILDCARD)) + { validator_log(val, ISC_LOG_INFO, "accepted expired %sRRSIG (keyid=%u)", (result == DNS_R_FROMWILDCARD) ? "wildcard " : "", @@ -1457,7 +1447,7 @@ again: } if (result == DNS_R_FROMWILDCARD) { if (!dns_name_equal(val->event->name, wild)) { - dns_name_t * closest; + dns_name_t *closest; unsigned int labels; /* @@ -1485,11 +1475,10 @@ again: * \li Other return codes are possible and all indicate failure. */ static isc_result_t -validate_answer(dns_validator_t *val, bool resume) -{ - isc_result_t result, vresult = DNS_R_NOVALIDSIG; +validate_answer(dns_validator_t *val, bool resume) { + isc_result_t result, vresult = DNS_R_NOVALIDSIG; dns_validatorevent_t *event; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_t rdata = DNS_RDATA_INIT; /* * Caller must be holding the validator lock. @@ -1524,9 +1513,10 @@ validate_answer(dns_validator_t *val, bool resume) * At this point we could check that the signature algorithm * was known and "sufficiently good". */ - if (!dns_resolver_algorithm_supported( - val->view->resolver, event->name, - val->siginfo->algorithm)) { + if (!dns_resolver_algorithm_supported(val->view->resolver, + event->name, + val->siginfo->algorithm)) + { resume = false; continue; } @@ -1621,15 +1611,15 @@ validate_answer(dns_validator_t *val, bool resume) */ static isc_result_t check_signer(dns_validator_t *val, dns_rdata_t *keyrdata, uint16_t keyid, - dns_secalg_t algorithm) -{ + dns_secalg_t algorithm) { dns_rdata_rrsig_t sig; - dst_key_t * dstkey = NULL; - isc_result_t result; + dst_key_t *dstkey = NULL; + isc_result_t result; for (result = dns_rdataset_first(val->event->sigrdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(val->event->sigrdataset)) { + result = dns_rdataset_next(val->event->sigrdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(val->event->sigrdataset, &rdata); @@ -1676,8 +1666,7 @@ check_signer(dns_validator_t *val, dns_rdata_t *keyrdata, uint16_t keyid, * continue the zone key validation. */ static isc_result_t -get_dsset(dns_validator_t *val, dns_name_t *tname, isc_result_t *resp) -{ +get_dsset(dns_validator_t *val, dns_name_t *tname, isc_result_t *resp) { isc_result_t result; result = view_find(val, tname, dns_rdatatype_ds); @@ -1690,7 +1679,8 @@ get_dsset(dns_validator_t *val, dns_name_t *tname, isc_result_t *resp) INSIST(val->keynode == NULL); if ((DNS_TRUST_PENDING(val->frdataset.trust) || DNS_TRUST_ANSWER(val->frdataset.trust)) && - dns_rdataset_isassociated(&val->fsigrdataset)) { + dns_rdataset_isassociated(&val->fsigrdataset)) + { /* * ... which is signed but not yet validated. */ @@ -1765,15 +1755,14 @@ get_dsset(dns_validator_t *val, dns_name_t *tname, isc_result_t *resp) * \li Other return codes are possible and all indicate failure. */ static isc_result_t -validate_dnskey(dns_validator_t *val) -{ - isc_result_t result; - dns_rdata_t dsrdata = DNS_RDATA_INIT; - dns_rdata_t keyrdata = DNS_RDATA_INIT; +validate_dnskey(dns_validator_t *val) { + isc_result_t result; + dns_rdata_t dsrdata = DNS_RDATA_INIT; + dns_rdata_t keyrdata = DNS_RDATA_INIT; dns_keynode_t *keynode = NULL; dns_rdata_ds_t ds; - bool supported_algorithm; - char digest_types[256]; + bool supported_algorithm; + char digest_types[256]; /* * If we don't already have a DS RRset, check to see if there's @@ -1857,7 +1846,8 @@ validate_dnskey(dns_validator_t *val) */ memset(digest_types, 1, sizeof(digest_types)); for (result = dns_rdataset_first(val->dsset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(val->dsset)) { + result = dns_rdataset_next(val->dsset)) + { dns_rdata_reset(&dsrdata); dns_rdataset_current(val->dsset, &dsrdata); result = dns_rdata_tostruct(&dsrdata, &ds, NULL); @@ -1865,27 +1855,31 @@ validate_dnskey(dns_validator_t *val) if (!dns_resolver_ds_digest_supported(val->view->resolver, val->event->name, - ds.digest_type)) { + ds.digest_type)) + { continue; } if (!dns_resolver_algorithm_supported(val->view->resolver, val->event->name, - ds.algorithm)) { + ds.algorithm)) + { continue; } if ((ds.digest_type == DNS_DSDIGEST_SHA256 && ds.length == ISC_SHA256_DIGESTLENGTH) || (ds.digest_type == DNS_DSDIGEST_SHA384 && - ds.length == ISC_SHA384_DIGESTLENGTH)) { + ds.length == ISC_SHA384_DIGESTLENGTH)) + { digest_types[DNS_DSDIGEST_SHA1] = 0; break; } } for (result = dns_rdataset_first(val->dsset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(val->dsset)) { + result = dns_rdataset_next(val->dsset)) + { dns_rdata_reset(&dsrdata); dns_rdataset_current(val->dsset, &dsrdata); result = dns_rdata_tostruct(&dsrdata, &ds, NULL); @@ -1897,13 +1891,15 @@ validate_dnskey(dns_validator_t *val) if (!dns_resolver_ds_digest_supported(val->view->resolver, val->event->name, - ds.digest_type)) { + ds.digest_type)) + { continue; } if (!dns_resolver_algorithm_supported(val->view->resolver, val->event->name, - ds.algorithm)) { + ds.algorithm)) + { continue; } @@ -1961,10 +1957,9 @@ cleanup: */ static isc_result_t val_rdataset_first(dns_validator_t *val, dns_name_t **namep, - dns_rdataset_t **rdatasetp) -{ + dns_rdataset_t **rdatasetp) { dns_message_t *message = val->event->message; - isc_result_t result; + isc_result_t result; REQUIRE(rdatasetp != NULL); REQUIRE(namep != NULL); @@ -1996,10 +1991,9 @@ val_rdataset_first(dns_validator_t *val, dns_name_t **namep, static isc_result_t val_rdataset_next(dns_validator_t *val, dns_name_t **namep, - dns_rdataset_t **rdatasetp) -{ + dns_rdataset_t **rdatasetp) { dns_message_t *message = val->event->message; - isc_result_t result = ISC_R_SUCCESS; + isc_result_t result = ISC_R_SUCCESS; REQUIRE(rdatasetp != NULL && *rdatasetp != NULL); REQUIRE(namep != NULL && *namep != NULL); @@ -2039,12 +2033,12 @@ val_rdataset_next(dns_validator_t *val, dns_name_t **namep, * \li ISC_R_SUCCESS */ static isc_result_t -checkwildcard(dns_validator_t *val, dns_rdatatype_t type, dns_name_t *zonename) -{ - dns_name_t * name, *wild, tname; - isc_result_t result; - bool exists, data; - char namebuf[DNS_NAME_FORMATSIZE]; +checkwildcard(dns_validator_t *val, dns_rdatatype_t type, + dns_name_t *zonename) { + dns_name_t *name, *wild, tname; + isc_result_t result; + bool exists, data; + char namebuf[DNS_NAME_FORMATSIZE]; dns_rdataset_t *rdataset, trdataset; dns_name_init(&tname, NULL); @@ -2070,7 +2064,8 @@ checkwildcard(dns_validator_t *val, dns_rdatatype_t type, dns_name_t *zonename) for (result = val_rdataset_first(val, &name, &rdataset); result == ISC_R_SUCCESS; - result = val_rdataset_next(val, &name, &rdataset)) { + result = val_rdataset_next(val, &name, &rdataset)) + { if (rdataset->type != type || rdataset->trust != dns_trust_secure) { continue; @@ -2079,9 +2074,10 @@ checkwildcard(dns_validator_t *val, dns_rdatatype_t type, dns_name_t *zonename) if (rdataset->type == dns_rdatatype_nsec && (NEEDNODATA(val) || NEEDNOWILDCARD(val)) && !FOUNDNODATA(val) && !FOUNDNOWILDCARD(val) && - dns_nsec_noexistnodata( - val->event->type, wild, name, rdataset, &exists, - &data, NULL, validator_log, val) == ISC_R_SUCCESS) { + dns_nsec_noexistnodata(val->event->type, wild, name, + rdataset, &exists, &data, NULL, + validator_log, val) == ISC_R_SUCCESS) + { dns_name_t **proofs = val->event->proofs; if (exists && !data) { val->attributes |= VALATTR_FOUNDNODATA; @@ -2107,7 +2103,8 @@ checkwildcard(dns_validator_t *val, dns_rdatatype_t type, dns_name_t *zonename) dns_nsec3_noexistnodata( val->event->type, wild, name, rdataset, zonename, &exists, &data, NULL, NULL, NULL, NULL, NULL, NULL, - validator_log, val) == ISC_R_SUCCESS) { + validator_log, val) == ISC_R_SUCCESS) + { dns_name_t **proofs = val->event->proofs; if (exists && !data) { val->attributes |= VALATTR_FOUNDNODATA; @@ -2142,15 +2139,14 @@ checkwildcard(dns_validator_t *val, dns_rdatatype_t type, dns_name_t *zonename) * are found. */ static isc_result_t -findnsec3proofs(dns_validator_t *val) -{ - dns_name_t * name, tname; - isc_result_t result; - bool exists, data, optout, unknown; - bool setclosest, setnearest, *setclosestp; +findnsec3proofs(dns_validator_t *val) { + dns_name_t *name, tname; + isc_result_t result; + bool exists, data, optout, unknown; + bool setclosest, setnearest, *setclosestp; dns_fixedname_t fclosest, fnearest, fzonename; - dns_name_t * closest, *nearest, *zonename, *closestp; - dns_name_t ** proofs = val->event->proofs; + dns_name_t *closest, *nearest, *zonename, *closestp; + dns_name_t **proofs = val->event->proofs; dns_rdataset_t *rdataset, trdataset; dns_name_init(&tname, NULL); @@ -2169,9 +2165,11 @@ findnsec3proofs(dns_validator_t *val) for (result = val_rdataset_first(val, &name, &rdataset); result == ISC_R_SUCCESS; - result = val_rdataset_next(val, &name, &rdataset)) { + result = val_rdataset_next(val, &name, &rdataset)) + { if (rdataset->type != dns_rdatatype_nsec3 || - rdataset->trust != dns_trust_secure) { + rdataset->trust != dns_trust_secure) + { continue; } @@ -2217,9 +2215,11 @@ findnsec3proofs(dns_validator_t *val) for (result = val_rdataset_first(val, &name, &rdataset); result == ISC_R_SUCCESS; - result = val_rdataset_next(val, &name, &rdataset)) { + result = val_rdataset_next(val, &name, &rdataset)) + { if (rdataset->type != dns_rdatatype_nsec3 || - rdataset->trust != dns_trust_secure) { + rdataset->trust != dns_trust_secure) + { continue; } @@ -2268,7 +2268,8 @@ findnsec3proofs(dns_validator_t *val) if (dns_name_countlabels(closest) > 0 && dns_name_countlabels(nearest) == dns_name_countlabels(closest) + 1 && - dns_name_issubdomain(nearest, closest)) { + dns_name_issubdomain(nearest, closest)) + { val->attributes |= VALATTR_FOUNDCLOSEST; result = dns_name_concatenate(dns_wildcardname, closest, dns_fixedname_name(&val->wild), @@ -2284,7 +2285,8 @@ findnsec3proofs(dns_validator_t *val) * Do we need to check for the wildcard? */ if (FOUNDNOQNAME(val) && FOUNDCLOSEST(val) && - ((NEEDNODATA(val) && !FOUNDNODATA(val)) || NEEDNOWILDCARD(val))) { + ((NEEDNODATA(val) && !FOUNDNODATA(val)) || NEEDNOWILDCARD(val))) + { result = checkwildcard(val, dns_rdatatype_nsec3, zonename); if (result != ISC_R_SUCCESS) { return (result); @@ -2304,8 +2306,7 @@ findnsec3proofs(dns_validator_t *val) */ static isc_result_t validate_neg_rrset(dns_validator_t *val, dns_name_t *name, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { isc_result_t result; /* @@ -2320,7 +2321,8 @@ validate_neg_rrset(dns_validator_t *val, dns_name_t *name, */ if (val->event->type == dns_rdatatype_dnskey && rdataset->type == dns_rdatatype_nsec && - dns_name_equal(name, val->event->name)) { + dns_name_equal(name, val->event->name)) + { dns_rdata_t nsec = DNS_RDATA_INIT; result = dns_rdataset_first(rdataset); @@ -2349,11 +2351,10 @@ validate_neg_rrset(dns_validator_t *val, dns_name_t *name, * Validate the authority section records. */ static isc_result_t -validate_authority(dns_validator_t *val, bool resume) -{ - dns_name_t * name; +validate_authority(dns_validator_t *val, bool resume) { + dns_name_t *name; dns_message_t *message = val->event->message; - isc_result_t result; + isc_result_t result; if (!resume) { result = dns_message_firstname(message, DNS_SECTION_AUTHORITY); @@ -2362,7 +2363,8 @@ validate_authority(dns_validator_t *val, bool resume) } for (; result == ISC_R_SUCCESS; - result = dns_message_nextname(message, DNS_SECTION_AUTHORITY)) { + result = dns_message_nextname(message, DNS_SECTION_AUTHORITY)) + { dns_rdataset_t *rdataset = NULL, *sigrdataset = NULL; name = NULL; @@ -2383,9 +2385,11 @@ validate_authority(dns_validator_t *val, bool resume) for (sigrdataset = ISC_LIST_HEAD(name->list); sigrdataset != NULL; - sigrdataset = ISC_LIST_NEXT(sigrdataset, link)) { + sigrdataset = ISC_LIST_NEXT(sigrdataset, link)) + { if (sigrdataset->type == dns_rdatatype_rrsig && - sigrdataset->covers == rdataset->type) { + sigrdataset->covers == rdataset->type) + { break; } } @@ -2407,9 +2411,8 @@ validate_authority(dns_validator_t *val, bool resume) * Validate negative cache elements. */ static isc_result_t -validate_ncache(dns_validator_t *val, bool resume) -{ - dns_name_t * name; +validate_ncache(dns_validator_t *val, bool resume) { + dns_name_t *name; isc_result_t result; if (!resume) { @@ -2419,7 +2422,8 @@ validate_ncache(dns_validator_t *val, bool resume) } for (; result == ISC_R_SUCCESS; - result = dns_rdataset_next(val->event->rdataset)) { + result = dns_rdataset_next(val->event->rdataset)) + { dns_rdataset_t *rdataset, *sigrdataset = NULL; disassociate_rdatasets(val); @@ -2467,8 +2471,7 @@ validate_ncache(dns_validator_t *val, bool resume) * response. */ static isc_result_t -validate_nx(dns_validator_t *val, bool resume) -{ +validate_nx(dns_validator_t *val, bool resume) { isc_result_t result; if (resume) { @@ -2494,15 +2497,16 @@ validate_nx(dns_validator_t *val, bool resume) findnsec3proofs(val); } - if (FOUNDNOQNAME(val) && FOUNDCLOSEST(val) && - !FOUNDOPTOUT(val)) { + if (FOUNDNOQNAME(val) && FOUNDCLOSEST(val) && !FOUNDOPTOUT(val)) + { validator_log(val, ISC_LOG_DEBUG(3), "marking as secure, noqname proof found"); marksecure(val->event); return (ISC_R_SUCCESS); } else if (FOUNDOPTOUT(val) && dns_name_countlabels( - dns_fixedname_name(&val->wild)) != 0) { + dns_fixedname_name(&val->wild)) != 0) + { validator_log(val, ISC_LOG_DEBUG(3), "optout proof found"); val->event->optout = true; @@ -2527,7 +2531,8 @@ validate_nx(dns_validator_t *val, bool resume) * Do we need to check for the wildcard? */ if (FOUNDNOQNAME(val) && FOUNDCLOSEST(val) && - ((NEEDNODATA(val) && !FOUNDNODATA(val)) || NEEDNOWILDCARD(val))) { + ((NEEDNODATA(val) && !FOUNDNODATA(val)) || NEEDNOWILDCARD(val))) + { result = checkwildcard(val, dns_rdatatype_nsec, NULL); if (result != ISC_R_SUCCESS) { return (result); @@ -2536,7 +2541,8 @@ validate_nx(dns_validator_t *val, bool resume) if ((NEEDNODATA(val) && (FOUNDNODATA(val) || FOUNDOPTOUT(val))) || (NEEDNOQNAME(val) && FOUNDNOQNAME(val) && NEEDNOWILDCARD(val) && - FOUNDNOWILDCARD(val) && FOUNDCLOSEST(val))) { + FOUNDNOWILDCARD(val) && FOUNDCLOSEST(val))) + { if ((val->attributes & VALATTR_FOUNDOPTOUT) != 0) { val->event->optout = true; } @@ -2563,14 +2569,15 @@ validate_nx(dns_validator_t *val, bool resume) * a supported algorithm and digest. */ static bool -check_ds_algs(dns_validator_t *val, dns_name_t *name, dns_rdataset_t *rdataset) -{ - dns_rdata_t dsrdata = DNS_RDATA_INIT; +check_ds_algs(dns_validator_t *val, dns_name_t *name, + dns_rdataset_t *rdataset) { + dns_rdata_t dsrdata = DNS_RDATA_INIT; dns_rdata_ds_t ds; - isc_result_t result; + isc_result_t result; for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { dns_rdataset_current(rdataset, &dsrdata); result = dns_rdata_tostruct(&dsrdata, &ds, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); @@ -2578,7 +2585,8 @@ check_ds_algs(dns_validator_t *val, dns_name_t *name, dns_rdataset_t *rdataset) if (dns_resolver_ds_digest_supported(val->view->resolver, name, ds.digest_type) && dns_resolver_algorithm_supported(val->view->resolver, name, - ds.algorithm)) { + ds.algorithm)) + { dns_rdata_reset(&dsrdata); return (true); } @@ -2602,13 +2610,12 @@ check_ds_algs(dns_validator_t *val, dns_name_t *name, dns_rdataset_t *rdataset) * continue walking down labels. */ static isc_result_t -seek_ds(dns_validator_t *val, isc_result_t *resp) -{ - isc_result_t result; - char namebuf[DNS_NAME_FORMATSIZE]; +seek_ds(dns_validator_t *val, isc_result_t *resp) { + isc_result_t result; + char namebuf[DNS_NAME_FORMATSIZE]; dns_fixedname_t fixedfound; - dns_name_t * found = dns_fixedname_initname(&fixedfound); - dns_name_t * tname = dns_fixedname_initname(&val->fname); + dns_name_t *found = dns_fixedname_initname(&fixedfound); + dns_name_t *tname = dns_fixedname_initname(&val->fname); if (val->labels == dns_name_countlabels(val->event->name)) { dns_name_copynf(val->event->name, tname); @@ -2687,7 +2694,8 @@ seek_ds(dns_validator_t *val, isc_result_t *resp) * has switched from insecure to should be secure. */ if (DNS_TRUST_PENDING(val->frdataset.trust) || - DNS_TRUST_ANSWER(val->frdataset.trust)) { + DNS_TRUST_ANSWER(val->frdataset.trust)) + { result = create_validator( val, tname, dns_rdatatype_ds, &val->frdataset, &val->fsigrdataset, validator_callback_ds, @@ -2709,7 +2717,8 @@ seek_ds(dns_validator_t *val, isc_result_t *resp) dns_view_findzonecut(val->view, tname, found, NULL, 0, 0, false, false, NULL, NULL) == ISC_R_SUCCESS && - dns_name_equal(tname, found)) { + dns_name_equal(tname, found)) + { *resp = markanswer(val, "proveunsecure (3)", "no DS at zone cut"); return (ISC_R_COMPLETE); @@ -2751,7 +2760,8 @@ seek_ds(dns_validator_t *val, isc_result_t *resp) *resp = DNS_R_NOVALIDNSEC; return (ISC_R_COMPLETE); } else if (DNS_TRUST_PENDING(val->frdataset.trust) || - DNS_TRUST_ANSWER(val->frdataset.trust)) { + DNS_TRUST_ANSWER(val->frdataset.trust)) + { /* * If we have "trust == answer" then this * namespace has switched from insecure to @@ -2785,7 +2795,8 @@ seek_ds(dns_validator_t *val, isc_result_t *resp) case DNS_R_CNAME: if (DNS_TRUST_PENDING(val->frdataset.trust) || - DNS_TRUST_ANSWER(val->frdataset.trust)) { + DNS_TRUST_ANSWER(val->frdataset.trust)) + { result = create_validator( val, tname, dns_rdatatype_cname, &val->frdataset, &val->fsigrdataset, @@ -2831,13 +2842,12 @@ seek_ds(dns_validator_t *val, isc_result_t *resp) * \li DNS_R_BROKENCHAIN */ static isc_result_t -proveunsecure(dns_validator_t *val, bool have_ds, bool resume) -{ - isc_result_t result; - char namebuf[DNS_NAME_FORMATSIZE]; +proveunsecure(dns_validator_t *val, bool have_ds, bool resume) { + isc_result_t result; + char namebuf[DNS_NAME_FORMATSIZE]; dns_fixedname_t fixedsecroot; - dns_name_t * secroot = dns_fixedname_initname(&fixedsecroot); - unsigned int labels; + dns_name_t *secroot = dns_fixedname_initname(&fixedsecroot); + unsigned int labels; /* * We're attempting to prove insecurity. @@ -2881,7 +2891,8 @@ proveunsecure(dns_validator_t *val, bool have_ds, bool resume) */ if (have_ds && val->frdataset.trust >= dns_trust_secure && !check_ds_algs(val, dns_fixedname_name(&val->fname), - &val->frdataset)) { + &val->frdataset)) + { dns_name_format(dns_fixedname_name(&val->fname), namebuf, sizeof(namebuf)); validator_log(val, ISC_LOG_DEBUG(3), @@ -2935,12 +2946,11 @@ out: * be an unsecure positive answer. */ static void -validator_start(isc_task_t *task, isc_event_t *event) -{ - dns_validator_t * val; +validator_start(isc_task_t *task, isc_event_t *event) { + dns_validator_t *val; dns_validatorevent_t *vevent; - bool want_destroy = false; - isc_result_t result = ISC_R_FAILURE; + bool want_destroy = false; + isc_result_t result = ISC_R_FAILURE; UNUSED(task); REQUIRE(event->ev_type == DNS_EVENT_VALIDATORSTART); @@ -3054,11 +3064,10 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, dns_message_t *message, unsigned int options, isc_task_t *task, isc_taskaction_t action, void *arg, - dns_validator_t **validatorp) -{ - isc_result_t result = ISC_R_FAILURE; - dns_validator_t * val; - isc_task_t * tclone = NULL; + dns_validator_t **validatorp) { + isc_result_t result = ISC_R_FAILURE; + dns_validator_t *val; + isc_task_t *tclone = NULL; dns_validatorevent_t *event; REQUIRE(name != NULL); @@ -3128,8 +3137,7 @@ cleanup: } void -dns_validator_send(dns_validator_t *validator) -{ +dns_validator_send(dns_validator_t *validator) { isc_event_t *event; REQUIRE(VALID_VALIDATOR(validator)); @@ -3144,8 +3152,7 @@ dns_validator_send(dns_validator_t *validator) } void -dns_validator_cancel(dns_validator_t *validator) -{ +dns_validator_cancel(dns_validator_t *validator) { dns_fetch_t *fetch = NULL; REQUIRE(VALID_VALIDATOR(validator)); @@ -3179,8 +3186,7 @@ dns_validator_cancel(dns_validator_t *validator) } static void -destroy(dns_validator_t *val) -{ +destroy(dns_validator_t *val) { isc_mem_t *mctx; REQUIRE(SHUTDOWN(val)); @@ -3212,10 +3218,9 @@ destroy(dns_validator_t *val) } void -dns_validator_destroy(dns_validator_t **validatorp) -{ +dns_validator_destroy(dns_validator_t **validatorp) { dns_validator_t *val; - bool want_destroy = false; + bool want_destroy = false; REQUIRE(validatorp != NULL); val = *validatorp; @@ -3236,12 +3241,12 @@ dns_validator_destroy(dns_validator_t **validatorp) static void validator_logv(dns_validator_t *val, isc_logcategory_t *category, - isc_logmodule_t *module, int level, const char *fmt, va_list ap) -{ - char msgbuf[2048]; + isc_logmodule_t *module, int level, const char *fmt, + va_list ap) { + char msgbuf[2048]; static const char spaces[] = " *"; - int depth = val->depth * 2; - const char * viewname, *sep1, *sep2; + int depth = val->depth * 2; + const char *viewname, *sep1, *sep2; vsnprintf(msgbuf, sizeof(msgbuf), fmt, ap); @@ -3258,7 +3263,8 @@ validator_logv(dns_validator_t *val, isc_logcategory_t *category, */ if (val->view->rdclass == dns_rdataclass_in && (strcmp(val->view->name, "_default") == 0 || - strcmp(val->view->name, DNS_CLIENTVIEW_NAME) == 0)) { + strcmp(val->view->name, DNS_CLIENTVIEW_NAME) == 0)) + { sep1 = viewname = sep2 = ""; } else { sep1 = "view "; @@ -3284,8 +3290,7 @@ validator_logv(dns_validator_t *val, isc_logcategory_t *category, } static void -validator_log(void *val, int level, const char *fmt, ...) -{ +validator_log(void *val, int level, const char *fmt, ...) { va_list ap; if (!isc_log_wouldlog(dns_lctx, level)) { @@ -3302,8 +3307,7 @@ validator_log(void *val, int level, const char *fmt, ...) static void validator_logcreate(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type, const char *caller, - const char *operation) -{ + const char *operation) { char namestr[DNS_NAME_FORMATSIZE]; char typestr[DNS_RDATATYPE_FORMATSIZE]; diff --git a/lib/dns/view.c b/lib/dns/view.c index 0f4ad47123..c2ec4cf131 100644 --- a/lib/dns/view.c +++ b/lib/dns/view.c @@ -74,23 +74,19 @@ #define REQSHUTDOWN(v) \ ((atomic_load(&(v)->attributes) & DNS_VIEWATTR_REQSHUTDOWN) != 0) -#define DNS_VIEW_DELONLYHASH 111 +#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, - dns_view_t **viewp) -{ - dns_view_t * view; + dns_view_t **viewp) { + dns_view_t *view; isc_result_t result; - char buffer[1024]; + char buffer[1024]; /* * Create a view. @@ -345,8 +341,7 @@ cleanup_name: } static inline void -destroy(dns_view_t *view) -{ +destroy(dns_view_t *view) { dns_dns64_t *dns64; dns_dlzdb_t *dlzdb; @@ -368,7 +363,7 @@ destroy(dns_view_t *view) if (view->dynamickeys != NULL) { isc_result_t result; char template[PATH_MAX]; - char keyfile[PATH_MAX]; + char keyfile[PATH_MAX]; FILE *fp = NULL; result = isc_file_mktemplate(NULL, template, sizeof(template)); @@ -416,12 +411,14 @@ destroy(dns_view_t *view) dns_catz_catzs_detach(&view->catzs); } for (dlzdb = ISC_LIST_HEAD(view->dlz_searched); dlzdb != NULL; - dlzdb = ISC_LIST_HEAD(view->dlz_searched)) { + dlzdb = ISC_LIST_HEAD(view->dlz_searched)) + { ISC_LIST_UNLINK(view->dlz_searched, dlzdb, link); dns_dlzdestroy(&dlzdb); } for (dlzdb = ISC_LIST_HEAD(view->dlz_unsearched); dlzdb != NULL; - dlzdb = ISC_LIST_HEAD(view->dlz_unsearched)) { + dlzdb = ISC_LIST_HEAD(view->dlz_unsearched)) + { ISC_LIST_UNLINK(view->dlz_unsearched, dlzdb, link); dns_dlzdestroy(&dlzdb); } @@ -499,7 +496,7 @@ destroy(dns_view_t *view) } if (view->delonly != NULL) { dns_name_t *name; - int i; + int i; for (i = 0; i < DNS_VIEW_DELONLYHASH; i++) { name = ISC_LIST_HEAD(view->delonly[i]); @@ -516,7 +513,7 @@ destroy(dns_view_t *view) } if (view->rootexclude != NULL) { dns_name_t *name; - int i; + int i; for (i = 0; i < DNS_VIEW_DELONLYHASH; i++) { name = ISC_LIST_HEAD(view->rootexclude[i]); @@ -548,7 +545,8 @@ destroy(dns_view_t *view) dns_ntatable_detach(&view->ntatable_priv); } for (dns64 = ISC_LIST_HEAD(view->dns64); dns64 != NULL; - dns64 = ISC_LIST_HEAD(view->dns64)) { + dns64 = ISC_LIST_HEAD(view->dns64)) + { dns_dns64_unlink(&view->dns64, dns64); dns_dns64_destroy(&dns64); } @@ -603,8 +601,7 @@ destroy(dns_view_t *view) } void -dns_view_attach(dns_view_t *source, dns_view_t **targetp) -{ +dns_view_attach(dns_view_t *source, dns_view_t **targetp) { REQUIRE(DNS_VIEW_VALID(source)); REQUIRE(targetp != NULL && *targetp == NULL); @@ -614,8 +611,7 @@ dns_view_attach(dns_view_t *source, dns_view_t **targetp) } static void -view_flushanddetach(dns_view_t **viewp, bool flush) -{ +view_flushanddetach(dns_view_t **viewp, bool flush) { REQUIRE(viewp != NULL && DNS_VIEW_VALID(*viewp)); dns_view_t *view = *viewp; *viewp = NULL; @@ -678,28 +674,24 @@ view_flushanddetach(dns_view_t **viewp, bool flush) } void -dns_view_flushanddetach(dns_view_t **viewp) -{ +dns_view_flushanddetach(dns_view_t **viewp) { view_flushanddetach(viewp, true); } void -dns_view_detach(dns_view_t **viewp) -{ +dns_view_detach(dns_view_t **viewp) { view_flushanddetach(viewp, false); } static isc_result_t -dialup(dns_zone_t *zone, void *dummy) -{ +dialup(dns_zone_t *zone, void *dummy) { UNUSED(dummy); dns_zone_dialup(zone); return (ISC_R_SUCCESS); } void -dns_view_dialup(dns_view_t *view) -{ +dns_view_dialup(dns_view_t *view) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(view->zonetable != NULL); @@ -707,8 +699,7 @@ dns_view_dialup(dns_view_t *view) } void -dns_view_weakattach(dns_view_t *source, dns_view_t **targetp) -{ +dns_view_weakattach(dns_view_t *source, dns_view_t **targetp) { REQUIRE(DNS_VIEW_VALID(source)); REQUIRE(targetp != NULL && *targetp == NULL); @@ -718,8 +709,7 @@ dns_view_weakattach(dns_view_t *source, dns_view_t **targetp) } void -dns_view_weakdetach(dns_view_t **viewp) -{ +dns_view_weakdetach(dns_view_t **viewp) { dns_view_t *view; REQUIRE(viewp != NULL); @@ -733,8 +723,7 @@ dns_view_weakdetach(dns_view_t **viewp) } static void -resolver_shutdown(isc_task_t *task, isc_event_t *event) -{ +resolver_shutdown(isc_task_t *task, isc_event_t *event) { dns_view_t *view = event->ev_arg; REQUIRE(event->ev_type == DNS_EVENT_VIEWRESSHUTDOWN); @@ -750,8 +739,7 @@ resolver_shutdown(isc_task_t *task, isc_event_t *event) } static void -adb_shutdown(isc_task_t *task, isc_event_t *event) -{ +adb_shutdown(isc_task_t *task, isc_event_t *event) { dns_view_t *view = event->ev_arg; REQUIRE(event->ev_type == DNS_EVENT_VIEWADBSHUTDOWN); @@ -768,8 +756,7 @@ adb_shutdown(isc_task_t *task, isc_event_t *event) } static void -req_shutdown(isc_task_t *task, isc_event_t *event) -{ +req_shutdown(isc_task_t *task, isc_event_t *event) { dns_view_t *view = event->ev_arg; REQUIRE(event->ev_type == DNS_EVENT_VIEWREQSHUTDOWN); @@ -786,8 +773,7 @@ req_shutdown(isc_task_t *task, isc_event_t *event) } isc_result_t -dns_view_createzonetable(dns_view_t *view) -{ +dns_view_createzonetable(dns_view_t *view) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(!view->frozen); REQUIRE(view->zonetable == NULL); @@ -800,11 +786,11 @@ dns_view_createresolver(dns_view_t *view, isc_taskmgr_t *taskmgr, unsigned int ntasks, unsigned int ndisp, isc_socketmgr_t *socketmgr, isc_timermgr_t *timermgr, unsigned int options, dns_dispatchmgr_t *dispatchmgr, - dns_dispatch_t *dispatchv4, dns_dispatch_t *dispatchv6) -{ + dns_dispatch_t *dispatchv4, + dns_dispatch_t *dispatchv6) { isc_result_t result; isc_event_t *event; - isc_mem_t * mctx = NULL; + isc_mem_t *mctx = NULL; REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(!view->frozen); @@ -861,8 +847,7 @@ dns_view_createresolver(dns_view_t *view, isc_taskmgr_t *taskmgr, } void -dns_view_setcache(dns_view_t *view, dns_cache_t *cache, bool shared) -{ +dns_view_setcache(dns_view_t *view, dns_cache_t *cache, bool shared) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(!view->frozen); @@ -877,16 +862,14 @@ dns_view_setcache(dns_view_t *view, dns_cache_t *cache, bool shared) } bool -dns_view_iscacheshared(dns_view_t *view) -{ +dns_view_iscacheshared(dns_view_t *view) { REQUIRE(DNS_VIEW_VALID(view)); return (view->cacheshared); } void -dns_view_sethints(dns_view_t *view, dns_db_t *hints) -{ +dns_view_sethints(dns_view_t *view, dns_db_t *hints) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(!view->frozen); REQUIRE(view->hints == NULL); @@ -896,8 +879,7 @@ dns_view_sethints(dns_view_t *view, dns_db_t *hints) } void -dns_view_setkeyring(dns_view_t *view, dns_tsig_keyring_t *ring) -{ +dns_view_setkeyring(dns_view_t *view, dns_tsig_keyring_t *ring) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(ring != NULL); if (view->statickeys != NULL) { @@ -907,8 +889,7 @@ dns_view_setkeyring(dns_view_t *view, dns_tsig_keyring_t *ring) } void -dns_view_setdynamickeyring(dns_view_t *view, dns_tsig_keyring_t *ring) -{ +dns_view_setdynamickeyring(dns_view_t *view, dns_tsig_keyring_t *ring) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(ring != NULL); if (view->dynamickeys != NULL) { @@ -918,8 +899,7 @@ dns_view_setdynamickeyring(dns_view_t *view, dns_tsig_keyring_t *ring) } void -dns_view_getdynamickeyring(dns_view_t *view, dns_tsig_keyring_t **ringp) -{ +dns_view_getdynamickeyring(dns_view_t *view, dns_tsig_keyring_t **ringp) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(ringp != NULL && *ringp == NULL); if (view->dynamickeys != NULL) { @@ -928,10 +908,9 @@ dns_view_getdynamickeyring(dns_view_t *view, dns_tsig_keyring_t **ringp) } void -dns_view_restorekeyring(dns_view_t *view) -{ - FILE * fp; - char keyfile[PATH_MAX]; +dns_view_restorekeyring(dns_view_t *view) { + FILE *fp; + char keyfile[PATH_MAX]; isc_result_t result; REQUIRE(DNS_VIEW_VALID(view)); @@ -950,15 +929,13 @@ dns_view_restorekeyring(dns_view_t *view) } void -dns_view_setdstport(dns_view_t *view, in_port_t dstport) -{ +dns_view_setdstport(dns_view_t *view, in_port_t dstport) { REQUIRE(DNS_VIEW_VALID(view)); view->dstport = dstport; } void -dns_view_freeze(dns_view_t *view) -{ +dns_view_freeze(dns_view_t *view) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(!view->frozen); @@ -970,8 +947,7 @@ dns_view_freeze(dns_view_t *view) } void -dns_view_thaw(dns_view_t *view) -{ +dns_view_thaw(dns_view_t *view) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(view->frozen); @@ -979,8 +955,7 @@ dns_view_thaw(dns_view_t *view) } isc_result_t -dns_view_addzone(dns_view_t *view, dns_zone_t *zone) -{ +dns_view_addzone(dns_view_t *view, dns_zone_t *zone) { isc_result_t result; REQUIRE(DNS_VIEW_VALID(view)); @@ -993,8 +968,8 @@ dns_view_addzone(dns_view_t *view, dns_zone_t *zone) } isc_result_t -dns_view_findzone(dns_view_t *view, const dns_name_t *name, dns_zone_t **zonep) -{ +dns_view_findzone(dns_view_t *view, const dns_name_t *name, + dns_zone_t **zonep) { isc_result_t result; REQUIRE(DNS_VIEW_VALID(view)); @@ -1019,14 +994,13 @@ dns_view_find(dns_view_t *view, const dns_name_t *name, dns_rdatatype_t type, isc_stdtime_t now, unsigned int options, bool use_hints, bool use_static_stub, dns_db_t **dbp, dns_dbnode_t **nodep, dns_name_t *foundname, dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset) -{ - isc_result_t result; - dns_db_t * db, *zdb; - dns_dbnode_t * node, *znode; - bool is_cache, is_staticstub_zone; + dns_rdataset_t *sigrdataset) { + isc_result_t result; + dns_db_t *db, *zdb; + dns_dbnode_t *node, *znode; + bool is_cache, is_staticstub_zone; dns_rdataset_t zrdataset, zsigrdataset; - dns_zone_t * zone; + dns_zone_t *zone; /* * Find an rdataset whose owner name is 'name', and whose type is @@ -1063,7 +1037,8 @@ dns_view_find(dns_view_t *view, const dns_name_t *name, dns_rdatatype_t type, } UNLOCK(&view->lock); if (zone != NULL && dns_zone_gettype(zone) == dns_zone_staticstub && - !use_static_stub) { + !use_static_stub) + { result = ISC_R_NOTFOUND; } if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) { @@ -1074,7 +1049,8 @@ dns_view_find(dns_view_t *view, const dns_name_t *name, dns_rdatatype_t type, goto cleanup; } if (dns_zone_gettype(zone) == dns_zone_staticstub && - dns_name_equal(name, dns_zone_getorigin(zone))) { + dns_name_equal(name, dns_zone_getorigin(zone))) + { is_staticstub_zone = true; } } else if (result == ISC_R_NOTFOUND && view->cachedb != NULL) { @@ -1252,9 +1228,8 @@ isc_result_t dns_view_simplefind(dns_view_t *view, const dns_name_t *name, dns_rdatatype_t type, isc_stdtime_t now, unsigned int options, bool use_hints, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ - isc_result_t result; + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { + isc_result_t result; dns_fixedname_t foundname; dns_fixedname_init(&foundname); @@ -1278,7 +1253,8 @@ dns_view_simplefind(dns_view_t *view, const dns_name_t *name, } else if (result != ISC_R_SUCCESS && result != DNS_R_GLUE && result != DNS_R_HINT && result != DNS_R_NCACHENXDOMAIN && result != DNS_R_NCACHENXRRSET && result != DNS_R_NXRRSET && - result != DNS_R_HINTNXRRSET && result != ISC_R_NOTFOUND) { + result != DNS_R_HINTNXRRSET && result != ISC_R_NOTFOUND) + { if (dns_rdataset_isassociated(rdataset)) { dns_rdataset_disassociate(rdataset); } @@ -1296,16 +1272,15 @@ isc_result_t dns_view_findzonecut(dns_view_t *view, const dns_name_t *name, dns_name_t *fname, dns_name_t *dcname, isc_stdtime_t now, unsigned int options, bool use_hints, bool use_cache, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ - isc_result_t result; - dns_db_t * db; - bool is_cache, use_zone, try_hints; - dns_zone_t * zone; - dns_name_t * zfname; - dns_rdataset_t zrdataset, zsigrdataset; + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { + isc_result_t result; + dns_db_t *db; + bool is_cache, use_zone, try_hints; + dns_zone_t *zone; + dns_name_t *zfname; + dns_rdataset_t zrdataset, zsigrdataset; dns_fixedname_t zfixedname; - unsigned int ztoptions = DNS_ZTFIND_MIRROR; + unsigned int ztoptions = DNS_ZTFIND_MIRROR; REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(view->frozen); @@ -1407,7 +1382,8 @@ db_find: if (zfname != NULL && (!dns_name_issubdomain(fname, zfname) || (dns_zone_gettype(zone) == dns_zone_staticstub && - dns_name_equal(fname, zfname)))) { + dns_name_equal(fname, zfname)))) + { /* * We found a zonecut in the cache, but our * zone delegation is better. @@ -1497,14 +1473,14 @@ cleanup: isc_result_t dns_viewlist_find(dns_viewlist_t *list, const char *name, - dns_rdataclass_t rdclass, dns_view_t **viewp) -{ + dns_rdataclass_t rdclass, dns_view_t **viewp) { dns_view_t *view; REQUIRE(list != NULL); for (view = ISC_LIST_HEAD(*list); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if (strcmp(view->name, name) == 0 && view->rdclass == rdclass) { break; } @@ -1521,18 +1497,18 @@ dns_viewlist_find(dns_viewlist_t *list, const char *name, isc_result_t dns_viewlist_findzone(dns_viewlist_t *list, const dns_name_t *name, bool allclasses, dns_rdataclass_t rdclass, - dns_zone_t **zonep) -{ - dns_view_t * view; + dns_zone_t **zonep) { + dns_view_t *view; isc_result_t result; - dns_zone_t * zone1 = NULL, *zone2 = NULL; + dns_zone_t *zone1 = NULL, *zone2 = NULL; dns_zone_t **zp = NULL; REQUIRE(list != NULL); REQUIRE(zonep != NULL && *zonep == NULL); for (view = ISC_LIST_HEAD(*list); view != NULL; - view = ISC_LIST_NEXT(view, link)) { + view = ISC_LIST_NEXT(view, link)) + { if (allclasses == false && view->rdclass != rdclass) { continue; } @@ -1544,8 +1520,8 @@ dns_viewlist_findzone(dns_viewlist_t *list, const dns_name_t *name, zp = (zone1 == NULL) ? &zone1 : &zone2; LOCK(&view->lock); if (view->zonetable != NULL) { - result = - dns_zt_find(view->zonetable, name, 0, NULL, zp); + result = dns_zt_find(view->zonetable, name, 0, NULL, + zp); } else { result = ISC_R_NOTFOUND; } @@ -1577,8 +1553,7 @@ dns_viewlist_findzone(dns_viewlist_t *list, const dns_name_t *name, } isc_result_t -dns_view_load(dns_view_t *view, bool stop, bool newonly) -{ +dns_view_load(dns_view_t *view, bool stop, bool newonly) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(view->zonetable != NULL); @@ -1587,8 +1562,7 @@ dns_view_load(dns_view_t *view, bool stop, bool newonly) isc_result_t dns_view_asyncload(dns_view_t *view, bool newonly, dns_zt_allloaded_t callback, - void *arg) -{ + void *arg) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(view->zonetable != NULL); @@ -1597,8 +1571,7 @@ dns_view_asyncload(dns_view_t *view, bool newonly, dns_zt_allloaded_t callback, isc_result_t dns_view_gettsig(dns_view_t *view, const dns_name_t *keyname, - dns_tsigkey_t **keyp) -{ + dns_tsigkey_t **keyp) { isc_result_t result; REQUIRE(keyp != NULL && *keyp == NULL); @@ -1612,11 +1585,10 @@ dns_view_gettsig(dns_view_t *view, const dns_name_t *keyname, isc_result_t dns_view_getpeertsig(dns_view_t *view, const isc_netaddr_t *peeraddr, - dns_tsigkey_t **keyp) -{ + dns_tsigkey_t **keyp) { isc_result_t result; - dns_name_t * keyname = NULL; - dns_peer_t * peer = NULL; + dns_name_t *keyname = NULL; + dns_peer_t *peer = NULL; result = dns_peerlist_peerbyaddr(view->peers, peeraddr, &peer); if (result != ISC_R_SUCCESS) { @@ -1633,8 +1605,7 @@ dns_view_getpeertsig(dns_view_t *view, const isc_netaddr_t *peeraddr, } isc_result_t -dns_view_checksig(dns_view_t *view, isc_buffer_t *source, dns_message_t *msg) -{ +dns_view_checksig(dns_view_t *view, isc_buffer_t *source, dns_message_t *msg) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(source != NULL); @@ -1643,8 +1614,7 @@ dns_view_checksig(dns_view_t *view, isc_buffer_t *source, dns_message_t *msg) } isc_result_t -dns_view_dumpdbtostream(dns_view_t *view, FILE *fp) -{ +dns_view_dumpdbtostream(dns_view_t *view, FILE *fp) { isc_result_t result; REQUIRE(DNS_VIEW_VALID(view)); @@ -1663,8 +1633,7 @@ dns_view_dumpdbtostream(dns_view_t *view, FILE *fp) } isc_result_t -dns_view_flushcache(dns_view_t *view, bool fixuponly) -{ +dns_view_flushcache(dns_view_t *view, bool fixuponly) { isc_result_t result; REQUIRE(DNS_VIEW_VALID(view)); @@ -1692,14 +1661,12 @@ dns_view_flushcache(dns_view_t *view, bool fixuponly) } isc_result_t -dns_view_flushname(dns_view_t *view, const dns_name_t *name) -{ +dns_view_flushname(dns_view_t *view, const dns_name_t *name) { return (dns_view_flushnode(view, name, false)); } isc_result_t -dns_view_flushnode(dns_view_t *view, const dns_name_t *name, bool tree) -{ +dns_view_flushnode(dns_view_t *view, const dns_name_t *name, bool tree) { isc_result_t result = ISC_R_SUCCESS; REQUIRE(DNS_VIEW_VALID(view)); @@ -1734,17 +1701,16 @@ dns_view_flushnode(dns_view_t *view, const dns_name_t *name, bool tree) } isc_result_t -dns_view_adddelegationonly(dns_view_t *view, const dns_name_t *name) -{ +dns_view_adddelegationonly(dns_view_t *view, const dns_name_t *name) { dns_name_t *item; - uint32_t hash; + uint32_t hash; REQUIRE(DNS_VIEW_VALID(view)); if (view->delonly == NULL) { - view->delonly = - isc_mem_get(view->mctx, sizeof(dns_namelist_t) * - DNS_VIEW_DELONLYHASH); + view->delonly = isc_mem_get(view->mctx, + sizeof(dns_namelist_t) * + DNS_VIEW_DELONLYHASH); for (hash = 0; hash < DNS_VIEW_DELONLYHASH; hash++) { ISC_LIST_INIT(view->delonly[hash]); } @@ -1765,16 +1731,15 @@ dns_view_adddelegationonly(dns_view_t *view, const dns_name_t *name) } isc_result_t -dns_view_excludedelegationonly(dns_view_t *view, const dns_name_t *name) -{ +dns_view_excludedelegationonly(dns_view_t *view, const dns_name_t *name) { dns_name_t *item; - uint32_t hash; + uint32_t hash; REQUIRE(DNS_VIEW_VALID(view)); if (view->rootexclude == NULL) { - view->rootexclude = - isc_mem_get(view->mctx, sizeof(dns_namelist_t) * + view->rootexclude = isc_mem_get(view->mctx, + sizeof(dns_namelist_t) * DNS_VIEW_DELONLYHASH); for (hash = 0; hash < DNS_VIEW_DELONLYHASH; hash++) { ISC_LIST_INIT(view->rootexclude[hash]); @@ -1796,10 +1761,9 @@ dns_view_excludedelegationonly(dns_view_t *view, const dns_name_t *name) } bool -dns_view_isdelegationonly(dns_view_t *view, const dns_name_t *name) -{ +dns_view_isdelegationonly(dns_view_t *view, const dns_name_t *name) { dns_name_t *item; - uint32_t hash; + uint32_t hash; REQUIRE(DNS_VIEW_VALID(view)); @@ -1836,22 +1800,19 @@ dns_view_isdelegationonly(dns_view_t *view, const dns_name_t *name) } void -dns_view_setrootdelonly(dns_view_t *view, bool value) -{ +dns_view_setrootdelonly(dns_view_t *view, bool value) { REQUIRE(DNS_VIEW_VALID(view)); view->rootdelonly = value; } bool -dns_view_getrootdelonly(dns_view_t *view) -{ +dns_view_getrootdelonly(dns_view_t *view) { REQUIRE(DNS_VIEW_VALID(view)); return (view->rootdelonly); } isc_result_t -dns_view_freezezones(dns_view_t *view, bool value) -{ +dns_view_freezezones(dns_view_t *view, bool value) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(view->zonetable != NULL); @@ -1859,8 +1820,7 @@ dns_view_freezezones(dns_view_t *view, bool value) } void -dns_view_setadbstats(dns_view_t *view, isc_stats_t *stats) -{ +dns_view_setadbstats(dns_view_t *view, isc_stats_t *stats) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(!view->frozen); REQUIRE(view->adbstats == NULL); @@ -1869,8 +1829,7 @@ dns_view_setadbstats(dns_view_t *view, isc_stats_t *stats) } void -dns_view_getadbstats(dns_view_t *view, isc_stats_t **statsp) -{ +dns_view_getadbstats(dns_view_t *view, isc_stats_t **statsp) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(statsp != NULL && *statsp == NULL); @@ -1880,8 +1839,7 @@ dns_view_getadbstats(dns_view_t *view, isc_stats_t **statsp) } void -dns_view_setresstats(dns_view_t *view, isc_stats_t *stats) -{ +dns_view_setresstats(dns_view_t *view, isc_stats_t *stats) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(!view->frozen); REQUIRE(view->resstats == NULL); @@ -1890,8 +1848,7 @@ dns_view_setresstats(dns_view_t *view, isc_stats_t *stats) } void -dns_view_getresstats(dns_view_t *view, isc_stats_t **statsp) -{ +dns_view_getresstats(dns_view_t *view, isc_stats_t **statsp) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(statsp != NULL && *statsp == NULL); @@ -1901,8 +1858,7 @@ dns_view_getresstats(dns_view_t *view, isc_stats_t **statsp) } void -dns_view_setresquerystats(dns_view_t *view, dns_stats_t *stats) -{ +dns_view_setresquerystats(dns_view_t *view, dns_stats_t *stats) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(!view->frozen); REQUIRE(view->resquerystats == NULL); @@ -1911,8 +1867,7 @@ dns_view_setresquerystats(dns_view_t *view, dns_stats_t *stats) } void -dns_view_getresquerystats(dns_view_t *view, dns_stats_t **statsp) -{ +dns_view_getresquerystats(dns_view_t *view, dns_stats_t **statsp) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(statsp != NULL && *statsp == NULL); @@ -1923,8 +1878,7 @@ dns_view_getresquerystats(dns_view_t *view, dns_stats_t **statsp) isc_result_t dns_view_initntatable(dns_view_t *view, isc_taskmgr_t *taskmgr, - isc_timermgr_t *timermgr) -{ + isc_timermgr_t *timermgr) { REQUIRE(DNS_VIEW_VALID(view)); if (view->ntatable_priv != NULL) { dns_ntatable_detach(&view->ntatable_priv); @@ -1934,8 +1888,7 @@ dns_view_initntatable(dns_view_t *view, isc_taskmgr_t *taskmgr, } isc_result_t -dns_view_getntatable(dns_view_t *view, dns_ntatable_t **ntp) -{ +dns_view_getntatable(dns_view_t *view, dns_ntatable_t **ntp) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(ntp != NULL && *ntp == NULL); if (view->ntatable_priv == NULL) { @@ -1946,8 +1899,7 @@ dns_view_getntatable(dns_view_t *view, dns_ntatable_t **ntp) } isc_result_t -dns_view_initsecroots(dns_view_t *view, isc_mem_t *mctx) -{ +dns_view_initsecroots(dns_view_t *view, isc_mem_t *mctx) { REQUIRE(DNS_VIEW_VALID(view)); if (view->secroots_priv != NULL) { dns_keytable_detach(&view->secroots_priv); @@ -1956,8 +1908,7 @@ dns_view_initsecroots(dns_view_t *view, isc_mem_t *mctx) } isc_result_t -dns_view_getsecroots(dns_view_t *view, dns_keytable_t **ktp) -{ +dns_view_getsecroots(dns_view_t *view, dns_keytable_t **ktp) { REQUIRE(DNS_VIEW_VALID(view)); REQUIRE(ktp != NULL && *ktp == NULL); if (view->secroots_priv == NULL) { @@ -1969,8 +1920,7 @@ dns_view_getsecroots(dns_view_t *view, dns_keytable_t **ktp) bool dns_view_ntacovers(dns_view_t *view, isc_stdtime_t now, const dns_name_t *name, - const dns_name_t *anchor) -{ + const dns_name_t *anchor) { REQUIRE(DNS_VIEW_VALID(view)); if (view->ntatable_priv == NULL) { @@ -1983,12 +1933,11 @@ dns_view_ntacovers(dns_view_t *view, isc_stdtime_t now, const dns_name_t *name, isc_result_t dns_view_issecuredomain(dns_view_t *view, const dns_name_t *name, isc_stdtime_t now, bool checknta, bool *ntap, - bool *secure_domain) -{ - isc_result_t result; - bool secure = false; + bool *secure_domain) { + isc_result_t result; + bool secure = false; dns_fixedname_t fn; - dns_name_t * anchor; + dns_name_t *anchor; REQUIRE(DNS_VIEW_VALID(view)); @@ -2008,7 +1957,8 @@ dns_view_issecuredomain(dns_view_t *view, const dns_name_t *name, *ntap = false; } if (checknta && secure && view->ntatable_priv != NULL && - dns_ntatable_covered(view->ntatable_priv, now, name, anchor)) { + dns_ntatable_covered(view->ntatable_priv, now, name, anchor)) + { if (ntap != NULL) { *ntap = true; } @@ -2021,9 +1971,8 @@ dns_view_issecuredomain(dns_view_t *view, const dns_name_t *name, void dns_view_untrust(dns_view_t *view, const dns_name_t *keyname, - dns_rdata_dnskey_t *dnskey) -{ - isc_result_t result; + dns_rdata_dnskey_t *dnskey) { + isc_result_t result; dns_keytable_t *sr = NULL; REQUIRE(DNS_VIEW_VALID(view)); @@ -2075,10 +2024,9 @@ dns_view_untrust(dns_view_t *view, const dns_name_t *keyname, static isc_result_t nz_legacy(const char *directory, const char *viewname, const char *suffix, - char *buffer, size_t buflen) -{ + char *buffer, size_t buflen) { isc_result_t result; - char newbuf[PATH_MAX]; + char newbuf[PATH_MAX]; result = isc_file_sanitize(directory, viewname, suffix, buffer, buflen); if (result != ISC_R_SUCCESS) { @@ -2108,13 +2056,12 @@ nz_legacy(const char *directory, const char *viewname, const char *suffix, isc_result_t dns_view_setnewzones(dns_view_t *view, bool allow, void *cfgctx, - void (*cfg_destroy)(void **), uint64_t mapsize) -{ + void (*cfg_destroy)(void **), uint64_t mapsize) { isc_result_t result = ISC_R_SUCCESS; - char buffer[1024]; + char buffer[1024]; #ifdef HAVE_LMDB MDB_env *env = NULL; - int status; + int status; #endif /* ifdef HAVE_LMDB */ #ifndef HAVE_LMDB @@ -2222,8 +2169,7 @@ cleanup: } void -dns_view_setnewzonedir(dns_view_t *view, const char *dir) -{ +dns_view_setnewzonedir(dns_view_t *view, const char *dir) { REQUIRE(DNS_VIEW_VALID(view)); if (view->new_zone_dir != NULL) { @@ -2239,8 +2185,7 @@ dns_view_setnewzonedir(dns_view_t *view, const char *dir) } const char * -dns_view_getnewzonedir(dns_view_t *view) -{ +dns_view_getnewzonedir(dns_view_t *view) { REQUIRE(DNS_VIEW_VALID(view)); return (view->new_zone_dir); @@ -2249,16 +2194,15 @@ dns_view_getnewzonedir(dns_view_t *view) isc_result_t dns_view_searchdlz(dns_view_t *view, const dns_name_t *name, unsigned int minlabels, dns_clientinfomethods_t *methods, - dns_clientinfo_t *clientinfo, dns_db_t **dbp) -{ - dns_fixedname_t fname; - dns_name_t * zonename; - unsigned int namelabels; - unsigned int i; - isc_result_t result; + dns_clientinfo_t *clientinfo, dns_db_t **dbp) { + dns_fixedname_t fname; + dns_name_t *zonename; + unsigned int namelabels; + unsigned int i; + isc_result_t result; dns_dlzfindzone_t findzone; - dns_dlzdb_t * dlzdb; - dns_db_t * db, *best = NULL; + dns_dlzdb_t *dlzdb; + dns_db_t *db, *best = NULL; /* * Performs checks to make sure data is as we expect it to be. @@ -2274,7 +2218,8 @@ dns_view_searchdlz(dns_view_t *view, const dns_name_t *name, namelabels = dns_name_countlabels(name); for (dlzdb = ISC_LIST_HEAD(view->dlz_searched); dlzdb != NULL; - dlzdb = ISC_LIST_NEXT(dlzdb, link)) { + dlzdb = ISC_LIST_NEXT(dlzdb, link)) + { REQUIRE(DNS_DLZ_VALID(dlzdb)); /* @@ -2333,26 +2278,23 @@ dns_view_searchdlz(dns_view_t *view, const dns_name_t *name, } uint32_t -dns_view_getfailttl(dns_view_t *view) -{ +dns_view_getfailttl(dns_view_t *view) { REQUIRE(DNS_VIEW_VALID(view)); return (view->fail_ttl); } void -dns_view_setfailttl(dns_view_t *view, uint32_t fail_ttl) -{ +dns_view_setfailttl(dns_view_t *view, uint32_t fail_ttl) { REQUIRE(DNS_VIEW_VALID(view)); view->fail_ttl = fail_ttl; } isc_result_t -dns_view_saventa(dns_view_t *view) -{ - isc_result_t result; - bool removefile = false; +dns_view_saventa(dns_view_t *view) { + isc_result_t result; + bool removefile = false; dns_ntatable_t *ntatable = NULL; - FILE * fp = NULL; + FILE *fp = NULL; REQUIRE(DNS_VIEW_VALID(view)); @@ -2402,13 +2344,12 @@ cleanup: #define TLEN(t) ((t).value.as_textregion.length) isc_result_t -dns_view_loadnta(dns_view_t *view) -{ - isc_result_t result; +dns_view_loadnta(dns_view_t *view) { + isc_result_t result; dns_ntatable_t *ntatable = NULL; - isc_lex_t * lex = NULL; - isc_token_t token; - isc_stdtime_t now; + isc_lex_t *lex = NULL; + isc_token_t token; + isc_stdtime_t now; REQUIRE(DNS_VIEW_VALID(view)); @@ -2422,14 +2363,14 @@ dns_view_loadnta(dns_view_t *view) isc_stdtime_get(&now); for (;;) { - int options = (ISC_LEXOPT_EOL | ISC_LEXOPT_EOF); - char * name, *type, *timestamp; - size_t len; - dns_fixedname_t fn; + int options = (ISC_LEXOPT_EOL | ISC_LEXOPT_EOF); + char *name, *type, *timestamp; + size_t len; + dns_fixedname_t fn; const dns_name_t *ntaname; - isc_buffer_t b; - isc_stdtime_t t; - bool forced; + isc_buffer_t b; + isc_stdtime_t t; + bool forced; CHECK(isc_lex_gettoken(lex, options, &token)); if (token.type == isc_tokentype_eof) { @@ -2509,8 +2450,7 @@ cleanup: } void -dns_view_setviewcommit(dns_view_t *view) -{ +dns_view_setviewcommit(dns_view_t *view) { REQUIRE(DNS_VIEW_VALID(view)); LOCK(&view->lock); @@ -2529,8 +2469,7 @@ dns_view_setviewcommit(dns_view_t *view) } void -dns_view_setviewrevert(dns_view_t *view) -{ +dns_view_setviewrevert(dns_view_t *view) { dns_zt_t *zonetable; REQUIRE(DNS_VIEW_VALID(view)); diff --git a/lib/dns/win32/DLLMain.c b/lib/dns/win32/DLLMain.c index 69e68ca22a..e104b8e4f3 100644 --- a/lib/dns/win32/DLLMain.c +++ b/lib/dns/win32/DLLMain.c @@ -16,8 +16,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/lib/dns/xfrin.c b/lib/dns/xfrin.c index 082c2a028c..9c92ac8ebc 100644 --- a/lib/dns/xfrin.c +++ b/lib/dns/xfrin.c @@ -93,25 +93,25 @@ typedef enum { struct dns_xfrin_ctx { unsigned int magic; - isc_mem_t * mctx; - dns_zone_t * zone; + isc_mem_t *mctx; + dns_zone_t *zone; int refcount; - isc_task_t * task; - isc_timer_t * timer; + isc_task_t *task; + isc_timer_t *timer; isc_socketmgr_t *socketmgr; - int connects; /*%< Connect in progress */ - int sends; /*%< Send in progress */ - int recvs; /*%< Receive in progress */ - bool shuttingdown; + int connects; /*%< Connect in progress */ + int sends; /*%< Send in progress */ + int recvs; /*%< Receive in progress */ + bool shuttingdown; isc_result_t shutdown_result; - dns_name_t name; /*%< Name of zone to transfer */ + dns_name_t name; /*%< Name of zone to transfer */ dns_rdataclass_t rdclass; - bool checkid; + bool checkid; dns_messageid_t id; /*% @@ -120,19 +120,19 @@ struct dns_xfrin_ctx { * may differ due to IXFR->AXFR fallback. */ dns_rdatatype_t reqtype; - isc_dscp_t dscp; + isc_dscp_t dscp; isc_sockaddr_t masteraddr; isc_sockaddr_t sourceaddr; - isc_socket_t * socket; + isc_socket_t *socket; /*% Buffer for IXFR/AXFR request message */ - isc_buffer_t qbuffer; + isc_buffer_t qbuffer; unsigned char qbuffer_data[512]; /*% Incoming reply TCP message */ dns_tcpmsg_t tcpmsg; - bool tcpmsg_valid; + bool tcpmsg_valid; /*% * Whether the zone originally had a database attached at the time this @@ -141,18 +141,18 @@ struct dns_xfrin_ctx { */ bool zone_had_db; - dns_db_t * db; + dns_db_t *db; dns_dbversion_t *ver; - dns_diff_t diff; /*%< Pending database changes */ - int difflen; /*%< Number of pending tuples */ + dns_diff_t diff; /*%< Pending database changes */ + int difflen; /*%< Number of pending tuples */ xfrin_state_t state; - uint32_t end_serial; - bool is_ixfr; + uint32_t end_serial; + bool is_ixfr; - unsigned int nmsg; /*%< Number of messages recvd */ - unsigned int nrecs; /*%< Number of records recvd */ - uint64_t nbytes; /*%< Number of bytes received */ + unsigned int nmsg; /*%< Number of messages recvd */ + unsigned int nrecs; /*%< Number of records recvd */ + uint64_t nbytes; /*%< Number of bytes received */ unsigned int maxrecords; /*%< The maximum number of * records set for the zone */ @@ -160,10 +160,10 @@ struct dns_xfrin_ctx { isc_time_t start; /*%< Start time of the transfer */ isc_time_t end; /*%< End time of the transfer */ - dns_tsigkey_t * tsigkey; /*%< Key used to create TSIG */ - isc_buffer_t * lasttsig; /*%< The last TSIG */ - dst_context_t * tsigctx; /*%< TSIG verification context */ - unsigned int sincetsig; /*%< recvd since the last TSIG */ + dns_tsigkey_t *tsigkey; /*%< Key used to create TSIG */ + isc_buffer_t *lasttsig; /*%< The last TSIG */ + dst_context_t *tsigctx; /*%< TSIG verification context */ + unsigned int sincetsig; /*%< recvd since the last TSIG */ dns_xfrindone_t done; /*% @@ -175,13 +175,13 @@ struct dns_xfrin_ctx { dns_rdatacallbacks_t axfr; struct { - uint32_t request_serial; - uint32_t current_serial; + uint32_t request_serial; + uint32_t current_serial; dns_journal_t *journal; } ixfr; }; -#define XFRIN_MAGIC ISC_MAGIC('X', 'f', 'r', 'I') +#define XFRIN_MAGIC ISC_MAGIC('X', 'f', 'r', 'I') #define VALID_XFRIN(x) ISC_MAGIC_VALID(x, XFRIN_MAGIC) /**************************************************************************/ @@ -197,66 +197,49 @@ 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 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 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 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 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 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 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_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_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_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 void xfrin_log(dns_xfrin_ctx_t *xfr, int level, const char *fmt, ...) ISC_FORMAT_PRINTF(3, 4); /**************************************************************************/ @@ -265,8 +248,7 @@ xfrin_log(dns_xfrin_ctx_t *xfr, int level, const char *fmt, ...) */ static isc_result_t -axfr_init(dns_xfrin_ctx_t *xfr) -{ +axfr_init(dns_xfrin_ctx_t *xfr) { isc_result_t result; xfr->is_ixfr = false; @@ -284,8 +266,7 @@ failure: } static isc_result_t -axfr_makedb(dns_xfrin_ctx_t *xfr, dns_db_t **dbp) -{ +axfr_makedb(dns_xfrin_ctx_t *xfr, dns_db_t **dbp) { isc_result_t result; result = dns_db_create(xfr->mctx, /* XXX */ @@ -302,8 +283,7 @@ 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) -{ + dns_ttl_t ttl, dns_rdata_t *rdata) { isc_result_t result; dns_difftuple_t *tuple = NULL; @@ -328,10 +308,9 @@ failure: * Store a set of AXFR RRs in the database. */ static isc_result_t -axfr_apply(dns_xfrin_ctx_t *xfr) -{ +axfr_apply(dns_xfrin_ctx_t *xfr) { isc_result_t result; - uint64_t records; + uint64_t records; CHECK(dns_diff_load(&xfr->diff, xfr->axfr.add, xfr->axfr.add_private)); xfr->difflen = 0; @@ -349,8 +328,7 @@ failure: } static isc_result_t -axfr_commit(dns_xfrin_ctx_t *xfr) -{ +axfr_commit(dns_xfrin_ctx_t *xfr) { isc_result_t result; CHECK(axfr_apply(xfr)); @@ -363,8 +341,7 @@ failure: } static isc_result_t -axfr_finalize(dns_xfrin_ctx_t *xfr) -{ +axfr_finalize(dns_xfrin_ctx_t *xfr) { isc_result_t result; CHECK(dns_zone_replacedb(xfr->zone, xfr->db, true)); @@ -380,10 +357,9 @@ failure: */ static isc_result_t -ixfr_init(dns_xfrin_ctx_t *xfr) -{ +ixfr_init(dns_xfrin_ctx_t *xfr) { isc_result_t result; - char * journalfile; + char *journalfile; if (xfr->reqtype != dns_rdatatype_ixfr) { xfrin_log(xfr, ISC_LOG_ERROR, @@ -408,9 +384,8 @@ failure: 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) -{ - isc_result_t result; + dns_ttl_t ttl, dns_rdata_t *rdata) { + isc_result_t result; dns_difftuple_t *tuple = NULL; if (rdata->rdclass != xfr->rdclass) { @@ -435,10 +410,9 @@ failure: * Apply a set of IXFR changes to the database. */ static isc_result_t -ixfr_apply(dns_xfrin_ctx_t *xfr) -{ +ixfr_apply(dns_xfrin_ctx_t *xfr) { isc_result_t result; - uint64_t records; + uint64_t records; if (xfr->ver == NULL) { CHECK(dns_db_newversion(xfr->db, &xfr->ver)); @@ -468,8 +442,7 @@ failure: } static isc_result_t -ixfr_commit(dns_xfrin_ctx_t *xfr) -{ +ixfr_commit(dns_xfrin_ctx_t *xfr) { isc_result_t result; CHECK(ixfr_apply(xfr)); @@ -497,8 +470,8 @@ failure: * state. */ static isc_result_t -xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, uint32_t ttl, dns_rdata_t *rdata) -{ +xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, uint32_t ttl, + dns_rdata_t *rdata) { isc_result_t result; xfr->nrecs++; @@ -518,7 +491,8 @@ redo: } xfr->end_serial = dns_soa_getserial(rdata); if (!DNS_SERIAL_GT(xfr->end_serial, xfr->ixfr.request_serial) && - !dns_zone_isforced(xfr->zone)) { + !dns_zone_isforced(xfr->zone)) + { xfrin_log(xfr, ISC_LOG_DEBUG(3), "requested serial %u, " "master has %u, not updating", @@ -547,7 +521,8 @@ redo: xfr->end_serial = dns_soa_getserial(rdata); if (xfr->reqtype == dns_rdatatype_ixfr && !DNS_SERIAL_GT(xfr->end_serial, xfr->ixfr.request_serial) && - !dns_zone_isforced(xfr->zone)) { + !dns_zone_isforced(xfr->zone)) + { /* * This must be the single SOA record that is * sent when the current version on the master @@ -572,7 +547,8 @@ redo: */ if (xfr->reqtype == dns_rdatatype_ixfr && rdata->type == dns_rdatatype_soa && - xfr->ixfr.request_serial == dns_soa_getserial(rdata)) { + xfr->ixfr.request_serial == dns_soa_getserial(rdata)) + { xfrin_log(xfr, ISC_LOG_DEBUG(3), "got incremental response"); CHECK(ixfr_init(xfr)); @@ -639,7 +615,8 @@ redo: */ if (rdata->type == dns_rdatatype_a && rdata->rdclass != xfr->rdclass && - xfr->rdclass != dns_rdataclass_in) { + xfr->rdclass != dns_rdataclass_in) + { break; } CHECK(axfr_putdata(xfr, DNS_DIFFOP_ADD, name, ttl, rdata)); @@ -669,12 +646,12 @@ dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype, const isc_sockaddr_t *sourceaddr, isc_dscp_t dscp, dns_tsigkey_t *tsigkey, isc_mem_t *mctx, isc_timermgr_t *timermgr, isc_socketmgr_t *socketmgr, - isc_task_t *task, dns_xfrindone_t done, dns_xfrin_ctx_t **xfrp) -{ - dns_name_t * zonename = dns_zone_getorigin(zone); + isc_task_t *task, dns_xfrindone_t done, + dns_xfrin_ctx_t **xfrp) { + dns_name_t *zonename = dns_zone_getorigin(zone); dns_xfrin_ctx_t *xfr = NULL; - isc_result_t result; - dns_db_t * db = NULL; + isc_result_t result; + dns_db_t *db = NULL; REQUIRE(xfrp != NULL && *xfrp == NULL); @@ -714,24 +691,21 @@ failure: } void -dns_xfrin_shutdown(dns_xfrin_ctx_t *xfr) -{ +dns_xfrin_shutdown(dns_xfrin_ctx_t *xfr) { if (!xfr->shuttingdown) { xfrin_fail(xfr, ISC_R_CANCELED, "shut down"); } } void -dns_xfrin_attach(dns_xfrin_ctx_t *source, dns_xfrin_ctx_t **target) -{ +dns_xfrin_attach(dns_xfrin_ctx_t *source, dns_xfrin_ctx_t **target) { REQUIRE(target != NULL && *target == NULL); source->refcount++; *target = source; } void -dns_xfrin_detach(dns_xfrin_ctx_t **xfrp) -{ +dns_xfrin_detach(dns_xfrin_ctx_t **xfrp) { dns_xfrin_ctx_t *xfr = *xfrp; *xfrp = NULL; INSIST(xfr->refcount > 0); @@ -740,8 +714,7 @@ dns_xfrin_detach(dns_xfrin_ctx_t **xfrp) } static void -xfrin_cancelio(dns_xfrin_ctx_t *xfr) -{ +xfrin_cancelio(dns_xfrin_ctx_t *xfr) { if (xfr->connects > 0) { isc_socket_cancel(xfr->socket, xfr->task, ISC_SOCKCANCEL_CONNECT); @@ -753,8 +726,7 @@ xfrin_cancelio(dns_xfrin_ctx_t *xfr) } static void -xfrin_reset(dns_xfrin_ctx_t *xfr) -{ +xfrin_reset(dns_xfrin_ctx_t *xfr) { REQUIRE(VALID_XFRIN(xfr)); xfrin_log(xfr, ISC_LOG_INFO, "resetting"); @@ -791,8 +763,7 @@ xfrin_reset(dns_xfrin_ctx_t *xfr) } static void -xfrin_fail(dns_xfrin_ctx_t *xfr, isc_result_t result, const char *msg) -{ +xfrin_fail(dns_xfrin_ctx_t *xfr, isc_result_t result, const char *msg) { if (result != DNS_R_UPTODATE && result != DNS_R_TOOMANYRECORDS) { xfrin_log(xfr, ISC_LOG_ERROR, "%s: %s", msg, isc_result_totext(result)); @@ -823,10 +794,9 @@ xfrin_create(isc_mem_t *mctx, dns_zone_t *zone, dns_db_t *db, isc_task_t *task, dns_name_t *zonename, dns_rdataclass_t rdclass, dns_rdatatype_t reqtype, const isc_sockaddr_t *masteraddr, const isc_sockaddr_t *sourceaddr, isc_dscp_t dscp, - dns_tsigkey_t *tsigkey, dns_xfrin_ctx_t **xfrp) -{ + dns_tsigkey_t *tsigkey, dns_xfrin_ctx_t **xfrp) { dns_xfrin_ctx_t *xfr = NULL; - isc_result_t result; + isc_result_t result; xfr = isc_mem_get(mctx, sizeof(*xfr)); xfr->mctx = NULL; @@ -942,8 +912,7 @@ failure: } static isc_result_t -xfrin_start(dns_xfrin_ctx_t *xfr) -{ +xfrin_start(dns_xfrin_ctx_t *xfr) { isc_result_t result; CHECK(isc_socket_create(xfr->socketmgr, isc_sockaddr_pf(&xfr->sourceaddr), @@ -966,11 +935,10 @@ failure: /* XXX the resolver could use this, too */ static isc_result_t -render(dns_message_t *msg, isc_mem_t *mctx, isc_buffer_t *buf) -{ +render(dns_message_t *msg, isc_mem_t *mctx, isc_buffer_t *buf) { dns_compress_t cctx; - bool cleanup_cctx = false; - isc_result_t result; + bool cleanup_cctx = false; + isc_result_t result; CHECK(dns_compress_init(&cctx, -1, mctx)); cleanup_cctx = true; @@ -992,17 +960,16 @@ failure: * A connection has been established. */ static void -xfrin_connect_done(isc_task_t *task, isc_event_t *event) -{ +xfrin_connect_done(isc_task_t *task, isc_event_t *event) { isc_socket_connev_t *cev = (isc_socket_connev_t *)event; - dns_xfrin_ctx_t * xfr = (dns_xfrin_ctx_t *)event->ev_arg; - isc_result_t result = cev->result; - char sourcetext[ISC_SOCKADDR_FORMATSIZE]; - char signerbuf[DNS_NAME_FORMATSIZE]; - const char * signer = "", *sep = ""; - isc_sockaddr_t sockaddr; - dns_zonemgr_t * zmgr; - isc_time_t now; + dns_xfrin_ctx_t *xfr = (dns_xfrin_ctx_t *)event->ev_arg; + isc_result_t result = cev->result; + char sourcetext[ISC_SOCKADDR_FORMATSIZE]; + char signerbuf[DNS_NAME_FORMATSIZE]; + const char *signer = "", *sep = ""; + isc_sockaddr_t sockaddr; + dns_zonemgr_t *zmgr; + isc_time_t now; REQUIRE(VALID_XFRIN(xfr)); @@ -1062,13 +1029,12 @@ failure: * into the given dns_message_t. */ static isc_result_t -tuple2msgname(dns_difftuple_t *tuple, dns_message_t *msg, dns_name_t **target) -{ - isc_result_t result; - dns_rdata_t * rdata = NULL; +tuple2msgname(dns_difftuple_t *tuple, dns_message_t *msg, dns_name_t **target) { + isc_result_t result; + dns_rdata_t *rdata = NULL; dns_rdatalist_t *rdl = NULL; - dns_rdataset_t * rds = NULL; - dns_name_t * name = NULL; + dns_rdataset_t *rds = NULL; + dns_name_t *name = NULL; REQUIRE(target != NULL && *target == NULL); @@ -1115,16 +1081,15 @@ failure: * Build an *XFR request and send its length prefix. */ static isc_result_t -xfrin_send_request(dns_xfrin_ctx_t *xfr) -{ - isc_result_t result; - isc_region_t region; - dns_rdataset_t * qrdataset = NULL; - dns_message_t * msg = NULL; +xfrin_send_request(dns_xfrin_ctx_t *xfr) { + isc_result_t result; + isc_region_t region; + dns_rdataset_t *qrdataset = NULL; + dns_message_t *msg = NULL; dns_difftuple_t *soatuple = NULL; - dns_name_t * qname = NULL; + dns_name_t *qname = NULL; dns_dbversion_t *ver = NULL; - dns_name_t * msgsoaname = NULL; + dns_name_t *msgsoaname = NULL; /* Create the request message */ CHECK(dns_message_create(xfr->mctx, DNS_MESSAGE_INTENTRENDER, &msg)); @@ -1223,11 +1188,10 @@ failure: } static void -xfrin_send_done(isc_task_t *task, isc_event_t *event) -{ +xfrin_send_done(isc_task_t *task, isc_event_t *event) { isc_socketevent_t *sev = (isc_socketevent_t *)event; - dns_xfrin_ctx_t * xfr = (dns_xfrin_ctx_t *)event->ev_arg; - isc_result_t result; + dns_xfrin_ctx_t *xfr = (dns_xfrin_ctx_t *)event->ev_arg; + isc_result_t result; REQUIRE(VALID_XFRIN(xfr)); @@ -1250,13 +1214,12 @@ failure: } static void -xfrin_recv_done(isc_task_t *task, isc_event_t *ev) -{ - dns_xfrin_ctx_t * xfr = (dns_xfrin_ctx_t *)ev->ev_arg; - isc_result_t result; - dns_message_t * msg = NULL; - dns_name_t * name; - dns_tcpmsg_t * tcpmsg; +xfrin_recv_done(isc_task_t *task, isc_event_t *ev) { + dns_xfrin_ctx_t *xfr = (dns_xfrin_ctx_t *)ev->ev_arg; + isc_result_t result; + dns_message_t *msg = NULL; + dns_name_t *name; + dns_tcpmsg_t *tcpmsg; const dns_name_t *tsigowner = NULL; REQUIRE(VALID_XFRIN(xfr)); @@ -1309,9 +1272,10 @@ xfrin_recv_done(isc_task_t *task, isc_event_t *ev) if (result != ISC_R_SUCCESS || msg->rcode != dns_rcode_noerror || msg->opcode != dns_opcode_query || msg->rdclass != xfr->rdclass || - (xfr->checkid && msg->id != xfr->id)) { - if (result == ISC_R_SUCCESS && - msg->rcode != dns_rcode_noerror) { + (xfr->checkid && msg->id != xfr->id)) + { + if (result == ISC_R_SUCCESS && msg->rcode != dns_rcode_noerror) + { result = ISC_RESULTCLASS_DNSRCODE + msg->rcode; /*XXX*/ } else if (result == ISC_R_SUCCESS && msg->opcode != dns_opcode_query) { @@ -1345,7 +1309,8 @@ xfrin_recv_done(isc_task_t *task, isc_event_t *ev) */ if (xfr->reqtype == dns_rdatatype_ixfr && xfr->state == XFRST_INITIALSOA && - msg->counts[DNS_SECTION_ANSWER] == 0) { + msg->counts[DNS_SECTION_ANSWER] == 0) + { xfrin_log(xfr, ISC_LOG_DEBUG(3), "empty answer section, retrying with AXFR"); goto try_axfr; @@ -1365,16 +1330,19 @@ xfrin_recv_done(isc_task_t *task, isc_event_t *ev) for (result = dns_message_firstname(msg, DNS_SECTION_ANSWER); result == ISC_R_SUCCESS; - result = dns_message_nextname(msg, DNS_SECTION_ANSWER)) { + result = dns_message_nextname(msg, DNS_SECTION_ANSWER)) + { dns_rdataset_t *rds; name = NULL; dns_message_currentname(msg, DNS_SECTION_ANSWER, &name); for (rds = ISC_LIST_HEAD(name->list); rds != NULL; - rds = ISC_LIST_NEXT(rds, link)) { + rds = ISC_LIST_NEXT(rds, link)) + { for (result = dns_rdataset_first(rds); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rds)) { + result = dns_rdataset_next(rds)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(rds, &rdata); CHECK(xfr_rr(xfr, name, rds->ttl, &rdata)); @@ -1406,7 +1374,8 @@ xfrin_recv_done(isc_task_t *task, isc_event_t *ev) xfr->sincetsig++; if (xfr->sincetsig > 100 || xfr->nmsg == 0 || xfr->state == XFRST_AXFR_END || - xfr->state == XFRST_IXFR_END) { + xfr->state == XFRST_IXFR_END) + { result = DNS_R_EXPECTEDTSIG; goto failure; } @@ -1483,8 +1452,7 @@ failure: } static void -xfrin_timeout(isc_task_t *task, isc_event_t *event) -{ +xfrin_timeout(isc_task_t *task, isc_event_t *event) { dns_xfrin_ctx_t *xfr = (dns_xfrin_ctx_t *)event->ev_arg; REQUIRE(VALID_XFRIN(xfr)); @@ -1499,16 +1467,16 @@ xfrin_timeout(isc_task_t *task, isc_event_t *event) } static void -maybe_free(dns_xfrin_ctx_t *xfr) -{ - uint64_t msecs; - uint64_t persec; +maybe_free(dns_xfrin_ctx_t *xfr) { + uint64_t msecs; + uint64_t persec; const char *result_str; REQUIRE(VALID_XFRIN(xfr)); if (!xfr->shuttingdown || xfr->refcount != 0 || xfr->connects != 0 || - xfr->sends != 0 || xfr->recvs != 0) { + xfr->sends != 0 || xfr->recvs != 0) + { return; } @@ -1594,7 +1562,8 @@ maybe_free(dns_xfrin_ctx_t *xfr) if (xfr->zone != NULL) { if (!xfr->zone_had_db && xfr->shuttingdown && xfr->shutdown_result == ISC_R_SUCCESS && - dns_zone_gettype(xfr->zone) == dns_zone_mirror) { + dns_zone_gettype(xfr->zone) == dns_zone_mirror) + { dns_zone_log(xfr->zone, ISC_LOG_INFO, "mirror zone is now in use"); } @@ -1614,8 +1583,7 @@ maybe_free(dns_xfrin_ctx_t *xfr) */ static void xfrin_logv(int level, const char *zonetext, const isc_sockaddr_t *masteraddr, - const char *fmt, va_list ap) -{ + const char *fmt, va_list ap) { char mastertext[ISC_SOCKADDR_FORMATSIZE]; char msgtext[2048]; @@ -1633,8 +1601,7 @@ xfrin_logv(int level, const char *zonetext, const isc_sockaddr_t *masteraddr, static void xfrin_log1(int level, const char *zonetext, const isc_sockaddr_t *masteraddr, - const char *fmt, ...) -{ + const char *fmt, ...) { va_list ap; if (isc_log_wouldlog(dns_lctx, level) == false) { @@ -1651,10 +1618,9 @@ xfrin_log1(int level, const char *zonetext, const isc_sockaddr_t *masteraddr, */ static void -xfrin_log(dns_xfrin_ctx_t *xfr, int level, const char *fmt, ...) -{ +xfrin_log(dns_xfrin_ctx_t *xfr, int level, const char *fmt, ...) { va_list ap; - char zonetext[DNS_NAME_MAXTEXT + 32]; + char zonetext[DNS_NAME_MAXTEXT + 32]; if (isc_log_wouldlog(dns_lctx, level) == false) { return; diff --git a/lib/dns/zone.c b/lib/dns/zone.c index a76de7753a..c0e0a6b6ec 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -87,25 +87,25 @@ #include -#define ZONE_MAGIC ISC_MAGIC('Z', 'O', 'N', 'E') +#define ZONE_MAGIC ISC_MAGIC('Z', 'O', 'N', 'E') #define DNS_ZONE_VALID(zone) ISC_MAGIC_VALID(zone, ZONE_MAGIC) -#define NOTIFY_MAGIC ISC_MAGIC('N', 't', 'f', 'y') +#define NOTIFY_MAGIC ISC_MAGIC('N', 't', 'f', 'y') #define DNS_NOTIFY_VALID(notify) ISC_MAGIC_VALID(notify, NOTIFY_MAGIC) -#define STUB_MAGIC ISC_MAGIC('S', 't', 'u', 'b') +#define STUB_MAGIC ISC_MAGIC('S', 't', 'u', 'b') #define DNS_STUB_VALID(stub) ISC_MAGIC_VALID(stub, STUB_MAGIC) -#define ZONEMGR_MAGIC ISC_MAGIC('Z', 'm', 'g', 'r') +#define ZONEMGR_MAGIC ISC_MAGIC('Z', 'm', 'g', 'r') #define DNS_ZONEMGR_VALID(stub) ISC_MAGIC_VALID(stub, ZONEMGR_MAGIC) -#define LOAD_MAGIC ISC_MAGIC('L', 'o', 'a', 'd') +#define LOAD_MAGIC ISC_MAGIC('L', 'o', 'a', 'd') #define DNS_LOAD_VALID(load) ISC_MAGIC_VALID(load, LOAD_MAGIC) -#define FORWARD_MAGIC ISC_MAGIC('F', 'o', 'r', 'w') +#define FORWARD_MAGIC ISC_MAGIC('F', 'o', 'r', 'w') #define DNS_FORWARD_VALID(load) ISC_MAGIC_VALID(load, FORWARD_MAGIC) -#define IO_MAGIC ISC_MAGIC('Z', 'm', 'I', 'O') +#define IO_MAGIC ISC_MAGIC('Z', 'm', 'I', 'O') #define DNS_IO_VALID(load) ISC_MAGIC_VALID(load, IO_MAGIC) /*% @@ -119,16 +119,16 @@ * Key flags */ #define REVOKE(x) ((dst_key_flags(x) & DNS_KEYFLAG_REVOKE) != 0) -#define KSK(x) ((dst_key_flags(x) & DNS_KEYFLAG_KSK) != 0) -#define ALG(x) dst_key_alg(x) +#define KSK(x) ((dst_key_flags(x) & DNS_KEYFLAG_KSK) != 0) +#define ALG(x) dst_key_alg(x) /* * Default values. */ -#define DNS_DEFAULT_IDLEIN 3600 /*%< 1 hour */ -#define DNS_DEFAULT_IDLEOUT 3600 /*%< 1 hour */ -#define MAX_XFER_TIME (2 * 3600) /*%< Documented default is 2 hours */ -#define RESIGN_DELAY 3600 /*%< 1 hour */ +#define DNS_DEFAULT_IDLEIN 3600 /*%< 1 hour */ +#define DNS_DEFAULT_IDLEOUT 3600 /*%< 1 hour */ +#define MAX_XFER_TIME (2 * 3600) /*%< Documented default is 2 hours */ +#define RESIGN_DELAY 3600 /*%< 1 hour */ #ifndef DNS_MAX_EXPIRE #define DNS_MAX_EXPIRE 14515200 /*%< 24 weeks */ @@ -138,9 +138,9 @@ #define DNS_DUMP_DELAY 900 /*%< 15 minutes */ #endif /* ifndef DNS_DUMP_DELAY */ -typedef struct dns_notify dns_notify_t; -typedef struct dns_stub dns_stub_t; -typedef struct dns_load dns_load_t; +typedef struct dns_notify dns_notify_t; +typedef struct dns_stub dns_stub_t; +typedef struct dns_load dns_load_t; typedef struct dns_forward dns_forward_t; typedef ISC_LIST(dns_forward_t) dns_forwardlist_t; typedef struct dns_io dns_io_t; @@ -149,9 +149,9 @@ typedef struct dns_signing dns_signing_t; typedef ISC_LIST(dns_signing_t) dns_signinglist_t; typedef struct dns_nsec3chain dns_nsec3chain_t; typedef ISC_LIST(dns_nsec3chain_t) dns_nsec3chainlist_t; -typedef struct dns_keyfetch dns_keyfetch_t; +typedef struct dns_keyfetch dns_keyfetch_t; typedef struct dns_asyncload dns_asyncload_t; -typedef struct dns_include dns_include_t; +typedef struct dns_include dns_include_t; #define DNS_ZONE_CHECKLOCK #ifdef DNS_ZONE_CHECKLOCK @@ -176,7 +176,7 @@ typedef struct dns_include dns_include_t; } \ } while (0) #else /* ifdef DNS_ZONE_CHECKLOCK */ -#define LOCK_ZONE(z) LOCK(&(z)->lock) +#define LOCK_ZONE(z) LOCK(&(z)->lock) #define UNLOCK_ZONE(z) UNLOCK(&(z)->lock) #define LOCKED_ZONE(z) true #define TRYLOCK_ZONE(result, z) \ @@ -185,10 +185,10 @@ typedef struct dns_include dns_include_t; } while (0) #endif /* ifdef DNS_ZONE_CHECKLOCK */ -#define ZONEDB_INITLOCK(l) isc_rwlock_init((l), 0, 0) +#define ZONEDB_INITLOCK(l) isc_rwlock_init((l), 0, 0) #define ZONEDB_DESTROYLOCK(l) isc_rwlock_destroy(l) -#define ZONEDB_LOCK(l, t) RWLOCK((l), (t)) -#define ZONEDB_UNLOCK(l, t) RWUNLOCK((l), (t)) +#define ZONEDB_LOCK(l, t) RWLOCK((l), (t)) +#define ZONEDB_UNLOCK(l, t) RWUNLOCK((l), (t)) #ifdef ENABLE_AFL extern bool dns_fuzzing_resolver; @@ -197,55 +197,55 @@ extern bool dns_fuzzing_resolver; struct dns_zone { /* Unlocked */ unsigned int magic; - isc_mutex_t lock; + isc_mutex_t lock; #ifdef DNS_ZONE_CHECKLOCK bool locked; #endif /* ifdef DNS_ZONE_CHECKLOCK */ - isc_mem_t * mctx; + isc_mem_t *mctx; isc_refcount_t erefs; isc_rwlock_t dblock; - dns_db_t * db; /* Locked by dblock */ + dns_db_t *db; /* Locked by dblock */ /* Locked */ dns_zonemgr_t *zmgr; ISC_LINK(dns_zone_t) link; /* Used by zmgr. */ - isc_timer_t * timer; + isc_timer_t *timer; isc_refcount_t irefs; - dns_name_t origin; - char * masterfile; + dns_name_t origin; + char *masterfile; ISC_LIST(dns_include_t) includes; /* Include files */ ISC_LIST(dns_include_t) newincludes; /* Loading */ - unsigned int nincludes; - dns_masterformat_t masterformat; + unsigned int nincludes; + dns_masterformat_t masterformat; const dns_master_style_t *masterstyle; - char * journal; - int32_t journalsize; - dns_rdataclass_t rdclass; - dns_zonetype_t type; - atomic_uint_fast64_t flags; - atomic_uint_fast64_t options; - unsigned int db_argc; - char ** db_argv; - isc_time_t expiretime; - isc_time_t refreshtime; - isc_time_t dumptime; - isc_time_t loadtime; - isc_time_t notifytime; - isc_time_t resigntime; - isc_time_t keywarntime; - isc_time_t signingtime; - isc_time_t nsec3chaintime; - isc_time_t refreshkeytime; - uint32_t refreshkeyinterval; - uint32_t refreshkeycount; - uint32_t refresh; - uint32_t retry; - uint32_t expire; - uint32_t minimum; - isc_stdtime_t key_expiry; - isc_stdtime_t log_key_expired_timer; - char * keydirectory; + char *journal; + int32_t journalsize; + dns_rdataclass_t rdclass; + dns_zonetype_t type; + atomic_uint_fast64_t flags; + atomic_uint_fast64_t options; + unsigned int db_argc; + char **db_argv; + isc_time_t expiretime; + isc_time_t refreshtime; + isc_time_t dumptime; + isc_time_t loadtime; + isc_time_t notifytime; + isc_time_t resigntime; + isc_time_t keywarntime; + isc_time_t signingtime; + isc_time_t nsec3chaintime; + isc_time_t refreshkeytime; + uint32_t refreshkeyinterval; + uint32_t refreshkeycount; + uint32_t refresh; + uint32_t retry; + uint32_t expire; + uint32_t minimum; + isc_stdtime_t key_expiry; + isc_stdtime_t log_key_expired_timer; + char *keydirectory; uint32_t maxrefresh; uint32_t minrefresh; @@ -254,67 +254,67 @@ struct dns_zone { uint32_t maxrecords; - isc_sockaddr_t * masters; - isc_dscp_t * masterdscps; - dns_name_t ** masterkeynames; - bool * mastersok; - unsigned int masterscnt; - unsigned int curmaster; - isc_sockaddr_t masteraddr; + isc_sockaddr_t *masters; + isc_dscp_t *masterdscps; + dns_name_t **masterkeynames; + bool *mastersok; + unsigned int masterscnt; + unsigned int curmaster; + isc_sockaddr_t masteraddr; dns_notifytype_t notifytype; - isc_sockaddr_t * notify; - dns_name_t ** notifykeynames; - isc_dscp_t * notifydscp; - unsigned int notifycnt; - isc_sockaddr_t notifyfrom; - isc_task_t * task; - isc_task_t * loadtask; - isc_sockaddr_t notifysrc4; - isc_sockaddr_t notifysrc6; - isc_sockaddr_t xfrsource4; - isc_sockaddr_t xfrsource6; - isc_sockaddr_t altxfrsource4; - isc_sockaddr_t altxfrsource6; - isc_sockaddr_t sourceaddr; - isc_dscp_t notifysrc4dscp; - isc_dscp_t notifysrc6dscp; - isc_dscp_t xfrsource4dscp; - isc_dscp_t xfrsource6dscp; - isc_dscp_t altxfrsource4dscp; - isc_dscp_t altxfrsource6dscp; - dns_xfrin_ctx_t *xfr; /* task locked */ - dns_tsigkey_t * tsigkey; /* key used for xfr */ + isc_sockaddr_t *notify; + dns_name_t **notifykeynames; + isc_dscp_t *notifydscp; + unsigned int notifycnt; + isc_sockaddr_t notifyfrom; + isc_task_t *task; + isc_task_t *loadtask; + isc_sockaddr_t notifysrc4; + isc_sockaddr_t notifysrc6; + isc_sockaddr_t xfrsource4; + isc_sockaddr_t xfrsource6; + isc_sockaddr_t altxfrsource4; + isc_sockaddr_t altxfrsource6; + isc_sockaddr_t sourceaddr; + isc_dscp_t notifysrc4dscp; + isc_dscp_t notifysrc6dscp; + isc_dscp_t xfrsource4dscp; + isc_dscp_t xfrsource6dscp; + isc_dscp_t altxfrsource4dscp; + isc_dscp_t altxfrsource6dscp; + dns_xfrin_ctx_t *xfr; /* task locked */ + dns_tsigkey_t *tsigkey; /* key used for xfr */ /* Access Control Lists */ - dns_acl_t * update_acl; - dns_acl_t * forward_acl; - dns_acl_t * notify_acl; - dns_acl_t * query_acl; - dns_acl_t * queryon_acl; - dns_acl_t * xfr_acl; - bool update_disabled; - bool zero_no_soa_ttl; + dns_acl_t *update_acl; + dns_acl_t *forward_acl; + dns_acl_t *notify_acl; + dns_acl_t *query_acl; + dns_acl_t *queryon_acl; + dns_acl_t *xfr_acl; + bool update_disabled; + bool zero_no_soa_ttl; dns_severity_t check_names; ISC_LIST(dns_notify_t) notifies; - dns_request_t * request; - dns_loadctx_t * lctx; - dns_io_t * readio; - dns_dumpctx_t * dctx; - dns_io_t * writeio; - uint32_t maxxfrin; - uint32_t maxxfrout; - uint32_t idlein; - uint32_t idleout; - isc_event_t ctlevent; - dns_ssutable_t * ssutable; - uint32_t sigvalidityinterval; - uint32_t keyvalidityinterval; - uint32_t sigresigninginterval; - dns_view_t * view; - dns_view_t * prev_view; - dns_kasp_t * kasp; - dns_checkmxfunc_t checkmx; + dns_request_t *request; + dns_loadctx_t *lctx; + dns_io_t *readio; + dns_dumpctx_t *dctx; + dns_io_t *writeio; + uint32_t maxxfrin; + uint32_t maxxfrout; + uint32_t idlein; + uint32_t idleout; + isc_event_t ctlevent; + dns_ssutable_t *ssutable; + uint32_t sigvalidityinterval; + uint32_t keyvalidityinterval; + uint32_t sigresigninginterval; + dns_view_t *view; + dns_view_t *prev_view; + dns_kasp_t *kasp; + dns_checkmxfunc_t checkmx; dns_checksrvfunc_t checksrv; - dns_checknsfunc_t checkns; + dns_checknsfunc_t checkns; /*% * Zones in certain states such as "waiting for zone transfer" * or "zone transfer in progress" are kept on per-state linked lists @@ -333,14 +333,14 @@ struct dns_zone { * module. */ dns_zonestat_level_t statlevel; - bool requeststats_on; - isc_stats_t * requeststats; - dns_stats_t * rcvquerystats; - dns_stats_t * dnssecsignstats; - dns_stats_t * dnssecrefreshstats; - uint32_t notifydelay; - dns_isselffunc_t isself; - void * isselfarg; + bool requeststats_on; + isc_stats_t *requeststats; + dns_stats_t *rcvquerystats; + dns_stats_t *dnssecsignstats; + dns_stats_t *dnssecrefreshstats; + uint32_t notifydelay; + dns_isselffunc_t isself; + void *isselfarg; char *strnamerd; char *strname; @@ -354,7 +354,7 @@ struct dns_zone { /*% * Keys that are signing the zone for the first time. */ - dns_signinglist_t signing; + dns_signinglist_t signing; dns_nsec3chainlist_t nsec3chain; /*% * List of outstanding NSEC3PARAM change requests. @@ -363,8 +363,8 @@ struct dns_zone { /*% * Signing / re-signing quantum stopping parameters. */ - uint32_t signatures; - uint32_t nodes; + uint32_t signatures; + uint32_t nodes; dns_rdatatype_t privatetype; /*% @@ -386,7 +386,7 @@ struct dns_zone { * response policy data to be relayed to the database */ dns_rpz_zones_t *rpzs; - dns_rpz_num_t rpz_num; + dns_rpz_num_t rpz_num; /*% * catalog zone data @@ -421,7 +421,7 @@ struct dns_zone { dns_zone_t *raw; dns_zone_t *secure; - bool sourceserialset; + bool sourceserialset; uint32_t sourceserial; /*% @@ -432,14 +432,14 @@ struct dns_zone { /* * Inline zone signing state. */ - dns_diff_t rss_diff; - isc_eventlist_t rss_events; - isc_eventlist_t rss_post; - dns_dbversion_t * rss_newver; - dns_dbversion_t * rss_oldver; - dns_db_t * rss_db; - dns_zone_t * rss_raw; - isc_event_t * rss_event; + dns_diff_t rss_diff; + isc_eventlist_t rss_events; + isc_eventlist_t rss_post; + dns_dbversion_t *rss_newver; + dns_dbversion_t *rss_oldver; + dns_db_t *rss_db; + dns_zone_t *rss_raw; + isc_event_t *rss_event; dns_update_state_t *rss_state; isc_stats_t *gluecachestats; @@ -452,7 +452,7 @@ struct dns_zone { (_z)->offline = false; \ } while (0) -#define DNS_ZONE_FLAG(z, f) ((atomic_load_relaxed(&(z)->flags) & (f)) != 0) +#define DNS_ZONE_FLAG(z, f) ((atomic_load_relaxed(&(z)->flags) & (f)) != 0) #define DNS_ZONE_SETFLAG(z, f) atomic_fetch_or(&(z)->flags, (f)) #define DNS_ZONE_CLRFLAG(z, f) atomic_fetch_and(&(z)->flags, ~(f)) typedef enum { @@ -502,7 +502,7 @@ typedef enum { DNS_ZONEFLG___MAX = UINT64_MAX, /* trick to make the ENUM 64-bit wide */ } dns_zoneflg_t; -#define DNS_ZONE_OPTION(z, o) ((atomic_load_relaxed(&(z)->options) & (o)) != 0) +#define DNS_ZONE_OPTION(z, o) ((atomic_load_relaxed(&(z)->options) & (o)) != 0) #define DNS_ZONE_SETOPTION(z, o) atomic_fetch_or(&(z)->options, (o)) #define DNS_ZONE_CLROPTION(z, o) atomic_fetch_and(&(z)->options, ~(o)) @@ -519,7 +519,7 @@ typedef enum { } dns_zoneloadflag_t; #define UNREACH_CACHE_SIZE 10U -#define UNREACH_HOLD_TIME 600 /* 10 minutes */ +#define UNREACH_HOLD_TIME 600 /* 10 minutes */ #define CHECK(op) \ do { \ @@ -529,31 +529,31 @@ typedef enum { } while (0) struct dns_unreachable { - isc_sockaddr_t remote; - isc_sockaddr_t local; + isc_sockaddr_t remote; + isc_sockaddr_t local; atomic_uint_fast32_t expire; atomic_uint_fast32_t last; - uint32_t count; + uint32_t count; }; struct dns_zonemgr { - unsigned int magic; - isc_mem_t * mctx; - isc_refcount_t refs; - isc_taskmgr_t * taskmgr; - isc_timermgr_t * timermgr; - isc_socketmgr_t * socketmgr; - isc_taskpool_t * zonetasks; - isc_taskpool_t * loadtasks; - isc_task_t * task; - isc_pool_t * mctxpool; + unsigned int magic; + isc_mem_t *mctx; + isc_refcount_t refs; + isc_taskmgr_t *taskmgr; + isc_timermgr_t *timermgr; + isc_socketmgr_t *socketmgr; + isc_taskpool_t *zonetasks; + isc_taskpool_t *loadtasks; + isc_task_t *task; + isc_pool_t *mctxpool; isc_ratelimiter_t *notifyrl; isc_ratelimiter_t *refreshrl; isc_ratelimiter_t *startupnotifyrl; isc_ratelimiter_t *startuprefreshrl; - isc_rwlock_t rwlock; - isc_mutex_t iolock; - isc_rwlock_t urlock; + isc_rwlock_t rwlock; + isc_mutex_t iolock; + isc_rwlock_t urlock; /* Locked by rwlock. */ dns_zonelist_t zones; @@ -561,16 +561,16 @@ struct dns_zonemgr { dns_zonelist_t xfrin_in_progress; /* Configuration data. */ - uint32_t transfersin; - uint32_t transfersperns; + uint32_t transfersin; + uint32_t transfersperns; unsigned int notifyrate; unsigned int startupnotifyrate; unsigned int serialqueryrate; unsigned int startupserialqueryrate; /* Locked by iolock */ - uint32_t iolimit; - uint32_t ioactive; + uint32_t iolimit; + uint32_t ioactive; dns_iolist_t high; dns_iolist_t low; @@ -583,21 +583,21 @@ struct dns_zonemgr { * Hold notify state. */ struct dns_notify { - unsigned int magic; - unsigned int flags; - isc_mem_t * mctx; - dns_zone_t * zone; + unsigned int magic; + unsigned int flags; + isc_mem_t *mctx; + dns_zone_t *zone; dns_adbfind_t *find; dns_request_t *request; - dns_name_t ns; + dns_name_t ns; isc_sockaddr_t dst; dns_tsigkey_t *key; - isc_dscp_t dscp; + isc_dscp_t dscp; ISC_LINK(dns_notify_t) link; isc_event_t *event; }; -#define DNS_NOTIFY_NOSOA 0x0001U +#define DNS_NOTIFY_NOSOA 0x0001U #define DNS_NOTIFY_STARTUP 0x0002U /*% @@ -607,10 +607,10 @@ struct dns_notify { */ struct dns_stub { - unsigned int magic; - isc_mem_t * mctx; - dns_zone_t * zone; - dns_db_t * db; + unsigned int magic; + isc_mem_t *mctx; + dns_zone_t *zone; + dns_db_t *db; dns_dbversion_t *version; }; @@ -618,11 +618,11 @@ struct dns_stub { * Hold load state. */ struct dns_load { - unsigned int magic; - isc_mem_t * mctx; - dns_zone_t * zone; - dns_db_t * db; - isc_time_t loadtime; + unsigned int magic; + isc_mem_t *mctx; + dns_zone_t *zone; + dns_db_t *db; + isc_time_t loadtime; dns_rdatacallbacks_t callbacks; }; @@ -630,16 +630,16 @@ struct dns_load { * Hold forward state. */ struct dns_forward { - unsigned int magic; - isc_mem_t * mctx; - dns_zone_t * zone; - isc_buffer_t * msgbuf; - dns_request_t * request; - uint32_t which; - isc_sockaddr_t addr; + unsigned int magic; + isc_mem_t *mctx; + dns_zone_t *zone; + isc_buffer_t *msgbuf; + dns_request_t *request; + uint32_t which; + isc_sockaddr_t addr; dns_updatecallback_t callback; - void * callback_arg; - unsigned int options; + void *callback_arg; + unsigned int options; ISC_LINK(dns_forward_t) link; }; @@ -647,10 +647,10 @@ struct dns_forward { * Hold IO request state. */ struct dns_io { - unsigned int magic; + unsigned int magic; dns_zonemgr_t *zmgr; - bool high; - isc_task_t * task; + bool high; + isc_task_t *task; ISC_LINK(dns_io_t) link; isc_event_t *event; }; @@ -660,26 +660,26 @@ struct dns_io { * DNSKEY as result of an update. */ struct dns_signing { - unsigned int magic; - dns_db_t * db; + unsigned int magic; + dns_db_t *db; dns_dbiterator_t *dbiterator; - dns_secalg_t algorithm; - uint16_t keyid; - bool deleteit; - bool done; + dns_secalg_t algorithm; + uint16_t keyid; + bool deleteit; + bool done; ISC_LINK(dns_signing_t) link; }; struct dns_nsec3chain { - unsigned int magic; - dns_db_t * db; - dns_dbiterator_t * dbiterator; + unsigned int magic; + dns_db_t *db; + dns_dbiterator_t *dbiterator; dns_rdata_nsec3param_t nsec3param; - unsigned char salt[255]; - bool done; - bool seen_nsec; - bool delete_nsec; - bool save_delete_nsec; + unsigned char salt[255]; + bool done; + bool seen_nsec; + bool delete_nsec; + bool save_delete_nsec; ISC_LINK(dns_nsec3chain_t) link; }; /*%< @@ -706,29 +706,29 @@ struct dns_nsec3chain { struct dns_keyfetch { dns_fixedname_t name; - dns_rdataset_t keydataset; - dns_rdataset_t dnskeyset; - dns_rdataset_t dnskeysigset; - dns_zone_t * zone; - dns_db_t * db; - dns_fetch_t * fetch; + dns_rdataset_t keydataset; + dns_rdataset_t dnskeyset; + dns_rdataset_t dnskeysigset; + dns_zone_t *zone; + dns_db_t *db; + dns_fetch_t *fetch; }; /*% * Hold state for an asynchronous load */ struct dns_asyncload { - dns_zone_t * zone; - unsigned int flags; + dns_zone_t *zone; + unsigned int flags; dns_zt_zoneloaded_t loaded; - void * loaded_arg; + void *loaded_arg; }; /*% * Reference to an include file encountered during loading */ struct dns_include { - char * name; + char *name; isc_time_t filetime; ISC_LINK(dns_include_t) link; }; @@ -738,8 +738,8 @@ struct dns_include { * line, so that we can test with shorter periods than specified in * RFC 5011. */ -#define HOUR 3600 -#define DAY (24 * HOUR) +#define HOUR 3600 +#define DAY (24 * HOUR) #define MONTH (30 * DAY) LIBDNS_EXTERNAL_DATA unsigned int dns_zone_mkey_hour = HOUR; LIBDNS_EXTERNAL_DATA unsigned int dns_zone_mkey_day = DAY; @@ -747,149 +747,101 @@ 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 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 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 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") static const unsigned int dbargc_default = 1; -static const char * dbargv_default[] = { "rbt" }; +static const char *dbargv_default[] = { "rbt" }; #define DNS_ZONE_JITTER_ADD(a, b, c) \ do { \ isc_interval_t _i; \ - uint32_t _j; \ + uint32_t _j; \ _j = (b)-isc_random_uniform((b) / 4); \ isc_interval_set(&_i, _j, 0); \ if (isc_time_add((a), &_i, (c)) != ISC_R_SUCCESS) { \ @@ -919,28 +871,27 @@ static const char * dbargv_default[] = { "rbt" }; typedef struct nsec3param nsec3param_t; struct nsec3param { unsigned char data[DNS_NSEC3PARAM_BUFFERSIZE + 1]; - unsigned int length; - bool nsec; - bool replace; + unsigned int length; + bool nsec; + bool replace; ISC_LINK(nsec3param_t) link; }; typedef ISC_LIST(nsec3param_t) nsec3paramlist_t; struct np3event { - isc_event_t event; + isc_event_t event; nsec3param_t params; }; struct ssevent { isc_event_t event; - uint32_t serial; + uint32_t serial; }; /*% * Increment resolver-related statistics counters. Zone must be locked. */ static inline void -inc_stats(dns_zone_t *zone, isc_statscounter_t counter) -{ +inc_stats(dns_zone_t *zone, isc_statscounter_t counter) { if (zone->stats != NULL) { isc_stats_increment(zone->stats, counter); } @@ -951,11 +902,10 @@ inc_stats(dns_zone_t *zone, isc_statscounter_t counter) ***/ isc_result_t -dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) -{ +dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) { isc_result_t result; - dns_zone_t * zone; - isc_time_t now; + dns_zone_t *zone; + isc_time_t now; REQUIRE(zonep != NULL && *zonep == NULL); REQUIRE(mctx != NULL); @@ -1163,12 +1113,11 @@ free_mutex: * outstanding events or references, no locking is necessary. */ static void -zone_free(dns_zone_t *zone) -{ - dns_signing_t * signing; +zone_free(dns_zone_t *zone) { + dns_signing_t *signing; dns_nsec3chain_t *nsec3chain; - isc_event_t * event; - dns_include_t * include; + isc_event_t *event; + dns_include_t *include; REQUIRE(DNS_ZONE_VALID(zone)); isc_refcount_destroy(&zone->erefs); @@ -1212,27 +1161,31 @@ zone_free(dns_zone_t *zone) isc_event_free(&event); } for (signing = ISC_LIST_HEAD(zone->signing); signing != NULL; - signing = ISC_LIST_HEAD(zone->signing)) { + signing = ISC_LIST_HEAD(zone->signing)) + { ISC_LIST_UNLINK(zone->signing, signing, link); dns_db_detach(&signing->db); dns_dbiterator_destroy(&signing->dbiterator); isc_mem_put(zone->mctx, signing, sizeof *signing); } for (nsec3chain = ISC_LIST_HEAD(zone->nsec3chain); nsec3chain != NULL; - nsec3chain = ISC_LIST_HEAD(zone->nsec3chain)) { + nsec3chain = ISC_LIST_HEAD(zone->nsec3chain)) + { ISC_LIST_UNLINK(zone->nsec3chain, nsec3chain, link); dns_db_detach(&nsec3chain->db); dns_dbiterator_destroy(&nsec3chain->dbiterator); isc_mem_put(zone->mctx, nsec3chain, sizeof *nsec3chain); } for (include = ISC_LIST_HEAD(zone->includes); include != NULL; - include = ISC_LIST_HEAD(zone->includes)) { + include = ISC_LIST_HEAD(zone->includes)) + { ISC_LIST_UNLINK(zone->includes, include, link); isc_mem_free(zone->mctx, include->name); isc_mem_put(zone->mctx, include, sizeof *include); } for (include = ISC_LIST_HEAD(zone->newincludes); include != NULL; - include = ISC_LIST_HEAD(zone->newincludes)) { + include = ISC_LIST_HEAD(zone->newincludes)) + { ISC_LIST_UNLINK(zone->newincludes, include, link); isc_mem_free(zone->mctx, include->name); isc_mem_put(zone->mctx, include, sizeof *include); @@ -1336,8 +1289,7 @@ zone_free(dns_zone_t *zone) * Caller should hold zone lock. */ static inline bool -inline_secure(dns_zone_t *zone) -{ +inline_secure(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); if (zone->raw != NULL) { return (true); @@ -1350,8 +1302,7 @@ inline_secure(dns_zone_t *zone) * Caller should hold zone lock. */ static inline bool -inline_raw(dns_zone_t *zone) -{ +inline_raw(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); if (zone->secure != NULL) { return (true); @@ -1363,8 +1314,7 @@ inline_raw(dns_zone_t *zone) * Single shot. */ void -dns_zone_setclass(dns_zone_t *zone, dns_rdataclass_t rdclass) -{ +dns_zone_setclass(dns_zone_t *zone, dns_rdataclass_t rdclass) { char namebuf[1024]; REQUIRE(DNS_ZONE_VALID(zone)); @@ -1398,16 +1348,14 @@ dns_zone_setclass(dns_zone_t *zone, dns_rdataclass_t rdclass) } dns_rdataclass_t -dns_zone_getclass(dns_zone_t *zone) -{ +dns_zone_getclass(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->rdclass); } void -dns_zone_setnotifytype(dns_zone_t *zone, dns_notifytype_t notifytype) -{ +dns_zone_setnotifytype(dns_zone_t *zone, dns_notifytype_t notifytype) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -1416,8 +1364,7 @@ dns_zone_setnotifytype(dns_zone_t *zone, dns_notifytype_t notifytype) } isc_result_t -dns_zone_getserial(dns_zone_t *zone, uint32_t *serialp) -{ +dns_zone_getserial(dns_zone_t *zone, uint32_t *serialp) { isc_result_t result; unsigned int soacount; @@ -1446,8 +1393,7 @@ dns_zone_getserial(dns_zone_t *zone, uint32_t *serialp) * Single shot. */ void -dns_zone_settype(dns_zone_t *zone, dns_zonetype_t type) -{ +dns_zone_settype(dns_zone_t *zone, dns_zonetype_t type) { char namebuf[1024]; REQUIRE(DNS_ZONE_VALID(zone)); @@ -1470,8 +1416,7 @@ dns_zone_settype(dns_zone_t *zone, dns_zonetype_t type) } static void -zone_freedbargs(dns_zone_t *zone) -{ +zone_freedbargs(dns_zone_t *zone) { unsigned int i; /* Free the old database argument list. */ @@ -1487,13 +1432,12 @@ zone_freedbargs(dns_zone_t *zone) } isc_result_t -dns_zone_getdbtype(dns_zone_t *zone, char ***argv, isc_mem_t *mctx) -{ - size_t size = 0; +dns_zone_getdbtype(dns_zone_t *zone, char ***argv, isc_mem_t *mctx) { + size_t size = 0; unsigned int i; isc_result_t result = ISC_R_SUCCESS; - void * mem; - char ** tmp, *tmp2, *base; + void *mem; + char **tmp, *tmp2, *base; REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(argv != NULL && *argv == NULL); @@ -1523,9 +1467,8 @@ dns_zone_getdbtype(dns_zone_t *zone, char ***argv, isc_mem_t *mctx) void dns_zone_setdbtype(dns_zone_t *zone, unsigned int dbargc, - const char *const *dbargv) -{ - char ** argv = NULL; + const char *const *dbargv) { + char **argv = NULL; unsigned int i; REQUIRE(DNS_ZONE_VALID(zone)); @@ -1553,8 +1496,7 @@ dns_zone_setdbtype(dns_zone_t *zone, unsigned int dbargc, } static void -dns_zone_setview_helper(dns_zone_t *zone, dns_view_t *view) -{ +dns_zone_setview_helper(dns_zone_t *zone, dns_view_t *view) { char namebuf[1024]; if (zone->prev_view == NULL && zone->view != NULL) { @@ -1585,8 +1527,7 @@ dns_zone_setview_helper(dns_zone_t *zone, dns_view_t *view) } void -dns_zone_setview(dns_zone_t *zone, dns_view_t *view) -{ +dns_zone_setview(dns_zone_t *zone, dns_view_t *view) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -1595,16 +1536,14 @@ dns_zone_setview(dns_zone_t *zone, dns_view_t *view) } dns_view_t * -dns_zone_getview(dns_zone_t *zone) -{ +dns_zone_getview(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->view); } void -dns_zone_setviewcommit(dns_zone_t *zone) -{ +dns_zone_setviewcommit(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -1615,8 +1554,7 @@ dns_zone_setviewcommit(dns_zone_t *zone) } void -dns_zone_setviewrevert(dns_zone_t *zone) -{ +dns_zone_setviewrevert(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -1628,10 +1566,9 @@ dns_zone_setviewrevert(dns_zone_t *zone) } isc_result_t -dns_zone_setorigin(dns_zone_t *zone, const dns_name_t *origin) -{ +dns_zone_setorigin(dns_zone_t *zone, const dns_name_t *origin) { isc_result_t result = ISC_R_SUCCESS; - char namebuf[1024]; + char namebuf[1024]; REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(origin != NULL); @@ -1664,8 +1601,7 @@ dns_zone_setorigin(dns_zone_t *zone, const dns_name_t *origin) } static isc_result_t -dns_zone_setstring(dns_zone_t *zone, char **field, const char *value) -{ +dns_zone_setstring(dns_zone_t *zone, char **field, const char *value) { char *copy; if (value != NULL) { @@ -1684,8 +1620,7 @@ dns_zone_setstring(dns_zone_t *zone, char **field, const char *value) isc_result_t dns_zone_setfile(dns_zone_t *zone, const char *file, dns_masterformat_t format, - const dns_master_style_t *style) -{ + const dns_master_style_t *style) { isc_result_t result = ISC_R_SUCCESS; REQUIRE(DNS_ZONE_VALID(zone)); @@ -1705,24 +1640,21 @@ dns_zone_setfile(dns_zone_t *zone, const char *file, dns_masterformat_t format, } const char * -dns_zone_getfile(dns_zone_t *zone) -{ +dns_zone_getfile(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->masterfile); } dns_ttl_t -dns_zone_getmaxttl(dns_zone_t *zone) -{ +dns_zone_getmaxttl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->maxttl); } void -dns_zone_setmaxttl(dns_zone_t *zone, dns_ttl_t maxttl) -{ +dns_zone_setmaxttl(dns_zone_t *zone, dns_ttl_t maxttl) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -1738,10 +1670,9 @@ dns_zone_setmaxttl(dns_zone_t *zone, dns_ttl_t maxttl) } static isc_result_t -default_journal(dns_zone_t *zone) -{ +default_journal(dns_zone_t *zone) { isc_result_t result; - char * journal; + char *journal; REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(LOCKED_ZONE(zone)); @@ -1763,8 +1694,7 @@ default_journal(dns_zone_t *zone) } isc_result_t -dns_zone_setjournal(dns_zone_t *zone, const char *myjournal) -{ +dns_zone_setjournal(dns_zone_t *zone, const char *myjournal) { isc_result_t result = ISC_R_SUCCESS; REQUIRE(DNS_ZONE_VALID(zone)); @@ -1777,8 +1707,7 @@ dns_zone_setjournal(dns_zone_t *zone, const char *myjournal) } char * -dns_zone_getjournal(dns_zone_t *zone) -{ +dns_zone_getjournal(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->journal); @@ -1795,13 +1724,13 @@ dns_zone_getjournal(dns_zone_t *zone) * exactly "{ none; }". */ bool -dns_zone_isdynamic(dns_zone_t *zone, bool ignore_freeze) -{ +dns_zone_isdynamic(dns_zone_t *zone, bool ignore_freeze) { REQUIRE(DNS_ZONE_VALID(zone)); if (zone->type == dns_zone_slave || zone->type == dns_zone_mirror || zone->type == dns_zone_stub || zone->type == dns_zone_key || - (zone->type == dns_zone_redirect && zone->masters != NULL)) { + (zone->type == dns_zone_redirect && zone->masters != NULL)) + { return (true); } @@ -1814,7 +1743,8 @@ dns_zone_isdynamic(dns_zone_t *zone, bool ignore_freeze) if (zone->type == dns_zone_master && (!zone->update_disabled || ignore_freeze) && ((zone->ssutable != NULL) || - (zone->update_acl != NULL && !dns_acl_isnone(zone->update_acl)))) { + (zone->update_acl != NULL && !dns_acl_isnone(zone->update_acl)))) + { return (true); } @@ -1826,8 +1756,7 @@ dns_zone_isdynamic(dns_zone_t *zone, bool ignore_freeze) */ isc_result_t dns_zone_rpz_enable(dns_zone_t *zone, dns_rpz_zones_t *rpzs, - dns_rpz_num_t rpz_num) -{ + dns_rpz_num_t rpz_num) { /* * Only RBTDB zones can be used for response policy zones, * because only they have the code to create the summary data. @@ -1835,7 +1764,8 @@ dns_zone_rpz_enable(dns_zone_t *zone, dns_rpz_zones_t *rpzs, * summary data and so can be policy zones. */ if (strcmp(zone->db_argv[0], "rbt") != 0 && - strcmp(zone->db_argv[0], "rbt64") != 0) { + strcmp(zone->db_argv[0], "rbt64") != 0) + { return (ISC_R_NOTIMPLEMENTED); } if (zone->masterformat == dns_masterformat_map) { @@ -1860,8 +1790,7 @@ dns_zone_rpz_enable(dns_zone_t *zone, dns_rpz_zones_t *rpzs, } dns_rpz_num_t -dns_zone_get_rpz_num(dns_zone_t *zone) -{ +dns_zone_get_rpz_num(dns_zone_t *zone) { return (zone->rpz_num); } @@ -1869,8 +1798,7 @@ dns_zone_get_rpz_num(dns_zone_t *zone) * If a zone is a response policy zone, mark its new database. */ void -dns_zone_rpz_enable_db(dns_zone_t *zone, dns_db_t *db) -{ +dns_zone_rpz_enable_db(dns_zone_t *zone, dns_db_t *db) { isc_result_t result; if (zone->rpz_num == DNS_RPZ_INVALID_NUM) { return; @@ -1882,8 +1810,7 @@ dns_zone_rpz_enable_db(dns_zone_t *zone, dns_db_t *db) } static void -dns_zone_rpz_disable_db(dns_zone_t *zone, dns_db_t *db) -{ +dns_zone_rpz_disable_db(dns_zone_t *zone, dns_db_t *db) { if (zone->rpz_num == DNS_RPZ_INVALID_NUM) { return; } @@ -1893,8 +1820,7 @@ dns_zone_rpz_disable_db(dns_zone_t *zone, dns_db_t *db) } void -dns_zone_catz_enable(dns_zone_t *zone, dns_catz_zones_t *catzs) -{ +dns_zone_catz_enable(dns_zone_t *zone, dns_catz_zones_t *catzs) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(catzs != NULL); @@ -1911,8 +1837,7 @@ dns_zone_catz_enable(dns_zone_t *zone, dns_catz_zones_t *catzs) * If a zone is a catalog zone, attach it to update notification in database. */ void -dns_zone_catz_enable_db(dns_zone_t *zone, dns_db_t *db) -{ +dns_zone_catz_enable_db(dns_zone_t *zone, dns_db_t *db) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(db != NULL); @@ -1923,8 +1848,7 @@ dns_zone_catz_enable_db(dns_zone_t *zone, dns_db_t *db) } static void -dns_zone_catz_disable_db(dns_zone_t *zone, dns_db_t *db) -{ +dns_zone_catz_disable_db(dns_zone_t *zone, dns_db_t *db) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(db != NULL); @@ -1938,8 +1862,7 @@ dns_zone_catz_disable_db(dns_zone_t *zone, dns_db_t *db) * Set catalog zone ownership of the zone */ void -dns_zone_set_parentcatz(dns_zone_t *zone, dns_catz_zone_t *catz) -{ +dns_zone_set_parentcatz(dns_zone_t *zone, dns_catz_zone_t *catz) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(catz != NULL); LOCK_ZONE(zone); @@ -1949,17 +1872,15 @@ dns_zone_set_parentcatz(dns_zone_t *zone, dns_catz_zone_t *catz) } dns_catz_zone_t * -dns_zone_get_parentcatz(const dns_zone_t *zone) -{ +dns_zone_get_parentcatz(const dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->parentcatz); } static bool -zone_touched(dns_zone_t *zone) -{ - isc_result_t result; - isc_time_t modtime; +zone_touched(dns_zone_t *zone) { + isc_result_t result; + isc_time_t modtime; dns_include_t *include; REQUIRE(DNS_ZONE_VALID(zone)); @@ -1971,10 +1892,12 @@ zone_touched(dns_zone_t *zone) } for (include = ISC_LIST_HEAD(zone->includes); include != NULL; - include = ISC_LIST_NEXT(include, link)) { + include = ISC_LIST_NEXT(include, link)) + { result = isc_file_getmodtime(include->name, &modtime); if (result != ISC_R_SUCCESS || - isc_time_compare(&modtime, &include->filetime) > 0) { + isc_time_compare(&modtime, &include->filetime) > 0) + { return (true); } } @@ -1988,13 +1911,12 @@ zone_touched(dns_zone_t *zone) * in order to load the raw zone. */ static isc_result_t -zone_load(dns_zone_t *zone, unsigned int flags, bool locked) -{ +zone_load(dns_zone_t *zone, unsigned int flags, bool locked) { isc_result_t result; - isc_time_t now; - isc_time_t loadtime; - dns_db_t * db = NULL; - bool rbt, hasraw, is_dynamic; + isc_time_t now; + isc_time_t loadtime; + dns_db_t *db = NULL; + bool rbt, hasraw, is_dynamic; REQUIRE(DNS_ZONE_VALID(zone)); @@ -2099,7 +2021,8 @@ zone_load(dns_zone_t *zone, unsigned int flags, bool locked) * "rndc reconfig", we are done. */ if (!isc_time_isepoch(&zone->loadtime) && - (flags & DNS_ZONELOADFLAG_NOSTAT) != 0) { + (flags & DNS_ZONELOADFLAG_NOSTAT) != 0) + { result = ISC_R_SUCCESS; goto cleanup; } @@ -2132,7 +2055,8 @@ zone_load(dns_zone_t *zone, unsigned int flags, bool locked) if (zone->type == dns_zone_master && strcmp(zone->db_argv[0], "_builtin") == 0 && (zone->db_argc < 2 || strcmp(zone->db_argv[1], "empty") != 0) && - DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) { + DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) + { result = ISC_R_SUCCESS; goto cleanup; } @@ -2142,11 +2066,12 @@ zone_load(dns_zone_t *zone, unsigned int flags, bool locked) * but we need to associate the database with the zone object. */ if (strcmp(zone->db_argv[0], "dlz") == 0) { - dns_dlzdb_t * dlzdb; + dns_dlzdb_t *dlzdb; dns_dlzfindzone_t findzone; for (dlzdb = ISC_LIST_HEAD(zone->view->dlz_unsearched); - dlzdb != NULL; dlzdb = ISC_LIST_NEXT(dlzdb, link)) { + dlzdb != NULL; dlzdb = ISC_LIST_NEXT(dlzdb, link)) + { INSIST(DNS_DLZ_VALID(dlzdb)); if (strcmp(zone->db_argv[1], dlzdb->dlzname) == 0) { break; @@ -2200,7 +2125,8 @@ zone_load(dns_zone_t *zone, unsigned int flags, bool locked) if ((zone->type == dns_zone_slave || zone->type == dns_zone_mirror || zone->type == dns_zone_stub || (zone->type == dns_zone_redirect && zone->masters != NULL)) && - rbt) { + rbt) + { if (zone->masterfile == NULL || !isc_file_exists(zone->masterfile)) { if (zone->masterfile != NULL) { @@ -2235,7 +2161,8 @@ zone_load(dns_zone_t *zone, unsigned int flags, bool locked) dns_db_settask(db, zone->task); if (zone->type == dns_zone_master || zone->type == dns_zone_slave || - zone->type == dns_zone_mirror) { + zone->type == dns_zone_mirror) + { result = dns_db_setgluecachestats(db, zone->gluecachestats); if (result == ISC_R_NOTIMPLEMENTED) { result = ISC_R_SUCCESS; @@ -2252,7 +2179,8 @@ zone_load(dns_zone_t *zone, unsigned int flags, bool locked) result = DNS_R_NOMASTERFILE; if (zone->type == dns_zone_master || (zone->type == dns_zone_redirect && - zone->masters == NULL)) { + zone->masters == NULL)) + { dns_zone_logc(zone, DNS_LOGCATEGORY_ZONELOAD, ISC_LOG_ERROR, "loading zone: " @@ -2290,17 +2218,15 @@ cleanup: } isc_result_t -dns_zone_load(dns_zone_t *zone, bool newonly) -{ +dns_zone_load(dns_zone_t *zone, bool newonly) { return (zone_load(zone, newonly ? DNS_ZONELOADFLAG_NOSTAT : 0, false)); } static void -zone_asyncload(isc_task_t *task, isc_event_t *event) -{ +zone_asyncload(isc_task_t *task, isc_event_t *event) { dns_asyncload_t *asl = event->ev_arg; - dns_zone_t * zone = asl->zone; - isc_result_t result; + dns_zone_t *zone = asl->zone; + isc_result_t result; UNUSED(task); @@ -2326,9 +2252,8 @@ zone_asyncload(isc_task_t *task, isc_event_t *event) isc_result_t dns_zone_asyncload(dns_zone_t *zone, bool newonly, dns_zt_zoneloaded_t done, - void *arg) -{ - isc_event_t * e; + void *arg) { + isc_event_t *e; dns_asyncload_t *asl = NULL; REQUIRE(DNS_ZONE_VALID(zone)); @@ -2363,16 +2288,14 @@ dns_zone_asyncload(dns_zone_t *zone, bool newonly, dns_zt_zoneloaded_t done, } bool -dns__zone_loadpending(dns_zone_t *zone) -{ +dns__zone_loadpending(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADPENDING)); } isc_result_t -dns_zone_loadandthaw(dns_zone_t *zone) -{ +dns_zone_loadandthaw(dns_zone_t *zone) { isc_result_t result; if (inline_raw(zone)) { @@ -2401,13 +2324,13 @@ dns_zone_loadandthaw(dns_zone_t *zone) } static unsigned int -get_master_options(dns_zone_t *zone) -{ +get_master_options(dns_zone_t *zone) { unsigned int options; options = DNS_MASTER_ZONE | DNS_MASTER_RESIGN; if (zone->type == dns_zone_slave || zone->type == dns_zone_mirror || - (zone->type == dns_zone_redirect && zone->masters == NULL)) { + (zone->type == dns_zone_redirect && zone->masters == NULL)) + { options |= DNS_MASTER_SLAVE; } if (zone->type == dns_zone_key) { @@ -2442,10 +2365,9 @@ get_master_options(dns_zone_t *zone) } static void -zone_registerinclude(const char *filename, void *arg) -{ - isc_result_t result; - dns_zone_t * zone = (dns_zone_t *)arg; +zone_registerinclude(const char *filename, void *arg) { + isc_result_t result; + dns_zone_t *zone = (dns_zone_t *)arg; dns_include_t *inc = NULL; REQUIRE(DNS_ZONE_VALID(zone)); @@ -2458,7 +2380,8 @@ zone_registerinclude(const char *filename, void *arg) * Suppress duplicates. */ for (inc = ISC_LIST_HEAD(zone->newincludes); inc != NULL; - inc = ISC_LIST_NEXT(inc, link)) { + inc = ISC_LIST_NEXT(inc, link)) + { if (strcmp(filename, inc->name) == 0) { return; } @@ -2477,9 +2400,8 @@ zone_registerinclude(const char *filename, void *arg) } static void -zone_gotreadhandle(isc_task_t *task, isc_event_t *event) -{ - dns_load_t * load = event->ev_arg; +zone_gotreadhandle(isc_task_t *task, isc_event_t *event) { + dns_load_t *load = event->ev_arg; isc_result_t result = ISC_R_SUCCESS; unsigned int options; @@ -2502,7 +2424,8 @@ zone_gotreadhandle(isc_task_t *task, isc_event_t *event) zone_registerinclude, load->zone, load->zone->mctx, load->zone->masterformat, load->zone->maxttl); if (result != ISC_R_SUCCESS && result != DNS_R_CONTINUE && - result != DNS_R_SEENINCLUDE) { + result != DNS_R_SEENINCLUDE) + { goto fail; } return; @@ -2512,8 +2435,7 @@ fail: } static void -get_raw_serial(dns_zone_t *raw, dns_masterrawheader_t *rawdata) -{ +get_raw_serial(dns_zone_t *raw, dns_masterrawheader_t *rawdata) { isc_result_t result; unsigned int soacount; @@ -2530,12 +2452,11 @@ get_raw_serial(dns_zone_t *raw, dns_masterrawheader_t *rawdata) } static void -zone_gotwritehandle(isc_task_t *task, isc_event_t *event) -{ - const char me[] = "zone_gotwritehandle"; - dns_zone_t * zone = event->ev_arg; - isc_result_t result = ISC_R_SUCCESS; - dns_dbversion_t * version = NULL; +zone_gotwritehandle(isc_task_t *task, isc_event_t *event) { + const char me[] = "zone_gotwritehandle"; + dns_zone_t *zone = event->ev_arg; + isc_result_t result = ISC_R_SUCCESS; + dns_dbversion_t *version = NULL; dns_masterrawheader_t rawdata; REQUIRE(DNS_ZONE_VALID(zone)); @@ -2594,8 +2515,7 @@ fail: * all we're interested in.) */ static void -zone_setrawdata(dns_zone_t *zone, dns_masterrawheader_t *header) -{ +zone_setrawdata(dns_zone_t *zone, dns_masterrawheader_t *header) { if ((header->flags & DNS_MASTERRAW_SOURCESERIALSET) == 0) { return; } @@ -2605,8 +2525,7 @@ zone_setrawdata(dns_zone_t *zone, dns_masterrawheader_t *header) } void -dns_zone_setrawdata(dns_zone_t *zone, dns_masterrawheader_t *header) -{ +dns_zone_setrawdata(dns_zone_t *zone, dns_masterrawheader_t *header) { if (zone == NULL) { return; } @@ -2617,10 +2536,9 @@ dns_zone_setrawdata(dns_zone_t *zone, dns_masterrawheader_t *header) } static isc_result_t -zone_startload(dns_db_t *db, dns_zone_t *zone, isc_time_t loadtime) -{ - const char me[] = "zone_startload"; - dns_load_t * load; +zone_startload(dns_db_t *db, dns_zone_t *zone, isc_time_t loadtime) { + const char me[] = "zone_startload"; + dns_load_t *load; isc_result_t result; isc_result_t tresult; unsigned int options; @@ -2703,15 +2621,14 @@ cleanup: static bool zone_check_mx(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, - dns_name_t *owner) -{ - isc_result_t result; - char ownerbuf[DNS_NAME_FORMATSIZE]; - char namebuf[DNS_NAME_FORMATSIZE]; - char altbuf[DNS_NAME_FORMATSIZE]; + dns_name_t *owner) { + isc_result_t result; + char ownerbuf[DNS_NAME_FORMATSIZE]; + char namebuf[DNS_NAME_FORMATSIZE]; + char altbuf[DNS_NAME_FORMATSIZE]; dns_fixedname_t fixed; - dns_name_t * foundname; - int level; + dns_name_t *foundname; + int level; /* * "." means the services does not exist. @@ -2755,7 +2672,8 @@ zone_check_mx(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, dns_name_format(owner, ownerbuf, sizeof ownerbuf); dns_name_format(name, namebuf, sizeof namebuf); if (result == DNS_R_NXRRSET || result == DNS_R_NXDOMAIN || - result == DNS_R_EMPTYNAME) { + result == DNS_R_EMPTYNAME) + { if (!DNS_ZONE_OPTION(zone, DNS_ZONEOPT_CHECKMXFAIL)) { level = ISC_LOG_WARNING; } @@ -2767,7 +2685,8 @@ zone_check_mx(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, if (result == DNS_R_CNAME) { if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_WARNMXCNAME) || - DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IGNOREMXCNAME)) { + DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IGNOREMXCNAME)) + { level = ISC_LOG_WARNING; } if (!DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IGNOREMXCNAME)) { @@ -2780,7 +2699,8 @@ zone_check_mx(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, if (result == DNS_R_DNAME) { if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_WARNMXCNAME) || - DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IGNOREMXCNAME)) { + DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IGNOREMXCNAME)) + { level = ISC_LOG_WARNING; } if (!DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IGNOREMXCNAME)) { @@ -2802,15 +2722,14 @@ zone_check_mx(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, static bool zone_check_srv(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, - dns_name_t *owner) -{ - isc_result_t result; - char ownerbuf[DNS_NAME_FORMATSIZE]; - char namebuf[DNS_NAME_FORMATSIZE]; - char altbuf[DNS_NAME_FORMATSIZE]; + dns_name_t *owner) { + isc_result_t result; + char ownerbuf[DNS_NAME_FORMATSIZE]; + char namebuf[DNS_NAME_FORMATSIZE]; + char altbuf[DNS_NAME_FORMATSIZE]; dns_fixedname_t fixed; - dns_name_t * foundname; - int level; + dns_name_t *foundname; + int level; /* * "." means the services does not exist. @@ -2854,7 +2773,8 @@ zone_check_srv(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, dns_name_format(owner, ownerbuf, sizeof ownerbuf); dns_name_format(name, namebuf, sizeof namebuf); if (result == DNS_R_NXRRSET || result == DNS_R_NXDOMAIN || - result == DNS_R_EMPTYNAME) { + result == DNS_R_EMPTYNAME) + { dns_zone_log(zone, level, "%s/SRV '%s' has no address records (A or AAAA)", ownerbuf, namebuf); @@ -2864,7 +2784,8 @@ zone_check_srv(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, if (result == DNS_R_CNAME) { if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_WARNSRVCNAME) || - DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IGNORESRVCNAME)) { + DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IGNORESRVCNAME)) + { level = ISC_LOG_WARNING; } if (!DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IGNORESRVCNAME)) { @@ -2877,7 +2798,8 @@ zone_check_srv(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, if (result == DNS_R_DNAME) { if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_WARNSRVCNAME) || - DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IGNORESRVCNAME)) { + DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IGNORESRVCNAME)) + { level = ISC_LOG_WARNING; } if (!DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IGNORESRVCNAME)) { @@ -2899,18 +2821,17 @@ zone_check_srv(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, static bool zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, - dns_name_t *owner) -{ - bool answer = true; - isc_result_t result, tresult; - char ownerbuf[DNS_NAME_FORMATSIZE]; - char namebuf[DNS_NAME_FORMATSIZE]; - char altbuf[DNS_NAME_FORMATSIZE]; + dns_name_t *owner) { + bool answer = true; + isc_result_t result, tresult; + char ownerbuf[DNS_NAME_FORMATSIZE]; + char namebuf[DNS_NAME_FORMATSIZE]; + char altbuf[DNS_NAME_FORMATSIZE]; dns_fixedname_t fixed; - dns_name_t * foundname; - dns_rdataset_t a; - dns_rdataset_t aaaa; - int level; + dns_name_t *foundname; + dns_rdataset_t a; + dns_rdataset_t aaaa; + int level; /* * Outside of zone. @@ -2959,7 +2880,8 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, } if (result == DNS_R_NXRRSET || result == DNS_R_DELEGATION || - result == DNS_R_GLUE) { + result == DNS_R_GLUE) + { tresult = dns_db_find(db, name, NULL, dns_rdatatype_aaaa, DNS_DBFIND_GLUEOK, 0, NULL, foundname, &aaaa, NULL); @@ -2994,9 +2916,10 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, dns_name_format(owner, ownerbuf, sizeof ownerbuf); dns_name_format(name, namebuf, sizeof namebuf); if (result == DNS_R_NXRRSET || result == DNS_R_NXDOMAIN || - result == DNS_R_EMPTYNAME || result == DNS_R_DELEGATION) { + result == DNS_R_EMPTYNAME || result == DNS_R_DELEGATION) + { const char *what; - bool required = false; + bool required = false; if (dns_name_issubdomain(name, owner)) { what = "REQUIRED GLUE "; required = true; @@ -3007,7 +2930,8 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, } if (result != DNS_R_DELEGATION || required || - DNS_ZONE_OPTION(zone, DNS_ZONEOPT_CHECKSIBLING)) { + DNS_ZONE_OPTION(zone, DNS_ZONEOPT_CHECKSIBLING)) + { dns_zone_log(zone, level, "%s/NS '%s' has no %s" "address records (A or AAAA)", @@ -3015,8 +2939,8 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, /* * Log missing address record. */ - if (result == DNS_R_DELEGATION && - zone->checkns != NULL) { + if (result == DNS_R_DELEGATION && zone->checkns != NULL) + { (void)(zone->checkns)(zone, name, owner, &a, &aaaa); } @@ -3048,16 +2972,15 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, static bool zone_rrset_check_dup(dns_zone_t *zone, dns_name_t *owner, - dns_rdataset_t *rdataset) -{ + dns_rdataset_t *rdataset) { dns_rdataset_t tmprdataset; - isc_result_t result; - bool answer = true; - bool format = true; - int level = ISC_LOG_WARNING; - char ownerbuf[DNS_NAME_FORMATSIZE]; - char typebuf[DNS_RDATATYPE_FORMATSIZE]; - unsigned int count1 = 0; + isc_result_t result; + bool answer = true; + bool format = true; + int level = ISC_LOG_WARNING; + char ownerbuf[DNS_NAME_FORMATSIZE]; + char typebuf[DNS_RDATATYPE_FORMATSIZE]; + unsigned int count1 = 0; if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_CHECKDUPRRFAIL)) { level = ISC_LOG_ERROR; @@ -3065,8 +2988,9 @@ zone_rrset_check_dup(dns_zone_t *zone, dns_name_t *owner, dns_rdataset_init(&tmprdataset); for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { - dns_rdata_t rdata1 = DNS_RDATA_INIT; + result = dns_rdataset_next(rdataset)) + { + dns_rdata_t rdata1 = DNS_RDATA_INIT; unsigned int count2 = 0; count1++; @@ -3074,7 +2998,8 @@ zone_rrset_check_dup(dns_zone_t *zone, dns_name_t *owner, dns_rdataset_clone(rdataset, &tmprdataset); for (result = dns_rdataset_first(&tmprdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&tmprdataset)) { + result = dns_rdataset_next(&tmprdataset)) + { dns_rdata_t rdata2 = DNS_RDATA_INIT; count2++; if (count1 >= count2) { @@ -3109,16 +3034,15 @@ zone_rrset_check_dup(dns_zone_t *zone, dns_name_t *owner, } static bool -zone_check_dup(dns_zone_t *zone, dns_db_t *db) -{ - dns_dbiterator_t * dbiterator = NULL; - dns_dbnode_t * node = NULL; - dns_fixedname_t fixed; - dns_name_t * name; - dns_rdataset_t rdataset; +zone_check_dup(dns_zone_t *zone, dns_db_t *db) { + dns_dbiterator_t *dbiterator = NULL; + dns_dbnode_t *node = NULL; + dns_fixedname_t fixed; + dns_name_t *name; + dns_rdataset_t rdataset; dns_rdatasetiter_t *rdsit = NULL; - bool ok = true; - isc_result_t result; + bool ok = true; + isc_result_t result; name = dns_fixedname_initname(&fixed); dns_rdataset_init(&rdataset); @@ -3129,7 +3053,8 @@ zone_check_dup(dns_zone_t *zone, dns_db_t *db) } for (result = dns_dbiterator_first(dbiterator); result == ISC_R_SUCCESS; - result = dns_dbiterator_next(dbiterator)) { + result = dns_dbiterator_next(dbiterator)) + { result = dns_dbiterator_current(dbiterator, &node, name); if (result != ISC_R_SUCCESS) { continue; @@ -3142,7 +3067,8 @@ zone_check_dup(dns_zone_t *zone, dns_db_t *db) for (result = dns_rdatasetiter_first(rdsit); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(rdsit)) { + result = dns_rdatasetiter_next(rdsit)) + { dns_rdatasetiter_current(rdsit, &rdataset); if (!zone_rrset_check_dup(zone, name, &rdataset)) { ok = false; @@ -3162,11 +3088,10 @@ zone_check_dup(dns_zone_t *zone, dns_db_t *db) } static bool -isspf(const dns_rdata_t *rdata) -{ - char buf[1024]; +isspf(const dns_rdata_t *rdata) { + char buf[1024]; const unsigned char *data = rdata->data; - unsigned int rdl = rdata->length, i = 0, tl, len; + unsigned int rdl = rdata->length, i = 0, tl, len; while (rdl > 0U) { len = tl = *data; @@ -3194,21 +3119,20 @@ isspf(const dns_rdata_t *rdata) } static bool -integrity_checks(dns_zone_t *zone, dns_db_t *db) -{ - dns_dbiterator_t * dbiterator = NULL; - dns_dbnode_t * node = NULL; - dns_rdataset_t rdataset; - dns_fixedname_t fixed; - dns_fixedname_t fixedbottom; - dns_rdata_mx_t mx; - dns_rdata_ns_t ns; +integrity_checks(dns_zone_t *zone, dns_db_t *db) { + dns_dbiterator_t *dbiterator = NULL; + dns_dbnode_t *node = NULL; + dns_rdataset_t rdataset; + dns_fixedname_t fixed; + dns_fixedname_t fixedbottom; + dns_rdata_mx_t mx; + dns_rdata_ns_t ns; dns_rdata_in_srv_t srv; - dns_rdata_t rdata; - dns_name_t * name; - dns_name_t * bottom; - isc_result_t result; - bool ok = true, have_spf, have_txt; + dns_rdata_t rdata; + dns_name_t *name; + dns_name_t *bottom; + isc_result_t result; + bool ok = true, have_spf, have_txt; name = dns_fixedname_initname(&fixed); bottom = dns_fixedname_initname(&fixedbottom); @@ -3232,7 +3156,8 @@ integrity_checks(dns_zone_t *zone, dns_db_t *db) */ if (!dns_name_issubdomain(name, &zone->origin) || (dns_name_countlabels(bottom) > 0 && - dns_name_issubdomain(name, bottom))) { + dns_name_issubdomain(name, bottom))) + { goto next; } @@ -3386,14 +3311,13 @@ cleanup: * if they are in use. */ static void -zone_check_dnskeys(dns_zone_t *zone, dns_db_t *db) -{ - dns_dbnode_t * node = NULL; - dns_dbversion_t * version = NULL; +zone_check_dnskeys(dns_zone_t *zone, dns_db_t *db) { + dns_dbnode_t *node = NULL; + dns_dbversion_t *version = NULL; dns_rdata_dnskey_t dnskey; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdataset_t rdataset; - isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdataset_t rdataset; + isc_result_t result; result = dns_db_findnode(db, &zone->origin, false, &node); if (result != ISC_R_SUCCESS) { @@ -3409,7 +3333,8 @@ zone_check_dnskeys(dns_zone_t *zone, dns_db_t *db) } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdataset_current(&rdataset, &rdata); result = dns_rdata_tostruct(&rdata, &dnskey, NULL); INSIST(result == ISC_R_SUCCESS); @@ -3432,9 +3357,9 @@ zone_check_dnskeys(dns_zone_t *zone, dns_db_t *db) */ if (dnskey.datalen > 1 && dnskey.data[0] == 1 && dnskey.data[1] == 3) { - const char * algorithm = ""; + const char *algorithm = ""; isc_region_t r; - bool logit = true; + bool logit = true; dns_rdata_toregion(&rdata, &r); @@ -3481,14 +3406,13 @@ cleanup: } static void -resume_signingwithkey(dns_zone_t *zone) -{ - dns_dbnode_t * node = NULL; +resume_signingwithkey(dns_zone_t *zone) { + dns_dbnode_t *node = NULL; dns_dbversion_t *version = NULL; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdataset_t rdataset; - isc_result_t result; - dns_db_t * db = NULL; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdataset_t rdataset; + isc_result_t result; + dns_db_t *db = NULL; ZONEDB_LOCK(&zone->dblock, isc_rwlocktype_read); if (zone->db != NULL) { @@ -3514,7 +3438,8 @@ resume_signingwithkey(dns_zone_t *zone) } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdataset_current(&rdataset, &rdata); if (rdata.length != 5 || rdata.data[0] == 0 || rdata.data[4] != 0) { @@ -3553,17 +3478,16 @@ cleanup: * Zone must be locked by caller. */ static isc_result_t -zone_addnsec3chain(dns_zone_t *zone, dns_rdata_nsec3param_t *nsec3param) -{ +zone_addnsec3chain(dns_zone_t *zone, dns_rdata_nsec3param_t *nsec3param) { dns_nsec3chain_t *nsec3chain, *current; - dns_dbversion_t * version = NULL; - bool nseconly = false, nsec3ok = false; - isc_result_t result; - isc_time_t now; - unsigned int options = 0; - char saltbuf[255 * 2 + 1]; - char flags[sizeof("INITIAL|REMOVE|CREATE|NONSEC|OPTOUT")]; - dns_db_t * db = NULL; + dns_dbversion_t *version = NULL; + bool nseconly = false, nsec3ok = false; + isc_result_t result; + isc_time_t now; + unsigned int options = 0; + char saltbuf[255 * 2 + 1]; + char flags[sizeof("INITIAL|REMOVE|CREATE|NONSEC|OPTOUT")]; + dns_db_t *db = NULL; ZONEDB_LOCK(&zone->dblock, isc_rwlocktype_read); if (zone->db != NULL) { @@ -3652,8 +3576,8 @@ zone_addnsec3chain(dns_zone_t *zone, dns_rdata_nsec3param_t *nsec3param) } } } - result = - dns_nsec3param_salttotext(nsec3param, saltbuf, sizeof(saltbuf)); + result = dns_nsec3param_salttotext(nsec3param, saltbuf, + sizeof(saltbuf)); RUNTIME_CHECK(result == ISC_R_SUCCESS); dnssec_log(zone, ISC_LOG_INFO, "zone_addnsec3chain(%u,%s,%u,%s)", nsec3param->hash, flags, nsec3param->iterations, saltbuf); @@ -3664,7 +3588,8 @@ zone_addnsec3chain(dns_zone_t *zone, dns_rdata_nsec3param_t *nsec3param) * simultaneously adding and removing records for the same NSEC3 chain. */ for (current = ISC_LIST_HEAD(zone->nsec3chain); current != NULL; - current = ISC_LIST_NEXT(current, link)) { + current = ISC_LIST_NEXT(current, link)) + { if ((current->db == db) && (current->nsec3param.hash == nsec3param->hash) && (current->nsec3param.iterations == @@ -3672,7 +3597,8 @@ zone_addnsec3chain(dns_zone_t *zone, dns_rdata_nsec3param_t *nsec3param) (current->nsec3param.salt_length == nsec3param->salt_length) && memcmp(current->nsec3param.salt, nsec3param->salt, - nsec3param->salt_length) == 0) { + nsec3param->salt_length) == 0) + { current->done = true; } } @@ -3737,15 +3663,14 @@ cleanup: * Zone must be locked by caller. */ static void -resume_addnsec3chain(dns_zone_t *zone) -{ - dns_dbnode_t * node = NULL; - dns_dbversion_t * version = NULL; - dns_rdataset_t rdataset; - isc_result_t result; +resume_addnsec3chain(dns_zone_t *zone) { + dns_dbnode_t *node = NULL; + dns_dbversion_t *version = NULL; + dns_rdataset_t rdataset; + isc_result_t result; dns_rdata_nsec3param_t nsec3param; - bool nseconly = false, nsec3ok = false; - dns_db_t * db = NULL; + bool nseconly = false, nsec3ok = false; + dns_db_t *db = NULL; INSIST(LOCKED_ZONE(zone)); @@ -3788,9 +3713,10 @@ resume_addnsec3chain(dns_zone_t *zone) } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE]; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_t private = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &private); @@ -3806,8 +3732,8 @@ resume_addnsec3chain(dns_zone_t *zone) result = dns_rdata_tostruct(&rdata, &nsec3param, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); if (((nsec3param.flags & DNS_NSEC3FLAG_REMOVE) != 0) || - ((nsec3param.flags & DNS_NSEC3FLAG_CREATE) != 0 && - nsec3ok)) { + ((nsec3param.flags & DNS_NSEC3FLAG_CREATE) != 0 && nsec3ok)) + { /* * Pass the NSEC3PARAM RDATA contained in this * private-type record to zone_addnsec3chain() so that @@ -3836,14 +3762,13 @@ cleanup: } static void -set_resigntime(dns_zone_t *zone) -{ - dns_rdataset_t rdataset; +set_resigntime(dns_zone_t *zone) { + dns_rdataset_t rdataset; dns_fixedname_t fixed; - unsigned int resign; - isc_result_t result; - uint32_t nanosecs; - dns_db_t * db = NULL; + unsigned int resign; + isc_result_t result; + uint32_t nanosecs; + dns_db_t *db = NULL; /* We only re-sign zones that can be dynamically updated */ if (zone->update_disabled) { @@ -3852,8 +3777,9 @@ set_resigntime(dns_zone_t *zone) if (!inline_secure(zone) && (zone->type != dns_zone_master || - (zone->ssutable == NULL && (zone->update_acl == NULL || - dns_acl_isnone(zone->update_acl))))) { + (zone->ssutable == NULL && + (zone->update_acl == NULL || dns_acl_isnone(zone->update_acl))))) + { return; } @@ -3888,16 +3814,15 @@ cleanup: } static isc_result_t -check_nsec3param(dns_zone_t *zone, dns_db_t *db) -{ - dns_dbnode_t * node = NULL; - dns_rdataset_t rdataset; - dns_dbversion_t * version = NULL; +check_nsec3param(dns_zone_t *zone, dns_db_t *db) { + dns_dbnode_t *node = NULL; + dns_rdataset_t rdataset; + dns_dbversion_t *version = NULL; dns_rdata_nsec3param_t nsec3param; - bool ok = false; - isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; - bool dynamic = (zone->type == dns_zone_master) + bool ok = false; + isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; + bool dynamic = (zone->type == dns_zone_master) ? dns_zone_isdynamic(zone, false) : false; dynamic = dynamic || dns_zone_getkasp(zone); @@ -3934,13 +3859,15 @@ check_nsec3param(dns_zone_t *zone, dns_db_t *db) * For non-dynamic zones we only need to find a supported algorithm. */ for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdataset_current(&rdataset, &rdata); result = dns_rdata_tostruct(&rdata, &nsec3param, NULL); dns_rdata_reset(&rdata); INSIST(result == ISC_R_SUCCESS); if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_NSEC3TESTZONE) && - nsec3param.hash == DNS_NSEC3_UNKNOWNALG && !dynamic) { + nsec3param.hash == DNS_NSEC3_UNKNOWNALG && !dynamic) + { dns_zone_log(zone, ISC_LOG_WARNING, "nsec3 test \"unknown\" hash algorithm " "found: %u", @@ -3992,12 +3919,11 @@ cleanup: */ static void set_refreshkeytimer(dns_zone_t *zone, dns_rdata_keydata_t *key, - isc_stdtime_t now, bool force) -{ - const char me[] = "set_refreshkeytimer"; + isc_stdtime_t now, bool force) { + const char me[] = "set_refreshkeytimer"; isc_stdtime_t then; - isc_time_t timenow, timethen; - char timebuf[80]; + isc_time_t timenow, timethen; + char timebuf[80]; ENTER; then = key->refresh; @@ -4018,7 +3944,8 @@ set_refreshkeytimer(dns_zone_t *zone, dns_rdata_keydata_t *key, timethen = timenow; } if (isc_time_compare(&zone->refreshkeytime, &timenow) < 0 || - isc_time_compare(&timethen, &zone->refreshkeytime) < 0) { + isc_time_compare(&timethen, &zone->refreshkeytime) < 0) + { zone->refreshkeytime = timethen; } @@ -4039,15 +3966,14 @@ set_refreshkeytimer(dns_zone_t *zone, dns_rdata_keydata_t *key, static isc_result_t create_keydata(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, dns_keynode_t *keynode, dns_name_t *keyname, - bool *changed) -{ - const char me[] = "create_keydata"; - isc_result_t result = ISC_R_SUCCESS; - dns_rdata_t rdata = DNS_RDATA_INIT; + bool *changed) { + const char me[] = "create_keydata"; + isc_result_t result = ISC_R_SUCCESS; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_keydata_t kd; - unsigned char rrdata[4096]; - isc_buffer_t rrdatabuf; - isc_stdtime_t now; + unsigned char rrdata[4096]; + isc_buffer_t rrdatabuf; + isc_stdtime_t now; REQUIRE(keynode != NULL); @@ -4087,13 +4013,13 @@ failure: */ static isc_result_t delete_keydata(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, - dns_name_t *name, dns_rdataset_t *rdataset) -{ - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_name_t *name, dns_rdataset_t *rdataset) { + dns_rdata_t rdata = DNS_RDATA_INIT; isc_result_t result, uresult; for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { dns_rdata_reset(&rdata); dns_rdataset_current(rdataset, &rdata); uresult = update_one_rr(db, ver, diff, DNS_DIFFOP_DEL, name, 0, @@ -4113,13 +4039,12 @@ delete_keydata(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, */ static isc_result_t compute_tag(dns_name_t *name, dns_rdata_dnskey_t *dnskey, isc_mem_t *mctx, - dns_keytag_t *tag) -{ - isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_keytag_t *tag) { + isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; unsigned char data[4096]; - isc_buffer_t buffer; - dst_key_t * dstkey = NULL; + isc_buffer_t buffer; + dst_key_t *dstkey = NULL; isc_buffer_init(&buffer, data, sizeof(data)); dns_rdata_fromstruct(&rdata, dnskey->common.rdclass, @@ -4139,14 +4064,13 @@ compute_tag(dns_name_t *name, dns_rdata_dnskey_t *dnskey, isc_mem_t *mctx, */ static void trust_key(dns_zone_t *zone, dns_name_t *keyname, dns_rdata_dnskey_t *dnskey, - bool initial) -{ - isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; - unsigned char data[4096], digest[ISC_MAX_MD_SIZE]; - isc_buffer_t buffer; + bool initial) { + isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; + unsigned char data[4096], digest[ISC_MAX_MD_SIZE]; + isc_buffer_t buffer; dns_keytable_t *sr = NULL; - dns_rdata_ds_t ds; + dns_rdata_ds_t ds; result = dns_view_getsecroots(zone->view, &sr); if (result != ISC_R_SUCCESS) { @@ -4175,9 +4099,8 @@ failure: * to the zone will fail. */ static void -fail_secure(dns_zone_t *zone, dns_name_t *keyname) -{ - isc_result_t result; +fail_secure(dns_zone_t *zone, dns_name_t *keyname) { + isc_result_t result; dns_keytable_t *sr = NULL; result = dns_view_getsecroots(zone->view, &sr); @@ -4192,15 +4115,14 @@ fail_secure(dns_zone_t *zone, dns_name_t *keyname) * valid (i.e., the add holddown timer has expired) become trusted keys. */ static void -load_secroots(dns_zone_t *zone, dns_name_t *name, dns_rdataset_t *rdataset) -{ - isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; +load_secroots(dns_zone_t *zone, dns_name_t *name, dns_rdataset_t *rdataset) { + isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_keydata_t keydata; - dns_rdata_dnskey_t dnskey; - int trusted = 0, revoked = 0, pending = 0; - isc_stdtime_t now; - dns_keytable_t * sr = NULL; + dns_rdata_dnskey_t dnskey; + int trusted = 0, revoked = 0, pending = 0; + isc_stdtime_t now; + dns_keytable_t *sr = NULL; isc_stdtime_get(&now); @@ -4212,7 +4134,8 @@ load_secroots(dns_zone_t *zone, dns_name_t *name, dns_rdataset_t *rdataset) /* Now insert all the accepted trust anchors from this keydata set. */ for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { dns_rdata_reset(&rdata); dns_rdataset_current(rdataset, &rdata); @@ -4265,9 +4188,8 @@ load_secroots(dns_zone_t *zone, dns_name_t *name, dns_rdataset_t *rdataset) static isc_result_t do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver, - dns_diff_t *diff) -{ - dns_diff_t temp_diff; + dns_diff_t *diff) { + dns_diff_t temp_diff; isc_result_t result; /* @@ -4300,10 +4222,9 @@ do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver, 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) -{ + dns_rdata_t *rdata) { dns_difftuple_t *tuple = NULL; - isc_result_t result; + isc_result_t result; result = dns_difftuple_create(diff->mctx, op, name, ttl, rdata, &tuple); if (result != ISC_R_SUCCESS) { return (result); @@ -4313,12 +4234,11 @@ update_one_rr(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, static isc_result_t update_soa_serial(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, - isc_mem_t *mctx, dns_updatemethod_t method) -{ + isc_mem_t *mctx, dns_updatemethod_t method) { dns_difftuple_t *deltuple = NULL; dns_difftuple_t *addtuple = NULL; - uint32_t serial; - isc_result_t result; + uint32_t serial; + isc_result_t result; INSIST(method != dns_updatemethod_none); @@ -4348,13 +4268,12 @@ failure: */ static isc_result_t zone_journal(dns_zone_t *zone, dns_diff_t *diff, uint32_t *sourceserial, - const char *caller) -{ - const char me[] = "zone_journal"; - const char * journalfile; - isc_result_t result = ISC_R_SUCCESS; + const char *caller) { + const char me[] = "zone_journal"; + const char *journalfile; + isc_result_t result = ISC_R_SUCCESS; dns_journal_t *journal = NULL; - unsigned int mode = DNS_JOURNAL_CREATE | DNS_JOURNAL_WRITE; + unsigned int mode = DNS_JOURNAL_CREATE | DNS_JOURNAL_WRITE; ENTER; journalfile = dns_zone_getjournal(zone); @@ -4388,13 +4307,12 @@ zone_journal(dns_zone_t *zone, dns_diff_t *diff, uint32_t *sourceserial, * Create an SOA record for a newly-created zone */ static isc_result_t -add_soa(dns_zone_t *zone, dns_db_t *db) -{ - isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; - unsigned char buf[DNS_SOA_BUFFERSIZE]; +add_soa(dns_zone_t *zone, dns_db_t *db) { + isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; + unsigned char buf[DNS_SOA_BUFFERSIZE]; dns_dbversion_t *ver = NULL; - dns_diff_t diff; + dns_diff_t diff; dns_zone_log(zone, ISC_LOG_DEBUG(1), "creating SOA"); @@ -4432,25 +4350,24 @@ failure: } struct addifmissing_arg { - dns_db_t * db; + dns_db_t *db; dns_dbversion_t *ver; - dns_diff_t * diff; - dns_zone_t * zone; - bool * changed; - isc_result_t result; + dns_diff_t *diff; + dns_zone_t *zone; + bool *changed; + isc_result_t result; }; static void addifmissing(dns_keytable_t *keytable, dns_keynode_t *keynode, - dns_name_t *keyname, void *arg) -{ - dns_db_t * db = ((struct addifmissing_arg *)arg)->db; + dns_name_t *keyname, void *arg) { + dns_db_t *db = ((struct addifmissing_arg *)arg)->db; dns_dbversion_t *ver = ((struct addifmissing_arg *)arg)->ver; - dns_diff_t * diff = ((struct addifmissing_arg *)arg)->diff; - dns_zone_t * zone = ((struct addifmissing_arg *)arg)->zone; - bool * changed = ((struct addifmissing_arg *)arg)->changed; - isc_result_t result; - dns_fixedname_t fname; + dns_diff_t *diff = ((struct addifmissing_arg *)arg)->diff; + dns_zone_t *zone = ((struct addifmissing_arg *)arg)->zone; + bool *changed = ((struct addifmissing_arg *)arg)->changed; + isc_result_t result; + dns_fixedname_t fname; UNUSED(keytable); @@ -4502,17 +4419,16 @@ addifmissing(dns_keytable_t *keytable, dns_keynode_t *keynode, * zone with the matching key, and schedule a key refresh. */ static isc_result_t -sync_keyzone(dns_zone_t *zone, dns_db_t *db) -{ - isc_result_t result = ISC_R_SUCCESS; - bool changed = false; - bool commit = false; - dns_keynode_t * keynode = NULL; - dns_view_t * view = zone->view; - dns_keytable_t * sr = NULL; - dns_dbversion_t * ver = NULL; - dns_diff_t diff; - dns_rriterator_t rrit; +sync_keyzone(dns_zone_t *zone, dns_db_t *db) { + isc_result_t result = ISC_R_SUCCESS; + bool changed = false; + bool commit = false; + dns_keynode_t *keynode = NULL; + dns_view_t *view = zone->view; + dns_keytable_t *sr = NULL; + dns_dbversion_t *ver = NULL; + dns_diff_t diff; + dns_rriterator_t rrit; struct addifmissing_arg arg; dns_zone_log(zone, ISC_LOG_DEBUG(1), "synchronizing trusted keys"); @@ -4538,10 +4454,11 @@ sync_keyzone(dns_zone_t *zone, dns_db_t *db) */ dns_rriterator_init(&rrit, db, ver, 0); for (result = dns_rriterator_first(&rrit); result == ISC_R_SUCCESS; - result = dns_rriterator_nextrrset(&rrit)) { + result = dns_rriterator_nextrrset(&rrit)) + { dns_rdataset_t *rdataset = NULL; - dns_name_t * rrname = NULL; - uint32_t ttl; + dns_name_t *rrname = NULL; + uint32_t ttl; dns_rriterator_current(&rrit, &rrname, &ttl, &rdataset, NULL); if (!dns_rdataset_isassociated(rdataset)) { @@ -4593,8 +4510,8 @@ sync_keyzone(dns_zone_t *zone, dns_db_t *db) } failure: - if (result != ISC_R_SUCCESS && - !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) { + if (result != ISC_R_SUCCESS && !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) + { dnssec_log(zone, ISC_LOG_ERROR, "unable to synchronize managed keys: %s", dns_result_totext(result)); @@ -4617,10 +4534,9 @@ failure: } isc_result_t -dns_zone_synckeyzone(dns_zone_t *zone) -{ +dns_zone_synckeyzone(dns_zone_t *zone) { isc_result_t result; - dns_db_t * db = NULL; + dns_db_t *db = NULL; if (zone->type != dns_zone_key) { return (DNS_R_BADZONE); @@ -4640,8 +4556,7 @@ failure: } static void -maybe_send_secure(dns_zone_t *zone) -{ +maybe_send_secure(dns_zone_t *zone) { isc_result_t result; /* @@ -4655,7 +4570,7 @@ maybe_send_secure(dns_zone_t *zone) */ if (zone->raw->db != NULL) { if (zone->db != NULL) { - uint32_t serial; + uint32_t serial; unsigned int soacount; result = zone_get_from_db(zone->raw, zone->raw->db, @@ -4673,11 +4588,10 @@ maybe_send_secure(dns_zone_t *zone) } static bool -zone_unchanged(dns_db_t *db1, dns_db_t *db2, isc_mem_t *mctx) -{ +zone_unchanged(dns_db_t *db1, dns_db_t *db2, isc_mem_t *mctx) { isc_result_t result; - bool answer = false; - dns_diff_t diff; + bool answer = false; + dns_diff_t diff; dns_diff_init(mctx, &diff); result = dns_db_diffx(&diff, db1, NULL, db2, NULL, NULL); @@ -4694,20 +4608,19 @@ zone_unchanged(dns_db_t *db1, dns_db_t *db2, isc_mem_t *mctx) */ static isc_result_t zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, - isc_result_t result) -{ - unsigned int soacount = 0; - unsigned int nscount = 0; - unsigned int errors = 0; - uint32_t serial, oldserial, refresh, retry, expire, minimum; - isc_time_t now; - bool needdump = false; - bool hasinclude = DNS_ZONE_FLAG(zone, DNS_ZONEFLG_HASINCLUDE); - bool nomaster = false; - bool had_db = false; - unsigned int options; + isc_result_t result) { + unsigned int soacount = 0; + unsigned int nscount = 0; + unsigned int errors = 0; + uint32_t serial, oldserial, refresh, retry, expire, minimum; + isc_time_t now; + bool needdump = false; + bool hasinclude = DNS_ZONE_FLAG(zone, DNS_ZONEFLG_HASINCLUDE); + bool nomaster = false; + bool had_db = false; + unsigned int options; dns_include_t *inc; - bool is_dynamic = false; + bool is_dynamic = false; INSIST(LOCKED_ZONE(zone)); if (inline_raw(zone)) { @@ -4725,8 +4638,8 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, if (zone->type == dns_zone_slave || zone->type == dns_zone_mirror || zone->type == dns_zone_stub || - (zone->type == dns_zone_redirect && - zone->masters == NULL)) { + (zone->type == dns_zone_redirect && zone->masters == NULL)) + { if (result == ISC_R_FILENOTFOUND) { dns_zone_logc(zone, DNS_LOGCATEGORY_ZONELOAD, ISC_LOG_DEBUG(1), @@ -4740,8 +4653,8 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, dns_result_totext(result)); } } else if (zone->type == dns_zone_master && - inline_secure(zone) && - result == ISC_R_FILENOTFOUND) { + inline_secure(zone) && result == ISC_R_FILENOTFOUND) + { dns_zone_logc(zone, DNS_LOGCATEGORY_ZONELOAD, ISC_LOG_DEBUG(1), "no master file, requesting db"); @@ -4791,10 +4704,12 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, */ if (zone->journal != NULL && !DNS_ZONE_OPTION(zone, DNS_ZONEOPT_NOMERGE) && - !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) { + !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) + { if (zone->type == dns_zone_master && (inline_secure(zone) || - (zone->update_acl != NULL || zone->ssutable != NULL))) { + (zone->update_acl != NULL || zone->ssutable != NULL))) + { options = DNS_JOURNALOPT_RESIGN; } else { options = 0; @@ -4803,7 +4718,8 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, zone->journal); if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND && result != DNS_R_UPTODATE && result != DNS_R_NOJOURNAL && - result != ISC_R_RANGE) { + result != ISC_R_RANGE) + { dns_zone_logc(zone, DNS_LOGCATEGORY_ZONELOAD, ISC_LOG_ERROR, "journal rollforward failed: %s", @@ -4845,10 +4761,11 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, is_dynamic = dns_zone_isdynamic(zone, true) || dns_zone_getkasp(zone) != NULL; if (zone->journal != NULL && is_dynamic && - !DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IXFRFROMDIFFS)) { - uint32_t jserial; + !DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IXFRFROMDIFFS)) + { + uint32_t jserial; dns_journal_t *journal = NULL; - bool empty = false; + bool empty = false; result = dns_journal_open(zone->mctx, zone->journal, DNS_JOURNAL_READ, &journal); @@ -4923,13 +4840,15 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, } if (zone->type == dns_zone_master && DNS_ZONE_OPTION(zone, DNS_ZONEOPT_CHECKINTEGRITY) && - !integrity_checks(zone, db)) { + !integrity_checks(zone, db)) + { result = DNS_R_BADZONE; goto cleanup; } if (zone->type == dns_zone_master && DNS_ZONE_OPTION(zone, DNS_ZONEOPT_CHECKDUPRR) && - !zone_check_dup(zone, db)) { + !zone_check_dup(zone, db)) + { result = DNS_R_BADZONE; goto cleanup; } @@ -4962,7 +4881,8 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, RUNTIME_CHECK(result == ISC_R_SUCCESS); RUNTIME_CHECK(soacount > 0U); if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IXFRFROMDIFFS) && - !isc_serial_gt(serial, oldserial)) { + !isc_serial_gt(serial, oldserial)) + { uint32_t serialmin, serialmax; INSIST(zone->type == dns_zone_master); @@ -4996,7 +4916,8 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, "backwards", serial, oldserial); } else if (serial == oldserial && !hasinclude && - strcmp(zone->db_argv[0], "_builtin") != 0) { + strcmp(zone->db_argv[0], "_builtin") != 0) + { dns_zone_logc(zone, DNS_LOGCATEGORY_ZONELOAD, ISC_LOG_ERROR, "zone serial (%u) unchanged. " @@ -5009,15 +4930,16 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, if (zone->type == dns_zone_master && (zone->update_acl != NULL || zone->ssutable != NULL) && dns_zone_getsigresigninginterval(zone) < (3 * refresh) && - dns_db_issecure(db)) { + dns_db_issecure(db)) + { dns_zone_logc(zone, DNS_LOGCATEGORY_ZONELOAD, ISC_LOG_WARNING, "sig-re-signing-interval less than " "3 * refresh."); } - zone->refresh = - RANGE(refresh, zone->minrefresh, zone->maxrefresh); + zone->refresh = RANGE(refresh, zone->minrefresh, + zone->maxrefresh); zone->retry = RANGE(retry, zone->minretry, zone->maxretry); zone->expire = RANGE(expire, zone->refresh + zone->retry, DNS_MAX_EXPIRE); @@ -5027,10 +4949,10 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, if (zone->type == dns_zone_slave || zone->type == dns_zone_mirror || zone->type == dns_zone_stub || - (zone->type == dns_zone_redirect && - zone->masters != NULL)) { + (zone->type == dns_zone_redirect && zone->masters != NULL)) + { isc_time_t t; - uint32_t delay; + uint32_t delay; result = isc_file_getmodtime(zone->journal, &t); if (result != ISC_R_SUCCESS) { @@ -5081,7 +5003,8 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, * Schedule DNSSEC key refresh. */ if (zone->type == dns_zone_master && - DNS_ZONEKEY_OPTION(zone, DNS_ZONEKEY_MAINTAIN)) { + DNS_ZONEKEY_OPTION(zone, DNS_ZONEKEY_MAINTAIN)) + { zone->refreshkeytime = now; } @@ -5137,10 +5060,11 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, dns_zone_getkasp(zone) != NULL; if (zone->type == dns_zone_master && !DNS_ZONEKEY_OPTION(zone, DNS_ZONEKEY_NORESIGN) && - is_dynamic && dns_db_issecure(db)) { - dns_name_t * name; + is_dynamic && dns_db_issecure(db)) + { + dns_name_t *name; dns_fixedname_t fixed; - dns_rdataset_t next; + dns_rdataset_t next; dns_rdataset_init(&next); name = dns_fixedname_initname(&fixed); @@ -5148,8 +5072,8 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, result = dns_db_getsigningtime(db, &next, name); if (result == ISC_R_SUCCESS) { isc_stdtime_t timenow; - char namebuf[DNS_NAME_FORMATSIZE]; - char typebuf[DNS_RDATATYPE_FORMATSIZE]; + char namebuf[DNS_NAME_FORMATSIZE]; + char typebuf[DNS_RDATATYPE_FORMATSIZE]; isc_stdtime_get(&timenow); dns_name_format(name, namebuf, sizeof(namebuf)); @@ -5178,7 +5102,8 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, * Clear old include list. */ for (inc = ISC_LIST_HEAD(zone->includes); inc != NULL; - inc = ISC_LIST_HEAD(zone->includes)) { + inc = ISC_LIST_HEAD(zone->includes)) + { ISC_LIST_UNLINK(zone->includes, inc, link); isc_mem_free(zone->mctx, inc->name); isc_mem_put(zone->mctx, inc, sizeof(*inc)); @@ -5189,7 +5114,8 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, * Transfer new include list. */ for (inc = ISC_LIST_HEAD(zone->newincludes); inc != NULL; - inc = ISC_LIST_HEAD(zone->newincludes)) { + inc = ISC_LIST_HEAD(zone->newincludes)) + { ISC_LIST_UNLINK(zone->newincludes, inc, link); ISC_LIST_APPEND(zone->includes, inc, link); zone->nincludes++; @@ -5218,14 +5144,16 @@ cleanup: } for (inc = ISC_LIST_HEAD(zone->newincludes); inc != NULL; - inc = ISC_LIST_HEAD(zone->newincludes)) { + inc = ISC_LIST_HEAD(zone->newincludes)) + { ISC_LIST_UNLINK(zone->newincludes, inc, link); isc_mem_free(zone->mctx, inc->name); isc_mem_put(zone->mctx, inc, sizeof(*inc)); } if (zone->type == dns_zone_slave || zone->type == dns_zone_mirror || zone->type == dns_zone_stub || zone->type == dns_zone_key || - (zone->type == dns_zone_redirect && zone->masters != NULL)) { + (zone->type == dns_zone_redirect && zone->masters != NULL)) + { if (result != ISC_R_NOMEMORY) { if (zone->journal != NULL) { zone_saveunique(zone, zone->journal, @@ -5265,8 +5193,8 @@ done: * dealing with by consulting the DNS_ZONEFLG_LOADED flag for the * secure zone: if it is set, this must be a reload. */ - if (inline_raw(zone) && - DNS_ZONE_FLAG(zone->secure, DNS_ZONEFLG_LOADED)) { + if (inline_raw(zone) && DNS_ZONE_FLAG(zone->secure, DNS_ZONEFLG_LOADED)) + { DNS_ZONE_CLRFLAG(zone->secure, DNS_ZONEFLG_LOADPENDING); } @@ -5276,12 +5204,12 @@ done: } static bool -exit_check(dns_zone_t *zone) -{ +exit_check(dns_zone_t *zone) { REQUIRE(LOCKED_ZONE(zone)); if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_SHUTDOWN) && - isc_refcount_current(&zone->irefs) == 0) { + isc_refcount_current(&zone->irefs) == 0) + { /* * DNS_ZONEFLG_SHUTDOWN can only be set if erefs == 0. */ @@ -5293,14 +5221,13 @@ exit_check(dns_zone_t *zone) static bool zone_check_ns(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version, - dns_name_t *name, bool logit) -{ - isc_result_t result; - char namebuf[DNS_NAME_FORMATSIZE]; - char altbuf[DNS_NAME_FORMATSIZE]; + dns_name_t *name, bool logit) { + isc_result_t result; + char namebuf[DNS_NAME_FORMATSIZE]; + char altbuf[DNS_NAME_FORMATSIZE]; dns_fixedname_t fixed; - dns_name_t * foundname; - int level; + dns_name_t *foundname; + int level; if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_NOCHECKNS)) { return (true); @@ -5329,7 +5256,8 @@ zone_check_ns(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version, } if (result == DNS_R_NXRRSET || result == DNS_R_NXDOMAIN || - result == DNS_R_EMPTYNAME) { + result == DNS_R_EMPTYNAME) + { if (logit) { dns_name_format(name, namebuf, sizeof namebuf); dns_zone_log(zone, level, @@ -5369,13 +5297,12 @@ zone_check_ns(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version, static isc_result_t zone_count_ns_rr(dns_zone_t *zone, dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, unsigned int *nscount, - unsigned int *errors, bool logit) -{ - isc_result_t result; - unsigned int count = 0; - unsigned int ecount = 0; + unsigned int *errors, bool logit) { + isc_result_t result; + unsigned int count = 0; + unsigned int ecount = 0; dns_rdataset_t rdataset; - dns_rdata_t rdata; + dns_rdata_t rdata; dns_rdata_ns_t ns; dns_rdataset_init(&rdataset); @@ -5395,14 +5322,15 @@ zone_count_ns_rr(dns_zone_t *zone, dns_db_t *db, dns_dbnode_t *node, if (errors != NULL && zone->rdclass == dns_rdataclass_in && (zone->type == dns_zone_master || zone->type == dns_zone_slave || - zone->type == dns_zone_mirror)) { + zone->type == dns_zone_mirror)) + { dns_rdata_init(&rdata); dns_rdataset_current(&rdataset, &rdata); result = dns_rdata_tostruct(&rdata, &ns, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); if (dns_name_issubdomain(&ns.name, &zone->origin) && - !zone_check_ns(zone, db, version, &ns.name, - logit)) { + !zone_check_ns(zone, db, version, &ns.name, logit)) + { ecount++; } } @@ -5430,12 +5358,11 @@ invalidate_rdataset: static isc_result_t zone_load_soa_rr(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, unsigned int *soacount, uint32_t *serial, uint32_t *refresh, - uint32_t *retry, uint32_t *expire, uint32_t *minimum) -{ - isc_result_t result; - unsigned int count; - dns_rdataset_t rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; + uint32_t *retry, uint32_t *expire, uint32_t *minimum) { + isc_result_t result; + unsigned int count; + dns_rdataset_t rdataset; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_soa_t soa; dns_rdataset_init(&rdataset); @@ -5541,12 +5468,11 @@ 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) -{ - isc_result_t result; - isc_result_t answer = ISC_R_SUCCESS; + unsigned int *errors) { + isc_result_t result; + isc_result_t answer = ISC_R_SUCCESS; dns_dbversion_t *version = NULL; - dns_dbnode_t * node; + dns_dbnode_t *node; REQUIRE(db != NULL); REQUIRE(zone != NULL); @@ -5591,7 +5517,8 @@ zone_get_from_db(dns_zone_t *zone, dns_db_t *db, unsigned int *nscount, } if (soacount != NULL || serial != NULL || refresh != NULL || - retry != NULL || expire != NULL || minimum != NULL) { + retry != NULL || expire != NULL || minimum != NULL) + { result = zone_load_soa_rr(db, node, version, soacount, serial, refresh, retry, expire, minimum); if (result != ISC_R_SUCCESS) { @@ -5607,8 +5534,7 @@ closeversion: } void -dns_zone_attach(dns_zone_t *source, dns_zone_t **target) -{ +dns_zone_attach(dns_zone_t *source, dns_zone_t **target) { REQUIRE(DNS_ZONE_VALID(source)); REQUIRE(target != NULL && *target == NULL); isc_refcount_increment(&source->erefs); @@ -5616,13 +5542,12 @@ dns_zone_attach(dns_zone_t *source, dns_zone_t **target) } void -dns_zone_detach(dns_zone_t **zonep) -{ +dns_zone_detach(dns_zone_t **zonep) { REQUIRE(zonep != NULL && DNS_ZONE_VALID(*zonep)); dns_zone_t *zone = *zonep; *zonep = NULL; - bool free_now = false; + bool free_now = false; dns_zone_t *raw = NULL; dns_zone_t *secure = NULL; if (isc_refcount_decrement(&zone->erefs) == 1) { @@ -5675,8 +5600,7 @@ dns_zone_detach(dns_zone_t **zonep) } void -dns_zone_iattach(dns_zone_t *source, dns_zone_t **target) -{ +dns_zone_iattach(dns_zone_t *source, dns_zone_t **target) { REQUIRE(DNS_ZONE_VALID(source)); LOCK_ZONE(source); @@ -5685,8 +5609,7 @@ dns_zone_iattach(dns_zone_t *source, dns_zone_t **target) } static void -zone_iattach(dns_zone_t *source, dns_zone_t **target) -{ +zone_iattach(dns_zone_t *source, dns_zone_t **target) { REQUIRE(DNS_ZONE_VALID(source)); REQUIRE(LOCKED_ZONE(source)); REQUIRE(target != NULL && *target == NULL); @@ -5697,8 +5620,7 @@ zone_iattach(dns_zone_t *source, dns_zone_t **target) } static void -zone_idetach(dns_zone_t **zonep) -{ +zone_idetach(dns_zone_t **zonep) { dns_zone_t *zone; /* @@ -5716,10 +5638,9 @@ zone_idetach(dns_zone_t **zonep) } void -dns_zone_idetach(dns_zone_t **zonep) -{ +dns_zone_idetach(dns_zone_t **zonep) { dns_zone_t *zone; - bool free_needed; + bool free_needed; REQUIRE(zonep != NULL && DNS_ZONE_VALID(*zonep)); @@ -5737,24 +5658,21 @@ dns_zone_idetach(dns_zone_t **zonep) } isc_mem_t * -dns_zone_getmctx(dns_zone_t *zone) -{ +dns_zone_getmctx(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->mctx); } dns_zonemgr_t * -dns_zone_getmgr(dns_zone_t *zone) -{ +dns_zone_getmgr(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->zmgr); } void -dns_zone_setflag(dns_zone_t *zone, unsigned int flags, bool value) -{ +dns_zone_setflag(dns_zone_t *zone, unsigned int flags, bool value) { REQUIRE(DNS_ZONE_VALID(zone)); if (value) { @@ -5765,8 +5683,7 @@ dns_zone_setflag(dns_zone_t *zone, unsigned int flags, bool value) } void -dns_zone_setkasp(dns_zone_t *zone, dns_kasp_t *kasp) -{ +dns_zone_setkasp(dns_zone_t *zone, dns_kasp_t *kasp) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -5780,16 +5697,14 @@ dns_zone_setkasp(dns_zone_t *zone, dns_kasp_t *kasp) } dns_kasp_t * -dns_zone_getkasp(dns_zone_t *zone) -{ +dns_zone_getkasp(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->kasp); } void -dns_zone_setoption(dns_zone_t *zone, dns_zoneopt_t option, bool value) -{ +dns_zone_setoption(dns_zone_t *zone, dns_zoneopt_t option, bool value) { REQUIRE(DNS_ZONE_VALID(zone)); if (value) { @@ -5800,16 +5715,14 @@ dns_zone_setoption(dns_zone_t *zone, dns_zoneopt_t option, bool value) } dns_zoneopt_t -dns_zone_getoptions(dns_zone_t *zone) -{ +dns_zone_getoptions(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (atomic_load_relaxed(&zone->options)); } void -dns_zone_setkeyopt(dns_zone_t *zone, unsigned int keyopt, bool value) -{ +dns_zone_setkeyopt(dns_zone_t *zone, unsigned int keyopt, bool value) { REQUIRE(DNS_ZONE_VALID(zone)); if (value) { @@ -5820,16 +5733,14 @@ dns_zone_setkeyopt(dns_zone_t *zone, unsigned int keyopt, bool value) } unsigned int -dns_zone_getkeyopts(dns_zone_t *zone) -{ +dns_zone_getkeyopts(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (atomic_load_relaxed(&zone->keyopts)); } isc_result_t -dns_zone_setxfrsource4(dns_zone_t *zone, const isc_sockaddr_t *xfrsource) -{ +dns_zone_setxfrsource4(dns_zone_t *zone, const isc_sockaddr_t *xfrsource) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -5840,15 +5751,13 @@ dns_zone_setxfrsource4(dns_zone_t *zone, const isc_sockaddr_t *xfrsource) } isc_sockaddr_t * -dns_zone_getxfrsource4(dns_zone_t *zone) -{ +dns_zone_getxfrsource4(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (&zone->xfrsource4); } isc_result_t -dns_zone_setxfrsource4dscp(dns_zone_t *zone, isc_dscp_t dscp) -{ +dns_zone_setxfrsource4dscp(dns_zone_t *zone, isc_dscp_t dscp) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -5859,15 +5768,13 @@ dns_zone_setxfrsource4dscp(dns_zone_t *zone, isc_dscp_t dscp) } isc_dscp_t -dns_zone_getxfrsource4dscp(dns_zone_t *zone) -{ +dns_zone_getxfrsource4dscp(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->xfrsource4dscp); } isc_result_t -dns_zone_setxfrsource6(dns_zone_t *zone, const isc_sockaddr_t *xfrsource) -{ +dns_zone_setxfrsource6(dns_zone_t *zone, const isc_sockaddr_t *xfrsource) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -5878,22 +5785,19 @@ dns_zone_setxfrsource6(dns_zone_t *zone, const isc_sockaddr_t *xfrsource) } isc_sockaddr_t * -dns_zone_getxfrsource6(dns_zone_t *zone) -{ +dns_zone_getxfrsource6(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (&zone->xfrsource6); } isc_dscp_t -dns_zone_getxfrsource6dscp(dns_zone_t *zone) -{ +dns_zone_getxfrsource6dscp(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->xfrsource6dscp); } isc_result_t -dns_zone_setxfrsource6dscp(dns_zone_t *zone, isc_dscp_t dscp) -{ +dns_zone_setxfrsource6dscp(dns_zone_t *zone, isc_dscp_t dscp) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -5904,8 +5808,8 @@ dns_zone_setxfrsource6dscp(dns_zone_t *zone, isc_dscp_t dscp) } isc_result_t -dns_zone_setaltxfrsource4(dns_zone_t *zone, const isc_sockaddr_t *altxfrsource) -{ +dns_zone_setaltxfrsource4(dns_zone_t *zone, + const isc_sockaddr_t *altxfrsource) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -5916,15 +5820,13 @@ dns_zone_setaltxfrsource4(dns_zone_t *zone, const isc_sockaddr_t *altxfrsource) } isc_sockaddr_t * -dns_zone_getaltxfrsource4(dns_zone_t *zone) -{ +dns_zone_getaltxfrsource4(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (&zone->altxfrsource4); } isc_result_t -dns_zone_setaltxfrsource4dscp(dns_zone_t *zone, isc_dscp_t dscp) -{ +dns_zone_setaltxfrsource4dscp(dns_zone_t *zone, isc_dscp_t dscp) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -5935,15 +5837,14 @@ dns_zone_setaltxfrsource4dscp(dns_zone_t *zone, isc_dscp_t dscp) } isc_dscp_t -dns_zone_getaltxfrsource4dscp(dns_zone_t *zone) -{ +dns_zone_getaltxfrsource4dscp(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->altxfrsource4dscp); } isc_result_t -dns_zone_setaltxfrsource6(dns_zone_t *zone, const isc_sockaddr_t *altxfrsource) -{ +dns_zone_setaltxfrsource6(dns_zone_t *zone, + const isc_sockaddr_t *altxfrsource) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -5954,15 +5855,13 @@ dns_zone_setaltxfrsource6(dns_zone_t *zone, const isc_sockaddr_t *altxfrsource) } isc_sockaddr_t * -dns_zone_getaltxfrsource6(dns_zone_t *zone) -{ +dns_zone_getaltxfrsource6(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (&zone->altxfrsource6); } isc_result_t -dns_zone_setaltxfrsource6dscp(dns_zone_t *zone, isc_dscp_t dscp) -{ +dns_zone_setaltxfrsource6dscp(dns_zone_t *zone, isc_dscp_t dscp) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -5973,15 +5872,13 @@ dns_zone_setaltxfrsource6dscp(dns_zone_t *zone, isc_dscp_t dscp) } isc_dscp_t -dns_zone_getaltxfrsource6dscp(dns_zone_t *zone) -{ +dns_zone_getaltxfrsource6dscp(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->altxfrsource6dscp); } isc_result_t -dns_zone_setnotifysrc4(dns_zone_t *zone, const isc_sockaddr_t *notifysrc) -{ +dns_zone_setnotifysrc4(dns_zone_t *zone, const isc_sockaddr_t *notifysrc) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -5992,15 +5889,13 @@ dns_zone_setnotifysrc4(dns_zone_t *zone, const isc_sockaddr_t *notifysrc) } isc_sockaddr_t * -dns_zone_getnotifysrc4(dns_zone_t *zone) -{ +dns_zone_getnotifysrc4(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (&zone->notifysrc4); } isc_result_t -dns_zone_setnotifysrc4dscp(dns_zone_t *zone, isc_dscp_t dscp) -{ +dns_zone_setnotifysrc4dscp(dns_zone_t *zone, isc_dscp_t dscp) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -6011,15 +5906,13 @@ dns_zone_setnotifysrc4dscp(dns_zone_t *zone, isc_dscp_t dscp) } isc_dscp_t -dns_zone_getnotifysrc4dscp(dns_zone_t *zone) -{ +dns_zone_getnotifysrc4dscp(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->notifysrc4dscp); } isc_result_t -dns_zone_setnotifysrc6(dns_zone_t *zone, const isc_sockaddr_t *notifysrc) -{ +dns_zone_setnotifysrc6(dns_zone_t *zone, const isc_sockaddr_t *notifysrc) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -6030,16 +5923,14 @@ dns_zone_setnotifysrc6(dns_zone_t *zone, const isc_sockaddr_t *notifysrc) } isc_sockaddr_t * -dns_zone_getnotifysrc6(dns_zone_t *zone) -{ +dns_zone_getnotifysrc6(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (&zone->notifysrc6); } static bool same_addrs(isc_sockaddr_t const *oldlist, isc_sockaddr_t const *newlist, - uint32_t count) -{ + uint32_t count) { unsigned int i; for (i = 0; i < count; i++) { @@ -6052,8 +5943,7 @@ same_addrs(isc_sockaddr_t const *oldlist, isc_sockaddr_t const *newlist, static bool same_keynames(dns_name_t *const *oldlist, dns_name_t *const *newlist, - uint32_t count) -{ + uint32_t count) { unsigned int i; if (oldlist == NULL && newlist == NULL) { @@ -6068,7 +5958,8 @@ same_keynames(dns_name_t *const *oldlist, dns_name_t *const *newlist, continue; } if (oldlist[i] == NULL || newlist[i] == NULL || - !dns_name_equal(oldlist[i], newlist[i])) { + !dns_name_equal(oldlist[i], newlist[i])) + { return (false); } } @@ -6078,12 +5969,11 @@ same_keynames(dns_name_t *const *oldlist, dns_name_t *const *newlist, static void clear_addresskeylist(isc_sockaddr_t **addrsp, isc_dscp_t **dscpsp, dns_name_t ***keynamesp, unsigned int *countp, - isc_mem_t *mctx) -{ - unsigned int count; + isc_mem_t *mctx) { + unsigned int count; isc_sockaddr_t *addrs; - isc_dscp_t * dscps; - dns_name_t ** keynames; + isc_dscp_t *dscps; + dns_name_t **keynames; REQUIRE(countp != NULL && addrsp != NULL && dscpsp != NULL && keynamesp != NULL); @@ -6123,12 +6013,11 @@ static isc_result_t set_addrkeylist(unsigned int count, const isc_sockaddr_t *addrs, isc_sockaddr_t **newaddrsp, const isc_dscp_t *dscp, isc_dscp_t **newdscpp, dns_name_t **names, - dns_name_t ***newnamesp, isc_mem_t *mctx) -{ + dns_name_t ***newnamesp, isc_mem_t *mctx) { isc_sockaddr_t *newaddrs = NULL; - isc_dscp_t * newdscp = NULL; - dns_name_t ** newnames = NULL; - unsigned int i; + isc_dscp_t *newdscp = NULL; + dns_name_t **newnames = NULL; + unsigned int i; REQUIRE(newaddrsp != NULL && *newaddrsp == NULL); REQUIRE(newdscpp != NULL && *newdscpp == NULL); @@ -6151,8 +6040,8 @@ set_addrkeylist(unsigned int count, const isc_sockaddr_t *addrs, } for (i = 0; i < count; i++) { if (names[i] != NULL) { - newnames[i] = - isc_mem_get(mctx, sizeof(dns_name_t)); + newnames[i] = isc_mem_get(mctx, + sizeof(dns_name_t)); dns_name_init(newnames[i], NULL); dns_name_dup(names[i], mctx, newnames[i]); } @@ -6168,8 +6057,7 @@ set_addrkeylist(unsigned int count, const isc_sockaddr_t *addrs, } isc_result_t -dns_zone_setnotifysrc6dscp(dns_zone_t *zone, isc_dscp_t dscp) -{ +dns_zone_setnotifysrc6dscp(dns_zone_t *zone, isc_dscp_t dscp) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -6180,24 +6068,21 @@ dns_zone_setnotifysrc6dscp(dns_zone_t *zone, isc_dscp_t dscp) } isc_dscp_t -dns_zone_getnotifysrc6dscp(dns_zone_t *zone) -{ +dns_zone_getnotifysrc6dscp(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->notifysrc6dscp); } isc_result_t dns_zone_setalsonotify(dns_zone_t *zone, const isc_sockaddr_t *notify, - uint32_t count) -{ + uint32_t count) { return (dns_zone_setalsonotifydscpkeys(zone, notify, NULL, NULL, count)); } isc_result_t dns_zone_setalsonotifywithkeys(dns_zone_t *zone, const isc_sockaddr_t *notify, - dns_name_t **keynames, uint32_t count) -{ + dns_name_t **keynames, uint32_t count) { return (dns_zone_setalsonotifydscpkeys(zone, notify, NULL, keynames, count)); } @@ -6205,12 +6090,11 @@ dns_zone_setalsonotifywithkeys(dns_zone_t *zone, const isc_sockaddr_t *notify, isc_result_t dns_zone_setalsonotifydscpkeys(dns_zone_t *zone, const isc_sockaddr_t *notify, const isc_dscp_t *dscps, dns_name_t **keynames, - uint32_t count) -{ - isc_result_t result; + uint32_t count) { + isc_result_t result; isc_sockaddr_t *newaddrs = NULL; - isc_dscp_t * newdscps = NULL; - dns_name_t ** newnames = NULL; + isc_dscp_t *newdscps = NULL; + dns_name_t **newnames = NULL; REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(count == 0 || notify != NULL); @@ -6222,7 +6106,8 @@ dns_zone_setalsonotifydscpkeys(dns_zone_t *zone, const isc_sockaddr_t *notify, if (count == zone->notifycnt && same_addrs(zone->notify, notify, count) && - same_keynames(zone->notifykeynames, keynames, count)) { + same_keynames(zone->notifykeynames, keynames, count)) + { goto unlock; } @@ -6257,8 +6142,7 @@ unlock: isc_result_t dns_zone_setmasters(dns_zone_t *zone, const isc_sockaddr_t *masters, - uint32_t count) -{ + uint32_t count) { isc_result_t result; result = dns_zone_setmasterswithkeys(zone, masters, NULL, count); @@ -6267,14 +6151,13 @@ dns_zone_setmasters(dns_zone_t *zone, const isc_sockaddr_t *masters, isc_result_t dns_zone_setmasterswithkeys(dns_zone_t *zone, const isc_sockaddr_t *masters, - dns_name_t **keynames, uint32_t count) -{ - isc_result_t result = ISC_R_SUCCESS; + dns_name_t **keynames, uint32_t count) { + isc_result_t result = ISC_R_SUCCESS; isc_sockaddr_t *newaddrs = NULL; - isc_dscp_t * newdscps = NULL; - dns_name_t ** newnames = NULL; - bool * newok; - unsigned int i; + isc_dscp_t *newdscps = NULL; + dns_name_t **newnames = NULL; + bool *newok; + unsigned int i; REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(count == 0 || masters != NULL); @@ -6291,7 +6174,8 @@ dns_zone_setmasterswithkeys(dns_zone_t *zone, const isc_sockaddr_t *masters, */ if (count != zone->masterscnt || !same_addrs(zone->masters, masters, count) || - !same_keynames(zone->masterkeynames, keynames, count)) { + !same_keynames(zone->masterkeynames, keynames, count)) + { if (zone->request != NULL) { dns_request_cancel(zone->request); } @@ -6355,8 +6239,7 @@ unlock: } isc_result_t -dns_zone_getdb(dns_zone_t *zone, dns_db_t **dpb) -{ +dns_zone_getdb(dns_zone_t *zone, dns_db_t **dpb) { isc_result_t result = ISC_R_SUCCESS; REQUIRE(DNS_ZONE_VALID(zone)); @@ -6373,8 +6256,7 @@ dns_zone_getdb(dns_zone_t *zone, dns_db_t **dpb) } void -dns_zone_setdb(dns_zone_t *zone, dns_db_t *db) -{ +dns_zone_setdb(dns_zone_t *zone, dns_db_t *db) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(zone->type == dns_zone_staticstub); @@ -6388,8 +6270,7 @@ dns_zone_setdb(dns_zone_t *zone, dns_db_t *db) * Co-ordinates the starting of routine jobs. */ void -dns_zone_maintenance(dns_zone_t *zone) -{ +dns_zone_maintenance(dns_zone_t *zone) { const char me[] = "dns_zone_maintenance"; isc_time_t now; @@ -6403,8 +6284,7 @@ dns_zone_maintenance(dns_zone_t *zone) } static inline bool -was_dumping(dns_zone_t *zone) -{ +was_dumping(dns_zone_t *zone) { REQUIRE(LOCKED_ZONE(zone)); if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING)) { @@ -6426,11 +6306,10 @@ was_dumping(dns_zone_t *zone) isc_result_t dns__zone_findkeys(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, isc_stdtime_t now, isc_mem_t *mctx, unsigned int maxkeys, - dst_key_t **keys, unsigned int *nkeys) -{ - isc_result_t result; + dst_key_t **keys, unsigned int *nkeys) { + isc_result_t result; dns_dbnode_t *node = NULL; - const char * directory = dns_zone_getkeydirectory(zone); + const char *directory = dns_zone_getkeydirectory(zone); CHECK(dns_db_findnode(db, dns_db_origin(db), false, &node)); memset(keys, 0, sizeof(*keys) * maxkeys); @@ -6449,8 +6328,7 @@ failure: static isc_result_t offline(dns_db_t *db, dns_dbversion_t *ver, dns__zonediff_t *zonediff, - dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata) -{ + dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata) { isc_result_t result; if ((rdata->flags & DNS_RDATA_OFFLINE) != 0) { @@ -6469,10 +6347,10 @@ offline(dns_db_t *db, dns_dbversion_t *ver, dns__zonediff_t *zonediff, } static void -set_key_expiry_warning(dns_zone_t *zone, isc_stdtime_t when, isc_stdtime_t now) -{ +set_key_expiry_warning(dns_zone_t *zone, isc_stdtime_t when, + isc_stdtime_t now) { unsigned int delta; - char timebuf[80]; + char timebuf[80]; zone->key_expiry = when; if (when <= now) { @@ -6505,12 +6383,11 @@ set_key_expiry_warning(dns_zone_t *zone, isc_stdtime_t when, isc_stdtime_t now) */ static bool delsig_ok(dns_rdata_rrsig_t *rrsig_ptr, dst_key_t **keys, unsigned int nkeys, - bool *warn) -{ + bool *warn) { unsigned int i = 0; isc_result_t ret; - bool have_ksk = false, have_zsk = false; - bool have_pksk = false, have_pzsk = false; + bool have_ksk = false, have_zsk = false; + bool have_pksk = false, have_pzsk = false; for (i = 0; i < nkeys; i++) { bool ksk, zsk; @@ -6564,7 +6441,8 @@ delsig_ok(dns_rdata_rrsig_t *rrsig_ptr, dst_key_t **keys, unsigned int nkeys, */ for (i = 0; i < nkeys; i++) { if ((rrsig_ptr->algorithm == dst_key_alg(keys[i])) && - (rrsig_ptr->keyid == dst_key_id(keys[i]))) { + (rrsig_ptr->keyid == dst_key_id(keys[i]))) + { return (false); } } @@ -6582,15 +6460,14 @@ delsig_ok(dns_rdata_rrsig_t *rrsig_ptr, dst_key_t **keys, unsigned int nkeys, static isc_result_t del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_rdatatype_t type, dns__zonediff_t *zonediff, dst_key_t **keys, - unsigned int nkeys, isc_stdtime_t now, bool incremental) -{ - isc_result_t result; - dns_dbnode_t * node = NULL; - dns_rdataset_t rdataset; - unsigned int i; + unsigned int nkeys, isc_stdtime_t now, bool incremental) { + isc_result_t result; + dns_dbnode_t *node = NULL; + dns_rdataset_t rdataset; + unsigned int i; dns_rdata_rrsig_t rrsig; - bool found; - int64_t timewarn = 0, timemaybe = 0; + bool found; + int64_t timewarn = 0, timemaybe = 0; dns_rdataset_init(&rdataset); @@ -6619,7 +6496,8 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &rdata); @@ -6627,7 +6505,8 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, RUNTIME_CHECK(result == ISC_R_SUCCESS); if (type != dns_rdatatype_dnskey && type != dns_rdatatype_cds && - type != dns_rdatatype_cdnskey) { + type != dns_rdatatype_cdnskey) + { bool warn = false, deleted = false; if (delsig_ok(&rrsig, keys, nkeys, &warn)) { result = update_one_rr(db, ver, zonediff->diff, @@ -6677,8 +6556,8 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, "retaining signatures.", origin, algbuf, rrsig.keyid); - zone->log_key_expired_timer = - now + 3600; + zone->log_key_expired_timer = now + + 3600; } } continue; @@ -6690,7 +6569,8 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, found = false; for (i = 0; i < nkeys; i++) { if (rrsig.algorithm == dst_key_alg(keys[i]) && - rrsig.keyid == dst_key_id(keys[i])) { + rrsig.keyid == dst_key_id(keys[i])) + { found = true; /* * Mark offline DNSKEY. @@ -6771,18 +6651,17 @@ static isc_result_t add_sigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_zone_t *zone, dns_rdatatype_t type, dns_diff_t *diff, dst_key_t **keys, unsigned int nkeys, isc_mem_t *mctx, isc_stdtime_t inception, - isc_stdtime_t expire, bool check_ksk, bool keyset_kskonly) -{ - isc_result_t result; - dns_dbnode_t * node = NULL; - dns_kasp_t * kasp = dns_zone_getkasp(zone); - dns_stats_t * dnssecsignstats; - dns_stats_t * dnssecrefreshstats; + isc_stdtime_t expire, bool check_ksk, bool keyset_kskonly) { + isc_result_t result; + dns_dbnode_t *node = NULL; + dns_kasp_t *kasp = dns_zone_getkasp(zone); + dns_stats_t *dnssecsignstats; + dns_stats_t *dnssecrefreshstats; dns_rdataset_t rdataset; - dns_rdata_t sig_rdata = DNS_RDATA_INIT; - unsigned char data[1024]; /* XXX */ - isc_buffer_t buffer; - unsigned int i, j; + dns_rdata_t sig_rdata = DNS_RDATA_INIT; + unsigned char data[1024]; /* XXX */ + isc_buffer_t buffer; + unsigned int i, j; if (kasp != NULL) { check_ksk = false; @@ -6870,10 +6749,10 @@ add_sigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_zone_t *zone, * A dnssec-policy is found. Check what RRsets this * key should sign. */ - isc_result_t kresult; + isc_result_t kresult; isc_stdtime_t when; - bool ksk = false; - bool zsk = false; + bool ksk = false; + bool zsk = false; kresult = dst_key_getbool(keys[i], DST_BOOL_KSK, &ksk); if (kresult != ISC_R_SUCCESS) { @@ -6890,7 +6769,8 @@ add_sigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_zone_t *zone, if (type == dns_rdatatype_dnskey || type == dns_rdatatype_cdnskey || - type == dns_rdatatype_cds) { + type == dns_rdatatype_cds) + { /* * DNSKEY RRset is signed with KSK. * CDS and CDNSKEY RRsets too (RFC 7344, 4.1). @@ -6924,7 +6804,8 @@ add_sigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_zone_t *zone, */ if (type == dns_rdatatype_dnskey || type == dns_rdatatype_cdnskey || - type == dns_rdatatype_cds) { + type == dns_rdatatype_cds) + { if (!KSK(keys[i]) && keyset_kskonly) { continue; } @@ -6973,25 +6854,24 @@ failure: } static void -zone_resigninc(dns_zone_t *zone) -{ - const char * me = "zone_resigninc"; - dns_db_t * db = NULL; +zone_resigninc(dns_zone_t *zone) { + const char *me = "zone_resigninc"; + dns_db_t *db = NULL; dns_dbversion_t *version = NULL; - dns_diff_t _sig_diff; - dns__zonediff_t zonediff; - dns_fixedname_t fixed; - dns_name_t * name; - dns_rdataset_t rdataset; - dns_rdatatype_t covers; - dst_key_t * zone_keys[DNS_MAXZONEKEYS]; - bool check_ksk, keyset_kskonly = false; - isc_result_t result; - isc_stdtime_t now, inception, soaexpire, expire, fullexpire, stop; - uint32_t sigvalidityinterval, expiryinterval; - unsigned int i; - unsigned int nkeys = 0; - unsigned int resign; + dns_diff_t _sig_diff; + dns__zonediff_t zonediff; + dns_fixedname_t fixed; + dns_name_t *name; + dns_rdataset_t rdataset; + dns_rdatatype_t covers; + dst_key_t *zone_keys[DNS_MAXZONEKEYS]; + bool check_ksk, keyset_kskonly = false; + isc_result_t result; + isc_stdtime_t now, inception, soaexpire, expire, fullexpire, stop; + uint32_t sigvalidityinterval, expiryinterval; + unsigned int i; + unsigned int nkeys = 0; + unsigned int resign; ENTER; @@ -7221,12 +7101,11 @@ failure: static isc_result_t next_active(dns_db_t *db, dns_dbversion_t *version, dns_name_t *oldname, - dns_name_t *newname, bool bottom) -{ - isc_result_t result; - dns_dbiterator_t * dbit = NULL; + dns_name_t *newname, bool bottom) { + isc_result_t result; + dns_dbiterator_t *dbit = NULL; dns_rdatasetiter_t *rdsit = NULL; - dns_dbnode_t * node = NULL; + dns_dbnode_t *node = NULL; CHECK(dns_db_createiterator(db, DNS_DB_NONSEC3, &dbit)); CHECK(dns_dbiterator_seek(dbit, oldname)); @@ -7237,7 +7116,8 @@ next_active(dns_db_t *db, dns_dbversion_t *version, dns_name_t *oldname, } CHECK(dns_dbiterator_current(dbit, &node, newname)); if (bottom && dns_name_issubdomain(newname, oldname) && - !dns_name_equal(newname, oldname)) { + !dns_name_equal(newname, oldname)) + { dns_db_detachnode(db, &node); continue; } @@ -7265,14 +7145,13 @@ failure: static bool signed_with_good_key(dns_zone_t *zone, dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, dns_rdatatype_t type, - dst_key_t *key) -{ - isc_result_t result; - dns_rdataset_t rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; + dst_key_t *key) { + isc_result_t result; + dns_rdataset_t rdataset; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_rrsig_t rrsig; - int count = 0; - dns_kasp_t * kasp = dns_zone_getkasp(zone); + int count = 0; + dns_kasp_t *kasp = dns_zone_getkasp(zone); dns_rdataset_init(&rdataset); result = dns_db_findrdataset(db, node, version, dns_rdatatype_rrsig, @@ -7282,7 +7161,8 @@ signed_with_good_key(dns_zone_t *zone, dns_db_t *db, dns_dbnode_t *node, return (false); } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdataset_current(&rdataset, &rdata); result = dns_rdata_tostruct(&rdata, &rrsig, NULL); INSIST(result == ISC_R_SUCCESS); @@ -7299,11 +7179,12 @@ signed_with_good_key(dns_zone_t *zone, dns_db_t *db, dns_dbnode_t *node, if (kasp) { dns_kasp_key_t *kkey; - int zsk_count = 0; - bool approved; + int zsk_count = 0; + bool approved; for (kkey = ISC_LIST_HEAD(dns_kasp_keys(kasp)); kkey != NULL; - kkey = ISC_LIST_NEXT(kkey, link)) { + kkey = ISC_LIST_NEXT(kkey, link)) + { if (dns_kasp_key_algorithm(kkey) != dst_key_alg(key)) { continue; } @@ -7313,8 +7194,8 @@ signed_with_good_key(dns_zone_t *zone, dns_db_t *db, dns_dbnode_t *node, } if (type == dns_rdatatype_dnskey || - type == dns_rdatatype_cdnskey || - type == dns_rdatatype_cds) { + type == dns_rdatatype_cdnskey || type == dns_rdatatype_cds) + { /* * CDS and CDNSKEY are signed with KSK like DNSKEY. * (RFC 7344, section 4.1 specifies that they must @@ -7336,13 +7217,12 @@ signed_with_good_key(dns_zone_t *zone, dns_db_t *db, dns_dbnode_t *node, static isc_result_t add_nsec(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, - dns_dbnode_t *node, dns_ttl_t ttl, bool bottom, dns_diff_t *diff) -{ + dns_dbnode_t *node, dns_ttl_t ttl, bool bottom, dns_diff_t *diff) { dns_fixedname_t fixed; - dns_name_t * next; - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_result_t result; - unsigned char nsecbuffer[DNS_NSEC_BUFFERSIZE]; + dns_name_t *next; + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_result_t result; + unsigned char nsecbuffer[DNS_NSEC_BUFFERSIZE]; next = dns_fixedname_initname(&fixed); @@ -7356,11 +7236,10 @@ failure: static isc_result_t check_if_bottom_of_zone(dns_db_t *db, dns_dbnode_t *node, - dns_dbversion_t *version, bool *is_bottom_of_zone) -{ - isc_result_t result; + dns_dbversion_t *version, bool *is_bottom_of_zone) { + isc_result_t result; dns_rdatasetiter_t *iterator = NULL; - dns_rdataset_t rdataset; + dns_rdataset_t rdataset; bool seen_soa = false, seen_ns = false, seen_dname = false; REQUIRE(is_bottom_of_zone != NULL); @@ -7375,7 +7254,8 @@ check_if_bottom_of_zone(dns_db_t *db, dns_dbnode_t *node, dns_rdataset_init(&rdataset); for (result = dns_rdatasetiter_first(iterator); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(iterator)) { + result = dns_rdatasetiter_next(iterator)) + { dns_rdatasetiter_current(iterator, &rdataset); switch (rdataset.type) { case dns_rdatatype_soa: @@ -7410,17 +7290,16 @@ sign_a_node(dns_db_t *db, dns_zone_t *zone, dns_name_t *name, bool build_nsec, dst_key_t *key, isc_stdtime_t inception, isc_stdtime_t expire, unsigned int minimum, bool is_ksk, bool is_zsk, bool keyset_kskonly, bool is_bottom_of_zone, - dns_diff_t *diff, int32_t *signatures, isc_mem_t *mctx) -{ - isc_result_t result; - dns_kasp_t * kasp = dns_zone_getkasp(zone); + dns_diff_t *diff, int32_t *signatures, isc_mem_t *mctx) { + isc_result_t result; + dns_kasp_t *kasp = dns_zone_getkasp(zone); dns_rdatasetiter_t *iterator = NULL; - dns_rdataset_t rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_stats_t * dnssecsignstats; - dns_stats_t * dnssecrefreshstats; + dns_rdataset_t rdataset; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_stats_t *dnssecsignstats; + dns_stats_t *dnssecrefreshstats; - isc_buffer_t buffer; + isc_buffer_t buffer; unsigned char data[1024]; bool seen_soa, seen_ns, seen_rr, seen_nsec, seen_nsec3, seen_ds; @@ -7436,7 +7315,8 @@ sign_a_node(dns_db_t *db, dns_zone_t *zone, dns_name_t *name, isc_buffer_init(&buffer, data, sizeof(data)); seen_rr = seen_soa = seen_ns = seen_nsec = seen_nsec3 = seen_ds = false; for (result = dns_rdatasetiter_first(iterator); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(iterator)) { + result = dns_rdatasetiter_next(iterator)) + { dns_rdatasetiter_current(iterator, &rdataset); if (rdataset.type == dns_rdatatype_soa) { seen_soa = true; @@ -7493,7 +7373,8 @@ sign_a_node(dns_db_t *db, dns_zone_t *zone, dns_name_t *name, } if (rdataset.type == dns_rdatatype_dnskey || rdataset.type == dns_rdatatype_cdnskey || - rdataset.type == dns_rdatatype_cds) { + rdataset.type == dns_rdatatype_cds) + { /* * CDS and CDNSKEY are signed with KSK like DNSKEY. * (RFC 7344, section 4.1 specifies that they must @@ -7514,7 +7395,8 @@ sign_a_node(dns_db_t *db, dns_zone_t *zone, dns_name_t *name, } if (seen_ns && !seen_soa && rdataset.type != dns_rdatatype_ds && - rdataset.type != dns_rdatatype_nsec) { + rdataset.type != dns_rdatatype_nsec) + { goto next_rdataset; } if (signed_with_good_key(zone, db, node, version, rdataset.type, @@ -7569,11 +7451,10 @@ failure: */ static isc_result_t updatesecure(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, - dns_ttl_t minimum, bool update_only, dns_diff_t *diff) -{ - isc_result_t result; + dns_ttl_t minimum, bool update_only, dns_diff_t *diff) { + isc_result_t result; dns_rdataset_t rdataset; - dns_dbnode_t * node = NULL; + dns_dbnode_t *node = NULL; CHECK(dns_db_getoriginnode(db, &node)); if (update_only) { @@ -7605,15 +7486,14 @@ failure: static isc_result_t updatesignwithkey(dns_zone_t *zone, dns_signing_t *signing, dns_dbversion_t *version, bool build_nsec3, dns_ttl_t minimum, - dns_diff_t *diff) -{ - isc_result_t result; - dns_dbnode_t * node = NULL; + dns_diff_t *diff) { + isc_result_t result; + dns_dbnode_t *node = NULL; dns_rdataset_t rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; - unsigned char data[5]; - bool seen_done = false; - bool have_rr = false; + dns_rdata_t rdata = DNS_RDATA_INIT; + unsigned char data[5]; + bool seen_done = false; + bool have_rr = false; dns_rdataset_init(&rdataset); result = dns_db_getoriginnode(signing->db, &node); @@ -7634,14 +7514,16 @@ updatesignwithkey(dns_zone_t *zone, dns_signing_t *signing, goto failure; } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdataset_current(&rdataset, &rdata); /* * If we don't match the algorithm or keyid skip the record. */ if (rdata.length != 5 || rdata.data[0] != signing->algorithm || rdata.data[1] != ((signing->keyid >> 8) & 0xff) || - rdata.data[2] != (signing->keyid & 0xff)) { + rdata.data[2] != (signing->keyid & 0xff)) + { have_rr = true; dns_rdata_reset(&rdata); continue; @@ -7737,18 +7619,17 @@ failure: */ static isc_result_t fixup_nsec3param(dns_db_t *db, dns_dbversion_t *ver, dns_nsec3chain_t *chain, - bool active, dns_rdatatype_t privatetype, dns_diff_t *diff) -{ - dns_dbnode_t * node = NULL; - dns_name_t * name = dns_db_origin(db); - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdataset_t rdataset; + bool active, dns_rdatatype_t privatetype, dns_diff_t *diff) { + dns_dbnode_t *node = NULL; + dns_name_t *name = dns_db_origin(db); + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdataset_t rdataset; dns_rdata_nsec3param_t nsec3param; - isc_result_t result; - isc_buffer_t buffer; - unsigned char parambuf[DNS_NSEC3PARAM_BUFFERSIZE]; - dns_ttl_t ttl = 0; - bool nseconly = false, nsec3ok = false; + isc_result_t result; + isc_buffer_t buffer; + unsigned char parambuf[DNS_NSEC3PARAM_BUFFERSIZE]; + dns_ttl_t ttl = 0; + bool nseconly = false, nsec3ok = false; dns_rdataset_init(&rdataset); @@ -7772,7 +7653,8 @@ fixup_nsec3param(dns_db_t *db, dns_dbversion_t *ver, dns_nsec3chain_t *chain, * Delete all NSEC3PARAM records which match that in nsec3chain. */ for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdataset_current(&rdataset, &rdata); CHECK(dns_rdata_tostruct(&rdata, &nsec3param, NULL)); @@ -7781,7 +7663,8 @@ fixup_nsec3param(dns_db_t *db, dns_dbversion_t *ver, dns_nsec3chain_t *chain, nsec3param.iterations != chain->nsec3param.iterations || nsec3param.salt_length != chain->nsec3param.salt_length || memcmp(nsec3param.salt, chain->nsec3param.salt, - nsec3param.salt_length)) { + nsec3param.salt_length)) + { dns_rdata_reset(&rdata); continue; } @@ -7818,7 +7701,8 @@ try_private: } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t private = DNS_RDATA_INIT; unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE]; @@ -7835,7 +7719,8 @@ try_private: nsec3param.iterations != chain->nsec3param.iterations || nsec3param.salt_length != chain->nsec3param.salt_length || memcmp(nsec3param.salt, chain->nsec3param.salt, - nsec3param.salt_length)) { + nsec3param.salt_length)) + { dns_rdata_reset(&rdata); continue; } @@ -7878,10 +7763,9 @@ failure: 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) -{ + dns_name_t *name, dns_diff_t *diff) { dns_rdataset_t rdataset; - isc_result_t result; + isc_result_t result; dns_rdataset_init(&rdataset); @@ -7894,7 +7778,8 @@ delete_nsec(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node, return (result); } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &rdata); @@ -7912,11 +7797,10 @@ failure: static isc_result_t deletematchingnsec3(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node, dns_name_t *name, const dns_rdata_nsec3param_t *param, - dns_diff_t *diff) -{ - dns_rdataset_t rdataset; + dns_diff_t *diff) { + dns_rdataset_t rdataset; dns_rdata_nsec3_t nsec3; - isc_result_t result; + isc_result_t result; dns_rdataset_init(&rdataset); result = dns_db_findrdataset(db, node, ver, dns_rdatatype_nsec3, 0, 0, @@ -7929,7 +7813,8 @@ deletematchingnsec3(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node, } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &rdata); @@ -7937,7 +7822,8 @@ deletematchingnsec3(dns_db_t *db, dns_dbversion_t *ver, dns_dbnode_t *node, if (nsec3.hash != param->hash || nsec3.iterations != param->iterations || nsec3.salt_length != param->salt_length || - memcmp(nsec3.salt, param->salt, nsec3.salt_length)) { + memcmp(nsec3.salt, param->salt, nsec3.salt_length)) + { continue; } CHECK(update_one_rr(db, ver, diff, DNS_DIFFOP_DEL, name, @@ -7953,13 +7839,12 @@ failure: static isc_result_t need_nsec_chain(dns_db_t *db, dns_dbversion_t *ver, - const dns_rdata_nsec3param_t *param, bool *answer) -{ - dns_dbnode_t * node = NULL; - dns_rdata_t rdata = DNS_RDATA_INIT; + const dns_rdata_nsec3param_t *param, bool *answer) { + dns_dbnode_t *node = NULL; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_nsec3param_t myparam; - dns_rdataset_t rdataset; - isc_result_t result; + dns_rdataset_t rdataset; + isc_result_t result; *answer = false; @@ -7993,7 +7878,8 @@ need_nsec_chain(dns_db_t *db, dns_dbversion_t *ver, } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdataset_current(&rdataset, &rdata); CHECK(dns_rdata_tostruct(&rdata, &myparam, NULL)); dns_rdata_reset(&rdata); @@ -8009,7 +7895,8 @@ need_nsec_chain(dns_db_t *db, dns_dbversion_t *ver, if (myparam.hash == param->hash && myparam.iterations == param->iterations && myparam.salt_length == param->salt_length && - !memcmp(myparam.salt, param->salt, myparam.salt_length)) { + !memcmp(myparam.salt, param->salt, myparam.salt_length)) + { continue; } /* @@ -8036,13 +7923,13 @@ failure: * found). */ static dns_difftuple_t * -find_next_matching_tuple(dns_difftuple_t *cur) -{ +find_next_matching_tuple(dns_difftuple_t *cur) { dns_difftuple_t *next = cur; while ((next = ISC_LIST_NEXT(next, link)) != NULL) { if (cur->rdata.type == next->rdata.type && - dns_name_equal(&cur->name, &next->name)) { + dns_name_equal(&cur->name, &next->name)) + { return (next); } } @@ -8055,8 +7942,7 @@ find_next_matching_tuple(dns_difftuple_t *cur) * them to 'dst'. */ static void -move_matching_tuples(dns_difftuple_t *cur, dns_diff_t *src, dns_diff_t *dst) -{ +move_matching_tuples(dns_difftuple_t *cur, dns_diff_t *src, dns_diff_t *dst) { do { dns_difftuple_t *next = find_next_matching_tuple(cur); ISC_LIST_UNLINK(src->tuples, cur, link); @@ -8076,10 +7962,9 @@ dns__zone_updatesigs(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *version, dns_zone_t *zone, isc_stdtime_t inception, isc_stdtime_t expire, isc_stdtime_t keyexpire, isc_stdtime_t now, bool check_ksk, bool keyset_kskonly, - dns__zonediff_t *zonediff) -{ + dns__zonediff_t *zonediff) { dns_difftuple_t *tuple; - isc_result_t result; + isc_result_t result; while ((tuple = ISC_LIST_HEAD(diff->tuples)) != NULL) { isc_stdtime_t exp = expire; @@ -8087,7 +7972,8 @@ dns__zone_updatesigs(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *version, if (keyexpire != 0 && (tuple->rdata.type == dns_rdatatype_dnskey || tuple->rdata.type == dns_rdatatype_cdnskey || - tuple->rdata.type == dns_rdatatype_cds)) { + tuple->rdata.type == dns_rdatatype_cds)) + { exp = keyexpire; } @@ -8128,41 +8014,40 @@ dns__zone_updatesigs(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *version, * requested. */ static void -zone_nsec3chain(dns_zone_t *zone) -{ - const char * me = "zone_nsec3chain"; - dns_db_t * db = NULL; - dns_dbnode_t * node = NULL; - dns_dbversion_t * version = NULL; - dns_diff_t _sig_diff; - dns_diff_t nsec_diff; - dns_diff_t nsec3_diff; - dns_diff_t param_diff; - dns__zonediff_t zonediff; - dns_fixedname_t fixed; - dns_fixedname_t nextfixed; - dns_name_t * name, *nextname; - dns_rdataset_t rdataset; - dns_nsec3chain_t * nsec3chain = NULL, *nextnsec3chain; +zone_nsec3chain(dns_zone_t *zone) { + const char *me = "zone_nsec3chain"; + dns_db_t *db = NULL; + dns_dbnode_t *node = NULL; + dns_dbversion_t *version = NULL; + dns_diff_t _sig_diff; + dns_diff_t nsec_diff; + dns_diff_t nsec3_diff; + dns_diff_t param_diff; + dns__zonediff_t zonediff; + dns_fixedname_t fixed; + dns_fixedname_t nextfixed; + dns_name_t *name, *nextname; + dns_rdataset_t rdataset; + dns_nsec3chain_t *nsec3chain = NULL, *nextnsec3chain; dns_nsec3chainlist_t cleanup; - dst_key_t * zone_keys[DNS_MAXZONEKEYS]; - int32_t signatures; - bool check_ksk, keyset_kskonly; - bool delegation; - bool first; - isc_result_t result; - isc_stdtime_t now, inception, soaexpire, expire; - uint32_t jitter, sigvalidityinterval, expiryinterval; - unsigned int i; - unsigned int nkeys = 0; - uint32_t nodes; - bool unsecure = false; - bool seen_soa, seen_ns, seen_dname, seen_ds; - bool seen_nsec, seen_nsec3, seen_rr; - dns_rdatasetiter_t * iterator = NULL; - bool buildnsecchain; - bool updatensec = false; - dns_rdatatype_t privatetype = zone->privatetype; + dst_key_t *zone_keys[DNS_MAXZONEKEYS]; + int32_t signatures; + bool check_ksk, keyset_kskonly; + bool delegation; + bool first; + isc_result_t result; + isc_stdtime_t now, inception, soaexpire, expire; + uint32_t jitter, sigvalidityinterval, expiryinterval; + unsigned int i; + unsigned int nkeys = 0; + uint32_t nodes; + bool unsecure = false; + bool seen_soa, seen_ns, seen_dname, seen_ds; + bool seen_nsec, seen_nsec3, seen_rr; + dns_rdatasetiter_t *iterator = NULL; + bool buildnsecchain; + bool updatensec = false; + dns_rdatatype_t privatetype = zone->privatetype; ENTER; @@ -8329,14 +8214,15 @@ zone_nsec3chain(dns_zone_t *zone) unsecure = false; if (first) { dns_fixedname_t ffound; - dns_name_t * found; + dns_name_t *found; found = dns_fixedname_initname(&ffound); result = dns_db_find( db, name, version, dns_rdatatype_soa, DNS_DBFIND_NOWILD, 0, NULL, found, NULL, NULL); if ((result == DNS_R_DELEGATION || result == DNS_R_DNAME) && - !dns_name_equal(name, found)) { + !dns_name_equal(name, found)) + { /* * Remember the obscuring name so that * we skip all obscured names. @@ -8362,7 +8248,8 @@ zone_nsec3chain(dns_zone_t *zone) seen_soa = seen_ns = seen_dname = seen_ds = seen_nsec = false; for (result = dns_rdatasetiter_first(iterator); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(iterator)) { + result = dns_rdatasetiter_next(iterator)) + { dns_rdatasetiter_current(iterator, &rdataset); INSIST(rdataset.type != dns_rdatatype_nsec3); if (rdataset.type == dns_rdatatype_soa) { @@ -8529,8 +8416,8 @@ zone_nsec3chain(dns_zone_t *zone) * of removing this NSEC3 chain. */ if (first && !updatensec && - (nsec3chain->nsec3param.flags & DNS_NSEC3FLAG_NONSEC) == - 0) { + (nsec3chain->nsec3param.flags & DNS_NSEC3FLAG_NONSEC) == 0) + { result = need_nsec_chain(db, version, &nsec3chain->nsec3param, &buildnsecchain); @@ -8587,14 +8474,15 @@ zone_nsec3chain(dns_zone_t *zone) if (first) { dns_fixedname_t ffound; - dns_name_t * found; + dns_name_t *found; found = dns_fixedname_initname(&ffound); result = dns_db_find( db, name, version, dns_rdatatype_soa, DNS_DBFIND_NOWILD, 0, NULL, found, NULL, NULL); if ((result == DNS_R_DELEGATION || result == DNS_R_DNAME) && - !dns_name_equal(name, found)) { + !dns_name_equal(name, found)) + { /* * Remember the obscuring name so that * we skip all obscured names. @@ -8621,7 +8509,8 @@ zone_nsec3chain(dns_zone_t *zone) seen_rr = false; for (result = dns_rdatasetiter_first(iterator); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(iterator)) { + result = dns_rdatasetiter_next(iterator)) + { dns_rdatasetiter_current(iterator, &rdataset); if (rdataset.type == dns_rdatatype_soa) { seen_soa = true; @@ -8736,7 +8625,8 @@ skip_removals: } for (result = dns_rdatasetiter_first(iterator); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(iterator)) { + result = dns_rdatasetiter_next(iterator)) + { dns_rdatasetiter_current(iterator, &rdataset); if (rdataset.type == dns_rdatatype_nsec) { rebuild_nsec = true; @@ -8886,7 +8776,8 @@ done: */ LOCK_ZONE(zone); for (nsec3chain = ISC_LIST_HEAD(zone->nsec3chain); nsec3chain != NULL; - nsec3chain = ISC_LIST_NEXT(nsec3chain, link)) { + nsec3chain = ISC_LIST_NEXT(nsec3chain, link)) + { dns_dbiterator_pause(nsec3chain->dbiterator); } UNLOCK_ZONE(zone); @@ -8957,7 +8848,8 @@ failure: LOCK_ZONE(zone); for (nsec3chain = ISC_LIST_HEAD(zone->nsec3chain); nsec3chain != NULL; - nsec3chain = ISC_LIST_NEXT(nsec3chain, link)) { + nsec3chain = ISC_LIST_NEXT(nsec3chain, link)) + { dns_dbiterator_pause(nsec3chain->dbiterator); } UNLOCK_ZONE(zone); @@ -9011,14 +8903,13 @@ failure: static isc_result_t del_sig(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, dns_dbnode_t *node, unsigned int nkeys, dns_secalg_t algorithm, - uint16_t keyid, bool *has_algp, dns_diff_t *diff) -{ - dns_rdata_rrsig_t rrsig; - dns_rdataset_t rdataset; + uint16_t keyid, bool *has_algp, dns_diff_t *diff) { + dns_rdata_rrsig_t rrsig; + dns_rdataset_t rdataset; dns_rdatasetiter_t *iterator = NULL; - isc_result_t result; - bool alg_missed = false; - bool alg_found = false; + isc_result_t result; + bool alg_missed = false; + bool alg_found = false; char namebuf[DNS_NAME_FORMATSIZE]; dns_name_format(name, namebuf, sizeof(namebuf)); @@ -9033,13 +8924,15 @@ del_sig(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, dns_rdataset_init(&rdataset); for (result = dns_rdatasetiter_first(iterator); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(iterator)) { + result = dns_rdatasetiter_next(iterator)) + { bool has_alg = false; dns_rdatasetiter_current(iterator, &rdataset); if (nkeys == 0 && rdataset.type == dns_rdatatype_nsec) { for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &rdata); CHECK(update_one_rr(db, version, diff, @@ -9058,7 +8951,8 @@ del_sig(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name, } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &rdata); CHECK(dns_rdata_tostruct(&rdata, &rrsig, NULL)); @@ -9110,37 +9004,36 @@ failure: * Builds the NSEC chain if required. */ static void -zone_sign(dns_zone_t *zone) -{ - const char * me = "zone_sign"; - dns_db_t * db = NULL; - dns_dbnode_t * node = NULL; - dns_dbversion_t * version = NULL; - dns_diff_t _sig_diff; - dns_diff_t post_diff; - dns__zonediff_t zonediff; - dns_fixedname_t fixed; - dns_fixedname_t nextfixed; - dns_kasp_t * kasp; - dns_name_t * name, *nextname; - dns_rdataset_t rdataset; - dns_signing_t * signing, *nextsigning; +zone_sign(dns_zone_t *zone) { + const char *me = "zone_sign"; + dns_db_t *db = NULL; + dns_dbnode_t *node = NULL; + dns_dbversion_t *version = NULL; + dns_diff_t _sig_diff; + dns_diff_t post_diff; + dns__zonediff_t zonediff; + dns_fixedname_t fixed; + dns_fixedname_t nextfixed; + dns_kasp_t *kasp; + dns_name_t *name, *nextname; + dns_rdataset_t rdataset; + dns_signing_t *signing, *nextsigning; dns_signinglist_t cleanup; - dst_key_t * zone_keys[DNS_MAXZONEKEYS]; - int32_t signatures; - bool check_ksk, keyset_kskonly, is_ksk, is_zsk; - bool with_ksk, with_zsk; - bool commit = false; - bool is_bottom_of_zone; - bool build_nsec = false; - bool build_nsec3 = false; - bool first; - isc_result_t result; - isc_stdtime_t now, inception, soaexpire, expire; - uint32_t jitter, sigvalidityinterval, expiryinterval; - unsigned int i, j; - unsigned int nkeys = 0; - uint32_t nodes; + dst_key_t *zone_keys[DNS_MAXZONEKEYS]; + int32_t signatures; + bool check_ksk, keyset_kskonly, is_ksk, is_zsk; + bool with_ksk, with_zsk; + bool commit = false; + bool is_bottom_of_zone; + bool build_nsec = false; + bool build_nsec3 = false; + bool first; + isc_result_t result; + isc_stdtime_t now, inception, soaexpire, expire; + uint32_t jitter, sigvalidityinterval, expiryinterval; + unsigned int i, j; + unsigned int nkeys = 0; + uint32_t nodes; ENTER; @@ -9230,10 +9123,10 @@ zone_sign(dns_zone_t *zone) check_ksk = (kasp != NULL) ? false : DNS_ZONE_OPTION(zone, DNS_ZONEOPT_UPDATECHECKKSK); - keyset_kskonly = - (kasp != NULL) - ? true - : DNS_ZONE_OPTION(zone, DNS_ZONEOPT_DNSKEYKSKONLY); + keyset_kskonly = (kasp != NULL) + ? true + : DNS_ZONE_OPTION(zone, + DNS_ZONEOPT_DNSKEYKSKONLY); /* Determine which type of chain to build */ CHECK(dns_private_chains(db, version, zone->privatetype, &build_nsec, @@ -9277,9 +9170,9 @@ zone_sign(dns_zone_t *zone) * Find the key we want to remove. */ if (ALG(zone_keys[i]) == signing->algorithm && - dst_key_id(zone_keys[i]) == - signing->keyid) { - bool ksk = false; + dst_key_id(zone_keys[i]) == signing->keyid) + { + bool ksk = false; isc_result_t ret = dst_key_getbool( zone_keys[i], DST_BOOL_KSK, &ksk); @@ -9315,14 +9208,15 @@ zone_sign(dns_zone_t *zone) */ if (first) { dns_fixedname_t ffound; - dns_name_t * found; + dns_name_t *found; found = dns_fixedname_initname(&ffound); result = dns_db_find( db, name, version, dns_rdatatype_soa, DNS_DBFIND_NOWILD, 0, NULL, found, NULL, NULL); if ((result == DNS_R_DELEGATION || result == DNS_R_DNAME) && - !dns_name_equal(name, found)) { + !dns_name_equal(name, found)) + { /* * Remember the obscuring name so that * we skip all obscured names. @@ -9361,7 +9255,8 @@ zone_sign(dns_zone_t *zone) */ if (!signing->deleteit && (dst_key_alg(zone_keys[i]) != signing->algorithm || - dst_key_id(zone_keys[i]) != signing->keyid)) { + dst_key_id(zone_keys[i]) != signing->keyid)) + { continue; } @@ -9615,12 +9510,14 @@ pauseall: * Pause all iterators so that dns_db_closeversion() can succeed. */ for (signing = ISC_LIST_HEAD(zone->signing); signing != NULL; - signing = ISC_LIST_NEXT(signing, link)) { + signing = ISC_LIST_NEXT(signing, link)) + { dns_dbiterator_pause(signing->dbiterator); } for (signing = ISC_LIST_HEAD(cleanup); signing != NULL; - signing = ISC_LIST_NEXT(signing, link)) { + signing = ISC_LIST_NEXT(signing, link)) + { dns_dbiterator_pause(signing->dbiterator); } @@ -9661,7 +9558,8 @@ cleanup: * Pause all dbiterators. */ for (signing = ISC_LIST_HEAD(zone->signing); signing != NULL; - signing = ISC_LIST_NEXT(signing, link)) { + signing = ISC_LIST_NEXT(signing, link)) + { dns_dbiterator_pause(signing->dbiterator); } @@ -9711,12 +9609,11 @@ cleanup: static isc_result_t normalize_key(dns_rdata_t *rr, dns_rdata_t *target, unsigned char *data, - int size) -{ - dns_rdata_dnskey_t dnskey; + int size) { + dns_rdata_dnskey_t dnskey; dns_rdata_keydata_t keydata; - isc_buffer_t buf; - isc_result_t result; + isc_buffer_t buf; + isc_result_t result; dns_rdata_reset(target); isc_buffer_init(&buf, data, size); @@ -9758,11 +9655,10 @@ normalize_key(dns_rdata_t *rr, dns_rdata_t *target, unsigned char *data, */ static bool -matchkey(dns_rdataset_t *rdset, dns_rdata_t *rr) -{ +matchkey(dns_rdataset_t *rdset, dns_rdata_t *rr) { unsigned char data1[4096], data2[4096]; - dns_rdata_t rdata, rdata1, rdata2; - isc_result_t result; + dns_rdata_t rdata, rdata1, rdata2; + isc_result_t result; dns_rdata_init(&rdata); dns_rdata_init(&rdata1); @@ -9774,7 +9670,8 @@ matchkey(dns_rdataset_t *rdset, dns_rdata_t *rr) } for (result = dns_rdataset_first(rdset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdset)) { + result = dns_rdataset_next(rdset)) + { dns_rdata_reset(&rdata); dns_rdataset_current(rdset, &rdata); result = normalize_key(&rdata, &rdata2, data2, sizeof(data2)); @@ -9801,14 +9698,13 @@ matchkey(dns_rdataset_t *rdset, dns_rdata_t *rr) * 1/10 * RRSigExpirationInterval)) */ static inline isc_stdtime_t -refresh_time(dns_keyfetch_t *kfetch, bool retry) -{ - isc_result_t result; - uint32_t t; +refresh_time(dns_keyfetch_t *kfetch, bool retry) { + isc_result_t result; + uint32_t t; dns_rdataset_t *rdset; - dns_rdata_t sigrr = DNS_RDATA_INIT; + dns_rdata_t sigrr = DNS_RDATA_INIT; dns_rdata_sig_t sig; - isc_stdtime_t now; + isc_stdtime_t now; isc_stdtime_get(&now); @@ -9872,23 +9768,23 @@ refresh_time(dns_keyfetch_t *kfetch, bool retry) * hold zone lock. */ static isc_result_t -minimal_update(dns_keyfetch_t *kfetch, dns_dbversion_t *ver, dns_diff_t *diff) -{ - isc_result_t result; - isc_buffer_t keyb; - unsigned char key_buf[4096]; - dns_rdata_t rdata = DNS_RDATA_INIT; +minimal_update(dns_keyfetch_t *kfetch, dns_dbversion_t *ver, dns_diff_t *diff) { + isc_result_t result; + isc_buffer_t keyb; + unsigned char key_buf[4096]; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_keydata_t keydata; - dns_name_t * name; - dns_zone_t * zone = kfetch->zone; - isc_stdtime_t now; + dns_name_t *name; + dns_zone_t *zone = kfetch->zone; + isc_stdtime_t now; name = dns_fixedname_name(&kfetch->name); isc_stdtime_get(&now); for (result = dns_rdataset_first(&kfetch->keydataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&kfetch->keydataset)) { + result = dns_rdataset_next(&kfetch->keydataset)) + { dns_rdata_reset(&rdata); dns_rdataset_current(&kfetch->keydataset, &rdata); @@ -9926,19 +9822,18 @@ failure: * Verify that DNSKEY set is signed by the key specified in 'keydata'. */ static bool -revocable(dns_keyfetch_t *kfetch, dns_rdata_keydata_t *keydata) -{ - isc_result_t result; - dns_name_t * keyname; - isc_mem_t * mctx; - dns_rdata_t sigrr = DNS_RDATA_INIT; - dns_rdata_t rr = DNS_RDATA_INIT; - dns_rdata_rrsig_t sig; +revocable(dns_keyfetch_t *kfetch, dns_rdata_keydata_t *keydata) { + isc_result_t result; + dns_name_t *keyname; + isc_mem_t *mctx; + dns_rdata_t sigrr = DNS_RDATA_INIT; + dns_rdata_t rr = DNS_RDATA_INIT; + dns_rdata_rrsig_t sig; dns_rdata_dnskey_t dnskey; - dst_key_t * dstkey = NULL; - unsigned char key_buf[4096]; - isc_buffer_t keyb; - bool answer = false; + dst_key_t *dstkey = NULL; + unsigned char key_buf[4096]; + isc_buffer_t keyb; + bool answer = false; REQUIRE(kfetch != NULL && keydata != NULL); REQUIRE(dns_rdataset_isassociated(&kfetch->dnskeysigset)); @@ -9959,7 +9854,8 @@ revocable(dns_keyfetch_t *kfetch, dns_rdata_keydata_t *keydata) /* See if that key generated any of the signatures */ for (result = dns_rdataset_first(&kfetch->dnskeysigset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&kfetch->dnskeysigset)) { + result = dns_rdataset_next(&kfetch->dnskeysigset)) + { dns_fixedname_t fixed; dns_fixedname_init(&fixed); @@ -9995,37 +9891,36 @@ revocable(dns_keyfetch_t *kfetch, dns_rdata_keydata_t *keydata) * local trust anchors according to RFC5011. */ static void -keyfetch_done(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result, eresult; - dns_fetchevent_t * devent; - dns_keyfetch_t * kfetch; - dns_zone_t * zone; - isc_mem_t * mctx = NULL; - dns_keytable_t * secroots = NULL; - dns_dbversion_t * ver = NULL; - dns_diff_t diff; - bool alldone = false; - bool commit = false; - dns_name_t * keyname = NULL; - dns_rdata_t sigrr = DNS_RDATA_INIT; - dns_rdata_t dnskeyrr = DNS_RDATA_INIT; - dns_rdata_t keydatarr = DNS_RDATA_INIT; - dns_rdata_rrsig_t sig; - dns_rdata_dnskey_t dnskey; +keyfetch_done(isc_task_t *task, isc_event_t *event) { + isc_result_t result, eresult; + dns_fetchevent_t *devent; + dns_keyfetch_t *kfetch; + dns_zone_t *zone; + isc_mem_t *mctx = NULL; + dns_keytable_t *secroots = NULL; + dns_dbversion_t *ver = NULL; + dns_diff_t diff; + bool alldone = false; + bool commit = false; + dns_name_t *keyname = NULL; + dns_rdata_t sigrr = DNS_RDATA_INIT; + dns_rdata_t dnskeyrr = DNS_RDATA_INIT; + dns_rdata_t keydatarr = DNS_RDATA_INIT; + dns_rdata_rrsig_t sig; + dns_rdata_dnskey_t dnskey; dns_rdata_keydata_t keydata; - bool initializing; - char namebuf[DNS_NAME_FORMATSIZE]; - unsigned char key_buf[4096]; - isc_buffer_t keyb; - dst_key_t * dstkey = NULL; - isc_stdtime_t now; - int pending = 0; - bool secure = false, initial = false; - bool free_needed; - dns_keynode_t * keynode = NULL; - dns_rdataset_t * dnskeys = NULL, *dnskeysigs = NULL; - dns_rdataset_t * keydataset = NULL, *dsset = NULL; + bool initializing; + char namebuf[DNS_NAME_FORMATSIZE]; + unsigned char key_buf[4096]; + isc_buffer_t keyb; + dst_key_t *dstkey = NULL; + isc_stdtime_t now; + int pending = 0; + bool secure = false, initial = false; + bool free_needed; + dns_keynode_t *keynode = NULL; + dns_rdataset_t *dnskeys = NULL, *dnskeysigs = NULL; + dns_rdataset_t *keydataset = NULL, *dsset = NULL; UNUSED(task); INSIST(event != NULL && event->ev_type == DNS_EVENT_FETCHDONE); @@ -10114,9 +10009,10 @@ keyfetch_done(isc_task_t *task, isc_event_t *event) if ((dsset = dns_keynode_dsset(keynode)) != NULL) { for (result = dns_rdataset_first(dnskeysigs); result == ISC_R_SUCCESS; - result = dns_rdataset_next(dnskeysigs)) { + result = dns_rdataset_next(dnskeysigs)) + { isc_result_t tresult; - dns_rdata_t keyrdata = DNS_RDATA_INIT; + dns_rdata_t keyrdata = DNS_RDATA_INIT; dns_rdata_reset(&sigrr); dns_rdataset_current(dnskeysigs, &sigrr); @@ -10125,14 +10021,15 @@ keyfetch_done(isc_task_t *task, isc_event_t *event) for (tresult = dns_rdataset_first(dsset); tresult == ISC_R_SUCCESS; - tresult = dns_rdataset_next(dsset)) { - dns_rdata_t dsrdata = DNS_RDATA_INIT; + tresult = dns_rdataset_next(dsset)) + { + dns_rdata_t dsrdata = DNS_RDATA_INIT; dns_rdata_ds_t ds; dns_rdata_reset(&dsrdata); dns_rdataset_current(dsset, &dsrdata); - tresult = - dns_rdata_tostruct(&dsrdata, &ds, NULL); + tresult = dns_rdata_tostruct(&dsrdata, &ds, + NULL); RUNTIME_CHECK(tresult == ISC_R_SUCCESS); if (ds.key_tag != sig.keyid || @@ -10210,7 +10107,8 @@ anchors_done: */ initializing = true; for (result = dns_rdataset_first(keydataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(keydataset)) { + result = dns_rdataset_next(keydataset)) + { dns_keytag_t keytag; dns_rdata_reset(&keydatarr); @@ -10260,8 +10158,8 @@ anchors_done: "timer", keytag, namebuf); if (keydata.addhd < now + dns_zone_mkey_month) { - keydata.addhd = - now + dns_zone_mkey_month; + keydata.addhd = now + + dns_zone_mkey_month; } keydata.refresh = refresh_time(kfetch, false); } else if (keydata.removehd == 0) { @@ -10324,12 +10222,13 @@ anchors_done: * timers updated */ for (result = dns_rdataset_first(dnskeys); result == ISC_R_SUCCESS; - result = dns_rdataset_next(dnskeys)) { - bool revoked = false; - bool newkey = false; - bool updatekey = false; - bool deletekey = false; - bool trustkey = false; + result = dns_rdataset_next(dnskeys)) + { + bool revoked = false; + bool newkey = false; + bool updatekey = false; + bool deletekey = false; + bool trustkey = false; dns_keytag_t keytag; dns_rdata_reset(&dnskeyrr); @@ -10431,8 +10330,8 @@ anchors_done: deletekey = true; newkey = true; keydata.removehd = 0; - keydata.addhd = - now + dns_zone_mkey_month; + keydata.addhd = now + + dns_zone_mkey_month; dnssec_log(zone, ISC_LOG_INFO, "Revoked key %d for " @@ -10538,8 +10437,9 @@ anchors_done: RUNTIME_CHECK(result == ISC_R_SUCCESS); dns_keydata_fromdnskey(&keydata, &dnskey, 0, 0, 0, NULL); - keydata.addhd = - initializing ? now : now + dns_zone_mkey_month; + keydata.addhd = initializing + ? now + : now + dns_zone_mkey_month; keydata.refresh = refresh_time(kfetch, false); dns_rdata_reset(&keydatarr); isc_buffer_init(&keyb, key_buf, sizeof(key_buf)); @@ -10652,20 +10552,19 @@ cleanup: * DNSKEY records at the trust anchor name. */ static void -zone_refreshkeys(dns_zone_t *zone) -{ - const char me[] = "zone_refreshkeys"; - isc_result_t result; - dns_rriterator_t rrit; - dns_db_t * db = NULL; - dns_dbversion_t * ver = NULL; - dns_diff_t diff; - dns_rdata_t rdata = DNS_RDATA_INIT; +zone_refreshkeys(dns_zone_t *zone) { + const char me[] = "zone_refreshkeys"; + isc_result_t result; + dns_rriterator_t rrit; + dns_db_t *db = NULL; + dns_dbversion_t *ver = NULL; + dns_diff_t diff; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_keydata_t kd; - isc_stdtime_t now; - bool commit = false; - bool fetching = false, fetch_err = false; - bool timerset = false; + isc_stdtime_t now; + bool commit = false; + bool fetching = false, fetch_err = false; + bool timerset = false; ENTER; REQUIRE(zone->db != NULL); @@ -10691,16 +10590,18 @@ zone_refreshkeys(dns_zone_t *zone) dns_rriterator_init(&rrit, db, ver, 0); for (result = dns_rriterator_first(&rrit); result == ISC_R_SUCCESS; - result = dns_rriterator_nextrrset(&rrit)) { - isc_stdtime_t timer = 0xffffffff; - dns_name_t * name = NULL, *kname = NULL; + result = dns_rriterator_nextrrset(&rrit)) + { + isc_stdtime_t timer = 0xffffffff; + dns_name_t *name = NULL, *kname = NULL; dns_rdataset_t *kdset = NULL; dns_keyfetch_t *kfetch; - uint32_t ttl; + uint32_t ttl; dns_rriterator_current(&rrit, &name, &ttl, &kdset, NULL); if (kdset == NULL || kdset->type != dns_rdatatype_keydata || - !dns_rdataset_isassociated(kdset)) { + !dns_rdataset_isassociated(kdset)) + { continue; } @@ -10709,8 +10610,8 @@ zone_refreshkeys(dns_zone_t *zone) * removal or refreshing */ for (result = dns_rdataset_first(kdset); - result == ISC_R_SUCCESS; - result = dns_rdataset_next(kdset)) { + result == ISC_R_SUCCESS; result = dns_rdataset_next(kdset)) + { dns_rdata_reset(&rdata); dns_rdataset_current(kdset, &rdata); result = dns_rdata_tostruct(&rdata, &kd, NULL); @@ -10822,7 +10723,7 @@ failure: * Error during a key fetch; retry in an hour. */ isc_time_t timenow, timethen; - char timebuf[80]; + char timebuf[80]; TIME_NOW(&timenow); DNS_ZONE_TIME_ADD(&timenow, dns_zone_mkey_hour, &timethen); @@ -10853,12 +10754,11 @@ failure: } static void -zone_maintenance(dns_zone_t *zone) -{ - const char me[] = "zone_maintenance"; - isc_time_t now; +zone_maintenance(dns_zone_t *zone) { + const char me[] = "zone_maintenance"; + isc_time_t now; isc_result_t result; - bool dumping, load_pending; + bool dumping, load_pending; REQUIRE(DNS_ZONE_VALID(zone)); ENTER; @@ -10901,7 +10801,8 @@ zone_maintenance(dns_zone_t *zone) case dns_zone_stub: LOCK_ZONE(zone); if (isc_time_compare(&now, &zone->expiretime) >= 0 && - DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) { + DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) + { zone_expire(zone); zone->refreshtime = now; } @@ -10924,7 +10825,8 @@ zone_maintenance(dns_zone_t *zone) case dns_zone_mirror: case dns_zone_stub: if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DIALREFRESH) && - isc_time_compare(&now, &zone->refreshtime) >= 0) { + isc_time_compare(&now, &zone->refreshtime) >= 0) + { dns_zone_refresh(zone); } break; @@ -10938,7 +10840,8 @@ zone_maintenance(dns_zone_t *zone) if ((zone->type == dns_zone_slave || zone->type == dns_zone_mirror) && (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDNOTIFY) || DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDSTARTUPNOTIFY)) && - isc_time_compare(&now, &zone->notifytime) >= 0) { + isc_time_compare(&now, &zone->notifytime) >= 0) + { zone_notify(zone, &now); } @@ -10956,7 +10859,8 @@ zone_maintenance(dns_zone_t *zone) if (zone->masterfile != NULL && isc_time_compare(&now, &zone->dumptime) >= 0 && DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED) && - DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP)) { + DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP)) + { dumping = was_dumping(zone); } else { dumping = true; @@ -10983,7 +10887,8 @@ zone_maintenance(dns_zone_t *zone) case dns_zone_redirect: if ((DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDNOTIFY) || DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDSTARTUPNOTIFY)) && - isc_time_compare(&now, &zone->notifytime) >= 0) { + isc_time_compare(&now, &zone->notifytime) >= 0) + { zone_notify(zone, &now); } default: @@ -10997,7 +10902,8 @@ zone_maintenance(dns_zone_t *zone) case dns_zone_key: if (isc_time_compare(&now, &zone->refreshkeytime) >= 0) { if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED) && - !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_REFRESHING)) { + !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_REFRESHING)) + { zone_refreshkeys(zone); } } @@ -11005,7 +10911,8 @@ zone_maintenance(dns_zone_t *zone) case dns_zone_master: if (!isc_time_isepoch(&zone->refreshkeytime) && isc_time_compare(&now, &zone->refreshkeytime) >= 0 && - zone->rss_event == NULL) { + zone->rss_event == NULL) + { zone_rekey(zone); } default: @@ -11023,20 +10930,24 @@ zone_maintenance(dns_zone_t *zone) break; } if (!isc_time_isepoch(&zone->signingtime) && - isc_time_compare(&now, &zone->signingtime) >= 0) { + isc_time_compare(&now, &zone->signingtime) >= 0) + { zone_sign(zone); } else if (!isc_time_isepoch(&zone->resigntime) && - isc_time_compare(&now, &zone->resigntime) >= 0) { + isc_time_compare(&now, &zone->resigntime) >= 0) + { zone_resigninc(zone); } else if (!isc_time_isepoch(&zone->nsec3chaintime) && - isc_time_compare(&now, &zone->nsec3chaintime) >= 0) { + isc_time_compare(&now, &zone->nsec3chaintime) >= 0) + { zone_nsec3chain(zone); } /* * Do we need to issue a key expiry warning? */ if (!isc_time_isepoch(&zone->keywarntime) && - isc_time_compare(&now, &zone->keywarntime) >= 0) { + isc_time_compare(&now, &zone->keywarntime) >= 0) + { set_key_expiry_warning(zone, zone->key_expiry, isc_time_seconds(&now)); } @@ -11051,11 +10962,10 @@ zone_maintenance(dns_zone_t *zone) } void -dns_zone_markdirty(dns_zone_t *zone) -{ - uint32_t serial; +dns_zone_markdirty(dns_zone_t *zone) { + uint32_t serial; isc_result_t result = ISC_R_SUCCESS; - dns_zone_t * secure = NULL; + dns_zone_t *secure = NULL; /* * Obtaining a lock on the zone->secure (see zone_send_secureserial) @@ -11104,8 +11014,7 @@ again: } void -dns_zone_expire(dns_zone_t *zone) -{ +dns_zone_expire(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -11114,8 +11023,7 @@ dns_zone_expire(dns_zone_t *zone) } static void -zone_expire(dns_zone_t *zone) -{ +zone_expire(dns_zone_t *zone) { dns_db_t *db = NULL; /* @@ -11139,7 +11047,7 @@ zone_expire(dns_zone_t *zone) * the diff automatically. */ if (zone->rpzs != NULL && zone->rpz_num != DNS_RPZ_INVALID_NUM) { - isc_result_t result; + isc_result_t result; dns_rpz_zone_t *rpz = zone->rpzs->zones[zone->rpz_num]; CHECK(dns_db_create(zone->mctx, "rbt", &zone->origin, @@ -11160,12 +11068,11 @@ failure: } void -dns_zone_refresh(dns_zone_t *zone) -{ +dns_zone_refresh(dns_zone_t *zone) { isc_interval_t i; - uint32_t oldflags; - unsigned int j; - isc_result_t result; + uint32_t oldflags; + unsigned int j; + isc_result_t result; REQUIRE(DNS_ZONE_VALID(zone)); @@ -11229,12 +11136,11 @@ unlock: } static void -zone_journal_compact(dns_zone_t *zone, dns_db_t *db, uint32_t serial) -{ - isc_result_t result; - int32_t journalsize; +zone_journal_compact(dns_zone_t *zone, dns_db_t *db, uint32_t serial) { + isc_result_t result; + int32_t journalsize; dns_dbversion_t *ver = NULL; - uint64_t dbsize; + uint64_t dbsize; INSIST(LOCKED_ZONE(zone)); if (inline_raw(zone)) { @@ -11276,10 +11182,9 @@ zone_journal_compact(dns_zone_t *zone, dns_db_t *db, uint32_t serial) } isc_result_t -dns_zone_flush(dns_zone_t *zone) -{ +dns_zone_flush(dns_zone_t *zone) { isc_result_t result = ISC_R_SUCCESS; - bool dumping; + bool dumping; REQUIRE(DNS_ZONE_VALID(zone)); @@ -11300,10 +11205,9 @@ dns_zone_flush(dns_zone_t *zone) } isc_result_t -dns_zone_dump(dns_zone_t *zone) -{ +dns_zone_dump(dns_zone_t *zone) { isc_result_t result = ISC_R_ALREADYRUNNING; - bool dumping; + bool dumping; REQUIRE(DNS_ZONE_VALID(zone)); @@ -11317,8 +11221,7 @@ dns_zone_dump(dns_zone_t *zone) } static void -zone_needdump(dns_zone_t *zone, unsigned int delay) -{ +zone_needdump(dns_zone_t *zone, unsigned int delay) { const char me[] = "zone_needdump"; isc_time_t dumptime; isc_time_t now; @@ -11345,7 +11248,8 @@ zone_needdump(dns_zone_t *zone, unsigned int delay) DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_NEEDDUMP); if (isc_time_isepoch(&zone->dumptime) || - isc_time_compare(&zone->dumptime, &dumptime) > 0) { + isc_time_compare(&zone->dumptime, &dumptime) > 0) + { zone->dumptime = dumptime; } if (zone->task != NULL) { @@ -11354,17 +11258,16 @@ zone_needdump(dns_zone_t *zone, unsigned int delay) } static void -dump_done(void *arg, isc_result_t result) -{ - const char me[] = "dump_done"; - dns_zone_t * zone = arg; - dns_zone_t * secure = NULL; - dns_db_t * db; +dump_done(void *arg, isc_result_t result) { + const char me[] = "dump_done"; + dns_zone_t *zone = arg; + dns_zone_t *secure = NULL; + dns_db_t *db; dns_dbversion_t *version; - bool again = false; - bool compact = false; - uint32_t serial; - isc_result_t tresult; + bool again = false; + bool compact = false; + uint32_t serial; + isc_result_t tresult; REQUIRE(DNS_ZONE_VALID(zone)); @@ -11400,7 +11303,7 @@ dump_done(void *arg, isc_result_t result) * use its serial if it is less than ours. */ if (tresult == ISC_R_SUCCESS && secure != NULL) { - uint32_t sserial; + uint32_t sserial; isc_result_t mresult; ZONEDB_LOCK(&secure->dblock, isc_rwlocktype_read); @@ -11443,7 +11346,8 @@ dump_done(void *arg, isc_result_t result) } else if (result == ISC_R_SUCCESS && DNS_ZONE_FLAG(zone, DNS_ZONEFLG_FLUSH) && DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP) && - DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) { + DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) + { DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_NEEDDUMP); DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_DUMPING); isc_time_settoepoch(&zone->dumptime); @@ -11464,14 +11368,13 @@ dump_done(void *arg, isc_result_t result) } static isc_result_t -zone_dump(dns_zone_t *zone, bool compact) -{ - const char me[] = "zone_dump"; - isc_result_t result; - dns_dbversion_t * version = NULL; - bool again; - dns_db_t * db = NULL; - char * masterfile = NULL; +zone_dump(dns_zone_t *zone, bool compact) { + const char me[] = "zone_dump"; + isc_result_t result; + dns_dbversion_t *version = NULL; + bool again; + dns_db_t *db = NULL; + char *masterfile = NULL; dns_masterformat_t masterformat = dns_masterformat_none; /* @@ -11556,7 +11459,8 @@ fail: zone_needdump(zone, DNS_DUMP_DELAY); } else if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_FLUSH) && DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP) && - DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) { + DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) + { DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_NEEDDUMP); DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_DUMPING); isc_time_settoepoch(&zone->dumptime); @@ -11574,11 +11478,10 @@ fail: static isc_result_t dumptostream(dns_zone_t *zone, FILE *fd, const dns_master_style_t *style, - dns_masterformat_t format, const uint32_t rawversion) -{ - isc_result_t result; - dns_dbversion_t * version = NULL; - dns_db_t * db = NULL; + dns_masterformat_t format, const uint32_t rawversion) { + isc_result_t result; + dns_dbversion_t *version = NULL; + dns_db_t *db = NULL; dns_masterrawheader_t rawdata; REQUIRE(DNS_ZONE_VALID(zone)); @@ -11612,14 +11515,12 @@ dumptostream(dns_zone_t *zone, FILE *fd, const dns_master_style_t *style, isc_result_t dns_zone_dumptostream(dns_zone_t *zone, FILE *fd, dns_masterformat_t format, const dns_master_style_t *style, - const uint32_t rawversion) -{ + const uint32_t rawversion) { return (dumptostream(zone, fd, style, format, rawversion)); } void -dns_zone_unload(dns_zone_t *zone) -{ +dns_zone_unload(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -11628,8 +11529,7 @@ dns_zone_unload(dns_zone_t *zone) } static void -notify_cancel(dns_zone_t *zone) -{ +notify_cancel(dns_zone_t *zone) { dns_notify_t *notify; /* @@ -11639,7 +11539,8 @@ notify_cancel(dns_zone_t *zone) REQUIRE(LOCKED_ZONE(zone)); for (notify = ISC_LIST_HEAD(zone->notifies); notify != NULL; - notify = ISC_LIST_NEXT(notify, link)) { + notify = ISC_LIST_NEXT(notify, link)) + { if (notify->find != NULL) { dns_adb_cancelfind(notify->find); } @@ -11650,8 +11551,7 @@ notify_cancel(dns_zone_t *zone) } static void -forward_cancel(dns_zone_t *zone) -{ +forward_cancel(dns_zone_t *zone) { dns_forward_t *forward; /* @@ -11661,7 +11561,8 @@ forward_cancel(dns_zone_t *zone) REQUIRE(LOCKED_ZONE(zone)); for (forward = ISC_LIST_HEAD(zone->forwards); forward != NULL; - forward = ISC_LIST_NEXT(forward, link)) { + forward = ISC_LIST_NEXT(forward, link)) + { if (forward->request != NULL) { dns_request_cancel(forward->request); } @@ -11669,8 +11570,7 @@ forward_cancel(dns_zone_t *zone) } static void -zone_unload(dns_zone_t *zone) -{ +zone_unload(dns_zone_t *zone) { /* * 'zone' locked by caller. */ @@ -11678,7 +11578,8 @@ zone_unload(dns_zone_t *zone) REQUIRE(LOCKED_ZONE(zone)); if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_FLUSH) || - !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING)) { + !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING)) + { if (zone->writeio != NULL) { zonemgr_cancelio(zone->writeio); } @@ -11701,8 +11602,7 @@ zone_unload(dns_zone_t *zone) } void -dns_zone_setminrefreshtime(dns_zone_t *zone, uint32_t val) -{ +dns_zone_setminrefreshtime(dns_zone_t *zone, uint32_t val) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(val > 0); @@ -11710,8 +11610,7 @@ dns_zone_setminrefreshtime(dns_zone_t *zone, uint32_t val) } void -dns_zone_setmaxrefreshtime(dns_zone_t *zone, uint32_t val) -{ +dns_zone_setmaxrefreshtime(dns_zone_t *zone, uint32_t val) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(val > 0); @@ -11719,8 +11618,7 @@ dns_zone_setmaxrefreshtime(dns_zone_t *zone, uint32_t val) } void -dns_zone_setminretrytime(dns_zone_t *zone, uint32_t val) -{ +dns_zone_setminretrytime(dns_zone_t *zone, uint32_t val) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(val > 0); @@ -11728,8 +11626,7 @@ dns_zone_setminretrytime(dns_zone_t *zone, uint32_t val) } void -dns_zone_setmaxretrytime(dns_zone_t *zone, uint32_t val) -{ +dns_zone_setmaxretrytime(dns_zone_t *zone, uint32_t val) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(val > 0); @@ -11737,16 +11634,14 @@ dns_zone_setmaxretrytime(dns_zone_t *zone, uint32_t val) } uint32_t -dns_zone_getmaxrecords(dns_zone_t *zone) -{ +dns_zone_getmaxrecords(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->maxrecords); } void -dns_zone_setmaxrecords(dns_zone_t *zone, uint32_t val) -{ +dns_zone_setmaxrecords(dns_zone_t *zone, uint32_t val) { REQUIRE(DNS_ZONE_VALID(zone)); zone->maxrecords = val; @@ -11754,23 +11649,25 @@ dns_zone_setmaxrecords(dns_zone_t *zone, uint32_t val) static bool notify_isqueued(dns_zone_t *zone, unsigned int flags, dns_name_t *name, - isc_sockaddr_t *addr, dns_tsigkey_t *key) -{ - dns_notify_t * notify; + isc_sockaddr_t *addr, dns_tsigkey_t *key) { + dns_notify_t *notify; dns_zonemgr_t *zmgr; - isc_result_t result; + isc_result_t result; for (notify = ISC_LIST_HEAD(zone->notifies); notify != NULL; - notify = ISC_LIST_NEXT(notify, link)) { + notify = ISC_LIST_NEXT(notify, link)) + { if (notify->request != NULL) { continue; } if (name != NULL && dns_name_dynamic(¬ify->ns) && - dns_name_equal(name, ¬ify->ns)) { + dns_name_equal(name, ¬ify->ns)) + { goto requeue; } if (addr != NULL && isc_sockaddr_equal(addr, ¬ify->dst) && - notify->key == key) { + notify->key == key) + { goto requeue; } } @@ -11783,7 +11680,8 @@ requeue: * ratelimiter. */ if (notify->event != NULL && (flags & DNS_NOTIFY_STARTUP) == 0 && - (notify->flags & DNS_NOTIFY_STARTUP) != 0) { + (notify->flags & DNS_NOTIFY_STARTUP) != 0) + { zmgr = notify->zone->zmgr; result = isc_ratelimiter_dequeue(zmgr->startupnotifyrl, notify->event); @@ -11805,14 +11703,13 @@ requeue: } static bool -notify_isself(dns_zone_t *zone, isc_sockaddr_t *dst) -{ +notify_isself(dns_zone_t *zone, isc_sockaddr_t *dst) { dns_tsigkey_t *key = NULL; isc_sockaddr_t src; isc_sockaddr_t any; - bool isself; - isc_netaddr_t dstaddr; - isc_result_t result; + bool isself; + isc_netaddr_t dstaddr; + isc_result_t result; if (zone->view == NULL || zone->isself == NULL) { return (false); @@ -11853,8 +11750,7 @@ notify_isself(dns_zone_t *zone, isc_sockaddr_t *dst) } static void -notify_destroy(dns_notify_t *notify, bool locked) -{ +notify_destroy(dns_notify_t *notify, bool locked) { isc_mem_t *mctx; REQUIRE(DNS_NOTIFY_VALID(notify)); @@ -11894,8 +11790,7 @@ notify_destroy(dns_notify_t *notify, bool locked) } static isc_result_t -notify_create(isc_mem_t *mctx, unsigned int flags, dns_notify_t **notifyp) -{ +notify_create(isc_mem_t *mctx, unsigned int flags, dns_notify_t **notifyp) { dns_notify_t *notify; REQUIRE(notifyp != NULL && *notifyp == NULL); @@ -11922,9 +11817,8 @@ notify_create(isc_mem_t *mctx, unsigned int flags, dns_notify_t **notifyp) * XXXAG should check for DNS_ZONEFLG_EXITING */ static void -process_adb_event(isc_task_t *task, isc_event_t *ev) -{ - dns_notify_t * notify; +process_adb_event(isc_task_t *task, isc_event_t *ev) { + dns_notify_t *notify; isc_eventtype_t result; UNUSED(task); @@ -11948,8 +11842,7 @@ process_adb_event(isc_task_t *task, isc_event_t *ev) } static void -notify_find_address(dns_notify_t *notify) -{ +notify_find_address(dns_notify_t *notify) { isc_result_t result; unsigned int options; @@ -11986,8 +11879,7 @@ destroy: } static isc_result_t -notify_send_queue(dns_notify_t *notify, bool startup) -{ +notify_send_queue(dns_notify_t *notify, bool startup) { isc_event_t *e; isc_result_t result; @@ -12011,19 +11903,18 @@ notify_send_queue(dns_notify_t *notify, bool startup) } static void -notify_send_toaddr(isc_task_t *task, isc_event_t *event) -{ - dns_notify_t * notify; - isc_result_t result; +notify_send_toaddr(isc_task_t *task, isc_event_t *event) { + dns_notify_t *notify; + isc_result_t result; dns_message_t *message = NULL; - isc_netaddr_t dstip; + isc_netaddr_t dstip; dns_tsigkey_t *key = NULL; - char addrbuf[ISC_SOCKADDR_FORMATSIZE]; + char addrbuf[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_t src; - unsigned int options, timeout; - bool have_notifysource = false; - bool have_notifydscp = false; - isc_dscp_t dscp = -1; + unsigned int options, timeout; + bool have_notifysource = false; + bool have_notifydscp = false; + isc_dscp_t dscp = -1; notify = event->ev_arg; REQUIRE(DNS_NOTIFY_VALID(notify)); @@ -12041,8 +11932,8 @@ notify_send_toaddr(isc_task_t *task, isc_event_t *event) if ((event->ev_attributes & ISC_EVENTATTR_CANCELED) != 0 || DNS_ZONE_FLAG(notify->zone, DNS_ZONEFLG_EXITING) || - notify->zone->view->requestmgr == NULL || - notify->zone->db == NULL) { + notify->zone->view->requestmgr == NULL || notify->zone->db == NULL) + { result = ISC_R_CANCELED; goto cleanup; } @@ -12052,7 +11943,8 @@ notify_send_toaddr(isc_task_t *task, isc_event_t *event) * mapped form. */ if (isc_sockaddr_pf(¬ify->dst) == PF_INET6 && - IN6_IS_ADDR_V4MAPPED(¬ify->dst.type.sin6.sin6_addr)) { + IN6_IS_ADDR_V4MAPPED(¬ify->dst.type.sin6.sin6_addr)) + { isc_sockaddr_format(¬ify->dst, addrbuf, sizeof(addrbuf)); notify_log(notify->zone, ISC_LOG_DEBUG(3), "notify: ignoring IPv6 mapped IPV4 address: %s", @@ -12097,7 +11989,7 @@ notify_send_toaddr(isc_task_t *task, isc_event_t *event) options = 0; if (notify->zone->view->peers != NULL) { dns_peer_t *peer = NULL; - bool usetcp = false; + bool usetcp = false; result = dns_peerlist_peerbyaddr(notify->zone->view->peers, &dstip, &peer); if (result == ISC_R_SUCCESS) { @@ -12169,14 +12061,13 @@ cleanup: } static void -notify_send(dns_notify_t *notify) -{ +notify_send(dns_notify_t *notify) { dns_adbaddrinfo_t *ai; - isc_sockaddr_t dst; - isc_result_t result; - dns_notify_t * newnotify = NULL; - unsigned int flags; - bool startup; + isc_sockaddr_t dst; + isc_result_t result; + dns_notify_t *newnotify = NULL; + unsigned int flags; + bool startup; /* * Zone lock held by caller. @@ -12189,7 +12080,8 @@ notify_send(dns_notify_t *notify) } for (ai = ISC_LIST_HEAD(notify->find->list); ai != NULL; - ai = ISC_LIST_NEXT(ai, publink)) { + ai = ISC_LIST_NEXT(ai, publink)) + { dst = ai->sockaddr; if (notify_isqueued(notify->zone, notify->flags, NULL, &dst, NULL)) { @@ -12222,8 +12114,7 @@ cleanup: } void -dns_zone_notify(dns_zone_t *zone) -{ +dns_zone_notify(dns_zone_t *zone) { isc_time_t now; REQUIRE(DNS_ZONE_VALID(zone)); @@ -12237,27 +12128,26 @@ dns_zone_notify(dns_zone_t *zone) } static void -zone_notify(dns_zone_t *zone, isc_time_t *now) -{ - dns_dbnode_t * node = NULL; - dns_db_t * zonedb = NULL; +zone_notify(dns_zone_t *zone, isc_time_t *now) { + dns_dbnode_t *node = NULL; + dns_db_t *zonedb = NULL; dns_dbversion_t *version = NULL; - dns_name_t * origin = NULL; - dns_name_t master; - dns_rdata_ns_t ns; - dns_rdata_soa_t soa; - uint32_t serial; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdataset_t nsrdset; - dns_rdataset_t soardset; - isc_result_t result; - unsigned int i; - isc_sockaddr_t dst; - bool isqueued; + dns_name_t *origin = NULL; + dns_name_t master; + dns_rdata_ns_t ns; + dns_rdata_soa_t soa; + uint32_t serial; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdataset_t nsrdset; + dns_rdataset_t soardset; + isc_result_t result; + unsigned int i; + isc_sockaddr_t dst; + bool isqueued; dns_notifytype_t notifytype; - unsigned int flags = 0; - bool loggednotify = false; - bool startup; + unsigned int flags = 0; + bool loggednotify = false; + bool startup; REQUIRE(DNS_ZONE_VALID(zone)); @@ -12270,7 +12160,8 @@ zone_notify(dns_zone_t *zone, isc_time_t *now) UNLOCK_ZONE(zone); if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_EXITING) || - !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) { + !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) + { return; } @@ -12346,7 +12237,7 @@ zone_notify(dns_zone_t *zone, isc_time_t *now) LOCK_ZONE(zone); for (i = 0; i < zone->notifycnt; i++) { dns_tsigkey_t *key = NULL; - dns_notify_t * notify = NULL; + dns_notify_t *notify = NULL; if ((zone->notifykeynames != NULL) && (zone->notifykeynames[i] != NULL)) { @@ -12422,7 +12313,8 @@ zone_notify(dns_zone_t *zone, isc_time_t *now) * configured to do so. */ if (!DNS_ZONE_OPTION(zone, DNS_ZONEOPT_NOTIFYTOSOA) && - dns_name_compare(&master, &ns.name) == 0) { + dns_name_compare(&master, &ns.name) == 0) + { result = dns_rdataset_next(&nsrdset); continue; } @@ -12471,14 +12363,13 @@ cleanup1: static inline isc_result_t save_nsrrset(dns_message_t *message, dns_name_t *name, dns_db_t *db, - dns_dbversion_t *version) -{ + dns_dbversion_t *version) { dns_rdataset_t *nsrdataset = NULL; dns_rdataset_t *rdataset = NULL; - dns_dbnode_t * node = NULL; - dns_rdata_ns_t ns; - isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_dbnode_t *node = NULL; + dns_rdata_ns_t ns; + isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; /* * Extract NS RRset from message. @@ -12506,7 +12397,8 @@ save_nsrrset(dns_message_t *message, dns_name_t *name, dns_db_t *db, * Add glue rdatasets. */ for (result = dns_rdataset_first(nsrdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(nsrdataset)) { + result = dns_rdataset_next(nsrdataset)) + { dns_rdataset_current(nsrdataset, &rdata); result = dns_rdata_tostruct(&rdata, &ns, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); @@ -12559,21 +12451,20 @@ fail: } static void -stub_callback(isc_task_t *task, isc_event_t *event) -{ - const char me[] = "stub_callback"; +stub_callback(isc_task_t *task, isc_event_t *event) { + const char me[] = "stub_callback"; dns_requestevent_t *revent = (dns_requestevent_t *)event; - dns_stub_t * stub = NULL; - dns_message_t * msg = NULL; - dns_zone_t * zone = NULL; - char master[ISC_SOCKADDR_FORMATSIZE]; - char source[ISC_SOCKADDR_FORMATSIZE]; - uint32_t nscnt, cnamecnt, refresh, retry, expire; - isc_result_t result; - isc_time_t now; - bool exiting = false; - isc_interval_t i; - unsigned int j, soacount; + dns_stub_t *stub = NULL; + dns_message_t *msg = NULL; + dns_zone_t *zone = NULL; + char master[ISC_SOCKADDR_FORMATSIZE]; + char source[ISC_SOCKADDR_FORMATSIZE]; + uint32_t nscnt, cnamecnt, refresh, retry, expire; + isc_result_t result; + isc_time_t now; + bool exiting = false; + isc_interval_t i; + unsigned int j, soacount; stub = revent->ev_arg; INSIST(DNS_STUB_VALID(stub)); @@ -12599,7 +12490,8 @@ stub_callback(isc_task_t *task, isc_event_t *event) if (revent->result != ISC_R_SUCCESS) { if (revent->result == ISC_R_TIMEDOUT && - !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NOEDNS)) { + !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NOEDNS)) + { DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_NOEDNS); dns_zone_log(zone, ISC_LOG_DEBUG(1), "refreshing stub: timeout retrying " @@ -12630,7 +12522,7 @@ stub_callback(isc_task_t *task, isc_event_t *event) * Unexpected rcode. */ if (msg->rcode != dns_rcode_noerror) { - char rcode[128]; + char rcode[128]; isc_buffer_t rb; isc_buffer_init(&rb, rcode, sizeof(rcode)); @@ -12639,7 +12531,8 @@ stub_callback(isc_task_t *task, isc_event_t *event) if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NOEDNS) && (msg->rcode == dns_rcode_servfail || msg->rcode == dns_rcode_notimp || - msg->rcode == dns_rcode_formerr)) { + msg->rcode == dns_rcode_formerr)) + { dns_zone_log(zone, ISC_LOG_DEBUG(1), "refreshing stub: rcode (%.*s) retrying " "without EDNS master %s (source %s)", @@ -12727,8 +12620,8 @@ stub_callback(isc_task_t *task, isc_event_t *event) result = zone_get_from_db(zone, zone->db, NULL, &soacount, NULL, &refresh, &retry, &expire, NULL, NULL); if (result == ISC_R_SUCCESS && soacount > 0U) { - zone->refresh = - RANGE(refresh, zone->minrefresh, zone->maxrefresh); + zone->refresh = RANGE(refresh, zone->minrefresh, + zone->maxrefresh); zone->retry = RANGE(retry, zone->minretry, zone->maxretry); zone->expire = RANGE(expire, zone->refresh + zone->retry, DNS_MAX_EXPIRE); @@ -12778,7 +12671,8 @@ next_master: bool done = true; if (!exiting && DNS_ZONE_OPTION(zone, DNS_ZONEOPT_USEALTXFRSRC) && - !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_USEALTXFRSRC)) { + !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_USEALTXFRSRC)) + { /* * Did we get a good answer from all the masters? */ @@ -12841,14 +12735,13 @@ done: * expire to be not more than it. */ static void -get_edns_expire(dns_zone_t *zone, dns_message_t *message, uint32_t *expirep) -{ +get_edns_expire(dns_zone_t *zone, dns_message_t *message, uint32_t *expirep) { isc_result_t result; - uint32_t expire; - dns_rdata_t rdata = DNS_RDATA_INIT; + uint32_t expire; + dns_rdata_t rdata = DNS_RDATA_INIT; isc_buffer_t optbuf; - uint16_t optcode; - uint16_t optlen; + uint16_t optcode; + uint16_t optlen; REQUIRE(expirep != NULL); REQUIRE(message != NULL); @@ -12890,10 +12783,9 @@ get_edns_expire(dns_zone_t *zone, dns_message_t *message, uint32_t *expirep) * Set the file modification time zone->expire seconds before expiretime. */ static void -setmodtime(dns_zone_t *zone, isc_time_t *expiretime) -{ - isc_result_t result; - isc_time_t when; +setmodtime(dns_zone_t *zone, isc_time_t *expiretime) { + isc_result_t result; + isc_time_t when; isc_interval_t i; isc_interval_set(&i, zone->expire, 0); @@ -12908,7 +12800,8 @@ setmodtime(dns_zone_t *zone, isc_time_t *expiretime) } if (result == ISC_R_SUCCESS && !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP) && - !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP)) { + !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP)) + { result = isc_file_settime(zone->masterfile, &when); } else if (result != ISC_R_SUCCESS) { result = isc_file_settime(zone->masterfile, &when); @@ -12931,23 +12824,22 @@ setmodtime(dns_zone_t *zone, isc_time_t *expiretime) * An SOA query has finished (successfully or not). */ static void -refresh_callback(isc_task_t *task, isc_event_t *event) -{ - const char me[] = "refresh_callback"; +refresh_callback(isc_task_t *task, isc_event_t *event) { + const char me[] = "refresh_callback"; dns_requestevent_t *revent = (dns_requestevent_t *)event; - dns_zone_t * zone; - dns_message_t * msg = NULL; - uint32_t soacnt, cnamecnt, soacount, nscount; - isc_time_t now; - char master[ISC_SOCKADDR_FORMATSIZE]; - char source[ISC_SOCKADDR_FORMATSIZE]; - dns_rdataset_t * rdataset = NULL; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdata_soa_t soa; - isc_result_t result; - uint32_t serial, oldserial = 0; - unsigned int j; - bool do_queue_xfrin = false; + dns_zone_t *zone; + dns_message_t *msg = NULL; + uint32_t soacnt, cnamecnt, soacount, nscount; + isc_time_t now; + char master[ISC_SOCKADDR_FORMATSIZE]; + char source[ISC_SOCKADDR_FORMATSIZE]; + dns_rdataset_t *rdataset = NULL; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_soa_t soa; + isc_result_t result; + uint32_t serial, oldserial = 0; + unsigned int j; + bool do_queue_xfrin = false; zone = revent->ev_arg; INSIST(DNS_ZONE_VALID(zone)); @@ -12975,7 +12867,8 @@ refresh_callback(isc_task_t *task, isc_event_t *event) if (revent->result != ISC_R_SUCCESS) { if (revent->result == ISC_R_TIMEDOUT && - !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NOEDNS)) { + !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NOEDNS)) + { DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_NOEDNS); dns_zone_log(zone, ISC_LOG_DEBUG(1), "refresh: timeout retrying without EDNS " @@ -12993,10 +12886,12 @@ refresh_callback(isc_task_t *task, isc_event_t *event) if ((zone->type == dns_zone_slave || zone->type == dns_zone_mirror || zone->type == dns_zone_redirect) && - DNS_ZONE_OPTION(zone, DNS_ZONEOPT_TRYTCPREFRESH)) { + DNS_ZONE_OPTION(zone, DNS_ZONEOPT_TRYTCPREFRESH)) + { if (!dns_zonemgr_unreachable( zone->zmgr, &zone->masteraddr, - &zone->sourceaddr, &now)) { + &zone->sourceaddr, &now)) + { DNS_ZONE_SETFLAG( zone, DNS_ZONEFLG_SOABEFOREAXFR); @@ -13035,7 +12930,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) * Unexpected rcode. */ if (msg->rcode != dns_rcode_noerror) { - char rcode[128]; + char rcode[128]; isc_buffer_t rb; isc_buffer_init(&rb, rcode, sizeof(rcode)); @@ -13044,7 +12939,8 @@ refresh_callback(isc_task_t *task, isc_event_t *event) if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NOEDNS) && (msg->rcode == dns_rcode_servfail || msg->rcode == dns_rcode_notimp || - msg->rcode == dns_rcode_formerr)) { + msg->rcode == dns_rcode_formerr)) + { dns_zone_log(zone, ISC_LOG_DEBUG(1), "refresh: rcode (%.*s) retrying without " "EDNS master %s (source %s)", @@ -13071,7 +12967,8 @@ refresh_callback(isc_task_t *task, isc_event_t *event) if (msg->rcode == dns_rcode_refused && (zone->type == dns_zone_slave || zone->type == dns_zone_mirror || - zone->type == dns_zone_redirect)) { + zone->type == dns_zone_redirect)) + { goto tcp_transfer; } goto next_master; @@ -13083,7 +12980,8 @@ refresh_callback(isc_task_t *task, isc_event_t *event) if ((msg->flags & DNS_MESSAGEFLAG_TC) != 0) { if (zone->type == dns_zone_slave || zone->type == dns_zone_mirror || - zone->type == dns_zone_redirect) { + zone->type == dns_zone_redirect) + { dns_zone_log(zone, ISC_LOG_INFO, "refresh: truncated UDP answer, " "initiating TCP zone xfer " @@ -13208,9 +13106,11 @@ refresh_callback(isc_task_t *task, isc_event_t *event) if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED) || DNS_ZONE_FLAG(zone, DNS_ZONEFLG_FORCEXFER) || - isc_serial_gt(serial, oldserial)) { + isc_serial_gt(serial, oldserial)) + { if (dns_zonemgr_unreachable(zone->zmgr, &zone->masteraddr, - &zone->sourceaddr, &now)) { + &zone->sourceaddr, &now)) + { dns_zone_log(zone, ISC_LOG_INFO, "refresh: skipping %s as master %s " "(source %s) is unreachable (cached)", @@ -13227,7 +13127,8 @@ refresh_callback(isc_task_t *task, isc_event_t *event) dns_request_destroy(&zone->request); if (zone->type == dns_zone_slave || zone->type == dns_zone_mirror || - zone->type == dns_zone_redirect) { + zone->type == dns_zone_redirect) + { do_queue_xfrin = true; } else { INSIST(zone->type == dns_zone_stub); @@ -13238,7 +13139,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) } } else if (isc_serial_eq(soa.serial, oldserial)) { isc_time_t expiretime; - uint32_t expire; + uint32_t expire; /* * Compute the new expire time based on this response. @@ -13294,7 +13195,8 @@ next_master: if (zone->curmaster >= zone->masterscnt) { bool done = true; if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_USEALTXFRSRC) && - !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_USEALTXFRSRC)) { + !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_USEALTXFRSRC)) + { /* * Did we get a good answer from all the masters? */ @@ -13353,11 +13255,10 @@ detach: } static void -queue_soa_query(dns_zone_t *zone) -{ - const char me[] = "queue_soa_query"; +queue_soa_query(dns_zone_t *zone) { + const char me[] = "queue_soa_query"; isc_event_t *e; - dns_zone_t * dummy = NULL; + dns_zone_t *dummy = NULL; isc_result_t result; ENTER; @@ -13391,12 +13292,12 @@ queue_soa_query(dns_zone_t *zone) } static inline isc_result_t -create_query(dns_zone_t *zone, dns_rdatatype_t rdtype, dns_message_t **messagep) -{ - dns_message_t * message = NULL; - dns_name_t * qname = NULL; +create_query(dns_zone_t *zone, dns_rdatatype_t rdtype, + dns_message_t **messagep) { + dns_message_t *message = NULL; + dns_name_t *qname = NULL; dns_rdataset_t *qrdataset = NULL; - isc_result_t result; + isc_result_t result; result = dns_message_create(zone->mctx, DNS_MESSAGE_INTENTRENDER, &message); @@ -13443,12 +13344,12 @@ cleanup: } static isc_result_t -add_opt(dns_message_t *message, uint16_t udpsize, bool reqnsid, bool reqexpire) -{ - isc_result_t result; +add_opt(dns_message_t *message, uint16_t udpsize, bool reqnsid, + bool reqexpire) { + isc_result_t result; dns_rdataset_t *rdataset = NULL; - dns_ednsopt_t ednsopts[DNS_EDNSOPTIONS]; - int count = 0; + dns_ednsopt_t ednsopts[DNS_EDNSOPTIONS]; + int count = 0; /* Set EDNS options if applicable */ if (reqnsid) { @@ -13475,21 +13376,20 @@ add_opt(dns_message_t *message, uint16_t udpsize, bool reqnsid, bool reqexpire) } static void -soa_query(isc_task_t *task, isc_event_t *event) -{ - const char me[] = "soa_query"; - isc_result_t result = ISC_R_FAILURE; +soa_query(isc_task_t *task, isc_event_t *event) { + const char me[] = "soa_query"; + isc_result_t result = ISC_R_FAILURE; dns_message_t *message = NULL; - dns_zone_t * zone = event->ev_arg; - dns_zone_t * dummy = NULL; - isc_netaddr_t masterip; + dns_zone_t *zone = event->ev_arg; + dns_zone_t *dummy = NULL; + isc_netaddr_t masterip; dns_tsigkey_t *key = NULL; - uint32_t options; - bool cancel = true; - int timeout; - bool have_xfrsource, have_xfrdscp, reqnsid, reqexpire; - uint16_t udpsize = SEND_BUFFER_SIZE; - isc_dscp_t dscp = -1; + uint32_t options; + bool cancel = true; + int timeout; + bool have_xfrsource, have_xfrdscp, reqnsid, reqexpire; + uint16_t udpsize = SEND_BUFFER_SIZE; + isc_dscp_t dscp = -1; REQUIRE(DNS_ZONE_VALID(zone)); @@ -13500,7 +13400,8 @@ soa_query(isc_task_t *task, isc_event_t *event) LOCK_ZONE(zone); if (((event->ev_attributes & ISC_EVENTATTR_CANCELED) != 0) || DNS_ZONE_FLAG(zone, DNS_ZONEFLG_EXITING) || - zone->view->requestmgr == NULL) { + zone->view->requestmgr == NULL) + { if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_EXITING)) { cancel = false; } @@ -13524,7 +13425,8 @@ again: * try for a server key. */ if ((zone->masterkeynames != NULL) && - (zone->masterkeynames[zone->curmaster] != NULL)) { + (zone->masterkeynames[zone->curmaster] != NULL)) + { dns_view_t *view = dns_zone_getview(zone); dns_name_t *keyname = zone->masterkeynames[zone->curmaster]; result = dns_view_gettsig(view, keyname, &key); @@ -13554,7 +13456,7 @@ again: reqexpire = zone->requestexpire; if (zone->view->peers != NULL) { dns_peer_t *peer = NULL; - bool edns, usetcp; + bool edns, usetcp; result = dns_peerlist_peerbyaddr(zone->view->peers, &masterip, &peer); if (result == ISC_R_SUCCESS) { @@ -13696,19 +13598,18 @@ skip_master: } static void -ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) -{ - const char me[] = "ns_query"; - isc_result_t result; +ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) { + const char me[] = "ns_query"; + isc_result_t result; dns_message_t *message = NULL; - isc_netaddr_t masterip; + isc_netaddr_t masterip; dns_tsigkey_t *key = NULL; - dns_dbnode_t * node = NULL; - int timeout; - bool have_xfrsource = false, have_xfrdscp = false; - bool reqnsid; - uint16_t udpsize = SEND_BUFFER_SIZE; - isc_dscp_t dscp = -1; + dns_dbnode_t *node = NULL; + int timeout; + bool have_xfrsource = false, have_xfrdscp = false; + bool reqnsid; + uint16_t udpsize = SEND_BUFFER_SIZE; + isc_dscp_t dscp = -1; REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(LOCKED_ZONE(zone)); @@ -13808,7 +13709,8 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) * try for a server key. */ if ((zone->masterkeynames != NULL) && - (zone->masterkeynames[zone->curmaster] != NULL)) { + (zone->masterkeynames[zone->curmaster] != NULL)) + { dns_view_t *view = dns_zone_getview(zone); dns_name_t *keyname = zone->masterkeynames[zone->curmaster]; result = dns_view_gettsig(view, keyname, &key); @@ -13826,7 +13728,7 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) reqnsid = zone->view->requestnsid; if (zone->view->peers != NULL) { dns_peer_t *peer = NULL; - bool edns; + bool edns; result = dns_peerlist_peerbyaddr(zone->view->peers, &masterip, &peer); if (result == ISC_R_SUCCESS) { @@ -13939,10 +13841,9 @@ unlock: * to shut down, it is not a shutdown event in the sense of the task library. */ static void -zone_shutdown(isc_task_t *task, isc_event_t *event) -{ +zone_shutdown(isc_task_t *task, isc_event_t *event) { dns_zone_t *zone = (dns_zone_t *)event->ev_arg; - bool free_needed, linked = false; + bool free_needed, linked = false; dns_zone_t *raw = NULL, *secure = NULL; UNUSED(task); @@ -14012,7 +13913,8 @@ zone_shutdown(isc_task_t *task, isc_event_t *event) } if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_FLUSH) || - !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING)) { + !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING)) + { if (zone->writeio != NULL) { zonemgr_cancelio(zone->writeio); } @@ -14059,9 +13961,8 @@ zone_shutdown(isc_task_t *task, isc_event_t *event) } static void -zone_timer(isc_task_t *task, isc_event_t *event) -{ - const char me[] = "zone_timer"; +zone_timer(isc_task_t *task, isc_event_t *event) { + const char me[] = "zone_timer"; dns_zone_t *zone = (dns_zone_t *)event->ev_arg; UNUSED(task); @@ -14075,10 +13976,9 @@ zone_timer(isc_task_t *task, isc_event_t *event) } static void -zone_settimer(dns_zone_t *zone, isc_time_t *now) -{ - const char me[] = "zone_settimer"; - isc_time_t next; +zone_settimer(dns_zone_t *zone, isc_time_t *now) { + const char me[] = "zone_settimer"; + isc_time_t next; isc_result_t result; REQUIRE(DNS_ZONE_VALID(zone)); @@ -14100,11 +14000,13 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) case dns_zone_master: if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDNOTIFY) || - DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDSTARTUPNOTIFY)) { + DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDSTARTUPNOTIFY)) + { next = zone->notifytime; } if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP) && - !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING)) { + !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING)) + { INSIST(!isc_time_isepoch(&zone->dumptime)); if (isc_time_isepoch(&next) || isc_time_compare(&zone->dumptime, &next) < 0) { @@ -14115,10 +14017,11 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) break; } if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_REFRESHING) && - !isc_time_isepoch(&zone->refreshkeytime)) { + !isc_time_isepoch(&zone->refreshkeytime)) + { if (isc_time_isepoch(&next) || - isc_time_compare(&zone->refreshkeytime, &next) < - 0) { + isc_time_compare(&zone->refreshkeytime, &next) < 0) + { next = zone->refreshkeytime; } } @@ -14142,8 +14045,8 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) } if (!isc_time_isepoch(&zone->nsec3chaintime)) { if (isc_time_isepoch(&next) || - isc_time_compare(&zone->nsec3chaintime, &next) < - 0) { + isc_time_compare(&zone->nsec3chaintime, &next) < 0) + { next = zone->nsec3chaintime; } } @@ -14153,7 +14056,8 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) case dns_zone_mirror: treat_as_slave: if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDNOTIFY) || - DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDSTARTUPNOTIFY)) { + DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDSTARTUPNOTIFY)) + { next = zone->notifytime; } /* FALLTHROUGH */ @@ -14166,18 +14070,21 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADPENDING) && !isc_time_isepoch(&zone->refreshtime) && (isc_time_isepoch(&next) || - isc_time_compare(&zone->refreshtime, &next) < 0)) { + isc_time_compare(&zone->refreshtime, &next) < 0)) + { next = zone->refreshtime; } if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED) && - !isc_time_isepoch(&zone->expiretime)) { + !isc_time_isepoch(&zone->expiretime)) + { if (isc_time_isepoch(&next) || isc_time_compare(&zone->expiretime, &next) < 0) { next = zone->expiretime; } } if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP) && - !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING)) { + !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING)) + { INSIST(!isc_time_isepoch(&zone->dumptime)); if (isc_time_isepoch(&next) || isc_time_compare(&zone->dumptime, &next) < 0) { @@ -14188,7 +14095,8 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) case dns_zone_key: if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP) && - !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING)) { + !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING)) + { INSIST(!isc_time_isepoch(&zone->dumptime)); if (isc_time_isepoch(&next) || isc_time_compare(&zone->dumptime, &next) < 0) { @@ -14199,7 +14107,8 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) if (isc_time_isepoch(&next) || (!isc_time_isepoch(&zone->refreshkeytime) && isc_time_compare(&zone->refreshkeytime, &next) < - 0)) { + 0)) + { next = zone->refreshkeytime; } } @@ -14233,8 +14142,7 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) } static void -cancel_refresh(dns_zone_t *zone) -{ +cancel_refresh(dns_zone_t *zone) { const char me[] = "cancel_refresh"; isc_time_t now; @@ -14254,22 +14162,21 @@ cancel_refresh(dns_zone_t *zone) static isc_result_t notify_createmessage(dns_zone_t *zone, unsigned int flags, - dns_message_t **messagep) -{ - dns_db_t * zonedb = NULL; - dns_dbnode_t * node = NULL; + dns_message_t **messagep) { + dns_db_t *zonedb = NULL; + dns_dbnode_t *node = NULL; dns_dbversion_t *version = NULL; - dns_message_t * message = NULL; - dns_rdataset_t rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_message_t *message = NULL; + dns_rdataset_t rdataset; + dns_rdata_t rdata = DNS_RDATA_INIT; - dns_name_t * tempname = NULL; - dns_rdata_t * temprdata = NULL; + dns_name_t *tempname = NULL; + dns_rdata_t *temprdata = NULL; dns_rdatalist_t *temprdatalist = NULL; - dns_rdataset_t * temprdataset = NULL; + dns_rdataset_t *temprdataset = NULL; - isc_result_t result; - isc_region_t r; + isc_result_t result; + isc_region_t r; isc_buffer_t *b = NULL; REQUIRE(DNS_ZONE_VALID(zone)); @@ -14421,19 +14328,18 @@ cleanup: isc_result_t dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, - isc_sockaddr_t *to, dns_message_t *msg) -{ - unsigned int i; - dns_rdata_soa_t soa; - dns_rdataset_t * rdataset = NULL; - dns_rdata_t rdata = DNS_RDATA_INIT; - isc_result_t result; - char fromtext[ISC_SOCKADDR_FORMATSIZE]; - int match = 0; - isc_netaddr_t netaddr; - uint32_t serial = 0; - bool have_serial = false; - dns_tsigkey_t * tsigkey; + isc_sockaddr_t *to, dns_message_t *msg) { + unsigned int i; + dns_rdata_soa_t soa; + dns_rdataset_t *rdataset = NULL; + dns_rdata_t rdata = DNS_RDATA_INIT; + isc_result_t result; + char fromtext[ISC_SOCKADDR_FORMATSIZE]; + int match = 0; + isc_netaddr_t netaddr; + uint32_t serial = 0; + bool have_serial = false; + dns_tsigkey_t *tsigkey; const dns_name_t *tsig; REQUIRE(DNS_ZONE_VALID(zone)); @@ -14481,7 +14387,8 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, if (msg->counts[DNS_SECTION_QUESTION] == 0 || dns_message_findname(msg, DNS_SECTION_QUESTION, &zone->origin, dns_rdatatype_soa, dns_rdatatype_none, NULL, - NULL) != ISC_R_SUCCESS) { + NULL) != ISC_R_SUCCESS) + { UNLOCK_ZONE(zone); if (msg->counts[DNS_SECTION_QUESTION] == 0) { dns_zone_log(zone, ISC_LOG_NOTICE, @@ -14510,7 +14417,8 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, } if (zone->view->aclenv.match_mapped && IN6_IS_ADDR_V4MAPPED(&from->type.sin6.sin6_addr) && - isc_sockaddr_pf(&zone->masters[i]) == AF_INET) { + isc_sockaddr_pf(&zone->masters[i]) == AF_INET) + { isc_netaddr_t na1, na2; isc_netaddr_fromv4mapped(&na1, &netaddr); isc_netaddr_fromsockaddr(&na2, &zone->masters[i]); @@ -14530,7 +14438,8 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, (dns_acl_match(&netaddr, tsig, zone->notify_acl, &zone->view->aclenv, &match, NULL) == ISC_R_SUCCESS) && - match > 0) { + match > 0) + { /* Accept notify. */ } else if (i >= zone->masterscnt) { UNLOCK_ZONE(zone); @@ -14548,7 +14457,8 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, */ if (msg->counts[DNS_SECTION_ANSWER] > 0 && DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED) && - !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NOREFRESH)) { + !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NOREFRESH)) + { result = dns_message_findname( msg, DNS_SECTION_ANSWER, &zone->origin, dns_rdatatype_soa, dns_rdatatype_none, NULL, &rdataset); @@ -14556,7 +14466,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, result = dns_rdataset_first(rdataset); } if (result == ISC_R_SUCCESS) { - uint32_t oldserial; + uint32_t oldserial; unsigned int soacount; dns_rdataset_current(rdataset, &rdata); @@ -14624,8 +14534,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from, } void -dns_zone_setnotifyacl(dns_zone_t *zone, dns_acl_t *acl) -{ +dns_zone_setnotifyacl(dns_zone_t *zone, dns_acl_t *acl) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -14637,8 +14546,7 @@ dns_zone_setnotifyacl(dns_zone_t *zone, dns_acl_t *acl) } void -dns_zone_setqueryacl(dns_zone_t *zone, dns_acl_t *acl) -{ +dns_zone_setqueryacl(dns_zone_t *zone, dns_acl_t *acl) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -14650,8 +14558,7 @@ dns_zone_setqueryacl(dns_zone_t *zone, dns_acl_t *acl) } void -dns_zone_setqueryonacl(dns_zone_t *zone, dns_acl_t *acl) -{ +dns_zone_setqueryonacl(dns_zone_t *zone, dns_acl_t *acl) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -14663,8 +14570,7 @@ dns_zone_setqueryonacl(dns_zone_t *zone, dns_acl_t *acl) } void -dns_zone_setupdateacl(dns_zone_t *zone, dns_acl_t *acl) -{ +dns_zone_setupdateacl(dns_zone_t *zone, dns_acl_t *acl) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -14676,8 +14582,7 @@ dns_zone_setupdateacl(dns_zone_t *zone, dns_acl_t *acl) } void -dns_zone_setforwardacl(dns_zone_t *zone, dns_acl_t *acl) -{ +dns_zone_setforwardacl(dns_zone_t *zone, dns_acl_t *acl) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -14689,8 +14594,7 @@ dns_zone_setforwardacl(dns_zone_t *zone, dns_acl_t *acl) } void -dns_zone_setxfracl(dns_zone_t *zone, dns_acl_t *acl) -{ +dns_zone_setxfracl(dns_zone_t *zone, dns_acl_t *acl) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -14702,56 +14606,49 @@ dns_zone_setxfracl(dns_zone_t *zone, dns_acl_t *acl) } dns_acl_t * -dns_zone_getnotifyacl(dns_zone_t *zone) -{ +dns_zone_getnotifyacl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->notify_acl); } dns_acl_t * -dns_zone_getqueryacl(dns_zone_t *zone) -{ +dns_zone_getqueryacl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->query_acl); } dns_acl_t * -dns_zone_getqueryonacl(dns_zone_t *zone) -{ +dns_zone_getqueryonacl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->queryon_acl); } dns_acl_t * -dns_zone_getupdateacl(dns_zone_t *zone) -{ +dns_zone_getupdateacl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->update_acl); } dns_acl_t * -dns_zone_getforwardacl(dns_zone_t *zone) -{ +dns_zone_getforwardacl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->forward_acl); } dns_acl_t * -dns_zone_getxfracl(dns_zone_t *zone) -{ +dns_zone_getxfracl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->xfr_acl); } void -dns_zone_clearupdateacl(dns_zone_t *zone) -{ +dns_zone_clearupdateacl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -14762,8 +14659,7 @@ dns_zone_clearupdateacl(dns_zone_t *zone) } void -dns_zone_clearforwardacl(dns_zone_t *zone) -{ +dns_zone_clearforwardacl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -14774,8 +14670,7 @@ dns_zone_clearforwardacl(dns_zone_t *zone) } void -dns_zone_clearnotifyacl(dns_zone_t *zone) -{ +dns_zone_clearnotifyacl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -14786,8 +14681,7 @@ dns_zone_clearnotifyacl(dns_zone_t *zone) } void -dns_zone_clearqueryacl(dns_zone_t *zone) -{ +dns_zone_clearqueryacl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -14798,8 +14692,7 @@ dns_zone_clearqueryacl(dns_zone_t *zone) } void -dns_zone_clearqueryonacl(dns_zone_t *zone) -{ +dns_zone_clearqueryonacl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -14810,8 +14703,7 @@ dns_zone_clearqueryonacl(dns_zone_t *zone) } void -dns_zone_clearxfracl(dns_zone_t *zone) -{ +dns_zone_clearxfracl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -14822,68 +14714,59 @@ dns_zone_clearxfracl(dns_zone_t *zone) } bool -dns_zone_getupdatedisabled(dns_zone_t *zone) -{ +dns_zone_getupdatedisabled(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->update_disabled); } void -dns_zone_setupdatedisabled(dns_zone_t *zone, bool state) -{ +dns_zone_setupdatedisabled(dns_zone_t *zone, bool state) { REQUIRE(DNS_ZONE_VALID(zone)); zone->update_disabled = state; } bool -dns_zone_getzeronosoattl(dns_zone_t *zone) -{ +dns_zone_getzeronosoattl(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->zero_no_soa_ttl); } void -dns_zone_setzeronosoattl(dns_zone_t *zone, bool state) -{ +dns_zone_setzeronosoattl(dns_zone_t *zone, bool state) { REQUIRE(DNS_ZONE_VALID(zone)); zone->zero_no_soa_ttl = state; } void -dns_zone_setchecknames(dns_zone_t *zone, dns_severity_t severity) -{ +dns_zone_setchecknames(dns_zone_t *zone, dns_severity_t severity) { REQUIRE(DNS_ZONE_VALID(zone)); zone->check_names = severity; } dns_severity_t -dns_zone_getchecknames(dns_zone_t *zone) -{ +dns_zone_getchecknames(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->check_names); } void -dns_zone_setjournalsize(dns_zone_t *zone, int32_t size) -{ +dns_zone_setjournalsize(dns_zone_t *zone, int32_t size) { REQUIRE(DNS_ZONE_VALID(zone)); zone->journalsize = size; } int32_t -dns_zone_getjournalsize(dns_zone_t *zone) -{ +dns_zone_getjournalsize(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->journalsize); } static void -zone_namerd_tostr(dns_zone_t *zone, char *buf, size_t length) -{ +zone_namerd_tostr(dns_zone_t *zone, char *buf, size_t length) { isc_result_t result = ISC_R_FAILURE; isc_buffer_t buffer; @@ -14900,7 +14783,8 @@ zone_namerd_tostr(dns_zone_t *zone, char *buf, size_t length) } if (result != ISC_R_SUCCESS && isc_buffer_availablelength(&buffer) >= - (sizeof("") - 1)) { + (sizeof("") - 1)) + { isc_buffer_putstr(&buffer, ""); } @@ -14912,7 +14796,8 @@ zone_namerd_tostr(dns_zone_t *zone, char *buf, size_t length) if (zone->view != NULL && strcmp(zone->view->name, "_bind") != 0 && strcmp(zone->view->name, "_default") != 0 && - strlen(zone->view->name) < isc_buffer_availablelength(&buffer)) { + strlen(zone->view->name) < isc_buffer_availablelength(&buffer)) + { isc_buffer_putstr(&buffer, "/"); isc_buffer_putstr(&buffer, zone->view->name); } @@ -14927,8 +14812,7 @@ 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) -{ +zone_name_tostr(dns_zone_t *zone, char *buf, size_t length) { isc_result_t result = ISC_R_FAILURE; isc_buffer_t buffer; @@ -14943,7 +14827,8 @@ zone_name_tostr(dns_zone_t *zone, char *buf, size_t length) result = dns_name_totext(&zone->origin, true, &buffer); } if (result != ISC_R_SUCCESS && - isc_buffer_availablelength(&buffer) >= (sizeof("") - 1)) { + isc_buffer_availablelength(&buffer) >= (sizeof("") - 1)) + { isc_buffer_putstr(&buffer, ""); } @@ -14951,8 +14836,7 @@ 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) -{ +zone_rdclass_tostr(dns_zone_t *zone, char *buf, size_t length) { isc_buffer_t buffer; REQUIRE(buf != NULL); @@ -14968,8 +14852,7 @@ 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) -{ +zone_viewname_tostr(dns_zone_t *zone, char *buf, size_t length) { isc_buffer_t buffer; REQUIRE(buf != NULL); @@ -14993,16 +14876,14 @@ zone_viewname_tostr(dns_zone_t *zone, char *buf, size_t length) } void -dns_zone_name(dns_zone_t *zone, char *buf, size_t length) -{ +dns_zone_name(dns_zone_t *zone, char *buf, size_t length) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(buf != NULL); zone_namerd_tostr(zone, buf, length); } void -dns_zone_nameonly(dns_zone_t *zone, char *buf, size_t length) -{ +dns_zone_nameonly(dns_zone_t *zone, char *buf, size_t length) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(buf != NULL); zone_name_tostr(zone, buf, length); @@ -15010,9 +14891,8 @@ dns_zone_nameonly(dns_zone_t *zone, char *buf, size_t length) void dns_zone_logv(dns_zone_t *zone, isc_logcategory_t *category, int level, - const char *prefix, const char *fmt, va_list ap) -{ - char message[4096]; + const char *prefix, const char *fmt, va_list ap) { + char message[4096]; const char *zstr; REQUIRE(DNS_ZONE_VALID(zone)); @@ -15041,8 +14921,7 @@ dns_zone_logv(dns_zone_t *zone, isc_logcategory_t *category, int level, } static void -notify_log(dns_zone_t *zone, int level, const char *fmt, ...) -{ +notify_log(dns_zone_t *zone, int level, const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -15052,8 +14931,7 @@ notify_log(dns_zone_t *zone, int level, const char *fmt, ...) void dns_zone_logc(dns_zone_t *zone, isc_logcategory_t *category, int level, - const char *fmt, ...) -{ + const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -15062,8 +14940,7 @@ dns_zone_logc(dns_zone_t *zone, isc_logcategory_t *category, int level, } void -dns_zone_log(dns_zone_t *zone, int level, const char *fmt, ...) -{ +dns_zone_log(dns_zone_t *zone, int level, const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -15073,9 +14950,8 @@ dns_zone_log(dns_zone_t *zone, int level, const char *fmt, ...) static void zone_debuglog(dns_zone_t *zone, const char *me, int debuglevel, const char *fmt, - ...) -{ - int level = ISC_LOG_DEBUG(debuglevel); + ...) { + int level = ISC_LOG_DEBUG(debuglevel); va_list ap; va_start(ap, fmt); @@ -15084,8 +14960,7 @@ zone_debuglog(dns_zone_t *zone, const char *me, int debuglevel, const char *fmt, } static void -dnssec_log(dns_zone_t *zone, int level, const char *fmt, ...) -{ +dnssec_log(dns_zone_t *zone, int level, const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -15094,12 +14969,11 @@ dnssec_log(dns_zone_t *zone, int level, const char *fmt, ...) } static int -message_count(dns_message_t *msg, dns_section_t section, dns_rdatatype_t type) -{ - isc_result_t result; - dns_name_t * name; +message_count(dns_message_t *msg, dns_section_t section, dns_rdatatype_t type) { + isc_result_t result; + dns_name_t *name; dns_rdataset_t *curr; - int count = 0; + int count = 0; result = dns_message_firstname(msg, section); while (result == ISC_R_SUCCESS) { @@ -15107,7 +14981,8 @@ message_count(dns_message_t *msg, dns_section_t section, dns_rdatatype_t type) dns_message_currentname(msg, section, &name); for (curr = ISC_LIST_TAIL(name->list); curr != NULL; - curr = ISC_LIST_PREV(curr, link)) { + curr = ISC_LIST_PREV(curr, link)) + { if (curr->type == type) { count++; } @@ -15119,47 +14994,41 @@ message_count(dns_message_t *msg, dns_section_t section, dns_rdatatype_t type) } void -dns_zone_setmaxxfrin(dns_zone_t *zone, uint32_t maxxfrin) -{ +dns_zone_setmaxxfrin(dns_zone_t *zone, uint32_t maxxfrin) { REQUIRE(DNS_ZONE_VALID(zone)); zone->maxxfrin = maxxfrin; } uint32_t -dns_zone_getmaxxfrin(dns_zone_t *zone) -{ +dns_zone_getmaxxfrin(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->maxxfrin); } void -dns_zone_setmaxxfrout(dns_zone_t *zone, uint32_t maxxfrout) -{ +dns_zone_setmaxxfrout(dns_zone_t *zone, uint32_t maxxfrout) { REQUIRE(DNS_ZONE_VALID(zone)); zone->maxxfrout = maxxfrout; } uint32_t -dns_zone_getmaxxfrout(dns_zone_t *zone) -{ +dns_zone_getmaxxfrout(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->maxxfrout); } dns_zonetype_t -dns_zone_gettype(dns_zone_t *zone) -{ +dns_zone_gettype(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->type); } dns_zonetype_t -dns_zone_getredirecttype(dns_zone_t *zone) -{ +dns_zone_getredirecttype(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(zone->type == dns_zone_redirect); @@ -15167,16 +15036,14 @@ dns_zone_getredirecttype(dns_zone_t *zone) } dns_name_t * -dns_zone_getorigin(dns_zone_t *zone) -{ +dns_zone_getorigin(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (&zone->origin); } void -dns_zone_settask(dns_zone_t *zone, isc_task_t *task) -{ +dns_zone_settask(dns_zone_t *zone, isc_task_t *task) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -15193,15 +15060,13 @@ dns_zone_settask(dns_zone_t *zone, isc_task_t *task) } void -dns_zone_gettask(dns_zone_t *zone, isc_task_t **target) -{ +dns_zone_gettask(dns_zone_t *zone, isc_task_t **target) { REQUIRE(DNS_ZONE_VALID(zone)); isc_task_attach(zone->task, target); } void -dns_zone_setidlein(dns_zone_t *zone, uint32_t idlein) -{ +dns_zone_setidlein(dns_zone_t *zone, uint32_t idlein) { REQUIRE(DNS_ZONE_VALID(zone)); if (idlein == 0) { @@ -15211,39 +15076,35 @@ dns_zone_setidlein(dns_zone_t *zone, uint32_t idlein) } uint32_t -dns_zone_getidlein(dns_zone_t *zone) -{ +dns_zone_getidlein(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->idlein); } void -dns_zone_setidleout(dns_zone_t *zone, uint32_t idleout) -{ +dns_zone_setidleout(dns_zone_t *zone, uint32_t idleout) { REQUIRE(DNS_ZONE_VALID(zone)); zone->idleout = idleout; } uint32_t -dns_zone_getidleout(dns_zone_t *zone) -{ +dns_zone_getidleout(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->idleout); } static void -notify_done(isc_task_t *task, isc_event_t *event) -{ +notify_done(isc_task_t *task, isc_event_t *event) { dns_requestevent_t *revent = (dns_requestevent_t *)event; - dns_notify_t * notify; - isc_result_t result; - dns_message_t * message = NULL; - isc_buffer_t buf; - char rcode[128]; - char addrbuf[ISC_SOCKADDR_FORMATSIZE]; + dns_notify_t *notify; + isc_result_t result; + dns_message_t *message = NULL; + isc_buffer_t buf; + char rcode[128]; + char addrbuf[ISC_SOCKADDR_FORMATSIZE]; UNUSED(task); @@ -15283,7 +15144,8 @@ notify_done(isc_task_t *task, isc_event_t *event) */ isc_event_free(&event); if (message != NULL && message->rcode == dns_rcode_formerr && - (notify->flags & DNS_NOTIFY_NOSOA) == 0) { + (notify->flags & DNS_NOTIFY_NOSOA) == 0) + { bool startup; notify->flags |= DNS_NOTIFY_NOSOA; @@ -15307,13 +15169,12 @@ notify_done(isc_task_t *task, isc_event_t *event) struct secure_event { isc_event_t e; - dns_db_t * db; - uint32_t serial; + dns_db_t *db; + uint32_t serial; }; static void -update_log_cb(void *arg, dns_zone_t *zone, int level, const char *message) -{ +update_log_cb(void *arg, dns_zone_t *zone, int level, const char *message) { UNUSED(arg); dns_zone_log(zone, level, "%s", message); } @@ -15321,12 +15182,11 @@ update_log_cb(void *arg, dns_zone_t *zone, int level, const char *message) static isc_result_t sync_secure_journal(dns_zone_t *zone, dns_zone_t *raw, dns_journal_t *journal, uint32_t start, uint32_t end, dns_difftuple_t **soatuplep, - dns_diff_t *diff) -{ - isc_result_t result; + dns_diff_t *diff) { + isc_result_t result; dns_difftuple_t *tuple = NULL; - dns_diffop_t op = DNS_DIFFOP_ADD; - int n_soa = 0; + dns_diffop_t op = DNS_DIFFOP_ADD; + int n_soa = 0; REQUIRE(soatuplep != NULL); @@ -15336,9 +15196,10 @@ sync_secure_journal(dns_zone_t *zone, dns_zone_t *raw, dns_journal_t *journal, CHECK(dns_journal_iter_init(journal, start, end)); for (result = dns_journal_first_rr(journal); result == ISC_R_SUCCESS; - result = dns_journal_next_rr(journal)) { - dns_name_t * name = NULL; - uint32_t ttl; + result = dns_journal_next_rr(journal)) + { + dns_name_t *name = NULL; + uint32_t ttl; dns_rdata_t *rdata = NULL; dns_journal_current_rr(journal, &name, &ttl, &rdata); @@ -15369,8 +15230,8 @@ sync_secure_journal(dns_zone_t *zone, dns_zone_t *raw, dns_journal_t *journal, return (ISC_R_FAILURE); } - if (zone->privatetype != 0 && - rdata->type == zone->privatetype) { + if (zone->privatetype != 0 && rdata->type == zone->privatetype) + { continue; } @@ -15378,7 +15239,8 @@ sync_secure_journal(dns_zone_t *zone, dns_zone_t *raw, dns_journal_t *journal, rdata->type == dns_rdatatype_rrsig || rdata->type == dns_rdatatype_nsec3 || rdata->type == dns_rdatatype_dnskey || - rdata->type == dns_rdatatype_nsec3param) { + rdata->type == dns_rdatatype_nsec3param) + { continue; } @@ -15399,14 +15261,13 @@ failure: static isc_result_t sync_secure_db(dns_zone_t *seczone, dns_zone_t *raw, dns_db_t *secdb, dns_dbversion_t *secver, dns_difftuple_t **soatuple, - dns_diff_t *diff) -{ - isc_result_t result; - dns_db_t * rawdb = NULL; + dns_diff_t *diff) { + isc_result_t result; + dns_db_t *rawdb = NULL; dns_dbversion_t *rawver = NULL; dns_difftuple_t *tuple = NULL, *next; dns_difftuple_t *oldtuple = NULL, *newtuple = NULL; - dns_rdata_soa_t oldsoa, newsoa; + dns_rdata_soa_t oldsoa, newsoa; REQUIRE(DNS_ZONE_VALID(seczone)); REQUIRE(soatuple != NULL && *soatuple == NULL); @@ -15431,7 +15292,8 @@ sync_secure_db(dns_zone_t *seczone, dns_zone_t *raw, dns_db_t *secdb, tuple->rdata.type == dns_rdatatype_rrsig || tuple->rdata.type == dns_rdatatype_dnskey || tuple->rdata.type == dns_rdatatype_nsec3 || - tuple->rdata.type == dns_rdatatype_nsec3param) { + tuple->rdata.type == dns_rdatatype_nsec3param) + { ISC_LIST_UNLINK(diff->tuples, tuple, link); dns_difftuple_free(&tuple); continue; @@ -15464,7 +15326,8 @@ sync_secure_db(dns_zone_t *seczone, dns_zone_t *raw, dns_db_t *secdb, oldsoa.minimum == newsoa.minimum && oldsoa.expire == newsoa.expire && dns_name_equal(&oldsoa.origin, &newsoa.origin) && - dns_name_equal(&oldsoa.contact, &newsoa.contact)) { + dns_name_equal(&oldsoa.contact, &newsoa.contact)) + { ISC_LIST_UNLINK(diff->tuples, oldtuple, link); dns_difftuple_free(&oldtuple); ISC_LIST_UNLINK(diff->tuples, newtuple, link); @@ -15494,19 +15357,18 @@ sync_secure_db(dns_zone_t *seczone, dns_zone_t *raw, dns_db_t *secdb, } static void -receive_secure_serial(isc_task_t *task, isc_event_t *event) -{ - static char me[] = "receive_secure_serial"; - isc_result_t result = ISC_R_SUCCESS; - dns_journal_t * rjournal = NULL; - dns_journal_t * sjournal = NULL; - uint32_t start, end; - dns_zone_t * zone; +receive_secure_serial(isc_task_t *task, isc_event_t *event) { + static char me[] = "receive_secure_serial"; + isc_result_t result = ISC_R_SUCCESS; + dns_journal_t *rjournal = NULL; + dns_journal_t *sjournal = NULL; + uint32_t start, end; + dns_zone_t *zone; dns_difftuple_t *tuple = NULL, *soatuple = NULL; dns_update_log_t log = { update_log_cb, NULL }; - uint32_t newserial = 0, desired = 0; - isc_time_t timenow; - int level = ISC_LOG_ERROR; + uint32_t newserial = 0, desired = 0; + isc_time_t timenow; + int level = ISC_LOG_ERROR; UNUSED(task); @@ -15749,10 +15611,9 @@ failure: } static isc_result_t -zone_send_secureserial(dns_zone_t *zone, uint32_t serial) -{ +zone_send_secureserial(dns_zone_t *zone, uint32_t serial) { isc_event_t *e; - dns_zone_t * dummy = NULL; + dns_zone_t *dummy = NULL; e = isc_event_allocate(zone->secure->mctx, zone, DNS_EVENT_ZONESECURESERIAL, @@ -15769,17 +15630,16 @@ zone_send_secureserial(dns_zone_t *zone, uint32_t serial) static isc_result_t checkandaddsoa(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, - dns_rdataset_t *rdataset, uint32_t oldserial) -{ + dns_rdataset_t *rdataset, uint32_t oldserial) { dns_rdata_soa_t soa; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdatalist_t temprdatalist; - dns_rdataset_t temprdataset; - isc_buffer_t b; - isc_result_t result; - unsigned char buf[DNS_SOA_BUFFERSIZE]; + dns_rdataset_t temprdataset; + isc_buffer_t b; + isc_result_t result; + unsigned char buf[DNS_SOA_BUFFERSIZE]; dns_fixedname_t fixed; - dns_name_t * name; + dns_name_t *name; result = dns_rdataset_first(rdataset); RUNTIME_CHECK(result == ISC_R_SUCCESS); @@ -15832,17 +15692,16 @@ checkandaddsoa(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, * nsecparam_t data from a zone. */ static isc_result_t -save_nsec3param(dns_zone_t *zone, nsec3paramlist_t *nsec3list) -{ - isc_result_t result; - dns_dbnode_t * node = NULL; - dns_rdataset_t rdataset, prdataset; +save_nsec3param(dns_zone_t *zone, nsec3paramlist_t *nsec3list) { + isc_result_t result; + dns_dbnode_t *node = NULL; + dns_rdataset_t rdataset, prdataset; dns_dbversion_t *version = NULL; - nsec3param_t * nsec3param = NULL; - nsec3param_t * nsec3p = NULL; - nsec3param_t * next; - dns_db_t * db = NULL; - unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE]; + nsec3param_t *nsec3param = NULL; + nsec3param_t *nsec3p = NULL; + nsec3param_t *next; + dns_db_t *db = NULL; + unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE]; REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(nsec3list != NULL); @@ -15870,7 +15729,8 @@ save_nsec3param(dns_zone_t *zone, nsec3paramlist_t *nsec3list) * one) */ for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_t private = DNS_RDATA_INIT; @@ -15905,7 +15765,8 @@ getprivate: * CREATE and REMOVE flags */ for (result = dns_rdataset_first(&prdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&prdataset)) { + result = dns_rdataset_next(&prdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_t private = DNS_RDATA_INIT; @@ -15937,7 +15798,8 @@ getprivate: if (nsec3p->length == rdata.length + 1 && memcmp(rdata.data, nsec3p->data + 1, - nsec3p->length - 1) == 0) { + nsec3p->length - 1) == 0) + { ISC_LIST_UNLINK(*nsec3list, nsec3p, link); isc_mem_put(zone->mctx, nsec3p, @@ -15989,11 +15851,10 @@ failure: */ static isc_result_t restore_nsec3param(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version, - nsec3paramlist_t *nsec3list) -{ - isc_result_t result = ISC_R_SUCCESS; - dns_diff_t diff; - dns_rdata_t rdata; + nsec3paramlist_t *nsec3list) { + isc_result_t result = ISC_R_SUCCESS; + dns_diff_t diff; + dns_rdata_t rdata; nsec3param_t *nsec3p = NULL; nsec3param_t *next; @@ -16007,8 +15868,8 @@ restore_nsec3param(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version, * and CREATE flags, and the add the record to the apex of the tree * in db. */ - for (nsec3p = ISC_LIST_HEAD(*nsec3list); nsec3p != NULL; - nsec3p = next) { + for (nsec3p = ISC_LIST_HEAD(*nsec3list); nsec3p != NULL; nsec3p = next) + { next = ISC_LIST_NEXT(nsec3p, link); dns_rdata_init(&rdata); nsec3p->data[2] = DNS_NSEC3FLAG_CREATE | DNS_NSEC3FLAG_INITIAL; @@ -16030,14 +15891,13 @@ restore_nsec3param(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version, static isc_result_t copy_non_dnssec_records(dns_zone_t *zone, dns_db_t *db, dns_db_t *version, dns_db_t *rawdb, dns_dbiterator_t *dbiterator, - unsigned int *oldserial) -{ - dns_dbnode_t * rawnode = NULL, *node = NULL; - dns_fixedname_t fixed; - dns_name_t * name = dns_fixedname_initname(&fixed); - dns_rdataset_t rdataset; + unsigned int *oldserial) { + dns_dbnode_t *rawnode = NULL, *node = NULL; + dns_fixedname_t fixed; + dns_name_t *name = dns_fixedname_initname(&fixed); + dns_rdataset_t rdataset; dns_rdatasetiter_t *rdsit = NULL; - isc_result_t result; + isc_result_t result; result = dns_dbiterator_current(dbiterator, &rawnode, name); if (result != ISC_R_SUCCESS) { @@ -16057,13 +15917,15 @@ copy_non_dnssec_records(dns_zone_t *zone, dns_db_t *db, dns_db_t *version, dns_rdataset_init(&rdataset); for (result = dns_rdatasetiter_first(rdsit); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(rdsit)) { + result = dns_rdatasetiter_next(rdsit)) + { dns_rdatasetiter_current(rdsit, &rdataset); if (rdataset.type == dns_rdatatype_nsec || rdataset.type == dns_rdatatype_rrsig || rdataset.type == dns_rdatatype_nsec3 || rdataset.type == dns_rdatatype_dnskey || - rdataset.type == dns_rdatatype_nsec3param) { + rdataset.type == dns_rdatatype_nsec3param) + { /* * Allow DNSSEC records with dnssec-policy. * WMM: Perhaps add config option for it. @@ -16103,18 +15965,17 @@ cleanup: } static void -receive_secure_db(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result; - dns_zone_t * zone; - dns_db_t * rawdb, *db = NULL; +receive_secure_db(isc_task_t *task, isc_event_t *event) { + isc_result_t result; + dns_zone_t *zone; + dns_db_t *rawdb, *db = NULL; dns_dbiterator_t *dbiterator = NULL; - dns_dbversion_t * version = NULL; - isc_time_t loadtime; - unsigned int oldserial = 0, *oldserialp = NULL; - nsec3paramlist_t nsec3list; - isc_event_t * setnsec3param_event; - dns_zone_t * dummy; + dns_dbversion_t *version = NULL; + isc_time_t loadtime; + unsigned int oldserial = 0, *oldserialp = NULL; + nsec3paramlist_t nsec3list; + isc_event_t *setnsec3param_event; + dns_zone_t *dummy; UNUSED(task); @@ -16173,7 +16034,8 @@ receive_secure_db(isc_task_t *task, isc_event_t *event) } for (result = dns_dbiterator_first(dbiterator); result == ISC_R_SUCCESS; - result = dns_dbiterator_next(dbiterator)) { + result = dns_dbiterator_next(dbiterator)) + { result = copy_non_dnssec_records(zone, db, version, rawdb, dbiterator, oldserialp); if (result != ISC_R_SUCCESS) { @@ -16249,11 +16111,10 @@ failure: } static isc_result_t -zone_send_securedb(dns_zone_t *zone, dns_db_t *db) -{ +zone_send_securedb(dns_zone_t *zone, dns_db_t *db) { isc_event_t *e; - dns_db_t * dummy = NULL; - dns_zone_t * secure = NULL; + dns_db_t *dummy = NULL; + dns_zone_t *secure = NULL; e = isc_event_allocate(zone->secure->mctx, zone, DNS_EVENT_ZONESECUREDB, receive_secure_db, zone->secure, @@ -16268,10 +16129,9 @@ zone_send_securedb(dns_zone_t *zone, dns_db_t *db) } isc_result_t -dns_zone_replacedb(dns_zone_t *zone, dns_db_t *db, bool dump) -{ +dns_zone_replacedb(dns_zone_t *zone, dns_db_t *db, bool dump) { isc_result_t result; - dns_zone_t * secure = NULL; + dns_zone_t *secure = NULL; REQUIRE(DNS_ZONE_VALID(zone)); again: @@ -16298,12 +16158,11 @@ again: } static isc_result_t -zone_replacedb(dns_zone_t *zone, dns_db_t *db, bool dump) -{ +zone_replacedb(dns_zone_t *zone, dns_db_t *db, bool dump) { dns_dbversion_t *ver; - isc_result_t result; - unsigned int soacount = 0; - unsigned int nscount = 0; + isc_result_t result; + unsigned int soacount = 0; + unsigned int nscount = 0; /* * 'zone' and 'zone->db' locked by caller. @@ -16351,7 +16210,8 @@ zone_replacedb(dns_zone_t *zone, dns_db_t *db, bool dump) */ if (zone->db != NULL && zone->journal != NULL && DNS_ZONE_OPTION(zone, DNS_ZONEOPT_IXFRFROMDIFFS) && - !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_FORCEXFER)) { + !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_FORCEXFER)) + { uint32_t serial, oldserial; dns_zone_log(zone, ISC_LOG_DEBUG(3), "generating diffs"); @@ -16375,7 +16235,8 @@ zone_replacedb(dns_zone_t *zone, dns_db_t *db, bool dump) if ((zone->type == dns_zone_slave || (zone->type == dns_zone_redirect && zone->masters != NULL)) && - !isc_serial_gt(serial, oldserial)) { + !isc_serial_gt(serial, oldserial)) + { uint32_t serialmin, serialmax; serialmin = (oldserial + 1) & 0xffffffffU; serialmax = (oldserial + 0x7fffffffU) & 0xffffffffU; @@ -16414,7 +16275,8 @@ zone_replacedb(dns_zone_t *zone, dns_db_t *db, bool dump) * to keep the old masterfile. */ if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_FORCEXFER) && - remove(zone->masterfile) < 0 && errno != ENOENT) { + remove(zone->masterfile) < 0 && errno != ENOENT) + { char strbuf[ISC_STRERRORSIZE]; strerror_r(errno, strbuf, sizeof(strbuf)); isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, @@ -16481,8 +16343,7 @@ fail: /* The caller must hold the dblock as a writer. */ static inline void -zone_attachdb(dns_zone_t *zone, dns_db_t *db) -{ +zone_attachdb(dns_zone_t *zone, dns_db_t *db) { REQUIRE(zone->db == NULL && db != NULL); dns_db_attach(db, &zone->db); @@ -16490,24 +16351,22 @@ zone_attachdb(dns_zone_t *zone, dns_db_t *db) /* The caller must hold the dblock as a writer. */ static inline void -zone_detachdb(dns_zone_t *zone) -{ +zone_detachdb(dns_zone_t *zone) { REQUIRE(zone->db != NULL); dns_db_detach(&zone->db); } static void -zone_xfrdone(dns_zone_t *zone, isc_result_t result) -{ - isc_time_t now; - bool again = false; +zone_xfrdone(dns_zone_t *zone, isc_result_t result) { + isc_time_t now; + bool again = false; unsigned int soacount; unsigned int nscount; - uint32_t serial, refresh, retry, expire, minimum; + uint32_t serial, refresh, retry, expire, minimum; isc_result_t xfrresult = result; - bool free_needed; - dns_zone_t * secure = NULL; + bool free_needed; + dns_zone_t *secure = NULL; REQUIRE(DNS_ZONE_VALID(zone)); @@ -16576,8 +16435,8 @@ again: dns_zone_log(zone, ISC_LOG_ERROR, "transferred zone " "has no NS records"); - if (DNS_ZONE_FLAG(zone, - DNS_ZONEFLG_HAVETIMERS)) { + if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_HAVETIMERS)) + { zone->refresh = DNS_ZONE_DEFAULTREFRESH; zone->retry = DNS_ZONE_DEFAULTRETRY; } @@ -16587,8 +16446,8 @@ again: } zone->refresh = RANGE(refresh, zone->minrefresh, zone->maxrefresh); - zone->retry = - RANGE(retry, zone->minretry, zone->maxretry); + zone->retry = RANGE(retry, zone->minretry, + zone->maxretry); zone->expire = RANGE(expire, zone->refresh + zone->retry, DNS_MAX_EXPIRE); @@ -16641,20 +16500,22 @@ again: if (zone->journal != NULL) { result = isc_file_settime(zone->journal, &now); } - if (result != ISC_R_SUCCESS && - zone->masterfile != NULL) { + if (result != ISC_R_SUCCESS && zone->masterfile != NULL) + { result = isc_file_settime(zone->masterfile, &now); } if ((DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NODELAY) != 0) || - result == ISC_R_FILENOTFOUND) { + result == ISC_R_FILENOTFOUND) + { delay = 0; } if ((result == ISC_R_SUCCESS || result == ISC_R_FILENOTFOUND) && - zone->masterfile != NULL) { + zone->masterfile != NULL) + { zone_needdump(zone, delay); } else if (result != ISC_R_SUCCESS) { dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN, @@ -16694,7 +16555,8 @@ again: if (zone->curmaster >= zone->masterscnt) { zone->curmaster = 0; if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_USEALTXFRSRC) && - !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_USEALTXFRSRC)) { + !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_USEALTXFRSRC)) + { DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_REFRESH); DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_USEALTXFRSRC); @@ -16777,13 +16639,12 @@ again: } static void -zone_loaddone(void *arg, isc_result_t result) -{ - static char me[] = "zone_loaddone"; - dns_load_t * load = arg; - dns_zone_t * zone; +zone_loaddone(void *arg, isc_result_t result) { + static char me[] = "zone_loaddone"; + dns_load_t *load = arg; + dns_zone_t *zone; isc_result_t tresult; - dns_zone_t * secure = NULL; + dns_zone_t *secure = NULL; REQUIRE(DNS_LOAD_VALID(load)); zone = load->zone; @@ -16801,7 +16662,8 @@ zone_loaddone(void *arg, isc_result_t result) tresult = dns_db_endload(load->db, &load->callbacks); if (tresult != ISC_R_SUCCESS && - (result == ISC_R_SUCCESS || result == DNS_R_SEENINCLUDE)) { + (result == ISC_R_SUCCESS || result == DNS_R_SEENINCLUDE)) + { result = tresult; } @@ -16831,7 +16693,8 @@ again: * Leave the zone frozen if the reload fails. */ if ((result == ISC_R_SUCCESS || result == DNS_R_SEENINCLUDE) && - DNS_ZONE_FLAG(zone, DNS_ZONEFLG_THAW)) { + DNS_ZONE_FLAG(zone, DNS_ZONEFLG_THAW)) + { zone->update_disabled = false; } DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_THAW); @@ -16852,8 +16715,7 @@ again: } void -dns_zone_getssutable(dns_zone_t *zone, dns_ssutable_t **table) -{ +dns_zone_getssutable(dns_zone_t *zone, dns_ssutable_t **table) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(table != NULL); REQUIRE(*table == NULL); @@ -16866,8 +16728,7 @@ dns_zone_getssutable(dns_zone_t *zone, dns_ssutable_t **table) } void -dns_zone_setssutable(dns_zone_t *zone, dns_ssutable_t *table) -{ +dns_zone_setssutable(dns_zone_t *zone, dns_ssutable_t *table) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -16881,40 +16742,35 @@ dns_zone_setssutable(dns_zone_t *zone, dns_ssutable_t *table) } void -dns_zone_setsigvalidityinterval(dns_zone_t *zone, uint32_t interval) -{ +dns_zone_setsigvalidityinterval(dns_zone_t *zone, uint32_t interval) { REQUIRE(DNS_ZONE_VALID(zone)); zone->sigvalidityinterval = interval; } uint32_t -dns_zone_getsigvalidityinterval(dns_zone_t *zone) -{ +dns_zone_getsigvalidityinterval(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->sigvalidityinterval); } void -dns_zone_setkeyvalidityinterval(dns_zone_t *zone, uint32_t interval) -{ +dns_zone_setkeyvalidityinterval(dns_zone_t *zone, uint32_t interval) { REQUIRE(DNS_ZONE_VALID(zone)); zone->keyvalidityinterval = interval; } uint32_t -dns_zone_getkeyvalidityinterval(dns_zone_t *zone) -{ +dns_zone_getkeyvalidityinterval(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->keyvalidityinterval); } void -dns_zone_setsigresigninginterval(dns_zone_t *zone, uint32_t interval) -{ +dns_zone_setsigresigninginterval(dns_zone_t *zone, uint32_t interval) { isc_time_t now; REQUIRE(DNS_ZONE_VALID(zone)); @@ -16930,18 +16786,16 @@ dns_zone_setsigresigninginterval(dns_zone_t *zone, uint32_t interval) } uint32_t -dns_zone_getsigresigninginterval(dns_zone_t *zone) -{ +dns_zone_getsigresigninginterval(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->sigresigninginterval); } static void -queue_xfrin(dns_zone_t *zone) -{ - const char me[] = "queue_xfrin"; - isc_result_t result; +queue_xfrin(dns_zone_t *zone) { + const char me[] = "queue_xfrin"; + isc_result_t result; dns_zonemgr_t *zmgr = zone->zmgr; ENTER; @@ -16971,21 +16825,20 @@ queue_xfrin(dns_zone_t *zone) * to go ahead and start the transfer. */ static void -got_transfer_quota(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result = ISC_R_SUCCESS; - dns_peer_t * peer = NULL; - char master[ISC_SOCKADDR_FORMATSIZE]; - char source[ISC_SOCKADDR_FORMATSIZE]; +got_transfer_quota(isc_task_t *task, isc_event_t *event) { + isc_result_t result = ISC_R_SUCCESS; + dns_peer_t *peer = NULL; + char master[ISC_SOCKADDR_FORMATSIZE]; + char source[ISC_SOCKADDR_FORMATSIZE]; dns_rdatatype_t xfrtype; - dns_zone_t * zone = event->ev_arg; - isc_netaddr_t masterip; - isc_sockaddr_t sourceaddr; - isc_sockaddr_t masteraddr; - isc_time_t now; - const char * soa_before = ""; - isc_dscp_t dscp = -1; - bool loaded; + dns_zone_t *zone = event->ev_arg; + isc_netaddr_t masterip; + isc_sockaddr_t sourceaddr; + isc_sockaddr_t masteraddr; + isc_time_t now; + const char *soa_before = ""; + isc_dscp_t dscp = -1; + bool loaded; UNUSED(task); @@ -17000,7 +16853,8 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) isc_sockaddr_format(&zone->masteraddr, master, sizeof(master)); if (dns_zonemgr_unreachable(zone->zmgr, &zone->masteraddr, - &zone->sourceaddr, &now)) { + &zone->sourceaddr, &now)) + { isc_sockaddr_format(&zone->sourceaddr, source, sizeof(source)); dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN, ISC_LOG_INFO, "got_transfer_quota: skipping zone transfer as " @@ -17081,7 +16935,8 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) * try for a server key. */ if ((zone->masterkeynames != NULL) && - (zone->masterkeynames[zone->curmaster] != NULL)) { + (zone->masterkeynames[zone->curmaster] != NULL)) + { dns_view_t *view = dns_zone_getview(zone); dns_name_t *keyname = zone->masterkeynames[zone->curmaster]; result = dns_view_gettsig(view, keyname, &zone->tsigkey); @@ -17160,8 +17015,7 @@ cleanup: */ static void -forward_destroy(dns_forward_t *forward) -{ +forward_destroy(dns_forward_t *forward) { forward->magic = 0; if (forward->request != NULL) { dns_request_destroy(&forward->request); @@ -17181,11 +17035,10 @@ forward_destroy(dns_forward_t *forward) } static isc_result_t -sendtomaster(dns_forward_t *forward) -{ - isc_result_t result; +sendtomaster(dns_forward_t *forward) { + isc_result_t result; isc_sockaddr_t src; - isc_dscp_t dscp = -1; + isc_dscp_t dscp = -1; LOCK_ZONE(forward->zone); @@ -17236,15 +17089,14 @@ unlock: } static void -forward_callback(isc_task_t *task, isc_event_t *event) -{ - const char me[] = "forward_callback"; +forward_callback(isc_task_t *task, isc_event_t *event) { + const char me[] = "forward_callback"; dns_requestevent_t *revent = (dns_requestevent_t *)event; - dns_message_t * msg = NULL; - char master[ISC_SOCKADDR_FORMATSIZE]; - isc_result_t result; - dns_forward_t * forward; - dns_zone_t * zone; + dns_message_t *msg = NULL; + char master[ISC_SOCKADDR_FORMATSIZE]; + isc_result_t result; + dns_forward_t *forward; + dns_zone_t *zone; UNUSED(task); @@ -17286,7 +17138,7 @@ forward_callback(isc_task_t *task, isc_event_t *event) case dns_rcode_nxrrset: case dns_rcode_refused: case dns_rcode_nxdomain: { - char rcode[128]; + char rcode[128]; isc_buffer_t rb; isc_buffer_init(&rb, rcode, sizeof(rcode)); @@ -17301,7 +17153,7 @@ forward_callback(isc_task_t *task, isc_event_t *event) /* These should not occur if the masters/zone are valid. */ case dns_rcode_notzone: case dns_rcode_notauth: { - char rcode[128]; + char rcode[128]; isc_buffer_t rb; isc_buffer_init(&rb, rcode, sizeof(rcode)); @@ -17349,11 +17201,10 @@ next_master: isc_result_t dns_zone_forwardupdate(dns_zone_t *zone, dns_message_t *msg, - dns_updatecallback_t callback, void *callback_arg) -{ + dns_updatecallback_t callback, void *callback_arg) { dns_forward_t *forward; - isc_result_t result; - isc_region_t * mr; + isc_result_t result; + isc_region_t *mr; REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(msg != NULL); @@ -17403,8 +17254,7 @@ cleanup: } isc_result_t -dns_zone_next(dns_zone_t *zone, dns_zone_t **next) -{ +dns_zone_next(dns_zone_t *zone, dns_zone_t **next) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(next != NULL && *next == NULL); @@ -17417,8 +17267,7 @@ dns_zone_next(dns_zone_t *zone, dns_zone_t **next) } isc_result_t -dns_zone_first(dns_zonemgr_t *zmgr, dns_zone_t **first) -{ +dns_zone_first(dns_zonemgr_t *zmgr, dns_zone_t **first) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); REQUIRE(first != NULL && *first == NULL); @@ -17437,10 +17286,9 @@ dns_zone_first(dns_zonemgr_t *zmgr, dns_zone_t **first) isc_result_t dns_zonemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, isc_timermgr_t *timermgr, isc_socketmgr_t *socketmgr, - dns_zonemgr_t **zmgrp) -{ + dns_zonemgr_t **zmgrp) { dns_zonemgr_t *zmgr; - isc_result_t result; + isc_result_t result; zmgr = isc_mem_get(mctx, sizeof(*zmgr)); zmgr->mctx = NULL; @@ -17549,12 +17397,11 @@ free_mem: } isc_result_t -dns_zonemgr_createzone(dns_zonemgr_t *zmgr, dns_zone_t **zonep) -{ +dns_zonemgr_createzone(dns_zonemgr_t *zmgr, dns_zone_t **zonep) { isc_result_t result; - isc_mem_t * mctx = NULL; - dns_zone_t * zone = NULL; - void * item; + isc_mem_t *mctx = NULL; + dns_zone_t *zone = NULL; + void *item; REQUIRE(DNS_ZONEMGR_VALID(zmgr)); REQUIRE(zonep != NULL && *zonep == NULL); @@ -17580,8 +17427,7 @@ dns_zonemgr_createzone(dns_zonemgr_t *zmgr, dns_zone_t **zonep) } isc_result_t -dns_zonemgr_managezone(dns_zonemgr_t *zmgr, dns_zone_t *zone) -{ +dns_zonemgr_managezone(dns_zonemgr_t *zmgr, dns_zone_t *zone) { isc_result_t result; REQUIRE(DNS_ZONE_VALID(zone)); @@ -17638,8 +17484,7 @@ unlock: } void -dns_zonemgr_releasezone(dns_zonemgr_t *zmgr, dns_zone_t *zone) -{ +dns_zonemgr_releasezone(dns_zonemgr_t *zmgr, dns_zone_t *zone) { bool free_now = false; REQUIRE(DNS_ZONE_VALID(zone)); @@ -17666,8 +17511,7 @@ dns_zonemgr_releasezone(dns_zonemgr_t *zmgr, dns_zone_t *zone) } void -dns_zonemgr_attach(dns_zonemgr_t *source, dns_zonemgr_t **target) -{ +dns_zonemgr_attach(dns_zonemgr_t *source, dns_zonemgr_t **target) { REQUIRE(DNS_ZONEMGR_VALID(source)); REQUIRE(target != NULL && *target == NULL); @@ -17677,8 +17521,7 @@ dns_zonemgr_attach(dns_zonemgr_t *source, dns_zonemgr_t **target) } void -dns_zonemgr_detach(dns_zonemgr_t **zmgrp) -{ +dns_zonemgr_detach(dns_zonemgr_t **zmgrp) { dns_zonemgr_t *zmgr; REQUIRE(zmgrp != NULL); @@ -17692,8 +17535,7 @@ dns_zonemgr_detach(dns_zonemgr_t **zmgrp) } isc_result_t -dns_zonemgr_forcemaint(dns_zonemgr_t *zmgr) -{ +dns_zonemgr_forcemaint(dns_zonemgr_t *zmgr) { dns_zone_t *p; REQUIRE(DNS_ZONEMGR_VALID(zmgr)); @@ -17718,8 +17560,7 @@ dns_zonemgr_forcemaint(dns_zonemgr_t *zmgr) } void -dns_zonemgr_resumexfrs(dns_zonemgr_t *zmgr) -{ +dns_zonemgr_resumexfrs(dns_zonemgr_t *zmgr) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); RWLOCK(&zmgr->rwlock, isc_rwlocktype_write); @@ -17728,8 +17569,7 @@ dns_zonemgr_resumexfrs(dns_zonemgr_t *zmgr) } void -dns_zonemgr_shutdown(dns_zonemgr_t *zmgr) -{ +dns_zonemgr_shutdown(dns_zonemgr_t *zmgr) { dns_zone_t *zone; REQUIRE(DNS_ZONEMGR_VALID(zmgr)); @@ -17754,7 +17594,8 @@ dns_zonemgr_shutdown(dns_zonemgr_t *zmgr) RWLOCK(&zmgr->rwlock, isc_rwlocktype_read); for (zone = ISC_LIST_HEAD(zmgr->zones); zone != NULL; - zone = ISC_LIST_NEXT(zone, link)) { + zone = ISC_LIST_NEXT(zone, link)) + { LOCK_ZONE(zone); forward_cancel(zone); UNLOCK_ZONE(zone); @@ -17763,8 +17604,7 @@ dns_zonemgr_shutdown(dns_zonemgr_t *zmgr) } static isc_result_t -mctxinit(void **target, void *arg) -{ +mctxinit(void **target, void *arg) { isc_mem_t *mctx = NULL; UNUSED(arg); @@ -17779,8 +17619,7 @@ mctxinit(void **target, void *arg) } static void -mctxfree(void **target) -{ +mctxfree(void **target) { isc_mem_t *mctx = *(isc_mem_t **)target; isc_mem_detach(&mctx); *target = NULL; @@ -17790,13 +17629,12 @@ mctxfree(void **target) #define ZONES_PER_MCTX 1000 isc_result_t -dns_zonemgr_setsize(dns_zonemgr_t *zmgr, int num_zones) -{ - isc_result_t result; - int ntasks = num_zones / ZONES_PER_TASK; - int nmctx = num_zones / ZONES_PER_MCTX; +dns_zonemgr_setsize(dns_zonemgr_t *zmgr, int num_zones) { + isc_result_t result; + int ntasks = num_zones / ZONES_PER_TASK; + int nmctx = num_zones / ZONES_PER_MCTX; isc_taskpool_t *pool = NULL; - isc_pool_t * mctxpool = NULL; + isc_pool_t *mctxpool = NULL; REQUIRE(DNS_ZONEMGR_VALID(zmgr)); @@ -17868,8 +17706,7 @@ dns_zonemgr_setsize(dns_zonemgr_t *zmgr, int num_zones) } static void -zonemgr_free(dns_zonemgr_t *zmgr) -{ +zonemgr_free(dns_zonemgr_t *zmgr) { isc_mem_t *mctx; INSIST(ISC_LIST_EMPTY(zmgr->zones)); @@ -17891,32 +17728,28 @@ zonemgr_free(dns_zonemgr_t *zmgr) } void -dns_zonemgr_settransfersin(dns_zonemgr_t *zmgr, uint32_t value) -{ +dns_zonemgr_settransfersin(dns_zonemgr_t *zmgr, uint32_t value) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); zmgr->transfersin = value; } uint32_t -dns_zonemgr_getttransfersin(dns_zonemgr_t *zmgr) -{ +dns_zonemgr_getttransfersin(dns_zonemgr_t *zmgr) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); return (zmgr->transfersin); } void -dns_zonemgr_settransfersperns(dns_zonemgr_t *zmgr, uint32_t value) -{ +dns_zonemgr_settransfersperns(dns_zonemgr_t *zmgr, uint32_t value) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); zmgr->transfersperns = value; } uint32_t -dns_zonemgr_getttransfersperns(dns_zonemgr_t *zmgr) -{ +dns_zonemgr_getttransfersperns(dns_zonemgr_t *zmgr) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); return (zmgr->transfersperns); @@ -17930,8 +17763,7 @@ dns_zonemgr_getttransfersperns(dns_zonemgr_t *zmgr) * The zone manager is locked by the caller. */ static void -zmgr_resume_xfrs(dns_zonemgr_t *zmgr, bool multi) -{ +zmgr_resume_xfrs(dns_zonemgr_t *zmgr, bool multi) { dns_zone_t *zone; dns_zone_t *next; @@ -17980,14 +17812,13 @@ zmgr_resume_xfrs(dns_zonemgr_t *zmgr, bool multi) * Others Failure. */ static isc_result_t -zmgr_start_xfrin_ifquota(dns_zonemgr_t *zmgr, dns_zone_t *zone) -{ - dns_peer_t * peer = NULL; +zmgr_start_xfrin_ifquota(dns_zonemgr_t *zmgr, dns_zone_t *zone) { + dns_peer_t *peer = NULL; isc_netaddr_t masterip; - uint32_t nxfrsin, nxfrsperns; - dns_zone_t * x; - uint32_t maxtransfersin, maxtransfersperns; - isc_event_t * e; + uint32_t nxfrsin, nxfrsperns; + dns_zone_t *x; + uint32_t maxtransfersin, maxtransfersperns; + isc_event_t *e; /* * If we are exiting just pretend we got quota so the zone will @@ -18026,7 +17857,8 @@ zmgr_start_xfrin_ifquota(dns_zonemgr_t *zmgr, dns_zone_t *zone) */ nxfrsin = nxfrsperns = 0; for (x = ISC_LIST_HEAD(zmgr->xfrin_in_progress); x != NULL; - x = ISC_LIST_NEXT(x, statelink)) { + x = ISC_LIST_NEXT(x, statelink)) + { isc_netaddr_t xip; LOCK_ZONE(x); @@ -18071,8 +17903,7 @@ gotquota: } void -dns_zonemgr_setiolimit(dns_zonemgr_t *zmgr, uint32_t iolimit) -{ +dns_zonemgr_setiolimit(dns_zonemgr_t *zmgr, uint32_t iolimit) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); REQUIRE(iolimit > 0); @@ -18080,8 +17911,7 @@ dns_zonemgr_setiolimit(dns_zonemgr_t *zmgr, uint32_t iolimit) } uint32_t -dns_zonemgr_getiolimit(dns_zonemgr_t *zmgr) -{ +dns_zonemgr_getiolimit(dns_zonemgr_t *zmgr) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); return (zmgr->iolimit); @@ -18099,10 +17929,9 @@ dns_zonemgr_getiolimit(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) -{ + isc_taskaction_t action, void *arg, dns_io_t **iop) { dns_io_t *io; - bool queue; + bool queue; REQUIRE(DNS_ZONEMGR_VALID(zmgr)); REQUIRE(iop != NULL && *iop == NULL); @@ -18139,10 +17968,9 @@ zonemgr_getio(dns_zonemgr_t *zmgr, bool high, isc_task_t *task, } static void -zonemgr_putio(dns_io_t **iop) -{ - dns_io_t * io; - dns_io_t * next; +zonemgr_putio(dns_io_t **iop) { + dns_io_t *io; + dns_io_t *next; dns_zonemgr_t *zmgr; REQUIRE(iop != NULL); @@ -18180,8 +18008,7 @@ zonemgr_putio(dns_io_t **iop) } static void -zonemgr_cancelio(dns_io_t *io) -{ +zonemgr_cancelio(dns_io_t *io) { bool send_event = false; REQUIRE(DNS_IO_VALID(io)); @@ -18208,10 +18035,9 @@ zonemgr_cancelio(dns_io_t *io) } static void -zone_saveunique(dns_zone_t *zone, const char *path, const char *templat) -{ - char * buf; - int buflen; +zone_saveunique(dns_zone_t *zone, const char *path, const char *templat) { + char *buf; + int buflen; isc_result_t result; buflen = strlen(path) + strlen(templat) + 2; @@ -18239,12 +18065,11 @@ cleanup: } static void -setrl(isc_ratelimiter_t *rl, unsigned int *rate, unsigned int value) -{ +setrl(isc_ratelimiter_t *rl, unsigned int *rate, unsigned int value) { isc_interval_t interval; - uint32_t s, ns; - uint32_t pertic; - isc_result_t result; + uint32_t s, ns; + uint32_t pertic; + isc_result_t result; if (value == 0) { value = 1; @@ -18274,24 +18099,21 @@ setrl(isc_ratelimiter_t *rl, unsigned int *rate, unsigned int value) } void -dns_zonemgr_setnotifyrate(dns_zonemgr_t *zmgr, unsigned int value) -{ +dns_zonemgr_setnotifyrate(dns_zonemgr_t *zmgr, unsigned int value) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); setrl(zmgr->notifyrl, &zmgr->notifyrate, value); } void -dns_zonemgr_setstartupnotifyrate(dns_zonemgr_t *zmgr, unsigned int value) -{ +dns_zonemgr_setstartupnotifyrate(dns_zonemgr_t *zmgr, unsigned int value) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); setrl(zmgr->startupnotifyrl, &zmgr->startupnotifyrate, value); } void -dns_zonemgr_setserialqueryrate(dns_zonemgr_t *zmgr, unsigned int value) -{ +dns_zonemgr_setserialqueryrate(dns_zonemgr_t *zmgr, unsigned int value) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); setrl(zmgr->refreshrl, &zmgr->serialqueryrate, value); @@ -18300,24 +18122,21 @@ dns_zonemgr_setserialqueryrate(dns_zonemgr_t *zmgr, unsigned int value) } unsigned int -dns_zonemgr_getnotifyrate(dns_zonemgr_t *zmgr) -{ +dns_zonemgr_getnotifyrate(dns_zonemgr_t *zmgr) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); return (zmgr->notifyrate); } unsigned int -dns_zonemgr_getstartupnotifyrate(dns_zonemgr_t *zmgr) -{ +dns_zonemgr_getstartupnotifyrate(dns_zonemgr_t *zmgr) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); return (zmgr->startupnotifyrate); } unsigned int -dns_zonemgr_getserialqueryrate(dns_zonemgr_t *zmgr) -{ +dns_zonemgr_getserialqueryrate(dns_zonemgr_t *zmgr) { REQUIRE(DNS_ZONEMGR_VALID(zmgr)); return (zmgr->serialqueryrate); @@ -18325,11 +18144,10 @@ dns_zonemgr_getserialqueryrate(dns_zonemgr_t *zmgr) bool dns_zonemgr_unreachable(dns_zonemgr_t *zmgr, isc_sockaddr_t *remote, - isc_sockaddr_t *local, isc_time_t *now) -{ + isc_sockaddr_t *local, isc_time_t *now) { unsigned int i; - uint32_t seconds = isc_time_seconds(now); - uint32_t count = 0; + uint32_t seconds = isc_time_seconds(now); + uint32_t count = 0; REQUIRE(DNS_ZONEMGR_VALID(zmgr)); @@ -18337,7 +18155,8 @@ dns_zonemgr_unreachable(dns_zonemgr_t *zmgr, isc_sockaddr_t *remote, for (i = 0; i < UNREACH_CACHE_SIZE; i++) { if (atomic_load(&zmgr->unreachable[i].expire) >= seconds && isc_sockaddr_equal(&zmgr->unreachable[i].remote, remote) && - isc_sockaddr_equal(&zmgr->unreachable[i].local, local)) { + isc_sockaddr_equal(&zmgr->unreachable[i].local, local)) + { atomic_store_relaxed(&zmgr->unreachable[i].last, seconds); count = zmgr->unreachable[i].count; @@ -18350,11 +18169,10 @@ dns_zonemgr_unreachable(dns_zonemgr_t *zmgr, isc_sockaddr_t *remote, void dns_zonemgr_unreachabledel(dns_zonemgr_t *zmgr, isc_sockaddr_t *remote, - isc_sockaddr_t *local) -{ + isc_sockaddr_t *local) { unsigned int i; - char master[ISC_SOCKADDR_FORMATSIZE]; - char source[ISC_SOCKADDR_FORMATSIZE]; + char master[ISC_SOCKADDR_FORMATSIZE]; + char source[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_format(remote, master, sizeof(master)); isc_sockaddr_format(local, source, sizeof(source)); @@ -18364,7 +18182,8 @@ dns_zonemgr_unreachabledel(dns_zonemgr_t *zmgr, isc_sockaddr_t *remote, RWLOCK(&zmgr->urlock, isc_rwlocktype_read); for (i = 0; i < UNREACH_CACHE_SIZE; i++) { if (isc_sockaddr_equal(&zmgr->unreachable[i].remote, remote) && - isc_sockaddr_equal(&zmgr->unreachable[i].local, local)) { + isc_sockaddr_equal(&zmgr->unreachable[i].local, local)) + { atomic_store_relaxed(&zmgr->unreachable[i].expire, 0); break; } @@ -18374,19 +18193,19 @@ dns_zonemgr_unreachabledel(dns_zonemgr_t *zmgr, isc_sockaddr_t *remote, void dns_zonemgr_unreachableadd(dns_zonemgr_t *zmgr, isc_sockaddr_t *remote, - isc_sockaddr_t *local, isc_time_t *now) -{ - uint32_t seconds = isc_time_seconds(now); - uint32_t expire = 0, last = seconds; + isc_sockaddr_t *local, isc_time_t *now) { + uint32_t seconds = isc_time_seconds(now); + uint32_t expire = 0, last = seconds; unsigned int slot = UNREACH_CACHE_SIZE, oldest = 0; - bool update_entry = true; + bool update_entry = true; REQUIRE(DNS_ZONEMGR_VALID(zmgr)); RWLOCK(&zmgr->urlock, isc_rwlocktype_write); for (unsigned int i = 0; i < UNREACH_CACHE_SIZE; i++) { /* Existing entry? */ if (isc_sockaddr_equal(&zmgr->unreachable[i].remote, remote) && - isc_sockaddr_equal(&zmgr->unreachable[i].local, local)) { + isc_sockaddr_equal(&zmgr->unreachable[i].local, local)) + { update_entry = false; slot = i; expire = atomic_load_relaxed( @@ -18394,8 +18213,8 @@ dns_zonemgr_unreachableadd(dns_zonemgr_t *zmgr, isc_sockaddr_t *remote, break; } /* Pick first empty slot? */ - if (atomic_load_relaxed(&zmgr->unreachable[i].expire) < - seconds) { + if (atomic_load_relaxed(&zmgr->unreachable[i].expire) < seconds) + { slot = i; break; } @@ -18429,12 +18248,12 @@ dns_zonemgr_unreachableadd(dns_zonemgr_t *zmgr, isc_sockaddr_t *remote, } void -dns_zone_forcereload(dns_zone_t *zone) -{ +dns_zone_forcereload(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); if (zone->type == dns_zone_master || - (zone->type == dns_zone_redirect && zone->masters == NULL)) { + (zone->type == dns_zone_redirect && zone->masters == NULL)) + { return; } @@ -18445,16 +18264,14 @@ dns_zone_forcereload(dns_zone_t *zone) } bool -dns_zone_isforced(dns_zone_t *zone) -{ +dns_zone_isforced(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_FORCEXFER)); } isc_result_t -dns_zone_setstatistics(dns_zone_t *zone, bool on) -{ +dns_zone_setstatistics(dns_zone_t *zone, bool on) { /* * This function is obsoleted. */ @@ -18464,8 +18281,7 @@ dns_zone_setstatistics(dns_zone_t *zone, bool on) } uint64_t * -dns_zone_getstatscounters(dns_zone_t *zone) -{ +dns_zone_getstatscounters(dns_zone_t *zone) { /* * This function is obsoleted. */ @@ -18474,8 +18290,7 @@ dns_zone_getstatscounters(dns_zone_t *zone) } void -dns_zone_setstats(dns_zone_t *zone, isc_stats_t *stats) -{ +dns_zone_setstats(dns_zone_t *zone, isc_stats_t *stats) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(zone->stats == NULL); @@ -18486,8 +18301,7 @@ dns_zone_setstats(dns_zone_t *zone, isc_stats_t *stats) } void -dns_zone_setrequeststats(dns_zone_t *zone, isc_stats_t *stats) -{ +dns_zone_setrequeststats(dns_zone_t *zone, isc_stats_t *stats) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -18503,8 +18317,7 @@ dns_zone_setrequeststats(dns_zone_t *zone, isc_stats_t *stats) } void -dns_zone_setrcvquerystats(dns_zone_t *zone, dns_stats_t *stats) -{ +dns_zone_setrcvquerystats(dns_zone_t *zone, dns_stats_t *stats) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -18518,8 +18331,7 @@ dns_zone_setrcvquerystats(dns_zone_t *zone, dns_stats_t *stats) } void -dns_zone_setdnssecsignstats(dns_zone_t *zone, dns_stats_t *stats) -{ +dns_zone_setdnssecsignstats(dns_zone_t *zone, dns_stats_t *stats) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -18530,8 +18342,7 @@ dns_zone_setdnssecsignstats(dns_zone_t *zone, dns_stats_t *stats) } void -dns_zone_setdnssecrefreshstats(dns_zone_t *zone, dns_stats_t *stats) -{ +dns_zone_setdnssecrefreshstats(dns_zone_t *zone, dns_stats_t *stats) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -18542,24 +18353,21 @@ dns_zone_setdnssecrefreshstats(dns_zone_t *zone, dns_stats_t *stats) } dns_stats_t * -dns_zone_getdnssecsignstats(dns_zone_t *zone) -{ +dns_zone_getdnssecsignstats(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->dnssecsignstats); } dns_stats_t * -dns_zone_getdnssecrefreshstats(dns_zone_t *zone) -{ +dns_zone_getdnssecrefreshstats(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->dnssecrefreshstats); } isc_stats_t * -dns_zone_getrequeststats(dns_zone_t *zone) -{ +dns_zone_getrequeststats(dns_zone_t *zone) { /* * We don't lock zone for efficiency reason. This is not catastrophic * because requeststats must always be valid when requeststats_on is @@ -18580,8 +18388,7 @@ dns_zone_getrequeststats(dns_zone_t *zone) * see note from dns_zone_getrequeststats() */ dns_stats_t * -dns_zone_getrcvquerystats(dns_zone_t *zone) -{ +dns_zone_getrcvquerystats(dns_zone_t *zone) { if (zone->requeststats_on) { return (zone->rcvquerystats); } else { @@ -18590,8 +18397,7 @@ dns_zone_getrcvquerystats(dns_zone_t *zone) } void -dns_zone_dialup(dns_zone_t *zone) -{ +dns_zone_dialup(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); zone_debuglog(zone, "dns_zone_dialup", 3, "notify = %d, refresh = %d", @@ -18602,14 +18408,14 @@ dns_zone_dialup(dns_zone_t *zone) dns_zone_notify(zone); } if (zone->type != dns_zone_master && zone->masters != NULL && - DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DIALREFRESH)) { + DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DIALREFRESH)) + { dns_zone_refresh(zone); } } void -dns_zone_setdialup(dns_zone_t *zone, dns_dialuptype_t dialup) -{ +dns_zone_setdialup(dns_zone_t *zone, dns_dialuptype_t dialup) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -18646,8 +18452,7 @@ dns_zone_setdialup(dns_zone_t *zone, dns_dialuptype_t dialup) } isc_result_t -dns_zone_setkeydirectory(dns_zone_t *zone, const char *directory) -{ +dns_zone_setkeydirectory(dns_zone_t *zone, const char *directory) { isc_result_t result = ISC_R_SUCCESS; REQUIRE(DNS_ZONE_VALID(zone)); @@ -18660,17 +18465,15 @@ dns_zone_setkeydirectory(dns_zone_t *zone, const char *directory) } const char * -dns_zone_getkeydirectory(dns_zone_t *zone) -{ +dns_zone_getkeydirectory(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->keydirectory); } unsigned int -dns_zonemgr_getcount(dns_zonemgr_t *zmgr, int state) -{ - dns_zone_t * zone; +dns_zonemgr_getcount(dns_zonemgr_t *zmgr, int state) { + dns_zone_t *zone; unsigned int count = 0; REQUIRE(DNS_ZONEMGR_VALID(zmgr)); @@ -18679,19 +18482,22 @@ dns_zonemgr_getcount(dns_zonemgr_t *zmgr, int state) switch (state) { case DNS_ZONESTATE_XFERRUNNING: for (zone = ISC_LIST_HEAD(zmgr->xfrin_in_progress); - zone != NULL; zone = ISC_LIST_NEXT(zone, statelink)) { + zone != NULL; zone = ISC_LIST_NEXT(zone, statelink)) + { count++; } break; case DNS_ZONESTATE_XFERDEFERRED: for (zone = ISC_LIST_HEAD(zmgr->waiting_for_xfrin); - zone != NULL; zone = ISC_LIST_NEXT(zone, statelink)) { + zone != NULL; zone = ISC_LIST_NEXT(zone, statelink)) + { count++; } break; case DNS_ZONESTATE_SOAQUERY: for (zone = ISC_LIST_HEAD(zmgr->zones); zone != NULL; - zone = ISC_LIST_NEXT(zone, link)) { + zone = ISC_LIST_NEXT(zone, link)) + { if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_REFRESH)) { count++; } @@ -18699,7 +18505,8 @@ dns_zonemgr_getcount(dns_zonemgr_t *zmgr, int state) break; case DNS_ZONESTATE_ANY: for (zone = ISC_LIST_HEAD(zmgr->zones); zone != NULL; - zone = ISC_LIST_NEXT(zone, link)) { + zone = ISC_LIST_NEXT(zone, link)) + { dns_view_t *view = zone->view; if (view != NULL && strcmp(view->name, "_bind") == 0) { continue; @@ -18709,7 +18516,8 @@ dns_zonemgr_getcount(dns_zonemgr_t *zmgr, int state) break; case DNS_ZONESTATE_AUTOMATIC: for (zone = ISC_LIST_HEAD(zmgr->zones); zone != NULL; - zone = ISC_LIST_NEXT(zone, link)) { + zone = ISC_LIST_NEXT(zone, link)) + { dns_view_t *view = zone->view; if (view != NULL && strcmp(view->name, "_bind") == 0) { continue; @@ -18731,25 +18539,26 @@ dns_zonemgr_getcount(dns_zonemgr_t *zmgr, int state) isc_result_t dns_zone_checknames(dns_zone_t *zone, const dns_name_t *name, - dns_rdata_t *rdata) -{ - bool ok = true; - bool fail = false; - char namebuf[DNS_NAME_FORMATSIZE]; - char namebuf2[DNS_NAME_FORMATSIZE]; - char typebuf[DNS_RDATATYPE_FORMATSIZE]; - int level = ISC_LOG_WARNING; + dns_rdata_t *rdata) { + bool ok = true; + bool fail = false; + char namebuf[DNS_NAME_FORMATSIZE]; + char namebuf2[DNS_NAME_FORMATSIZE]; + char typebuf[DNS_RDATATYPE_FORMATSIZE]; + int level = ISC_LOG_WARNING; dns_name_t bad; REQUIRE(DNS_ZONE_VALID(zone)); if (!DNS_ZONE_OPTION(zone, DNS_ZONEOPT_CHECKNAMES) && - rdata->type != dns_rdatatype_nsec3) { + rdata->type != dns_rdatatype_nsec3) + { return (ISC_R_SUCCESS); } if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_CHECKNAMESFAIL) || - rdata->type == dns_rdatatype_nsec3) { + rdata->type == dns_rdatatype_nsec3) + { level = ISC_LOG_ERROR; fail = true; } @@ -18782,29 +18591,25 @@ dns_zone_checknames(dns_zone_t *zone, const dns_name_t *name, } void -dns_zone_setcheckmx(dns_zone_t *zone, dns_checkmxfunc_t checkmx) -{ +dns_zone_setcheckmx(dns_zone_t *zone, dns_checkmxfunc_t checkmx) { REQUIRE(DNS_ZONE_VALID(zone)); zone->checkmx = checkmx; } void -dns_zone_setchecksrv(dns_zone_t *zone, dns_checksrvfunc_t checksrv) -{ +dns_zone_setchecksrv(dns_zone_t *zone, dns_checksrvfunc_t checksrv) { REQUIRE(DNS_ZONE_VALID(zone)); zone->checksrv = checksrv; } void -dns_zone_setcheckns(dns_zone_t *zone, dns_checknsfunc_t checkns) -{ +dns_zone_setcheckns(dns_zone_t *zone, dns_checknsfunc_t checkns) { REQUIRE(DNS_ZONE_VALID(zone)); zone->checkns = checkns; } void -dns_zone_setisself(dns_zone_t *zone, dns_isselffunc_t isself, void *arg) -{ +dns_zone_setisself(dns_zone_t *zone, dns_isselffunc_t isself, void *arg) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -18814,8 +18619,7 @@ dns_zone_setisself(dns_zone_t *zone, dns_isselffunc_t isself, void *arg) } void -dns_zone_setnotifydelay(dns_zone_t *zone, uint32_t delay) -{ +dns_zone_setnotifydelay(dns_zone_t *zone, uint32_t delay) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -18824,8 +18628,7 @@ dns_zone_setnotifydelay(dns_zone_t *zone, uint32_t delay) } uint32_t -dns_zone_getnotifydelay(dns_zone_t *zone) -{ +dns_zone_getnotifydelay(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->notifydelay); @@ -18833,8 +18636,7 @@ dns_zone_getnotifydelay(dns_zone_t *zone) isc_result_t dns_zone_signwithkey(dns_zone_t *zone, dns_secalg_t algorithm, uint16_t keyid, - bool deleteit) -{ + bool deleteit) { isc_result_t result; REQUIRE(DNS_ZONE_VALID(zone)); @@ -18855,10 +18657,9 @@ dns_zone_signwithkey(dns_zone_t *zone, dns_secalg_t algorithm, uint16_t keyid, * logged. Then call zone_addnsec3chain(), passing NSEC3PARAM RDATA to it. */ isc_result_t -dns_zone_addnsec3chain(dns_zone_t *zone, dns_rdata_nsec3param_t *nsec3param) -{ +dns_zone_addnsec3chain(dns_zone_t *zone, dns_rdata_nsec3param_t *nsec3param) { isc_result_t result; - char salt[255 * 2 + 1]; + char salt[255 * 2 + 1]; REQUIRE(DNS_ZONE_VALID(zone)); @@ -18875,8 +18676,7 @@ dns_zone_addnsec3chain(dns_zone_t *zone, dns_rdata_nsec3param_t *nsec3param) } void -dns_zone_setnodes(dns_zone_t *zone, uint32_t nodes) -{ +dns_zone_setnodes(dns_zone_t *zone, uint32_t nodes) { REQUIRE(DNS_ZONE_VALID(zone)); if (nodes == 0) { @@ -18886,8 +18686,7 @@ dns_zone_setnodes(dns_zone_t *zone, uint32_t nodes) } void -dns_zone_setsignatures(dns_zone_t *zone, uint32_t signatures) -{ +dns_zone_setsignatures(dns_zone_t *zone, uint32_t signatures) { REQUIRE(DNS_ZONE_VALID(zone)); /* @@ -18903,35 +18702,31 @@ dns_zone_setsignatures(dns_zone_t *zone, uint32_t signatures) } uint32_t -dns_zone_getsignatures(dns_zone_t *zone) -{ +dns_zone_getsignatures(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->signatures); } void -dns_zone_setprivatetype(dns_zone_t *zone, dns_rdatatype_t type) -{ +dns_zone_setprivatetype(dns_zone_t *zone, dns_rdatatype_t type) { REQUIRE(DNS_ZONE_VALID(zone)); zone->privatetype = type; } dns_rdatatype_t -dns_zone_getprivatetype(dns_zone_t *zone) -{ +dns_zone_getprivatetype(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->privatetype); } static isc_result_t zone_signwithkey(dns_zone_t *zone, dns_secalg_t algorithm, uint16_t keyid, - bool deleteit) -{ + bool deleteit) { dns_signing_t *signing; dns_signing_t *current; - isc_result_t result = ISC_R_SUCCESS; - isc_time_t now; - dns_db_t * db = NULL; + isc_result_t result = ISC_R_SUCCESS; + isc_time_t now; + dns_db_t *db = NULL; signing = isc_mem_get(zone->mctx, sizeof *signing); @@ -18959,10 +18754,12 @@ zone_signwithkey(dns_zone_t *zone, dns_secalg_t algorithm, uint16_t keyid, dns_db_attach(db, &signing->db); for (current = ISC_LIST_HEAD(zone->signing); current != NULL; - current = ISC_LIST_NEXT(current, link)) { + current = ISC_LIST_NEXT(current, link)) + { if (current->db == signing->db && current->algorithm == signing->algorithm && - current->keyid == signing->keyid) { + current->keyid == signing->keyid) + { if (current->deleteit != signing->deleteit) { current->done = true; } else { @@ -19005,8 +18802,7 @@ cleanup: } static void -clear_keylist(dns_dnsseckeylist_t *list, isc_mem_t *mctx) -{ +clear_keylist(dns_dnsseckeylist_t *list, isc_mem_t *mctx) { dns_dnsseckey_t *key; while (!ISC_LIST_EMPTY(*list)) { key = ISC_LIST_HEAD(*list); @@ -19017,11 +18813,10 @@ clear_keylist(dns_dnsseckeylist_t *list, isc_mem_t *mctx) /* Called once; *timep should be set to the current time. */ static isc_result_t -next_keyevent(dst_key_t *key, isc_stdtime_t *timep) -{ - isc_result_t result; +next_keyevent(dst_key_t *key, isc_stdtime_t *timep) { + isc_result_t result; isc_stdtime_t now, then = 0, event; - int i; + int i; now = *timep; @@ -19043,11 +18838,10 @@ next_keyevent(dst_key_t *key, isc_stdtime_t *timep) static isc_result_t rr_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, - const dns_rdata_t *rdata, bool *flag) -{ + const dns_rdata_t *rdata, bool *flag) { dns_rdataset_t rdataset; - dns_dbnode_t * node = NULL; - isc_result_t result; + dns_dbnode_t *node = NULL; + isc_result_t result; dns_rdataset_init(&rdataset); if (rdata->type == dns_rdatatype_nsec3) { @@ -19064,7 +18858,8 @@ rr_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t myrdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &myrdata); if (!dns_rdata_compare(&myrdata, rdata)) { @@ -19091,29 +18886,29 @@ failure: */ static isc_result_t add_signing_records(dns_db_t *db, dns_rdatatype_t privatetype, - dns_dbversion_t *ver, dns_diff_t *diff, bool sign_all) -{ - dns_difftuple_t * tuple, *newtuple = NULL; + dns_dbversion_t *ver, dns_diff_t *diff, bool sign_all) { + dns_difftuple_t *tuple, *newtuple = NULL; dns_rdata_dnskey_t dnskey; - dns_rdata_t rdata = DNS_RDATA_INIT; - bool flag; - isc_region_t r; - isc_result_t result = ISC_R_SUCCESS; - uint16_t keyid; - unsigned char buf[5]; - dns_name_t * name = dns_db_origin(db); + dns_rdata_t rdata = DNS_RDATA_INIT; + bool flag; + isc_region_t r; + isc_result_t result = ISC_R_SUCCESS; + uint16_t keyid; + unsigned char buf[5]; + dns_name_t *name = dns_db_origin(db); for (tuple = ISC_LIST_HEAD(diff->tuples); tuple != NULL; - tuple = ISC_LIST_NEXT(tuple, link)) { + tuple = ISC_LIST_NEXT(tuple, link)) + { if (tuple->rdata.type != dns_rdatatype_dnskey) { continue; } result = dns_rdata_tostruct(&tuple->rdata, &dnskey, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); - if ((dnskey.flags & - (DNS_KEYFLAG_OWNERMASK | DNS_KEYTYPE_NOAUTH)) != - DNS_KEYOWNER_ZONE) { + if ((dnskey.flags & (DNS_KEYFLAG_OWNERMASK | + DNS_KEYTYPE_NOAUTH)) != DNS_KEYOWNER_ZONE) + { continue; } @@ -19170,13 +18965,14 @@ tickle_apex_rrset(dns_rdatatype_t rrtype, dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, isc_stdtime_t now, dns_diff_t *diff, dns__zonediff_t *zonediff, dst_key_t **keys, unsigned int nkeys, isc_stdtime_t inception, - isc_stdtime_t keyexpire, bool check_ksk, bool keyset_kskonly) -{ + isc_stdtime_t keyexpire, bool check_ksk, + bool keyset_kskonly) { dns_difftuple_t *tuple; - isc_result_t result; + isc_result_t result; for (tuple = ISC_LIST_HEAD(diff->tuples); tuple != NULL; - tuple = ISC_LIST_NEXT(tuple, link)) { + tuple = ISC_LIST_NEXT(tuple, link)) + { if (tuple->rdata.type == rrtype && dns_name_equal(&tuple->name, &zone->origin)) { break; @@ -19209,13 +19005,12 @@ tickle_apex_rrset(dns_rdatatype_t rrtype, dns_zone_t *zone, dns_db_t *db, static isc_result_t sign_apex(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, - isc_stdtime_t now, dns_diff_t *diff, dns__zonediff_t *zonediff) -{ - isc_result_t result; + isc_stdtime_t now, dns_diff_t *diff, dns__zonediff_t *zonediff) { + isc_result_t result; isc_stdtime_t inception, soaexpire, keyexpire; - bool check_ksk, keyset_kskonly; - dst_key_t * zone_keys[DNS_MAXZONEKEYS]; - unsigned int nkeys = 0, i; + bool check_ksk, keyset_kskonly; + dst_key_t *zone_keys[DNS_MAXZONEKEYS]; + unsigned int nkeys = 0, i; result = dns__zone_findkeys(zone, db, ver, now, zone->mctx, DNS_MAXZONEKEYS, zone_keys, &nkeys); @@ -19288,16 +19083,16 @@ failure: */ static bool dnskey_sane(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, - dns_diff_t *diff) -{ - isc_result_t result; + dns_diff_t *diff) { + isc_result_t result; dns_difftuple_t *tuple; - bool nseconly = false, nsec3 = false; - dns_rdatatype_t privatetype = dns_zone_getprivatetype(zone); + bool nseconly = false, nsec3 = false; + dns_rdatatype_t privatetype = dns_zone_getprivatetype(zone); /* Scan the tuples for an NSEC-only DNSKEY */ for (tuple = ISC_LIST_HEAD(diff->tuples); tuple != NULL; - tuple = ISC_LIST_NEXT(tuple, link)) { + tuple = ISC_LIST_NEXT(tuple, link)) + { uint8_t alg; if (tuple->rdata.type != dns_rdatatype_dnskey || tuple->op != DNS_DIFFOP_ADD) { @@ -19340,10 +19135,9 @@ failure: static isc_result_t clean_nsec3param(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, - dns_diff_t *diff) -{ - isc_result_t result; - dns_dbnode_t * node = NULL; + dns_diff_t *diff) { + isc_result_t result; + dns_dbnode_t *node = NULL; dns_rdataset_t rdataset; dns_rdataset_init(&rdataset); @@ -19372,11 +19166,10 @@ failure: * are any signatures using that algorithm. */ static bool -signed_with_alg(dns_rdataset_t *rdataset, dns_secalg_t alg) -{ - dns_rdata_t rdata = DNS_RDATA_INIT; +signed_with_alg(dns_rdataset_t *rdataset, dns_secalg_t alg) { + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_rrsig_t rrsig; - isc_result_t result; + isc_result_t result; REQUIRE(rdataset == NULL || rdataset->type == dns_rdatatype_rrsig); if (rdataset == NULL || !dns_rdataset_isassociated(rdataset)) { @@ -19384,7 +19177,8 @@ signed_with_alg(dns_rdataset_t *rdataset, dns_secalg_t alg) } for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { dns_rdataset_current(rdataset, &rdata); result = dns_rdata_tostruct(&rdata, &rrsig, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); @@ -19399,10 +19193,9 @@ signed_with_alg(dns_rdataset_t *rdataset, dns_secalg_t alg) static isc_result_t add_chains(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, - dns_diff_t *diff) -{ - dns_name_t * origin; - bool build_nsec3; + dns_diff_t *diff) { + dns_name_t *origin; + bool build_nsec3; isc_result_t result; origin = dns_db_origin(db); @@ -19419,8 +19212,7 @@ failure: } static void -dnssec_report(const char *format, ...) -{ +dnssec_report(const char *format, ...) { va_list args; va_start(args, format); isc_log_vwrite(dns_lctx, DNS_LOGCATEGORY_DNSSEC, DNS_LOGMODULE_ZONE, @@ -19429,28 +19221,27 @@ dnssec_report(const char *format, ...) } static void -zone_rekey(dns_zone_t *zone) -{ - isc_result_t result; - dns_db_t * db = NULL; - dns_dbnode_t * node = NULL; +zone_rekey(dns_zone_t *zone) { + isc_result_t result; + dns_db_t *db = NULL; + dns_dbnode_t *node = NULL; dns_dbversion_t *ver = NULL; - dns_rdataset_t cdsset, soaset, soasigs, keyset, keysigs, cdnskeyset; + dns_rdataset_t cdsset, soaset, soasigs, keyset, keysigs, cdnskeyset; dns_dnsseckeylist_t dnskeys, keys, rmkeys; - dns_dnsseckey_t * key = NULL; - dns_diff_t diff, _sig_diff; - dns_kasp_t * kasp; - dns__zonediff_t zonediff; - bool commit = false, newactive = false; - bool newalg = false; - bool fullsign; - dns_ttl_t ttl = 3600; - const char * dir = NULL; - isc_mem_t * mctx = NULL; - isc_stdtime_t now, nexttime = 0; - isc_time_t timenow; - isc_interval_t ival; - char timebuf[80]; + dns_dnsseckey_t *key = NULL; + dns_diff_t diff, _sig_diff; + dns_kasp_t *kasp; + dns__zonediff_t zonediff; + bool commit = false, newactive = false; + bool newalg = false; + bool fullsign; + dns_ttl_t ttl = 3600; + const char *dir = NULL; + isc_mem_t *mctx = NULL; + isc_stdtime_t now, nexttime = 0; + isc_time_t timenow; + isc_interval_t ival; + char timebuf[80]; REQUIRE(DNS_ZONE_VALID(zone)); @@ -19600,7 +19391,8 @@ zone_rekey(dns_zone_t *zone) } if ((newactive || fullsign || !ISC_LIST_EMPTY(diff.tuples)) && - dnskey_sane(zone, db, ver, &diff)) { + dnskey_sane(zone, db, ver, &diff)) + { CHECK(dns_diff_apply(&diff, db, ver)); CHECK(clean_nsec3param(zone, db, ver, &diff)); CHECK(add_signing_records(db, zone->privatetype, ver, @@ -19700,9 +19492,10 @@ zone_rekey(dns_zone_t *zone) * deferred NSEC3PARAM changes. */ for (tuple = ISC_LIST_HEAD(zonediff.diff->tuples); - tuple != NULL; tuple = ISC_LIST_NEXT(tuple, link)) { - unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE]; - dns_rdata_t rdata = DNS_RDATA_INIT; + tuple != NULL; tuple = ISC_LIST_NEXT(tuple, link)) + { + unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE]; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_nsec3param_t nsec3param; if (tuple->rdata.type != zone->privatetype || @@ -19768,8 +19561,9 @@ zone_rekey(dns_zone_t *zone) * the next scheduled key event or to 'dnssec-loadkeys-interval' * seconds in the future, whichever is sooner. */ - else if (DNS_ZONEKEY_OPTION(zone, DNS_ZONEKEY_MAINTAIN)) { - isc_time_t timethen; + else if (DNS_ZONEKEY_OPTION(zone, DNS_ZONEKEY_MAINTAIN)) + { + isc_time_t timethen; isc_stdtime_t then; DNS_ZONE_TIME_ADD(&timenow, zone->refreshkeyinterval, @@ -19847,8 +19641,7 @@ failure: } void -dns_zone_rekey(dns_zone_t *zone, bool fullsign) -{ +dns_zone_rekey(dns_zone_t *zone, bool fullsign) { isc_time_t now; if (zone->type == dns_zone_master && zone->task != NULL) { @@ -19868,9 +19661,8 @@ dns_zone_rekey(dns_zone_t *zone, bool fullsign) isc_result_t dns_zone_nscheck(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version, - unsigned int *errors) -{ - isc_result_t result; + unsigned int *errors) { + isc_result_t result; dns_dbnode_t *node = NULL; REQUIRE(DNS_ZONE_VALID(zone)); @@ -19886,14 +19678,13 @@ dns_zone_nscheck(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version, } isc_result_t -dns_zone_cdscheck(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version) -{ - isc_result_t result; - dns_dbnode_t * node = NULL; +dns_zone_cdscheck(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version) { + isc_result_t result; + dns_dbnode_t *node = NULL; dns_rdataset_t dnskey, cds, cdnskey; - unsigned char buffer[DNS_DS_BUFFERSIZE]; - unsigned char algorithms[256]; - unsigned int i; + unsigned char buffer[DNS_DS_BUFFERSIZE]; + unsigned char algorithms[256]; + unsigned int i; enum { notexpected = 0, expected = 1, found = 2 }; @@ -19949,8 +19740,9 @@ dns_zone_cdscheck(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version) bool delete = false; memset(algorithms, notexpected, sizeof(algorithms)); for (result = dns_rdataset_first(&cds); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&cds)) { - dns_rdata_t crdata = DNS_RDATA_INIT; + result = dns_rdataset_next(&cds)) + { + dns_rdata_t crdata = DNS_RDATA_INIT; dns_rdata_cds_t structcds; dns_rdataset_current(&cds, &crdata); @@ -19960,8 +19752,8 @@ dns_zone_cdscheck(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version) */ if (crdata.length == 5U && memcmp(crdata.data, - (unsigned char[5]){ 0, 0, 0, 0, 0 }, - 5) == 0) { + (unsigned char[5]){ 0, 0, 0, 0, 0 }, 5) == 0) + { delete = true; continue; } @@ -19971,7 +19763,8 @@ dns_zone_cdscheck(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version) } for (result = dns_rdataset_first(&dnskey); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&dnskey)) { + result = dns_rdataset_next(&dnskey)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_t dsrdata = DNS_RDATA_INIT; @@ -19981,7 +19774,8 @@ dns_zone_cdscheck(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version) buffer, &dsrdata)); if (crdata.length == dsrdata.length && memcmp(crdata.data, dsrdata.data, - dsrdata.length) == 0) { + dsrdata.length) == 0) + { algorithms[structcds.algorithm] = found; } } @@ -20012,8 +19806,9 @@ dns_zone_cdscheck(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version) memset(algorithms, notexpected, sizeof(algorithms)); for (result = dns_rdataset_first(&cdnskey); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&cdnskey)) { - dns_rdata_t crdata = DNS_RDATA_INIT; + result = dns_rdataset_next(&cdnskey)) + { + dns_rdata_t crdata = DNS_RDATA_INIT; dns_rdata_cdnskey_t structcdnskey; dns_rdataset_current(&cdnskey, &crdata); @@ -20024,8 +19819,8 @@ dns_zone_cdscheck(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version) */ if (crdata.length == 5U && memcmp(crdata.data, - (unsigned char[5]){ 0, 0, 3, 0, 0 }, - 5) == 0) { + (unsigned char[5]){ 0, 0, 3, 0, 0 }, 5) == 0) + { delete = true; continue; } @@ -20036,13 +19831,15 @@ dns_zone_cdscheck(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version) } for (result = dns_rdataset_first(&dnskey); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&dnskey)) { + result = dns_rdataset_next(&dnskey)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(&dnskey, &rdata); if (crdata.length == rdata.length && memcmp(crdata.data, rdata.data, - rdata.length) == 0) { + rdata.length) == 0) + { algorithms[structcdnskey.algorithm] = found; } @@ -20080,8 +19877,7 @@ failure: } void -dns_zone_setautomatic(dns_zone_t *zone, bool automatic) -{ +dns_zone_setautomatic(dns_zone_t *zone, bool automatic) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -20090,15 +19886,13 @@ dns_zone_setautomatic(dns_zone_t *zone, bool automatic) } bool -dns_zone_getautomatic(dns_zone_t *zone) -{ +dns_zone_getautomatic(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->automatic); } void -dns_zone_setadded(dns_zone_t *zone, bool added) -{ +dns_zone_setadded(dns_zone_t *zone, bool added) { REQUIRE(DNS_ZONE_VALID(zone)); LOCK_ZONE(zone); @@ -20107,18 +19901,16 @@ dns_zone_setadded(dns_zone_t *zone, bool added) } bool -dns_zone_getadded(dns_zone_t *zone) -{ +dns_zone_getadded(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->added); } isc_result_t -dns_zone_dlzpostload(dns_zone_t *zone, dns_db_t *db) -{ - isc_time_t loadtime; +dns_zone_dlzpostload(dns_zone_t *zone, dns_db_t *db) { + isc_time_t loadtime; isc_result_t result; - dns_zone_t * secure = NULL; + dns_zone_t *secure = NULL; TIME_NOW(&loadtime); @@ -20151,8 +19943,7 @@ again: } isc_result_t -dns_zone_setrefreshkeyinterval(dns_zone_t *zone, uint32_t interval) -{ +dns_zone_setrefreshkeyinterval(dns_zone_t *zone, uint32_t interval) { REQUIRE(DNS_ZONE_VALID(zone)); if (interval == 0) { return (ISC_R_RANGE); @@ -20167,43 +19958,37 @@ dns_zone_setrefreshkeyinterval(dns_zone_t *zone, uint32_t interval) } void -dns_zone_setrequestixfr(dns_zone_t *zone, bool flag) -{ +dns_zone_setrequestixfr(dns_zone_t *zone, bool flag) { REQUIRE(DNS_ZONE_VALID(zone)); zone->requestixfr = flag; } bool -dns_zone_getrequestixfr(dns_zone_t *zone) -{ +dns_zone_getrequestixfr(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->requestixfr); } void -dns_zone_setrequestexpire(dns_zone_t *zone, bool flag) -{ +dns_zone_setrequestexpire(dns_zone_t *zone, bool flag) { REQUIRE(DNS_ZONE_VALID(zone)); zone->requestexpire = flag; } bool -dns_zone_getrequestexpire(dns_zone_t *zone) -{ +dns_zone_getrequestexpire(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->requestexpire); } void -dns_zone_setserialupdatemethod(dns_zone_t *zone, dns_updatemethod_t method) -{ +dns_zone_setserialupdatemethod(dns_zone_t *zone, dns_updatemethod_t method) { REQUIRE(DNS_ZONE_VALID(zone)); zone->updatemethod = method; } dns_updatemethod_t -dns_zone_getserialupdatemethod(dns_zone_t *zone) -{ +dns_zone_getserialupdatemethod(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->updatemethod); } @@ -20212,9 +19997,8 @@ dns_zone_getserialupdatemethod(dns_zone_t *zone) * Lock hierarchy: zmgr, zone, raw. */ isc_result_t -dns_zone_link(dns_zone_t *zone, dns_zone_t *raw) -{ - isc_result_t result; +dns_zone_link(dns_zone_t *zone, dns_zone_t *raw) { + isc_result_t result; dns_zonemgr_t *zmgr; REQUIRE(DNS_ZONE_VALID(zone)); @@ -20273,8 +20057,7 @@ unlock: } void -dns_zone_getraw(dns_zone_t *zone, dns_zone_t **raw) -{ +dns_zone_getraw(dns_zone_t *zone, dns_zone_t **raw) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(raw != NULL && *raw == NULL); @@ -20287,29 +20070,28 @@ dns_zone_getraw(dns_zone_t *zone, dns_zone_t **raw) } struct keydone { - isc_event_t event; - bool all; + isc_event_t event; + bool all; unsigned char data[5]; }; #define PENDINGFLAGS (DNS_NSEC3FLAG_CREATE | DNS_NSEC3FLAG_INITIAL) static void -keydone(isc_task_t *task, isc_event_t *event) -{ - const char * me = "keydone"; - bool commit = false; - isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; +keydone(isc_task_t *task, isc_event_t *event) { + const char *me = "keydone"; + bool commit = false; + isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_dbversion_t *oldver = NULL, *newver = NULL; - dns_zone_t * zone; - dns_db_t * db = NULL; - dns_dbnode_t * node = NULL; - dns_rdataset_t rdataset; - dns_diff_t diff; - struct keydone * kd = (struct keydone *)event; + dns_zone_t *zone; + dns_db_t *db = NULL; + dns_dbnode_t *node = NULL; + dns_rdataset_t rdataset; + dns_diff_t diff; + struct keydone *kd = (struct keydone *)event; dns_update_log_t log = { update_log_cb, NULL }; - bool clear_pending = false; + bool clear_pending = false; UNUSED(task); @@ -20356,14 +20138,16 @@ keydone(isc_task_t *task, isc_event_t *event) } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { bool found = false; dns_rdataset_current(&rdataset, &rdata); if (kd->all) { if (rdata.length == 5 && rdata.data[0] != 0 && - rdata.data[3] == 0 && rdata.data[4] == 1) { + rdata.data[3] == 0 && rdata.data[4] == 1) + { found = true; } else if (rdata.data[0] == 0 && (rdata.data[2] & PENDINGFLAGS) != 0) { @@ -20430,12 +20214,11 @@ failure: } isc_result_t -dns_zone_keydone(dns_zone_t *zone, const char *keystr) -{ - isc_result_t result = ISC_R_SUCCESS; - isc_event_t * e; - isc_buffer_t b; - dns_zone_t * dummy = NULL; +dns_zone_keydone(dns_zone_t *zone, const char *keystr) { + isc_result_t result = ISC_R_SUCCESS; + isc_event_t *e; + isc_buffer_t b; + dns_zone_t *dummy = NULL; struct keydone *kd; REQUIRE(DNS_ZONE_VALID(zone)); @@ -20450,10 +20233,10 @@ dns_zone_keydone(dns_zone_t *zone, const char *keystr) kd->all = true; } else { isc_textregion_t r; - const char * algstr; - dns_keytag_t keyid; - dns_secalg_t alg; - size_t n; + const char *algstr; + dns_keytag_t keyid; + dns_secalg_t alg; + size_t n; kd->all = false; @@ -20501,8 +20284,7 @@ failure: * dns_zone_setnsec3param(). */ static void -setnsec3param(isc_task_t *task, isc_event_t *event) -{ +setnsec3param(isc_task_t *task, isc_event_t *event) { const char *me = "setnsec3param"; dns_zone_t *zone = event->ev_arg; @@ -20534,22 +20316,21 @@ setnsec3param(isc_task_t *task, isc_event_t *event) * resume_addnsec3chain(). */ static void -rss_post(dns_zone_t *zone, isc_event_t *event) -{ - const char * me = "rss_post"; - bool commit = false; - isc_result_t result; +rss_post(dns_zone_t *zone, isc_event_t *event) { + const char *me = "rss_post"; + bool commit = false; + isc_result_t result; dns_dbversion_t *oldver = NULL, *newver = NULL; - dns_db_t * db = NULL; - dns_dbnode_t * node = NULL; - dns_rdataset_t prdataset, nrdataset; - dns_diff_t diff; + dns_db_t *db = NULL; + dns_dbnode_t *node = NULL; + dns_rdataset_t prdataset, nrdataset; + dns_diff_t diff; struct np3event *npe = (struct np3event *)event; - nsec3param_t * np; + nsec3param_t *np; dns_update_log_t log = { update_log_cb, NULL }; - dns_rdata_t rdata; - bool nseconly; - bool exists = false; + dns_rdata_t rdata; + bool nseconly; + bool exists = false; ENTER; @@ -20588,7 +20369,8 @@ rss_post(dns_zone_t *zone, isc_event_t *event) if (result == ISC_R_SUCCESS) { for (result = dns_rdataset_first(&prdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&prdataset)) { + result = dns_rdataset_next(&prdataset)) + { dns_rdata_init(&rdata); dns_rdataset_current(&prdataset, &rdata); @@ -20611,13 +20393,15 @@ rss_post(dns_zone_t *zone, isc_event_t *event) if (result == ISC_R_SUCCESS) { for (result = dns_rdataset_first(&nrdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&nrdataset)) { + result = dns_rdataset_next(&nrdataset)) + { dns_rdata_init(&rdata); dns_rdataset_current(&nrdataset, &rdata); if (np->length == (rdata.length + 1) && memcmp(rdata.data, np->data + 1, np->length - 1) == - 0) { + 0) + { exists = true; break; } @@ -20741,18 +20525,17 @@ failure: isc_result_t dns_zone_setnsec3param(dns_zone_t *zone, uint8_t hash, uint8_t flags, uint16_t iter, uint8_t saltlen, unsigned char *salt, - bool replace) -{ - isc_result_t result = ISC_R_SUCCESS; + bool replace) { + isc_result_t result = ISC_R_SUCCESS; dns_rdata_nsec3param_t param; - dns_rdata_t nrdata = DNS_RDATA_INIT; - dns_rdata_t prdata = DNS_RDATA_INIT; - unsigned char nbuf[DNS_NSEC3PARAM_BUFFERSIZE]; - struct np3event * npe; - nsec3param_t * np; - dns_zone_t * dummy = NULL; - isc_buffer_t b; - isc_event_t * e; + dns_rdata_t nrdata = DNS_RDATA_INIT; + dns_rdata_t prdata = DNS_RDATA_INIT; + unsigned char nbuf[DNS_NSEC3PARAM_BUFFERSIZE]; + struct np3event *npe; + nsec3param_t *np; + dns_zone_t *dummy = NULL; + isc_buffer_t b; + isc_event_t *e; REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(salt != NULL); @@ -20815,8 +20598,7 @@ failure: } isc_result_t -dns_zone_getloadtime(dns_zone_t *zone, isc_time_t *loadtime) -{ +dns_zone_getloadtime(dns_zone_t *zone, isc_time_t *loadtime) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(loadtime != NULL); @@ -20827,8 +20609,7 @@ dns_zone_getloadtime(dns_zone_t *zone, isc_time_t *loadtime) } isc_result_t -dns_zone_getexpiretime(dns_zone_t *zone, isc_time_t *expiretime) -{ +dns_zone_getexpiretime(dns_zone_t *zone, isc_time_t *expiretime) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(expiretime != NULL); @@ -20839,8 +20620,7 @@ dns_zone_getexpiretime(dns_zone_t *zone, isc_time_t *expiretime) } isc_result_t -dns_zone_getrefreshtime(dns_zone_t *zone, isc_time_t *refreshtime) -{ +dns_zone_getrefreshtime(dns_zone_t *zone, isc_time_t *refreshtime) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(refreshtime != NULL); @@ -20851,8 +20631,7 @@ dns_zone_getrefreshtime(dns_zone_t *zone, isc_time_t *refreshtime) } isc_result_t -dns_zone_getrefreshkeytime(dns_zone_t *zone, isc_time_t *refreshkeytime) -{ +dns_zone_getrefreshkeytime(dns_zone_t *zone, isc_time_t *refreshkeytime) { REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(refreshkeytime != NULL); @@ -20863,11 +20642,10 @@ dns_zone_getrefreshkeytime(dns_zone_t *zone, isc_time_t *refreshkeytime) } unsigned int -dns_zone_getincludes(dns_zone_t *zone, char ***includesp) -{ +dns_zone_getincludes(dns_zone_t *zone, char ***includesp) { dns_include_t *include; - char ** array = NULL; - unsigned int n = 0; + char **array = NULL; + unsigned int n = 0; REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(includesp != NULL && *includesp == NULL); @@ -20879,7 +20657,8 @@ dns_zone_getincludes(dns_zone_t *zone, char ***includesp) array = isc_mem_allocate(zone->mctx, sizeof(char *) * zone->nincludes); for (include = ISC_LIST_HEAD(zone->includes); include != NULL; - include = ISC_LIST_NEXT(include, link)) { + include = ISC_LIST_NEXT(include, link)) + { INSIST(n < zone->nincludes); array[n++] = isc_mem_strdup(zone->mctx, include->name); } @@ -20892,33 +20671,30 @@ done: } void -dns_zone_setstatlevel(dns_zone_t *zone, dns_zonestat_level_t level) -{ +dns_zone_setstatlevel(dns_zone_t *zone, dns_zonestat_level_t level) { REQUIRE(DNS_ZONE_VALID(zone)); zone->statlevel = level; } dns_zonestat_level_t -dns_zone_getstatlevel(dns_zone_t *zone) -{ +dns_zone_getstatlevel(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->statlevel); } static void -setserial(isc_task_t *task, isc_event_t *event) -{ - uint32_t oldserial, desired; - const char * me = "setserial"; - bool commit = false; - isc_result_t result; +setserial(isc_task_t *task, isc_event_t *event) { + uint32_t oldserial, desired; + const char *me = "setserial"; + bool commit = false; + isc_result_t result; dns_dbversion_t *oldver = NULL, *newver = NULL; - dns_zone_t * zone; - dns_db_t * db = NULL; - dns_diff_t diff; - struct ssevent * sse = (struct ssevent *)event; + dns_zone_t *zone; + dns_db_t *db = NULL; + dns_diff_t diff; + struct ssevent *sse = (struct ssevent *)event; dns_update_log_t log = { update_log_cb, NULL }; dns_difftuple_t *oldtuple = NULL, *newtuple = NULL; @@ -21017,11 +20793,10 @@ failure: } isc_result_t -dns_zone_setserial(dns_zone_t *zone, uint32_t serial) -{ - isc_result_t result = ISC_R_SUCCESS; - dns_zone_t * dummy = NULL; - isc_event_t * e = NULL; +dns_zone_setserial(dns_zone_t *zone, uint32_t serial) { + isc_result_t result = ISC_R_SUCCESS; + dns_zone_t *dummy = NULL; + isc_event_t *e = NULL; struct ssevent *sse; REQUIRE(DNS_ZONE_VALID(zone)); @@ -21059,28 +20834,25 @@ failure: } isc_stats_t * -dns_zone_getgluecachestats(dns_zone_t *zone) -{ +dns_zone_getgluecachestats(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (zone->gluecachestats); } bool -dns_zone_isloaded(dns_zone_t *zone) -{ +dns_zone_isloaded(dns_zone_t *zone) { REQUIRE(DNS_ZONE_VALID(zone)); return (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)); } isc_result_t -dns_zone_verifydb(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver) -{ +dns_zone_verifydb(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver) { dns_dbversion_t *version = NULL; - dns_keytable_t * secroots = NULL; - isc_result_t result; - dns_name_t * origin; + dns_keytable_t *secroots = NULL; + isc_result_t result; + dns_name_t *origin; const char me[] = "dns_zone_verifydb"; diff --git a/lib/dns/zonekey.c b/lib/dns/zonekey.c index 8e4d1b4c16..a56f5fddf6 100644 --- a/lib/dns/zonekey.c +++ b/lib/dns/zonekey.c @@ -24,11 +24,10 @@ #include bool -dns_zonekey_iszonekey(dns_rdata_t *keyrdata) -{ - isc_result_t result; +dns_zonekey_iszonekey(dns_rdata_t *keyrdata) { + isc_result_t result; dns_rdata_dnskey_t key; - bool iszonekey = true; + bool iszonekey = true; REQUIRE(keyrdata != NULL); diff --git a/lib/dns/zoneverify.c b/lib/dns/zoneverify.c index 7000585298..d0644348cb 100644 --- a/lib/dns/zoneverify.c +++ b/lib/dns/zoneverify.c @@ -52,38 +52,38 @@ #include typedef struct vctx { - isc_mem_t * mctx; - dns_zone_t * zone; - dns_db_t * db; + isc_mem_t *mctx; + dns_zone_t *zone; + dns_db_t *db; dns_dbversion_t *ver; - dns_name_t * origin; - dns_keytable_t * secroots; - bool goodksk; - bool goodzsk; - dns_rdataset_t keyset; - dns_rdataset_t keysigs; - dns_rdataset_t soaset; - dns_rdataset_t soasigs; - dns_rdataset_t nsecset; - dns_rdataset_t nsecsigs; - dns_rdataset_t nsec3paramset; - dns_rdataset_t nsec3paramsigs; - unsigned char revoked_ksk[256]; - unsigned char revoked_zsk[256]; - unsigned char standby_ksk[256]; - unsigned char standby_zsk[256]; - unsigned char ksk_algorithms[256]; - unsigned char zsk_algorithms[256]; - unsigned char bad_algorithms[256]; - unsigned char act_algorithms[256]; - isc_heap_t * expected_chains; - isc_heap_t * found_chains; + dns_name_t *origin; + dns_keytable_t *secroots; + bool goodksk; + bool goodzsk; + dns_rdataset_t keyset; + dns_rdataset_t keysigs; + dns_rdataset_t soaset; + dns_rdataset_t soasigs; + dns_rdataset_t nsecset; + dns_rdataset_t nsecsigs; + dns_rdataset_t nsec3paramset; + dns_rdataset_t nsec3paramsigs; + unsigned char revoked_ksk[256]; + unsigned char revoked_zsk[256]; + unsigned char standby_ksk[256]; + unsigned char standby_zsk[256]; + unsigned char ksk_algorithms[256]; + unsigned char zsk_algorithms[256]; + unsigned char bad_algorithms[256]; + unsigned char act_algorithms[256]; + isc_heap_t *expected_chains; + isc_heap_t *found_chains; } vctx_t; struct nsec3_chain_fixed { - uint8_t hash; - uint8_t salt_length; - uint8_t next_length; + uint8_t hash; + uint8_t salt_length; + uint8_t next_length; uint16_t iterations; /* * The following non-fixed-length data is stored in memory after the @@ -102,8 +102,7 @@ struct nsec3_chain_fixed { * respectively. */ static void -zoneverify_log_error(const vctx_t *vctx, const char *fmt, ...) -{ +zoneverify_log_error(const vctx_t *vctx, const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -119,10 +118,9 @@ zoneverify_log_error(const vctx_t *vctx, const char *fmt, ...) static bool is_delegation(const vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, - uint32_t *ttlp) -{ + uint32_t *ttlp) { dns_rdataset_t nsset; - isc_result_t result; + isc_result_t result; if (dns_name_equal(name, vctx->origin)) { return (false); @@ -146,10 +144,9 @@ is_delegation(const vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, * 'node'; return false otherwise. */ static bool -has_dname(const vctx_t *vctx, dns_dbnode_t *node) -{ +has_dname(const vctx_t *vctx, dns_dbnode_t *node) { dns_rdataset_t dnameset; - isc_result_t result; + isc_result_t result; dns_rdataset_init(&dnameset); result = dns_db_findrdataset(vctx->db, node, vctx->ver, @@ -164,18 +161,18 @@ has_dname(const vctx_t *vctx, dns_dbnode_t *node) static bool goodsig(const vctx_t *vctx, dns_rdata_t *sigrdata, const dns_name_t *name, - dns_rdataset_t *keyrdataset, dns_rdataset_t *rdataset) -{ + dns_rdataset_t *keyrdataset, dns_rdataset_t *rdataset) { dns_rdata_dnskey_t key; - dns_rdata_rrsig_t sig; - dst_key_t * dstkey = NULL; - isc_result_t result; + dns_rdata_rrsig_t sig; + dst_key_t *dstkey = NULL; + isc_result_t result; result = dns_rdata_tostruct(sigrdata, &sig, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); for (result = dns_rdataset_first(keyrdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(keyrdataset)) { + result = dns_rdataset_next(keyrdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(keyrdataset, &rdata); result = dns_rdata_tostruct(&rdata, &key, NULL); @@ -187,7 +184,8 @@ goodsig(const vctx_t *vctx, dns_rdata_t *sigrdata, const dns_name_t *name, } if (sig.algorithm != key.algorithm || sig.keyid != dst_key_id(dstkey) || - !dns_name_equal(&sig.signer, vctx->origin)) { + !dns_name_equal(&sig.signer, vctx->origin)) + { dst_key_free(&dstkey); continue; } @@ -202,16 +200,16 @@ goodsig(const vctx_t *vctx, dns_rdata_t *sigrdata, const dns_name_t *name, } static bool -nsec_bitmap_equal(dns_rdata_nsec_t *nsec, dns_rdata_t *rdata) -{ - isc_result_t result; +nsec_bitmap_equal(dns_rdata_nsec_t *nsec, dns_rdata_t *rdata) { + isc_result_t result; dns_rdata_nsec_t tmpnsec; result = dns_rdata_tostruct(rdata, &tmpnsec, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); if (nsec->len != tmpnsec.len || - memcmp(nsec->typebits, tmpnsec.typebits, nsec->len) != 0) { + memcmp(nsec->typebits, tmpnsec.typebits, nsec->len) != 0) + { return (false); } return (true); @@ -219,17 +217,16 @@ nsec_bitmap_equal(dns_rdata_nsec_t *nsec, dns_rdata_t *rdata) static isc_result_t verifynsec(const vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, - const dns_name_t *nextname, isc_result_t *vresult) -{ - unsigned char buffer[DNS_NSEC_BUFFERSIZE]; - char namebuf[DNS_NAME_FORMATSIZE]; - char nextbuf[DNS_NAME_FORMATSIZE]; - char found[DNS_NAME_FORMATSIZE]; - dns_rdataset_t rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdata_t tmprdata = DNS_RDATA_INIT; + const dns_name_t *nextname, isc_result_t *vresult) { + unsigned char buffer[DNS_NSEC_BUFFERSIZE]; + char namebuf[DNS_NAME_FORMATSIZE]; + char nextbuf[DNS_NAME_FORMATSIZE]; + char found[DNS_NAME_FORMATSIZE]; + dns_rdataset_t rdataset; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_t tmprdata = DNS_RDATA_INIT; dns_rdata_nsec_t nsec; - isc_result_t result; + isc_result_t result; dns_rdataset_init(&rdataset); result = dns_db_findrdataset(vctx->db, node, vctx->ver, @@ -307,13 +304,12 @@ done: static isc_result_t check_no_rrsig(const vctx_t *vctx, const dns_rdataset_t *rdataset, - const dns_name_t *name, dns_dbnode_t *node) -{ - char namebuf[DNS_NAME_FORMATSIZE]; - char typebuf[DNS_RDATATYPE_FORMATSIZE]; - dns_rdataset_t sigrdataset; + const dns_name_t *name, dns_dbnode_t *node) { + char namebuf[DNS_NAME_FORMATSIZE]; + char typebuf[DNS_RDATATYPE_FORMATSIZE]; + dns_rdataset_t sigrdataset; dns_rdatasetiter_t *rdsiter = NULL; - isc_result_t result; + isc_result_t result; dns_rdataset_init(&sigrdataset); result = dns_db_allrdatasets(vctx->db, node, vctx->ver, 0, &rdsiter); @@ -323,10 +319,12 @@ check_no_rrsig(const vctx_t *vctx, const dns_rdataset_t *rdataset, return (result); } for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(rdsiter)) { + result = dns_rdatasetiter_next(rdsiter)) + { dns_rdatasetiter_current(rdsiter, &sigrdataset); if (sigrdataset.type == dns_rdatatype_rrsig && - sigrdataset.covers == rdataset->type) { + sigrdataset.covers == rdataset->type) + { break; } dns_rdataset_disassociate(&sigrdataset); @@ -348,10 +346,9 @@ check_no_rrsig(const vctx_t *vctx, const dns_rdataset_t *rdataset, } static bool -chain_compare(void *arg1, void *arg2) -{ +chain_compare(void *arg1, void *arg2) { struct nsec3_chain_fixed *e1 = arg1, *e2 = arg2; - size_t len; + size_t len; /* * Do each element in turn to get a stable sort. @@ -389,8 +386,7 @@ chain_compare(void *arg1, void *arg2) static bool chain_equal(const struct nsec3_chain_fixed *e1, - const struct nsec3_chain_fixed *e2) -{ + const struct nsec3_chain_fixed *e2) { size_t len; if (e1->hash != e2->hash) { @@ -414,12 +410,11 @@ chain_equal(const struct nsec3_chain_fixed *e1, static isc_result_t record_nsec3(const vctx_t *vctx, const unsigned char *rawhash, - const dns_rdata_nsec3_t *nsec3, isc_heap_t *chains) -{ + const dns_rdata_nsec3_t *nsec3, isc_heap_t *chains) { struct nsec3_chain_fixed *element; - size_t len; - unsigned char * cp; - isc_result_t result; + size_t len; + unsigned char *cp; + isc_result_t result; len = sizeof(*element) + nsec3->next_length * 2 + nsec3->salt_length; @@ -448,19 +443,20 @@ static isc_result_t match_nsec3(const vctx_t *vctx, const dns_name_t *name, const dns_rdata_nsec3param_t *nsec3param, dns_rdataset_t *rdataset, const unsigned char types[8192], unsigned int maxtype, - const unsigned char *rawhash, size_t rhsize, isc_result_t *vresult) -{ - unsigned char cbm[8244]; - char namebuf[DNS_NAME_FORMATSIZE]; + const unsigned char *rawhash, size_t rhsize, + isc_result_t *vresult) { + unsigned char cbm[8244]; + char namebuf[DNS_NAME_FORMATSIZE]; dns_rdata_nsec3_t nsec3; - isc_result_t result; - unsigned int len; + isc_result_t result; + unsigned int len; /* * Find matching NSEC3 record. */ for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(rdataset, &rdata); result = dns_rdata_tostruct(&rdata, &nsec3, NULL); @@ -470,7 +466,8 @@ match_nsec3(const vctx_t *vctx, const dns_name_t *name, nsec3.iterations == nsec3param->iterations && nsec3.salt_length == nsec3param->salt_length && memcmp(nsec3.salt, nsec3param->salt, - nsec3param->salt_length) == 0) { + nsec3param->salt_length) == 0) + { break; } } @@ -511,7 +508,8 @@ match_nsec3(const vctx_t *vctx, const dns_name_t *name, * parameters. */ for (result = dns_rdataset_next(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(rdataset, &rdata); result = dns_rdata_tostruct(&rdata, &nsec3, NULL); @@ -520,7 +518,8 @@ match_nsec3(const vctx_t *vctx, const dns_name_t *name, nsec3.iterations == nsec3param->iterations && nsec3.salt_length == nsec3param->salt_length && memcmp(nsec3.salt, nsec3param->salt, nsec3.salt_length) == - 0) { + 0) + { dns_name_format(name, namebuf, sizeof(namebuf)); zoneverify_log_error(vctx, "Multiple NSEC3 records with the " @@ -540,14 +539,13 @@ match_nsec3(const vctx_t *vctx, const dns_name_t *name, } static bool -innsec3params(const dns_rdata_nsec3_t *nsec3, dns_rdataset_t *nsec3paramset) -{ +innsec3params(const dns_rdata_nsec3_t *nsec3, dns_rdataset_t *nsec3paramset) { dns_rdata_nsec3param_t nsec3param; - isc_result_t result; + isc_result_t result; for (result = dns_rdataset_first(nsec3paramset); - result == ISC_R_SUCCESS; - result = dns_rdataset_next(nsec3paramset)) { + result == ISC_R_SUCCESS; result = dns_rdataset_next(nsec3paramset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(nsec3paramset, &rdata); @@ -557,7 +555,8 @@ innsec3params(const dns_rdata_nsec3_t *nsec3, dns_rdataset_t *nsec3paramset) nsec3param.iterations == nsec3->iterations && nsec3param.salt_length == nsec3->salt_length && memcmp(nsec3param.salt, nsec3->salt, nsec3->salt_length) == - 0) { + 0) + { return (true); } } @@ -566,17 +565,16 @@ innsec3params(const dns_rdata_nsec3_t *nsec3, dns_rdataset_t *nsec3paramset) static isc_result_t record_found(const vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, - dns_rdataset_t *nsec3paramset) -{ - unsigned char owner[NSEC3_MAX_HASH_LENGTH]; + dns_rdataset_t *nsec3paramset) { + unsigned char owner[NSEC3_MAX_HASH_LENGTH]; dns_rdata_nsec3_t nsec3; - dns_rdataset_t rdataset; - dns_label_t hashlabel; - isc_buffer_t b; - isc_result_t result; + dns_rdataset_t rdataset; + dns_label_t hashlabel; + isc_buffer_t b; + isc_result_t result; - if (nsec3paramset == NULL || - !dns_rdataset_isassociated(nsec3paramset)) { + if (nsec3paramset == NULL || !dns_rdataset_isassociated(nsec3paramset)) + { return (ISC_R_SUCCESS); } @@ -598,7 +596,8 @@ record_found(const vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &rdata); result = dns_rdata_tostruct(&rdata, &nsec3, NULL); @@ -632,18 +631,17 @@ cleanup: } static isc_result_t -isoptout(const vctx_t *vctx, const dns_rdata_t *nsec3rdata, bool *optout) -{ - dns_rdataset_t rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdata_nsec3_t nsec3; +isoptout(const vctx_t *vctx, const dns_rdata_t *nsec3rdata, bool *optout) { + dns_rdataset_t rdataset; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_nsec3_t nsec3; dns_rdata_nsec3param_t nsec3param; - dns_fixedname_t fixed; - dns_name_t * hashname; - isc_result_t result; - dns_dbnode_t * node = NULL; - unsigned char rawhash[NSEC3_MAX_HASH_LENGTH]; - size_t rhsize = sizeof(rawhash); + dns_fixedname_t fixed; + dns_name_t *hashname; + isc_result_t result; + dns_dbnode_t *node = NULL; + unsigned char rawhash[NSEC3_MAX_HASH_LENGTH]; + size_t rhsize = sizeof(rawhash); result = dns_rdata_tostruct(nsec3rdata, &nsec3param, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); @@ -701,19 +699,18 @@ static isc_result_t verifynsec3(const vctx_t *vctx, const dns_name_t *name, const dns_rdata_t *rdata, bool delegation, bool empty, const unsigned char types[8192], unsigned int maxtype, - isc_result_t *vresult) -{ - char namebuf[DNS_NAME_FORMATSIZE]; - char hashbuf[DNS_NAME_FORMATSIZE]; - dns_rdataset_t rdataset; + isc_result_t *vresult) { + char namebuf[DNS_NAME_FORMATSIZE]; + char hashbuf[DNS_NAME_FORMATSIZE]; + dns_rdataset_t rdataset; dns_rdata_nsec3param_t nsec3param; - dns_fixedname_t fixed; - dns_name_t * hashname; - isc_result_t result, tvresult = ISC_R_UNSET; - dns_dbnode_t * node = NULL; - unsigned char rawhash[NSEC3_MAX_HASH_LENGTH]; - size_t rhsize = sizeof(rawhash); - bool optout = false; + dns_fixedname_t fixed; + dns_name_t *hashname; + isc_result_t result, tvresult = ISC_R_UNSET; + dns_dbnode_t *node = NULL; + unsigned char rawhash[NSEC3_MAX_HASH_LENGTH]; + size_t rhsize = sizeof(rawhash); + bool optout = false; result = dns_rdata_tostruct(rdata, &nsec3param, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); @@ -757,13 +754,14 @@ verifynsec3(const vctx_t *vctx, const dns_name_t *name, } if (result != ISC_R_SUCCESS && (!delegation || (empty && !optout) || - (!empty && dns_nsec_isset(types, dns_rdatatype_ds)))) { + (!empty && dns_nsec_isset(types, dns_rdatatype_ds)))) + { dns_name_format(name, namebuf, sizeof(namebuf)); dns_name_format(hashname, hashbuf, sizeof(hashbuf)); zoneverify_log_error(vctx, "Missing NSEC3 record for %s (%s)", namebuf, hashbuf); - } else if (result == ISC_R_NOTFOUND && delegation && - (!empty || optout)) { + } else if (result == ISC_R_NOTFOUND && delegation && (!empty || optout)) + { result = ISC_R_SUCCESS; } else if (result == ISC_R_SUCCESS) { result = match_nsec3(vctx, name, &nsec3param, &rdataset, types, @@ -792,13 +790,12 @@ static isc_result_t verifynsec3s(const vctx_t *vctx, const dns_name_t *name, dns_rdataset_t *nsec3paramset, bool delegation, bool empty, const unsigned char types[8192], unsigned int maxtype, - isc_result_t *vresult) -{ + isc_result_t *vresult) { isc_result_t result; for (result = dns_rdataset_first(nsec3paramset); - result == ISC_R_SUCCESS; - result = dns_rdataset_next(nsec3paramset)) { + result == ISC_R_SUCCESS; result = dns_rdataset_next(nsec3paramset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(nsec3paramset, &rdata); @@ -819,16 +816,15 @@ verifynsec3s(const vctx_t *vctx, const dns_name_t *name, static isc_result_t verifyset(vctx_t *vctx, dns_rdataset_t *rdataset, const dns_name_t *name, - dns_dbnode_t *node, dns_rdataset_t *keyrdataset) -{ - unsigned char set_algorithms[256]; - char namebuf[DNS_NAME_FORMATSIZE]; - char algbuf[DNS_SECALG_FORMATSIZE]; - char typebuf[DNS_RDATATYPE_FORMATSIZE]; - dns_rdataset_t sigrdataset; + dns_dbnode_t *node, dns_rdataset_t *keyrdataset) { + unsigned char set_algorithms[256]; + char namebuf[DNS_NAME_FORMATSIZE]; + char algbuf[DNS_SECALG_FORMATSIZE]; + char typebuf[DNS_RDATATYPE_FORMATSIZE]; + dns_rdataset_t sigrdataset; dns_rdatasetiter_t *rdsiter = NULL; - isc_result_t result; - int i; + isc_result_t result; + int i; dns_rdataset_init(&sigrdataset); result = dns_db_allrdatasets(vctx->db, node, vctx->ver, 0, &rdsiter); @@ -838,10 +834,12 @@ verifyset(vctx_t *vctx, dns_rdataset_t *rdataset, const dns_name_t *name, return (result); } for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(rdsiter)) { + result = dns_rdatasetiter_next(rdsiter)) + { dns_rdatasetiter_current(rdsiter, &sigrdataset); if (sigrdataset.type == dns_rdatatype_rrsig && - sigrdataset.covers == rdataset->type) { + sigrdataset.covers == rdataset->type) + { break; } dns_rdataset_disassociate(&sigrdataset); @@ -862,8 +860,9 @@ verifyset(vctx_t *vctx, dns_rdataset_t *rdataset, const dns_name_t *name, memset(set_algorithms, 0, sizeof(set_algorithms)); for (result = dns_rdataset_first(&sigrdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&sigrdataset)) { - dns_rdata_t rdata = DNS_RDATA_INIT; + result = dns_rdataset_next(&sigrdataset)) + { + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_rrsig_t sig; dns_rdataset_current(&sigrdataset, &rdata); @@ -880,7 +879,8 @@ verifyset(vctx_t *vctx, dns_rdataset_t *rdataset, const dns_name_t *name, continue; } if ((set_algorithms[sig.algorithm] != 0) || - (vctx->act_algorithms[sig.algorithm] == 0)) { + (vctx->act_algorithms[sig.algorithm] == 0)) + { continue; } if (goodsig(vctx, &rdata, name, keyrdataset, rdataset)) { @@ -921,13 +921,12 @@ static isc_result_t verifynode(vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, bool delegation, dns_rdataset_t *keyrdataset, dns_rdataset_t *nsecset, dns_rdataset_t *nsec3paramset, - const dns_name_t *nextname, isc_result_t *vresult) -{ - unsigned char types[8192]; - unsigned int maxtype = 0; - dns_rdataset_t rdataset; + const dns_name_t *nextname, isc_result_t *vresult) { + unsigned char types[8192]; + unsigned int maxtype = 0; + dns_rdataset_t rdataset; dns_rdatasetiter_t *rdsiter = NULL; - isc_result_t result, tvresult = ISC_R_UNSET; + isc_result_t result, tvresult = ISC_R_UNSET; REQUIRE(vresult != NULL || (nsecset == NULL && nsec3paramset == NULL)); @@ -952,7 +951,8 @@ verifynode(vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, if (rdataset.type != dns_rdatatype_rrsig && rdataset.type != dns_rdatatype_dnskey && (!delegation || rdataset.type == dns_rdatatype_ds || - rdataset.type == dns_rdatatype_nsec)) { + rdataset.type == dns_rdatatype_nsec)) + { result = verifyset(vctx, &rdataset, name, node, keyrdataset); if (result != ISC_R_SUCCESS) { @@ -965,7 +965,8 @@ verifynode(vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, maxtype = rdataset.type; } } else if (rdataset.type != dns_rdatatype_rrsig && - rdataset.type != dns_rdatatype_dnskey) { + rdataset.type != dns_rdatatype_dnskey) + { if (rdataset.type == dns_rdatatype_ns) { dns_nsec_setbit(types, rdataset.type, 1); } @@ -1017,10 +1018,9 @@ verifynode(vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node, } static isc_result_t -is_empty(const vctx_t *vctx, dns_dbnode_t *node, bool *empty) -{ +is_empty(const vctx_t *vctx, dns_dbnode_t *node, bool *empty) { dns_rdatasetiter_t *rdsiter = NULL; - isc_result_t result; + isc_result_t result; result = dns_db_allrdatasets(vctx->db, node, vctx->ver, 0, &rdsiter); if (result != ISC_R_SUCCESS) { @@ -1037,11 +1037,10 @@ is_empty(const vctx_t *vctx, dns_dbnode_t *node, bool *empty) } static isc_result_t -check_no_nsec(const vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node) -{ - bool nsec_exists = false; +check_no_nsec(const vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node) { + bool nsec_exists = false; dns_rdataset_t rdataset; - isc_result_t result; + isc_result_t result; dns_rdataset_init(&rdataset); result = dns_db_findrdataset(vctx->db, node, vctx->ver, @@ -1063,20 +1062,19 @@ check_no_nsec(const vctx_t *vctx, const dns_name_t *name, dns_dbnode_t *node) static bool newchain(const struct nsec3_chain_fixed *first, - const struct nsec3_chain_fixed *e) -{ + const struct nsec3_chain_fixed *e) { if (first->hash != e->hash || first->iterations != e->iterations || first->salt_length != e->salt_length || first->next_length != e->next_length || - memcmp(first + 1, e + 1, first->salt_length) != 0) { + memcmp(first + 1, e + 1, first->salt_length) != 0) + { return (true); } return (false); } static void -free_element(isc_mem_t *mctx, struct nsec3_chain_fixed *e) -{ +free_element(isc_mem_t *mctx, struct nsec3_chain_fixed *e) { size_t len; len = sizeof(*e) + e->salt_length + 2 * e->next_length; @@ -1084,23 +1082,21 @@ free_element(isc_mem_t *mctx, struct nsec3_chain_fixed *e) } static void -free_element_heap(void *element, void *uap) -{ +free_element_heap(void *element, void *uap) { struct nsec3_chain_fixed *e = (struct nsec3_chain_fixed *)element; - isc_mem_t * mctx = (isc_mem_t *)uap; + isc_mem_t *mctx = (isc_mem_t *)uap; free_element(mctx, e); } static bool _checknext(const vctx_t *vctx, const struct nsec3_chain_fixed *first, - const struct nsec3_chain_fixed *e) -{ - char buf[512]; + const struct nsec3_chain_fixed *e) { + char buf[512]; const unsigned char *d1 = (const unsigned char *)(first + 1); const unsigned char *d2 = (const unsigned char *)(e + 1); - isc_buffer_t b; - isc_region_t sr; + isc_buffer_t b; + isc_region_t sr; d1 += first->salt_length + first->next_length; d2 += e->salt_length; @@ -1136,8 +1132,7 @@ _checknext(const vctx_t *vctx, const struct nsec3_chain_fixed *first, static inline bool checknext(isc_mem_t *mctx, const vctx_t *vctx, const struct nsec3_chain_fixed *first, struct nsec3_chain_fixed *prev, - const struct nsec3_chain_fixed *cur) -{ + const struct nsec3_chain_fixed *cur) { bool result = _checknext(vctx, prev, cur); if (prev != first) { @@ -1149,8 +1144,7 @@ checknext(isc_mem_t *mctx, const vctx_t *vctx, static inline bool checklast(isc_mem_t *mctx, const vctx_t *vctx, struct nsec3_chain_fixed *first, - struct nsec3_chain_fixed *prev) -{ + struct nsec3_chain_fixed *prev) { bool result = _checknext(vctx, prev, first); if (prev != first) { free_element(mctx, prev); @@ -1161,9 +1155,8 @@ checklast(isc_mem_t *mctx, const vctx_t *vctx, struct nsec3_chain_fixed *first, } static isc_result_t -verify_nsec3_chains(const vctx_t *vctx, isc_mem_t *mctx) -{ - isc_result_t result = ISC_R_SUCCESS; +verify_nsec3_chains(const vctx_t *vctx, isc_mem_t *mctx) { + isc_result_t result = ISC_R_SUCCESS; struct nsec3_chain_fixed *e, *f = NULL; struct nsec3_chain_fixed *first = NULL, *prev = NULL; @@ -1258,13 +1251,12 @@ verify_nsec3_chains(const vctx_t *vctx, isc_mem_t *mctx) static isc_result_t verifyemptynodes(const vctx_t *vctx, const dns_name_t *name, const dns_name_t *prevname, bool isdelegation, - dns_rdataset_t *nsec3paramset, isc_result_t *vresult) -{ + dns_rdataset_t *nsec3paramset, isc_result_t *vresult) { dns_namereln_t reln; - int order; - unsigned int labels, nlabels, i; - dns_name_t suffix; - isc_result_t result, tvresult = ISC_R_UNSET; + int order; + unsigned int labels, nlabels, i; + dns_name_t suffix; + isc_result_t result, tvresult = ISC_R_UNSET; *vresult = ISC_R_SUCCESS; @@ -1301,8 +1293,7 @@ verifyemptynodes(const vctx_t *vctx, const dns_name_t *name, static isc_result_t vctx_init(vctx_t *vctx, isc_mem_t *mctx, dns_zone_t *zone, dns_db_t *db, - dns_dbversion_t *ver, dns_name_t *origin, dns_keytable_t *secroots) -{ + dns_dbversion_t *ver, dns_name_t *origin, dns_keytable_t *secroots) { isc_result_t result; memset(vctx, 0, sizeof(*vctx)); @@ -1344,8 +1335,7 @@ vctx_init(vctx_t *vctx, isc_mem_t *mctx, dns_zone_t *zone, dns_db_t *db, } static void -vctx_destroy(vctx_t *vctx) -{ +vctx_destroy(vctx_t *vctx) { if (dns_rdataset_isassociated(&vctx->keyset)) { dns_rdataset_disassociate(&vctx->keyset); } @@ -1377,10 +1367,9 @@ vctx_destroy(vctx_t *vctx) } static isc_result_t -check_apex_rrsets(vctx_t *vctx) -{ +check_apex_rrsets(vctx_t *vctx) { dns_dbnode_t *node = NULL; - isc_result_t result; + isc_result_t result; result = dns_db_findnode(vctx->db, vctx->origin, false, &node); if (result != ISC_R_SUCCESS) { @@ -1437,7 +1426,8 @@ check_apex_rrsets(vctx_t *vctx) } if (dns_rdataset_isassociated(&vctx->nsecset) && - !dns_rdataset_isassociated(&vctx->nsecsigs)) { + !dns_rdataset_isassociated(&vctx->nsecsigs)) + { zoneverify_log_error(vctx, "NSEC is not signed " "(keys offline or inactive?)"); result = ISC_R_FAILURE; @@ -1445,7 +1435,8 @@ check_apex_rrsets(vctx_t *vctx) } if (dns_rdataset_isassociated(&vctx->nsec3paramset) && - !dns_rdataset_isassociated(&vctx->nsec3paramsigs)) { + !dns_rdataset_isassociated(&vctx->nsec3paramsigs)) + { zoneverify_log_error(vctx, "NSEC3PARAM is not signed " "(keys offline or inactive?)"); result = ISC_R_FAILURE; @@ -1453,7 +1444,8 @@ check_apex_rrsets(vctx_t *vctx) } if (!dns_rdataset_isassociated(&vctx->nsecset) && - !dns_rdataset_isassociated(&vctx->nsec3paramset)) { + !dns_rdataset_isassociated(&vctx->nsec3paramset)) + { zoneverify_log_error(vctx, "No valid NSEC/NSEC3 chain for " "testing"); result = ISC_R_FAILURE; @@ -1480,13 +1472,12 @@ done: */ static void check_dnskey_sigs(vctx_t *vctx, const dns_rdata_dnskey_t *dnskey, - dns_rdata_t *keyrdata, bool is_ksk) -{ - unsigned char * active_keys = NULL, *standby_keys = NULL; - dns_keynode_t * keynode = NULL; - bool * goodkey = NULL; - dst_key_t * key = NULL; - isc_result_t result; + dns_rdata_t *keyrdata, bool is_ksk) { + unsigned char *active_keys = NULL, *standby_keys = NULL; + dns_keynode_t *keynode = NULL; + bool *goodkey = NULL; + dst_key_t *key = NULL; + isc_result_t result; dns_rdataset_t *dsset = NULL; active_keys = (is_ksk ? vctx->ksk_algorithms : vctx->zsk_algorithms); @@ -1497,10 +1488,12 @@ check_dnskey_sigs(vctx_t *vctx, const dns_rdata_dnskey_t *dnskey, * First, does this key sign the DNSKEY rrset? */ if (!dns_dnssec_selfsigns(keyrdata, vctx->origin, &vctx->keyset, - &vctx->keysigs, false, vctx->mctx)) { + &vctx->keysigs, false, vctx->mctx)) + { if (!is_ksk && dns_dnssec_signs(keyrdata, vctx->origin, &vctx->soaset, - &vctx->soasigs, false, vctx->mctx)) { + &vctx->soasigs, false, vctx->mctx)) + { if (active_keys[dnskey->algorithm] != 255) { active_keys[dnskey->algorithm]++; } @@ -1552,11 +1545,11 @@ check_dnskey_sigs(vctx_t *vctx, const dns_rdata_dnskey_t *dnskey, */ if ((dsset = dns_keynode_dsset(keynode)) != NULL) { for (result = dns_rdataset_first(dsset); - result == ISC_R_SUCCESS; - result = dns_rdataset_next(dsset)) { - dns_rdata_t dsrdata = DNS_RDATA_INIT; - dns_rdata_t newdsrdata = DNS_RDATA_INIT; - unsigned char buf[DNS_DS_BUFFERSIZE]; + result == ISC_R_SUCCESS; result = dns_rdataset_next(dsset)) + { + dns_rdata_t dsrdata = DNS_RDATA_INIT; + dns_rdata_t newdsrdata = DNS_RDATA_INIT; + unsigned char buf[DNS_DS_BUFFERSIZE]; dns_rdata_ds_t ds; dns_rdata_reset(&dsrdata); @@ -1603,16 +1596,15 @@ cleanup: * algorithm in it (or, if -x was used, one self-signing KSK). */ static isc_result_t -check_dnskey(vctx_t *vctx) -{ - dns_rdata_t rdata = DNS_RDATA_INIT; +check_dnskey(vctx_t *vctx) { + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_dnskey_t dnskey; - isc_result_t result; - bool is_ksk; + isc_result_t result; + bool is_ksk; for (result = dns_rdataset_first(&vctx->keyset); - result == ISC_R_SUCCESS; - result = dns_rdataset_next(&vctx->keyset)) { + result == ISC_R_SUCCESS; result = dns_rdataset_next(&vctx->keyset)) + { dns_rdataset_current(&vctx->keyset, &rdata); result = dns_rdata_tostruct(&rdata, &dnskey, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); @@ -1623,9 +1615,10 @@ check_dnskey(vctx_t *vctx) if ((dnskey.flags & DNS_KEYFLAG_KSK) != 0 && !dns_dnssec_selfsigns(&rdata, vctx->origin, &vctx->keyset, &vctx->keysigs, - false, vctx->mctx)) { - char namebuf[DNS_NAME_FORMATSIZE]; - char buffer[1024]; + false, vctx->mctx)) + { + char namebuf[DNS_NAME_FORMATSIZE]; + char buffer[1024]; isc_buffer_t buf; dns_name_format(vctx->origin, namebuf, @@ -1648,10 +1641,12 @@ check_dnskey(vctx_t *vctx) return (ISC_R_FAILURE); } if ((dnskey.flags & DNS_KEYFLAG_KSK) != 0 && - vctx->revoked_ksk[dnskey.algorithm] != 255) { + vctx->revoked_ksk[dnskey.algorithm] != 255) + { vctx->revoked_ksk[dnskey.algorithm]++; } else if ((dnskey.flags & DNS_KEYFLAG_KSK) == 0 && - vctx->revoked_zsk[dnskey.algorithm] != 255) { + vctx->revoked_zsk[dnskey.algorithm] != 255) + { vctx->revoked_zsk[dnskey.algorithm]++; } } else { @@ -1667,23 +1662,23 @@ check_dnskey(vctx_t *vctx) static void determine_active_algorithms(vctx_t *vctx, bool ignore_kskflag, bool keyset_kskonly, - void (*report)(const char *, ...)) -{ + void (*report)(const char *, ...)) { char algbuf[DNS_SECALG_FORMATSIZE]; - int i; + int i; report("Verifying the zone using the following algorithms:"); for (i = 0; i < 256; i++) { if (ignore_kskflag) { - vctx->act_algorithms[i] = - (vctx->ksk_algorithms[i] != 0 || - vctx->zsk_algorithms[i] != 0) - ? 1 - : 0; + vctx->act_algorithms[i] = (vctx->ksk_algorithms[i] != + 0 || + vctx->zsk_algorithms[i] != 0) + ? 1 + : 0; } else { - vctx->act_algorithms[i] = - vctx->ksk_algorithms[i] != 0 ? 1 : 0; + vctx->act_algorithms[i] = vctx->ksk_algorithms[i] != 0 + ? 1 + : 0; } if (vctx->act_algorithms[i] != 0) { dns_secalg_format(i, algbuf, sizeof(algbuf)); @@ -1721,15 +1716,14 @@ determine_active_algorithms(vctx_t *vctx, bool ignore_kskflag, * present in the DNSKEY RRset. */ static isc_result_t -verify_nodes(vctx_t *vctx, isc_result_t *vresult) -{ - dns_fixedname_t fname, fnextname, fprevname, fzonecut; - dns_name_t * name, *nextname, *prevname, *zonecut; - dns_dbnode_t * node = NULL, *nextnode; +verify_nodes(vctx_t *vctx, isc_result_t *vresult) { + dns_fixedname_t fname, fnextname, fprevname, fzonecut; + dns_name_t *name, *nextname, *prevname, *zonecut; + dns_dbnode_t *node = NULL, *nextnode; dns_dbiterator_t *dbiter = NULL; - bool done = false; - isc_result_t tvresult = ISC_R_UNSET; - isc_result_t result; + bool done = false; + isc_result_t tvresult = ISC_R_UNSET; + isc_result_t result; name = dns_fixedname_initname(&fname); nextname = dns_fixedname_initname(&fnextname); @@ -1806,9 +1800,10 @@ verify_nodes(vctx_t *vctx, isc_result_t *vresult) } if (!dns_name_issubdomain(nextname, vctx->origin) || (zonecut != NULL && - dns_name_issubdomain(nextname, zonecut))) { - result = - check_no_nsec(vctx, nextname, nextnode); + dns_name_issubdomain(nextname, zonecut))) + { + result = check_no_nsec(vctx, nextname, + nextnode); if (result != ISC_R_SUCCESS) { dns_db_detachnode(vctx->db, &node); dns_db_detachnode(vctx->db, &nextnode); @@ -1882,7 +1877,8 @@ verify_nodes(vctx_t *vctx, isc_result_t *vresult) } for (result = dns_dbiterator_first(dbiter); result == ISC_R_SUCCESS; - result = dns_dbiterator_next(dbiter)) { + result = dns_dbiterator_next(dbiter)) + { result = dns_dbiterator_current(dbiter, &node, name); if (result != ISC_R_SUCCESS && result != DNS_R_NEWORIGIN) { zoneverify_log_error(vctx, @@ -1914,11 +1910,10 @@ done: } static isc_result_t -check_bad_algorithms(const vctx_t *vctx, void (*report)(const char *, ...)) -{ +check_bad_algorithms(const vctx_t *vctx, void (*report)(const char *, ...)) { char algbuf[DNS_SECALG_FORMATSIZE]; bool first = true; - int i; + int i; for (i = 0; i < 256; i++) { if (vctx->bad_algorithms[i] == 0) { @@ -1942,10 +1937,9 @@ check_bad_algorithms(const vctx_t *vctx, void (*report)(const char *, ...)) static void print_summary(const vctx_t *vctx, bool keyset_kskonly, - void (*report)(const char *, ...)) -{ + void (*report)(const char *, ...)) { char algbuf[DNS_SECALG_FORMATSIZE]; - int i; + int i; report("Zone fully signed:\n"); for (i = 0; i < 256; i++) { @@ -1953,8 +1947,8 @@ print_summary(const vctx_t *vctx, bool keyset_kskonly, (vctx->standby_ksk[i] == 0) && (vctx->revoked_ksk[i] == 0) && (vctx->zsk_algorithms[i] == 0) && - (vctx->standby_zsk[i] == 0) && - (vctx->revoked_zsk[i] == 0)) { + (vctx->standby_zsk[i] == 0) && (vctx->revoked_zsk[i] == 0)) + { continue; } dns_secalg_format(i, algbuf, sizeof(algbuf)); @@ -1975,11 +1969,10 @@ isc_result_t dns_zoneverify_dnssec(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *origin, dns_keytable_t *secroots, isc_mem_t *mctx, bool ignore_kskflag, bool keyset_kskonly, - void (*report)(const char *, ...)) -{ - const char * keydesc = (secroots == NULL ? "self-signed" : "trusted"); + void (*report)(const char *, ...)) { + const char *keydesc = (secroots == NULL ? "self-signed" : "trusted"); isc_result_t result, vresult = ISC_R_UNSET; - vctx_t vctx; + vctx_t vctx; result = vctx_init(&vctx, mctx, zone, db, ver, origin, secroots); if (result != ISC_R_SUCCESS) { diff --git a/lib/dns/zt.c b/lib/dns/zt.c index 1d3550dad2..997b4f4488 100644 --- a/lib/dns/zt.c +++ b/lib/dns/zt.c @@ -33,21 +33,21 @@ struct zt_load_params { dns_zt_zoneloaded_t dl; - bool newonly; + bool newonly; }; struct dns_zt { /* Unlocked. */ - unsigned int magic; - isc_mem_t * mctx; - dns_rdataclass_t rdclass; - isc_rwlock_t rwlock; - dns_zt_allloaded_t loaddone; - void * loaddone_arg; + unsigned int magic; + isc_mem_t *mctx; + dns_rdataclass_t rdclass; + isc_rwlock_t rwlock; + dns_zt_allloaded_t loaddone; + void *loaddone_arg; struct zt_load_params *loadparams; /* Atomic */ - atomic_bool flush; + atomic_bool flush; isc_refcount_t references; isc_refcount_t loads_pending; @@ -55,28 +55,23 @@ struct dns_zt { dns_rbt_t *table; }; -#define ZTMAGIC ISC_MAGIC('Z', 'T', 'b', 'l') +#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) -{ - dns_zt_t * zt; +dns_zt_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, dns_zt_t **ztp) { + dns_zt_t *zt; isc_result_t result; REQUIRE(ztp != NULL && *ztp == NULL); @@ -118,11 +113,10 @@ cleanup_zt: } isc_result_t -dns_zt_mount(dns_zt_t *zt, dns_zone_t *zone) -{ +dns_zt_mount(dns_zt_t *zt, dns_zone_t *zone) { isc_result_t result; - dns_zone_t * dummy = NULL; - dns_name_t * name; + dns_zone_t *dummy = NULL; + dns_name_t *name; REQUIRE(VALID_ZT(zt)); @@ -141,10 +135,9 @@ dns_zt_mount(dns_zt_t *zt, dns_zone_t *zone) } isc_result_t -dns_zt_unmount(dns_zt_t *zt, dns_zone_t *zone) -{ +dns_zt_unmount(dns_zt_t *zt, dns_zone_t *zone) { isc_result_t result; - dns_name_t * name; + dns_name_t *name; REQUIRE(VALID_ZT(zt)); @@ -161,10 +154,9 @@ dns_zt_unmount(dns_zt_t *zt, dns_zone_t *zone) isc_result_t dns_zt_find(dns_zt_t *zt, const dns_name_t *name, unsigned int options, - dns_name_t *foundname, dns_zone_t **zonep) -{ + dns_name_t *foundname, dns_zone_t **zonep) { isc_result_t result; - dns_zone_t * dummy = NULL; + dns_zone_t *dummy = NULL; unsigned int rbtoptions = 0; REQUIRE(VALID_ZT(zt)); @@ -197,7 +189,8 @@ dns_zt_find(dns_zt_t *zt, const dns_name_t *name, unsigned int options, */ if ((options & DNS_ZTFIND_MIRROR) != 0 && dns_zone_gettype(dummy) == dns_zone_mirror && - !dns_zone_isloaded(dummy)) { + !dns_zone_isloaded(dummy)) + { result = ISC_R_NOTFOUND; } else { dns_zone_attach(dummy, zonep); @@ -210,8 +203,7 @@ dns_zt_find(dns_zt_t *zt, const dns_name_t *name, unsigned int options, } void -dns_zt_attach(dns_zt_t *zt, dns_zt_t **ztp) -{ +dns_zt_attach(dns_zt_t *zt, dns_zt_t **ztp) { REQUIRE(VALID_ZT(zt)); REQUIRE(ztp != NULL && *ztp == NULL); @@ -221,15 +213,13 @@ dns_zt_attach(dns_zt_t *zt, dns_zt_t **ztp) } static isc_result_t -flush(dns_zone_t *zone, void *uap) -{ +flush(dns_zone_t *zone, void *uap) { UNUSED(uap); return (dns_zone_flush(zone)); } static void -zt_destroy(dns_zt_t *zt) -{ +zt_destroy(dns_zt_t *zt) { if (atomic_load_acquire(&zt->flush)) { (void)dns_zt_apply(zt, false, NULL, flush, NULL); } @@ -240,8 +230,7 @@ zt_destroy(dns_zt_t *zt) } static void -zt_flushanddetach(dns_zt_t **ztp, bool need_flush) -{ +zt_flushanddetach(dns_zt_t **ztp, bool need_flush) { dns_zt_t *zt; REQUIRE(ztp != NULL && VALID_ZT(*ztp)); @@ -259,21 +248,18 @@ zt_flushanddetach(dns_zt_t **ztp, bool need_flush) } void -dns_zt_flushanddetach(dns_zt_t **ztp) -{ +dns_zt_flushanddetach(dns_zt_t **ztp) { zt_flushanddetach(ztp, true); } void -dns_zt_detach(dns_zt_t **ztp) -{ +dns_zt_detach(dns_zt_t **ztp) { zt_flushanddetach(ztp, false); } isc_result_t -dns_zt_load(dns_zt_t *zt, bool stop, bool newonly) -{ - isc_result_t result; +dns_zt_load(dns_zt_t *zt, bool stop, bool newonly) { + isc_result_t result; struct zt_load_params params; REQUIRE(VALID_ZT(zt)); params.newonly = newonly; @@ -284,23 +270,22 @@ dns_zt_load(dns_zt_t *zt, bool stop, bool newonly) } static isc_result_t -load(dns_zone_t *zone, void *paramsv) -{ - isc_result_t result; +load(dns_zone_t *zone, void *paramsv) { + isc_result_t result; struct zt_load_params *params = (struct zt_load_params *)paramsv; result = dns_zone_load(zone, params->newonly); if (result == DNS_R_CONTINUE || result == DNS_R_UPTODATE || - result == DNS_R_DYNAMIC) { + result == DNS_R_DYNAMIC) + { result = ISC_R_SUCCESS; } return (result); } static void -call_loaddone(dns_zt_t *zt) -{ +call_loaddone(dns_zt_t *zt) { dns_zt_allloaded_t loaddone = zt->loaddone; - void * loaddone_arg = zt->loaddone_arg; + void *loaddone_arg = zt->loaddone_arg; /* * Set zt->loaddone, zt->loaddone_arg and zt->loadparams to NULL @@ -322,9 +307,8 @@ call_loaddone(dns_zt_t *zt) isc_result_t dns_zt_asyncload(dns_zt_t *zt, bool newonly, dns_zt_allloaded_t alldone, - void *arg) -{ - isc_result_t result; + void *arg) { + isc_result_t result; uint_fast32_t loads_pending; REQUIRE(VALID_ZT(zt)); @@ -372,9 +356,8 @@ dns_zt_asyncload(dns_zt_t *zt, bool newonly, dns_zt_allloaded_t alldone, * the zone loading is complete. */ static isc_result_t -asyncload(dns_zone_t *zone, void *zt_) -{ - isc_result_t result; +asyncload(dns_zone_t *zone, void *zt_) { + isc_result_t result; struct dns_zt *zt = (dns_zt_t *)zt_; REQUIRE(zone != NULL); @@ -395,8 +378,7 @@ asyncload(dns_zone_t *zone, void *zt_) } isc_result_t -dns_zt_freezezones(dns_zt_t *zt, bool freeze) -{ +dns_zt_freezezones(dns_zt_t *zt, bool freeze) { isc_result_t result, tresult; REQUIRE(VALID_ZT(zt)); @@ -411,18 +393,17 @@ dns_zt_freezezones(dns_zt_t *zt, bool freeze) } static isc_result_t -freezezones(dns_zone_t *zone, void *uap) -{ - bool freeze = *(bool *)uap; - bool frozen; +freezezones(dns_zone_t *zone, void *uap) { + bool freeze = *(bool *)uap; + bool frozen; isc_result_t result = ISC_R_SUCCESS; - char classstr[DNS_RDATACLASS_FORMATSIZE]; - char zonename[DNS_NAME_FORMATSIZE]; - dns_zone_t * raw = NULL; - dns_view_t * view; - const char * vname; - const char * sep; - int level; + char classstr[DNS_RDATACLASS_FORMATSIZE]; + char zonename[DNS_NAME_FORMATSIZE]; + dns_zone_t *raw = NULL; + dns_view_t *view; + const char *vname; + const char *sep; + int level; dns_zone_getraw(zone, &raw); if (raw != NULL) { @@ -463,7 +444,8 @@ freezezones(dns_zone_t *zone, void *uap) } view = dns_zone_getview(zone); if (strcmp(view->name, "_bind") == 0 || strcmp(view->name, "_defaul" - "t") == 0) { + "t") == 0) + { vname = ""; sep = ""; } else { @@ -485,11 +467,10 @@ freezezones(dns_zone_t *zone, void *uap) } void -dns_zt_setviewcommit(dns_zt_t *zt) -{ - dns_rbtnode_t * node; +dns_zt_setviewcommit(dns_zt_t *zt) { + dns_rbtnode_t *node; dns_rbtnodechain_t chain; - isc_result_t result; + isc_result_t result; REQUIRE(VALID_ZT(zt)); @@ -509,11 +490,10 @@ dns_zt_setviewcommit(dns_zt_t *zt) } void -dns_zt_setviewrevert(dns_zt_t *zt) -{ - dns_rbtnode_t * node; +dns_zt_setviewrevert(dns_zt_t *zt) { + dns_rbtnode_t *node; dns_rbtnodechain_t chain; - isc_result_t result; + isc_result_t result; REQUIRE(VALID_ZT(zt)); @@ -534,12 +514,11 @@ dns_zt_setviewrevert(dns_zt_t *zt) isc_result_t dns_zt_apply(dns_zt_t *zt, bool stop, isc_result_t *sub, - isc_result_t (*action)(dns_zone_t *, void *), void *uap) -{ - dns_rbtnode_t * node; + isc_result_t (*action)(dns_zone_t *, void *), void *uap) { + dns_rbtnode_t *node; dns_rbtnodechain_t chain; - isc_result_t result, tresult = ISC_R_SUCCESS; - dns_zone_t * zone; + isc_result_t result, tresult = ISC_R_SUCCESS; + dns_zone_t *zone; REQUIRE(VALID_ZT(zt)); REQUIRE(action != NULL); @@ -589,8 +568,7 @@ cleanup: * dns_zt_asyncload(). */ static isc_result_t -doneloading(dns_zt_t *zt, dns_zone_t *zone, isc_task_t *task) -{ +doneloading(dns_zt_t *zt, dns_zone_t *zone, isc_task_t *task) { UNUSED(zone); UNUSED(task); @@ -612,8 +590,7 @@ doneloading(dns_zt_t *zt, dns_zone_t *zone, isc_task_t *task) ***/ static void -auto_detach(void *data, void *arg) -{ +auto_detach(void *data, void *arg) { dns_zone_t *zone = data; UNUSED(arg); diff --git a/lib/irs/context.c b/lib/irs/context.c index a5e11755f2..267383baab 100644 --- a/lib/irs/context.c +++ b/lib/irs/context.c @@ -29,7 +29,7 @@ #include #include -#define IRS_CONTEXT_MAGIC ISC_MAGIC('I', 'R', 'S', 'c') +#define IRS_CONTEXT_MAGIC ISC_MAGIC('I', 'R', 'S', 'c') #define IRS_CONTEXT_VALID(c) ISC_MAGIC_VALID(c, IRS_CONTEXT_MAGIC) #ifndef RESOLV_CONF @@ -49,22 +49,21 @@ struct irs_context { * An IRS context is a thread-specific object, and does not need to * be locked. */ - unsigned int magic; - isc_mem_t * mctx; - isc_appctx_t * actx; - isc_taskmgr_t * taskmgr; - isc_task_t * task; + unsigned int magic; + isc_mem_t *mctx; + isc_appctx_t *actx; + isc_taskmgr_t *taskmgr; + isc_task_t *task; isc_socketmgr_t *socketmgr; - isc_timermgr_t * timermgr; - dns_client_t * dnsclient; - irs_resconf_t * resconf; - irs_dnsconf_t * dnsconf; + isc_timermgr_t *timermgr; + dns_client_t *dnsclient; + irs_resconf_t *resconf; + irs_dnsconf_t *dnsconf; }; static void ctxs_destroy(isc_mem_t **mctxp, isc_appctx_t **actxp, isc_taskmgr_t **taskmgrp, - isc_socketmgr_t **socketmgrp, isc_timermgr_t **timermgrp) -{ + isc_socketmgr_t **socketmgrp, isc_timermgr_t **timermgrp) { if (taskmgrp != NULL) { isc_taskmgr_destroy(taskmgrp); } @@ -88,8 +87,7 @@ ctxs_destroy(isc_mem_t **mctxp, isc_appctx_t **actxp, isc_taskmgr_t **taskmgrp, static isc_result_t ctxs_init(isc_mem_t **mctxp, isc_appctx_t **actxp, isc_taskmgr_t **taskmgrp, - isc_socketmgr_t **socketmgrp, isc_timermgr_t **timermgrp) -{ + isc_socketmgr_t **socketmgrp, isc_timermgr_t **timermgrp) { isc_result_t result; isc_mem_create(mctxp); @@ -123,8 +121,7 @@ fail: } isc_result_t -irs_context_get(irs_context_t **contextp) -{ +irs_context_get(irs_context_t **contextp) { isc_result_t result; REQUIRE(contextp != NULL && *contextp == NULL); @@ -142,19 +139,18 @@ irs_context_get(irs_context_t **contextp) } isc_result_t -irs_context_create(irs_context_t **contextp) -{ - isc_result_t result; - irs_context_t * context; - isc_appctx_t * actx = NULL; - isc_mem_t * mctx = NULL; - isc_taskmgr_t * taskmgr = NULL; - isc_socketmgr_t * socketmgr = NULL; - isc_timermgr_t * timermgr = NULL; - dns_client_t * client = NULL; - isc_sockaddrlist_t * nameservers; +irs_context_create(irs_context_t **contextp) { + isc_result_t result; + irs_context_t *context; + isc_appctx_t *actx = NULL; + isc_mem_t *mctx = NULL; + isc_taskmgr_t *taskmgr = NULL; + isc_socketmgr_t *socketmgr = NULL; + isc_timermgr_t *timermgr = NULL; + dns_client_t *client = NULL; + isc_sockaddrlist_t *nameservers; irs_dnsconf_dnskeylist_t *trustedkeys; - irs_dnsconf_dnskey_t * trustedkey; + irs_dnsconf_dnskey_t *trustedkey; isc_lib_register(); result = dns_lib_init(); @@ -216,7 +212,8 @@ irs_context_create(irs_context_t **contextp) } trustedkeys = irs_dnsconf_gettrustedkeys(context->dnsconf); for (trustedkey = ISC_LIST_HEAD(*trustedkeys); trustedkey != NULL; - trustedkey = ISC_LIST_NEXT(trustedkey, link)) { + trustedkey = ISC_LIST_NEXT(trustedkey, link)) + { result = dns_client_addtrustedkey( client, dns_rdataclass_in, dns_rdatatype_dnskey, trustedkey->keyname, trustedkey->keydatabuf); @@ -250,8 +247,7 @@ fail: } void -irs_context_destroy(irs_context_t **contextp) -{ +irs_context_destroy(irs_context_t **contextp) { irs_context_t *context; REQUIRE(contextp != NULL); @@ -273,64 +269,56 @@ irs_context_destroy(irs_context_t **contextp) } isc_mem_t * -irs_context_getmctx(irs_context_t *context) -{ +irs_context_getmctx(irs_context_t *context) { REQUIRE(IRS_CONTEXT_VALID(context)); return (context->mctx); } isc_appctx_t * -irs_context_getappctx(irs_context_t *context) -{ +irs_context_getappctx(irs_context_t *context) { REQUIRE(IRS_CONTEXT_VALID(context)); return (context->actx); } isc_taskmgr_t * -irs_context_gettaskmgr(irs_context_t *context) -{ +irs_context_gettaskmgr(irs_context_t *context) { REQUIRE(IRS_CONTEXT_VALID(context)); return (context->taskmgr); } isc_timermgr_t * -irs_context_gettimermgr(irs_context_t *context) -{ +irs_context_gettimermgr(irs_context_t *context) { REQUIRE(IRS_CONTEXT_VALID(context)); return (context->timermgr); } isc_task_t * -irs_context_gettask(irs_context_t *context) -{ +irs_context_gettask(irs_context_t *context) { REQUIRE(IRS_CONTEXT_VALID(context)); return (context->task); } dns_client_t * -irs_context_getdnsclient(irs_context_t *context) -{ +irs_context_getdnsclient(irs_context_t *context) { REQUIRE(IRS_CONTEXT_VALID(context)); return (context->dnsclient); } irs_resconf_t * -irs_context_getresconf(irs_context_t *context) -{ +irs_context_getresconf(irs_context_t *context) { REQUIRE(IRS_CONTEXT_VALID(context)); return (context->resconf); } irs_dnsconf_t * -irs_context_getdnsconf(irs_context_t *context) -{ +irs_context_getdnsconf(irs_context_t *context) { REQUIRE(IRS_CONTEXT_VALID(context)); return (context->dnsconf); diff --git a/lib/irs/dnsconf.c b/lib/irs/dnsconf.c index 0c8728b88c..519739385e 100644 --- a/lib/irs/dnsconf.c +++ b/lib/irs/dnsconf.c @@ -29,7 +29,7 @@ #include -#define IRS_DNSCONF_MAGIC ISC_MAGIC('D', 'c', 'f', 'g') +#define IRS_DNSCONF_MAGIC ISC_MAGIC('D', 'c', 'f', 'g') #define IRS_DNSCONF_VALID(c) ISC_MAGIC_VALID(c, IRS_DNSCONF_MAGIC) /*! @@ -37,27 +37,26 @@ */ struct irs_dnsconf { - unsigned int magic; - isc_mem_t * mctx; + unsigned int magic; + isc_mem_t *mctx; irs_dnsconf_dnskeylist_t trusted_keylist; }; static isc_result_t configure_key(isc_mem_t *mctx, const cfg_obj_t *key, irs_dnsconf_t *conf, - dns_rdataclass_t rdclass) -{ - isc_result_t result; - uint32_t flags, proto, alg; - dns_fixedname_t fkeyname; - dns_name_t * keyname_base = NULL, *keyname = NULL; - const char * keystr = NULL, *keynamestr = NULL; - unsigned char keydata[4096]; - isc_buffer_t keydatabuf_base, *keydatabuf = NULL; - dns_rdata_dnskey_t keystruct; - unsigned char rrdata[4096]; - isc_buffer_t rrdatabuf; - isc_region_t r; - isc_buffer_t namebuf; + dns_rdataclass_t rdclass) { + isc_result_t result; + uint32_t flags, proto, alg; + dns_fixedname_t fkeyname; + dns_name_t *keyname_base = NULL, *keyname = NULL; + const char *keystr = NULL, *keynamestr = NULL; + unsigned char keydata[4096]; + isc_buffer_t keydatabuf_base, *keydatabuf = NULL; + dns_rdata_dnskey_t keystruct; + unsigned char rrdata[4096]; + isc_buffer_t rrdatabuf; + isc_region_t r; + isc_buffer_t namebuf; irs_dnsconf_dnskey_t *keyent = NULL; flags = cfg_obj_asuint32(cfg_tuple_get(key, "flags")); @@ -142,18 +141,19 @@ cleanup: static isc_result_t configure_keygroup(irs_dnsconf_t *conf, const cfg_obj_t *keys, - dns_rdataclass_t rdclass) -{ - isc_result_t result; - const cfg_obj_t * key, *keylist; + dns_rdataclass_t rdclass) { + isc_result_t result; + const cfg_obj_t *key, *keylist; const cfg_listelt_t *element, *element2; - isc_mem_t * mctx = conf->mctx; + isc_mem_t *mctx = conf->mctx; for (element = cfg_list_first(keys); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { keylist = cfg_listelt_value(element); for (element2 = cfg_list_first(keylist); element2 != NULL; - element2 = cfg_list_next(element2)) { + element2 = cfg_list_next(element2)) + { key = cfg_listelt_value(element2); result = configure_key(mctx, key, conf, rdclass); if (result != ISC_R_SUCCESS) { @@ -167,9 +167,8 @@ configure_keygroup(irs_dnsconf_t *conf, const cfg_obj_t *keys, static isc_result_t configure_dnsseckeys(irs_dnsconf_t *conf, cfg_obj_t *cfgobj, - dns_rdataclass_t rdclass) -{ - isc_result_t result; + dns_rdataclass_t rdclass) { + isc_result_t result; const cfg_obj_t *keys = NULL; cfg_map_get(cfgobj, "trusted-keys", &keys); @@ -208,12 +207,11 @@ configure_dnsseckeys(irs_dnsconf_t *conf, cfg_obj_t *cfgobj, } isc_result_t -irs_dnsconf_load(isc_mem_t *mctx, const char *filename, irs_dnsconf_t **confp) -{ +irs_dnsconf_load(isc_mem_t *mctx, const char *filename, irs_dnsconf_t **confp) { irs_dnsconf_t *conf; - cfg_parser_t * parser = NULL; - cfg_obj_t * cfgobj = NULL; - isc_result_t result = ISC_R_SUCCESS; + cfg_parser_t *parser = NULL; + cfg_obj_t *cfgobj = NULL; + isc_result_t result = ISC_R_SUCCESS; REQUIRE(confp != NULL && *confp == NULL); @@ -262,9 +260,8 @@ cleanup: } void -irs_dnsconf_destroy(irs_dnsconf_t **confp) -{ - irs_dnsconf_t * conf; +irs_dnsconf_destroy(irs_dnsconf_t **confp) { + irs_dnsconf_t *conf; irs_dnsconf_dnskey_t *keyent; REQUIRE(confp != NULL); @@ -285,8 +282,7 @@ irs_dnsconf_destroy(irs_dnsconf_t **confp) } irs_dnsconf_dnskeylist_t * -irs_dnsconf_gettrustedkeys(irs_dnsconf_t *conf) -{ +irs_dnsconf_gettrustedkeys(irs_dnsconf_t *conf) { REQUIRE(IRS_DNSCONF_VALID(conf)); return (&conf->trusted_keylist); diff --git a/lib/irs/gai_strerror.c b/lib/irs/gai_strerror.c index d691a1311a..9c0a0416db 100644 --- a/lib/irs/gai_strerror.c +++ b/lib/irs/gai_strerror.c @@ -77,15 +77,15 @@ char * #else /* if defined _WIN32 */ const char * #endif /* if defined _WIN32 */ -gai_strerror(int ecode) -{ +gai_strerror(int ecode) { union { const char *const_ptr; - char * deconst_ptr; + char *deconst_ptr; } ptr; if ((ecode < 0) || - (ecode >= (int)(sizeof(gai_messages) / sizeof(*gai_messages)))) { + (ecode >= (int)(sizeof(gai_messages) / sizeof(*gai_messages)))) + { ptr.const_ptr = "invalid error code"; } else { ptr.const_ptr = gai_messages[ecode]; diff --git a/lib/irs/getaddrinfo.c b/lib/irs/getaddrinfo.c index df0aba1871..707386ab26 100644 --- a/lib/irs/getaddrinfo.c +++ b/lib/irs/getaddrinfo.c @@ -153,41 +153,35 @@ #include #include -#define SA(addr) ((struct sockaddr *)(addr)) -#define SIN(addr) ((struct sockaddr_in *)(addr)) -#define SIN6(addr) ((struct sockaddr_in6 *)(addr)) +#define SA(addr) ((struct sockaddr *)(addr)) +#define SIN(addr) ((struct sockaddr_in *)(addr)) +#define SIN6(addr) ((struct sockaddr_in6 *)(addr)) #define SLOCAL(addr) ((struct sockaddr_un *)(addr)) /*! \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 -#define FOUND_MAX 2 +#define FOUND_MAX 2 /*% * Try converting the scope identifier in 'src' to a network interface index. @@ -195,8 +189,7 @@ _freeaddrinfo(struct addrinfo *ai); * failure, return false. */ static bool -parse_scopeid(const char *src, uint32_t *dst) -{ +parse_scopeid(const char *src, uint32_t *dst) { uint32_t scopeid = 0; REQUIRE(src != NULL); @@ -238,14 +231,13 @@ parse_scopeid(const char *src, uint32_t *dst) */ int getaddrinfo(const char *hostname, const char *servname, - const struct addrinfo *hints, struct addrinfo **res) -{ - struct servent * sp; - const char * proto; - int family, socktype, flags, protocol; + const struct addrinfo *hints, struct addrinfo **res) { + struct servent *sp; + const char *proto; + int family, socktype, flags, protocol; struct addrinfo *ai, *ai_list; - int err = 0; - int port, i; + int err = 0; + int port, i; int (*net_order[FOUND_MAX + 1])(const char *, int, struct addrinfo **, int, int); @@ -259,7 +251,8 @@ getaddrinfo(const char *hostname, const char *servname, return (EAI_BADFLAGS); } if (hints->ai_addrlen || hints->ai_canonname || - hints->ai_addr || hints->ai_next) { + hints->ai_addr || hints->ai_next) + { errno = EINVAL; return (EAI_SYSTEM); } @@ -327,12 +320,14 @@ getaddrinfo(const char *hostname, const char *servname, */ if (hostname != NULL && - (family == AF_LOCAL || (family == 0 && *hostname == '/'))) { + (family == AF_LOCAL || (family == 0 && *hostname == '/'))) + { return (get_local(hostname, socktype, res)); } if (servname != NULL && - (family == AF_LOCAL || (family == 0 && *servname == '/'))) { + (family == AF_LOCAL || (family == 0 && *servname == '/'))) + { return (get_local(servname, socktype, res)); } #endif /* ifdef AF_LOCAL */ @@ -361,7 +356,7 @@ getaddrinfo(const char *hostname, const char *servname, port = htons((unsigned short)port); } else { #ifdef _WIN32 - WORD wVersionRequested; + WORD wVersionRequested; WSADATA wsaData; wVersionRequested = MAKEWORD(2, 0); @@ -436,12 +431,12 @@ getaddrinfo(const char *hostname, const char *servname, * a domain name, and vice versa. Checking for both numerics here * avoids that. */ - if (hostname != NULL && - (family == 0 || (flags & AI_NUMERICHOST) != 0)) { - char abuf[sizeof(struct in6_addr)]; - char nbuf[NI_MAXHOST]; - int addrsize, addroff; - char ntmp[NI_MAXHOST]; + if (hostname != NULL && (family == 0 || (flags & AI_NUMERICHOST) != 0)) + { + char abuf[sizeof(struct in6_addr)]; + char nbuf[NI_MAXHOST]; + int addrsize, addroff; + char ntmp[NI_MAXHOST]; uint32_t scopeid = 0; /* @@ -512,7 +507,8 @@ getaddrinfo(const char *hostname, const char *servname, if (getnameinfo(ai->ai_addr, (socklen_t)ai->ai_addrlen, nbuf, sizeof(nbuf), NULL, 0, - NI_NUMERICHOST) == 0) { + NI_NUMERICHOST) == 0) + { ai->ai_canonname = strdup(nbuf); if (ai->ai_canonname == NULL) { _freeaddrinfo(ai); @@ -566,46 +562,45 @@ done: typedef struct gai_restrans { dns_clientrestrans_t *xid; - bool is_inprogress; - int error; - struct addrinfo ai_sentinel; - struct gai_resstate * resstate; + bool is_inprogress; + int error; + struct addrinfo ai_sentinel; + struct gai_resstate *resstate; } gai_restrans_t; typedef struct gai_resstate { - isc_mem_t * mctx; + isc_mem_t *mctx; struct gai_statehead *head; - dns_fixedname_t fixedname; - dns_name_t * qname; - gai_restrans_t * trans4; - gai_restrans_t * trans6; + dns_fixedname_t fixedname; + dns_name_t *qname; + gai_restrans_t *trans4; + gai_restrans_t *trans6; ISC_LINK(struct gai_resstate) link; } gai_resstate_t; typedef struct gai_statehead { - int ai_family; - int ai_flags; - int ai_socktype; - int ai_port; + int ai_family; + int ai_flags; + int ai_socktype; + int ai_port; isc_appctx_t *actx; dns_client_t *dnsclient; - isc_mutex_t list_lock; + isc_mutex_t list_lock; ISC_LIST(struct gai_resstate) resstates; unsigned int activestates; } gai_statehead_t; static isc_result_t make_resstate(isc_mem_t *mctx, gai_statehead_t *head, const char *hostname, - const char *domain, gai_resstate_t **statep) -{ - isc_result_t result; + const char *domain, gai_resstate_t **statep) { + isc_result_t result; gai_resstate_t *state; dns_fixedname_t fixeddomain; - dns_name_t * qdomain; - unsigned int namelen; - isc_buffer_t b; - bool need_v4 = false; - bool need_v6 = false; + dns_name_t *qdomain; + unsigned int namelen; + isc_buffer_t b; + bool need_v4 = false; + bool need_v6 = false; state = isc_mem_get(mctx, sizeof(*state)); @@ -668,12 +663,11 @@ make_resstate(isc_mem_t *mctx, gai_statehead_t *head, const char *hostname, static isc_result_t make_resstates(isc_mem_t *mctx, const char *hostname, gai_statehead_t *head, - irs_resconf_t *resconf) -{ - isc_result_t result; + irs_resconf_t *resconf) { + isc_result_t result; irs_resconf_searchlist_t *searchlist; - irs_resconf_search_t * searchent; - gai_resstate_t * resstate, *resstate0; + irs_resconf_search_t *searchent; + gai_resstate_t *resstate, *resstate0; resstate0 = NULL; result = make_resstate(mctx, head, hostname, ".", &resstate0); @@ -683,7 +677,8 @@ make_resstates(isc_mem_t *mctx, const char *hostname, gai_statehead_t *head, searchlist = irs_resconf_getsearchlist(resconf); for (searchent = ISC_LIST_HEAD(*searchlist); searchent != NULL; - searchent = ISC_LIST_NEXT(searchent, link)) { + searchent = ISC_LIST_NEXT(searchent, link)) + { resstate = NULL; result = make_resstate(mctx, head, hostname, (const char *)searchent->domain, @@ -729,15 +724,14 @@ make_resstates(isc_mem_t *mctx, const char *hostname, gai_statehead_t *head, } static void -process_answer(isc_task_t *task, isc_event_t *event) -{ - int error = 0, family; - gai_restrans_t * trans = event->ev_arg; - gai_resstate_t * resstate; +process_answer(isc_task_t *task, isc_event_t *event) { + int error = 0, family; + gai_restrans_t *trans = event->ev_arg; + gai_resstate_t *resstate; dns_clientresevent_t *rev = (dns_clientresevent_t *)event; - dns_rdatatype_t qtype; - dns_name_t * name; - bool wantcname; + dns_rdatatype_t qtype; + dns_name_t *name; + bool wantcname; REQUIRE(trans != NULL); resstate = trans->resstate; @@ -785,10 +779,11 @@ process_answer(isc_task_t *task, isc_event_t *event) /* Parse the response and construct the addrinfo chain */ for (name = ISC_LIST_HEAD(rev->answerlist); name != NULL; - name = ISC_LIST_NEXT(name, link)) { - isc_result_t result; + name = ISC_LIST_NEXT(name, link)) + { + isc_result_t result; dns_rdataset_t *rdataset; - char cname[1024]; + char cname[1024]; if (wantcname) { isc_buffer_t b; @@ -803,7 +798,8 @@ process_answer(isc_task_t *task, isc_event_t *event) } for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (!dns_rdataset_isassociated(rdataset)) { continue; } @@ -813,10 +809,11 @@ process_answer(isc_task_t *task, isc_event_t *event) for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { - struct addrinfo * ai; - dns_rdata_t rdata; - dns_rdata_in_a_t rdata_a; + result = dns_rdataset_next(rdataset)) + { + struct addrinfo *ai; + dns_rdata_t rdata; + dns_rdata_in_a_t rdata_a; dns_rdata_in_aaaa_t rdata_aaaa; ai = ai_alloc( @@ -894,7 +891,8 @@ done: /* Check whether we are done */ if ((resstate->trans4 == NULL || !resstate->trans4->is_inprogress) && - (resstate->trans6 == NULL || !resstate->trans6->is_inprogress)) { + (resstate->trans6 == NULL || !resstate->trans6->is_inprogress)) + { /* * We're done for this state. If there is no other outstanding * state, we can exit. @@ -916,12 +914,14 @@ done: if ((resstate->trans4 != NULL && resstate->trans4->ai_sentinel.ai_next != NULL) || (resstate->trans6 != NULL && - resstate->trans6->ai_sentinel.ai_next != NULL)) { + resstate->trans6->ai_sentinel.ai_next != NULL)) + { gai_resstate_t *rest; for (rest = ISC_LIST_NEXT(resstate, link); rest != NULL; - rest = ISC_LIST_NEXT(rest, link)) { + rest = ISC_LIST_NEXT(rest, link)) + { if (rest->trans4 != NULL && rest->trans4->xid != NULL) { dns_client_cancelresolve( @@ -951,20 +951,19 @@ done: static int resolve_name(int family, const char *hostname, int flags, struct addrinfo **aip, - int socktype, int port) -{ - isc_result_t result; - irs_context_t * irsctx; - irs_resconf_t * conf; - isc_mem_t * mctx; - isc_appctx_t * actx; - isc_task_t * task; - int terror = 0; - int error = 0; - dns_client_t * client; + int socktype, int port) { + isc_result_t result; + irs_context_t *irsctx; + irs_resconf_t *conf; + isc_mem_t *mctx; + isc_appctx_t *actx; + isc_task_t *task; + int terror = 0; + int error = 0; + dns_client_t *client; gai_resstate_t *resstate; gai_statehead_t head; - bool all_fail = true; + bool all_fail = true; /* get IRS context and the associated parameters */ irsctx = NULL; @@ -998,7 +997,8 @@ resolve_name(int family, const char *hostname, int flags, struct addrinfo **aip, LOCK(&head.list_lock); for (resstate = ISC_LIST_HEAD(head.resstates); resstate != NULL; - resstate = ISC_LIST_NEXT(resstate, link)) { + resstate = ISC_LIST_NEXT(resstate, link)) + { if (resstate->trans4 != NULL) { result = dns_client_startresolve( client, resstate->qname, dns_rdataclass_in, @@ -1106,10 +1106,9 @@ resolve_name(int family, const char *hostname, int flags, struct addrinfo **aip, static void set_order(int family, - int (**net_order)(const char *, int, struct addrinfo **, int, int)) -{ + int (**net_order)(const char *, int, struct addrinfo **, int, int)) { char *order, *tok, *last; - int found; + int found; if (family) { switch (family) { @@ -1160,8 +1159,7 @@ static char v4_loop[4] = { 127, 0, 0, 1 }; static int add_ipv4(const char *hostname, int flags, struct addrinfo **aip, int socktype, - int port) -{ + int port) { struct addrinfo *ai; UNUSED(hostname); @@ -1184,8 +1182,7 @@ static char v6_loop[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }; static int add_ipv6(const char *hostname, int flags, struct addrinfo **aip, int socktype, - int port) -{ + int port) { struct addrinfo *ai; UNUSED(hostname); @@ -1206,14 +1203,12 @@ add_ipv6(const char *hostname, int flags, struct addrinfo **aip, int socktype, /*% Free address info. */ void -freeaddrinfo(struct addrinfo *ai) -{ +freeaddrinfo(struct addrinfo *ai) { _freeaddrinfo(ai); } static void -_freeaddrinfo(struct addrinfo *ai) -{ +_freeaddrinfo(struct addrinfo *ai) { struct addrinfo *ai_next; while (ai != NULL) { @@ -1231,9 +1226,8 @@ _freeaddrinfo(struct addrinfo *ai) #ifdef AF_LOCAL static int -get_local(const char *name, int socktype, struct addrinfo **res) -{ - struct addrinfo * ai; +get_local(const char *name, int socktype, struct addrinfo **res) { + struct addrinfo *ai; struct sockaddr_un *slocal; if (socktype == 0) { @@ -1270,8 +1264,7 @@ get_local(const char *name, int socktype, struct addrinfo **res) * and everything else is initialized to zero. */ static struct addrinfo * -ai_alloc(int family, int addrlen) -{ +ai_alloc(int family, int addrlen) { struct addrinfo *ai; ai = (struct addrinfo *)calloc(1, sizeof(*ai)); @@ -1294,8 +1287,7 @@ ai_alloc(int family, int addrlen) } static struct addrinfo * -ai_clone(struct addrinfo *oai, int family) -{ +ai_clone(struct addrinfo *oai, int family) { struct addrinfo *ai; ai = ai_alloc(family, @@ -1318,8 +1310,7 @@ ai_clone(struct addrinfo *oai, int family) } static struct addrinfo * -ai_reverse(struct addrinfo *oai) -{ +ai_reverse(struct addrinfo *oai) { struct addrinfo *nai, *tai; nai = NULL; @@ -1340,8 +1331,7 @@ ai_reverse(struct addrinfo *oai) } static struct addrinfo * -ai_concat(struct addrinfo *ai1, struct addrinfo *ai2) -{ +ai_concat(struct addrinfo *ai1, struct addrinfo *ai2) { struct addrinfo *ai_tmp; if (ai1 == NULL) { @@ -1351,7 +1341,8 @@ ai_concat(struct addrinfo *ai1, struct addrinfo *ai2) } for (ai_tmp = ai1; ai_tmp != NULL && ai_tmp->ai_next != NULL; - ai_tmp = ai_tmp->ai_next) { + ai_tmp = ai_tmp->ai_next) + { } ai_tmp->ai_next = ai2; diff --git a/lib/irs/getnameinfo.c b/lib/irs/getnameinfo.c index 9964f774a5..a102db5443 100644 --- a/lib/irs/getnameinfo.c +++ b/lib/irs/getnameinfo.c @@ -114,7 +114,7 @@ /*% afd structure definition */ static struct afd { - int a_af; + int a_af; size_t a_addrlen; size_t a_socklen; } afdl[] = { @@ -139,17 +139,16 @@ static struct afd { int getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, - socklen_t hostlen, char *serv, socklen_t servlen, int flags) -{ - struct afd * afd = NULL; + socklen_t hostlen, char *serv, socklen_t servlen, int flags) { + struct afd *afd = NULL; struct servent *sp; - unsigned short port = 0; + unsigned short port = 0; #ifdef IRS_PLATFORM_HAVESALEN size_t len; #endif /* ifdef IRS_PLATFORM_HAVESALEN */ - int family, i; + int family, i; const void *addr = NULL; - char * p; + char *p; #if 0 unsigned long v4a; unsigned char pfx; @@ -158,7 +157,7 @@ getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, char numaddr[sizeof("abcd:abcd:abcd:abcd:abcd:abcd:255.255.255.255") + 1 + sizeof("4294967295")]; const char *proto; - int result = SUCCESS; + int result = SUCCESS; if (sa == NULL) { ERR(EAI_FAIL); @@ -209,7 +208,8 @@ found: * Caller does not want service. */ } else if ((flags & NI_NUMERICSERV) != 0 || - (sp = getservbyport(port, proto)) == NULL) { + (sp = getservbyport(port, proto)) == NULL) + { snprintf(numserv, sizeof(numserv), "%d", ntohs(port)); if ((strlen(numserv) + 1) > servlen) { ERR(EAI_OVERFLOW); @@ -259,7 +259,7 @@ found: #if defined(IRS_HAVE_SIN6_SCOPE_ID) if (afd->a_af == AF_INET6 && ((const struct sockaddr_in6 *)sa)->sin6_scope_id) { - char * p = numaddr + strlen(numaddr); + char *p = numaddr + strlen(numaddr); const char *stringscope = NULL; #ifdef VENDOR_SPECIFIC /* @@ -284,17 +284,17 @@ found: } strlcpy(host, numaddr, hostlen); } else { - isc_netaddr_t netaddr; + isc_netaddr_t netaddr; dns_fixedname_t ptrfname; - dns_name_t * ptrname; - irs_context_t * irsctx = NULL; - dns_client_t * client; - bool found = false; - dns_namelist_t answerlist; + dns_name_t *ptrname; + irs_context_t *irsctx = NULL; + dns_client_t *client; + bool found = false; + dns_namelist_t answerlist; dns_rdataset_t *rdataset; - isc_region_t hostregion; - char hoststr[1024]; /* is this enough? */ - isc_result_t iresult; + isc_region_t hostregion; + char hoststr[1024]; /* is this enough? */ + isc_result_t iresult; /* Get IRS context and the associated DNS client object */ iresult = irs_context_get(&irsctx); @@ -348,10 +348,12 @@ found: /* Parse the answer for the hostname */ for (ptrname = ISC_LIST_HEAD(answerlist); ptrname != NULL; - ptrname = ISC_LIST_NEXT(ptrname, link)) { + ptrname = ISC_LIST_NEXT(ptrname, link)) + { for (rdataset = ISC_LIST_HEAD(ptrname->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (!dns_rdataset_isassociated(rdataset)) { continue; } @@ -361,10 +363,11 @@ found: for (iresult = dns_rdataset_first(rdataset); iresult == ISC_R_SUCCESS; - iresult = dns_rdataset_next(rdataset)) { - dns_rdata_t rdata; + iresult = dns_rdataset_next(rdataset)) + { + dns_rdata_t rdata; dns_rdata_ptr_t rdata_ptr; - isc_buffer_t b; + isc_buffer_t b; dns_rdata_init(&rdata); dns_rdataset_current(rdataset, &rdata); diff --git a/lib/irs/resconf.c b/lib/irs/resconf.c index 7526ce1d92..2511c91a07 100644 --- a/lib/irs/resconf.c +++ b/lib/irs/resconf.c @@ -55,7 +55,7 @@ #include #include -#define IRS_RESCONF_MAGIC ISC_MAGIC('R', 'E', 'S', 'c') +#define IRS_RESCONF_MAGIC ISC_MAGIC('R', 'E', 'S', 'c') #define IRS_RESCONF_VALID(c) ISC_MAGIC_VALID(c, IRS_RESCONF_MAGIC) /*! @@ -74,10 +74,10 @@ * resolv.conf parameters */ -#define RESCONFMAXNAMESERVERS 3U /*%< max 3 "nameserver" entries */ -#define RESCONFMAXSEARCH 8U /*%< max 8 domains in "search" entry */ -#define RESCONFMAXLINELEN 256U /*%< max size of a line */ -#define RESCONFMAXSORTLIST 10U /*%< max 10 */ +#define RESCONFMAXNAMESERVERS 3U /*%< max 3 "nameserver" entries */ +#define RESCONFMAXSEARCH 8U /*%< max 8 domains in "search" entry */ +#define RESCONFMAXLINELEN 256U /*%< max size of a line */ +#define RESCONFMAXSORTLIST 10U /*%< max 10 */ /*! * configuration data structure @@ -89,14 +89,14 @@ struct irs_resconf { * need to be locked. */ unsigned int magic; - isc_mem_t * mctx; + isc_mem_t *mctx; isc_sockaddrlist_t nameservers; - unsigned int numns; /*%< number of configured servers - * */ + unsigned int numns; /*%< number of configured servers + * */ - char * domainname; - char * search[RESCONFMAXSEARCH]; + char *domainname; + char *search[RESCONFMAXSEARCH]; uint8_t searchnxt; /*%< index for next free slot * */ @@ -115,28 +115,21 @@ 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 */ /*! * Eat characters from FP until EOL or EOF. Returns EOF or '\n' */ static int -eatline(FILE *fp) -{ +eatline(FILE *fp) { int ch; ch = fgetc(fp); @@ -153,8 +146,7 @@ eatline(FILE *fp) * space. */ static int -eatwhite(FILE *fp) -{ +eatwhite(FILE *fp) { int ch; ch = fgetc(fp); @@ -176,9 +168,8 @@ eatwhite(FILE *fp) * that caused the reading to stop. */ static int -getword(FILE *fp, char *buffer, size_t size) -{ - int ch; +getword(FILE *fp, char *buffer, size_t size) { + int ch; char *p; REQUIRE(buffer != NULL); @@ -211,12 +202,11 @@ getword(FILE *fp, char *buffer, size_t size) static isc_result_t add_server(isc_mem_t *mctx, const char *address_str, - isc_sockaddrlist_t *nameservers) -{ - int error; + isc_sockaddrlist_t *nameservers) { + int error; isc_sockaddr_t *address = NULL; struct addrinfo hints, *res; - isc_result_t result = ISC_R_SUCCESS; + isc_result_t result = ISC_R_SUCCESS; res = NULL; memset(&hints, 0, sizeof(hints)); @@ -232,8 +222,8 @@ add_server(isc_mem_t *mctx, const char *address_str, /* XXX: special case: treat all-0 IPv4 address as loopback */ if (res->ai_family == AF_INET) { struct in_addr *v4; - unsigned char zeroaddress[] = { 0, 0, 0, 0 }; - unsigned char loopaddress[] = { 127, 0, 0, 1 }; + unsigned char zeroaddress[] = { 0, 0, 0, 0 }; + unsigned char loopaddress[] = { 127, 0, 0, 1 }; v4 = &((struct sockaddr_in *)res->ai_addr)->sin_addr; if (memcmp(v4, zeroaddress, 4) == 0) { @@ -259,9 +249,8 @@ cleanup: } static isc_result_t -create_addr(const char *buffer, isc_netaddr_t *addr, int convert_zero) -{ - struct in_addr v4; +create_addr(const char *buffer, isc_netaddr_t *addr, int convert_zero) { + struct in_addr v4; struct in6_addr v6; if (inet_pton(AF_INET, buffer, &v4) == 1) { @@ -287,10 +276,9 @@ create_addr(const char *buffer, isc_netaddr_t *addr, int convert_zero) } static isc_result_t -resconf_parsenameserver(irs_resconf_t *conf, FILE *fp) -{ - char word[RESCONFMAXLINELEN]; - int cp; +resconf_parsenameserver(irs_resconf_t *conf, FILE *fp) { + char word[RESCONFMAXLINELEN]; + int cp; isc_result_t result; if (conf->numns == RESCONFMAXNAMESERVERS) { @@ -318,10 +306,9 @@ resconf_parsenameserver(irs_resconf_t *conf, FILE *fp) } static isc_result_t -resconf_parsedomain(irs_resconf_t *conf, FILE *fp) -{ - char word[RESCONFMAXLINELEN]; - int res; +resconf_parsedomain(irs_resconf_t *conf, FILE *fp) { + char word[RESCONFMAXLINELEN]; + int res; unsigned int i; res = getword(fp, word, sizeof(word)); @@ -356,11 +343,10 @@ resconf_parsedomain(irs_resconf_t *conf, FILE *fp) } static isc_result_t -resconf_parsesearch(irs_resconf_t *conf, FILE *fp) -{ - int delim; +resconf_parsesearch(irs_resconf_t *conf, FILE *fp) { + int delim; unsigned int idx; - char word[RESCONFMAXLINELEN]; + char word[RESCONFMAXLINELEN]; if (conf->domainname != NULL) { /* @@ -409,12 +395,11 @@ resconf_parsesearch(irs_resconf_t *conf, FILE *fp) } static isc_result_t -resconf_parsesortlist(irs_resconf_t *conf, FILE *fp) -{ - int delim, res; +resconf_parsesortlist(irs_resconf_t *conf, FILE *fp) { + int delim, res; unsigned int idx; - char word[RESCONFMAXLINELEN]; - char * p; + char word[RESCONFMAXLINELEN]; + char *p; delim = getword(fp, word, sizeof(word)); if (strlen(word) == 0U) { @@ -466,12 +451,11 @@ resconf_parsesortlist(irs_resconf_t *conf, FILE *fp) } static isc_result_t -resconf_parseoption(irs_resconf_t *conf, FILE *fp) -{ - int delim; - long ndots; +resconf_parseoption(irs_resconf_t *conf, FILE *fp) { + int delim; + long ndots; char *p; - char word[RESCONFMAXLINELEN]; + char word[RESCONFMAXLINELEN]; delim = getword(fp, word, sizeof(word)); if (strlen(word) == 0U) { @@ -503,8 +487,7 @@ resconf_parseoption(irs_resconf_t *conf, FILE *fp) } static isc_result_t -add_search(irs_resconf_t *conf, char *domain) -{ +add_search(irs_resconf_t *conf, char *domain) { irs_resconf_search_t *entry; entry = isc_mem_get(conf->mctx, sizeof(*entry)); @@ -518,14 +501,13 @@ add_search(irs_resconf_t *conf, char *domain) /*% parses a file and fills in the data structure. */ isc_result_t -irs_resconf_load(isc_mem_t *mctx, const char *filename, irs_resconf_t **confp) -{ - FILE * fp = NULL; - char word[256]; - isc_result_t rval, ret = ISC_R_SUCCESS; +irs_resconf_load(isc_mem_t *mctx, const char *filename, irs_resconf_t **confp) { + FILE *fp = NULL; + char word[256]; + isc_result_t rval, ret = ISC_R_SUCCESS; irs_resconf_t *conf; - unsigned int i; - int stopchar; + unsigned int i; + int stopchar; REQUIRE(mctx != NULL); REQUIRE(filename != NULL); @@ -644,12 +626,11 @@ error: } void -irs_resconf_destroy(irs_resconf_t **confp) -{ - irs_resconf_t * conf; - isc_sockaddr_t * address; +irs_resconf_destroy(irs_resconf_t **confp) { + irs_resconf_t *conf; + isc_sockaddr_t *address; irs_resconf_search_t *searchentry; - unsigned int i; + unsigned int i; REQUIRE(confp != NULL); conf = *confp; @@ -680,24 +661,21 @@ irs_resconf_destroy(irs_resconf_t **confp) } isc_sockaddrlist_t * -irs_resconf_getnameservers(irs_resconf_t *conf) -{ +irs_resconf_getnameservers(irs_resconf_t *conf) { REQUIRE(IRS_RESCONF_VALID(conf)); return (&conf->nameservers); } irs_resconf_searchlist_t * -irs_resconf_getsearchlist(irs_resconf_t *conf) -{ +irs_resconf_getsearchlist(irs_resconf_t *conf) { REQUIRE(IRS_RESCONF_VALID(conf)); return (&conf->searchlist); } unsigned int -irs_resconf_getndots(irs_resconf_t *conf) -{ +irs_resconf_getndots(irs_resconf_t *conf) { REQUIRE(IRS_RESCONF_VALID(conf)); return ((unsigned int)conf->ndots); diff --git a/lib/irs/tests/resconf_test.c b/lib/irs/tests/resconf_test.c index 9aeed89d5f..7304a4ba6c 100644 --- a/lib/irs/tests/resconf_test.c +++ b/lib/irs/tests/resconf_test.c @@ -32,8 +32,7 @@ static isc_mem_t *mctx = NULL; static void -setup_test() -{ +setup_test() { isc_mem_create(&mctx); /* @@ -46,13 +45,12 @@ setup_test() /* test irs_resconf_load() */ static void -irs_resconf_load_test(void **state) -{ - isc_result_t result; +irs_resconf_load_test(void **state) { + isc_result_t result; irs_resconf_t *resconf = NULL; - unsigned int i; + unsigned int i; struct { - const char * file; + const char *file; isc_result_t loadres; isc_result_t (*check)(irs_resconf_t *resconf); isc_result_t checkres; @@ -121,8 +119,7 @@ irs_resconf_load_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(irs_resconf_load_test), }; @@ -135,8 +132,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/irs/win32/DLLMain.c b/lib/irs/win32/DLLMain.c index 69e68ca22a..e104b8e4f3 100644 --- a/lib/irs/win32/DLLMain.c +++ b/lib/irs/win32/DLLMain.c @@ -16,8 +16,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/lib/irs/win32/include/irs/netdb.h b/lib/irs/win32/include/irs/netdb.h index ee2f884557..be632eb073 100644 --- a/lib/irs/win32/include/irs/netdb.h +++ b/lib/irs/win32/include/irs/netdb.h @@ -54,12 +54,12 @@ struct addrinfo { #undef NO_ADDRESS #define NETDB_INTERNAL -1 /* see errno */ -#define NETDB_SUCCESS 0 /* no problem */ +#define NETDB_SUCCESS 0 /* no problem */ #define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found */ -#define TRY_AGAIN 2 /* Non-Authoritive Host not found, or SERVERFAIL */ -#define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */ -#define NO_DATA 4 /* Valid name, no data record of requested type */ -#define NO_ADDRESS NO_DATA /* no address, look for MX record */ +#define TRY_AGAIN 2 /* Non-Authoritive Host not found, or SERVERFAIL */ +#define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */ +#define NO_DATA 4 /* Valid name, no data record of requested type */ +#define NO_ADDRESS NO_DATA /* no address, look for MX record */ /* * Error return codes from getaddrinfo(). EAI_INSECUREDATA is our own extension @@ -84,22 +84,22 @@ struct addrinfo { #undef EAI_INSECUREDATA #undef EAI_MAX -#define EAI_ADDRFAMILY 1 /* address family for hostname not supported */ -#define EAI_AGAIN 2 /* temporary failure in name resolution */ -#define EAI_BADFLAGS 3 /* invalid value for ai_flags */ -#define EAI_FAIL 4 /* non-recoverable failure in name resolution */ -#define EAI_FAMILY 5 /* ai_family not supported */ -#define EAI_MEMORY 6 /* memory allocation failure */ -#define EAI_NODATA 7 /* no address associated with hostname */ -#define EAI_NONAME 8 /* hostname nor servname provided, or not known */ -#define EAI_SERVICE 9 /* servname not supported for ai_socktype */ -#define EAI_SOCKTYPE 10 /* ai_socktype not supported */ -#define EAI_SYSTEM 11 /* system error returned in errno */ -#define EAI_BADHINTS 12 -#define EAI_PROTOCOL 13 -#define EAI_OVERFLOW 14 +#define EAI_ADDRFAMILY 1 /* address family for hostname not supported */ +#define EAI_AGAIN 2 /* temporary failure in name resolution */ +#define EAI_BADFLAGS 3 /* invalid value for ai_flags */ +#define EAI_FAIL 4 /* non-recoverable failure in name resolution */ +#define EAI_FAMILY 5 /* ai_family not supported */ +#define EAI_MEMORY 6 /* memory allocation failure */ +#define EAI_NODATA 7 /* no address associated with hostname */ +#define EAI_NONAME 8 /* hostname nor servname provided, or not known */ +#define EAI_SERVICE 9 /* servname not supported for ai_socktype */ +#define EAI_SOCKTYPE 10 /* ai_socktype not supported */ +#define EAI_SYSTEM 11 /* system error returned in errno */ +#define EAI_BADHINTS 12 +#define EAI_PROTOCOL 13 +#define EAI_OVERFLOW 14 #define EAI_INSECUREDATA 15 -#define EAI_MAX 16 +#define EAI_MAX 16 /* * Flag values for getaddrinfo() @@ -108,8 +108,8 @@ struct addrinfo { #undef AI_CANONNAME #undef AI_NUMERICHOST -#define AI_PASSIVE 0x00000001 -#define AI_CANONNAME 0x00000002 +#define AI_PASSIVE 0x00000001 +#define AI_CANONNAME 0x00000002 #define AI_NUMERICHOST 0x00000004 /* @@ -120,10 +120,10 @@ struct addrinfo { #undef AI_ADDRCONFIG #undef AI_DEFAULT -#define AI_V4MAPPED 0x00000008 -#define AI_ALL 0x00000010 +#define AI_V4MAPPED 0x00000008 +#define AI_ALL 0x00000010 #define AI_ADDRCONFIG 0x00000020 -#define AI_DEFAULT (AI_V4MAPPED | AI_ADDRCONFIG) +#define AI_DEFAULT (AI_V4MAPPED | AI_ADDRCONFIG) /* * Constants for getnameinfo() @@ -144,11 +144,11 @@ struct addrinfo { #undef NI_DGRAM #undef NI_NUMERICSCOPE -#define NI_NOFQDN 0x00000001 +#define NI_NOFQDN 0x00000001 #define NI_NUMERICHOST 0x00000002 -#define NI_NAMEREQD 0x00000004 +#define NI_NAMEREQD 0x00000004 #define NI_NUMERICSERV 0x00000008 -#define NI_DGRAM 0x00000010 +#define NI_DGRAM 0x00000010 /* * Define to map into irs_ namespace. diff --git a/lib/irs/win32/resconf.c b/lib/irs/win32/resconf.c index 72e632fada..e972b9cffc 100644 --- a/lib/irs/win32/resconf.c +++ b/lib/irs/win32/resconf.c @@ -28,14 +28,13 @@ #define TCPIP_SUBKEY "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters" isc_result_t -get_win32_searchlist(irs_resconf_t *conf) -{ +get_win32_searchlist(irs_resconf_t *conf) { isc_result_t result = ISC_R_SUCCESS; - HKEY hKey; - char searchlist[MAX_PATH]; - DWORD searchlen = MAX_PATH; - LSTATUS status; - char * cp; + HKEY hKey; + char searchlist[MAX_PATH]; + DWORD searchlen = MAX_PATH; + LSTATUS status; + char *cp; REQUIRE(conf != NULL); @@ -65,12 +64,11 @@ get_win32_searchlist(irs_resconf_t *conf) } isc_result_t -get_win32_nameservers(irs_resconf_t *conf) -{ - isc_result_t result; - FIXED_INFO * FixedInfo; - ULONG BufLen = sizeof(FIXED_INFO); - DWORD dwRetVal; +get_win32_nameservers(irs_resconf_t *conf) { + isc_result_t result; + FIXED_INFO *FixedInfo; + ULONG BufLen = sizeof(FIXED_INFO); + DWORD dwRetVal; IP_ADDR_STRING *pIPAddr; REQUIRE(conf != NULL); diff --git a/lib/isc/aes.c b/lib/isc/aes.c index f98acd000e..4d9cadb5cd 100644 --- a/lib/isc/aes.c +++ b/lib/isc/aes.c @@ -22,21 +22,20 @@ #include #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -#define EVP_CIPHER_CTX_new() &(_context), EVP_CIPHER_CTX_init(&_context) +#define EVP_CIPHER_CTX_new() &(_context), EVP_CIPHER_CTX_init(&_context) #define EVP_CIPHER_CTX_free(c) RUNTIME_CHECK(EVP_CIPHER_CTX_cleanup(c) == 1) #endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || \ * defined(LIBRESSL_VERSION_NUMBER) */ void isc_aes128_crypt(const unsigned char *key, const unsigned char *in, - unsigned char *out) -{ + unsigned char *out) { #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) EVP_CIPHER_CTX _context; #endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || \ * defined(LIBRESSL_VERSION_NUMBER) */ EVP_CIPHER_CTX *c; - int len; + int len; c = EVP_CIPHER_CTX_new(); RUNTIME_CHECK(c != NULL); @@ -50,14 +49,13 @@ isc_aes128_crypt(const unsigned char *key, const unsigned char *in, void isc_aes192_crypt(const unsigned char *key, const unsigned char *in, - unsigned char *out) -{ + unsigned char *out) { #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) EVP_CIPHER_CTX _context; #endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || \ * defined(LIBRESSL_VERSION_NUMBER) */ EVP_CIPHER_CTX *c; - int len; + int len; c = EVP_CIPHER_CTX_new(); RUNTIME_CHECK(c != NULL); @@ -71,14 +69,13 @@ isc_aes192_crypt(const unsigned char *key, const unsigned char *in, void isc_aes256_crypt(const unsigned char *key, const unsigned char *in, - unsigned char *out) -{ + unsigned char *out) { #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) EVP_CIPHER_CTX _context; #endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || \ * defined(LIBRESSL_VERSION_NUMBER) */ EVP_CIPHER_CTX *c; - int len; + int len; c = EVP_CIPHER_CTX_new(); RUNTIME_CHECK(c != NULL); diff --git a/lib/isc/app.c b/lib/isc/app.c index 2348265816..a6424db5f9 100644 --- a/lib/isc/app.c +++ b/lib/isc/app.c @@ -52,7 +52,7 @@ */ static isc_thread_t blockedthread; -static atomic_bool is_running; +static atomic_bool is_running; #ifdef WIN32 /* @@ -64,7 +64,7 @@ static isc_thread_t main_thread; /* * The application context of this module. */ -#define APPCTX_MAGIC ISC_MAGIC('A', 'p', 'c', 'x') +#define APPCTX_MAGIC ISC_MAGIC('A', 'p', 'c', 'x') #define VALID_APPCTX(c) ISC_MAGIC_VALID(c, APPCTX_MAGIC) #ifdef WIN32 @@ -74,19 +74,19 @@ enum { RELOAD_EVENT, SHUTDOWN_EVENT }; #endif /* WIN32 */ struct isc_appctx { - unsigned int magic; - isc_mem_t * mctx; - isc_mutex_t lock; + unsigned int magic; + isc_mem_t *mctx; + isc_mutex_t lock; isc_eventlist_t on_run; - atomic_bool shutdown_requested; - atomic_bool running; - atomic_bool want_shutdown; - atomic_bool want_reload; - atomic_bool blocked; + atomic_bool shutdown_requested; + atomic_bool running; + atomic_bool want_shutdown; + atomic_bool want_reload; + atomic_bool blocked; #ifdef WIN32 HANDLE hEvents[NUM_EVENTS]; #else /* WIN32 */ - isc_mutex_t readylock; + isc_mutex_t readylock; isc_condition_t ready; #endif /* WIN32 */ }; @@ -95,8 +95,7 @@ static isc_appctx_t isc_g_appctx; #ifndef WIN32 static void -handle_signal(int sig, void (*handler)(int)) -{ +handle_signal(int sig, void (*handler)(int)) { struct sigaction sa; memset(&sa, 0, sizeof(sa)); @@ -112,8 +111,7 @@ handle_signal(int sig, void (*handler)(int)) #endif /* ifndef WIN32 */ isc_result_t -isc_app_ctxstart(isc_appctx_t *ctx) -{ +isc_app_ctxstart(isc_appctx_t *ctx) { REQUIRE(VALID_APPCTX(ctx)); /* @@ -144,9 +142,9 @@ isc_app_ctxstart(isc_appctx_t *ctx) /* Create the shutdown event in a non-signaled state */ ctx->hEvents[SHUTDOWN_EVENT] = CreateEvent(NULL, FALSE, FALSE, NULL); #else /* WIN32 */ - int presult; - sigset_t sset; - char strbuf[ISC_STRERRORSIZE]; + int presult; + sigset_t sset; + char strbuf[ISC_STRERRORSIZE]; /* * Always ignore SIGPIPE. @@ -167,7 +165,8 @@ isc_app_ctxstart(isc_appctx_t *ctx) * sigwait() for them will get those signals. */ if (sigemptyset(&sset) != 0 || sigaddset(&sset, SIGHUP) != 0 || - sigaddset(&sset, SIGINT) != 0 || sigaddset(&sset, SIGTERM) != 0) { + sigaddset(&sset, SIGINT) != 0 || sigaddset(&sset, SIGTERM) != 0) + { strerror_r(errno, strbuf, sizeof(strbuf)); isc_error_fatal(__FILE__, __LINE__, "isc_app_start() sigsetops: %s", strbuf); @@ -185,8 +184,7 @@ isc_app_ctxstart(isc_appctx_t *ctx) } isc_result_t -isc_app_start(void) -{ +isc_app_start(void) { isc_g_appctx.magic = APPCTX_MAGIC; isc_g_appctx.mctx = NULL; /* The remaining members will be initialized in ctxstart() */ @@ -196,17 +194,15 @@ isc_app_start(void) isc_result_t isc_app_onrun(isc_mem_t *mctx, isc_task_t *task, isc_taskaction_t action, - void *arg) -{ + void *arg) { return (isc_app_ctxonrun(&isc_g_appctx, mctx, task, action, arg)); } isc_result_t isc_app_ctxonrun(isc_appctx_t *ctx, isc_mem_t *mctx, isc_task_t *task, - isc_taskaction_t action, void *arg) -{ + isc_taskaction_t action, void *arg) { isc_event_t *event; - isc_task_t * cloned_task = NULL; + isc_task_t *cloned_task = NULL; if (atomic_load_acquire(&ctx->running)) { return (ISC_R_ALREADYRUNNING); @@ -229,12 +225,11 @@ isc_app_ctxonrun(isc_appctx_t *ctx, isc_mem_t *mctx, isc_task_t *task, } isc_result_t -isc_app_ctxrun(isc_appctx_t *ctx) -{ +isc_app_ctxrun(isc_appctx_t *ctx) { isc_event_t *event, *next_event; - isc_task_t * task; - bool exp_false = false; - bool exp_true = true; + isc_task_t *task; + bool exp_false = false; + bool exp_true = true; REQUIRE(VALID_APPCTX(ctx)); @@ -243,7 +238,8 @@ isc_app_ctxrun(isc_appctx_t *ctx) #endif /* ifdef WIN32 */ if (atomic_compare_exchange_weak_acq_rel(&ctx->running, &exp_false, - true) == true) { + true) == true) + { /* * Post any on-run events (in FIFO order). */ @@ -300,7 +296,7 @@ isc_app_ctxrun(isc_appctx_t *ctx) #else /* WIN32 */ if (isc_bind9) { sigset_t sset; - int sig; + int sig; /* * BIND9 internal; single context: * Wait for SIGHUP, SIGINT, or SIGTERM. @@ -308,7 +304,8 @@ isc_app_ctxrun(isc_appctx_t *ctx) if (sigemptyset(&sset) != 0 || sigaddset(&sset, SIGHUP) != 0 || sigaddset(&sset, SIGINT) != 0 || - sigaddset(&sset, SIGTERM) != 0) { + sigaddset(&sset, SIGTERM) != 0) + { char strbuf[ISC_STRERRORSIZE]; strerror_r(errno, strbuf, sizeof(strbuf)); isc_error_fatal(__FILE__, __LINE__, @@ -354,7 +351,8 @@ isc_app_ctxrun(isc_appctx_t *ctx) } if (atomic_load_acquire(&ctx->want_shutdown) && - atomic_load_acquire(&ctx->blocked)) { + atomic_load_acquire(&ctx->blocked)) + { exit(1); } } @@ -363,10 +361,9 @@ isc_app_ctxrun(isc_appctx_t *ctx) } isc_result_t -isc_app_run(void) -{ +isc_app_run(void) { isc_result_t result; - bool exp_false = false; + bool exp_false = false; REQUIRE(atomic_compare_exchange_weak_acq_rel(&is_running, &exp_false, true) == true); @@ -377,14 +374,12 @@ isc_app_run(void) } bool -isc_app_isrunning() -{ +isc_app_isrunning() { return (atomic_load_acquire(&is_running)); } void -isc_app_ctxshutdown(isc_appctx_t *ctx) -{ +isc_app_ctxshutdown(isc_appctx_t *ctx) { bool exp_false = false; REQUIRE(VALID_APPCTX(ctx)); @@ -395,7 +390,8 @@ isc_app_ctxshutdown(isc_appctx_t *ctx) * down and we want to just bail out. */ if (atomic_compare_exchange_weak_acq_rel(&ctx->shutdown_requested, - &exp_false, true)) { + &exp_false, true)) + { #ifdef WIN32 SetEvent(ctx->hEvents[SHUTDOWN_EVENT]); #else /* WIN32 */ @@ -422,14 +418,12 @@ isc_app_ctxshutdown(isc_appctx_t *ctx) } void -isc_app_shutdown(void) -{ +isc_app_shutdown(void) { isc_app_ctxshutdown(&isc_g_appctx); } void -isc_app_ctxsuspend(isc_appctx_t *ctx) -{ +isc_app_ctxsuspend(isc_appctx_t *ctx) { REQUIRE(VALID_APPCTX(ctx)); REQUIRE(atomic_load(&ctx->running)); @@ -464,14 +458,12 @@ isc_app_ctxsuspend(isc_appctx_t *ctx) } void -isc_app_reload(void) -{ +isc_app_reload(void) { isc_app_ctxsuspend(&isc_g_appctx); } void -isc_app_ctxfinish(isc_appctx_t *ctx) -{ +isc_app_ctxfinish(isc_appctx_t *ctx) { REQUIRE(VALID_APPCTX(ctx)); isc_mutex_destroy(&ctx->lock); @@ -482,14 +474,12 @@ isc_app_ctxfinish(isc_appctx_t *ctx) } void -isc_app_finish(void) -{ +isc_app_finish(void) { isc_app_ctxfinish(&isc_g_appctx); } void -isc_app_block(void) -{ +isc_app_block(void) { bool exp_false = false; REQUIRE(atomic_load_acquire(&isc_g_appctx.running)); REQUIRE(atomic_compare_exchange_weak_acq_rel(&isc_g_appctx.blocked, @@ -508,8 +498,7 @@ isc_app_block(void) } void -isc_app_unblock(void) -{ +isc_app_unblock(void) { bool exp_true = true; REQUIRE(atomic_load_acquire(&isc_g_appctx.running)); @@ -530,8 +519,7 @@ isc_app_unblock(void) } isc_result_t -isc_appctx_create(isc_mem_t *mctx, isc_appctx_t **ctxp) -{ +isc_appctx_create(isc_mem_t *mctx, isc_appctx_t **ctxp) { isc_appctx_t *ctx; REQUIRE(mctx != NULL); @@ -550,8 +538,7 @@ isc_appctx_create(isc_mem_t *mctx, isc_appctx_t **ctxp) } void -isc_appctx_destroy(isc_appctx_t **ctxp) -{ +isc_appctx_destroy(isc_appctx_t **ctxp) { isc_appctx_t *ctx; REQUIRE(ctxp != NULL); diff --git a/lib/isc/assertions.c b/lib/isc/assertions.c index cbabec3a97..b413fc5129 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; @@ -42,8 +42,7 @@ static isc_assertioncallback_t isc_assertion_failed_cb = default_callback; /* coverity[+kill] */ void isc_assertion_failed(const char *file, int line, isc_assertiontype_t type, - const char *cond) -{ + const char *cond) { isc_assertion_failed_cb(file, line, type, cond); abort(); /* NOTREACHED */ @@ -51,8 +50,7 @@ isc_assertion_failed(const char *file, int line, isc_assertiontype_t type, /*% Set callback. */ void -isc_assertion_setcallback(isc_assertioncallback_t cb) -{ +isc_assertion_setcallback(isc_assertioncallback_t cb) { if (cb == NULL) { isc_assertion_failed_cb = default_callback; } else { @@ -62,8 +60,7 @@ isc_assertion_setcallback(isc_assertioncallback_t cb) /*% Type to Text */ const char * -isc_assertion_typetotext(isc_assertiontype_t type) -{ +isc_assertion_typetotext(isc_assertiontype_t type) { const char *result; /* @@ -96,12 +93,11 @@ isc_assertion_typetotext(isc_assertiontype_t type) static void default_callback(const char *file, int line, isc_assertiontype_t type, - const char *cond) -{ - void * tracebuf[BACKTRACE_MAXFRAME]; - int i, nframes; - const char * logsuffix = "."; - const char * fname; + const char *cond) { + void *tracebuf[BACKTRACE_MAXFRAME]; + int i, nframes; + const char *logsuffix = "."; + const char *fname; isc_result_t result; result = isc_backtrace_gettrace(tracebuf, BACKTRACE_MAXFRAME, &nframes); diff --git a/lib/isc/astack.c b/lib/isc/astack.c index a1d16ae07a..8ae0d515d5 100644 --- a/lib/isc/astack.c +++ b/lib/isc/astack.c @@ -20,16 +20,15 @@ #include struct isc_astack { - isc_mem_t * mctx; - size_t size; - size_t pos; + isc_mem_t *mctx; + size_t size; + size_t pos; isc_mutex_t lock; - uintptr_t nodes[]; + uintptr_t nodes[]; }; isc_astack_t * -isc_astack_new(isc_mem_t *mctx, size_t size) -{ +isc_astack_new(isc_mem_t *mctx, size_t size) { isc_astack_t *stack = isc_mem_get( mctx, sizeof(isc_astack_t) + size * sizeof(uintptr_t)); @@ -43,8 +42,7 @@ isc_astack_new(isc_mem_t *mctx, size_t size) } bool -isc_astack_trypush(isc_astack_t *stack, void *obj) -{ +isc_astack_trypush(isc_astack_t *stack, void *obj) { if (isc_mutex_trylock(&stack->lock) == false) { if (stack->pos >= stack->size) { UNLOCK(&stack->lock); @@ -59,8 +57,7 @@ isc_astack_trypush(isc_astack_t *stack, void *obj) } void * -isc_astack_pop(isc_astack_t *stack) -{ +isc_astack_pop(isc_astack_t *stack) { LOCK(&stack->lock); uintptr_t rv; if (stack->pos == 0) { @@ -73,8 +70,7 @@ isc_astack_pop(isc_astack_t *stack) } void -isc_astack_destroy(isc_astack_t *stack) -{ +isc_astack_destroy(isc_astack_t *stack) { LOCK(&stack->lock); REQUIRE(stack->pos == 0); UNLOCK(&stack->lock); diff --git a/lib/isc/backtrace-emptytbl.c b/lib/isc/backtrace-emptytbl.c index f5a2c2b1f0..7193666ff2 100644 --- a/lib/isc/backtrace-emptytbl.c +++ b/lib/isc/backtrace-emptytbl.c @@ -21,7 +21,7 @@ #include -LIBISC_EXTERNAL_DATA const int isc__backtrace_nsymbols = 0; +LIBISC_EXTERNAL_DATA const int isc__backtrace_nsymbols = 0; LIBISC_EXTERNAL_DATA const isc_backtrace_symmap_t isc__backtrace_symtable[] = { { NULL, "" } }; diff --git a/lib/isc/backtrace.c b/lib/isc/backtrace.c index 56f0ad9210..c3570b462f 100644 --- a/lib/isc/backtrace.c +++ b/lib/isc/backtrace.c @@ -55,8 +55,7 @@ #ifdef BACKTRACE_LIBC isc_result_t -isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) -{ +isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) { int n; /* @@ -81,21 +80,18 @@ 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; - int max_depth; - int skip_count; - int count; + int max_depth; + int skip_count; + int count; } trace_arg_t; static int -btcallback(void *uc, void *opq) -{ +btcallback(void *uc, void *opq) { trace_arg_t *arg = (trace_arg_t *)opq; if (arg->skip_count > 0) { @@ -110,8 +106,7 @@ btcallback(void *uc, void *opq) } isc_result_t -isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) -{ +isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) { trace_arg_t arg; /* Argument validation: see above. */ @@ -131,8 +126,7 @@ isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) } #elif defined(BACKTRACE_WIN32) isc_result_t -isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) -{ +isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) { unsigned long ftc = (unsigned long)maxaddrs; *nframes = (int)CaptureStackBackTrace(1, ftc, addrs, NULL); @@ -141,15 +135,13 @@ isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) #elif defined(BACKTRACE_X86STACK) #ifdef __x86_64__ static unsigned long -getrbp(void) -{ +getrbp(void) { __asm("movq %rbp, %rax\n"); } #endif /* ifdef __x86_64__ */ static void ** -getnextframeptr(void **sp) -{ +getnextframeptr(void **sp) { void **newsp = (void **)*sp; /* @@ -177,9 +169,8 @@ getnextframeptr(void **sp) } isc_result_t -isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) -{ - int i = 0; +isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) { + int i = 0; void **sp; /* Argument validation: see above. */ @@ -217,8 +208,7 @@ isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) } #elif defined(BACKTRACE_DISABLED) isc_result_t -isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) -{ +isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) { /* Argument validation: see above. */ if (addrs == NULL || nframes == NULL) { return (ISC_R_FAILURE); @@ -232,8 +222,7 @@ isc_backtrace_gettrace(void **addrs, int maxaddrs, int *nframes) isc_result_t isc_backtrace_getsymbolfromindex(int idx, const void **addrp, - const char **symbolp) -{ + const char **symbolp) { REQUIRE(addrp != NULL && *addrp == NULL); REQUIRE(symbolp != NULL && *symbolp == NULL); @@ -247,8 +236,7 @@ isc_backtrace_getsymbolfromindex(int idx, const void **addrp, } static int -symtbl_compare(const void *addr, const void *entryarg) -{ +symtbl_compare(const void *addr, const void *entryarg) { const isc_backtrace_symmap_t *entry = entryarg; const isc_backtrace_symmap_t *end = &isc__backtrace_symtable[isc__backtrace_nsymbols - 1]; @@ -276,9 +264,8 @@ symtbl_compare(const void *addr, const void *entryarg) isc_result_t isc_backtrace_getsymbol(const void *addr, const char **symbolp, - unsigned long *offsetp) -{ - isc_result_t result = ISC_R_SUCCESS; + unsigned long *offsetp) { + isc_result_t result = ISC_R_SUCCESS; isc_backtrace_symmap_t *found; /* diff --git a/lib/isc/base32.c b/lib/isc/base32.c index a2942f16e0..a140ed1d45 100644 --- a/lib/isc/base32.c +++ b/lib/isc/base32.c @@ -32,11 +32,10 @@ * 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); /*@}*/ @@ -47,9 +46,8 @@ static const char base32hex[] = "0123456789ABCDEFGHIJKLMNOPQRSTUV=" static isc_result_t base32_totext(isc_region_t *source, int wordlength, const char *wordbreak, - isc_buffer_t *target, const char base[], char pad) -{ - char buf[9]; + isc_buffer_t *target, const char base[], char pad) { + char buf[9]; unsigned int loops = 0; if (wordlength >= 0 && wordlength < 8) { @@ -100,7 +98,8 @@ base32_totext(isc_region_t *source, int wordlength, const char *wordbreak, loops++; if (source->length != 0 && wordlength >= 0 && - (int)((loops + 1) * 8) >= wordlength) { + (int)((loops + 1) * 8) >= wordlength) + { loops = 0; RETERR(str_totext(wordbreak, target)); } @@ -113,24 +112,21 @@ base32_totext(isc_region_t *source, int wordlength, const char *wordbreak, isc_result_t isc_base32_totext(isc_region_t *source, int wordlength, const char *wordbreak, - isc_buffer_t *target) -{ + isc_buffer_t *target) { return (base32_totext(source, wordlength, wordbreak, target, base32, '=')); } isc_result_t isc_base32hex_totext(isc_region_t *source, int wordlength, - const char *wordbreak, isc_buffer_t *target) -{ + const char *wordbreak, isc_buffer_t *target) { return (base32_totext(source, wordlength, wordbreak, target, base32hex, '=')); } isc_result_t isc_base32hexnp_totext(isc_region_t *source, int wordlength, - const char *wordbreak, isc_buffer_t *target) -{ + const char *wordbreak, isc_buffer_t *target) { return (base32_totext(source, wordlength, wordbreak, target, base32hex, 0)); } @@ -139,21 +135,20 @@ isc_base32hexnp_totext(isc_region_t *source, int wordlength, * State of a base32 decoding process in progress. */ typedef struct { - int length; /*%< Desired length of binary data or -1 */ - isc_buffer_t *target; /*%< Buffer for resulting binary data */ - int digits; /*%< Number of buffered base32 digits */ - bool seen_end; /*%< True if "=" end marker seen */ - int val[8]; - const char * base; /*%< Which encoding we are using */ - int seen_32; /*%< Number of significant bytes if non - * zero */ - bool pad; /*%< Expect padding */ + int length; /*%< Desired length of binary data or -1 */ + isc_buffer_t *target; /*%< Buffer for resulting binary data */ + int digits; /*%< Number of buffered base32 digits */ + bool seen_end; /*%< True if "=" end marker seen */ + int val[8]; + const char *base; /*%< Which encoding we are using */ + int seen_32; /*%< Number of significant bytes if non + * zero */ + bool pad; /*%< Expect padding */ } base32_decode_ctx_t; static inline void base32_decode_init(base32_decode_ctx_t *ctx, int length, const char base[], - bool pad, isc_buffer_t *target) -{ + bool pad, isc_buffer_t *target) { ctx->digits = 0; ctx->seen_end = false; ctx->seen_32 = 0; @@ -164,9 +159,8 @@ base32_decode_init(base32_decode_ctx_t *ctx, int length, const char base[], } static inline isc_result_t -base32_decode_char(base32_decode_ctx_t *ctx, int c) -{ - const char * s; +base32_decode_char(base32_decode_ctx_t *ctx, int c) { + const char *s; unsigned int last; if (ctx->seen_end) { @@ -245,7 +239,7 @@ base32_decode_char(base32_decode_ctx_t *ctx, int c) ctx->val[ctx->digits++] = (last == 32) ? 0 : last; if (ctx->digits == 8) { - int n = 5; + int n = 5; unsigned char buf[5]; if (ctx->seen_32 != 0) { @@ -273,8 +267,7 @@ base32_decode_char(base32_decode_ctx_t *ctx, int c) } static inline isc_result_t -base32_decode_finish(base32_decode_ctx_t *ctx) -{ +base32_decode_finish(base32_decode_ctx_t *ctx) { if (ctx->length > 0) { return (ISC_R_UNEXPECTEDEND); } @@ -295,13 +288,12 @@ base32_decode_finish(base32_decode_ctx_t *ctx) static isc_result_t base32_tobuffer(isc_lex_t *lexer, const char base[], bool pad, - isc_buffer_t *target, int length) -{ - unsigned int before, after; + isc_buffer_t *target, int length) { + unsigned int before, after; base32_decode_ctx_t ctx; - isc_textregion_t * tr; - isc_token_t token; - bool eol; + isc_textregion_t *tr; + isc_token_t token; + bool eol; REQUIRE(length >= -2); @@ -338,27 +330,23 @@ base32_tobuffer(isc_lex_t *lexer, const char base[], bool pad, } isc_result_t -isc_base32_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) -{ +isc_base32_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) { return (base32_tobuffer(lexer, base32, true, target, length)); } isc_result_t -isc_base32hex_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) -{ +isc_base32hex_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) { return (base32_tobuffer(lexer, base32hex, true, target, length)); } isc_result_t -isc_base32hexnp_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) -{ +isc_base32hexnp_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) { return (base32_tobuffer(lexer, base32hex, false, target, length)); } static isc_result_t base32_decodestring(const char *cstr, const char base[], bool pad, - isc_buffer_t *target) -{ + isc_buffer_t *target) { base32_decode_ctx_t ctx; base32_decode_init(&ctx, -1, base, pad, target); @@ -377,27 +365,23 @@ base32_decodestring(const char *cstr, const char base[], bool pad, } isc_result_t -isc_base32_decodestring(const char *cstr, isc_buffer_t *target) -{ +isc_base32_decodestring(const char *cstr, isc_buffer_t *target) { return (base32_decodestring(cstr, base32, true, target)); } isc_result_t -isc_base32hex_decodestring(const char *cstr, isc_buffer_t *target) -{ +isc_base32hex_decodestring(const char *cstr, isc_buffer_t *target) { return (base32_decodestring(cstr, base32hex, true, target)); } isc_result_t -isc_base32hexnp_decodestring(const char *cstr, isc_buffer_t *target) -{ +isc_base32hexnp_decodestring(const char *cstr, isc_buffer_t *target) { return (base32_decodestring(cstr, base32hex, false, target)); } static isc_result_t base32_decoderegion(isc_region_t *source, const char base[], bool pad, - isc_buffer_t *target) -{ + isc_buffer_t *target) { base32_decode_ctx_t ctx; base32_decode_init(&ctx, -1, base, pad, target); @@ -411,26 +395,22 @@ base32_decoderegion(isc_region_t *source, const char base[], bool pad, } isc_result_t -isc_base32_decoderegion(isc_region_t *source, isc_buffer_t *target) -{ +isc_base32_decoderegion(isc_region_t *source, isc_buffer_t *target) { return (base32_decoderegion(source, base32, true, target)); } isc_result_t -isc_base32hex_decoderegion(isc_region_t *source, isc_buffer_t *target) -{ +isc_base32hex_decoderegion(isc_region_t *source, isc_buffer_t *target) { return (base32_decoderegion(source, base32hex, true, target)); } isc_result_t -isc_base32hexnp_decoderegion(isc_region_t *source, isc_buffer_t *target) -{ +isc_base32hexnp_decoderegion(isc_region_t *source, isc_buffer_t *target) { return (base32_decoderegion(source, base32hex, false, target)); } static isc_result_t -str_totext(const char *source, isc_buffer_t *target) -{ +str_totext(const char *source, isc_buffer_t *target) { unsigned int l; isc_region_t region; @@ -447,8 +427,7 @@ str_totext(const char *source, isc_buffer_t *target) } static isc_result_t -mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) -{ +mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) { isc_region_t tr; isc_buffer_availableregion(target, &tr); diff --git a/lib/isc/base64.c b/lib/isc/base64.c index b812a29360..70e025cc28 100644 --- a/lib/isc/base64.c +++ b/lib/isc/base64.c @@ -31,11 +31,10 @@ * 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+/="; @@ -43,9 +42,8 @@ static const char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvw" isc_result_t isc_base64_totext(isc_region_t *source, int wordlength, const char *wordbreak, - isc_buffer_t *target) -{ - char buf[5]; + isc_buffer_t *target) { + char buf[5]; unsigned int loops = 0; if (wordlength < 4) { @@ -64,8 +62,8 @@ isc_base64_totext(isc_region_t *source, int wordlength, const char *wordbreak, isc_region_consume(source, 3); loops++; - if (source->length != 0 && - (int)((loops + 1) * 4) >= wordlength) { + if (source->length != 0 && (int)((loops + 1) * 4) >= wordlength) + { loops = 0; RETERR(str_totext(wordbreak, target)); } @@ -92,16 +90,15 @@ isc_base64_totext(isc_region_t *source, int wordlength, const char *wordbreak, * State of a base64 decoding process in progress. */ typedef struct { - int length; /*%< Desired length of binary data or -1 */ - isc_buffer_t *target; /*%< Buffer for resulting binary data */ - int digits; /*%< Number of buffered base64 digits */ - bool seen_end; /*%< True if "=" end marker seen */ - int val[4]; + int length; /*%< Desired length of binary data or -1 */ + isc_buffer_t *target; /*%< Buffer for resulting binary data */ + int digits; /*%< Number of buffered base64 digits */ + bool seen_end; /*%< True if "=" end marker seen */ + int val[4]; } base64_decode_ctx_t; static inline void -base64_decode_init(base64_decode_ctx_t *ctx, int length, isc_buffer_t *target) -{ +base64_decode_init(base64_decode_ctx_t *ctx, int length, isc_buffer_t *target) { ctx->digits = 0; ctx->seen_end = false; ctx->length = length; @@ -109,8 +106,7 @@ base64_decode_init(base64_decode_ctx_t *ctx, int length, isc_buffer_t *target) } static inline isc_result_t -base64_decode_char(base64_decode_ctx_t *ctx, int c) -{ +base64_decode_char(base64_decode_ctx_t *ctx, int c) { const char *s; if (ctx->seen_end) { @@ -121,7 +117,7 @@ base64_decode_char(base64_decode_ctx_t *ctx, int c) } ctx->val[ctx->digits++] = (int)(s - base64); if (ctx->digits == 4) { - int n; + int n; unsigned char buf[3]; if (ctx->val[0] == 64 || ctx->val[1] == 64) { return (ISC_R_BADBASE64); @@ -169,8 +165,7 @@ base64_decode_char(base64_decode_ctx_t *ctx, int c) } static inline isc_result_t -base64_decode_finish(base64_decode_ctx_t *ctx) -{ +base64_decode_finish(base64_decode_ctx_t *ctx) { if (ctx->length > 0) { return (ISC_R_UNEXPECTEDEND); } @@ -181,13 +176,12 @@ base64_decode_finish(base64_decode_ctx_t *ctx) } isc_result_t -isc_base64_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) -{ - unsigned int before, after; +isc_base64_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) { + unsigned int before, after; base64_decode_ctx_t ctx; - isc_textregion_t * tr; - isc_token_t token; - bool eol; + isc_textregion_t *tr; + isc_token_t token; + bool eol; REQUIRE(length >= -2); @@ -224,8 +218,7 @@ isc_base64_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) } isc_result_t -isc_base64_decodestring(const char *cstr, isc_buffer_t *target) -{ +isc_base64_decodestring(const char *cstr, isc_buffer_t *target) { base64_decode_ctx_t ctx; base64_decode_init(&ctx, -1, target); @@ -244,8 +237,7 @@ isc_base64_decodestring(const char *cstr, isc_buffer_t *target) } static isc_result_t -str_totext(const char *source, isc_buffer_t *target) -{ +str_totext(const char *source, isc_buffer_t *target) { unsigned int l; isc_region_t region; @@ -262,8 +254,7 @@ str_totext(const char *source, isc_buffer_t *target) } static isc_result_t -mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) -{ +mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) { isc_region_t tr; isc_buffer_availableregion(target, &tr); diff --git a/lib/isc/buffer.c b/lib/isc/buffer.c index 3b90812364..c2731933ad 100644 --- a/lib/isc/buffer.c +++ b/lib/isc/buffer.c @@ -23,8 +23,7 @@ #include void -isc__buffer_init(isc_buffer_t *b, void *base, unsigned int length) -{ +isc__buffer_init(isc_buffer_t *b, void *base, unsigned int length) { /* * Make 'b' refer to the 'length'-byte region starting at 'base'. * XXXDCL see the comment in buffer.h about base being const. @@ -36,8 +35,7 @@ isc__buffer_init(isc_buffer_t *b, void *base, unsigned int length) } void -isc__buffer_initnull(isc_buffer_t *b) -{ +isc__buffer_initnull(isc_buffer_t *b) { /* * Initialize a new buffer which has no backing store. This can * later be grown as needed and swapped in place. @@ -47,8 +45,7 @@ isc__buffer_initnull(isc_buffer_t *b) } void -isc_buffer_reinit(isc_buffer_t *b, void *base, unsigned int length) -{ +isc_buffer_reinit(isc_buffer_t *b, void *base, unsigned int length) { /* * Re-initialize the buffer enough to reconfigure the base of the * buffer. We will swap in the new buffer, after copying any @@ -71,8 +68,7 @@ isc_buffer_reinit(isc_buffer_t *b, void *base, unsigned int length) } void -isc__buffer_invalidate(isc_buffer_t *b) -{ +isc__buffer_invalidate(isc_buffer_t *b) { /* * Make 'b' an invalid buffer. */ @@ -85,16 +81,14 @@ isc__buffer_invalidate(isc_buffer_t *b) } void -isc_buffer_setautorealloc(isc_buffer_t *b, bool enable) -{ +isc_buffer_setautorealloc(isc_buffer_t *b, bool enable) { REQUIRE(ISC_BUFFER_VALID(b)); REQUIRE(b->mctx != NULL); b->autore = enable; } void -isc__buffer_region(isc_buffer_t *b, isc_region_t *r) -{ +isc__buffer_region(isc_buffer_t *b, isc_region_t *r) { /* * Make 'r' refer to the region of 'b'. */ @@ -106,8 +100,7 @@ isc__buffer_region(isc_buffer_t *b, isc_region_t *r) } void -isc__buffer_usedregion(const isc_buffer_t *b, isc_region_t *r) -{ +isc__buffer_usedregion(const isc_buffer_t *b, isc_region_t *r) { /* * Make 'r' refer to the used region of 'b'. */ @@ -119,8 +112,7 @@ isc__buffer_usedregion(const isc_buffer_t *b, isc_region_t *r) } void -isc__buffer_availableregion(isc_buffer_t *b, isc_region_t *r) -{ +isc__buffer_availableregion(isc_buffer_t *b, isc_region_t *r) { /* * Make 'r' refer to the available region of 'b'. */ @@ -132,8 +124,7 @@ isc__buffer_availableregion(isc_buffer_t *b, isc_region_t *r) } void -isc__buffer_add(isc_buffer_t *b, unsigned int n) -{ +isc__buffer_add(isc_buffer_t *b, unsigned int n) { /* * Increase the 'used' region of 'b' by 'n' bytes. */ @@ -145,8 +136,7 @@ isc__buffer_add(isc_buffer_t *b, unsigned int n) } void -isc__buffer_subtract(isc_buffer_t *b, unsigned int n) -{ +isc__buffer_subtract(isc_buffer_t *b, unsigned int n) { /* * Decrease the 'used' region of 'b' by 'n' bytes. */ @@ -158,8 +148,7 @@ isc__buffer_subtract(isc_buffer_t *b, unsigned int n) } void -isc__buffer_clear(isc_buffer_t *b) -{ +isc__buffer_clear(isc_buffer_t *b) { /* * Make the used region empty. */ @@ -170,8 +159,7 @@ isc__buffer_clear(isc_buffer_t *b) } void -isc__buffer_consumedregion(isc_buffer_t *b, isc_region_t *r) -{ +isc__buffer_consumedregion(isc_buffer_t *b, isc_region_t *r) { /* * Make 'r' refer to the consumed region of 'b'. */ @@ -183,8 +171,7 @@ isc__buffer_consumedregion(isc_buffer_t *b, isc_region_t *r) } void -isc__buffer_remainingregion(isc_buffer_t *b, isc_region_t *r) -{ +isc__buffer_remainingregion(isc_buffer_t *b, isc_region_t *r) { /* * Make 'r' refer to the remaining region of 'b'. */ @@ -196,8 +183,7 @@ isc__buffer_remainingregion(isc_buffer_t *b, isc_region_t *r) } void -isc__buffer_activeregion(isc_buffer_t *b, isc_region_t *r) -{ +isc__buffer_activeregion(isc_buffer_t *b, isc_region_t *r) { /* * Make 'r' refer to the active region of 'b'. */ @@ -209,8 +195,7 @@ isc__buffer_activeregion(isc_buffer_t *b, isc_region_t *r) } void -isc__buffer_setactive(isc_buffer_t *b, unsigned int n) -{ +isc__buffer_setactive(isc_buffer_t *b, unsigned int n) { /* * Sets the end of the active region 'n' bytes after current. */ @@ -222,8 +207,7 @@ isc__buffer_setactive(isc_buffer_t *b, unsigned int n) } void -isc__buffer_first(isc_buffer_t *b) -{ +isc__buffer_first(isc_buffer_t *b) { /* * Make the consumed region empty. */ @@ -234,8 +218,7 @@ isc__buffer_first(isc_buffer_t *b) } void -isc__buffer_forward(isc_buffer_t *b, unsigned int n) -{ +isc__buffer_forward(isc_buffer_t *b, unsigned int n) { /* * Increase the 'consumed' region of 'b' by 'n' bytes. */ @@ -247,8 +230,7 @@ isc__buffer_forward(isc_buffer_t *b, unsigned int n) } void -isc__buffer_back(isc_buffer_t *b, unsigned int n) -{ +isc__buffer_back(isc_buffer_t *b, unsigned int n) { /* * Decrease the 'consumed' region of 'b' by 'n' bytes. */ @@ -260,10 +242,9 @@ isc__buffer_back(isc_buffer_t *b, unsigned int n) } void -isc_buffer_compact(isc_buffer_t *b) -{ +isc_buffer_compact(isc_buffer_t *b) { unsigned int length; - void * src; + void *src; /* * Compact the used region by moving the remaining region so it occurs @@ -289,10 +270,9 @@ isc_buffer_compact(isc_buffer_t *b) } uint8_t -isc_buffer_getuint8(isc_buffer_t *b) -{ +isc_buffer_getuint8(isc_buffer_t *b) { unsigned char *cp; - uint8_t result; + uint8_t result; /* * Read an unsigned 8-bit integer from 'b' and return it. @@ -309,8 +289,7 @@ isc_buffer_getuint8(isc_buffer_t *b) } void -isc__buffer_putuint8(isc_buffer_t *b, uint8_t val) -{ +isc__buffer_putuint8(isc_buffer_t *b, uint8_t val) { isc_result_t result; REQUIRE(ISC_BUFFER_VALID(b)); if (ISC_UNLIKELY(b->autore)) { @@ -323,10 +302,9 @@ isc__buffer_putuint8(isc_buffer_t *b, uint8_t val) } uint16_t -isc_buffer_getuint16(isc_buffer_t *b) -{ +isc_buffer_getuint16(isc_buffer_t *b) { unsigned char *cp; - uint16_t result; + uint16_t result; /* * Read an unsigned 16-bit integer in network byte order from 'b', @@ -345,8 +323,7 @@ isc_buffer_getuint16(isc_buffer_t *b) } void -isc__buffer_putuint16(isc_buffer_t *b, uint16_t val) -{ +isc__buffer_putuint16(isc_buffer_t *b, uint16_t val) { isc_result_t result; REQUIRE(ISC_BUFFER_VALID(b)); if (ISC_UNLIKELY(b->autore)) { @@ -359,8 +336,7 @@ isc__buffer_putuint16(isc_buffer_t *b, uint16_t val) } void -isc__buffer_putuint24(isc_buffer_t *b, uint32_t val) -{ +isc__buffer_putuint24(isc_buffer_t *b, uint32_t val) { isc_result_t result; REQUIRE(ISC_BUFFER_VALID(b)); if (ISC_UNLIKELY(b->autore)) { @@ -373,10 +349,9 @@ isc__buffer_putuint24(isc_buffer_t *b, uint32_t val) } uint32_t -isc_buffer_getuint32(isc_buffer_t *b) -{ +isc_buffer_getuint32(isc_buffer_t *b) { unsigned char *cp; - uint32_t result; + uint32_t result; /* * Read an unsigned 32-bit integer in network byte order from 'b', @@ -397,8 +372,7 @@ isc_buffer_getuint32(isc_buffer_t *b) } void -isc__buffer_putuint32(isc_buffer_t *b, uint32_t val) -{ +isc__buffer_putuint32(isc_buffer_t *b, uint32_t val) { isc_result_t result; REQUIRE(ISC_BUFFER_VALID(b)); if (ISC_UNLIKELY(b->autore)) { @@ -411,10 +385,9 @@ isc__buffer_putuint32(isc_buffer_t *b, uint32_t val) } uint64_t -isc_buffer_getuint48(isc_buffer_t *b) -{ +isc_buffer_getuint48(isc_buffer_t *b) { unsigned char *cp; - uint64_t result; + uint64_t result; /* * Read an unsigned 48-bit integer in network byte order from 'b', @@ -437,11 +410,10 @@ isc_buffer_getuint48(isc_buffer_t *b) } void -isc__buffer_putuint48(isc_buffer_t *b, uint64_t val) -{ +isc__buffer_putuint48(isc_buffer_t *b, uint64_t val) { isc_result_t result; - uint16_t valhi; - uint32_t vallo; + uint16_t valhi; + uint32_t vallo; REQUIRE(ISC_BUFFER_VALID(b)); if (ISC_UNLIKELY(b->autore)) { @@ -458,8 +430,7 @@ isc__buffer_putuint48(isc_buffer_t *b, uint64_t val) void isc__buffer_putmem(isc_buffer_t *b, const unsigned char *base, - unsigned int length) -{ + unsigned int length) { isc_result_t result; REQUIRE(ISC_BUFFER_VALID(b)); if (ISC_UNLIKELY(b->autore)) { @@ -472,11 +443,10 @@ isc__buffer_putmem(isc_buffer_t *b, const unsigned char *base, } void -isc__buffer_putstr(isc_buffer_t *b, const char *source) -{ - unsigned int l; +isc__buffer_putstr(isc_buffer_t *b, const char *source) { + unsigned int l; unsigned char *cp; - isc_result_t result; + isc_result_t result; REQUIRE(ISC_BUFFER_VALID(b)); REQUIRE(source != NULL); @@ -497,12 +467,11 @@ isc__buffer_putstr(isc_buffer_t *b, const char *source) } void -isc_buffer_putdecint(isc_buffer_t *b, int64_t v) -{ - unsigned int l = 0; +isc_buffer_putdecint(isc_buffer_t *b, int64_t v) { + unsigned int l = 0; unsigned char *cp; - char buf[21]; - isc_result_t result; + char buf[21]; + isc_result_t result; REQUIRE(ISC_BUFFER_VALID(b)); @@ -521,11 +490,10 @@ isc_buffer_putdecint(isc_buffer_t *b, int64_t v) } isc_result_t -isc_buffer_dup(isc_mem_t *mctx, isc_buffer_t **dstp, const isc_buffer_t *src) -{ +isc_buffer_dup(isc_mem_t *mctx, isc_buffer_t **dstp, const isc_buffer_t *src) { isc_buffer_t *dst = NULL; - isc_region_t region; - isc_result_t result; + isc_region_t region; + isc_result_t result; REQUIRE(dstp != NULL && *dstp == NULL); REQUIRE(ISC_BUFFER_VALID(src)); @@ -541,8 +509,7 @@ isc_buffer_dup(isc_mem_t *mctx, isc_buffer_t **dstp, const isc_buffer_t *src) } isc_result_t -isc_buffer_copyregion(isc_buffer_t *b, const isc_region_t *r) -{ +isc_buffer_copyregion(isc_buffer_t *b, const isc_region_t *r) { isc_result_t result; REQUIRE(ISC_BUFFER_VALID(b)); @@ -569,11 +536,10 @@ isc_buffer_copyregion(isc_buffer_t *b, const isc_region_t *r) void isc_buffer_allocate(isc_mem_t *mctx, isc_buffer_t **dynbuffer, - unsigned int length) -{ + unsigned int length) { REQUIRE(dynbuffer != NULL && *dynbuffer == NULL); - isc_buffer_t * dbuf = isc_mem_get(mctx, sizeof(isc_buffer_t)); + isc_buffer_t *dbuf = isc_mem_get(mctx, sizeof(isc_buffer_t)); unsigned char *bdata = isc_mem_get(mctx, length); isc_buffer_init(dbuf, bdata, length); @@ -586,10 +552,9 @@ isc_buffer_allocate(isc_mem_t *mctx, isc_buffer_t **dynbuffer, } isc_result_t -isc_buffer_reserve(isc_buffer_t **dynbuffer, unsigned int size) -{ +isc_buffer_reserve(isc_buffer_t **dynbuffer, unsigned int size) { unsigned char *bdata; - uint64_t len; + uint64_t len; REQUIRE(dynbuffer != NULL); REQUIRE(ISC_BUFFER_VALID(*dynbuffer)); @@ -634,10 +599,9 @@ isc_buffer_reserve(isc_buffer_t **dynbuffer, unsigned int size) } void -isc_buffer_free(isc_buffer_t **dynbuffer) -{ +isc_buffer_free(isc_buffer_t **dynbuffer) { isc_buffer_t *dbuf; - isc_mem_t * mctx; + isc_mem_t *mctx; REQUIRE(dynbuffer != NULL); REQUIRE(ISC_BUFFER_VALID(*dynbuffer)); @@ -654,10 +618,9 @@ isc_buffer_free(isc_buffer_t **dynbuffer) } isc_result_t -isc_buffer_printf(isc_buffer_t *b, const char *format, ...) -{ - va_list ap; - int n; +isc_buffer_printf(isc_buffer_t *b, const char *format, ...) { + va_list ap; + int n; isc_result_t result; REQUIRE(ISC_BUFFER_VALID(b)); diff --git a/lib/isc/bufferlist.c b/lib/isc/bufferlist.c index 22fb4b25be..c5b02fe1b9 100644 --- a/lib/isc/bufferlist.c +++ b/lib/isc/bufferlist.c @@ -18,10 +18,9 @@ #include unsigned int -isc_bufferlist_usedcount(isc_bufferlist_t *bl) -{ +isc_bufferlist_usedcount(isc_bufferlist_t *bl) { isc_buffer_t *buffer; - unsigned int length; + unsigned int length; REQUIRE(bl != NULL); @@ -37,10 +36,9 @@ isc_bufferlist_usedcount(isc_bufferlist_t *bl) } unsigned int -isc_bufferlist_availablecount(isc_bufferlist_t *bl) -{ +isc_bufferlist_availablecount(isc_bufferlist_t *bl) { isc_buffer_t *buffer; - unsigned int length; + unsigned int length; REQUIRE(bl != NULL); diff --git a/lib/isc/commandline.c b/lib/isc/commandline.c index 6db7c5163f..55ae916b4a 100644 --- a/lib/isc/commandline.c +++ b/lib/isc/commandline.c @@ -79,10 +79,9 @@ static char endopt = '\0'; * Parse argc/argv argument vector. */ int -isc_commandline_parse(int argc, char *const *argv, const char *options) -{ +isc_commandline_parse(int argc, char *const *argv, const char *options) { static char *place = ENDOPT; - const char * option; /* Index into *options of option. */ + const char *option; /* Index into *options of option. */ REQUIRE(argc >= 0 && argv != NULL && options != NULL); @@ -101,7 +100,8 @@ isc_commandline_parse(int argc, char *const *argv, const char *options) } if (isc_commandline_index >= argc || - *(place = argv[isc_commandline_index]) != '-') { + *(place = argv[isc_commandline_index]) != '-') + { /* * Index out of range or points to non-option. */ @@ -206,8 +206,7 @@ isc_commandline_parse(int argc, char *const *argv, const char *options) isc_result_t isc_commandline_strtoargv(isc_mem_t *mctx, char *s, unsigned int *argcp, - char ***argvp, unsigned int n) -{ + char ***argvp, unsigned int n) { isc_result_t result; restart: @@ -253,8 +252,8 @@ restart: *p++ = '\0'; } - result = - isc_commandline_strtoargv(mctx, p, argcp, argvp, n + 1); + result = isc_commandline_strtoargv(mctx, p, argcp, argvp, + n + 1); if (result != ISC_R_SUCCESS) { return (result); } diff --git a/lib/isc/counter.c b/lib/isc/counter.c index 510c94268c..ceccee37cc 100644 --- a/lib/isc/counter.c +++ b/lib/isc/counter.c @@ -21,20 +21,19 @@ #include #include -#define COUNTER_MAGIC ISC_MAGIC('C', 'n', 't', 'r') +#define COUNTER_MAGIC ISC_MAGIC('C', 'n', 't', 'r') #define VALID_COUNTER(r) ISC_MAGIC_VALID(r, COUNTER_MAGIC) struct isc_counter { - unsigned int magic; - isc_mem_t * mctx; - isc_refcount_t references; + unsigned int magic; + isc_mem_t *mctx; + isc_refcount_t references; atomic_uint_fast32_t limit; atomic_uint_fast32_t used; }; isc_result_t -isc_counter_create(isc_mem_t *mctx, int limit, isc_counter_t **counterp) -{ +isc_counter_create(isc_mem_t *mctx, int limit, isc_counter_t **counterp) { isc_counter_t *counter; REQUIRE(counterp != NULL && *counterp == NULL); @@ -54,8 +53,7 @@ isc_counter_create(isc_mem_t *mctx, int limit, isc_counter_t **counterp) } isc_result_t -isc_counter_increment(isc_counter_t *counter) -{ +isc_counter_increment(isc_counter_t *counter) { uint32_t used = atomic_fetch_add_relaxed(&counter->used, 1) + 1; uint32_t limit = atomic_load_acquire(&counter->limit); @@ -67,24 +65,21 @@ isc_counter_increment(isc_counter_t *counter) } unsigned int -isc_counter_used(isc_counter_t *counter) -{ +isc_counter_used(isc_counter_t *counter) { REQUIRE(VALID_COUNTER(counter)); return (atomic_load_acquire(&counter->used)); } void -isc_counter_setlimit(isc_counter_t *counter, int limit) -{ +isc_counter_setlimit(isc_counter_t *counter, int limit) { REQUIRE(VALID_COUNTER(counter)); atomic_store(&counter->limit, limit); } void -isc_counter_attach(isc_counter_t *source, isc_counter_t **targetp) -{ +isc_counter_attach(isc_counter_t *source, isc_counter_t **targetp) { REQUIRE(VALID_COUNTER(source)); REQUIRE(targetp != NULL && *targetp == NULL); @@ -94,16 +89,14 @@ isc_counter_attach(isc_counter_t *source, isc_counter_t **targetp) } static void -destroy(isc_counter_t *counter) -{ +destroy(isc_counter_t *counter) { isc_refcount_destroy(&counter->references); counter->magic = 0; isc_mem_putanddetach(&counter->mctx, counter, sizeof(*counter)); } void -isc_counter_detach(isc_counter_t **counterp) -{ +isc_counter_detach(isc_counter_t **counterp) { isc_counter_t *counter; REQUIRE(counterp != NULL && *counterp != NULL); diff --git a/lib/isc/crc64.c b/lib/isc/crc64.c index c4930902c4..2338dff48f 100644 --- a/lib/isc/crc64.c +++ b/lib/isc/crc64.c @@ -110,18 +110,16 @@ static const uint64_t crc64_table[256] = { }; void -isc_crc64_init(uint64_t *crc) -{ +isc_crc64_init(uint64_t *crc) { REQUIRE(crc != NULL); *crc = 0xffffffffffffffffULL; } void -isc_crc64_update(uint64_t *crc, const void *data, size_t len) -{ +isc_crc64_update(uint64_t *crc, const void *data, size_t len) { const unsigned char *p = data; - int i; + int i; REQUIRE(crc != NULL); REQUIRE(data != NULL); @@ -133,8 +131,7 @@ isc_crc64_update(uint64_t *crc, const void *data, size_t len) } void -isc_crc64_final(uint64_t *crc) -{ +isc_crc64_final(uint64_t *crc) { REQUIRE(crc != NULL); *crc ^= 0xffffffffffffffffULL; diff --git a/lib/isc/entropy.c b/lib/isc/entropy.c index 5ddfe05913..9e0ba1da4f 100644 --- a/lib/isc/entropy.c +++ b/lib/isc/entropy.c @@ -18,8 +18,7 @@ #include void -isc_entropy_get(void *buf, size_t buflen) -{ +isc_entropy_get(void *buf, size_t buflen) { if (RAND_bytes(buf, buflen) < 1) { FATAL_ERROR(__FILE__, __LINE__, "RAND_bytes(): %s", ERR_error_string(ERR_get_error(), NULL)); diff --git a/lib/isc/error.c b/lib/isc/error.c index 887c49c259..17675569d2 100644 --- a/lib/isc/error.c +++ b/lib/isc/error.c @@ -18,13 +18,11 @@ #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 */ @@ -32,8 +30,7 @@ static isc_errorcallback_t unexpected_callback = default_unexpected_callback; static isc_errorcallback_t fatal_callback = default_fatal_callback; void -isc_error_setunexpected(isc_errorcallback_t cb) -{ +isc_error_setunexpected(isc_errorcallback_t cb) { if (cb == NULL) { unexpected_callback = default_unexpected_callback; } else { @@ -42,8 +39,7 @@ isc_error_setunexpected(isc_errorcallback_t cb) } void -isc_error_setfatal(isc_errorcallback_t cb) -{ +isc_error_setfatal(isc_errorcallback_t cb) { if (cb == NULL) { fatal_callback = default_fatal_callback; } else { @@ -52,8 +48,7 @@ isc_error_setfatal(isc_errorcallback_t cb) } void -isc_error_unexpected(const char *file, int line, const char *format, ...) -{ +isc_error_unexpected(const char *file, int line, const char *format, ...) { va_list args; va_start(args, format); @@ -62,8 +57,7 @@ isc_error_unexpected(const char *file, int line, const char *format, ...) } void -isc_error_fatal(const char *file, int line, const char *format, ...) -{ +isc_error_fatal(const char *file, int line, const char *format, ...) { va_list args; va_start(args, format); @@ -73,15 +67,13 @@ isc_error_fatal(const char *file, int line, const char *format, ...) } void -isc_error_runtimecheck(const char *file, int line, const char *expression) -{ +isc_error_runtimecheck(const char *file, int line, const char *expression) { isc_error_fatal(file, line, "RUNTIME_CHECK(%s) failed", expression); } static void default_unexpected_callback(const char *file, int line, const char *format, - va_list args) -{ + va_list args) { fprintf(stderr, "%s:%d: ", file, line); vfprintf(stderr, format, args); fprintf(stderr, "\n"); @@ -90,8 +82,7 @@ default_unexpected_callback(const char *file, int line, const char *format, static void default_fatal_callback(const char *file, int line, const char *format, - va_list args) -{ + va_list args) { fprintf(stderr, "%s:%d: fatal error: ", file, line); vfprintf(stderr, format, args); fprintf(stderr, "\n"); diff --git a/lib/isc/event.c b/lib/isc/event.c index 97bcb0e756..939ceb11ab 100644 --- a/lib/isc/event.c +++ b/lib/isc/event.c @@ -22,8 +22,7 @@ ***/ static void -destroy(isc_event_t *event) -{ +destroy(isc_event_t *event) { isc_mem_t *mctx = event->ev_destroy_arg; isc_mem_put(mctx, event, event->ev_size); @@ -31,8 +30,7 @@ destroy(isc_event_t *event) isc_event_t * isc_event_allocate(isc_mem_t *mctx, void *sender, isc_eventtype_t type, - isc_taskaction_t action, void *arg, size_t size) -{ + isc_taskaction_t action, void *arg, size_t size) { isc_event_t *event; REQUIRE(size >= sizeof(struct isc_event)); @@ -48,10 +46,9 @@ isc_event_allocate(isc_mem_t *mctx, void *sender, isc_eventtype_t type, isc_event_t * isc_event_constallocate(isc_mem_t *mctx, void *sender, isc_eventtype_t type, - isc_taskaction_t action, const void *arg, size_t size) -{ + isc_taskaction_t action, const void *arg, size_t size) { isc_event_t *event; - void * deconst_arg; + void *deconst_arg; REQUIRE(size >= sizeof(struct isc_event)); REQUIRE(action != NULL); @@ -79,8 +76,7 @@ isc_event_constallocate(isc_mem_t *mctx, void *sender, isc_eventtype_t type, } void -isc_event_free(isc_event_t **eventp) -{ +isc_event_free(isc_event_t **eventp) { isc_event_t *event; REQUIRE(eventp != NULL); diff --git a/lib/isc/fsaccess.c b/lib/isc/fsaccess.c index f90d5fedde..025d4788d7 100644 --- a/lib/isc/fsaccess.c +++ b/lib/isc/fsaccess.c @@ -25,13 +25,12 @@ * . Could check consistency with sizeof(isc_fsaccess_t) * and the number of bits in each function. */ -#define STEP (ISC__FSACCESS_PERMISSIONBITS) +#define STEP (ISC__FSACCESS_PERMISSIONBITS) #define GROUP (STEP) #define OTHER (STEP * 2) void -isc_fsaccess_add(int trustee, int permission, isc_fsaccess_t *access) -{ +isc_fsaccess_add(int trustee, int permission, isc_fsaccess_t *access) { REQUIRE(trustee <= 0x7); REQUIRE(permission <= 0xFF); @@ -49,8 +48,7 @@ isc_fsaccess_add(int trustee, int permission, isc_fsaccess_t *access) } void -isc_fsaccess_remove(int trustee, int permission, isc_fsaccess_t *access) -{ +isc_fsaccess_remove(int trustee, int permission, isc_fsaccess_t *access) { REQUIRE(trustee <= 0x7); REQUIRE(permission <= 0xFF); @@ -68,8 +66,7 @@ isc_fsaccess_remove(int trustee, int permission, isc_fsaccess_t *access) } static isc_result_t -check_bad_bits(isc_fsaccess_t access, bool is_dir) -{ +check_bad_bits(isc_fsaccess_t access, bool is_dir) { isc_fsaccess_t bits; /* diff --git a/lib/isc/hash.c b/lib/isc/hash.c index aaceef5444..b00cd148cf 100644 --- a/lib/isc/hash.c +++ b/lib/isc/hash.c @@ -31,13 +31,12 @@ #include "isc/types.h" #include "isc/util.h" -static uint8_t isc_hash_key[16]; -static bool hash_initialized = false; +static uint8_t isc_hash_key[16]; +static bool hash_initialized = false; static isc_once_t isc_hash_once = ISC_ONCE_INIT; static void -isc_hash_initialize(void) -{ +isc_hash_initialize(void) { uint64_t key[2] = { 0, 1 }; #if FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION /* @@ -77,8 +76,7 @@ static uint8_t maptolower[] = { }; const void * -isc_hash_get_initializer(void) -{ +isc_hash_get_initializer(void) { if (ISC_UNLIKELY(!hash_initialized)) { RUNTIME_CHECK( isc_once_do(&isc_hash_once, isc_hash_initialize) == @@ -89,8 +87,7 @@ isc_hash_get_initializer(void) } void -isc_hash_set_initializer(const void *initializer) -{ +isc_hash_set_initializer(const void *initializer) { REQUIRE(initializer != NULL); /* @@ -108,8 +105,7 @@ isc_hash_set_initializer(const void *initializer) uint64_t isc_hash_function(const void *data, const size_t length, - const bool case_sensitive) -{ + const bool case_sensitive) { uint64_t hval; REQUIRE(length == 0 || data != NULL); diff --git a/lib/isc/heap.c b/lib/isc/heap.c index d2e5e4c486..491889f67d 100644 --- a/lib/isc/heap.c +++ b/lib/isc/heap.c @@ -35,12 +35,12 @@ * The right child is index*2+1. */ #define heap_parent(i) ((i) >> 1) -#define heap_left(i) ((i) << 1) +#define heap_left(i) ((i) << 1) /*@}*/ #define SIZE_INCREMENT 1024 -#define HEAP_MAGIC ISC_MAGIC('H', 'E', 'A', 'P') +#define HEAP_MAGIC ISC_MAGIC('H', 'E', 'A', 'P') #define VALID_HEAP(h) ISC_MAGIC_VALID(h, HEAP_MAGIC) /*% @@ -54,20 +54,19 @@ /*% ISC heap structure. */ struct isc_heap { - unsigned int magic; - isc_mem_t * mctx; - unsigned int size; - unsigned int size_increment; - unsigned int last; - void ** array; + unsigned int magic; + isc_mem_t *mctx; + unsigned int size; + unsigned int size_increment; + unsigned int last; + void **array; isc_heapcompare_t compare; - isc_heapindex_t index; + isc_heapindex_t index; }; #ifdef ISC_HEAP_CHECK static void -heap_check(isc_heap_t *heap) -{ +heap_check(isc_heap_t *heap) { unsigned int i; for (i = 1; i <= heap->last; i++) { INSIST(HEAPCONDITION(i)); @@ -79,8 +78,7 @@ heap_check(isc_heap_t *heap) isc_result_t isc_heap_create(isc_mem_t *mctx, isc_heapcompare_t compare, isc_heapindex_t idx, - unsigned int size_increment, isc_heap_t **heapp) -{ + unsigned int size_increment, isc_heap_t **heapp) { isc_heap_t *heap; REQUIRE(heapp != NULL && *heapp == NULL); @@ -107,8 +105,7 @@ isc_heap_create(isc_mem_t *mctx, isc_heapcompare_t compare, isc_heapindex_t idx, } void -isc_heap_destroy(isc_heap_t **heapp) -{ +isc_heap_destroy(isc_heap_t **heapp) { isc_heap_t *heap; REQUIRE(heapp != NULL); @@ -125,9 +122,8 @@ isc_heap_destroy(isc_heap_t **heapp) } static bool -resize(isc_heap_t *heap) -{ - void ** new_array; +resize(isc_heap_t *heap) { + void **new_array; unsigned int new_size; REQUIRE(VALID_HEAP(heap)); @@ -146,12 +142,12 @@ resize(isc_heap_t *heap) } static void -float_up(isc_heap_t *heap, unsigned int i, void *elt) -{ +float_up(isc_heap_t *heap, unsigned int i, void *elt) { unsigned int p; for (p = heap_parent(i); i > 1 && heap->compare(elt, heap->array[p]); - i = p, p = heap_parent(i)) { + i = p, p = heap_parent(i)) + { heap->array[i] = heap->array[p]; if (heap->index != NULL) { (heap->index)(heap->array[i], i); @@ -167,8 +163,7 @@ float_up(isc_heap_t *heap, unsigned int i, void *elt) } static void -sink_down(isc_heap_t *heap, unsigned int i, void *elt) -{ +sink_down(isc_heap_t *heap, unsigned int i, void *elt) { unsigned int j, size, half_size; size = heap->last; half_size = size / 2; @@ -198,8 +193,7 @@ sink_down(isc_heap_t *heap, unsigned int i, void *elt) } isc_result_t -isc_heap_insert(isc_heap_t *heap, void *elt) -{ +isc_heap_insert(isc_heap_t *heap, void *elt) { unsigned int new_last; REQUIRE(VALID_HEAP(heap)); @@ -218,10 +212,9 @@ isc_heap_insert(isc_heap_t *heap, void *elt) } void -isc_heap_delete(isc_heap_t *heap, unsigned int idx) -{ +isc_heap_delete(isc_heap_t *heap, unsigned int idx) { void *elt; - bool less; + bool less; REQUIRE(VALID_HEAP(heap)); REQUIRE(idx >= 1 && idx <= heap->last); @@ -250,8 +243,7 @@ isc_heap_delete(isc_heap_t *heap, unsigned int idx) } void -isc_heap_increased(isc_heap_t *heap, unsigned int idx) -{ +isc_heap_increased(isc_heap_t *heap, unsigned int idx) { REQUIRE(VALID_HEAP(heap)); REQUIRE(idx >= 1 && idx <= heap->last); @@ -259,8 +251,7 @@ isc_heap_increased(isc_heap_t *heap, unsigned int idx) } void -isc_heap_decreased(isc_heap_t *heap, unsigned int idx) -{ +isc_heap_decreased(isc_heap_t *heap, unsigned int idx) { REQUIRE(VALID_HEAP(heap)); REQUIRE(idx >= 1 && idx <= heap->last); @@ -268,8 +259,7 @@ isc_heap_decreased(isc_heap_t *heap, unsigned int idx) } void * -isc_heap_element(isc_heap_t *heap, unsigned int idx) -{ +isc_heap_element(isc_heap_t *heap, unsigned int idx) { REQUIRE(VALID_HEAP(heap)); REQUIRE(idx >= 1); @@ -281,8 +271,7 @@ isc_heap_element(isc_heap_t *heap, unsigned int idx) } void -isc_heap_foreach(isc_heap_t *heap, isc_heapaction_t action, void *uap) -{ +isc_heap_foreach(isc_heap_t *heap, isc_heapaction_t action, void *uap) { unsigned int i; REQUIRE(VALID_HEAP(heap)); diff --git a/lib/isc/hex.c b/lib/isc/hex.c index b9a49cbff5..95a2d1d957 100644 --- a/lib/isc/hex.c +++ b/lib/isc/hex.c @@ -30,19 +30,17 @@ /* * 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"; isc_result_t isc_hex_totext(isc_region_t *source, int wordlength, const char *wordbreak, - isc_buffer_t *target) -{ - char buf[3]; + isc_buffer_t *target) { + char buf[3]; unsigned int loops = 0; if (wordlength < 2) { @@ -57,8 +55,8 @@ isc_hex_totext(isc_region_t *source, int wordlength, const char *wordbreak, isc_region_consume(source, 1); loops++; - if (source->length != 0 && - (int)((loops + 1) * 2) >= wordlength) { + if (source->length != 0 && (int)((loops + 1) * 2) >= wordlength) + { loops = 0; RETERR(str_totext(wordbreak, target)); } @@ -70,23 +68,21 @@ isc_hex_totext(isc_region_t *source, int wordlength, const char *wordbreak, * State of a hex decoding process in progress. */ typedef struct { - int length; /*%< Desired length of binary data or -1 */ + int length; /*%< Desired length of binary data or -1 */ isc_buffer_t *target; /*%< Buffer for resulting binary data */ - int digits; /*%< Number of buffered hex digits */ - int val[2]; + int digits; /*%< Number of buffered hex digits */ + int val[2]; } hex_decode_ctx_t; static inline void -hex_decode_init(hex_decode_ctx_t *ctx, int length, isc_buffer_t *target) -{ +hex_decode_init(hex_decode_ctx_t *ctx, int length, isc_buffer_t *target) { ctx->digits = 0; ctx->length = length; ctx->target = target; } static inline isc_result_t -hex_decode_char(hex_decode_ctx_t *ctx, int c) -{ +hex_decode_char(hex_decode_ctx_t *ctx, int c) { const char *s; if ((s = strchr(hex, toupper(c))) == NULL) { @@ -111,8 +107,7 @@ hex_decode_char(hex_decode_ctx_t *ctx, int c) } static inline isc_result_t -hex_decode_finish(hex_decode_ctx_t *ctx) -{ +hex_decode_finish(hex_decode_ctx_t *ctx) { if (ctx->length > 0) { return (ISC_R_UNEXPECTEDEND); } @@ -123,13 +118,12 @@ hex_decode_finish(hex_decode_ctx_t *ctx) } isc_result_t -isc_hex_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) -{ - unsigned int before, after; - hex_decode_ctx_t ctx; +isc_hex_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) { + unsigned int before, after; + hex_decode_ctx_t ctx; isc_textregion_t *tr; - isc_token_t token; - bool eol; + isc_token_t token; + bool eol; REQUIRE(length >= -2); @@ -166,8 +160,7 @@ isc_hex_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) } isc_result_t -isc_hex_decodestring(const char *cstr, isc_buffer_t *target) -{ +isc_hex_decodestring(const char *cstr, isc_buffer_t *target) { hex_decode_ctx_t ctx; hex_decode_init(&ctx, -1, target); @@ -186,8 +179,7 @@ isc_hex_decodestring(const char *cstr, isc_buffer_t *target) } static isc_result_t -str_totext(const char *source, isc_buffer_t *target) -{ +str_totext(const char *source, isc_buffer_t *target) { unsigned int l; isc_region_t region; @@ -204,8 +196,7 @@ str_totext(const char *source, isc_buffer_t *target) } static isc_result_t -mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) -{ +mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) { isc_region_t tr; isc_buffer_availableregion(target, &tr); diff --git a/lib/isc/hmac.c b/lib/isc/hmac.c index 0423fabe5e..b5b3f1f412 100644 --- a/lib/isc/hmac.c +++ b/lib/isc/hmac.c @@ -24,16 +24,14 @@ #include isc_hmac_t * -isc_hmac_new(void) -{ +isc_hmac_new(void) { isc_hmac_t *hmac = HMAC_CTX_new(); RUNTIME_CHECK(hmac != NULL); return (hmac); } void -isc_hmac_free(isc_hmac_t *hmac) -{ +isc_hmac_free(isc_hmac_t *hmac) { if (ISC_UNLIKELY(hmac == NULL)) { return; } @@ -43,8 +41,7 @@ isc_hmac_free(isc_hmac_t *hmac) isc_result_t isc_hmac_init(isc_hmac_t *hmac, const void *key, size_t keylen, - isc_md_type_t md_type) -{ + isc_md_type_t md_type) { REQUIRE(hmac != NULL); REQUIRE(key != NULL); @@ -60,8 +57,7 @@ isc_hmac_init(isc_hmac_t *hmac, const void *key, size_t keylen, } isc_result_t -isc_hmac_reset(isc_hmac_t *hmac) -{ +isc_hmac_reset(isc_hmac_t *hmac) { REQUIRE(hmac != NULL); if (HMAC_CTX_reset(hmac) != 1) { @@ -72,8 +68,7 @@ isc_hmac_reset(isc_hmac_t *hmac) } isc_result_t -isc_hmac_update(isc_hmac_t *hmac, const unsigned char *buf, const size_t len) -{ +isc_hmac_update(isc_hmac_t *hmac, const unsigned char *buf, const size_t len) { REQUIRE(hmac != NULL); if (ISC_UNLIKELY(buf == NULL || len == 0)) { @@ -88,8 +83,8 @@ isc_hmac_update(isc_hmac_t *hmac, const unsigned char *buf, const size_t len) } isc_result_t -isc_hmac_final(isc_hmac_t *hmac, unsigned char *digest, unsigned int *digestlen) -{ +isc_hmac_final(isc_hmac_t *hmac, unsigned char *digest, + unsigned int *digestlen) { REQUIRE(hmac != NULL); REQUIRE(digest != NULL); @@ -101,24 +96,21 @@ isc_hmac_final(isc_hmac_t *hmac, unsigned char *digest, unsigned int *digestlen) } isc_md_type_t -isc_hmac_get_md_type(isc_hmac_t *hmac) -{ +isc_hmac_get_md_type(isc_hmac_t *hmac) { REQUIRE(hmac != NULL); return (HMAC_CTX_get_md(hmac)); } size_t -isc_hmac_get_size(isc_hmac_t *hmac) -{ +isc_hmac_get_size(isc_hmac_t *hmac) { REQUIRE(hmac != NULL); return ((size_t)EVP_MD_size(HMAC_CTX_get_md(hmac))); } int -isc_hmac_get_block_size(isc_hmac_t *hmac) -{ +isc_hmac_get_block_size(isc_hmac_t *hmac) { REQUIRE(hmac != NULL); return (EVP_MD_block_size(HMAC_CTX_get_md(hmac))); @@ -127,9 +119,8 @@ isc_hmac_get_block_size(isc_hmac_t *hmac) isc_result_t isc_hmac(isc_md_type_t type, const void *key, const int keylen, const unsigned char *buf, const size_t len, unsigned char *digest, - unsigned int *digestlen) -{ - isc_hmac_t * hmac = NULL; + unsigned int *digestlen) { + isc_hmac_t *hmac = NULL; isc_result_t res; hmac = isc_hmac_new(); diff --git a/lib/isc/hp.c b/lib/isc/hp.c index 824be6b4d6..2eb7827d59 100644 --- a/lib/isc/hp.c +++ b/lib/isc/hp.c @@ -55,8 +55,8 @@ #define HP_MAX_THREADS 128 static int isc__hp_max_threads = HP_MAX_THREADS; -#define HP_MAX_HPS 4 /* This is named 'K' in the HP paper */ -#define CLPAD (128 / sizeof(uintptr_t)) +#define HP_MAX_HPS 4 /* This is named 'K' in the HP paper */ +#define CLPAD (128 / sizeof(uintptr_t)) #define HP_THRESHOLD_R 0 /* This is named 'R' in the HP paper */ /* Maximum number of retired objects per thread */ @@ -69,21 +69,20 @@ static atomic_int_fast32_t tid_v_base = ATOMIC_VAR_INIT(0); ISC_THREAD_LOCAL int tid_v = TID_UNKNOWN; typedef struct retirelist { - int size; + int size; uintptr_t *list; } retirelist_t; struct isc_hp { - int max_hps; - isc_mem_t * mctx; - atomic_uintptr_t ** hp; - retirelist_t ** rl; + int max_hps; + isc_mem_t *mctx; + atomic_uintptr_t **hp; + retirelist_t **rl; isc_hp_deletefunc_t *deletefunc; }; static inline int -tid() -{ +tid() { if (tid_v == TID_UNKNOWN) { tid_v = atomic_fetch_add(&tid_v_base, 1); REQUIRE(tid_v < isc__hp_max_threads); @@ -93,15 +92,13 @@ tid() } void -isc_hp_init(int max_threads) -{ +isc_hp_init(int max_threads) { isc__hp_max_threads = max_threads; isc__hp_max_retired = max_threads * HP_MAX_HPS; } isc_hp_t * -isc_hp_new(isc_mem_t *mctx, size_t max_hps, isc_hp_deletefunc_t *deletefunc) -{ +isc_hp_new(isc_mem_t *mctx, size_t max_hps, isc_hp_deletefunc_t *deletefunc) { isc_hp_t *hp = isc_mem_get(mctx, sizeof(*hp)); if (max_hps == 0) { @@ -131,8 +128,7 @@ isc_hp_new(isc_mem_t *mctx, size_t max_hps, isc_hp_deletefunc_t *deletefunc) } void -isc_hp_destroy(isc_hp_t *hp) -{ +isc_hp_destroy(isc_hp_t *hp) { for (int i = 0; i < isc__hp_max_threads; i++) { isc_mem_put(hp->mctx, hp->hp[i], CLPAD * 2 * sizeof(hp->hp[i][0])); @@ -152,22 +148,19 @@ isc_hp_destroy(isc_hp_t *hp) } void -isc_hp_clear(isc_hp_t *hp) -{ +isc_hp_clear(isc_hp_t *hp) { for (int i = 0; i < hp->max_hps; i++) { atomic_store_release(&hp->hp[tid()][i], 0); } } void -isc_hp_clear_one(isc_hp_t *hp, int ihp) -{ +isc_hp_clear_one(isc_hp_t *hp, int ihp) { atomic_store_release(&hp->hp[tid()][ihp], 0); } uintptr_t -isc_hp_protect(isc_hp_t *hp, int ihp, atomic_uintptr_t *atom) -{ +isc_hp_protect(isc_hp_t *hp, int ihp, atomic_uintptr_t *atom) { uintptr_t n = 0; uintptr_t ret; while ((ret = atomic_load(atom)) != n) { @@ -178,22 +171,19 @@ isc_hp_protect(isc_hp_t *hp, int ihp, atomic_uintptr_t *atom) } uintptr_t -isc_hp_protect_ptr(isc_hp_t *hp, int ihp, atomic_uintptr_t ptr) -{ +isc_hp_protect_ptr(isc_hp_t *hp, int ihp, atomic_uintptr_t ptr) { atomic_store(&hp->hp[tid()][ihp], atomic_load(&ptr)); return (atomic_load(&ptr)); } uintptr_t -isc_hp_protect_release(isc_hp_t *hp, int ihp, atomic_uintptr_t ptr) -{ +isc_hp_protect_release(isc_hp_t *hp, int ihp, atomic_uintptr_t ptr) { atomic_store_release(&hp->hp[tid()][ihp], atomic_load(&ptr)); return (atomic_load(&ptr)); } void -isc_hp_retire(isc_hp_t *hp, uintptr_t ptr) -{ +isc_hp_retire(isc_hp_t *hp, uintptr_t ptr) { hp->rl[tid()]->list[hp->rl[tid()]->size++] = ptr; INSIST(hp->rl[tid()]->size < isc__hp_max_retired); @@ -203,7 +193,7 @@ isc_hp_retire(isc_hp_t *hp, uintptr_t ptr) for (int iret = 0; iret < hp->rl[tid()]->size; iret++) { uintptr_t obj = hp->rl[tid()]->list[iret]; - bool can_delete = true; + bool can_delete = true; for (int itid = 0; itid < isc__hp_max_threads && can_delete; itid++) { for (int ihp = hp->max_hps - 1; ihp >= 0; ihp--) { diff --git a/lib/isc/ht.c b/lib/isc/ht.c index 6ffa8a0625..b3c9e5100d 100644 --- a/lib/isc/ht.c +++ b/lib/isc/ht.c @@ -22,36 +22,35 @@ typedef struct isc_ht_node isc_ht_node_t; -#define ISC_HT_MAGIC ISC_MAGIC('H', 'T', 'a', 'b') +#define ISC_HT_MAGIC ISC_MAGIC('H', 'T', 'a', 'b') #define ISC_HT_VALID(ht) ISC_MAGIC_VALID(ht, ISC_HT_MAGIC) struct isc_ht_node { - void * value; + void *value; isc_ht_node_t *next; - size_t keysize; - unsigned char key[FLEXIBLE_ARRAY_MEMBER]; + size_t keysize; + unsigned char key[FLEXIBLE_ARRAY_MEMBER]; }; struct isc_ht { - unsigned int magic; - isc_mem_t * mctx; - size_t size; - size_t mask; - unsigned int count; + unsigned int magic; + isc_mem_t *mctx; + size_t size; + size_t mask; + unsigned int count; isc_ht_node_t **table; }; struct isc_ht_iter { - isc_ht_t * ht; - size_t i; + isc_ht_t *ht; + size_t i; isc_ht_node_t *cur; }; isc_result_t -isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, uint8_t bits) -{ +isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, uint8_t bits) { isc_ht_t *ht = NULL; - size_t i; + size_t i; REQUIRE(htp != NULL && *htp == NULL); REQUIRE(mctx != NULL); @@ -79,10 +78,9 @@ isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, uint8_t bits) } void -isc_ht_destroy(isc_ht_t **htp) -{ +isc_ht_destroy(isc_ht_t **htp) { isc_ht_t *ht; - size_t i; + size_t i; REQUIRE(htp != NULL); @@ -113,10 +111,9 @@ isc_ht_destroy(isc_ht_t **htp) isc_result_t isc_ht_add(isc_ht_t *ht, const unsigned char *key, uint32_t keysize, - void *value) -{ + void *value) { isc_ht_node_t *node; - uint32_t hash; + uint32_t hash; REQUIRE(ISC_HT_VALID(ht)); REQUIRE(key != NULL && keysize > 0); @@ -145,10 +142,9 @@ isc_ht_add(isc_ht_t *ht, const unsigned char *key, uint32_t keysize, isc_result_t isc_ht_find(const isc_ht_t *ht, const unsigned char *key, uint32_t keysize, - void **valuep) -{ + void **valuep) { isc_ht_node_t *node; - uint32_t hash; + uint32_t hash; REQUIRE(ISC_HT_VALID(ht)); REQUIRE(key != NULL && keysize > 0); @@ -171,10 +167,9 @@ isc_ht_find(const isc_ht_t *ht, const unsigned char *key, uint32_t keysize, } isc_result_t -isc_ht_delete(isc_ht_t *ht, const unsigned char *key, uint32_t keysize) -{ +isc_ht_delete(isc_ht_t *ht, const unsigned char *key, uint32_t keysize) { isc_ht_node_t *node, *prev; - uint32_t hash; + uint32_t hash; REQUIRE(ISC_HT_VALID(ht)); REQUIRE(key != NULL && keysize > 0); @@ -205,8 +200,7 @@ isc_ht_delete(isc_ht_t *ht, const unsigned char *key, uint32_t keysize) } isc_result_t -isc_ht_iter_create(isc_ht_t *ht, isc_ht_iter_t **itp) -{ +isc_ht_iter_create(isc_ht_t *ht, isc_ht_iter_t **itp) { isc_ht_iter_t *it; REQUIRE(ISC_HT_VALID(ht)); @@ -224,10 +218,9 @@ isc_ht_iter_create(isc_ht_t *ht, isc_ht_iter_t **itp) } void -isc_ht_iter_destroy(isc_ht_iter_t **itp) -{ +isc_ht_iter_destroy(isc_ht_iter_t **itp) { isc_ht_iter_t *it; - isc_ht_t * ht; + isc_ht_t *ht; REQUIRE(itp != NULL && *itp != NULL); @@ -238,8 +231,7 @@ isc_ht_iter_destroy(isc_ht_iter_t **itp) } isc_result_t -isc_ht_iter_first(isc_ht_iter_t *it) -{ +isc_ht_iter_first(isc_ht_iter_t *it) { REQUIRE(it != NULL); it->i = 0; @@ -257,8 +249,7 @@ isc_ht_iter_first(isc_ht_iter_t *it) } isc_result_t -isc_ht_iter_next(isc_ht_iter_t *it) -{ +isc_ht_iter_next(isc_ht_iter_t *it) { REQUIRE(it != NULL); REQUIRE(it->cur != NULL); @@ -277,14 +268,13 @@ isc_ht_iter_next(isc_ht_iter_t *it) } isc_result_t -isc_ht_iter_delcurrent_next(isc_ht_iter_t *it) -{ - isc_result_t result = ISC_R_SUCCESS; +isc_ht_iter_delcurrent_next(isc_ht_iter_t *it) { + isc_result_t result = ISC_R_SUCCESS; isc_ht_node_t *to_delete = NULL; isc_ht_node_t *prev = NULL; isc_ht_node_t *node = NULL; - uint32_t hash; - isc_ht_t * ht; + uint32_t hash; + isc_ht_t *ht; REQUIRE(it != NULL); REQUIRE(it->cur != NULL); to_delete = it->cur; @@ -323,8 +313,7 @@ isc_ht_iter_delcurrent_next(isc_ht_iter_t *it) } void -isc_ht_iter_current(isc_ht_iter_t *it, void **valuep) -{ +isc_ht_iter_current(isc_ht_iter_t *it, void **valuep) { REQUIRE(it != NULL); REQUIRE(it->cur != NULL); REQUIRE(valuep != NULL && *valuep == NULL); @@ -333,8 +322,8 @@ isc_ht_iter_current(isc_ht_iter_t *it, void **valuep) } void -isc_ht_iter_currentkey(isc_ht_iter_t *it, unsigned char **key, size_t *keysize) -{ +isc_ht_iter_currentkey(isc_ht_iter_t *it, unsigned char **key, + size_t *keysize) { REQUIRE(it != NULL); REQUIRE(it->cur != NULL); REQUIRE(key != NULL && *key == NULL); @@ -344,8 +333,7 @@ isc_ht_iter_currentkey(isc_ht_iter_t *it, unsigned char **key, size_t *keysize) } unsigned int -isc_ht_count(isc_ht_t *ht) -{ +isc_ht_count(isc_ht_t *ht) { REQUIRE(ISC_HT_VALID(ht)); return (ht->count); diff --git a/lib/isc/httpd.c b/lib/isc/httpd.c index c502b046ad..855a1ed2ce 100644 --- a/lib/isc/httpd.c +++ b/lib/isc/httpd.c @@ -38,43 +38,43 @@ * page and close the client. */ -#define MSHUTTINGDOWN(cm) ((cm->flags & ISC_HTTPDMGR_FLAGSHUTTINGDOWN) != 0) +#define MSHUTTINGDOWN(cm) ((cm->flags & ISC_HTTPDMGR_FLAGSHUTTINGDOWN) != 0) #define MSETSHUTTINGDOWN(cm) (cm->flags |= ISC_HTTPDMGR_FLAGSHUTTINGDOWN) -#define HTTP_RECVLEN 1024 -#define HTTP_SENDGROW 1024 +#define HTTP_RECVLEN 1024 +#define HTTP_SENDGROW 1024 #define HTTP_SEND_MAXLEN 10240 -#define HTTPD_CLOSE 0x0001 /* Got a Connection: close header */ -#define HTTPD_FOUNDHOST 0x0002 /* Got a Host: header */ -#define HTTPD_KEEPALIVE 0x0004 /* Got a Connection: Keep-Alive */ +#define HTTPD_CLOSE 0x0001 /* Got a Connection: close header */ +#define HTTPD_FOUNDHOST 0x0002 /* Got a Host: header */ +#define HTTPD_KEEPALIVE 0x0004 /* Got a Connection: Keep-Alive */ #define HTTPD_ACCEPT_DEFLATE 0x0008 -#define HTTPD_MAGIC ISC_MAGIC('H', 't', 'p', 'd') +#define HTTPD_MAGIC ISC_MAGIC('H', 't', 'p', 'd') #define VALID_HTTPD(m) ISC_MAGIC_VALID(m, HTTPD_MAGIC) -#define HTTPDMGR_MAGIC ISC_MAGIC('H', 'p', 'd', 'm') +#define HTTPDMGR_MAGIC ISC_MAGIC('H', 'p', 'd', 'm') #define VALID_HTTPDMGR(m) ISC_MAGIC_VALID(m, HTTPDMGR_MAGIC) /*% http client */ struct isc_httpd { - unsigned int magic; /* HTTPD_MAGIC */ - isc_refcount_t references; + unsigned int magic; /* HTTPD_MAGIC */ + isc_refcount_t references; isc_httpdmgr_t *mgr; /*%< our parent */ ISC_LINK(isc_httpd_t) link; - unsigned int state; + unsigned int state; isc_socket_t *sock; /*% * Received data state. */ - char recvbuf[HTTP_RECVLEN]; /*%< receive buffer */ - uint32_t recvlen; /*%< length recv'd */ - char * headers; /*%< set in process_request() */ + char recvbuf[HTTP_RECVLEN]; /*%< receive buffer */ + uint32_t recvlen; /*%< length recv'd */ + char *headers; /*%< set in process_request() */ unsigned int method; - char * url; - char * querystring; - char * protocol; + char *url; + char *querystring; + char *protocol; /* * Flags on the httpd client. @@ -107,30 +107,30 @@ struct isc_httpd { * compressed HTTP data, if compression is used. * */ - isc_buffer_t headerbuffer; - isc_buffer_t compbuffer; + isc_buffer_t headerbuffer; + isc_buffer_t compbuffer; isc_buffer_t *sendbuffer; - const char * mimetype; - unsigned int retcode; - const char * retmsg; - isc_buffer_t bodybuffer; + const char *mimetype; + unsigned int retcode; + const char *retmsg; + isc_buffer_t bodybuffer; isc_httpdfree_t *freecb; - void * freecb_arg; + void *freecb_arg; }; /*% lightweight socket manager for httpd output */ struct isc_httpdmgr { - unsigned int magic; /* HTTPDMGR_MAGIC */ - isc_refcount_t references; - isc_mem_t * mctx; - isc_socket_t * sock; /*%< listening socket */ - isc_task_t * task; /*%< owning task */ + unsigned int magic; /* HTTPDMGR_MAGIC */ + isc_refcount_t references; + isc_mem_t *mctx; + isc_socket_t *sock; /*%< listening socket */ + isc_task_t *task; /*%< owning task */ isc_timermgr_t *timermgr; - isc_httpdclientok_t * client_ok; /*%< client validator */ + isc_httpdclientok_t *client_ok; /*%< client validator */ isc_httpdondestroy_t *ondestroy; /*%< cleanup callback */ - void * cb_arg; /*%< argument for the above */ + void *cb_arg; /*%< argument for the above */ unsigned int flags; ISC_LIST(isc_httpd_t) running; /*%< running clients */ @@ -146,8 +146,8 @@ struct isc_httpdmgr { * HTTP methods. */ #define ISC_HTTPD_METHODUNKNOWN 0 -#define ISC_HTTPD_METHODGET 1 -#define ISC_HTTPD_METHODPOST 2 +#define ISC_HTTPD_METHODGET 1 +#define ISC_HTTPD_METHODPOST 2 /*% * Client states. @@ -178,37 +178,31 @@ struct isc_httpdmgr { * At any time -> RECV on error. If RECV fails, the client will * self-destroy, closing the socket and freeing memory. */ -#define ISC_HTTPD_STATEIDLE 0 -#define ISC_HTTPD_STATERECV 1 +#define ISC_HTTPD_STATEIDLE 0 +#define ISC_HTTPD_STATERECV 1 #define ISC_HTTPD_STATERECVDONE 2 -#define ISC_HTTPD_STATESEND 3 +#define ISC_HTTPD_STATESEND 3 #define ISC_HTTPD_STATESENDDONE 4 -#define ISC_HTTPD_ISRECV(c) ((c)->state == ISC_HTTPD_STATERECV) +#define ISC_HTTPD_ISRECV(c) ((c)->state == ISC_HTTPD_STATERECV) #define ISC_HTTPD_ISRECVDONE(c) ((c)->state == ISC_HTTPD_STATERECVDONE) -#define ISC_HTTPD_ISSEND(c) ((c)->state == ISC_HTTPD_STATESEND) +#define ISC_HTTPD_ISSEND(c) ((c)->state == ISC_HTTPD_STATESEND) #define ISC_HTTPD_ISSENDDONE(c) ((c)->state == ISC_HTTPD_STATESENDDONE) /*% * Overall magic test that means we're not idle. */ -#define ISC_HTTPD_SETRECV(c) ((c)->state = ISC_HTTPD_STATERECV) +#define ISC_HTTPD_SETRECV(c) ((c)->state = ISC_HTTPD_STATERECV) #define ISC_HTTPD_SETRECVDONE(c) ((c)->state = ISC_HTTPD_STATERECVDONE) -#define ISC_HTTPD_SETSEND(c) ((c)->state = ISC_HTTPD_STATESEND) +#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; @@ -217,31 +211,23 @@ 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) -{ +maybe_destroy_httpd(isc_httpd_t *httpd) { if (isc_refcount_decrement(&httpd->references) == 1) { destroy_httpd(httpd); } } static inline void -free_buffer(isc_mem_t *mctx, isc_buffer_t *buffer) -{ +free_buffer(isc_mem_t *mctx, isc_buffer_t *buffer) { isc_region_t r; isc_buffer_region(buffer, &r); @@ -251,8 +237,7 @@ free_buffer(isc_mem_t *mctx, isc_buffer_t *buffer) } static void -destroy_httpd(isc_httpd_t *httpd) -{ +destroy_httpd(isc_httpd_t *httpd) { isc_httpdmgr_t *httpdmgr; REQUIRE(VALID_HTTPD(httpd)); @@ -288,8 +273,7 @@ destroy_httpd(isc_httpd_t *httpd) } static inline isc_result_t -httpdmgr_socket_accept(isc_task_t *task, isc_httpdmgr_t *httpdmgr) -{ +httpdmgr_socket_accept(isc_task_t *task, isc_httpdmgr_t *httpdmgr) { isc_result_t result = ISC_R_SUCCESS; /* decremented in isc_httpd_accept */ @@ -303,8 +287,7 @@ httpdmgr_socket_accept(isc_task_t *task, isc_httpdmgr_t *httpdmgr) } static inline void -httpd_socket_recv(isc_httpd_t *httpd, isc_region_t *region, isc_task_t *task) -{ +httpd_socket_recv(isc_httpd_t *httpd, isc_region_t *region, isc_task_t *task) { isc_result_t result = ISC_R_SUCCESS; /* decremented in isc_httpd_recvdone */ @@ -317,8 +300,7 @@ httpd_socket_recv(isc_httpd_t *httpd, isc_region_t *region, isc_task_t *task) } static inline void -httpd_socket_send(isc_httpd_t *httpd, isc_region_t *region, isc_task_t *task) -{ +httpd_socket_send(isc_httpd_t *httpd, isc_region_t *region, isc_task_t *task) { isc_result_t result = ISC_R_SUCCESS; /* decremented in isc_httpd_senddone */ @@ -332,11 +314,10 @@ httpd_socket_send(isc_httpd_t *httpd, isc_region_t *region, isc_task_t *task) isc_result_t isc_httpdmgr_create(isc_mem_t *mctx, isc_socket_t *sock, isc_task_t *task, - isc_httpdclientok_t * client_ok, + isc_httpdclientok_t *client_ok, isc_httpdondestroy_t *ondestroy, void *cb_arg, - isc_timermgr_t *tmgr, isc_httpdmgr_t **httpdmgrp) -{ - isc_result_t result; + isc_timermgr_t *tmgr, isc_httpdmgr_t **httpdmgrp) { + isc_result_t result; isc_httpdmgr_t *httpdmgr; REQUIRE(mctx != NULL); @@ -399,8 +380,7 @@ cleanup: } static void -isc_httpdmgr_attach(isc_httpdmgr_t *source, isc_httpdmgr_t **targetp) -{ +isc_httpdmgr_attach(isc_httpdmgr_t *source, isc_httpdmgr_t **targetp) { REQUIRE(VALID_HTTPDMGR(source)); REQUIRE(targetp != NULL && *targetp == NULL); @@ -410,8 +390,7 @@ isc_httpdmgr_attach(isc_httpdmgr_t *source, isc_httpdmgr_t **targetp) } static void -isc_httpdmgr_detach(isc_httpdmgr_t **httpdmgrp) -{ +isc_httpdmgr_detach(isc_httpdmgr_t **httpdmgrp) { REQUIRE(httpdmgrp != NULL && VALID_HTTPDMGR(*httpdmgrp)); isc_httpdmgr_t *httpdmgr = *httpdmgrp; *httpdmgrp = NULL; @@ -420,16 +399,14 @@ isc_httpdmgr_detach(isc_httpdmgr_t **httpdmgrp) } static void -maybe_destroy_httpdmgr(isc_httpdmgr_t *httpdmgr) -{ +maybe_destroy_httpdmgr(isc_httpdmgr_t *httpdmgr) { if (isc_refcount_decrement(&httpdmgr->references) == 1) { destroy_httpdmgr(httpdmgr); } } static void -destroy_httpdmgr(isc_httpdmgr_t *httpdmgr) -{ +destroy_httpdmgr(isc_httpdmgr_t *httpdmgr) { isc_httpdurl_t *url; isc_refcount_destroy(&httpdmgr->references); @@ -475,9 +452,8 @@ destroy_httpdmgr(isc_httpdmgr_t *httpdmgr) */ static bool have_header(isc_httpd_t *httpd, const char *header, const char *value, - const char *eov) -{ - char * cr, *nl, *h; + const char *eov) { + char *cr, *nl, *h; size_t hlen, vlen = 0; h = httpd->headers; @@ -549,11 +525,10 @@ have_header(isc_httpd_t *httpd, const char *header, const char *value, } static isc_result_t -process_request(isc_httpd_t *httpd, int length) -{ +process_request(isc_httpd_t *httpd, int length) { char *s; char *p; - int delim; + int delim; httpd->recvlen += length; @@ -602,7 +577,8 @@ process_request(isc_httpd_t *httpd, int length) */ s = p; while (LENGTHOK(s) && BUFLENOK(s) && - (*s != '\n' && *s != '\r' && *s != '\0' && *s != ' ')) { + (*s != '\n' && *s != '\r' && *s != '\0' && *s != ' ')) + { s++; } if (!LENGTHOK(s)) { @@ -697,8 +673,8 @@ process_request(isc_httpd_t *httpd, int length) } if (strncmp(httpd->protocol, "HTTP/1.0", 8) == 0) { - if (have_header(httpd, "Connection:", "Keep-Alive", - ", \t\r\n")) { + if (have_header(httpd, "Connection:", "Keep-Alive", ", \t\r\n")) + { httpd->flags |= HTTPD_KEEPALIVE; } else { httpd->flags |= HTTPD_CLOSE; @@ -718,7 +694,8 @@ process_request(isc_httpd_t *httpd, int length) * Standards compliance hooks here. */ if (strcmp(httpd->protocol, "HTTP/1.1") == 0 && - ((httpd->flags & HTTPD_FOUNDHOST) == 0)) { + ((httpd->flags & HTTPD_FOUNDHOST) == 0)) + { return (ISC_R_RANGE); } @@ -727,10 +704,9 @@ process_request(isc_httpd_t *httpd, int length) static void isc_httpd_create(isc_httpdmgr_t *httpdmgr, isc_socket_t *sock, - isc_httpd_t **httpdp) -{ + isc_httpd_t **httpdp) { isc_httpd_t *httpd; - char * headerdata; + char *headerdata; REQUIRE(VALID_HTTPDMGR(httpdmgr)); REQUIRE(httpdp != NULL && *httpdp == NULL); @@ -764,13 +740,12 @@ isc_httpd_create(isc_httpdmgr_t *httpdmgr, isc_socket_t *sock, } static void -isc_httpd_accept(isc_task_t *task, isc_event_t *ev) -{ - isc_httpdmgr_t * httpdmgr = ev->ev_arg; - isc_httpd_t * httpd = NULL; - isc_region_t r; +isc_httpd_accept(isc_task_t *task, isc_event_t *ev) { + isc_httpdmgr_t *httpdmgr = ev->ev_arg; + isc_httpd_t *httpd = NULL; + isc_region_t r; isc_socket_newconnev_t *nev = (isc_socket_newconnev_t *)ev; - isc_sockaddr_t peeraddr; + isc_sockaddr_t peeraddr; REQUIRE(VALID_HTTPDMGR(httpdmgr)); @@ -790,7 +765,8 @@ isc_httpd_accept(isc_task_t *task, isc_event_t *ev) (void)isc_socket_getpeername(nev->newsocket, &peeraddr); if (httpdmgr->client_ok != NULL && - !(httpdmgr->client_ok)(&peeraddr, httpdmgr->cb_arg)) { + !(httpdmgr->client_ok)(&peeraddr, httpdmgr->cb_arg)) + { isc_socket_detach(&nev->newsocket); goto requeue; } @@ -820,8 +796,7 @@ static isc_result_t render_404(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, - isc_httpdfree_t **freecb, void **freecb_args) -{ + isc_httpdfree_t **freecb, void **freecb_args) { static char msg[] = "No such URL.\r\n"; UNUSED(url); @@ -845,8 +820,7 @@ static isc_result_t render_500(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, const char *headers, void *arg, unsigned int *retcode, const char **retmsg, const char **mimetype, isc_buffer_t *b, - isc_httpdfree_t **freecb, void **freecb_args) -{ + isc_httpdfree_t **freecb, void **freecb_args) { static char msg[] = "Internal server failure.\r\n"; UNUSED(url); @@ -879,9 +853,8 @@ render_500(const char *url, isc_httpdurl_t *urlinfo, const char *querystring, *\li #ISC_R_NOMEMORY -- not enough memory to extend buffer */ static isc_result_t -alloc_compspace(isc_httpd_t *httpd, unsigned int size) -{ - char * newspace; +alloc_compspace(isc_httpd_t *httpd, unsigned int size) { + char *newspace; isc_region_t r; isc_buffer_region(&httpd->compbuffer, &r); @@ -913,13 +886,12 @@ alloc_compspace(isc_httpd_t *httpd, unsigned int size) * data would be larger than input data */ static isc_result_t -isc_httpd_compress(isc_httpd_t *httpd) -{ - z_stream zstr; +isc_httpd_compress(isc_httpd_t *httpd) { + z_stream zstr; isc_region_t r; isc_result_t result; - int ret; - int inputlen; + int ret; + int inputlen; inputlen = isc_buffer_usedlength(&httpd->bodybuffer); result = alloc_compspace(httpd, inputlen); @@ -954,17 +926,16 @@ isc_httpd_compress(isc_httpd_t *httpd) #endif /* ifdef HAVE_ZLIB */ static void -isc_httpd_recvdone(isc_task_t *task, isc_event_t *ev) -{ - isc_result_t result; - isc_httpd_t * httpd = ev->ev_arg; +isc_httpd_recvdone(isc_task_t *task, isc_event_t *ev) { + isc_result_t result; + isc_httpd_t *httpd = ev->ev_arg; isc_socketevent_t *sev = (isc_socketevent_t *)ev; - isc_buffer_t * databuffer; - isc_httpdurl_t * url; - isc_time_t now; - isc_region_t r; - bool is_compressed = false; - char datebuf[ISC_FORMATHTTPTIMESTAMP_SIZE]; + isc_buffer_t *databuffer; + isc_httpdurl_t *url; + isc_time_t now; + isc_region_t r; + bool is_compressed = false; + char datebuf[ISC_FORMATHTTPTIMESTAMP_SIZE]; REQUIRE(VALID_HTTPD(httpd)); @@ -1095,10 +1066,9 @@ out: } void -isc_httpdmgr_shutdown(isc_httpdmgr_t **httpdmgrp) -{ +isc_httpdmgr_shutdown(isc_httpdmgr_t **httpdmgrp) { isc_httpdmgr_t *httpdmgr; - isc_httpd_t * httpd; + isc_httpd_t *httpd; REQUIRE(httpdmgrp != NULL); httpdmgr = *httpdmgrp; @@ -1124,9 +1094,8 @@ isc_httpdmgr_shutdown(isc_httpdmgr_t **httpdmgrp) } static isc_result_t -grow_headerspace(isc_httpd_t *httpd) -{ - char * newspace; +grow_headerspace(isc_httpd_t *httpd) { + char *newspace; unsigned int newlen; isc_region_t r; @@ -1146,8 +1115,7 @@ grow_headerspace(isc_httpd_t *httpd) } isc_result_t -isc_httpd_response(isc_httpd_t *httpd) -{ +isc_httpd_response(isc_httpd_t *httpd) { isc_result_t result; unsigned int needlen; @@ -1170,8 +1138,7 @@ isc_httpd_response(isc_httpd_t *httpd) } isc_result_t -isc_httpd_addheader(isc_httpd_t *httpd, const char *name, const char *val) -{ +isc_httpd_addheader(isc_httpd_t *httpd, const char *name, const char *val) { isc_result_t result; unsigned int needlen; @@ -1200,8 +1167,7 @@ isc_httpd_addheader(isc_httpd_t *httpd, const char *name, const char *val) } isc_result_t -isc_httpd_endheaders(isc_httpd_t *httpd) -{ +isc_httpd_endheaders(isc_httpd_t *httpd) { isc_result_t result; REQUIRE(VALID_HTTPD(httpd)); @@ -1217,11 +1183,10 @@ isc_httpd_endheaders(isc_httpd_t *httpd) } isc_result_t -isc_httpd_addheaderuint(isc_httpd_t *httpd, const char *name, int val) -{ +isc_httpd_addheaderuint(isc_httpd_t *httpd, const char *name, int val) { isc_result_t result; unsigned int needlen; - char buf[sizeof "18446744073709551616"]; + char buf[sizeof "18446744073709551616"]; REQUIRE(VALID_HTTPD(httpd)); @@ -1243,10 +1208,9 @@ isc_httpd_addheaderuint(isc_httpd_t *httpd, const char *name, int val) } static void -isc_httpd_senddone(isc_task_t *task, isc_event_t *ev) -{ - isc_httpd_t * httpd = ev->ev_arg; - isc_region_t r; +isc_httpd_senddone(isc_task_t *task, isc_event_t *ev) { + isc_httpd_t *httpd = ev->ev_arg; + isc_region_t r; isc_socketevent_t *sev = (isc_socketevent_t *)ev; REQUIRE(VALID_HTTPD(httpd)); @@ -1293,8 +1257,7 @@ out: } static void -reset_client(isc_httpd_t *httpd) -{ +reset_client(isc_httpd_t *httpd) { /* * Catch errors here. We MUST be in RECV mode, and we MUST NOT have * any outstanding buffers. If we have buffers, we have a leak. @@ -1319,8 +1282,7 @@ reset_client(isc_httpd_t *httpd) isc_result_t isc_httpdmgr_addurl(isc_httpdmgr_t *httpdmgr, const char *url, - isc_httpdaction_t *func, void *arg) -{ + isc_httpdaction_t *func, void *arg) { /* REQUIRE(VALID_HTTPDMGR(httpdmgr)); Dummy function */ return (isc_httpdmgr_addurl2(httpdmgr, url, false, func, arg)); @@ -1328,8 +1290,7 @@ isc_httpdmgr_addurl(isc_httpdmgr_t *httpdmgr, const char *url, isc_result_t isc_httpdmgr_addurl2(isc_httpdmgr_t *httpdmgr, const char *url, bool isstatic, - isc_httpdaction_t *func, void *arg) -{ + isc_httpdaction_t *func, void *arg) { isc_httpdurl_t *item; REQUIRE(VALID_HTTPDMGR(httpdmgr)); @@ -1358,8 +1319,7 @@ isc_httpdmgr_addurl2(isc_httpdmgr_t *httpdmgr, const char *url, bool isstatic, } void -isc_httpd_setfinishhook(void (*fn)(void)) -{ +isc_httpd_setfinishhook(void (*fn)(void)) { #if ENABLE_AFL finishhook = fn; #else /* ENABLE_AFL */ diff --git a/lib/isc/include/isc/app.h b/lib/isc/include/isc/app.h index b66d8910ec..5b05254672 100644 --- a/lib/isc/include/isc/app.h +++ b/lib/isc/include/isc/app.h @@ -90,8 +90,8 @@ typedef isc_event_t isc_appevent_t; #define ISC_APPEVENT_FIRSTEVENT (ISC_EVENTCLASS_APP + 0) -#define ISC_APPEVENT_SHUTDOWN (ISC_EVENTCLASS_APP + 1) -#define ISC_APPEVENT_LASTEVENT (ISC_EVENTCLASS_APP + 65535) +#define ISC_APPEVENT_SHUTDOWN (ISC_EVENTCLASS_APP + 1) +#define ISC_APPEVENT_LASTEVENT (ISC_EVENTCLASS_APP + 65535) /*% * This structure is actually just the common prefix of an application context diff --git a/lib/isc/include/isc/buffer.h b/lib/isc/include/isc/buffer.h index 5fb030e243..5ebdff969e 100644 --- a/lib/isc/include/isc/buffer.h +++ b/lib/isc/include/isc/buffer.h @@ -121,7 +121,7 @@ ISC_LANG_BEGINDECLS /*! *** Magic numbers ***/ -#define ISC_BUFFER_MAGIC 0x42756621U /* Buf!. */ +#define ISC_BUFFER_MAGIC 0x42756621U /* Buf!. */ #define ISC_BUFFER_VALID(b) ISC_MAGIC_VALID(b, ISC_BUFFER_MAGIC) /*@}*/ @@ -157,11 +157,11 @@ ISC_LANG_BEGINDECLS /*! * Derived lengths. (Described in the introductory comment.) */ -#define isc_buffer_usedlength(b) ((b)->used) /* d-a */ -#define isc_buffer_consumedlength(b) ((b)->current) /* b-a */ -#define isc_buffer_remaininglength(b) ((b)->used - (b)->current) /* d-b */ -#define isc_buffer_activelength(b) ((b)->active - (b)->current) /* c-b */ -#define isc_buffer_availablelength(b) ((b)->length - (b)->used) /* e-d */ +#define isc_buffer_usedlength(b) ((b)->used) /* d-a */ +#define isc_buffer_consumedlength(b) ((b)->current) /* b-a */ +#define isc_buffer_remaininglength(b) ((b)->used - (b)->current) /* d-b */ +#define isc_buffer_activelength(b) ((b)->active - (b)->current) /* c-b */ +#define isc_buffer_availablelength(b) ((b)->length - (b)->used) /* e-d */ /*@}*/ /*! @@ -988,51 +988,51 @@ ISC_LANG_ENDDECLS } while (0) #if defined(ISC_BUFFER_USEINLINE) -#define isc_buffer_init ISC__BUFFER_INIT -#define isc_buffer_initnull ISC__BUFFER_INITNULL -#define isc_buffer_invalidate ISC__BUFFER_INVALIDATE -#define isc_buffer_region ISC__BUFFER_REGION -#define isc_buffer_usedregion ISC__BUFFER_USEDREGION +#define isc_buffer_init ISC__BUFFER_INIT +#define isc_buffer_initnull ISC__BUFFER_INITNULL +#define isc_buffer_invalidate ISC__BUFFER_INVALIDATE +#define isc_buffer_region ISC__BUFFER_REGION +#define isc_buffer_usedregion ISC__BUFFER_USEDREGION #define isc_buffer_availableregion ISC__BUFFER_AVAILABLEREGION -#define isc_buffer_add ISC__BUFFER_ADD -#define isc_buffer_subtract ISC__BUFFER_SUBTRACT -#define isc_buffer_clear ISC__BUFFER_CLEAR -#define isc_buffer_consumedregion ISC__BUFFER_CONSUMEDREGION +#define isc_buffer_add ISC__BUFFER_ADD +#define isc_buffer_subtract ISC__BUFFER_SUBTRACT +#define isc_buffer_clear ISC__BUFFER_CLEAR +#define isc_buffer_consumedregion ISC__BUFFER_CONSUMEDREGION #define isc_buffer_remainingregion ISC__BUFFER_REMAININGREGION -#define isc_buffer_activeregion ISC__BUFFER_ACTIVEREGION -#define isc_buffer_setactive ISC__BUFFER_SETACTIVE -#define isc_buffer_first ISC__BUFFER_FIRST -#define isc_buffer_forward ISC__BUFFER_FORWARD -#define isc_buffer_back ISC__BUFFER_BACK -#define isc_buffer_putmem ISC__BUFFER_PUTMEM -#define isc_buffer_putstr ISC__BUFFER_PUTSTR -#define isc_buffer_putuint8 ISC__BUFFER_PUTUINT8 -#define isc_buffer_putuint16 ISC__BUFFER_PUTUINT16 -#define isc_buffer_putuint24 ISC__BUFFER_PUTUINT24 -#define isc_buffer_putuint32 ISC__BUFFER_PUTUINT32 +#define isc_buffer_activeregion ISC__BUFFER_ACTIVEREGION +#define isc_buffer_setactive ISC__BUFFER_SETACTIVE +#define isc_buffer_first ISC__BUFFER_FIRST +#define isc_buffer_forward ISC__BUFFER_FORWARD +#define isc_buffer_back ISC__BUFFER_BACK +#define isc_buffer_putmem ISC__BUFFER_PUTMEM +#define isc_buffer_putstr ISC__BUFFER_PUTSTR +#define isc_buffer_putuint8 ISC__BUFFER_PUTUINT8 +#define isc_buffer_putuint16 ISC__BUFFER_PUTUINT16 +#define isc_buffer_putuint24 ISC__BUFFER_PUTUINT24 +#define isc_buffer_putuint32 ISC__BUFFER_PUTUINT32 #else /* if defined(ISC_BUFFER_USEINLINE) */ -#define isc_buffer_init isc__buffer_init -#define isc_buffer_initnull isc__buffer_initnull -#define isc_buffer_invalidate isc__buffer_invalidate -#define isc_buffer_region isc__buffer_region -#define isc_buffer_usedregion isc__buffer_usedregion +#define isc_buffer_init isc__buffer_init +#define isc_buffer_initnull isc__buffer_initnull +#define isc_buffer_invalidate isc__buffer_invalidate +#define isc_buffer_region isc__buffer_region +#define isc_buffer_usedregion isc__buffer_usedregion #define isc_buffer_availableregion isc__buffer_availableregion -#define isc_buffer_add isc__buffer_add -#define isc_buffer_subtract isc__buffer_subtract -#define isc_buffer_clear isc__buffer_clear -#define isc_buffer_consumedregion isc__buffer_consumedregion +#define isc_buffer_add isc__buffer_add +#define isc_buffer_subtract isc__buffer_subtract +#define isc_buffer_clear isc__buffer_clear +#define isc_buffer_consumedregion isc__buffer_consumedregion #define isc_buffer_remainingregion isc__buffer_remainingregion -#define isc_buffer_activeregion isc__buffer_activeregion -#define isc_buffer_setactive isc__buffer_setactive -#define isc_buffer_first isc__buffer_first -#define isc_buffer_forward isc__buffer_forward -#define isc_buffer_back isc__buffer_back -#define isc_buffer_putmem isc__buffer_putmem -#define isc_buffer_putstr isc__buffer_putstr -#define isc_buffer_putuint8 isc__buffer_putuint8 -#define isc_buffer_putuint16 isc__buffer_putuint16 -#define isc_buffer_putuint24 isc__buffer_putuint24 -#define isc_buffer_putuint32 isc__buffer_putuint32 +#define isc_buffer_activeregion isc__buffer_activeregion +#define isc_buffer_setactive isc__buffer_setactive +#define isc_buffer_first isc__buffer_first +#define isc_buffer_forward isc__buffer_forward +#define isc_buffer_back isc__buffer_back +#define isc_buffer_putmem isc__buffer_putmem +#define isc_buffer_putstr isc__buffer_putstr +#define isc_buffer_putuint8 isc__buffer_putuint8 +#define isc_buffer_putuint16 isc__buffer_putuint16 +#define isc_buffer_putuint24 isc__buffer_putuint24 +#define isc_buffer_putuint32 isc__buffer_putuint32 #endif /* if defined(ISC_BUFFER_USEINLINE) */ #define isc_buffer_constinit(_b, _d, _l) \ diff --git a/lib/isc/include/isc/event.h b/lib/isc/include/isc/event.h index b152f169e2..e941b3713b 100644 --- a/lib/isc/include/isc/event.h +++ b/lib/isc/include/isc/event.h @@ -76,7 +76,7 @@ struct isc_event { }; #define ISC_EVENTTYPE_FIRSTEVENT 0x00000000 -#define ISC_EVENTTYPE_LASTEVENT 0xffffffff +#define ISC_EVENTTYPE_LASTEVENT 0xffffffff #define ISC_EVENT_PTR(p) ((isc_event_t **)(void *)(p)) diff --git a/lib/isc/include/isc/eventclass.h b/lib/isc/include/isc/eventclass.h index 8a9a2716bc..2b7ae8a820 100644 --- a/lib/isc/include/isc/eventclass.h +++ b/lib/isc/include/isc/eventclass.h @@ -31,16 +31,16 @@ * Event classes >= 1024 and <= 65535 are reserved for application use. */ -#define ISC_EVENTCLASS_TASK ISC_EVENTCLASS(0) -#define ISC_EVENTCLASS_TIMER ISC_EVENTCLASS(1) -#define ISC_EVENTCLASS_SOCKET ISC_EVENTCLASS(2) -#define ISC_EVENTCLASS_FILE ISC_EVENTCLASS(3) -#define ISC_EVENTCLASS_DNS ISC_EVENTCLASS(4) -#define ISC_EVENTCLASS_APP ISC_EVENTCLASS(5) -#define ISC_EVENTCLASS_OMAPI ISC_EVENTCLASS(6) +#define ISC_EVENTCLASS_TASK ISC_EVENTCLASS(0) +#define ISC_EVENTCLASS_TIMER ISC_EVENTCLASS(1) +#define ISC_EVENTCLASS_SOCKET ISC_EVENTCLASS(2) +#define ISC_EVENTCLASS_FILE ISC_EVENTCLASS(3) +#define ISC_EVENTCLASS_DNS ISC_EVENTCLASS(4) +#define ISC_EVENTCLASS_APP ISC_EVENTCLASS(5) +#define ISC_EVENTCLASS_OMAPI ISC_EVENTCLASS(6) #define ISC_EVENTCLASS_RATELIMITER ISC_EVENTCLASS(7) -#define ISC_EVENTCLASS_ISCCC ISC_EVENTCLASS(8) -#define ISC_EVENTCLASS_NS ISC_EVENTCLASS(9) +#define ISC_EVENTCLASS_ISCCC ISC_EVENTCLASS(8) +#define ISC_EVENTCLASS_NS ISC_EVENTCLASS(9) /*@}*/ #endif /* ISC_EVENTCLASS_H */ diff --git a/lib/isc/include/isc/fsaccess.h b/lib/isc/include/isc/fsaccess.h index 610fb6a211..b4d79e25d7 100644 --- a/lib/isc/include/isc/fsaccess.h +++ b/lib/isc/include/isc/fsaccess.h @@ -138,13 +138,13 @@ /* * Types of permission. */ -#define ISC_FSACCESS_READ 0x00000001 /*%< File only. */ -#define ISC_FSACCESS_WRITE 0x00000002 /*%< File only. */ -#define ISC_FSACCESS_EXECUTE 0x00000004 /*%< File only. */ -#define ISC_FSACCESS_CREATECHILD 0x00000008 /*%< Dir only. */ -#define ISC_FSACCESS_DELETECHILD 0x00000010 /*%< Dir only. */ +#define ISC_FSACCESS_READ 0x00000001 /*%< File only. */ +#define ISC_FSACCESS_WRITE 0x00000002 /*%< File only. */ +#define ISC_FSACCESS_EXECUTE 0x00000004 /*%< File only. */ +#define ISC_FSACCESS_CREATECHILD 0x00000008 /*%< Dir only. */ +#define ISC_FSACCESS_DELETECHILD 0x00000010 /*%< Dir only. */ #define ISC_FSACCESS_LISTDIRECTORY 0x00000020 /*%< Dir only. */ -#define ISC_FSACCESS_ACCESSCHILD 0x00000040 /*%< Dir only. */ +#define ISC_FSACCESS_ACCESSCHILD 0x00000040 /*%< Dir only. */ /*% * Adding any permission bits beyond 0x200 would mean typedef'ing diff --git a/lib/isc/include/isc/httpd.h b/lib/isc/include/isc/httpd.h index 5641d36c74..cfc3508054 100644 --- a/lib/isc/include/isc/httpd.h +++ b/lib/isc/include/isc/httpd.h @@ -40,7 +40,7 @@ struct isc_httpdurl { }; #define HTTPD_EVENTCLASS ISC_EVENTCLASS(4300) -#define HTTPD_SHUTDOWN (HTTPD_EVENTCLASS + 0x0001) +#define HTTPD_SHUTDOWN (HTTPD_EVENTCLASS + 0x0001) #define ISC_HTTPDMGR_FLAGSHUTTINGDOWN 0x00000001 diff --git a/lib/isc/include/isc/interfaceiter.h b/lib/isc/include/isc/interfaceiter.h index 7c5c307ca0..21b659f004 100644 --- a/lib/isc/include/isc/interfaceiter.h +++ b/lib/isc/include/isc/interfaceiter.h @@ -56,9 +56,9 @@ struct isc_interface { /*@{*/ /*! Interface flags. */ -#define INTERFACE_F_UP 0x00000001U +#define INTERFACE_F_UP 0x00000001U #define INTERFACE_F_POINTTOPOINT 0x00000002U -#define INTERFACE_F_LOOPBACK 0x00000004U +#define INTERFACE_F_LOOPBACK 0x00000004U /*@}*/ /*** diff --git a/lib/isc/include/isc/lang.h b/lib/isc/include/isc/lang.h index 1e44bb7150..fac85d37f1 100644 --- a/lib/isc/include/isc/lang.h +++ b/lib/isc/include/isc/lang.h @@ -16,7 +16,7 @@ #ifdef __cplusplus #define ISC_LANG_BEGINDECLS extern "C" { -#define ISC_LANG_ENDDECLS } +#define ISC_LANG_ENDDECLS } #else /* ifdef __cplusplus */ #define ISC_LANG_BEGINDECLS #define ISC_LANG_ENDDECLS diff --git a/lib/isc/include/isc/lex.h b/lib/isc/include/isc/lex.h index 0b863525b9..8ef0dff753 100644 --- a/lib/isc/include/isc/lex.h +++ b/lib/isc/include/isc/lex.h @@ -61,11 +61,11 @@ ISC_LANG_BEGINDECLS * Various options for isc_lex_gettoken(). */ -#define ISC_LEXOPT_EOL 0x01 /*%< Want end-of-line token. */ -#define ISC_LEXOPT_EOF 0x02 /*%< Want end-of-file token. */ +#define ISC_LEXOPT_EOL 0x01 /*%< Want end-of-line token. */ +#define ISC_LEXOPT_EOF 0x02 /*%< Want end-of-file token. */ #define ISC_LEXOPT_INITIALWS 0x04 /*%< Want initial whitespace. */ -#define ISC_LEXOPT_NUMBER 0x08 /*%< Recognize numbers. */ -#define ISC_LEXOPT_QSTRING 0x10 /*%< Recognize qstrings. */ +#define ISC_LEXOPT_NUMBER 0x08 /*%< Recognize numbers. */ +#define ISC_LEXOPT_QSTRING 0x10 /*%< Recognize qstrings. */ /*@}*/ /*@{*/ @@ -77,13 +77,13 @@ ISC_LANG_BEGINDECLS * characters. */ #define ISC_LEXOPT_DNSMULTILINE 0x20 /*%< Handle '(' and ')'. */ -#define ISC_LEXOPT_NOMORE 0x40 /*%< Want "no more" token. */ +#define ISC_LEXOPT_NOMORE 0x40 /*%< Want "no more" token. */ -#define ISC_LEXOPT_CNUMBER 0x80 /*%< Recognize octal and hex. */ -#define ISC_LEXOPT_ESCAPE 0x100 /*%< Recognize escapes. */ +#define ISC_LEXOPT_CNUMBER 0x80 /*%< Recognize octal and hex. */ +#define ISC_LEXOPT_ESCAPE 0x100 /*%< Recognize escapes. */ #define ISC_LEXOPT_QSTRINGMULTILINE 0x200 /*%< Allow multiline "" strings */ -#define ISC_LEXOPT_OCTAL 0x400 /*%< Expect a octal number. */ -#define ISC_LEXOPT_BTEXT 0x800 /*%< Bracketed text. */ +#define ISC_LEXOPT_OCTAL 0x400 /*%< Expect a octal number. */ +#define ISC_LEXOPT_BTEXT 0x800 /*%< Bracketed text. */ /*@}*/ /*@{*/ /*! @@ -91,9 +91,9 @@ ISC_LANG_BEGINDECLS * isc_lex_setcomments(). */ -#define ISC_LEXCOMMENT_C 0x01 -#define ISC_LEXCOMMENT_CPLUSPLUS 0x02 -#define ISC_LEXCOMMENT_SHELL 0x04 +#define ISC_LEXCOMMENT_C 0x01 +#define ISC_LEXCOMMENT_CPLUSPLUS 0x02 +#define ISC_LEXCOMMENT_SHELL 0x04 #define ISC_LEXCOMMENT_DNSMASTERFILE 0x08 /*@}*/ diff --git a/lib/isc/include/isc/likely.h b/lib/isc/include/isc/likely.h index 772790113f..0f01a083d3 100644 --- a/lib/isc/include/isc/likely.h +++ b/lib/isc/include/isc/likely.h @@ -16,14 +16,14 @@ * Performance */ #ifdef CPPCHECK -#define ISC_LIKELY(x) (x) +#define ISC_LIKELY(x) (x) #define ISC_UNLIKELY(x) (x) #else /* ifdef CPPCHECK */ #ifdef HAVE_BUILTIN_EXPECT -#define ISC_LIKELY(x) __builtin_expect(!!(x), 1) +#define ISC_LIKELY(x) __builtin_expect(!!(x), 1) #define ISC_UNLIKELY(x) __builtin_expect(!!(x), 0) #else /* ifdef HAVE_BUILTIN_EXPECT */ -#define ISC_LIKELY(x) (x) +#define ISC_LIKELY(x) (x) #define ISC_UNLIKELY(x) (x) #endif /* ifdef HAVE_BUILTIN_EXPECT */ #endif /* ifdef CPPCHECK */ diff --git a/lib/isc/include/isc/list.h b/lib/isc/include/isc/list.h index d24bf9ccde..bab6f1f619 100644 --- a/lib/isc/include/isc/list.h +++ b/lib/isc/include/isc/list.h @@ -39,11 +39,11 @@ (elt)->link.prev = (type *)(-1); \ (elt)->link.next = (type *)(-1); \ } while (0) -#define ISC_LINK_INIT(elt, link) ISC_LINK_INIT_TYPE(elt, link, void) +#define ISC_LINK_INIT(elt, link) ISC_LINK_INIT_TYPE(elt, link, void) #define ISC_LINK_LINKED(elt, link) ((void *)((elt)->link.prev) != (void *)(-1)) -#define ISC_LIST_HEAD(list) ((list).head) -#define ISC_LIST_TAIL(list) ((list).tail) +#define ISC_LIST_HEAD(list) ((list).head) +#define ISC_LIST_TAIL(list) ((list).tail) #define ISC_LIST_EMPTY(list) ((list).head == NULL) #define __ISC_LIST_PREPENDUNSAFE(list, elt, link) \ diff --git a/lib/isc/include/isc/log.h b/lib/isc/include/isc/log.h index 542d017db6..18784ee35b 100644 --- a/lib/isc/include/isc/log.h +++ b/lib/isc/include/isc/log.h @@ -34,11 +34,11 @@ * #ISC_LOG_DYNAMIC can only be used for defining channels with * isc_log_createchannel(), not to specify a level in isc_log_write(). */ -#define ISC_LOG_DYNAMIC 0 -#define ISC_LOG_INFO (-1) -#define ISC_LOG_NOTICE (-2) -#define ISC_LOG_WARNING (-3) -#define ISC_LOG_ERROR (-4) +#define ISC_LOG_DYNAMIC 0 +#define ISC_LOG_INFO (-1) +#define ISC_LOG_NOTICE (-2) +#define ISC_LOG_WARNING (-3) +#define ISC_LOG_ERROR (-4) #define ISC_LOG_CRITICAL (-5) /*@}*/ @@ -46,9 +46,9 @@ /*! * \brief Destinations. */ -#define ISC_LOG_TONULL 1 -#define ISC_LOG_TOSYSLOG 2 -#define ISC_LOG_TOFILE 3 +#define ISC_LOG_TONULL 1 +#define ISC_LOG_TOSYSLOG 2 +#define ISC_LOG_TOFILE 3 #define ISC_LOG_TOFILEDESC 4 /*@}*/ @@ -56,18 +56,18 @@ /*% * Channel flags. */ -#define ISC_LOG_PRINTTIME 0x00001 -#define ISC_LOG_PRINTLEVEL 0x00002 +#define ISC_LOG_PRINTTIME 0x00001 +#define ISC_LOG_PRINTLEVEL 0x00002 #define ISC_LOG_PRINTCATEGORY 0x00004 -#define ISC_LOG_PRINTMODULE 0x00008 -#define ISC_LOG_PRINTTAG 0x00010 /* tag and ":" */ -#define ISC_LOG_PRINTPREFIX 0x00020 /* tag only, no colon */ -#define ISC_LOG_PRINTALL 0x0003F -#define ISC_LOG_BUFFERED 0x00040 -#define ISC_LOG_DEBUGONLY 0x01000 -#define ISC_LOG_OPENERR 0x08000 /* internal */ -#define ISC_LOG_ISO8601 0x10000 /* if PRINTTIME, use ISO8601 */ -#define ISC_LOG_UTC 0x20000 /* if PRINTTIME, use UTC */ +#define ISC_LOG_PRINTMODULE 0x00008 +#define ISC_LOG_PRINTTAG 0x00010 /* tag and ":" */ +#define ISC_LOG_PRINTPREFIX 0x00020 /* tag only, no colon */ +#define ISC_LOG_PRINTALL 0x0003F +#define ISC_LOG_BUFFERED 0x00040 +#define ISC_LOG_DEBUGONLY 0x01000 +#define ISC_LOG_OPENERR 0x08000 /* internal */ +#define ISC_LOG_ISO8601 0x10000 /* if PRINTTIME, use ISO8601 */ +#define ISC_LOG_UTC 0x20000 /* if PRINTTIME, use UTC */ /*@}*/ /*@{*/ @@ -79,7 +79,7 @@ * INFINITE is going to be trivial to add to that. */ #define ISC_LOG_ROLLINFINITE (-1) -#define ISC_LOG_ROLLNEVER (-2) +#define ISC_LOG_ROLLNEVER (-2) #define ISC_LOG_MAX_VERSIONS 256 /*@}*/ @@ -173,13 +173,13 @@ LIBISC_EXTERNAL_DATA extern isc_logmodule_t isc_modules[]; #define ISC_LOGCATEGORY_GENERAL (&isc_categories[1]) /*@}*/ -#define ISC_LOGMODULE_SOCKET (&isc_modules[0]) -#define ISC_LOGMODULE_TIME (&isc_modules[1]) +#define ISC_LOGMODULE_SOCKET (&isc_modules[0]) +#define ISC_LOGMODULE_TIME (&isc_modules[1]) #define ISC_LOGMODULE_INTERFACE (&isc_modules[2]) -#define ISC_LOGMODULE_TIMER (&isc_modules[3]) -#define ISC_LOGMODULE_FILE (&isc_modules[4]) -#define ISC_LOGMODULE_NETMGR (&isc_modules[5]) -#define ISC_LOGMODULE_OTHER (&isc_modules[6]) +#define ISC_LOGMODULE_TIMER (&isc_modules[3]) +#define ISC_LOGMODULE_FILE (&isc_modules[4]) +#define ISC_LOGMODULE_NETMGR (&isc_modules[5]) +#define ISC_LOGMODULE_OTHER (&isc_modules[6]) ISC_LANG_BEGINDECLS diff --git a/lib/isc/include/isc/md.h b/lib/isc/include/isc/md.h index 14fc064776..27720fe70a 100644 --- a/lib/isc/include/isc/md.h +++ b/lib/isc/include/isc/md.h @@ -38,17 +38,17 @@ typedef EVP_MD_CTX isc_md_t; */ typedef const EVP_MD *isc_md_type_t; -#define ISC_MD_MD5 EVP_md5() -#define ISC_MD_SHA1 EVP_sha1() +#define ISC_MD_MD5 EVP_md5() +#define ISC_MD_SHA1 EVP_sha1() #define ISC_MD_SHA224 EVP_sha224() #define ISC_MD_SHA256 EVP_sha256() #define ISC_MD_SHA384 EVP_sha384() #define ISC_MD_SHA512 EVP_sha512() -#define ISC_MD5_DIGESTLENGTH isc_md_type_get_size(ISC_MD_MD5) -#define ISC_MD5_BLOCK_LENGTH isc_md_type_get_block_size(ISC_MD_MD5) -#define ISC_SHA1_DIGESTLENGTH isc_md_type_get_size(ISC_MD_SHA1) -#define ISC_SHA1_BLOCK_LENGTH isc_md_type_get_block_size(ISC_MD_SHA1) +#define ISC_MD5_DIGESTLENGTH isc_md_type_get_size(ISC_MD_MD5) +#define ISC_MD5_BLOCK_LENGTH isc_md_type_get_block_size(ISC_MD_MD5) +#define ISC_SHA1_DIGESTLENGTH isc_md_type_get_size(ISC_MD_SHA1) +#define ISC_SHA1_BLOCK_LENGTH isc_md_type_get_block_size(ISC_MD_SHA1) #define ISC_SHA224_DIGESTLENGTH isc_md_type_get_size(ISC_MD_SHA224) #define ISC_SHA224_BLOCK_LENGTH isc_md_type_get_block_size(ISC_MD_SHA224) #define ISC_SHA256_DIGESTLENGTH isc_md_type_get_size(ISC_MD_SHA256) @@ -58,7 +58,7 @@ typedef const EVP_MD *isc_md_type_t; #define ISC_SHA512_DIGESTLENGTH isc_md_type_get_size(ISC_MD_SHA512) #define ISC_SHA512_BLOCK_LENGTH isc_md_type_get_block_size(ISC_MD_SHA512) -#define ISC_MAX_MD_SIZE EVP_MAX_MD_SIZE +#define ISC_MAX_MD_SIZE EVP_MAX_MD_SIZE #define ISC_MAX_BLOCK_SIZE 128U /* ISC_SHA512_BLOCK_LENGTH */ /** diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h index dcb41b8493..4b84d927ea 100644 --- a/lib/isc/include/isc/mem.h +++ b/lib/isc/include/isc/mem.h @@ -64,12 +64,12 @@ LIBISC_EXTERNAL_DATA extern unsigned int isc_mem_debugging; LIBISC_EXTERNAL_DATA extern unsigned int isc_mem_defaultflags; /*@{*/ -#define ISC_MEM_DEBUGTRACE 0x00000001U +#define ISC_MEM_DEBUGTRACE 0x00000001U #define ISC_MEM_DEBUGRECORD 0x00000002U -#define ISC_MEM_DEBUGUSAGE 0x00000004U -#define ISC_MEM_DEBUGSIZE 0x00000008U -#define ISC_MEM_DEBUGCTX 0x00000010U -#define ISC_MEM_DEBUGALL 0x0000001FU +#define ISC_MEM_DEBUGUSAGE 0x00000004U +#define ISC_MEM_DEBUGSIZE 0x00000008U +#define ISC_MEM_DEBUGCTX 0x00000010U +#define ISC_MEM_DEBUGALL 0x0000001FU /*!< * The variable isc_mem_debugging holds a set of flags for * turning certain memory debugging options on or off at @@ -100,7 +100,7 @@ LIBISC_EXTERNAL_DATA extern unsigned int isc_mem_defaultflags; #if ISC_MEM_TRACKLINES #define _ISC_MEM_FILELINE , __FILE__, __LINE__ -#define _ISC_MEM_FLARG , const char *, unsigned int +#define _ISC_MEM_FLARG , const char *, unsigned int #else /* if ISC_MEM_TRACKLINES */ #define _ISC_MEM_FILELINE #define _ISC_MEM_FLARG @@ -190,7 +190,7 @@ struct isc_mem { isc_memmethods_t *methods; }; -#define ISCAPI_MCTX_MAGIC ISC_MAGIC('A', 'm', 'c', 'x') +#define ISCAPI_MCTX_MAGIC ISC_MAGIC('A', 'm', 'c', 'x') #define ISCAPI_MCTX_VALID(m) ((m) != NULL && (m)->magic == ISCAPI_MCTX_MAGIC) /*% @@ -218,15 +218,15 @@ struct isc_mempool { * loaded modules can use them even if named is statically linked. */ -#define ISCMEMFUNC(sfx) isc__mem_##sfx +#define ISCMEMFUNC(sfx) isc__mem_##sfx #define ISCMEMPOOLFUNC(sfx) isc__mempool_##sfx -#define isc_mem_get(c, s) ISCMEMFUNC(get)((c), (s)_ISC_MEM_FILELINE) +#define isc_mem_get(c, s) ISCMEMFUNC(get)((c), (s)_ISC_MEM_FILELINE) #define isc_mem_allocate(c, s) ISCMEMFUNC(allocate)((c), (s)_ISC_MEM_FILELINE) #define isc_mem_reallocate(c, p, s) \ ISCMEMFUNC(reallocate)((c), (p), (s)_ISC_MEM_FILELINE) #define isc_mem_strdup(c, p) ISCMEMFUNC(strdup)((c), (p)_ISC_MEM_FILELINE) -#define isc_mempool_get(c) ISCMEMPOOLFUNC(get)((c)_ISC_MEM_FILELINE) +#define isc_mempool_get(c) ISCMEMPOOLFUNC(get)((c)_ISC_MEM_FILELINE) #define isc_mem_put(c, p, s) \ do { \ diff --git a/lib/isc/include/isc/radix.h b/lib/isc/include/isc/radix.h index 62f85f334b..35b9bbef09 100644 --- a/lib/isc/include/isc/radix.h +++ b/lib/isc/include/isc/radix.h @@ -56,7 +56,7 @@ typedef struct isc_prefix { typedef void (*isc_radix_destroyfunc_t)(void *); typedef void (*isc_radix_processfunc_t)(isc_prefix_t *, void **); -#define isc_prefix_tochar(prefix) ((char *)&(prefix)->add.sin) +#define isc_prefix_tochar(prefix) ((char *)&(prefix)->add.sin) #define isc_prefix_touchar(prefix) ((u_char *)&(prefix)->add.sin) /* @@ -78,8 +78,8 @@ typedef void (*isc_radix_processfunc_t)(isc_prefix_t *, void **); * but matches all IPv6 addresses too. */ -#define RADIX_V4 0 -#define RADIX_V6 1 +#define RADIX_V4 0 +#define RADIX_V6 1 #define RADIX_FAMILIES 2 #define ISC_RADIX_FAMILY(p) (((p)->family == AF_INET6) ? RADIX_V6 : RADIX_V4) @@ -99,7 +99,7 @@ typedef struct isc_radix_node { * nodes */ } isc_radix_node_t; -#define RADIX_TREE_MAGIC ISC_MAGIC('R', 'd', 'x', 'T'); +#define RADIX_TREE_MAGIC ISC_MAGIC('R', 'd', 'x', 'T'); #define RADIX_TREE_VALID(a) ISC_MAGIC_VALID(a, RADIX_TREE_MAGIC); typedef struct isc_radix_tree { @@ -190,8 +190,8 @@ isc_radix_process(isc_radix_tree_t *radix, isc_radix_processfunc_t func); * \li 'func' to point to a function. */ -#define RADIX_MAXBITS 128 -#define RADIX_NBIT(x) (0x80 >> ((x)&0x7f)) +#define RADIX_MAXBITS 128 +#define RADIX_NBIT(x) (0x80 >> ((x)&0x7f)) #define RADIX_NBYTE(x) ((x) >> 3) #define RADIX_WALK(Xhead, Xnode) \ diff --git a/lib/isc/include/isc/refcount.h b/lib/isc/include/isc/refcount.h index be5060bce7..647df64a1f 100644 --- a/lib/isc/include/isc/refcount.h +++ b/lib/isc/include/isc/refcount.h @@ -68,8 +68,7 @@ typedef atomic_uint_fast32_t isc_refcount_t; */ #if _MSC_VER static inline uint_fast32_t -isc_refcount_increment0(isc_refcount_t *target) -{ +isc_refcount_increment0(isc_refcount_t *target) { uint_fast32_t __v; __v = (uint_fast32_t)atomic_fetch_add_relaxed(target, 1); INSIST(__v < UINT32_MAX); @@ -93,8 +92,7 @@ isc_refcount_increment0(isc_refcount_t *target) */ #if _MSC_VER static inline uint_fast32_t -isc_refcount_increment(isc_refcount_t *target) -{ +isc_refcount_increment(isc_refcount_t *target) { uint_fast32_t __v; __v = (uint_fast32_t)atomic_fetch_add_relaxed(target, 1); INSIST(__v > 0 && __v < UINT32_MAX); @@ -118,8 +116,7 @@ isc_refcount_increment(isc_refcount_t *target) */ #if _MSC_VER static inline uint_fast32_t -isc_refcount_decrement(isc_refcount_t *target) -{ +isc_refcount_decrement(isc_refcount_t *target) { uint_fast32_t __v; __v = (uint_fast32_t)atomic_fetch_sub_release(target, 1); INSIST(__v > 0); diff --git a/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h index 25b02f815f..50911dd545 100644 --- a/lib/isc/include/isc/result.h +++ b/lib/isc/include/isc/result.h @@ -17,77 +17,77 @@ #include #include -#define ISC_R_SUCCESS 0 /*%< success */ -#define ISC_R_NOMEMORY 1 /*%< out of memory */ -#define ISC_R_TIMEDOUT 2 /*%< timed out */ -#define ISC_R_NOTHREADS 3 /*%< no available threads */ -#define ISC_R_ADDRNOTAVAIL 4 /*%< address not available */ -#define ISC_R_ADDRINUSE 5 /*%< address in use */ -#define ISC_R_NOPERM 6 /*%< permission denied */ -#define ISC_R_NOCONN 7 /*%< no pending connections */ -#define ISC_R_NETUNREACH 8 /*%< network unreachable */ -#define ISC_R_HOSTUNREACH 9 /*%< host unreachable */ -#define ISC_R_NETDOWN 10 /*%< network down */ -#define ISC_R_HOSTDOWN 11 /*%< host down */ -#define ISC_R_CONNREFUSED 12 /*%< connection refused */ -#define ISC_R_NORESOURCES 13 /*%< not enough free resources */ -#define ISC_R_EOF 14 /*%< end of file */ -#define ISC_R_BOUND 15 /*%< socket already bound */ -#define ISC_R_RELOAD 16 /*%< reload */ -#define ISC_R_SUSPEND ISC_R_RELOAD /*%< alias of 'reload' */ -#define ISC_R_LOCKBUSY 17 /*%< lock busy */ -#define ISC_R_EXISTS 18 /*%< already exists */ -#define ISC_R_NOSPACE 19 /*%< ran out of space */ -#define ISC_R_CANCELED 20 /*%< operation canceled */ -#define ISC_R_NOTBOUND 21 /*%< socket is not bound */ -#define ISC_R_SHUTTINGDOWN 22 /*%< shutting down */ -#define ISC_R_NOTFOUND 23 /*%< not found */ -#define ISC_R_UNEXPECTEDEND 24 /*%< unexpected end of input */ -#define ISC_R_FAILURE 25 /*%< generic failure */ -#define ISC_R_IOERROR 26 /*%< I/O error */ -#define ISC_R_NOTIMPLEMENTED 27 /*%< not implemented */ -#define ISC_R_UNBALANCED 28 /*%< unbalanced parentheses */ -#define ISC_R_NOMORE 29 /*%< no more */ -#define ISC_R_INVALIDFILE 30 /*%< invalid file */ -#define ISC_R_BADBASE64 31 /*%< bad base64 encoding */ -#define ISC_R_UNEXPECTEDTOKEN 32 /*%< unexpected token */ -#define ISC_R_QUOTA 33 /*%< quota reached */ -#define ISC_R_UNEXPECTED 34 /*%< unexpected error */ -#define ISC_R_ALREADYRUNNING 35 /*%< already running */ -#define ISC_R_IGNORE 36 /*%< ignore */ -#define ISC_R_MASKNONCONTIG 37 /*%< addr mask not contiguous */ -#define ISC_R_FILENOTFOUND 38 /*%< file not found */ -#define ISC_R_FILEEXISTS 39 /*%< file already exists */ -#define ISC_R_NOTCONNECTED 40 /*%< socket is not connected */ -#define ISC_R_RANGE 41 /*%< out of range */ -#define ISC_R_NOENTROPY 42 /*%< out of entropy */ -#define ISC_R_MULTICAST 43 /*%< invalid use of multicast */ -#define ISC_R_NOTFILE 44 /*%< not a file */ -#define ISC_R_NOTDIRECTORY 45 /*%< not a directory */ -#define ISC_R_QUEUEFULL 46 /*%< queue is full */ -#define ISC_R_FAMILYMISMATCH 47 /*%< address family mismatch */ -#define ISC_R_FAMILYNOSUPPORT 48 /*%< AF not supported */ -#define ISC_R_BADHEX 49 /*%< bad hex encoding */ -#define ISC_R_TOOMANYOPENFILES 50 /*%< too many open files */ -#define ISC_R_NOTBLOCKING 51 /*%< not blocking */ -#define ISC_R_UNBALANCEDQUOTES 52 /*%< unbalanced quotes */ -#define ISC_R_INPROGRESS 53 /*%< operation in progress */ -#define ISC_R_CONNECTIONRESET 54 /*%< connection reset */ -#define ISC_R_SOFTQUOTA 55 /*%< soft quota reached */ -#define ISC_R_BADNUMBER 56 /*%< not a valid number */ -#define ISC_R_DISABLED 57 /*%< disabled */ -#define ISC_R_MAXSIZE 58 /*%< max size */ -#define ISC_R_BADADDRESSFORM 59 /*%< invalid address format */ -#define ISC_R_BADBASE32 60 /*%< bad base32 encoding */ -#define ISC_R_UNSET 61 /*%< unset */ -#define ISC_R_MULTIPLE 62 /*%< multiple */ -#define ISC_R_WOULDBLOCK 63 /*%< would block */ -#define ISC_R_COMPLETE 64 /*%< complete */ -#define ISC_R_CRYPTOFAILURE 65 /*%< cryptography library failure */ -#define ISC_R_DISCQUOTA 66 /*%< disc quota */ -#define ISC_R_DISCFULL 67 /*%< disc full */ -#define ISC_R_DEFAULT 68 /*%< default */ -#define ISC_R_IPV4PREFIX 69 /*%< IPv4 prefix */ +#define ISC_R_SUCCESS 0 /*%< success */ +#define ISC_R_NOMEMORY 1 /*%< out of memory */ +#define ISC_R_TIMEDOUT 2 /*%< timed out */ +#define ISC_R_NOTHREADS 3 /*%< no available threads */ +#define ISC_R_ADDRNOTAVAIL 4 /*%< address not available */ +#define ISC_R_ADDRINUSE 5 /*%< address in use */ +#define ISC_R_NOPERM 6 /*%< permission denied */ +#define ISC_R_NOCONN 7 /*%< no pending connections */ +#define ISC_R_NETUNREACH 8 /*%< network unreachable */ +#define ISC_R_HOSTUNREACH 9 /*%< host unreachable */ +#define ISC_R_NETDOWN 10 /*%< network down */ +#define ISC_R_HOSTDOWN 11 /*%< host down */ +#define ISC_R_CONNREFUSED 12 /*%< connection refused */ +#define ISC_R_NORESOURCES 13 /*%< not enough free resources */ +#define ISC_R_EOF 14 /*%< end of file */ +#define ISC_R_BOUND 15 /*%< socket already bound */ +#define ISC_R_RELOAD 16 /*%< reload */ +#define ISC_R_SUSPEND ISC_R_RELOAD /*%< alias of 'reload' */ +#define ISC_R_LOCKBUSY 17 /*%< lock busy */ +#define ISC_R_EXISTS 18 /*%< already exists */ +#define ISC_R_NOSPACE 19 /*%< ran out of space */ +#define ISC_R_CANCELED 20 /*%< operation canceled */ +#define ISC_R_NOTBOUND 21 /*%< socket is not bound */ +#define ISC_R_SHUTTINGDOWN 22 /*%< shutting down */ +#define ISC_R_NOTFOUND 23 /*%< not found */ +#define ISC_R_UNEXPECTEDEND 24 /*%< unexpected end of input */ +#define ISC_R_FAILURE 25 /*%< generic failure */ +#define ISC_R_IOERROR 26 /*%< I/O error */ +#define ISC_R_NOTIMPLEMENTED 27 /*%< not implemented */ +#define ISC_R_UNBALANCED 28 /*%< unbalanced parentheses */ +#define ISC_R_NOMORE 29 /*%< no more */ +#define ISC_R_INVALIDFILE 30 /*%< invalid file */ +#define ISC_R_BADBASE64 31 /*%< bad base64 encoding */ +#define ISC_R_UNEXPECTEDTOKEN 32 /*%< unexpected token */ +#define ISC_R_QUOTA 33 /*%< quota reached */ +#define ISC_R_UNEXPECTED 34 /*%< unexpected error */ +#define ISC_R_ALREADYRUNNING 35 /*%< already running */ +#define ISC_R_IGNORE 36 /*%< ignore */ +#define ISC_R_MASKNONCONTIG 37 /*%< addr mask not contiguous */ +#define ISC_R_FILENOTFOUND 38 /*%< file not found */ +#define ISC_R_FILEEXISTS 39 /*%< file already exists */ +#define ISC_R_NOTCONNECTED 40 /*%< socket is not connected */ +#define ISC_R_RANGE 41 /*%< out of range */ +#define ISC_R_NOENTROPY 42 /*%< out of entropy */ +#define ISC_R_MULTICAST 43 /*%< invalid use of multicast */ +#define ISC_R_NOTFILE 44 /*%< not a file */ +#define ISC_R_NOTDIRECTORY 45 /*%< not a directory */ +#define ISC_R_QUEUEFULL 46 /*%< queue is full */ +#define ISC_R_FAMILYMISMATCH 47 /*%< address family mismatch */ +#define ISC_R_FAMILYNOSUPPORT 48 /*%< AF not supported */ +#define ISC_R_BADHEX 49 /*%< bad hex encoding */ +#define ISC_R_TOOMANYOPENFILES 50 /*%< too many open files */ +#define ISC_R_NOTBLOCKING 51 /*%< not blocking */ +#define ISC_R_UNBALANCEDQUOTES 52 /*%< unbalanced quotes */ +#define ISC_R_INPROGRESS 53 /*%< operation in progress */ +#define ISC_R_CONNECTIONRESET 54 /*%< connection reset */ +#define ISC_R_SOFTQUOTA 55 /*%< soft quota reached */ +#define ISC_R_BADNUMBER 56 /*%< not a valid number */ +#define ISC_R_DISABLED 57 /*%< disabled */ +#define ISC_R_MAXSIZE 58 /*%< max size */ +#define ISC_R_BADADDRESSFORM 59 /*%< invalid address format */ +#define ISC_R_BADBASE32 60 /*%< bad base32 encoding */ +#define ISC_R_UNSET 61 /*%< unset */ +#define ISC_R_MULTIPLE 62 /*%< multiple */ +#define ISC_R_WOULDBLOCK 63 /*%< would block */ +#define ISC_R_COMPLETE 64 /*%< complete */ +#define ISC_R_CRYPTOFAILURE 65 /*%< cryptography library failure */ +#define ISC_R_DISCQUOTA 66 /*%< disc quota */ +#define ISC_R_DISCFULL 67 /*%< disc full */ +#define ISC_R_DEFAULT 68 /*%< default */ +#define ISC_R_IPV4PREFIX 69 /*%< IPv4 prefix */ /*% Not a result code: the number of results. */ #define ISC_R_NRESULTS 70 diff --git a/lib/isc/include/isc/resultclass.h b/lib/isc/include/isc/resultclass.h index 6f06137325..5d6e92c933 100644 --- a/lib/isc/include/isc/resultclass.h +++ b/lib/isc/include/isc/resultclass.h @@ -23,19 +23,19 @@ * Result classes >= 1024 and <= 65535 are reserved for application use. */ -#define ISC_RESULTCLASS_FROMNUM(num) ((num) << 16) +#define ISC_RESULTCLASS_FROMNUM(num) ((num) << 16) #define ISC_RESULTCLASS_TONUM(rclass) ((rclass) >> 16) -#define ISC_RESULTCLASS_SIZE 65536 +#define ISC_RESULTCLASS_SIZE 65536 #define ISC_RESULTCLASS_INCLASS(rclass, result) \ ((rclass) == ((result)&0xFFFF0000)) -#define ISC_RESULTCLASS_ISC ISC_RESULTCLASS_FROMNUM(0) -#define ISC_RESULTCLASS_DNS ISC_RESULTCLASS_FROMNUM(1) -#define ISC_RESULTCLASS_DST ISC_RESULTCLASS_FROMNUM(2) +#define ISC_RESULTCLASS_ISC ISC_RESULTCLASS_FROMNUM(0) +#define ISC_RESULTCLASS_DNS ISC_RESULTCLASS_FROMNUM(1) +#define ISC_RESULTCLASS_DST ISC_RESULTCLASS_FROMNUM(2) #define ISC_RESULTCLASS_DNSRCODE ISC_RESULTCLASS_FROMNUM(3) -#define ISC_RESULTCLASS_OMAPI ISC_RESULTCLASS_FROMNUM(4) -#define ISC_RESULTCLASS_ISCCC ISC_RESULTCLASS_FROMNUM(5) -#define ISC_RESULTCLASS_DHCP ISC_RESULTCLASS_FROMNUM(6) -#define ISC_RESULTCLASS_PK11 ISC_RESULTCLASS_FROMNUM(7) +#define ISC_RESULTCLASS_OMAPI ISC_RESULTCLASS_FROMNUM(4) +#define ISC_RESULTCLASS_ISCCC ISC_RESULTCLASS_FROMNUM(5) +#define ISC_RESULTCLASS_DHCP ISC_RESULTCLASS_FROMNUM(6) +#define ISC_RESULTCLASS_PK11 ISC_RESULTCLASS_FROMNUM(7) #endif /* ISC_RESULTCLASS_H */ diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h index 06eee560d7..4e8c0bba08 100644 --- a/lib/isc/include/isc/socket.h +++ b/lib/isc/include/isc/socket.h @@ -147,8 +147,8 @@ struct isc_socket_connev { #define ISC_SOCKEVENT_ANYEVENT (0) #define ISC_SOCKEVENT_RECVDONE (ISC_EVENTCLASS_SOCKET + 1) #define ISC_SOCKEVENT_SENDDONE (ISC_EVENTCLASS_SOCKET + 2) -#define ISC_SOCKEVENT_NEWCONN (ISC_EVENTCLASS_SOCKET + 3) -#define ISC_SOCKEVENT_CONNECT (ISC_EVENTCLASS_SOCKET + 4) +#define ISC_SOCKEVENT_NEWCONN (ISC_EVENTCLASS_SOCKET + 3) +#define ISC_SOCKEVENT_CONNECT (ISC_EVENTCLASS_SOCKET + 4) /* * Internal events. @@ -169,18 +169,18 @@ typedef enum { */ #define ISC_SOCKSHUT_RECV 0x00000001 /*%< close read side */ #define ISC_SOCKSHUT_SEND 0x00000002 /*%< close write side */ -#define ISC_SOCKSHUT_ALL 0x00000003 /*%< close them all */ +#define ISC_SOCKSHUT_ALL 0x00000003 /*%< close them all */ /*@}*/ /*@{*/ /*! * What I/O events to cancel in isc_socket_cancel() calls. */ -#define ISC_SOCKCANCEL_RECV 0x00000001 /*%< cancel recv */ -#define ISC_SOCKCANCEL_SEND 0x00000002 /*%< cancel send */ -#define ISC_SOCKCANCEL_ACCEPT 0x00000004 /*%< cancel accept */ +#define ISC_SOCKCANCEL_RECV 0x00000001 /*%< cancel recv */ +#define ISC_SOCKCANCEL_SEND 0x00000002 /*%< cancel send */ +#define ISC_SOCKCANCEL_ACCEPT 0x00000004 /*%< cancel accept */ #define ISC_SOCKCANCEL_CONNECT 0x00000008 /*%< cancel connect */ -#define ISC_SOCKCANCEL_ALL 0x0000000f /*%< cancel everything */ +#define ISC_SOCKCANCEL_ALL 0x0000000f /*%< cancel everything */ /*@}*/ /*@{*/ @@ -188,7 +188,7 @@ typedef enum { * Flags for isc_socket_send() and isc_socket_recv() calls. */ #define ISC_SOCKFLAG_IMMEDIATE 0x00000001 /*%< send event only if needed */ -#define ISC_SOCKFLAG_NORETRY 0x00000002 /*%< drop failed UDP sends */ +#define ISC_SOCKFLAG_NORETRY 0x00000002 /*%< drop failed UDP sends */ /*@}*/ /*% diff --git a/lib/isc/include/isc/task.h b/lib/isc/include/isc/task.h index 0e9e5c2d94..a97044440f 100644 --- a/lib/isc/include/isc/task.h +++ b/lib/isc/include/isc/task.h @@ -80,9 +80,9 @@ #include #define ISC_TASKEVENT_FIRSTEVENT (ISC_EVENTCLASS_TASK + 0) -#define ISC_TASKEVENT_SHUTDOWN (ISC_EVENTCLASS_TASK + 1) -#define ISC_TASKEVENT_TEST (ISC_EVENTCLASS_TASK + 1) -#define ISC_TASKEVENT_LASTEVENT (ISC_EVENTCLASS_TASK + 65535) +#define ISC_TASKEVENT_SHUTDOWN (ISC_EVENTCLASS_TASK + 1) +#define ISC_TASKEVENT_TEST (ISC_EVENTCLASS_TASK + 1) +#define ISC_TASKEVENT_LASTEVENT (ISC_EVENTCLASS_TASK + 65535) /***** ***** Tasks. @@ -126,7 +126,7 @@ struct isc_task { unsigned int magic; }; -#define ISCAPI_TASK_MAGIC ISC_MAGIC('A', 't', 's', 't') +#define ISCAPI_TASK_MAGIC ISC_MAGIC('A', 't', 's', 't') #define ISCAPI_TASK_VALID(s) ((s) != NULL && (s)->magic == ISCAPI_TASK_MAGIC) isc_result_t diff --git a/lib/isc/include/isc/timer.h b/lib/isc/include/isc/timer.h index d1962d2041..28af8daaeb 100644 --- a/lib/isc/include/isc/timer.h +++ b/lib/isc/include/isc/timer.h @@ -92,10 +92,10 @@ typedef struct isc_timerevent { } isc_timerevent_t; #define ISC_TIMEREVENT_FIRSTEVENT (ISC_EVENTCLASS_TIMER + 0) -#define ISC_TIMEREVENT_TICK (ISC_EVENTCLASS_TIMER + 1) -#define ISC_TIMEREVENT_IDLE (ISC_EVENTCLASS_TIMER + 2) -#define ISC_TIMEREVENT_LIFE (ISC_EVENTCLASS_TIMER + 3) -#define ISC_TIMEREVENT_LASTEVENT (ISC_EVENTCLASS_TIMER + 65535) +#define ISC_TIMEREVENT_TICK (ISC_EVENTCLASS_TIMER + 1) +#define ISC_TIMEREVENT_IDLE (ISC_EVENTCLASS_TIMER + 2) +#define ISC_TIMEREVENT_LIFE (ISC_EVENTCLASS_TIMER + 3) +#define ISC_TIMEREVENT_LASTEVENT (ISC_EVENTCLASS_TIMER + 65535) /*% * This structure is actually just the common prefix of a timer manager @@ -124,7 +124,7 @@ struct isc_timer { unsigned int magic; }; -#define ISCAPI_TIMER_MAGIC ISC_MAGIC('A', 't', 'm', 'r') +#define ISCAPI_TIMER_MAGIC ISC_MAGIC('A', 't', 'm', 'r') #define ISCAPI_TIMER_VALID(s) ((s) != NULL && (s)->magic == ISCAPI_TIMER_MAGIC) /*** diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h index a23b8e2158..c87dd750a8 100644 --- a/lib/isc/include/isc/util.h +++ b/lib/isc/include/isc/util.h @@ -165,22 +165,22 @@ */ #include /* Contractual promise. */ -#define LIST(type) ISC_LIST(type) -#define INIT_LIST(type) ISC_LIST_INIT(type) -#define LINK(type) ISC_LINK(type) -#define INIT_LINK(elt, link) ISC_LINK_INIT(elt, link) -#define HEAD(list) ISC_LIST_HEAD(list) -#define TAIL(list) ISC_LIST_TAIL(list) -#define EMPTY(list) ISC_LIST_EMPTY(list) -#define PREV(elt, link) ISC_LIST_PREV(elt, link) -#define NEXT(elt, link) ISC_LIST_NEXT(elt, link) -#define APPEND(list, elt, link) ISC_LIST_APPEND(list, elt, link) -#define PREPEND(list, elt, link) ISC_LIST_PREPEND(list, elt, link) -#define UNLINK(list, elt, link) ISC_LIST_UNLINK(list, elt, link) -#define ENQUEUE(list, elt, link) ISC_LIST_APPEND(list, elt, link) -#define DEQUEUE(list, elt, link) ISC_LIST_UNLINK(list, elt, link) -#define INSERTBEFORE(li, b, e, ln) ISC_LIST_INSERTBEFORE(li, b, e, ln) -#define INSERTAFTER(li, a, e, ln) ISC_LIST_INSERTAFTER(li, a, e, ln) +#define LIST(type) ISC_LIST(type) +#define INIT_LIST(type) ISC_LIST_INIT(type) +#define LINK(type) ISC_LINK(type) +#define INIT_LINK(elt, link) ISC_LINK_INIT(elt, link) +#define HEAD(list) ISC_LIST_HEAD(list) +#define TAIL(list) ISC_LIST_TAIL(list) +#define EMPTY(list) ISC_LIST_EMPTY(list) +#define PREV(elt, link) ISC_LIST_PREV(elt, link) +#define NEXT(elt, link) ISC_LIST_NEXT(elt, link) +#define APPEND(list, elt, link) ISC_LIST_APPEND(list, elt, link) +#define PREPEND(list, elt, link) ISC_LIST_PREPEND(list, elt, link) +#define UNLINK(list, elt, link) ISC_LIST_UNLINK(list, elt, link) +#define ENQUEUE(list, elt, link) ISC_LIST_APPEND(list, elt, link) +#define DEQUEUE(list, elt, link) ISC_LIST_UNLINK(list, elt, link) +#define INSERTBEFORE(li, b, e, ln) ISC_LIST_INSERTBEFORE(li, b, e, ln) +#define INSERTAFTER(li, a, e, ln) ISC_LIST_INSERTAFTER(li, a, e, ln) #define APPENDLIST(list1, list2, link) ISC_LIST_APPENDLIST(list1, list2, link) /*% @@ -263,11 +263,11 @@ mock_assert(const int result, const char *const expression, #include /* Contractual promise. */ /*% Require Assertion */ -#define REQUIRE(e) ISC_REQUIRE(e) +#define REQUIRE(e) ISC_REQUIRE(e) /*% Ensure Assertion */ -#define ENSURE(e) ISC_ENSURE(e) +#define ENSURE(e) ISC_ENSURE(e) /*% Insist Assertion */ -#define INSIST(e) ISC_INSIST(e) +#define INSIST(e) ISC_INSIST(e) /*% Invariant Assertion */ #define INVARIANT(e) ISC_INVARIANT(e) diff --git a/lib/isc/include/pk11/result.h b/lib/isc/include/pk11/result.h index adc4b9c69e..a45be327b0 100644 --- a/lib/isc/include/pk11/result.h +++ b/lib/isc/include/pk11/result.h @@ -26,11 +26,11 @@ */ #include /* Contractual promise. */ -#define PK11_R_INITFAILED (ISC_RESULTCLASS_PK11 + 0) -#define PK11_R_NOPROVIDER (ISC_RESULTCLASS_PK11 + 1) +#define PK11_R_INITFAILED (ISC_RESULTCLASS_PK11 + 0) +#define PK11_R_NOPROVIDER (ISC_RESULTCLASS_PK11 + 1) #define PK11_R_NORANDOMSERVICE (ISC_RESULTCLASS_PK11 + 2) #define PK11_R_NODIGESTSERVICE (ISC_RESULTCLASS_PK11 + 3) -#define PK11_R_NOAESSERVICE (ISC_RESULTCLASS_PK11 + 4) +#define PK11_R_NOAESSERVICE (ISC_RESULTCLASS_PK11 + 4) #define PK11_R_NRESULTS 5 /* Number of results */ diff --git a/lib/isc/include/pkcs11/pkcs11.h b/lib/isc/include/pkcs11/pkcs11.h index 4f3bff7c98..cd565ee64f 100644 --- a/lib/isc/include/pkcs11/pkcs11.h +++ b/lib/isc/include/pkcs11/pkcs11.h @@ -60,8 +60,8 @@ extern "C" { /* The version of cryptoki we implement. The revision is changed with * each modification of this file. */ -#define CRYPTOKI_VERSION_MAJOR 2 -#define CRYPTOKI_VERSION_MINOR 40 +#define CRYPTOKI_VERSION_MAJOR 2 +#define CRYPTOKI_VERSION_MINOR 40 #define P11_KIT_CRYPTOKI_VERSION_REVISION 0 /* Compatibility interface is default, unless CRYPTOKI_GNU is @@ -98,52 +98,52 @@ extern "C" { #define ck_flags_t CK_FLAGS #define ck_version _CK_VERSION -#define ck_info _CK_INFO -#define cryptoki_version cryptokiVersion -#define manufacturer_id manufacturerID +#define ck_info _CK_INFO +#define cryptoki_version cryptokiVersion +#define manufacturer_id manufacturerID #define library_description libraryDescription -#define library_version libraryVersion +#define library_version libraryVersion #define ck_notification_t CK_NOTIFICATION -#define ck_slot_id_t CK_SLOT_ID +#define ck_slot_id_t CK_SLOT_ID -#define ck_slot_info _CK_SLOT_INFO +#define ck_slot_info _CK_SLOT_INFO #define slot_description slotDescription #define hardware_version hardwareVersion #define firmware_version firmwareVersion -#define ck_token_info _CK_TOKEN_INFO -#define serial_number serialNumber -#define max_session_count ulMaxSessionCount -#define session_count ulSessionCount +#define ck_token_info _CK_TOKEN_INFO +#define serial_number serialNumber +#define max_session_count ulMaxSessionCount +#define session_count ulSessionCount #define max_rw_session_count ulMaxRwSessionCount -#define rw_session_count ulRwSessionCount -#define max_pin_len ulMaxPinLen -#define min_pin_len ulMinPinLen -#define total_public_memory ulTotalPublicMemory -#define free_public_memory ulFreePublicMemory +#define rw_session_count ulRwSessionCount +#define max_pin_len ulMaxPinLen +#define min_pin_len ulMinPinLen +#define total_public_memory ulTotalPublicMemory +#define free_public_memory ulFreePublicMemory #define total_private_memory ulTotalPrivateMemory -#define free_private_memory ulFreePrivateMemory -#define utc_time utcTime +#define free_private_memory ulFreePrivateMemory +#define utc_time utcTime #define ck_session_handle_t CK_SESSION_HANDLE -#define ck_user_type_t CK_USER_TYPE -#define ck_state_t CK_STATE +#define ck_user_type_t CK_USER_TYPE +#define ck_state_t CK_STATE #define ck_session_info _CK_SESSION_INFO -#define slot_id slotID -#define device_error ulDeviceError +#define slot_id slotID +#define device_error ulDeviceError -#define ck_object_handle_t CK_OBJECT_HANDLE -#define ck_object_class_t CK_OBJECT_CLASS -#define ck_hw_feature_type_t CK_HW_FEATURE_TYPE -#define ck_key_type_t CK_KEY_TYPE +#define ck_object_handle_t CK_OBJECT_HANDLE +#define ck_object_class_t CK_OBJECT_CLASS +#define ck_hw_feature_type_t CK_HW_FEATURE_TYPE +#define ck_key_type_t CK_KEY_TYPE #define ck_certificate_type_t CK_CERTIFICATE_TYPE -#define ck_attribute_type_t CK_ATTRIBUTE_TYPE +#define ck_attribute_type_t CK_ATTRIBUTE_TYPE #define ck_attribute _CK_ATTRIBUTE -#define value pValue -#define value_len ulValueLen +#define value pValue +#define value_len ulValueLen #define count ulCount @@ -151,59 +151,59 @@ extern "C" { #define ck_mechanism_type_t CK_MECHANISM_TYPE -#define ck_mechanism _CK_MECHANISM -#define parameter pParameter +#define ck_mechanism _CK_MECHANISM +#define parameter pParameter #define parameter_len ulParameterLen #define params pParams #define ck_mechanism_info _CK_MECHANISM_INFO -#define min_key_size ulMinKeySize -#define max_key_size ulMaxKeySize +#define min_key_size ulMinKeySize +#define max_key_size ulMaxKeySize -#define ck_param_type CK_PARAM_TYPE -#define ck_otp_param CK_OTP_PARAM -#define ck_otp_params CK_OTP_PARAMS +#define ck_param_type CK_PARAM_TYPE +#define ck_otp_param CK_OTP_PARAM +#define ck_otp_params CK_OTP_PARAMS #define ck_otp_signature_info CK_OTP_SIGNATURE_INFO -#define ck_rv_t CK_RV +#define ck_rv_t CK_RV #define ck_notify_t CK_NOTIFY #define ck_function_list _CK_FUNCTION_LIST -#define ck_createmutex_t CK_CREATEMUTEX +#define ck_createmutex_t CK_CREATEMUTEX #define ck_destroymutex_t CK_DESTROYMUTEX -#define ck_lockmutex_t CK_LOCKMUTEX -#define ck_unlockmutex_t CK_UNLOCKMUTEX +#define ck_lockmutex_t CK_LOCKMUTEX +#define ck_unlockmutex_t CK_UNLOCKMUTEX #define ck_c_initialize_args _CK_C_INITIALIZE_ARGS -#define create_mutex CreateMutex -#define destroy_mutex DestroyMutex -#define lock_mutex LockMutex -#define unlock_mutex UnlockMutex -#define reserved pReserved +#define create_mutex CreateMutex +#define destroy_mutex DestroyMutex +#define lock_mutex LockMutex +#define unlock_mutex UnlockMutex +#define reserved pReserved -#define ck_rsa_pkcs_mgf_type_t CK_RSA_PKCS_MGF_TYPE +#define ck_rsa_pkcs_mgf_type_t CK_RSA_PKCS_MGF_TYPE #define ck_rsa_pkcs_oaep_source_type_t CK_RSA_PKCS_OAEP_SOURCE_TYPE -#define hash_alg hashAlg -#define s_len sLen -#define source_data pSourceData -#define source_data_len ulSourceDataLen +#define hash_alg hashAlg +#define s_len sLen +#define source_data pSourceData +#define source_data_len ulSourceDataLen -#define counter_bits ulCounterBits -#define iv_ptr pIv -#define iv_len ulIvLen -#define iv_bits ulIvBits -#define aad_ptr pAAD -#define aad_len ulAADLen -#define tag_bits ulTagBits +#define counter_bits ulCounterBits +#define iv_ptr pIv +#define iv_len ulIvLen +#define iv_bits ulIvBits +#define aad_ptr pAAD +#define aad_len ulAADLen +#define tag_bits ulTagBits #define shared_data_len ulSharedDataLen -#define shared_data pSharedData +#define shared_data pSharedData #define public_data_len ulPublicDataLen -#define public_data pPublicData -#define string_data pData +#define public_data pPublicData +#define string_data pData #define string_data_len ulLen -#define data_params pData +#define data_params pData #endif /* CRYPTOKI_COMPAT */ typedef unsigned long ck_flags_t; @@ -235,10 +235,10 @@ struct ck_slot_info { struct ck_version firmware_version; }; -#define CKF_TOKEN_PRESENT (1UL << 0) +#define CKF_TOKEN_PRESENT (1UL << 0) #define CKF_REMOVABLE_DEVICE (1UL << 1) -#define CKF_HW_SLOT (1UL << 2) -#define CKF_ARRAY_ATTRIBUTE (1UL << 30) +#define CKF_HW_SLOT (1UL << 2) +#define CKF_ARRAY_ATTRIBUTE (1UL << 30) struct ck_token_info { unsigned char label[32]; @@ -261,27 +261,27 @@ struct ck_token_info { unsigned char utc_time[16]; }; -#define CKF_RNG (1UL << 0) -#define CKF_WRITE_PROTECTED (1UL << 1) -#define CKF_LOGIN_REQUIRED (1UL << 2) -#define CKF_USER_PIN_INITIALIZED (1UL << 3) -#define CKF_RESTORE_KEY_NOT_NEEDED (1UL << 5) -#define CKF_CLOCK_ON_TOKEN (1UL << 6) +#define CKF_RNG (1UL << 0) +#define CKF_WRITE_PROTECTED (1UL << 1) +#define CKF_LOGIN_REQUIRED (1UL << 2) +#define CKF_USER_PIN_INITIALIZED (1UL << 3) +#define CKF_RESTORE_KEY_NOT_NEEDED (1UL << 5) +#define CKF_CLOCK_ON_TOKEN (1UL << 6) #define CKF_PROTECTED_AUTHENTICATION_PATH (1UL << 8) -#define CKF_DUAL_CRYPTO_OPERATIONS (1UL << 9) -#define CKF_TOKEN_INITIALIZED (1UL << 10) -#define CKF_SECONDARY_AUTHENTICATION (1UL << 11) -#define CKF_USER_PIN_COUNT_LOW (1UL << 16) -#define CKF_USER_PIN_FINAL_TRY (1UL << 17) -#define CKF_USER_PIN_LOCKED (1UL << 18) -#define CKF_USER_PIN_TO_BE_CHANGED (1UL << 19) -#define CKF_SO_PIN_COUNT_LOW (1UL << 20) -#define CKF_SO_PIN_FINAL_TRY (1UL << 21) -#define CKF_SO_PIN_LOCKED (1UL << 22) -#define CKF_SO_PIN_TO_BE_CHANGED (1UL << 23) +#define CKF_DUAL_CRYPTO_OPERATIONS (1UL << 9) +#define CKF_TOKEN_INITIALIZED (1UL << 10) +#define CKF_SECONDARY_AUTHENTICATION (1UL << 11) +#define CKF_USER_PIN_COUNT_LOW (1UL << 16) +#define CKF_USER_PIN_FINAL_TRY (1UL << 17) +#define CKF_USER_PIN_LOCKED (1UL << 18) +#define CKF_USER_PIN_TO_BE_CHANGED (1UL << 19) +#define CKF_SO_PIN_COUNT_LOW (1UL << 20) +#define CKF_SO_PIN_FINAL_TRY (1UL << 21) +#define CKF_SO_PIN_LOCKED (1UL << 22) +#define CKF_SO_PIN_TO_BE_CHANGED (1UL << 23) #define CK_UNAVAILABLE_INFORMATION ((unsigned long)-1L) -#define CK_EFFECTIVELY_INFINITE (0UL) +#define CK_EFFECTIVELY_INFINITE (0UL) typedef unsigned long ck_session_handle_t; @@ -289,8 +289,8 @@ typedef unsigned long ck_session_handle_t; typedef unsigned long ck_user_type_t; -#define CKU_SO (0UL) -#define CKU_USER (1UL) +#define CKU_SO (0UL) +#define CKU_USER (1UL) #define CKU_CONTEXT_SPECIFIC (2UL) typedef unsigned long ck_state_t; @@ -299,7 +299,7 @@ typedef unsigned long ck_state_t; #define CKS_RO_USER_FUNCTIONS (1UL) #define CKS_RW_PUBLIC_SESSION (2UL) #define CKS_RW_USER_FUNCTIONS (3UL) -#define CKS_RW_SO_FUNCTIONS (4UL) +#define CKS_RW_SO_FUNCTIONS (4UL) struct ck_session_info { ck_slot_id_t slot_id; @@ -308,196 +308,196 @@ struct ck_session_info { unsigned long device_error; }; -#define CKF_RW_SESSION (1UL << 1) +#define CKF_RW_SESSION (1UL << 1) #define CKF_SERIAL_SESSION (1UL << 2) typedef unsigned long ck_object_handle_t; typedef unsigned long ck_object_class_t; -#define CKO_DATA (0UL) -#define CKO_CERTIFICATE (1UL) -#define CKO_PUBLIC_KEY (2UL) -#define CKO_PRIVATE_KEY (3UL) -#define CKO_SECRET_KEY (4UL) -#define CKO_HW_FEATURE (5UL) +#define CKO_DATA (0UL) +#define CKO_CERTIFICATE (1UL) +#define CKO_PUBLIC_KEY (2UL) +#define CKO_PRIVATE_KEY (3UL) +#define CKO_SECRET_KEY (4UL) +#define CKO_HW_FEATURE (5UL) #define CKO_DOMAIN_PARAMETERS (6UL) -#define CKO_MECHANISM (7UL) -#define CKO_OTP_KEY (8UL) -#define CKO_VENDOR_DEFINED ((unsigned long)(1UL << 31)) +#define CKO_MECHANISM (7UL) +#define CKO_OTP_KEY (8UL) +#define CKO_VENDOR_DEFINED ((unsigned long)(1UL << 31)) typedef unsigned long ck_hw_feature_type_t; #define CKH_MONOTONIC_COUNTER (1UL) -#define CKH_CLOCK (2UL) -#define CKH_USER_INTERFACE (3UL) -#define CKH_VENDOR_DEFINED ((unsigned long)(1UL << 31)) +#define CKH_CLOCK (2UL) +#define CKH_USER_INTERFACE (3UL) +#define CKH_VENDOR_DEFINED ((unsigned long)(1UL << 31)) typedef unsigned long ck_key_type_t; -#define CKK_RSA (0UL) -#define CKK_DSA (1UL) -#define CKK_DH (2UL) -#define CKK_ECDSA (3UL) -#define CKK_EC (3UL) -#define CKK_X9_42_DH (4UL) -#define CKK_KEA (5UL) +#define CKK_RSA (0UL) +#define CKK_DSA (1UL) +#define CKK_DH (2UL) +#define CKK_ECDSA (3UL) +#define CKK_EC (3UL) +#define CKK_X9_42_DH (4UL) +#define CKK_KEA (5UL) #define CKK_GENERIC_SECRET (0x10UL) -#define CKK_RC2 (0x11UL) -#define CKK_RC4 (0x12UL) -#define CKK_DES (0x13UL) -#define CKK_DES2 (0x14UL) -#define CKK_DES3 (0x15UL) -#define CKK_CAST (0x16UL) -#define CKK_CAST3 (0x17UL) -#define CKK_CAST128 (0x18UL) -#define CKK_RC5 (0x19UL) -#define CKK_IDEA (0x1aUL) -#define CKK_SKIPJACK (0x1bUL) -#define CKK_BATON (0x1cUL) -#define CKK_JUNIPER (0x1dUL) -#define CKK_CDMF (0x1eUL) -#define CKK_AES (0x1fUL) -#define CKK_BLOWFISH (0x20UL) -#define CKK_TWOFISH (0x21UL) -#define CKK_SECURID (0x22UL) -#define CKK_HOTP (0x23UL) -#define CKK_ACTI (0x24UL) -#define CKK_CAMELLIA (0x25UL) -#define CKK_ARIA (0x26UL) -#define CKK_MD5_HMAC (0x27UL) -#define CKK_SHA_1_HMAC (0x28UL) +#define CKK_RC2 (0x11UL) +#define CKK_RC4 (0x12UL) +#define CKK_DES (0x13UL) +#define CKK_DES2 (0x14UL) +#define CKK_DES3 (0x15UL) +#define CKK_CAST (0x16UL) +#define CKK_CAST3 (0x17UL) +#define CKK_CAST128 (0x18UL) +#define CKK_RC5 (0x19UL) +#define CKK_IDEA (0x1aUL) +#define CKK_SKIPJACK (0x1bUL) +#define CKK_BATON (0x1cUL) +#define CKK_JUNIPER (0x1dUL) +#define CKK_CDMF (0x1eUL) +#define CKK_AES (0x1fUL) +#define CKK_BLOWFISH (0x20UL) +#define CKK_TWOFISH (0x21UL) +#define CKK_SECURID (0x22UL) +#define CKK_HOTP (0x23UL) +#define CKK_ACTI (0x24UL) +#define CKK_CAMELLIA (0x25UL) +#define CKK_ARIA (0x26UL) +#define CKK_MD5_HMAC (0x27UL) +#define CKK_SHA_1_HMAC (0x28UL) #define CKK_RIPEMD128_HMAC (0x29UL) #define CKK_RIPEMD160_HMAC (0x2aUL) -#define CKK_SHA256_HMAC (0x2bUL) -#define CKK_SHA384_HMAC (0x2cUL) -#define CKK_SHA512_HMAC (0x2dUL) -#define CKK_SHA224_HMAC (0x2eUL) -#define CKK_SEED (0x2fUL) -#define CKK_GOSTR3410 (0x30UL) -#define CKK_GOSTR3411 (0x31UL) -#define CKK_GOST28147 (0x32UL) -#define CKK_EC_EDWARDS (0x40UL) +#define CKK_SHA256_HMAC (0x2bUL) +#define CKK_SHA384_HMAC (0x2cUL) +#define CKK_SHA512_HMAC (0x2dUL) +#define CKK_SHA224_HMAC (0x2eUL) +#define CKK_SEED (0x2fUL) +#define CKK_GOSTR3410 (0x30UL) +#define CKK_GOSTR3411 (0x31UL) +#define CKK_GOST28147 (0x32UL) +#define CKK_EC_EDWARDS (0x40UL) #define CKK_VENDOR_DEFINED ((unsigned long)(1UL << 31)) typedef unsigned long ck_certificate_type_t; -#define CKC_X_509 (0UL) +#define CKC_X_509 (0UL) #define CKC_X_509_ATTR_CERT (1UL) -#define CKC_WTLS (2UL) -#define CKC_VENDOR_DEFINED ((unsigned long)(1UL << 31)) +#define CKC_WTLS (2UL) +#define CKC_VENDOR_DEFINED ((unsigned long)(1UL << 31)) #define CKC_OPENPGP (CKC_VENDOR_DEFINED | 0x504750UL) typedef unsigned long ck_attribute_type_t; -#define CKA_CLASS (0UL) -#define CKA_TOKEN (1UL) -#define CKA_PRIVATE (2UL) -#define CKA_LABEL (3UL) -#define CKA_APPLICATION (0x10UL) -#define CKA_VALUE (0x11UL) -#define CKA_OBJECT_ID (0x12UL) -#define CKA_CERTIFICATE_TYPE (0x80UL) -#define CKA_ISSUER (0x81UL) -#define CKA_SERIAL_NUMBER (0x82UL) -#define CKA_AC_ISSUER (0x83UL) -#define CKA_OWNER (0x84UL) -#define CKA_ATTR_TYPES (0x85UL) -#define CKA_TRUSTED (0x86UL) -#define CKA_CERTIFICATE_CATEGORY (0x87UL) -#define CKA_JAVA_MIDP_SECURITY_DOMAIN (0x88UL) -#define CKA_URL (0x89UL) +#define CKA_CLASS (0UL) +#define CKA_TOKEN (1UL) +#define CKA_PRIVATE (2UL) +#define CKA_LABEL (3UL) +#define CKA_APPLICATION (0x10UL) +#define CKA_VALUE (0x11UL) +#define CKA_OBJECT_ID (0x12UL) +#define CKA_CERTIFICATE_TYPE (0x80UL) +#define CKA_ISSUER (0x81UL) +#define CKA_SERIAL_NUMBER (0x82UL) +#define CKA_AC_ISSUER (0x83UL) +#define CKA_OWNER (0x84UL) +#define CKA_ATTR_TYPES (0x85UL) +#define CKA_TRUSTED (0x86UL) +#define CKA_CERTIFICATE_CATEGORY (0x87UL) +#define CKA_JAVA_MIDP_SECURITY_DOMAIN (0x88UL) +#define CKA_URL (0x89UL) #define CKA_HASH_OF_SUBJECT_PUBLIC_KEY (0x8aUL) -#define CKA_HASH_OF_ISSUER_PUBLIC_KEY (0x8bUL) -#define CKA_NAME_HASH_ALGORITHM (0x8cUL) -#define CKA_CHECK_VALUE (0x90UL) -#define CKA_KEY_TYPE (0x100UL) -#define CKA_SUBJECT (0x101UL) -#define CKA_ID (0x102UL) -#define CKA_SENSITIVE (0x103UL) -#define CKA_ENCRYPT (0x104UL) -#define CKA_DECRYPT (0x105UL) -#define CKA_WRAP (0x106UL) -#define CKA_UNWRAP (0x107UL) -#define CKA_SIGN (0x108UL) -#define CKA_SIGN_RECOVER (0x109UL) -#define CKA_VERIFY (0x10aUL) -#define CKA_VERIFY_RECOVER (0x10bUL) -#define CKA_DERIVE (0x10cUL) -#define CKA_START_DATE (0x110UL) -#define CKA_END_DATE (0x111UL) -#define CKA_MODULUS (0x120UL) -#define CKA_MODULUS_BITS (0x121UL) -#define CKA_PUBLIC_EXPONENT (0x122UL) -#define CKA_PRIVATE_EXPONENT (0x123UL) -#define CKA_PRIME_1 (0x124UL) -#define CKA_PRIME_2 (0x125UL) -#define CKA_EXPONENT_1 (0x126UL) -#define CKA_EXPONENT_2 (0x127UL) -#define CKA_COEFFICIENT (0x128UL) -#define CKA_PUBLIC_KEY_INFO (0x129UL) -#define CKA_PRIME (0x130UL) -#define CKA_SUBPRIME (0x131UL) -#define CKA_BASE (0x132UL) -#define CKA_PRIME_BITS (0x133UL) -#define CKA_SUB_PRIME_BITS (0x134UL) -#define CKA_VALUE_BITS (0x160UL) -#define CKA_VALUE_LEN (0x161UL) -#define CKA_EXTRACTABLE (0x162UL) -#define CKA_LOCAL (0x163UL) -#define CKA_NEVER_EXTRACTABLE (0x164UL) -#define CKA_ALWAYS_SENSITIVE (0x165UL) -#define CKA_KEY_GEN_MECHANISM (0x166UL) -#define CKA_MODIFIABLE (0x170UL) -#define CKA_COPYABLE (0x171UL) -#define CKA_DESTROYABLE (0x172UL) -#define CKA_ECDSA_PARAMS (0x180UL) -#define CKA_EC_PARAMS (0x180UL) -#define CKA_EC_POINT (0x181UL) -#define CKA_SECONDARY_AUTH (0x200UL) -#define CKA_AUTH_PIN_FLAGS (0x201UL) -#define CKA_ALWAYS_AUTHENTICATE (0x202UL) -#define CKA_WRAP_WITH_TRUSTED (0x210UL) -#define CKA_OTP_FORMAT (0x220UL) -#define CKA_OTP_LENGTH (0x221UL) -#define CKA_OTP_TIME_INTERVAL (0x222UL) -#define CKA_OTP_USER_FRIENDLY_MODE (0x223UL) -#define CKA_OTP_CHALLENGE_REQUIREMENT (0x224UL) -#define CKA_OTP_TIME_REQUIREMENT (0x225UL) -#define CKA_OTP_COUNTER_REQUIREMENT (0x226UL) -#define CKA_OTP_PIN_REQUIREMENT (0x227UL) -#define CKA_OTP_USER_IDENTIFIER (0x22AUL) -#define CKA_OTP_SERVICE_IDENTIFIER (0x22BUL) -#define CKA_OTP_SERVICE_LOGO (0x22CUL) -#define CKA_OTP_SERVICE_LOGO_TYPE (0x22DUL) -#define CKA_OTP_COUNTER (0x22EUL) -#define CKA_OTP_TIME (0x22FUL) -#define CKA_GOSTR3410_PARAMS (0x250UL) -#define CKA_GOSTR3411_PARAMS (0x251UL) -#define CKA_GOST28147_PARAMS (0x252UL) -#define CKA_HW_FEATURE_TYPE (0x300UL) -#define CKA_RESET_ON_INIT (0x301UL) -#define CKA_HAS_RESET (0x302UL) -#define CKA_PIXEL_X (0x400UL) -#define CKA_PIXEL_Y (0x401UL) -#define CKA_RESOLUTION (0x402UL) -#define CKA_CHAR_ROWS (0x403UL) -#define CKA_CHAR_COLUMNS (0x404UL) -#define CKA_COLOR (0x405UL) -#define CKA_BITS_PER_PIXEL (0x406UL) -#define CKA_CHAR_SETS (0x480UL) -#define CKA_ENCODING_METHODS (0x481UL) -#define CKA_MIME_TYPES (0x482UL) -#define CKA_MECHANISM_TYPE (0x500UL) -#define CKA_REQUIRED_CMS_ATTRIBUTES (0x501UL) -#define CKA_DEFAULT_CMS_ATTRIBUTES (0x502UL) -#define CKA_SUPPORTED_CMS_ATTRIBUTES (0x503UL) -#define CKA_WRAP_TEMPLATE (CKF_ARRAY_ATTRIBUTE | 0x211UL) -#define CKA_UNWRAP_TEMPLATE (CKF_ARRAY_ATTRIBUTE | 0x212UL) -#define CKA_DERIVE_TEMPLATE (CKF_ARRAY_ATTRIBUTE | 0x213UL) -#define CKA_ALLOWED_MECHANISMS (CKF_ARRAY_ATTRIBUTE | 0x600UL) -#define CKA_VENDOR_DEFINED ((unsigned long)(1UL << 31)) +#define CKA_HASH_OF_ISSUER_PUBLIC_KEY (0x8bUL) +#define CKA_NAME_HASH_ALGORITHM (0x8cUL) +#define CKA_CHECK_VALUE (0x90UL) +#define CKA_KEY_TYPE (0x100UL) +#define CKA_SUBJECT (0x101UL) +#define CKA_ID (0x102UL) +#define CKA_SENSITIVE (0x103UL) +#define CKA_ENCRYPT (0x104UL) +#define CKA_DECRYPT (0x105UL) +#define CKA_WRAP (0x106UL) +#define CKA_UNWRAP (0x107UL) +#define CKA_SIGN (0x108UL) +#define CKA_SIGN_RECOVER (0x109UL) +#define CKA_VERIFY (0x10aUL) +#define CKA_VERIFY_RECOVER (0x10bUL) +#define CKA_DERIVE (0x10cUL) +#define CKA_START_DATE (0x110UL) +#define CKA_END_DATE (0x111UL) +#define CKA_MODULUS (0x120UL) +#define CKA_MODULUS_BITS (0x121UL) +#define CKA_PUBLIC_EXPONENT (0x122UL) +#define CKA_PRIVATE_EXPONENT (0x123UL) +#define CKA_PRIME_1 (0x124UL) +#define CKA_PRIME_2 (0x125UL) +#define CKA_EXPONENT_1 (0x126UL) +#define CKA_EXPONENT_2 (0x127UL) +#define CKA_COEFFICIENT (0x128UL) +#define CKA_PUBLIC_KEY_INFO (0x129UL) +#define CKA_PRIME (0x130UL) +#define CKA_SUBPRIME (0x131UL) +#define CKA_BASE (0x132UL) +#define CKA_PRIME_BITS (0x133UL) +#define CKA_SUB_PRIME_BITS (0x134UL) +#define CKA_VALUE_BITS (0x160UL) +#define CKA_VALUE_LEN (0x161UL) +#define CKA_EXTRACTABLE (0x162UL) +#define CKA_LOCAL (0x163UL) +#define CKA_NEVER_EXTRACTABLE (0x164UL) +#define CKA_ALWAYS_SENSITIVE (0x165UL) +#define CKA_KEY_GEN_MECHANISM (0x166UL) +#define CKA_MODIFIABLE (0x170UL) +#define CKA_COPYABLE (0x171UL) +#define CKA_DESTROYABLE (0x172UL) +#define CKA_ECDSA_PARAMS (0x180UL) +#define CKA_EC_PARAMS (0x180UL) +#define CKA_EC_POINT (0x181UL) +#define CKA_SECONDARY_AUTH (0x200UL) +#define CKA_AUTH_PIN_FLAGS (0x201UL) +#define CKA_ALWAYS_AUTHENTICATE (0x202UL) +#define CKA_WRAP_WITH_TRUSTED (0x210UL) +#define CKA_OTP_FORMAT (0x220UL) +#define CKA_OTP_LENGTH (0x221UL) +#define CKA_OTP_TIME_INTERVAL (0x222UL) +#define CKA_OTP_USER_FRIENDLY_MODE (0x223UL) +#define CKA_OTP_CHALLENGE_REQUIREMENT (0x224UL) +#define CKA_OTP_TIME_REQUIREMENT (0x225UL) +#define CKA_OTP_COUNTER_REQUIREMENT (0x226UL) +#define CKA_OTP_PIN_REQUIREMENT (0x227UL) +#define CKA_OTP_USER_IDENTIFIER (0x22AUL) +#define CKA_OTP_SERVICE_IDENTIFIER (0x22BUL) +#define CKA_OTP_SERVICE_LOGO (0x22CUL) +#define CKA_OTP_SERVICE_LOGO_TYPE (0x22DUL) +#define CKA_OTP_COUNTER (0x22EUL) +#define CKA_OTP_TIME (0x22FUL) +#define CKA_GOSTR3410_PARAMS (0x250UL) +#define CKA_GOSTR3411_PARAMS (0x251UL) +#define CKA_GOST28147_PARAMS (0x252UL) +#define CKA_HW_FEATURE_TYPE (0x300UL) +#define CKA_RESET_ON_INIT (0x301UL) +#define CKA_HAS_RESET (0x302UL) +#define CKA_PIXEL_X (0x400UL) +#define CKA_PIXEL_Y (0x401UL) +#define CKA_RESOLUTION (0x402UL) +#define CKA_CHAR_ROWS (0x403UL) +#define CKA_CHAR_COLUMNS (0x404UL) +#define CKA_COLOR (0x405UL) +#define CKA_BITS_PER_PIXEL (0x406UL) +#define CKA_CHAR_SETS (0x480UL) +#define CKA_ENCODING_METHODS (0x481UL) +#define CKA_MIME_TYPES (0x482UL) +#define CKA_MECHANISM_TYPE (0x500UL) +#define CKA_REQUIRED_CMS_ATTRIBUTES (0x501UL) +#define CKA_DEFAULT_CMS_ATTRIBUTES (0x502UL) +#define CKA_SUPPORTED_CMS_ATTRIBUTES (0x503UL) +#define CKA_WRAP_TEMPLATE (CKF_ARRAY_ATTRIBUTE | 0x211UL) +#define CKA_UNWRAP_TEMPLATE (CKF_ARRAY_ATTRIBUTE | 0x212UL) +#define CKA_DERIVE_TEMPLATE (CKF_ARRAY_ATTRIBUTE | 0x213UL) +#define CKA_ALLOWED_MECHANISMS (CKF_ARRAY_ATTRIBUTE | 0x600UL) +#define CKA_VENDOR_DEFINED ((unsigned long)(1UL << 31)) struct ck_attribute { ck_attribute_type_t type; @@ -513,373 +513,373 @@ struct ck_date { typedef unsigned long ck_mechanism_type_t; -#define CKM_RSA_PKCS_KEY_PAIR_GEN (0UL) -#define CKM_RSA_PKCS (1UL) -#define CKM_RSA_9796 (2UL) -#define CKM_RSA_X_509 (3UL) -#define CKM_MD2_RSA_PKCS (4UL) -#define CKM_MD5_RSA_PKCS (5UL) -#define CKM_SHA1_RSA_PKCS (6UL) -#define CKM_RIPEMD128_RSA_PKCS (7UL) -#define CKM_RIPEMD160_RSA_PKCS (8UL) -#define CKM_RSA_PKCS_OAEP (9UL) -#define CKM_RSA_X9_31_KEY_PAIR_GEN (0xaUL) -#define CKM_RSA_X9_31 (0xbUL) -#define CKM_SHA1_RSA_X9_31 (0xcUL) -#define CKM_RSA_PKCS_PSS (0xdUL) -#define CKM_SHA1_RSA_PKCS_PSS (0xeUL) -#define CKM_DSA_KEY_PAIR_GEN (0x10UL) -#define CKM_DSA (0x11UL) -#define CKM_DSA_SHA1 (0x12UL) -#define CKM_DSA_SHA224 (0x13UL) -#define CKM_DSA_SHA256 (0x14UL) -#define CKM_DSA_SHA384 (0x15UL) -#define CKM_DSA_SHA512 (0x16UL) -#define CKM_DH_PKCS_KEY_PAIR_GEN (0x20UL) -#define CKM_DH_PKCS_DERIVE (0x21UL) -#define CKM_X9_42_DH_KEY_PAIR_GEN (0x30UL) -#define CKM_X9_42_DH_DERIVE (0x31UL) -#define CKM_X9_42_DH_HYBRID_DERIVE (0x32UL) -#define CKM_X9_42_MQV_DERIVE (0x33UL) -#define CKM_SHA256_RSA_PKCS (0x40UL) -#define CKM_SHA384_RSA_PKCS (0x41UL) -#define CKM_SHA512_RSA_PKCS (0x42UL) -#define CKM_SHA256_RSA_PKCS_PSS (0x43UL) -#define CKM_SHA384_RSA_PKCS_PSS (0x44UL) -#define CKM_SHA512_RSA_PKCS_PSS (0x45UL) -#define CKM_SHA512_224 (0x48UL) -#define CKM_SHA512_224_HMAC (0x49UL) -#define CKM_SHA512_224_HMAC_GENERAL (0x4aUL) -#define CKM_SHA512_224_KEY_DERIVATION (0x4bUL) -#define CKM_SHA512_256 (0x4cUL) -#define CKM_SHA512_256_HMAC (0x4dUL) -#define CKM_SHA512_256_HMAC_GENERAL (0x4eUL) -#define CKM_SHA512_256_KEY_DERIVATION (0x4fUL) -#define CKM_SHA512_T (0x50UL) -#define CKM_SHA512_T_HMAC (0x51UL) -#define CKM_SHA512_T_HMAC_GENERAL (0x52UL) -#define CKM_SHA512_T_KEY_DERIVATION (0x53UL) -#define CKM_RC2_KEY_GEN (0x100UL) -#define CKM_RC2_ECB (0x101UL) -#define CKM_RC2_CBC (0x102UL) -#define CKM_RC2_MAC (0x103UL) -#define CKM_RC2_MAC_GENERAL (0x104UL) -#define CKM_RC2_CBC_PAD (0x105UL) -#define CKM_RC4_KEY_GEN (0x110UL) -#define CKM_RC4 (0x111UL) -#define CKM_DES_KEY_GEN (0x120UL) -#define CKM_DES_ECB (0x121UL) -#define CKM_DES_CBC (0x122UL) -#define CKM_DES_MAC (0x123UL) -#define CKM_DES_MAC_GENERAL (0x124UL) -#define CKM_DES_CBC_PAD (0x125UL) -#define CKM_DES2_KEY_GEN (0x130UL) -#define CKM_DES3_KEY_GEN (0x131UL) -#define CKM_DES3_ECB (0x132UL) -#define CKM_DES3_CBC (0x133UL) -#define CKM_DES3_MAC (0x134UL) -#define CKM_DES3_MAC_GENERAL (0x135UL) -#define CKM_DES3_CBC_PAD (0x136UL) -#define CKM_DES3_CMAC_GENERAL (0x137UL) -#define CKM_DES3_CMAC (0x138UL) -#define CKM_CDMF_KEY_GEN (0x140UL) -#define CKM_CDMF_ECB (0x141UL) -#define CKM_CDMF_CBC (0x142UL) -#define CKM_CDMF_MAC (0x143UL) -#define CKM_CDMF_MAC_GENERAL (0x144UL) -#define CKM_CDMF_CBC_PAD (0x145UL) -#define CKM_DES_OFB64 (0x150UL) -#define CKM_DES_OFB8 (0x151UL) -#define CKM_DES_CFB64 (0x152UL) -#define CKM_DES_CFB8 (0x153UL) -#define CKM_MD2 (0x200UL) -#define CKM_MD2_HMAC (0x201UL) -#define CKM_MD2_HMAC_GENERAL (0x202UL) -#define CKM_MD5 (0x210UL) -#define CKM_MD5_HMAC (0x211UL) -#define CKM_MD5_HMAC_GENERAL (0x212UL) -#define CKM_SHA_1 (0x220UL) -#define CKM_SHA_1_HMAC (0x221UL) -#define CKM_SHA_1_HMAC_GENERAL (0x222UL) -#define CKM_RIPEMD128 (0x230UL) -#define CKM_RIPEMD128_HMAC (0x231UL) -#define CKM_RIPEMD128_HMAC_GENERAL (0x232UL) -#define CKM_RIPEMD160 (0x240UL) -#define CKM_RIPEMD160_HMAC (0x241UL) -#define CKM_RIPEMD160_HMAC_GENERAL (0x242UL) -#define CKM_SHA256 (0x250UL) -#define CKM_SHA256_HMAC (0x251UL) -#define CKM_SHA256_HMAC_GENERAL (0x252UL) -#define CKM_SHA384 (0x260UL) -#define CKM_SHA384_HMAC (0x261UL) -#define CKM_SHA384_HMAC_GENERAL (0x262UL) -#define CKM_SHA512 (0x270UL) -#define CKM_SHA512_HMAC (0x271UL) -#define CKM_SHA512_HMAC_GENERAL (0x272UL) -#define CKM_SECURID_KEY_GEN (0x280UL) -#define CKM_SECURID (0x282UL) -#define CKM_HOTP_KEY_GEN (0x290UL) -#define CKM_HOTP (0x291UL) -#define CKM_ACTI (0x2a0UL) -#define CKM_ACTI_KEY_GEN (0x2a1UL) -#define CKM_CAST_KEY_GEN (0x300UL) -#define CKM_CAST_ECB (0x301UL) -#define CKM_CAST_CBC (0x302UL) -#define CKM_CAST_MAC (0x303UL) -#define CKM_CAST_MAC_GENERAL (0x304UL) -#define CKM_CAST_CBC_PAD (0x305UL) -#define CKM_CAST3_KEY_GEN (0x310UL) -#define CKM_CAST3_ECB (0x311UL) -#define CKM_CAST3_CBC (0x312UL) -#define CKM_CAST3_MAC (0x313UL) -#define CKM_CAST3_MAC_GENERAL (0x314UL) -#define CKM_CAST3_CBC_PAD (0x315UL) -#define CKM_CAST5_KEY_GEN (0x320UL) -#define CKM_CAST128_KEY_GEN (0x320UL) -#define CKM_CAST5_ECB (0x321UL) -#define CKM_CAST128_ECB (0x321UL) -#define CKM_CAST5_CBC (0x322UL) -#define CKM_CAST128_CBC (0x322UL) -#define CKM_CAST5_MAC (0x323UL) -#define CKM_CAST128_MAC (0x323UL) -#define CKM_CAST5_MAC_GENERAL (0x324UL) -#define CKM_CAST128_MAC_GENERAL (0x324UL) -#define CKM_CAST5_CBC_PAD (0x325UL) -#define CKM_CAST128_CBC_PAD (0x325UL) -#define CKM_RC5_KEY_GEN (0x330UL) -#define CKM_RC5_ECB (0x331UL) -#define CKM_RC5_CBC (0x332UL) -#define CKM_RC5_MAC (0x333UL) -#define CKM_RC5_MAC_GENERAL (0x334UL) -#define CKM_RC5_CBC_PAD (0x335UL) -#define CKM_IDEA_KEY_GEN (0x340UL) -#define CKM_IDEA_ECB (0x341UL) -#define CKM_IDEA_CBC (0x342UL) -#define CKM_IDEA_MAC (0x343UL) -#define CKM_IDEA_MAC_GENERAL (0x344UL) -#define CKM_IDEA_CBC_PAD (0x345UL) -#define CKM_GENERIC_SECRET_KEY_GEN (0x350UL) -#define CKM_CONCATENATE_BASE_AND_KEY (0x360UL) -#define CKM_CONCATENATE_BASE_AND_DATA (0x362UL) -#define CKM_CONCATENATE_DATA_AND_BASE (0x363UL) -#define CKM_XOR_BASE_AND_DATA (0x364UL) -#define CKM_EXTRACT_KEY_FROM_KEY (0x365UL) -#define CKM_SSL3_PRE_MASTER_KEY_GEN (0x370UL) -#define CKM_SSL3_MASTER_KEY_DERIVE (0x371UL) -#define CKM_SSL3_KEY_AND_MAC_DERIVE (0x372UL) -#define CKM_SSL3_MASTER_KEY_DERIVE_DH (0x373UL) -#define CKM_TLS_PRE_MASTER_KEY_GEN (0x374UL) -#define CKM_TLS_MASTER_KEY_DERIVE (0x375UL) -#define CKM_TLS_KEY_AND_MAC_DERIVE (0x376UL) -#define CKM_TLS_MASTER_KEY_DERIVE_DH (0x377UL) -#define CKM_TLS_PRF (0x378UL) -#define CKM_SSL3_MD5_MAC (0x380UL) -#define CKM_SSL3_SHA1_MAC (0x381UL) -#define CKM_MD5_KEY_DERIVATION (0x390UL) -#define CKM_MD2_KEY_DERIVATION (0x391UL) -#define CKM_SHA1_KEY_DERIVATION (0x392UL) -#define CKM_SHA256_KEY_DERIVATION (0x393UL) -#define CKM_SHA384_KEY_DERIVATION (0x394UL) -#define CKM_SHA512_KEY_DERIVATION (0x395UL) -#define CKM_PBE_MD2_DES_CBC (0x3a0UL) -#define CKM_PBE_MD5_DES_CBC (0x3a1UL) -#define CKM_PBE_MD5_CAST_CBC (0x3a2UL) -#define CKM_PBE_MD5_CAST3_CBC (0x3a3UL) -#define CKM_PBE_MD5_CAST5_CBC (0x3a4UL) -#define CKM_PBE_MD5_CAST128_CBC (0x3a4UL) -#define CKM_PBE_SHA1_CAST5_CBC (0x3a5UL) -#define CKM_PBE_SHA1_CAST128_CBC (0x3a5UL) -#define CKM_PBE_SHA1_RC4_128 (0x3a6UL) -#define CKM_PBE_SHA1_RC4_40 (0x3a7UL) -#define CKM_PBE_SHA1_DES3_EDE_CBC (0x3a8UL) -#define CKM_PBE_SHA1_DES2_EDE_CBC (0x3a9UL) -#define CKM_PBE_SHA1_RC2_128_CBC (0x3aaUL) -#define CKM_PBE_SHA1_RC2_40_CBC (0x3abUL) -#define CKM_PKCS5_PBKD2 (0x3b0UL) -#define CKM_PBA_SHA1_WITH_SHA1_HMAC (0x3c0UL) -#define CKM_WTLS_PRE_MASTER_KEY_GEN (0x3d0UL) -#define CKM_WTLS_MASTER_KEY_DERIVE (0x3d1UL) -#define CKM_WTLS_MASTER_KEY_DERIVE_DH_ECC (0x3d2UL) -#define CKM_WTLS_PRF (0x3d3UL) +#define CKM_RSA_PKCS_KEY_PAIR_GEN (0UL) +#define CKM_RSA_PKCS (1UL) +#define CKM_RSA_9796 (2UL) +#define CKM_RSA_X_509 (3UL) +#define CKM_MD2_RSA_PKCS (4UL) +#define CKM_MD5_RSA_PKCS (5UL) +#define CKM_SHA1_RSA_PKCS (6UL) +#define CKM_RIPEMD128_RSA_PKCS (7UL) +#define CKM_RIPEMD160_RSA_PKCS (8UL) +#define CKM_RSA_PKCS_OAEP (9UL) +#define CKM_RSA_X9_31_KEY_PAIR_GEN (0xaUL) +#define CKM_RSA_X9_31 (0xbUL) +#define CKM_SHA1_RSA_X9_31 (0xcUL) +#define CKM_RSA_PKCS_PSS (0xdUL) +#define CKM_SHA1_RSA_PKCS_PSS (0xeUL) +#define CKM_DSA_KEY_PAIR_GEN (0x10UL) +#define CKM_DSA (0x11UL) +#define CKM_DSA_SHA1 (0x12UL) +#define CKM_DSA_SHA224 (0x13UL) +#define CKM_DSA_SHA256 (0x14UL) +#define CKM_DSA_SHA384 (0x15UL) +#define CKM_DSA_SHA512 (0x16UL) +#define CKM_DH_PKCS_KEY_PAIR_GEN (0x20UL) +#define CKM_DH_PKCS_DERIVE (0x21UL) +#define CKM_X9_42_DH_KEY_PAIR_GEN (0x30UL) +#define CKM_X9_42_DH_DERIVE (0x31UL) +#define CKM_X9_42_DH_HYBRID_DERIVE (0x32UL) +#define CKM_X9_42_MQV_DERIVE (0x33UL) +#define CKM_SHA256_RSA_PKCS (0x40UL) +#define CKM_SHA384_RSA_PKCS (0x41UL) +#define CKM_SHA512_RSA_PKCS (0x42UL) +#define CKM_SHA256_RSA_PKCS_PSS (0x43UL) +#define CKM_SHA384_RSA_PKCS_PSS (0x44UL) +#define CKM_SHA512_RSA_PKCS_PSS (0x45UL) +#define CKM_SHA512_224 (0x48UL) +#define CKM_SHA512_224_HMAC (0x49UL) +#define CKM_SHA512_224_HMAC_GENERAL (0x4aUL) +#define CKM_SHA512_224_KEY_DERIVATION (0x4bUL) +#define CKM_SHA512_256 (0x4cUL) +#define CKM_SHA512_256_HMAC (0x4dUL) +#define CKM_SHA512_256_HMAC_GENERAL (0x4eUL) +#define CKM_SHA512_256_KEY_DERIVATION (0x4fUL) +#define CKM_SHA512_T (0x50UL) +#define CKM_SHA512_T_HMAC (0x51UL) +#define CKM_SHA512_T_HMAC_GENERAL (0x52UL) +#define CKM_SHA512_T_KEY_DERIVATION (0x53UL) +#define CKM_RC2_KEY_GEN (0x100UL) +#define CKM_RC2_ECB (0x101UL) +#define CKM_RC2_CBC (0x102UL) +#define CKM_RC2_MAC (0x103UL) +#define CKM_RC2_MAC_GENERAL (0x104UL) +#define CKM_RC2_CBC_PAD (0x105UL) +#define CKM_RC4_KEY_GEN (0x110UL) +#define CKM_RC4 (0x111UL) +#define CKM_DES_KEY_GEN (0x120UL) +#define CKM_DES_ECB (0x121UL) +#define CKM_DES_CBC (0x122UL) +#define CKM_DES_MAC (0x123UL) +#define CKM_DES_MAC_GENERAL (0x124UL) +#define CKM_DES_CBC_PAD (0x125UL) +#define CKM_DES2_KEY_GEN (0x130UL) +#define CKM_DES3_KEY_GEN (0x131UL) +#define CKM_DES3_ECB (0x132UL) +#define CKM_DES3_CBC (0x133UL) +#define CKM_DES3_MAC (0x134UL) +#define CKM_DES3_MAC_GENERAL (0x135UL) +#define CKM_DES3_CBC_PAD (0x136UL) +#define CKM_DES3_CMAC_GENERAL (0x137UL) +#define CKM_DES3_CMAC (0x138UL) +#define CKM_CDMF_KEY_GEN (0x140UL) +#define CKM_CDMF_ECB (0x141UL) +#define CKM_CDMF_CBC (0x142UL) +#define CKM_CDMF_MAC (0x143UL) +#define CKM_CDMF_MAC_GENERAL (0x144UL) +#define CKM_CDMF_CBC_PAD (0x145UL) +#define CKM_DES_OFB64 (0x150UL) +#define CKM_DES_OFB8 (0x151UL) +#define CKM_DES_CFB64 (0x152UL) +#define CKM_DES_CFB8 (0x153UL) +#define CKM_MD2 (0x200UL) +#define CKM_MD2_HMAC (0x201UL) +#define CKM_MD2_HMAC_GENERAL (0x202UL) +#define CKM_MD5 (0x210UL) +#define CKM_MD5_HMAC (0x211UL) +#define CKM_MD5_HMAC_GENERAL (0x212UL) +#define CKM_SHA_1 (0x220UL) +#define CKM_SHA_1_HMAC (0x221UL) +#define CKM_SHA_1_HMAC_GENERAL (0x222UL) +#define CKM_RIPEMD128 (0x230UL) +#define CKM_RIPEMD128_HMAC (0x231UL) +#define CKM_RIPEMD128_HMAC_GENERAL (0x232UL) +#define CKM_RIPEMD160 (0x240UL) +#define CKM_RIPEMD160_HMAC (0x241UL) +#define CKM_RIPEMD160_HMAC_GENERAL (0x242UL) +#define CKM_SHA256 (0x250UL) +#define CKM_SHA256_HMAC (0x251UL) +#define CKM_SHA256_HMAC_GENERAL (0x252UL) +#define CKM_SHA384 (0x260UL) +#define CKM_SHA384_HMAC (0x261UL) +#define CKM_SHA384_HMAC_GENERAL (0x262UL) +#define CKM_SHA512 (0x270UL) +#define CKM_SHA512_HMAC (0x271UL) +#define CKM_SHA512_HMAC_GENERAL (0x272UL) +#define CKM_SECURID_KEY_GEN (0x280UL) +#define CKM_SECURID (0x282UL) +#define CKM_HOTP_KEY_GEN (0x290UL) +#define CKM_HOTP (0x291UL) +#define CKM_ACTI (0x2a0UL) +#define CKM_ACTI_KEY_GEN (0x2a1UL) +#define CKM_CAST_KEY_GEN (0x300UL) +#define CKM_CAST_ECB (0x301UL) +#define CKM_CAST_CBC (0x302UL) +#define CKM_CAST_MAC (0x303UL) +#define CKM_CAST_MAC_GENERAL (0x304UL) +#define CKM_CAST_CBC_PAD (0x305UL) +#define CKM_CAST3_KEY_GEN (0x310UL) +#define CKM_CAST3_ECB (0x311UL) +#define CKM_CAST3_CBC (0x312UL) +#define CKM_CAST3_MAC (0x313UL) +#define CKM_CAST3_MAC_GENERAL (0x314UL) +#define CKM_CAST3_CBC_PAD (0x315UL) +#define CKM_CAST5_KEY_GEN (0x320UL) +#define CKM_CAST128_KEY_GEN (0x320UL) +#define CKM_CAST5_ECB (0x321UL) +#define CKM_CAST128_ECB (0x321UL) +#define CKM_CAST5_CBC (0x322UL) +#define CKM_CAST128_CBC (0x322UL) +#define CKM_CAST5_MAC (0x323UL) +#define CKM_CAST128_MAC (0x323UL) +#define CKM_CAST5_MAC_GENERAL (0x324UL) +#define CKM_CAST128_MAC_GENERAL (0x324UL) +#define CKM_CAST5_CBC_PAD (0x325UL) +#define CKM_CAST128_CBC_PAD (0x325UL) +#define CKM_RC5_KEY_GEN (0x330UL) +#define CKM_RC5_ECB (0x331UL) +#define CKM_RC5_CBC (0x332UL) +#define CKM_RC5_MAC (0x333UL) +#define CKM_RC5_MAC_GENERAL (0x334UL) +#define CKM_RC5_CBC_PAD (0x335UL) +#define CKM_IDEA_KEY_GEN (0x340UL) +#define CKM_IDEA_ECB (0x341UL) +#define CKM_IDEA_CBC (0x342UL) +#define CKM_IDEA_MAC (0x343UL) +#define CKM_IDEA_MAC_GENERAL (0x344UL) +#define CKM_IDEA_CBC_PAD (0x345UL) +#define CKM_GENERIC_SECRET_KEY_GEN (0x350UL) +#define CKM_CONCATENATE_BASE_AND_KEY (0x360UL) +#define CKM_CONCATENATE_BASE_AND_DATA (0x362UL) +#define CKM_CONCATENATE_DATA_AND_BASE (0x363UL) +#define CKM_XOR_BASE_AND_DATA (0x364UL) +#define CKM_EXTRACT_KEY_FROM_KEY (0x365UL) +#define CKM_SSL3_PRE_MASTER_KEY_GEN (0x370UL) +#define CKM_SSL3_MASTER_KEY_DERIVE (0x371UL) +#define CKM_SSL3_KEY_AND_MAC_DERIVE (0x372UL) +#define CKM_SSL3_MASTER_KEY_DERIVE_DH (0x373UL) +#define CKM_TLS_PRE_MASTER_KEY_GEN (0x374UL) +#define CKM_TLS_MASTER_KEY_DERIVE (0x375UL) +#define CKM_TLS_KEY_AND_MAC_DERIVE (0x376UL) +#define CKM_TLS_MASTER_KEY_DERIVE_DH (0x377UL) +#define CKM_TLS_PRF (0x378UL) +#define CKM_SSL3_MD5_MAC (0x380UL) +#define CKM_SSL3_SHA1_MAC (0x381UL) +#define CKM_MD5_KEY_DERIVATION (0x390UL) +#define CKM_MD2_KEY_DERIVATION (0x391UL) +#define CKM_SHA1_KEY_DERIVATION (0x392UL) +#define CKM_SHA256_KEY_DERIVATION (0x393UL) +#define CKM_SHA384_KEY_DERIVATION (0x394UL) +#define CKM_SHA512_KEY_DERIVATION (0x395UL) +#define CKM_PBE_MD2_DES_CBC (0x3a0UL) +#define CKM_PBE_MD5_DES_CBC (0x3a1UL) +#define CKM_PBE_MD5_CAST_CBC (0x3a2UL) +#define CKM_PBE_MD5_CAST3_CBC (0x3a3UL) +#define CKM_PBE_MD5_CAST5_CBC (0x3a4UL) +#define CKM_PBE_MD5_CAST128_CBC (0x3a4UL) +#define CKM_PBE_SHA1_CAST5_CBC (0x3a5UL) +#define CKM_PBE_SHA1_CAST128_CBC (0x3a5UL) +#define CKM_PBE_SHA1_RC4_128 (0x3a6UL) +#define CKM_PBE_SHA1_RC4_40 (0x3a7UL) +#define CKM_PBE_SHA1_DES3_EDE_CBC (0x3a8UL) +#define CKM_PBE_SHA1_DES2_EDE_CBC (0x3a9UL) +#define CKM_PBE_SHA1_RC2_128_CBC (0x3aaUL) +#define CKM_PBE_SHA1_RC2_40_CBC (0x3abUL) +#define CKM_PKCS5_PBKD2 (0x3b0UL) +#define CKM_PBA_SHA1_WITH_SHA1_HMAC (0x3c0UL) +#define CKM_WTLS_PRE_MASTER_KEY_GEN (0x3d0UL) +#define CKM_WTLS_MASTER_KEY_DERIVE (0x3d1UL) +#define CKM_WTLS_MASTER_KEY_DERIVE_DH_ECC (0x3d2UL) +#define CKM_WTLS_PRF (0x3d3UL) #define CKM_WTLS_SERVER_KEY_AND_MAC_DERIVE (0x3d4UL) #define CKM_WTLS_CLIENT_KEY_AND_MAC_DERIVE (0x3d5UL) -#define CKM_TLS10_MAC_SERVER (0x3d6UL) -#define CKM_TLS10_MAC_CLIENT (0x3d7UL) -#define CKM_TLS12_MAC (0x3d8UL) -#define CKM_TLS12_KDF (0x3d9UL) -#define CKM_TLS12_MASTER_KEY_DERIVE (0x3e0UL) -#define CKM_TLS12_KEY_AND_MAC_DERIVE (0x3e1UL) -#define CKM_TLS12_MASTER_KEY_DERIVE_DH (0x3e2UL) -#define CKM_TLS12_KEY_SAFE_DERIVE (0x3e3UL) -#define CKM_TLS_MAC (0x3e4UL) -#define CKM_TLS_KDF (0x3e5UL) -#define CKM_KEY_WRAP_LYNKS (0x400UL) -#define CKM_KEY_WRAP_SET_OAEP (0x401UL) -#define CKM_CMS_SIG (0x500UL) -#define CKM_KIP_DERIVE (0x510UL) -#define CKM_KIP_WRAP (0x511UL) -#define CKM_KIP_MAC (0x512UL) -#define CKM_ARIA_KEY_GEN (0x560UL) -#define CKM_ARIA_ECB (0x561UL) -#define CKM_ARIA_CBC (0x562UL) -#define CKM_ARIA_MAC (0x563UL) -#define CKM_ARIA_MAC_GENERAL (0x564UL) -#define CKM_ARIA_CBC_PAD (0x565UL) -#define CKM_ARIA_ECB_ENCRYPT_DATA (0x566UL) -#define CKM_ARIA_CBC_ENCRYPT_DATA (0x567UL) -#define CKM_SEED_KEY_GEN (0x650UL) -#define CKM_SEED_ECB (0x651UL) -#define CKM_SEED_CBC (0x652UL) -#define CKM_SEED_MAC (0x653UL) -#define CKM_SEED_MAC_GENERAL (0x654UL) -#define CKM_SEED_CBC_PAD (0x655UL) -#define CKM_SEED_ECB_ENCRYPT_DATA (0x656UL) -#define CKM_SEED_CBC_ENCRYPT_DATA (0x657UL) -#define CKM_SKIPJACK_KEY_GEN (0x1000UL) -#define CKM_SKIPJACK_ECB64 (0x1001UL) -#define CKM_SKIPJACK_CBC64 (0x1002UL) -#define CKM_SKIPJACK_OFB64 (0x1003UL) -#define CKM_SKIPJACK_CFB64 (0x1004UL) -#define CKM_SKIPJACK_CFB32 (0x1005UL) -#define CKM_SKIPJACK_CFB16 (0x1006UL) -#define CKM_SKIPJACK_CFB8 (0x1007UL) -#define CKM_SKIPJACK_WRAP (0x1008UL) -#define CKM_SKIPJACK_PRIVATE_WRAP (0x1009UL) -#define CKM_SKIPJACK_RELAYX (0x100aUL) -#define CKM_KEA_KEY_PAIR_GEN (0x1010UL) -#define CKM_KEA_KEY_DERIVE (0x1011UL) -#define CKM_FORTEZZA_TIMESTAMP (0x1020UL) -#define CKM_BATON_KEY_GEN (0x1030UL) -#define CKM_BATON_ECB128 (0x1031UL) -#define CKM_BATON_ECB96 (0x1032UL) -#define CKM_BATON_CBC128 (0x1033UL) -#define CKM_BATON_COUNTER (0x1034UL) -#define CKM_BATON_SHUFFLE (0x1035UL) -#define CKM_BATON_WRAP (0x1036UL) -#define CKM_ECDSA_KEY_PAIR_GEN (0x1040UL) -#define CKM_EC_KEY_PAIR_GEN (0x1040UL) -#define CKM_ECDSA (0x1041UL) -#define CKM_ECDSA_SHA1 (0x1042UL) -#define CKM_ECDSA_SHA224 (0x1043UL) -#define CKM_ECDSA_SHA256 (0x1044UL) -#define CKM_ECDSA_SHA384 (0x1045UL) -#define CKM_ECDSA_SHA512 (0x1046UL) -#define CKM_ECDH1_DERIVE (0x1050UL) -#define CKM_ECDH1_COFACTOR_DERIVE (0x1051UL) -#define CKM_ECMQV_DERIVE (0x1052UL) -#define CKM_ECDH_AES_KEY_WRAP (0x1053UL) -#define CKM_RSA_AES_KEY_WRAP (0x1054UL) -#define CKM_JUNIPER_KEY_GEN (0x1060UL) -#define CKM_JUNIPER_ECB128 (0x1061UL) -#define CKM_JUNIPER_CBC128 (0x1062UL) -#define CKM_JUNIPER_COUNTER (0x1063UL) -#define CKM_JUNIPER_SHUFFLE (0x1064UL) -#define CKM_JUNIPER_WRAP (0x1065UL) -#define CKM_FASTHASH (0x1070UL) -#define CKM_AES_KEY_GEN (0x1080UL) -#define CKM_AES_ECB (0x1081UL) -#define CKM_AES_CBC (0x1082UL) -#define CKM_AES_MAC (0x1083UL) -#define CKM_AES_MAC_GENERAL (0x1084UL) -#define CKM_AES_CBC_PAD (0x1085UL) -#define CKM_AES_CTR (0x1086UL) -#define CKM_AES_GCM (0x1087UL) -#define CKM_AES_CCM (0x1088UL) -#define CKM_AES_CTS (0x1089UL) -#define CKM_AES_CMAC (0x108aUL) -#define CKM_AES_CMAC_GENERAL (0x108bUL) -#define CKM_AES_XCBC_MAC (0x108cUL) -#define CKM_AES_XCBC_MAC_96 (0x108dUL) -#define CKM_AES_GMAC (0x108eUL) -#define CKM_BLOWFISH_KEY_GEN (0x1090UL) -#define CKM_BLOWFISH_CBC (0x1091UL) -#define CKM_TWOFISH_KEY_GEN (0x1092UL) -#define CKM_TWOFISH_CBC (0x1093UL) -#define CKM_BLOWFISH_CBC_PAD (0x1094UL) -#define CKM_TWOFISH_CBC_PAD (0x1095UL) -#define CKM_DES_ECB_ENCRYPT_DATA (0x1100UL) -#define CKM_DES_CBC_ENCRYPT_DATA (0x1101UL) -#define CKM_DES3_ECB_ENCRYPT_DATA (0x1102UL) -#define CKM_DES3_CBC_ENCRYPT_DATA (0x1103UL) -#define CKM_AES_ECB_ENCRYPT_DATA (0x1104UL) -#define CKM_AES_CBC_ENCRYPT_DATA (0x1105UL) -#define CKM_GOSTR3410_KEY_PAIR_GEN (0x1200UL) -#define CKM_GOSTR3410 (0x1201UL) -#define CKM_GOSTR3410_WITH_GOSTR3411 (0x1202UL) -#define CKM_GOSTR3410_KEY_WRAP (0x1203UL) -#define CKM_GOSTR3410_DERIVE (0x1204UL) -#define CKM_GOSTR3411 (0x1210UL) -#define CKM_GOSTR3411_HMAC (0x1211UL) -#define CKM_GOST28147_KEY_GEN (0x1220UL) -#define CKM_GOST28147_ECB (0x1221UL) -#define CKM_GOST28147 (0x1222UL) -#define CKM_GOST28147_MAC (0x1223UL) -#define CKM_GOST28147_KEY_WRAP (0x1224UL) -#define CKM_DSA_PARAMETER_GEN (0x2000UL) -#define CKM_DH_PKCS_PARAMETER_GEN (0x2001UL) -#define CKM_X9_42_DH_PARAMETER_GEN (0x2002UL) +#define CKM_TLS10_MAC_SERVER (0x3d6UL) +#define CKM_TLS10_MAC_CLIENT (0x3d7UL) +#define CKM_TLS12_MAC (0x3d8UL) +#define CKM_TLS12_KDF (0x3d9UL) +#define CKM_TLS12_MASTER_KEY_DERIVE (0x3e0UL) +#define CKM_TLS12_KEY_AND_MAC_DERIVE (0x3e1UL) +#define CKM_TLS12_MASTER_KEY_DERIVE_DH (0x3e2UL) +#define CKM_TLS12_KEY_SAFE_DERIVE (0x3e3UL) +#define CKM_TLS_MAC (0x3e4UL) +#define CKM_TLS_KDF (0x3e5UL) +#define CKM_KEY_WRAP_LYNKS (0x400UL) +#define CKM_KEY_WRAP_SET_OAEP (0x401UL) +#define CKM_CMS_SIG (0x500UL) +#define CKM_KIP_DERIVE (0x510UL) +#define CKM_KIP_WRAP (0x511UL) +#define CKM_KIP_MAC (0x512UL) +#define CKM_ARIA_KEY_GEN (0x560UL) +#define CKM_ARIA_ECB (0x561UL) +#define CKM_ARIA_CBC (0x562UL) +#define CKM_ARIA_MAC (0x563UL) +#define CKM_ARIA_MAC_GENERAL (0x564UL) +#define CKM_ARIA_CBC_PAD (0x565UL) +#define CKM_ARIA_ECB_ENCRYPT_DATA (0x566UL) +#define CKM_ARIA_CBC_ENCRYPT_DATA (0x567UL) +#define CKM_SEED_KEY_GEN (0x650UL) +#define CKM_SEED_ECB (0x651UL) +#define CKM_SEED_CBC (0x652UL) +#define CKM_SEED_MAC (0x653UL) +#define CKM_SEED_MAC_GENERAL (0x654UL) +#define CKM_SEED_CBC_PAD (0x655UL) +#define CKM_SEED_ECB_ENCRYPT_DATA (0x656UL) +#define CKM_SEED_CBC_ENCRYPT_DATA (0x657UL) +#define CKM_SKIPJACK_KEY_GEN (0x1000UL) +#define CKM_SKIPJACK_ECB64 (0x1001UL) +#define CKM_SKIPJACK_CBC64 (0x1002UL) +#define CKM_SKIPJACK_OFB64 (0x1003UL) +#define CKM_SKIPJACK_CFB64 (0x1004UL) +#define CKM_SKIPJACK_CFB32 (0x1005UL) +#define CKM_SKIPJACK_CFB16 (0x1006UL) +#define CKM_SKIPJACK_CFB8 (0x1007UL) +#define CKM_SKIPJACK_WRAP (0x1008UL) +#define CKM_SKIPJACK_PRIVATE_WRAP (0x1009UL) +#define CKM_SKIPJACK_RELAYX (0x100aUL) +#define CKM_KEA_KEY_PAIR_GEN (0x1010UL) +#define CKM_KEA_KEY_DERIVE (0x1011UL) +#define CKM_FORTEZZA_TIMESTAMP (0x1020UL) +#define CKM_BATON_KEY_GEN (0x1030UL) +#define CKM_BATON_ECB128 (0x1031UL) +#define CKM_BATON_ECB96 (0x1032UL) +#define CKM_BATON_CBC128 (0x1033UL) +#define CKM_BATON_COUNTER (0x1034UL) +#define CKM_BATON_SHUFFLE (0x1035UL) +#define CKM_BATON_WRAP (0x1036UL) +#define CKM_ECDSA_KEY_PAIR_GEN (0x1040UL) +#define CKM_EC_KEY_PAIR_GEN (0x1040UL) +#define CKM_ECDSA (0x1041UL) +#define CKM_ECDSA_SHA1 (0x1042UL) +#define CKM_ECDSA_SHA224 (0x1043UL) +#define CKM_ECDSA_SHA256 (0x1044UL) +#define CKM_ECDSA_SHA384 (0x1045UL) +#define CKM_ECDSA_SHA512 (0x1046UL) +#define CKM_ECDH1_DERIVE (0x1050UL) +#define CKM_ECDH1_COFACTOR_DERIVE (0x1051UL) +#define CKM_ECMQV_DERIVE (0x1052UL) +#define CKM_ECDH_AES_KEY_WRAP (0x1053UL) +#define CKM_RSA_AES_KEY_WRAP (0x1054UL) +#define CKM_JUNIPER_KEY_GEN (0x1060UL) +#define CKM_JUNIPER_ECB128 (0x1061UL) +#define CKM_JUNIPER_CBC128 (0x1062UL) +#define CKM_JUNIPER_COUNTER (0x1063UL) +#define CKM_JUNIPER_SHUFFLE (0x1064UL) +#define CKM_JUNIPER_WRAP (0x1065UL) +#define CKM_FASTHASH (0x1070UL) +#define CKM_AES_KEY_GEN (0x1080UL) +#define CKM_AES_ECB (0x1081UL) +#define CKM_AES_CBC (0x1082UL) +#define CKM_AES_MAC (0x1083UL) +#define CKM_AES_MAC_GENERAL (0x1084UL) +#define CKM_AES_CBC_PAD (0x1085UL) +#define CKM_AES_CTR (0x1086UL) +#define CKM_AES_GCM (0x1087UL) +#define CKM_AES_CCM (0x1088UL) +#define CKM_AES_CTS (0x1089UL) +#define CKM_AES_CMAC (0x108aUL) +#define CKM_AES_CMAC_GENERAL (0x108bUL) +#define CKM_AES_XCBC_MAC (0x108cUL) +#define CKM_AES_XCBC_MAC_96 (0x108dUL) +#define CKM_AES_GMAC (0x108eUL) +#define CKM_BLOWFISH_KEY_GEN (0x1090UL) +#define CKM_BLOWFISH_CBC (0x1091UL) +#define CKM_TWOFISH_KEY_GEN (0x1092UL) +#define CKM_TWOFISH_CBC (0x1093UL) +#define CKM_BLOWFISH_CBC_PAD (0x1094UL) +#define CKM_TWOFISH_CBC_PAD (0x1095UL) +#define CKM_DES_ECB_ENCRYPT_DATA (0x1100UL) +#define CKM_DES_CBC_ENCRYPT_DATA (0x1101UL) +#define CKM_DES3_ECB_ENCRYPT_DATA (0x1102UL) +#define CKM_DES3_CBC_ENCRYPT_DATA (0x1103UL) +#define CKM_AES_ECB_ENCRYPT_DATA (0x1104UL) +#define CKM_AES_CBC_ENCRYPT_DATA (0x1105UL) +#define CKM_GOSTR3410_KEY_PAIR_GEN (0x1200UL) +#define CKM_GOSTR3410 (0x1201UL) +#define CKM_GOSTR3410_WITH_GOSTR3411 (0x1202UL) +#define CKM_GOSTR3410_KEY_WRAP (0x1203UL) +#define CKM_GOSTR3410_DERIVE (0x1204UL) +#define CKM_GOSTR3411 (0x1210UL) +#define CKM_GOSTR3411_HMAC (0x1211UL) +#define CKM_GOST28147_KEY_GEN (0x1220UL) +#define CKM_GOST28147_ECB (0x1221UL) +#define CKM_GOST28147 (0x1222UL) +#define CKM_GOST28147_MAC (0x1223UL) +#define CKM_GOST28147_KEY_WRAP (0x1224UL) +#define CKM_DSA_PARAMETER_GEN (0x2000UL) +#define CKM_DH_PKCS_PARAMETER_GEN (0x2001UL) +#define CKM_X9_42_DH_PARAMETER_GEN (0x2002UL) #define CKM_DSA_PROBABLISTIC_PARAMETER_GEN (0x2003UL) #define CKM_DSA_SHAWE_TAYLOR_PARAMETER_GEN (0x2004UL) -#define CKM_AES_OFB (0x2104UL) -#define CKM_AES_CFB64 (0x2105UL) -#define CKM_AES_CFB8 (0x2106UL) -#define CKM_AES_CFB128 (0x2107UL) -#define CKM_AES_CFB1 (0x2108UL) +#define CKM_AES_OFB (0x2104UL) +#define CKM_AES_CFB64 (0x2105UL) +#define CKM_AES_CFB8 (0x2106UL) +#define CKM_AES_CFB128 (0x2107UL) +#define CKM_AES_CFB1 (0x2108UL) #define CKM_VENDOR_DEFINED ((unsigned long)(1UL << 31)) /* Amendments */ -#define CKM_SHA224 (0x255UL) -#define CKM_SHA224_HMAC (0x256UL) -#define CKM_SHA224_HMAC_GENERAL (0x257UL) -#define CKM_SHA224_RSA_PKCS (0x46UL) -#define CKM_SHA224_RSA_PKCS_PSS (0x47UL) +#define CKM_SHA224 (0x255UL) +#define CKM_SHA224_HMAC (0x256UL) +#define CKM_SHA224_HMAC_GENERAL (0x257UL) +#define CKM_SHA224_RSA_PKCS (0x46UL) +#define CKM_SHA224_RSA_PKCS_PSS (0x47UL) #define CKM_SHA224_KEY_DERIVATION (0x396UL) -#define CKM_CAMELLIA_KEY_GEN (0x550UL) -#define CKM_CAMELLIA_ECB (0x551UL) -#define CKM_CAMELLIA_CBC (0x552UL) -#define CKM_CAMELLIA_MAC (0x553UL) -#define CKM_CAMELLIA_MAC_GENERAL (0x554UL) -#define CKM_CAMELLIA_CBC_PAD (0x555UL) +#define CKM_CAMELLIA_KEY_GEN (0x550UL) +#define CKM_CAMELLIA_ECB (0x551UL) +#define CKM_CAMELLIA_CBC (0x552UL) +#define CKM_CAMELLIA_MAC (0x553UL) +#define CKM_CAMELLIA_MAC_GENERAL (0x554UL) +#define CKM_CAMELLIA_CBC_PAD (0x555UL) #define CKM_CAMELLIA_ECB_ENCRYPT_DATA (0x556UL) #define CKM_CAMELLIA_CBC_ENCRYPT_DATA (0x557UL) -#define CKM_CAMELLIA_CTR (0x558UL) +#define CKM_CAMELLIA_CTR (0x558UL) -#define CKM_AES_KEY_WRAP (0x2109UL) +#define CKM_AES_KEY_WRAP (0x2109UL) #define CKM_AES_KEY_WRAP_PAD (0x210aUL) -#define CKM_RSA_PKCS_TPM_1_1 (0x4001UL) +#define CKM_RSA_PKCS_TPM_1_1 (0x4001UL) #define CKM_RSA_PKCS_OAEP_TPM_1_1 (0x4002UL) /* From version 3.0 */ #define CKM_EC_EDWARDS_KEY_PAIR_GEN (0x1055UL) -#define CKM_EDDSA (0x1057UL) +#define CKM_EDDSA (0x1057UL) /* Attribute and other constants related to OTP */ -#define CK_OTP_FORMAT_DECIMAL (0UL) -#define CK_OTP_FORMAT_HEXADECIMAL (1UL) +#define CK_OTP_FORMAT_DECIMAL (0UL) +#define CK_OTP_FORMAT_HEXADECIMAL (1UL) #define CK_OTP_FORMAT_ALPHANUMERIC (2UL) -#define CK_OTP_FORMAT_BINARY (3UL) -#define CK_OTP_PARAM_IGNORED (0UL) -#define CK_OTP_PARAM_OPTIONAL (1UL) -#define CK_OTP_PARAM_MANDATORY (2UL) +#define CK_OTP_FORMAT_BINARY (3UL) +#define CK_OTP_PARAM_IGNORED (0UL) +#define CK_OTP_PARAM_OPTIONAL (1UL) +#define CK_OTP_PARAM_MANDATORY (2UL) -#define CK_OTP_VALUE (0UL) -#define CK_OTP_PIN (1UL) -#define CK_OTP_CHALLENGE (2UL) -#define CK_OTP_TIME (3UL) -#define CK_OTP_COUNTER (4UL) -#define CK_OTP_FLAGS (5UL) +#define CK_OTP_VALUE (0UL) +#define CK_OTP_PIN (1UL) +#define CK_OTP_CHALLENGE (2UL) +#define CK_OTP_TIME (3UL) +#define CK_OTP_COUNTER (4UL) +#define CK_OTP_FLAGS (5UL) #define CK_OTP_OUTPUT_LENGTH (6UL) -#define CK_OTP_FORMAT (7UL) +#define CK_OTP_FORMAT (7UL) /* OTP mechanism flags */ -#define CKF_NEXT_OTP (0x01UL) -#define CKF_EXCLUDE_TIME (0x02UL) -#define CKF_EXCLUDE_COUNTER (0x04UL) +#define CKF_NEXT_OTP (0x01UL) +#define CKF_EXCLUDE_TIME (0x02UL) +#define CKF_EXCLUDE_COUNTER (0x04UL) #define CKF_EXCLUDE_CHALLENGE (0x08UL) -#define CKF_EXCLUDE_PIN (0x10UL) +#define CKF_EXCLUDE_PIN (0x10UL) #define CKF_USER_FRIENDLY_OTP (0x20UL) #define CKN_OTP_CHANGED (0x01UL) @@ -914,7 +914,7 @@ typedef struct ck_otp_signature_info { unsigned long count; } ck_otp_signature_info; -#define CKG_MGF1_SHA1 0x00000001UL +#define CKG_MGF1_SHA1 0x00000001UL #define CKG_MGF1_SHA224 0x00000005UL #define CKG_MGF1_SHA256 0x00000002UL #define CKG_MGF1_SHA384 0x00000003UL @@ -953,17 +953,17 @@ struct ck_gcm_params { }; /* The following EC Key Derivation Functions are defined */ -#define CKD_NULL (0x01UL) +#define CKD_NULL (0x01UL) #define CKD_SHA1_KDF (0x02UL) /* The following X9.42 DH key derivation functions are defined */ -#define CKD_SHA1_KDF_ASN1 (0x03UL) +#define CKD_SHA1_KDF_ASN1 (0x03UL) #define CKD_SHA1_KDF_CONCATENATE (0x04UL) -#define CKD_SHA224_KDF (0x05UL) -#define CKD_SHA256_KDF (0x06UL) -#define CKD_SHA384_KDF (0x07UL) -#define CKD_SHA512_KDF (0x08UL) -#define CKD_CPDIVERSIFY_KDF (0x09UL) +#define CKD_SHA224_KDF (0x05UL) +#define CKD_SHA256_KDF (0x06UL) +#define CKD_SHA384_KDF (0x07UL) +#define CKD_SHA512_KDF (0x08UL) +#define CKD_CPDIVERSIFY_KDF (0x09UL) typedef unsigned long ck_ec_kdf_t; @@ -992,25 +992,25 @@ struct ck_aes_cbc_encrypt_data_params { unsigned long length; }; -#define CKF_HW (1UL << 0) -#define CKF_ENCRYPT (1UL << 8) -#define CKF_DECRYPT (1UL << 9) -#define CKF_DIGEST (1UL << 10) -#define CKF_SIGN (1UL << 11) -#define CKF_SIGN_RECOVER (1UL << 12) -#define CKF_VERIFY (1UL << 13) -#define CKF_VERIFY_RECOVER (1UL << 14) -#define CKF_GENERATE (1UL << 15) +#define CKF_HW (1UL << 0) +#define CKF_ENCRYPT (1UL << 8) +#define CKF_DECRYPT (1UL << 9) +#define CKF_DIGEST (1UL << 10) +#define CKF_SIGN (1UL << 11) +#define CKF_SIGN_RECOVER (1UL << 12) +#define CKF_VERIFY (1UL << 13) +#define CKF_VERIFY_RECOVER (1UL << 14) +#define CKF_GENERATE (1UL << 15) #define CKF_GENERATE_KEY_PAIR (1UL << 16) -#define CKF_WRAP (1UL << 17) -#define CKF_UNWRAP (1UL << 18) -#define CKF_DERIVE (1UL << 19) -#define CKF_EXTENSION ((unsigned long)(1UL << 31)) +#define CKF_WRAP (1UL << 17) +#define CKF_UNWRAP (1UL << 18) +#define CKF_DERIVE (1UL << 19) +#define CKF_EXTENSION ((unsigned long)(1UL << 31)) -#define CKF_EC_F_P (1UL << 20) +#define CKF_EC_F_P (1UL << 20) #define CKF_EC_NAMEDCURVE (1UL << 23) #define CKF_EC_UNCOMPRESS (1UL << 24) -#define CKF_EC_COMPRESS (1UL << 25) +#define CKF_EC_COMPRESS (1UL << 25) /* Flags for C_WaitForSlotEvent. */ #define CKF_DONT_BLOCK (1UL) @@ -1341,102 +1341,102 @@ struct ck_c_initialize_args { }; #define CKF_LIBRARY_CANT_CREATE_OS_THREADS (1UL << 0) -#define CKF_OS_LOCKING_OK (1UL << 1) +#define CKF_OS_LOCKING_OK (1UL << 1) -#define CKR_OK (0UL) -#define CKR_CANCEL (1UL) -#define CKR_HOST_MEMORY (2UL) -#define CKR_SLOT_ID_INVALID (3UL) -#define CKR_GENERAL_ERROR (5UL) -#define CKR_FUNCTION_FAILED (6UL) -#define CKR_ARGUMENTS_BAD (7UL) -#define CKR_NO_EVENT (8UL) -#define CKR_NEED_TO_CREATE_THREADS (9UL) -#define CKR_CANT_LOCK (0xaUL) -#define CKR_ATTRIBUTE_READ_ONLY (0x10UL) -#define CKR_ATTRIBUTE_SENSITIVE (0x11UL) -#define CKR_ATTRIBUTE_TYPE_INVALID (0x12UL) -#define CKR_ATTRIBUTE_VALUE_INVALID (0x13UL) -#define CKR_ACTION_PROHIBITED (0x1BUL) -#define CKR_DATA_INVALID (0x20UL) -#define CKR_DATA_LEN_RANGE (0x21UL) -#define CKR_DEVICE_ERROR (0x30UL) -#define CKR_DEVICE_MEMORY (0x31UL) -#define CKR_DEVICE_REMOVED (0x32UL) -#define CKR_ENCRYPTED_DATA_INVALID (0x40UL) -#define CKR_ENCRYPTED_DATA_LEN_RANGE (0x41UL) -#define CKR_FUNCTION_CANCELED (0x50UL) -#define CKR_FUNCTION_NOT_PARALLEL (0x51UL) -#define CKR_FUNCTION_NOT_SUPPORTED (0x54UL) -#define CKR_KEY_HANDLE_INVALID (0x60UL) -#define CKR_KEY_SIZE_RANGE (0x62UL) -#define CKR_KEY_TYPE_INCONSISTENT (0x63UL) -#define CKR_KEY_NOT_NEEDED (0x64UL) -#define CKR_KEY_CHANGED (0x65UL) -#define CKR_KEY_NEEDED (0x66UL) -#define CKR_KEY_INDIGESTIBLE (0x67UL) -#define CKR_KEY_FUNCTION_NOT_PERMITTED (0x68UL) -#define CKR_KEY_NOT_WRAPPABLE (0x69UL) -#define CKR_KEY_UNEXTRACTABLE (0x6aUL) -#define CKR_MECHANISM_INVALID (0x70UL) -#define CKR_MECHANISM_PARAM_INVALID (0x71UL) -#define CKR_OBJECT_HANDLE_INVALID (0x82UL) -#define CKR_OPERATION_ACTIVE (0x90UL) -#define CKR_OPERATION_NOT_INITIALIZED (0x91UL) -#define CKR_PIN_INCORRECT (0xa0UL) -#define CKR_PIN_INVALID (0xa1UL) -#define CKR_PIN_LEN_RANGE (0xa2UL) -#define CKR_PIN_EXPIRED (0xa3UL) -#define CKR_PIN_LOCKED (0xa4UL) -#define CKR_SESSION_CLOSED (0xb0UL) -#define CKR_SESSION_COUNT (0xb1UL) -#define CKR_SESSION_HANDLE_INVALID (0xb3UL) -#define CKR_SESSION_PARALLEL_NOT_SUPPORTED (0xb4UL) -#define CKR_SESSION_READ_ONLY (0xb5UL) -#define CKR_SESSION_EXISTS (0xb6UL) -#define CKR_SESSION_READ_ONLY_EXISTS (0xb7UL) -#define CKR_SESSION_READ_WRITE_SO_EXISTS (0xb8UL) -#define CKR_SIGNATURE_INVALID (0xc0UL) -#define CKR_SIGNATURE_LEN_RANGE (0xc1UL) -#define CKR_TEMPLATE_INCOMPLETE (0xd0UL) -#define CKR_TEMPLATE_INCONSISTENT (0xd1UL) -#define CKR_TOKEN_NOT_PRESENT (0xe0UL) -#define CKR_TOKEN_NOT_RECOGNIZED (0xe1UL) -#define CKR_TOKEN_WRITE_PROTECTED (0xe2UL) -#define CKR_UNWRAPPING_KEY_HANDLE_INVALID (0xf0UL) -#define CKR_UNWRAPPING_KEY_SIZE_RANGE (0xf1UL) +#define CKR_OK (0UL) +#define CKR_CANCEL (1UL) +#define CKR_HOST_MEMORY (2UL) +#define CKR_SLOT_ID_INVALID (3UL) +#define CKR_GENERAL_ERROR (5UL) +#define CKR_FUNCTION_FAILED (6UL) +#define CKR_ARGUMENTS_BAD (7UL) +#define CKR_NO_EVENT (8UL) +#define CKR_NEED_TO_CREATE_THREADS (9UL) +#define CKR_CANT_LOCK (0xaUL) +#define CKR_ATTRIBUTE_READ_ONLY (0x10UL) +#define CKR_ATTRIBUTE_SENSITIVE (0x11UL) +#define CKR_ATTRIBUTE_TYPE_INVALID (0x12UL) +#define CKR_ATTRIBUTE_VALUE_INVALID (0x13UL) +#define CKR_ACTION_PROHIBITED (0x1BUL) +#define CKR_DATA_INVALID (0x20UL) +#define CKR_DATA_LEN_RANGE (0x21UL) +#define CKR_DEVICE_ERROR (0x30UL) +#define CKR_DEVICE_MEMORY (0x31UL) +#define CKR_DEVICE_REMOVED (0x32UL) +#define CKR_ENCRYPTED_DATA_INVALID (0x40UL) +#define CKR_ENCRYPTED_DATA_LEN_RANGE (0x41UL) +#define CKR_FUNCTION_CANCELED (0x50UL) +#define CKR_FUNCTION_NOT_PARALLEL (0x51UL) +#define CKR_FUNCTION_NOT_SUPPORTED (0x54UL) +#define CKR_KEY_HANDLE_INVALID (0x60UL) +#define CKR_KEY_SIZE_RANGE (0x62UL) +#define CKR_KEY_TYPE_INCONSISTENT (0x63UL) +#define CKR_KEY_NOT_NEEDED (0x64UL) +#define CKR_KEY_CHANGED (0x65UL) +#define CKR_KEY_NEEDED (0x66UL) +#define CKR_KEY_INDIGESTIBLE (0x67UL) +#define CKR_KEY_FUNCTION_NOT_PERMITTED (0x68UL) +#define CKR_KEY_NOT_WRAPPABLE (0x69UL) +#define CKR_KEY_UNEXTRACTABLE (0x6aUL) +#define CKR_MECHANISM_INVALID (0x70UL) +#define CKR_MECHANISM_PARAM_INVALID (0x71UL) +#define CKR_OBJECT_HANDLE_INVALID (0x82UL) +#define CKR_OPERATION_ACTIVE (0x90UL) +#define CKR_OPERATION_NOT_INITIALIZED (0x91UL) +#define CKR_PIN_INCORRECT (0xa0UL) +#define CKR_PIN_INVALID (0xa1UL) +#define CKR_PIN_LEN_RANGE (0xa2UL) +#define CKR_PIN_EXPIRED (0xa3UL) +#define CKR_PIN_LOCKED (0xa4UL) +#define CKR_SESSION_CLOSED (0xb0UL) +#define CKR_SESSION_COUNT (0xb1UL) +#define CKR_SESSION_HANDLE_INVALID (0xb3UL) +#define CKR_SESSION_PARALLEL_NOT_SUPPORTED (0xb4UL) +#define CKR_SESSION_READ_ONLY (0xb5UL) +#define CKR_SESSION_EXISTS (0xb6UL) +#define CKR_SESSION_READ_ONLY_EXISTS (0xb7UL) +#define CKR_SESSION_READ_WRITE_SO_EXISTS (0xb8UL) +#define CKR_SIGNATURE_INVALID (0xc0UL) +#define CKR_SIGNATURE_LEN_RANGE (0xc1UL) +#define CKR_TEMPLATE_INCOMPLETE (0xd0UL) +#define CKR_TEMPLATE_INCONSISTENT (0xd1UL) +#define CKR_TOKEN_NOT_PRESENT (0xe0UL) +#define CKR_TOKEN_NOT_RECOGNIZED (0xe1UL) +#define CKR_TOKEN_WRITE_PROTECTED (0xe2UL) +#define CKR_UNWRAPPING_KEY_HANDLE_INVALID (0xf0UL) +#define CKR_UNWRAPPING_KEY_SIZE_RANGE (0xf1UL) #define CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT (0xf2UL) -#define CKR_USER_ALREADY_LOGGED_IN (0x100UL) -#define CKR_USER_NOT_LOGGED_IN (0x101UL) -#define CKR_USER_PIN_NOT_INITIALIZED (0x102UL) -#define CKR_USER_TYPE_INVALID (0x103UL) -#define CKR_USER_ANOTHER_ALREADY_LOGGED_IN (0x104UL) -#define CKR_USER_TOO_MANY_TYPES (0x105UL) -#define CKR_WRAPPED_KEY_INVALID (0x110UL) -#define CKR_WRAPPED_KEY_LEN_RANGE (0x112UL) -#define CKR_WRAPPING_KEY_HANDLE_INVALID (0x113UL) -#define CKR_WRAPPING_KEY_SIZE_RANGE (0x114UL) -#define CKR_WRAPPING_KEY_TYPE_INCONSISTENT (0x115UL) -#define CKR_RANDOM_SEED_NOT_SUPPORTED (0x120UL) -#define CKR_RANDOM_NO_RNG (0x121UL) -#define CKR_DOMAIN_PARAMS_INVALID (0x130UL) -#define CKR_BUFFER_TOO_SMALL (0x150UL) -#define CKR_SAVED_STATE_INVALID (0x160UL) -#define CKR_INFORMATION_SENSITIVE (0x170UL) -#define CKR_STATE_UNSAVEABLE (0x180UL) -#define CKR_CRYPTOKI_NOT_INITIALIZED (0x190UL) -#define CKR_CRYPTOKI_ALREADY_INITIALIZED (0x191UL) -#define CKR_MUTEX_BAD (0x1a0UL) -#define CKR_MUTEX_NOT_LOCKED (0x1a1UL) -#define CKR_NEW_PIN_MODE (0x1b0UL) -#define CKR_NEXT_OTP (0x1b1UL) -#define CKR_EXCEEDED_MAX_ITERATIONS (0x1c0UL) -#define CKR_FIPS_SELF_TEST_FAILED (0x1c1UL) -#define CKR_LIBRARY_LOAD_FAILED (0x1c2UL) -#define CKR_PIN_TOO_WEAK (0x1c3UL) -#define CKR_PUBLIC_KEY_INVALID (0x1c4UL) -#define CKR_FUNCTION_REJECTED (0x200UL) -#define CKR_VENDOR_DEFINED ((unsigned long)(1UL << 31)) +#define CKR_USER_ALREADY_LOGGED_IN (0x100UL) +#define CKR_USER_NOT_LOGGED_IN (0x101UL) +#define CKR_USER_PIN_NOT_INITIALIZED (0x102UL) +#define CKR_USER_TYPE_INVALID (0x103UL) +#define CKR_USER_ANOTHER_ALREADY_LOGGED_IN (0x104UL) +#define CKR_USER_TOO_MANY_TYPES (0x105UL) +#define CKR_WRAPPED_KEY_INVALID (0x110UL) +#define CKR_WRAPPED_KEY_LEN_RANGE (0x112UL) +#define CKR_WRAPPING_KEY_HANDLE_INVALID (0x113UL) +#define CKR_WRAPPING_KEY_SIZE_RANGE (0x114UL) +#define CKR_WRAPPING_KEY_TYPE_INCONSISTENT (0x115UL) +#define CKR_RANDOM_SEED_NOT_SUPPORTED (0x120UL) +#define CKR_RANDOM_NO_RNG (0x121UL) +#define CKR_DOMAIN_PARAMS_INVALID (0x130UL) +#define CKR_BUFFER_TOO_SMALL (0x150UL) +#define CKR_SAVED_STATE_INVALID (0x160UL) +#define CKR_INFORMATION_SENSITIVE (0x170UL) +#define CKR_STATE_UNSAVEABLE (0x180UL) +#define CKR_CRYPTOKI_NOT_INITIALIZED (0x190UL) +#define CKR_CRYPTOKI_ALREADY_INITIALIZED (0x191UL) +#define CKR_MUTEX_BAD (0x1a0UL) +#define CKR_MUTEX_NOT_LOCKED (0x1a1UL) +#define CKR_NEW_PIN_MODE (0x1b0UL) +#define CKR_NEXT_OTP (0x1b1UL) +#define CKR_EXCEEDED_MAX_ITERATIONS (0x1c0UL) +#define CKR_FIPS_SELF_TEST_FAILED (0x1c1UL) +#define CKR_LIBRARY_LOAD_FAILED (0x1c2UL) +#define CKR_PIN_TOO_WEAK (0x1c3UL) +#define CKR_PUBLIC_KEY_INVALID (0x1c4UL) +#define CKR_FUNCTION_REJECTED (0x200UL) +#define CKR_VENDOR_DEFINED ((unsigned long)(1UL << 31)) #define CKZ_DATA_SPECIFIED (0x01UL) @@ -1463,7 +1463,7 @@ typedef CK_ULONG * CK_ULONG_PTR; typedef void * CK_VOID_PTR; typedef void ** CK_VOID_PTR_PTR; #define CK_FALSE 0 -#define CK_TRUE 1 +#define CK_TRUE 1 #ifndef CK_DISABLE_TRUE_FALSE #ifndef FALSE #define FALSE 0 diff --git a/lib/isc/iterated_hash.c b/lib/isc/iterated_hash.c index 33ffbcea62..f4b15e5382 100644 --- a/lib/isc/iterated_hash.c +++ b/lib/isc/iterated_hash.c @@ -19,13 +19,12 @@ int isc_iterated_hash(unsigned char *out, const unsigned int hashalg, const int iterations, const unsigned char *salt, const int saltlength, const unsigned char *in, - const int inlength) -{ - isc_md_t * md; - isc_result_t result; - int n = 0; - unsigned int outlength = 0; - size_t len; + const int inlength) { + isc_md_t *md; + isc_result_t result; + int n = 0; + unsigned int outlength = 0; + size_t len; const unsigned char *buf; REQUIRE(out != NULL); diff --git a/lib/isc/lex.c b/lib/isc/lex.c index f49762ef2a..cd44fe3078 100644 --- a/lib/isc/lex.c +++ b/lib/isc/lex.c @@ -28,42 +28,41 @@ #include typedef struct inputsource { - isc_result_t result; - bool is_file; - bool need_close; - bool at_eof; - bool last_was_eol; + isc_result_t result; + bool is_file; + bool need_close; + bool at_eof; + bool last_was_eol; isc_buffer_t *pushback; - unsigned int ignored; - void * input; - char * name; + unsigned int ignored; + void *input; + char *name; unsigned long line; unsigned long saved_line; ISC_LINK(struct inputsource) link; } inputsource; -#define LEX_MAGIC ISC_MAGIC('L', 'e', 'x', '!') +#define LEX_MAGIC ISC_MAGIC('L', 'e', 'x', '!') #define VALID_LEX(l) ISC_MAGIC_VALID(l, LEX_MAGIC) struct isc_lex { /* Unlocked. */ - unsigned int magic; - isc_mem_t * mctx; - size_t max_token; - char * data; - unsigned int comments; - bool comment_ok; - bool last_was_eol; - unsigned int brace_count; - unsigned int paren_count; - unsigned int saved_paren_count; + unsigned int magic; + isc_mem_t *mctx; + size_t max_token; + char *data; + unsigned int comments; + bool comment_ok; + bool last_was_eol; + unsigned int brace_count; + unsigned int paren_count; + unsigned int saved_paren_count; isc_lexspecials_t specials; LIST(struct inputsource) sources; }; static inline isc_result_t -grow_data(isc_lex_t *lex, size_t *remainingp, char **currp, char **prevp) -{ +grow_data(isc_lex_t *lex, size_t *remainingp, char **currp, char **prevp) { char *tmp; tmp = isc_mem_get(lex->mctx, lex->max_token * 2 + 1); @@ -80,8 +79,7 @@ grow_data(isc_lex_t *lex, size_t *remainingp, char **currp, char **prevp) } isc_result_t -isc_lex_create(isc_mem_t *mctx, size_t max_token, isc_lex_t **lexp) -{ +isc_lex_create(isc_mem_t *mctx, size_t max_token, isc_lex_t **lexp) { isc_lex_t *lex; /* @@ -113,8 +111,7 @@ isc_lex_create(isc_mem_t *mctx, size_t max_token, isc_lex_t **lexp) } void -isc_lex_destroy(isc_lex_t **lexp) -{ +isc_lex_destroy(isc_lex_t **lexp) { isc_lex_t *lex; /* @@ -137,8 +134,7 @@ isc_lex_destroy(isc_lex_t **lexp) } unsigned int -isc_lex_getcomments(isc_lex_t *lex) -{ +isc_lex_getcomments(isc_lex_t *lex) { /* * Return the current lexer commenting styles. */ @@ -149,8 +145,7 @@ isc_lex_getcomments(isc_lex_t *lex) } void -isc_lex_setcomments(isc_lex_t *lex, unsigned int comments) -{ +isc_lex_setcomments(isc_lex_t *lex, unsigned int comments) { /* * Set allowed lexer commenting styles. */ @@ -161,8 +156,7 @@ isc_lex_setcomments(isc_lex_t *lex, unsigned int comments) } void -isc_lex_getspecials(isc_lex_t *lex, isc_lexspecials_t specials) -{ +isc_lex_getspecials(isc_lex_t *lex, isc_lexspecials_t specials) { /* * Put the current list of specials into 'specials'. */ @@ -173,8 +167,7 @@ isc_lex_getspecials(isc_lex_t *lex, isc_lexspecials_t specials) } void -isc_lex_setspecials(isc_lex_t *lex, isc_lexspecials_t specials) -{ +isc_lex_setspecials(isc_lex_t *lex, isc_lexspecials_t specials) { /* * The characters in 'specials' are returned as tokens. Along with * whitespace, they delimit strings and numbers. @@ -187,8 +180,7 @@ isc_lex_setspecials(isc_lex_t *lex, isc_lexspecials_t specials) static inline isc_result_t new_source(isc_lex_t *lex, bool is_file, bool need_close, void *input, - const char *name) -{ + const char *name) { inputsource *source; source = isc_mem_get(lex->mctx, sizeof(*source)); @@ -210,10 +202,9 @@ new_source(isc_lex_t *lex, bool is_file, bool need_close, void *input, } isc_result_t -isc_lex_openfile(isc_lex_t *lex, const char *filename) -{ +isc_lex_openfile(isc_lex_t *lex, const char *filename) { isc_result_t result; - FILE * stream = NULL; + FILE *stream = NULL; /* * Open 'filename' and make it the current input source for 'lex'. @@ -234,8 +225,7 @@ isc_lex_openfile(isc_lex_t *lex, const char *filename) } isc_result_t -isc_lex_openstream(isc_lex_t *lex, FILE *stream) -{ +isc_lex_openstream(isc_lex_t *lex, FILE *stream) { char name[128]; /* @@ -250,8 +240,7 @@ isc_lex_openstream(isc_lex_t *lex, FILE *stream) } isc_result_t -isc_lex_openbuffer(isc_lex_t *lex, isc_buffer_t *buffer) -{ +isc_lex_openbuffer(isc_lex_t *lex, isc_buffer_t *buffer) { char name[128]; /* @@ -266,8 +255,7 @@ isc_lex_openbuffer(isc_lex_t *lex, isc_buffer_t *buffer) } isc_result_t -isc_lex_close(isc_lex_t *lex) -{ +isc_lex_close(isc_lex_t *lex) { inputsource *source; /* @@ -311,8 +299,7 @@ typedef enum { #define IWSEOL (ISC_LEXOPT_INITIALWS | ISC_LEXOPT_EOL) static void -pushback(inputsource *source, int c) -{ +pushback(inputsource *source, int c) { REQUIRE(source->pushback->current > 0); if (c == EOF) { source->at_eof = false; @@ -325,13 +312,12 @@ pushback(inputsource *source, int c) } static isc_result_t -pushandgrow(isc_lex_t *lex, inputsource *source, int c) -{ +pushandgrow(isc_lex_t *lex, inputsource *source, int c) { if (isc_buffer_availablelength(source->pushback) == 0) { isc_buffer_t *tbuf = NULL; - unsigned int oldlen; - isc_region_t used; - isc_result_t result; + unsigned int oldlen; + isc_region_t used; + isc_result_t result; oldlen = isc_buffer_length(source->pushback); isc_buffer_allocate(lex->mctx, &tbuf, oldlen * 2); @@ -347,22 +333,21 @@ pushandgrow(isc_lex_t *lex, inputsource *source, int c) } isc_result_t -isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) -{ - inputsource * source; - int c; - bool done = false; - bool no_comments = false; - bool escaped = false; - lexstate state = lexstate_start; - lexstate saved_state = lexstate_start; +isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) { + inputsource *source; + int c; + bool done = false; + bool no_comments = false; + bool escaped = false; + lexstate state = lexstate_start; + lexstate saved_state = lexstate_start; isc_buffer_t *buffer; - FILE * stream; - char * curr, *prev; - size_t remaining; - uint32_t as_ulong; - unsigned int saved_options; - isc_result_t result; + FILE *stream; + char *curr, *prev; + size_t remaining; + uint32_t as_ulong; + unsigned int saved_options; + isc_result_t result; /* * Get the next token. @@ -387,15 +372,15 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) lex->saved_paren_count = lex->paren_count; source->saved_line = source->line; - if (isc_buffer_remaininglength(source->pushback) == 0 && - source->at_eof) { + if (isc_buffer_remaininglength(source->pushback) == 0 && source->at_eof) + { if ((options & ISC_LEXOPT_DNSMULTILINE) != 0 && lex->paren_count != 0) { lex->paren_count = 0; return (ISC_R_UNBALANCED); } - if ((options & ISC_LEXOPT_BTEXT) != 0 && - lex->brace_count != 0) { + if ((options & ISC_LEXOPT_BTEXT) != 0 && lex->brace_count != 0) + { lex->brace_count = 0; return (ISC_R_UNBALANCED); } @@ -482,7 +467,8 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) if (lex->comment_ok && !no_comments) { if (!escaped && c == ';' && ((lex->comments & ISC_LEXCOMMENT_DNSMASTERFILE) != - 0)) { + 0)) + { saved_state = state; state = lexstate_eatline; no_comments = true; @@ -490,7 +476,8 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) } else if (c == '/' && (lex->comments & (ISC_LEXCOMMENT_C | - ISC_LEXCOMMENT_CPLUSPLUS)) != 0) { + ISC_LEXCOMMENT_CPLUSPLUS)) != 0) + { saved_state = state; state = lexstate_maybecomment; no_comments = true; @@ -614,7 +601,8 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) case lexstate_number: if (c == EOF || !isdigit((unsigned char)c)) { if (c == ' ' || c == '\t' || c == '\r' || - c == '\n' || c == EOF || lex->specials[c]) { + c == '\n' || c == EOF || lex->specials[c]) + { int base; if ((options & ISC_LEXOPT_OCTAL) != 0) { base = 8; @@ -653,7 +641,8 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) 0 || ((c != 'x' && c != 'X') || (curr != &lex->data[1]) || - (lex->data[0] != '0'))) { + (lex->data[0] != '0'))) + { /* Above test supports hex numbers */ state = lexstate_string; } @@ -680,7 +669,8 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) */ if (c == '\r' || c == '\n' || c == EOF || (!escaped && - (c == ' ' || c == '\t' || lex->specials[c]))) { + (c == ' ' || c == '\t' || lex->specials[c]))) + { pushback(source, c); if (source->result != ISC_R_SUCCESS) { result = source->result; @@ -711,13 +701,13 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) remaining--; break; case lexstate_maybecomment: - if (c == '*' && - (lex->comments & ISC_LEXCOMMENT_C) != 0) { + if (c == '*' && (lex->comments & ISC_LEXCOMMENT_C) != 0) + { state = lexstate_ccomment; continue; - } else if (c == '/' && - (lex->comments & ISC_LEXCOMMENT_CPLUSPLUS) != - 0) { + } else if (c == '/' && (lex->comments & + ISC_LEXCOMMENT_CPLUSPLUS) != 0) + { state = lexstate_eatline; continue; } @@ -881,8 +871,7 @@ done: isc_result_t isc_lex_getmastertoken(isc_lex_t *lex, isc_token_t *token, - isc_tokentype_t expect, bool eol) -{ + isc_tokentype_t expect, bool eol) { unsigned int options = ISC_LEXOPT_EOL | ISC_LEXOPT_EOF | ISC_LEXOPT_DNSMULTILINE | ISC_LEXOPT_ESCAPE; isc_result_t result; @@ -901,7 +890,8 @@ isc_lex_getmastertoken(isc_lex_t *lex, isc_token_t *token, } if (eol && ((token->type == isc_tokentype_eol) || - (token->type == isc_tokentype_eof))) { + (token->type == isc_tokentype_eof))) + { return (ISC_R_SUCCESS); } if (token->type == isc_tokentype_string && @@ -923,8 +913,7 @@ isc_lex_getmastertoken(isc_lex_t *lex, isc_token_t *token, } isc_result_t -isc_lex_getoctaltoken(isc_lex_t *lex, isc_token_t *token, bool eol) -{ +isc_lex_getoctaltoken(isc_lex_t *lex, isc_token_t *token, bool eol) { unsigned int options = ISC_LEXOPT_EOL | ISC_LEXOPT_EOF | ISC_LEXOPT_DNSMULTILINE | ISC_LEXOPT_ESCAPE | ISC_LEXOPT_NUMBER | ISC_LEXOPT_OCTAL; @@ -939,7 +928,8 @@ isc_lex_getoctaltoken(isc_lex_t *lex, isc_token_t *token, bool eol) } if (eol && ((token->type == isc_tokentype_eol) || - (token->type == isc_tokentype_eof))) { + (token->type == isc_tokentype_eof))) + { return (ISC_R_SUCCESS); } if (token->type != isc_tokentype_number) { @@ -954,8 +944,7 @@ isc_lex_getoctaltoken(isc_lex_t *lex, isc_token_t *token, bool eol) } void -isc_lex_ungettoken(isc_lex_t *lex, isc_token_t *tokenp) -{ +isc_lex_ungettoken(isc_lex_t *lex, isc_token_t *tokenp) { inputsource *source; /* * Unget the current token. @@ -977,8 +966,7 @@ isc_lex_ungettoken(isc_lex_t *lex, isc_token_t *tokenp) } void -isc_lex_getlasttokentext(isc_lex_t *lex, isc_token_t *tokenp, isc_region_t *r) -{ +isc_lex_getlasttokentext(isc_lex_t *lex, isc_token_t *tokenp, isc_region_t *r) { inputsource *source; REQUIRE(VALID_LEX(lex)); @@ -993,13 +981,12 @@ isc_lex_getlasttokentext(isc_lex_t *lex, isc_token_t *tokenp, isc_region_t *r) INSIST(source->ignored <= isc_buffer_consumedlength(source->pushback)); r->base = (unsigned char *)isc_buffer_base(source->pushback) + source->ignored; - r->length = - isc_buffer_consumedlength(source->pushback) - source->ignored; + r->length = isc_buffer_consumedlength(source->pushback) - + source->ignored; } char * -isc_lex_getsourcename(isc_lex_t *lex) -{ +isc_lex_getsourcename(isc_lex_t *lex) { inputsource *source; REQUIRE(VALID_LEX(lex)); @@ -1013,8 +1000,7 @@ isc_lex_getsourcename(isc_lex_t *lex) } unsigned long -isc_lex_getsourceline(isc_lex_t *lex) -{ +isc_lex_getsourceline(isc_lex_t *lex) { inputsource *source; REQUIRE(VALID_LEX(lex)); @@ -1028,10 +1014,9 @@ isc_lex_getsourceline(isc_lex_t *lex) } isc_result_t -isc_lex_setsourcename(isc_lex_t *lex, const char *name) -{ +isc_lex_setsourcename(isc_lex_t *lex, const char *name) { inputsource *source; - char * newname; + char *newname; REQUIRE(VALID_LEX(lex)); source = HEAD(lex->sources); @@ -1046,8 +1031,7 @@ isc_lex_setsourcename(isc_lex_t *lex, const char *name) } isc_result_t -isc_lex_setsourceline(isc_lex_t *lex, unsigned long line) -{ +isc_lex_setsourceline(isc_lex_t *lex, unsigned long line) { inputsource *source; REQUIRE(VALID_LEX(lex)); @@ -1062,8 +1046,7 @@ isc_lex_setsourceline(isc_lex_t *lex, unsigned long line) } bool -isc_lex_isfile(isc_lex_t *lex) -{ +isc_lex_isfile(isc_lex_t *lex) { inputsource *source; REQUIRE(VALID_LEX(lex)); diff --git a/lib/isc/lfsr.c b/lib/isc/lfsr.c index e3c6215cdf..169b215e09 100644 --- a/lib/isc/lfsr.c +++ b/lib/isc/lfsr.c @@ -23,8 +23,7 @@ void isc_lfsr_init(isc_lfsr_t *lfsr, uint32_t state, unsigned int bits, uint32_t tap, - unsigned int count, isc_lfsrreseed_t reseed, void *arg) -{ + unsigned int count, isc_lfsrreseed_t reseed, void *arg) { REQUIRE(VALID_LFSR(lfsr)); REQUIRE(8 <= bits && bits <= 32); REQUIRE(tap != 0); @@ -48,8 +47,7 @@ isc_lfsr_init(isc_lfsr_t *lfsr, uint32_t state, unsigned int bits, uint32_t tap, * Return the next state of the lfsr. */ static inline uint32_t -lfsr_generate(isc_lfsr_t *lfsr) -{ +lfsr_generate(isc_lfsr_t *lfsr) { /* * If the previous state is zero, we must fill it with something * here, or we will begin to generate an extremely predictable output. @@ -76,11 +74,10 @@ lfsr_generate(isc_lfsr_t *lfsr) } void -isc_lfsr_generate(isc_lfsr_t *lfsr, void *data, unsigned int count) -{ +isc_lfsr_generate(isc_lfsr_t *lfsr, void *data, unsigned int count) { unsigned char *p; - unsigned int bit; - unsigned int byte; + unsigned int bit; + unsigned int byte; REQUIRE(VALID_LFSR(lfsr)); REQUIRE(data != NULL); @@ -109,8 +106,7 @@ isc_lfsr_generate(isc_lfsr_t *lfsr, void *data, unsigned int count) } static inline uint32_t -lfsr_skipgenerate(isc_lfsr_t *lfsr, unsigned int skip) -{ +lfsr_skipgenerate(isc_lfsr_t *lfsr, unsigned int skip) { while (skip--) { (void)lfsr_generate(lfsr); } @@ -124,8 +120,7 @@ lfsr_skipgenerate(isc_lfsr_t *lfsr, unsigned int skip) * Skip "skip" states in "lfsr". */ void -isc_lfsr_skip(isc_lfsr_t *lfsr, unsigned int skip) -{ +isc_lfsr_skip(isc_lfsr_t *lfsr, unsigned int skip) { REQUIRE(VALID_LFSR(lfsr)); while (skip--) { @@ -138,8 +133,7 @@ isc_lfsr_skip(isc_lfsr_t *lfsr, unsigned int skip) * Return the final state of lfsr1 ^ lfsr2. */ uint32_t -isc_lfsr_generate32(isc_lfsr_t *lfsr1, isc_lfsr_t *lfsr2) -{ +isc_lfsr_generate32(isc_lfsr_t *lfsr1, isc_lfsr_t *lfsr2) { uint32_t state1, state2; uint32_t skip1, skip2; diff --git a/lib/isc/lib.c b/lib/isc/lib.c index a6cffe220d..f3e2070040 100644 --- a/lib/isc/lib.c +++ b/lib/isc/lib.c @@ -19,7 +19,6 @@ ***/ void -isc_lib_register(void) -{ +isc_lib_register(void) { isc_bind9 = false; } diff --git a/lib/isc/log.c b/lib/isc/log.c index 6ec0e2d97b..ac6d735324 100644 --- a/lib/isc/log.c +++ b/lib/isc/log.c @@ -33,10 +33,10 @@ #include /* dev_t FreeBSD 2.1 */ -#define LCTX_MAGIC ISC_MAGIC('L', 'c', 't', 'x') +#define LCTX_MAGIC ISC_MAGIC('L', 'c', 't', 'x') #define VALID_CONTEXT(lctx) ISC_MAGIC_VALID(lctx, LCTX_MAGIC) -#define LCFG_MAGIC ISC_MAGIC('L', 'c', 'f', 'g') +#define LCFG_MAGIC ISC_MAGIC('L', 'c', 'f', 'g') #define VALID_CONFIG(lcfg) ISC_MAGIC_VALID(lcfg, LCFG_MAGIC) /* @@ -56,10 +56,10 @@ typedef struct isc_logchannel isc_logchannel_t; struct isc_logchannel { - char * name; - unsigned int type; - int level; - unsigned int flags; + char *name; + unsigned int type; + int level; + unsigned int flags; isc_logdestination_t destination; ISC_LINK(isc_logchannel_t) link; }; @@ -76,7 +76,7 @@ typedef struct isc_logchannellist isc_logchannellist_t; struct isc_logchannellist { const isc_logmodule_t *module; - isc_logchannel_t * channel; + isc_logchannel_t *channel; ISC_LINK(isc_logchannellist_t) link; }; @@ -87,7 +87,7 @@ struct isc_logchannellist { typedef struct isc_logmessage isc_logmessage_t; struct isc_logmessage { - char * text; + char *text; isc_time_t time; ISC_LINK(isc_logmessage_t) link; }; @@ -101,14 +101,14 @@ struct isc_logmessage { */ struct isc_logconfig { unsigned int magic; - isc_log_t * lctx; + isc_log_t *lctx; ISC_LIST(isc_logchannel_t) channels; ISC_LIST(isc_logchannellist_t) * channellists; unsigned int channellist_count; unsigned int duplicate_interval; - int highest_level; - char * tag; - bool dynamic; + int highest_level; + char *tag; + bool dynamic; }; /*! @@ -130,17 +130,17 @@ struct isc_logconfig { */ struct isc_log { /* Not locked. */ - unsigned int magic; - isc_mem_t * mctx; + unsigned int magic; + isc_mem_t *mctx; isc_logcategory_t *categories; - unsigned int category_count; - isc_logmodule_t * modules; - unsigned int module_count; - int debug_level; - isc_mutex_t lock; + unsigned int category_count; + isc_logmodule_t *modules; + unsigned int module_count; + int debug_level; + isc_mutex_t lock; /* Locked by isc_log lock. */ isc_logconfig_t *logconfig; - char buffer[LOG_BUFFER_SIZE]; + char buffer[LOG_BUFFER_SIZE]; ISC_LIST(isc_logmessage_t) messages; }; @@ -196,32 +196,32 @@ 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); /*@{*/ /*! * Convenience macros. */ -#define FACILITY(channel) (channel->destination.facility) -#define FILE_NAME(channel) (channel->destination.file.name) -#define FILE_STREAM(channel) (channel->destination.file.stream) -#define FILE_VERSIONS(channel) (channel->destination.file.versions) -#define FILE_SUFFIX(channel) (channel->destination.file.suffix) -#define FILE_MAXSIZE(channel) (channel->destination.file.maximum_size) +#define FACILITY(channel) (channel->destination.facility) +#define FILE_NAME(channel) (channel->destination.file.name) +#define FILE_STREAM(channel) (channel->destination.file.stream) +#define FILE_VERSIONS(channel) (channel->destination.file.versions) +#define FILE_SUFFIX(channel) (channel->destination.file.suffix) +#define FILE_MAXSIZE(channel) (channel->destination.file.maximum_size) #define FILE_MAXREACHED(channel) (channel->destination.file.maximum_reached) /*@}*/ @@ -233,11 +233,10 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category, * Establish a new logging context, with default channels. */ isc_result_t -isc_log_create(isc_mem_t *mctx, isc_log_t **lctxp, isc_logconfig_t **lcfgp) -{ - isc_log_t * lctx; +isc_log_create(isc_mem_t *mctx, isc_log_t **lctxp, isc_logconfig_t **lcfgp) { + isc_log_t *lctx; isc_logconfig_t *lcfg = NULL; - isc_result_t result; + isc_result_t result; REQUIRE(mctx != NULL); REQUIRE(lctxp != NULL && *lctxp == NULL); @@ -297,12 +296,11 @@ isc_log_create(isc_mem_t *mctx, isc_log_t **lctxp, isc_logconfig_t **lcfgp) } isc_result_t -isc_logconfig_create(isc_log_t *lctx, isc_logconfig_t **lcfgp) -{ - isc_logconfig_t * lcfg; +isc_logconfig_create(isc_log_t *lctx, isc_logconfig_t **lcfgp) { + isc_logconfig_t *lcfg; isc_logdestination_t destination; - isc_result_t result = ISC_R_SUCCESS; - int level = ISC_LOG_INFO; + isc_result_t result = ISC_R_SUCCESS; + int level = ISC_LOG_INFO; REQUIRE(lcfgp != NULL && *lcfgp == NULL); REQUIRE(VALID_CONTEXT(lctx)); @@ -374,10 +372,9 @@ isc_logconfig_create(isc_log_t *lctx, isc_logconfig_t **lcfgp) } isc_result_t -isc_logconfig_use(isc_log_t *lctx, isc_logconfig_t *lcfg) -{ +isc_logconfig_use(isc_log_t *lctx, isc_logconfig_t *lcfg) { isc_logconfig_t *old_cfg; - isc_result_t result; + isc_result_t result; REQUIRE(VALID_CONTEXT(lctx)); REQUIRE(VALID_CONFIG(lcfg)); @@ -406,11 +403,10 @@ isc_logconfig_use(isc_log_t *lctx, isc_logconfig_t *lcfg) } void -isc_log_destroy(isc_log_t **lctxp) -{ - isc_log_t * lctx; - isc_logconfig_t * lcfg; - isc_mem_t * mctx; +isc_log_destroy(isc_log_t **lctxp) { + isc_log_t *lctx; + isc_logconfig_t *lcfg; + isc_mem_t *mctx; isc_logmessage_t *message; REQUIRE(lctxp != NULL && VALID_CONTEXT(*lctxp)); @@ -447,14 +443,13 @@ isc_log_destroy(isc_log_t **lctxp) } void -isc_logconfig_destroy(isc_logconfig_t **lcfgp) -{ - isc_logconfig_t * lcfg; - isc_mem_t * mctx; - isc_logchannel_t * channel; +isc_logconfig_destroy(isc_logconfig_t **lcfgp) { + isc_logconfig_t *lcfg; + isc_mem_t *mctx; + isc_logchannel_t *channel; isc_logchannellist_t *item; - char * filename; - unsigned int i; + char *filename; + unsigned int i; REQUIRE(lcfgp != NULL && VALID_CONFIG(*lcfgp)); @@ -517,8 +512,7 @@ isc_logconfig_destroy(isc_logconfig_t **lcfgp) } void -isc_log_registercategories(isc_log_t *lctx, isc_logcategory_t categories[]) -{ +isc_log_registercategories(isc_log_t *lctx, isc_logcategory_t categories[]) { isc_logcategory_t *catp; REQUIRE(VALID_CONTEXT(lctx)); @@ -564,8 +558,7 @@ isc_log_registercategories(isc_log_t *lctx, isc_logcategory_t categories[]) } isc_logcategory_t * -isc_log_categorybyname(isc_log_t *lctx, const char *name) -{ +isc_log_categorybyname(isc_log_t *lctx, const char *name) { isc_logcategory_t *catp; REQUIRE(VALID_CONTEXT(lctx)); @@ -590,8 +583,7 @@ isc_log_categorybyname(isc_log_t *lctx, const char *name) } void -isc_log_registermodules(isc_log_t *lctx, isc_logmodule_t modules[]) -{ +isc_log_registermodules(isc_log_t *lctx, isc_logmodule_t modules[]) { isc_logmodule_t *modp; REQUIRE(VALID_CONTEXT(lctx)); @@ -637,8 +629,7 @@ isc_log_registermodules(isc_log_t *lctx, isc_logmodule_t modules[]) } isc_logmodule_t * -isc_log_modulebyname(isc_log_t *lctx, const char *name) -{ +isc_log_modulebyname(isc_log_t *lctx, const char *name) { isc_logmodule_t *modp; REQUIRE(VALID_CONTEXT(lctx)); @@ -666,11 +657,10 @@ isc_result_t isc_log_createchannel(isc_logconfig_t *lcfg, const char *name, unsigned int type, int level, const isc_logdestination_t *destination, - unsigned int flags) -{ + unsigned int flags) { isc_logchannel_t *channel; - isc_mem_t * mctx; - unsigned int permitted = ISC_LOG_PRINTALL | ISC_LOG_DEBUGONLY | + isc_mem_t *mctx; + unsigned int permitted = ISC_LOG_PRINTALL | ISC_LOG_DEBUGONLY | ISC_LOG_BUFFERED | ISC_LOG_ISO8601 | ISC_LOG_UTC; @@ -706,8 +696,8 @@ isc_log_createchannel(isc_logconfig_t *lcfg, const char *name, * to scribble on it, so it needs to be definitely in * writable memory. */ - FILE_NAME(channel) = - isc_mem_strdup(mctx, destination->file.name); + FILE_NAME(channel) = isc_mem_strdup(mctx, + destination->file.name); FILE_STREAM(channel) = NULL; FILE_VERSIONS(channel) = destination->file.versions; FILE_SUFFIX(channel) = destination->file.suffix; @@ -749,12 +739,11 @@ isc_log_createchannel(isc_logconfig_t *lcfg, const char *name, isc_result_t isc_log_usechannel(isc_logconfig_t *lcfg, const char *name, const isc_logcategory_t *category, - const isc_logmodule_t * module) -{ - isc_log_t * lctx; + const isc_logmodule_t *module) { + isc_log_t *lctx; isc_logchannel_t *channel; - isc_result_t result = ISC_R_SUCCESS; - unsigned int i; + isc_result_t result = ISC_R_SUCCESS; + unsigned int i; REQUIRE(VALID_CONFIG(lcfg)); REQUIRE(name != NULL); @@ -765,7 +754,8 @@ isc_log_usechannel(isc_logconfig_t *lcfg, const char *name, REQUIRE(module == NULL || module->id < lctx->module_count); for (channel = ISC_LIST_HEAD(lcfg->channels); channel != NULL; - channel = ISC_LIST_NEXT(channel, link)) { + channel = ISC_LIST_NEXT(channel, link)) + { if (strcmp(name, channel->name) == 0) { break; } @@ -795,8 +785,7 @@ isc_log_usechannel(isc_logconfig_t *lcfg, const char *name, void isc_log_write(isc_log_t *lctx, isc_logcategory_t *category, - isc_logmodule_t *module, int level, const char *format, ...) -{ + isc_logmodule_t *module, int level, const char *format, ...) { va_list args; /* @@ -811,8 +800,7 @@ isc_log_write(isc_log_t *lctx, isc_logcategory_t *category, void isc_log_vwrite(isc_log_t *lctx, isc_logcategory_t *category, isc_logmodule_t *module, int level, const char *format, - va_list args) -{ + va_list args) { /* * Contract checking is done in isc_log_doit(). */ @@ -821,8 +809,7 @@ isc_log_vwrite(isc_log_t *lctx, isc_logcategory_t *category, void isc_log_write1(isc_log_t *lctx, isc_logcategory_t *category, - isc_logmodule_t *module, int level, const char *format, ...) -{ + isc_logmodule_t *module, int level, const char *format, ...) { va_list args; /* @@ -837,8 +824,7 @@ isc_log_write1(isc_log_t *lctx, isc_logcategory_t *category, void isc_log_vwrite1(isc_log_t *lctx, isc_logcategory_t *category, isc_logmodule_t *module, int level, const char *format, - va_list args) -{ + va_list args) { /* * Contract checking is done in isc_log_doit(). */ @@ -846,14 +832,12 @@ isc_log_vwrite1(isc_log_t *lctx, isc_logcategory_t *category, } void -isc_log_setcontext(isc_log_t *lctx) -{ +isc_log_setcontext(isc_log_t *lctx) { isc_lctx = lctx; } void -isc_log_setdebuglevel(isc_log_t *lctx, unsigned int level) -{ +isc_log_setdebuglevel(isc_log_t *lctx, unsigned int level) { isc_logchannel_t *channel; REQUIRE(VALID_CONTEXT(lctx)); @@ -866,10 +850,12 @@ isc_log_setdebuglevel(isc_log_t *lctx, unsigned int level) */ if (lctx->debug_level == 0) { for (channel = ISC_LIST_HEAD(lctx->logconfig->channels); - channel != NULL; channel = ISC_LIST_NEXT(channel, link)) { + channel != NULL; channel = ISC_LIST_NEXT(channel, link)) + { if (channel->type == ISC_LOG_TOFILE && (channel->flags & ISC_LOG_DEBUGONLY) != 0 && - FILE_STREAM(channel) != NULL) { + FILE_STREAM(channel) != NULL) + { { (void)fclose(FILE_STREAM(channel)); FILE_STREAM(channel) = NULL; @@ -881,32 +867,28 @@ isc_log_setdebuglevel(isc_log_t *lctx, unsigned int level) } unsigned int -isc_log_getdebuglevel(isc_log_t *lctx) -{ +isc_log_getdebuglevel(isc_log_t *lctx) { REQUIRE(VALID_CONTEXT(lctx)); return (lctx->debug_level); } void -isc_log_setduplicateinterval(isc_logconfig_t *lcfg, unsigned int interval) -{ +isc_log_setduplicateinterval(isc_logconfig_t *lcfg, unsigned int interval) { REQUIRE(VALID_CONFIG(lcfg)); lcfg->duplicate_interval = interval; } unsigned int -isc_log_getduplicateinterval(isc_logconfig_t *lcfg) -{ +isc_log_getduplicateinterval(isc_logconfig_t *lcfg) { REQUIRE(VALID_CONTEXT(lcfg)); return (lcfg->duplicate_interval); } isc_result_t -isc_log_settag(isc_logconfig_t *lcfg, const char *tag) -{ +isc_log_settag(isc_logconfig_t *lcfg, const char *tag) { REQUIRE(VALID_CONFIG(lcfg)); if (tag != NULL && *tag != '\0') { @@ -925,8 +907,7 @@ isc_log_settag(isc_logconfig_t *lcfg, const char *tag) } char * -isc_log_gettag(isc_logconfig_t *lcfg) -{ +isc_log_gettag(isc_logconfig_t *lcfg) { REQUIRE(VALID_CONFIG(lcfg)); return (lcfg->tag); @@ -934,21 +915,20 @@ isc_log_gettag(isc_logconfig_t *lcfg) /* XXXDCL NT -- This interface will assuredly be changing. */ void -isc_log_opensyslog(const char *tag, int options, int facility) -{ +isc_log_opensyslog(const char *tag, int options, int facility) { (void)openlog(tag, options, facility); } void -isc_log_closefilelogs(isc_log_t *lctx) -{ +isc_log_closefilelogs(isc_log_t *lctx) { isc_logchannel_t *channel; REQUIRE(VALID_CONTEXT(lctx)); LOCK(&lctx->lock); for (channel = ISC_LIST_HEAD(lctx->logconfig->channels); - channel != NULL; channel = ISC_LIST_NEXT(channel, link)) { + channel != NULL; channel = ISC_LIST_NEXT(channel, link)) + { if (channel->type == ISC_LOG_TOFILE && FILE_STREAM(channel) != NULL) { { @@ -966,11 +946,10 @@ isc_log_closefilelogs(isc_log_t *lctx) static isc_result_t assignchannel(isc_logconfig_t *lcfg, unsigned int category_id, - const isc_logmodule_t *module, isc_logchannel_t *channel) -{ + const isc_logmodule_t *module, isc_logchannel_t *channel) { isc_logchannellist_t *new_item; - isc_log_t * lctx; - isc_result_t result; + isc_log_t *lctx; + isc_result_t result; REQUIRE(VALID_CONFIG(lcfg)); @@ -1017,11 +996,10 @@ assignchannel(isc_logconfig_t *lcfg, unsigned int category_id, * that function would have to return isc_result_t instead of void. */ static isc_result_t -sync_channellist(isc_logconfig_t *lcfg) -{ +sync_channellist(isc_logconfig_t *lcfg) { unsigned int bytes; - isc_log_t * lctx; - void * lists; + isc_log_t *lctx; + void *lists; REQUIRE(VALID_CONFIG(lcfg)); @@ -1053,15 +1031,14 @@ sync_channellist(isc_logconfig_t *lcfg) } static isc_result_t -greatest_version(isc_logfile_t *file, int versions, int *greatestp) -{ - char * bname, *digit_end; - const char * dirname; - int version, greatest = -1; - size_t bnamelen; - isc_dir_t dir; +greatest_version(isc_logfile_t *file, int versions, int *greatestp) { + char *bname, *digit_end; + const char *dirname; + int version, greatest = -1; + size_t bnamelen; + isc_dir_t dir; isc_result_t result; - char sep = '/'; + char sep = '/'; #ifdef _WIN32 char *bname2; #endif /* ifdef _WIN32 */ @@ -1074,7 +1051,8 @@ greatest_version(isc_logfile_t *file, int versions, int *greatestp) #ifdef _WIN32 bname2 = strrchr(file->name, '\\'); if ((bname != NULL && bname2 != NULL && bname2 > bname) || - (bname == NULL && bname2 != NULL)) { + (bname == NULL && bname2 != NULL)) + { bname = bname2; sep = '\\'; } @@ -1108,7 +1086,8 @@ greatest_version(isc_logfile_t *file, int versions, int *greatestp) while (isc_dir_read(&dir) == ISC_R_SUCCESS) { if (dir.entry.length > bnamelen && strncmp(dir.entry.name, bname, bnamelen) == 0 && - dir.entry.name[bnamelen] == '.') { + dir.entry.name[bnamelen] == '.') + { version = strtol(&dir.entry.name[bnamelen + 1], &digit_end, 10); /* @@ -1137,16 +1116,15 @@ greatest_version(isc_logfile_t *file, int versions, int *greatestp) } static isc_result_t -remove_old_tsversions(isc_logfile_t *file, int versions) -{ +remove_old_tsversions(isc_logfile_t *file, int versions) { isc_result_t result; - char * bname, *digit_end; - const char * dirname; - int64_t version, last = INT64_MAX; - int64_t to_keep[ISC_LOG_MAX_VERSIONS]; - size_t bnamelen; - isc_dir_t dir; - char sep = '/'; + char *bname, *digit_end; + const char *dirname; + int64_t version, last = INT64_MAX; + int64_t to_keep[ISC_LOG_MAX_VERSIONS]; + size_t bnamelen; + isc_dir_t dir; + char sep = '/'; #ifdef _WIN32 char *bname2; #endif /* ifdef _WIN32 */ @@ -1158,7 +1136,8 @@ remove_old_tsversions(isc_logfile_t *file, int versions) #ifdef _WIN32 bname2 = strrchr(file->name, '\\'); if ((bname != NULL && bname2 != NULL && bname2 > bname) || - (bname == NULL && bname2 != NULL)) { + (bname == NULL && bname2 != NULL)) + { bname = bname2; sep = '\\'; } @@ -1197,7 +1176,8 @@ remove_old_tsversions(isc_logfile_t *file, int versions) while (isc_dir_read(&dir) == ISC_R_SUCCESS) { if (dir.entry.length > bnamelen && strncmp(dir.entry.name, bname, bnamelen) == 0 && - dir.entry.name[bnamelen] == '.') { + dir.entry.name[bnamelen] == '.') + { char *ename = &dir.entry.name[bnamelen + 1]; version = strtoull(ename, &digit_end, 10); if (*digit_end == '\0') { @@ -1231,7 +1211,8 @@ remove_old_tsversions(isc_logfile_t *file, int versions) while (isc_dir_read(&dir) == ISC_R_SUCCESS) { if (dir.entry.length > bnamelen && strncmp(dir.entry.name, bname, bnamelen) == 0 && - dir.entry.name[bnamelen] == '.') { + dir.entry.name[bnamelen] == '.') + { char *ename = &dir.entry.name[bnamelen + 1]; version = strtoull(ename, &digit_end, 10); /* @@ -1257,12 +1238,11 @@ remove_old_tsversions(isc_logfile_t *file, int versions) } static isc_result_t -roll_increment(isc_logfile_t *file) -{ - int i, n, greatest; - char current[PATH_MAX + 1]; - char newpath[PATH_MAX + 1]; - const char * path; +roll_increment(isc_logfile_t *file) { + int i, n, greatest; + char current[PATH_MAX + 1]; + char newpath[PATH_MAX + 1]; + const char *path; isc_result_t result = ISC_R_SUCCESS; REQUIRE(file != NULL); @@ -1340,13 +1320,12 @@ roll_increment(isc_logfile_t *file) } static isc_result_t -roll_timestamp(isc_logfile_t *file) -{ - int n; - char newts[PATH_MAX + 1]; - char newpath[PATH_MAX + 1]; - const char * path; - isc_time_t now; +roll_timestamp(isc_logfile_t *file) { + int n; + char newts[PATH_MAX + 1]; + char newpath[PATH_MAX + 1]; + const char *path; + isc_time_t now; isc_result_t result = ISC_R_SUCCESS; REQUIRE(file != NULL); @@ -1381,8 +1360,7 @@ roll_timestamp(isc_logfile_t *file) } isc_result_t -isc_logfile_roll(isc_logfile_t *file) -{ +isc_logfile_roll(isc_logfile_t *file) { isc_result_t result; REQUIRE(file != NULL); @@ -1414,13 +1392,12 @@ isc_logfile_roll(isc_logfile_t *file) } static isc_result_t -isc_log_open(isc_logchannel_t *channel) -{ - struct stat statbuf; - bool regular_file; - bool roll = false; +isc_log_open(isc_logchannel_t *channel) { + struct stat statbuf; + bool regular_file; + bool roll = false; isc_result_t result = ISC_R_SUCCESS; - const char * path; + const char *path; REQUIRE(channel->type == ISC_LOG_TOFILE); REQUIRE(FILE_STREAM(channel) == NULL); @@ -1440,7 +1417,8 @@ isc_log_open(isc_logchannel_t *channel) if ((FILE_MAXSIZE(channel) == 0 && FILE_VERSIONS(channel) != ISC_LOG_ROLLNEVER) || (FILE_MAXSIZE(channel) > 0 && - statbuf.st_size >= FILE_MAXSIZE(channel))) { + statbuf.st_size >= FILE_MAXSIZE(channel))) + { roll = regular_file; } } else if (errno == ENOENT) { @@ -1477,8 +1455,7 @@ isc_log_open(isc_logchannel_t *channel) } bool ISC_NO_SANITIZE -isc_log_wouldlog(isc_log_t *lctx, int level) -{ +isc_log_wouldlog(isc_log_t *lctx, int level) { /* * Try to avoid locking the mutex for messages which can't * possibly be logged to any channels -- primarily debugging @@ -1507,22 +1484,21 @@ isc_log_wouldlog(isc_log_t *lctx, int level) 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) -{ - int syslog_level; - const char * time_string; - char local_time[64]; - char iso8601z_string[64]; - char iso8601l_string[64]; - char level_string[24] = { 0 }; - struct stat statbuf; - bool matched = false; - bool printtime, iso8601, utc, printtag, printcolon; - bool printcategory, printmodule, printlevel, buffered; - isc_logconfig_t * lcfg; - isc_logchannel_t * channel; + const char *format, va_list args) { + int syslog_level; + const char *time_string; + char local_time[64]; + char iso8601z_string[64]; + char iso8601l_string[64]; + char level_string[24] = { 0 }; + struct stat statbuf; + bool matched = false; + bool printtime, iso8601, utc, printtag, printcolon; + bool printcategory, printmodule, printlevel, buffered; + isc_logconfig_t *lcfg; + isc_logchannel_t *channel; isc_logchannellist_t *category_channels; - isc_result_t result; + isc_result_t result; REQUIRE(lctx == NULL || VALID_CONTEXT(lctx)); REQUIRE(category != NULL); @@ -1572,7 +1548,8 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category, } if (category_channels == NULL && !matched && - category_channels != ISC_LIST_HEAD(lcfg->channellists[0])) { + category_channels != ISC_LIST_HEAD(lcfg->channellists[0])) + { /* * No category/module pair was explicitly configured. * Try the category named "default". @@ -1592,8 +1569,8 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category, if (category_channels->module != NULL && category_channels->module != module) { - category_channels = - ISC_LIST_NEXT(category_channels, link); + category_channels = ISC_LIST_NEXT(category_channels, + link); continue; } @@ -1656,9 +1633,9 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category, */ if (write_once) { isc_logmessage_t *message, *next; - isc_time_t oldest; - isc_interval_t interval; - size_t size; + isc_time_t oldest; + isc_interval_t interval; + size_t size; isc_interval_set(&interval, lcfg->duplicate_interval, 0); @@ -1670,8 +1647,8 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category, */ TIME_NOW(&oldest); if (isc_time_subtract(&oldest, &interval, - &oldest) != - ISC_R_SUCCESS) { + &oldest) != ISC_R_SUCCESS) + { /* * Can't effectively do the checking * without having a valid time. @@ -1792,7 +1769,8 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category, ISC_LOG_ROLLNEVER || (stat(FILE_NAME(channel), &statbuf) != 0 && errno == ENOENT) || - statbuf.st_size < FILE_MAXSIZE(channel)) { + statbuf.st_size < FILE_MAXSIZE(channel)) + { (void)fclose(FILE_STREAM(channel)); FILE_STREAM(channel) = NULL; FILE_MAXREACHED(channel) = false; @@ -1808,7 +1786,8 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category, result = isc_log_open(channel); if (result != ISC_R_SUCCESS && result != ISC_R_MAXSIZE && - (channel->flags & ISC_LOG_OPENERR) == 0) { + (channel->flags & ISC_LOG_OPENERR) == 0) + { syslog(LOG_ERR, "isc_log_open '%s' failed: %s", FILE_NAME(channel), @@ -1851,7 +1830,8 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category, /* XXXDCL complain if fstat fails? */ if (fstat(fileno(FILE_STREAM(channel)), &statbuf) >= 0 && - statbuf.st_size > FILE_MAXSIZE(channel)) { + statbuf.st_size > FILE_MAXSIZE(channel)) + { FILE_MAXREACHED(channel) = true; } } diff --git a/lib/isc/md.c b/lib/isc/md.c index 6d8990f568..101a16cdd9 100644 --- a/lib/isc/md.c +++ b/lib/isc/md.c @@ -21,16 +21,14 @@ #include isc_md_t * -isc_md_new(void) -{ +isc_md_new(void) { isc_md_t *md = EVP_MD_CTX_new(); RUNTIME_CHECK(md != NULL); return (md); } void -isc_md_free(isc_md_t *md) -{ +isc_md_free(isc_md_t *md) { if (ISC_UNLIKELY(md == NULL)) { return; } @@ -39,8 +37,7 @@ isc_md_free(isc_md_t *md) } isc_result_t -isc_md_init(isc_md_t *md, const isc_md_type_t md_type) -{ +isc_md_init(isc_md_t *md, const isc_md_type_t md_type) { REQUIRE(md != NULL); if (md_type == NULL) { @@ -55,8 +52,7 @@ isc_md_init(isc_md_t *md, const isc_md_type_t md_type) } isc_result_t -isc_md_reset(isc_md_t *md) -{ +isc_md_reset(isc_md_t *md) { REQUIRE(md != NULL); if (EVP_MD_CTX_reset(md) != 1) { @@ -67,8 +63,7 @@ isc_md_reset(isc_md_t *md) } isc_result_t -isc_md_update(isc_md_t *md, const unsigned char *buf, const size_t len) -{ +isc_md_update(isc_md_t *md, const unsigned char *buf, const size_t len) { REQUIRE(md != NULL); if (ISC_UNLIKELY(buf == NULL || len == 0)) { @@ -83,8 +78,7 @@ isc_md_update(isc_md_t *md, const unsigned char *buf, const size_t len) } isc_result_t -isc_md_final(isc_md_t *md, unsigned char *digest, unsigned int *digestlen) -{ +isc_md_final(isc_md_t *md, unsigned char *digest, unsigned int *digestlen) { REQUIRE(md != NULL); REQUIRE(digest != NULL); @@ -96,32 +90,28 @@ isc_md_final(isc_md_t *md, unsigned char *digest, unsigned int *digestlen) } isc_md_type_t -isc_md_get_md_type(isc_md_t *md) -{ +isc_md_get_md_type(isc_md_t *md) { REQUIRE(md != NULL); return (EVP_MD_CTX_md(md)); } size_t -isc_md_get_size(isc_md_t *md) -{ +isc_md_get_size(isc_md_t *md) { REQUIRE(md != NULL); return (EVP_MD_CTX_size(md)); } size_t -isc_md_get_block_size(isc_md_t *md) -{ +isc_md_get_block_size(isc_md_t *md) { REQUIRE(md != NULL); return (EVP_MD_CTX_block_size(md)); } size_t -isc_md_type_get_size(isc_md_type_t md_type) -{ +isc_md_type_get_size(isc_md_type_t md_type) { if (md_type != NULL) { return ((size_t)EVP_MD_size(md_type)); } @@ -130,8 +120,7 @@ isc_md_type_get_size(isc_md_type_t md_type) } size_t -isc_md_type_get_block_size(isc_md_type_t md_type) -{ +isc_md_type_get_block_size(isc_md_type_t md_type) { if (md_type != NULL) { return ((size_t)EVP_MD_block_size(md_type)); } @@ -141,9 +130,8 @@ isc_md_type_get_block_size(isc_md_type_t md_type) isc_result_t isc_md(isc_md_type_t md_type, const unsigned char *buf, const size_t len, - unsigned char *digest, unsigned int *digestlen) -{ - isc_md_t * md; + unsigned char *digest, unsigned int *digestlen) { + isc_md_t *md; isc_result_t res; md = isc_md_new(); diff --git a/lib/isc/mem.c b/lib/isc/mem.c index f4c12175cb..401aa2bd8f 100644 --- a/lib/isc/mem.c +++ b/lib/isc/mem.c @@ -42,7 +42,7 @@ #include "mem_p.h" -#define MCTXLOCK(m) LOCK(&m->lock) +#define MCTXLOCK(m) LOCK(&m->lock) #define MCTXUNLOCK(m) UNLOCK(&m->lock) #ifndef ISC_MEM_DEBUGGING @@ -55,33 +55,33 @@ LIBISC_EXTERNAL_DATA unsigned int isc_mem_defaultflags = ISC_MEMFLAG_DEFAULT; * Constants. */ -#define DEF_MAX_SIZE 1100 -#define DEF_MEM_TARGET 4096 -#define ALIGNMENT_SIZE 8U /*%< must be a power of 2 */ -#define NUM_BASIC_BLOCKS 64 /*%< must be > 1 */ -#define TABLE_INCREMENT 1024 +#define DEF_MAX_SIZE 1100 +#define DEF_MEM_TARGET 4096 +#define ALIGNMENT_SIZE 8U /*%< must be a power of 2 */ +#define NUM_BASIC_BLOCKS 64 /*%< must be > 1 */ +#define TABLE_INCREMENT 1024 #define DEBUG_TABLE_COUNT 512U /* * Types. */ -typedef struct isc__mem isc__mem_t; +typedef struct isc__mem isc__mem_t; typedef struct isc__mempool isc__mempool_t; #if ISC_MEM_TRACKLINES typedef struct debuglink debuglink_t; struct debuglink { ISC_LINK(debuglink_t) link; - const void * ptr; - size_t size; - const char * file; + const void *ptr; + size_t size; + const char *file; unsigned int line; }; typedef ISC_LIST(debuglink_t) debuglist_t; #define FLARG_PASS , file, line -#define FLARG , const char *file, unsigned int line +#define FLARG , const char *file, unsigned int line #else /* if ISC_MEM_TRACKLINES */ #define FLARG_PASS #define FLARG @@ -97,9 +97,9 @@ typedef struct { * This structure must be ALIGNMENT_SIZE bytes. */ union { - size_t size; + size_t size; isc__mem_t *ctx; - char bytes[ALIGNMENT_SIZE]; + char bytes[ALIGNMENT_SIZE]; } u; } size_info; @@ -110,14 +110,14 @@ struct stats { unsigned long freefrags; }; -#define MEM_MAGIC ISC_MAGIC('M', 'e', 'm', 'C') +#define MEM_MAGIC ISC_MAGIC('M', 'e', 'm', 'C') #define VALID_CONTEXT(c) ISC_MAGIC_VALID(c, MEM_MAGIC) /* List of all active memory contexts. */ static ISC_LIST(isc__mem_t) contexts; -static isc_once_t once = ISC_ONCE_INIT; +static isc_once_t once = ISC_ONCE_INIT; static isc_mutex_t contextslock; /*% @@ -135,62 +135,62 @@ typedef void *(*isc__memalloc_t)(size_t); typedef void (*isc__memfree_t)(void *); struct isc__mem { - isc_mem_t common; - unsigned int flags; - isc_mutex_t lock; + isc_mem_t common; + unsigned int flags; + isc_mutex_t lock; isc__memalloc_t memalloc; - isc__memfree_t memfree; - size_t max_size; - bool checkfree; - struct stats * stats; - isc_refcount_t references; - char name[16]; - void * tag; - size_t total; - size_t inuse; - size_t maxinuse; - size_t malloced; - size_t maxmalloced; - size_t hi_water; - size_t lo_water; - bool hi_called; - bool is_overmem; + isc__memfree_t memfree; + size_t max_size; + bool checkfree; + struct stats *stats; + isc_refcount_t references; + char name[16]; + void *tag; + size_t total; + size_t inuse; + size_t maxinuse; + size_t malloced; + size_t maxmalloced; + size_t hi_water; + size_t lo_water; + bool hi_called; + bool is_overmem; isc_mem_water_t water; - void * water_arg; + void *water_arg; ISC_LIST(isc__mempool_t) pools; unsigned int poolcnt; /* ISC_MEMFLAG_INTERNAL */ - size_t mem_target; - element ** freelists; - element * basic_blocks; + size_t mem_target; + element **freelists; + element *basic_blocks; unsigned char **basic_table; - unsigned int basic_table_count; - unsigned int basic_table_size; - unsigned char * lowest; - unsigned char * highest; + unsigned int basic_table_count; + unsigned int basic_table_size; + unsigned char *lowest; + unsigned char *highest; #if ISC_MEM_TRACKLINES debuglist_t *debuglist; - size_t debuglistcnt; + size_t debuglistcnt; #endif /* if ISC_MEM_TRACKLINES */ ISC_LINK(isc__mem_t) link; }; -#define MEMPOOL_MAGIC ISC_MAGIC('M', 'E', 'M', 'p') +#define MEMPOOL_MAGIC ISC_MAGIC('M', 'E', 'M', 'p') #define VALID_MEMPOOL(c) ISC_MAGIC_VALID(c, MEMPOOL_MAGIC) struct isc__mempool { /* always unlocked */ isc_mempool_t common; /*%< common header of mempool's */ - isc_mutex_t * lock; /*%< optional lock */ - isc__mem_t * mctx; /*%< our memory context */ + isc_mutex_t *lock; /*%< optional lock */ + isc__mem_t *mctx; /*%< our memory context */ /*%< locked via the memory context's lock */ ISC_LINK(isc__mempool_t) link; /*%< next pool in this mem context */ /*%< optionally locked from here down */ - element * items; /*%< low water item list */ - size_t size; /*%< size of each item on this pool */ + element *items; /*%< low water item list */ + size_t size; /*%< size of each item on this pool */ unsigned int maxalloc; /*%< max number of items allowed */ unsigned int allocated; /*%< # of items currently given out */ unsigned int freecount; /*%< # of items on reserved list */ @@ -227,25 +227,18 @@ 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, @@ -258,11 +251,10 @@ static isc_memmethods_t memmethods = { * mctx must be locked. */ static void -add_trace_entry(isc__mem_t *mctx, const void *ptr, size_t size FLARG) -{ +add_trace_entry(isc__mem_t *mctx, const void *ptr, size_t size FLARG) { debuglink_t *dl; - uint32_t hash; - uint32_t idx; + uint32_t hash; + uint32_t idx; if ((isc_mem_debugging & ISC_MEM_DEBUGTRACE) != 0) { fprintf(stderr, "add %p size %zu file %s line %u mctx %p\n", @@ -295,11 +287,10 @@ add_trace_entry(isc__mem_t *mctx, const void *ptr, size_t size FLARG) static void delete_trace_entry(isc__mem_t *mctx, const void *ptr, size_t size, - const char *file, unsigned int line) -{ + const char *file, unsigned int line) { debuglink_t *dl; - uint32_t hash; - uint32_t idx; + uint32_t hash; + uint32_t idx; if ((isc_mem_debugging & ISC_MEM_DEBUGTRACE) != 0) { fprintf(stderr, "del %p size %zu file %s line %u mctx %p\n", @@ -334,8 +325,7 @@ delete_trace_entry(isc__mem_t *mctx, const void *ptr, size_t size, #endif /* ISC_MEM_TRACKLINES */ static inline size_t -rmsize(size_t size) -{ +rmsize(size_t size) { /* * round down to ALIGNMENT_SIZE */ @@ -343,8 +333,7 @@ rmsize(size_t size) } static inline size_t -quantize(size_t size) -{ +quantize(size_t size) { /*! * Round up the result in order to get a size big * enough to satisfy the request and be aligned on ALIGNMENT_SIZE @@ -358,13 +347,12 @@ quantize(size_t size) } static inline void -more_basic_blocks(isc__mem_t *ctx) -{ - void * tmp; - unsigned char * curr, *next; - unsigned char * first, *last; +more_basic_blocks(isc__mem_t *ctx) { + void *tmp; + unsigned char *curr, *next; + unsigned char *first, *last; unsigned char **table; - unsigned int table_size; + unsigned int table_size; /* Require: we hold the context lock. */ @@ -381,8 +369,8 @@ more_basic_blocks(isc__mem_t *ctx) ctx->basic_table_size * sizeof(unsigned char *)); (ctx->memfree)(ctx->basic_table); - ctx->malloced -= - ctx->basic_table_size * sizeof(unsigned char *); + ctx->malloced -= ctx->basic_table_size * + sizeof(unsigned char *); } ctx->basic_table = table; ctx->basic_table_size = table_size; @@ -421,11 +409,10 @@ more_basic_blocks(isc__mem_t *ctx) } static inline void -more_frags(isc__mem_t *ctx, size_t new_size) -{ - int frags; - size_t total_size; - void * tmp; +more_frags(isc__mem_t *ctx, size_t new_size) { + int frags; + size_t total_size; + void *tmp; unsigned char *curr, *next; /*! @@ -473,10 +460,9 @@ more_frags(isc__mem_t *ctx, size_t new_size) } static inline void * -mem_getunlocked(isc__mem_t *ctx, size_t size) -{ +mem_getunlocked(isc__mem_t *ctx, size_t size) { size_t new_size = quantize(size); - void * ret; + void *ret; if (new_size >= ctx->max_size) { /* @@ -528,7 +514,8 @@ mem_getunlocked(isc__mem_t *ctx, size_t size) done: if (ISC_UNLIKELY((ctx->flags & ISC_MEMFLAG_FILL) != 0) && - ISC_LIKELY(ret != NULL)) { + ISC_LIKELY(ret != NULL)) + { memset(ret, 0xbe, new_size); /* Mnemonic for "beef". */ } @@ -537,8 +524,7 @@ done: #if ISC_MEM_CHECKOVERRUN static inline void -check_overrun(void *mem, size_t size, size_t new_size) -{ +check_overrun(void *mem, size_t size, size_t new_size) { unsigned char *cp; cp = (unsigned char *)mem; @@ -553,8 +539,7 @@ check_overrun(void *mem, size_t size, size_t new_size) /* coverity[+free : arg-1] */ static inline void -mem_putunlocked(isc__mem_t *ctx, void *mem, size_t size) -{ +mem_putunlocked(isc__mem_t *ctx, void *mem, size_t size) { size_t new_size = quantize(size); if (new_size >= ctx->max_size) { @@ -603,8 +588,7 @@ mem_putunlocked(isc__mem_t *ctx, void *mem, size_t size) * Perform a malloc, doing memory filling and overrun detection as necessary. */ static inline void * -mem_get(isc__mem_t *ctx, size_t size) -{ +mem_get(isc__mem_t *ctx, size_t size) { char *ret; #if ISC_MEM_CHECKOVERRUN @@ -618,7 +602,8 @@ mem_get(isc__mem_t *ctx, size_t size) } } #if ISC_MEM_CHECKOVERRUN - else { + else + { if (ISC_LIKELY(ret != NULL)) { ret[size - 1] = 0xbe; } @@ -633,8 +618,7 @@ mem_get(isc__mem_t *ctx, size_t size) */ /* coverity[+free : arg-1] */ static inline void -mem_put(isc__mem_t *ctx, void *mem, size_t size) -{ +mem_put(isc__mem_t *ctx, void *mem, size_t size) { #if ISC_MEM_CHECKOVERRUN INSIST(((unsigned char *)mem)[size] == 0xbe); size += 1; @@ -649,8 +633,7 @@ mem_put(isc__mem_t *ctx, void *mem, size_t size) * Update internal counters after a memory get. */ static inline void -mem_getstats(isc__mem_t *ctx, size_t size) -{ +mem_getstats(isc__mem_t *ctx, size_t size) { ctx->total += size; ctx->inuse += size; @@ -675,8 +658,7 @@ mem_getstats(isc__mem_t *ctx, size_t size) * Update internal counters after a memory put. */ static inline void -mem_putstats(isc__mem_t *ctx, void *ptr, size_t size) -{ +mem_putstats(isc__mem_t *ctx, void *ptr, size_t size) { UNUSED(ptr); INSIST(ctx->inuse >= size); @@ -700,8 +682,7 @@ mem_putstats(isc__mem_t *ctx, void *ptr, size_t size) */ static void * -default_memalloc(size_t size) -{ +default_memalloc(size_t size) { void *ptr; ptr = malloc(size); @@ -732,22 +713,19 @@ default_memalloc(size_t size) } static void -default_memfree(void *ptr) -{ +default_memfree(void *ptr) { free(ptr); } static void -initialize_action(void) -{ +initialize_action(void) { isc_mutex_init(&contextslock); ISC_LIST_INIT(contexts); totallost = 0; } static void -mem_create(isc_mem_t **ctxp, unsigned int flags) -{ +mem_create(isc_mem_t **ctxp, unsigned int flags) { REQUIRE(ctxp != NULL && *ctxp == NULL); isc__mem_t *ctx; @@ -841,8 +819,7 @@ mem_create(isc_mem_t **ctxp, unsigned int flags) */ static void -destroy(isc__mem_t *ctx) -{ +destroy(isc__mem_t *ctx) { unsigned int i; LOCK(&contextslock); @@ -860,7 +837,8 @@ destroy(isc__mem_t *ctx) debuglink_t *dl; for (i = 0; i < DEBUG_TABLE_COUNT; i++) { for (dl = ISC_LIST_HEAD(ctx->debuglist[i]); dl != NULL; - dl = ISC_LIST_HEAD(ctx->debuglist[i])) { + dl = ISC_LIST_HEAD(ctx->debuglist[i])) + { if (ctx->checkfree && dl->ptr != NULL) { print_active(ctx, stderr); } @@ -905,8 +883,8 @@ destroy(isc__mem_t *ctx) ctx->malloced -= ctx->max_size * sizeof(element *); if (ctx->basic_table != NULL) { (ctx->memfree)(ctx->basic_table); - ctx->malloced -= - ctx->basic_table_size * sizeof(unsigned char *); + ctx->malloced -= ctx->basic_table_size * + sizeof(unsigned char *); } } @@ -920,8 +898,7 @@ destroy(isc__mem_t *ctx) } void -isc_mem_attach(isc_mem_t *source0, isc_mem_t **targetp) -{ +isc_mem_attach(isc_mem_t *source0, isc_mem_t **targetp) { REQUIRE(VALID_CONTEXT(source0)); REQUIRE(targetp != NULL && *targetp == NULL); @@ -933,8 +910,7 @@ isc_mem_attach(isc_mem_t *source0, isc_mem_t **targetp) } void -isc_mem_detach(isc_mem_t **ctxp) -{ +isc_mem_detach(isc_mem_t **ctxp) { REQUIRE(ctxp != NULL && VALID_CONTEXT(*ctxp)); isc__mem_t *ctx = (isc__mem_t *)*ctxp; @@ -957,8 +933,7 @@ isc_mem_detach(isc_mem_t **ctxp) */ void -isc___mem_putanddetach(isc_mem_t **ctxp, void *ptr, size_t size FLARG) -{ +isc___mem_putanddetach(isc_mem_t **ctxp, void *ptr, size_t size FLARG) { REQUIRE(ctxp != NULL && VALID_CONTEXT(*ctxp)); REQUIRE(ptr != NULL); @@ -966,10 +941,11 @@ isc___mem_putanddetach(isc_mem_t **ctxp, void *ptr, size_t size FLARG) *ctxp = NULL; if (ISC_UNLIKELY((isc_mem_debugging & - (ISC_MEM_DEBUGSIZE | ISC_MEM_DEBUGCTX)) != 0)) { + (ISC_MEM_DEBUGSIZE | ISC_MEM_DEBUGCTX)) != 0)) + { if ((isc_mem_debugging & ISC_MEM_DEBUGSIZE) != 0) { size_info *si = &(((size_info *)ptr)[-1]); - size_t oldsize = si->u.size - ALIGNMENT_SIZE; + size_t oldsize = si->u.size - ALIGNMENT_SIZE; if ((isc_mem_debugging & ISC_MEM_DEBUGCTX) != 0) { oldsize -= ALIGNMENT_SIZE; } @@ -1000,8 +976,7 @@ destroy: } void -isc_mem_destroy(isc_mem_t **ctxp) -{ +isc_mem_destroy(isc_mem_t **ctxp) { /* * This routine provides legacy support for callers who use mctxs * without attaching/detaching. @@ -1025,16 +1000,16 @@ isc_mem_destroy(isc_mem_t **ctxp) } void * -isc___mem_get(isc_mem_t *ctx0, size_t size FLARG) -{ +isc___mem_get(isc_mem_t *ctx0, size_t size FLARG) { REQUIRE(VALID_CONTEXT(ctx0)); isc__mem_t *ctx = (isc__mem_t *)ctx0; - void * ptr; - bool call_water = false; + void *ptr; + bool call_water = false; if (ISC_UNLIKELY((isc_mem_debugging & - (ISC_MEM_DEBUGSIZE | ISC_MEM_DEBUGCTX)) != 0)) { + (ISC_MEM_DEBUGSIZE | ISC_MEM_DEBUGCTX)) != 0)) + { return (isc__mem_allocate(ctx0, size FLARG_PASS)); } @@ -1060,7 +1035,8 @@ isc___mem_get(isc_mem_t *ctx0, size_t size FLARG) if (ctx->inuse > ctx->maxinuse) { ctx->maxinuse = ctx->inuse; if (ctx->hi_water != 0U && ctx->inuse > ctx->hi_water && - (isc_mem_debugging & ISC_MEM_DEBUGUSAGE) != 0) { + (isc_mem_debugging & ISC_MEM_DEBUGUSAGE) != 0) + { fprintf(stderr, "maxinuse = %lu\n", (unsigned long)ctx->inuse); } @@ -1075,18 +1051,18 @@ isc___mem_get(isc_mem_t *ctx0, size_t size FLARG) } void -isc___mem_put(isc_mem_t *ctx0, void *ptr, size_t size FLARG) -{ +isc___mem_put(isc_mem_t *ctx0, void *ptr, size_t size FLARG) { REQUIRE(VALID_CONTEXT(ctx0)); REQUIRE(ptr != NULL); isc__mem_t *ctx = (isc__mem_t *)ctx0; - bool call_water = false; - size_info * si; - size_t oldsize; + bool call_water = false; + size_info *si; + size_t oldsize; if (ISC_UNLIKELY((isc_mem_debugging & - (ISC_MEM_DEBUGSIZE | ISC_MEM_DEBUGCTX)) != 0)) { + (ISC_MEM_DEBUGSIZE | ISC_MEM_DEBUGCTX)) != 0)) + { if ((isc_mem_debugging & ISC_MEM_DEBUGSIZE) != 0) { si = &(((size_info *)ptr)[-1]); oldsize = si->u.size - ALIGNMENT_SIZE; @@ -1130,8 +1106,7 @@ isc___mem_put(isc_mem_t *ctx0, void *ptr, size_t size FLARG) } void -isc_mem_waterack(isc_mem_t *ctx0, int flag) -{ +isc_mem_waterack(isc_mem_t *ctx0, int flag) { REQUIRE(VALID_CONTEXT(ctx0)); isc__mem_t *ctx = (isc__mem_t *)ctx0; @@ -1147,12 +1122,11 @@ isc_mem_waterack(isc_mem_t *ctx0, int flag) #if ISC_MEM_TRACKLINES static void -print_active(isc__mem_t *mctx, FILE *out) -{ +print_active(isc__mem_t *mctx, FILE *out) { if (mctx->debuglist != NULL) { debuglink_t *dl; unsigned int i; - bool found; + bool found; fputs("Dump of all outstanding memory allocations:\n", out); found = false; @@ -1186,13 +1160,12 @@ print_active(isc__mem_t *mctx, FILE *out) * Print the stats[] on the stream "out" with suitable formatting. */ void -isc_mem_stats(isc_mem_t *ctx0, FILE *out) -{ +isc_mem_stats(isc_mem_t *ctx0, FILE *out) { REQUIRE(VALID_CONTEXT(ctx0)); - isc__mem_t * ctx = (isc__mem_t *)ctx0; - size_t i; - const struct stats * s; + isc__mem_t *ctx = (isc__mem_t *)ctx0; + size_t i; + const struct stats *s; const isc__mempool_t *pool; MCTXLOCK(ctx); @@ -1207,7 +1180,8 @@ isc_mem_stats(isc_mem_t *ctx0, FILE *out) (i == ctx->max_size) ? ">=" : " ", (unsigned long)i, s->totalgets, s->gets); if ((ctx->flags & ISC_MEMFLAG_INTERNAL) != 0 && - (s->blocks != 0U || s->freefrags != 0U)) { + (s->blocks != 0U || s->freefrags != 0U)) + { fprintf(out, " (%lu bl, %lu ff)", s->blocks, s->freefrags); } @@ -1255,10 +1229,9 @@ isc_mem_stats(isc_mem_t *ctx0, FILE *out) */ static void * -mem_allocateunlocked(isc_mem_t *ctx0, size_t size) -{ +mem_allocateunlocked(isc_mem_t *ctx0, size_t size) { isc__mem_t *ctx = (isc__mem_t *)ctx0; - size_info * si; + size_info *si; size += ALIGNMENT_SIZE; if (ISC_UNLIKELY((isc_mem_debugging & ISC_MEM_DEBUGCTX) != 0)) { @@ -1280,13 +1253,12 @@ mem_allocateunlocked(isc_mem_t *ctx0, size_t size) } void * -isc___mem_allocate(isc_mem_t *ctx0, size_t size FLARG) -{ +isc___mem_allocate(isc_mem_t *ctx0, size_t size FLARG) { REQUIRE(VALID_CONTEXT(ctx0)); isc__mem_t *ctx = (isc__mem_t *)ctx0; - size_info * si; - bool call_water = false; + size_info *si; + bool call_water = false; MCTXLOCK(ctx); si = mem_allocateunlocked((isc_mem_t *)ctx, size); @@ -1307,9 +1279,10 @@ isc___mem_allocate(isc_mem_t *ctx0, size_t size FLARG) } if (ctx->inuse > ctx->maxinuse) { ctx->maxinuse = ctx->inuse; - if (ISC_UNLIKELY( - ctx->hi_water != 0U && ctx->inuse > ctx->hi_water && - (isc_mem_debugging & ISC_MEM_DEBUGUSAGE) != 0)) { + if (ISC_UNLIKELY(ctx->hi_water != 0U && + ctx->inuse > ctx->hi_water && + (isc_mem_debugging & ISC_MEM_DEBUGUSAGE) != 0)) + { fprintf(stderr, "maxinuse = %lu\n", (unsigned long)ctx->inuse); } @@ -1324,11 +1297,10 @@ isc___mem_allocate(isc_mem_t *ctx0, size_t size FLARG) } void * -isc___mem_reallocate(isc_mem_t *ctx0, void *ptr, size_t size FLARG) -{ +isc___mem_reallocate(isc_mem_t *ctx0, void *ptr, size_t size FLARG) { REQUIRE(VALID_CONTEXT(ctx0)); - void * new_ptr = NULL; + void *new_ptr = NULL; size_t oldsize, copysize; /* @@ -1365,15 +1337,14 @@ isc___mem_reallocate(isc_mem_t *ctx0, void *ptr, size_t size FLARG) } void -isc___mem_free(isc_mem_t *ctx0, void *ptr FLARG) -{ +isc___mem_free(isc_mem_t *ctx0, void *ptr FLARG) { REQUIRE(VALID_CONTEXT(ctx0)); REQUIRE(ptr != NULL); isc__mem_t *ctx = (isc__mem_t *)ctx0; - size_info * si; - size_t size; - bool call_water = false; + size_info *si; + size_t size; + bool call_water = false; if (ISC_UNLIKELY((isc_mem_debugging & ISC_MEM_DEBUGCTX) != 0)) { si = &(((size_info *)ptr)[-2]); @@ -1425,14 +1396,13 @@ isc___mem_free(isc_mem_t *ctx0, void *ptr FLARG) */ char * -isc___mem_strdup(isc_mem_t *mctx0, const char *s FLARG) -{ +isc___mem_strdup(isc_mem_t *mctx0, const char *s FLARG) { REQUIRE(VALID_CONTEXT(mctx0)); REQUIRE(s != NULL); isc__mem_t *mctx = (isc__mem_t *)mctx0; - size_t len; - char * ns; + size_t len; + char *ns; len = strlen(s) + 1; @@ -1446,8 +1416,7 @@ isc___mem_strdup(isc_mem_t *mctx0, const char *s FLARG) } void -isc_mem_setdestroycheck(isc_mem_t *ctx0, bool flag) -{ +isc_mem_setdestroycheck(isc_mem_t *ctx0, bool flag) { REQUIRE(VALID_CONTEXT(ctx0)); isc__mem_t *ctx = (isc__mem_t *)ctx0; @@ -1460,12 +1429,11 @@ isc_mem_setdestroycheck(isc_mem_t *ctx0, bool flag) } size_t -isc_mem_inuse(isc_mem_t *ctx0) -{ +isc_mem_inuse(isc_mem_t *ctx0) { REQUIRE(VALID_CONTEXT(ctx0)); isc__mem_t *ctx = (isc__mem_t *)ctx0; - size_t inuse; + size_t inuse; MCTXLOCK(ctx); @@ -1477,12 +1445,11 @@ isc_mem_inuse(isc_mem_t *ctx0) } size_t -isc_mem_maxinuse(isc_mem_t *ctx0) -{ +isc_mem_maxinuse(isc_mem_t *ctx0) { REQUIRE(VALID_CONTEXT(ctx0)); isc__mem_t *ctx = (isc__mem_t *)ctx0; - size_t maxinuse; + size_t maxinuse; MCTXLOCK(ctx); @@ -1494,12 +1461,11 @@ isc_mem_maxinuse(isc_mem_t *ctx0) } size_t -isc_mem_total(isc_mem_t *ctx0) -{ +isc_mem_total(isc_mem_t *ctx0) { REQUIRE(VALID_CONTEXT(ctx0)); isc__mem_t *ctx = (isc__mem_t *)ctx0; - size_t total; + size_t total; MCTXLOCK(ctx); @@ -1512,15 +1478,14 @@ isc_mem_total(isc_mem_t *ctx0) void isc_mem_setwater(isc_mem_t *ctx0, isc_mem_water_t water, void *water_arg, - size_t hiwater, size_t lowater) -{ + size_t hiwater, size_t lowater) { REQUIRE(VALID_CONTEXT(ctx0)); REQUIRE(hiwater >= lowater); - isc__mem_t * ctx = (isc__mem_t *)ctx0; - bool callwater = false; + isc__mem_t *ctx = (isc__mem_t *)ctx0; + bool callwater = false; isc_mem_water_t oldwater; - void * oldwater_arg; + void *oldwater_arg; MCTXLOCK(ctx); oldwater = ctx->water; @@ -1534,7 +1499,8 @@ isc_mem_setwater(isc_mem_t *ctx0, isc_mem_water_t water, void *water_arg, } else { if (ctx->hi_called && (ctx->water != water || ctx->water_arg != water_arg || - ctx->inuse < lowater || lowater == 0U)) { + ctx->inuse < lowater || lowater == 0U)) + { callwater = true; } ctx->water = water; @@ -1550,8 +1516,7 @@ isc_mem_setwater(isc_mem_t *ctx0, isc_mem_water_t water, void *water_arg, } bool -isc_mem_isovermem(isc_mem_t *ctx0) -{ +isc_mem_isovermem(isc_mem_t *ctx0) { REQUIRE(VALID_CONTEXT(ctx0)); isc__mem_t *ctx = (isc__mem_t *)ctx0; @@ -1565,8 +1530,7 @@ isc_mem_isovermem(isc_mem_t *ctx0) } void -isc_mem_setname(isc_mem_t *ctx0, const char *name, void *tag) -{ +isc_mem_setname(isc_mem_t *ctx0, const char *name, void *tag) { REQUIRE(VALID_CONTEXT(ctx0)); isc__mem_t *ctx = (isc__mem_t *)ctx0; @@ -1578,8 +1542,7 @@ isc_mem_setname(isc_mem_t *ctx0, const char *name, void *tag) } const char * -isc_mem_getname(isc_mem_t *ctx0) -{ +isc_mem_getname(isc_mem_t *ctx0) { REQUIRE(VALID_CONTEXT(ctx0)); isc__mem_t *ctx = (isc__mem_t *)ctx0; @@ -1592,8 +1555,7 @@ isc_mem_getname(isc_mem_t *ctx0) } void * -isc_mem_gettag(isc_mem_t *ctx0) -{ +isc_mem_gettag(isc_mem_t *ctx0) { REQUIRE(VALID_CONTEXT(ctx0)); isc__mem_t *ctx = (isc__mem_t *)ctx0; @@ -1606,13 +1568,12 @@ isc_mem_gettag(isc_mem_t *ctx0) */ void -isc_mempool_create(isc_mem_t *mctx0, size_t size, isc_mempool_t **mpctxp) -{ +isc_mempool_create(isc_mem_t *mctx0, size_t size, isc_mempool_t **mpctxp) { REQUIRE(VALID_CONTEXT(mctx0)); REQUIRE(size > 0U); REQUIRE(mpctxp != NULL && *mpctxp == NULL); - isc__mem_t * mctx = (isc__mem_t *)mctx0; + isc__mem_t *mctx = (isc__mem_t *)mctx0; isc__mempool_t *mpctx; /* @@ -1652,8 +1613,7 @@ isc_mempool_create(isc_mem_t *mctx0, size_t size, isc_mempool_t **mpctxp) } void -isc_mempool_setname(isc_mempool_t *mpctx0, const char *name) -{ +isc_mempool_setname(isc_mempool_t *mpctx0, const char *name) { REQUIRE(VALID_MEMPOOL(mpctx0)); REQUIRE(name != NULL); @@ -1676,15 +1636,14 @@ isc_mempool_setname(isc_mempool_t *mpctx0, const char *name) } void -isc_mempool_destroy(isc_mempool_t **mpctxp) -{ +isc_mempool_destroy(isc_mempool_t **mpctxp) { REQUIRE(mpctxp != NULL); REQUIRE(VALID_MEMPOOL(*mpctxp)); isc__mempool_t *mpctx; - isc__mem_t * mctx; - isc_mutex_t * lock; - element * item; + isc__mem_t *mctx; + isc_mutex_t *lock; + element *item; mpctx = (isc__mempool_t *)*mpctxp; #if ISC_MEMPOOL_NAMES @@ -1745,8 +1704,7 @@ isc_mempool_destroy(isc_mempool_t **mpctxp) } void -isc_mempool_associatelock(isc_mempool_t *mpctx0, isc_mutex_t *lock) -{ +isc_mempool_associatelock(isc_mempool_t *mpctx0, isc_mutex_t *lock) { REQUIRE(VALID_MEMPOOL(mpctx0)); REQUIRE(lock != NULL); @@ -1758,14 +1716,13 @@ isc_mempool_associatelock(isc_mempool_t *mpctx0, isc_mutex_t *lock) } void * -isc__mempool_get(isc_mempool_t *mpctx0 FLARG) -{ +isc__mempool_get(isc_mempool_t *mpctx0 FLARG) { REQUIRE(VALID_MEMPOOL(mpctx0)); isc__mempool_t *mpctx = (isc__mempool_t *)mpctx0; - element * item; - isc__mem_t * mctx; - unsigned int i; + element *item; + isc__mem_t *mctx; + unsigned int i; mctx = mpctx->mctx; @@ -1839,14 +1796,13 @@ out: /* coverity[+free : arg-1] */ void -isc__mempool_put(isc_mempool_t *mpctx0, void *mem FLARG) -{ +isc__mempool_put(isc_mempool_t *mpctx0, void *mem FLARG) { REQUIRE(VALID_MEMPOOL(mpctx0)); REQUIRE(mem != NULL); isc__mempool_t *mpctx = (isc__mempool_t *)mpctx0; - isc__mem_t * mctx = mpctx->mctx; - element * item; + isc__mem_t *mctx = mpctx->mctx; + element *item; if (mpctx->lock != NULL) { LOCK(mpctx->lock); @@ -1899,8 +1855,7 @@ isc__mempool_put(isc_mempool_t *mpctx0, void *mem FLARG) */ void -isc_mempool_setfreemax(isc_mempool_t *mpctx0, unsigned int limit) -{ +isc_mempool_setfreemax(isc_mempool_t *mpctx0, unsigned int limit) { REQUIRE(VALID_MEMPOOL(mpctx0)); isc__mempool_t *mpctx = (isc__mempool_t *)mpctx0; @@ -1917,12 +1872,11 @@ isc_mempool_setfreemax(isc_mempool_t *mpctx0, unsigned int limit) } unsigned int -isc_mempool_getfreemax(isc_mempool_t *mpctx0) -{ +isc_mempool_getfreemax(isc_mempool_t *mpctx0) { REQUIRE(VALID_MEMPOOL(mpctx0)); isc__mempool_t *mpctx = (isc__mempool_t *)mpctx0; - unsigned int freemax; + unsigned int freemax; if (mpctx->lock != NULL) { LOCK(mpctx->lock); @@ -1938,12 +1892,11 @@ isc_mempool_getfreemax(isc_mempool_t *mpctx0) } unsigned int -isc_mempool_getfreecount(isc_mempool_t *mpctx0) -{ +isc_mempool_getfreecount(isc_mempool_t *mpctx0) { REQUIRE(VALID_MEMPOOL(mpctx0)); isc__mempool_t *mpctx = (isc__mempool_t *)mpctx0; - unsigned int freecount; + unsigned int freecount; if (mpctx->lock != NULL) { LOCK(mpctx->lock); @@ -1959,8 +1912,7 @@ isc_mempool_getfreecount(isc_mempool_t *mpctx0) } void -isc_mempool_setmaxalloc(isc_mempool_t *mpctx0, unsigned int limit) -{ +isc_mempool_setmaxalloc(isc_mempool_t *mpctx0, unsigned int limit) { REQUIRE(VALID_MEMPOOL(mpctx0)); REQUIRE(limit > 0); @@ -1978,12 +1930,11 @@ isc_mempool_setmaxalloc(isc_mempool_t *mpctx0, unsigned int limit) } unsigned int -isc_mempool_getmaxalloc(isc_mempool_t *mpctx0) -{ +isc_mempool_getmaxalloc(isc_mempool_t *mpctx0) { REQUIRE(VALID_MEMPOOL(mpctx0)); isc__mempool_t *mpctx = (isc__mempool_t *)mpctx0; - unsigned int maxalloc; + unsigned int maxalloc; if (mpctx->lock != NULL) { LOCK(mpctx->lock); @@ -1999,12 +1950,11 @@ isc_mempool_getmaxalloc(isc_mempool_t *mpctx0) } unsigned int -isc_mempool_getallocated(isc_mempool_t *mpctx0) -{ +isc_mempool_getallocated(isc_mempool_t *mpctx0) { REQUIRE(VALID_MEMPOOL(mpctx0)); isc__mempool_t *mpctx = (isc__mempool_t *)mpctx0; - unsigned int allocated; + unsigned int allocated; if (mpctx->lock != NULL) { LOCK(mpctx->lock); @@ -2020,8 +1970,7 @@ isc_mempool_getallocated(isc_mempool_t *mpctx0) } void -isc_mempool_setfillcount(isc_mempool_t *mpctx0, unsigned int limit) -{ +isc_mempool_setfillcount(isc_mempool_t *mpctx0, unsigned int limit) { REQUIRE(VALID_MEMPOOL(mpctx0)); REQUIRE(limit > 0); @@ -2039,8 +1988,7 @@ isc_mempool_setfillcount(isc_mempool_t *mpctx0, unsigned int limit) } unsigned int -isc_mempool_getfillcount(isc_mempool_t *mpctx0) -{ +isc_mempool_getfillcount(isc_mempool_t *mpctx0) { REQUIRE(VALID_MEMPOOL(mpctx0)); isc__mempool_t *mpctx = (isc__mempool_t *)mpctx0; @@ -2064,8 +2012,7 @@ isc_mempool_getfillcount(isc_mempool_t *mpctx0) * Requires contextslock to be held by caller. */ static void -print_contexts(FILE *file) -{ +print_contexts(FILE *file) { isc__mem_t *ctx; for (ctx = ISC_LIST_HEAD(contexts); ctx != NULL; @@ -2079,8 +2026,7 @@ print_contexts(FILE *file) } void -isc_mem_checkdestroyed(FILE *file) -{ +isc_mem_checkdestroyed(FILE *file) { #if !ISC_MEM_TRACKLINES UNUSED(file); #endif /* if !ISC_MEM_TRACKLINES */ @@ -2101,8 +2047,7 @@ isc_mem_checkdestroyed(FILE *file) } unsigned int -isc_mem_references(isc_mem_t *ctx0) -{ +isc_mem_references(isc_mem_t *ctx0) { isc__mem_t *ctx = (isc__mem_t *)ctx0; return (isc_refcount_current(&ctx->references)); } @@ -2123,8 +2068,8 @@ typedef struct summarystat { goto error; \ } while (0) static int -xml_renderctx(isc__mem_t *ctx, summarystat_t *summary, xmlTextWriterPtr writer) -{ +xml_renderctx(isc__mem_t *ctx, summarystat_t *summary, + xmlTextWriterPtr writer) { REQUIRE(VALID_CONTEXT(ctx)); int xmlrc; @@ -2149,9 +2094,9 @@ xml_renderctx(isc__mem_t *ctx, summarystat_t *summary, xmlTextWriterPtr writer) ctx->basic_table_count * sizeof(char *); #if ISC_MEM_TRACKLINES if (ctx->debuglist != NULL) { - summary->contextsize += - DEBUG_TABLE_COUNT * sizeof(debuglist_t) + - ctx->debuglistcnt * sizeof(debuglink_t); + summary->contextsize += DEBUG_TABLE_COUNT * + sizeof(debuglist_t) + + ctx->debuglistcnt * sizeof(debuglink_t); } #endif /* if ISC_MEM_TRACKLINES */ TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "references")); @@ -2225,12 +2170,11 @@ error: } int -isc_mem_renderxml(void *writer0) -{ - isc__mem_t * ctx; - summarystat_t summary; - uint64_t lost; - int xmlrc; +isc_mem_renderxml(void *writer0) { + isc__mem_t *ctx; + summarystat_t summary; + uint64_t lost; + int xmlrc; xmlTextWriterPtr writer = (xmlTextWriterPtr)writer0; memset(&summary, 0, sizeof(summary)); @@ -2295,14 +2239,13 @@ error: #define CHECKMEM(m) RUNTIME_CHECK(m != NULL) static isc_result_t -json_renderctx(isc__mem_t *ctx, summarystat_t *summary, json_object *array) -{ +json_renderctx(isc__mem_t *ctx, summarystat_t *summary, json_object *array) { REQUIRE(VALID_CONTEXT(ctx)); REQUIRE(summary != NULL); REQUIRE(array != NULL); json_object *ctxobj, *obj; - char buf[1024]; + char buf[1024]; MCTXLOCK(ctx); @@ -2319,9 +2262,9 @@ json_renderctx(isc__mem_t *ctx, summarystat_t *summary, json_object *array) } #if ISC_MEM_TRACKLINES if (ctx->debuglist != NULL) { - summary->contextsize += - DEBUG_TABLE_COUNT * sizeof(debuglist_t) + - ctx->debuglistcnt * sizeof(debuglink_t); + summary->contextsize += DEBUG_TABLE_COUNT * + sizeof(debuglist_t) + + ctx->debuglistcnt * sizeof(debuglink_t); } #endif /* if ISC_MEM_TRACKLINES */ @@ -2392,14 +2335,13 @@ json_renderctx(isc__mem_t *ctx, summarystat_t *summary, json_object *array) } isc_result_t -isc_mem_renderjson(void *memobj0) -{ - isc_result_t result = ISC_R_SUCCESS; - isc__mem_t * ctx; +isc_mem_renderjson(void *memobj0) { + isc_result_t result = ISC_R_SUCCESS; + isc__mem_t *ctx; summarystat_t summary; - uint64_t lost; - json_object * ctxarray, *obj; - json_object * memobj = (json_object *)memobj0; + uint64_t lost; + json_object *ctxarray, *obj; + json_object *memobj = (json_object *)memobj0; memset(&summary, 0, sizeof(summary)); RUNTIME_CHECK(isc_once_do(&once, initialize_action) == ISC_R_SUCCESS); @@ -2455,70 +2397,61 @@ error: #endif /* HAVE_JSON_C */ void -isc_mem_create(isc_mem_t **mctxp) -{ +isc_mem_create(isc_mem_t **mctxp) { mem_create(mctxp, isc_mem_defaultflags); } void * -isc__mem_get(isc_mem_t *mctx, size_t size FLARG) -{ +isc__mem_get(isc_mem_t *mctx, size_t size FLARG) { REQUIRE(ISCAPI_MCTX_VALID(mctx)); return (mctx->methods->memget(mctx, size FLARG_PASS)); } void -isc__mem_put(isc_mem_t *mctx, void *ptr, size_t size FLARG) -{ +isc__mem_put(isc_mem_t *mctx, void *ptr, size_t size FLARG) { REQUIRE(ISCAPI_MCTX_VALID(mctx)); mctx->methods->memput(mctx, ptr, size FLARG_PASS); } void -isc__mem_putanddetach(isc_mem_t **mctxp, void *ptr, size_t size FLARG) -{ +isc__mem_putanddetach(isc_mem_t **mctxp, void *ptr, size_t size FLARG) { REQUIRE(mctxp != NULL && ISCAPI_MCTX_VALID(*mctxp)); (*mctxp)->methods->memputanddetach(mctxp, ptr, size FLARG_PASS); } void * -isc__mem_allocate(isc_mem_t *mctx, size_t size FLARG) -{ +isc__mem_allocate(isc_mem_t *mctx, size_t size FLARG) { REQUIRE(ISCAPI_MCTX_VALID(mctx)); return (mctx->methods->memallocate(mctx, size FLARG_PASS)); } void * -isc__mem_reallocate(isc_mem_t *mctx, void *ptr, size_t size FLARG) -{ +isc__mem_reallocate(isc_mem_t *mctx, void *ptr, size_t size FLARG) { REQUIRE(ISCAPI_MCTX_VALID(mctx)); return (mctx->methods->memreallocate(mctx, ptr, size FLARG_PASS)); } char * -isc__mem_strdup(isc_mem_t *mctx, const char *s FLARG) -{ +isc__mem_strdup(isc_mem_t *mctx, const char *s FLARG) { REQUIRE(ISCAPI_MCTX_VALID(mctx)); return (mctx->methods->memstrdup(mctx, s FLARG_PASS)); } void -isc__mem_free(isc_mem_t *mctx, void *ptr FLARG) -{ +isc__mem_free(isc_mem_t *mctx, void *ptr FLARG) { REQUIRE(ISCAPI_MCTX_VALID(mctx)); mctx->methods->memfree(mctx, ptr FLARG_PASS); } void -isc__mem_printactive(isc_mem_t *ctx0, FILE *file) -{ +isc__mem_printactive(isc_mem_t *ctx0, FILE *file) { #if ISC_MEM_TRACKLINES REQUIRE(VALID_CONTEXT(ctx0)); REQUIRE(file != NULL); diff --git a/lib/isc/mutexblock.c b/lib/isc/mutexblock.c index b1fb83d35b..39d7e80443 100644 --- a/lib/isc/mutexblock.c +++ b/lib/isc/mutexblock.c @@ -15,8 +15,7 @@ #include void -isc_mutexblock_init(isc_mutex_t *block, unsigned int count) -{ +isc_mutexblock_init(isc_mutex_t *block, unsigned int count) { unsigned int i; for (i = 0; i < count; i++) { @@ -25,8 +24,7 @@ isc_mutexblock_init(isc_mutex_t *block, unsigned int count) } void -isc_mutexblock_destroy(isc_mutex_t *block, unsigned int count) -{ +isc_mutexblock_destroy(isc_mutex_t *block, unsigned int count) { unsigned int i; for (i = 0; i < count; i++) { diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c index 4a4d70456e..ed3fd13bb2 100644 --- a/lib/isc/netaddr.c +++ b/lib/isc/netaddr.c @@ -24,8 +24,7 @@ #include bool -isc_netaddr_equal(const isc_netaddr_t *a, const isc_netaddr_t *b) -{ +isc_netaddr_equal(const isc_netaddr_t *a, const isc_netaddr_t *b) { REQUIRE(a != NULL && b != NULL); if (a->family != b->family) { @@ -45,7 +44,8 @@ isc_netaddr_equal(const isc_netaddr_t *a, const isc_netaddr_t *b) case AF_INET6: if (memcmp(&a->type.in6, &b->type.in6, sizeof(a->type.in6)) != 0 || - a->zone != b->zone) { + a->zone != b->zone) + { return (false); } break; @@ -64,8 +64,7 @@ isc_netaddr_equal(const isc_netaddr_t *a, const isc_netaddr_t *b) bool isc_netaddr_eqprefix(const isc_netaddr_t *a, const isc_netaddr_t *b, - unsigned int prefixlen) -{ + unsigned int prefixlen) { const unsigned char *pa = NULL, *pb = NULL; unsigned int ipabytes = 0; /* Length of whole IP address in bytes */ unsigned int nbytes; /* Number of significant whole bytes */ @@ -126,14 +125,13 @@ isc_netaddr_eqprefix(const isc_netaddr_t *a, const isc_netaddr_t *b, } isc_result_t -isc_netaddr_totext(const isc_netaddr_t *netaddr, isc_buffer_t *target) -{ +isc_netaddr_totext(const isc_netaddr_t *netaddr, isc_buffer_t *target) { char abuf[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255")]; char zbuf[sizeof("%4294967295")]; unsigned int alen; - int zlen; - const char * r; - const void * type; + int zlen; + const char *r; + const void *type; REQUIRE(netaddr != NULL); @@ -186,8 +184,7 @@ isc_netaddr_totext(const isc_netaddr_t *netaddr, isc_buffer_t *target) } void -isc_netaddr_format(const isc_netaddr_t *na, char *array, unsigned int size) -{ +isc_netaddr_format(const isc_netaddr_t *na, char *array, unsigned int size) { isc_result_t result; isc_buffer_t buf; @@ -217,11 +214,10 @@ isc_netaddr_format(const isc_netaddr_t *na, char *array, unsigned int size) } isc_result_t -isc_netaddr_prefixok(const isc_netaddr_t *na, unsigned int prefixlen) -{ +isc_netaddr_prefixok(const isc_netaddr_t *na, unsigned int prefixlen) { static const unsigned char zeros[16]; - unsigned int nbits, nbytes, ipbytes = 0; - const unsigned char * p; + unsigned int nbits, nbytes, ipbytes = 0; + const unsigned char *p; switch (na->family) { case AF_INET: @@ -258,9 +254,8 @@ isc_netaddr_prefixok(const isc_netaddr_t *na, unsigned int prefixlen) } isc_result_t -isc_netaddr_masktoprefixlen(const isc_netaddr_t *s, unsigned int *lenp) -{ - unsigned int nbits = 0, nbytes = 0, ipbytes = 0, i; +isc_netaddr_masktoprefixlen(const isc_netaddr_t *s, unsigned int *lenp) { + unsigned int nbits = 0, nbytes = 0, ipbytes = 0, i; const unsigned char *p; switch (s->family) { @@ -302,24 +297,21 @@ isc_netaddr_masktoprefixlen(const isc_netaddr_t *s, unsigned int *lenp) } void -isc_netaddr_fromin(isc_netaddr_t *netaddr, const struct in_addr *ina) -{ +isc_netaddr_fromin(isc_netaddr_t *netaddr, const struct in_addr *ina) { memset(netaddr, 0, sizeof(*netaddr)); netaddr->family = AF_INET; netaddr->type.in = *ina; } void -isc_netaddr_fromin6(isc_netaddr_t *netaddr, const struct in6_addr *ina6) -{ +isc_netaddr_fromin6(isc_netaddr_t *netaddr, const struct in6_addr *ina6) { memset(netaddr, 0, sizeof(*netaddr)); netaddr->family = AF_INET6; netaddr->type.in6 = *ina6; } isc_result_t -isc_netaddr_frompath(isc_netaddr_t *netaddr, const char *path) -{ +isc_netaddr_frompath(isc_netaddr_t *netaddr, const char *path) { #ifdef ISC_PLATFORM_HAVESYSUNH if (strlen(path) > sizeof(netaddr->type.un) - 1) { return (ISC_R_NOSPACE); @@ -338,8 +330,7 @@ isc_netaddr_frompath(isc_netaddr_t *netaddr, const char *path) } void -isc_netaddr_setzone(isc_netaddr_t *netaddr, uint32_t zone) -{ +isc_netaddr_setzone(isc_netaddr_t *netaddr, uint32_t zone) { /* we currently only support AF_INET6. */ REQUIRE(netaddr->family == AF_INET6); @@ -347,14 +338,12 @@ isc_netaddr_setzone(isc_netaddr_t *netaddr, uint32_t zone) } uint32_t -isc_netaddr_getzone(const isc_netaddr_t *netaddr) -{ +isc_netaddr_getzone(const isc_netaddr_t *netaddr) { return (netaddr->zone); } void -isc_netaddr_fromsockaddr(isc_netaddr_t *t, const isc_sockaddr_t *s) -{ +isc_netaddr_fromsockaddr(isc_netaddr_t *t, const isc_sockaddr_t *s) { int family = s->type.sa.sa_family; t->family = family; switch (family) { @@ -379,31 +368,27 @@ isc_netaddr_fromsockaddr(isc_netaddr_t *t, const isc_sockaddr_t *s) } void -isc_netaddr_any(isc_netaddr_t *netaddr) -{ +isc_netaddr_any(isc_netaddr_t *netaddr) { memset(netaddr, 0, sizeof(*netaddr)); netaddr->family = AF_INET; netaddr->type.in.s_addr = INADDR_ANY; } void -isc_netaddr_any6(isc_netaddr_t *netaddr) -{ +isc_netaddr_any6(isc_netaddr_t *netaddr) { memset(netaddr, 0, sizeof(*netaddr)); netaddr->family = AF_INET6; netaddr->type.in6 = in6addr_any; } void -isc_netaddr_unspec(isc_netaddr_t *netaddr) -{ +isc_netaddr_unspec(isc_netaddr_t *netaddr) { memset(netaddr, 0, sizeof(*netaddr)); netaddr->family = AF_UNSPEC; } bool -isc_netaddr_ismulticast(const isc_netaddr_t *na) -{ +isc_netaddr_ismulticast(const isc_netaddr_t *na) { switch (na->family) { case AF_INET: return (ISC_IPADDR_ISMULTICAST(na->type.in.s_addr)); @@ -415,8 +400,7 @@ isc_netaddr_ismulticast(const isc_netaddr_t *na) } bool -isc_netaddr_isexperimental(const isc_netaddr_t *na) -{ +isc_netaddr_isexperimental(const isc_netaddr_t *na) { switch (na->family) { case AF_INET: return (ISC_IPADDR_ISEXPERIMENTAL(na->type.in.s_addr)); @@ -426,8 +410,7 @@ isc_netaddr_isexperimental(const isc_netaddr_t *na) } bool -isc_netaddr_islinklocal(const isc_netaddr_t *na) -{ +isc_netaddr_islinklocal(const isc_netaddr_t *na) { switch (na->family) { case AF_INET: return (false); @@ -439,8 +422,7 @@ isc_netaddr_islinklocal(const isc_netaddr_t *na) } bool -isc_netaddr_issitelocal(const isc_netaddr_t *na) -{ +isc_netaddr_issitelocal(const isc_netaddr_t *na) { switch (na->family) { case AF_INET: return (false); @@ -455,8 +437,7 @@ isc_netaddr_issitelocal(const isc_netaddr_t *na) (((uint32_t)(i)&ISC__IPADDR(0xff000000)) == ISC__IPADDR(0x00000000)) bool -isc_netaddr_isnetzero(const isc_netaddr_t *na) -{ +isc_netaddr_isnetzero(const isc_netaddr_t *na) { switch (na->family) { case AF_INET: return (ISC_IPADDR_ISNETZERO(na->type.in.s_addr)); @@ -468,8 +449,7 @@ isc_netaddr_isnetzero(const isc_netaddr_t *na) } void -isc_netaddr_fromv4mapped(isc_netaddr_t *t, const isc_netaddr_t *s) -{ +isc_netaddr_fromv4mapped(isc_netaddr_t *t, const isc_netaddr_t *s) { isc_netaddr_t *src; DE_CONST(s, src); /* Must come before IN6_IS_ADDR_V4MAPPED. */ @@ -484,8 +464,7 @@ isc_netaddr_fromv4mapped(isc_netaddr_t *t, const isc_netaddr_t *s) } bool -isc_netaddr_isloopback(const isc_netaddr_t *na) -{ +isc_netaddr_isloopback(const isc_netaddr_t *na) { switch (na->family) { case AF_INET: return (((ntohl(na->type.in.s_addr) & 0xff000000U) == diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h index ae83f943d3..5e8a5ca7be 100644 --- a/lib/isc/netmgr/netmgr-int.h +++ b/lib/isc/netmgr/netmgr-int.h @@ -65,7 +65,7 @@ typedef struct isc__networker { * connections we have peer address here, so both TCP and UDP can be * handled with a simple send-like function */ -#define NMHANDLE_MAGIC ISC_MAGIC('N', 'M', 'H', 'D') +#define NMHANDLE_MAGIC ISC_MAGIC('N', 'M', 'H', 'D') #define VALID_NMHANDLE(t) ISC_MAGIC_VALID(t, NMHANDLE_MAGIC) typedef void (*isc__nm_closecb)(isc_nmhandle_t *); @@ -160,7 +160,7 @@ typedef union { * always point to its parent. Note that we always allocate more than * sizeof(struct) because we make room for different req types; */ -#define UVREQ_MAGIC ISC_MAGIC('N', 'M', 'U', 'R') +#define UVREQ_MAGIC ISC_MAGIC('N', 'M', 'U', 'R') #define VALID_UVREQ(t) ISC_MAGIC_VALID(t, UVREQ_MAGIC) typedef struct isc__nm_uvreq { @@ -253,7 +253,7 @@ typedef union { /* * Network manager */ -#define NM_MAGIC ISC_MAGIC('N', 'E', 'T', 'M') +#define NM_MAGIC ISC_MAGIC('N', 'E', 'T', 'M') #define VALID_NM(t) ISC_MAGIC_VALID(t, NM_MAGIC) struct isc_nm { @@ -319,7 +319,7 @@ typedef enum isc_nmsocket_type { * A universal structure for either a single socket or a group of * dup'd/SO_REUSE_PORT-using sockets listening on the same interface. */ -#define NMSOCK_MAGIC ISC_MAGIC('N', 'M', 'S', 'K') +#define NMSOCK_MAGIC ISC_MAGIC('N', 'M', 'S', 'K') #define VALID_NMSOCK(t) ISC_MAGIC_VALID(t, NMSOCK_MAGIC) /*% diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c index 57f29c745c..1dadc524cf 100644 --- a/lib/isc/netmgr/netmgr.c +++ b/lib/isc/netmgr/netmgr.c @@ -111,34 +111,26 @@ 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() -{ +isc_nm_tid() { return (isc__nm_tid_v); } bool -isc__nm_in_netthread() -{ +isc__nm_in_netthread() { return (isc__nm_tid_v >= 0); } isc_nm_t * -isc_nm_start(isc_mem_t *mctx, uint32_t workers) -{ +isc_nm_start(isc_mem_t *mctx, uint32_t workers) { isc_nm_t *mgr = NULL; - char name[32]; + char name[32]; mgr = isc_mem_get(mctx, sizeof(*mgr)); *mgr = (isc_nm_t){ .nworkers = workers }; @@ -179,7 +171,7 @@ isc_nm_start(isc_mem_t *mctx, uint32_t workers) mgr->workers = isc_mem_get(mctx, workers * sizeof(isc__networker_t)); for (size_t i = 0; i < workers; i++) { - int r; + int r; isc__networker_t *worker = &mgr->workers[i]; *worker = (isc__networker_t){ .mgr = mgr, @@ -221,8 +213,7 @@ isc_nm_start(isc_mem_t *mctx, uint32_t workers) * Free the resources of the network manager. */ static void -nm_destroy(isc_nm_t **mgr0) -{ +nm_destroy(isc_nm_t **mgr0) { REQUIRE(VALID_NM(*mgr0)); REQUIRE(!isc__nm_in_netthread()); @@ -252,16 +243,18 @@ nm_destroy(isc_nm_t **mgr0) for (size_t i = 0; i < mgr->nworkers; i++) { isc__networker_t *worker = &mgr->workers[i]; isc__netievent_t *ievent = NULL; - int r; + int r; /* Empty the async event queues */ while ((ievent = (isc__netievent_t *)isc_queue_dequeue( - worker->ievents)) != NULL) { + worker->ievents)) != NULL) + { isc_mempool_put(mgr->evpool, ievent); } while ((ievent = (isc__netievent_t *)isc_queue_dequeue( - worker->ievents_prio)) != NULL) { + worker->ievents_prio)) != NULL) + { isc_mempool_put(mgr->evpool, ievent); } @@ -292,8 +285,7 @@ nm_destroy(isc_nm_t **mgr0) } void -isc_nm_pause(isc_nm_t *mgr) -{ +isc_nm_pause(isc_nm_t *mgr) { REQUIRE(VALID_NM(mgr)); REQUIRE(!isc__nm_in_netthread()); @@ -317,15 +309,15 @@ isc_nm_pause(isc_nm_t *mgr) LOCK(&mgr->lock); while (atomic_load_relaxed(&mgr->workers_paused) != - atomic_load_relaxed(&mgr->workers_running)) { + atomic_load_relaxed(&mgr->workers_running)) + { WAIT(&mgr->wkstatecond, &mgr->lock); } UNLOCK(&mgr->lock); } void -isc_nm_resume(isc_nm_t *mgr) -{ +isc_nm_resume(isc_nm_t *mgr) { REQUIRE(VALID_NM(mgr)); REQUIRE(!isc__nm_in_netthread()); @@ -344,8 +336,7 @@ isc_nm_resume(isc_nm_t *mgr) } void -isc_nm_attach(isc_nm_t *mgr, isc_nm_t **dst) -{ +isc_nm_attach(isc_nm_t *mgr, isc_nm_t **dst) { REQUIRE(VALID_NM(mgr)); REQUIRE(dst != NULL && *dst == NULL); @@ -355,8 +346,7 @@ isc_nm_attach(isc_nm_t *mgr, isc_nm_t **dst) } void -isc_nm_detach(isc_nm_t **mgr0) -{ +isc_nm_detach(isc_nm_t **mgr0) { isc_nm_t *mgr = NULL; REQUIRE(mgr0 != NULL); @@ -371,8 +361,7 @@ isc_nm_detach(isc_nm_t **mgr0) } void -isc_nm_closedown(isc_nm_t *mgr) -{ +isc_nm_closedown(isc_nm_t *mgr) { REQUIRE(VALID_NM(mgr)); atomic_store(&mgr->closing, true); @@ -384,8 +373,7 @@ isc_nm_closedown(isc_nm_t *mgr) } void -isc_nm_destroy(isc_nm_t **mgr0) -{ +isc_nm_destroy(isc_nm_t **mgr0) { isc_nm_t *mgr = NULL; REQUIRE(mgr0 != NULL); @@ -424,8 +412,7 @@ isc_nm_destroy(isc_nm_t **mgr0) } void -isc_nm_maxudp(isc_nm_t *mgr, uint32_t maxudp) -{ +isc_nm_maxudp(isc_nm_t *mgr, uint32_t maxudp) { REQUIRE(VALID_NM(mgr)); atomic_store(&mgr->maxudp, maxudp); @@ -433,8 +420,7 @@ isc_nm_maxudp(isc_nm_t *mgr, uint32_t maxudp) void isc_nm_tcp_settimeouts(isc_nm_t *mgr, uint32_t init, uint32_t idle, - uint32_t keepalive, uint32_t advertised) -{ + uint32_t keepalive, uint32_t advertised) { REQUIRE(VALID_NM(mgr)); mgr->init = init * 100; @@ -445,8 +431,7 @@ isc_nm_tcp_settimeouts(isc_nm_t *mgr, uint32_t init, uint32_t idle, void isc_nm_tcp_gettimeouts(isc_nm_t *mgr, uint32_t *initial, uint32_t *idle, - uint32_t *keepalive, uint32_t *advertised) -{ + uint32_t *keepalive, uint32_t *advertised) { REQUIRE(VALID_NM(mgr)); if (initial != NULL) { @@ -471,15 +456,14 @@ isc_nm_tcp_gettimeouts(isc_nm_t *mgr, uint32_t *initial, uint32_t *idle, * until asked to stop. */ static isc_threadresult_t -nm_thread(isc_threadarg_t worker0) -{ +nm_thread(isc_threadarg_t worker0) { isc__networker_t *worker = (isc__networker_t *)worker0; isc__nm_tid_v = worker->id; isc_thread_setaffinity(isc__nm_tid_v); while (true) { - int r = uv_run(&worker->loop, UV_RUN_DEFAULT); + int r = uv_run(&worker->loop, UV_RUN_DEFAULT); bool pausing = false; /* @@ -572,20 +556,18 @@ nm_thread(isc_threadarg_t worker0) * passed from other threads. */ static void -async_cb(uv_async_t *handle) -{ +async_cb(uv_async_t *handle) { isc__networker_t *worker = (isc__networker_t *)handle->loop->data; process_queue(worker, worker->ievents_prio); process_queue(worker, worker->ievents); } static void -process_queue(isc__networker_t *worker, isc_queue_t *queue) -{ +process_queue(isc__networker_t *worker, isc_queue_t *queue) { isc__netievent_t *ievent = NULL; - while ((ievent = (isc__netievent_t *)isc_queue_dequeue(queue)) != - NULL) { + while ((ievent = (isc__netievent_t *)isc_queue_dequeue(queue)) != NULL) + { switch (ievent->type) { case netievent_stop: uv_stop(&worker->loop); @@ -646,8 +628,7 @@ process_queue(isc__networker_t *worker, isc_queue_t *queue) } void * -isc__nm_get_ievent(isc_nm_t *mgr, isc__netievent_type type) -{ +isc__nm_get_ievent(isc_nm_t *mgr, isc__netievent_type type) { isc__netievent_storage_t *event = isc_mempool_get(mgr->evpool); *event = (isc__netievent_storage_t){ .ni.type = type }; @@ -655,14 +636,12 @@ isc__nm_get_ievent(isc_nm_t *mgr, isc__netievent_type type) } void -isc__nm_put_ievent(isc_nm_t *mgr, void *ievent) -{ +isc__nm_put_ievent(isc_nm_t *mgr, void *ievent) { isc_mempool_put(mgr->evpool, ievent); } void -isc__nm_enqueue_ievent(isc__networker_t *worker, isc__netievent_t *event) -{ +isc__nm_enqueue_ievent(isc__networker_t *worker, isc__netievent_t *event) { if (event->type > netievent_prio) { /* * We need to make sure this signal will be delivered and @@ -679,8 +658,7 @@ isc__nm_enqueue_ievent(isc__networker_t *worker, isc__netievent_t *event) } bool -isc__nmsocket_active(isc_nmsocket_t *sock) -{ +isc__nmsocket_active(isc_nmsocket_t *sock) { REQUIRE(VALID_NMSOCK(sock)); if (sock->parent != NULL) { return (atomic_load(&sock->parent->active)); @@ -690,8 +668,7 @@ isc__nmsocket_active(isc_nmsocket_t *sock) } void -isc_nmsocket_attach(isc_nmsocket_t *sock, isc_nmsocket_t **target) -{ +isc_nmsocket_attach(isc_nmsocket_t *sock, isc_nmsocket_t **target) { REQUIRE(VALID_NMSOCK(sock)); REQUIRE(target != NULL && *target == NULL); @@ -709,9 +686,8 @@ isc_nmsocket_attach(isc_nmsocket_t *sock, isc_nmsocket_t **target) * Free all resources inside a socket (including its children if any). */ static void -nmsocket_cleanup(isc_nmsocket_t *sock, bool dofree) -{ - isc_nmhandle_t * handle = NULL; +nmsocket_cleanup(isc_nmsocket_t *sock, bool dofree) { + isc_nmhandle_t *handle = NULL; isc__nm_uvreq_t *uvreq = NULL; REQUIRE(VALID_NMSOCK(sock)); @@ -788,9 +764,8 @@ nmsocket_cleanup(isc_nmsocket_t *sock, bool dofree) } static void -nmsocket_maybe_destroy(isc_nmsocket_t *sock) -{ - int active_handles; +nmsocket_maybe_destroy(isc_nmsocket_t *sock) { + int active_handles; bool destroy = false; if (sock->parent != NULL) { @@ -810,8 +785,8 @@ nmsocket_maybe_destroy(isc_nmsocket_t *sock) */ LOCK(&sock->lock); if (atomic_load(&sock->active) || atomic_load(&sock->destroying) || - !atomic_load(&sock->closed) || - atomic_load(&sock->references) != 0) { + !atomic_load(&sock->closed) || atomic_load(&sock->references) != 0) + { UNLOCK(&sock->lock); return; } @@ -836,8 +811,7 @@ nmsocket_maybe_destroy(isc_nmsocket_t *sock) } void -isc__nmsocket_prep_destroy(isc_nmsocket_t *sock) -{ +isc__nmsocket_prep_destroy(isc_nmsocket_t *sock) { REQUIRE(sock->parent == NULL); /* @@ -882,8 +856,7 @@ isc__nmsocket_prep_destroy(isc_nmsocket_t *sock) } void -isc_nmsocket_detach(isc_nmsocket_t **sockp) -{ +isc_nmsocket_detach(isc_nmsocket_t **sockp) { REQUIRE(sockp != NULL && *sockp != NULL); REQUIRE(VALID_NMSOCK(*sockp)); @@ -908,8 +881,7 @@ isc_nmsocket_detach(isc_nmsocket_t **sockp) void isc__nmsocket_init(isc_nmsocket_t *sock, isc_nm_t *mgr, isc_nmsocket_type type, - isc_nmiface_t *iface) -{ + isc_nmiface_t *iface) { uint16_t family; REQUIRE(sock != NULL); @@ -930,8 +902,8 @@ isc__nmsocket_init(isc_nmsocket_t *sock, isc_nm_t *mgr, isc_nmsocket_type type, isc_nm_attach(mgr, &sock->mgr); sock->uv_handle.handle.data = sock; - sock->ah_frees = - isc_mem_allocate(mgr->mctx, sock->ah_size * sizeof(size_t)); + sock->ah_frees = isc_mem_allocate(mgr->mctx, + sock->ah_size * sizeof(size_t)); sock->ah_handles = isc_mem_allocate( mgr->mctx, sock->ah_size * sizeof(isc_nmhandle_t *)); for (size_t i = 0; i < 32; i++) { @@ -977,9 +949,8 @@ isc__nmsocket_init(isc_nmsocket_t *sock, isc_nm_t *mgr, isc_nmsocket_type type, } void -isc__nm_alloc_cb(uv_handle_t *handle, size_t size, uv_buf_t *buf) -{ - isc_nmsocket_t * sock = uv_handle_get_data(handle); +isc__nm_alloc_cb(uv_handle_t *handle, size_t size, uv_buf_t *buf) { + isc_nmsocket_t *sock = uv_handle_get_data(handle); isc__networker_t *worker = NULL; REQUIRE(VALID_NMSOCK(sock)); @@ -995,8 +966,7 @@ isc__nm_alloc_cb(uv_handle_t *handle, size_t size, uv_buf_t *buf) } void -isc__nm_free_uvbuf(isc_nmsocket_t *sock, const uv_buf_t *buf) -{ +isc__nm_free_uvbuf(isc_nmsocket_t *sock, const uv_buf_t *buf) { isc__networker_t *worker = NULL; REQUIRE(VALID_NMSOCK(sock)); @@ -1013,8 +983,7 @@ isc__nm_free_uvbuf(isc_nmsocket_t *sock, const uv_buf_t *buf) } static isc_nmhandle_t * -alloc_handle(isc_nmsocket_t *sock) -{ +alloc_handle(isc_nmsocket_t *sock) { isc_nmhandle_t *handle = isc_mem_get(sock->mgr->mctx, sizeof(isc_nmhandle_t) + sock->extrahandlesize); @@ -1027,11 +996,10 @@ alloc_handle(isc_nmsocket_t *sock) isc_nmhandle_t * isc__nmhandle_get(isc_nmsocket_t *sock, isc_sockaddr_t *peer, - isc_sockaddr_t *local) -{ + isc_sockaddr_t *local) { isc_nmhandle_t *handle = NULL; - size_t handlenum; - int pos; + size_t handlenum; + int pos; REQUIRE(VALID_NMSOCK(sock)); @@ -1096,16 +1064,14 @@ isc__nmhandle_get(isc_nmsocket_t *sock, isc_sockaddr_t *peer, } void -isc_nmhandle_ref(isc_nmhandle_t *handle) -{ +isc_nmhandle_ref(isc_nmhandle_t *handle) { REQUIRE(VALID_NMHANDLE(handle)); isc_refcount_increment(&handle->references); } bool -isc_nmhandle_is_stream(isc_nmhandle_t *handle) -{ +isc_nmhandle_is_stream(isc_nmhandle_t *handle) { REQUIRE(VALID_NMHANDLE(handle)); return (handle->sock->type == isc_nm_tcpsocket || @@ -1113,8 +1079,7 @@ isc_nmhandle_is_stream(isc_nmhandle_t *handle) } static void -nmhandle_free(isc_nmsocket_t *sock, isc_nmhandle_t *handle) -{ +nmhandle_free(isc_nmsocket_t *sock, isc_nmhandle_t *handle) { size_t extra = sock->extrahandlesize; isc_refcount_destroy(&handle->references); @@ -1129,8 +1094,7 @@ nmhandle_free(isc_nmsocket_t *sock, isc_nmhandle_t *handle) } static void -nmhandle_deactivate(isc_nmsocket_t *sock, isc_nmhandle_t *handle) -{ +nmhandle_deactivate(isc_nmsocket_t *sock, isc_nmhandle_t *handle) { /* * We do all of this under lock to avoid races with socket * destruction. We have to do this now, because at this point the @@ -1157,8 +1121,7 @@ nmhandle_deactivate(isc_nmsocket_t *sock, isc_nmhandle_t *handle) } void -isc_nmhandle_unref(isc_nmhandle_t *handle) -{ +isc_nmhandle_unref(isc_nmhandle_t *handle) { isc_nmsocket_t *sock = NULL, *tmp = NULL; REQUIRE(VALID_NMHANDLE(handle)); @@ -1210,8 +1173,7 @@ isc_nmhandle_unref(isc_nmhandle_t *handle) } void * -isc_nmhandle_getdata(isc_nmhandle_t *handle) -{ +isc_nmhandle_getdata(isc_nmhandle_t *handle) { REQUIRE(VALID_NMHANDLE(handle)); return (handle->opaque); @@ -1219,8 +1181,7 @@ isc_nmhandle_getdata(isc_nmhandle_t *handle) void isc_nmhandle_setdata(isc_nmhandle_t *handle, void *arg, - isc_nm_opaquecb_t doreset, isc_nm_opaquecb_t dofree) -{ + isc_nm_opaquecb_t doreset, isc_nm_opaquecb_t dofree) { REQUIRE(VALID_NMHANDLE(handle)); handle->opaque = arg; @@ -1229,32 +1190,28 @@ isc_nmhandle_setdata(isc_nmhandle_t *handle, void *arg, } void * -isc_nmhandle_getextra(isc_nmhandle_t *handle) -{ +isc_nmhandle_getextra(isc_nmhandle_t *handle) { REQUIRE(VALID_NMHANDLE(handle)); return (handle->extra); } isc_sockaddr_t -isc_nmhandle_peeraddr(isc_nmhandle_t *handle) -{ +isc_nmhandle_peeraddr(isc_nmhandle_t *handle) { REQUIRE(VALID_NMHANDLE(handle)); return (handle->peer); } isc_sockaddr_t -isc_nmhandle_localaddr(isc_nmhandle_t *handle) -{ +isc_nmhandle_localaddr(isc_nmhandle_t *handle) { REQUIRE(VALID_NMHANDLE(handle)); return (handle->local); } isc_nm_t * -isc_nmhandle_netmgr(isc_nmhandle_t *handle) -{ +isc_nmhandle_netmgr(isc_nmhandle_t *handle) { REQUIRE(VALID_NMHANDLE(handle)); REQUIRE(VALID_NMSOCK(handle->sock)); @@ -1262,8 +1219,7 @@ isc_nmhandle_netmgr(isc_nmhandle_t *handle) } isc__nm_uvreq_t * -isc__nm_uvreq_get(isc_nm_t *mgr, isc_nmsocket_t *sock) -{ +isc__nm_uvreq_get(isc_nm_t *mgr, isc_nmsocket_t *sock) { isc__nm_uvreq_t *req = NULL; REQUIRE(VALID_NM(mgr)); @@ -1287,10 +1243,9 @@ isc__nm_uvreq_get(isc_nm_t *mgr, isc_nmsocket_t *sock) } void -isc__nm_uvreq_put(isc__nm_uvreq_t **req0, isc_nmsocket_t *sock) -{ +isc__nm_uvreq_put(isc__nm_uvreq_t **req0, isc_nmsocket_t *sock) { isc__nm_uvreq_t *req = NULL; - isc_nmhandle_t * handle = NULL; + isc_nmhandle_t *handle = NULL; REQUIRE(req0 != NULL); REQUIRE(VALID_UVREQ(*req0)); @@ -1323,8 +1278,7 @@ isc__nm_uvreq_put(isc__nm_uvreq_t **req0, isc_nmsocket_t *sock) isc_result_t isc_nm_send(isc_nmhandle_t *handle, isc_region_t *region, isc_nm_cb_t cb, - void *cbarg) -{ + void *cbarg) { REQUIRE(VALID_NMHANDLE(handle)); switch (handle->sock->type) { @@ -1342,8 +1296,7 @@ isc_nm_send(isc_nmhandle_t *handle, isc_region_t *region, isc_nm_cb_t cb, } void -isc__nm_async_closecb(isc__networker_t *worker, isc__netievent_t *ev0) -{ +isc__nm_async_closecb(isc__networker_t *worker, isc__netievent_t *ev0) { isc__netievent_closecb_t *ievent = (isc__netievent_closecb_t *)ev0; REQUIRE(VALID_NMSOCK(ievent->sock)); @@ -1359,8 +1312,7 @@ isc__nm_async_closecb(isc__networker_t *worker, isc__netievent_t *ev0) } static void -shutdown_walk_cb(uv_handle_t *handle, void *arg) -{ +shutdown_walk_cb(uv_handle_t *handle, void *arg) { UNUSED(arg); switch (handle->type) { @@ -1373,15 +1325,13 @@ shutdown_walk_cb(uv_handle_t *handle, void *arg) } void -isc__nm_async_shutdown(isc__networker_t *worker, isc__netievent_t *ev0) -{ +isc__nm_async_shutdown(isc__networker_t *worker, isc__netievent_t *ev0) { UNUSED(ev0); uv_walk(&worker->loop, shutdown_walk_cb, NULL); } bool -isc__nm_acquire_interlocked(isc_nm_t *mgr) -{ +isc__nm_acquire_interlocked(isc_nm_t *mgr) { LOCK(&mgr->lock); bool success = atomic_compare_exchange_strong(&mgr->interlocked, &(bool){ false }, true); @@ -1390,8 +1340,7 @@ isc__nm_acquire_interlocked(isc_nm_t *mgr) } void -isc__nm_drop_interlocked(isc_nm_t *mgr) -{ +isc__nm_drop_interlocked(isc_nm_t *mgr) { LOCK(&mgr->lock); bool success = atomic_compare_exchange_strong(&mgr->interlocked, &(bool){ true }, false); @@ -1401,19 +1350,18 @@ isc__nm_drop_interlocked(isc_nm_t *mgr) } void -isc__nm_acquire_interlocked_force(isc_nm_t *mgr) -{ +isc__nm_acquire_interlocked_force(isc_nm_t *mgr) { LOCK(&mgr->lock); while (!atomic_compare_exchange_strong(&mgr->interlocked, - &(bool){ false }, true)) { + &(bool){ false }, true)) + { WAIT(&mgr->wkstatecond, &mgr->lock); } UNLOCK(&mgr->lock); } void -isc_nm_setstats(isc_nm_t *mgr, isc_stats_t *stats) -{ +isc_nm_setstats(isc_nm_t *mgr, isc_stats_t *stats) { REQUIRE(VALID_NM(mgr)); REQUIRE(mgr->stats == NULL); REQUIRE(isc_stats_ncounters(stats) == isc_sockstatscounter_max); @@ -1422,8 +1370,7 @@ isc_nm_setstats(isc_nm_t *mgr, isc_stats_t *stats) } void -isc__nm_incstats(isc_nm_t *mgr, isc_statscounter_t counterid) -{ +isc__nm_incstats(isc_nm_t *mgr, isc_statscounter_t counterid) { REQUIRE(VALID_NM(mgr)); REQUIRE(counterid != -1); @@ -1433,8 +1380,7 @@ isc__nm_incstats(isc_nm_t *mgr, isc_statscounter_t counterid) } void -isc__nm_decstats(isc_nm_t *mgr, isc_statscounter_t counterid) -{ +isc__nm_decstats(isc_nm_t *mgr, isc_statscounter_t counterid) { REQUIRE(VALID_NM(mgr)); REQUIRE(counterid != -1); diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c index a83fede0d2..830453930f 100644 --- a/lib/isc/netmgr/tcp.c +++ b/lib/isc/netmgr/tcp.c @@ -32,36 +32,26 @@ #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) -{ +tcp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) { isc__networker_t *worker = NULL; - int r; + int r; REQUIRE(isc__nm_in_netthread()); @@ -89,13 +79,12 @@ tcp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) } void -isc__nm_async_tcpconnect(isc__networker_t *worker, isc__netievent_t *ev0) -{ +isc__nm_async_tcpconnect(isc__networker_t *worker, isc__netievent_t *ev0) { isc__netievent_tcpconnect_t *ievent = (isc__netievent_tcpconnect_t *)ev0; - isc_nmsocket_t * sock = ievent->sock; + isc_nmsocket_t *sock = ievent->sock; isc__nm_uvreq_t *req = ievent->req; - int r; + int r; REQUIRE(sock->type == isc_nm_tcpsocket); REQUIRE(worker->id == ievent->req->sock->mgr->workers[isc_nm_tid()].id); @@ -108,17 +97,16 @@ isc__nm_async_tcpconnect(isc__networker_t *worker, isc__netievent_t *ev0) } static void -tcp_connect_cb(uv_connect_t *uvreq, int status) -{ +tcp_connect_cb(uv_connect_t *uvreq, int status) { isc__nm_uvreq_t *req = (isc__nm_uvreq_t *)uvreq->data; - isc_nmsocket_t * sock = NULL; + isc_nmsocket_t *sock = NULL; sock = uv_handle_get_data((uv_handle_t *)uvreq->handle); REQUIRE(VALID_UVREQ(req)); if (status == 0) { - isc_result_t result; - isc_nmhandle_t * handle = NULL; + isc_result_t result; + isc_nmhandle_t *handle = NULL; struct sockaddr_storage ss; isc__nm_incstats(sock->mgr, sock->statsindex[STATID_CONNECT]); @@ -146,9 +134,8 @@ tcp_connect_cb(uv_connect_t *uvreq, int status) isc_result_t isc_nm_listentcp(isc_nm_t *mgr, isc_nmiface_t *iface, isc_nm_cb_t cb, void *cbarg, size_t extrahandlesize, int backlog, - isc_quota_t *quota, isc_nmsocket_t **sockp) -{ - isc_nmsocket_t * nsock = NULL; + isc_quota_t *quota, isc_nmsocket_t **sockp) { + isc_nmsocket_t *nsock = NULL; isc__netievent_tcplisten_t *ievent = NULL; REQUIRE(VALID_NM(mgr)); @@ -157,8 +144,8 @@ isc_nm_listentcp(isc_nm_t *mgr, isc_nmiface_t *iface, isc_nm_cb_t cb, isc__nmsocket_init(nsock, mgr, isc_nm_tcplistener, iface); nsock->nchildren = mgr->nworkers; atomic_init(&nsock->rchildren, mgr->nworkers); - nsock->children = - isc_mem_get(mgr->mctx, mgr->nworkers * sizeof(*nsock)); + nsock->children = isc_mem_get(mgr->mctx, + mgr->nworkers * sizeof(*nsock)); memset(nsock->children, 0, mgr->nworkers * sizeof(*nsock)); nsock->rcb.accept = cb; nsock->rcbarg = cbarg; @@ -215,12 +202,11 @@ isc_nm_listentcp(isc_nm_t *mgr, isc_nmiface_t *iface, isc_nm_cb_t cb, * they have been deprecated and removed.) */ void -isc__nm_async_tcplisten(isc__networker_t *worker, isc__netievent_t *ev0) -{ +isc__nm_async_tcplisten(isc__networker_t *worker, isc__netievent_t *ev0) { isc__netievent_tcplisten_t *ievent = (isc__netievent_tcplisten_t *)ev0; - isc_nmsocket_t * sock = ievent->sock; - struct sockaddr_storage sname; - int r, flags = 0, snamelen = sizeof(sname); + isc_nmsocket_t *sock = ievent->sock; + struct sockaddr_storage sname; + int r, flags = 0, snamelen = sizeof(sname); REQUIRE(isc__nm_in_netthread()); REQUIRE(sock->type == isc_nm_tcplistener); @@ -291,7 +277,7 @@ isc__nm_async_tcplisten(isc__networker_t *worker, isc__netievent_t *ev0) * the exported socket. */ for (int i = 0; i < sock->nchildren; i++) { - isc_nmsocket_t * csock = &sock->children[i]; + isc_nmsocket_t *csock = &sock->children[i]; isc__netievent_tcpchildlisten_t *event = NULL; event = isc__nm_get_ievent(csock->mgr, @@ -331,12 +317,11 @@ done: * for the socket we'll be listening on. */ void -isc__nm_async_tcpchildlisten(isc__networker_t *worker, isc__netievent_t *ev0) -{ +isc__nm_async_tcpchildlisten(isc__networker_t *worker, isc__netievent_t *ev0) { isc__netievent_tcpchildlisten_t *ievent = (isc__netievent_tcpchildlisten_t *)ev0; isc_nmsocket_t *sock = ievent->sock; - int r; + int r; REQUIRE(isc__nm_in_netthread()); REQUIRE(sock->type == isc_nm_tcpchildlistener); @@ -367,8 +352,7 @@ isc__nm_async_tcpchildlisten(isc__networker_t *worker, isc__netievent_t *ev0) } void -isc_nm_tcp_stoplistening(isc_nmsocket_t *sock) -{ +isc_nm_tcp_stoplistening(isc_nmsocket_t *sock) { isc__netievent_tcpstop_t *ievent = NULL; REQUIRE(VALID_NMSOCK(sock)); @@ -381,10 +365,9 @@ isc_nm_tcp_stoplistening(isc_nmsocket_t *sock) } void -isc__nm_async_tcpstop(isc__networker_t *worker, isc__netievent_t *ev0) -{ +isc__nm_async_tcpstop(isc__networker_t *worker, isc__netievent_t *ev0) { isc__netievent_tcpstop_t *ievent = (isc__netievent_tcpstop_t *)ev0; - isc_nmsocket_t * sock = ievent->sock; + isc_nmsocket_t *sock = ievent->sock; UNUSED(worker); @@ -409,8 +392,7 @@ isc__nm_async_tcpstop(isc__networker_t *worker, isc__netievent_t *ev0) } static void -stoplistening(isc_nmsocket_t *sock) -{ +stoplistening(isc_nmsocket_t *sock) { for (int i = 0; i < sock->nchildren; i++) { isc__netievent_tcpchildstop_t *event = NULL; @@ -441,8 +423,7 @@ stoplistening(isc_nmsocket_t *sock) } void -isc__nm_async_tcpchildstop(isc__networker_t *worker, isc__netievent_t *ev0) -{ +isc__nm_async_tcpchildstop(isc__networker_t *worker, isc__netievent_t *ev0) { isc__netievent_tcpchildstop_t *ievent = (isc__netievent_tcpchildstop_t *)ev0; isc_nmsocket_t *sock = ievent->sock; @@ -472,11 +453,10 @@ isc__nm_async_tcpchildstop(isc__networker_t *worker, isc__netievent_t *ev0) * sockets; that's why we need to choose the proper lock. */ static void -tcp_listenclose_cb(uv_handle_t *handle) -{ +tcp_listenclose_cb(uv_handle_t *handle) { isc_nmsocket_t *sock = uv_handle_get_data(handle); - isc_mutex_t * lock = - ((sock->parent != NULL) ? &sock->parent->lock : &sock->lock); + isc_mutex_t *lock = ((sock->parent != NULL) ? &sock->parent->lock + : &sock->lock); LOCK(lock); atomic_store(&sock->closed, true); @@ -488,8 +468,7 @@ tcp_listenclose_cb(uv_handle_t *handle) } static void -readtimeout_cb(uv_timer_t *handle) -{ +readtimeout_cb(uv_timer_t *handle) { isc_nmsocket_t *sock = uv_handle_get_data((uv_handle_t *)handle); REQUIRE(VALID_NMSOCK(sock)); @@ -515,9 +494,8 @@ readtimeout_cb(uv_timer_t *handle) } isc_result_t -isc_nm_read(isc_nmhandle_t *handle, isc_nm_recv_cb_t cb, void *cbarg) -{ - isc_nmsocket_t * sock = NULL; +isc_nm_read(isc_nmhandle_t *handle, isc_nm_recv_cb_t cb, void *cbarg) { + isc_nmsocket_t *sock = NULL; isc__netievent_startread_t *ievent = NULL; REQUIRE(VALID_NMHANDLE(handle)); @@ -543,11 +521,10 @@ isc_nm_read(isc_nmhandle_t *handle, isc_nm_recv_cb_t cb, void *cbarg) } void -isc__nm_async_startread(isc__networker_t *worker, isc__netievent_t *ev0) -{ +isc__nm_async_startread(isc__networker_t *worker, isc__netievent_t *ev0) { isc__netievent_startread_t *ievent = (isc__netievent_startread_t *)ev0; - isc_nmsocket_t * sock = ievent->sock; - int r; + isc_nmsocket_t *sock = ievent->sock; + int r; REQUIRE(worker->id == isc_nm_tid()); if (sock->read_timeout != 0) { @@ -567,8 +544,7 @@ isc__nm_async_startread(isc__networker_t *worker, isc__netievent_t *ev0) } isc_result_t -isc_nm_pauseread(isc_nmsocket_t *sock) -{ +isc_nm_pauseread(isc_nmsocket_t *sock) { isc__netievent_pauseread_t *ievent = NULL; REQUIRE(VALID_NMSOCK(sock)); @@ -594,10 +570,9 @@ isc_nm_pauseread(isc_nmsocket_t *sock) } void -isc__nm_async_pauseread(isc__networker_t *worker, isc__netievent_t *ev0) -{ +isc__nm_async_pauseread(isc__networker_t *worker, isc__netievent_t *ev0) { isc__netievent_pauseread_t *ievent = (isc__netievent_pauseread_t *)ev0; - isc_nmsocket_t * sock = ievent->sock; + isc_nmsocket_t *sock = ievent->sock; REQUIRE(VALID_NMSOCK(sock)); REQUIRE(worker->id == isc_nm_tid()); @@ -609,8 +584,7 @@ isc__nm_async_pauseread(isc__networker_t *worker, isc__netievent_t *ev0) } isc_result_t -isc_nm_resumeread(isc_nmsocket_t *sock) -{ +isc_nm_resumeread(isc_nmsocket_t *sock) { isc__netievent_startread_t *ievent = NULL; REQUIRE(VALID_NMSOCK(sock)); @@ -638,8 +612,7 @@ isc_nm_resumeread(isc_nmsocket_t *sock) } static void -read_cb(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) -{ +read_cb(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) { isc_nmsocket_t *sock = uv_handle_get_data((uv_handle_t *)stream); REQUIRE(VALID_NMSOCK(sock)); @@ -689,22 +662,22 @@ read_cb(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) } static isc_result_t -accept_connection(isc_nmsocket_t *ssock) -{ - isc_result_t result; - isc_quota_t * quota = NULL; - isc_nmsocket_t * csock = NULL; - isc__networker_t * worker = NULL; - isc_nmhandle_t * handle = NULL; +accept_connection(isc_nmsocket_t *ssock) { + isc_result_t result; + isc_quota_t *quota = NULL; + isc_nmsocket_t *csock = NULL; + isc__networker_t *worker = NULL; + isc_nmhandle_t *handle = NULL; struct sockaddr_storage ss; - isc_sockaddr_t local; - int r; + isc_sockaddr_t local; + int r; REQUIRE(VALID_NMSOCK(ssock)); REQUIRE(ssock->tid == isc_nm_tid()); if (!atomic_load_relaxed(&ssock->active) || - atomic_load_relaxed(&ssock->mgr->closing)) { + atomic_load_relaxed(&ssock->mgr->closing)) + { /* We're closing, bail */ return (ISC_R_CANCELED); } @@ -743,8 +716,8 @@ accept_connection(isc_nmsocket_t *ssock) goto error; } - result = - isc_sockaddr_fromsockaddr(&csock->peer, (struct sockaddr *)&ss); + result = isc_sockaddr_fromsockaddr(&csock->peer, + (struct sockaddr *)&ss); if (result != ISC_R_SUCCESS) { goto error; } @@ -785,10 +758,9 @@ error: } static void -tcp_connection_cb(uv_stream_t *server, int status) -{ +tcp_connection_cb(uv_stream_t *server, int status) { isc_nmsocket_t *ssock = uv_handle_get_data((uv_handle_t *)server); - isc_result_t result; + isc_result_t result; UNUSED(status); @@ -806,11 +778,10 @@ tcp_connection_cb(uv_stream_t *server, int status) isc_result_t isc__nm_tcp_send(isc_nmhandle_t *handle, isc_region_t *region, isc_nm_cb_t cb, - void *cbarg) -{ - isc_nmsocket_t * sock = handle->sock; + void *cbarg) { + isc_nmsocket_t *sock = handle->sock; isc__netievent_tcpsend_t *ievent = NULL; - isc__nm_uvreq_t * uvreq = NULL; + isc__nm_uvreq_t *uvreq = NULL; REQUIRE(sock->type == isc_nm_tcpsocket); @@ -844,9 +815,8 @@ isc__nm_tcp_send(isc_nmhandle_t *handle, isc_region_t *region, isc_nm_cb_t cb, } static void -tcp_send_cb(uv_write_t *req, int status) -{ - isc_result_t result = ISC_R_SUCCESS; +tcp_send_cb(uv_write_t *req, int status) { + isc_result_t result = ISC_R_SUCCESS; isc__nm_uvreq_t *uvreq = (isc__nm_uvreq_t *)req->data; REQUIRE(VALID_UVREQ(uvreq)); @@ -867,9 +837,8 @@ tcp_send_cb(uv_write_t *req, int status) * Handle 'tcpsend' async event - send a packet on the socket */ void -isc__nm_async_tcpsend(isc__networker_t *worker, isc__netievent_t *ev0) -{ - isc_result_t result; +isc__nm_async_tcpsend(isc__networker_t *worker, isc__netievent_t *ev0) { + isc_result_t result; isc__netievent_tcpsend_t *ievent = (isc__netievent_tcpsend_t *)ev0; REQUIRE(worker->id == ievent->sock->tid); @@ -887,8 +856,7 @@ isc__nm_async_tcpsend(isc__networker_t *worker, isc__netievent_t *ev0) } static isc_result_t -tcp_send_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) -{ +tcp_send_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) { int r; REQUIRE(sock->tid == isc_nm_tid()); @@ -908,8 +876,7 @@ tcp_send_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) } static void -tcp_close_cb(uv_handle_t *uvhandle) -{ +tcp_close_cb(uv_handle_t *uvhandle) { isc_nmsocket_t *sock = uv_handle_get_data(uvhandle); REQUIRE(VALID_NMSOCK(sock)); @@ -920,8 +887,7 @@ tcp_close_cb(uv_handle_t *uvhandle) } static void -timer_close_cb(uv_handle_t *uvhandle) -{ +timer_close_cb(uv_handle_t *uvhandle) { isc_nmsocket_t *sock = uv_handle_get_data(uvhandle); REQUIRE(VALID_NMSOCK(sock)); @@ -931,8 +897,7 @@ timer_close_cb(uv_handle_t *uvhandle) } static void -tcp_close_direct(isc_nmsocket_t *sock) -{ +tcp_close_direct(isc_nmsocket_t *sock) { REQUIRE(VALID_NMSOCK(sock)); REQUIRE(sock->tid == isc_nm_tid()); REQUIRE(sock->type == isc_nm_tcpsocket); @@ -944,8 +909,8 @@ tcp_close_direct(isc_nmsocket_t *sock) if (ssock->overquota) { isc_result_t result = accept_connection(ssock); - if (result != ISC_R_QUOTA && - result != ISC_R_SOFTQUOTA) { + if (result != ISC_R_QUOTA && result != ISC_R_SOFTQUOTA) + { ssock->overquota = false; } } @@ -963,8 +928,7 @@ tcp_close_direct(isc_nmsocket_t *sock) } void -isc__nm_tcp_close(isc_nmsocket_t *sock) -{ +isc__nm_tcp_close(isc_nmsocket_t *sock) { REQUIRE(VALID_NMSOCK(sock)); REQUIRE(sock->type == isc_nm_tcpsocket); @@ -984,8 +948,7 @@ isc__nm_tcp_close(isc_nmsocket_t *sock) } void -isc__nm_async_tcpclose(isc__networker_t *worker, isc__netievent_t *ev0) -{ +isc__nm_async_tcpclose(isc__networker_t *worker, isc__netievent_t *ev0) { isc__netievent_tcpclose_t *ievent = (isc__netievent_tcpclose_t *)ev0; REQUIRE(worker->id == ievent->sock->tid); @@ -994,12 +957,12 @@ isc__nm_async_tcpclose(isc__networker_t *worker, isc__netievent_t *ev0) } void -isc__nm_tcp_shutdown(isc_nmsocket_t *sock) -{ +isc__nm_tcp_shutdown(isc_nmsocket_t *sock) { REQUIRE(VALID_NMSOCK(sock)); if (sock->type == isc_nm_tcpsocket && sock->tcphandle != NULL && - sock->rcb.recv != NULL) { + sock->rcb.recv != NULL) + { sock->rcb.recv(sock->tcphandle, NULL, sock->rcbarg); } } diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c index e384b73be9..79650281e6 100644 --- a/lib/isc/netmgr/tcpdns.c +++ b/lib/isc/netmgr/tcpdns.c @@ -37,15 +37,13 @@ * 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) -{ +dnslen(unsigned char *base) { return ((base[0] << 8) + (base[1])); } @@ -60,8 +58,7 @@ dnslen(unsigned char *base) */ #define NM_BIG_BUF (65535 + 2) * 2 static inline void -alloc_dnsbuf(isc_nmsocket_t *sock, size_t len) -{ +alloc_dnsbuf(isc_nmsocket_t *sock, size_t len) { REQUIRE(len <= NM_BIG_BUF); if (sock->buf == NULL) { @@ -78,8 +75,7 @@ alloc_dnsbuf(isc_nmsocket_t *sock, size_t len) } static void -timer_close_cb(uv_handle_t *handle) -{ +timer_close_cb(uv_handle_t *handle) { isc_nmsocket_t *sock = (isc_nmsocket_t *)uv_handle_get_data(handle); INSIST(VALID_NMSOCK(sock)); atomic_store(&sock->closed, true); @@ -87,8 +83,7 @@ timer_close_cb(uv_handle_t *handle) } static void -dnstcp_readtimeout(uv_timer_t *timer) -{ +dnstcp_readtimeout(uv_timer_t *timer) { isc_nmsocket_t *sock = (isc_nmsocket_t *)uv_handle_get_data((uv_handle_t *)timer); @@ -103,8 +98,7 @@ dnstcp_readtimeout(uv_timer_t *timer) * Accept callback for TCP-DNS connection. */ static void -dnslisten_acceptcb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) -{ +dnslisten_acceptcb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) { isc_nmsocket_t *dnslistensock = (isc_nmsocket_t *)cbarg; isc_nmsocket_t *dnssock = NULL; @@ -154,8 +148,7 @@ dnslisten_acceptcb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) * The caller will need to unreference the handle. */ static isc_result_t -processbuffer(isc_nmsocket_t *dnssock, isc_nmhandle_t **handlep) -{ +processbuffer(isc_nmsocket_t *dnssock, isc_nmhandle_t **handlep) { size_t len; REQUIRE(VALID_NMSOCK(dnssock)); @@ -175,8 +168,8 @@ processbuffer(isc_nmsocket_t *dnssock, isc_nmhandle_t **handlep) */ len = dnslen(dnssock->buf); if (len <= dnssock->buf_len - 2) { - isc_nmhandle_t *dnshandle = - isc__nmhandle_get(dnssock, NULL, NULL); + isc_nmhandle_t *dnshandle = isc__nmhandle_get(dnssock, NULL, + NULL); isc_nmsocket_t *listener = dnssock->listener; if (listener != NULL && listener->rcb.recv != NULL) { @@ -206,12 +199,11 @@ processbuffer(isc_nmsocket_t *dnssock, isc_nmhandle_t **handlep) * a complete DNS packet and, if so - call the callback */ static void -dnslisten_readcb(isc_nmhandle_t *handle, isc_region_t *region, void *arg) -{ +dnslisten_readcb(isc_nmhandle_t *handle, isc_region_t *region, void *arg) { isc_nmsocket_t *dnssock = (isc_nmsocket_t *)arg; - unsigned char * base = NULL; - bool done = false; - size_t len; + unsigned char *base = NULL; + bool done = false; + size_t len; REQUIRE(VALID_NMSOCK(dnssock)); REQUIRE(VALID_NMHANDLE(handle)); @@ -237,7 +229,7 @@ dnslisten_readcb(isc_nmhandle_t *handle, isc_region_t *region, void *arg) : dnssock->mgr->idle); do { - isc_result_t result; + isc_result_t result; isc_nmhandle_t *dnshandle = NULL; result = processbuffer(dnssock, &dnshandle); @@ -290,11 +282,10 @@ isc_result_t isc_nm_listentcpdns(isc_nm_t *mgr, isc_nmiface_t *iface, isc_nm_recv_cb_t cb, void *cbarg, isc_nm_cb_t accept_cb, void *accept_cbarg, size_t extrahandlesize, int backlog, isc_quota_t *quota, - isc_nmsocket_t **sockp) -{ + isc_nmsocket_t **sockp) { /* A 'wrapper' socket object with outer set to true TCP socket */ - isc_nmsocket_t *dnslistensock = - isc_mem_get(mgr->mctx, sizeof(*dnslistensock)); + isc_nmsocket_t *dnslistensock = isc_mem_get(mgr->mctx, + sizeof(*dnslistensock)); isc_result_t result; REQUIRE(VALID_NM(mgr)); @@ -322,8 +313,7 @@ isc_nm_listentcpdns(isc_nm_t *mgr, isc_nmiface_t *iface, isc_nm_recv_cb_t cb, } void -isc_nm_tcpdns_stoplistening(isc_nmsocket_t *sock) -{ +isc_nm_tcpdns_stoplistening(isc_nmsocket_t *sock) { REQUIRE(VALID_NMSOCK(sock)); REQUIRE(sock->type == isc_nm_tcpdnslistener); @@ -339,8 +329,7 @@ isc_nm_tcpdns_stoplistening(isc_nmsocket_t *sock) } void -isc_nm_tcpdns_sequential(isc_nmhandle_t *handle) -{ +isc_nm_tcpdns_sequential(isc_nmhandle_t *handle) { REQUIRE(VALID_NMHANDLE(handle)); if (handle->sock->type != isc_nm_tcpdnssocket || @@ -361,8 +350,7 @@ isc_nm_tcpdns_sequential(isc_nmhandle_t *handle) } void -isc_nm_tcpdns_keepalive(isc_nmhandle_t *handle) -{ +isc_nm_tcpdns_keepalive(isc_nmhandle_t *handle) { REQUIRE(VALID_NMHANDLE(handle)); if (handle->sock->type != isc_nm_tcpdnssocket || @@ -375,19 +363,18 @@ isc_nm_tcpdns_keepalive(isc_nmhandle_t *handle) } typedef struct tcpsend { - isc_mem_t * mctx; + isc_mem_t *mctx; isc_nmhandle_t *handle; - isc_region_t region; + isc_region_t region; isc_nmhandle_t *orighandle; - isc_nm_cb_t cb; - void * cbarg; + isc_nm_cb_t cb; + void *cbarg; } tcpsend_t; static void -resume_processing(void *arg) -{ +resume_processing(void *arg) { isc_nmsocket_t *sock = (isc_nmsocket_t *)arg; - isc_result_t result; + isc_result_t result; REQUIRE(VALID_NMSOCK(sock)); REQUIRE(sock->tid == isc_nm_tid()); @@ -448,8 +435,7 @@ resume_processing(void *arg) } static void -tcpdnssend_cb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) -{ +tcpdnssend_cb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) { tcpsend_t *ts = (tcpsend_t *)cbarg; UNUSED(handle); @@ -466,8 +452,7 @@ tcpdnssend_cb(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) */ isc_result_t isc__nm_tcpdns_send(isc_nmhandle_t *handle, isc_region_t *region, - isc_nm_cb_t cb, void *cbarg) -{ + isc_nm_cb_t cb, void *cbarg) { tcpsend_t *t = NULL; REQUIRE(VALID_NMHANDLE(handle)); @@ -504,8 +489,7 @@ isc__nm_tcpdns_send(isc_nmhandle_t *handle, isc_region_t *region, } static void -tcpdns_close_direct(isc_nmsocket_t *sock) -{ +tcpdns_close_direct(isc_nmsocket_t *sock) { REQUIRE(sock->tid == isc_nm_tid()); if (sock->outer != NULL) { sock->outer->rcb.recv = NULL; @@ -523,8 +507,7 @@ tcpdns_close_direct(isc_nmsocket_t *sock) } void -isc__nm_tcpdns_close(isc_nmsocket_t *sock) -{ +isc__nm_tcpdns_close(isc_nmsocket_t *sock) { REQUIRE(VALID_NMSOCK(sock)); REQUIRE(sock->type == isc_nm_tcpdnssocket); @@ -541,8 +524,7 @@ isc__nm_tcpdns_close(isc_nmsocket_t *sock) } void -isc__nm_async_tcpdnsclose(isc__networker_t *worker, isc__netievent_t *ev0) -{ +isc__nm_async_tcpdnsclose(isc__networker_t *worker, isc__netievent_t *ev0) { isc__netievent_tcpdnsclose_t *ievent = (isc__netievent_tcpdnsclose_t *)ev0; diff --git a/lib/isc/netmgr/udp.c b/lib/isc/netmgr/udp.c index 5a105c7cbd..2e0773a3d4 100644 --- a/lib/isc/netmgr/udp.c +++ b/lib/isc/netmgr/udp.c @@ -29,21 +29,17 @@ #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, - void *cbarg, size_t extrahandlesize, isc_nmsocket_t **sockp) -{ + void *cbarg, size_t extrahandlesize, isc_nmsocket_t **sockp) { isc_nmsocket_t *nsock = NULL; REQUIRE(VALID_NM(mgr)); @@ -56,8 +52,8 @@ isc_nm_listenudp(isc_nm_t *mgr, isc_nmiface_t *iface, isc_nm_recv_cb_t cb, isc__nmsocket_init(nsock, mgr, isc_nm_udplistener, iface); nsock->nchildren = mgr->nworkers; atomic_init(&nsock->rchildren, mgr->nworkers); - nsock->children = - isc_mem_get(mgr->mctx, mgr->nworkers * sizeof(*nsock)); + nsock->children = isc_mem_get(mgr->mctx, + mgr->nworkers * sizeof(*nsock)); memset(nsock->children, 0, mgr->nworkers * sizeof(*nsock)); INSIST(nsock->rcb.recv == NULL && nsock->rcbarg == NULL); @@ -67,10 +63,10 @@ isc_nm_listenudp(isc_nm_t *mgr, isc_nmiface_t *iface, isc_nm_recv_cb_t cb, for (size_t i = 0; i < mgr->nworkers; i++) { uint16_t family = iface->addr.type.sa.sa_family; - int res; + int res; isc__netievent_udplisten_t *ievent = NULL; - isc_nmsocket_t * csock = &nsock->children[i]; + isc_nmsocket_t *csock = &nsock->children[i]; isc__nmsocket_init(csock, mgr, isc_nm_udpsocket, iface); csock->parent = nsock; @@ -112,11 +108,10 @@ isc_nm_listenudp(isc_nm_t *mgr, isc_nmiface_t *iface, isc_nm_recv_cb_t cb, * handle 'udplisten' async call - start listening on a socket. */ void -isc__nm_async_udplisten(isc__networker_t *worker, isc__netievent_t *ev0) -{ +isc__nm_async_udplisten(isc__networker_t *worker, isc__netievent_t *ev0) { isc__netievent_udplisten_t *ievent = (isc__netievent_udplisten_t *)ev0; - isc_nmsocket_t * sock = ievent->sock; - int r, flags = 0; + isc_nmsocket_t *sock = ievent->sock; + int r, flags = 0; REQUIRE(sock->type == isc_nm_udpsocket); REQUIRE(sock->iface != NULL); @@ -152,8 +147,7 @@ isc__nm_async_udplisten(isc__networker_t *worker, isc__netievent_t *ev0) } static void -udp_close_cb(uv_handle_t *handle) -{ +udp_close_cb(uv_handle_t *handle) { isc_nmsocket_t *sock = uv_handle_get_data(handle); atomic_store(&sock->closed, true); @@ -161,8 +155,7 @@ udp_close_cb(uv_handle_t *handle) } static void -stop_udp_child(isc_nmsocket_t *sock) -{ +stop_udp_child(isc_nmsocket_t *sock) { REQUIRE(sock->type == isc_nm_udpsocket); REQUIRE(sock->tid == isc_nm_tid()); @@ -178,8 +171,7 @@ stop_udp_child(isc_nmsocket_t *sock) } static void -stoplistening(isc_nmsocket_t *sock) -{ +stoplistening(isc_nmsocket_t *sock) { REQUIRE(sock->type == isc_nm_udplistener); /* @@ -220,8 +212,7 @@ stoplistening(isc_nmsocket_t *sock) } void -isc_nm_udp_stoplistening(isc_nmsocket_t *sock) -{ +isc_nm_udp_stoplistening(isc_nmsocket_t *sock) { isc__netievent_udpstop_t *ievent = NULL; /* We can't be launched from network thread, we'd deadlock */ @@ -248,10 +239,9 @@ isc_nm_udp_stoplistening(isc_nmsocket_t *sock) * handle 'udpstop' async call - stop listening on a socket. */ void -isc__nm_async_udpstop(isc__networker_t *worker, isc__netievent_t *ev0) -{ +isc__nm_async_udpstop(isc__networker_t *worker, isc__netievent_t *ev0) { isc__netievent_udpstop_t *ievent = (isc__netievent_udpstop_t *)ev0; - isc_nmsocket_t * sock = ievent->sock; + isc_nmsocket_t *sock = ievent->sock; REQUIRE(sock->iface != NULL); UNUSED(worker); @@ -287,16 +277,15 @@ isc__nm_async_udpstop(isc__networker_t *worker, isc__netievent_t *ev0) */ static void udp_recv_cb(uv_udp_t *handle, ssize_t nrecv, const uv_buf_t *buf, - const struct sockaddr *addr, unsigned flags) -{ - isc_result_t result; - isc_nmhandle_t * nmhandle = NULL; - isc_sockaddr_t sockaddr; - isc_sockaddr_t localaddr; + const struct sockaddr *addr, unsigned flags) { + isc_result_t result; + isc_nmhandle_t *nmhandle = NULL; + isc_sockaddr_t sockaddr; + isc_sockaddr_t localaddr; struct sockaddr_storage laddr; isc_nmsocket_t *sock = uv_handle_get_data((uv_handle_t *)handle); - isc_region_t region; - uint32_t maxudp; + isc_region_t region; + uint32_t maxudp; REQUIRE(VALID_NMSOCK(sock)); @@ -355,15 +344,14 @@ udp_recv_cb(uv_udp_t *handle, ssize_t nrecv, const uv_buf_t *buf, */ isc_result_t isc__nm_udp_send(isc_nmhandle_t *handle, isc_region_t *region, isc_nm_cb_t cb, - void *cbarg) -{ - isc_nmsocket_t * psock = NULL, *rsock = NULL; - isc_nmsocket_t * sock = handle->sock; - isc_sockaddr_t * peer = &handle->peer; + void *cbarg) { + isc_nmsocket_t *psock = NULL, *rsock = NULL; + isc_nmsocket_t *sock = handle->sock; + isc_sockaddr_t *peer = &handle->peer; isc__netievent_udpsend_t *ievent = NULL; - isc__nm_uvreq_t * uvreq = NULL; - int ntid; - uint32_t maxudp = atomic_load(&sock->mgr->maxudp); + isc__nm_uvreq_t *uvreq = NULL; + int ntid; + uint32_t maxudp = atomic_load(&sock->mgr->maxudp); /* * Simulate a firewall blocking UDP packets bigger than @@ -435,8 +423,7 @@ isc__nm_udp_send(isc_nmhandle_t *handle, isc_region_t *region, isc_nm_cb_t cb, * handle 'udpsend' async event - send a packet on the socket */ void -isc__nm_async_udpsend(isc__networker_t *worker, isc__netievent_t *ev0) -{ +isc__nm_async_udpsend(isc__networker_t *worker, isc__netievent_t *ev0) { isc__netievent_udpsend_t *ievent = (isc__netievent_udpsend_t *)ev0; REQUIRE(worker->id == ievent->sock->tid); @@ -454,9 +441,8 @@ isc__nm_async_udpsend(isc__networker_t *worker, isc__netievent_t *ev0) * udp_send_cb - callback */ static void -udp_send_cb(uv_udp_send_t *req, int status) -{ - isc_result_t result = ISC_R_SUCCESS; +udp_send_cb(uv_udp_send_t *req, int status) { + isc_result_t result = ISC_R_SUCCESS; isc__nm_uvreq_t *uvreq = (isc__nm_uvreq_t *)req->data; REQUIRE(VALID_UVREQ(uvreq)); @@ -479,8 +465,7 @@ udp_send_cb(uv_udp_send_t *req, int status) */ static isc_result_t udp_send_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req, - isc_sockaddr_t *peer) -{ + isc_sockaddr_t *peer) { int rv; REQUIRE(sock->tid == isc_nm_tid()); diff --git a/lib/isc/netmgr/uv-compat.c b/lib/isc/netmgr/uv-compat.c index fecf26d792..9e75538f8a 100644 --- a/lib/isc/netmgr/uv-compat.c +++ b/lib/isc/netmgr/uv-compat.c @@ -33,7 +33,7 @@ typedef enum { typedef struct { WSAPROTOCOL_INFOW socket_info; - uint32_t delayed_error; + uint32_t delayed_error; } uv__ipc_socket_xfer_info_t; /* @@ -41,18 +41,15 @@ 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) -{ +isc_uv_export(uv_stream_t *stream, isc_uv_stream_info_t *info) { uv__ipc_socket_xfer_info_t xfer_info; uv__ipc_socket_xfer_type_t xfer_type = UV__IPC_SOCKET_XFER_NONE; @@ -79,16 +76,15 @@ isc_uv_export(uv_stream_t *stream, isc_uv_stream_info_t *info) } int -isc_uv_import(uv_stream_t *stream, isc_uv_stream_info_t *info) -{ +isc_uv_import(uv_stream_t *stream, isc_uv_stream_info_t *info) { if (stream->type != UV_TCP || info->type != UV_TCP) { return (-1); } return (uv__tcp_xfer_import( (uv_tcp_t *)stream, UV__IPC_SOCKET_XFER_TCP_SERVER, - &(uv__ipc_socket_xfer_info_t){ .socket_info = - info->socket_info })); + &(uv__ipc_socket_xfer_info_t){ + .socket_info = info->socket_info })); } #else /* WIN32 */ /* Adapted from libuv/src/unix/internal.h */ @@ -97,8 +93,7 @@ isc_uv_import(uv_stream_t *stream, isc_uv_stream_info_t *info) #include static int -isc_uv__cloexec(int fd, int set) -{ +isc_uv__cloexec(int fd, int set) { int r; /* @@ -149,8 +144,7 @@ isc_uv__cloexec(int fd, int set) } int -isc_uv_export(uv_stream_t *stream, isc_uv_stream_info_t *info) -{ +isc_uv_export(uv_stream_t *stream, isc_uv_stream_info_t *info) { int oldfd, fd; int err; @@ -180,8 +174,7 @@ isc_uv_export(uv_stream_t *stream, isc_uv_stream_info_t *info) } int -isc_uv_import(uv_stream_t *stream, isc_uv_stream_info_t *info) -{ +isc_uv_import(uv_stream_t *stream, isc_uv_stream_info_t *info) { if (info->type != UV_TCP) { return (-1); } diff --git a/lib/isc/netmgr/uv-compat.h b/lib/isc/netmgr/uv-compat.h index 9b548a760e..662bd1cbd0 100644 --- a/lib/isc/netmgr/uv-compat.h +++ b/lib/isc/netmgr/uv-compat.h @@ -21,16 +21,14 @@ #ifndef HAVE_UV_HANDLE_GET_DATA static inline void * -uv_handle_get_data(const uv_handle_t *handle) -{ +uv_handle_get_data(const uv_handle_t *handle) { return (handle->data); } #endif /* ifndef HAVE_UV_HANDLE_GET_DATA */ #ifndef HAVE_UV_HANDLE_SET_DATA static inline void -uv_handle_set_data(uv_handle_t *handle, void *data) -{ +uv_handle_set_data(uv_handle_t *handle, void *data) { handle->data = data; } #endif /* ifndef HAVE_UV_HANDLE_SET_DATA */ diff --git a/lib/isc/netmgr/uverr2result.c b/lib/isc/netmgr/uverr2result.c index b6a8065e3e..cf95eba88a 100644 --- a/lib/isc/netmgr/uverr2result.c +++ b/lib/isc/netmgr/uverr2result.c @@ -27,8 +27,7 @@ */ isc_result_t isc___nm_uverr2result(int uverr, bool dolog, const char *file, - unsigned int line) -{ + unsigned int line) { switch (uverr) { case UV_ENOTDIR: case UV_ELOOP: diff --git a/lib/isc/netscope.c b/lib/isc/netscope.c index 0f863c6d02..bca2d13801 100644 --- a/lib/isc/netscope.c +++ b/lib/isc/netscope.c @@ -20,11 +20,10 @@ #include isc_result_t -isc_netscope_pton(int af, char *scopename, void *addr, uint32_t *zoneid) -{ +isc_netscope_pton(int af, char *scopename, void *addr, uint32_t *zoneid) { char *ep; #ifdef HAVE_IF_NAMETOINDEX - unsigned int ifid; + unsigned int ifid; struct in6_addr *in6; #endif /* ifdef HAVE_IF_NAMETOINDEX */ uint32_t zone; @@ -46,7 +45,8 @@ isc_netscope_pton(int af, char *scopename, void *addr, uint32_t *zoneid) #ifdef HAVE_IF_NAMETOINDEX in6 = (struct in6_addr *)addr; if (IN6_IS_ADDR_LINKLOCAL(in6) && - (ifid = if_nametoindex((const char *)scopename)) != 0) { + (ifid = if_nametoindex((const char *)scopename)) != 0) + { zone = (uint32_t)ifid; } else { #endif /* ifdef HAVE_IF_NAMETOINDEX */ diff --git a/lib/isc/nonce.c b/lib/isc/nonce.c index 88af544453..c281d3688f 100644 --- a/lib/isc/nonce.c +++ b/lib/isc/nonce.c @@ -14,7 +14,6 @@ #include "entropy_private.h" void -isc_nonce_buf(void *buf, size_t buflen) -{ +isc_nonce_buf(void *buf, size_t buflen) { isc_entropy_get(buf, buflen); } diff --git a/lib/isc/openssl_shim.c b/lib/isc/openssl_shim.c index ce6f33ce22..c3c3dd3540 100644 --- a/lib/isc/openssl_shim.c +++ b/lib/isc/openssl_shim.c @@ -22,8 +22,7 @@ #if !HAVE_CRYPTO_ZALLOC void * -CRYPTO_zalloc(size_t size) -{ +CRYPTO_zalloc(size_t size) { void *ret = OPENSSL_malloc(size); if (ret != NULL) { memset(ret, 0, size); @@ -34,8 +33,7 @@ CRYPTO_zalloc(size_t size) #if !HAVE_EVP_CIPHER_CTX_NEW EVP_CIPHER_CTX * -EVP_CIPHER_CTX_new(void) -{ +EVP_CIPHER_CTX_new(void) { EVP_CIPHER_CTX *ctx = OPENSSL_zalloc(sizeof(*ctx)); return (ctx); } @@ -43,8 +41,7 @@ EVP_CIPHER_CTX_new(void) #if !HAVE_EVP_CIPHER_CTX_FREE void -EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx) -{ +EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx) { if (ctx != NULL) { EVP_CIPHER_CTX_cleanup(ctx); OPENSSL_free(ctx); @@ -54,8 +51,7 @@ EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx) #if !HAVE_EVP_MD_CTX_NEW EVP_MD_CTX * -EVP_MD_CTX_new(void) -{ +EVP_MD_CTX_new(void) { EVP_MD_CTX *ctx = OPENSSL_malloc(sizeof(*ctx)); if (ctx != NULL) { memset(ctx, 0, sizeof(*ctx)); @@ -66,8 +62,7 @@ EVP_MD_CTX_new(void) #if !HAVE_EVP_MD_CTX_FREE void -EVP_MD_CTX_free(EVP_MD_CTX *ctx) -{ +EVP_MD_CTX_free(EVP_MD_CTX *ctx) { if (ctx != NULL) { EVP_MD_CTX_cleanup(ctx); OPENSSL_free(ctx); @@ -77,16 +72,14 @@ EVP_MD_CTX_free(EVP_MD_CTX *ctx) #if !HAVE_EVP_MD_CTX_RESET int -EVP_MD_CTX_reset(EVP_MD_CTX *ctx) -{ +EVP_MD_CTX_reset(EVP_MD_CTX *ctx) { return (EVP_MD_CTX_cleanup(ctx)); } #endif /* if !HAVE_EVP_MD_CTX_RESET */ #if !HAVE_HMAC_CTX_NEW HMAC_CTX * -HMAC_CTX_new(void) -{ +HMAC_CTX_new(void) { HMAC_CTX *ctx = OPENSSL_zalloc(sizeof(*ctx)); if (ctx != NULL) { if (!HMAC_CTX_reset(ctx)) { @@ -100,8 +93,7 @@ HMAC_CTX_new(void) #if !HAVE_HMAC_CTX_FREE void -HMAC_CTX_free(HMAC_CTX *ctx) -{ +HMAC_CTX_free(HMAC_CTX *ctx) { if (ctx != NULL) { HMAC_CTX_cleanup(ctx); OPENSSL_free(ctx); @@ -111,8 +103,7 @@ HMAC_CTX_free(HMAC_CTX *ctx) #if !HAVE_HMAC_CTX_RESET int -HMAC_CTX_reset(HMAC_CTX *ctx) -{ +HMAC_CTX_reset(HMAC_CTX *ctx) { HMAC_CTX_cleanup(ctx); return (1); } @@ -120,8 +111,7 @@ HMAC_CTX_reset(HMAC_CTX *ctx) #if !HAVE_HMAC_CTX_GET_MD const EVP_MD * -HMAC_CTX_get_md(const HMAC_CTX *ctx) -{ +HMAC_CTX_get_md(const HMAC_CTX *ctx) { return (ctx->md); } #endif /* if !HAVE_HMAC_CTX_GET_MD */ diff --git a/lib/isc/parseint.c b/lib/isc/parseint.c index ea7e529b15..de42d210d3 100644 --- a/lib/isc/parseint.c +++ b/lib/isc/parseint.c @@ -21,11 +21,10 @@ #include isc_result_t -isc_parse_uint32(uint32_t *uip, const char *string, int base) -{ +isc_parse_uint32(uint32_t *uip, const char *string, int base) { unsigned long n; - uint32_t r; - char * e; + uint32_t r; + char *e; if (!isalnum((unsigned char)(string[0]))) { return (ISC_R_BADNUMBER); } @@ -48,9 +47,8 @@ isc_parse_uint32(uint32_t *uip, const char *string, int base) } isc_result_t -isc_parse_uint16(uint16_t *uip, const char *string, int base) -{ - uint32_t val; +isc_parse_uint16(uint16_t *uip, const char *string, int base) { + uint32_t val; isc_result_t result; result = isc_parse_uint32(&val, string, base); if (result != ISC_R_SUCCESS) { @@ -64,9 +62,8 @@ isc_parse_uint16(uint16_t *uip, const char *string, int base) } isc_result_t -isc_parse_uint8(uint8_t *uip, const char *string, int base) -{ - uint32_t val; +isc_parse_uint8(uint8_t *uip, const char *string, int base) { + uint32_t val; isc_result_t result; result = isc_parse_uint32(&val, string, base); if (result != ISC_R_SUCCESS) { diff --git a/lib/isc/pk11.c b/lib/isc/pk11.c index fee36ece76..3258c1ed9c 100644 --- a/lib/isc/pk11.c +++ b/lib/isc/pk11.c @@ -48,15 +48,15 @@ LIBISC_EXTERNAL_DATA bool pk11_verbose_init = false; static isc_once_t once = ISC_ONCE_INIT; static isc_mem_t *pk11_mctx = NULL; -static int32_t allocsize = 0; -static bool initialized = false; +static int32_t allocsize = 0; +static bool initialized = false; typedef struct pk11_session pk11_session_t; -typedef struct pk11_token pk11_token_t; +typedef struct pk11_token pk11_token_t; typedef ISC_LIST(pk11_session_t) pk11_sessionlist_t; struct pk11_session { - unsigned int magic; + unsigned int magic; CK_SESSION_HANDLE session; ISC_LINK(pk11_session_t) link; pk11_token_t *token; @@ -66,14 +66,14 @@ struct pk11_token { unsigned int magic; unsigned int operations; ISC_LINK(pk11_token_t) link; - CK_SLOT_ID slotid; + CK_SLOT_ID slotid; pk11_sessionlist_t sessions; - bool logged; - char name[32]; - char manuf[32]; - char model[16]; - char serial[16]; - char pin[PINLEN + 1]; + bool logged; + char name[32]; + char manuf[32]; + char model[16]; + char serial[16]; + char pin[PINLEN + 1]; }; static ISC_LIST(pk11_token_t) tokens; @@ -82,22 +82,16 @@ 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; @@ -124,20 +118,17 @@ static const char *lib_name = PK11_LIB_LOCATION ".dll"; #endif /* ifndef WIN32 */ void -pk11_set_lib_name(const char *name) -{ +pk11_set_lib_name(const char *name) { lib_name = name; } const char * -pk11_get_lib_name(void) -{ +pk11_get_lib_name(void) { return (lib_name); } static void -initialize(void) -{ +initialize(void) { char *pk11_provider; isc_mutex_init(&alloclock); @@ -150,8 +141,7 @@ initialize(void) } void * -pk11_mem_get(size_t size) -{ +pk11_mem_get(size_t size) { void *ptr; LOCK(&alloclock); @@ -175,8 +165,7 @@ pk11_mem_get(size_t size) } void -pk11_mem_put(void *ptr, size_t size) -{ +pk11_mem_put(void *ptr, size_t size) { if (ptr != NULL) { memset(ptr, 0, size); } @@ -193,10 +182,9 @@ pk11_mem_put(void *ptr, size_t size) } isc_result_t -pk11_initialize(isc_mem_t *mctx, const char *engine) -{ +pk11_initialize(isc_mem_t *mctx, const char *engine) { isc_result_t result = ISC_R_SUCCESS; - CK_RV rv; + CK_RV rv; RUNTIME_CHECK(isc_once_do(&once, initialize) == ISC_R_SUCCESS); @@ -240,10 +228,9 @@ unlock: } isc_result_t -pk11_finalize(void) -{ +pk11_finalize(void) { pk11_token_t *token, *next; - isc_result_t ret; + isc_result_t ret; ret = free_all_sessions(); (void)pkcs_C_Finalize(NULL_PTR); @@ -275,12 +262,11 @@ pk11_finalize(void) isc_result_t pk11_get_session(pk11_context_t *ctx, pk11_optype_t optype, bool need_services, - bool rw, bool logon, const char *pin, CK_SLOT_ID slot) -{ - pk11_token_t * token = NULL; + bool rw, bool logon, const char *pin, CK_SLOT_ID slot) { + pk11_token_t *token = NULL; pk11_sessionlist_t *freelist; - pk11_session_t * sp; - isc_result_t ret; + pk11_session_t *sp; + isc_result_t ret; UNUSED(need_services); memset(ctx, 0, sizeof(pk11_context_t)); @@ -299,7 +285,8 @@ pk11_get_session(pk11_context_t *ctx, pk11_optype_t optype, bool need_services, switch (optype) { case OP_ANY: for (token = ISC_LIST_HEAD(tokens); token != NULL; - token = ISC_LIST_NEXT(token, link)) { + token = ISC_LIST_NEXT(token, link)) + { if (token->slotid == slot) { break; } @@ -307,7 +294,8 @@ pk11_get_session(pk11_context_t *ctx, pk11_optype_t optype, bool need_services, break; default: for (token = ISC_LIST_HEAD(tokens); token != NULL; - token = ISC_LIST_NEXT(token, link)) { + token = ISC_LIST_NEXT(token, link)) + { if (token->slotid == slot) { break; } @@ -366,8 +354,7 @@ pk11_get_session(pk11_context_t *ctx, pk11_optype_t optype, bool need_services, } void -pk11_return_session(pk11_context_t *ctx) -{ +pk11_return_session(pk11_context_t *ctx) { pk11_session_t *sp = (pk11_session_t *)ctx->handle; if (sp == NULL) { @@ -390,14 +377,14 @@ pk11_return_session(pk11_context_t *ctx) } static isc_result_t -free_all_sessions(void) -{ +free_all_sessions(void) { pk11_token_t *token; - isc_result_t ret = ISC_R_SUCCESS; - isc_result_t oret; + isc_result_t ret = ISC_R_SUCCESS; + isc_result_t oret; for (token = ISC_LIST_HEAD(tokens); token != NULL; - token = ISC_LIST_NEXT(token, link)) { + token = ISC_LIST_NEXT(token, link)) + { oret = free_session_list(&token->sessions); if (oret != ISC_R_SUCCESS) { ret = oret; @@ -414,11 +401,10 @@ free_all_sessions(void) } static isc_result_t -free_session_list(pk11_sessionlist_t *slist) -{ +free_session_list(pk11_sessionlist_t *slist) { pk11_session_t *sp; - CK_RV rv; - isc_result_t ret; + CK_RV rv; + isc_result_t ret; ret = ISC_R_SUCCESS; LOCK(&sessionlock); @@ -441,9 +427,8 @@ free_session_list(pk11_sessionlist_t *slist) } static isc_result_t -setup_session(pk11_session_t *sp, pk11_token_t *token, bool rw) -{ - CK_RV rv; +setup_session(pk11_session_t *sp, pk11_token_t *token, bool rw) { + CK_RV rv; CK_FLAGS flags = CKF_SERIAL_SESSION; if (rw) { @@ -459,11 +444,10 @@ setup_session(pk11_session_t *sp, pk11_token_t *token, bool rw) } static isc_result_t -token_login(pk11_session_t *sp) -{ - CK_RV rv; +token_login(pk11_session_t *sp) { + CK_RV rv; pk11_token_t *token = sp->token; - isc_result_t ret = ISC_R_SUCCESS; + isc_result_t ret = ISC_R_SUCCESS; LOCK(&sessionlock); if (!token->logged) { @@ -499,17 +483,16 @@ token_login(pk11_session_t *sp) fprintf(stderr, #mech ": 0x%lx\n", rv) static void -scan_slots(void) -{ +scan_slots(void) { CK_MECHANISM_INFO mechInfo; - CK_TOKEN_INFO tokenInfo; - CK_RV rv; - CK_SLOT_ID slot; - CK_SLOT_ID_PTR slotList; - CK_ULONG slotCount; - pk11_token_t * token; - unsigned int i; - bool bad; + CK_TOKEN_INFO tokenInfo; + CK_RV rv; + CK_SLOT_ID slot; + CK_SLOT_ID_PTR slotList; + CK_ULONG slotCount; + pk11_token_t *token; + unsigned int i; + bool bad; slotCount = 0; PK11_FATALCHECK(pkcs_C_GetSlotList, (CK_FALSE, NULL_PTR, &slotCount)); @@ -551,34 +534,39 @@ scan_slots(void) } rv = pkcs_C_GetMechanismInfo(slot, CKM_MD5_RSA_PKCS, &mechInfo); if ((rv != CKR_OK) || ((mechInfo.flags & CKF_SIGN) == 0) || - ((mechInfo.flags & CKF_VERIFY) == 0)) { + ((mechInfo.flags & CKF_VERIFY) == 0)) + { bad = true; PK11_TRACEM(CKM_MD5_RSA_PKCS); } rv = pkcs_C_GetMechanismInfo(slot, CKM_SHA1_RSA_PKCS, &mechInfo); if ((rv != CKR_OK) || ((mechInfo.flags & CKF_SIGN) == 0) || - ((mechInfo.flags & CKF_VERIFY) == 0)) { + ((mechInfo.flags & CKF_VERIFY) == 0)) + { bad = true; PK11_TRACEM(CKM_SHA1_RSA_PKCS); } rv = pkcs_C_GetMechanismInfo(slot, CKM_SHA256_RSA_PKCS, &mechInfo); if ((rv != CKR_OK) || ((mechInfo.flags & CKF_SIGN) == 0) || - ((mechInfo.flags & CKF_VERIFY) == 0)) { + ((mechInfo.flags & CKF_VERIFY) == 0)) + { bad = true; PK11_TRACEM(CKM_SHA256_RSA_PKCS); } rv = pkcs_C_GetMechanismInfo(slot, CKM_SHA512_RSA_PKCS, &mechInfo); if ((rv != CKR_OK) || ((mechInfo.flags & CKF_SIGN) == 0) || - ((mechInfo.flags & CKF_VERIFY) == 0)) { + ((mechInfo.flags & CKF_VERIFY) == 0)) + { bad = true; PK11_TRACEM(CKM_SHA512_RSA_PKCS); } rv = pkcs_C_GetMechanismInfo(slot, CKM_RSA_PKCS, &mechInfo); if ((rv != CKR_OK) || ((mechInfo.flags & CKF_SIGN) == 0) || - ((mechInfo.flags & CKF_VERIFY) == 0)) { + ((mechInfo.flags & CKF_VERIFY) == 0)) + { bad = true; PK11_TRACEM(CKM_RSA_PKCS); } @@ -600,7 +588,8 @@ scan_slots(void) } rv = pkcs_C_GetMechanismInfo(slot, CKM_ECDSA, &mechInfo); if ((rv != CKR_OK) || ((mechInfo.flags & CKF_SIGN) == 0) || - ((mechInfo.flags & CKF_VERIFY) == 0)) { + ((mechInfo.flags & CKF_VERIFY) == 0)) + { bad = true; PK11_TRACEM(CKM_ECDSA); } @@ -624,7 +613,8 @@ scan_slots(void) } rv = pkcs_C_GetMechanismInfo(slot, CKM_EDDSA, &mechInfo); if ((rv != CKR_OK) || ((mechInfo.flags & CKF_SIGN) == 0) || - ((mechInfo.flags & CKF_VERIFY) == 0)) { + ((mechInfo.flags & CKF_VERIFY) == 0)) + { bad = true; PK11_TRACEM(CKM_EDDSA); } @@ -644,8 +634,7 @@ scan_slots(void) } CK_SLOT_ID -pk11_get_best_token(pk11_optype_t optype) -{ +pk11_get_best_token(pk11_optype_t optype) { pk11_token_t *token = NULL; switch (optype) { @@ -665,10 +654,9 @@ pk11_get_best_token(pk11_optype_t optype) } unsigned int -pk11_numbits(CK_BYTE_PTR data, unsigned int bytecnt) -{ +pk11_numbits(CK_BYTE_PTR data, unsigned int bytecnt) { unsigned int bitcnt, i; - CK_BYTE top; + CK_BYTE top; if (bytecnt == 0) { return (0); @@ -711,14 +699,12 @@ pk11_numbits(CK_BYTE_PTR data, unsigned int bytecnt) } CK_ATTRIBUTE * -pk11_attribute_first(const pk11_object_t *obj) -{ +pk11_attribute_first(const pk11_object_t *obj) { return (obj->repr); } CK_ATTRIBUTE * -pk11_attribute_next(const pk11_object_t *obj, CK_ATTRIBUTE *attr) -{ +pk11_attribute_next(const pk11_object_t *obj, CK_ATTRIBUTE *attr) { CK_ATTRIBUTE *next; next = attr + 1; @@ -729,12 +715,12 @@ pk11_attribute_next(const pk11_object_t *obj, CK_ATTRIBUTE *attr) } CK_ATTRIBUTE * -pk11_attribute_bytype(const pk11_object_t *obj, CK_ATTRIBUTE_TYPE type) -{ +pk11_attribute_bytype(const pk11_object_t *obj, CK_ATTRIBUTE_TYPE type) { CK_ATTRIBUTE *attr; for (attr = pk11_attribute_first(obj); attr != NULL; - attr = pk11_attribute_next(obj, attr)) { + attr = pk11_attribute_next(obj, attr)) + { if (attr->type == type) { return (attr); } @@ -743,9 +729,8 @@ pk11_attribute_bytype(const pk11_object_t *obj, CK_ATTRIBUTE_TYPE type) } static char * -percent_decode(char *x, size_t *len) -{ - char * p, *c; +percent_decode(char *x, size_t *len) { + char *p, *c; unsigned char v = 0; INSIST(len != NULL); @@ -830,8 +815,7 @@ percent_decode(char *x, size_t *len) } static bool -pk11strcmp(const char *x, size_t lenx, const char *y, size_t leny) -{ +pk11strcmp(const char *x, size_t lenx, const char *y, size_t leny) { char buf[32]; INSIST((leny == 32) || (leny == 16)); @@ -845,11 +829,10 @@ 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) -{ +push_attribute(pk11_object_t *obj, isc_mem_t *mctx, size_t len) { CK_ATTRIBUTE *old = obj->repr; CK_ATTRIBUTE *attr; - CK_BYTE cnt = obj->attrcnt; + CK_BYTE cnt = obj->attrcnt; REQUIRE(old != NULL || cnt == 0); @@ -878,16 +861,15 @@ push_attribute(pk11_object_t *obj, isc_mem_t *mctx, size_t len) isc_result_t pk11_parse_uri(pk11_object_t *obj, const char *label, isc_mem_t *mctx, - pk11_optype_t optype) -{ + pk11_optype_t optype) { CK_ATTRIBUTE *attr; pk11_token_t *token = NULL; - char * uri, *p, *a, *na, *v; - size_t len, l; - FILE * stream = NULL; - char pin[PINLEN + 1]; - bool gotpin = false; - isc_result_t ret; + char *uri, *p, *a, *na, *v; + size_t len, l; + FILE *stream = NULL; + char pin[PINLEN + 1]; + bool gotpin = false; + isc_result_t ret; /* get values to work on */ len = strlen(label) + 1; @@ -944,7 +926,8 @@ pk11_parse_uri(pk11_object_t *obj, const char *label, isc_mem_t *mctx, if (token == NULL) { for (token = ISC_LIST_HEAD(tokens); token != NULL; - token = ISC_LIST_NEXT(token, link)) { + token = ISC_LIST_NEXT(token, link)) + { if (pk11strcmp(v, l, token->name, 32)) { break; } @@ -955,9 +938,10 @@ pk11_parse_uri(pk11_object_t *obj, const char *label, isc_mem_t *mctx, if (token == NULL) { for (token = ISC_LIST_HEAD(tokens); token != NULL; - token = ISC_LIST_NEXT(token, link)) { - if (pk11strcmp(v, l, token->manuf, - 32)) { + token = ISC_LIST_NEXT(token, link)) + { + if (pk11strcmp(v, l, token->manuf, 32)) + { break; } } @@ -967,9 +951,10 @@ pk11_parse_uri(pk11_object_t *obj, const char *label, isc_mem_t *mctx, if (token == NULL) { for (token = ISC_LIST_HEAD(tokens); token != NULL; - token = ISC_LIST_NEXT(token, link)) { - if (pk11strcmp(v, l, token->serial, - 16)) { + token = ISC_LIST_NEXT(token, link)) + { + if (pk11strcmp(v, l, token->serial, 16)) + { break; } } @@ -979,9 +964,10 @@ pk11_parse_uri(pk11_object_t *obj, const char *label, isc_mem_t *mctx, if (token == NULL) { for (token = ISC_LIST_HEAD(tokens); token != NULL; - token = ISC_LIST_NEXT(token, link)) { - if (pk11strcmp(v, l, token->model, - 16)) { + token = ISC_LIST_NEXT(token, link)) + { + if (pk11strcmp(v, l, token->model, 16)) + { break; } } @@ -1036,7 +1022,8 @@ pk11_parse_uri(pk11_object_t *obj, const char *label, isc_mem_t *mctx, } if ((pk11_attribute_bytype(obj, CKA_LABEL) == NULL) && - (pk11_attribute_bytype(obj, CKA_ID) == NULL)) { + (pk11_attribute_bytype(obj, CKA_ID) == NULL)) + { DST_RET(ISC_R_NOTFOUND); } @@ -1070,16 +1057,14 @@ err: void pk11_error_fatalcheck(const char *file, int line, const char *funcname, - CK_RV rv) -{ + CK_RV rv) { isc_error_fatal(file, line, "%s: Error = 0x%.8lX\n", funcname, rv); } void -pk11_dump_tokens(void) -{ +pk11_dump_tokens(void) { pk11_token_t *token; - bool first; + bool first; printf("DEFAULTS\n"); printf("\tbest_rsa_token=%p\n", best_rsa_token); @@ -1088,7 +1073,8 @@ pk11_dump_tokens(void) printf("\tbest_eddsa_token=%p\n", best_eddsa_token); for (token = ISC_LIST_HEAD(tokens); token != NULL; - token = ISC_LIST_NEXT(token, link)) { + token = ISC_LIST_NEXT(token, link)) + { printf("\nTOKEN\n"); printf("\taddress=%p\n", token); printf("\tslotID=%lu\n", token->slotid); diff --git a/lib/isc/pk11_result.c b/lib/isc/pk11_result.c index 6b4b4b8f75..2fd0cecdac 100644 --- a/lib/isc/pk11_result.c +++ b/lib/isc/pk11_result.c @@ -35,8 +35,7 @@ static const char *ids[PK11_R_NRESULTS] = { static isc_once_t once = ISC_ONCE_INIT; static void -initialize_action(void) -{ +initialize_action(void) { isc_result_t result; result = isc_result_register(ISC_RESULTCLASS_PK11, PK11_R_NRESULTS, @@ -55,21 +54,18 @@ initialize_action(void) } static void -initialize(void) -{ +initialize(void) { RUNTIME_CHECK(isc_once_do(&once, initialize_action) == ISC_R_SUCCESS); } const char * -pk11_result_totext(isc_result_t result) -{ +pk11_result_totext(isc_result_t result) { initialize(); return (isc_result_totext(result)); } void -pk11_result_register(void) -{ +pk11_result_register(void) { initialize(); } diff --git a/lib/isc/pool.c b/lib/isc/pool.c index abd0a1471b..1c51df1e40 100644 --- a/lib/isc/pool.c +++ b/lib/isc/pool.c @@ -23,12 +23,12 @@ ***/ struct isc_pool { - isc_mem_t * mctx; - unsigned int count; + isc_mem_t *mctx; + unsigned int count; isc_pooldeallocator_t free; isc_poolinitializer_t init; - void * initarg; - void ** pool; + void *initarg; + void **pool; }; /*** @@ -36,8 +36,7 @@ struct isc_pool { ***/ static isc_result_t -alloc_pool(isc_mem_t *mctx, unsigned int count, isc_pool_t **poolp) -{ +alloc_pool(isc_mem_t *mctx, unsigned int count, isc_pool_t **poolp) { isc_pool_t *pool; pool = isc_mem_get(mctx, sizeof(*pool)); @@ -57,9 +56,8 @@ alloc_pool(isc_mem_t *mctx, unsigned int count, isc_pool_t **poolp) isc_result_t isc_pool_create(isc_mem_t *mctx, unsigned int count, isc_pooldeallocator_t release, isc_poolinitializer_t init, - void *initarg, isc_pool_t **poolp) -{ - isc_pool_t * pool = NULL; + void *initarg, isc_pool_t **poolp) { + isc_pool_t *pool = NULL; isc_result_t result; unsigned int i; @@ -89,23 +87,21 @@ isc_pool_create(isc_mem_t *mctx, unsigned int count, } void * -isc_pool_get(isc_pool_t *pool) -{ +isc_pool_get(isc_pool_t *pool) { return (pool->pool[isc_random_uniform(pool->count)]); } int -isc_pool_count(isc_pool_t *pool) -{ +isc_pool_count(isc_pool_t *pool) { REQUIRE(pool != NULL); return (pool->count); } isc_result_t -isc_pool_expand(isc_pool_t **sourcep, unsigned int count, isc_pool_t **targetp) -{ +isc_pool_expand(isc_pool_t **sourcep, unsigned int count, + isc_pool_t **targetp) { isc_result_t result; - isc_pool_t * pool; + isc_pool_t *pool; REQUIRE(sourcep != NULL && *sourcep != NULL); REQUIRE(targetp != NULL && *targetp == NULL); @@ -113,7 +109,7 @@ isc_pool_expand(isc_pool_t **sourcep, unsigned int count, isc_pool_t **targetp) pool = *sourcep; *sourcep = NULL; if (count > pool->count) { - isc_pool_t * newpool = NULL; + isc_pool_t *newpool = NULL; unsigned int i; /* Allocate a new pool structure */ @@ -151,10 +147,9 @@ isc_pool_expand(isc_pool_t **sourcep, unsigned int count, isc_pool_t **targetp) } void -isc_pool_destroy(isc_pool_t **poolp) -{ +isc_pool_destroy(isc_pool_t **poolp) { unsigned int i; - isc_pool_t * pool = *poolp; + isc_pool_t *pool = *poolp; *poolp = NULL; for (i = 0; i < pool->count; i++) { if (pool->free != NULL && pool->pool[i] != NULL) { diff --git a/lib/isc/portset.c b/lib/isc/portset.c index fecbfa7484..4cb664f092 100644 --- a/lib/isc/portset.c +++ b/lib/isc/portset.c @@ -29,18 +29,16 @@ */ struct isc_portset { unsigned int nports; /*%< number of ports in the set */ - uint32_t buf[ISC_PORTSET_BUFSIZE]; + uint32_t buf[ISC_PORTSET_BUFSIZE]; }; static inline bool -portset_isset(isc_portset_t *portset, in_port_t port) -{ +portset_isset(isc_portset_t *portset, in_port_t port) { return ((portset->buf[port >> 5] & ((uint32_t)1 << (port & 31))) != 0); } static inline void -portset_add(isc_portset_t *portset, in_port_t port) -{ +portset_add(isc_portset_t *portset, in_port_t port) { if (!portset_isset(portset, port)) { portset->nports++; portset->buf[port >> 5] |= ((uint32_t)1 << (port & 31)); @@ -48,8 +46,7 @@ portset_add(isc_portset_t *portset, in_port_t port) } static inline void -portset_remove(isc_portset_t *portset, in_port_t port) -{ +portset_remove(isc_portset_t *portset, in_port_t port) { if (portset_isset(portset, port)) { portset->nports--; portset->buf[port >> 5] &= ~((uint32_t)1 << (port & 31)); @@ -57,8 +54,7 @@ portset_remove(isc_portset_t *portset, in_port_t port) } isc_result_t -isc_portset_create(isc_mem_t *mctx, isc_portset_t **portsetp) -{ +isc_portset_create(isc_mem_t *mctx, isc_portset_t **portsetp) { isc_portset_t *portset; REQUIRE(portsetp != NULL && *portsetp == NULL); @@ -73,8 +69,7 @@ isc_portset_create(isc_mem_t *mctx, isc_portset_t **portsetp) } void -isc_portset_destroy(isc_mem_t *mctx, isc_portset_t **portsetp) -{ +isc_portset_destroy(isc_mem_t *mctx, isc_portset_t **portsetp) { isc_portset_t *portset; REQUIRE(portsetp != NULL); @@ -84,39 +79,34 @@ isc_portset_destroy(isc_mem_t *mctx, isc_portset_t **portsetp) } bool -isc_portset_isset(isc_portset_t *portset, in_port_t port) -{ +isc_portset_isset(isc_portset_t *portset, in_port_t port) { REQUIRE(portset != NULL); return (portset_isset(portset, port)); } unsigned int -isc_portset_nports(isc_portset_t *portset) -{ +isc_portset_nports(isc_portset_t *portset) { REQUIRE(portset != NULL); return (portset->nports); } void -isc_portset_add(isc_portset_t *portset, in_port_t port) -{ +isc_portset_add(isc_portset_t *portset, in_port_t port) { REQUIRE(portset != NULL); portset_add(portset, port); } void -isc_portset_remove(isc_portset_t *portset, in_port_t port) -{ +isc_portset_remove(isc_portset_t *portset, in_port_t port) { portset_remove(portset, port); } void isc_portset_addrange(isc_portset_t *portset, in_port_t port_lo, - in_port_t port_hi) -{ + in_port_t port_hi) { in_port_t p; REQUIRE(portset != NULL); @@ -130,8 +120,7 @@ isc_portset_addrange(isc_portset_t *portset, in_port_t port_lo, void isc_portset_removerange(isc_portset_t *portset, in_port_t port_lo, - in_port_t port_hi) -{ + in_port_t port_hi) { in_port_t p; REQUIRE(portset != NULL); diff --git a/lib/isc/pthreads/condition.c b/lib/isc/pthreads/condition.c index d86e0f4c01..08c42e65ab 100644 --- a/lib/isc/pthreads/condition.c +++ b/lib/isc/pthreads/condition.c @@ -20,12 +20,11 @@ #include isc_result_t -isc_condition_waituntil(isc_condition_t *c, isc_mutex_t *m, isc_time_t *t) -{ - int presult; - isc_result_t result; +isc_condition_waituntil(isc_condition_t *c, isc_mutex_t *m, isc_time_t *t) { + int presult; + isc_result_t result; struct timespec ts; - char strbuf[ISC_STRERRORSIZE]; + char strbuf[ISC_STRERRORSIZE]; REQUIRE(c != NULL && m != NULL && t != NULL); diff --git a/lib/isc/pthreads/mutex.c b/lib/isc/pthreads/mutex.c index 5545d55575..cae12d22c1 100644 --- a/lib/isc/pthreads/mutex.c +++ b/lib/isc/pthreads/mutex.c @@ -54,35 +54,34 @@ #define ISC_MUTEX_MAX_LOCKERS 32 typedef struct { - const char * file; - int line; - unsigned count; + const char *file; + int line; + unsigned count; struct timeval locked_total; struct timeval wait_total; } isc_mutexlocker_t; struct isc_mutexstats { - const char * file; /*%< File mutex was created in. */ - int line; /*%< Line mutex was created on. */ - unsigned count; - struct timeval lock_t; - struct timeval locked_total; - struct timeval wait_total; + const char *file; /*%< File mutex was created in. */ + int line; /*%< Line mutex was created on. */ + unsigned count; + struct timeval lock_t; + struct timeval locked_total; + struct timeval wait_total; isc_mutexlocker_t *cur_locker; - isc_mutexlocker_t lockers[ISC_MUTEX_MAX_LOCKERS]; + isc_mutexlocker_t lockers[ISC_MUTEX_MAX_LOCKERS]; }; #ifndef ISC_MUTEX_PROFTABLESIZE #define ISC_MUTEX_PROFTABLESIZE (1024 * 1024) #endif /* ifndef ISC_MUTEX_PROFTABLESIZE */ static isc_mutexstats_t stats[ISC_MUTEX_PROFTABLESIZE]; -static int stats_next = 0; -static bool stats_init = false; -static pthread_mutex_t statslock = PTHREAD_MUTEX_INITIALIZER; +static int stats_next = 0; +static bool stats_init = false; +static pthread_mutex_t statslock = PTHREAD_MUTEX_INITIALIZER; void -isc_mutex_init_profile(isc_mutex_t *mp, const char *file, int line) -{ +isc_mutex_init_profile(isc_mutex_t *mp, const char *file, int line) { int i, err; err = pthread_mutex_init(&mp->mutex, NULL); @@ -126,12 +125,11 @@ isc_mutex_init_profile(isc_mutex_t *mp, const char *file, int line) } isc_result_t -isc_mutex_lock_profile(isc_mutex_t *mp, const char *file, int line) -{ - struct timeval prelock_t; - struct timeval postlock_t; +isc_mutex_lock_profile(isc_mutex_t *mp, const char *file, int line) { + struct timeval prelock_t; + struct timeval postlock_t; isc_mutexlocker_t *locker = NULL; - int i; + int i; gettimeofday(&prelock_t, NULL); @@ -154,7 +152,8 @@ isc_mutex_lock_profile(isc_mutex_t *mp, const char *file, int line) locker->line = line; break; } else if (mp->stats->lockers[i].file == file && - mp->stats->lockers[i].line == line) { + mp->stats->lockers[i].line == line) + { locker = &mp->stats->lockers[i]; break; } @@ -171,8 +170,7 @@ isc_mutex_lock_profile(isc_mutex_t *mp, const char *file, int line) } isc_result_t -isc_mutex_unlock_profile(isc_mutex_t *mp, const char *file, int line) -{ +isc_mutex_unlock_profile(isc_mutex_t *mp, const char *file, int line) { struct timeval unlock_t; UNUSED(file); @@ -191,10 +189,9 @@ isc_mutex_unlock_profile(isc_mutex_t *mp, const char *file, int line) } void -isc_mutex_statsprofile(FILE *fp) -{ +isc_mutex_statsprofile(FILE *fp) { isc_mutexlocker_t *locker; - int i, j; + int i, j; fprintf(fp, "Mutex stats (in us)\n"); for (i = 0; i < stats_next; i++) { @@ -224,13 +221,12 @@ isc_mutex_statsprofile(FILE *fp) #if ISC_MUTEX_DEBUG && defined(PTHREAD_MUTEX_ERRORCHECK) -static bool errcheck_initialized = false; +static bool errcheck_initialized = false; static pthread_mutexattr_t errcheck; -static isc_once_t once_errcheck = ISC_ONCE_INIT; +static isc_once_t once_errcheck = ISC_ONCE_INIT; static void -initialize_errcheck(void) -{ +initialize_errcheck(void) { RUNTIME_CHECK(pthread_mutexattr_init(&errcheck) == 0); RUNTIME_CHECK(pthread_mutexattr_settype(&errcheck, PTHREAD_MUTEX_ERRORCHECK) == 0); @@ -238,10 +234,9 @@ initialize_errcheck(void) } void -isc_mutex_init_errcheck(isc_mutex_t *mp) -{ +isc_mutex_init_errcheck(isc_mutex_t *mp) { isc_result_t result; - int err; + int err; result = isc_once_do(&once_errcheck, initialize_errcheck); RUNTIME_CHECK(result == ISC_R_SUCCESS); @@ -267,15 +262,14 @@ pthread_mutexattr_t isc__mutex_attrs = { !ISC_MUTEX_PROFILE #ifdef HAVE_PTHREAD_MUTEX_ADAPTIVE_NP -static bool attr_initialized = false; +static bool attr_initialized = false; static pthread_mutexattr_t attr; -static isc_once_t once_attr = ISC_ONCE_INIT; +static isc_once_t once_attr = ISC_ONCE_INIT; #endif /* HAVE_PTHREAD_MUTEX_ADAPTIVE_NP */ #ifdef HAVE_PTHREAD_MUTEX_ADAPTIVE_NP static void -initialize_attr(void) -{ +initialize_attr(void) { RUNTIME_CHECK(pthread_mutexattr_init(&attr) == 0); RUNTIME_CHECK(pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_ADAPTIVE_NP) == 0); @@ -284,8 +278,7 @@ initialize_attr(void) #endif /* HAVE_PTHREAD_MUTEX_ADAPTIVE_NP */ void -isc__mutex_init(isc_mutex_t *mp, const char *file, unsigned int line) -{ +isc__mutex_init(isc_mutex_t *mp, const char *file, unsigned int line) { int err; #ifdef HAVE_PTHREAD_MUTEX_ADAPTIVE_NP diff --git a/lib/isc/pthreads/thread.c b/lib/isc/pthreads/thread.c index d7e6e23ac2..80e2b8a991 100644 --- a/lib/isc/pthreads/thread.c +++ b/lib/isc/pthreads/thread.c @@ -43,8 +43,7 @@ void isc_thread_create(isc_threadfunc_t func, isc_threadarg_t arg, - isc_thread_t *thread) -{ + isc_thread_t *thread) { pthread_attr_t attr; #if defined(HAVE_PTHREAD_ATTR_GETSTACKSIZE) && \ defined(HAVE_PTHREAD_ATTR_SETSTACKSIZE) @@ -82,8 +81,7 @@ isc_thread_create(isc_threadfunc_t func, isc_threadarg_t arg, } void -isc_thread_join(isc_thread_t thread, isc_threadresult_t *result) -{ +isc_thread_join(isc_thread_t thread, isc_threadresult_t *result) { int ret = pthread_join(thread, result); if (ret != 0) { _FATAL(ret, "pthread_join()"); @@ -95,14 +93,12 @@ isc_thread_join(isc_thread_t thread, isc_threadresult_t *result) #endif /* ifdef __NetBSD__ */ void -isc_thread_setconcurrency(unsigned int level) -{ +isc_thread_setconcurrency(unsigned int level) { (void)pthread_setconcurrency(level); } void -isc_thread_setname(isc_thread_t thread, const char *name) -{ +isc_thread_setname(isc_thread_t thread, const char *name) { #if defined(HAVE_PTHREAD_SETNAME_NP) && !defined(__APPLE__) /* * macOS has pthread_setname_np but only works on the @@ -122,8 +118,7 @@ isc_thread_setname(isc_thread_t thread, const char *name) } void -isc_thread_yield(void) -{ +isc_thread_yield(void) { #if defined(HAVE_SCHED_YIELD) sched_yield(); #elif defined(HAVE_PTHREAD_YIELD) @@ -134,14 +129,14 @@ isc_thread_yield(void) } isc_result_t -isc_thread_setaffinity(int cpu) -{ +isc_thread_setaffinity(int cpu) { #if defined(HAVE_CPUSET_SETAFFINITY) cpuset_t cpuset; CPU_ZERO(&cpuset); CPU_SET(cpu, &cpuset); if (cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, - sizeof(cpuset), &cpuset) != 0) { + sizeof(cpuset), &cpuset) != 0) + { return (ISC_R_FAILURE); } #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) diff --git a/lib/isc/queue.c b/lib/isc/queue.c index 4f4b84b694..deab5a08bd 100644 --- a/lib/isc/queue.c +++ b/lib/isc/queue.c @@ -28,10 +28,10 @@ static uintptr_t nulluintptr = (uintptr_t)NULL; typedef struct node { atomic_uint_fast32_t deqidx; - atomic_uintptr_t items[BUFFER_SIZE]; + atomic_uintptr_t items[BUFFER_SIZE]; atomic_uint_fast32_t enqidx; - atomic_uintptr_t next; - isc_mem_t * mctx; + atomic_uintptr_t next; + isc_mem_t *mctx; } node_t; /* we just need one Hazard Pointer */ @@ -42,15 +42,14 @@ struct isc_queue { alignas(ALIGNMENT) atomic_uintptr_t head; alignas(ALIGNMENT) atomic_uintptr_t tail; isc_mem_t *mctx; - int max_threads; - int taken; - isc_hp_t * hp; - void * alloced_ptr; + int max_threads; + int taken; + isc_hp_t *hp; + void *alloced_ptr; }; static node_t * -node_new(isc_mem_t *mctx, uintptr_t item) -{ +node_new(isc_mem_t *mctx, uintptr_t item) { node_t *node = isc_mem_get(mctx, sizeof(*node)); *node = (node_t){ .mctx = NULL }; @@ -69,41 +68,36 @@ node_new(isc_mem_t *mctx, uintptr_t item) } static void -node_destroy(void *node0) -{ +node_destroy(void *node0) { node_t *node = (node_t *)node0; isc_mem_putanddetach(&node->mctx, node, sizeof(*node)); } static bool -node_cas_next(node_t *node, node_t *cmp, const node_t *val) -{ +node_cas_next(node_t *node, node_t *cmp, const node_t *val) { return (atomic_compare_exchange_strong(&node->next, (uintptr_t *)&cmp, (uintptr_t)val)); } static bool -queue_cas_tail(isc_queue_t *queue, node_t *cmp, const node_t *val) -{ +queue_cas_tail(isc_queue_t *queue, node_t *cmp, const node_t *val) { return (atomic_compare_exchange_strong(&queue->tail, (uintptr_t *)&cmp, (uintptr_t)val)); } static bool -queue_cas_head(isc_queue_t *queue, node_t *cmp, const node_t *val) -{ +queue_cas_head(isc_queue_t *queue, node_t *cmp, const node_t *val) { return (atomic_compare_exchange_strong(&queue->head, (uintptr_t *)&cmp, (uintptr_t)val)); } isc_queue_t * -isc_queue_new(isc_mem_t *mctx, int max_threads) -{ +isc_queue_new(isc_mem_t *mctx, int max_threads) { isc_queue_t *queue = NULL; - node_t * sentinel = NULL; - void * qbuf = NULL; - uintptr_t qptr; + node_t *sentinel = NULL; + void *qbuf = NULL; + uintptr_t qptr; /* * A trick to allocate an aligned isc_queue_t structure @@ -135,14 +129,13 @@ isc_queue_new(isc_mem_t *mctx, int max_threads) } void -isc_queue_enqueue(isc_queue_t *queue, uintptr_t item) -{ +isc_queue_enqueue(isc_queue_t *queue, uintptr_t item) { REQUIRE(item != nulluintptr); while (true) { - node_t * lt = NULL; + node_t *lt = NULL; uint_fast32_t idx; - uintptr_t n = nulluintptr; + uintptr_t n = nulluintptr; lt = (node_t *)isc_hp_protect(queue->hp, 0, &queue->tail); idx = atomic_fetch_add(<->enqidx, 1); @@ -177,18 +170,18 @@ isc_queue_enqueue(isc_queue_t *queue, uintptr_t item) } uintptr_t -isc_queue_dequeue(isc_queue_t *queue) -{ +isc_queue_dequeue(isc_queue_t *queue) { REQUIRE(queue != NULL); while (true) { - node_t * lh = NULL; + node_t *lh = NULL; uint_fast32_t idx; - uintptr_t item; + uintptr_t item; lh = (node_t *)isc_hp_protect(queue->hp, 0, &queue->head); if (atomic_load(&lh->deqidx) >= atomic_load(&lh->enqidx) && - atomic_load(&lh->next) == nulluintptr) { + atomic_load(&lh->next) == nulluintptr) + { break; } @@ -220,10 +213,9 @@ isc_queue_dequeue(isc_queue_t *queue) } void -isc_queue_destroy(isc_queue_t *queue) -{ +isc_queue_destroy(isc_queue_t *queue) { node_t *last = NULL; - void * alloced = NULL; + void *alloced = NULL; REQUIRE(queue != NULL); diff --git a/lib/isc/quota.c b/lib/isc/quota.c index 7af9e3236d..9036dd3f73 100644 --- a/lib/isc/quota.c +++ b/lib/isc/quota.c @@ -18,16 +18,14 @@ #include void -isc_quota_init(isc_quota_t *quota, unsigned int max) -{ +isc_quota_init(isc_quota_t *quota, unsigned int max) { atomic_init("a->max, max); atomic_init("a->used, 0); atomic_init("a->soft, 0); } void -isc_quota_destroy(isc_quota_t *quota) -{ +isc_quota_destroy(isc_quota_t *quota) { INSIST(atomic_load("a->used) == 0); atomic_store_release("a->max, 0); atomic_store_release("a->used, 0); @@ -35,42 +33,36 @@ isc_quota_destroy(isc_quota_t *quota) } void -isc_quota_soft(isc_quota_t *quota, unsigned int soft) -{ +isc_quota_soft(isc_quota_t *quota, unsigned int soft) { atomic_store_release("a->soft, soft); } void -isc_quota_max(isc_quota_t *quota, unsigned int max) -{ +isc_quota_max(isc_quota_t *quota, unsigned int max) { atomic_store_release("a->max, max); } unsigned int -isc_quota_getmax(isc_quota_t *quota) -{ +isc_quota_getmax(isc_quota_t *quota) { return (atomic_load_relaxed("a->max)); } unsigned int -isc_quota_getsoft(isc_quota_t *quota) -{ +isc_quota_getsoft(isc_quota_t *quota) { return (atomic_load_relaxed("a->soft)); } unsigned int -isc_quota_getused(isc_quota_t *quota) -{ +isc_quota_getused(isc_quota_t *quota) { return (atomic_load_relaxed("a->used)); } isc_result_t -isc_quota_reserve(isc_quota_t *quota) -{ +isc_quota_reserve(isc_quota_t *quota) { isc_result_t result; - uint32_t max = atomic_load_acquire("a->max); - uint32_t soft = atomic_load_acquire("a->soft); - uint32_t used = atomic_fetch_add_relaxed("a->used, 1); + uint32_t max = atomic_load_acquire("a->max); + uint32_t soft = atomic_load_acquire("a->soft); + uint32_t used = atomic_fetch_add_relaxed("a->used, 1); if (max == 0 || used < max) { if (soft == 0 || used < soft) { result = ISC_R_SUCCESS; @@ -85,14 +77,12 @@ isc_quota_reserve(isc_quota_t *quota) } void -isc_quota_release(isc_quota_t *quota) -{ +isc_quota_release(isc_quota_t *quota) { INSIST(atomic_fetch_sub_release("a->used, 1) > 0); } static isc_result_t -doattach(isc_quota_t *quota, isc_quota_t **p, bool force) -{ +doattach(isc_quota_t *quota, isc_quota_t **p, bool force) { isc_result_t result; REQUIRE(p != NULL && *p == NULL); @@ -110,20 +100,17 @@ doattach(isc_quota_t *quota, isc_quota_t **p, bool force) } isc_result_t -isc_quota_attach(isc_quota_t *quota, isc_quota_t **p) -{ +isc_quota_attach(isc_quota_t *quota, isc_quota_t **p) { return (doattach(quota, p, false)); } isc_result_t -isc_quota_force(isc_quota_t *quota, isc_quota_t **p) -{ +isc_quota_force(isc_quota_t *quota, isc_quota_t **p) { return (doattach(quota, p, true)); } void -isc_quota_detach(isc_quota_t **p) -{ +isc_quota_detach(isc_quota_t **p) { INSIST(p != NULL && *p != NULL); isc_quota_release(*p); *p = NULL; diff --git a/lib/isc/radix.c b/lib/isc/radix.c index 216309707c..f11c20fd3c 100644 --- a/lib/isc/radix.c +++ b/lib/isc/radix.c @@ -24,26 +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, - int bitlen) -{ + int bitlen) { isc_prefix_t *prefix; REQUIRE(target != NULL); @@ -74,8 +69,7 @@ _new_prefix(isc_mem_t *mctx, isc_prefix_t **target, int family, void *dest, } static void -_deref_prefix(isc_prefix_t *prefix) -{ +_deref_prefix(isc_prefix_t *prefix) { if (prefix != NULL) { if (isc_refcount_decrement(&prefix->refcount) == 1) { isc_refcount_destroy(&prefix->refcount); @@ -86,8 +80,7 @@ _deref_prefix(isc_prefix_t *prefix) } static isc_result_t -_ref_prefix(isc_mem_t *mctx, isc_prefix_t **target, isc_prefix_t *prefix) -{ +_ref_prefix(isc_mem_t *mctx, isc_prefix_t **target, isc_prefix_t *prefix) { INSIST(prefix != NULL); INSIST((prefix->family == AF_INET && prefix->bitlen <= 32) || (prefix->family == AF_INET6 && prefix->bitlen <= 128) || @@ -113,8 +106,7 @@ _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) -{ +_comp_with_mask(void *addr, void *dest, u_int mask) { /* Mask length of zero matches everything */ if (mask == 0) { return (1); @@ -133,8 +125,7 @@ _comp_with_mask(void *addr, void *dest, u_int mask) } isc_result_t -isc_radix_create(isc_mem_t *mctx, isc_radix_tree_t **target, int maxbits) -{ +isc_radix_create(isc_mem_t *mctx, isc_radix_tree_t **target, int maxbits) { isc_radix_tree_t *radix; REQUIRE(target != NULL && *target == NULL); @@ -159,14 +150,13 @@ isc_radix_create(isc_mem_t *mctx, isc_radix_tree_t **target, int maxbits) */ static void -_clear_radix(isc_radix_tree_t *radix, isc_radix_destroyfunc_t func) -{ +_clear_radix(isc_radix_tree_t *radix, isc_radix_destroyfunc_t func) { REQUIRE(radix != NULL); if (radix->head != NULL) { - isc_radix_node_t * Xstack[RADIX_MAXBITS + 1]; + isc_radix_node_t *Xstack[RADIX_MAXBITS + 1]; isc_radix_node_t **Xsp = Xstack; - isc_radix_node_t * Xrn = radix->head; + isc_radix_node_t *Xrn = radix->head; while (Xrn != NULL) { isc_radix_node_t *l = Xrn->l; @@ -203,8 +193,7 @@ _clear_radix(isc_radix_tree_t *radix, isc_radix_destroyfunc_t func) } void -isc_radix_destroy(isc_radix_tree_t *radix, isc_radix_destroyfunc_t func) -{ +isc_radix_destroy(isc_radix_tree_t *radix, isc_radix_destroyfunc_t func) { REQUIRE(radix != NULL); _clear_radix(radix, func); isc_mem_putanddetach(&radix->mctx, radix, sizeof(*radix)); @@ -214,8 +203,7 @@ isc_radix_destroy(isc_radix_tree_t *radix, isc_radix_destroyfunc_t func) * func will be called as func(node->prefix, node->data) */ void -isc_radix_process(isc_radix_tree_t *radix, isc_radix_processfunc_t func) -{ +isc_radix_process(isc_radix_tree_t *radix, isc_radix_processfunc_t func) { isc_radix_node_t *node; REQUIRE(func != NULL); @@ -226,13 +214,12 @@ isc_radix_process(isc_radix_tree_t *radix, isc_radix_processfunc_t func) isc_result_t isc_radix_search(isc_radix_tree_t *radix, isc_radix_node_t **target, - isc_prefix_t *prefix) -{ + isc_prefix_t *prefix) { isc_radix_node_t *node; isc_radix_node_t *stack[RADIX_MAXBITS + 1]; - u_char * addr; - uint32_t bitlen; - int tfam = -1, cnt = 0; + u_char *addr; + uint32_t bitlen; + int tfam = -1, cnt = 0; REQUIRE(radix != NULL); REQUIRE(prefix != NULL); @@ -254,8 +241,8 @@ isc_radix_search(isc_radix_tree_t *radix, isc_radix_node_t **target, stack[cnt++] = node; } - if (BIT_TEST(addr[node->bit >> 3], - 0x80 >> (node->bit & 0x07))) { + if (BIT_TEST(addr[node->bit >> 3], 0x80 >> (node->bit & 0x07))) + { node = node->r; } else { node = node->l; @@ -279,11 +266,13 @@ isc_radix_search(isc_radix_tree_t *radix, isc_radix_node_t **target, if (_comp_with_mask(isc_prefix_tochar(node->prefix), isc_prefix_tochar(prefix), - node->prefix->bitlen)) { + node->prefix->bitlen)) + { int fam = ISC_RADIX_FAMILY(prefix); if (node->node_num[fam] != -1 && ((*target == NULL) || - (*target)->node_num[tfam] > node->node_num[fam])) { + (*target)->node_num[tfam] > node->node_num[fam])) + { *target = node; tfam = fam; } @@ -299,13 +288,12 @@ isc_radix_search(isc_radix_tree_t *radix, isc_radix_node_t **target, isc_result_t isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, - isc_radix_node_t *source, isc_prefix_t *prefix) -{ + isc_radix_node_t *source, isc_prefix_t *prefix) { isc_radix_node_t *node, *new_node, *parent, *glue = NULL; - u_char * addr, *test_addr; - uint32_t bitlen, fam, check_bit, differ_bit; - uint32_t i, j, r; - isc_result_t result; + u_char *addr, *test_addr; + uint32_t bitlen, fam, check_bit, differ_bit; + uint32_t i, j, r; + isc_result_t result; REQUIRE(radix != NULL); REQUIRE(target != NULL && *target == NULL); @@ -377,8 +365,8 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, while (node->bit < bitlen || node->prefix == NULL) { if (node->bit < radix->maxbits && - BIT_TEST(addr[node->bit >> 3], - 0x80 >> (node->bit & 0x07))) { + BIT_TEST(addr[node->bit >> 3], 0x80 >> (node->bit & 0x07))) + { if (node->r == NULL) { break; } @@ -463,8 +451,8 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, *target = node; return (ISC_R_SUCCESS); } else { - result = - _ref_prefix(radix->mctx, &node->prefix, prefix); + result = _ref_prefix(radix->mctx, &node->prefix, + prefix); if (result != ISC_R_SUCCESS) { return (result); } @@ -526,8 +514,8 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, for (i = 0; i < RADIX_FAMILIES; i++) { int cur = radix->num_added_node; if (source->node_num[i] != -1) { - new_node->node_num[i] = - source->node_num[i] + cur; + new_node->node_num[i] = source->node_num[i] + + cur; new_node->data[i] = source->data[i]; } } @@ -548,8 +536,8 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, INSIST(glue == NULL); new_node->parent = node; if (node->bit < radix->maxbits && - BIT_TEST(addr[node->bit >> 3], - 0x80 >> (node->bit & 0x07))) { + BIT_TEST(addr[node->bit >> 3], 0x80 >> (node->bit & 0x07))) + { INSIST(node->r == NULL); node->r = new_node; } else { @@ -563,7 +551,8 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, if (bitlen == differ_bit) { INSIST(glue == NULL); if (bitlen < radix->maxbits && - BIT_TEST(test_addr[bitlen >> 3], 0x80 >> (bitlen & 0x07))) { + BIT_TEST(test_addr[bitlen >> 3], 0x80 >> (bitlen & 0x07))) + { new_node->r = node; } else { new_node->l = node; @@ -589,8 +578,8 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, } radix->num_active_node++; if (differ_bit < radix->maxbits && - BIT_TEST(addr[differ_bit >> 3], - 0x80 >> (differ_bit & 07))) { + BIT_TEST(addr[differ_bit >> 3], 0x80 >> (differ_bit & 07))) + { glue->r = new_node; glue->l = node; } else { @@ -615,8 +604,7 @@ isc_radix_insert(isc_radix_tree_t *radix, isc_radix_node_t **target, } void -isc_radix_remove(isc_radix_tree_t *radix, isc_radix_node_t *node) -{ +isc_radix_remove(isc_radix_tree_t *radix, isc_radix_node_t *node) { isc_radix_node_t *parent, *child; REQUIRE(radix != NULL); diff --git a/lib/isc/random.c b/lib/isc/random.c index c8d87832c0..02b92260db 100644 --- a/lib/isc/random.c +++ b/lib/isc/random.c @@ -63,8 +63,7 @@ ISC_THREAD_LOCAL isc_once_t isc_random_once = ISC_ONCE_INIT; static void -isc_random_initialize(void) -{ +isc_random_initialize(void) { int useed[4] = { 0, 0, 0, 1 }; #if FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION /* @@ -79,33 +78,29 @@ isc_random_initialize(void) } uint8_t -isc_random8(void) -{ +isc_random8(void) { RUNTIME_CHECK(isc_once_do(&isc_random_once, isc_random_initialize) == ISC_R_SUCCESS); return (next() & 0xff); } uint16_t -isc_random16(void) -{ +isc_random16(void) { RUNTIME_CHECK(isc_once_do(&isc_random_once, isc_random_initialize) == ISC_R_SUCCESS); return (next() & 0xffff); } uint32_t -isc_random32(void) -{ +isc_random32(void) { RUNTIME_CHECK(isc_once_do(&isc_random_once, isc_random_initialize) == ISC_R_SUCCESS); return (next()); } void -isc_random_buf(void *buf, size_t buflen) -{ - int i; +isc_random_buf(void *buf, size_t buflen) { + int i; uint32_t r; REQUIRE(buf != NULL); @@ -124,8 +119,7 @@ isc_random_buf(void *buf, size_t buflen) } uint32_t -isc_random_uniform(uint32_t upper_bound) -{ +isc_random_uniform(uint32_t upper_bound) { /* Copy of arc4random_uniform from OpenBSD */ uint32_t r, min; diff --git a/lib/isc/ratelimiter.c b/lib/isc/ratelimiter.c index 4b91baf8a4..64338fd2e6 100644 --- a/lib/isc/ratelimiter.c +++ b/lib/isc/ratelimiter.c @@ -30,32 +30,29 @@ typedef enum { } isc_ratelimiter_state_t; struct isc_ratelimiter { - isc_mem_t * mctx; - isc_mutex_t lock; - isc_refcount_t references; - isc_task_t * task; - isc_timer_t * timer; - isc_interval_t interval; - uint32_t pertic; - bool pushpop; + isc_mem_t *mctx; + isc_mutex_t lock; + isc_refcount_t references; + isc_task_t *task; + isc_timer_t *timer; + isc_interval_t interval; + uint32_t pertic; + bool pushpop; isc_ratelimiter_state_t state; - isc_event_t shutdownevent; + isc_event_t shutdownevent; ISC_LIST(isc_event_t) pending; }; #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, - isc_task_t *task, isc_ratelimiter_t **ratelimiterp) -{ - isc_result_t result; + isc_task_t *task, isc_ratelimiter_t **ratelimiterp) { + isc_result_t result; isc_ratelimiter_t *rl; INSIST(ratelimiterp != NULL && *ratelimiterp == NULL); @@ -99,8 +96,7 @@ free_mutex: } isc_result_t -isc_ratelimiter_setinterval(isc_ratelimiter_t *rl, isc_interval_t *interval) -{ +isc_ratelimiter_setinterval(isc_ratelimiter_t *rl, isc_interval_t *interval) { isc_result_t result = ISC_R_SUCCESS; REQUIRE(rl != NULL); @@ -120,8 +116,7 @@ isc_ratelimiter_setinterval(isc_ratelimiter_t *rl, isc_interval_t *interval) } void -isc_ratelimiter_setpertic(isc_ratelimiter_t *rl, uint32_t pertic) -{ +isc_ratelimiter_setpertic(isc_ratelimiter_t *rl, uint32_t pertic) { REQUIRE(rl != NULL); if (pertic == 0) { @@ -131,8 +126,7 @@ isc_ratelimiter_setpertic(isc_ratelimiter_t *rl, uint32_t pertic) } void -isc_ratelimiter_setpushpop(isc_ratelimiter_t *rl, bool pushpop) -{ +isc_ratelimiter_setpushpop(isc_ratelimiter_t *rl, bool pushpop) { REQUIRE(rl != NULL); rl->pushpop = pushpop; @@ -140,8 +134,7 @@ isc_ratelimiter_setpushpop(isc_ratelimiter_t *rl, bool pushpop) isc_result_t isc_ratelimiter_enqueue(isc_ratelimiter_t *rl, isc_task_t *task, - isc_event_t **eventp) -{ + isc_event_t **eventp) { isc_result_t result = ISC_R_SUCCESS; isc_event_t *ev; @@ -153,7 +146,8 @@ isc_ratelimiter_enqueue(isc_ratelimiter_t *rl, isc_task_t *task, LOCK(&rl->lock); if (rl->state == isc_ratelimiter_ratelimited || - rl->state == isc_ratelimiter_stalled) { + rl->state == isc_ratelimiter_stalled) + { ev->ev_sender = task; *eventp = NULL; if (rl->pushpop) { @@ -180,8 +174,7 @@ isc_ratelimiter_enqueue(isc_ratelimiter_t *rl, isc_task_t *task, } isc_result_t -isc_ratelimiter_dequeue(isc_ratelimiter_t *rl, isc_event_t *event) -{ +isc_ratelimiter_dequeue(isc_ratelimiter_t *rl, isc_event_t *event) { isc_result_t result = ISC_R_SUCCESS; REQUIRE(rl != NULL); @@ -199,11 +192,10 @@ isc_ratelimiter_dequeue(isc_ratelimiter_t *rl, isc_event_t *event) } static void -ratelimiter_tick(isc_task_t *task, isc_event_t *event) -{ +ratelimiter_tick(isc_task_t *task, isc_event_t *event) { isc_ratelimiter_t *rl = (isc_ratelimiter_t *)event->ev_arg; - isc_event_t * p; - uint32_t pertic; + isc_event_t *p; + uint32_t pertic; UNUSED(task); @@ -241,8 +233,7 @@ ratelimiter_tick(isc_task_t *task, isc_event_t *event) } void -isc_ratelimiter_shutdown(isc_ratelimiter_t *rl) -{ +isc_ratelimiter_shutdown(isc_ratelimiter_t *rl) { isc_event_t *ev; REQUIRE(rl != NULL); @@ -270,8 +261,7 @@ isc_ratelimiter_shutdown(isc_ratelimiter_t *rl) } static void -ratelimiter_shutdowncomplete(isc_task_t *task, isc_event_t *event) -{ +ratelimiter_shutdowncomplete(isc_task_t *task, isc_event_t *event) { isc_ratelimiter_t *rl = (isc_ratelimiter_t *)event->ev_arg; UNUSED(task); @@ -280,15 +270,13 @@ ratelimiter_shutdowncomplete(isc_task_t *task, isc_event_t *event) } static void -ratelimiter_free(isc_ratelimiter_t *rl) -{ +ratelimiter_free(isc_ratelimiter_t *rl) { isc_mutex_destroy(&rl->lock); isc_mem_put(rl->mctx, rl, sizeof(*rl)); } void -isc_ratelimiter_attach(isc_ratelimiter_t *source, isc_ratelimiter_t **target) -{ +isc_ratelimiter_attach(isc_ratelimiter_t *source, isc_ratelimiter_t **target) { REQUIRE(source != NULL); REQUIRE(target != NULL && *target == NULL); @@ -298,8 +286,7 @@ isc_ratelimiter_attach(isc_ratelimiter_t *source, isc_ratelimiter_t **target) } void -isc_ratelimiter_detach(isc_ratelimiter_t **rlp) -{ +isc_ratelimiter_detach(isc_ratelimiter_t **rlp) { isc_ratelimiter_t *rl; REQUIRE(rlp != NULL && *rlp != NULL); @@ -313,8 +300,7 @@ isc_ratelimiter_detach(isc_ratelimiter_t **rlp) } isc_result_t -isc_ratelimiter_stall(isc_ratelimiter_t *rl) -{ +isc_ratelimiter_stall(isc_ratelimiter_t *rl) { isc_result_t result = ISC_R_SUCCESS; REQUIRE(rl != NULL); @@ -339,8 +325,7 @@ isc_ratelimiter_stall(isc_ratelimiter_t *rl) } isc_result_t -isc_ratelimiter_release(isc_ratelimiter_t *rl) -{ +isc_ratelimiter_release(isc_ratelimiter_t *rl) { isc_result_t result = ISC_R_SUCCESS; REQUIRE(rl != NULL); diff --git a/lib/isc/regex.c b/lib/isc/regex.c index a0fe003ff0..2f257b4c14 100644 --- a/lib/isc/regex.c +++ b/lib/isc/regex.c @@ -30,8 +30,7 @@ * Validate the regular expression 'C' locale. */ int -isc_regex_validate(const char *c) -{ +isc_regex_validate(const char *c) { enum { none, parse_bracket, parse_bound, @@ -39,25 +38,25 @@ isc_regex_validate(const char *c) parse_ec, parse_cc } state = none; /* Well known character classes. */ - const char * cc[] = { ":alnum:", ":digit:", ":punct:", ":alpha:", - ":graph:", ":space:", ":blank:", ":lower:", - ":upper:", ":cntrl:", ":print:", ":xdigit:" }; - bool seen_comma = false; - bool seen_high = false; - bool seen_char = false; - bool seen_ec = false; - bool seen_ce = false; - bool have_atom = false; - int group = 0; - int range = 0; - int sub = 0; - bool empty_ok = false; - bool neg = false; - bool was_multiple = false; + const char *cc[] = { ":alnum:", ":digit:", ":punct:", ":alpha:", + ":graph:", ":space:", ":blank:", ":lower:", + ":upper:", ":cntrl:", ":print:", ":xdigit:" }; + bool seen_comma = false; + bool seen_high = false; + bool seen_char = false; + bool seen_ec = false; + bool seen_ce = false; + bool have_atom = false; + int group = 0; + int range = 0; + int sub = 0; + bool empty_ok = false; + bool neg = false; + bool was_multiple = false; unsigned int low = 0; unsigned int high = 0; - const char * ccname = NULL; - int range_start = 0; + const char *ccname = NULL; + int range_start = 0; #if VALREGEX_REPORT_REASON const char *reason = ""; #endif /* if VALREGEX_REPORT_REASON */ @@ -379,19 +378,19 @@ isc_regex_validate(const char *c) switch (*c) { case ']': { unsigned int i; - bool found = false; + bool found = false; for (i = 0; - i < sizeof(cc) / sizeof(*cc); - i++) { + i < sizeof(cc) / sizeof(*cc); i++) + { unsigned int len; len = strlen(cc[i]); if (len != - (unsigned int)(c - - ccname)) { + (unsigned int)(c - ccname)) + { continue; } - if (strncmp(cc[i], ccname, - len)) { + if (strncmp(cc[i], ccname, len)) + { continue; } found = true; diff --git a/lib/isc/region.c b/lib/isc/region.c index 7dab5be033..32d6145858 100644 --- a/lib/isc/region.c +++ b/lib/isc/region.c @@ -18,10 +18,9 @@ #include int -isc_region_compare(isc_region_t *r1, isc_region_t *r2) -{ +isc_region_compare(isc_region_t *r1, isc_region_t *r2) { unsigned int l; - int result; + int result; REQUIRE(r1 != NULL); REQUIRE(r2 != NULL); diff --git a/lib/isc/result.c b/lib/isc/result.c index c0f7cdc81d..0574b3a413 100644 --- a/lib/isc/result.c +++ b/lib/isc/result.c @@ -24,7 +24,7 @@ typedef struct resulttable { unsigned int base; unsigned int last; const char **text; - int set; + int set; ISC_LINK(struct resulttable) link; } resulttable; @@ -176,18 +176,17 @@ static const char *identifier[ISC_R_NRESULTS] = { "ISC_R_IPV4PREFIX", }; -#define ISC_RESULT_RESULTSET 2 +#define ISC_RESULT_RESULTSET 2 #define ISC_RESULT_UNAVAILABLESET 3 -static isc_once_t once = ISC_ONCE_INIT; +static isc_once_t once = ISC_ONCE_INIT; static resulttable_list_t description_tables; static resulttable_list_t identifier_tables; -static isc_mutex_t lock; +static isc_mutex_t lock; static isc_result_t register_table(resulttable_list_t *tables, unsigned int base, - unsigned int nresults, const char **text, int set) -{ + unsigned int nresults, const char **text, int set) { resulttable *table; REQUIRE(base % ISC_RESULTCLASS_SIZE == 0); @@ -218,8 +217,7 @@ register_table(resulttable_list_t *tables, unsigned int base, } static void -initialize_action(void) -{ +initialize_action(void) { isc_result_t result; isc_mutex_init(&lock); @@ -244,17 +242,15 @@ initialize_action(void) } static void -initialize(void) -{ +initialize(void) { RUNTIME_CHECK(isc_once_do(&once, initialize_action) == ISC_R_SUCCESS); } static const char * -isc_result_tomany_helper(resulttable_list_t *tables, isc_result_t result) -{ +isc_result_tomany_helper(resulttable_list_t *tables, isc_result_t result) { resulttable *table; - const char * text; - int index; + const char *text; + int index; initialize(); @@ -262,7 +258,8 @@ isc_result_tomany_helper(resulttable_list_t *tables, isc_result_t result) text = NULL; for (table = ISC_LIST_HEAD(*tables); table != NULL; - table = ISC_LIST_NEXT(table, link)) { + table = ISC_LIST_NEXT(table, link)) + { if (result >= table->base && result <= table->last) { index = (int)(result - table->base); text = table->text[index]; @@ -279,21 +276,18 @@ isc_result_tomany_helper(resulttable_list_t *tables, isc_result_t result) } const char * -isc_result_totext(isc_result_t result) -{ +isc_result_totext(isc_result_t result) { return (isc_result_tomany_helper(&description_tables, result)); } const char * -isc_result_toid(isc_result_t result) -{ +isc_result_toid(isc_result_t result) { return (isc_result_tomany_helper(&identifier_tables, result)); } isc_result_t isc_result_register(unsigned int base, unsigned int nresults, const char **text, - int set) -{ + int set) { initialize(); return (register_table(&description_tables, base, nresults, text, set)); @@ -301,8 +295,7 @@ isc_result_register(unsigned int base, unsigned int nresults, const char **text, isc_result_t isc_result_registerids(unsigned int base, unsigned int nresults, - const char **ids, int set) -{ + const char **ids, int set) { initialize(); return (register_table(&identifier_tables, base, nresults, ids, set)); diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c index bc48a5a680..3f2b0e1072 100644 --- a/lib/isc/rwlock.c +++ b/lib/isc/rwlock.c @@ -33,8 +33,7 @@ isc_result_t isc_rwlock_init(isc_rwlock_t *rwl, unsigned int read_quota, - unsigned int write_quota) -{ + unsigned int write_quota) { UNUSED(read_quota); UNUSED(write_quota); REQUIRE(pthread_rwlock_init(&rwl->rwlock, NULL) == 0); @@ -43,8 +42,7 @@ isc_rwlock_init(isc_rwlock_t *rwl, unsigned int read_quota, } isc_result_t -isc_rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) -{ +isc_rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { switch (type) { case isc_rwlocktype_read: REQUIRE(pthread_rwlock_rdlock(&rwl->rwlock) == 0); @@ -71,8 +69,7 @@ isc_rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) } isc_result_t -isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) -{ +isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { int ret = 0; switch (type) { case isc_rwlocktype_read: @@ -103,23 +100,20 @@ isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) } isc_result_t -isc_rwlock_unlock(isc_rwlock_t *rwl, isc_rwlocktype_t type) -{ +isc_rwlock_unlock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { UNUSED(type); REQUIRE(pthread_rwlock_unlock(&rwl->rwlock) == 0); return (ISC_R_SUCCESS); } isc_result_t -isc_rwlock_tryupgrade(isc_rwlock_t *rwl) -{ +isc_rwlock_tryupgrade(isc_rwlock_t *rwl) { UNUSED(rwl); return (ISC_R_LOCKBUSY); } void -isc_rwlock_downgrade(isc_rwlock_t *rwl) -{ +isc_rwlock_downgrade(isc_rwlock_t *rwl) { atomic_store_release(&rwl->downgrade, true); isc_rwlock_unlock(rwl, isc_rwlocktype_write); isc_rwlock_lock(rwl, isc_rwlocktype_read); @@ -127,14 +121,13 @@ isc_rwlock_downgrade(isc_rwlock_t *rwl) } void -isc_rwlock_destroy(isc_rwlock_t *rwl) -{ +isc_rwlock_destroy(isc_rwlock_t *rwl) { pthread_rwlock_destroy(&rwl->rwlock); } #else /* if USE_PTHREAD_RWLOCK */ -#define RWLOCK_MAGIC ISC_MAGIC('R', 'W', 'L', 'k') +#define RWLOCK_MAGIC ISC_MAGIC('R', 'W', 'L', 'k') #define VALID_RWLOCK(rwl) ISC_MAGIC_VALID(rwl, RWLOCK_MAGIC) #ifndef RWLOCK_DEFAULT_READ_QUOTA @@ -172,8 +165,7 @@ 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. */ @@ -181,8 +173,7 @@ isc__rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type); #include /* Required for isc_thread_self(). */ static void -print_lock(const char *operation, isc_rwlock_t *rwl, isc_rwlocktype_t type) -{ +print_lock(const char *operation, isc_rwlock_t *rwl, isc_rwlocktype_t type) { fprintf(stderr, "rwlock %p thread %lu %s(%s): " "write_requests=%u, write_completions=%u, " @@ -199,8 +190,7 @@ print_lock(const char *operation, isc_rwlock_t *rwl, isc_rwlocktype_t type) isc_result_t isc_rwlock_init(isc_rwlock_t *rwl, unsigned int read_quota, - unsigned int write_quota) -{ + unsigned int write_quota) { REQUIRE(rwl != NULL); /* @@ -235,8 +225,7 @@ isc_rwlock_init(isc_rwlock_t *rwl, unsigned int read_quota, } void -isc_rwlock_destroy(isc_rwlock_t *rwl) -{ +isc_rwlock_destroy(isc_rwlock_t *rwl) { REQUIRE(VALID_RWLOCK(rwl)); REQUIRE(atomic_load_acquire(&rwl->write_requests) == @@ -313,11 +302,10 @@ isc_rwlock_destroy(isc_rwlock_t *rwl) */ #define WRITER_ACTIVE 0x1 -#define READER_INCR 0x2 +#define READER_INCR 0x2 static isc_result_t -isc__rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) -{ +isc__rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { int32_t cntflag; REQUIRE(VALID_RWLOCK(rwl)); @@ -328,11 +316,13 @@ isc__rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) if (type == isc_rwlocktype_read) { if (atomic_load_acquire(&rwl->write_requests) != - atomic_load_acquire(&rwl->write_completions)) { + atomic_load_acquire(&rwl->write_completions)) + { /* there is a waiting or active writer */ LOCK(&rwl->lock); if (atomic_load_acquire(&rwl->write_requests) != - atomic_load_acquire(&rwl->write_completions)) { + atomic_load_acquire(&rwl->write_completions)) + { rwl->readers_waiting++; WAIT(&rwl->readable, &rwl->lock); rwl->readers_waiting--; @@ -412,7 +402,8 @@ isc__rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) while (1) { int_fast32_t zero = 0; if (atomic_compare_exchange_weak_acq_rel( - &rwl->cnt_and_flag, &zero, WRITER_ACTIVE)) { + &rwl->cnt_and_flag, &zero, WRITER_ACTIVE)) + { break; } @@ -437,11 +428,10 @@ isc__rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) } isc_result_t -isc_rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) -{ - int32_t cnt = 0; - int32_t spins = atomic_load_acquire(&rwl->spins) * 2 + 10; - int32_t max_cnt = ISC_MAX(spins, RWLOCK_MAX_ADAPTIVE_COUNT); +isc_rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { + int32_t cnt = 0; + int32_t spins = atomic_load_acquire(&rwl->spins) * 2 + 10; + int32_t max_cnt = ISC_MAX(spins, RWLOCK_MAX_ADAPTIVE_COUNT); isc_result_t result = ISC_R_SUCCESS; do { @@ -458,8 +448,7 @@ isc_rwlock_lock(isc_rwlock_t *rwl, isc_rwlocktype_t type) } isc_result_t -isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) -{ +isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { int32_t cntflag; REQUIRE(VALID_RWLOCK(rwl)); @@ -471,7 +460,8 @@ isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) if (type == isc_rwlocktype_read) { /* If a writer is waiting or working, we fail. */ if (atomic_load_acquire(&rwl->write_requests) != - atomic_load_acquire(&rwl->write_completions)) { + atomic_load_acquire(&rwl->write_completions)) + { return (ISC_R_LOCKBUSY); } @@ -491,7 +481,8 @@ isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) */ if (cntflag == READER_INCR && atomic_load_acquire(&rwl->write_completions) != - atomic_load_acquire(&rwl->write_requests)) { + atomic_load_acquire(&rwl->write_requests)) + { LOCK(&rwl->lock); BROADCAST(&rwl->writeable); UNLOCK(&rwl->lock); @@ -502,8 +493,9 @@ isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) } else { /* Try locking without entering the waiting queue. */ int_fast32_t zero = 0; - if (!atomic_compare_exchange_weak_acq_rel( - &rwl->cnt_and_flag, &zero, WRITER_ACTIVE)) { + if (!atomic_compare_exchange_weak_acq_rel(&rwl->cnt_and_flag, + &zero, WRITER_ACTIVE)) + { return (ISC_R_LOCKBUSY); } @@ -523,8 +515,7 @@ isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) } isc_result_t -isc_rwlock_tryupgrade(isc_rwlock_t *rwl) -{ +isc_rwlock_tryupgrade(isc_rwlock_t *rwl) { REQUIRE(VALID_RWLOCK(rwl)); { @@ -555,15 +546,14 @@ isc_rwlock_tryupgrade(isc_rwlock_t *rwl) } void -isc_rwlock_downgrade(isc_rwlock_t *rwl) -{ +isc_rwlock_downgrade(isc_rwlock_t *rwl) { int32_t prev_readers; REQUIRE(VALID_RWLOCK(rwl)); /* Become an active reader. */ - prev_readers = - atomic_fetch_add_release(&rwl->cnt_and_flag, READER_INCR); + prev_readers = atomic_fetch_add_release(&rwl->cnt_and_flag, + READER_INCR); /* We must have been a writer. */ INSIST((prev_readers & WRITER_ACTIVE) != 0); @@ -580,8 +570,7 @@ isc_rwlock_downgrade(isc_rwlock_t *rwl) } isc_result_t -isc_rwlock_unlock(isc_rwlock_t *rwl, isc_rwlocktype_t type) -{ +isc_rwlock_unlock(isc_rwlock_t *rwl, isc_rwlocktype_t type) { int32_t prev_cnt; REQUIRE(VALID_RWLOCK(rwl)); @@ -600,7 +589,8 @@ isc_rwlock_unlock(isc_rwlock_t *rwl, isc_rwlocktype_t type) */ if (prev_cnt == READER_INCR && atomic_load_acquire(&rwl->write_completions) != - atomic_load_acquire(&rwl->write_requests)) { + atomic_load_acquire(&rwl->write_requests)) + { LOCK(&rwl->lock); BROADCAST(&rwl->writeable); UNLOCK(&rwl->lock); @@ -619,8 +609,8 @@ isc_rwlock_unlock(isc_rwlock_t *rwl, isc_rwlocktype_t type) rwl->write_quota) || (atomic_load_acquire(&rwl->write_requests) == atomic_load_acquire(&rwl->write_completions)) || - (atomic_load_acquire(&rwl->cnt_and_flag) & - ~WRITER_ACTIVE)) { + (atomic_load_acquire(&rwl->cnt_and_flag) & ~WRITER_ACTIVE)) + { /* * We have passed the write quota, no writer is * waiting, or some readers are almost ready, pending @@ -639,7 +629,8 @@ isc_rwlock_unlock(isc_rwlock_t *rwl, isc_rwlocktype_t type) if ((atomic_load_acquire(&rwl->write_requests) != atomic_load_acquire(&rwl->write_completions)) && - wakeup_writers) { + wakeup_writers) + { LOCK(&rwl->lock); BROADCAST(&rwl->writeable); UNLOCK(&rwl->lock); diff --git a/lib/isc/serial.c b/lib/isc/serial.c index f4e8a91e67..ab60bb209b 100644 --- a/lib/isc/serial.c +++ b/lib/isc/serial.c @@ -17,8 +17,7 @@ #include bool -isc_serial_lt(uint32_t a, uint32_t b) -{ +isc_serial_lt(uint32_t a, uint32_t b) { /* * Undefined => false */ @@ -29,31 +28,26 @@ isc_serial_lt(uint32_t a, uint32_t b) } bool -isc_serial_gt(uint32_t a, uint32_t b) -{ +isc_serial_gt(uint32_t a, uint32_t b) { return (((int32_t)(a - b) > 0) ? true : false); } bool -isc_serial_le(uint32_t a, uint32_t b) -{ +isc_serial_le(uint32_t a, uint32_t b) { return ((a == b) ? true : isc_serial_lt(a, b)); } bool -isc_serial_ge(uint32_t a, uint32_t b) -{ +isc_serial_ge(uint32_t a, uint32_t b) { return ((a == b) ? true : isc_serial_gt(a, b)); } bool -isc_serial_eq(uint32_t a, uint32_t b) -{ +isc_serial_eq(uint32_t a, uint32_t b) { return ((a == b) ? true : false); } bool -isc_serial_ne(uint32_t a, uint32_t b) -{ +isc_serial_ne(uint32_t a, uint32_t b) { return ((a != b) ? true : false); } diff --git a/lib/isc/siphash.c b/lib/isc/siphash.c index e5d77bc0d0..87e3c285ec 100644 --- a/lib/isc/siphash.c +++ b/lib/isc/siphash.c @@ -109,8 +109,7 @@ isc_siphash24(const uint8_t*k,const uint8_t*in,const size_t inlen,uint8_t*out) void isc_siphash24(const uint8_t *k, const uint8_t *in, const size_t inlen, - uint8_t *out) -{ + uint8_t *out) { REQUIRE(k != NULL); REQUIRE(out != NULL); @@ -125,7 +124,7 @@ isc_siphash24(const uint8_t *k, const uint8_t *in, const size_t inlen, uint64_t b = ((uint64_t)inlen) << 56; const uint8_t *end = in + inlen - (inlen % sizeof(uint64_t)); - const size_t left = inlen & 7; + const size_t left = inlen & 7; for (; in != end; in += 8) { uint64_t m = U8TO64_LE(in); diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c index 4f55152e1b..c6a2d86869 100644 --- a/lib/isc/sockaddr.c +++ b/lib/isc/sockaddr.c @@ -27,8 +27,7 @@ #include bool -isc_sockaddr_equal(const isc_sockaddr_t *a, const isc_sockaddr_t *b) -{ +isc_sockaddr_equal(const isc_sockaddr_t *a, const isc_sockaddr_t *b) { return (isc_sockaddr_compare(a, b, ISC_SOCKADDR_CMPADDR | ISC_SOCKADDR_CMPPORT | @@ -36,16 +35,14 @@ isc_sockaddr_equal(const isc_sockaddr_t *a, const isc_sockaddr_t *b) } bool -isc_sockaddr_eqaddr(const isc_sockaddr_t *a, const isc_sockaddr_t *b) -{ +isc_sockaddr_eqaddr(const isc_sockaddr_t *a, const isc_sockaddr_t *b) { return (isc_sockaddr_compare( a, b, ISC_SOCKADDR_CMPADDR | ISC_SOCKADDR_CMPSCOPE)); } bool isc_sockaddr_compare(const isc_sockaddr_t *a, const isc_sockaddr_t *b, - unsigned int flags) -{ + unsigned int flags) { REQUIRE(a != NULL && b != NULL); if (a->length != b->length) { @@ -64,18 +61,21 @@ isc_sockaddr_compare(const isc_sockaddr_t *a, const isc_sockaddr_t *b, case AF_INET: if ((flags & ISC_SOCKADDR_CMPADDR) != 0 && memcmp(&a->type.sin.sin_addr, &b->type.sin.sin_addr, - sizeof(a->type.sin.sin_addr)) != 0) { + sizeof(a->type.sin.sin_addr)) != 0) + { return (false); } if ((flags & ISC_SOCKADDR_CMPPORT) != 0 && - a->type.sin.sin_port != b->type.sin.sin_port) { + a->type.sin.sin_port != b->type.sin.sin_port) + { return (false); } break; case AF_INET6: if ((flags & ISC_SOCKADDR_CMPADDR) != 0 && memcmp(&a->type.sin6.sin6_addr, &b->type.sin6.sin6_addr, - sizeof(a->type.sin6.sin6_addr)) != 0) { + sizeof(a->type.sin6.sin6_addr)) != 0) + { return (false); } /* @@ -86,11 +86,13 @@ isc_sockaddr_compare(const isc_sockaddr_t *a, const isc_sockaddr_t *b, a->type.sin6.sin6_scope_id != b->type.sin6.sin6_scope_id && ((flags & ISC_SOCKADDR_CMPSCOPEZERO) == 0 || (a->type.sin6.sin6_scope_id != 0 && - b->type.sin6.sin6_scope_id != 0))) { + b->type.sin6.sin6_scope_id != 0))) + { return (false); } if ((flags & ISC_SOCKADDR_CMPPORT) != 0 && - a->type.sin6.sin6_port != b->type.sin6.sin6_port) { + a->type.sin6.sin6_port != b->type.sin6.sin6_port) + { return (false); } break; @@ -104,8 +106,7 @@ isc_sockaddr_compare(const isc_sockaddr_t *a, const isc_sockaddr_t *b, bool isc_sockaddr_eqaddrprefix(const isc_sockaddr_t *a, const isc_sockaddr_t *b, - unsigned int prefixlen) -{ + unsigned int prefixlen) { isc_netaddr_t na, nb; isc_netaddr_fromsockaddr(&na, a); isc_netaddr_fromsockaddr(&nb, b); @@ -113,13 +114,12 @@ isc_sockaddr_eqaddrprefix(const isc_sockaddr_t *a, const isc_sockaddr_t *b, } isc_result_t -isc_sockaddr_totext(const isc_sockaddr_t *sockaddr, isc_buffer_t *target) -{ - isc_result_t result; +isc_sockaddr_totext(const isc_sockaddr_t *sockaddr, isc_buffer_t *target) { + isc_result_t result; isc_netaddr_t netaddr; - char pbuf[sizeof("65000")]; - unsigned int plen; - isc_region_t avail; + char pbuf[sizeof("65000")]; + unsigned int plen; + isc_region_t avail; REQUIRE(sockaddr != NULL); @@ -186,8 +186,7 @@ isc_sockaddr_totext(const isc_sockaddr_t *sockaddr, isc_buffer_t *target) } void -isc_sockaddr_format(const isc_sockaddr_t *sa, char *array, unsigned int size) -{ +isc_sockaddr_format(const isc_sockaddr_t *sa, char *array, unsigned int size) { isc_result_t result; isc_buffer_t buf; @@ -208,12 +207,11 @@ isc_sockaddr_format(const isc_sockaddr_t *sa, char *array, unsigned int size) } unsigned int -isc_sockaddr_hash(const isc_sockaddr_t *sockaddr, bool address_only) -{ - unsigned int length = 0; - const unsigned char * s = NULL; - unsigned int h = 0; - unsigned int p = 0; +isc_sockaddr_hash(const isc_sockaddr_t *sockaddr, bool address_only) { + unsigned int length = 0; + const unsigned char *s = NULL; + unsigned int h = 0; + unsigned int p = 0; const struct in6_addr *in6; REQUIRE(sockaddr != NULL); @@ -257,8 +255,7 @@ isc_sockaddr_hash(const isc_sockaddr_t *sockaddr, bool address_only) } void -isc_sockaddr_any(isc_sockaddr_t *sockaddr) -{ +isc_sockaddr_any(isc_sockaddr_t *sockaddr) { memset(sockaddr, 0, sizeof(*sockaddr)); sockaddr->type.sin.sin_family = AF_INET; sockaddr->type.sin.sin_addr.s_addr = INADDR_ANY; @@ -268,8 +265,7 @@ isc_sockaddr_any(isc_sockaddr_t *sockaddr) } void -isc_sockaddr_any6(isc_sockaddr_t *sockaddr) -{ +isc_sockaddr_any6(isc_sockaddr_t *sockaddr) { memset(sockaddr, 0, sizeof(*sockaddr)); sockaddr->type.sin6.sin6_family = AF_INET6; sockaddr->type.sin6.sin6_addr = in6addr_any; @@ -280,8 +276,7 @@ isc_sockaddr_any6(isc_sockaddr_t *sockaddr) void isc_sockaddr_fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina, - in_port_t port) -{ + in_port_t port) { memset(sockaddr, 0, sizeof(*sockaddr)); sockaddr->type.sin.sin_family = AF_INET; sockaddr->type.sin.sin_addr = *ina; @@ -291,8 +286,7 @@ isc_sockaddr_fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina, } void -isc_sockaddr_anyofpf(isc_sockaddr_t *sockaddr, int pf) -{ +isc_sockaddr_anyofpf(isc_sockaddr_t *sockaddr, int pf) { switch (pf) { case AF_INET: isc_sockaddr_any(sockaddr); @@ -308,8 +302,7 @@ isc_sockaddr_anyofpf(isc_sockaddr_t *sockaddr, int pf) void isc_sockaddr_fromin6(isc_sockaddr_t *sockaddr, const struct in6_addr *ina6, - in_port_t port) -{ + in_port_t port) { memset(sockaddr, 0, sizeof(*sockaddr)); sockaddr->type.sin6.sin6_family = AF_INET6; sockaddr->type.sin6.sin6_addr = *ina6; @@ -320,8 +313,7 @@ isc_sockaddr_fromin6(isc_sockaddr_t *sockaddr, const struct in6_addr *ina6, void isc_sockaddr_v6fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina, - in_port_t port) -{ + in_port_t port) { memset(sockaddr, 0, sizeof(*sockaddr)); sockaddr->type.sin6.sin6_family = AF_INET6; sockaddr->type.sin6.sin6_addr.s6_addr[10] = 0xff; @@ -333,8 +325,7 @@ isc_sockaddr_v6fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina, } int -isc_sockaddr_pf(const isc_sockaddr_t *sockaddr) -{ +isc_sockaddr_pf(const isc_sockaddr_t *sockaddr) { /* * Get the protocol family of 'sockaddr'. */ @@ -359,8 +350,7 @@ isc_sockaddr_pf(const isc_sockaddr_t *sockaddr) void isc_sockaddr_fromnetaddr(isc_sockaddr_t *sockaddr, const isc_netaddr_t *na, - in_port_t port) -{ + in_port_t port) { memset(sockaddr, 0, sizeof(*sockaddr)); sockaddr->type.sin.sin_family = na->family; switch (na->family) { @@ -383,8 +373,7 @@ isc_sockaddr_fromnetaddr(isc_sockaddr_t *sockaddr, const isc_netaddr_t *na, } void -isc_sockaddr_setport(isc_sockaddr_t *sockaddr, in_port_t port) -{ +isc_sockaddr_setport(isc_sockaddr_t *sockaddr, in_port_t port) { switch (sockaddr->type.sa.sa_family) { case AF_INET: sockaddr->type.sin.sin_port = htons(port); @@ -399,8 +388,7 @@ isc_sockaddr_setport(isc_sockaddr_t *sockaddr, in_port_t port) } in_port_t -isc_sockaddr_getport(const isc_sockaddr_t *sockaddr) -{ +isc_sockaddr_getport(const isc_sockaddr_t *sockaddr) { in_port_t port = 0; switch (sockaddr->type.sa.sa_family) { @@ -419,12 +407,12 @@ isc_sockaddr_getport(const isc_sockaddr_t *sockaddr) } bool -isc_sockaddr_ismulticast(const isc_sockaddr_t *sockaddr) -{ +isc_sockaddr_ismulticast(const isc_sockaddr_t *sockaddr) { isc_netaddr_t netaddr; if (sockaddr->type.sa.sa_family == AF_INET || - sockaddr->type.sa.sa_family == AF_INET6) { + sockaddr->type.sa.sa_family == AF_INET6) + { isc_netaddr_fromsockaddr(&netaddr, sockaddr); return (isc_netaddr_ismulticast(&netaddr)); } @@ -432,8 +420,7 @@ isc_sockaddr_ismulticast(const isc_sockaddr_t *sockaddr) } bool -isc_sockaddr_isexperimental(const isc_sockaddr_t *sockaddr) -{ +isc_sockaddr_isexperimental(const isc_sockaddr_t *sockaddr) { isc_netaddr_t netaddr; if (sockaddr->type.sa.sa_family == AF_INET) { @@ -444,8 +431,7 @@ isc_sockaddr_isexperimental(const isc_sockaddr_t *sockaddr) } bool -isc_sockaddr_issitelocal(const isc_sockaddr_t *sockaddr) -{ +isc_sockaddr_issitelocal(const isc_sockaddr_t *sockaddr) { isc_netaddr_t netaddr; if (sockaddr->type.sa.sa_family == AF_INET6) { @@ -456,8 +442,7 @@ isc_sockaddr_issitelocal(const isc_sockaddr_t *sockaddr) } bool -isc_sockaddr_islinklocal(const isc_sockaddr_t *sockaddr) -{ +isc_sockaddr_islinklocal(const isc_sockaddr_t *sockaddr) { isc_netaddr_t netaddr; if (sockaddr->type.sa.sa_family == AF_INET6) { @@ -468,8 +453,7 @@ isc_sockaddr_islinklocal(const isc_sockaddr_t *sockaddr) } bool -isc_sockaddr_isnetzero(const isc_sockaddr_t *sockaddr) -{ +isc_sockaddr_isnetzero(const isc_sockaddr_t *sockaddr) { isc_netaddr_t netaddr; if (sockaddr->type.sa.sa_family == AF_INET) { @@ -480,8 +464,7 @@ isc_sockaddr_isnetzero(const isc_sockaddr_t *sockaddr) } isc_result_t -isc_sockaddr_frompath(isc_sockaddr_t *sockaddr, const char *path) -{ +isc_sockaddr_frompath(isc_sockaddr_t *sockaddr, const char *path) { #ifdef ISC_PLATFORM_HAVESYSUNH if (strlen(path) >= sizeof(sockaddr->type.sunix.sun_path)) { return (ISC_R_NOSPACE); @@ -500,8 +483,7 @@ isc_sockaddr_frompath(isc_sockaddr_t *sockaddr, const char *path) } isc_result_t -isc_sockaddr_fromsockaddr(isc_sockaddr_t *isa, const struct sockaddr *sa) -{ +isc_sockaddr_fromsockaddr(isc_sockaddr_t *isa, const struct sockaddr *sa) { unsigned int length = 0; switch (sa->sa_family) { diff --git a/lib/isc/stats.c b/lib/isc/stats.c index 3efee40e5f..d08986169d 100644 --- a/lib/isc/stats.c +++ b/lib/isc/stats.c @@ -24,7 +24,7 @@ #include #include -#define ISC_STATS_MAGIC ISC_MAGIC('S', 't', 'a', 't') +#define ISC_STATS_MAGIC ISC_MAGIC('S', 't', 'a', 't') #define ISC_STATS_VALID(x) ISC_MAGIC_VALID(x, ISC_STATS_MAGIC) #if defined(_WIN32) && !defined(_WIN64) @@ -34,18 +34,17 @@ typedef atomic_int_fast64_t isc__atomic_statcounter_t; #endif /* if defined(_WIN32) && !defined(_WIN64) */ struct isc_stats { - unsigned int magic; - isc_mem_t * mctx; - isc_refcount_t references; - int ncounters; + unsigned int magic; + isc_mem_t *mctx; + isc_refcount_t references; + int ncounters; isc__atomic_statcounter_t *counters; }; static isc_result_t -create_stats(isc_mem_t *mctx, int ncounters, isc_stats_t **statsp) -{ +create_stats(isc_mem_t *mctx, int ncounters, isc_stats_t **statsp) { isc_stats_t *stats; - size_t counters_alloc_size; + size_t counters_alloc_size; REQUIRE(statsp != NULL && *statsp == NULL); @@ -64,8 +63,7 @@ create_stats(isc_mem_t *mctx, int ncounters, isc_stats_t **statsp) } void -isc_stats_attach(isc_stats_t *stats, isc_stats_t **statsp) -{ +isc_stats_attach(isc_stats_t *stats, isc_stats_t **statsp) { REQUIRE(ISC_STATS_VALID(stats)); REQUIRE(statsp != NULL && *statsp == NULL); @@ -74,8 +72,7 @@ isc_stats_attach(isc_stats_t *stats, isc_stats_t **statsp) } void -isc_stats_detach(isc_stats_t **statsp) -{ +isc_stats_detach(isc_stats_t **statsp) { isc_stats_t *stats; REQUIRE(statsp != NULL && ISC_STATS_VALID(*statsp)); @@ -93,24 +90,21 @@ isc_stats_detach(isc_stats_t **statsp) } int -isc_stats_ncounters(isc_stats_t *stats) -{ +isc_stats_ncounters(isc_stats_t *stats) { REQUIRE(ISC_STATS_VALID(stats)); return (stats->ncounters); } isc_result_t -isc_stats_create(isc_mem_t *mctx, isc_stats_t **statsp, int ncounters) -{ +isc_stats_create(isc_mem_t *mctx, isc_stats_t **statsp, int ncounters) { REQUIRE(statsp != NULL && *statsp == NULL); return (create_stats(mctx, ncounters, statsp)); } void -isc_stats_increment(isc_stats_t *stats, isc_statscounter_t counter) -{ +isc_stats_increment(isc_stats_t *stats, isc_statscounter_t counter) { REQUIRE(ISC_STATS_VALID(stats)); REQUIRE(counter < stats->ncounters); @@ -119,8 +113,7 @@ isc_stats_increment(isc_stats_t *stats, isc_statscounter_t counter) } void -isc_stats_decrement(isc_stats_t *stats, isc_statscounter_t counter) -{ +isc_stats_decrement(isc_stats_t *stats, isc_statscounter_t counter) { REQUIRE(ISC_STATS_VALID(stats)); REQUIRE(counter < stats->ncounters); @@ -130,8 +123,7 @@ isc_stats_decrement(isc_stats_t *stats, isc_statscounter_t counter) void isc_stats_dump(isc_stats_t *stats, isc_stats_dumper_t dump_fn, void *arg, - unsigned int options) -{ + unsigned int options) { int i; REQUIRE(ISC_STATS_VALID(stats)); @@ -147,8 +139,7 @@ isc_stats_dump(isc_stats_t *stats, isc_stats_dumper_t dump_fn, void *arg, } void -isc_stats_set(isc_stats_t *stats, uint64_t val, isc_statscounter_t counter) -{ +isc_stats_set(isc_stats_t *stats, uint64_t val, isc_statscounter_t counter) { REQUIRE(ISC_STATS_VALID(stats)); REQUIRE(counter < stats->ncounters); @@ -158,8 +149,7 @@ isc_stats_set(isc_stats_t *stats, uint64_t val, isc_statscounter_t counter) void isc_stats_update_if_greater(isc_stats_t *stats, isc_statscounter_t counter, - isc_statscounter_t value) -{ + isc_statscounter_t value) { REQUIRE(ISC_STATS_VALID(stats)); REQUIRE(counter < stats->ncounters); @@ -174,8 +164,7 @@ isc_stats_update_if_greater(isc_stats_t *stats, isc_statscounter_t counter, } isc_statscounter_t -isc_stats_get_counter(isc_stats_t *stats, isc_statscounter_t counter) -{ +isc_stats_get_counter(isc_stats_t *stats, isc_statscounter_t counter) { REQUIRE(ISC_STATS_VALID(stats)); REQUIRE(counter < stats->ncounters); diff --git a/lib/isc/string.c b/lib/isc/string.c index bb255762ea..41eac61c70 100644 --- a/lib/isc/string.c +++ b/lib/isc/string.c @@ -49,11 +49,10 @@ #if !defined(HAVE_STRLCPY) size_t -strlcpy(char *dst, const char *src, size_t size) -{ - char * d = dst; +strlcpy(char *dst, const char *src, size_t size) { + char *d = dst; const char *s = src; - size_t n = size; + size_t n = size; /* Copy as many bytes as will fit */ if (n != 0U && --n != 0U) { @@ -79,12 +78,11 @@ strlcpy(char *dst, const char *src, size_t size) #if !defined(HAVE_STRLCAT) size_t -strlcat(char *dst, const char *src, size_t size) -{ - char * d = dst; +strlcat(char *dst, const char *src, size_t size) { + char *d = dst; const char *s = src; - size_t n = size; - size_t dlen; + size_t n = size; + size_t dlen; /* Find the end of dst and adjust bytes left but don't go past end */ while (n-- != 0U && *d != '\0') { @@ -110,8 +108,7 @@ strlcat(char *dst, const char *src, size_t size) #endif /* !defined(HAVE_STRLCAT) */ int -isc_string_strerror_r(int errnum, char *buf, size_t buflen) -{ +isc_string_strerror_r(int errnum, char *buf, size_t buflen) { #if defined(_WIN32) || defined(_WIN64) return (strerror_s(buf, buflen, errnum)); #else /* if defined(_WIN32) || defined(_WIN64) */ diff --git a/lib/isc/symtab.c b/lib/isc/symtab.c index 8f1a9738d7..071a88c2cf 100644 --- a/lib/isc/symtab.c +++ b/lib/isc/symtab.c @@ -21,37 +21,36 @@ #include typedef struct elt { - char * key; - unsigned int type; + char *key; + unsigned int type; isc_symvalue_t value; LINK(struct elt) link; } elt_t; typedef LIST(elt_t) eltlist_t; -#define SYMTAB_MAGIC ISC_MAGIC('S', 'y', 'm', 'T') +#define SYMTAB_MAGIC ISC_MAGIC('S', 'y', 'm', 'T') #define VALID_SYMTAB(st) ISC_MAGIC_VALID(st, SYMTAB_MAGIC) struct isc_symtab { /* Unlocked. */ - unsigned int magic; - isc_mem_t * mctx; - unsigned int size; - unsigned int count; - unsigned int maxload; - eltlist_t * table; + unsigned int magic; + isc_mem_t *mctx; + unsigned int size; + unsigned int count; + unsigned int maxload; + eltlist_t *table; isc_symtabaction_t undefine_action; - void * undefine_arg; - bool case_sensitive; + void *undefine_arg; + bool case_sensitive; }; isc_result_t isc_symtab_create(isc_mem_t *mctx, unsigned int size, isc_symtabaction_t undefine_action, void *undefine_arg, - bool case_sensitive, isc_symtab_t **symtabp) -{ + bool case_sensitive, isc_symtab_t **symtabp) { isc_symtab_t *symtab; - unsigned int i; + unsigned int i; REQUIRE(mctx != NULL); REQUIRE(symtabp != NULL && *symtabp == NULL); @@ -79,11 +78,10 @@ isc_symtab_create(isc_mem_t *mctx, unsigned int size, } void -isc_symtab_destroy(isc_symtab_t **symtabp) -{ +isc_symtab_destroy(isc_symtab_t **symtabp) { isc_symtab_t *symtab; - unsigned int i; - elt_t * elt, *nelt; + unsigned int i; + elt_t *elt, *nelt; REQUIRE(symtabp != NULL); symtab = *symtabp; @@ -108,11 +106,10 @@ isc_symtab_destroy(isc_symtab_t **symtabp) } static inline unsigned int -hash(const char *key, bool case_sensitive) -{ - const char * s; +hash(const char *key, bool case_sensitive) { + const char *s; unsigned int h = 0; - int c; + int c; /* * This hash function is similar to the one Ousterhout @@ -152,10 +149,9 @@ hash(const char *key, bool case_sensitive) isc_result_t isc_symtab_lookup(isc_symtab_t *symtab, const char *key, unsigned int type, - isc_symvalue_t *value) -{ + isc_symvalue_t *value) { unsigned int bucket; - elt_t * elt; + elt_t *elt; REQUIRE(VALID_SYMTAB(symtab)); REQUIRE(key != NULL); @@ -174,9 +170,8 @@ isc_symtab_lookup(isc_symtab_t *symtab, const char *key, unsigned int type, } static void -grow_table(isc_symtab_t *symtab) -{ - eltlist_t * newtable; +grow_table(isc_symtab_t *symtab) { + eltlist_t *newtable; unsigned int i, newsize, newmax; REQUIRE(symtab != NULL); @@ -215,10 +210,9 @@ grow_table(isc_symtab_t *symtab) isc_result_t isc_symtab_define(isc_symtab_t *symtab, const char *key, unsigned int type, - isc_symvalue_t value, isc_symexists_t exists_policy) -{ + isc_symvalue_t value, isc_symexists_t exists_policy) { unsigned int bucket; - elt_t * elt; + elt_t *elt; REQUIRE(VALID_SYMTAB(symtab)); REQUIRE(key != NULL); @@ -267,10 +261,9 @@ isc_symtab_define(isc_symtab_t *symtab, const char *key, unsigned int type, } isc_result_t -isc_symtab_undefine(isc_symtab_t *symtab, const char *key, unsigned int type) -{ +isc_symtab_undefine(isc_symtab_t *symtab, const char *key, unsigned int type) { unsigned int bucket; - elt_t * elt; + elt_t *elt; REQUIRE(VALID_SYMTAB(symtab)); REQUIRE(key != NULL); @@ -293,8 +286,7 @@ isc_symtab_undefine(isc_symtab_t *symtab, const char *key, unsigned int type) } unsigned int -isc_symtab_count(isc_symtab_t *symtab) -{ +isc_symtab_count(isc_symtab_t *symtab) { REQUIRE(VALID_SYMTAB(symtab)); return (symtab->count); } diff --git a/lib/isc/task.c b/lib/isc/task.c index ac2aa3af8d..1a542179ad 100644 --- a/lib/isc/task.c +++ b/lib/isc/task.c @@ -93,31 +93,31 @@ static const char *statenames[] = { }; #endif /* if defined(HAVE_LIBXML2) || defined(HAVE_JSON_C) */ -#define TASK_MAGIC ISC_MAGIC('T', 'A', 'S', 'K') +#define TASK_MAGIC ISC_MAGIC('T', 'A', 'S', 'K') #define VALID_TASK(t) ISC_MAGIC_VALID(t, TASK_MAGIC) -typedef struct isc__task isc__task_t; -typedef struct isc__taskmgr isc__taskmgr_t; +typedef struct isc__task isc__task_t; +typedef struct isc__taskmgr isc__taskmgr_t; typedef struct isc__taskqueue isc__taskqueue_t; struct isc__task { /* Not locked. */ - isc_task_t common; + isc_task_t common; isc__taskmgr_t *manager; - isc_mutex_t lock; + isc_mutex_t lock; /* Locked by task lock. */ - task_state_t state; - isc_refcount_t references; + task_state_t state; + isc_refcount_t references; isc_eventlist_t events; isc_eventlist_t on_shutdown; - unsigned int nevents; - unsigned int quantum; - isc_stdtime_t now; - isc_time_t tnow; - char name[16]; - void * tag; - unsigned int threadid; - bool bound; + unsigned int nevents; + unsigned int quantum; + isc_stdtime_t now; + isc_time_t tnow; + char name[16]; + void *tag; + unsigned int threadid; + bool bound; /* Protected by atomics */ atomic_uint_fast32_t flags; /* Locked by task manager lock. */ @@ -127,7 +127,7 @@ struct isc__task { }; #define TASK_F_SHUTTINGDOWN 0x01 -#define TASK_F_PRIVILEGED 0x02 +#define TASK_F_PRIVILEGED 0x02 #define TASK_SHUTTINGDOWN(t) \ ((atomic_load_acquire(&(t)->flags) & TASK_F_SHUTTINGDOWN) != 0) @@ -138,43 +138,43 @@ struct isc__task { #define TASK_FLAG_CLR(t, f) atomic_fetch_and_release(&(t)->flags, ~(f)) #define TASK_MANAGER_MAGIC ISC_MAGIC('T', 'S', 'K', 'M') -#define VALID_MANAGER(m) ISC_MAGIC_VALID(m, TASK_MANAGER_MAGIC) +#define VALID_MANAGER(m) ISC_MAGIC_VALID(m, TASK_MANAGER_MAGIC) typedef ISC_LIST(isc__task_t) isc__tasklist_t; struct isc__taskqueue { /* Everything locked by lock */ - isc_mutex_t lock; + isc_mutex_t lock; isc__tasklist_t ready_tasks; isc__tasklist_t ready_priority_tasks; isc_condition_t work_available; - isc_thread_t thread; - unsigned int threadid; + isc_thread_t thread; + unsigned int threadid; isc__taskmgr_t *manager; }; struct isc__taskmgr { /* Not locked. */ - isc_taskmgr_t common; - isc_mem_t * mctx; - isc_mutex_t lock; - isc_mutex_t halt_lock; - isc_condition_t halt_cond; - unsigned int workers; + isc_taskmgr_t common; + isc_mem_t *mctx; + isc_mutex_t lock; + isc_mutex_t halt_lock; + isc_condition_t halt_cond; + unsigned int workers; atomic_uint_fast32_t tasks_running; atomic_uint_fast32_t tasks_ready; atomic_uint_fast32_t curq; atomic_uint_fast32_t tasks_count; - isc__taskqueue_t * queues; - isc_nm_t * nm; + isc__taskqueue_t *queues; + isc_nm_t *nm; /* Locked by task manager lock. */ unsigned int default_quantum; LIST(isc__task_t) tasks; atomic_uint_fast32_t mode; - atomic_bool pause_req; - atomic_bool exclusive_req; - atomic_bool exiting; + atomic_bool pause_req; + atomic_bool exclusive_req; + atomic_bool exiting; /* Locked by halt_lock */ unsigned int halted; @@ -184,14 +184,12 @@ struct isc__taskmgr { * to protect the access. We can't use 'lock' since isc_task_detach() * will try to acquire it. */ - isc_mutex_t excl_lock; + isc_mutex_t excl_lock; 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) \ @@ -204,31 +202,24 @@ 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. ***/ static inline void -wake_all_queues(isc__taskmgr_t *manager) -{ +wake_all_queues(isc__taskmgr_t *manager) { for (unsigned int i = 0; i < manager->workers; i++) { LOCK(&manager->queues[i].lock); BROADCAST(&manager->queues[i].work_available); @@ -237,8 +228,7 @@ wake_all_queues(isc__taskmgr_t *manager) } static void -task_finished(isc__task_t *task) -{ +task_finished(isc__task_t *task) { isc__taskmgr_t *manager = task->manager; REQUIRE(EMPTY(task->events)); REQUIRE(task->nevents == 0); @@ -270,18 +260,16 @@ task_finished(isc__task_t *task) isc_result_t isc_task_create(isc_taskmgr_t *manager0, unsigned int quantum, - isc_task_t **taskp) -{ + isc_task_t **taskp) { return (isc_task_create_bound(manager0, quantum, taskp, -1)); } isc_result_t isc_task_create_bound(isc_taskmgr_t *manager0, unsigned int quantum, - isc_task_t **taskp, int threadid) -{ + isc_task_t **taskp, int threadid) { isc__taskmgr_t *manager = (isc__taskmgr_t *)manager0; - isc__task_t * task; - bool exiting; + isc__task_t *task; + bool exiting; REQUIRE(VALID_MANAGER(manager)); REQUIRE(taskp != NULL && *taskp == NULL); @@ -348,8 +336,7 @@ isc_task_create_bound(isc_taskmgr_t *manager0, unsigned int quantum, } void -isc_task_attach(isc_task_t *source0, isc_task_t **targetp) -{ +isc_task_attach(isc_task_t *source0, isc_task_t **targetp) { isc__task_t *source = (isc__task_t *)source0; /* @@ -367,9 +354,8 @@ isc_task_attach(isc_task_t *source0, isc_task_t **targetp) } static inline bool -task_shutdown(isc__task_t *task) -{ - bool was_idle = false; +task_shutdown(isc__task_t *task) { + bool was_idle = false; isc_event_t *event, *prev; /* @@ -412,10 +398,9 @@ task_shutdown(isc__task_t *task) * Caller must NOT hold manager lock. */ static inline void -task_ready(isc__task_t *task) -{ +task_ready(isc__task_t *task) { isc__taskmgr_t *manager = task->manager; - bool has_privilege = isc_task_privilege((isc_task_t *)task); + bool has_privilege = isc_task_privilege((isc_task_t *)task); REQUIRE(VALID_MANAGER(manager)); REQUIRE(task->state == task_state_ready); @@ -431,8 +416,7 @@ task_ready(isc__task_t *task) } static inline bool -task_detach(isc__task_t *task) -{ +task_detach(isc__task_t *task) { /* * Caller must be holding the task lock. */ @@ -440,7 +424,8 @@ task_detach(isc__task_t *task) XTRACE("detach"); if (isc_refcount_decrement(&task->references) == 1 && - task->state == task_state_idle) { + task->state == task_state_idle) + { INSIST(EMPTY(task->events)); /* * There are no references to this task, and no @@ -458,10 +443,9 @@ task_detach(isc__task_t *task) } void -isc_task_detach(isc_task_t **taskp) -{ +isc_task_detach(isc_task_t **taskp) { isc__task_t *task; - bool was_idle; + bool was_idle; /* * Detach *taskp from its task. @@ -485,9 +469,8 @@ isc_task_detach(isc_task_t **taskp) } static inline bool -task_send(isc__task_t *task, isc_event_t **eventp, int c) -{ - bool was_idle = false; +task_send(isc__task_t *task, isc_event_t **eventp, int c) { + bool was_idle = false; isc_event_t *event; /* @@ -521,22 +504,19 @@ task_send(isc__task_t *task, isc_event_t **eventp, int c) } void -isc_task_send(isc_task_t *task0, isc_event_t **eventp) -{ +isc_task_send(isc_task_t *task0, isc_event_t **eventp) { isc_task_sendto(task0, eventp, -1); } void -isc_task_sendanddetach(isc_task_t **taskp, isc_event_t **eventp) -{ +isc_task_sendanddetach(isc_task_t **taskp, isc_event_t **eventp) { isc_task_sendtoanddetach(taskp, eventp, -1); } void -isc_task_sendto(isc_task_t *task0, isc_event_t **eventp, int c) -{ +isc_task_sendto(isc_task_t *task0, isc_event_t **eventp, int c) { isc__task_t *task = (isc__task_t *)task0; - bool was_idle; + bool was_idle; /* * Send '*event' to 'task'. @@ -583,9 +563,8 @@ isc_task_sendto(isc_task_t *task0, isc_event_t **eventp, int c) } void -isc_task_sendtoanddetach(isc_task_t **taskp, isc_event_t **eventp, int c) -{ - bool idle1, idle2; +isc_task_sendtoanddetach(isc_task_t **taskp, isc_event_t **eventp, int c) { + bool idle1, idle2; isc__task_t *task; /* @@ -629,8 +608,7 @@ isc_task_sendtoanddetach(isc_task_t **taskp, isc_event_t **eventp, int c) static unsigned int dequeue_events(isc__task_t *task, void *sender, isc_eventtype_t first, isc_eventtype_t last, void *tag, isc_eventlist_t *events, - bool purging) -{ + bool purging) { isc_event_t *event, *next_event; unsigned int count = 0; @@ -654,7 +632,8 @@ dequeue_events(isc__task_t *task, void *sender, isc_eventtype_t first, if (event->ev_type >= first && event->ev_type <= last && (sender == NULL || event->ev_sender == sender) && (tag == NULL || event->ev_tag == tag) && - (!purging || PURGE_OK(event))) { + (!purging || PURGE_OK(event))) + { DEQUEUE(task->events, event, ev_link); task->nevents--; ENQUEUE(*events, event, ev_link); @@ -669,12 +648,11 @@ dequeue_events(isc__task_t *task, void *sender, isc_eventtype_t first, unsigned int isc_task_purgerange(isc_task_t *task0, void *sender, isc_eventtype_t first, - isc_eventtype_t last, void *tag) -{ - isc__task_t * task = (isc__task_t *)task0; - unsigned int count; + isc_eventtype_t last, void *tag) { + isc__task_t *task = (isc__task_t *)task0; + unsigned int count; isc_eventlist_t events; - isc_event_t * event, *next_event; + isc_event_t *event, *next_event; REQUIRE(VALID_TASK(task)); /* @@ -701,8 +679,8 @@ isc_task_purgerange(isc_task_t *task0, void *sender, isc_eventtype_t first, } unsigned int -isc_task_purge(isc_task_t *task, void *sender, isc_eventtype_t type, void *tag) -{ +isc_task_purge(isc_task_t *task, void *sender, isc_eventtype_t type, + void *tag) { /* * Purge events from a task's event queue. */ @@ -714,8 +692,7 @@ isc_task_purge(isc_task_t *task, void *sender, isc_eventtype_t type, void *tag) } bool -isc_task_purgeevent(isc_task_t *task0, isc_event_t *event) -{ +isc_task_purgeevent(isc_task_t *task0, isc_event_t *event) { isc__task_t *task = (isc__task_t *)task0; isc_event_t *curr_event, *next_event; @@ -739,7 +716,8 @@ isc_task_purgeevent(isc_task_t *task0, isc_event_t *event) LOCK(&task->lock); for (curr_event = HEAD(task->events); curr_event != NULL; - curr_event = next_event) { + curr_event = next_event) + { next_event = NEXT(curr_event, ev_link); if (curr_event == event && PURGE_OK(event)) { DEQUEUE(task->events, curr_event, ev_link); @@ -760,8 +738,7 @@ isc_task_purgeevent(isc_task_t *task0, isc_event_t *event) unsigned int isc_task_unsendrange(isc_task_t *task, void *sender, isc_eventtype_t first, - isc_eventtype_t last, void *tag, isc_eventlist_t *events) -{ + isc_eventtype_t last, void *tag, isc_eventlist_t *events) { /* * Remove events from a task's event queue. */ @@ -775,8 +752,7 @@ isc_task_unsendrange(isc_task_t *task, void *sender, isc_eventtype_t first, unsigned int isc_task_unsend(isc_task_t *task, void *sender, isc_eventtype_t type, void *tag, - isc_eventlist_t *events) -{ + isc_eventlist_t *events) { /* * Remove events from a task's event queue. */ @@ -788,10 +764,9 @@ isc_task_unsend(isc_task_t *task, void *sender, isc_eventtype_t type, void *tag, } isc_result_t -isc_task_onshutdown(isc_task_t *task0, isc_taskaction_t action, void *arg) -{ +isc_task_onshutdown(isc_task_t *task0, isc_taskaction_t action, void *arg) { isc__task_t *task = (isc__task_t *)task0; - bool disallowed = false; + bool disallowed = false; isc_result_t result = ISC_R_SUCCESS; isc_event_t *event; @@ -824,10 +799,9 @@ isc_task_onshutdown(isc_task_t *task0, isc_taskaction_t action, void *arg) } void -isc_task_shutdown(isc_task_t *task0) -{ +isc_task_shutdown(isc_task_t *task0) { isc__task_t *task = (isc__task_t *)task0; - bool was_idle; + bool was_idle; /* * Shutdown 'task'. @@ -845,8 +819,7 @@ isc_task_shutdown(isc_task_t *task0) } void -isc_task_destroy(isc_task_t **taskp) -{ +isc_task_destroy(isc_task_t **taskp) { /* * Destroy '*taskp'. */ @@ -858,8 +831,7 @@ isc_task_destroy(isc_task_t **taskp) } void -isc_task_setname(isc_task_t *task0, const char *name, void *tag) -{ +isc_task_setname(isc_task_t *task0, const char *name, void *tag) { isc__task_t *task = (isc__task_t *)task0; /* @@ -875,8 +847,7 @@ isc_task_setname(isc_task_t *task0, const char *name, void *tag) } const char * -isc_task_getname(isc_task_t *task0) -{ +isc_task_getname(isc_task_t *task0) { isc__task_t *task = (isc__task_t *)task0; REQUIRE(VALID_TASK(task)); @@ -885,8 +856,7 @@ isc_task_getname(isc_task_t *task0) } void * -isc_task_gettag(isc_task_t *task0) -{ +isc_task_gettag(isc_task_t *task0) { isc__task_t *task = (isc__task_t *)task0; REQUIRE(VALID_TASK(task)); @@ -895,8 +865,7 @@ isc_task_gettag(isc_task_t *task0) } void -isc_task_getcurrenttime(isc_task_t *task0, isc_stdtime_t *t) -{ +isc_task_getcurrenttime(isc_task_t *task0, isc_stdtime_t *t) { isc__task_t *task = (isc__task_t *)task0; REQUIRE(VALID_TASK(task)); @@ -908,8 +877,7 @@ isc_task_getcurrenttime(isc_task_t *task0, isc_stdtime_t *t) } void -isc_task_getcurrenttimex(isc_task_t *task0, isc_time_t *t) -{ +isc_task_getcurrenttimex(isc_task_t *task0, isc_time_t *t) { isc__task_t *task = (isc__task_t *)task0; REQUIRE(VALID_TASK(task)); @@ -932,8 +900,7 @@ isc_task_getcurrenttimex(isc_task_t *task0, isc_time_t *t) * Caller must hold the task manager lock. */ static inline bool -empty_readyq(isc__taskmgr_t *manager, int c) -{ +empty_readyq(isc__taskmgr_t *manager, int c) { isc__tasklist_t queue; if (atomic_load_relaxed(&manager->mode) == isc_taskmgrmode_normal) { @@ -953,8 +920,7 @@ empty_readyq(isc__taskmgr_t *manager, int c) * Caller must hold the task manager lock. */ static inline isc__task_t * -pop_readyq(isc__taskmgr_t *manager, int c) -{ +pop_readyq(isc__taskmgr_t *manager, int c) { isc__task_t *task; if (atomic_load_relaxed(&manager->mode) == isc_taskmgrmode_normal) { @@ -981,8 +947,7 @@ pop_readyq(isc__taskmgr_t *manager, int c) * Caller must hold the task manager lock. */ static inline void -push_readyq(isc__taskmgr_t *manager, isc__task_t *task, int c) -{ +push_readyq(isc__taskmgr_t *manager, isc__task_t *task, int c) { ENQUEUE(manager->queues[c].ready_tasks, task, ready_link); if (TASK_PRIVILEGED(task)) { ENQUEUE(manager->queues[c].ready_priority_tasks, task, @@ -993,8 +958,7 @@ push_readyq(isc__taskmgr_t *manager, isc__task_t *task, int c) } static void -dispatch(isc__taskmgr_t *manager, unsigned int threadid) -{ +dispatch(isc__taskmgr_t *manager, unsigned int threadid) { isc__task_t *task; REQUIRE(VALID_MANAGER(manager)); @@ -1068,7 +1032,8 @@ dispatch(isc__taskmgr_t *manager, unsigned int threadid) while ((empty_readyq(manager, threadid) && !atomic_load_relaxed(&manager->pause_req) && !atomic_load_relaxed(&manager->exclusive_req)) && - !FINISHED(manager)) { + !FINISHED(manager)) + { XTHREADTRACE("wait"); XTHREADTRACE(atomic_load_relaxed(&manager->pause_req) ? "paused" @@ -1084,7 +1049,8 @@ dispatch(isc__taskmgr_t *manager, unsigned int threadid) XTHREADTRACE("working"); if (atomic_load_relaxed(&manager->pause_req) || - atomic_load_relaxed(&manager->exclusive_req)) { + atomic_load_relaxed(&manager->exclusive_req)) + { UNLOCK(&manager->queues[threadid].lock); XTHREADTRACE("halting"); @@ -1105,7 +1071,8 @@ dispatch(isc__taskmgr_t *manager, unsigned int threadid) manager->halted++; BROADCAST(&manager->halt_cond); while (atomic_load_relaxed(&manager->pause_req) || - atomic_load_relaxed(&manager->exclusive_req)) { + atomic_load_relaxed(&manager->exclusive_req)) + { WAIT(&manager->halt_cond, &manager->halt_lock); } manager->halted--; @@ -1120,9 +1087,9 @@ dispatch(isc__taskmgr_t *manager, unsigned int threadid) task = pop_readyq(manager, threadid); if (task != NULL) { unsigned int dispatch_count = 0; - bool done = false; - bool requeue = false; - bool finished = false; + bool done = false; + bool requeue = false; + bool finished = false; isc_event_t *event; INSIST(VALID_TASK(task)); @@ -1171,7 +1138,8 @@ dispatch(isc__taskmgr_t *manager, unsigned int threadid) if (isc_refcount_current(&task->references) == 0 && EMPTY(task->events) && - !TASK_SHUTTINGDOWN(task)) { + !TASK_SHUTTINGDOWN(task)) + { bool was_idle; /* @@ -1296,7 +1264,8 @@ dispatch(isc__taskmgr_t *manager, unsigned int threadid) if (atomic_load_relaxed(&manager->mode) != isc_taskmgrmode_normal && atomic_load_explicit(&manager->tasks_running, - memory_order_acquire) == 0) { + memory_order_acquire) == 0) + { UNLOCK(&manager->queues[threadid].lock); LOCK(&manager->lock); /* @@ -1309,11 +1278,12 @@ dispatch(isc__taskmgr_t *manager, unsigned int threadid) if (atomic_load(&manager->mode) != isc_taskmgrmode_normal && atomic_load_explicit(&manager->tasks_running, - memory_order_acquire) == 0) { - bool empty = true; + memory_order_acquire) == 0) + { + bool empty = true; unsigned int i; - for (i = 0; i < manager->workers && empty; - i++) { + for (i = 0; i < manager->workers && empty; i++) + { LOCK(&manager->queues[i].lock); empty &= empty_readyq(manager, i); UNLOCK(&manager->queues[i].lock); @@ -1340,11 +1310,10 @@ static isc_threadresult_t #ifdef _WIN32 WINAPI #endif /* ifdef _WIN32 */ - run(void *queuep) -{ + run(void *queuep) { isc__taskqueue_t *tq = queuep; - isc__taskmgr_t * manager = tq->manager; - int threadid = tq->threadid; + isc__taskmgr_t *manager = tq->manager; + int threadid = tq->threadid; isc_thread_setaffinity(threadid); XTHREADTRACE("starting"); @@ -1361,8 +1330,7 @@ static isc_threadresult_t } static void -manager_free(isc__taskmgr_t *manager) -{ +manager_free(isc__taskmgr_t *manager) { for (unsigned int i = 0; i < manager->workers; i++) { isc_mutex_destroy(&manager->queues[i].lock); } @@ -1378,9 +1346,8 @@ manager_free(isc__taskmgr_t *manager) isc_result_t isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers, unsigned int default_quantum, isc_nm_t *nm, - isc_taskmgr_t **managerp) -{ - unsigned int i; + isc_taskmgr_t **managerp) { + unsigned int i; isc__taskmgr_t *manager; /* @@ -1454,12 +1421,11 @@ isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers, } void -isc_taskmgr_destroy(isc_taskmgr_t **managerp) -{ +isc_taskmgr_destroy(isc_taskmgr_t **managerp) { isc__taskmgr_t *manager; - isc__task_t * task; - unsigned int i; - bool exiting; + isc__task_t *task; + unsigned int i; + bool exiting; /* * Destroy '*managerp'. @@ -1516,8 +1482,8 @@ isc_taskmgr_destroy(isc_taskmgr_t **managerp) * posted). To make things easier post idle tasks to worker 0. */ LOCK(&manager->queues[0].lock); - for (task = HEAD(manager->tasks); task != NULL; - task = NEXT(task, link)) { + for (task = HEAD(manager->tasks); task != NULL; task = NEXT(task, link)) + { LOCK(&task->lock); if (task_shutdown(task)) { task->threadid = 0; @@ -1555,28 +1521,26 @@ isc_taskmgr_destroy(isc_taskmgr_t **managerp) } void -isc_taskmgr_setprivilegedmode(isc_taskmgr_t *manager0) -{ +isc_taskmgr_setprivilegedmode(isc_taskmgr_t *manager0) { isc__taskmgr_t *manager = (isc__taskmgr_t *)manager0; atomic_store(&manager->mode, isc_taskmgrmode_privileged); } isc_taskmgrmode_t -isc_taskmgr_mode(isc_taskmgr_t *manager0) -{ +isc_taskmgr_mode(isc_taskmgr_t *manager0) { isc__taskmgr_t *manager = (isc__taskmgr_t *)manager0; return (atomic_load(&manager->mode)); } void -isc__taskmgr_pause(isc_taskmgr_t *manager0) -{ +isc__taskmgr_pause(isc_taskmgr_t *manager0) { isc__taskmgr_t *manager = (isc__taskmgr_t *)manager0; LOCK(&manager->halt_lock); while (atomic_load_relaxed(&manager->exclusive_req) || - atomic_load_relaxed(&manager->pause_req)) { + atomic_load_relaxed(&manager->pause_req)) + { UNLOCK(&manager->halt_lock); /* This is ugly but pause is used EXCLUSIVELY in tests */ isc_thread_yield(); @@ -1592,8 +1556,7 @@ isc__taskmgr_pause(isc_taskmgr_t *manager0) } void -isc__taskmgr_resume(isc_taskmgr_t *manager0) -{ +isc__taskmgr_resume(isc_taskmgr_t *manager0) { isc__taskmgr_t *manager = (isc__taskmgr_t *)manager0; LOCK(&manager->halt_lock); if (atomic_load(&manager->pause_req)) { @@ -1607,10 +1570,9 @@ isc__taskmgr_resume(isc_taskmgr_t *manager0) } void -isc_taskmgr_setexcltask(isc_taskmgr_t *mgr0, isc_task_t *task0) -{ +isc_taskmgr_setexcltask(isc_taskmgr_t *mgr0, isc_task_t *task0) { isc__taskmgr_t *mgr = (isc__taskmgr_t *)mgr0; - isc__task_t * task = (isc__task_t *)task0; + isc__task_t *task = (isc__task_t *)task0; REQUIRE(VALID_MANAGER(mgr)); REQUIRE(VALID_TASK(task)); @@ -1623,10 +1585,9 @@ 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) -{ +isc_taskmgr_excltask(isc_taskmgr_t *mgr0, isc_task_t **taskp) { isc__taskmgr_t *mgr = (isc__taskmgr_t *)mgr0; - isc_result_t result = ISC_R_SUCCESS; + isc_result_t result = ISC_R_SUCCESS; REQUIRE(VALID_MANAGER(mgr)); REQUIRE(taskp != NULL && *taskp == NULL); @@ -1643,9 +1604,8 @@ isc_taskmgr_excltask(isc_taskmgr_t *mgr0, isc_task_t **taskp) } isc_result_t -isc_task_beginexclusive(isc_task_t *task0) -{ - isc__task_t * task = (isc__task_t *)task0; +isc_task_beginexclusive(isc_task_t *task0) { + isc__task_t *task = (isc__task_t *)task0; isc__taskmgr_t *manager; REQUIRE(VALID_TASK(task)); @@ -1661,7 +1621,8 @@ isc_task_beginexclusive(isc_task_t *task0) UNLOCK(&manager->excl_lock); if (atomic_load_relaxed(&manager->exclusive_req) || - atomic_load_relaxed(&manager->pause_req)) { + atomic_load_relaxed(&manager->pause_req)) + { return (ISC_R_LOCKBUSY); } @@ -1681,9 +1642,8 @@ isc_task_beginexclusive(isc_task_t *task0) } void -isc_task_endexclusive(isc_task_t *task0) -{ - isc__task_t * task = (isc__task_t *)task0; +isc_task_endexclusive(isc_task_t *task0) { + isc__task_t *task = (isc__task_t *)task0; isc__taskmgr_t *manager; REQUIRE(VALID_TASK(task)); @@ -1704,12 +1664,11 @@ isc_task_endexclusive(isc_task_t *task0) } void -isc_task_pause(isc_task_t *task0) -{ +isc_task_pause(isc_task_t *task0) { REQUIRE(ISCAPI_TASK_VALID(task0)); - isc__task_t * task = (isc__task_t *)task0; + isc__task_t *task = (isc__task_t *)task0; isc__taskmgr_t *manager = task->manager; - bool running = false; + bool running = false; LOCK(&task->lock); INSIST(task->state == task_state_idle || @@ -1736,10 +1695,9 @@ isc_task_pause(isc_task_t *task0) } void -isc_task_unpause(isc_task_t *task0) -{ +isc_task_unpause(isc_task_t *task0) { isc__task_t *task = (isc__task_t *)task0; - bool was_idle = false; + bool was_idle = false; REQUIRE(ISCAPI_TASK_VALID(task0)); @@ -1764,12 +1722,11 @@ isc_task_unpause(isc_task_t *task0) } void -isc_task_setprivilege(isc_task_t *task0, bool priv) -{ +isc_task_setprivilege(isc_task_t *task0, bool priv) { REQUIRE(ISCAPI_TASK_VALID(task0)); - isc__task_t * task = (isc__task_t *)task0; + isc__task_t *task = (isc__task_t *)task0; isc__taskmgr_t *manager = task->manager; - uint_fast32_t oldflags, newflags; + uint_fast32_t oldflags, newflags; oldflags = atomic_load_acquire(&task->flags); do { @@ -1796,8 +1753,7 @@ isc_task_setprivilege(isc_task_t *task0, bool priv) } bool -isc_task_privilege(isc_task_t *task0) -{ +isc_task_privilege(isc_task_t *task0) { isc__task_t *task = (isc__task_t *)task0; REQUIRE(VALID_TASK(task)); @@ -1805,8 +1761,7 @@ isc_task_privilege(isc_task_t *task0) } bool -isc_task_exiting(isc_task_t *t) -{ +isc_task_exiting(isc_task_t *t) { isc__task_t *task = (isc__task_t *)t; REQUIRE(VALID_TASK(task)); @@ -1821,11 +1776,10 @@ isc_task_exiting(isc_task_t *t) goto error; \ } while (0) int -isc_taskmgr_renderxml(isc_taskmgr_t *mgr0, void *writer0) -{ - isc__taskmgr_t * mgr = (isc__taskmgr_t *)mgr0; - isc__task_t * task = NULL; - int xmlrc; +isc_taskmgr_renderxml(isc_taskmgr_t *mgr0, void *writer0) { + isc__taskmgr_t *mgr = (isc__taskmgr_t *)mgr0; + isc__task_t *task = NULL; + int xmlrc; xmlTextWriterPtr writer = (xmlTextWriterPtr)writer0; LOCK(&mgr->lock); @@ -1932,13 +1886,12 @@ error: } while (0) isc_result_t -isc_taskmgr_renderjson(isc_taskmgr_t *mgr0, void *tasks0) -{ - isc_result_t result = ISC_R_SUCCESS; +isc_taskmgr_renderjson(isc_taskmgr_t *mgr0, void *tasks0) { + isc_result_t result = ISC_R_SUCCESS; isc__taskmgr_t *mgr = (isc__taskmgr_t *)mgr0; - isc__task_t * task = NULL; - json_object * obj = NULL, *array = NULL, *taskobj = NULL; - json_object * tasks = (json_object *)tasks0; + isc__task_t *task = NULL; + json_object *obj = NULL, *array = NULL, *taskobj = NULL; + json_object *tasks = (json_object *)tasks0; LOCK(&mgr->lock); @@ -1974,7 +1927,8 @@ isc_taskmgr_renderjson(isc_taskmgr_t *mgr0, void *tasks0) CHECKMEM(array); for (task = ISC_LIST_HEAD(mgr->tasks); task != NULL; - task = ISC_LIST_NEXT(task, link)) { + task = ISC_LIST_NEXT(task, link)) + { char buf[255]; LOCK(&task->lock); @@ -2034,8 +1988,8 @@ error: isc_result_t isc_taskmgr_createinctx(isc_mem_t *mctx, unsigned int workers, - unsigned int default_quantum, isc_taskmgr_t **managerp) -{ + unsigned int default_quantum, + isc_taskmgr_t **managerp) { isc_result_t result; result = isc_taskmgr_create(mctx, workers, default_quantum, NULL, diff --git a/lib/isc/taskpool.c b/lib/isc/taskpool.c index 35a6f68d6b..a00ec2eb60 100644 --- a/lib/isc/taskpool.c +++ b/lib/isc/taskpool.c @@ -23,11 +23,11 @@ ***/ struct isc_taskpool { - isc_mem_t * mctx; + isc_mem_t *mctx; isc_taskmgr_t *tmgr; - unsigned int ntasks; - unsigned int quantum; - isc_task_t ** tasks; + unsigned int ntasks; + unsigned int quantum; + isc_task_t **tasks; }; /*** @@ -36,10 +36,9 @@ struct isc_taskpool { static void alloc_pool(isc_taskmgr_t *tmgr, isc_mem_t *mctx, unsigned int ntasks, - unsigned int quantum, isc_taskpool_t **poolp) -{ + unsigned int quantum, isc_taskpool_t **poolp) { isc_taskpool_t *pool; - unsigned int i; + unsigned int i; pool = isc_mem_get(mctx, sizeof(*pool)); @@ -58,11 +57,10 @@ alloc_pool(isc_taskmgr_t *tmgr, isc_mem_t *mctx, unsigned int ntasks, isc_result_t isc_taskpool_create(isc_taskmgr_t *tmgr, isc_mem_t *mctx, unsigned int ntasks, - unsigned int quantum, isc_taskpool_t **poolp) -{ - unsigned int i; + unsigned int quantum, isc_taskpool_t **poolp) { + unsigned int i; isc_taskpool_t *pool = NULL; - isc_result_t result; + isc_result_t result; INSIST(ntasks > 0); @@ -84,23 +82,20 @@ isc_taskpool_create(isc_taskmgr_t *tmgr, isc_mem_t *mctx, unsigned int ntasks, } void -isc_taskpool_gettask(isc_taskpool_t *pool, isc_task_t **targetp) -{ +isc_taskpool_gettask(isc_taskpool_t *pool, isc_task_t **targetp) { isc_task_attach(pool->tasks[isc_random_uniform(pool->ntasks)], targetp); } int -isc_taskpool_size(isc_taskpool_t *pool) -{ +isc_taskpool_size(isc_taskpool_t *pool) { REQUIRE(pool != NULL); return (pool->ntasks); } isc_result_t isc_taskpool_expand(isc_taskpool_t **sourcep, unsigned int size, - isc_taskpool_t **targetp) -{ - isc_result_t result; + isc_taskpool_t **targetp) { + isc_result_t result; isc_taskpool_t *pool; REQUIRE(sourcep != NULL && *sourcep != NULL); @@ -110,7 +105,7 @@ isc_taskpool_expand(isc_taskpool_t **sourcep, unsigned int size, *sourcep = NULL; if (size > pool->ntasks) { isc_taskpool_t *newpool = NULL; - unsigned int i; + unsigned int i; /* Allocate a new pool structure */ alloc_pool(pool->tmgr, pool->mctx, size, pool->quantum, @@ -143,9 +138,8 @@ isc_taskpool_expand(isc_taskpool_t **sourcep, unsigned int size, } void -isc_taskpool_destroy(isc_taskpool_t **poolp) -{ - unsigned int i; +isc_taskpool_destroy(isc_taskpool_t **poolp) { + unsigned int i; isc_taskpool_t *pool = *poolp; *poolp = NULL; for (i = 0; i < pool->ntasks; i++) { @@ -159,8 +153,7 @@ isc_taskpool_destroy(isc_taskpool_t **poolp) } void -isc_taskpool_setprivilege(isc_taskpool_t *pool, bool priv) -{ +isc_taskpool_setprivilege(isc_taskpool_t *pool, bool priv) { unsigned int i; REQUIRE(pool != NULL); diff --git a/lib/isc/tests/aes_test.c b/lib/isc/tests/aes_test.c index 9a1e0b6d30..96a51cf295 100644 --- a/lib/isc/tests/aes_test.c +++ b/lib/isc/tests/aes_test.c @@ -33,21 +33,18 @@ * 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]; -char str[2 * ISC_AES_BLOCK_LENGTH + 1]; +char str[2 * ISC_AES_BLOCK_LENGTH + 1]; unsigned char key[ISC_AES256_KEYLENGTH + 1]; -size_t len; +size_t len; isc_result_t -tohexstr(unsigned char *d, char *out) -{ +tohexstr(unsigned char *d, char *out) { isc_buffer_t b; isc_region_t r; @@ -58,8 +55,7 @@ tohexstr(unsigned char *d, char *out) } size_t -fromhexstr(const char *in, unsigned char *d) -{ +fromhexstr(const char *in, unsigned char *d) { isc_buffer_t b; isc_result_t ret; @@ -79,8 +75,7 @@ typedef struct aes_testcase { /* AES 128 test vectors */ static void -isc_aes128_test(void **state) -{ +isc_aes128_test(void **state) { aes_testcase_t testcases[] = { /* Test 1 (KAT ECBVarTxt128 #3) */ { "00000000000000000000000000000000", "F0000000000000000000000000000000", @@ -127,8 +122,7 @@ isc_aes128_test(void **state) /* AES 192 test vectors */ static void -isc_aes192_test(void **state) -{ +isc_aes192_test(void **state) { aes_testcase_t testcases[] = { /* Test 1 (KAT ECBVarTxt192 #3) */ { "000000000000000000000000000000000000000000000000", @@ -176,8 +170,7 @@ isc_aes192_test(void **state) /* AES 256 test vectors */ static void -isc_aes256_test(void **state) -{ +isc_aes256_test(void **state) { aes_testcase_t testcases[] = { /* Test 1 (KAT ECBVarTxt256 #3) */ { "00000000000000000000000000000000" "00000000000000000000000000000000", @@ -229,8 +222,7 @@ isc_aes256_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(isc_aes128_test), cmocka_unit_test(isc_aes192_test), @@ -245,8 +237,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/buffer_test.c b/lib/isc/tests/buffer_test.c index 873b1aab7f..63fa053149 100644 --- a/lib/isc/tests/buffer_test.c +++ b/lib/isc/tests/buffer_test.c @@ -35,8 +35,7 @@ #include "isctest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -48,8 +47,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); isc_test_end(); @@ -59,9 +57,8 @@ _teardown(void **state) /* reserve space in dynamic buffers */ static void -isc_buffer_reserve_test(void **state) -{ - isc_result_t result; +isc_buffer_reserve_test(void **state) { + isc_result_t result; isc_buffer_t *b; UNUSED(state); @@ -127,11 +124,10 @@ isc_buffer_reserve_test(void **state) /* dynamic buffer automatic reallocation */ static void -isc_buffer_dynamic_test(void **state) -{ +isc_buffer_dynamic_test(void **state) { isc_buffer_t *b; - size_t last_length = 10; - int i; + size_t last_length = 10; + int i; UNUSED(state); @@ -181,11 +177,10 @@ isc_buffer_dynamic_test(void **state) /* copy a region into a buffer */ static void -isc_buffer_copyregion_test(void **state) -{ +isc_buffer_copyregion_test(void **state) { unsigned char data[] = { 0x11, 0x22, 0x33, 0x44 }; isc_buffer_t *b = NULL; - isc_result_t result; + isc_result_t result; isc_region_t r = { .base = data, @@ -220,13 +215,12 @@ isc_buffer_copyregion_test(void **state) /* sprintf() into a buffer */ static void -isc_buffer_printf_test(void **state) -{ - unsigned int used, prev_used; - const char * empty_fmt; - isc_result_t result; +isc_buffer_printf_test(void **state) { + unsigned int used, prev_used; + const char *empty_fmt; + isc_result_t result; isc_buffer_t *b, sb; - char buf[8]; + char buf[8]; UNUSED(state); @@ -327,8 +321,7 @@ isc_buffer_printf_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(isc_buffer_reserve_test, _setup, _teardown), @@ -348,8 +341,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/counter_test.c b/lib/isc/tests/counter_test.c index 9c0efb809b..d77d9d4c1f 100644 --- a/lib/isc/tests/counter_test.c +++ b/lib/isc/tests/counter_test.c @@ -28,8 +28,7 @@ #include "isctest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -41,8 +40,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); isc_test_end(); @@ -52,11 +50,10 @@ _teardown(void **state) /* test isc_counter object */ static void -isc_counter_test(void **state) -{ - isc_result_t result; +isc_counter_test(void **state) { + isc_result_t result; isc_counter_t *counter = NULL; - int i; + int i; UNUSED(state); @@ -84,8 +81,7 @@ isc_counter_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(isc_counter_test, _setup, _teardown), @@ -99,8 +95,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/crc64_test.c b/lib/isc/tests/crc64_test.c index 94720d92e2..55c688edc9 100644 --- a/lib/isc/tests/crc64_test.c +++ b/lib/isc/tests/crc64_test.c @@ -31,14 +31,13 @@ typedef struct hash_testcase { const char *input; - size_t input_len; + size_t input_len; const char *result; - int repeats; + int repeats; } hash_testcase_t; static void -isc_crc64_init_test(void **state) -{ +isc_crc64_init_test(void **state) { uint64_t crc; UNUSED(state); @@ -48,8 +47,7 @@ isc_crc64_init_test(void **state) } static void -_crc64(const char *buf, size_t buflen, const char *result, const int repeats) -{ +_crc64(const char *buf, size_t buflen, const char *result, const int repeats) { uint64_t crc; isc_crc64_init(&crc); @@ -69,8 +67,7 @@ _crc64(const char *buf, size_t buflen, const char *result, const int repeats) /* 64-bit cyclic redundancy check */ static void -isc_crc64_test(void **state) -{ +isc_crc64_test(void **state) { UNUSED(state); _crc64(TEST_INPUT(""), "0000000000000000", 1); @@ -87,8 +84,7 @@ isc_crc64_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(isc_crc64_init_test), cmocka_unit_test(isc_crc64_test), @@ -102,8 +98,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/errno_test.c b/lib/isc/tests/errno_test.c index 122983d194..ac575fb800 100644 --- a/lib/isc/tests/errno_test.c +++ b/lib/isc/tests/errno_test.c @@ -26,7 +26,7 @@ #include typedef struct { - int err; + int err; isc_result_t result; } testpair_t; @@ -86,10 +86,9 @@ testpair_t testpair[] = { { EPERM, ISC_R_NOPERM }, /* convert errno to ISC result */ static void -isc_errno_toresult_test(void **state) -{ +isc_errno_toresult_test(void **state) { isc_result_t result, expect; - size_t i; + size_t i; UNUSED(state); @@ -101,8 +100,7 @@ isc_errno_toresult_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(isc_errno_toresult_test), }; @@ -115,8 +113,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/file_test.c b/lib/isc/tests/file_test.c index c6c5004854..d24fe3c504 100644 --- a/lib/isc/tests/file_test.c +++ b/lib/isc/tests/file_test.c @@ -26,21 +26,20 @@ #include #include -#define NAME "internal" -#define SHA "3bed2cb3a3acf7b6a8ef408420cc682d5520e26976d354254f528c965612054f" +#define NAME "internal" +#define SHA "3bed2cb3a3acf7b6a8ef408420cc682d5520e26976d354254f528c965612054f" #define TRUNC_SHA "3bed2cb3a3acf7b6" -#define BAD1 "in/internal" +#define BAD1 "in/internal" #define BADHASH1 "8bbb97a888791399" -#define BAD2 "Internal" +#define BAD2 "Internal" #define BADHASH2 "2ea1842b445b0c81" #define F(x) "testdata/file/" x ".test" static void -touch(const char *filename) -{ +touch(const char *filename) { int fd; unlink(filename); @@ -52,10 +51,9 @@ touch(const char *filename) /* test sanitized filenames */ static void -isc_file_sanitize_test(void **state) -{ +isc_file_sanitize_test(void **state) { isc_result_t result; - char buf[1024]; + char buf[1024]; UNUSED(state); @@ -89,10 +87,9 @@ isc_file_sanitize_test(void **state) /* test filename templates */ static void -isc_file_template_test(void **state) -{ +isc_file_template_test(void **state) { isc_result_t result; - char buf[1024]; + char buf[1024]; UNUSED(state); @@ -122,8 +119,8 @@ isc_file_template_test(void **state) assert_int_equal(result, ISC_R_SUCCESS); assert_string_equal(buf, "/file-XXXXXXXX"); - result = - isc_file_template("noslash", "file-XXXXXXXX", buf, sizeof(buf)); + result = isc_file_template("noslash", "file-XXXXXXXX", buf, + sizeof(buf)); assert_int_equal(result, ISC_R_SUCCESS); assert_string_equal(buf, "file-XXXXXXXX"); @@ -133,8 +130,7 @@ isc_file_template_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(isc_file_sanitize_test), cmocka_unit_test(isc_file_template_test), @@ -148,8 +144,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/hash_test.c b/lib/isc/tests/hash_test.c index dd40440609..0652acbd84 100644 --- a/lib/isc/tests/hash_test.c +++ b/lib/isc/tests/hash_test.c @@ -37,8 +37,7 @@ /*Hash function test */ static void -isc_hash_function_test(void **state) -{ +isc_hash_function_test(void **state) { unsigned int h1; unsigned int h2; @@ -71,8 +70,7 @@ isc_hash_function_test(void **state) /* Hash function initializer test */ static void -isc_hash_initializer_test(void **state) -{ +isc_hash_initializer_test(void **state) { unsigned int h1; unsigned int h2; @@ -92,8 +90,7 @@ isc_hash_initializer_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(isc_hash_function_test), cmocka_unit_test(isc_hash_initializer_test), @@ -107,8 +104,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/heap_test.c b/lib/isc/tests/heap_test.c index 5f1c4a2ae9..2b144b0c3e 100644 --- a/lib/isc/tests/heap_test.c +++ b/lib/isc/tests/heap_test.c @@ -30,8 +30,7 @@ #include "isctest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -43,8 +42,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); isc_test_end(); @@ -58,8 +56,7 @@ struct e { }; static bool -compare(void *p1, void *p2) -{ +compare(void *p1, void *p2) { struct e *e1 = p1; struct e *e2 = p2; @@ -67,8 +64,7 @@ compare(void *p1, void *p2) } static void -idx(void *p, unsigned int i) -{ +idx(void *p, unsigned int i) { struct e *e = p; e->index = i; @@ -76,11 +72,10 @@ idx(void *p, unsigned int i) /* test isc_heap_delete() */ static void -isc_heap_delete_test(void **state) -{ - isc_heap_t * heap = NULL; +isc_heap_delete_test(void **state) { + isc_heap_t *heap = NULL; isc_result_t result; - struct e e1 = { 100, 0 }; + struct e e1 = { 100, 0 }; UNUSED(state); @@ -100,8 +95,7 @@ isc_heap_delete_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(isc_heap_delete_test), }; @@ -114,8 +108,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/hmac_test.c b/lib/isc/tests/hmac_test.c index 0c791ca4f6..78ffd013cc 100644 --- a/lib/isc/tests/hmac_test.c +++ b/lib/isc/tests/hmac_test.c @@ -34,8 +34,7 @@ #define TEST_INPUT(x) (x), sizeof(x) - 1 static int -_setup(void **state) -{ +_setup(void **state) { isc_hmac_t *hmac = isc_hmac_new(); if (hmac == NULL) { return (-1); @@ -45,8 +44,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { if (*state == NULL) { return (-1); } @@ -55,8 +53,7 @@ _teardown(void **state) } static int -_reset(void **state) -{ +_reset(void **state) { if (*state == NULL) { return (-1); } @@ -67,8 +64,7 @@ _reset(void **state) } static void -isc_hmac_new_test(void **state) -{ +isc_hmac_new_test(void **state) { UNUSED(state); isc_hmac_t *hmac = isc_hmac_new(); @@ -77,8 +73,7 @@ isc_hmac_new_test(void **state) } static void -isc_hmac_free_test(void **state) -{ +isc_hmac_free_test(void **state) { UNUSED(state); isc_hmac_t *hmac = isc_hmac_new(); @@ -90,8 +85,7 @@ isc_hmac_free_test(void **state) static void isc_hmac_test(isc_hmac_t *hmac, const void *key, size_t keylen, isc_md_type_t type, const char *buf, size_t buflen, - const char *result, const int repeats) -{ + const char *result, const int repeats) { assert_non_null(hmac); assert_int_equal(isc_hmac_init(hmac, key, keylen, type), ISC_R_SUCCESS); @@ -105,11 +99,11 @@ isc_hmac_test(isc_hmac_t *hmac, const void *key, size_t keylen, } unsigned char digest[ISC_MAX_MD_SIZE]; - unsigned int digestlen; + unsigned int digestlen; assert_int_equal(isc_hmac_final(hmac, digest, &digestlen), ISC_R_SUCCESS); - char hexdigest[ISC_MAX_MD_SIZE * 2 + 3]; + char hexdigest[ISC_MAX_MD_SIZE * 2 + 3]; isc_region_t r = { .base = digest, .length = digestlen }; isc_buffer_t b; isc_buffer_init(&b, hexdigest, sizeof(hexdigest)); @@ -121,8 +115,7 @@ isc_hmac_test(isc_hmac_t *hmac, const void *key, size_t keylen, } static void -isc_hmac_init_test(void **state) -{ +isc_hmac_init_test(void **state) { isc_hmac_t *hmac = *state; assert_non_null(hmac); @@ -158,8 +151,7 @@ isc_hmac_init_test(void **state) } static void -isc_hmac_update_test(void **state) -{ +isc_hmac_update_test(void **state) { isc_hmac_t *hmac = *state; assert_non_null(hmac); @@ -172,8 +164,7 @@ isc_hmac_update_test(void **state) } static void -isc_hmac_reset_test(void **state) -{ +isc_hmac_reset_test(void **state) { isc_hmac_t *hmac = *state; #if 0 unsigned char digest[ISC_MAX_MD_SIZE] __attribute((unused)); @@ -202,13 +193,12 @@ isc_hmac_reset_test(void **state) } static void -isc_hmac_final_test(void **state) -{ +isc_hmac_final_test(void **state) { isc_hmac_t *hmac = *state; assert_non_null(hmac); unsigned char digest[ISC_MAX_MD_SIZE]; - unsigned int digestlen; + unsigned int digestlen; /* Fail when message digest context is empty */ expect_assert_failure(isc_hmac_final(NULL, digest, &digestlen)); @@ -221,8 +211,7 @@ isc_hmac_final_test(void **state) } static void -isc_hmac_md5_test(void **state) -{ +isc_hmac_md5_test(void **state) { isc_hmac_t *hmac = *state; /* Test 0 */ @@ -320,8 +309,7 @@ isc_hmac_md5_test(void **state) } static void -isc_hmac_sha1_test(void **state) -{ +isc_hmac_sha1_test(void **state) { isc_hmac_t *hmac = *state; /* Test 0 */ @@ -405,8 +393,7 @@ isc_hmac_sha1_test(void **state) } static void -isc_hmac_sha224_test(void **state) -{ +isc_hmac_sha224_test(void **state) { isc_hmac_t *hmac = *state; /* Test 0 */ @@ -530,8 +517,7 @@ isc_hmac_sha224_test(void **state) } static void -isc_hmac_sha256_test(void **state) -{ +isc_hmac_sha256_test(void **state) { isc_hmac_t *hmac = *state; /* Test 0 */ @@ -655,8 +641,7 @@ isc_hmac_sha256_test(void **state) } static void -isc_hmac_sha384_test(void **state) -{ +isc_hmac_sha384_test(void **state) { isc_hmac_t *hmac = *state; /* Test 0 */ @@ -786,8 +771,7 @@ isc_hmac_sha384_test(void **state) } static void -isc_hmac_sha512_test(void **state) -{ +isc_hmac_sha512_test(void **state) { isc_hmac_t *hmac = *state; /* Test 0 */ @@ -918,8 +902,7 @@ isc_hmac_sha512_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { /* isc_hmac_new() */ cmocka_unit_test(isc_hmac_new_test), @@ -956,8 +939,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/ht_test.c b/lib/isc/tests/ht_test.c index 2fc05a0087..4c07c02730 100644 --- a/lib/isc/tests/ht_test.c +++ b/lib/isc/tests/ht_test.c @@ -33,8 +33,7 @@ #include "isctest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -46,8 +45,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); isc_test_end(); @@ -56,11 +54,10 @@ _teardown(void **state) } static void -test_ht_full(int bits, uintptr_t count) -{ - isc_ht_t * ht = NULL; +test_ht_full(int bits, uintptr_t count) { + isc_ht_t *ht = NULL; isc_result_t result; - uintptr_t i; + uintptr_t i; result = isc_ht_init(&ht, test_mctx, bits); assert_int_equal(result, ISC_R_SUCCESS); @@ -80,7 +77,7 @@ test_ht_full(int bits, uintptr_t count) for (i = 1; i < count; i++) { unsigned char key[16]; - void * f = NULL; + void *f = NULL; snprintf((char *)key, sizeof(key), "%u", (unsigned int)i); strlcat((char *)key, " key of a raw hashtable!!", sizeof(key)); result = isc_ht_find(ht, key, 16, &f); @@ -111,7 +108,7 @@ test_ht_full(int bits, uintptr_t count) for (i = 1; i < count; i++) { unsigned char key[16]; - void * f = NULL; + void *f = NULL; /* * Note: case of KEY is now in capitals, */ @@ -123,7 +120,7 @@ test_ht_full(int bits, uintptr_t count) } for (i = 1; i < count; i++) { - char key[64]; + char key[64]; void *f = NULL; snprintf((char *)key, sizeof(key), "%u", (unsigned int)i); strlcat((char *)key, " key of a raw hashtable!!", sizeof(key)); @@ -135,7 +132,7 @@ test_ht_full(int bits, uintptr_t count) for (i = 1; i < count; i++) { unsigned char key[16]; - void * f = NULL; + void *f = NULL; snprintf((char *)key, sizeof(key), "%u", (unsigned int)i); strlcat((char *)key, " key of a raw hashtable!!", sizeof(key)); result = isc_ht_delete(ht, key, 16); @@ -157,7 +154,7 @@ test_ht_full(int bits, uintptr_t count) } for (i = 1; i < count; i++) { - char key[64]; + char key[64]; void *f = NULL; snprintf((char *)key, sizeof(key), "%u", (unsigned int)i); strlcat((char *)key, " key of a raw hashtable!!", sizeof(key)); @@ -172,7 +169,7 @@ test_ht_full(int bits, uintptr_t count) for (i = 1; i < count; i++) { unsigned char key[16]; - void * f = NULL; + void *f = NULL; /* * Note: case of KEY is now in capitals, */ @@ -185,7 +182,7 @@ test_ht_full(int bits, uintptr_t count) for (i = 1; i < count; i++) { unsigned char key[16]; - void * f = NULL; + void *f = NULL; snprintf((char *)key, sizeof(key), "%u", (unsigned int)i); strlcat((char *)key, " key of a raw hashtable!!", sizeof(key)); result = isc_ht_find(ht, key, 16, &f); @@ -198,16 +195,15 @@ test_ht_full(int bits, uintptr_t count) } static void -test_ht_iterator() -{ - isc_ht_t * ht = NULL; - isc_result_t result; +test_ht_iterator() { + isc_ht_t *ht = NULL; + isc_result_t result; isc_ht_iter_t *iter = NULL; - uintptr_t i; - uintptr_t count = 10000; - uint32_t walked; - unsigned char key[16]; - size_t tksize; + uintptr_t i; + uintptr_t count = 10000; + uint32_t walked; + unsigned char key[16]; + size_t tksize; result = isc_ht_init(&ht, test_mctx, 16); assert_int_equal(result, ISC_R_SUCCESS); @@ -228,9 +224,10 @@ test_ht_iterator() assert_int_equal(result, ISC_R_SUCCESS); for (result = isc_ht_iter_first(iter); result == ISC_R_SUCCESS; - result = isc_ht_iter_next(iter)) { + result = isc_ht_iter_next(iter)) + { unsigned char *tkey = NULL; - void * v = NULL; + void *v = NULL; isc_ht_iter_current(iter, &v); isc_ht_iter_currentkey(iter, &tkey, &tksize); @@ -249,7 +246,7 @@ test_ht_iterator() result = isc_ht_iter_first(iter); while (result == ISC_R_SUCCESS) { unsigned char *tkey = NULL; - void * v = NULL; + void *v = NULL; isc_ht_iter_current(iter, &v); isc_ht_iter_currentkey(iter, &tkey, &tksize); @@ -273,7 +270,7 @@ test_ht_iterator() result = isc_ht_iter_first(iter); while (result == ISC_R_SUCCESS) { unsigned char *tkey = NULL; - void * v = NULL; + void *v = NULL; isc_ht_iter_current(iter, &v); isc_ht_iter_currentkey(iter, &tkey, &tksize); @@ -294,7 +291,8 @@ test_ht_iterator() walked = 0; for (result = isc_ht_iter_first(iter); result == ISC_R_SUCCESS; - result = isc_ht_iter_next(iter)) { + result = isc_ht_iter_next(iter)) + { walked++; } @@ -310,39 +308,34 @@ test_ht_iterator() /* 20 bit, 200K elements test */ static void -isc_ht_20(void **state) -{ +isc_ht_20(void **state) { UNUSED(state); test_ht_full(20, 200000); } /* 8 bit, 20000 elements crowded test */ static void -isc_ht_8(void **state) -{ +isc_ht_8(void **state) { UNUSED(state); test_ht_full(8, 20000); } /* 8 bit, 100 elements corner case test */ static void -isc_ht_1(void **state) -{ +isc_ht_1(void **state) { UNUSED(state); test_ht_full(1, 100); } /* test hashtable iterator */ static void -isc_ht_iterator_test(void **state) -{ +isc_ht_iterator_test(void **state) { UNUSED(state); test_ht_iterator(); } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(isc_ht_20), cmocka_unit_test(isc_ht_8), @@ -358,8 +351,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/isctest.c b/lib/isc/tests/isctest.c index a95ef8a697..cfc29a9ab6 100644 --- a/lib/isc/tests/isctest.c +++ b/lib/isc/tests/isctest.c @@ -28,14 +28,14 @@ #include #include -isc_mem_t * test_mctx = NULL; -isc_log_t * test_lctx = NULL; -isc_taskmgr_t * taskmgr = NULL; -isc_timermgr_t * timermgr = NULL; +isc_mem_t *test_mctx = NULL; +isc_log_t *test_lctx = NULL; +isc_taskmgr_t *taskmgr = NULL; +isc_timermgr_t *timermgr = NULL; isc_socketmgr_t *socketmgr = NULL; -isc_nm_t * netmgr = NULL; -isc_task_t * maintask = NULL; -int ncpus; +isc_nm_t *netmgr = NULL; +isc_task_t *maintask = NULL; +int ncpus; static bool test_running = false; @@ -53,8 +53,7 @@ static isc_logcategory_t categories[] = { { "", 0 }, { NULL, 0 } }; static void -cleanup_managers(void) -{ +cleanup_managers(void) { if (maintask != NULL) { isc_task_shutdown(maintask); isc_task_destroy(&maintask); @@ -74,10 +73,9 @@ cleanup_managers(void) } static isc_result_t -create_managers(unsigned int workers) -{ +create_managers(unsigned int workers) { isc_result_t result; - char * p; + char *p; if (workers == 0) { workers = isc_os_ncpus(); @@ -103,8 +101,7 @@ cleanup: } isc_result_t -isc_test_begin(FILE *logfile, bool start_managers, unsigned int workers) -{ +isc_test_begin(FILE *logfile, bool start_managers, unsigned int workers) { isc_result_t result; INSIST(!test_running); @@ -117,7 +114,7 @@ isc_test_begin(FILE *logfile, bool start_managers, unsigned int workers) if (logfile != NULL) { isc_logdestination_t destination; - isc_logconfig_t * logconfig = NULL; + isc_logconfig_t *logconfig = NULL; INSIST(test_lctx == NULL); CHECK(isc_log_create(test_mctx, &test_lctx, &logconfig)); @@ -149,8 +146,7 @@ cleanup: } void -isc_test_end(void) -{ +isc_test_end(void) { if (maintask != NULL) { isc_task_detach(&maintask); } @@ -174,8 +170,7 @@ isc_test_end(void) * Sleep for 'usec' microseconds. */ void -isc_test_nap(uint32_t usec) -{ +isc_test_nap(uint32_t usec) { #ifdef HAVE_NANOSLEEP struct timespec ts; diff --git a/lib/isc/tests/lex_test.c b/lib/isc/tests/lex_test.c index 3b23caeeea..ef81d1d03a 100644 --- a/lib/isc/tests/lex_test.c +++ b/lib/isc/tests/lex_test.c @@ -30,8 +30,7 @@ #include "isctest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -43,8 +42,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); isc_test_end(); @@ -54,12 +52,11 @@ _teardown(void **state) /* check handling of 0xff */ static void -lex_0xff(void **state) -{ +lex_0xff(void **state) { isc_result_t result; - isc_lex_t * lex = NULL; + isc_lex_t *lex = NULL; isc_buffer_t death_buf; - isc_token_t token; + isc_token_t token; unsigned char death[] = { EOF, 'A' }; @@ -82,15 +79,14 @@ lex_0xff(void **state) /* check setting of source line */ static void -lex_setline(void **state) -{ - isc_result_t result; - isc_lex_t * lex = NULL; +lex_setline(void **state) { + isc_result_t result; + isc_lex_t *lex = NULL; unsigned char text[] = "text\nto\nbe\nprocessed\nby\nlexer"; - isc_buffer_t buf; - isc_token_t token; + isc_buffer_t buf; + isc_token_t token; unsigned long line; - int i; + int i; UNUSED(state); @@ -124,8 +120,7 @@ lex_setline(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(lex_0xff), cmocka_unit_test(lex_setline), @@ -139,8 +134,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/md_test.c b/lib/isc/tests/md_test.c index 5cef8c9f0a..62d6cd163b 100644 --- a/lib/isc/tests/md_test.c +++ b/lib/isc/tests/md_test.c @@ -33,8 +33,7 @@ #define TEST_INPUT(x) (x), sizeof(x) - 1 static int -_setup(void **state) -{ +_setup(void **state) { isc_md_t *md = isc_md_new(); if (md == NULL) { return (-1); @@ -44,8 +43,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { if (*state == NULL) { return (-1); } @@ -54,8 +52,7 @@ _teardown(void **state) } static int -_reset(void **state) -{ +_reset(void **state) { if (*state == NULL) { return (-1); } @@ -66,8 +63,7 @@ _reset(void **state) } static void -isc_md_new_test(void **state) -{ +isc_md_new_test(void **state) { UNUSED(state); isc_md_t *md = isc_md_new(); @@ -76,8 +72,7 @@ isc_md_new_test(void **state) } static void -isc_md_free_test(void **state) -{ +isc_md_free_test(void **state) { UNUSED(state); isc_md_t *md = isc_md_new(); @@ -88,8 +83,7 @@ isc_md_free_test(void **state) static void isc_md_test(isc_md_t *md, isc_md_type_t type, const char *buf, size_t buflen, - const char *result, const int repeats) -{ + const char *result, const int repeats) { assert_non_null(md); assert_int_equal(isc_md_init(md, type), ISC_R_SUCCESS); @@ -102,10 +96,10 @@ isc_md_test(isc_md_t *md, isc_md_type_t type, const char *buf, size_t buflen, } unsigned char digest[ISC_MAX_MD_SIZE]; - unsigned int digestlen; + unsigned int digestlen; assert_int_equal(isc_md_final(md, digest, &digestlen), ISC_R_SUCCESS); - char hexdigest[ISC_MAX_MD_SIZE * 2 + 3]; + char hexdigest[ISC_MAX_MD_SIZE * 2 + 3]; isc_region_t r = { .base = digest, .length = digestlen }; isc_buffer_t b; isc_buffer_init(&b, hexdigest, sizeof(hexdigest)); @@ -117,8 +111,7 @@ isc_md_test(isc_md_t *md, isc_md_type_t type, const char *buf, size_t buflen, } static void -isc_md_init_test(void **state) -{ +isc_md_init_test(void **state) { isc_md_t *md = *state; assert_non_null(md); @@ -146,8 +139,7 @@ isc_md_init_test(void **state) } static void -isc_md_update_test(void **state) -{ +isc_md_update_test(void **state) { isc_md_t *md = *state; assert_non_null(md); @@ -160,8 +152,7 @@ isc_md_update_test(void **state) } static void -isc_md_reset_test(void **state) -{ +isc_md_reset_test(void **state) { isc_md_t *md = *state; #if 0 unsigned char digest[ISC_MAX_MD_SIZE] __attribute((unused)); @@ -189,13 +180,12 @@ isc_md_reset_test(void **state) } static void -isc_md_final_test(void **state) -{ +isc_md_final_test(void **state) { isc_md_t *md = *state; assert_non_null(md); unsigned char digest[ISC_MAX_MD_SIZE]; - unsigned int digestlen; + unsigned int digestlen; /* Fail when message digest context is empty */ expect_assert_failure(isc_md_final(NULL, digest, &digestlen)); @@ -207,8 +197,7 @@ isc_md_final_test(void **state) } static void -isc_md_md5_test(void **state) -{ +isc_md_md5_test(void **state) { isc_md_t *md = *state; isc_md_test(md, ISC_MD_MD5, NULL, 0, NULL, 0); isc_md_test(md, ISC_MD_MD5, TEST_INPUT(""), @@ -232,8 +221,7 @@ isc_md_md5_test(void **state) } static void -isc_md_sha1_test(void **state) -{ +isc_md_sha1_test(void **state) { isc_md_t *md = *state; isc_md_test(md, ISC_MD_SHA1, NULL, 0, NULL, 0); isc_md_test(md, ISC_MD_SHA1, TEST_INPUT(""), @@ -277,8 +265,7 @@ isc_md_sha1_test(void **state) } static void -isc_md_sha224_test(void **state) -{ +isc_md_sha224_test(void **state) { isc_md_t *md = *state; isc_md_test(md, ISC_MD_SHA224, NULL, 0, NULL, 0); @@ -338,8 +325,7 @@ isc_md_sha224_test(void **state) } static void -isc_md_sha256_test(void **state) -{ +isc_md_sha256_test(void **state) { isc_md_t *md = *state; isc_md_test(md, ISC_MD_SHA256, NULL, 0, NULL, 0); @@ -401,8 +387,7 @@ isc_md_sha256_test(void **state) } static void -isc_md_sha384_test(void **state) -{ +isc_md_sha384_test(void **state) { isc_md_t *md = *state; isc_md_test(md, ISC_MD_SHA384, NULL, 0, NULL, 0); @@ -479,8 +464,7 @@ isc_md_sha384_test(void **state) } static void -isc_md_sha512_test(void **state) -{ +isc_md_sha512_test(void **state) { isc_md_t *md = *state; isc_md_test(md, ISC_MD_SHA512, NULL, 0, NULL, 0); @@ -556,8 +540,7 @@ isc_md_sha512_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { /* isc_md_new() */ cmocka_unit_test(isc_md_new_test), @@ -594,8 +577,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/mem_test.c b/lib/isc/tests/mem_test.c index 27b0201db5..e289845471 100644 --- a/lib/isc/tests/mem_test.c +++ b/lib/isc/tests/mem_test.c @@ -37,8 +37,7 @@ #include "isctest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -50,8 +49,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); isc_test_end(); @@ -59,8 +57,8 @@ _teardown(void **state) return (0); } -#define MP1_FREEMAX 10 -#define MP1_FILLCNT 10 +#define MP1_FREEMAX 10 +#define MP1_FILLCNT 10 #define MP1_MAXALLOC 30 #define MP2_FREEMAX 25 @@ -68,14 +66,13 @@ _teardown(void **state) /* general memory system tests */ static void -isc_mem_test(void **state) -{ - void * items1[50]; - void * items2[50]; - void * tmp; +isc_mem_test(void **state) { + void *items1[50]; + void *items2[50]; + void *tmp; isc_mempool_t *mp1 = NULL, *mp2 = NULL; - unsigned int i, j; - int rval; + unsigned int i, j; + int rval; UNUSED(state); @@ -157,12 +154,11 @@ isc_mem_test(void **state) /* test TotalUse calculation */ static void -isc_mem_total_test(void **state) -{ +isc_mem_total_test(void **state) { isc_mem_t *mctx2 = NULL; - size_t before, after; - ssize_t diff; - int i; + size_t before, after; + ssize_t diff; + int i; UNUSED(state); @@ -207,12 +203,11 @@ isc_mem_total_test(void **state) /* test InUse calculation */ static void -isc_mem_inuse_test(void **state) -{ +isc_mem_inuse_test(void **state) { isc_mem_t *mctx2 = NULL; - size_t before, after; - ssize_t diff; - void * ptr; + size_t before, after; + ssize_t diff; + void *ptr; UNUSED(state); @@ -235,13 +230,12 @@ isc_mem_inuse_test(void **state) /* test mem with no flags */ static void -isc_mem_noflags_test(void **state) -{ +isc_mem_noflags_test(void **state) { isc_result_t result; - isc_mem_t * mctx2 = NULL; - char buf[4096], *p, *q; - FILE * f; - void * ptr; + isc_mem_t *mctx2 = NULL; + char buf[4096], *p, *q; + FILE *f; + void *ptr; result = isc_stdio_open("mem.output", "w", &f); assert_int_equal(result, ISC_R_SUCCESS); @@ -281,13 +275,12 @@ isc_mem_noflags_test(void **state) /* test mem with record flag */ static void -isc_mem_recordflag_test(void **state) -{ +isc_mem_recordflag_test(void **state) { isc_result_t result; - isc_mem_t * mctx2 = NULL; - char buf[4096], *p; - FILE * f; - void * ptr; + isc_mem_t *mctx2 = NULL; + char buf[4096], *p; + FILE *f; + void *ptr; result = isc_stdio_open("mem.output", "w", &f); assert_int_equal(result, ISC_R_SUCCESS); @@ -323,13 +316,12 @@ isc_mem_recordflag_test(void **state) /* test mem with trace flag */ static void -isc_mem_traceflag_test(void **state) -{ +isc_mem_traceflag_test(void **state) { isc_result_t result; - isc_mem_t * mctx2 = NULL; - char buf[4096], *p; - FILE * f; - void * ptr; + isc_mem_t *mctx2 = NULL; + char buf[4096], *p; + FILE *f; + void *ptr; /* redirect stderr so we can check trace output */ f = freopen("mem.output", "w", stderr); @@ -376,14 +368,13 @@ isc_mem_traceflag_test(void **state) #if !defined(__SANITIZE_THREAD__) -#define ITERS 512 +#define ITERS 512 #define NUM_ITEMS 1024 /* 768 */ #define ITEM_SIZE 65534 static isc_threadresult_t -mem_thread(isc_threadarg_t arg) -{ - void * items[NUM_ITEMS]; +mem_thread(isc_threadarg_t arg) { + void *items[NUM_ITEMS]; size_t size = *((size_t *)arg); for (int i = 0; i < ITERS; i++) { @@ -399,14 +390,13 @@ mem_thread(isc_threadarg_t arg) } static void -isc_mem_benchmark(void **state) -{ - int nthreads = ISC_MAX(ISC_MIN(isc_os_ncpus(), 32), 1); +isc_mem_benchmark(void **state) { + int nthreads = ISC_MAX(ISC_MIN(isc_os_ncpus(), 32), 1); isc_thread_t threads[32]; - isc_time_t ts1, ts2; - double t; + isc_time_t ts1, ts2; + double t; isc_result_t result; - size_t size = ITEM_SIZE; + size_t size = ITEM_SIZE; UNUSED(state); @@ -433,10 +423,9 @@ isc_mem_benchmark(void **state) } static isc_threadresult_t -mempool_thread(isc_threadarg_t arg) -{ +mempool_thread(isc_threadarg_t arg) { isc_mempool_t *mp = (isc_mempool_t *)arg; - void * items[NUM_ITEMS]; + void *items[NUM_ITEMS]; for (int i = 0; i < ITERS; i++) { for (int j = 0; j < NUM_ITEMS; j++) { @@ -451,16 +440,15 @@ mempool_thread(isc_threadarg_t arg) } static void -isc_mempool_benchmark(void **state) -{ - int nthreads = ISC_MAX(ISC_MIN(isc_os_ncpus(), 32), 1); - isc_thread_t threads[32]; - isc_time_t ts1, ts2; - double t; - isc_result_t result; - size_t size = ITEM_SIZE; +isc_mempool_benchmark(void **state) { + int nthreads = ISC_MAX(ISC_MIN(isc_os_ncpus(), 32), 1); + isc_thread_t threads[32]; + isc_time_t ts1, ts2; + double t; + isc_result_t result; + size_t size = ITEM_SIZE; isc_mempool_t *mp = NULL; - isc_mutex_t mplock; + isc_mutex_t mplock; isc_mutex_init(&mplock); @@ -505,8 +493,7 @@ isc_mempool_benchmark(void **state) */ int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(isc_mem_test, _setup, _teardown), @@ -544,8 +531,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/netaddr_test.c b/lib/isc/tests/netaddr_test.c index 186cab769d..6da79ca143 100644 --- a/lib/isc/tests/netaddr_test.c +++ b/lib/isc/tests/netaddr_test.c @@ -28,19 +28,18 @@ /* test isc_netaddr_isnetzero() */ static void -netaddr_isnetzero(void **state) -{ - unsigned int i; +netaddr_isnetzero(void **state) { + unsigned int i; struct in_addr ina; struct { const char *address; - bool expect; + bool expect; } tests[] = { { "0.0.0.0", true }, { "0.0.0.1", true }, { "0.0.1.2", true }, { "0.1.2.3", true }, { "10.0.0.0", false }, { "10.9.0.0", false }, { "10.9.8.0", false }, { "10.9.8.7", false }, { "127.0.0.0", false }, { "127.0.0.1", false } }; - bool result; + bool result; isc_netaddr_t netaddr; UNUSED(state); @@ -55,17 +54,16 @@ netaddr_isnetzero(void **state) /* test isc_netaddr_masktoprefixlen() calculates correct prefix lengths */ static void -netaddr_masktoprefixlen(void **state) -{ +netaddr_masktoprefixlen(void **state) { struct in_addr na_a; struct in_addr na_b; struct in_addr na_c; struct in_addr na_d; - isc_netaddr_t ina_a; - isc_netaddr_t ina_b; - isc_netaddr_t ina_c; - isc_netaddr_t ina_d; - unsigned int plen; + isc_netaddr_t ina_a; + isc_netaddr_t ina_b; + isc_netaddr_t ina_c; + isc_netaddr_t ina_d; + unsigned int plen; UNUSED(state); @@ -98,13 +96,12 @@ netaddr_masktoprefixlen(void **state) /* check multicast addresses are detected properly */ static void -netaddr_multicast(void **state) -{ +netaddr_multicast(void **state) { unsigned int i; struct { - int family; + int family; const char *addr; - bool is_multicast; + bool is_multicast; } tests[] = { { AF_INET, "1.2.3.4", false }, { AF_INET, "4.3.2.1", false }, { AF_INET, "224.1.1.1", true }, { AF_INET, "1.1.1.244", false }, @@ -114,10 +111,10 @@ netaddr_multicast(void **state) UNUSED(state); for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { - isc_netaddr_t na; - struct in_addr in; + isc_netaddr_t na; + struct in_addr in; struct in6_addr in6; - int r; + int r; if (tests[i].family == AF_INET) { r = inet_pton(AF_INET, tests[i].addr, @@ -137,8 +134,7 @@ netaddr_multicast(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(netaddr_isnetzero), cmocka_unit_test(netaddr_masktoprefixlen), @@ -153,8 +149,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/parse_test.c b/lib/isc/tests/parse_test.c index 10d4276296..f396fe1c8d 100644 --- a/lib/isc/tests/parse_test.c +++ b/lib/isc/tests/parse_test.c @@ -32,8 +32,7 @@ #include "isctest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -45,8 +44,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); isc_test_end(); @@ -56,10 +54,9 @@ _teardown(void **state) /* Test for 32 bit overflow on 64 bit machines in isc_parse_uint32 */ static void -parse_overflow(void **state) -{ +parse_overflow(void **state) { isc_result_t result; - uint32_t output; + uint32_t output; UNUSED(state); @@ -75,8 +72,7 @@ parse_overflow(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(parse_overflow, _setup, _teardown), @@ -90,8 +86,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/pool_test.c b/lib/isc/tests/pool_test.c index a946000f6a..415d33253a 100644 --- a/lib/isc/tests/pool_test.c +++ b/lib/isc/tests/pool_test.c @@ -29,8 +29,7 @@ #include "isctest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -42,8 +41,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); isc_test_end(); @@ -52,12 +50,11 @@ _teardown(void **state) } static isc_result_t -poolinit(void **target, void *arg) -{ +poolinit(void **target, void *arg) { isc_result_t result; isc_taskmgr_t *mgr = (isc_taskmgr_t *)arg; - isc_task_t * task = NULL; + isc_task_t *task = NULL; result = isc_task_create(mgr, 0, &task); if (result != ISC_R_SUCCESS) { return (result); @@ -68,8 +65,7 @@ poolinit(void **target, void *arg) } static void -poolfree(void **target) -{ +poolfree(void **target) { isc_task_t *task = *(isc_task_t **)target; isc_task_destroy(&task); *target = NULL; @@ -77,10 +73,9 @@ poolfree(void **target) /* Create a pool */ static void -create_pool(void **state) -{ +create_pool(void **state) { isc_result_t result; - isc_pool_t * pool = NULL; + isc_pool_t *pool = NULL; UNUSED(state); @@ -95,10 +90,9 @@ create_pool(void **state) /* Resize a pool */ static void -expand_pool(void **state) -{ +expand_pool(void **state) { isc_result_t result; - isc_pool_t * pool1 = NULL, *pool2 = NULL, *hold = NULL; + isc_pool_t *pool1 = NULL, *pool2 = NULL, *hold = NULL; UNUSED(state); @@ -141,12 +135,11 @@ expand_pool(void **state) /* Get objects */ static void -get_objects(void **state) -{ +get_objects(void **state) { isc_result_t result; - isc_pool_t * pool = NULL; - void * item; - isc_task_t * task1 = NULL, *task2 = NULL, *task3 = NULL; + isc_pool_t *pool = NULL; + void *item; + isc_task_t *task1 = NULL, *task2 = NULL, *task3 = NULL; UNUSED(state); @@ -176,8 +169,7 @@ get_objects(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(create_pool, _setup, _teardown), cmocka_unit_test_setup_teardown(expand_pool, _setup, _teardown), @@ -192,8 +184,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/radix_test.c b/lib/isc/tests/radix_test.c index f80f183ba3..c1f43e9d89 100644 --- a/lib/isc/tests/radix_test.c +++ b/lib/isc/tests/radix_test.c @@ -30,8 +30,7 @@ #include "isctest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -43,8 +42,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); isc_test_end(); @@ -54,14 +52,13 @@ _teardown(void **state) /* test radix searching */ static void -isc_radix_search_test(void **state) -{ +isc_radix_search_test(void **state) { isc_radix_tree_t *radix = NULL; isc_radix_node_t *node; - isc_prefix_t prefix; - isc_result_t result; - struct in_addr in_addr; - isc_netaddr_t netaddr; + isc_prefix_t prefix; + isc_result_t result; + struct in_addr in_addr; + isc_netaddr_t netaddr; UNUSED(state); @@ -103,8 +100,7 @@ isc_radix_search_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(isc_radix_search_test, _setup, _teardown), @@ -118,8 +114,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/random_test.c b/lib/isc/tests/random_test.c index e24508f023..d1c08f4f2a 100644 --- a/lib/isc/tests/random_test.c +++ b/lib/isc/tests/random_test.c @@ -59,10 +59,8 @@ 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; @@ -77,8 +75,7 @@ typedef enum { } isc_random_func; static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -90,8 +87,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); isc_test_end(); @@ -100,8 +96,7 @@ _teardown(void **state) } static double -igamc(double a, double x) -{ +igamc(double a, double x) { double ans, ax, c, yc, r, t, y, z; double pk, pkm1, pkm2, qk, qkm1, qkm2; @@ -162,8 +157,7 @@ igamc(double a, double x) } static double -igam(double a, double x) -{ +igam(double a, double x) { double ans, ax, c, r; if ((x <= 0) || (a <= 0)) { @@ -196,13 +190,12 @@ igam(double a, double x) return (ans * ax / a); } -static int8_t scounts_table[65536]; +static int8_t scounts_table[65536]; static uint8_t bitcounts_table[65536]; static int8_t -scount_calculate(uint16_t n) -{ - int i; +scount_calculate(uint16_t n) { + int i; int8_t sc; sc = 0; @@ -223,9 +216,8 @@ scount_calculate(uint16_t n) } static uint8_t -bitcount_calculate(uint16_t n) -{ - int i; +bitcount_calculate(uint16_t n) { + int i; uint8_t bc; bc = 0; @@ -244,8 +236,7 @@ bitcount_calculate(uint16_t n) } static void -tables_init(void) -{ +tables_init(void) { uint32_t i; for (i = 0; i < 65536; i++) { @@ -262,12 +253,11 @@ tables_init(void) * This function destroys (modifies) the data passed in bits. */ static uint32_t -matrix_binaryrank(uint32_t *bits, size_t rows, size_t cols) -{ - size_t i, j, k; +matrix_binaryrank(uint32_t *bits, size_t rows, size_t cols) { + size_t i, j, k; unsigned int rt = 0; - uint32_t rank = 0; - uint32_t tmp; + uint32_t rank = 0; + uint32_t tmp; for (k = 0; k < rows; k++) { i = k; @@ -310,18 +300,17 @@ matrix_binaryrank(uint32_t *bits, size_t rows, size_t cols) } static void -random_test(pvalue_func_t *func, isc_random_func test_func) -{ +random_test(pvalue_func_t *func, isc_random_func test_func) { uint32_t m; uint32_t j; uint32_t histogram[11] = { 0 }; uint32_t passed; - double proportion; - double p_hat; - double lower_confidence, higher_confidence; - double chi_square; - double p_value_t; - double alpha; + double proportion; + double p_hat; + double lower_confidence, higher_confidence; + double chi_square; + double p_value_t; + double alpha; tables_init(); @@ -329,27 +318,27 @@ random_test(pvalue_func_t *func, isc_random_func test_func) passed = 0; for (j = 0; j < m; j++) { - uint32_t i; - uint32_t values[REPS]; + uint32_t i; + uint32_t values[REPS]; uint16_t *uniform_values; - double p_value; + double p_value; switch (test_func) { case ISC_RANDOM8: - for (i = 0; i < (sizeof(values) / sizeof(*values)); - i++) { + for (i = 0; i < (sizeof(values) / sizeof(*values)); i++) + { values[i] = isc_random8(); } break; case ISC_RANDOM16: - for (i = 0; i < (sizeof(values) / sizeof(*values)); - i++) { + for (i = 0; i < (sizeof(values) / sizeof(*values)); i++) + { values[i] = isc_random16(); } break; case ISC_RANDOM32: - for (i = 0; i < (sizeof(values) / sizeof(*values)); - i++) { + for (i = 0; i < (sizeof(values) / sizeof(*values)); i++) + { values[i] = isc_random32(); } break; @@ -447,13 +436,12 @@ random_test(pvalue_func_t *func, isc_random_func test_func) * RANDOM test suite. */ static double -monobit(isc_mem_t *mctx, uint16_t *values, size_t length) -{ - size_t i; - int32_t scount; +monobit(isc_mem_t *mctx, uint16_t *values, size_t length) { + size_t i; + int32_t scount; uint32_t numbits; - double s_obs; - double p_value; + double s_obs; + double p_value; UNUSED(mctx); @@ -481,21 +469,20 @@ monobit(isc_mem_t *mctx, uint16_t *values, size_t length) * This is the runs test taken from the NIST SP 800-22 RNG test suite. */ static double -runs(isc_mem_t *mctx, uint16_t *values, size_t length) -{ - size_t i; +runs(isc_mem_t *mctx, uint16_t *values, size_t length) { + size_t i; uint32_t bcount; uint32_t numbits; - double pi; - double tau; + double pi; + double tau; uint32_t j; uint32_t b; - uint8_t bit_this; - uint8_t bit_prev; + uint8_t bit_this; + uint8_t bit_prev; uint32_t v_obs; - double numer; - double denom; - double p_value; + double numer; + double denom; + double p_value; UNUSED(mctx); @@ -561,16 +548,15 @@ runs(isc_mem_t *mctx, uint16_t *values, size_t length) * test suite. */ static double -blockfrequency(isc_mem_t *mctx, uint16_t *values, size_t length) -{ +blockfrequency(isc_mem_t *mctx, uint16_t *values, size_t length) { uint32_t i; uint32_t numbits; uint32_t mbits; uint32_t mwords; uint32_t numblocks; - double * pi; - double chi_square; - double p_value; + double *pi; + double chi_square; + double p_value; numbits = length * sizeof(*values) * 8; mbits = 32000; @@ -627,21 +613,20 @@ blockfrequency(isc_mem_t *mctx, uint16_t *values, size_t length) * test suite. */ static double -binarymatrixrank(isc_mem_t *mctx, uint16_t *values, size_t length) -{ +binarymatrixrank(isc_mem_t *mctx, uint16_t *values, size_t length) { uint32_t i; - size_t matrix_m; - size_t matrix_q; + size_t matrix_m; + size_t matrix_q; uint32_t num_matrices; - size_t numbits; + size_t numbits; uint32_t fm_0; uint32_t fm_1; uint32_t fm_rest; - double term1; - double term2; - double term3; - double chi_square; - double p_value; + double term1; + double term2; + double term3; + double chi_square; + double p_value; UNUSED(mctx); @@ -664,11 +649,11 @@ binarymatrixrank(isc_mem_t *mctx, uint16_t *values, size_t length) * takes up uint32_t array of size 32. */ uint32_t bits[32]; - int j; + int j; uint32_t rank; for (j = 0; j < 32; j++) { - size_t idx; + size_t idx; uint32_t r1; uint32_t r2; @@ -720,8 +705,7 @@ binarymatrixrank(isc_mem_t *mctx, uint16_t *values, size_t length) /* Monobit test for the RANDOM */ static void -isc_random32_monobit(void **state) -{ +isc_random32_monobit(void **state) { UNUSED(state); random_test(monobit, ISC_RANDOM32); @@ -729,8 +713,7 @@ isc_random32_monobit(void **state) /* Runs test for the RANDOM */ static void -isc_random32_runs(void **state) -{ +isc_random32_runs(void **state) { UNUSED(state); random_test(runs, ISC_RANDOM32); @@ -738,8 +721,7 @@ isc_random32_runs(void **state) /* Block frequency test for the RANDOM */ static void -isc_random32_blockfrequency(void **state) -{ +isc_random32_blockfrequency(void **state) { UNUSED(state); random_test(blockfrequency, ISC_RANDOM32); @@ -747,8 +729,7 @@ isc_random32_blockfrequency(void **state) /* Binary matrix rank test for the RANDOM */ static void -isc_random32_binarymatrixrank(void **state) -{ +isc_random32_binarymatrixrank(void **state) { UNUSED(state); random_test(binarymatrixrank, ISC_RANDOM32); @@ -760,8 +741,7 @@ isc_random32_binarymatrixrank(void **state) /* Monobit test for the RANDOM */ static void -isc_random_bytes_monobit(void **state) -{ +isc_random_bytes_monobit(void **state) { UNUSED(state); random_test(monobit, ISC_RANDOM_BYTES); @@ -769,8 +749,7 @@ isc_random_bytes_monobit(void **state) /* Runs test for the RANDOM */ static void -isc_random_bytes_runs(void **state) -{ +isc_random_bytes_runs(void **state) { UNUSED(state); random_test(runs, ISC_RANDOM_BYTES); @@ -778,8 +757,7 @@ isc_random_bytes_runs(void **state) /* Block frequency test for the RANDOM */ static void -isc_random_bytes_blockfrequency(void **state) -{ +isc_random_bytes_blockfrequency(void **state) { UNUSED(state); random_test(blockfrequency, ISC_RANDOM_BYTES); @@ -787,8 +765,7 @@ isc_random_bytes_blockfrequency(void **state) /* Binary matrix rank test for the RANDOM */ static void -isc_random_bytes_binarymatrixrank(void **state) -{ +isc_random_bytes_binarymatrixrank(void **state) { UNUSED(state); random_test(binarymatrixrank, ISC_RANDOM_BYTES); @@ -800,8 +777,7 @@ isc_random_bytes_binarymatrixrank(void **state) /* Monobit test for the RANDOM */ static void -isc_random_uniform_monobit(void **state) -{ +isc_random_uniform_monobit(void **state) { UNUSED(state); random_test(monobit, ISC_RANDOM_UNIFORM); @@ -809,8 +785,7 @@ isc_random_uniform_monobit(void **state) /* Runs test for the RANDOM */ static void -isc_random_uniform_runs(void **state) -{ +isc_random_uniform_runs(void **state) { UNUSED(state); random_test(runs, ISC_RANDOM_UNIFORM); @@ -818,8 +793,7 @@ isc_random_uniform_runs(void **state) /* Block frequency test for the RANDOM */ static void -isc_random_uniform_blockfrequency(void **state) -{ +isc_random_uniform_blockfrequency(void **state) { UNUSED(state); random_test(blockfrequency, ISC_RANDOM_UNIFORM); @@ -827,8 +801,7 @@ isc_random_uniform_blockfrequency(void **state) /* Binary matrix rank test for the RANDOM */ static void -isc_random_uniform_binarymatrixrank(void **state) -{ +isc_random_uniform_binarymatrixrank(void **state) { UNUSED(state); random_test(binarymatrixrank, ISC_RANDOM_UNIFORM); @@ -838,8 +811,7 @@ isc_random_uniform_binarymatrixrank(void **state) /* Monobit test for the RANDOM */ static void -isc_nonce_bytes_monobit(void **state) -{ +isc_nonce_bytes_monobit(void **state) { UNUSED(state); random_test(monobit, ISC_NONCE_BYTES); @@ -847,8 +819,7 @@ isc_nonce_bytes_monobit(void **state) /* Runs test for the RANDOM */ static void -isc_nonce_bytes_runs(void **state) -{ +isc_nonce_bytes_runs(void **state) { UNUSED(state); random_test(runs, ISC_NONCE_BYTES); @@ -856,8 +827,7 @@ isc_nonce_bytes_runs(void **state) /* Block frequency test for the RANDOM */ static void -isc_nonce_bytes_blockfrequency(void **state) -{ +isc_nonce_bytes_blockfrequency(void **state) { UNUSED(state); random_test(blockfrequency, ISC_NONCE_BYTES); @@ -865,16 +835,14 @@ isc_nonce_bytes_blockfrequency(void **state) /* Binary matrix rank test for the RANDOM */ static void -isc_nonce_bytes_binarymatrixrank(void **state) -{ +isc_nonce_bytes_binarymatrixrank(void **state) { UNUSED(state); random_test(binarymatrixrank, ISC_NONCE_BYTES); } int -main(int argc, char **argv) -{ +main(int argc, char **argv) { const struct CMUnitTest tests[] = { cmocka_unit_test(isc_random32_monobit), cmocka_unit_test(isc_random32_runs), @@ -913,8 +881,7 @@ main(int argc, char **argv) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/regex_test.c b/lib/isc/tests/regex_test.c index 461a379177..af9b86060e 100644 --- a/lib/isc/tests/regex_test.c +++ b/lib/isc/tests/regex_test.c @@ -36,17 +36,16 @@ static bool verbose = false; /* test isc_regex_validate() */ static void -regex_validate(void **state) -{ +regex_validate(void **state) { /* * test regex were generated using http://code.google.com/p/regfuzz/ * modified to use only printable characters */ struct { const char *expression; - int expect; - int exception; /* regcomp accepts but is - * disallowed. */ + int expect; + int exception; /* regcomp accepts but is + * disallowed. */ } tests[] = { { "", -1, 0 }, { "*", -1, 0 }, @@ -2285,7 +2284,7 @@ regex_validate(void **state) { "}}}}}}}}}(}}){}[llll]^N|", -1, 0 }, }; unsigned int i; - int r; + int r; UNUSED(state); @@ -2300,7 +2299,8 @@ regex_validate(void **state) r = regcomp(&preg, tests[i].expression, REG_EXTENDED); if (((r != 0 && tests[i].expect != -1) || (r == 0 && tests[i].expect == -1)) && - !tests[i].exception) { + !tests[i].exception) + { if (verbose) { print_error("regcomp(%s) -> %s expected %s\n", tests[i].expression, @@ -2310,7 +2310,8 @@ regex_validate(void **state) } } else if (r == 0 && preg.re_nsub != (unsigned int)tests[i].expect && - !tests[i].exception) { + !tests[i].exception) + { if (verbose) { print_error("%s preg.re_nsub %lu expected %d\n", tests[i].expression, @@ -2339,8 +2340,7 @@ regex_validate(void **state) } int -main(int argc, char **argv) -{ +main(int argc, char **argv) { const struct CMUnitTest tests[] = { cmocka_unit_test(regex_validate), }; @@ -2364,8 +2364,7 @@ main(int argc, char **argv) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/result_test.c b/lib/isc/tests/result_test.c index a29f873d8d..fd3aa485b0 100644 --- a/lib/isc/tests/result_test.c +++ b/lib/isc/tests/result_test.c @@ -27,8 +27,7 @@ /* convert result to identifier string */ static void -isc_result_toid_test(void **state) -{ +isc_result_toid_test(void **state) { const char *id; UNUSED(state); @@ -42,8 +41,7 @@ isc_result_toid_test(void **state) /* convert result to description string */ static void -isc_result_totext_test(void **state) -{ +isc_result_totext_test(void **state) { const char *str; UNUSED(state); @@ -57,9 +55,8 @@ isc_result_totext_test(void **state) /* check tables are populated */ static void -tables(void **state) -{ - const char * str; +tables(void **state) { + const char *str; isc_result_t result; UNUSED(state); @@ -87,7 +84,8 @@ tables(void **state) assert_string_equal(str, "(result code text not available)"); for (result = ISC_RESULTCLASS_PK11; - result < (ISC_RESULTCLASS_PK11 + PK11_R_NRESULTS); result++) { + result < (ISC_RESULTCLASS_PK11 + PK11_R_NRESULTS); result++) + { str = isc_result_toid(result); assert_non_null(str); assert_string_not_equal(str, "(result code text not " @@ -109,8 +107,7 @@ tables(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(isc_result_toid_test), cmocka_unit_test(isc_result_totext_test), @@ -125,8 +122,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/safe_test.c b/lib/isc/tests/safe_test.c index fc482c5eac..5ce5a77486 100644 --- a/lib/isc/tests/safe_test.c +++ b/lib/isc/tests/safe_test.c @@ -28,8 +28,7 @@ /* test isc_safe_memequal() */ static void -isc_safe_memequal_test(void **state) -{ +isc_safe_memequal_test(void **state) { UNUSED(state); assert_true(isc_safe_memequal("test", "test", 4)); @@ -44,8 +43,7 @@ isc_safe_memequal_test(void **state) /* test isc_safe_memwipe() */ static void -isc_safe_memwipe_test(void **state) -{ +isc_safe_memwipe_test(void **state) { UNUSED(state); /* These should pass. */ @@ -85,8 +83,7 @@ isc_safe_memwipe_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(isc_safe_memequal_test), cmocka_unit_test(isc_safe_memwipe_test), @@ -100,8 +97,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/siphash_test.c b/lib/isc/tests/siphash_test.c index 2356c85e62..b09a2d795e 100644 --- a/lib/isc/tests/siphash_test.c +++ b/lib/isc/tests/siphash_test.c @@ -22,14 +22,13 @@ #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 @@ -37,7 +36,7 @@ openssl_isc_siphash24(const uint8_t *, const uint8_t *, const size_t, #undef isc_siphash24 #define HAVE_OPENSSL_SIPHASH 1 -#define isc_siphash24 openssl_isc_siphash24 +#define isc_siphash24 openssl_isc_siphash24 #include "../siphash.c" #undef isc_siphash24 @@ -694,8 +693,7 @@ const uint8_t vectors[64][8] = { #if HAVE_OPENSSL_SIPHASH static void -openssl_isc_siphash24_test(void **state) -{ +openssl_isc_siphash24_test(void **state) { UNUSED(state); uint8_t in[64], out[8], key[16]; @@ -712,8 +710,7 @@ openssl_isc_siphash24_test(void **state) #endif /* if HAVE_OPENSSL_SIPHASH */ static void -native_isc_siphash24_test(void **state) -{ +native_isc_siphash24_test(void **state) { UNUSED(state); uint8_t in[64], out[8], key[16]; @@ -729,8 +726,7 @@ native_isc_siphash24_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { #if HAVE_OPENSSL_SIPHASH cmocka_unit_test(openssl_isc_siphash24_test), @@ -746,8 +742,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/sockaddr_test.c b/lib/isc/tests/sockaddr_test.c index 9e8439d821..b1d225ad9b 100644 --- a/lib/isc/tests/sockaddr_test.c +++ b/lib/isc/tests/sockaddr_test.c @@ -31,8 +31,7 @@ #include "isctest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -44,8 +43,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); isc_test_end(); @@ -55,13 +53,12 @@ _teardown(void **state) /* test sockaddr hash */ static void -sockaddr_hash(void **state) -{ - isc_sockaddr_t addr; - struct in_addr in; +sockaddr_hash(void **state) { + isc_sockaddr_t addr; + struct in_addr in; struct in6_addr in6; - unsigned int h1, h2, h3, h4; - int ret; + unsigned int h1, h2, h3, h4; + int ret; UNUSED(state); @@ -82,17 +79,16 @@ sockaddr_hash(void **state) /* test isc_sockaddr_isnetzero() */ static void -sockaddr_isnetzero(void **state) -{ - isc_sockaddr_t addr; - struct in_addr in; +sockaddr_isnetzero(void **state) { + isc_sockaddr_t addr; + struct in_addr in; struct in6_addr in6; - bool r; - int ret; - size_t i; + bool r; + int ret; + size_t i; struct { const char *string; - bool expect; + bool expect; } data4[] = { { "0.0.0.0", true }, { "0.0.0.1", true }, { "0.0.1.0", true }, { "0.1.0.0", true }, @@ -105,7 +101,7 @@ sockaddr_isnetzero(void **state) */ struct { const char *string; - bool expect; + bool expect; } data6[] = { { "::ffff:0.0.0.0", false }, { "::ffff:0.0.0.1", false }, @@ -138,8 +134,7 @@ sockaddr_isnetzero(void **state) * and b are equal, and false when they are not equal */ static void -sockaddr_eqaddrprefix(void **state) -{ +sockaddr_eqaddrprefix(void **state) { struct in_addr ina_a; struct in_addr ina_b; struct in_addr ina_c; @@ -167,8 +162,7 @@ sockaddr_eqaddrprefix(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(sockaddr_hash, _setup, _teardown), @@ -184,8 +178,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/socket_test.c b/lib/isc/tests/socket_test.c index fdd94acde1..57bf8e47fb 100644 --- a/lib/isc/tests/socket_test.c +++ b/lib/isc/tests/socket_test.c @@ -33,17 +33,16 @@ #include "../unix/socket_p.h" #include "isctest.h" -static bool recv_dscp; +static bool recv_dscp; static unsigned int recv_dscp_value; -static bool recv_trunc; +static bool recv_trunc; /* * Helper functions */ static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -55,8 +54,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); isc_test_end(); @@ -65,23 +63,21 @@ _teardown(void **state) } typedef struct { - atomic_bool done; - isc_result_t result; + atomic_bool done; + isc_result_t result; isc_socket_t *socket; } completion_t; static void -completion_init(completion_t *completion) -{ +completion_init(completion_t *completion) { atomic_store(&completion->done, false); completion->socket = NULL; } static void -accept_done(isc_task_t *task, isc_event_t *event) -{ +accept_done(isc_task_t *task, isc_event_t *event) { isc_socket_newconnev_t *nevent = (isc_socket_newconnev_t *)event; - completion_t * completion = event->ev_arg; + completion_t *completion = event->ev_arg; UNUSED(task); @@ -95,11 +91,10 @@ accept_done(isc_task_t *task, isc_event_t *event) } static void -event_done(isc_task_t *task, isc_event_t *event) -{ - isc_socketevent_t * sev = NULL; +event_done(isc_task_t *task, isc_event_t *event) { + isc_socketevent_t *sev = NULL; isc_socket_connev_t *connev = NULL; - completion_t * completion = event->ev_arg; + completion_t *completion = event->ev_arg; UNUSED(task); switch (event->ev_type) { @@ -127,8 +122,7 @@ event_done(isc_task_t *task, isc_event_t *event) } static isc_result_t -waitfor(completion_t *completion) -{ +waitfor(completion_t *completion) { int i = 0; while (!atomic_load(&completion->done) && i++ < 5000) { isc_test_nap(1000); @@ -140,14 +134,12 @@ waitfor(completion_t *completion) } static void -waitbody(void) -{ +waitbody(void) { isc_test_nap(1000); } static isc_result_t -waitfor2(completion_t *c1, completion_t *c2) -{ +waitfor2(completion_t *c1, completion_t *c2) { int i = 0; while (!(atomic_load(&c1->done) && atomic_load(&c2->done)) && @@ -166,16 +158,15 @@ waitfor2(completion_t *c1, completion_t *c2) /* Test UDP sendto/recv (IPv4) */ static void -udp_sendto_test(void **state) -{ - isc_result_t result; +udp_sendto_test(void **state) { + isc_result_t result; isc_sockaddr_t addr1, addr2; struct in_addr in; - isc_socket_t * s1 = NULL, *s2 = NULL; - isc_task_t * task = NULL; - char sendbuf[BUFSIZ], recvbuf[BUFSIZ]; - completion_t completion; - isc_region_t r; + isc_socket_t *s1 = NULL, *s2 = NULL; + isc_task_t *task = NULL; + char sendbuf[BUFSIZ], recvbuf[BUFSIZ]; + completion_t completion; + isc_region_t r; UNUSED(state); @@ -232,16 +223,15 @@ udp_sendto_test(void **state) /* Test UDP sendto/recv with duplicated socket */ static void -udp_dup_test(void **state) -{ - isc_result_t result; +udp_dup_test(void **state) { + isc_result_t result; isc_sockaddr_t addr1, addr2; struct in_addr in; - isc_socket_t * s1 = NULL, *s2 = NULL, *s3 = NULL; - isc_task_t * task = NULL; - char sendbuf[BUFSIZ], recvbuf[BUFSIZ]; - completion_t completion; - isc_region_t r; + isc_socket_t *s1 = NULL, *s2 = NULL, *s3 = NULL; + isc_task_t *task = NULL; + char sendbuf[BUFSIZ], recvbuf[BUFSIZ]; + completion_t completion; + isc_region_t r; UNUSED(state); @@ -324,16 +314,15 @@ udp_dup_test(void **state) /* Test UDP sendto/recv (IPv4) */ static void -udp_dscp_v4_test(void **state) -{ - isc_result_t result; - isc_sockaddr_t addr1, addr2; - struct in_addr in; - isc_socket_t * s1 = NULL, *s2 = NULL; - isc_task_t * task = NULL; - char sendbuf[BUFSIZ], recvbuf[BUFSIZ]; - completion_t completion; - isc_region_t r; +udp_dscp_v4_test(void **state) { + isc_result_t result; + isc_sockaddr_t addr1, addr2; + struct in_addr in; + isc_socket_t *s1 = NULL, *s2 = NULL; + isc_task_t *task = NULL; + char sendbuf[BUFSIZ], recvbuf[BUFSIZ]; + completion_t completion; + isc_region_t r; isc_socketevent_t *socketevent; UNUSED(state); @@ -413,18 +402,17 @@ udp_dscp_v4_test(void **state) /* Test UDP sendto/recv (IPv6) */ static void -udp_dscp_v6_test(void **state) -{ - isc_result_t result; - isc_sockaddr_t addr1, addr2; - struct in6_addr in6; - isc_socket_t * s1 = NULL, *s2 = NULL; - isc_task_t * task = NULL; - char sendbuf[BUFSIZ], recvbuf[BUFSIZ]; - completion_t completion; - isc_region_t r; +udp_dscp_v6_test(void **state) { + isc_result_t result; + isc_sockaddr_t addr1, addr2; + struct in6_addr in6; + isc_socket_t *s1 = NULL, *s2 = NULL; + isc_task_t *task = NULL; + char sendbuf[BUFSIZ], recvbuf[BUFSIZ]; + completion_t completion; + isc_region_t r; isc_socketevent_t *socketevent; - int n; + int n; UNUSED(state); @@ -433,8 +421,8 @@ udp_dscp_v6_test(void **state) isc_sockaddr_fromin6(&addr1, &in6, 0); isc_sockaddr_fromin6(&addr2, &in6, 0); - result = - isc_socket_create(socketmgr, PF_INET6, isc_sockettype_udp, &s1); + result = isc_socket_create(socketmgr, PF_INET6, isc_sockettype_udp, + &s1); assert_int_equal(result, ISC_R_SUCCESS); result = isc_socket_bind(s1, &addr1, 0); assert_int_equal(result, ISC_R_SUCCESS); @@ -442,8 +430,8 @@ udp_dscp_v6_test(void **state) assert_int_equal(result, ISC_R_SUCCESS); assert_true(isc_sockaddr_getport(&addr1) != 0); - result = - isc_socket_create(socketmgr, PF_INET6, isc_sockettype_udp, &s2); + result = isc_socket_create(socketmgr, PF_INET6, isc_sockettype_udp, + &s2); assert_int_equal(result, ISC_R_SUCCESS); result = isc_socket_bind(s2, &addr2, 0); assert_int_equal(result, ISC_R_SUCCESS); @@ -504,16 +492,15 @@ udp_dscp_v6_test(void **state) /* Test TCP sendto/recv (IPv4) */ static void -tcp_dscp_v4_test(void **state) -{ - isc_result_t result; +tcp_dscp_v4_test(void **state) { + isc_result_t result; isc_sockaddr_t addr1; struct in_addr in; - isc_socket_t * s1 = NULL, *s2 = NULL, *s3 = NULL; - isc_task_t * task = NULL; - char sendbuf[BUFSIZ], recvbuf[BUFSIZ]; - completion_t completion, completion2; - isc_region_t r; + isc_socket_t *s1 = NULL, *s2 = NULL, *s3 = NULL; + isc_task_t *task = NULL; + char sendbuf[BUFSIZ], recvbuf[BUFSIZ]; + completion_t completion, completion2; + isc_region_t r; UNUSED(state); @@ -596,17 +583,16 @@ tcp_dscp_v4_test(void **state) /* Test TCP sendto/recv (IPv6) */ static void -tcp_dscp_v6_test(void **state) -{ - isc_result_t result; - isc_sockaddr_t addr1; +tcp_dscp_v6_test(void **state) { + isc_result_t result; + isc_sockaddr_t addr1; struct in6_addr in6; - isc_socket_t * s1 = NULL, *s2 = NULL, *s3 = NULL; - isc_task_t * task = NULL; - char sendbuf[BUFSIZ], recvbuf[BUFSIZ]; - completion_t completion, completion2; - isc_region_t r; - int n; + isc_socket_t *s1 = NULL, *s2 = NULL, *s3 = NULL; + isc_task_t *task = NULL; + char sendbuf[BUFSIZ], recvbuf[BUFSIZ]; + completion_t completion, completion2; + isc_region_t r; + int n; UNUSED(state); @@ -614,8 +600,8 @@ tcp_dscp_v6_test(void **state) assert_true(n == 1); isc_sockaddr_fromin6(&addr1, &in6, 0); - result = - isc_socket_create(socketmgr, PF_INET6, isc_sockettype_tcp, &s1); + result = isc_socket_create(socketmgr, PF_INET6, isc_sockettype_tcp, + &s1); assert_int_equal(result, ISC_R_SUCCESS); result = isc_socket_bind(s1, &addr1, 0); @@ -627,8 +613,8 @@ tcp_dscp_v6_test(void **state) result = isc_socket_listen(s1, 3); assert_int_equal(result, ISC_R_SUCCESS); - result = - isc_socket_create(socketmgr, PF_INET6, isc_sockettype_tcp, &s2); + result = isc_socket_create(socketmgr, PF_INET6, isc_sockettype_tcp, + &s2); assert_int_equal(result, ISC_R_SUCCESS); result = isc_task_create(taskmgr, 0, &task); @@ -696,8 +682,7 @@ tcp_dscp_v6_test(void **state) /* probe dscp capabilities */ static void -net_probedscp_test(void **state) -{ +net_probedscp_test(void **state) { unsigned int n; UNUSED(state); @@ -730,16 +715,15 @@ net_probedscp_test(void **state) /* Test UDP truncation detection */ static void -udp_trunc_test(void **state) -{ - isc_result_t result; - isc_sockaddr_t addr1, addr2; - struct in_addr in; - isc_socket_t * s1 = NULL, *s2 = NULL; - isc_task_t * task = NULL; - char sendbuf[BUFSIZ * 2], recvbuf[BUFSIZ]; - completion_t completion; - isc_region_t r; +udp_trunc_test(void **state) { + isc_result_t result; + isc_sockaddr_t addr1, addr2; + struct in_addr in; + isc_socket_t *s1 = NULL, *s2 = NULL; + isc_task_t *task = NULL; + char sendbuf[BUFSIZ * 2], recvbuf[BUFSIZ]; + completion_t completion; + isc_region_t r; isc_socketevent_t *socketevent; UNUSED(state); @@ -840,8 +824,7 @@ udp_trunc_test(void **state) * Main */ int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(udp_sendto_test, _setup, _teardown), @@ -869,8 +852,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/symtab_test.c b/lib/isc/tests/symtab_test.c index ee5d0c0585..98cea42b15 100644 --- a/lib/isc/tests/symtab_test.c +++ b/lib/isc/tests/symtab_test.c @@ -29,8 +29,7 @@ #include "isctest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -42,8 +41,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); isc_test_end(); @@ -52,8 +50,7 @@ _teardown(void **state) } static void -undefine(char *key, unsigned int type, isc_symvalue_t value, void *arg) -{ +undefine(char *key, unsigned int type, isc_symvalue_t value, void *arg) { UNUSED(arg); assert_int_equal(type, 1); @@ -63,13 +60,12 @@ undefine(char *key, unsigned int type, isc_symvalue_t value, void *arg) /* test symbol table growth */ static void -symtab_grow(void **state) -{ - isc_result_t result; - isc_symtab_t * st = NULL; - isc_symvalue_t value; +symtab_grow(void **state) { + isc_result_t result; + isc_symtab_t *st = NULL; + isc_symvalue_t value; isc_symexists_t policy = isc_symexists_reject; - int i; + int i; UNUSED(state); @@ -152,8 +148,7 @@ symtab_grow(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(symtab_grow, _setup, _teardown), }; @@ -166,8 +161,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/task_test.c b/lib/isc/tests/task_test.c index 717daf3979..8b5b57ee38 100644 --- a/lib/isc/tests/task_test.c +++ b/lib/isc/tests/task_test.c @@ -41,16 +41,15 @@ /* Set to true (or use -v option) for verbose output */ static bool verbose = false; -static isc_mutex_t lock; +static isc_mutex_t lock; static isc_condition_t cv; atomic_int_fast32_t counter; -static int active[10]; -static atomic_bool done, done2; +static int active[10]; +static atomic_bool done, done2; static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -66,8 +65,7 @@ _setup(void **state) } static int -_setup2(void **state) -{ +_setup2(void **state) { isc_result_t result; UNUSED(state); @@ -84,8 +82,7 @@ _setup2(void **state) } static int -_setup4(void **state) -{ +_setup4(void **state) { isc_result_t result; UNUSED(state); @@ -102,8 +99,7 @@ _setup4(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); isc_test_end(); @@ -113,8 +109,7 @@ _teardown(void **state) } static void -set(isc_task_t *task, isc_event_t *event) -{ +set(isc_task_t *task, isc_event_t *event) { atomic_int_fast32_t *value = (atomic_int_fast32_t *)event->ev_arg; UNUSED(task); @@ -124,8 +119,7 @@ set(isc_task_t *task, isc_event_t *event) } static void -set_and_drop(isc_task_t *task, isc_event_t *event) -{ +set_and_drop(isc_task_t *task, isc_event_t *event) { atomic_int_fast32_t *value = (atomic_int_fast32_t *)event->ev_arg; UNUSED(task); @@ -139,10 +133,9 @@ set_and_drop(isc_task_t *task, isc_event_t *event) /* Create a task */ static void -create_task(void **state) -{ +create_task(void **state) { isc_result_t result; - isc_task_t * task = NULL; + isc_task_t *task = NULL; UNUSED(state); @@ -155,13 +148,12 @@ create_task(void **state) /* Process events */ static void -all_events(void **state) -{ - isc_result_t result; - isc_task_t * task = NULL; - isc_event_t * event = NULL; +all_events(void **state) { + isc_result_t result; + isc_task_t *task = NULL; + isc_event_t *event = NULL; atomic_int_fast32_t a, b; - int i = 0; + int i = 0; UNUSED(state); @@ -200,13 +192,12 @@ all_events(void **state) /* Privileged events */ static void -privileged_events(void **state) -{ - isc_result_t result; - isc_task_t * task1 = NULL, *task2 = NULL; - isc_event_t * event = NULL; +privileged_events(void **state) { + isc_result_t result; + isc_task_t *task1 = NULL, *task2 = NULL; + isc_event_t *event = NULL; atomic_int_fast32_t a, b, c, d, e; - int i = 0; + int i = 0; UNUSED(state); @@ -285,7 +276,8 @@ privileged_events(void **state) while ((atomic_load(&a) == 0 || atomic_load(&b) == 0 || atomic_load(&c) == 0 || atomic_load(&d) == 0 || atomic_load(&e) == 0) && - i++ < 5000) { + i++ < 5000) + { isc_test_nap(1000); } @@ -320,13 +312,12 @@ privileged_events(void **state) * we explicitly set it into normal mode *while* running privileged. */ static void -privilege_drop(void **state) -{ - isc_result_t result; - isc_task_t * task1 = NULL, *task2 = NULL; - isc_event_t * event = NULL; +privilege_drop(void **state) { + isc_result_t result; + isc_task_t *task1 = NULL, *task2 = NULL; + isc_event_t *event = NULL; atomic_int_fast32_t a, b, c, d, e; /* non valid states */ - int i = 0; + int i = 0; UNUSED(state); @@ -405,7 +396,8 @@ privilege_drop(void **state) while ((atomic_load(&a) == -1 || atomic_load(&b) == -1 || atomic_load(&c) == -1 || atomic_load(&d) == -1 || atomic_load(&e) == -1) && - i++ < 5000) { + i++ < 5000) + { isc_test_nap(1000); } @@ -433,8 +425,7 @@ privilege_drop(void **state) } static void -sleep_cb(isc_task_t *task, isc_event_t *event) -{ +sleep_cb(isc_task_t *task, isc_event_t *event) { UNUSED(task); int p = *(int *)event->ev_arg; if (p == 1) { @@ -467,10 +458,9 @@ sleep_cb(isc_task_t *task, isc_event_t *event) } static void -pause_unpause(void **state) -{ +pause_unpause(void **state) { isc_result_t result; - isc_task_t * task = NULL; + isc_task_t *task = NULL; isc_event_t *event1, *event2 = NULL; UNUSED(state); atomic_store(&done, false); @@ -515,8 +505,7 @@ pause_unpause(void **state) * Basic task functions: */ static void -basic_cb(isc_task_t *task, isc_event_t *event) -{ +basic_cb(isc_task_t *task, isc_event_t *event) { int i, j; UNUSED(task); @@ -536,8 +525,7 @@ basic_cb(isc_task_t *task, isc_event_t *event) } static void -basic_shutdown(isc_task_t *task, isc_event_t *event) -{ +basic_shutdown(isc_task_t *task, isc_event_t *event) { UNUSED(task); if (verbose) { @@ -548,8 +536,7 @@ basic_shutdown(isc_task_t *task, isc_event_t *event) } static void -basic_tick(isc_task_t *task, isc_event_t *event) -{ +basic_tick(isc_task_t *task, isc_event_t *event) { UNUSED(task); if (verbose) { @@ -567,21 +554,20 @@ static char tick[] = "tick"; static char tock[] = "tock"; static void -basic(void **state) -{ - isc_result_t result; - isc_task_t * task1 = NULL; - isc_task_t * task2 = NULL; - isc_task_t * task3 = NULL; - isc_task_t * task4 = NULL; - isc_event_t * event = NULL; - isc_timer_t * ti1 = NULL; - isc_timer_t * ti2 = NULL; - isc_time_t absolute; +basic(void **state) { + isc_result_t result; + isc_task_t *task1 = NULL; + isc_task_t *task2 = NULL; + isc_task_t *task3 = NULL; + isc_task_t *task4 = NULL; + isc_event_t *event = NULL; + isc_timer_t *ti1 = NULL; + isc_timer_t *ti2 = NULL; + isc_time_t absolute; isc_interval_t interval; char *testarray[] = { one, one, one, one, one, one, one, one, one, two, three, four, two, three, four, NULL }; - int i; + int i; UNUSED(state); @@ -660,8 +646,7 @@ basic(void **state) * tasks complete first. */ static int -spin(int n) -{ +spin(int n) { int i; int r = 0; for (i = 0; i < n; i++) { @@ -674,8 +659,7 @@ spin(int n) } static void -exclusive_cb(isc_task_t *task, isc_event_t *event) -{ +exclusive_cb(isc_task_t *task, isc_event_t *event) { int taskno = *(int *)(event->ev_arg); if (verbose) { @@ -685,7 +669,7 @@ exclusive_cb(isc_task_t *task, isc_event_t *event) /* task chosen from the middle of the range */ if (taskno == 6) { isc_result_t result; - int i; + int i; result = isc_task_beginexclusive(task); assert_int_equal(result, ISC_R_SUCCESS); @@ -715,17 +699,16 @@ exclusive_cb(isc_task_t *task, isc_event_t *event) } static void -task_exclusive(void **state) -{ - isc_task_t * tasks[10]; +task_exclusive(void **state) { + isc_task_t *tasks[10]; isc_result_t result; - int i; + int i; UNUSED(state); for (i = 0; i < 10; i++) { isc_event_t *event = NULL; - int * v; + int *v; tasks[i] = NULL; @@ -759,8 +742,7 @@ task_exclusive(void **state) * The task system can create and execute many tasks. Tests with 10000. */ static void -maxtask_shutdown(isc_task_t *task, isc_event_t *event) -{ +maxtask_shutdown(isc_task_t *task, isc_event_t *event) { UNUSED(task); if (event->ev_arg != NULL) { @@ -776,8 +758,7 @@ maxtask_shutdown(isc_task_t *task, isc_event_t *event) } static void -maxtask_cb(isc_task_t *task, isc_event_t *event) -{ +maxtask_cb(isc_task_t *task, isc_event_t *event) { isc_result_t result; if (event->ev_arg != NULL) { @@ -803,12 +784,11 @@ maxtask_cb(isc_task_t *task, isc_event_t *event) } static void -manytasks(void **state) -{ - isc_mem_t * mctx = NULL; +manytasks(void **state) { + isc_mem_t *mctx = NULL; isc_result_t result; isc_event_t *event = NULL; - uintptr_t ntasks = 10000; + uintptr_t ntasks = 10000; UNUSED(state); @@ -849,14 +829,13 @@ manytasks(void **state) * in LIFO order. */ -static int nevents = 0; -static int nsdevents = 0; -static int senders[4]; +static int nevents = 0; +static int nsdevents = 0; +static int senders[4]; atomic_bool ready, all_done; static void -sd_sde1(isc_task_t *task, isc_event_t *event) -{ +sd_sde1(isc_task_t *task, isc_event_t *event) { UNUSED(task); assert_int_equal(nevents, 256); @@ -873,8 +852,7 @@ sd_sde1(isc_task_t *task, isc_event_t *event) } static void -sd_sde2(isc_task_t *task, isc_event_t *event) -{ +sd_sde2(isc_task_t *task, isc_event_t *event) { UNUSED(task); assert_int_equal(nevents, 256); @@ -889,8 +867,7 @@ sd_sde2(isc_task_t *task, isc_event_t *event) } static void -sd_event1(isc_task_t *task, isc_event_t *event) -{ +sd_event1(isc_task_t *task, isc_event_t *event) { UNUSED(task); LOCK(&lock); @@ -907,8 +884,7 @@ sd_event1(isc_task_t *task, isc_event_t *event) } static void -sd_event2(isc_task_t *task, isc_event_t *event) -{ +sd_event2(isc_task_t *task, isc_event_t *event) { UNUSED(task); ++nevents; @@ -921,13 +897,12 @@ sd_event2(isc_task_t *task, isc_event_t *event) } static void -shutdown(void **state) -{ - isc_result_t result; +shutdown(void **state) { + isc_result_t result; isc_eventtype_t event_type; - isc_event_t * event = NULL; - isc_task_t * task = NULL; - int i; + isc_event_t *event = NULL; + isc_task_t *task = NULL; + int i; UNUSED(state); @@ -991,8 +966,7 @@ shutdown(void **state) * isc_task_onshutdown() will return ISC_R_SHUTTINGDOWN. */ static void -psd_event1(isc_task_t *task, isc_event_t *event) -{ +psd_event1(isc_task_t *task, isc_event_t *event) { UNUSED(task); LOCK(&lock); @@ -1007,20 +981,18 @@ psd_event1(isc_task_t *task, isc_event_t *event) } static void -psd_sde(isc_task_t *task, isc_event_t *event) -{ +psd_sde(isc_task_t *task, isc_event_t *event) { UNUSED(task); isc_event_free(&event); } static void -post_shutdown(void **state) -{ - isc_result_t result; +post_shutdown(void **state) { + isc_result_t result; isc_eventtype_t event_type; - isc_event_t * event; - isc_task_t * task; + isc_event_t *event; + isc_task_t *task; UNUSED(state); @@ -1064,22 +1036,21 @@ post_shutdown(void **state) */ #define SENDERCNT 3 -#define TYPECNT 4 -#define TAGCNT 5 -#define NEVENTS (SENDERCNT * TYPECNT * TAGCNT) +#define TYPECNT 4 +#define TAGCNT 5 +#define NEVENTS (SENDERCNT * TYPECNT * TAGCNT) -static bool testrange; -static void * purge_sender; +static bool testrange; +static void *purge_sender; static isc_eventtype_t purge_type_first; static isc_eventtype_t purge_type_last; -static void * purge_tag; -static int eventcnt; +static void *purge_tag; +static int eventcnt; atomic_bool started; static void -pg_event1(isc_task_t *task, isc_event_t *event) -{ +pg_event1(isc_task_t *task, isc_event_t *event) { UNUSED(task); LOCK(&lock); @@ -1092,8 +1063,7 @@ pg_event1(isc_task_t *task, isc_event_t *event) } static void -pg_event2(isc_task_t *task, isc_event_t *event) -{ +pg_event2(isc_task_t *task, isc_event_t *event) { bool sender_match = false; bool type_match = false; bool tag_match = false; @@ -1143,8 +1113,7 @@ pg_event2(isc_task_t *task, isc_event_t *event) } static void -pg_sde(isc_task_t *task, isc_event_t *event) -{ +pg_sde(isc_task_t *task, isc_event_t *event) { UNUSED(task); LOCK(&lock); @@ -1156,16 +1125,15 @@ pg_sde(isc_task_t *task, isc_event_t *event) } static void -test_purge(int sender, int type, int tag, int exp_purged) -{ - isc_result_t result; - isc_task_t * task = NULL; - isc_event_t * eventtab[NEVENTS]; - isc_event_t * event = NULL; +test_purge(int sender, int type, int tag, int exp_purged) { + isc_result_t result; + isc_task_t *task = NULL; + isc_event_t *eventtab[NEVENTS]; + isc_event_t *event = NULL; isc_interval_t interval; - isc_time_t now; - int sender_cnt, type_cnt, tag_cnt, event_cnt, i; - int purged = 0; + isc_time_t now; + int sender_cnt, type_cnt, tag_cnt, event_cnt, i; + int purged = 0; atomic_init(&started, false); atomic_init(&done, false); @@ -1290,8 +1258,7 @@ test_purge(int sender, int type, int tag, int exp_purged) * from the task's " queue and returns the number of events purged. */ static void -purge(void **state) -{ +purge(void **state) { UNUSED(state); /* Try purging on a specific sender. */ @@ -1359,8 +1326,7 @@ purge(void **state) */ static void -purgerange(void **state) -{ +purgerange(void **state) { UNUSED(state); /* Now let's try some ranges. */ @@ -1421,8 +1387,7 @@ purgerange(void **state) * Helpers for purge event tests */ static void -pge_event1(isc_task_t *task, isc_event_t *event) -{ +pge_event1(isc_task_t *task, isc_event_t *event) { UNUSED(task); LOCK(&lock); @@ -1435,8 +1400,7 @@ pge_event1(isc_task_t *task, isc_event_t *event) } static void -pge_event2(isc_task_t *task, isc_event_t *event) -{ +pge_event2(isc_task_t *task, isc_event_t *event) { UNUSED(task); ++eventcnt; @@ -1444,8 +1408,7 @@ pge_event2(isc_task_t *task, isc_event_t *event) } static void -pge_sde(isc_task_t *task, isc_event_t *event) -{ +pge_sde(isc_task_t *task, isc_event_t *event) { UNUSED(task); LOCK(&lock); @@ -1457,15 +1420,14 @@ pge_sde(isc_task_t *task, isc_event_t *event) } static void -try_purgeevent(bool purgeable) -{ - isc_result_t result; - isc_task_t * task = NULL; - bool purged; - isc_event_t * event1 = NULL; - isc_event_t * event2 = NULL; - isc_event_t * event2_clone = NULL; - isc_time_t now; +try_purgeevent(bool purgeable) { + isc_result_t result; + isc_task_t *task = NULL; + bool purged; + isc_event_t *event1 = NULL; + isc_event_t *event2 = NULL; + isc_event_t *event2_clone = NULL; + isc_time_t now; isc_interval_t interval; atomic_init(&started, false); @@ -1541,8 +1503,7 @@ try_purgeevent(bool purgeable) */ static void -purgeevent(void **state) -{ +purgeevent(void **state) { UNUSED(state); try_purgeevent(true); @@ -1556,16 +1517,14 @@ purgeevent(void **state) */ static void -purgeevent_notpurge(void **state) -{ +purgeevent_notpurge(void **state) { UNUSED(state); try_purgeevent(false); } int -main(int argc, char **argv) -{ +main(int argc, char **argv) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(create_task, _setup, _teardown), cmocka_unit_test_setup_teardown(shutdown, _setup4, _teardown), @@ -1608,8 +1567,7 @@ main(int argc, char **argv) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/taskpool_test.c b/lib/isc/tests/taskpool_test.c index a1504f937c..b96da11b91 100644 --- a/lib/isc/tests/taskpool_test.c +++ b/lib/isc/tests/taskpool_test.c @@ -29,8 +29,7 @@ #include "isctest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -42,8 +41,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); isc_test_end(); @@ -53,9 +51,8 @@ _teardown(void **state) /* Create a taskpool */ static void -create_pool(void **state) -{ - isc_result_t result; +create_pool(void **state) { + isc_result_t result; isc_taskpool_t *pool = NULL; UNUSED(state); @@ -70,9 +67,8 @@ create_pool(void **state) /* Resize a taskpool */ static void -expand_pool(void **state) -{ - isc_result_t result; +expand_pool(void **state) { + isc_result_t result; isc_taskpool_t *pool1 = NULL, *pool2 = NULL, *hold = NULL; UNUSED(state); @@ -115,11 +111,10 @@ expand_pool(void **state) /* Get tasks */ static void -get_tasks(void **state) -{ - isc_result_t result; +get_tasks(void **state) { + isc_result_t result; isc_taskpool_t *pool = NULL; - isc_task_t * task1 = NULL, *task2 = NULL, *task3 = NULL; + isc_task_t *task1 = NULL, *task2 = NULL, *task3 = NULL; UNUSED(state); @@ -147,11 +142,10 @@ get_tasks(void **state) /* Set privileges */ static void -set_privilege(void **state) -{ - isc_result_t result; +set_privilege(void **state) { + isc_result_t result; isc_taskpool_t *pool = NULL; - isc_task_t * task1 = NULL, *task2 = NULL, *task3 = NULL; + isc_task_t *task1 = NULL, *task2 = NULL, *task3 = NULL; UNUSED(state); @@ -188,8 +182,7 @@ set_privilege(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(create_pool, _setup, _teardown), cmocka_unit_test_setup_teardown(expand_pool, _setup, _teardown), @@ -206,8 +199,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/time_test.c b/lib/isc/tests/time_test.c index c82840f84a..7508cdefda 100644 --- a/lib/isc/tests/time_test.c +++ b/lib/isc/tests/time_test.c @@ -28,11 +28,10 @@ /* parse http time stamp */ static void -isc_time_parsehttptimestamp_test(void **state) -{ +isc_time_parsehttptimestamp_test(void **state) { isc_result_t result; - isc_time_t t, x; - char buf[ISC_FORMATHTTPTIMESTAMP_SIZE]; + isc_time_t t, x; + char buf[ISC_FORMATHTTPTIMESTAMP_SIZE]; UNUSED(state); @@ -48,11 +47,10 @@ isc_time_parsehttptimestamp_test(void **state) /* print UTC in ISO8601 */ static void -isc_time_formatISO8601_test(void **state) -{ +isc_time_formatISO8601_test(void **state) { isc_result_t result; - isc_time_t t; - char buf[64]; + isc_time_t t; + char buf[64]; UNUSED(state); @@ -85,11 +83,10 @@ isc_time_formatISO8601_test(void **state) /* print UTC in ISO8601 with milliseconds */ static void -isc_time_formatISO8601ms_test(void **state) -{ +isc_time_formatISO8601ms_test(void **state) { isc_result_t result; - isc_time_t t; - char buf[64]; + isc_time_t t; + char buf[64]; UNUSED(state); @@ -123,11 +120,10 @@ isc_time_formatISO8601ms_test(void **state) /* print local time in ISO8601 */ static void -isc_time_formatISO8601L_test(void **state) -{ +isc_time_formatISO8601L_test(void **state) { isc_result_t result; - isc_time_t t; - char buf[64]; + isc_time_t t; + char buf[64]; UNUSED(state); @@ -159,11 +155,10 @@ isc_time_formatISO8601L_test(void **state) /* print local time in ISO8601 with milliseconds */ static void -isc_time_formatISO8601Lms_test(void **state) -{ +isc_time_formatISO8601Lms_test(void **state) { isc_result_t result; - isc_time_t t; - char buf[64]; + isc_time_t t; + char buf[64]; UNUSED(state); @@ -196,11 +191,10 @@ isc_time_formatISO8601Lms_test(void **state) /* print UTC time as yyyymmddhhmmsssss */ static void -isc_time_formatshorttimestamp_test(void **state) -{ +isc_time_formatshorttimestamp_test(void **state) { isc_result_t result; - isc_time_t t; - char buf[64]; + isc_time_t t; + char buf[64]; UNUSED(state); @@ -226,8 +220,7 @@ isc_time_formatshorttimestamp_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(isc_time_parsehttptimestamp_test), cmocka_unit_test(isc_time_formatISO8601_test), @@ -245,8 +238,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/tests/timer_test.c b/lib/isc/tests/timer_test.c index 14c824e0d7..1e6f004700 100644 --- a/lib/isc/tests/timer_test.c +++ b/lib/isc/tests/timer_test.c @@ -39,24 +39,23 @@ /* Set to true (or use -v option) for verbose output */ static bool verbose = false; -#define FUDGE_SECONDS 0 /* in absence of clock_getres() */ +#define FUDGE_SECONDS 0 /* in absence of clock_getres() */ #define FUDGE_NANOSECONDS 500000000 /* in absence of clock_getres() */ -static isc_timer_t * timer = NULL; -static isc_condition_t cv; -static isc_mutex_t mx; -static isc_time_t endtime; -static isc_mutex_t lasttime_mx; -static isc_time_t lasttime; -static int seconds; -static int nanoseconds; -static atomic_int_fast32_t eventcnt; +static isc_timer_t *timer = NULL; +static isc_condition_t cv; +static isc_mutex_t mx; +static isc_time_t endtime; +static isc_mutex_t lasttime_mx; +static isc_time_t lasttime; +static int seconds; +static int nanoseconds; +static atomic_int_fast32_t eventcnt; static atomic_uint_fast32_t errcnt; -static int nevents; +static int nevents; static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -71,8 +70,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); isc_test_end(); @@ -81,8 +79,7 @@ _teardown(void **state) } static void -shutdown(isc_task_t *task, isc_event_t *event) -{ +shutdown(isc_task_t *task, isc_event_t *event) { isc_result_t result; UNUSED(task); @@ -105,10 +102,9 @@ shutdown(isc_task_t *task, isc_event_t *event) static void setup_test(isc_timertype_t timertype, isc_time_t *expires, isc_interval_t *interval, - void (*action)(isc_task_t *, isc_event_t *)) -{ + void (*action)(isc_task_t *, isc_event_t *)) { isc_result_t result; - isc_task_t * task = NULL; + isc_task_t *task = NULL; isc_time_settoepoch(&endtime); atomic_init(&eventcnt, 0); @@ -152,45 +148,40 @@ setup_test(isc_timertype_t timertype, isc_time_t *expires, } static void -set_global_error(isc_result_t result) -{ +set_global_error(isc_result_t result) { (void)atomic_compare_exchange_strong( &errcnt, &(uint_fast32_t){ ISC_R_SUCCESS }, result); } static void -subthread_assert_true(bool expected) -{ +subthread_assert_true(bool expected) { if (!expected) { set_global_error(ISC_R_UNEXPECTED); } } static void -subthread_assert_int_equal(int observed, int expected) -{ +subthread_assert_int_equal(int observed, int expected) { if (observed != expected) { set_global_error(ISC_R_UNEXPECTED); } } static void -subthread_assert_result_equal(isc_result_t result, isc_result_t expected) -{ +subthread_assert_result_equal(isc_result_t result, isc_result_t expected) { if (result != expected) { set_global_error(result); } } static void -ticktock(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result; - isc_time_t now; - isc_time_t base; - isc_time_t ulim; - isc_time_t llim; - isc_interval_t interval; +ticktock(isc_task_t *task, isc_event_t *event) { + isc_result_t result; + isc_time_t now; + isc_time_t base; + isc_time_t ulim; + isc_time_t llim; + isc_interval_t interval; isc_eventtype_t expected_event_type; int tick = atomic_fetch_add(&eventcnt, 1); @@ -250,9 +241,8 @@ ticktock(isc_task_t *task, isc_event_t *event) /* timer type ticker */ static void -ticker(void **state) -{ - isc_time_t expires; +ticker(void **state) { + isc_time_t expires; isc_interval_t interval; UNUSED(state); @@ -269,10 +259,9 @@ ticker(void **state) /* timer type once reaches lifetime */ static void -once_life(void **state) -{ - isc_result_t result; - isc_time_t expires; +once_life(void **state) { + isc_result_t result; + isc_time_t expires; isc_interval_t interval; UNUSED(state); @@ -291,13 +280,12 @@ once_life(void **state) } static void -test_idle(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result; - isc_time_t now; - isc_time_t base; - isc_time_t ulim; - isc_time_t llim; +test_idle(isc_task_t *task, isc_event_t *event) { + isc_result_t result; + isc_time_t now; + isc_time_t base; + isc_time_t ulim; + isc_time_t llim; isc_interval_t interval; int tick = atomic_fetch_add(&eventcnt, 1); @@ -339,10 +327,9 @@ test_idle(isc_task_t *task, isc_event_t *event) /* timer type once idles out */ static void -once_idle(void **state) -{ - isc_result_t result; - isc_time_t expires; +once_idle(void **state) { + isc_result_t result; + isc_time_t expires; isc_interval_t interval; UNUSED(state); @@ -362,14 +349,13 @@ once_idle(void **state) /* timer reset */ static void -test_reset(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result; - isc_time_t now; - isc_time_t base; - isc_time_t ulim; - isc_time_t llim; - isc_time_t expires; +test_reset(isc_task_t *task, isc_event_t *event) { + isc_result_t result; + isc_time_t now; + isc_time_t base; + isc_time_t ulim; + isc_time_t llim; + isc_time_t expires; isc_interval_t interval; int tick = atomic_fetch_add(&eventcnt, 1); @@ -432,9 +418,8 @@ test_reset(isc_task_t *task, isc_event_t *event) } static void -reset(void **state) -{ - isc_time_t expires; +reset(void **state) { + isc_time_t expires; isc_interval_t interval; UNUSED(state); @@ -449,12 +434,12 @@ reset(void **state) setup_test(isc_timertype_ticker, &expires, &interval, test_reset); } -static int startflag; -static int shutdownflag; +static int startflag; +static int shutdownflag; static isc_timer_t *tickertimer = NULL; static isc_timer_t *oncetimer = NULL; -static isc_task_t * task1 = NULL; -static isc_task_t * task2 = NULL; +static isc_task_t *task1 = NULL; +static isc_task_t *task2 = NULL; /* * task1 blocks on mx while events accumulate @@ -462,8 +447,7 @@ static isc_task_t * task2 = NULL; */ static void -start_event(isc_task_t *task, isc_event_t *event) -{ +start_event(isc_task_t *task, isc_event_t *event) { UNUSED(task); if (verbose) { @@ -480,10 +464,9 @@ start_event(isc_task_t *task, isc_event_t *event) } static void -tick_event(isc_task_t *task, isc_event_t *event) -{ - isc_result_t result; - isc_time_t expires; +tick_event(isc_task_t *task, isc_event_t *event) { + isc_result_t result; + isc_time_t expires; isc_interval_t interval; UNUSED(task); @@ -511,8 +494,7 @@ tick_event(isc_task_t *task, isc_event_t *event) } static void -once_event(isc_task_t *task, isc_event_t *event) -{ +once_event(isc_task_t *task, isc_event_t *event) { isc_result_t result; if (verbose) { @@ -534,8 +516,7 @@ once_event(isc_task_t *task, isc_event_t *event) } static void -shutdown_purge(isc_task_t *task, isc_event_t *event) -{ +shutdown_purge(isc_task_t *task, isc_event_t *event) { isc_result_t result; UNUSED(task); @@ -560,11 +541,10 @@ shutdown_purge(isc_task_t *task, isc_event_t *event) /* timer events purged */ static void -purge(void **state) -{ - isc_result_t result; - isc_event_t * event = NULL; - isc_time_t expires; +purge(void **state) { + isc_result_t result; + isc_event_t *event = NULL; + isc_time_t expires; isc_interval_t interval; UNUSED(state); @@ -638,8 +618,7 @@ purge(void **state) } int -main(int argc, char **argv) -{ +main(int argc, char **argv) { const struct CMUnitTest tests[] = { cmocka_unit_test(ticker), cmocka_unit_test(once_life), cmocka_unit_test(once_idle), cmocka_unit_test(reset), @@ -665,8 +644,7 @@ main(int argc, char **argv) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isc/timer.c b/lib/isc/timer.c index d105365fcf..d4fd5dd0d7 100644 --- a/lib/isc/timer.c +++ b/lib/isc/timer.c @@ -34,7 +34,7 @@ #endif /* ifdef OPENSSL_LEAKS */ #ifdef ISC_TIMER_TRACE -#define XTRACE(s) fprintf(stderr, "%s\n", (s)) +#define XTRACE(s) fprintf(stderr, "%s\n", (s)) #define XTRACEID(s, t) fprintf(stderr, "%s %p\n", (s), (t)) #define XTRACETIME(s, d) \ fprintf(stderr, "%s %u.%09u\n", (s), (d).seconds, (d).nanoseconds) @@ -52,60 +52,58 @@ #define XTRACETIMER(s, t, d) #endif /* ISC_TIMER_TRACE */ -#define TIMER_MAGIC ISC_MAGIC('T', 'I', 'M', 'R') +#define TIMER_MAGIC ISC_MAGIC('T', 'I', 'M', 'R') #define VALID_TIMER(t) ISC_MAGIC_VALID(t, TIMER_MAGIC) -typedef struct isc__timer isc__timer_t; +typedef struct isc__timer isc__timer_t; typedef struct isc__timermgr isc__timermgr_t; struct isc__timer { /*! Not locked. */ - isc_timer_t common; + isc_timer_t common; isc__timermgr_t *manager; - isc_mutex_t lock; - isc_refcount_t references; + isc_mutex_t lock; + isc_refcount_t references; /*! Locked by timer lock. */ isc_time_t idle; /*! Locked by manager lock. */ - isc_timertype_t type; - isc_time_t expires; - isc_interval_t interval; - isc_task_t * task; + isc_timertype_t type; + isc_time_t expires; + isc_interval_t interval; + isc_task_t *task; isc_taskaction_t action; - void * arg; - unsigned int index; - isc_time_t due; + void *arg; + unsigned int index; + isc_time_t due; LINK(isc__timer_t) link; }; #define TIMER_MANAGER_MAGIC ISC_MAGIC('T', 'I', 'M', 'M') -#define VALID_MANAGER(m) ISC_MAGIC_VALID(m, TIMER_MANAGER_MAGIC) +#define VALID_MANAGER(m) ISC_MAGIC_VALID(m, TIMER_MANAGER_MAGIC) struct isc__timermgr { /* Not locked. */ isc_timermgr_t common; - isc_mem_t * mctx; - isc_mutex_t lock; + isc_mem_t *mctx; + isc_mutex_t lock; /* Locked by manager lock. */ bool done; LIST(isc__timer_t) timers; - unsigned int nscheduled; - isc_time_t due; + unsigned int nscheduled; + isc_time_t due; isc_condition_t wakeup; - isc_thread_t thread; - isc_heap_t * heap; + isc_thread_t thread; + 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) -{ - isc_result_t result; +schedule(isc__timer_t *timer, isc_time_t *now, bool signal_ok) { + isc_result_t result; isc__timermgr_t *manager; - isc_time_t due; - int cmp; + isc_time_t due; + int cmp; /*! * Note: the caller must ensure locking. @@ -124,7 +122,8 @@ schedule(isc__timer_t *timer, isc_time_t *now, bool signal_ok) return (result); } if (timer->type == isc_timertype_limited && - isc_time_compare(&timer->expires, &due) < 0) { + isc_time_compare(&timer->expires, &due) < 0) + { due = timer->expires; } } else { @@ -132,8 +131,8 @@ schedule(isc__timer_t *timer, isc_time_t *now, bool signal_ok) due = timer->expires; } else if (isc_time_isepoch(&timer->expires)) { due = timer->idle; - } else if (isc_time_compare(&timer->idle, &timer->expires) < - 0) { + } else if (isc_time_compare(&timer->idle, &timer->expires) < 0) + { due = timer->idle; } else { due = timer->expires; @@ -189,9 +188,8 @@ schedule(isc__timer_t *timer, isc_time_t *now, bool signal_ok) } static inline void -deschedule(isc__timer_t *timer) -{ - bool need_wakeup = false; +deschedule(isc__timer_t *timer) { + bool need_wakeup = false; isc__timermgr_t *manager; /* @@ -215,8 +213,7 @@ deschedule(isc__timer_t *timer) } static void -destroy(isc__timer_t *timer) -{ +destroy(isc__timer_t *timer) { isc__timermgr_t *manager = timer->manager; /* @@ -243,16 +240,15 @@ isc_result_t isc_timer_create(isc_timermgr_t *manager0, isc_timertype_t type, const isc_time_t *expires, const isc_interval_t *interval, isc_task_t *task, isc_taskaction_t action, void *arg, - isc_timer_t **timerp) -{ + isc_timer_t **timerp) { REQUIRE(VALID_MANAGER(manager0)); REQUIRE(task != NULL); REQUIRE(action != NULL); isc__timermgr_t *manager; - isc__timer_t * timer; - isc_result_t result; - isc_time_t now; + isc__timer_t *timer; + isc_result_t result; + isc_time_t now; /* * Create a new 'type' timer managed by 'manager'. The timers @@ -360,12 +356,11 @@ isc_timer_create(isc_timermgr_t *manager0, isc_timertype_t type, isc_result_t isc_timer_reset(isc_timer_t *timer0, isc_timertype_t type, const isc_time_t *expires, const isc_interval_t *interval, - bool purge) -{ - isc__timer_t * timer; - isc_time_t now; + bool purge) { + isc__timer_t *timer; + isc_time_t now; isc__timermgr_t *manager; - isc_result_t result; + isc_result_t result; /* * Change the timer's type, expires, and interval values to the given @@ -437,9 +432,8 @@ isc_timer_reset(isc_timer_t *timer0, isc_timertype_t type, } isc_timertype_t -isc_timer_gettype(isc_timer_t *timer0) -{ - isc__timer_t * timer; +isc_timer_gettype(isc_timer_t *timer0) { + isc__timer_t *timer; isc_timertype_t t; REQUIRE(VALID_TIMER(timer0)); @@ -453,11 +447,10 @@ isc_timer_gettype(isc_timer_t *timer0) } isc_result_t -isc_timer_touch(isc_timer_t *timer0) -{ +isc_timer_touch(isc_timer_t *timer0) { isc__timer_t *timer; - isc_result_t result; - isc_time_t now; + isc_result_t result; + isc_time_t now; /* * Set the last-touched time of 'timer' to the current time. @@ -486,8 +479,7 @@ isc_timer_touch(isc_timer_t *timer0) } void -isc_timer_attach(isc_timer_t *timer0, isc_timer_t **timerp) -{ +isc_timer_attach(isc_timer_t *timer0, isc_timer_t **timerp) { isc__timer_t *timer; /* @@ -503,8 +495,7 @@ isc_timer_attach(isc_timer_t *timer0, isc_timer_t **timerp) } void -isc_timer_detach(isc_timer_t **timerp) -{ +isc_timer_detach(isc_timer_t **timerp) { isc__timer_t *timer; /* @@ -523,14 +514,13 @@ isc_timer_detach(isc_timer_t **timerp) } static void -dispatch(isc__timermgr_t *manager, isc_time_t *now) -{ - bool done = false, post_event, need_schedule; +dispatch(isc__timermgr_t *manager, isc_time_t *now) { + bool done = false, post_event, need_schedule; isc_timerevent_t *event; - isc_eventtype_t type = 0; - isc__timer_t * timer; - isc_result_t result; - bool idle; + isc_eventtype_t type = 0; + isc__timer_t *timer; + isc_result_t result; + bool idle; /*! * The caller must be holding the manager lock. @@ -557,8 +547,8 @@ dispatch(isc__timermgr_t *manager, isc_time_t *now) need_schedule = true; } } else if (!isc_time_isepoch(&timer->expires) && - isc_time_compare(now, &timer->expires) >= - 0) { + isc_time_compare(now, &timer->expires) >= 0) + { type = ISC_TIMEREVENT_LIFE; post_event = true; need_schedule = false; @@ -633,11 +623,10 @@ static isc_threadresult_t #ifdef _WIN32 /* XXXDCL */ WINAPI #endif /* ifdef _WIN32 */ - run(void *uap) -{ + run(void *uap) { isc__timermgr_t *manager = uap; - isc_time_t now; - isc_result_t result; + isc_time_t now; + isc_result_t result; LOCK(&manager->lock); while (!manager->done) { @@ -669,8 +658,7 @@ static isc_threadresult_t } static bool -sooner(void *v1, void *v2) -{ +sooner(void *v1, void *v2) { isc__timer_t *t1, *t2; t1 = v1; @@ -685,8 +673,7 @@ sooner(void *v1, void *v2) } static void -set_index(void *what, unsigned int index) -{ +set_index(void *what, unsigned int index) { isc__timer_t *timer; REQUIRE(VALID_TIMER(what)); @@ -696,10 +683,9 @@ set_index(void *what, unsigned int index) } isc_result_t -isc_timermgr_create(isc_mem_t *mctx, isc_timermgr_t **managerp) -{ +isc_timermgr_create(isc_mem_t *mctx, isc_timermgr_t **managerp) { isc__timermgr_t *manager; - isc_result_t result; + isc_result_t result; /* * Create a timer manager. @@ -735,8 +721,7 @@ isc_timermgr_create(isc_mem_t *mctx, isc_timermgr_t **managerp) } void -isc_timermgr_poke(isc_timermgr_t *manager0) -{ +isc_timermgr_poke(isc_timermgr_t *manager0) { isc__timermgr_t *manager; REQUIRE(VALID_MANAGER(manager0)); @@ -746,8 +731,7 @@ isc_timermgr_poke(isc_timermgr_t *manager0) } void -isc_timermgr_destroy(isc_timermgr_t **managerp) -{ +isc_timermgr_destroy(isc_timermgr_t **managerp) { isc__timermgr_t *manager; /* @@ -787,8 +771,7 @@ isc_timermgr_destroy(isc_timermgr_t **managerp) } isc_result_t -isc_timermgr_createinctx(isc_mem_t *mctx, isc_timermgr_t **managerp) -{ +isc_timermgr_createinctx(isc_mem_t *mctx, isc_timermgr_t **managerp) { isc_result_t result; result = isc_timermgr_create(mctx, managerp); diff --git a/lib/isc/tm.c b/lib/isc/tm.c index 8733f0b191..d4072ed0f8 100644 --- a/lib/isc/tm.c +++ b/lib/isc/tm.c @@ -83,8 +83,7 @@ static const char *abmon[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", static const char *am_pm[2] = { "AM", "PM" }; static int -conv_num(const char **buf, int *dest, int llim, int ulim) -{ +conv_num(const char **buf, int *dest, int llim, int ulim) { int result = 0; /* The limit also determines the number of valid digits. */ @@ -110,11 +109,10 @@ conv_num(const char **buf, int *dest, int llim, int ulim) } time_t -isc_tm_timegm(struct tm *tm) -{ +isc_tm_timegm(struct tm *tm) { time_t ret; - int i, yday = 0, leapday; - int mdays[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30 }; + int i, yday = 0, leapday; + int mdays[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30 }; leapday = ((((tm->tm_year + 1900) % 4) == 0 && ((tm->tm_year + 1900) % 100) != 0) || @@ -135,12 +133,11 @@ isc_tm_timegm(struct tm *tm) } char * -isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) -{ - char c, *ret; +isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) { + char c, *ret; const char *bp; - size_t len = 0; - int alt_format, i, split_year = 0; + size_t len = 0; + int alt_format, i, split_year = 0; REQUIRE(buf != NULL); REQUIRE(fmt != NULL); @@ -379,7 +376,8 @@ isc_tm_strptime(const char *buf, const char *fmt, struct tm *tm) break; } /* PM? */ - else if (strcasecmp(am_pm[1], bp) == 0) { + else if (strcasecmp(am_pm[1], bp) == 0) + { if (tm->tm_hour > 11) { return (0); } diff --git a/lib/isc/unix/dir.c b/lib/isc/unix/dir.c index 77b2e9edaf..82a25e34c1 100644 --- a/lib/isc/unix/dir.c +++ b/lib/isc/unix/dir.c @@ -27,12 +27,11 @@ #include #include -#define ISC_DIR_MAGIC ISC_MAGIC('D', 'I', 'R', '*') +#define ISC_DIR_MAGIC ISC_MAGIC('D', 'I', 'R', '*') #define VALID_DIR(dir) ISC_MAGIC_VALID(dir, ISC_DIR_MAGIC) void -isc_dir_init(isc_dir_t *dir) -{ +isc_dir_init(isc_dir_t *dir) { REQUIRE(dir != NULL); dir->entry.name[0] = '\0'; @@ -48,9 +47,8 @@ isc_dir_init(isc_dir_t *dir) * NULL will be returned. */ isc_result_t -isc_dir_open(isc_dir_t *dir, const char *dirname) -{ - char * p; +isc_dir_open(isc_dir_t *dir, const char *dirname) { + char *p; isc_result_t result = ISC_R_SUCCESS; REQUIRE(VALID_DIR(dir)); @@ -96,8 +94,7 @@ isc_dir_open(isc_dir_t *dir, const char *dirname) * the dir stream and reads the first file in one operation. */ isc_result_t -isc_dir_read(isc_dir_t *dir) -{ +isc_dir_read(isc_dir_t *dir) { struct dirent *entry; REQUIRE(VALID_DIR(dir) && dir->handle != NULL); @@ -132,8 +129,7 @@ isc_dir_read(isc_dir_t *dir) * \brief Close directory stream. */ void -isc_dir_close(isc_dir_t *dir) -{ +isc_dir_close(isc_dir_t *dir) { REQUIRE(VALID_DIR(dir) && dir->handle != NULL); (void)closedir(dir->handle); @@ -144,8 +140,7 @@ isc_dir_close(isc_dir_t *dir) * \brief Reposition directory stream at start. */ isc_result_t -isc_dir_reset(isc_dir_t *dir) -{ +isc_dir_reset(isc_dir_t *dir) { REQUIRE(VALID_DIR(dir) && dir->handle != NULL); rewinddir(dir->handle); @@ -154,8 +149,7 @@ isc_dir_reset(isc_dir_t *dir) } isc_result_t -isc_dir_chdir(const char *dirname) -{ +isc_dir_chdir(const char *dirname) { /*! * \brief Change the current directory to 'dirname'. */ @@ -170,8 +164,7 @@ isc_dir_chdir(const char *dirname) } isc_result_t -isc_dir_chroot(const char *dirname) -{ +isc_dir_chroot(const char *dirname) { #ifdef HAVE_CHROOT void *tmp; #endif /* ifdef HAVE_CHROOT */ @@ -201,13 +194,12 @@ isc_dir_chroot(const char *dirname) } isc_result_t -isc_dir_createunique(char *templet) -{ +isc_dir_createunique(char *templet) { isc_result_t result; - char * x; - char * p; - int i; - int pid; + char *x; + char *p; + int i; + int pid; REQUIRE(templet != NULL); @@ -221,7 +213,8 @@ isc_dir_createunique(char *templet) * Replace trailing Xs with the process-id, zero-filled. */ for (x = templet + strlen(templet) - 1; *x == 'X' && x >= templet; - x--, pid /= 10) { + x--, pid /= 10) + { *x = pid % 10 + '0'; } diff --git a/lib/isc/unix/errno.c b/lib/isc/unix/errno.c index 61afb94798..0f1c077423 100644 --- a/lib/isc/unix/errno.c +++ b/lib/isc/unix/errno.c @@ -17,7 +17,6 @@ #include "errno2result.h" isc_result_t -isc_errno_toresult(int err) -{ +isc_errno_toresult(int err) { return (isc___errno2result(err, false, 0, 0)); } diff --git a/lib/isc/unix/errno2result.c b/lib/isc/unix/errno2result.c index 5e349c0dcb..58c137f7f2 100644 --- a/lib/isc/unix/errno2result.c +++ b/lib/isc/unix/errno2result.c @@ -29,8 +29,7 @@ */ isc_result_t isc___errno2result(int posixerrno, bool dolog, const char *file, - unsigned int line) -{ + unsigned int line) { char strbuf[ISC_STRERRORSIZE]; switch (posixerrno) { diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c index 7143ed704b..e5555f3514 100644 --- a/lib/isc/unix/file.c +++ b/lib/isc/unix/file.c @@ -79,8 +79,7 @@ * annoying MP issues. BTW, Win32 has stat(). */ static isc_result_t -file_stats(const char *file, struct stat *stats) -{ +file_stats(const char *file, struct stat *stats) { isc_result_t result = ISC_R_SUCCESS; REQUIRE(file != NULL); @@ -94,8 +93,7 @@ file_stats(const char *file, struct stat *stats) } static isc_result_t -fd_stats(int fd, struct stat *stats) -{ +fd_stats(int fd, struct stat *stats) { isc_result_t result = ISC_R_SUCCESS; REQUIRE(stats != NULL); @@ -108,10 +106,9 @@ fd_stats(int fd, struct stat *stats) } isc_result_t -isc_file_getsizefd(int fd, off_t *size) -{ +isc_file_getsizefd(int fd, off_t *size) { isc_result_t result; - struct stat stats; + struct stat stats; REQUIRE(size != NULL); @@ -125,10 +122,9 @@ isc_file_getsizefd(int fd, off_t *size) } isc_result_t -isc_file_mode(const char *file, mode_t *modep) -{ +isc_file_mode(const char *file, mode_t *modep) { isc_result_t result; - struct stat stats; + struct stat stats; REQUIRE(modep != NULL); @@ -141,10 +137,9 @@ isc_file_mode(const char *file, mode_t *modep) } isc_result_t -isc_file_getmodtime(const char *file, isc_time_t *modtime) -{ +isc_file_getmodtime(const char *file, isc_time_t *modtime) { isc_result_t result; - struct stat stats; + struct stat stats; REQUIRE(file != NULL); REQUIRE(modtime != NULL); @@ -163,10 +158,9 @@ isc_file_getmodtime(const char *file, isc_time_t *modtime) } isc_result_t -isc_file_getsize(const char *file, off_t *size) -{ +isc_file_getsize(const char *file, off_t *size) { isc_result_t result; - struct stat stats; + struct stat stats; REQUIRE(file != NULL); REQUIRE(size != NULL); @@ -181,8 +175,7 @@ isc_file_getsize(const char *file, off_t *size) } isc_result_t -isc_file_settime(const char *file, isc_time_t *when) -{ +isc_file_settime(const char *file, isc_time_t *when) { struct timeval times[2]; REQUIRE(file != NULL && when != NULL); @@ -225,15 +218,13 @@ isc_file_settime(const char *file, isc_time_t *when) #define TEMPLATE "tmp-XXXXXXXXXX" /*%< 14 characters. */ isc_result_t -isc_file_mktemplate(const char *path, char *buf, size_t buflen) -{ +isc_file_mktemplate(const char *path, char *buf, size_t buflen) { return (isc_file_template(path, TEMPLATE, buf, buflen)); } isc_result_t isc_file_template(const char *path, const char *templet, char *buf, - size_t buflen) -{ + size_t buflen) { const char *s; REQUIRE(templet != NULL); @@ -274,8 +265,7 @@ static const char alphnum[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuv" "wxyz0123456789"; isc_result_t -isc_file_renameunique(const char *file, char *templet) -{ +isc_file_renameunique(const char *file, char *templet) { char *x; char *cp; @@ -322,27 +312,24 @@ isc_file_renameunique(const char *file, char *templet) } isc_result_t -isc_file_openunique(char *templet, FILE **fp) -{ +isc_file_openunique(char *templet, FILE **fp) { int mode = S_IWUSR | S_IRUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; return (isc_file_openuniquemode(templet, mode, fp)); } isc_result_t -isc_file_openuniqueprivate(char *templet, FILE **fp) -{ +isc_file_openuniqueprivate(char *templet, FILE **fp) { int mode = S_IWUSR | S_IRUSR; return (isc_file_openuniquemode(templet, mode, fp)); } isc_result_t -isc_file_openuniquemode(char *templet, int mode, FILE **fp) -{ - int fd; - FILE * f; +isc_file_openuniquemode(char *templet, int mode, FILE **fp) { + int fd; + FILE *f; isc_result_t result = ISC_R_SUCCESS; - char * x; - char * cp; + char *x; + char *cp; REQUIRE(templet != NULL); REQUIRE(fp != NULL && *fp == NULL); @@ -396,28 +383,24 @@ isc_file_openuniquemode(char *templet, int mode, FILE **fp) } isc_result_t -isc_file_bopenunique(char *templet, FILE **fp) -{ +isc_file_bopenunique(char *templet, FILE **fp) { int mode = S_IWUSR | S_IRUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; return (isc_file_openuniquemode(templet, mode, fp)); } isc_result_t -isc_file_bopenuniqueprivate(char *templet, FILE **fp) -{ +isc_file_bopenuniqueprivate(char *templet, FILE **fp) { int mode = S_IWUSR | S_IRUSR; return (isc_file_openuniquemode(templet, mode, fp)); } isc_result_t -isc_file_bopenuniquemode(char *templet, int mode, FILE **fp) -{ +isc_file_bopenuniquemode(char *templet, int mode, FILE **fp) { return (isc_file_openuniquemode(templet, mode, fp)); } isc_result_t -isc_file_remove(const char *filename) -{ +isc_file_remove(const char *filename) { int r; REQUIRE(filename != NULL); @@ -431,8 +414,7 @@ isc_file_remove(const char *filename) } isc_result_t -isc_file_rename(const char *oldname, const char *newname) -{ +isc_file_rename(const char *oldname, const char *newname) { int r; REQUIRE(oldname != NULL); @@ -447,8 +429,7 @@ isc_file_rename(const char *oldname, const char *newname) } bool -isc_file_exists(const char *pathname) -{ +isc_file_exists(const char *pathname) { struct stat stats; REQUIRE(pathname != NULL); @@ -457,8 +438,7 @@ isc_file_exists(const char *pathname) } isc_result_t -isc_file_isplainfile(const char *filename) -{ +isc_file_isplainfile(const char *filename) { /* * This function returns success if filename is a plain file. */ @@ -477,8 +457,7 @@ isc_file_isplainfile(const char *filename) } isc_result_t -isc_file_isplainfilefd(int fd) -{ +isc_file_isplainfilefd(int fd) { /* * This function returns success if filename is a plain file. */ @@ -497,8 +476,7 @@ isc_file_isplainfilefd(int fd) } isc_result_t -isc_file_isdirectory(const char *filename) -{ +isc_file_isdirectory(const char *filename) { /* * This function returns success if filename exists and is a * directory. @@ -518,22 +496,19 @@ isc_file_isdirectory(const char *filename) } bool -isc_file_isabsolute(const char *filename) -{ +isc_file_isabsolute(const char *filename) { REQUIRE(filename != NULL); return (filename[0] == '/'); } bool -isc_file_iscurrentdir(const char *filename) -{ +isc_file_iscurrentdir(const char *filename) { REQUIRE(filename != NULL); return (filename[0] == '.' && filename[1] == '\0'); } bool -isc_file_ischdiridempotent(const char *filename) -{ +isc_file_ischdiridempotent(const char *filename) { REQUIRE(filename != NULL); if (isc_file_isabsolute(filename)) { return (true); @@ -545,8 +520,7 @@ isc_file_ischdiridempotent(const char *filename) } const char * -isc_file_basename(const char *filename) -{ +isc_file_basename(const char *filename) { const char *s; REQUIRE(filename != NULL); @@ -560,10 +534,9 @@ isc_file_basename(const char *filename) } isc_result_t -isc_file_progname(const char *filename, char *buf, size_t buflen) -{ +isc_file_progname(const char *filename, char *buf, size_t buflen) { const char *base; - size_t len; + size_t len; REQUIRE(filename != NULL); REQUIRE(buf != NULL); @@ -586,9 +559,8 @@ isc_file_progname(const char *filename, char *buf, size_t buflen) * concatenated with a relative pathname to make a valid pathname string. */ static isc_result_t -dir_current(char *dirname, size_t length) -{ - char * cwd; +dir_current(char *dirname, size_t length) { + char *cwd; isc_result_t result = ISC_R_SUCCESS; REQUIRE(dirname != NULL); @@ -614,8 +586,7 @@ dir_current(char *dirname, size_t length) } isc_result_t -isc_file_absolutepath(const char *filename, char *path, size_t pathlen) -{ +isc_file_absolutepath(const char *filename, char *path, size_t pathlen) { isc_result_t result; result = dir_current(path, pathlen); if (result != ISC_R_SUCCESS) { @@ -629,8 +600,7 @@ isc_file_absolutepath(const char *filename, char *path, size_t pathlen) } isc_result_t -isc_file_truncate(const char *filename, isc_offset_t size) -{ +isc_file_truncate(const char *filename, isc_offset_t size) { isc_result_t result = ISC_R_SUCCESS; if (truncate(filename, size) < 0) { @@ -640,13 +610,12 @@ isc_file_truncate(const char *filename, isc_offset_t size) } isc_result_t -isc_file_safecreate(const char *filename, FILE **fp) -{ +isc_file_safecreate(const char *filename, FILE **fp) { isc_result_t result; - int flags; - struct stat sb; - FILE * f; - int fd; + int flags; + struct stat sb; + FILE *f; + int fd; REQUIRE(filename != NULL); REQUIRE(fp != NULL && *fp == NULL); @@ -681,9 +650,8 @@ isc_file_safecreate(const char *filename, FILE **fp) isc_result_t isc_file_splitpath(isc_mem_t *mctx, const char *path, char **dirname, - char const **bname) -{ - char * dir; + char const **bname) { + char *dir; const char *file, *slash; if (path == NULL) { @@ -720,50 +688,49 @@ isc_file_splitpath(isc_mem_t *mctx, const char *path, char **dirname, } void * -isc_file_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) -{ +isc_file_mmap(void *addr, size_t len, int prot, int flags, int fd, + off_t offset) { #ifdef HAVE_MMAP return (mmap(addr, len, prot, flags, fd, offset)); #else /* ifdef HAVE_MMAP */ - void * buf; - ssize_t ret; - off_t end; + void *buf; + ssize_t ret; + off_t end; - UNUSED(addr); - UNUSED(prot); - UNUSED(flags); + UNUSED(addr); + UNUSED(prot); + UNUSED(flags); - end = lseek(fd, 0, SEEK_END); - lseek(fd, offset, SEEK_SET); - if (end - offset < (off_t)len) { - len = end - offset; - } + end = lseek(fd, 0, SEEK_END); + lseek(fd, offset, SEEK_SET); + if (end - offset < (off_t)len) { + len = end - offset; + } - buf = malloc(len); - if (buf == NULL) { - return (NULL); - } + buf = malloc(len); + if (buf == NULL) { + return (NULL); + } - ret = read(fd, buf, len); - if (ret != (ssize_t)len) { - free(buf); - buf = NULL; - } + ret = read(fd, buf, len); + if (ret != (ssize_t)len) { + free(buf); + buf = NULL; + } - return (buf); + return (buf); #endif /* ifdef HAVE_MMAP */ } int -isc_file_munmap(void *addr, size_t len) -{ +isc_file_munmap(void *addr, size_t len) { #ifdef HAVE_MMAP return (munmap(addr, len)); #else /* ifdef HAVE_MMAP */ - UNUSED(len); + UNUSED(len); - free(addr); - return (0); + free(addr); + return (0); #endif /* ifdef HAVE_MMAP */ } @@ -771,10 +738,9 @@ isc_file_munmap(void *addr, size_t len) static isc_result_t digest2hex(unsigned char *digest, unsigned int digestlen, char *hash, - size_t hashlen) -{ + size_t hashlen) { unsigned int i; - int ret; + int ret; for (i = 0; i < digestlen; i++) { size_t left = hashlen - i * 2; ret = snprintf(hash + i * 2, left, "%02x", digest[i]); @@ -787,14 +753,13 @@ digest2hex(unsigned char *digest, unsigned int digestlen, char *hash, isc_result_t isc_file_sanitize(const char *dir, const char *base, const char *ext, - char *path, size_t length) -{ - char buf[PATH_MAX]; + char *path, size_t length) { + char buf[PATH_MAX]; unsigned char digest[ISC_MAX_MD_SIZE]; - unsigned int digestlen; - char hash[ISC_MAX_MD_SIZE * 2 + 1]; - size_t l = 0; - isc_result_t err; + unsigned int digestlen; + char hash[ISC_MAX_MD_SIZE * 2 + 1]; + size_t l = 0; + isc_result_t err; REQUIRE(base != NULL); REQUIRE(path != NULL); @@ -868,7 +833,6 @@ isc_file_sanitize(const char *dir, const char *base, const char *ext, } bool -isc_file_isdirwritable(const char *path) -{ +isc_file_isdirwritable(const char *path) { return (access(path, W_OK | X_OK) == 0); } diff --git a/lib/isc/unix/fsaccess.c b/lib/isc/unix/fsaccess.c index 8acf65e927..ea18c2d8d0 100644 --- a/lib/isc/unix/fsaccess.c +++ b/lib/isc/unix/fsaccess.c @@ -24,13 +24,12 @@ #include "../fsaccess.c" isc_result_t -isc_fsaccess_set(const char *path, isc_fsaccess_t access) -{ - struct stat statb; - mode_t mode; - bool is_dir = false; +isc_fsaccess_set(const char *path, isc_fsaccess_t access) { + struct stat statb; + mode_t mode; + bool is_dir = false; isc_fsaccess_t bits; - isc_result_t result; + isc_result_t result; if (stat(path, &statb) != 0) { return (isc__errno2result(errno)); diff --git a/lib/isc/unix/ifiter_getifaddrs.c b/lib/isc/unix/ifiter_getifaddrs.c index cb3ee49f4d..eb6d82c4e3 100644 --- a/lib/isc/unix/ifiter_getifaddrs.c +++ b/lib/isc/unix/ifiter_getifaddrs.c @@ -30,27 +30,26 @@ static bool seenv6 = false; /*% Iterator structure */ struct isc_interfaceiter { - unsigned int magic; /*%< Magic number. */ - isc_mem_t * mctx; - void * buf; /*%< (unused) */ - unsigned int bufsize; /*%< (always 0) */ + unsigned int magic; /*%< Magic number. */ + isc_mem_t *mctx; + void *buf; /*%< (unused) */ + unsigned int bufsize; /*%< (always 0) */ struct ifaddrs *ifaddrs; /*%< List of ifaddrs */ struct ifaddrs *pos; /*%< Ptr to current ifaddr */ isc_interface_t current; /*%< Current interface data. */ - isc_result_t result; /*%< Last result code. */ + isc_result_t result; /*%< Last result code. */ #ifdef __linux - FILE * proc; - char entry[ISC_IF_INET6_SZ]; + FILE *proc; + char entry[ISC_IF_INET6_SZ]; isc_result_t valid; #endif /* ifdef __linux */ }; isc_result_t -isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) -{ +isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) { isc_interfaceiter_t *iter; - isc_result_t result; - char strbuf[ISC_STRERRORSIZE]; + isc_result_t result; + char strbuf[ISC_STRERRORSIZE]; REQUIRE(mctx != NULL); REQUIRE(iterp != NULL); @@ -116,11 +115,10 @@ failure: */ static isc_result_t -internal_current(isc_interfaceiter_t *iter) -{ +internal_current(isc_interfaceiter_t *iter) { struct ifaddrs *ifa; - int family; - unsigned int namelen; + int family; + unsigned int namelen; REQUIRE(VALID_IFITER(iter)); @@ -184,7 +182,8 @@ internal_current(isc_interfaceiter_t *iter) } if (ifa->ifa_dstaddr != NULL && - (iter->current.flags & INTERFACE_F_POINTTOPOINT) != 0) { + (iter->current.flags & INTERFACE_F_POINTTOPOINT) != 0) + { get_addr(family, &iter->current.dstaddress, ifa->ifa_dstaddr, ifa->ifa_name); } @@ -200,8 +199,7 @@ internal_current(isc_interfaceiter_t *iter) * interfaces, otherwise ISC_R_SUCCESS. */ static isc_result_t -internal_next(isc_interfaceiter_t *iter) -{ +internal_next(isc_interfaceiter_t *iter) { if (iter->pos != NULL) { iter->pos = iter->pos->ifa_next; } @@ -218,8 +216,7 @@ internal_next(isc_interfaceiter_t *iter) } static void -internal_destroy(isc_interfaceiter_t *iter) -{ +internal_destroy(isc_interfaceiter_t *iter) { #ifdef __linux if (iter->proc != NULL) { fclose(iter->proc); @@ -233,8 +230,7 @@ internal_destroy(isc_interfaceiter_t *iter) } static void -internal_first(isc_interfaceiter_t *iter) -{ +internal_first(isc_interfaceiter_t *iter) { #ifdef __linux linux_if_inet6_first(iter); #endif /* ifdef __linux */ diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h index 2cfdaae5be..b8cd5c87f6 100644 --- a/lib/isc/unix/include/isc/net.h +++ b/lib/isc/unix/include/isc/net.h @@ -274,11 +274,11 @@ isc_net_probeunix(void); #define ISC_NET_DSCPRECVV4 0x01 /* Can receive sent DSCP value IPv4 */ #define ISC_NET_DSCPRECVV6 0x02 /* Can receive sent DSCP value IPv6 */ -#define ISC_NET_DSCPSETV4 0x04 /* Can set DSCP on socket IPv4 */ -#define ISC_NET_DSCPSETV6 0x08 /* Can set DSCP on socket IPv6 */ -#define ISC_NET_DSCPPKTV4 0x10 /* Can set DSCP on per packet IPv4 */ -#define ISC_NET_DSCPPKTV6 0x20 /* Can set DSCP on per packet IPv6 */ -#define ISC_NET_DSCPALL 0x3f /* All valid flags */ +#define ISC_NET_DSCPSETV4 0x04 /* Can set DSCP on socket IPv4 */ +#define ISC_NET_DSCPSETV6 0x08 /* Can set DSCP on socket IPv6 */ +#define ISC_NET_DSCPPKTV4 0x10 /* Can set DSCP on per packet IPv4 */ +#define ISC_NET_DSCPPKTV6 0x20 /* Can set DSCP on per packet IPv6 */ +#define ISC_NET_DSCPALL 0x3f /* All valid flags */ unsigned int isc_net_probedscp(void); diff --git a/lib/isc/unix/include/isc/stdatomic.h b/lib/isc/unix/include/isc/stdatomic.h index 3fb127334d..7339b87f91 100644 --- a/lib/isc/unix/include/isc/stdatomic.h +++ b/lib/isc/unix/include/isc/stdatomic.h @@ -82,7 +82,7 @@ typedef bool atomic_bool; typedef uint_fast64_t atomic_uintptr_t; #if defined(__CLANG_ATOMICS) /* __c11_atomic builtins */ -#define atomic_init(obj, desired) __c11_atomic_init(obj, desired) +#define atomic_init(obj, desired) __c11_atomic_init(obj, desired) #define atomic_load_explicit(obj, order) __c11_atomic_load(obj, order) #define atomic_store_explicit(obj, desired, order) \ __c11_atomic_store(obj, desired, order) @@ -105,7 +105,7 @@ typedef uint_fast64_t atomic_uintptr_t; #define atomic_exchange_explicit(obj, desired, order) \ __c11_atomic_exchange_explicit(obj, expected, order) #elif defined(__GNUC_ATOMICS) /* __atomic builtins */ -#define atomic_init(obj, desired) (*obj = desired) +#define atomic_init(obj, desired) (*obj = desired) #define atomic_load_explicit(obj, order) __atomic_load_n(obj, order) #define atomic_store_explicit(obj, desired, order) \ __atomic_store_n(obj, desired, order) @@ -126,7 +126,7 @@ typedef uint_fast64_t atomic_uintptr_t; #define atomic_exchange_explicit(obj, desired, order) \ __atomic_exchange_n(obj, desired, order) #else /* __sync builtins */ -#define atomic_init(obj, desired) (*obj = desired) +#define atomic_init(obj, desired) (*obj = desired) #define atomic_load_explicit(obj, order) __sync_fetch_and_add(obj, 0) #define atomic_store_explicit(obj, desired, order) \ do { \ diff --git a/lib/isc/unix/interfaceiter.c b/lib/isc/unix/interfaceiter.c index a82476d607..2ff780a9e1 100644 --- a/lib/isc/unix/interfaceiter.c +++ b/lib/isc/unix/interfaceiter.c @@ -54,8 +54,7 @@ static void get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src, - char *ifname) -{ + char *ifname) { struct sockaddr_in6 *sa6; #if !defined(HAVE_IF_NAMETOINDEX) @@ -135,20 +134,16 @@ 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" #ifdef __linux static void -linux_if_inet6_first(isc_interfaceiter_t *iter) -{ +linux_if_inet6_first(isc_interfaceiter_t *iter) { if (iter->proc != NULL) { rewind(iter->proc); (void)linux_if_inet6_next(iter); @@ -158,10 +153,10 @@ linux_if_inet6_first(isc_interfaceiter_t *iter) } static isc_result_t -linux_if_inet6_next(isc_interfaceiter_t *iter) -{ +linux_if_inet6_next(isc_interfaceiter_t *iter) { if (iter->proc != NULL && - fgets(iter->entry, sizeof(iter->entry), iter->proc) != NULL) { + fgets(iter->entry, sizeof(iter->entry), iter->proc) != NULL) + { iter->valid = ISC_R_SUCCESS; } else { iter->valid = ISC_R_NOMORE; @@ -170,14 +165,13 @@ linux_if_inet6_next(isc_interfaceiter_t *iter) } static isc_result_t -linux_if_inet6_current(isc_interfaceiter_t *iter) -{ - char address[33]; - char name[IF_NAMESIZE + 1]; +linux_if_inet6_current(isc_interfaceiter_t *iter) { + char address[33]; + char name[IF_NAMESIZE + 1]; struct in6_addr addr6; - unsigned int ifindex, prefix, flag3, flag4; - int res; - unsigned int i; + unsigned int ifindex, prefix, flag3, flag4; + int res; + unsigned int i; if (iter->valid != ISC_R_SUCCESS) { return (iter->valid); @@ -205,7 +199,7 @@ linux_if_inet6_current(isc_interfaceiter_t *iter) return (ISC_R_FAILURE); } for (i = 0; i < 16; i++) { - unsigned char byte; + unsigned char byte; static const char hex[] = "0123456789abcdef"; byte = ((strchr(hex, address[i * 2]) - hex) << 4) | (strchr(hex, address[i * 2 + 1]) - hex); @@ -237,16 +231,14 @@ linux_if_inet6_current(isc_interfaceiter_t *iter) */ isc_result_t -isc_interfaceiter_current(isc_interfaceiter_t *iter, isc_interface_t *ifdata) -{ +isc_interfaceiter_current(isc_interfaceiter_t *iter, isc_interface_t *ifdata) { REQUIRE(iter->result == ISC_R_SUCCESS); memmove(ifdata, &iter->current, sizeof(*ifdata)); return (ISC_R_SUCCESS); } isc_result_t -isc_interfaceiter_first(isc_interfaceiter_t *iter) -{ +isc_interfaceiter_first(isc_interfaceiter_t *iter) { isc_result_t result; REQUIRE(VALID_IFITER(iter)); @@ -267,8 +259,7 @@ isc_interfaceiter_first(isc_interfaceiter_t *iter) } isc_result_t -isc_interfaceiter_next(isc_interfaceiter_t *iter) -{ +isc_interfaceiter_next(isc_interfaceiter_t *iter) { isc_result_t result; REQUIRE(VALID_IFITER(iter)); @@ -289,8 +280,7 @@ isc_interfaceiter_next(isc_interfaceiter_t *iter) } void -isc_interfaceiter_destroy(isc_interfaceiter_t **iterp) -{ +isc_interfaceiter_destroy(isc_interfaceiter_t **iterp) { isc_interfaceiter_t *iter; REQUIRE(iterp != NULL); iter = *iterp; diff --git a/lib/isc/unix/meminfo.c b/lib/isc/unix/meminfo.c index 80f4116581..ea13e523c1 100644 --- a/lib/isc/unix/meminfo.c +++ b/lib/isc/unix/meminfo.c @@ -18,8 +18,7 @@ #endif /* if defined(HAVE_SYS_SYSCTL_H) && !defined(__linux__) */ uint64_t -isc_meminfo_totalphys(void) -{ +isc_meminfo_totalphys(void) { #if defined(CTL_HW) && (defined(HW_PHYSMEM64) || defined(HW_MEMSIZE)) int mib[2]; mib[0] = CTL_HW; @@ -29,7 +28,7 @@ isc_meminfo_totalphys(void) mib[1] = HW_PHYSMEM64; #endif /* if defined(HW_MEMSIZE) */ uint64_t size = 0; - size_t len = sizeof(size); + size_t len = sizeof(size); if (sysctl(mib, 2, &size, &len, NULL, 0) == 0) { return (size); } diff --git a/lib/isc/unix/net.c b/lib/isc/unix/net.c index 0b349ba67e..c1c907de94 100644 --- a/lib/isc/unix/net.c +++ b/lib/isc/unix/net.c @@ -61,18 +61,18 @@ */ #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__) #define USE_SYSCTL_PORTRANGE -#define SYSCTL_V4PORTRANGE_LOW "net.inet.ip.portrange.hifirst" +#define SYSCTL_V4PORTRANGE_LOW "net.inet.ip.portrange.hifirst" #define SYSCTL_V4PORTRANGE_HIGH "net.inet.ip.portrange.hilast" -#define SYSCTL_V6PORTRANGE_LOW "net.inet.ip.portrange.hifirst" +#define SYSCTL_V6PORTRANGE_LOW "net.inet.ip.portrange.hifirst" #define SYSCTL_V6PORTRANGE_HIGH "net.inet.ip.portrange.hilast" #endif /* if defined(__FreeBSD__) || defined(__APPLE__) || \ * defined(__DragonFly__) */ #ifdef __NetBSD__ #define USE_SYSCTL_PORTRANGE -#define SYSCTL_V4PORTRANGE_LOW "net.inet.ip.anonportmin" +#define SYSCTL_V4PORTRANGE_LOW "net.inet.ip.anonportmin" #define SYSCTL_V4PORTRANGE_HIGH "net.inet.ip.anonportmax" -#define SYSCTL_V6PORTRANGE_LOW "net.inet6.ip6.anonportmin" +#define SYSCTL_V6PORTRANGE_LOW "net.inet6.ip6.anonportmin" #define SYSCTL_V6PORTRANGE_HIGH "net.inet6.ip6.anonportmax" #endif /* ifdef __NetBSD__ */ @@ -89,7 +89,7 @@ CTL_NET, PF_INET, IPPROTO_IP, IPCTL_IPPORT_HILASTAUTO \ } /* Same for IPv6 */ -#define SYSCTL_V6PORTRANGE_LOW SYSCTL_V4PORTRANGE_LOW +#define SYSCTL_V6PORTRANGE_LOW SYSCTL_V4PORTRANGE_LOW #define SYSCTL_V6PORTRANGE_HIGH SYSCTL_V4PORTRANGE_HIGH #endif /* ifdef __OpenBSD__ */ @@ -119,11 +119,10 @@ static isc_result_t ipv6pktinfo_result = ISC_R_NOTFOUND; static unsigned int dscp_result = 0; static isc_result_t -try_proto(int domain) -{ - int s; +try_proto(int domain) { + int s; isc_result_t result = ISC_R_SUCCESS; - char strbuf[ISC_STRERRORSIZE]; + char strbuf[ISC_STRERRORSIZE]; s = socket(domain, SOCK_STREAM, 0); if (s == -1) { @@ -151,14 +150,14 @@ try_proto(int domain) if (domain == PF_INET6) { struct sockaddr_in6 sin6; - unsigned int len; + unsigned int len; /* * Check to see if IPv6 is broken, as is common on Linux. */ len = sizeof(sin6); - if (getsockname(s, (struct sockaddr *)&sin6, (void *)&len) < - 0) { + if (getsockname(s, (struct sockaddr *)&sin6, (void *)&len) < 0) + { isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL, ISC_LOGMODULE_SOCKET, ISC_LOG_ERROR, "retrieving the address of an IPv6 " @@ -191,8 +190,7 @@ try_proto(int domain) } static void -initialize_action(void) -{ +initialize_action(void) { ipv4_result = try_proto(PF_INET); ipv6_result = try_proto(PF_INET6); #ifdef ISC_PLATFORM_HAVESYSUNH @@ -201,37 +199,32 @@ initialize_action(void) } static void -initialize(void) -{ +initialize(void) { RUNTIME_CHECK(isc_once_do(&once, initialize_action) == ISC_R_SUCCESS); } isc_result_t -isc_net_probeipv4(void) -{ +isc_net_probeipv4(void) { initialize(); return (ipv4_result); } isc_result_t -isc_net_probeipv6(void) -{ +isc_net_probeipv6(void) { initialize(); return (ipv6_result); } isc_result_t -isc_net_probeunix(void) -{ +isc_net_probeunix(void) { initialize(); return (unix_result); } static void -try_ipv6only(void) -{ +try_ipv6only(void) { #ifdef IPV6_V6ONLY - int s, on; + int s, on; char strbuf[ISC_STRERRORSIZE]; #endif /* ifdef IPV6_V6ONLY */ isc_result_t result; @@ -289,20 +282,18 @@ close: } static void -initialize_ipv6only(void) -{ +initialize_ipv6only(void) { RUNTIME_CHECK(isc_once_do(&once_ipv6only, try_ipv6only) == ISC_R_SUCCESS); } #ifdef __notyet__ static void -try_ipv6pktinfo(void) -{ - int s, on; - char strbuf[ISC_STRERRORSIZE]; +try_ipv6pktinfo(void) { + int s, on; + char strbuf[ISC_STRERRORSIZE]; isc_result_t result; - int optname; + int optname; result = isc_net_probeipv6(); if (result != ISC_R_SUCCESS) { @@ -339,23 +330,20 @@ close: } static void -initialize_ipv6pktinfo(void) -{ +initialize_ipv6pktinfo(void) { RUNTIME_CHECK(isc_once_do(&once_ipv6pktinfo, try_ipv6pktinfo) == ISC_R_SUCCESS); } #endif /* ifdef __notyet__ */ isc_result_t -isc_net_probe_ipv6only(void) -{ +isc_net_probe_ipv6only(void) { initialize_ipv6only(); return (ipv6only_result); } isc_result_t -isc_net_probe_ipv6pktinfo(void) -{ +isc_net_probe_ipv6pktinfo(void) { /* * XXXWPK if pktinfo were supported then we could listen on :: for ipv6 and get * the information about the destination address from pktinfo structure passed @@ -374,8 +362,7 @@ isc_net_probe_ipv6pktinfo(void) #if ISC_CMSG_IP_TOS || defined(IPV6_TCLASS) static inline socklen_t -cmsg_len(socklen_t len) -{ +cmsg_len(socklen_t len) { #ifdef CMSG_LEN return (CMSG_LEN(len)); #else /* ifdef CMSG_LEN */ @@ -391,12 +378,11 @@ cmsg_len(socklen_t len) } static inline socklen_t -cmsg_space(socklen_t len) -{ +cmsg_space(socklen_t len) { #ifdef CMSG_SPACE return (CMSG_SPACE(len)); #else /* ifdef CMSG_SPACE */ - struct msghdr msg; + struct msghdr msg; struct cmsghdr *cmsgp; /* * XXX: The buffer length is an ad-hoc value, but should be enough @@ -424,10 +410,9 @@ cmsg_space(socklen_t len) * Make a fd non-blocking. */ static isc_result_t -make_nonblock(int fd) -{ - int ret; - int flags; +make_nonblock(int fd) { + int ret; + int flags; char strbuf[ISC_STRERRORSIZE]; #ifdef USE_FIONBIO_IOCTL int on = 1; @@ -456,21 +441,20 @@ make_nonblock(int fd) } static bool -cmsgsend(int s, int level, int type, struct addrinfo *res) -{ - char strbuf[ISC_STRERRORSIZE]; +cmsgsend(int s, int level, int type, struct addrinfo *res) { + char strbuf[ISC_STRERRORSIZE]; struct sockaddr_storage ss; - socklen_t len = sizeof(ss); - struct msghdr msg; + socklen_t len = sizeof(ss); + struct msghdr msg; union { struct cmsghdr h; - unsigned char b[256]; + unsigned char b[256]; } control; struct cmsghdr *cmsgp; - int dscp = (46 << 2); /* Expedited forwarding. */ - struct iovec iovec; - char buf[1] = { 0 }; - isc_result_t result; + int dscp = (46 << 2); /* Expedited forwarding. */ + struct iovec iovec; + char buf[1] = { 0 }; + isc_result_t result; if (bind(s, res->ai_addr, res->ai_addrlen) < 0) { strerror_r(errno, strbuf, sizeof(strbuf)); @@ -529,7 +513,7 @@ cmsgsend(int s, int level, int type, struct addrinfo *res) } if (sendmsg(s, &msg, 0) < 0) { - int debug = ISC_LOG_DEBUG(10); + int debug = ISC_LOG_DEBUG(10); const char *typestr; switch (errno) { #ifdef ENOPROTOOPT @@ -586,12 +570,11 @@ cmsgsend(int s, int level, int type, struct addrinfo *res) #endif /* if ISC_CMSG_IP_TOS || defined(IPV6_TCLASS) */ static void -try_dscp_v4(void) -{ +try_dscp_v4(void) { #ifdef IP_TOS - char strbuf[ISC_STRERRORSIZE]; + char strbuf[ISC_STRERRORSIZE]; struct addrinfo hints, *res0; - int s, dscp = 0, n; + int s, dscp = 0, n; #ifdef IP_RECVTOS int on = 1; #endif /* IP_RECVTOS */ @@ -649,12 +632,11 @@ try_dscp_v4(void) } static void -try_dscp_v6(void) -{ +try_dscp_v6(void) { #ifdef IPV6_TCLASS - char strbuf[ISC_STRERRORSIZE]; + char strbuf[ISC_STRERRORSIZE]; struct addrinfo hints, *res0; - int s, dscp = 0, n; + int s, dscp = 0, n; #if defined(IPV6_RECVTCLASS) int on = 1; #endif /* IPV6_RECVTCLASS */ @@ -686,15 +668,15 @@ try_dscp_v6(void) freeaddrinfo(res0); return; } - if (setsockopt(s, IPPROTO_IPV6, IPV6_TCLASS, &dscp, sizeof(dscp)) == - 0) { + if (setsockopt(s, IPPROTO_IPV6, IPV6_TCLASS, &dscp, sizeof(dscp)) == 0) + { dscp_result |= ISC_NET_DSCPSETV6; } #ifdef IPV6_RECVTCLASS on = 1; - if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVTCLASS, &on, sizeof(on)) == - 0) { + if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVTCLASS, &on, sizeof(on)) == 0) + { dscp_result |= ISC_NET_DSCPRECVV6; } #endif /* IPV6_RECVTCLASS */ @@ -710,21 +692,18 @@ try_dscp_v6(void) } static void -try_dscp(void) -{ +try_dscp(void) { try_dscp_v4(); try_dscp_v6(); } static void -initialize_dscp(void) -{ +initialize_dscp(void) { RUNTIME_CHECK(isc_once_do(&once_dscp, try_dscp) == ISC_R_SUCCESS); } unsigned int -isc_net_probedscp(void) -{ +isc_net_probedscp(void) { initialize_dscp(); return (dscp_result); } @@ -732,10 +711,9 @@ isc_net_probedscp(void) #if defined(USE_SYSCTL_PORTRANGE) #if defined(HAVE_SYSCTLBYNAME) static isc_result_t -getudpportrange_sysctl(int af, in_port_t *low, in_port_t *high) -{ - int port_low, port_high; - size_t portlen; +getudpportrange_sysctl(int af, in_port_t *low, in_port_t *high) { + int port_low, port_high; + size_t portlen; const char *sysctlname_lowport, *sysctlname_hiport; if (af == AF_INET) { @@ -746,13 +724,13 @@ getudpportrange_sysctl(int af, in_port_t *low, in_port_t *high) sysctlname_hiport = SYSCTL_V6PORTRANGE_HIGH; } portlen = sizeof(port_low); - if (sysctlbyname(sysctlname_lowport, &port_low, &portlen, NULL, 0) < - 0) { + if (sysctlbyname(sysctlname_lowport, &port_low, &portlen, NULL, 0) < 0) + { return (ISC_R_FAILURE); } portlen = sizeof(port_high); - if (sysctlbyname(sysctlname_hiport, &port_high, &portlen, NULL, 0) < - 0) { + if (sysctlbyname(sysctlname_hiport, &port_high, &portlen, NULL, 0) < 0) + { return (ISC_R_FAILURE); } if ((port_low & ~0xffff) != 0 || (port_high & ~0xffff) != 0) { @@ -766,8 +744,7 @@ getudpportrange_sysctl(int af, in_port_t *low, in_port_t *high) } #else /* !HAVE_SYSCTLBYNAME */ static isc_result_t -getudpportrange_sysctl(int af, in_port_t *low, in_port_t *high) -{ +getudpportrange_sysctl(int af, in_port_t *low, in_port_t *high) { int mib_lo4[4] = SYSCTL_V4PORTRANGE_LOW; int mib_hi4[4] = SYSCTL_V4PORTRANGE_HIGH; int mib_lo6[4] = SYSCTL_V6PORTRANGE_LOW; @@ -809,8 +786,7 @@ getudpportrange_sysctl(int af, in_port_t *low, in_port_t *high) #endif /* USE_SYSCTL_PORTRANGE */ isc_result_t -isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high) -{ +isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high) { int result = ISC_R_FAILURE; #if !defined(USE_SYSCTL_PORTRANGE) && defined(__linux) FILE *fp; @@ -829,7 +805,7 @@ isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high) */ fp = fopen("/proc/sys/net/ipv4/ip_local_port_range", "r"); if (fp != NULL) { - int n; + int n; unsigned int l, h; n = fscanf(fp, "%u %u", &l, &h); @@ -853,8 +829,7 @@ isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high) } void -isc_net_disableipv4(void) -{ +isc_net_disableipv4(void) { initialize(); if (ipv4_result == ISC_R_SUCCESS) { ipv4_result = ISC_R_DISABLED; @@ -862,8 +837,7 @@ isc_net_disableipv4(void) } void -isc_net_disableipv6(void) -{ +isc_net_disableipv6(void) { initialize(); if (ipv6_result == ISC_R_SUCCESS) { ipv6_result = ISC_R_DISABLED; @@ -871,8 +845,7 @@ isc_net_disableipv6(void) } void -isc_net_enableipv4(void) -{ +isc_net_enableipv4(void) { initialize(); if (ipv4_result == ISC_R_DISABLED) { ipv4_result = ISC_R_SUCCESS; @@ -880,8 +853,7 @@ isc_net_enableipv4(void) } void -isc_net_enableipv6(void) -{ +isc_net_enableipv6(void) { initialize(); if (ipv6_result == ISC_R_DISABLED) { ipv6_result = ISC_R_SUCCESS; diff --git a/lib/isc/unix/os.c b/lib/isc/unix/os.c index 76e945378d..6feab87ffc 100644 --- a/lib/isc/unix/os.c +++ b/lib/isc/unix/os.c @@ -16,8 +16,7 @@ #include static inline long -sysconf_ncpus(void) -{ +sysconf_ncpus(void) { #if defined(_SC_NPROCESSORS_ONLN) return (sysconf((_SC_NPROCESSORS_ONLN))); #elif defined(_SC_NPROC_ONLN) @@ -34,9 +33,8 @@ sysconf_ncpus(void) #include /* for FreeBSD */ static int -sysctl_ncpus(void) -{ - int ncpu, result; +sysctl_ncpus(void) { + int ncpu, result; size_t len; len = sizeof(ncpu); @@ -49,8 +47,7 @@ sysctl_ncpus(void) #endif /* if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_SYSCTLBYNAME) */ unsigned int -isc_os_ncpus(void) -{ +isc_os_ncpus(void) { long ncpus = 0; #if defined(HAVE_SYSCONF) diff --git a/lib/isc/unix/pk11_api.c b/lib/isc/unix/pk11_api.c index e07886e349..ee24258524 100644 --- a/lib/isc/unix/pk11_api.c +++ b/lib/isc/unix/pk11_api.c @@ -29,11 +29,10 @@ #include static void *hPK11 = NULL; -static char loaderrmsg[1024]; +static char loaderrmsg[1024]; CK_RV -pkcs_C_Initialize(CK_VOID_PTR pReserved) -{ +pkcs_C_Initialize(CK_VOID_PTR pReserved) { CK_C_Initialize sym; if (hPK11 != NULL) { @@ -56,16 +55,14 @@ pkcs_C_Initialize(CK_VOID_PTR pReserved) } char * -pk11_get_load_error_message(void) -{ +pk11_get_load_error_message(void) { return (loaderrmsg); } CK_RV -pkcs_C_Finalize(CK_VOID_PTR pReserved) -{ +pkcs_C_Finalize(CK_VOID_PTR pReserved) { CK_C_Finalize sym; - CK_RV rv; + CK_RV rv; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -84,10 +81,9 @@ pkcs_C_Finalize(CK_VOID_PTR pReserved) CK_RV pkcs_C_GetSlotList(CK_BBOOL tokenPresent, CK_SLOT_ID_PTR pSlotList, - CK_ULONG_PTR pulCount) -{ + CK_ULONG_PTR pulCount) { static CK_C_GetSlotList sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -103,10 +99,9 @@ pkcs_C_GetSlotList(CK_BBOOL tokenPresent, CK_SLOT_ID_PTR pSlotList, } CK_RV -pkcs_C_GetTokenInfo(CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo) -{ +pkcs_C_GetTokenInfo(CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo) { static CK_C_GetTokenInfo sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -123,10 +118,9 @@ pkcs_C_GetTokenInfo(CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo) CK_RV pkcs_C_GetMechanismInfo(CK_SLOT_ID slotID, CK_MECHANISM_TYPE type, - CK_MECHANISM_INFO_PTR pInfo) -{ + CK_MECHANISM_INFO_PTR pInfo) { static CK_C_GetMechanismInfo sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -144,12 +138,11 @@ pkcs_C_GetMechanismInfo(CK_SLOT_ID slotID, CK_MECHANISM_TYPE type, CK_RV pkcs_C_OpenSession(CK_SLOT_ID slotID, CK_FLAGS flags, CK_VOID_PTR pApplication, CK_RV (*Notify)(CK_SESSION_HANDLE hSession, - CK_NOTIFICATION event, - CK_VOID_PTR pApplication), - CK_SESSION_HANDLE_PTR phSession) -{ + CK_NOTIFICATION event, + CK_VOID_PTR pApplication), + CK_SESSION_HANDLE_PTR phSession) { static CK_C_OpenSession sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { hPK11 = dlopen(pk11_get_lib_name(), RTLD_NOW); @@ -171,10 +164,9 @@ pkcs_C_OpenSession(CK_SLOT_ID slotID, CK_FLAGS flags, CK_VOID_PTR pApplication, } CK_RV -pkcs_C_CloseSession(CK_SESSION_HANDLE hSession) -{ +pkcs_C_CloseSession(CK_SESSION_HANDLE hSession) { static CK_C_CloseSession sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -191,10 +183,9 @@ pkcs_C_CloseSession(CK_SESSION_HANDLE hSession) CK_RV pkcs_C_Login(CK_SESSION_HANDLE hSession, CK_USER_TYPE userType, - CK_CHAR_PTR pPin, CK_ULONG usPinLen) -{ + CK_CHAR_PTR pPin, CK_ULONG usPinLen) { static CK_C_Login sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -210,10 +201,9 @@ pkcs_C_Login(CK_SESSION_HANDLE hSession, CK_USER_TYPE userType, } CK_RV -pkcs_C_Logout(CK_SESSION_HANDLE hSession) -{ +pkcs_C_Logout(CK_SESSION_HANDLE hSession) { static CK_C_Logout sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -230,10 +220,9 @@ pkcs_C_Logout(CK_SESSION_HANDLE hSession) CK_RV pkcs_C_CreateObject(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate, - CK_ULONG usCount, CK_OBJECT_HANDLE_PTR phObject) -{ + CK_ULONG usCount, CK_OBJECT_HANDLE_PTR phObject) { static CK_C_CreateObject sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -249,10 +238,9 @@ pkcs_C_CreateObject(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate, } CK_RV -pkcs_C_DestroyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject) -{ +pkcs_C_DestroyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject) { static CK_C_DestroyObject sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -269,10 +257,9 @@ pkcs_C_DestroyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject) CK_RV pkcs_C_GetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject, - CK_ATTRIBUTE_PTR pTemplate, CK_ULONG usCount) -{ + CK_ATTRIBUTE_PTR pTemplate, CK_ULONG usCount) { static CK_C_GetAttributeValue sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -290,10 +277,9 @@ pkcs_C_GetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject, CK_RV pkcs_C_SetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject, - CK_ATTRIBUTE_PTR pTemplate, CK_ULONG usCount) -{ + CK_ATTRIBUTE_PTR pTemplate, CK_ULONG usCount) { static CK_C_SetAttributeValue sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -311,10 +297,9 @@ pkcs_C_SetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject, CK_RV pkcs_C_FindObjectsInit(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate, - CK_ULONG usCount) -{ + CK_ULONG usCount) { static CK_C_FindObjectsInit sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -331,10 +316,9 @@ pkcs_C_FindObjectsInit(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate, CK_RV pkcs_C_FindObjects(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE_PTR phObject, - CK_ULONG usMaxObjectCount, CK_ULONG_PTR pusObjectCount) -{ + CK_ULONG usMaxObjectCount, CK_ULONG_PTR pusObjectCount) { static CK_C_FindObjects sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -350,10 +334,9 @@ pkcs_C_FindObjects(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE_PTR phObject, } CK_RV -pkcs_C_FindObjectsFinal(CK_SESSION_HANDLE hSession) -{ +pkcs_C_FindObjectsFinal(CK_SESSION_HANDLE hSession) { static CK_C_FindObjectsFinal sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -370,10 +353,9 @@ pkcs_C_FindObjectsFinal(CK_SESSION_HANDLE hSession) CK_RV pkcs_C_EncryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, - CK_OBJECT_HANDLE hKey) -{ + CK_OBJECT_HANDLE hKey) { static CK_C_EncryptInit sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -391,10 +373,9 @@ pkcs_C_EncryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_RV pkcs_C_Encrypt(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ulDataLen, CK_BYTE_PTR pEncryptedData, - CK_ULONG_PTR pulEncryptedDataLen) -{ + CK_ULONG_PTR pulEncryptedDataLen) { static CK_C_Encrypt sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -411,10 +392,9 @@ pkcs_C_Encrypt(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, } CK_RV -pkcs_C_DigestInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism) -{ +pkcs_C_DigestInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism) { static CK_C_DigestInit sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -431,10 +411,9 @@ pkcs_C_DigestInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism) CK_RV pkcs_C_DigestUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, - CK_ULONG ulPartLen) -{ + CK_ULONG ulPartLen) { static CK_C_DigestUpdate sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -451,10 +430,9 @@ pkcs_C_DigestUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_RV pkcs_C_DigestFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pDigest, - CK_ULONG_PTR pulDigestLen) -{ + CK_ULONG_PTR pulDigestLen) { static CK_C_DigestFinal sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -471,10 +449,9 @@ pkcs_C_DigestFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pDigest, CK_RV pkcs_C_SignInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, - CK_OBJECT_HANDLE hKey) -{ + CK_OBJECT_HANDLE hKey) { static CK_C_SignInit sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -491,10 +468,9 @@ pkcs_C_SignInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_RV pkcs_C_Sign(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ulDataLen, - CK_BYTE_PTR pSignature, CK_ULONG_PTR pulSignatureLen) -{ + CK_BYTE_PTR pSignature, CK_ULONG_PTR pulSignatureLen) { static CK_C_Sign sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -512,10 +488,9 @@ pkcs_C_Sign(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ulDataLen, CK_RV pkcs_C_SignUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, - CK_ULONG ulPartLen) -{ + CK_ULONG ulPartLen) { static CK_C_SignUpdate sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -532,10 +507,9 @@ pkcs_C_SignUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_RV pkcs_C_SignFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature, - CK_ULONG_PTR pulSignatureLen) -{ + CK_ULONG_PTR pulSignatureLen) { static CK_C_SignFinal sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -552,10 +526,9 @@ pkcs_C_SignFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature, CK_RV pkcs_C_VerifyInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, - CK_OBJECT_HANDLE hKey) -{ + CK_OBJECT_HANDLE hKey) { static CK_C_VerifyInit sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -572,10 +545,9 @@ pkcs_C_VerifyInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_RV pkcs_C_Verify(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ulDataLen, - CK_BYTE_PTR pSignature, CK_ULONG ulSignatureLen) -{ + CK_BYTE_PTR pSignature, CK_ULONG ulSignatureLen) { static CK_C_Verify sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -592,10 +564,9 @@ pkcs_C_Verify(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ulDataLen, CK_RV pkcs_C_VerifyUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, - CK_ULONG ulPartLen) -{ + CK_ULONG ulPartLen) { static CK_C_VerifyUpdate sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -612,10 +583,9 @@ pkcs_C_VerifyUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_RV pkcs_C_VerifyFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature, - CK_ULONG ulSignatureLen) -{ + CK_ULONG ulSignatureLen) { static CK_C_VerifyFinal sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -633,10 +603,9 @@ pkcs_C_VerifyFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature, CK_RV pkcs_C_GenerateKey(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_ATTRIBUTE_PTR pTemplate, CK_ULONG ulCount, - CK_OBJECT_HANDLE_PTR phKey) -{ + CK_OBJECT_HANDLE_PTR phKey) { static CK_C_GenerateKey sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -653,15 +622,14 @@ pkcs_C_GenerateKey(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_RV pkcs_C_GenerateKeyPair(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, - CK_ATTRIBUTE_PTR pPublicKeyTemplate, - CK_ULONG usPublicKeyAttributeCount, - CK_ATTRIBUTE_PTR pPrivateKeyTemplate, - CK_ULONG usPrivateKeyAttributeCount, + CK_ATTRIBUTE_PTR pPublicKeyTemplate, + CK_ULONG usPublicKeyAttributeCount, + CK_ATTRIBUTE_PTR pPrivateKeyTemplate, + CK_ULONG usPrivateKeyAttributeCount, CK_OBJECT_HANDLE_PTR phPrivateKey, - CK_OBJECT_HANDLE_PTR phPublicKey) -{ + CK_OBJECT_HANDLE_PTR phPublicKey) { static CK_C_GenerateKeyPair sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -681,10 +649,9 @@ pkcs_C_GenerateKeyPair(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_RV pkcs_C_DeriveKey(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_OBJECT_HANDLE hBaseKey, CK_ATTRIBUTE_PTR pTemplate, - CK_ULONG ulAttributeCount, CK_OBJECT_HANDLE_PTR phKey) -{ + CK_ULONG ulAttributeCount, CK_OBJECT_HANDLE_PTR phKey) { static CK_C_DeriveKey sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -702,10 +669,9 @@ pkcs_C_DeriveKey(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_RV pkcs_C_SeedRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSeed, - CK_ULONG ulSeedLen) -{ + CK_ULONG ulSeedLen) { static CK_C_SeedRandom sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); @@ -722,10 +688,9 @@ pkcs_C_SeedRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSeed, CK_RV pkcs_C_GenerateRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR RandomData, - CK_ULONG ulRandomLen) -{ + CK_ULONG ulRandomLen) { static CK_C_GenerateRandom sym = NULL; - static void * pPK11 = NULL; + static void *pPK11 = NULL; if (hPK11 == NULL) { return (CKR_LIBRARY_LOAD_FAILED); diff --git a/lib/isc/unix/resource.c b/lib/isc/unix/resource.c index c7152c5586..0a81638e26 100644 --- a/lib/isc/unix/resource.c +++ b/lib/isc/unix/resource.c @@ -28,8 +28,7 @@ #include "errno2result.h" static isc_result_t -resource2rlim(isc_resource_t resource, int *rlim_resource) -{ +resource2rlim(isc_resource_t resource, int *rlim_resource) { isc_result_t result = ISC_R_SUCCESS; switch (resource) { @@ -92,13 +91,12 @@ resource2rlim(isc_resource_t resource, int *rlim_resource) } isc_result_t -isc_resource_setlimit(isc_resource_t resource, isc_resourcevalue_t value) -{ +isc_resource_setlimit(isc_resource_t resource, isc_resourcevalue_t value) { struct rlimit rl; - rlim_t rlim_value; - int unixresult; - int unixresource; - isc_result_t result; + rlim_t rlim_value; + int unixresult; + int unixresource; + isc_result_t result; result = resource2rlim(resource, &unixresource); if (result != ISC_R_SUCCESS) { @@ -182,11 +180,10 @@ isc_resource_setlimit(isc_resource_t resource, isc_resourcevalue_t value) } isc_result_t -isc_resource_getlimit(isc_resource_t resource, isc_resourcevalue_t *value) -{ - int unixresource; +isc_resource_getlimit(isc_resource_t resource, isc_resourcevalue_t *value) { + int unixresource; struct rlimit rl; - isc_result_t result; + isc_result_t result; result = resource2rlim(resource, &unixresource); if (result != ISC_R_SUCCESS) { @@ -202,11 +199,10 @@ isc_resource_getlimit(isc_resource_t resource, isc_resourcevalue_t *value) } isc_result_t -isc_resource_getcurlimit(isc_resource_t resource, isc_resourcevalue_t *value) -{ - int unixresource; +isc_resource_getcurlimit(isc_resource_t resource, isc_resourcevalue_t *value) { + int unixresource; struct rlimit rl; - isc_result_t result; + isc_result_t result; result = resource2rlim(resource, &unixresource); if (result != ISC_R_SUCCESS) { diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c index 65e77a0f2e..e6f1c4b545 100644 --- a/lib/isc/unix/socket.c +++ b/lib/isc/unix/socket.c @@ -187,7 +187,7 @@ typedef enum { poll_idle, poll_active, poll_checking } pollstate_t; /*% * Per-FD lock buckets, we shuffle them around a bit as FDs come in herds. */ -#define FDLOCK_BITS 10 +#define FDLOCK_BITS 10 #define FDLOCK_COUNT (1 << FDLOCK_BITS) #define FDLOCK_ID(fd) \ (((fd) % (FDLOCK_COUNT) >> (FDLOCK_BITS / 2)) | \ @@ -237,21 +237,21 @@ typedef enum { poll_idle, poll_active, poll_checking } pollstate_t; * DLVL(50) -- Event tracing, including receiving/sending completion events. * DLVL(20) -- Socket creation/destruction. */ -#define TRACE_LEVEL 90 +#define TRACE_LEVEL 90 #define CORRECTNESS_LEVEL 70 -#define IOEVENT_LEVEL 60 -#define EVENT_LEVEL 50 -#define CREATION_LEVEL 20 +#define IOEVENT_LEVEL 60 +#define EVENT_LEVEL 50 +#define CREATION_LEVEL 20 -#define TRACE DLVL(TRACE_LEVEL) +#define TRACE DLVL(TRACE_LEVEL) #define CORRECTNESS DLVL(CORRECTNESS_LEVEL) -#define IOEVENT DLVL(IOEVENT_LEVEL) -#define EVENT DLVL(EVENT_LEVEL) -#define CREATION DLVL(CREATION_LEVEL) +#define IOEVENT DLVL(IOEVENT_LEVEL) +#define EVENT DLVL(EVENT_LEVEL) +#define CREATION DLVL(CREATION_LEVEL) typedef isc_event_t intev_t; -#define SOCKET_MAGIC ISC_MAGIC('I', 'O', 'i', 'o') +#define SOCKET_MAGIC ISC_MAGIC('I', 'O', 'i', 'o') #define VALID_SOCKET(s) ISC_MAGIC_VALID(s, SOCKET_MAGIC) /*! @@ -330,27 +330,27 @@ typedef isc_event_t intev_t; */ #define NRETRIES 10 -typedef struct isc__socket isc__socket_t; -typedef struct isc__socketmgr isc__socketmgr_t; +typedef struct isc__socket isc__socket_t; +typedef struct isc__socketmgr isc__socketmgr_t; typedef struct isc__socketthread isc__socketthread_t; #define NEWCONNSOCK(ev) ((isc__socket_t *)(ev)->newsocket) struct isc__socket { /* Not locked. */ - isc_socket_t common; - isc__socketmgr_t * manager; - isc_mutex_t lock; - isc_sockettype_t type; + isc_socket_t common; + isc__socketmgr_t *manager; + isc_mutex_t lock; + isc_sockettype_t type; const isc_statscounter_t *statsindex; - isc_refcount_t references; + isc_refcount_t references; /* Locked by socket lock. */ ISC_LINK(isc__socket_t) link; - int fd; - int pf; - int threadid; - char name[16]; + int fd; + int pf; + int threadid; + char name[16]; void *tag; ISC_LIST(isc_socketevent_t) send_list; @@ -375,64 +375,64 @@ struct isc__socket { }; #define SOCKET_MANAGER_MAGIC ISC_MAGIC('I', 'O', 'm', 'g') -#define VALID_MANAGER(m) ISC_MAGIC_VALID(m, SOCKET_MANAGER_MAGIC) +#define VALID_MANAGER(m) ISC_MAGIC_VALID(m, SOCKET_MANAGER_MAGIC) struct isc__socketmgr { /* Not locked. */ - isc_socketmgr_t common; - isc_mem_t * mctx; - isc_mutex_t lock; - isc_stats_t * stats; - int nthreads; + isc_socketmgr_t common; + isc_mem_t *mctx; + isc_mutex_t lock; + isc_stats_t *stats; + int nthreads; isc__socketthread_t *threads; - unsigned int maxsocks; + unsigned int maxsocks; /* Locked by manager lock. */ ISC_LIST(isc__socket_t) socklist; - int reserved; /* unlocked */ + int reserved; /* unlocked */ isc_condition_t shutdown_ok; - size_t maxudp; + size_t maxudp; }; struct isc__socketthread { isc__socketmgr_t *manager; - int threadid; - isc_thread_t thread; - int pipe_fds[2]; - isc_mutex_t * fdlock; + int threadid; + isc_thread_t thread; + int pipe_fds[2]; + isc_mutex_t *fdlock; /* Locked by fdlock. */ isc__socket_t **fds; - int * fdstate; + int *fdstate; #ifdef USE_KQUEUE - int kqueue_fd; - int nevents; + int kqueue_fd; + int nevents; struct kevent *events; #endif /* USE_KQUEUE */ #ifdef USE_EPOLL - int epoll_fd; - int nevents; + int epoll_fd; + int nevents; struct epoll_event *events; - uint32_t * epoll_events; + uint32_t *epoll_events; #endif /* USE_EPOLL */ #ifdef USE_DEVPOLL - int devpoll_fd; + int devpoll_fd; isc_resourcevalue_t open_max; - unsigned int calls; - int nevents; - struct pollfd * events; - pollinfo_t * fdpollinfo; + unsigned int calls; + int nevents; + struct pollfd *events; + pollinfo_t *fdpollinfo; #endif /* USE_DEVPOLL */ #ifdef USE_SELECT - int fd_bufsize; + int fd_bufsize; fd_set *read_fds; fd_set *read_fds_copy; fd_set *write_fds; fd_set *write_fds_copy; - int maxfd; + int maxfd; #endif /* USE_SELECT */ }; -#define CLOSED 0 /* this one must be zero */ -#define MANAGED 1 +#define CLOSED 0 /* this one must be zero */ +#define MANAGED 1 #define CLOSE_PENDING 2 /* @@ -445,49 +445,35 @@ 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) -#define SELECT_POKE_READ (-3) -#define SELECT_POKE_ACCEPT (-3) /*%< Same as _READ */ -#define SELECT_POKE_WRITE (-4) -#define SELECT_POKE_CONNECT (-4) /*%< Same as _WRITE */ -#define SELECT_POKE_CLOSE (-5) +#define SELECT_POKE_NOTHING (-2) +#define SELECT_POKE_READ (-3) +#define SELECT_POKE_ACCEPT (-3) /*%< Same as _READ */ +#define SELECT_POKE_WRITE (-4) +#define SELECT_POKE_CONNECT (-4) /*%< Same as _WRITE */ +#define SELECT_POKE_CLOSE (-5) /*% * Shortcut index arrays to get access to statistics counters. @@ -567,24 +553,20 @@ 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) -{ +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, ...) -{ - char msgbuf[2048]; + isc_logmodule_t *module, int level, const char *fmt, ...) { + char msgbuf[2048]; va_list ap; if (!isc_log_wouldlog(isc_lctx, level)) { @@ -599,15 +581,13 @@ 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, - isc_logmodule_t *module, int level, const char *fmt, ...) -{ - char msgbuf[2048]; + isc_logmodule_t *module, int level, const char *fmt, ...) { + char msgbuf[2048]; va_list ap; if (!isc_log_wouldlog(isc_lctx, level)) { @@ -623,17 +603,15 @@ 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, - const char *fmt, ...) -{ - char msgbuf[2048]; - char peerbuf[ISC_SOCKADDR_FORMATSIZE]; + const char *fmt, ...) { + char msgbuf[2048]; + char peerbuf[ISC_SOCKADDR_FORMATSIZE]; va_list ap; if (!isc_log_wouldlog(isc_lctx, level)) { @@ -658,8 +636,7 @@ socket_log(isc__socket_t *sock, const isc_sockaddr_t *address, * Increment socket-related statistics counters. */ static inline void -inc_stats(isc_stats_t *stats, isc_statscounter_t counterid) -{ +inc_stats(isc_stats_t *stats, isc_statscounter_t counterid) { REQUIRE(counterid != -1); if (stats != NULL) { @@ -671,8 +648,7 @@ inc_stats(isc_stats_t *stats, isc_statscounter_t counterid) * Decrement socket-related statistics counters. */ static inline void -dec_stats(isc_stats_t *stats, isc_statscounter_t counterid) -{ +dec_stats(isc_stats_t *stats, isc_statscounter_t counterid) { REQUIRE(counterid != -1); if (stats != NULL) { @@ -681,8 +657,7 @@ dec_stats(isc_stats_t *stats, isc_statscounter_t counterid) } static inline isc_result_t -watch_fd(isc__socketthread_t *thread, int fd, int msg) -{ +watch_fd(isc__socketthread_t *thread, int fd, int msg) { isc_result_t result = ISC_R_SUCCESS; #ifdef USE_KQUEUE @@ -703,9 +678,9 @@ watch_fd(isc__socketthread_t *thread, int fd, int msg) return (result); #elif defined(USE_EPOLL) struct epoll_event event; - uint32_t oldevents; - int ret; - int op; + uint32_t oldevents; + int ret; + int op; oldevents = thread->epoll_events[fd]; if (msg == SELECT_POKE_READ) { @@ -733,7 +708,7 @@ watch_fd(isc__socketthread_t *thread, int fd, int msg) return (result); #elif defined(USE_DEVPOLL) struct pollfd pfd; - int lockid = FDLOCK_ID(fd); + int lockid = FDLOCK_ID(fd); memset(&pfd, 0, sizeof(pfd)); if (msg == SELECT_POKE_READ) { @@ -769,8 +744,7 @@ watch_fd(isc__socketthread_t *thread, int fd, int msg) } static inline isc_result_t -unwatch_fd(isc__socketthread_t *thread, int fd, int msg) -{ +unwatch_fd(isc__socketthread_t *thread, int fd, int msg) { isc_result_t result = ISC_R_SUCCESS; #ifdef USE_KQUEUE @@ -791,8 +765,8 @@ unwatch_fd(isc__socketthread_t *thread, int fd, int msg) return (result); #elif defined(USE_EPOLL) struct epoll_event event; - int ret; - int op; + int ret; + int op; if (msg == SELECT_POKE_READ) { thread->epoll_events[fd] &= ~(EPOLLIN); @@ -816,8 +790,8 @@ unwatch_fd(isc__socketthread_t *thread, int fd, int msg) return (result); #elif defined(USE_DEVPOLL) struct pollfd pfds[2]; - size_t writelen = sizeof(pfds[0]); - int lockid = FDLOCK_ID(fd); + size_t writelen = sizeof(pfds[0]); + int lockid = FDLOCK_ID(fd); memset(pfds, 0, sizeof(pfds)); pfds[0].events = POLLREMOVE; @@ -868,10 +842,9 @@ unwatch_fd(isc__socketthread_t *thread, int fd, int msg) * on a fd provided */ static void -wakeup_socket(isc__socketthread_t *thread, int fd, int msg) -{ +wakeup_socket(isc__socketthread_t *thread, int fd, int msg) { isc_result_t result; - int lockid = FDLOCK_ID(fd); + int lockid = FDLOCK_ID(fd); /* * This is a wakeup on a socket. If the socket is not in the @@ -936,10 +909,9 @@ wakeup_socket(isc__socketthread_t *thread, int fd, int msg) * will not get partial writes. */ static void -select_poke(isc__socketmgr_t *mgr, int threadid, int fd, int msg) -{ - int cc; - int buf[2]; +select_poke(isc__socketmgr_t *mgr, int threadid, int fd, int msg) { + int cc; + int buf[2]; char strbuf[ISC_STRERRORSIZE]; buf[0] = fd; @@ -973,10 +945,9 @@ select_poke(isc__socketmgr_t *mgr, int threadid, int fd, int msg) * Read a message on the internal fd. */ static void -select_readmsg(isc__socketthread_t *thread, int *fd, int *msg) -{ - int buf[2]; - int cc; +select_readmsg(isc__socketthread_t *thread, int *fd, int *msg) { + int buf[2]; + int cc; char strbuf[ISC_STRERRORSIZE]; cc = read(thread->pipe_fds[0], buf, sizeof(buf)); @@ -1001,9 +972,8 @@ select_readmsg(isc__socketthread_t *thread, int *fd, int *msg) * Make a fd non-blocking. */ static isc_result_t -make_nonblock(int fd) -{ - int ret; +make_nonblock(int fd) { + int ret; char strbuf[ISC_STRERRORSIZE]; #ifdef USE_FIONBIO_IOCTL int on = 1; @@ -1044,8 +1014,7 @@ make_nonblock(int fd) * CMSG_SPACE. */ static inline socklen_t -cmsg_len(socklen_t len) -{ +cmsg_len(socklen_t len) { #ifdef CMSG_LEN return (CMSG_LEN(len)); #else /* ifdef CMSG_LEN */ @@ -1061,12 +1030,11 @@ cmsg_len(socklen_t len) } static inline socklen_t -cmsg_space(socklen_t len) -{ +cmsg_space(socklen_t len) { #ifdef CMSG_SPACE return (CMSG_SPACE(len)); #else /* ifdef CMSG_SPACE */ - struct msghdr msg; + struct msghdr msg; struct cmsghdr *cmsgp; /* * XXX: The buffer length is an ad-hoc value, but should be enough @@ -1095,10 +1063,9 @@ cmsg_space(socklen_t len) * Process control messages received on a socket. */ static void -process_cmsg(isc__socket_t *sock, struct msghdr *msg, isc_socketevent_t *dev) -{ +process_cmsg(isc__socket_t *sock, struct msghdr *msg, isc_socketevent_t *dev) { #ifdef USE_CMSG - struct cmsghdr * cmsgp; + struct cmsghdr *cmsgp; struct in6_pktinfo *pktinfop; #ifdef SO_TIMESTAMP void *timevalp; @@ -1187,7 +1154,8 @@ process_cmsg(isc__socket_t *sock, struct msghdr *msg, isc_socketevent_t *dev) #ifdef IP_RECVTOS || cmsgp->cmsg_type == IP_RECVTOS #endif /* ifdef IP_RECVTOS */ - )) { + )) + { dev->dscp = (int)*(unsigned char *)CMSG_DATA(cmsgp); dev->dscp >>= 2; dev->attributes |= ISC_SOCKEVENTATTR_DSCP; @@ -1214,10 +1182,9 @@ process_cmsg(isc__socket_t *sock, struct msghdr *msg, isc_socketevent_t *dev) */ static void build_msghdr_send(isc__socket_t *sock, char *cmsgbuf, isc_socketevent_t *dev, - struct msghdr *msg, struct iovec *iov, size_t *write_countp) -{ - unsigned int iovcount; - size_t write_count; + struct msghdr *msg, struct iovec *iov, size_t *write_countp) { + unsigned int iovcount; + size_t write_count; struct cmsghdr *cmsgp; memset(msg, 0, sizeof(*msg)); @@ -1243,7 +1210,8 @@ build_msghdr_send(isc__socket_t *sock, char *cmsgbuf, isc_socketevent_t *dev, #if defined(USE_CMSG) if ((sock->type == isc_sockettype_udp) && - ((dev->attributes & ISC_SOCKEVENTATTR_PKTINFO) != 0)) { + ((dev->attributes & ISC_SOCKEVENTATTR_PKTINFO) != 0)) + { struct in6_pktinfo *pktinfop; socket_log(sock, NULL, TRACE, "sendto pktinfo data, ifindex %u", @@ -1263,7 +1231,8 @@ build_msghdr_send(isc__socket_t *sock, char *cmsgbuf, isc_socketevent_t *dev, #if defined(IPV6_USE_MIN_MTU) if ((sock->type == isc_sockettype_udp) && (sock->pf == AF_INET6) && - ((dev->attributes & ISC_SOCKEVENTATTR_USEMINMTU) != 0)) { + ((dev->attributes & ISC_SOCKEVENTATTR_USEMINMTU) != 0)) + { int use_min_mtu = 1; /* -1, 0, 1 */ cmsgp = (struct cmsghdr *)(cmsgbuf + msg->msg_controllen); @@ -1288,7 +1257,8 @@ build_msghdr_send(isc__socket_t *sock, char *cmsgbuf, isc_socketevent_t *dev, #if defined(IP_TOS) || (defined(IPPROTO_IPV6) && defined(IPV6_TCLASS)) if ((sock->type == isc_sockettype_udp) && - ((dev->attributes & ISC_SOCKEVENTATTR_DSCP) != 0)) { + ((dev->attributes & ISC_SOCKEVENTATTR_DSCP) != 0)) + { int dscp = (dev->dscp << 2) & 0xff; INSIST(dev->dscp < 0x40); @@ -1333,7 +1303,8 @@ build_msghdr_send(isc__socket_t *sock, char *cmsgbuf, isc_socketevent_t *dev, memmove(CMSG_DATA(cmsgp), &dscp, sizeof(dscp)); } else if (sock->pf == AF_INET6 && sock->dscp != dev->dscp) { if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_TCLASS, - (void *)&dscp, sizeof(int)) < 0) { + (void *)&dscp, sizeof(int)) < 0) + { char strbuf[ISC_STRERRORSIZE]; strerror_r(errno, strbuf, sizeof(strbuf)); UNEXPECTED_ERROR(__FILE__, __LINE__, @@ -1375,10 +1346,9 @@ build_msghdr_send(isc__socket_t *sock, char *cmsgbuf, isc_socketevent_t *dev, */ static void build_msghdr_recv(isc__socket_t *sock, char *cmsgbuf, isc_socketevent_t *dev, - struct msghdr *msg, struct iovec *iov, size_t *read_countp) -{ + struct msghdr *msg, struct iovec *iov, size_t *read_countp) { unsigned int iovcount; - size_t read_count; + size_t read_count; memset(msg, 0, sizeof(struct msghdr)); @@ -1428,8 +1398,7 @@ build_msghdr_recv(isc__socket_t *sock, char *cmsgbuf, isc_socketevent_t *dev, static void set_dev_address(const isc_sockaddr_t *address, isc__socket_t *sock, - isc_socketevent_t *dev) -{ + isc_socketevent_t *dev) { if (sock->type == isc_sockettype_udp) { if (address != NULL) { dev->address = *address; @@ -1443,8 +1412,7 @@ set_dev_address(const isc_sockaddr_t *address, isc__socket_t *sock, } static void -destroy_socketevent(isc_event_t *event) -{ +destroy_socketevent(isc_event_t *event) { isc_socketevent_t *ev = (isc_socketevent_t *)event; (ev->destroy)(event); @@ -1452,8 +1420,7 @@ destroy_socketevent(isc_event_t *event) static isc_socketevent_t * allocate_socketevent(isc_mem_t *mctx, void *sender, isc_eventtype_t eventtype, - isc_taskaction_t action, void *arg) -{ + isc_taskaction_t action, void *arg) { isc_socketevent_t *ev; ev = (isc_socketevent_t *)isc_event_allocate(mctx, sender, eventtype, @@ -1474,8 +1441,7 @@ allocate_socketevent(isc_mem_t *mctx, void *sender, isc_eventtype_t eventtype, #if defined(ISC_SOCKET_DEBUG) static void -dump_msg(struct msghdr *msg) -{ +dump_msg(struct msghdr *msg) { unsigned int i; printf("MSGHDR %p\n", msg); @@ -1491,20 +1457,19 @@ dump_msg(struct msghdr *msg) #endif /* if defined(ISC_SOCKET_DEBUG) */ #define DOIO_SUCCESS 0 /* i/o ok, event sent */ -#define DOIO_SOFT 1 /* i/o ok, soft error, no event sent */ -#define DOIO_HARD 2 /* i/o error, event sent */ -#define DOIO_EOF 3 /* EOF, no event sent */ +#define DOIO_SOFT 1 /* i/o ok, soft error, no event sent */ +#define DOIO_HARD 2 /* i/o error, event sent */ +#define DOIO_EOF 3 /* EOF, no event sent */ static int -doio_recv(isc__socket_t *sock, isc_socketevent_t *dev) -{ - int cc; - struct iovec iov[MAXSCATTERGATHER_RECV]; - size_t read_count; +doio_recv(isc__socket_t *sock, isc_socketevent_t *dev) { + int cc; + struct iovec iov[MAXSCATTERGATHER_RECV]; + size_t read_count; struct msghdr msghdr; - int recv_errno; - char strbuf[ISC_STRERRORSIZE]; - char cmsgbuf[RECVCMSGBUFLEN] = { 0 }; + int recv_errno; + char strbuf[ISC_STRERRORSIZE]; + char cmsgbuf[RECVCMSGBUFLEN] = { 0 }; build_msghdr_recv(sock, cmsgbuf, dev, &msghdr, iov, &read_count); @@ -1662,23 +1627,23 @@ doio_recv(isc__socket_t *sock, isc_socketevent_t *dev) * No other return values are possible. */ static int -doio_send(isc__socket_t *sock, isc_socketevent_t *dev) -{ - int cc; - struct iovec iov[MAXSCATTERGATHER_SEND]; - size_t write_count; +doio_send(isc__socket_t *sock, isc_socketevent_t *dev) { + int cc; + struct iovec iov[MAXSCATTERGATHER_SEND]; + size_t write_count; struct msghdr msghdr; - char addrbuf[ISC_SOCKADDR_FORMATSIZE]; - int attempts = 0; - int send_errno; - char strbuf[ISC_STRERRORSIZE]; - char cmsgbuf[SENDCMSGBUFLEN] = { 0 }; + char addrbuf[ISC_SOCKADDR_FORMATSIZE]; + int attempts = 0; + int send_errno; + char strbuf[ISC_STRERRORSIZE]; + char cmsgbuf[SENDCMSGBUFLEN] = { 0 }; build_msghdr_send(sock, cmsgbuf, dev, &msghdr, iov, &write_count); resend: if (sock->type == isc_sockettype_udp && sock->manager->maxudp != 0 && - write_count > sock->manager->maxudp) { + write_count > sock->manager->maxudp) + { cc = write_count; } else { cc = sendmsg(sock->fd, &msghdr, 0); @@ -1784,8 +1749,7 @@ resend: * references exist. */ static void -socketclose(isc__socketthread_t *thread, isc__socket_t *sock, int fd) -{ +socketclose(isc__socketthread_t *thread, isc__socket_t *sock, int fd) { int lockid = FDLOCK_ID(fd); /* * No one has this socket open, so the watcher doesn't have to be @@ -1838,11 +1802,10 @@ socketclose(isc__socketthread_t *thread, isc__socket_t *sock, int fd) } static void -destroy(isc__socket_t **sockp) -{ - int fd = 0; - isc__socket_t * sock = *sockp; - isc__socketmgr_t * manager = sock->manager; +destroy(isc__socket_t **sockp) { + int fd = 0; + isc__socket_t *sock = *sockp; + isc__socketmgr_t *manager = sock->manager; isc__socketthread_t *thread = NULL; socket_log(sock, NULL, CREATION, "destroying"); @@ -1884,8 +1847,7 @@ destroy(isc__socket_t **sockp) static isc_result_t allocate_socket(isc__socketmgr_t *manager, isc_sockettype_t type, - isc__socket_t **socketp) -{ + isc__socket_t **socketp) { isc__socket_t *sock; sock = isc_mem_get(manager->mctx, sizeof(*sock)); @@ -1942,8 +1904,7 @@ allocate_socket(isc__socketmgr_t *manager, isc_sockettype_t type, * also close the socket. */ static void -free_socket(isc__socket_t **socketp) -{ +free_socket(isc__socket_t **socketp) { isc__socket_t *sock = *socketp; *socketp = NULL; @@ -1968,13 +1929,12 @@ free_socket(isc__socket_t **socketp) #ifdef SO_RCVBUF static isc_once_t rcvbuf_once = ISC_ONCE_INIT; -static int rcvbuf = RCVBUFSIZE; +static int rcvbuf = RCVBUFSIZE; static void -set_rcvbuf(void) -{ - int fd; - int max = rcvbuf, min; +set_rcvbuf(void) { + int fd; + int max = rcvbuf, min; socklen_t len; fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); @@ -1998,10 +1958,12 @@ set_rcvbuf(void) len = sizeof(min); if (getsockopt(fd, SOL_SOCKET, SO_RCVBUF, (void *)&min, &len) == 0 && - min < rcvbuf) { + min < rcvbuf) + { again: if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (void *)&rcvbuf, - sizeof(rcvbuf)) == -1) { + sizeof(rcvbuf)) == -1) + { if (errno == ENOBUFS && rcvbuf > min) { max = rcvbuf - 1; rcvbuf = (rcvbuf + min) / 2; @@ -2025,13 +1987,12 @@ cleanup: #ifdef SO_SNDBUF static isc_once_t sndbuf_once = ISC_ONCE_INIT; -static int sndbuf = SNDBUFSIZE; +static int sndbuf = SNDBUFSIZE; static void -set_sndbuf(void) -{ - int fd; - int max = sndbuf, min; +set_sndbuf(void) { + int fd; + int max = sndbuf, min; socklen_t len; fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); @@ -2057,10 +2018,12 @@ set_sndbuf(void) len = sizeof(min); if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, (void *)&min, &len) == 0 && - min < sndbuf) { + min < sndbuf) + { again: if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, (void *)&sndbuf, - sizeof(sndbuf)) == -1) { + sizeof(sndbuf)) == -1) + { if (errno == ENOBUFS && sndbuf > min) { max = sndbuf - 1; sndbuf = (sndbuf + min) / 2; @@ -2083,8 +2046,7 @@ cleanup: #endif /* ifdef SO_SNDBUF */ static void -use_min_mtu(isc__socket_t *sock) -{ +use_min_mtu(isc__socket_t *sock) { #if !defined(IPV6_USE_MIN_MTU) && !defined(IPV6_MTU) UNUSED(sock); #endif /* if !defined(IPV6_USE_MIN_MTU) && !defined(IPV6_MTU) */ @@ -2109,8 +2071,7 @@ use_min_mtu(isc__socket_t *sock) } static void -set_tcp_maxseg(isc__socket_t *sock, int size) -{ +set_tcp_maxseg(isc__socket_t *sock, int size) { #ifdef TCP_MAXSEG if (sock->type == isc_sockettype_tcp) { (void)setsockopt(sock->fd, IPPROTO_TCP, TCP_MAXSEG, @@ -2121,18 +2082,17 @@ set_tcp_maxseg(isc__socket_t *sock, int size) static isc_result_t opensocket(isc__socketmgr_t *manager, isc__socket_t *sock, - isc__socket_t *dup_socket) -{ + isc__socket_t *dup_socket) { isc_result_t result; - char strbuf[ISC_STRERRORSIZE]; - const char * err = "socket"; - int tries = 0; + char strbuf[ISC_STRERRORSIZE]; + const char *err = "socket"; + int tries = 0; #if defined(USE_CMSG) || defined(SO_NOSIGPIPE) int on = 1; #endif /* if defined(USE_CMSG) || defined(SO_NOSIGPIPE) */ #if defined(SO_RCVBUF) || defined(SO_SNDBUF) socklen_t optlen; - int size = 0; + int size = 0; #endif /* if defined(SO_RCVBUF) || defined(SO_SNDBUF) */ again: @@ -2163,7 +2123,7 @@ again: if (sock->fd != -1) { #ifdef NETLINK_ROUTE struct sockaddr_nl sa; - int n; + int n; /* * Do an implicit bind. @@ -2200,7 +2160,8 @@ again: * Leave a space for stdio and TCP to work in. */ if (manager->reserved != 0 && sock->type == isc_sockettype_udp && - sock->fd >= 0 && sock->fd < manager->reserved) { + sock->fd >= 0 && sock->fd < manager->reserved) + { int newfd, tmp; newfd = fcntl(sock->fd, F_DUPFD, manager->reserved); tmp = errno; @@ -2301,7 +2262,8 @@ again: #if defined(SO_TIMESTAMP) if (setsockopt(sock->fd, SOL_SOCKET, SO_TIMESTAMP, (void *)&on, sizeof(on)) < 0 && - errno != ENOPROTOOPT) { + errno != ENOPROTOOPT) + { strerror_r(errno, strbuf, sizeof(strbuf)); UNEXPECTED_ERROR(__FILE__, __LINE__, "setsockopt(%d, SO_TIMESTAMP) failed: " @@ -2315,7 +2277,8 @@ again: /* RFC 3542 */ if ((sock->pf == AF_INET6) && (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, - (void *)&on, sizeof(on)) < 0)) { + (void *)&on, sizeof(on)) < 0)) + { strerror_r(errno, strbuf, sizeof(strbuf)); UNEXPECTED_ERROR(__FILE__, __LINE__, "setsockopt(%d, IPV6_RECVPKTINFO) " @@ -2326,7 +2289,8 @@ again: /* RFC 2292 */ if ((sock->pf == AF_INET6) && (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_PKTINFO, - (void *)&on, sizeof(on)) < 0)) { + (void *)&on, sizeof(on)) < 0)) + { strerror_r(errno, strbuf, sizeof(strbuf)); UNEXPECTED_ERROR(__FILE__, __LINE__, "setsockopt(%d, IPV6_PKTINFO) failed: " @@ -2358,7 +2322,8 @@ again: #if defined(IP_PMTUDISC_OMIT) action = IP_PMTUDISC_OMIT; if (setsockopt(sock->fd, IPPROTO_IP, IP_MTU_DISCOVER, - &action, sizeof(action)) < 0) { + &action, sizeof(action)) < 0) + { #endif /* if defined(IP_PMTUDISC_OMIT) */ action = IP_PMTUDISC_DONT; (void)setsockopt(sock->fd, IPPROTO_IP, @@ -2384,11 +2349,13 @@ again: optlen = sizeof(size); if (getsockopt(sock->fd, SOL_SOCKET, SO_RCVBUF, (void *)&size, &optlen) == 0 && - size < rcvbuf) { + size < rcvbuf) + { RUNTIME_CHECK(isc_once_do(&rcvbuf_once, set_rcvbuf) == ISC_R_SUCCESS); if (setsockopt(sock->fd, SOL_SOCKET, SO_RCVBUF, - (void *)&rcvbuf, sizeof(rcvbuf)) == -1) { + (void *)&rcvbuf, sizeof(rcvbuf)) == -1) + { strerror_r(errno, strbuf, sizeof(strbuf)); UNEXPECTED_ERROR(__FILE__, __LINE__, "setsockopt(%d, SO_RCVBUF, " @@ -2402,11 +2369,13 @@ again: optlen = sizeof(size); if (getsockopt(sock->fd, SOL_SOCKET, SO_SNDBUF, (void *)&size, &optlen) == 0 && - size < sndbuf) { + size < sndbuf) + { RUNTIME_CHECK(isc_once_do(&sndbuf_once, set_sndbuf) == ISC_R_SUCCESS); if (setsockopt(sock->fd, SOL_SOCKET, SO_SNDBUF, - (void *)&sndbuf, sizeof(sndbuf)) == -1) { + (void *)&sndbuf, sizeof(sndbuf)) == -1) + { strerror_r(errno, strbuf, sizeof(strbuf)); UNEXPECTED_ERROR(__FILE__, __LINE__, "setsockopt(%d, SO_SNDBUF, " @@ -2419,7 +2388,8 @@ again: #ifdef IPV6_RECVTCLASS if ((sock->pf == AF_INET6) && (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_RECVTCLASS, (void *)&on, - sizeof(on)) < 0)) { + sizeof(on)) < 0)) + { strerror_r(errno, strbuf, sizeof(strbuf)); UNEXPECTED_ERROR(__FILE__, __LINE__, "setsockopt(%d, IPV6_RECVTCLASS) " @@ -2430,7 +2400,8 @@ again: #ifdef IP_RECVTOS if ((sock->pf == AF_INET) && (setsockopt(sock->fd, IPPROTO_IP, IP_RECVTOS, (void *)&on, - sizeof(on)) < 0)) { + sizeof(on)) < 0)) + { strerror_r(errno, strbuf, sizeof(strbuf)); UNEXPECTED_ERROR(__FILE__, __LINE__, "setsockopt(%d, IP_RECVTOS) " @@ -2458,13 +2429,12 @@ setup_done: */ 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) -{ - isc__socket_t * sock = NULL; - isc__socketmgr_t * manager = (isc__socketmgr_t *)manager0; + isc_socket_t **socketp, isc_socket_t *dup_socket) { + isc__socket_t *sock = NULL; + isc__socketmgr_t *manager = (isc__socketmgr_t *)manager0; isc__socketthread_t *thread; - isc_result_t result; - int lockid; + isc_result_t result; + int lockid; REQUIRE(VALID_MANAGER(manager)); REQUIRE(socketp != NULL && *socketp == NULL); @@ -2553,8 +2523,7 @@ socket_create(isc_socketmgr_t *manager0, int pf, isc_sockettype_t type, */ isc_result_t isc_socket_create(isc_socketmgr_t *manager0, int pf, isc_sockettype_t type, - isc_socket_t **socketp) -{ + isc_socket_t **socketp) { return (socket_create(manager0, pf, type, socketp, NULL)); } @@ -2563,8 +2532,7 @@ isc_socket_create(isc_socketmgr_t *manager0, int pf, isc_sockettype_t type, * in 'socketp'. */ isc_result_t -isc_socket_dup(isc_socket_t *sock0, isc_socket_t **socketp) -{ +isc_socket_dup(isc_socket_t *sock0, isc_socket_t **socketp) { isc__socket_t *sock = (isc__socket_t *)sock0; REQUIRE(VALID_SOCKET(sock)); @@ -2575,10 +2543,9 @@ isc_socket_dup(isc_socket_t *sock0, isc_socket_t **socketp) } isc_result_t -isc_socket_open(isc_socket_t *sock0) -{ - isc_result_t result; - isc__socket_t * sock = (isc__socket_t *)sock0; +isc_socket_open(isc_socket_t *sock0) { + isc_result_t result; + isc__socket_t *sock = (isc__socket_t *)sock0; isc__socketthread_t *thread; REQUIRE(VALID_SOCKET(sock)); @@ -2628,8 +2595,7 @@ isc_socket_open(isc_socket_t *sock0) * Attach to a socket. Caller must explicitly detach when it is done. */ void -isc_socket_attach(isc_socket_t *sock0, isc_socket_t **socketp) -{ +isc_socket_attach(isc_socket_t *sock0, isc_socket_t **socketp) { isc__socket_t *sock = (isc__socket_t *)sock0; REQUIRE(VALID_SOCKET(sock)); @@ -2646,8 +2612,7 @@ isc_socket_attach(isc_socket_t *sock0, isc_socket_t **socketp) * up by destroying the socket. */ void -isc_socket_detach(isc_socket_t **socketp) -{ +isc_socket_detach(isc_socket_t **socketp) { isc__socket_t *sock; REQUIRE(socketp != NULL); @@ -2662,11 +2627,10 @@ isc_socket_detach(isc_socket_t **socketp) } isc_result_t -isc_socket_close(isc_socket_t *sock0) -{ - isc__socket_t * sock = (isc__socket_t *)sock0; - int fd; - isc__socketmgr_t * manager; +isc_socket_close(isc_socket_t *sock0) { + isc__socket_t *sock = (isc__socket_t *)sock0; + int fd; + isc__socketmgr_t *manager; isc__socketthread_t *thread; fflush(stdout); REQUIRE(VALID_SOCKET(sock)); @@ -2714,8 +2678,7 @@ isc_socket_close(isc_socket_t *sock0) * Caller must have the socket locked if the event is attached to the socket. */ static void -send_recvdone_event(isc__socket_t *sock, isc_socketevent_t **dev) -{ +send_recvdone_event(isc__socket_t *sock, isc_socketevent_t **dev) { isc_task_t *task; task = (*dev)->ev_sender; @@ -2740,8 +2703,7 @@ send_recvdone_event(isc__socket_t *sock, isc_socketevent_t **dev) * Caller must have the socket locked if the event is attached to the socket. */ static void -send_senddone_event(isc__socket_t *sock, isc_socketevent_t **dev) -{ +send_senddone_event(isc__socket_t *sock, isc_socketevent_t **dev) { isc_task_t *task; INSIST(dev != NULL && *dev != NULL); @@ -2767,8 +2729,7 @@ send_senddone_event(isc__socket_t *sock, isc_socketevent_t **dev) * Caller must have the socket locked if the event is attached to the socket. */ static void -send_connectdone_event(isc__socket_t *sock, isc_socket_connev_t **dev) -{ +send_connectdone_event(isc__socket_t *sock, isc_socket_connev_t **dev) { isc_task_t *task; INSIST(dev != NULL && *dev != NULL); @@ -2795,17 +2756,16 @@ send_connectdone_event(isc__socket_t *sock, isc_socket_connev_t **dev) * so just unlock and return. */ static void -internal_accept(isc__socket_t *sock) -{ - isc__socketmgr_t * manager; - isc__socketthread_t * thread, *nthread; +internal_accept(isc__socket_t *sock) { + isc__socketmgr_t *manager; + isc__socketthread_t *thread, *nthread; isc_socket_newconnev_t *dev; - isc_task_t * task; - socklen_t addrlen; - int fd; - isc_result_t result = ISC_R_SUCCESS; - char strbuf[ISC_STRERRORSIZE]; - const char * err = "accept"; + isc_task_t *task; + socklen_t addrlen; + int fd; + isc_result_t result = ISC_R_SUCCESS; + char strbuf[ISC_STRERRORSIZE]; + const char *err = "accept"; INSIST(VALID_SOCKET(sock)); @@ -2972,9 +2932,9 @@ internal_accept(isc__socket_t *sock) * We already hold a lock on one fdlock in accepting thread, * we need to make sure that we don't double lock. */ - bool same_bucket = - (sock->threadid == NEWCONNSOCK(dev)->threadid) && - (FDLOCK_ID(sock->fd) == lockid); + bool same_bucket = (sock->threadid == + NEWCONNSOCK(dev)->threadid) && + (FDLOCK_ID(sock->fd) == lockid); /* * Use minimum mtu if possible. @@ -3051,8 +3011,7 @@ soft_error: } static void -internal_recv(isc__socket_t *sock) -{ +internal_recv(isc__socket_t *sock) { isc_socketevent_t *dev; INSIST(VALID_SOCKET(sock)); @@ -3108,8 +3067,7 @@ finish: } static void -internal_send(isc__socket_t *sock) -{ +internal_send(isc__socket_t *sock) { isc_socketevent_t *dev; INSIST(VALID_SOCKET(sock)); @@ -3155,10 +3113,9 @@ finish: * and unlocking twice if both reads and writes are possible. */ static void -process_fd(isc__socketthread_t *thread, int fd, bool readable, bool writeable) -{ +process_fd(isc__socketthread_t *thread, int fd, bool readable, bool writeable) { isc__socket_t *sock; - int lockid = FDLOCK_ID(fd); + int lockid = FDLOCK_ID(fd); /* * If the socket is going to be closed, don't do more I/O. @@ -3218,9 +3175,8 @@ process_fd(isc__socketthread_t *thread, int fd, bool readable, bool writeable) */ #ifdef USE_KQUEUE static bool -process_fds(isc__socketthread_t *thread, struct kevent *events, int nevents) -{ - int i; +process_fds(isc__socketthread_t *thread, struct kevent *events, int nevents) { + int i; bool readable, writable; bool done = false; bool have_ctlevent = false; @@ -3256,8 +3212,7 @@ process_fds(isc__socketthread_t *thread, struct kevent *events, int nevents) #elif defined(USE_EPOLL) static bool process_fds(isc__socketthread_t *thread, struct epoll_event *events, - int nevents) -{ + int nevents) { int i; bool done = false; bool have_ctlevent = false; @@ -3300,9 +3255,8 @@ process_fds(isc__socketthread_t *thread, struct epoll_event *events, } #elif defined(USE_DEVPOLL) static bool -process_fds(isc__socketthread_t *thread, struct pollfd *events, int nevents) -{ - int i; +process_fds(isc__socketthread_t *thread, struct pollfd *events, int nevents) { + int i; bool done = false; bool have_ctlevent = false; @@ -3333,8 +3287,7 @@ process_fds(isc__socketthread_t *thread, struct pollfd *events, int nevents) #elif defined(USE_SELECT) static void process_fds(isc__socketthread_t *thread, int maxfd, fd_set *readfds, - fd_set *writefds) -{ + fd_set *writefds) { int i; REQUIRE(maxfd <= (int)thread->manager->maxsocks); @@ -3350,8 +3303,7 @@ process_fds(isc__socketthread_t *thread, int maxfd, fd_set *readfds, #endif /* ifdef USE_KQUEUE */ static bool -process_ctlfd(isc__socketthread_t *thread) -{ +process_ctlfd(isc__socketthread_t *thread) { int msg, fd; for (;;) { @@ -3397,13 +3349,12 @@ process_ctlfd(isc__socketthread_t *thread) * an event to the task that was requesting the action. */ static isc_threadresult_t -netthread(void *uap) -{ +netthread(void *uap) { isc__socketthread_t *thread = uap; - isc__socketmgr_t * manager = thread->manager; + isc__socketmgr_t *manager = thread->manager; (void)manager; bool done; - int cc; + int cc; if (manager->nthreads > 1) { isc_thread_setaffinity(thread->threadid); } @@ -3412,12 +3363,12 @@ netthread(void *uap) #elif defined(USE_EPOLL) const char *fnname = "epoll_wait()"; #elif defined(USE_DEVPOLL) - isc_result_t result; - const char * fnname = "ioctl(DP_POLL)"; + isc_result_t result; + const char *fnname = "ioctl(DP_POLL)"; struct dvpoll dvp; - int pass; + int pass; #if defined(ISC_SOCKET_USE_POLLWATCH) - pollstate_t pollstate = poll_idle; + pollstate_t pollstate = poll_idle; #endif /* if defined(ISC_SOCKET_USE_POLLWATCH) */ #elif defined(USE_SELECT) const char *fnname = "select()"; @@ -3442,26 +3393,26 @@ netthread(void *uap) cc = epoll_wait(thread->epoll_fd, thread->events, thread->nevents, -1); #elif defined(USE_DEVPOLL) - /* - * Re-probe every thousand calls. - */ - if (thread->calls++ > 1000U) { - result = isc_resource_getcurlimit( - isc_resource_openfiles, - &thread->open_max); - if (result != ISC_R_SUCCESS) { - thread->open_max = 64; - } - thread->calls = 0; - } - for (pass = 0; pass < 2; pass++) { - dvp.dp_fds = thread->events; - dvp.dp_nfds = thread->nevents; - if (dvp.dp_nfds >= thread->open_max) { - dvp.dp_nfds = thread->open_max - 1; - } + /* + * Re-probe every thousand calls. + */ + if (thread->calls++ > 1000U) { + result = isc_resource_getcurlimit( + isc_resource_openfiles, + &thread->open_max); + if (result != ISC_R_SUCCESS) { + thread->open_max = 64; + } + thread->calls = 0; + } + for (pass = 0; pass < 2; pass++) { + dvp.dp_fds = thread->events; + dvp.dp_nfds = thread->nevents; + if (dvp.dp_nfds >= thread->open_max) { + dvp.dp_nfds = thread->open_max - 1; + } #ifndef ISC_SOCKET_USE_POLLWATCH - dvp.dp_timeout = -1; + dvp.dp_timeout = -1; #else /* ifndef ISC_SOCKET_USE_POLLWATCH */ if (pollstate == poll_idle) { dvp.dp_timeout = -1; @@ -3470,22 +3421,22 @@ netthread(void *uap) ISC_SOCKET_POLLWATCH_TIMEOUT; } #endif /* ISC_SOCKET_USE_POLLWATCH */ - cc = ioctl(thread->devpoll_fd, DP_POLL, &dvp); - if (cc == -1 && errno == EINVAL) { - /* - * {OPEN_MAX} may have dropped. Look - * up the current value and try again. - */ - result = isc_resource_getcurlimit( - isc_resource_openfiles, - &thread->open_max); - if (result != ISC_R_SUCCESS) { - thread->open_max = 64; - } - } else { - break; - } - } + cc = ioctl(thread->devpoll_fd, DP_POLL, &dvp); + if (cc == -1 && errno == EINVAL) { + /* + * {OPEN_MAX} may have dropped. Look + * up the current value and try again. + */ + result = isc_resource_getcurlimit( + isc_resource_openfiles, + &thread->open_max); + if (result != ISC_R_SUCCESS) { + thread->open_max = 64; + } + } else { + break; + } + } #elif defined(USE_SELECT) /* * We will have only one thread anyway, we can lock @@ -3558,8 +3509,7 @@ netthread(void *uap) } void -isc_socketmgr_setreserved(isc_socketmgr_t *manager0, uint32_t reserved) -{ +isc_socketmgr_setreserved(isc_socketmgr_t *manager0, uint32_t reserved) { isc__socketmgr_t *manager = (isc__socketmgr_t *)manager0; REQUIRE(VALID_MANAGER(manager)); @@ -3568,8 +3518,7 @@ isc_socketmgr_setreserved(isc_socketmgr_t *manager0, uint32_t reserved) } void -isc_socketmgr_maxudp(isc_socketmgr_t *manager0, unsigned int maxudp) -{ +isc_socketmgr_maxudp(isc_socketmgr_t *manager0, unsigned int maxudp) { isc__socketmgr_t *manager = (isc__socketmgr_t *)manager0; REQUIRE(VALID_MANAGER(manager)); @@ -3582,11 +3531,10 @@ isc_socketmgr_maxudp(isc_socketmgr_t *manager0, unsigned int maxudp) */ static isc_result_t -setup_thread(isc__socketthread_t *thread) -{ +setup_thread(isc__socketthread_t *thread) { isc_result_t result = ISC_R_SUCCESS; - int i; - char strbuf[ISC_STRERRORSIZE]; + int i; + char strbuf[ISC_STRERRORSIZE]; REQUIRE(thread != NULL); REQUIRE(VALID_MANAGER(thread->manager)); @@ -3721,20 +3669,20 @@ setup_thread(isc__socketthread_t *thread) * FD_SETSIZE, but we separate the cases to avoid possible portability * issues regarding howmany() and the actual representation of fd_set. */ - thread->fd_bufsize = - howmany(manager->maxsocks, NFDBITS) * sizeof(fd_mask); + thread->fd_bufsize = howmany(manager->maxsocks, NFDBITS) * + sizeof(fd_mask); #else /* if ISC_SOCKET_MAXSOCKETS > FD_SETSIZE */ thread->fd_bufsize = sizeof(fd_set); #endif /* if ISC_SOCKET_MAXSOCKETS > FD_SETSIZE */ - thread->read_fds = - isc_mem_get(thread->manager->mctx, thread->fd_bufsize); - thread->read_fds_copy = - isc_mem_get(thread->manager->mctx, thread->fd_bufsize); - thread->write_fds = - isc_mem_get(thread->manager->mctx, thread->fd_bufsize); - thread->write_fds_copy = - isc_mem_get(thread->manager->mctx, thread->fd_bufsize); + thread->read_fds = isc_mem_get(thread->manager->mctx, + thread->fd_bufsize); + thread->read_fds_copy = isc_mem_get(thread->manager->mctx, + thread->fd_bufsize); + thread->write_fds = isc_mem_get(thread->manager->mctx, + thread->fd_bufsize); + thread->write_fds_copy = isc_mem_get(thread->manager->mctx, + thread->fd_bufsize); memset(thread->read_fds, 0, thread->fd_bufsize); memset(thread->write_fds, 0, thread->fd_bufsize); @@ -3746,10 +3694,9 @@ setup_thread(isc__socketthread_t *thread) } static void -cleanup_thread(isc_mem_t *mctx, isc__socketthread_t *thread) -{ +cleanup_thread(isc_mem_t *mctx, isc__socketthread_t *thread) { isc_result_t result; - int i; + int i; result = unwatch_fd(thread, thread->pipe_fds[0], SELECT_POKE_READ); if (result != ISC_R_SUCCESS) { @@ -3810,16 +3757,14 @@ cleanup_thread(isc_mem_t *mctx, isc__socketthread_t *thread) } isc_result_t -isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) -{ +isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) { return (isc_socketmgr_create2(mctx, managerp, 0, 1)); } isc_result_t isc_socketmgr_create2(isc_mem_t *mctx, isc_socketmgr_t **managerp, - unsigned int maxsocks, int nthreads) -{ - int i; + unsigned int maxsocks, int nthreads) { + int i; isc__socketmgr_t *manager; REQUIRE(managerp != NULL && *managerp == NULL); @@ -3869,8 +3814,7 @@ isc_socketmgr_create2(isc_mem_t *mctx, isc_socketmgr_t **managerp, } isc_result_t -isc_socketmgr_getmaxsockets(isc_socketmgr_t *manager0, unsigned int *nsockp) -{ +isc_socketmgr_getmaxsockets(isc_socketmgr_t *manager0, unsigned int *nsockp) { isc__socketmgr_t *manager = (isc__socketmgr_t *)manager0; REQUIRE(VALID_MANAGER(manager)); REQUIRE(nsockp != NULL); @@ -3881,8 +3825,7 @@ isc_socketmgr_getmaxsockets(isc_socketmgr_t *manager0, unsigned int *nsockp) } void -isc_socketmgr_setstats(isc_socketmgr_t *manager0, isc_stats_t *stats) -{ +isc_socketmgr_setstats(isc_socketmgr_t *manager0, isc_stats_t *stats) { isc__socketmgr_t *manager = (isc__socketmgr_t *)manager0; REQUIRE(VALID_MANAGER(manager)); @@ -3894,8 +3837,7 @@ isc_socketmgr_setstats(isc_socketmgr_t *manager0, isc_stats_t *stats) } void -isc_socketmgr_destroy(isc_socketmgr_t **managerp) -{ +isc_socketmgr_destroy(isc_socketmgr_t **managerp) { isc__socketmgr_t *manager; /* @@ -3954,11 +3896,10 @@ isc_socketmgr_destroy(isc_socketmgr_t **managerp) static isc_result_t socket_recv(isc__socket_t *sock, isc_socketevent_t *dev, isc_task_t *task, - unsigned int flags) -{ - int io_state; - bool have_lock = false; - isc_task_t * ntask = NULL; + unsigned int flags) { + int io_state; + bool have_lock = false; + isc_task_t *ntask = NULL; isc_result_t result = ISC_R_SUCCESS; dev->ev_sender = task; @@ -4032,11 +3973,10 @@ socket_recv(isc__socket_t *sock, isc_socketevent_t *dev, isc_task_t *task, isc_result_t isc_socket_recv(isc_socket_t *sock0, isc_region_t *region, unsigned int minimum, - isc_task_t *task, isc_taskaction_t action, void *arg) -{ - isc__socket_t * sock = (isc__socket_t *)sock0; + isc_task_t *task, isc_taskaction_t action, void *arg) { + isc__socket_t *sock = (isc__socket_t *)sock0; isc_socketevent_t *dev; - isc__socketmgr_t * manager; + isc__socketmgr_t *manager; REQUIRE(VALID_SOCKET(sock)); REQUIRE(action != NULL); @@ -4058,8 +3998,7 @@ isc_socket_recv(isc_socket_t *sock0, isc_region_t *region, unsigned int minimum, isc_result_t isc_socket_recv2(isc_socket_t *sock0, isc_region_t *region, unsigned int minimum, isc_task_t *task, - isc_socketevent_t *event, unsigned int flags) -{ + isc_socketevent_t *event, unsigned int flags) { isc__socket_t *sock = (isc__socket_t *)sock0; event->ev_sender = sock; @@ -4088,11 +4027,10 @@ isc_socket_recv2(isc_socket_t *sock0, isc_region_t *region, static isc_result_t socket_send(isc__socket_t *sock, isc_socketevent_t *dev, isc_task_t *task, const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, - unsigned int flags) -{ - int io_state; - bool have_lock = false; - isc_task_t * ntask = NULL; + unsigned int flags) { + int io_state; + bool have_lock = false; + isc_task_t *ntask = NULL; isc_result_t result = ISC_R_SUCCESS; dev->ev_sender = task; @@ -4103,7 +4041,8 @@ socket_send(isc__socket_t *sock, isc_socketevent_t *dev, isc_task_t *task, dev->pktinfo = *pktinfo; if (!isc_sockaddr_issitelocal(&dev->address) && - !isc_sockaddr_islinklocal(&dev->address)) { + !isc_sockaddr_islinklocal(&dev->address)) + { socket_log(sock, NULL, TRACE, "pktinfo structure provided, ifindex %u " "(set to 0)", @@ -4189,8 +4128,7 @@ socket_send(isc__socket_t *sock, isc_socketevent_t *dev, isc_task_t *task, isc_result_t isc_socket_send(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, - isc_taskaction_t action, void *arg) -{ + isc_taskaction_t action, void *arg) { /* * REQUIRE() checking is performed in isc_socket_sendto(). */ @@ -4200,11 +4138,10 @@ isc_socket_send(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, isc_result_t isc_socket_sendto(isc_socket_t *sock0, isc_region_t *region, isc_task_t *task, isc_taskaction_t action, void *arg, - const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo) -{ - isc__socket_t * sock = (isc__socket_t *)sock0; + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo) { + isc__socket_t *sock = (isc__socket_t *)sock0; isc_socketevent_t *dev; - isc__socketmgr_t * manager; + isc__socketmgr_t *manager; REQUIRE(VALID_SOCKET(sock)); REQUIRE(region != NULL); @@ -4230,8 +4167,7 @@ isc_socket_sendto(isc_socket_t *sock0, isc_region_t *region, isc_task_t *task, isc_result_t isc_socket_sendto2(isc_socket_t *sock0, isc_region_t *region, isc_task_t *task, const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, - isc_socketevent_t *event, unsigned int flags) -{ + isc_socketevent_t *event, unsigned int flags) { isc__socket_t *sock = (isc__socket_t *)sock0; REQUIRE(VALID_SOCKET(sock)); @@ -4251,12 +4187,11 @@ isc_socket_sendto2(isc_socket_t *sock0, isc_region_t *region, isc_task_t *task, } void -isc_socket_cleanunix(const isc_sockaddr_t *sockaddr, bool active) -{ +isc_socket_cleanunix(const isc_sockaddr_t *sockaddr, bool active) { #ifdef ISC_PLATFORM_HAVESYSUNH - int s; + int s; struct stat sb; - char strbuf[ISC_STRERRORSIZE]; + char strbuf[ISC_STRERRORSIZE]; if (sockaddr->type.sa.sa_family != AF_UNIX) { return; @@ -4352,7 +4287,8 @@ isc_socket_cleanunix(const isc_sockaddr_t *sockaddr, bool active) } if (connect(s, (const struct sockaddr *)&sockaddr->type.sunix, - sizeof(sockaddr->type.sunix)) < 0) { + sizeof(sockaddr->type.sunix)) < 0) + { switch (errno) { case ECONNREFUSED: case ECONNRESET: @@ -4385,12 +4321,11 @@ cleanup: isc_result_t isc_socket_permunix(const isc_sockaddr_t *sockaddr, uint32_t perm, - uint32_t owner, uint32_t group) -{ + uint32_t owner, uint32_t group) { #ifdef ISC_PLATFORM_HAVESYSUNH isc_result_t result = ISC_R_SUCCESS; - char strbuf[ISC_STRERRORSIZE]; - char path[sizeof(sockaddr->type.sunix.sun_path)]; + char strbuf[ISC_STRERRORSIZE]; + char path[sizeof(sockaddr->type.sunix.sun_path)]; #ifdef NEED_SECURE_DIRECTORY char *slash; #endif /* ifdef NEED_SECURE_DIRECTORY */ @@ -4440,11 +4375,10 @@ isc_socket_permunix(const isc_sockaddr_t *sockaddr, uint32_t perm, isc_result_t isc_socket_bind(isc_socket_t *sock0, const isc_sockaddr_t *sockaddr, - isc_socket_options_t options) -{ + isc_socket_options_t options) { isc__socket_t *sock = (isc__socket_t *)sock0; - char strbuf[ISC_STRERRORSIZE]; - int on = 1; + char strbuf[ISC_STRERRORSIZE]; + int on = 1; REQUIRE(VALID_SOCKET(sock)); @@ -4467,7 +4401,8 @@ isc_socket_bind(isc_socket_t *sock0, const isc_sockaddr_t *sockaddr, } #endif /* ifdef AF_UNIX */ if ((options & ISC_SOCKET_REUSEADDRESS) != 0 && - isc_sockaddr_getport(sockaddr) != (in_port_t)0) { + isc_sockaddr_getport(sockaddr) != (in_port_t)0) + { if (setsockopt(sock->fd, SOL_SOCKET, SO_REUSEADDR, (void *)&on, sizeof(on)) < 0) { UNEXPECTED_ERROR(__FILE__, __LINE__, @@ -4475,7 +4410,8 @@ isc_socket_bind(isc_socket_t *sock0, const isc_sockaddr_t *sockaddr, } #if defined(__FreeBSD_kernel__) && defined(SO_REUSEPORT_LB) if (setsockopt(sock->fd, SOL_SOCKET, SO_REUSEPORT_LB, - (void *)&on, sizeof(on)) < 0) { + (void *)&on, sizeof(on)) < 0) + { UNEXPECTED_ERROR(__FILE__, __LINE__, "setsockopt(%d) failed", sock->fd); } @@ -4528,11 +4464,10 @@ bind_socket: #undef ENABLE_ACCEPTFILTER isc_result_t -isc_socket_filter(isc_socket_t *sock0, const char *filter) -{ +isc_socket_filter(isc_socket_t *sock0, const char *filter) { isc__socket_t *sock = (isc__socket_t *)sock0; #if defined(SO_ACCEPTFILTER) && defined(ENABLE_ACCEPTFILTER) - char strbuf[ISC_STRERRORSIZE]; + char strbuf[ISC_STRERRORSIZE]; struct accept_filter_arg afa; #else /* if defined(SO_ACCEPTFILTER) && defined(ENABLE_ACCEPTFILTER) */ UNUSED(sock); @@ -4561,8 +4496,7 @@ isc_socket_filter(isc_socket_t *sock0, const char *filter) * Try enabling TCP Fast Open for a given socket if the OS supports it. */ static void -set_tcp_fastopen(isc__socket_t *sock, unsigned int backlog) -{ +set_tcp_fastopen(isc__socket_t *sock, unsigned int backlog) { #if defined(ENABLE_TCP_FASTOPEN) && defined(TCP_FASTOPEN) char strbuf[ISC_STRERRORSIZE]; @@ -4575,8 +4509,8 @@ set_tcp_fastopen(isc__socket_t *sock, unsigned int backlog) #if defined(__FreeBSD__) && defined(HAVE_SYSCTLBYNAME) #define SYSCTL_TFO "net.inet.tcp.fastopen.enabled" unsigned int enabled; - size_t enabledlen = sizeof(enabled); - static bool tfo_notice_logged = false; + size_t enabledlen = sizeof(enabled); + static bool tfo_notice_logged = false; if (sysctlbyname(SYSCTL_TFO, &enabled, &enabledlen, NULL, 0) < 0) { /* @@ -4609,7 +4543,8 @@ set_tcp_fastopen(isc__socket_t *sock, unsigned int backlog) } #endif /* ifdef __APPLE__ */ if (setsockopt(sock->fd, IPPROTO_TCP, TCP_FASTOPEN, (void *)&backlog, - sizeof(backlog)) < 0) { + sizeof(backlog)) < 0) + { strerror_r(errno, strbuf, sizeof(strbuf)); UNEXPECTED_ERROR(__FILE__, __LINE__, "setsockopt(%d, TCP_FASTOPEN) failed with %s", @@ -4633,10 +4568,9 @@ set_tcp_fastopen(isc__socket_t *sock, unsigned int backlog) * as well keep things simple rather than having to track them. */ isc_result_t -isc_socket_listen(isc_socket_t *sock0, unsigned int backlog) -{ +isc_socket_listen(isc_socket_t *sock0, unsigned int backlog) { isc__socket_t *sock = (isc__socket_t *)sock0; - char strbuf[ISC_STRERRORSIZE]; + char strbuf[ISC_STRERRORSIZE]; REQUIRE(VALID_SOCKET(sock)); @@ -4673,15 +4607,14 @@ isc_socket_listen(isc_socket_t *sock0, unsigned int backlog) */ isc_result_t isc_socket_accept(isc_socket_t *sock0, isc_task_t *task, - isc_taskaction_t action, void *arg) -{ - isc__socket_t * sock = (isc__socket_t *)sock0; + isc_taskaction_t action, void *arg) { + isc__socket_t *sock = (isc__socket_t *)sock0; isc_socket_newconnev_t *dev; - isc__socketmgr_t * manager; - isc_task_t * ntask = NULL; - isc__socket_t * nsock; - isc_result_t result; - bool do_poke = false; + isc__socketmgr_t *manager; + isc_task_t *ntask = NULL; + isc__socket_t *nsock; + isc_result_t result; + bool do_poke = false; REQUIRE(VALID_SOCKET(sock)); manager = sock->manager; @@ -4742,15 +4675,14 @@ isc_socket_accept(isc_socket_t *sock0, isc_task_t *task, isc_result_t isc_socket_connect(isc_socket_t *sock0, const isc_sockaddr_t *addr, - isc_task_t *task, isc_taskaction_t action, void *arg) -{ - isc__socket_t * sock = (isc__socket_t *)sock0; + isc_task_t *task, isc_taskaction_t action, void *arg) { + isc__socket_t *sock = (isc__socket_t *)sock0; isc_socket_connev_t *dev; - isc_task_t * ntask = NULL; - isc__socketmgr_t * manager; - int cc; - char strbuf[ISC_STRERRORSIZE]; - char addrbuf[ISC_SOCKADDR_FORMATSIZE]; + isc_task_t *ntask = NULL; + isc__socketmgr_t *manager; + int cc; + char strbuf[ISC_STRERRORSIZE]; + char addrbuf[ISC_SOCKADDR_FORMATSIZE]; REQUIRE(VALID_SOCKET(sock)); REQUIRE(addr != NULL); @@ -4905,14 +4837,13 @@ queue: * Called when a socket with a pending connect() finishes. */ static void -internal_connect(isc__socket_t *sock) -{ +internal_connect(isc__socket_t *sock) { isc_socket_connev_t *dev; - int cc; - isc_result_t result; - socklen_t optlen; - char strbuf[ISC_STRERRORSIZE]; - char peerbuf[ISC_SOCKADDR_FORMATSIZE]; + int cc; + isc_result_t result; + socklen_t optlen; + char strbuf[ISC_STRERRORSIZE]; + char peerbuf[ISC_SOCKADDR_FORMATSIZE]; INSIST(VALID_SOCKET(sock)); @@ -4934,7 +4865,8 @@ internal_connect(isc__socket_t *sock) */ optlen = sizeof(cc); if (getsockopt(sock->fd, SOL_SOCKET, SO_ERROR, (void *)&cc, - (void *)&optlen) != 0) { + (void *)&optlen) != 0) + { cc = errno; } else { errno = cc; @@ -5005,10 +4937,9 @@ finish: } isc_result_t -isc_socket_getpeername(isc_socket_t *sock0, isc_sockaddr_t *addressp) -{ +isc_socket_getpeername(isc_socket_t *sock0, isc_sockaddr_t *addressp) { isc__socket_t *sock = (isc__socket_t *)sock0; - isc_result_t result; + isc_result_t result; REQUIRE(VALID_SOCKET(sock)); REQUIRE(addressp != NULL); @@ -5028,12 +4959,11 @@ isc_socket_getpeername(isc_socket_t *sock0, isc_sockaddr_t *addressp) } isc_result_t -isc_socket_getsockname(isc_socket_t *sock0, isc_sockaddr_t *addressp) -{ +isc_socket_getsockname(isc_socket_t *sock0, isc_sockaddr_t *addressp) { isc__socket_t *sock = (isc__socket_t *)sock0; - socklen_t len; - isc_result_t result; - char strbuf[ISC_STRERRORSIZE]; + socklen_t len; + isc_result_t result; + char strbuf[ISC_STRERRORSIZE]; REQUIRE(VALID_SOCKET(sock)); REQUIRE(addressp != NULL); @@ -5067,8 +4997,7 @@ out: * queued for task "task" of type "how". "how" is a bitmask. */ void -isc_socket_cancel(isc_socket_t *sock0, isc_task_t *task, unsigned int how) -{ +isc_socket_cancel(isc_socket_t *sock0, isc_task_t *task, unsigned int how) { isc__socket_t *sock = (isc__socket_t *)sock0; REQUIRE(VALID_SOCKET(sock)); @@ -5097,7 +5026,7 @@ isc_socket_cancel(isc_socket_t *sock0, isc_task_t *task, unsigned int how) !ISC_LIST_EMPTY(sock->recv_list)) { isc_socketevent_t *dev; isc_socketevent_t *next; - isc_task_t * current_task; + isc_task_t *current_task; dev = ISC_LIST_HEAD(sock->recv_list); @@ -5117,7 +5046,7 @@ isc_socket_cancel(isc_socket_t *sock0, isc_task_t *task, unsigned int how) !ISC_LIST_EMPTY(sock->send_list)) { isc_socketevent_t *dev; isc_socketevent_t *next; - isc_task_t * current_task; + isc_task_t *current_task; dev = ISC_LIST_HEAD(sock->send_list); @@ -5137,7 +5066,7 @@ isc_socket_cancel(isc_socket_t *sock0, isc_task_t *task, unsigned int how) !ISC_LIST_EMPTY(sock->accept_list)) { isc_socket_newconnev_t *dev; isc_socket_newconnev_t *next; - isc_task_t * current_task; + isc_task_t *current_task; dev = ISC_LIST_HEAD(sock->accept_list); while (dev != NULL) { @@ -5164,10 +5093,11 @@ isc_socket_cancel(isc_socket_t *sock0, isc_task_t *task, unsigned int how) } if (((how & ISC_SOCKCANCEL_CONNECT) != 0) && - !ISC_LIST_EMPTY(sock->connect_list)) { + !ISC_LIST_EMPTY(sock->connect_list)) + { isc_socket_connev_t *dev; isc_socket_connev_t *next; - isc_task_t * current_task; + isc_task_t *current_task; INSIST(sock->connecting); sock->connecting = 0; @@ -5190,8 +5120,7 @@ isc_socket_cancel(isc_socket_t *sock0, isc_task_t *task, unsigned int how) } isc_sockettype_t -isc_socket_gettype(isc_socket_t *sock0) -{ +isc_socket_gettype(isc_socket_t *sock0) { isc__socket_t *sock = (isc__socket_t *)sock0; REQUIRE(VALID_SOCKET(sock)); @@ -5200,8 +5129,7 @@ isc_socket_gettype(isc_socket_t *sock0) } void -isc_socket_ipv6only(isc_socket_t *sock0, bool yes) -{ +isc_socket_ipv6only(isc_socket_t *sock0, bool yes) { isc__socket_t *sock = (isc__socket_t *)sock0; #if defined(IPV6_V6ONLY) int onoff = yes ? 1 : 0; @@ -5216,7 +5144,8 @@ isc_socket_ipv6only(isc_socket_t *sock0, bool yes) #ifdef IPV6_V6ONLY if (sock->pf == AF_INET6) { if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_V6ONLY, - (void *)&onoff, sizeof(int)) < 0) { + (void *)&onoff, sizeof(int)) < 0) + { char strbuf[ISC_STRERRORSIZE]; strerror_r(errno, strbuf, sizeof(strbuf)); UNEXPECTED_ERROR(__FILE__, __LINE__, @@ -5229,8 +5158,7 @@ isc_socket_ipv6only(isc_socket_t *sock0, bool yes) } static void -setdscp(isc__socket_t *sock, isc_dscp_t dscp) -{ +setdscp(isc__socket_t *sock, isc_dscp_t dscp) { #if defined(IP_TOS) || defined(IPV6_TCLASS) int value = dscp << 2; #endif /* if defined(IP_TOS) || defined(IPV6_TCLASS) */ @@ -5253,7 +5181,8 @@ setdscp(isc__socket_t *sock, isc_dscp_t dscp) #ifdef IPV6_TCLASS if (sock->pf == AF_INET6) { if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_TCLASS, - (void *)&value, sizeof(value)) < 0) { + (void *)&value, sizeof(value)) < 0) + { char strbuf[ISC_STRERRORSIZE]; strerror_r(errno, strbuf, sizeof(strbuf)); UNEXPECTED_ERROR(__FILE__, __LINE__, @@ -5266,8 +5195,7 @@ setdscp(isc__socket_t *sock, isc_dscp_t dscp) } void -isc_socket_dscp(isc_socket_t *sock0, isc_dscp_t dscp) -{ +isc_socket_dscp(isc_socket_t *sock0, isc_dscp_t dscp) { isc__socket_t *sock = (isc__socket_t *)sock0; REQUIRE(VALID_SOCKET(sock)); @@ -5295,14 +5223,12 @@ isc_socket_dscp(isc_socket_t *sock0, isc_dscp_t dscp) isc_socketevent_t * isc_socket_socketevent(isc_mem_t *mctx, void *sender, isc_eventtype_t eventtype, - isc_taskaction_t action, void *arg) -{ + isc_taskaction_t action, void *arg) { return (allocate_socketevent(mctx, sender, eventtype, action, arg)); } void -isc_socket_setname(isc_socket_t *socket0, const char *name, void *tag) -{ +isc_socket_setname(isc_socket_t *socket0, const char *name, void *tag) { isc__socket_t *sock = (isc__socket_t *)socket0; /* @@ -5318,35 +5244,31 @@ isc_socket_setname(isc_socket_t *socket0, const char *name, void *tag) } const char * -isc_socket_getname(isc_socket_t *socket0) -{ +isc_socket_getname(isc_socket_t *socket0) { isc__socket_t *sock = (isc__socket_t *)socket0; return (sock->name); } void * -isc_socket_gettag(isc_socket_t *socket0) -{ +isc_socket_gettag(isc_socket_t *socket0) { isc__socket_t *sock = (isc__socket_t *)socket0; return (sock->tag); } int -isc_socket_getfd(isc_socket_t *socket0) -{ +isc_socket_getfd(isc_socket_t *socket0) { isc__socket_t *sock = (isc__socket_t *)socket0; return ((short)sock->fd); } static isc_once_t hasreuseport_once = ISC_ONCE_INIT; -static bool hasreuseport = false; +static bool hasreuseport = false; static void -init_hasreuseport() -{ +init_hasreuseport() { /* * SO_REUSEPORT works very differently on *BSD and on Linux (because why not). * We only want to use it on Linux, if it's available. On BSD we want to dup() @@ -5384,8 +5306,7 @@ init_hasreuseport() } bool -isc_socket_hasreuseport() -{ +isc_socket_hasreuseport() { RUNTIME_CHECK(isc_once_do(&hasreuseport_once, init_hasreuseport) == ISC_R_SUCCESS); return (hasreuseport); @@ -5393,8 +5314,7 @@ isc_socket_hasreuseport() #if defined(HAVE_LIBXML2) || defined(HAVE_JSON_C) static const char * -_socktype(isc_sockettype_t type) -{ +_socktype(isc_sockettype_t type) { switch (type) { case isc_sockettype_udp: return ("udp"); @@ -5416,15 +5336,14 @@ _socktype(isc_sockettype_t type) goto error; \ } while (0) int -isc_socketmgr_renderxml(isc_socketmgr_t *mgr0, void *writer0) -{ +isc_socketmgr_renderxml(isc_socketmgr_t *mgr0, void *writer0) { isc__socketmgr_t *mgr = (isc__socketmgr_t *)mgr0; - isc__socket_t * sock = NULL; - char peerbuf[ISC_SOCKADDR_FORMATSIZE]; - isc_sockaddr_t addr; - socklen_t len; - int xmlrc; - xmlTextWriterPtr writer = (xmlTextWriterPtr)writer0; + isc__socket_t *sock = NULL; + char peerbuf[ISC_SOCKADDR_FORMATSIZE]; + isc_sockaddr_t addr; + socklen_t len; + int xmlrc; + xmlTextWriterPtr writer = (xmlTextWriterPtr)writer0; LOCK(&mgr->lock); @@ -5529,16 +5448,15 @@ error: } while (0) isc_result_t -isc_socketmgr_renderjson(isc_socketmgr_t *mgr0, void *stats0) -{ - isc_result_t result = ISC_R_SUCCESS; +isc_socketmgr_renderjson(isc_socketmgr_t *mgr0, void *stats0) { + isc_result_t result = ISC_R_SUCCESS; isc__socketmgr_t *mgr = (isc__socketmgr_t *)mgr0; - isc__socket_t * sock = NULL; - char peerbuf[ISC_SOCKADDR_FORMATSIZE]; - isc_sockaddr_t addr; - socklen_t len; - json_object * obj, *array = json_object_new_array(); - json_object * stats = (json_object *)stats0; + isc__socket_t *sock = NULL; + char peerbuf[ISC_SOCKADDR_FORMATSIZE]; + isc_sockaddr_t addr; + socklen_t len; + json_object *obj, *array = json_object_new_array(); + json_object *stats = (json_object *)stats0; CHECKMEM(array); @@ -5547,7 +5465,7 @@ isc_socketmgr_renderjson(isc_socketmgr_t *mgr0, void *stats0) sock = ISC_LIST_HEAD(mgr->socklist); while (sock != NULL) { json_object *states, *entry = json_object_new_object(); - char buf[255]; + char buf[255]; CHECKMEM(entry); json_object_array_add(array, entry); @@ -5642,8 +5560,7 @@ error: #endif /* HAVE_JSON_C */ isc_result_t -isc_socketmgr_createinctx(isc_mem_t *mctx, isc_socketmgr_t **managerp) -{ +isc_socketmgr_createinctx(isc_mem_t *mctx, isc_socketmgr_t **managerp) { isc_result_t result; result = isc_socketmgr_create(mctx, managerp); diff --git a/lib/isc/unix/stdio.c b/lib/isc/unix/stdio.c index 0183bdae6c..d2715e2269 100644 --- a/lib/isc/unix/stdio.c +++ b/lib/isc/unix/stdio.c @@ -19,8 +19,7 @@ #include "errno2result.h" isc_result_t -isc_stdio_open(const char *filename, const char *mode, FILE **fp) -{ +isc_stdio_open(const char *filename, const char *mode, FILE **fp) { FILE *f; f = fopen(filename, mode); @@ -32,8 +31,7 @@ isc_stdio_open(const char *filename, const char *mode, FILE **fp) } isc_result_t -isc_stdio_close(FILE *f) -{ +isc_stdio_close(FILE *f) { int r; r = fclose(f); @@ -45,8 +43,7 @@ isc_stdio_close(FILE *f) } isc_result_t -isc_stdio_seek(FILE *f, off_t offset, int whence) -{ +isc_stdio_seek(FILE *f, off_t offset, int whence) { int r; r = fseeko(f, offset, whence); @@ -58,8 +55,7 @@ isc_stdio_seek(FILE *f, off_t offset, int whence) } isc_result_t -isc_stdio_tell(FILE *f, off_t *offsetp) -{ +isc_stdio_tell(FILE *f, off_t *offsetp) { off_t r; REQUIRE(offsetp != NULL); @@ -74,10 +70,9 @@ isc_stdio_tell(FILE *f, off_t *offsetp) } isc_result_t -isc_stdio_read(void *ptr, size_t size, size_t nmemb, FILE *f, size_t *nret) -{ +isc_stdio_read(void *ptr, size_t size, size_t nmemb, FILE *f, size_t *nret) { isc_result_t result = ISC_R_SUCCESS; - size_t r; + size_t r; clearerr(f); r = fread(ptr, size, nmemb, f); @@ -96,10 +91,9 @@ isc_stdio_read(void *ptr, size_t size, size_t nmemb, FILE *f, size_t *nret) isc_result_t isc_stdio_write(const void *ptr, size_t size, size_t nmemb, FILE *f, - size_t *nret) -{ + size_t *nret) { isc_result_t result = ISC_R_SUCCESS; - size_t r; + size_t r; clearerr(f); r = fwrite(ptr, size, nmemb, f); @@ -113,8 +107,7 @@ isc_stdio_write(const void *ptr, size_t size, size_t nmemb, FILE *f, } isc_result_t -isc_stdio_flush(FILE *f) -{ +isc_stdio_flush(FILE *f) { int r; r = fflush(f); @@ -133,10 +126,9 @@ isc_stdio_flush(FILE *f) #endif /* if defined(EOPNOTSUPP) && !defined(ENOTSUP) */ isc_result_t -isc_stdio_sync(FILE *f) -{ +isc_stdio_sync(FILE *f) { struct stat buf; - int r; + int r; if (fstat(fileno(f), &buf) != 0) { return (isc__errno2result(errno)); diff --git a/lib/isc/unix/stdtime.c b/lib/isc/unix/stdtime.c index aa28decddc..9886e921f4 100644 --- a/lib/isc/unix/stdtime.c +++ b/lib/isc/unix/stdtime.c @@ -29,8 +29,7 @@ #if ISC_FIX_TV_USEC static inline void -fix_tv_usec(struct timeval *tv) -{ +fix_tv_usec(struct timeval *tv) { bool fixed = false; if (tv->tv_usec < 0) { @@ -57,8 +56,7 @@ fix_tv_usec(struct timeval *tv) #endif /* if ISC_FIX_TV_USEC */ void -isc_stdtime_get(isc_stdtime_t *t) -{ +isc_stdtime_get(isc_stdtime_t *t) { struct timeval tv; /* diff --git a/lib/isc/unix/syslog.c b/lib/isc/unix/syslog.c index 154c6fbc67..183b9c02db 100644 --- a/lib/isc/unix/syslog.c +++ b/lib/isc/unix/syslog.c @@ -20,7 +20,7 @@ #include static struct dsn_c_pvt_sfnt { - int val; + int val; const char *strval; } facilities[] = { { LOG_KERN, "kern" }, { LOG_USER, "user" }, @@ -55,8 +55,7 @@ static struct dsn_c_pvt_sfnt { { 0, NULL } }; isc_result_t -isc_syslog_facilityfromstring(const char *str, int *facilityp) -{ +isc_syslog_facilityfromstring(const char *str, int *facilityp) { int i; REQUIRE(str != NULL); diff --git a/lib/isc/unix/time.c b/lib/isc/unix/time.c index ed2b21a4b2..86dfca606d 100644 --- a/lib/isc/unix/time.c +++ b/lib/isc/unix/time.c @@ -30,10 +30,10 @@ #include /* Required for struct timeval on some platforms. */ -#define NS_PER_S 1000000000 /*%< Nanoseconds per second. */ -#define NS_PER_US 1000 /*%< Nanoseconds per microsecond. */ -#define NS_PER_MS 1000000 /*%< Nanoseconds per millisecond. */ -#define US_PER_S 1000000 /*%< Microseconds per second. */ +#define NS_PER_S 1000000000 /*%< Nanoseconds per second. */ +#define NS_PER_US 1000 /*%< Nanoseconds per microsecond. */ +#define NS_PER_MS 1000000 /*%< Nanoseconds per millisecond. */ +#define US_PER_S 1000000 /*%< Microseconds per second. */ #if defined(CLOCK_REALTIME_COARSE) #define CLOCKSOURCE CLOCK_REALTIME_COARSE @@ -52,8 +52,7 @@ const isc_interval_t *const isc_interval_zero = &zero_interval; void isc_interval_set(isc_interval_t *i, unsigned int seconds, - unsigned int nanoseconds) -{ + unsigned int nanoseconds) { REQUIRE(i != NULL); REQUIRE(nanoseconds < NS_PER_S); @@ -62,8 +61,7 @@ isc_interval_set(isc_interval_t *i, unsigned int seconds, } bool -isc_interval_iszero(const isc_interval_t *i) -{ +isc_interval_iszero(const isc_interval_t *i) { REQUIRE(i != NULL); INSIST(i->nanoseconds < NS_PER_S); @@ -82,8 +80,7 @@ static const isc_time_t epoch = { 0, 0 }; const isc_time_t *const isc_time_epoch = &epoch; void -isc_time_set(isc_time_t *t, unsigned int seconds, unsigned int nanoseconds) -{ +isc_time_set(isc_time_t *t, unsigned int seconds, unsigned int nanoseconds) { REQUIRE(t != NULL); REQUIRE(nanoseconds < NS_PER_S); @@ -92,8 +89,7 @@ isc_time_set(isc_time_t *t, unsigned int seconds, unsigned int nanoseconds) } void -isc_time_settoepoch(isc_time_t *t) -{ +isc_time_settoepoch(isc_time_t *t) { REQUIRE(t != NULL); t->seconds = 0; @@ -101,8 +97,7 @@ isc_time_settoepoch(isc_time_t *t) } bool -isc_time_isepoch(const isc_time_t *t) -{ +isc_time_isepoch(const isc_time_t *t) { REQUIRE(t != NULL); INSIST(t->nanoseconds < NS_PER_S); @@ -114,10 +109,9 @@ isc_time_isepoch(const isc_time_t *t) } isc_result_t -isc_time_now(isc_time_t *t) -{ +isc_time_now(isc_time_t *t) { struct timespec ts; - char strbuf[ISC_STRERRORSIZE]; + char strbuf[ISC_STRERRORSIZE]; REQUIRE(t != NULL); @@ -135,7 +129,8 @@ isc_time_now(isc_time_t *t) * Ensure the tv_sec value fits in t->seconds. */ if (sizeof(ts.tv_sec) > sizeof(t->seconds) && - ((ts.tv_sec | (unsigned int)-1) ^ (unsigned int)-1) != 0U) { + ((ts.tv_sec | (unsigned int)-1) ^ (unsigned int)-1) != 0U) + { return (ISC_R_RANGE); } @@ -146,10 +141,9 @@ isc_time_now(isc_time_t *t) } isc_result_t -isc_time_nowplusinterval(isc_time_t *t, const isc_interval_t *i) -{ +isc_time_nowplusinterval(isc_time_t *t, const isc_interval_t *i) { struct timespec ts; - char strbuf[ISC_STRERRORSIZE]; + char strbuf[ISC_STRERRORSIZE]; REQUIRE(t != NULL); REQUIRE(i != NULL); @@ -172,7 +166,8 @@ isc_time_nowplusinterval(isc_time_t *t, const isc_interval_t *i) * and getting another 1 added below the result is UINT_MAX.) */ if ((ts.tv_sec > INT_MAX || i->seconds > INT_MAX) && - ((long long)ts.tv_sec + i->seconds > UINT_MAX)) { + ((long long)ts.tv_sec + i->seconds > UINT_MAX)) + { return (ISC_R_RANGE); } @@ -187,8 +182,7 @@ isc_time_nowplusinterval(isc_time_t *t, const isc_interval_t *i) } int -isc_time_compare(const isc_time_t *t1, const isc_time_t *t2) -{ +isc_time_compare(const isc_time_t *t1, const isc_time_t *t2) { REQUIRE(t1 != NULL && t2 != NULL); INSIST(t1->nanoseconds < NS_PER_S && t2->nanoseconds < NS_PER_S); @@ -208,8 +202,7 @@ isc_time_compare(const isc_time_t *t1, const isc_time_t *t2) } isc_result_t -isc_time_add(const isc_time_t *t, const isc_interval_t *i, isc_time_t *result) -{ +isc_time_add(const isc_time_t *t, const isc_interval_t *i, isc_time_t *result) { REQUIRE(t != NULL && i != NULL && result != NULL); INSIST(t->nanoseconds < NS_PER_S && i->nanoseconds < NS_PER_S); @@ -220,7 +213,8 @@ isc_time_add(const isc_time_t *t, const isc_interval_t *i, isc_time_t *result) * and getting another 1 added below the result is UINT_MAX.) */ if ((t->seconds > INT_MAX || i->seconds > INT_MAX) && - ((long long)t->seconds + i->seconds > UINT_MAX)) { + ((long long)t->seconds + i->seconds > UINT_MAX)) + { return (ISC_R_RANGE); } @@ -236,14 +230,14 @@ isc_time_add(const isc_time_t *t, const isc_interval_t *i, isc_time_t *result) isc_result_t isc_time_subtract(const isc_time_t *t, const isc_interval_t *i, - isc_time_t *result) -{ + isc_time_t *result) { REQUIRE(t != NULL && i != NULL && result != NULL); INSIST(t->nanoseconds < NS_PER_S && i->nanoseconds < NS_PER_S); if ((unsigned int)t->seconds < i->seconds || ((unsigned int)t->seconds == i->seconds && - t->nanoseconds < i->nanoseconds)) { + t->nanoseconds < i->nanoseconds)) + { return (ISC_R_RANGE); } @@ -251,8 +245,8 @@ isc_time_subtract(const isc_time_t *t, const isc_interval_t *i, if (t->nanoseconds >= i->nanoseconds) { result->nanoseconds = t->nanoseconds - i->nanoseconds; } else { - result->nanoseconds = - NS_PER_S - i->nanoseconds + t->nanoseconds; + result->nanoseconds = NS_PER_S - i->nanoseconds + + t->nanoseconds; result->seconds--; } @@ -260,8 +254,7 @@ isc_time_subtract(const isc_time_t *t, const isc_interval_t *i, } uint64_t -isc_time_microdiff(const isc_time_t *t1, const isc_time_t *t2) -{ +isc_time_microdiff(const isc_time_t *t1, const isc_time_t *t2) { uint64_t i1, i2, i3; REQUIRE(t1 != NULL && t2 != NULL); @@ -285,8 +278,7 @@ isc_time_microdiff(const isc_time_t *t1, const isc_time_t *t2) } uint32_t -isc_time_seconds(const isc_time_t *t) -{ +isc_time_seconds(const isc_time_t *t) { REQUIRE(t != NULL); INSIST(t->nanoseconds < NS_PER_S); @@ -294,8 +286,7 @@ isc_time_seconds(const isc_time_t *t) } isc_result_t -isc_time_secondsastimet(const isc_time_t *t, time_t *secondsp) -{ +isc_time_secondsastimet(const isc_time_t *t, time_t *secondsp) { time_t seconds; REQUIRE(t != NULL); @@ -333,8 +324,7 @@ isc_time_secondsastimet(const isc_time_t *t, time_t *secondsp) } uint32_t -isc_time_nanoseconds(const isc_time_t *t) -{ +isc_time_nanoseconds(const isc_time_t *t) { REQUIRE(t != NULL); ENSURE(t->nanoseconds < NS_PER_S); @@ -343,11 +333,10 @@ isc_time_nanoseconds(const isc_time_t *t) } void -isc_time_formattimestamp(const isc_time_t *t, char *buf, unsigned int len) -{ - time_t now; +isc_time_formattimestamp(const isc_time_t *t, char *buf, unsigned int len) { + time_t now; unsigned int flen; - struct tm tm; + struct tm tm; REQUIRE(t != NULL); INSIST(t->nanoseconds < NS_PER_S); @@ -366,11 +355,10 @@ isc_time_formattimestamp(const isc_time_t *t, char *buf, unsigned int len) } void -isc_time_formathttptimestamp(const isc_time_t *t, char *buf, unsigned int len) -{ - time_t now; +isc_time_formathttptimestamp(const isc_time_t *t, char *buf, unsigned int len) { + time_t now; unsigned int flen; - struct tm tm; + struct tm tm; REQUIRE(t != NULL); INSIST(t->nanoseconds < NS_PER_S); @@ -387,11 +375,10 @@ isc_time_formathttptimestamp(const isc_time_t *t, char *buf, unsigned int len) } isc_result_t -isc_time_parsehttptimestamp(char *buf, isc_time_t *t) -{ +isc_time_parsehttptimestamp(char *buf, isc_time_t *t) { struct tm t_tm; - time_t when; - char * p; + time_t when; + char *p; REQUIRE(buf != NULL); REQUIRE(t != NULL); @@ -409,11 +396,10 @@ isc_time_parsehttptimestamp(char *buf, isc_time_t *t) } void -isc_time_formatISO8601L(const isc_time_t *t, char *buf, unsigned int len) -{ - time_t now; +isc_time_formatISO8601L(const isc_time_t *t, char *buf, unsigned int len) { + time_t now; unsigned int flen; - struct tm tm; + struct tm tm; REQUIRE(t != NULL); INSIST(t->nanoseconds < NS_PER_S); @@ -426,11 +412,10 @@ isc_time_formatISO8601L(const isc_time_t *t, char *buf, unsigned int len) } void -isc_time_formatISO8601Lms(const isc_time_t *t, char *buf, unsigned int len) -{ - time_t now; +isc_time_formatISO8601Lms(const isc_time_t *t, char *buf, unsigned int len) { + time_t now; unsigned int flen; - struct tm tm; + struct tm tm; REQUIRE(t != NULL); INSIST(t->nanoseconds < NS_PER_S); @@ -447,11 +432,10 @@ isc_time_formatISO8601Lms(const isc_time_t *t, char *buf, unsigned int len) } void -isc_time_formatISO8601(const isc_time_t *t, char *buf, unsigned int len) -{ - time_t now; +isc_time_formatISO8601(const isc_time_t *t, char *buf, unsigned int len) { + time_t now; unsigned int flen; - struct tm tm; + struct tm tm; REQUIRE(t != NULL); INSIST(t->nanoseconds < NS_PER_S); @@ -464,11 +448,10 @@ isc_time_formatISO8601(const isc_time_t *t, char *buf, unsigned int len) } void -isc_time_formatISO8601ms(const isc_time_t *t, char *buf, unsigned int len) -{ - time_t now; +isc_time_formatISO8601ms(const isc_time_t *t, char *buf, unsigned int len) { + time_t now; unsigned int flen; - struct tm tm; + struct tm tm; REQUIRE(t != NULL); INSIST(t->nanoseconds < NS_PER_S); @@ -486,11 +469,11 @@ isc_time_formatISO8601ms(const isc_time_t *t, char *buf, unsigned int len) } void -isc_time_formatshorttimestamp(const isc_time_t *t, char *buf, unsigned int len) -{ - time_t now; +isc_time_formatshorttimestamp(const isc_time_t *t, char *buf, + unsigned int len) { + time_t now; unsigned int flen; - struct tm tm; + struct tm tm; REQUIRE(t != NULL); INSIST(t->nanoseconds < NS_PER_S); diff --git a/lib/isc/win32/DLLMain.c b/lib/isc/win32/DLLMain.c index 8a1275a112..d7f067d106 100644 --- a/lib/isc/win32/DLLMain.c +++ b/lib/isc/win32/DLLMain.c @@ -16,8 +16,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/lib/isc/win32/condition.c b/lib/isc/win32/condition.c index 29c415ad27..0b0bde191f 100644 --- a/lib/isc/win32/condition.c +++ b/lib/isc/win32/condition.c @@ -20,12 +20,11 @@ #include #include -#define LSIGNAL 0 +#define LSIGNAL 0 #define LBROADCAST 1 void -isc_condition_init(isc_condition_t *cond) -{ +isc_condition_init(isc_condition_t *cond) { HANDLE h; REQUIRE(cond != NULL); @@ -36,7 +35,7 @@ isc_condition_init(isc_condition_t *cond) */ h = CreateEvent(NULL, FALSE, FALSE, NULL); if (h == NULL) { - char strbuf[ISC_STRERRORSIZE]; + char strbuf[ISC_STRERRORSIZE]; DWORD err = GetLastError(); strerror_r(err, strbuf, sizeof(strbuf)); isc_error_fatal(__FILE__, __LINE__, "CreateEvent failed: %s", @@ -56,9 +55,8 @@ isc_condition_init(isc_condition_t *cond) */ static isc_result_t register_thread(unsigned long thrd, isc_condition_t *gblcond, - isc_condition_thread_t **localcond) -{ - HANDLE hc; + isc_condition_thread_t **localcond) { + HANDLE hc; isc_condition_thread_t *newthread; REQUIRE(localcond != NULL && *localcond == NULL); @@ -95,8 +93,7 @@ register_thread(unsigned long thrd, isc_condition_t *gblcond, static isc_result_t find_thread_condition(unsigned long thrd, isc_condition_t *cond, - isc_condition_thread_t **threadcondp) -{ + isc_condition_thread_t **threadcondp) { isc_condition_thread_t *threadcond; REQUIRE(threadcondp != NULL && *threadcondp == NULL); @@ -105,7 +102,8 @@ find_thread_condition(unsigned long thrd, isc_condition_t *cond, * Look for the thread ID. */ for (threadcond = ISC_LIST_HEAD(cond->threadlist); threadcond != NULL; - threadcond = ISC_LIST_NEXT(threadcond, link)) { + threadcond = ISC_LIST_NEXT(threadcond, link)) + { if (threadcond->th == thrd) { *threadcondp = threadcond; return (ISC_R_SUCCESS); @@ -119,8 +117,7 @@ find_thread_condition(unsigned long thrd, isc_condition_t *cond, } isc_result_t -isc_condition_signal(isc_condition_t *cond) -{ +isc_condition_signal(isc_condition_t *cond) { /* * Unlike pthreads, the caller MUST hold the lock associated with * the condition variable when calling us. @@ -135,10 +132,9 @@ isc_condition_signal(isc_condition_t *cond) } isc_result_t -isc_condition_broadcast(isc_condition_t *cond) -{ +isc_condition_broadcast(isc_condition_t *cond) { isc_condition_thread_t *threadcond; - bool failed = false; + bool failed = false; /* * Unlike pthreads, the caller MUST hold the lock associated with @@ -150,7 +146,8 @@ isc_condition_broadcast(isc_condition_t *cond) * Notify every thread registered for this */ for (threadcond = ISC_LIST_HEAD(cond->threadlist); threadcond != NULL; - threadcond = ISC_LIST_NEXT(threadcond, link)) { + threadcond = ISC_LIST_NEXT(threadcond, link)) + { if (!SetEvent(threadcond->handle[LBROADCAST])) { failed = true; } @@ -164,8 +161,7 @@ isc_condition_broadcast(isc_condition_t *cond) } isc_result_t -isc_condition_destroy(isc_condition_t *cond) -{ +isc_condition_destroy(isc_condition_t *cond) { isc_condition_thread_t *next, *threadcond; REQUIRE(cond != NULL); @@ -199,10 +195,9 @@ isc_condition_destroy(isc_condition_t *cond) * the mutex. */ static isc_result_t -wait(isc_condition_t *cond, isc_mutex_t *mutex, DWORD milliseconds) -{ - DWORD result; - isc_result_t tresult; +wait(isc_condition_t *cond, isc_mutex_t *mutex, DWORD milliseconds) { + DWORD result; + isc_result_t tresult; isc_condition_thread_t *threadcond = NULL; /* @@ -231,17 +226,15 @@ wait(isc_condition_t *cond, isc_mutex_t *mutex, DWORD milliseconds) } isc_result_t -isc_condition_wait(isc_condition_t *cond, isc_mutex_t *mutex) -{ +isc_condition_wait(isc_condition_t *cond, isc_mutex_t *mutex) { return (wait(cond, mutex, INFINITE)); } isc_result_t isc_condition_waituntil(isc_condition_t *cond, isc_mutex_t *mutex, - isc_time_t *t) -{ - DWORD milliseconds; - uint64_t microseconds; + isc_time_t *t) { + DWORD milliseconds; + uint64_t microseconds; isc_time_t now; if (isc_time_now(&now) != ISC_R_SUCCESS) { diff --git a/lib/isc/win32/dir.c b/lib/isc/win32/dir.c index e6bd56b206..501a1bdfc8 100644 --- a/lib/isc/win32/dir.c +++ b/lib/isc/win32/dir.c @@ -25,15 +25,13 @@ #include -#define ISC_DIR_MAGIC ISC_MAGIC('D', 'I', 'R', '*') +#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) -{ +isc_dir_init(isc_dir_t *dir) { REQUIRE(dir != NULL); dir->dirname[0] = '\0'; @@ -53,9 +51,8 @@ isc_dir_init(isc_dir_t *dir) * NULL will be returned. */ isc_result_t -isc_dir_open(isc_dir_t *dir, const char *dirname) -{ - char * p; +isc_dir_open(isc_dir_t *dir, const char *dirname) { + char *p; isc_result_t result; REQUIRE(dirname != NULL); @@ -95,8 +92,7 @@ isc_dir_open(isc_dir_t *dir, const char *dirname) * the dir stream and reads the first file in one operation. */ isc_result_t -isc_dir_read(isc_dir_t *dir) -{ +isc_dir_read(isc_dir_t *dir) { REQUIRE(VALID_DIR(dir) && dir->search_handle != INVALID_HANDLE_VALUE); if (dir->entry_filled) { @@ -137,8 +133,7 @@ isc_dir_read(isc_dir_t *dir) * Close directory stream. */ void -isc_dir_close(isc_dir_t *dir) -{ +isc_dir_close(isc_dir_t *dir) { REQUIRE(VALID_DIR(dir) && dir->search_handle != INVALID_HANDLE_VALUE); FindClose(dir->search_handle); @@ -149,8 +144,7 @@ isc_dir_close(isc_dir_t *dir) * Reposition directory stream at start. */ isc_result_t -isc_dir_reset(isc_dir_t *dir) -{ +isc_dir_reset(isc_dir_t *dir) { isc_result_t result; REQUIRE(VALID_DIR(dir) && dir->search_handle != INVALID_HANDLE_VALUE); @@ -177,8 +171,7 @@ isc_dir_reset(isc_dir_t *dir) * - Be sure to close previous stream before opening new one */ static isc_result_t -start_directory(isc_dir_t *dir) -{ +start_directory(isc_dir_t *dir) { REQUIRE(VALID_DIR(dir)); REQUIRE(dir->search_handle == INVALID_HANDLE_VALUE); @@ -221,8 +214,7 @@ start_directory(isc_dir_t *dir) } isc_result_t -isc_dir_chdir(const char *dirname) -{ +isc_dir_chdir(const char *dirname) { /* * Change the current directory to 'dirname'. */ @@ -237,19 +229,17 @@ isc_dir_chdir(const char *dirname) } isc_result_t -isc_dir_chroot(const char *dirname) -{ +isc_dir_chroot(const char *dirname) { return (ISC_R_NOTIMPLEMENTED); } isc_result_t -isc_dir_createunique(char *templet) -{ +isc_dir_createunique(char *templet) { isc_result_t result; - char * x; - char * p; - int i; - int pid; + char *x; + char *p; + int i; + int pid; REQUIRE(templet != NULL); diff --git a/lib/isc/win32/errno.c b/lib/isc/win32/errno.c index 80eeb17a4b..c2fe4fc62f 100644 --- a/lib/isc/win32/errno.c +++ b/lib/isc/win32/errno.c @@ -14,7 +14,6 @@ #include "errno2result.h" isc_result_t -isc_errno_toresult(int err) -{ +isc_errno_toresult(int err) { return (isc__errno2resultx(err, false, 0, 0)); } diff --git a/lib/isc/win32/errno2result.c b/lib/isc/win32/errno2result.c index 14c8a696da..ba73f80913 100644 --- a/lib/isc/win32/errno2result.c +++ b/lib/isc/win32/errno2result.c @@ -26,8 +26,7 @@ * not already there. */ isc_result_t -isc__errno2resultx(int posixerrno, bool dolog, const char *file, int line) -{ +isc__errno2resultx(int posixerrno, bool dolog, const char *file, int line) { char strbuf[ISC_STRERRORSIZE]; switch (posixerrno) { diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c index 8cedbafda5..41472b76b5 100644 --- a/lib/isc/win32/file.c +++ b/lib/isc/win32/file.c @@ -44,11 +44,10 @@ static const char alphnum[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuv" * */ static int -gettemp(char *path, bool binary, int *doopen) -{ - char * start, *trv; +gettemp(char *path, bool binary, int *doopen) { + char *start, *trv; struct stat sbuf; - int flags = O_CREAT | O_EXCL | O_RDWR; + int flags = O_CREAT | O_EXCL | O_RDWR; if (binary) { flags |= _O_BINARY; @@ -117,8 +116,7 @@ gettemp(char *path, bool binary, int *doopen) } static int -mkstemp(char *path, bool binary) -{ +mkstemp(char *path, bool binary) { int fd; return (gettemp(path, binary, &fd) ? fd : -1); @@ -133,8 +131,7 @@ mkstemp(char *path, bool binary) * annoying MP issues. BTW, Win32 has stat(). */ static isc_result_t -file_stats(const char *file, struct stat *stats) -{ +file_stats(const char *file, struct stat *stats) { isc_result_t result = ISC_R_SUCCESS; REQUIRE(file != NULL); @@ -148,8 +145,7 @@ file_stats(const char *file, struct stat *stats) } static isc_result_t -fd_stats(int fd, struct stat *stats) -{ +fd_stats(int fd, struct stat *stats) { isc_result_t result = ISC_R_SUCCESS; REQUIRE(stats != NULL); @@ -162,10 +158,9 @@ fd_stats(int fd, struct stat *stats) } isc_result_t -isc_file_getsizefd(int fd, off_t *size) -{ +isc_file_getsizefd(int fd, off_t *size) { isc_result_t result; - struct stat stats; + struct stat stats; REQUIRE(size != NULL); @@ -178,10 +173,9 @@ isc_file_getsizefd(int fd, off_t *size) } isc_result_t -isc_file_mode(const char *file, mode_t *modep) -{ +isc_file_mode(const char *file, mode_t *modep) { isc_result_t result; - struct stat stats; + struct stat stats; REQUIRE(modep != NULL); @@ -200,13 +194,12 @@ isc_file_mode(const char *file, mode_t *modep) */ int -isc_file_safemovefile(const char *oldname, const char *newname) -{ - BOOL filestatus; - char buf[512]; +isc_file_safemovefile(const char *oldname, const char *newname) { + BOOL filestatus; + char buf[512]; struct stat sbuf; - BOOL exists = FALSE; - int tmpfd; + BOOL exists = FALSE; + int tmpfd; /* * Make sure we have something to do @@ -261,8 +254,7 @@ isc_file_safemovefile(const char *oldname, const char *newname) } isc_result_t -isc_file_getmodtime(const char *file, isc_time_t *time) -{ +isc_file_getmodtime(const char *file, isc_time_t *time) { int fh; REQUIRE(file != NULL); @@ -283,10 +275,9 @@ isc_file_getmodtime(const char *file, isc_time_t *time) } isc_result_t -isc_file_getsize(const char *file, off_t *size) -{ +isc_file_getsize(const char *file, off_t *size) { isc_result_t result; - struct stat stats; + struct stat stats; REQUIRE(file != NULL); REQUIRE(size != NULL); @@ -301,8 +292,7 @@ isc_file_getsize(const char *file, off_t *size) } isc_result_t -isc_file_settime(const char *file, isc_time_t *time) -{ +isc_file_settime(const char *file, isc_time_t *time) { int fh; REQUIRE(file != NULL && time != NULL); @@ -317,7 +307,8 @@ isc_file_settime(const char *file, isc_time_t *time) * underlying file system. */ if (!SetFileTime((HANDLE)_get_osfhandle(fh), NULL, &time->absolute, - &time->absolute)) { + &time->absolute)) + { close(fh); errno = EINVAL; return (isc__errno2result(errno)); @@ -331,15 +322,13 @@ isc_file_settime(const char *file, isc_time_t *time) #define TEMPLATE "XXXXXXXXXX.tmp" /* 14 characters. */ isc_result_t -isc_file_mktemplate(const char *path, char *buf, size_t buflen) -{ +isc_file_mktemplate(const char *path, char *buf, size_t buflen) { return (isc_file_template(path, TEMPLATE, buf, buflen)); } isc_result_t isc_file_template(const char *path, const char *templet, char *buf, - size_t buflen) -{ + size_t buflen) { char *s; REQUIRE(templet != NULL); @@ -377,9 +366,8 @@ isc_file_template(const char *path, const char *templet, char *buf, } isc_result_t -isc_file_renameunique(const char *file, char *templet) -{ - int fd; +isc_file_renameunique(const char *file, char *templet) { + int fd; isc_result_t result = ISC_R_SUCCESS; REQUIRE(file != NULL); @@ -404,10 +392,9 @@ isc_file_renameunique(const char *file, char *templet) } static isc_result_t -openuniquemode(char *templet, int mode, bool binary, FILE **fp) -{ - int fd; - FILE * f; +openuniquemode(char *templet, int mode, bool binary, FILE **fp) { + int fd; + FILE *f; isc_result_t result = ISC_R_SUCCESS; REQUIRE(templet != NULL); @@ -441,48 +428,41 @@ openuniquemode(char *templet, int mode, bool binary, FILE **fp) } isc_result_t -isc_file_openuniqueprivate(char *templet, FILE **fp) -{ +isc_file_openuniqueprivate(char *templet, FILE **fp) { int mode = _S_IREAD | _S_IWRITE; return (openuniquemode(templet, mode, false, fp)); } isc_result_t -isc_file_openunique(char *templet, FILE **fp) -{ +isc_file_openunique(char *templet, FILE **fp) { int mode = _S_IREAD | _S_IWRITE; return (openuniquemode(templet, mode, false, fp)); } isc_result_t -isc_file_openuniquemode(char *templet, int mode, FILE **fp) -{ +isc_file_openuniquemode(char *templet, int mode, FILE **fp) { return (openuniquemode(templet, mode, false, fp)); } isc_result_t -isc_file_bopenuniqueprivate(char *templet, FILE **fp) -{ +isc_file_bopenuniqueprivate(char *templet, FILE **fp) { int mode = _S_IREAD | _S_IWRITE; return (openuniquemode(templet, mode, true, fp)); } isc_result_t -isc_file_bopenunique(char *templet, FILE **fp) -{ +isc_file_bopenunique(char *templet, FILE **fp) { int mode = _S_IREAD | _S_IWRITE; return (openuniquemode(templet, mode, true, fp)); } isc_result_t -isc_file_bopenuniquemode(char *templet, int mode, FILE **fp) -{ +isc_file_bopenuniquemode(char *templet, int mode, FILE **fp) { return (openuniquemode(templet, mode, true, fp)); } isc_result_t -isc_file_remove(const char *filename) -{ +isc_file_remove(const char *filename) { int r; REQUIRE(filename != NULL); @@ -496,8 +476,7 @@ isc_file_remove(const char *filename) } isc_result_t -isc_file_rename(const char *oldname, const char *newname) -{ +isc_file_rename(const char *oldname, const char *newname) { int r; REQUIRE(oldname != NULL); @@ -512,8 +491,7 @@ isc_file_rename(const char *oldname, const char *newname) } bool -isc_file_exists(const char *pathname) -{ +isc_file_exists(const char *pathname) { struct stat stats; REQUIRE(pathname != NULL); @@ -522,8 +500,7 @@ isc_file_exists(const char *pathname) } isc_result_t -isc_file_isplainfile(const char *filename) -{ +isc_file_isplainfile(const char *filename) { /* * This function returns success if filename is a plain file. */ @@ -542,8 +519,7 @@ isc_file_isplainfile(const char *filename) } isc_result_t -isc_file_isplainfilefd(int fd) -{ +isc_file_isplainfilefd(int fd) { /* * This function returns success if filename is a plain file. */ @@ -562,8 +538,7 @@ isc_file_isplainfilefd(int fd) } isc_result_t -isc_file_isdirectory(const char *filename) -{ +isc_file_isdirectory(const char *filename) { /* * This function returns success if filename is a directory. */ @@ -582,8 +557,7 @@ isc_file_isdirectory(const char *filename) } bool -isc_file_isabsolute(const char *filename) -{ +isc_file_isabsolute(const char *filename) { REQUIRE(filename != NULL); /* * Look for c:\path\... style, c:/path/... or \\computer\shar\path... @@ -602,15 +576,13 @@ isc_file_isabsolute(const char *filename) } bool -isc_file_iscurrentdir(const char *filename) -{ +isc_file_iscurrentdir(const char *filename) { REQUIRE(filename != NULL); return (filename[0] == '.' && filename[1] == '\0'); } bool -isc_file_ischdiridempotent(const char *filename) -{ +isc_file_ischdiridempotent(const char *filename) { REQUIRE(filename != NULL); if (isc_file_isabsolute(filename)) { @@ -629,8 +601,7 @@ isc_file_ischdiridempotent(const char *filename) } const char * -isc_file_basename(const char *filename) -{ +isc_file_basename(const char *filename) { char *s; REQUIRE(filename != NULL); @@ -643,11 +614,10 @@ isc_file_basename(const char *filename) } isc_result_t -isc_file_progname(const char *filename, char *progname, size_t namelen) -{ +isc_file_progname(const char *filename, char *progname, size_t namelen) { const char *s; const char *p; - size_t len; + size_t len; REQUIRE(filename != NULL); REQUIRE(progname != NULL); @@ -687,8 +657,7 @@ isc_file_progname(const char *filename, char *progname, size_t namelen) } isc_result_t -isc_file_absolutepath(const char *filename, char *path, size_t pathlen) -{ +isc_file_absolutepath(const char *filename, char *path, size_t pathlen) { char *ptrname; DWORD retval; @@ -709,8 +678,7 @@ isc_file_absolutepath(const char *filename, char *path, size_t pathlen) } isc_result_t -isc_file_truncate(const char *filename, isc_offset_t size) -{ +isc_file_truncate(const char *filename, isc_offset_t size) { int fh; REQUIRE(filename != NULL && size >= 0); @@ -729,13 +697,12 @@ isc_file_truncate(const char *filename, isc_offset_t size) } isc_result_t -isc_file_safecreate(const char *filename, FILE **fp) -{ +isc_file_safecreate(const char *filename, FILE **fp) { isc_result_t result; - int flags; - struct stat sb; - FILE * f; - int fd; + int flags; + struct stat sb; + FILE *f; + int fd; REQUIRE(filename != NULL); REQUIRE(fp != NULL && *fp == NULL); @@ -770,17 +737,17 @@ isc_file_safecreate(const char *filename, FILE **fp) isc_result_t isc_file_splitpath(isc_mem_t *mctx, const char *path, char **dirname, - char const **basename) -{ - char * dir; + char const **basename) { + char *dir; const char *file, *slash; - char * backslash; + char *backslash; slash = strrchr(path, '/'); backslash = strrchr(path, '\\'); if ((slash != NULL && backslash != NULL && backslash > slash) || - (slash == NULL && backslash != NULL)) { + (slash == NULL && backslash != NULL)) + { slash = backslash; } @@ -812,11 +779,11 @@ isc_file_splitpath(isc_mem_t *mctx, const char *path, char **dirname, } void * -isc_file_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) -{ - void * buf; +isc_file_mmap(void *addr, size_t len, int prot, int flags, int fd, + off_t offset) { + void *buf; ssize_t ret; - off_t end; + off_t end; UNUSED(addr); UNUSED(prot); @@ -843,8 +810,7 @@ isc_file_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) } int -isc_file_munmap(void *addr, size_t len) -{ +isc_file_munmap(void *addr, size_t len) { UNUSED(len); free(addr); return (0); @@ -854,10 +820,9 @@ isc_file_munmap(void *addr, size_t len) static isc_result_t digest2hex(unsigned char *digest, unsigned int digestlen, char *hash, - size_t hashlen) -{ + size_t hashlen) { unsigned int i; - int ret; + int ret; for (i = 0; i < digestlen; i++) { size_t left = hashlen - i * 2; ret = snprintf(hash + i * 2, left, "%02x", digest[i]); @@ -870,14 +835,13 @@ digest2hex(unsigned char *digest, unsigned int digestlen, char *hash, isc_result_t isc_file_sanitize(const char *dir, const char *base, const char *ext, - char *path, size_t length) -{ - char buf[PATH_MAX]; + char *path, size_t length) { + char buf[PATH_MAX]; unsigned char digest[ISC_MAX_MD_SIZE]; - unsigned int digestlen; - char hash[ISC_MAX_MD_SIZE * 2 + 1]; - size_t l = 0; - isc_result_t err; + unsigned int digestlen; + char hash[ISC_MAX_MD_SIZE * 2 + 1]; + size_t l = 0; + isc_result_t err; REQUIRE(base != NULL); REQUIRE(path != NULL); @@ -954,12 +918,11 @@ isc_file_sanitize(const char *dir, const char *base, const char *ext, * Based on http://blog.aaronballman.com/2011/08/how-to-check-access-rights/ */ bool -isc_file_isdirwritable(const char *path) -{ - DWORD length = 0; - HANDLE hToken = NULL; +isc_file_isdirwritable(const char *path) { + DWORD length = 0; + HANDLE hToken = NULL; PSECURITY_DESCRIPTOR security = NULL; - bool answer = false; + bool answer = false; if (isc_file_isdirectory(path) != ISC_R_SUCCESS) { return (answer); @@ -972,7 +935,8 @@ isc_file_isdirwritable(const char *path) OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, - NULL, 0, &length)) { + NULL, 0, &length)) + { return (answer); } @@ -992,24 +956,26 @@ isc_file_isdirwritable(const char *path) OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, - security, length, &length)) { + security, length, &length)) + { return (answer); } if (OpenProcessToken(GetCurrentProcess(), TOKEN_IMPERSONATE | TOKEN_QUERY | TOKEN_DUPLICATE | STANDARD_RIGHTS_READ, - &hToken)) { + &hToken)) + { HANDLE hImpersonatedToken = NULL; if (DuplicateToken(hToken, SecurityImpersonation, &hImpersonatedToken)) { GENERIC_MAPPING mapping; - PRIVILEGE_SET privileges = { 0 }; - DWORD grantedAccess = 0; - DWORD privilegesLength = sizeof(privileges); - BOOL result = FALSE; - DWORD genericAccessRights = GENERIC_WRITE; + PRIVILEGE_SET privileges = { 0 }; + DWORD grantedAccess = 0; + DWORD privilegesLength = sizeof(privileges); + BOOL result = FALSE; + DWORD genericAccessRights = GENERIC_WRITE; mapping.GenericRead = FILE_GENERIC_READ; mapping.GenericWrite = FILE_GENERIC_WRITE; @@ -1020,7 +986,8 @@ isc_file_isdirwritable(const char *path) if (AccessCheck(security, hImpersonatedToken, genericAccessRights, &mapping, &privileges, &privilegesLength, - &grantedAccess, &result)) { + &grantedAccess, &result)) + { answer = result; } CloseHandle(hImpersonatedToken); diff --git a/lib/isc/win32/fsaccess.c b/lib/isc/win32/fsaccess.c index f7d16e2491..3342f7c5e7 100644 --- a/lib/isc/win32/fsaccess.c +++ b/lib/isc/win32/fsaccess.c @@ -39,7 +39,7 @@ #include "../fsaccess.c" /* Store the user account name locally */ -static char username[255] = "\0"; +static char username[255] = "\0"; static DWORD namelen = 0; /* @@ -48,14 +48,13 @@ static DWORD namelen = 0; */ BOOL -is_ntfs(const char *file) -{ - char drive[255]; - char FSType[20]; - char tmpbuf[256]; +is_ntfs(const char *file) { + char drive[255]; + char FSType[20]; + char tmpbuf[256]; char *machinename; char *sharename; - char filename[1024]; + char filename[1024]; char *last; REQUIRE(filename != NULL); @@ -70,7 +69,8 @@ is_ntfs(const char *file) * the UNC style file specs */ if (isalpha(filename[0]) && filename[1] == ':' && - (filename[2] == '\\' || filename[2] == '/')) { + (filename[2] == '\\' || filename[2] == '/')) + { /* Copy 'c:\' or 'c:/' and NUL terminate. */ strlcpy(drive, filename, ISC_MIN(3 + 1, sizeof(drive))); } else if ((filename[0] == '\\') && (filename[1] == '\\')) { @@ -102,9 +102,8 @@ is_ntfs(const char *file) * cleared. */ isc_result_t -FAT_fsaccess_set(const char *path, isc_fsaccess_t access) -{ - int mode; +FAT_fsaccess_set(const char *path, isc_fsaccess_t access) { + int mode; isc_fsaccess_t bits; /* @@ -144,25 +143,24 @@ FAT_fsaccess_set(const char *path, isc_fsaccess_t access) isc_result_t NTFS_Access_Control(const char *filename, const char *user, int access, - bool isdir) -{ + bool isdir) { SECURITY_DESCRIPTOR sd; - BYTE aclBuffer[1024]; - PACL pacl = (PACL)&aclBuffer; - BYTE sidBuffer[100]; - PSID psid = (PSID)&sidBuffer; - DWORD sidBufferSize = sizeof(sidBuffer); - BYTE adminSidBuffer[100]; - PSID padminsid = (PSID)&adminSidBuffer; - DWORD adminSidBufferSize = sizeof(adminSidBuffer); - BYTE otherSidBuffer[100]; - PSID pothersid = (PSID)&otherSidBuffer; - DWORD otherSidBufferSize = sizeof(otherSidBuffer); - char domainBuffer[100]; - DWORD domainBufferSize = sizeof(domainBuffer); - SID_NAME_USE snu; - DWORD NTFSbits; - int caccess; + BYTE aclBuffer[1024]; + PACL pacl = (PACL)&aclBuffer; + BYTE sidBuffer[100]; + PSID psid = (PSID)&sidBuffer; + DWORD sidBufferSize = sizeof(sidBuffer); + BYTE adminSidBuffer[100]; + PSID padminsid = (PSID)&adminSidBuffer; + DWORD adminSidBufferSize = sizeof(adminSidBuffer); + BYTE otherSidBuffer[100]; + PSID pothersid = (PSID)&otherSidBuffer; + DWORD otherSidBufferSize = sizeof(otherSidBuffer); + char domainBuffer[100]; + DWORD domainBufferSize = sizeof(domainBuffer); + SID_NAME_USE snu; + DWORD NTFSbits; + int caccess; /* Initialize an ACL */ if (!InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION)) { @@ -172,19 +170,22 @@ NTFS_Access_Control(const char *filename, const char *user, int access, return (ISC_R_NOPERM); } if (!LookupAccountName(0, user, psid, &sidBufferSize, domainBuffer, - &domainBufferSize, &snu)) { + &domainBufferSize, &snu)) + { return (ISC_R_NOPERM); } domainBufferSize = sizeof(domainBuffer); if (!LookupAccountName(0, "Administrators", padminsid, &adminSidBufferSize, domainBuffer, - &domainBufferSize, &snu)) { + &domainBufferSize, &snu)) + { (void)GetLastError(); return (ISC_R_NOPERM); } domainBufferSize = sizeof(domainBuffer); if (!LookupAccountName(0, "Everyone", pothersid, &otherSidBufferSize, - domainBuffer, &domainBufferSize, &snu)) { + domainBuffer, &domainBufferSize, &snu)) + { (void)GetLastError(); return (ISC_R_NOPERM); } @@ -293,8 +294,7 @@ NTFS_Access_Control(const char *filename, const char *user, int access, } isc_result_t -NTFS_fsaccess_set(const char *path, isc_fsaccess_t access, bool isdir) -{ +NTFS_fsaccess_set(const char *path, isc_fsaccess_t access, bool isdir) { /* * For NTFS we first need to get the name of the account under * which BIND is running @@ -309,10 +309,9 @@ NTFS_fsaccess_set(const char *path, isc_fsaccess_t access, bool isdir) } isc_result_t -isc_fsaccess_set(const char *path, isc_fsaccess_t access) -{ - struct stat statb; - bool is_dir = false; +isc_fsaccess_set(const char *path, isc_fsaccess_t access) { + struct stat statb; + bool is_dir = false; isc_result_t result; if (stat(path, &statb) != 0) { @@ -342,18 +341,17 @@ isc_fsaccess_set(const char *path, isc_fsaccess_t access) } isc_result_t -isc_fsaccess_changeowner(const char *filename, const char *user) -{ +isc_fsaccess_changeowner(const char *filename, const char *user) { SECURITY_DESCRIPTOR psd; - BYTE sidBuffer[500]; - BYTE groupBuffer[500]; - PSID psid = (PSID)&sidBuffer; - DWORD sidBufferSize = sizeof(sidBuffer); - char domainBuffer[100]; - DWORD domainBufferSize = sizeof(domainBuffer); - SID_NAME_USE snu; - PSID pSidGroup = (PSID)&groupBuffer; - DWORD groupBufferSize = sizeof(groupBuffer); + BYTE sidBuffer[500]; + BYTE groupBuffer[500]; + PSID psid = (PSID)&sidBuffer; + DWORD sidBufferSize = sizeof(sidBuffer); + char domainBuffer[100]; + DWORD domainBufferSize = sizeof(domainBuffer); + SID_NAME_USE snu; + PSID pSidGroup = (PSID)&groupBuffer; + DWORD groupBufferSize = sizeof(groupBuffer); /* * Determine if this is a FAT or NTFS disk and @@ -370,14 +368,16 @@ isc_fsaccess_changeowner(const char *filename, const char *user) } if (!LookupAccountName(0, user, psid, &sidBufferSize, domainBuffer, - &domainBufferSize, &snu)) { + &domainBufferSize, &snu)) + { return (ISC_R_NOPERM); } /* Make sure administrators can get to it */ domainBufferSize = sizeof(domainBuffer); if (!LookupAccountName(0, "Administrators", pSidGroup, &groupBufferSize, - domainBuffer, &domainBufferSize, &snu)) { + domainBuffer, &domainBufferSize, &snu)) + { return (ISC_R_NOPERM); } @@ -392,7 +392,8 @@ isc_fsaccess_changeowner(const char *filename, const char *user) if (!SetFileSecurity(filename, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION, - &psd)) { + &psd)) + { return (ISC_R_NOPERM); } diff --git a/lib/isc/win32/include/isc/bind_registry.h b/lib/isc/win32/include/isc/bind_registry.h index 2c5883e2cd..8a48d39e90 100644 --- a/lib/isc/win32/include/isc/bind_registry.h +++ b/lib/isc/win32/include/isc/bind_registry.h @@ -17,8 +17,8 @@ * during startup and installation */ -#define BIND_SUBKEY "Software\\ISC\\BIND" -#define BIND_SESSION "CurrentSession" +#define BIND_SUBKEY "Software\\ISC\\BIND" +#define BIND_SESSION "CurrentSession" #define BIND_SESSION_SUBKEY "Software\\ISC\\BIND\\CurrentSession" #define BIND_UNINSTALL_SUBKEY \ "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\ISC BIND" @@ -33,8 +33,8 @@ #define BIND_CONFIGFILE 0 #define BIND_DEBUGLEVEL 1 -#define BIND_QUERYLOG 2 +#define BIND_QUERYLOG 2 #define BIND_FOREGROUND 3 -#define BIND_PORT 4 +#define BIND_PORT 4 #endif /* ISC_BINDREGISTRY_H */ diff --git a/lib/isc/win32/include/isc/mutex.h b/lib/isc/win32/include/isc/mutex.h index f84a66f1cb..eb2eb7d752 100644 --- a/lib/isc/win32/include/isc/mutex.h +++ b/lib/isc/win32/include/isc/mutex.h @@ -28,8 +28,8 @@ WINBASEAPI BOOL WINAPI TryEnterCriticalSection(LPCRITICAL_SECTION lpCriticalSection); #endif /* _WIN32_WINNT < 0x0400 */ -#define isc_mutex_init(mp) InitializeCriticalSection((mp)) -#define isc_mutex_lock(mp) (EnterCriticalSection((mp)), ISC_R_SUCCESS) +#define isc_mutex_init(mp) InitializeCriticalSection((mp)) +#define isc_mutex_lock(mp) (EnterCriticalSection((mp)), ISC_R_SUCCESS) #define isc_mutex_unlock(mp) (LeaveCriticalSection((mp)), ISC_R_SUCCESS) #define isc_mutex_trylock(mp) \ (TryEnterCriticalSection((mp)) ? ISC_R_SUCCESS : ISC_R_LOCKBUSY) diff --git a/lib/isc/win32/include/isc/net.h b/lib/isc/win32/include/isc/net.h index 45e4c0bb6c..c6b56acd6a 100644 --- a/lib/isc/win32/include/isc/net.h +++ b/lib/isc/win32/include/isc/net.h @@ -100,7 +100,7 @@ #endif /* ifndef INADDR_LOOPBACK */ #if _MSC_VER < 1300 -#define in6addr_any isc_in6addr_any +#define in6addr_any isc_in6addr_any #define in6addr_loopback isc_in6addr_loopback #endif /* if _MSC_VER < 1300 */ @@ -327,11 +327,11 @@ isc_net_probeunix(void); #define ISC_NET_DSCPRECVV4 0x01 /* Can receive sent DSCP value IPv4 */ #define ISC_NET_DSCPRECVV6 0x02 /* Can receive sent DSCP value IPv6 */ -#define ISC_NET_DSCPSETV4 0x04 /* Can set DSCP on socket IPv4 */ -#define ISC_NET_DSCPSETV6 0x08 /* Can set DSCP on socket IPv6 */ -#define ISC_NET_DSCPPKTV4 0x10 /* Can set DSCP on per packet IPv4 */ -#define ISC_NET_DSCPPKTV6 0x20 /* Can set DSCP on per packet IPv6 */ -#define ISC_NET_DSCPALL 0x3f /* All valid flags */ +#define ISC_NET_DSCPSETV4 0x04 /* Can set DSCP on socket IPv4 */ +#define ISC_NET_DSCPSETV6 0x08 /* Can set DSCP on socket IPv6 */ +#define ISC_NET_DSCPPKTV4 0x10 /* Can set DSCP on per packet IPv4 */ +#define ISC_NET_DSCPPKTV6 0x20 /* Can set DSCP on per packet IPv6 */ +#define ISC_NET_DSCPALL 0x3f /* All valid flags */ unsigned int isc_net_probedscp(void); diff --git a/lib/isc/win32/include/isc/ntpaths.h b/lib/isc/win32/include/isc/ntpaths.h index a64281910c..26208f796f 100644 --- a/lib/isc/win32/include/isc/ntpaths.h +++ b/lib/isc/win32/include/isc/ntpaths.h @@ -39,17 +39,17 @@ enum NtPaths { /* * Define macros to get the path of the config files */ -#define NAMED_CONFFILE isc_ntpaths_get(NAMED_CONF_PATH) -#define RNDC_CONFFILE isc_ntpaths_get(RNDC_CONF_PATH) -#define RNDC_KEYFILE isc_ntpaths_get(RNDC_KEY_PATH) +#define NAMED_CONFFILE isc_ntpaths_get(NAMED_CONF_PATH) +#define RNDC_CONFFILE isc_ntpaths_get(RNDC_CONF_PATH) +#define RNDC_KEYFILE isc_ntpaths_get(RNDC_KEY_PATH) #define SESSION_KEYFILE isc_ntpaths_get(SESSION_KEY_PATH) -#define RESOLV_CONF isc_ntpaths_get(RESOLV_CONF_PATH) +#define RESOLV_CONF isc_ntpaths_get(RESOLV_CONF_PATH) /* * Information about where the files are on disk */ #define NAMED_LOCALSTATEDIR "/dns/bin" -#define NAMED_SYSCONFDIR "/dns/etc" +#define NAMED_SYSCONFDIR "/dns/etc" ISC_LANG_BEGINDECLS diff --git a/lib/isc/win32/include/isc/once.h b/lib/isc/win32/include/isc/once.h index e955752440..78318a1c22 100644 --- a/lib/isc/win32/include/isc/once.h +++ b/lib/isc/win32/include/isc/once.h @@ -23,7 +23,7 @@ typedef struct { } isc_once_t; #define ISC_ONCE_INIT_NEEDED 0 -#define ISC_ONCE_INIT_DONE 1 +#define ISC_ONCE_INIT_DONE 1 #define ISC_ONCE_INIT \ { \ diff --git a/lib/isc/win32/include/isc/stat.h b/lib/isc/win32/include/isc/stat.h index dec3a4cca6..b18d45875f 100644 --- a/lib/isc/win32/include/isc/stat.h +++ b/lib/isc/win32/include/isc/stat.h @@ -24,14 +24,14 @@ typedef unsigned short mode_t; * We'll just map them all to the NT equivalent */ -#define S_IREAD _S_IREAD /* read permission, owner */ +#define S_IREAD _S_IREAD /* read permission, owner */ #define S_IWRITE _S_IWRITE /* write permission, owner */ -#define S_IRUSR _S_IREAD /* Owner read permission */ -#define S_IWUSR _S_IWRITE /* Owner write permission */ -#define S_IRGRP _S_IREAD /* Group read permission */ -#define S_IWGRP _S_IWRITE /* Group write permission */ -#define S_IROTH _S_IREAD /* Other read permission */ -#define S_IWOTH _S_IWRITE /* Other write permission */ +#define S_IRUSR _S_IREAD /* Owner read permission */ +#define S_IWUSR _S_IWRITE /* Owner write permission */ +#define S_IRGRP _S_IREAD /* Group read permission */ +#define S_IWGRP _S_IWRITE /* Group write permission */ +#define S_IROTH _S_IREAD /* Other read permission */ +#define S_IWOTH _S_IWRITE /* Other write permission */ #ifndef S_IFMT #define S_IFMT _S_IFMT diff --git a/lib/isc/win32/include/isc/stdatomic.h b/lib/isc/win32/include/isc/stdatomic.h index 0ab679b142..15cf9b6f0b 100644 --- a/lib/isc/win32/include/isc/stdatomic.h +++ b/lib/isc/win32/include/isc/stdatomic.h @@ -18,7 +18,7 @@ #include #include -#define InterlockedExchangeAdd8 _InterlockedExchangeAdd8 +#define InterlockedExchangeAdd8 _InterlockedExchangeAdd8 #define InterlockedCompareExchange8 _InterlockedCompareExchange8 #pragma intrinsic(_InterlockedCompareExchange8, _InterlockedExchangeAdd8) @@ -102,8 +102,7 @@ typedef uintptr_t volatile atomic_uintptr_t; #endif /* ifdef _WIN64 */ static inline void -atomic_store_abort() -{ +atomic_store_abort() { INSIST(0); ISC_UNREACHABLE(); } @@ -157,8 +156,7 @@ atomic_store_abort() #endif /* ifdef _WIN64 */ static inline int8_t -atomic_load_abort() -{ +atomic_load_abort() { INSIST(0); ISC_UNREACHABLE(); } @@ -219,8 +217,7 @@ atomic_load_abort() #endif /* ifdef _WIN64 */ static inline int8_t -atomic_add_abort() -{ +atomic_add_abort() { INSIST(0); ISC_UNREACHABLE(); } @@ -281,8 +278,7 @@ atomic_add_abort() #endif /* ifdef _WIN64 */ static inline int8_t -atomic_and_abort() -{ +atomic_and_abort() { INSIST(0); ISC_UNREACHABLE(); } @@ -337,8 +333,7 @@ atomic_and_abort() #endif /* ifdef _WIN64 */ static inline int8_t -atomic_or_abort() -{ +atomic_or_abort() { INSIST(0); ISC_UNREACHABLE(); } @@ -359,8 +354,7 @@ atomic_or_abort() 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) -{ + memory_order succ, memory_order fail) { bool __r; int8_t __v; @@ -379,8 +373,8 @@ atomic_compare_exchange_strong_explicit8(atomic_int_fast8_t *obj, static inline bool atomic_compare_exchange_strong_explicit32(atomic_int_fast32_t *obj, int32_t *expected, int32_t desired, - memory_order succ, memory_order fail) -{ + memory_order succ, + memory_order fail) { bool __r; int32_t __v; @@ -415,8 +409,8 @@ atomic_compare_exchange_strong_explicit32(atomic_int_fast32_t *obj, static inline bool atomic_compare_exchange_strong_explicit64(atomic_int_fast64_t *obj, int64_t *expected, int64_t desired, - memory_order succ, memory_order fail) -{ + memory_order succ, + memory_order fail) { bool __r; int64_t __v; @@ -454,8 +448,7 @@ atomic_compare_exchange_strong_explicit64(atomic_int_fast64_t *obj, } static inline bool -atomic_compare_exchange_abort() -{ +atomic_compare_exchange_abort() { INSIST(0); ISC_UNREACHABLE(); } @@ -490,8 +483,7 @@ atomic_compare_exchange_abort() memory_order_seq_cst) static inline bool -atomic_exchange_abort() -{ +atomic_exchange_abort() { INSIST(0); ISC_UNREACHABLE(); } diff --git a/lib/isc/win32/include/isc/thread.h b/lib/isc/win32/include/isc/thread.h index 7f1998f962..9ce612217a 100644 --- a/lib/isc/win32/include/isc/thread.h +++ b/lib/isc/win32/include/isc/thread.h @@ -23,48 +23,41 @@ /* check handle for NULL and INVALID_HANDLE */ inline BOOL -IsValidHandle(HANDLE hHandle) -{ +IsValidHandle(HANDLE hHandle) { return ((hHandle != NULL) && (hHandle != INVALID_HANDLE_VALUE)); } /* validate wait return codes... */ inline BOOL -WaitSucceeded(DWORD dwWaitResult, DWORD dwHandleCount) -{ +WaitSucceeded(DWORD dwWaitResult, DWORD dwHandleCount) { return ((dwWaitResult >= WAIT_OBJECT_0) && (dwWaitResult < WAIT_OBJECT_0 + dwHandleCount)); } inline BOOL -WaitAbandoned(DWORD dwWaitResult, DWORD dwHandleCount) -{ +WaitAbandoned(DWORD dwWaitResult, DWORD dwHandleCount) { return ((dwWaitResult >= WAIT_ABANDONED_0) && (dwWaitResult < WAIT_ABANDONED_0 + dwHandleCount)); } inline BOOL -WaitTimeout(DWORD dwWaitResult) -{ +WaitTimeout(DWORD dwWaitResult) { return (dwWaitResult == WAIT_TIMEOUT); } inline BOOL -WaitFailed(DWORD dwWaitResult) -{ +WaitFailed(DWORD dwWaitResult) { return (dwWaitResult == WAIT_FAILED); } /* compute object indices for waits... */ inline DWORD -WaitSucceededIndex(DWORD dwWaitResult) -{ +WaitSucceededIndex(DWORD dwWaitResult) { return (dwWaitResult - WAIT_OBJECT_0); } inline DWORD -WaitAbandonedIndex(DWORD dwWaitResult) -{ +WaitAbandonedIndex(DWORD dwWaitResult) { return (dwWaitResult - WAIT_ABANDONED_0); } diff --git a/lib/isc/win32/interfaceiter.c b/lib/isc/win32/interfaceiter.c index a78234509f..73e82c34e8 100644 --- a/lib/isc/win32/interfaceiter.c +++ b/lib/isc/win32/interfaceiter.c @@ -31,8 +31,7 @@ #include -void -InitSockets(void); +void InitSockets(void); /* Common utility functions */ @@ -45,26 +44,26 @@ InitSockets(void); * not have a valid address family). */ -#define IFITER_MAGIC 0x49464954U /* IFIT. */ +#define IFITER_MAGIC 0x49464954U /* IFIT. */ #define VALID_IFITER(t) ((t) != NULL && (t)->magic == IFITER_MAGIC) struct isc_interfaceiter { - unsigned int magic; /* Magic number. */ - isc_mem_t * mctx; - SOCKET socket; - INTERFACE_INFO IFData; /* Current Interface Info. */ - int numIF; /* Current Interface count. */ - int v4IF; /* Number of IPv4 Interfaces */ - INTERFACE_INFO * buf4; /* Buffer for WSAIoctl data. */ - unsigned int buf4size; /* Bytes allocated. */ - INTERFACE_INFO * pos4; /* Current offset in IF List */ - SOCKET_ADDRESS_LIST *buf6; /* Buffer for WSAIoctl data. */ - unsigned int buf6size; /* Bytes allocated. */ - unsigned int pos6; /* Which entry to process. */ - bool v6loop; /* See IPv6 loop address. */ - bool pos6zero; /* Done pos6 == 0. */ - isc_interface_t current; /* Current interface data. */ - isc_result_t result; /* Last result code. */ + unsigned int magic; /* Magic number. */ + isc_mem_t *mctx; + SOCKET socket; + INTERFACE_INFO IFData; /* Current Interface Info. */ + int numIF; /* Current Interface count. */ + int v4IF; /* Number of IPv4 Interfaces */ + INTERFACE_INFO *buf4; /* Buffer for WSAIoctl data. */ + unsigned int buf4size; /* Bytes allocated. */ + INTERFACE_INFO *pos4; /* Current offset in IF List */ + SOCKET_ADDRESS_LIST *buf6; /* Buffer for WSAIoctl data. */ + unsigned int buf6size; /* Bytes allocated. */ + unsigned int pos6; /* Which entry to process. */ + bool v6loop; /* See IPv6 loop address. */ + bool pos6zero; /* Done pos6 == 0. */ + isc_interface_t current; /* Current interface data. */ + isc_result_t result; /* Last result code. */ }; /* @@ -72,13 +71,12 @@ struct isc_interfaceiter { * We assume no sane system will have more than than 1K of IP addresses on * all of its adapters. */ -#define IFCONF_SIZE_INITIAL 16 +#define IFCONF_SIZE_INITIAL 16 #define IFCONF_SIZE_INCREMENT 64 -#define IFCONF_SIZE_MAX 1040 +#define IFCONF_SIZE_MAX 1040 static void -get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src) -{ +get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src) { dst->family = family; switch (family) { case AF_INET: @@ -98,13 +96,12 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src) } isc_result_t -isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) -{ - char strbuf[ISC_STRERRORSIZE]; +isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) { + char strbuf[ISC_STRERRORSIZE]; isc_interfaceiter_t *iter; - isc_result_t result; - int error; - unsigned long bytesReturned = 0; + isc_result_t result; + int error; + unsigned long bytesReturned = 0; REQUIRE(mctx != NULL); REQUIRE(iterp != NULL); @@ -155,7 +152,8 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) if (WSAIoctl(iter->socket, SIO_GET_INTERFACE_LIST, 0, 0, iter->buf4, iter->buf4size, &bytesReturned, 0, - 0) == SOCKET_ERROR) { + 0) == SOCKET_ERROR) + { error = WSAGetLastError(); if (error != WSAEFAULT && error != WSAENOBUFS) { errno = error; @@ -182,8 +180,8 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) break; } } - if (iter->buf4size >= - IFCONF_SIZE_MAX * sizeof(INTERFACE_INFO)) { + if (iter->buf4size >= IFCONF_SIZE_MAX * sizeof(INTERFACE_INFO)) + { UNEXPECTED_ERROR(__FILE__, __LINE__, "get interface configuration: " "maximum buffer size exceeded"); @@ -192,8 +190,8 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) } isc_mem_put(mctx, iter->buf4, iter->buf4size); - iter->buf4size += - IFCONF_SIZE_INCREMENT * sizeof(INTERFACE_INFO); + iter->buf4size += IFCONF_SIZE_INCREMENT * + sizeof(INTERFACE_INFO); } /* @@ -235,7 +233,8 @@ inet6_only: if (WSAIoctl(iter->socket, SIO_ADDRESS_LIST_QUERY, 0, 0, iter->buf6, iter->buf6size, &bytesReturned, 0, - 0) == SOCKET_ERROR) { + 0) == SOCKET_ERROR) + { error = WSAGetLastError(); if (error != WSAEFAULT && error != WSAENOBUFS) { errno = error; @@ -253,8 +252,8 @@ inet6_only: break; } - if (iter->buf6size >= - IFCONF_SIZE_MAX * sizeof(SOCKET_ADDRESS)) { + if (iter->buf6size >= IFCONF_SIZE_MAX * sizeof(SOCKET_ADDRESS)) + { UNEXPECTED_ERROR(__FILE__, __LINE__, "get interface configuration: " "maximum buffer size exceeded"); @@ -263,8 +262,8 @@ inet6_only: } isc_mem_put(mctx, iter->buf6, iter->buf6size); - iter->buf6size += - IFCONF_SIZE_INCREMENT * sizeof(SOCKET_ADDRESS); + iter->buf6size += IFCONF_SIZE_INCREMENT * + sizeof(SOCKET_ADDRESS); } closesocket(iter->socket); @@ -299,9 +298,8 @@ socket_failure: */ static isc_result_t -internal_current(isc_interfaceiter_t *iter) -{ - BOOL ifNamed = FALSE; +internal_current(isc_interfaceiter_t *iter) { + BOOL ifNamed = FALSE; unsigned long flags; REQUIRE(VALID_IFITER(iter)); @@ -361,10 +359,9 @@ internal_current(isc_interfaceiter_t *iter) } static isc_result_t -internal_current6(isc_interfaceiter_t *iter) -{ +internal_current6(isc_interfaceiter_t *iter) { SOCKET fd; - int i; + int i; REQUIRE(VALID_IFITER(iter)); REQUIRE(iter->buf6 != NULL); @@ -440,8 +437,7 @@ internal_current6(isc_interfaceiter_t *iter) * interfaces, otherwise ISC_R_SUCCESS. */ static isc_result_t -internal_next(isc_interfaceiter_t *iter) -{ +internal_next(isc_interfaceiter_t *iter) { if (iter->numIF >= iter->v4IF) { return (ISC_R_NOMORE); } @@ -470,8 +466,7 @@ internal_next(isc_interfaceiter_t *iter) } static isc_result_t -internal_next6(isc_interfaceiter_t *iter) -{ +internal_next6(isc_interfaceiter_t *iter) { if (iter->pos6 == 0U && iter->v6loop) { return (ISC_R_NOMORE); } @@ -482,16 +477,14 @@ internal_next6(isc_interfaceiter_t *iter) } isc_result_t -isc_interfaceiter_current(isc_interfaceiter_t *iter, isc_interface_t *ifdata) -{ +isc_interfaceiter_current(isc_interfaceiter_t *iter, isc_interface_t *ifdata) { REQUIRE(iter->result == ISC_R_SUCCESS); memmove(ifdata, &iter->current, sizeof(*ifdata)); return (ISC_R_SUCCESS); } isc_result_t -isc_interfaceiter_first(isc_interfaceiter_t *iter) -{ +isc_interfaceiter_first(isc_interfaceiter_t *iter) { REQUIRE(VALID_IFITER(iter)); if (iter->buf6 != NULL) { @@ -504,8 +497,7 @@ isc_interfaceiter_first(isc_interfaceiter_t *iter) } isc_result_t -isc_interfaceiter_next(isc_interfaceiter_t *iter) -{ +isc_interfaceiter_next(isc_interfaceiter_t *iter) { isc_result_t result; REQUIRE(VALID_IFITER(iter)); @@ -536,8 +528,7 @@ isc_interfaceiter_next(isc_interfaceiter_t *iter) } void -isc_interfaceiter_destroy(isc_interfaceiter_t **iterp) -{ +isc_interfaceiter_destroy(isc_interfaceiter_t **iterp) { isc_interfaceiter_t *iter; REQUIRE(iterp != NULL); iter = *iterp; diff --git a/lib/isc/win32/meminfo.c b/lib/isc/win32/meminfo.c index bd650d87a2..12e897dc9e 100644 --- a/lib/isc/win32/meminfo.c +++ b/lib/isc/win32/meminfo.c @@ -15,8 +15,7 @@ #include uint64_t -isc_meminfo_totalphys(void) -{ +isc_meminfo_totalphys(void) { MEMORYSTATUSEX statex; statex.dwLength = sizeof(statex); diff --git a/lib/isc/win32/net.c b/lib/isc/win32/net.c index 8e500f1806..1c0d5eee90 100644 --- a/lib/isc/win32/net.c +++ b/lib/isc/win32/net.c @@ -36,23 +36,21 @@ #define ISC_NET_PORTRANGEHIGH 65535 #endif /* ISC_NET_PORTRANGEHIGH */ -static isc_once_t once = ISC_ONCE_INIT; -static isc_once_t once_ipv6only = ISC_ONCE_INIT; -static isc_once_t once_ipv6pktinfo = ISC_ONCE_INIT; +static isc_once_t once = ISC_ONCE_INIT; +static isc_once_t once_ipv6only = ISC_ONCE_INIT; +static isc_once_t once_ipv6pktinfo = ISC_ONCE_INIT; static isc_result_t ipv4_result = ISC_R_NOTFOUND; 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) -{ +try_proto(int domain) { SOCKET s; - char strbuf[ISC_STRERRORSIZE]; - int errval; + char strbuf[ISC_STRERRORSIZE]; + int errval; s = socket(domain, SOCK_STREAM, IPPROTO_TCP); if (s == INVALID_SOCKET) { @@ -76,46 +74,40 @@ try_proto(int domain) } static void -initialize_action(void) -{ +initialize_action(void) { InitSockets(); ipv4_result = try_proto(PF_INET); ipv6_result = try_proto(PF_INET6); } static void -initialize(void) -{ +initialize(void) { RUNTIME_CHECK(isc_once_do(&once, initialize_action) == ISC_R_SUCCESS); } isc_result_t -isc_net_probeipv4(void) -{ +isc_net_probeipv4(void) { initialize(); return (ipv4_result); } isc_result_t -isc_net_probeipv6(void) -{ +isc_net_probeipv6(void) { initialize(); return (ipv6_result); } isc_result_t -isc_net_probeunix(void) -{ +isc_net_probeunix(void) { return (ISC_R_NOTFOUND); } static void -try_ipv6only(void) -{ +try_ipv6only(void) { #ifdef IPV6_V6ONLY SOCKET s; - int on; - char strbuf[ISC_STRERRORSIZE]; + int on; + char strbuf[ISC_STRERRORSIZE]; #endif /* ifdef IPV6_V6ONLY */ isc_result_t result; @@ -174,8 +166,7 @@ close: } static void -initialize_ipv6only(void) -{ +initialize_ipv6only(void) { RUNTIME_CHECK(isc_once_do(&once_ipv6only, try_ipv6only) == ISC_R_SUCCESS); } @@ -187,13 +178,12 @@ initialize_ipv6only(void) * and compiler version dependent. */ static void -try_ipv6pktinfo(void) -{ - SOCKET s; - int on; - char strbuf[ISC_STRERRORSIZE]; +try_ipv6pktinfo(void) { + SOCKET s; + int on; + char strbuf[ISC_STRERRORSIZE]; isc_result_t result; - int optname; + int optname; result = isc_net_probeipv6(); if (result != ISC_R_SUCCESS) { @@ -231,23 +221,20 @@ close: } static void -initialize_ipv6pktinfo(void) -{ +initialize_ipv6pktinfo(void) { RUNTIME_CHECK(isc_once_do(&once_ipv6pktinfo, try_ipv6pktinfo) == ISC_R_SUCCESS); } #endif /* __notyet__ */ isc_result_t -isc_net_probe_ipv6only(void) -{ +isc_net_probe_ipv6only(void) { initialize_ipv6only(); return (ipv6only_result); } isc_result_t -isc_net_probe_ipv6pktinfo(void) -{ +isc_net_probe_ipv6pktinfo(void) { #ifdef __notyet__ initialize_ipv6pktinfo(); #endif /* __notyet__ */ @@ -255,8 +242,7 @@ isc_net_probe_ipv6pktinfo(void) } isc_result_t -isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high) -{ +isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high) { int result = ISC_R_FAILURE; REQUIRE(low != NULL && high != NULL); @@ -272,8 +258,7 @@ isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high) } void -isc_net_disableipv4(void) -{ +isc_net_disableipv4(void) { initialize(); if (ipv4_result == ISC_R_SUCCESS) { ipv4_result = ISC_R_DISABLED; @@ -281,8 +266,7 @@ isc_net_disableipv4(void) } void -isc_net_disableipv6(void) -{ +isc_net_disableipv6(void) { initialize(); if (ipv6_result == ISC_R_SUCCESS) { ipv6_result = ISC_R_DISABLED; @@ -290,8 +274,7 @@ isc_net_disableipv6(void) } void -isc_net_enableipv4(void) -{ +isc_net_enableipv4(void) { initialize(); if (ipv4_result == ISC_R_DISABLED) { ipv4_result = ISC_R_SUCCESS; @@ -299,8 +282,7 @@ isc_net_enableipv4(void) } void -isc_net_enableipv6(void) -{ +isc_net_enableipv6(void) { initialize(); if (ipv6_result == ISC_R_DISABLED) { ipv6_result = ISC_R_SUCCESS; @@ -308,7 +290,6 @@ isc_net_enableipv6(void) } unsigned int -isc_net_probedscp(void) -{ +isc_net_probedscp(void) { return (0); } diff --git a/lib/isc/win32/netdb.h b/lib/isc/win32/netdb.h index 28dea01210..48b4f444a4 100644 --- a/lib/isc/win32/netdb.h +++ b/lib/isc/win32/netdb.h @@ -52,12 +52,12 @@ struct addrinfo { #undef NO_ADDRESS #define NETDB_INTERNAL -1 /* see errno */ -#define NETDB_SUCCESS 0 /* no problem */ +#define NETDB_SUCCESS 0 /* no problem */ #define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found */ -#define TRY_AGAIN 2 /* Non-Authoritative Host not found, or SERVERFAIL */ -#define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */ -#define NO_DATA 4 /* Valid name, no data record of requested type */ -#define NO_ADDRESS NO_DATA /* no address, look for MX record */ +#define TRY_AGAIN 2 /* Non-Authoritative Host not found, or SERVERFAIL */ +#define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */ +#define NO_DATA 4 /* Valid name, no data record of requested type */ +#define NO_ADDRESS NO_DATA /* no address, look for MX record */ /* * Error return codes from getaddrinfo() @@ -78,20 +78,20 @@ struct addrinfo { #undef EAI_PROTOCOL #undef EAI_MAX -#define EAI_ADDRFAMILY 1 /* address family for hostname not supported */ -#define EAI_AGAIN 2 /* temporary failure in name resolution */ -#define EAI_BADFLAGS 3 /* invalid value for ai_flags */ -#define EAI_FAIL 4 /* non-recoverable failure in name resolution */ -#define EAI_FAMILY 5 /* ai_family not supported */ -#define EAI_MEMORY 6 /* memory allocation failure */ -#define EAI_NODATA 7 /* no address associated with hostname */ -#define EAI_NONAME 8 /* hostname nor servname provided, or not known */ -#define EAI_SERVICE 9 /* servname not supported for ai_socktype */ -#define EAI_SOCKTYPE 10 /* ai_socktype not supported */ -#define EAI_SYSTEM 11 /* system error returned in errno */ -#define EAI_BADHINTS 12 -#define EAI_PROTOCOL 13 -#define EAI_MAX 14 +#define EAI_ADDRFAMILY 1 /* address family for hostname not supported */ +#define EAI_AGAIN 2 /* temporary failure in name resolution */ +#define EAI_BADFLAGS 3 /* invalid value for ai_flags */ +#define EAI_FAIL 4 /* non-recoverable failure in name resolution */ +#define EAI_FAMILY 5 /* ai_family not supported */ +#define EAI_MEMORY 6 /* memory allocation failure */ +#define EAI_NODATA 7 /* no address associated with hostname */ +#define EAI_NONAME 8 /* hostname nor servname provided, or not known */ +#define EAI_SERVICE 9 /* servname not supported for ai_socktype */ +#define EAI_SOCKTYPE 10 /* ai_socktype not supported */ +#define EAI_SYSTEM 11 /* system error returned in errno */ +#define EAI_BADHINTS 12 +#define EAI_PROTOCOL 13 +#define EAI_MAX 14 /* * Flag values for getaddrinfo() @@ -100,8 +100,8 @@ struct addrinfo { #undef AI_CANONNAME #undef AI_NUMERICHOST -#define AI_PASSIVE 0x00000001 -#define AI_CANONNAME 0x00000002 +#define AI_PASSIVE 0x00000001 +#define AI_CANONNAME 0x00000002 #define AI_NUMERICHOST 0x00000004 /* @@ -112,10 +112,10 @@ struct addrinfo { #undef AI_ADDRCONFIG #undef AI_DEFAULT -#define AI_V4MAPPED 0x00000008 -#define AI_ALL 0x00000010 +#define AI_V4MAPPED 0x00000008 +#define AI_ALL 0x00000010 #define AI_ADDRCONFIG 0x00000020 -#define AI_DEFAULT (AI_V4MAPPED | AI_ADDRCONFIG) +#define AI_DEFAULT (AI_V4MAPPED | AI_ADDRCONFIG) /* * Constants for getnameinfo() @@ -136,11 +136,11 @@ struct addrinfo { #undef NI_DGRAM #undef NI_NUMERICSCOPE -#define NI_NOFQDN 0x00000001 -#define NI_NUMERICHOST 0x00000002 -#define NI_NAMEREQD 0x00000004 -#define NI_NUMERICSERV 0x00000008 -#define NI_DGRAM 0x00000010 +#define NI_NOFQDN 0x00000001 +#define NI_NUMERICHOST 0x00000002 +#define NI_NAMEREQD 0x00000004 +#define NI_NUMERICSERV 0x00000008 +#define NI_DGRAM 0x00000010 #define NI_NUMERICSCOPE 0x00000020 /*2553bis-00*/ /* @@ -172,9 +172,9 @@ struct rrsetinfo { /* * Return codes for getrrsetbyname() */ -#define ERRSET_SUCCESS 0 +#define ERRSET_SUCCESS 0 #define ERRSET_NOMEMORY 1 -#define ERRSET_FAIL 2 -#define ERRSET_INVAL 3 +#define ERRSET_FAIL 2 +#define ERRSET_INVAL 3 #endif /* NETDB_H */ diff --git a/lib/isc/win32/ntgroups.c b/lib/isc/win32/ntgroups.c index 5288668d8b..8a67c4d7fa 100644 --- a/lib/isc/win32/ntgroups.c +++ b/lib/isc/win32/ntgroups.c @@ -51,23 +51,22 @@ isc_result_t isc_ntsecurity_getaccountgroups(char *username, char **GroupList, - unsigned int maxgroups, - unsigned int *totalGroups) -{ - LPGROUP_USERS_INFO_0 pTmpBuf; + unsigned int maxgroups, + unsigned int *totalGroups) { + LPGROUP_USERS_INFO_0 pTmpBuf; LPLOCALGROUP_USERS_INFO_0 pTmpLBuf; - DWORD i; + DWORD i; LPLOCALGROUP_USERS_INFO_0 pBuf = NULL; - LPGROUP_USERS_INFO_0 pgrpBuf = NULL; - DWORD dwLevel = 0; - DWORD dwFlags = LG_INCLUDE_INDIRECT; - DWORD dwPrefMaxLen = MAX_PREFERRED_LENGTH; - DWORD dwEntriesRead = 0; - DWORD dwTotalEntries = 0; - NET_API_STATUS nStatus; - size_t retlen; - wchar_t user[MAX_NAME_LENGTH]; - isc_result_t result; + LPGROUP_USERS_INFO_0 pgrpBuf = NULL; + DWORD dwLevel = 0; + DWORD dwFlags = LG_INCLUDE_INDIRECT; + DWORD dwPrefMaxLen = MAX_PREFERRED_LENGTH; + DWORD dwEntriesRead = 0; + DWORD dwTotalEntries = 0; + NET_API_STATUS nStatus; + size_t retlen; + wchar_t user[MAX_NAME_LENGTH]; + isc_result_t result; *totalGroups = 0; diff --git a/lib/isc/win32/ntpaths.c b/lib/isc/win32/ntpaths.c index 3eaaf579f7..af5cc77fc8 100644 --- a/lib/isc/win32/ntpaths.c +++ b/lib/isc/win32/ntpaths.c @@ -39,17 +39,17 @@ static char resolv_confFile[MAX_PATH]; static char bind_keysFile[MAX_PATH]; static DWORD baseLen = MAX_PATH; -static BOOL Initialized = FALSE; +static BOOL Initialized = FALSE; void -isc_ntpaths_init(void) -{ +isc_ntpaths_init(void) { HKEY hKey; BOOL keyFound = TRUE; memset(namedBase, 0, sizeof(namedBase)); if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, BIND_SUBKEY, 0, KEY_READ, &hKey) != - ERROR_SUCCESS) { + ERROR_SUCCESS) + { keyFound = FALSE; } @@ -57,7 +57,8 @@ isc_ntpaths_init(void) /* Get the named directory */ if (RegQueryValueEx(hKey, "InstallDir", NULL, NULL, (LPBYTE)namedBase, - &baseLen) != ERROR_SUCCESS) { + &baseLen) != ERROR_SUCCESS) + { keyFound = FALSE; } RegCloseKey(hKey); @@ -106,8 +107,7 @@ isc_ntpaths_init(void) } char * -isc_ntpaths_get(int ind) -{ +isc_ntpaths_get(int ind) { if (!Initialized) { isc_ntpaths_init(); } diff --git a/lib/isc/win32/once.c b/lib/isc/win32/once.c index 2ee6b4987a..09590afac9 100644 --- a/lib/isc/win32/once.c +++ b/lib/isc/win32/once.c @@ -16,8 +16,7 @@ #include isc_result_t -isc_once_do(isc_once_t *controller, void (*function)(void)) -{ +isc_once_do(isc_once_t *controller, void (*function)(void)) { REQUIRE(controller != NULL && function != NULL); if (controller->status == ISC_ONCE_INIT_NEEDED) { diff --git a/lib/isc/win32/os.c b/lib/isc/win32/os.c index 97c5798c74..9ff9210c99 100644 --- a/lib/isc/win32/os.c +++ b/lib/isc/win32/os.c @@ -13,12 +13,11 @@ #include -static BOOL bInit = FALSE; +static BOOL bInit = FALSE; static SYSTEM_INFO SystemInfo; static void -initialize_action(void) -{ +initialize_action(void) { if (bInit) { return; } @@ -28,8 +27,7 @@ initialize_action(void) } unsigned int -isc_os_ncpus(void) -{ +isc_os_ncpus(void) { long ncpus; initialize_action(); ncpus = SystemInfo.dwNumberOfProcessors; diff --git a/lib/isc/win32/pk11_api.c b/lib/isc/win32/pk11_api.c index 21fa1dfc7a..bfd0359905 100644 --- a/lib/isc/win32/pk11_api.c +++ b/lib/isc/win32/pk11_api.c @@ -28,12 +28,11 @@ #include char * -getpass(const char *prompt) -{ +getpass(const char *prompt) { static char buf[128]; - HANDLE h; - DWORD cc, mode; - int cnt; + HANDLE h; + DWORD cc, mode; + int cnt; h = GetStdHandle(STD_INPUT_HANDLE); fputs(prompt, stderr); @@ -62,13 +61,12 @@ getpass(const char *prompt) /* load PKCS11 DLL */ static HINSTANCE hPK11 = NULL; -static char loaderrmsg[1024]; +static char loaderrmsg[1024]; CK_RV -pkcs_C_Initialize(CK_VOID_PTR pReserved) -{ +pkcs_C_Initialize(CK_VOID_PTR pReserved) { CK_C_Initialize sym; - const char * lib_name = pk11_get_lib_name(); + const char *lib_name = pk11_get_lib_name(); if (hPK11 != NULL) { return (CKR_LIBRARY_ALREADY_INITIALIZED); @@ -99,16 +97,14 @@ pkcs_C_Initialize(CK_VOID_PTR pReserved) } char * -pk11_get_load_error_message(void) -{ +pk11_get_load_error_message(void) { return (loaderrmsg); } CK_RV -pkcs_C_Finalize(CK_VOID_PTR pReserved) -{ +pkcs_C_Finalize(CK_VOID_PTR pReserved) { CK_C_Finalize sym; - CK_RV rv; + CK_RV rv; if (hPK11 == NULL) { return (CKR_LIBRARY_FAILED_TO_LOAD); @@ -127,8 +123,7 @@ pkcs_C_Finalize(CK_VOID_PTR pReserved) CK_RV pkcs_C_GetSlotList(CK_BBOOL tokenPresent, CK_SLOT_ID_PTR pSlotList, - CK_ULONG_PTR pulCount) -{ + CK_ULONG_PTR pulCount) { static CK_C_GetSlotList sym = NULL; if (hPK11 == NULL) { @@ -144,8 +139,7 @@ pkcs_C_GetSlotList(CK_BBOOL tokenPresent, CK_SLOT_ID_PTR pSlotList, } CK_RV -pkcs_C_GetTokenInfo(CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo) -{ +pkcs_C_GetTokenInfo(CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo) { static CK_C_GetTokenInfo sym = NULL; if (hPK11 == NULL) { @@ -163,8 +157,7 @@ pkcs_C_GetTokenInfo(CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo) CK_RV pkcs_C_GetMechanismInfo(CK_SLOT_ID slotID, CK_MECHANISM_TYPE type, - CK_MECHANISM_INFO_PTR pInfo) -{ + CK_MECHANISM_INFO_PTR pInfo) { static CK_C_GetMechanismInfo sym = NULL; if (hPK11 == NULL) { @@ -184,10 +177,9 @@ pkcs_C_GetMechanismInfo(CK_SLOT_ID slotID, CK_MECHANISM_TYPE type, CK_RV pkcs_C_OpenSession(CK_SLOT_ID slotID, CK_FLAGS flags, CK_VOID_PTR pApplication, CK_RV (*Notify)(CK_SESSION_HANDLE hSession, - CK_NOTIFICATION event, - CK_VOID_PTR pApplication), - CK_SESSION_HANDLE_PTR phSession) -{ + CK_NOTIFICATION event, + CK_VOID_PTR pApplication), + CK_SESSION_HANDLE_PTR phSession) { static CK_C_OpenSession sym = NULL; if (hPK11 == NULL) { @@ -210,8 +202,7 @@ pkcs_C_OpenSession(CK_SLOT_ID slotID, CK_FLAGS flags, CK_VOID_PTR pApplication, } CK_RV -pkcs_C_CloseSession(CK_SESSION_HANDLE hSession) -{ +pkcs_C_CloseSession(CK_SESSION_HANDLE hSession) { static CK_C_CloseSession sym = NULL; if (hPK11 == NULL) { @@ -229,8 +220,7 @@ pkcs_C_CloseSession(CK_SESSION_HANDLE hSession) CK_RV pkcs_C_Login(CK_SESSION_HANDLE hSession, CK_USER_TYPE userType, - CK_CHAR_PTR pPin, CK_ULONG usPinLen) -{ + CK_CHAR_PTR pPin, CK_ULONG usPinLen) { static CK_C_Login sym = NULL; if (hPK11 == NULL) { @@ -246,8 +236,7 @@ pkcs_C_Login(CK_SESSION_HANDLE hSession, CK_USER_TYPE userType, } CK_RV -pkcs_C_Logout(CK_SESSION_HANDLE hSession) -{ +pkcs_C_Logout(CK_SESSION_HANDLE hSession) { static CK_C_Logout sym = NULL; if (hPK11 == NULL) { @@ -264,8 +253,7 @@ pkcs_C_Logout(CK_SESSION_HANDLE hSession) CK_RV pkcs_C_CreateObject(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate, - CK_ULONG usCount, CK_OBJECT_HANDLE_PTR phObject) -{ + CK_ULONG usCount, CK_OBJECT_HANDLE_PTR phObject) { static CK_C_CreateObject sym = NULL; if (hPK11 == NULL) { @@ -282,8 +270,7 @@ pkcs_C_CreateObject(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate, } CK_RV -pkcs_C_DestroyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject) -{ +pkcs_C_DestroyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject) { static CK_C_DestroyObject sym = NULL; if (hPK11 == NULL) { @@ -302,8 +289,7 @@ pkcs_C_DestroyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject) CK_RV pkcs_C_GetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject, - CK_ATTRIBUTE_PTR pTemplate, CK_ULONG usCount) -{ + CK_ATTRIBUTE_PTR pTemplate, CK_ULONG usCount) { static CK_C_GetAttributeValue sym = NULL; if (hPK11 == NULL) { @@ -322,8 +308,7 @@ pkcs_C_GetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject, CK_RV pkcs_C_SetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject, - CK_ATTRIBUTE_PTR pTemplate, CK_ULONG usCount) -{ + CK_ATTRIBUTE_PTR pTemplate, CK_ULONG usCount) { static CK_C_SetAttributeValue sym = NULL; if (hPK11 == NULL) { @@ -342,8 +327,7 @@ pkcs_C_SetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject, CK_RV pkcs_C_FindObjectsInit(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate, - CK_ULONG usCount) -{ + CK_ULONG usCount) { static CK_C_FindObjectsInit sym = NULL; if (hPK11 == NULL) { @@ -362,8 +346,7 @@ pkcs_C_FindObjectsInit(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate, CK_RV pkcs_C_FindObjects(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE_PTR phObject, - CK_ULONG usMaxObjectCount, CK_ULONG_PTR pusObjectCount) -{ + CK_ULONG usMaxObjectCount, CK_ULONG_PTR pusObjectCount) { static CK_C_FindObjects sym = NULL; if (hPK11 == NULL) { @@ -379,8 +362,7 @@ pkcs_C_FindObjects(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE_PTR phObject, } CK_RV -pkcs_C_FindObjectsFinal(CK_SESSION_HANDLE hSession) -{ +pkcs_C_FindObjectsFinal(CK_SESSION_HANDLE hSession) { static CK_C_FindObjectsFinal sym = NULL; if (hPK11 == NULL) { @@ -399,8 +381,7 @@ pkcs_C_FindObjectsFinal(CK_SESSION_HANDLE hSession) CK_RV pkcs_C_EncryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, - CK_OBJECT_HANDLE hKey) -{ + CK_OBJECT_HANDLE hKey) { static CK_C_EncryptInit sym = NULL; if (hPK11 == NULL) { @@ -418,8 +399,7 @@ pkcs_C_EncryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_RV pkcs_C_Encrypt(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ulDataLen, CK_BYTE_PTR pEncryptedData, - CK_ULONG_PTR pulEncryptedDataLen) -{ + CK_ULONG_PTR pulEncryptedDataLen) { static CK_C_Encrypt sym = NULL; if (hPK11 == NULL) { @@ -436,8 +416,7 @@ pkcs_C_Encrypt(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, } CK_RV -pkcs_C_DigestInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism) -{ +pkcs_C_DigestInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism) { static CK_C_DigestInit sym = NULL; if (hPK11 == NULL) { @@ -454,8 +433,7 @@ pkcs_C_DigestInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism) CK_RV pkcs_C_DigestUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, - CK_ULONG ulPartLen) -{ + CK_ULONG ulPartLen) { static CK_C_DigestUpdate sym = NULL; if (hPK11 == NULL) { @@ -473,8 +451,7 @@ pkcs_C_DigestUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_RV pkcs_C_DigestFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pDigest, - CK_ULONG_PTR pulDigestLen) -{ + CK_ULONG_PTR pulDigestLen) { static CK_C_DigestFinal sym = NULL; if (hPK11 == NULL) { @@ -491,8 +468,7 @@ pkcs_C_DigestFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pDigest, CK_RV pkcs_C_SignInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, - CK_OBJECT_HANDLE hKey) -{ + CK_OBJECT_HANDLE hKey) { static CK_C_SignInit sym = NULL; if (hPK11 == NULL) { @@ -509,8 +485,7 @@ pkcs_C_SignInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_RV pkcs_C_Sign(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ulDataLen, - CK_BYTE_PTR pSignature, CK_ULONG_PTR pulSignatureLen) -{ + CK_BYTE_PTR pSignature, CK_ULONG_PTR pulSignatureLen) { static CK_C_Sign sym = NULL; if (hPK11 == NULL) { @@ -528,8 +503,7 @@ pkcs_C_Sign(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ulDataLen, CK_RV pkcs_C_SignUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, - CK_ULONG ulPartLen) -{ + CK_ULONG ulPartLen) { static CK_C_SignUpdate sym = NULL; if (hPK11 == NULL) { @@ -546,8 +520,7 @@ pkcs_C_SignUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_RV pkcs_C_SignFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature, - CK_ULONG_PTR pulSignatureLen) -{ + CK_ULONG_PTR pulSignatureLen) { static CK_C_SignFinal sym = NULL; if (hPK11 == NULL) { @@ -564,8 +537,7 @@ pkcs_C_SignFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature, CK_RV pkcs_C_VerifyInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, - CK_OBJECT_HANDLE hKey) -{ + CK_OBJECT_HANDLE hKey) { static CK_C_VerifyInit sym = NULL; if (hPK11 == NULL) { @@ -582,8 +554,7 @@ pkcs_C_VerifyInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_RV pkcs_C_Verify(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ulDataLen, - CK_BYTE_PTR pSignature, CK_ULONG ulSignatureLen) -{ + CK_BYTE_PTR pSignature, CK_ULONG ulSignatureLen) { static CK_C_Verify sym = NULL; if (hPK11 == NULL) { @@ -600,8 +571,7 @@ pkcs_C_Verify(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ulDataLen, CK_RV pkcs_C_VerifyUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, - CK_ULONG ulPartLen) -{ + CK_ULONG ulPartLen) { static CK_C_VerifyUpdate sym = NULL; if (hPK11 == NULL) { @@ -619,8 +589,7 @@ pkcs_C_VerifyUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_RV pkcs_C_VerifyFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature, - CK_ULONG ulSignatureLen) -{ + CK_ULONG ulSignatureLen) { static CK_C_VerifyFinal sym = NULL; if (hPK11 == NULL) { @@ -638,8 +607,7 @@ pkcs_C_VerifyFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature, CK_RV pkcs_C_GenerateKey(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_ATTRIBUTE_PTR pTemplate, CK_ULONG ulCount, - CK_OBJECT_HANDLE_PTR phKey) -{ + CK_OBJECT_HANDLE_PTR phKey) { static CK_C_GenerateKey sym = NULL; if (hPK11 == NULL) { @@ -656,13 +624,12 @@ pkcs_C_GenerateKey(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_RV pkcs_C_GenerateKeyPair(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, - CK_ATTRIBUTE_PTR pPublicKeyTemplate, - CK_ULONG usPublicKeyAttributeCount, - CK_ATTRIBUTE_PTR pPrivateKeyTemplate, - CK_ULONG usPrivateKeyAttributeCount, + CK_ATTRIBUTE_PTR pPublicKeyTemplate, + CK_ULONG usPublicKeyAttributeCount, + CK_ATTRIBUTE_PTR pPrivateKeyTemplate, + CK_ULONG usPrivateKeyAttributeCount, CK_OBJECT_HANDLE_PTR phPrivateKey, - CK_OBJECT_HANDLE_PTR phPublicKey) -{ + CK_OBJECT_HANDLE_PTR phPublicKey) { static CK_C_GenerateKeyPair sym = NULL; if (hPK11 == NULL) { @@ -684,8 +651,7 @@ pkcs_C_GenerateKeyPair(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_RV pkcs_C_DeriveKey(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_OBJECT_HANDLE hBaseKey, CK_ATTRIBUTE_PTR pTemplate, - CK_ULONG ulAttributeCount, CK_OBJECT_HANDLE_PTR phKey) -{ + CK_ULONG ulAttributeCount, CK_OBJECT_HANDLE_PTR phKey) { static CK_C_DeriveKey sym = NULL; if (hPK11 == NULL) { @@ -703,8 +669,7 @@ pkcs_C_DeriveKey(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_RV pkcs_C_SeedRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSeed, - CK_ULONG ulSeedLen) -{ + CK_ULONG ulSeedLen) { static CK_C_SeedRandom sym = NULL; if (hPK11 == NULL) { @@ -721,8 +686,7 @@ pkcs_C_SeedRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSeed, CK_RV pkcs_C_GenerateRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR RandomData, - CK_ULONG ulRandomLen) -{ + CK_ULONG ulRandomLen) { static CK_C_GenerateRandom sym = NULL; if (hPK11 == NULL) { diff --git a/lib/isc/win32/resource.c b/lib/isc/win32/resource.c index 4232efe93d..ff8283231b 100644 --- a/lib/isc/win32/resource.c +++ b/lib/isc/win32/resource.c @@ -25,10 +25,9 @@ #define WIN32_MAX_OPEN_FILES 2048 isc_result_t -isc_resource_setlimit(isc_resource_t resource, isc_resourcevalue_t value) -{ +isc_resource_setlimit(isc_resource_t resource, isc_resourcevalue_t value) { isc_resourcevalue_t rlim_value; - int wresult; + int wresult; if (resource != isc_resource_openfiles) { return (ISC_R_NOTIMPLEMENTED); @@ -50,8 +49,7 @@ isc_resource_setlimit(isc_resource_t resource, isc_resourcevalue_t value) } isc_result_t -isc_resource_getlimit(isc_resource_t resource, isc_resourcevalue_t *value) -{ +isc_resource_getlimit(isc_resource_t resource, isc_resourcevalue_t *value) { if (resource != isc_resource_openfiles) { return (ISC_R_NOTIMPLEMENTED); } @@ -61,7 +59,6 @@ isc_resource_getlimit(isc_resource_t resource, isc_resourcevalue_t *value) } isc_result_t -isc_resource_getcurlimit(isc_resource_t resource, isc_resourcevalue_t *value) -{ +isc_resource_getcurlimit(isc_resource_t resource, isc_resourcevalue_t *value) { return (isc_resource_getlimit(resource, value)); } diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c index 7c30060dc6..e847ade985 100644 --- a/lib/isc/win32/socket.c +++ b/lib/isc/win32/socket.c @@ -96,8 +96,8 @@ LIBISC_EXTERNAL_DATA int isc_dscp_check_value = -1; * no library exports this function. Instead, we need to * issue a runtime call to get the address. */ -LPFN_CONNECTEX ISCConnectEx; -LPFN_ACCEPTEX ISCAcceptEx; +LPFN_CONNECTEX ISCConnectEx; +LPFN_ACCEPTEX ISCAcceptEx; LPFN_GETACCEPTEXSOCKADDRS ISCGetAcceptExSockaddrs; /* @@ -110,8 +110,7 @@ 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 @@ -139,9 +138,9 @@ consistent(isc_socket_t *sock); #define PENDING_ERROR(e) ((e) == WSA_IO_PENDING || (e) == 0) #define DOIO_SUCCESS 0 /* i/o ok, event sent */ -#define DOIO_SOFT 1 /* i/o ok, soft error, no event sent */ -#define DOIO_HARD 2 /* i/o error, event sent */ -#define DOIO_EOF 3 /* EOF, no event sent */ +#define DOIO_SOFT 1 /* i/o ok, soft error, no event sent */ +#define DOIO_HARD 2 /* i/o error, event sent */ +#define DOIO_EOF 3 /* EOF, no event sent */ #define DOIO_PENDING 4 /* status when i/o is in process */ #define DOIO_NEEDMORE \ 5 /* IO was processed, but we need more due to minimum \ @@ -156,17 +155,17 @@ consistent(isc_socket_t *sock); * DLVL(50) -- Event tracing, including receiving/sending completion events. * DLVL(20) -- Socket creation/destruction. */ -#define TRACE_LEVEL 90 +#define TRACE_LEVEL 90 #define CORRECTNESS_LEVEL 70 -#define IOEVENT_LEVEL 60 -#define EVENT_LEVEL 50 -#define CREATION_LEVEL 20 +#define IOEVENT_LEVEL 60 +#define EVENT_LEVEL 50 +#define CREATION_LEVEL 20 -#define TRACE DLVL(TRACE_LEVEL) +#define TRACE DLVL(TRACE_LEVEL) #define CORRECTNESS DLVL(CORRECTNESS_LEVEL) -#define IOEVENT DLVL(IOEVENT_LEVEL) -#define EVENT DLVL(EVENT_LEVEL) -#define CREATION DLVL(CREATION_LEVEL) +#define IOEVENT DLVL(IOEVENT_LEVEL) +#define EVENT DLVL(EVENT_LEVEL) +#define CREATION DLVL(CREATION_LEVEL) typedef isc_event_t intev_t; @@ -182,7 +181,7 @@ enum { SOCK_INITIALIZED, /* Socket Initialized */ SOCK_CLOSED, /* Socket has been closed */ }; -#define SOCKET_MAGIC ISC_MAGIC('I', 'O', 'i', 'o') +#define SOCKET_MAGIC ISC_MAGIC('I', 'O', 'i', 'o') #define VALID_SOCKET(t) ISC_MAGIC_VALID(t, SOCKET_MAGIC) /* @@ -205,13 +204,13 @@ enum { SOCK_INITIALIZED, /* Socket Initialized */ * Used value-result for recvmsg, value only for sendmsg. */ struct msghdr { - SOCKADDR_STORAGE to_addr; /* UDP send/recv address */ - int to_addr_len; /* length of the address */ - WSABUF * msg_iov; /* scatter/gather array */ - u_int msg_iovlen; /* # elements in msg_iov */ - void * msg_control; /* ancillary data, see below */ - u_int msg_controllen; /* ancillary data buffer len */ - u_int msg_totallen; /* total length of this message */ + SOCKADDR_STORAGE to_addr; /* UDP send/recv address */ + int to_addr_len; /* length of the address */ + WSABUF *msg_iov; /* scatter/gather array */ + u_int msg_iovlen; /* # elements in msg_iov */ + void *msg_control; /* ancillary data, see below */ + u_int msg_controllen; /* ancillary data buffer len */ + u_int msg_totallen; /* total length of this message */ } msghdr; /* @@ -227,9 +226,9 @@ struct msghdr { struct isc_socket { /* Not locked. */ - unsigned int magic; + unsigned int magic; isc_socketmgr_t *manager; - isc_mutex_t lock; + isc_mutex_t lock; isc_sockettype_t type; /* Pointers to scatter/gather buffers */ @@ -238,10 +237,10 @@ struct isc_socket { /* Locked by socket lock. */ ISC_LINK(isc_socket_t) link; isc_refcount_t references; /* EXTERNAL references */ - SOCKET fd; /* file handle */ - int pf; /* protocol family */ - char name[16]; - void * tag; + SOCKET fd; /* file handle */ + int pf; /* protocol family */ + char name[16]; + void *tag; /* * Each recv() call uses this buffer. It is a per-socket receive @@ -251,15 +250,15 @@ struct isc_socket { * calls. It also allows us to read-ahead in some cases. */ struct { - SOCKADDR_STORAGE from_addr; /* UDP send/recv address */ - int from_addr_len; /* length of the address */ - char * base; /* the base of the buffer */ - char * consume_position; /* where to start - * copying data from - * next */ - unsigned int len; /* the actual size of this buffer */ - unsigned int remaining; /* the number of bytes - * remaining */ + SOCKADDR_STORAGE from_addr; /* UDP send/recv address */ + int from_addr_len; /* length of the address */ + char *base; /* the base of the buffer */ + char *consume_position; /* where to start + * copying data from + * next */ + unsigned int len; /* the actual size of this buffer */ + unsigned int remaining; /* the number of bytes + * remaining */ } recvbuf; ISC_LIST(isc_socketevent_t) send_list; @@ -300,16 +299,16 @@ struct isc_socket { static HANDLE hHeapHandle = NULL; typedef struct IoCompletionInfo { - OVERLAPPED overlapped; - isc_socketevent_t * dev; /* send()/recv() done event */ - isc_socket_connev_t * cdev; /* connect() done event */ + OVERLAPPED overlapped; + isc_socketevent_t *dev; /* send()/recv() done event */ + isc_socket_connev_t *cdev; /* connect() done event */ isc_socket_newconnev_t *adev; /* accept() done event */ - void * acceptbuffer; - DWORD received_bytes; - int request_type; - struct msghdr messagehdr; - void * buf; - unsigned int buflen; + void *acceptbuffer; + DWORD received_bytes; + int request_type; + struct msghdr messagehdr; + void *buf; + unsigned int buflen; } IoCompletionInfo; /* @@ -320,24 +319,24 @@ typedef struct IoCompletionInfo { #define MAX_IOCPTHREADS 20 #define SOCKET_MANAGER_MAGIC ISC_MAGIC('I', 'O', 'm', 'g') -#define VALID_MANAGER(m) ISC_MAGIC_VALID(m, SOCKET_MANAGER_MAGIC) +#define VALID_MANAGER(m) ISC_MAGIC_VALID(m, SOCKET_MANAGER_MAGIC) struct isc_socketmgr { /* Not locked. */ unsigned int magic; - isc_mem_t * mctx; - isc_mutex_t lock; + isc_mem_t *mctx; + isc_mutex_t lock; isc_stats_t *stats; /* Locked by manager lock. */ ISC_LIST(isc_socket_t) socklist; - bool bShutdown; + bool bShutdown; isc_condition_t shutdown_ok; - HANDLE hIoCompletionPort; - int maxIOCPThreads; - HANDLE hIOCPThreads[MAX_IOCPTHREADS]; - DWORD dwIOCPThreadIds[MAX_IOCPTHREADS]; - size_t maxudp; + HANDLE hIoCompletionPort; + int maxIOCPThreads; + HANDLE hIOCPThreads[MAX_IOCPTHREADS]; + DWORD dwIOCPThreadIds[MAX_IOCPTHREADS]; + size_t maxudp; /* * Debugging. @@ -355,38 +354,27 @@ 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 @@ -395,11 +383,10 @@ queue_receive_request(isc_socket_t *sock); * it should only be used interactively. */ void -sock_dump(isc_socket_t *sock) -{ - isc_socketevent_t * ldev; +sock_dump(isc_socket_t *sock) { + isc_socketevent_t *ldev; isc_socket_newconnev_t *ndev; - isc_socket_connev_t * cdev; + isc_socket_connev_t *cdev; #if 0 isc_sockaddr_t addr; @@ -458,19 +445,19 @@ 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) */ static void -signal_iocompletionport_exit(isc_socketmgr_t *manager) -{ - int i; - int errval; +signal_iocompletionport_exit(isc_socketmgr_t *manager) { + int i; + int errval; char strbuf[ISC_STRERRORSIZE]; REQUIRE(VALID_MANAGER(manager)); @@ -490,11 +477,10 @@ signal_iocompletionport_exit(isc_socketmgr_t *manager) * Create the worker threads for the I/O Completion Port */ void -iocompletionport_createthreads(int total_threads, isc_socketmgr_t *manager) -{ - int errval; +iocompletionport_createthreads(int total_threads, isc_socketmgr_t *manager) { + int errval; char strbuf[ISC_STRERRORSIZE]; - int i; + int i; INSIST(total_threads > 0); REQUIRE(VALID_MANAGER(manager)); @@ -518,9 +504,8 @@ iocompletionport_createthreads(int total_threads, isc_socketmgr_t *manager) * Create/initialise the I/O completion port */ void -iocompletionport_init(isc_socketmgr_t *manager) -{ - int errval; +iocompletionport_init(isc_socketmgr_t *manager) { + int errval; char strbuf[ISC_STRERRORSIZE]; REQUIRE(VALID_MANAGER(manager)); @@ -560,10 +545,9 @@ iocompletionport_init(isc_socketmgr_t *manager) * events for it and have our worker pool of threads process them. */ void -iocompletionport_update(isc_socket_t *sock) -{ +iocompletionport_update(isc_socket_t *sock) { HANDLE hiocp; - char strbuf[ISC_STRERRORSIZE]; + char strbuf[ISC_STRERRORSIZE]; REQUIRE(VALID_SOCKET(sock)); @@ -602,8 +586,7 @@ iocompletionport_update(isc_socket_t *sock) * The socket is locked before calling this function */ void -socket_close(isc_socket_t *sock) -{ +socket_close(isc_socket_t *sock) { REQUIRE(sock != NULL); if (sock->fd != INVALID_SOCKET) { @@ -615,19 +598,18 @@ socket_close(isc_socket_t *sock) } static isc_once_t initialise_once = ISC_ONCE_INIT; -static bool initialised = false; +static bool initialised = false; static void -initialise(void) -{ - WORD wVersionRequested; +initialise(void) { + WORD wVersionRequested; WSADATA wsaData; - int err; - SOCKET sock; - GUID GUIDConnectEx = WSAID_CONNECTEX; - GUID GUIDAcceptEx = WSAID_ACCEPTEX; - GUID GUIDGetAcceptExSockaddrs = WSAID_GETACCEPTEXSOCKADDRS; - DWORD dwBytes; + int err; + SOCKET sock; + GUID GUIDConnectEx = WSAID_CONNECTEX; + GUID GUIDAcceptEx = WSAID_ACCEPTEX; + GUID GUIDGetAcceptExSockaddrs = WSAID_GETACCEPTEXSOCKADDRS; + DWORD dwBytes; /* Need Winsock 2.2 or better */ wVersionRequested = MAKEWORD(2, 2); @@ -673,8 +655,7 @@ initialise(void) * Initialize socket services */ void -InitSockets(void) -{ +InitSockets(void) { RUNTIME_CHECK(isc_once_do(&initialise_once, initialise) == ISC_R_SUCCESS); if (!initialised) { @@ -684,12 +665,11 @@ InitSockets(void) int internal_sendmsg(isc_socket_t *sock, IoCompletionInfo *lpo, - struct msghdr *messagehdr, int flags, int *Error) -{ - int Result; + struct msghdr *messagehdr, int flags, int *Error) { + int Result; DWORD BytesSent; DWORD Flags = flags; - int total_sent; + int total_sent; *Error = 0; Result = WSASendTo(sock->fd, messagehdr->msg_iov, @@ -729,16 +709,15 @@ internal_sendmsg(isc_socket_t *sock, IoCompletionInfo *lpo, } static void -queue_receive_request(isc_socket_t *sock) -{ - DWORD Flags = 0; - DWORD NumBytes = 0; - int Result; - int Error; - int need_retry; - WSABUF iov[1]; +queue_receive_request(isc_socket_t *sock) { + DWORD Flags = 0; + DWORD NumBytes = 0; + int Result; + int Error; + int need_retry; + WSABUF iov[1]; IoCompletionInfo *lpo = NULL; - isc_result_t isc_result; + isc_result_t isc_result; retry: need_retry = false; @@ -844,9 +823,8 @@ retry: static void manager_log(isc_socketmgr_t *sockmgr, isc_logcategory_t *category, - isc_logmodule_t *module, int level, const char *fmt, ...) -{ - char msgbuf[2048]; + isc_logmodule_t *module, int level, const char *fmt, ...) { + char msgbuf[2048]; va_list ap; if (!isc_log_wouldlog(isc_lctx, level)) { @@ -864,10 +842,9 @@ manager_log(isc_socketmgr_t *sockmgr, isc_logcategory_t *category, 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, ...) -{ - char msgbuf[2048]; - char peerbuf[256]; + const char *fmt, ...) { + char msgbuf[2048]; + char peerbuf[256]; va_list ap; if (!isc_log_wouldlog(isc_lctx, level)) { @@ -893,11 +870,10 @@ socket_log(int lineno, isc_socket_t *sock, const isc_sockaddr_t *address, * Make an fd SOCKET non-blocking. */ static isc_result_t -make_nonblock(SOCKET fd) -{ - int ret; +make_nonblock(SOCKET fd) { + int ret; unsigned long flags = 1; - char strbuf[ISC_STRERRORSIZE]; + char strbuf[ISC_STRERRORSIZE]; /* Set the socket to non-blocking */ ret = ioctlsocket(fd, FIONBIO, &flags); @@ -925,10 +901,9 @@ make_nonblock(SOCKET fd) * See Microsoft Knowledge Base Article Q263823 for details of this. */ isc_result_t -connection_reset_fix(SOCKET fd) -{ +connection_reset_fix(SOCKET fd) { DWORD dwBytesReturned = 0; - BOOL bNewBehavior = FALSE; + BOOL bNewBehavior = FALSE; DWORD status; if (isc_win32os_versioncheck(5, 0, 0, 0) < 0) { @@ -960,10 +935,9 @@ connection_reset_fix(SOCKET fd) static void build_msghdr_send(isc_socket_t *sock, isc_socketevent_t *dev, struct msghdr *msg, char *cmsg, WSABUF *iov, - IoCompletionInfo *lpo) -{ + IoCompletionInfo *lpo) { unsigned int iovcount; - size_t write_count; + size_t write_count; memset(msg, 0, sizeof(*msg)); @@ -996,8 +970,7 @@ build_msghdr_send(isc_socket_t *sock, isc_socketevent_t *dev, static void set_dev_address(const isc_sockaddr_t *address, isc_socket_t *sock, - isc_socketevent_t *dev) -{ + isc_socketevent_t *dev) { if (sock->type == isc_sockettype_udp) { if (address != NULL) { dev->address = *address; @@ -1011,8 +984,7 @@ set_dev_address(const isc_sockaddr_t *address, isc_socket_t *sock, } static void -destroy_socketevent(isc_event_t *event) -{ +destroy_socketevent(isc_event_t *event) { isc_socketevent_t *ev = (isc_socketevent_t *)event; (ev->destroy)(event); @@ -1021,8 +993,7 @@ destroy_socketevent(isc_event_t *event) static isc_socketevent_t * allocate_socketevent(isc_mem_t *mctx, isc_socket_t *sock, isc_eventtype_t eventtype, isc_taskaction_t action, - void *arg) -{ + void *arg) { isc_socketevent_t *ev; ev = (isc_socketevent_t *)isc_event_allocate(mctx, sock, eventtype, @@ -1045,8 +1016,7 @@ allocate_socketevent(isc_mem_t *mctx, isc_socket_t *sock, #if defined(ISC_SOCKET_DEBUG) static void -dump_msg(struct msghdr *msg, isc_socket_t *sock) -{ +dump_msg(struct msghdr *msg, isc_socket_t *sock) { unsigned int i; printf("MSGHDR %p, Socket #: %Iu\n", msg, sock->fd); @@ -1063,8 +1033,7 @@ dump_msg(struct msghdr *msg, isc_socket_t *sock) */ int map_socket_error(isc_socket_t *sock, int windows_errno, int *isc_errno, - char *errorstring, size_t bufsize) -{ + char *errorstring, size_t bufsize) { int doreturn; switch (windows_errno) { case WSAECONNREFUSED: @@ -1175,8 +1144,7 @@ map_socket_error(isc_socket_t *sock, int windows_errno, int *isc_errno, } static void -fill_recv(isc_socket_t *sock, isc_socketevent_t *dev) -{ +fill_recv(isc_socket_t *sock, isc_socketevent_t *dev) { int copylen; INSIST(dev->n < dev->minimum); @@ -1201,7 +1169,8 @@ fill_recv(isc_socket_t *sock, isc_socketevent_t *dev) * 'maxudp' bytes. */ if (sock->manager->maxudp != 0 && - sock->recvbuf.remaining > sock->manager->maxudp) { + sock->recvbuf.remaining > sock->manager->maxudp) + { sock->recvbuf.remaining = 0; return; } @@ -1232,8 +1201,7 @@ fill_recv(isc_socket_t *sock, isc_socketevent_t *dev) * As each done event is filled, send it along its way. */ static void -completeio_recv(isc_socket_t *sock) -{ +completeio_recv(isc_socket_t *sock) { isc_socketevent_t *dev; /* @@ -1244,8 +1212,8 @@ completeio_recv(isc_socket_t *sock) return; } - while (sock->recvbuf.remaining > 0 && - !ISC_LIST_EMPTY(sock->recv_list)) { + while (sock->recvbuf.remaining > 0 && !ISC_LIST_EMPTY(sock->recv_list)) + { dev = ISC_LIST_HEAD(sock->recv_list); /* @@ -1279,8 +1247,7 @@ completeio_recv(isc_socket_t *sock) */ static int completeio_send(isc_socket_t *sock, isc_socketevent_t *dev, - struct msghdr *messagehdr, int cc, int send_errno) -{ + struct msghdr *messagehdr, int cc, int send_errno) { char strbuf[ISC_STRERRORSIZE]; if (send_errno != 0) { @@ -1310,20 +1277,20 @@ completeio_send(isc_socket_t *sock, isc_socketevent_t *dev, static int startio_send(isc_socket_t *sock, isc_socketevent_t *dev, int *nbytes, - int *send_errno) -{ - char * cmsg = NULL; - char strbuf[ISC_STRERRORSIZE]; + int *send_errno) { + char *cmsg = NULL; + char strbuf[ISC_STRERRORSIZE]; IoCompletionInfo *lpo; - int status; - struct msghdr * mh; + int status; + struct msghdr *mh; /* * Simulate a firewall blocking UDP responses bigger than * 'maxudp' bytes. */ if (sock->type == isc_sockettype_udp && sock->manager->maxudp != 0 && - dev->region.length - dev->n > sock->manager->maxudp) { + dev->region.length - dev->n > sock->manager->maxudp) + { *nbytes = dev->region.length - dev->n; return (DOIO_SUCCESS); } @@ -1376,8 +1343,7 @@ done: } static void -use_min_mtu(isc_socket_t *sock) -{ +use_min_mtu(isc_socket_t *sock) { #ifdef IPV6_USE_MIN_MTU /* use minimum MTU */ if (sock->pf == AF_INET6) { @@ -1392,8 +1358,7 @@ use_min_mtu(isc_socket_t *sock) static isc_result_t allocate_socket(isc_socketmgr_t *manager, isc_sockettype_t type, - isc_socket_t **socketp) -{ + isc_socket_t **socketp) { isc_socket_t *sock; sock = isc_mem_get(manager->mctx, sizeof(*sock)); @@ -1429,9 +1394,9 @@ allocate_socket(isc_socketmgr_t *manager, isc_sockettype_t type, sock->recvbuf.len = 65536; sock->recvbuf.consume_position = sock->recvbuf.base; sock->recvbuf.remaining = 0; - sock->recvbuf.base = - isc_mem_get(manager->mctx, sock->recvbuf.len); /* max buffer */ - /* size */ + sock->recvbuf.base = isc_mem_get(manager->mctx, + sock->recvbuf.len); /* max buffer */ + /* size */ /* * Initialize the lock. @@ -1450,13 +1415,12 @@ allocate_socket(isc_socketmgr_t *manager, isc_sockettype_t type, * Verify that the socket state is consistent. */ static void -consistent(isc_socket_t *sock) -{ - isc_socketevent_t * dev; +consistent(isc_socket_t *sock) { + isc_socketevent_t *dev; isc_socket_newconnev_t *nev; - unsigned int count; - char * crash_reason; - bool crash = false; + unsigned int count; + char *crash_reason; + bool crash = false; REQUIRE(sock->pending_iocp == sock->pending_recv + sock->pending_send + sock->pending_accept + @@ -1508,8 +1472,7 @@ consistent(isc_socket_t *sock) * to hold on to this pointer are allowed. */ static void -maybe_free_socket(isc_socket_t **socketp, int lineno) -{ +maybe_free_socket(isc_socket_t **socketp, int lineno) { isc_socket_t *sock = *socketp; *socketp = NULL; @@ -1522,7 +1485,8 @@ maybe_free_socket(isc_socket_t **socketp, int lineno) sock->pending_connect == 1 || !ISC_LIST_EMPTY(sock->recv_list) || !ISC_LIST_EMPTY(sock->send_list) || !ISC_LIST_EMPTY(sock->accept_list) || - !ISC_LIST_EMPTY(sock->connect_list) || sock->fd != INVALID_SOCKET) { + !ISC_LIST_EMPTY(sock->connect_list) || sock->fd != INVALID_SOCKET) + { UNLOCK(&sock->lock); return; } @@ -1532,10 +1496,9 @@ maybe_free_socket(isc_socket_t **socketp, int lineno) } void -free_socket(isc_socket_t **sockp, int lineno) -{ +free_socket(isc_socket_t **sockp, int lineno) { isc_socketmgr_t *manager; - isc_socket_t * sock = *sockp; + isc_socket_t *sock = *sockp; *sockp = NULL; /* @@ -1574,18 +1537,17 @@ free_socket(isc_socket_t **sockp, int lineno) */ static isc_result_t socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type, - isc_socket_t **socketp, isc_socket_t *dup_socket) -{ + isc_socket_t **socketp, isc_socket_t *dup_socket) { isc_socket_t *sock = NULL; - isc_result_t result; + isc_result_t result; #if defined(USE_CMSG) int on = 1; #endif /* if defined(USE_CMSG) */ #if defined(SO_RCVBUF) socklen_t optlen; - int size; + int size; #endif /* if defined(SO_RCVBUF) */ - int socket_errno; + int socket_errno; char strbuf[ISC_STRERRORSIZE]; REQUIRE(VALID_MANAGER(manager)); @@ -1685,7 +1647,8 @@ socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type, /* 2292bis */ if ((pf == AF_INET6) && (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, - (char *)&on, sizeof(on)) < 0)) { + (char *)&on, sizeof(on)) < 0)) + { strerror_r(WSAGetLastError(), strbuf, sizeof(strbuf)); UNEXPECTED_ERROR(__FILE__, __LINE__, "setsockopt(%d, IPV6_RECVPKTINFO) " @@ -1696,7 +1659,8 @@ socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type, /* 2292 */ if ((pf == AF_INET6) && (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_PKTINFO, - (char *)&on, sizeof(on)) < 0)) { + (char *)&on, sizeof(on)) < 0)) + { strerror_r(WSAGetLastError(), strbuf, sizeof(strbuf)); UNEXPECTED_ERROR(__FILE__, __LINE__, "setsockopt(%d, IPV6_PKTINFO) %s: %s", @@ -1709,7 +1673,8 @@ socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type, optlen = sizeof(size); if (getsockopt(sock->fd, SOL_SOCKET, SO_RCVBUF, (char *)&size, &optlen) >= 0 && - size < RCVBUFSIZE) { + size < RCVBUFSIZE) + { size = RCVBUFSIZE; (void)setsockopt(sock->fd, SOL_SOCKET, SO_RCVBUF, (char *)&size, sizeof(size)); @@ -1764,14 +1729,12 @@ socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type, isc_result_t isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type, - isc_socket_t **socketp) -{ + isc_socket_t **socketp) { return (socket_create(manager, pf, type, socketp, NULL)); } isc_result_t -isc_socket_dup(isc_socket_t *sock, isc_socket_t **socketp) -{ +isc_socket_dup(isc_socket_t *sock, isc_socket_t **socketp) { REQUIRE(VALID_SOCKET(sock)); REQUIRE(socketp != NULL && *socketp == NULL); @@ -1780,8 +1743,7 @@ isc_socket_dup(isc_socket_t *sock, isc_socket_t **socketp) } isc_result_t -isc_socket_open(isc_socket_t *sock) -{ +isc_socket_open(isc_socket_t *sock) { REQUIRE(VALID_SOCKET(sock)); return (ISC_R_NOTIMPLEMENTED); @@ -1791,8 +1753,7 @@ isc_socket_open(isc_socket_t *sock) * Attach to a socket. Caller must explicitly detach when it is done. */ void -isc_socket_attach(isc_socket_t *sock, isc_socket_t **socketp) -{ +isc_socket_attach(isc_socket_t *sock, isc_socket_t **socketp) { REQUIRE(VALID_SOCKET(sock)); REQUIRE(socketp != NULL && *socketp == NULL); @@ -1810,10 +1771,9 @@ isc_socket_attach(isc_socket_t *sock, isc_socket_t **socketp) * up by destroying the socket. */ void -isc_socket_detach(isc_socket_t **socketp) -{ +isc_socket_detach(isc_socket_t **socketp) { isc_socket_t *sock; - uint32_t references; + uint32_t references; REQUIRE(socketp != NULL); sock = *socketp; @@ -1839,8 +1799,7 @@ isc_socket_detach(isc_socket_t **socketp) } isc_result_t -isc_socket_close(isc_socket_t *sock) -{ +isc_socket_close(isc_socket_t *sock) { REQUIRE(VALID_SOCKET(sock)); return (ISC_R_NOTIMPLEMENTED); @@ -1857,8 +1816,7 @@ isc_socket_close(isc_socket_t *sock) * Caller must have the socket locked if the event is attached to the socket. */ static void -send_recvdone_event(isc_socket_t *sock, isc_socketevent_t **dev) -{ +send_recvdone_event(isc_socket_t *sock, isc_socketevent_t **dev) { isc_task_t *task; task = (*dev)->ev_sender; @@ -1881,8 +1839,7 @@ send_recvdone_event(isc_socket_t *sock, isc_socketevent_t **dev) * See comments for send_recvdone_event() above. */ static void -send_senddone_event(isc_socket_t *sock, isc_socketevent_t **dev) -{ +send_senddone_event(isc_socket_t *sock, isc_socketevent_t **dev) { isc_task_t *task; INSIST(dev != NULL && *dev != NULL); @@ -1907,8 +1864,7 @@ send_senddone_event(isc_socket_t *sock, isc_socketevent_t **dev) * See comments for send_recvdone_event() above. */ static void -send_acceptdone_event(isc_socket_t *sock, isc_socket_newconnev_t **adev) -{ +send_acceptdone_event(isc_socket_t *sock, isc_socket_newconnev_t **adev) { isc_task_t *task; INSIST(adev != NULL && *adev != NULL); @@ -1929,8 +1885,7 @@ send_acceptdone_event(isc_socket_t *sock, isc_socket_newconnev_t **adev) * See comments for send_recvdone_event() above. */ static void -send_connectdone_event(isc_socket_t *sock, isc_socket_connev_t **cdev) -{ +send_connectdone_event(isc_socket_t *sock, isc_socket_connev_t **cdev) { isc_task_t *task; INSIST(cdev != NULL && *cdev != NULL); @@ -1956,15 +1911,14 @@ send_connectdone_event(isc_socket_t *sock, isc_socket_connev_t **cdev) * Note the socket is locked before entering here */ static void -internal_accept(isc_socket_t *sock, IoCompletionInfo *lpo, int accept_errno) -{ +internal_accept(isc_socket_t *sock, IoCompletionInfo *lpo, int accept_errno) { isc_socket_newconnev_t *adev; - isc_result_t result = ISC_R_SUCCESS; - isc_socket_t * nsock; - struct sockaddr * localaddr; - int localaddr_len = sizeof(*localaddr); - struct sockaddr * remoteaddr; - int remoteaddr_len = sizeof(*remoteaddr); + isc_result_t result = ISC_R_SUCCESS; + isc_socket_t *nsock; + struct sockaddr *localaddr; + int localaddr_len = sizeof(*localaddr); + struct sockaddr *remoteaddr; + int remoteaddr_len = sizeof(*remoteaddr); INSIST(VALID_SOCKET(sock)); LOCK(&sock->lock); @@ -2053,11 +2007,10 @@ done: * Note that the socket is locked before entering. */ static void -internal_connect(isc_socket_t *sock, IoCompletionInfo *lpo, int connect_errno) -{ +internal_connect(isc_socket_t *sock, IoCompletionInfo *lpo, int connect_errno) { isc_socket_connev_t *cdev; - isc_result_t result; - char strbuf[ISC_STRERRORSIZE]; + isc_result_t result; + char strbuf[ISC_STRERRORSIZE]; INSIST(VALID_SOCKET(sock)); @@ -2150,8 +2103,7 @@ internal_connect(isc_socket_t *sock, IoCompletionInfo *lpo, int connect_errno) * Loop through the socket, returning ISC_R_EOF for each done event pending. */ static void -send_recvdone_abort(isc_socket_t *sock, isc_result_t result) -{ +send_recvdone_abort(isc_socket_t *sock, isc_result_t result) { isc_socketevent_t *dev; while (!ISC_LIST_EMPTY(sock->recv_list)) { @@ -2165,8 +2117,7 @@ send_recvdone_abort(isc_socket_t *sock, isc_result_t result) * Loop through the socket, returning result for each done event pending. */ static void -send_connectdone_abort(isc_socket_t *sock, isc_result_t result) -{ +send_connectdone_abort(isc_socket_t *sock, isc_result_t result) { isc_socket_connev_t *dev; while (!ISC_LIST_EMPTY(sock->connect_list)) { @@ -2185,8 +2136,7 @@ send_connectdone_abort(isc_socket_t *sock, isc_result_t result) * buffers. */ static void -internal_recv(isc_socket_t *sock, int nbytes) -{ +internal_recv(isc_socket_t *sock, int nbytes) { INSIST(VALID_SOCKET(sock)); LOCK(&sock->lock); @@ -2243,8 +2193,7 @@ internal_recv(isc_socket_t *sock, int nbytes) static void internal_send(isc_socket_t *sock, isc_socketevent_t *dev, struct msghdr *messagehdr, int nbytes, int send_errno, - IoCompletionInfo *lpo) -{ + IoCompletionInfo *lpo) { /* * Find out what socket this is and lock it. */ @@ -2296,8 +2245,7 @@ done: * Using these ensures we will not double-send an event. */ static bool -senddone_is_active(isc_socket_t *sock, isc_socketevent_t *dev) -{ +senddone_is_active(isc_socket_t *sock, isc_socketevent_t *dev) { isc_socketevent_t *ldev; ldev = ISC_LIST_HEAD(sock->send_list); @@ -2309,8 +2257,7 @@ 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) -{ +acceptdone_is_active(isc_socket_t *sock, isc_socket_newconnev_t *dev) { isc_socket_newconnev_t *ldev; ldev = ISC_LIST_HEAD(sock->accept_list); @@ -2322,8 +2269,7 @@ 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) -{ +connectdone_is_active(isc_socket_t *sock, isc_socket_connev_t *dev) { isc_socket_connev_t *cdev; cdev = ISC_LIST_HEAD(sock->connect_list); @@ -2356,10 +2302,9 @@ connectdone_is_active(isc_socket_t *sock, isc_socket_connev_t *dev) /* by the caller. */ /* */ static isc_result_t -restart_accept(isc_socket_t *parent, IoCompletionInfo *lpo) -{ +restart_accept(isc_socket_t *parent, IoCompletionInfo *lpo) { isc_socket_t *nsock = lpo->adev->newsocket; - SOCKET new_fd; + SOCKET new_fd; /* * AcceptEx() requires we pass in a socket. Note that we carefully @@ -2400,17 +2345,16 @@ restart_accept(isc_socket_t *parent, IoCompletionInfo *lpo) * processing. There are a number of these in separate threads. */ static isc_threadresult_t WINAPI -SocketIoThread(LPVOID ThreadContext) -{ - isc_socketmgr_t * manager = ThreadContext; - DWORD nbytes; +SocketIoThread(LPVOID ThreadContext) { + isc_socketmgr_t *manager = ThreadContext; + DWORD nbytes; IoCompletionInfo *lpo = NULL; - isc_socket_t * sock = NULL; - int request; - struct msghdr * messagehdr = NULL; - int errval; - char strbuf[ISC_STRERRORSIZE]; - int errstatus; + isc_socket_t *sock = NULL; + int request; + struct msghdr *messagehdr = NULL; + int errval; + char strbuf[ISC_STRERRORSIZE]; + int errstatus; REQUIRE(VALID_MANAGER(manager)); @@ -2469,7 +2413,8 @@ SocketIoThread(LPVOID ThreadContext) if (!sock->connected && ((errstatus == ERROR_HOST_UNREACHABLE) || (errstatus == WSAENETRESET) || - (errstatus == WSAECONNRESET))) { + (errstatus == WSAECONNRESET))) + { /* ignore soft errors */ queue_receive_request(sock); break; @@ -2599,15 +2544,13 @@ SocketIoThread(LPVOID ThreadContext) * Create a new socket manager. */ isc_result_t -isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) -{ +isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) { return (isc_socketmgr_create2(mctx, managerp, 0, 1)); } isc_result_t isc_socketmgr_create2(isc_mem_t *mctx, isc_socketmgr_t **managerp, - unsigned int maxsocks, int nthreads) -{ + unsigned int maxsocks, int nthreads) { isc_socketmgr_t *manager; REQUIRE(managerp != NULL && *managerp == NULL); @@ -2646,8 +2589,7 @@ isc_socketmgr_create2(isc_mem_t *mctx, isc_socketmgr_t **managerp, } isc_result_t -isc_socketmgr_getmaxsockets(isc_socketmgr_t *manager, unsigned int *nsockp) -{ +isc_socketmgr_getmaxsockets(isc_socketmgr_t *manager, unsigned int *nsockp) { REQUIRE(VALID_MANAGER(manager)); REQUIRE(nsockp != NULL); @@ -2655,8 +2597,7 @@ isc_socketmgr_getmaxsockets(isc_socketmgr_t *manager, unsigned int *nsockp) } void -isc_socketmgr_setstats(isc_socketmgr_t *manager, isc_stats_t *stats) -{ +isc_socketmgr_setstats(isc_socketmgr_t *manager, isc_stats_t *stats) { REQUIRE(VALID_MANAGER(manager)); REQUIRE(ISC_LIST_EMPTY(manager->socklist)); REQUIRE(manager->stats == NULL); @@ -2666,8 +2607,7 @@ isc_socketmgr_setstats(isc_socketmgr_t *manager, isc_stats_t *stats) } void -isc_socketmgr_destroy(isc_socketmgr_t **managerp) -{ +isc_socketmgr_destroy(isc_socketmgr_t **managerp) { isc_socketmgr_t *manager; /* @@ -2722,8 +2662,7 @@ isc_socketmgr_destroy(isc_socketmgr_t **managerp) static void queue_receive_event(isc_socket_t *sock, isc_task_t *task, - isc_socketevent_t *dev) -{ + isc_socketevent_t *dev) { isc_task_t *ntask = NULL; isc_task_attach(task, &ntask); @@ -2748,8 +2687,7 @@ queue_receive_event(isc_socket_t *sock, isc_task_t *task, */ static isc_result_t socket_recv(isc_socket_t *sock, isc_socketevent_t *dev, isc_task_t *task, - unsigned int flags) -{ + unsigned int flags) { isc_result_t result = ISC_R_SUCCESS; dev->ev_sender = task; @@ -2782,11 +2720,10 @@ socket_recv(isc_socket_t *sock, isc_socketevent_t *dev, isc_task_t *task, isc_result_t isc_socket_recv(isc_socket_t *sock, isc_region_t *region, unsigned int minimum, - isc_task_t *task, isc_taskaction_t action, void *arg) -{ + isc_task_t *task, isc_taskaction_t action, void *arg) { isc_socketevent_t *dev; - isc_socketmgr_t * manager; - isc_result_t ret; + isc_socketmgr_t *manager; + isc_result_t ret; REQUIRE(VALID_SOCKET(sock)); LOCK(&sock->lock); @@ -2820,8 +2757,8 @@ isc_socket_recv(isc_socket_t *sock, isc_region_t *region, unsigned int minimum, isc_result_t isc_socket_recv2(isc_socket_t *sock, isc_region_t *region, unsigned int minimum, - isc_task_t *task, isc_socketevent_t *event, unsigned int flags) -{ + isc_task_t *task, isc_socketevent_t *event, + unsigned int flags) { isc_result_t ret; REQUIRE(VALID_SOCKET(sock)); @@ -2867,12 +2804,11 @@ isc_socket_recv2(isc_socket_t *sock, isc_region_t *region, unsigned int minimum, static isc_result_t socket_send(isc_socket_t *sock, isc_socketevent_t *dev, isc_task_t *task, const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, - unsigned int flags) -{ - int io_state; - int send_errno = 0; - int cc = 0; - isc_task_t * ntask = NULL; + unsigned int flags) { + int io_state; + int send_errno = 0; + int cc = 0; + isc_task_t *ntask = NULL; isc_result_t result = ISC_R_SUCCESS; dev->ev_sender = task; @@ -2930,8 +2866,7 @@ socket_send(isc_socket_t *sock, isc_socketevent_t *dev, isc_task_t *task, isc_result_t isc_socket_send(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, - isc_taskaction_t action, void *arg) -{ + isc_taskaction_t action, void *arg) { /* * REQUIRE() checking is performed in isc_socket_sendto(). */ @@ -2941,11 +2876,10 @@ isc_socket_send(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, isc_result_t isc_socket_sendto(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, isc_taskaction_t action, void *arg, - const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo) -{ + const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo) { isc_socketevent_t *dev; - isc_socketmgr_t * manager; - isc_result_t ret; + isc_socketmgr_t *manager; + isc_result_t ret; REQUIRE(VALID_SOCKET(sock)); @@ -2984,8 +2918,7 @@ isc_socket_sendto(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, isc_result_t isc_socket_sendto2(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, const isc_sockaddr_t *address, struct in6_pktinfo *pktinfo, - isc_socketevent_t *event, unsigned int flags) -{ + isc_socketevent_t *event, unsigned int flags) { isc_result_t ret; REQUIRE(VALID_SOCKET(sock)); @@ -3018,11 +2951,10 @@ isc_socket_sendto2(isc_socket_t *sock, isc_region_t *region, isc_task_t *task, isc_result_t isc_socket_bind(isc_socket_t *sock, const isc_sockaddr_t *sockaddr, - isc_socket_options_t options) -{ - int bind_errno; + isc_socket_options_t options) { + int bind_errno; char strbuf[ISC_STRERRORSIZE]; - int on = 1; + int on = 1; REQUIRE(VALID_SOCKET(sock)); LOCK(&sock->lock); @@ -3049,7 +2981,8 @@ isc_socket_bind(isc_socket_t *sock, const isc_sockaddr_t *sockaddr, if ((options & ISC_SOCKET_REUSEADDRESS) != 0 && isc_sockaddr_getport(sockaddr) != (in_port_t)0 && setsockopt(sock->fd, SOL_SOCKET, SO_REUSEADDR, (char *)&on, - sizeof(on)) < 0) { + sizeof(on)) < 0) + { UNEXPECTED_ERROR(__FILE__, __LINE__, "setsockopt(%d) failed", sock->fd); /* Press on... */ @@ -3082,8 +3015,7 @@ isc_socket_bind(isc_socket_t *sock, const isc_sockaddr_t *sockaddr, } isc_result_t -isc_socket_filter(isc_socket_t *sock, const char *filter) -{ +isc_socket_filter(isc_socket_t *sock, const char *filter) { UNUSED(sock); UNUSED(filter); @@ -3102,8 +3034,7 @@ isc_socket_filter(isc_socket_t *sock, const char *filter) * as well keep things simple rather than having to track them. */ isc_result_t -isc_socket_listen(isc_socket_t *sock, unsigned int backlog) -{ +isc_socket_listen(isc_socket_t *sock, unsigned int backlog) { char strbuf[ISC_STRERRORSIZE]; #if defined(ENABLE_TCP_FASTOPEN) && defined(TCP_FASTOPEN) char on = 1; @@ -3163,14 +3094,13 @@ isc_socket_listen(isc_socket_t *sock, unsigned int backlog) */ isc_result_t isc_socket_accept(isc_socket_t *sock, isc_task_t *task, isc_taskaction_t action, - void *arg) -{ + void *arg) { isc_socket_newconnev_t *adev; - isc_socketmgr_t * manager; - isc_task_t * ntask = NULL; - isc_socket_t * nsock; - isc_result_t result; - IoCompletionInfo * lpo; + isc_socketmgr_t *manager; + isc_task_t *ntask = NULL; + isc_socket_t *nsock; + isc_result_t result; + IoCompletionInfo *lpo; REQUIRE(VALID_SOCKET(sock)); @@ -3277,14 +3207,13 @@ isc_socket_accept(isc_socket_t *sock, isc_task_t *task, isc_taskaction_t action, isc_result_t isc_socket_connect(isc_socket_t *sock, const isc_sockaddr_t *addr, - isc_task_t *task, isc_taskaction_t action, void *arg) -{ - char strbuf[ISC_STRERRORSIZE]; + isc_task_t *task, isc_taskaction_t action, void *arg) { + char strbuf[ISC_STRERRORSIZE]; isc_socket_connev_t *cdev; - isc_task_t * ntask = NULL; - isc_socketmgr_t * manager; - IoCompletionInfo * lpo; - int bind_errno; + isc_task_t *ntask = NULL; + isc_socketmgr_t *manager; + IoCompletionInfo *lpo; + int bind_errno; REQUIRE(VALID_SOCKET(sock)); REQUIRE(addr != NULL); @@ -3403,8 +3332,7 @@ isc_socket_connect(isc_socket_t *sock, const isc_sockaddr_t *addr, } isc_result_t -isc_socket_getpeername(isc_socket_t *sock, isc_sockaddr_t *addressp) -{ +isc_socket_getpeername(isc_socket_t *sock, isc_sockaddr_t *addressp) { isc_result_t result; REQUIRE(VALID_SOCKET(sock)); @@ -3434,11 +3362,10 @@ isc_socket_getpeername(isc_socket_t *sock, isc_sockaddr_t *addressp) } isc_result_t -isc_socket_getsockname(isc_socket_t *sock, isc_sockaddr_t *addressp) -{ - socklen_t len; +isc_socket_getsockname(isc_socket_t *sock, isc_sockaddr_t *addressp) { + socklen_t len; isc_result_t result; - char strbuf[ISC_STRERRORSIZE]; + char strbuf[ISC_STRERRORSIZE]; REQUIRE(VALID_SOCKET(sock)); REQUIRE(addressp != NULL); @@ -3481,8 +3408,7 @@ out: * queued for task "task" of type "how". "how" is a bitmask. */ void -isc_socket_cancel(isc_socket_t *sock, isc_task_t *task, unsigned int how) -{ +isc_socket_cancel(isc_socket_t *sock, isc_task_t *task, unsigned int how) { REQUIRE(VALID_SOCKET(sock)); /* @@ -3518,7 +3444,7 @@ isc_socket_cancel(isc_socket_t *sock, isc_task_t *task, unsigned int how) if ((how & ISC_SOCKCANCEL_RECV) != 0) { isc_socketevent_t *dev; isc_socketevent_t *next; - isc_task_t * current_task; + isc_task_t *current_task; dev = ISC_LIST_HEAD(sock->recv_list); while (dev != NULL) { @@ -3536,7 +3462,7 @@ isc_socket_cancel(isc_socket_t *sock, isc_task_t *task, unsigned int how) if ((how & ISC_SOCKCANCEL_SEND) != 0) { isc_socketevent_t *dev; isc_socketevent_t *next; - isc_task_t * current_task; + isc_task_t *current_task; dev = ISC_LIST_HEAD(sock->send_list); @@ -3556,7 +3482,7 @@ isc_socket_cancel(isc_socket_t *sock, isc_task_t *task, unsigned int how) !ISC_LIST_EMPTY(sock->accept_list)) { isc_socket_newconnev_t *dev; isc_socket_newconnev_t *next; - isc_task_t * current_task; + isc_task_t *current_task; dev = ISC_LIST_HEAD(sock->accept_list); while (dev != NULL) { @@ -3580,10 +3506,11 @@ isc_socket_cancel(isc_socket_t *sock, isc_task_t *task, unsigned int how) how &= ~ISC_SOCKCANCEL_ACCEPT; if (((how & ISC_SOCKCANCEL_CONNECT) != 0) && - !ISC_LIST_EMPTY(sock->connect_list)) { + !ISC_LIST_EMPTY(sock->connect_list)) + { isc_socket_connev_t *dev; isc_socket_connev_t *next; - isc_task_t * current_task; + isc_task_t *current_task; INSIST(sock->pending_connect); @@ -3609,8 +3536,7 @@ isc_socket_cancel(isc_socket_t *sock, isc_task_t *task, unsigned int how) } isc_sockettype_t -isc_socket_gettype(isc_socket_t *sock) -{ +isc_socket_gettype(isc_socket_t *sock) { isc_sockettype_t type; REQUIRE(VALID_SOCKET(sock)); @@ -3631,8 +3557,7 @@ isc_socket_gettype(isc_socket_t *sock) } void -isc_socket_ipv6only(isc_socket_t *sock, bool yes) -{ +isc_socket_ipv6only(isc_socket_t *sock, bool yes) { #if defined(IPV6_V6ONLY) int onoff = yes ? 1 : 0; #else /* if defined(IPV6_V6ONLY) */ @@ -3650,8 +3575,7 @@ isc_socket_ipv6only(isc_socket_t *sock, bool yes) } void -isc_socket_dscp(isc_socket_t *sock, isc_dscp_t dscp) -{ +isc_socket_dscp(isc_socket_t *sock, isc_dscp_t dscp) { #if !defined(IP_TOS) && !defined(IPV6_TCLASS) UNUSED(dscp); #else /* if !defined(IP_TOS) && !defined(IPV6_TCLASS) */ @@ -3680,16 +3604,14 @@ isc_socket_dscp(isc_socket_t *sock, isc_dscp_t dscp) } void -isc_socket_cleanunix(const isc_sockaddr_t *addr, bool active) -{ +isc_socket_cleanunix(const isc_sockaddr_t *addr, bool active) { UNUSED(addr); UNUSED(active); } isc_result_t isc_socket_permunix(const isc_sockaddr_t *addr, uint32_t perm, uint32_t owner, - uint32_t group) -{ + uint32_t group) { UNUSED(addr); UNUSED(perm); UNUSED(owner); @@ -3698,8 +3620,7 @@ isc_socket_permunix(const isc_sockaddr_t *addr, uint32_t perm, uint32_t owner, } void -isc_socket_setname(isc_socket_t *socket, const char *name, void *tag) -{ +isc_socket_setname(isc_socket_t *socket, const char *name, void *tag) { /* * Name 'socket'. */ @@ -3713,48 +3634,41 @@ isc_socket_setname(isc_socket_t *socket, const char *name, void *tag) } const char * -isc_socket_getname(isc_socket_t *socket) -{ +isc_socket_getname(isc_socket_t *socket) { return (socket->name); } void * -isc_socket_gettag(isc_socket_t *socket) -{ +isc_socket_gettag(isc_socket_t *socket) { return (socket->tag); } int -isc_socket_getfd(isc_socket_t *socket) -{ +isc_socket_getfd(isc_socket_t *socket) { return ((short)socket->fd); } void -isc_socketmgr_setreserved(isc_socketmgr_t *manager, uint32_t reserved) -{ +isc_socketmgr_setreserved(isc_socketmgr_t *manager, uint32_t reserved) { UNUSED(manager); UNUSED(reserved); } isc_socketevent_t * isc_socket_socketevent(isc_mem_t *mctx, void *sender, isc_eventtype_t eventtype, - isc_taskaction_t action, void *arg) -{ + isc_taskaction_t action, void *arg) { return (allocate_socketevent(mctx, sender, eventtype, action, arg)); } bool -isc_socket_hasreuseport() -{ +isc_socket_hasreuseport() { return (false); } #ifdef HAVE_LIBXML2 static const char * -_socktype(isc_sockettype_t type) -{ +_socktype(isc_sockettype_t type) { switch (type) { case isc_sockettype_udp: return ("udp"); @@ -3774,13 +3688,12 @@ _socktype(isc_sockettype_t type) goto error; \ } while (0) int -isc_socketmgr_renderxml(isc_socketmgr_t *mgr, void *writer0) -{ - isc_socket_t * sock = NULL; - char peerbuf[ISC_SOCKADDR_FORMATSIZE]; - isc_sockaddr_t addr; - socklen_t len; - int xmlrc; +isc_socketmgr_renderxml(isc_socketmgr_t *mgr, void *writer0) { + isc_socket_t *sock = NULL; + char peerbuf[ISC_SOCKADDR_FORMATSIZE]; + isc_sockaddr_t addr; + socklen_t len; + int xmlrc; xmlTextWriterPtr writer = (xmlTextWriterPtr)writer0; LOCK(&mgr->lock); @@ -3904,15 +3817,14 @@ error: } while (0) isc_result_t -isc_socketmgr_renderjson(isc_socketmgr_t *mgr, void *stats0) -{ - isc_result_t result = ISC_R_SUCCESS; - isc_socket_t * sock = NULL; - char peerbuf[ISC_SOCKADDR_FORMATSIZE]; +isc_socketmgr_renderjson(isc_socketmgr_t *mgr, void *stats0) { + isc_result_t result = ISC_R_SUCCESS; + isc_socket_t *sock = NULL; + char peerbuf[ISC_SOCKADDR_FORMATSIZE]; isc_sockaddr_t addr; - socklen_t len; - json_object * obj, *array = json_object_new_array(); - json_object * stats = (json_object *)stats; + socklen_t len; + json_object *obj, *array = json_object_new_array(); + json_object *stats = (json_object *)stats; CHECKMEM(array); @@ -3927,7 +3839,7 @@ isc_socketmgr_renderjson(isc_socketmgr_t *mgr, void *stats0) sock = ISC_LIST_HEAD(mgr->socklist); while (sock != NULL) { json_object *states, *entry = json_object_new_object(); - char buf[255]; + char buf[255]; CHECKMEM(entry); json_object_array_add(array, entry); @@ -4040,8 +3952,7 @@ error: #endif /* HAVE_JSON_C */ isc_result_t -isc_socketmgr_createinctx(isc_mem_t *mctx, isc_socketmgr_t **managerp) -{ +isc_socketmgr_createinctx(isc_mem_t *mctx, isc_socketmgr_t **managerp) { isc_result_t result; result = isc_socketmgr_create(mctx, managerp); @@ -4050,8 +3961,7 @@ isc_socketmgr_createinctx(isc_mem_t *mctx, isc_socketmgr_t **managerp) } void -isc_socketmgr_maxudp(isc_socketmgr_t *manager, unsigned int maxudp) -{ +isc_socketmgr_maxudp(isc_socketmgr_t *manager, unsigned int maxudp) { REQUIRE(VALID_MANAGER(manager)); manager->maxudp = maxudp; diff --git a/lib/isc/win32/stdio.c b/lib/isc/win32/stdio.c index cf5431ad67..0b214437a4 100644 --- a/lib/isc/win32/stdio.c +++ b/lib/isc/win32/stdio.c @@ -21,8 +21,7 @@ #include isc_result_t -isc_stdio_open(const char *filename, const char *mode, FILE **fp) -{ +isc_stdio_open(const char *filename, const char *mode, FILE **fp) { FILE *f; f = fopen(filename, mode); @@ -34,8 +33,7 @@ isc_stdio_open(const char *filename, const char *mode, FILE **fp) } isc_result_t -isc_stdio_close(FILE *f) -{ +isc_stdio_close(FILE *f) { int r; r = fclose(f); @@ -47,8 +45,7 @@ isc_stdio_close(FILE *f) } isc_result_t -isc_stdio_seek(FILE *f, off_t offset, int whence) -{ +isc_stdio_seek(FILE *f, off_t offset, int whence) { int r; #ifndef _WIN64 @@ -64,8 +61,7 @@ isc_stdio_seek(FILE *f, off_t offset, int whence) } isc_result_t -isc_stdio_tell(FILE *f, off_t *offsetp) -{ +isc_stdio_tell(FILE *f, off_t *offsetp) { #ifndef _WIN64 long r; #else /* ifndef _WIN64 */ @@ -88,10 +84,9 @@ isc_stdio_tell(FILE *f, off_t *offsetp) } isc_result_t -isc_stdio_read(void *ptr, size_t size, size_t nmemb, FILE *f, size_t *nret) -{ +isc_stdio_read(void *ptr, size_t size, size_t nmemb, FILE *f, size_t *nret) { isc_result_t result = ISC_R_SUCCESS; - size_t r; + size_t r; clearerr(f); r = fread(ptr, size, nmemb, f); @@ -110,10 +105,9 @@ isc_stdio_read(void *ptr, size_t size, size_t nmemb, FILE *f, size_t *nret) isc_result_t isc_stdio_write(const void *ptr, size_t size, size_t nmemb, FILE *f, - size_t *nret) -{ + size_t *nret) { isc_result_t result = ISC_R_SUCCESS; - size_t r; + size_t r; clearerr(f); r = fwrite(ptr, size, nmemb, f); @@ -127,8 +121,7 @@ isc_stdio_write(const void *ptr, size_t size, size_t nmemb, FILE *f, } isc_result_t -isc_stdio_flush(FILE *f) -{ +isc_stdio_flush(FILE *f) { int r; r = fflush(f); @@ -140,10 +133,9 @@ isc_stdio_flush(FILE *f) } isc_result_t -isc_stdio_sync(FILE *f) -{ +isc_stdio_sync(FILE *f) { struct _stat buf; - int r; + int r; if (_fstat(_fileno(f), &buf) != 0) { return (isc__errno2result(errno)); diff --git a/lib/isc/win32/stdtime.c b/lib/isc/win32/stdtime.c index de7cf2aade..55bd123952 100644 --- a/lib/isc/win32/stdtime.c +++ b/lib/isc/win32/stdtime.c @@ -16,8 +16,7 @@ #include void -isc_stdtime_get(isc_stdtime_t *t) -{ +isc_stdtime_get(isc_stdtime_t *t) { /* * Set 't' to the number of seconds past 00:00:00 UTC, January 1, 1970. */ diff --git a/lib/isc/win32/syslog.c b/lib/isc/win32/syslog.c index 0a1a1ecef9..645fc3b8c4 100644 --- a/lib/isc/win32/syslog.c +++ b/lib/isc/win32/syslog.c @@ -21,11 +21,11 @@ #include static HANDLE hAppLog = NULL; -static FILE * log_stream; -static int debug_level = 0; +static FILE *log_stream; +static int debug_level = 0; static struct dsn_c_pvt_sfnt { - int val; + int val; const char *strval; } facilities[] = { { LOG_KERN, "kern" }, { LOG_USER, "user" }, @@ -60,8 +60,7 @@ static struct dsn_c_pvt_sfnt { { 0, NULL } }; isc_result_t -isc_syslog_facilityfromstring(const char *str, int *facilityp) -{ +isc_syslog_facilityfromstring(const char *str, int *facilityp) { int i; REQUIRE(str != NULL); @@ -80,11 +79,10 @@ isc_syslog_facilityfromstring(const char *str, int *facilityp) * Log to the NT Event Log */ void -syslog(int level, const char *fmt, ...) -{ +syslog(int level, const char *fmt, ...) { va_list ap; - char buf[1024]; - char * str[1]; + char buf[1024]; + char *str[1]; str[0] = buf; @@ -117,8 +115,7 @@ syslog(int level, const char *fmt, ...) * Initialize event logging */ void -openlog(const char *name, int flags, ...) -{ +openlog(const char *name, int flags, ...) { /* Get a handle to the Application event log */ hAppLog = RegisterEventSource(NULL, name); } @@ -129,8 +126,7 @@ openlog(const char *name, int flags, ...) * In fact if we failed then we would have nowhere to put the message */ void -closelog(void) -{ +closelog(void) { DeregisterEventSource(hAppLog); } @@ -138,8 +134,7 @@ closelog(void) * Keep event logging synced with the current debug level */ void -ModifyLogLevel(int level) -{ +ModifyLogLevel(int level) { debug_level = level; } @@ -148,8 +143,7 @@ ModifyLogLevel(int level) * Piggyback onto stream given. */ void -InitNTLogging(FILE *stream, int debug) -{ +InitNTLogging(FILE *stream, int debug) { log_stream = stream; ModifyLogLevel(debug); } @@ -160,9 +154,8 @@ InitNTLogging(FILE *stream, int debug) * circumstances. */ void -NTReportError(const char *name, const char *str) -{ - HANDLE hNTAppLog = NULL; +NTReportError(const char *name, const char *str) { + HANDLE hNTAppLog = NULL; const char *buf[1]; buf[0] = str; diff --git a/lib/isc/win32/syslog.h b/lib/isc/win32/syslog.h index 00fd2bf353..75bc2902c5 100644 --- a/lib/isc/win32/syslog.h +++ b/lib/isc/win32/syslog.h @@ -15,16 +15,16 @@ #include /* Constant definitions for openlog() */ -#define LOG_PID 1 +#define LOG_PID 1 #define LOG_CONS 2 /* NT event log does not support facility level */ -#define LOG_KERN 0 -#define LOG_USER 0 -#define LOG_MAIL 0 +#define LOG_KERN 0 +#define LOG_USER 0 +#define LOG_MAIL 0 #define LOG_DAEMON 0 -#define LOG_AUTH 0 +#define LOG_AUTH 0 #define LOG_SYSLOG 0 -#define LOG_LPR 0 +#define LOG_LPR 0 #define LOG_LOCAL0 0 #define LOG_LOCAL1 0 #define LOG_LOCAL2 0 @@ -34,14 +34,14 @@ #define LOG_LOCAL6 0 #define LOG_LOCAL7 0 -#define LOG_EMERG 0 /* system is unusable */ -#define LOG_ALERT 1 /* action must be taken immediately */ -#define LOG_CRIT 2 /* critical conditions */ -#define LOG_ERR 3 /* error conditions */ +#define LOG_EMERG 0 /* system is unusable */ +#define LOG_ALERT 1 /* action must be taken immediately */ +#define LOG_CRIT 2 /* critical conditions */ +#define LOG_ERR 3 /* error conditions */ #define LOG_WARNING 4 /* warning conditions */ -#define LOG_NOTICE 5 /* normal but signification condition */ -#define LOG_INFO 6 /* informational */ -#define LOG_DEBUG 7 /* debug-level messages */ +#define LOG_NOTICE 5 /* normal but signification condition */ +#define LOG_INFO 6 /* informational */ +#define LOG_DEBUG 7 /* debug-level messages */ void syslog(int level, const char *fmt, ...); diff --git a/lib/isc/win32/thread.c b/lib/isc/win32/thread.c index 442116b966..5e55bb60f6 100644 --- a/lib/isc/win32/thread.c +++ b/lib/isc/win32/thread.c @@ -17,8 +17,7 @@ void isc_thread_create(isc_threadfunc_t start, isc_threadarg_t arg, - isc_thread_t *threadp) -{ + isc_thread_t *threadp) { isc_thread_t thread; unsigned int id; @@ -36,8 +35,7 @@ isc_thread_create(isc_threadfunc_t start, isc_threadarg_t arg, } void -isc_thread_join(isc_thread_t thread, isc_threadresult_t *rp) -{ +isc_thread_join(isc_thread_t thread, isc_threadresult_t *rp) { DWORD result; result = WaitForSingleObject(thread, INFINITE); @@ -56,8 +54,7 @@ isc_thread_join(isc_thread_t thread, isc_threadresult_t *rp) } void -isc_thread_setconcurrency(unsigned int level) -{ +isc_thread_setconcurrency(unsigned int level) { /* * This is unnecessary on Win32 systems, but is here so that the * call exists @@ -65,15 +62,13 @@ isc_thread_setconcurrency(unsigned int level) } void -isc_thread_setname(isc_thread_t thread, const char *name) -{ +isc_thread_setname(isc_thread_t thread, const char *name) { UNUSED(thread); UNUSED(name); } isc_result_t -isc_thread_setaffinity(int cpu) -{ +isc_thread_setaffinity(int cpu) { /* no-op on Windows for now */ return (ISC_R_SUCCESS); } diff --git a/lib/isc/win32/time.c b/lib/isc/win32/time.c index deca723c71..b6ee1eac24 100644 --- a/lib/isc/win32/time.c +++ b/lib/isc/win32/time.c @@ -31,15 +31,15 @@ * While it is reasonably obvious that this makes the needed * conversion factor 10^7, it is coded this way for additional clarity. */ -#define NS_PER_S 1000000000 -#define NS_INTERVAL 100 +#define NS_PER_S 1000000000 +#define NS_INTERVAL 100 #define INTERVALS_PER_S (NS_PER_S / NS_INTERVAL) /*** *** Absolute Times ***/ -static const isc_time_t epoch = { { 0, 0 } }; +static const isc_time_t epoch = { { 0, 0 } }; LIBISC_EXTERNAL_DATA const isc_time_t *const isc_time_epoch = &epoch; /*** @@ -52,8 +52,7 @@ LIBISC_EXTERNAL_DATA const isc_interval_t *const isc_interval_zero = void isc_interval_set(isc_interval_t *i, unsigned int seconds, - unsigned int nanoseconds) -{ + unsigned int nanoseconds) { REQUIRE(i != NULL); REQUIRE(nanoseconds < NS_PER_S); @@ -65,8 +64,7 @@ isc_interval_set(isc_interval_t *i, unsigned int seconds, } bool -isc_interval_iszero(const isc_interval_t *i) -{ +isc_interval_iszero(const isc_interval_t *i) { REQUIRE(i != NULL); if (i->interval == 0) { return (true); @@ -76,10 +74,9 @@ isc_interval_iszero(const isc_interval_t *i) } void -isc_time_set(isc_time_t *t, unsigned int seconds, unsigned int nanoseconds) -{ - SYSTEMTIME epoch1970 = { 1970, 1, 4, 1, 0, 0, 0, 0 }; - FILETIME temp; +isc_time_set(isc_time_t *t, unsigned int seconds, unsigned int nanoseconds) { + SYSTEMTIME epoch1970 = { 1970, 1, 4, 1, 0, 0, 0, 0 }; + FILETIME temp; ULARGE_INTEGER i1; REQUIRE(t != NULL); @@ -100,8 +97,7 @@ isc_time_set(isc_time_t *t, unsigned int seconds, unsigned int nanoseconds) } void -isc_time_settoepoch(isc_time_t *t) -{ +isc_time_settoepoch(isc_time_t *t) { REQUIRE(t != NULL); t->absolute.dwLowDateTime = 0; @@ -109,8 +105,7 @@ isc_time_settoepoch(isc_time_t *t) } bool -isc_time_isepoch(const isc_time_t *t) -{ +isc_time_isepoch(const isc_time_t *t) { REQUIRE(t != NULL); if (t->absolute.dwLowDateTime == 0 && t->absolute.dwHighDateTime == 0) { @@ -121,8 +116,7 @@ isc_time_isepoch(const isc_time_t *t) } isc_result_t -isc_time_now(isc_time_t *t) -{ +isc_time_now(isc_time_t *t) { REQUIRE(t != NULL); GetSystemTimeAsFileTime(&t->absolute); @@ -131,8 +125,7 @@ isc_time_now(isc_time_t *t) } isc_result_t -isc_time_nowplusinterval(isc_time_t *t, const isc_interval_t *i) -{ +isc_time_nowplusinterval(isc_time_t *t, const isc_interval_t *i) { ULARGE_INTEGER i1; REQUIRE(t != NULL); @@ -157,16 +150,14 @@ isc_time_nowplusinterval(isc_time_t *t, const isc_interval_t *i) } int -isc_time_compare(const isc_time_t *t1, const isc_time_t *t2) -{ +isc_time_compare(const isc_time_t *t1, const isc_time_t *t2) { REQUIRE(t1 != NULL && t2 != NULL); return ((int)CompareFileTime(&t1->absolute, &t2->absolute)); } isc_result_t -isc_time_add(const isc_time_t *t, const isc_interval_t *i, isc_time_t *result) -{ +isc_time_add(const isc_time_t *t, const isc_interval_t *i, isc_time_t *result) { ULARGE_INTEGER i1; REQUIRE(t != NULL && i != NULL && result != NULL); @@ -189,8 +180,7 @@ isc_time_add(const isc_time_t *t, const isc_interval_t *i, isc_time_t *result) isc_result_t isc_time_subtract(const isc_time_t *t, const isc_interval_t *i, - isc_time_t *result) -{ + isc_time_t *result) { ULARGE_INTEGER i1; REQUIRE(t != NULL && i != NULL && result != NULL); @@ -212,10 +202,9 @@ isc_time_subtract(const isc_time_t *t, const isc_interval_t *i, } uint64_t -isc_time_microdiff(const isc_time_t *t1, const isc_time_t *t2) -{ +isc_time_microdiff(const isc_time_t *t1, const isc_time_t *t2) { ULARGE_INTEGER i1, i2; - LONGLONG i3; + LONGLONG i3; REQUIRE(t1 != NULL && t2 != NULL); @@ -241,12 +230,11 @@ isc_time_microdiff(const isc_time_t *t1, const isc_time_t *t2) } uint32_t -isc_time_seconds(const isc_time_t *t) -{ - SYSTEMTIME epoch1970 = { 1970, 1, 4, 1, 0, 0, 0, 0 }; - FILETIME temp; +isc_time_seconds(const isc_time_t *t) { + SYSTEMTIME epoch1970 = { 1970, 1, 4, 1, 0, 0, 0, 0 }; + FILETIME temp; ULARGE_INTEGER i1, i2; - LONGLONG i3; + LONGLONG i3; SystemTimeToFileTime(&epoch1970, &temp); @@ -265,8 +253,7 @@ isc_time_seconds(const isc_time_t *t) } isc_result_t -isc_time_secondsastimet(const isc_time_t *t, time_t *secondsp) -{ +isc_time_secondsastimet(const isc_time_t *t, time_t *secondsp) { time_t seconds; REQUIRE(t != NULL); @@ -286,8 +273,7 @@ isc_time_secondsastimet(const isc_time_t *t, time_t *secondsp) } uint32_t -isc_time_nanoseconds(const isc_time_t *t) -{ +isc_time_nanoseconds(const isc_time_t *t) { ULARGE_INTEGER i; i.LowPart = t->absolute.dwLowDateTime; @@ -296,19 +282,19 @@ isc_time_nanoseconds(const isc_time_t *t) } void -isc_time_formattimestamp(const isc_time_t *t, char *buf, unsigned int len) -{ - FILETIME localft; +isc_time_formattimestamp(const isc_time_t *t, char *buf, unsigned int len) { + FILETIME localft; SYSTEMTIME st; - char DateBuf[50]; - char TimeBuf[50]; + char DateBuf[50]; + char TimeBuf[50]; REQUIRE(t != NULL); REQUIRE(buf != NULL); REQUIRE(len > 0); if (FileTimeToLocalFileTime(&t->absolute, &localft) && - FileTimeToSystemTime(&localft, &st)) { + FileTimeToSystemTime(&localft, &st)) + { GetDateFormat(LOCALE_USER_DEFAULT, 0, &st, "dd-MMM-yyyy", DateBuf, 50); GetTimeFormat(LOCALE_USER_DEFAULT, @@ -323,11 +309,10 @@ isc_time_formattimestamp(const isc_time_t *t, char *buf, unsigned int len) } void -isc_time_formathttptimestamp(const isc_time_t *t, char *buf, unsigned int len) -{ +isc_time_formathttptimestamp(const isc_time_t *t, char *buf, unsigned int len) { SYSTEMTIME st; - char DateBuf[50]; - char TimeBuf[50]; + char DateBuf[50]; + char TimeBuf[50]; /* strftime() format: "%a, %d %b %Y %H:%M:%S GMT" */ @@ -349,11 +334,10 @@ isc_time_formathttptimestamp(const isc_time_t *t, char *buf, unsigned int len) } isc_result_t -isc_time_parsehttptimestamp(char *buf, isc_time_t *t) -{ +isc_time_parsehttptimestamp(char *buf, isc_time_t *t) { struct tm t_tm; - time_t when; - char * p; + time_t when; + char *p; REQUIRE(buf != NULL); REQUIRE(t != NULL); @@ -371,11 +355,10 @@ isc_time_parsehttptimestamp(char *buf, isc_time_t *t) } void -isc_time_formatISO8601L(const isc_time_t *t, char *buf, unsigned int len) -{ +isc_time_formatISO8601L(const isc_time_t *t, char *buf, unsigned int len) { SYSTEMTIME st; - char DateBuf[50]; - char TimeBuf[50]; + char DateBuf[50]; + char TimeBuf[50]; /* strtime() format: "%Y-%m-%dT%H:%M:%S" */ @@ -396,11 +379,10 @@ isc_time_formatISO8601L(const isc_time_t *t, char *buf, unsigned int len) } void -isc_time_formatISO8601Lms(const isc_time_t *t, char *buf, unsigned int len) -{ +isc_time_formatISO8601Lms(const isc_time_t *t, char *buf, unsigned int len) { SYSTEMTIME st; - char DateBuf[50]; - char TimeBuf[50]; + char DateBuf[50]; + char TimeBuf[50]; /* strtime() format: "%Y-%m-%dT%H:%M:%S.SSS" */ @@ -422,11 +404,10 @@ isc_time_formatISO8601Lms(const isc_time_t *t, char *buf, unsigned int len) } void -isc_time_formatISO8601(const isc_time_t *t, char *buf, unsigned int len) -{ +isc_time_formatISO8601(const isc_time_t *t, char *buf, unsigned int len) { SYSTEMTIME st; - char DateBuf[50]; - char TimeBuf[50]; + char DateBuf[50]; + char TimeBuf[50]; /* strtime() format: "%Y-%m-%dT%H:%M:%SZ" */ @@ -447,11 +428,10 @@ isc_time_formatISO8601(const isc_time_t *t, char *buf, unsigned int len) } void -isc_time_formatISO8601ms(const isc_time_t *t, char *buf, unsigned int len) -{ +isc_time_formatISO8601ms(const isc_time_t *t, char *buf, unsigned int len) { SYSTEMTIME st; - char DateBuf[50]; - char TimeBuf[50]; + char DateBuf[50]; + char TimeBuf[50]; /* strtime() format: "%Y-%m-%dT%H:%M:%S.SSSZ" */ @@ -473,11 +453,11 @@ isc_time_formatISO8601ms(const isc_time_t *t, char *buf, unsigned int len) } void -isc_time_formatshorttimestamp(const isc_time_t *t, char *buf, unsigned int len) -{ +isc_time_formatshorttimestamp(const isc_time_t *t, char *buf, + unsigned int len) { SYSTEMTIME st; - char DateBuf[50]; - char TimeBuf[50]; + char DateBuf[50]; + char TimeBuf[50]; /* strtime() format: "%Y%m%d%H%M%SSSS" */ diff --git a/lib/isc/win32/unistd.h b/lib/isc/win32/unistd.h index 4332b8fea8..aa68088ecf 100644 --- a/lib/isc/win32/unistd.h +++ b/lib/isc/win32/unistd.h @@ -10,7 +10,7 @@ */ /* None of these are defined in NT, so define them for our use */ -#define O_NONBLOCK 1 +#define O_NONBLOCK 1 #define PORT_NONBLOCK O_NONBLOCK /* diff --git a/lib/isc/win32/win32os.c b/lib/isc/win32/win32os.c index 14a2c7224d..c7435ff194 100644 --- a/lib/isc/win32/win32os.c +++ b/lib/isc/win32/win32os.c @@ -22,11 +22,10 @@ int isc_win32os_versioncheck(unsigned int major, unsigned int minor, - unsigned int spmajor, unsigned int spminor) -{ + unsigned int spmajor, unsigned int spminor) { OSVERSIONINFOEX osVer; - DWORD typeMask; - ULONGLONG conditionMask; + DWORD typeMask; + ULONGLONG conditionMask; memset(&osVer, 0, sizeof(OSVERSIONINFOEX)); osVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); @@ -56,10 +55,10 @@ isc_win32os_versioncheck(unsigned int major, unsigned int minor, /* Failed: retry with equal */ conditionMask = 0; - conditionMask = - VerSetConditionMask(conditionMask, VER_MAJORVERSION, VER_EQUAL); - conditionMask = - VerSetConditionMask(conditionMask, VER_MINORVERSION, VER_EQUAL); + conditionMask = VerSetConditionMask(conditionMask, VER_MAJORVERSION, + VER_EQUAL); + conditionMask = VerSetConditionMask(conditionMask, VER_MINORVERSION, + VER_EQUAL); conditionMask = VerSetConditionMask(conditionMask, VER_SERVICEPACKMAJOR, VER_EQUAL); conditionMask = VerSetConditionMask(conditionMask, VER_SERVICEPACKMINOR, @@ -73,13 +72,12 @@ isc_win32os_versioncheck(unsigned int major, unsigned int minor, #ifdef TESTVERSION int -main(int argc, char **argv) -{ +main(int argc, char **argv) { unsigned int major = 0; unsigned int minor = 0; unsigned int spmajor = 0; unsigned int spminor = 0; - int ret; + int ret; if (argc > 1) { --argc; diff --git a/lib/isc/xoshiro128starstar.c b/lib/isc/xoshiro128starstar.c index 7bf59227f0..88f9a9c7d1 100644 --- a/lib/isc/xoshiro128starstar.c +++ b/lib/isc/xoshiro128starstar.c @@ -37,14 +37,12 @@ ISC_THREAD_LOCAL uint32_t seed[4] = { 0 }; static inline uint32_t -rotl(const uint32_t x, int k) -{ +rotl(const uint32_t x, int k) { return ((x << k) | (x >> (32 - k))); } static inline uint32_t -next(void) -{ +next(void) { uint32_t result_starstar, t; result_starstar = rotl(seed[0] * 5, 7) * 9; diff --git a/lib/isccc/alist.c b/lib/isccc/alist.c index 2a38b2949c..1fd7c63d3e 100644 --- a/lib/isccc/alist.c +++ b/lib/isccc/alist.c @@ -40,15 +40,14 @@ #define CAR(s) (s)->value.as_dottedpair.car #define CDR(s) (s)->value.as_dottedpair.cdr -#define ALIST_TAG "*alist*" +#define ALIST_TAG "*alist*" #define MAX_INDENT 64 static char spaces[MAX_INDENT + 1] = " " " "; isccc_sexpr_t * -isccc_alist_create(void) -{ +isccc_alist_create(void) { isccc_sexpr_t *alist, *tag; tag = isccc_sexpr_fromstring(ALIST_TAG); @@ -65,8 +64,7 @@ isccc_alist_create(void) } bool -isccc_alist_alistp(isccc_sexpr_t *alist) -{ +isccc_alist_alistp(isccc_sexpr_t *alist) { isccc_sexpr_t *car; if (alist == NULL || alist->type != ISCCC_SEXPRTYPE_DOTTEDPAIR) { @@ -83,8 +81,7 @@ isccc_alist_alistp(isccc_sexpr_t *alist) } bool -isccc_alist_emptyp(isccc_sexpr_t *alist) -{ +isccc_alist_emptyp(isccc_sexpr_t *alist) { REQUIRE(isccc_alist_alistp(alist)); if (CDR(alist) == NULL) { @@ -94,16 +91,14 @@ isccc_alist_emptyp(isccc_sexpr_t *alist) } isccc_sexpr_t * -isccc_alist_first(isccc_sexpr_t *alist) -{ +isccc_alist_first(isccc_sexpr_t *alist) { REQUIRE(isccc_alist_alistp(alist)); return (CDR(alist)); } isccc_sexpr_t * -isccc_alist_assq(isccc_sexpr_t *alist, const char *key) -{ +isccc_alist_assq(isccc_sexpr_t *alist, const char *key) { isccc_sexpr_t *car, *caar; REQUIRE(isccc_alist_alistp(alist)); @@ -119,7 +114,8 @@ isccc_alist_assq(isccc_sexpr_t *alist, const char *key) INSIST(car->type == ISCCC_SEXPRTYPE_DOTTEDPAIR); caar = CAR(car); if (caar->type == ISCCC_SEXPRTYPE_STRING && - strcmp(caar->value.as_string, key) == 0) { + strcmp(caar->value.as_string, key) == 0) + { return (car); } alist = CDR(alist); @@ -129,8 +125,7 @@ isccc_alist_assq(isccc_sexpr_t *alist, const char *key) } void -isccc_alist_delete(isccc_sexpr_t *alist, const char *key) -{ +isccc_alist_delete(isccc_sexpr_t *alist, const char *key) { isccc_sexpr_t *car, *caar, *rest, *prev; REQUIRE(isccc_alist_alistp(alist)); @@ -143,7 +138,8 @@ isccc_alist_delete(isccc_sexpr_t *alist, const char *key) INSIST(car != NULL && car->type == ISCCC_SEXPRTYPE_DOTTEDPAIR); caar = CAR(car); if (caar->type == ISCCC_SEXPRTYPE_STRING && - strcmp(caar->value.as_string, key) == 0) { + strcmp(caar->value.as_string, key) == 0) + { CDR(prev) = CDR(rest); CDR(rest) = NULL; isccc_sexpr_free(&rest); @@ -155,8 +151,8 @@ isccc_alist_delete(isccc_sexpr_t *alist, const char *key) } isccc_sexpr_t * -isccc_alist_define(isccc_sexpr_t *alist, const char *key, isccc_sexpr_t *value) -{ +isccc_alist_define(isccc_sexpr_t *alist, const char *key, + isccc_sexpr_t *value) { isccc_sexpr_t *kv, *k, *elt; kv = isccc_alist_assq(alist, key); @@ -190,8 +186,8 @@ isccc_alist_define(isccc_sexpr_t *alist, const char *key, isccc_sexpr_t *value) } isccc_sexpr_t * -isccc_alist_definestring(isccc_sexpr_t *alist, const char *key, const char *str) -{ +isccc_alist_definestring(isccc_sexpr_t *alist, const char *key, + const char *str) { isccc_sexpr_t *v, *kv; v = isccc_sexpr_fromstring(str); @@ -208,8 +204,7 @@ isccc_alist_definestring(isccc_sexpr_t *alist, const char *key, const char *str) isccc_sexpr_t * isccc_alist_definebinary(isccc_sexpr_t *alist, const char *key, - isccc_region_t *r) -{ + isccc_region_t *r) { isccc_sexpr_t *v, *kv; v = isccc_sexpr_frombinary(r); @@ -225,8 +220,7 @@ isccc_alist_definebinary(isccc_sexpr_t *alist, const char *key, } isccc_sexpr_t * -isccc_alist_lookup(isccc_sexpr_t *alist, const char *key) -{ +isccc_alist_lookup(isccc_sexpr_t *alist, const char *key) { isccc_sexpr_t *kv; kv = isccc_alist_assq(alist, key); @@ -237,8 +231,7 @@ isccc_alist_lookup(isccc_sexpr_t *alist, const char *key) } isc_result_t -isccc_alist_lookupstring(isccc_sexpr_t *alist, const char *key, char **strp) -{ +isccc_alist_lookupstring(isccc_sexpr_t *alist, const char *key, char **strp) { isccc_sexpr_t *kv, *v; kv = isccc_alist_assq(alist, key); @@ -259,8 +252,7 @@ isccc_alist_lookupstring(isccc_sexpr_t *alist, const char *key, char **strp) isc_result_t isccc_alist_lookupbinary(isccc_sexpr_t *alist, const char *key, - isccc_region_t **r) -{ + isccc_region_t **r) { isccc_sexpr_t *kv, *v; kv = isccc_alist_assq(alist, key); @@ -280,8 +272,8 @@ isccc_alist_lookupbinary(isccc_sexpr_t *alist, const char *key, } void -isccc_alist_prettyprint(isccc_sexpr_t *sexpr, unsigned int indent, FILE *stream) -{ +isccc_alist_prettyprint(isccc_sexpr_t *sexpr, unsigned int indent, + FILE *stream) { isccc_sexpr_t *elt, *kv, *k, *v; if (isccc_alist_alistp(sexpr)) { diff --git a/lib/isccc/base64.c b/lib/isccc/base64.c index 8f92a45676..9b4eb2eba5 100644 --- a/lib/isccc/base64.c +++ b/lib/isccc/base64.c @@ -36,8 +36,7 @@ isc_result_t isccc_base64_encode(isccc_region_t *source, int wordlength, - const char *wordbreak, isccc_region_t *target) -{ + const char *wordbreak, isccc_region_t *target) { isc_region_t sr; isc_buffer_t tb; isc_result_t result; @@ -57,8 +56,7 @@ isccc_base64_encode(isccc_region_t *source, int wordlength, } isc_result_t -isccc_base64_decode(const char *cstr, isccc_region_t *target) -{ +isccc_base64_decode(const char *cstr, isccc_region_t *target) { isc_buffer_t b; isc_result_t result; diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c index d6c098feb3..5f4eef0804 100644 --- a/lib/isccc/cc.c +++ b/lib/isccc/cc.c @@ -46,7 +46,7 @@ #include #include -#define MAX_TAGS 256 +#define MAX_TAGS 256 #define DUP_LIFETIME 900 typedef isccc_sexpr_t *sexpr_ptr; @@ -94,18 +94,15 @@ 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) -{ - unsigned int len; +value_towire(isccc_sexpr_t *elt, isc_buffer_t **buffer) { + unsigned int len; isccc_region_t *vr; - isc_result_t result; + isc_result_t result; if (isccc_sexpr_binaryp(elt)) { vr = isccc_sexpr_tobinary(elt); @@ -196,12 +193,11 @@ value_towire(isccc_sexpr_t *elt, isc_buffer_t **buffer) } static isc_result_t -table_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer) -{ +table_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer) { isccc_sexpr_t *kv, *elt, *k, *v; - char * ks; - isc_result_t result; - unsigned int len; + char *ks; + isc_result_t result; + unsigned int len; for (elt = isccc_alist_first(alist); elt != NULL; elt = ISCCC_SEXPR_CDR(elt)) { @@ -233,8 +229,7 @@ table_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer) } static isc_result_t -list_towire(isccc_sexpr_t *list, isc_buffer_t **buffer) -{ +list_towire(isccc_sexpr_t *list, isc_buffer_t **buffer) { isc_result_t result; while (list != NULL) { @@ -250,14 +245,13 @@ list_towire(isccc_sexpr_t *list, isc_buffer_t **buffer) static isc_result_t sign(unsigned char *data, unsigned int length, unsigned char *hmac, - uint32_t algorithm, isccc_region_t *secret) -{ - isc_md_type_t md_type; - isc_result_t result; + uint32_t algorithm, isccc_region_t *secret) { + isc_md_type_t md_type; + isc_result_t result; isccc_region_t source, target; - unsigned char digest[ISC_MAX_MD_SIZE]; - unsigned int digestlen; - unsigned char digestb64[HSHA_LENGTH + 4]; + unsigned char digest[ISC_MAX_MD_SIZE]; + unsigned int digestlen; + unsigned char digestb64[HSHA_LENGTH + 4]; source.rstart = digest; @@ -308,15 +302,14 @@ sign(unsigned char *data, unsigned int length, unsigned char *hmac, isc_result_t isccc_cc_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer, uint32_t algorithm, - isccc_region_t *secret) -{ + isccc_region_t *secret) { unsigned int hmac_base, signed_base; isc_result_t result; - result = - isc_buffer_reserve(buffer, 4 + ((algorithm == ISCCC_ALG_HMACMD5) - ? sizeof(auth_hmd5) - : sizeof(auth_hsha))); + result = isc_buffer_reserve(buffer, + 4 + ((algorithm == ISCCC_ALG_HMACMD5) + ? sizeof(auth_hmd5) + : sizeof(auth_hsha))); if (result != ISC_R_SUCCESS) { return (ISC_R_NOSPACE); } @@ -373,16 +366,15 @@ isccc_cc_towire(isccc_sexpr_t *alist, isc_buffer_t **buffer, uint32_t algorithm, static isc_result_t verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, - uint32_t algorithm, isccc_region_t *secret) -{ - isc_md_type_t md_type; + uint32_t algorithm, isccc_region_t *secret) { + isc_md_type_t md_type; isccc_region_t source; isccc_region_t target; - isc_result_t result; + isc_result_t result; isccc_sexpr_t *_auth, *hmac; - unsigned char digest[ISC_MAX_MD_SIZE]; - unsigned int digestlen; - unsigned char digestb64[HSHA_LENGTH * 4]; + unsigned char digest[ISC_MAX_MD_SIZE]; + unsigned int digestlen; + unsigned char digestb64[HSHA_LENGTH * 4]; /* * Extract digest. @@ -447,7 +439,7 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, */ if (algorithm == ISCCC_ALG_HMACMD5) { isccc_region_t *region; - unsigned char * value; + unsigned char *value; region = isccc_sexpr_tobinary(hmac); if ((region->rend - region->rstart) != HMD5_LENGTH) { @@ -459,8 +451,8 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, } } else { isccc_region_t *region; - unsigned char * value; - uint32_t valalg; + unsigned char *value; + uint32_t valalg; region = isccc_sexpr_tobinary(hmac); @@ -482,21 +474,20 @@ 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) -{ - unsigned int msgtype; - uint32_t len; +value_fromwire(isccc_region_t *source, isccc_sexpr_t **valuep) { + unsigned int msgtype; + uint32_t len; isccc_sexpr_t *value; isccc_region_t active; - isc_result_t result; + isc_result_t result; if (REGION_SIZE(*source) < 1 + 4) { return (ISC_R_UNEXPECTEDEND); @@ -530,13 +521,12 @@ value_fromwire(isccc_region_t *source, isccc_sexpr_t **valuep) static isc_result_t table_fromwire(isccc_region_t *source, isccc_region_t *secret, - uint32_t algorithm, isccc_sexpr_t **alistp) -{ - char key[256]; - uint32_t len; - isc_result_t result; + uint32_t algorithm, isccc_sexpr_t **alistp) { + char key[256]; + uint32_t len; + isc_result_t result; isccc_sexpr_t *alist, *value; - bool first_tag; + bool first_tag; unsigned char *checksum_rstart; REQUIRE(alistp != NULL && *alistp == NULL); @@ -595,10 +585,9 @@ bad: } static isc_result_t -list_fromwire(isccc_region_t *source, isccc_sexpr_t **listp) -{ +list_fromwire(isccc_region_t *source, isccc_sexpr_t **listp) { isccc_sexpr_t *list, *value; - isc_result_t result; + isc_result_t result; list = NULL; while (!REGION_EMPTY(*source)) { @@ -622,10 +611,9 @@ list_fromwire(isccc_region_t *source, isccc_sexpr_t **listp) isc_result_t isccc_cc_fromwire(isccc_region_t *source, isccc_sexpr_t **alistp, - uint32_t algorithm, isccc_region_t *secret) -{ + uint32_t algorithm, isccc_region_t *secret) { unsigned int size; - uint32_t version; + uint32_t version; size = REGION_SIZE(*source); if (size < 4) { @@ -642,10 +630,9 @@ isccc_cc_fromwire(isccc_region_t *source, isccc_sexpr_t **alistp, static isc_result_t createmessage(uint32_t version, const char *from, const char *to, uint32_t serial, isccc_time_t now, isccc_time_t expires, - isccc_sexpr_t **alistp, bool want_expires) -{ + isccc_sexpr_t **alistp, bool want_expires) { isccc_sexpr_t *alist, *_ctrl, *_data; - isc_result_t result; + isc_result_t result; REQUIRE(alistp != NULL && *alistp == NULL); @@ -681,11 +668,12 @@ createmessage(uint32_t version, const char *from, const char *to, if (isccc_cc_defineuint32(_ctrl, "_ser", serial) == NULL || isccc_cc_defineuint32(_ctrl, "_tim", now) == NULL || (want_expires && - isccc_cc_defineuint32(_ctrl, "_exp", expires) == NULL)) { + isccc_cc_defineuint32(_ctrl, "_exp", expires) == NULL)) + { goto bad; } - if (from != NULL && - isccc_cc_definestring(_ctrl, "_frm", from) == NULL) { + if (from != NULL && isccc_cc_definestring(_ctrl, "_frm", from) == NULL) + { goto bad; } if (to != NULL && isccc_cc_definestring(_ctrl, "_to", to) == NULL) { @@ -705,27 +693,26 @@ bad: isc_result_t isccc_cc_createmessage(uint32_t version, const char *from, const char *to, uint32_t serial, isccc_time_t now, isccc_time_t expires, - isccc_sexpr_t **alistp) -{ + isccc_sexpr_t **alistp) { return (createmessage(version, from, to, serial, now, expires, alistp, true)); } isc_result_t -isccc_cc_createack(isccc_sexpr_t *message, bool ok, isccc_sexpr_t **ackp) -{ - char * _frm, *_to; - uint32_t serial; +isccc_cc_createack(isccc_sexpr_t *message, bool ok, isccc_sexpr_t **ackp) { + char *_frm, *_to; + uint32_t serial; isccc_sexpr_t *ack, *_ctrl; - isc_result_t result; - isccc_time_t t; + isc_result_t result; + isccc_time_t t; REQUIRE(ackp != NULL && *ackp == NULL); _ctrl = isccc_alist_lookup(message, "_ctrl"); if (!isccc_alist_alistp(_ctrl) || isccc_cc_lookupuint32(_ctrl, "_ser", &serial) != ISC_R_SUCCESS || - isccc_cc_lookupuint32(_ctrl, "_tim", &t) != ISC_R_SUCCESS) { + isccc_cc_lookupuint32(_ctrl, "_tim", &t) != ISC_R_SUCCESS) + { return (ISC_R_FAILURE); } /* @@ -765,8 +752,7 @@ bad: } bool -isccc_cc_isack(isccc_sexpr_t *message) -{ +isccc_cc_isack(isccc_sexpr_t *message) { isccc_sexpr_t *_ctrl; _ctrl = isccc_alist_lookup(message, "_ctrl"); @@ -780,8 +766,7 @@ isccc_cc_isack(isccc_sexpr_t *message) } bool -isccc_cc_isreply(isccc_sexpr_t *message) -{ +isccc_cc_isreply(isccc_sexpr_t *message) { isccc_sexpr_t *_ctrl; _ctrl = isccc_alist_lookup(message, "_ctrl"); @@ -796,12 +781,11 @@ isccc_cc_isreply(isccc_sexpr_t *message) isc_result_t isccc_cc_createresponse(isccc_sexpr_t *message, isccc_time_t now, - isccc_time_t expires, isccc_sexpr_t **alistp) -{ - char * _frm, *_to, *type = NULL; - uint32_t serial; + isccc_time_t expires, isccc_sexpr_t **alistp) { + char *_frm, *_to, *type = NULL; + uint32_t serial; isccc_sexpr_t *alist, *_ctrl, *_data; - isc_result_t result; + isc_result_t result; REQUIRE(alistp != NULL && *alistp == NULL); @@ -809,7 +793,8 @@ isccc_cc_createresponse(isccc_sexpr_t *message, isccc_time_t now, _data = isccc_alist_lookup(message, "_data"); if (!isccc_alist_alistp(_ctrl) || !isccc_alist_alistp(_data) || isccc_cc_lookupuint32(_ctrl, "_ser", &serial) != ISC_R_SUCCESS || - isccc_cc_lookupstring(_data, "type", &type) != ISC_R_SUCCESS) { + isccc_cc_lookupstring(_data, "type", &type) != ISC_R_SUCCESS) + { return (ISC_R_FAILURE); } /* @@ -842,7 +827,8 @@ isccc_cc_createresponse(isccc_sexpr_t *message, isccc_time_t now, } if (isccc_cc_definestring(_ctrl, "_rpl", "1") == NULL || - isccc_cc_definestring(_data, "type", type) == NULL) { + isccc_cc_definestring(_data, "type", type) == NULL) + { result = ISC_R_NOMEMORY; goto bad; } @@ -857,9 +843,8 @@ bad: } isccc_sexpr_t * -isccc_cc_definestring(isccc_sexpr_t *alist, const char *key, const char *str) -{ - size_t len; +isccc_cc_definestring(isccc_sexpr_t *alist, const char *key, const char *str) { + size_t len; isccc_region_t r; len = strlen(str); @@ -870,10 +855,9 @@ isccc_cc_definestring(isccc_sexpr_t *alist, const char *key, const char *str) } isccc_sexpr_t * -isccc_cc_defineuint32(isccc_sexpr_t *alist, const char *key, uint32_t i) -{ - char b[100]; - size_t len; +isccc_cc_defineuint32(isccc_sexpr_t *alist, const char *key, uint32_t i) { + char b[100]; + size_t len; isccc_region_t r; snprintf(b, sizeof(b), "%u", i); @@ -885,8 +869,7 @@ isccc_cc_defineuint32(isccc_sexpr_t *alist, const char *key, uint32_t i) } isc_result_t -isccc_cc_lookupstring(isccc_sexpr_t *alist, const char *key, char **strp) -{ +isccc_cc_lookupstring(isccc_sexpr_t *alist, const char *key, char **strp) { isccc_sexpr_t *kv, *v; REQUIRE(strp == NULL || *strp == NULL); @@ -908,8 +891,7 @@ isccc_cc_lookupstring(isccc_sexpr_t *alist, const char *key, char **strp) } isc_result_t -isccc_cc_lookupuint32(isccc_sexpr_t *alist, const char *key, uint32_t *uintp) -{ +isccc_cc_lookupuint32(isccc_sexpr_t *alist, const char *key, uint32_t *uintp) { isccc_sexpr_t *kv, *v; kv = isccc_alist_assq(alist, key); @@ -930,8 +912,8 @@ isccc_cc_lookupuint32(isccc_sexpr_t *alist, const char *key, uint32_t *uintp) } static void -symtab_undefine(char *key, unsigned int type, isccc_symvalue_t value, void *arg) -{ +symtab_undefine(char *key, unsigned int type, isccc_symvalue_t value, + void *arg) { UNUSED(type); UNUSED(value); UNUSED(arg); @@ -940,8 +922,7 @@ symtab_undefine(char *key, unsigned int type, isccc_symvalue_t value, void *arg) } static bool -symtab_clean(char *key, unsigned int type, isccc_symvalue_t value, void *arg) -{ +symtab_clean(char *key, unsigned int type, isccc_symvalue_t value, void *arg) { isccc_time_t *now; UNUSED(key); @@ -959,21 +940,18 @@ symtab_clean(char *key, unsigned int type, isccc_symvalue_t value, void *arg) } isc_result_t -isccc_cc_createsymtab(isccc_symtab_t **symtabp) -{ +isccc_cc_createsymtab(isccc_symtab_t **symtabp) { return (isccc_symtab_create(11897, symtab_undefine, NULL, false, symtabp)); } void -isccc_cc_cleansymtab(isccc_symtab_t *symtab, isccc_time_t now) -{ +isccc_cc_cleansymtab(isccc_symtab_t *symtab, isccc_time_t now) { isccc_symtab_foreach(symtab, symtab_clean, &now); } static bool -has_whitespace(const char *str) -{ +has_whitespace(const char *str) { char c; if (str == NULL) { @@ -989,21 +967,21 @@ has_whitespace(const char *str) isc_result_t isccc_cc_checkdup(isccc_symtab_t *symtab, isccc_sexpr_t *message, - isccc_time_t now) -{ - const char * _frm; - const char * _to; - char * _ser = NULL, *_tim = NULL, *tmp; - isc_result_t result; - char * key; - size_t len; + isccc_time_t now) { + const char *_frm; + const char *_to; + char *_ser = NULL, *_tim = NULL, *tmp; + isc_result_t result; + char *key; + size_t len; isccc_symvalue_t value; - isccc_sexpr_t * _ctrl; + isccc_sexpr_t *_ctrl; _ctrl = isccc_alist_lookup(message, "_ctrl"); if (!isccc_alist_alistp(_ctrl) || isccc_cc_lookupstring(_ctrl, "_ser", &_ser) != ISC_R_SUCCESS || - isccc_cc_lookupstring(_ctrl, "_tim", &_tim) != ISC_R_SUCCESS) { + isccc_cc_lookupstring(_ctrl, "_tim", &_tim) != ISC_R_SUCCESS) + { return (ISC_R_FAILURE); } @@ -1030,7 +1008,8 @@ isccc_cc_checkdup(isccc_symtab_t *symtab, isccc_sexpr_t *message, * we can write them to a file later. */ if (has_whitespace(_frm) || has_whitespace(_to) || - has_whitespace(_ser) || has_whitespace(_tim)) { + has_whitespace(_ser) || has_whitespace(_tim)) + { return (ISC_R_FAILURE); } len = strlen(_frm) + strlen(_to) + strlen(_ser) + strlen(_tim) + 4; diff --git a/lib/isccc/ccmsg.c b/lib/isccc/ccmsg.c index a4c066312c..612927d9eb 100644 --- a/lib/isccc/ccmsg.c +++ b/lib/isccc/ccmsg.c @@ -35,22 +35,19 @@ #include #include -#define CCMSG_MAGIC ISC_MAGIC('C', 'C', 'm', 's') +#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) -{ +recv_length(isc_task_t *task, isc_event_t *ev_in) { isc_socketevent_t *ev = (isc_socketevent_t *)ev_in; - isc_event_t * dev; - isccc_ccmsg_t * ccmsg = ev_in->ev_arg; - isc_region_t region; - isc_result_t result; + isc_event_t *dev; + isccc_ccmsg_t *ccmsg = ev_in->ev_arg; + isc_region_t region; + isc_result_t result; INSIST(VALID_CCMSG(ccmsg)); @@ -100,11 +97,10 @@ send_and_free: } static void -recv_message(isc_task_t *task, isc_event_t *ev_in) -{ +recv_message(isc_task_t *task, isc_event_t *ev_in) { isc_socketevent_t *ev = (isc_socketevent_t *)ev_in; - isc_event_t * dev; - isccc_ccmsg_t * ccmsg = ev_in->ev_arg; + isc_event_t *dev; + isccc_ccmsg_t *ccmsg = ev_in->ev_arg; (void)task; @@ -128,8 +124,7 @@ send_and_free: } void -isccc_ccmsg_init(isc_mem_t *mctx, isc_socket_t *sock, isccc_ccmsg_t *ccmsg) -{ +isccc_ccmsg_init(isc_mem_t *mctx, isc_socket_t *sock, isccc_ccmsg_t *ccmsg) { REQUIRE(mctx != NULL); REQUIRE(sock != NULL); REQUIRE(ccmsg != NULL); @@ -150,8 +145,7 @@ isccc_ccmsg_init(isc_mem_t *mctx, isc_socket_t *sock, isccc_ccmsg_t *ccmsg) } void -isccc_ccmsg_setmaxsize(isccc_ccmsg_t *ccmsg, unsigned int maxsize) -{ +isccc_ccmsg_setmaxsize(isccc_ccmsg_t *ccmsg, unsigned int maxsize) { REQUIRE(VALID_CCMSG(ccmsg)); ccmsg->maxsize = maxsize; @@ -159,8 +153,7 @@ isccc_ccmsg_setmaxsize(isccc_ccmsg_t *ccmsg, unsigned int maxsize) isc_result_t isccc_ccmsg_readmessage(isccc_ccmsg_t *ccmsg, isc_task_t *task, - isc_taskaction_t action, void *arg) -{ + isc_taskaction_t action, void *arg) { isc_result_t result; isc_region_t region; @@ -196,8 +189,7 @@ isccc_ccmsg_readmessage(isccc_ccmsg_t *ccmsg, isc_task_t *task, } void -isccc_ccmsg_cancelread(isccc_ccmsg_t *ccmsg) -{ +isccc_ccmsg_cancelread(isccc_ccmsg_t *ccmsg) { REQUIRE(VALID_CCMSG(ccmsg)); isc_socket_cancel(ccmsg->sock, NULL, ISC_SOCKCANCEL_RECV); @@ -219,8 +211,7 @@ isccc_ccmsg_freebuffer(isccc_ccmsg_t*ccmsg) { #endif /* if 0 */ void -isccc_ccmsg_invalidate(isccc_ccmsg_t *ccmsg) -{ +isccc_ccmsg_invalidate(isccc_ccmsg_t *ccmsg) { REQUIRE(VALID_CCMSG(ccmsg)); ccmsg->magic = 0; diff --git a/lib/isccc/include/isccc/cc.h b/lib/isccc/include/isccc/cc.h index 0623192379..69de6b6222 100644 --- a/lib/isccc/include/isccc/cc.h +++ b/lib/isccc/include/isccc/cc.h @@ -40,9 +40,9 @@ ISC_LANG_BEGINDECLS /*% from lib/dns/include/dst/dst.h */ -#define ISCCC_ALG_UNKNOWN 0 -#define ISCCC_ALG_HMACMD5 157 -#define ISCCC_ALG_HMACSHA1 161 +#define ISCCC_ALG_UNKNOWN 0 +#define ISCCC_ALG_HMACMD5 157 +#define ISCCC_ALG_HMACSHA1 161 #define ISCCC_ALG_HMACSHA224 162 #define ISCCC_ALG_HMACSHA256 163 #define ISCCC_ALG_HMACSHA384 164 diff --git a/lib/isccc/include/isccc/events.h b/lib/isccc/include/isccc/events.h index a1493845fc..32861d13cb 100644 --- a/lib/isccc/include/isccc/events.h +++ b/lib/isccc/include/isccc/events.h @@ -37,6 +37,6 @@ #define ISCCC_EVENT_CCMSG (ISC_EVENTCLASS_ISCCC + 0) #define ISCCC_EVENT_FIRSTEVENT (ISC_EVENTCLASS_ISCCC + 0) -#define ISCCC_EVENT_LASTEVENT (ISC_EVENTCLASS_ISCCC + 65535) +#define ISCCC_EVENT_LASTEVENT (ISC_EVENTCLASS_ISCCC + 65535) #endif /* ISCCC_EVENTS_H */ diff --git a/lib/isccc/include/isccc/sexpr.h b/lib/isccc/include/isccc/sexpr.h index 777a968d55..896fe6b55b 100644 --- a/lib/isccc/include/isccc/sexpr.h +++ b/lib/isccc/include/isccc/sexpr.h @@ -53,11 +53,11 @@ struct isccc_sexpr { } value; }; -#define ISCCC_SEXPRTYPE_NONE 0x00 /*%< Illegal. */ -#define ISCCC_SEXPRTYPE_T 0x01 -#define ISCCC_SEXPRTYPE_STRING 0x02 +#define ISCCC_SEXPRTYPE_NONE 0x00 /*%< Illegal. */ +#define ISCCC_SEXPRTYPE_T 0x01 +#define ISCCC_SEXPRTYPE_STRING 0x02 #define ISCCC_SEXPRTYPE_DOTTEDPAIR 0x03 -#define ISCCC_SEXPRTYPE_BINARY 0x04 +#define ISCCC_SEXPRTYPE_BINARY 0x04 #define ISCCC_SEXPR_CAR(s) (s)->value.as_dottedpair.car #define ISCCC_SEXPR_CDR(s) (s)->value.as_dottedpair.cdr diff --git a/lib/isccc/include/isccc/symtype.h b/lib/isccc/include/isccc/symtype.h index 32178693a1..84efce4716 100644 --- a/lib/isccc/include/isccc/symtype.h +++ b/lib/isccc/include/isccc/symtype.h @@ -28,9 +28,9 @@ /*! \file isccc/symtype.h */ -#define ISCCC_SYMTYPE_ZONESTATS 0x0001 -#define ISCCC_SYMTYPE_CCDUP 0x0002 -#define ISCCC_SYMTYPE_TELLSERVICE 0x0003 +#define ISCCC_SYMTYPE_ZONESTATS 0x0001 +#define ISCCC_SYMTYPE_CCDUP 0x0002 +#define ISCCC_SYMTYPE_TELLSERVICE 0x0003 #define ISCCC_SYMTYPE_TELLRESPONSE 0x0004 #endif /* ISCCC_SYMTYPE_H */ diff --git a/lib/isccc/include/isccc/util.h b/lib/isccc/include/isccc/util.h index 3df6a50e1f..9a10fd5895 100644 --- a/lib/isccc/include/isccc/util.h +++ b/lib/isccc/include/isccc/util.h @@ -194,7 +194,7 @@ /* * Regions. */ -#define REGION_SIZE(r) ((unsigned int)((r).rend - (r).rstart)) +#define REGION_SIZE(r) ((unsigned int)((r).rend - (r).rstart)) #define REGION_EMPTY(r) ((r).rstart == (r).rend) #define REGION_FROMSTRING(r, s) \ do { \ diff --git a/lib/isccc/result.c b/lib/isccc/result.c index 37a2fb1642..5a918fc22a 100644 --- a/lib/isccc/result.c +++ b/lib/isccc/result.c @@ -49,8 +49,7 @@ static const char *ids[ISCCC_R_NRESULTS] = { static isc_once_t once = ISC_ONCE_INIT; static void -initialize_action(void) -{ +initialize_action(void) { isc_result_t result; result = isc_result_register(ISC_RESULTCLASS_ISCCC, ISCCC_R_NRESULTS, @@ -69,21 +68,18 @@ initialize_action(void) } static void -initialize(void) -{ +initialize(void) { RUNTIME_CHECK(isc_once_do(&once, initialize_action) == ISC_R_SUCCESS); } const char * -isccc_result_totext(isc_result_t result) -{ +isccc_result_totext(isc_result_t result) { initialize(); return (isc_result_totext(result)); } void -isccc_result_register(void) -{ +isccc_result_register(void) { initialize(); } diff --git a/lib/isccc/sexpr.c b/lib/isccc/sexpr.c index fdaef77644..ea95cb191f 100644 --- a/lib/isccc/sexpr.c +++ b/lib/isccc/sexpr.c @@ -42,8 +42,7 @@ static isccc_sexpr_t sexpr_t = { ISCCC_SEXPRTYPE_T, { NULL } }; #define CDR(s) (s)->value.as_dottedpair.cdr isccc_sexpr_t * -isccc_sexpr_cons(isccc_sexpr_t *car, isccc_sexpr_t *cdr) -{ +isccc_sexpr_cons(isccc_sexpr_t *car, isccc_sexpr_t *cdr) { isccc_sexpr_t *sexpr; sexpr = malloc(sizeof(*sexpr)); @@ -58,14 +57,12 @@ isccc_sexpr_cons(isccc_sexpr_t *car, isccc_sexpr_t *cdr) } isccc_sexpr_t * -isccc_sexpr_tconst(void) -{ +isccc_sexpr_tconst(void) { return (&sexpr_t); } isccc_sexpr_t * -isccc_sexpr_fromstring(const char *str) -{ +isccc_sexpr_fromstring(const char *str) { isccc_sexpr_t *sexpr; sexpr = malloc(sizeof(*sexpr)); @@ -83,10 +80,9 @@ isccc_sexpr_fromstring(const char *str) } isccc_sexpr_t * -isccc_sexpr_frombinary(const isccc_region_t *region) -{ +isccc_sexpr_frombinary(const isccc_region_t *region) { isccc_sexpr_t *sexpr; - unsigned int region_size; + unsigned int region_size; sexpr = malloc(sizeof(*sexpr)); if (sexpr == NULL) { @@ -106,8 +102,8 @@ isccc_sexpr_frombinary(const isccc_region_t *region) free(sexpr); return (NULL); } - sexpr->value.as_region.rend = - sexpr->value.as_region.rstart + region_size; + sexpr->value.as_region.rend = sexpr->value.as_region.rstart + + region_size; memmove(sexpr->value.as_region.rstart, region->rstart, region_size); /* * NUL terminate. @@ -118,8 +114,7 @@ isccc_sexpr_frombinary(const isccc_region_t *region) } void -isccc_sexpr_free(isccc_sexpr_t **sexprp) -{ +isccc_sexpr_free(isccc_sexpr_t **sexprp) { isccc_sexpr_t *sexpr; isccc_sexpr_t *item; @@ -150,8 +145,7 @@ isccc_sexpr_free(isccc_sexpr_t **sexprp) } static bool -printable(isccc_region_t *r) -{ +printable(isccc_region_t *r) { unsigned char *curr; curr = r->rstart; @@ -166,10 +160,9 @@ printable(isccc_region_t *r) } void -isccc_sexpr_print(isccc_sexpr_t *sexpr, FILE *stream) -{ +isccc_sexpr_print(isccc_sexpr_t *sexpr, FILE *stream) { isccc_sexpr_t *cdr; - unsigned int size, i; + unsigned int size, i; unsigned char *curr; if (sexpr == NULL) { @@ -220,40 +213,35 @@ isccc_sexpr_print(isccc_sexpr_t *sexpr, FILE *stream) } isccc_sexpr_t * -isccc_sexpr_car(isccc_sexpr_t *list) -{ +isccc_sexpr_car(isccc_sexpr_t *list) { REQUIRE(list->type == ISCCC_SEXPRTYPE_DOTTEDPAIR); return (CAR(list)); } isccc_sexpr_t * -isccc_sexpr_cdr(isccc_sexpr_t *list) -{ +isccc_sexpr_cdr(isccc_sexpr_t *list) { REQUIRE(list->type == ISCCC_SEXPRTYPE_DOTTEDPAIR); return (CDR(list)); } void -isccc_sexpr_setcar(isccc_sexpr_t *pair, isccc_sexpr_t *car) -{ +isccc_sexpr_setcar(isccc_sexpr_t *pair, isccc_sexpr_t *car) { REQUIRE(pair->type == ISCCC_SEXPRTYPE_DOTTEDPAIR); CAR(pair) = car; } void -isccc_sexpr_setcdr(isccc_sexpr_t *pair, isccc_sexpr_t *cdr) -{ +isccc_sexpr_setcdr(isccc_sexpr_t *pair, isccc_sexpr_t *cdr) { REQUIRE(pair->type == ISCCC_SEXPRTYPE_DOTTEDPAIR); CDR(pair) = cdr; } isccc_sexpr_t * -isccc_sexpr_addtolist(isccc_sexpr_t **l1p, isccc_sexpr_t *l2) -{ +isccc_sexpr_addtolist(isccc_sexpr_t **l1p, isccc_sexpr_t *l2) { isccc_sexpr_t *last, *elt, *l1; REQUIRE(l1p != NULL); @@ -277,8 +265,7 @@ isccc_sexpr_addtolist(isccc_sexpr_t **l1p, isccc_sexpr_t *l2) } bool -isccc_sexpr_listp(isccc_sexpr_t *sexpr) -{ +isccc_sexpr_listp(isccc_sexpr_t *sexpr) { if (sexpr == NULL || sexpr->type == ISCCC_SEXPRTYPE_DOTTEDPAIR) { return (true); } @@ -286,8 +273,7 @@ isccc_sexpr_listp(isccc_sexpr_t *sexpr) } bool -isccc_sexpr_emptyp(isccc_sexpr_t *sexpr) -{ +isccc_sexpr_emptyp(isccc_sexpr_t *sexpr) { if (sexpr == NULL) { return (true); } @@ -295,8 +281,7 @@ isccc_sexpr_emptyp(isccc_sexpr_t *sexpr) } bool -isccc_sexpr_stringp(isccc_sexpr_t *sexpr) -{ +isccc_sexpr_stringp(isccc_sexpr_t *sexpr) { if (sexpr != NULL && sexpr->type == ISCCC_SEXPRTYPE_STRING) { return (true); } @@ -304,8 +289,7 @@ isccc_sexpr_stringp(isccc_sexpr_t *sexpr) } bool -isccc_sexpr_binaryp(isccc_sexpr_t *sexpr) -{ +isccc_sexpr_binaryp(isccc_sexpr_t *sexpr) { if (sexpr != NULL && sexpr->type == ISCCC_SEXPRTYPE_BINARY) { return (true); } @@ -313,8 +297,7 @@ isccc_sexpr_binaryp(isccc_sexpr_t *sexpr) } char * -isccc_sexpr_tostring(isccc_sexpr_t *sexpr) -{ +isccc_sexpr_tostring(isccc_sexpr_t *sexpr) { REQUIRE(sexpr != NULL && (sexpr->type == ISCCC_SEXPRTYPE_STRING || sexpr->type == ISCCC_SEXPRTYPE_BINARY)); @@ -325,8 +308,7 @@ isccc_sexpr_tostring(isccc_sexpr_t *sexpr) } isccc_region_t * -isccc_sexpr_tobinary(isccc_sexpr_t *sexpr) -{ +isccc_sexpr_tobinary(isccc_sexpr_t *sexpr) { REQUIRE(sexpr != NULL && sexpr->type == ISCCC_SEXPRTYPE_BINARY); return (&sexpr->value.as_region); } diff --git a/lib/isccc/symtab.c b/lib/isccc/symtab.c index 87829cfe42..936125ec26 100644 --- a/lib/isccc/symtab.c +++ b/lib/isccc/symtab.c @@ -38,34 +38,33 @@ #include typedef struct elt { - char * key; - unsigned int type; + char *key; + unsigned int type; isccc_symvalue_t value; ISC_LINK(struct elt) link; } elt_t; typedef ISC_LIST(elt_t) eltlist_t; -#define SYMTAB_MAGIC ISC_MAGIC('S', 'y', 'm', 'T') +#define SYMTAB_MAGIC ISC_MAGIC('S', 'y', 'm', 'T') #define VALID_SYMTAB(st) ISC_MAGIC_VALID(st, SYMTAB_MAGIC) struct isccc_symtab { - unsigned int magic; - unsigned int size; - eltlist_t * table; + unsigned int magic; + unsigned int size; + eltlist_t *table; isccc_symtabundefaction_t undefine_action; - void * undefine_arg; - bool case_sensitive; + void *undefine_arg; + bool case_sensitive; }; isc_result_t -isccc_symtab_create(unsigned int size, +isccc_symtab_create(unsigned int size, isccc_symtabundefaction_t undefine_action, void *undefine_arg, bool case_sensitive, - isccc_symtab_t **symtabp) -{ + isccc_symtab_t **symtabp) { isccc_symtab_t *symtab; - unsigned int i; + unsigned int i; REQUIRE(symtabp != NULL && *symtabp == NULL); REQUIRE(size > 0); /* Should be prime. */ @@ -94,8 +93,7 @@ isccc_symtab_create(unsigned int size, } static inline void -free_elt(isccc_symtab_t *symtab, unsigned int bucket, elt_t *elt) -{ +free_elt(isccc_symtab_t *symtab, unsigned int bucket, elt_t *elt) { ISC_LIST_UNLINK(symtab->table[bucket], elt, link); if (symtab->undefine_action != NULL) { (symtab->undefine_action)(elt->key, elt->type, elt->value, @@ -105,11 +103,10 @@ free_elt(isccc_symtab_t *symtab, unsigned int bucket, elt_t *elt) } void -isccc_symtab_destroy(isccc_symtab_t **symtabp) -{ +isccc_symtab_destroy(isccc_symtab_t **symtabp) { isccc_symtab_t *symtab; - unsigned int i; - elt_t * elt, *nelt; + unsigned int i; + elt_t *elt, *nelt; REQUIRE(symtabp != NULL); symtab = *symtabp; @@ -129,12 +126,11 @@ isccc_symtab_destroy(isccc_symtab_t **symtabp) } static inline unsigned int -hash(const char *key, bool case_sensitive) -{ - const char * s; +hash(const char *key, bool case_sensitive) { + const char *s; unsigned int h = 0; unsigned int g; - int c; + int c; /* * P. J. Weinberger's hash function, adapted from p. 436 of @@ -185,10 +181,9 @@ hash(const char *key, bool case_sensitive) isc_result_t isccc_symtab_lookup(isccc_symtab_t *symtab, const char *key, unsigned int type, - isccc_symvalue_t *value) -{ + isccc_symvalue_t *value) { unsigned int bucket; - elt_t * elt; + elt_t *elt; REQUIRE(VALID_SYMTAB(symtab)); REQUIRE(key != NULL); @@ -208,10 +203,9 @@ isccc_symtab_lookup(isccc_symtab_t *symtab, const char *key, unsigned int type, isc_result_t isccc_symtab_define(isccc_symtab_t *symtab, char *key, unsigned int type, - isccc_symvalue_t value, isccc_symexists_t exists_policy) -{ + isccc_symvalue_t value, isccc_symexists_t exists_policy) { unsigned int bucket; - elt_t * elt; + elt_t *elt; REQUIRE(VALID_SYMTAB(symtab)); REQUIRE(key != NULL); @@ -252,10 +246,9 @@ isccc_symtab_define(isccc_symtab_t *symtab, char *key, unsigned int type, isc_result_t isccc_symtab_undefine(isccc_symtab_t *symtab, const char *key, - unsigned int type) -{ + unsigned int type) { unsigned int bucket; - elt_t * elt; + elt_t *elt; REQUIRE(VALID_SYMTAB(symtab)); REQUIRE(key != NULL); @@ -273,10 +266,9 @@ isccc_symtab_undefine(isccc_symtab_t *symtab, const char *key, void isccc_symtab_foreach(isccc_symtab_t *symtab, isccc_symtabforeachaction_t action, - void *arg) -{ + void *arg) { unsigned int i; - elt_t * elt, *nelt; + elt_t *elt, *nelt; REQUIRE(VALID_SYMTAB(symtab)); REQUIRE(action != NULL); diff --git a/lib/isccc/tests/result_test.c b/lib/isccc/tests/result_test.c index 1dd8d69899..2a86778cb0 100644 --- a/lib/isccc/tests/result_test.c +++ b/lib/isccc/tests/result_test.c @@ -29,9 +29,8 @@ * Check tables are populated. */ static void -tables(void **state) -{ - const char * str; +tables(void **state) { + const char *str; isc_result_t result; UNUSED(state); @@ -39,7 +38,8 @@ tables(void **state) isccc_result_register(); for (result = ISC_RESULTCLASS_ISCCC; - result < (ISC_RESULTCLASS_ISCCC + ISCCC_R_NRESULTS); result++) { + result < (ISC_RESULTCLASS_ISCCC + ISCCC_R_NRESULTS); result++) + { str = isc_result_toid(result); assert_non_null(str); assert_string_not_equal(str, "(result code text not " @@ -61,8 +61,7 @@ tables(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(tables), }; @@ -75,8 +74,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isccc/win32/DLLMain.c b/lib/isccc/win32/DLLMain.c index 69e68ca22a..e104b8e4f3 100644 --- a/lib/isccc/win32/DLLMain.c +++ b/lib/isccc/win32/DLLMain.c @@ -16,8 +16,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/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c index d482e4f38b..991f9377a7 100644 --- a/lib/isccfg/aclconf.c +++ b/lib/isccfg/aclconf.c @@ -35,8 +35,7 @@ static const char *geoip_dbnames[] = { #endif /* if defined(HAVE_GEOIP2) */ isc_result_t -cfg_aclconfctx_create(isc_mem_t *mctx, cfg_aclconfctx_t **ret) -{ +cfg_aclconfctx_create(isc_mem_t *mctx, cfg_aclconfctx_t **ret) { cfg_aclconfctx_t *actx; REQUIRE(mctx != NULL); @@ -59,8 +58,7 @@ cfg_aclconfctx_create(isc_mem_t *mctx, cfg_aclconfctx_t **ret) } void -cfg_aclconfctx_attach(cfg_aclconfctx_t *src, cfg_aclconfctx_t **dest) -{ +cfg_aclconfctx_attach(cfg_aclconfctx_t *src, cfg_aclconfctx_t **dest) { REQUIRE(src != NULL); REQUIRE(dest != NULL && *dest == NULL); @@ -69,8 +67,7 @@ cfg_aclconfctx_attach(cfg_aclconfctx_t *src, cfg_aclconfctx_t **dest) } void -cfg_aclconfctx_detach(cfg_aclconfctx_t **actxp) -{ +cfg_aclconfctx_detach(cfg_aclconfctx_t **actxp) { REQUIRE(actxp != NULL && *actxp != NULL); cfg_aclconfctx_t *actx = *actxp; *actxp = NULL; @@ -93,18 +90,17 @@ cfg_aclconfctx_detach(cfg_aclconfctx_t **actxp) * Find the definition of the named acl whose name is "name". */ static isc_result_t -get_acl_def(const cfg_obj_t *cctx, const char *name, const cfg_obj_t **ret) -{ - isc_result_t result; - const cfg_obj_t * acls = NULL; +get_acl_def(const cfg_obj_t *cctx, const char *name, const cfg_obj_t **ret) { + isc_result_t result; + const cfg_obj_t *acls = NULL; const cfg_listelt_t *elt; result = cfg_map_get(cctx, "acl", &acls); if (result != ISC_R_SUCCESS) { return (result); } - for (elt = cfg_list_first(acls); elt != NULL; - elt = cfg_list_next(elt)) { + for (elt = cfg_list_first(acls); elt != NULL; elt = cfg_list_next(elt)) + { const cfg_obj_t *acl = cfg_listelt_value(elt); const char *aclname = cfg_obj_asstring(cfg_tuple_get(acl, "nam" "e")); @@ -121,17 +117,17 @@ get_acl_def(const cfg_obj_t *cctx, const char *name, const cfg_obj_t **ret) static isc_result_t convert_named_acl(const cfg_obj_t *nameobj, const cfg_obj_t *cctx, isc_log_t *lctx, cfg_aclconfctx_t *ctx, isc_mem_t *mctx, - unsigned int nest_level, dns_acl_t **target) -{ - isc_result_t result; + unsigned int nest_level, dns_acl_t **target) { + isc_result_t result; const cfg_obj_t *cacl = NULL; - dns_acl_t * dacl; - dns_acl_t loop; - const char * aclname = cfg_obj_asstring(nameobj); + dns_acl_t *dacl; + dns_acl_t loop; + const char *aclname = cfg_obj_asstring(nameobj); /* Look for an already-converted version. */ for (dacl = ISC_LIST_HEAD(ctx->named_acl_cache); dacl != NULL; - dacl = ISC_LIST_NEXT(dacl, nextincache)) { + dacl = ISC_LIST_NEXT(dacl, nextincache)) + { /* cppcheck-suppress nullPointerRedundantCheck symbolName=dacl */ if (strcasecmp(aclname, dacl->name) == 0) { @@ -175,13 +171,12 @@ convert_named_acl(const cfg_obj_t *nameobj, const cfg_obj_t *cctx, static isc_result_t convert_keyname(const cfg_obj_t *keyobj, isc_log_t *lctx, isc_mem_t *mctx, - dns_name_t *dnsname) -{ - isc_result_t result; - isc_buffer_t buf; + dns_name_t *dnsname) { + isc_result_t result; + isc_buffer_t buf; dns_fixedname_t fixname; - unsigned int keylen; - const char * txtname = cfg_obj_asstring(keyobj); + unsigned int keylen; + const char *txtname = cfg_obj_asstring(keyobj); keylen = strlen(txtname); isc_buffer_constinit(&buf, txtname, keylen); @@ -209,11 +204,10 @@ convert_keyname(const cfg_obj_t *keyobj, isc_log_t *lctx, isc_mem_t *mctx, static isc_result_t count_acl_elements(const cfg_obj_t *caml, const cfg_obj_t *cctx, isc_log_t *lctx, cfg_aclconfctx_t *ctx, isc_mem_t *mctx, - uint32_t *count, bool *has_negative) -{ + uint32_t *count, bool *has_negative) { const cfg_listelt_t *elt; - isc_result_t result; - uint32_t n = 0; + isc_result_t result; + uint32_t n = 0; REQUIRE(count != NULL); @@ -221,8 +215,8 @@ count_acl_elements(const cfg_obj_t *caml, const cfg_obj_t *cctx, *has_negative = false; } - for (elt = cfg_list_first(caml); elt != NULL; - elt = cfg_list_next(elt)) { + for (elt = cfg_list_first(caml); elt != NULL; elt = cfg_list_next(elt)) + { const cfg_obj_t *ce = cfg_listelt_value(elt); /* might be a negated element, in which case get the value. */ @@ -239,7 +233,7 @@ count_acl_elements(const cfg_obj_t *caml, const cfg_obj_t *cctx, if (cfg_obj_istype(ce, &cfg_type_keyref)) { n++; } else if (cfg_obj_islist(ce)) { - bool negative; + bool negative; uint32_t sub; result = count_acl_elements(ce, cctx, lctx, ctx, mctx, &sub, &negative); @@ -259,7 +253,8 @@ count_acl_elements(const cfg_obj_t *caml, const cfg_obj_t *cctx, const char *name = cfg_obj_asstring(ce); if (strcasecmp(name, "localhost") == 0 || strcasecmp(name, "localnets") == 0 || - strcasecmp(name, "none") == 0) { + strcasecmp(name, "none") == 0) + { n++; } else if (strcasecmp(name, "any") != 0) { dns_acl_t *inneracl = NULL; @@ -290,8 +285,7 @@ count_acl_elements(const cfg_obj_t *caml, const cfg_obj_t *cctx, #if defined(HAVE_GEOIP2) static dns_geoip_subtype_t get_subtype(const cfg_obj_t *obj, isc_log_t *lctx, dns_geoip_subtype_t subtype, - const char *dbname) -{ + const char *dbname) { if (dbname == NULL) { return (subtype); } @@ -411,8 +405,7 @@ get_subtype(const cfg_obj_t *obj, isc_log_t *lctx, dns_geoip_subtype_t subtype, } static bool -geoip_can_answer(dns_aclelement_t *elt, cfg_aclconfctx_t *ctx) -{ +geoip_can_answer(dns_aclelement_t *elt, cfg_aclconfctx_t *ctx) { if (ctx->geoip == NULL) { return (true); } @@ -477,14 +470,13 @@ geoip_can_answer(dns_aclelement_t *elt, cfg_aclconfctx_t *ctx) static isc_result_t parse_geoip_element(const cfg_obj_t *obj, isc_log_t *lctx, - cfg_aclconfctx_t *ctx, dns_aclelement_t *dep) -{ - const cfg_obj_t * ge; - const char * dbname = NULL; - const char * stype = NULL, *search = NULL; + cfg_aclconfctx_t *ctx, dns_aclelement_t *dep) { + const cfg_obj_t *ge; + const char *dbname = NULL; + const char *stype = NULL, *search = NULL; dns_geoip_subtype_t subtype; - dns_aclelement_t de; - size_t len; + dns_aclelement_t de; + size_t len; REQUIRE(dep != NULL); @@ -546,13 +538,15 @@ parse_geoip_element(const cfg_obj_t *obj, isc_log_t *lctx, sizeof(de.geoip_elem.as_string)); } else if ((strcasecmp(stype, "region") == 0 || strcasecmp(stype, "subdivision") == 0) && - len == 2) { + len == 2) + { /* Two-letter region code */ subtype = dns_geoip_region; strlcpy(de.geoip_elem.as_string, search, sizeof(de.geoip_elem.as_string)); } else if (strcasecmp(stype, "region") == 0 || - strcasecmp(stype, "subdivision") == 0) { + strcasecmp(stype, "subdivision") == 0) + { /* Region name */ subtype = dns_geoip_regionname; strlcpy(de.geoip_elem.as_string, search, @@ -563,7 +557,8 @@ parse_geoip_element(const cfg_obj_t *obj, isc_log_t *lctx, strlcpy(de.geoip_elem.as_string, search, sizeof(de.geoip_elem.as_string)); } else if (strcasecmp(stype, "postal") == 0 || - strcasecmp(stype, "postalcode") == 0) { + strcasecmp(stype, "postalcode") == 0) + { if (len < 7) { subtype = dns_geoip_city_postalcode; strlcpy(de.geoip_elem.as_string, search, @@ -574,11 +569,13 @@ parse_geoip_element(const cfg_obj_t *obj, isc_log_t *lctx, return (ISC_R_FAILURE); } } else if (strcasecmp(stype, "metro") == 0 || - strcasecmp(stype, "metrocode") == 0) { + strcasecmp(stype, "metrocode") == 0) + { subtype = dns_geoip_city_metrocode; de.geoip_elem.as_int = atoi(search); - } else if (strcasecmp(stype, "tz") == 0 || - strcasecmp(stype, "timezone") == 0) { + } else if (strcasecmp(stype, "tz") == 0 || strcasecmp(stype, "timezon" + "e") == 0) + { subtype = dns_geoip_city_timezonecode; strlcpy(de.geoip_elem.as_string, search, sizeof(de.geoip_elem.as_string)); @@ -625,8 +622,7 @@ parse_geoip_element(const cfg_obj_t *obj, isc_log_t *lctx, isc_result_t cfg_acl_fromconfig(const cfg_obj_t *caml, const cfg_obj_t *cctx, isc_log_t *lctx, cfg_aclconfctx_t *ctx, isc_mem_t *mctx, - unsigned int nest_level, dns_acl_t **target) -{ + unsigned int nest_level, dns_acl_t **target) { return (cfg_acl_fromconfig2(caml, cctx, lctx, ctx, mctx, nest_level, 0, target)); } @@ -635,15 +631,14 @@ isc_result_t cfg_acl_fromconfig2(const cfg_obj_t *caml, const cfg_obj_t *cctx, isc_log_t *lctx, cfg_aclconfctx_t *ctx, isc_mem_t *mctx, unsigned int nest_level, uint16_t family, - dns_acl_t **target) -{ - isc_result_t result; - dns_acl_t * dacl = NULL, *inneracl = NULL; - dns_aclelement_t * de; + dns_acl_t **target) { + isc_result_t result; + dns_acl_t *dacl = NULL, *inneracl = NULL; + dns_aclelement_t *de; const cfg_listelt_t *elt; - dns_iptable_t * iptab; - int new_nest_level = 0; - bool setpos; + dns_iptable_t *iptab; + int new_nest_level = 0; + bool setpos; if (nest_level != 0) { new_nest_level = nest_level - 1; @@ -687,10 +682,10 @@ cfg_acl_fromconfig2(const cfg_obj_t *caml, const cfg_obj_t *cctx, } de = dacl->elements; - for (elt = cfg_list_first(caml); elt != NULL; - elt = cfg_list_next(elt)) { + for (elt = cfg_list_first(caml); elt != NULL; elt = cfg_list_next(elt)) + { const cfg_obj_t *ce = cfg_listelt_value(elt); - bool neg = false; + bool neg = false; INSIST(dacl->length <= dacl->alloc); @@ -724,7 +719,7 @@ cfg_acl_fromconfig2(const cfg_obj_t *caml, const cfg_obj_t *cctx, if (cfg_obj_isnetprefix(ce)) { /* Network prefix */ isc_netaddr_t addr; - unsigned int bitlen; + unsigned int bitlen; cfg_obj_asnetprefix(ce, &addr, &bitlen); if (family != 0 && family != addr.family) { diff --git a/lib/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h index b107961ff5..3123a9b39f 100644 --- a/lib/isccfg/include/isccfg/cfg.h +++ b/lib/isccfg/include/isccfg/cfg.h @@ -501,7 +501,7 @@ cfg_printx(const cfg_obj_t *obj, unsigned int flags, void (*f)(void *closure, const char *text, int textlen), void *closure); -#define CFG_PRINTER_XKEY 0x1 /* '?' out shared keys. */ +#define CFG_PRINTER_XKEY 0x1 /* '?' out shared keys. */ #define CFG_PRINTER_ONELINE 0x2 /* print config as a single line */ #define CFG_PRINTER_ACTIVEONLY \ 0x4 /* print only active configuration \ diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h index 5a79b2755e..e723175d80 100644 --- a/lib/isccfg/include/isccfg/grammar.h +++ b/lib/isccfg/include/isccfg/grammar.h @@ -65,16 +65,16 @@ * These share space with CFG_CLAUSEFLAG values, but count * down from the top. */ -#define CFG_ZONE_MASTER 0x80000000 -#define CFG_ZONE_SLAVE 0x40000000 -#define CFG_ZONE_STUB 0x20000000 -#define CFG_ZONE_HINT 0x10000000 -#define CFG_ZONE_FORWARD 0x08000000 +#define CFG_ZONE_MASTER 0x80000000 +#define CFG_ZONE_SLAVE 0x40000000 +#define CFG_ZONE_STUB 0x20000000 +#define CFG_ZONE_HINT 0x10000000 +#define CFG_ZONE_FORWARD 0x08000000 #define CFG_ZONE_STATICSTUB 0x04000000 -#define CFG_ZONE_REDIRECT 0x02000000 +#define CFG_ZONE_REDIRECT 0x02000000 #define CFG_ZONE_DELEGATION 0x01000000 -#define CFG_ZONE_INVIEW 0x00800000 -#define CFG_ZONE_MIRROR 0x00400000 +#define CFG_ZONE_INVIEW 0x00800000 +#define CFG_ZONE_MIRROR 0x00400000 typedef struct cfg_clausedef cfg_clausedef_t; typedef struct cfg_tuplefielddef cfg_tuplefielddef_t; @@ -282,19 +282,19 @@ struct cfg_parser { }; /* Parser context flags */ -#define CFG_PCTX_SKIP 0x1 +#define CFG_PCTX_SKIP 0x1 #define CFG_PCTX_NODEPRECATED 0x2 /*@{*/ /*% * Flags defining whether to accept certain types of network addresses. */ -#define CFG_ADDR_V4OK 0x00000001 +#define CFG_ADDR_V4OK 0x00000001 #define CFG_ADDR_V4PREFIXOK 0x00000002 -#define CFG_ADDR_V6OK 0x00000004 -#define CFG_ADDR_WILDOK 0x00000008 -#define CFG_ADDR_DSCPOK 0x00000010 -#define CFG_ADDR_MASK (CFG_ADDR_V6OK | CFG_ADDR_V4OK) +#define CFG_ADDR_V6OK 0x00000004 +#define CFG_ADDR_WILDOK 0x00000008 +#define CFG_ADDR_DSCPOK 0x00000010 +#define CFG_ADDR_MASK (CFG_ADDR_V6OK | CFG_ADDR_V4OK) /*@}*/ /*@{*/ @@ -575,7 +575,7 @@ cfg_parser_error(cfg_parser_t *pctx, unsigned int flags, const char *fmt, ...) * Pass one of these flags to cfg_parser_error() to include the * token text in log message. */ -#define CFG_LOG_NEAR 0x00000001 /*%< Say "near " */ +#define CFG_LOG_NEAR 0x00000001 /*%< Say "near " */ #define CFG_LOG_BEFORE 0x00000002 /*%< Say "before " */ #define CFG_LOG_NOPREP 0x00000004 /*%< Say just "" */ diff --git a/lib/isccfg/kaspconf.c b/lib/isccfg/kaspconf.c index 7e83c006a5..4fc56fc401 100644 --- a/lib/isccfg/kaspconf.c +++ b/lib/isccfg/kaspconf.c @@ -33,8 +33,7 @@ * Utility function for getting a configuration option. */ static isc_result_t -confget(cfg_obj_t const *const *maps, const char *name, const cfg_obj_t **obj) -{ +confget(cfg_obj_t const *const *maps, const char *name, const cfg_obj_t **obj) { for (size_t i = 0;; i++) { if (maps[i] == NULL) { return (ISC_R_NOTFOUND); @@ -49,10 +48,9 @@ confget(cfg_obj_t const *const *maps, const char *name, const cfg_obj_t **obj) * Utility function for configuring durations. */ static uint32_t -get_duration(const cfg_obj_t **maps, const char *option, uint32_t dfl) -{ +get_duration(const cfg_obj_t **maps, const char *option, uint32_t dfl) { const cfg_obj_t *obj; - isc_result_t result; + isc_result_t result; obj = NULL; result = confget(maps, option, &obj); @@ -68,9 +66,8 @@ get_duration(const cfg_obj_t **maps, const char *option, uint32_t dfl) */ static isc_result_t cfg_kaspkey_fromconfig(const cfg_obj_t *config, dns_kasp_t *kasp, - isc_log_t *logctx) -{ - isc_result_t result; + isc_log_t *logctx) { + isc_result_t result; dns_kasp_key_t *key = NULL; /* Create a new key reference. */ @@ -86,8 +83,8 @@ cfg_kaspkey_fromconfig(const cfg_obj_t *config, dns_kasp_t *kasp, key->algorithm = DNS_KEYALG_ECDSA256; key->length = -1; } else { - const char * rolestr = NULL; - const cfg_obj_t * obj = NULL; + const char *rolestr = NULL; + const cfg_obj_t *obj = NULL; isc_consttextregion_t alg; rolestr = cfg_obj_asstring(cfg_tuple_get(config, "role")); @@ -168,16 +165,15 @@ cleanup: isc_result_t cfg_kasp_fromconfig(const cfg_obj_t *config, isc_mem_t *mctx, isc_log_t *logctx, - dns_kasplist_t *kasplist, dns_kasp_t **kaspp) -{ - isc_result_t result; - const cfg_obj_t * maps[2]; - const cfg_obj_t * koptions = NULL; - const cfg_obj_t * keys = NULL; + dns_kasplist_t *kasplist, dns_kasp_t **kaspp) { + isc_result_t result; + const cfg_obj_t *maps[2]; + const cfg_obj_t *koptions = NULL; + const cfg_obj_t *keys = NULL; const cfg_listelt_t *element = NULL; - const char * kaspname = NULL; - dns_kasp_t * kasp = NULL; - int i = 0; + const char *kaspname = NULL; + dns_kasp_t *kasp = NULL; + int i = 0; REQUIRE(kaspp != NULL && *kaspp == NULL); @@ -238,7 +234,8 @@ cfg_kasp_fromconfig(const cfg_obj_t *config, isc_mem_t *mctx, isc_log_t *logctx, } } else { for (element = cfg_list_first(keys); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { cfg_obj_t *kobj = cfg_listelt_value(element); result = cfg_kaspkey_fromconfig(kobj, kasp, logctx); if (result != ISC_R_SUCCESS) { diff --git a/lib/isccfg/log.c b/lib/isccfg/log.c index 07b5cf02d0..cce2388bfb 100644 --- a/lib/isccfg/log.c +++ b/lib/isccfg/log.c @@ -31,8 +31,7 @@ LIBISCCFG_EXTERNAL_DATA isc_logmodule_t cfg_modules[] = { }; void -cfg_log_init(isc_log_t *lctx) -{ +cfg_log_init(isc_log_t *lctx) { REQUIRE(lctx != NULL); isc_log_registercategories(lctx, cfg_categories); diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index 2cf33ac0a5..390aeb62c4 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -52,29 +52,24 @@ * 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; @@ -255,19 +250,19 @@ static cfg_type_t cfg_type_rrtypelist = { }; static const char *mode_enums[] = { "deny", "grant", NULL }; -static cfg_type_t cfg_type_mode = { - "mode", cfg_parse_enum, cfg_print_ustring, - cfg_doc_enum, &cfg_rep_string, &mode_enums +static cfg_type_t cfg_type_mode = { + "mode", cfg_parse_enum, cfg_print_ustring, + cfg_doc_enum, &cfg_rep_string, &mode_enums }; static isc_result_t -parse_matchtype(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_matchtype(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; CHECK(cfg_peektoken(pctx, 0)); if (pctx->token.type == isc_tokentype_string && - strcasecmp(TOKEN_STRING(pctx), "zonesub") == 0) { + strcasecmp(TOKEN_STRING(pctx), "zonesub") == 0) + { pctx->flags |= CFG_PCTX_SKIP; } return (cfg_parse_enum(pctx, type, ret)); @@ -277,10 +272,9 @@ cleanup: } static isc_result_t -parse_matchname(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_matchname(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; - cfg_obj_t * obj = NULL; + cfg_obj_t *obj = NULL; if ((pctx->flags & CFG_PCTX_SKIP) != 0) { pctx->flags &= ~CFG_PCTX_SKIP; @@ -295,8 +289,7 @@ cleanup: } static void -doc_matchname(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_matchname(cfg_printer_t *pctx, const cfg_type_t *type) { cfg_print_cstr(pctx, "[ "); cfg_doc_obj(pctx, type->of); cfg_print_cstr(pctx, " ]"); @@ -350,18 +343,20 @@ static cfg_type_t cfg_type_updatepolicy = { }; static isc_result_t -parse_updatepolicy(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_updatepolicy(cfg_parser_t *pctx, const cfg_type_t *type, + cfg_obj_t **ret) { isc_result_t result; CHECK(cfg_gettoken(pctx, 0)); if (pctx->token.type == isc_tokentype_special && - pctx->token.value.as_char == '{') { + pctx->token.value.as_char == '{') + { cfg_ungettoken(pctx); return (cfg_parse_bracketed_list(pctx, type, ret)); } if (pctx->token.type == isc_tokentype_string && - strcasecmp(TOKEN_STRING(pctx), "local") == 0) { + strcasecmp(TOKEN_STRING(pctx), "local") == 0) + { cfg_obj_t *obj = NULL; CHECK(cfg_create_obj(pctx, &cfg_type_ustring, &obj)); obj->value.string.length = strlen("local"); @@ -381,8 +376,7 @@ cleanup: } static void -print_updatepolicy(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +print_updatepolicy(cfg_printer_t *pctx, const cfg_obj_t *obj) { if (cfg_obj_isstring(obj)) { cfg_print_ustring(pctx, obj); } else { @@ -391,8 +385,7 @@ print_updatepolicy(cfg_printer_t *pctx, const cfg_obj_t *obj) } static void -doc_updatepolicy(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_updatepolicy(cfg_printer_t *pctx, const cfg_type_t *type) { cfg_print_cstr(pctx, "( local | { "); cfg_doc_obj(pctx, type->of); cfg_print_cstr(pctx, "; ... }"); @@ -451,14 +444,12 @@ static cfg_type_t cfg_type_category = { "category", cfg_parse_tuple, &cfg_rep_tuple, category_fields }; static isc_result_t -parse_maxduration(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_maxduration(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { return (cfg_parse_enum_or_other(pctx, type, &cfg_type_duration, ret)); } static void -doc_maxduration(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_maxduration(cfg_printer_t *pctx, const cfg_type_t *type) { cfg_doc_enum_or_other(pctx, type, &cfg_type_duration); } @@ -466,9 +457,9 @@ doc_maxduration(cfg_printer_t *pctx, const cfg_type_t *type) * A duration or "unlimited", but not "default". */ static const char *maxduration_enums[] = { "unlimited", NULL }; -static cfg_type_t cfg_type_maxduration = { - "maxduration_no_default", parse_maxduration, cfg_print_ustring, - doc_maxduration, &cfg_rep_duration, maxduration_enums +static cfg_type_t cfg_type_maxduration = { + "maxduration_no_default", parse_maxduration, cfg_print_ustring, + doc_maxduration, &cfg_rep_duration, maxduration_enums }; /*% @@ -492,14 +483,13 @@ static cfg_type_t cfg_type_dnsseckey = { "dnsseckey", cfg_parse_tuple, * */ static isc_result_t -parse_optional_enum(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_optional_enum(cfg_parser_t *pctx, const cfg_type_t *type, + cfg_obj_t **ret) { return (cfg_parse_enum_or_other(pctx, type, &cfg_type_void, ret)); } static void -doc_optional_enum(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_optional_enum(cfg_printer_t *pctx, const cfg_type_t *type) { UNUSED(type); cfg_print_cstr(pctx, "[ "); cfg_doc_enum(pctx, type); @@ -512,9 +502,9 @@ doc_optional_enum(cfg_printer_t *pctx, const cfg_type_t *type) */ static const char *anchortype_enums[] = { "static-key", "initial-key", "static-ds", "initial-ds", NULL }; -static cfg_type_t cfg_type_anchortype = { "anchortype", cfg_parse_enum, - cfg_print_ustring, cfg_doc_enum, - &cfg_rep_string, anchortype_enums }; +static cfg_type_t cfg_type_anchortype = { "anchortype", cfg_parse_enum, + cfg_print_ustring, cfg_doc_enum, + &cfg_rep_string, anchortype_enums }; static cfg_tuplefielddef_t managedkey_fields[] = { { "name", &cfg_type_astring, 0 }, { "anchortype", &cfg_type_anchortype, 0 }, @@ -532,33 +522,33 @@ static cfg_type_t cfg_type_managedkey = { "managedkey", cfg_parse_tuple, * DNSSEC key roles. */ static const char *dnsseckeyrole_enums[] = { "csk", "ksk", "zsk", NULL }; -static cfg_type_t cfg_type_dnsseckeyrole = { - "dnssec-key-role", cfg_parse_enum, cfg_print_ustring, - cfg_doc_enum, &cfg_rep_string, &dnsseckeyrole_enums +static cfg_type_t cfg_type_dnsseckeyrole = { + "dnssec-key-role", cfg_parse_enum, cfg_print_ustring, + cfg_doc_enum, &cfg_rep_string, &dnsseckeyrole_enums }; /*% * DNSSEC key storage types. */ static const char *dnsseckeystore_enums[] = { "key-directory", NULL }; -static cfg_type_t cfg_type_dnsseckeystore = { - "dnssec-key-storage", parse_optional_enum, cfg_print_ustring, - doc_optional_enum, &cfg_rep_string, dnsseckeystore_enums +static cfg_type_t cfg_type_dnsseckeystore = { + "dnssec-key-storage", parse_optional_enum, cfg_print_ustring, + doc_optional_enum, &cfg_rep_string, dnsseckeystore_enums }; /*% * A dnssec key, as used in the "keys" statement in a "dnssec-policy". */ static keyword_type_t algorithm_kw = { "algorithm", &cfg_type_ustring }; -static cfg_type_t cfg_type_algorithm = { "algorithm", parse_keyvalue, - print_keyvalue, doc_keyvalue, - &cfg_rep_string, &algorithm_kw }; +static cfg_type_t cfg_type_algorithm = { "algorithm", parse_keyvalue, + print_keyvalue, doc_keyvalue, + &cfg_rep_string, &algorithm_kw }; static keyword_type_t lifetime_kw = { "lifetime", &cfg_type_duration_or_unlimited }; -static cfg_type_t cfg_type_lifetime = { "lifetime", parse_keyvalue, - print_keyvalue, doc_keyvalue, - &cfg_rep_duration, &lifetime_kw }; +static cfg_type_t cfg_type_lifetime = { "lifetime", parse_keyvalue, + print_keyvalue, doc_keyvalue, + &cfg_rep_duration, &lifetime_kw }; static cfg_tuplefielddef_t kaspkey_fields[] = { { "role", &cfg_type_dnsseckeyrole, 0 }, @@ -619,19 +609,19 @@ static cfg_type_t cfg_type_rrsetorderingelement = { static const char *checktype_enums[] = { "primary", "master", "secondary", "slave", "response", NULL }; -static cfg_type_t cfg_type_checktype = { "checktype", cfg_parse_enum, - cfg_print_ustring, cfg_doc_enum, - &cfg_rep_string, &checktype_enums }; +static cfg_type_t cfg_type_checktype = { "checktype", cfg_parse_enum, + cfg_print_ustring, cfg_doc_enum, + &cfg_rep_string, &checktype_enums }; static const char *checkmode_enums[] = { "fail", "warn", "ignore", NULL }; -static cfg_type_t cfg_type_checkmode = { "checkmode", cfg_parse_enum, - cfg_print_ustring, cfg_doc_enum, - &cfg_rep_string, &checkmode_enums }; +static cfg_type_t cfg_type_checkmode = { "checkmode", cfg_parse_enum, + cfg_print_ustring, cfg_doc_enum, + &cfg_rep_string, &checkmode_enums }; static const char *warn_enums[] = { "warn", "ignore", NULL }; -static cfg_type_t cfg_type_warn = { - "warn", cfg_parse_enum, cfg_print_ustring, - cfg_doc_enum, &cfg_rep_string, &warn_enums +static cfg_type_t cfg_type_warn = { + "warn", cfg_parse_enum, cfg_print_ustring, + cfg_doc_enum, &cfg_rep_string, &warn_enums }; static cfg_tuplefielddef_t checknames_fields[] = { @@ -661,22 +651,22 @@ static cfg_type_t cfg_type_bracketed_netaddrlist = { "bracketed_netaddrlist", &cfg_type_netaddr }; static const char *autodnssec_enums[] = { "allow", "maintain", "off", NULL }; -static cfg_type_t cfg_type_autodnssec = { - "autodnssec", cfg_parse_enum, cfg_print_ustring, - cfg_doc_enum, &cfg_rep_string, &autodnssec_enums +static cfg_type_t cfg_type_autodnssec = { + "autodnssec", cfg_parse_enum, cfg_print_ustring, + cfg_doc_enum, &cfg_rep_string, &autodnssec_enums }; static const char *dnssecupdatemode_enums[] = { "maintain", "no-resign", NULL }; -static cfg_type_t cfg_type_dnssecupdatemode = { - "dnssecupdatemode", cfg_parse_enum, cfg_print_ustring, - cfg_doc_enum, &cfg_rep_string, &dnssecupdatemode_enums +static cfg_type_t cfg_type_dnssecupdatemode = { + "dnssecupdatemode", cfg_parse_enum, cfg_print_ustring, + cfg_doc_enum, &cfg_rep_string, &dnssecupdatemode_enums }; static const char *updatemethods_enums[] = { "date", "increment", "unixtime", NULL }; -static cfg_type_t cfg_type_updatemethod = { - "updatemethod", cfg_parse_enum, cfg_print_ustring, - cfg_doc_enum, &cfg_rep_string, &updatemethods_enums +static cfg_type_t cfg_type_updatemethod = { + "updatemethod", cfg_parse_enum, cfg_print_ustring, + cfg_doc_enum, &cfg_rep_string, &updatemethods_enums }; /* @@ -688,13 +678,11 @@ static cfg_type_t cfg_type_updatemethod = { */ static const char *zonestat_enums[] = { "full", "terse", "none", NULL }; static isc_result_t -parse_zonestat(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_zonestat(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { return (cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret)); } static void -doc_zonestat(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_zonestat(cfg_printer_t *pctx, const cfg_type_t *type) { cfg_doc_enum_or_other(pctx, type, &cfg_type_boolean); } static cfg_type_t cfg_type_zonestat = { "zonestat", parse_zonestat, @@ -761,9 +749,9 @@ static cfg_type_t cfg_type_kaspkeys = { "kaspkeys", &cfg_type_kaspkey }; static const char *forwardtype_enums[] = { "first", "only", NULL }; -static cfg_type_t cfg_type_forwardtype = { - "forwardtype", cfg_parse_enum, cfg_print_ustring, - cfg_doc_enum, &cfg_rep_string, &forwardtype_enums +static cfg_type_t cfg_type_forwardtype = { + "forwardtype", cfg_parse_enum, cfg_print_ustring, + cfg_doc_enum, &cfg_rep_string, &forwardtype_enums }; static const char *zonetype_enums[] = { @@ -778,15 +766,15 @@ static cfg_type_t cfg_type_zonetype = { "zonetype", cfg_parse_enum, static const char *loglevel_enums[] = { "critical", "error", "warning", "notice", "info", "dynamic", NULL }; -static cfg_type_t cfg_type_loglevel = { "loglevel", cfg_parse_enum, - cfg_print_ustring, cfg_doc_enum, - &cfg_rep_string, &loglevel_enums }; +static cfg_type_t cfg_type_loglevel = { "loglevel", cfg_parse_enum, + cfg_print_ustring, cfg_doc_enum, + &cfg_rep_string, &loglevel_enums }; static const char *transferformat_enums[] = { "many-answers", "one-answer", NULL }; -static cfg_type_t cfg_type_transferformat = { - "transferformat", cfg_parse_enum, cfg_print_ustring, - cfg_doc_enum, &cfg_rep_string, &transferformat_enums +static cfg_type_t cfg_type_transferformat = { + "transferformat", cfg_parse_enum, cfg_print_ustring, + cfg_doc_enum, &cfg_rep_string, &transferformat_enums }; /*% @@ -794,8 +782,7 @@ static cfg_type_t cfg_type_transferformat = { */ static void -print_none(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +print_none(cfg_printer_t *pctx, const cfg_obj_t *obj) { UNUSED(obj); cfg_print_cstr(pctx, "none"); } @@ -807,13 +794,14 @@ static cfg_type_t cfg_type_none = { "none", NULL, print_none, * A quoted string or the special keyword "none". Used in the pid-file option. */ static isc_result_t -parse_qstringornone(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_qstringornone(cfg_parser_t *pctx, const cfg_type_t *type, + cfg_obj_t **ret) { isc_result_t result; CHECK(cfg_gettoken(pctx, CFG_LEXOPT_QSTRING)); if (pctx->token.type == isc_tokentype_string && - strcasecmp(TOKEN_STRING(pctx), "none") == 0) { + strcasecmp(TOKEN_STRING(pctx), "none") == 0) + { return (cfg_create_obj(pctx, &cfg_type_none, ret)); } cfg_ungettoken(pctx); @@ -823,8 +811,7 @@ cleanup: } static void -doc_qstringornone(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_qstringornone(cfg_printer_t *pctx, const cfg_type_t *type) { UNUSED(type); cfg_print_cstr(pctx, "( | none )"); } @@ -841,8 +828,7 @@ static cfg_type_t cfg_type_qstringornone = { "qstringornone", * Used in the dnssec-validation option. */ static void -print_auto(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +print_auto(cfg_printer_t *pctx, const cfg_obj_t *obj) { UNUSED(obj); cfg_print_cstr(pctx, "auto"); } @@ -851,13 +837,13 @@ static cfg_type_t cfg_type_auto = { "auto", NULL, print_auto, NULL, &cfg_rep_void, NULL }; static isc_result_t -parse_boolorauto(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_boolorauto(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; CHECK(cfg_gettoken(pctx, CFG_LEXOPT_QSTRING)); if (pctx->token.type == isc_tokentype_string && - strcasecmp(TOKEN_STRING(pctx), "auto") == 0) { + strcasecmp(TOKEN_STRING(pctx), "auto") == 0) + { return (cfg_create_obj(pctx, &cfg_type_auto, ret)); } cfg_ungettoken(pctx); @@ -867,8 +853,7 @@ cleanup: } static void -print_boolorauto(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +print_boolorauto(cfg_printer_t *pctx, const cfg_obj_t *obj) { if (obj->type->rep == &cfg_rep_void) { cfg_print_cstr(pctx, "auto"); } else if (obj->value.boolean) { @@ -879,8 +864,7 @@ print_boolorauto(cfg_printer_t *pctx, const cfg_obj_t *obj) } static void -doc_boolorauto(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_boolorauto(cfg_printer_t *pctx, const cfg_type_t *type) { UNUSED(type); cfg_print_cstr(pctx, "( yes | no | auto )"); } @@ -894,8 +878,7 @@ static cfg_type_t cfg_type_boolorauto = { * keyword hostname */ static void -print_hostname(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +print_hostname(cfg_printer_t *pctx, const cfg_obj_t *obj) { UNUSED(obj); cfg_print_cstr(pctx, "hostname"); } @@ -909,16 +892,17 @@ static cfg_type_t cfg_type_hostname = { "hostname", NULL, */ static isc_result_t -parse_serverid(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_serverid(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; CHECK(cfg_gettoken(pctx, CFG_LEXOPT_QSTRING)); if (pctx->token.type == isc_tokentype_string && - strcasecmp(TOKEN_STRING(pctx), "none") == 0) { + strcasecmp(TOKEN_STRING(pctx), "none") == 0) + { return (cfg_create_obj(pctx, &cfg_type_none, ret)); } if (pctx->token.type == isc_tokentype_string && - strcasecmp(TOKEN_STRING(pctx), "hostname") == 0) { + strcasecmp(TOKEN_STRING(pctx), "hostname") == 0) + { result = cfg_create_obj(pctx, &cfg_type_hostname, ret); if (result == ISC_R_SUCCESS) { (*ret)->value.boolean = true; @@ -932,8 +916,7 @@ cleanup: } static void -doc_serverid(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_serverid(cfg_printer_t *pctx, const cfg_type_t *type) { UNUSED(type); cfg_print_cstr(pctx, "( | none | hostname )"); } @@ -945,8 +928,7 @@ static cfg_type_t cfg_type_serverid = { "serverid", parse_serverid, NULL, * Port list. */ static void -print_porttuple(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +print_porttuple(cfg_printer_t *pctx, const cfg_obj_t *obj) { cfg_print_cstr(pctx, "range "); cfg_print_tuple(pctx, obj); } @@ -960,8 +942,7 @@ static cfg_type_t cfg_type_porttuple = { "porttuple", cfg_parse_tuple, &cfg_rep_tuple, porttuple_fields }; static isc_result_t -parse_port(cfg_parser_t *pctx, cfg_obj_t **ret) -{ +parse_port(cfg_parser_t *pctx, cfg_obj_t **ret) { isc_result_t result; CHECK(cfg_parse_uint32(pctx, NULL, ret)); @@ -976,10 +957,9 @@ cleanup: } static isc_result_t -parse_portrange(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_portrange(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; - cfg_obj_t * obj = NULL; + cfg_obj_t *obj = NULL; UNUSED(type); @@ -989,7 +969,8 @@ parse_portrange(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) } else { CHECK(cfg_gettoken(pctx, 0)); if (pctx->token.type != isc_tokentype_string || - strcasecmp(TOKEN_STRING(pctx), "range") != 0) { + strcasecmp(TOKEN_STRING(pctx), "range") != 0) + { cfg_parser_error(pctx, CFG_LOG_NEAR, "expected integer or 'range'"); return (ISC_R_UNEXPECTEDTOKEN); @@ -1029,9 +1010,9 @@ static cfg_type_t cfg_type_bracketed_portlist = { "bracketed_sockaddrlist", &cfg_type_portrange }; static const char *cookiealg_enums[] = { "aes", "siphash24", NULL }; -static cfg_type_t cfg_type_cookiealg = { "cookiealg", cfg_parse_enum, - cfg_print_ustring, cfg_doc_enum, - &cfg_rep_string, &cookiealg_enums }; +static cfg_type_t cfg_type_cookiealg = { "cookiealg", cfg_parse_enum, + cfg_print_ustring, cfg_doc_enum, + &cfg_rep_string, &cookiealg_enums }; /*% * fetch-quota-params @@ -1121,9 +1102,9 @@ static cfg_clausedef_t bindkeys_clauses[] = { }; static const char *fstrm_model_enums[] = { "mpsc", "spsc", NULL }; -static cfg_type_t cfg_type_fstrm_model = { - "model", cfg_parse_enum, cfg_print_ustring, - cfg_doc_enum, &cfg_rep_string, &fstrm_model_enums +static cfg_type_t cfg_type_fstrm_model = { + "model", cfg_parse_enum, cfg_print_ustring, + cfg_doc_enum, &cfg_rep_string, &fstrm_model_enums }; /*% @@ -1340,15 +1321,15 @@ static cfg_type_t cfg_type_mustbesecure = { }; static const char *masterformat_enums[] = { "map", "raw", "text", NULL }; -static cfg_type_t cfg_type_masterformat = { - "masterformat", cfg_parse_enum, cfg_print_ustring, - cfg_doc_enum, &cfg_rep_string, &masterformat_enums +static cfg_type_t cfg_type_masterformat = { + "masterformat", cfg_parse_enum, cfg_print_ustring, + cfg_doc_enum, &cfg_rep_string, &masterformat_enums }; static const char *masterstyle_enums[] = { "full", "relative", NULL }; -static cfg_type_t cfg_type_masterstyle = { - "masterstyle", cfg_parse_enum, cfg_print_ustring, - cfg_doc_enum, &cfg_rep_string, &masterstyle_enums +static cfg_type_t cfg_type_masterstyle = { + "masterstyle", cfg_parse_enum, cfg_print_ustring, + cfg_doc_enum, &cfg_rep_string, &masterstyle_enums }; static keyword_type_t blocksize_kw = { "block-size", &cfg_type_uint32 }; @@ -1413,10 +1394,9 @@ static cfg_type_t cfg_type_dnstap = { "dnstap", * dnstap-output */ static isc_result_t -parse_dtout(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ - isc_result_t result; - cfg_obj_t * obj = NULL; +parse_dtout(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { + isc_result_t result; + cfg_obj_t *obj = NULL; const cfg_tuplefielddef_t *fields = type->of; CHECK(cfg_create_tuple(pctx, type, &obj)); @@ -1436,12 +1416,14 @@ parse_dtout(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) &obj->value.tuple[2])); } else if (strcasecmp(TOKEN_STRING(pctx), "versions") == 0 && - obj->value.tuple[3] == NULL) { + obj->value.tuple[3] == NULL) + { CHECK(cfg_parse_obj(pctx, fields[3].type, &obj->value.tuple[3])); } else if (strcasecmp(TOKEN_STRING(pctx), "suffix") == 0 && - obj->value.tuple[4] == NULL) { + obj->value.tuple[4] == NULL) + { CHECK(cfg_parse_obj(pctx, fields[4].type, &obj->value.tuple[4])); } else { @@ -1475,8 +1457,7 @@ cleanup: } static void -print_dtout(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +print_dtout(cfg_printer_t *pctx, const cfg_obj_t *obj) { cfg_print_obj(pctx, obj->value.tuple[0]); /* mode */ cfg_print_obj(pctx, obj->value.tuple[1]); /* file */ if (obj->value.tuple[2]->type->print != cfg_print_void) { @@ -1494,8 +1475,7 @@ print_dtout(cfg_printer_t *pctx, const cfg_obj_t *obj) } static void -doc_dtout(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_dtout(cfg_printer_t *pctx, const cfg_type_t *type) { UNUSED(type); cfg_print_cstr(pctx, "( file | unix ) "); cfg_print_cstr(pctx, " "); @@ -1507,9 +1487,9 @@ doc_dtout(cfg_printer_t *pctx, const cfg_type_t *type) } static const char *dtoutmode_enums[] = { "file", "unix", NULL }; -static cfg_type_t cfg_type_dtmode = { "dtmode", cfg_parse_enum, - cfg_print_ustring, cfg_doc_enum, - &cfg_rep_string, &dtoutmode_enums }; +static cfg_type_t cfg_type_dtmode = { "dtmode", cfg_parse_enum, + cfg_print_ustring, cfg_doc_enum, + &cfg_rep_string, &dtoutmode_enums }; static cfg_tuplefielddef_t dtout_fields[] = { { "mode", &cfg_type_dtmode, 0 }, @@ -1541,8 +1521,7 @@ static cfg_type_t cfg_type_dnstapoutput = { "dnstapoutput", parse_dtout, */ static void -doc_rpz_policy(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_rpz_policy(cfg_printer_t *pctx, const cfg_type_t *type) { const char *const *p; /* * This is cfg_doc_enum() without the trailing " )". @@ -1557,8 +1536,7 @@ doc_rpz_policy(cfg_printer_t *pctx, const cfg_type_t *type) } static void -doc_rpz_cname(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_rpz_cname(cfg_printer_t *pctx, const cfg_type_t *type) { cfg_doc_terminal(pctx, type); cfg_print_cstr(pctx, " )"); } @@ -1569,10 +1547,9 @@ doc_rpz_cname(cfg_printer_t *pctx, const cfg_type_t *type) */ static isc_result_t cfg_parse_rpz_policy(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret) -{ - isc_result_t result; - cfg_obj_t * obj = NULL; + cfg_obj_t **ret) { + isc_result_t result; + cfg_obj_t *obj = NULL; const cfg_tuplefielddef_t *fields; CHECK(cfg_create_tuple(pctx, type, &obj)); @@ -1602,12 +1579,12 @@ cleanup: * by 2 or more optional keyvalues that can be in any order. */ static isc_result_t -cfg_parse_kv_tuple(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +cfg_parse_kv_tuple(cfg_parser_t *pctx, const cfg_type_t *type, + cfg_obj_t **ret) { const cfg_tuplefielddef_t *fields, *f; - cfg_obj_t * obj = NULL; - int fn; - isc_result_t result; + cfg_obj_t *obj = NULL; + int fn; + isc_result_t result; CHECK(cfg_create_tuple(pctx, type, &obj)); @@ -1631,7 +1608,8 @@ cfg_parse_kv_tuple(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) goto cleanup; } if (obj->value.tuple[fn] == NULL && - strcasecmp(f->name, TOKEN_STRING(pctx)) == 0) { + strcasecmp(f->name, TOKEN_STRING(pctx)) == 0) + { break; } } @@ -1656,11 +1634,10 @@ cleanup: } static void -cfg_print_kv_tuple(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ - unsigned int i; +cfg_print_kv_tuple(cfg_printer_t *pctx, const cfg_obj_t *obj) { + unsigned int i; const cfg_tuplefielddef_t *fields, *f; - const cfg_obj_t * fieldobj; + const cfg_obj_t *fieldobj; fields = obj->type->of; for (f = fields, i = 0; f->name != NULL; f++, i++) { @@ -1678,8 +1655,7 @@ cfg_print_kv_tuple(cfg_printer_t *pctx, const cfg_obj_t *obj) } static void -cfg_doc_kv_tuple(cfg_printer_t *pctx, const cfg_type_t *type) -{ +cfg_doc_kv_tuple(cfg_printer_t *pctx, const cfg_type_t *type) { const cfg_tuplefielddef_t *fields, *f; fields = type->of; @@ -1699,9 +1675,9 @@ cfg_doc_kv_tuple(cfg_printer_t *pctx, const cfg_type_t *type) } static keyword_type_t zone_kw = { "zone", &cfg_type_astring }; -static cfg_type_t cfg_type_rpz_zone = { "zone", parse_keyvalue, - print_keyvalue, doc_keyvalue, - &cfg_rep_string, &zone_kw }; +static cfg_type_t cfg_type_rpz_zone = { "zone", parse_keyvalue, + print_keyvalue, doc_keyvalue, + &cfg_rep_string, &zone_kw }; /* * "no-op" is an obsolete equivalent of "passthru". */ @@ -1709,9 +1685,9 @@ static const char *rpz_policies[] = { "cname", "disabled", "drop", "given", "no-op", "nodata", "nxdomain", "passthru", "tcp-only", NULL }; -static cfg_type_t cfg_type_rpz_policy_name = { - "policy name", cfg_parse_enum, cfg_print_ustring, - doc_rpz_policy, &cfg_rep_string, &rpz_policies +static cfg_type_t cfg_type_rpz_policy_name = { + "policy name", cfg_parse_enum, cfg_print_ustring, + doc_rpz_policy, &cfg_rep_string, &rpz_policies }; static cfg_type_t cfg_type_rpz_cname = { "quoted_string", cfg_parse_astring, NULL, @@ -1794,12 +1770,12 @@ static cfg_type_t cfg_type_catz_tuple = { "catz tuple", cfg_parse_kv_tuple, cfg_print_kv_tuple, cfg_doc_kv_tuple, &cfg_rep_tuple, catz_zone_fields }; -static cfg_type_t cfg_type_catz_list = { "zone list", - cfg_parse_bracketed_list, - cfg_print_bracketed_list, - cfg_doc_bracketed_list, - &cfg_rep_list, - &cfg_type_catz_tuple }; +static cfg_type_t cfg_type_catz_list = { "zone list", + cfg_parse_bracketed_list, + cfg_print_bracketed_list, + cfg_doc_bracketed_list, + &cfg_rep_list, + &cfg_type_catz_tuple }; static cfg_tuplefielddef_t catz_fields[] = { { "zone list", &cfg_type_catz_list, 0 }, { NULL, NULL, 0 } }; @@ -1840,12 +1816,12 @@ static cfg_type_t cfg_type_rrl = { "rate-limit", cfg_parse_map, cfg_print_map, */ static void -print_lookaside(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +print_lookaside(cfg_printer_t *pctx, const cfg_obj_t *obj) { const cfg_obj_t *domain = obj->value.tuple[0]; if (domain->value.string.length == 4 && - strncmp(domain->value.string.base, "auto", 4) == 0) { + strncmp(domain->value.string.base, "auto", 4) == 0) + { cfg_print_cstr(pctx, "auto"); } else { cfg_print_tuple(pctx, obj); @@ -1853,8 +1829,7 @@ print_lookaside(cfg_printer_t *pctx, const cfg_obj_t *obj) } static void -doc_lookaside(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_lookaside(cfg_printer_t *pctx, const cfg_type_t *type) { UNUSED(type); cfg_print_cstr(pctx, "( trust-anchor | auto | no )"); } @@ -1878,8 +1853,7 @@ static cfg_type_t cfg_type_lookaside = { "lookaside", cfg_parse_tuple, static isc_result_t parse_optional_uint32(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret) -{ + cfg_obj_t **ret) { isc_result_t result; UNUSED(type); @@ -1894,8 +1868,7 @@ cleanup: } static void -doc_optional_uint32(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_optional_uint32(cfg_printer_t *pctx, const cfg_type_t *type) { UNUSED(type); cfg_print_cstr(pctx, "[ ]"); } @@ -2303,9 +2276,9 @@ static cfg_clausedef_t zone_only_clauses[] = { /*% The top-level named.conf syntax. */ -static cfg_clausedef_t * namedconf_clausesets[] = { namedconf_clauses, - namedconf_or_view_clauses, - NULL }; +static cfg_clausedef_t *namedconf_clausesets[] = { namedconf_clauses, + namedconf_or_view_clauses, + NULL }; LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_namedconf = { "namedconf", cfg_parse_mapbody, cfg_print_mapbody, cfg_doc_mapbody, &cfg_rep_map, namedconf_clausesets @@ -2322,9 +2295,9 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_bindkeys = { static cfg_clausedef_t *options_clausesets[] = { options_clauses, view_clauses, zone_clauses, NULL }; -static cfg_type_t cfg_type_options = { "options", cfg_parse_map, - cfg_print_map, cfg_doc_map, - &cfg_rep_map, options_clausesets }; +static cfg_type_t cfg_type_options = { "options", cfg_parse_map, + cfg_print_map, cfg_doc_map, + &cfg_rep_map, options_clausesets }; /*% The "view" statement syntax. */ @@ -2356,13 +2329,13 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_dnssecpolicyopts = { /*% The "dynamically loadable zones" statement syntax. */ -static cfg_clausedef_t dlz_clauses[] = { { "database", &cfg_type_astring, 0 }, - { "search", &cfg_type_boolean, 0 }, - { NULL, NULL, 0 } }; +static cfg_clausedef_t dlz_clauses[] = { { "database", &cfg_type_astring, 0 }, + { "search", &cfg_type_boolean, 0 }, + { NULL, NULL, 0 } }; static cfg_clausedef_t *dlz_clausesets[] = { dlz_clauses, NULL }; -static cfg_type_t cfg_type_dlz = { "dlz", cfg_parse_named_map, - cfg_print_map, cfg_doc_map, - &cfg_rep_map, dlz_clausesets }; +static cfg_type_t cfg_type_dlz = { "dlz", cfg_parse_named_map, + cfg_print_map, cfg_doc_map, + &cfg_rep_map, dlz_clausesets }; /*% * The "dyndb" statement syntax. @@ -2385,9 +2358,9 @@ static cfg_type_t cfg_type_dyndb = { "dyndb", cfg_parse_tuple, */ static const char *plugin_enums[] = { "query", NULL }; -static cfg_type_t cfg_type_plugintype = { "plugintype", cfg_parse_enum, - cfg_print_ustring, cfg_doc_enum, - &cfg_rep_string, plugin_enums }; +static cfg_type_t cfg_type_plugintype = { "plugintype", cfg_parse_enum, + cfg_print_ustring, cfg_doc_enum, + &cfg_rep_string, plugin_enums }; static cfg_tuplefielddef_t plugin_fields[] = { { "type", &cfg_type_plugintype, 0 }, { "library", &cfg_type_astring, 0 }, @@ -2406,9 +2379,9 @@ static cfg_clausedef_t key_clauses[] = { { "algorithm", &cfg_type_astring, 0 }, { NULL, NULL, 0 } }; static cfg_clausedef_t *key_clausesets[] = { key_clauses, NULL }; -static cfg_type_t cfg_type_key = { "key", cfg_parse_named_map, - cfg_print_map, cfg_doc_map, - &cfg_rep_map, key_clausesets }; +static cfg_type_t cfg_type_key = { "key", cfg_parse_named_map, + cfg_print_map, cfg_doc_map, + &cfg_rep_map, key_clausesets }; /*% * Clauses that can be found in a 'server' statement. @@ -2457,13 +2430,11 @@ static cfg_type_t cfg_type_server = { "server", cfg_parse_netprefix_map, static const char *printtime_enums[] = { "iso8601", "iso8601-utc", "local", NULL }; static isc_result_t -parse_printtime(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_printtime(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { return (cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret)); } static void -doc_printtime(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_printtime(cfg_printer_t *pctx, const cfg_type_t *type) { cfg_doc_enum_or_other(pctx, type, &cfg_type_boolean); } static cfg_type_t cfg_type_printtime = { "printtime", parse_printtime, @@ -2485,9 +2456,9 @@ static cfg_clausedef_t channel_clauses[] = { { NULL, NULL, 0 } }; static cfg_clausedef_t *channel_clausesets[] = { channel_clauses, NULL }; -static cfg_type_t cfg_type_channel = { "channel", cfg_parse_named_map, - cfg_print_map, cfg_doc_map, - &cfg_rep_map, channel_clausesets }; +static cfg_type_t cfg_type_channel = { "channel", cfg_parse_named_map, + cfg_print_map, cfg_doc_map, + &cfg_rep_map, channel_clausesets }; /*% A list of log destination, used in the "category" clause. */ static cfg_type_t cfg_type_destinationlist = { "destinationlist", @@ -2506,9 +2477,9 @@ static cfg_clausedef_t logging_clauses[] = { { NULL, NULL, 0 } }; static cfg_clausedef_t *logging_clausesets[] = { logging_clauses, NULL }; -static cfg_type_t cfg_type_logging = { "logging", cfg_parse_map, - cfg_print_map, cfg_doc_map, - &cfg_rep_map, logging_clausesets }; +static cfg_type_t cfg_type_logging = { "logging", cfg_parse_map, + cfg_print_map, cfg_doc_map, + &cfg_rep_map, logging_clausesets }; /*% * For parsing an 'addzone' statement @@ -2537,12 +2508,11 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_addzoneconf = { }; static isc_result_t -parse_unitstring(char *str, isc_resourcevalue_t *valuep) -{ - char * endp; +parse_unitstring(char *str, isc_resourcevalue_t *valuep) { + char *endp; unsigned int len; - uint64_t value; - uint64_t unit; + uint64_t value; + uint64_t unit; value = strtoull(str, &endp, 10); if (*endp == 0) { @@ -2579,11 +2549,10 @@ parse_unitstring(char *str, isc_resourcevalue_t *valuep) } static isc_result_t -parse_sizeval(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_sizeval(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; - cfg_obj_t * obj = NULL; - uint64_t val; + cfg_obj_t *obj = NULL; + uint64_t val; UNUSED(type); @@ -2607,13 +2576,12 @@ cleanup: static isc_result_t parse_sizeval_percent(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret) -{ - char * endp; + cfg_obj_t **ret) { + char *endp; isc_result_t result; - cfg_obj_t * obj = NULL; - uint64_t val; - uint64_t percent; + cfg_obj_t *obj = NULL; + uint64_t val; + uint64_t percent; UNUSED(type); @@ -2645,8 +2613,7 @@ cleanup: } static void -doc_sizeval_percent(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_sizeval_percent(cfg_printer_t *pctx, const cfg_type_t *type) { UNUSED(type); cfg_print_cstr(pctx, "( "); @@ -2668,30 +2635,28 @@ static cfg_type_t cfg_type_sizeval = { "sizeval", parse_sizeval, */ static isc_result_t -parse_size(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_size(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { return (cfg_parse_enum_or_other(pctx, type, &cfg_type_sizeval, ret)); } static void -doc_size(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_size(cfg_printer_t *pctx, const cfg_type_t *type) { cfg_doc_enum_or_other(pctx, type, &cfg_type_sizeval); } static const char *size_enums[] = { "default", "unlimited", NULL }; -static cfg_type_t cfg_type_size = { - "size", parse_size, cfg_print_ustring, - doc_size, &cfg_rep_string, size_enums +static cfg_type_t cfg_type_size = { + "size", parse_size, cfg_print_ustring, + doc_size, &cfg_rep_string, size_enums }; /*% * A size or "unlimited", but not "default". */ static const char *sizenodefault_enums[] = { "unlimited", NULL }; -static cfg_type_t cfg_type_sizenodefault = { - "size_no_default", parse_size, cfg_print_ustring, - doc_size, &cfg_rep_string, sizenodefault_enums +static cfg_type_t cfg_type_sizenodefault = { + "size_no_default", parse_size, cfg_print_ustring, + doc_size, &cfg_rep_string, sizenodefault_enums }; /*% @@ -2708,15 +2673,13 @@ static cfg_type_t cfg_type_sizeval_percent = { static isc_result_t parse_size_or_percent(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret) -{ + cfg_obj_t **ret) { return (cfg_parse_enum_or_other(pctx, type, &cfg_type_sizeval_percent, ret)); } static void -doc_parse_size_or_percent(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_parse_size_or_percent(cfg_printer_t *pctx, const cfg_type_t *type) { UNUSED(type); cfg_print_cstr(pctx, "( default | unlimited | "); cfg_doc_terminal(pctx, &cfg_type_sizeval); @@ -2726,9 +2689,9 @@ doc_parse_size_or_percent(cfg_printer_t *pctx, const cfg_type_t *type) } static const char *sizeorpercent_enums[] = { "default", "unlimited", NULL }; -static cfg_type_t cfg_type_sizeorpercent = { - "size_or_percent", parse_size_or_percent, cfg_print_ustring, - doc_parse_size_or_percent, &cfg_rep_string, sizeorpercent_enums +static cfg_type_t cfg_type_sizeorpercent = { + "size_or_percent", parse_size_or_percent, cfg_print_ustring, + doc_parse_size_or_percent, &cfg_rep_string, sizeorpercent_enums }; /*% @@ -2736,15 +2699,15 @@ static cfg_type_t cfg_type_sizeorpercent = { */ static isc_result_t parse_maybe_optional_keyvalue(cfg_parser_t *pctx, const cfg_type_t *type, - bool optional, cfg_obj_t **ret) -{ - isc_result_t result; - cfg_obj_t * obj = NULL; + bool optional, cfg_obj_t **ret) { + isc_result_t result; + cfg_obj_t *obj = NULL; const keyword_type_t *kw = type->of; CHECK(cfg_peektoken(pctx, 0)); if (pctx->token.type == isc_tokentype_string && - strcasecmp(TOKEN_STRING(pctx), kw->name) == 0) { + strcasecmp(TOKEN_STRING(pctx), kw->name) == 0) + { CHECK(cfg_gettoken(pctx, 0)); CHECK(kw->type->parse(pctx, kw->type, &obj)); obj->type = type; /* XXX kludge */ @@ -2764,21 +2727,18 @@ cleanup: } static isc_result_t -parse_keyvalue(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_keyvalue(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { return (parse_maybe_optional_keyvalue(pctx, type, false, ret)); } static isc_result_t parse_optional_keyvalue(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret) -{ + cfg_obj_t **ret) { return (parse_maybe_optional_keyvalue(pctx, type, true, ret)); } static void -print_keyvalue(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +print_keyvalue(cfg_printer_t *pctx, const cfg_obj_t *obj) { const keyword_type_t *kw = obj->type->of; cfg_print_cstr(pctx, kw->name); cfg_print_cstr(pctx, " "); @@ -2786,8 +2746,7 @@ print_keyvalue(cfg_printer_t *pctx, const cfg_obj_t *obj) } static void -doc_keyvalue(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_keyvalue(cfg_printer_t *pctx, const cfg_type_t *type) { const keyword_type_t *kw = type->of; cfg_print_cstr(pctx, kw->name); cfg_print_cstr(pctx, " "); @@ -2795,8 +2754,7 @@ 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) -{ +doc_optional_keyvalue(cfg_printer_t *pctx, const cfg_type_t *type) { const keyword_type_t *kw = type->of; cfg_print_cstr(pctx, "[ "); cfg_print_cstr(pctx, kw->name); @@ -2808,13 +2766,11 @@ doc_optional_keyvalue(cfg_printer_t *pctx, const cfg_type_t *type) static const char *dialup_enums[] = { "notify", "notify-passive", "passive", "refresh", NULL }; static isc_result_t -parse_dialup_type(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_dialup_type(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { return (cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret)); } static void -doc_dialup_type(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_dialup_type(cfg_printer_t *pctx, const cfg_type_t *type) { cfg_doc_enum_or_other(pctx, type, &cfg_type_boolean); } static cfg_type_t cfg_type_dialuptype = { "dialuptype", parse_dialup_type, @@ -2823,13 +2779,11 @@ static cfg_type_t cfg_type_dialuptype = { "dialuptype", parse_dialup_type, static const char *notify_enums[] = { "explicit", "master-only", NULL }; static isc_result_t -parse_notify_type(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_notify_type(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { return (cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret)); } static void -doc_notify_type(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_notify_type(cfg_printer_t *pctx, const cfg_type_t *type) { cfg_doc_enum_or_other(pctx, type, &cfg_type_boolean); } static cfg_type_t cfg_type_notifytype = { @@ -2839,13 +2793,11 @@ static cfg_type_t cfg_type_notifytype = { static const char *minimal_enums[] = { "no-auth", "no-auth-recursive", NULL }; static isc_result_t -parse_minimal(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_minimal(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { return (cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret)); } static void -doc_minimal(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_minimal(cfg_printer_t *pctx, const cfg_type_t *type) { cfg_doc_enum_or_other(pctx, type, &cfg_type_boolean); } static cfg_type_t cfg_type_minimal = { @@ -2856,13 +2808,12 @@ static cfg_type_t cfg_type_minimal = { static const char *ixfrdiff_enums[] = { "primary", "master", "secondary", "slave", NULL }; static isc_result_t -parse_ixfrdiff_type(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_ixfrdiff_type(cfg_parser_t *pctx, const cfg_type_t *type, + cfg_obj_t **ret) { return (cfg_parse_enum_or_other(pctx, type, &cfg_type_boolean, ret)); } static void -doc_ixfrdiff_type(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_ixfrdiff_type(cfg_printer_t *pctx, const cfg_type_t *type) { cfg_doc_enum_or_other(pctx, type, &cfg_type_boolean); } static cfg_type_t cfg_type_ixfrdifftype = { @@ -2971,17 +2922,16 @@ static cfg_clausedef_t controls_clauses[] = { }; static cfg_clausedef_t *controls_clausesets[] = { controls_clauses, NULL }; -static cfg_type_t cfg_type_controls = { "controls", cfg_parse_map, - cfg_print_map, cfg_doc_map, - &cfg_rep_map, &controls_clausesets }; +static cfg_type_t cfg_type_controls = { "controls", cfg_parse_map, + cfg_print_map, cfg_doc_map, + &cfg_rep_map, &controls_clausesets }; /*% * A "statistics-channels" statement is represented as a map with the * multivalued "inet" clauses. */ static void -doc_optional_bracketed_list(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_optional_bracketed_list(cfg_printer_t *pctx, const cfg_type_t *type) { const keyword_type_t *kw = type->of; cfg_print_cstr(pctx, "[ "); cfg_print_cstr(pctx, kw->name); @@ -3025,8 +2975,7 @@ static cfg_type_t cfg_type_statschannels = { */ static isc_result_t parse_optional_class(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret) -{ + cfg_obj_t **ret) { isc_result_t result; UNUSED(type); CHECK(cfg_peektoken(pctx, 0)); @@ -3040,8 +2989,7 @@ cleanup: } static void -doc_optional_class(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_optional_class(cfg_printer_t *pctx, const cfg_type_t *type) { UNUSED(type); cfg_print_cstr(pctx, "[ ]"); } @@ -3054,16 +3002,15 @@ static cfg_type_t cfg_type_optional_class = { "optional_class", NULL }; static isc_result_t -parse_querysource(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ - isc_result_t result; - cfg_obj_t * obj = NULL; - isc_netaddr_t netaddr; - in_port_t port = 0; - isc_dscp_t dscp = -1; - unsigned int have_address = 0; - unsigned int have_port = 0; - unsigned int have_dscp = 0; +parse_querysource(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { + isc_result_t result; + cfg_obj_t *obj = NULL; + isc_netaddr_t netaddr; + in_port_t port = 0; + isc_dscp_t dscp = -1; + unsigned int have_address = 0; + unsigned int have_port = 0; + unsigned int have_dscp = 0; const unsigned int *flagp = type->of; if ((*flagp & CFG_ADDR_V4OK) != 0) { @@ -3084,15 +3031,15 @@ parse_querysource(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) CHECK(cfg_parse_rawaddr(pctx, *flagp, &netaddr)); have_address++; - } else if (strcasecmp(TOKEN_STRING(pctx), "port") == - 0) { + } else if (strcasecmp(TOKEN_STRING(pctx), "port") == 0) + { /* read "port" */ CHECK(cfg_gettoken(pctx, 0)); CHECK(cfg_parse_rawport(pctx, CFG_ADDR_WILDOK, &port)); have_port++; - } else if (strcasecmp(TOKEN_STRING(pctx), "dscp") == - 0) { + } else if (strcasecmp(TOKEN_STRING(pctx), "dscp") == 0) + { /* read "dscp" */ CHECK(cfg_gettoken(pctx, 0)); CHECK(cfg_parse_dscp(pctx, &dscp)); @@ -3110,8 +3057,8 @@ parse_querysource(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) break; } } - if (have_address > 1 || have_port > 1 || - have_address + have_port == 0) { + if (have_address > 1 || have_port > 1 || have_address + have_port == 0) + { cfg_parser_error(pctx, 0, "expected one address and/or port"); return (ISC_R_UNEXPECTEDTOKEN); } @@ -3134,8 +3081,7 @@ cleanup: } static void -print_querysource(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +print_querysource(cfg_printer_t *pctx, const cfg_obj_t *obj) { isc_netaddr_t na; isc_netaddr_fromsockaddr(&na, &obj->value.sockaddr); cfg_print_cstr(pctx, "address "); @@ -3149,8 +3095,7 @@ print_querysource(cfg_printer_t *pctx, const cfg_obj_t *obj) } static void -doc_querysource(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_querysource(cfg_printer_t *pctx, const cfg_type_t *type) { const unsigned int *flagp = type->of; cfg_print_cstr(pctx, "( ( [ address ] ( "); @@ -3213,16 +3158,16 @@ static cfg_type_t cfg_type_controls_sockaddr = { */ static isc_result_t parse_server_key_kludge(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret) -{ + cfg_obj_t **ret) { isc_result_t result; - bool braces = false; + bool braces = false; UNUSED(type); /* Allow opening brace. */ CHECK(cfg_peektoken(pctx, 0)); if (pctx->token.type == isc_tokentype_special && - pctx->token.value.as_char == '{') { + pctx->token.value.as_char == '{') + { CHECK(cfg_gettoken(pctx, 0)); braces = true; } @@ -3233,7 +3178,8 @@ parse_server_key_kludge(cfg_parser_t *pctx, const cfg_type_t *type, /* Skip semicolon if present. */ CHECK(cfg_peektoken(pctx, 0)); if (pctx->token.type == isc_tokentype_special && - pctx->token.value.as_char == ';') { + pctx->token.value.as_char == ';') + { CHECK(cfg_gettoken(pctx, 0)); } @@ -3253,14 +3199,14 @@ static cfg_type_t cfg_type_server_key_kludge = { static isc_result_t parse_optional_facility(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret) -{ + cfg_obj_t **ret) { isc_result_t result; UNUSED(type); CHECK(cfg_peektoken(pctx, CFG_LEXOPT_QSTRING)); if (pctx->token.type == isc_tokentype_string || - pctx->token.type == isc_tokentype_qstring) { + pctx->token.type == isc_tokentype_qstring) + { CHECK(cfg_parse_obj(pctx, &cfg_type_astring, ret)); } else { CHECK(cfg_parse_obj(pctx, &cfg_type_void, ret)); @@ -3270,8 +3216,7 @@ cleanup: } static void -doc_optional_facility(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_optional_facility(cfg_printer_t *pctx, const cfg_type_t *type) { UNUSED(type); cfg_print_cstr(pctx, "[ ]"); } @@ -3289,19 +3234,19 @@ static cfg_type_t cfg_type_optional_facility = { "optional_facility", */ static keyword_type_t debug_kw = { "debug", &cfg_type_uint32 }; -static cfg_type_t cfg_type_debuglevel = { "debuglevel", parse_keyvalue, - print_keyvalue, doc_keyvalue, - &cfg_rep_uint32, &debug_kw }; +static cfg_type_t cfg_type_debuglevel = { "debuglevel", parse_keyvalue, + print_keyvalue, doc_keyvalue, + &cfg_rep_uint32, &debug_kw }; static isc_result_t -parse_logseverity(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_logseverity(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; UNUSED(type); CHECK(cfg_peektoken(pctx, 0)); if (pctx->token.type == isc_tokentype_string && - strcasecmp(TOKEN_STRING(pctx), "debug") == 0) { + strcasecmp(TOKEN_STRING(pctx), "debug") == 0) + { CHECK(cfg_gettoken(pctx, 0)); /* read "debug" */ CHECK(cfg_peektoken(pctx, ISC_LEXOPT_NUMBER)); if (pctx->token.type == isc_tokentype_number) { @@ -3334,14 +3279,12 @@ static cfg_type_t cfg_type_logseverity = { "log_severity", parse_logseverity, static const char *logversions_enums[] = { "unlimited", NULL }; static isc_result_t -parse_logversions(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_logversions(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { return (cfg_parse_enum_or_other(pctx, type, &cfg_type_uint32, ret)); } static void -doc_logversions(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_logversions(cfg_printer_t *pctx, const cfg_type_t *type) { cfg_doc_enum_or_other(pctx, type, &cfg_type_uint32); } @@ -3351,9 +3294,9 @@ static cfg_type_t cfg_type_logversions = { }; static const char *logsuffix_enums[] = { "increment", "timestamp", NULL }; -static cfg_type_t cfg_type_logsuffix = { "logsuffix", cfg_parse_enum, - cfg_print_ustring, cfg_doc_enum, - &cfg_rep_string, &logsuffix_enums }; +static cfg_type_t cfg_type_logsuffix = { "logsuffix", cfg_parse_enum, + cfg_print_ustring, cfg_doc_enum, + &cfg_rep_string, &logsuffix_enums }; static cfg_tuplefielddef_t logfile_fields[] = { { "file", &cfg_type_qstring, 0 }, @@ -3364,10 +3307,9 @@ static cfg_tuplefielddef_t logfile_fields[] = { }; static isc_result_t -parse_logfile(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ - isc_result_t result; - cfg_obj_t * obj = NULL; +parse_logfile(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { + isc_result_t result; + cfg_obj_t *obj = NULL; const cfg_tuplefielddef_t *fields = type->of; CHECK(cfg_create_tuple(pctx, type, &obj)); @@ -3381,17 +3323,20 @@ parse_logfile(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) if (pctx->token.type == isc_tokentype_string) { CHECK(cfg_gettoken(pctx, 0)); if (strcasecmp(TOKEN_STRING(pctx), "versions") == 0 && - obj->value.tuple[1] == NULL) { + obj->value.tuple[1] == NULL) + { CHECK(cfg_parse_obj(pctx, fields[1].type, &obj->value.tuple[1])); } else if (strcasecmp(TOKEN_STRING(pctx), "size") == 0 && - obj->value.tuple[2] == NULL) { + obj->value.tuple[2] == NULL) + { CHECK(cfg_parse_obj(pctx, fields[2].type, &obj->value.tuple[2])); } else if (strcasecmp(TOKEN_STRING(pctx), "suffix") == 0 && - obj->value.tuple[3] == NULL) { + obj->value.tuple[3] == NULL) + { CHECK(cfg_parse_obj(pctx, fields[3].type, &obj->value.tuple[3])); } else { @@ -3422,8 +3367,7 @@ cleanup: } static void -print_logfile(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +print_logfile(cfg_printer_t *pctx, const cfg_obj_t *obj) { cfg_print_obj(pctx, obj->value.tuple[0]); /* file */ if (obj->value.tuple[1]->type->print != cfg_print_void) { cfg_print_cstr(pctx, " versions "); @@ -3440,8 +3384,7 @@ print_logfile(cfg_printer_t *pctx, const cfg_obj_t *obj) } static void -doc_logfile(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_logfile(cfg_printer_t *pctx, const cfg_type_t *type) { UNUSED(type); cfg_print_cstr(pctx, ""); cfg_print_cstr(pctx, " "); @@ -3553,8 +3496,7 @@ static cfg_type_t cfg_type_nameport = { "nameport", cfg_parse_tuple, &cfg_rep_tuple, nameport_fields }; static void -doc_sockaddrnameport(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_sockaddrnameport(cfg_printer_t *pctx, const cfg_type_t *type) { UNUSED(type); cfg_print_cstr(pctx, "( "); cfg_print_cstr(pctx, ""); @@ -3579,17 +3521,17 @@ doc_sockaddrnameport(cfg_printer_t *pctx, const cfg_type_t *type) static isc_result_t parse_sockaddrnameport(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret) -{ + cfg_obj_t **ret) { isc_result_t result; - cfg_obj_t * obj = NULL; + cfg_obj_t *obj = NULL; UNUSED(type); CHECK(cfg_peektoken(pctx, CFG_LEXOPT_QSTRING)); if (pctx->token.type == isc_tokentype_string || - pctx->token.type == isc_tokentype_qstring) { - if (cfg_lookingat_netaddr(pctx, - CFG_ADDR_V4OK | CFG_ADDR_V6OK)) { + pctx->token.type == isc_tokentype_qstring) + { + if (cfg_lookingat_netaddr(pctx, CFG_ADDR_V4OK | CFG_ADDR_V6OK)) + { CHECK(cfg_parse_sockaddr(pctx, &cfg_type_sockaddr, ret)); } else { @@ -3652,8 +3594,7 @@ static cfg_type_t cfg_type_nameportiplist = { */ static void -doc_masterselement(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_masterselement(cfg_printer_t *pctx, const cfg_type_t *type) { UNUSED(type); cfg_print_cstr(pctx, "( "); cfg_print_cstr(pctx, ""); @@ -3670,17 +3611,17 @@ doc_masterselement(cfg_printer_t *pctx, const cfg_type_t *type) static isc_result_t parse_masterselement(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret) -{ + cfg_obj_t **ret) { isc_result_t result; - cfg_obj_t * obj = NULL; + cfg_obj_t *obj = NULL; UNUSED(type); CHECK(cfg_peektoken(pctx, CFG_LEXOPT_QSTRING)); if (pctx->token.type == isc_tokentype_string || - pctx->token.type == isc_tokentype_qstring) { - if (cfg_lookingat_netaddr(pctx, - CFG_ADDR_V4OK | CFG_ADDR_V6OK)) { + pctx->token.type == isc_tokentype_qstring) + { + if (cfg_lookingat_netaddr(pctx, CFG_ADDR_V4OK | CFG_ADDR_V6OK)) + { CHECK(cfg_parse_sockaddr(pctx, &cfg_type_sockaddr, ret)); } else { @@ -3704,18 +3645,16 @@ static cfg_type_t cfg_type_masterselement = { "masters_element", NULL }; static int -cmp_clause(const void *ap, const void *bp) -{ +cmp_clause(const void *ap, const void *bp) { const cfg_clausedef_t *a = (const cfg_clausedef_t *)ap; const cfg_clausedef_t *b = (const cfg_clausedef_t *)bp; return (strcmp(a->name, b->name)); } bool -cfg_clause_validforzone(const char *name, unsigned int ztype) -{ +cfg_clause_validforzone(const char *name, unsigned int ztype) { const cfg_clausedef_t *clause; - bool valid = false; + bool valid = false; for (clause = zone_clauses; clause->name != NULL; clause++) { if ((clause->flags & ztype) == 0 || @@ -3738,16 +3677,15 @@ cfg_clause_validforzone(const char *name, unsigned int ztype) void cfg_print_zonegrammar(const unsigned int zonetype, unsigned int flags, void (*f)(void *closure, const char *text, int textlen), - void *closure) -{ + void *closure) { #define NCLAUSES \ (((sizeof(zone_clauses) + sizeof(zone_only_clauses)) / \ sizeof(clause[0])) - \ 1) - cfg_printer_t pctx; + cfg_printer_t pctx; cfg_clausedef_t *clause = NULL; - cfg_clausedef_t clauses[NCLAUSES]; + cfg_clausedef_t clauses[NCLAUSES]; pctx.f = f; pctx.closure = closure; @@ -3812,7 +3750,8 @@ cfg_print_zonegrammar(const unsigned int zonetype, unsigned int flags, (((clause->flags & CFG_CLAUSEFLAG_OBSOLETE) != 0) || ((clause->flags & CFG_CLAUSEFLAG_ANCIENT) != 0) || ((clause->flags & CFG_CLAUSEFLAG_NYI) != 0) || - ((clause->flags & CFG_CLAUSEFLAG_TESTONLY) != 0))) { + ((clause->flags & CFG_CLAUSEFLAG_TESTONLY) != 0))) + { continue; } if ((clause->flags & zonetype) == 0 || diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c index 5d51f3bdc9..bef3771a4a 100644 --- a/lib/isccfg/parser.c +++ b/lib/isccfg/parser.c @@ -64,57 +64,46 @@ * 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 */ /* @@ -154,8 +143,7 @@ static cfg_type_t cfg_type_implicitlist = { "implicitlist", NULL, /* Functions. */ void -cfg_print_obj(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +cfg_print_obj(cfg_printer_t *pctx, const cfg_obj_t *obj) { REQUIRE(pctx != NULL); REQUIRE(obj != NULL); @@ -163,8 +151,7 @@ cfg_print_obj(cfg_printer_t *pctx, const cfg_obj_t *obj) } void -cfg_print_chars(cfg_printer_t *pctx, const char *text, int len) -{ +cfg_print_chars(cfg_printer_t *pctx, const char *text, int len) { REQUIRE(pctx != NULL); REQUIRE(text != NULL); @@ -172,8 +159,7 @@ cfg_print_chars(cfg_printer_t *pctx, const char *text, int len) } static void -print_open(cfg_printer_t *pctx) -{ +print_open(cfg_printer_t *pctx) { if ((pctx->flags & CFG_PRINTER_ONELINE) != 0) { cfg_print_cstr(pctx, "{ "); } else { @@ -183,8 +169,7 @@ print_open(cfg_printer_t *pctx) } void -cfg_print_indent(cfg_printer_t *pctx) -{ +cfg_print_indent(cfg_printer_t *pctx) { int indent = pctx->indent; if ((pctx->flags & CFG_PRINTER_ONELINE) != 0) { cfg_print_cstr(pctx, " "); @@ -197,8 +182,7 @@ cfg_print_indent(cfg_printer_t *pctx) } static void -print_close(cfg_printer_t *pctx) -{ +print_close(cfg_printer_t *pctx) { if ((pctx->flags & CFG_PRINTER_ONELINE) == 0) { pctx->indent--; cfg_print_indent(pctx); @@ -207,8 +191,7 @@ print_close(cfg_printer_t *pctx) } isc_result_t -cfg_parse_obj(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +cfg_parse_obj(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; REQUIRE(pctx != NULL); @@ -226,8 +209,7 @@ cfg_parse_obj(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) void cfg_print(const cfg_obj_t *obj, void (*f)(void *closure, const char *text, int textlen), - void *closure) -{ + void *closure) { REQUIRE(obj != NULL); REQUIRE(f != NULL); @@ -237,8 +219,7 @@ cfg_print(const cfg_obj_t *obj, void cfg_printx(const cfg_obj_t *obj, unsigned int flags, void (*f)(void *closure, const char *text, int textlen), - void *closure) -{ + void *closure) { cfg_printer_t pctx; REQUIRE(obj != NULL); @@ -254,14 +235,13 @@ cfg_printx(const cfg_obj_t *obj, unsigned int flags, /* Tuples. */ isc_result_t -cfg_create_tuple(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ - isc_result_t result; +cfg_create_tuple(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { + isc_result_t result; const cfg_tuplefielddef_t *fields; const cfg_tuplefielddef_t *f; - cfg_obj_t * obj = NULL; - unsigned int nfields = 0; - int i; + cfg_obj_t *obj = NULL; + unsigned int nfields = 0; + int i; REQUIRE(pctx != NULL); REQUIRE(type != NULL); @@ -274,8 +254,8 @@ cfg_create_tuple(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) } CHECK(cfg_create_obj(pctx, type, &obj)); - obj->value.tuple = - isc_mem_get(pctx->mctx, nfields * sizeof(cfg_obj_t *)); + obj->value.tuple = isc_mem_get(pctx->mctx, + nfields * sizeof(cfg_obj_t *)); for (f = fields, i = 0; f->name != NULL; f++, i++) { obj->value.tuple[i] = NULL; } @@ -290,13 +270,12 @@ cleanup: } isc_result_t -cfg_parse_tuple(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ - isc_result_t result; +cfg_parse_tuple(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { + isc_result_t result; const cfg_tuplefielddef_t *fields; const cfg_tuplefielddef_t *f; - cfg_obj_t * obj = NULL; - unsigned int i; + cfg_obj_t *obj = NULL; + unsigned int i; REQUIRE(pctx != NULL); REQUIRE(type != NULL); @@ -318,12 +297,11 @@ cleanup: } void -cfg_print_tuple(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ - unsigned int i; +cfg_print_tuple(cfg_printer_t *pctx, const cfg_obj_t *obj) { + unsigned int i; const cfg_tuplefielddef_t *fields; const cfg_tuplefielddef_t *f; - bool need_space = false; + bool need_space = false; REQUIRE(pctx != NULL); REQUIRE(obj != NULL); @@ -336,17 +314,16 @@ cfg_print_tuple(cfg_printer_t *pctx, const cfg_obj_t *obj) cfg_print_cstr(pctx, " "); } cfg_print_obj(pctx, fieldobj); - need_space = - (need_space || fieldobj->type->print != cfg_print_void); + need_space = (need_space || + fieldobj->type->print != cfg_print_void); } } void -cfg_doc_tuple(cfg_printer_t *pctx, const cfg_type_t *type) -{ +cfg_doc_tuple(cfg_printer_t *pctx, const cfg_type_t *type) { const cfg_tuplefielddef_t *fields; const cfg_tuplefielddef_t *f; - bool need_space = false; + bool need_space = false; REQUIRE(pctx != NULL); REQUIRE(type != NULL); @@ -363,12 +340,11 @@ cfg_doc_tuple(cfg_printer_t *pctx, const cfg_type_t *type) } static void -free_tuple(cfg_parser_t *pctx, cfg_obj_t *obj) -{ - unsigned int i; +free_tuple(cfg_parser_t *pctx, cfg_obj_t *obj) { + unsigned int i; const cfg_tuplefielddef_t *fields = obj->type->of; const cfg_tuplefielddef_t *f; - unsigned int nfields = 0; + unsigned int nfields = 0; if (obj->value.tuple == NULL) { return; @@ -383,16 +359,14 @@ free_tuple(cfg_parser_t *pctx, cfg_obj_t *obj) } bool -cfg_obj_istuple(const cfg_obj_t *obj) -{ +cfg_obj_istuple(const cfg_obj_t *obj) { REQUIRE(obj != NULL); return (obj->type->rep == &cfg_rep_tuple); } const cfg_obj_t * -cfg_tuple_get(const cfg_obj_t *tupleobj, const char *name) -{ - unsigned int i; +cfg_tuple_get(const cfg_obj_t *tupleobj, const char *name) { + unsigned int i; const cfg_tuplefielddef_t *fields; const cfg_tuplefielddef_t *f; @@ -410,15 +384,15 @@ cfg_tuple_get(const cfg_obj_t *tupleobj, const char *name) } isc_result_t -cfg_parse_special(cfg_parser_t *pctx, int special) -{ +cfg_parse_special(cfg_parser_t *pctx, int special) { isc_result_t result; REQUIRE(pctx != NULL); CHECK(cfg_gettoken(pctx, 0)); if (pctx->token.type == isc_tokentype_special && - pctx->token.value.as_char == special) { + pctx->token.value.as_char == special) + { return (ISC_R_SUCCESS); } @@ -436,13 +410,13 @@ cleanup: * consumed or an infinite loop may result. */ static isc_result_t -parse_semicolon(cfg_parser_t *pctx) -{ +parse_semicolon(cfg_parser_t *pctx) { isc_result_t result; CHECK(cfg_gettoken(pctx, 0)); if (pctx->token.type == isc_tokentype_special && - pctx->token.value.as_char == ';') { + pctx->token.value.as_char == ';') + { return (ISC_R_SUCCESS); } @@ -456,8 +430,7 @@ cleanup: * Parse EOF, logging and returning an error if not there. */ static isc_result_t -parse_eof(cfg_parser_t *pctx) -{ +parse_eof(cfg_parser_t *pctx) { isc_result_t result; CHECK(cfg_gettoken(pctx, 0)); @@ -479,10 +452,9 @@ static cfg_type_t cfg_type_filelist = { "filelist", NULL, &cfg_rep_list, &cfg_type_qstring }; isc_result_t -cfg_parser_create(isc_mem_t *mctx, isc_log_t *lctx, cfg_parser_t **ret) -{ - isc_result_t result; - cfg_parser_t * pctx; +cfg_parser_create(isc_mem_t *mctx, isc_log_t *lctx, cfg_parser_t **ret) { + isc_result_t result; + cfg_parser_t *pctx; isc_lexspecials_t specials; REQUIRE(mctx != NULL); @@ -542,8 +514,7 @@ cleanup: } void -cfg_parser_setflags(cfg_parser_t *pctx, unsigned int flags, bool turn_on) -{ +cfg_parser_setflags(cfg_parser_t *pctx, unsigned int flags, bool turn_on) { REQUIRE(pctx != NULL); if (turn_on) { @@ -554,11 +525,10 @@ cfg_parser_setflags(cfg_parser_t *pctx, unsigned int flags, bool turn_on) } static isc_result_t -parser_openfile(cfg_parser_t *pctx, const char *filename) -{ - isc_result_t result; +parser_openfile(cfg_parser_t *pctx, const char *filename) { + isc_result_t result; cfg_listelt_t *elt = NULL; - cfg_obj_t * stringobj = NULL; + cfg_obj_t *stringobj = NULL; result = isc_lex_openfile(pctx->lexer, filename); if (result != ISC_R_SUCCESS) { @@ -580,8 +550,7 @@ cleanup: void cfg_parser_setcallback(cfg_parser_t *pctx, cfg_parsecallback_t callback, - void *arg) -{ + void *arg) { REQUIRE(pctx != NULL); pctx->callback = callback; @@ -589,8 +558,7 @@ cfg_parser_setcallback(cfg_parser_t *pctx, cfg_parsecallback_t callback, } void -cfg_parser_reset(cfg_parser_t *pctx) -{ +cfg_parser_reset(cfg_parser_t *pctx) { REQUIRE(pctx != NULL); if (pctx->lexer != NULL) { @@ -609,10 +577,9 @@ cfg_parser_reset(cfg_parser_t *pctx) * been set up with a source. */ static isc_result_t -parse2(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse2(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; - cfg_obj_t * obj = NULL; + cfg_obj_t *obj = NULL; result = cfg_parse_obj(pctx, type, &obj); @@ -643,9 +610,8 @@ cleanup: isc_result_t cfg_parse_file(cfg_parser_t *pctx, const char *filename, const cfg_type_t *type, - cfg_obj_t **ret) -{ - isc_result_t result; + cfg_obj_t **ret) { + isc_result_t result; cfg_listelt_t *elt; REQUIRE(pctx != NULL); @@ -670,8 +636,7 @@ cleanup: isc_result_t cfg_parse_buffer(cfg_parser_t *pctx, isc_buffer_t *buffer, const char *file, unsigned int line, const cfg_type_t *type, unsigned int flags, - cfg_obj_t **ret) -{ + cfg_obj_t **ret) { isc_result_t result; REQUIRE(pctx != NULL); @@ -697,8 +662,7 @@ cleanup: } void -cfg_parser_attach(cfg_parser_t *src, cfg_parser_t **dest) -{ +cfg_parser_attach(cfg_parser_t *src, cfg_parser_t **dest) { REQUIRE(src != NULL); REQUIRE(dest != NULL && *dest == NULL); @@ -707,8 +671,7 @@ cfg_parser_attach(cfg_parser_t *src, cfg_parser_t **dest) } void -cfg_parser_destroy(cfg_parser_t **pctxp) -{ +cfg_parser_destroy(cfg_parser_t **pctxp) { cfg_parser_t *pctx; REQUIRE(pctxp != NULL && *pctxp != NULL); @@ -732,8 +695,7 @@ cfg_parser_destroy(cfg_parser_t **pctxp) * void */ isc_result_t -cfg_parse_void(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +cfg_parse_void(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { REQUIRE(pctx != NULL); REQUIRE(ret != NULL && *ret == NULL); @@ -743,8 +705,7 @@ cfg_parse_void(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) } void -cfg_print_void(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +cfg_print_void(cfg_printer_t *pctx, const cfg_obj_t *obj) { REQUIRE(pctx != NULL); REQUIRE(obj != NULL); @@ -753,8 +714,7 @@ cfg_print_void(cfg_printer_t *pctx, const cfg_obj_t *obj) } void -cfg_doc_void(cfg_printer_t *pctx, const cfg_type_t *type) -{ +cfg_doc_void(cfg_printer_t *pctx, const cfg_type_t *type) { REQUIRE(pctx != NULL); REQUIRE(type != NULL); @@ -763,8 +723,7 @@ cfg_doc_void(cfg_printer_t *pctx, const cfg_type_t *type) } bool -cfg_obj_isvoid(const cfg_obj_t *obj) -{ +cfg_obj_isvoid(const cfg_obj_t *obj) { REQUIRE(obj != NULL); return (obj->type->rep == &cfg_rep_void); } @@ -779,12 +738,11 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_void = { */ isc_result_t cfg_parse_percentage(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret) -{ - char * endp; + cfg_obj_t **ret) { + char *endp; isc_result_t result; - cfg_obj_t * obj = NULL; - uint64_t percent; + cfg_obj_t *obj = NULL; + uint64_t percent; REQUIRE(pctx != NULL); REQUIRE(ret != NULL && *ret == NULL); @@ -812,10 +770,9 @@ cleanup: } void -cfg_print_percentage(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +cfg_print_percentage(cfg_printer_t *pctx, const cfg_obj_t *obj) { char buf[64]; - int n; + int n; REQUIRE(pctx != NULL); REQUIRE(obj != NULL); @@ -826,8 +783,7 @@ cfg_print_percentage(cfg_printer_t *pctx, const cfg_obj_t *obj) } uint32_t -cfg_obj_aspercentage(const cfg_obj_t *obj) -{ +cfg_obj_aspercentage(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_percentage); return (obj->value.uint32); } @@ -838,8 +794,7 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_percentage = { }; bool -cfg_obj_ispercentage(const cfg_obj_t *obj) -{ +cfg_obj_ispercentage(const cfg_obj_t *obj) { REQUIRE(obj != NULL); return (obj->type->rep == &cfg_rep_percentage); } @@ -849,12 +804,11 @@ cfg_obj_ispercentage(const cfg_obj_t *obj) */ isc_result_t cfg_parse_fixedpoint(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret) -{ + cfg_obj_t **ret) { isc_result_t result; - cfg_obj_t * obj = NULL; - size_t n1, n2, n3, l; - const char * p; + cfg_obj_t *obj = NULL; + size_t n1, n2, n3, l; + const char *p; REQUIRE(pctx != NULL); REQUIRE(ret != NULL && *ret == NULL); @@ -874,8 +828,8 @@ cfg_parse_fixedpoint(cfg_parser_t *pctx, const cfg_type_t *type, n2 = strspn(p + n1, "."); n3 = strspn(p + n1 + n2, "0123456789"); - if ((n1 + n2 + n3 != l) || (n1 + n3 == 0) || n1 > 5 || n2 > 1 || - n3 > 2) { + if ((n1 + n2 + n3 != l) || (n1 + n3 == 0) || n1 > 5 || n2 > 1 || n3 > 2) + { cfg_parser_error(pctx, CFG_LOG_NEAR, "expected fixed point number"); return (ISC_R_UNEXPECTEDTOKEN); @@ -899,10 +853,9 @@ cleanup: } void -cfg_print_fixedpoint(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +cfg_print_fixedpoint(cfg_printer_t *pctx, const cfg_obj_t *obj) { char buf[64]; - int n; + int n; REQUIRE(pctx != NULL); REQUIRE(obj != NULL); @@ -914,8 +867,7 @@ cfg_print_fixedpoint(cfg_printer_t *pctx, const cfg_obj_t *obj) } uint32_t -cfg_obj_asfixedpoint(const cfg_obj_t *obj) -{ +cfg_obj_asfixedpoint(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_fixedpoint); return (obj->value.uint32); } @@ -926,8 +878,7 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_fixedpoint = { }; bool -cfg_obj_isfixedpoint(const cfg_obj_t *obj) -{ +cfg_obj_isfixedpoint(const cfg_obj_t *obj) { REQUIRE(obj != NULL); return (obj->type->rep == &cfg_rep_fixedpoint); } @@ -936,10 +887,9 @@ cfg_obj_isfixedpoint(const cfg_obj_t *obj) * uint32 */ isc_result_t -cfg_parse_uint32(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +cfg_parse_uint32(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; - cfg_obj_t * obj = NULL; + cfg_obj_t *obj = NULL; REQUIRE(pctx != NULL); REQUIRE(ret != NULL && *ret == NULL); @@ -961,14 +911,12 @@ cleanup: } void -cfg_print_cstr(cfg_printer_t *pctx, const char *s) -{ +cfg_print_cstr(cfg_printer_t *pctx, const char *s) { cfg_print_chars(pctx, s, strlen(s)); } void -cfg_print_rawuint(cfg_printer_t *pctx, unsigned int u) -{ +cfg_print_rawuint(cfg_printer_t *pctx, unsigned int u) { char buf[32]; snprintf(buf, sizeof(buf), "%u", u); @@ -976,21 +924,18 @@ cfg_print_rawuint(cfg_printer_t *pctx, unsigned int u) } void -cfg_print_uint32(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +cfg_print_uint32(cfg_printer_t *pctx, const cfg_obj_t *obj) { cfg_print_rawuint(pctx, obj->value.uint32); } bool -cfg_obj_isuint32(const cfg_obj_t *obj) -{ +cfg_obj_isuint32(const cfg_obj_t *obj) { REQUIRE(obj != NULL); return (obj->type->rep == &cfg_rep_uint32); } uint32_t -cfg_obj_asuint32(const cfg_obj_t *obj) -{ +cfg_obj_asuint32(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_uint32); return (obj->value.uint32); } @@ -1004,22 +949,19 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_uint32 = { * uint64 */ bool -cfg_obj_isuint64(const cfg_obj_t *obj) -{ +cfg_obj_isuint64(const cfg_obj_t *obj) { REQUIRE(obj != NULL); return (obj->type->rep == &cfg_rep_uint64); } uint64_t -cfg_obj_asuint64(const cfg_obj_t *obj) -{ +cfg_obj_asuint64(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_uint64); return (obj->value.uint64); } void -cfg_print_uint64(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +cfg_print_uint64(cfg_printer_t *pctx, const cfg_obj_t *obj) { char buf[32]; snprintf(buf, sizeof(buf), "%" PRIu64, obj->value.uint64); @@ -1035,10 +977,9 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_uint64 = { * Get the number of digits in a number. */ static size_t -numlen(uint32_t num) -{ +numlen(uint32_t num) { uint32_t period = num; - size_t count = 0; + size_t count = 0; if (period == 0) { return (1); @@ -1054,13 +995,12 @@ numlen(uint32_t num) * duration */ void -cfg_print_duration(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ - char buf[CFG_DURATION_MAXLEN]; - char * str; - const char * indicators = "YMWDHMS"; - int count, i; - int durationlen[7]; +cfg_print_duration(cfg_printer_t *pctx, const cfg_obj_t *obj) { + char buf[CFG_DURATION_MAXLEN]; + char *str; + const char *indicators = "YMWDHMS"; + int count, i; + int durationlen[7]; cfg_duration_t duration; /* * D ? The duration has a date part. @@ -1141,8 +1081,7 @@ cfg_print_duration(cfg_printer_t *pctx, const cfg_obj_t *obj) } void -cfg_print_duration_or_unlimited(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +cfg_print_duration_or_unlimited(cfg_printer_t *pctx, const cfg_obj_t *obj) { cfg_duration_t duration; REQUIRE(pctx != NULL); @@ -1158,15 +1097,13 @@ cfg_print_duration_or_unlimited(cfg_printer_t *pctx, const cfg_obj_t *obj) } bool -cfg_obj_isduration(const cfg_obj_t *obj) -{ +cfg_obj_isduration(const cfg_obj_t *obj) { REQUIRE(obj != NULL); return (obj->type->rep == &cfg_rep_duration); } uint32_t -cfg_obj_asduration(const cfg_obj_t *obj) -{ +cfg_obj_asduration(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_duration); uint32_t duration = 0; duration += obj->value.duration.parts[6]; /* Seconds */ @@ -1212,12 +1149,11 @@ cfg_obj_asduration(const cfg_obj_t *obj) * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ static isc_result_t -duration_fromtext(isc_textregion_t *source, cfg_duration_t *duration) -{ - char buf[CFG_DURATION_MAXLEN]; +duration_fromtext(isc_textregion_t *source, cfg_duration_t *duration) { + char buf[CFG_DURATION_MAXLEN]; char *P, *X, *T, *W, *str; - bool not_weeks = false; - int i; + bool not_weeks = false; + int i; /* * Copy the buffer as it may not be NULL terminated. @@ -1329,10 +1265,9 @@ duration_fromtext(isc_textregion_t *source, cfg_duration_t *duration) } static isc_result_t -parse_duration(cfg_parser_t *pctx, cfg_obj_t **ret) -{ - isc_result_t result; - cfg_obj_t * obj = NULL; +parse_duration(cfg_parser_t *pctx, cfg_obj_t **ret) { + isc_result_t result; + cfg_obj_t *obj = NULL; cfg_duration_t duration; duration.unlimited = false; @@ -1377,8 +1312,8 @@ cleanup: } isc_result_t -cfg_parse_duration(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +cfg_parse_duration(cfg_parser_t *pctx, const cfg_type_t *type, + cfg_obj_t **ret) { isc_result_t result; UNUSED(type); @@ -1399,10 +1334,9 @@ cleanup: isc_result_t cfg_parse_duration_or_unlimited(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret) -{ - isc_result_t result; - cfg_obj_t * obj = NULL; + cfg_obj_t **ret) { + isc_result_t result; + cfg_obj_t *obj = NULL; cfg_duration_t duration; UNUSED(type); @@ -1470,11 +1404,10 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_duration_or_unlimited = { /* Create a string object from a null-terminated C string. */ static isc_result_t create_string(cfg_parser_t *pctx, const char *contents, const cfg_type_t *type, - cfg_obj_t **ret) -{ + cfg_obj_t **ret) { isc_result_t result; - cfg_obj_t * obj = NULL; - int len; + cfg_obj_t *obj = NULL; + int len; CHECK(cfg_create_obj(pctx, type, &obj)); len = strlen(contents); @@ -1493,8 +1426,7 @@ cleanup: } isc_result_t -cfg_parse_qstring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +cfg_parse_qstring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; REQUIRE(pctx != NULL); @@ -1514,8 +1446,7 @@ cleanup: } static isc_result_t -parse_ustring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_ustring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; UNUSED(type); @@ -1533,8 +1464,7 @@ cleanup: } isc_result_t -cfg_parse_astring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +cfg_parse_astring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; REQUIRE(pctx != NULL); @@ -1550,8 +1480,7 @@ cleanup: } isc_result_t -cfg_parse_sstring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +cfg_parse_sstring(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; REQUIRE(pctx != NULL); @@ -1567,8 +1496,7 @@ cleanup: } static isc_result_t -parse_btext(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_btext(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; UNUSED(type); @@ -1585,8 +1513,7 @@ cleanup: } static void -print_btext(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +print_btext(cfg_printer_t *pctx, const cfg_obj_t *obj) { /* * We need to print "{" instead of running print_open() * in order to preserve the exact original formatting @@ -1601,16 +1528,14 @@ print_btext(cfg_printer_t *pctx, const cfg_obj_t *obj) } static void -doc_btext(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_btext(cfg_printer_t *pctx, const cfg_type_t *type) { UNUSED(type); cfg_print_cstr(pctx, "{ }"); } bool -cfg_is_enum(const char *s, const char *const *enums) -{ +cfg_is_enum(const char *s, const char *const *enums) { const char *const *p; REQUIRE(s != NULL); @@ -1625,8 +1550,7 @@ cfg_is_enum(const char *s, const char *const *enums) } static isc_result_t -check_enum(cfg_parser_t *pctx, cfg_obj_t *obj, const char *const *enums) -{ +check_enum(cfg_parser_t *pctx, cfg_obj_t *obj, const char *const *enums) { const char *s = obj->value.string.base; if (cfg_is_enum(s, enums)) { @@ -1637,10 +1561,9 @@ check_enum(cfg_parser_t *pctx, cfg_obj_t *obj, const char *const *enums) } isc_result_t -cfg_parse_enum(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +cfg_parse_enum(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; - cfg_obj_t * obj = NULL; + cfg_obj_t *obj = NULL; REQUIRE(pctx != NULL); REQUIRE(type != NULL); @@ -1656,8 +1579,7 @@ cleanup: } void -cfg_doc_enum(cfg_printer_t *pctx, const cfg_type_t *type) -{ +cfg_doc_enum(cfg_printer_t *pctx, const cfg_type_t *type) { const char *const *p; REQUIRE(pctx != NULL); @@ -1675,12 +1597,12 @@ cfg_doc_enum(cfg_printer_t *pctx, const cfg_type_t *type) isc_result_t cfg_parse_enum_or_other(cfg_parser_t *pctx, const cfg_type_t *enumtype, - const cfg_type_t *othertype, cfg_obj_t **ret) -{ + const cfg_type_t *othertype, cfg_obj_t **ret) { isc_result_t result; CHECK(cfg_peektoken(pctx, 0)); if (pctx->token.type == isc_tokentype_string && - cfg_is_enum(TOKEN_STRING(pctx), enumtype->of)) { + cfg_is_enum(TOKEN_STRING(pctx), enumtype->of)) + { CHECK(cfg_parse_enum(pctx, enumtype, ret)); } else { CHECK(cfg_parse_obj(pctx, othertype, ret)); @@ -1691,10 +1613,9 @@ cleanup: void cfg_doc_enum_or_other(cfg_printer_t *pctx, const cfg_type_t *enumtype, - const cfg_type_t *othertype) -{ + const cfg_type_t *othertype) { const char *const *p; - bool first = true; + bool first = true; /* * If othertype is cfg_type_void, it means that enumtype is @@ -1725,8 +1646,7 @@ cfg_doc_enum_or_other(cfg_printer_t *pctx, const cfg_type_t *enumtype, } void -cfg_print_ustring(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +cfg_print_ustring(cfg_printer_t *pctx, const cfg_obj_t *obj) { REQUIRE(pctx != NULL); REQUIRE(obj != NULL); @@ -1734,16 +1654,14 @@ cfg_print_ustring(cfg_printer_t *pctx, const cfg_obj_t *obj) } static void -print_qstring(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +print_qstring(cfg_printer_t *pctx, const cfg_obj_t *obj) { cfg_print_cstr(pctx, "\""); cfg_print_ustring(pctx, obj); cfg_print_cstr(pctx, "\""); } static void -print_sstring(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +print_sstring(cfg_printer_t *pctx, const cfg_obj_t *obj) { cfg_print_cstr(pctx, "\""); if ((pctx->flags & CFG_PRINTER_XKEY) != 0) { unsigned int len = obj->value.string.length; @@ -1757,22 +1675,19 @@ print_sstring(cfg_printer_t *pctx, const cfg_obj_t *obj) } static void -free_string(cfg_parser_t *pctx, cfg_obj_t *obj) -{ +free_string(cfg_parser_t *pctx, cfg_obj_t *obj) { isc_mem_put(pctx->mctx, obj->value.string.base, obj->value.string.length + 1); } bool -cfg_obj_isstring(const cfg_obj_t *obj) -{ +cfg_obj_isstring(const cfg_obj_t *obj) { REQUIRE(obj != NULL); return (obj->type->rep == &cfg_rep_string); } const char * -cfg_obj_asstring(const cfg_obj_t *obj) -{ +cfg_obj_asstring(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_string); return (obj->value.string.base); } @@ -1842,10 +1757,9 @@ static cfg_type_t cfg_type_geoip = { "geoip", parse_geoip, print_geoip, doc_geoip, &cfg_rep_tuple, geoip_fields }; static isc_result_t -parse_geoip(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ - isc_result_t result; - cfg_obj_t * obj = NULL; +parse_geoip(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { + isc_result_t result; + cfg_obj_t *obj = NULL; const cfg_tuplefielddef_t *fields = type->of; CHECK(cfg_create_tuple(pctx, type, &obj)); @@ -1877,8 +1791,7 @@ cleanup: } static void -print_geoip(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +print_geoip(cfg_printer_t *pctx, const cfg_obj_t *obj) { if (obj->value.tuple[1]->type->print != cfg_print_void) { cfg_print_cstr(pctx, " db "); cfg_print_obj(pctx, obj->value.tuple[1]); @@ -1888,8 +1801,7 @@ print_geoip(cfg_printer_t *pctx, const cfg_obj_t *obj) } static void -doc_geoip(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_geoip(cfg_printer_t *pctx, const cfg_type_t *type) { UNUSED(type); cfg_print_cstr(pctx, "[ db "); cfg_doc_obj(pctx, &cfg_type_astring); @@ -1905,20 +1817,23 @@ static cfg_type_t cfg_type_addrmatchelt; static cfg_type_t cfg_type_negated; static isc_result_t -parse_addrmatchelt(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +parse_addrmatchelt(cfg_parser_t *pctx, const cfg_type_t *type, + cfg_obj_t **ret) { isc_result_t result; UNUSED(type); CHECK(cfg_peektoken(pctx, CFG_LEXOPT_QSTRING)); if (pctx->token.type == isc_tokentype_string || - pctx->token.type == isc_tokentype_qstring) { + pctx->token.type == isc_tokentype_qstring) + { if (pctx->token.type == isc_tokentype_string && - (strcasecmp(TOKEN_STRING(pctx), "key") == 0)) { + (strcasecmp(TOKEN_STRING(pctx), "key") == 0)) + { CHECK(cfg_parse_obj(pctx, &cfg_type_keyref, ret)); } else if (pctx->token.type == isc_tokentype_string && - (strcasecmp(TOKEN_STRING(pctx), "geoip") == 0)) { + (strcasecmp(TOKEN_STRING(pctx), "geoip") == 0)) + { #if defined(HAVE_GEOIP2) CHECK(cfg_gettoken(pctx, 0)); CHECK(cfg_parse_obj(pctx, &cfg_type_geoip, ret)); @@ -1931,7 +1846,8 @@ parse_addrmatchelt(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) } else { if (cfg_lookingat_netaddr( pctx, CFG_ADDR_V4OK | CFG_ADDR_V4PREFIXOK | - CFG_ADDR_V6OK)) { + CFG_ADDR_V6OK)) + { CHECK(cfg_parse_netprefix(pctx, NULL, ret)); } else { CHECK(cfg_parse_astring(pctx, NULL, ret)); @@ -1968,8 +1884,7 @@ static cfg_tuplefielddef_t negated_fields[] = { }; static void -print_negated(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +print_negated(cfg_printer_t *pctx, const cfg_obj_t *obj) { cfg_print_cstr(pctx, "!"); cfg_print_tuple(pctx, obj); } @@ -2004,8 +1919,7 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_bracketed_aml = { */ static isc_result_t parse_optional_btext(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret) -{ + cfg_obj_t **ret) { isc_result_t result; UNUSED(type); @@ -2021,8 +1935,7 @@ cleanup: } static void -print_optional_btext(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +print_optional_btext(cfg_printer_t *pctx, const cfg_obj_t *obj) { if (obj->type == &cfg_type_void) { return; } @@ -2034,8 +1947,7 @@ print_optional_btext(cfg_printer_t *pctx, const cfg_obj_t *obj) } static void -doc_optional_btext(cfg_printer_t *pctx, const cfg_type_t *type) -{ +doc_optional_btext(cfg_printer_t *pctx, const cfg_type_t *type) { UNUSED(type); cfg_print_cstr(pctx, "[ { } ]"); @@ -2055,25 +1967,22 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_optional_bracketed_text = { */ bool -cfg_obj_isboolean(const cfg_obj_t *obj) -{ +cfg_obj_isboolean(const cfg_obj_t *obj) { REQUIRE(obj != NULL); return (obj->type->rep == &cfg_rep_boolean); } bool -cfg_obj_asboolean(const cfg_obj_t *obj) -{ +cfg_obj_asboolean(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_boolean); return (obj->value.boolean); } isc_result_t -cfg_parse_boolean(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +cfg_parse_boolean(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; - bool value; - cfg_obj_t * obj = NULL; + bool value; + cfg_obj_t *obj = NULL; REQUIRE(pctx != NULL); REQUIRE(ret != NULL && *ret == NULL); @@ -2091,11 +2000,13 @@ cfg_parse_boolean(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) if ((strcasecmp(TOKEN_STRING(pctx), "true") == 0) || (strcasecmp(TOKEN_STRING(pctx), "yes") == 0) || - (strcmp(TOKEN_STRING(pctx), "1") == 0)) { + (strcmp(TOKEN_STRING(pctx), "1") == 0)) + { value = true; } else if ((strcasecmp(TOKEN_STRING(pctx), "false") == 0) || (strcasecmp(TOKEN_STRING(pctx), "no") == 0) || - (strcmp(TOKEN_STRING(pctx), "0") == 0)) { + (strcmp(TOKEN_STRING(pctx), "0") == 0)) + { value = false; } else { goto bad_boolean; @@ -2115,8 +2026,7 @@ cleanup: } void -cfg_print_boolean(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +cfg_print_boolean(cfg_printer_t *pctx, const cfg_obj_t *obj) { REQUIRE(pctx != NULL); REQUIRE(obj != NULL); @@ -2137,8 +2047,7 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_boolean = { */ isc_result_t -cfg_create_list(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **obj) -{ +cfg_create_list(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **obj) { isc_result_t result; REQUIRE(pctx != NULL); @@ -2152,8 +2061,7 @@ cleanup: } static isc_result_t -create_listelt(cfg_parser_t *pctx, cfg_listelt_t **eltp) -{ +create_listelt(cfg_parser_t *pctx, cfg_listelt_t **eltp) { cfg_listelt_t *elt; elt = isc_mem_get(pctx->mctx, sizeof(*elt)); @@ -2164,8 +2072,7 @@ create_listelt(cfg_parser_t *pctx, cfg_listelt_t **eltp) } static void -free_listelt(cfg_parser_t *pctx, cfg_listelt_t *elt) -{ +free_listelt(cfg_parser_t *pctx, cfg_listelt_t *elt) { if (elt->obj != NULL) { cfg_obj_destroy(pctx, &elt->obj); } @@ -2173,8 +2080,7 @@ free_listelt(cfg_parser_t *pctx, cfg_listelt_t *elt) } static void -free_list(cfg_parser_t *pctx, cfg_obj_t *obj) -{ +free_list(cfg_parser_t *pctx, cfg_obj_t *obj) { cfg_listelt_t *elt, *next; for (elt = ISC_LIST_HEAD(obj->value.list); elt != NULL; elt = next) { next = ISC_LIST_NEXT(elt, link); @@ -2184,11 +2090,10 @@ free_list(cfg_parser_t *pctx, cfg_obj_t *obj) isc_result_t cfg_parse_listelt(cfg_parser_t *pctx, const cfg_type_t *elttype, - cfg_listelt_t **ret) -{ - isc_result_t result; + cfg_listelt_t **ret) { + isc_result_t result; cfg_listelt_t *elt = NULL; - cfg_obj_t * value = NULL; + cfg_obj_t *value = NULL; REQUIRE(pctx != NULL); REQUIRE(elttype != NULL); @@ -2216,19 +2121,19 @@ cleanup: * and where each element is terminated by a semicolon. */ static isc_result_t -parse_list(cfg_parser_t *pctx, const cfg_type_t *listtype, cfg_obj_t **ret) -{ - cfg_obj_t * listobj = NULL; +parse_list(cfg_parser_t *pctx, const cfg_type_t *listtype, cfg_obj_t **ret) { + cfg_obj_t *listobj = NULL; const cfg_type_t *listof = listtype->of; - isc_result_t result; - cfg_listelt_t * elt = NULL; + isc_result_t result; + cfg_listelt_t *elt = NULL; CHECK(cfg_create_list(pctx, listtype, &listobj)); for (;;) { CHECK(cfg_peektoken(pctx, 0)); if (pctx->token.type == isc_tokentype_special && - pctx->token.value.as_char == /*{*/ '}') { + pctx->token.value.as_char == /*{*/ '}') + { break; } CHECK(cfg_parse_listelt(pctx, listof, &elt)); @@ -2248,9 +2153,8 @@ cleanup: } static void -print_list(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ - const cfg_list_t * list = &obj->value.list; +print_list(cfg_printer_t *pctx, const cfg_obj_t *obj) { + const cfg_list_t *list = &obj->value.list; const cfg_listelt_t *elt; for (elt = ISC_LIST_HEAD(*list); elt != NULL; @@ -2268,8 +2172,7 @@ print_list(cfg_printer_t *pctx, const cfg_obj_t *obj) isc_result_t cfg_parse_bracketed_list(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret) -{ + cfg_obj_t **ret) { isc_result_t result; REQUIRE(pctx != NULL); @@ -2284,8 +2187,7 @@ cleanup: } void -cfg_print_bracketed_list(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +cfg_print_bracketed_list(cfg_printer_t *pctx, const cfg_obj_t *obj) { REQUIRE(pctx != NULL); REQUIRE(obj != NULL); @@ -2295,8 +2197,7 @@ cfg_print_bracketed_list(cfg_printer_t *pctx, const cfg_obj_t *obj) } void -cfg_doc_bracketed_list(cfg_printer_t *pctx, const cfg_type_t *type) -{ +cfg_doc_bracketed_list(cfg_printer_t *pctx, const cfg_type_t *type) { REQUIRE(pctx != NULL); REQUIRE(type != NULL); @@ -2312,11 +2213,10 @@ cfg_doc_bracketed_list(cfg_printer_t *pctx, const cfg_type_t *type) */ isc_result_t cfg_parse_spacelist(cfg_parser_t *pctx, const cfg_type_t *listtype, - cfg_obj_t **ret) -{ - cfg_obj_t * listobj = NULL; + cfg_obj_t **ret) { + cfg_obj_t *listobj = NULL; const cfg_type_t *listof; - isc_result_t result; + isc_result_t result; REQUIRE(pctx != NULL); REQUIRE(listtype != NULL); @@ -2331,7 +2231,8 @@ cfg_parse_spacelist(cfg_parser_t *pctx, const cfg_type_t *listtype, CHECK(cfg_peektoken(pctx, 0)); if (pctx->token.type == isc_tokentype_special && - pctx->token.value.as_char == ';') { + pctx->token.value.as_char == ';') + { break; } CHECK(cfg_parse_listelt(pctx, listof, &elt)); @@ -2346,9 +2247,8 @@ cleanup: } void -cfg_print_spacelist(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ - const cfg_list_t * list = &obj->value.list; +cfg_print_spacelist(cfg_printer_t *pctx, const cfg_obj_t *obj) { + const cfg_list_t *list = &obj->value.list; const cfg_listelt_t *elt; REQUIRE(pctx != NULL); @@ -2364,15 +2264,13 @@ cfg_print_spacelist(cfg_printer_t *pctx, const cfg_obj_t *obj) } bool -cfg_obj_islist(const cfg_obj_t *obj) -{ +cfg_obj_islist(const cfg_obj_t *obj) { REQUIRE(obj != NULL); return (obj->type->rep == &cfg_rep_list); } const cfg_listelt_t * -cfg_list_first(const cfg_obj_t *obj) -{ +cfg_list_first(const cfg_obj_t *obj) { REQUIRE(obj == NULL || obj->type->rep == &cfg_rep_list); if (obj == NULL) { return (NULL); @@ -2381,8 +2279,7 @@ cfg_list_first(const cfg_obj_t *obj) } const cfg_listelt_t * -cfg_list_next(const cfg_listelt_t *elt) -{ +cfg_list_next(const cfg_listelt_t *elt) { REQUIRE(elt != NULL); return (ISC_LIST_NEXT(elt, link)); } @@ -2392,10 +2289,9 @@ cfg_list_next(const cfg_listelt_t *elt) * a list, return 0. */ unsigned int -cfg_list_length(const cfg_obj_t *obj, bool recurse) -{ +cfg_list_length(const cfg_obj_t *obj, bool recurse) { const cfg_listelt_t *elt; - unsigned int count = 0; + unsigned int count = 0; if (obj == NULL || !cfg_obj_islist(obj)) { return (0U); @@ -2411,8 +2307,7 @@ cfg_list_length(const cfg_obj_t *obj, bool recurse) } cfg_obj_t * -cfg_listelt_value(const cfg_listelt_t *elt) -{ +cfg_listelt_value(const cfg_listelt_t *elt) { REQUIRE(elt != NULL); return (elt->obj); } @@ -2432,18 +2327,17 @@ cfg_listelt_value(const cfg_listelt_t *elt) * options, view, zone, and other statements. */ isc_result_t -cfg_parse_mapbody(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +cfg_parse_mapbody(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { const cfg_clausedef_t *const *clausesets; - isc_result_t result; + isc_result_t result; const cfg_clausedef_t *const *clauseset; - const cfg_clausedef_t * clause; - cfg_obj_t * value = NULL; - cfg_obj_t * obj = NULL; - cfg_obj_t * eltobj = NULL; - cfg_obj_t * includename = NULL; - isc_symvalue_t symval; - cfg_list_t * list = NULL; + const cfg_clausedef_t *clause; + cfg_obj_t *value = NULL; + cfg_obj_t *obj = NULL; + cfg_obj_t *eltobj = NULL; + cfg_obj_t *includename = NULL; + isc_symvalue_t symval; + cfg_list_t *list = NULL; REQUIRE(pctx != NULL); REQUIRE(type != NULL); @@ -2525,7 +2419,8 @@ cfg_parse_mapbody(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) /* Issue warnings if appropriate */ if ((pctx->flags & CFG_PCTX_NODEPRECATED) == 0 && - (clause->flags & CFG_CLAUSEFLAG_DEPRECATED) != 0) { + (clause->flags & CFG_CLAUSEFLAG_DEPRECATED) != 0) + { cfg_parser_warning(pctx, 0, "option '%s' is deprecated", clause->name); } @@ -2605,9 +2500,9 @@ cfg_parse_mapbody(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) } else { /* Single-valued clause */ if (result == ISC_R_NOTFOUND) { - bool callback = - ((clause->flags & - CFG_CLAUSEFLAG_CALLBACK) != 0); + bool callback = ((clause->flags & + CFG_CLAUSEFLAG_CALLBACK) != + 0); CHECK(parse_symtab_elt( pctx, clause->name, clause->type, obj->value.map.symtab, callback)); @@ -2639,10 +2534,9 @@ cleanup: static isc_result_t parse_symtab_elt(cfg_parser_t *pctx, const char *name, cfg_type_t *elttype, - isc_symtab_t *symtab, bool callback) -{ - isc_result_t result; - cfg_obj_t * obj = NULL; + isc_symtab_t *symtab, bool callback) { + isc_result_t result; + cfg_obj_t *obj = NULL; isc_symvalue_t symval; CHECK(cfg_parse_obj(pctx, elttype, &obj)); @@ -2664,8 +2558,7 @@ cleanup: * Parse a map; e.g., "{ foo 1; bar { glub; }; zap true; zap false; }" */ isc_result_t -cfg_parse_map(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +cfg_parse_map(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; REQUIRE(pctx != NULL); @@ -2684,11 +2577,10 @@ cleanup: */ static isc_result_t parse_any_named_map(cfg_parser_t *pctx, cfg_type_t *nametype, - const cfg_type_t *type, cfg_obj_t **ret) -{ + const cfg_type_t *type, cfg_obj_t **ret) { isc_result_t result; - cfg_obj_t * idobj = NULL; - cfg_obj_t * mapobj = NULL; + cfg_obj_t *idobj = NULL; + cfg_obj_t *mapobj = NULL; REQUIRE(pctx != NULL); REQUIRE(nametype != NULL); @@ -2711,8 +2603,8 @@ cleanup: * Used for the "key" and "channel" statements. */ isc_result_t -cfg_parse_named_map(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +cfg_parse_named_map(cfg_parser_t *pctx, const cfg_type_t *type, + cfg_obj_t **ret) { return (parse_any_named_map(pctx, &cfg_type_astring, type, ret)); } @@ -2722,8 +2614,7 @@ cfg_parse_named_map(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) */ isc_result_t cfg_parse_addressed_map(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret) -{ + cfg_obj_t **ret) { return (parse_any_named_map(pctx, &cfg_type_netaddr, type, ret)); } @@ -2733,14 +2624,12 @@ cfg_parse_addressed_map(cfg_parser_t *pctx, const cfg_type_t *type, */ isc_result_t cfg_parse_netprefix_map(cfg_parser_t *pctx, const cfg_type_t *type, - cfg_obj_t **ret) -{ + cfg_obj_t **ret) { return (parse_any_named_map(pctx, &cfg_type_netprefix, type, ret)); } static void -print_symval(cfg_printer_t *pctx, const char *name, cfg_obj_t *obj) -{ +print_symval(cfg_printer_t *pctx, const char *name, cfg_obj_t *obj) { if ((pctx->flags & CFG_PRINTER_ONELINE) == 0) { cfg_print_indent(pctx); } @@ -2757,8 +2646,7 @@ print_symval(cfg_printer_t *pctx, const char *name, cfg_obj_t *obj) } void -cfg_print_mapbody(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +cfg_print_mapbody(cfg_printer_t *pctx, const cfg_obj_t *obj) { const cfg_clausedef_t *const *clauseset; REQUIRE(pctx != NULL); @@ -2766,7 +2654,7 @@ cfg_print_mapbody(cfg_printer_t *pctx, const cfg_obj_t *obj) for (clauseset = obj->value.map.clausesets; *clauseset != NULL; clauseset++) { - isc_symvalue_t symval; + isc_symvalue_t symval; const cfg_clausedef_t *clause; for (clause = *clauseset; clause->name != NULL; clause++) { @@ -2802,7 +2690,7 @@ cfg_print_mapbody(cfg_printer_t *pctx, const cfg_obj_t *obj) static struct flagtext { unsigned int flag; - const char * text; + const char *text; } flagtexts[] = { { CFG_CLAUSEFLAG_NOTIMP, "not implemented" }, { CFG_CLAUSEFLAG_NYI, "not yet implemented" }, { CFG_CLAUSEFLAG_OBSOLETE, "obsolete" }, @@ -2817,10 +2705,9 @@ static struct flagtext { { 0, NULL } }; void -cfg_print_clauseflags(cfg_printer_t *pctx, unsigned int flags) -{ +cfg_print_clauseflags(cfg_printer_t *pctx, unsigned int flags) { struct flagtext *p; - bool first = true; + bool first = true; for (p = flagtexts; p->flag != 0; p++) { if ((flags & p->flag) != 0) { if (first) { @@ -2835,10 +2722,9 @@ cfg_print_clauseflags(cfg_printer_t *pctx, unsigned int flags) } void -cfg_doc_mapbody(cfg_printer_t *pctx, const cfg_type_t *type) -{ +cfg_doc_mapbody(cfg_printer_t *pctx, const cfg_type_t *type) { const cfg_clausedef_t *const *clauseset; - const cfg_clausedef_t * clause; + const cfg_clausedef_t *clause; REQUIRE(pctx != NULL); REQUIRE(type != NULL); @@ -2849,7 +2735,8 @@ cfg_doc_mapbody(cfg_printer_t *pctx, const cfg_type_t *type) (((clause->flags & CFG_CLAUSEFLAG_OBSOLETE) != 0) || ((clause->flags & CFG_CLAUSEFLAG_ANCIENT) != 0) || ((clause->flags & CFG_CLAUSEFLAG_NYI) != 0) || - ((clause->flags & CFG_CLAUSEFLAG_TESTONLY) != 0))) { + ((clause->flags & CFG_CLAUSEFLAG_TESTONLY) != 0))) + { continue; } cfg_print_cstr(pctx, clause->name); @@ -2863,8 +2750,7 @@ cfg_doc_mapbody(cfg_printer_t *pctx, const cfg_type_t *type) } void -cfg_print_map(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +cfg_print_map(cfg_printer_t *pctx, const cfg_obj_t *obj) { REQUIRE(pctx != NULL); REQUIRE(obj != NULL); @@ -2878,10 +2764,9 @@ cfg_print_map(cfg_printer_t *pctx, const cfg_obj_t *obj) } void -cfg_doc_map(cfg_printer_t *pctx, const cfg_type_t *type) -{ +cfg_doc_map(cfg_printer_t *pctx, const cfg_type_t *type) { const cfg_clausedef_t *const *clauseset; - const cfg_clausedef_t * clause; + const cfg_clausedef_t *clause; REQUIRE(pctx != NULL); REQUIRE(type != NULL); @@ -2905,7 +2790,8 @@ cfg_doc_map(cfg_printer_t *pctx, const cfg_type_t *type) (((clause->flags & CFG_CLAUSEFLAG_OBSOLETE) != 0) || ((clause->flags & CFG_CLAUSEFLAG_ANCIENT) != 0) || ((clause->flags & CFG_CLAUSEFLAG_NYI) != 0) || - ((clause->flags & CFG_CLAUSEFLAG_TESTONLY) != 0))) { + ((clause->flags & CFG_CLAUSEFLAG_TESTONLY) != 0))) + { continue; } cfg_print_indent(pctx); @@ -2923,17 +2809,15 @@ cfg_doc_map(cfg_printer_t *pctx, const cfg_type_t *type) } bool -cfg_obj_ismap(const cfg_obj_t *obj) -{ +cfg_obj_ismap(const cfg_obj_t *obj) { REQUIRE(obj != NULL); return (obj->type->rep == &cfg_rep_map); } isc_result_t -cfg_map_get(const cfg_obj_t *mapobj, const char *name, const cfg_obj_t **obj) -{ - isc_result_t result; - isc_symvalue_t val; +cfg_map_get(const cfg_obj_t *mapobj, const char *name, const cfg_obj_t **obj) { + isc_result_t result; + isc_symvalue_t val; const cfg_map_t *map; REQUIRE(mapobj != NULL && mapobj->type->rep == &cfg_rep_map); @@ -2951,15 +2835,13 @@ cfg_map_get(const cfg_obj_t *mapobj, const char *name, const cfg_obj_t **obj) } const cfg_obj_t * -cfg_map_getname(const cfg_obj_t *mapobj) -{ +cfg_map_getname(const cfg_obj_t *mapobj) { REQUIRE(mapobj != NULL && mapobj->type->rep == &cfg_rep_map); return (mapobj->value.map.id); } unsigned int -cfg_map_count(const cfg_obj_t *mapobj) -{ +cfg_map_count(const cfg_obj_t *mapobj) { const cfg_map_t *map; REQUIRE(mapobj != NULL && mapobj->type->rep == &cfg_rep_map); @@ -2970,8 +2852,7 @@ cfg_map_count(const cfg_obj_t *mapobj) const char * cfg_map_firstclause(const cfg_type_t *map, const void **clauses, - unsigned int *idx) -{ + unsigned int *idx) { cfg_clausedef_t *const *clauseset; REQUIRE(map != NULL && map->rep == &cfg_rep_map); @@ -2995,8 +2876,7 @@ cfg_map_firstclause(const cfg_type_t *map, const void **clauses, const char * cfg_map_nextclause(const cfg_type_t *map, const void **clauses, - unsigned int *idx) -{ + unsigned int *idx) { cfg_clausedef_t *const *clauseset; REQUIRE(map != NULL && map->rep == &cfg_rep_map); @@ -3021,9 +2901,8 @@ cfg_map_nextclause(const cfg_type_t *map, const void **clauses, /* Parse an arbitrary token, storing its raw text representation. */ static isc_result_t -parse_token(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ - cfg_obj_t * obj = NULL; +parse_token(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { + cfg_obj_t *obj = NULL; isc_result_t result; isc_region_t r; @@ -3064,11 +2943,10 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_token = { */ static isc_result_t -parse_unsupported(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ - cfg_obj_t * listobj = NULL; +parse_unsupported(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { + cfg_obj_t *listobj = NULL; isc_result_t result; - int braces = 0; + int braces = 0; CHECK(cfg_create_list(pctx, type, &listobj)); @@ -3121,10 +2999,9 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_unsupported = { * and the IPv6 wildcard address otherwise. */ static isc_result_t -token_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) -{ - char * s; - struct in_addr in4a; +token_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) { + char *s; + struct in_addr in4a; struct in6_addr in6a; if (pctx->token.type != isc_tokentype_string) { @@ -3152,7 +3029,7 @@ token_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) } if ((flags & CFG_ADDR_V4PREFIXOK) != 0 && strlen(s) <= 15U) { char buf[64]; - int i; + int i; strlcpy(buf, s, sizeof(buf)); for (i = 0; i < 3; i++) { @@ -3164,8 +3041,8 @@ token_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) } } if ((flags & CFG_ADDR_V6OK) != 0 && strlen(s) <= 127U) { - char buf[128]; /* see lib/bind9/getaddresses.c */ - char * d; /* zone delimiter */ + char buf[128]; /* see lib/bind9/getaddresses.c */ + char *d; /* zone delimiter */ uint32_t zone = 0; /* scope zone ID */ strlcpy(buf, s, sizeof(buf)); @@ -3195,11 +3072,10 @@ token_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) } isc_result_t -cfg_parse_rawaddr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) -{ +cfg_parse_rawaddr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) { isc_result_t result; - const char * wild = ""; - const char * prefix = ""; + const char *wild = ""; + const char *prefix = ""; REQUIRE(pctx != NULL); REQUIRE(na != NULL); @@ -3232,9 +3108,8 @@ cleanup: } bool -cfg_lookingat_netaddr(cfg_parser_t *pctx, unsigned int flags) -{ - isc_result_t result; +cfg_lookingat_netaddr(cfg_parser_t *pctx, unsigned int flags) { + isc_result_t result; isc_netaddr_t na_dummy; REQUIRE(pctx != NULL); @@ -3244,8 +3119,7 @@ cfg_lookingat_netaddr(cfg_parser_t *pctx, unsigned int flags) } isc_result_t -cfg_parse_rawport(cfg_parser_t *pctx, unsigned int flags, in_port_t *port) -{ +cfg_parse_rawport(cfg_parser_t *pctx, unsigned int flags, in_port_t *port) { isc_result_t result; REQUIRE(pctx != NULL); @@ -3255,7 +3129,8 @@ cfg_parse_rawport(cfg_parser_t *pctx, unsigned int flags, in_port_t *port) if ((flags & CFG_ADDR_WILDOK) != 0 && pctx->token.type == isc_tokentype_string && - strcmp(TOKEN_STRING(pctx), "*") == 0) { + strcmp(TOKEN_STRING(pctx), "*") == 0) + { *port = 0; return (ISC_R_SUCCESS); } @@ -3276,10 +3151,9 @@ cleanup: } void -cfg_print_rawaddr(cfg_printer_t *pctx, const isc_netaddr_t *na) -{ +cfg_print_rawaddr(cfg_printer_t *pctx, const isc_netaddr_t *na) { isc_result_t result; - char text[128]; + char text[128]; isc_buffer_t buf; REQUIRE(pctx != NULL); @@ -3293,8 +3167,7 @@ cfg_print_rawaddr(cfg_printer_t *pctx, const isc_netaddr_t *na) } isc_result_t -cfg_parse_dscp(cfg_parser_t *pctx, isc_dscp_t *dscp) -{ +cfg_parse_dscp(cfg_parser_t *pctx, isc_dscp_t *dscp) { isc_result_t result; REQUIRE(pctx != NULL); @@ -3325,12 +3198,11 @@ static unsigned int netaddr6_flags = CFG_ADDR_V6OK; static unsigned int netaddr6wild_flags = CFG_ADDR_V6OK | CFG_ADDR_WILDOK; static isc_result_t -parse_netaddr(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ - isc_result_t result; - cfg_obj_t * obj = NULL; +parse_netaddr(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { + isc_result_t result; + cfg_obj_t *obj = NULL; isc_netaddr_t netaddr; - unsigned int flags = *(const unsigned int *)type->of; + unsigned int flags = *(const unsigned int *)type->of; CHECK(cfg_create_obj(pctx, type, &obj)); CHECK(cfg_parse_rawaddr(pctx, flags, &netaddr)); @@ -3343,10 +3215,9 @@ cleanup: } static void -cfg_doc_netaddr(cfg_printer_t *pctx, const cfg_type_t *type) -{ +cfg_doc_netaddr(cfg_printer_t *pctx, const cfg_type_t *type) { const unsigned int *flagp = type->of; - int n = 0; + int n = 0; if (*flagp != CFG_ADDR_V4OK && *flagp != CFG_ADDR_V6OK) { cfg_print_cstr(pctx, "( "); } @@ -3402,13 +3273,13 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_netaddr6wild = { /* netprefix */ isc_result_t -cfg_parse_netprefix(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ - cfg_obj_t * obj = NULL; - isc_result_t result; +cfg_parse_netprefix(cfg_parser_t *pctx, const cfg_type_t *type, + cfg_obj_t **ret) { + cfg_obj_t *obj = NULL; + isc_result_t result; isc_netaddr_t netaddr; - unsigned int addrlen = 0, prefixlen; - bool expectprefix; + unsigned int addrlen = 0, prefixlen; + bool expectprefix; REQUIRE(pctx != NULL); REQUIRE(ret != NULL && *ret == NULL); @@ -3435,7 +3306,8 @@ cfg_parse_netprefix(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) expectprefix = (result == ISC_R_IPV4PREFIX); CHECK(cfg_peektoken(pctx, 0)); if (pctx->token.type == isc_tokentype_special && - pctx->token.value.as_char == '/') { + pctx->token.value.as_char == '/') + { CHECK(cfg_gettoken(pctx, 0)); /* read "/" */ CHECK(cfg_gettoken(pctx, ISC_LEXOPT_NUMBER)); if (pctx->token.type != isc_tokentype_number) { @@ -3478,8 +3350,7 @@ cleanup: } static void -print_netprefix(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +print_netprefix(cfg_printer_t *pctx, const cfg_obj_t *obj) { const cfg_netprefix_t *p = &obj->value.netprefix; cfg_print_rawaddr(pctx, &p->address); @@ -3488,16 +3359,14 @@ print_netprefix(cfg_printer_t *pctx, const cfg_obj_t *obj) } bool -cfg_obj_isnetprefix(const cfg_obj_t *obj) -{ +cfg_obj_isnetprefix(const cfg_obj_t *obj) { REQUIRE(obj != NULL); return (obj->type->rep == &cfg_rep_netprefix); } void cfg_obj_asnetprefix(const cfg_obj_t *obj, isc_netaddr_t *netaddr, - unsigned int *prefixlen) -{ + unsigned int *prefixlen) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_netprefix); REQUIRE(netaddr != NULL); REQUIRE(prefixlen != NULL); @@ -3513,14 +3382,13 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_netprefix = { static isc_result_t parse_sockaddrsub(cfg_parser_t *pctx, const cfg_type_t *type, int flags, - cfg_obj_t **ret) -{ - isc_result_t result; + cfg_obj_t **ret) { + isc_result_t result; isc_netaddr_t netaddr; - in_port_t port = 0; - isc_dscp_t dscp = -1; - cfg_obj_t * obj = NULL; - int have_port = 0, have_dscp = 0; + in_port_t port = 0; + isc_dscp_t dscp = -1; + cfg_obj_t *obj = NULL; + int have_port = 0, have_dscp = 0; CHECK(cfg_create_obj(pctx, type, &obj)); CHECK(cfg_parse_rawaddr(pctx, flags, &netaddr)); @@ -3532,8 +3400,8 @@ parse_sockaddrsub(cfg_parser_t *pctx, const cfg_type_t *type, int flags, CHECK(cfg_parse_rawport(pctx, flags, &port)); ++have_port; } else if ((flags & CFG_ADDR_DSCPOK) != 0 && - strcasecmp(TOKEN_STRING(pctx), "dscp") == - 0) { + strcasecmp(TOKEN_STRING(pctx), "dscp") == 0) + { CHECK(cfg_gettoken(pctx, 0)); /* read "dscp" */ CHECK(cfg_parse_dscp(pctx, &dscp)); ++have_dscp; @@ -3579,8 +3447,8 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_sockaddrdscp = { }; isc_result_t -cfg_parse_sockaddr(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +cfg_parse_sockaddr(cfg_parser_t *pctx, const cfg_type_t *type, + cfg_obj_t **ret) { const unsigned int *flagp; REQUIRE(pctx != NULL); @@ -3593,11 +3461,10 @@ cfg_parse_sockaddr(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) } void -cfg_print_sockaddr(cfg_printer_t *pctx, const cfg_obj_t *obj) -{ +cfg_print_sockaddr(cfg_printer_t *pctx, const cfg_obj_t *obj) { isc_netaddr_t netaddr; - in_port_t port; - char buf[ISC_NETADDR_FORMATSIZE]; + in_port_t port; + char buf[ISC_NETADDR_FORMATSIZE]; REQUIRE(pctx != NULL); REQUIRE(obj != NULL); @@ -3617,10 +3484,9 @@ cfg_print_sockaddr(cfg_printer_t *pctx, const cfg_obj_t *obj) } void -cfg_doc_sockaddr(cfg_printer_t *pctx, const cfg_type_t *type) -{ +cfg_doc_sockaddr(cfg_printer_t *pctx, const cfg_type_t *type) { const unsigned int *flagp; - int n = 0; + int n = 0; REQUIRE(pctx != NULL); REQUIRE(type != NULL); @@ -3659,29 +3525,25 @@ cfg_doc_sockaddr(cfg_printer_t *pctx, const cfg_type_t *type) } bool -cfg_obj_issockaddr(const cfg_obj_t *obj) -{ +cfg_obj_issockaddr(const cfg_obj_t *obj) { REQUIRE(obj != NULL); return (obj->type->rep == &cfg_rep_sockaddr); } const isc_sockaddr_t * -cfg_obj_assockaddr(const cfg_obj_t *obj) -{ +cfg_obj_assockaddr(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_sockaddr); return (&obj->value.sockaddr); } isc_dscp_t -cfg_obj_getdscp(const cfg_obj_t *obj) -{ +cfg_obj_getdscp(const cfg_obj_t *obj) { REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_sockaddr); return (obj->value.sockaddrdscp.dscp); } isc_result_t -cfg_gettoken(cfg_parser_t *pctx, int options) -{ +cfg_gettoken(cfg_parser_t *pctx, int options) { isc_result_t result; REQUIRE(pctx != NULL); @@ -3741,8 +3603,7 @@ redo: } void -cfg_ungettoken(cfg_parser_t *pctx) -{ +cfg_ungettoken(cfg_parser_t *pctx) { REQUIRE(pctx != NULL); if (pctx->seen_eof) { @@ -3753,8 +3614,7 @@ cfg_ungettoken(cfg_parser_t *pctx) } isc_result_t -cfg_peektoken(cfg_parser_t *pctx, int options) -{ +cfg_peektoken(cfg_parser_t *pctx, int options) { isc_result_t result; REQUIRE(pctx != NULL); @@ -3770,8 +3630,7 @@ cleanup: * Log an error if the next token is not a string. */ static isc_result_t -cfg_getstringtoken(cfg_parser_t *pctx) -{ +cfg_getstringtoken(cfg_parser_t *pctx) { isc_result_t result; result = cfg_gettoken(pctx, CFG_LEXOPT_QSTRING); @@ -3780,7 +3639,8 @@ cfg_getstringtoken(cfg_parser_t *pctx) } if (pctx->token.type != isc_tokentype_string && - pctx->token.type != isc_tokentype_qstring) { + pctx->token.type != isc_tokentype_qstring) + { cfg_parser_error(pctx, CFG_LOG_NEAR, "expected string"); return (ISC_R_UNEXPECTEDTOKEN); } @@ -3788,8 +3648,7 @@ cfg_getstringtoken(cfg_parser_t *pctx) } void -cfg_parser_error(cfg_parser_t *pctx, unsigned int flags, const char *fmt, ...) -{ +cfg_parser_error(cfg_parser_t *pctx, unsigned int flags, const char *fmt, ...) { va_list args; REQUIRE(pctx != NULL); @@ -3802,8 +3661,8 @@ cfg_parser_error(cfg_parser_t *pctx, unsigned int flags, const char *fmt, ...) } void -cfg_parser_warning(cfg_parser_t *pctx, unsigned int flags, const char *fmt, ...) -{ +cfg_parser_warning(cfg_parser_t *pctx, unsigned int flags, const char *fmt, + ...) { va_list args; REQUIRE(pctx != NULL); @@ -3818,8 +3677,7 @@ cfg_parser_warning(cfg_parser_t *pctx, unsigned int flags, const char *fmt, ...) #define MAX_LOG_TOKEN 30 /* How much of a token to quote in log messages. */ static bool -have_current_file(cfg_parser_t *pctx) -{ +have_current_file(cfg_parser_t *pctx) { cfg_listelt_t *elt; if (pctx->open_files == NULL) { return (false); @@ -3834,11 +3692,10 @@ have_current_file(cfg_parser_t *pctx) } static char * -current_file(cfg_parser_t *pctx) -{ - static char none[] = "none"; +current_file(cfg_parser_t *pctx) { + static char none[] = "none"; cfg_listelt_t *elt; - cfg_obj_t * fileobj; + cfg_obj_t *fileobj; if (!have_current_file(pctx)) { return (none); @@ -3856,14 +3713,13 @@ current_file(cfg_parser_t *pctx) static void parser_complain(cfg_parser_t *pctx, bool is_warning, unsigned int flags, - const char *format, va_list args) -{ - char tokenbuf[MAX_LOG_TOKEN + 10]; + const char *format, va_list args) { + char tokenbuf[MAX_LOG_TOKEN + 10]; static char where[PATH_MAX + 100]; static char message[2048]; - int level = ISC_LOG_ERROR; + int level = ISC_LOG_ERROR; const char *prep = ""; - size_t len; + size_t len; if (is_warning) { level = ISC_LOG_WARNING; @@ -3924,10 +3780,9 @@ parser_complain(cfg_parser_t *pctx, bool is_warning, unsigned int flags, void cfg_obj_log(const cfg_obj_t *obj, isc_log_t *lctx, int level, const char *fmt, - ...) -{ + ...) { va_list ap; - char msgbuf[2048]; + char msgbuf[2048]; REQUIRE(obj != NULL); REQUIRE(fmt != NULL); @@ -3949,24 +3804,21 @@ cfg_obj_log(const cfg_obj_t *obj, isc_log_t *lctx, int level, const char *fmt, } const char * -cfg_obj_file(const cfg_obj_t *obj) -{ +cfg_obj_file(const cfg_obj_t *obj) { REQUIRE(obj != NULL); return (obj->file); } unsigned int -cfg_obj_line(const cfg_obj_t *obj) -{ +cfg_obj_line(const cfg_obj_t *obj) { REQUIRE(obj != NULL); return (obj->line); } isc_result_t -cfg_create_obj(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ +cfg_create_obj(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { cfg_obj_t *obj; REQUIRE(pctx != NULL); @@ -3989,9 +3841,8 @@ cfg_create_obj(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) static void map_symtabitem_destroy(char *key, unsigned int type, isc_symvalue_t symval, - void *userarg) -{ - cfg_obj_t * obj = symval.as_pointer; + void *userarg) { + cfg_obj_t *obj = symval.as_pointer; cfg_parser_t *pctx = (cfg_parser_t *)userarg; UNUSED(key); @@ -4001,11 +3852,10 @@ map_symtabitem_destroy(char *key, unsigned int type, isc_symvalue_t symval, } static isc_result_t -create_map(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) -{ - isc_result_t result; +create_map(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { + isc_result_t result; isc_symtab_t *symtab = NULL; - cfg_obj_t * obj = NULL; + cfg_obj_t *obj = NULL; CHECK(cfg_create_obj(pctx, type, &obj)); CHECK(isc_symtab_create(pctx->mctx, 5, /* XXX */ @@ -4024,15 +3874,13 @@ cleanup: } static void -free_map(cfg_parser_t *pctx, cfg_obj_t *obj) -{ +free_map(cfg_parser_t *pctx, cfg_obj_t *obj) { CLEANUP_OBJ(obj->value.map.id); isc_symtab_destroy(&obj->value.map.symtab); } bool -cfg_obj_istype(const cfg_obj_t *obj, const cfg_type_t *type) -{ +cfg_obj_istype(const cfg_obj_t *obj, const cfg_type_t *type) { REQUIRE(obj != NULL); REQUIRE(type != NULL); @@ -4043,8 +3891,7 @@ cfg_obj_istype(const cfg_obj_t *obj, const cfg_type_t *type) * Destroy 'obj', a configuration object created in 'pctx'. */ void -cfg_obj_destroy(cfg_parser_t *pctx, cfg_obj_t **objp) -{ +cfg_obj_destroy(cfg_parser_t *pctx, cfg_obj_t **objp) { REQUIRE(objp != NULL && *objp != NULL); REQUIRE(pctx != NULL); @@ -4059,8 +3906,7 @@ cfg_obj_destroy(cfg_parser_t *pctx, cfg_obj_t **objp) } void -cfg_obj_attach(cfg_obj_t *src, cfg_obj_t **dest) -{ +cfg_obj_attach(cfg_obj_t *src, cfg_obj_t **dest) { REQUIRE(src != NULL); REQUIRE(dest != NULL && *dest == NULL); @@ -4069,15 +3915,13 @@ cfg_obj_attach(cfg_obj_t *src, cfg_obj_t **dest) } static void -free_noop(cfg_parser_t *pctx, cfg_obj_t *obj) -{ +free_noop(cfg_parser_t *pctx, cfg_obj_t *obj) { UNUSED(pctx); UNUSED(obj); } void -cfg_doc_obj(cfg_printer_t *pctx, const cfg_type_t *type) -{ +cfg_doc_obj(cfg_printer_t *pctx, const cfg_type_t *type) { REQUIRE(pctx != NULL); REQUIRE(type != NULL); @@ -4085,8 +3929,7 @@ cfg_doc_obj(cfg_printer_t *pctx, const cfg_type_t *type) } void -cfg_doc_terminal(cfg_printer_t *pctx, const cfg_type_t *type) -{ +cfg_doc_terminal(cfg_printer_t *pctx, const cfg_type_t *type) { REQUIRE(pctx != NULL); REQUIRE(type != NULL); @@ -4098,8 +3941,7 @@ cfg_doc_terminal(cfg_printer_t *pctx, const cfg_type_t *type) void cfg_print_grammar(const cfg_type_t *type, unsigned int flags, void (*f)(void *closure, const char *text, int textlen), - void *closure) -{ + void *closure) { cfg_printer_t pctx; pctx.f = f; @@ -4111,15 +3953,14 @@ cfg_print_grammar(const cfg_type_t *type, unsigned int flags, isc_result_t cfg_parser_mapadd(cfg_parser_t *pctx, cfg_obj_t *mapobj, cfg_obj_t *obj, - const char *clausename) -{ - isc_result_t result = ISC_R_SUCCESS; - const cfg_map_t * map; - isc_symvalue_t symval; - cfg_obj_t * destobj = NULL; - cfg_listelt_t * elt = NULL; + const char *clausename) { + isc_result_t result = ISC_R_SUCCESS; + const cfg_map_t *map; + isc_symvalue_t symval; + cfg_obj_t *destobj = NULL; + cfg_listelt_t *elt = NULL; const cfg_clausedef_t *const *clauseset; - const cfg_clausedef_t * clause; + const cfg_clausedef_t *clause; REQUIRE(pctx != NULL); REQUIRE(mapobj != NULL && mapobj->type->rep == &cfg_rep_map); @@ -4186,20 +4027,20 @@ cleanup: isc_result_t cfg_pluginlist_foreach(const cfg_obj_t *config, const cfg_obj_t *list, isc_log_t *lctx, pluginlist_cb_t *callback, - void *callback_data) -{ - isc_result_t result = ISC_R_SUCCESS; + void *callback_data) { + isc_result_t result = ISC_R_SUCCESS; const cfg_listelt_t *element; REQUIRE(config != NULL); REQUIRE(callback != NULL); for (element = cfg_list_first(list); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *plugin = cfg_listelt_value(element); const cfg_obj_t *obj; - const char * type, *library; - const char * parameters = NULL; + const char *type, *library; + const char *parameters = NULL; /* Get the path to the plugin module. */ obj = cfg_tuple_get(plugin, "type"); diff --git a/lib/isccfg/tests/duration_test.c b/lib/isccfg/tests/duration_test.c index 3c2ed5d919..171aa26c23 100644 --- a/lib/isccfg/tests/duration_test.c +++ b/lib/isccfg/tests/duration_test.c @@ -41,8 +41,8 @@ goto cleanup; \ } while (0) -isc_mem_t * mctx = NULL; -isc_log_t * lctx = NULL; +isc_mem_t *mctx = NULL; +isc_log_t *lctx = NULL; static isc_logcategory_t categories[] = { { "", 0 }, { "client", 0 }, { "network", 0 }, @@ -54,8 +54,7 @@ static isc_logcategory_t categories[] = { { "", 0 }, { NULL, 0 } }; static void -cleanup() -{ +cleanup() { if (lctx != NULL) { isc_log_destroy(&lctx); } @@ -65,15 +64,14 @@ cleanup() } static isc_result_t -setup() -{ +setup() { isc_result_t result; isc_mem_debugging |= ISC_MEM_DEBUGRECORD; isc_mem_create(&mctx); isc_logdestination_t destination; - isc_logconfig_t * logconfig = NULL; + isc_logconfig_t *logconfig = NULL; CHECK(isc_log_create(mctx, &lctx, &logconfig)); isc_log_registercategories(lctx, categories); @@ -96,15 +94,14 @@ cleanup: struct duration_conf { const char *string; - uint32_t time; + uint32_t time; }; typedef struct duration_conf duration_conf_t; /* test cfg_obj_asduration() */ static void -cfg_obj_asduration_test(void **state) -{ - isc_result_t result; +cfg_obj_asduration_test(void **state) { + isc_result_t result; duration_conf_t durations[] = { { .string = "PT0S", .time = 0 }, { .string = "PT42S", .time = 42 }, @@ -129,10 +126,10 @@ cfg_obj_asduration_test(void **state) { .string = "7d", .time = 604800 }, { .string = "2w", .time = 1209600 }, }; - int num = 22; - isc_buffer_t buf1; + int num = 22; + isc_buffer_t buf1; cfg_parser_t *p1 = NULL; - cfg_obj_t * c1 = NULL; + cfg_obj_t *c1 = NULL; UNUSED(state); @@ -140,8 +137,8 @@ cfg_obj_asduration_test(void **state) for (int i = 0; i < num; i++) { const cfg_listelt_t *element; - const cfg_obj_t * kasps = NULL; - char conf[64]; + const cfg_obj_t *kasps = NULL; + char conf[64]; sprintf(&conf[0], "dnssec-policy \"dp\"\n{\nsignatures-refresh %s;\n};\n", durations[i].string); @@ -160,10 +157,11 @@ cfg_obj_asduration_test(void **state) (void)cfg_map_get(c1, "dnssec-policy", &kasps); assert_non_null(kasps); for (element = cfg_list_first(kasps); element != NULL; - element = cfg_list_next(element)) { + element = cfg_list_next(element)) + { const cfg_obj_t *d1 = NULL; const cfg_obj_t *kopts = NULL; - cfg_obj_t * kconf = cfg_listelt_value(element); + cfg_obj_t *kconf = cfg_listelt_value(element); assert_non_null(kconf); kopts = cfg_tuple_get(kconf, "options"); @@ -182,8 +180,7 @@ cfg_obj_asduration_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(cfg_obj_asduration_test), }; @@ -196,8 +193,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isccfg/tests/parser_test.c b/lib/isccfg/tests/parser_test.c index 701e1f00b9..24466f6121 100644 --- a/lib/isccfg/tests/parser_test.c +++ b/lib/isccfg/tests/parser_test.c @@ -41,8 +41,8 @@ goto cleanup; \ } while (0) -isc_mem_t * mctx = NULL; -isc_log_t * lctx = NULL; +isc_mem_t *mctx = NULL; +isc_log_t *lctx = NULL; static isc_logcategory_t categories[] = { { "", 0 }, { "client", 0 }, { "network", 0 }, @@ -54,8 +54,7 @@ static isc_logcategory_t categories[] = { { "", 0 }, { NULL, 0 } }; static void -cleanup() -{ +cleanup() { if (lctx != NULL) { isc_log_destroy(&lctx); } @@ -65,15 +64,14 @@ cleanup() } static isc_result_t -setup() -{ +setup() { isc_result_t result; isc_mem_debugging |= ISC_MEM_DEBUGRECORD; isc_mem_create(&mctx); isc_logdestination_t destination; - isc_logconfig_t * logconfig = NULL; + isc_logconfig_t *logconfig = NULL; CHECK(isc_log_create(mctx, &lctx, &logconfig)); isc_log_registercategories(lctx, categories); @@ -96,13 +94,12 @@ cleanup: /* test cfg_parse_buffer() */ static void -parse_buffer_test(void **state) -{ - isc_result_t result; +parse_buffer_test(void **state) { + isc_result_t result; unsigned char text[] = "options\n{\nrecursion yes;\n};\n"; - isc_buffer_t buf1, buf2; + isc_buffer_t buf1, buf2; cfg_parser_t *p1 = NULL, *p2 = NULL; - cfg_obj_t * c1 = NULL, *c2 = NULL; + cfg_obj_t *c1 = NULL, *c2 = NULL; UNUSED(state); @@ -143,10 +140,9 @@ parse_buffer_test(void **state) /* test cfg_map_firstclause() */ static void -cfg_map_firstclause_test(void **state) -{ - const char * name = NULL; - const void * clauses = NULL; +cfg_map_firstclause_test(void **state) { + const char *name = NULL; + const void *clauses = NULL; unsigned int idx; UNUSED(state); @@ -159,10 +155,9 @@ cfg_map_firstclause_test(void **state) /* test cfg_map_nextclause() */ static void -cfg_map_nextclause_test(void **state) -{ - const char * name = NULL; - const void * clauses = NULL; +cfg_map_nextclause_test(void **state) { + const char *name = NULL; + const void *clauses = NULL; unsigned int idx; UNUSED(state); @@ -184,8 +179,7 @@ cfg_map_nextclause_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test(parse_buffer_test), cmocka_unit_test(cfg_map_firstclause_test), @@ -200,8 +194,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/isccfg/win32/DLLMain.c b/lib/isccfg/win32/DLLMain.c index 6cd1fe564c..a272a64776 100644 --- a/lib/isccfg/win32/DLLMain.c +++ b/lib/isccfg/win32/DLLMain.c @@ -16,8 +16,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/lib/ns/client.c b/lib/ns/client.c index c2a1c5b8ba..e88f39a217 100644 --- a/lib/ns/client.c +++ b/lib/ns/client.c @@ -95,14 +95,14 @@ #define TCP_CLIENT(c) (((c)->attributes & NS_CLIENTATTR_TCP) != 0) #define COOKIE_SIZE 24U /* 8 + 4 + 4 + 8 */ -#define ECS_SIZE 20U /* 2 + 1 + 1 + [0..16] */ +#define ECS_SIZE 20U /* 2 + 1 + 1 + [0..16] */ -#define WANTNSID(x) (((x)->attributes & NS_CLIENTATTR_WANTNSID) != 0) -#define WANTEXPIRE(x) (((x)->attributes & NS_CLIENTATTR_WANTEXPIRE) != 0) -#define WANTPAD(x) (((x)->attributes & NS_CLIENTATTR_WANTPAD) != 0) +#define WANTNSID(x) (((x)->attributes & NS_CLIENTATTR_WANTNSID) != 0) +#define WANTEXPIRE(x) (((x)->attributes & NS_CLIENTATTR_WANTEXPIRE) != 0) +#define WANTPAD(x) (((x)->attributes & NS_CLIENTATTR_WANTPAD) != 0) #define USEKEEPALIVE(x) (((x)->attributes & NS_CLIENTATTR_USEKEEPALIVE) != 0) -#define MANAGER_MAGIC ISC_MAGIC('N', 'S', 'C', 'm') +#define MANAGER_MAGIC ISC_MAGIC('N', 'S', 'C', 'm') #define VALID_MANAGER(m) ISC_MAGIC_VALID(m, MANAGER_MAGIC) /* @@ -118,25 +118,17 @@ 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) -{ +ns_client_recursing(ns_client_t *client) { REQUIRE(NS_CLIENT_VALID(client)); REQUIRE(client->state == NS_CLIENTSTATE_WORKING); @@ -147,8 +139,7 @@ ns_client_recursing(ns_client_t *client) } void -ns_client_killoldestquery(ns_client_t *client) -{ +ns_client_killoldestquery(ns_client_t *client) { ns_client_t *oldest; REQUIRE(NS_CLIENT_VALID(client)); @@ -166,16 +157,14 @@ ns_client_killoldestquery(ns_client_t *client) } void -ns_client_settimeout(ns_client_t *client, unsigned int seconds) -{ +ns_client_settimeout(ns_client_t *client, unsigned int seconds) { UNUSED(client); UNUSED(seconds); /* XXXWPK TODO use netmgr to set timeout */ } static void -ns_client_endrequest(ns_client_t *client) -{ +ns_client_endrequest(ns_client_t *client) { INSIST(client->naccepts == 0); INSIST(client->nreads == 0); INSIST(client->nsends == 0); @@ -238,15 +227,15 @@ ns_client_endrequest(ns_client_t *client) if (client->sctx->fuzznotify != NULL && (client->sctx->fuzztype == isc_fuzz_client || client->sctx->fuzztype == isc_fuzz_tcpclient || - client->sctx->fuzztype == isc_fuzz_resolver)) { + client->sctx->fuzztype == isc_fuzz_resolver)) + { client->sctx->fuzznotify(); } #endif /* ENABLE_AFL */ } void -ns_client_drop(ns_client_t *client, isc_result_t result) -{ +ns_client_drop(ns_client_t *client, isc_result_t result) { REQUIRE(NS_CLIENT_VALID(client)); REQUIRE(client->state == NS_CLIENTSTATE_WORKING || client->state == NS_CLIENTSTATE_RECURSING); @@ -260,8 +249,7 @@ ns_client_drop(ns_client_t *client, isc_result_t result) } static void -client_senddone(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) -{ +client_senddone(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) { ns_client_t *client = cbarg; REQUIRE(client->handle == handle); @@ -287,11 +275,10 @@ client_senddone(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) static isc_result_t client_allocsendbuf(ns_client_t *client, isc_buffer_t *buffer, isc_buffer_t *tcpbuffer, uint32_t length, - unsigned char **datap) -{ + unsigned char **datap) { unsigned char *data; - uint32_t bufsize; - isc_result_t result; + uint32_t bufsize; + isc_result_t result; REQUIRE(datap != NULL); REQUIRE((tcpbuffer == NULL && length != 0) || @@ -303,8 +290,8 @@ client_allocsendbuf(ns_client_t *client, isc_buffer_t *buffer, result = ISC_R_NOSPACE; goto done; } - client->tcpbuf = - isc_mem_get(client->mctx, NS_CLIENT_TCP_BUFFER_SIZE); + client->tcpbuf = isc_mem_get(client->mctx, + NS_CLIENT_TCP_BUFFER_SIZE); data = client->tcpbuf; if (tcpbuffer != NULL) { isc_buffer_init(tcpbuffer, data, @@ -347,8 +334,7 @@ done: } static isc_result_t -client_sendpkg(ns_client_t *client, isc_buffer_t *buffer) -{ +client_sendpkg(ns_client_t *client, isc_buffer_t *buffer) { isc_region_t r; isc_buffer_usedregion(buffer, &r); @@ -359,13 +345,12 @@ client_sendpkg(ns_client_t *client, isc_buffer_t *buffer) } void -ns_client_sendraw(ns_client_t *client, dns_message_t *message) -{ - isc_result_t result; +ns_client_sendraw(ns_client_t *client, dns_message_t *message) { + isc_result_t result; unsigned char *data; - isc_buffer_t buffer; - isc_region_t r; - isc_region_t * mr; + isc_buffer_t buffer; + isc_region_t r; + isc_region_t *mr; REQUIRE(NS_CLIENT_VALID(client)); @@ -410,24 +395,23 @@ done: } void -ns_client_send(ns_client_t *client) -{ - isc_result_t result; +ns_client_send(ns_client_t *client) { + isc_result_t result; unsigned char *data; - isc_buffer_t buffer = { .magic = 0 }; - isc_buffer_t tcpbuffer = { .magic = 0 }; - isc_region_t r; + isc_buffer_t buffer = { .magic = 0 }; + isc_buffer_t tcpbuffer = { .magic = 0 }; + isc_region_t r; dns_compress_t cctx; - bool cleanup_cctx = false; - unsigned int render_opts; - unsigned int preferred_glue; - bool opt_included = false; - size_t respsize; - dns_aclenv_t * env; + bool cleanup_cctx = false; + unsigned int render_opts; + unsigned int preferred_glue; + bool opt_included = false; + size_t respsize; + dns_aclenv_t *env; #ifdef HAVE_DNSTAP - unsigned char zone[DNS_NAME_MAXWIRE]; + unsigned char zone[DNS_NAME_MAXWIRE]; dns_dtmsgtype_t dtmsgtype; - isc_region_t zr; + isc_region_t zr; #endif /* HAVE_DNSTAP */ /* @@ -446,7 +430,8 @@ ns_client_send(ns_client_t *client) CTRACE("send"); if (client->message->opcode == dns_opcode_query && - (client->attributes & NS_CLIENTATTR_RA) != 0) { + (client->attributes & NS_CLIENTATTR_RA) != 0) + { client->message->flags |= DNS_MESSAGEFLAG_RA; } @@ -476,8 +461,8 @@ ns_client_send(ns_client_t *client) * Create an OPT for our reply. */ if ((client->attributes & NS_CLIENTATTR_WANTOPT) != 0) { - result = - ns_client_addopt(client, client->message, &client->opt); + result = ns_client_addopt(client, client->message, + &client->opt); if (result != ISC_R_SUCCESS) { goto done; } @@ -497,7 +482,7 @@ ns_client_send(ns_client_t *client) } if (client->peeraddr_valid && client->view != NULL) { isc_netaddr_t netaddr; - dns_name_t * name = NULL; + dns_name_t *name = NULL; isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr); if (client->message->tsigkey != NULL) { @@ -506,7 +491,8 @@ ns_client_send(ns_client_t *client) if (client->view->nocasecompress == NULL || !dns_acl_allowed(&netaddr, name, - client->view->nocasecompress, env)) { + client->view->nocasecompress, env)) + { dns_compress_setsensitive(&cctx, true); } @@ -579,9 +565,10 @@ renderend: #ifdef HAVE_DNSTAP memset(&zr, 0, sizeof(zr)); if (((client->message->flags & DNS_MESSAGEFLAG_AA) != 0) && - (client->query.authzone != NULL)) { + (client->query.authzone != NULL)) + { isc_buffer_t b; - dns_name_t * zo = dns_zone_getorigin(client->query.authzone); + dns_name_t *zo = dns_zone_getorigin(client->query.authzone); isc_buffer_init(&b, zone, sizeof(zone)); dns_compress_setmethods(&cctx, DNS_COMPRESS_NONE); @@ -717,8 +704,8 @@ done: } #if NS_CLIENT_DROPPORT -#define DROPPORT_NO 0 -#define DROPPORT_REQUEST 1 +#define DROPPORT_NO 0 +#define DROPPORT_REQUEST 1 #define DROPPORT_RESPONSE 2 /*% * ns_client_dropport determines if certain requests / responses @@ -730,8 +717,7 @@ done: * \li 2: Drop (error) response. */ static int -ns_client_dropport(in_port_t port) -{ +ns_client_dropport(in_port_t port) { switch (port) { case 7: /* echo */ case 13: /* daytime */ @@ -746,9 +732,8 @@ ns_client_dropport(in_port_t port) #endif /* if NS_CLIENT_DROPPORT */ void -ns_client_error(ns_client_t *client, isc_result_t result) -{ - dns_rcode_t rcode; +ns_client_error(ns_client_t *client, isc_result_t result) { + dns_rcode_t rcode; dns_message_t *message; REQUIRE(NS_CLIENT_VALID(client)); @@ -769,8 +754,9 @@ ns_client_error(ns_client_t *client, isc_result_t result) */ if (rcode == dns_rcode_formerr && ns_client_dropport(isc_sockaddr_getport(&client->peeraddr)) != - DROPPORT_NO) { - char buf[64]; + DROPPORT_NO) + { + char buf[64]; isc_buffer_t b; isc_buffer_init(&b, buf, sizeof(buf) - 1); @@ -790,10 +776,10 @@ ns_client_error(ns_client_t *client, isc_result_t result) * Try to rate limit error responses. */ if (client->view != NULL && client->view->rrl != NULL) { - bool wouldlog; - char log_buf[DNS_RRL_LOG_BUF_LEN]; + bool wouldlog; + char log_buf[DNS_RRL_LOG_BUF_LEN]; dns_rrl_result_t rrl_result; - int loglevel; + int loglevel; INSIST(rcode != dns_rcode_noerror && rcode != dns_rcode_nxdomain); @@ -874,7 +860,8 @@ ns_client_error(ns_client_t *client, isc_result_t result) &client->formerrcache.addr) && message->id == client->formerrcache.id && (isc_time_seconds(&client->requesttime) - - client->formerrcache.time) < 2) { + client->formerrcache.time) < 2) + { /* Drop packet. */ ns_client_log(client, NS_LOGCATEGORY_CLIENT, NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(1), @@ -889,13 +876,14 @@ ns_client_error(ns_client_t *client, isc_result_t result) client->formerrcache.id = message->id; } else if (rcode == dns_rcode_servfail && client->query.qname != NULL && client->view != NULL && client->view->fail_ttl != 0 && - ((client->attributes & NS_CLIENTATTR_NOSETFC) == 0)) { + ((client->attributes & NS_CLIENTATTR_NOSETFC) == 0)) + { /* * SERVFAIL caching: store qname/qtype of failed queries */ - isc_time_t expire; + isc_time_t expire; isc_interval_t i; - uint32_t flags = 0; + uint32_t flags = 0; if ((message->flags & DNS_MESSAGEFLAG_CD) != 0) { flags = NS_FAILCACHE_CD; @@ -915,21 +903,20 @@ ns_client_error(ns_client_t *client, isc_result_t result) isc_result_t ns_client_addopt(ns_client_t *client, dns_message_t *message, - dns_rdataset_t **opt) -{ - unsigned char ecs[ECS_SIZE]; - char nsid[BUFSIZ], *nsidp; - unsigned char cookie[COOKIE_SIZE]; - isc_result_t result; - dns_view_t * view; + dns_rdataset_t **opt) { + unsigned char ecs[ECS_SIZE]; + char nsid[BUFSIZ], *nsidp; + unsigned char cookie[COOKIE_SIZE]; + isc_result_t result; + dns_view_t *view; dns_resolver_t *resolver; - uint16_t udpsize; - dns_ednsopt_t ednsopts[DNS_EDNSOPTIONS]; - int count = 0; - unsigned int flags; - unsigned char expire[4]; - unsigned char advtimo[2]; - dns_aclenv_t * env; + uint16_t udpsize; + dns_ednsopt_t ednsopts[DNS_EDNSOPTIONS]; + int count = 0; + unsigned int flags; + unsigned char expire[4]; + unsigned char advtimo[2]; + dns_aclenv_t *env; REQUIRE(NS_CLIENT_VALID(client)); REQUIRE(opt != NULL && *opt == NULL); @@ -968,9 +955,9 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, } no_nsid: if ((client->attributes & NS_CLIENTATTR_WANTCOOKIE) != 0) { - isc_buffer_t buf; + isc_buffer_t buf; isc_stdtime_t now; - uint32_t nonce; + uint32_t nonce; isc_buffer_init(&buf, cookie, sizeof(cookie)); isc_stdtime_get(&now); @@ -1000,11 +987,12 @@ no_nsid: if (((client->attributes & NS_CLIENTATTR_HAVEECS) != 0) && (client->ecs.addr.family == AF_INET || client->ecs.addr.family == AF_INET6 || - client->ecs.addr.family == AF_UNSPEC)) { + client->ecs.addr.family == AF_UNSPEC)) + { isc_buffer_t buf; - uint8_t addr[16]; - uint32_t plen, addrl; - uint16_t family = 0; + uint8_t addr[16]; + uint32_t plen, addrl; + uint16_t family = 0; /* Add CLIENT-SUBNET option. */ @@ -1057,7 +1045,7 @@ no_nsid: } if (TCP_CLIENT(client) && USEKEEPALIVE(client)) { isc_buffer_t buf; - uint32_t adv; + uint32_t adv; INSIST(count < DNS_EDNSOPTIONS); @@ -1074,9 +1062,10 @@ no_nsid: /* Padding must be added last */ if ((view != NULL) && (view->padding > 0) && WANTPAD(client) && (TCP_CLIENT(client) || - ((client->attributes & NS_CLIENTATTR_HAVECOOKIE) != 0))) { + ((client->attributes & NS_CLIENTATTR_HAVECOOKIE) != 0))) + { isc_netaddr_t netaddr; - int match; + int match; isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr); result = dns_acl_match(&netaddr, NULL, view->pad_acl, env, @@ -1100,8 +1089,7 @@ no_nsid: static void compute_cookie(ns_client_t *client, uint32_t when, uint32_t nonce, - const unsigned char *secret, isc_buffer_t *buf) -{ + const unsigned char *secret, isc_buffer_t *buf) { unsigned char digest[ISC_MAX_MD_SIZE] ISC_NONSTRING = { 0 }; STATIC_ASSERT(ISC_MAX_MD_SIZE >= ISC_SIPHASH24_TAG_LENGTH, "You need " "to " @@ -1115,9 +1103,9 @@ compute_cookie(ns_client_t *client, uint32_t when, uint32_t nonce, switch (client->sctx->cookiealg) { case ns_cookiealg_siphash24: { - unsigned char input[16 + 16] ISC_NONSTRING = { 0 }; - size_t inputlen = 0; - isc_netaddr_t netaddr; + unsigned char input[16 + 16] ISC_NONSTRING = { 0 }; + size_t inputlen = 0; + isc_netaddr_t netaddr; unsigned char *cp; cp = isc_buffer_used(buf); @@ -1150,10 +1138,10 @@ compute_cookie(ns_client_t *client, uint32_t when, uint32_t nonce, break; } case ns_cookiealg_aes: { - unsigned char input[4 + 4 + 16] ISC_NONSTRING = { 0 }; - isc_netaddr_t netaddr; + unsigned char input[4 + 4 + 16] ISC_NONSTRING = { 0 }; + isc_netaddr_t netaddr; unsigned char *cp; - unsigned int i; + unsigned int i; cp = isc_buffer_used(buf); isc_buffer_putmem(buf, client->cookie, 8); @@ -1200,21 +1188,21 @@ compute_cookie(ns_client_t *client, uint32_t when, uint32_t nonce, } static void -process_cookie(ns_client_t *client, isc_buffer_t *buf, size_t optlen) -{ +process_cookie(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { ns_altsecret_t *altsecret; - unsigned char dbuf[COOKIE_SIZE]; - unsigned char * old; - isc_stdtime_t now; - uint32_t when; - uint32_t nonce; - isc_buffer_t db; + unsigned char dbuf[COOKIE_SIZE]; + unsigned char *old; + isc_stdtime_t now; + uint32_t when; + uint32_t nonce; + isc_buffer_t db; /* * If we have already seen a cookie option skip this cookie option. */ if ((!client->sctx->answercookie) || - (client->attributes & NS_CLIENTATTR_WANTCOOKIE) != 0) { + (client->attributes & NS_CLIENTATTR_WANTCOOKIE) != 0) + { isc_buffer_forward(buf, (unsigned int)optlen); return; } @@ -1256,8 +1244,9 @@ process_cookie(ns_client_t *client, isc_buffer_t *buf, size_t optlen) * Only accept COOKIE if we have talked to the client in the last hour. */ isc_stdtime_get(&now); - if (isc_serial_gt(when, (now + 300)) || /* In the future. */ - isc_serial_lt(when, (now - 3600))) { /* In the past. */ + if (isc_serial_gt(when, (now + 300)) || /* In the future. */ + isc_serial_lt(when, (now - 3600))) + { /* In the past. */ ns_stats_increment(client->sctx->nsstats, ns_statscounter_cookiebadtime); return; @@ -1274,7 +1263,8 @@ process_cookie(ns_client_t *client, isc_buffer_t *buf, size_t optlen) } for (altsecret = ISC_LIST_HEAD(client->sctx->altsecrets); - altsecret != NULL; altsecret = ISC_LIST_NEXT(altsecret, link)) { + altsecret != NULL; altsecret = ISC_LIST_NEXT(altsecret, link)) + { isc_buffer_init(&db, dbuf, sizeof(dbuf)); compute_cookie(client, when, nonce, altsecret->secret, &db); if (isc_safe_memequal(old, dbuf, COOKIE_SIZE)) { @@ -1290,10 +1280,9 @@ process_cookie(ns_client_t *client, isc_buffer_t *buf, size_t optlen) } static isc_result_t -process_ecs(ns_client_t *client, isc_buffer_t *buf, size_t optlen) -{ - uint16_t family; - uint8_t addrlen, addrbytes, scope, *paddr; +process_ecs(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { + uint16_t family; + uint8_t addrlen, addrbytes, scope, *paddr; isc_netaddr_t caddr; /* @@ -1410,8 +1399,7 @@ process_ecs(ns_client_t *client, isc_buffer_t *buf, size_t optlen) } static isc_result_t -process_keytag(ns_client_t *client, isc_buffer_t *buf, size_t optlen) -{ +process_keytag(ns_client_t *client, isc_buffer_t *buf, size_t optlen) { if (optlen == 0 || (optlen % 2) != 0) { isc_buffer_forward(buf, (unsigned int)optlen); return (DNS_R_OPTERR); @@ -1433,13 +1421,12 @@ process_keytag(ns_client_t *client, isc_buffer_t *buf, size_t optlen) } static isc_result_t -process_opt(ns_client_t *client, dns_rdataset_t *opt) -{ - dns_rdata_t rdata; +process_opt(ns_client_t *client, dns_rdataset_t *opt) { + dns_rdata_t rdata; isc_buffer_t optbuf; isc_result_t result; - uint16_t optcode; - uint16_t optlen; + uint16_t optcode; + uint16_t optlen; /* * Set the client's UDP buffer size. @@ -1468,8 +1455,8 @@ process_opt(ns_client_t *client, dns_rdataset_t *opt) if (client->ednsversion > DNS_EDNS_VERSION) { ns_stats_increment(client->sctx->nsstats, ns_statscounter_badednsver); - result = - ns_client_addopt(client, client->message, &client->opt); + result = ns_client_addopt(client, client->message, + &client->opt); if (result == ISC_R_SUCCESS) { result = DNS_R_BADVERS; } @@ -1535,8 +1522,8 @@ process_opt(ns_client_t *client, dns_rdataset_t *opt) isc_buffer_forward(&optbuf, optlen); break; case DNS_OPT_KEY_TAG: - result = - process_keytag(client, &optbuf, optlen); + result = process_keytag(client, &optbuf, + optlen); if (result != ISC_R_SUCCESS) { ns_client_error(client, result); return (result); @@ -1560,8 +1547,7 @@ process_opt(ns_client_t *client, dns_rdataset_t *opt) } void -ns__client_reset_cb(void *client0) -{ +ns__client_reset_cb(void *client0) { ns_client_t *client = client0; ns_client_log(client, DNS_LOGCATEGORY_SECURITY, NS_LOGMODULE_CLIENT, @@ -1583,8 +1569,7 @@ ns__client_reset_cb(void *client0) } void -ns__client_put_cb(void *client0) -{ +ns__client_put_cb(void *client0) { ns_client_t *client = client0; ns_client_log(client, DNS_LOGCATEGORY_SECURITY, NS_LOGMODULE_CLIENT, @@ -1640,26 +1625,25 @@ ns__client_put_cb(void *client0) * or tcpmsg (TCP case). */ void -ns__client_request(isc_nmhandle_t *handle, isc_region_t *region, void *arg) -{ - ns_client_t * client; - bool newclient = false; - ns_clientmgr_t * mgr; - ns_interface_t * ifp; - isc_result_t result; - isc_result_t sigresult = ISC_R_SUCCESS; - isc_buffer_t * buffer; - isc_buffer_t tbuffer; - dns_rdataset_t * opt; +ns__client_request(isc_nmhandle_t *handle, isc_region_t *region, void *arg) { + ns_client_t *client; + bool newclient = false; + ns_clientmgr_t *mgr; + ns_interface_t *ifp; + isc_result_t result; + isc_result_t sigresult = ISC_R_SUCCESS; + isc_buffer_t *buffer; + isc_buffer_t tbuffer; + dns_rdataset_t *opt; const dns_name_t *signame; - bool ra; /* Recursion available. */ - isc_netaddr_t netaddr; - int match; - dns_messageid_t id; - unsigned int flags; - bool notimp; - size_t reqsize; - dns_aclenv_t * env; + bool ra; /* Recursion available. */ + isc_netaddr_t netaddr; + int match; + dns_messageid_t id; + unsigned int flags; + bool notimp; + size_t reqsize; + dns_aclenv_t *env; #ifdef HAVE_DNSTAP dns_dtmsgtype_t dtmsgtype; #endif /* ifdef HAVE_DNSTAP */ @@ -1731,7 +1715,8 @@ ns__client_request(isc_nmhandle_t *handle, isc_region_t *region, void *arg) #if NS_CLIENT_DROPPORT if (ns_client_dropport(isc_sockaddr_getport(&client->peeraddr)) == - DROPPORT_REQUEST) { + DROPPORT_REQUEST) + { ns_client_log(client, DNS_LOGCATEGORY_SECURITY, NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(10), "dropped request: suspicious port"); @@ -1753,7 +1738,8 @@ ns__client_request(isc_nmhandle_t *handle, isc_region_t *region, void *arg) if (client->sctx->blackholeacl != NULL && (dns_acl_match(&netaddr, NULL, client->sctx->blackholeacl, env, &match, NULL) == ISC_R_SUCCESS) && - match > 0) { + match > 0) + { ns_client_log(client, DNS_LOGCATEGORY_SECURITY, NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(10), "blackholed UDP datagram"); @@ -1858,7 +1844,8 @@ ns__client_request(isc_nmhandle_t *handle, isc_region_t *region, void *arg) (client->message->opcode != dns_opcode_query || (client->sctx->keepresporder != NULL && dns_acl_allowed(&netaddr, NULL, client->sctx->keepresporder, - env)))) { + env)))) + { isc_nm_tcpdns_sequential(handle); } @@ -1938,7 +1925,8 @@ ns__client_request(isc_nmhandle_t *handle, isc_region_t *region, void *arg) if (client->message->rdclass == 0) { if ((client->attributes & NS_CLIENTATTR_WANTCOOKIE) != 0 && client->message->opcode == dns_opcode_query && - client->message->counts[DNS_SECTION_QUESTION] == 0U) { + client->message->counts[DNS_SECTION_QUESTION] == 0U) + { result = dns_message_reply(client->message, true); if (result != ISC_R_SUCCESS) { ns_client_error(client, result); @@ -1977,8 +1965,8 @@ ns__client_request(isc_nmhandle_t *handle, isc_region_t *region, void *arg) * If all the attempts fail (this can happen due to memory shortage, * etc), we regard this as an error for safety. */ - if ((client->manager->interface->flags & NS_INTERFACEFLAG_ANYADDR) == - 0) { + if ((client->manager->interface->flags & NS_INTERFACEFLAG_ANYADDR) == 0) + { isc_netaddr_fromsockaddr(&client->destaddr, &client->manager->interface->addr); } else { @@ -2000,7 +1988,7 @@ ns__client_request(isc_nmhandle_t *handle, isc_region_t *region, void *arg) * response will have a TSIG if the query did, as * required by RFC2845. */ - isc_buffer_t b; + isc_buffer_t b; isc_region_t *r; dns_message_resetsig(client->message); @@ -2059,9 +2047,9 @@ ns__client_request(isc_nmhandle_t *handle, isc_region_t *region, void *arg) NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(3), "request is signed by a nonauthoritative key"); } else { - char tsigrcode[64]; + char tsigrcode[64]; isc_buffer_t b; - dns_rcode_t status; + dns_rcode_t status; isc_result_t tresult; /* There is a signature, but it is bad. */ @@ -2115,7 +2103,8 @@ ns__client_request(isc_nmhandle_t *handle, isc_region_t *region, void *arg) * that don't have all the same keys as the master. */ if (!(client->message->tsigstatus == dns_tsigerror_badkey && - client->message->opcode == dns_opcode_update)) { + client->message->opcode == dns_opcode_update)) + { ns_client_error(client, sigresult); isc_task_unpause(client->task); return; @@ -2140,7 +2129,8 @@ ns__client_request(isc_nmhandle_t *handle, isc_region_t *region, void *arg) true) == ISC_R_SUCCESS && ns_client_checkaclsilent(client, &client->destaddr, client->view->cacheonacl, - true) == ISC_R_SUCCESS) { + true) == ISC_R_SUCCESS) + { ra = true; } @@ -2157,7 +2147,7 @@ ns__client_request(isc_nmhandle_t *handle, isc_region_t *region, void *arg) */ if (client->udpsize > 512) { dns_peer_t *peer = NULL; - uint16_t udpsize = client->view->maxudp; + uint16_t udpsize = client->view->maxudp; (void)dns_peerlist_peerbyaddr(client->view->peers, &netaddr, &peer); if (peer != NULL) { @@ -2219,8 +2209,7 @@ ns__client_request(isc_nmhandle_t *handle, isc_region_t *region, void *arg) } void -ns__client_tcpconn(isc_nmhandle_t *handle, isc_result_t result, void *arg) -{ +ns__client_tcpconn(isc_nmhandle_t *handle, isc_result_t result, void *arg) { ns_server_t *sctx = (ns_server_t *)arg; unsigned int tcpquota; @@ -2233,8 +2222,7 @@ ns__client_tcpconn(isc_nmhandle_t *handle, isc_result_t result, void *arg) } static void -get_clientmctx(ns_clientmgr_t *manager, isc_mem_t **mctxp) -{ +get_clientmctx(ns_clientmgr_t *manager, isc_mem_t **mctxp) { isc_mem_t *clientmctx; #if CLIENT_NMCTXS > 0 unsigned int nextmctx; @@ -2270,8 +2258,7 @@ get_clientmctx(ns_clientmgr_t *manager, isc_mem_t **mctxp) } isc_result_t -ns__client_setup(ns_client_t *client, ns_clientmgr_t *mgr, bool new) -{ +ns__client_setup(ns_client_t *client, ns_clientmgr_t *mgr, bool new) { isc_result_t result; /* @@ -2302,8 +2289,8 @@ ns__client_setup(ns_client_t *client, ns_clientmgr_t *mgr, bool new) goto cleanup; } - client->recvbuf = - isc_mem_get(client->mctx, NS_CLIENT_RECV_BUFFER_SIZE); + client->recvbuf = isc_mem_get(client->mctx, + NS_CLIENT_RECV_BUFFER_SIZE); /* * Set magic earlier than usual because ns_query_init() * and the functions it calls will require it. @@ -2315,12 +2302,12 @@ ns__client_setup(ns_client_t *client, ns_clientmgr_t *mgr, bool new) } } else { ns_clientmgr_t *oldmgr = client->manager; - ns_server_t * sctx = client->sctx; - isc_task_t * task = client->task; - unsigned char * recvbuf = client->recvbuf; - dns_message_t * message = client->message; - isc_mem_t * oldmctx = client->mctx; - ns_query_t query = client->query; + ns_server_t *sctx = client->sctx; + isc_task_t *task = client->task; + unsigned char *recvbuf = client->recvbuf; + dns_message_t *message = client->message; + isc_mem_t *oldmctx = client->mctx; + ns_query_t query = client->query; *client = (ns_client_t){ .magic = 0, .mctx = oldmctx, @@ -2378,8 +2365,7 @@ cleanup: } bool -ns_client_shuttingdown(ns_client_t *client) -{ +ns_client_shuttingdown(ns_client_t *client) { return (client->shuttingdown); } @@ -2388,8 +2374,7 @@ ns_client_shuttingdown(ns_client_t *client) ***/ static void -clientmgr_attach(ns_clientmgr_t *source, ns_clientmgr_t **targetp) -{ +clientmgr_attach(ns_clientmgr_t *source, ns_clientmgr_t **targetp) { int32_t oldrefs; REQUIRE(VALID_MANAGER(source)); @@ -2404,9 +2389,8 @@ clientmgr_attach(ns_clientmgr_t *source, ns_clientmgr_t **targetp) } static void -clientmgr_detach(ns_clientmgr_t **mp) -{ - int32_t oldrefs; +clientmgr_detach(ns_clientmgr_t **mp) { + int32_t oldrefs; ns_clientmgr_t *mgr = *mp; *mp = NULL; @@ -2420,8 +2404,7 @@ clientmgr_detach(ns_clientmgr_t **mp) } static void -clientmgr_destroy(ns_clientmgr_t *manager) -{ +clientmgr_destroy(ns_clientmgr_t *manager) { #if CLIENT_NMCTXS > 0 int i; #endif /* if CLIENT_NMCTXS > 0 */ @@ -2465,10 +2448,9 @@ clientmgr_destroy(ns_clientmgr_t *manager) isc_result_t ns_clientmgr_create(isc_mem_t *mctx, ns_server_t *sctx, isc_taskmgr_t *taskmgr, isc_timermgr_t *timermgr, ns_interface_t *interface, - ns_clientmgr_t **managerp) -{ + ns_clientmgr_t **managerp) { ns_clientmgr_t *manager; - isc_result_t result; + isc_result_t result; #if CLIENT_NMCTXS > 0 int i; #endif /* if CLIENT_NMCTXS > 0 */ @@ -2492,8 +2474,8 @@ ns_clientmgr_create(isc_mem_t *mctx, ns_server_t *sctx, isc_taskmgr_t *taskmgr, ns_interface_attach(interface, &manager->interface); manager->exiting = false; - manager->taskpool = - isc_mem_get(mctx, CLIENT_NTASKS * sizeof(isc_task_t *)); + manager->taskpool = isc_mem_get(mctx, + CLIENT_NTASKS * sizeof(isc_task_t *)); for (i = 0; i < CLIENT_NTASKS; i++) { manager->taskpool[i] = NULL; isc_task_create(manager->taskmgr, 20, &manager->taskpool[i]); @@ -2527,11 +2509,10 @@ cleanup_reclock: } void -ns_clientmgr_destroy(ns_clientmgr_t **managerp) -{ - isc_result_t result; +ns_clientmgr_destroy(ns_clientmgr_t **managerp) { + isc_result_t result; ns_clientmgr_t *manager; - bool unlock = false; + bool unlock = false; REQUIRE(managerp != NULL); manager = *managerp; @@ -2562,26 +2543,23 @@ ns_clientmgr_destroy(ns_clientmgr_t **managerp) } isc_sockaddr_t * -ns_client_getsockaddr(ns_client_t *client) -{ +ns_client_getsockaddr(ns_client_t *client) { return (&client->peeraddr); } isc_sockaddr_t * -ns_client_getdestaddr(ns_client_t *client) -{ +ns_client_getdestaddr(ns_client_t *client) { return (&client->destsockaddr); } isc_result_t ns_client_checkaclsilent(ns_client_t *client, isc_netaddr_t *netaddr, - dns_acl_t *acl, bool default_allow) -{ - isc_result_t result; + dns_acl_t *acl, bool default_allow) { + isc_result_t result; dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->manager->interface->mgr); isc_netaddr_t tmpnetaddr; - int match; + int match; if (acl == NULL) { if (default_allow) { @@ -2616,9 +2594,8 @@ deny: isc_result_t ns_client_checkacl(ns_client_t *client, isc_sockaddr_t *sockaddr, const char *opname, dns_acl_t *acl, bool default_allow, - int log_level) -{ - isc_result_t result; + int log_level) { + isc_result_t result; isc_netaddr_t netaddr; if (sockaddr != NULL) { @@ -2641,8 +2618,7 @@ ns_client_checkacl(ns_client_t *client, isc_sockaddr_t *sockaddr, } static void -ns_client_name(ns_client_t *client, char *peerbuf, size_t len) -{ +ns_client_name(ns_client_t *client, char *peerbuf, size_t len) { if (client->peeraddr_valid) { isc_sockaddr_format(&client->peeraddr, peerbuf, (unsigned int)len); @@ -2653,8 +2629,8 @@ ns_client_name(ns_client_t *client, char *peerbuf, size_t len) void ns_client_logv(ns_client_t *client, isc_logcategory_t *category, - isc_logmodule_t *module, int level, const char *fmt, va_list ap) -{ + isc_logmodule_t *module, int level, const char *fmt, + va_list ap) { char msgbuf[4096]; char signerbuf[DNS_NAME_FORMATSIZE], qnamebuf[DNS_NAME_FORMATSIZE]; char peerbuf[ISC_SOCKADDR_FORMATSIZE]; @@ -2683,7 +2659,8 @@ ns_client_logv(ns_client_t *client, isc_logcategory_t *category, } if (client->view != NULL && strcmp(client->view->name, "_bind") != 0 && - strcmp(client->view->name, "_default") != 0) { + strcmp(client->view->name, "_default") != 0) + { sep4 = ": view "; viewname = client->view->name; } @@ -2702,8 +2679,7 @@ ns_client_logv(ns_client_t *client, isc_logcategory_t *category, void ns_client_log(ns_client_t *client, isc_logcategory_t *category, - isc_logmodule_t *module, int level, const char *fmt, ...) -{ + isc_logmodule_t *module, int level, const char *fmt, ...) { va_list ap; if (!isc_log_wouldlog(ns_lctx, level)) { @@ -2717,8 +2693,7 @@ ns_client_log(ns_client_t *client, isc_logcategory_t *category, void ns_client_aclmsg(const char *msg, const dns_name_t *name, dns_rdatatype_t type, - dns_rdataclass_t rdclass, char *buf, size_t len) -{ + dns_rdataclass_t rdclass, char *buf, size_t len) { char namebuf[DNS_NAME_FORMATSIZE]; char typebuf[DNS_RDATATYPE_FORMATSIZE]; char classbuf[DNS_RDATACLASS_FORMATSIZE]; @@ -2731,11 +2706,10 @@ ns_client_aclmsg(const char *msg, const dns_name_t *name, dns_rdatatype_t type, } static void -ns_client_dumpmessage(ns_client_t *client, const char *reason) -{ +ns_client_dumpmessage(ns_client_t *client, const char *reason) { isc_buffer_t buffer; - char * buf = NULL; - int len = 1024; + char *buf = NULL; + int len = 1024; isc_result_t result; if (!isc_log_wouldlog(ns_lctx, ISC_LOG_DEBUG(1))) { @@ -2769,17 +2743,16 @@ ns_client_dumpmessage(ns_client_t *client, const char *reason) } void -ns_client_dumprecursing(FILE *f, ns_clientmgr_t *manager) -{ - ns_client_t * client; - char namebuf[DNS_NAME_FORMATSIZE]; - char original[DNS_NAME_FORMATSIZE]; - char peerbuf[ISC_SOCKADDR_FORMATSIZE]; - char typebuf[DNS_RDATATYPE_FORMATSIZE]; - char classbuf[DNS_RDATACLASS_FORMATSIZE]; - const char * name; - const char * sep; - const char * origfor; +ns_client_dumprecursing(FILE *f, ns_clientmgr_t *manager) { + ns_client_t *client; + char namebuf[DNS_NAME_FORMATSIZE]; + char original[DNS_NAME_FORMATSIZE]; + char peerbuf[ISC_SOCKADDR_FORMATSIZE]; + char typebuf[DNS_RDATATYPE_FORMATSIZE]; + char classbuf[DNS_RDATACLASS_FORMATSIZE]; + const char *name; + const char *sep; + const char *origfor; dns_rdataset_t *rdataset; REQUIRE(VALID_MANAGER(manager)); @@ -2792,7 +2765,8 @@ ns_client_dumprecursing(FILE *f, ns_clientmgr_t *manager) ns_client_name(client, peerbuf, sizeof(peerbuf)); if (client->view != NULL && strcmp(client->view->name, "_bind") != 0 && - strcmp(client->view->name, "_default") != 0) { + strcmp(client->view->name, "_default") != 0) + { name = client->view->name; sep = ": view "; } else { @@ -2804,7 +2778,8 @@ ns_client_dumprecursing(FILE *f, ns_clientmgr_t *manager) INSIST(client->query.qname != NULL); dns_name_format(client->query.qname, namebuf, sizeof(namebuf)); if (client->query.qname != client->query.origqname && - client->query.origqname != NULL) { + client->query.origqname != NULL) + { origfor = " for "; dns_name_format(client->query.origqname, original, sizeof(original)); @@ -2838,8 +2813,7 @@ ns_client_dumprecursing(FILE *f, ns_clientmgr_t *manager) } void -ns_client_qnamereplace(ns_client_t *client, dns_name_t *name) -{ +ns_client_qnamereplace(ns_client_t *client, dns_name_t *name) { LOCK(&client->query.fetchlock); if (client->query.restarts > 0) { /* @@ -2853,8 +2827,7 @@ ns_client_qnamereplace(ns_client_t *client, dns_name_t *name) } isc_result_t -ns_client_sourceip(dns_clientinfo_t *ci, isc_sockaddr_t **addrp) -{ +ns_client_sourceip(dns_clientinfo_t *ci, isc_sockaddr_t **addrp) { ns_client_t *client = (ns_client_t *)ci->data; REQUIRE(NS_CLIENT_VALID(client)); @@ -2865,10 +2838,9 @@ ns_client_sourceip(dns_clientinfo_t *ci, isc_sockaddr_t **addrp) } dns_rdataset_t * -ns_client_newrdataset(ns_client_t *client) -{ +ns_client_newrdataset(ns_client_t *client) { dns_rdataset_t *rdataset; - isc_result_t result; + isc_result_t result; REQUIRE(NS_CLIENT_VALID(client)); @@ -2882,8 +2854,7 @@ ns_client_newrdataset(ns_client_t *client) } void -ns_client_putrdataset(ns_client_t *client, dns_rdataset_t **rdatasetp) -{ +ns_client_putrdataset(ns_client_t *client, dns_rdataset_t **rdatasetp) { dns_rdataset_t *rdataset; REQUIRE(NS_CLIENT_VALID(client)); @@ -2900,8 +2871,7 @@ ns_client_putrdataset(ns_client_t *client, dns_rdataset_t **rdatasetp) } isc_result_t -ns_client_newnamebuf(ns_client_t *client) -{ +ns_client_newnamebuf(ns_client_t *client) { isc_buffer_t *dbuf; CTRACE("ns_client_newnamebuf"); @@ -2915,9 +2885,8 @@ ns_client_newnamebuf(ns_client_t *client) } dns_name_t * -ns_client_newname(ns_client_t *client, isc_buffer_t *dbuf, isc_buffer_t *nbuf) -{ - dns_name_t * name; +ns_client_newname(ns_client_t *client, isc_buffer_t *dbuf, isc_buffer_t *nbuf) { + dns_name_t *name; isc_region_t r; isc_result_t result; @@ -2943,11 +2912,10 @@ ns_client_newname(ns_client_t *client, isc_buffer_t *dbuf, isc_buffer_t *nbuf) } isc_buffer_t * -ns_client_getnamebuf(ns_client_t *client) -{ +ns_client_getnamebuf(ns_client_t *client) { isc_buffer_t *dbuf; - isc_result_t result; - isc_region_t r; + isc_result_t result; + isc_region_t r; CTRACE("ns_client_getnamebuf"); @@ -2983,8 +2951,7 @@ ns_client_getnamebuf(ns_client_t *client) } void -ns_client_keepname(ns_client_t *client, dns_name_t *name, isc_buffer_t *dbuf) -{ +ns_client_keepname(ns_client_t *client, dns_name_t *name, isc_buffer_t *dbuf) { isc_region_t r; CTRACE("ns_client_keepname"); @@ -3002,8 +2969,7 @@ ns_client_keepname(ns_client_t *client, dns_name_t *name, isc_buffer_t *dbuf) } void -ns_client_releasename(ns_client_t *client, dns_name_t **namep) -{ +ns_client_releasename(ns_client_t *client, dns_name_t **namep) { dns_name_t *name = *namep; /*% @@ -3023,9 +2989,8 @@ ns_client_releasename(ns_client_t *client, dns_name_t **namep) } isc_result_t -ns_client_newdbversion(ns_client_t *client, unsigned int n) -{ - unsigned int i; +ns_client_newdbversion(ns_client_t *client, unsigned int n) { + unsigned int i; ns_dbversion_t *dbversion; for (i = 0; i < n; i++) { @@ -3042,9 +3007,8 @@ ns_client_newdbversion(ns_client_t *client, unsigned int n) } static inline ns_dbversion_t * -client_getdbversion(ns_client_t *client) -{ - isc_result_t result; +client_getdbversion(ns_client_t *client) { + isc_result_t result; ns_dbversion_t *dbversion; if (ISC_LIST_EMPTY(client->query.freeversions)) { @@ -3061,12 +3025,12 @@ client_getdbversion(ns_client_t *client) } ns_dbversion_t * -ns_client_findversion(ns_client_t *client, dns_db_t *db) -{ +ns_client_findversion(ns_client_t *client, dns_db_t *db) { ns_dbversion_t *dbversion; for (dbversion = ISC_LIST_HEAD(client->query.activeversions); - dbversion != NULL; dbversion = ISC_LIST_NEXT(dbversion, link)) { + dbversion != NULL; dbversion = ISC_LIST_NEXT(dbversion, link)) + { if (dbversion->db == db) { break; } diff --git a/lib/ns/hooks.c b/lib/ns/hooks.c index 9d3bf09ad2..8719acefac 100644 --- a/lib/ns/hooks.c +++ b/lib/ns/hooks.c @@ -47,13 +47,13 @@ } while (0) struct ns_plugin { - isc_mem_t * mctx; - void * handle; - void * inst; - char * modpath; - ns_plugin_check_t * check_func; + isc_mem_t *mctx; + void *handle; + void *inst; + char *modpath; + ns_plugin_check_t *check_func; ns_plugin_register_t *register_func; - ns_plugin_destroy_t * destroy_func; + ns_plugin_destroy_t *destroy_func; LINK(ns_plugin_t) link; }; @@ -61,8 +61,7 @@ static ns_hooklist_t default_hooktable[NS_HOOKPOINTS_COUNT]; LIBNS_EXTERNAL_DATA ns_hooktable_t *ns__hook_table = &default_hooktable; isc_result_t -ns_plugin_expandpath(const char *src, char *dst, size_t dstsize) -{ +ns_plugin_expandpath(const char *src, char *dst, size_t dstsize) { int result; #ifndef WIN32 @@ -99,8 +98,7 @@ ns_plugin_expandpath(const char *src, char *dst, size_t dstsize) #if HAVE_DLFCN_H && HAVE_DLOPEN static isc_result_t load_symbol(void *handle, const char *modpath, const char *symbol_name, - void **symbolp) -{ + void **symbolp) { void *symbol = NULL; REQUIRE(handle != NULL); @@ -134,16 +132,15 @@ load_symbol(void *handle, const char *modpath, const char *symbol_name, } static isc_result_t -load_plugin(isc_mem_t *mctx, const char *modpath, ns_plugin_t **pluginp) -{ - isc_result_t result; - void * handle = NULL; - ns_plugin_t * plugin = NULL; - ns_plugin_check_t * check_func = NULL; +load_plugin(isc_mem_t *mctx, const char *modpath, ns_plugin_t **pluginp) { + isc_result_t result; + void *handle = NULL; + ns_plugin_t *plugin = NULL; + ns_plugin_check_t *check_func = NULL; ns_plugin_register_t *register_func = NULL; - ns_plugin_destroy_t * destroy_func = NULL; - ns_plugin_version_t * version_func = NULL; - int version, flags; + ns_plugin_destroy_t *destroy_func = NULL; + ns_plugin_version_t *version_func = NULL; + int version, flags; REQUIRE(pluginp != NULL && *pluginp == NULL); @@ -170,7 +167,8 @@ load_plugin(isc_mem_t *mctx, const char *modpath, ns_plugin_t **pluginp) version = version_func(); if (version < (NS_PLUGIN_VERSION - NS_PLUGIN_AGE) || - version > NS_PLUGIN_VERSION) { + version > NS_PLUGIN_VERSION) + { isc_log_write(ns_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_HOOKS, ISC_LOG_ERROR, "plugin API version mismatch: %d/%d", version, @@ -219,8 +217,7 @@ cleanup: } static void -unload_plugin(ns_plugin_t **pluginp) -{ +unload_plugin(ns_plugin_t **pluginp) { ns_plugin_t *plugin = NULL; REQUIRE(pluginp != NULL && *pluginp != NULL); @@ -247,8 +244,7 @@ unload_plugin(ns_plugin_t **pluginp) #elif _WIN32 static isc_result_t load_symbol(HMODULE handle, const char *modpath, const char *symbol_name, - void **symbolp) -{ + void **symbolp) { void *symbol = NULL; REQUIRE(handle != NULL); @@ -271,8 +267,7 @@ load_symbol(HMODULE handle, const char *modpath, const char *symbol_name, } static isc_result_t -load_plugin(isc_mem_t *mctx, const char *modpath, ns_plugin_t **pluginp) -{ +load_plugin(isc_mem_t *mctx, const char *modpath, ns_plugin_t **pluginp) { isc_result_t result; HMODULE handle; ns_plugin_t *plugin = NULL; @@ -293,7 +288,8 @@ load_plugin(isc_mem_t *mctx, const char *modpath, ns_plugin_t **pluginp) version = version_func(); if (version < (NS_PLUGIN_VERSION - NS_PLUGIN_AGE) || - version > NS_PLUGIN_VERSION) { + version > NS_PLUGIN_VERSION) + { isc_log_write(ns_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_HOOKS, ISC_LOG_ERROR, "plugin API version mismatch: %d/%d", version, @@ -342,8 +338,7 @@ cleanup: } static void -unload_plugin(ns_plugin_t **pluginp) -{ +unload_plugin(ns_plugin_t **pluginp) { ns_plugin_t *plugin = NULL; REQUIRE(pluginp != NULL && *pluginp != NULL); @@ -370,8 +365,7 @@ unload_plugin(ns_plugin_t **pluginp) } #else /* HAVE_DLFCN_H || _WIN32 */ static isc_result_t -load_plugin(isc_mem_t *mctx, const char *modpath, ns_plugin_t **pluginp) -{ +load_plugin(isc_mem_t *mctx, const char *modpath, ns_plugin_t **pluginp) { UNUSED(mctx); UNUSED(modpath); UNUSED(pluginp); @@ -383,8 +377,7 @@ load_plugin(isc_mem_t *mctx, const char *modpath, ns_plugin_t **pluginp) } static void -unload_plugin(ns_plugin_t **pluginp) -{ +unload_plugin(ns_plugin_t **pluginp) { UNUSED(pluginp); } #endif /* HAVE_DLFCN_H */ @@ -393,8 +386,7 @@ isc_result_t ns_plugin_register(const char *modpath, const char *parameters, const void *cfg, const char *cfg_file, unsigned long cfg_line, isc_mem_t *mctx, isc_log_t *lctx, void *actx, - dns_view_t *view) -{ + dns_view_t *view) { isc_result_t result; ns_plugin_t *plugin = NULL; @@ -427,8 +419,7 @@ cleanup: isc_result_t ns_plugin_check(const char *modpath, const char *parameters, const void *cfg, const char *cfg_file, unsigned long cfg_line, isc_mem_t *mctx, - isc_log_t *lctx, void *actx) -{ + isc_log_t *lctx, void *actx) { isc_result_t result; ns_plugin_t *plugin = NULL; @@ -446,8 +437,7 @@ cleanup: } void -ns_hooktable_init(ns_hooktable_t *hooktable) -{ +ns_hooktable_init(ns_hooktable_t *hooktable) { int i; for (i = 0; i < NS_HOOKPOINTS_COUNT; i++) { @@ -456,8 +446,7 @@ ns_hooktable_init(ns_hooktable_t *hooktable) } isc_result_t -ns_hooktable_create(isc_mem_t *mctx, ns_hooktable_t **tablep) -{ +ns_hooktable_create(isc_mem_t *mctx, ns_hooktable_t **tablep) { ns_hooktable_t *hooktable = NULL; REQUIRE(tablep != NULL && *tablep == NULL); @@ -472,11 +461,10 @@ ns_hooktable_create(isc_mem_t *mctx, ns_hooktable_t **tablep) } void -ns_hooktable_free(isc_mem_t *mctx, void **tablep) -{ +ns_hooktable_free(isc_mem_t *mctx, void **tablep) { ns_hooktable_t *table = NULL; - ns_hook_t * hook = NULL, *next = NULL; - int i = 0; + ns_hook_t *hook = NULL, *next = NULL; + int i = 0; REQUIRE(tablep != NULL && *tablep != NULL); @@ -500,8 +488,7 @@ ns_hooktable_free(isc_mem_t *mctx, void **tablep) void ns_hook_add(ns_hooktable_t *hooktable, isc_mem_t *mctx, - ns_hookpoint_t hookpoint, const ns_hook_t *hook) -{ + ns_hookpoint_t hookpoint, const ns_hook_t *hook) { ns_hook_t *copy = NULL; REQUIRE(hooktable != NULL); @@ -521,8 +508,7 @@ ns_hook_add(ns_hooktable_t *hooktable, isc_mem_t *mctx, } void -ns_plugins_create(isc_mem_t *mctx, ns_plugins_t **listp) -{ +ns_plugins_create(isc_mem_t *mctx, ns_plugins_t **listp) { ns_plugins_t *plugins = NULL; REQUIRE(listp != NULL && *listp == NULL); @@ -535,10 +521,9 @@ ns_plugins_create(isc_mem_t *mctx, ns_plugins_t **listp) } void -ns_plugins_free(isc_mem_t *mctx, void **listp) -{ +ns_plugins_free(isc_mem_t *mctx, void **listp) { ns_plugins_t *list = NULL; - ns_plugin_t * plugin = NULL, *next = NULL; + ns_plugin_t *plugin = NULL, *next = NULL; REQUIRE(listp != NULL && *listp != NULL); diff --git a/lib/ns/include/ns/client.h b/lib/ns/include/ns/client.h index 78b1475a31..dce787a9f2 100644 --- a/lib/ns/include/ns/client.h +++ b/lib/ns/include/ns/client.h @@ -81,7 +81,7 @@ *** Types ***/ -#define NS_CLIENT_TCP_BUFFER_SIZE (65535 + 2) +#define NS_CLIENT_TCP_BUFFER_SIZE (65535 + 2) #define NS_CLIENT_SEND_BUFFER_SIZE 4096 #define NS_CLIENT_RECV_BUFFER_SIZE 4096 @@ -266,25 +266,25 @@ struct ns_client { int32_t rcode_override; }; -#define NS_CLIENT_MAGIC ISC_MAGIC('N', 'S', 'C', 'c') +#define NS_CLIENT_MAGIC ISC_MAGIC('N', 'S', 'C', 'c') #define NS_CLIENT_VALID(c) ISC_MAGIC_VALID(c, NS_CLIENT_MAGIC) -#define NS_CLIENTATTR_TCP 0x00001 -#define NS_CLIENTATTR_RA 0x00002 /*%< Client gets recursive service */ -#define NS_CLIENTATTR_PKTINFO 0x00004 /*%< pktinfo is valid */ -#define NS_CLIENTATTR_MULTICAST 0x00008 /*%< recv'd from multicast */ +#define NS_CLIENTATTR_TCP 0x00001 +#define NS_CLIENTATTR_RA 0x00002 /*%< Client gets recursive service */ +#define NS_CLIENTATTR_PKTINFO 0x00004 /*%< pktinfo is valid */ +#define NS_CLIENTATTR_MULTICAST 0x00008 /*%< recv'd from multicast */ #define NS_CLIENTATTR_WANTDNSSEC 0x00010 /*%< include dnssec records */ -#define NS_CLIENTATTR_WANTNSID 0x00020 /*%< include nameserver ID */ +#define NS_CLIENTATTR_WANTNSID 0x00020 /*%< include nameserver ID */ /* Obsolete: NS_CLIENTATTR_FILTER_AAAA 0x00040 */ /* Obsolete: NS_CLIENTATTR_FILTER_AAAA_RC 0x00080 */ -#define NS_CLIENTATTR_WANTAD 0x00100 /*%< want AD in response if possible */ -#define NS_CLIENTATTR_WANTCOOKIE 0x00200 /*%< return a COOKIE */ -#define NS_CLIENTATTR_HAVECOOKIE 0x00400 /*%< has a valid COOKIE */ -#define NS_CLIENTATTR_WANTEXPIRE 0x00800 /*%< return seconds to expire */ -#define NS_CLIENTATTR_HAVEEXPIRE 0x01000 /*%< return seconds to expire */ -#define NS_CLIENTATTR_WANTOPT 0x02000 /*%< add opt to reply */ -#define NS_CLIENTATTR_HAVEECS 0x04000 /*%< received an ECS option */ -#define NS_CLIENTATTR_WANTPAD 0x08000 /*%< pad reply */ +#define NS_CLIENTATTR_WANTAD 0x00100 /*%< want AD in response if possible */ +#define NS_CLIENTATTR_WANTCOOKIE 0x00200 /*%< return a COOKIE */ +#define NS_CLIENTATTR_HAVECOOKIE 0x00400 /*%< has a valid COOKIE */ +#define NS_CLIENTATTR_WANTEXPIRE 0x00800 /*%< return seconds to expire */ +#define NS_CLIENTATTR_HAVEEXPIRE 0x01000 /*%< return seconds to expire */ +#define NS_CLIENTATTR_WANTOPT 0x02000 /*%< add opt to reply */ +#define NS_CLIENTATTR_HAVEECS 0x04000 /*%< received an ECS option */ +#define NS_CLIENTATTR_WANTPAD 0x08000 /*%< pad reply */ #define NS_CLIENTATTR_USEKEEPALIVE 0x10000 /*%< use TCP keepalive */ #define NS_CLIENTATTR_NOSETFC 0x20000 /*%< don't set servfail cache */ diff --git a/lib/ns/include/ns/hooks.h b/lib/ns/include/ns/hooks.h index 9dd808794f..12b0e836f1 100644 --- a/lib/ns/include/ns/hooks.h +++ b/lib/ns/include/ns/hooks.h @@ -259,7 +259,7 @@ LIBNS_EXTERNAL_DATA extern ns_hooktable_t *ns__hook_table; */ #ifndef NS_PLUGIN_VERSION #define NS_PLUGIN_VERSION 1 -#define NS_PLUGIN_AGE 0 +#define NS_PLUGIN_AGE 0 #endif /* ifndef NS_PLUGIN_VERSION */ typedef isc_result_t diff --git a/lib/ns/include/ns/interfacemgr.h b/lib/ns/include/ns/interfacemgr.h index 962978e8fe..424972e8fc 100644 --- a/lib/ns/include/ns/interfacemgr.h +++ b/lib/ns/include/ns/interfacemgr.h @@ -58,7 +58,7 @@ *** Types ***/ -#define IFACE_MAGIC ISC_MAGIC('I', ':', '-', ')') +#define IFACE_MAGIC ISC_MAGIC('I', ':', '-', ')') #define NS_INTERFACE_VALID(t) ISC_MAGIC_VALID(t, IFACE_MAGIC) #define NS_INTERFACEFLAG_ANYADDR 0x01U /*%< bound to "any" address */ diff --git a/lib/ns/include/ns/log.h b/lib/ns/include/ns/log.h index cb8ebe0ef1..428aff6f8d 100644 --- a/lib/ns/include/ns/log.h +++ b/lib/ns/include/ns/log.h @@ -21,28 +21,28 @@ LIBNS_EXTERNAL_DATA extern isc_log_t * ns_lctx; LIBNS_EXTERNAL_DATA extern isc_logcategory_t ns_categories[]; LIBNS_EXTERNAL_DATA extern isc_logmodule_t ns_modules[]; -#define NS_LOGCATEGORY_CLIENT (&ns_categories[0]) -#define NS_LOGCATEGORY_NETWORK (&ns_categories[1]) -#define NS_LOGCATEGORY_UPDATE (&ns_categories[2]) -#define NS_LOGCATEGORY_QUERIES (&ns_categories[3]) +#define NS_LOGCATEGORY_CLIENT (&ns_categories[0]) +#define NS_LOGCATEGORY_NETWORK (&ns_categories[1]) +#define NS_LOGCATEGORY_UPDATE (&ns_categories[2]) +#define NS_LOGCATEGORY_QUERIES (&ns_categories[3]) #define NS_LOGCATEGORY_UPDATE_SECURITY (&ns_categories[4]) -#define NS_LOGCATEGORY_QUERY_ERRORS (&ns_categories[5]) -#define NS_LOGCATEGORY_TAT (&ns_categories[6]) -#define NS_LOGCATEGORY_SERVE_STALE (&ns_categories[7]) +#define NS_LOGCATEGORY_QUERY_ERRORS (&ns_categories[5]) +#define NS_LOGCATEGORY_TAT (&ns_categories[6]) +#define NS_LOGCATEGORY_SERVE_STALE (&ns_categories[7]) /* * Backwards compatibility. */ #define NS_LOGCATEGORY_GENERAL ISC_LOGCATEGORY_GENERAL -#define NS_LOGMODULE_CLIENT (&ns_modules[0]) -#define NS_LOGMODULE_QUERY (&ns_modules[1]) +#define NS_LOGMODULE_CLIENT (&ns_modules[0]) +#define NS_LOGMODULE_QUERY (&ns_modules[1]) #define NS_LOGMODULE_INTERFACEMGR (&ns_modules[2]) -#define NS_LOGMODULE_UPDATE (&ns_modules[3]) -#define NS_LOGMODULE_XFER_IN (&ns_modules[4]) -#define NS_LOGMODULE_XFER_OUT (&ns_modules[5]) -#define NS_LOGMODULE_NOTIFY (&ns_modules[6]) -#define NS_LOGMODULE_HOOKS (&ns_modules[7]) +#define NS_LOGMODULE_UPDATE (&ns_modules[3]) +#define NS_LOGMODULE_XFER_IN (&ns_modules[4]) +#define NS_LOGMODULE_XFER_OUT (&ns_modules[5]) +#define NS_LOGMODULE_NOTIFY (&ns_modules[6]) +#define NS_LOGMODULE_HOOKS (&ns_modules[7]) void ns_log_init(isc_log_t *lctx); diff --git a/lib/ns/include/ns/query.h b/lib/ns/include/ns/query.h index 2138d20fdc..0831d0785c 100644 --- a/lib/ns/include/ns/query.h +++ b/lib/ns/include/ns/query.h @@ -98,23 +98,23 @@ struct ns_query { bool root_key_sentinel_not_ta; }; -#define NS_QUERYATTR_RECURSIONOK 0x00001 -#define NS_QUERYATTR_CACHEOK 0x00002 -#define NS_QUERYATTR_PARTIALANSWER 0x00004 -#define NS_QUERYATTR_NAMEBUFUSED 0x00008 -#define NS_QUERYATTR_RECURSING 0x00010 -#define NS_QUERYATTR_QUERYOKVALID 0x00040 -#define NS_QUERYATTR_QUERYOK 0x00080 -#define NS_QUERYATTR_WANTRECURSION 0x00100 -#define NS_QUERYATTR_SECURE 0x00200 -#define NS_QUERYATTR_NOAUTHORITY 0x00400 -#define NS_QUERYATTR_NOADDITIONAL 0x00800 +#define NS_QUERYATTR_RECURSIONOK 0x00001 +#define NS_QUERYATTR_CACHEOK 0x00002 +#define NS_QUERYATTR_PARTIALANSWER 0x00004 +#define NS_QUERYATTR_NAMEBUFUSED 0x00008 +#define NS_QUERYATTR_RECURSING 0x00010 +#define NS_QUERYATTR_QUERYOKVALID 0x00040 +#define NS_QUERYATTR_QUERYOK 0x00080 +#define NS_QUERYATTR_WANTRECURSION 0x00100 +#define NS_QUERYATTR_SECURE 0x00200 +#define NS_QUERYATTR_NOAUTHORITY 0x00400 +#define NS_QUERYATTR_NOADDITIONAL 0x00800 #define NS_QUERYATTR_CACHEACLOKVALID 0x01000 -#define NS_QUERYATTR_CACHEACLOK 0x02000 -#define NS_QUERYATTR_DNS64 0x04000 -#define NS_QUERYATTR_DNS64EXCLUDE 0x08000 -#define NS_QUERYATTR_RRL_CHECKED 0x10000 -#define NS_QUERYATTR_REDIRECT 0x20000 +#define NS_QUERYATTR_CACHEACLOK 0x02000 +#define NS_QUERYATTR_DNS64 0x04000 +#define NS_QUERYATTR_DNS64EXCLUDE 0x08000 +#define NS_QUERYATTR_RRL_CHECKED 0x10000 +#define NS_QUERYATTR_REDIRECT 0x20000 typedef struct query_ctx query_ctx_t; diff --git a/lib/ns/include/ns/server.h b/lib/ns/include/ns/server.h index a157071a9e..512119b899 100644 --- a/lib/ns/include/ns/server.h +++ b/lib/ns/include/ns/server.h @@ -32,20 +32,20 @@ #define NS_EVENT_CLIENTCONTROL (ISC_EVENTCLASS_NS + 0) -#define NS_SERVER_LOGQUERIES 0x00000001U /*%< log queries */ -#define NS_SERVER_NOAA 0x00000002U /*%< -T noaa */ -#define NS_SERVER_NOSOA 0x00000004U /*%< -T nosoa */ -#define NS_SERVER_NONEAREST 0x00000008U /*%< -T nonearest */ -#define NS_SERVER_NOEDNS 0x00000020U /*%< -T noedns */ -#define NS_SERVER_DROPEDNS 0x00000040U /*%< -T dropedns */ -#define NS_SERVER_NOTCP 0x00000080U /*%< -T notcp */ -#define NS_SERVER_DISABLE4 0x00000100U /*%< -6 */ -#define NS_SERVER_DISABLE6 0x00000200U /*%< -4 */ -#define NS_SERVER_FIXEDLOCAL 0x00000400U /*%< -T fixedlocal */ +#define NS_SERVER_LOGQUERIES 0x00000001U /*%< log queries */ +#define NS_SERVER_NOAA 0x00000002U /*%< -T noaa */ +#define NS_SERVER_NOSOA 0x00000004U /*%< -T nosoa */ +#define NS_SERVER_NONEAREST 0x00000008U /*%< -T nonearest */ +#define NS_SERVER_NOEDNS 0x00000020U /*%< -T noedns */ +#define NS_SERVER_DROPEDNS 0x00000040U /*%< -T dropedns */ +#define NS_SERVER_NOTCP 0x00000080U /*%< -T notcp */ +#define NS_SERVER_DISABLE4 0x00000100U /*%< -6 */ +#define NS_SERVER_DISABLE6 0x00000200U /*%< -4 */ +#define NS_SERVER_FIXEDLOCAL 0x00000400U /*%< -T fixedlocal */ #define NS_SERVER_SIGVALINSECS 0x00000800U /*%< -T sigvalinsecs */ -#define NS_SERVER_EDNSFORMERR 0x00001000U /*%< -T ednsformerr (STD13) */ -#define NS_SERVER_EDNSNOTIMP 0x00002000U /*%< -T ednsnotimp */ -#define NS_SERVER_EDNSREFUSED 0x00004000U /*%< -T ednsrefused */ +#define NS_SERVER_EDNSFORMERR 0x00001000U /*%< -T ednsformerr (STD13) */ +#define NS_SERVER_EDNSNOTIMP 0x00002000U /*%< -T ednsnotimp */ +#define NS_SERVER_EDNSREFUSED 0x00004000U /*%< -T ednsrefused */ /*% * Type for callback function to get hostname. diff --git a/lib/ns/interfacemgr.c b/lib/ns/interfacemgr.c index f66402fb54..1e1acebe41 100644 --- a/lib/ns/interfacemgr.c +++ b/lib/ns/interfacemgr.c @@ -33,10 +33,10 @@ #ifdef HAVE_NET_ROUTE_H #include #if defined(RTM_VERSION) && defined(RTM_NEWADDR) && defined(RTM_DELADDR) -#define USE_ROUTE_SOCKET 1 +#define USE_ROUTE_SOCKET 1 #define ROUTE_SOCKET_PROTOCOL PF_ROUTE -#define MSGHDR rt_msghdr -#define MSGTYPE rtm_type +#define MSGHDR rt_msghdr +#define MSGTYPE rtm_type #endif /* if defined(RTM_VERSION) && defined(RTM_NEWADDR) && \ * defined(RTM_DELADDR) */ #endif /* ifdef HAVE_NET_ROUTE_H */ @@ -45,10 +45,10 @@ #include #include #if defined(RTM_NEWADDR) && defined(RTM_DELADDR) -#define USE_ROUTE_SOCKET 1 +#define USE_ROUTE_SOCKET 1 #define ROUTE_SOCKET_PROTOCOL PF_NETLINK -#define MSGHDR nlmsghdr -#define MSGTYPE nlmsg_type +#define MSGHDR nlmsghdr +#define MSGTYPE nlmsg_type #endif /* if defined(RTM_NEWADDR) && defined(RTM_DELADDR) */ #endif /* if defined(HAVE_LINUX_NETLINK_H) && defined(HAVE_LINUX_RTNETLINK_H) \ */ @@ -59,7 +59,7 @@ #define UDPBUFFERS 1000 #endif /* TUNE_LARGE */ -#define IFMGR_MAGIC ISC_MAGIC('I', 'F', 'M', 'G') +#define IFMGR_MAGIC ISC_MAGIC('I', 'F', 'M', 'G') #define NS_INTERFACEMGR_VALID(t) ISC_MAGIC_VALID(t, IFMGR_MAGIC) #define IFMGR_COMMON_LOGARGS \ @@ -67,50 +67,47 @@ /*% nameserver interface manager structure */ struct ns_interfacemgr { - unsigned int magic; /*%< Magic number. */ - isc_refcount_t references; - isc_mutex_t lock; - isc_mem_t * mctx; /*%< Memory context. */ - ns_server_t * sctx; /*%< Server context. */ - isc_taskmgr_t * taskmgr; /*%< Task manager. */ - isc_task_t * excl; /*%< Exclusive task. */ - isc_timermgr_t * timermgr; /*%< Timer manager. */ - isc_socketmgr_t * socketmgr; /*%< Socket manager. */ - isc_nm_t * nm; /*%< Net manager. */ + unsigned int magic; /*%< Magic number. */ + isc_refcount_t references; + isc_mutex_t lock; + isc_mem_t *mctx; /*%< Memory context. */ + ns_server_t *sctx; /*%< Server context. */ + isc_taskmgr_t *taskmgr; /*%< Task manager. */ + isc_task_t *excl; /*%< Exclusive task. */ + isc_timermgr_t *timermgr; /*%< Timer manager. */ + isc_socketmgr_t *socketmgr; /*%< Socket manager. */ + isc_nm_t *nm; /*%< Net manager. */ dns_dispatchmgr_t *dispatchmgr; - unsigned int generation; /*%< Current generation no. */ - ns_listenlist_t * listenon4; - ns_listenlist_t * listenon6; - dns_aclenv_t aclenv; /*%< Localhost/localnets ACLs */ + unsigned int generation; /*%< Current generation no. */ + ns_listenlist_t *listenon4; + ns_listenlist_t *listenon6; + dns_aclenv_t aclenv; /*%< Localhost/localnets ACLs */ ISC_LIST(ns_interface_t) interfaces; /*%< List of interfaces. */ ISC_LIST(isc_sockaddr_t) listenon; - int backlog; /*%< Listen queue size */ - unsigned int udpdisp; /*%< UDP dispatch count */ - atomic_bool shuttingdown; /*%< Interfacemgr is shutting - * down */ + int backlog; /*%< Listen queue size */ + unsigned int udpdisp; /*%< UDP dispatch count */ + atomic_bool shuttingdown; /*%< Interfacemgr is shutting + * down */ #ifdef USE_ROUTE_SOCKET - isc_task_t * task; + isc_task_t *task; isc_socket_t *route; unsigned char buf[2048]; #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 -route_event(isc_task_t *task, isc_event_t *event) -{ +route_event(isc_task_t *task, isc_event_t *event) { isc_socketevent_t *sevent = NULL; ns_interfacemgr_t *mgr = NULL; - isc_region_t r; - isc_result_t result; - struct MSGHDR * rtm; - bool done = true; + isc_region_t r; + isc_result_t result; + struct MSGHDR *rtm; + bool done = true; UNUSED(task); @@ -184,9 +181,8 @@ ns_interfacemgr_create(isc_mem_t *mctx, ns_server_t *sctx, isc_socketmgr_t *socketmgr, isc_nm_t *nm, dns_dispatchmgr_t *dispatchmgr, isc_task_t *task, unsigned int udpdisp, dns_geoip_databases_t *geoip, - ns_interfacemgr_t **mgrp) -{ - isc_result_t result; + ns_interfacemgr_t **mgrp) { + isc_result_t result; ns_interfacemgr_t *mgr; #ifndef USE_ROUTE_SOCKET @@ -302,8 +298,7 @@ cleanup_ctx: } static void -ns_interfacemgr_destroy(ns_interfacemgr_t *mgr) -{ +ns_interfacemgr_destroy(ns_interfacemgr_t *mgr) { REQUIRE(NS_INTERFACEMGR_VALID(mgr)); isc_refcount_destroy(&mgr->references); @@ -332,8 +327,7 @@ ns_interfacemgr_destroy(ns_interfacemgr_t *mgr) } void -ns_interfacemgr_setbacklog(ns_interfacemgr_t *mgr, int backlog) -{ +ns_interfacemgr_setbacklog(ns_interfacemgr_t *mgr, int backlog) { REQUIRE(NS_INTERFACEMGR_VALID(mgr)); LOCK(&mgr->lock); mgr->backlog = backlog; @@ -341,24 +335,21 @@ ns_interfacemgr_setbacklog(ns_interfacemgr_t *mgr, int backlog) } dns_aclenv_t * -ns_interfacemgr_getaclenv(ns_interfacemgr_t *mgr) -{ +ns_interfacemgr_getaclenv(ns_interfacemgr_t *mgr) { REQUIRE(NS_INTERFACEMGR_VALID(mgr)); return (&mgr->aclenv); } void -ns_interfacemgr_attach(ns_interfacemgr_t *source, ns_interfacemgr_t **target) -{ +ns_interfacemgr_attach(ns_interfacemgr_t *source, ns_interfacemgr_t **target) { REQUIRE(NS_INTERFACEMGR_VALID(source)); isc_refcount_increment(&source->references); *target = source; } void -ns_interfacemgr_detach(ns_interfacemgr_t **targetp) -{ +ns_interfacemgr_detach(ns_interfacemgr_t **targetp) { ns_interfacemgr_t *target = *targetp; *targetp = NULL; REQUIRE(target != NULL); @@ -369,8 +360,7 @@ ns_interfacemgr_detach(ns_interfacemgr_t **targetp) } void -ns_interfacemgr_shutdown(ns_interfacemgr_t *mgr) -{ +ns_interfacemgr_shutdown(ns_interfacemgr_t *mgr) { REQUIRE(NS_INTERFACEMGR_VALID(mgr)); /*% @@ -394,11 +384,10 @@ ns_interfacemgr_shutdown(ns_interfacemgr_t *mgr) static isc_result_t ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, - const char *name, ns_interface_t **ifpret) -{ + const char *name, ns_interface_t **ifpret) { ns_interface_t *ifp; - isc_result_t result; - int disp; + isc_result_t result; + int disp; REQUIRE(NS_INTERFACEMGR_VALID(mgr)); @@ -457,8 +446,7 @@ failure: } static isc_result_t -ns_interface_listenudp(ns_interface_t *ifp) -{ +ns_interface_listenudp(ns_interface_t *ifp) { isc_result_t result; /* Reserve space for an ns_client_t with the netmgr handle */ @@ -469,8 +457,7 @@ ns_interface_listenudp(ns_interface_t *ifp) } static isc_result_t -ns_interface_listentcp(ns_interface_t *ifp) -{ +ns_interface_listentcp(ns_interface_t *ifp) { isc_result_t result; result = isc_nm_listentcpdns( @@ -508,9 +495,8 @@ ns_interface_listentcp(ns_interface_t *ifp) static isc_result_t ns_interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, const char *name, ns_interface_t **ifpret, bool accept_tcp, - isc_dscp_t dscp, bool *addr_in_use) -{ - isc_result_t result; + isc_dscp_t dscp, bool *addr_in_use) { + isc_result_t result; ns_interface_t *ifp = NULL; REQUIRE(ifpret != NULL && *ifpret == NULL); REQUIRE(addr_in_use == NULL || *addr_in_use == false); @@ -530,8 +516,8 @@ ns_interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, goto cleanup_interface; } - if (((mgr->sctx->options & NS_SERVER_NOTCP) == 0) && - accept_tcp == true) { + if (((mgr->sctx->options & NS_SERVER_NOTCP) == 0) && accept_tcp == true) + { result = ns_interface_listentcp(ifp); if (result != ISC_R_SUCCESS) { if ((result == ISC_R_ADDRINUSE) && @@ -560,8 +546,7 @@ cleanup_interface: } void -ns_interface_shutdown(ns_interface_t *ifp) -{ +ns_interface_shutdown(ns_interface_t *ifp) { if (ifp->udplistensocket != NULL) { isc_nm_udp_stoplistening(ifp->udplistensocket); isc_nmsocket_detach(&ifp->udplistensocket); @@ -576,8 +561,7 @@ ns_interface_shutdown(ns_interface_t *ifp) } static void -ns_interface_destroy(ns_interface_t *ifp) -{ +ns_interface_destroy(ns_interface_t *ifp) { REQUIRE(NS_INTERFACE_VALID(ifp)); isc_mem_t *mctx = ifp->mgr->mctx; @@ -610,16 +594,14 @@ ns_interface_destroy(ns_interface_t *ifp) } void -ns_interface_attach(ns_interface_t *source, ns_interface_t **target) -{ +ns_interface_attach(ns_interface_t *source, ns_interface_t **target) { REQUIRE(NS_INTERFACE_VALID(source)); isc_refcount_increment(&source->references); *target = source; } void -ns_interface_detach(ns_interface_t **targetp) -{ +ns_interface_detach(ns_interface_t **targetp) { ns_interface_t *target = *targetp; *targetp = NULL; REQUIRE(target != NULL); @@ -634,12 +616,12 @@ ns_interface_detach(ns_interface_t **targetp) * both match those of 'addr'. Return a pointer to it, or NULL if not found. */ static ns_interface_t * -find_matching_interface(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr) -{ +find_matching_interface(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr) { ns_interface_t *ifp; LOCK(&mgr->lock); for (ifp = ISC_LIST_HEAD(mgr->interfaces); ifp != NULL; - ifp = ISC_LIST_NEXT(ifp, link)) { + ifp = ISC_LIST_NEXT(ifp, link)) + { if (isc_sockaddr_equal(&ifp->addr, addr)) { break; } @@ -652,8 +634,7 @@ find_matching_interface(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr) * Remove any interfaces whose generation number is not the current one. */ static void -purge_old_interfaces(ns_interfacemgr_t *mgr) -{ +purge_old_interfaces(ns_interfacemgr_t *mgr) { ns_interface_t *ifp, *next; LOCK(&mgr->lock); for (ifp = ISC_LIST_HEAD(mgr->interfaces); ifp != NULL; ifp = next) { @@ -673,9 +654,8 @@ purge_old_interfaces(ns_interfacemgr_t *mgr) } static isc_result_t -clearacl(isc_mem_t *mctx, dns_acl_t **aclp) -{ - dns_acl_t * newacl = NULL; +clearacl(isc_mem_t *mctx, dns_acl_t **aclp) { + dns_acl_t *newacl = NULL; isc_result_t result; result = dns_acl_create(mctx, 0, &newacl); if (result != ISC_R_SUCCESS) { @@ -688,17 +668,15 @@ clearacl(isc_mem_t *mctx, dns_acl_t **aclp) } static bool -listenon_is_ip6_any(ns_listenelt_t *elt) -{ +listenon_is_ip6_any(ns_listenelt_t *elt) { REQUIRE(elt && elt->acl); return (dns_acl_isany(elt->acl)); } static isc_result_t -setup_locals(ns_interfacemgr_t *mgr, isc_interface_t *interface) -{ - isc_result_t result; - unsigned int prefixlen; +setup_locals(ns_interfacemgr_t *mgr, isc_interface_t *interface) { + isc_result_t result; + unsigned int prefixlen; isc_netaddr_t *netaddr; netaddr = &interface->address; @@ -747,8 +725,7 @@ setup_locals(ns_interfacemgr_t *mgr, isc_interface_t *interface) static void setup_listenon(ns_interfacemgr_t *mgr, isc_interface_t *interface, - in_port_t port) -{ + in_port_t port) { isc_sockaddr_t *addr; isc_sockaddr_t *old; @@ -758,7 +735,8 @@ setup_listenon(ns_interfacemgr_t *mgr, isc_interface_t *interface, LOCK(&mgr->lock); for (old = ISC_LIST_HEAD(mgr->listenon); old != NULL; - old = ISC_LIST_NEXT(old, link)) { + old = ISC_LIST_NEXT(old, link)) + { if (isc_sockaddr_equal(addr, old)) { break; } @@ -773,8 +751,7 @@ setup_listenon(ns_interfacemgr_t *mgr, isc_interface_t *interface, } static void -clearlistenon(ns_interfacemgr_t *mgr) -{ +clearlistenon(ns_interfacemgr_t *mgr) { isc_sockaddr_t *old; LOCK(&mgr->lock); @@ -788,24 +765,23 @@ clearlistenon(ns_interfacemgr_t *mgr) } static isc_result_t -do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, bool verbose) -{ +do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, bool verbose) { isc_interfaceiter_t *iter = NULL; - bool scan_ipv4 = false; - bool scan_ipv6 = false; - bool adjusting = false; - bool ipv6only = true; - bool ipv6pktinfo = true; - isc_result_t result; - isc_netaddr_t zero_address, zero_address6; - ns_listenelt_t * le; - isc_sockaddr_t listen_addr; - ns_interface_t * ifp; - bool log_explicit = false; - bool dolistenon; - char sabuf[ISC_SOCKADDR_FORMATSIZE]; - bool tried_listening; - bool all_addresses_in_use; + bool scan_ipv4 = false; + bool scan_ipv6 = false; + bool adjusting = false; + bool ipv6only = true; + bool ipv6pktinfo = true; + isc_result_t result; + isc_netaddr_t zero_address, zero_address6; + ns_listenelt_t *le; + isc_sockaddr_t listen_addr; + ns_interface_t *ifp; + bool log_explicit = false; + bool dolistenon; + char sabuf[ISC_SOCKADDR_FORMATSIZE]; + bool tried_listening; + bool all_addresses_in_use; if (ext_listen != NULL) { adjusting = true; @@ -847,7 +823,8 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, bool verbose) } if (scan_ipv6 == true && ipv6only && ipv6pktinfo) { for (le = ISC_LIST_HEAD(mgr->listenon6->elts); le != NULL; - le = ISC_LIST_NEXT(le, link)) { + le = ISC_LIST_NEXT(le, link)) + { struct in6_addr in6a; if (!listenon_is_ip6_any(le)) { @@ -916,10 +893,11 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, bool verbose) tried_listening = false; all_addresses_in_use = true; for (result = isc_interfaceiter_first(iter); result == ISC_R_SUCCESS; - result = isc_interfaceiter_next(iter)) { - isc_interface_t interface; + result = isc_interfaceiter_next(iter)) + { + isc_interface_t interface; ns_listenlist_t *ll; - unsigned int family; + unsigned int family; result = isc_interfaceiter_current(iter, &interface); if (result != ISC_R_SUCCESS) { @@ -960,7 +938,8 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, bool verbose) */ if (((mgr->sctx->options & NS_SERVER_FIXEDLOCAL) != 0) && - !isc_netaddr_isloopback(&interface.address)) { + !isc_netaddr_isloopback(&interface.address)) + { goto listenon; } @@ -975,9 +954,9 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, bool verbose) dolistenon = true; for (le = ISC_LIST_HEAD(ll->elts); le != NULL; le = ISC_LIST_NEXT(le, link)) { - int match; - bool ipv6_wildcard = false; - isc_netaddr_t listen_netaddr; + int match; + bool ipv6_wildcard = false; + isc_netaddr_t listen_netaddr; isc_sockaddr_t listen_sockaddr; /* @@ -1034,7 +1013,8 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, bool verbose) match = 0; for (ele = ISC_LIST_HEAD(ext_listen->elts); ele != NULL; - ele = ISC_LIST_NEXT(ele, link)) { + ele = ISC_LIST_NEXT(ele, link)) + { (void)dns_acl_match(&listen_netaddr, NULL, ele->acl, NULL, &match, NULL); @@ -1069,8 +1049,8 @@ do_scan(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, bool verbose) } else { bool addr_in_use = false; - if (adjusting == false && - ipv6_wildcard == true) { + if (adjusting == false && ipv6_wildcard == true) + { continue; } @@ -1150,10 +1130,9 @@ cleanup_iter: static isc_result_t ns_interfacemgr_scan0(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, - bool verbose) -{ + bool verbose) { isc_result_t result; - bool purge = true; + bool purge = true; REQUIRE(NS_INTERFACEMGR_VALID(mgr)); @@ -1186,18 +1165,16 @@ ns_interfacemgr_scan0(ns_interfacemgr_t *mgr, ns_listenlist_t *ext_listen, } bool -ns_interfacemgr_islistening(ns_interfacemgr_t *mgr) -{ +ns_interfacemgr_islistening(ns_interfacemgr_t *mgr) { REQUIRE(NS_INTERFACEMGR_VALID(mgr)); return (ISC_LIST_EMPTY(mgr->interfaces) ? false : true); } isc_result_t -ns_interfacemgr_scan(ns_interfacemgr_t *mgr, bool verbose) -{ +ns_interfacemgr_scan(ns_interfacemgr_t *mgr, bool verbose) { isc_result_t result; - bool unlock = false; + bool unlock = false; /* * Check for success because we may already be task-exclusive @@ -1220,14 +1197,12 @@ ns_interfacemgr_scan(ns_interfacemgr_t *mgr, bool verbose) isc_result_t ns_interfacemgr_adjust(ns_interfacemgr_t *mgr, ns_listenlist_t *list, - bool verbose) -{ + bool verbose) { return (ns_interfacemgr_scan0(mgr, list, verbose)); } void -ns_interfacemgr_setlistenon4(ns_interfacemgr_t *mgr, ns_listenlist_t *value) -{ +ns_interfacemgr_setlistenon4(ns_interfacemgr_t *mgr, ns_listenlist_t *value) { REQUIRE(NS_INTERFACEMGR_VALID(mgr)); LOCK(&mgr->lock); @@ -1237,8 +1212,7 @@ ns_interfacemgr_setlistenon4(ns_interfacemgr_t *mgr, ns_listenlist_t *value) } void -ns_interfacemgr_setlistenon6(ns_interfacemgr_t *mgr, ns_listenlist_t *value) -{ +ns_interfacemgr_setlistenon6(ns_interfacemgr_t *mgr, ns_listenlist_t *value) { REQUIRE(NS_INTERFACEMGR_VALID(mgr)); LOCK(&mgr->lock); @@ -1248,8 +1222,7 @@ ns_interfacemgr_setlistenon6(ns_interfacemgr_t *mgr, ns_listenlist_t *value) } void -ns_interfacemgr_dumprecursing(FILE *f, ns_interfacemgr_t *mgr) -{ +ns_interfacemgr_dumprecursing(FILE *f, ns_interfacemgr_t *mgr) { ns_interface_t *interface; REQUIRE(NS_INTERFACEMGR_VALID(mgr)); @@ -1266,10 +1239,10 @@ ns_interfacemgr_dumprecursing(FILE *f, ns_interfacemgr_t *mgr) } bool -ns_interfacemgr_listeningon(ns_interfacemgr_t *mgr, const isc_sockaddr_t *addr) -{ +ns_interfacemgr_listeningon(ns_interfacemgr_t *mgr, + const isc_sockaddr_t *addr) { isc_sockaddr_t *old; - bool result = false; + bool result = false; REQUIRE(NS_INTERFACEMGR_VALID(mgr)); /* @@ -1281,7 +1254,8 @@ ns_interfacemgr_listeningon(ns_interfacemgr_t *mgr, const isc_sockaddr_t *addr) } LOCK(&mgr->lock); for (old = ISC_LIST_HEAD(mgr->listenon); old != NULL; - old = ISC_LIST_NEXT(old, link)) { + old = ISC_LIST_NEXT(old, link)) + { if (isc_sockaddr_equal(old, addr)) { result = true; break; @@ -1293,8 +1267,7 @@ ns_interfacemgr_listeningon(ns_interfacemgr_t *mgr, const isc_sockaddr_t *addr) } ns_interface_t * -ns__interfacemgr_getif(ns_interfacemgr_t *mgr) -{ +ns__interfacemgr_getif(ns_interfacemgr_t *mgr) { ns_interface_t *head; REQUIRE(NS_INTERFACEMGR_VALID(mgr)); LOCK(&mgr->lock); @@ -1304,8 +1277,7 @@ ns__interfacemgr_getif(ns_interfacemgr_t *mgr) } ns_interface_t * -ns__interfacemgr_nextif(ns_interface_t *ifp) -{ +ns__interfacemgr_nextif(ns_interface_t *ifp) { ns_interface_t *next; LOCK(&ifp->lock); next = ISC_LIST_NEXT(ifp, link); diff --git a/lib/ns/lib.c b/lib/ns/lib.c index 63d7158839..6d9d7c177c 100644 --- a/lib/ns/lib.c +++ b/lib/ns/lib.c @@ -34,14 +34,13 @@ LIBNS_EXTERNAL_DATA unsigned int ns_pps = 0U; *** Private ***/ -static isc_once_t init_once = ISC_ONCE_INIT; -static isc_mem_t * ns_g_mctx = NULL; -static bool initialize_done = false; +static isc_once_t init_once = ISC_ONCE_INIT; +static isc_mem_t *ns_g_mctx = NULL; +static bool initialize_done = false; static isc_refcount_t references; static void -initialize(void) -{ +initialize(void) { REQUIRE(initialize_done == false); isc_mem_create(&ns_g_mctx); @@ -52,8 +51,7 @@ initialize(void) } isc_result_t -ns_lib_init(void) -{ +ns_lib_init(void) { isc_result_t result; /* @@ -76,8 +74,7 @@ ns_lib_init(void) } void -ns_lib_shutdown(void) -{ +ns_lib_shutdown(void) { if (isc_refcount_decrement(&references) == 1) { isc_refcount_destroy(&references); if (ns_g_mctx != NULL) { diff --git a/lib/ns/listenlist.c b/lib/ns/listenlist.c index 3e11f925d3..6c70295093 100644 --- a/lib/ns/listenlist.c +++ b/lib/ns/listenlist.c @@ -20,13 +20,11 @@ #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, - dns_acl_t *acl, ns_listenelt_t **target) -{ + dns_acl_t *acl, ns_listenelt_t **target) { ns_listenelt_t *elt = NULL; REQUIRE(target != NULL && *target == NULL); elt = isc_mem_get(mctx, sizeof(*elt)); @@ -40,8 +38,7 @@ ns_listenelt_create(isc_mem_t *mctx, in_port_t port, isc_dscp_t dscp, } void -ns_listenelt_destroy(ns_listenelt_t *elt) -{ +ns_listenelt_destroy(ns_listenelt_t *elt) { if (elt->acl != NULL) { dns_acl_detach(&elt->acl); } @@ -49,8 +46,7 @@ ns_listenelt_destroy(ns_listenelt_t *elt) } isc_result_t -ns_listenlist_create(isc_mem_t *mctx, ns_listenlist_t **target) -{ +ns_listenlist_create(isc_mem_t *mctx, ns_listenlist_t **target) { ns_listenlist_t *list = NULL; REQUIRE(target != NULL && *target == NULL); list = isc_mem_get(mctx, sizeof(*list)); @@ -62,8 +58,7 @@ ns_listenlist_create(isc_mem_t *mctx, ns_listenlist_t **target) } static void -destroy(ns_listenlist_t *list) -{ +destroy(ns_listenlist_t *list) { ns_listenelt_t *elt, *next; for (elt = ISC_LIST_HEAD(list->elts); elt != NULL; elt = next) { next = ISC_LIST_NEXT(elt, link); @@ -73,16 +68,14 @@ destroy(ns_listenlist_t *list) } void -ns_listenlist_attach(ns_listenlist_t *source, ns_listenlist_t **target) -{ +ns_listenlist_attach(ns_listenlist_t *source, ns_listenlist_t **target) { INSIST(source->refcount > 0); source->refcount++; *target = source; } void -ns_listenlist_detach(ns_listenlist_t **listp) -{ +ns_listenlist_detach(ns_listenlist_t **listp) { ns_listenlist_t *list = *listp; *listp = NULL; INSIST(list->refcount > 0); @@ -94,11 +87,10 @@ ns_listenlist_detach(ns_listenlist_t **listp) isc_result_t ns_listenlist_default(isc_mem_t *mctx, in_port_t port, isc_dscp_t dscp, - bool enabled, ns_listenlist_t **target) -{ - isc_result_t result; - dns_acl_t * acl = NULL; - ns_listenelt_t * elt = NULL; + bool enabled, ns_listenlist_t **target) { + isc_result_t result; + dns_acl_t *acl = NULL; + ns_listenelt_t *elt = NULL; ns_listenlist_t *list = NULL; REQUIRE(target != NULL && *target == NULL); diff --git a/lib/ns/log.c b/lib/ns/log.c index 882a159ea3..b77e514b32 100644 --- a/lib/ns/log.c +++ b/lib/ns/log.c @@ -49,8 +49,7 @@ LIBNS_EXTERNAL_DATA isc_logmodule_t ns_modules[] = { LIBNS_EXTERNAL_DATA isc_log_t *ns_lctx = NULL; void -ns_log_init(isc_log_t *lctx) -{ +ns_log_init(isc_log_t *lctx) { REQUIRE(lctx != NULL); isc_log_registercategories(lctx, ns_categories); @@ -58,7 +57,6 @@ ns_log_init(isc_log_t *lctx) } void -ns_log_setcontext(isc_log_t *lctx) -{ +ns_log_setcontext(isc_log_t *lctx) { ns_lctx = lctx; } diff --git a/lib/ns/notify.c b/lib/ns/notify.c index e6df2e991a..3dafc8cdbf 100644 --- a/lib/ns/notify.c +++ b/lib/ns/notify.c @@ -30,8 +30,7 @@ */ static void -notify_log(ns_client_t *client, int level, const char *fmt, ...) -{ +notify_log(ns_client_t *client, int level, const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -41,11 +40,10 @@ notify_log(ns_client_t *client, int level, const char *fmt, ...) } static void -respond(ns_client_t *client, isc_result_t result) -{ - dns_rcode_t rcode; +respond(ns_client_t *client, isc_result_t result) { + dns_rcode_t rcode; dns_message_t *message; - isc_result_t msg_result; + isc_result_t msg_result; message = client->message; rcode = dns_result_torcode(result); @@ -71,14 +69,13 @@ respond(ns_client_t *client, isc_result_t result) } void -ns_notify_start(ns_client_t *client) -{ - dns_message_t * request = client->message; - isc_result_t result; - dns_name_t * zonename; +ns_notify_start(ns_client_t *client) { + dns_message_t *request = client->message; + isc_result_t result; + dns_name_t *zonename; dns_rdataset_t *zone_rdataset; - dns_zone_t * zone = NULL; - char namebuf[DNS_NAME_FORMATSIZE]; + dns_zone_t *zone = NULL; + char namebuf[DNS_NAME_FORMATSIZE]; char tsigbuf[DNS_NAME_FORMATSIZE * 2 + sizeof(": TSIG '' ()")]; dns_tsigkey_t *tsigkey; @@ -149,14 +146,15 @@ ns_notify_start(ns_client_t *client) if ((zonetype == dns_zone_master) || (zonetype == dns_zone_slave) || (zonetype == dns_zone_mirror) || - (zonetype == dns_zone_stub)) { + (zonetype == dns_zone_stub)) + { isc_sockaddr_t *from = ns_client_getsockaddr(client); isc_sockaddr_t *to = ns_client_getdestaddr(client); notify_log(client, ISC_LOG_INFO, "received notify for zone '%s'%s", namebuf, tsigbuf); - result = - dns_zone_notifyreceive(zone, from, to, request); + result = dns_zone_notifyreceive(zone, from, to, + request); goto done; } } diff --git a/lib/ns/query.c b/lib/ns/query.c index ce7ed42e46..8e783556ce 100644 --- a/lib/ns/query.c +++ b/lib/ns/query.c @@ -140,8 +140,7 @@ #ifdef WANT_QUERYTRACE static inline void -client_trace(ns_client_t *client, int level, const char *message) -{ +client_trace(ns_client_t *client, int level, const char *message) { if (client != NULL && client->query.qname != NULL) { if (isc_log_wouldlog(ns_lctx, level)) { char qbuf[DNS_NAME_FORMATSIZE]; @@ -166,16 +165,16 @@ client_trace(ns_client_t *client, int level, const char *message) message); } } -#define CTRACE(l, m) client_trace(client, l, m) +#define CTRACE(l, m) client_trace(client, l, m) #define CCTRACE(l, m) client_trace(qctx->client, l, m) #else /* ifdef WANT_QUERYTRACE */ -#define CTRACE(l, m) ((void)m) +#define CTRACE(l, m) ((void)m) #define CCTRACE(l, m) ((void)m) #endif /* WANT_QUERYTRACE */ -#define DNS_GETDB_NOEXACT 0x01U -#define DNS_GETDB_NOLOG 0x02U -#define DNS_GETDB_PARTIAL 0x04U +#define DNS_GETDB_NOEXACT 0x01U +#define DNS_GETDB_NOLOG 0x02U +#define DNS_GETDB_PARTIAL 0x04U #define DNS_GETDB_IGNOREACL 0x08U #define PENDINGOK(x) (((x)&DNS_DBFIND_PENDINGOK) != 0) @@ -200,9 +199,8 @@ 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, @@ -210,18 +208,16 @@ 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); /* @@ -229,10 +225,9 @@ log_noexistnodata(void *val, int level, const char *fmt, ...) * set, return the default hooktable. */ static inline ns_hooktable_t * -get_hooktab(query_ctx_t *qctx) -{ - if (qctx == NULL || qctx->view == NULL || - qctx->view->hooktable == NULL) { +get_hooktab(query_ctx_t *qctx) { + if (qctx == NULL || qctx->view == NULL || qctx->view->hooktable == NULL) + { return (ns__hook_table); } @@ -249,27 +244,27 @@ get_hooktab(query_ctx_t *qctx) * is a macro instead of an inline function; it needs to be able to use * 'goto cleanup' regardless of the return value.) */ -#define CALL_HOOK(_id, _qctx) \ - do { \ - isc_result_t _res; \ - ns_hooktable_t *_tab = get_hooktab(_qctx); \ - ns_hook_t * _hook; \ - _hook = ISC_LIST_HEAD((*_tab)[_id]); \ - while (_hook != NULL) { \ - ns_hook_action_t _func = _hook->action; \ - void * _data = _hook->action_data; \ - INSIST(_func != NULL); \ - switch (_func(_qctx, _data, &_res)) { \ - case NS_HOOK_CONTINUE: \ - _hook = ISC_LIST_NEXT(_hook, link); \ - break; \ - case NS_HOOK_RETURN: \ - result = _res; \ - goto cleanup; \ - default: \ - INSIST(0); \ - } \ - } \ +#define CALL_HOOK(_id, _qctx) \ + do { \ + isc_result_t _res; \ + ns_hooktable_t *_tab = get_hooktab(_qctx); \ + ns_hook_t *_hook; \ + _hook = ISC_LIST_HEAD((*_tab)[_id]); \ + while (_hook != NULL) { \ + ns_hook_action_t _func = _hook->action; \ + void *_data = _hook->action_data; \ + INSIST(_func != NULL); \ + switch (_func(_qctx, _data, &_res)) { \ + case NS_HOOK_CONTINUE: \ + _hook = ISC_LIST_NEXT(_hook, link); \ + break; \ + case NS_HOOK_RETURN: \ + result = _res; \ + goto cleanup; \ + default: \ + INSIST(0); \ + } \ + } \ } while (false) /* @@ -281,19 +276,19 @@ get_hooktab(query_ctx_t *qctx) * (This could be implemented as an inline void function, but is left as a * macro for symmetry with CALL_HOOK above.) */ -#define CALL_HOOK_NORETURN(_id, _qctx) \ - do { \ - isc_result_t _res; \ - ns_hooktable_t *_tab = get_hooktab(_qctx); \ - ns_hook_t * _hook; \ - _hook = ISC_LIST_HEAD((*_tab)[_id]); \ - while (_hook != NULL) { \ - ns_hook_action_t _func = _hook->action; \ - void * _data = _hook->action_data; \ - INSIST(_func != NULL); \ - _func(_qctx, _data, &_res); \ - _hook = ISC_LIST_NEXT(_hook, link); \ - } \ +#define CALL_HOOK_NORETURN(_id, _qctx) \ + do { \ + isc_result_t _res; \ + ns_hooktable_t *_tab = get_hooktab(_qctx); \ + ns_hook_t *_hook; \ + _hook = ISC_LIST_HEAD((*_tab)[_id]); \ + while (_hook != NULL) { \ + ns_hook_action_t _func = _hook->action; \ + void *_data = _hook->action_data; \ + INSIST(_func != NULL); \ + _func(_qctx, _data, &_res); \ + _hook = ISC_LIST_NEXT(_hook, link); \ + } \ } while (false) /* @@ -363,134 +358,97 @@ 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. */ static inline void -inc_stats(ns_client_t *client, isc_statscounter_t counter) -{ - dns_zone_t * zone = client->query.authzone; +inc_stats(ns_client_t *client, isc_statscounter_t counter) { + dns_zone_t *zone = client->query.authzone; dns_rdatatype_t qtype; dns_rdataset_t *rdataset; - isc_stats_t * zonestats; - dns_stats_t * querystats = NULL; + isc_stats_t *zonestats; + dns_stats_t *querystats = NULL; ns_stats_increment(client->sctx->nsstats, counter); @@ -523,8 +481,7 @@ inc_stats(ns_client_t *client, isc_statscounter_t counter) } static void -query_send(ns_client_t *client) -{ +query_send(ns_client_t *client) { isc_statscounter_t counter; if ((client->message->flags & DNS_MESSAGEFLAG_AA) == 0) { @@ -558,8 +515,7 @@ query_send(ns_client_t *client) } static void -query_error(ns_client_t *client, isc_result_t result, int line) -{ +query_error(ns_client_t *client, isc_result_t result, int line) { int loglevel = ISC_LOG_DEBUG(3); switch (dns_result_torcode(result)) { @@ -586,8 +542,7 @@ query_error(ns_client_t *client, isc_result_t result, int line) } static void -query_next(ns_client_t *client, isc_result_t result) -{ +query_next(ns_client_t *client, isc_result_t result) { if (result == DNS_R_DUPLICATE) { inc_stats(client, ns_statscounter_duplicate); } else if (result == DNS_R_DROP) { @@ -600,13 +555,13 @@ query_next(ns_client_t *client, isc_result_t result) } static inline void -query_freefreeversions(ns_client_t *client, bool everything) -{ +query_freefreeversions(ns_client_t *client, bool everything) { ns_dbversion_t *dbversion, *dbversion_next; - unsigned int i; + unsigned int i; for (dbversion = ISC_LIST_HEAD(client->query.freeversions), i = 0; - dbversion != NULL; dbversion = dbversion_next, i++) { + dbversion != NULL; dbversion = dbversion_next, i++) + { dbversion_next = ISC_LIST_NEXT(dbversion, link); /* * If we're not freeing everything, we keep the first three @@ -622,8 +577,7 @@ query_freefreeversions(ns_client_t *client, bool everything) } void -ns_query_cancel(ns_client_t *client) -{ +ns_query_cancel(ns_client_t *client) { REQUIRE(NS_CLIENT_VALID(client)); LOCK(&client->query.fetchlock); @@ -636,9 +590,8 @@ ns_query_cancel(ns_client_t *client) } static inline void -query_reset(ns_client_t *client, bool everything) -{ - isc_buffer_t * dbuf, *dbuf_next; +query_reset(ns_client_t *client, bool everything) { + isc_buffer_t *dbuf, *dbuf_next; ns_dbversion_t *dbversion, *dbversion_next; CTRACE(ISC_LOG_DEBUG(3), "query_reset"); @@ -656,7 +609,8 @@ query_reset(ns_client_t *client, bool everything) * Cleanup any active versions. */ for (dbversion = ISC_LIST_HEAD(client->query.activeversions); - dbversion != NULL; dbversion = dbversion_next) { + dbversion != NULL; dbversion = dbversion_next) + { dbversion_next = ISC_LIST_NEXT(dbversion, link); dns_db_closeversion(dbversion->db, &dbversion->version, false); dns_db_detach(&dbversion->db); @@ -701,7 +655,8 @@ query_reset(ns_client_t *client, bool everything) query_freefreeversions(client, everything); for (dbuf = ISC_LIST_HEAD(client->query.namebufs); dbuf != NULL; - dbuf = dbuf_next) { + dbuf = dbuf_next) + { dbuf_next = ISC_LIST_NEXT(dbuf, link); if (dbuf_next != NULL || everything) { ISC_LIST_UNLINK(client->query.namebufs, dbuf, link); @@ -744,22 +699,19 @@ query_reset(ns_client_t *client, bool everything) } static void -query_cleanup(ns_client_t *client) -{ +query_cleanup(ns_client_t *client) { query_reset(client, false); } void -ns_query_free(ns_client_t *client) -{ +ns_query_free(ns_client_t *client) { REQUIRE(NS_CLIENT_VALID(client)); query_reset(client, true); } isc_result_t -ns_query_init(ns_client_t *client) -{ +ns_query_init(ns_client_t *client) { isc_result_t result; REQUIRE(NS_CLIENT_VALID(client)); @@ -831,8 +783,7 @@ ns_query_init(ns_client_t *client) */ static isc_result_t query_checkcacheaccess(ns_client_t *client, const dns_name_t *name, - dns_rdatatype_t qtype, unsigned int options) -{ + dns_rdatatype_t qtype, unsigned int options) { isc_result_t result; if ((client->query.attributes & NS_QUERYATTR_CACHEACLOKVALID) == 0) { @@ -856,8 +807,8 @@ query_checkcacheaccess(ns_client_t *client, const dns_name_t *name, * We were allowed by the "allow-query-cache" ACL. */ client->query.attributes |= NS_QUERYATTR_CACHEACLOK; - if (log && - isc_log_wouldlog(ns_lctx, ISC_LOG_DEBUG(3))) { + if (log && isc_log_wouldlog(ns_lctx, ISC_LOG_DEBUG(3))) + { ns_client_aclmsg("query (cache)", name, qtype, client->view->rdclass, msg, sizeof(msg)); @@ -896,10 +847,10 @@ query_checkcacheaccess(ns_client_t *client, const dns_name_t *name, static inline isc_result_t query_validatezonedb(ns_client_t *client, const dns_name_t *name, dns_rdatatype_t qtype, unsigned int options, - dns_zone_t *zone, dns_db_t *db, dns_dbversion_t **versionp) -{ - isc_result_t result; - dns_acl_t * queryacl, *queryonacl; + dns_zone_t *zone, dns_db_t *db, + dns_dbversion_t **versionp) { + isc_result_t result; + dns_acl_t *queryacl, *queryonacl; ns_dbversion_t *dbversion; REQUIRE(zone != NULL); @@ -921,7 +872,8 @@ query_validatezonedb(ns_client_t *client, const dns_name_t *name, */ if (client->query.rpz_st == NULL && !(WANTRECURSION(client) && RECURSIONOK(client)) && - client->query.authdbset && db != client->query.authdb) { + client->query.authdbset && db != client->query.authdb) + { return (DNS_R_REFUSED); } @@ -965,8 +917,8 @@ query_validatezonedb(ns_client_t *client, const dns_name_t *name, queryacl = dns_zone_getqueryacl(zone); if (queryacl == NULL) { queryacl = client->view->queryacl; - if ((client->query.attributes & NS_QUERYATTR_QUERYOKVALID) != - 0) { + if ((client->query.attributes & NS_QUERYATTR_QUERYOKVALID) != 0) + { /* * We've evaluated the view's queryacl already. If * NS_QUERYATTR_QUERYOK is set, then the client is @@ -1032,8 +984,8 @@ query_validatezonedb(ns_client_t *client, const dns_name_t *name, result = ns_client_checkaclsilent(client, &client->destaddr, queryonacl, true); - if ((options & DNS_GETDB_NOLOG) == 0 && - result != ISC_R_SUCCESS) { + if ((options & DNS_GETDB_NOLOG) == 0 && result != ISC_R_SUCCESS) + { ns_client_log(client, DNS_LOGCATEGORY_SECURITY, NS_LOGMODULE_QUERY, ISC_LOG_INFO, "query-on denied"); @@ -1058,13 +1010,12 @@ approved: static inline isc_result_t query_getzonedb(ns_client_t *client, const dns_name_t *name, dns_rdatatype_t qtype, unsigned int options, dns_zone_t **zonep, - dns_db_t **dbp, dns_dbversion_t **versionp) -{ + dns_db_t **dbp, dns_dbversion_t **versionp) { isc_result_t result; unsigned int ztoptions; - dns_zone_t * zone = NULL; - dns_db_t * db = NULL; - bool partial = false; + dns_zone_t *zone = NULL; + dns_db_t *db = NULL; + bool partial = false; REQUIRE(zonep != NULL && *zonep == NULL); REQUIRE(dbp != NULL && *dbp == NULL); @@ -1121,17 +1072,16 @@ fail: static void rpz_log_rewrite(ns_client_t *client, bool disabled, dns_rpz_policy_t policy, dns_rpz_type_t type, dns_zone_t *p_zone, dns_name_t *p_name, - dns_name_t *cname, dns_rpz_num_t rpz_num) -{ - char cname_buf[DNS_NAME_FORMATSIZE] = { 0 }; - char p_name_buf[DNS_NAME_FORMATSIZE]; - char qname_buf[DNS_NAME_FORMATSIZE]; - char classbuf[DNS_RDATACLASS_FORMATSIZE]; - char typebuf[DNS_RDATATYPE_FORMATSIZE]; - const char * s1 = cname_buf, *s2 = cname_buf; + dns_name_t *cname, dns_rpz_num_t rpz_num) { + char cname_buf[DNS_NAME_FORMATSIZE] = { 0 }; + char p_name_buf[DNS_NAME_FORMATSIZE]; + char qname_buf[DNS_NAME_FORMATSIZE]; + char classbuf[DNS_RDATACLASS_FORMATSIZE]; + char typebuf[DNS_RDATATYPE_FORMATSIZE]; + const char *s1 = cname_buf, *s2 = cname_buf; dns_rdataset_t *rdataset; - dns_rpz_st_t * st; - isc_stats_t * zonestats; + dns_rpz_st_t *st; + isc_stats_t *zonestats; /* * Count enabled rewrites in the global counter. @@ -1186,10 +1136,9 @@ rpz_log_rewrite(ns_client_t *client, bool disabled, dns_rpz_policy_t policy, static void rpz_log_fail_helper(ns_client_t *client, int level, dns_name_t *p_name, dns_rpz_type_t rpz_type1, dns_rpz_type_t rpz_type2, - const char *str, isc_result_t result) -{ - char qnamebuf[DNS_NAME_FORMATSIZE]; - char p_namebuf[DNS_NAME_FORMATSIZE]; + const char *str, isc_result_t result) { + char qnamebuf[DNS_NAME_FORMATSIZE]; + char p_namebuf[DNS_NAME_FORMATSIZE]; const char *failed, *via, *slash, *str_blank; const char *rpztypestr1; const char *rpztypestr2; @@ -1236,8 +1185,7 @@ rpz_log_fail_helper(ns_client_t *client, int level, dns_name_t *p_name, static void rpz_log_fail(ns_client_t *client, int level, dns_name_t *p_name, - dns_rpz_type_t rpz_type, const char *str, isc_result_t result) -{ + dns_rpz_type_t rpz_type, const char *str, isc_result_t result) { rpz_log_fail_helper(client, level, p_name, rpz_type, DNS_RPZ_TYPE_BAD, str, result); } @@ -1247,12 +1195,11 @@ rpz_log_fail(ns_client_t *client, int level, dns_name_t *p_name, */ static isc_result_t rpz_getdb(ns_client_t *client, dns_name_t *p_name, dns_rpz_type_t rpz_type, - dns_zone_t **zonep, dns_db_t **dbp, dns_dbversion_t **versionp) -{ - char qnamebuf[DNS_NAME_FORMATSIZE]; - char p_namebuf[DNS_NAME_FORMATSIZE]; + dns_zone_t **zonep, dns_db_t **dbp, dns_dbversion_t **versionp) { + char qnamebuf[DNS_NAME_FORMATSIZE]; + char p_namebuf[DNS_NAME_FORMATSIZE]; dns_dbversion_t *rpz_version = NULL; - isc_result_t result; + isc_result_t result; CTRACE(ISC_LOG_DEBUG(3), "rpz_getdb"); @@ -1290,10 +1237,9 @@ rpz_getdb(ns_client_t *client, dns_name_t *p_name, dns_rpz_type_t rpz_type, */ static inline isc_result_t query_getcachedb(ns_client_t *client, const dns_name_t *name, - dns_rdatatype_t qtype, dns_db_t **dbp, unsigned int options) -{ + dns_rdatatype_t qtype, dns_db_t **dbp, unsigned int options) { isc_result_t result; - dns_db_t * db = NULL; + dns_db_t *db = NULL; REQUIRE(dbp != NULL && *dbp == NULL); @@ -1320,13 +1266,12 @@ query_getcachedb(ns_client_t *client, const dns_name_t *name, static inline isc_result_t query_getdb(ns_client_t *client, dns_name_t *name, dns_rdatatype_t qtype, unsigned int options, dns_zone_t **zonep, dns_db_t **dbp, - dns_dbversion_t **versionp, bool *is_zonep) -{ + dns_dbversion_t **versionp, bool *is_zonep) { isc_result_t result; isc_result_t tresult; unsigned int namelabels; unsigned int zonelabels; - dns_zone_t * zone = NULL; + dns_zone_t *zone = NULL; REQUIRE(zonep != NULL && *zonep == NULL); @@ -1348,10 +1293,11 @@ query_getdb(ns_client_t *client, dns_name_t *name, dns_rdatatype_t qtype, * Only try if DLZ drivers are loaded for this view */ if (ISC_UNLIKELY(zonelabels < namelabels && - !ISC_LIST_EMPTY(client->view->dlz_searched))) { + !ISC_LIST_EMPTY(client->view->dlz_searched))) + { dns_clientinfomethods_t cm; - dns_clientinfo_t ci; - dns_db_t * tdbp; + dns_clientinfo_t ci; + dns_db_t *tdbp; dns_clientinfomethods_init(&cm, ns_client_sourceip); dns_clientinfo_init(&ci, client, NULL); @@ -1421,11 +1367,10 @@ query_getdb(ns_client_t *client, dns_name_t *name, dns_rdatatype_t qtype, static inline bool query_isduplicate(ns_client_t *client, dns_name_t *name, dns_rdatatype_t type, - dns_name_t **mnamep) -{ + dns_name_t **mnamep) { dns_section_t section; - dns_name_t * mname = NULL; - isc_result_t result; + dns_name_t *mname = NULL; + isc_result_t result; CTRACE(ISC_LOG_DEBUG(3), "query_isduplicate"); @@ -1489,12 +1434,11 @@ query_additionalauthfind(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, dns_rdatatype_t type, ns_client_t *client, dns_dbnode_t **nodep, dns_name_t *fname, dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *sigrdataset) { dns_clientinfomethods_t cm; - dns_dbnode_t * node = NULL; - dns_clientinfo_t ci; - isc_result_t result; + dns_dbnode_t *node = NULL; + dns_clientinfo_t ci; + isc_result_t result; dns_clientinfomethods_init(&cm, ns_client_sourceip); dns_clientinfo_init(&ci, client, NULL); @@ -1528,7 +1472,8 @@ query_additionalauthfind(dns_db_t *db, dns_dbversion_t *version, * Do not return signatures if the zone is not fully signed. */ if (sigrdataset != NULL && !dns_db_issecure(db) && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { dns_rdataset_disassociate(sigrdataset); } @@ -1561,15 +1506,14 @@ static isc_result_t query_additionalauth(query_ctx_t *qctx, const dns_name_t *name, dns_rdatatype_t type, dns_db_t **dbp, dns_dbnode_t **nodep, dns_name_t *fname, dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset) -{ - ns_client_t * client = qctx->client; - ns_dbversion_t * dbversion = NULL; + dns_rdataset_t *sigrdataset) { + ns_client_t *client = qctx->client; + ns_dbversion_t *dbversion = NULL; dns_dbversion_t *version = NULL; - dns_dbnode_t * node = NULL; - dns_zone_t * zone = NULL; - dns_db_t * db = NULL; - isc_result_t result; + dns_dbnode_t *node = NULL; + dns_zone_t *zone = NULL; + dns_db_t *db = NULL; + isc_result_t result; /* * First, look within the same zone database for authoritative @@ -1593,7 +1537,8 @@ query_additionalauth(query_ctx_t *qctx, const dns_name_t *name, &node, fname, rdataset, sigrdataset); if (result != ISC_R_SUCCESS && qctx->view->minimalresponses == dns_minimal_no && - RECURSIONOK(client)) { + RECURSIONOK(client)) + { /* * If we aren't doing response minimization and recursion is * allowed, we can try and see if any other zone matches. @@ -1628,24 +1573,23 @@ query_additionalauth(query_ctx_t *qctx, const dns_name_t *name, } static isc_result_t -query_additional_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) -{ - query_ctx_t * qctx = arg; - ns_client_t * client = qctx->client; - isc_result_t result, eresult = ISC_R_SUCCESS; - dns_dbnode_t * node = NULL; - dns_db_t * db = NULL; - dns_name_t * fname = NULL, *mname = NULL; - dns_rdataset_t * rdataset = NULL, *sigrdataset = NULL; - dns_rdataset_t * trdataset = NULL; - isc_buffer_t * dbuf = NULL; - isc_buffer_t b; - ns_dbversion_t * dbversion = NULL; - dns_dbversion_t * version = NULL; - bool added_something = false, need_addname = false; - dns_rdatatype_t type; - dns_clientinfomethods_t cm; - dns_clientinfo_t ci; +query_additional_cb(void *arg, const dns_name_t *name, dns_rdatatype_t qtype) { + query_ctx_t *qctx = arg; + ns_client_t *client = qctx->client; + isc_result_t result, eresult = ISC_R_SUCCESS; + dns_dbnode_t *node = NULL; + dns_db_t *db = NULL; + dns_name_t *fname = NULL, *mname = NULL; + dns_rdataset_t *rdataset = NULL, *sigrdataset = NULL; + dns_rdataset_t *trdataset = NULL; + isc_buffer_t *dbuf = NULL; + isc_buffer_t b; + ns_dbversion_t *dbversion = NULL; + dns_dbversion_t *version = NULL; + bool added_something = false, need_addname = false; + dns_rdatatype_t type; + dns_clientinfomethods_t cm; + dns_clientinfo_t ci; dns_rdatasetadditional_t additionaltype = dns_rdatasetadditional_fromauth; @@ -1817,7 +1761,8 @@ found: */ mname = NULL; if (dns_rdataset_isassociated(rdataset) && - !query_isduplicate(client, fname, type, &mname)) { + !query_isduplicate(client, fname, type, &mname)) + { if (mname != NULL) { INSIST(mname != fname); ns_client_releasename(client, &fname); @@ -1888,7 +1833,8 @@ found: if (additionaltype == dns_rdatasetadditional_fromcache && (DNS_TRUST_PENDING(rdataset->trust) || - DNS_TRUST_GLUE(rdataset->trust))) { + DNS_TRUST_GLUE(rdataset->trust))) + { /* validate() may change rdataset->trust */ invalid = !validate(client, db, fname, rdataset, sigrdataset); @@ -1900,8 +1846,8 @@ found: dns_rdataset_disassociate(sigrdataset); } } else if (!query_isduplicate(client, fname, - dns_rdatatype_a, - &mname)) { + dns_rdatatype_a, &mname)) + { if (mname != fname) { if (mname != NULL) { ns_client_releasename(client, @@ -1936,8 +1882,8 @@ found: } } aaaa_lookup: - if (query_isduplicate(client, fname, dns_rdatatype_aaaa, - NULL)) { + if (query_isduplicate(client, fname, dns_rdatatype_aaaa, NULL)) + { goto addname; } result = dns_db_findrdataset(db, node, version, @@ -1958,7 +1904,8 @@ found: if (additionaltype == dns_rdatasetadditional_fromcache && (DNS_TRUST_PENDING(rdataset->trust) || - DNS_TRUST_GLUE(rdataset->trust))) { + DNS_TRUST_GLUE(rdataset->trust))) + { /* validate() may change rdataset->trust */ invalid = !validate(client, db, fname, rdataset, sigrdataset); @@ -2060,8 +2007,7 @@ cleanup: * Add 'rdataset' to 'name'. */ static inline void -query_addtoname(dns_name_t *name, dns_rdataset_t *rdataset) -{ +query_addtoname(dns_name_t *name, dns_rdataset_t *rdataset) { ISC_LIST_APPEND(name->list, rdataset, link); } @@ -2069,8 +2015,7 @@ query_addtoname(dns_name_t *name, dns_rdataset_t *rdataset) * Set the ordering for 'rdataset'. */ static void -query_setorder(query_ctx_t *qctx, dns_name_t *name, dns_rdataset_t *rdataset) -{ +query_setorder(query_ctx_t *qctx, dns_name_t *name, dns_rdataset_t *rdataset) { ns_client_t *client = qctx->client; dns_order_t *order = client->view->order; @@ -2089,8 +2034,7 @@ query_setorder(query_ctx_t *qctx, dns_name_t *name, dns_rdataset_t *rdataset) * Handle glue and fetch any other needed additional data for 'rdataset'. */ static void -query_additional(query_ctx_t *qctx, dns_rdataset_t *rdataset) -{ +query_additional(query_ctx_t *qctx, dns_rdataset_t *rdataset) { ns_client_t *client = qctx->client; isc_result_t result; @@ -2106,7 +2050,8 @@ query_additional(query_ctx_t *qctx, dns_rdataset_t *rdataset) if (qctx->view->use_glue_cache && (rdataset->type == dns_rdatatype_ns) && (client->query.gluedb != NULL) && - dns_db_iszone(client->query.gluedb)) { + dns_db_iszone(client->query.gluedb)) + { ns_dbversion_t *dbversion; dbversion = ns_client_findversion(client, client->query.gluedb); @@ -2133,11 +2078,10 @@ regular: static void query_addrrset(query_ctx_t *qctx, dns_name_t **namep, dns_rdataset_t **rdatasetp, dns_rdataset_t **sigrdatasetp, - isc_buffer_t *dbuf, dns_section_t section) -{ - isc_result_t result; - ns_client_t * client = qctx->client; - dns_name_t * name = *namep, *mname = NULL; + isc_buffer_t *dbuf, dns_section_t section) { + isc_result_t result; + ns_client_t *client = qctx->client; + dns_name_t *name = *namep, *mname = NULL; dns_rdataset_t *rdataset = *rdatasetp, *mrdataset = NULL; dns_rdataset_t *sigrdataset = NULL; @@ -2193,8 +2137,8 @@ query_addrrset(query_ctx_t *qctx, dns_name_t **namep, } if (rdataset->trust != dns_trust_secure && - (section == DNS_SECTION_ANSWER || - section == DNS_SECTION_AUTHORITY)) { + (section == DNS_SECTION_ANSWER || section == DNS_SECTION_AUTHORITY)) + { client->query.attributes &= ~NS_QUERYATTR_SECURE; } @@ -2230,13 +2174,12 @@ query_addrrset(query_ctx_t *qctx, dns_name_t **namep, static void mark_secure(ns_client_t *client, dns_db_t *db, dns_name_t *name, dns_rdata_rrsig_t *rrsig, dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset) -{ - isc_result_t result; - dns_dbnode_t * node = NULL; + dns_rdataset_t *sigrdataset) { + isc_result_t result; + dns_dbnode_t *node = NULL; dns_clientinfomethods_t cm; - dns_clientinfo_t ci; - isc_stdtime_t now; + dns_clientinfo_t ci; + isc_stdtime_t now; rdataset->trust = dns_trust_secure; sigrdataset->trust = dns_trust_secure; @@ -2270,13 +2213,12 @@ mark_secure(ns_client_t *client, dns_db_t *db, dns_name_t *name, */ static bool get_key(ns_client_t *client, dns_db_t *db, dns_rdata_rrsig_t *rrsig, - dns_rdataset_t *keyrdataset, dst_key_t **keyp) -{ - isc_result_t result; - dns_dbnode_t * node = NULL; - bool secure = false; + dns_rdataset_t *keyrdataset, dst_key_t **keyp) { + isc_result_t result; + dns_dbnode_t *node = NULL; + bool secure = false; dns_clientinfomethods_t cm; - dns_clientinfo_t ci; + dns_clientinfo_t ci; dns_clientinfomethods_init(&cm, ns_client_sourceip); dns_clientinfo_init(&ci, client, NULL); @@ -2305,9 +2247,9 @@ get_key(ns_client_t *client, dns_db_t *db, dns_rdata_rrsig_t *rrsig, result = dns_rdataset_next(keyrdataset); } - for (; result == ISC_R_SUCCESS; - result = dns_rdataset_next(keyrdataset)) { - dns_rdata_t rdata = DNS_RDATA_INIT; + for (; result == ISC_R_SUCCESS; result = dns_rdataset_next(keyrdataset)) + { + dns_rdata_t rdata = DNS_RDATA_INIT; isc_buffer_t b; dns_rdataset_current(keyrdataset, &rdata); @@ -2320,7 +2262,8 @@ get_key(ns_client_t *client, dns_db_t *db, dns_rdata_rrsig_t *rrsig, } if (rrsig->algorithm == (dns_secalg_t)dst_key_alg(*keyp) && rrsig->keyid == (dns_keytag_t)dst_key_id(*keyp) && - dst_key_iszonekey(*keyp)) { + dst_key_iszonekey(*keyp)) + { secure = true; break; } @@ -2331,11 +2274,10 @@ get_key(ns_client_t *client, dns_db_t *db, dns_rdata_rrsig_t *rrsig, static bool verify(dst_key_t *key, dns_name_t *name, dns_rdataset_t *rdataset, - dns_rdata_t *rdata, ns_client_t *client) -{ - isc_result_t result; + dns_rdata_t *rdata, ns_client_t *client) { + isc_result_t result; dns_fixedname_t fixed; - bool ignore = false; + bool ignore = false; dns_fixedname_init(&fixed); @@ -2358,26 +2300,27 @@ again: */ static bool validate(ns_client_t *client, dns_db_t *db, dns_name_t *name, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ - isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { + isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_rrsig_t rrsig; - dst_key_t * key = NULL; - dns_rdataset_t keyrdataset; + dst_key_t *key = NULL; + dns_rdataset_t keyrdataset; if (sigrdataset == NULL || !dns_rdataset_isassociated(sigrdataset)) { return (false); } for (result = dns_rdataset_first(sigrdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(sigrdataset)) { + result = dns_rdataset_next(sigrdataset)) + { dns_rdata_reset(&rdata); dns_rdataset_current(sigrdataset, &rdata); result = dns_rdata_tostruct(&rdata, &rrsig, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); if (!dns_resolver_algorithm_supported(client->view->resolver, - name, rrsig.algorithm)) { + name, rrsig.algorithm)) + { continue; } if (!dns_name_issubdomain(name, &rrsig.signer)) { @@ -2405,8 +2348,7 @@ validate(ns_client_t *client, dns_db_t *db, dns_name_t *name, } static void -fixrdataset(ns_client_t *client, dns_rdataset_t **rdataset) -{ +fixrdataset(ns_client_t *client, dns_rdataset_t **rdataset) { if (*rdataset == NULL) { *rdataset = ns_client_newrdataset(client); } else if (dns_rdataset_isassociated(*rdataset)) { @@ -2416,8 +2358,7 @@ fixrdataset(ns_client_t *client, dns_rdataset_t **rdataset) static void fixfname(ns_client_t *client, dns_name_t **fname, isc_buffer_t **dbuf, - isc_buffer_t *nbuf) -{ + isc_buffer_t *nbuf) { if (*fname == NULL) { *dbuf = ns_client_getnamebuf(client); if (*dbuf == NULL) { @@ -2429,8 +2370,7 @@ fixfname(ns_client_t *client, dns_name_t **fname, isc_buffer_t **dbuf, static void free_devent(ns_client_t *client, isc_event_t **eventp, - dns_fetchevent_t **deventp) -{ + dns_fetchevent_t **deventp) { dns_fetchevent_t *devent = *deventp; REQUIRE((void *)(*eventp) == (void *)(*deventp)); @@ -2464,10 +2404,9 @@ free_devent(ns_client_t *client, isc_event_t **eventp, } static void -prefetch_done(isc_task_t *task, isc_event_t *event) -{ +prefetch_done(isc_task_t *task, isc_event_t *event) { dns_fetchevent_t *devent = (dns_fetchevent_t *)event; - ns_client_t * client; + ns_client_t *client; UNUSED(task); @@ -2490,19 +2429,20 @@ prefetch_done(isc_task_t *task, isc_event_t *event) } static void -query_prefetch(ns_client_t *client, dns_name_t *qname, dns_rdataset_t *rdataset) -{ - isc_result_t result; +query_prefetch(ns_client_t *client, dns_name_t *qname, + dns_rdataset_t *rdataset) { + isc_result_t result; isc_sockaddr_t *peeraddr; dns_rdataset_t *tmprdataset; - unsigned int options; + unsigned int options; CTRACE(ISC_LOG_DEBUG(3), "query_prefetch"); if (client->query.prefetch != NULL || client->view->prefetch_trigger == 0U || rdataset->ttl > client->view->prefetch_trigger || - (rdataset->attributes & DNS_RDATASETATTR_PREFETCH) == 0) { + (rdataset->attributes & DNS_RDATASETATTR_PREFETCH) == 0) + { return; } @@ -2543,8 +2483,7 @@ query_prefetch(ns_client_t *client, dns_name_t *qname, dns_rdataset_t *rdataset) static inline void rpz_clean(dns_zone_t **zonep, dns_db_t **dbp, dns_dbnode_t **nodep, - dns_rdataset_t **rdatasetp) -{ + dns_rdataset_t **rdatasetp) { if (nodep != NULL && *nodep != NULL) { REQUIRE(dbp != NULL && *dbp != NULL); dns_db_detachnode(*dbp, nodep); @@ -2556,21 +2495,20 @@ rpz_clean(dns_zone_t **zonep, dns_db_t **dbp, dns_dbnode_t **nodep, dns_zone_detach(zonep); } if (rdatasetp != NULL && *rdatasetp != NULL && - dns_rdataset_isassociated(*rdatasetp)) { + dns_rdataset_isassociated(*rdatasetp)) + { dns_rdataset_disassociate(*rdatasetp); } } static inline void -rpz_match_clear(dns_rpz_st_t *st) -{ +rpz_match_clear(dns_rpz_st_t *st) { rpz_clean(&st->m.zone, &st->m.db, &st->m.node, &st->m.rdataset); st->m.version = NULL; } static inline isc_result_t -rpz_ready(ns_client_t *client, dns_rdataset_t **rdatasetp) -{ +rpz_ready(ns_client_t *client, dns_rdataset_t **rdatasetp) { REQUIRE(rdatasetp != NULL); CTRACE(ISC_LOG_DEBUG(3), "rpz_ready"); @@ -2589,8 +2527,7 @@ rpz_ready(ns_client_t *client, dns_rdataset_t **rdatasetp) } static void -rpz_st_clear(ns_client_t *client) -{ +rpz_st_clear(ns_client_t *client) { dns_rpz_st_t *st = client->query.rpz_st; CTRACE(ISC_LOG_DEBUG(3), "rpz_st_clear"); @@ -2625,9 +2562,8 @@ rpz_st_clear(ns_client_t *client) static dns_rpz_zbits_t rpz_get_zbits(ns_client_t *client, dns_rdatatype_t ip_type, - dns_rpz_type_t rpz_type) -{ - dns_rpz_st_t * st; + dns_rpz_type_t rpz_type) { + dns_rpz_st_t *st; dns_rpz_zbits_t zbits = 0; REQUIRE(client != NULL); @@ -2640,7 +2576,8 @@ rpz_get_zbits(ns_client_t *client, dns_rdatatype_t ip_type, if (st->rpsdb == NULL || librpz->have_trig(dns_dnsrps_type2trig(rpz_type), ip_type == dns_rdatatype_aaaa, - ((rpsdb_t *)st->rpsdb)->rsp)) { + ((rpsdb_t *)st->rpsdb)->rsp)) + { return (DNS_RPZ_ALL_ZBITS); } return (0); @@ -2707,12 +2644,11 @@ rpz_get_zbits(ns_client_t *client, dns_rdatatype_t ip_type, } static void -query_rpzfetch(ns_client_t *client, dns_name_t *qname, dns_rdatatype_t type) -{ - isc_result_t result; +query_rpzfetch(ns_client_t *client, dns_name_t *qname, dns_rdatatype_t type) { + isc_result_t result; isc_sockaddr_t *peeraddr; dns_rdataset_t *tmprdataset; - unsigned int options; + unsigned int options; CTRACE(ISC_LOG_DEBUG(3), "query_rpzfetch"); @@ -2760,16 +2696,15 @@ static isc_result_t rpz_rrset_find(ns_client_t *client, dns_name_t *name, dns_rdatatype_t type, dns_rpz_type_t rpz_type, dns_db_t **dbp, dns_dbversion_t *version, dns_rdataset_t **rdatasetp, - bool resuming) -{ - dns_rpz_st_t * st; - bool is_zone; - dns_dbnode_t * node; - dns_fixedname_t fixed; - dns_name_t * found; - isc_result_t result; + bool resuming) { + dns_rpz_st_t *st; + bool is_zone; + dns_dbnode_t *node; + dns_fixedname_t fixed; + dns_name_t *found; + isc_result_t result; dns_clientinfomethods_t cm; - dns_clientinfo_t ci; + dns_clientinfo_t ci; CTRACE(ISC_LOG_DEBUG(3), "rpz_rrset_find"); @@ -2874,12 +2809,11 @@ rpz_rrset_find(ns_client_t *client, dns_name_t *name, dns_rdatatype_t type, */ static isc_result_t rpz_get_p_name(ns_client_t *client, dns_name_t *p_name, dns_rpz_zone_t *rpz, - dns_rpz_type_t rpz_type, dns_name_t *trig_name) -{ + dns_rpz_type_t rpz_type, dns_name_t *trig_name) { dns_offsets_t prefix_offsets; - dns_name_t prefix, *suffix; - unsigned int first, labels; - isc_result_t result; + dns_name_t prefix, *suffix; + unsigned int first, labels; + isc_result_t result; CTRACE(ISC_LOG_DEBUG(3), "rpz_get_p_name"); @@ -2961,14 +2895,13 @@ rpz_find_p(ns_client_t *client, dns_name_t *self_name, dns_rdatatype_t qtype, dns_name_t *p_name, dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, dns_zone_t **zonep, dns_db_t **dbp, dns_dbversion_t **versionp, dns_dbnode_t **nodep, dns_rdataset_t **rdatasetp, - dns_rpz_policy_t *policyp) -{ - dns_fixedname_t foundf; - dns_name_t * found; - isc_result_t result; + dns_rpz_policy_t *policyp) { + dns_fixedname_t foundf; + dns_name_t *found; + isc_result_t result; dns_clientinfomethods_t cm; - dns_clientinfo_t ci; - bool found_a = false; + dns_clientinfo_t ci; + bool found_a = false; REQUIRE(nodep != NULL); @@ -3017,7 +2950,8 @@ rpz_find_p(ns_client_t *client, dns_name_t *self_name, dns_rdatatype_t qtype, !ISC_LIST_EMPTY(client->view->dns64)) { for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(rdsiter)) { + result = dns_rdatasetiter_next(rdsiter)) + { dns_rdatasetiter_current(rdsiter, *rdatasetp); if ((*rdatasetp)->type == dns_rdatatype_a) { found_a = true; @@ -3027,7 +2961,8 @@ rpz_find_p(ns_client_t *client, dns_name_t *self_name, dns_rdatatype_t qtype, } for (result = dns_rdatasetiter_first(rdsiter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(rdsiter)) { + result = dns_rdatasetiter_next(rdsiter)) + { dns_rdatasetiter_current(rdsiter, *rdatasetp); if ((*rdatasetp)->type == dns_rdatatype_cname || (*rdatasetp)->type == qtype) { @@ -3075,7 +3010,8 @@ rpz_find_p(ns_client_t *client, dns_name_t *self_name, dns_rdatatype_t qtype, if ((*policyp == DNS_RPZ_POLICY_RECORD || *policyp == DNS_RPZ_POLICY_WILDCNAME) && qtype != dns_rdatatype_cname && - qtype != dns_rdatatype_any) { + qtype != dns_rdatatype_any) + { return (DNS_R_CNAME); } } @@ -3114,8 +3050,7 @@ rpz_save_p(dns_rpz_st_t *st, dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, dns_rpz_policy_t policy, dns_name_t *p_name, dns_rpz_prefix_t prefix, isc_result_t result, dns_zone_t **zonep, dns_db_t **dbp, dns_dbnode_t **nodep, dns_rdataset_t **rdatasetp, - dns_dbversion_t *version) -{ + dns_dbversion_t *version) { dns_rdataset_t *trdataset = NULL; rpz_match_clear(st); @@ -3151,9 +3086,8 @@ rpz_save_p(dns_rpz_st_t *st, dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type, */ static int dnsrps_ck(librpz_emsg_t *emsg, ns_client_t *client, rpsdb_t *rpsdb, - bool recursed) -{ - isc_region_t region; + bool recursed) { + isc_region_t region; librpz_domain_buf_t pname_buf; if (!librpz->rsp_result(emsg, &rpsdb->result, recursed, rpsdb->rsp)) { @@ -3166,7 +3100,8 @@ dnsrps_ck(librpz_emsg_t *emsg, ns_client_t *client, rpsdb_t *rpsdb, */ if (rpsdb->result.policy == LIBRPZ_POLICY_UNDEFINED || rpsdb->result.hit_id != rpsdb->hit_id || - rpsdb->result.policy != LIBRPZ_POLICY_DISABLED) { + rpsdb->result.policy != LIBRPZ_POLICY_DISABLED) + { if (!librpz->rsp_pop_discard(emsg, rpsdb->rsp)) { return (-1); } @@ -3189,7 +3124,8 @@ dnsrps_ck(librpz_emsg_t *emsg, ns_client_t *client, rpsdb_t *rpsdb, rpsdb->result.cznum); if (!librpz->rsp_forget_zone(emsg, rpsdb->result.cznum, rpsdb->rsp) || - !librpz->rsp_pop(emsg, &rpsdb->result, rpsdb->rsp)) { + !librpz->rsp_pop(emsg, &rpsdb->result, rpsdb->rsp)) + { return (-1); } return (1); @@ -3200,19 +3136,19 @@ dnsrps_ck(librpz_emsg_t *emsg, ns_client_t *client, rpsdb_t *rpsdb, */ static bool dnsrps_set_p(librpz_emsg_t *emsg, ns_client_t *client, dns_rpz_st_t *st, - dns_rdatatype_t qtype, dns_rdataset_t **p_rdatasetp, bool recursed) -{ - rpsdb_t * rpsdb; + dns_rdatatype_t qtype, dns_rdataset_t **p_rdatasetp, + bool recursed) { + rpsdb_t *rpsdb; librpz_domain_buf_t pname_buf; - isc_region_t region; - dns_zone_t * p_zone; - dns_db_t * p_db; - dns_dbnode_t * p_node; - dns_rpz_policy_t policy; - dns_fixedname_t foundf; - dns_name_t * found; - dns_rdatatype_t foundtype, searchtype; - isc_result_t result; + isc_region_t region; + dns_zone_t *p_zone; + dns_db_t *p_db; + dns_dbnode_t *p_node; + dns_rpz_policy_t policy; + dns_fixedname_t foundf; + dns_name_t *found; + dns_rdatatype_t foundtype, searchtype; + isc_result_t result; rpsdb = (rpsdb_t *)st->rpsdb; @@ -3228,7 +3164,8 @@ dnsrps_set_p(librpz_emsg_t *emsg, ns_client_t *client, dns_rpz_st_t *st, * Give the fake or shim DNSRPS database its new origin. */ if (!librpz->rsp_soa(emsg, NULL, NULL, &rpsdb->origin_buf, - &rpsdb->result, rpsdb->rsp)) { + &rpsdb->result, rpsdb->rsp)) + { return (false); } region.base = rpsdb->origin_buf.d; @@ -3265,7 +3202,8 @@ dnsrps_set_p(librpz_emsg_t *emsg, ns_client_t *client, dns_rpz_st_t *st, */ if (!librpz->rsp_rr(emsg, &foundtype, NULL, NULL, NULL, &rpsdb->result, rpsdb->qname->ndata, - rpsdb->qname->length, rpsdb->rsp)) { + rpsdb->qname->length, rpsdb->rsp)) + { return (false); } if (foundtype == dns_rdatatype_cname) { @@ -3305,15 +3243,14 @@ dnsrps_set_p(librpz_emsg_t *emsg, ns_client_t *client, dns_rpz_st_t *st, static isc_result_t dnsrps_rewrite_ip(ns_client_t *client, const isc_netaddr_t *netaddr, - dns_rpz_type_t rpz_type, dns_rdataset_t **p_rdatasetp) -{ + dns_rpz_type_t rpz_type, dns_rdataset_t **p_rdatasetp) { dns_rpz_st_t *st; - rpsdb_t * rpsdb; + rpsdb_t *rpsdb; librpz_trig_t trig = LIBRPZ_TRIG_CLIENT_IP; - bool recursed = false; - int res; + bool recursed = false; + int res; librpz_emsg_t emsg; - isc_result_t result; + isc_result_t result; st = client->query.rpz_st; rpsdb = (rpsdb_t *)st->rpsdb; @@ -3350,7 +3287,8 @@ dnsrps_rewrite_ip(ns_client_t *client, const isc_netaddr_t *netaddr, : (const void *)&netaddr->type.in6, netaddr->family, trig, ++rpsdb->hit_id, recursed, rpsdb->rsp) || - (res = dnsrps_ck(&emsg, client, rpsdb, recursed)) < 0) { + (res = dnsrps_ck(&emsg, client, rpsdb, recursed)) < 0) + { rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL, NULL, rpz_type, emsg.c, DNS_R_SERVFAIL); st->m.policy = DNS_RPZ_POLICY_ERROR; @@ -3362,15 +3300,14 @@ dnsrps_rewrite_ip(ns_client_t *client, const isc_netaddr_t *netaddr, static isc_result_t dnsrps_rewrite_name(ns_client_t *client, dns_name_t *trig_name, bool recursed, - dns_rpz_type_t rpz_type, dns_rdataset_t **p_rdatasetp) -{ + dns_rpz_type_t rpz_type, dns_rdataset_t **p_rdatasetp) { dns_rpz_st_t *st; - rpsdb_t * rpsdb; + rpsdb_t *rpsdb; librpz_trig_t trig = LIBRPZ_TRIG_CLIENT_IP; - isc_region_t r; - int res; + isc_region_t r; + int res; librpz_emsg_t emsg; - isc_result_t result; + isc_result_t result; st = client->query.rpz_st; rpsdb = (rpsdb_t *)st->rpsdb; @@ -3398,7 +3335,8 @@ dnsrps_rewrite_name(ns_client_t *client, dns_name_t *trig_name, bool recursed, if (!librpz->rsp_push(&emsg, rpsdb->rsp) || !librpz->ck_domain(&emsg, r.base, r.length, trig, ++rpsdb->hit_id, recursed, rpsdb->rsp) || - (res = dnsrps_ck(&emsg, client, rpsdb, recursed)) < 0) { + (res = dnsrps_ck(&emsg, client, rpsdb, recursed)) < 0) + { rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL, NULL, rpz_type, emsg.c, DNS_R_SERVFAIL); st->m.policy = DNS_RPZ_POLICY_ERROR; @@ -3415,21 +3353,20 @@ dnsrps_rewrite_name(ns_client_t *client, dns_name_t *trig_name, bool recursed, static isc_result_t rpz_rewrite_ip(ns_client_t *client, const isc_netaddr_t *netaddr, dns_rdatatype_t qtype, dns_rpz_type_t rpz_type, - dns_rpz_zbits_t zbits, dns_rdataset_t **p_rdatasetp) -{ + dns_rpz_zbits_t zbits, dns_rdataset_t **p_rdatasetp) { dns_rpz_zones_t *rpzs; - dns_rpz_st_t * st; - dns_rpz_zone_t * rpz; + dns_rpz_st_t *st; + dns_rpz_zone_t *rpz; dns_rpz_prefix_t prefix; - dns_rpz_num_t rpz_num; - dns_fixedname_t ip_namef, p_namef; - dns_name_t * ip_name, *p_name; - dns_zone_t * p_zone; - dns_db_t * p_db; + dns_rpz_num_t rpz_num; + dns_fixedname_t ip_namef, p_namef; + dns_name_t *ip_name, *p_name; + dns_zone_t *p_zone; + dns_db_t *p_db; dns_dbversion_t *p_version; - dns_dbnode_t * p_node; + dns_dbnode_t *p_node; dns_rpz_policy_t policy; - isc_result_t result; + isc_result_t result; CTRACE(ISC_LOG_DEBUG(3), "rpz_rewrite_ip"); @@ -3468,7 +3405,8 @@ rpz_rewrite_ip(ns_client_t *client, const isc_netaddr_t *netaddr, break; } if (st->m.rpz->num == rpz->num && - (st->m.type < rpz_type || st->m.prefix > prefix)) { + (st->m.type < rpz_type || st->m.prefix > prefix)) + { break; } } @@ -3523,7 +3461,8 @@ rpz_rewrite_ip(ns_client_t *client, const isc_netaddr_t *netaddr, if (st->m.policy != DNS_RPZ_POLICY_MISS && rpz->num == st->m.rpz->num && (st->m.type == rpz_type && st->m.prefix == prefix && - 0 > dns_name_rdatacompare(st->p_name, p_name))) { + 0 > dns_name_rdatacompare(st->p_name, p_name))) + { break; } @@ -3563,13 +3502,12 @@ rpz_rewrite_ip_rrset(ns_client_t *client, dns_name_t *name, dns_rdatatype_t qtype, dns_rpz_type_t rpz_type, dns_rdatatype_t ip_type, dns_db_t **ip_dbp, dns_dbversion_t *ip_version, dns_rdataset_t **ip_rdatasetp, - dns_rdataset_t **p_rdatasetp, bool resuming) -{ + dns_rdataset_t **p_rdatasetp, bool resuming) { dns_rpz_zbits_t zbits; - isc_netaddr_t netaddr; - struct in_addr ina; + isc_netaddr_t netaddr; + struct in_addr ina; struct in6_addr in6a; - isc_result_t result; + isc_result_t result; CTRACE(ISC_LOG_DEBUG(3), "rpz_rewrite_ip_rrset"); @@ -3621,8 +3559,8 @@ rpz_rewrite_ip_rrset(ns_client_t *client, dns_name_t *name, * Check all of the IP addresses in the rdataset. */ for (result = dns_rdataset_first(*ip_rdatasetp); - result == ISC_R_SUCCESS; - result = dns_rdataset_next(*ip_rdatasetp)) { + result == ISC_R_SUCCESS; result = dns_rdataset_next(*ip_rdatasetp)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(*ip_rdatasetp, &rdata); switch (rdata.type) { @@ -3657,13 +3595,12 @@ rpz_rewrite_ip_rrset(ns_client_t *client, dns_name_t *name, static isc_result_t rpz_rewrite_ip_rrsets(ns_client_t *client, dns_name_t *name, dns_rdatatype_t qtype, dns_rpz_type_t rpz_type, - dns_rdataset_t **ip_rdatasetp, bool resuming) -{ - dns_rpz_st_t * st; + dns_rdataset_t **ip_rdatasetp, bool resuming) { + dns_rpz_st_t *st; dns_dbversion_t *ip_version; - dns_db_t * ip_db; - dns_rdataset_t * p_rdataset; - isc_result_t result; + dns_db_t *ip_db; + dns_rdataset_t *p_rdataset; + isc_result_t result; CTRACE(ISC_LOG_DEBUG(3), "rpz_rewrite_ip_rrsets"); @@ -3673,7 +3610,8 @@ rpz_rewrite_ip_rrsets(ns_client_t *client, dns_name_t *name, p_rdataset = NULL; if ((st->state & DNS_RPZ_DONE_IPv4) == 0 && (qtype == dns_rdatatype_a || qtype == dns_rdatatype_any || - rpz_type == DNS_RPZ_TYPE_NSIP)) { + rpz_type == DNS_RPZ_TYPE_NSIP)) + { /* * Rewrite based on an IPv4 address that will appear * in the ANSWER section or if we are checking IP addresses. @@ -3689,7 +3627,8 @@ rpz_rewrite_ip_rrsets(ns_client_t *client, dns_name_t *name, } if (result == ISC_R_SUCCESS && (qtype == dns_rdatatype_aaaa || qtype == dns_rdatatype_any || - rpz_type == DNS_RPZ_TYPE_NSIP)) { + rpz_type == DNS_RPZ_TYPE_NSIP)) + { /* * Rewrite based on IPv6 addresses that will appear * in the ANSWER section or if we are checking IP addresses. @@ -3717,21 +3656,20 @@ static isc_result_t rpz_rewrite_name(ns_client_t *client, dns_name_t *trig_name, dns_rdatatype_t qtype, dns_rpz_type_t rpz_type, dns_rpz_zbits_t allowed_zbits, bool recursed, - dns_rdataset_t **rdatasetp) -{ + dns_rdataset_t **rdatasetp) { dns_rpz_zones_t *rpzs; - dns_rpz_zone_t * rpz; - dns_rpz_st_t * st; - dns_fixedname_t p_namef; - dns_name_t * p_name; - dns_rpz_zbits_t zbits; - dns_rpz_num_t rpz_num; - dns_zone_t * p_zone; - dns_db_t * p_db; + dns_rpz_zone_t *rpz; + dns_rpz_st_t *st; + dns_fixedname_t p_namef; + dns_name_t *p_name; + dns_rpz_zbits_t zbits; + dns_rpz_num_t rpz_num; + dns_zone_t *p_zone; + dns_db_t *p_db; dns_dbversion_t *p_version; - dns_dbnode_t * p_node; + dns_dbnode_t *p_node; dns_rpz_policy_t policy; - isc_result_t result; + isc_result_t result; #ifndef USE_DNSRPS UNUSED(recursed); @@ -3794,8 +3732,8 @@ rpz_rewrite_name(ns_client_t *client, dns_name_t *trig_name, if (st->m.rpz->num < rpz->num) { break; } - if (st->m.rpz->num == rpz->num && - st->m.type < rpz_type) { + if (st->m.rpz->num == rpz->num && st->m.type < rpz_type) + { break; } } @@ -3840,7 +3778,8 @@ rpz_rewrite_name(ns_client_t *client, dns_name_t *trig_name, rpz->num == st->m.rpz->num && (st->m.type < rpz_type || (st->m.type == rpz_type && - 0 >= dns_name_compare(p_name, st->p_name)))) { + 0 >= dns_name_compare(p_name, st->p_name)))) + { continue; } @@ -3873,8 +3812,7 @@ rpz_rewrite_name(ns_client_t *client, dns_name_t *trig_name, static void rpz_rewrite_ns_skip(ns_client_t *client, dns_name_t *nsname, - isc_result_t result, int level, const char *str) -{ + isc_result_t result, int level, const char *str) { dns_rpz_st_t *st; CTRACE(ISC_LOG_DEBUG(3), "rpz_rewrite_ns_skip"); @@ -3907,19 +3845,18 @@ typedef enum { */ static isc_result_t rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult, - bool resuming, dns_rdataset_t *ordataset, dns_rdataset_t *osigset) -{ + bool resuming, dns_rdataset_t *ordataset, dns_rdataset_t *osigset) { dns_rpz_zones_t *rpzs; - dns_rpz_st_t * st; - dns_rdataset_t * rdataset; - dns_fixedname_t nsnamef; - dns_name_t * nsname; - qresult_type_t qresult_type; - dns_rpz_zbits_t zbits; - isc_result_t result = ISC_R_SUCCESS; - dns_rpz_have_t have; - dns_rpz_popt_t popt; - int rpz_ver; + dns_rpz_st_t *st; + dns_rdataset_t *rdataset; + dns_fixedname_t nsnamef; + dns_name_t *nsname; + qresult_type_t qresult_type; + dns_rpz_zbits_t zbits; + isc_result_t result = ISC_R_SUCCESS; + dns_rpz_have_t have; + dns_rpz_popt_t popt; + int rpz_ver; #ifdef USE_DNSRPS librpz_emsg_t emsg; #endif /* ifdef USE_DNSRPS */ @@ -3937,7 +3874,8 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult, RWLOCK(&rpzs->search_lock, isc_rwlocktype_read); if ((rpzs->p.num_zones == 0 && !rpzs->p.dnsrps_enabled) || (!RECURSIONOK(client) && rpzs->p.no_rd_ok == 0) || - !rpz_ck_dnssec(client, qresult, ordataset, osigset)) { + !rpz_ck_dnssec(client, qresult, ordataset, osigset)) + { RWUNLOCK(&rpzs->search_lock, isc_rwlocktype_read); return (DNS_R_DISALLOWED); } @@ -4040,8 +3978,9 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult, rdataset = NULL; if ((st->state & (DNS_RPZ_DONE_CLIENT_IP | DNS_RPZ_DONE_QNAME)) != - (DNS_RPZ_DONE_CLIENT_IP | DNS_RPZ_DONE_QNAME)) { - isc_netaddr_t netaddr; + (DNS_RPZ_DONE_CLIENT_IP | DNS_RPZ_DONE_QNAME)) + { + isc_netaddr_t netaddr; dns_rpz_zbits_t allowed; if (!st->popt.dnsrps_enabled && @@ -4097,8 +4036,8 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult, * Reset to the start of the NS names. */ st->r.label = dns_name_countlabels(client->query.qname); - st->state &= - ~(DNS_RPZ_DONE_QNAME_IP | DNS_RPZ_DONE_IPv4); + st->state &= ~(DNS_RPZ_DONE_QNAME_IP | + DNS_RPZ_DONE_IPv4); } /* @@ -4133,7 +4072,8 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult, */ if ((st->state & DNS_RPZ_DONE_QNAME_IP) == 0 && qresult_type == qresult_type_done && - rpz_get_zbits(client, qtype, DNS_RPZ_TYPE_IP) != 0) { + rpz_get_zbits(client, qtype, DNS_RPZ_TYPE_IP) != 0) + { result = rpz_rewrite_ip_rrsets(client, client->query.qname, qtype, DNS_RPZ_TYPE_IP, &rdataset, resuming); @@ -4154,7 +4094,8 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult, */ if (rpz_get_zbits(client, dns_rdatatype_any, DNS_RPZ_TYPE_NSDNAME) == 0 && - rpz_get_zbits(client, dns_rdatatype_any, DNS_RPZ_TYPE_NSIP) == 0) { + rpz_get_zbits(client, dns_rdatatype_any, DNS_RPZ_TYPE_NSIP) == 0) + { result = ISC_R_SUCCESS; goto cleanup; } @@ -4230,7 +4171,7 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult, */ do { dns_rdata_ns_t ns; - dns_rdata_t nsrdata = DNS_RDATA_INIT; + dns_rdata_t nsrdata = DNS_RDATA_INIT; dns_rdataset_current(st->r.ns_rdataset, &nsrdata); result = dns_rdata_tostruct(&nsrdata, &ns, NULL); @@ -4270,8 +4211,8 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult, if (result != ISC_R_SUCCESS) { goto cleanup; } - st->state &= - ~(DNS_RPZ_DONE_NSDNAME | DNS_RPZ_DONE_IPv4); + st->state &= ~(DNS_RPZ_DONE_NSDNAME | + DNS_RPZ_DONE_IPv4); result = dns_rdataset_next(st->r.ns_rdataset); } while (result == ISC_R_SUCCESS); dns_rdataset_disassociate(st->r.ns_rdataset); @@ -4280,7 +4221,8 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult, if (rpz_get_zbits(client, dns_rdatatype_any, DNS_RPZ_TYPE_NSDNAME) == 0 && rpz_get_zbits(client, dns_rdatatype_any, - DNS_RPZ_TYPE_NSIP) == 0) { + DNS_RPZ_TYPE_NSIP) == 0) + { break; } } @@ -4294,7 +4236,8 @@ cleanup: #ifdef USE_DNSRPS if (st->popt.dnsrps_enabled && st->m.policy != DNS_RPZ_POLICY_ERROR && !dnsrps_set_p(&emsg, client, st, qtype, &rdataset, - (qresult_type != qresult_type_recurse))) { + (qresult_type != qresult_type_recurse))) + { rpz_log_fail(client, DNS_RPZ_ERROR_LEVEL, NULL, DNS_RPZ_TYPE_BAD, emsg.c, DNS_R_SERVFAIL); st->m.policy = DNS_RPZ_POLICY_ERROR; @@ -4302,12 +4245,14 @@ cleanup: #endif /* ifdef USE_DNSRPS */ if (st->m.policy != DNS_RPZ_POLICY_MISS && st->m.policy != DNS_RPZ_POLICY_ERROR && - st->m.rpz->policy != DNS_RPZ_POLICY_GIVEN) { + st->m.rpz->policy != DNS_RPZ_POLICY_GIVEN) + { st->m.policy = st->m.rpz->policy; } if (st->m.policy == DNS_RPZ_POLICY_MISS || st->m.policy == DNS_RPZ_POLICY_PASSTHRU || - st->m.policy == DNS_RPZ_POLICY_ERROR) { + st->m.policy == DNS_RPZ_POLICY_ERROR) + { if (st->m.policy == DNS_RPZ_POLICY_PASSTHRU && result != DNS_R_DELEGATION) { rpz_log_rewrite(client, false, st->m.policy, st->m.type, @@ -4335,13 +4280,12 @@ cleanup: */ static bool rpz_ck_dnssec(ns_client_t *client, isc_result_t qresult, - dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { dns_fixedname_t fixed; - dns_name_t * found; - dns_rdataset_t trdataset; + dns_name_t *found; + dns_rdataset_t trdataset; dns_rdatatype_t type; - isc_result_t result; + isc_result_t result; CTRACE(ISC_LOG_DEBUG(3), "rpz_ck_dnssec"); @@ -4375,7 +4319,8 @@ rpz_ck_dnssec(ns_client_t *client, isc_result_t qresult, */ if (rdataset->type == dns_rdatatype_nsec || rdataset->type == dns_rdatatype_nsec3 || - rdataset->type == dns_rdatatype_rrsig) { + rdataset->type == dns_rdatatype_rrsig) + { return (false); } @@ -4388,12 +4333,14 @@ rpz_ck_dnssec(ns_client_t *client, isc_result_t qresult, found = dns_fixedname_initname(&fixed); dns_rdataset_init(&trdataset); for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { dns_ncache_current(rdataset, found, &trdataset); type = trdataset.type; dns_rdataset_disassociate(&trdataset); if (type == dns_rdatatype_nsec || type == dns_rdatatype_nsec3 || - type == dns_rdatatype_rrsig) { + type == dns_rdatatype_rrsig) + { return (false); } } @@ -4409,9 +4356,8 @@ rpz_ck_dnssec(ns_client_t *client, isc_result_t qresult, * ISC_R_NOTIMPLEMENTED The rdata is not a known address type. */ static isc_result_t -rdata_tonetaddr(const dns_rdata_t *rdata, isc_netaddr_t *netaddr) -{ - struct in_addr ina; +rdata_tonetaddr(const dns_rdata_t *rdata, isc_netaddr_t *netaddr) { + struct in_addr ina; struct in6_addr in6a; switch (rdata->type) { @@ -4483,19 +4429,18 @@ static unsigned char hostmaster_data[] = "\012hostmaster\014root-" static unsigned char prisoner_offsets[] = { 0, 9, 14, 18 }; static unsigned char hostmaster_offsets[] = { 0, 11, 24, 28 }; -static dns_name_t const prisoner = - DNS_NAME_INITABSOLUTE(prisoner_data, prisoner_offsets); -static dns_name_t const hostmaster = - DNS_NAME_INITABSOLUTE(hostmaster_data, hostmaster_offsets); +static dns_name_t const prisoner = DNS_NAME_INITABSOLUTE(prisoner_data, + prisoner_offsets); +static dns_name_t const hostmaster = DNS_NAME_INITABSOLUTE(hostmaster_data, + hostmaster_offsets); static void -warn_rfc1918(ns_client_t *client, dns_name_t *fname, dns_rdataset_t *rdataset) -{ - unsigned int i; - dns_rdata_t rdata = DNS_RDATA_INIT; +warn_rfc1918(ns_client_t *client, dns_name_t *fname, dns_rdataset_t *rdataset) { + unsigned int i; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_soa_t soa; - dns_rdataset_t found; - isc_result_t result; + dns_rdataset_t found; + isc_result_t result; for (i = 0; i < (sizeof(rfc1918names) / sizeof(*rfc1918names)); i++) { if (dns_name_issubdomain(fname, &rfc1918names[i])) { @@ -4513,7 +4458,8 @@ warn_rfc1918(ns_client_t *client, dns_name_t *fname, dns_rdataset_t *rdataset) result = dns_rdata_tostruct(&rdata, &soa, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); if (dns_name_equal(&soa.origin, &prisoner) && - dns_name_equal(&soa.contact, &hostmaster)) { + dns_name_equal(&soa.contact, &hostmaster)) + { char buf[DNS_NAME_FORMATSIZE]; dns_name_format(fname, buf, sizeof(buf)); ns_client_log(client, DNS_LOGCATEGORY_SECURITY, @@ -4533,22 +4479,21 @@ static void query_findclosestnsec3(dns_name_t *qname, dns_db_t *db, dns_dbversion_t *version, ns_client_t *client, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset, - dns_name_t *fname, bool exact, dns_name_t *found) -{ - unsigned char salt[256]; - size_t salt_length; - uint16_t iterations; - isc_result_t result; - unsigned int dboptions; - dns_fixedname_t fixed; - dns_hash_t hash; - dns_name_t name; - unsigned int skip = 0, labels; - dns_rdata_nsec3_t nsec3; - dns_rdata_t rdata = DNS_RDATA_INIT; - bool optout; + dns_name_t *fname, bool exact, dns_name_t *found) { + unsigned char salt[256]; + size_t salt_length; + uint16_t iterations; + isc_result_t result; + unsigned int dboptions; + dns_fixedname_t fixed; + dns_hash_t hash; + dns_name_t name; + unsigned int skip = 0, labels; + dns_rdata_nsec3_t nsec3; + dns_rdata_t rdata = DNS_RDATA_INIT; + bool optout; dns_clientinfomethods_t cm; - dns_clientinfo_t ci; + dns_clientinfo_t ci; salt_length = sizeof(salt); result = dns_db_getnsec3parameters(db, version, &hash, NULL, @@ -4634,14 +4579,13 @@ again: } static uint32_t -dns64_ttl(dns_db_t *db, dns_dbversion_t *version) -{ - dns_dbnode_t * node = NULL; +dns64_ttl(dns_db_t *db, dns_dbversion_t *version) { + dns_dbnode_t *node = NULL; dns_rdata_soa_t soa; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdataset_t rdataset; - isc_result_t result; - uint32_t ttl = UINT32_MAX; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdataset_t rdataset; + isc_result_t result; + uint32_t ttl = UINT32_MAX; dns_rdataset_init(&rdataset); @@ -4677,15 +4621,14 @@ cleanup: static bool dns64_aaaaok(ns_client_t *client, dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset) -{ + dns_rdataset_t *sigrdataset) { isc_netaddr_t netaddr; dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->manager->interface->mgr); dns_dns64_t *dns64 = ISC_LIST_HEAD(client->view->dns64); unsigned int flags = 0; unsigned int i, count; - bool * aaaaok; + bool *aaaaok; INSIST(client->query.dns64_aaaaok == NULL); INSIST(client->query.dns64_aaaaoklen == 0); @@ -4701,7 +4644,8 @@ dns64_aaaaok(ns_client_t *client, dns_rdataset_t *rdataset, } if (WANTDNSSEC(client) && sigrdataset != NULL && - dns_rdataset_isassociated(sigrdataset)) { + dns_rdataset_isassociated(sigrdataset)) + { flags |= DNS_DNS64_DNSSEC; } @@ -4710,7 +4654,8 @@ dns64_aaaaok(ns_client_t *client, dns_rdataset_t *rdataset, isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr); if (dns_dns64_aaaaok(dns64, &netaddr, client->signer, env, flags, - rdataset, aaaaok, count)) { + rdataset, aaaaok, count)) + { for (i = 0; i < count; i++) { if (aaaaok != NULL && !aaaaok[i]) { SAVE(client->query.dns64_aaaaok, aaaaok); @@ -4740,18 +4685,17 @@ dns64_aaaaok(ns_client_t *client, dns_rdataset_t *rdataset, static isc_result_t redirect(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, dns_dbnode_t **nodep, dns_db_t **dbp, dns_dbversion_t **versionp, - dns_rdatatype_t qtype) -{ - dns_db_t * db = NULL; - dns_dbnode_t * node = NULL; - dns_fixedname_t fixed; - dns_name_t * found; - dns_rdataset_t trdataset; - isc_result_t result; - dns_rdatatype_t type; + dns_rdatatype_t qtype) { + dns_db_t *db = NULL; + dns_dbnode_t *node = NULL; + dns_fixedname_t fixed; + dns_name_t *found; + dns_rdataset_t trdataset; + isc_result_t result; + dns_rdatatype_t type; dns_clientinfomethods_t cm; - dns_clientinfo_t ci; - ns_dbversion_t * dbversion; + dns_clientinfo_t ci; + ns_dbversion_t *dbversion; CTRACE(ISC_LOG_DEBUG(3), "redirect"); @@ -4765,8 +4709,8 @@ redirect(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, dns_clientinfomethods_init(&cm, ns_client_sourceip); dns_clientinfo_init(&ci, client, NULL); - if (WANTDNSSEC(client) && dns_db_iszone(*dbp) && - dns_db_issecure(*dbp)) { + if (WANTDNSSEC(client) && dns_db_iszone(*dbp) && dns_db_issecure(*dbp)) + { return (ISC_R_NOTFOUND); } @@ -4776,19 +4720,22 @@ redirect(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, } if (rdataset->trust == dns_trust_ultimate && (rdataset->type == dns_rdatatype_nsec || - rdataset->type == dns_rdatatype_nsec3)) { + rdataset->type == dns_rdatatype_nsec3)) + { return (ISC_R_NOTFOUND); } if ((rdataset->attributes & DNS_RDATASETATTR_NEGATIVE) != 0) { for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { dns_ncache_current(rdataset, found, &trdataset); type = trdataset.type; dns_rdataset_disassociate(&trdataset); if (type == dns_rdatatype_nsec || type == dns_rdatatype_nsec3 || - type == dns_rdatatype_rrsig) { + type == dns_rdatatype_rrsig) + { return (ISC_R_NOTFOUND); } } @@ -4858,8 +4805,8 @@ nxrrset: dns_db_detach(&db); *versionp = dbversion->version; - client->query.attributes |= - (NS_QUERYATTR_NOAUTHORITY | NS_QUERYATTR_NOADDITIONAL); + client->query.attributes |= (NS_QUERYATTR_NOAUTHORITY | + NS_QUERYATTR_NOADDITIONAL); return (result); } @@ -4867,23 +4814,22 @@ nxrrset: static isc_result_t redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, dns_dbnode_t **nodep, dns_db_t **dbp, dns_dbversion_t **versionp, - dns_rdatatype_t qtype, bool *is_zonep) -{ - dns_db_t * db = NULL; - dns_dbnode_t * node = NULL; - dns_fixedname_t fixed; - dns_fixedname_t fixedredirect; - dns_name_t * found, *redirectname; - dns_rdataset_t trdataset; - isc_result_t result; - dns_rdatatype_t type; + dns_rdatatype_t qtype, bool *is_zonep) { + dns_db_t *db = NULL; + dns_dbnode_t *node = NULL; + dns_fixedname_t fixed; + dns_fixedname_t fixedredirect; + dns_name_t *found, *redirectname; + dns_rdataset_t trdataset; + isc_result_t result; + dns_rdatatype_t type; dns_clientinfomethods_t cm; - dns_clientinfo_t ci; - dns_dbversion_t * version = NULL; - dns_zone_t * zone = NULL; - bool is_zone; - unsigned int labels; - unsigned int options; + dns_clientinfo_t ci; + dns_dbversion_t *version = NULL; + dns_zone_t *zone = NULL; + bool is_zone; + unsigned int labels; + unsigned int options; CTRACE(ISC_LOG_DEBUG(3), "redirect2"); @@ -4901,8 +4847,8 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, dns_clientinfomethods_init(&cm, ns_client_sourceip); dns_clientinfo_init(&ci, client, NULL); - if (WANTDNSSEC(client) && dns_db_iszone(*dbp) && - dns_db_issecure(*dbp)) { + if (WANTDNSSEC(client) && dns_db_iszone(*dbp) && dns_db_issecure(*dbp)) + { return (ISC_R_NOTFOUND); } @@ -4912,19 +4858,22 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset, } if (rdataset->trust == dns_trust_ultimate && (rdataset->type == dns_rdatatype_nsec || - rdataset->type == dns_rdatatype_nsec3)) { + rdataset->type == dns_rdatatype_nsec3)) + { return (ISC_R_NOTFOUND); } if ((rdataset->attributes & DNS_RDATASETATTR_NEGATIVE) != 0) { for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { dns_ncache_current(rdataset, found, &trdataset); type = trdataset.type; dns_rdataset_disassociate(&trdataset); if (type == dns_rdatatype_nsec || type == dns_rdatatype_nsec3 || - type == dns_rdatatype_rrsig) { + type == dns_rdatatype_rrsig) + { return (ISC_R_NOTFOUND); } } @@ -5042,8 +4991,8 @@ nxrrset: *is_zonep = is_zone; *versionp = version; - client->query.attributes |= - (NS_QUERYATTR_NOAUTHORITY | NS_QUERYATTR_NOADDITIONAL); + client->query.attributes |= (NS_QUERYATTR_NOAUTHORITY | + NS_QUERYATTR_NOADDITIONAL); return (result); } @@ -5058,8 +5007,7 @@ nxrrset: */ static void qctx_init(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype, - query_ctx_t *qctx) -{ + query_ctx_t *qctx) { REQUIRE(qctx != NULL); REQUIRE(client != NULL); @@ -5084,10 +5032,9 @@ qctx_init(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype, * Clean up and disassociate the rdataset and node pointers in qctx. */ static void -qctx_clean(query_ctx_t *qctx) -{ - if (qctx->rdataset != NULL && - dns_rdataset_isassociated(qctx->rdataset)) { +qctx_clean(query_ctx_t *qctx) { + if (qctx->rdataset != NULL && dns_rdataset_isassociated(qctx->rdataset)) + { dns_rdataset_disassociate(qctx->rdataset); } if (qctx->sigrdataset != NULL && @@ -5103,8 +5050,7 @@ qctx_clean(query_ctx_t *qctx) * Free any allocated memory associated with qctx. */ static void -qctx_freedata(query_ctx_t *qctx) -{ +qctx_freedata(query_ctx_t *qctx) { if (qctx->rdataset != NULL) { ns_client_putrdataset(qctx->client, &qctx->rdataset); } @@ -5141,8 +5087,7 @@ qctx_freedata(query_ctx_t *qctx) } static void -qctx_destroy(query_ctx_t *qctx) -{ +qctx_destroy(query_ctx_t *qctx) { CALL_HOOK_NORETURN(NS_QUERY_QCTX_DESTROYED, qctx); dns_view_detach(&qctx->view); @@ -5153,8 +5098,7 @@ qctx_destroy(query_ctx_t *qctx) * the client request or a return from recursion. */ static void -query_trace(query_ctx_t *qctx) -{ +query_trace(query_ctx_t *qctx) { #ifdef WANT_QUERYTRACE char mbuf[2 * DNS_NAME_FORMATSIZE]; char qbuf[DNS_NAME_FORMATSIZE]; @@ -5192,10 +5136,9 @@ query_trace(query_ctx_t *qctx) * recursion is handled by query_resume(). */ static isc_result_t -query_setup(ns_client_t *client, dns_rdatatype_t qtype) -{ +query_setup(ns_client_t *client, dns_rdatatype_t qtype) { isc_result_t result; - query_ctx_t qctx; + query_ctx_t qctx; qctx_init(client, NULL, qtype, &qctx); query_trace(&qctx); @@ -5227,10 +5170,9 @@ cleanup: } static bool -get_root_key_sentinel_id(query_ctx_t *qctx, const char *ndata) -{ +get_root_key_sentinel_id(query_ctx_t *qctx, const char *ndata) { unsigned int v = 0; - int i; + int i; for (i = 0; i < 5; i++) { if (ndata[i] < '0' || ndata[i] > '9') { @@ -5253,12 +5195,12 @@ get_root_key_sentinel_id(query_ctx_t *qctx, const char *ndata) * The code is assuming a zero padded decimal field of width 5. */ static void -root_key_sentinel_detect(query_ctx_t *qctx) -{ +root_key_sentinel_detect(query_ctx_t *qctx) { const char *ndata = (const char *)qctx->client->query.qname->ndata; if (qctx->client->query.qname->length > 30 && ndata[0] == 29 && - strncasecmp(ndata + 1, "root-key-sentinel-is-ta-", 24) == 0) { + strncasecmp(ndata + 1, "root-key-sentinel-is-ta-", 24) == 0) + { if (!get_root_key_sentinel_id(qctx, ndata + 25)) { return; } @@ -5272,8 +5214,8 @@ root_key_sentinel_detect(query_ctx_t *qctx) NS_LOGMODULE_QUERY, ISC_LOG_INFO, "root-key-sentinel-is-ta query label found"); } else if (qctx->client->query.qname->length > 31 && ndata[0] == 30 && - strncasecmp(ndata + 1, "root-key-sentinel-not-ta-", 25) == - 0) { + strncasecmp(ndata + 1, "root-key-sentinel-not-ta-", 25) == 0) + { if (!get_root_key_sentinel_id(qctx, ndata + 26)) { return; } @@ -5297,8 +5239,7 @@ root_key_sentinel_detect(query_ctx_t *qctx) * search, then hands off processing to query_lookup(). */ isc_result_t -ns__query_start(query_ctx_t *qctx) -{ +ns__query_start(query_ctx_t *qctx) { isc_result_t result; CCTRACE(ISC_LOG_DEBUG(3), "ns__query_start"); qctx->want_restart = false; @@ -5315,7 +5256,8 @@ ns__query_start(query_ctx_t *qctx) * before we have done too much work. */ if (!TCP(qctx->client) && qctx->view->requireservercookie && - WANTCOOKIE(qctx->client) && !HAVECOOKIE(qctx->client)) { + WANTCOOKIE(qctx->client) && !HAVECOOKIE(qctx->client)) + { qctx->client->message->flags &= ~DNS_MESSAGEFLAG_AA; qctx->client->message->flags &= ~DNS_MESSAGEFLAG_AD; qctx->client->message->rcode = dns_rcode_badcookie; @@ -5325,7 +5267,8 @@ ns__query_start(query_ctx_t *qctx) if (qctx->view->checknames && !dns_rdata_checkowner(qctx->client->query.qname, qctx->client->message->rdclass, qctx->qtype, - false)) { + false)) + { char namebuf[DNS_NAME_FORMATSIZE]; char typebuf[DNS_RDATATYPE_FORMATSIZE]; char classbuf[DNS_RDATACLASS_FORMATSIZE]; @@ -5350,7 +5293,8 @@ ns__query_start(query_ctx_t *qctx) qctx->client->query.restarts == 0 && (qctx->qtype == dns_rdatatype_a || qctx->qtype == dns_rdatatype_aaaa) && - (qctx->client->message->flags & DNS_MESSAGEFLAG_CD) == 0) { + (qctx->client->message->flags & DNS_MESSAGEFLAG_CD) == 0) + { root_key_sentinel_detect(qctx); } @@ -5359,7 +5303,8 @@ ns__query_start(query_ctx_t *qctx) */ qctx->options &= DNS_GETDB_NOLOG; /* Preserve DNS_GETDB_NOLOG. */ if (dns_rdatatype_atparent(qctx->qtype) && - !dns_name_equal(qctx->client->query.qname, dns_rootname)) { + !dns_name_equal(qctx->client->query.qname, dns_rootname)) + { /* * If authoritative data for this QTYPE is supposed to live in * the parent zone, do not look for an exact match for QNAME, @@ -5375,17 +5320,18 @@ ns__query_start(query_ctx_t *qctx) if (ISC_UNLIKELY((result != ISC_R_SUCCESS || !qctx->is_zone) && qctx->qtype == dns_rdatatype_ds && !RECURSIONOK(qctx->client) && - (qctx->options & DNS_GETDB_NOEXACT) != 0)) { + (qctx->options & DNS_GETDB_NOEXACT) != 0)) + { /* * This is a non-recursive QTYPE=DS query with QNAME whose * parent we are not authoritative for. Check whether we are * authoritative for QNAME, because if so, we need to send a * "no data" response as required by RFC 4035, section 3.1.4.1. */ - dns_db_t * tdb = NULL; - dns_zone_t * tzone = NULL; + dns_db_t *tdb = NULL; + dns_zone_t *tzone = NULL; dns_dbversion_t *tversion = NULL; - isc_result_t tresult; + isc_result_t tresult; tresult = query_getzonedb( qctx->client, qctx->client->query.qname, qctx->qtype, @@ -5459,8 +5405,8 @@ ns__query_start(query_ctx_t *qctx) if (dns_zone_gettype(qctx->zone) == dns_zone_mirror) { qctx->authoritative = false; } - if (dns_zone_gettype(qctx->zone) == - dns_zone_staticstub) { + if (dns_zone_gettype(qctx->zone) == dns_zone_staticstub) + { qctx->is_staticstub_zone = true; } } @@ -5504,14 +5450,13 @@ cleanup: * hand off processing to query_gotanswer(). */ static isc_result_t -query_lookup(query_ctx_t *qctx) -{ - isc_buffer_t b; - isc_result_t result; +query_lookup(query_ctx_t *qctx) { + isc_buffer_t b; + isc_result_t result; dns_clientinfomethods_t cm; - dns_clientinfo_t ci; - dns_name_t * rpzqname = NULL; - unsigned int dboptions; + dns_clientinfo_t ci; + dns_name_t *rpzqname = NULL; + unsigned int dboptions; CCTRACE(ISC_LOG_DEBUG(3), "query_lookup"); @@ -5542,7 +5487,8 @@ query_lookup(query_ctx_t *qctx) } if ((WANTDNSSEC(qctx->client) || qctx->findcoveringnsec) && - (!qctx->is_zone || dns_db_issecure(qctx->db))) { + (!qctx->is_zone || dns_db_issecure(qctx->db))) + { qctx->sigrdataset = ns_client_newrdataset(qctx->client); if (qctx->sigrdataset == NULL) { CCTRACE(ISC_LOG_ERROR, "query_lookup: " @@ -5564,7 +5510,8 @@ query_lookup(query_ctx_t *qctx) dboptions = qctx->client->query.dboptions; if (!qctx->is_zone && qctx->findcoveringnsec && - (qctx->type != dns_rdatatype_null || !dns_name_istat(rpzqname))) { + (qctx->type != dns_rdatatype_null || !dns_name_istat(rpzqname))) + { dboptions |= DNS_DBFIND_COVERINGNSEC; } @@ -5595,7 +5542,8 @@ query_lookup(query_ctx_t *qctx) qctx->client->query.dboptions &= ~DNS_DBFIND_STALEOK; if (dns_rdataset_isassociated(qctx->rdataset) && dns_rdataset_count(qctx->rdataset) > 0 && - STALE(qctx->rdataset)) { + STALE(qctx->rdataset)) + { qctx->rdataset->ttl = qctx->view->staleanswerttl; success = true; } else { @@ -5627,15 +5575,14 @@ cleanup: * query_resume() to continue the ongoing work. */ static void -fetch_callback(isc_task_t *task, isc_event_t *event) -{ - dns_fetchevent_t * devent = (dns_fetchevent_t *)event; - dns_fetch_t * fetch = NULL; - ns_client_t * client; - bool fetch_canceled, client_shuttingdown; - isc_result_t result; +fetch_callback(isc_task_t *task, isc_event_t *event) { + dns_fetchevent_t *devent = (dns_fetchevent_t *)event; + dns_fetch_t *fetch = NULL; + ns_client_t *client; + bool fetch_canceled, client_shuttingdown; + isc_result_t result; isc_logcategory_t *logcategory = NS_LOGCATEGORY_QUERY_ERRORS; - int errorloglevel; + int errorloglevel; UNUSED(task); @@ -5742,8 +5689,7 @@ fetch_callback(isc_task_t *task, isc_event_t *event) */ static bool recparam_match(const ns_query_recparam_t *param, dns_rdatatype_t qtype, - const dns_name_t *qname, const dns_name_t *qdomain) -{ + const dns_name_t *qname, const dns_name_t *qdomain) { REQUIRE(param != NULL); return (param->qtype == qtype && param->qname != NULL && @@ -5758,8 +5704,7 @@ recparam_match(const ns_query_recparam_t *param, dns_rdatatype_t qtype, */ static void recparam_update(ns_query_recparam_t *param, dns_rdatatype_t qtype, - const dns_name_t *qname, const dns_name_t *qdomain) -{ + const dns_name_t *qname, const dns_name_t *qdomain) { REQUIRE(param != NULL); param->qtype = qtype; @@ -5782,8 +5727,7 @@ static atomic_uint_fast32_t last_soft, last_hard; #ifdef ISC_MUTEX_ATOMICS static isc_once_t last_once = ISC_ONCE_INIT; static void -last_init() -{ +last_init() { atomic_init(&last_soft, 0); atomic_init(&last_hard, 0); } @@ -5792,9 +5736,8 @@ last_init() isc_result_t ns_query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qname, dns_name_t *qdomain, dns_rdataset_t *nameservers, - bool resuming) -{ - isc_result_t result; + bool resuming) { + isc_result_t result; dns_rdataset_t *rdataset, *sigrdataset; isc_sockaddr_t *peeraddr = NULL; @@ -5944,10 +5887,9 @@ ns_query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qname, * continues the query processing if needed. */ static isc_result_t -query_resume(query_ctx_t *qctx) -{ +query_resume(query_ctx_t *qctx) { isc_result_t result; - dns_name_t * tname; + dns_name_t *tname; isc_buffer_t b; #ifdef WANT_QUERYTRACE char mbuf[4 * DNS_NAME_FORMATSIZE]; @@ -6151,9 +6093,8 @@ cleanup: * SERVFAIL response to a CD=1 query. */ isc_result_t -ns__query_sfcache(query_ctx_t *qctx) -{ - bool failcache; +ns__query_sfcache(query_ctx_t *qctx) { + bool failcache; uint32_t flags; /* @@ -6179,7 +6120,8 @@ ns__query_sfcache(query_ctx_t *qctx) #endif /* ifdef ENABLE_AFL */ if (failcache && (((flags & NS_FAILCACHE_CD) != 0) || - ((qctx->client->message->flags & DNS_MESSAGEFLAG_CD) == 0))) { + ((qctx->client->message->flags & DNS_MESSAGEFLAG_CD) == 0))) + { if (isc_log_wouldlog(ns_lctx, ISC_LOG_DEBUG(1))) { char namebuf[DNS_NAME_FORMATSIZE]; char typebuf[DNS_RDATATYPE_FORMATSIZE]; @@ -6209,8 +6151,7 @@ ns__query_sfcache(query_ctx_t *qctx) * Handle response rate limiting (RRL). */ static isc_result_t -query_checkrrl(query_ctx_t *qctx, isc_result_t result) -{ +query_checkrrl(query_ctx_t *qctx, isc_result_t result) { /* * Rate limit these responses to this client. * Do not delay counting and handling obvious referrals, @@ -6252,14 +6193,15 @@ query_checkrrl(query_ctx_t *qctx, isc_result_t result) RECURSIONOK(qctx->client)) && (qctx->client->query.rpz_st == NULL || (qctx->client->query.rpz_st->state & DNS_RPZ_REWRITTEN) == 0) && - (qctx->client->query.attributes & NS_QUERYATTR_RRL_CHECKED) == 0) { - dns_rdataset_t nc_rdataset; - bool wouldlog; - dns_fixedname_t fixed; + (qctx->client->query.attributes & NS_QUERYATTR_RRL_CHECKED) == 0) + { + dns_rdataset_t nc_rdataset; + bool wouldlog; + dns_fixedname_t fixed; const dns_name_t *constname; - char log_buf[DNS_RRL_LOG_BUF_LEN]; - isc_result_t nc_result, resp_result; - dns_rrl_result_t rrl_result; + char log_buf[DNS_RRL_LOG_BUF_LEN]; + isc_result_t nc_result, resp_result; + dns_rrl_result_t rrl_result; qctx->client->query.attributes |= NS_QUERYATTR_RRL_CHECKED; @@ -6277,7 +6219,8 @@ query_checkrrl(query_ctx_t *qctx, isc_result_t result) qctx->rdataset != NULL && dns_rdataset_isassociated(qctx->rdataset) && (qctx->rdataset->attributes & - DNS_RDATASETATTR_NEGATIVE) != 0) { + DNS_RDATASETATTR_NEGATIVE) != 0) + { /* * Try to use owner name in the negative cache SOA. */ @@ -6285,7 +6228,8 @@ query_checkrrl(query_ctx_t *qctx, isc_result_t result) dns_rdataset_init(&nc_rdataset); for (nc_result = dns_rdataset_first(qctx->rdataset); nc_result == ISC_R_SUCCESS; - nc_result = dns_rdataset_next(qctx->rdataset)) { + nc_result = dns_rdataset_next(qctx->rdataset)) + { dns_ncache_current(qctx->rdataset, dns_fixedname_name(&fixed), &nc_rdataset); @@ -6297,8 +6241,8 @@ query_checkrrl(query_ctx_t *qctx, isc_result_t result) dns_rdataset_disassociate(&nc_rdataset); } resp_result = DNS_R_NXDOMAIN; - } else if (result == DNS_R_NXRRSET || - result == DNS_R_EMPTYNAME) { + } else if (result == DNS_R_NXRRSET || result == DNS_R_EMPTYNAME) + { resp_result = DNS_R_NXRRSET; } else if (result == DNS_R_DELEGATION) { resp_result = result; @@ -6382,8 +6326,7 @@ query_checkrrl(query_ctx_t *qctx, isc_result_t result) * Do any RPZ rewriting that may be needed for this query. */ static isc_result_t -query_checkrpz(query_ctx_t *qctx, isc_result_t result) -{ +query_checkrpz(query_ctx_t *qctx, isc_result_t result) { isc_result_t rresult; CCTRACE(ISC_LOG_DEBUG(3), "query_checkrpz"); @@ -6426,7 +6369,8 @@ query_checkrpz(query_ctx_t *qctx, isc_result_t result) qctx->rpz_st->m.policy != DNS_RPZ_POLICY_PASSTHRU && (qctx->rpz_st->m.policy != DNS_RPZ_POLICY_TCP_ONLY || !TCP(qctx->client)) && - qctx->rpz_st->m.policy != DNS_RPZ_POLICY_ERROR) { + qctx->rpz_st->m.policy != DNS_RPZ_POLICY_ERROR) + { /* * We got a hit and are going to answer with our * fiction. Ensure that we answer with the name @@ -6520,7 +6464,7 @@ query_checkrpz(query_ctx_t *qctx, isc_result_t result) qctx->rpz = true; break; case DNS_RPZ_POLICY_WILDCNAME: { - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_cname_t cname; result = dns_rdataset_first(qctx->rdataset); RUNTIME_CHECK(result == ISC_R_SUCCESS); @@ -6558,8 +6502,8 @@ query_checkrpz(query_ctx_t *qctx, isc_result_t result) * Turn off DNSSEC because the results of a * response policy zone cannot verify. */ - qctx->client->attributes &= - ~(NS_CLIENTATTR_WANTDNSSEC | NS_CLIENTATTR_WANTAD); + qctx->client->attributes &= ~(NS_CLIENTATTR_WANTDNSSEC | + NS_CLIENTATTR_WANTAD); qctx->client->message->flags &= ~DNS_MESSAGEFLAG_AD; ns_client_putrdataset(qctx->client, &qctx->sigrdataset); qctx->rpz_st->q.is_zone = qctx->is_zone; @@ -6580,12 +6524,11 @@ query_checkrpz(query_ctx_t *qctx, isc_result_t result) * foo.evil.com CNAME foo.evil.com.example.com */ static isc_result_t -query_rpzcname(query_ctx_t *qctx, dns_name_t *cname) -{ - ns_client_t * client; +query_rpzcname(query_ctx_t *qctx, dns_name_t *cname) { + ns_client_t *client; dns_fixedname_t prefix, suffix; - unsigned int labels; - isc_result_t result; + unsigned int labels; + isc_result_t result; REQUIRE(qctx != NULL && qctx->client != NULL); @@ -6614,8 +6557,8 @@ query_rpzcname(query_ctx_t *qctx, dns_name_t *cname) } ns_client_keepname(client, qctx->fname, qctx->dbuf); - result = - query_addcname(qctx, dns_trust_authanswer, qctx->rpz_st->m.ttl); + result = query_addcname(qctx, dns_trust_authanswer, + qctx->rpz_st->m.ttl); if (result != ISC_R_SUCCESS) { return (result); } @@ -6631,8 +6574,8 @@ query_rpzcname(query_ctx_t *qctx, dns_name_t *cname) * Turn off DNSSEC because the results of a * response policy zone cannot verify. */ - client->attributes &= - ~(NS_CLIENTATTR_WANTDNSSEC | NS_CLIENTATTR_WANTAD); + client->attributes &= ~(NS_CLIENTATTR_WANTDNSSEC | + NS_CLIENTATTR_WANTAD); return (ISC_R_SUCCESS); } @@ -6644,13 +6587,12 @@ query_rpzcname(query_ctx_t *qctx, dns_name_t *cname) * Return true when found, otherwise return false. */ static bool -has_ta(query_ctx_t *qctx) -{ +has_ta(query_ctx_t *qctx) { dns_keytable_t *keytable = NULL; - dns_keynode_t * keynode = NULL; + dns_keynode_t *keynode = NULL; dns_rdataset_t *dsset = NULL; - dns_keytag_t sentinel = qctx->client->query.root_key_sentinel_keyid; - isc_result_t result; + dns_keytag_t sentinel = qctx->client->query.root_key_sentinel_keyid; + isc_result_t result; result = dns_view_getsecroots(qctx->view, &keytable); if (result != ISC_R_SUCCESS) { @@ -6668,9 +6610,9 @@ has_ta(query_ctx_t *qctx) if ((dsset = dns_keynode_dsset(keynode)) != NULL) { for (result = dns_rdataset_first(dsset); - result == ISC_R_SUCCESS; - result = dns_rdataset_next(dsset)) { - dns_rdata_t rdata = DNS_RDATA_INIT; + result == ISC_R_SUCCESS; result = dns_rdataset_next(dsset)) + { + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_ds_t ds; dns_rdata_reset(&rdata); @@ -6698,13 +6640,13 @@ has_ta(query_ctx_t *qctx) * Check if a root key sentinel SERVFAIL should be returned. */ static bool -root_key_sentinel_return_servfail(query_ctx_t *qctx, isc_result_t result) -{ +root_key_sentinel_return_servfail(query_ctx_t *qctx, isc_result_t result) { /* * Are we looking at a "root-key-sentinel" query? */ if (!qctx->client->query.root_key_sentinel_is_ta && - !qctx->client->query.root_key_sentinel_not_ta) { + !qctx->client->query.root_key_sentinel_not_ta) + { return (false); } @@ -6728,7 +6670,8 @@ root_key_sentinel_return_servfail(query_ctx_t *qctx, isc_result_t result) */ if (!qctx->is_zone && qctx->rdataset->trust == dns_trust_secure && ((qctx->client->query.root_key_sentinel_is_ta && !has_ta(qctx)) || - (qctx->client->query.root_key_sentinel_not_ta && has_ta(qctx)))) { + (qctx->client->query.root_key_sentinel_not_ta && has_ta(qctx)))) + { return (true); } @@ -6747,10 +6690,9 @@ root_key_sentinel_return_servfail(query_ctx_t *qctx, isc_result_t result) * return true; otherwise, return false. */ static bool -query_usestale(query_ctx_t *qctx) -{ - bool staleanswersok = false; - dns_ttl_t stale_ttl = 0; +query_usestale(query_ctx_t *qctx) { + bool staleanswersok = false; + dns_ttl_t stale_ttl = 0; isc_result_t result; qctx_clean(qctx); @@ -6797,10 +6739,9 @@ query_usestale(query_ctx_t *qctx) * result from the search. */ static isc_result_t -query_gotanswer(query_ctx_t *qctx, isc_result_t res) -{ +query_gotanswer(query_ctx_t *qctx, isc_result_t res) { isc_result_t result = res; - char errmsg[256]; + char errmsg[256]; CCTRACE(ISC_LOG_DEBUG(3), "query_gotanswer"); @@ -6811,7 +6752,8 @@ query_gotanswer(query_ctx_t *qctx, isc_result_t res) } if (!RECURSING(qctx->client) && - !dns_name_equal(qctx->client->query.qname, dns_rootname)) { + !dns_name_equal(qctx->client->query.qname, dns_rootname)) + { result = query_checkrpz(qctx, result); if (result == ISC_R_COMPLETE) { return (ns_query_done(qctx)); @@ -6908,13 +6850,12 @@ cleanup: } static void -query_addnoqnameproof(query_ctx_t *qctx) -{ - ns_client_t * client = qctx->client; - isc_buffer_t * dbuf, b; - dns_name_t * fname = NULL; +query_addnoqnameproof(query_ctx_t *qctx) { + ns_client_t *client = qctx->client; + isc_buffer_t *dbuf, b; + dns_name_t *fname = NULL; dns_rdataset_t *neg = NULL, *negsig = NULL; - isc_result_t result = ISC_R_NOMEMORY; + isc_result_t result = ISC_R_NOMEMORY; CTRACE(ISC_LOG_DEBUG(3), "query_addnoqnameproof"); @@ -6989,13 +6930,12 @@ cleanup: * Build the response for a query for type ANY. */ static isc_result_t -query_respond_any(query_ctx_t *qctx) -{ - bool found = false, hidden = false; +query_respond_any(query_ctx_t *qctx) { + bool found = false, hidden = false; dns_rdatasetiter_t *rdsiter = NULL; - isc_result_t result; - dns_rdatatype_t onetype = 0; /* type to use for minimal-any */ - isc_buffer_t b; + isc_result_t result; + dns_rdatatype_t onetype = 0; /* type to use for minimal-any */ + isc_buffer_t b; CCTRACE(ISC_LOG_DEBUG(3), "query_respond_any"); @@ -7032,7 +6972,8 @@ query_respond_any(query_ctx_t *qctx) * We found an NS RRset; no need to add one later. */ if (qctx->qtype == dns_rdatatype_any && - qctx->rdataset->type == dns_rdatatype_ns) { + qctx->rdataset->type == dns_rdatatype_ns) + { qctx->answer_has_ns = true; } @@ -7044,7 +6985,8 @@ query_respond_any(query_ctx_t *qctx) */ if (qctx->is_zone && qctx->qtype == dns_rdatatype_any && !dns_db_issecure(qctx->db) && - dns_rdatatype_isdnssec(qctx->rdataset->type)) { + dns_rdatatype_isdnssec(qctx->rdataset->type)) + { /* * The zone may be transitioning from insecure * to secure. Hide DNSSEC records from ANY queries. @@ -7055,21 +6997,24 @@ query_respond_any(query_ctx_t *qctx) !WANTDNSSEC(qctx->client) && qctx->qtype == dns_rdatatype_any && (qctx->rdataset->type == dns_rdatatype_sig || - qctx->rdataset->type == dns_rdatatype_rrsig)) { + qctx->rdataset->type == dns_rdatatype_rrsig)) + { CCTRACE(ISC_LOG_DEBUG(5), "query_respond_any: " "minimal-any skip signature"); dns_rdataset_disassociate(qctx->rdataset); } else if (qctx->view->minimal_any && !TCP(qctx->client) && onetype != 0 && qctx->rdataset->type != onetype && - qctx->rdataset->covers != onetype) { + qctx->rdataset->covers != onetype) + { CCTRACE(ISC_LOG_DEBUG(5), "query_respond_any: " "minimal-any skip rdataset"); dns_rdataset_disassociate(qctx->rdataset); } else if ((qctx->qtype == dns_rdatatype_any || qctx->rdataset->type == qctx->qtype) && - qctx->rdataset->type != 0) { - if (NOQNAME(qctx->rdataset) && - WANTDNSSEC(qctx->client)) { + qctx->rdataset->type != 0) + { + if (NOQNAME(qctx->rdataset) && WANTDNSSEC(qctx->client)) + { qctx->noqname = qctx->rdataset; } else { qctx->noqname = NULL; @@ -7095,7 +7040,8 @@ query_respond_any(query_ctx_t *qctx) * can skip others with minimal-any. */ if (qctx->rdataset->type == dns_rdatatype_sig || - qctx->rdataset->type == dns_rdatatype_rrsig) { + qctx->rdataset->type == dns_rdatatype_rrsig) + { onetype = qctx->rdataset->covers; } else { onetype = qctx->rdataset->type; @@ -7163,7 +7109,8 @@ query_respond_any(query_ctx_t *qctx) */ query_addauth(qctx); } else if (qctx->qtype == dns_rdatatype_rrsig || - qctx->qtype == dns_rdatatype_sig) { + qctx->qtype == dns_rdatatype_sig) + { /* * No matching rdatasets were found, but we got * here on a search for RRSIG/SIG, so that's okay. @@ -7206,8 +7153,7 @@ cleanup: * master zone. */ static void -query_getexpire(query_ctx_t *qctx) -{ +query_getexpire(query_ctx_t *qctx) { dns_zone_t *raw = NULL, *mayberaw; CCTRACE(ISC_LOG_DEBUG(3), "query_getexpire"); @@ -7215,7 +7161,8 @@ query_getexpire(query_ctx_t *qctx) if (qctx->zone == NULL || !qctx->is_zone || qctx->qtype != dns_rdatatype_soa || qctx->client->query.restarts != 0 || - (qctx->client->attributes & NS_CLIENTATTR_WANTEXPIRE) == 0) { + (qctx->client->attributes & NS_CLIENTATTR_WANTEXPIRE) == 0) + { return; } @@ -7223,19 +7170,20 @@ query_getexpire(query_ctx_t *qctx) mayberaw = (raw != NULL) ? raw : qctx->zone; if (dns_zone_gettype(mayberaw) == dns_zone_slave || - dns_zone_gettype(mayberaw) == dns_zone_mirror) { + dns_zone_gettype(mayberaw) == dns_zone_mirror) + { isc_time_t expiretime; - uint32_t secs; + uint32_t secs; dns_zone_getexpiretime(qctx->zone, &expiretime); secs = isc_time_seconds(&expiretime); - if (secs >= qctx->client->now && - qctx->result == ISC_R_SUCCESS) { + if (secs >= qctx->client->now && qctx->result == ISC_R_SUCCESS) + { qctx->client->attributes |= NS_CLIENTATTR_HAVEEXPIRE; qctx->client->expire = secs - qctx->client->now; } } else if (dns_zone_gettype(mayberaw) == dns_zone_master) { - isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; + isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_soa_t soa; result = dns_rdataset_first(qctx->rdataset); @@ -7258,10 +7206,9 @@ query_getexpire(query_ctx_t *qctx) * Fill the ANSWER section of a positive response. */ static isc_result_t -query_addanswer(query_ctx_t *qctx) -{ +query_addanswer(query_ctx_t *qctx) { dns_rdataset_t **sigrdatasetp = NULL; - isc_result_t result; + isc_result_t result; CCTRACE(ISC_LOG_DEBUG(3), "query_addanswer"); @@ -7322,8 +7269,7 @@ cleanup: * for which we have an answer (either positive or negative). */ static isc_result_t -query_respond(query_ctx_t *qctx) -{ +query_respond(query_ctx_t *qctx) { isc_result_t result; CCTRACE(ISC_LOG_DEBUG(3), "query_respond"); @@ -7337,7 +7283,8 @@ query_respond(query_ctx_t *qctx) if (qctx->qtype == dns_rdatatype_aaaa && !qctx->dns64_exclude && !ISC_LIST_EMPTY(qctx->view->dns64) && qctx->client->message->rdclass == dns_rdataclass_in && - !dns64_aaaaok(qctx->client, qctx->rdataset, qctx->sigrdataset)) { + !dns64_aaaaok(qctx->client, qctx->rdataset, qctx->sigrdataset)) + { /* * Look to see if there are A records for this name. */ @@ -7419,24 +7366,23 @@ cleanup: } static isc_result_t -query_dns64(query_ctx_t *qctx) -{ - ns_client_t * client = qctx->client; +query_dns64(query_ctx_t *qctx) { + ns_client_t *client = qctx->client; dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->manager->interface->mgr); - dns_name_t * name, *mname; - dns_rdata_t * dns64_rdata; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdatalist_t * dns64_rdatalist; - dns_rdataset_t * dns64_rdataset; - dns_rdataset_t * mrdataset; - isc_buffer_t * buffer; - isc_region_t r; - isc_result_t result; - dns_view_t * view = client->view; - isc_netaddr_t netaddr; - dns_dns64_t * dns64; - unsigned int flags = 0; + dns_name_t *name, *mname; + dns_rdata_t *dns64_rdata; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdatalist_t *dns64_rdatalist; + dns_rdataset_t *dns64_rdataset; + dns_rdataset_t *mrdataset; + isc_buffer_t *buffer; + isc_region_t r; + isc_result_t result; + dns_view_t *view = client->view; + isc_netaddr_t netaddr; + dns_dns64_t *dns64; + unsigned int flags = 0; const dns_section_t section = DNS_SECTION_ANSWER; /*% @@ -7505,8 +7451,8 @@ query_dns64(query_ctx_t *qctx) if (result != ISC_R_SUCCESS) { goto cleanup; } - result = - dns_message_gettemprdatalist(client->message, &dns64_rdatalist); + result = dns_message_gettemprdatalist(client->message, + &dns64_rdatalist); if (result != ISC_R_SUCCESS) { goto cleanup; } @@ -7515,8 +7461,8 @@ query_dns64(query_ctx_t *qctx) dns64_rdatalist->rdclass = dns_rdataclass_in; dns64_rdatalist->type = dns_rdatatype_aaaa; if (client->query.dns64_ttl != UINT32_MAX) { - dns64_rdatalist->ttl = - ISC_MIN(qctx->rdataset->ttl, client->query.dns64_ttl); + dns64_rdatalist->ttl = ISC_MIN(qctx->rdataset->ttl, + client->query.dns64_ttl); } else { dns64_rdatalist->ttl = ISC_MIN(qctx->rdataset->ttl, 600); } @@ -7530,15 +7476,18 @@ query_dns64(query_ctx_t *qctx) * as this provides a easy way to see if the answer was signed. */ if (WANTDNSSEC(qctx->client) && qctx->sigrdataset != NULL && - dns_rdataset_isassociated(qctx->sigrdataset)) { + dns_rdataset_isassociated(qctx->sigrdataset)) + { flags |= DNS_DNS64_DNSSEC; } for (result = dns_rdataset_first(qctx->rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(qctx->rdataset)) { + result = dns_rdataset_next(qctx->rdataset)) + { for (dns64 = ISC_LIST_HEAD(client->view->dns64); dns64 != NULL; - dns64 = dns_dns64_next(dns64)) { + dns64 = dns_dns64_next(dns64)) + { dns_rdataset_current(qctx->rdataset, &rdata); isc_buffer_availableregion(buffer, &r); INSIST(r.length >= 16); @@ -7607,7 +7556,8 @@ cleanup: if (dns64_rdatalist != NULL) { for (dns64_rdata = ISC_LIST_HEAD(dns64_rdatalist->rdata); dns64_rdata != NULL; - dns64_rdata = ISC_LIST_HEAD(dns64_rdatalist->rdata)) { + dns64_rdata = ISC_LIST_HEAD(dns64_rdatalist->rdata)) + { ISC_LIST_UNLINK(dns64_rdatalist->rdata, dns64_rdata, link); dns_message_puttemprdata(client->message, &dns64_rdata); @@ -7620,18 +7570,17 @@ cleanup: } static void -query_filter64(query_ctx_t *qctx) -{ - ns_client_t * client = qctx->client; - dns_name_t * name, *mname; - dns_rdata_t * myrdata; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdatalist_t * myrdatalist; - dns_rdataset_t * myrdataset; - isc_buffer_t * buffer; - isc_region_t r; - isc_result_t result; - unsigned int i; +query_filter64(query_ctx_t *qctx) { + ns_client_t *client = qctx->client; + dns_name_t *name, *mname; + dns_rdata_t *myrdata; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdatalist_t *myrdatalist; + dns_rdataset_t *myrdataset; + isc_buffer_t *buffer; + isc_region_t r; + isc_result_t result; + unsigned int i; const dns_section_t section = DNS_SECTION_ANSWER; CTRACE(ISC_LOG_DEBUG(3), "query_filter64"); @@ -7694,7 +7643,8 @@ query_filter64(query_ctx_t *qctx) i = 0; for (result = dns_rdataset_first(qctx->rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(qctx->rdataset)) { + result = dns_rdataset_next(qctx->rdataset)) + { if (!client->query.dns64_aaaaok[i++]) { continue; } @@ -7756,7 +7706,8 @@ cleanup: if (myrdatalist != NULL) { for (myrdata = ISC_LIST_HEAD(myrdatalist->rdata); myrdata != NULL; - myrdata = ISC_LIST_HEAD(myrdatalist->rdata)) { + myrdata = ISC_LIST_HEAD(myrdatalist->rdata)) + { ISC_LIST_UNLINK(myrdatalist->rdata, myrdata, link); dns_message_puttemprdata(client->message, &myrdata); } @@ -7775,8 +7726,7 @@ cleanup: * query_delegation() for a root referral if appropriate. */ static isc_result_t -query_notfound(query_ctx_t *qctx) -{ +query_notfound(query_ctx_t *qctx) { isc_result_t result; CCTRACE(ISC_LOG_DEBUG(3), "query_notfound"); @@ -7795,7 +7745,7 @@ query_notfound(query_ctx_t *qctx) */ if (qctx->view->hints != NULL) { dns_clientinfomethods_t cm; - dns_clientinfo_t ci; + dns_clientinfo_t ci; dns_clientinfomethods_init(&cm, ns_client_sourceip); dns_clientinfo_init(&ci, qctx->client, NULL); @@ -7862,11 +7812,10 @@ cleanup: * to the client. */ static isc_result_t -query_prepare_delegation_response(query_ctx_t *qctx) -{ - isc_result_t result; +query_prepare_delegation_response(query_ctx_t *qctx) { + isc_result_t result; dns_rdataset_t **sigrdatasetp = NULL; - bool detach = false; + bool detach = false; CALL_HOOK(NS_QUERY_PREP_DELEGATION_BEGIN, qctx); @@ -7919,8 +7868,7 @@ cleanup: * delegation to the client and call ns_query_done(). */ static isc_result_t -query_zone_delegation(query_ctx_t *qctx) -{ +query_zone_delegation(query_ctx_t *qctx) { isc_result_t result; CALL_HOOK(NS_QUERY_ZONE_DELEGATION_BEGIN, qctx); @@ -7931,9 +7879,10 @@ query_zone_delegation(query_ctx_t *qctx) */ if (!RECURSIONOK(qctx->client) && (qctx->options & DNS_GETDB_NOEXACT) != 0 && - qctx->qtype == dns_rdatatype_ds) { - dns_db_t * tdb = NULL; - dns_zone_t * tzone = NULL; + qctx->qtype == dns_rdatatype_ds) + { + dns_db_t *tdb = NULL; + dns_zone_t *tzone = NULL; dns_dbversion_t *tversion = NULL; result = query_getzonedb( qctx->client, qctx->client->query.qname, qctx->qtype, @@ -7978,7 +7927,8 @@ query_zone_delegation(query_ctx_t *qctx) if (USECACHE(qctx->client) && (RECURSIONOK(qctx->client) || (qctx->zone != NULL && - dns_zone_gettype(qctx->zone) == dns_zone_mirror))) { + dns_zone_gettype(qctx->zone) == dns_zone_mirror))) + { /* * We might have a better answer or delegation in the * cache. We'll remember the current values of fname, @@ -8016,8 +7966,7 @@ cleanup: * client and call ns_query_done(). */ static isc_result_t -query_delegation(query_ctx_t *qctx) -{ +query_delegation(query_ctx_t *qctx) { isc_result_t result; CCTRACE(ISC_LOG_DEBUG(3), "query_delegation"); @@ -8033,7 +7982,8 @@ query_delegation(query_ctx_t *qctx) if (qctx->zfname != NULL && (!dns_name_issubdomain(qctx->fname, qctx->zfname) || (qctx->is_staticstub_zone && - dns_name_equal(qctx->fname, qctx->zfname)))) { + dns_name_equal(qctx->fname, qctx->zfname)))) + { /* * In the following cases use "authoritative" * data instead of the cache delegation: @@ -8090,10 +8040,9 @@ cleanup: * delegation process. */ static isc_result_t -query_delegation_recurse(query_ctx_t *qctx) -{ +query_delegation_recurse(query_ctx_t *qctx) { isc_result_t result; - dns_name_t * qname = qctx->client->query.qname; + dns_name_t *qname = qctx->client->query.qname; CCTRACE(ISC_LOG_DEBUG(3), "query_delegation_recurse"); @@ -8157,17 +8106,16 @@ cleanup: * Add a DS record if needed. */ static void -query_addds(query_ctx_t *qctx) -{ - ns_client_t * client = qctx->client; +query_addds(query_ctx_t *qctx) { + ns_client_t *client = qctx->client; dns_fixedname_t fixed; - dns_name_t * fname = NULL; - dns_name_t * rname = NULL; - dns_name_t * name; + dns_name_t *fname = NULL; + dns_name_t *rname = NULL; + dns_name_t *name; dns_rdataset_t *rdataset = NULL, *sigrdataset = NULL; - isc_buffer_t * dbuf, b; - isc_result_t result; - unsigned int count; + isc_buffer_t *dbuf, b; + isc_result_t result; + unsigned int count; CTRACE(ISC_LOG_DEBUG(3), "query_addds"); @@ -8205,7 +8153,8 @@ query_addds(query_ctx_t *qctx) goto addnsec3; } if (!dns_rdataset_isassociated(rdataset) || - !dns_rdataset_isassociated(sigrdataset)) { + !dns_rdataset_isassociated(sigrdataset)) + { goto addnsec3; } @@ -8301,8 +8250,7 @@ cleanup: * Handle authoritative NOERROR/NODATA responses. */ static isc_result_t -query_nodata(query_ctx_t *qctx, isc_result_t res) -{ +query_nodata(query_ctx_t *qctx, isc_result_t res) { isc_result_t result = res; CCTRACE(ISC_LOG_DEBUG(3), "query_nodata"); @@ -8336,8 +8284,8 @@ query_nodata(query_ctx_t *qctx, isc_result_t res) QUERY_ERROR(qctx, ISC_R_NOMEMORY); return (ns_query_done(qctx)); } - qctx->fname = - ns_client_newname(qctx->client, qctx->dbuf, &b); + qctx->fname = ns_client_newname(qctx->client, + qctx->dbuf, &b); if (qctx->fname == NULL) { CCTRACE(ISC_LOG_ERROR, "query_nodata: " "ns_client_newname " @@ -8359,7 +8307,8 @@ query_nodata(query_ctx_t *qctx, isc_result_t res) } else if ((result == DNS_R_NXRRSET || result == DNS_R_NCACHENXRRSET) && !ISC_LIST_EMPTY(qctx->view->dns64) && !qctx->nxrewrite && qctx->client->message->rdclass == dns_rdataclass_in && - qctx->qtype == dns_rdatatype_aaaa) { + qctx->qtype == dns_rdatatype_aaaa) + { /* * Look to see if there are A records for this name. */ @@ -8376,8 +8325,8 @@ query_nodata(query_ctx_t *qctx, isc_result_t res) qctx->rdataset->ttl; break; } - if (dns_rdataset_first(qctx->rdataset) == - ISC_R_SUCCESS) { + if (dns_rdataset_first(qctx->rdataset) == ISC_R_SUCCESS) + { qctx->client->query.dns64_ttl = 0; } break; @@ -8428,8 +8377,7 @@ cleanup: * Add RRSIGs for NOERROR/NODATA responses when answering authoritatively. */ isc_result_t -query_sign_nodata(query_ctx_t *qctx) -{ +query_sign_nodata(query_ctx_t *qctx) { isc_result_t result; CCTRACE(ISC_LOG_DEBUG(3), "query_sign_nodata"); @@ -8443,10 +8391,10 @@ query_sign_nodata(query_ctx_t *qctx) if (!dns_rdataset_isassociated(qctx->rdataset) && WANTDNSSEC(qctx->client)) { if ((qctx->fname->attributes & DNS_NAMEATTR_WILDCARD) == 0) { - dns_name_t * found; - dns_name_t * qname; + dns_name_t *found; + dns_name_t *qname; dns_fixedname_t fixed; - isc_buffer_t b; + isc_buffer_t b; found = dns_fixedname_initname(&fixed); qname = qctx->client->query.qname; @@ -8464,7 +8412,8 @@ query_sign_nodata(query_ctx_t *qctx) !dns_name_equal(qname, found) && (((qctx->client->sctx->options & NS_SERVER_NONEAREST) == 0) || - qctx->qtype == dns_rdatatype_ds)) { + qctx->qtype == dns_rdatatype_ds)) + { unsigned int count; unsigned int skip; @@ -8552,15 +8501,14 @@ query_sign_nodata(query_ctx_t *qctx) } static void -query_addnxrrsetnsec(query_ctx_t *qctx) -{ - ns_client_t * client = qctx->client; - dns_rdata_t sigrdata; +query_addnxrrsetnsec(query_ctx_t *qctx) { + ns_client_t *client = qctx->client; + dns_rdata_t sigrdata; dns_rdata_rrsig_t sig; - unsigned int labels; - isc_buffer_t * dbuf, b; - dns_name_t * fname; - isc_result_t result; + unsigned int labels; + isc_buffer_t *dbuf, b; + dns_name_t *fname; + isc_result_t result; INSIST(qctx->fname != NULL); @@ -8616,11 +8564,10 @@ query_addnxrrsetnsec(query_ctx_t *qctx) * Handle NXDOMAIN and empty wildcard responses. */ static isc_result_t -query_nxdomain(query_ctx_t *qctx, bool empty_wild) -{ +query_nxdomain(query_ctx_t *qctx, bool empty_wild) { dns_section_t section; - uint32_t ttl; - isc_result_t result; + uint32_t ttl; + isc_result_t result; CCTRACE(ISC_LOG_DEBUG(3), "query_nxdomain"); @@ -8664,7 +8611,8 @@ query_nxdomain(query_ctx_t *qctx, bool empty_wild) : DNS_SECTION_AUTHORITY; ttl = UINT32_MAX; if (!qctx->nxrewrite && qctx->qtype == dns_rdatatype_soa && - qctx->zone != NULL && dns_zone_getzeronosoattl(qctx->zone)) { + qctx->zone != NULL && dns_zone_getzeronosoattl(qctx->zone)) + { ttl = 0; } if (!qctx->nxrewrite || qctx->rpz_st->m.rpz->addsoa) { @@ -8714,8 +8662,7 @@ cleanup: * redirecting, so query processing should continue past it. */ static isc_result_t -query_redirect(query_ctx_t *qctx) -{ +query_redirect(query_ctx_t *qctx) { isc_result_t result; CCTRACE(ISC_LOG_DEBUG(3), "query_redirect"); @@ -8782,10 +8729,9 @@ query_redirect(query_ctx_t *qctx) * Logging function to be passed to dns_nsec_noexistnodata. */ static void -log_noexistnodata(void *val, int level, const char *fmt, ...) -{ +log_noexistnodata(void *val, int level, const char *fmt, ...) { query_ctx_t *qctx = val; - va_list ap; + va_list ap; va_start(ap, fmt); ns_client_logv(qctx->client, NS_LOGCATEGORY_QUERIES, NS_LOGMODULE_QUERY, @@ -8796,12 +8742,11 @@ log_noexistnodata(void *val, int level, const char *fmt, ...) static dns_ttl_t query_synthttl(dns_rdataset_t *soardataset, dns_rdataset_t *sigsoardataset, dns_rdataset_t *p1rdataset, dns_rdataset_t *sigp1rdataset, - dns_rdataset_t *p2rdataset, dns_rdataset_t *sigp2rdataset) -{ + dns_rdataset_t *p2rdataset, dns_rdataset_t *sigp2rdataset) { dns_rdata_soa_t soa; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_ttl_t ttl; - isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_ttl_t ttl; + isc_result_t result; REQUIRE(soardataset != NULL); REQUIRE(sigsoardataset != NULL); @@ -8834,12 +8779,11 @@ query_synthttl(dns_rdataset_t *soardataset, dns_rdataset_t *sigsoardataset, static isc_result_t query_synthnodata(query_ctx_t *qctx, const dns_name_t *signer, dns_rdataset_t **soardatasetp, - dns_rdataset_t **sigsoardatasetp) -{ - dns_name_t * name = NULL; - dns_ttl_t ttl; + dns_rdataset_t **sigsoardatasetp) { + dns_name_t *name = NULL; + dns_ttl_t ttl; isc_buffer_t *dbuf, b; - isc_result_t result; + isc_result_t result; /* * Detemine the correct TTL to use for the SOA and RRSIG @@ -8905,12 +8849,11 @@ cleanup: */ static isc_result_t query_synthwildcard(query_ctx_t *qctx, dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset) -{ - dns_name_t * name = NULL; - isc_buffer_t * dbuf, b; - isc_result_t result; - dns_rdataset_t * cloneset = NULL, *clonesigset = NULL; + dns_rdataset_t *sigrdataset) { + dns_name_t *name = NULL; + isc_buffer_t *dbuf, b; + isc_result_t result; + dns_rdataset_t *cloneset = NULL, *clonesigset = NULL; dns_rdataset_t **sigrdatasetp; CCTRACE(ISC_LOG_DEBUG(3), "query_synthwildcard"); @@ -8994,11 +8937,10 @@ cleanup: */ static isc_result_t query_synthcnamewildcard(query_ctx_t *qctx, dns_rdataset_t *rdataset, - dns_rdataset_t *sigrdataset) -{ - isc_result_t result; - dns_name_t * tname = NULL; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdataset_t *sigrdataset) { + isc_result_t result; + dns_name_t *tname = NULL; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_cname_t cname; result = query_synthwildcard(qctx, rdataset, sigrdataset); @@ -9052,12 +8994,11 @@ query_synthnxdomain(query_ctx_t *qctx, dns_name_t *nowild, dns_rdataset_t *nowildrdataset, dns_rdataset_t *signowildrdataset, dns_name_t *signer, dns_rdataset_t **soardatasetp, - dns_rdataset_t **sigsoardatasetp) -{ - dns_name_t * name = NULL; - dns_ttl_t ttl; - isc_buffer_t * dbuf, b; - isc_result_t result; + dns_rdataset_t **sigsoardatasetp) { + dns_name_t *name = NULL; + dns_ttl_t ttl; + isc_buffer_t *dbuf, b; + isc_result_t result; dns_rdataset_t *cloneset = NULL, *clonesigset = NULL; CCTRACE(ISC_LOG_DEBUG(3), "query_synthnxdomain"); @@ -9162,13 +9103,13 @@ cleanup: * Check that all signer names in sigrdataset match the expected signer. */ static isc_result_t -checksignames(dns_name_t *signer, dns_rdataset_t *sigrdataset) -{ +checksignames(dns_name_t *signer, dns_rdataset_t *sigrdataset) { isc_result_t result; for (result = dns_rdataset_first(sigrdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(sigrdataset)) { - dns_rdata_t rdata = DNS_RDATA_INIT; + result = dns_rdataset_next(sigrdataset)) + { + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_rrsig_t rrsig; dns_rdataset_current(sigrdataset, &rdata); @@ -9206,27 +9147,26 @@ checksignames(dns_name_t *signer, dns_rdataset_t *sigrdataset) * type at the wildcard name. */ static isc_result_t -query_coveringnsec(query_ctx_t *qctx) -{ - dns_db_t * db = NULL; - dns_clientinfo_t ci; +query_coveringnsec(query_ctx_t *qctx) { + dns_db_t *db = NULL; + dns_clientinfo_t ci; dns_clientinfomethods_t cm; - dns_dbnode_t * node = NULL; - dns_fixedname_t fixed; - dns_fixedname_t fnowild; - dns_fixedname_t fsigner; - dns_fixedname_t fwild; - dns_name_t * fname = NULL; - dns_name_t * nowild = NULL; - dns_name_t * signer = NULL; - dns_name_t * wild = NULL; - dns_rdataset_t * soardataset = NULL, *sigsoardataset = NULL; - dns_rdataset_t rdataset, sigrdataset; - bool done = false; - bool exists = true, data = true; - bool redirected = false; - isc_result_t result = ISC_R_SUCCESS; - unsigned int dboptions = qctx->client->query.dboptions; + dns_dbnode_t *node = NULL; + dns_fixedname_t fixed; + dns_fixedname_t fnowild; + dns_fixedname_t fsigner; + dns_fixedname_t fwild; + dns_name_t *fname = NULL; + dns_name_t *nowild = NULL; + dns_name_t *signer = NULL; + dns_name_t *wild = NULL; + dns_rdataset_t *soardataset = NULL, *sigsoardataset = NULL; + dns_rdataset_t rdataset, sigrdataset; + bool done = false; + bool exists = true, data = true; + bool redirected = false; + isc_result_t result = ISC_R_SUCCESS; + unsigned int dboptions = qctx->client->query.dboptions; CCTRACE(ISC_LOG_DEBUG(3), "query_coveringnsec"); @@ -9279,7 +9219,8 @@ query_coveringnsec(query_ctx_t *qctx) goto cleanup; } if (!qctx->resuming && !STALE(qctx->rdataset) && - qctx->rdataset->ttl == 0 && RECURSIONOK(qctx->client)) { + qctx->rdataset->ttl == 0 && RECURSIONOK(qctx->client)) + { goto cleanup; } @@ -9342,7 +9283,8 @@ query_coveringnsec(query_ctx_t *qctx) /* FALLTHROUGH */ case DNS_R_CNAME: if (!qctx->resuming && !STALE(&rdataset) && rdataset.ttl == 0 && - RECURSIONOK(qctx->client)) { + RECURSIONOK(qctx->client)) + { goto cleanup; } default: @@ -9474,8 +9416,7 @@ cleanup: * set to DNS_R_NXDOMAIN when handling DNS64 lookups.) */ static isc_result_t -query_ncache(query_ctx_t *qctx, isc_result_t result) -{ +query_ncache(query_ctx_t *qctx, isc_result_t result) { INSIST(!qctx->is_zone); INSIST(result == DNS_R_NCACHENXDOMAIN || result == DNS_R_NCACHENXRRSET || result == DNS_R_NXDOMAIN); @@ -9498,7 +9439,8 @@ query_ncache(query_ctx_t *qctx, isc_result_t result) /* Look for RFC 1918 leakage from Internet. */ if (qctx->qtype == dns_rdatatype_ptr && qctx->client->message->rdclass == dns_rdataclass_in && - dns_name_countlabels(qctx->fname) == 7) { + dns_name_countlabels(qctx->fname) == 7) + { warn_rfc1918(qctx->client, qctx->fname, qctx->rdataset); } } @@ -9513,14 +9455,14 @@ cleanup: * If we have a zero ttl from the cache, refetch. */ static isc_result_t -query_zerottl_refetch(query_ctx_t *qctx) -{ +query_zerottl_refetch(query_ctx_t *qctx) { isc_result_t result; CCTRACE(ISC_LOG_DEBUG(3), "query_zerottl_refetch"); if (qctx->is_zone || qctx->resuming || STALE(qctx->rdataset) || - qctx->rdataset->ttl != 0 || !RECURSIONOK(qctx->client)) { + qctx->rdataset->ttl != 0 || !RECURSIONOK(qctx->client)) + { return (ISC_R_COMPLETE); } @@ -9556,13 +9498,12 @@ cleanup: * Handle CNAME responses. */ static isc_result_t -query_cname(query_ctx_t *qctx) -{ - isc_result_t result; - dns_name_t * tname; - dns_rdataset_t * trdataset; - dns_rdataset_t ** sigrdatasetp = NULL; - dns_rdata_t rdata = DNS_RDATA_INIT; +query_cname(query_ctx_t *qctx) { + isc_result_t result; + dns_name_t *tname; + dns_rdataset_t *trdataset; + dns_rdataset_t **sigrdatasetp = NULL; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_cname_t cname; CCTRACE(ISC_LOG_DEBUG(3), "query_cname"); @@ -9589,7 +9530,8 @@ query_cname(query_ctx_t *qctx) } if (WANTDNSSEC(qctx->client) && - (qctx->fname->attributes & DNS_NAMEATTR_WILDCARD) != 0) { + (qctx->fname->attributes & DNS_NAMEATTR_WILDCARD) != 0) + { dns_fixedname_init(&qctx->wildcardname); dns_name_copynf(qctx->fname, dns_fixedname_name(&qctx->wildcardname)); @@ -9660,19 +9602,18 @@ cleanup: * Handle DNAME responses. */ static isc_result_t -query_dname(query_ctx_t *qctx) -{ - dns_name_t * tname, *prefix; - dns_rdata_t rdata = DNS_RDATA_INIT; +query_dname(query_ctx_t *qctx) { + dns_name_t *tname, *prefix; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_dname_t dname; - dns_fixedname_t fixed; - dns_rdataset_t * trdataset; - dns_rdataset_t ** sigrdatasetp = NULL; - dns_namereln_t namereln; - isc_buffer_t b; - int order; - isc_result_t result; - unsigned int nlabels; + dns_fixedname_t fixed; + dns_rdataset_t *trdataset; + dns_rdataset_t **sigrdatasetp = NULL; + dns_namereln_t namereln; + isc_buffer_t b; + int order; + isc_result_t result; + unsigned int nlabels; CCTRACE(ISC_LOG_DEBUG(3), "query_dname"); @@ -9702,7 +9643,8 @@ query_dname(query_ctx_t *qctx) } if (WANTDNSSEC(qctx->client) && - (qctx->fname->attributes & DNS_NAMEATTR_WILDCARD) != 0) { + (qctx->fname->attributes & DNS_NAMEATTR_WILDCARD) != 0) + { dns_fixedname_init(&qctx->wildcardname); dns_name_copynf(qctx->fname, dns_fixedname_name(&qctx->wildcardname)); @@ -9819,15 +9761,14 @@ cleanup: * Add CNAME to repsonse. */ static isc_result_t -query_addcname(query_ctx_t *qctx, dns_trust_t trust, dns_ttl_t ttl) -{ - ns_client_t * client = qctx->client; - dns_rdataset_t * rdataset = NULL; +query_addcname(query_ctx_t *qctx, dns_trust_t trust, dns_ttl_t ttl) { + ns_client_t *client = qctx->client; + dns_rdataset_t *rdataset = NULL; dns_rdatalist_t *rdatalist = NULL; - dns_rdata_t * rdata = NULL; - isc_region_t r; - dns_name_t * aname = NULL; - isc_result_t result; + dns_rdata_t *rdata = NULL; + isc_region_t r; + dns_name_t *aname = NULL; + isc_result_t result; result = dns_message_gettempname(client->message, &aname); if (result != ISC_R_SUCCESS) { @@ -9892,8 +9833,7 @@ query_addcname(query_ctx_t *qctx, dns_trust_t trust, dns_ttl_t ttl) * query_respond_any(). */ static isc_result_t -query_prepresponse(query_ctx_t *qctx) -{ +query_prepresponse(query_ctx_t *qctx) { isc_result_t result; CCTRACE(ISC_LOG_DEBUG(3), "query_prepresponse"); @@ -9901,7 +9841,8 @@ query_prepresponse(query_ctx_t *qctx) CALL_HOOK(NS_QUERY_PREP_RESPONSE_BEGIN, qctx); if (WANTDNSSEC(qctx->client) && - (qctx->fname->attributes & DNS_NAMEATTR_WILDCARD) != 0) { + (qctx->fname->attributes & DNS_NAMEATTR_WILDCARD) != 0) + { dns_fixedname_init(&qctx->wildcardname); dns_name_copynf(qctx->fname, dns_fixedname_name(&qctx->wildcardname)); @@ -9930,16 +9871,15 @@ cleanup: */ static isc_result_t query_addsoa(query_ctx_t *qctx, unsigned int override_ttl, - dns_section_t section) -{ - ns_client_t * client = qctx->client; - dns_name_t * name; - dns_dbnode_t * node; - isc_result_t result, eresult; - dns_rdataset_t * rdataset = NULL, *sigrdataset = NULL; - dns_rdataset_t ** sigrdatasetp = NULL; + dns_section_t section) { + ns_client_t *client = qctx->client; + dns_name_t *name; + dns_dbnode_t *node; + isc_result_t result, eresult; + dns_rdataset_t *rdataset = NULL, *sigrdataset = NULL; + dns_rdataset_t **sigrdatasetp = NULL; dns_clientinfomethods_t cm; - dns_clientinfo_t ci; + dns_clientinfo_t ci; CTRACE(ISC_LOG_DEBUG(3), "query_addsoa"); /* @@ -9957,8 +9897,8 @@ query_addsoa(query_ctx_t *qctx, unsigned int override_ttl, * Don't add the SOA record for test which set "-T nosoa". */ if (((client->sctx->options & NS_SERVER_NOSOA) != 0) && - (!WANTDNSSEC(client) || - !dns_rdataset_isassociated(qctx->rdataset))) { + (!WANTDNSSEC(client) || !dns_rdataset_isassociated(qctx->rdataset))) + { return (ISC_R_SUCCESS); } @@ -9996,7 +9936,7 @@ query_addsoa(query_ctx_t *qctx, unsigned int override_ttl, rdataset, sigrdataset); } else { dns_fixedname_t foundname; - dns_name_t * fname; + dns_name_t *fname; fname = dns_fixedname_initname(&foundname); @@ -10017,15 +9957,15 @@ query_addsoa(query_ctx_t *qctx, unsigned int override_ttl, * Extract the SOA MINIMUM. */ dns_rdata_soa_t soa; - dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_t rdata = DNS_RDATA_INIT; result = dns_rdataset_first(rdataset); RUNTIME_CHECK(result == ISC_R_SUCCESS); dns_rdataset_current(rdataset, &rdata); result = dns_rdata_tostruct(&rdata, &soa, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); - if (override_ttl != UINT32_MAX && - override_ttl < rdataset->ttl) { + if (override_ttl != UINT32_MAX && override_ttl < rdataset->ttl) + { rdataset->ttl = override_ttl; if (sigrdataset != NULL) { sigrdataset->ttl = override_ttl; @@ -10075,17 +10015,16 @@ cleanup: * Add NS to authority section (used when the zone apex is already known). */ static isc_result_t -query_addns(query_ctx_t *qctx) -{ - ns_client_t * client = qctx->client; - isc_result_t result, eresult; - dns_name_t * name = NULL, *fname; - dns_dbnode_t * node = NULL; - dns_fixedname_t foundname; - dns_rdataset_t * rdataset = NULL, *sigrdataset = NULL; - dns_rdataset_t ** sigrdatasetp = NULL; +query_addns(query_ctx_t *qctx) { + ns_client_t *client = qctx->client; + isc_result_t result, eresult; + dns_name_t *name = NULL, *fname; + dns_dbnode_t *node = NULL; + dns_fixedname_t foundname; + dns_rdataset_t *rdataset = NULL, *sigrdataset = NULL; + dns_rdataset_t **sigrdatasetp = NULL; dns_clientinfomethods_t cm; - dns_clientinfo_t ci; + dns_clientinfo_t ci; CTRACE(ISC_LOG_DEBUG(3), "query_addns"); @@ -10180,22 +10119,21 @@ cleanup: * Find the zone cut and add the best NS rrset to the authority section. */ static void -query_addbestns(query_ctx_t *qctx) -{ - ns_client_t * client = qctx->client; - dns_db_t * db = NULL, *zdb = NULL; - dns_dbnode_t * node = NULL; - dns_name_t * fname = NULL, *zfname = NULL; - dns_rdataset_t * rdataset = NULL, *sigrdataset = NULL; - dns_rdataset_t * zrdataset = NULL, *zsigrdataset = NULL; - bool is_zone = false, use_zone = false; - isc_buffer_t * dbuf = NULL; - isc_result_t result; - dns_dbversion_t * version = NULL; - dns_zone_t * zone = NULL; - isc_buffer_t b; +query_addbestns(query_ctx_t *qctx) { + ns_client_t *client = qctx->client; + dns_db_t *db = NULL, *zdb = NULL; + dns_dbnode_t *node = NULL; + dns_name_t *fname = NULL, *zfname = NULL; + dns_rdataset_t *rdataset = NULL, *sigrdataset = NULL; + dns_rdataset_t *zrdataset = NULL, *zsigrdataset = NULL; + bool is_zone = false, use_zone = false; + isc_buffer_t *dbuf = NULL; + isc_result_t result; + dns_dbversion_t *version = NULL; + dns_zone_t *zone = NULL; + isc_buffer_t b; dns_clientinfomethods_t cm; - dns_clientinfo_t ci; + dns_clientinfo_t ci; CTRACE(ISC_LOG_DEBUG(3), "query_addbestns"); @@ -10314,14 +10252,16 @@ db_find: if ((DNS_TRUST_PENDING(rdataset->trust) || (sigrdataset != NULL && DNS_TRUST_PENDING(sigrdataset->trust))) && !validate(client, db, fname, rdataset, sigrdataset) && - !PENDINGOK(client->query.dboptions)) { + !PENDINGOK(client->query.dboptions)) + { goto cleanup; } if ((DNS_TRUST_GLUE(rdataset->trust) || (sigrdataset != NULL && DNS_TRUST_GLUE(sigrdataset->trust))) && !validate(client, db, fname, rdataset, sigrdataset) && - SECURE(client) && WANTDNSSEC(client)) { + SECURE(client) && WANTDNSSEC(client)) + { goto cleanup; } @@ -10331,7 +10271,8 @@ db_find: */ if (SECURE(client) && (WANTDNSSEC(client) || WANTAD(client)) && ((rdataset->trust != dns_trust_secure) || - (sigrdataset != NULL && sigrdataset->trust != dns_trust_secure))) { + (sigrdataset != NULL && sigrdataset->trust != dns_trust_secure))) + { goto cleanup; } @@ -10378,27 +10319,26 @@ cleanup: } static void -query_addwildcardproof(query_ctx_t *qctx, bool ispositive, bool nodata) -{ - ns_client_t * client = qctx->client; - isc_buffer_t * dbuf, b; - dns_name_t * name; - dns_name_t * fname = NULL; - dns_rdataset_t * rdataset = NULL, *sigrdataset = NULL; - dns_fixedname_t wfixed; - dns_name_t * wname; - dns_dbnode_t * node = NULL; - unsigned int options; - unsigned int olabels, nlabels, labels; - isc_result_t result; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_rdata_nsec_t nsec; - bool have_wname; - int order; - dns_fixedname_t cfixed; - dns_name_t * cname; +query_addwildcardproof(query_ctx_t *qctx, bool ispositive, bool nodata) { + ns_client_t *client = qctx->client; + isc_buffer_t *dbuf, b; + dns_name_t *name; + dns_name_t *fname = NULL; + dns_rdataset_t *rdataset = NULL, *sigrdataset = NULL; + dns_fixedname_t wfixed; + dns_name_t *wname; + dns_dbnode_t *node = NULL; + unsigned int options; + unsigned int olabels, nlabels, labels; + isc_result_t result; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_rdata_nsec_t nsec; + bool have_wname; + int order; + dns_fixedname_t cfixed; + dns_name_t *cname; dns_clientinfomethods_t cm; - dns_clientinfo_t ci; + dns_clientinfo_t ci; CTRACE(ISC_LOG_DEBUG(3), "query_addwildcardproof"); @@ -10683,8 +10623,7 @@ cleanup: * to the authority section. */ static void -query_addauth(query_ctx_t *qctx) -{ +query_addauth(query_ctx_t *qctx) { CCTRACE(ISC_LOG_DEBUG(3), "query_addauth"); /* * Add NS records to the authority section (if we haven't already @@ -10720,8 +10659,7 @@ query_addauth(query_ctx_t *qctx) * sortlist statement. */ static int -query_sortlist_order_2element(const dns_rdata_t *rdata, const void *arg) -{ +query_sortlist_order_2element(const dns_rdata_t *rdata, const void *arg) { isc_netaddr_t netaddr; if (rdata_tonetaddr(rdata, &netaddr) != ISC_R_SUCCESS) { @@ -10735,8 +10673,7 @@ query_sortlist_order_2element(const dns_rdata_t *rdata, const void *arg) * of a 1-element top-level sortlist statement. */ static int -query_sortlist_order_1element(const dns_rdata_t *rdata, const void *arg) -{ +query_sortlist_order_1element(const dns_rdata_t *rdata, const void *arg) { isc_netaddr_t netaddr; if (rdata_tonetaddr(rdata, &netaddr) != ISC_R_SUCCESS) { @@ -10750,10 +10687,9 @@ query_sortlist_order_1element(const dns_rdata_t *rdata, const void *arg) * the sortlist info in in client->message appropriately. */ static void -query_setup_sortlist(query_ctx_t *qctx) -{ +query_setup_sortlist(query_ctx_t *qctx) { isc_netaddr_t netaddr; - ns_client_t * client = qctx->client; + ns_client_t *client = qctx->client; dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->manager->interface->mgr); const void *order_arg = NULL; @@ -10784,28 +10720,30 @@ query_setup_sortlist(query_ctx_t *qctx) * in the glue, sort it to the start of the additional section. */ static inline void -query_glueanswer(query_ctx_t *qctx) -{ +query_glueanswer(query_ctx_t *qctx) { const dns_namelist_t *secs = qctx->client->message->sections; - const dns_section_t section = DNS_SECTION_ADDITIONAL; - dns_name_t * name; - dns_message_t * msg; - dns_rdataset_t * rdataset = NULL; + const dns_section_t section = DNS_SECTION_ADDITIONAL; + dns_name_t *name; + dns_message_t *msg; + dns_rdataset_t *rdataset = NULL; if (!ISC_LIST_EMPTY(secs[DNS_SECTION_ANSWER]) || qctx->client->message->rcode != dns_rcode_noerror || (qctx->qtype != dns_rdatatype_a && - qctx->qtype != dns_rdatatype_aaaa)) { + qctx->qtype != dns_rdatatype_aaaa)) + { return; } msg = qctx->client->message; for (name = ISC_LIST_HEAD(msg->sections[section]); name != NULL; - name = ISC_LIST_NEXT(name, link)) { + name = ISC_LIST_NEXT(name, link)) + { if (dns_name_equal(name, qctx->client->query.qname)) { for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (rdataset->type == qctx->qtype) { break; } @@ -10823,9 +10761,8 @@ query_glueanswer(query_ctx_t *qctx) } isc_result_t -ns_query_done(query_ctx_t *qctx) -{ - isc_result_t result; +ns_query_done(query_ctx_t *qctx) { + isc_result_t result; const dns_namelist_t *secs = qctx->client->message->sections; CCTRACE(ISC_LOG_DEBUG(3), "ns_query_done"); @@ -10866,7 +10803,8 @@ ns_query_done(query_ctx_t *qctx) if (qctx->result != ISC_R_SUCCESS && (!PARTIALANSWER(qctx->client) || WANTRECURSION(qctx->client) || - qctx->result == DNS_R_DROP)) { + qctx->result == DNS_R_DROP)) + { if (qctx->result == DNS_R_DUPLICATE || qctx->result == DNS_R_DROP) { /* @@ -10909,7 +10847,8 @@ ns_query_done(query_ctx_t *qctx) query_glueanswer(qctx); if (qctx->client->message->rcode == dns_rcode_nxdomain && - qctx->view->auth_nxdomain == true) { + qctx->view->auth_nxdomain == true) + { qctx->client->message->flags |= DNS_MESSAGEFLAG_AA; } @@ -10920,7 +10859,8 @@ ns_query_done(query_ctx_t *qctx) */ if (qctx->resuming && (ISC_LIST_EMPTY(secs[DNS_SECTION_ANSWER]) || - qctx->client->message->rcode != dns_rcode_noerror)) { + qctx->client->message->rcode != dns_rcode_noerror)) + { qctx->result = ISC_R_FAILURE; } @@ -10936,14 +10876,13 @@ cleanup: } static inline void -log_tat(ns_client_t *client) -{ - char namebuf[DNS_NAME_FORMATSIZE]; - char clientbuf[ISC_NETADDR_FORMATSIZE]; - char classbuf[DNS_RDATACLASS_FORMATSIZE]; +log_tat(ns_client_t *client) { + char namebuf[DNS_NAME_FORMATSIZE]; + char clientbuf[ISC_NETADDR_FORMATSIZE]; + char classbuf[DNS_RDATACLASS_FORMATSIZE]; isc_netaddr_t netaddr; - char * tags = NULL; - size_t taglen = 0; + char *tags = NULL; + size_t taglen = 0; if (!isc_log_wouldlog(ns_lctx, ISC_LOG_INFO)) { return; @@ -10952,7 +10891,8 @@ log_tat(ns_client_t *client) if ((client->query.qtype != dns_rdatatype_null || !dns_name_istat(client->query.qname)) && (client->keytag == NULL || - client->query.qtype != dns_rdatatype_dnskey)) { + client->query.qtype != dns_rdatatype_dnskey)) + { return; } @@ -10964,14 +10904,14 @@ log_tat(ns_client_t *client) if (client->query.qtype == dns_rdatatype_dnskey) { uint16_t keytags = client->keytag_len / 2; - size_t len = taglen = sizeof("65000") * keytags + 1; - char * cp = tags = isc_mem_get(client->mctx, taglen); - int i = 0; + size_t len = taglen = sizeof("65000") * keytags + 1; + char *cp = tags = isc_mem_get(client->mctx, taglen); + int i = 0; INSIST(client->keytag != NULL); if (tags != NULL) { while (keytags-- > 0U) { - int n; + int n; uint16_t keytag; keytag = (client->keytag[i * 2] << 8) | client->keytag[i * 2 + 1]; @@ -10996,8 +10936,7 @@ log_tat(ns_client_t *client) } static inline void -log_query(ns_client_t *client, unsigned int flags, unsigned int extflags) -{ +log_query(ns_client_t *client, unsigned int flags, unsigned int extflags) { char namebuf[DNS_NAME_FORMATSIZE]; char typebuf[DNS_RDATATYPE_FORMATSIZE]; char classbuf[DNS_RDATACLASS_FORMATSIZE]; @@ -11005,7 +10944,7 @@ log_query(ns_client_t *client, unsigned int flags, unsigned int extflags) char ecsbuf[DNS_ECS_FORMATSIZE + sizeof(" [ECS ]") - 1] = { 0 }; char ednsbuf[sizeof("E(65535)")] = { 0 }; dns_rdataset_t *rdataset; - int level = ISC_LOG_INFO; + int level = ISC_LOG_INFO; if (!isc_log_wouldlog(ns_lctx, level)) { return; @@ -11041,12 +10980,11 @@ log_query(ns_client_t *client, unsigned int flags, unsigned int extflags) } static inline void -log_queryerror(ns_client_t *client, isc_result_t result, int line, int level) -{ - char namebuf[DNS_NAME_FORMATSIZE]; - char typebuf[DNS_RDATATYPE_FORMATSIZE]; - char classbuf[DNS_RDATACLASS_FORMATSIZE]; - const char * namep, *typep, *classp, *sep1, *sep2; +log_queryerror(ns_client_t *client, isc_result_t result, int line, int level) { + char namebuf[DNS_NAME_FORMATSIZE]; + char typebuf[DNS_RDATATYPE_FORMATSIZE]; + char classbuf[DNS_RDATACLASS_FORMATSIZE]; + const char *namep, *typep, *classp, *sep1, *sep2; dns_rdataset_t *rdataset; if (!isc_log_wouldlog(ns_lctx, level)) { @@ -11085,14 +11023,13 @@ log_queryerror(ns_client_t *client, isc_result_t result, int line, int level) } void -ns_query_start(ns_client_t *client) -{ - isc_result_t result; - dns_message_t * message; +ns_query_start(ns_client_t *client) { + isc_result_t result; + dns_message_t *message; dns_rdataset_t *rdataset; dns_rdatatype_t qtype; - unsigned int saved_extflags; - unsigned int saved_flags; + unsigned int saved_extflags; + unsigned int saved_flags; REQUIRE(NS_CLIENT_VALID(client)); @@ -11119,8 +11056,8 @@ ns_query_start(ns_client_t *client) case dns_minimal_no: break; case dns_minimal_yes: - client->query.attributes |= - (NS_QUERYATTR_NOAUTHORITY | NS_QUERYATTR_NOADDITIONAL); + client->query.attributes |= (NS_QUERYATTR_NOAUTHORITY | + NS_QUERYATTR_NOADDITIONAL); break; case dns_minimal_noauth: client->query.attributes |= NS_QUERYATTR_NOAUTHORITY; @@ -11137,11 +11074,12 @@ ns_query_start(ns_client_t *client) * We don't have a cache. Turn off cache support and * recursion. */ - client->query.attributes &= - ~(NS_QUERYATTR_RECURSIONOK | NS_QUERYATTR_CACHEOK); + client->query.attributes &= ~(NS_QUERYATTR_RECURSIONOK | + NS_QUERYATTR_CACHEOK); client->attributes |= NS_CLIENTATTR_NOSETFC; } else if ((client->attributes & NS_CLIENTATTR_RA) == 0 || - (message->flags & DNS_MESSAGEFLAG_RD) == 0) { + (message->flags & DNS_MESSAGEFLAG_RD) == 0) + { /* * If the client isn't allowed to recurse (due to * "recursion no", the allow-recursion ACL, or the @@ -11231,9 +11169,10 @@ ns_query_start(ns_client_t *client) * Turn on minimal response for (C)DNSKEY and (C)DS queries. */ if (qtype == dns_rdatatype_dnskey || qtype == dns_rdatatype_ds || - qtype == dns_rdatatype_cdnskey || qtype == dns_rdatatype_cds) { - client->query.attributes |= - (NS_QUERYATTR_NOAUTHORITY | NS_QUERYATTR_NOADDITIONAL); + qtype == dns_rdatatype_cdnskey || qtype == dns_rdatatype_cds) + { + client->query.attributes |= (NS_QUERYATTR_NOAUTHORITY | + NS_QUERYATTR_NOADDITIONAL); } /* @@ -11241,17 +11180,17 @@ ns_query_start(ns_client_t *client) */ if (qtype == dns_rdatatype_any && client->view->minimal_any && !TCP(client)) { - client->query.attributes |= - (NS_QUERYATTR_NOAUTHORITY | NS_QUERYATTR_NOADDITIONAL); + client->query.attributes |= (NS_QUERYATTR_NOAUTHORITY | + NS_QUERYATTR_NOADDITIONAL); } /* * Turn on minimal responses for EDNS/UDP bufsize 512 queries. */ - if (client->ednsversion >= 0 && client->udpsize <= 512U && - !TCP(client)) { - client->query.attributes |= - (NS_QUERYATTR_NOAUTHORITY | NS_QUERYATTR_NOADDITIONAL); + if (client->ednsversion >= 0 && client->udpsize <= 512U && !TCP(client)) + { + client->query.attributes |= (NS_QUERYATTR_NOAUTHORITY | + NS_QUERYATTR_NOADDITIONAL); } /* diff --git a/lib/ns/server.c b/lib/ns/server.c index c2ce5dfd03..60c59198c3 100644 --- a/lib/ns/server.c +++ b/lib/ns/server.c @@ -24,7 +24,7 @@ #include #include -#define SCTX_MAGIC ISC_MAGIC('S', 'c', 't', 'x') +#define SCTX_MAGIC ISC_MAGIC('S', 'c', 't', 'x') #define SCTX_VALID(s) ISC_MAGIC_VALID(s, SCTX_MAGIC) #define CHECKFATAL(op) \ @@ -35,8 +35,7 @@ isc_result_t ns_server_create(isc_mem_t *mctx, ns_matchview_t matchingview, - ns_server_t **sctxp) -{ + ns_server_t **sctxp) { ns_server_t *sctx; isc_result_t result; @@ -107,8 +106,7 @@ ns_server_create(isc_mem_t *mctx, ns_matchview_t matchingview, } void -ns_server_attach(ns_server_t *src, ns_server_t **dest) -{ +ns_server_attach(ns_server_t *src, ns_server_t **dest) { REQUIRE(SCTX_VALID(src)); REQUIRE(dest != NULL && *dest == NULL); @@ -118,8 +116,7 @@ ns_server_attach(ns_server_t *src, ns_server_t **dest) } void -ns_server_detach(ns_server_t **sctxp) -{ +ns_server_detach(ns_server_t **sctxp) { ns_server_t *sctx; REQUIRE(sctxp != NULL && SCTX_VALID(*sctxp)); @@ -199,8 +196,7 @@ ns_server_detach(ns_server_t **sctxp) } isc_result_t -ns_server_setserverid(ns_server_t *sctx, const char *serverid) -{ +ns_server_setserverid(ns_server_t *sctx, const char *serverid) { REQUIRE(SCTX_VALID(sctx)); if (sctx->server_id != NULL) { @@ -216,8 +212,7 @@ ns_server_setserverid(ns_server_t *sctx, const char *serverid) } void -ns_server_setoption(ns_server_t *sctx, unsigned int option, bool value) -{ +ns_server_setoption(ns_server_t *sctx, unsigned int option, bool value) { REQUIRE(SCTX_VALID(sctx)); if (value) { sctx->options |= option; @@ -227,8 +222,7 @@ ns_server_setoption(ns_server_t *sctx, unsigned int option, bool value) } bool -ns_server_getoption(ns_server_t *sctx, unsigned int option) -{ +ns_server_getoption(ns_server_t *sctx, unsigned int option) { REQUIRE(SCTX_VALID(sctx)); return ((sctx->options & option) != 0); diff --git a/lib/ns/sortlist.c b/lib/ns/sortlist.c index ba7fc1d8e5..0056f09fc1 100644 --- a/lib/ns/sortlist.c +++ b/lib/ns/sortlist.c @@ -23,8 +23,7 @@ ns_sortlisttype_t ns_sortlist_setup(dns_acl_t *acl, dns_aclenv_t *env, isc_netaddr_t *clientaddr, - const void **argp) -{ + const void **argp) { unsigned int i; if (acl == NULL) { @@ -36,9 +35,9 @@ ns_sortlist_setup(dns_acl_t *acl, dns_aclenv_t *env, isc_netaddr_t *clientaddr, * 'e' refers to the current 'top level statement' * in the sortlist (see ARM). */ - dns_aclelement_t * e = &acl->elements[i]; - dns_aclelement_t * try_elt; - dns_aclelement_t * order_elt = NULL; + dns_aclelement_t *e = &acl->elements[i]; + dns_aclelement_t *try_elt; + dns_aclelement_t *order_elt = NULL; const dns_aclelement_t *matched_elt = NULL; if (e->type == dns_aclelementtype_nestedacl) { @@ -73,12 +72,14 @@ ns_sortlist_setup(dns_acl_t *acl, dns_aclenv_t *env, isc_netaddr_t *clientaddr, return (NS_SORTLISTTYPE_2ELEMENT); } else if (order_elt->type == dns_aclelementtype_localhost && - env->localhost != NULL) { + env->localhost != NULL) + { *argp = env->localhost; return (NS_SORTLISTTYPE_2ELEMENT); } else if (order_elt->type == dns_aclelementtype_localnets && - env->localnets != NULL) { + env->localnets != NULL) + { *argp = env->localnets; return (NS_SORTLISTTYPE_2ELEMENT); } else { @@ -105,12 +106,11 @@ dont_sort: } int -ns_sortlist_addrorder2(const isc_netaddr_t *addr, const void *arg) -{ +ns_sortlist_addrorder2(const isc_netaddr_t *addr, const void *arg) { const dns_sortlist_arg_t *sla = (const dns_sortlist_arg_t *)arg; - const dns_aclenv_t * env = sla->env; - const dns_acl_t * sortacl = sla->acl; - int match; + const dns_aclenv_t *env = sla->env; + const dns_acl_t *sortacl = sla->acl; + int match; (void)dns_acl_match(addr, NULL, sortacl, env, &match, NULL); if (match > 0) { @@ -123,11 +123,10 @@ ns_sortlist_addrorder2(const isc_netaddr_t *addr, const void *arg) } int -ns_sortlist_addrorder1(const isc_netaddr_t *addr, const void *arg) -{ +ns_sortlist_addrorder1(const isc_netaddr_t *addr, const void *arg) { const dns_sortlist_arg_t *sla = (const dns_sortlist_arg_t *)arg; - const dns_aclenv_t * env = sla->env; - const dns_aclelement_t * element = sla->element; + const dns_aclenv_t *env = sla->env; + const dns_aclelement_t *element = sla->element; if (dns_aclelement_match(addr, NULL, element, env, NULL)) { return (0); @@ -138,9 +137,8 @@ ns_sortlist_addrorder1(const isc_netaddr_t *addr, const void *arg) void ns_sortlist_byaddrsetup(dns_acl_t *sortlist_acl, dns_aclenv_t *env, - isc_netaddr_t * client_addr, - dns_addressorderfunc_t *orderp, const void **argp) -{ + isc_netaddr_t *client_addr, + dns_addressorderfunc_t *orderp, const void **argp) { ns_sortlisttype_t sortlisttype; sortlisttype = ns_sortlist_setup(sortlist_acl, env, client_addr, argp); diff --git a/lib/ns/stats.c b/lib/ns/stats.c index f62a030dae..8e924aa8f9 100644 --- a/lib/ns/stats.c +++ b/lib/ns/stats.c @@ -19,20 +19,19 @@ #include -#define NS_STATS_MAGIC ISC_MAGIC('N', 's', 't', 't') +#define NS_STATS_MAGIC ISC_MAGIC('N', 's', 't', 't') #define NS_STATS_VALID(x) ISC_MAGIC_VALID(x, NS_STATS_MAGIC) struct ns_stats { /*% Unlocked */ - unsigned int magic; - isc_mem_t * mctx; - isc_stats_t * counters; + unsigned int magic; + isc_mem_t *mctx; + isc_stats_t *counters; isc_refcount_t references; }; void -ns_stats_attach(ns_stats_t *stats, ns_stats_t **statsp) -{ +ns_stats_attach(ns_stats_t *stats, ns_stats_t **statsp) { REQUIRE(NS_STATS_VALID(stats)); REQUIRE(statsp != NULL && *statsp == NULL); @@ -42,8 +41,7 @@ ns_stats_attach(ns_stats_t *stats, ns_stats_t **statsp) } void -ns_stats_detach(ns_stats_t **statsp) -{ +ns_stats_detach(ns_stats_t **statsp) { ns_stats_t *stats; REQUIRE(statsp != NULL && NS_STATS_VALID(*statsp)); @@ -59,9 +57,8 @@ ns_stats_detach(ns_stats_t **statsp) } isc_result_t -ns_stats_create(isc_mem_t *mctx, int ncounters, ns_stats_t **statsp) -{ - ns_stats_t * stats; +ns_stats_create(isc_mem_t *mctx, int ncounters, ns_stats_t **statsp) { + ns_stats_t *stats; isc_result_t result; REQUIRE(statsp != NULL && *statsp == NULL); @@ -93,24 +90,21 @@ clean_mem: * Increment/Decrement methods */ void -ns_stats_increment(ns_stats_t *stats, isc_statscounter_t counter) -{ +ns_stats_increment(ns_stats_t *stats, isc_statscounter_t counter) { REQUIRE(NS_STATS_VALID(stats)); isc_stats_increment(stats->counters, counter); } void -ns_stats_decrement(ns_stats_t *stats, isc_statscounter_t counter) -{ +ns_stats_decrement(ns_stats_t *stats, isc_statscounter_t counter) { REQUIRE(NS_STATS_VALID(stats)); isc_stats_decrement(stats->counters, counter); } isc_stats_t * -ns_stats_get(ns_stats_t *stats) -{ +ns_stats_get(ns_stats_t *stats) { REQUIRE(NS_STATS_VALID(stats)); return (stats->counters); @@ -118,16 +112,14 @@ ns_stats_get(ns_stats_t *stats) void ns_stats_update_if_greater(ns_stats_t *stats, isc_statscounter_t counter, - isc_statscounter_t value) -{ + isc_statscounter_t value) { REQUIRE(NS_STATS_VALID(stats)); isc_stats_update_if_greater(stats->counters, counter, value); } isc_statscounter_t -ns_stats_get_counter(ns_stats_t *stats, isc_statscounter_t counter) -{ +ns_stats_get_counter(ns_stats_t *stats, isc_statscounter_t counter) { REQUIRE(NS_STATS_VALID(stats)); return (isc_stats_get_counter(stats->counters, counter)); diff --git a/lib/ns/tests/listenlist_test.c b/lib/ns/tests/listenlist_test.c index d0fa960833..fc60997d3c 100644 --- a/lib/ns/tests/listenlist_test.c +++ b/lib/ns/tests/listenlist_test.c @@ -36,8 +36,7 @@ #include "nstest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -49,8 +48,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); ns_test_end(); @@ -60,13 +58,12 @@ _teardown(void **state) /* test that ns_listenlist_default() works */ static void -ns_listenlist_default_test(void **state) -{ - isc_result_t result; - in_port_t port = 5300 + isc_random8(); +ns_listenlist_default_test(void **state) { + isc_result_t result; + in_port_t port = 5300 + isc_random8(); ns_listenlist_t *list = NULL; - ns_listenelt_t * elt; - int count; + ns_listenelt_t *elt; + int count; UNUSED(state); @@ -80,7 +77,7 @@ ns_listenlist_default_test(void **state) elt = ISC_LIST_HEAD(list->elts); while (elt != NULL) { ns_listenelt_t *next = ISC_LIST_NEXT(elt, link); - dns_acl_t * acl = NULL; + dns_acl_t *acl = NULL; dns_acl_attach(elt->acl, &acl); ISC_LIST_UNLINK(list->elts, elt, link); @@ -118,8 +115,7 @@ ns_listenlist_default_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(ns_listenlist_default_test, _setup, _teardown), @@ -133,8 +129,7 @@ main(void) #include int -main(void) -{ +main(void) { #if __SANITIZE_ADDRESS__ /* * We disable this test when the address sanitizer is in diff --git a/lib/ns/tests/notify_test.c b/lib/ns/tests/notify_test.c index 37ad0e47bf..cac2bd14ac 100644 --- a/lib/ns/tests/notify_test.c +++ b/lib/ns/tests/notify_test.c @@ -40,8 +40,7 @@ #if defined(USE_LIBTOOL) || LD_WRAP static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -53,8 +52,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); ns_test_end(); @@ -63,12 +61,11 @@ _teardown(void **state) } static void -check_response(isc_buffer_t *buf) -{ - isc_result_t result; +check_response(isc_buffer_t *buf) { + isc_result_t result; dns_message_t *message = NULL; - char rcodebuf[20]; - isc_buffer_t b; + char rcodebuf[20]; + isc_buffer_t b; result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &message); assert_int_equal(result, ISC_R_SUCCESS); @@ -87,14 +84,13 @@ check_response(isc_buffer_t *buf) /* test ns_notify_start() */ static void -notify_start(void **state) -{ - isc_result_t result; - ns_client_t * client = NULL; +notify_start(void **state) { + isc_result_t result; + ns_client_t *client = NULL; dns_message_t *nmsg = NULL; - unsigned char ndata[4096]; - isc_buffer_t nbuf; - size_t nsize; + unsigned char ndata[4096]; + isc_buffer_t nbuf; + size_t nsize; UNUSED(state); @@ -146,8 +142,7 @@ notify_start(void **state) #endif /* if defined(USE_LIBTOOL) || LD_WRAP */ int -main(void) -{ +main(void) { #if defined(USE_LIBTOOL) || LD_WRAP const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(notify_start, _setup, @@ -164,8 +159,7 @@ main(void) #include int -main(void) -{ +main(void) { #if __SANITIZE_ADDRESS__ /* * We disable this test when the address sanitizer is in diff --git a/lib/ns/tests/nstest.c b/lib/ns/tests/nstest.c index ab26b6fc08..c7d46ae144 100644 --- a/lib/ns/tests/nstest.c +++ b/lib/ns/tests/nstest.c @@ -50,21 +50,21 @@ #include #include -isc_mem_t * mctx = NULL; -isc_log_t * lctx = NULL; -isc_taskmgr_t * taskmgr = NULL; -isc_task_t * maintask = NULL; -isc_timermgr_t * timermgr = NULL; -isc_socketmgr_t * socketmgr = NULL; -isc_nm_t * nm = NULL; -dns_zonemgr_t * zonemgr = NULL; +isc_mem_t *mctx = NULL; +isc_log_t *lctx = NULL; +isc_taskmgr_t *taskmgr = NULL; +isc_task_t *maintask = NULL; +isc_timermgr_t *timermgr = NULL; +isc_socketmgr_t *socketmgr = NULL; +isc_nm_t *nm = NULL; +dns_zonemgr_t *zonemgr = NULL; dns_dispatchmgr_t *dispatchmgr = NULL; -ns_clientmgr_t * clientmgr = NULL; +ns_clientmgr_t *clientmgr = NULL; ns_interfacemgr_t *interfacemgr = NULL; -ns_server_t * sctx = NULL; -bool app_running = false; -int ncpus; -bool debug_mem_record = true; +ns_server_t *sctx = NULL; +bool app_running = false; +int ncpus; +bool debug_mem_record = true; static atomic_bool run_managers = ATOMIC_VAR_INIT(false); static bool dst_active = false; @@ -76,16 +76,14 @@ static dns_zone_t *served_zone = NULL; * We don't want to use netmgr-based client accounting, we need to emulate it. */ atomic_uint_fast32_t client_refs[32]; -atomic_uintptr_t client_addrs[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) -{ +__wrap_isc_nmhandle_unref(isc_nmhandle_t *handle) { ns_client_t *client = (ns_client_t *)handle; - int i; + int i; for (i = 0; i < 32; i++) { if (atomic_load(&client_addrs[i]) == (uintptr_t)client) { @@ -120,8 +118,7 @@ static isc_logcategory_t categories[] = { { "", 0 }, static isc_result_t matchview(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr, dns_message_t *message, dns_aclenv_t *env, isc_result_t *sigresultp, - dns_view_t **viewp) -{ + dns_view_t **viewp) { UNUSED(srcaddr); UNUSED(destaddr); UNUSED(message); @@ -137,8 +134,7 @@ matchview(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr, */ static atomic_bool shutdown_done = ATOMIC_VAR_INIT(false); static void -shutdown_managers(isc_task_t *task, isc_event_t *event) -{ +shutdown_managers(isc_task_t *task, isc_event_t *event) { UNUSED(task); if (interfacemgr != NULL) { @@ -157,8 +153,7 @@ shutdown_managers(isc_task_t *task, isc_event_t *event) } static void -cleanup_managers(void) -{ +cleanup_managers(void) { atomic_store(&shutdown_done, false); if (maintask != NULL) { @@ -206,8 +201,7 @@ cleanup_managers(void) } static void -scan_interfaces(isc_task_t *task, isc_event_t *event) -{ +scan_interfaces(isc_task_t *task, isc_event_t *event) { UNUSED(task); ns_interfacemgr_scan(interfacemgr, true); @@ -215,12 +209,11 @@ scan_interfaces(isc_task_t *task, isc_event_t *event) } static isc_result_t -create_managers(void) -{ - isc_result_t result; - in_port_t port = 5300 + isc_random8(); +create_managers(void) { + isc_result_t result; + in_port_t port = 5300 + isc_random8(); ns_listenlist_t *listenon = NULL; - isc_event_t * event = NULL; + isc_event_t *event = NULL; ncpus = isc_os_ncpus(); CHECK(isc_taskmgr_create(mctx, ncpus, 0, NULL, &taskmgr)); @@ -269,8 +262,7 @@ cleanup: } isc_result_t -ns_test_begin(FILE *logfile, bool start_managers) -{ +ns_test_begin(FILE *logfile, bool start_managers) { isc_result_t result; INSIST(!test_running); @@ -293,7 +285,7 @@ ns_test_begin(FILE *logfile, bool start_managers) if (logfile != NULL) { isc_logdestination_t destination; - isc_logconfig_t * logconfig = NULL; + isc_logconfig_t *logconfig = NULL; INSIST(lctx == NULL); CHECK(isc_log_create(mctx, &lctx, &logconfig)); @@ -336,8 +328,7 @@ cleanup: } void -ns_test_end(void) -{ +ns_test_end(void) { cleanup_managers(); dst_lib_destroy(); @@ -355,10 +346,9 @@ ns_test_end(void) } isc_result_t -ns_test_makeview(const char *name, bool with_cache, dns_view_t **viewp) -{ +ns_test_makeview(const char *name, bool with_cache, dns_view_t **viewp) { dns_cache_t *cache = NULL; - dns_view_t * view = NULL; + dns_view_t *view = NULL; isc_result_t result; CHECK(dns_view_create(mctx, dns_rdataclass_in, name, &view)); @@ -399,13 +389,12 @@ cleanup: */ isc_result_t ns_test_makezone(const char *name, dns_zone_t **zonep, dns_view_t *view, - bool keepview) -{ - isc_result_t result; - dns_zone_t * zone = NULL; - isc_buffer_t buffer; + bool keepview) { + isc_result_t result; + dns_zone_t *zone = NULL; + isc_buffer_t buffer; dns_fixedname_t fixorigin; - dns_name_t * origin; + dns_name_t *origin; if (view == NULL) { CHECK(dns_view_create(mctx, dns_rdataclass_in, "view", &view)); @@ -447,8 +436,7 @@ cleanup: } isc_result_t -ns_test_setupzonemgr(void) -{ +ns_test_setupzonemgr(void) { isc_result_t result; REQUIRE(zonemgr == NULL); @@ -458,8 +446,7 @@ ns_test_setupzonemgr(void) } isc_result_t -ns_test_managezone(dns_zone_t *zone) -{ +ns_test_managezone(dns_zone_t *zone) { isc_result_t result; REQUIRE(zonemgr != NULL); @@ -473,15 +460,13 @@ ns_test_managezone(dns_zone_t *zone) } void -ns_test_releasezone(dns_zone_t *zone) -{ +ns_test_releasezone(dns_zone_t *zone) { REQUIRE(zonemgr != NULL); dns_zonemgr_releasezone(zonemgr, zone); } void -ns_test_closezonemgr(void) -{ +ns_test_closezonemgr(void) { REQUIRE(zonemgr != NULL); dns_zonemgr_shutdown(zonemgr); @@ -489,10 +474,10 @@ ns_test_closezonemgr(void) } isc_result_t -ns_test_serve_zone(const char *zonename, const char *filename, dns_view_t *view) -{ +ns_test_serve_zone(const char *zonename, const char *filename, + dns_view_t *view) { isc_result_t result; - dns_db_t * db = NULL; + dns_db_t *db = NULL; /* * Prepare zone structure for further processing. @@ -554,8 +539,7 @@ free_zone: } void -ns_test_cleanup_zone(void) -{ +ns_test_cleanup_zone(void) { ns_test_releasezone(served_zone); ns_test_closezonemgr(); @@ -563,11 +547,10 @@ ns_test_cleanup_zone(void) } isc_result_t -ns_test_getclient(ns_interface_t *ifp0, bool tcp, ns_client_t **clientp) -{ +ns_test_getclient(ns_interface_t *ifp0, bool tcp, ns_client_t **clientp) { isc_result_t result; ns_client_t *client = isc_mem_get(mctx, sizeof(ns_client_t)); - int i; + int i; UNUSED(ifp0); UNUSED(tcp); @@ -576,7 +559,8 @@ ns_test_getclient(ns_interface_t *ifp0, bool tcp, ns_client_t **clientp) for (i = 0; i < 32; i++) { if (atomic_load(&client_addrs[i]) == (uintptr_t)NULL || - atomic_load(&client_addrs[i]) == (uintptr_t)client) { + atomic_load(&client_addrs[i]) == (uintptr_t)client) + { break; } } @@ -596,15 +580,14 @@ ns_test_getclient(ns_interface_t *ifp0, bool tcp, ns_client_t **clientp) */ static isc_result_t attach_query_msg_to_client(ns_client_t *client, const char *qnamestr, - dns_rdatatype_t qtype, unsigned int qflags) -{ + dns_rdatatype_t qtype, unsigned int qflags) { dns_rdataset_t *qrdataset = NULL; - dns_message_t * message = NULL; - unsigned char query[65536]; - dns_name_t * qname = NULL; - isc_buffer_t querybuf; - dns_compress_t cctx; - isc_result_t result; + dns_message_t *message = NULL; + unsigned char query[65536]; + dns_name_t *qname = NULL; + isc_buffer_t querybuf; + dns_compress_t cctx; + isc_result_t result; REQUIRE(client != NULL); REQUIRE(qnamestr != NULL); @@ -699,10 +682,9 @@ destroy_message: * point. */ static ns_hookresult_t -extract_qctx(void *arg, void *data, isc_result_t *resultp) -{ +extract_qctx(void *arg, void *data, isc_result_t *resultp) { query_ctx_t **qctxp; - query_ctx_t * qctx; + query_ctx_t *qctx; REQUIRE(arg != NULL); REQUIRE(data != NULL); @@ -737,8 +719,7 @@ extract_qctx(void *arg, void *data, isc_result_t *resultp) * \li "client->message" to hold a parsed DNS query. */ static isc_result_t -create_qctx_for_client(ns_client_t *client, query_ctx_t **qctxp) -{ +create_qctx_for_client(ns_client_t *client, query_ctx_t **qctxp) { ns_hooktable_t *saved_hook_table = NULL, *query_hooks = NULL; const ns_hook_t hook = { .action = extract_qctx, @@ -777,8 +758,7 @@ create_qctx_for_client(ns_client_t *client, query_ctx_t **qctxp) isc_result_t ns_test_qctx_create(const ns_test_qctx_create_params_t *params, - query_ctx_t ** qctxp) -{ + query_ctx_t **qctxp) { ns_client_t *client = NULL; isc_result_t result; @@ -847,8 +827,7 @@ detach_client: } void -ns_test_qctx_destroy(query_ctx_t **qctxp) -{ +ns_test_qctx_destroy(query_ctx_t **qctxp) { query_ctx_t *qctx; REQUIRE(qctxp != NULL); @@ -871,8 +850,7 @@ ns_test_qctx_destroy(query_ctx_t **qctxp) } ns_hookresult_t -ns_test_hook_catch_call(void *arg, void *data, isc_result_t *resultp) -{ +ns_test_hook_catch_call(void *arg, void *data, isc_result_t *resultp) { UNUSED(arg); UNUSED(data); @@ -885,8 +863,7 @@ ns_test_hook_catch_call(void *arg, void *data, isc_result_t *resultp) * Sleep for 'usec' microseconds. */ void -ns_test_nap(uint32_t usec) -{ +ns_test_nap(uint32_t usec) { #ifdef HAVE_NANOSLEEP struct timespec ts; @@ -906,11 +883,10 @@ ns_test_nap(uint32_t usec) isc_result_t ns_test_loaddb(dns_db_t **db, dns_dbtype_t dbtype, const char *origin, - const char *testfile) -{ - isc_result_t result; + const char *testfile) { + isc_result_t result; dns_fixedname_t fixed; - dns_name_t * name; + dns_name_t *name; name = dns_fixedname_initname(&fixed); @@ -930,8 +906,7 @@ ns_test_loaddb(dns_db_t **db, dns_dbtype_t dbtype, const char *origin, } static int -fromhex(char c) -{ +fromhex(char c) { if (c >= '0' && c <= '9') { return (c - '0'); } else if (c >= 'a' && c <= 'f') { @@ -947,15 +922,14 @@ fromhex(char c) isc_result_t ns_test_getdata(const char *file, unsigned char *buf, size_t bufsiz, - size_t *sizep) -{ - isc_result_t result; + size_t *sizep) { + isc_result_t result; unsigned char *bp; - char * rp, *wp; - char s[BUFSIZ]; - size_t len, i; - FILE * f = NULL; - int n; + char *rp, *wp; + char s[BUFSIZ]; + size_t len, i; + FILE *f = NULL; + int n; result = isc_stdio_open(file, "r", &f); if (result != ISC_R_SUCCESS) { diff --git a/lib/ns/tests/plugin_test.c b/lib/ns/tests/plugin_test.c index 0a0afe123f..795411219a 100644 --- a/lib/ns/tests/plugin_test.c +++ b/lib/ns/tests/plugin_test.c @@ -29,16 +29,15 @@ #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 #include "nstest.h" static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -50,8 +49,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { if (*state != NULL) { isc_mem_free(mctx, *state); } @@ -65,22 +63,22 @@ _teardown(void **state) * Structure containing parameters for run_full_path_test(). */ typedef struct { - const ns_test_id_t id; /* libns test identifier */ - const char * input; /* source string - plugin name or path - * */ - size_t output_size; /* size of target char array to - * allocate */ - isc_result_t result; /* expected return value */ - const char * output; /* expected output string */ + const ns_test_id_t id; /* libns test identifier */ + const char *input; /* source string - plugin name or path + * */ + size_t output_size; /* size of target char array to + * allocate */ + isc_result_t result; /* expected return value */ + const char *output; /* expected output string */ } ns_plugin_expandpath_test_params_t; /*% * Perform a single ns_plugin_expandpath() check using given parameters. */ static void -run_full_path_test(const ns_plugin_expandpath_test_params_t *test, void **state) -{ - char ** target = (char **)state; +run_full_path_test(const ns_plugin_expandpath_test_params_t *test, + void **state) { + char **target = (char **)state; isc_result_t result; REQUIRE(test != NULL); @@ -125,8 +123,7 @@ run_full_path_test(const ns_plugin_expandpath_test_params_t *test, void **state) /* test ns_plugin_expandpath() */ static void -ns_plugin_expandpath_test(void **state) -{ +ns_plugin_expandpath_test(void **state) { size_t i; const ns_plugin_expandpath_test_params_t tests[] = { @@ -189,8 +186,7 @@ ns_plugin_expandpath_test(void **state) } int -main(void) -{ +main(void) { const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(ns_plugin_expandpath_test, _setup, _teardown), @@ -203,8 +199,7 @@ main(void) #include int -main(void) -{ +main(void) { printf("1..0 # Skipped: cmocka not available\n"); return (0); } diff --git a/lib/ns/tests/query_test.c b/lib/ns/tests/query_test.c index ad6e7c4f55..a82989e2c0 100644 --- a/lib/ns/tests/query_test.c +++ b/lib/ns/tests/query_test.c @@ -36,8 +36,7 @@ #if defined(USE_LIBTOOL) || LD_WRAP static int -_setup(void **state) -{ +_setup(void **state) { isc_result_t result; UNUSED(state); @@ -49,8 +48,7 @@ _setup(void **state) } static int -_teardown(void **state) -{ +_teardown(void **state) { UNUSED(state); ns_test_end(); @@ -66,32 +64,31 @@ _teardown(void **state) * Structure containing parameters for ns__query_sfcache_test(). */ typedef struct { - const ns_test_id_t id; /* libns test identifier */ - unsigned int qflags; /* query flags */ - bool cache_entry_present; /* whether a SERVFAIL - * cache entry - * matching the query - * should be - * present */ - uint32_t cache_entry_flags; /* NS_FAILCACHE_* flags to - * set for - * the SERVFAIL cache entry - * */ - bool servfail_expected; /* whether a cached - * SERVFAIL is - * expected to be returned - * */ + const ns_test_id_t id; /* libns test identifier */ + unsigned int qflags; /* query flags */ + bool cache_entry_present; /* whether a SERVFAIL + * cache entry + * matching the query + * should be + * present */ + uint32_t cache_entry_flags; /* NS_FAILCACHE_* flags to + * set for + * the SERVFAIL cache entry + * */ + bool servfail_expected; /* whether a cached + * SERVFAIL is + * expected to be returned + * */ } ns__query_sfcache_test_params_t; /*% * Perform a single ns__query_sfcache() check using given parameters. */ static void -run_sfcache_test(const ns__query_sfcache_test_params_t *test) -{ +run_sfcache_test(const ns__query_sfcache_test_params_t *test) { ns_hooktable_t *query_hooks = NULL; - query_ctx_t * qctx = NULL; - isc_result_t result; + query_ctx_t *qctx = NULL; + isc_result_t result; const ns_hook_t hook = { .action = ns_test_hook_catch_call, }; @@ -130,7 +127,7 @@ run_sfcache_test(const ns__query_sfcache_test_params_t *test) */ if (test->cache_entry_present) { isc_interval_t hour; - isc_time_t expire; + isc_time_t expire; isc_interval_set(&hour, 3600, 0); result = isc_time_nowplusinterval(&expire, &hour); @@ -171,8 +168,7 @@ run_sfcache_test(const ns__query_sfcache_test_params_t *test) /* test ns__query_sfcache() */ static void -ns__query_sfcache_test(void **state) -{ +ns__query_sfcache_test(void **state) { size_t i; const ns__query_sfcache_test_params_t tests[] = { @@ -260,29 +256,29 @@ ns__query_sfcache_test(void **state) * Structure containing parameters for ns__query_start_test(). */ typedef struct { - const ns_test_id_t id; /* libns test identifier */ - const char * qname; /* QNAME */ - dns_rdatatype_t qtype; /* QTYPE */ - unsigned int qflags; /* query flags */ - bool disable_name_checks; /* if set to true, owner - * name - * checks will - * be disabled for the - * view created - * */ - bool recursive_service; /* if set to true, the view - * created will - * have a cache - * database - * attached */ - const char *auth_zone_origin; /* origin name of the zone - * the - * created view will be - * authoritative for */ - const char *auth_zone_path; /* path to load the - * authoritative - * zone from */ - enum { /* expected result: */ + const ns_test_id_t id; /* libns test identifier */ + const char *qname; /* QNAME */ + dns_rdatatype_t qtype; /* QTYPE */ + unsigned int qflags; /* query flags */ + bool disable_name_checks; /* if set to true, owner + * name + * checks will + * be disabled for the + * view created + * */ + bool recursive_service; /* if set to true, the view + * created will + * have a cache + * database + * attached */ + const char *auth_zone_origin; /* origin name of the zone + * the + * created view will be + * authoritative for */ + const char *auth_zone_path; /* path to load the + * authoritative + * zone from */ + enum { /* expected result: */ NS__QUERY_START_R_INVALID, NS__QUERY_START_R_REFUSE, /* query should be REFUSED */ NS__QUERY_START_R_CACHE, /* query should be answered from @@ -296,11 +292,10 @@ typedef struct { * Perform a single ns__query_start() check using given parameters. */ static void -run_start_test(const ns__query_start_test_params_t *test) -{ +run_start_test(const ns__query_start_test_params_t *test) { ns_hooktable_t *query_hooks = NULL; - query_ctx_t * qctx = NULL; - isc_result_t result; + query_ctx_t *qctx = NULL; + isc_result_t result; const ns_hook_t hook = { .action = ns_test_hook_catch_call, }; @@ -389,8 +384,8 @@ run_start_test(const ns__query_start_test_params_t *test) "query context, but some was", test->id.description, test->id.lineno); } - if (qctx->db == NULL || - qctx->db != qctx->client->view->cachedb) { + if (qctx->db == NULL || qctx->db != qctx->client->view->cachedb) + { fail_msg("# test \"%s\" on line %d: " "cache database was expected to be " "attached to query context, but it was not", @@ -438,8 +433,7 @@ run_start_test(const ns__query_start_test_params_t *test) /* test ns__query_start() */ static void -ns__query_start_test(void **state) -{ +ns__query_start_test(void **state) { size_t i; const ns__query_start_test_params_t tests[] = { @@ -609,8 +603,7 @@ ns__query_start_test(void **state) #endif /* if defined(USE_LIBTOOL) || LD_WRAP */ int -main(void) -{ +main(void) { #if defined(USE_LIBTOOL) || LD_WRAP const struct CMUnitTest tests[] = { cmocka_unit_test_setup_teardown(ns__query_sfcache_test, _setup, @@ -630,8 +623,7 @@ main(void) #include int -main(void) -{ +main(void) { #if __SANITIZE_ADDRESS__ /* * We disable this test when the address sanitizer is in diff --git a/lib/ns/tests/wrap.c b/lib/ns/tests/wrap.c index b89c004700..19a8219d1d 100644 --- a/lib/ns/tests/wrap.c +++ b/lib/ns/tests/wrap.c @@ -31,11 +31,9 @@ * 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) -{ +isc_nmhandle_unref(isc_nmhandle_t *handle) { __wrap_isc_nmhandle_unref(handle); } diff --git a/lib/ns/update.c b/lib/ns/update.c index f53fbeed0f..ce812e85b8 100644 --- a/lib/ns/update.c +++ b/lib/ns/update.c @@ -211,7 +211,7 @@ typedef struct rr rr_t; struct rr { /* dns_name_t name; */ - uint32_t ttl; + uint32_t ttl; dns_rdata_t rdata; }; @@ -219,8 +219,8 @@ typedef struct update_event update_event_t; struct update_event { ISC_EVENT_COMMON(update_event_t); - dns_zone_t * zone; - isc_result_t result; + dns_zone_t *zone; + isc_result_t result; dns_message_t *answer; }; @@ -234,16 +234,16 @@ struct update_event { */ typedef struct { - dns_db_t * db; + dns_db_t *db; dns_dbversion_t *ver; - dns_diff_t * diff; - dns_name_t * name; - dns_name_t * oldname; - dns_rdata_t * update_rr; - dns_ttl_t update_rr_ttl; - bool ignore_add; - dns_diff_t del_diff; - dns_diff_t add_diff; + dns_diff_t *diff; + dns_name_t *name; + dns_name_t *oldname; + dns_rdata_t *update_rr; + dns_ttl_t update_rr_ttl; + bool ignore_add; + dns_diff_t del_diff; + dns_diff_t add_diff; } add_rr_prepare_ctx_t; /**************************************************************************/ @@ -251,31 +251,24 @@ 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, - ...) -{ + ...) { va_list ap; - char message[4096]; - char namebuf[DNS_NAME_FORMATSIZE]; - char classbuf[DNS_RDATACLASS_FORMATSIZE]; + char message[4096]; + char namebuf[DNS_NAME_FORMATSIZE]; + char classbuf[DNS_RDATACLASS_FORMATSIZE]; if (client == NULL) { return; @@ -306,8 +299,7 @@ update_log(ns_client_t *client, dns_zone_t *zone, int level, const char *fmt, } static void -update_log_cb(void *arg, dns_zone_t *zone, int level, const char *message) -{ +update_log_cb(void *arg, dns_zone_t *zone, int level, const char *message) { update_log(arg, zone, level, "%s", message); } @@ -315,8 +307,7 @@ update_log_cb(void *arg, dns_zone_t *zone, int level, const char *message) * Increment updated-related statistics counters. */ static inline void -inc_stats(ns_client_t *client, dns_zone_t *zone, isc_statscounter_t counter) -{ +inc_stats(ns_client_t *client, dns_zone_t *zone, isc_statscounter_t counter) { ns_stats_increment(client->sctx->nsstats, counter); if (zone != NULL) { @@ -335,11 +326,10 @@ inc_stats(ns_client_t *client, dns_zone_t *zone, isc_statscounter_t counter) */ static isc_result_t checkqueryacl(ns_client_t *client, dns_acl_t *queryacl, dns_name_t *zonename, - dns_acl_t *updateacl, dns_ssutable_t *ssutable) -{ - char namebuf[DNS_NAME_FORMATSIZE]; - char classbuf[DNS_RDATACLASS_FORMATSIZE]; - int level; + dns_acl_t *updateacl, dns_ssutable_t *ssutable) { + char namebuf[DNS_NAME_FORMATSIZE]; + char classbuf[DNS_RDATACLASS_FORMATSIZE]; + int level; isc_result_t result; result = ns_client_checkaclsilent(client, NULL, queryacl, true); @@ -384,12 +374,11 @@ checkqueryacl(ns_client_t *client, dns_acl_t *queryacl, dns_name_t *zonename, */ static isc_result_t checkupdateacl(ns_client_t *client, dns_acl_t *acl, const char *message, - dns_name_t *zonename, bool slave, bool has_ssutable) -{ - char namebuf[DNS_NAME_FORMATSIZE]; - char classbuf[DNS_RDATACLASS_FORMATSIZE]; - int level = ISC_LOG_ERROR; - const char * msg = "denied"; + dns_name_t *zonename, bool slave, bool has_ssutable) { + char namebuf[DNS_NAME_FORMATSIZE]; + char classbuf[DNS_RDATACLASS_FORMATSIZE]; + int level = ISC_LOG_ERROR; + const char *msg = "denied"; isc_result_t result; if (slave && acl == NULL) { @@ -433,9 +422,8 @@ checkupdateacl(ns_client_t *client, dns_acl_t *acl, const char *message, */ static isc_result_t do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver, - dns_diff_t *diff) -{ - dns_diff_t temp_diff; + dns_diff_t *diff) { + dns_diff_t temp_diff; isc_result_t result; /* @@ -474,8 +462,7 @@ do_one_tuple(dns_difftuple_t **tuple, dns_db_t *db, dns_dbversion_t *ver, */ static isc_result_t do_diff(dns_diff_t *updates, dns_db_t *db, dns_dbversion_t *ver, - dns_diff_t *diff) -{ + dns_diff_t *diff) { isc_result_t result; while (!ISC_LIST_EMPTY(updates->tuples)) { dns_difftuple_t *t = ISC_LIST_HEAD(updates->tuples); @@ -492,10 +479,9 @@ failure: 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) -{ + dns_rdata_t *rdata) { dns_difftuple_t *tuple = NULL; - isc_result_t result; + isc_result_t result; result = dns_difftuple_create(diff->mctx, op, name, ttl, rdata, &tuple); if (result != ISC_R_SUCCESS) { return (result); @@ -526,33 +512,31 @@ 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(). */ typedef struct { rr_func *rr_action; - void * rr_action_data; + void *rr_action_data; } foreach_node_rr_ctx_t; /*% * Internal helper function for foreach_node_rr(). */ static isc_result_t -foreach_node_rr_action(void *data, dns_rdataset_t *rdataset) -{ - isc_result_t result; +foreach_node_rr_action(void *data, dns_rdataset_t *rdataset) { + isc_result_t result; foreach_node_rr_ctx_t *ctx = data; for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { rr_t rr = { 0, DNS_RDATA_INIT }; dns_rdataset_current(rdataset, &rr.rdata); @@ -577,14 +561,13 @@ foreach_node_rr_action(void *data, dns_rdataset_t *rdataset) */ static isc_result_t foreach_rrset(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, - rrset_func *action, void *action_data) -{ - isc_result_t result; - dns_dbnode_t * node; - dns_rdatasetiter_t * iter; + rrset_func *action, void *action_data) { + isc_result_t result; + dns_dbnode_t *node; + dns_rdatasetiter_t *iter; dns_clientinfomethods_t cm; - dns_clientinfo_t ci; - dns_dbversion_t * oldver = NULL; + dns_clientinfo_t ci; + dns_dbversion_t *oldver = NULL; dns_clientinfomethods_init(&cm, ns_client_sourceip); @@ -612,7 +595,8 @@ foreach_rrset(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, } for (result = dns_rdatasetiter_first(iter); result == ISC_R_SUCCESS; - result = dns_rdatasetiter_next(iter)) { + result = dns_rdatasetiter_next(iter)) + { dns_rdataset_t rdataset; dns_rdataset_init(&rdataset); @@ -648,8 +632,7 @@ cleanup_node: */ static isc_result_t foreach_node_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, - rr_func *rr_action, void *rr_action_data) -{ + rr_func *rr_action, void *rr_action_data) { foreach_node_rr_ctx_t ctx; ctx.rr_action = rr_action; ctx.rr_action_data = rr_action_data; @@ -668,15 +651,14 @@ foreach_node_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, static isc_result_t foreach_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_rdatatype_t type, dns_rdatatype_t covers, rr_func *rr_action, - void *rr_action_data) -{ - isc_result_t result; - dns_dbnode_t * node; - dns_rdataset_t rdataset; + void *rr_action_data) { + isc_result_t result; + dns_dbnode_t *node; + dns_rdataset_t rdataset; dns_clientinfomethods_t cm; - dns_clientinfo_t ci; - dns_dbversion_t * oldver = NULL; - dns_fixedname_t fixed; + dns_clientinfo_t ci; + dns_dbversion_t *oldver = NULL; + dns_fixedname_t fixed; dns_clientinfomethods_init(&cm, ns_client_sourceip); @@ -695,7 +677,8 @@ foreach_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, node = NULL; if (type == dns_rdatatype_nsec3 || - (type == dns_rdatatype_rrsig && covers == dns_rdatatype_nsec3)) { + (type == dns_rdatatype_rrsig && covers == dns_rdatatype_nsec3)) + { result = dns_db_findnsec3node(db, name, false, &node); } else { result = dns_db_findnodeext(db, name, false, &cm, &ci, &node); @@ -727,7 +710,8 @@ foreach_rr(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { rr_t rr = { 0, DNS_RDATA_INIT }; dns_rdataset_current(&rdataset, &rr.rdata); rr.ttl = rdataset.ttl; @@ -758,15 +742,13 @@ 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(). */ static isc_result_t -rrset_exists_action(void *data, rr_t *rr) -{ +rrset_exists_action(void *data, rr_t *rr) { UNUSED(data); UNUSED(rr); return (ISC_R_EXISTS); @@ -798,8 +780,7 @@ rrset_exists_action(void *data, rr_t *rr) */ static isc_result_t rrset_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, - dns_rdatatype_t type, dns_rdatatype_t covers, bool *exists) -{ + dns_rdatatype_t type, dns_rdatatype_t covers, bool *exists) { isc_result_t result; result = foreach_rr(db, ver, name, type, covers, rrset_exists_action, NULL); @@ -810,8 +791,7 @@ rrset_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, * Helper function for cname_incompatible_rrset_exists. */ static isc_result_t -cname_compatibility_action(void *data, dns_rdataset_t *rrset) -{ +cname_compatibility_action(void *data, dns_rdataset_t *rrset) { UNUSED(data); if (rrset->type != dns_rdatatype_cname && !dns_rdatatype_atcname(rrset->type)) { @@ -830,8 +810,7 @@ cname_compatibility_action(void *data, dns_rdataset_t *rrset) */ static isc_result_t cname_incompatible_rrset_exists(dns_db_t *db, dns_dbversion_t *ver, - dns_name_t *name, bool *exists) -{ + dns_name_t *name, bool *exists) { isc_result_t result; result = foreach_rrset(db, ver, name, cname_compatibility_action, NULL); RETURN_EXISTENCE_FLAG; @@ -841,8 +820,7 @@ cname_incompatible_rrset_exists(dns_db_t *db, dns_dbversion_t *ver, * Helper function for rr_count(). */ static isc_result_t -count_rr_action(void *data, rr_t *rr) -{ +count_rr_action(void *data, rr_t *rr) { int *countp = data; UNUSED(rr); (*countp)++; @@ -854,8 +832,7 @@ count_rr_action(void *data, rr_t *rr) */ static isc_result_t rr_count(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, - dns_rdatatype_t type, dns_rdatatype_t covers, int *countp) -{ + dns_rdatatype_t type, dns_rdatatype_t covers, int *countp) { *countp = 0; return (foreach_rr(db, ver, name, type, covers, count_rr_action, countp)); @@ -866,8 +843,7 @@ rr_count(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, */ static isc_result_t -name_exists_action(void *data, dns_rdataset_t *rrset) -{ +name_exists_action(void *data, dns_rdataset_t *rrset) { UNUSED(data); UNUSED(rrset); return (ISC_R_EXISTS); @@ -877,8 +853,8 @@ name_exists_action(void *data, dns_rdataset_t *rrset) * Set '*exists' to true iff the given name exists, to false otherwise. */ static isc_result_t -name_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, bool *exists) -{ +name_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, + bool *exists) { isc_result_t result; result = foreach_rrset(db, ver, name, name_exists_action, NULL); RETURN_EXISTENCE_FLAG; @@ -913,10 +889,9 @@ typedef struct { } ssu_check_t; static isc_result_t -ssu_checkrule(void *data, dns_rdataset_t *rrset) -{ +ssu_checkrule(void *data, dns_rdataset_t *rrset) { ssu_check_t *ssuinfo = data; - bool result; + bool result; /* * If we're deleting all records, it's ok to delete RRSIG and NSEC even @@ -935,10 +910,9 @@ ssu_checkrule(void *data, dns_rdataset_t *rrset) static bool ssu_checkall(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_ssutable_t *ssutable, dns_name_t *signer, isc_netaddr_t *addr, - dns_aclenv_t *aclenv, bool tcp, dst_key_t *key) -{ + dns_aclenv_t *aclenv, bool tcp, dst_key_t *key) { isc_result_t result; - ssu_check_t ssuinfo; + ssu_check_t ssuinfo; ssuinfo.name = name; ssuinfo.table = ssutable; @@ -967,9 +941,8 @@ ssu_checkall(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, * 'name' and 'rdata' to 'diff'. */ static isc_result_t -temp_append(dns_diff_t *diff, dns_name_t *name, dns_rdata_t *rdata) -{ - isc_result_t result; +temp_append(dns_diff_t *diff, dns_name_t *name, dns_rdata_t *rdata) { + isc_result_t result; dns_difftuple_t *tuple = NULL; REQUIRE(DNS_DIFF_VALID(diff)); @@ -987,8 +960,7 @@ failure: * if not. */ static isc_result_t -temp_check_rrset(dns_difftuple_t *a, dns_difftuple_t *b) -{ +temp_check_rrset(dns_difftuple_t *a, dns_difftuple_t *b) { for (;;) { if (a == NULL || b == NULL) { break; @@ -1015,13 +987,12 @@ temp_check_rrset(dns_difftuple_t *a, dns_difftuple_t *b) * followed by the type and rdata. */ static int -temp_order(const void *av, const void *bv) -{ +temp_order(const void *av, const void *bv) { dns_difftuple_t const *const *ap = av; dns_difftuple_t const *const *bp = bv; - dns_difftuple_t const * a = *ap; - dns_difftuple_t const * b = *bp; - int r; + dns_difftuple_t const *a = *ap; + dns_difftuple_t const *b = *bp; + int r; r = dns_name_compare(&a->name, &b->name); if (r != 0) { return (r); @@ -1046,13 +1017,12 @@ temp_order(const void *av, const void *bv) static isc_result_t temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db, - dns_dbversion_t *ver, dns_name_t *tmpname, dns_rdatatype_t *typep) -{ - isc_result_t result; - dns_name_t * name; - dns_dbnode_t * node; + dns_dbversion_t *ver, dns_name_t *tmpname, dns_rdatatype_t *typep) { + isc_result_t result; + dns_name_t *name; + dns_dbnode_t *node; dns_difftuple_t *t; - dns_diff_t trash; + dns_diff_t trash; dns_diff_init(mctx, &trash); @@ -1082,11 +1052,11 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db, /* A new unique type begins here. */ while (t != NULL && dns_name_equal(&t->name, name)) { dns_rdatatype_t type, covers; - dns_rdataset_t rdataset; - dns_diff_t d_rrs; /* Database RRs with - * this name and type */ - dns_diff_t u_rrs; /* Update RRs with - * this name and type */ + dns_rdataset_t rdataset; + dns_diff_t d_rrs; /* Database RRs with + * this name and type */ + dns_diff_t u_rrs; /* Update RRs with + * this name and type */ *typep = type = t->rdata.type; if (type == dns_rdatatype_rrsig || @@ -1119,7 +1089,8 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db, for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &rdata); result = temp_append(&d_rrs, name, &rdata); @@ -1192,12 +1163,12 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db, */ typedef struct { - rr_predicate * predicate; - dns_db_t * db; + rr_predicate *predicate; + dns_db_t *db; dns_dbversion_t *ver; - dns_diff_t * diff; - dns_name_t * name; - dns_rdata_t * update_rr; + dns_diff_t *diff; + dns_name_t *name; + dns_rdata_t *update_rr; } conditional_delete_ctx_t; /*% @@ -1209,8 +1180,7 @@ typedef struct { * an RRSIG nor an NSEC3PARAM nor a NSEC. */ static bool -type_not_soa_nor_ns_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) -{ +type_not_soa_nor_ns_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { UNUSED(update_rr); return ((db_rr->type != dns_rdatatype_soa && db_rr->type != dns_rdatatype_ns && @@ -1225,8 +1195,7 @@ type_not_soa_nor_ns_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) * Return true iff 'db_rr' is neither a RRSIG nor a NSEC. */ static bool -type_not_dnssec(dns_rdata_t *update_rr, dns_rdata_t *db_rr) -{ +type_not_dnssec(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { UNUSED(update_rr); return ((db_rr->type != dns_rdatatype_rrsig && db_rr->type != dns_rdatatype_nsec) @@ -1238,8 +1207,7 @@ type_not_dnssec(dns_rdata_t *update_rr, dns_rdata_t *db_rr) * Return true always. */ static bool -true_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) -{ +true_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { UNUSED(update_rr); UNUSED(db_rr); return (true); @@ -1249,8 +1217,7 @@ true_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) * Return true iff the two RRs have identical rdata. */ static bool -rr_equal_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) -{ +rr_equal_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { /* * XXXRTH This is not a problem, but we should consider creating * dns_rdata_equal() (that used dns_name_equal()), since it @@ -1272,10 +1239,9 @@ rr_equal_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) * rollover by only requiring that the new RRSIG be added. */ static bool -replaces_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) -{ +replaces_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { dns_rdata_rrsig_t updatesig, dbsig; - isc_result_t result; + isc_result_t result; if (db_rr->type != update_rr->type) { return (false); @@ -1303,7 +1269,8 @@ replaces_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) RUNTIME_CHECK(result == ISC_R_SUCCESS); if (dbsig.keyid == updatesig.keyid && dbsig.covered == updatesig.covered && - dbsig.algorithm == updatesig.algorithm) { + dbsig.algorithm == updatesig.algorithm) + { return (true); } } @@ -1330,7 +1297,8 @@ replaces_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) */ if (db_rr->data[0] == update_rr->data[0] && memcmp(db_rr->data + 2, update_rr->data + 2, - update_rr->length - 2) == 0) { + update_rr->length - 2) == 0) + { return (true); } } @@ -1341,8 +1309,7 @@ replaces_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) * Internal helper function for delete_if(). */ static isc_result_t -delete_if_action(void *data, rr_t *rr) -{ +delete_if_action(void *data, rr_t *rr) { conditional_delete_ctx_t *ctx = data; if ((*ctx->predicate)(ctx->update_rr, &rr->rdata)) { isc_result_t result; @@ -1365,8 +1332,7 @@ delete_if_action(void *data, rr_t *rr) static isc_result_t delete_if(rr_predicate *predicate, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_rdatatype_t type, dns_rdatatype_t covers, - dns_rdata_t *update_rr, dns_diff_t *diff) -{ + dns_rdata_t *update_rr, dns_diff_t *diff) { conditional_delete_ctx_t ctx; ctx.predicate = predicate; ctx.db = db; @@ -1381,12 +1347,11 @@ delete_if(rr_predicate *predicate, dns_db_t *db, dns_dbversion_t *ver, /**************************************************************************/ static isc_result_t -add_rr_prepare_action(void *data, rr_t *rr) -{ - isc_result_t result = ISC_R_SUCCESS; +add_rr_prepare_action(void *data, rr_t *rr) { + isc_result_t result = ISC_R_SUCCESS; add_rr_prepare_ctx_t *ctx = data; - dns_difftuple_t * tuple = NULL; - bool equal, case_equal, ttl_equal; + dns_difftuple_t *tuple = NULL; + bool equal, case_equal, ttl_equal; /* * Are the new and old cases equal? @@ -1456,10 +1421,9 @@ static void get_current_rr(dns_message_t *msg, dns_section_t section, dns_rdataclass_t zoneclass, dns_name_t **name, dns_rdata_t *rdata, dns_rdatatype_t *covers, dns_ttl_t *ttl, - dns_rdataclass_t *update_class) -{ + dns_rdataclass_t *update_class) { dns_rdataset_t *rdataset; - isc_result_t result; + isc_result_t result; dns_message_currentname(msg, section, name); rdataset = ISC_LIST_HEAD((*name)->list); INSIST(rdataset != NULL); @@ -1488,12 +1452,11 @@ get_current_rr(dns_message_t *msg, dns_section_t section, static isc_result_t update_soa_serial(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, - isc_mem_t *mctx, dns_updatemethod_t method) -{ + isc_mem_t *mctx, dns_updatemethod_t method) { dns_difftuple_t *deltuple = NULL; dns_difftuple_t *addtuple = NULL; - uint32_t serial; - isc_result_t result; + uint32_t serial; + isc_result_t result; CHECK(dns_db_createsoatuple(db, ver, mctx, DNS_DIFFOP_DEL, &deltuple)); CHECK(dns_difftuple_copy(deltuple, &addtuple)); @@ -1538,10 +1501,9 @@ failure: */ static isc_result_t check_soa_increment(dns_db_t *db, dns_dbversion_t *ver, - dns_rdata_t *update_rdata, bool *ok) -{ - uint32_t db_serial; - uint32_t update_serial; + dns_rdata_t *update_rdata, bool *ok) { + uint32_t db_serial; + uint32_t update_serial; isc_result_t result; update_serial = dns_soa_getserial(update_rdata); @@ -1567,11 +1529,10 @@ check_soa_increment(dns_db_t *db, dns_dbversion_t *ver, */ static isc_result_t -send_update_event(ns_client_t *client, dns_zone_t *zone) -{ - isc_result_t result = ISC_R_SUCCESS; +send_update_event(ns_client_t *client, dns_zone_t *zone) { + isc_result_t result = ISC_R_SUCCESS; update_event_t *event = NULL; - isc_task_t * zonetask = NULL; + isc_task_t *zonetask = NULL; event = (update_event_t *)isc_event_allocate( client->mctx, client, DNS_EVENT_UPDATE, update_action, NULL, @@ -1591,8 +1552,7 @@ send_update_event(ns_client_t *client, dns_zone_t *zone) } static void -respond(ns_client_t *client, isc_result_t result) -{ +respond(ns_client_t *client, isc_result_t result) { isc_result_t msg_result; msg_result = dns_message_reply(client->message, true); @@ -1615,13 +1575,12 @@ msg_failure: } void -ns_update_start(ns_client_t *client, isc_result_t sigresult) -{ - dns_message_t * request = client->message; - isc_result_t result; - dns_name_t * zonename; +ns_update_start(ns_client_t *client, isc_result_t sigresult) { + dns_message_t *request = client->message; + isc_result_t result; + dns_name_t *zonename; dns_rdataset_t *zone_rdataset; - dns_zone_t * zone = NULL, *raw = NULL; + dns_zone_t *zone = NULL, *raw = NULL; /* * Interpret the zone section. @@ -1717,21 +1676,22 @@ failure: */ static isc_result_t -remove_orphaned_ds(dns_db_t *db, dns_dbversion_t *newver, dns_diff_t *diff) -{ - isc_result_t result; - bool ns_exists; +remove_orphaned_ds(dns_db_t *db, dns_dbversion_t *newver, dns_diff_t *diff) { + isc_result_t result; + bool ns_exists; dns_difftuple_t *tupple; - dns_diff_t temp_diff; + dns_diff_t temp_diff; dns_diff_init(diff->mctx, &temp_diff); for (tupple = ISC_LIST_HEAD(diff->tuples); tupple != NULL; - tupple = ISC_LIST_NEXT(tupple, link)) { + tupple = ISC_LIST_NEXT(tupple, link)) + { if (!((tupple->op == DNS_DIFFOP_DEL && tupple->rdata.type == dns_rdatatype_ns) || (tupple->op == DNS_DIFFOP_ADD && - tupple->rdata.type == dns_rdatatype_ds))) { + tupple->rdata.type == dns_rdatatype_ds))) + { continue; } CHECK(rrset_exists(db, newver, &tupple->name, dns_rdatatype_ns, @@ -1747,7 +1707,8 @@ remove_orphaned_ds(dns_db_t *db, dns_dbversion_t *newver, dns_diff_t *diff) failure: for (tupple = ISC_LIST_HEAD(temp_diff.tuples); tupple != NULL; - tupple = ISC_LIST_HEAD(temp_diff.tuples)) { + tupple = ISC_LIST_HEAD(temp_diff.tuples)) + { ISC_LIST_UNLINK(temp_diff.tuples, tupple, link); dns_diff_appendminimal(diff, &tupple); } @@ -1759,23 +1720,22 @@ failure: */ static isc_result_t check_mx(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, - dns_dbversion_t *newver, dns_diff_t *diff) -{ + dns_dbversion_t *newver, dns_diff_t *diff) { char tmp[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:123.123.123.123.")]; char ownerbuf[DNS_NAME_FORMATSIZE]; char namebuf[DNS_NAME_FORMATSIZE]; char altbuf[DNS_NAME_FORMATSIZE]; dns_difftuple_t *t; - dns_fixedname_t fixed; - dns_name_t * foundname; - dns_rdata_mx_t mx; - dns_rdata_t rdata; - bool ok = true; - bool isaddress; - isc_result_t result; - struct in6_addr addr6; - struct in_addr addr; - dns_zoneopt_t options; + dns_fixedname_t fixed; + dns_name_t *foundname; + dns_rdata_mx_t mx; + dns_rdata_t rdata; + bool ok = true; + bool isaddress; + isc_result_t result; + struct in6_addr addr6; + struct in_addr addr; + dns_zoneopt_t options; foundname = dns_fixedname_initname(&fixed); dns_rdata_init(&rdata); @@ -1798,12 +1758,14 @@ check_mx(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, dns_name_format(&t->name, ownerbuf, sizeof(ownerbuf)); isaddress = false; if ((options & DNS_ZONEOPT_CHECKMX) != 0 && - strlcpy(tmp, namebuf, sizeof(tmp)) < sizeof(tmp)) { + strlcpy(tmp, namebuf, sizeof(tmp)) < sizeof(tmp)) + { if (tmp[strlen(tmp) - 1] == '.') { tmp[strlen(tmp) - 1] = '\0'; } if (inet_pton(AF_INET, tmp, &addr) == 1 || - inet_pton(AF_INET6, tmp, &addr6) == 1) { + inet_pton(AF_INET6, tmp, &addr6) == 1) + { isaddress = true; } } @@ -1865,11 +1827,10 @@ check_mx(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, static isc_result_t rr_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, - const dns_rdata_t *rdata, bool *flag) -{ + const dns_rdata_t *rdata, bool *flag) { dns_rdataset_t rdataset; - dns_dbnode_t * node = NULL; - isc_result_t result; + dns_dbnode_t *node = NULL; + isc_result_t result; dns_rdataset_init(&rdataset); if (rdata->type == dns_rdatatype_nsec3) { @@ -1886,7 +1847,8 @@ rr_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t myrdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &myrdata); if (!dns_rdata_casecompare(&myrdata, rdata)) { @@ -1910,13 +1872,12 @@ failure: static isc_result_t get_iterations(dns_db_t *db, dns_dbversion_t *ver, dns_rdatatype_t privatetype, - unsigned int *iterationsp) -{ - dns_dbnode_t * node = NULL; + unsigned int *iterationsp) { + dns_dbnode_t *node = NULL; dns_rdata_nsec3param_t nsec3param; - dns_rdataset_t rdataset; - isc_result_t result; - unsigned int iterations = 0; + dns_rdataset_t rdataset; + isc_result_t result; + unsigned int iterations = 0; dns_rdataset_init(&rdataset); @@ -1934,7 +1895,8 @@ get_iterations(dns_db_t *db, dns_dbversion_t *ver, dns_rdatatype_t privatetype, } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdataset_current(&rdataset, &rdata); CHECK(dns_rdata_tostruct(&rdata, &nsec3param, NULL)); @@ -1966,7 +1928,8 @@ try_private: } for (result = dns_rdataset_first(&rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(&rdataset)) { + result = dns_rdataset_next(&rdataset)) + { unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE]; dns_rdata_t private = DNS_RDATA_INIT; dns_rdata_t rdata = DNS_RDATA_INIT; @@ -2008,17 +1971,17 @@ failure: */ static isc_result_t check_dnssec(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, - dns_dbversion_t *ver, dns_diff_t *diff) -{ + dns_dbversion_t *ver, dns_diff_t *diff) { dns_difftuple_t *tuple; - bool nseconly = false, nsec3 = false; - isc_result_t result; - unsigned int iterations = 0, max; - dns_rdatatype_t privatetype = dns_zone_getprivatetype(zone); + bool nseconly = false, nsec3 = false; + isc_result_t result; + unsigned int iterations = 0, max; + dns_rdatatype_t privatetype = dns_zone_getprivatetype(zone); /* Scan the tuples for an NSEC-only DNSKEY or an NSEC3PARAM */ for (tuple = ISC_LIST_HEAD(diff->tuples); tuple != NULL; - tuple = ISC_LIST_NEXT(tuple, link)) { + tuple = ISC_LIST_NEXT(tuple, link)) + { if (tuple->op != DNS_DIFFOP_ADD) { continue; } @@ -2086,19 +2049,18 @@ failure: */ static isc_result_t add_nsec3param_records(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, - dns_dbversion_t *ver, dns_diff_t *diff) -{ - isc_result_t result = ISC_R_SUCCESS; + dns_dbversion_t *ver, dns_diff_t *diff) { + isc_result_t result = ISC_R_SUCCESS; dns_difftuple_t *tuple, *newtuple = NULL, *next; - dns_rdata_t rdata = DNS_RDATA_INIT; - unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE + 1]; - dns_diff_t temp_diff; - dns_diffop_t op; - bool flag; - dns_name_t * name = dns_zone_getorigin(zone); - dns_rdatatype_t privatetype = dns_zone_getprivatetype(zone); - uint32_t ttl = 0; - bool ttl_good = false; + dns_rdata_t rdata = DNS_RDATA_INIT; + unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE + 1]; + dns_diff_t temp_diff; + dns_diffop_t op; + bool flag; + dns_name_t *name = dns_zone_getorigin(zone); + dns_rdatatype_t privatetype = dns_zone_getprivatetype(zone); + uint32_t ttl = 0; + bool ttl_good = false; update_log(client, zone, ISC_LOG_DEBUG(3), "checking for NSEC3PARAM changes"); @@ -2112,7 +2074,8 @@ add_nsec3param_records(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, next = ISC_LIST_NEXT(tuple, link); if (tuple->rdata.type != dns_rdatatype_nsec3param || - !dns_name_equal(name, &tuple->name)) { + !dns_name_equal(name, &tuple->name)) + { continue; } ISC_LIST_UNLINK(diff->tuples, tuple, link); @@ -2145,7 +2108,8 @@ add_nsec3param_records(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, if (next->op == DNS_DIFFOP_DEL && next->rdata.length == tuple->rdata.length && !memcmp(next_data, tuple_data, - next->rdata.length)) { + next->rdata.length)) + { ISC_LIST_UNLINK(temp_diff.tuples, next, link); ISC_LIST_APPEND(diff->tuples, next, @@ -2238,7 +2202,8 @@ add_nsec3param_records(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, next_data[2] != tuple_data[2] || next_data[3] != tuple_data[3] || memcmp(next_data + 4, tuple_data + 4, - tuple->rdata.length - 4)) { + tuple->rdata.length - 4)) + { next = ISC_LIST_NEXT(next, link); continue; } @@ -2350,14 +2315,13 @@ failure: static isc_result_t rollback_private(dns_db_t *db, dns_rdatatype_t privatetype, - dns_dbversion_t *ver, dns_diff_t *diff) -{ - dns_diff_t temp_diff; - dns_diffop_t op; + dns_dbversion_t *ver, dns_diff_t *diff) { + dns_diff_t temp_diff; + dns_diffop_t op; dns_difftuple_t *tuple, *newtuple = NULL, *next; - dns_name_t * name = dns_db_origin(db); - isc_mem_t * mctx = diff->mctx; - isc_result_t result; + dns_name_t *name = dns_db_origin(db); + isc_mem_t *mctx = diff->mctx; + isc_result_t result; if (privatetype == 0) { return (ISC_R_SUCCESS); @@ -2381,7 +2345,8 @@ rollback_private(dns_db_t *db, dns_rdatatype_t privatetype, * signed with a DNSKEY to be removed. */ if (tuple->op == DNS_DIFFOP_DEL && tuple->rdata.length == 5 && - tuple->rdata.data[0] != 0 && tuple->rdata.data[4] != 0) { + tuple->rdata.data[0] != 0 && tuple->rdata.data[4] != 0) + { continue; } @@ -2412,18 +2377,17 @@ failure: */ static isc_result_t add_signing_records(dns_db_t *db, dns_rdatatype_t privatetype, - dns_dbversion_t *ver, dns_diff_t *diff) -{ - dns_difftuple_t * tuple, *newtuple = NULL, *next; + dns_dbversion_t *ver, dns_diff_t *diff) { + dns_difftuple_t *tuple, *newtuple = NULL, *next; dns_rdata_dnskey_t dnskey; - dns_rdata_t rdata = DNS_RDATA_INIT; - bool flag; - isc_region_t r; - isc_result_t result = ISC_R_SUCCESS; - uint16_t keyid; - unsigned char buf[5]; - dns_name_t * name = dns_db_origin(db); - dns_diff_t temp_diff; + dns_rdata_t rdata = DNS_RDATA_INIT; + bool flag; + isc_region_t r; + isc_result_t result = ISC_R_SUCCESS; + uint16_t keyid; + unsigned char buf[5]; + dns_name_t *name = dns_db_origin(db); + dns_diff_t temp_diff; dns_diff_init(diff->mctx, &temp_diff); @@ -2459,7 +2423,8 @@ add_signing_records(dns_db_t *db, dns_rdatatype_t privatetype, dns_name_equal(&tuple->name, &next->name) && next->rdata.length == tuple->rdata.length && !memcmp(next_data, tuple_data, - next->rdata.length)) { + next->rdata.length)) + { ISC_LIST_UNLINK(temp_diff.tuples, next, link); ISC_LIST_APPEND(diff->tuples, next, @@ -2492,15 +2457,16 @@ add_signing_records(dns_db_t *db, dns_rdatatype_t privatetype, * Process the remaining DNSKEY entries. */ for (tuple = ISC_LIST_HEAD(temp_diff.tuples); tuple != NULL; - tuple = ISC_LIST_HEAD(temp_diff.tuples)) { + tuple = ISC_LIST_HEAD(temp_diff.tuples)) + { ISC_LIST_UNLINK(temp_diff.tuples, tuple, link); ISC_LIST_APPEND(diff->tuples, tuple, link); result = dns_rdata_tostruct(&tuple->rdata, &dnskey, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); - if ((dnskey.flags & - (DNS_KEYFLAG_OWNERMASK | DNS_KEYTYPE_NOAUTH)) != - DNS_KEYOWNER_ZONE) { + if ((dnskey.flags & (DNS_KEYFLAG_OWNERMASK | + DNS_KEYTYPE_NOAUTH)) != DNS_KEYOWNER_ZONE) + { continue; } @@ -2546,10 +2512,9 @@ failure: } static bool -isdnssec(dns_db_t *db, dns_dbversion_t *ver, dns_rdatatype_t privatetype) -{ +isdnssec(dns_db_t *db, dns_dbversion_t *ver, dns_rdatatype_t privatetype) { isc_result_t result; - bool build_nsec, build_nsec3; + bool build_nsec, build_nsec3; if (dns_db_issecure(db)) { return (true); @@ -2562,35 +2527,34 @@ isdnssec(dns_db_t *db, dns_dbversion_t *ver, dns_rdatatype_t privatetype) } static void -update_action(isc_task_t *task, isc_event_t *event) -{ - update_event_t * uev = (update_event_t *)event; - dns_zone_t * zone = uev->zone; - ns_client_t * client = (ns_client_t *)event->ev_arg; - isc_result_t result; - dns_db_t * db = NULL; - dns_dbversion_t * oldver = NULL; - dns_dbversion_t * ver = NULL; - dns_diff_t diff; /* Pending updates. */ - dns_diff_t temp; /* Pending RR existence assertions. */ - bool soa_serial_changed = false; - isc_mem_t * mctx = client->mctx; - dns_rdatatype_t covers; - dns_message_t * request = client->message; - dns_rdataclass_t zoneclass; - dns_name_t * zonename; - dns_ssutable_t * ssutable = NULL; - dns_fixedname_t tmpnamefixed; - dns_name_t * tmpname = NULL; - dns_zoneopt_t options; - dns_difftuple_t * tuple; +update_action(isc_task_t *task, isc_event_t *event) { + update_event_t *uev = (update_event_t *)event; + dns_zone_t *zone = uev->zone; + ns_client_t *client = (ns_client_t *)event->ev_arg; + isc_result_t result; + dns_db_t *db = NULL; + dns_dbversion_t *oldver = NULL; + dns_dbversion_t *ver = NULL; + dns_diff_t diff; /* Pending updates. */ + dns_diff_t temp; /* Pending RR existence assertions. */ + bool soa_serial_changed = false; + isc_mem_t *mctx = client->mctx; + dns_rdatatype_t covers; + dns_message_t *request = client->message; + dns_rdataclass_t zoneclass; + dns_name_t *zonename; + dns_ssutable_t *ssutable = NULL; + dns_fixedname_t tmpnamefixed; + dns_name_t *tmpname = NULL; + dns_zoneopt_t options; + dns_difftuple_t *tuple; dns_rdata_dnskey_t dnskey; - bool had_dnskey; - dns_rdatatype_t privatetype = dns_zone_getprivatetype(zone); - dns_ttl_t maxttl = 0; - uint32_t maxrecords; - uint64_t records; - dns_aclenv_t * env = + bool had_dnskey; + dns_rdatatype_t privatetype = dns_zone_getprivatetype(zone); + dns_ttl_t maxttl = 0; + uint32_t maxrecords; + uint64_t records; + dns_aclenv_t *env = ns_interfacemgr_getaclenv(client->manager->interface->mgr); INSIST(event->ev_type == DNS_EVENT_UPDATE); @@ -2623,12 +2587,13 @@ update_action(isc_task_t *task, isc_event_t *event) for (result = dns_message_firstname(request, DNS_SECTION_PREREQUISITE); result == ISC_R_SUCCESS; - result = dns_message_nextname(request, DNS_SECTION_PREREQUISITE)) { - dns_name_t * name = NULL; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_ttl_t ttl; + result = dns_message_nextname(request, DNS_SECTION_PREREQUISITE)) + { + dns_name_t *name = NULL; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_ttl_t ttl; dns_rdataclass_t update_class; - bool flag; + bool flag; get_current_rr(request, DNS_SECTION_PREREQUISITE, zoneclass, &name, &rdata, &covers, &ttl, &update_class); @@ -2768,10 +2733,11 @@ update_action(isc_task_t *task, isc_event_t *event) for (result = dns_message_firstname(request, DNS_SECTION_UPDATE); result == ISC_R_SUCCESS; - result = dns_message_nextname(request, DNS_SECTION_UPDATE)) { - dns_name_t * name = NULL; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_ttl_t ttl; + result = dns_message_nextname(request, DNS_SECTION_UPDATE)) + { + dns_name_t *name = NULL; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_ttl_t ttl; dns_rdataclass_t update_class; get_current_rr(request, DNS_SECTION_UPDATE, zoneclass, &name, &rdata, &covers, &ttl, &update_class); @@ -2795,7 +2761,8 @@ update_action(isc_task_t *task, isc_event_t *event) } else if (update_class == dns_rdataclass_any) { if (ttl != 0 || rdata.length != 0 || (dns_rdatatype_ismeta(rdata.type) && - rdata.type != dns_rdatatype_any)) { + rdata.type != dns_rdatatype_any)) + { FAILC(DNS_R_FORMERR, "meta-RR in update"); } } else if (update_class == dns_rdataclass_none) { @@ -2833,7 +2800,7 @@ update_action(isc_task_t *task, isc_event_t *event) if (ssutable != NULL) { isc_netaddr_t netaddr; - dst_key_t * tsigkey = NULL; + dst_key_t *tsigkey = NULL; isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr); if (client->message->tsigkey != NULL) { @@ -2844,14 +2811,16 @@ update_action(isc_task_t *task, isc_event_t *event) if (!dns_ssutable_checkrules( ssutable, client->signer, name, &netaddr, TCPCLIENT(client), env, - rdata.type, tsigkey)) { + rdata.type, tsigkey)) + { FAILC(DNS_R_REFUSED, "rejected by " "secure update"); } } else { if (!ssu_checkall(db, ver, name, ssutable, client->signer, &netaddr, env, - TCPCLIENT(client), tsigkey)) { + TCPCLIENT(client), tsigkey)) + { FAILC(DNS_R_REFUSED, "rejected by " "secure update"); } @@ -2871,12 +2840,13 @@ update_action(isc_task_t *task, isc_event_t *event) options = dns_zone_getoptions(zone); for (result = dns_message_firstname(request, DNS_SECTION_UPDATE); result == ISC_R_SUCCESS; - result = dns_message_nextname(request, DNS_SECTION_UPDATE)) { - dns_name_t * name = NULL; - dns_rdata_t rdata = DNS_RDATA_INIT; - dns_ttl_t ttl; + result = dns_message_nextname(request, DNS_SECTION_UPDATE)) + { + dns_name_t *name = NULL; + dns_rdata_t rdata = DNS_RDATA_INIT; + dns_ttl_t ttl; dns_rdataclass_t update_class; - bool flag; + bool flag; get_current_rr(request, DNS_SECTION_UPDATE, zoneclass, &name, &rdata, &covers, &ttl, &update_class); @@ -2898,7 +2868,8 @@ update_action(isc_task_t *task, isc_event_t *event) } if ((rdata.type == dns_rdatatype_ns || rdata.type == dns_rdatatype_dname) && - dns_name_iswildcard(name)) { + dns_name_iswildcard(name)) + { char typebuf[DNS_RDATATYPE_FORMATSIZE]; dns_rdatatype_format(rdata.type, typebuf, @@ -2924,8 +2895,8 @@ update_action(isc_task_t *task, isc_event_t *event) CHECK(rrset_exists(db, ver, name, dns_rdatatype_cname, 0, &flag)); - if (flag && - !dns_rdatatype_atcname(rdata.type)) { + if (flag && !dns_rdatatype_atcname(rdata.type)) + { update_log(client, zone, LOGLEVEL_PROTOCOL, "attempt to add non-CNAME " @@ -2984,7 +2955,8 @@ update_action(isc_task_t *task, isc_event_t *event) } if ((options & DNS_ZONEOPT_CHECKWILDCARD) != 0 && - dns_name_internalwildcard(name)) { + dns_name_internalwildcard(name)) + { char namestr[DNS_NAME_FORMATSIZE]; dns_name_format(name, namestr, sizeof(namestr)); update_log(client, zone, LOGLEVEL_PROTOCOL, @@ -3006,12 +2978,12 @@ update_action(isc_task_t *task, isc_event_t *event) } if (isc_log_wouldlog(ns_lctx, LOGLEVEL_PROTOCOL)) { - char namestr[DNS_NAME_FORMATSIZE]; - char typestr[DNS_RDATATYPE_FORMATSIZE]; - char rdstr[2048]; + char namestr[DNS_NAME_FORMATSIZE]; + char typestr[DNS_RDATATYPE_FORMATSIZE]; + char rdstr[2048]; isc_buffer_t buf; - int len = 0; - const char * truncated = ""; + int len = 0; + const char *truncated = ""; dns_name_format(name, namestr, sizeof(namestr)); dns_rdatatype_format(rdata.type, typestr, @@ -3100,7 +3072,8 @@ update_action(isc_task_t *task, isc_event_t *event) } } else if (dns_name_equal(name, zonename) && (rdata.type == dns_rdatatype_soa || - rdata.type == dns_rdatatype_ns)) { + rdata.type == dns_rdatatype_ns)) + { update_log(client, zone, LOGLEVEL_PROTOCOL, "attempt to delete all SOA " "or NS records ignored"); @@ -3208,9 +3181,9 @@ update_action(isc_task_t *task, isc_event_t *event) * to the journal. */ if (!ISC_LIST_EMPTY(diff.tuples)) { - char * journalfile; + char *journalfile; dns_journal_t *journal; - bool has_dnskey; + bool has_dnskey; /* * Increment the SOA serial, but only if it was not @@ -3263,7 +3236,7 @@ update_action(isc_task_t *task, isc_event_t *event) &diff)); } else if (has_dnskey && isdnssec(db, ver, privatetype)) { dns_update_log_t log; - uint32_t interval = + uint32_t interval = dns_zone_getsigvalidityinterval(zone); log.func = update_log_cb; @@ -3344,10 +3317,11 @@ update_action(isc_task_t *task, isc_event_t *event) * Note: we are already committed to this course of action. */ for (tuple = ISC_LIST_HEAD(diff.tuples); tuple != NULL; - tuple = ISC_LIST_NEXT(tuple, link)) { + tuple = ISC_LIST_NEXT(tuple, link)) + { isc_region_t r; dns_secalg_t algorithm; - uint16_t keyid; + uint16_t keyid; if (tuple->rdata.type != dns_rdatatype_dnskey) { continue; @@ -3356,7 +3330,8 @@ update_action(isc_task_t *task, isc_event_t *event) dns_rdata_tostruct(&tuple->rdata, &dnskey, NULL); if ((dnskey.flags & (DNS_KEYFLAG_OWNERMASK | DNS_KEYTYPE_NOAUTH)) != - DNS_KEYOWNER_ZONE) { + DNS_KEYOWNER_ZONE) + { continue; } @@ -3381,9 +3356,10 @@ update_action(isc_task_t *task, isc_event_t *event) * Note: we are already committed to this course of action. */ for (tuple = ISC_LIST_HEAD(diff.tuples); tuple != NULL; - tuple = ISC_LIST_NEXT(tuple, link)) { - unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE]; - dns_rdata_t rdata = DNS_RDATA_INIT; + tuple = ISC_LIST_NEXT(tuple, link)) + { + unsigned char buf[DNS_NSEC3PARAM_BUFFERSIZE]; + dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_nsec3param_t nsec3param; if (tuple->rdata.type != privatetype || @@ -3453,10 +3429,9 @@ common: } static void -updatedone_action(isc_task_t *task, isc_event_t *event) -{ +updatedone_action(isc_task_t *task, isc_event_t *event) { update_event_t *uev = (update_event_t *)event; - ns_client_t * client = (ns_client_t *)event->ev_arg; + ns_client_t *client = (ns_client_t *)event->ev_arg; UNUSED(task); @@ -3489,8 +3464,7 @@ updatedone_action(isc_task_t *task, isc_event_t *event) */ static void -forward_fail(isc_task_t *task, isc_event_t *event) -{ +forward_fail(isc_task_t *task, isc_event_t *event) { ns_client_t *client = (ns_client_t *)event->ev_arg; UNUSED(task); @@ -3503,11 +3477,10 @@ forward_fail(isc_task_t *task, isc_event_t *event) } static void -forward_callback(void *arg, isc_result_t result, dns_message_t *answer) -{ +forward_callback(void *arg, isc_result_t result, dns_message_t *answer) { update_event_t *uev = arg; - ns_client_t * client = uev->ev_arg; - dns_zone_t * zone = uev->zone; + ns_client_t *client = uev->ev_arg; + dns_zone_t *zone = uev->zone; if (result != ISC_R_SUCCESS) { INSIST(answer == NULL); @@ -3525,10 +3498,9 @@ forward_callback(void *arg, isc_result_t result, dns_message_t *answer) } static void -forward_done(isc_task_t *task, isc_event_t *event) -{ +forward_done(isc_task_t *task, isc_event_t *event) { update_event_t *uev = (update_event_t *)event; - ns_client_t * client = (ns_client_t *)event->ev_arg; + ns_client_t *client = (ns_client_t *)event->ev_arg; UNUSED(task); @@ -3541,12 +3513,11 @@ forward_done(isc_task_t *task, isc_event_t *event) } static void -forward_action(isc_task_t *task, isc_event_t *event) -{ +forward_action(isc_task_t *task, isc_event_t *event) { update_event_t *uev = (update_event_t *)event; - dns_zone_t * zone = uev->zone; - ns_client_t * client = (ns_client_t *)event->ev_arg; - isc_result_t result; + dns_zone_t *zone = uev->zone; + ns_client_t *client = (ns_client_t *)event->ev_arg; + isc_result_t result; result = dns_zone_forwardupdate(zone, client->message, forward_callback, event); @@ -3564,13 +3535,12 @@ forward_action(isc_task_t *task, isc_event_t *event) } static isc_result_t -send_forward_event(ns_client_t *client, dns_zone_t *zone) -{ - char namebuf[DNS_NAME_FORMATSIZE]; - char classbuf[DNS_RDATACLASS_FORMATSIZE]; - isc_result_t result = ISC_R_SUCCESS; +send_forward_event(ns_client_t *client, dns_zone_t *zone) { + char namebuf[DNS_NAME_FORMATSIZE]; + char classbuf[DNS_RDATACLASS_FORMATSIZE]; + isc_result_t result = ISC_R_SUCCESS; update_event_t *event = NULL; - isc_task_t * zonetask = NULL; + isc_task_t *zonetask = NULL; event = (update_event_t *)isc_event_allocate( client->mctx, client, DNS_EVENT_UPDATE, forward_action, NULL, diff --git a/lib/ns/win32/DLLMain.c b/lib/ns/win32/DLLMain.c index 69e68ca22a..e104b8e4f3 100644 --- a/lib/ns/win32/DLLMain.c +++ b/lib/ns/win32/DLLMain.c @@ -16,8 +16,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/lib/ns/xfrout.c b/lib/ns/xfrout.c index 11b117d59e..2ea07f3c5b 100644 --- a/lib/ns/xfrout.c +++ b/lib/ns/xfrout.c @@ -108,8 +108,7 @@ /**************************************************************************/ static inline void -inc_stats(ns_client_t *client, dns_zone_t *zone, isc_statscounter_t counter) -{ +inc_stats(ns_client_t *client, dns_zone_t *zone, isc_statscounter_t counter) { ns_stats_increment(client->sctx->nsstats, counter); if (zone != NULL) { isc_stats_t *zonestats = dns_zone_getrequeststats(zone); @@ -124,14 +123,13 @@ inc_stats(ns_client_t *client, dns_zone_t *zone, isc_statscounter_t counter) /*% Log an RR (for debugging) */ static void -log_rr(dns_name_t *name, dns_rdata_t *rdata, uint32_t ttl) -{ - isc_result_t result; - isc_buffer_t buf; - char mem[2000]; +log_rr(dns_name_t *name, dns_rdata_t *rdata, uint32_t ttl) { + isc_result_t result; + isc_buffer_t buf; + char mem[2000]; dns_rdatalist_t rdl; - dns_rdataset_t rds; - dns_rdata_t rd = DNS_RDATA_INIT; + dns_rdataset_t rds; + dns_rdata_t rd = DNS_RDATA_INIT; dns_rdatalist_init(&rdl); rdl.type = rdata->type; @@ -182,7 +180,7 @@ log_rr(dns_name_t *name, dns_rdata_t *rdata, uint32_t ttl) typedef struct rrstream_methods rrstream_methods_t; typedef struct rrstream { - isc_mem_t * mctx; + isc_mem_t *mctx; rrstream_methods_t *methods; } rrstream_t; @@ -196,8 +194,7 @@ struct rrstream_methods { }; static void -rrstream_noop_pause(rrstream_t *rs) -{ +rrstream_noop_pause(rrstream_t *rs) { UNUSED(rs); } @@ -213,13 +210,12 @@ rrstream_noop_pause(rrstream_t *rs) */ typedef struct ixfr_rrstream { - rrstream_t common; + rrstream_t common; dns_journal_t *journal; } 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; @@ -231,10 +227,9 @@ static rrstream_methods_t ixfr_rrstream_methods; static isc_result_t ixfr_rrstream_create(isc_mem_t *mctx, const char *journal_filename, uint32_t begin_serial, uint32_t end_serial, - rrstream_t **sp) -{ + rrstream_t **sp) { ixfr_rrstream_t *s; - isc_result_t result; + isc_result_t result; INSIST(sp != NULL && *sp == NULL); @@ -257,30 +252,26 @@ failure: } static isc_result_t -ixfr_rrstream_first(rrstream_t *rs) -{ +ixfr_rrstream_first(rrstream_t *rs) { ixfr_rrstream_t *s = (ixfr_rrstream_t *)rs; return (dns_journal_first_rr(s->journal)); } static isc_result_t -ixfr_rrstream_next(rrstream_t *rs) -{ +ixfr_rrstream_next(rrstream_t *rs) { ixfr_rrstream_t *s = (ixfr_rrstream_t *)rs; return (dns_journal_next_rr(s->journal)); } static void ixfr_rrstream_current(rrstream_t *rs, dns_name_t **name, uint32_t *ttl, - dns_rdata_t **rdata) -{ + dns_rdata_t **rdata) { ixfr_rrstream_t *s = (ixfr_rrstream_t *)rs; dns_journal_current_rr(s->journal, name, ttl, rdata); } static void -ixfr_rrstream_destroy(rrstream_t **rsp) -{ +ixfr_rrstream_destroy(rrstream_t **rsp) { ixfr_rrstream_t *s = (ixfr_rrstream_t *)*rsp; if (s->journal != NULL) { dns_journal_destroy(&s->journal); @@ -303,25 +294,23 @@ static rrstream_methods_t ixfr_rrstream_methods = { */ typedef struct axfr_rrstream { - rrstream_t common; + rrstream_t common; dns_rriterator_t it; - bool it_valid; + bool it_valid; } axfr_rrstream_t; /* * 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; static isc_result_t axfr_rrstream_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *ver, - rrstream_t **sp) -{ + rrstream_t **sp) { axfr_rrstream_t *s; - isc_result_t result; + isc_result_t result; INSIST(sp != NULL && *sp == NULL); @@ -343,18 +332,17 @@ failure: } static isc_result_t -axfr_rrstream_first(rrstream_t *rs) -{ +axfr_rrstream_first(rrstream_t *rs) { axfr_rrstream_t *s = (axfr_rrstream_t *)rs; - isc_result_t result; + isc_result_t result; result = dns_rriterator_first(&s->it); if (result != ISC_R_SUCCESS) { return (result); } /* Skip SOA records. */ for (;;) { - dns_name_t * name_dummy = NULL; - uint32_t ttl_dummy; + dns_name_t *name_dummy = NULL; + uint32_t ttl_dummy; dns_rdata_t *rdata = NULL; dns_rriterator_current(&s->it, &name_dummy, &ttl_dummy, NULL, &rdata); @@ -370,15 +358,14 @@ axfr_rrstream_first(rrstream_t *rs) } static isc_result_t -axfr_rrstream_next(rrstream_t *rs) -{ +axfr_rrstream_next(rrstream_t *rs) { axfr_rrstream_t *s = (axfr_rrstream_t *)rs; - isc_result_t result; + isc_result_t result; /* Skip SOA records. */ for (;;) { - dns_name_t * name_dummy = NULL; - uint32_t ttl_dummy; + dns_name_t *name_dummy = NULL; + uint32_t ttl_dummy; dns_rdata_t *rdata = NULL; result = dns_rriterator_next(&s->it); if (result != ISC_R_SUCCESS) { @@ -395,22 +382,19 @@ axfr_rrstream_next(rrstream_t *rs) static void axfr_rrstream_current(rrstream_t *rs, dns_name_t **name, uint32_t *ttl, - dns_rdata_t **rdata) -{ + dns_rdata_t **rdata) { axfr_rrstream_t *s = (axfr_rrstream_t *)rs; dns_rriterator_current(&s->it, name, ttl, NULL, rdata); } static void -axfr_rrstream_pause(rrstream_t *rs) -{ +axfr_rrstream_pause(rrstream_t *rs) { axfr_rrstream_t *s = (axfr_rrstream_t *)rs; dns_rriterator_pause(&s->it); } static void -axfr_rrstream_destroy(rrstream_t **rsp) -{ +axfr_rrstream_destroy(rrstream_t **rsp) { axfr_rrstream_t *s = (axfr_rrstream_t *)*rsp; if (s->it_valid) { dns_rriterator_destroy(&s->it); @@ -430,24 +414,22 @@ static rrstream_methods_t axfr_rrstream_methods = { */ typedef struct soa_rrstream { - rrstream_t common; + rrstream_t common; dns_difftuple_t *soa_tuple; } soa_rrstream_t; /* * 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; static isc_result_t soa_rrstream_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *ver, - rrstream_t **sp) -{ + rrstream_t **sp) { soa_rrstream_t *s; - isc_result_t result; + isc_result_t result; INSIST(sp != NULL && *sp == NULL); @@ -469,23 +451,20 @@ failure: } static isc_result_t -soa_rrstream_first(rrstream_t *rs) -{ +soa_rrstream_first(rrstream_t *rs) { UNUSED(rs); return (ISC_R_SUCCESS); } static isc_result_t -soa_rrstream_next(rrstream_t *rs) -{ +soa_rrstream_next(rrstream_t *rs) { UNUSED(rs); return (ISC_R_NOMORE); } static void soa_rrstream_current(rrstream_t *rs, dns_name_t **name, uint32_t *ttl, - dns_rdata_t **rdata) -{ + dns_rdata_t **rdata) { soa_rrstream_t *s = (soa_rrstream_t *)rs; *name = &s->soa_tuple->name; *ttl = s->soa_tuple->ttl; @@ -493,8 +472,7 @@ soa_rrstream_current(rrstream_t *rs, dns_name_t **name, uint32_t *ttl, } static void -soa_rrstream_destroy(rrstream_t **rsp) -{ +soa_rrstream_destroy(rrstream_t **rsp) { soa_rrstream_t *s = (soa_rrstream_t *)*rsp; if (s->soa_tuple != NULL) { dns_difftuple_free(&s->soa_tuple); @@ -519,20 +497,18 @@ static rrstream_methods_t soa_rrstream_methods = { */ typedef struct compound_rrstream { - rrstream_t common; - rrstream_t * components[3]; - int state; + rrstream_t common; + rrstream_t *components[3]; + int state; isc_result_t result; } compound_rrstream_t; /* * 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; @@ -551,8 +527,7 @@ static rrstream_methods_t compound_rrstream_methods; */ static isc_result_t compound_rrstream_create(isc_mem_t *mctx, rrstream_t **soa_stream, - rrstream_t **data_stream, rrstream_t **sp) -{ + rrstream_t **data_stream, rrstream_t **sp) { compound_rrstream_t *s; INSIST(sp != NULL && *sp == NULL); @@ -574,8 +549,7 @@ compound_rrstream_create(isc_mem_t *mctx, rrstream_t **soa_stream, } static isc_result_t -compound_rrstream_first(rrstream_t *rs) -{ +compound_rrstream_first(rrstream_t *rs) { compound_rrstream_t *s = (compound_rrstream_t *)rs; s->state = 0; do { @@ -586,10 +560,9 @@ compound_rrstream_first(rrstream_t *rs) } static isc_result_t -compound_rrstream_next(rrstream_t *rs) -{ +compound_rrstream_next(rrstream_t *rs) { compound_rrstream_t *s = (compound_rrstream_t *)rs; - rrstream_t * curstream = s->components[s->state]; + rrstream_t *curstream = s->components[s->state]; s->result = curstream->methods->next(curstream); while (s->result == ISC_R_NOMORE) { /* @@ -609,10 +582,9 @@ compound_rrstream_next(rrstream_t *rs) static void compound_rrstream_current(rrstream_t *rs, dns_name_t **name, uint32_t *ttl, - dns_rdata_t **rdata) -{ + dns_rdata_t **rdata) { compound_rrstream_t *s = (compound_rrstream_t *)rs; - rrstream_t * curstream; + rrstream_t *curstream; INSIST(0 <= s->state && s->state < 3); INSIST(s->result == ISC_R_SUCCESS); curstream = s->components[s->state]; @@ -620,18 +592,16 @@ compound_rrstream_current(rrstream_t *rs, dns_name_t **name, uint32_t *ttl, } static void -compound_rrstream_pause(rrstream_t *rs) -{ +compound_rrstream_pause(rrstream_t *rs) { compound_rrstream_t *s = (compound_rrstream_t *)rs; - rrstream_t * curstream; + rrstream_t *curstream; INSIST(0 <= s->state && s->state < 3); curstream = s->components[s->state]; curstream->methods->pause(curstream); } static void -compound_rrstream_destroy(rrstream_t **rsp) -{ +compound_rrstream_destroy(rrstream_t **rsp) { compound_rrstream_t *s = (compound_rrstream_t *)*rsp; s->components[0]->methods->destroy(&s->components[0]); s->components[1]->methods->destroy(&s->components[1]); @@ -651,11 +621,11 @@ static rrstream_methods_t compound_rrstream_methods = { * Structure holding outgoing transfer statistics */ struct xfr_stats { - uint64_t nmsg; /*%< Number of messages sent */ - uint64_t nrecs; /*%< Number of records sent */ - uint64_t nbytes; /*%< Number of bytes sent */ - isc_time_t start; /*%< Start time of the transfer */ - isc_time_t end; /*%< End time of the transfer */ + uint64_t nmsg; /*%< Number of messages sent */ + uint64_t nrecs; /*%< Number of records sent */ + uint64_t nbytes; /*%< Number of bytes sent */ + isc_time_t start; /*%< Start time of the transfer */ + isc_time_t end; /*%< End time of the transfer */ }; /*% @@ -663,110 +633,104 @@ struct xfr_stats { * in progress. */ typedef struct { - isc_mem_t * mctx; - ns_client_t * client; - unsigned int id; /* ID of request */ - dns_name_t * qname; /* Question name of request */ - dns_rdatatype_t qtype; /* dns_rdatatype_{a,i}xfr */ + isc_mem_t *mctx; + ns_client_t *client; + unsigned int id; /* ID of request */ + dns_name_t *qname; /* Question name of request */ + dns_rdatatype_t qtype; /* dns_rdatatype_{a,i}xfr */ dns_rdataclass_t qclass; - dns_zone_t * zone; /* (necessary for stats) */ - dns_db_t * db; + dns_zone_t *zone; /* (necessary for stats) */ + dns_db_t *db; dns_dbversion_t *ver; - isc_quota_t * quota; - rrstream_t * stream; /* The XFR RR stream */ - bool question_added; /* QUESTION section sent? */ - bool end_of_stream; /* EOS has been reached */ - isc_buffer_t buf; /* Buffer for message owner - * names and rdatas */ - isc_buffer_t txlenbuf; /* Transmit length buffer */ - isc_buffer_t txbuf; /* Transmit message buffer */ - size_t cbytes; /* Length of current message */ - void * txmem; - unsigned int txmemlen; - dns_tsigkey_t * tsigkey; /* Key used to create TSIG */ - isc_buffer_t * lasttsig; /* the last TSIG */ - bool verified_tsig; /* verified request MAC */ - bool many_answers; - int sends; /* Send in progress */ - bool shuttingdown; - bool poll; - const char * mnemonic; /* Style of transfer */ - struct xfr_stats stats; /*%< Transfer statistics */ + isc_quota_t *quota; + rrstream_t *stream; /* The XFR RR stream */ + bool question_added; /* QUESTION section sent? */ + bool end_of_stream; /* EOS has been reached */ + isc_buffer_t buf; /* Buffer for message owner + * names and rdatas */ + isc_buffer_t txlenbuf; /* Transmit length buffer */ + isc_buffer_t txbuf; /* Transmit message buffer */ + size_t cbytes; /* Length of current message */ + void *txmem; + unsigned int txmemlen; + dns_tsigkey_t *tsigkey; /* Key used to create TSIG */ + isc_buffer_t *lasttsig; /* the last TSIG */ + bool verified_tsig; /* verified request MAC */ + bool many_answers; + int sends; /* Send in progress */ + bool shuttingdown; + bool poll; + const char *mnemonic; /* Style of transfer */ + 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); /**************************************************************************/ void -ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) -{ - isc_result_t result; - dns_name_t * question_name; - dns_rdataset_t * question_rdataset; - dns_zone_t * zone = NULL, *raw = NULL, *mayberaw; - dns_db_t * db = NULL; - dns_dbversion_t * ver = NULL; - dns_rdataclass_t question_class; - rrstream_t * soa_stream = NULL; - rrstream_t * data_stream = NULL; - rrstream_t * stream = NULL; - dns_difftuple_t * current_soa_tuple = NULL; - dns_name_t * soa_name; - dns_rdataset_t * soa_rdataset; - dns_rdata_t soa_rdata = DNS_RDATA_INIT; - bool have_soa = false; - const char * mnemonic = NULL; - isc_mem_t * mctx = client->mctx; - dns_message_t * request = client->message; - xfrout_ctx_t * xfr = NULL; - isc_quota_t * quota = NULL; +ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { + isc_result_t result; + dns_name_t *question_name; + dns_rdataset_t *question_rdataset; + dns_zone_t *zone = NULL, *raw = NULL, *mayberaw; + dns_db_t *db = NULL; + dns_dbversion_t *ver = NULL; + dns_rdataclass_t question_class; + rrstream_t *soa_stream = NULL; + rrstream_t *data_stream = NULL; + rrstream_t *stream = NULL; + dns_difftuple_t *current_soa_tuple = NULL; + dns_name_t *soa_name; + dns_rdataset_t *soa_rdataset; + dns_rdata_t soa_rdata = DNS_RDATA_INIT; + bool have_soa = false; + const char *mnemonic = NULL; + isc_mem_t *mctx = client->mctx; + dns_message_t *request = client->message; + xfrout_ctx_t *xfr = NULL; + isc_quota_t *quota = NULL; dns_transfer_format_t format = client->view->transfer_format; - isc_netaddr_t na; - dns_peer_t * peer = NULL; - isc_buffer_t * tsigbuf = NULL; - char * journalfile; - char msg[NS_CLIENT_ACLMSGSIZE("zone transfer")]; - char keyname[DNS_NAME_FORMATSIZE]; - bool is_poll = false; - bool is_dlz = false; - bool is_ixfr = false; - bool useviewacl = false; - uint32_t begin_serial = 0, current_serial; + isc_netaddr_t na; + dns_peer_t *peer = NULL; + isc_buffer_t *tsigbuf = NULL; + char *journalfile; + char msg[NS_CLIENT_ACLMSGSIZE("zone transfer")]; + char keyname[DNS_NAME_FORMATSIZE]; + bool is_poll = false; + bool is_dlz = false; + bool is_ixfr = false; + bool useviewacl = false; + uint32_t begin_serial = 0, current_serial; switch (reqtype) { case dns_rdatatype_axfr: @@ -890,7 +854,8 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) */ for (result = dns_message_firstname(request, DNS_SECTION_AUTHORITY); result == ISC_R_SUCCESS; - result = dns_message_nextname(request, DNS_SECTION_AUTHORITY)) { + result = dns_message_nextname(request, DNS_SECTION_AUTHORITY)) + { soa_name = NULL; dns_message_currentname(request, DNS_SECTION_AUTHORITY, &soa_name); @@ -904,7 +869,8 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) for (soa_rdataset = ISC_LIST_HEAD(soa_name->list); soa_rdataset != NULL; - soa_rdataset = ISC_LIST_NEXT(soa_rdataset, link)) { + soa_rdataset = ISC_LIST_NEXT(soa_rdataset, link)) + { /* * Ignore non-SOA data. */ @@ -956,7 +922,8 @@ got_soa: * AXFR over UDP is not possible. */ if (reqtype == dns_rdatatype_axfr && - (client->attributes & NS_CLIENTATTR_TCP) == 0) { + (client->attributes & NS_CLIENTATTR_TCP) == 0) + { FAILC(DNS_R_FORMERR, "attempted AXFR over UDP"); } @@ -1020,7 +987,8 @@ got_soa: * IXFR over UDP (currently, we always do). */ if (DNS_SERIAL_GE(begin_serial, current_serial) || - (client->attributes & NS_CLIENTATTR_TCP) == 0) { + (client->attributes & NS_CLIENTATTR_TCP) == 0) + { CHECK(soa_rrstream_create(mctx, db, ver, &stream)); is_poll = true; goto have_stream; @@ -1115,9 +1083,10 @@ have_stream: mayberaw = (raw != NULL) ? raw : zone; if ((client->attributes & NS_CLIENTATTR_WANTEXPIRE) != 0 && (dns_zone_gettype(mayberaw) == dns_zone_slave || - dns_zone_gettype(mayberaw) == dns_zone_mirror)) { + dns_zone_gettype(mayberaw) == dns_zone_mirror)) + { isc_time_t expiretime; - uint32_t secs; + uint32_t secs; dns_zone_getexpiretime(zone, &expiretime); secs = isc_time_seconds(&expiretime); if (secs >= client->now && result == ISC_R_SUCCESS) { @@ -1187,11 +1156,11 @@ xfrout_ctx_create(isc_mem_t *mctx, ns_client_t *client, unsigned int id, 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) -{ + unsigned int idletime, bool many_answers, + xfrout_ctx_t **xfrp) { xfrout_ctx_t *xfr; - unsigned int len; - void * mem; + unsigned int len; + void *mem; REQUIRE(xfrp != NULL && *xfrp == NULL); @@ -1292,20 +1261,19 @@ xfrout_ctx_create(isc_mem_t *mctx, ns_client_t *client, unsigned int id, * _first method of the iterator has been called). */ static void -sendstream(xfrout_ctx_t *xfr) -{ - dns_message_t * tcpmsg = NULL; - dns_message_t * msg = NULL; /* Client message if UDP, tcpmsg if TCP */ - isc_result_t result; - dns_rdataset_t * qrdataset; - dns_name_t * msgname = NULL; - dns_rdata_t * msgrdata = NULL; +sendstream(xfrout_ctx_t *xfr) { + dns_message_t *tcpmsg = NULL; + dns_message_t *msg = NULL; /* Client message if UDP, tcpmsg if TCP */ + isc_result_t result; + dns_rdataset_t *qrdataset; + dns_name_t *msgname = NULL; + dns_rdata_t *msgrdata = NULL; dns_rdatalist_t *msgrdl = NULL; - dns_rdataset_t * msgrds = NULL; - dns_compress_t cctx; - bool cleanup_cctx = false; - bool is_tcp; - int n_rrs; + dns_rdataset_t *msgrds = NULL; + dns_compress_t cctx; + bool cleanup_cctx = false; + bool is_tcp; + int n_rrs; isc_buffer_clear(&xfr->buf); isc_buffer_clear(&xfr->txlenbuf); @@ -1374,7 +1342,7 @@ sendstream(xfrout_ctx_t *xfr) * have a question section. */ if (!xfr->question_added) { - dns_name_t * qname = NULL; + dns_name_t *qname = NULL; isc_region_t r; /* @@ -1422,8 +1390,8 @@ sendstream(xfrout_ctx_t *xfr) * format has been requested. */ for (n_rrs = 0;; n_rrs++) { - dns_name_t * name = NULL; - uint32_t ttl; + dns_name_t *name = NULL; + uint32_t ttl; dns_rdata_t *rdata = NULL; unsigned int size; @@ -1536,7 +1504,8 @@ sendstream(xfrout_ctx_t *xfr) */ if ((isc_buffer_usedlength(&xfr->buf) >= xfr->client->sctx->transfer_tcp_message_size) && - is_tcp) { + is_tcp) + { break; } } @@ -1613,8 +1582,7 @@ failure: } static void -xfrout_ctx_destroy(xfrout_ctx_t **xfrp) -{ +xfrout_ctx_destroy(xfrout_ctx_t **xfrp) { xfrout_ctx_t *xfr = *xfrp; *xfrp = NULL; @@ -1652,8 +1620,7 @@ xfrout_ctx_destroy(xfrout_ctx_t **xfrp) } static void -xfrout_senddone(isc_nmhandle_t *handle, isc_result_t result, void *arg) -{ +xfrout_senddone(isc_nmhandle_t *handle, isc_result_t result, void *arg) { xfrout_ctx_t *xfr = (xfrout_ctx_t *)arg; REQUIRE((xfr->client->attributes & NS_CLIENTATTR_TCP) != 0); @@ -1710,8 +1677,7 @@ 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) -{ +xfrout_fail(xfrout_ctx_t *xfr, isc_result_t result, const char *msg) { xfr->shuttingdown = true; xfrout_log(xfr, ISC_LOG_ERROR, "%s: %s", msg, isc_result_totext(result)); @@ -1719,8 +1685,7 @@ xfrout_fail(xfrout_ctx_t *xfr, isc_result_t result, const char *msg) } static void -xfrout_maybe_destroy(xfrout_ctx_t *xfr) -{ +xfrout_maybe_destroy(xfrout_ctx_t *xfr) { INSIST(xfr->shuttingdown == true); #if 0 if (xfr->sends > 0) { @@ -1741,8 +1706,7 @@ xfrout_maybe_destroy(xfrout_ctx_t *xfr) } static void -xfrout_client_shutdown(void *arg, isc_result_t result) -{ +xfrout_client_shutdown(void *arg, isc_result_t result) { xfrout_ctx_t *xfr = (xfrout_ctx_t *)arg; xfrout_fail(xfr, result, "aborted"); } @@ -1752,14 +1716,13 @@ 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, - int level, const char *fmt, va_list ap) -{ + int level, const char *fmt, va_list ap) { char msgbuf[2048]; char namebuf[DNS_NAME_FORMATSIZE]; char classbuf[DNS_RDATACLASS_FORMATSIZE]; @@ -1777,8 +1740,7 @@ xfrout_logv(ns_client_t *client, dns_name_t *zonename, dns_rdataclass_t rdclass, */ static void xfrout_log1(ns_client_t *client, dns_name_t *zonename, dns_rdataclass_t rdclass, - int level, const char *fmt, ...) -{ + int level, const char *fmt, ...) { va_list ap; va_start(ap, fmt); xfrout_logv(client, zonename, rdclass, level, fmt, ap); @@ -1789,8 +1751,7 @@ xfrout_log1(ns_client_t *client, dns_name_t *zonename, dns_rdataclass_t rdclass, * Logging function for use when there is a xfrout_ctx_t. */ static void -xfrout_log(xfrout_ctx_t *xfr, int level, const char *fmt, ...) -{ +xfrout_log(xfrout_ctx_t *xfr, int level, const char *fmt, ...) { va_list ap; va_start(ap, fmt); xfrout_logv(xfr->client, xfr->qname, xfr->qclass, level, fmt, ap); diff --git a/lib/samples/nsprobe.c b/lib/samples/nsprobe.c index 3645a9abf3..9898717970 100644 --- a/lib/samples/nsprobe.c +++ b/lib/samples/nsprobe.c @@ -49,12 +49,12 @@ #define MAX_PROBES 1000 static dns_client_t *client = NULL; -static isc_task_t * probe_task = NULL; +static isc_task_t *probe_task = NULL; static isc_appctx_t *actx = NULL; -static isc_mem_t * mctx = NULL; -static unsigned int outstanding_probes = 0; -const char * cacheserver = "127.0.0.1"; -static FILE * input; +static isc_mem_t *mctx = NULL; +static unsigned int outstanding_probes = 0; +const char *cacheserver = "127.0.0.1"; +static FILE *input; typedef enum { none, @@ -82,21 +82,21 @@ struct probe_ns { ISC_LINK(struct probe_ns) link; dns_fixedname_t fixedname; - dns_name_t * name; - struct server * current_server; + dns_name_t *name; + struct server *current_server; ISC_LIST(struct server) servers; }; struct probe_trans { - bool inuse; - char * domain; - dns_fixedname_t fixedname; - dns_name_t * qname; - const char ** qlabel; - bool qname_found; + bool inuse; + char *domain; + dns_fixedname_t fixedname; + dns_name_t *qname; + const char **qlabel; + bool qname_found; dns_clientrestrans_t *resid; - dns_message_t * qmessage; - dns_message_t * rmessage; + dns_message_t *qmessage; + dns_message_t *rmessage; dns_clientreqtrans_t *reqid; /* NS list */ @@ -116,31 +116,26 @@ struct lcl_stat { unsigned long unknown; } server_stat, domain_stat; -static unsigned long number_of_domains = 0; -static unsigned long number_of_servers = 0; -static unsigned long multiple_error_domains = 0; -static bool debug_mode = false; -static int verbose_level = 0; -static const char * qlabels[] = { "www.", "ftp.", NULL }; +static unsigned long number_of_domains = 0; +static unsigned long number_of_servers = 0; +static unsigned long multiple_error_domains = 0; +static bool debug_mode = false; +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 -print_rdataset(dns_rdataset_t *rdataset, dns_name_t *owner) -{ +print_rdataset(dns_rdataset_t *rdataset, dns_name_t *owner) { isc_buffer_t target; isc_result_t result; isc_region_t r; - char t[4096]; + char t[4096]; if (!debug_mode) { return (ISC_R_SUCCESS); @@ -162,12 +157,11 @@ print_rdataset(dns_rdataset_t *rdataset, dns_name_t *owner) } static isc_result_t -print_name(dns_name_t *name) -{ +print_name(dns_name_t *name) { isc_result_t result; isc_buffer_t target; isc_region_t r; - char t[4096]; + char t[4096]; isc_buffer_init(&target, t, sizeof(t)); result = dns_name_totext(name, true, &target); @@ -182,12 +176,12 @@ print_name(dns_name_t *name) } static isc_result_t -print_address(FILE *fp, isc_sockaddr_t *addr) -{ +print_address(FILE *fp, isc_sockaddr_t *addr) { char buf[NI_MAXHOST]; if (getnameinfo(&addr->type.sa, addr->length, buf, sizeof(buf), NULL, 0, - NI_NUMERICHOST) == 0) { + NI_NUMERICHOST) == 0) + { fprintf(fp, "%s", buf); } else { fprintf(fp, "(invalid address)"); @@ -198,8 +192,7 @@ print_address(FILE *fp, isc_sockaddr_t *addr) static void ctxs_destroy(isc_mem_t **mctxp, isc_appctx_t **actxp, isc_taskmgr_t **taskmgrp, - isc_socketmgr_t **socketmgrp, isc_timermgr_t **timermgrp) -{ + isc_socketmgr_t **socketmgrp, isc_timermgr_t **timermgrp) { if (*taskmgrp != NULL) { isc_taskmgr_destroy(taskmgrp); } @@ -223,8 +216,7 @@ ctxs_destroy(isc_mem_t **mctxp, isc_appctx_t **actxp, isc_taskmgr_t **taskmgrp, static isc_result_t ctxs_init(isc_mem_t **mctxp, isc_appctx_t **actxp, isc_taskmgr_t **taskmgrp, - isc_socketmgr_t **socketmgrp, isc_timermgr_t **timermgrp) -{ + isc_socketmgr_t **socketmgrp, isc_timermgr_t **timermgrp) { isc_result_t result; isc_mem_create(mctxp); @@ -262,11 +254,10 @@ fail: */ static isc_result_t make_querymessage(dns_message_t *message, dns_name_t *qname0, - dns_rdatatype_t rdtype) -{ - dns_name_t * qname = NULL; + dns_rdatatype_t rdtype) { + dns_name_t *qname = NULL; dns_rdataset_t *qrdataset = NULL; - isc_result_t result; + isc_result_t result; message->opcode = dns_opcode_query; message->rdclass = dns_rdataclass_in; @@ -303,29 +294,29 @@ cleanup: * Update statistics */ static inline void -increment_entry(unsigned long *entryp) -{ +increment_entry(unsigned long *entryp) { (*entryp)++; INSIST(*entryp != 0U); /* check overflow */ } static void -update_stat(struct probe_trans *trans) -{ +update_stat(struct probe_trans *trans) { struct probe_ns *pns; - struct server * server; - struct lcl_stat local_stat; - unsigned int err_count = 0; - const char * stattype; + struct server *server; + struct lcl_stat local_stat; + unsigned int err_count = 0; + const char *stattype; increment_entry(&number_of_domains); memset(&local_stat, 0, sizeof(local_stat)); /* Update per sever statistics */ for (pns = ISC_LIST_HEAD(trans->nslist); pns != NULL; - pns = ISC_LIST_NEXT(pns, link)) { + pns = ISC_LIST_NEXT(pns, link)) + { for (server = ISC_LIST_HEAD(pns->servers); server != NULL; - server = ISC_LIST_NEXT(server, link)) { + server = ISC_LIST_NEXT(server, link)) + { increment_entry(&number_of_servers); if (server->result_aaaa == exist || @@ -401,7 +392,8 @@ update_stat(struct probe_trans *trans) if (verbose_level > 1 || (verbose_level == 1 && strcmp(stattype, "valid") != 0 && - strcmp(stattype, "unknown") != 0)) { + strcmp(stattype, "unknown") != 0)) + { print_name(pns->name); putchar('('); print_address(stdout, &server->address); @@ -494,12 +486,11 @@ update_stat(struct probe_trans *trans) */ static isc_result_t -set_nextqname(struct probe_trans *trans) -{ +set_nextqname(struct probe_trans *trans) { isc_result_t result; unsigned int domainlen; isc_buffer_t b; - char buf[4096]; /* XXX ad-hoc constant, but should be enough */ + char buf[4096]; /* XXX ad-hoc constant, but should be enough */ if (*trans->qlabel == NULL) { return (ISC_R_NOMORE); @@ -525,18 +516,17 @@ set_nextqname(struct probe_trans *trans) } static void -request_done(isc_task_t *task, isc_event_t *event) -{ - struct probe_trans * trans = event->ev_arg; +request_done(isc_task_t *task, isc_event_t *event) { + struct probe_trans *trans = event->ev_arg; dns_clientreqevent_t *rev = (dns_clientreqevent_t *)event; - dns_message_t * rmessage; - struct probe_ns * pns; - struct server * server; - isc_result_t result; - query_result_t * resultp; - dns_name_t * name; - dns_rdataset_t * rdataset; - dns_rdatatype_t type; + dns_message_t *rmessage; + struct probe_ns *pns; + struct server *server; + isc_result_t result; + query_result_t *resultp; + dns_name_t *name; + dns_rdataset_t *rdataset; + dns_rdatatype_t type; REQUIRE(task == probe_task); REQUIRE(trans != NULL && trans->inuse == true); @@ -574,13 +564,15 @@ request_done(isc_task_t *task, isc_event_t *event) rmessage, DNS_SECTION_ANSWER, &name); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { (void)print_rdataset(rdataset, name); if (rdataset->type == dns_rdatatype_cname || rdataset->type == - dns_rdatatype_dname) { + dns_rdatatype_dname) + { /* Should chase the chain? */ *resultp = exist; goto found; @@ -601,7 +593,8 @@ request_done(isc_task_t *task, isc_event_t *event) *resultp = unexpected; } } else if (rev->result == DNS_R_RECOVERABLE || - rev->result == DNS_R_BADLABELTYPE) { + rev->result == DNS_R_BADLABELTYPE) + { /* Broken response. Try identifying known cases. */ *resultp = brokenanswer; @@ -618,7 +611,8 @@ request_done(isc_task_t *task, isc_event_t *event) rmessage, DNS_SECTION_ANSWER, &name); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (rdataset->type == dns_rdatatype_cname && dns_rdataset_count(rdataset) > 1) { @@ -644,7 +638,8 @@ request_done(isc_task_t *task, isc_event_t *event) rmessage, DNS_SECTION_AUTHORITY, &name); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (rdataset->type == dns_rdatatype_soa && dns_rdataset_count(rdataset) > 1) { @@ -704,7 +699,8 @@ found: pns->servers); server != NULL; server = ISC_LIST_NEXT(server, - link)) { + link)) + { INSIST(server->result_aaaa == none); server->result_a = none; @@ -727,11 +723,10 @@ found: } static isc_result_t -probe_name(struct probe_trans *trans, dns_rdatatype_t type) -{ - isc_result_t result; +probe_name(struct probe_trans *trans, dns_rdatatype_t type) { + isc_result_t result; struct probe_ns *pns; - struct server * server; + struct server *server; REQUIRE(trans->reqid == NULL); REQUIRE(type == dns_rdatatype_a || type == dns_rdatatype_aaaa); @@ -739,11 +734,13 @@ probe_name(struct probe_trans *trans, dns_rdatatype_t type) for (pns = trans->current_ns; pns != NULL; pns = ISC_LIST_NEXT(pns, link)) { for (server = ISC_LIST_HEAD(pns->servers); server != NULL; - server = ISC_LIST_NEXT(server, link)) { + server = ISC_LIST_NEXT(server, link)) + { if ((type == dns_rdatatype_a && server->result_a == none) || (type == dns_rdatatype_aaaa && - server->result_aaaa == none)) { + server->result_aaaa == none)) + { pns->current_server = server; goto found; } @@ -776,15 +773,14 @@ found: */ static void -resolve_nsaddress(isc_task_t *task, isc_event_t *event) -{ - struct probe_trans * trans = event->ev_arg; +resolve_nsaddress(isc_task_t *task, isc_event_t *event) { + struct probe_trans *trans = event->ev_arg; dns_clientresevent_t *rev = (dns_clientresevent_t *)event; - dns_name_t * name; - dns_rdataset_t * rdataset; - dns_rdata_t rdata = DNS_RDATA_INIT; - struct probe_ns * pns = trans->current_ns; - isc_result_t result; + dns_name_t *name; + dns_rdataset_t *rdataset; + dns_rdata_t rdata = DNS_RDATA_INIT; + struct probe_ns *pns = trans->current_ns; + isc_result_t result; REQUIRE(task == probe_task); REQUIRE(trans->inuse == true); @@ -792,9 +788,11 @@ resolve_nsaddress(isc_task_t *task, isc_event_t *event) INSIST(outstanding_probes > 0); for (name = ISC_LIST_HEAD(rev->answerlist); name != NULL; - name = ISC_LIST_NEXT(name, link)) { + name = ISC_LIST_NEXT(name, link)) + { for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { (void)print_rdataset(rdataset, name); if (rdataset->type != dns_rdatatype_a) { @@ -803,9 +801,10 @@ resolve_nsaddress(isc_task_t *task, isc_event_t *event) for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { dns_rdata_in_a_t rdata_a; - struct server * server; + struct server *server; dns_rdataset_current(rdataset, &rdata); result = dns_rdata_tostruct(&rdata, &rdata_a, @@ -852,8 +851,7 @@ next_ns: } static isc_result_t -fetch_nsaddress(struct probe_trans *trans) -{ +fetch_nsaddress(struct probe_trans *trans) { struct probe_ns *pns; pns = trans->current_ns; @@ -869,11 +867,10 @@ fetch_nsaddress(struct probe_trans *trans) */ static void -reset_probe(struct probe_trans *trans) -{ +reset_probe(struct probe_trans *trans) { struct probe_ns *pns; - struct server * server; - isc_result_t result; + struct server *server; + isc_result_t result; REQUIRE(trans->resid == NULL); REQUIRE(trans->reqid == NULL); @@ -914,24 +911,25 @@ reset_probe(struct probe_trans *trans) } static void -resolve_ns(isc_task_t *task, isc_event_t *event) -{ - struct probe_trans * trans = event->ev_arg; +resolve_ns(isc_task_t *task, isc_event_t *event) { + struct probe_trans *trans = event->ev_arg; dns_clientresevent_t *rev = (dns_clientresevent_t *)event; - dns_name_t * name; - dns_rdataset_t * rdataset; - isc_result_t result = ISC_R_SUCCESS; - dns_rdata_t rdata = DNS_RDATA_INIT; - struct probe_ns * pns; + dns_name_t *name; + dns_rdataset_t *rdataset; + isc_result_t result = ISC_R_SUCCESS; + dns_rdata_t rdata = DNS_RDATA_INIT; + struct probe_ns *pns; REQUIRE(task == probe_task); REQUIRE(trans->inuse == true); INSIST(outstanding_probes > 0); for (name = ISC_LIST_HEAD(rev->answerlist); name != NULL; - name = ISC_LIST_NEXT(name, link)) { + name = ISC_LIST_NEXT(name, link)) + { for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { (void)print_rdataset(rdataset, name); if (rdataset->type != dns_rdatatype_ns) { @@ -940,7 +938,8 @@ resolve_ns(isc_task_t *task, isc_event_t *event) for (result = dns_rdataset_first(rdataset); result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) { + result = dns_rdataset_next(rdataset)) + { dns_rdata_ns_t ns; dns_rdataset_current(rdataset, &rdata); @@ -987,13 +986,12 @@ resolve_ns(isc_task_t *task, isc_event_t *event) } static isc_result_t -probe_domain(struct probe_trans *trans) -{ +probe_domain(struct probe_trans *trans) { isc_result_t result; unsigned int domainlen; isc_buffer_t b; - char buf[4096]; /* XXX ad hoc constant, but should be enough */ - char * cp; + char buf[4096]; /* XXX ad hoc constant, but should be enough */ + char *cp; REQUIRE(trans != NULL); REQUIRE(trans->inuse == false); @@ -1037,12 +1035,10 @@ 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) -{ +usage(void) { fprintf(stderr, "usage: nsprobe [-d] [-v [-v...]] [-c cache_address] " "[input_file]\n"); @@ -1050,16 +1046,15 @@ usage(void) } int -main(int argc, char *argv[]) -{ - int i, ch, error; - struct addrinfo hints, *res; - isc_result_t result; - isc_sockaddr_t sa; +main(int argc, char *argv[]) { + int i, ch, error; + struct addrinfo hints, *res; + isc_result_t result; + isc_sockaddr_t sa; isc_sockaddrlist_t servers; - isc_taskmgr_t * taskmgr = NULL; - isc_socketmgr_t * socketmgr = NULL; - isc_timermgr_t * timermgr = NULL; + isc_taskmgr_t *taskmgr = NULL; + isc_socketmgr_t *socketmgr = NULL; + isc_timermgr_t *timermgr = NULL; while ((ch = isc_commandline_parse(argc, argv, "c:dhv")) != -1) { switch (ch) { diff --git a/lib/samples/resolve.c b/lib/samples/resolve.c index 9c914d3ff3..ed40d16e95 100644 --- a/lib/samples/resolve.c +++ b/lib/samples/resolve.c @@ -56,12 +56,11 @@ static char *algname; static isc_result_t -printdata(dns_rdataset_t *rdataset, dns_name_t *owner) -{ +printdata(dns_rdataset_t *rdataset, dns_name_t *owner) { isc_buffer_t target; isc_result_t result; isc_region_t r; - char t[4096]; + char t[4096]; if (!dns_rdataset_isassociated(rdataset)) { printf("[WARN: empty]\n"); @@ -80,12 +79,10 @@ 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) -{ +usage(void) { fprintf(stderr, "resolve [-t RRtype] " "[[-a algorithm] [-e] -k keyname -K keystring] " "[-S domain:serveraddr_for_domain ] [-s server_address]" @@ -96,21 +93,20 @@ usage(void) static void set_key(dns_client_t *client, char *keynamestr, char *keystr, bool is_sep, - isc_mem_t **mctxp) -{ - isc_result_t result; - dns_fixedname_t fkeyname; - unsigned int namelen; - dns_name_t * keyname; + isc_mem_t **mctxp) { + isc_result_t result; + dns_fixedname_t fkeyname; + unsigned int namelen; + dns_name_t *keyname; dns_rdata_dnskey_t keystruct; - unsigned char keydata[4096]; - isc_buffer_t keydatabuf; - unsigned char rrdata[4096]; - isc_buffer_t rrdatabuf; - isc_buffer_t b; - isc_textregion_t tr; - isc_region_t r; - dns_secalg_t alg; + unsigned char keydata[4096]; + isc_buffer_t keydatabuf; + unsigned char rrdata[4096]; + isc_buffer_t rrdatabuf; + isc_buffer_t b; + isc_textregion_t tr; + isc_region_t r; + dns_secalg_t alg; isc_mem_create(mctxp); @@ -173,17 +169,16 @@ set_key(dns_client_t *client, char *keynamestr, char *keystr, bool is_sep, static void addserver(dns_client_t *client, const char *addrstr, const char *port, - const char *name_space) -{ - struct addrinfo hints, *res; - int gaierror; - isc_sockaddr_t sa; + const char *name_space) { + struct addrinfo hints, *res; + int gaierror; + isc_sockaddr_t sa; isc_sockaddrlist_t servers; - isc_result_t result; - unsigned int namelen; - isc_buffer_t b; - dns_fixedname_t fname; - dns_name_t * name = NULL; + isc_result_t result; + unsigned int namelen; + isc_buffer_t b; + dns_fixedname_t fname; + dns_name_t *name = NULL; memset(&hints, 0, sizeof(hints)); hints.ai_family = AF_UNSPEC; @@ -226,38 +221,37 @@ addserver(dns_client_t *client, const char *addrstr, const char *port, } int -main(int argc, char *argv[]) -{ - int ch; +main(int argc, char *argv[]) { + int ch; isc_textregion_t tr; - char * server = NULL; - char * altserver = NULL; - char * altserveraddr = NULL; - char * altservername = NULL; - dns_client_t * client = NULL; - char * keynamestr = NULL; - char * keystr = NULL; - isc_result_t result; - isc_buffer_t b; - dns_fixedname_t qname0; - unsigned int namelen; - dns_name_t * qname, *name; - dns_rdatatype_t type = dns_rdatatype_a; - dns_rdataset_t * rdataset; - dns_namelist_t namelist; - isc_mem_t * keymctx = NULL; - unsigned int clientopt, resopt; - bool is_sep = false; - const char * port = "53"; - isc_mem_t * mctx = NULL; - isc_appctx_t * actx = NULL; - isc_taskmgr_t * taskmgr = NULL; + char *server = NULL; + char *altserver = NULL; + char *altserveraddr = NULL; + char *altservername = NULL; + dns_client_t *client = NULL; + char *keynamestr = NULL; + char *keystr = NULL; + isc_result_t result; + isc_buffer_t b; + dns_fixedname_t qname0; + unsigned int namelen; + dns_name_t *qname, *name; + dns_rdatatype_t type = dns_rdatatype_a; + dns_rdataset_t *rdataset; + dns_namelist_t namelist; + isc_mem_t *keymctx = NULL; + unsigned int clientopt, resopt; + bool is_sep = false; + const char *port = "53"; + isc_mem_t *mctx = NULL; + isc_appctx_t *actx = NULL; + isc_taskmgr_t *taskmgr = NULL; isc_socketmgr_t *socketmgr = NULL; - isc_timermgr_t * timermgr = NULL; - struct in_addr in4; - struct in6_addr in6; - isc_sockaddr_t a4, a6; - isc_sockaddr_t * addr4 = NULL, *addr6 = NULL; + isc_timermgr_t *timermgr = NULL; + struct in_addr in4; + struct in6_addr in6; + isc_sockaddr_t a4, a6; + isc_sockaddr_t *addr4 = NULL, *addr6 = NULL; while ((ch = isc_commandline_parse(argc, argv, "a:b:es:t:k:K:p:S:")) != -1) { @@ -400,7 +394,7 @@ main(int argc, char *argv[]) /* Set the nameserver */ if (server == NULL) { - irs_resconf_t * resconf = NULL; + irs_resconf_t *resconf = NULL; isc_sockaddrlist_t *nameservers; result = irs_resconf_load(mctx, "/etc/resolv.conf", &resconf); @@ -461,9 +455,11 @@ main(int argc, char *argv[]) dns_result_totext(result)); } for (name = ISC_LIST_HEAD(namelist); name != NULL; - name = ISC_LIST_NEXT(name, link)) { + name = ISC_LIST_NEXT(name, link)) + { for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { if (printdata(rdataset, name) != ISC_R_SUCCESS) { fprintf(stderr, "print data failed\n"); } diff --git a/lib/samples/sample-async.c b/lib/samples/sample-async.c index 907b519b04..eebc2d365a 100644 --- a/lib/samples/sample-async.c +++ b/lib/samples/sample-async.c @@ -47,31 +47,29 @@ #define MAX_QUERIES 100 static dns_client_t *client = NULL; -static isc_task_t * query_task = NULL; +static isc_task_t *query_task = NULL; static isc_appctx_t *query_actx = NULL; -static unsigned int outstanding_queries = 0; -static const char * def_server = "127.0.0.1"; -static FILE * fp; +static unsigned int outstanding_queries = 0; +static const char *def_server = "127.0.0.1"; +static FILE *fp; struct query_trans { - int id; - bool inuse; - dns_rdatatype_t type; - dns_fixedname_t fixedname; - dns_name_t * qname; - dns_namelist_t answerlist; + int id; + bool inuse; + dns_rdatatype_t type; + dns_fixedname_t fixedname; + dns_name_t *qname; + dns_namelist_t answerlist; dns_clientrestrans_t *xid; }; 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, - isc_socketmgr_t **socketmgrp, isc_timermgr_t **timermgrp) -{ + isc_socketmgr_t **socketmgrp, isc_timermgr_t **timermgrp) { if (*taskmgrp != NULL) { isc_taskmgr_destroy(taskmgrp); } @@ -95,8 +93,7 @@ ctxs_destroy(isc_mem_t **mctxp, isc_appctx_t **actxp, isc_taskmgr_t **taskmgrp, static isc_result_t ctxs_init(isc_mem_t **mctxp, isc_appctx_t **actxp, isc_taskmgr_t **taskmgrp, - isc_socketmgr_t **socketmgrp, isc_timermgr_t **timermgrp) -{ + isc_socketmgr_t **socketmgrp, isc_timermgr_t **timermgrp) { isc_result_t result; isc_mem_create(mctxp); @@ -130,12 +127,11 @@ fail: } static isc_result_t -printdata(dns_rdataset_t *rdataset, dns_name_t *owner) -{ +printdata(dns_rdataset_t *rdataset, dns_name_t *owner) { isc_buffer_t target; isc_result_t result; isc_region_t r; - char t[4096]; + char t[4096]; isc_buffer_init(&target, t, sizeof(t)); @@ -153,13 +149,12 @@ printdata(dns_rdataset_t *rdataset, dns_name_t *owner) } static void -process_answer(isc_task_t *task, isc_event_t *event) -{ - struct query_trans * trans = event->ev_arg; +process_answer(isc_task_t *task, isc_event_t *event) { + struct query_trans *trans = event->ev_arg; dns_clientresevent_t *rev = (dns_clientresevent_t *)event; - dns_name_t * name; - dns_rdataset_t * rdataset; - isc_result_t result; + dns_name_t *name; + dns_rdataset_t *rdataset; + isc_result_t result; REQUIRE(task == query_task); REQUIRE(trans->inuse == true); @@ -173,9 +168,11 @@ process_answer(isc_task_t *task, isc_event_t *event) } for (name = ISC_LIST_HEAD(rev->answerlist); name != NULL; - name = ISC_LIST_NEXT(name, link)) { + name = ISC_LIST_NEXT(name, link)) + { for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) { + rdataset = ISC_LIST_NEXT(rdataset, link)) + { (void)printdata(rdataset, name); } } @@ -206,13 +203,12 @@ process_answer(isc_task_t *task, isc_event_t *event) } static isc_result_t -dispatch_query(struct query_trans *trans) -{ +dispatch_query(struct query_trans *trans) { isc_result_t result; unsigned int namelen; isc_buffer_t b; - char buf[4096]; /* XXX ad hoc constant, but should be enough */ - char * cp; + char buf[4096]; /* XXX ad hoc constant, but should be enough */ + char *cp; REQUIRE(trans != NULL); REQUIRE(trans->inuse == false); @@ -256,12 +252,10 @@ 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) -{ +usage(void) { fprintf(stderr, "usage: sample-async [-s server_address] [-t RR type] " "input_file\n"); @@ -269,22 +263,21 @@ usage(void) } int -main(int argc, char *argv[]) -{ - int ch; - isc_textregion_t tr; - isc_mem_t * mctx = NULL; - isc_taskmgr_t * taskmgr = NULL; - isc_socketmgr_t * socketmgr = NULL; - isc_timermgr_t * timermgr = NULL; - int nservers = 0; - const char * serveraddr[MAX_SERVERS]; - isc_sockaddr_t sa[MAX_SERVERS]; +main(int argc, char *argv[]) { + int ch; + isc_textregion_t tr; + isc_mem_t *mctx = NULL; + isc_taskmgr_t *taskmgr = NULL; + isc_socketmgr_t *socketmgr = NULL; + isc_timermgr_t *timermgr = NULL; + int nservers = 0; + const char *serveraddr[MAX_SERVERS]; + isc_sockaddr_t sa[MAX_SERVERS]; isc_sockaddrlist_t servers; - dns_rdatatype_t type = dns_rdatatype_a; - struct in_addr inaddr; - isc_result_t result; - int i; + dns_rdatatype_t type = dns_rdatatype_a; + struct in_addr inaddr; + isc_result_t result; + int i; while ((ch = isc_commandline_parse(argc, argv, "s:t:")) != -1) { switch (ch) { diff --git a/lib/samples/sample-gai.c b/lib/samples/sample-gai.c index 3016e2d997..92c0d3196a 100644 --- a/lib/samples/sample-gai.c +++ b/lib/samples/sample-gai.c @@ -19,11 +19,10 @@ #include static void -do_gai(int family, char *hostname) -{ +do_gai(int family, char *hostname) { struct addrinfo hints, *res, *res0; - int error; - char namebuf[1024], addrbuf[1024], servbuf[1024]; + int error; + char namebuf[1024], addrbuf[1024], servbuf[1024]; memset(&hints, 0, sizeof(hints)); hints.ai_family = family; @@ -59,8 +58,7 @@ do_gai(int family, char *hostname) } int -main(int argc, char *argv[]) -{ +main(int argc, char *argv[]) { if (argc < 2) { exit(1); } diff --git a/lib/samples/sample-request.c b/lib/samples/sample-request.c index bcd5f7b366..a3ea4d8c87 100644 --- a/lib/samples/sample-request.c +++ b/lib/samples/sample-request.c @@ -48,15 +48,13 @@ #include -static isc_mem_t * mctx; +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) -{ +usage(void) { fprintf(stderr, "sample-request [-t RRtype] server_address hostname\n"); exit(1); @@ -64,13 +62,12 @@ usage(void) static isc_result_t make_querymessage(dns_message_t *message, const char *namestr, - dns_rdatatype_t rdtype) -{ - dns_name_t * qname = NULL, *qname0; + dns_rdatatype_t rdtype) { + dns_name_t *qname = NULL, *qname0; dns_rdataset_t *qrdataset = NULL; - isc_result_t result; - isc_buffer_t b; - unsigned int namelen; + isc_result_t result; + isc_buffer_t b; + unsigned int namelen; REQUIRE(message != NULL); REQUIRE(namestr != NULL); @@ -120,8 +117,7 @@ cleanup: } static void -print_section(dns_message_t *message, int section, isc_buffer_t *buf) -{ +print_section(dns_message_t *message, int section, isc_buffer_t *buf) { isc_result_t result; isc_region_t r; @@ -141,17 +137,16 @@ fail: } int -main(int argc, char *argv[]) -{ - int ch, i, gaierror; - struct addrinfo hints, *res; +main(int argc, char *argv[]) { + int ch, i, gaierror; + struct addrinfo hints, *res; isc_textregion_t tr; - dns_client_t * client = NULL; - isc_result_t result; - isc_sockaddr_t sa; - dns_message_t * qmessage, *rmessage; - dns_rdatatype_t type = dns_rdatatype_a; - isc_buffer_t * outputbuf; + dns_client_t *client = NULL; + isc_result_t result; + isc_sockaddr_t sa; + dns_message_t *qmessage, *rmessage; + dns_rdatatype_t type = dns_rdatatype_a; + isc_buffer_t *outputbuf; while ((ch = isc_commandline_parse(argc, argv, "t:")) != -1) { switch (ch) { diff --git a/lib/samples/sample-update.c b/lib/samples/sample-update.c index 8e5f1fef4b..fe09ae9904 100644 --- a/lib/samples/sample-update.c +++ b/lib/samples/sample-update.c @@ -54,27 +54,22 @@ #include -static dns_tsec_t * tsec = NULL; +static dns_tsec_t *tsec = NULL; static const dns_rdataclass_t default_rdataclass = dns_rdataclass_in; -static isc_bufferlist_t usedbuffers; +static isc_bufferlist_t usedbuffers; 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) -{ +usage(void) { fprintf(stderr, "sample-update " "-s " "[-a auth_server] " @@ -88,11 +83,10 @@ usage(void) #ifdef _WIN32 static void -InitSockets(void) -{ - WORD wVersionRequested; +InitSockets(void) { + WORD wVersionRequested; WSADATA wsaData; - int err; + int err; wVersionRequested = MAKEWORD(2, 0); @@ -104,21 +98,19 @@ InitSockets(void) } static void -DestroySockets(void) -{ +DestroySockets(void) { WSACleanup(); } #else /* ifdef _WIN32 */ -#define InitSockets() ((void)0) +#define InitSockets() ((void)0) #define DestroySockets() ((void)0) #endif /* ifdef _WIN32 */ static bool addserver(const char *server, isc_sockaddrlist_t *list, - isc_sockaddr_t *sockaddr) -{ + isc_sockaddr_t *sockaddr) { struct addrinfo hints, *res; - int gaierror; + int gaierror; memset(&hints, 0, sizeof(hints)); hints.ai_family = AF_UNSPEC; @@ -149,35 +141,34 @@ addserver(const char *server, isc_sockaddrlist_t *list, } int -main(int argc, char *argv[]) -{ - int ch; - dns_client_t * client = NULL; - char * zonenamestr = NULL; - char * keyfilename = NULL; - char * prereqstr = NULL; - isc_sockaddr_t sa_auth[10], sa_recursive[10]; - unsigned int nsa_auth = 0, nsa_recursive = 0; +main(int argc, char *argv[]) { + int ch; + dns_client_t *client = NULL; + char *zonenamestr = NULL; + char *keyfilename = NULL; + char *prereqstr = NULL; + isc_sockaddr_t sa_auth[10], sa_recursive[10]; + unsigned int nsa_auth = 0, nsa_recursive = 0; isc_sockaddrlist_t rec_servers; isc_sockaddrlist_t auth_servers, *auth_serversp = &auth_servers; - isc_result_t result; - bool isdelete; - isc_buffer_t b, *buf; - dns_fixedname_t zname0, pname0, uname0; - unsigned int namelen; - dns_name_t * zname = NULL, *uname, *pname; - dns_rdataset_t * rdataset; - dns_rdatalist_t * rdatalist; - dns_rdata_t * rdata; - dns_namelist_t updatelist, prereqlist, *prereqlistp = NULL; - isc_mem_t * umctx = NULL; - bool sendtwice = false; + isc_result_t result; + bool isdelete; + isc_buffer_t b, *buf; + dns_fixedname_t zname0, pname0, uname0; + unsigned int namelen; + dns_name_t *zname = NULL, *uname, *pname; + dns_rdataset_t *rdataset; + dns_rdatalist_t *rdatalist; + dns_rdata_t *rdata; + dns_namelist_t updatelist, prereqlist, *prereqlistp = NULL; + isc_mem_t *umctx = NULL; + bool sendtwice = false; ISC_LIST_INIT(auth_servers); ISC_LIST_INIT(rec_servers); - while ((ch = isc_commandline_parse(argc, argv, "a:k:p:P:r:sz:")) != - EOF) { + while ((ch = isc_commandline_parse(argc, argv, "a:k:p:P:r:sz:")) != EOF) + { switch (ch) { case 'k': keyfilename = isc_commandline_argument; @@ -185,7 +176,8 @@ main(int argc, char *argv[]) case 'a': if (nsa_auth < sizeof(sa_auth) / sizeof(*sa_auth) && addserver(isc_commandline_argument, &auth_servers, - &sa_auth[nsa_auth])) { + &sa_auth[nsa_auth])) + { nsa_auth++; } break; @@ -199,7 +191,8 @@ main(int argc, char *argv[]) if (nsa_recursive < sizeof(sa_recursive) / sizeof(*sa_recursive) && addserver(isc_commandline_argument, &rec_servers, - &sa_recursive[nsa_recursive])) { + &sa_recursive[nsa_recursive])) + { nsa_recursive++; } break; @@ -364,12 +357,11 @@ main(int argc, char *argv[]) #define TTL_MAX 2147483647U /* Maximum signed 32 bit integer. */ static char * -nsu_strsep(char **stringp, const char *delim) -{ - char * string = *stringp; - char * s; +nsu_strsep(char **stringp, const char *delim) { + char *string = *stringp; + char *s; const char *d; - char sc, dc; + char sc, dc; if (string == NULL) { return (NULL); @@ -402,8 +394,7 @@ nsu_strsep(char **stringp, const char *delim) } static void -fatal(const char *format, ...) -{ +fatal(const char *format, ...) { va_list args; va_start(args, format); @@ -414,18 +405,16 @@ fatal(const char *format, ...) } static inline void -check_result(isc_result_t result, const char *msg) -{ +check_result(isc_result_t result, const char *msg) { if (result != ISC_R_SUCCESS) { fatal("%s: %s", msg, isc_result_totext(result)); } } static void -parse_name(char **cmdlinep, dns_name_t *name) -{ +parse_name(char **cmdlinep, dns_name_t *name) { isc_result_t result; - char * word; + char *word; isc_buffer_t source; word = nsu_strsep(cmdlinep, " \t\r\n"); @@ -443,14 +432,13 @@ parse_name(char **cmdlinep, dns_name_t *name) static void parse_rdata(isc_mem_t *mctx, char **cmdlinep, dns_rdataclass_t rdataclass, - dns_rdatatype_t rdatatype, dns_rdata_t *rdata) -{ - char * cmdline = *cmdlinep; - isc_buffer_t source, *buf = NULL, *newbuf = NULL; - isc_region_t r; - isc_lex_t * lex = NULL; + dns_rdatatype_t rdatatype, dns_rdata_t *rdata) { + char *cmdline = *cmdlinep; + isc_buffer_t source, *buf = NULL, *newbuf = NULL; + isc_region_t r; + isc_lex_t *lex = NULL; dns_rdatacallbacks_t callbacks; - isc_result_t result; + isc_result_t result; while (cmdline != NULL && *cmdline != 0 && isspace((unsigned char)*cmdline)) { @@ -493,16 +481,15 @@ parse_rdata(isc_mem_t *mctx, char **cmdlinep, dns_rdataclass_t rdataclass, static void update_addordelete(isc_mem_t *mctx, char *cmdline, bool isdelete, - dns_name_t *name) -{ - isc_result_t result; - uint32_t ttl; - char * word; + dns_name_t *name) { + isc_result_t result; + uint32_t ttl; + char *word; dns_rdataclass_t rdataclass; - dns_rdatatype_t rdatatype; - dns_rdata_t * rdata = NULL; + dns_rdatatype_t rdatatype; + dns_rdata_t *rdata = NULL; dns_rdatalist_t *rdatalist = NULL; - dns_rdataset_t * rdataset = NULL; + dns_rdataset_t *rdataset = NULL; isc_textregion_t region; /* @@ -641,16 +628,15 @@ doneparsing: static void make_prereq(isc_mem_t *mctx, char *cmdline, bool ispositive, bool isrrset, - dns_name_t *name) -{ - isc_result_t result; - char * word; + dns_name_t *name) { + isc_result_t result; + char *word; isc_textregion_t region; - dns_rdataset_t * rdataset = NULL; + dns_rdataset_t *rdataset = NULL; dns_rdatalist_t *rdatalist = NULL; dns_rdataclass_t rdataclass; - dns_rdatatype_t rdatatype; - dns_rdata_t * rdata = NULL; + dns_rdatatype_t rdatatype; + dns_rdata_t *rdata = NULL; /* * Read the owner name @@ -732,10 +718,9 @@ make_prereq(isc_mem_t *mctx, char *cmdline, bool ispositive, bool isrrset, } static void -evaluate_prereq(isc_mem_t *mctx, char *cmdline, dns_name_t *name) -{ +evaluate_prereq(isc_mem_t *mctx, char *cmdline, dns_name_t *name) { char *word; - bool ispositive, isrrset; + bool ispositive, isrrset; word = nsu_strsep(&cmdline, " \t\r\n"); if (word == NULL || *word == 0) { @@ -763,10 +748,9 @@ evaluate_prereq(isc_mem_t *mctx, char *cmdline, dns_name_t *name) } static void -setup_tsec(char *keyfile, isc_mem_t *mctx) -{ - dst_key_t * dstkey = NULL; - isc_result_t result; +setup_tsec(char *keyfile, isc_mem_t *mctx) { + dst_key_t *dstkey = NULL; + isc_result_t result; dns_tsectype_t tsectype; result = dst_key_fromnamedfile( diff --git a/lib/win32/bindevt/bindevt.c b/lib/win32/bindevt/bindevt.c index 0d772a0592..7e93f20ebd 100644 --- a/lib/win32/bindevt/bindevt.c +++ b/lib/win32/bindevt/bindevt.c @@ -16,7 +16,6 @@ #include BOOL APIENTRY -DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) -{ +DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { return (TRUE); }