From d981ca645597116d227a48bf37cc5edc061c854d Mon Sep 17 00:00:00 2001 From: Bob Halley Date: Mon, 2 Aug 1999 22:18:31 +0000 Subject: [PATCH] class to rdclass; additional data support --- lib/dns/gen.c | 87 +++++++++++++++++------------- lib/dns/include/dns/rdata.h | 45 +++++++++++++--- lib/dns/rdata.c | 53 ++++++++++++------ lib/dns/rdata/any_255/tsig_250.c | 38 ++++++++----- lib/dns/rdata/generic/afsdb_18.c | 29 +++++++--- lib/dns/rdata/generic/cert_37.c | 29 +++++++--- lib/dns/rdata/generic/cname_5.c | 28 +++++++--- lib/dns/rdata/generic/dname_39.c | 29 +++++++--- lib/dns/rdata/generic/gpos_27.c | 29 +++++++--- lib/dns/rdata/generic/hinfo_13.c | 29 +++++++--- lib/dns/rdata/generic/isdn_20.c | 29 +++++++--- lib/dns/rdata/generic/key_25.c | 29 +++++++--- lib/dns/rdata/generic/loc_29.c | 29 +++++++--- lib/dns/rdata/generic/mb_7.c | 29 +++++++--- lib/dns/rdata/generic/md_3.c | 29 +++++++--- lib/dns/rdata/generic/mf_4.c | 29 +++++++--- lib/dns/rdata/generic/mg_8.c | 29 +++++++--- lib/dns/rdata/generic/minfo_14.c | 29 +++++++--- lib/dns/rdata/generic/mr_9.c | 29 +++++++--- lib/dns/rdata/generic/mx_15.c | 29 +++++++--- lib/dns/rdata/generic/ns_2.c | 31 +++++++---- lib/dns/rdata/generic/null_10.c | 31 +++++++---- lib/dns/rdata/generic/nxt_30.c | 29 +++++++--- lib/dns/rdata/generic/proforma.c | 38 ++++++++----- lib/dns/rdata/generic/ptr_12.c | 29 +++++++--- lib/dns/rdata/generic/rp_17.c | 29 +++++++--- lib/dns/rdata/generic/rt_21.c | 29 +++++++--- lib/dns/rdata/generic/sig_24.c | 29 +++++++--- lib/dns/rdata/generic/soa_6.c | 31 +++++++---- lib/dns/rdata/generic/tkey_249.c | 29 +++++++--- lib/dns/rdata/generic/txt_16.c | 29 +++++++--- lib/dns/rdata/generic/unspec_103.c | 29 +++++++--- lib/dns/rdata/generic/x25_19.c | 29 +++++++--- lib/dns/rdata/in_1/a6_38.c | 38 ++++++++----- lib/dns/rdata/in_1/a_1.c | 38 ++++++++----- lib/dns/rdata/in_1/aaaa_28.c | 40 +++++++++----- lib/dns/rdata/in_1/kx_36.c | 38 ++++++++----- lib/dns/rdata/in_1/naptr_35.c | 38 ++++++++----- lib/dns/rdata/in_1/nsap-ptr_23.c | 38 ++++++++----- lib/dns/rdata/in_1/nsap_22.c | 40 +++++++++----- lib/dns/rdata/in_1/px_26.c | 38 ++++++++----- lib/dns/rdata/in_1/srv_33.c | 36 +++++++++---- lib/dns/rdata/in_1/wks_11.c | 38 ++++++++----- lib/dns/rdataset.c | 32 +++++++++++ 44 files changed, 1059 insertions(+), 433 deletions(-) diff --git a/lib/dns/gen.c b/lib/dns/gen.c index dc5757b65a..f90bcbac2c 100644 --- a/lib/dns/gen.c +++ b/lib/dns/gen.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: gen.c,v 1.21 1999/07/03 20:55:16 halley Exp $ */ + /* $Id: gen.c,v 1.22 1999/08/02 22:18:30 halley Exp $ */ #include @@ -31,39 +31,39 @@ #include -#define FROMTEXTDECL "dns_rdataclass_t class, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target" -#define FROMTEXTARGS "class, type, lexer, origin, downcase, target" -#define FROMTEXTCLASS "class" +#define FROMTEXTDECL "dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, isc_buffer_t *target" +#define FROMTEXTARGS "rdclass, type, lexer, origin, downcase, target" +#define FROMTEXTCLASS "rdclass" #define FROMTEXTTYPE "type" #define FROMTEXTDEF "use_default = ISC_TRUE" #define TOTEXTDECL "dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target" #define TOTEXTARGS "rdata, tctx, target" -#define TOTEXTCLASS "rdata->class" +#define TOTEXTCLASS "rdata->rdclass" #define TOTEXTTYPE "rdata->type" #define TOTEXTDEF "use_default = ISC_TRUE" -#define FROMWIREDECL "dns_rdataclass_t class, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target" -#define FROMWIREARGS "class, type, source, dctx, downcase, target" -#define FROMWIRECLASS "class" +#define FROMWIREDECL "dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, isc_buffer_t *target" +#define FROMWIREARGS "rdclass, type, source, dctx, downcase, target" +#define FROMWIRECLASS "rdclass" #define FROMWIRETYPE "type" #define FROMWIREDEF "use_default = ISC_TRUE" #define TOWIREDECL "dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target" #define TOWIREARGS "rdata, cctx, target" -#define TOWIRECLASS "rdata->class" +#define TOWIRECLASS "rdata->rdclass" #define TOWIRETYPE "rdata->type" #define TOWIREDEF "use_default = ISC_TRUE" -#define FROMSTRUCTDECL "dns_rdataclass_t class, dns_rdatatype_t type, void *source, isc_buffer_t *target" -#define FROMSTRUCTARGS "class, type, source, target" -#define FROMSTRUCTCLASS "class" +#define FROMSTRUCTDECL "dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target" +#define FROMSTRUCTARGS "rdclass, type, source, target" +#define FROMSTRUCTCLASS "rdclass" #define FROMSTRUCTTYPE "type" #define FROMSTRUCTDEF "use_default = ISC_TRUE" #define TOSTRUCTDECL "dns_rdata_t *rdata, void *target, isc_mem_t *mctx" #define TOSTRUCTARGS "rdata, target, mctx" -#define TOSTRUCTCLASS "rdata->class" +#define TOSTRUCTCLASS "rdata->rdclass" #define TOSTRUCTTYPE "rdata->type" #define TOSTRUCTDEF "use_default = ISC_TRUE" @@ -75,10 +75,17 @@ #define COMPAREDECL "dns_rdata_t *rdata1, dns_rdata_t *rdata2" #define COMPAREARGS "rdata1, rdata2" -#define COMPARECLASS "rdata1->class" +#define COMPARECLASS "rdata1->rdclass" #define COMPARETYPE "rdata1->type" #define COMPAREDEF "use_default = ISC_TRUE" +#define ADDITIONALDATADECL \ + "dns_rdata_t *rdata, dns_additionaldatafunc_t add, void *arg" +#define ADDITIONALDATAARGS "rdata, add, arg" +#define ADDITIONALDATACLASS "rdata->rdclass" +#define ADDITIONALDATATYPE "rdata->type" +#define ADDITIONALDATADEF "use_default = ISC_TRUE" + char copyright[] = "/*\n\ * Copyright (C) 1998%s Internet Software Consortium.\n\ @@ -102,13 +109,13 @@ char copyright[] = struct cc { struct cc *next; - int class; + int rdclass; char classname[11]; } *classes; struct tt { struct tt *next; - int class; + int rdclass; int type; char classname[11]; char typename[11]; @@ -178,12 +185,12 @@ doswitch(char *name, char *function, char *args, fputs("\t\tbreak; \\\n", stdout); subswitch = 0; } - if (tt->class && tt->type != lasttype) { + if (tt->rdclass && tt->type != lasttype) { fprintf(stdout, "\tcase %d: switch (%s) { \\\n" /*}*/, tt->type, csw); subswitch = 1; } - if (tt->class == 0) + if (tt->rdclass == 0) fprintf(stdout, "\tcase %d:%s %s_%s(%s); break;", tt->type, result, function, @@ -191,7 +198,7 @@ doswitch(char *name, char *function, char *args, else fprintf(stdout, "\t\tcase %d:%s %s_%s_%s(%s); break;", - tt->class, result, function, + tt->rdclass, result, function, funname(tt->classname, buf1), funname(tt->typename, buf2), args); fputs(" \\\n", stdout); @@ -226,7 +233,7 @@ dodecl(char *type, char *function, char *args) { fputs("\n", stdout); for (tt = types; tt ; tt = tt->next) - if (tt->class) + if (tt->rdclass) fprintf(stdout, "static %s %s_%s_%s(%s);\n", type, function, @@ -240,7 +247,7 @@ dodecl(char *type, char *function, char *args) { } void -add(int class, char *classname, int type, char *typename, char *dirname) { +add(int rdclass, char *classname, int type, char *typename, char *dirname) { struct tt *newtt = (struct tt *)malloc(sizeof *newtt); struct tt *tt, *oldtt; struct cc *newcc; @@ -250,7 +257,7 @@ add(int class, char *classname, int type, char *typename, char *dirname) { exit(1); newtt->next = NULL; - newtt->class = class; + newtt->rdclass = rdclass; newtt->type = type; strcpy(newtt->classname, classname); strcpy(newtt->typename, typename); @@ -264,14 +271,14 @@ add(int class, char *classname, int type, char *typename, char *dirname) { tt = tt->next; } - while ((tt != NULL) && (tt->type == type) && (tt->class < class)) { + while ((tt != NULL) && (tt->type == type) && (tt->rdclass < rdclass)) { if (strcmp(tt->typename, typename) != 0) exit(1); oldtt = tt; tt = tt->next; } - if ((tt != NULL) && (tt->type == type) && (tt->class == class)) + if ((tt != NULL) && (tt->type == type) && (tt->rdclass == rdclass)) exit(1); newtt->next = tt; @@ -282,21 +289,21 @@ add(int class, char *classname, int type, char *typename, char *dirname) { /* do a class switch for this type */ - if (class == 0) + if (rdclass == 0) return; newcc = (struct cc *)malloc(sizeof *newcc); - newcc->class = class; + newcc->rdclass = rdclass; strcpy(newcc->classname, classname); cc = classes; oldcc = NULL; - while ((cc != NULL) && (cc->class < class)) { + while ((cc != NULL) && (cc->rdclass < rdclass)) { oldcc = cc; cc = cc->next; } - if ((cc != NULL) && cc->class == class) { + if ((cc != NULL) && cc->rdclass == rdclass) { free((char *)newcc); return; } @@ -309,7 +316,7 @@ add(int class, char *classname, int type, char *typename, char *dirname) { } void -sd(int class, char *classname, char *dir, char filetype) { +sd(int rdclass, char *classname, char *dir, char filetype) { char buf[sizeof "0123456789_65535.h"]; char fmt[sizeof "%10[-0-9a-z]_%d.h"]; DIR *d; @@ -330,7 +337,7 @@ sd(int class, char *classname, char *dir, char filetype) { sprintf(buf, "%s_%d.%c", typename, type, filetype); if (strcmp(buf, dp->d_name) != 0) continue; - add(class, classname, type, typename, dir); + add(rdclass, classname, type, typename, dir); } closedir(d); } @@ -340,7 +347,7 @@ main(int argc, char **argv) { DIR *d; char buf[256]; /* XXX Should be max path length */ char srcdir[256]; /* XXX Should be max path length */ - int class; + int rdclass; char classname[11]; struct dirent *dp; struct tt *tt; @@ -403,15 +410,15 @@ main(int argc, char **argv) { while ((dp = readdir(d)) != NULL) { if (sscanf(dp->d_name, "%10[0-9a-z]_%d", - classname, &class) != 2) + classname, &rdclass) != 2) continue; - if ((class > 65535) || (class < 0)) + if ((rdclass > 65535) || (rdclass < 0)) continue; - sprintf(buf, "%srdata/%s_%d", srcdir, classname, class); + sprintf(buf, "%srdata/%s_%d", srcdir, classname, rdclass); if (strcmp(buf + 6 + strlen(srcdir), dp->d_name) != 0) continue; - sd(class, classname, buf, filetype); + sd(rdclass, classname, buf, filetype); } closedir(d); sprintf(buf, "%srdata/generic", srcdir); @@ -436,6 +443,7 @@ main(int argc, char **argv) { dodecl("dns_result_t", "fromstruct", FROMSTRUCTDECL); dodecl("dns_result_t", "tostruct", TOSTRUCTDECL); dodecl("void", "freestruct", FREESTRUCTDECL); + dodecl("dns_result_t", "additionaldata", ADDITIONALDATADECL); doswitch("FROMTEXTSWITCH", "fromtext", FROMTEXTARGS, FROMTEXTTYPE, FROMTEXTCLASS, FROMTEXTDEF); @@ -453,6 +461,9 @@ main(int argc, char **argv) { TOSTRUCTTYPE, TOSTRUCTCLASS, TOSTRUCTDEF); doswitch("FREESTRUCTSWITCH", "freestruct", FREESTRUCTARGS, FREESTRUCTTYPE, FREESTRUCTCLASS, FREESTRUCTDEF); + doswitch("ADDITIONALDATASWITCH", "additionaldata", + ADDITIONALDATAARGS, ADDITIONALDATATYPE, + ADDITIONALDATACLASS, ADDITIONALDATADEF); fprintf(stdout, "\n#define TYPENAMES%s\n", types != NULL ? " \\" : ""); @@ -470,8 +481,8 @@ main(int argc, char **argv) { classes != NULL ? " \\" : ""); for (cc = classes; cc != NULL; cc = cc->next) - fprintf(stdout, "\t{ %d, \"%s\", 0 },%s\n", cc->class, - upper(cc->classname), + fprintf(stdout, "\t{ %d, \"%s\", 0 },%s\n", + cc->rdclass, upper(cc->classname), cc->next != NULL ? " \\" : ""); @@ -500,7 +511,7 @@ main(int argc, char **argv) { for (cc = classes; cc != NULL; cc = cc->next) fprintf(stdout, "\t dns_rdataclass_%s = %d,%s\n", funname(cc->classname, buf1), - cc->class, + cc->rdclass, cc->next != NULL ? " \\" : ""); fprintf(stdout, "#endif /* CLASSENUM */\n"); } else if (structs) { diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h index 1c6b0db20c..e36f39777e 100644 --- a/lib/dns/include/dns/rdata.h +++ b/lib/dns/include/dns/rdata.h @@ -121,7 +121,7 @@ ISC_LANG_BEGINDECLS struct dns_rdata { unsigned char * data; unsigned int length; - dns_rdataclass_t class; + dns_rdataclass_t rdclass; dns_rdatatype_t type; ISC_LINK(dns_rdata_t) link; }; @@ -177,7 +177,7 @@ int dns_rdata_compare(dns_rdata_t *rdata1, dns_rdata_t *rdata2); ***/ void dns_rdata_fromregion(dns_rdata_t *rdata, - dns_rdataclass_t class, dns_rdatatype_t type, + dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_region_t *r); /* * Make 'rdata' refer to region 'r'. @@ -193,7 +193,7 @@ void dns_rdata_toregion(dns_rdata_t *rdata, isc_region_t *r); */ dns_result_t dns_rdata_fromwire(dns_rdata_t *rdata, - dns_rdataclass_t class, dns_rdatatype_t type, + dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_t *source, dns_decompress_t *dctx, isc_boolean_t downcase, @@ -209,7 +209,7 @@ dns_result_t dns_rdata_fromwire(dns_rdata_t *rdata, * * Requires: * - * 'class' and 'type' are valid. + * 'rdclass' and 'type' are valid. * * 'source' is a valid binary buffer, and the active region of 'source' * references the rdata to be processed. @@ -267,7 +267,7 @@ dns_result_t dns_rdata_towire(dns_rdata_t *rdata, */ dns_result_t dns_rdata_fromtext(dns_rdata_t *rdata, - dns_rdataclass_t class, dns_rdatatype_t type, + dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_lex_t *lexer, dns_name_t *origin, isc_boolean_t downcase, @@ -287,7 +287,7 @@ dns_result_t dns_rdata_fromtext(dns_rdata_t *rdata, * * Requires: * - * 'class' and 'type' are valid. + * 'rdclass' and 'type' are valid. * * 'lexer' is a valid isc_lex_t. * @@ -372,7 +372,8 @@ dns_result_t dns_rdata_tofmttext(dns_rdata_t *rdata, dns_name_t *origin, */ dns_result_t dns_rdata_fromstruct(dns_rdata_t *rdata, - dns_rdataclass_t class, dns_rdatatype_t type, + dns_rdataclass_t rdclass, + dns_rdatatype_t type, void *source, isc_buffer_t *target); /* @@ -383,7 +384,7 @@ dns_result_t dns_rdata_fromstruct(dns_rdata_t *rdata, * * Requires: * - * 'class' and 'type' are valid. + * 'rdclass' and 'type' are valid. * * 'source' points to a valid C struct for the class and type. * @@ -438,6 +439,34 @@ isc_boolean_t dns_rdatatype_ismeta(dns_rdatatype_t type); * */ +dns_result_t +dns_rdata_additionaldata(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg); +/* + * Call 'add' for each name and type from 'rdata' which is subject to + * additional section processing. + * + * Requires: + * + * 'rdata' is a valid, non-empty rdata. + * + * 'add' is a valid dns_additionalfunc_t. + * + * Ensures: + * + * If successful, then add() will have been called for each name + * and type subject to additional section processing. + * + * If add() returns something other than DNS_R_SUCCESS, that result + * will be returned as the result of dns_rdata_additionaldata(). + * + * Returns: + * + * DNS_R_SUCCESS + * + * Many other results are possible if not successful. + */ + ISC_LANG_ENDDECLS #endif /* DNS_RDATA_H */ diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c index 67526dd2b4..2aeaaa23fc 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: rdata.c,v 1.55 1999/07/24 01:01:08 halley Exp $ */ + /* $Id: rdata.c,v 1.56 1999/08/02 22:18:30 halley Exp $ */ #include @@ -195,7 +195,7 @@ dns_rdata_init(dns_rdata_t *rdata) { rdata->data = NULL; rdata->length = 0; - rdata->class = 0; + rdata->rdclass = 0; rdata->type = 0; ISC_LINK_INIT(rdata, link); /* ISC_LIST_INIT(rdata->list); */ @@ -215,8 +215,8 @@ dns_rdata_compare(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { REQUIRE(rdata1->data != NULL); REQUIRE(rdata2->data != NULL); - if (rdata1->class != rdata2->class) - return (rdata1->class < rdata2->class ? -1 : 1); + if (rdata1->rdclass != rdata2->rdclass) + return (rdata1->rdclass < rdata2->rdclass ? -1 : 1); if (rdata1->type != rdata2->type) return (rdata1->type < rdata2->type ? -1 : 1); @@ -239,7 +239,7 @@ dns_rdata_compare(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { ***/ void -dns_rdata_fromregion(dns_rdata_t *rdata, dns_rdataclass_t class, +dns_rdata_fromregion(dns_rdata_t *rdata, dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_region_t *r) { @@ -248,7 +248,7 @@ dns_rdata_fromregion(dns_rdata_t *rdata, dns_rdataclass_t class, rdata->data = r->base; rdata->length = r->length; - rdata->class = class; + rdata->rdclass = rdclass; rdata->type = type; } @@ -263,7 +263,7 @@ dns_rdata_toregion(dns_rdata_t *rdata, isc_region_t *r) { } dns_result_t -dns_rdata_fromwire(dns_rdata_t *rdata, dns_rdataclass_t class, +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) @@ -294,7 +294,7 @@ dns_rdata_fromwire(dns_rdata_t *rdata, dns_rdataclass_t class, if (rdata && result == DNS_R_SUCCESS) { region.length = target->used - st.used; - dns_rdata_fromregion(rdata, class, type, ®ion); + dns_rdata_fromregion(rdata, rdclass, type, ®ion); } if (result != DNS_R_SUCCESS) { @@ -335,7 +335,7 @@ dns_rdata_towire(dns_rdata_t *rdata, dns_compress_t *cctx, } dns_result_t -dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t class, +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) @@ -420,7 +420,7 @@ dns_rdata_fromtext(dns_rdata_t *rdata, dns_rdataclass_t class, if (rdata != NULL && result == DNS_R_SUCCESS) { region.length = target->used - st.used; - dns_rdata_fromregion(rdata, class, type, ®ion); + dns_rdata_fromregion(rdata, rdclass, type, ®ion); } if (result != DNS_R_SUCCESS) { *target = st; @@ -485,7 +485,7 @@ dns_rdata_tofmttext(dns_rdata_t *rdata, dns_name_t *origin, } dns_result_t -dns_rdata_fromstruct(dns_rdata_t *rdata, dns_rdataclass_t class, +dns_rdata_fromstruct(dns_rdata_t *rdata, dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { @@ -507,7 +507,7 @@ dns_rdata_fromstruct(dns_rdata_t *rdata, dns_rdataclass_t class, if (rdata != NULL && result == DNS_R_SUCCESS) { region.length = target->used - st.used; - dns_rdata_fromregion(rdata, class, type, ®ion); + dns_rdata_fromregion(rdata, rdclass, type, ®ion); } if (result != DNS_R_SUCCESS) *target = st; @@ -537,6 +537,29 @@ dns_rdata_freestruct(void *source) { FREESTRUCTSWITCH } +dns_result_t +dns_rdata_additionaldata(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + dns_result_t result = ISC_R_SUCCESS; + isc_boolean_t use_default = ISC_FALSE; + + /* + * Call 'add' for each name and type from 'rdata' which is subject to + * additional section processing. + */ + + REQUIRE(rdata != NULL); + REQUIRE(add != NULL); + + ADDITIONALDATASWITCH + + if (use_default) + (void)NULL; + + return (result); +} + dns_result_t dns_rdataclass_fromtext(dns_rdataclass_t *classp, isc_textregion_t *source) { int i = 0; @@ -557,17 +580,17 @@ dns_rdataclass_fromtext(dns_rdataclass_t *classp, isc_textregion_t *source) { } dns_result_t -dns_rdataclass_totext(dns_rdataclass_t class, isc_buffer_t *target) { +dns_rdataclass_totext(dns_rdataclass_t rdclass, isc_buffer_t *target) { int i = 0; char buf[sizeof "65000"]; while (classes[i].name != NULL) { - if (classes[i].value == class) { + if (classes[i].value == rdclass) { return (str_totext(classes[i].name, target)); } i++; } - sprintf(buf, "%u", class); + sprintf(buf, "%u", rdclass); return (str_totext(buf, target)); } diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c index 1d0aeb8411..0b08f8fad5 100644 --- a/lib/dns/rdata/any_255/tsig_250.c +++ b/lib/dns/rdata/any_255/tsig_250.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: tsig_250.c,v 1.12 1999/06/08 20:41:30 gson Exp $ */ + /* $Id: tsig_250.c,v 1.13 1999/08/02 22:17:58 halley Exp $ */ /* draft-ietf-dnsind-tsig-07.txt */ @@ -24,7 +24,7 @@ #include static dns_result_t -fromtext_any_tsig(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -35,7 +35,7 @@ fromtext_any_tsig(dns_rdataclass_t class, dns_rdatatype_t type, char *e; REQUIRE(type == 250); - REQUIRE(class == 255); + REQUIRE(rdclass == 255); /* Algorithm Name */ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); @@ -107,7 +107,7 @@ totext_any_tsig(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, unsigned short n; REQUIRE(rdata->type == 250); - REQUIRE(rdata->class == 255); + REQUIRE(rdata->rdclass == 255); dns_rdata_toregion(rdata, &sr); /* Algorithm Name */ @@ -185,7 +185,7 @@ totext_any_tsig(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_any_tsig(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -194,7 +194,7 @@ fromwire_any_tsig(dns_rdataclass_t class, dns_rdatatype_t type, unsigned long n; REQUIRE(type == 250); - REQUIRE(class == 255); + REQUIRE(rdclass == 255); if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -246,7 +246,7 @@ towire_any_tsig(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) dns_name_t name; REQUIRE(rdata->type == 250); - REQUIRE(rdata->class == 255); + REQUIRE(rdata->rdclass == 255); if (dns_compress_getedns(cctx) >= 1) dns_compress_setmethods(cctx, DNS_COMPRESS_ALL); @@ -270,9 +270,9 @@ compare_any_tsig(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { int result; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 250); - REQUIRE(rdata1->class == 255); + REQUIRE(rdata1->rdclass == 255); dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); @@ -289,12 +289,12 @@ compare_any_tsig(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_any_tsig(dns_rdataclass_t class, dns_rdatatype_t type, +fromstruct_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 250); - REQUIRE(class == 255); + REQUIRE(rdclass == 255); source = source; target = target; @@ -306,7 +306,7 @@ static dns_result_t tostruct_any_tsig(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 250); - REQUIRE(rdata->class == 255); + REQUIRE(rdata->rdclass == 255); target = target; mctx = mctx; @@ -324,4 +324,18 @@ freestruct_any_tsig(void *source) { REQUIRE(ISC_FALSE); } + +static dns_result_t +additionaldata_any_tsig(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 250); + REQUIRE(rdata->rdclass == 255); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_ANY_255_TSIG_250_C */ diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c index 569718d57f..cf8231785a 100644 --- a/lib/dns/rdata/generic/afsdb_18.c +++ b/lib/dns/rdata/generic/afsdb_18.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: afsdb_18.c,v 1.8 1999/06/08 10:35:09 gson Exp $ */ + /* $Id: afsdb_18.c,v 1.9 1999/08/02 22:17:58 halley Exp $ */ /* RFC 1183 */ @@ -23,7 +23,7 @@ #define RDATA_GENERIC_AFSDB_18_C static dns_result_t -fromtext_afsdb(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -33,7 +33,7 @@ fromtext_afsdb(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 18); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ /* subtype */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); @@ -76,7 +76,7 @@ totext_afsdb(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_afsdb(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -86,7 +86,7 @@ fromwire_afsdb(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 18); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -143,7 +143,7 @@ compare_afsdb(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t region2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 18); result = memcmp(rdata1->data, rdata2->data, 2); @@ -166,13 +166,13 @@ compare_afsdb(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_afsdb(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_afsdb(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 18); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -200,4 +200,17 @@ freestruct_afsdb(void *source) { REQUIRE(afsdb->common.rdtype == 18); REQUIRE(ISC_FALSE); } + +static dns_result_t +additionaldata_afsdb(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 18); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_AFSDB_18_C */ diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c index 8dec9cdb3b..37645ce5ea 100644 --- a/lib/dns/rdata/generic/cert_37.c +++ b/lib/dns/rdata/generic/cert_37.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: cert_37.c,v 1.10 1999/06/08 20:41:31 gson Exp $ */ + /* $Id: cert_37.c,v 1.11 1999/08/02 22:17:58 halley Exp $ */ /* draft-ietf-dnssec-certs-04.txt */ @@ -23,7 +23,7 @@ #define RDATA_GENERIC_CERT_37_C static dns_result_t -fromtext_cert(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -35,7 +35,7 @@ fromtext_cert(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 37); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ origin = origin; /*unused*/ downcase = downcase; /*unused*/ @@ -115,7 +115,7 @@ totext_cert(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_cert(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -123,7 +123,7 @@ fromwire_cert(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 37); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ dctx = dctx; /*unused*/ downcase = downcase; /*unused*/ @@ -153,7 +153,7 @@ compare_cert(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t r2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 37); dns_rdata_toregion(rdata1, &r1); @@ -162,13 +162,13 @@ compare_cert(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_cert(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_cert(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 37); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -193,4 +193,17 @@ freestruct_cert(void *target) { REQUIRE(target != NULL && target != NULL); REQUIRE(ISC_FALSE); /* XXX */ } + +static dns_result_t +additionaldata_cert(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 37); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_CERT_37_C */ diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c index 436dcd9c42..3f9bb21227 100644 --- a/lib/dns/rdata/generic/cname_5.c +++ b/lib/dns/rdata/generic/cname_5.c @@ -15,13 +15,13 @@ * SOFTWARE. */ - /* $Id: cname_5.c,v 1.14 1999/06/08 10:35:09 gson Exp $ */ + /* $Id: cname_5.c,v 1.15 1999/08/02 22:17:59 halley Exp $ */ #ifndef RDATA_GENERIC_CNAME_5_C #define RDATA_GENERIC_CNAME_5_C static dns_result_t -fromtext_cname(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -31,7 +31,7 @@ fromtext_cname(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 5); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); @@ -65,7 +65,7 @@ totext_cname(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_cname(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -73,7 +73,7 @@ fromwire_cname(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 5); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -111,7 +111,7 @@ compare_cname(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t region2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 5); dns_name_init(&name1, NULL); @@ -127,13 +127,13 @@ compare_cname(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_cname(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_cname(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 5); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -159,4 +159,16 @@ freestruct_cname(void *source) { REQUIRE(ISC_FALSE); } +static dns_result_t +additionaldata_cname(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 5); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_CNAME_5_C */ diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c index 3f0931fab2..429301c701 100644 --- a/lib/dns/rdata/generic/dname_39.c +++ b/lib/dns/rdata/generic/dname_39.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: dname_39.c,v 1.7 1999/06/08 10:35:09 gson Exp $ */ + /* $Id: dname_39.c,v 1.8 1999/08/02 22:17:59 halley Exp $ */ /* draft-ietf-dnsind-dname-02.txt */ @@ -23,7 +23,7 @@ #define RDATA_GENERIC_DNAME_39_C static dns_result_t -fromtext_dname(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -32,7 +32,7 @@ fromtext_dname(dns_rdataclass_t class, dns_rdatatype_t type, isc_buffer_t buffer; REQUIRE(type == 39); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); @@ -66,14 +66,14 @@ totext_dname(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_dname(dns_rdataclass_t class, dns_rdatatype_t type, +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) { dns_name_t name; REQUIRE(type == 39); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -111,7 +111,7 @@ compare_dname(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t region2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 39); dns_name_init(&name1, NULL); @@ -127,13 +127,13 @@ compare_dname(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_dname(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_dname(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 39); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -158,4 +158,17 @@ freestruct_dname(void *source) { REQUIRE(source != NULL && source != NULL); REQUIRE(ISC_FALSE); /* XXX */ } + +static dns_result_t +additionaldata_dname(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 39); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_DNAME_39_C */ diff --git a/lib/dns/rdata/generic/gpos_27.c b/lib/dns/rdata/generic/gpos_27.c index 76ed4b048c..67b454aabf 100644 --- a/lib/dns/rdata/generic/gpos_27.c +++ b/lib/dns/rdata/generic/gpos_27.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: gpos_27.c,v 1.5 1999/06/08 10:35:10 gson Exp $ */ + /* $Id: gpos_27.c,v 1.6 1999/08/02 22:17:59 halley Exp $ */ /* RFC 1712 */ @@ -23,7 +23,7 @@ #define RDATA_GENERIC_GPOS_27_C static dns_result_t -fromtext_gpos(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -32,7 +32,7 @@ fromtext_gpos(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 27); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ origin = origin; /*unused*/ downcase = downcase; /*unused*/ @@ -67,7 +67,7 @@ totext_gpos(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_gpos(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -76,7 +76,7 @@ fromwire_gpos(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 27); dctx = dctx; /*unused*/ - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ downcase = downcase; /*unused*/ for (i = 0 ; i < 3; i++) @@ -100,7 +100,7 @@ compare_gpos(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t r2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 27); dns_rdata_toregion(rdata1, &r1); @@ -109,13 +109,13 @@ compare_gpos(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_gpos(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_gpos(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 27); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -139,4 +139,17 @@ freestruct_gpos(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /* XXX */ } + +static dns_result_t +additionaldata_gpos(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 27); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_GPOS_27_C */ diff --git a/lib/dns/rdata/generic/hinfo_13.c b/lib/dns/rdata/generic/hinfo_13.c index b87c12fcfb..0074304afc 100644 --- a/lib/dns/rdata/generic/hinfo_13.c +++ b/lib/dns/rdata/generic/hinfo_13.c @@ -15,13 +15,13 @@ * SOFTWARE. */ - /* $Id: hinfo_13.c,v 1.13 1999/06/08 10:35:10 gson Exp $ */ + /* $Id: hinfo_13.c,v 1.14 1999/08/02 22:17:59 halley Exp $ */ #ifndef RDATA_GENERIC_HINFO_13_C #define RDATA_GENERIC_HINFO_13_C static dns_result_t -fromtext_hinfo(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -30,7 +30,7 @@ fromtext_hinfo(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 13); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ origin = origin; /*unused*/ downcase = downcase; /*unused*/ @@ -59,7 +59,7 @@ totext_hinfo(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_hinfo(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -67,7 +67,7 @@ fromwire_hinfo(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 13); dctx = dctx; /* unused */ - class = class; /* unused */ + rdclass = rdclass; /* unused */ downcase = downcase; /* unused */ RETERR(txt_fromwire(source, target)); @@ -90,7 +90,7 @@ compare_hinfo(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t r2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 13); dns_rdata_toregion(rdata1, &r1); @@ -99,13 +99,13 @@ compare_hinfo(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_hinfo(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_hinfo(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 13); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -129,4 +129,17 @@ freestruct_hinfo(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /* XXX */ } + +static dns_result_t +additionaldata_hinfo(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 13); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_HINFO_13_C */ diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c index 0d6130e408..2433e912da 100644 --- a/lib/dns/rdata/generic/isdn_20.c +++ b/lib/dns/rdata/generic/isdn_20.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: isdn_20.c,v 1.6 1999/06/08 10:35:10 gson Exp $ */ + /* $Id: isdn_20.c,v 1.7 1999/08/02 22:17:59 halley Exp $ */ /* RFC 1183 */ @@ -23,7 +23,7 @@ #define RDATA_GENERIC_ISDN_20_C static dns_result_t -fromtext_isdn(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -31,7 +31,7 @@ fromtext_isdn(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 20); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ origin = origin; /*unused*/ downcase = downcase; /*unused*/ @@ -68,7 +68,7 @@ totext_isdn(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_isdn(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -76,7 +76,7 @@ fromwire_isdn(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 20); dctx = dctx; /* unused */ - class = class; /* unused */ + rdclass = rdclass; /* unused */ downcase = downcase; /* unused */ RETERR(txt_fromwire(source, target)); @@ -101,7 +101,7 @@ compare_isdn(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t r2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 20); dns_rdata_toregion(rdata1, &r1); @@ -110,13 +110,13 @@ compare_isdn(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_isdn(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_isdn(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 20); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -140,4 +140,17 @@ freestruct_isdn(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_isdn(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 20); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_ISDN_20_C */ diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c index a661c9f7da..59fc6c36ab 100644 --- a/lib/dns/rdata/generic/key_25.c +++ b/lib/dns/rdata/generic/key_25.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: key_25.c,v 1.8 1999/06/08 20:41:31 gson Exp $ */ + /* $Id: key_25.c,v 1.9 1999/08/02 22:17:59 halley Exp $ */ /* RFC 2065 */ @@ -23,7 +23,7 @@ #define RDATA_GENERIC_KEY_25_C static dns_result_t -fromtext_key(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -33,7 +33,7 @@ fromtext_key(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 25); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ origin = origin; /*unused*/ downcase = downcase; /*unused*/ @@ -111,7 +111,7 @@ totext_key(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_key(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -119,7 +119,7 @@ fromwire_key(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 25); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ dctx = dctx; /*unused*/ downcase = downcase; /*unused*/ @@ -149,7 +149,7 @@ compare_key(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t r2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 25); dns_rdata_toregion(rdata1, &r1); @@ -158,13 +158,13 @@ compare_key(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_key(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_key(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 25); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -188,4 +188,17 @@ freestruct_key(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_key(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 25); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_KEY_25_C */ diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c index 061a9802e6..557be90d3c 100644 --- a/lib/dns/rdata/generic/loc_29.c +++ b/lib/dns/rdata/generic/loc_29.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: loc_29.c,v 1.5 1999/06/08 10:35:11 gson Exp $ */ + /* $Id: loc_29.c,v 1.6 1999/08/02 22:17:59 halley Exp $ */ /* RFC 1876 */ @@ -23,7 +23,7 @@ #define RDATA_GENERIC_LOC_29_C static dns_result_t -fromtext_loc(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -51,7 +51,7 @@ fromtext_loc(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 29); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ origin = origin; /*unused*/ downcase = downcase; /*unused*/ @@ -475,7 +475,7 @@ totext_loc(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_loc(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -486,7 +486,7 @@ fromwire_loc(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 29); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ dctx = dctx; /*unused*/ downcase = downcase; /*unused*/ @@ -554,7 +554,7 @@ compare_loc(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t r2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 29); dns_rdata_toregion(rdata1, &r1); @@ -563,13 +563,13 @@ compare_loc(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_loc(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 29); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -593,4 +593,17 @@ freestruct_loc(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_loc(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 29); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_LOC_29_C */ diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c index 8cb25fc6c4..df218075d7 100644 --- a/lib/dns/rdata/generic/mb_7.c +++ b/lib/dns/rdata/generic/mb_7.c @@ -15,13 +15,13 @@ * SOFTWARE. */ - /* $Id: mb_7.c,v 1.14 1999/06/08 10:35:11 gson Exp $ */ + /* $Id: mb_7.c,v 1.15 1999/08/02 22:17:59 halley Exp $ */ #ifndef RDATA_GENERIC_MB_7_C #define RDATA_GENERIC_MB_7_C static dns_result_t -fromtext_mb(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -31,7 +31,7 @@ fromtext_mb(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 7); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); @@ -65,7 +65,7 @@ totext_mb(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_mb(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -73,7 +73,7 @@ fromwire_mb(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 7); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -111,7 +111,7 @@ compare_mb(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t region2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 7); dns_name_init(&name1, NULL); @@ -127,13 +127,13 @@ compare_mb(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_mb(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_mb(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 7); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -157,4 +157,17 @@ freestruct_mb(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_mb(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 7); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_MB_7_C */ diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c index 75f08cabf7..d3ff03fb5d 100644 --- a/lib/dns/rdata/generic/md_3.c +++ b/lib/dns/rdata/generic/md_3.c @@ -15,13 +15,13 @@ * SOFTWARE. */ - /* $Id: md_3.c,v 1.14 1999/06/08 10:35:11 gson Exp $ */ + /* $Id: md_3.c,v 1.15 1999/08/02 22:17:59 halley Exp $ */ #ifndef RDATA_GENERIC_MD_3_C #define RDATA_GENERIC_MD_3_C static dns_result_t -fromtext_md(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -31,7 +31,7 @@ fromtext_md(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 3); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); @@ -65,7 +65,7 @@ totext_md(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_md(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -73,7 +73,7 @@ fromwire_md(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 3); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -111,7 +111,7 @@ compare_md(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t region2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 3); dns_name_init(&name1, NULL); @@ -127,13 +127,13 @@ compare_md(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_md(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_md(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 3); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -157,4 +157,17 @@ freestruct_md(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_md(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 3); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_MD_3_C */ diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c index 609fa340b4..a1306d5e51 100644 --- a/lib/dns/rdata/generic/mf_4.c +++ b/lib/dns/rdata/generic/mf_4.c @@ -15,13 +15,13 @@ * SOFTWARE. */ - /* $Id: mf_4.c,v 1.13 1999/06/08 10:35:11 gson Exp $ */ + /* $Id: mf_4.c,v 1.14 1999/08/02 22:17:59 halley Exp $ */ #ifndef RDATA_GENERIC_MF_4_C #define RDATA_GENERIC_MF_4_C static dns_result_t -fromtext_mf(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -31,7 +31,7 @@ fromtext_mf(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 4); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); @@ -65,7 +65,7 @@ totext_mf(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_mf(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -73,7 +73,7 @@ fromwire_mf(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 4); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -111,7 +111,7 @@ compare_mf(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t region2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 4); dns_name_init(&name1, NULL); @@ -127,13 +127,13 @@ compare_mf(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_mf(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_mf(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 4); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -157,4 +157,17 @@ freestruct_mf(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_mf(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 4); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_MF_4_C */ diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c index c9fd10911a..758a71c919 100644 --- a/lib/dns/rdata/generic/mg_8.c +++ b/lib/dns/rdata/generic/mg_8.c @@ -15,13 +15,13 @@ * SOFTWARE. */ - /* $Id: mg_8.c,v 1.13 1999/06/08 10:35:11 gson Exp $ */ + /* $Id: mg_8.c,v 1.14 1999/08/02 22:17:59 halley Exp $ */ #ifndef RDATA_GENERIC_MG_8_C #define RDATA_GENERIC_MG_8_C static dns_result_t -fromtext_mg(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -31,7 +31,7 @@ fromtext_mg(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 8); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); @@ -65,7 +65,7 @@ totext_mg(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_mg(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -73,7 +73,7 @@ fromwire_mg(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 8); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -111,7 +111,7 @@ compare_mg(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t region2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 8); dns_name_init(&name1, NULL); @@ -127,13 +127,13 @@ compare_mg(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_mg(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_mg(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 8); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -157,4 +157,17 @@ freestruct_mg(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_mg(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 8); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_MG_8_C */ diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c index 1b4d435b2c..6ec31a9cd3 100644 --- a/lib/dns/rdata/generic/minfo_14.c +++ b/lib/dns/rdata/generic/minfo_14.c @@ -15,13 +15,13 @@ * SOFTWARE. */ - /* $Id: minfo_14.c,v 1.14 1999/06/08 10:35:12 gson Exp $ */ + /* $Id: minfo_14.c,v 1.15 1999/08/02 22:18:00 halley Exp $ */ #ifndef RDATA_GENERIC_MINFO_14_C #define RDATA_GENERIC_MINFO_14_C static dns_result_t -fromtext_minfo(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -32,7 +32,7 @@ fromtext_minfo(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 14); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ for (i = 0; i < 2 ; i++) { RETERR(gettoken(lexer, &token, isc_tokentype_string, @@ -82,7 +82,7 @@ totext_minfo(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_minfo(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -96,7 +96,7 @@ fromwire_minfo(dns_rdataclass_t class, dns_rdatatype_t type, else dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ dns_name_init(&rmail, NULL); dns_name_init(&email, NULL); @@ -143,7 +143,7 @@ compare_minfo(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { int result; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 14); dns_name_init(&name1, NULL); @@ -173,13 +173,13 @@ compare_minfo(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_minfo(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_minfo(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 14); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -203,4 +203,17 @@ freestruct_minfo(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_minfo(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 14); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_MINFO_14_C */ diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c index a955fb3d19..6a68363cf7 100644 --- a/lib/dns/rdata/generic/mr_9.c +++ b/lib/dns/rdata/generic/mr_9.c @@ -15,13 +15,13 @@ * SOFTWARE. */ - /* $Id: mr_9.c,v 1.13 1999/06/08 10:35:12 gson Exp $ */ + /* $Id: mr_9.c,v 1.14 1999/08/02 22:18:00 halley Exp $ */ #ifndef RDATA_GENERIC_MR_9_C #define RDATA_GENERIC_MR_9_C static dns_result_t -fromtext_mr(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -31,7 +31,7 @@ fromtext_mr(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 9); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); @@ -65,7 +65,7 @@ totext_mr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_mr(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -73,7 +73,7 @@ fromwire_mr(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 9); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -111,7 +111,7 @@ compare_mr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t region2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 9); dns_name_init(&name1, NULL); @@ -127,13 +127,13 @@ compare_mr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_mr(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_mr(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 9); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -157,4 +157,17 @@ freestruct_mr(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_mr(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 9); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_MR_9_C */ diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c index b39d3361a4..35dd21eb23 100644 --- a/lib/dns/rdata/generic/mx_15.c +++ b/lib/dns/rdata/generic/mx_15.c @@ -15,13 +15,13 @@ * SOFTWARE. */ - /* $Id: mx_15.c,v 1.16 1999/06/08 10:35:12 gson Exp $ */ + /* $Id: mx_15.c,v 1.17 1999/08/02 22:18:00 halley Exp $ */ #ifndef RDATA_GENERIC_MX_15_C #define RDATA_GENERIC_MX_15_C static dns_result_t -fromtext_mx(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -31,7 +31,7 @@ fromtext_mx(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 15); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); @@ -74,7 +74,7 @@ totext_mx(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_mx(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -84,7 +84,7 @@ fromwire_mx(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 15); - class = class; /* unused */ + rdclass = rdclass; /* unused */ if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -141,7 +141,7 @@ compare_mx(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { int result; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 15); result = memcmp(rdata1->data, rdata2->data, 2); @@ -164,13 +164,13 @@ compare_mx(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_mx(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_mx(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 15); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -194,4 +194,17 @@ freestruct_mx(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_mx(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 15); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_MX_15_C */ diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c index f13ace16a3..f6c90c665e 100644 --- a/lib/dns/rdata/generic/ns_2.c +++ b/lib/dns/rdata/generic/ns_2.c @@ -15,13 +15,13 @@ * SOFTWARE. */ - /* $Id: ns_2.c,v 1.13 1999/06/08 10:35:14 gson Exp $ */ + /* $Id: ns_2.c,v 1.14 1999/08/02 22:18:00 halley Exp $ */ #ifndef RDATA_GENERIC_NS_2_C #define RDATA_GENERIC_NS_2_C static dns_result_t -fromtext_ns(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -31,7 +31,7 @@ fromtext_ns(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 2); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ RETERR(gettoken(lexer, &token,isc_tokentype_string, ISC_FALSE)); @@ -65,7 +65,7 @@ totext_ns(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_ns(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -73,7 +73,7 @@ fromwire_ns(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 2); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -111,7 +111,7 @@ compare_ns(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t region2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 2); dns_name_init(&name1, NULL); @@ -127,13 +127,13 @@ compare_ns(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_ns(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_ns(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 2); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -151,7 +151,7 @@ tostruct_ns(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { mctx = mctx; /*unused*/ - ns->common.rdclass = rdata->class; + ns->common.rdclass = rdata->rdclass; ns->common.rdtype = rdata->type; ISC_LINK_INIT(&ns->common, link); @@ -167,4 +167,17 @@ freestruct_ns(void *source) { REQUIRE(source != NULL); /* No action required. */ } + +static dns_result_t +additionaldata_ns(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 2); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_NS_2_C */ diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c index eca25e5042..6a8a153efd 100644 --- a/lib/dns/rdata/generic/null_10.c +++ b/lib/dns/rdata/generic/null_10.c @@ -15,20 +15,20 @@ * SOFTWARE. */ - /* $Id: null_10.c,v 1.10 1999/06/08 10:35:18 gson Exp $ */ + /* $Id: null_10.c,v 1.11 1999/08/02 22:18:00 halley Exp $ */ #ifndef RDATA_GENERIC_NULL_10_C #define RDATA_GENERIC_NULL_10_C static dns_result_t -fromtext_null(dns_rdataclass_t class, dns_rdatatype_t type, +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) { REQUIRE(type == 10); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ type = type; /*unused*/ lexer = lexer; /*unused*/ origin = origin; /*unused*/ @@ -54,14 +54,14 @@ totext_null(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_null(dns_rdataclass_t class, dns_rdatatype_t type, +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) { REQUIRE(type == 10); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ dctx = dctx; /*unused*/ downcase = downcase; /*unused*/ target = target; /*unused*/ @@ -85,20 +85,20 @@ static int compare_null(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { REQUIRE(rdata1->type == rdata1->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 10); return (0); } static dns_result_t -fromstruct_null(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_null(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 10); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -116,7 +116,7 @@ tostruct_null(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { mctx = mctx; null->common.rdtype = rdata->type; - null->common.rdclass = rdata->class; + null->common.rdclass = rdata->rdclass; ISC_LINK_INIT(&null->common, link); return (DNS_R_SUCCESS); @@ -127,4 +127,17 @@ freestruct_null(void *source) { REQUIRE(source != NULL); /* No action required. */ } + +static dns_result_t +additionaldata_null(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 10); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_NULL_10_C */ diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c index d5bb18844e..280c08203e 100644 --- a/lib/dns/rdata/generic/nxt_30.c +++ b/lib/dns/rdata/generic/nxt_30.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: nxt_30.c,v 1.11 1999/07/23 09:15:10 gson Exp $ */ + /* $Id: nxt_30.c,v 1.12 1999/08/02 22:18:00 halley Exp $ */ /* RFC 2065 */ @@ -23,7 +23,7 @@ #define RDATA_GENERIC_NXT_30_C static dns_result_t -fromtext_nxt(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -39,7 +39,7 @@ fromtext_nxt(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 30); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ /* next domain */ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); @@ -119,7 +119,7 @@ totext_nxt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_nxt(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -128,7 +128,7 @@ fromwire_nxt(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 30); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -176,7 +176,7 @@ compare_nxt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { int result; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 30); dns_name_init(&name1, NULL); @@ -193,13 +193,13 @@ compare_nxt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_nxt(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 30); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -226,4 +226,17 @@ freestruct_nxt(void *source) { REQUIRE(nxt->common.rdtype == 30); REQUIRE(ISC_FALSE); } + +static dns_result_t +additionaldata_nxt(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 30); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_NXT_30_C */ diff --git a/lib/dns/rdata/generic/proforma.c b/lib/dns/rdata/generic/proforma.c index 6bfa1abfc9..702e880b41 100644 --- a/lib/dns/rdata/generic/proforma.c +++ b/lib/dns/rdata/generic/proforma.c @@ -15,19 +15,19 @@ * SOFTWARE. */ - /* $Id: proforma.c,v 1.11 1999/06/08 10:35:19 gson Exp $ */ + /* $Id: proforma.c,v 1.12 1999/08/02 22:18:00 halley Exp $ */ #ifndef RDATA_GENERIC_#_#_C #define RDATA_GENERIC_#_#_C static dns_result_t -fromtext_#(dns_rdataclass_t class, dns_rdatatype_t type, +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) { isc_token_t token; REQUIRE(type == #); - REQUIRE(class == #); + REQUIRE(rdclass == #); RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); @@ -40,18 +40,18 @@ totext_#(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, { REQUIRE(rdata->type == #); - REQUIRE(rdata->class == #); + REQUIRE(rdata->rdclass == #); return (DNS_R_NOTIMPLEMENTED); } static dns_result_t -fromwire_#(dns_rdataclass_t class, dns_rdatatype_t type, +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) { REQUIRE(type == #); - REQUIRE(class == #); + REQUIRE(rdclass == #); if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -65,7 +65,7 @@ static dns_result_t towire_#(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { REQUIRE(rdata->type == #); - REQUIRE(rdata->class == #); + REQUIRE(rdata->rdclass == #); if (dns_compress_getedns(cctx) >= 1) dns_compress_setmethods(cctx, DNS_COMPRESS_ALL): @@ -81,9 +81,9 @@ compare_#(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t r2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == #); - REQUIRE(rdata1->class == #); + REQUIRE(rdata1->rdclass == #); dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); @@ -91,11 +91,11 @@ compare_#(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_#(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_#(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == #); - REQUIRE(class == #); + REQUIRE(rdclass == #); return (DNS_R_NOTIMPLEMENTED); } @@ -104,7 +104,7 @@ static dns_result_t tostruct_#(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == #); - REQUIRE(rdata->class == #); + REQUIRE(rdata->rdclass == #); return (DNS_R_NOTIMPLEMENTED); } @@ -118,4 +118,18 @@ freestruct_#(void *source) { REQUIRE(#->common.rdclass == #); } + +static dns_result_t +additionaldata_#(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == #); + REQUIRE(rdata->rdclass == #); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_#_#_C */ diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c index 8ea8361485..34a2c0dc65 100644 --- a/lib/dns/rdata/generic/ptr_12.c +++ b/lib/dns/rdata/generic/ptr_12.c @@ -15,13 +15,13 @@ * SOFTWARE. */ - /* $Id: ptr_12.c,v 1.14 1999/06/08 10:35:19 gson Exp $ */ + /* $Id: ptr_12.c,v 1.15 1999/08/02 22:18:00 halley Exp $ */ #ifndef RDATA_GENERIC_PTR_12_C #define RDATA_GENERIC_PTR_12_C static dns_result_t -fromtext_ptr(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -31,7 +31,7 @@ fromtext_ptr(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 12); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); @@ -65,7 +65,7 @@ totext_ptr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_ptr(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -73,7 +73,7 @@ fromwire_ptr(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 12); - class = class; /* unused */ + rdclass = rdclass; /* unused */ if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -111,7 +111,7 @@ compare_ptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t region2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 12); dns_name_init(&name1, NULL); @@ -127,13 +127,13 @@ compare_ptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_ptr(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 12); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -157,4 +157,17 @@ freestruct_ptr(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); } + +static dns_result_t +additionaldata_ptr(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 12); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_PTR_12_C */ diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c index a6644b03d3..b064bb89b8 100644 --- a/lib/dns/rdata/generic/rp_17.c +++ b/lib/dns/rdata/generic/rp_17.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: rp_17.c,v 1.8 1999/06/08 10:35:19 gson Exp $ */ + /* $Id: rp_17.c,v 1.9 1999/08/02 22:18:00 halley Exp $ */ /* RFC 1183 */ @@ -23,7 +23,7 @@ #define RDATA_GENERIC_RP_17_C static dns_result_t -fromtext_rp(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -34,7 +34,7 @@ fromtext_rp(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 17); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ for (i = 0; i < 2 ; i++) { RETERR(gettoken(lexer, &token, isc_tokentype_string, @@ -84,7 +84,7 @@ totext_rp(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_rp(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -93,7 +93,7 @@ fromwire_rp(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 17); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -145,7 +145,7 @@ compare_rp(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { int result; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 17); dns_name_init(&name1, NULL); @@ -175,13 +175,13 @@ compare_rp(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_rp(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_rp(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 17); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -205,4 +205,17 @@ freestruct_rp(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_rp(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 17); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_RP_17_C */ diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c index b14fef7249..a34d0e553f 100644 --- a/lib/dns/rdata/generic/rt_21.c +++ b/lib/dns/rdata/generic/rt_21.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: rt_21.c,v 1.8 1999/06/08 10:35:19 gson Exp $ */ + /* $Id: rt_21.c,v 1.9 1999/08/02 22:18:00 halley Exp $ */ /* RFC 1183 */ @@ -23,7 +23,7 @@ #define RDATA_GENERIC_RT_21_C static dns_result_t -fromtext_rt(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -33,7 +33,7 @@ fromtext_rt(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 21); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); @@ -76,7 +76,7 @@ totext_rt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_rt(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -85,7 +85,7 @@ fromwire_rt(dns_rdataclass_t class, dns_rdatatype_t type, isc_region_t tregion; REQUIRE(type == 21); - class = class; /* unused */ + rdclass = rdclass; /* unused */ if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -142,7 +142,7 @@ compare_rt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { int result; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 21); result = memcmp(rdata1->data, rdata2->data, 2); @@ -165,13 +165,13 @@ compare_rt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_rt(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_rt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 21); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -195,4 +195,17 @@ freestruct_rt(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_rt(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 21); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_RT_21_C */ diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c index 03723f579f..d4f0fbeaa1 100644 --- a/lib/dns/rdata/generic/sig_24.c +++ b/lib/dns/rdata/generic/sig_24.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: sig_24.c,v 1.14 1999/06/08 20:41:31 gson Exp $ */ + /* $Id: sig_24.c,v 1.15 1999/08/02 22:18:00 halley Exp $ */ /* RFC 2065 */ @@ -23,7 +23,7 @@ #define RDATA_GENERIC_SIG_24_C static dns_result_t -fromtext_sig(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -39,7 +39,7 @@ fromtext_sig(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 24); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ origin = origin; /*unused*/ downcase = downcase; /*unused*/ @@ -185,7 +185,7 @@ totext_sig(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_sig(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -199,7 +199,7 @@ fromwire_sig(dns_rdataclass_t class, dns_rdatatype_t type, else dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ isc_buffer_active(source, &sr); /* @@ -271,7 +271,7 @@ compare_sig(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { int result; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 24); dns_rdata_toregion(rdata1, &r1); @@ -303,13 +303,13 @@ compare_sig(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_sig(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 24); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -333,4 +333,17 @@ freestruct_sig(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_sig(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 24); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_SIG_24_C */ diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c index 25989ae299..993266c861 100644 --- a/lib/dns/rdata/generic/soa_6.c +++ b/lib/dns/rdata/generic/soa_6.c @@ -15,13 +15,13 @@ * SOFTWARE. */ - /* $Id: soa_6.c,v 1.19 1999/07/03 20:58:13 halley Exp $ */ + /* $Id: soa_6.c,v 1.20 1999/08/02 22:18:01 halley Exp $ */ #ifndef RDATA_GENERIC_SOA_6_C #define RDATA_GENERIC_SOA_6_C static dns_result_t -fromtext_soa(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -32,7 +32,7 @@ fromtext_soa(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 6); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ for (i = 0 ; i < 2 ; i++) { RETERR(gettoken(lexer, &token, isc_tokentype_string, @@ -129,7 +129,7 @@ totext_soa(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_soa(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -140,7 +140,7 @@ fromwire_soa(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 6); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -211,7 +211,7 @@ compare_soa(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { int result; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 6); dns_name_init(&name1, NULL); @@ -247,12 +247,12 @@ compare_soa(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_soa(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_soa(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 6); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -270,7 +270,7 @@ tostruct_soa(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { mctx = mctx; /*unused*/ - soa->common.rdclass = rdata->class; + soa->common.rdclass = rdata->rdclass; soa->common.rdtype = rdata->type; ISC_LINK_INIT(&soa->common, link); @@ -304,4 +304,17 @@ freestruct_soa(void *source) { REQUIRE(soa->common.rdtype == 6); /* No action required */ } + +static dns_result_t +additionaldata_soa(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 6); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_SOA_6_C */ diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c index 7085d70d59..950eb09758 100644 --- a/lib/dns/rdata/generic/tkey_249.c +++ b/lib/dns/rdata/generic/tkey_249.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: tkey_249.c,v 1.12 1999/06/08 20:41:31 gson Exp $ */ + /* $Id: tkey_249.c,v 1.13 1999/08/02 22:18:01 halley Exp $ */ /* draft-ietf-dnssec-tkey-01.txt */ @@ -23,7 +23,7 @@ #define RDATA_GENERIC_TKEY_249_C static dns_result_t -fromtext_tkey(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -35,7 +35,7 @@ fromtext_tkey(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 249); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ /* Algorithm */ @@ -177,7 +177,7 @@ totext_tkey(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_tkey(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -187,7 +187,7 @@ fromwire_tkey(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 249); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -262,7 +262,7 @@ compare_tkey(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { int result; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 249); /* Algorithm */ @@ -280,12 +280,12 @@ compare_tkey(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_tkey(dns_rdataclass_t class, dns_rdatatype_t type, +fromstruct_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 249); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -309,4 +309,17 @@ freestruct_tkey(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_tkey(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 249); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_TKEY_249_C */ diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c index 04a255a709..c8a7c3e2e0 100644 --- a/lib/dns/rdata/generic/txt_16.c +++ b/lib/dns/rdata/generic/txt_16.c @@ -15,13 +15,13 @@ * SOFTWARE. */ - /* $Id: txt_16.c,v 1.12 1999/06/08 10:35:20 gson Exp $ */ + /* $Id: txt_16.c,v 1.13 1999/08/02 22:18:01 halley Exp $ */ #ifndef RDATA_GENERIC_TXT_16_C #define RDATA_GENERIC_TXT_16_C static dns_result_t -fromtext_txt(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -29,7 +29,7 @@ fromtext_txt(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 16); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ origin = origin; /*unused*/ downcase = downcase; /*unused*/ @@ -68,7 +68,7 @@ totext_txt(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_txt(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -77,7 +77,7 @@ fromwire_txt(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 16); dctx = dctx; /*unused*/ - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ downcase = downcase; /*unused*/ while (!buffer_empty(source)) { @@ -111,7 +111,7 @@ compare_txt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t r2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 16); dns_rdata_toregion(rdata1, &r1); @@ -120,13 +120,13 @@ compare_txt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_txt(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_txt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 16); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -150,4 +150,17 @@ freestruct_txt(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); } + +static dns_result_t +additionaldata_txt(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 16); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_TXT_16_C */ diff --git a/lib/dns/rdata/generic/unspec_103.c b/lib/dns/rdata/generic/unspec_103.c index 0d9f61215f..83cec35844 100644 --- a/lib/dns/rdata/generic/unspec_103.c +++ b/lib/dns/rdata/generic/unspec_103.c @@ -15,20 +15,20 @@ * SOFTWARE. */ - /* $Id: unspec_103.c,v 1.5 1999/06/08 10:35:20 gson Exp $ */ + /* $Id: unspec_103.c,v 1.6 1999/08/02 22:18:01 halley Exp $ */ #ifndef RDATA_GENERIC_UNSPEC_103_C #define RDATA_GENERIC_UNSPEC_103_C static dns_result_t -fromtext_unspec(dns_rdataclass_t class, dns_rdatatype_t type, +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) { REQUIRE(type == 103); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ origin = origin; /*unused*/ downcase = downcase; /*unused*/ @@ -49,7 +49,7 @@ totext_unspec(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_unspec(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -57,7 +57,7 @@ fromwire_unspec(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 103); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ dctx = dctx; /*unused*/ downcase = downcase; /*unused*/ isc_buffer_active(source, &sr); @@ -81,7 +81,7 @@ compare_unspec(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t r2; REQUIRE(rdata1->type == rdata1->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 103); dns_rdata_toregion(rdata1, &r1); @@ -90,13 +90,13 @@ compare_unspec(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_unspec(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_unspec(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 103); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -120,4 +120,17 @@ freestruct_unspec(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_unspec(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 103); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_UNSPEC_103_C */ diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c index e0568708dc..8aa43b7a6b 100644 --- a/lib/dns/rdata/generic/x25_19.c +++ b/lib/dns/rdata/generic/x25_19.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: x25_19.c,v 1.5 1999/06/08 10:35:21 gson Exp $ */ + /* $Id: x25_19.c,v 1.6 1999/08/02 22:18:01 halley Exp $ */ /* RFC 1183 */ @@ -25,7 +25,7 @@ #include static dns_result_t -fromtext_x25(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -34,7 +34,7 @@ fromtext_x25(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 19); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ origin = origin; /*unused*/ downcase = downcase; /*unused*/ @@ -61,7 +61,7 @@ totext_x25(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_x25(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -69,7 +69,7 @@ fromwire_x25(dns_rdataclass_t class, dns_rdatatype_t type, REQUIRE(type == 19); dctx = dctx; /* unused */ - class = class; /* unused */ + rdclass = rdclass; /* unused */ downcase = downcase; /* unused */ return (txt_fromwire(source, target)); @@ -91,7 +91,7 @@ compare_x25(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { int result; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 19); l = (rdata1->length < rdata2->length) ? rdata1->length : rdata2->length; @@ -106,13 +106,13 @@ compare_x25(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_x25(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_x25(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 19); - class = class; /*unused*/ + rdclass = rdclass; /*unused*/ source = source; target = target; @@ -136,4 +136,17 @@ freestruct_x25(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_x25(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 19); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_X25_19_C */ diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c index 1d29267802..793ebbb72c 100644 --- a/lib/dns/rdata/in_1/a6_38.c +++ b/lib/dns/rdata/in_1/a6_38.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: a6_38.c,v 1.11 1999/07/16 00:24:32 halley Exp $ */ + /* $Id: a6_38.c,v 1.12 1999/08/02 22:18:01 halley Exp $ */ /* draft-ietf-ipngwg-dns-lookups-03.txt */ @@ -31,7 +31,7 @@ #endif static dns_result_t -fromtext_in_a6(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -44,7 +44,7 @@ fromtext_in_a6(dns_rdataclass_t class, dns_rdatatype_t type, isc_buffer_t buffer; REQUIRE(type == 38); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); /* prefix length */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); @@ -95,7 +95,7 @@ totext_in_a6(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_boolean_t sub; REQUIRE(rdata->type == 38); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); dns_rdata_toregion(rdata, &sr); prefixlen = sr.base[0]; @@ -132,7 +132,7 @@ totext_in_a6(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_in_a6(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -143,7 +143,7 @@ fromwire_in_a6(dns_rdataclass_t class, dns_rdatatype_t type, dns_name_t name; REQUIRE(type == 38); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -187,7 +187,7 @@ towire_in_a6(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { unsigned char octets; REQUIRE(rdata->type == 38); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); if (dns_compress_getedns(cctx) >= 1) dns_compress_setmethods(cctx, DNS_COMPRESS_ALL); @@ -221,9 +221,9 @@ compare_in_a6(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t region2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 38); - REQUIRE(rdata1->class == 1); + REQUIRE(rdata1->rdclass == 1); dns_rdata_toregion(rdata1, ®ion1); dns_rdata_toregion(rdata2, ®ion2); @@ -245,12 +245,12 @@ compare_in_a6(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_in_a6(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_in_a6(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 1); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); source = source; target = target; @@ -262,7 +262,7 @@ static dns_result_t tostruct_in_a6(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 38); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); target = target; mctx = mctx; @@ -275,4 +275,18 @@ freestruct_in_a6(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_in_a6(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 38); + REQUIRE(rdata->rdclass == 1); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_IN_1_A6_38_C */ diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c index 001f76f023..b65ca33646 100644 --- a/lib/dns/rdata/in_1/a_1.c +++ b/lib/dns/rdata/in_1/a_1.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: a_1.c,v 1.16 1999/07/16 00:24:32 halley Exp $ */ + /* $Id: a_1.c,v 1.17 1999/08/02 22:18:01 halley Exp $ */ #ifndef RDATA_IN_1_A_1_C #define RDATA_IN_1_A_1_C @@ -25,7 +25,7 @@ #include static dns_result_t -fromtext_in_a(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -34,7 +34,7 @@ fromtext_in_a(dns_rdataclass_t class, dns_rdatatype_t type, isc_region_t region; REQUIRE(type == 1); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); origin = origin; /*unused*/ downcase = downcase; /*unused*/ @@ -58,7 +58,7 @@ totext_in_a(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_region_t region; REQUIRE(rdata->type == 1); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); REQUIRE(rdata->length == 4); tctx = tctx; /* unused */ @@ -73,7 +73,7 @@ totext_in_a(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_in_a(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -81,7 +81,7 @@ fromwire_in_a(dns_rdataclass_t class, dns_rdatatype_t type, isc_region_t tregion; REQUIRE(type == 1); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); dctx = dctx; /* unused */ downcase = downcase; /* unused */ @@ -105,7 +105,7 @@ towire_in_a(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t region; REQUIRE(rdata->type == 1); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); cctx = cctx; /*unused*/ @@ -122,9 +122,9 @@ compare_in_a(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { int result; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->type); + REQUIRE(rdata1->rdclass == rdata2->type); REQUIRE(rdata1->type == 1); - REQUIRE(rdata1->class == 1); + REQUIRE(rdata1->rdclass == 1); result = memcmp(rdata1->data, rdata2->data, 4); if (result != 0) @@ -134,12 +134,12 @@ compare_in_a(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_in_a(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_in_a(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 1); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); source = source; target = target; @@ -151,7 +151,7 @@ static dns_result_t tostruct_in_a(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 1); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); target = target; mctx = mctx; @@ -165,4 +165,18 @@ freestruct_in_a(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_in_a(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 1); + REQUIRE(rdata->rdclass == 1); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_IN_1_A_1_C */ diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c index 9838b7e750..7723c0fc41 100644 --- a/lib/dns/rdata/in_1/aaaa_28.c +++ b/lib/dns/rdata/in_1/aaaa_28.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: aaaa_28.c,v 1.10 1999/07/16 00:24:33 halley Exp $ */ + /* $Id: aaaa_28.c,v 1.11 1999/08/02 22:18:01 halley Exp $ */ /* RFC 1886 */ @@ -27,7 +27,7 @@ #include static dns_result_t -fromtext_in_aaaa(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -36,7 +36,7 @@ fromtext_in_aaaa(dns_rdataclass_t class, dns_rdatatype_t type, isc_region_t region; REQUIRE(type == 28); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); origin = origin; /*unused*/ downcase = downcase; /*unused*/ @@ -60,7 +60,7 @@ totext_in_aaaa(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_region_t region; REQUIRE(rdata->type == 28); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); REQUIRE(rdata->length == 16); tctx = tctx; /* unused */ @@ -75,7 +75,7 @@ totext_in_aaaa(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_in_aaaa(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -83,7 +83,7 @@ fromwire_in_aaaa(dns_rdataclass_t class, dns_rdatatype_t type, isc_region_t tregion; REQUIRE(type == 28); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); dctx = dctx; /* unused */ downcase = downcase; /* unused */ @@ -107,7 +107,7 @@ towire_in_aaaa(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t region; REQUIRE(rdata->type == 28); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); cctx = cctx; /*unused*/ @@ -124,9 +124,9 @@ compare_in_aaaa(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { int result; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 28); - REQUIRE(rdata1->class == 1); + REQUIRE(rdata1->rdclass == 1); result = memcmp(rdata1->data, rdata2->data, 16); if (result != 0) @@ -136,12 +136,12 @@ compare_in_aaaa(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_in_aaaa(dns_rdataclass_t class, dns_rdatatype_t type, void *source, - isc_buffer_t *target) +fromstruct_in_aaaa(dns_rdataclass_t rdclass, dns_rdatatype_t type, + void *source, isc_buffer_t *target) { REQUIRE(type == 1); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); source = source; target = target; @@ -153,7 +153,7 @@ static dns_result_t tostruct_in_aaaa(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 28); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); target = target; mctx = mctx; @@ -166,4 +166,18 @@ freestruct_in_aaaa(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_in_aaaa(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 28); + REQUIRE(rdata->rdclass == 1); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_IN_1_AAAA_28_C */ diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c index 037da8eea6..8a69d3fe9b 100644 --- a/lib/dns/rdata/in_1/kx_36.c +++ b/lib/dns/rdata/in_1/kx_36.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: kx_36.c,v 1.8 1999/06/08 10:35:21 gson Exp $ */ + /* $Id: kx_36.c,v 1.9 1999/08/02 22:18:01 halley Exp $ */ /* RFC 2230 */ @@ -23,7 +23,7 @@ #define RDATA_GENERIC_KX_36_C static dns_result_t -fromtext_in_kx(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -32,7 +32,7 @@ fromtext_in_kx(dns_rdataclass_t class, dns_rdatatype_t type, isc_buffer_t buffer; REQUIRE(type == 36); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); RETERR(uint16_tobuffer(token.value.as_ulong, target)); @@ -57,7 +57,7 @@ totext_in_kx(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, unsigned short num; REQUIRE(rdata->type == 36); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); dns_name_init(&name, NULL); dns_name_init(&prefix, NULL); @@ -75,7 +75,7 @@ totext_in_kx(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_in_kx(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -83,7 +83,7 @@ fromwire_in_kx(dns_rdataclass_t class, dns_rdatatype_t type, isc_region_t sregion; REQUIRE(type == 36); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -106,7 +106,7 @@ towire_in_kx(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t region; REQUIRE(rdata->type == 36); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); if (dns_compress_getedns(cctx) >= 1) dns_compress_setmethods(cctx, DNS_COMPRESS_ALL); @@ -132,9 +132,9 @@ compare_in_kx(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { int result; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 36); - REQUIRE(rdata1->class == 1); + REQUIRE(rdata1->rdclass == 1); result = memcmp(rdata1->data, rdata2->data, 2); if (result != 0) @@ -156,12 +156,12 @@ compare_in_kx(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_in_kx(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_in_kx(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 36); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); source = source; target = target; @@ -173,7 +173,7 @@ static dns_result_t tostruct_in_kx(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 36); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); target = target; mctx = mctx; @@ -187,4 +187,18 @@ freestruct_in_kx(void *source) { REQUIRE(ISC_FALSE); } + +static dns_result_t +additionaldata_in_kx(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 36); + REQUIRE(rdata->rdclass == 1); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_GENERIC_KX_15_C */ diff --git a/lib/dns/rdata/in_1/naptr_35.c b/lib/dns/rdata/in_1/naptr_35.c index d383b4abdf..d9216d8a07 100644 --- a/lib/dns/rdata/in_1/naptr_35.c +++ b/lib/dns/rdata/in_1/naptr_35.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: naptr_35.c,v 1.8 1999/06/08 10:35:21 gson Exp $ */ + /* $Id: naptr_35.c,v 1.9 1999/08/02 22:18:01 halley Exp $ */ /* RFC 2168 */ @@ -23,7 +23,7 @@ #define RDATA_IN_1_NAPTR_35_C static dns_result_t -fromtext_in_naptr(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -32,7 +32,7 @@ fromtext_in_naptr(dns_rdataclass_t class, dns_rdatatype_t type, isc_buffer_t buffer; REQUIRE(type == 35); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); /* priority */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); @@ -75,7 +75,7 @@ totext_in_naptr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, unsigned short num; REQUIRE(rdata->type == 35); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); dns_name_init(&name, NULL); dns_name_init(&prefix, NULL); @@ -114,7 +114,7 @@ totext_in_naptr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_in_naptr(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -122,7 +122,7 @@ fromwire_in_naptr(dns_rdataclass_t class, dns_rdatatype_t type, isc_region_t sr; REQUIRE(type == 35); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -157,7 +157,7 @@ towire_in_naptr(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) isc_region_t sr; REQUIRE(rdata->type == 35); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); if (dns_compress_getedns(cctx) >= 1) dns_compress_setmethods(cctx, DNS_COMPRESS_ALL); @@ -196,9 +196,9 @@ compare_in_naptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { int result; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 35); - REQUIRE(rdata1->class == 1); + REQUIRE(rdata1->rdclass == 1); dns_rdata_toregion(rdata1, ®ion1); dns_rdata_toregion(rdata2, ®ion2); @@ -242,12 +242,12 @@ compare_in_naptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_in_naptr(dns_rdataclass_t class, dns_rdatatype_t type, +fromstruct_in_naptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 35); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); source = source; target = target; @@ -259,7 +259,7 @@ static dns_result_t tostruct_in_naptr(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 35); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); target = target; mctx = mctx; @@ -272,4 +272,18 @@ freestruct_in_naptr(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); } + +static dns_result_t +additionaldata_in_naptr(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 35); + REQUIRE(rdata->rdclass == 1); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_IN_1_NAPTR_35_C */ diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c index 9f6f275668..a44893c6ae 100644 --- a/lib/dns/rdata/in_1/nsap-ptr_23.c +++ b/lib/dns/rdata/in_1/nsap-ptr_23.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: nsap-ptr_23.c,v 1.7 1999/06/08 10:35:22 gson Exp $ */ + /* $Id: nsap-ptr_23.c,v 1.8 1999/08/02 22:18:01 halley Exp $ */ /* RFC 1348 */ @@ -23,7 +23,7 @@ #define RDATA_IN_1_NSAP_PTR_23_C static dns_result_t -fromtext_in_nsap_ptr(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -32,7 +32,7 @@ fromtext_in_nsap_ptr(dns_rdataclass_t class, dns_rdatatype_t type, isc_buffer_t buffer; REQUIRE(type == 23); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); @@ -53,7 +53,7 @@ totext_in_nsap_ptr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_boolean_t sub; REQUIRE(rdata->type == 23); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); dns_name_init(&name, NULL); dns_name_init(&prefix, NULL); @@ -67,14 +67,14 @@ totext_in_nsap_ptr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_in_nsap_ptr(dns_rdataclass_t class, dns_rdatatype_t type, +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) { dns_name_t name; REQUIRE(type == 23); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -93,7 +93,7 @@ towire_in_nsap_ptr(dns_rdata_t *rdata, dns_compress_t *cctx, isc_region_t region; REQUIRE(rdata->type == 23); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); if (dns_compress_getedns(cctx) >= 1) dns_compress_setmethods(cctx, DNS_COMPRESS_ALL); @@ -115,9 +115,9 @@ compare_in_nsap_ptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t region2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 23); - REQUIRE(rdata1->class == 1); + REQUIRE(rdata1->rdclass == 1); dns_name_init(&name1, NULL); dns_name_init(&name2, NULL); @@ -132,12 +132,12 @@ compare_in_nsap_ptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_in_nsap_ptr(dns_rdataclass_t class, dns_rdatatype_t type, +fromstruct_in_nsap_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 23); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); source = source; target = target; @@ -149,7 +149,7 @@ static dns_result_t tostruct_in_nsap_ptr(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 23); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); target = target; mctx = mctx; @@ -162,4 +162,18 @@ freestruct_in_nsap_ptr(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); } + +static dns_result_t +additionaldata_in_nsap_ptr(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 23); + REQUIRE(rdata->rdclass == 1); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_IN_1_NSAP_PTR_23_C */ diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c index 11004dbbf0..fa8c45e5c9 100644 --- a/lib/dns/rdata/in_1/nsap_22.c +++ b/lib/dns/rdata/in_1/nsap_22.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: nsap_22.c,v 1.6 1999/06/08 10:35:22 gson Exp $ */ + /* $Id: nsap_22.c,v 1.7 1999/08/02 22:18:01 halley Exp $ */ /* RFC 1706 */ @@ -25,7 +25,7 @@ #include static dns_result_t -fromtext_in_nsap(dns_rdataclass_t class, dns_rdatatype_t type, +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) { isc_token_t token; @@ -35,7 +35,7 @@ fromtext_in_nsap(dns_rdataclass_t class, dns_rdatatype_t type, unsigned char c; REQUIRE(type == 22); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); origin = origin; /*unused*/ downcase = downcase; /*unused*/ @@ -79,7 +79,7 @@ totext_in_nsap(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, char buf[sizeof "xx"]; REQUIRE(rdata->type == 22); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); tctx = tctx; /* unused */ @@ -94,14 +94,14 @@ totext_in_nsap(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_in_nsap(dns_rdataclass_t class, dns_rdatatype_t type, +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) { isc_region_t region; REQUIRE(type == 22); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); dctx = dctx; /* unused */ downcase = downcase; /* unused */ @@ -118,7 +118,7 @@ static dns_result_t towire_in_nsap(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { REQUIRE(rdata->type == 22); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); cctx = cctx; /*unused*/ @@ -131,9 +131,9 @@ compare_in_nsap(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t r2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 22); - REQUIRE(rdata1->class == 1); + REQUIRE(rdata1->rdclass == 1); dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); @@ -141,12 +141,12 @@ compare_in_nsap(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_in_nsap(dns_rdataclass_t class, dns_rdatatype_t type, void *source, - isc_buffer_t *target) +fromstruct_in_nsap(dns_rdataclass_t rdclass, dns_rdatatype_t type, + void *source, isc_buffer_t *target) { REQUIRE(type == 22); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); source = source; target = target; @@ -158,7 +158,7 @@ static dns_result_t tostruct_in_nsap(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 22); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); target = target; mctx = mctx; @@ -171,4 +171,18 @@ freestruct_in_nsap(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_in_nsap(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 22); + REQUIRE(rdata->rdclass == 1); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_IN_1_NSAP_22_C */ diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c index 64d916bea2..acc3e9e5d7 100644 --- a/lib/dns/rdata/in_1/px_26.c +++ b/lib/dns/rdata/in_1/px_26.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: px_26.c,v 1.7 1999/06/08 10:35:22 gson Exp $ */ + /* $Id: px_26.c,v 1.8 1999/08/02 22:18:01 halley Exp $ */ /* RFC 2163 */ @@ -23,7 +23,7 @@ #define RDATA_IN_1_PX_26_C static dns_result_t -fromtext_in_px(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -32,7 +32,7 @@ fromtext_in_px(dns_rdataclass_t class, dns_rdatatype_t type, isc_buffer_t buffer; REQUIRE(type == 26); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); /* preference */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); @@ -67,7 +67,7 @@ totext_in_px(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, unsigned short num; REQUIRE(rdata->type == 26); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); dns_name_init(&name, NULL); dns_name_init(&prefix, NULL); @@ -94,7 +94,7 @@ totext_in_px(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_in_px(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -102,7 +102,7 @@ fromwire_in_px(dns_rdataclass_t class, dns_rdatatype_t type, isc_region_t sregion; REQUIRE(type == 26); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -131,7 +131,7 @@ towire_in_px(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t region; REQUIRE(rdata->type == 26); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); if (dns_compress_getedns(cctx) >= 1) dns_compress_setmethods(cctx, DNS_COMPRESS_ALL); @@ -164,9 +164,9 @@ compare_in_px(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { int result; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 26); - REQUIRE(rdata1->class == 1); + REQUIRE(rdata1->rdclass == 1); result = memcmp(rdata1->data, rdata2->data, 2); if (result != 0) @@ -198,12 +198,12 @@ compare_in_px(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_in_px(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_in_px(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 26); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); source = source; target = target; @@ -215,7 +215,7 @@ static dns_result_t tostruct_in_px(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 26); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); target = target; mctx = mctx; @@ -229,4 +229,18 @@ freestruct_in_px(void *source) { REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_in_px(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 26); + REQUIRE(rdata->rdclass == 1); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_IN_1_PX_26_C */ diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c index 7d87798e7a..3cb5dc8648 100644 --- a/lib/dns/rdata/in_1/srv_33.c +++ b/lib/dns/rdata/in_1/srv_33.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: srv_33.c,v 1.7 1999/06/08 10:35:23 gson Exp $ */ + /* $Id: srv_33.c,v 1.8 1999/08/02 22:18:02 halley Exp $ */ /* RFC 2052 bis */ @@ -23,7 +23,7 @@ #define RDATA_IN_1_SRV_33_C static dns_result_t -fromtext_in_srv(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -32,7 +32,7 @@ fromtext_in_srv(dns_rdataclass_t class, dns_rdatatype_t type, isc_buffer_t buffer; REQUIRE(type == 33); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); /* priority */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); @@ -67,7 +67,7 @@ totext_in_srv(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, unsigned short num; REQUIRE(rdata->type == 33); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); dns_name_init(&name, NULL); dns_name_init(&prefix, NULL); @@ -101,7 +101,7 @@ totext_in_srv(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_in_srv(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -109,7 +109,7 @@ fromwire_in_srv(dns_rdataclass_t class, dns_rdatatype_t type, isc_region_t sr; REQUIRE(type == 33); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx)) dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); @@ -161,9 +161,9 @@ compare_in_srv(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { int result; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 33); - REQUIRE(rdata1->class == 1); + REQUIRE(rdata1->rdclass == 1); /* priority, weight, port */ result = memcmp(rdata1->data, rdata2->data, 6); @@ -187,12 +187,12 @@ compare_in_srv(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_in_srv(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_in_srv(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 33); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); source = source; target = target; @@ -204,7 +204,7 @@ static dns_result_t tostruct_in_srv(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 33); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); target = target; mctx = mctx; @@ -217,4 +217,18 @@ freestruct_in_srv(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_in_srv(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 33); + REQUIRE(rdata->rdclass == 1); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_IN_1_SRV_33_C */ diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c index 966296e3cb..70c7da921d 100644 --- a/lib/dns/rdata/in_1/wks_11.c +++ b/lib/dns/rdata/in_1/wks_11.c @@ -15,7 +15,7 @@ * SOFTWARE. */ - /* $Id: wks_11.c,v 1.13 1999/07/16 00:24:33 halley Exp $ */ + /* $Id: wks_11.c,v 1.14 1999/08/02 22:18:02 halley Exp $ */ #ifndef RDATA_IN_1_WKS_11_C #define RDATA_IN_1_WKS_11_C @@ -28,7 +28,7 @@ #include static dns_result_t -fromtext_in_wks(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -46,7 +46,7 @@ fromtext_in_wks(dns_rdataclass_t class, dns_rdatatype_t type, unsigned int n; REQUIRE(type == 11); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); origin = origin; /*unused*/ downcase = downcase; /*unused*/ @@ -118,7 +118,7 @@ totext_in_wks(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, unsigned int i, j; REQUIRE(rdata->type == 11); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); tctx = tctx; dns_rdata_toregion(rdata, &sr); @@ -149,7 +149,7 @@ totext_in_wks(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, } static dns_result_t -fromwire_in_wks(dns_rdataclass_t class, dns_rdatatype_t type, +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) { @@ -157,7 +157,7 @@ fromwire_in_wks(dns_rdataclass_t class, dns_rdatatype_t type, isc_region_t tr; REQUIRE(type == 11); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); dctx = dctx; /*unused*/ downcase = downcase; /*unused*/ @@ -183,7 +183,7 @@ towire_in_wks(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t sr; REQUIRE(rdata->type == 11); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); cctx = cctx; /*unused*/ @@ -197,9 +197,9 @@ compare_in_wks(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t r2; REQUIRE(rdata1->type == rdata2->type); - REQUIRE(rdata1->class == rdata2->class); + REQUIRE(rdata1->rdclass == rdata2->rdclass); REQUIRE(rdata1->type == 11); - REQUIRE(rdata1->class == 1); + REQUIRE(rdata1->rdclass == 1); dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); @@ -207,13 +207,13 @@ compare_in_wks(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { } static dns_result_t -fromstruct_in_wks(dns_rdataclass_t class, dns_rdatatype_t type, void *source, +fromstruct_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, isc_buffer_t *target) { REQUIRE(type == 11); - REQUIRE(class == 1); + REQUIRE(rdclass == 1); source = source; target = target; @@ -225,7 +225,7 @@ static dns_result_t tostruct_in_wks(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { REQUIRE(rdata->type == 11); - REQUIRE(rdata->class == 1); + REQUIRE(rdata->rdclass == 1); target = target; mctx = mctx; @@ -238,4 +238,18 @@ freestruct_in_wks(void *source) { REQUIRE(source != NULL); REQUIRE(ISC_FALSE); /*XXX*/ } + +static dns_result_t +additionaldata_in_wks(dns_rdata_t *rdata, dns_additionaldatafunc_t add, + void *arg) +{ + REQUIRE(rdata->type == 11); + REQUIRE(rdata->rdclass == 1); + + (void)add; + (void)arg; + + return (DNS_R_SUCCESS); +} + #endif /* RDATA_IN_1_WKS_11_C */ diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c index 7317f6ea67..bb0840f02e 100644 --- a/lib/dns/rdataset.c +++ b/lib/dns/rdataset.c @@ -315,3 +315,35 @@ dns_rdataset_towire(dns_rdataset_t *rdataset, return (DNS_R_SUCCESS); } + +dns_result_t +dns_rdataset_additionaldata(dns_rdataset_t *rdataset, + dns_additionaldatafunc_t add, void *arg) +{ + dns_rdata_t rdata; + dns_result_t result; + + /* + * For each rdata in rdataset, call 'add' for each name and type in the + * rdata which is subject to additional section processing. + */ + + REQUIRE(DNS_RDATASET_VALID(rdataset)); + REQUIRE((rdataset->attributes & DNS_RDATASETATTR_QUESTION) == 0); + + result = dns_rdataset_first(rdataset); + if (result != DNS_R_SUCCESS) + return (result); + + do { + dns_rdataset_current(rdataset, &rdata); + result = dns_rdata_additionaldata(&rdata, add, arg); + if (result == DNS_R_SUCCESS) + result = dns_rdataset_next(rdataset); + } while (result == DNS_R_SUCCESS); + + if (result != DNS_R_NOMORE) + return (result); + + return (DNS_R_SUCCESS); +}