From 34b394b43e2207e8f8f3703f0402422121455638 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Mon, 15 May 2000 21:14:38 +0000 Subject: [PATCH] DNS_R_RANGE -> ISC_R_RANGE --- CHANGES | 4 +- bin/named/server.c | 6 +- bin/named/xfrout.c | 4 +- doc/dev/rdata.html | 4 +- lib/dns/include/dns/cert.h | 8 +- lib/dns/include/dns/journal.h | 2 +- lib/dns/include/dns/keyflags.h | 6 +- lib/dns/include/dns/result.h | 2 +- lib/dns/include/dns/secalg.h | 9 +- lib/dns/include/dns/secproto.h | 6 +- lib/dns/journal.c | 6 +- lib/dns/nxt.c | 7 +- lib/dns/rdata.c | 10 +- lib/dns/rdata/any_255/tsig_250.c | 14 +-- lib/dns/rdata/generic/afsdb_18.c | 27 +++--- lib/dns/rdata/generic/cert_37.c | 32 ++++-- lib/dns/rdata/generic/loc_29.c | 44 ++++----- lib/dns/rdata/generic/mx_15.c | 16 ++- lib/dns/rdata/generic/nxt_30.c | 8 +- lib/dns/rdata/generic/rt_21.c | 19 ++-- lib/dns/rdata/generic/sig_24.c | 162 +++++++++++++++++++++++-------- lib/dns/rdata/generic/tkey_249.c | 10 +- lib/dns/rdata/generic/x25_19.c | 4 +- lib/dns/rdata/in_1/a6_38.c | 48 +++++---- lib/dns/rdata/in_1/kx_36.c | 21 ++-- lib/dns/rdata/in_1/naptr_35.c | 154 +++++++++++++++++++++-------- lib/dns/rdata/in_1/px_26.c | 52 +++++++--- lib/dns/rdata/in_1/srv_33.c | 64 ++++++++---- lib/dns/rdata/in_1/wks_11.c | 33 ++++--- lib/dns/result.c | 30 +++--- lib/dns/tcpmsg.c | 2 +- lib/dns/time.c | 10 +- lib/tests/t_api.c | 2 +- 33 files changed, 527 insertions(+), 299 deletions(-) diff --git a/CHANGES b/CHANGES index cef226cc88..576e2df5ae 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ + 180. [func] New isc_result_t ISC_R_RANGE. Supersedes DNS_R_RANGE. + 179. [func] options named.conf statement *must* now come before any zone or view statements. @@ -30,7 +32,7 @@ master files because totext_ctx_init() failed to initialize ctx->current_ttl_valid. - 171. [cleanup] On NetBSD systems, the mit-pthreads or + 171. [cleanup] On NetBSD systems, the mit-pthreads or unproven-pthreads library is now always used unless --with-ptl2 is explicitly specified on the configure command line. The diff --git a/bin/named/server.c b/bin/named/server.c index 08a9f08edc..fa7abd4a03 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -219,11 +219,11 @@ configure_view_dnsseckeys(dns_c_ctx_t *cctx, proto = ckey->pubkey->protocol; alg = ckey->pubkey->algorithm; if (flags < 0 || flags > 0xffff) - CHECKM(DNS_R_RANGE, "key flags"); + CHECKM(ISC_R_RANGE, "key flags"); if (proto < 0 || proto > 0xff) - CHECKM(DNS_R_RANGE, "key protocol"); + CHECKM(ISC_R_RANGE, "key protocol"); if (alg < 0 || alg > 0xff) - CHECKM(DNS_R_RANGE, "key algorithm"); + CHECKM(ISC_R_RANGE, "key algorithm"); keystruct.flags = flags; keystruct.protocol = proto; keystruct.algorithm = alg; diff --git a/bin/named/xfrout.c b/bin/named/xfrout.c index 8d9b08bfd0..452a815608 100644 --- a/bin/named/xfrout.c +++ b/bin/named/xfrout.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: xfrout.c,v 1.61 2000/05/10 03:33:52 tale Exp $ */ +/* $Id: xfrout.c,v 1.62 2000/05/15 21:14:01 tale Exp $ */ #include @@ -999,7 +999,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { current_serial, &data_stream); if (result == ISC_R_NOTFOUND || - result == DNS_R_RANGE) { + result == ISC_R_RANGE) { xfrout_log1(client, question_name, ISC_LOG_DEBUG(4), "IXFR version not in journal, " "falling back to AXFR"); diff --git a/doc/dev/rdata.html b/doc/dev/rdata.html index e389a26881..91fe38d9d8 100644 --- a/doc/dev/rdata.html +++ b/doc/dev/rdata.html @@ -483,7 +483,7 @@ uint16_tobuffer(isc_uint32_t value, isc_buffer_t *target);

Write them 16 bit value in network order to target.

-Returns DNS_R_RANGE, DNS_R_NOSPACE and DNS_R_SUCCESS. +Returns ISC_R_RANGE, DNS_R_NOSPACE and DNS_R_SUCCESS.

static isc_uint32_t
uint32_fromregion(isc_region_t *region);
@@ -583,7 +583,7 @@ Take the date in source and convert it seconds since January 1, 1970 (ignoring leap seconds) and place the least significant 32 bits into target.

-Returns DNS_R_RANGE, DNS_R_SYNTAX, +Returns ISC_R_RANGE, DNS_R_SYNTAX, DNS_R_NOSPACE and DNS_R_SUCCESS.

Support Macros

diff --git a/lib/dns/include/dns/cert.h b/lib/dns/include/dns/cert.h index cf3d89c88a..28abb446d5 100644 --- a/lib/dns/include/dns/cert.h +++ b/lib/dns/include/dns/cert.h @@ -24,7 +24,8 @@ ISC_LANG_BEGINDECLS -isc_result_t dns_cert_fromtext(dns_cert_t *certp, isc_textregion_t *source); +isc_result_t +dns_cert_fromtext(dns_cert_t *certp, isc_textregion_t *source); /* * Convert the text 'source' refers to into a certificate type. * The text may contain either a mnemonic type name or a decimal type number. @@ -36,11 +37,12 @@ isc_result_t dns_cert_fromtext(dns_cert_t *certp, isc_textregion_t *source); * * Returns: * ISC_R_SUCCESS on success + * ISC_R_RANGE numeric type is out of range * DNS_R_UNKNOWN mnemonic type is unknown - * DNS_R_RANGE numeric type is out of range */ -isc_result_t dns_cert_totext(dns_cert_t cert, isc_buffer_t *target); +isc_result_t +dns_cert_totext(dns_cert_t cert, isc_buffer_t *target); /* * Put a textual representation of certificate type 'cert' into 'target'. * diff --git a/lib/dns/include/dns/journal.h b/lib/dns/include/dns/journal.h index bde3c083f9..efcbcbbe11 100644 --- a/lib/dns/include/dns/journal.h +++ b/lib/dns/include/dns/journal.h @@ -432,10 +432,10 @@ dns_journal_iter_init(dns_journal_t *j, * * Returns: * ISC_R_SUCCESS + * ISC_R_RANGE begin_serial is outside the addressable range. * ISC_R_NOTFOUND begin_serial is within the range of adressable * serial numbers covered by the journal, but * this particular serial number does not exist. - * DNS_R_RANGE begin_serial is outside the addressable range. */ isc_result_t diff --git a/lib/dns/include/dns/keyflags.h b/lib/dns/include/dns/keyflags.h index b71f9d9516..0b977a8e7c 100644 --- a/lib/dns/include/dns/keyflags.h +++ b/lib/dns/include/dns/keyflags.h @@ -24,8 +24,8 @@ ISC_LANG_BEGINDECLS -isc_result_t dns_keyflags_fromtext(dns_keyflags_t *flagsp, - isc_textregion_t *source); +isc_result_t +dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source); /* * Convert the text 'source' refers to into a DNSSEC KEY flags value. * The text may contain either a set of flag mnemonics separated by @@ -41,8 +41,8 @@ isc_result_t dns_keyflags_fromtext(dns_keyflags_t *flagsp, * * Returns: * ISC_R_SUCCESS on success + * ISC_R_RANGE numeric flag value is out of range * DNS_R_UNKNOWN mnemonic flag is unknown - * DNS_R_RANGE numeric flag value is out of range */ ISC_LANG_ENDDECLS diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h index 9f872da784..555a8486e9 100644 --- a/lib/dns/include/dns/result.h +++ b/lib/dns/include/dns/result.h @@ -49,7 +49,7 @@ #define DNS_R_EXTRATOKEN (ISC_RESULTCLASS_DNS + 12) #define DNS_R_EXTRADATA (ISC_RESULTCLASS_DNS + 13) #define DNS_R_TEXTTOOLONG (ISC_RESULTCLASS_DNS + 14) -#define DNS_R_RANGE (ISC_RESULTCLASS_DNS + 15) +/* 15 is unused */ #define DNS_R_SYNTAX (ISC_RESULTCLASS_DNS + 16) #define DNS_R_BADCKSUM (ISC_RESULTCLASS_DNS + 17) #define DNS_R_BADAAAA (ISC_RESULTCLASS_DNS + 18) diff --git a/lib/dns/include/dns/secalg.h b/lib/dns/include/dns/secalg.h index 96544bb055..0de257cd89 100644 --- a/lib/dns/include/dns/secalg.h +++ b/lib/dns/include/dns/secalg.h @@ -24,8 +24,8 @@ ISC_LANG_BEGINDECLS -isc_result_t dns_secalg_fromtext(dns_secalg_t *secalgp, - isc_textregion_t *source); +isc_result_t +dns_secalg_fromtext(dns_secalg_t *secalgp, isc_textregion_t *source); /* * Convert the text 'source' refers to into a DNSSEC security algorithm value. * The text may contain either a mnemonic algorithm name or a decimal algorithm @@ -38,11 +38,12 @@ isc_result_t dns_secalg_fromtext(dns_secalg_t *secalgp, * * Returns: * ISC_R_SUCCESS on success + * ISC_R_RANGE numeric type is out of range * DNS_R_UNKNOWN mnemonic type is unknown - * DNS_R_RANGE numeric type is out of range */ -isc_result_t dns_secalg_totext(dns_secalg_t secalg, isc_buffer_t *target); +isc_result_t +dns_secalg_totext(dns_secalg_t secalg, isc_buffer_t *target); /* * Put a textual representation of the DNSSEC security algorithm 'secalg' * into 'target'. diff --git a/lib/dns/include/dns/secproto.h b/lib/dns/include/dns/secproto.h index b538adecc5..7bd9f3fa91 100644 --- a/lib/dns/include/dns/secproto.h +++ b/lib/dns/include/dns/secproto.h @@ -24,8 +24,8 @@ ISC_LANG_BEGINDECLS -isc_result_t dns_secproto_fromtext(dns_secproto_t *secprotop, - isc_textregion_t *source); +isc_result_t +dns_secproto_fromtext(dns_secproto_t *secprotop, isc_textregion_t *source); /* * Convert the text 'source' refers to into a DNSSEC security protocol value. * The text may contain either a mnemonic protocol name or a decimal protocol @@ -38,8 +38,8 @@ isc_result_t dns_secproto_fromtext(dns_secproto_t *secprotop, * * Returns: * ISC_R_SUCCESS on success + * ISC_R_RANGE numeric type is out of range * DNS_R_UNKNOWN mnemonic type is unknown - * DNS_R_RANGE numeric type is out of range */ isc_result_t diff --git a/lib/dns/journal.c b/lib/dns/journal.c index 8350b50add..097a77b9ab 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -1389,7 +1389,7 @@ index_invalidate(dns_journal_t *j, isc_uint32_t serial) { * (from the journal, not just from the index), return ISC_R_NOTFOUND. * * If 'serial' is outside the range of addressable serial numbers - * covered by the journal, return DNS_R_RANGE. + * covered by the journal, return ISC_R_RANGE. * */ static isc_result_t @@ -1399,9 +1399,9 @@ journal_find(dns_journal_t *j, isc_uint32_t serial, journal_pos_t *pos) { REQUIRE(DNS_JOURNAL_VALID(j)); if (DNS_SERIAL_GT(j->header.begin.serial, serial)) - return (DNS_R_RANGE); + return (ISC_R_RANGE); if (DNS_SERIAL_GT(serial, j->header.end.serial)) - return (DNS_R_RANGE); + return (ISC_R_RANGE); if (serial == j->header.end.serial) { *pos = j->header.end; return (ISC_R_SUCCESS); diff --git a/lib/dns/nxt.c b/lib/dns/nxt.c index a81210d967..915308c3be 100644 --- a/lib/dns/nxt.c +++ b/lib/dns/nxt.c @@ -93,7 +93,8 @@ dns_buildnxtrdata(dns_db_t *db, dns_dbversion_t *version, { dns_rdatasetiter_current(rdsiter, &rdataset); if (rdataset.type > 127) - return DNS_R_RANGE; /* XXX "rdataset type too large" */ + /* XXX "rdataset type too large" */ + return (ISC_R_RANGE); if (rdataset.type != dns_rdatatype_nxt) { if (rdataset.type > max_type) max_type = rdataset.type; @@ -102,7 +103,9 @@ dns_buildnxtrdata(dns_db_t *db, dns_dbversion_t *version, dns_rdataset_disassociate(&rdataset); } - /* At zone cuts, deny the existence of glue in the parent zone. */ + /* + * At zone cuts, deny the existence of glue in the parent zone. + */ if (bit_isset(nxt_bits, dns_rdatatype_ns) && ! bit_isset(nxt_bits, dns_rdatatype_soa)) { for (i = 0; i < 128; i++) { diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c index 8f8626ce1a..7c8feb0a5c 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: rdata.c,v 1.89 2000/05/14 02:02:24 tale Exp $ */ +/* $Id: rdata.c,v 1.90 2000/05/15 21:14:07 tale Exp $ */ #include @@ -696,7 +696,7 @@ dns_mnemonic_fromtext(unsigned int *valuep, isc_textregion_t *source, n = strtoul(buffer, &e, 10); if (*e == 0) { if (n > max) - return (DNS_R_RANGE); + return (ISC_R_RANGE); *valuep = n; return (ISC_R_SUCCESS); } @@ -923,7 +923,7 @@ dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source) n = strtoul(buffer, &e, 0); /* Allow hex/octal. */ if (*e == 0) { if (n > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); *flagsp = n; return (ISC_R_SUCCESS); } @@ -1180,7 +1180,7 @@ uint16_tobuffer(isc_uint32_t value, isc_buffer_t *target) { isc_region_t region; if (value > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); isc_buffer_availableregion(target, ®ion); if (region.length < 2) return (ISC_R_NOSPACE); @@ -1193,7 +1193,7 @@ uint8_tobuffer(isc_uint32_t value, isc_buffer_t *target) { isc_region_t region; if (value > 0xff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); isc_buffer_availableregion(target, ®ion); if (region.length < 1) return (ISC_R_NOSPACE); diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c index a7b02953de..4c20f25e77 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.35 2000/05/13 22:50:49 tale Exp $ */ +/* $Id: tsig_250.c,v 1.36 2000/05/15 21:14:18 tale Exp $ */ /* Reviewed: Thu Mar 16 13:39:43 PST 2000 by gson */ @@ -58,7 +58,7 @@ fromtext_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type, if (*e != 0) return (DNS_R_SYNTAX); if ((sigtime >> 48) != 0) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer((isc_uint16_t)(sigtime >> 32), target)); RETERR(uint32_tobuffer((isc_uint32_t)(sigtime & 0xffffffffU), target)); @@ -67,7 +67,7 @@ fromtext_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type, */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); /* @@ -75,7 +75,7 @@ fromtext_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type, */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); /* @@ -88,7 +88,7 @@ fromtext_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type, */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); /* @@ -96,7 +96,7 @@ fromtext_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type, */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); /* @@ -104,7 +104,7 @@ fromtext_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type, */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); /* diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c index 09d5e1fb94..1e71d9408b 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.26 2000/05/12 12:59:22 marka Exp $ */ +/* $Id: afsdb_18.c,v 1.27 2000/05/15 21:14:20 tale Exp $ */ /* Reviewed: Wed Mar 15 14:59:00 PST 2000 by explorer */ @@ -39,13 +39,17 @@ fromtext_afsdb(dns_rdataclass_t rdclass, dns_rdatatype_t type, REQUIRE(type == 18); - /* subtype */ + /* + * Subtype. + */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); - /* hostname */ + /* + * Hostname. + */ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); dns_name_init(&name, NULL); buffer_fromregion(&buffer, &token.value.as_region); @@ -109,8 +113,7 @@ fromwire_afsdb(dns_rdataclass_t rdclass, dns_rdatatype_t type, } static inline isc_result_t -towire_afsdb(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) -{ +towire_afsdb(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t tr; isc_region_t sr; dns_name_t name; @@ -133,8 +136,7 @@ towire_afsdb(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) } static inline int -compare_afsdb(dns_rdata_t *rdata1, dns_rdata_t *rdata2) -{ +compare_afsdb(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { int result; dns_name_t name1; dns_name_t name2; @@ -178,8 +180,7 @@ fromstruct_afsdb(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, } static inline isc_result_t -tostruct_afsdb(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) -{ +tostruct_afsdb(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { isc_region_t region; dns_rdata_afsdb_t *afsdb = target; dns_name_t name; @@ -207,8 +208,7 @@ tostruct_afsdb(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) } static inline void -freestruct_afsdb(void *source) -{ +freestruct_afsdb(void *source) { dns_rdata_afsdb_t *afsdb = source; REQUIRE(source != NULL); @@ -239,8 +239,7 @@ additionaldata_afsdb(dns_rdata_t *rdata, dns_additionaldatafunc_t add, } static inline isc_result_t -digest_afsdb(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) -{ +digest_afsdb(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r1, r2; dns_name_t name; diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c index e8d35b9a7b..d949d44bde 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.26 2000/05/12 12:59:26 marka Exp $ */ +/* $Id: cert_37.c,v 1.27 2000/05/15 21:14:21 tale Exp $ */ /* Reviewed: Wed Mar 15 21:14:32 EST 2000 by tale */ @@ -41,18 +41,24 @@ fromtext_cert(dns_rdataclass_t rdclass, dns_rdatatype_t type, UNUSED(origin); UNUSED(downcase); - /* cert type */ + /* + * Cert type. + */ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); RETERR(dns_cert_fromtext(&cert, &token.value.as_textregion)); RETERR(uint16_tobuffer(cert, target)); - /* key tag */ + /* + * Key tag. + */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); - /* algorithm */ + /* + * Algorithm. + */ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); RETERR(dns_secalg_fromtext(&secalg, &token.value.as_textregion)); RETERR(mem_tobuffer(target, &secalg, 1)); @@ -74,23 +80,31 @@ totext_cert(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, dns_rdata_toregion(rdata, &sr); - /* type */ + /* + * Type. + */ n = uint16_fromregion(&sr); isc_region_consume(&sr, 2); RETERR(dns_cert_totext((dns_cert_t)n, target)); RETERR(str_totext(" ", target)); - /* key tag */ + /* + * Key tag. + */ n = uint16_fromregion(&sr); isc_region_consume(&sr, 2); sprintf(buf, "%u ", n); RETERR(str_totext(buf, target)); - /* algorithm */ + /* + * Algorithm. + */ RETERR(dns_secalg_totext(sr.base[0], target)); isc_region_consume(&sr, 1); - /* cert */ + /* + * Cert. + */ if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) RETERR(str_totext(" (", target)); RETERR(str_totext(tctx->linebreak, target)); diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c index 4e1b17491d..0b21f8da54 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.18 2000/05/13 21:24:37 tale Exp $ */ +/* $Id: loc_29.c,v 1.19 2000/05/15 21:14:22 tale Exp $ */ /* Reviewed: Wed Mar 15 18:13:09 PST 2000 by explorer */ @@ -74,7 +74,7 @@ fromtext_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 90) - return (DNS_R_RANGE); + return (ISC_R_RANGE); d1 = (int)token.value.as_ulong; /* * Minutes. @@ -88,9 +88,9 @@ fromtext_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, if (*e != 0) return (DNS_R_SYNTAX); if (m1 < 0 || m1 > 59) - return (DNS_R_RANGE); + return (ISC_R_RANGE); if (d1 == 90 && m1 != 0) - return (DNS_R_RANGE); + return (ISC_R_RANGE); /* * Seconds. @@ -104,7 +104,7 @@ fromtext_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, if (*e != 0 && *e != '.') return (DNS_R_SYNTAX); if (s1 < 0 || s1 > 59) - return (DNS_R_RANGE); + return (ISC_R_RANGE); if (*e == '.') { e++; for (i = 0; i < 3 ; i++) { @@ -122,7 +122,7 @@ fromtext_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, } else s1 *= 1000; if (d1 == 90 && s1 != 0) - return (DNS_R_RANGE); + return (ISC_R_RANGE); /* * Direction. @@ -139,7 +139,7 @@ fromtext_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 180) - return (DNS_R_RANGE); + return (ISC_R_RANGE); d2 = (int)token.value.as_ulong; /* @@ -154,9 +154,9 @@ fromtext_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, if (*e != 0) return (DNS_R_SYNTAX); if (m2 < 0 || m2 > 59) - return (DNS_R_RANGE); + return (ISC_R_RANGE); if (d2 == 180 && m2 != 0) - return (DNS_R_RANGE); + return (ISC_R_RANGE); /* * Seconds. @@ -170,7 +170,7 @@ fromtext_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, if (*e != 0 && *e != '.') return (DNS_R_SYNTAX); if (s2 < 0 || s2 > 59) - return (DNS_R_RANGE); + return (ISC_R_RANGE); if (*e == '.') { e++; for (i = 0; i < 3 ; i++) { @@ -188,7 +188,7 @@ fromtext_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, } else s2 *= 1000; if (d2 == 180 && s2 != 0) - return (DNS_R_RANGE); + return (ISC_R_RANGE); /* * Direction. @@ -208,7 +208,7 @@ fromtext_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, if (*e != 0 && *e != '.' && *e != 'm') return (DNS_R_SYNTAX); if (m < -100000 || m > 42849672) - return (DNS_R_RANGE); + return (ISC_R_RANGE); cm = 0; if (*e == '.') { e++; @@ -231,9 +231,9 @@ fromtext_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, if (*e != 0) return (DNS_R_SYNTAX); if (m == -100000 && cm != 0) - return (DNS_R_RANGE); + return (ISC_R_RANGE); if (m == 42849672 && cm > 95) - return (DNS_R_RANGE); + return (ISC_R_RANGE); /* * Adjust base. */ @@ -254,7 +254,7 @@ fromtext_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, if (*e != 0 && *e != '.' && *e != 'm') return (DNS_R_SYNTAX); if (m < 0 || m > 90000000) - return (DNS_R_RANGE); + return (ISC_R_RANGE); cm = 0; if (*e == '.') { e++; @@ -306,7 +306,7 @@ fromtext_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, if (*e != 0 && *e != '.' && *e != 'm') return (DNS_R_SYNTAX); if (m < 0 || m > 90000000) - return (DNS_R_RANGE); + return (ISC_R_RANGE); cm = 0; if (*e == '.') { e++; @@ -356,7 +356,7 @@ fromtext_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, if (*e != 0 && *e != '.' && *e != 'm') return (DNS_R_SYNTAX); if (m < 0 || m > 90000000) - return (DNS_R_RANGE); + return (ISC_R_RANGE); cm = 0; if (*e == '.') { e++; @@ -542,7 +542,7 @@ fromwire_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, c = sr.base[1]; if (c != 0) if ((c&0xf) > 9 || ((c>>4)&0xf) > 9 || ((c>>4)&0xf) == 0) - return (DNS_R_RANGE); + return (ISC_R_RANGE); /* * Horizontal precision. @@ -550,7 +550,7 @@ fromwire_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, c = sr.base[2]; if (c != 0) if ((c&0xf) > 9 || ((c>>4)&0xf) > 9 || ((c>>4)&0xf) == 0) - return (DNS_R_RANGE); + return (ISC_R_RANGE); /* * Vertical precision. @@ -558,7 +558,7 @@ fromwire_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, c = sr.base[3]; if (c != 0) if ((c&0xf) > 9 || ((c>>4)&0xf) > 9 || ((c>>4)&0xf) == 0) - return (DNS_R_RANGE); + return (ISC_R_RANGE); isc_region_consume(&sr, 4); /* @@ -567,7 +567,7 @@ fromwire_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, latitude = uint32_fromregion(&sr); if (latitude < (0x80000000UL - 90 * 3600000) || latitude > (0x80000000UL + 90 * 3600000)) - return (DNS_R_RANGE); + return (ISC_R_RANGE); isc_region_consume(&sr, 4); /* @@ -576,7 +576,7 @@ fromwire_loc(dns_rdataclass_t rdclass, dns_rdatatype_t type, longitude = uint32_fromregion(&sr); if (longitude < (0x80000000UL - 180 * 3600000) || longitude > (0x80000000UL + 180 * 3600000)) - return (DNS_R_RANGE); + return (ISC_R_RANGE); /* * Altitiude. diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c index 6cf70ee468..a13391c038 100644 --- a/lib/dns/rdata/generic/mx_15.c +++ b/lib/dns/rdata/generic/mx_15.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: mx_15.c,v 1.34 2000/05/13 20:52:13 tale Exp $ */ +/* $Id: mx_15.c,v 1.35 2000/05/15 21:14:24 tale Exp $ */ /* reviewed: Wed Mar 15 18:05:46 PST 2000 by brister */ @@ -39,7 +39,7 @@ fromtext_mx(dns_rdataclass_t rdclass, dns_rdatatype_t type, RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); @@ -103,8 +103,7 @@ fromwire_mx(dns_rdataclass_t rdclass, dns_rdatatype_t type, } static inline isc_result_t -towire_mx(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) -{ +towire_mx(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { dns_name_t name; isc_region_t region; @@ -123,8 +122,7 @@ towire_mx(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) } static inline int -compare_mx(dns_rdata_t *rdata1, dns_rdata_t *rdata2) -{ +compare_mx(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { dns_name_t name1; dns_name_t name2; isc_region_t region1; @@ -169,8 +167,7 @@ fromstruct_mx(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, } static inline isc_result_t -tostruct_mx(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) -{ +tostruct_mx(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { isc_region_t region; dns_rdata_mx_t *mx = target; dns_name_t name; @@ -225,8 +222,7 @@ additionaldata_mx(dns_rdata_t *rdata, dns_additionaldatafunc_t add, } static inline isc_result_t -digest_mx(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) -{ +digest_mx(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r1, r2; dns_name_t name; diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c index 0259f637e7..6110dc6499 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.33 2000/05/13 22:05:39 tale Exp $ */ +/* $Id: nxt_30.c,v 1.34 2000/05/15 21:14:25 tale Exp $ */ /* reviewed: Wed Mar 15 18:21:15 PST 2000 by brister */ @@ -49,7 +49,9 @@ fromtext_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type, UNUSED(rdclass); - /* next domain */ + /* + * Next domain. + */ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); dns_name_init(&name, NULL); buffer_fromregion(&buffer, &token.value.as_region); @@ -72,7 +74,7 @@ fromtext_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type, * NXT is only specified for types 1..127. */ if (covered < 1 || covered > 127) - return (DNS_R_RANGE); + return (ISC_R_RANGE); if (first || covered > maxcovered) maxcovered = covered; first = ISC_FALSE; diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c index 737651f5b3..c2bfc220ae 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.24 2000/05/12 12:59:28 marka Exp $ */ +/* $Id: rt_21.c,v 1.25 2000/05/15 21:14:26 tale Exp $ */ /* reviewed: Thu Mar 16 15:02:31 PST 2000 by brister */ @@ -41,7 +41,7 @@ fromtext_rt(dns_rdataclass_t rdclass, dns_rdatatype_t type, RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); @@ -108,8 +108,7 @@ fromwire_rt(dns_rdataclass_t rdclass, dns_rdatatype_t type, } static inline isc_result_t -towire_rt(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) -{ +towire_rt(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { dns_name_t name; isc_region_t region; isc_region_t tr; @@ -132,8 +131,7 @@ towire_rt(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) } static inline int -compare_rt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) -{ +compare_rt(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { dns_name_t name1; dns_name_t name2; isc_region_t region1; @@ -178,8 +176,7 @@ fromstruct_rt(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, } static inline isc_result_t -tostruct_rt(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) -{ +tostruct_rt(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { isc_region_t region; dns_rdata_rt_t *rt = target; dns_name_t name; @@ -204,8 +201,7 @@ tostruct_rt(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) } static inline void -freestruct_rt(void *source) -{ +freestruct_rt(void *source) { dns_rdata_rt_t *rt = source; REQUIRE(source != NULL); @@ -243,8 +239,7 @@ additionaldata_rt(dns_rdata_t *rdata, dns_additionaldatafunc_t add, } static inline isc_result_t -digest_rt(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) -{ +digest_rt(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r1, r2; isc_result_t result; dns_name_t name; diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c index 63fa556472..bb13b6c16e 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.38 2000/05/05 18:15:01 gson Exp $ */ +/* $Id: sig_24.c,v 1.39 2000/05/15 21:14:27 tale Exp $ */ /* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */ @@ -45,57 +45,75 @@ fromtext_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type, UNUSED(rdclass); - /* type covered */ + /* + * Type covered. + */ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); result = dns_rdatatype_fromtext(&covered, &token.value.as_textregion); if (result != ISC_R_SUCCESS && result != ISC_R_NOTIMPLEMENTED) { i = strtol(token.value.as_pointer, &e, 10); if (i < 0 || i > 65535) - return (DNS_R_RANGE); + return (ISC_R_RANGE); if (*e != 0) return (result); covered = (dns_rdatatype_t)i; } RETERR(uint16_tobuffer(covered, target)); - /* algorithm */ + /* + * Algorithm. + */ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); RETERR(dns_secalg_fromtext(&c, &token.value.as_textregion)); RETERR(mem_tobuffer(target, &c, 1)); - /* labels */ + /* + * Labels. + */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); c = (unsigned char)token.value.as_ulong; RETERR(mem_tobuffer(target, &c, 1)); - /* original ttl */ + /* + * Original ttl. + */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); RETERR(uint32_tobuffer(token.value.as_ulong, target)); - /* signature expiration */ + /* + * Signature expiration. + */ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); RETERR(dns_time32_fromtext(token.value.as_pointer, &time_expire)); RETERR(uint32_tobuffer(time_expire, target)); - /* time signed */ + /* + * Time signed. + */ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); RETERR(dns_time32_fromtext(token.value.as_pointer, &time_signed)); RETERR(uint32_tobuffer(time_signed, target)); - /* key footprint */ + /* + * Key footprint. + */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); RETERR(uint16_tobuffer(token.value.as_ulong, target)); - /* signer */ + /* + * Signer. + */ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); dns_name_init(&name, NULL); buffer_fromregion(&buffer, &token.value.as_region); origin = (origin != NULL) ? origin : dns_rootname; RETERR(dns_name_fromtext(&name, &buffer, origin, downcase, target)); - /* sig */ + /* + * Sig. + */ return (isc_base64_tobuffer(lexer, target, -1)); } @@ -118,32 +136,42 @@ totext_sig(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, dns_rdata_toregion(rdata, &sr); - /* type covered */ + /* + * Type covered. + */ covered = uint16_fromregion(&sr); isc_region_consume(&sr, 2); RETERR(dns_rdatatype_totext(covered, target)); RETERR(str_totext(" ", target)); - /* algorithm */ + /* + * Algorithm. + */ sprintf(buf, "%u", sr.base[0]); isc_region_consume(&sr, 1); RETERR(str_totext(buf, target)); RETERR(str_totext(" ", target)); - /* labels */ + /* + * Labels. + */ sprintf(buf, "%u", sr.base[0]); isc_region_consume(&sr, 1); RETERR(str_totext(buf, target)); RETERR(str_totext(" ", target)); - /* ttl */ + /* + * Ttl. + */ ttl = uint32_fromregion(&sr); isc_region_consume(&sr, 4); sprintf(buf, "%lu", ttl); RETERR(str_totext(buf, target)); RETERR(str_totext(" ", target)); - /* sig exp */ + /* + * Sig exp. + */ exp = uint32_fromregion(&sr); isc_region_consume(&sr, 4); RETERR(dns_time32_totext(exp, target)); @@ -152,20 +180,26 @@ totext_sig(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, RETERR(str_totext(" (", target)); RETERR(str_totext(tctx->linebreak, target)); - /* time signed */ + /* + * Time signed. + */ when = uint32_fromregion(&sr); isc_region_consume(&sr, 4); RETERR(dns_time32_totext(when, target)); RETERR(str_totext(" ", target)); - /* footprint */ + /* + * Footprint. + */ foot = uint16_fromregion(&sr); isc_region_consume(&sr, 2); sprintf(buf, "%lu", foot); RETERR(str_totext(buf, target)); RETERR(str_totext(" ", target)); - /* signer */ + /* + * Signer. + */ dns_name_init(&name, NULL); dns_name_init(&prefix, NULL); dns_name_fromregion(&name, &sr); @@ -173,7 +207,9 @@ totext_sig(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, sub = name_prefix(&name, tctx->origin, &prefix); RETERR(dns_name_totext(&prefix, sub, target)); - /* sig */ + /* + * Sig. + */ RETERR(str_totext(tctx->linebreak, target)); RETERR(isc_base64_totext(&sr, tctx->width - 2, tctx->linebreak, target)); @@ -213,11 +249,15 @@ fromwire_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type, isc_buffer_forward(source, 18); RETERR(mem_tobuffer(target, sr.base, 18)); - /* signer */ + /* + * Signer. + */ dns_name_init(&name, NULL); RETERR(dns_name_fromwire(&name, source, dctx, downcase, target)); - /* sig */ + /* + * Sig. + */ isc_buffer_activeregion(source, &sr); isc_buffer_forward(source, sr.length); return (mem_tobuffer(target, sr.base, sr.length)); @@ -244,13 +284,17 @@ towire_sig(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { RETERR(mem_tobuffer(target, sr.base, 18)); isc_region_consume(&sr, 18); - /* signer */ + /* + * Signer. + */ dns_name_init(&name, NULL); dns_name_fromregion(&name, &sr); isc_region_consume(&sr, name_length(&name)); RETERR(dns_name_towire(&name, cctx, target)); - /* signature */ + /* + * Signature. + */ return (mem_tobuffer(target, sr.base, sr.length)); } @@ -308,31 +352,49 @@ fromstruct_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, sig = (dns_rdata_sig_t *)source; - /* Type covered */ + /* + * Type covered. + */ RETERR(uint16_tobuffer(sig->covered, target)); - /* Algorithm */ + /* + * Algorithm. + */ RETERR(uint8_tobuffer(sig->algorithm, target)); - /* Labels */ + /* + * Labels. + */ RETERR(uint8_tobuffer(sig->labels, target)); - /* Original TTL */ + /* + * Original TTL. + */ RETERR(uint32_tobuffer(sig->originalttl, target)); - /* Expire time */ + /* + * Expire time. + */ RETERR(uint32_tobuffer(sig->timeexpire, target)); - /* Time signed */ + /* + * Time signed. + */ RETERR(uint32_tobuffer(sig->timesigned, target)); - /* Key ID */ + /* + * Key ID. + */ RETERR(uint16_tobuffer(sig->keyid, target)); - /* Signer name */ + /* + * Signer name. + */ RETERR(name_tobuffer(&sig->signer, target)); - /* Signature */ + /* + * Signature. + */ if (sig->siglen > 0) { isc_buffer_availableregion(target, &tr); if (tr.length < sig->siglen) @@ -359,31 +421,45 @@ tostruct_sig(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { dns_rdata_toregion(rdata, &sr); - /* Type covered */ + /* + * Type covered. + */ sig->covered = uint16_fromregion(&sr); isc_region_consume(&sr, 2); - /* Algorithm */ + /* + * Algorithm. + */ sig->algorithm = uint8_fromregion(&sr); isc_region_consume(&sr, 1); - /* Labels */ + /* + * Labels. + */ sig->labels = uint8_fromregion(&sr); isc_region_consume(&sr, 1); - /* Original TTL */ + /* + * Original TTL. + */ sig->originalttl = uint32_fromregion(&sr); isc_region_consume(&sr, 4); - /* Expire time */ + /* + * Expire time. + */ sig->timeexpire = uint32_fromregion(&sr); isc_region_consume(&sr, 4); - /* Time signed */ + /* + * Time signed. + */ sig->timesigned = uint32_fromregion(&sr); isc_region_consume(&sr, 4); - /* Key ID */ + /* + * Key ID. + */ sig->keyid = uint16_fromregion(&sr); isc_region_consume(&sr, 2); @@ -393,7 +469,9 @@ tostruct_sig(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { RETERR(dns_name_dup(&signer, mctx, &sig->signer)); isc_region_consume(&sr, name_length(&sig->signer)); - /* Signature */ + /* + * Signature. + */ sig->siglen = sr.length; if (sig->siglen > 0) { sig->signature = mem_maybedup(mctx, sr.base, sig->siglen); diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c index dbf2c82da5..d835629057 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.32 2000/05/13 22:46:07 tale Exp $ */ +/* $Id: tkey_249.c,v 1.33 2000/05/15 21:14:28 tale Exp $ */ /* * Reviewed: Thu Mar 16 17:35:30 PST 2000 by halley. @@ -71,7 +71,7 @@ fromtext_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type, */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); /* @@ -84,7 +84,7 @@ fromtext_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type, if (*e != 0) return (DNS_R_UNKNOWN); if (i < 0 || i > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); rcode = (dns_rcode_t)i; } RETERR(uint16_tobuffer(rcode, target)); @@ -94,7 +94,7 @@ fromtext_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type, */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); /* @@ -107,7 +107,7 @@ fromtext_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type, */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); /* diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c index 1b5382a72a..c871947b66 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.17 2000/05/05 05:50:12 marka Exp $ */ +/* $Id: x25_19.c,v 1.18 2000/05/15 21:14:30 tale Exp $ */ /* Reviewed: Thu Mar 16 16:15:57 PST 2000 by bwelling */ @@ -47,7 +47,7 @@ fromtext_x25(dns_rdataclass_t rdclass, dns_rdatatype_t type, return (DNS_R_SYNTAX); for (i = 0; i < token.value.as_textregion.length; i++) if (!isdigit(token.value.as_textregion.base[i] & 0xff)) - return (DNS_R_RANGE); + return (ISC_R_RANGE); return (txt_fromtext(&token.value.as_textregion, target)); } diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c index 6c34a84293..006d5e2f4f 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.30 2000/05/13 22:07:57 tale Exp $ */ + /* $Id: a6_38.c,v 1.31 2000/05/15 21:14:31 tale Exp $ */ /* draft-ietf-ipngwg-dns-lookups-03.txt */ @@ -42,19 +42,27 @@ fromtext_in_a6(dns_rdataclass_t rdclass, dns_rdatatype_t type, REQUIRE(type == 38); REQUIRE(rdclass == 1); - /* prefix length */ + /* + * Prefix length. + */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 128) - return (DNS_R_RANGE); + return (ISC_R_RANGE); prefixlen = (unsigned char)token.value.as_ulong; RETERR(mem_tobuffer(target, &prefixlen, 1)); - /* suffix */ + /* + * Suffix. + */ if (prefixlen != 128) { - /* prefix 0..127 */ + /* + * Prefix 0..127. + */ octets = prefixlen/8; - /* octets 0..15 */ + /* + * Octets 0..15. + */ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); if (inet_pton(AF_INET6, token.value.as_pointer, addr) != 1) @@ -143,23 +151,27 @@ fromwire_in_a6(dns_rdataclass_t rdclass, dns_rdatatype_t type, dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE); isc_buffer_activeregion(source, &sr); - /* prefix length */ + /* + * Prefix length. + */ if (sr.length < 1) return (ISC_R_UNEXPECTEDEND); prefixlen = sr.base[0]; if (prefixlen > 128) - return (DNS_R_RANGE); + return (ISC_R_RANGE); isc_region_consume(&sr, 1); RETERR(mem_tobuffer(target, &prefixlen, 1)); isc_buffer_forward(source, 1); - /* suffix */ + /* + * Suffix. + */ if (prefixlen != 128) { octets = 16 - prefixlen / 8; if (sr.length < octets) return (ISC_R_UNEXPECTEDEND); mask = 0xff >> (prefixlen % 8); - sr.base[0] &= mask; /* ensure pad bits are zero */ + sr.base[0] &= mask; /* Ensure pad bits are zero. */ RETERR(mem_tobuffer(target, sr.base, octets)); isc_buffer_forward(source, octets); } @@ -265,7 +277,7 @@ fromstruct_in_a6(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, REQUIRE(a6->common.rdclass == rdclass); if (a6->prefixlen > 128) - return (DNS_R_RANGE); + return (ISC_R_RANGE); prefixlen = a6->prefixlen; RETERR(mem_tobuffer(target, &prefixlen, 1)); @@ -306,7 +318,9 @@ tostruct_in_a6(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) isc_region_consume(&r, 1); memset(a6->in6_addr.s6_addr, 0, sizeof(a6->in6_addr.s6_addr)); - /* suffix */ + /* + * Suffix. + */ if (a6->prefixlen != 128) { octets = 16 - a6->prefixlen / 8; INSIST(r.length >= octets); @@ -314,7 +328,9 @@ tostruct_in_a6(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) isc_region_consume(&r, octets); } - /* prefix */ + /* + * Prefix. + */ dns_name_init(&a6->prefix, NULL); if (a6->prefixlen != 0) { dns_name_init(&name, NULL); @@ -326,8 +342,7 @@ tostruct_in_a6(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) } static inline void -freestruct_in_a6(void *source) -{ +freestruct_in_a6(void *source) { dns_rdata_in_a6_t *a6 = source; REQUIRE(source != NULL); @@ -357,8 +372,7 @@ additionaldata_in_a6(dns_rdata_t *rdata, dns_additionaldatafunc_t add, } static inline isc_result_t -digest_in_a6(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) -{ +digest_in_a6(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r1, r2; unsigned char prefixlen, octets; isc_result_t result; diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c index 3cd549df3c..02c9c4d77a 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.25 2000/05/12 12:59:30 marka Exp $ */ +/* $Id: kx_36.c,v 1.26 2000/05/15 21:14:32 tale Exp $ */ /* Reviewed: Thu Mar 16 17:24:54 PST 2000 by explorer */ @@ -40,7 +40,7 @@ fromtext_in_kx(dns_rdataclass_t rdclass, dns_rdatatype_t type, RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); @@ -104,8 +104,7 @@ fromwire_in_kx(dns_rdataclass_t rdclass, dns_rdatatype_t type, } static inline isc_result_t -towire_in_kx(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) -{ +towire_in_kx(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { dns_name_t name; isc_region_t region; @@ -124,8 +123,7 @@ towire_in_kx(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) } static inline int -compare_in_kx(dns_rdata_t *rdata1, dns_rdata_t *rdata2) -{ +compare_in_kx(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { dns_name_t name1; dns_name_t name2; isc_region_t region1; @@ -175,8 +173,7 @@ fromstruct_in_kx(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, } static inline isc_result_t -tostruct_in_kx(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) -{ +tostruct_in_kx(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { isc_region_t region; dns_rdata_in_kx_t *kx = target; dns_name_t name; @@ -203,8 +200,7 @@ tostruct_in_kx(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) } static inline void -freestruct_in_kx(void *source) -{ +freestruct_in_kx(void *source) { dns_rdata_in_kx_t *kx = source; REQUIRE(source != NULL); @@ -237,8 +233,7 @@ additionaldata_in_kx(dns_rdata_t *rdata, dns_additionaldatafunc_t add, } static inline isc_result_t -digest_in_kx(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) -{ +digest_in_kx(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r1, r2; dns_name_t name; @@ -255,4 +250,4 @@ digest_in_kx(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) return (dns_name_digest(&name, digest, arg)); } -#endif /* RDATA_GENERIC_KX_15_C */ +#endif /* RDATA_GENERIC_KX_36_C */ diff --git a/lib/dns/rdata/in_1/naptr_35.c b/lib/dns/rdata/in_1/naptr_35.c index a81fbcc57d..d03b4dda80 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.25 2000/05/12 12:59:32 marka Exp $ */ +/* $Id: naptr_35.c,v 1.26 2000/05/15 21:14:33 tale Exp $ */ /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */ @@ -38,31 +38,43 @@ fromtext_in_naptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, REQUIRE(type == 35); REQUIRE(rdclass == 1); - /* order */ + /* + * Order. + */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); - /* preference */ + /* + * Preference. + */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); - /* flags */ + /* + * Flags. + */ RETERR(gettoken(lexer, &token, isc_tokentype_qstring, ISC_FALSE)); RETERR(txt_fromtext(&token.value.as_textregion, target)); - /* service */ + /* + * Service. + */ RETERR(gettoken(lexer, &token, isc_tokentype_qstring, ISC_FALSE)); RETERR(txt_fromtext(&token.value.as_textregion, target)); - /* regexp */ + /* + * Regexp. + */ RETERR(gettoken(lexer, &token, isc_tokentype_qstring, ISC_FALSE)); RETERR(txt_fromtext(&token.value.as_textregion, target)); - /* replacement */ + /* + * Replacement. + */ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); dns_name_init(&name, NULL); buffer_fromregion(&buffer, &token.value.as_region); @@ -89,33 +101,45 @@ totext_in_naptr(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, dns_rdata_toregion(rdata, ®ion); - /* order */ + /* + * Order. + */ num = uint16_fromregion(®ion); isc_region_consume(®ion, 2); sprintf(buf, "%u", num); RETERR(str_totext(buf, target)); RETERR(str_totext(" ", target)); - /* preference */ + /* + * Preference. + */ num = uint16_fromregion(®ion); isc_region_consume(®ion, 2); sprintf(buf, "%u", num); RETERR(str_totext(buf, target)); RETERR(str_totext(" ", target)); - /* flags */ + /* + * Flags. + */ RETERR(txt_totext(®ion, target)); RETERR(str_totext(" ", target)); - /* service */ + /* + * Service. + */ RETERR(txt_totext(®ion, target)); RETERR(str_totext(" ", target)); - /* regexp */ + /* + * Regexp. + */ RETERR(txt_totext(®ion, target)); RETERR(str_totext(" ", target)); - /* replacement */ + /* + * Replacement. + */ dns_name_fromregion(&name, ®ion); sub = name_prefix(&name, tctx->origin, &prefix); return (dns_name_totext(&prefix, sub, target)); @@ -136,23 +160,33 @@ fromwire_in_naptr(dns_rdataclass_t rdclass, dns_rdatatype_t type, dns_name_init(&name, NULL); - /* order, preference */ + /* + * Order, preference. + */ isc_buffer_activeregion(source, &sr); if (sr.length < 4) return (ISC_R_UNEXPECTEDEND); RETERR(mem_tobuffer(target, sr.base, 4)); isc_buffer_forward(source, 4); - /* flags */ + /* + * Flags. + */ RETERR(txt_fromwire(source, target)); - /* service */ + /* + * Service. + */ RETERR(txt_fromwire(source, target)); - /* regexp */ + /* + * Regexp. + */ RETERR(txt_fromwire(source, target)); - /* replacement */ + /* + * Replacement. + */ return (dns_name_fromwire(&name, source, dctx, downcase, target)); } @@ -165,24 +199,34 @@ towire_in_naptr(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) REQUIRE(rdata->rdclass == 1); dns_compress_setmethods(cctx, DNS_COMPRESS_NONE); - /* order, preference */ + /* + * Order, preference. + */ dns_rdata_toregion(rdata, &sr); RETERR(mem_tobuffer(target, sr.base, 4)); isc_region_consume(&sr, 4); - /* flags */ + /* + * Flags. + */ RETERR(mem_tobuffer(target, sr.base, sr.base[0] + 1)); isc_region_consume(&sr, sr.base[0] + 1); - /* service */ + /* + * Service. + */ RETERR(mem_tobuffer(target, sr.base, sr.base[0] + 1)); isc_region_consume(&sr, sr.base[0] + 1); - /* regexp */ + /* + * Regexp. + */ RETERR(mem_tobuffer(target, sr.base, sr.base[0] + 1)); isc_region_consume(&sr, sr.base[0] + 1); - /* replacement */ + /* + * Replacement. + */ dns_name_init(&name, NULL); dns_name_fromregion(&name, &sr); return (dns_name_towire(&name, cctx, target)); @@ -204,14 +248,18 @@ compare_in_naptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { dns_rdata_toregion(rdata1, ®ion1); dns_rdata_toregion(rdata2, ®ion2); - /* order, preference */ + /* + * Order, preference. + */ order = memcmp(region1.base, region2.base, 4); if (order != 0) return (order < 0 ? -1 : 1); isc_region_consume(®ion1, 4); isc_region_consume(®ion2, 4); - /* flags */ + /* + * Flags. + */ len = ISC_MIN(region1.base[0], region2.base[0]); order = memcmp(region1.base, region2.base, len + 1); if (order != 0) @@ -219,7 +267,9 @@ compare_in_naptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_consume(®ion1, region1.base[0] + 1); isc_region_consume(®ion2, region2.base[0] + 1); - /* service */ + /* + * Service. + */ len = ISC_MIN(region1.base[0], region2.base[0]); order = memcmp(region1.base, region2.base, len + 1); if (order != 0) @@ -227,7 +277,9 @@ compare_in_naptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_consume(®ion1, region1.base[0] + 1); isc_region_consume(®ion2, region2.base[0] + 1); - /* regexp */ + /* + * Regexp. + */ len = ISC_MIN(region1.base[0], region2.base[0]); order = memcmp(region1.base, region2.base, len + 1); if (order != 0) @@ -235,7 +287,9 @@ compare_in_naptr(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_consume(®ion1, region1.base[0] + 1); isc_region_consume(®ion2, region2.base[0] + 1); - /* replacement */ + /* + * Replacement. + */ dns_name_init(&name1, NULL); dns_name_init(&name2, NULL); @@ -363,11 +417,15 @@ additionaldata_in_naptr(dns_rdata_t *rdata, dns_additionaldatafunc_t add, REQUIRE(rdata->type == 35); REQUIRE(rdata->rdclass == 1); - /* order, preference */ + /* + * Order, preference. + */ dns_rdata_toregion(rdata, &sr); isc_region_consume(&sr, 4); - /* flags */ + /* + * Flags. + */ atype = 0; flagslen = sr.base[0]; cp = (char *)&sr.base[1]; @@ -383,13 +441,19 @@ additionaldata_in_naptr(dns_rdata_t *rdata, dns_additionaldatafunc_t add, } isc_region_consume(&sr, flagslen + 1); - /* service */ + /* + * Service. + */ isc_region_consume(&sr, sr.base[0] + 1); - /* regexp */ + /* + * Regexp. + */ isc_region_consume(&sr, sr.base[0] + 1); - /* replacement */ + /* + * Replacement. + */ dns_name_init(&name, NULL); dns_name_fromregion(&name, &sr); @@ -413,21 +477,29 @@ digest_in_naptr(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { r2 = r1; length = 0; - /* order, preference */ + /* + * Order, preference. + */ length += 4; isc_region_consume(&r2, 4); - /* flags */ + /* + * Flags. + */ n = r2.base[0] + 1; length += n; isc_region_consume(&r2, n); - /* service */ + /* + * Service. + */ n = r2.base[0] + 1; length += n; isc_region_consume(&r2, n); - /* regexp */ + /* + * Regexp. + */ n = r2.base[0] + 1; length += n; isc_region_consume(&r2, n); @@ -440,7 +512,9 @@ digest_in_naptr(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { if (result != ISC_R_SUCCESS) return (result); - /* replacement */ + /* + * Replacement. + */ dns_name_init(&name, NULL); dns_name_fromregion(&name, &r2); diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c index d66ca87fa5..0cf36ca03e 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.22 2000/05/12 12:59:33 marka Exp $ */ +/* $Id: px_26.c,v 1.23 2000/05/15 21:14:34 tale Exp $ */ /* Reviewed: Mon Mar 20 10:44:27 PST 2000 */ @@ -38,20 +38,26 @@ fromtext_in_px(dns_rdataclass_t rdclass, dns_rdatatype_t type, REQUIRE(type == 26); REQUIRE(rdclass == 1); - /* preference */ + /* + * Preference. + */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); - /* MAP822 */ + /* + * MAP822. + */ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); dns_name_init(&name, NULL); buffer_fromregion(&buffer, &token.value.as_region); origin = (origin != NULL) ? origin : dns_rootname; RETERR(dns_name_fromtext(&name, &buffer, origin, downcase, target)); - /* MAPX400 */ + /* + * MAPX400. + */ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); dns_name_init(&name, NULL); buffer_fromregion(&buffer, &token.value.as_region); @@ -76,7 +82,9 @@ totext_in_px(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, dns_name_init(&name, NULL); dns_name_init(&prefix, NULL); - /* preference */ + /* + * Preference. + */ dns_rdata_toregion(rdata, ®ion); num = uint16_fromregion(®ion); isc_region_consume(®ion, 2); @@ -84,14 +92,18 @@ totext_in_px(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, RETERR(str_totext(buf, target)); RETERR(str_totext(" ", target)); - /* MAP822 */ + /* + * MAP822. + */ dns_name_fromregion(&name, ®ion); sub = name_prefix(&name, tctx->origin, &prefix); isc_region_consume(®ion, name_length(&name)); RETERR(dns_name_totext(&prefix, sub, target)); RETERR(str_totext(" ", target)); - /* MAPX400 */ + /* + * MAPX400. + */ dns_name_fromregion(&name, ®ion); sub = name_prefix(&name, tctx->origin, &prefix); return(dns_name_totext(&prefix, sub, target)); @@ -112,17 +124,23 @@ fromwire_in_px(dns_rdataclass_t rdclass, dns_rdatatype_t type, dns_name_init(&name, NULL); - /* preference */ + /* + * Preference. + */ isc_buffer_activeregion(source, &sregion); if (sregion.length < 2) return (ISC_R_UNEXPECTEDEND); RETERR(mem_tobuffer(target, sregion.base, 2)); isc_buffer_forward(source, 2); - /* MAP822 */ + /* + * MAP822. + */ RETERR(dns_name_fromwire(&name, source, dctx, downcase, target)); - /* MAPX400 */ + /* + * MAPX400. + */ return (dns_name_fromwire(&name, source, dctx, downcase, target)); } @@ -135,18 +153,24 @@ towire_in_px(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { REQUIRE(rdata->rdclass == 1); dns_compress_setmethods(cctx, DNS_COMPRESS_NONE); - /* preference */ + /* + * Preference. + */ dns_rdata_toregion(rdata, ®ion); RETERR(mem_tobuffer(target, region.base, 2)); isc_region_consume(®ion, 2); - /* MAP822 */ + /* + * MAP822. + */ dns_name_init(&name, NULL); dns_name_fromregion(&name, ®ion); RETERR(dns_name_towire(&name, cctx, target)); isc_region_consume(®ion, name_length(&name)); - /* MAPX400 */ + /* + * MAPX400. + */ dns_name_init(&name, NULL); dns_name_fromregion(&name, ®ion); return (dns_name_towire(&name, cctx, target)); diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c index e5bf3f090a..3b08204da8 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.23 2000/05/12 12:59:35 marka Exp $ */ +/* $Id: srv_33.c,v 1.24 2000/05/15 21:14:35 tale Exp $ */ /* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */ @@ -38,25 +38,33 @@ fromtext_in_srv(dns_rdataclass_t rdclass, dns_rdatatype_t type, REQUIRE(type == 33); REQUIRE(rdclass == 1); - /* priority */ + /* + * Priority. + */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); - /* weight */ + /* + * Weight. + */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); - /* port */ + /* + * Port. + */ RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); if (token.value.as_ulong > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); RETERR(uint16_tobuffer(token.value.as_ulong, target)); - /* target */ + /* + * Target. + */ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); dns_name_init(&name, NULL); buffer_fromregion(&buffer, &token.value.as_region); @@ -81,7 +89,9 @@ totext_in_srv(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, dns_name_init(&name, NULL); dns_name_init(&prefix, NULL); - /* priority */ + /* + * Priority. + */ dns_rdata_toregion(rdata, ®ion); num = uint16_fromregion(®ion); isc_region_consume(®ion, 2); @@ -89,21 +99,27 @@ totext_in_srv(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, RETERR(str_totext(buf, target)); RETERR(str_totext(" ", target)); - /* weight */ + /* + * Weight. + */ num = uint16_fromregion(®ion); isc_region_consume(®ion, 2); sprintf(buf, "%u", num); RETERR(str_totext(buf, target)); RETERR(str_totext(" ", target)); - /* port */ + /* + * Port. + */ num = uint16_fromregion(®ion); isc_region_consume(®ion, 2); sprintf(buf, "%u", num); RETERR(str_totext(buf, target)); RETERR(str_totext(" ", target)); - /* target */ + /* + * Target. + */ dns_name_fromregion(&name, ®ion); sub = name_prefix(&name, tctx->origin, &prefix); return (dns_name_totext(&prefix, sub, target)); @@ -124,14 +140,18 @@ fromwire_in_srv(dns_rdataclass_t rdclass, dns_rdatatype_t type, dns_name_init(&name, NULL); - /* priority, weight, port */ + /* + * Priority, weight, port. + */ isc_buffer_activeregion(source, &sr); if (sr.length < 6) return (ISC_R_UNEXPECTEDEND); RETERR(mem_tobuffer(target, sr.base, 6)); isc_buffer_forward(source, 6); - /* target */ + /* + * Target. + */ return (dns_name_fromwire(&name, source, dctx, downcase, target)); } @@ -143,12 +163,16 @@ towire_in_srv(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { REQUIRE(rdata->type == 33); dns_compress_setmethods(cctx, DNS_COMPRESS_NONE); - /* priority, weight, port */ + /* + * Priority, weight, port. + */ dns_rdata_toregion(rdata, &sr); RETERR(mem_tobuffer(target, sr.base, 6)); isc_region_consume(&sr, 6); - /* target */ + /* + * Target. + */ dns_name_init(&name, NULL); dns_name_fromregion(&name, &sr); return (dns_name_towire(&name, cctx, target)); @@ -167,12 +191,16 @@ compare_in_srv(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { REQUIRE(rdata1->type == 33); REQUIRE(rdata1->rdclass == 1); - /* priority, weight, port */ + /* + * Priority, weight, port. + */ order = memcmp(rdata1->data, rdata2->data, 6); if (order != 0) return (order < 0 ? -1 : 1); - /* target */ + /* + * Target. + */ dns_name_init(&name1, NULL); dns_name_init(&name2, NULL); diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c index 05177991a6..ed2c3d6491 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.28 2000/05/08 16:12:30 tale Exp $ */ +/* $Id: wks_11.c,v 1.29 2000/05/15 21:14:36 tale Exp $ */ /* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */ @@ -54,7 +54,9 @@ fromtext_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type, REQUIRE(type == 11); REQUIRE(rdclass == 1); - /* IPv4 dotted quad */ + /* + * IPv4 dotted quad. + */ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); isc_buffer_availableregion(target, ®ion); @@ -65,7 +67,9 @@ fromtext_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type, memcpy(region.base, &addr, 4); isc_buffer_add(target, 4); - /* protocol */ + /* + * Protocol. + */ RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); proto = strtol(token.value.as_pointer, &e, 10); @@ -76,7 +80,7 @@ fromtext_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type, else return (ISC_R_UNEXPECTED); if (proto < 0 || proto > 0xff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); if (proto == IPPROTO_TCP) ps = "tcp"; @@ -100,13 +104,15 @@ fromtext_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type, else return (ISC_R_UNEXPECTED); if (port < 0 || port > 0xffff) - return (DNS_R_RANGE); + return (ISC_R_RANGE); if (port > maxport) maxport = port; bm[port / 8] |= (0x80 >> (port % 8)); } while (1); - /* Let upper layer handle eol/eof. */ + /* + * Let upper layer handle eol/eof. + */ isc_lex_ungettoken(lexer, &token); n = (maxport + 8) / 8; @@ -188,8 +194,7 @@ fromwire_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type, } static inline isc_result_t -towire_in_wks(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) -{ +towire_in_wks(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) { isc_region_t sr; UNUSED(cctx); @@ -202,8 +207,7 @@ towire_in_wks(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) } static inline int -compare_in_wks(dns_rdata_t *rdata1, dns_rdata_t *rdata2) -{ +compare_in_wks(dns_rdata_t *rdata1, dns_rdata_t *rdata2) { isc_region_t r1; isc_region_t r2; @@ -231,8 +235,7 @@ fromstruct_in_wks(dns_rdataclass_t rdclass, dns_rdatatype_t type, void *source, } static inline isc_result_t -tostruct_in_wks(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) -{ +tostruct_in_wks(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) { dns_rdata_in_wks_t *wks = target; isc_uint32_t n; isc_region_t region; @@ -262,8 +265,7 @@ tostruct_in_wks(dns_rdata_t *rdata, void *target, isc_mem_t *mctx) } static inline void -freestruct_in_wks(void *source) -{ +freestruct_in_wks(void *source) { dns_rdata_in_wks_t *wks = source; REQUIRE(source != NULL); @@ -293,8 +295,7 @@ additionaldata_in_wks(dns_rdata_t *rdata, dns_additionaldatafunc_t add, } static inline isc_result_t -digest_in_wks(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) -{ +digest_in_wks(dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg) { isc_region_t r; REQUIRE(rdata->type == 11); diff --git a/lib/dns/result.c b/lib/dns/result.c index 7cf560d075..5032369d49 100644 --- a/lib/dns/result.c +++ b/lib/dns/result.c @@ -39,7 +39,7 @@ static char *text[DNS_R_NRESULTS] = { "extra input text", /* 12 */ "extra input data", /* 13 */ "text too long", /* 14 */ - "out of range", /* 15 */ + "UNUSED15", /* 15 */ "syntax error", /* 16 */ "bad checksum", /* 17 */ "bad IPv6 address", /* 18 */ @@ -164,27 +164,27 @@ dns_result_torcode(isc_result_t result) { case ISC_R_SUCCESS: rcode = dns_rcode_noerror; break; - case ISC_R_NOSPACE: - case ISC_R_UNEXPECTEDEND: case ISC_R_BADBASE64: - case DNS_R_LABELTOOLONG: + case ISC_R_NOSPACE: + case ISC_R_RANGE: + case ISC_R_UNEXPECTEDEND: + case DNS_R_BADAAAA: case DNS_R_BADBITSTRING: - case DNS_R_BITSTRINGTOOLONG: - case DNS_R_UNKNOWN: + case DNS_R_BADCKSUM: + case DNS_R_BADCLASS: case DNS_R_BADLABELTYPE: case DNS_R_BADPOINTER: - case DNS_R_TOOMANYHOPS: - case DNS_R_EXTRADATA: - case DNS_R_TEXTTOOLONG: - case DNS_R_RANGE: - case DNS_R_SYNTAX: - case DNS_R_BADCKSUM: - case DNS_R_BADAAAA: - case DNS_R_BADCLASS: case DNS_R_BADTTL: - case DNS_R_NOREDATA: case DNS_R_BADZONE: + case DNS_R_BITSTRINGTOOLONG: + case DNS_R_EXTRADATA: + case DNS_R_LABELTOOLONG: + case DNS_R_NOREDATA: + case DNS_R_SYNTAX: + case DNS_R_TEXTTOOLONG: + case DNS_R_TOOMANYHOPS: case DNS_R_TSIGERRORSET: + case DNS_R_UNKNOWN: rcode = dns_rcode_formerr; break; case DNS_R_DISALLOWED: diff --git a/lib/dns/tcpmsg.c b/lib/dns/tcpmsg.c index 8cab5f0caf..952a6ebd0d 100644 --- a/lib/dns/tcpmsg.c +++ b/lib/dns/tcpmsg.c @@ -65,7 +65,7 @@ recv_length(isc_task_t *task, isc_event_t *ev_in) { goto send_and_free; } if (tcpmsg->size > tcpmsg->maxsize) { - tcpmsg->result = DNS_R_RANGE; + tcpmsg->result = ISC_R_RANGE; goto send_and_free; } diff --git a/lib/dns/time.c b/lib/dns/time.c index 2fae062ac5..2d3d773e09 100644 --- a/lib/dns/time.c +++ b/lib/dns/time.c @@ -15,7 +15,7 @@ * SOFTWARE. */ -/* $Id: time.c,v 1.12 2000/05/08 19:23:17 tale Exp $ */ +/* $Id: time.c,v 1.13 2000/05/15 21:14:10 tale Exp $ */ #include @@ -50,7 +50,7 @@ dns_time64_totext(isc_int64_t t, isc_buffer_t *target) { t -= secs; tm.tm_year++; if (tm.tm_year + 1900 > 9999) - return DNS_R_RANGE; + return (ISC_R_RANGE); } tm.tm_mon = 0; while ((secs = month_secs(tm.tm_mon, tm.tm_year + 1900)) <= t) { @@ -118,7 +118,7 @@ dns_time64_fromtext(char *source, isc_int64_t *target) { #define RANGE(min, max, value) \ do { \ if (value < (min) || value > (max)) \ - return (DNS_R_RANGE); \ + return (ISC_R_RANGE); \ } while (0) if (strlen(source) != 14) @@ -162,8 +162,8 @@ dns_time32_fromtext(char *source, isc_uint32_t *target) { return (result); value32 = (isc_uint32_t)value64; if (value32 != value64) - return DNS_R_RANGE; + return (ISC_R_RANGE); *target = value32; - return ISC_R_SUCCESS; + return (ISC_R_SUCCESS); } diff --git a/lib/tests/t_api.c b/lib/tests/t_api.c index 98e6fc0936..3290925006 100644 --- a/lib/tests/t_api.c +++ b/lib/tests/t_api.c @@ -568,6 +568,7 @@ struct dns_errormap { { ISC_R_NOSPACE, "ISC_R_NOSPACE" }, { ISC_R_UNEXPECTED, "ISC_R_UNEXPECTED" }, { ISC_R_UNEXPECTEDEND, "ISC_R_UNEXPECTEDEND" }, + { ISC_R_RANGE, "ISC_R_RANGE" }, { DNS_R_LABELTOOLONG, "DNS_R_LABELTOOLONG" }, { DNS_R_BADESCAPE, "DNS_R_BADESCAPE" }, { DNS_R_BADBITSTRING, "DNS_R_BADBITSTRING" }, @@ -582,7 +583,6 @@ struct dns_errormap { { DNS_R_EXTRATOKEN, "DNS_R_EXTRATOKEN" }, { DNS_R_EXTRADATA, "DNS_R_EXTRADATA" }, { DNS_R_TEXTTOOLONG, "DNS_R_TEXTTOOLONG" }, - { DNS_R_RANGE, "DNS_R_RANGE" }, { DNS_R_SYNTAX, "DNS_R_SYNTAX" }, { DNS_R_BADCKSUM, "DNS_R_BADCKSUM" }, { DNS_R_BADAAAA, "DNS_R_BADAAAA" },