mirror of
https://github.com/isc-projects/bind9.git
synced 2026-04-20 21:58:03 -04:00
Simplify dns_name_init()
Remove the now-unused offsets parameter from dns_name_init().
This commit is contained in:
parent
08e966df82
commit
04c2c2cbc8
95 changed files with 531 additions and 544 deletions
|
|
@ -593,7 +593,7 @@ short_answer(dns_message_t *msg, dns_messagetextflag_t flags, isc_buffer_t *buf,
|
|||
|
||||
UNUSED(flags);
|
||||
|
||||
dns_name_init(&empty_name, NULL);
|
||||
dns_name_init(&empty_name);
|
||||
result = dns_message_firstname(msg, DNS_SECTION_ANSWER);
|
||||
if (result == ISC_R_NOMORE) {
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
|
|||
|
|
@ -865,7 +865,7 @@ setup_text_key(void) {
|
|||
|
||||
debug("setup_text_key()");
|
||||
isc_buffer_allocate(mctx, &namebuf, MXNAME);
|
||||
dns_name_init(&keyname, NULL);
|
||||
dns_name_init(&keyname);
|
||||
isc_buffer_putstr(namebuf, keynametext);
|
||||
secretsize = (unsigned int)strlen(keysecret) * 3 / 4;
|
||||
secretstore = isc_mem_allocate(mctx, secretsize);
|
||||
|
|
@ -2082,8 +2082,8 @@ insert_soa(dig_lookup_t *lookup) {
|
|||
soa.common.rdclass = lookup->rdclass;
|
||||
soa.common.rdtype = dns_rdatatype_soa;
|
||||
|
||||
dns_name_init(&soa.origin, NULL);
|
||||
dns_name_init(&soa.contact, NULL);
|
||||
dns_name_init(&soa.origin);
|
||||
dns_name_init(&soa.contact);
|
||||
|
||||
dns_name_clone(dns_rootname, &soa.origin);
|
||||
dns_name_clone(dns_rootname, &soa.contact);
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ printsection(dns_message_t *msg, dns_section_t sectionid,
|
|||
printf(";; %s SECTION:\n", section_name);
|
||||
}
|
||||
|
||||
dns_name_init(&empty_name, NULL);
|
||||
dns_name_init(&empty_name);
|
||||
|
||||
result = dns_message_firstname(msg, sectionid);
|
||||
if (result == ISC_R_NOMORE) {
|
||||
|
|
|
|||
|
|
@ -839,7 +839,7 @@ getoriginnode(dns_db_t *db, dns_dbnode_t **nodep DNS__DB_FLARG) {
|
|||
REQUIRE(VALID_BDB(bdb));
|
||||
REQUIRE(nodep != NULL && *nodep == NULL);
|
||||
|
||||
dns_name_init(&relname, NULL);
|
||||
dns_name_init(&relname);
|
||||
name = &relname;
|
||||
|
||||
result = createnode(bdb, &node);
|
||||
|
|
@ -881,7 +881,7 @@ findnode(dns_db_t *db, const dns_name_t *name, bool create,
|
|||
isorigin = dns_name_equal(name, &bdb->common.origin);
|
||||
|
||||
labels = dns_name_countlabels(name) - dns_name_countlabels(&db->origin);
|
||||
dns_name_init(&relname, NULL);
|
||||
dns_name_init(&relname);
|
||||
dns_name_getlabelsequence(name, 0, labels, &relname);
|
||||
name = &relname;
|
||||
|
||||
|
|
@ -1197,7 +1197,7 @@ create(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type,
|
|||
|
||||
isc_refcount_init(&bdb->common.references, 1);
|
||||
isc_mem_attach(mctx, &bdb->common.mctx);
|
||||
dns_name_init(&bdb->common.origin, NULL);
|
||||
dns_name_init(&bdb->common.origin);
|
||||
dns_name_dup(origin, mctx, &bdb->common.origin);
|
||||
|
||||
INSIST(argc >= 1);
|
||||
|
|
|
|||
|
|
@ -551,7 +551,7 @@ named_config_getname(isc_mem_t *mctx, const cfg_obj_t *obj,
|
|||
}
|
||||
|
||||
*namep = isc_mem_get(mctx, sizeof(**namep));
|
||||
dns_name_init(*namep, NULL);
|
||||
dns_name_init(*namep);
|
||||
|
||||
objstr = cfg_obj_asstring(obj);
|
||||
isc_buffer_constinit(&b, objstr, strlen(objstr));
|
||||
|
|
|
|||
|
|
@ -2745,7 +2745,7 @@ configure_catz_zone(dns_view_t *view, dns_view_t *pview,
|
|||
dns_name_t origin;
|
||||
dns_catz_options_t *opts;
|
||||
|
||||
dns_name_init(&origin, NULL);
|
||||
dns_name_init(&origin);
|
||||
catz_obj = cfg_listelt_value(element);
|
||||
|
||||
str = cfg_obj_asstring(cfg_tuple_get(catz_obj, "zone name"));
|
||||
|
|
@ -3088,7 +3088,7 @@ add_ns(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name,
|
|||
ns.common.rdtype = dns_rdatatype_ns;
|
||||
ns.common.rdclass = dns_db_class(db);
|
||||
ns.mctx = NULL;
|
||||
dns_name_init(&ns.name, NULL);
|
||||
dns_name_init(&ns.name);
|
||||
dns_name_clone(nsname, &ns.name);
|
||||
CHECK(dns_rdata_fromstruct(&rdata, dns_db_class(db), dns_rdatatype_ns,
|
||||
&ns, &b));
|
||||
|
|
@ -5932,7 +5932,7 @@ validate_tls(const cfg_obj_t *config, dns_view_t *view, const cfg_obj_t *obj,
|
|||
|
||||
if (name != NULL && *name == NULL) {
|
||||
*name = isc_mem_get(view->mctx, sizeof(dns_name_t));
|
||||
dns_name_init(*name, NULL);
|
||||
dns_name_init(*name);
|
||||
dns_name_dup(nm, view->mctx, *name);
|
||||
}
|
||||
|
||||
|
|
@ -7295,7 +7295,7 @@ configure_session_key(const cfg_obj_t **maps, named_server_t *server,
|
|||
INSIST(server->session_keybits == 0);
|
||||
|
||||
server->session_keyname = isc_mem_get(mctx, sizeof(dns_name_t));
|
||||
dns_name_init(server->session_keyname, NULL);
|
||||
dns_name_init(server->session_keyname);
|
||||
dns_name_dup(keyname, mctx, server->session_keyname);
|
||||
|
||||
server->session_keyfile = isc_mem_strdup(mctx, keyfile);
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ named_tkeyctx_fromconfig(const cfg_obj_t *options, isc_mem_t *mctx,
|
|||
name = dns_fixedname_initname(&fname);
|
||||
RETERR(dns_name_fromtext(name, &b, dns_rootname, 0, NULL));
|
||||
tctx->domain = isc_mem_get(mctx, sizeof(dns_name_t));
|
||||
dns_name_init(tctx->domain, NULL);
|
||||
dns_name_init(tctx->domain);
|
||||
dns_name_dup(name, mctx, tctx->domain);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
#define create_name(id, name) \
|
||||
isc_buffer_t namesrc, namebuf; \
|
||||
char namedata[DNS_NAME_FORMATSIZE + 1]; \
|
||||
dns_name_init(name, NULL); \
|
||||
dns_name_init(name); \
|
||||
isc_buffer_constinit(&namesrc, id, strlen(id)); \
|
||||
isc_buffer_add(&namesrc, strlen(id)); \
|
||||
isc_buffer_init(&namebuf, namedata, sizeof(namedata)); \
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ add_initial_keys(const cfg_obj_t *list, dns_tsigkeyring_t *ring,
|
|||
/*
|
||||
* Create the key name.
|
||||
*/
|
||||
dns_name_init(&keyname, NULL);
|
||||
dns_name_init(&keyname);
|
||||
isc_buffer_constinit(&keynamesrc, keyid, strlen(keyid));
|
||||
isc_buffer_add(&keynamesrc, strlen(keyid));
|
||||
isc_buffer_init(&keynamebuf, keynamedata, sizeof(keynamedata));
|
||||
|
|
|
|||
|
|
@ -633,7 +633,7 @@ configure_staticstub(const cfg_obj_t *zconfig, dns_zone_t *zone,
|
|||
*/
|
||||
CHECK(dns_db_newversion(db, &dbversion));
|
||||
|
||||
dns_name_init(&apexname, NULL);
|
||||
dns_name_init(&apexname);
|
||||
dns_name_clone(dns_zone_getorigin(zone), &apexname);
|
||||
CHECK(dns_db_findnode(db, &apexname, false, &apexnode));
|
||||
|
||||
|
|
|
|||
|
|
@ -789,7 +789,7 @@ static isc_result_t
|
|||
create_name(const char *str, char *namedata, size_t len, dns_name_t *name) {
|
||||
isc_buffer_t namesrc, namebuf;
|
||||
|
||||
dns_name_init(name, NULL);
|
||||
dns_name_init(name);
|
||||
isc_buffer_constinit(&namesrc, str, strlen(str));
|
||||
isc_buffer_add(&namesrc, strlen(str));
|
||||
isc_buffer_init(&namebuf, namedata, len);
|
||||
|
|
@ -2614,8 +2614,8 @@ done:
|
|||
if (usegsstsig) {
|
||||
dns_name_free(&tmpzonename, gmctx);
|
||||
dns_name_free(&restart_primary, gmctx);
|
||||
dns_name_init(&tmpzonename, NULL);
|
||||
dns_name_init(&restart_primary, NULL);
|
||||
dns_name_init(&tmpzonename);
|
||||
dns_name_init(&restart_primary);
|
||||
}
|
||||
done_update();
|
||||
}
|
||||
|
|
@ -2881,7 +2881,7 @@ lookforsoa:
|
|||
result = dns_rdata_tostruct(&soarr, &soa, NULL);
|
||||
check_result(result, "dns_rdata_tostruct");
|
||||
|
||||
dns_name_init(&primary, NULL);
|
||||
dns_name_init(&primary);
|
||||
dns_name_clone(&soa.origin, &primary);
|
||||
|
||||
if (userzone != NULL) {
|
||||
|
|
@ -2937,9 +2937,9 @@ lookforsoa:
|
|||
|
||||
#if HAVE_GSSAPI
|
||||
if (usegsstsig) {
|
||||
dns_name_init(&tmpzonename, NULL);
|
||||
dns_name_init(&tmpzonename);
|
||||
dns_name_dup(zname, gmctx, &tmpzonename);
|
||||
dns_name_init(&restart_primary, NULL);
|
||||
dns_name_init(&restart_primary);
|
||||
dns_name_dup(&primary, gmctx, &restart_primary);
|
||||
start_gssrequest(&primary);
|
||||
} else {
|
||||
|
|
@ -2968,7 +2968,7 @@ droplabel:
|
|||
if (nlabels == 1) {
|
||||
fatal("could not find enclosing zone");
|
||||
}
|
||||
dns_name_init(&tname, NULL);
|
||||
dns_name_init(&tname);
|
||||
dns_name_getlabelsequence(name, 1, nlabels - 1, &tname);
|
||||
dns_name_clone(&tname, name);
|
||||
dns_request_destroy(&request);
|
||||
|
|
@ -3075,8 +3075,8 @@ failed_gssrequest(void) {
|
|||
|
||||
dns_name_free(&tmpzonename, gmctx);
|
||||
dns_name_free(&restart_primary, gmctx);
|
||||
dns_name_init(&tmpzonename, NULL);
|
||||
dns_name_init(&restart_primary, NULL);
|
||||
dns_name_init(&tmpzonename);
|
||||
dns_name_init(&restart_primary);
|
||||
|
||||
done_update();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -518,7 +518,7 @@ add_ns(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name,
|
|||
ns.common.rdtype = dns_rdatatype_ns;
|
||||
ns.common.rdclass = dns_db_class(db);
|
||||
ns.mctx = NULL;
|
||||
dns_name_init(&ns.name, NULL);
|
||||
dns_name_init(&ns.name);
|
||||
dns_name_clone(nsname, &ns.name);
|
||||
CHECK(dns_rdata_fromstruct(&rdata, dns_db_class(db), dns_rdatatype_ns,
|
||||
&ns, &b));
|
||||
|
|
@ -608,7 +608,7 @@ create_db(isc_mem_t *mctx, const dns_name_t *origin, dns_dbtype_t type,
|
|||
};
|
||||
|
||||
isc_mem_attach(mctx, &sampledb->common.mctx);
|
||||
dns_name_init(&sampledb->common.origin, NULL);
|
||||
dns_name_init(&sampledb->common.origin);
|
||||
|
||||
dns_name_dup(origin, mctx, &sampledb->common.origin);
|
||||
|
||||
|
|
|
|||
|
|
@ -224,7 +224,7 @@ syncptr(sample_instance_t *inst, dns_name_t *name, dns_rdata_t *addr_rdata,
|
|||
|
||||
dns_fixedname_init(&ptr_name);
|
||||
DNS_RDATACOMMON_INIT(&ptr_struct, dns_rdatatype_ptr, dns_rdataclass_in);
|
||||
dns_name_init(&ptr_struct.ptr, NULL);
|
||||
dns_name_init(&ptr_struct.ptr);
|
||||
|
||||
syncptr = isc_mem_get(mctx, sizeof(*syncptr));
|
||||
*syncptr = (syncptr_t){ 0 };
|
||||
|
|
|
|||
|
|
@ -441,7 +441,7 @@ repopulate_buffer:
|
|||
answerstyleflags |= DNS_STYLEFLAG_UNKNOWNFORMAT;
|
||||
}
|
||||
|
||||
dns_name_init(&empty_name, NULL);
|
||||
dns_name_init(&empty_name);
|
||||
result = dns_message_firstname(response, DNS_SECTION_ANSWER);
|
||||
if (result != ISC_R_NOMORE) {
|
||||
CHECK("dns_message_firstname", result);
|
||||
|
|
|
|||
|
|
@ -610,19 +610,6 @@ both dynamically and statically allocated, relative and absolute,
|
|||
compressed and not, with straightforward conversions from text to
|
||||
wire format and vice versa.
|
||||
|
||||
##### Initializing
|
||||
|
||||
When a name object is initialized, a pointer to an "offset table"
|
||||
(`dns_offsets_t`) may optionally be supplied; this will improve
|
||||
performance of most name operations if the name is used more than
|
||||
once.
|
||||
|
||||
dns_name_t name1, name2;
|
||||
dns_offsets_t offsets1;
|
||||
|
||||
dns_name_init(&name1, &offsets1);
|
||||
dns_name_init(&name2, NULL);
|
||||
|
||||
##### Copying
|
||||
|
||||
There are three methods for copying name objects:
|
||||
|
|
@ -641,7 +628,7 @@ There are three methods for copying name objects:
|
|||
isc_buffer_t buffer;
|
||||
|
||||
isc_buffer_init(&buffer, namedata, sizeof(namedata));
|
||||
dns_name_init(&target, NULL);
|
||||
dns_name_init(&target);
|
||||
dns_name_setbuffer(target, &buffer);
|
||||
dns_name_copy(source, &target);
|
||||
|
||||
|
|
@ -687,7 +674,7 @@ name.
|
|||
isc_buffer_t buf;
|
||||
dns_name_t name;
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
isc_buffer_init(&buf, namedata, sizeof(namedata));
|
||||
isc_buffer_add(&buf, strlen(text));
|
||||
result = dns_name_fromtext(&name, &buf, dns_rootname, 0, NULL);
|
||||
|
|
|
|||
|
|
@ -366,8 +366,8 @@ Typical use:
|
|||
dns_name_t name, prefix;
|
||||
bool sub;
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
sub = name_prefix(&name, origin, &prefix);
|
||||
|
|
|
|||
|
|
@ -324,7 +324,7 @@ dns_acl_merge(dns_acl_t *dest, dns_acl_t *source, bool pos) {
|
|||
|
||||
/* Duplicate key name. */
|
||||
if (source->elements[i].type == dns_aclelementtype_keyname) {
|
||||
dns_name_init(&dest->elements[nelem + i].keyname, NULL);
|
||||
dns_name_init(&dest->elements[nelem + i].keyname);
|
||||
dns_name_dup(&source->elements[i].keyname, dest->mctx,
|
||||
&dest->elements[nelem + i].keyname);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -815,7 +815,7 @@ static void
|
|||
clean_target(dns_adb_t *adb, dns_name_t *target) {
|
||||
if (dns_name_countlabels(target) > 0) {
|
||||
dns_name_free(target, adb->mctx);
|
||||
dns_name_init(target, NULL);
|
||||
dns_name_init(target);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -988,7 +988,7 @@ new_adbname(dns_adb_t *adb, const dns_name_t *dnsname, unsigned int flags) {
|
|||
|
||||
name->name = dns_fixedname_initname(&name->fname);
|
||||
dns_name_copy(dnsname, name->name);
|
||||
dns_name_init(&name->target, NULL);
|
||||
dns_name_init(&name->target);
|
||||
|
||||
inc_adbstats(adb, dns_adbstats_namescnt);
|
||||
return name;
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ bcentry_new(isc_loop_t *loop, const dns_name_t *name,
|
|||
.lru_head = CDS_LIST_HEAD_INIT(bad->lru_head),
|
||||
};
|
||||
|
||||
dns_name_init(&bad->name, NULL);
|
||||
dns_name_init(&bad->name);
|
||||
dns_name_dup(name, mctx, &bad->name);
|
||||
|
||||
return bad;
|
||||
|
|
|
|||
|
|
@ -252,7 +252,7 @@ catz_coo_new(isc_mem_t *mctx, const dns_name_t *domain) {
|
|||
*ncoo = (dns_catz_coo_t){
|
||||
.magic = DNS_CATZ_COO_MAGIC,
|
||||
};
|
||||
dns_name_init(&ncoo->name, NULL);
|
||||
dns_name_init(&ncoo->name);
|
||||
dns_name_dup(domain, mctx, &ncoo->name);
|
||||
isc_refcount_init(&ncoo->references, 1);
|
||||
|
||||
|
|
@ -307,7 +307,7 @@ dns_catz_entry_new(isc_mem_t *mctx, const dns_name_t *domain) {
|
|||
.magic = DNS_CATZ_ENTRY_MAGIC,
|
||||
};
|
||||
|
||||
dns_name_init(&nentry->name, NULL);
|
||||
dns_name_init(&nentry->name);
|
||||
if (domain != NULL) {
|
||||
dns_name_dup(domain, mctx, &nentry->name);
|
||||
}
|
||||
|
|
@ -842,7 +842,7 @@ dns_catz_zone_new(dns_catz_zones_t *catzs, const dns_name_t *name) {
|
|||
isc_time_settoepoch(&catz->lastupdated);
|
||||
dns_catz_options_init(&catz->defoptions);
|
||||
dns_catz_options_init(&catz->zoneoptions);
|
||||
dns_name_init(&catz->name, NULL);
|
||||
dns_name_init(&catz->name);
|
||||
dns_name_dup(name, catzs->mctx, &catz->name);
|
||||
|
||||
return catz;
|
||||
|
|
@ -1168,7 +1168,7 @@ catz_process_zones(dns_catz_zone_t *catz, dns_rdataset_t *value,
|
|||
if (labels == 1) {
|
||||
return catz_process_zones_entry(catz, value, &mhash);
|
||||
} else {
|
||||
dns_name_init(&opt, NULL);
|
||||
dns_name_init(&opt);
|
||||
dns_name_split(name, 1, &opt, NULL);
|
||||
return catz_process_zones_suboption(catz, value, &mhash, &opt);
|
||||
}
|
||||
|
|
@ -1460,7 +1460,7 @@ catz_process_primaries(dns_catz_zone_t *catz, dns_ipkeylist_t *ipkl,
|
|||
|
||||
/* rdatastr.length < DNS_NAME_MAXTEXT */
|
||||
keyname = isc_mem_get(mctx, sizeof(*keyname));
|
||||
dns_name_init(keyname, NULL);
|
||||
dns_name_init(keyname);
|
||||
memmove(keycbuf, rdatastr.data, rdatastr.length);
|
||||
keycbuf[rdatastr.length] = 0;
|
||||
dns_rdata_freestruct(&rdata_txt);
|
||||
|
|
@ -1501,7 +1501,7 @@ catz_process_primaries(dns_catz_zone_t *catz, dns_ipkeylist_t *ipkl,
|
|||
|
||||
ipkl->labels[i] = isc_mem_get(mctx,
|
||||
sizeof(*ipkl->labels[0]));
|
||||
dns_name_init(ipkl->labels[i], NULL);
|
||||
dns_name_init(ipkl->labels[i]);
|
||||
dns_name_dup(name, mctx, ipkl->labels[i]);
|
||||
|
||||
if (value->type == dns_rdatatype_txt) {
|
||||
|
|
@ -1683,7 +1683,7 @@ catz_process_zones_suboption(dns_catz_zone_t *catz, dns_rdataset_t *value,
|
|||
}
|
||||
INSIST(result == ISC_R_SUCCESS);
|
||||
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&prefix);
|
||||
dns_name_split(name, suffix_labels, &prefix, NULL);
|
||||
switch (opt) {
|
||||
case CATZ_OPT_COO:
|
||||
|
|
@ -1762,7 +1762,7 @@ catz_process_value(dns_catz_zone_t *catz, dns_name_t *name,
|
|||
opt = catz_get_option(&option);
|
||||
}
|
||||
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&prefix);
|
||||
dns_name_split(name, suffix_labels, &prefix, NULL);
|
||||
|
||||
switch (opt) {
|
||||
|
|
@ -1851,7 +1851,7 @@ dns__catz_update_process(dns_catz_zone_t *catz, const dns_name_t *src_name,
|
|||
}
|
||||
|
||||
uint8_t labels = dns_name_countlabels(&catz->name);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&prefix);
|
||||
dns_name_split(src_name, labels, &prefix, NULL);
|
||||
result = catz_process_value(catz, &prefix, rdataset);
|
||||
|
||||
|
|
|
|||
|
|
@ -569,7 +569,7 @@ client_resfind(resctx_t *rctx, dns_fetchresponse_t *resp) {
|
|||
dns_name_t *aname = dns_fixedname_name(&rctx->name);
|
||||
|
||||
ansname = isc_mem_get(mctx, sizeof(*ansname));
|
||||
dns_name_init(ansname, NULL);
|
||||
dns_name_init(ansname);
|
||||
|
||||
dns_name_dup(aname, mctx, ansname);
|
||||
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ dns_difftuple_create(isc_mem_t *mctx, dns_diffop_t op, const dns_name_t *name,
|
|||
datap = (unsigned char *)(t + 1);
|
||||
|
||||
memmove(datap, name->ndata, name->length);
|
||||
dns_name_init(&t->name, NULL);
|
||||
dns_name_init(&t->name);
|
||||
dns_name_clone(name, &t->name);
|
||||
t->name.ndata = datap;
|
||||
datap += name->length;
|
||||
|
|
|
|||
|
|
@ -228,7 +228,7 @@ dns_dnssec_sign(const dns_name_t *name, dns_rdataset_t *set, dst_key_t *key,
|
|||
/*
|
||||
* Downcase signer.
|
||||
*/
|
||||
dns_name_init(&sig.signer, NULL);
|
||||
dns_name_init(&sig.signer);
|
||||
dns_fixedname_init(&fsigner);
|
||||
RUNTIME_CHECK(dns_name_downcase(dst_key_name(key),
|
||||
dns_fixedname_name(&fsigner),
|
||||
|
|
@ -803,7 +803,7 @@ dns_dnssec_signmessage(dns_message_t *msg, dst_key_t *key) {
|
|||
|
||||
sig.keyid = dst_key_id(key);
|
||||
|
||||
dns_name_init(&sig.signer, NULL);
|
||||
dns_name_init(&sig.signer);
|
||||
dns_name_clone(dst_key_name(key), &sig.signer);
|
||||
|
||||
sig.siglen = 0;
|
||||
|
|
|
|||
|
|
@ -1534,7 +1534,7 @@ get_key_struct(const dns_name_t *name, unsigned int alg, unsigned int flags,
|
|||
.func = dst_t_func[alg],
|
||||
};
|
||||
|
||||
dns_name_init(key->key_name, NULL);
|
||||
dns_name_init(key->key_name);
|
||||
dns_name_dup(name, mctx, key->key_name);
|
||||
|
||||
isc_refcount_init(&key->refs, 1);
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
void
|
||||
dns_fixedname_init(dns_fixedname_t *fixed) {
|
||||
dns_name_init(&fixed->name, NULL);
|
||||
dns_name_init(&fixed->name);
|
||||
isc_buffer_init(&fixed->buffer, fixed->data, DNS_NAME_MAXWIRE);
|
||||
dns_name_setbuffer(&fixed->name, &fixed->buffer);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ dns_fwdtable_addfwd(dns_fwdtable_t *fwdtable, const dns_name_t *name,
|
|||
if (fwd->tlsname != NULL) {
|
||||
nfwd->tlsname = isc_mem_get(fwdtable->mctx,
|
||||
sizeof(*nfwd->tlsname));
|
||||
dns_name_init(nfwd->tlsname, NULL);
|
||||
dns_name_init(nfwd->tlsname);
|
||||
dns_name_dup(fwd->tlsname, fwdtable->mctx,
|
||||
nfwd->tlsname);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ name_to_gbuffer(const dns_name_t *name, isc_buffer_t *buffer,
|
|||
namep = name;
|
||||
} else {
|
||||
unsigned int labels;
|
||||
dns_name_init(&tname, NULL);
|
||||
dns_name_init(&tname);
|
||||
labels = dns_name_countlabels(name);
|
||||
dns_name_getlabelsequence(name, 0, labels - 1, &tname);
|
||||
namep = &tname;
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@ typedef isc_result_t(dns_name_totextfilter_t)(isc_buffer_t *target,
|
|||
***/
|
||||
|
||||
static inline void
|
||||
dns_name_init(dns_name_t *name, unsigned char *offsets ISC_ATTR_UNUSED) {
|
||||
dns_name_init(dns_name_t *name) {
|
||||
*name = (dns_name_t){
|
||||
.magic = DNS_NAME_MAGIC,
|
||||
.link = ISC_LINK_INITIALIZER,
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ dns_ipkeylist_copy(isc_mem_t *mctx, const dns_ipkeylist_t *src,
|
|||
if (src->keys[i] != NULL) {
|
||||
dst->keys[i] = isc_mem_get(mctx,
|
||||
sizeof(dns_name_t));
|
||||
dns_name_init(dst->keys[i], NULL);
|
||||
dns_name_init(dst->keys[i]);
|
||||
dns_name_dup(src->keys[i], mctx, dst->keys[i]);
|
||||
} else {
|
||||
dst->keys[i] = NULL;
|
||||
|
|
@ -135,7 +135,7 @@ dns_ipkeylist_copy(isc_mem_t *mctx, const dns_ipkeylist_t *src,
|
|||
if (src->tlss[i] != NULL) {
|
||||
dst->tlss[i] = isc_mem_get(mctx,
|
||||
sizeof(dns_name_t));
|
||||
dns_name_init(dst->tlss[i], NULL);
|
||||
dns_name_init(dst->tlss[i]);
|
||||
dns_name_dup(src->tlss[i], mctx, dst->tlss[i]);
|
||||
} else {
|
||||
dst->tlss[i] = NULL;
|
||||
|
|
@ -148,7 +148,7 @@ dns_ipkeylist_copy(isc_mem_t *mctx, const dns_ipkeylist_t *src,
|
|||
if (src->labels[i] != NULL) {
|
||||
dst->labels[i] =
|
||||
isc_mem_get(mctx, sizeof(dns_name_t));
|
||||
dns_name_init(dst->labels[i], NULL);
|
||||
dns_name_init(dst->labels[i]);
|
||||
dns_name_dup(src->labels[i], mctx,
|
||||
dst->labels[i]);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -723,7 +723,7 @@ journal_open(isc_mem_t *mctx, const char *filename, bool writable, bool create,
|
|||
/*
|
||||
* Initialize the iterator.
|
||||
*/
|
||||
dns_name_init(&j->it.name, NULL);
|
||||
dns_name_init(&j->it.name);
|
||||
dns_rdata_init(&j->it.rdata);
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -2964,7 +2964,7 @@ is_glue(rdatalist_head_t *head, dns_name_t *owner) {
|
|||
|
||||
rdata = ISC_LIST_HEAD(this->rdata);
|
||||
while (rdata != NULL) {
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
if (dns_name_equal(&name, owner)) {
|
||||
|
|
|
|||
|
|
@ -511,7 +511,7 @@ ncache_summary(dns_rdataset_t *rdataset, bool omit_final_dot,
|
|||
char *start = NULL;
|
||||
|
||||
dns_rdataset_init(&rds);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
|
||||
do {
|
||||
dns_ncache_current(rdataset, &name, &rds);
|
||||
|
|
|
|||
|
|
@ -3297,7 +3297,7 @@ dns_message_sectiontotext(dns_message_t *msg, dns_section_t section,
|
|||
ADD_STRING(target, " SECTION:\n");
|
||||
}
|
||||
|
||||
dns_name_init(&empty_name, NULL);
|
||||
dns_name_init(&empty_name);
|
||||
result = dns_message_firstname(msg, section);
|
||||
if (result != ISC_R_SUCCESS) {
|
||||
goto cleanup;
|
||||
|
|
@ -4834,7 +4834,7 @@ rdataset_soa_min(dns_rdataset_t *rds, dns_ttl_t *ttlp) {
|
|||
* whether it's an SOA.
|
||||
*/
|
||||
dns_rdata_toregion(&rdata, &r);
|
||||
dns_name_init(&tmp, NULL);
|
||||
dns_name_init(&tmp);
|
||||
dns_name_fromregion(&tmp, &r);
|
||||
isc_region_consume(&r, tmp.length);
|
||||
if (r.length < 2) {
|
||||
|
|
|
|||
|
|
@ -570,7 +570,7 @@ dns_name_matcheswildcard(const dns_name_t *name, const dns_name_t *wname) {
|
|||
REQUIRE(labels > 0);
|
||||
REQUIRE(dns_name_iswildcard(wname));
|
||||
|
||||
dns_name_init(&tname, NULL);
|
||||
dns_name_init(&tname);
|
||||
dns_name_getlabelsequence(wname, 1, labels - 1, &tname);
|
||||
if (dns_name_fullcompare(name, &tname, &order, &nlabels) ==
|
||||
dns_namereln_subdomain)
|
||||
|
|
@ -1632,7 +1632,7 @@ dns_name_concatenate(const dns_name_t *prefix, const dns_name_t *suffix,
|
|||
REQUIRE(!copy_suffix);
|
||||
}
|
||||
if (name == NULL) {
|
||||
dns_name_init(&tmp_name, NULL);
|
||||
dns_name_init(&tmp_name);
|
||||
name = &tmp_name;
|
||||
}
|
||||
if (target == NULL) {
|
||||
|
|
@ -1765,7 +1765,7 @@ dns_name_digest(const dns_name_t *name, dns_digestfunc_t digest, void *arg) {
|
|||
REQUIRE(DNS_NAME_VALID(name));
|
||||
REQUIRE(digest != NULL);
|
||||
|
||||
dns_name_init(&downname, NULL);
|
||||
dns_name_init(&downname);
|
||||
|
||||
isc_buffer_init(&buffer, data, sizeof(data));
|
||||
|
||||
|
|
@ -1965,7 +1965,7 @@ dns_name_isdnssd(const dns_name_t *name) {
|
|||
dns_name_t prefix;
|
||||
|
||||
if (dns_name_countlabels(name) > 3U) {
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&prefix);
|
||||
dns_name_getlabelsequence(name, 0, 3, &prefix);
|
||||
for (i = 0; i < (sizeof(dns_sd) / sizeof(dns_sd[0])); i++) {
|
||||
if (dns_name_equal(&prefix, &dns_sd[i])) {
|
||||
|
|
@ -2175,7 +2175,7 @@ dns_name_israd(const dns_name_t *name, const dns_name_t *rad) {
|
|||
return false;
|
||||
}
|
||||
|
||||
dns_name_init(&suffix, NULL);
|
||||
dns_name_init(&suffix);
|
||||
dns_name_split(name, rad_labels + 1, NULL, &suffix);
|
||||
|
||||
if (suffix.ndata[0] != 3 || suffix.ndata[1] != '_' ||
|
||||
|
|
|
|||
|
|
@ -322,7 +322,7 @@ dns_ncache_towire(dns_rdataset_t *rdataset, dns_compress_t *cctx,
|
|||
dns_rdataset_current(rdataset, &rdata);
|
||||
isc_buffer_init(&source, rdata.data, rdata.length);
|
||||
isc_buffer_add(&source, rdata.length);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
isc_buffer_remainingregion(&source, &remaining);
|
||||
dns_name_fromregion(&name, &remaining);
|
||||
INSIST(remaining.length >= name.length);
|
||||
|
|
@ -545,7 +545,7 @@ dns_ncache_getrdataset(dns_rdataset_t *ncacherdataset, dns_name_t *name,
|
|||
dns_rdataset_current(&rclone, &rdata);
|
||||
isc_buffer_init(&source, rdata.data, rdata.length);
|
||||
isc_buffer_add(&source, rdata.length);
|
||||
dns_name_init(&tname, NULL);
|
||||
dns_name_init(&tname);
|
||||
isc_buffer_remainingregion(&source, &remaining);
|
||||
dns_name_fromregion(&tname, &remaining);
|
||||
INSIST(remaining.length >= tname.length);
|
||||
|
|
@ -615,7 +615,7 @@ dns_ncache_getsigrdataset(dns_rdataset_t *ncacherdataset, dns_name_t *name,
|
|||
dns_rdataset_current(&rclone, &rdata);
|
||||
isc_buffer_init(&source, rdata.data, rdata.length);
|
||||
isc_buffer_add(&source, rdata.length);
|
||||
dns_name_init(&tname, NULL);
|
||||
dns_name_init(&tname);
|
||||
isc_buffer_remainingregion(&source, &remaining);
|
||||
dns_name_fromregion(&tname, &remaining);
|
||||
INSIST(remaining.length >= tname.length);
|
||||
|
|
@ -704,7 +704,7 @@ dns_ncache_current(dns_rdataset_t *ncacherdataset, dns_name_t *found,
|
|||
isc_buffer_init(&source, rdata.data, rdata.length);
|
||||
isc_buffer_add(&source, rdata.length);
|
||||
|
||||
dns_name_init(&tname, NULL);
|
||||
dns_name_init(&tname);
|
||||
isc_buffer_remainingregion(&source, &remaining);
|
||||
dns_name_fromregion(found, &remaining);
|
||||
INSIST(remaining.length >= found->length);
|
||||
|
|
|
|||
|
|
@ -473,7 +473,7 @@ dns_nsec_noexistnodata(dns_rdatatype_t type, const dns_name_t *name,
|
|||
}
|
||||
if (wild != NULL) {
|
||||
dns_name_t common;
|
||||
dns_name_init(&common, NULL);
|
||||
dns_name_init(&common);
|
||||
if (olabels > nlabels) {
|
||||
labels = dns_name_countlabels(nsecname);
|
||||
dns_name_getlabelsequence(nsecname, labels - olabels,
|
||||
|
|
|
|||
|
|
@ -757,7 +757,7 @@ addnsec3:
|
|||
/*
|
||||
* Add missing NSEC3 records for empty nodes
|
||||
*/
|
||||
dns_name_init(&empty, NULL);
|
||||
dns_name_init(&empty);
|
||||
dns_name_clone(name, &empty);
|
||||
do {
|
||||
labels = dns_name_countlabels(&empty) - 1;
|
||||
|
|
@ -1114,7 +1114,7 @@ dns_nsec3param_deletechains(dns_db_t *db, dns_dbversion_t *ver,
|
|||
dns_name_t *origin = dns_zone_getorigin(zone);
|
||||
dns_rdatatype_t privatetype = dns_zone_getprivatetype(zone);
|
||||
|
||||
dns_name_init(&next, NULL);
|
||||
dns_name_init(&next);
|
||||
dns_rdataset_init(&rdataset);
|
||||
|
||||
result = dns_db_getoriginnode(db, &node);
|
||||
|
|
@ -1536,7 +1536,7 @@ dns_nsec3_delnsec3(dns_db_t *db, dns_dbversion_t *version,
|
|||
* Delete NSEC3 records for now non active nodes.
|
||||
*/
|
||||
cleanup_orphaned_ents:
|
||||
dns_name_init(&empty, NULL);
|
||||
dns_name_init(&empty);
|
||||
dns_name_clone(name, &empty);
|
||||
do {
|
||||
labels = dns_name_countlabels(&empty) - 1;
|
||||
|
|
|
|||
|
|
@ -513,7 +513,7 @@ dns_peer_setkeybycharp(dns_peer_t *peer, const char *keyval) {
|
|||
|
||||
name = isc_mem_get(peer->mem, sizeof(dns_name_t));
|
||||
|
||||
dns_name_init(name, NULL);
|
||||
dns_name_init(name);
|
||||
dns_name_dup(dns_fixedname_name(&fname), peer->mem, name);
|
||||
|
||||
result = dns_peer_setkey(peer, &name);
|
||||
|
|
|
|||
|
|
@ -2156,7 +2156,7 @@ wildcardmagic(qpzonedb_t *qpdb, dns_qp_t *qp, const dns_name_t *name) {
|
|||
unsigned int n;
|
||||
qpznode_t *node = NULL;
|
||||
|
||||
dns_name_init(&foundname, NULL);
|
||||
dns_name_init(&foundname);
|
||||
n = dns_name_countlabels(name);
|
||||
INSIST(n >= 2);
|
||||
n--;
|
||||
|
|
@ -2180,7 +2180,7 @@ addwildcards(qpzonedb_t *qpdb, dns_qp_t *qp, const dns_name_t *name) {
|
|||
dns_name_t foundname;
|
||||
unsigned int n, l, i;
|
||||
|
||||
dns_name_init(&foundname, NULL);
|
||||
dns_name_init(&foundname);
|
||||
n = dns_name_countlabels(name);
|
||||
l = dns_name_countlabels(&qpdb->common.origin);
|
||||
i = l + 1;
|
||||
|
|
@ -2848,9 +2848,9 @@ wildcard_blocked(qpz_search_t *search, const dns_name_t *qname,
|
|||
bool check_prev = false;
|
||||
unsigned int n;
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&tname, NULL);
|
||||
dns_name_init(&rname, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&tname);
|
||||
dns_name_init(&rname);
|
||||
next = dns_fixedname_initname(&fnext);
|
||||
prev = dns_fixedname_initname(&fprev);
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ fromtext_any_tsig(ARGS_FROMTEXT) {
|
|||
*/
|
||||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -151,8 +151,8 @@ totext_any_tsig(ARGS_TOTEXT) {
|
|||
/*
|
||||
* Algorithm Name.
|
||||
*/
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT
|
||||
: 0;
|
||||
|
|
@ -270,7 +270,7 @@ fromwire_any_tsig(ARGS_FROMWIRE) {
|
|||
/*
|
||||
* Algorithm Name.
|
||||
*/
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
RETERR(dns_name_fromwire(&name, source, dctx, target));
|
||||
|
||||
isc_buffer_activeregion(source, &sr);
|
||||
|
|
@ -333,7 +333,7 @@ towire_any_tsig(ARGS_TOWIRE) {
|
|||
|
||||
dns_compress_setpermitted(cctx, false);
|
||||
dns_rdata_toregion(rdata, &sr);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
RETERR(dns_name_towire(&name, cctx, target, NULL));
|
||||
isc_region_consume(&sr, name_length(&name));
|
||||
|
|
@ -357,8 +357,8 @@ compare_any_tsig(ARGS_COMPARE) {
|
|||
|
||||
dns_rdata_toregion(rdata1, &r1);
|
||||
dns_rdata_toregion(rdata2, &r2);
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
dns_name_fromregion(&name1, &r1);
|
||||
dns_name_fromregion(&name2, &r2);
|
||||
order = dns_name_rdatacompare(&name1, &name2);
|
||||
|
|
@ -462,9 +462,9 @@ tostruct_any_tsig(ARGS_TOSTRUCT) {
|
|||
/*
|
||||
* Algorithm Name.
|
||||
*/
|
||||
dns_name_init(&alg, NULL);
|
||||
dns_name_init(&alg);
|
||||
dns_name_fromregion(&alg, &sr);
|
||||
dns_name_init(&tsig->algorithm, NULL);
|
||||
dns_name_init(&tsig->algorithm);
|
||||
name_duporclone(&alg, mctx, &tsig->algorithm);
|
||||
|
||||
isc_region_consume(&sr, name_length(&tsig->algorithm));
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ fromtext_ch_a(ARGS_FROMTEXT) {
|
|||
false));
|
||||
|
||||
/* get domain name */
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -77,8 +77,8 @@ totext_ch_a(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->rdclass == dns_rdataclass_ch); /* 3 */
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
|
@ -108,7 +108,7 @@ fromwire_ch_a(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
|
||||
RETERR(dns_name_fromwire(&name, source, dctx, target));
|
||||
|
||||
|
|
@ -140,7 +140,7 @@ towire_ch_a(ARGS_TOWIRE) {
|
|||
|
||||
dns_compress_setpermitted(cctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
|
||||
dns_rdata_toregion(rdata, &sregion);
|
||||
|
||||
|
|
@ -173,8 +173,8 @@ compare_ch_a(ARGS_COMPARE) {
|
|||
REQUIRE(rdata1->length != 0);
|
||||
REQUIRE(rdata2->length != 0);
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -231,11 +231,11 @@ tostruct_ch_a(ARGS_TOSTRUCT) {
|
|||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
isc_region_consume(®ion, name_length(&name));
|
||||
|
||||
dns_name_init(&a->ch_addr_dom, NULL);
|
||||
dns_name_init(&a->ch_addr_dom);
|
||||
name_duporclone(&name, mctx, &a->ch_addr_dom);
|
||||
a->ch_addr = htons(uint16_fromregion(®ion));
|
||||
a->mctx = mctx;
|
||||
|
|
@ -279,7 +279,7 @@ digest_ch_a(ARGS_DIGEST) {
|
|||
REQUIRE(rdata->rdclass == dns_rdataclass_ch);
|
||||
|
||||
dns_rdata_toregion(rdata, &r);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
isc_region_consume(&r, name_length(&name));
|
||||
RETERR(dns_name_digest(&name, digest, arg));
|
||||
|
|
@ -307,7 +307,7 @@ checknames_ch_a(ARGS_CHECKNAMES) {
|
|||
UNUSED(owner);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
if (!dns_name_ishostname(&name, false)) {
|
||||
if (bad != NULL) {
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ fromtext_afsdb(ARGS_FROMTEXT) {
|
|||
*/
|
||||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -76,8 +76,8 @@ totext_afsdb(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_afsdb);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
num = uint16_fromregion(®ion);
|
||||
|
|
@ -103,7 +103,7 @@ fromwire_afsdb(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, false);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
|
||||
isc_buffer_activeregion(source, &sr);
|
||||
isc_buffer_availableregion(target, &tr);
|
||||
|
|
@ -138,7 +138,7 @@ towire_afsdb(ARGS_TOWIRE) {
|
|||
isc_region_consume(&sr, 2);
|
||||
isc_buffer_add(target, 2);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
|
||||
return dns_name_towire(&name, cctx, target, NULL);
|
||||
|
|
@ -163,8 +163,8 @@ compare_afsdb(ARGS_COMPARE) {
|
|||
return result < 0 ? -1 : 1;
|
||||
}
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -210,14 +210,14 @@ tostruct_afsdb(ARGS_TOSTRUCT) {
|
|||
afsdb->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&afsdb->common, link);
|
||||
|
||||
dns_name_init(&afsdb->server, NULL);
|
||||
dns_name_init(&afsdb->server);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
|
||||
afsdb->subtype = uint16_fromregion(®ion);
|
||||
isc_region_consume(®ion, 2);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
name_duporclone(&name, mctx, &afsdb->server);
|
||||
|
|
@ -249,7 +249,7 @@ additionaldata_afsdb(ARGS_ADDLDATA) {
|
|||
|
||||
UNUSED(owner);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
isc_region_consume(®ion, 2);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
|
@ -269,7 +269,7 @@ digest_afsdb(ARGS_DIGEST) {
|
|||
isc_region_consume(&r2, 2);
|
||||
r1.length = 2;
|
||||
RETERR((digest)(arg, &r1));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r2);
|
||||
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
|
|
@ -298,7 +298,7 @@ checknames_afsdb(ARGS_CHECKNAMES) {
|
|||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
isc_region_consume(®ion, 2);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
if (!dns_name_ishostname(&name, false)) {
|
||||
if (bad != NULL) {
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ fromtext_amtrelay(ARGS_FROMTEXT) {
|
|||
return ISC_R_SUCCESS;
|
||||
|
||||
case 3:
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -172,7 +172,7 @@ totext_amtrelay(ARGS_TOTEXT) {
|
|||
return inet_totext(AF_INET6, tctx->flags, ®ion, target);
|
||||
|
||||
case 3:
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
return dns_name_totext(&name, 0, target);
|
||||
|
||||
|
|
@ -224,7 +224,7 @@ fromwire_amtrelay(ARGS_FROMWIRE) {
|
|||
case 3:
|
||||
RETERR(mem_tobuffer(target, region.base, 2));
|
||||
isc_buffer_forward(source, 2);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
return dns_name_fromwire(&name, source, dctx, target);
|
||||
|
||||
default:
|
||||
|
|
@ -318,10 +318,10 @@ tostruct_amtrelay(ARGS_TOSTRUCT) {
|
|||
amtrelay->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&amtrelay->common, link);
|
||||
|
||||
dns_name_init(&amtrelay->gateway, NULL);
|
||||
dns_name_init(&amtrelay->gateway);
|
||||
amtrelay->data = NULL;
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
|
||||
amtrelay->precedence = uint8_fromregion(®ion);
|
||||
|
|
@ -453,8 +453,8 @@ casecompare_amtrelay(ARGS_COMPARE) {
|
|||
return isc_region_compare(®ion1, ®ion2);
|
||||
}
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
isc_region_consume(®ion1, 2);
|
||||
isc_region_consume(®ion2, 2);
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ fromtext_cname(ARGS_FROMTEXT) {
|
|||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -51,8 +51,8 @@ totext_cname(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_cname);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
|
@ -73,7 +73,7 @@ fromwire_cname(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
return dns_name_fromwire(&name, source, dctx, target);
|
||||
}
|
||||
|
||||
|
|
@ -87,7 +87,7 @@ towire_cname(ARGS_TOWIRE) {
|
|||
|
||||
dns_compress_setpermitted(cctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
|
|
@ -107,8 +107,8 @@ compare_cname(ARGS_COMPARE) {
|
|||
REQUIRE(rdata1->length != 0);
|
||||
REQUIRE(rdata2->length != 0);
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -150,10 +150,10 @@ tostruct_cname(ARGS_TOSTRUCT) {
|
|||
cname->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&cname->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
dns_name_init(&cname->cname, NULL);
|
||||
dns_name_init(&cname->cname);
|
||||
name_duporclone(&name, mctx, &cname->cname);
|
||||
cname->mctx = mctx;
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -193,7 +193,7 @@ digest_cname(ARGS_DIGEST) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_cname);
|
||||
|
||||
dns_rdata_toregion(rdata, &r);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ fromtext_dname(ARGS_FROMTEXT) {
|
|||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -52,8 +52,8 @@ totext_dname(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_dname);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
|
@ -74,7 +74,7 @@ fromwire_dname(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, false);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
return dns_name_fromwire(&name, source, dctx, target);
|
||||
}
|
||||
|
||||
|
|
@ -87,7 +87,7 @@ towire_dname(ARGS_TOWIRE) {
|
|||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_compress_setpermitted(cctx, false);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
|
|
@ -107,8 +107,8 @@ compare_dname(ARGS_COMPARE) {
|
|||
REQUIRE(rdata1->length != 0);
|
||||
REQUIRE(rdata2->length != 0);
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -150,10 +150,10 @@ tostruct_dname(ARGS_TOSTRUCT) {
|
|||
dname->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&dname->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
dns_name_init(&dname->dname, NULL);
|
||||
dns_name_init(&dname->dname);
|
||||
name_duporclone(&name, mctx, &dname->dname);
|
||||
dname->mctx = mctx;
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -194,7 +194,7 @@ digest_dname(ARGS_DIGEST) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_dname);
|
||||
|
||||
dns_rdata_toregion(rdata, &r);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ fromtext_hip(ARGS_FROMTEXT) {
|
|||
/*
|
||||
* Rendezvous Servers.
|
||||
*/
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
do {
|
||||
RETERR(isc_lex_getmastertoken(lexer, &token,
|
||||
isc_tokentype_string, true));
|
||||
|
|
@ -173,7 +173,7 @@ totext_hip(ARGS_TOTEXT) {
|
|||
/*
|
||||
* Rendezvous Servers.
|
||||
*/
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
while (region.length > 0) {
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
|
|
@ -228,7 +228,7 @@ fromwire_hip(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, false);
|
||||
while (isc_buffer_activelength(source) > 0) {
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
RETERR(dns_name_fromwire(&name, source, dctx, target));
|
||||
}
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -424,7 +424,7 @@ dns_rdata_hip_next(dns_rdata_hip_t *hip) {
|
|||
|
||||
region.base = hip->servers + hip->offset;
|
||||
region.length = hip->servers_len - hip->offset;
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
hip->offset += name.length;
|
||||
INSIST(hip->offset <= hip->servers_len);
|
||||
|
|
@ -485,8 +485,8 @@ casecompare_hip(ARGS_COMPARE) {
|
|||
isc_region_consume(&r1, hit_len + key_len);
|
||||
isc_region_consume(&r2, hit_len + key_len);
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
while (r1.length != 0 && r2.length != 0) {
|
||||
dns_name_fromregion(&name1, &r1);
|
||||
dns_name_fromregion(&name2, &r2);
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ fromtext_ipseckey(ARGS_FROMTEXT) {
|
|||
break;
|
||||
|
||||
case 3:
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -132,7 +132,7 @@ totext_ipseckey(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_ipseckey);
|
||||
REQUIRE(rdata->length >= 3);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
|
||||
if (rdata->data[1] > 3U) {
|
||||
return ISC_R_NOTIMPLEMENTED;
|
||||
|
|
@ -223,7 +223,7 @@ fromwire_ipseckey(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, false);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
|
||||
isc_buffer_activeregion(source, ®ion);
|
||||
if (region.length < 3) {
|
||||
|
|
@ -357,7 +357,7 @@ tostruct_ipseckey(ARGS_TOSTRUCT) {
|
|||
ipseckey->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&ipseckey->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
|
||||
ipseckey->precedence = uint8_fromregion(®ion);
|
||||
|
|
@ -386,7 +386,7 @@ tostruct_ipseckey(ARGS_TOSTRUCT) {
|
|||
break;
|
||||
|
||||
case 3:
|
||||
dns_name_init(&ipseckey->gateway, NULL);
|
||||
dns_name_init(&ipseckey->gateway);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
name_duporclone(&name, mctx, &ipseckey->gateway);
|
||||
isc_region_consume(®ion, name_length(&name));
|
||||
|
|
@ -494,8 +494,8 @@ casecompare_ipseckey(ARGS_COMPARE) {
|
|||
return isc_region_compare(®ion1, ®ion2);
|
||||
}
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
isc_region_consume(®ion1, 3);
|
||||
isc_region_consume(®ion2, 3);
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ generic_totext_key(ARGS_TOTEXT) {
|
|||
algorithm == DNS_KEYALG_PRIVATEDNS)
|
||||
{
|
||||
dns_name_t name;
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
dns_name_format(&name, algbuf, sizeof(algbuf));
|
||||
} else if ((tctx->flags & DNS_STYLEFLAG_RRCOMMENT) != 0 &&
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ fromtext_lp(ARGS_FROMTEXT) {
|
|||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -62,8 +62,8 @@ totext_lp(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_lp);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
num = uint16_fromregion(®ion);
|
||||
|
|
@ -91,7 +91,7 @@ fromwire_lp(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
|
||||
isc_buffer_activeregion(source, &sregion);
|
||||
if (sregion.length < 2) {
|
||||
|
|
@ -161,12 +161,12 @@ tostruct_lp(ARGS_TOSTRUCT) {
|
|||
lp->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&lp->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
lp->pref = uint16_fromregion(®ion);
|
||||
isc_region_consume(®ion, 2);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
dns_name_init(&lp->lp, NULL);
|
||||
dns_name_init(&lp->lp);
|
||||
name_duporclone(&name, mctx, &lp->lp);
|
||||
lp->mctx = mctx;
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -197,7 +197,7 @@ additionaldata_lp(ARGS_ADDLDATA) {
|
|||
|
||||
UNUSED(owner);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
isc_region_consume(®ion, 2);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
|
@ -260,8 +260,8 @@ casecompare_lp(ARGS_COMPARE) {
|
|||
return order < 0 ? -1 : 1;
|
||||
}
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ fromtext_mb(ARGS_FROMTEXT) {
|
|||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -50,8 +50,8 @@ totext_mb(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_mb);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
|
@ -72,7 +72,7 @@ fromwire_mb(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
return dns_name_fromwire(&name, source, dctx, target);
|
||||
}
|
||||
|
||||
|
|
@ -86,7 +86,7 @@ towire_mb(ARGS_TOWIRE) {
|
|||
|
||||
dns_compress_setpermitted(cctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
|
|
@ -106,8 +106,8 @@ compare_mb(ARGS_COMPARE) {
|
|||
REQUIRE(rdata1->length != 0);
|
||||
REQUIRE(rdata2->length != 0);
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -149,10 +149,10 @@ tostruct_mb(ARGS_TOSTRUCT) {
|
|||
mb->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&mb->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
dns_name_init(&mb->mb, NULL);
|
||||
dns_name_init(&mb->mb);
|
||||
name_duporclone(&name, mctx, &mb->mb);
|
||||
mb->mctx = mctx;
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -181,7 +181,7 @@ additionaldata_mb(ARGS_ADDLDATA) {
|
|||
|
||||
UNUSED(owner);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
|
|
@ -196,7 +196,7 @@ digest_mb(ARGS_DIGEST) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_mb);
|
||||
|
||||
dns_rdata_toregion(rdata, &r);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ fromtext_md(ARGS_FROMTEXT) {
|
|||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -50,8 +50,8 @@ totext_md(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_md);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
|
@ -72,7 +72,7 @@ fromwire_md(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
return dns_name_fromwire(&name, source, dctx, target);
|
||||
}
|
||||
|
||||
|
|
@ -86,7 +86,7 @@ towire_md(ARGS_TOWIRE) {
|
|||
|
||||
dns_compress_setpermitted(cctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
|
|
@ -106,8 +106,8 @@ compare_md(ARGS_COMPARE) {
|
|||
REQUIRE(rdata1->length != 0);
|
||||
REQUIRE(rdata2->length != 0);
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -149,10 +149,10 @@ tostruct_md(ARGS_TOSTRUCT) {
|
|||
md->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&md->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, &r);
|
||||
dns_name_fromregion(&name, &r);
|
||||
dns_name_init(&md->md, NULL);
|
||||
dns_name_init(&md->md);
|
||||
name_duporclone(&name, mctx, &md->md);
|
||||
md->mctx = mctx;
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -182,7 +182,7 @@ additionaldata_md(ARGS_ADDLDATA) {
|
|||
|
||||
UNUSED(owner);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
|
|
@ -197,7 +197,7 @@ digest_md(ARGS_DIGEST) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_md);
|
||||
|
||||
dns_rdata_toregion(rdata, &r);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ fromtext_mf(ARGS_FROMTEXT) {
|
|||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -50,8 +50,8 @@ totext_mf(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_mf);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
|
@ -72,7 +72,7 @@ fromwire_mf(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
return dns_name_fromwire(&name, source, dctx, target);
|
||||
}
|
||||
|
||||
|
|
@ -86,7 +86,7 @@ towire_mf(ARGS_TOWIRE) {
|
|||
|
||||
dns_compress_setpermitted(cctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
|
|
@ -106,8 +106,8 @@ compare_mf(ARGS_COMPARE) {
|
|||
REQUIRE(rdata1->length != 0);
|
||||
REQUIRE(rdata2->length != 0);
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -149,10 +149,10 @@ tostruct_mf(ARGS_TOSTRUCT) {
|
|||
mf->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&mf->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, &r);
|
||||
dns_name_fromregion(&name, &r);
|
||||
dns_name_init(&mf->mf, NULL);
|
||||
dns_name_init(&mf->mf);
|
||||
name_duporclone(&name, mctx, &mf->mf);
|
||||
mf->mctx = mctx;
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -181,7 +181,7 @@ additionaldata_mf(ARGS_ADDLDATA) {
|
|||
|
||||
UNUSED(owner);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
|
|
@ -196,7 +196,7 @@ digest_mf(ARGS_DIGEST) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_mf);
|
||||
|
||||
dns_rdata_toregion(rdata, &r);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ fromtext_mg(ARGS_FROMTEXT) {
|
|||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -50,8 +50,8 @@ totext_mg(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_mg);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
|
@ -72,7 +72,7 @@ fromwire_mg(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
return dns_name_fromwire(&name, source, dctx, target);
|
||||
}
|
||||
|
||||
|
|
@ -86,7 +86,7 @@ towire_mg(ARGS_TOWIRE) {
|
|||
|
||||
dns_compress_setpermitted(cctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
|
|
@ -106,8 +106,8 @@ compare_mg(ARGS_COMPARE) {
|
|||
REQUIRE(rdata1->length != 0);
|
||||
REQUIRE(rdata2->length != 0);
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -149,10 +149,10 @@ tostruct_mg(ARGS_TOSTRUCT) {
|
|||
mg->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&mg->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
dns_name_init(&mg->mg, NULL);
|
||||
dns_name_init(&mg->mg);
|
||||
name_duporclone(&name, mctx, &mg->mg);
|
||||
mg->mctx = mctx;
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -192,7 +192,7 @@ digest_mg(ARGS_DIGEST) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_mg);
|
||||
|
||||
dns_rdata_toregion(rdata, &r);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ fromtext_minfo(ARGS_FROMTEXT) {
|
|||
for (i = 0; i < 2; i++) {
|
||||
RETERR(isc_lex_getmastertoken(lexer, &token,
|
||||
isc_tokentype_string, false));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
RETTOK(dns_name_fromtext(&name, &buffer, origin, options,
|
||||
target));
|
||||
|
|
@ -66,9 +66,9 @@ totext_minfo(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_minfo);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&rmail, NULL);
|
||||
dns_name_init(&email, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&rmail);
|
||||
dns_name_init(&email);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
|
||||
|
|
@ -103,8 +103,8 @@ fromwire_minfo(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, true);
|
||||
|
||||
dns_name_init(&rmail, NULL);
|
||||
dns_name_init(&email, NULL);
|
||||
dns_name_init(&rmail);
|
||||
dns_name_init(&email);
|
||||
|
||||
RETERR(dns_name_fromwire(&rmail, source, dctx, target));
|
||||
return dns_name_fromwire(&email, source, dctx, target);
|
||||
|
|
@ -121,8 +121,8 @@ towire_minfo(ARGS_TOWIRE) {
|
|||
|
||||
dns_compress_setpermitted(cctx, true);
|
||||
|
||||
dns_name_init(&rmail, NULL);
|
||||
dns_name_init(&email, NULL);
|
||||
dns_name_init(&rmail);
|
||||
dns_name_init(&email);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
|
||||
|
|
@ -151,8 +151,8 @@ compare_minfo(ARGS_COMPARE) {
|
|||
REQUIRE(rdata1->length != 0);
|
||||
REQUIRE(rdata2->length != 0);
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -168,8 +168,8 @@ compare_minfo(ARGS_COMPARE) {
|
|||
isc_region_consume(®ion1, name_length(&name1));
|
||||
isc_region_consume(®ion2, name_length(&name2));
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_name_fromregion(&name1, ®ion1);
|
||||
dns_name_fromregion(&name2, ®ion2);
|
||||
|
|
@ -211,15 +211,15 @@ tostruct_minfo(ARGS_TOSTRUCT) {
|
|||
minfo->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&minfo->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
dns_name_init(&minfo->rmailbox, NULL);
|
||||
dns_name_init(&minfo->rmailbox);
|
||||
name_duporclone(&name, mctx, &minfo->rmailbox);
|
||||
isc_region_consume(®ion, name_length(&name));
|
||||
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
dns_name_init(&minfo->emailbox, NULL);
|
||||
dns_name_init(&minfo->emailbox);
|
||||
name_duporclone(&name, mctx, &minfo->emailbox);
|
||||
minfo->mctx = mctx;
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -262,14 +262,14 @@ digest_minfo(ARGS_DIGEST) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_minfo);
|
||||
|
||||
dns_rdata_toregion(rdata, &r);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
result = dns_name_digest(&name, digest, arg);
|
||||
if (result != ISC_R_SUCCESS) {
|
||||
return result;
|
||||
}
|
||||
isc_region_consume(&r, name_length(&name));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
|
|
@ -297,7 +297,7 @@ checknames_minfo(ARGS_CHECKNAMES) {
|
|||
UNUSED(owner);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
if (!dns_name_ismailbox(&name)) {
|
||||
if (bad != NULL) {
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ fromtext_mr(ARGS_FROMTEXT) {
|
|||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -50,8 +50,8 @@ totext_mr(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_mr);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
|
@ -72,7 +72,7 @@ fromwire_mr(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
return dns_name_fromwire(&name, source, dctx, target);
|
||||
}
|
||||
|
||||
|
|
@ -86,7 +86,7 @@ towire_mr(ARGS_TOWIRE) {
|
|||
|
||||
dns_compress_setpermitted(cctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
|
|
@ -106,8 +106,8 @@ compare_mr(ARGS_COMPARE) {
|
|||
REQUIRE(rdata1->length != 0);
|
||||
REQUIRE(rdata2->length != 0);
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -149,10 +149,10 @@ tostruct_mr(ARGS_TOSTRUCT) {
|
|||
mr->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&mr->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
dns_name_init(&mr->mr, NULL);
|
||||
dns_name_init(&mr->mr);
|
||||
name_duporclone(&name, mctx, &mr->mr);
|
||||
mr->mctx = mctx;
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -192,7 +192,7 @@ digest_mr(ARGS_DIGEST) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_mr);
|
||||
|
||||
dns_rdata_toregion(rdata, &r);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ fromtext_mx(ARGS_FROMTEXT) {
|
|||
warn_badmx(&token, lexer, callbacks);
|
||||
}
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -108,8 +108,8 @@ totext_mx(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_mx);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
num = uint16_fromregion(®ion);
|
||||
|
|
@ -137,7 +137,7 @@ fromwire_mx(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
|
||||
isc_buffer_activeregion(source, &sregion);
|
||||
if (sregion.length < 2) {
|
||||
|
|
@ -162,7 +162,7 @@ towire_mx(ARGS_TOWIRE) {
|
|||
RETERR(mem_tobuffer(target, region.base, 2));
|
||||
isc_region_consume(®ion, 2);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
return dns_name_towire(&name, cctx, target, NULL);
|
||||
|
|
@ -187,8 +187,8 @@ compare_mx(ARGS_COMPARE) {
|
|||
return order < 0 ? -1 : 1;
|
||||
}
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -234,12 +234,12 @@ tostruct_mx(ARGS_TOSTRUCT) {
|
|||
mx->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&mx->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
mx->pref = uint16_fromregion(®ion);
|
||||
isc_region_consume(®ion, 2);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
dns_name_init(&mx->mx, NULL);
|
||||
dns_name_init(&mx->mx);
|
||||
name_duporclone(&name, mctx, &mx->mx);
|
||||
mx->mctx = mctx;
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -274,7 +274,7 @@ additionaldata_mx(ARGS_ADDLDATA) {
|
|||
|
||||
UNUSED(owner);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
isc_region_consume(®ion, 2);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
|
@ -311,7 +311,7 @@ digest_mx(ARGS_DIGEST) {
|
|||
isc_region_consume(&r2, 2);
|
||||
r1.length = 2;
|
||||
RETERR((digest)(arg, &r1));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r2);
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
}
|
||||
|
|
@ -337,7 +337,7 @@ checknames_mx(ARGS_CHECKNAMES) {
|
|||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
isc_region_consume(®ion, 2);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
if (!dns_name_ishostname(&name, false)) {
|
||||
if (bad != NULL) {
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@ fromtext_naptr(ARGS_FROMTEXT) {
|
|||
*/
|
||||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -251,8 +251,8 @@ totext_naptr(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_naptr);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
|
||||
|
|
@ -314,7 +314,7 @@ fromwire_naptr(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, false);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
|
||||
/*
|
||||
* Order, preference.
|
||||
|
|
@ -386,7 +386,7 @@ towire_naptr(ARGS_TOWIRE) {
|
|||
/*
|
||||
* Replacement.
|
||||
*/
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
return dns_name_towire(&name, cctx, target, NULL);
|
||||
}
|
||||
|
|
@ -454,8 +454,8 @@ compare_naptr(ARGS_COMPARE) {
|
|||
/*
|
||||
* Replacement.
|
||||
*/
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_name_fromregion(&name1, ®ion1);
|
||||
dns_name_fromregion(&name2, ®ion2);
|
||||
|
|
@ -535,9 +535,9 @@ tostruct_naptr(ARGS_TOSTRUCT) {
|
|||
naptr->regexp = mem_maybedup(mctx, r.base, naptr->regexp_len);
|
||||
isc_region_consume(&r, naptr->regexp_len);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
dns_name_init(&naptr->replacement, NULL);
|
||||
dns_name_init(&naptr->replacement);
|
||||
name_duporclone(&name, mctx, &naptr->replacement);
|
||||
naptr->mctx = mctx;
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -616,7 +616,7 @@ additionaldata_naptr(ARGS_ADDLDATA) {
|
|||
/*
|
||||
* Replacement.
|
||||
*/
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
|
||||
if (atype != 0) {
|
||||
|
|
@ -679,7 +679,7 @@ digest_naptr(ARGS_DIGEST) {
|
|||
* Replacement.
|
||||
*/
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r2);
|
||||
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ fromtext_ns(ARGS_FROMTEXT) {
|
|||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -61,8 +61,8 @@ totext_ns(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_ns);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
|
@ -83,7 +83,7 @@ fromwire_ns(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
return dns_name_fromwire(&name, source, dctx, target);
|
||||
}
|
||||
|
||||
|
|
@ -97,7 +97,7 @@ towire_ns(ARGS_TOWIRE) {
|
|||
|
||||
dns_compress_setpermitted(cctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
|
|
@ -117,8 +117,8 @@ compare_ns(ARGS_COMPARE) {
|
|||
REQUIRE(rdata1->length != 0);
|
||||
REQUIRE(rdata2->length != 0);
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -160,10 +160,10 @@ tostruct_ns(ARGS_TOSTRUCT) {
|
|||
ns->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&ns->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
dns_name_init(&ns->name, NULL);
|
||||
dns_name_init(&ns->name);
|
||||
name_duporclone(&name, mctx, &ns->name);
|
||||
ns->mctx = mctx;
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -192,7 +192,7 @@ additionaldata_ns(ARGS_ADDLDATA) {
|
|||
|
||||
UNUSED(owner);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
|
|
@ -207,7 +207,7 @@ digest_ns(ARGS_DIGEST) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_ns);
|
||||
|
||||
dns_rdata_toregion(rdata, &r);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
|
|
@ -235,7 +235,7 @@ checknames_ns(ARGS_CHECKNAMES) {
|
|||
UNUSED(owner);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
if (!dns_name_ishostname(&name, false)) {
|
||||
if (bad != NULL) {
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ fromtext_nsec(ARGS_FROMTEXT) {
|
|||
*/
|
||||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -61,7 +61,7 @@ totext_nsec(ARGS_TOTEXT) {
|
|||
|
||||
UNUSED(tctx);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, &sr);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
isc_region_consume(&sr, name_length(&name));
|
||||
|
|
@ -87,7 +87,7 @@ fromwire_nsec(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, false);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
RETERR(dns_name_fromwire(&name, source, dctx, target));
|
||||
|
||||
isc_buffer_activeregion(source, &sr);
|
||||
|
|
@ -106,7 +106,7 @@ towire_nsec(ARGS_TOWIRE) {
|
|||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_compress_setpermitted(cctx, false);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, &sr);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
isc_region_consume(&sr, name_length(&name));
|
||||
|
|
@ -168,11 +168,11 @@ tostruct_nsec(ARGS_TOSTRUCT) {
|
|||
nsec->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&nsec->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
isc_region_consume(®ion, name_length(&name));
|
||||
dns_name_init(&nsec->next, NULL);
|
||||
dns_name_init(&nsec->next);
|
||||
name_duporclone(&name, mctx, &nsec->next);
|
||||
|
||||
nsec->len = region.length;
|
||||
|
|
@ -258,8 +258,8 @@ casecompare_nsec(ARGS_COMPARE) {
|
|||
REQUIRE(rdata1->length != 0);
|
||||
REQUIRE(rdata2->length != 0);
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ fromtext_nxt(ARGS_FROMTEXT) {
|
|||
*/
|
||||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -98,8 +98,8 @@ totext_nxt(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_nxt);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
dns_rdata_toregion(rdata, &sr);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
isc_region_consume(&sr, name_length(&name));
|
||||
|
|
@ -146,7 +146,7 @@ fromwire_nxt(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, false);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
RETERR(dns_name_fromwire(&name, source, dctx, target));
|
||||
|
||||
isc_buffer_activeregion(source, &sr);
|
||||
|
|
@ -169,7 +169,7 @@ towire_nxt(ARGS_TOWIRE) {
|
|||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_compress_setpermitted(cctx, false);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, &sr);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
isc_region_consume(&sr, name_length(&name));
|
||||
|
|
@ -192,8 +192,8 @@ compare_nxt(ARGS_COMPARE) {
|
|||
REQUIRE(rdata1->length != 0);
|
||||
REQUIRE(rdata2->length != 0);
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
dns_rdata_toregion(rdata1, &r1);
|
||||
dns_rdata_toregion(rdata2, &r2);
|
||||
dns_name_fromregion(&name1, &r1);
|
||||
|
|
@ -247,11 +247,11 @@ tostruct_nxt(ARGS_TOSTRUCT) {
|
|||
nxt->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&nxt->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
isc_region_consume(®ion, name_length(&name));
|
||||
dns_name_init(&nxt->next, NULL);
|
||||
dns_name_init(&nxt->next);
|
||||
name_duporclone(&name, mctx, &nxt->next);
|
||||
|
||||
nxt->len = region.length;
|
||||
|
|
@ -299,7 +299,7 @@ digest_nxt(ARGS_DIGEST) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_nxt);
|
||||
|
||||
dns_rdata_toregion(rdata, &r);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
result = dns_name_digest(&name, digest, arg);
|
||||
if (result != ISC_R_SUCCESS) {
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ fromtext_ptr(ARGS_FROMTEXT) {
|
|||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -63,8 +63,8 @@ totext_ptr(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_ptr);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
|
@ -85,7 +85,7 @@ fromwire_ptr(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
return dns_name_fromwire(&name, source, dctx, target);
|
||||
}
|
||||
|
||||
|
|
@ -99,7 +99,7 @@ towire_ptr(ARGS_TOWIRE) {
|
|||
|
||||
dns_compress_setpermitted(cctx, true);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
|
|
@ -119,8 +119,8 @@ compare_ptr(ARGS_COMPARE) {
|
|||
REQUIRE(rdata1->length != 0);
|
||||
REQUIRE(rdata2->length != 0);
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -162,10 +162,10 @@ tostruct_ptr(ARGS_TOSTRUCT) {
|
|||
ptr->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&ptr->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
dns_name_init(&ptr->ptr, NULL);
|
||||
dns_name_init(&ptr->ptr);
|
||||
name_duporclone(&name, mctx, &ptr->ptr);
|
||||
ptr->mctx = mctx;
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -206,7 +206,7 @@ digest_ptr(ARGS_DIGEST) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_ptr);
|
||||
|
||||
dns_rdata_toregion(rdata, &r);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
|
|
@ -254,7 +254,7 @@ checknames_ptr(ARGS_CHECKNAMES) {
|
|||
dns_name_issubdomain(owner, &ip6_int))
|
||||
{
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
if (!dns_name_ishostname(&name, false)) {
|
||||
if (bad != NULL) {
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ fromtext_rp(ARGS_FROMTEXT) {
|
|||
for (i = 0; i < 2; i++) {
|
||||
RETERR(isc_lex_getmastertoken(lexer, &token,
|
||||
isc_tokentype_string, false));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
RETTOK(dns_name_fromtext(&name, &buffer, origin, options,
|
||||
target));
|
||||
|
|
@ -68,9 +68,9 @@ totext_rp(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_rp);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&rmail, NULL);
|
||||
dns_name_init(&email, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&rmail);
|
||||
dns_name_init(&email);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
|
||||
|
|
@ -105,8 +105,8 @@ fromwire_rp(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, false);
|
||||
|
||||
dns_name_init(&rmail, NULL);
|
||||
dns_name_init(&email, NULL);
|
||||
dns_name_init(&rmail);
|
||||
dns_name_init(&email);
|
||||
|
||||
RETERR(dns_name_fromwire(&rmail, source, dctx, target));
|
||||
return dns_name_fromwire(&email, source, dctx, target);
|
||||
|
|
@ -122,8 +122,8 @@ towire_rp(ARGS_TOWIRE) {
|
|||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_compress_setpermitted(cctx, false);
|
||||
dns_name_init(&rmail, NULL);
|
||||
dns_name_init(&email, NULL);
|
||||
dns_name_init(&rmail);
|
||||
dns_name_init(&email);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
|
||||
|
|
@ -152,8 +152,8 @@ compare_rp(ARGS_COMPARE) {
|
|||
REQUIRE(rdata1->length != 0);
|
||||
REQUIRE(rdata2->length != 0);
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -169,8 +169,8 @@ compare_rp(ARGS_COMPARE) {
|
|||
isc_region_consume(®ion1, name_length(&name1));
|
||||
isc_region_consume(®ion2, name_length(&name2));
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_name_fromregion(&name1, ®ion1);
|
||||
dns_name_fromregion(&name2, ®ion2);
|
||||
|
|
@ -211,14 +211,14 @@ tostruct_rp(ARGS_TOSTRUCT) {
|
|||
rp->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&rp->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
dns_name_init(&rp->mail, NULL);
|
||||
dns_name_init(&rp->mail);
|
||||
name_duporclone(&name, mctx, &rp->mail);
|
||||
isc_region_consume(®ion, name_length(&name));
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
dns_name_init(&rp->text, NULL);
|
||||
dns_name_init(&rp->text);
|
||||
name_duporclone(&name, mctx, &rp->text);
|
||||
rp->mctx = mctx;
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -260,13 +260,13 @@ digest_rp(ARGS_DIGEST) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_rp);
|
||||
|
||||
dns_rdata_toregion(rdata, &r);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
|
||||
dns_name_fromregion(&name, &r);
|
||||
RETERR(dns_name_digest(&name, digest, arg));
|
||||
isc_region_consume(&r, name_length(&name));
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
|
|
@ -294,7 +294,7 @@ checknames_rp(ARGS_CHECKNAMES) {
|
|||
UNUSED(owner);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
if (!dns_name_ismailbox(&name)) {
|
||||
if (bad != NULL) {
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ fromtext_rrsig(ARGS_FROMTEXT) {
|
|||
*/
|
||||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -265,7 +265,7 @@ totext_rrsig(ARGS_TOTEXT) {
|
|||
/*
|
||||
* Signer.
|
||||
*/
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
isc_region_consume(&sr, name_length(&name));
|
||||
RETERR(dns_name_totext(&name, 0, target));
|
||||
|
|
@ -327,7 +327,7 @@ fromwire_rrsig(ARGS_FROMWIRE) {
|
|||
/*
|
||||
* Signer.
|
||||
*/
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
RETERR(dns_name_fromwire(&name, source, dctx, target));
|
||||
|
||||
/*
|
||||
|
|
@ -374,7 +374,7 @@ towire_rrsig(ARGS_TOWIRE) {
|
|||
/*
|
||||
* Signer.
|
||||
*/
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
isc_region_consume(&sr, name_length(&name));
|
||||
RETERR(dns_name_towire(&name, cctx, target, NULL));
|
||||
|
|
@ -518,9 +518,9 @@ tostruct_rrsig(ARGS_TOSTRUCT) {
|
|||
sig->keyid = uint16_fromregion(&sr);
|
||||
isc_region_consume(&sr, 2);
|
||||
|
||||
dns_name_init(&signer, NULL);
|
||||
dns_name_init(&signer);
|
||||
dns_name_fromregion(&signer, &sr);
|
||||
dns_name_init(&sig->signer, NULL);
|
||||
dns_name_init(&sig->signer);
|
||||
name_duporclone(&signer, mctx, &sig->signer);
|
||||
isc_region_consume(&sr, name_length(&sig->signer));
|
||||
|
||||
|
|
@ -636,8 +636,8 @@ casecompare_rrsig(ARGS_COMPARE) {
|
|||
return order;
|
||||
}
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
dns_rdata_toregion(rdata1, &r1);
|
||||
dns_rdata_toregion(rdata2, &r2);
|
||||
isc_region_consume(&r1, 18);
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ fromtext_rt(ARGS_FROMTEXT) {
|
|||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -72,8 +72,8 @@ totext_rt(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_rt);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
num = uint16_fromregion(®ion);
|
||||
|
|
@ -100,7 +100,7 @@ fromwire_rt(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, false);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
|
||||
isc_buffer_activeregion(source, &sregion);
|
||||
isc_buffer_availableregion(target, &tregion);
|
||||
|
|
@ -135,7 +135,7 @@ towire_rt(ARGS_TOWIRE) {
|
|||
isc_region_consume(®ion, 2);
|
||||
isc_buffer_add(target, 2);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
return dns_name_towire(&name, cctx, target, NULL);
|
||||
|
|
@ -160,8 +160,8 @@ compare_rt(ARGS_COMPARE) {
|
|||
return order < 0 ? -1 : 1;
|
||||
}
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -207,12 +207,12 @@ tostruct_rt(ARGS_TOSTRUCT) {
|
|||
rt->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&rt->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
rt->preference = uint16_fromregion(®ion);
|
||||
isc_region_consume(®ion, 2);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
dns_name_init(&rt->host, NULL);
|
||||
dns_name_init(&rt->host);
|
||||
name_duporclone(&name, mctx, &rt->host);
|
||||
|
||||
rt->mctx = mctx;
|
||||
|
|
@ -244,7 +244,7 @@ additionaldata_rt(ARGS_ADDLDATA) {
|
|||
|
||||
UNUSED(owner);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
isc_region_consume(®ion, 2);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
|
@ -276,7 +276,7 @@ digest_rt(ARGS_DIGEST) {
|
|||
if (result != ISC_R_SUCCESS) {
|
||||
return result;
|
||||
}
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r2);
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
}
|
||||
|
|
@ -304,7 +304,7 @@ checknames_rt(ARGS_CHECKNAMES) {
|
|||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
isc_region_consume(®ion, 2);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
if (!dns_name_ishostname(&name, false)) {
|
||||
if (bad != NULL) {
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ fromtext_sig(ARGS_FROMTEXT) {
|
|||
*/
|
||||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -231,8 +231,8 @@ totext_sig(ARGS_TOTEXT) {
|
|||
/*
|
||||
* Signer.
|
||||
*/
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
isc_region_consume(&sr, name_length(&name));
|
||||
opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT
|
||||
|
|
@ -291,7 +291,7 @@ fromwire_sig(ARGS_FROMWIRE) {
|
|||
/*
|
||||
* Signer.
|
||||
*/
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
RETERR(dns_name_fromwire(&name, source, dctx, target));
|
||||
|
||||
/*
|
||||
|
|
@ -338,7 +338,7 @@ towire_sig(ARGS_TOWIRE) {
|
|||
/*
|
||||
* Signer.
|
||||
*/
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
isc_region_consume(&sr, name_length(&name));
|
||||
RETERR(dns_name_towire(&name, cctx, target, NULL));
|
||||
|
|
@ -375,8 +375,8 @@ compare_sig(ARGS_COMPARE) {
|
|||
return order;
|
||||
}
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
dns_rdata_toregion(rdata1, &r1);
|
||||
dns_rdata_toregion(rdata2, &r2);
|
||||
isc_region_consume(&r1, 18);
|
||||
|
|
@ -511,9 +511,9 @@ tostruct_sig(ARGS_TOSTRUCT) {
|
|||
sig->keyid = uint16_fromregion(&sr);
|
||||
isc_region_consume(&sr, 2);
|
||||
|
||||
dns_name_init(&signer, NULL);
|
||||
dns_name_init(&signer);
|
||||
dns_name_fromregion(&signer, &sr);
|
||||
dns_name_init(&sig->signer, NULL);
|
||||
dns_name_init(&sig->signer);
|
||||
name_duporclone(&signer, mctx, &sig->signer);
|
||||
isc_region_consume(&sr, name_length(&sig->signer));
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ fromtext_soa(ARGS_FROMTEXT) {
|
|||
RETERR(isc_lex_getmastertoken(lexer, &token,
|
||||
isc_tokentype_string, false));
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
RETTOK(dns_name_fromtext(&name, &buffer, origin, options,
|
||||
target));
|
||||
|
|
@ -100,9 +100,9 @@ totext_soa(ARGS_TOTEXT) {
|
|||
comm = false;
|
||||
}
|
||||
|
||||
dns_name_init(&mname, NULL);
|
||||
dns_name_init(&rname, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&mname);
|
||||
dns_name_init(&rname);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, &dregion);
|
||||
|
||||
|
|
@ -171,8 +171,8 @@ fromwire_soa(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, true);
|
||||
|
||||
dns_name_init(&mname, NULL);
|
||||
dns_name_init(&rname, NULL);
|
||||
dns_name_init(&mname);
|
||||
dns_name_init(&rname);
|
||||
|
||||
RETERR(dns_name_fromwire(&mname, source, dctx, target));
|
||||
RETERR(dns_name_fromwire(&rname, source, dctx, target));
|
||||
|
|
@ -206,8 +206,8 @@ towire_soa(ARGS_TOWIRE) {
|
|||
|
||||
dns_compress_setpermitted(cctx, true);
|
||||
|
||||
dns_name_init(&mname, NULL);
|
||||
dns_name_init(&rname, NULL);
|
||||
dns_name_init(&mname);
|
||||
dns_name_init(&rname);
|
||||
|
||||
dns_rdata_toregion(rdata, &sregion);
|
||||
|
||||
|
|
@ -243,8 +243,8 @@ compare_soa(ARGS_COMPARE) {
|
|||
REQUIRE(rdata1->length != 0);
|
||||
REQUIRE(rdata2->length != 0);
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -260,8 +260,8 @@ compare_soa(ARGS_COMPARE) {
|
|||
isc_region_consume(®ion1, name_length(&name1));
|
||||
isc_region_consume(®ion2, name_length(&name2));
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_name_fromregion(&name1, ®ion1);
|
||||
dns_name_fromregion(&name2, ®ion2);
|
||||
|
|
@ -317,15 +317,15 @@ tostruct_soa(ARGS_TOSTRUCT) {
|
|||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
isc_region_consume(®ion, name_length(&name));
|
||||
dns_name_init(&soa->origin, NULL);
|
||||
dns_name_init(&soa->origin);
|
||||
name_duporclone(&name, mctx, &soa->origin);
|
||||
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
isc_region_consume(®ion, name_length(&name));
|
||||
dns_name_init(&soa->contact, NULL);
|
||||
dns_name_init(&soa->contact);
|
||||
name_duporclone(&name, mctx, &soa->contact);
|
||||
|
||||
soa->serial = uint32_fromregion(®ion);
|
||||
|
|
@ -383,12 +383,12 @@ digest_soa(ARGS_DIGEST) {
|
|||
|
||||
dns_rdata_toregion(rdata, &r);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
RETERR(dns_name_digest(&name, digest, arg));
|
||||
isc_region_consume(&r, name_length(&name));
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
RETERR(dns_name_digest(&name, digest, arg));
|
||||
isc_region_consume(&r, name_length(&name));
|
||||
|
|
@ -418,7 +418,7 @@ checknames_soa(ARGS_CHECKNAMES) {
|
|||
UNUSED(owner);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
if (!dns_name_ishostname(&name, false)) {
|
||||
if (bad != NULL) {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ fromtext_talink(ARGS_FROMTEXT) {
|
|||
RETERR(isc_lex_getmastertoken(lexer, &token,
|
||||
isc_tokentype_string, false));
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
RETTOK(dns_name_fromtext(&name, &buffer, origin, options,
|
||||
target));
|
||||
|
|
@ -57,9 +57,9 @@ totext_talink(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->type == dns_rdatatype_talink);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&prev, NULL);
|
||||
dns_name_init(&next, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&prev);
|
||||
dns_name_init(&next);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, &dregion);
|
||||
|
||||
|
|
@ -92,8 +92,8 @@ fromwire_talink(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, false);
|
||||
|
||||
dns_name_init(&prev, NULL);
|
||||
dns_name_init(&next, NULL);
|
||||
dns_name_init(&prev);
|
||||
dns_name_init(&next);
|
||||
|
||||
RETERR(dns_name_fromwire(&prev, source, dctx, target));
|
||||
return dns_name_fromwire(&next, source, dctx, target);
|
||||
|
|
@ -110,8 +110,8 @@ towire_talink(ARGS_TOWIRE) {
|
|||
|
||||
dns_compress_setpermitted(cctx, false);
|
||||
|
||||
dns_name_init(&prev, NULL);
|
||||
dns_name_init(&next, NULL);
|
||||
dns_name_init(&prev);
|
||||
dns_name_init(&next);
|
||||
|
||||
dns_rdata_toregion(rdata, &sregion);
|
||||
|
||||
|
|
@ -175,15 +175,15 @@ tostruct_talink(ARGS_TOSTRUCT) {
|
|||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
isc_region_consume(®ion, name_length(&name));
|
||||
dns_name_init(&talink->prev, NULL);
|
||||
dns_name_init(&talink->prev);
|
||||
name_duporclone(&name, mctx, &talink->prev);
|
||||
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
isc_region_consume(®ion, name_length(&name));
|
||||
dns_name_init(&talink->next, NULL);
|
||||
dns_name_init(&talink->next);
|
||||
name_duporclone(&name, mctx, &talink->next);
|
||||
|
||||
talink->mctx = mctx;
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ fromtext_tkey(ARGS_FROMTEXT) {
|
|||
*/
|
||||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -136,8 +136,8 @@ totext_tkey(ARGS_TOTEXT) {
|
|||
/*
|
||||
* Algorithm.
|
||||
*/
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT
|
||||
: 0;
|
||||
|
|
@ -260,7 +260,7 @@ fromwire_tkey(ARGS_FROMWIRE) {
|
|||
/*
|
||||
* Algorithm.
|
||||
*/
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
RETERR(dns_name_fromwire(&name, source, dctx, target));
|
||||
|
||||
/*
|
||||
|
|
@ -318,7 +318,7 @@ towire_tkey(ARGS_TOWIRE) {
|
|||
* Algorithm.
|
||||
*/
|
||||
dns_rdata_toregion(rdata, &sr);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
RETERR(dns_name_towire(&name, cctx, target, NULL));
|
||||
isc_region_consume(&sr, name_length(&name));
|
||||
|
|
@ -345,8 +345,8 @@ compare_tkey(ARGS_COMPARE) {
|
|||
*/
|
||||
dns_rdata_toregion(rdata1, &r1);
|
||||
dns_rdata_toregion(rdata2, &r2);
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
dns_name_fromregion(&name1, &r1);
|
||||
dns_name_fromregion(&name2, &r2);
|
||||
if ((order = dns_name_rdatacompare(&name1, &name2)) != 0) {
|
||||
|
|
@ -434,9 +434,9 @@ tostruct_tkey(ARGS_TOSTRUCT) {
|
|||
/*
|
||||
* Algorithm Name.
|
||||
*/
|
||||
dns_name_init(&alg, NULL);
|
||||
dns_name_init(&alg);
|
||||
dns_name_fromregion(&alg, &sr);
|
||||
dns_name_init(&tkey->algorithm, NULL);
|
||||
dns_name_init(&tkey->algorithm);
|
||||
name_duporclone(&alg, mctx, &tkey->algorithm);
|
||||
isc_region_consume(&sr, name_length(&tkey->algorithm));
|
||||
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ fromtext_in_a6(ARGS_FROMTEXT) {
|
|||
|
||||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -137,8 +137,8 @@ totext_in_a6(ARGS_TOTEXT) {
|
|||
}
|
||||
|
||||
RETERR(str_totext(" ", target));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
opts = name_prefix(&name, tctx->origin, &prefix) ? DNS_NAME_OMITFINALDOT
|
||||
: 0;
|
||||
|
|
@ -196,7 +196,7 @@ fromwire_in_a6(ARGS_FROMWIRE) {
|
|||
return ISC_R_SUCCESS;
|
||||
}
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
return dns_name_fromwire(&name, source, dctx, target);
|
||||
}
|
||||
|
||||
|
|
@ -224,7 +224,7 @@ towire_in_a6(ARGS_TOWIRE) {
|
|||
return ISC_R_SUCCESS;
|
||||
}
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
return dns_name_towire(&name, cctx, target, NULL);
|
||||
}
|
||||
|
|
@ -279,8 +279,8 @@ compare_in_a6(ARGS_COMPARE) {
|
|||
isc_region_consume(®ion2, octets);
|
||||
}
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
dns_name_fromregion(&name1, ®ion1);
|
||||
dns_name_fromregion(&name2, ®ion2);
|
||||
return dns_name_rdatacompare(&name1, &name2);
|
||||
|
|
@ -369,9 +369,9 @@ tostruct_in_a6(ARGS_TOSTRUCT) {
|
|||
/*
|
||||
* Prefix.
|
||||
*/
|
||||
dns_name_init(&a6->prefix, NULL);
|
||||
dns_name_init(&a6->prefix);
|
||||
if (a6->prefixlen != 0) {
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
name_duporclone(&name, mctx, &a6->prefix);
|
||||
}
|
||||
|
|
@ -435,7 +435,7 @@ digest_in_a6(ARGS_DIGEST) {
|
|||
}
|
||||
|
||||
isc_region_consume(&r2, octets);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r2);
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
}
|
||||
|
|
@ -468,7 +468,7 @@ checknames_in_a6(ARGS_CHECKNAMES) {
|
|||
return true;
|
||||
}
|
||||
isc_region_consume(®ion, 1 + 16 - prefixlen / 8);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
if (!dns_name_ishostname(&name, false)) {
|
||||
if (bad != NULL) {
|
||||
|
|
|
|||
|
|
@ -222,8 +222,8 @@ checkowner_in_a(ARGS_CHECKOWNER) {
|
|||
/*
|
||||
* Handle Active Directory gc._msdcs.<forest> name.
|
||||
*/
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&suffix, NULL);
|
||||
dns_name_init(&prefix);
|
||||
dns_name_init(&suffix);
|
||||
dns_name_split(name, labels - 2, &prefix, &suffix);
|
||||
if (dns_name_equal(&gc_msdcs, &prefix) &&
|
||||
dns_name_ishostname(&suffix, false))
|
||||
|
|
|
|||
|
|
@ -232,8 +232,8 @@ checkowner_in_aaaa(ARGS_CHECKOWNER) {
|
|||
* Handle Active Directory gc._msdcs.<forest> name.
|
||||
*/
|
||||
if (dns_name_countlabels(name) > 2U) {
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&suffix, NULL);
|
||||
dns_name_init(&prefix);
|
||||
dns_name_init(&suffix);
|
||||
dns_name_split(name, dns_name_countlabels(name) - 2, &prefix,
|
||||
&suffix);
|
||||
if (dns_name_equal(&gc_msdcs, &prefix) &&
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ fromtext_in_kx(ARGS_FROMTEXT) {
|
|||
|
||||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -62,8 +62,8 @@ totext_in_kx(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->rdclass == dns_rdataclass_in);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
num = uint16_fromregion(®ion);
|
||||
|
|
@ -92,7 +92,7 @@ fromwire_in_kx(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, false);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
|
||||
isc_buffer_activeregion(source, &sregion);
|
||||
if (sregion.length < 2) {
|
||||
|
|
@ -117,7 +117,7 @@ towire_in_kx(ARGS_TOWIRE) {
|
|||
RETERR(mem_tobuffer(target, region.base, 2));
|
||||
isc_region_consume(®ion, 2);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
return dns_name_towire(&name, cctx, target, NULL);
|
||||
|
|
@ -143,8 +143,8 @@ compare_in_kx(ARGS_COMPARE) {
|
|||
return order < 0 ? -1 : 1;
|
||||
}
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -192,14 +192,14 @@ tostruct_in_kx(ARGS_TOSTRUCT) {
|
|||
kx->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&kx->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
|
||||
kx->preference = uint16_fromregion(®ion);
|
||||
isc_region_consume(®ion, 2);
|
||||
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
dns_name_init(&kx->exchange, NULL);
|
||||
dns_name_init(&kx->exchange);
|
||||
name_duporclone(&name, mctx, &kx->exchange);
|
||||
kx->mctx = mctx;
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -231,7 +231,7 @@ additionaldata_in_kx(ARGS_ADDLDATA) {
|
|||
|
||||
UNUSED(owner);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
isc_region_consume(®ion, 2);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
|
@ -252,7 +252,7 @@ digest_in_kx(ARGS_DIGEST) {
|
|||
isc_region_consume(&r2, 2);
|
||||
r1.length = 2;
|
||||
RETERR((digest)(arg, &r1));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r2);
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ fromtext_in_nsap_ptr(ARGS_FROMTEXT) {
|
|||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -54,8 +54,8 @@ totext_in_nsap_ptr(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->rdclass == dns_rdataclass_in);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
|
@ -77,7 +77,7 @@ fromwire_in_nsap_ptr(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, false);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
return dns_name_fromwire(&name, source, dctx, target);
|
||||
}
|
||||
|
||||
|
|
@ -91,7 +91,7 @@ towire_in_nsap_ptr(ARGS_TOWIRE) {
|
|||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_compress_setpermitted(cctx, false);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
|
|
@ -112,8 +112,8 @@ compare_in_nsap_ptr(ARGS_COMPARE) {
|
|||
REQUIRE(rdata1->length != 0);
|
||||
REQUIRE(rdata2->length != 0);
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -157,10 +157,10 @@ tostruct_in_nsap_ptr(ARGS_TOSTRUCT) {
|
|||
nsap_ptr->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&nsap_ptr->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
dns_name_init(&nsap_ptr->owner, NULL);
|
||||
dns_name_init(&nsap_ptr->owner);
|
||||
name_duporclone(&name, mctx, &nsap_ptr->owner);
|
||||
nsap_ptr->mctx = mctx;
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -204,7 +204,7 @@ digest_in_nsap_ptr(ARGS_DIGEST) {
|
|||
REQUIRE(rdata->rdclass == dns_rdataclass_in);
|
||||
|
||||
dns_rdata_toregion(rdata, &r);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r);
|
||||
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ fromtext_in_px(ARGS_FROMTEXT) {
|
|||
*/
|
||||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
|
||||
|
||||
|
|
@ -59,7 +59,7 @@ fromtext_in_px(ARGS_FROMTEXT) {
|
|||
*/
|
||||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target));
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -78,8 +78,8 @@ totext_in_px(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->rdclass == dns_rdataclass_in);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
/*
|
||||
* Preference.
|
||||
|
|
@ -123,7 +123,7 @@ fromwire_in_px(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, false);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
|
||||
/*
|
||||
* Preference.
|
||||
|
|
@ -166,7 +166,7 @@ towire_in_px(ARGS_TOWIRE) {
|
|||
/*
|
||||
* MAP822.
|
||||
*/
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
RETERR(dns_name_towire(&name, cctx, target, NULL));
|
||||
isc_region_consume(®ion, name_length(&name));
|
||||
|
|
@ -174,7 +174,7 @@ towire_in_px(ARGS_TOWIRE) {
|
|||
/*
|
||||
* MAPX400.
|
||||
*/
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
return dns_name_towire(&name, cctx, target, NULL);
|
||||
}
|
||||
|
|
@ -199,8 +199,8 @@ compare_in_px(ARGS_COMPARE) {
|
|||
return order < 0 ? -1 : 1;
|
||||
}
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -261,7 +261,7 @@ tostruct_in_px(ARGS_TOSTRUCT) {
|
|||
px->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&px->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
|
||||
px->preference = uint16_fromregion(®ion);
|
||||
|
|
@ -269,11 +269,11 @@ tostruct_in_px(ARGS_TOSTRUCT) {
|
|||
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
|
||||
dns_name_init(&px->map822, NULL);
|
||||
dns_name_init(&px->map822);
|
||||
name_duporclone(&name, mctx, &px->map822);
|
||||
isc_region_consume(®ion, name_length(&px->map822));
|
||||
|
||||
dns_name_init(&px->mapx400, NULL);
|
||||
dns_name_init(&px->mapx400);
|
||||
name_duporclone(&name, mctx, &px->mapx400);
|
||||
|
||||
px->mctx = mctx;
|
||||
|
|
@ -327,14 +327,14 @@ digest_in_px(ARGS_DIGEST) {
|
|||
if (result != ISC_R_SUCCESS) {
|
||||
return result;
|
||||
}
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r2);
|
||||
result = dns_name_digest(&name, digest, arg);
|
||||
if (result != ISC_R_SUCCESS) {
|
||||
return result;
|
||||
}
|
||||
isc_region_consume(&r2, name_length(&name));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r2);
|
||||
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ fromtext_in_srv(ARGS_FROMTEXT) {
|
|||
*/
|
||||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string,
|
||||
false));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -99,8 +99,8 @@ totext_in_srv(ARGS_TOTEXT) {
|
|||
REQUIRE(rdata->rdclass == dns_rdataclass_in);
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
/*
|
||||
* Priority.
|
||||
|
|
@ -152,7 +152,7 @@ fromwire_in_srv(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, false);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
|
||||
/*
|
||||
* Priority, weight, port.
|
||||
|
|
@ -189,7 +189,7 @@ towire_in_srv(ARGS_TOWIRE) {
|
|||
/*
|
||||
* Target.
|
||||
*/
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &sr);
|
||||
return dns_name_towire(&name, cctx, target, NULL);
|
||||
}
|
||||
|
|
@ -220,8 +220,8 @@ compare_in_srv(ARGS_COMPARE) {
|
|||
/*
|
||||
* Target.
|
||||
*/
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name1);
|
||||
dns_name_init(&name2);
|
||||
|
||||
dns_rdata_toregion(rdata1, ®ion1);
|
||||
dns_rdata_toregion(rdata2, ®ion2);
|
||||
|
|
@ -271,7 +271,7 @@ tostruct_in_srv(ARGS_TOSTRUCT) {
|
|||
srv->common.rdtype = rdata->type;
|
||||
ISC_LINK_INIT(&srv->common, link);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
srv->priority = uint16_fromregion(®ion);
|
||||
isc_region_consume(®ion, 2);
|
||||
|
|
@ -280,7 +280,7 @@ tostruct_in_srv(ARGS_TOSTRUCT) {
|
|||
srv->port = uint16_fromregion(®ion);
|
||||
isc_region_consume(®ion, 2);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
dns_name_init(&srv->target, NULL);
|
||||
dns_name_init(&srv->target);
|
||||
name_duporclone(&name, mctx, &srv->target);
|
||||
srv->mctx = mctx;
|
||||
return ISC_R_SUCCESS;
|
||||
|
|
@ -316,7 +316,7 @@ additionaldata_in_srv(ARGS_ADDLDATA) {
|
|||
|
||||
UNUSED(owner);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
isc_region_consume(®ion, 4);
|
||||
port = uint16_fromregion(®ion);
|
||||
|
|
@ -363,7 +363,7 @@ digest_in_srv(ARGS_DIGEST) {
|
|||
isc_region_consume(&r2, 6);
|
||||
r1.length = 6;
|
||||
RETERR((digest)(arg, &r1));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, &r2);
|
||||
return dns_name_digest(&name, digest, arg);
|
||||
}
|
||||
|
|
@ -393,7 +393,7 @@ checknames_in_srv(ARGS_CHECKNAMES) {
|
|||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
isc_region_consume(®ion, 6);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
if (!dns_name_ishostname(&name, false)) {
|
||||
if (bad != NULL) {
|
||||
|
|
|
|||
|
|
@ -579,7 +579,7 @@ generic_fromtext_in_svcb(ARGS_FROMTEXT) {
|
|||
*/
|
||||
RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_qstring,
|
||||
false));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
buffer_fromregion(&buffer, &token.value.as_region);
|
||||
if (origin == NULL) {
|
||||
origin = dns_rootname;
|
||||
|
|
@ -643,8 +643,8 @@ generic_totext_in_svcb(ARGS_TOTEXT) {
|
|||
|
||||
REQUIRE(rdata->length != 0);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_init(&prefix);
|
||||
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
|
||||
|
|
@ -786,7 +786,7 @@ generic_fromwire_in_svcb(ARGS_FROMWIRE) {
|
|||
|
||||
dctx = dns_decompress_setpermitted(dctx, false);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
|
||||
/*
|
||||
* SvcPriority.
|
||||
|
|
@ -938,7 +938,7 @@ generic_towire_in_svcb(ARGS_TOWIRE) {
|
|||
/*
|
||||
* TargetName.
|
||||
*/
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
RETERR(dns_name_towire(&name, cctx, target, NULL));
|
||||
isc_region_consume(®ion, name_length(&name));
|
||||
|
|
@ -1025,8 +1025,8 @@ generic_tostruct_in_svcb(ARGS_TOSTRUCT) {
|
|||
svcb->priority = uint16_fromregion(®ion);
|
||||
isc_region_consume(®ion, 2);
|
||||
|
||||
dns_name_init(&svcb->svcdomain, NULL);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&svcb->svcdomain);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
isc_region_consume(®ion, name_length(&name));
|
||||
|
||||
|
|
@ -1087,7 +1087,7 @@ generic_additionaldata_in_svcb(ARGS_ADDLDATA) {
|
|||
isc_region_t region;
|
||||
unsigned int cnames = 0;
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_toregion(rdata, ®ion);
|
||||
alias = uint16_fromregion(®ion) == 0;
|
||||
isc_region_consume(®ion, 2);
|
||||
|
|
@ -1207,7 +1207,7 @@ generic_checknames_in_svcb(ARGS_CHECKNAMES) {
|
|||
INSIST(region.length > 1);
|
||||
alias = uint16_fromregion(®ion) == 0;
|
||||
isc_region_consume(®ion, 2);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_fromregion(&name, ®ion);
|
||||
if (!alias && !dns_name_ishostname(&name, false)) {
|
||||
if (bad != NULL) {
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ dns_remote_init(dns_remote_t *remote, unsigned int count,
|
|||
if (keynames[i] != NULL) {
|
||||
remote->keynames[i] =
|
||||
isc_mem_get(mctx, sizeof(dns_name_t));
|
||||
dns_name_init(remote->keynames[i], NULL);
|
||||
dns_name_init(remote->keynames[i]);
|
||||
dns_name_dup(keynames[i], mctx,
|
||||
remote->keynames[i]);
|
||||
}
|
||||
|
|
@ -117,7 +117,7 @@ dns_remote_init(dns_remote_t *remote, unsigned int count,
|
|||
if (tlsnames[i] != NULL) {
|
||||
remote->tlsnames[i] =
|
||||
isc_mem_get(mctx, sizeof(dns_name_t));
|
||||
dns_name_init(remote->tlsnames[i], NULL);
|
||||
dns_name_init(remote->tlsnames[i]);
|
||||
dns_name_dup(tlsnames[i], mctx,
|
||||
remote->tlsnames[i]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2325,7 +2325,7 @@ issecuredomain(dns_view_t *view, const dns_name_t *name, dns_rdatatype_t type,
|
|||
*/
|
||||
labels = dns_name_countlabels(name);
|
||||
if (dns_rdatatype_atparent(type) && labels > 1) {
|
||||
dns_name_init(&suffix, NULL);
|
||||
dns_name_init(&suffix);
|
||||
dns_name_getlabelsequence(name, 1, labels - 1, &suffix);
|
||||
name = &suffix;
|
||||
}
|
||||
|
|
@ -3510,7 +3510,7 @@ fctx_getaddresses(fetchctx_t *fctx) {
|
|||
dns_name_countlabels(name) > 1)
|
||||
{
|
||||
unsigned int labels;
|
||||
dns_name_init(&suffix, NULL);
|
||||
dns_name_init(&suffix);
|
||||
labels = dns_name_countlabels(name);
|
||||
dns_name_getlabelsequence(name, 1, labels - 1, &suffix);
|
||||
name = &suffix;
|
||||
|
|
@ -4681,7 +4681,7 @@ fctx_create(dns_resolver_t *res, isc_loop_t *loop, const dns_name_t *name,
|
|||
if (dns_rdatatype_atparent(fctx->type) &&
|
||||
dns_name_countlabels(name) > 1)
|
||||
{
|
||||
dns_name_init(&suffix, NULL);
|
||||
dns_name_init(&suffix);
|
||||
labels = dns_name_countlabels(name);
|
||||
dns_name_getlabelsequence(name, 1, labels - 1, &suffix);
|
||||
fwdname = &suffix;
|
||||
|
|
@ -6668,7 +6668,7 @@ name_external(const dns_name_t *name, dns_rdatatype_t type, fetchctx_t *fctx) {
|
|||
*/
|
||||
labels = dns_name_countlabels(name);
|
||||
if (dns_rdatatype_atparent(type) && labels > 1U) {
|
||||
dns_name_init(&suffix, NULL);
|
||||
dns_name_init(&suffix);
|
||||
dns_name_getlabelsequence(name, 1, labels - 1, &suffix);
|
||||
name = &suffix;
|
||||
} else if (rel == dns_namereln_equal) {
|
||||
|
|
@ -6925,7 +6925,7 @@ is_answertarget_allowed(fetchctx_t *fctx, dns_name_t *qname, dns_name_t *rname,
|
|||
}
|
||||
result = dns_rdata_tostruct(&rdata, &dname, NULL);
|
||||
RUNTIME_CHECK(result == ISC_R_SUCCESS);
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&prefix);
|
||||
tname = dns_fixedname_initname(&fixed);
|
||||
nlabels = dns_name_countlabels(rname);
|
||||
dns_name_split(qname, nlabels, &prefix, NULL);
|
||||
|
|
@ -10264,7 +10264,7 @@ fctx_minimize_qname(fetchctx_t *fctx) {
|
|||
|
||||
REQUIRE(VALID_FCTX(fctx));
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
|
||||
dlabels = dns_name_countlabels(fctx->qmindcname);
|
||||
nlabels = dns_name_countlabels(fctx->name);
|
||||
|
|
@ -10740,7 +10740,7 @@ dns_resolver_addalternate(dns_resolver_t *res, const isc_sockaddr_t *alt,
|
|||
} else {
|
||||
a->isaddress = false;
|
||||
a->_u._n.port = port;
|
||||
dns_name_init(&a->_u._n.name, NULL);
|
||||
dns_name_init(&a->_u._n.name);
|
||||
dns_name_dup(name, res->mctx, &a->_u._n.name);
|
||||
}
|
||||
ISC_LINK_INIT(a, link);
|
||||
|
|
|
|||
|
|
@ -886,7 +886,7 @@ name2ipkey(int log_level, dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type,
|
|||
badname(log_level, src_name, "; too short", "");
|
||||
return ISC_R_FAILURE;
|
||||
}
|
||||
dns_name_init(&ip_name, NULL);
|
||||
dns_name_init(&ip_name);
|
||||
dns_name_getlabelsequence(src_name, 0, ip_labels, &ip_name);
|
||||
|
||||
/*
|
||||
|
|
@ -1062,7 +1062,7 @@ name2data(dns_rpz_zone_t *rpz, dns_rpz_type_t rpz_type,
|
|||
memset(&new_data->wild, 0, sizeof(new_data->wild));
|
||||
}
|
||||
|
||||
dns_name_init(&tmp_name, NULL);
|
||||
dns_name_init(&tmp_name);
|
||||
n = dns_name_countlabels(src_name);
|
||||
n -= prefix_len;
|
||||
if (rpz_type == DNS_RPZ_TYPE_QNAME) {
|
||||
|
|
@ -1551,15 +1551,15 @@ dns_rpz_new_zone(dns_rpz_zones_t *rpzs, dns_rpz_zone_t **rpzp) {
|
|||
|
||||
isc_ht_init(&rpz->nodes, rpzs->mctx, 1, ISC_HT_CASE_SENSITIVE);
|
||||
|
||||
dns_name_init(&rpz->origin, NULL);
|
||||
dns_name_init(&rpz->client_ip, NULL);
|
||||
dns_name_init(&rpz->ip, NULL);
|
||||
dns_name_init(&rpz->nsdname, NULL);
|
||||
dns_name_init(&rpz->nsip, NULL);
|
||||
dns_name_init(&rpz->passthru, NULL);
|
||||
dns_name_init(&rpz->drop, NULL);
|
||||
dns_name_init(&rpz->tcp_only, NULL);
|
||||
dns_name_init(&rpz->cname, NULL);
|
||||
dns_name_init(&rpz->origin);
|
||||
dns_name_init(&rpz->client_ip);
|
||||
dns_name_init(&rpz->ip);
|
||||
dns_name_init(&rpz->nsdname);
|
||||
dns_name_init(&rpz->nsip);
|
||||
dns_name_init(&rpz->passthru);
|
||||
dns_name_init(&rpz->drop);
|
||||
dns_name_init(&rpz->tcp_only);
|
||||
dns_name_init(&rpz->cname);
|
||||
|
||||
isc_time_settoepoch(&rpz->lastupdated);
|
||||
|
||||
|
|
|
|||
|
|
@ -481,7 +481,7 @@ getnodedata(dns_db_t *db, const dns_name_t *name, bool create,
|
|||
|
||||
labels = dns_name_countlabels(name) -
|
||||
dns_name_countlabels(&sdlz->common.origin);
|
||||
dns_name_init(&relname, NULL);
|
||||
dns_name_init(&relname);
|
||||
dns_name_getlabelsequence(name, 0, labels, &relname);
|
||||
result = dns_name_totext(&relname, DNS_NAME_OMITFINALDOT, &b);
|
||||
if (result != ISC_R_SUCCESS) {
|
||||
|
|
@ -603,7 +603,7 @@ getnodedata(dns_db_t *db, const dns_name_t *name, bool create,
|
|||
|
||||
if (node->name == NULL) {
|
||||
node->name = isc_mem_get(sdlz->common.mctx, sizeof(dns_name_t));
|
||||
dns_name_init(node->name, NULL);
|
||||
dns_name_init(node->name);
|
||||
dns_name_dup(name, sdlz->common.mctx, node->name);
|
||||
}
|
||||
|
||||
|
|
@ -1374,7 +1374,7 @@ dns_sdlzcreateDBP(isc_mem_t *mctx, void *driverarg, void *dbdata,
|
|||
};
|
||||
|
||||
/* initialize and set origin */
|
||||
dns_name_init(&sdlzdb->common.origin, NULL);
|
||||
dns_name_init(&sdlzdb->common.origin);
|
||||
dns_name_dup(name, mctx, &sdlzdb->common.origin);
|
||||
|
||||
isc_refcount_init(&sdlzdb->common.references, 1);
|
||||
|
|
@ -1817,7 +1817,7 @@ dns_sdlz_putnamedrr(dns_sdlzallnodes_t *allnodes, const char *name,
|
|||
return result;
|
||||
}
|
||||
sdlznode->name = isc_mem_get(mctx, sizeof(dns_name_t));
|
||||
dns_name_init(sdlznode->name, NULL);
|
||||
dns_name_init(sdlznode->name);
|
||||
dns_name_dup(newname, mctx, sdlznode->name);
|
||||
ISC_LIST_PREPEND(allnodes->nodelist, sdlznode, link);
|
||||
if (allnodes->origin == NULL &&
|
||||
|
|
|
|||
|
|
@ -77,9 +77,9 @@ dns_soa_buildrdata(const dns_name_t *origin, const dns_name_t *contact,
|
|||
soa.retry = retry;
|
||||
soa.expire = expire;
|
||||
soa.minimum = minimum;
|
||||
dns_name_init(&soa.origin, NULL);
|
||||
dns_name_init(&soa.origin);
|
||||
dns_name_clone(origin, &soa.origin);
|
||||
dns_name_init(&soa.contact, NULL);
|
||||
dns_name_init(&soa.contact);
|
||||
dns_name_clone(contact, &soa.contact);
|
||||
|
||||
return dns_rdata_fromstruct(rdata, rdclass, dns_rdatatype_soa, &soa,
|
||||
|
|
|
|||
|
|
@ -213,9 +213,9 @@ dns_ssutable_addrule(dns_ssutable_t *table, bool grant,
|
|||
.magic = SSURULEMAGIC,
|
||||
};
|
||||
|
||||
dns_name_init(rule->identity, NULL);
|
||||
dns_name_init(rule->identity);
|
||||
dns_name_dup(identity, mctx, rule->identity);
|
||||
dns_name_init(rule->name, NULL);
|
||||
dns_name_init(rule->name);
|
||||
dns_name_dup(name, mctx, rule->name);
|
||||
|
||||
if (ntypes > 0) {
|
||||
|
|
|
|||
|
|
@ -255,7 +255,7 @@ dns_tsigkey_createfromkey(const dns_name_t *name, dst_algorithm_t algorithm,
|
|||
|
||||
if (creator != NULL) {
|
||||
tkey->creator = isc_mem_get(mctx, sizeof(dns_name_t));
|
||||
dns_name_init(tkey->creator, NULL);
|
||||
dns_name_init(tkey->creator);
|
||||
dns_name_dup(creator, mctx, tkey->creator);
|
||||
}
|
||||
|
||||
|
|
@ -608,7 +608,7 @@ dns_tsig_sign(dns_message_t *msg) {
|
|||
.error = response ? msg->querytsigstatus : dns_rcode_noerror,
|
||||
};
|
||||
|
||||
dns_name_init(&tsig.algorithm, NULL);
|
||||
dns_name_init(&tsig.algorithm);
|
||||
dns_name_clone(key->algorithm, &tsig.algorithm);
|
||||
|
||||
isc_buffer_init(&databuf, data, sizeof(data));
|
||||
|
|
|
|||
|
|
@ -298,7 +298,7 @@ trynsec3:
|
|||
* Iterate over the ncache entry.
|
||||
*/
|
||||
found = false;
|
||||
dns_name_init(&nsec3name, NULL);
|
||||
dns_name_init(&nsec3name);
|
||||
dns_fixedname_init(&fixed);
|
||||
dns_name_downcase(name, dns_fixedname_name(&fixed), NULL);
|
||||
name = dns_fixedname_name(&fixed);
|
||||
|
|
@ -2350,7 +2350,7 @@ checkwildcard(dns_validator_t *val, dns_rdatatype_t type,
|
|||
char namebuf[DNS_NAME_FORMATSIZE];
|
||||
dns_rdataset_t *rdataset, trdataset;
|
||||
|
||||
dns_name_init(&tname, NULL);
|
||||
dns_name_init(&tname);
|
||||
dns_rdataset_init(&trdataset);
|
||||
wild = dns_fixedname_name(&val->wild);
|
||||
|
||||
|
|
@ -2459,7 +2459,7 @@ findnsec3proofs(dns_validator_t *val) {
|
|||
dns_name_t **proofs = val->proofs;
|
||||
dns_rdataset_t *rdataset, trdataset;
|
||||
|
||||
dns_name_init(&tname, NULL);
|
||||
dns_name_init(&tname);
|
||||
dns_rdataset_init(&trdataset);
|
||||
closest = dns_fixedname_initname(&fclosest);
|
||||
nearest = dns_fixedname_initname(&fnearest);
|
||||
|
|
|
|||
|
|
@ -1250,7 +1250,7 @@ xfrin_create(isc_mem_t *mctx, dns_zone_t *zone, dns_db_t *db, isc_loop_t *loop,
|
|||
isc_mem_attach(mctx, &xfr->mctx);
|
||||
dns_zone_iattach(zone, &xfr->zone);
|
||||
dns_view_weakattach(dns_zone_getview(zone), &xfr->view);
|
||||
dns_name_init(&xfr->name, NULL);
|
||||
dns_name_init(&xfr->name);
|
||||
|
||||
__cds_wfcq_init(&xfr->diff_head, &xfr->diff_tail);
|
||||
|
||||
|
|
|
|||
|
|
@ -1171,8 +1171,8 @@ dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx, unsigned int tid) {
|
|||
|
||||
isc_refcount_init(&zone->references, 1);
|
||||
isc_refcount_init(&zone->irefs, 0);
|
||||
dns_name_init(&zone->origin, NULL);
|
||||
dns_name_init(&zone->rad, NULL);
|
||||
dns_name_init(&zone->origin);
|
||||
dns_name_init(&zone->rad);
|
||||
isc_sockaddr_any(&zone->notifysrc4);
|
||||
isc_sockaddr_any6(&zone->notifysrc6);
|
||||
isc_sockaddr_any(&zone->parentalsrc4);
|
||||
|
|
@ -1693,7 +1693,7 @@ dns_zone_setorigin(dns_zone_t *zone, const dns_name_t *origin) {
|
|||
INSIST(zone != zone->raw);
|
||||
if (dns_name_dynamic(&zone->origin)) {
|
||||
dns_name_free(&zone->origin, zone->mctx);
|
||||
dns_name_init(&zone->origin, NULL);
|
||||
dns_name_init(&zone->origin);
|
||||
}
|
||||
dns_name_dup(origin, zone->mctx, &zone->origin);
|
||||
|
||||
|
|
@ -12526,7 +12526,7 @@ notify_create(isc_mem_t *mctx, unsigned int flags, dns_notify_t **notifyp) {
|
|||
isc_mem_attach(mctx, ¬ify->mctx);
|
||||
isc_sockaddr_any(¬ify->src);
|
||||
isc_sockaddr_any(¬ify->dst);
|
||||
dns_name_init(¬ify->ns, NULL);
|
||||
dns_name_init(¬ify->ns);
|
||||
ISC_LINK_INIT(notify, link);
|
||||
notify->magic = NOTIFY_MAGIC;
|
||||
*notifyp = notify;
|
||||
|
|
@ -12950,7 +12950,7 @@ zone_notify(dns_zone_t *zone, isc_time_t *now) {
|
|||
/*
|
||||
* Find serial and primary server's name.
|
||||
*/
|
||||
dns_name_init(&primary, NULL);
|
||||
dns_name_init(&primary);
|
||||
result = dns_rdataset_first(&soardset);
|
||||
if (result != ISC_R_SUCCESS) {
|
||||
goto cleanup3;
|
||||
|
|
@ -13629,7 +13629,7 @@ save_nsrrset(dns_message_t *message, dns_name_t *name,
|
|||
dns_name_t *tmp_name;
|
||||
tmp_name = isc_mem_get(cb_args->stub->mctx,
|
||||
sizeof(*tmp_name));
|
||||
dns_name_init(tmp_name, NULL);
|
||||
dns_name_init(tmp_name);
|
||||
dns_name_dup(&ns.name, cb_args->stub->mctx, tmp_name);
|
||||
ISC_LIST_APPEND(ns_list, tmp_name, link);
|
||||
}
|
||||
|
|
@ -20203,7 +20203,7 @@ dns_zone_checknames(dns_zone_t *zone, const dns_name_t *name,
|
|||
}
|
||||
}
|
||||
|
||||
dns_name_init(&bad, NULL);
|
||||
dns_name_init(&bad);
|
||||
ok = dns_rdata_checknames(rdata, name, &bad);
|
||||
if (!ok) {
|
||||
dns_name_format(name, namebuf, sizeof(namebuf));
|
||||
|
|
@ -21283,7 +21283,7 @@ checkds_create(isc_mem_t *mctx, unsigned int flags, dns_checkds_t **checkdsp) {
|
|||
|
||||
isc_mem_attach(mctx, &checkds->mctx);
|
||||
isc_sockaddr_any(&checkds->dst);
|
||||
dns_name_init(&checkds->ns, NULL);
|
||||
dns_name_init(&checkds->ns);
|
||||
ISC_LINK_INIT(checkds, link);
|
||||
checkds->magic = CHECKDS_MAGIC;
|
||||
*checkdsp = checkds;
|
||||
|
|
@ -21314,7 +21314,7 @@ checkds_createmessage(dns_zone_t *zone, dns_message_t **messagep) {
|
|||
/*
|
||||
* Make question.
|
||||
*/
|
||||
dns_name_init(tempname, NULL);
|
||||
dns_name_init(tempname);
|
||||
dns_name_clone(&zone->origin, tempname);
|
||||
dns_rdataset_makequestion(temprdataset, zone->rdclass,
|
||||
dns_rdatatype_ds);
|
||||
|
|
@ -22093,7 +22093,7 @@ zone_checkds(dns_zone_t *zone) {
|
|||
zone->nsfetchcount++;
|
||||
isc_refcount_increment0(&zone->irefs);
|
||||
name = dns_fixedname_initname(&nsfetch->name);
|
||||
dns_name_init(&nsfetch->pname, NULL);
|
||||
dns_name_init(&nsfetch->pname);
|
||||
dns_name_clone(&zone->origin, &nsfetch->pname);
|
||||
dns_name_dup(&zone->origin, zone->mctx, name);
|
||||
dns_rdataset_init(&nsfetch->nsrrset);
|
||||
|
|
|
|||
|
|
@ -1250,7 +1250,7 @@ verifyemptynodes(const vctx_t *vctx, const dns_name_t *name,
|
|||
if (reln == dns_namereln_commonancestor ||
|
||||
reln == dns_namereln_contains)
|
||||
{
|
||||
dns_name_init(&suffix, NULL);
|
||||
dns_name_init(&suffix);
|
||||
for (i = labels + 1; i < nlabels; i++) {
|
||||
dns_name_getlabelsequence(name, nlabels - i, i,
|
||||
&suffix);
|
||||
|
|
|
|||
|
|
@ -852,7 +852,7 @@ cfg_acl_fromconfig(const cfg_obj_t *acl_data, const cfg_obj_t *cctx,
|
|||
INSIST(dacl->length < dacl->alloc);
|
||||
de->type = dns_aclelementtype_keyname;
|
||||
de->negative = neg;
|
||||
dns_name_init(&de->keyname, NULL);
|
||||
dns_name_init(&de->keyname);
|
||||
result = convert_keyname(ce, mctx, &de->keyname);
|
||||
if (result != ISC_R_SUCCESS) {
|
||||
goto cleanup;
|
||||
|
|
|
|||
|
|
@ -2246,7 +2246,7 @@ ns_client_request_continue(void *arg) {
|
|||
* debugging.
|
||||
*/
|
||||
client->signer = NULL;
|
||||
dns_name_init(&client->signername, NULL);
|
||||
dns_name_init(&client->signername);
|
||||
result = dns_message_signer(client->message, &client->signername);
|
||||
if (result != ISC_R_NOTFOUND) {
|
||||
signame = NULL;
|
||||
|
|
@ -2532,8 +2532,8 @@ ns__client_setup(ns_client_t *client, ns_clientmgr_t *mgr, bool new) {
|
|||
client->state = NS_CLIENTSTATE_INACTIVE;
|
||||
client->udpsize = 512;
|
||||
client->ednsversion = -1;
|
||||
dns_name_init(&client->signername, NULL);
|
||||
dns_name_init(&client->rad, NULL);
|
||||
dns_name_init(&client->signername);
|
||||
dns_name_init(&client->rad);
|
||||
dns_ecs_init(&client->ecs);
|
||||
isc_sockaddr_any(&client->formerrcache.addr);
|
||||
client->formerrcache.time = 0;
|
||||
|
|
|
|||
|
|
@ -3175,7 +3175,7 @@ rpz_get_p_name(ns_client_t *client, dns_name_t *p_name, dns_rpz_zone_t *rpz,
|
|||
* Start with relative version of the full trigger name,
|
||||
* and trim enough allow the addition of the suffix.
|
||||
*/
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&prefix);
|
||||
labels = dns_name_countlabels(trig_name);
|
||||
first = 0;
|
||||
for (;;) {
|
||||
|
|
@ -4520,7 +4520,7 @@ query_findclosestnsec3(dns_name_t *qname, dns_db_t *db,
|
|||
return;
|
||||
}
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_clone(qname, &name);
|
||||
labels = dns_name_countlabels(&name);
|
||||
dns_clientinfomethods_init(&cm, ns_client_sourceip);
|
||||
|
|
@ -4906,7 +4906,7 @@ redirect2(ns_client_t *client, dns_name_t *name, dns_rdataset_t *rdataset,
|
|||
if (labels > 1U) {
|
||||
dns_name_t prefix;
|
||||
|
||||
dns_name_init(&prefix, NULL);
|
||||
dns_name_init(&prefix);
|
||||
dns_name_getlabelsequence(client->query.qname, 0, labels - 1,
|
||||
&prefix);
|
||||
result = dns_name_concatenate(&prefix,
|
||||
|
|
@ -9848,7 +9848,7 @@ query_coveringnsec(query_ctx_t *qctx) {
|
|||
|
||||
CCTRACE(ISC_LOG_DEBUG(3), "query_coveringnsec");
|
||||
|
||||
dns_name_init(&qname, NULL);
|
||||
dns_name_init(&qname);
|
||||
dns_rdataset_init(&rdataset);
|
||||
dns_rdataset_init(&sigrdataset);
|
||||
namespace = dns_fixedname_initname(&fnamespace);
|
||||
|
|
@ -10780,7 +10780,7 @@ query_addbestns(query_ctx_t *qctx) {
|
|||
dns_clientinfomethods_init(&cm, ns_client_sourceip);
|
||||
dns_clientinfo_init(&ci, client, NULL);
|
||||
|
||||
dns_name_init(&qname, NULL);
|
||||
dns_name_init(&qname);
|
||||
dns_name_clone(client->query.qname, &qname);
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ setup_test(void **state) {
|
|||
return -1;
|
||||
}
|
||||
|
||||
dns_name_init(&tls_name, NULL);
|
||||
dns_name_init(&tls_name);
|
||||
isc_buffer_constinit(&namesrc, tls_name_str, strlen(tls_name_str));
|
||||
isc_buffer_add(&namesrc, strlen(tls_name_str));
|
||||
isc_buffer_init(&namebuf, namedata, sizeof(namedata));
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ setup_master(void (*warn)(struct dns_rdatacallbacks *, const char *, ...),
|
|||
isc_buffer_add(&source, len);
|
||||
isc_buffer_setactive(&source, len);
|
||||
isc_buffer_init(&target, name_buf, BUFLEN);
|
||||
dns_name_init(&dns_origin, NULL);
|
||||
dns_name_init(&dns_origin);
|
||||
dns_master_initrawheader(&header);
|
||||
|
||||
result = dns_name_fromtext(&dns_origin, &source, dns_rootname, 0,
|
||||
|
|
@ -469,7 +469,7 @@ ISC_RUN_TEST_IMPL(dumpraw) {
|
|||
isc_buffer_add(&source, len);
|
||||
isc_buffer_setactive(&source, len);
|
||||
isc_buffer_init(&target, namebuf, BUFLEN);
|
||||
dns_name_init(&dnsorigin, NULL);
|
||||
dns_name_init(&dnsorigin);
|
||||
result = dns_name_fromtext(&dnsorigin, &source, dns_rootname, 0,
|
||||
&target);
|
||||
assert_int_equal(result, ISC_R_SUCCESS);
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ compress_test(const dns_name_t *name1, const dns_name_t *name2,
|
|||
|
||||
isc_buffer_setactive(&source, source.used);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
RUNTIME_CHECK(isc_buffer_getuint16(&source) == 0xEAD);
|
||||
RUNTIME_CHECK(dns_name_fromwire(&name, &source, dctx, &target) ==
|
||||
ISC_R_SUCCESS);
|
||||
|
|
@ -234,22 +234,22 @@ ISC_RUN_TEST_IMPL(compression) {
|
|||
|
||||
UNUSED(state);
|
||||
|
||||
dns_name_init(&name1, NULL);
|
||||
dns_name_init(&name1);
|
||||
r.base = plain1;
|
||||
r.length = sizeof(plain1);
|
||||
dns_name_fromregion(&name1, &r);
|
||||
|
||||
dns_name_init(&name2, NULL);
|
||||
dns_name_init(&name2);
|
||||
r.base = plain2;
|
||||
r.length = sizeof(plain2);
|
||||
dns_name_fromregion(&name2, &r);
|
||||
|
||||
dns_name_init(&name3, NULL);
|
||||
dns_name_init(&name3);
|
||||
r.base = plain3;
|
||||
r.length = sizeof(plain3);
|
||||
dns_name_fromregion(&name3, &r);
|
||||
|
||||
dns_name_init(&name4, NULL);
|
||||
dns_name_init(&name4);
|
||||
r.base = plain4;
|
||||
r.length = sizeof(plain3);
|
||||
dns_name_fromregion(&name4, &r);
|
||||
|
|
@ -395,7 +395,7 @@ ISC_RUN_TEST_IMPL(collision) {
|
|||
|
||||
dns_compress_init(&cctx, mctx, DNS_COMPRESS_LARGE);
|
||||
isc_buffer_init(&message, msgbuf, sizeof(msgbuf));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
|
||||
/*
|
||||
* compression offsets are not allowed to be zero so our
|
||||
|
|
@ -471,7 +471,7 @@ ISC_RUN_TEST_IMPL(fromregion) {
|
|||
* into 'name' where 'name.ndata' points to the buffer 'target'.
|
||||
*/
|
||||
isc_buffer_init(&b, target, sizeof(target));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_setbuffer(&name, &b);
|
||||
r.base = source;
|
||||
r.length = sizeof(source);
|
||||
|
|
@ -485,7 +485,7 @@ ISC_RUN_TEST_IMPL(fromregion) {
|
|||
* into 'name' where 'name.ndata' points to the source.
|
||||
*/
|
||||
isc_buffer_init(&b, target, sizeof(target));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
r.base = source;
|
||||
r.length = sizeof(source);
|
||||
dns_name_fromregion(&name, &r);
|
||||
|
|
@ -498,7 +498,7 @@ ISC_RUN_TEST_IMPL(fromregion) {
|
|||
* where 'name.ndata' points to the source.
|
||||
*/
|
||||
isc_buffer_init(&b, target, sizeof(target));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
r.base = source;
|
||||
r.length = 8;
|
||||
dns_name_fromregion(&name, &r);
|
||||
|
|
@ -510,7 +510,7 @@ ISC_RUN_TEST_IMPL(fromregion) {
|
|||
* Extract empty name in 'source' into 'name'.
|
||||
*/
|
||||
isc_buffer_init(&b, target, sizeof(target));
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
r.base = source;
|
||||
r.length = 0;
|
||||
dns_name_fromregion(&name, &r);
|
||||
|
|
@ -577,7 +577,7 @@ name_attr_zero(struct dns_name_attrs attributes) {
|
|||
ISC_RUN_TEST_IMPL(init) {
|
||||
dns_name_t name;
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
|
||||
assert_null(name.ndata);
|
||||
assert_int_equal(name.length, 0);
|
||||
|
|
@ -589,7 +589,7 @@ ISC_RUN_TEST_IMPL(init) {
|
|||
ISC_RUN_TEST_IMPL(invalidate) {
|
||||
dns_name_t name;
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_invalidate(&name);
|
||||
|
||||
assert_null(name.ndata);
|
||||
|
|
@ -607,7 +607,7 @@ ISC_RUN_TEST_IMPL(buffer) {
|
|||
UNUSED(state);
|
||||
|
||||
isc_buffer_init(&b, buf, BUFSIZ);
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_name_setbuffer(&name, &b);
|
||||
assert_ptr_equal(name.buffer, &b);
|
||||
assert_true(dns_name_hasbuffer(&name));
|
||||
|
|
@ -636,7 +636,7 @@ ISC_RUN_TEST_IMPL(isabsolute) {
|
|||
isc_buffer_constinit(&b, testcases[i].namestr, len);
|
||||
isc_buffer_add(&b, len);
|
||||
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
isc_buffer_init(&nb, data, BUFSIZ);
|
||||
dns_name_setbuffer(&name, &nb);
|
||||
result = dns_name_fromtext(&name, &b, NULL, 0, NULL);
|
||||
|
|
@ -866,8 +866,8 @@ ISC_RUN_TEST_IMPL(getlabelsequence) {
|
|||
dns_name_t *n1, *n2;
|
||||
|
||||
/* target names */
|
||||
dns_name_init(&t1, NULL);
|
||||
dns_name_init(&t2, NULL);
|
||||
dns_name_init(&t1);
|
||||
dns_name_init(&t2);
|
||||
|
||||
/* source names */
|
||||
n1 = dns_fixedname_initname(&f1);
|
||||
|
|
|
|||
|
|
@ -301,7 +301,7 @@ check_struct_conversions(dns_rdata_t *rdata, size_t structsize,
|
|||
result = dns_rdata_hip_next(hip))
|
||||
{
|
||||
dns_name_t name;
|
||||
dns_name_init(&name, NULL);
|
||||
dns_name_init(&name);
|
||||
dns_rdata_hip_current(hip, &name);
|
||||
assert_int_not_equal(dns_name_countlabels(&name), 0);
|
||||
assert_true(dns_name_isabsolute(&name));
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ add_tsig(dst_context_t *tsigctx, dns_tsigkey_t *key, isc_buffer_t *target,
|
|||
tsig.common.rdclass = dns_rdataclass_any;
|
||||
tsig.common.rdtype = dns_rdatatype_tsig;
|
||||
ISC_LINK_INIT(&tsig.common, link);
|
||||
dns_name_init(&tsig.algorithm, NULL);
|
||||
dns_name_init(&tsig.algorithm);
|
||||
dns_name_clone(key->algorithm, &tsig.algorithm);
|
||||
|
||||
tsig.timesigned = now;
|
||||
|
|
|
|||
Loading…
Reference in a new issue