mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-23 10:28:08 +00:00
Code Issues Releases Wiki Activity

Add partial support for caching zone information.

Browse Source
This commit is contained in:
Ted Lemon 2000-05-01 23:26:38 +00:00
parent 38287932f1
commit 7f56c004ba
1 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
common/dns.c
View File

@ -42,7 +42,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: dns.c,v 1.21 2000/04/20 00:55:51 mellon Exp $ Copyright (c) 2000 The Internet Software Consortium. All rights reserved.\n"; "$Id: dns.c,v 1.22 2000/05/01 23:26:38 mellon Exp $ Copyright (c) 2000 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@ -133,16 +133,22 @@ struct hash_table *tsig_key_hash;
struct hash_table *dns_zone_hash; struct hash_table *dns_zone_hash;
#if defined (NSUPDATE) #if defined (NSUPDATE)
isc_result_t find_tsig_key (ns_tsig_key **key, const char *zname) isc_result_t find_tsig_key (ns_tsig_key **key, const char *zname,
struct dns_zone *zone)
{ {
struct dns_zone *zone;
isc_result_t status; isc_result_t status;
ns_tsig_key *tkey; ns_tsig_key *tkey;
#if 0
struct dns_zone *zone;
zone = (struct dns_zone *)0; zone = (struct dns_zone *)0;
status = dns_zone_lookup (&zone, zname); status = dns_zone_lookup (&zone, zname);
if (status != ISC_R_SUCCESS) if (status != ISC_R_SUCCESS)
return status; return status;
#else
if (!zone)
return ISC_R_NOTFOUND;
#endif
if (!zone -> key) { if (!zone -> key) {
dns_zone_dereference (&zone, MDL); dns_zone_dereference (&zone, MDL);
return ISC_R_KEY_UNKNOWN; return ISC_R_KEY_UNKNOWN;
@ -326,7 +332,8 @@ int dns_zone_dereference (ptr, file, line)
#if defined (NSUPDATE) #if defined (NSUPDATE)
int find_cached_zone (const char *dname, ns_class class, int find_cached_zone (const char *dname, ns_class class,
char *zname, size_t zsize, char *zname, size_t zsize,
struct in_addr *addrs, int naddrs) struct in_addr *addrs, int naddrs,
struct dns_zone **zcookie)
{ {
isc_result_t status = ISC_R_NOTFOUND; isc_result_t status = ISC_R_NOTFOUND;
const char *np; const char *np;
@ -334,6 +341,12 @@ int find_cached_zone (const char *dname, ns_class class,
struct data_string nsaddrs; struct data_string nsaddrs;
int aix; int aix;
/* The absence of the zcookie pointer indicates that we
succeeded previously, but the update itself failed, meaning
that we shouldn't use the cached zone. */
if (!zcookie)
return 0;
/* For each subzone, try to find a cached zone. */ /* For each subzone, try to find a cached zone. */
for (np = dname - 1; np; np = strchr (np, '.')) { for (np = dname - 1; np; np = strchr (np, '.')) {
np++; np++;
@ -345,9 +358,17 @@ int find_cached_zone (const char *dname, ns_class class,
if (status != ISC_R_SUCCESS) if (status != ISC_R_SUCCESS)
return 0; return 0;
/* Make sure the zone name will fit. */ /* Make sure the zone is valid. */
if (strlen (zone -> name) > zsize) if (zone -> timeout && zone -> timeout < cur_time) {
dns_zone_dereference (&zone, MDL);
return 0; return 0;
}
/* Make sure the zone name will fit. */
if (strlen (zone -> name) > zsize) {
dns_zone_dereference (&zone, MDL);
return 0;
}
strcpy (zname, zone -> name); strcpy (zname, zone -> name);
memset (&nsaddrs, 0, sizeof nsaddrs); memset (&nsaddrs, 0, sizeof nsaddrs);
@ -389,6 +410,30 @@ int find_cached_zone (const char *dname, ns_class class,
data_string_forget (&nsaddrs, MDL); data_string_forget (&nsaddrs, MDL);
} }
} }
/* It's not an error for zcookie to have a value here - actually,
it's quite likely, because res_nupdate cycles through all the
names in the update looking for their zones. */
if (!*zcookie)
dns_zone_reference (zcookie, zone, MDL);
dns_zone_dereference (&zone, MDL);
return aix; return aix;
} }
void forget_zone (struct dns_zone **zone)
{
dns_zone_dereference (zone, MDL);
}
void repudiate_zone (struct dns_zone **zone)
{
/* XXX Currently we're not differentiating between a cached
XXX zone and a zone that's been repudiated, which means
XXX that if we reap cached zones, we blow away repudiated
XXX zones. This isn't a big problem since we're not yet
XXX caching zones... :'} */
(*zone) -> timeout = cur_time - 1;
dns_zone_dereference (zone, MDL);
}
#endif /* NSUPDATE */ #endif /* NSUPDATE */