Page MenuHomeFreeBSD
Files F146022213

D4472.diff
No OneTemporary
Actions

D4472.diff
View Options

Index: head/include/resolv.h
===================================================================
--- head/include/resolv.h
+++ head/include/resolv.h
@@ -57,7 +57,6 @@
#include <sys/types.h>
#include <sys/cdefs.h>
#include <sys/socket.h>
-#include <sys/timespec.h>
#include <stdio.h>
#include <arpa/nameser.h>
@@ -177,8 +176,7 @@
int res_h_errno; /*%< last one set for this context */
int _vcsock; /*%< PRIVATE: for res_send VC i/o */
u_int _flags; /*%< PRIVATE: see below */
- u_short reload_period; /*%< seconds between stat(resolv.conf)*/
- u_short _pad; /*%< make _u 64 bit aligned */
+ u_int _pad; /*%< make _u 64 bit aligned */
union {
/* On an 32-bit arch this means 512b total. */
char pad[72 - 4*sizeof (int) - 3*sizeof (void *)];
@@ -190,8 +188,6 @@
} _ext;
} _u;
u_char *_rnd; /*%< PRIVATE: random state */
- struct timespec conf_mtim; /*%< mod time of loaded resolv.conf */
- time_t conf_stat; /*%< time of last stat(resolv.conf) */
};
typedef struct __res_state *res_state;
Index: head/lib/libc/resolv/res_init.c
===================================================================
--- head/lib/libc/resolv/res_init.c
+++ head/lib/libc/resolv/res_init.c
@@ -228,7 +228,6 @@
statp->pfcode = 0;
statp->_vcsock = -1;
statp->_flags = 0;
- statp->reload_period = 2;
statp->qhook = NULL;
statp->rhook = NULL;
statp->_u._ext.nscount = 0;
@@ -238,6 +237,7 @@
statp->_u._ext.ext->nsaddrs[0].sin = statp->nsaddr;
strcpy(statp->_u._ext.ext->nsuffix, "ip6.arpa");
strcpy(statp->_u._ext.ext->nsuffix2, "ip6.int");
+ statp->_u._ext.ext->reload_period = 2;
} else {
/*
* Historically res_init() rarely, if at all, failed.
@@ -326,17 +326,13 @@
struct stat sb;
struct timespec now;
- if (_fstat(fileno(fp), &sb) == 0) {
- statp->conf_mtim = sb.st_mtim;
- if (clock_gettime(CLOCK_MONOTONIC_FAST, &now) == 0) {
- statp->conf_stat = now.tv_sec;
- } else {
- statp->conf_stat = 0;
- }
- } else {
- statp->conf_mtim.tv_sec = 0;
- statp->conf_mtim.tv_nsec = 0;
- statp->conf_stat = 0;
+ if (statp->_u._ext.ext != NULL) {
+ if (_fstat(fileno(fp), &sb) == 0) {
+ statp->_u._ext.ext->conf_mtim = sb.st_mtim;
+ if (clock_gettime(CLOCK_MONOTONIC_FAST, &now) == 0) {
+ statp->_u._ext.ext->conf_stat = now.tv_sec;
+ }
+ }
}
/* read the config file */
@@ -599,9 +595,7 @@
{
const char *cp = options;
int i;
-#ifndef _LIBC
struct __res_state_ext *ext = statp->_u._ext.ext;
-#endif
#ifdef DEBUG
if (statp->options & RES_DEBUG)
@@ -686,8 +680,10 @@
statp->options |= RES_NOCHECKNAME;
} else if (!strncmp(cp, "reload-period:",
sizeof("reload-period:") - 1)) {
- statp->reload_period = (u_short)
- atoi(cp + sizeof("reload-period:") - 1);
+ if (ext != NULL) {
+ ext->reload_period = (u_short)
+ atoi(cp + sizeof("reload-period:") - 1);
+ }
}
#ifdef RES_USE_EDNS0
else if (!strncmp(cp, "edns0", sizeof("edns0") - 1)) {
Index: head/lib/libc/resolv/res_private.h
===================================================================
--- head/lib/libc/resolv/res_private.h
+++ head/lib/libc/resolv/res_private.h
@@ -1,3 +1,5 @@
+/* $FreeBSD$ */
+
#ifndef res_private_h
#define res_private_h
@@ -12,6 +14,9 @@
} sort_list[MAXRESOLVSORT];
char nsuffix[64];
char nsuffix2[64];
+ struct timespec conf_mtim; /* mod time of loaded resolv.conf */
+ time_t conf_stat; /* time of last stat(resolv.conf) */
+ u_short reload_period; /* seconds between stat(resolv.conf) */
};
extern int
Index: head/lib/libc/resolv/res_state.c
===================================================================
--- head/lib/libc/resolv/res_state.c
+++ head/lib/libc/resolv/res_state.c
@@ -37,6 +37,8 @@
#include "reentrant.h"
#include "un-namespace.h"
+#include "res_private.h"
+
#undef _res
struct __res_state _res;
@@ -66,20 +68,26 @@
{
struct timespec now;
struct stat sb;
+ struct __res_state_ext *ext;
+
+ if ((statp->options & RES_INIT) == 0) {
+ return (statp);
+ }
- if ((statp->options & RES_INIT) == 0 || statp->reload_period == 0) {
+ ext = statp->_u._ext.ext;
+ if (ext == NULL || ext->reload_period == 0) {
return (statp);
}
if (clock_gettime(CLOCK_MONOTONIC_FAST, &now) != 0 ||
- (now.tv_sec - statp->conf_stat) < statp->reload_period) {
+ (now.tv_sec - ext->conf_stat) < ext->reload_period) {
return (statp);
}
- statp->conf_stat = now.tv_sec;
+ ext->conf_stat = now.tv_sec;
if (stat(_PATH_RESCONF, &sb) == 0 &&
- (sb.st_mtim.tv_sec != statp->conf_mtim.tv_sec ||
- sb.st_mtim.tv_nsec != statp->conf_mtim.tv_nsec)) {
+ (sb.st_mtim.tv_sec != ext->conf_mtim.tv_sec ||
+ sb.st_mtim.tv_nsec != ext->conf_mtim.tv_nsec)) {
statp->options &= ~RES_INIT;
}

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 28, 3:03 AM (8 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29049412
Default Alt Text
D4472.diff (4 KB)

Event Timeline