From 6c28834354e96890235addf13913fe02956fa78a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 24 Aug 2020 09:23:06 +0200 Subject: [PATCH 1/3] Explicitly configure new clang-format-11 options --- .clang-format | 3 +++ .clang-format.headers | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.clang-format b/.clang-format index 3ed176aeb7..7137d8e008 100644 --- a/.clang-format +++ b/.clang-format @@ -11,6 +11,7 @@ BraceWrapping: AfterFunction: false # should also be MultiLine, but not yet supported AfterExternBlock: false BeforeElse: false + BeforeWhile: false IndentBraces: false SplitEmptyFunction: true AllowShortIfStatementsOnASingleLine: false @@ -19,6 +20,7 @@ AlwaysBreakAfterReturnType: All Cpp11BracedListStyle: false ColumnLimit: 80 AlignAfterOpenBracket: Align +AlignConsecutiveBitFields: true AlignConsecutiveDeclarations: false AlignConsecutiveMacros: true AlignTrailingComments: true @@ -62,6 +64,7 @@ IncludeCategories: Priority: 1 - Regex: '.*' Priority: 0 +IndentExternBlock: NoIndent KeepEmptyLinesAtTheStartOfBlocks: false MaxEmptyLinesToKeep: 1 PenaltyBreakAssignment: 30 diff --git a/.clang-format.headers b/.clang-format.headers index a488e811f4..b536276e7c 100644 --- a/.clang-format.headers +++ b/.clang-format.headers @@ -11,6 +11,7 @@ BraceWrapping: AfterFunction: false # should also be MultiLine, but not yet supported AfterExternBlock: false BeforeElse: false + BeforeWhile: false IndentBraces: false SplitEmptyFunction: true AllowShortIfStatementsOnASingleLine: false @@ -19,6 +20,7 @@ AlwaysBreakAfterReturnType: All Cpp11BracedListStyle: false ColumnLimit: 80 AlignAfterOpenBracket: Align +AlignConsecutiveBitFields: true AlignConsecutiveDeclarations: true AlignConsecutiveMacros: true AlignTrailingComments: true @@ -50,6 +52,7 @@ IncludeCategories: Priority: 1 - Regex: '".*"' Priority: 9 +IndentExternBlock: NoIndent KeepEmptyLinesAtTheStartOfBlocks: false MaxEmptyLinesToKeep: 1 PenaltyBreakAssignment: 30 From 7ba18870dc535ac2afb61829a7edd9487c519211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 24 Aug 2020 09:23:19 +0200 Subject: [PATCH 2/3] Reformat sources using clang-format-11 --- bin/delv/delv.c | 12 +- bin/dig/dig.c | 5 +- bin/dnssec/dnssec-signzone.c | 16 +- bin/named/config.c | 16 +- bin/named/server.c | 15 +- lib/bind9/check.c | 26 +- lib/dns/include/dns/dlz.h | 4 +- lib/dns/include/dns/message.h | 20 +- lib/dns/include/dns/rbt.h | 43 +-- lib/dns/include/dns/rrl.h | 2 +- lib/dns/include/dns/sdlz.h | 12 +- lib/dns/include/dns/stats.h | 559 +++++++++++++++++----------------- lib/dns/include/dns/types.h | 27 +- lib/dns/rbt.c | 2 +- lib/dns/rbtdb.c | 4 +- lib/dns/update.c | 18 +- lib/isc/netmgr/netmgr-int.h | 36 ++- lib/isc/regex.c | 14 +- lib/isc/region.c | 6 +- lib/isc/unix/socket.c | 26 +- lib/isc/win32/socket.c | 17 +- lib/ns/include/ns/stats.h | 137 ++++----- lib/ns/query.c | 4 +- 23 files changed, 524 insertions(+), 497 deletions(-) diff --git a/bin/delv/delv.c b/bin/delv/delv.c index b4e7425c23..3c92ebf2e5 100644 --- a/bin/delv/delv.c +++ b/bin/delv/delv.c @@ -610,11 +610,13 @@ key_fromconfig(const cfg_obj_t *key, dns_client_t *client) { dns_name_t *keyname; isc_result_t result; bool match_root = false; - enum { INITIAL_KEY, - STATIC_KEY, - INITIAL_DS, - STATIC_DS, - TRUSTED } anchortype; + enum { + INITIAL_KEY, + STATIC_KEY, + INITIAL_DS, + STATIC_DS, + TRUSTED + } anchortype; const cfg_obj_t *obj; keynamestr = cfg_obj_asstring(cfg_tuple_get(key, "name")); diff --git a/bin/dig/dig.c b/bin/dig/dig.c index b2807cbf50..711dedf430 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -678,8 +678,9 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg, } debug("printmessage(%s %s %s)", headers ? "headers" : "noheaders", query->lookup->comments ? "comments" : "nocomments", - short_form ? "short_form" - : dns64prefix ? "dns64prefix_form" : "long_form"); + short_form ? "short_form" + : dns64prefix ? "dns64prefix_form" + : "long_form"); flags = 0; if (!headers) { diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index 6e097bce18..f253d6f3c5 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -591,10 +591,10 @@ signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name, vbprintf(2, "\trrsig by %s dropped - %s\n", sigstr, expired ? "expired" - : rrsig.originalttl != set->ttl - ? "ttl change" - : "failed to " - "verify"); + : rrsig.originalttl != set->ttl + ? "ttl change" + : "failed to " + "verify"); resign = true; } } else if (!ispublishedkey(key) && remove_orphansigs) { @@ -612,10 +612,10 @@ signset(dns_diff_t *del, dns_diff_t *add, dns_dbnode_t *node, dns_name_t *name, vbprintf(2, "\trrsig by %s dropped - %s\n", sigstr, expired ? "expired" - : rrsig.originalttl != set->ttl - ? "ttl change" - : "failed to " - "verify"); + : rrsig.originalttl != set->ttl + ? "ttl change" + : "failed to " + "verify"); } } else if (!expired) { vbprintf(2, "\trrsig by %s retained\n", sigstr); diff --git a/bin/named/config.c b/bin/named/config.c index 4e282914ee..cda5776357 100644 --- a/bin/named/config.c +++ b/bin/named/config.c @@ -983,13 +983,15 @@ named_config_getdscp(const cfg_obj_t *config, isc_dscp_t *dscpp) { struct keyalgorithms { const char *str; - enum { hmacnone, - hmacmd5, - hmacsha1, - hmacsha224, - hmacsha256, - hmacsha384, - hmacsha512 } hmac; + enum { + hmacnone, + hmacmd5, + hmacsha1, + hmacsha224, + hmacsha256, + hmacsha384, + hmacsha512 + } hmac; unsigned int type; uint16_t size; } algorithms[] = { { "hmac-md5", hmacmd5, DST_ALG_HMACMD5, 128 }, diff --git a/bin/named/server.c b/bin/named/server.c index 15c3ed62b1..733d2b7f8f 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -675,11 +675,13 @@ ta_fromconfig(const cfg_obj_t *key, bool *initialp, const char **namestrp, dns_name_t *name = NULL; isc_buffer_t namebuf; const char *atstr = NULL; - enum { INIT_DNSKEY, - STATIC_DNSKEY, - INIT_DS, - STATIC_DS, - TRUSTED } anchortype; + enum { + INIT_DNSKEY, + STATIC_DNSKEY, + INIT_DS, + STATIC_DS, + TRUSTED + } anchortype; REQUIRE(namestrp != NULL && *namestrp == NULL); REQUIRE(ds != NULL); @@ -6778,8 +6780,7 @@ 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)) - { - } + {} if (view == NULL) { continue; } diff --git a/lib/bind9/check.c b/lib/bind9/check.c index e1b986bc14..3e0b341d39 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -2361,10 +2361,9 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, 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, + ztype == CFG_ZONE_HINT ? 1 + : ztype == CFG_ZONE_REDIRECT ? 2 + : 3, symtab, "zone '%s': already exists " "previous definition: %s:%u", @@ -2382,10 +2381,9 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, tmp += strlen(tmp); len -= strlen(tmp); (void)snprintf(tmp, len, "%u/%s", zclass, - (ztype == CFG_ZONE_INVIEW) - ? target - : (viewname != NULL) ? viewname - : "_default"); + (ztype == CFG_ZONE_INVIEW) ? target + : (viewname != NULL) ? viewname + : "_default"); switch (ztype) { case CFG_ZONE_INVIEW: tresult = isc_symtab_lookup(inview, namebuf, 0, NULL); @@ -3499,11 +3497,13 @@ check_trust_anchor(const cfg_obj_t *key, bool managed, unsigned int *flagsp, uint32_t rdata1, rdata2, rdata3; unsigned char data[4096]; const char *atstr = NULL; - enum { INIT_DNSKEY, - STATIC_DNSKEY, - INIT_DS, - STATIC_DS, - TRUSTED } anchortype; + enum { + INIT_DNSKEY, + STATIC_DNSKEY, + INIT_DS, + STATIC_DS, + TRUSTED + } anchortype; /* * The 2010 and 2017 IANA root keys - these are used below diff --git a/lib/dns/include/dns/dlz.h b/lib/dns/include/dns/dlz.h index 90530bff72..e1020fab4e 100644 --- a/lib/dns/include/dns/dlz.h +++ b/lib/dns/include/dns/dlz.h @@ -306,8 +306,8 @@ dns_dlzunregister(dns_dlzimplementation_t **dlzimp); */ typedef isc_result_t - dns_dlz_writeablezone_t(dns_view_t *view, dns_dlzdb_t *dlzdb, - const char *zone_name); +dns_dlz_writeablezone_t(dns_view_t *view, dns_dlzdb_t *dlzdb, + const char *zone_name); dns_dlz_writeablezone_t dns_dlz_writeablezone; /*%< * creates a writeable DLZ zone. Must be called from within the diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h index f1927863bf..3dc340bc7b 100644 --- a/lib/dns/include/dns/message.h +++ b/lib/dns/include/dns/message.h @@ -222,18 +222,18 @@ struct dns_message { dns_rdataset_t *tsig; int state; - unsigned int from_to_wire : 2; - unsigned int header_ok : 1; - unsigned int question_ok : 1; + unsigned int from_to_wire : 2; + unsigned int header_ok : 1; + unsigned int question_ok : 1; unsigned int tcp_continuation : 1; - unsigned int verified_sig : 1; + unsigned int verified_sig : 1; unsigned int verify_attempted : 1; - unsigned int free_query : 1; - unsigned int free_saved : 1; - unsigned int cc_ok : 1; - unsigned int cc_bad : 1; - unsigned int tkey : 1; - unsigned int rdclass_set : 1; + unsigned int free_query : 1; + unsigned int free_saved : 1; + unsigned int cc_ok : 1; + unsigned int cc_bad : 1; + unsigned int tkey : 1; + unsigned int rdclass_set : 1; unsigned int opt_reserved; unsigned int sig_reserved; diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h index bc9c030f09..367d72b9ff 100644 --- a/lib/dns/include/dns/rbt.h +++ b/lib/dns/include/dns/rbt.h @@ -57,10 +57,11 @@ ISC_LANG_BEGINDECLS * multiple dns_rbtnode structures will not work. */ typedef struct dns_rbtnode dns_rbtnode_t; -enum { DNS_RBT_NSEC_NORMAL = 0, /* in main tree */ - DNS_RBT_NSEC_HAS_NSEC = 1, /* also has node in nsec tree */ - DNS_RBT_NSEC_NSEC = 2, /* in nsec tree */ - DNS_RBT_NSEC_NSEC3 = 3 /* in nsec3 tree */ +enum { + DNS_RBT_NSEC_NORMAL = 0, /* in main tree */ + DNS_RBT_NSEC_HAS_NSEC = 1, /* also has node in nsec tree */ + DNS_RBT_NSEC_NSEC = 2, /* in nsec tree */ + DNS_RBT_NSEC_NSEC3 = 3 /* in nsec3 tree */ }; struct dns_rbtnode { #if DNS_RBT_USEMAGIC @@ -86,24 +87,24 @@ struct dns_rbtnode { * the unnamed bitfields unless they should also be accessed * after acquiring the tree lock. */ - unsigned int : 0; /* start of bitfields c/o tree lock */ - unsigned int is_root : 1; /*%< range is 0..1 */ - unsigned int color : 1; /*%< range is 0..1 */ + unsigned int : 0; /* start of bitfields c/o tree lock */ + unsigned int is_root : 1; /*%< range is 0..1 */ + unsigned int color : 1; /*%< range is 0..1 */ unsigned int find_callback : 1; /*%< range is 0..1 */ - unsigned int attributes : 3; /*%< range is 0..2 */ - unsigned int nsec : 2; /*%< range is 0..3 */ - unsigned int namelen : 8; /*%< range is 1..255 */ - unsigned int offsetlen : 8; /*%< range is 1..128 */ - unsigned int oldnamelen : 8; /*%< range is 1..255 */ + unsigned int attributes : 3; /*%< range is 0..2 */ + unsigned int nsec : 2; /*%< range is 0..3 */ + unsigned int namelen : 8; /*%< range is 1..255 */ + unsigned int offsetlen : 8; /*%< range is 1..128 */ + unsigned int oldnamelen : 8; /*%< range is 1..255 */ /*@}*/ /* flags needed for serialization to file */ - unsigned int is_mmapped : 1; + unsigned int is_mmapped : 1; unsigned int parent_is_relative : 1; - unsigned int left_is_relative : 1; - unsigned int right_is_relative : 1; - unsigned int down_is_relative : 1; - unsigned int data_is_relative : 1; + unsigned int left_is_relative : 1; + unsigned int right_is_relative : 1; + unsigned int down_is_relative : 1; + unsigned int data_is_relative : 1; /* * full name length; set during serialization, and used @@ -114,7 +115,7 @@ struct dns_rbtnode { /* node needs to be cleaned from rpz */ unsigned int rpz : 1; - unsigned int : 0; /* end of bitfields c/o tree lock */ + unsigned int : 0; /* end of bitfields c/o tree lock */ /*% * These are needed for hashing. The 'uppernode' points to the @@ -156,10 +157,10 @@ struct dns_rbtnode { * separate region of memory. */ void *data; - uint8_t : 0; /* start of bitfields c/o node lock */ + uint8_t : 0; /* start of bitfields c/o node lock */ uint8_t dirty : 1; - uint8_t wild : 1; - uint8_t : 0; /* end of bitfields c/o node lock */ + uint8_t wild : 1; + uint8_t : 0; /* end of bitfields c/o node lock */ uint16_t locknum; /* note that this is not in the bitfield */ isc_refcount_t references; /*@}*/ diff --git a/lib/dns/include/dns/rrl.h b/lib/dns/include/dns/rrl.h index 2c11103da7..c1ebe44353 100644 --- a/lib/dns/include/dns/rrl.h +++ b/lib/dns/include/dns/rrl.h @@ -88,7 +88,7 @@ struct dns__rrl_key { dns_rdatatype_t qtype; uint8_t qclass; unsigned int rtype : 4; /* dns_rrl_rtype_t */ - unsigned int ipv6 : 1; + unsigned int ipv6 : 1; }; union dns_rrl_key { struct dns__rrl_key s; diff --git a/lib/dns/include/dns/sdlz.h b/lib/dns/include/dns/sdlz.h index 90cbd70232..115d5dc1d9 100644 --- a/lib/dns/include/dns/sdlz.h +++ b/lib/dns/include/dns/sdlz.h @@ -312,8 +312,8 @@ dns_sdlzunregister(dns_sdlzimplementation_t **sdlzimp); */ typedef isc_result_t - dns_sdlz_putnamedrr_t(dns_sdlzallnodes_t *allnodes, const char *name, - const char *type, dns_ttl_t ttl, const char *data); +dns_sdlz_putnamedrr_t(dns_sdlzallnodes_t *allnodes, const char *name, + const char *type, dns_ttl_t ttl, const char *data); dns_sdlz_putnamedrr_t dns_sdlz_putnamedrr; /*%< @@ -322,8 +322,8 @@ dns_sdlz_putnamedrr_t dns_sdlz_putnamedrr; */ typedef isc_result_t - dns_sdlz_putrr_t(dns_sdlzlookup_t *lookup, const char *type, dns_ttl_t ttl, - const char *data); +dns_sdlz_putrr_t(dns_sdlzlookup_t *lookup, const char *type, dns_ttl_t ttl, + const char *data); dns_sdlz_putrr_t dns_sdlz_putrr; /*%< * Add a single resource record to the lookup structure to be later @@ -345,8 +345,8 @@ dns_sdlz_putsoa_t dns_sdlz_putsoa; */ typedef isc_result_t - dns_sdlz_setdb_t(dns_dlzdb_t *dlzdatabase, dns_rdataclass_t rdclass, - const dns_name_t *name, dns_db_t **dbp); +dns_sdlz_setdb_t(dns_dlzdb_t *dlzdatabase, dns_rdataclass_t rdclass, + const dns_name_t *name, dns_db_t **dbp); dns_sdlz_setdb_t dns_sdlz_setdb; /*%< * Create the database pointers for a writeable SDLZ zone diff --git a/lib/dns/include/dns/stats.h b/lib/dns/include/dns/stats.h index 52e47d0b00..25d3f0bc9e 100644 --- a/lib/dns/include/dns/stats.h +++ b/lib/dns/include/dns/stats.h @@ -156,288 +156,291 @@ enum { /*% * Traffic size statistics counters. Used as isc_statscounter_t values. */ -enum { dns_sizecounter_in_0 = 0, - dns_sizecounter_in_16 = 1, - dns_sizecounter_in_32 = 2, - dns_sizecounter_in_48 = 3, - dns_sizecounter_in_64 = 4, - dns_sizecounter_in_80 = 5, - dns_sizecounter_in_96 = 6, - dns_sizecounter_in_112 = 7, - dns_sizecounter_in_128 = 8, - dns_sizecounter_in_144 = 9, - dns_sizecounter_in_160 = 10, - dns_sizecounter_in_176 = 11, - dns_sizecounter_in_192 = 12, - dns_sizecounter_in_208 = 13, - dns_sizecounter_in_224 = 14, - dns_sizecounter_in_240 = 15, - dns_sizecounter_in_256 = 16, - dns_sizecounter_in_272 = 17, - dns_sizecounter_in_288 = 18, +enum { + dns_sizecounter_in_0 = 0, + dns_sizecounter_in_16 = 1, + dns_sizecounter_in_32 = 2, + dns_sizecounter_in_48 = 3, + dns_sizecounter_in_64 = 4, + dns_sizecounter_in_80 = 5, + dns_sizecounter_in_96 = 6, + dns_sizecounter_in_112 = 7, + dns_sizecounter_in_128 = 8, + dns_sizecounter_in_144 = 9, + dns_sizecounter_in_160 = 10, + dns_sizecounter_in_176 = 11, + dns_sizecounter_in_192 = 12, + dns_sizecounter_in_208 = 13, + dns_sizecounter_in_224 = 14, + dns_sizecounter_in_240 = 15, + dns_sizecounter_in_256 = 16, + dns_sizecounter_in_272 = 17, + dns_sizecounter_in_288 = 18, - dns_sizecounter_in_max = 19, + dns_sizecounter_in_max = 19, }; -enum { dns_sizecounter_out_0 = 0, - dns_sizecounter_out_16 = 1, - dns_sizecounter_out_32 = 2, - dns_sizecounter_out_48 = 3, - dns_sizecounter_out_64 = 4, - dns_sizecounter_out_80 = 5, - dns_sizecounter_out_96 = 6, - dns_sizecounter_out_112 = 7, - dns_sizecounter_out_128 = 8, - dns_sizecounter_out_144 = 9, - dns_sizecounter_out_160 = 10, - dns_sizecounter_out_176 = 11, - dns_sizecounter_out_192 = 12, - dns_sizecounter_out_208 = 13, - dns_sizecounter_out_224 = 14, - dns_sizecounter_out_240 = 15, - dns_sizecounter_out_256 = 16, - dns_sizecounter_out_272 = 17, - dns_sizecounter_out_288 = 18, - dns_sizecounter_out_304 = 19, - dns_sizecounter_out_320 = 20, - dns_sizecounter_out_336 = 21, - dns_sizecounter_out_352 = 22, - dns_sizecounter_out_368 = 23, - dns_sizecounter_out_384 = 24, - dns_sizecounter_out_400 = 25, - dns_sizecounter_out_416 = 26, - dns_sizecounter_out_432 = 27, - dns_sizecounter_out_448 = 28, - dns_sizecounter_out_464 = 29, - dns_sizecounter_out_480 = 30, - dns_sizecounter_out_496 = 31, - dns_sizecounter_out_512 = 32, - dns_sizecounter_out_528 = 33, - dns_sizecounter_out_544 = 34, - dns_sizecounter_out_560 = 35, - dns_sizecounter_out_576 = 36, - dns_sizecounter_out_592 = 37, - dns_sizecounter_out_608 = 38, - dns_sizecounter_out_624 = 39, - dns_sizecounter_out_640 = 40, - dns_sizecounter_out_656 = 41, - dns_sizecounter_out_672 = 42, - dns_sizecounter_out_688 = 43, - dns_sizecounter_out_704 = 44, - dns_sizecounter_out_720 = 45, - dns_sizecounter_out_736 = 46, - dns_sizecounter_out_752 = 47, - dns_sizecounter_out_768 = 48, - dns_sizecounter_out_784 = 49, - dns_sizecounter_out_800 = 50, - dns_sizecounter_out_816 = 51, - dns_sizecounter_out_832 = 52, - dns_sizecounter_out_848 = 53, - dns_sizecounter_out_864 = 54, - dns_sizecounter_out_880 = 55, - dns_sizecounter_out_896 = 56, - dns_sizecounter_out_912 = 57, - dns_sizecounter_out_928 = 58, - dns_sizecounter_out_944 = 59, - dns_sizecounter_out_960 = 60, - dns_sizecounter_out_976 = 61, - dns_sizecounter_out_992 = 62, - dns_sizecounter_out_1008 = 63, - dns_sizecounter_out_1024 = 64, - dns_sizecounter_out_1040 = 65, - dns_sizecounter_out_1056 = 66, - dns_sizecounter_out_1072 = 67, - dns_sizecounter_out_1088 = 68, - dns_sizecounter_out_1104 = 69, - dns_sizecounter_out_1120 = 70, - dns_sizecounter_out_1136 = 71, - dns_sizecounter_out_1152 = 72, - dns_sizecounter_out_1168 = 73, - dns_sizecounter_out_1184 = 74, - dns_sizecounter_out_1200 = 75, - dns_sizecounter_out_1216 = 76, - dns_sizecounter_out_1232 = 77, - dns_sizecounter_out_1248 = 78, - dns_sizecounter_out_1264 = 79, - dns_sizecounter_out_1280 = 80, - dns_sizecounter_out_1296 = 81, - dns_sizecounter_out_1312 = 82, - dns_sizecounter_out_1328 = 83, - dns_sizecounter_out_1344 = 84, - dns_sizecounter_out_1360 = 85, - dns_sizecounter_out_1376 = 86, - dns_sizecounter_out_1392 = 87, - dns_sizecounter_out_1408 = 88, - dns_sizecounter_out_1424 = 89, - dns_sizecounter_out_1440 = 90, - dns_sizecounter_out_1456 = 91, - dns_sizecounter_out_1472 = 92, - dns_sizecounter_out_1488 = 93, - dns_sizecounter_out_1504 = 94, - dns_sizecounter_out_1520 = 95, - dns_sizecounter_out_1536 = 96, - dns_sizecounter_out_1552 = 97, - dns_sizecounter_out_1568 = 98, - dns_sizecounter_out_1584 = 99, - dns_sizecounter_out_1600 = 100, - dns_sizecounter_out_1616 = 101, - dns_sizecounter_out_1632 = 102, - dns_sizecounter_out_1648 = 103, - dns_sizecounter_out_1664 = 104, - dns_sizecounter_out_1680 = 105, - dns_sizecounter_out_1696 = 106, - dns_sizecounter_out_1712 = 107, - dns_sizecounter_out_1728 = 108, - dns_sizecounter_out_1744 = 109, - dns_sizecounter_out_1760 = 110, - dns_sizecounter_out_1776 = 111, - dns_sizecounter_out_1792 = 112, - dns_sizecounter_out_1808 = 113, - dns_sizecounter_out_1824 = 114, - dns_sizecounter_out_1840 = 115, - dns_sizecounter_out_1856 = 116, - dns_sizecounter_out_1872 = 117, - dns_sizecounter_out_1888 = 118, - dns_sizecounter_out_1904 = 119, - dns_sizecounter_out_1920 = 120, - dns_sizecounter_out_1936 = 121, - dns_sizecounter_out_1952 = 122, - dns_sizecounter_out_1968 = 123, - dns_sizecounter_out_1984 = 124, - dns_sizecounter_out_2000 = 125, - dns_sizecounter_out_2016 = 126, - dns_sizecounter_out_2032 = 127, - dns_sizecounter_out_2048 = 128, - dns_sizecounter_out_2064 = 129, - dns_sizecounter_out_2080 = 130, - dns_sizecounter_out_2096 = 131, - dns_sizecounter_out_2112 = 132, - dns_sizecounter_out_2128 = 133, - dns_sizecounter_out_2144 = 134, - dns_sizecounter_out_2160 = 135, - dns_sizecounter_out_2176 = 136, - dns_sizecounter_out_2192 = 137, - dns_sizecounter_out_2208 = 138, - dns_sizecounter_out_2224 = 139, - dns_sizecounter_out_2240 = 140, - dns_sizecounter_out_2256 = 141, - dns_sizecounter_out_2272 = 142, - dns_sizecounter_out_2288 = 143, - dns_sizecounter_out_2304 = 144, - dns_sizecounter_out_2320 = 145, - dns_sizecounter_out_2336 = 146, - dns_sizecounter_out_2352 = 147, - dns_sizecounter_out_2368 = 148, - dns_sizecounter_out_2384 = 149, - dns_sizecounter_out_2400 = 150, - dns_sizecounter_out_2416 = 151, - dns_sizecounter_out_2432 = 152, - dns_sizecounter_out_2448 = 153, - dns_sizecounter_out_2464 = 154, - dns_sizecounter_out_2480 = 155, - dns_sizecounter_out_2496 = 156, - dns_sizecounter_out_2512 = 157, - dns_sizecounter_out_2528 = 158, - dns_sizecounter_out_2544 = 159, - dns_sizecounter_out_2560 = 160, - dns_sizecounter_out_2576 = 161, - dns_sizecounter_out_2592 = 162, - dns_sizecounter_out_2608 = 163, - dns_sizecounter_out_2624 = 164, - dns_sizecounter_out_2640 = 165, - dns_sizecounter_out_2656 = 166, - dns_sizecounter_out_2672 = 167, - dns_sizecounter_out_2688 = 168, - dns_sizecounter_out_2704 = 169, - dns_sizecounter_out_2720 = 170, - dns_sizecounter_out_2736 = 171, - dns_sizecounter_out_2752 = 172, - dns_sizecounter_out_2768 = 173, - dns_sizecounter_out_2784 = 174, - dns_sizecounter_out_2800 = 175, - dns_sizecounter_out_2816 = 176, - dns_sizecounter_out_2832 = 177, - dns_sizecounter_out_2848 = 178, - dns_sizecounter_out_2864 = 179, - dns_sizecounter_out_2880 = 180, - dns_sizecounter_out_2896 = 181, - dns_sizecounter_out_2912 = 182, - dns_sizecounter_out_2928 = 183, - dns_sizecounter_out_2944 = 184, - dns_sizecounter_out_2960 = 185, - dns_sizecounter_out_2976 = 186, - dns_sizecounter_out_2992 = 187, - dns_sizecounter_out_3008 = 188, - dns_sizecounter_out_3024 = 189, - dns_sizecounter_out_3040 = 190, - dns_sizecounter_out_3056 = 191, - dns_sizecounter_out_3072 = 192, - dns_sizecounter_out_3088 = 193, - dns_sizecounter_out_3104 = 194, - dns_sizecounter_out_3120 = 195, - dns_sizecounter_out_3136 = 196, - dns_sizecounter_out_3152 = 197, - dns_sizecounter_out_3168 = 198, - dns_sizecounter_out_3184 = 199, - dns_sizecounter_out_3200 = 200, - dns_sizecounter_out_3216 = 201, - dns_sizecounter_out_3232 = 202, - dns_sizecounter_out_3248 = 203, - dns_sizecounter_out_3264 = 204, - dns_sizecounter_out_3280 = 205, - dns_sizecounter_out_3296 = 206, - dns_sizecounter_out_3312 = 207, - dns_sizecounter_out_3328 = 208, - dns_sizecounter_out_3344 = 209, - dns_sizecounter_out_3360 = 210, - dns_sizecounter_out_3376 = 211, - dns_sizecounter_out_3392 = 212, - dns_sizecounter_out_3408 = 213, - dns_sizecounter_out_3424 = 214, - dns_sizecounter_out_3440 = 215, - dns_sizecounter_out_3456 = 216, - dns_sizecounter_out_3472 = 217, - dns_sizecounter_out_3488 = 218, - dns_sizecounter_out_3504 = 219, - dns_sizecounter_out_3520 = 220, - dns_sizecounter_out_3536 = 221, - dns_sizecounter_out_3552 = 222, - dns_sizecounter_out_3568 = 223, - dns_sizecounter_out_3584 = 224, - dns_sizecounter_out_3600 = 225, - dns_sizecounter_out_3616 = 226, - dns_sizecounter_out_3632 = 227, - dns_sizecounter_out_3648 = 228, - dns_sizecounter_out_3664 = 229, - dns_sizecounter_out_3680 = 230, - dns_sizecounter_out_3696 = 231, - dns_sizecounter_out_3712 = 232, - dns_sizecounter_out_3728 = 233, - dns_sizecounter_out_3744 = 234, - dns_sizecounter_out_3760 = 235, - dns_sizecounter_out_3776 = 236, - dns_sizecounter_out_3792 = 237, - dns_sizecounter_out_3808 = 238, - dns_sizecounter_out_3824 = 239, - dns_sizecounter_out_3840 = 240, - dns_sizecounter_out_3856 = 241, - dns_sizecounter_out_3872 = 242, - dns_sizecounter_out_3888 = 243, - dns_sizecounter_out_3904 = 244, - dns_sizecounter_out_3920 = 245, - dns_sizecounter_out_3936 = 246, - dns_sizecounter_out_3952 = 247, - dns_sizecounter_out_3968 = 248, - dns_sizecounter_out_3984 = 249, - dns_sizecounter_out_4000 = 250, - dns_sizecounter_out_4016 = 251, - dns_sizecounter_out_4032 = 252, - dns_sizecounter_out_4048 = 253, - dns_sizecounter_out_4064 = 254, - dns_sizecounter_out_4080 = 255, - dns_sizecounter_out_4096 = 256, +enum { + dns_sizecounter_out_0 = 0, + dns_sizecounter_out_16 = 1, + dns_sizecounter_out_32 = 2, + dns_sizecounter_out_48 = 3, + dns_sizecounter_out_64 = 4, + dns_sizecounter_out_80 = 5, + dns_sizecounter_out_96 = 6, + dns_sizecounter_out_112 = 7, + dns_sizecounter_out_128 = 8, + dns_sizecounter_out_144 = 9, + dns_sizecounter_out_160 = 10, + dns_sizecounter_out_176 = 11, + dns_sizecounter_out_192 = 12, + dns_sizecounter_out_208 = 13, + dns_sizecounter_out_224 = 14, + dns_sizecounter_out_240 = 15, + dns_sizecounter_out_256 = 16, + dns_sizecounter_out_272 = 17, + dns_sizecounter_out_288 = 18, + dns_sizecounter_out_304 = 19, + dns_sizecounter_out_320 = 20, + dns_sizecounter_out_336 = 21, + dns_sizecounter_out_352 = 22, + dns_sizecounter_out_368 = 23, + dns_sizecounter_out_384 = 24, + dns_sizecounter_out_400 = 25, + dns_sizecounter_out_416 = 26, + dns_sizecounter_out_432 = 27, + dns_sizecounter_out_448 = 28, + dns_sizecounter_out_464 = 29, + dns_sizecounter_out_480 = 30, + dns_sizecounter_out_496 = 31, + dns_sizecounter_out_512 = 32, + dns_sizecounter_out_528 = 33, + dns_sizecounter_out_544 = 34, + dns_sizecounter_out_560 = 35, + dns_sizecounter_out_576 = 36, + dns_sizecounter_out_592 = 37, + dns_sizecounter_out_608 = 38, + dns_sizecounter_out_624 = 39, + dns_sizecounter_out_640 = 40, + dns_sizecounter_out_656 = 41, + dns_sizecounter_out_672 = 42, + dns_sizecounter_out_688 = 43, + dns_sizecounter_out_704 = 44, + dns_sizecounter_out_720 = 45, + dns_sizecounter_out_736 = 46, + dns_sizecounter_out_752 = 47, + dns_sizecounter_out_768 = 48, + dns_sizecounter_out_784 = 49, + dns_sizecounter_out_800 = 50, + dns_sizecounter_out_816 = 51, + dns_sizecounter_out_832 = 52, + dns_sizecounter_out_848 = 53, + dns_sizecounter_out_864 = 54, + dns_sizecounter_out_880 = 55, + dns_sizecounter_out_896 = 56, + dns_sizecounter_out_912 = 57, + dns_sizecounter_out_928 = 58, + dns_sizecounter_out_944 = 59, + dns_sizecounter_out_960 = 60, + dns_sizecounter_out_976 = 61, + dns_sizecounter_out_992 = 62, + dns_sizecounter_out_1008 = 63, + dns_sizecounter_out_1024 = 64, + dns_sizecounter_out_1040 = 65, + dns_sizecounter_out_1056 = 66, + dns_sizecounter_out_1072 = 67, + dns_sizecounter_out_1088 = 68, + dns_sizecounter_out_1104 = 69, + dns_sizecounter_out_1120 = 70, + dns_sizecounter_out_1136 = 71, + dns_sizecounter_out_1152 = 72, + dns_sizecounter_out_1168 = 73, + dns_sizecounter_out_1184 = 74, + dns_sizecounter_out_1200 = 75, + dns_sizecounter_out_1216 = 76, + dns_sizecounter_out_1232 = 77, + dns_sizecounter_out_1248 = 78, + dns_sizecounter_out_1264 = 79, + dns_sizecounter_out_1280 = 80, + dns_sizecounter_out_1296 = 81, + dns_sizecounter_out_1312 = 82, + dns_sizecounter_out_1328 = 83, + dns_sizecounter_out_1344 = 84, + dns_sizecounter_out_1360 = 85, + dns_sizecounter_out_1376 = 86, + dns_sizecounter_out_1392 = 87, + dns_sizecounter_out_1408 = 88, + dns_sizecounter_out_1424 = 89, + dns_sizecounter_out_1440 = 90, + dns_sizecounter_out_1456 = 91, + dns_sizecounter_out_1472 = 92, + dns_sizecounter_out_1488 = 93, + dns_sizecounter_out_1504 = 94, + dns_sizecounter_out_1520 = 95, + dns_sizecounter_out_1536 = 96, + dns_sizecounter_out_1552 = 97, + dns_sizecounter_out_1568 = 98, + dns_sizecounter_out_1584 = 99, + dns_sizecounter_out_1600 = 100, + dns_sizecounter_out_1616 = 101, + dns_sizecounter_out_1632 = 102, + dns_sizecounter_out_1648 = 103, + dns_sizecounter_out_1664 = 104, + dns_sizecounter_out_1680 = 105, + dns_sizecounter_out_1696 = 106, + dns_sizecounter_out_1712 = 107, + dns_sizecounter_out_1728 = 108, + dns_sizecounter_out_1744 = 109, + dns_sizecounter_out_1760 = 110, + dns_sizecounter_out_1776 = 111, + dns_sizecounter_out_1792 = 112, + dns_sizecounter_out_1808 = 113, + dns_sizecounter_out_1824 = 114, + dns_sizecounter_out_1840 = 115, + dns_sizecounter_out_1856 = 116, + dns_sizecounter_out_1872 = 117, + dns_sizecounter_out_1888 = 118, + dns_sizecounter_out_1904 = 119, + dns_sizecounter_out_1920 = 120, + dns_sizecounter_out_1936 = 121, + dns_sizecounter_out_1952 = 122, + dns_sizecounter_out_1968 = 123, + dns_sizecounter_out_1984 = 124, + dns_sizecounter_out_2000 = 125, + dns_sizecounter_out_2016 = 126, + dns_sizecounter_out_2032 = 127, + dns_sizecounter_out_2048 = 128, + dns_sizecounter_out_2064 = 129, + dns_sizecounter_out_2080 = 130, + dns_sizecounter_out_2096 = 131, + dns_sizecounter_out_2112 = 132, + dns_sizecounter_out_2128 = 133, + dns_sizecounter_out_2144 = 134, + dns_sizecounter_out_2160 = 135, + dns_sizecounter_out_2176 = 136, + dns_sizecounter_out_2192 = 137, + dns_sizecounter_out_2208 = 138, + dns_sizecounter_out_2224 = 139, + dns_sizecounter_out_2240 = 140, + dns_sizecounter_out_2256 = 141, + dns_sizecounter_out_2272 = 142, + dns_sizecounter_out_2288 = 143, + dns_sizecounter_out_2304 = 144, + dns_sizecounter_out_2320 = 145, + dns_sizecounter_out_2336 = 146, + dns_sizecounter_out_2352 = 147, + dns_sizecounter_out_2368 = 148, + dns_sizecounter_out_2384 = 149, + dns_sizecounter_out_2400 = 150, + dns_sizecounter_out_2416 = 151, + dns_sizecounter_out_2432 = 152, + dns_sizecounter_out_2448 = 153, + dns_sizecounter_out_2464 = 154, + dns_sizecounter_out_2480 = 155, + dns_sizecounter_out_2496 = 156, + dns_sizecounter_out_2512 = 157, + dns_sizecounter_out_2528 = 158, + dns_sizecounter_out_2544 = 159, + dns_sizecounter_out_2560 = 160, + dns_sizecounter_out_2576 = 161, + dns_sizecounter_out_2592 = 162, + dns_sizecounter_out_2608 = 163, + dns_sizecounter_out_2624 = 164, + dns_sizecounter_out_2640 = 165, + dns_sizecounter_out_2656 = 166, + dns_sizecounter_out_2672 = 167, + dns_sizecounter_out_2688 = 168, + dns_sizecounter_out_2704 = 169, + dns_sizecounter_out_2720 = 170, + dns_sizecounter_out_2736 = 171, + dns_sizecounter_out_2752 = 172, + dns_sizecounter_out_2768 = 173, + dns_sizecounter_out_2784 = 174, + dns_sizecounter_out_2800 = 175, + dns_sizecounter_out_2816 = 176, + dns_sizecounter_out_2832 = 177, + dns_sizecounter_out_2848 = 178, + dns_sizecounter_out_2864 = 179, + dns_sizecounter_out_2880 = 180, + dns_sizecounter_out_2896 = 181, + dns_sizecounter_out_2912 = 182, + dns_sizecounter_out_2928 = 183, + dns_sizecounter_out_2944 = 184, + dns_sizecounter_out_2960 = 185, + dns_sizecounter_out_2976 = 186, + dns_sizecounter_out_2992 = 187, + dns_sizecounter_out_3008 = 188, + dns_sizecounter_out_3024 = 189, + dns_sizecounter_out_3040 = 190, + dns_sizecounter_out_3056 = 191, + dns_sizecounter_out_3072 = 192, + dns_sizecounter_out_3088 = 193, + dns_sizecounter_out_3104 = 194, + dns_sizecounter_out_3120 = 195, + dns_sizecounter_out_3136 = 196, + dns_sizecounter_out_3152 = 197, + dns_sizecounter_out_3168 = 198, + dns_sizecounter_out_3184 = 199, + dns_sizecounter_out_3200 = 200, + dns_sizecounter_out_3216 = 201, + dns_sizecounter_out_3232 = 202, + dns_sizecounter_out_3248 = 203, + dns_sizecounter_out_3264 = 204, + dns_sizecounter_out_3280 = 205, + dns_sizecounter_out_3296 = 206, + dns_sizecounter_out_3312 = 207, + dns_sizecounter_out_3328 = 208, + dns_sizecounter_out_3344 = 209, + dns_sizecounter_out_3360 = 210, + dns_sizecounter_out_3376 = 211, + dns_sizecounter_out_3392 = 212, + dns_sizecounter_out_3408 = 213, + dns_sizecounter_out_3424 = 214, + dns_sizecounter_out_3440 = 215, + dns_sizecounter_out_3456 = 216, + dns_sizecounter_out_3472 = 217, + dns_sizecounter_out_3488 = 218, + dns_sizecounter_out_3504 = 219, + dns_sizecounter_out_3520 = 220, + dns_sizecounter_out_3536 = 221, + dns_sizecounter_out_3552 = 222, + dns_sizecounter_out_3568 = 223, + dns_sizecounter_out_3584 = 224, + dns_sizecounter_out_3600 = 225, + dns_sizecounter_out_3616 = 226, + dns_sizecounter_out_3632 = 227, + dns_sizecounter_out_3648 = 228, + dns_sizecounter_out_3664 = 229, + dns_sizecounter_out_3680 = 230, + dns_sizecounter_out_3696 = 231, + dns_sizecounter_out_3712 = 232, + dns_sizecounter_out_3728 = 233, + dns_sizecounter_out_3744 = 234, + dns_sizecounter_out_3760 = 235, + dns_sizecounter_out_3776 = 236, + dns_sizecounter_out_3792 = 237, + dns_sizecounter_out_3808 = 238, + dns_sizecounter_out_3824 = 239, + dns_sizecounter_out_3840 = 240, + dns_sizecounter_out_3856 = 241, + dns_sizecounter_out_3872 = 242, + dns_sizecounter_out_3888 = 243, + dns_sizecounter_out_3904 = 244, + dns_sizecounter_out_3920 = 245, + dns_sizecounter_out_3936 = 246, + dns_sizecounter_out_3952 = 247, + dns_sizecounter_out_3968 = 248, + dns_sizecounter_out_3984 = 249, + dns_sizecounter_out_4000 = 250, + dns_sizecounter_out_4016 = 251, + dns_sizecounter_out_4032 = 252, + dns_sizecounter_out_4048 = 253, + dns_sizecounter_out_4064 = 254, + dns_sizecounter_out_4080 = 255, + dns_sizecounter_out_4096 = 256, - dns_sizecounter_out_max = 257 }; + dns_sizecounter_out_max = 257 +}; #define DNS_STATS_NCOUNTERS 8 diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h index a9c8be0635..21ced9e4e6 100644 --- a/lib/dns/include/dns/types.h +++ b/lib/dns/include/dns/types.h @@ -265,26 +265,29 @@ enum { /*% * TSIG errors. */ -enum { dns_tsigerror_badsig = 16, - dns_tsigerror_badkey = 17, - dns_tsigerror_badtime = 18, - dns_tsigerror_badmode = 19, - dns_tsigerror_badname = 20, - dns_tsigerror_badalg = 21, - dns_tsigerror_badtrunc = 22 }; +enum { + dns_tsigerror_badsig = 16, + dns_tsigerror_badkey = 17, + dns_tsigerror_badtime = 18, + dns_tsigerror_badmode = 19, + dns_tsigerror_badname = 20, + dns_tsigerror_badalg = 21, + dns_tsigerror_badtrunc = 22 +}; /*% * Opcodes. */ -enum { dns_opcode_query = 0, +enum { + dns_opcode_query = 0, #define dns_opcode_query ((dns_opcode_t)dns_opcode_query) - dns_opcode_iquery = 1, + dns_opcode_iquery = 1, #define dns_opcode_iquery ((dns_opcode_t)dns_opcode_iquery) - dns_opcode_status = 2, + dns_opcode_status = 2, #define dns_opcode_status ((dns_opcode_t)dns_opcode_status) - dns_opcode_notify = 4, + dns_opcode_notify = 4, #define dns_opcode_notify ((dns_opcode_t)dns_opcode_notify) - dns_opcode_update = 5 /* dynamic update */ + dns_opcode_update = 5 /* dynamic update */ #define dns_opcode_update ((dns_opcode_t)dns_opcode_update) }; diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c index 08f2264ab1..9834baeb55 100644 --- a/lib/dns/rbt.c +++ b/lib/dns/rbt.c @@ -118,7 +118,7 @@ struct file_header { * will be used to tell if we can load the map file or not */ uint32_t ptrsize; - unsigned int bigendian : 1; /* big or little endian system */ + unsigned int bigendian : 1; /* big or little endian system */ unsigned int rdataset_fixed : 1; /* compiled with * --enable-rrset-fixed */ diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index f8d51e9a4b..6aa4bc1f38 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -208,10 +208,10 @@ typedef struct rdatasetheader { isc_stdtime_t last_refresh_fail_ts; struct noqname *noqname; struct noqname *closest; - unsigned int is_mmapped : 1; + unsigned int is_mmapped : 1; unsigned int next_is_relative : 1; unsigned int node_is_relative : 1; - unsigned int resign_lsb : 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. diff --git a/lib/dns/update.c b/lib/dns/update.c index 89935bedeb..4a8a03c0c1 100644 --- a/lib/dns/update.c +++ b/lib/dns/update.c @@ -1473,14 +1473,16 @@ struct dns_update_state { isc_stdtime_t inception, expire, soaexpire, keyexpire; dns_ttl_t nsecttl; bool check_ksk, keyset_kskonly, build_nsec3; - enum { sign_updates, - remove_orphaned, - build_chain, - process_nsec, - sign_nsec, - update_nsec3, - process_nsec3, - sign_nsec3 } state; + enum { + sign_updates, + remove_orphaned, + build_chain, + process_nsec, + sign_nsec, + update_nsec3, + process_nsec3, + sign_nsec3 + } state; }; static uint32_t diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h index c6a0da0a72..18fbe243c4 100644 --- a/lib/isc/netmgr/netmgr-int.h +++ b/lib/isc/netmgr/netmgr-int.h @@ -645,17 +645,19 @@ typedef enum isc_nmsocket_type { /*% * Index into socket stat counter arrays. */ -enum { STATID_OPEN = 0, - STATID_OPENFAIL = 1, - STATID_CLOSE = 2, - STATID_BINDFAIL = 3, - STATID_CONNECTFAIL = 4, - STATID_CONNECT = 5, - STATID_ACCEPTFAIL = 6, - STATID_ACCEPT = 7, - STATID_SENDFAIL = 8, - STATID_RECVFAIL = 9, - STATID_ACTIVE = 10 }; +enum { + STATID_OPEN = 0, + STATID_OPENFAIL = 1, + STATID_CLOSE = 2, + STATID_BINDFAIL = 3, + STATID_CONNECTFAIL = 4, + STATID_CONNECT = 5, + STATID_ACCEPTFAIL = 6, + STATID_ACCEPT = 7, + STATID_SENDFAIL = 8, + STATID_RECVFAIL = 9, + STATID_ACTIVE = 10 +}; struct isc_nmsocket { /*% Unlocked, RO */ @@ -677,11 +679,13 @@ struct isc_nmsocket { SSL *ssl; SSL_CTX *ctx; BIO *ssl_bio; - enum { TLS_INIT, - TLS_HANDSHAKE, - TLS_IO, - TLS_ERROR, - TLS_CLOSING } state; + enum { + TLS_INIT, + TLS_HANDSHAKE, + TLS_IO, + TLS_ERROR, + TLS_CLOSING + } state; isc_region_t senddata; bool sending; /* List of active send requests. */ diff --git a/lib/isc/regex.c b/lib/isc/regex.c index 953457f240..b05298c200 100644 --- a/lib/isc/regex.c +++ b/lib/isc/regex.c @@ -31,12 +31,14 @@ */ int isc_regex_validate(const char *c) { - enum { none, - parse_bracket, - parse_bound, - parse_ce, - parse_ec, - parse_cc } state = none; + enum { + none, + parse_bracket, + parse_bound, + parse_ce, + parse_ec, + parse_cc + } state = none; /* Well known character classes. */ const char *cc[] = { ":alnum:", ":digit:", ":punct:", ":alpha:", ":graph:", ":space:", ":blank:", ":lower:", diff --git a/lib/isc/region.c b/lib/isc/region.c index ea3028bc13..d5f4e17101 100644 --- a/lib/isc/region.c +++ b/lib/isc/region.c @@ -30,8 +30,8 @@ isc_region_compare(isc_region_t *r1, isc_region_t *r2) { if ((result = memcmp(r1->base, r2->base, l)) != 0) { return ((result < 0) ? -1 : 1); } else { - return ((r1->length == r2->length) - ? 0 - : (r1->length < r2->length) ? -1 : 1); + return ((r1->length == r2->length) ? 0 + : (r1->length < r2->length) ? -1 + : 1); } } diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c index b599932d4f..6f02dd0141 100644 --- a/lib/isc/unix/socket.c +++ b/lib/isc/unix/socket.c @@ -352,7 +352,7 @@ struct isc__socket { unsigned int listener : 1, /* listener socket */ connected : 1, connecting : 1, /* connect pending * */ - bound : 1, /* bound to local addr */ + bound : 1, /* bound to local addr */ dupped : 1, active : 1, /* currently active */ pktdscp : 1; /* per packet dscp */ @@ -481,17 +481,19 @@ setdscp(isc__socket_t *sock, isc_dscp_t dscp); /*% * Shortcut index arrays to get access to statistics counters. */ -enum { STATID_OPEN = 0, - STATID_OPENFAIL = 1, - STATID_CLOSE = 2, - STATID_BINDFAIL = 3, - STATID_CONNECTFAIL = 4, - STATID_CONNECT = 5, - STATID_ACCEPTFAIL = 6, - STATID_ACCEPT = 7, - STATID_SENDFAIL = 8, - STATID_RECVFAIL = 9, - STATID_ACTIVE = 10 }; +enum { + STATID_OPEN = 0, + STATID_OPENFAIL = 1, + STATID_CLOSE = 2, + STATID_BINDFAIL = 3, + STATID_CONNECTFAIL = 4, + STATID_CONNECT = 5, + STATID_ACCEPTFAIL = 6, + STATID_ACCEPT = 7, + STATID_SENDFAIL = 8, + STATID_RECVFAIL = 9, + STATID_ACTIVE = 10 +}; static const isc_statscounter_t udp4statsindex[] = { isc_sockstatscounter_udp4open, isc_sockstatscounter_udp4openfail, diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c index 499eef18c3..42d345cd82 100644 --- a/lib/isc/win32/socket.c +++ b/lib/isc/win32/socket.c @@ -173,13 +173,14 @@ typedef isc_event_t intev_t; /* * Socket State */ -enum { SOCK_INITIALIZED, /* Socket Initialized */ - SOCK_OPEN, /* Socket opened but nothing yet to do */ - SOCK_DATA, /* Socket sending or receiving data */ - SOCK_LISTEN, /* TCP Socket listening for connects */ - SOCK_ACCEPT, /* TCP socket is waiting to accept */ - SOCK_CONNECT, /* TCP Socket connecting */ - SOCK_CLOSED, /* Socket has been closed */ +enum { + SOCK_INITIALIZED, /* Socket Initialized */ + SOCK_OPEN, /* Socket opened but nothing yet to do */ + SOCK_DATA, /* Socket sending or receiving data */ + SOCK_LISTEN, /* TCP Socket listening for connects */ + SOCK_ACCEPT, /* TCP socket is waiting to accept */ + SOCK_CONNECT, /* TCP Socket connecting */ + SOCK_CLOSED, /* Socket has been closed */ }; #define SOCKET_MAGIC ISC_MAGIC('I', 'O', 'i', 'o') @@ -272,7 +273,7 @@ struct isc_socket { unsigned int listener : 1, /* listener socket */ connected : 1, pending_connect : 1, /* connect * pending */ - bound : 1, /* bound to local addr */ + bound : 1, /* bound to local addr */ dupped : 1; /* created by isc_socket_dup() */ unsigned int pending_iocp; /* Should equal the counters below. * Debug. */ diff --git a/lib/ns/include/ns/stats.h b/lib/ns/include/ns/stats.h index f3238b901b..3c0879927f 100644 --- a/lib/ns/include/ns/stats.h +++ b/lib/ns/include/ns/stats.h @@ -19,93 +19,94 @@ /*% * Server statistics counters. Used as isc_statscounter_t values. */ -enum { ns_statscounter_requestv4 = 0, - ns_statscounter_requestv6 = 1, - ns_statscounter_edns0in = 2, - ns_statscounter_badednsver = 3, - ns_statscounter_tsigin = 4, - ns_statscounter_sig0in = 5, - ns_statscounter_invalidsig = 6, - ns_statscounter_requesttcp = 7, +enum { + ns_statscounter_requestv4 = 0, + ns_statscounter_requestv6 = 1, + ns_statscounter_edns0in = 2, + ns_statscounter_badednsver = 3, + ns_statscounter_tsigin = 4, + ns_statscounter_sig0in = 5, + ns_statscounter_invalidsig = 6, + ns_statscounter_requesttcp = 7, - ns_statscounter_authrej = 8, - ns_statscounter_recurserej = 9, - ns_statscounter_xfrrej = 10, - ns_statscounter_updaterej = 11, + ns_statscounter_authrej = 8, + ns_statscounter_recurserej = 9, + ns_statscounter_xfrrej = 10, + ns_statscounter_updaterej = 11, - ns_statscounter_response = 12, - ns_statscounter_truncatedresp = 13, - ns_statscounter_edns0out = 14, - ns_statscounter_tsigout = 15, - ns_statscounter_sig0out = 16, + ns_statscounter_response = 12, + ns_statscounter_truncatedresp = 13, + ns_statscounter_edns0out = 14, + ns_statscounter_tsigout = 15, + ns_statscounter_sig0out = 16, - ns_statscounter_success = 17, - ns_statscounter_authans = 18, - ns_statscounter_nonauthans = 19, - ns_statscounter_referral = 20, - ns_statscounter_nxrrset = 21, - ns_statscounter_servfail = 22, - ns_statscounter_formerr = 23, - ns_statscounter_nxdomain = 24, - ns_statscounter_recursion = 25, - ns_statscounter_duplicate = 26, - ns_statscounter_dropped = 27, - ns_statscounter_failure = 28, + ns_statscounter_success = 17, + ns_statscounter_authans = 18, + ns_statscounter_nonauthans = 19, + ns_statscounter_referral = 20, + ns_statscounter_nxrrset = 21, + ns_statscounter_servfail = 22, + ns_statscounter_formerr = 23, + ns_statscounter_nxdomain = 24, + ns_statscounter_recursion = 25, + ns_statscounter_duplicate = 26, + ns_statscounter_dropped = 27, + ns_statscounter_failure = 28, - ns_statscounter_xfrdone = 29, + ns_statscounter_xfrdone = 29, - ns_statscounter_updatereqfwd = 30, - ns_statscounter_updaterespfwd = 31, - ns_statscounter_updatefwdfail = 32, - ns_statscounter_updatedone = 33, - ns_statscounter_updatefail = 34, - ns_statscounter_updatebadprereq = 35, + ns_statscounter_updatereqfwd = 30, + ns_statscounter_updaterespfwd = 31, + ns_statscounter_updatefwdfail = 32, + ns_statscounter_updatedone = 33, + ns_statscounter_updatefail = 34, + ns_statscounter_updatebadprereq = 35, - ns_statscounter_recursclients = 36, + ns_statscounter_recursclients = 36, - ns_statscounter_dns64 = 37, + ns_statscounter_dns64 = 37, - ns_statscounter_ratedropped = 38, - ns_statscounter_rateslipped = 39, + ns_statscounter_ratedropped = 38, + ns_statscounter_rateslipped = 39, - ns_statscounter_rpz_rewrites = 40, + ns_statscounter_rpz_rewrites = 40, - ns_statscounter_udp = 41, - ns_statscounter_tcp = 42, + ns_statscounter_udp = 41, + ns_statscounter_tcp = 42, - ns_statscounter_nsidopt = 43, - ns_statscounter_expireopt = 44, - ns_statscounter_otheropt = 45, - ns_statscounter_ecsopt = 46, - ns_statscounter_padopt = 47, - ns_statscounter_keepaliveopt = 48, + ns_statscounter_nsidopt = 43, + ns_statscounter_expireopt = 44, + ns_statscounter_otheropt = 45, + ns_statscounter_ecsopt = 46, + ns_statscounter_padopt = 47, + ns_statscounter_keepaliveopt = 48, - ns_statscounter_nxdomainredirect = 49, - ns_statscounter_nxdomainredirect_rlookup = 50, + ns_statscounter_nxdomainredirect = 49, + ns_statscounter_nxdomainredirect_rlookup = 50, - ns_statscounter_cookiein = 51, - ns_statscounter_cookiebadsize = 52, - ns_statscounter_cookiebadtime = 53, - ns_statscounter_cookienomatch = 54, - ns_statscounter_cookiematch = 55, - ns_statscounter_cookienew = 56, - ns_statscounter_badcookie = 57, + ns_statscounter_cookiein = 51, + ns_statscounter_cookiebadsize = 52, + ns_statscounter_cookiebadtime = 53, + ns_statscounter_cookienomatch = 54, + ns_statscounter_cookiematch = 55, + ns_statscounter_cookienew = 56, + ns_statscounter_badcookie = 57, - ns_statscounter_nxdomainsynth = 58, - ns_statscounter_nodatasynth = 59, - ns_statscounter_wildcardsynth = 60, + ns_statscounter_nxdomainsynth = 58, + ns_statscounter_nodatasynth = 59, + ns_statscounter_wildcardsynth = 60, - ns_statscounter_trystale = 61, - ns_statscounter_usedstale = 62, + ns_statscounter_trystale = 61, + ns_statscounter_usedstale = 62, - ns_statscounter_prefetch = 63, - ns_statscounter_keytagopt = 64, + ns_statscounter_prefetch = 63, + ns_statscounter_keytagopt = 64, - ns_statscounter_tcphighwater = 65, + ns_statscounter_tcphighwater = 65, - ns_statscounter_reclimitdropped = 66, + ns_statscounter_reclimitdropped = 66, - ns_statscounter_max = 67, + ns_statscounter_max = 67, }; void diff --git a/lib/ns/query.c b/lib/ns/query.c index 86b7c944e7..10a08ce4e0 100644 --- a/lib/ns/query.c +++ b/lib/ns/query.c @@ -11416,7 +11416,9 @@ log_query(ns_client_t *client, unsigned int flags, unsigned int extflags) { TCP(client) ? "T" : "", ((extflags & DNS_MESSAGEEXTFLAG_DO) != 0) ? "D" : "", ((flags & DNS_MESSAGEFLAG_CD) != 0) ? "C" : "", - HAVECOOKIE(client) ? "V" : WANTCOOKIE(client) ? "K" : "", + HAVECOOKIE(client) ? "V" + : WANTCOOKIE(client) ? "K" + : "", onbuf, ecsbuf); } From c1eb385fdf937f1cfe0181d070c59ea1f2d3a9c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 24 Aug 2020 09:24:25 +0200 Subject: [PATCH 3/3] Bump the clang version to 11 (stable) --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 54a9a2d4a4..d41c07c78f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,16 +16,16 @@ variables: TEST_PARALLEL_JOBS: 6 CONFIGURE: ./configure - CLANG: clang-10 - SCAN_BUILD: scan-build-10 - ASAN_SYMBOLIZER_PATH: /usr/lib/llvm-10/bin/llvm-symbolizer - CLANG_FORMAT: clang-format-10 + CLANG: clang-11 + SCAN_BUILD: scan-build-11 + ASAN_SYMBOLIZER_PATH: /usr/lib/llvm-11/bin/llvm-symbolizer + CLANG_FORMAT: clang-format-11 CFLAGS_COMMON: -fno-omit-frame-pointer -fno-optimize-sibling-calls -O1 -g -Wall -Wextra # Pass run-time flags to AddressSanitizer to get core dumps on error. ASAN_OPTIONS_COMMON: abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1 - TSAN_OPTIONS_COMMON: "second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=/usr/lib/llvm-10/bin/llvm-symbolizer" + TSAN_OPTIONS_COMMON: "second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=/usr/lib/llvm-11/bin/llvm-symbolizer" TARBALL_EXTENSION: xz