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

Megacommit of many files.

Browse source 
Mostly, several functions that take pointers as arguments, almost
always char * pointers, had those pointers qualified with "const".
Those that returned pointers to previously const-qualified arguments
had their return values qualified as const.  Some structure members
were qualified as const to retain that attribute from the variables
from which they were assigned.

The macro DE_CONST is used to deal with a handful of very special
places where something is qualified as const but really needs to have
its const qualifier removed.

rdata.c now defines macros for the prototypes of the basic rdata functions,
and all of the lib/dns/rdata/**/*.c files now use them.

Some minor integer-compatibility issues.  (IE, ~0x03 is a signed int,
so assigning it to an unsigned int should use a cast.  The type of an
enum member is int, so there are some conversion issues there, too.)

A pointers-to-function should not be cast to a pointer-to-object.

Variables should not be named for C reserved identifiers.

One or two set-but-not-used variables removed.

Minor other ISC style cleanups.
This commit is contained in:
David Lawrence 2000-06-01 18:26:56 +00:00
parent 8612a0d515
commit 6d12fdf966
76 changed files with 886 additions and 1340 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/dns/adb.c
View file

@ -414,8 +414,7 @@ static isc_result_t dbfind_a6(dns_adbname_t *, isc_stdtime_t);
static void
DP(int level, char *format, ...)
{
DP(int level, const char *format, ...) {
va_list args;
va_start(args, format);
@ -3005,7 +3004,7 @@ print_namehook_list(FILE *f, dns_adbname_t *n) {
}
static inline void
print_fetch(FILE *f, dns_adbfetch_t *ft, char *type) {
print_fetch(FILE *f, dns_adbfetch_t *ft, const char *type) {
fprintf(f, "\t\tFetch(%s): %p -> { nh %p, entry %p, fetch %p }\n",
type, ft, ft->namehook, ft->entry, ft->fetch);
}

4
lib/dns/cache.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: cache.c,v 1.21 2000/05/08 14:34:26 tale Exp $ */
/* $Id: cache.c,v 1.22 2000/06/01 18:25:25 tale Exp $ */
#include <config.h>
@ -120,7 +120,7 @@ cleaner_shutdown_action(isc_task_t *task, isc_event_t *event);
isc_result_t
dns_cache_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
isc_timermgr_t *timermgr, dns_rdataclass_t rdclass,
char *db_type, unsigned int db_argc, char **db_argv,
const char *db_type, unsigned int db_argc, char **db_argv,
dns_cache_t **cachep)
{
isc_result_t result;

13
lib/dns/callbacks.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: callbacks.c,v 1.7 2000/05/08 14:34:27 tale Exp $ */
/* $Id: callbacks.c,v 1.8 2000/06/01 18:25:26 tale Exp $ */
#include <config.h>
@ -24,14 +24,17 @@
#include <dns/callbacks.h>
#include <dns/log.h>
static void stdio_error_warn_callback(dns_rdatacallbacks_t *, char *, ...);
static void
stdio_error_warn_callback(dns_rdatacallbacks_t *, const char *, ...);
/*
* Private
*/
static void
stdio_error_warn_callback(dns_rdatacallbacks_t *callbacks, char *fmt, ...) {
stdio_error_warn_callback(dns_rdatacallbacks_t *callbacks,
const char *fmt, ...)
{
va_list ap;
UNUSED(callbacks);
@ -43,7 +46,7 @@ stdio_error_warn_callback(dns_rdatacallbacks_t *callbacks, char *fmt, ...) {
}
static void
isclog_error_callback(dns_rdatacallbacks_t *callbacks, char *fmt, ...) {
isclog_error_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, ...) {
va_list ap;
UNUSED(callbacks);
@ -56,7 +59,7 @@ isclog_error_callback(dns_rdatacallbacks_t *callbacks, char *fmt, ...) {
}
static void
isclog_warn_callback(dns_rdatacallbacks_t *callbacks, char *fmt, ...) {
isclog_warn_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, ...) {
va_list ap;
UNUSED(callbacks);

4
lib/dns/config/confcommon.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: confcommon.c,v 1.29 2000/05/31 13:09:55 brister Exp $ */
/* $Id: confcommon.c,v 1.30 2000/06/01 18:25:42 tale Exp $ */
#include <config.h>
@ -716,7 +716,7 @@ dns_c_charptoname(isc_mem_t *mem, const char *keyval, dns_name_t **name) {
dns_name_setbuffer(&newkey, b1);
isc_buffer_init(&b2, (char *)keyval, len);
isc_buffer_init(&b2, keyval, len);
isc_buffer_add(&b2, len);
res = dns_name_fromtext(&newkey, &b2, NULL, ISC_FALSE, NULL);

81
lib/dns/config/confndc.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: confndc.c,v 1.15 2000/05/24 15:07:58 tale Exp $ */
/* $Id: confndc.c,v 1.16 2000/06/01 18:25:43 tale Exp $ */
/*
** options {
@ -81,8 +81,8 @@ typedef struct {
} ndcpcontext;
struct keywordtoken {
char *token;
int yaccval;
const char *token;
const int yaccval;
};
@ -110,7 +110,7 @@ struct keywordtoken {
#define L_STRING 20
#define L_INTEGER 21
static struct keywordtoken keyword_tokens [] = {
static struct keywordtoken keyword_tokens[] = {
{ "{", L_LBRACE },
{ "}", L_RBRACE },
{ ";", L_EOS },
@ -142,40 +142,51 @@ static struct keywordtoken misc_tokens[] = {
static isc_result_t parse_file(ndcpcontext *pctx,
dns_c_ndcctx_t **context);
static isc_result_t
parse_file(ndcpcontext *pctx, dns_c_ndcctx_t **context);
static isc_result_t parse_statement(ndcpcontext *pctx);
static isc_result_t parse_options(ndcpcontext *pctx, dns_c_ndcopts_t **opts);
static isc_result_t parse_serverstmt(ndcpcontext *pctx,
dns_c_ndcserver_t **server);
static isc_result_t parse_keystmt(ndcpcontext *pctx, dns_c_kdeflist_t *keys);
static isc_result_t
parse_statement(ndcpcontext *pctx);
static isc_result_t
parse_options(ndcpcontext *pctx, dns_c_ndcopts_t **opts);
static isc_result_t
parse_serverstmt(ndcpcontext *pctx, dns_c_ndcserver_t **server);
static isc_result_t
parse_keystmt(ndcpcontext *pctx, dns_c_kdeflist_t *keys);
static const char *
keyword2str(isc_int32_t val);
static isc_boolean_t
eat(ndcpcontext *pctx, isc_uint32_t token);
static isc_boolean_t
eat_eos(ndcpcontext *pctx);
static isc_boolean_t
eat_lbrace(ndcpcontext *pctx);
static isc_boolean_t
eat_rbrace(ndcpcontext *pctx);
static isc_boolean_t
looking_at(ndcpcontext *pctx, isc_uint32_t token);
static isc_boolean_t
looking_at_anystring(ndcpcontext *pctx);
static const char * keyword2str(isc_int32_t val);
static isc_boolean_t eat(ndcpcontext *pctx, isc_uint32_t token);
static isc_boolean_t eat_eos(ndcpcontext *pctx);
static isc_boolean_t eat_lbrace(ndcpcontext *pctx);
static isc_boolean_t eat_rbrace(ndcpcontext *pctx);
static isc_boolean_t looking_at(ndcpcontext *pctx, isc_uint32_t token);
static isc_boolean_t looking_at_anystring(ndcpcontext *pctx);
static isc_result_t parser_setup(ndcpcontext *pctx, isc_mem_t *mem,
const char *filename);
static void parser_complain(isc_boolean_t is_warning,
isc_boolean_t print_last_token, ndcpcontext *pctx,
const char *format, va_list args);
static void parser_error(ndcpcontext *pctx, isc_boolean_t lasttoken,
const char *fmt, ...);
static void parser_warn(ndcpcontext *pctx, isc_boolean_t lasttoken,
const char *fmt, ...);
static isc_boolean_t is_ip6addr(const char *string, struct in6_addr *addr);
static isc_boolean_t is_ip4addr(const char *string, struct in_addr *addr);
static isc_result_t getnexttoken(ndcpcontext *pctx);
static void syntax_error(ndcpcontext *pctx, isc_uint32_t keyword);
static isc_result_t
parser_setup(ndcpcontext *pctx, isc_mem_t *mem, const char *filename);
static void
parser_complain(isc_boolean_t is_warning, isc_boolean_t print_last_token,
ndcpcontext *pctx, const char *format, va_list args);
static void
parser_error(ndcpcontext *pctx, isc_boolean_t lasttoken, const char *fmt, ...);
static void
parser_warn(ndcpcontext *pctx, isc_boolean_t lasttoken, const char *fmt, ...);
static isc_boolean_t
is_ip6addr(const char *string, struct in6_addr *addr);
static isc_boolean_t
is_ip4addr(const char *string, struct in_addr *addr);
static isc_result_t
getnexttoken(ndcpcontext *pctx);
static void
syntax_error(ndcpcontext *pctx, isc_uint32_t keyword);
/* *********************************************************************** */
@ -1400,7 +1411,7 @@ parser_setup(ndcpcontext *pctx, isc_mem_t *mem, const char *filename) {
ISC_LEXCOMMENT_CPLUSPLUS |
ISC_LEXCOMMENT_SHELL));
result = isc_lex_openfile(pctx->thelexer, (char *)filename);
result = isc_lex_openfile(pctx->thelexer, filename);
if (result != ISC_R_SUCCESS) {
isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,

23
lib/dns/config/confparser.y
View file

@ -16,7 +16,7 @@
* SOFTWARE.
*/
/* $Id: confparser.y,v 1.85 2000/05/31 13:09:57 brister Exp $ */
/* $Id: confparser.y,v 1.86 2000/06/01 18:25:45 tale Exp $ */
#include <config.h>
@ -126,7 +126,7 @@ static void parser_complain(isc_boolean_t is_warning,
isc_boolean_t last_token,
const char *format, va_list args);
static isc_boolean_t unit_to_uint32(char *in, isc_uint32_t *out);
static char * token_to_keyword(int token);
static const char * token_to_keyword(int token);
static void yyerror(const char *);
static dns_peerlist_t *currentpeerlist(dns_c_ctx_t *cfg,
isc_boolean_t createIfNeeded);
@ -2429,7 +2429,7 @@ category_name: any_string
}
| L_DEFAULT
{
char *name = token_to_keyword(L_DEFAULT);
const char *name = token_to_keyword(L_DEFAULT);
REQUIRE(name != NULL);
@ -2437,7 +2437,7 @@ category_name: any_string
}
| L_NOTIFY
{
char *name = token_to_keyword(L_NOTIFY);
const char *name = token_to_keyword(L_NOTIFY);
REQUIRE(name != NULL);
@ -4881,7 +4881,7 @@ static int lasttoken;
*/
struct token
{
char *token;
const char *token;
int yaccval;
};
@ -5160,7 +5160,7 @@ dns_c_parse_namedconf(const char *filename, isc_mem_t *mem,
ISC_LEXCOMMENT_CPLUSPLUS |
ISC_LEXCOMMENT_SHELL));
res = isc_lex_openfile(mylexer, (char *)filename); /* remove const */
res = isc_lex_openfile(mylexer, filename);
if (res != ISC_R_SUCCESS) {
isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@ -5324,9 +5324,11 @@ yylex(void)
static char *
token_to_text(int token, YYSTYPE lval) {
static char buffer[1024];
char *tk;
const char *tk;
/* Yacc keeps token numbers above 128, it seems. */
/*
* Yacc keeps token numbers above 128, it seems.
*/
if (token < 128) {
if (token == 0)
strncpy(buffer, "<end of file>", sizeof buffer);
@ -5383,9 +5385,8 @@ token_to_text(int token, YYSTYPE lval) {
return (buffer);
}
static char *
token_to_keyword(int token)
{
static const char *
token_to_keyword(int token) {
int i;
for (i = 0 ; keyword_tokens[i].token != NULL ; i++) {

8
lib/dns/config/confrrset.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: confrrset.c,v 1.13 2000/05/08 14:35:35 tale Exp $ */
/* $Id: confrrset.c,v 1.14 2000/06/01 18:25:46 tale Exp $ */
#include <config.h>
@ -82,9 +82,9 @@ dns_c_rrsolist_new(isc_mem_t *mem, dns_c_rrsolist_t **rval) {
}
isc_result_t
dns_c_rrso_new(isc_mem_t *mem, dns_c_rrso_t **res,
dns_rdataclass_t oclass,
dns_rdatatype_t otype, char *name, dns_c_ordering_t ordering)
dns_c_rrso_new(isc_mem_t *mem, dns_c_rrso_t **res, dns_rdataclass_t oclass,
dns_rdatatype_t otype, const char *name,
dns_c_ordering_t ordering)
{
dns_c_rrso_t *newo;

4
lib/dns/db.c
View file

@ -35,7 +35,7 @@
***/
typedef struct {
char * name;
const char * name;
isc_result_t (*create)(isc_mem_t *mctx, dns_name_t *name,
isc_boolean_t cache,
dns_rdataclass_t rdclass,
@ -67,7 +67,7 @@ static impinfo_t implementations[] = {
***/
isc_result_t
dns_db_create(isc_mem_t *mctx, char *db_type, dns_name_t *origin,
dns_db_create(isc_mem_t *mctx, const char *db_type, dns_name_t *origin,
isc_boolean_t cache, dns_rdataclass_t rdclass,
unsigned int argc, char *argv[], dns_db_t **dbp)
{

5
lib/dns/dnssec.c
View file

@ -16,7 +16,7 @@
*/
/*
* $Id: dnssec.c,v 1.40 2000/05/30 22:30:39 bwelling Exp $
* $Id: dnssec.c,v 1.41 2000/06/01 18:25:29 tale Exp $
* Principal Author: Brian Wellington
*/
@ -92,7 +92,8 @@ digest_callback(void *arg, isc_region_t *data) {
*/
static int
rdata_compare_wrapper(const void *rdata1, const void *rdata2) {
return dns_rdata_compare((dns_rdata_t *)rdata1, (dns_rdata_t *)rdata2);
return (dns_rdata_compare((const dns_rdata_t *)rdata1,
(const dns_rdata_t *)rdata2));
}
/*

44
lib/dns/gen.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: gen.c,v 1.46 2000/05/09 22:22:11 tale Exp $ */
/* $Id: gen.c,v 1.47 2000/06/01 18:25:30 tale Exp $ */
#include <config.h>
@ -151,13 +151,21 @@ struct ttnam {
unsigned int sorted;
} typenames[256];
char * upper(char *);
char * funname(char *, char *);
void doswitch(char *, char *, char *, char *, char *, char *);
void dodecl(char *, char *, char *);
void add(int, char *, int, char *, char *);
void sd(int, char *, char *, char);
void insert_into_typenames(int, char *, char *);
char *
upper(char *);
char *
funname(char *, char *);
void
doswitch(const char *, const char *, const char *, const char *,
const char *, const char *);
void
dodecl(char *, char *, char *);
void
add(int, const char *, int, const char *, const char *);
void
sd(int, const char *, const char *, char);
void
insert_into_typenames(int, const char *, const char *);
/*
* If you use more than 10 of these in, say, a printf(), you'll have problems.
@ -195,15 +203,15 @@ funname(char *s, char *buf) {
}
void
doswitch(char *name, char *function, char *args,
char *tsw, char *csw, char *res)
doswitch(const char *name, const char *function, const char *args,
const char *tsw, const char *csw, const char *res)
{
struct tt *tt;
int first = 1;
int lasttype = 0;
int subswitch = 0;
char buf1[11], buf2[11];
char *result = " result =";
const char *result = " result =";
if (res == NULL)
result = "";
@ -286,8 +294,7 @@ dodecl(char *type, char *function, char *args) {
}
void
insert_into_typenames(int type, char *typename, char *attr)
{
insert_into_typenames(int type, const char *typename, const char *attr) {
struct ttnam *ttn;
int c;
char tmp[256];
@ -335,7 +342,9 @@ insert_into_typenames(int type, char *typename, char *attr)
}
void
add(int rdclass, char *classname, int type, char *typename, char *dirname) {
add(int rdclass, const char *classname, int type, const char *typename,
const char *dirname)
{
struct tt *newtt = (struct tt *)malloc(sizeof *newtt);
struct tt *tt, *oldtt;
struct cc *newcc;
@ -409,7 +418,7 @@ add(int rdclass, char *classname, int type, char *typename, char *dirname) {
}
void
sd(int rdclass, char *classname, char *dirname, char filetype) {
sd(int rdclass, const char *classname, const char *dirname, char filetype) {
char buf[sizeof "0123456789_65535.h"];
char fmt[sizeof "%10[-0-9a-z]_%d.h"];
int type;
@ -436,8 +445,7 @@ sd(int rdclass, char *classname, char *dirname, char filetype) {
}
static unsigned int
HASH(char *string)
{
HASH(char *string) {
unsigned int n;
unsigned char a, b;
@ -617,7 +625,7 @@ main(int argc, char **argv) {
insert_into_typenames(255, "any", METAQUESTIONONLY);
printf("\ntypedef struct {\n");
printf("\tchar *name;\n");
printf("\tconst char *name;\n");
printf("\tunsigned int flags;\n");
printf("} typeattr_t;\n");
printf("static typeattr_t typeattr[] = {\n");

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

@ -62,7 +62,7 @@ ISC_LANG_BEGINDECLS
isc_result_t
dns_cache_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
isc_timermgr_t *timermgr, dns_rdataclass_t rdclass,
char *db_type, unsigned int db_argc, char **db_argv,
const char *db_type, unsigned int db_argc, char **db_argv,
dns_cache_t **cachep);
/*
* Create a new DNS cache.

10
lib/dns/include/dns/callbacks.h
View file

@ -40,17 +40,17 @@ struct dns_rdatacallbacks {
/*
* dns_load_master / dns_rdata_fromtext call this to issue a error.
*/
void (*error)(struct dns_rdatacallbacks *, char *, ...);
void (*error)(struct dns_rdatacallbacks *, const char *, ...);
/*
* dns_load_master / dns_rdata_fromtext call this to issue a warning.
*/
void (*warn)(struct dns_rdatacallbacks *, char *, ...);
void (*warn)(struct dns_rdatacallbacks *, const char *, ...);
/*
* Private data handles for use by the above callback functions.
*/
void *add_private;
void *error_private;
void *warn_private;
void *add_private;
void *error_private;
void *warn_private;
};
/***

3
lib/dns/include/dns/confrrset.h
View file

@ -110,7 +110,8 @@ dns_c_rrsolist_append(dns_c_rrsolist_t *dest, dns_c_rrsolist_t *src);
isc_result_t
dns_c_rrso_new(isc_mem_t *mem, dns_c_rrso_t **res, dns_rdataclass_t oclass,
dns_rdatatype_t otype, char *name, dns_c_ordering_t ordering);
dns_rdatatype_t otype, const char *name,
dns_c_ordering_t ordering);
isc_result_t
dns_c_rrso_delete(dns_c_rrso_t **order);

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

@ -189,7 +189,7 @@ struct dns_db {
***/
isc_result_t
dns_db_create(isc_mem_t *mctx, char *db_type, dns_name_t *origin,
dns_db_create(isc_mem_t *mctx, const char *db_type, dns_name_t *origin,
isc_boolean_t cache, dns_rdataclass_t rdclass,
unsigned int argc, char *argv[], dns_db_t **dbp);
/*

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

@ -100,7 +100,8 @@ ISC_LANG_BEGINDECLS
*** Properties
***/
dns_labeltype_t dns_label_type(dns_label_t *label);
dns_labeltype_t
dns_label_type(dns_label_t *label);
/*
* Get the type of 'label'.
*
@ -118,7 +119,8 @@ dns_labeltype_t dns_label_type(dns_label_t *label);
*** Bitstring Labels
***/
unsigned int dns_label_countbits(dns_label_t *label);
unsigned int
dns_label_countbits(dns_label_t *label);
/*
* The number of bits in a bitstring label.
*
@ -134,7 +136,8 @@ unsigned int dns_label_countbits(dns_label_t *label);
* The number of bits in the bitstring label.
*/
dns_bitlabel_t dns_label_getbit(dns_label_t *label, unsigned int n);
dns_bitlabel_t
dns_label_getbit(dns_label_t *label, unsigned int n);
/*
* The 'n'th most significant bit of 'label'.
*
@ -215,7 +218,8 @@ extern dns_name_t *dns_wildcardname;
*** Initialization
***/
void dns_name_init(dns_name_t *name, unsigned char *offsets);
void
dns_name_init(dns_name_t *name, unsigned char *offsets);
/*
* Initialize 'name'.
*
@ -234,7 +238,8 @@ void dns_name_init(dns_name_t *name, unsigned char *offsets);
* dns_name_countlabels(name) == 0
*/
void dns_name_invalidate(dns_name_t *name);
void
dns_name_invalidate(dns_name_t *name);
/*
* Make 'name' invalid.
*
@ -279,7 +284,7 @@ dns_name_setbuffer(dns_name_t *name, isc_buffer_t *buffer);
*/
isc_boolean_t
dns_name_hasbuffer(dns_name_t *name);
dns_name_hasbuffer(const dns_name_t *name);
/*
* Does 'name' have a dedicated buffer?
*
@ -296,7 +301,8 @@ dns_name_hasbuffer(dns_name_t *name);
*** Properties
***/
isc_boolean_t dns_name_isabsolute(dns_name_t *name);
isc_boolean_t
dns_name_isabsolute(const dns_name_t *name);
/*
* Does 'name' end in the root label?
*
@ -310,7 +316,8 @@ isc_boolean_t dns_name_isabsolute(dns_name_t *name);
* FALSE The last label in 'name' is not the root label.
*/
isc_boolean_t dns_name_iswildcard(dns_name_t *name);
isc_boolean_t
dns_name_iswildcard(const dns_name_t *name);
/*
* Is 'name' a wildcard name?
*
@ -324,7 +331,8 @@ isc_boolean_t dns_name_iswildcard(dns_name_t *name);
* FALSE The least significant label of 'name' is not '*'.
*/
isc_boolean_t dns_name_requiresedns(dns_name_t *name);
isc_boolean_t
dns_name_requiresedns(const dns_name_t *name);
/*
* Does 'name' require EDNS for transmission?
*
@ -338,7 +346,8 @@ isc_boolean_t dns_name_requiresedns(dns_name_t *name);
* FALSE The name does not require EDNS to be transmitted.
*/
unsigned int dns_name_hash(dns_name_t *name, isc_boolean_t case_sensitive);
unsigned int
dns_name_hash(dns_name_t *name, isc_boolean_t case_sensitive);
/*
* Provide a hash value for 'name'.
*
@ -357,7 +366,7 @@ unsigned int dns_name_hash(dns_name_t *name, isc_boolean_t case_sensitive);
***/
dns_namereln_t
dns_name_fullcompare(dns_name_t *name1, dns_name_t *name2,
dns_name_fullcompare(const dns_name_t *name1, const dns_name_t *name2,
int *orderp,
unsigned int *nlabelsp, unsigned int *nbitsp);
/*
@ -406,7 +415,7 @@ dns_name_fullcompare(dns_name_t *name1, dns_name_t *name2,
*/
int
dns_name_compare(dns_name_t *name1, dns_name_t *name2);
dns_name_compare(const dns_name_t *name1, const dns_name_t *name2);
/*
* Determine the relative ordering under the DNSSEC order relation of
* 'name1' and 'name2'.
@ -434,7 +443,7 @@ dns_name_compare(dns_name_t *name1, dns_name_t *name2);
*/
isc_boolean_t
dns_name_equal(dns_name_t *name1, dns_name_t *name2);
dns_name_equal(const dns_name_t *name1, const dns_name_t *name2);
/*
* Are 'name1' and 'name2' equal?
*
@ -462,7 +471,7 @@ dns_name_equal(dns_name_t *name1, dns_name_t *name2);
*/
int
dns_name_rdatacompare(dns_name_t *name1, dns_name_t *name2);
dns_name_rdatacompare(const dns_name_t *name1, const dns_name_t *name2);
/*
* Compare two names as if they are part of rdata in DNSSEC canonical
* form.
@ -483,7 +492,7 @@ dns_name_rdatacompare(dns_name_t *name1, dns_name_t *name2);
*/
isc_boolean_t
dns_name_issubdomain(dns_name_t *name1, dns_name_t *name2);
dns_name_issubdomain(const dns_name_t *name1, const dns_name_t *name2);
/*
* Is 'name1' a subdomain of 'name2'?
*
@ -513,7 +522,7 @@ dns_name_issubdomain(dns_name_t *name1, dns_name_t *name2);
*/
isc_boolean_t
dns_name_matcheswildcard(dns_name_t *name, dns_name_t *wname);
dns_name_matcheswildcard(const dns_name_t *name, const dns_name_t *wname);
/*
* Does 'name' match the wildcard specified in 'wname'?
*
@ -546,7 +555,7 @@ dns_name_matcheswildcard(dns_name_t *name, dns_name_t *wname);
*/
unsigned int
dns_name_depth(dns_name_t *name);
dns_name_depth(const dns_name_t *name);
/*
* The depth of 'name'.
*
@ -569,7 +578,8 @@ dns_name_depth(dns_name_t *name);
*** Labels
***/
unsigned int dns_name_countlabels(dns_name_t *name);
unsigned int
dns_name_countlabels(const dns_name_t *name);
/*
* How many labels does 'name' have?
*
@ -588,7 +598,8 @@ unsigned int dns_name_countlabels(dns_name_t *name);
* The number of labels in 'name'.
*/
void dns_name_getlabel(dns_name_t *name, unsigned int n, dns_label_t *label);
void
dns_name_getlabel(const dns_name_t *name, unsigned int n, dns_label_t *label);
/*
* Make 'label' refer to the 'n'th least significant label of 'name'.
*
@ -605,10 +616,9 @@ void dns_name_getlabel(dns_name_t *name, unsigned int n, dns_label_t *label);
* n < dns_label_countlabels(name)
*/
void dns_name_getlabelsequence(dns_name_t *source,
unsigned int first,
unsigned int n,
dns_name_t *target);
void
dns_name_getlabelsequence(const dns_name_t *source, unsigned int first,
unsigned int n, dns_name_t *target);
/*
* Make 'target' refer to the 'n' labels including and following 'first'
* in 'source'.
@ -658,7 +668,8 @@ dns_name_clone(dns_name_t *source, dns_name_t *target);
*** Conversions
***/
void dns_name_fromregion(dns_name_t *name, isc_region_t *r);
void
dns_name_fromregion(dns_name_t *name, isc_region_t *r);
/*
* Make 'name' refer to region 'r'.
*
@ -672,7 +683,8 @@ void dns_name_fromregion(dns_name_t *name, isc_region_t *r);
* labels.
*/
void dns_name_toregion(dns_name_t *name, isc_region_t *r);
void
dns_name_toregion(dns_name_t *name, isc_region_t *r);
/*
* Make 'r' refer to 'name'.
*
@ -683,11 +695,10 @@ void dns_name_toregion(dns_name_t *name, isc_region_t *r);
* 'r' is a valid region.
*/
isc_result_t dns_name_fromwire(dns_name_t *name,
isc_buffer_t *source,
dns_decompress_t *dctx,
isc_boolean_t downcase,
isc_buffer_t *target);
isc_result_t
dns_name_fromwire(dns_name_t *name, isc_buffer_t *source,
dns_decompress_t *dctx, isc_boolean_t downcase,
isc_buffer_t *target);
/*
* Copy the possibly-compressed name at source (active region) into target,
* decompressing it.
@ -743,9 +754,8 @@ isc_result_t dns_name_fromwire(dns_name_t *name,
* Resource Limit: Too many compression pointers
* Resource Limit: Not enough space in buffer */
isc_result_t dns_name_towire(dns_name_t *name,
dns_compress_t *cctx,
isc_buffer_t *target);
isc_result_t
dns_name_towire(dns_name_t *name, dns_compress_t *cctx, isc_buffer_t *target);
/*
* Convert 'name' into wire format, compressing it as specified by the
* compression context 'cctx', and storing the result in 'target'.
@ -779,11 +789,10 @@ isc_result_t dns_name_towire(dns_name_t *name,
* Resource Limit: Not enough space in buffer
*/
isc_result_t dns_name_fromtext(dns_name_t *name,
isc_buffer_t *source,
dns_name_t *origin,
isc_boolean_t downcase,
isc_buffer_t *target);
isc_result_t
dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
dns_name_t *origin, isc_boolean_t downcase,
isc_buffer_t *target);
/*
* Convert the textual representation of a DNS name at source
* into uncompressed wire form stored in target.
@ -830,9 +839,9 @@ isc_result_t dns_name_fromtext(dns_name_t *name,
* ISC_R_NOSPACE
* ISC_R_UNEXPECTEDEND */
isc_result_t dns_name_totext(dns_name_t *name,
isc_boolean_t omit_final_dot,
isc_buffer_t *target);
isc_result_t
dns_name_totext(dns_name_t *name, isc_boolean_t omit_final_dot,
isc_buffer_t *target);
/*
* Convert 'name' into text format, storing the result in 'target'.
*
@ -888,8 +897,9 @@ dns_name_downcase(dns_name_t *source, dns_name_t *name,
*
* Note: if source == name, then the result will always be ISC_R_SUCCESS. */
isc_result_t dns_name_concatenate(dns_name_t *prefix, dns_name_t *suffix,
dns_name_t *name, isc_buffer_t *target);
isc_result_t
dns_name_concatenate(dns_name_t *prefix, dns_name_t *suffix,
dns_name_t *name, isc_buffer_t *target);
/*
* Concatenate 'prefix' and 'suffix'.
*
@ -1151,6 +1161,8 @@ dns_name_format(dns_name_t *name, char *cp, unsigned int size);
*
*/
ISC_LANG_ENDDECLS
/***
*** High Peformance Macros
***/
@ -1186,13 +1198,11 @@ do { \
(n)->buffer = (b)
#define DNS_NAME_ISABSOLUTE(n) \
(((n)->attributes & DNS_NAMEATTR_ABSOLUTE) ? ISC_TRUE : ISC_FALSE)
(((n)->attributes & DNS_NAMEATTR_ABSOLUTE) != 0 ? ISC_TRUE : ISC_FALSE)
#define DNS_NAME_COUNTLABELS(n) \
((n)->labels)
#endif /* DNS_NAME_USEINLINE */
ISC_LANG_ENDDECLS
#endif /* DNS_NAME_H */

85
lib/dns/include/dns/rdata.h
View file

@ -139,7 +139,8 @@ struct dns_rdata {
*** Initialization
***/
void dns_rdata_init(dns_rdata_t *rdata);
void
dns_rdata_init(dns_rdata_t *rdata);
/*
* Make 'rdata' empty.
*
@ -151,7 +152,8 @@ void dns_rdata_init(dns_rdata_t *rdata);
*** Comparisons
***/
int dns_rdata_compare(dns_rdata_t *rdata1, dns_rdata_t *rdata2);
int
dns_rdata_compare(const dns_rdata_t *rdata1, const dns_rdata_t *rdata2);
/*
* Determine the relative ordering under the DNSSEC order relation of
* 'rdata1' and 'rdata2'.
@ -172,9 +174,9 @@ int dns_rdata_compare(dns_rdata_t *rdata1, dns_rdata_t *rdata2);
*** Conversions
***/
void dns_rdata_fromregion(dns_rdata_t *rdata,
dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_region_t *r);
void
dns_rdata_fromregion(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
dns_rdatatype_t type, isc_region_t *r);
/*
* Make 'rdata' refer to region 'r'.
*
@ -183,15 +185,16 @@ void dns_rdata_fromregion(dns_rdata_t *rdata,
* The data in 'r' is properly formatted for whatever type it is.
*/
void dns_rdata_toregion(dns_rdata_t *rdata, isc_region_t *r);
void
dns_rdata_toregion(const dns_rdata_t *rdata, isc_region_t *r);
/*
* Make 'r' refer to 'rdata'.
*/
isc_result_t dns_rdata_fromwire(dns_rdata_t *rdata,
dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source,
dns_decompress_t *dctx,
isc_result_t
dns_rdata_fromwire(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
dns_rdatatype_t type, isc_buffer_t *source,
dns_decompress_t *dctx,
isc_boolean_t downcase,
isc_buffer_t *target);
/*
@ -233,9 +236,9 @@ isc_result_t dns_rdata_fromwire(dns_rdata_t *rdata,
* Resource Limit: Not enough space
*/
isc_result_t dns_rdata_towire(dns_rdata_t *rdata,
dns_compress_t *cctx,
isc_buffer_t *target);
isc_result_t
dns_rdata_towire(dns_rdata_t *rdata, dns_compress_t *cctx,
isc_buffer_t *target);
/*
* Convert 'rdata' into wire format, compressing it as specified by the
* compression context 'cctx', and storing the result in 'target'.
@ -262,13 +265,11 @@ isc_result_t dns_rdata_towire(dns_rdata_t *rdata,
* Resource Limit: Not enough space
*/
isc_result_t dns_rdata_fromtext(dns_rdata_t *rdata,
dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer,
dns_name_t *origin,
isc_boolean_t downcase,
isc_buffer_t *target,
dns_rdatacallbacks_t *callbacks);
isc_result_t
dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target,
dns_rdatacallbacks_t *callbacks);
/*
* Convert the textual representation of a DNS rdata into uncompressed wire
* form stored in the target region. Tokens constituting the text of the rdata
@ -308,8 +309,8 @@ isc_result_t dns_rdata_fromtext(dns_rdata_t *rdata,
* Resource Limit: Not enough space
*/
isc_result_t dns_rdata_totext(dns_rdata_t *rdata, dns_name_t *origin,
isc_buffer_t *target);
isc_result_t
dns_rdata_totext(dns_rdata_t *rdata, dns_name_t *origin, isc_buffer_t *target);
/*
* Convert 'rdata' into text format, storing the result in 'target'.
* The text will consist of a single line, with fields separated by
@ -341,9 +342,9 @@ isc_result_t dns_rdata_totext(dns_rdata_t *rdata, dns_name_t *origin,
* Resource Limit: Not enough space
*/
isc_result_t dns_rdata_tofmttext(dns_rdata_t *rdata, dns_name_t *origin,
unsigned int flags, unsigned int width,
char *linebreak, isc_buffer_t *target);
isc_result_t
dns_rdata_tofmttext(dns_rdata_t *rdata, dns_name_t *origin, unsigned int flags,
unsigned int width, char *linebreak, isc_buffer_t *target);
/*
* Like dns_rdata_totext, but do formatted output suitable for
* database dumps. This is intended for use by dns_db_dump();
@ -367,11 +368,9 @@ isc_result_t dns_rdata_tofmttext(dns_rdata_t *rdata, dns_name_t *origin,
* output is selected.
*/
isc_result_t dns_rdata_fromstruct(dns_rdata_t *rdata,
dns_rdataclass_t rdclass,
dns_rdatatype_t type,
void *source,
isc_buffer_t *target);
isc_result_t
dns_rdata_fromstruct(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
dns_rdatatype_t type, void *source, isc_buffer_t *target);
/*
* Convert the C structure representation of an rdata into uncompressed wire
* format in 'target'.
@ -401,8 +400,8 @@ isc_result_t dns_rdata_fromstruct(dns_rdata_t *rdata,
* Resource Limit: Not enough space
*/
isc_result_t dns_rdata_tostruct(dns_rdata_t *rdata, void *target,
isc_mem_t *mctx);
isc_result_t
dns_rdata_tostruct(dns_rdata_t *rdata, void *target, isc_mem_t *mctx);
/*
* Convert an rdata into its C structure representation.
*
@ -421,8 +420,8 @@ isc_result_t dns_rdata_tostruct(dns_rdata_t *rdata, void *target,
* Resource Limit: Not enough memory
*/
void dns_rdata_freestruct(void *source);
void
dns_rdata_freestruct(void *source);
/*
* Free dynamic memory attached to 'source' (if any).
*
@ -432,7 +431,8 @@ void dns_rdata_freestruct(void *source);
* dns_rdata_tostruct().
*/
isc_boolean_t dns_rdatatype_ismeta(dns_rdatatype_t type);
isc_boolean_t
dns_rdatatype_ismeta(dns_rdatatype_t type);
/*
* Return true iff the rdata type 'type' is a meta-type
* like ANY or AXFR.
@ -442,7 +442,8 @@ isc_boolean_t dns_rdatatype_ismeta(dns_rdatatype_t type);
*
*/
isc_boolean_t dns_rdatatype_issingleton(dns_rdatatype_t type);
isc_boolean_t
dns_rdatatype_issingleton(dns_rdatatype_t type);
/*
* Return true iff the rdata type 'type' is a singleton type,
* like CNAME or SOA.
@ -452,7 +453,8 @@ isc_boolean_t dns_rdatatype_issingleton(dns_rdatatype_t type);
*
*/
isc_boolean_t dns_rdataclass_ismeta(dns_rdataclass_t rdclass);
isc_boolean_t
dns_rdataclass_ismeta(dns_rdataclass_t rdclass);
/*
* Return true iff the rdata class 'rdclass' is a meta-class
* like ANY or NONE.
@ -462,7 +464,8 @@ isc_boolean_t dns_rdataclass_ismeta(dns_rdataclass_t rdclass);
*
*/
isc_boolean_t dns_rdatatype_isdnssec(dns_rdatatype_t type);
isc_boolean_t
dns_rdatatype_isdnssec(dns_rdatatype_t type);
/*
* Return true iff 'type' is one of the DNSSEC
* rdata types that may exist alongside a CNAME record.
@ -471,7 +474,8 @@ isc_boolean_t dns_rdatatype_isdnssec(dns_rdatatype_t type);
* 'type' is a valid rdata type.
*/
isc_boolean_t dns_rdatatype_iszonecutauth(dns_rdatatype_t type);
isc_boolean_t
dns_rdatatype_iszonecutauth(dns_rdatatype_t type);
/*
* Return true iff rdata of type 'type' is considered authoritative
* data (not glue) in the NXT chain when it occurs in the parent zone
@ -482,7 +486,8 @@ isc_boolean_t dns_rdatatype_iszonecutauth(dns_rdatatype_t type);
*
*/
isc_boolean_t dns_rdatatype_isknown(dns_rdatatype_t type);
isc_boolean_t
dns_rdatatype_isknown(dns_rdatatype_t type);
/*
* Return true iff the rdata type 'type' is known.
*

8
lib/dns/include/dns/rdataclass.h
View file

@ -24,8 +24,8 @@
ISC_LANG_BEGINDECLS
isc_result_t dns_rdataclass_fromtext(dns_rdataclass_t *classp,
isc_textregion_t *source);
isc_result_t
dns_rdataclass_fromtext(dns_rdataclass_t *classp, isc_textregion_t *source);
/*
* Convert the text 'source' refers to into a DNS class.
*
@ -40,8 +40,8 @@ isc_result_t dns_rdataclass_fromtext(dns_rdataclass_t *classp,
* ISC_R_NOTIMPLEMENTED class is known, but not implemented
*/
isc_result_t dns_rdataclass_totext(dns_rdataclass_t rdclass,
isc_buffer_t *target);
isc_result_t
dns_rdataclass_totext(dns_rdataclass_t rdclass, isc_buffer_t *target);
/*
* Put a textual representation of class 'rdclass' into 'target'.
*

8
lib/dns/include/dns/rdatatype.h
View file

@ -24,8 +24,8 @@
ISC_LANG_BEGINDECLS
isc_result_t dns_rdatatype_fromtext(dns_rdatatype_t *typep,
isc_textregion_t *source);
isc_result_t
dns_rdatatype_fromtext(dns_rdatatype_t *typep, isc_textregion_t *source);
/*
* Convert the text 'source' refers to into a DNS rdata type.
*
@ -40,8 +40,8 @@ isc_result_t dns_rdatatype_fromtext(dns_rdatatype_t *typep,
* ISC_R_NOTIMPLEMENTED type is known, but not implemented
*/
isc_result_t dns_rdatatype_totext(dns_rdatatype_t type,
isc_buffer_t *target);
isc_result_t
dns_rdatatype_totext(dns_rdatatype_t type, isc_buffer_t *target);
/*
* Put a textual representation of type 'type' into 'target'.
*

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

@ -125,7 +125,7 @@
ISC_LANG_BEGINDECLS
char *
const char *
dns_result_totext(isc_result_t);
void

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

@ -227,7 +227,7 @@ typedef isc_result_t
(*dns_addrdatasetfunc_t)(void *, dns_name_t *, dns_rdataset_t *);
typedef isc_result_t
(*dns_additionaldatafunc_t)(void *, dns_name_t *, dns_rdatatype_t);
(*dns_additionaldatafunc_t)(void *, dns_name_t *, int);
typedef isc_result_t
(*dns_digestfunc_t)(void *, isc_region_t *);

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

@ -273,7 +273,7 @@ dns_zone_getdb(dns_zone_t *zone, dns_db_t **dbp);
*/
isc_result_t
dns_zone_setdbtype(dns_zone_t *zone, char *db_type);
dns_zone_setdbtype(dns_zone_t *zone, const char *db_type);
/*
* Sets the database type. Current database types are: "rbt", "rbt64".
* 'db_type' is not checked to see if it is a valid database type.

13
lib/dns/message.c
View file

@ -72,14 +72,14 @@
* Text representation of the different items, for message_totext
* functions.
*/
static char *sectiontext[] = {
static const char *sectiontext[] = {
"QUESTION",
"ANSWER",
"AUTHORITY",
"ADDITIONAL"
};
static char *opcodetext[] = {
static const char *opcodetext[] = {
"QUERY",
"IQUERY",
"STATUS",
@ -98,7 +98,7 @@ static char *opcodetext[] = {
"RESERVED15"
};
static char *rcodetext[] = {
static const char *rcodetext[] = {
"NOERROR",
"FORMERR",
"SERVFAIL",
@ -824,9 +824,12 @@ getrdata(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
if (msg->opcode == dns_opcode_update && rdatalen == 0) {
/*
* When the rdata is empty, the data pointer is never
* dereferenced, but it must still be non-NULL.
* dereferenced, but it must still be non-NULL. Casting
* 1 rather than "" avoids warnings about discarding
* the const attribute of a string, for compilers that
* would warn about such things.
*/
rdata->data = (unsigned char *)"";
rdata->data = (unsigned char *)1;
rdata->length = 0;
rdata->rdclass = rdclass;
rdata->type = rdtype;

159
lib/dns/name.c
View file

@ -132,7 +132,7 @@ static unsigned char maptolower[] = {
var = name->offsets; \
else { \
var = default; \
set_offsets(name, var, ISC_FALSE); \
set_offsets(name, var, NULL); \
}
/*
@ -155,58 +155,87 @@ do { \
((name->attributes & (DNS_NAMEATTR_READONLY|DNS_NAMEATTR_DYNAMIC)) \
== 0)
static struct dns_name root = {
DNS_NAME_MAGIC,
(unsigned char *)"", 1, 1,
DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE,
(unsigned char *)"", NULL,
{(void *)-1, (void *)-1},
{NULL, NULL}
/*
* This silliness is to avoid warnings about the const attribute of a string
* being discarded, as can happen (depending on the compiler and flags)
* when name.ndata or name.offsets is assigned to via a string literal.
* Unfortunately, gcc -Wwrite-strings produces incorrect warnings for
* assigning a const string to the ndata or offsets members in
* "const struct dns_name root", which (at least according to the ANSI
* Draft dated August 3, 1998) should have the effect of declaring all
* members of the struct as const.
*/
struct dns_constname {
dns_name_t name;
char const_ndata[2];
char const_offsets[1];
};
dns_name_t *dns_rootname = &root;
static struct dns_name wild = {
DNS_NAME_MAGIC,
(unsigned char *)"\001*", 2, 1,
DNS_NAMEATTR_READONLY,
(unsigned char *)"", NULL,
{(void *)-1, (void *)-1},
{NULL, NULL}
static struct dns_constname root = {
{
DNS_NAME_MAGIC,
root.const_ndata, 1, 1,
DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE,
root.const_offsets, NULL,
{(void *)-1, (void *)-1},
{NULL, NULL}
},
{ '\0', '\0' }, /* const_ndata */
{ '\0' } /* const_offsets */
};
dns_name_t *dns_wildcardname = &wild;
/* XXXDCL make const? */
dns_name_t *dns_rootname = &root.name;
static void set_offsets(dns_name_t *name, unsigned char *offsets,
isc_boolean_t want_set);
static void compact(dns_name_t *name, unsigned char *offsets);
static struct dns_constname wild = {
{
DNS_NAME_MAGIC,
wild.const_ndata, 2, 1,
DNS_NAMEATTR_READONLY,
wild.const_offsets, NULL,
{(void *)-1, (void *)-1},
{NULL, NULL}
},
{ '\001', '*' }, /* const_ndata */
{ '\0' } /* const_offsets */
};
/* XXXDCL make const? */
dns_name_t *dns_wildcardname = &wild.name;
static void
set_offsets(const dns_name_t *name, unsigned char *offsets,
dns_name_t *set_name);
static void
compact(dns_name_t *name, unsigned char *offsets);
/*
* Yes, get_bit and set_bit are lame. We define them here so they can
* be inlined by smart compilers.
*/
static unsigned int
get_bit(unsigned char *array, unsigned int index) {
static inline unsigned int
get_bit(unsigned char *array, unsigned int idx) {
unsigned int byte, shift;
byte = array[index / 8];
shift = 7 - (index % 8);
byte = array[idx / 8];
shift = 7 - (idx % 8);
return ((byte >> shift) & 0x01);
}
static void
set_bit(unsigned char *array, unsigned int index, unsigned int bit) {
static inline void
set_bit(unsigned char *array, unsigned int idx, unsigned int bit) {
unsigned int shift, mask;
shift = 7 - (index % 8);
shift = 7 - (idx % 8);
mask = 1 << shift;
if (bit != 0)
array[index / 8] |= mask;
array[idx / 8] |= mask;
else
array[index / 8] &= (~mask & 0xFF);
array[idx / 8] &= (~mask & 0xFF);
}
dns_labeltype_t
@ -321,7 +350,7 @@ dns_name_setbuffer(dns_name_t *name, isc_buffer_t *buffer) {
}
isc_boolean_t
dns_name_hasbuffer(dns_name_t *name) {
dns_name_hasbuffer(const dns_name_t *name) {
/*
* Does 'name' have a dedicated buffer?
*/
@ -335,7 +364,7 @@ dns_name_hasbuffer(dns_name_t *name) {
}
isc_boolean_t
dns_name_isabsolute(dns_name_t *name) {
dns_name_isabsolute(const dns_name_t *name) {
/*
* Does 'name' end in the root label?
@ -350,7 +379,7 @@ dns_name_isabsolute(dns_name_t *name) {
}
isc_boolean_t
dns_name_iswildcard(dns_name_t *name) {
dns_name_iswildcard(const dns_name_t *name) {
unsigned char *ndata;
/*
@ -370,7 +399,7 @@ dns_name_iswildcard(dns_name_t *name) {
}
isc_boolean_t
dns_name_requiresedns(dns_name_t *name) {
dns_name_requiresedns(const dns_name_t *name) {
unsigned int count, nrem;
unsigned char *ndata;
isc_boolean_t requiresedns = ISC_FALSE;
@ -455,7 +484,7 @@ dns_name_hash(dns_name_t *name, isc_boolean_t case_sensitive) {
}
dns_namereln_t
dns_name_fullcompare(dns_name_t *name1, dns_name_t *name2,
dns_name_fullcompare(const dns_name_t *name1, const dns_name_t *name2,
int *orderp,
unsigned int *nlabelsp, unsigned int *nbitsp)
{
@ -651,7 +680,7 @@ dns_name_fullcompare(dns_name_t *name1, dns_name_t *name2,
}
int
dns_name_compare(dns_name_t *name1, dns_name_t *name2) {
dns_name_compare(const dns_name_t *name1, const dns_name_t *name2) {
int order;
unsigned int nlabels, nbits;
@ -671,7 +700,7 @@ dns_name_compare(dns_name_t *name1, dns_name_t *name2) {
}
isc_boolean_t
dns_name_equal(dns_name_t *name1, dns_name_t *name2) {
dns_name_equal(const dns_name_t *name1, const dns_name_t *name2) {
unsigned int l, count;
unsigned char c;
unsigned char *label1, *label2;
@ -739,7 +768,7 @@ dns_name_equal(dns_name_t *name1, dns_name_t *name2) {
}
int
dns_name_rdatacompare(dns_name_t *name1, dns_name_t *name2) {
dns_name_rdatacompare(const dns_name_t *name1, const dns_name_t *name2) {
unsigned int l1, l2, l, count1, count2, count;
unsigned char c1, c2;
unsigned char *label1, *label2;
@ -819,7 +848,7 @@ dns_name_rdatacompare(dns_name_t *name1, dns_name_t *name2) {
}
isc_boolean_t
dns_name_issubdomain(dns_name_t *name1, dns_name_t *name2) {
dns_name_issubdomain(const dns_name_t *name1, const dns_name_t *name2) {
int order;
unsigned int nlabels, nbits;
dns_namereln_t namereln;
@ -843,7 +872,7 @@ dns_name_issubdomain(dns_name_t *name1, dns_name_t *name2) {
}
isc_boolean_t
dns_name_matcheswildcard(dns_name_t *name, dns_name_t *wname) {
dns_name_matcheswildcard(const dns_name_t *name, const dns_name_t *wname) {
int order;
unsigned int nlabels, nbits, labels;
dns_name_t tname;
@ -864,7 +893,7 @@ dns_name_matcheswildcard(dns_name_t *name, dns_name_t *wname) {
}
unsigned int
dns_name_depth(dns_name_t *name) {
dns_name_depth(const dns_name_t *name) {
unsigned int depth, count, nrem, n;
unsigned char *ndata;
@ -908,7 +937,7 @@ dns_name_depth(dns_name_t *name) {
}
unsigned int
dns_name_countlabels(dns_name_t *name) {
dns_name_countlabels(const dns_name_t *name) {
/*
* How many labels does 'name' have?
*/
@ -921,7 +950,7 @@ dns_name_countlabels(dns_name_t *name) {
}
void
dns_name_getlabel(dns_name_t *name, unsigned int n, dns_label_t *label) {
dns_name_getlabel(const dns_name_t *name, unsigned int n, dns_label_t *label) {
unsigned char *offsets;
dns_offsets_t odata;
@ -944,7 +973,7 @@ dns_name_getlabel(dns_name_t *name, unsigned int n, dns_label_t *label) {
}
void
dns_name_getlabelsequence(dns_name_t *source,
dns_name_getlabelsequence(const dns_name_t *source,
unsigned int first, unsigned int n,
dns_name_t *target)
{
@ -986,7 +1015,7 @@ dns_name_getlabelsequence(dns_name_t *source,
*/
if (target->offsets != NULL &&
(target != source || first != 0))
set_offsets(target, target->offsets, ISC_FALSE);
set_offsets(target, target->offsets, NULL);
}
void
@ -1004,14 +1033,14 @@ dns_name_clone(dns_name_t *source, dns_name_t *target) {
target->length = source->length;
target->labels = source->labels;
target->attributes = source->attributes &
~(DNS_NAMEATTR_READONLY | DNS_NAMEATTR_DYNAMIC |
DNS_NAMEATTR_DYNOFFSETS);
(unsigned int)~(DNS_NAMEATTR_READONLY | DNS_NAMEATTR_DYNAMIC |
DNS_NAMEATTR_DYNOFFSETS);
if (target->offsets != NULL && source->labels > 0) {
if (source->offsets != NULL)
memcpy(target->offsets, source->offsets,
source->labels);
else
set_offsets(target, target->offsets, ISC_FALSE);
set_offsets(target, target->offsets, NULL);
}
}
@ -1047,7 +1076,7 @@ dns_name_fromregion(dns_name_t *name, isc_region_t *r) {
}
if (r->length > 0)
set_offsets(name, offsets, ISC_TRUE);
set_offsets(name, offsets, name);
else {
name->labels = 0;
name->attributes &= ~DNS_NAMEATTR_ABSOLUTE;
@ -1902,7 +1931,7 @@ dns_name_downcase(dns_name_t *source, dns_name_t *name, isc_buffer_t *target) {
else
name->attributes = 0;
if (name->labels > 0 && name->offsets != NULL)
set_offsets(name, name->offsets, ISC_FALSE);
set_offsets(name, name->offsets, NULL);
}
isc_buffer_add(target, name->length);
@ -1911,7 +1940,9 @@ dns_name_downcase(dns_name_t *source, dns_name_t *name, isc_buffer_t *target) {
}
static void
set_offsets(dns_name_t *name, unsigned char *offsets, isc_boolean_t want_set) {
set_offsets(const dns_name_t *name, unsigned char *offsets,
dns_name_t *set_name)
{
unsigned int offset, count, length, nlabels, n;
unsigned char *ndata;
isc_boolean_t absolute;
@ -1948,13 +1979,15 @@ set_offsets(dns_name_t *name, unsigned char *offsets, isc_boolean_t want_set) {
INSIST(offset <= length);
}
}
if (want_set) {
name->labels = nlabels;
name->length = offset;
if (set_name != NULL) {
INSIST(set_name == name);
set_name->labels = nlabels;
set_name->length = offset;
if (absolute)
name->attributes |= DNS_NAMEATTR_ABSOLUTE;
set_name->attributes |= DNS_NAMEATTR_ABSOLUTE;
else
name->attributes &= ~DNS_NAMEATTR_ABSOLUTE;
set_name->attributes &= ~DNS_NAMEATTR_ABSOLUTE;
}
INSIST(nlabels == name->labels);
INSIST(offset == name->length);
@ -2096,7 +2129,7 @@ compact(dns_name_t *name, unsigned char *offsets) {
/*
* The offsets table may now be invalid.
*/
set_offsets(name, offsets, ISC_FALSE);
set_offsets(name, offsets, NULL);
goto again;
}
}
@ -2286,7 +2319,7 @@ dns_name_fromwire(dns_name_t *name, isc_buffer_t *source,
* We should build the offsets table directly.
*/
if (name->offsets != NULL || saw_bitstring)
set_offsets(name, offsets, ISC_FALSE);
set_offsets(name, offsets, NULL);
if (saw_bitstring)
compact(name, offsets);
@ -2518,7 +2551,7 @@ dns_name_concatenate(dns_name_t *prefix, dns_name_t *suffix, dns_name_t *name,
if (name->labels > 0 && (name->offsets != NULL || saw_bitstring)) {
INIT_OFFSETS(name, offsets, odata);
set_offsets(name, offsets, ISC_FALSE);
set_offsets(name, offsets, NULL);
if (saw_bitstring)
compact(name, offsets);
}
@ -2677,7 +2710,7 @@ dns_name_split(dns_name_t *name,
INSIST(len = prefix->length);
INIT_OFFSETS(prefix, splitoffsets, split_odata);
set_offsets(prefix, splitoffsets, ISC_TRUE);
set_offsets(prefix, splitoffsets, prefix);
INSIST(prefix->labels == splitlabel + 1 &&
prefix->length == len);
@ -2778,7 +2811,7 @@ dns_name_split(dns_name_t *name,
INSIST(len = suffix->length);
INIT_OFFSETS(suffix, splitoffsets, split_odata);
set_offsets(suffix, splitoffsets, ISC_TRUE);
set_offsets(suffix, splitoffsets, suffix);
INSIST(suffix->labels == suffixlabels &&
suffix->length == len);
@ -2892,7 +2925,7 @@ dns_name_dup(dns_name_t *source, isc_mem_t *mctx, dns_name_t *target) {
memcpy(target->offsets, source->offsets,
source->labels);
else
set_offsets(target, target->offsets, ISC_FALSE);
set_offsets(target, target->offsets, NULL);
}
return (ISC_R_SUCCESS);
@ -2934,7 +2967,7 @@ dns_name_dupwithoffsets(dns_name_t *source, isc_mem_t *mctx,
if (source->offsets != NULL)
memcpy(target->offsets, source->offsets, source->labels);
else
set_offsets(target, target->offsets, ISC_FALSE);
set_offsets(target, target->offsets, NULL);
return (ISC_R_SUCCESS);
}

66
lib/dns/rdata.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: rdata.c,v 1.97 2000/05/25 00:46:28 bwelling Exp $ */
/* $Id: rdata.c,v 1.98 2000/06/01 18:25:34 tale Exp $ */
#include <config.h>
#include <ctype.h>
@ -47,6 +47,34 @@
return (_r); \
} while (0)
#define ARGS_FROMTEXT int rdclass, int type, \
isc_lex_t *lexer, dns_name_t *origin, \
isc_boolean_t downcase, isc_buffer_t *target
#define ARGS_TOTEXT dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, \
isc_buffer_t *target
#define ARGS_FROMWIRE int rdclass, int type, \
isc_buffer_t *source, dns_decompress_t *dctx, \
isc_boolean_t downcase, isc_buffer_t *target
#define ARGS_TOWIRE dns_rdata_t *rdata, dns_compress_t *cctx, \
isc_buffer_t *target
#define ARGS_COMPARE const dns_rdata_t *rdata1, const dns_rdata_t *rdata2
#define ARGS_FROMSTRUCT int rdclass, int type, \
void *source, isc_buffer_t *target
#define ARGS_TOSTRUCT dns_rdata_t *rdata, void *target, isc_mem_t *mctx
#define ARGS_FREESTRUCT void *source
#define ARGS_ADDLDATA dns_rdata_t *rdata, dns_additionaldatafunc_t add, \
void *arg
#define ARGS_DIGEST dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg
/*
* Context structure for the totext_ functions.
* Contains formatting options for rdata-to-text
@ -56,7 +84,7 @@ typedef struct dns_rdata_textctx {
dns_name_t *origin; /* Current origin, or NULL. */
unsigned int flags; /* DNS_STYLEFLAG_* */
unsigned int width; /* Width of rdata column. */
char *linebreak; /* Line break string. */
const char *linebreak; /* Line break string. */
} dns_rdata_textctx_t;
static isc_result_t
@ -75,7 +103,7 @@ static unsigned int
name_length(dns_name_t *name);
static isc_result_t
str_totext(char *source, isc_buffer_t *target);
str_totext(const char *source, isc_buffer_t *target);
static isc_boolean_t
buffer_empty(isc_buffer_t *source);
@ -127,12 +155,12 @@ static isc_result_t
atob_tobuffer(isc_lex_t *lexer, isc_buffer_t *target);
static void
default_fromtext_callback(dns_rdatacallbacks_t *callbacks, char *, ...);
default_fromtext_callback(dns_rdatacallbacks_t *callbacks, const char *, ...);
static void
fromtext_error(void (*callback)(dns_rdatacallbacks_t *, char *, ...),
dns_rdatacallbacks_t *callbacks, char *name, unsigned long line,
isc_token_t *token, isc_result_t result);
fromtext_error(void (*callback)(dns_rdatacallbacks_t *, const char *, ...),
dns_rdatacallbacks_t *callbacks, const char *name,
unsigned long line, isc_token_t *token, isc_result_t result);
static isc_result_t
rdata_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
@ -230,8 +258,8 @@ static const char decdigits[] = "0123456789";
struct tbl {
unsigned int value;
char *name;
int flags;
const char *name;
int flags;
};
static struct tbl rcodes[] = { RCODENAMES ERCODENAMES };
@ -241,7 +269,7 @@ static struct tbl secalgs[] = { SECALGNAMES };
static struct tbl secprotos[] = { SECPROTONAMES };
static struct keyflag {
char *name;
const char *name;
unsigned int value;
unsigned int mask;
} keyflags[] = {
@ -301,7 +329,7 @@ dns_rdata_init(dns_rdata_t *rdata) {
***/
int
dns_rdata_compare(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
dns_rdata_compare(const dns_rdata_t *rdata1, const dns_rdata_t *rdata2) {
int result = 0;
isc_boolean_t use_default = ISC_FALSE;
@ -348,7 +376,7 @@ dns_rdata_fromregion(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
}
void
dns_rdata_toregion(dns_rdata_t *rdata, isc_region_t *r) {
dns_rdata_toregion(const dns_rdata_t *rdata, isc_region_t *r) {
REQUIRE(rdata != NULL);
REQUIRE(r != NULL);
@ -445,7 +473,7 @@ dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
ISC_LEXOPT_DNSMULTILINE | ISC_LEXOPT_ESCAPE;
char *name;
unsigned long line;
void (*callback)(dns_rdatacallbacks_t *, char *, ...);
void (*callback)(dns_rdatacallbacks_t *, const char *, ...);
isc_result_t iresult;
REQUIRE(origin == NULL || dns_name_isabsolute(origin) == ISC_TRUE);
@ -1163,7 +1191,7 @@ return_false:
}
static isc_result_t
str_totext(char *source, isc_buffer_t *target) {
str_totext(const char *source, isc_buffer_t *target) {
unsigned int l;
isc_region_t region;
@ -1625,7 +1653,9 @@ btoa_totext(unsigned char *inbuf, int inbuflen, isc_buffer_t *target) {
static void
default_fromtext_callback(dns_rdatacallbacks_t *callbacks, char *fmt, ...) {
default_fromtext_callback(dns_rdatacallbacks_t *callbacks, const char *fmt,
...)
{
va_list ap;
UNUSED(callbacks);
@ -1636,9 +1666,9 @@ default_fromtext_callback(dns_rdatacallbacks_t *callbacks, char *fmt, ...) {
}
static void
fromtext_error(void (*callback)(dns_rdatacallbacks_t *, char *, ...),
dns_rdatacallbacks_t *callbacks, char *name, unsigned long line,
isc_token_t *token, isc_result_t result)
fromtext_error(void (*callback)(dns_rdatacallbacks_t *, const char *, ...),
dns_rdatacallbacks_t *callbacks, const char *name,
unsigned long line, isc_token_t *token, isc_result_t result)
{
if (name == NULL)
name = "UNKNOWN";

36
lib/dns/rdata/any_255/tsig_250.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: tsig_250.c,v 1.40 2000/06/01 16:47:25 gson Exp $ */
/* $Id: tsig_250.c,v 1.41 2000/06/01 18:26:01 tale Exp $ */
/* Reviewed: Thu Mar 16 13:39:43 PST 2000 by gson */
@ -26,10 +26,7 @@
(DNS_RDATATYPEATTR_META | DNS_RDATATYPEATTR_NOTQUESTION)
static inline isc_result_t
fromtext_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_any_tsig(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_uint64_t sigtime;
@ -122,9 +119,7 @@ fromtext_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_any_tsig(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_any_tsig(ARGS_TOTEXT) {
isc_region_t sr;
isc_region_t sigr;
char buf[sizeof "281474976710655 "];
@ -236,10 +231,7 @@ totext_any_tsig(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_any_tsig(ARGS_FROMWIRE) {
isc_region_t sr;
dns_name_t name;
unsigned long n;
@ -299,9 +291,7 @@ fromwire_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_any_tsig(dns_rdata_t *rdata, dns_compress_t *cctx,
isc_buffer_t *target)
{
towire_any_tsig(ARGS_TOWIRE) {
isc_region_t sr;
dns_name_t name;
@ -318,7 +308,7 @@ towire_any_tsig(dns_rdata_t *rdata, dns_compress_t *cctx,
}
static inline int
compare_any_tsig(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_any_tsig(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
dns_name_t name1;
@ -345,9 +335,7 @@ compare_any_tsig(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type,
void *source, isc_buffer_t *target)
{
fromstruct_any_tsig(ARGS_FROMSTRUCT) {
dns_rdata_any_tsig_t *tsig = source;
isc_region_t tr;
@ -415,7 +403,7 @@ fromstruct_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
tostruct_any_tsig(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_any_tsig(ARGS_TOSTRUCT) {
dns_rdata_any_tsig_t *tsig;
dns_name_t alg;
isc_region_t sr;
@ -515,7 +503,7 @@ tostruct_any_tsig(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_any_tsig(void *source) {
freestruct_any_tsig(ARGS_FREESTRUCT) {
dns_rdata_any_tsig_t *tsig = (dns_rdata_any_tsig_t *) source;
REQUIRE(source != NULL);
@ -534,9 +522,7 @@ freestruct_any_tsig(void *source) {
}
static inline isc_result_t
additionaldata_any_tsig(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_any_tsig(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 250);
REQUIRE(rdata->rdclass == 255);
@ -548,7 +534,7 @@ additionaldata_any_tsig(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_any_tsig(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_any_tsig(ARGS_DIGEST) {
REQUIRE(rdata->type == 250);
REQUIRE(rdata->rdclass == 255);

34
lib/dns/rdata/generic/afsdb_18.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: afsdb_18.c,v 1.28 2000/05/22 12:37:29 marka Exp $ */
/* $Id: afsdb_18.c,v 1.29 2000/06/01 18:26:03 tale Exp $ */
/* Reviewed: Wed Mar 15 14:59:00 PST 2000 by explorer */
@ -27,10 +27,7 @@
#define RRTYPE_AFSDB_ATTRIBUTES (0)
static inline isc_result_t
fromtext_afsdb(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_afsdb(ARGS_FROMTEXT) {
isc_token_t token;
isc_buffer_t buffer;
dns_name_t name;
@ -58,9 +55,7 @@ fromtext_afsdb(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_afsdb(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_afsdb(ARGS_TOTEXT) {
dns_name_t name;
dns_name_t prefix;
isc_region_t region;
@ -84,10 +79,7 @@ totext_afsdb(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_afsdb(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_afsdb(ARGS_FROMWIRE) {
dns_name_t name;
isc_region_t sr;
isc_region_t tr;
@ -113,7 +105,7 @@ fromwire_afsdb(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_afsdb(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_afsdb(ARGS_TOWIRE) {
isc_region_t tr;
isc_region_t sr;
dns_name_t name;
@ -136,7 +128,7 @@ towire_afsdb(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_afsdb(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_afsdb(ARGS_COMPARE) {
int result;
dns_name_t name1;
dns_name_t name2;
@ -167,9 +159,7 @@ compare_afsdb(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_afsdb(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_afsdb(ARGS_FROMSTRUCT) {
dns_rdata_afsdb_t *afsdb = source;
isc_region_t region;
@ -184,7 +174,7 @@ fromstruct_afsdb(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_afsdb(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_afsdb(ARGS_TOSTRUCT) {
isc_region_t region;
dns_rdata_afsdb_t *afsdb = target;
dns_name_t name;
@ -212,7 +202,7 @@ tostruct_afsdb(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_afsdb(void *source) {
freestruct_afsdb(ARGS_FREESTRUCT) {
dns_rdata_afsdb_t *afsdb = source;
REQUIRE(source != NULL);
@ -226,9 +216,7 @@ freestruct_afsdb(void *source) {
}
static inline isc_result_t
additionaldata_afsdb(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_afsdb(ARGS_ADDLDATA) {
dns_name_t name;
isc_region_t region;
@ -243,7 +231,7 @@ additionaldata_afsdb(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_afsdb(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_afsdb(ARGS_DIGEST) {
isc_region_t r1, r2;
dns_name_t name;

38
lib/dns/rdata/generic/cert_37.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: cert_37.c,v 1.29 2000/05/22 12:37:30 marka Exp $ */
/* $Id: cert_37.c,v 1.30 2000/06/01 18:26:04 tale Exp $ */
/* Reviewed: Wed Mar 15 21:14:32 EST 2000 by tale */
@ -27,10 +27,7 @@
#define RRTYPE_CERT_ATTRIBUTES (0)
static inline isc_result_t
fromtext_cert(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_cert(ARGS_FROMTEXT) {
isc_token_t token;
dns_secalg_t secalg;
dns_cert_t cert;
@ -67,9 +64,7 @@ fromtext_cert(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_cert(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_cert(ARGS_TOTEXT) {
isc_region_t sr;
char buf[sizeof "64000 "];
unsigned int n;
@ -116,10 +111,7 @@ totext_cert(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_cert(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_cert(ARGS_FROMWIRE) {
isc_region_t sr;
REQUIRE(type == 37);
@ -137,7 +129,7 @@ fromwire_cert(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_cert(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_cert(ARGS_TOWIRE) {
isc_region_t sr;
REQUIRE(rdata->type == 37);
@ -149,7 +141,7 @@ towire_cert(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_cert(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_cert(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
@ -163,9 +155,7 @@ compare_cert(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_cert(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_cert(ARGS_FROMSTRUCT) {
dns_rdata_cert_t *cert = source;
REQUIRE(type == 37);
@ -181,7 +171,7 @@ fromstruct_cert(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_cert(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_cert(ARGS_TOSTRUCT) {
dns_rdata_cert_t *cert = target;
isc_region_t region;
@ -215,10 +205,10 @@ tostruct_cert(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_cert(void *target) {
dns_rdata_cert_t *cert = target;
freestruct_cert(ARGS_FREESTRUCT) {
dns_rdata_cert_t *cert = source;
REQUIRE(target != NULL && target != NULL);
REQUIRE(cert != NULL);
REQUIRE(cert->common.rdtype == 37);
if (cert->mctx == NULL)
@ -230,9 +220,7 @@ freestruct_cert(void *target) {
}
static inline isc_result_t
additionaldata_cert(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_cert(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 37);
UNUSED(rdata);
@ -243,7 +231,7 @@ additionaldata_cert(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_cert(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_cert(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == 37);

39
lib/dns/rdata/generic/cname_5.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: cname_5.c,v 1.31 2000/05/24 05:09:26 tale Exp $ */
/* $Id: cname_5.c,v 1.32 2000/06/01 18:26:05 tale Exp $ */
/* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
@ -26,10 +26,7 @@
(DNS_RDATATYPEATTR_EXCLUSIVE | DNS_RDATATYPEATTR_SINGLETON)
static inline isc_result_t
fromtext_cname(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_cname(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -47,9 +44,7 @@ fromtext_cname(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_cname(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_cname(ARGS_TOTEXT) {
isc_region_t region;
dns_name_t name;
dns_name_t prefix;
@ -69,10 +64,7 @@ totext_cname(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_cname(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_cname(ARGS_FROMWIRE) {
dns_name_t name;
REQUIRE(type == 5);
@ -86,8 +78,7 @@ fromwire_cname(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_cname(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
{
towire_cname(ARGS_TOWIRE) {
dns_name_t name;
isc_region_t region;
@ -103,8 +94,7 @@ towire_cname(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
}
static inline int
compare_cname(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
{
compare_cname(ARGS_COMPARE) {
dns_name_t name1;
dns_name_t name2;
isc_region_t region1;
@ -127,9 +117,7 @@ compare_cname(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
}
static inline isc_result_t
fromstruct_cname(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_cname(ARGS_FROMSTRUCT) {
dns_rdata_cname_t *cname = source;
isc_region_t region;
@ -143,8 +131,7 @@ fromstruct_cname(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_cname(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
{
tostruct_cname(ARGS_TOSTRUCT) {
isc_region_t region;
dns_rdata_cname_t *cname = target;
dns_name_t name;
@ -166,8 +153,7 @@ tostruct_cname(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
}
static inline void
freestruct_cname(void *source)
{
freestruct_cname(ARGS_FREESTRUCT) {
dns_rdata_cname_t *cname = source;
REQUIRE(source != NULL);
@ -180,9 +166,7 @@ freestruct_cname(void *source)
}
static inline isc_result_t
additionaldata_cname(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_cname(ARGS_ADDLDATA) {
UNUSED(rdata);
UNUSED(add);
UNUSED(arg);
@ -193,8 +177,7 @@ additionaldata_cname(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_cname(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg)
{
digest_cname(ARGS_DIGEST) {
isc_region_t r;
dns_name_t name;

39
lib/dns/rdata/generic/dname_39.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: dname_39.c,v 1.22 2000/05/22 12:37:32 marka Exp $ */
/* $Id: dname_39.c,v 1.23 2000/06/01 18:26:07 tale Exp $ */
/* Reviewed: Wed Mar 15 16:52:38 PST 2000 by explorer */
@ -27,10 +27,7 @@
#define RRTYPE_DNAME_ATTRIBUTES (DNS_RDATATYPEATTR_SINGLETON)
static inline isc_result_t
fromtext_dname(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_dname(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -48,9 +45,7 @@ fromtext_dname(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_dname(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_dname(ARGS_TOTEXT) {
isc_region_t region;
dns_name_t name;
dns_name_t prefix;
@ -70,10 +65,7 @@ totext_dname(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_dname(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_dname(ARGS_FROMWIRE) {
dns_name_t name;
UNUSED(rdclass);
@ -87,8 +79,7 @@ fromwire_dname(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_dname(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
{
towire_dname(ARGS_TOWIRE) {
dns_name_t name;
isc_region_t region;
@ -103,8 +94,7 @@ towire_dname(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
}
static inline int
compare_dname(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
{
compare_dname(ARGS_COMPARE) {
dns_name_t name1;
dns_name_t name2;
isc_region_t region1;
@ -127,9 +117,7 @@ compare_dname(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
}
static inline isc_result_t
fromstruct_dname(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_dname(ARGS_FROMSTRUCT) {
dns_rdata_dname_t *dname = source;
isc_region_t region;
@ -143,8 +131,7 @@ fromstruct_dname(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_dname(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
{
tostruct_dname(ARGS_TOSTRUCT) {
isc_region_t region;
dns_rdata_dname_t *dname = target;
dns_name_t name;
@ -166,8 +153,7 @@ tostruct_dname(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
}
static inline void
freestruct_dname(void *source)
{
freestruct_dname(ARGS_FREESTRUCT) {
dns_rdata_dname_t *dname = source;
REQUIRE(source != NULL);
@ -181,9 +167,7 @@ freestruct_dname(void *source)
}
static inline isc_result_t
additionaldata_dname(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_dname(ARGS_ADDLDATA) {
UNUSED(rdata);
UNUSED(add);
UNUSED(arg);
@ -194,8 +178,7 @@ additionaldata_dname(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_dname(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg)
{
digest_dname(ARGS_DIGEST) {
isc_region_t r;
dns_name_t name;

39
lib/dns/rdata/generic/gpos_27.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: gpos_27.c,v 1.21 2000/05/24 05:09:27 tale Exp $ */
/* $Id: gpos_27.c,v 1.22 2000/06/01 18:26:08 tale Exp $ */
/* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
@ -27,10 +27,7 @@
#define RRTYPE_GPOS_ATTRIBUTES (0)
static inline isc_result_t
fromtext_gpos(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_gpos(ARGS_FROMTEXT) {
isc_token_t token;
int i;
@ -49,9 +46,7 @@ fromtext_gpos(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_gpos(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_gpos(ARGS_TOTEXT) {
isc_region_t region;
int i;
@ -71,10 +66,7 @@ totext_gpos(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_gpos(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_gpos(ARGS_FROMWIRE) {
int i;
REQUIRE(type == 27);
@ -89,8 +81,7 @@ fromwire_gpos(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_gpos(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
{
towire_gpos(ARGS_TOWIRE) {
REQUIRE(rdata->type == 27);
@ -100,8 +91,7 @@ towire_gpos(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
}
static inline int
compare_gpos(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
{
compare_gpos(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
@ -115,9 +105,7 @@ compare_gpos(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
}
static inline isc_result_t
fromstruct_gpos(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_gpos(ARGS_FROMSTRUCT) {
dns_rdata_gpos_t *gpos = source;
REQUIRE(type == 27);
@ -134,8 +122,7 @@ fromstruct_gpos(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_gpos(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
{
tostruct_gpos(ARGS_TOSTRUCT) {
dns_rdata_gpos_t *gpos = target;
isc_region_t region;
@ -193,8 +180,7 @@ tostruct_gpos(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
}
static inline void
freestruct_gpos(void *source)
{
freestruct_gpos(ARGS_FREESTRUCT) {
dns_rdata_gpos_t *gpos = source;
REQUIRE(source != NULL);
@ -213,9 +199,7 @@ freestruct_gpos(void *source)
}
static inline isc_result_t
additionaldata_gpos(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_gpos(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 27);
UNUSED(rdata);
@ -226,8 +210,7 @@ additionaldata_gpos(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_gpos(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg)
{
digest_gpos(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == 27);

34
lib/dns/rdata/generic/hinfo_13.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: hinfo_13.c,v 1.25 2000/05/22 12:37:34 marka Exp $ */
/* $Id: hinfo_13.c,v 1.26 2000/06/01 18:26:09 tale Exp $ */
/*
* Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
@ -27,10 +27,7 @@
#define RRTYPE_HINFO_ATTRIBUTES (0)
static inline isc_result_t
fromtext_hinfo(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_hinfo(ARGS_FROMTEXT) {
isc_token_t token;
int i;
@ -49,9 +46,7 @@ fromtext_hinfo(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_hinfo(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_hinfo(ARGS_TOTEXT) {
isc_region_t region;
UNUSED(tctx);
@ -65,10 +60,7 @@ totext_hinfo(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_hinfo(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_hinfo(ARGS_FROMWIRE) {
UNUSED(dctx);
UNUSED(rdclass);
@ -81,7 +73,7 @@ fromwire_hinfo(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_hinfo(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_hinfo(ARGS_TOWIRE) {
UNUSED(cctx);
@ -91,7 +83,7 @@ towire_hinfo(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_hinfo(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_hinfo(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
@ -105,9 +97,7 @@ compare_hinfo(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_hinfo(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_hinfo(ARGS_FROMSTRUCT) {
dns_rdata_hinfo_t *hinfo = source;
REQUIRE(type == 13);
@ -122,7 +112,7 @@ fromstruct_hinfo(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_hinfo(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_hinfo(ARGS_TOSTRUCT) {
dns_rdata_hinfo_t *hinfo = target;
isc_region_t region;
@ -162,7 +152,7 @@ tostruct_hinfo(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_hinfo(void *source) {
freestruct_hinfo(ARGS_FREESTRUCT) {
dns_rdata_hinfo_t *hinfo = source;
REQUIRE(source != NULL);
@ -178,9 +168,7 @@ freestruct_hinfo(void *source) {
}
static inline isc_result_t
additionaldata_hinfo(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_hinfo(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 13);
UNUSED(add);
@ -191,7 +179,7 @@ additionaldata_hinfo(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_hinfo(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_hinfo(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == 13);

34
lib/dns/rdata/generic/isdn_20.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: isdn_20.c,v 1.19 2000/05/22 12:37:36 marka Exp $ */
/* $Id: isdn_20.c,v 1.20 2000/06/01 18:26:10 tale Exp $ */
/* Reviewed: Wed Mar 15 16:53:11 PST 2000 by bwelling */
@ -27,10 +27,7 @@
#define RRTYPE_ISDN_ATTRIBUTES (0)
static inline isc_result_t
fromtext_isdn(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_isdn(ARGS_FROMTEXT) {
isc_token_t token;
UNUSED(rdclass);
@ -54,9 +51,7 @@ fromtext_isdn(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_isdn(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_isdn(ARGS_TOTEXT) {
isc_region_t region;
UNUSED(tctx);
@ -72,10 +67,7 @@ totext_isdn(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_isdn(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_isdn(ARGS_FROMWIRE) {
UNUSED(dctx);
UNUSED(rdclass);
UNUSED(downcase);
@ -89,7 +81,7 @@ fromwire_isdn(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_isdn(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_isdn(ARGS_TOWIRE) {
UNUSED(cctx);
REQUIRE(rdata->type == 20);
@ -98,7 +90,7 @@ towire_isdn(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_isdn(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_isdn(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
@ -112,9 +104,7 @@ compare_isdn(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_isdn(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_isdn(ARGS_FROMSTRUCT) {
dns_rdata_isdn_t *isdn = source;
REQUIRE(type == 20);
@ -129,7 +119,7 @@ fromstruct_isdn(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_isdn(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_isdn(ARGS_TOSTRUCT) {
dns_rdata_isdn_t *isdn = target;
isc_region_t r;
@ -172,7 +162,7 @@ tostruct_isdn(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_isdn(void *source) {
freestruct_isdn(ARGS_FREESTRUCT) {
dns_rdata_isdn_t *isdn = source;
REQUIRE(source != NULL);
@ -188,9 +178,7 @@ freestruct_isdn(void *source) {
}
static inline isc_result_t
additionaldata_isdn(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_isdn(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 20);
UNUSED(rdata);
@ -201,7 +189,7 @@ additionaldata_isdn(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_isdn(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_isdn(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == 20);

34
lib/dns/rdata/generic/key_25.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: key_25.c,v 1.25 2000/05/22 12:37:37 marka Exp $ */
/* $Id: key_25.c,v 1.26 2000/06/01 18:26:11 tale Exp $ */
/*
* Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
@ -29,10 +29,7 @@
#define RRTYPE_KEY_ATTRIBUTES (DNS_RDATATYPEATTR_DNSSEC)
static inline isc_result_t
fromtext_key(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_key(ARGS_FROMTEXT) {
isc_token_t token;
dns_secalg_t alg;
dns_secproto_t proto;
@ -67,9 +64,7 @@ fromtext_key(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_key(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_key(ARGS_TOTEXT) {
isc_region_t sr;
char buf[sizeof "64000"];
unsigned int flags;
@ -115,10 +110,7 @@ totext_key(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_key(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_key(ARGS_FROMWIRE) {
isc_region_t sr;
UNUSED(rdclass);
@ -136,7 +128,7 @@ fromwire_key(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_key(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_key(ARGS_TOWIRE) {
isc_region_t sr;
UNUSED(cctx);
@ -148,7 +140,7 @@ towire_key(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_key(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_key(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
@ -162,9 +154,7 @@ compare_key(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_key(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_key(ARGS_FROMSTRUCT) {
dns_rdata_key_t *key = source;
REQUIRE(type == 25);
@ -186,7 +176,7 @@ fromstruct_key(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_key(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_key(ARGS_TOSTRUCT) {
dns_rdata_key_t *key = target;
isc_region_t sr;
@ -231,7 +221,7 @@ tostruct_key(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_key(void *source) {
freestruct_key(ARGS_FREESTRUCT) {
dns_rdata_key_t *key = (dns_rdata_key_t *) source;
REQUIRE(source != NULL);
@ -246,9 +236,7 @@ freestruct_key(void *source) {
}
static inline isc_result_t
additionaldata_key(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_key(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 25);
UNUSED(rdata);
@ -259,7 +247,7 @@ additionaldata_key(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_key(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_key(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == 25);

33
lib/dns/rdata/generic/loc_29.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: loc_29.c,v 1.20 2000/05/22 12:37:38 marka Exp $ */
/* $Id: loc_29.c,v 1.21 2000/06/01 18:26:13 tale Exp $ */
/* Reviewed: Wed Mar 15 18:13:09 PST 2000 by explorer */
@ -27,10 +27,7 @@
#define RRTYPE_LOC_ATTRIBUTES (0)
static inline isc_result_t
fromtext_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_loc(ARGS_FROMTEXT) {
isc_token_t token;
int d1, m1, s1;
int d2, m2, s2;
@ -414,9 +411,7 @@ fromtext_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_loc(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_loc(ARGS_TOTEXT) {
int d1, m1, s1, fs1;
int d2, m2, s2, fs2;
unsigned long latitude;
@ -513,10 +508,7 @@ totext_loc(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_loc(ARGS_FROMWIRE) {
isc_region_t sr;
unsigned char c;
unsigned long latitude;
@ -589,7 +581,7 @@ fromwire_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_loc(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_loc(ARGS_TOWIRE) {
UNUSED(cctx);
REQUIRE(rdata->type == 29);
@ -598,7 +590,7 @@ towire_loc(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_loc(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_loc(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
@ -612,9 +604,7 @@ compare_loc(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_loc(ARGS_FROMSTRUCT) {
dns_rdata_loc_t *loc = source;
isc_uint8_t c;
@ -655,7 +645,7 @@ fromstruct_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_loc(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_loc(ARGS_TOSTRUCT) {
dns_rdata_loc_t *loc = target;
isc_region_t r;
isc_uint8_t version;
@ -692,7 +682,7 @@ tostruct_loc(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_loc(void *source) {
freestruct_loc(ARGS_FREESTRUCT) {
dns_rdata_loc_t *loc = source;
REQUIRE(source != NULL);
@ -702,8 +692,7 @@ freestruct_loc(void *source) {
}
static inline isc_result_t
additionaldata_loc(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg)
{
additionaldata_loc(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 29);
UNUSED(rdata);
@ -714,7 +703,7 @@ additionaldata_loc(dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg)
}
static inline isc_result_t
digest_loc(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_loc(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == 29);

34
lib/dns/rdata/generic/mb_7.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: mb_7.c,v 1.29 2000/05/22 12:37:40 marka Exp $ */
/* $Id: mb_7.c,v 1.30 2000/06/01 18:26:14 tale Exp $ */
/* Reviewed: Wed Mar 15 17:31:26 PST 2000 by bwelling */
@ -25,10 +25,7 @@
#define RRTYPE_MB_ATTRIBUTES (0)
static inline isc_result_t
fromtext_mb(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_mb(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -46,9 +43,7 @@ fromtext_mb(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_mb(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_mb(ARGS_TOTEXT) {
isc_region_t region;
dns_name_t name;
dns_name_t prefix;
@ -68,10 +63,7 @@ totext_mb(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_mb(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_mb(ARGS_FROMWIRE) {
dns_name_t name;
UNUSED(rdclass);
@ -85,7 +77,7 @@ fromwire_mb(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_mb(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_mb(ARGS_TOWIRE) {
dns_name_t name;
isc_region_t region;
@ -101,7 +93,7 @@ towire_mb(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_mb(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_mb(ARGS_COMPARE) {
dns_name_t name1;
dns_name_t name2;
isc_region_t region1;
@ -124,9 +116,7 @@ compare_mb(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_mb(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_mb(ARGS_FROMSTRUCT) {
dns_rdata_mb_t *mb = source;
isc_region_t region;
@ -140,7 +130,7 @@ fromstruct_mb(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_mb(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_mb(ARGS_TOSTRUCT) {
isc_region_t region;
dns_rdata_mb_t *mb = target;
dns_name_t name;
@ -162,7 +152,7 @@ tostruct_mb(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_mb(void *source) {
freestruct_mb(ARGS_FREESTRUCT) {
dns_rdata_mb_t *mb = source;
REQUIRE(source != NULL);
@ -175,9 +165,7 @@ freestruct_mb(void *source) {
}
static inline isc_result_t
additionaldata_mb(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_mb(ARGS_ADDLDATA) {
dns_name_t name;
isc_region_t region;
@ -191,7 +179,7 @@ additionaldata_mb(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_mb(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_mb(ARGS_DIGEST) {
isc_region_t r;
dns_name_t name;

34
lib/dns/rdata/generic/md_3.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: md_3.c,v 1.31 2000/05/22 12:37:41 marka Exp $ */
/* $Id: md_3.c,v 1.32 2000/06/01 18:26:15 tale Exp $ */
/* Reviewed: Wed Mar 15 17:48:20 PST 2000 by bwelling */
@ -25,10 +25,7 @@
#define RRTYPE_MD_ATTRIBUTES (0)
static inline isc_result_t
fromtext_md(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_md(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -46,9 +43,7 @@ fromtext_md(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_md(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_md(ARGS_TOTEXT) {
isc_region_t region;
dns_name_t name;
dns_name_t prefix;
@ -68,10 +63,7 @@ totext_md(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_md(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_md(ARGS_FROMWIRE) {
dns_name_t name;
UNUSED(rdclass);
@ -85,7 +77,7 @@ fromwire_md(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_md(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_md(ARGS_TOWIRE) {
dns_name_t name;
isc_region_t region;
@ -101,7 +93,7 @@ towire_md(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_md(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_md(ARGS_COMPARE) {
dns_name_t name1;
dns_name_t name2;
isc_region_t region1;
@ -124,9 +116,7 @@ compare_md(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_md(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_md(ARGS_FROMSTRUCT) {
dns_rdata_md_t *md = source;
isc_region_t region;
@ -140,7 +130,7 @@ fromstruct_md(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_md(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_md(ARGS_TOSTRUCT) {
dns_rdata_md_t *md = target;
isc_region_t r;
dns_name_t name;
@ -162,7 +152,7 @@ tostruct_md(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_md(void *source) {
freestruct_md(ARGS_FREESTRUCT) {
dns_rdata_md_t *md = source;
REQUIRE(source != NULL);
@ -176,9 +166,7 @@ freestruct_md(void *source) {
}
static inline isc_result_t
additionaldata_md(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_md(ARGS_ADDLDATA) {
dns_name_t name;
isc_region_t region;
@ -192,7 +180,7 @@ additionaldata_md(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_md(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_md(ARGS_DIGEST) {
isc_region_t r;
dns_name_t name;

39
lib/dns/rdata/generic/mf_4.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: mf_4.c,v 1.29 2000/05/22 12:37:42 marka Exp $ */
/* $Id: mf_4.c,v 1.30 2000/06/01 18:26:16 tale Exp $ */
/* reviewed: Wed Mar 15 17:47:33 PST 2000 by brister */
@ -25,10 +25,7 @@
#define RRTYPE_MF_ATTRIBUTES (0)
static inline isc_result_t
fromtext_mf(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_mf(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -46,9 +43,7 @@ fromtext_mf(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_mf(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_mf(ARGS_TOTEXT) {
isc_region_t region;
dns_name_t name;
dns_name_t prefix;
@ -68,10 +63,7 @@ totext_mf(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_mf(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_mf(ARGS_FROMWIRE) {
dns_name_t name;
REQUIRE(type == 4);
@ -85,8 +77,7 @@ fromwire_mf(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_mf(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
{
towire_mf(ARGS_TOWIRE) {
dns_name_t name;
isc_region_t region;
@ -102,8 +93,7 @@ towire_mf(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
}
static inline int
compare_mf(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
{
compare_mf(ARGS_COMPARE) {
dns_name_t name1;
dns_name_t name2;
isc_region_t region1;
@ -126,9 +116,7 @@ compare_mf(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
}
static inline isc_result_t
fromstruct_mf(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_mf(ARGS_FROMSTRUCT) {
dns_rdata_mf_t *mf = source;
isc_region_t region;
@ -142,8 +130,7 @@ fromstruct_mf(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_mf(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
{
tostruct_mf(ARGS_TOSTRUCT) {
dns_rdata_mf_t *mf = target;
isc_region_t r;
dns_name_t name;
@ -165,8 +152,7 @@ tostruct_mf(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
}
static inline void
freestruct_mf(void *source)
{
freestruct_mf(ARGS_FREESTRUCT) {
dns_rdata_mf_t *mf = source;
REQUIRE(source != NULL);
@ -179,9 +165,7 @@ freestruct_mf(void *source)
}
static inline isc_result_t
additionaldata_mf(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_mf(ARGS_ADDLDATA) {
dns_name_t name;
isc_region_t region;
@ -195,8 +179,7 @@ additionaldata_mf(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_mf(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg)
{
digest_mf(ARGS_DIGEST) {
isc_region_t r;
dns_name_t name;

39
lib/dns/rdata/generic/mg_8.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: mg_8.c,v 1.27 2000/05/22 12:37:43 marka Exp $ */
/* $Id: mg_8.c,v 1.28 2000/06/01 18:26:17 tale Exp $ */
/* reviewed: Wed Mar 15 17:49:21 PST 2000 by brister */
@ -25,10 +25,7 @@
#define RRTYPE_MG_ATTRIBUTES (0)
static inline isc_result_t
fromtext_mg(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_mg(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -46,9 +43,7 @@ fromtext_mg(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_mg(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_mg(ARGS_TOTEXT) {
isc_region_t region;
dns_name_t name;
dns_name_t prefix;
@ -68,10 +63,7 @@ totext_mg(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_mg(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_mg(ARGS_FROMWIRE) {
dns_name_t name;
REQUIRE(type == 8);
@ -85,8 +77,7 @@ fromwire_mg(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_mg(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
{
towire_mg(ARGS_TOWIRE) {
dns_name_t name;
isc_region_t region;
@ -102,8 +93,7 @@ towire_mg(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
}
static inline int
compare_mg(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
{
compare_mg(ARGS_COMPARE) {
dns_name_t name1;
dns_name_t name2;
isc_region_t region1;
@ -126,9 +116,7 @@ compare_mg(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
}
static inline isc_result_t
fromstruct_mg(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_mg(ARGS_FROMSTRUCT) {
dns_rdata_mg_t *mg = source;
isc_region_t region;
@ -142,8 +130,7 @@ fromstruct_mg(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_mg(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
{
tostruct_mg(ARGS_TOSTRUCT) {
isc_region_t region;
dns_rdata_mg_t *mg = target;
dns_name_t name;
@ -165,8 +152,7 @@ tostruct_mg(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
}
static inline void
freestruct_mg(void *source)
{
freestruct_mg(ARGS_FREESTRUCT) {
dns_rdata_mg_t *mg = source;
REQUIRE(source != NULL);
@ -179,9 +165,7 @@ freestruct_mg(void *source)
}
static inline isc_result_t
additionaldata_mg(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_mg(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 8);
UNUSED(add);
@ -192,8 +176,7 @@ additionaldata_mg(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_mg(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg)
{
digest_mg(ARGS_DIGEST) {
isc_region_t r;
dns_name_t name;

39
lib/dns/rdata/generic/minfo_14.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: minfo_14.c,v 1.28 2000/05/22 12:37:44 marka Exp $ */
/* $Id: minfo_14.c,v 1.29 2000/06/01 18:26:18 tale Exp $ */
/* reviewed: Wed Mar 15 17:45:32 PST 2000 by brister */
@ -25,10 +25,7 @@
#define RRTYPE_MINFO_ATTRIBUTES (0)
static inline isc_result_t
fromtext_minfo(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_minfo(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -51,9 +48,7 @@ fromtext_minfo(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_minfo(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_minfo(ARGS_TOTEXT) {
isc_region_t region;
dns_name_t rmail;
dns_name_t email;
@ -85,10 +80,7 @@ totext_minfo(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_minfo(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_minfo(ARGS_FROMWIRE) {
dns_name_t rmail;
dns_name_t email;
@ -106,8 +98,7 @@ fromwire_minfo(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_minfo(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
{
towire_minfo(ARGS_TOWIRE) {
isc_region_t region;
dns_name_t rmail;
dns_name_t email;
@ -133,8 +124,7 @@ towire_minfo(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
}
static inline int
compare_minfo(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
{
compare_minfo(ARGS_COMPARE) {
isc_region_t region1;
isc_region_t region2;
dns_name_t name1;
@ -172,9 +162,7 @@ compare_minfo(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
}
static inline isc_result_t
fromstruct_minfo(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_minfo(ARGS_FROMSTRUCT) {
dns_rdata_minfo_t *minfo = source;
isc_region_t region;
@ -190,8 +178,7 @@ fromstruct_minfo(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_minfo(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
{
tostruct_minfo(ARGS_TOSTRUCT) {
dns_rdata_minfo_t *minfo = target;
isc_region_t region;
dns_name_t name;
@ -226,8 +213,7 @@ tostruct_minfo(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
}
static inline void
freestruct_minfo(void *source)
{
freestruct_minfo(ARGS_FREESTRUCT) {
dns_rdata_minfo_t *minfo = source;
REQUIRE(source != NULL);
@ -242,9 +228,7 @@ freestruct_minfo(void *source)
}
static inline isc_result_t
additionaldata_minfo(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_minfo(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 14);
UNUSED(rdata);
@ -255,8 +239,7 @@ additionaldata_minfo(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_minfo(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg)
{
digest_minfo(ARGS_DIGEST) {
isc_region_t r;
dns_name_t name;
isc_result_t result;

33
lib/dns/rdata/generic/mr_9.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: mr_9.c,v 1.26 2000/05/22 12:37:46 marka Exp $ */
/* $Id: mr_9.c,v 1.27 2000/06/01 18:26:20 tale Exp $ */
/* Reviewed: Wed Mar 15 21:30:35 EST 2000 by tale */
@ -25,10 +25,7 @@
#define RRTYPE_MR_ATTRIBUTES (0)
static inline isc_result_t
fromtext_mr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_mr(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -46,8 +43,7 @@ fromtext_mr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_mr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target)
{
totext_mr(ARGS_TOTEXT) {
isc_region_t region;
dns_name_t name;
dns_name_t prefix;
@ -67,10 +63,7 @@ totext_mr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target)
}
static inline isc_result_t
fromwire_mr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_mr(ARGS_FROMWIRE) {
dns_name_t name;
REQUIRE(type == 9);
@ -84,7 +77,7 @@ fromwire_mr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_mr(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_mr(ARGS_TOWIRE) {
dns_name_t name;
isc_region_t region;
@ -100,7 +93,7 @@ towire_mr(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_mr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_mr(ARGS_COMPARE) {
dns_name_t name1;
dns_name_t name2;
isc_region_t region1;
@ -123,9 +116,7 @@ compare_mr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_mr(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_mr(ARGS_FROMSTRUCT) {
dns_rdata_mr_t *mr = source;
isc_region_t region;
@ -139,7 +130,7 @@ fromstruct_mr(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_mr(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_mr(ARGS_TOSTRUCT) {
isc_region_t region;
dns_rdata_mr_t *mr = target;
dns_name_t name;
@ -161,7 +152,7 @@ tostruct_mr(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_mr(void *source) {
freestruct_mr(ARGS_FREESTRUCT) {
dns_rdata_mr_t *mr = source;
REQUIRE(source != NULL);
@ -174,9 +165,7 @@ freestruct_mr(void *source) {
}
static inline isc_result_t
additionaldata_mr(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_mr(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 9);
UNUSED(rdata);
@ -187,7 +176,7 @@ additionaldata_mr(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_mr(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_mr(ARGS_DIGEST) {
isc_region_t r;
dns_name_t name;

34
lib/dns/rdata/generic/mx_15.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: mx_15.c,v 1.36 2000/05/22 12:37:47 marka Exp $ */
/* $Id: mx_15.c,v 1.37 2000/06/01 18:26:21 tale Exp $ */
/* reviewed: Wed Mar 15 18:05:46 PST 2000 by brister */
@ -25,10 +25,7 @@
#define RRTYPE_MX_ATTRIBUTES (0)
static inline isc_result_t
fromtext_mx(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_mx(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -50,9 +47,7 @@ fromtext_mx(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_mx(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_mx(ARGS_TOTEXT) {
isc_region_t region;
dns_name_t name;
dns_name_t prefix;
@ -79,10 +74,7 @@ totext_mx(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_mx(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_mx(ARGS_FROMWIRE) {
dns_name_t name;
isc_region_t sregion;
@ -103,7 +95,7 @@ fromwire_mx(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_mx(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_mx(ARGS_TOWIRE) {
dns_name_t name;
isc_region_t region;
@ -122,7 +114,7 @@ towire_mx(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_mx(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_mx(ARGS_COMPARE) {
dns_name_t name1;
dns_name_t name2;
isc_region_t region1;
@ -153,9 +145,7 @@ compare_mx(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_mx(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_mx(ARGS_FROMSTRUCT) {
dns_rdata_mx_t *mx = source;
isc_region_t region;
@ -170,7 +160,7 @@ fromstruct_mx(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_mx(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_mx(ARGS_TOSTRUCT) {
isc_region_t region;
dns_rdata_mx_t *mx = target;
dns_name_t name;
@ -194,7 +184,7 @@ tostruct_mx(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_mx(void *source) {
freestruct_mx(ARGS_FREESTRUCT) {
dns_rdata_mx_t *mx = source;
REQUIRE(source != NULL);
@ -208,9 +198,7 @@ freestruct_mx(void *source) {
}
static inline isc_result_t
additionaldata_mx(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_mx(ARGS_ADDLDATA) {
dns_name_t name;
isc_region_t region;
@ -225,7 +213,7 @@ additionaldata_mx(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_mx(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_mx(ARGS_DIGEST) {
isc_region_t r1, r2;
dns_name_t name;

34
lib/dns/rdata/generic/ns_2.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: ns_2.c,v 1.30 2000/05/22 12:37:48 marka Exp $ */
/* $Id: ns_2.c,v 1.31 2000/06/01 18:26:22 tale Exp $ */
/* Reviewed: Wed Mar 15 18:15:00 PST 2000 by bwelling */
@ -25,10 +25,7 @@
#define RRTYPE_NS_ATTRIBUTES (DNS_RDATATYPEATTR_ZONECUTAUTH)
static inline isc_result_t
fromtext_ns(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_ns(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -46,9 +43,7 @@ fromtext_ns(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_ns(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_ns(ARGS_TOTEXT) {
isc_region_t region;
dns_name_t name;
dns_name_t prefix;
@ -68,10 +63,7 @@ totext_ns(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_ns(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_ns(ARGS_FROMWIRE) {
dns_name_t name;
UNUSED(rdclass);
@ -85,7 +77,7 @@ fromwire_ns(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_ns(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_ns(ARGS_TOWIRE) {
dns_name_t name;
isc_region_t region;
@ -101,7 +93,7 @@ towire_ns(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_ns(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_ns(ARGS_COMPARE) {
dns_name_t name1;
dns_name_t name2;
isc_region_t region1;
@ -124,9 +116,7 @@ compare_ns(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_ns(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_ns(ARGS_FROMSTRUCT) {
dns_rdata_ns_t *ns = source;
isc_region_t region;
@ -140,7 +130,7 @@ fromstruct_ns(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_ns(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_ns(ARGS_TOSTRUCT) {
isc_region_t region;
dns_rdata_ns_t *ns = target;
dns_name_t name;
@ -162,7 +152,7 @@ tostruct_ns(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_ns(void *source) {
freestruct_ns(ARGS_FREESTRUCT) {
dns_rdata_ns_t *ns = source;
REQUIRE(source != NULL);
@ -175,9 +165,7 @@ freestruct_ns(void *source) {
}
static inline isc_result_t
additionaldata_ns(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_ns(ARGS_ADDLDATA) {
dns_name_t name;
isc_region_t region;
@ -191,7 +179,7 @@ additionaldata_ns(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_ns(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_ns(ARGS_DIGEST) {
isc_region_t r;
dns_name_t name;

39
lib/dns/rdata/generic/null_10.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: null_10.c,v 1.24 2000/05/22 12:37:49 marka Exp $ */
/* $Id: null_10.c,v 1.25 2000/06/01 18:26:23 tale Exp $ */
/* Reviewed: Thu Mar 16 13:57:50 PST 2000 by explorer */
@ -25,10 +25,7 @@
#define RRTYPE_NULL_ATTRIBUTES (0)
static inline isc_result_t
fromtext_null(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_null(ARGS_FROMTEXT) {
UNUSED(rdclass);
UNUSED(type);
UNUSED(lexer);
@ -42,9 +39,7 @@ fromtext_null(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_null(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_null(ARGS_TOTEXT) {
UNUSED(rdata);
UNUSED(tctx);
UNUSED(target);
@ -55,10 +50,7 @@ totext_null(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_null(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_null(ARGS_FROMWIRE) {
isc_region_t sr;
UNUSED(rdclass);
@ -73,8 +65,7 @@ fromwire_null(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_null(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
{
towire_null(ARGS_TOWIRE) {
UNUSED(cctx);
REQUIRE(rdata->type == 10);
@ -83,8 +74,7 @@ towire_null(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
}
static inline int
compare_null(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
{
compare_null(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
@ -98,9 +88,7 @@ compare_null(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
}
static inline isc_result_t
fromstruct_null(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_null(ARGS_FROMSTRUCT) {
dns_rdata_null_t *null = source;
REQUIRE(type == 10);
@ -114,8 +102,7 @@ fromstruct_null(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_null(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
{
tostruct_null(ARGS_TOSTRUCT) {
dns_rdata_null_t *null = target;
isc_region_t r;
@ -140,8 +127,7 @@ tostruct_null(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
}
static inline void
freestruct_null(void *source)
{
freestruct_null(ARGS_FREESTRUCT) {
dns_rdata_null_t *null = source;
REQUIRE(source != NULL);
@ -156,9 +142,7 @@ freestruct_null(void *source)
}
static inline isc_result_t
additionaldata_null(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_null(ARGS_ADDLDATA) {
UNUSED(rdata);
UNUSED(add);
UNUSED(arg);
@ -169,8 +153,7 @@ additionaldata_null(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_null(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg)
{
digest_null(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == 10);

4
lib/dns/rdata/generic/null_10.h
View file

@ -18,12 +18,12 @@
#ifndef GENERIC_NULL_10_H
#define GENERIC_NULL_10_H 1
/* $Id: null_10.h,v 1.15 2000/04/29 02:01:46 tale Exp $ */
/* $Id: null_10.h,v 1.16 2000/06/01 18:26:24 tale Exp $ */
typedef struct dns_rdata_null {
dns_rdatacommon_t common;
isc_mem_t *mctx;
isc_int16_t length;
isc_uint16_t length;
unsigned char *data;
} dns_rdata_null_t;

34
lib/dns/rdata/generic/nxt_30.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: nxt_30.c,v 1.35 2000/05/22 12:37:50 marka Exp $ */
/* $Id: nxt_30.c,v 1.36 2000/06/01 18:26:25 tale Exp $ */
/* reviewed: Wed Mar 15 18:21:15 PST 2000 by brister */
@ -31,10 +31,7 @@
#define RRTYPE_NXT_ATTRIBUTES (DNS_RDATATYPEATTR_DNSSEC)
static inline isc_result_t
fromtext_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_nxt(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -88,9 +85,7 @@ fromtext_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_nxt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_nxt(ARGS_TOTEXT) {
isc_region_t sr;
unsigned int i, j;
dns_name_t name;
@ -130,10 +125,7 @@ totext_nxt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_nxt(ARGS_FROMWIRE) {
isc_region_t sr;
dns_name_t name;
@ -156,7 +148,7 @@ fromwire_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_nxt(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_nxt(ARGS_TOWIRE) {
isc_region_t sr;
dns_name_t name;
@ -173,7 +165,7 @@ towire_nxt(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_nxt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_nxt(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
dns_name_t name1;
@ -198,9 +190,7 @@ compare_nxt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_nxt(ARGS_FROMSTRUCT) {
dns_rdata_nxt_t *nxt = source;
REQUIRE(type == 30);
@ -214,7 +204,7 @@ fromstruct_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_nxt(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_nxt(ARGS_TOSTRUCT) {
dns_rdata_nxt_t *nxt = target;
isc_region_t r;
@ -239,7 +229,7 @@ tostruct_nxt(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_nxt(void *source) {
freestruct_nxt(ARGS_FREESTRUCT) {
dns_rdata_nxt_t *nxt = source;
REQUIRE(source != NULL);
@ -254,9 +244,7 @@ freestruct_nxt(void *source) {
}
static inline isc_result_t
additionaldata_nxt(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_nxt(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 30);
UNUSED(rdata);
@ -267,7 +255,7 @@ additionaldata_nxt(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_nxt(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_nxt(ARGS_DIGEST) {
isc_region_t r;
dns_name_t name;
isc_result_t result;

34
lib/dns/rdata/generic/opt_41.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: opt_41.c,v 1.14 2000/05/22 12:37:51 marka Exp $ */
/* $Id: opt_41.c,v 1.15 2000/06/01 18:26:26 tale Exp $ */
/* Reviewed: Thu Mar 16 14:06:44 PST 2000 by gson */
@ -29,10 +29,7 @@
DNS_RDATATYPEATTR_NOTQUESTION)
static inline isc_result_t
fromtext_opt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_opt(ARGS_FROMTEXT) {
/*
* OPT records do not have a text format.
*/
@ -49,9 +46,7 @@ fromtext_opt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_opt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_opt(ARGS_TOTEXT) {
isc_region_t r;
isc_region_t or;
isc_uint16_t option;
@ -93,10 +88,7 @@ totext_opt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_opt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_opt(ARGS_FROMWIRE) {
isc_region_t sregion;
isc_region_t tregion;
isc_uint16_t length;
@ -139,7 +131,7 @@ fromwire_opt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_opt(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_opt(ARGS_TOWIRE) {
REQUIRE(rdata->type == 41);
@ -149,7 +141,7 @@ towire_opt(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_opt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_opt(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
@ -163,9 +155,7 @@ compare_opt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_opt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_opt(ARGS_FROMSTRUCT) {
dns_rdata_opt_t *opt = source;
isc_region_t region;
isc_uint8_t length;
@ -194,7 +184,7 @@ fromstruct_opt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_opt(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_opt(ARGS_TOSTRUCT) {
dns_rdata_opt_t *opt = target;
isc_region_t r;
@ -220,7 +210,7 @@ tostruct_opt(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_opt(void *source) {
freestruct_opt(ARGS_FREESTRUCT) {
dns_rdata_opt_t *opt = source;
REQUIRE(source != NULL);
@ -235,9 +225,7 @@ freestruct_opt(void *source) {
}
static inline isc_result_t
additionaldata_opt(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_opt(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 41);
UNUSED(rdata);
@ -248,7 +236,7 @@ additionaldata_opt(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_opt(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_opt(ARGS_DIGEST) {
/*
* OPT records are not digested.

32
lib/dns/rdata/generic/proforma.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: proforma.c,v 1.23 2000/05/22 12:37:52 marka Exp $ */
/* $Id: proforma.c,v 1.24 2000/06/01 18:26:27 tale Exp $ */
#ifndef RDATA_GENERIC_#_#_C
#define RDATA_GENERIC_#_#_C
@ -23,9 +23,7 @@
#define RRTYPE_#_ATTRIBUTES (0)
static inline isc_result_t
fromtext_#(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target) {
fromtext_#(ARGS_FROMTEXT) {
isc_token_t token;
REQUIRE(type == #);
@ -37,9 +35,7 @@ fromtext_#(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_#(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_#(ARGS_TOTEXT) {
REQUIRE(rdata->type == #);
REQUIRE(rdata->rdclass == #);
@ -48,9 +44,7 @@ totext_#(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_#(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target) {
fromwire_#(ARGS_FROMWIRE) {
REQUIRE(type == #);
REQUIRE(rdclass == #);
@ -62,7 +56,7 @@ fromwire_#(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_#(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_#(ARGS_TOWIRE) {
REQUIRE(rdata->type == #);
REQUIRE(rdata->rdclass == #);
@ -74,7 +68,7 @@ towire_#(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_#(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_#(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
@ -89,9 +83,7 @@ compare_#(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_#(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_#(ARGS_FROMSTRUCT) {
dns_rdata_#_t *# = source;
REQUIRE(type == #);
@ -104,7 +96,7 @@ fromstruct_#(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_#(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_#(ARGS_TOSTRUCT) {
REQUIRE(rdata->type == #);
REQUIRE(rdata->rdclass == #);
@ -113,7 +105,7 @@ tostruct_#(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_#(void *source) {
freestruct_#(ARGS_FREESTRUCT) {
dns_rdata_#_t *# = source;
REQUIRE(source != NULL);
@ -123,9 +115,7 @@ freestruct_#(void *source) {
}
static inline isc_result_t
additionaldata_#(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_#(ARGS_ADDLDATA) {
REQUIRE(rdata->type == #);
REQUIRE(rdata->rdclass == #);
@ -136,7 +126,7 @@ additionaldata_#(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_#(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_#(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == #);

39
lib/dns/rdata/generic/ptr_12.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: ptr_12.c,v 1.27 2000/05/22 12:37:53 marka Exp $ */
/* $Id: ptr_12.c,v 1.28 2000/06/01 18:26:28 tale Exp $ */
/* Reviewed: Thu Mar 16 14:05:12 PST 2000 by explorer */
@ -25,10 +25,7 @@
#define RRTYPE_PTR_ATTRIBUTES (0)
static inline isc_result_t
fromtext_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_ptr(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -46,9 +43,7 @@ fromtext_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_ptr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_ptr(ARGS_TOTEXT) {
isc_region_t region;
dns_name_t name;
dns_name_t prefix;
@ -68,10 +63,7 @@ totext_ptr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_ptr(ARGS_FROMWIRE) {
dns_name_t name;
UNUSED(rdclass);
@ -85,8 +77,7 @@ fromwire_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_ptr(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
{
towire_ptr(ARGS_TOWIRE) {
dns_name_t name;
isc_region_t region;
@ -102,8 +93,7 @@ towire_ptr(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
}
static inline int
compare_ptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
{
compare_ptr(ARGS_COMPARE) {
dns_name_t name1;
dns_name_t name2;
isc_region_t region1;
@ -126,9 +116,7 @@ compare_ptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
}
static inline isc_result_t
fromstruct_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_ptr(ARGS_FROMSTRUCT) {
dns_rdata_ptr_t *ptr = source;
isc_region_t region;
@ -142,8 +130,7 @@ fromstruct_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_ptr(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
{
tostruct_ptr(ARGS_TOSTRUCT) {
isc_region_t region;
dns_rdata_ptr_t *ptr = target;
dns_name_t name;
@ -165,8 +152,7 @@ tostruct_ptr(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
}
static inline void
freestruct_ptr(void *source)
{
freestruct_ptr(ARGS_FREESTRUCT) {
dns_rdata_ptr_t *ptr = source;
REQUIRE(source != NULL);
@ -180,9 +166,7 @@ freestruct_ptr(void *source)
}
static inline isc_result_t
additionaldata_ptr(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_ptr(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 12);
UNUSED(rdata);
@ -193,8 +177,7 @@ additionaldata_ptr(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_ptr(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg)
{
digest_ptr(ARGS_DIGEST) {
isc_region_t r;
dns_name_t name;

39
lib/dns/rdata/generic/rp_17.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: rp_17.c,v 1.24 2000/05/22 12:37:54 marka Exp $ */
/* $Id: rp_17.c,v 1.25 2000/06/01 18:26:29 tale Exp $ */
/* RFC 1183 */
@ -25,10 +25,7 @@
#define RRTYPE_RP_ATTRIBUTES (0)
static inline isc_result_t
fromtext_rp(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_rp(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -52,9 +49,7 @@ fromtext_rp(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_rp(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_rp(ARGS_TOTEXT) {
isc_region_t region;
dns_name_t rmail;
dns_name_t email;
@ -85,10 +80,7 @@ totext_rp(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_rp(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_rp(ARGS_FROMWIRE) {
dns_name_t rmail;
dns_name_t email;
@ -106,8 +98,7 @@ fromwire_rp(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_rp(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
{
towire_rp(ARGS_TOWIRE) {
isc_region_t region;
dns_name_t rmail;
dns_name_t email;
@ -132,8 +123,7 @@ towire_rp(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
}
static inline int
compare_rp(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
{
compare_rp(ARGS_COMPARE) {
isc_region_t region1;
isc_region_t region2;
dns_name_t name1;
@ -170,9 +160,7 @@ compare_rp(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
}
static inline isc_result_t
fromstruct_rp(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_rp(ARGS_FROMSTRUCT) {
dns_rdata_rp_t *rp = source;
isc_region_t region;
@ -188,8 +176,7 @@ fromstruct_rp(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_rp(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
{
tostruct_rp(ARGS_TOSTRUCT) {
isc_result_t result;
isc_region_t region;
dns_rdata_rp_t *rp = target;
@ -224,8 +211,7 @@ tostruct_rp(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
}
static inline void
freestruct_rp(void *source)
{
freestruct_rp(ARGS_FREESTRUCT) {
dns_rdata_rp_t *rp = source;
REQUIRE(source != NULL);
@ -240,9 +226,7 @@ freestruct_rp(void *source)
}
static inline isc_result_t
additionaldata_rp(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_rp(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 17);
UNUSED(rdata);
@ -253,8 +237,7 @@ additionaldata_rp(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_rp(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg)
{
digest_rp(ARGS_DIGEST) {
isc_region_t r;
dns_name_t name;

34
lib/dns/rdata/generic/rt_21.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: rt_21.c,v 1.26 2000/05/22 12:37:55 marka Exp $ */
/* $Id: rt_21.c,v 1.27 2000/06/01 18:26:31 tale Exp $ */
/* reviewed: Thu Mar 16 15:02:31 PST 2000 by brister */
@ -27,10 +27,7 @@
#define RRTYPE_RT_ATTRIBUTES (0)
static inline isc_result_t
fromtext_rt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_rt(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -53,9 +50,7 @@ fromtext_rt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_rt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_rt(ARGS_TOTEXT) {
isc_region_t region;
dns_name_t name;
dns_name_t prefix;
@ -80,10 +75,7 @@ totext_rt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_rt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_rt(ARGS_FROMWIRE) {
dns_name_t name;
isc_region_t sregion;
isc_region_t tregion;
@ -108,7 +100,7 @@ fromwire_rt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_rt(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_rt(ARGS_TOWIRE) {
dns_name_t name;
isc_region_t region;
isc_region_t tr;
@ -131,7 +123,7 @@ towire_rt(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_rt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_rt(ARGS_COMPARE) {
dns_name_t name1;
dns_name_t name2;
isc_region_t region1;
@ -162,9 +154,7 @@ compare_rt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_rt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_rt(ARGS_FROMSTRUCT) {
dns_rdata_rt_t *rt = source;
isc_region_t region;
@ -179,7 +169,7 @@ fromstruct_rt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_rt(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_rt(ARGS_TOSTRUCT) {
isc_region_t region;
dns_rdata_rt_t *rt = target;
dns_name_t name;
@ -204,7 +194,7 @@ tostruct_rt(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_rt(void *source) {
freestruct_rt(ARGS_FREESTRUCT) {
dns_rdata_rt_t *rt = source;
REQUIRE(source != NULL);
@ -218,9 +208,7 @@ freestruct_rt(void *source) {
}
static inline isc_result_t
additionaldata_rt(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_rt(ARGS_ADDLDATA) {
dns_name_t name;
isc_region_t region;
isc_result_t result;
@ -242,7 +230,7 @@ additionaldata_rt(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_rt(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_rt(ARGS_DIGEST) {
isc_region_t r1, r2;
isc_result_t result;
dns_name_t name;

34
lib/dns/rdata/generic/sig_24.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: sig_24.c,v 1.42 2000/05/22 21:42:47 gson Exp $ */
/* $Id: sig_24.c,v 1.43 2000/06/01 18:26:32 tale Exp $ */
/* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */
@ -27,10 +27,7 @@
#define RRTYPE_SIG_ATTRIBUTES (DNS_RDATATYPEATTR_DNSSEC)
static inline isc_result_t
fromtext_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_sig(ARGS_FROMTEXT) {
isc_token_t token;
unsigned char c;
long i;
@ -118,9 +115,7 @@ fromtext_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_sig(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_sig(ARGS_TOTEXT) {
isc_region_t sr;
char buf[sizeof "4294967295"];
dns_rdatatype_t covered;
@ -230,10 +225,7 @@ totext_sig(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_sig(ARGS_FROMWIRE) {
isc_region_t sr;
dns_name_t name;
@ -274,7 +266,7 @@ fromwire_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_sig(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_sig(ARGS_TOWIRE) {
isc_region_t sr;
dns_name_t name;
@ -309,7 +301,7 @@ towire_sig(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_sig(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_sig(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
dns_name_t name1;
@ -350,9 +342,7 @@ compare_sig(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_sig(ARGS_FROMSTRUCT) {
dns_rdata_sig_t *sig = source;
REQUIRE(type == 24);
@ -409,7 +399,7 @@ fromstruct_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_sig(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_sig(ARGS_TOSTRUCT) {
isc_region_t sr;
dns_rdata_sig_t *sig = target;
dns_name_t signer;
@ -493,7 +483,7 @@ tostruct_sig(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_sig(void *source) {
freestruct_sig(ARGS_FREESTRUCT) {
dns_rdata_sig_t *sig = (dns_rdata_sig_t *) source;
REQUIRE(source != NULL);
@ -509,9 +499,7 @@ freestruct_sig(void *source) {
}
static inline isc_result_t
additionaldata_sig(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_sig(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 24);
UNUSED(rdata);
@ -522,7 +510,7 @@ additionaldata_sig(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_sig(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_sig(ARGS_DIGEST) {
REQUIRE(rdata->type == 24);

41
lib/dns/rdata/generic/soa_6.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: soa_6.c,v 1.38 2000/05/22 12:37:58 marka Exp $ */
/* $Id: soa_6.c,v 1.39 2000/06/01 18:26:33 tale Exp $ */
/* Reviewed: Thu Mar 16 15:18:32 PST 2000 by explorer */
@ -25,10 +25,7 @@
#define RRTYPE_SOA_ATTRIBUTES (DNS_RDATATYPEATTR_SINGLETON)
static inline isc_result_t
fromtext_soa(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_soa(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -64,14 +61,12 @@ fromtext_soa(dns_rdataclass_t rdclass, dns_rdatatype_t type,
return (ISC_R_SUCCESS);
}
static char *soa_fieldnames[5] = {
static const char *soa_fieldnames[5] = {
"serial", "refresh", "retry", "expire", "minimum"
};
static inline isc_result_t
totext_soa(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_soa(ARGS_TOTEXT) {
isc_region_t dregion;
dns_name_t mname;
dns_name_t rname;
@ -137,10 +132,7 @@ totext_soa(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_soa(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_soa(ARGS_FROMWIRE) {
dns_name_t mname;
dns_name_t rname;
isc_region_t sregion;
@ -174,8 +166,7 @@ fromwire_soa(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_soa(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
{
towire_soa(ARGS_TOWIRE) {
isc_region_t sregion;
isc_region_t tregion;
dns_name_t mname;
@ -208,8 +199,7 @@ towire_soa(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
}
static inline int
compare_soa(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
{
compare_soa(ARGS_COMPARE) {
isc_region_t region1;
isc_region_t region2;
dns_name_t name1;
@ -253,9 +243,7 @@ compare_soa(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
}
static inline isc_result_t
fromstruct_soa(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_soa(ARGS_FROMSTRUCT) {
dns_rdata_soa_t *soa = source;
isc_region_t region;
@ -276,8 +264,7 @@ fromstruct_soa(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_soa(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
{
tostruct_soa(ARGS_TOSTRUCT) {
isc_region_t region;
dns_rdata_soa_t *soa = target;
dns_name_t name;
@ -330,8 +317,7 @@ tostruct_soa(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
}
static inline void
freestruct_soa(void *source)
{
freestruct_soa(ARGS_FREESTRUCT) {
dns_rdata_soa_t *soa = source;
REQUIRE(source != NULL);
@ -346,9 +332,7 @@ freestruct_soa(void *source)
}
static inline isc_result_t
additionaldata_soa(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_soa(ARGS_ADDLDATA) {
UNUSED(rdata);
UNUSED(add);
UNUSED(arg);
@ -359,8 +343,7 @@ additionaldata_soa(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_soa(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg)
{
digest_soa(ARGS_DIGEST) {
isc_region_t r;
dns_name_t name;

35
lib/dns/rdata/generic/tkey_249.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: tkey_249.c,v 1.35 2000/05/25 00:46:32 bwelling Exp $ */
/* $Id: tkey_249.c,v 1.36 2000/06/01 18:26:34 tale Exp $ */
/*
* Reviewed: Thu Mar 16 17:35:30 PST 2000 by halley.
@ -29,10 +29,7 @@
#define RRTYPE_TKEY_ATTRIBUTES (DNS_RDATATYPEATTR_META)
static inline isc_result_t
fromtext_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_tkey(ARGS_FROMTEXT) {
isc_token_t token;
dns_rcode_t rcode;
dns_name_t name;
@ -118,9 +115,7 @@ fromtext_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_tkey(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_tkey(ARGS_TOTEXT) {
isc_region_t sr, dr;
char buf[sizeof "4294967295 "];
unsigned long n;
@ -231,10 +226,7 @@ totext_tkey(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_tkey(ARGS_FROMWIRE) {
isc_region_t sr;
unsigned long n;
dns_name_t name;
@ -289,7 +281,7 @@ fromwire_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_tkey(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_tkey(ARGS_TOWIRE) {
isc_region_t sr;
dns_name_t name;
@ -309,7 +301,7 @@ towire_tkey(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_tkey(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_tkey(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
dns_name_t name1;
@ -337,9 +329,7 @@ compare_tkey(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type,
void *source, isc_buffer_t *target)
{
fromstruct_tkey(ARGS_FROMSTRUCT) {
dns_rdata_tkey_t *tkey = source;
REQUIRE(type == 249);
@ -398,7 +388,7 @@ fromstruct_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
tostruct_tkey(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_tkey(ARGS_TOSTRUCT) {
dns_rdata_tkey_t *tkey = target;
dns_name_t alg;
isc_region_t sr;
@ -490,7 +480,7 @@ tostruct_tkey(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_tkey(void *source) {
freestruct_tkey(ARGS_FREESTRUCT) {
dns_rdata_tkey_t *tkey = (dns_rdata_tkey_t *) source;
REQUIRE(source != NULL);
@ -507,9 +497,7 @@ freestruct_tkey(void *source) {
}
static inline isc_result_t
additionaldata_tkey(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_tkey(ARGS_ADDLDATA) {
UNUSED(rdata);
UNUSED(add);
UNUSED(arg);
@ -520,8 +508,7 @@ additionaldata_tkey(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_tkey(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg)
{
digest_tkey(ARGS_DIGEST) {
UNUSED(rdata);
UNUSED(digest);
UNUSED(arg);

34
lib/dns/rdata/generic/txt_16.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: txt_16.c,v 1.26 2000/05/22 12:38:00 marka Exp $ */
/* $Id: txt_16.c,v 1.27 2000/06/01 18:26:35 tale Exp $ */
/* Reviewed: Thu Mar 16 15:40:00 PST 2000 by bwelling */
@ -25,10 +25,7 @@
#define RRTYPE_TXT_ATTRIBUTES (0)
static inline isc_result_t
fromtext_txt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_txt(ARGS_FROMTEXT) {
isc_token_t token;
UNUSED(rdclass);
@ -51,9 +48,7 @@ fromtext_txt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_txt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_txt(ARGS_TOTEXT) {
isc_region_t region;
UNUSED(tctx);
@ -72,10 +67,7 @@ totext_txt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_txt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_txt(ARGS_FROMWIRE) {
isc_result_t result;
UNUSED(dctx);
@ -93,7 +85,7 @@ fromwire_txt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_txt(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_txt(ARGS_TOWIRE) {
isc_region_t region;
REQUIRE(rdata->type == 16);
@ -110,7 +102,7 @@ towire_txt(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_txt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_txt(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
@ -124,9 +116,7 @@ compare_txt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_txt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_txt(ARGS_FROMSTRUCT) {
dns_rdata_txt_t *txt = source;
isc_region_t region;
isc_uint8_t length;
@ -152,7 +142,7 @@ fromstruct_txt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_txt(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_txt(ARGS_TOSTRUCT) {
dns_rdata_txt_t *txt = target;
isc_region_t r;
@ -178,7 +168,7 @@ tostruct_txt(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_txt(void *source) {
freestruct_txt(ARGS_FREESTRUCT) {
dns_rdata_txt_t *txt = source;
REQUIRE(source != NULL);
@ -193,9 +183,7 @@ freestruct_txt(void *source) {
}
static inline isc_result_t
additionaldata_txt(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_txt(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 16);
UNUSED(rdata);
@ -206,7 +194,7 @@ additionaldata_txt(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_txt(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_txt(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == 16);

34
lib/dns/rdata/generic/unspec_103.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: unspec_103.c,v 1.20 2000/05/22 12:38:01 marka Exp $ */
/* $Id: unspec_103.c,v 1.21 2000/06/01 18:26:36 tale Exp $ */
#ifndef RDATA_GENERIC_UNSPEC_103_C
#define RDATA_GENERIC_UNSPEC_103_C
@ -23,10 +23,7 @@
#define RRTYPE_UNSPEC_ATTRIBUTES (0)
static inline isc_result_t
fromtext_unspec(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_unspec(ARGS_FROMTEXT) {
REQUIRE(type == 103);
@ -38,9 +35,7 @@ fromtext_unspec(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_unspec(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_unspec(ARGS_TOTEXT) {
REQUIRE(rdata->type == 103);
@ -50,10 +45,7 @@ totext_unspec(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_unspec(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_unspec(ARGS_FROMWIRE) {
isc_region_t sr;
REQUIRE(type == 103);
@ -68,7 +60,7 @@ fromwire_unspec(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_unspec(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_unspec(ARGS_TOWIRE) {
REQUIRE(rdata->type == 103);
@ -78,7 +70,7 @@ towire_unspec(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_unspec(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_unspec(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
@ -92,9 +84,7 @@ compare_unspec(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_unspec(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_unspec(ARGS_FROMSTRUCT) {
dns_rdata_unspec_t *unspec = source;
REQUIRE(type == 103);
@ -108,7 +98,7 @@ fromstruct_unspec(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_unspec(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_unspec(ARGS_TOSTRUCT) {
dns_rdata_unspec_t *unspec = target;
isc_region_t r;
@ -133,7 +123,7 @@ tostruct_unspec(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_unspec(void *source) {
freestruct_unspec(ARGS_FREESTRUCT) {
dns_rdata_unspec_t *unspec = source;
REQUIRE(source != NULL);
@ -148,9 +138,7 @@ freestruct_unspec(void *source) {
}
static inline isc_result_t
additionaldata_unspec(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_unspec(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 103);
UNUSED(rdata);
@ -161,7 +149,7 @@ additionaldata_unspec(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_unspec(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_unspec(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == 103);

34
lib/dns/rdata/generic/x25_19.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: x25_19.c,v 1.20 2000/05/22 12:38:02 marka Exp $ */
/* $Id: x25_19.c,v 1.21 2000/06/01 18:26:37 tale Exp $ */
/* Reviewed: Thu Mar 16 16:15:57 PST 2000 by bwelling */
@ -27,10 +27,7 @@
#define RRTYPE_X25_ATTRIBUTES (0)
static inline isc_result_t
fromtext_x25(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_x25(ARGS_FROMTEXT) {
isc_token_t token;
unsigned int i;
@ -50,9 +47,7 @@ fromtext_x25(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_x25(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_x25(ARGS_TOTEXT) {
isc_region_t region;
UNUSED(tctx);
@ -64,10 +59,7 @@ totext_x25(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_x25(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_x25(ARGS_FROMWIRE) {
isc_region_t sr;
UNUSED(dctx);
@ -83,7 +75,7 @@ fromwire_x25(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_x25(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_x25(ARGS_TOWIRE) {
UNUSED(cctx);
REQUIRE(rdata->type == 19);
@ -92,7 +84,7 @@ towire_x25(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_x25(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_x25(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
@ -106,9 +98,7 @@ compare_x25(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_x25(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_x25(ARGS_FROMSTRUCT) {
dns_rdata_x25_t *x25 = source;
isc_uint8_t i;
@ -128,7 +118,7 @@ fromstruct_x25(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_x25(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_x25(ARGS_TOSTRUCT) {
dns_rdata_x25_t *x25 = target;
isc_region_t r;
@ -154,7 +144,7 @@ tostruct_x25(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_x25(void *source) {
freestruct_x25(ARGS_FREESTRUCT) {
dns_rdata_x25_t *x25 = source;
REQUIRE(source != NULL);
REQUIRE(x25->common.rdtype == 19);
@ -168,9 +158,7 @@ freestruct_x25(void *source) {
}
static inline isc_result_t
additionaldata_x25(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_x25(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 19);
UNUSED(rdata);
@ -181,7 +169,7 @@ additionaldata_x25(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_x25(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_x25(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == 19);

39
lib/dns/rdata/hs_4/a_1.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: a_1.c,v 1.13 2000/05/22 12:38:03 marka Exp $ */
/* $Id: a_1.c,v 1.14 2000/06/01 18:26:39 tale Exp $ */
/* reviewed: Thu Mar 16 15:58:36 PST 2000 by brister */
@ -27,10 +27,7 @@
#define RRTYPE_A_ATTRIBUTES (0)
static inline isc_result_t
fromtext_hs_a(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_hs_a(ARGS_FROMTEXT) {
isc_token_t token;
struct in_addr addr;
isc_region_t region;
@ -54,9 +51,7 @@ fromtext_hs_a(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_hs_a(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_hs_a(ARGS_TOTEXT) {
isc_region_t region;
REQUIRE(rdata->type == 1);
@ -75,10 +70,7 @@ totext_hs_a(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_hs_a(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_hs_a(ARGS_FROMWIRE) {
isc_region_t sregion;
isc_region_t tregion;
@ -103,8 +95,7 @@ fromwire_hs_a(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_hs_a(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
{
towire_hs_a(ARGS_TOWIRE) {
isc_region_t region;
REQUIRE(rdata->type == 1);
@ -121,8 +112,7 @@ towire_hs_a(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
}
static inline int
compare_hs_a(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
{
compare_hs_a(ARGS_COMPARE) {
int order;
REQUIRE(rdata1->type == rdata2->type);
@ -138,9 +128,7 @@ compare_hs_a(dns_rdata_t *rdata1, dns_rdata_t *rdata2)
}
static inline isc_result_t
fromstruct_hs_a(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_hs_a(ARGS_FROMSTRUCT) {
dns_rdata_hs_a_t *a = source;
isc_uint32_t n;
@ -156,8 +144,7 @@ fromstruct_hs_a(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_hs_a(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
{
tostruct_hs_a(ARGS_TOSTRUCT) {
dns_rdata_hs_a_t *a = target;
isc_uint32_t n;
isc_region_t region;
@ -179,17 +166,14 @@ tostruct_hs_a(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
}
static inline void
freestruct_hs_a(void *source)
{
freestruct_hs_a(ARGS_FREESTRUCT) {
UNUSED(source);
REQUIRE(source != NULL);
}
static inline isc_result_t
additionaldata_hs_a(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_hs_a(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 1);
REQUIRE(rdata->rdclass == 4);
@ -201,8 +185,7 @@ additionaldata_hs_a(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_hs_a(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg)
{
digest_hs_a(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == 1);

35
lib/dns/rdata/in_1/a6_38.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: a6_38.c,v 1.32 2000/05/22 12:38:05 marka Exp $ */
/* $Id: a6_38.c,v 1.33 2000/06/01 18:26:40 tale Exp $ */
/* draft-ietf-ipngwg-dns-lookups-03.txt */
@ -27,10 +27,7 @@
#define RRTYPE_A6_ATTRIBUTES (0)
static inline isc_result_t
fromtext_in_a6(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_in_a6(ARGS_FROMTEXT) {
isc_token_t token;
unsigned char addr[16];
unsigned char prefixlen;
@ -83,9 +80,7 @@ fromtext_in_a6(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_in_a6(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_in_a6(ARGS_TOTEXT) {
isc_region_t tr;
isc_region_t sr;
unsigned char addr[16];
@ -135,10 +130,7 @@ totext_in_a6(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_in_a6(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_in_a6(ARGS_FROMWIRE) {
isc_region_t sr;
unsigned char prefixlen;
unsigned char octets;
@ -184,7 +176,7 @@ fromwire_in_a6(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_in_a6(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_in_a6(ARGS_TOWIRE) {
isc_region_t sr;
dns_name_t name;
unsigned char prefixlen;
@ -211,7 +203,7 @@ towire_in_a6(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_in_a6(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_in_a6(ARGS_COMPARE) {
int order;
unsigned char prefixlen1, prefixlen2;
unsigned char octets;
@ -263,9 +255,7 @@ compare_in_a6(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_in_a6(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_in_a6(ARGS_FROMSTRUCT) {
dns_rdata_in_a6_t *a6 = source;
isc_region_t region;
int octets;
@ -307,8 +297,7 @@ fromstruct_in_a6(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_in_a6(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
{
tostruct_in_a6(ARGS_TOSTRUCT) {
dns_rdata_in_a6_t *a6 = target;
unsigned char octets;
dns_name_t name;
@ -352,7 +341,7 @@ tostruct_in_a6(dns_rdata_t *rdata, void *target, isc_mem_t *mctx)
}
static inline void
freestruct_in_a6(void *source) {
freestruct_in_a6(ARGS_FREESTRUCT) {
dns_rdata_in_a6_t *a6 = source;
REQUIRE(source != NULL);
@ -368,9 +357,7 @@ freestruct_in_a6(void *source) {
}
static inline isc_result_t
additionaldata_in_a6(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_in_a6(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 38);
REQUIRE(rdata->rdclass == 1);
@ -382,7 +369,7 @@ additionaldata_in_a6(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_in_a6(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_in_a6(ARGS_DIGEST) {
isc_region_t r1, r2;
unsigned char prefixlen, octets;
isc_result_t result;

34
lib/dns/rdata/in_1/a_1.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: a_1.c,v 1.33 2000/05/22 12:38:06 marka Exp $ */
/* $Id: a_1.c,v 1.34 2000/06/01 18:26:41 tale Exp $ */
/* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
@ -29,10 +29,7 @@
#define RRTYPE_A_ATTRIBUTES (0)
static inline isc_result_t
fromtext_in_a(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_in_a(ARGS_FROMTEXT) {
isc_token_t token;
struct in_addr addr;
isc_region_t region;
@ -56,9 +53,7 @@ fromtext_in_a(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_in_a(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_in_a(ARGS_TOTEXT) {
isc_region_t region;
UNUSED(tctx);
@ -77,10 +72,7 @@ totext_in_a(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_in_a(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_in_a(ARGS_FROMWIRE) {
isc_region_t sregion;
isc_region_t tregion;
@ -104,7 +96,7 @@ fromwire_in_a(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_in_a(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_in_a(ARGS_TOWIRE) {
isc_region_t region;
UNUSED(cctx);
@ -121,7 +113,7 @@ towire_in_a(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_in_a(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_in_a(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
@ -136,9 +128,7 @@ compare_in_a(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_in_a(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_in_a(ARGS_FROMSTRUCT) {
dns_rdata_in_a_t *a = source;
isc_uint32_t n;
@ -155,7 +145,7 @@ fromstruct_in_a(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
static inline isc_result_t
tostruct_in_a(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_in_a(ARGS_TOSTRUCT) {
dns_rdata_in_a_t *a = target;
isc_uint32_t n;
isc_region_t region;
@ -177,7 +167,7 @@ tostruct_in_a(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_in_a(void *source) {
freestruct_in_a(ARGS_FREESTRUCT) {
dns_rdata_in_a_t *a = source;
REQUIRE(source != NULL);
@ -186,9 +176,7 @@ freestruct_in_a(void *source) {
}
static inline isc_result_t
additionaldata_in_a(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_in_a(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 1);
REQUIRE(rdata->rdclass == 1);
@ -200,7 +188,7 @@ additionaldata_in_a(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_in_a(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_in_a(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == 1);

35
lib/dns/rdata/in_1/aaaa_28.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: aaaa_28.c,v 1.25 2000/05/24 05:09:31 tale Exp $ */
/* $Id: aaaa_28.c,v 1.26 2000/06/01 18:26:43 tale Exp $ */
/* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
@ -29,10 +29,7 @@
#define RRTYPE_AAAA_ATTRIBUTES (0)
static inline isc_result_t
fromtext_in_aaaa(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_in_aaaa(ARGS_FROMTEXT) {
isc_token_t token;
unsigned char addr[16];
isc_region_t region;
@ -56,9 +53,7 @@ fromtext_in_aaaa(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_in_aaaa(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_in_aaaa(ARGS_TOTEXT) {
isc_region_t region;
UNUSED(tctx);
@ -77,10 +72,7 @@ totext_in_aaaa(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_in_aaaa(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_in_aaaa(ARGS_FROMWIRE) {
isc_region_t sregion;
isc_region_t tregion;
@ -104,8 +96,7 @@ fromwire_in_aaaa(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_in_aaaa(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
{
towire_in_aaaa(ARGS_TOWIRE) {
isc_region_t region;
UNUSED(cctx);
@ -122,7 +113,7 @@ towire_in_aaaa(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
}
static inline int
compare_in_aaaa(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_in_aaaa(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
@ -137,9 +128,7 @@ compare_in_aaaa(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_in_aaaa(dns_rdataclass_t rdclass, dns_rdatatype_t type,
void *source, isc_buffer_t *target)
{
fromstruct_in_aaaa(ARGS_FROMSTRUCT) {
dns_rdata_in_aaaa_t *aaaa = source;
REQUIRE(type == 28);
@ -152,7 +141,7 @@ fromstruct_in_aaaa(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
tostruct_in_aaaa(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_in_aaaa(ARGS_TOSTRUCT) {
dns_rdata_in_aaaa_t *aaaa = target;
isc_region_t r;
@ -174,7 +163,7 @@ tostruct_in_aaaa(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_in_aaaa(void *source) {
freestruct_in_aaaa(ARGS_FREESTRUCT) {
dns_rdata_in_aaaa_t *aaaa = source;
REQUIRE(source != NULL);
@ -183,9 +172,7 @@ freestruct_in_aaaa(void *source) {
}
static inline isc_result_t
additionaldata_in_aaaa(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_in_aaaa(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 28);
REQUIRE(rdata->rdclass == 1);
@ -197,7 +184,7 @@ additionaldata_in_aaaa(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_in_aaaa(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_in_aaaa(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == 28);

34
lib/dns/rdata/in_1/kx_36.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: kx_36.c,v 1.26 2000/05/15 21:14:32 tale Exp $ */
/* $Id: kx_36.c,v 1.27 2000/06/01 18:26:44 tale Exp $ */
/* Reviewed: Thu Mar 16 17:24:54 PST 2000 by explorer */
@ -27,10 +27,7 @@
#define RRTYPE_KX_ATTRIBUTES (0)
static inline isc_result_t
fromtext_in_kx(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_in_kx(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -51,9 +48,7 @@ fromtext_in_kx(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_in_kx(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_in_kx(ARGS_TOTEXT) {
isc_region_t region;
dns_name_t name;
dns_name_t prefix;
@ -81,10 +76,7 @@ totext_in_kx(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_in_kx(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_in_kx(ARGS_FROMWIRE) {
dns_name_t name;
isc_region_t sregion;
@ -104,7 +96,7 @@ fromwire_in_kx(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_in_kx(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_in_kx(ARGS_TOWIRE) {
dns_name_t name;
isc_region_t region;
@ -123,7 +115,7 @@ towire_in_kx(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_in_kx(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_in_kx(ARGS_COMPARE) {
dns_name_t name1;
dns_name_t name2;
isc_region_t region1;
@ -155,9 +147,7 @@ compare_in_kx(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_in_kx(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_in_kx(ARGS_FROMSTRUCT) {
dns_rdata_in_kx_t *kx = source;
isc_region_t region;
@ -173,7 +163,7 @@ fromstruct_in_kx(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_in_kx(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_in_kx(ARGS_TOSTRUCT) {
isc_region_t region;
dns_rdata_in_kx_t *kx = target;
dns_name_t name;
@ -200,7 +190,7 @@ tostruct_in_kx(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_in_kx(void *source) {
freestruct_in_kx(ARGS_FREESTRUCT) {
dns_rdata_in_kx_t *kx = source;
REQUIRE(source != NULL);
@ -215,9 +205,7 @@ freestruct_in_kx(void *source) {
}
static inline isc_result_t
additionaldata_in_kx(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_in_kx(ARGS_ADDLDATA) {
dns_name_t name;
isc_region_t region;
@ -233,7 +221,7 @@ additionaldata_in_kx(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_in_kx(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_in_kx(ARGS_DIGEST) {
isc_region_t r1, r2;
dns_name_t name;

35
lib/dns/rdata/in_1/naptr_35.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: naptr_35.c,v 1.30 2000/05/24 05:09:32 tale Exp $ */
/* $Id: naptr_35.c,v 1.31 2000/06/01 18:26:45 tale Exp $ */
/* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
@ -27,10 +27,7 @@
#define RRTYPE_NAPTR_ATTRIBUTES (0)
static inline isc_result_t
fromtext_in_naptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_in_naptr(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -83,9 +80,7 @@ fromtext_in_naptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_in_naptr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_in_naptr(ARGS_TOTEXT) {
isc_region_t region;
dns_name_t name;
dns_name_t prefix;
@ -146,10 +141,7 @@ totext_in_naptr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_in_naptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_in_naptr(ARGS_FROMWIRE) {
dns_name_t name;
isc_region_t sr;
@ -191,8 +183,7 @@ fromwire_in_naptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_in_naptr(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
{
towire_in_naptr(ARGS_TOWIRE) {
dns_name_t name;
isc_region_t sr;
@ -234,7 +225,7 @@ towire_in_naptr(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
}
static inline int
compare_in_naptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_in_naptr(ARGS_COMPARE) {
dns_name_t name1;
dns_name_t name2;
isc_region_t region1;
@ -301,9 +292,7 @@ compare_in_naptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_in_naptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
void *source, isc_buffer_t *target)
{
fromstruct_in_naptr(ARGS_FROMSTRUCT) {
dns_rdata_in_naptr_t *naptr = source;
isc_region_t region;
@ -332,7 +321,7 @@ fromstruct_in_naptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
tostruct_in_naptr(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_in_naptr(ARGS_TOSTRUCT) {
dns_rdata_in_naptr_t *naptr = target;
isc_region_t r;
isc_result_t result;
@ -409,7 +398,7 @@ tostruct_in_naptr(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_in_naptr(void *source) {
freestruct_in_naptr(ARGS_FREESTRUCT) {
dns_rdata_in_naptr_t *naptr = source;
REQUIRE(source != NULL);
@ -430,9 +419,7 @@ freestruct_in_naptr(void *source) {
}
static inline isc_result_t
additionaldata_in_naptr(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_in_naptr(ARGS_ADDLDATA) {
dns_name_t name;
isc_region_t sr;
dns_rdatatype_t atype;
@ -489,7 +476,7 @@ additionaldata_in_naptr(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_in_naptr(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_in_naptr(ARGS_DIGEST) {
isc_region_t r1, r2;
unsigned int length, n;
isc_result_t result;

36
lib/dns/rdata/in_1/nsap-ptr_23.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: nsap-ptr_23.c,v 1.21 2000/05/22 12:38:09 marka Exp $ */
/* $Id: nsap-ptr_23.c,v 1.22 2000/06/01 18:26:46 tale Exp $ */
/* Reviewed: Fri Mar 17 10:16:02 PST 2000 by gson */
@ -27,10 +27,7 @@
#define RRTYPE_NSAP_PTR_ATTRIBUTES (0)
static inline isc_result_t
fromtext_in_nsap_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_in_nsap_ptr(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -47,9 +44,7 @@ fromtext_in_nsap_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_in_nsap_ptr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_in_nsap_ptr(ARGS_TOTEXT) {
isc_region_t region;
dns_name_t name;
dns_name_t prefix;
@ -70,10 +65,7 @@ totext_in_nsap_ptr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_in_nsap_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_in_nsap_ptr(ARGS_FROMWIRE) {
dns_name_t name;
REQUIRE(type == 23);
@ -86,9 +78,7 @@ fromwire_in_nsap_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_in_nsap_ptr(dns_rdata_t *rdata, dns_compress_t *cctx,
isc_buffer_t *target)
{
towire_in_nsap_ptr(ARGS_TOWIRE) {
dns_name_t name;
isc_region_t region;
@ -104,7 +94,7 @@ towire_in_nsap_ptr(dns_rdata_t *rdata, dns_compress_t *cctx,
}
static inline int
compare_in_nsap_ptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_in_nsap_ptr(ARGS_COMPARE) {
dns_name_t name1;
dns_name_t name2;
isc_region_t region1;
@ -128,9 +118,7 @@ compare_in_nsap_ptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_in_nsap_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
void *source, isc_buffer_t *target)
{
fromstruct_in_nsap_ptr(ARGS_FROMSTRUCT) {
dns_rdata_in_nsap_ptr_t *nsap_ptr = source;
isc_region_t region;
@ -145,7 +133,7 @@ fromstruct_in_nsap_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
tostruct_in_nsap_ptr(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_in_nsap_ptr(ARGS_TOSTRUCT) {
isc_region_t region;
dns_rdata_in_nsap_ptr_t *nsap_ptr = target;
dns_name_t name;
@ -168,7 +156,7 @@ tostruct_in_nsap_ptr(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_in_nsap_ptr(void *source) {
freestruct_in_nsap_ptr(ARGS_FREESTRUCT) {
dns_rdata_in_nsap_ptr_t *nsap_ptr = source;
REQUIRE(source != NULL);
@ -183,9 +171,7 @@ freestruct_in_nsap_ptr(void *source) {
}
static inline isc_result_t
additionaldata_in_nsap_ptr(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_in_nsap_ptr(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 23);
REQUIRE(rdata->rdclass == 1);
@ -197,7 +183,7 @@ additionaldata_in_nsap_ptr(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_in_nsap_ptr(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_in_nsap_ptr(ARGS_DIGEST) {
isc_region_t r;
dns_name_t name;

34
lib/dns/rdata/in_1/nsap_22.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: nsap_22.c,v 1.22 2000/05/24 05:09:33 tale Exp $ */
/* $Id: nsap_22.c,v 1.23 2000/06/01 18:26:47 tale Exp $ */
/* Reviewed: Fri Mar 17 10:41:07 PST 2000 by gson */
@ -27,9 +27,7 @@
#define RRTYPE_NSAP_ATTRIBUTES (0)
static inline isc_result_t
fromtext_in_nsap(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target) {
fromtext_in_nsap(ARGS_FROMTEXT) {
isc_token_t token;
isc_textregion_t *sr;
int n;
@ -74,9 +72,7 @@ fromtext_in_nsap(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_in_nsap(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_in_nsap(ARGS_TOTEXT) {
isc_region_t region;
char buf[sizeof "xx"];
@ -96,10 +92,7 @@ totext_in_nsap(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_in_nsap(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_in_nsap(ARGS_FROMWIRE) {
isc_region_t region;
REQUIRE(type == 22);
@ -118,8 +111,7 @@ fromwire_in_nsap(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_in_nsap(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
{
towire_in_nsap(ARGS_TOWIRE) {
REQUIRE(rdata->type == 22);
REQUIRE(rdata->rdclass == 1);
@ -129,7 +121,7 @@ towire_in_nsap(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
}
static inline int
compare_in_nsap(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_in_nsap(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
@ -144,9 +136,7 @@ compare_in_nsap(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_in_nsap(dns_rdataclass_t rdclass, dns_rdatatype_t type,
void *source, isc_buffer_t *target)
{
fromstruct_in_nsap(ARGS_FROMSTRUCT) {
dns_rdata_in_nsap_t *nsap = source;
REQUIRE(type == 22);
@ -161,7 +151,7 @@ fromstruct_in_nsap(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
tostruct_in_nsap(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_in_nsap(ARGS_TOSTRUCT) {
dns_rdata_in_nsap_t *nsap = target;
isc_region_t r;
@ -187,7 +177,7 @@ tostruct_in_nsap(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_in_nsap(void *source) {
freestruct_in_nsap(ARGS_FREESTRUCT) {
dns_rdata_in_nsap_t *nsap = source;
REQUIRE(source != NULL);
@ -203,9 +193,7 @@ freestruct_in_nsap(void *source) {
}
static inline isc_result_t
additionaldata_in_nsap(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_in_nsap(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 22);
REQUIRE(rdata->rdclass == 1);
@ -217,7 +205,7 @@ additionaldata_in_nsap(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_in_nsap(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_in_nsap(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == 22);

34
lib/dns/rdata/in_1/px_26.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: px_26.c,v 1.23 2000/05/15 21:14:34 tale Exp $ */
/* $Id: px_26.c,v 1.24 2000/06/01 18:26:48 tale Exp $ */
/* Reviewed: Mon Mar 20 10:44:27 PST 2000 */
@ -27,10 +27,7 @@
#define RRTYPE_PX_ATTRIBUTES (0)
static inline isc_result_t
fromtext_in_px(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_in_px(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -66,9 +63,7 @@ fromtext_in_px(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_in_px(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_in_px(ARGS_TOTEXT) {
isc_region_t region;
dns_name_t name;
dns_name_t prefix;
@ -110,10 +105,7 @@ totext_in_px(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_in_px(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_in_px(ARGS_FROMWIRE) {
dns_name_t name;
isc_region_t sregion;
@ -145,7 +137,7 @@ fromwire_in_px(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_in_px(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_in_px(ARGS_TOWIRE) {
dns_name_t name;
isc_region_t region;
@ -177,7 +169,7 @@ towire_in_px(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_in_px(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_in_px(ARGS_COMPARE) {
dns_name_t name1;
dns_name_t name2;
isc_region_t region1;
@ -219,9 +211,7 @@ compare_in_px(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_in_px(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_in_px(ARGS_FROMSTRUCT) {
dns_rdata_in_px_t *px = source;
isc_region_t region;
@ -239,7 +229,7 @@ fromstruct_in_px(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_in_px(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_in_px(ARGS_TOSTRUCT) {
dns_rdata_in_px_t *px = target;
dns_name_t name;
isc_region_t region;
@ -279,7 +269,7 @@ tostruct_in_px(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_in_px(void *source) {
freestruct_in_px(ARGS_FREESTRUCT) {
dns_rdata_in_px_t *px = source;
REQUIRE(source != NULL);
@ -295,9 +285,7 @@ freestruct_in_px(void *source) {
}
static inline isc_result_t
additionaldata_in_px(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_in_px(ARGS_ADDLDATA) {
REQUIRE(rdata->type == 26);
REQUIRE(rdata->rdclass == 1);
@ -309,7 +297,7 @@ additionaldata_in_px(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_in_px(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_in_px(ARGS_DIGEST) {
isc_region_t r1, r2;
dns_name_t name;
isc_result_t result;

34
lib/dns/rdata/in_1/srv_33.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: srv_33.c,v 1.25 2000/05/22 12:38:11 marka Exp $ */
/* $Id: srv_33.c,v 1.26 2000/06/01 18:26:50 tale Exp $ */
/* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */
@ -27,10 +27,7 @@
#define RRTYPE_SRV_ATTRIBUTES (0)
static inline isc_result_t
fromtext_in_srv(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_in_srv(ARGS_FROMTEXT) {
isc_token_t token;
dns_name_t name;
isc_buffer_t buffer;
@ -73,9 +70,7 @@ fromtext_in_srv(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_in_srv(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_in_srv(ARGS_TOTEXT) {
isc_region_t region;
dns_name_t name;
dns_name_t prefix;
@ -126,10 +121,7 @@ totext_in_srv(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_in_srv(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_in_srv(ARGS_FROMWIRE) {
dns_name_t name;
isc_region_t sr;
@ -156,7 +148,7 @@ fromwire_in_srv(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_in_srv(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_in_srv(ARGS_TOWIRE) {
dns_name_t name;
isc_region_t sr;
@ -179,7 +171,7 @@ towire_in_srv(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_in_srv(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_in_srv(ARGS_COMPARE) {
dns_name_t name1;
dns_name_t name2;
isc_region_t region1;
@ -217,9 +209,7 @@ compare_in_srv(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_in_srv(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_in_srv(ARGS_FROMSTRUCT) {
dns_rdata_in_srv_t *srv = source;
isc_region_t region;
@ -237,7 +227,7 @@ fromstruct_in_srv(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_in_srv(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_in_srv(ARGS_TOSTRUCT) {
isc_region_t region;
dns_rdata_in_srv_t *srv = target;
dns_name_t name;
@ -266,7 +256,7 @@ tostruct_in_srv(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_in_srv(void *source) {
freestruct_in_srv(ARGS_FREESTRUCT) {
dns_rdata_in_srv_t *srv = source;
REQUIRE(source != NULL);
@ -281,9 +271,7 @@ freestruct_in_srv(void *source) {
}
static inline isc_result_t
additionaldata_in_srv(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_in_srv(ARGS_ADDLDATA) {
dns_name_t name;
isc_region_t region;
@ -299,7 +287,7 @@ additionaldata_in_srv(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_in_srv(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_in_srv(ARGS_DIGEST) {
isc_region_t r1, r2;
dns_name_t name;

36
lib/dns/rdata/in_1/wks_11.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: wks_11.c,v 1.31 2000/05/22 12:38:12 marka Exp $ */
/* $Id: wks_11.c,v 1.32 2000/06/01 18:26:51 tale Exp $ */
/* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */
@ -31,10 +31,7 @@
#define RRTYPE_WKS_ATTRIBUTES (0)
static inline isc_result_t
fromtext_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_lex_t *lexer, dns_name_t *origin,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromtext_in_wks(ARGS_FROMTEXT) {
isc_token_t token;
isc_region_t region;
struct in_addr addr;
@ -45,7 +42,7 @@ fromtext_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type,
unsigned char bm[8*1024]; /* 64k bits */
long port;
long maxport = -1;
char *ps = NULL;
const char *ps = NULL;
unsigned int n;
char service[32];
int i;
@ -135,9 +132,7 @@ fromtext_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
totext_in_wks(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
isc_buffer_t *target)
{
totext_in_wks(ARGS_TOTEXT) {
isc_region_t sr;
isc_region_t tr;
unsigned short proto;
@ -178,10 +173,7 @@ totext_in_wks(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
}
static inline isc_result_t
fromwire_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type,
isc_buffer_t *source, dns_decompress_t *dctx,
isc_boolean_t downcase, isc_buffer_t *target)
{
fromwire_in_wks(ARGS_FROMWIRE) {
isc_region_t sr;
isc_region_t tr;
@ -209,7 +201,7 @@ fromwire_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type,
}
static inline isc_result_t
towire_in_wks(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
towire_in_wks(ARGS_TOWIRE) {
isc_region_t sr;
UNUSED(cctx);
@ -222,7 +214,7 @@ towire_in_wks(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
}
static inline int
compare_in_wks(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
compare_in_wks(ARGS_COMPARE) {
isc_region_t r1;
isc_region_t r2;
@ -237,9 +229,7 @@ compare_in_wks(dns_rdata_t *rdata1, dns_rdata_t *rdata2) {
}
static inline isc_result_t
fromstruct_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
isc_buffer_t *target)
{
fromstruct_in_wks(ARGS_FROMSTRUCT) {
dns_rdata_in_wks_t *wks = source;
isc_uint32_t a;
@ -256,7 +246,7 @@ fromstruct_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source,
}
static inline isc_result_t
tostruct_in_wks(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
tostruct_in_wks(ARGS_TOSTRUCT) {
dns_rdata_in_wks_t *wks = target;
isc_uint32_t n;
isc_region_t region;
@ -286,7 +276,7 @@ tostruct_in_wks(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
}
static inline void
freestruct_in_wks(void *source) {
freestruct_in_wks(ARGS_FREESTRUCT) {
dns_rdata_in_wks_t *wks = source;
REQUIRE(source != NULL);
@ -302,9 +292,7 @@ freestruct_in_wks(void *source) {
}
static inline isc_result_t
additionaldata_in_wks(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
void *arg)
{
additionaldata_in_wks(ARGS_ADDLDATA) {
UNUSED(rdata);
UNUSED(add);
UNUSED(arg);
@ -316,7 +304,7 @@ additionaldata_in_wks(dns_rdata_t *rdata, dns_additionaldatafunc_t add,
}
static inline isc_result_t
digest_in_wks(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) {
digest_in_wks(ARGS_DIGEST) {
isc_region_t r;
REQUIRE(rdata->type == 11);

16
lib/dns/resolver.c
View file

@ -1798,7 +1798,6 @@ fctx_start(isc_task_t *task, isc_event_t *event) {
res = fctx->res;
bucketnum = fctx->bucketnum;
UNUSED(task);
FCTXTRACE("start");
@ -1833,11 +1832,13 @@ fctx_start(isc_task_t *task, isc_event_t *event) {
fctx->state = fetchstate_active;
/*
* Reset the control event for later use in shutting down
* the fctx.
* the fctx. "task" is set as the sender only to satisfy
* the requirement that the sender is non-null, but it is not
* used by the event receiver.
*/
ISC_EVENT_INIT(event, sizeof(*event), 0, NULL,
DNS_EVENT_FETCHCONTROL, fctx_doshutdown, fctx,
(void *)fctx_doshutdown, NULL, NULL);
task, NULL, NULL);
}
UNLOCK(&res->buckets[bucketnum].lock);
@ -2791,7 +2792,7 @@ mark_related(dns_name_t *name, dns_rdataset_t *rdataset,
}
static isc_result_t
check_related(void *arg, dns_name_t *addname, dns_rdatatype_t type) {
check_related(void *arg, dns_name_t *addname, int type) {
fetchctx_t *fctx = arg;
isc_result_t result;
dns_name_t *name;
@ -4532,12 +4533,15 @@ dns_resolver_createfetch(dns_resolver_t *res, dns_name_t *name,
if (new_fctx) {
if (result == ISC_R_SUCCESS) {
/*
* Launch this fctx.
* Launch this fctx. "task" is set as the sender only
* to satisfy * the requirement that the sender is
* non-null, but it is not * used by the event
* receiver.
*/
event = &fctx->control_event;
ISC_EVENT_INIT(event, sizeof(*event), 0, NULL,
DNS_EVENT_FETCHCONTROL,
fctx_start, fctx, (void *)fctx_create,
fctx_start, fctx, task,
NULL, NULL);
isc_task_send(res->buckets[bucketnum].task, &event);
} else {

6
lib/dns/result.c
View file

@ -23,7 +23,7 @@
#include <dns/result.h>
#include <dns/lib.h>
static char *text[DNS_R_NRESULTS] = {
static const char *text[DNS_R_NRESULTS] = {
"label too long", /* 0 */
"bad escape", /* 1 */
"bad bitstring", /* 2 */
@ -88,7 +88,7 @@ static char *text[DNS_R_NRESULTS] = {
"not insecure" /* 61 */
};
static char *rcode_text[DNS_R_NRCODERESULTS] = {
static const char *rcode_text[DNS_R_NRCODERESULTS] = {
"NOERROR", /* 0 */
"FORMERR", /* 1 */
"SERVFAIL", /* 2 */
@ -135,7 +135,7 @@ initialize(void) {
RUNTIME_CHECK(isc_once_do(&once, initialize_action) == ISC_R_SUCCESS);
}
char *
const char *
dns_result_totext(isc_result_t result) {
initialize();

7
lib/dns/sec/dst/dst_api.c
View file

@ -19,7 +19,7 @@
/*
* Principal Author: Brian Wellington
* $Id: dst_api.c,v 1.41 2000/05/24 23:13:28 bwelling Exp $
* $Id: dst_api.c,v 1.42 2000/06/01 18:26:52 tale Exp $
*/
#include <config.h>
@ -759,8 +759,9 @@ dst_key_isnullkey(const dst_key_t *key) {
}
isc_result_t
dst_key_buildfilename(const dst_key_t *key, const int type, isc_buffer_t *out) {
char *suffix;
dst_key_buildfilename(const dst_key_t *key, const int type, isc_buffer_t *out)
{
const char *suffix;
unsigned int len;
isc_result_t result;

8
lib/dns/sec/dst/dst_parse.c
View file

@ -19,7 +19,7 @@
/*
* Principal Author: Brian Wellington
* $Id: dst_parse.c,v 1.16 2000/05/15 23:14:11 bwelling Exp $
* $Id: dst_parse.c,v 1.17 2000/06/01 18:26:53 tale Exp $
*/
#include <config.h>
@ -48,7 +48,7 @@
struct parse_map {
int value;
char *tag;
const char *tag;
};
static struct parse_map map[] = {
@ -89,7 +89,7 @@ find_value(const char *s, const int alg) {
}
}
static char *
static const char *
find_tag(const int value) {
int i;
@ -362,7 +362,7 @@ dst_s_write_private_key_file(const dst_key_t *key, const dst_private_t *priv) {
for (i = 0; i < priv->nelements; i++) {
isc_buffer_t b;
isc_region_t r;
char *s;
const char *s;
s = find_tag(priv->elements[i].tag);

6
lib/dns/sec/dst/dst_result.c
View file

@ -17,7 +17,7 @@
/*
* Principal Author: Brian Wellington
* $Id: dst_result.c,v 1.8 2000/05/08 14:37:05 tale Exp $
* $Id: dst_result.c,v 1.9 2000/06/01 18:26:54 tale Exp $
*/
#include <config.h>
@ -28,7 +28,7 @@
#include <dst/result.h>
#include <dst/lib.h>
static char *text[DST_R_NRESULTS] = {
static const char *text[DST_R_NRESULTS] = {
"algorithm is unsupported", /* 0 */
"key type is unsupported", /* 1 */
"signature mode is unsupported", /* 2 */
@ -72,7 +72,7 @@ initialize(void) {
RUNTIME_CHECK(isc_once_do(&once, initialize_action) == ISC_R_SUCCESS);
}
char *
const char *
dst_result_totext(isc_result_t result) {
initialize();

2
lib/dns/sec/dst/include/dst/result.h
View file

@ -54,7 +54,7 @@
ISC_LANG_BEGINDECLS
char *
const char *
dst_result_totext(isc_result_t);
void

19
lib/dns/tsig.c
View file

@ -16,7 +16,7 @@
*/
/*
* $Id: tsig.c,v 1.67 2000/05/31 23:58:34 bwelling Exp $
* $Id: tsig.c,v 1.68 2000/06/01 18:25:38 tale Exp $
* Principal Author: Brian Wellington
*/
@ -829,7 +829,6 @@ dns_tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) {
dns_tsigkey_t *tsigkey;
dst_key_t *key = NULL;
unsigned char header[DNS_MESSAGE_HEADERLEN];
isc_mem_t *mctx;
isc_uint16_t addcount, id;
isc_boolean_t has_tsig = ISC_FALSE;
@ -840,8 +839,6 @@ dns_tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) {
REQUIRE(is_response(msg));
REQUIRE(msg->querytsig != NULL);
mctx = msg->mctx;
tsigkey = dns_message_gettsigkey(msg);
if (msg->tsig != NULL) {
@ -1041,19 +1038,19 @@ dns_tsigkey_find(dns_tsigkey_t **tsigkey, dns_name_t *name,
}
static void
dns_tsig_inithmac() {
isc_region_t r;
char *str = "\010HMAC-MD5\007SIG-ALG\003REG\003INT";
dns_tsig_inithmac(void) {
isc_constregion_t r;
const char *str = "\010HMAC-MD5\007SIG-ALG\003REG\003INT";
dns_name_init(&hmacmd5_name, NULL);
r.base = (unsigned char *)str;
r.base = str;
r.length = strlen(str) + 1;
dns_name_fromregion(&hmacmd5_name, &r);
dns_name_fromregion(&hmacmd5_name, (isc_region_t *)&r);
dns_tsig_hmacmd5_name = &hmacmd5_name;
}
isc_result_t
dns_tsigkeyring_create(isc_mem_t *mctx, dns_tsig_keyring_t **ring)
{
dns_tsigkeyring_create(isc_mem_t *mctx, dns_tsig_keyring_t **ring) {
isc_result_t ret;
REQUIRE(mctx != NULL);

4
lib/dns/ttl.c
View file

@ -43,12 +43,13 @@ static isc_result_t bind_ttl(isc_textregion_t *source, isc_uint32_t *ttl);
* Helper for dns_ttl_totext().
*/
static isc_result_t
ttlfmt(unsigned int t, char *s, isc_boolean_t verbose,
ttlfmt(unsigned int t, const char *s, isc_boolean_t verbose,
isc_boolean_t space, isc_buffer_t *target)
{
char tmp[60];
size_t len;
isc_region_t region;
if (verbose)
len = snprintf(tmp, sizeof(tmp), "%s%u %s%s",
space ? " " : "",
@ -63,6 +64,7 @@ ttlfmt(unsigned int t, char *s, isc_boolean_t verbose,
return (ISC_R_NOSPACE);
memcpy(region.base, tmp, len);
isc_buffer_add(target, len);
return (ISC_R_SUCCESS);
}

4
lib/dns/zone.c
View file

@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: zone.c,v 1.134 2000/06/01 00:30:54 explorer Exp $ */
/* $Id: zone.c,v 1.135 2000/06/01 18:25:40 tale Exp $ */
#include <config.h>
@ -465,7 +465,7 @@ dns_zone_settype(dns_zone_t *zone, dns_zonetype_t type) {
}
isc_result_t
dns_zone_setdbtype(dns_zone_t *zone, char *db_type) {
dns_zone_setdbtype(dns_zone_t *zone, const char *db_type) {
isc_result_t result = ISC_R_SUCCESS;
REQUIRE(DNS_ZONE_VALID(zone));