mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-22 01:59:26 +00:00
Code Issues Releases Wiki Activity

Remove C++ support from the public header

Browse Source 
Since BIND 9 headers are not longer public, there's no reason to keep
the ISC_LANG_BEGINDECL and ISC_LANG_ENDDECL macros to support including
them from C++ projects.
This commit is contained in:
Ondřej Surý 2024-12-18 12:00:54 +01:00
parent e2c1941efd
commit 06f9163d51
No known key found for this signature in database
GPG Key ID: 2820F37E873DEA41
201 changed files with 0 additions and 1014 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/check/check-tool.h
View File

@ -18,7 +18,6 @@
#include <inttypes.h>
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/stdio.h>
#include <isc/types.h>
@ -26,8 +25,6 @@
#include <dns/types.h>
#include <dns/zone.h>
ISC_LANG_BEGINDECLS
isc_result_t
setup_logging(FILE *errout);
@ -48,5 +45,3 @@ extern bool docheckmx;
extern bool docheckns;
extern bool dochecksrv;
extern dns_zoneopt_t zone_options;
ISC_LANG_ENDDECLS

6
bin/confgen/include/confgen/os.h
View File

@ -17,10 +17,6 @@
#include <stdio.h>
#include <isc/lang.h>
ISC_LANG_BEGINDECLS
int
set_user(FILE *fd, const char *user);
/*%<
@ -29,5 +25,3 @@ set_user(FILE *fd, const char *user);
* 0 success
* -1 insufficient permissions, or 'user' does not exist.
*/
ISC_LANG_ENDDECLS

5
bin/confgen/keygen.h
View File

@ -16,13 +16,10 @@
/*! \file */
#include <isc/buffer.h>
#include <isc/lang.h>
#include <isc/mem.h>
#include <dns/secalg.h>
ISC_LANG_BEGINDECLS
void
generate_key(isc_mem_t *mctx, dns_secalg_t alg, int keysize,
isc_buffer_t *key_txtbuffer);
@ -37,5 +34,3 @@ dns_secalg_t
alg_fromtext(const char *name);
int
alg_bits(dns_secalg_t alg);
ISC_LANG_ENDDECLS

5
bin/confgen/util.h
View File

@ -17,7 +17,6 @@
#include <isc/attributes.h>
#include <isc/formatcheck.h>
#include <isc/lang.h>
#define NS_CONTROL_PORT 953
@ -31,12 +30,8 @@
notify("%s", name); \
} while (0)
ISC_LANG_BEGINDECLS
void
notify(const char *fmt, ...) ISC_FORMAT_PRINTF(1, 2);
ISC_NORETURN void
fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
ISC_LANG_ENDDECLS

1
bin/dig/dighost.c
View File

@ -40,7 +40,6 @@
#include <isc/file.h>
#include <isc/getaddresses.h>
#include <isc/hex.h>
#include <isc/lang.h>
#include <isc/log.h>
#include <isc/loop.h>
#include <isc/managers.h>

5
bin/dig/dighost.h
View File

@ -21,7 +21,6 @@
#include <isc/attributes.h>
#include <isc/buffer.h>
#include <isc/formatcheck.h>
#include <isc/lang.h>
#include <isc/list.h>
#include <isc/loop.h>
#include <isc/magic.h>
@ -85,8 +84,6 @@
* in a tight loop of constant lookups. It's value is arbitrary.
*/
ISC_LANG_BEGINDECLS
typedef struct dig_lookup dig_lookup_t;
typedef struct dig_query dig_query_t;
typedef struct dig_server dig_server_t;
@ -466,5 +463,3 @@ dig_shutdown(void);
bool
dig_lookup_is_tls(const dig_lookup_t *lookup);
ISC_LANG_ENDDECLS

1
bin/named/include/named/builtin.h
View File

@ -17,7 +17,6 @@
#include <inttypes.h>
#include <isc/lang.h>
#include <isc/types.h>
#include <dns/clientinfo.h>

5
bin/named/include/named/tkeyconf.h
View File

@ -15,13 +15,10 @@
/*! \file */
#include <isc/lang.h>
#include <isc/types.h>
#include <isccfg/cfg.h>
ISC_LANG_BEGINDECLS
isc_result_t
named_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx,
dns_tkeyctx_t **tctxp);
@ -39,5 +36,3 @@ named_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx,
*\li ISC_R_SUCCESS
*\li ISC_R_NOMEMORY
*/
ISC_LANG_ENDDECLS

5
bin/named/include/named/transportconf.h
View File

@ -15,15 +15,12 @@
/*! \file */
#include <isc/lang.h>
#include <isc/types.h>
#include <dns/transport.h>
#include <isccfg/cfg.h>
ISC_LANG_BEGINDECLS
isc_result_t
named_transports_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig,
isc_mem_t *mctx, dns_transport_list_t **listp);
@ -39,5 +36,3 @@ named_transports_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig,
* \li 'listp' is not NULL, and '*listp' is NULL
*
*/
ISC_LANG_ENDDECLS

5
bin/named/include/named/tsigconf.h
View File

@ -15,11 +15,8 @@
/*! \file */
#include <isc/lang.h>
#include <isc/types.h>
ISC_LANG_BEGINDECLS
isc_result_t
named_tsigkeyring_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig,
isc_mem_t *mctx, dns_tsigkeyring_t **ringp);
@ -37,5 +34,3 @@ named_tsigkeyring_fromconfig(const cfg_obj_t *config, const cfg_obj_t *vconfig,
* \li ISC_R_SUCCESS
* \li ISC_R_NOMEMORY
*/
ISC_LANG_ENDDECLS

5
bin/named/include/named/zoneconf.h
View File

@ -17,14 +17,11 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/types.h>
#include <isccfg/aclconf.h>
#include <isccfg/cfg.h>
ISC_LANG_BEGINDECLS
isc_result_t
named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
const cfg_obj_t *zconfig, cfg_aclconfctx_t *ac,
@ -76,5 +73,3 @@ named_zone_configure_writeable_dlz(dns_dlzdb_t *dlzdatabase, dns_zone_t *zone,
* \li 'rdclass' to be a valid rdataclass
* \li 'name' to be a valid zone origin name
*/
ISC_LANG_ENDDECLS

5
bin/rndc/util.h
View File

@ -17,7 +17,6 @@
#include <isc/attributes.h>
#include <isc/formatcheck.h>
#include <isc/lang.h>
#define NS_CONTROL_PORT 953
@ -31,12 +30,8 @@
notify("%s", name); \
} while (0)
ISC_LANG_BEGINDECLS
void
notify(const char *fmt, ...) ISC_FORMAT_PRINTF(1, 2);
ISC_NORETURN void
fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
ISC_LANG_ENDDECLS

11
doc/dev/style.md
View File

@ -180,14 +180,6 @@ within a library but not for public use, are kept in the source tree at the
same level as their related C files, and often have `"_p"` in their names,
e.g. `lib/isc/mem_p.h`.
Header files that define modules should have a structure like the
following. Note that `<isc/lang.h>` MUST be included by any public header
file using the ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS macros, so the
correct name-mangling happens for function declarations when C++ programs
include the file. `<isc/lang.h>` SHOULD be included for private header files
or for public files that do not declare any functions.
/*
* Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
*
@ -231,7 +223,6 @@ or for public files that do not declare any functions.
***/
/* #includes here. */
#include <isc/lang.h>
/***
*** Types
@ -242,9 +233,7 @@ or for public files that do not declare any functions.
/***
*** Functions
***/
ISC_LANG_BEGINDECLS
/* (Function declarations here, with full prototypes.) */
ISC_LANG_ENDDECLS
#### Including Interfaces (.h files)

5
fuzz/fuzz.h
View File

@ -18,7 +18,6 @@
#include <stdint.h>
#include <isc/dir.h>
#include <isc/lang.h>
#include <isc/mem.h>
#include <isc/once.h>
#include <isc/types.h>
@ -26,8 +25,6 @@
#include <dst/dst.h>
ISC_LANG_BEGINDECLS
extern bool debug;
int
@ -40,5 +37,3 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
if ((x) != ISC_R_SUCCESS) { \
return (0); \
}
ISC_LANG_ENDDECLS

5
lib/dns/db_p.h
View File

@ -14,7 +14,6 @@
#pragma once
#include <isc/heap.h>
#include <isc/lang.h>
#include <isc/urcu.h>
#include <dns/nsec3.h>
@ -115,8 +114,6 @@
#define IS_STUB(db) (((db)->common.attributes & DNS_DBATTR_STUB) != 0)
#define IS_CACHE(db) (((db)->common.attributes & DNS_DBATTR_CACHE) != 0)
ISC_LANG_BEGINDECLS
struct dns_glue {
struct dns_glue *next;
dns_name_t name;
@ -204,5 +201,3 @@ dns__db_logtoomanyrecords(dns_db_t *db, const dns_name_t *name,
* 'maxrrperset' limit. 'op' is 'adding' or 'updating' depending on whether
* the addition is to create a new rdataset or to merge to an existing one.
*/
ISC_LANG_ENDDECLS

5
lib/dns/dst_internal.h
View File

@ -39,7 +39,6 @@
#include <isc/buffer.h>
#include <isc/hmac.h>
#include <isc/lang.h>
#include <isc/magic.h>
#include <isc/md.h>
#include <isc/refcount.h>
@ -51,8 +50,6 @@
#include <dst/dst.h>
ISC_LANG_BEGINDECLS
#define KEY_MAGIC ISC_MAGIC('D', 'S', 'T', 'K')
#define CTX_MAGIC ISC_MAGIC('D', 'S', 'T', 'C')
@ -227,6 +224,4 @@ dst_key_close(char *tmpname, FILE *fp, char *filename);
isc_result_t
dst_key_cleanup(char *tmpname, FILE *fp);
ISC_LANG_ENDDECLS
/*! \file */

5
lib/dns/dst_openssl.h
View File

@ -20,13 +20,10 @@
#include <openssl/evp.h>
#include <openssl/rand.h>
#include <isc/lang.h>
#include <isc/log.h>
#include <isc/result.h>
#include <isc/tls.h>
ISC_LANG_BEGINDECLS
#define dst__openssl_toresult(fallback) \
isc__tlserr2result(ISC_LOGCATEGORY_INVALID, ISC_LOGMODULE_INVALID, \
NULL, fallback, __FILE__, __LINE__)
@ -49,5 +46,3 @@ dst__openssl_keypair_isprivate(const dst_key_t *key);
void
dst__openssl_keypair_destroy(dst_key_t *key);
ISC_LANG_ENDDECLS

6
lib/dns/dst_parse.h
View File

@ -30,8 +30,6 @@
/*! \file */
#pragma once
#include <isc/lang.h>
#include <dst/dst.h>
#define MAXFIELDSIZE 512
@ -109,8 +107,6 @@ struct dst_private {
typedef struct dst_private dst_private_t;
ISC_LANG_BEGINDECLS
void
dst__privstruct_free(dst_private_t *priv, isc_mem_t *mctx);
@ -121,5 +117,3 @@ dst__privstruct_parse(dst_key_t *key, unsigned int alg, isc_lex_t *lex,
isc_result_t
dst__privstruct_writefile(const dst_key_t *key, const dst_private_t *priv,
const char *directory);
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/acl.h
View File

@ -30,7 +30,6 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/magic.h>
#include <isc/netaddr.h>
#include <isc/refcount.h>
@ -118,8 +117,6 @@ struct dns_aclenv {
*** Functions
***/
ISC_LANG_BEGINDECLS
void
dns_acl_create(isc_mem_t *mctx, int n, dns_acl_t **target);
/*%<
@ -312,5 +309,3 @@ dns_acl_merge_ports_transports(dns_acl_t *dest, dns_acl_t *source, bool pos);
*\li 'dest' is a valid ACL object;
*\li 'source' is a valid ACL object.
*/
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/adb.h
View File

@ -66,7 +66,6 @@
#include <inttypes.h>
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/magic.h>
#include <isc/mem.h>
#include <isc/mutex.h>
@ -75,8 +74,6 @@
#include <dns/types.h>
#include <dns/view.h>
ISC_LANG_BEGINDECLS
/***
*** Magic number checks
***/
@ -754,4 +751,3 @@ dns_adb_dumpquota(dns_adb_t *adb, isc_buffer_t **buf);
* Requires:
* \li 'adb' is valid.
*/
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/badcache.h
View File

@ -51,8 +51,6 @@
#include <dns/types.h>
ISC_LANG_BEGINDECLS
/***
*** Functions
***/
@ -146,5 +144,3 @@ dns_badcache_print(dns_badcache_t *bc, const char *cachename, FILE *fp);
* \li cachename != NULL
* \li fp != NULL
*/
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/byaddr.h
View File

@ -40,12 +40,8 @@
*\li Drafts: TBS
*/
#include <isc/lang.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
isc_result_t
dns_byaddr_createptrname(const isc_netaddr_t *address, dns_name_t *name);
/*%<
@ -56,5 +52,3 @@ dns_byaddr_createptrname(const isc_netaddr_t *address, dns_name_t *name);
* \li 'address' is a valid address.
* \li 'name' is a valid name with a dedicated buffer.
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/cache.h
View File

@ -46,15 +46,12 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/refcount.h>
#include <isc/stats.h>
#include <isc/stdtime.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
/***
*** Functions
***/
@ -273,5 +270,3 @@ dns_cache_renderjson(dns_cache_t *cache, void *cstats0);
* Render cache statistics and status in JSON
*/
#endif /* HAVE_JSON_C */
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/callbacks.h
View File

@ -19,13 +19,10 @@
*** Imports
***/
#include <isc/lang.h>
#include <isc/magic.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
/***
*** Types
***/
@ -100,5 +97,3 @@ dns_rdatacallbacks_init_stdio(dns_rdatacallbacks_t *callbacks);
/*%<
* Like dns_rdatacallbacks_init, but logs to stdio.
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/catz.h
View File

@ -19,7 +19,6 @@
#include <stdbool.h>
#include <isc/ht.h>
#include <isc/lang.h>
#include <isc/refcount.h>
#include <isc/rwlock.h>
#include <isc/time.h>
@ -31,8 +30,6 @@
#include <dns/rdata.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
#define DNS_CATZ_ERROR_LEVEL ISC_LOG_WARNING
#define DNS_CATZ_INFO_LEVEL ISC_LOG_INFO
#define DNS_CATZ_DEBUG_LEVEL1 ISC_LOG_DEBUG(1)
@ -446,5 +443,3 @@ ISC_REFCOUNT_TRACE_DECL(dns_catz_zones);
ISC_REFCOUNT_DECL(dns_catz_zone);
ISC_REFCOUNT_DECL(dns_catz_zones);
#endif /* DNS_CATZ_TRACE */
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/cert.h
View File

@ -15,12 +15,8 @@
/*! \file dns/cert.h */
#include <isc/lang.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
isc_result_t
dns_cert_fromtext(dns_cert_t *certp, isc_textregion_t *source);
/*%<
@ -56,5 +52,3 @@ dns_cert_totext(dns_cert_t cert, isc_buffer_t *target);
*\li #ISC_R_SUCCESS on success
*\li #ISC_R_NOSPACE target buffer is too small
*/
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/client.h
View File

@ -48,8 +48,6 @@
#include <dst/dst.h>
ISC_LANG_BEGINDECLS
/***
*** Types
***/
@ -292,5 +290,3 @@ dns_client_addtrustedkey(dns_client_t *client, dns_rdataclass_t rdclass,
*
*\li Anything else Failure.
*/
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/clientinfo.h
View File

@ -44,8 +44,6 @@
#include <dns/ecs.h>
ISC_LANG_BEGINDECLS
/*****
***** Types
*****/
@ -98,5 +96,3 @@ dns_clientinfo_setecs(dns_clientinfo_t *ci, dns_ecs_t *ecs);
* Set the ECS client data associated with a clientinfo object 'ci'.
* If 'ecs' is NULL, initialize ci->ecs to 0/0/0; otherwise copy it.
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/compress.h
View File

@ -16,14 +16,11 @@
#include <inttypes.h>
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/region.h>
#include <dns/name.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
/*! \file dns/compress.h
* Direct manipulation of the structures is strongly discouraged.
*
@ -228,5 +225,3 @@ dns_decompress_getpermitted(dns_decompress_t dctx) {
return dctx == DNS_DECOMPRESS_ALWAYS ||
dctx == DNS_DECOMPRESS_PERMITTED;
}
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/db.h
View File

@ -52,7 +52,6 @@
#include <inttypes.h>
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/loop.h>
#include <isc/magic.h>
#include <isc/rwlock.h>
@ -67,8 +66,6 @@
#include <dns/rdataset.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
/*%
* Tuning: external query load in packets per seconds.
*/
@ -1821,4 +1818,3 @@ dns_db_setmaxtypepername(dns_db_t *db, uint32_t value);
* stored at a given node, then any subsequent attempt to add an rdataset
* with a new RR type will return ISC_R_TOOMANYRECORDS.
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/dbiterator.h
View File

@ -56,13 +56,10 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/magic.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
/*****
***** Types
*****/
@ -288,5 +285,3 @@ dns_dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name);
*
*\li Other results are possible, depending on the DB implementation.
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/diff.h
View File

@ -29,7 +29,6 @@
#include <stddef.h>
#include <isc/lang.h>
#include <isc/magic.h>
#include <dns/name.h>
@ -110,8 +109,6 @@ dns_diff_compare_func(const void *, const void *);
*** Functions
***/
ISC_LANG_BEGINDECLS
/**************************************************************************/
/*
* Manipulation of diffs and tuples.
@ -291,5 +288,3 @@ dns_diff_print(const dns_diff_t *diff, FILE *file);
*\li #ISC_R_UNEXPECTED
*\li any error from dns_rdataset_totext()
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/dispatch.h
View File

@ -50,7 +50,6 @@
#include <stdbool.h>
#include <isc/buffer.h>
#include <isc/lang.h>
#include <isc/mutex.h>
#include <isc/netmgr.h>
#include <isc/refcount.h>
@ -60,8 +59,6 @@
/* Add -DDNS_DISPATCH_TRACE=1 to CFLAGS for detailed reference tracing */
ISC_LANG_BEGINDECLS
/*%
* This is a set of one or more dispatches which can be retrieved
* round-robin fashion.
@ -435,5 +432,3 @@ dns_dispatch_checkperm(dns_dispatch_t *disp);
* Requires:
*\li disp is valid
*/
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/dlz.h
View File

@ -79,8 +79,6 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <dns/clientinfo.h>
#include <dns/name.h>
#include <dns/types.h>
@ -88,8 +86,6 @@
#include <dst/dst.h>
ISC_LANG_BEGINDECLS
/***
*** Types
***/
@ -329,5 +325,3 @@ dns_dlz_ssumatch(dns_dlzdb_t *dlzdatabase, const dns_name_t *signer,
/*%<
* call a DLZ drivers ssumatch method, if supplied. Otherwise return false
*/
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/dlz_dlopen.h
View File

@ -20,8 +20,6 @@
#include <dns/sdlz.h>
ISC_LANG_BEGINDECLS
/*
* This header provides a minimal set of defines and typedefs needed
* for the entry points of an external DLZ module for bind9.
@ -152,5 +150,3 @@ dlz_dlopen_subrdataset_t(const char *name, const char *rdatastr, void *dbdata,
typedef isc_result_t
dlz_dlopen_delrdataset_t(const char *name, const char *type, void *dbdata,
void *version);
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/dns64.h
View File

@ -15,12 +15,8 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
/*
* dns_dns64_create() flags.
*/
@ -190,5 +186,3 @@ dns_dns64_findprefix(dns_rdataset_t *rdataset, isc_netprefix_t *prefix,
* into 'prefix'.
* ISC_R_NOTFOUND no prefixes where found.
*/
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/dnssec.h
View File

@ -17,7 +17,6 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/stats.h>
#include <isc/stdtime.h>
@ -27,8 +26,6 @@
#include <dst/dst.h>
ISC_LANG_BEGINDECLS
extern isc_stats_t *dns_dnssec_stats;
/*%< Maximum number of keys supported in a zone. */
@ -423,4 +420,3 @@ dns_dnssec_matchdskey(dns_name_t *name, dns_rdata_t *dsrdata,
*\li ISC_R_NOTFOUND
*\li Other values indicate error
*/
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/ds.h
View File

@ -13,8 +13,6 @@
#pragma once
#include <isc/lang.h>
#include <dns/rdatastruct.h>
#include <dns/types.h>
@ -28,8 +26,6 @@
*/
#define DNS_DS_BUFFERSIZE (52)
ISC_LANG_BEGINDECLS
isc_result_t
dns_ds_fromkeyrdata(const dns_name_t *owner, dns_rdata_t *key,
dns_dsdigest_t digest_type, unsigned char *digest,
@ -61,5 +57,3 @@ dns_ds_buildrdata(dns_name_t *owner, dns_rdata_t *key,
* \li *rdata Contains a valid DS rdata. The 'data' member refers
* to 'buffer'.
*/
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/dsdigest.h
View File

@ -15,12 +15,8 @@
/*! \file dns/dsdigest.h */
#include <isc/lang.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
isc_result_t
dns_dsdigest_fromtext(dns_dsdigest_t *dsdigestp, isc_textregion_t *source);
/*%<
@ -65,5 +61,3 @@ dns_dsdigest_format(dns_dsdigest_t typ, char *cp, unsigned int size);
/*%<
* Wrapper for dns_dsdigest_totext(), writing text into 'cp'
*/
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/dyndb.h
View File

@ -19,8 +19,6 @@
#include <dns/types.h>
ISC_LANG_BEGINDECLS
/*!
* \brief
* Context for initializing a dyndb module.
@ -153,5 +151,3 @@ dns_dyndb_destroyctx(dns_dyndbctx_t **dctxp);
* Destroys a dyndb initialization context structure; all
* reference-counted members are detached and the structure is freed.
*/
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/ecs.h
View File

@ -15,7 +15,6 @@
#include <inttypes.h>
#include <isc/lang.h>
#include <isc/netaddr.h>
#include <isc/types.h>
@ -46,8 +45,6 @@ struct dns_ecs {
/* <address>/NNN/NNN */
#define DNS_ECS_FORMATSIZE (ISC_NETADDR_FORMATSIZE + 9)
ISC_LANG_BEGINDECLS
void
dns_ecs_init(dns_ecs_t *ecs);
/*%<
@ -78,4 +75,3 @@ dns_ecs_format(const dns_ecs_t *ecs, char *buf, size_t size);
* \li 'buf' is not NULL.
* \li 'size' is at least DNS_ECS_FORMATSIZE
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/fixedname.h
View File

@ -50,7 +50,6 @@
*****/
#include <isc/buffer.h>
#include <isc/lang.h>
#include <dns/name.h>
@ -65,8 +64,6 @@ struct dns_fixedname {
unsigned char data[DNS_NAME_MAXWIRE];
};
ISC_LANG_BEGINDECLS
void
dns_fixedname_init(dns_fixedname_t *fixed);
@ -78,5 +75,3 @@ dns_fixedname_name(dns_fixedname_t *fixed);
dns_name_t *
dns_fixedname_initname(dns_fixedname_t *fixed);
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/forward.h
View File

@ -15,7 +15,6 @@
/*! \file dns/forward.h */
#include <isc/lang.h>
#include <isc/mem.h>
#include <isc/refcount.h>
#include <isc/result.h>
@ -27,8 +26,6 @@
/* Add -DDNS_FORWARD_TRACE=1 to CFLAGS for detailed reference tracing */
ISC_LANG_BEGINDECLS
struct dns_forwarder {
isc_sockaddr_t addr;
dns_name_t *tlsname;
@ -122,4 +119,3 @@ ISC_REFCOUNT_TRACE_DECL(dns_forwarders);
#else
ISC_REFCOUNT_DECL(dns_forwarders);
#endif
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/geoip.h
View File

@ -30,7 +30,6 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/magic.h>
#include <isc/netaddr.h>
#include <isc/refcount.h>
@ -99,13 +98,9 @@ struct dns_geoip_databases {
*** Functions
***/
ISC_LANG_BEGINDECLS
bool
dns_geoip_match(const isc_netaddr_t *reqaddr,
const dns_geoip_databases_t *geoip,
const dns_geoip_elem_t *elt);
ISC_LANG_ENDDECLS
#endif /* HAVE_GEOIP2 */

5
lib/dns/include/dns/iptable.h
View File

@ -16,7 +16,6 @@
#include <inttypes.h>
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/magic.h>
#include <isc/radix.h>
#include <isc/refcount.h>
@ -40,8 +39,6 @@ struct dns_iptable {
*** Functions
***/
ISC_LANG_BEGINDECLS
void
dns_iptable_create(isc_mem_t *mctx, dns_iptable_t **target);
/*
@ -73,5 +70,3 @@ ISC_REFCOUNT_TRACE_DECL(dns_iptable);
#else
ISC_REFCOUNT_DECL(dns_iptable);
#endif
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/journal.h
View File

@ -29,7 +29,6 @@
#include <inttypes.h>
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/magic.h>
#include <dns/diff.h>
@ -75,8 +74,6 @@ typedef struct dns_journal dns_journal_t;
*** Functions
***/
ISC_LANG_BEGINDECLS
/**************************************************************************/
isc_result_t
@ -334,5 +331,3 @@ dns_journal_set_sourceserial(dns_journal_t *j, uint32_t sourceserial);
* Returns:
* true if sourceserial has previously been set.
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/kasp.h
View File

@ -25,7 +25,6 @@
* signed and maintained.
*/
#include <isc/lang.h>
#include <isc/magic.h>
#include <isc/mutex.h>
#include <isc/refcount.h>
@ -34,8 +33,6 @@
#include <dns/keystore.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
/* For storing a list of digest types */
struct dns_kasp_digest {
dns_dsdigest_t digest;
@ -904,5 +901,3 @@ dns_kasp_adddigest(dns_kasp_t *kasp, dns_dsdigest_t alg);
*
*\li 'kasp' is a valid, thawed kasp.
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/keydata.h
View File

@ -28,14 +28,11 @@
#include <inttypes.h>
#include <isc/lang.h>
#include <isc/types.h>
#include <dns/rdatastruct.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
isc_result_t
dns_keydata_todnskey(dns_rdata_keydata_t *keydata, dns_rdata_dnskey_t *dnskey,
isc_mem_t *mctx);
@ -44,5 +41,3 @@ isc_result_t
dns_keydata_fromdnskey(dns_rdata_keydata_t *keydata, dns_rdata_dnskey_t *dnskey,
uint32_t refresh, uint32_t addhd, uint32_t removehd,
isc_mem_t *mctx);
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/keyflags.h
View File

@ -15,12 +15,8 @@
/*! \file dns/keyflags.h */
#include <isc/lang.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
isc_result_t
dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source);
/*%<
@ -41,5 +37,3 @@ dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source);
*\li ISC_R_RANGE numeric flag value is out of range
*\li DNS_R_UNKNOWN mnemonic flag is unknown
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/keymgr.h
View File

@ -15,15 +15,12 @@
/*! \file dns/keymgr.h */
#include <isc/lang.h>
#include <isc/stdtime.h>
#include <dns/types.h>
#include <dst/dst.h>
ISC_LANG_BEGINDECLS
void
dns_keymgr_settime_syncpublish(dst_key_t *key, dns_kasp_t *kasp, bool first);
/*%<
@ -158,5 +155,3 @@ dns_keymgr_status(dns_kasp_t *kasp, dns_dnsseckeylist_t *keyring,
*\li Printable status in 'out'.
*
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/keystore.h
View File

@ -26,7 +26,6 @@
/* Add -DDNS_KEYSTORE_TRACE=1 to CFLAGS for detailed reference tracing */
#include <isc/lang.h>
#include <isc/magic.h>
#include <isc/mutex.h>
#include <isc/refcount.h>
@ -35,8 +34,6 @@
#include <dst/dst.h>
ISC_LANG_BEGINDECLS
/* Key store */
struct dns_keystore {
unsigned int magic;
@ -198,5 +195,3 @@ ISC_REFCOUNT_TRACE_DECL(dns_keystore);
#else
ISC_REFCOUNT_DECL(dns_keystore);
#endif /* DNS_KEYSTORE_TRACE */
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/keytable.h
View File

@ -36,7 +36,6 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/magic.h>
#include <isc/refcount.h>
#include <isc/rwlock.h>
@ -47,8 +46,6 @@
#include <dst/dst.h>
ISC_LANG_BEGINDECLS
typedef void (*dns_keytable_callback_t)(const dns_name_t *name, void *fn_arg);
void
@ -296,4 +293,3 @@ dns_keytable_forall(dns_keytable_t *keytable,
ISC_REFCOUNT_DECL(dns_keytable);
ISC_REFCOUNT_DECL(dns_keynode);
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/master.h
View File

@ -22,8 +22,6 @@
#include <inttypes.h>
#include <stdio.h>
#include <isc/lang.h>
#include <dns/types.h>
/*
@ -61,8 +59,6 @@
#define DNS_MASTER_CHECKTTL 0x00010000 /*%< Check max-zone-ttl */
#define DNS_MASTER_CHECKSVCB 0x00020000 /*%< Check SVBC records */
ISC_LANG_BEGINDECLS
/*
* Structures that implement the "raw" format for master dump.
* These are provided for a reference purpose only; in the actual
@ -229,4 +225,3 @@ dns_master_initrawheader(dns_masterrawheader_t *header);
* Initializes the header for a raw master file, setting all
* values to zero.
*/
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/masterdump.h
View File

@ -21,8 +21,6 @@
#include <stdio.h>
#include <isc/lang.h>
#include <dns/types.h>
/***
@ -120,8 +118,6 @@ typedef struct dns_master_style dns_master_style_t;
*/
#define DNS_STYLEFLAG_CLASS_PERNAME 0x400000000ULL
ISC_LANG_BEGINDECLS
/***
*** Constants
***/
@ -349,5 +345,3 @@ dns_master_stylecreate(dns_master_style_t **style,
void
dns_master_styledestroy(dns_master_style_t **style, isc_mem_t *mctx);
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/message.h
View File

@ -20,7 +20,6 @@
#include <inttypes.h>
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/magic.h>
#include <isc/refcount.h>
@ -365,8 +364,6 @@ typedef void (*dns_message_cb_t)(void *arg, isc_result_t result);
*** Functions
***/
ISC_LANG_BEGINDECLS
void
dns_message_create(isc_mem_t *mctx, isc_mempool_t *namepool,
isc_mempool_t *rdspool, dns_message_intent_t intent,
@ -1533,5 +1530,3 @@ dns_ede_unlinkall(isc_mem_t *mctx, dns_edelist_t *list);
* \li mctx to be non NULL;
* \li list to be non NULL;
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/name.h
View File

@ -69,14 +69,11 @@
#include <isc/buffer.h>
#include <isc/hashmap.h>
#include <isc/lang.h>
#include <isc/magic.h>
#include <isc/region.h> /* Required for storage size of dns_label_t. */
#include <dns/types.h>
ISC_LANG_BEGINDECLS
/*****
***** Names
*****
@ -1367,5 +1364,3 @@ dns_name_israd(const dns_name_t *name, const dns_name_t *rad);
* Requires:
* \li 'name' to be valid.
*/
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/nametree.h
View File

@ -26,7 +26,6 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/magic.h>
#include <isc/refcount.h>
#include <isc/rwlock.h>
@ -45,8 +44,6 @@ typedef enum {
DNS_NAMETREE_COUNT
} dns_nametree_type_t;
ISC_LANG_BEGINDECLS
void
dns_nametree_create(isc_mem_t *mctx, dns_nametree_type_t type, const char *name,
dns_nametree_t **ntp);
@ -190,4 +187,3 @@ ISC_REFCOUNT_TRACE_DECL(dns_ntnode);
ISC_REFCOUNT_DECL(dns_nametree);
ISC_REFCOUNT_DECL(dns_ntnode);
#endif
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/ncache.h
View File

@ -41,13 +41,10 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/stdtime.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
/*%
* _OMITDNSSEC:
* Omit DNSSEC records when rendering.
@ -180,5 +177,3 @@ dns_ncache_current(dns_rdataset_t *ncacherdataset, dns_name_t *found,
* \li 'found' to be valid.
* \li 'rdataset' to be unassociated.
*/
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/nsec.h
View File

@ -17,16 +17,12 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <dns/diff.h>
#include <dns/name.h>
#include <dns/types.h>
#define DNS_NSEC_BUFFERSIZE (DNS_NAME_MAXWIRE + 8192 + 512)
ISC_LANG_BEGINDECLS
isc_result_t
dns_nsec_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node,
const dns_name_t *target, unsigned char *buffer,
@ -122,5 +118,3 @@ dns_nsec_requiredtypespresent(dns_rdataset_t *rdataset);
* Requires:
* \li rdataset to be a NSEC rdataset.
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/nsec3.h
View File

@ -16,7 +16,6 @@
#include <stdbool.h>
#include <isc/iterated_hash.h>
#include <isc/lang.h>
#include <isc/log.h>
#include <dns/db.h>
@ -43,8 +42,6 @@
*/
#define DNS_NSEC3_UNKNOWNALG ((dns_hash_t)245U)
ISC_LANG_BEGINDECLS
isc_result_t
dns_nsec3_buildrdata(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node,
unsigned int hashalg, unsigned int optin,
@ -265,5 +262,3 @@ dns_nsec3_noexistnodata(dns_rdatatype_t type, const dns_name_t *name,
bool *optout, bool *unknown, bool *setclosest,
bool *setnearest, dns_name_t *closest,
dns_name_t *nearest, dns_nseclog_t logit, void *arg);
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/nta.h
View File

@ -28,7 +28,6 @@
#include <stdbool.h>
#include <isc/buffer.h>
#include <isc/lang.h>
#include <isc/magic.h>
#include <isc/refcount.h>
#include <isc/rwlock.h>
@ -42,8 +41,6 @@
/* Add -DDNS_NTA_TRACE=1 to CFLAGS for detailed reference tracing */
ISC_LANG_BEGINDECLS
#define NTATABLE_MAGIC ISC_MAGIC('N', 'T', 'A', 't')
#define VALID_NTATABLE(nt) ISC_MAGIC_VALID(nt, NTATABLE_MAGIC)
@ -180,5 +177,3 @@ ISC_REFCOUNT_TRACE_DECL(dns__nta);
#else
ISC_REFCOUNT_DECL(dns__nta);
#endif
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/opcode.h
View File

@ -15,12 +15,8 @@
/*! \file dns/opcode.h */
#include <isc/lang.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
isc_result_t
dns_opcode_totext(dns_opcode_t opcode, isc_buffer_t *target);
/*%<
@ -39,5 +35,3 @@ dns_opcode_totext(dns_opcode_t opcode, isc_buffer_t *target);
*\li #ISC_R_SUCCESS on success
*\li #ISC_R_NOSPACE target buffer is too small
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/order.h
View File

@ -15,13 +15,10 @@
/*! \file dns/order.h */
#include <isc/lang.h>
#include <isc/types.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
isc_result_t
dns_order_create(isc_mem_t *mctx, dns_order_t **orderp);
/*%<
@ -86,5 +83,3 @@ dns_order_detach(dns_order_t **orderp);
* Requires:
*\li '*orderp' to be valid.
*/
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/peer.h
View File

@ -29,7 +29,6 @@
#include <inttypes.h>
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/magic.h>
#include <isc/netaddr.h>
#include <isc/refcount.h>
@ -46,8 +45,6 @@
*** Functions
***/
ISC_LANG_BEGINDECLS
isc_result_t
dns_peerlist_new(isc_mem_t *mem, dns_peerlist_t **list);
@ -217,4 +214,3 @@ dns_peer_setednsversion(dns_peer_t *peer, uint8_t ednsversion);
isc_result_t
dns_peer_getednsversion(dns_peer_t *peer, uint8_t *ednsversion);
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/private.h
View File

@ -13,7 +13,6 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/types.h>
#include <dns/db.h>
@ -21,8 +20,6 @@
#pragma once
ISC_LANG_BEGINDECLS
isc_result_t
dns_private_chains(dns_db_t *db, dns_dbversion_t *ver,
dns_rdatatype_t privatetype, bool *build_nsec,
@ -62,5 +59,3 @@ dns_private_totext(dns_rdata_t *privaterdata, isc_buffer_t *buffer);
* \li ISC_R_SUCCESS
* \li other on error
*/
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/rcode.h
View File

@ -15,12 +15,8 @@
/*! \file dns/rcode.h */
#include <isc/lang.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
isc_result_t
dns_rcode_fromtext(dns_rcode_t *rcodep, isc_textregion_t *source);
/*%<
@ -103,5 +99,3 @@ dns_hashalg_fromtext(unsigned char *hashalg, isc_textregion_t *source);
*\li #ISC_R_SUCCESS on success
*\li #DNS_R_UNKNOWN type is unknown
*/
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/rdata.h
View File

@ -86,14 +86,10 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <dns/message.h>
#include <dns/name.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
/***
*** Types
***/
@ -822,5 +818,3 @@ dns_rdata_checksvcb(const dns_name_t *owner, const dns_rdata_t *rdata);
*\li #DNS_R_NOALPN -- ALPN required for 'owner', but not found
*\li #DNS_R_NODOHPATH -- DOHPATH required for 'owner', but not found
*/
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/rdataclass.h
View File

@ -15,12 +15,8 @@
/*! \file dns/rdataclass.h */
#include <isc/lang.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
isc_result_t
dns_rdataclass_fromtext(dns_rdataclass_t *classp, isc_textregion_t *source);
/*%<
@ -87,5 +83,3 @@ dns_rdataclass_format(dns_rdataclass_t rdclass, char *array, unsigned int size);
/*%<
* Minimum size of array to pass to dns_rdataclass_format().
*/
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/rdatalist.h
View File

@ -37,8 +37,6 @@
*\li None.
*/
#include <isc/lang.h>
#include <dns/types.h>
/*%
@ -59,8 +57,6 @@ struct dns_rdatalist {
unsigned char upper[32];
};
ISC_LANG_BEGINDECLS
void
dns_rdatalist_init(dns_rdatalist_t *rdatalist);
/*%<
@ -151,5 +147,3 @@ dns_rdatalist_setownercase(dns_rdataset_t *rdataset, const dns_name_t *name);
void
dns_rdatalist_getownercase(const dns_rdataset_t *rdataset, dns_name_t *name);
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/rdataset.h
View File

@ -47,7 +47,6 @@
#include <inttypes.h>
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/magic.h>
#include <isc/stdtime.h>
@ -66,8 +65,6 @@
#define DNS_RDATASET_COUNT 0
#endif /* DNS_RDATASET_FIXED */
ISC_LANG_BEGINDECLS
typedef enum {
dns_rdatasetadditional_fromauth,
dns_rdatasetadditional_fromcache,
@ -655,5 +652,3 @@ dns_trust_totext(dns_trust_t trust);
/*%<
* Display trust in textual form.
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/rdatasetiter.h
View File

@ -54,14 +54,11 @@
***** Imports
*****/
#include <isc/lang.h>
#include <isc/magic.h>
#include <isc/stdtime.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
/*****
***** Types
*****/
@ -166,5 +163,3 @@ dns__rdatasetiter_current(dns_rdatasetiter_t *iterator,
*\li The rdataset cursor of 'iterator' is at a valid location (i.e. the
* result of last call to a cursor movement command was #ISC_R_SUCCESS).
*/
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/rdataslab.h
View File

@ -45,7 +45,6 @@
#include <isc/atomic.h>
#include <isc/heap.h>
#include <isc/lang.h>
#include <isc/stdtime.h>
#include <isc/urcu.h>
@ -53,8 +52,6 @@
#include <dns/rdataset.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
#define DNS_RDATASLAB_FORCE 0x1
#define DNS_RDATASLAB_EXACT 0x2
@ -321,4 +318,3 @@ dns_slabheader_freeproof(isc_mem_t *mctx, dns_slabheader_proof_t **proof);
/*%<
* Free all memory associated with a nonexistence proof.
*/
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/rdatatype.h
View File

@ -15,8 +15,6 @@
/*! \file dns/rdatatype.h */
#include <isc/lang.h>
#include <dns/types.h>
#define DNS_TYPEPAIR_TYPE(type) ((dns_rdatatype_t)((type) & 0xFFFF))
@ -27,8 +25,6 @@
((dns_typepair_t)(((uint32_t)type) << 16) | \
(((uint32_t)dns_rdatatype_rrsig) & 0xffff))
ISC_LANG_BEGINDECLS
isc_result_t
dns_rdatatype_fromtext(dns_rdatatype_t *typep, isc_textregion_t *source);
/*%<
@ -98,5 +94,3 @@ dns_rdatatype_format(dns_rdatatype_t rdtype, char *array, unsigned int size);
* May need to be adjusted if a new RR type with a very long
* name is defined.
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/remote.h
View File

@ -17,14 +17,11 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/magic.h>
#include <isc/mem.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
#define DNS_REMOTE_MAGIC ISC_MAGIC('R', 'm', 't', 'e')
#define DNS_REMOTE_VALID(remote) ISC_MAGIC_VALID(remote, DNS_REMOTE_MAGIC)
@ -215,5 +212,3 @@ dns_remote_done(dns_remote_t *remote);
* Requires:
* 'remote' is a valid remote structure.
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/request.h
View File

@ -37,7 +37,6 @@
#include <stdbool.h>
#include <isc/job.h>
#include <isc/lang.h>
#include <isc/tls.h>
#include <dns/types.h>
@ -49,8 +48,6 @@
#define DNS_REQUESTOPT_FIXEDID 0x00000004U
#define DNS_REQUESTOPT_LARGE 0x00000008U
ISC_LANG_BEGINDECLS
isc_result_t
dns_requestmgr_create(isc_mem_t *mctx, isc_loopmgr_t *loopmgr,
dns_dispatchmgr_t *dispatchmgr,
@ -305,5 +302,3 @@ ISC_REFCOUNT_TRACE_DECL(dns_request);
#else
ISC_REFCOUNT_DECL(dns_request);
#endif
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/resolver.h
View File

@ -49,7 +49,6 @@
#include <netinet/in.h>
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/loop.h>
#include <isc/refcount.h>
#include <isc/stats.h>
@ -62,8 +61,6 @@
/* Add -DDNS_RESOLVER_TRACE=1 to CFLAGS for detailed reference tracing */
ISC_LANG_BEGINDECLS
/*%
* A dns_fetchresponse_t is sent to the caller when a fetch completes.
* Any of 'db', 'node', 'rdataset', and 'sigrdataset' may be bound; it
@ -637,5 +634,3 @@ dns_resolver_freefresp(dns_fetchresponse_t **frespp);
* Requires:
* \li 'frespp' is valid. No-op if *frespp == NULL
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/result.h
View File

@ -15,17 +15,12 @@
/*! \file dns/result.h */
#include <isc/lang.h>
#include <isc/result.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
dns_rcode_t
dns_result_torcode(isc_result_t result);
isc_result_t
dns_result_fromrcode(dns_rcode_t rcode);
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/rootns.h
View File

@ -15,12 +15,8 @@
/*! \file dns/rootns.h */
#include <isc/lang.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
isc_result_t
dns_rootns_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
const char *filename, dns_db_t **target);
@ -32,5 +28,3 @@ dns_root_checkhints(dns_view_t *view, dns_db_t *hints, dns_db_t *db);
*
* Requires view, hints and (cache) db to be valid.
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/rpz.h
View File

@ -19,7 +19,6 @@
#include <stdbool.h>
#include <isc/ht.h>
#include <isc/lang.h>
#include <isc/refcount.h>
#include <isc/rwlock.h>
#include <isc/time.h>
@ -30,8 +29,6 @@
#include <dns/rdata.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
#define DNS_RPZ_PREFIX "rpz-"
/*
* Sub-zones of various trigger types.
@ -418,5 +415,3 @@ dns_rpz_find_ip(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type,
dns_rpz_zbits_t
dns_rpz_find_name(dns_rpz_zones_t *rpzs, dns_rpz_type_t rpz_type,
dns_rpz_zbits_t zbits, dns_name_t *trig_name);
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/rriterator.h
View File

@ -28,7 +28,6 @@
#include <inttypes.h>
#include <isc/lang.h>
#include <isc/magic.h>
#include <isc/stdtime.h>
@ -41,8 +40,6 @@
#include <dns/rdatasetiter.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
/*****
***** Types
*****/
@ -175,5 +172,3 @@ dns_rriterator_destroy(dns_rriterator_t *it);
*
*\li All resources used by the rriterator are freed.
*/
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/rrl.h
View File

@ -20,14 +20,10 @@
#include <inttypes.h>
#include <stdbool.h>
#include <isc/lang.h>
#include <dns/fixedname.h>
#include <dns/rdata.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
/*
* Memory allocation or other failures.
*/
@ -265,5 +261,3 @@ dns_rrl_view_destroy(dns_view_t *view);
isc_result_t
dns_rrl_init(dns_rrl_t **rrlp, dns_view_t *view, int min_entries);
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/sdlz.h
View File

@ -56,8 +56,6 @@
#include <dns/clientinfo.h>
#include <dns/dlz.h>
ISC_LANG_BEGINDECLS
#define DNS_SDLZFLAG_THREADSAFE 0x00000001U
#define DNS_SDLZFLAG_RELATIVEOWNER 0x00000002U
#define DNS_SDLZFLAG_RELATIVERDATA 0x00000004U
@ -352,5 +350,3 @@ dns_sdlz_setdb_t dns_sdlz_setdb;
/*%<
* Create the database pointers for a writeable SDLZ zone
*/
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/secalg.h
View File

@ -15,12 +15,8 @@
/*! \file dns/secalg.h */
#include <isc/lang.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
isc_result_t
dns_secalg_fromtext(dns_secalg_t *secalgp, isc_textregion_t *source);
/*%<
@ -65,5 +61,3 @@ dns_secalg_format(dns_secalg_t alg, char *cp, unsigned int size);
/*%<
* Wrapper for dns_secalg_totext(), writing text into 'cp'
*/
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/secproto.h
View File

@ -15,12 +15,8 @@
/*! \file dns/secproto.h */
#include <isc/lang.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
isc_result_t
dns_secproto_fromtext(dns_secproto_t *secprotop, isc_textregion_t *source);
/*%<
@ -58,5 +54,3 @@ dns_secproto_totext(dns_secproto_t secproto, isc_buffer_t *target);
*\li ISC_R_SUCCESS on success
*\li ISC_R_NOSPACE target buffer is too small
*/
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/skr.h
View File

@ -26,8 +26,6 @@
#include <dns/diff.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
#define DNS_SKR_MAGIC ISC_MAGIC('S', 'K', 'R', '-')
#define DNS_SKR_VALID(t) ISC_MAGIC_VALID(t, DNS_SKR_MAGIC)
@ -145,5 +143,3 @@ dns_skr_destroy(dns_skr_t *skr);
* Requires:
* \li 'skr' is a valid SKR
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/soa.h
View File

@ -28,13 +28,10 @@
#include <inttypes.h>
#include <isc/lang.h>
#include <isc/types.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
#define DNS_SOA_BUFFERSIZE ((2 * DNS_NAME_MAXWIRE) + (4 * 5))
isc_result_t
@ -89,5 +86,3 @@ dns_soa_setminimum(uint32_t val, dns_rdata_t *rdata);
* Requires:
* rdata refers to the rdata of a well-formed SOA record.
*/
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/ssu.h
View File

@ -17,15 +17,11 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <dns/acl.h>
#include <dns/types.h>
#include <dst/dst.h>
ISC_LANG_BEGINDECLS
typedef enum {
dns_ssumatchtype_name = 0,
dns_ssumatchtype_subdomain = 1,
@ -258,5 +254,3 @@ dns_ssu_mtypefromstring(const char *str, dns_ssumatchtype_t *mtype);
*\li #ISC_R_SUCCESS
*\li #ISC_R_NOTFOUND
*/
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/stats.h
View File

@ -257,8 +257,6 @@ typedef void (*dns_dnssecsignstats_dumper_t)(uint32_t, uint64_t, void *);
typedef void (*dns_opcodestats_dumper_t)(dns_opcode_t, uint64_t, void *);
typedef void (*dns_rcodestats_dumper_t)(dns_rcode_t, uint64_t, void *);
ISC_LANG_BEGINDECLS
void
dns_generalstats_create(isc_mem_t *mctx, dns_stats_t **statsp, int ncounters);
/*%<
@ -515,5 +513,3 @@ dns_rcodestats_dump(dns_stats_t *stats, dns_rcodestats_dumper_t dump_fn,
* Requires:
*\li 'stats' is a valid dns_stats_t created by dns_generalstats_create().
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/time.h
View File

@ -22,9 +22,6 @@
#include <inttypes.h>
#include <isc/buffer.h>
#include <isc/lang.h>
ISC_LANG_BEGINDECLS
/***
*** Functions
@ -66,5 +63,3 @@ dns_time64_from32(uint32_t value);
/*%<
* Covert a 32-bit cyclic time value into a 64 bit time stamp.
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/tkey.h
View File

@ -18,15 +18,11 @@
#include <inttypes.h>
#include <stdbool.h>
#include <isc/lang.h>
#include <dns/types.h>
#include <dst/dst.h>
#include <dst/gssapi.h>
ISC_LANG_BEGINDECLS
/* Key agreement modes */
#define DNS_TKEYMODE_SERVERASSIGNED 1
#define DNS_TKEYMODE_DIFFIEHELLMAN 2
@ -139,4 +135,3 @@ dns_tkey_gssnegotiate(dns_message_t *qmsg, dns_message_t *rmsg,
* DNS_R_CONTINUE additional context negotiation is required;
* send the new qmsg to the server
*/
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/tsig.h
View File

@ -18,7 +18,6 @@
#include <stdbool.h>
#include <isc/hashmap.h>
#include <isc/lang.h>
#include <isc/refcount.h>
#include <isc/rwlock.h>
#include <isc/stdio.h>
@ -95,8 +94,6 @@ struct dns_tsigkey {
ISC_LINK(dns_tsigkey_t) link;
};
ISC_LANG_BEGINDECLS
const dns_name_t *
dns_tsigkey_identity(const dns_tsigkey_t *tsigkey);
/*%<
@ -308,5 +305,3 @@ ISC_REFCOUNT_TRACE_DECL(dns_tsigkeyring);
ISC_REFCOUNT_DECL(dns_tsigkey);
ISC_REFCOUNT_DECL(dns_tsigkeyring);
#endif
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/ttl.h
View File

@ -22,11 +22,8 @@
#include <inttypes.h>
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/types.h>
ISC_LANG_BEGINDECLS
/***
*** Functions
***/
@ -73,5 +70,3 @@ dns_ttl_fromtext(isc_textregion_t *source, uint32_t *ttl);
*\li ISC_R_SUCCESS
*\li DNS_R_BADTTL
*/
ISC_LANG_ENDDECLS

6
lib/dns/include/dns/update.h
View File

@ -21,8 +21,6 @@
#include <inttypes.h>
#include <isc/lang.h>
#include <dns/diff.h>
#include <dns/types.h>
@ -32,8 +30,6 @@ typedef struct {
void *arg;
} dns_update_log_t;
ISC_LANG_BEGINDECLS
/***
*** Functions
***/
@ -68,5 +64,3 @@ dns_update_signaturesinc(dns_update_log_t *log, dns_zone_t *zone, dns_db_t *db,
dns_dbversion_t *oldver, dns_dbversion_t *newver,
dns_diff_t *diff, uint32_t sigvalidityinterval,
dns_update_state_t **state);
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/validator.h
View File

@ -49,7 +49,6 @@
#include <stdbool.h>
#include <isc/job.h>
#include <isc/lang.h>
#include <isc/refcount.h>
#include <dns/fixedname.h>
@ -164,8 +163,6 @@ struct dns_validator {
#define DNS_VALIDATOR_NOCDFLAG 0x0004U
#define DNS_VALIDATOR_NONTA 0x0008U /*% Ignore NTA table */
ISC_LANG_BEGINDECLS
isc_result_t
dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset,
@ -264,5 +261,3 @@ ISC_REFCOUNT_TRACE_DECL(dns_validator);
#else
ISC_REFCOUNT_DECL(dns_validator);
#endif
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/view.h
View File

@ -57,7 +57,6 @@
#include <stdbool.h>
#include <stdio.h>
#include <isc/lang.h>
#include <isc/magic.h>
#include <isc/mutex.h>
#include <isc/net.h>
@ -78,8 +77,6 @@
#include <dns/types.h>
#include <dns/zt.h>
ISC_LANG_BEGINDECLS
struct dns_view {
/* Unlocked. */
unsigned int magic;
@ -1346,5 +1343,3 @@ dns_view_setmaxqueries(dns_view_t *view, uint16_t max_queries);
*\li 'view' is valid;
*\li 'max_queries' is greater than 0.
*/
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/xfrin.h
View File

@ -26,7 +26,6 @@
*** Imports
***/
#include <isc/lang.h>
#include <isc/refcount.h>
#include <isc/sockaddr.h>
#include <isc/tls.h>
@ -49,8 +48,6 @@ typedef struct dns_xfrin dns_xfrin_t;
*** Functions
***/
ISC_LANG_BEGINDECLS
void
dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype,
uint32_t ixfr_maxdiffs, const isc_sockaddr_t *primaryaddr,
@ -235,4 +232,3 @@ ISC_REFCOUNT_TRACE_DECL(dns_xfrin);
#else
ISC_REFCOUNT_DECL(dns_xfrin);
#endif
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/zone.h
View File

@ -24,7 +24,6 @@
#include <stdio.h>
#include <isc/formatcheck.h>
#include <isc/lang.h>
#include <isc/rwlock.h>
#include <isc/tls.h>
@ -150,8 +149,6 @@ typedef enum {
* exponential backoff */
#endif /* ifndef DNS_ZONE_DEFAULTRETRY */
ISC_LANG_BEGINDECLS
/***
*** Functions
***/
@ -2674,7 +2671,6 @@ dns_zone_setserial(dns_zone_t *zone, uint32_t serial);
/*%
* Set the zone's serial to 'serial'.
*/
ISC_LANG_ENDDECLS
isc_stats_t *
dns_zone_getgluecachestats(dns_zone_t *zone);

6
lib/dns/include/dns/zonekey.h
View File

@ -17,12 +17,8 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
bool
dns_zonekey_iszonekey(dns_rdata_t *keyrdata);
/*%<
@ -31,5 +27,3 @@ dns_zonekey_iszonekey(dns_rdata_t *keyrdata);
* Requires:
* 'keyrdata' is not NULL.
*/
ISC_LANG_ENDDECLS

4
lib/dns/include/dns/zoneverify.h
View File

@ -21,8 +21,6 @@
#include <dns/types.h>
ISC_LANG_BEGINDECLS
/*%
* Verify that certain things are sane:
*
@ -46,5 +44,3 @@ dns_zoneverify_dnssec(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
dns_name_t *origin, dns_keytable_t *secroots,
isc_mem_t *mctx, bool ignore_kskflag, bool keyset_kskonly,
void (*report)(const char *, ...));
ISC_LANG_ENDDECLS

5
lib/dns/include/dns/zt.h
View File

@ -17,13 +17,10 @@
#include <stdbool.h>
#include <isc/lang.h>
#include <isc/rwlock.h>
#include <dns/types.h>
ISC_LANG_BEGINDECLS
typedef enum dns_ztfind {
DNS_ZTFIND_EXACT = 1 << 0,
DNS_ZTFIND_NOEXACT = 1 << 1,
@ -215,5 +212,3 @@ dns_zt_setviewrevert(dns_zt_t *zt);
* Requires:
*\li 'zt' to be valid.
*/
ISC_LANG_ENDDECLS

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