mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 15:45:25 +00:00
Code Issues Releases Wiki Activity

libdns refactoring: get rid of two versions of dns_byaddr_createptrname

Browse Source
This commit is contained in:
Witold Kręcicki
2018-04-03 13:10:07 +02:00
parent f0a07b7546
commit d76ed0da1c
8 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/delv/delv.c
View File

@@ -1540,7 +1540,7 @@ get_reverse(char *reverse, size_t len, char *value, isc_boolean_t strict) {
dns_fixedname_init(&fname); dns_fixedname_init(&fname);
name = dns_fixedname_name(&fname); name = dns_fixedname_name(&fname);
result = dns_byaddr_createptrname2(&addr, options, name); result = dns_byaddr_createptrname(&addr, options, name);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
return (result); return (result);
dns_name_format(name, reverse, (unsigned int)len); dns_name_format(name, reverse, (unsigned int)len);

2
bin/dig/dighost.c
View File

@@ -355,7 +355,7 @@ get_reverse(char *reverse, size_t len, char *value, isc_boolean_t ip6_int,
options |= DNS_BYADDROPT_IPV6INT; options |= DNS_BYADDROPT_IPV6INT;
dns_fixedname_init(&fname); dns_fixedname_init(&fname);
name = dns_fixedname_name(&fname); name = dns_fixedname_name(&fname);
result = dns_byaddr_createptrname2(&addr, options, name); result = dns_byaddr_createptrname(&addr, options, name);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
return (result); return (result);
dns_name_format(name, reverse, (unsigned int)len); dns_name_format(name, reverse, (unsigned int)len);

2
bin/tests/system/dyndb/driver/syncptr.c
View File

@@ -119,7 +119,7 @@ syncptr_find_zone(sample_instance_t *inst, dns_rdata_t *rdata,
* @example * @example
* 192.168.0.1 -> 1.0.168.192.in-addr.arpa * 192.168.0.1 -> 1.0.168.192.in-addr.arpa
*/ */
CHECK(dns_byaddr_createptrname2(&isc_ip, 0, name)); CHECK(dns_byaddr_createptrname(&isc_ip, 0, name));
/* Find a zone containing owner name of the PTR record. */ /* Find a zone containing owner name of the PTR record. */
result = dns_zt_find(inst->view->zonetable, name, 0, NULL, zone); result = dns_zt_find(inst->view->zonetable, name, 0, NULL, zone);

2
bin/tools/mdig.c
View File

@@ -1004,7 +1004,7 @@ get_reverse(char *reverse, size_t len, const char *value,
options |= DNS_BYADDROPT_IPV6INT; options |= DNS_BYADDROPT_IPV6INT;
dns_fixedname_init(&fname); dns_fixedname_init(&fname);
name = dns_fixedname_name(&fname); name = dns_fixedname_name(&fname);
result = dns_byaddr_createptrname2(&addr, options, name); result = dns_byaddr_createptrname(&addr, options, name);
CHECK("dns_byaddr_createptrname2", result); CHECK("dns_byaddr_createptrname2", result);
dns_name_format(name, reverse, (unsigned int)len); dns_name_format(name, reverse, (unsigned int)len);
return; return;

19
lib/dns/byaddr.c
View File

@@ -43,21 +43,8 @@ static char hex_digits[] = {
}; };
isc_result_t isc_result_t
dns_byaddr_createptrname(const isc_netaddr_t *address, isc_boolean_t nibble, dns_byaddr_createptrname(const isc_netaddr_t *address, unsigned int options,
dns_name_t *name) dns_name_t *name)
{
/*
* We dropped bitstring labels, so all lookups will use nibbles.
*/
UNUSED(nibble);
return (dns_byaddr_createptrname2(address,
DNS_BYADDROPT_IPV6INT, name));
}
isc_result_t
dns_byaddr_createptrname2(const isc_netaddr_t *address, unsigned int options,
dns_name_t *name)
{ {
char textname[128]; char textname[128];
const unsigned char *bytes; const unsigned char *bytes;
@@ -245,8 +232,8 @@ dns_byaddr_create(isc_mem_t *mctx, const isc_netaddr_t *address,
dns_fixedname_init(&byaddr->name); dns_fixedname_init(&byaddr->name);
result = dns_byaddr_createptrname2(address, options, result = dns_byaddr_createptrname(address, options,
dns_fixedname_name(&byaddr->name)); dns_fixedname_name(&byaddr->name));
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto cleanup_lock; goto cleanup_lock;

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

@@ -141,12 +141,8 @@ dns_byaddr_destroy(dns_byaddr_t **byaddrp);
*/ */
isc_result_t isc_result_t
dns_byaddr_createptrname(const isc_netaddr_t *address, isc_boolean_t nibble, dns_byaddr_createptrname(const isc_netaddr_t *address, unsigned int options,
dns_name_t *name); dns_name_t *name);
isc_result_t
dns_byaddr_createptrname2(const isc_netaddr_t *address, unsigned int options,
dns_name_t *name);
/*%< /*%<
* Creates a name that would be used in a PTR query for this address. The * Creates a name that would be used in a PTR query for this address. The
* nibble flag indicates that the 'nibble' format is to be used if an IPv6 * nibble flag indicates that the 'nibble' format is to be used if an IPv6

1
lib/dns/win32/libdns.def.in
View File

@@ -68,7 +68,6 @@ dns_badcache_print
dns_byaddr_cancel dns_byaddr_cancel
dns_byaddr_create dns_byaddr_create
dns_byaddr_createptrname dns_byaddr_createptrname
dns_byaddr_createptrname2
dns_byaddr_destroy dns_byaddr_destroy
dns_cache_attach dns_cache_attach
dns_cache_attachdb dns_cache_attachdb

2
lib/irs/getnameinfo.c
View File

@@ -292,7 +292,7 @@ getnameinfo(const struct sockaddr *sa, IRS_GETNAMEINFO_SOCKLEN_T salen,
isc_netaddr_fromsockaddr(&netaddr, (const isc_sockaddr_t *)sa); isc_netaddr_fromsockaddr(&netaddr, (const isc_sockaddr_t *)sa);
dns_fixedname_init(&ptrfname); dns_fixedname_init(&ptrfname);
ptrname = dns_fixedname_name(&ptrfname); ptrname = dns_fixedname_name(&ptrfname);
iresult = dns_byaddr_createptrname2(&netaddr, 0, ptrname); iresult = dns_byaddr_createptrname(&netaddr, 0, ptrname);
if (iresult != ISC_R_SUCCESS) if (iresult != ISC_R_SUCCESS)
ERR(EAI_FAIL); ERR(EAI_FAIL);