upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'ondrej/remove-platform.h-header' into 'main'

Browse source 
Remove isc/platform.h

See merge request isc-projects/bind9!5162
This commit is contained in:
Ondřej Surý 2021-07-06 05:53:30 +00:00
commit f663701b1d
113 changed files with 331 additions and 520 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/confgen/util.h
View file

@ -17,7 +17,6 @@
#include <isc/attributes.h>
#include <isc/formatcheck.h>
#include <isc/lang.h>
#include <isc/platform.h>
#define NS_CONTROL_PORT 953

2
bin/dig/dig.c
View file

@ -19,9 +19,9 @@
#include <isc/app.h>
#include <isc/attributes.h>
#include <isc/dir.h>
#include <isc/netaddr.h>
#include <isc/parseint.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/string.h>
#include <isc/task.h>

1
bin/dnssec/dnssec-cds.c
View file

@ -24,6 +24,7 @@
#include <isc/attributes.h>
#include <isc/buffer.h>
#include <isc/commandline.h>
#include <isc/dir.h>
#include <isc/file.h>
#include <isc/hash.h>
#include <isc/mem.h>

1
bin/dnssec/dnssec-dsfromkey.c
View file

@ -18,6 +18,7 @@
#include <isc/attributes.h>
#include <isc/buffer.h>
#include <isc/commandline.h>
#include <isc/dir.h>
#include <isc/hash.h>
#include <isc/mem.h>
#include <isc/print.h>

1
bin/dnssec/dnssec-signzone.c
View file

@ -36,6 +36,7 @@
#include <isc/attributes.h>
#include <isc/base32.h>
#include <isc/commandline.h>
#include <isc/dir.h>
#include <isc/event.h>
#include <isc/file.h>
#include <isc/hash.h>

1
bin/dnssec/dnssectool.c
View file

@ -27,7 +27,6 @@
#include <isc/heap.h>
#include <isc/list.h>
#include <isc/mem.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/string.h>
#include <isc/time.h>

1
bin/dnssec/dnssectool.h
View file

@ -17,7 +17,6 @@
#include <isc/attributes.h>
#include <isc/log.h>
#include <isc/platform.h>
#include <isc/stdtime.h>
#include <dns/rdatastruct.h>

1
bin/named/geoip.c
View file

@ -15,6 +15,7 @@
#include <maxminddb.h>
#endif /* if defined(HAVE_GEOIP2) */
#include <isc/dir.h>
#include <isc/print.h>
#include <isc/string.h>
#include <isc/util.h>

9
bin/named/main.c
View file

@ -35,7 +35,6 @@
#include <isc/managers.h>
#include <isc/netmgr.h>
#include <isc/os.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/resource.h>
#include <isc/stdio.h>
@ -122,10 +121,10 @@
#define BACKTRACE_MAXFRAME 128
#endif /* ifndef BACKTRACE_MAXFRAME */
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;
extern int isc_dscp_check_value;
extern unsigned int dns_zone_mkey_hour;
extern unsigned int dns_zone_mkey_day;
extern unsigned int dns_zone_mkey_month;
static bool want_stats = false;
static char program_name[NAME_MAX] = "named";

1
bin/named/server.c
View file

@ -39,7 +39,6 @@
#include <isc/meminfo.h>
#include <isc/nonce.h>
#include <isc/parseint.h>
#include <isc/platform.h>
#include <isc/portset.h>
#include <isc/print.h>
#include <isc/refcount.h>

1
bin/nsupdate/nsupdate.c
View file

@ -33,7 +33,6 @@
#include <isc/mem.h>
#include <isc/nonce.h>
#include <isc/parseint.h>
#include <isc/platform.h>
#include <isc/portset.h>
#include <isc/print.h>
#include <isc/random.h>

1
bin/rndc/util.h
View file

@ -17,7 +17,6 @@
#include <isc/attributes.h>
#include <isc/formatcheck.h>
#include <isc/lang.h>
#include <isc/platform.h>
#define NS_CONTROL_PORT 953

1
bin/tests/system/pipelined/pipequeries.c
View file

@ -24,7 +24,6 @@
#include <isc/mem.h>
#include <isc/net.h>
#include <isc/parseint.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/sockaddr.h>
#include <isc/socket.h>

1
bin/tests/system/rsabigexponent/bigkey.c
View file

@ -14,7 +14,6 @@
#include <isc/buffer.h>
#include <isc/mem.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/region.h>
#include <isc/stdio.h>

4
configure.ac
View file

@ -1620,10 +1620,6 @@ AC_CONFIG_FILES([doc/Makefile
doc/man/Makefile
doc/misc/Makefile])
# Generated headers
AC_CONFIG_FILES([lib/isc/include/isc/platform.h])
# Unit Tests
AC_CONFIG_FILES([lib/isc/tests/Makefile

1
contrib/dlz/drivers/dlz_filesystem_driver.c
View file

@ -50,7 +50,6 @@
#include <isc/dir.h>
#include <isc/mem.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/result.h>
#include <isc/string.h>

1
contrib/dlz/drivers/dlz_ldap_driver.c
View file

@ -48,7 +48,6 @@
#include <string.h>
#include <isc/mem.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/result.h>
#include <isc/string.h>

1
contrib/dlz/drivers/dlz_mysql_driver.c
View file

@ -48,7 +48,6 @@
#include <string.h>
#include <isc/mem.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/result.h>
#include <isc/string.h>

1
contrib/dlz/drivers/dlz_odbc_driver.c
View file

@ -50,7 +50,6 @@
#include <string.h>
#include <isc/mem.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/result.h>
#include <isc/string.h>

1
contrib/dlz/drivers/dlz_postgres_driver.c
View file

@ -47,7 +47,6 @@
#include <string.h>
#include <isc/mem.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/result.h>
#include <isc/string.h>

1
fuzz/fuzz.h
View file

@ -13,6 +13,7 @@
#include <stddef.h>
#include <stdint.h>
#include <isc/dir.h>
#include <isc/lang.h>
#include <isc/mem.h>
#include <isc/once.h>

1
lib/.gitignore vendored
View file

@ -1,4 +1,3 @@
platform.h
netdb.h
gen
/unit-test-driver.sh

2
lib/bind9/check.c
View file

@ -23,6 +23,7 @@
#include <isc/aes.h>
#include <isc/base64.h>
#include <isc/buffer.h>
#include <isc/dir.h>
#include <isc/file.h>
#include <isc/hex.h>
#include <isc/log.h>
@ -30,7 +31,6 @@
#include <isc/mem.h>
#include <isc/netaddr.h>
#include <isc/parseint.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/region.h>
#include <isc/result.h>

1
lib/dns/badcache.c
View file

@ -19,7 +19,6 @@
#include <isc/log.h>
#include <isc/mem.h>
#include <isc/mutex.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/rwlock.h>
#include <isc/string.h>

2
lib/dns/dnssec.c
View file

@ -44,7 +44,7 @@
#include <dst/result.h>
LIBDNS_EXTERNAL_DATA isc_stats_t *dns_dnssec_stats;
isc_stats_t *dns_dnssec_stats;
#define is_response(msg) ((msg->flags & DNS_MESSAGEFLAG_QR) != 0)

1
lib/dns/dst_api.c
View file

@ -37,7 +37,6 @@
#include <isc/lex.h>
#include <isc/mem.h>
#include <isc/once.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/random.h>
#include <isc/refcount.h>

1
lib/dns/gssapictx.c
View file

@ -40,7 +40,6 @@
#include <isc/lex.h>
#include <isc/mem.h>
#include <isc/once.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/random.h>
#include <isc/string.h>

2
lib/dns/include/dns/dnssec.h
View file

@ -27,7 +27,7 @@
ISC_LANG_BEGINDECLS
LIBDNS_EXTERNAL_DATA extern isc_stats_t *dns_dnssec_stats;
extern isc_stats_t *dns_dnssec_stats;
/*%< Maximum number of keys supported in a zone. */
#define DNS_MAXZONEKEYS 32

2
lib/dns/include/dns/lib.h
View file

@ -22,7 +22,7 @@ ISC_LANG_BEGINDECLS
/*%
* Tuning: external query load in packets per seconds.
*/
LIBDNS_EXTERNAL_DATA extern unsigned int dns_pps;
extern unsigned int dns_pps;
isc_result_t
dns_lib_init(void);

6
lib/dns/include/dns/log.h
View file

@ -18,9 +18,9 @@
#include <isc/lang.h>
#include <isc/log.h>
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[];
extern isc_log_t * dns_lctx;
extern isc_logcategory_t dns_categories[];
extern isc_logmodule_t dns_modules[];
#define DNS_LOGCATEGORY_NOTIFY (&dns_categories[0])
#define DNS_LOGCATEGORY_DATABASE (&dns_categories[1])

24
lib/dns/include/dns/masterdump.h
View file

@ -126,34 +126,32 @@ ISC_LANG_BEGINDECLS
* tab stop for the TTL. The class is only printed for the first
* rrset in the file and shares a tab stop with the RR type.
*/
LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_default;
extern const dns_master_style_t dns_master_style_default;
/*%
* A master file style that dumps zones to a very generic format easily
* imported/checked with external tools.
*/
LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_full;
extern const dns_master_style_t dns_master_style_full;
/*%
* A master file style that prints explicit TTL values on each
* record line, never using $TTL statements. The TTL has a tab
* stop of its own, but the class and type share one.
*/
LIBDNS_EXTERNAL_DATA extern const dns_master_style_t
dns_master_style_explicitttl;
extern const dns_master_style_t dns_master_style_explicitttl;
/*%
* A master style format designed for cache files. It prints explicit TTL
* values on each record line and never uses $ORIGIN or relative names.
*/
LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_cache;
extern const dns_master_style_t dns_master_style_cache;
/*%
* A master style format designed for cache files. The same as above but
* this also prints expired entries.
*/
LIBDNS_EXTERNAL_DATA extern const dns_master_style_t
dns_master_style_cache_with_expired;
extern const dns_master_style_t dns_master_style_cache_with_expired;
/*%
* A master style that prints name, ttl, class, type, and value on
@ -161,32 +159,32 @@ LIBDNS_EXTERNAL_DATA extern const dns_master_style_t
* Intended for generating master files which can be easily parsed
* by perl scripts and similar applications.
*/
LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_simple;
extern const dns_master_style_t dns_master_style_simple;
/*%
* The style used for debugging, "dig" output, etc.
*/
LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_debug;
extern const dns_master_style_t dns_master_style_debug;
/*%
* Similar to dns_master_style_debug but data is prepended with ";"
*/
LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_comment;
extern const dns_master_style_t dns_master_style_comment;
/*%
* Similar to dns_master_style_debug but data is indented with "\t" (tab)
*/
LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_indent;
extern const dns_master_style_t dns_master_style_indent;
/*%
* The style used for dumping "key" zones.
*/
LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_keyzone;
extern const dns_master_style_t dns_master_style_keyzone;
/*%
* YAML-compatible output
*/
LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_yaml;
extern const dns_master_style_t dns_master_style_yaml;
/***
*** Functions

4
lib/dns/include/dns/name.h
View file

@ -142,8 +142,8 @@ struct dns_name {
#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;
extern const dns_name_t *dns_rootname;
extern const dns_name_t *dns_wildcardname;
/*%<
* DNS_NAME_INITNONABSOLUTE and DNS_NAME_INITABSOLUTE are macros for

2
lib/dns/include/dns/stats.h
View file

@ -456,7 +456,7 @@ enum {
/*%<
* (Obsoleted)
*/
LIBDNS_EXTERNAL_DATA extern const char *dns_statscounter_names[];
extern const char *dns_statscounter_names[];
/*%
* Attributes for statistics counters of RRset and Rdatatype types.

16
lib/dns/include/dns/tsig.h
View file

@ -31,21 +31,21 @@
/*
* Algorithms.
*/
LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_tsig_hmacmd5_name;
extern const dns_name_t *dns_tsig_hmacmd5_name;
#define DNS_TSIG_HMACMD5_NAME dns_tsig_hmacmd5_name
LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_tsig_gssapi_name;
extern const dns_name_t *dns_tsig_gssapi_name;
#define DNS_TSIG_GSSAPI_NAME dns_tsig_gssapi_name
LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_tsig_gssapims_name;
extern const dns_name_t *dns_tsig_gssapims_name;
#define DNS_TSIG_GSSAPIMS_NAME dns_tsig_gssapims_name
LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_tsig_hmacsha1_name;
extern const dns_name_t *dns_tsig_hmacsha1_name;
#define DNS_TSIG_HMACSHA1_NAME dns_tsig_hmacsha1_name
LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_tsig_hmacsha224_name;
extern const dns_name_t *dns_tsig_hmacsha224_name;
#define DNS_TSIG_HMACSHA224_NAME dns_tsig_hmacsha224_name
LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_tsig_hmacsha256_name;
extern const dns_name_t *dns_tsig_hmacsha256_name;
#define DNS_TSIG_HMACSHA256_NAME dns_tsig_hmacsha256_name
LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_tsig_hmacsha384_name;
extern const dns_name_t *dns_tsig_hmacsha384_name;
#define DNS_TSIG_HMACSHA384_NAME dns_tsig_hmacsha384_name
LIBDNS_EXTERNAL_DATA extern const dns_name_t *dns_tsig_hmacsha512_name;
extern const dns_name_t *dns_tsig_hmacsha512_name;
#define DNS_TSIG_HMACSHA512_NAME dns_tsig_hmacsha512_name
/*%

1
lib/dns/include/dst/gssapi.h
View file

@ -18,7 +18,6 @@
#include <isc/formatcheck.h>
#include <isc/lang.h>
#include <isc/platform.h>
#include <isc/types.h>
#include <dns/types.h>

1
lib/dns/journal.c
View file

@ -15,6 +15,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <isc/dir.h>
#include <isc/file.h>
#include <isc/mem.h>
#include <isc/print.h>

2
lib/dns/lib.c
View file

@ -31,7 +31,7 @@
*** Globals
***/
LIBDNS_EXTERNAL_DATA unsigned int dns_pps = 0U;
unsigned int dns_pps = 0U;
/***
*** Functions

6
lib/dns/log.c
View file

@ -19,7 +19,7 @@
* When adding a new category, be sure to add the appropriate
* \#define to <dns/log.h>.
*/
LIBDNS_EXTERNAL_DATA isc_logcategory_t dns_categories[] = {
isc_logcategory_t dns_categories[] = {
{ "notify", 0 }, { "database", 0 }, { "security", 0 },
{ "_placeholder", 0 }, { "dnssec", 0 }, { "resolver", 0 },
{ "xfer-in", 0 }, { "xfer-out", 0 }, { "dispatch", 0 },
@ -33,7 +33,7 @@ LIBDNS_EXTERNAL_DATA isc_logcategory_t dns_categories[] = {
* When adding a new module, be sure to add the appropriate
* \#define to <dns/log.h>.
*/
LIBDNS_EXTERNAL_DATA isc_logmodule_t dns_modules[] = {
isc_logmodule_t dns_modules[] = {
{ "dns/db", 0 }, { "dns/rbtdb", 0 },
{ "dns/rbt", 0 }, { "dns/rdata", 0 },
{ "dns/master", 0 }, { "dns/message", 0 },
@ -53,7 +53,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns_modules[] = {
{ "dns/ssu", 0 }, { NULL, 0 }
};
LIBDNS_EXTERNAL_DATA isc_log_t *dns_lctx = NULL;
isc_log_t *dns_lctx = NULL;
void
dns_log_init(isc_log_t *lctx) {

50
lib/dns/masterdump.c
View file

@ -105,7 +105,7 @@ typedef struct dns_totext_ctx {
dns_indent_t indent;
} dns_totext_ctx_t;
LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_keyzone = {
const dns_master_style_t dns_master_style_keyzone = {
DNS_STYLEFLAG_OMIT_OWNER | DNS_STYLEFLAG_OMIT_CLASS |
DNS_STYLEFLAG_REL_OWNER | DNS_STYLEFLAG_REL_DATA |
DNS_STYLEFLAG_OMIT_TTL | DNS_STYLEFLAG_TTL |
@ -120,7 +120,7 @@ LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_keyzone = {
UINT_MAX
};
LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_default = {
const dns_master_style_t dns_master_style_default = {
DNS_STYLEFLAG_OMIT_OWNER | DNS_STYLEFLAG_OMIT_CLASS |
DNS_STYLEFLAG_REL_OWNER | DNS_STYLEFLAG_REL_DATA |
DNS_STYLEFLAG_OMIT_TTL | DNS_STYLEFLAG_TTL |
@ -135,7 +135,7 @@ LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_default = {
UINT_MAX
};
LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_full = {
const dns_master_style_t dns_master_style_full = {
DNS_STYLEFLAG_COMMENT | DNS_STYLEFLAG_RESIGN,
46,
46,
@ -146,7 +146,7 @@ LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_full = {
UINT_MAX
};
LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_explicitttl = {
const dns_master_style_t dns_master_style_explicitttl = {
DNS_STYLEFLAG_OMIT_OWNER | DNS_STYLEFLAG_OMIT_CLASS |
DNS_STYLEFLAG_REL_OWNER | DNS_STYLEFLAG_REL_DATA |
DNS_STYLEFLAG_COMMENT | DNS_STYLEFLAG_RRCOMMENT |
@ -160,7 +160,7 @@ LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_explicitttl = {
UINT_MAX
};
LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_cache = {
const dns_master_style_t dns_master_style_cache = {
DNS_STYLEFLAG_OMIT_OWNER | DNS_STYLEFLAG_OMIT_CLASS |
DNS_STYLEFLAG_MULTILINE | DNS_STYLEFLAG_RRCOMMENT |
DNS_STYLEFLAG_TRUST | DNS_STYLEFLAG_NCACHE,
@ -173,36 +173,34 @@ LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_cache = {
UINT_MAX
};
LIBDNS_EXTERNAL_DATA const dns_master_style_t
dns_master_style_cache_with_expired = {
DNS_STYLEFLAG_OMIT_OWNER | DNS_STYLEFLAG_OMIT_CLASS |
DNS_STYLEFLAG_MULTILINE | DNS_STYLEFLAG_RRCOMMENT |
DNS_STYLEFLAG_TRUST | DNS_STYLEFLAG_NCACHE |
DNS_STYLEFLAG_EXPIRED,
24,
32,
32,
40,
80,
8,
UINT_MAX
};
LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_simple = {
0, 24, 32, 32, 40, 80, 8, UINT_MAX
const dns_master_style_t dns_master_style_cache_with_expired = {
DNS_STYLEFLAG_OMIT_OWNER | DNS_STYLEFLAG_OMIT_CLASS |
DNS_STYLEFLAG_MULTILINE | DNS_STYLEFLAG_RRCOMMENT |
DNS_STYLEFLAG_TRUST | DNS_STYLEFLAG_NCACHE |
DNS_STYLEFLAG_EXPIRED,
24,
32,
32,
40,
80,
8,
UINT_MAX
};
const dns_master_style_t dns_master_style_simple = { 0, 24, 32, 32,
40, 80, 8, UINT_MAX };
/*%
* A style suitable for dns_rdataset_totext().
*/
LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_debug = {
const dns_master_style_t dns_master_style_debug = {
DNS_STYLEFLAG_REL_OWNER, 24, 32, 40, 48, 80, 8, UINT_MAX
};
/*%
* Similar, but indented (i.e., prepended with indentctx.string).
*/
LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_indent = {
const dns_master_style_t dns_master_style_indent = {
DNS_STYLEFLAG_REL_OWNER | DNS_STYLEFLAG_INDENT,
24,
32,
@ -216,7 +214,7 @@ LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_indent = {
/*%
* Similar, but with each line commented out.
*/
LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_comment = {
const dns_master_style_t dns_master_style_comment = {
DNS_STYLEFLAG_REL_OWNER | DNS_STYLEFLAG_MULTILINE |
DNS_STYLEFLAG_RRCOMMENT | DNS_STYLEFLAG_COMMENTDATA,
24,
@ -231,7 +229,7 @@ LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_comment = {
/*%
* YAML style
*/
LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_yaml = {
const dns_master_style_t dns_master_style_yaml = {
DNS_STYLEFLAG_YAML | DNS_STYLEFLAG_REL_OWNER | DNS_STYLEFLAG_INDENT,
24,
32,

4
lib/dns/name.c
View file

@ -135,7 +135,7 @@ static unsigned char root_ndata[] = { "" };
static unsigned char root_offsets[] = { 0 };
static dns_name_t root = DNS_NAME_INITABSOLUTE(root_ndata, root_offsets);
LIBDNS_EXTERNAL_DATA const dns_name_t *dns_rootname = &root;
const dns_name_t *dns_rootname = &root;
static unsigned char wild_ndata[] = { "\001*" };
static unsigned char wild_offsets[] = { 0 };
@ -143,7 +143,7 @@ static unsigned char wild_offsets[] = { 0 };
static dns_name_t const wild = DNS_NAME_INITNONABSOLUTE(wild_ndata,
wild_offsets);
LIBDNS_EXTERNAL_DATA const dns_name_t *dns_wildcardname = &wild;
const dns_name_t *dns_wildcardname = &wild;
/*
* dns_name_t to text post-conversion procedure.

1
lib/dns/openssl_link.c
View file

@ -26,7 +26,6 @@
#include <isc/mem.h>
#include <isc/mutex.h>
#include <isc/mutexblock.h>
#include <isc/platform.h>
#include <isc/string.h>
#include <isc/thread.h>
#include <isc/tls.h>

1
lib/dns/rbt.c
View file

@ -20,7 +20,6 @@
#include <isc/hex.h>
#include <isc/mem.h>
#include <isc/once.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/refcount.h>
#include <isc/socket.h>

1
lib/dns/rbtdb.c
View file

@ -28,7 +28,6 @@
#include <isc/mem.h>
#include <isc/mutex.h>
#include <isc/once.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/random.h>
#include <isc/refcount.h>

1
lib/dns/resolver.c
View file

@ -18,7 +18,6 @@
#include <isc/atomic.h>
#include <isc/counter.h>
#include <isc/log.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/random.h>
#include <isc/refcount.h>

2
lib/dns/stats.c
View file

@ -604,7 +604,7 @@ dns_rcodestats_dump(dns_stats_t *stats, dns_rcodestats_dumper_t dump_fn,
/***
*** Obsolete variables and functions follow:
***/
LIBDNS_EXTERNAL_DATA const char *dns_statscounter_names[DNS_STATS_NCOUNTERS] = {
const char *dns_statscounter_names[DNS_STATS_NCOUNTERS] = {
"success", "referral", "nxrrset", "nxdomain",
"recursion", "failure", "duplicate", "dropped"
};

1
lib/dns/tests/geoip_test.c
View file

@ -24,6 +24,7 @@
#include <cmocka.h>
#include <maxminddb.h>
#include <isc/dir.h>
#include <isc/print.h>
#include <isc/string.h>
#include <isc/types.h>

16
lib/dns/tsig.c
View file

@ -58,13 +58,13 @@ static unsigned char hmacmd5_offsets[] = { 0, 9, 17, 21, 25 };
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;
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);
LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_gssapi_name = &gsstsig;
const dns_name_t *dns_tsig_gssapi_name = &gsstsig;
/*
* Since Microsoft doesn't follow its own standard, we will use this
@ -74,37 +74,37 @@ 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;
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);
LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha1_name = &hmacsha1;
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);
LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha224_name = &hmacsha224;
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);
LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha256_name = &hmacsha256;
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);
LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha384_name = &hmacsha384;
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);
LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha512_name = &hmacsha512;
const dns_name_t *dns_tsig_hmacsha512_name = &hmacsha512;
static const struct {
const dns_name_t *name;

1
lib/dns/update.c
View file

@ -17,7 +17,6 @@
#include <isc/magic.h>
#include <isc/mem.h>
#include <isc/netaddr.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/random.h>
#include <isc/serial.h>

1
lib/dns/view.c
View file

@ -20,6 +20,7 @@
#endif /* ifdef HAVE_LMDB */
#include <isc/atomic.h>
#include <isc/dir.h>
#include <isc/file.h>
#include <isc/hash.h>
#include <isc/lex.h>

6
lib/dns/zone.c
View file

@ -837,9 +837,9 @@ struct dns_include {
#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;
LIBDNS_EXTERNAL_DATA unsigned int dns_zone_mkey_month = MONTH;
unsigned int dns_zone_mkey_hour = HOUR;
unsigned int dns_zone_mkey_day = DAY;
unsigned int dns_zone_mkey_month = MONTH;
#define SEND_BUFFER_SIZE 2048

1
lib/isc/Makefile.am
View file

@ -66,7 +66,6 @@ libisc_la_HEADERS = \
include/isc/once.h \
include/isc/os.h \
include/isc/parseint.h \
include/isc/platform.h \
include/isc/pool.h \
include/isc/portset.h \
include/isc/print.h \

1
lib/isc/aes.c
View file

@ -16,7 +16,6 @@
#include <isc/aes.h>
#include <isc/assertions.h>
#include <isc/platform.h>
#include <isc/string.h>
#include <isc/types.h>
#include <isc/util.h>

1
lib/isc/app.c
View file

@ -28,7 +28,6 @@
#include <isc/event.h>
#include <isc/mem.h>
#include <isc/mutex.h>
#include <isc/platform.h>
#include <isc/strerr.h>
#include <isc/string.h>
#include <isc/task.h>

1
lib/isc/assertions.c
View file

@ -16,7 +16,6 @@
#include <isc/assertions.h>
#include <isc/backtrace.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/result.h>
#include <isc/strerr.h>

1
lib/isc/backtrace.c
View file

@ -18,7 +18,6 @@
#endif /* HAVE_BACKTRACE_SYMBOLS */
#include <isc/backtrace.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/result.h>
#include <isc/util.h>

2
lib/isc/bind9.c
View file

@ -22,4 +22,4 @@
* clients will run isc_lib_register(), which sets it to false,
* overriding certain BIND9 behaviors.
*/
LIBISC_EXTERNAL_DATA bool isc_bind9 = true;
bool isc_bind9 = true;

12
lib/isc/commandline.c
View file

@ -56,17 +56,17 @@
#include <isc/util.h>
/*% Index into parent argv vector. */
LIBISC_EXTERNAL_DATA int isc_commandline_index = 1;
int isc_commandline_index = 1;
/*% Character checked for validity. */
LIBISC_EXTERNAL_DATA int isc_commandline_option;
int isc_commandline_option;
/*% Argument associated with option. */
LIBISC_EXTERNAL_DATA char *isc_commandline_argument;
char *isc_commandline_argument;
/*% For printing error messages. */
LIBISC_EXTERNAL_DATA char *isc_commandline_progname;
char *isc_commandline_progname;
/*% Print error messages. */
LIBISC_EXTERNAL_DATA bool isc_commandline_errprint = true;
bool isc_commandline_errprint = true;
/*% Reset processing. */
LIBISC_EXTERNAL_DATA bool isc_commandline_reset = true;
bool isc_commandline_reset = true;
static char endopt = '\0';

1
lib/isc/errno2result.c
View file

@ -14,7 +14,6 @@
#include "errno2result.h"
#include <stdbool.h>
#include <isc/platform.h>
#include <isc/result.h>
#include <isc/strerr.h>
#include <isc/string.h>

1
lib/isc/file.c
View file

@ -60,7 +60,6 @@
#include <isc/log.h>
#include <isc/md.h>
#include <isc/mem.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/random.h>
#include <isc/string.h>

1
lib/isc/hmac.c
View file

@ -15,7 +15,6 @@
#include <isc/assertions.h>
#include <isc/hmac.h>
#include <isc/md.h>
#include <isc/platform.h>
#include <isc/safe.h>
#include <isc/string.h>
#include <isc/types.h>

1
lib/isc/include/isc/aes.h
View file

@ -15,7 +15,6 @@
#define ISC_AES_H 1
#include <isc/lang.h>
#include <isc/platform.h>
#include <isc/types.h>
#define ISC_AES128_KEYLENGTH 16U

1
lib/isc/include/isc/assertions.h
View file

@ -17,7 +17,6 @@
#include <isc/attributes.h>
#include <isc/lang.h>
#include <isc/likely.h>
#include <isc/platform.h>
ISC_LANG_BEGINDECLS

4
lib/isc/include/isc/bind9.h
View file

@ -14,14 +14,12 @@
#include <stdbool.h>
#include <isc/platform.h>
/*
* This determines whether we are using the libisc/libdns libraries
* in BIND9 or in some other application. For BIND9 (named and related
* tools) it must be set to true at runtime. Export library clients
* will call isc_lib_register(), which will set it to false.
*/
LIBISC_EXTERNAL_DATA extern bool isc_bind9;
extern bool isc_bind9;
#endif /* ISC_BIND9_H */

13
lib/isc/include/isc/commandline.h
View file

@ -17,21 +17,20 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/platform.h>
#include <isc/result.h>
/*% Index into parent argv vector. */
LIBISC_EXTERNAL_DATA extern int isc_commandline_index;
extern int isc_commandline_index;
/*% Character checked for validity. */
LIBISC_EXTERNAL_DATA extern int isc_commandline_option;
extern int isc_commandline_option;
/*% Argument associated with option. */
LIBISC_EXTERNAL_DATA extern char *isc_commandline_argument;
extern char *isc_commandline_argument;
/*% For printing error messages. */
LIBISC_EXTERNAL_DATA extern char *isc_commandline_progname;
extern char *isc_commandline_progname;
/*% Print error message. */
LIBISC_EXTERNAL_DATA extern bool isc_commandline_errprint;
extern bool isc_commandline_errprint;
/*% Reset getopt. */
LIBISC_EXTERNAL_DATA extern bool isc_commandline_reset;
extern bool isc_commandline_reset;
ISC_LANG_BEGINDECLS

15
lib/isc/include/isc/dir.h
View file

@ -9,19 +9,26 @@
* information regarding copyright ownership.
*/
#ifndef ISC_DIR_H
#define ISC_DIR_H 1
#pragma once
/*! \file */
#include <dirent.h>
#include <limits.h>
#include <isc/lang.h>
#include <isc/platform.h>
#include <isc/result.h>
#include <sys/types.h> /* Required on some systems. */
#ifndef NAME_MAX
#define NAME_MAX 256
#endif
#ifndef PATH_MAX
#define PATH_MAX 1024
#endif
/*% Directory Entry */
typedef struct isc_direntry {
char name[NAME_MAX];
@ -69,5 +76,3 @@ isc_dir_createunique(char *templet);
*/
ISC_LANG_ENDDECLS
#endif /* ISC_DIR_H */

1
lib/isc/include/isc/error.h
View file

@ -20,7 +20,6 @@
#include <isc/formatcheck.h>
#include <isc/lang.h>
#include <isc/likely.h>
#include <isc/platform.h>
ISC_LANG_BEGINDECLS

1
lib/isc/include/isc/hmac.h
View file

@ -18,7 +18,6 @@
#include <isc/lang.h>
#include <isc/md.h>
#include <isc/platform.h>
#include <isc/result.h>
#include <isc/types.h>

7
lib/isc/include/isc/log.h
View file

@ -21,7 +21,6 @@
#include <isc/formatcheck.h>
#include <isc/lang.h>
#include <isc/platform.h>
#include <isc/types.h>
/*@{*/
@ -159,9 +158,9 @@ typedef union isc_logdestination {
* definitions with indexes into its isc_logcategory structure corresponding to
* the order of the names.
*/
LIBISC_EXTERNAL_DATA extern isc_logcategory_t isc_categories[];
LIBISC_EXTERNAL_DATA extern isc_log_t * isc_lctx;
LIBISC_EXTERNAL_DATA extern isc_logmodule_t isc_modules[];
extern isc_logcategory_t isc_categories[];
extern isc_log_t * isc_lctx;
extern isc_logmodule_t isc_modules[];
/*@}*/
/*@{*/

1
lib/isc/include/isc/md.h
View file

@ -17,7 +17,6 @@
#pragma once
#include <isc/lang.h>
#include <isc/platform.h>
#include <isc/result.h>
#include <isc/types.h>

5
lib/isc/include/isc/mem.h
View file

@ -20,7 +20,6 @@
#include <isc/attributes.h>
#include <isc/lang.h>
#include <isc/mutex.h>
#include <isc/platform.h>
#include <isc/types.h>
ISC_LANG_BEGINDECLS
@ -37,8 +36,8 @@ typedef void (*isc_mem_water_t)(void *, int);
#define ISC_MEM_TRACKLINES 0
#endif /* ifndef ISC_MEM_TRACKLINES */
LIBISC_EXTERNAL_DATA extern unsigned int isc_mem_debugging;
LIBISC_EXTERNAL_DATA extern unsigned int isc_mem_defaultflags;
extern unsigned int isc_mem_debugging;
extern unsigned int isc_mem_defaultflags;
/*@{*/
#define ISC_MEM_DEBUGTRACE 0x00000001U

1
lib/isc/include/isc/net.h
View file

@ -67,7 +67,6 @@
#include <inttypes.h>
#include <isc/lang.h>
#include <isc/platform.h>
#include <isc/types.h>
#include <arpa/inet.h> /* Contractual promise. */

1
lib/isc/include/isc/once.h
View file

@ -16,7 +16,6 @@
#include <pthread.h>
#include <isc/platform.h>
#include <isc/result.h>
typedef pthread_once_t isc_once_t;

69
lib/isc/include/isc/platform.h.in
View file

@ -1,69 +0,0 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, you can obtain one at https://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
#ifndef ISC_PLATFORM_H
#define ISC_PLATFORM_H 1
/*! \file */
/*****
***** Platform-dependent defines.
*****/
/***
*** Default strerror_r buffer size
***/
#define ISC_STRERRORSIZE 128
/***
*** System limitations
***/
#include <limits.h>
#ifndef NAME_MAX
#define NAME_MAX 256
#endif
#ifndef PATH_MAX
#define PATH_MAX 1024
#endif
#ifndef IOV_MAX
#define IOV_MAX 1024
#endif
/***
*** Miscellaneous.
***/
/***
*** Windows dll support.
***/
#define LIBISC_EXTERNAL_DATA
#define LIBDNS_EXTERNAL_DATA
#define LIBISCCC_EXTERNAL_DATA
#define LIBISCCFG_EXTERNAL_DATA
#define LIBNS_EXTERNAL_DATA
#define LIBBIND9_EXTERNAL_DATA
#define LIBTESTS_EXTERNAL_DATA
/*
* Tell emacs to use C mode for this file.
*
* Local Variables:
* mode: c
* End:
*/
#endif /* ISC_PLATFORM_H */

1
lib/isc/include/isc/print.h
View file

@ -20,7 +20,6 @@
#include <isc/formatcheck.h> /* Required for ISC_FORMAT_PRINTF() macro. */
#include <isc/lang.h>
#include <isc/platform.h>
/***
*** Functions

1
lib/isc/include/isc/refcount.h
View file

@ -18,7 +18,6 @@
#include <isc/error.h>
#include <isc/lang.h>
#include <isc/mutex.h>
#include <isc/platform.h>
#include <isc/types.h>
/*! \file isc/refcount.h

1
lib/isc/include/isc/rwlock.h
View file

@ -19,7 +19,6 @@
#include <isc/atomic.h>
#include <isc/condition.h>
#include <isc/lang.h>
#include <isc/platform.h>
#include <isc/types.h>
ISC_LANG_BEGINDECLS

1
lib/isc/include/isc/siphash.h
View file

@ -14,7 +14,6 @@
#pragma once
#include <isc/lang.h>
#include <isc/platform.h>
#include <isc/types.h>
#define ISC_SIPHASH24_KEY_LENGTH 128 / 8

6
lib/isc/include/isc/strerr.h
View file

@ -15,6 +15,12 @@
#include <isc/string.h>
/***
*** Default strerror_r buffer size
***/
#define ISC_STRERRORSIZE 128
#if defined(strerror_r)
#undef strerror_r
#endif /* if defined(strerror_r) */

3
lib/isc/include/isc/string.h
View file

@ -15,8 +15,7 @@
#include <string.h>
#include "isc/lang.h"
#include "isc/platform.h"
#include <isc/lang.h>
ISC_LANG_BEGINDECLS

2
lib/isc/include/pk11/pk11.h
View file

@ -68,7 +68,7 @@ typedef enum {
/*%
* Global flag to make choose_slots() verbose
*/
LIBISC_EXTERNAL_DATA extern bool pk11_verbose_init;
extern bool pk11_verbose_init;
/*%
* Function prototypes

25
lib/isc/log.c
View file

@ -25,7 +25,6 @@
#include <isc/log.h>
#include <isc/magic.h>
#include <isc/mem.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/rwlock.h>
#include <isc/stat.h>
@ -178,21 +177,19 @@ static const int syslog_map[] = { LOG_DEBUG, LOG_INFO, LOG_NOTICE,
* be overridden. Since the default is always looked up as the first
* channellist in the log context, it must come first in isc_categories[].
*/
LIBISC_EXTERNAL_DATA isc_logcategory_t isc_categories[] = { { "default",
0 }, /* "default
must come
first. */
{ "general", 0 },
{ NULL, 0 } };
isc_logcategory_t isc_categories[] = { { "default", 0 }, /* "default
must come
first. */
{ "general", 0 },
{ NULL, 0 } };
/*!
* See above comment for categories on LIBISC_EXTERNAL_DATA, and apply it to
* modules.
* See above comment for categories, and apply it to modules.
*/
LIBISC_EXTERNAL_DATA isc_logmodule_t isc_modules[] = {
{ "socket", 0 }, { "time", 0 }, { "interface", 0 }, { "timer", 0 },
{ "file", 0 }, { "netmgr", 0 }, { "other", 0 }, { NULL, 0 }
};
isc_logmodule_t isc_modules[] = { { "socket", 0 }, { "time", 0 },
{ "interface", 0 }, { "timer", 0 },
{ "file", 0 }, { "netmgr", 0 },
{ "other", 0 }, { NULL, 0 } };
/*!
* This essentially constant structure must be filled in at run time,
@ -204,7 +201,7 @@ static isc_logchannellist_t default_channel;
/*!
* libisc logs to this context.
*/
LIBISC_EXTERNAL_DATA isc_log_t *isc_lctx = NULL;
isc_log_t *isc_lctx = NULL;
/*!
* Forward declarations.

4
lib/isc/mem.c
View file

@ -58,8 +58,8 @@
#ifndef ISC_MEM_DEBUGGING
#define ISC_MEM_DEBUGGING 0
#endif /* ifndef ISC_MEM_DEBUGGING */
LIBISC_EXTERNAL_DATA unsigned int isc_mem_debugging = ISC_MEM_DEBUGGING;
LIBISC_EXTERNAL_DATA unsigned int isc_mem_defaultflags = ISC_MEMFLAG_DEFAULT;
unsigned int isc_mem_debugging = ISC_MEM_DEBUGGING;
unsigned int isc_mem_defaultflags = ISC_MEMFLAG_DEFAULT;
/*
* Constants.

3
lib/isc/pk11.c
View file

@ -19,7 +19,6 @@
#include <isc/log.h>
#include <isc/mem.h>
#include <isc/once.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/stdio.h>
#include <isc/strerr.h>
@ -42,7 +41,7 @@
#define PK11_NO_LOGERR 1
#endif /* ifndef PK11_NO_LOGERR */
LIBISC_EXTERNAL_DATA bool pk11_verbose_init = false;
bool pk11_verbose_init = false;
static isc_once_t once = ISC_ONCE_INIT;
static isc_mem_t *pk11_mctx = NULL;

1
lib/isc/random.c
View file

@ -34,7 +34,6 @@
#include <unistd.h>
#include <isc/once.h>
#include <isc/platform.h>
#include <isc/random.h>
#include <isc/result.h>
#include <isc/thread.h>

1
lib/isc/resource.c
View file

@ -15,7 +15,6 @@
#include <sys/time.h> /* Required on some systems for <sys/resource.h>. */
#include <sys/types.h>
#include <isc/platform.h>
#include <isc/resource.h>
#include <isc/result.h>
#include <isc/util.h>

1
lib/isc/rwlock.c
View file

@ -21,7 +21,6 @@
#include <isc/atomic.h>
#include <isc/magic.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/rwlock.h>
#include <isc/util.h>

1
lib/isc/socket.c
View file

@ -46,7 +46,6 @@
#include <isc/mutex.h>
#include <isc/net.h>
#include <isc/once.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/refcount.h>
#include <isc/region.h>

1
lib/isc/stats.c
View file

@ -18,7 +18,6 @@
#include <isc/buffer.h>
#include <isc/magic.h>
#include <isc/mem.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/refcount.h>
#include <isc/stats.h>

1
lib/isc/task.c
View file

@ -26,7 +26,6 @@
#include <isc/magic.h>
#include <isc/mem.h>
#include <isc/once.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/random.h>
#include <isc/refcount.h>

1
lib/isc/tests/aes_test.c
View file

@ -24,7 +24,6 @@
#include <isc/aes.h>
#include <isc/buffer.h>
#include <isc/hex.h>
#include <isc/platform.h>
#include <isc/region.h>
#include <isc/string.h>
#include <isc/util.h>

1
lib/isc/tests/socket_test.c
View file

@ -26,7 +26,6 @@
#include <cmocka.h>
#include <isc/atomic.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/socket.h>
#include <isc/task.h>

1
lib/isc/tests/task_test.c
View file

@ -31,7 +31,6 @@
#include <isc/condition.h>
#include <isc/managers.h>
#include <isc/mem.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/task.h>
#include <isc/time.h>

1
lib/isc/tests/timer_test.c
View file

@ -27,7 +27,6 @@
#include <isc/commandline.h>
#include <isc/condition.h>
#include <isc/mem.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/task.h>
#include <isc/time.h>

1
lib/isc/time.c
View file

@ -21,7 +21,6 @@
#include <time.h>
#include <isc/log.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/strerr.h>
#include <isc/string.h>

1
lib/isc/timer.c
View file

@ -20,7 +20,6 @@
#include <isc/magic.h>
#include <isc/mem.h>
#include <isc/once.h>
#include <isc/platform.h>
#include <isc/print.h>
#include <isc/refcount.h>
#include <isc/task.h>

7
lib/isccfg/dnsconf.c
View file

@ -50,7 +50,6 @@ static cfg_clausedef_t dnsconf_clauses[] = {
static cfg_clausedef_t *dnsconf_clausesets[] = { dnsconf_clauses, NULL };
LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_dnsconf = {
"dnsconf", cfg_parse_mapbody, cfg_print_mapbody,
cfg_doc_mapbody, &cfg_rep_map, dnsconf_clausesets
};
cfg_type_t cfg_type_dnsconf = { "dnsconf", cfg_parse_mapbody,
cfg_print_mapbody, cfg_doc_mapbody,
&cfg_rep_map, dnsconf_clausesets };

78
lib/isccfg/include/isccfg/grammar.h
View file

@ -296,51 +296,51 @@ struct cfg_parser {
/*%
* Predefined data representation types.
*/
LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_uint32;
LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_uint64;
LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_string;
LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_boolean;
LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_map;
LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_list;
LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_tuple;
LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_sockaddr;
LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_netprefix;
LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_void;
LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_fixedpoint;
LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_percentage;
LIBISCCFG_EXTERNAL_DATA extern cfg_rep_t cfg_rep_duration;
extern cfg_rep_t cfg_rep_uint32;
extern cfg_rep_t cfg_rep_uint64;
extern cfg_rep_t cfg_rep_string;
extern cfg_rep_t cfg_rep_boolean;
extern cfg_rep_t cfg_rep_map;
extern cfg_rep_t cfg_rep_list;
extern cfg_rep_t cfg_rep_tuple;
extern cfg_rep_t cfg_rep_sockaddr;
extern cfg_rep_t cfg_rep_netprefix;
extern cfg_rep_t cfg_rep_void;
extern cfg_rep_t cfg_rep_fixedpoint;
extern cfg_rep_t cfg_rep_percentage;
extern cfg_rep_t cfg_rep_duration;
/*@}*/
/*@{*/
/*%
* Predefined configuration object types.
*/
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_boolean;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_uint32;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_uint64;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_qstring;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_astring;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_ustring;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_sstring;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_bracketed_aml;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_bracketed_text;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_optional_bracketed_text;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_keyref;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_sockaddr;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_sockaddrdscp;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_netaddr;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_netaddr4;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_netaddr4wild;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_netaddr6;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_netaddr6wild;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_netprefix;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_void;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_token;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_unsupported;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_fixedpoint;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_percentage;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_duration;
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_duration_or_unlimited;
extern cfg_type_t cfg_type_boolean;
extern cfg_type_t cfg_type_uint32;
extern cfg_type_t cfg_type_uint64;
extern cfg_type_t cfg_type_qstring;
extern cfg_type_t cfg_type_astring;
extern cfg_type_t cfg_type_ustring;
extern cfg_type_t cfg_type_sstring;
extern cfg_type_t cfg_type_bracketed_aml;
extern cfg_type_t cfg_type_bracketed_text;
extern cfg_type_t cfg_type_optional_bracketed_text;
extern cfg_type_t cfg_type_keyref;
extern cfg_type_t cfg_type_sockaddr;
extern cfg_type_t cfg_type_sockaddrdscp;
extern cfg_type_t cfg_type_netaddr;
extern cfg_type_t cfg_type_netaddr4;
extern cfg_type_t cfg_type_netaddr4wild;
extern cfg_type_t cfg_type_netaddr6;
extern cfg_type_t cfg_type_netaddr6wild;
extern cfg_type_t cfg_type_netprefix;
extern cfg_type_t cfg_type_void;
extern cfg_type_t cfg_type_token;
extern cfg_type_t cfg_type_unsupported;
extern cfg_type_t cfg_type_fixedpoint;
extern cfg_type_t cfg_type_percentage;
extern cfg_type_t cfg_type_duration;
extern cfg_type_t cfg_type_duration_or_unlimited;
/*@}*/
isc_result_t

4
lib/isccfg/include/isccfg/log.h
View file

@ -17,8 +17,8 @@
#include <isc/lang.h>
#include <isc/log.h>
LIBISCCFG_EXTERNAL_DATA extern isc_logcategory_t cfg_categories[];
LIBISCCFG_EXTERNAL_DATA extern isc_logmodule_t cfg_modules[];
extern isc_logcategory_t cfg_categories[];
extern isc_logmodule_t cfg_modules[];
#define CFG_LOGCATEGORY_CONFIG (&cfg_categories[0])

20
lib/isccfg/include/isccfg/namedconf.h
View file

@ -22,34 +22,34 @@
/*
* Configuration object types.
*/
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_namedconf;
extern cfg_type_t cfg_type_namedconf;
/*%< A complete named.conf file. */
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_bindkeys;
extern cfg_type_t cfg_type_bindkeys;
/*%< A bind.keys file. */
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_newzones;
extern cfg_type_t cfg_type_newzones;
/*%< A new-zones file (for zones added by 'rndc addzone'). */
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_addzoneconf;
extern cfg_type_t cfg_type_addzoneconf;
/*%< A single zone passed via the addzone rndc command. */
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_rndcconf;
extern cfg_type_t cfg_type_rndcconf;
/*%< A complete rndc.conf file. */
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_rndckey;
extern cfg_type_t cfg_type_rndckey;
/*%< A complete rndc.key file. */
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_sessionkey;
extern cfg_type_t cfg_type_sessionkey;
/*%< A complete session.key file. */
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_keyref;
extern cfg_type_t cfg_type_keyref;
/*%< A key reference, used as an ACL element */
/*%< Zone options */
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_zoneopts;
extern cfg_type_t cfg_type_zoneopts;
/*%< DNSSEC Key and Signing Policy options */
LIBISCCFG_EXTERNAL_DATA extern cfg_type_t cfg_type_dnssecpolicyopts;
extern cfg_type_t cfg_type_dnssecpolicyopts;
#endif /* ISCCFG_NAMEDCONF_H */

7
lib/isccfg/log.c
View file

@ -19,16 +19,13 @@
* When adding a new category, be sure to add the appropriate
* \#define to <isccfg/log.h>.
*/
LIBISCCFG_EXTERNAL_DATA isc_logcategory_t cfg_categories[] = { { "config", 0 },
{ NULL, 0 } };
isc_logcategory_t cfg_categories[] = { { "config", 0 }, { NULL, 0 } };
/*%
* When adding a new module, be sure to add the appropriate
* \#define to <isccfg/log.h>.
*/
LIBISCCFG_EXTERNAL_DATA isc_logmodule_t cfg_modules[] = {
{ "isccfg/parser", 0 }, { NULL, 0 }
};
isc_logmodule_t cfg_modules[] = { { "isccfg/parser", 0 }, { NULL, 0 } };
void
cfg_log_init(isc_log_t *lctx) {

Some files were not shown because too many files have changed in this diff Show more