diff options
author | wpaul <wpaul@FreeBSD.org> | 1996-12-22 22:30:58 +0000 |
---|---|---|
committer | wpaul <wpaul@FreeBSD.org> | 1996-12-22 22:30:58 +0000 |
commit | c1aa3ecaa1541240fd02352141c42ab719ee6e88 (patch) | |
tree | 8fe710785aad94fb6f6a3c1a55e03c034c4b1748 /usr.sbin/ypserv/yp_main.c | |
parent | d389236bb21608788d7843fe717422b5eeb5af45 (diff) | |
download | FreeBSD-src-c1aa3ecaa1541240fd02352141c42ab719ee6e88.zip FreeBSD-src-c1aa3ecaa1541240fd02352141c42ab719ee6e88.tar.gz |
Big round o changes:
- yp_dblookup.c: Create non-DB specific database access functions.
Using these allows access to the underlying database functions without
needing explicit knowledge of Berkeley DB. (These are used only
when DB_CACHE is #defined. Other programs that use the non-caching
functions (yp_mkdb, ypxfr, yppush, rpc.yppasswdd) shouldn't notice
the difference.)
- yp_dnslookup: Implement async DNS lookups. We send our own DNS
requests using UDP and put the request in a queue. When the response
arrives, we use the ID in the header to find the corresponsing queue
entry and then send the response to the client. We can go about our
business and handle other YP requests in the meantime. This way, we
can deal with time consuming DNS requests without blocking and without
forking.
- yp_server.c: Convert to using new non-DB-specific database access
functions. This simplifies the code a bit and removes the need for
this module to know anything about Berkeley DB. Also convert the
ypproc_match_2_svc() function to use the async DNS lookup routines.
- yp_main.c: tweak yp_svc_run() to add the resolver socket to the
set of descriptors monitored in the select() loop. Also add a
timeout to select(); we may get stale DNS requests stuck in the
queue which we want to invalidate after a while. If the timeout
hits, we decrement the ttl on all pending DNS requests and nuke
those requests that aren't handled before ttl hits zero.
- yp_extern.h: Add prototypes for new stuff.
- yp_svc_udp.c (new file): The async resolver code needs to be able
to rummage around inside the RPC UDP transport handle in order to
work correcty. There's basically one transport handle, and each time
a request comes in, the transaction ID in the handle is changed.
This means that if we queue a DNS request, then we handle some other
unrelated requests, we will be unable to send the DNS response because
the transaction ID and remote address of the client that made the DNS
request will have been lost. What we need to do is save the client
address and transaction ID in the queue entry for the DNS request,
then put the transaction ID and address back in the transport handle
when we're ready to reply. (And then we have to undo the change so
as not to confuse any other part of the server.) The trouble is that
the transaction ID is hidden in an opaque part of the transport handle,
and only the code in the svc_udp module in the RPC library knows how
to handle it. This file contains a couple of functions that let us
read and set the transaction ID in spite of this. This is really a
dirty trick and I should be taken out and shot for even thinking about
it, but there's no other way to get this stuff to work.
- Makefile: add yp_svc_udp.c to SRCS.
Diffstat (limited to 'usr.sbin/ypserv/yp_main.c')
-rw-r--r-- | usr.sbin/ypserv/yp_main.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/usr.sbin/ypserv/yp_main.c b/usr.sbin/ypserv/yp_main.c index 5c22d89..db40ac6 100644 --- a/usr.sbin/ypserv/yp_main.c +++ b/usr.sbin/ypserv/yp_main.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: yp_main.c,v 1.6 1996/05/31 16:01:50 wpaul Exp $ + * $Id: yp_main.c,v 1.4 1996/12/22 15:54:03 wpaul Exp $ */ /* @@ -66,7 +66,7 @@ #define _RPCSVC_CLOSEDOWN 120 #ifndef lint -static const char rcsid[] = "$Id: yp_main.c,v 1.6 1996/05/31 16:01:50 wpaul Exp $"; +static const char rcsid[] = "$Id: yp_main.c,v 1.4 1996/12/22 15:54:03 wpaul Exp $"; #endif /* not lint */ int _rpcpmstart; /* Started by a port monitor ? */ static int _rpcfdtype; @@ -85,6 +85,7 @@ char *progname = "ypserv"; char *yp_dir = _PATH_YP; int debug = 0; int do_dns = 0; +int resfd; static void _msgout(char* msg) @@ -109,6 +110,7 @@ yp_svc_run() extern int forked; int pid; int fd_setsize = _rpc_dtablesize(); + struct timeval timeout = { RESOLVER_TIMEOUT, 0 }; /* Establish the identity of the parent ypserv process. */ pid = getpid(); @@ -119,8 +121,12 @@ yp_svc_run() #else readfds = svc_fds; #endif /* def FD_SETSIZE */ + + if (yp_dnsq_pending()) + FD_SET(resfd, &readfds); + switch (select(fd_setsize, &readfds, NULL, NULL, - (struct timeval *)0)) { + &timeout)) { case -1: if (errno == EINTR) { continue; @@ -128,8 +134,13 @@ yp_svc_run() perror("svc_run: - select failed"); return; case 0: - continue; + yp_prune_dnsq(); + break; default: + if (FD_ISSET(resfd, &readfds)) { + yp_run_dnsq(); + FD_CLR(resfd, &readfds); + } svc_getreqset(&readfds); if (forked && pid != getpid()) exit(0); @@ -230,6 +241,7 @@ main(argc, argv) } load_securenets(); + yp_init_resolver(); #ifdef DB_CACHE yp_init_dbs(); #endif |