1995-12-16 20:54:17 +00:00
|
|
|
/*
|
|
|
|
* Copyright (c) 1995
|
|
|
|
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
|
|
* must display the following acknowledgement:
|
|
|
|
* This product includes software developed by Bill Paul.
|
|
|
|
* 4. Neither the name of the author nor the names of any co-contributors
|
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL Bill Paul OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
1997-10-29 07:25:05 +00:00
|
|
|
#ifndef lint
|
|
|
|
static const char rcsid[] =
|
Fix a bug in the database handle caching. This has to do with the way the
underlying database code works. When dealing with first/next queries, you
have the notion of a database 'cursor,' which is essentially a file pointer
for the database. To select the first entry, you do a fetch with the
R_FIRST flag set, then you can use the R_NEXT flag to enumerate the other
entries in the database. Unfortunately, doing a direct fetch with no flag
does _not_ set the 'cursor,' so you can't do a direct fetch and then
enumerate the table from there.
The bug is that cached handles generated as the result of a YPPROC_MATCH
were being treated as though they were the same as handles generated by
a YPPROC_FIRST, which is not the case. The manifestation is that if you
do a 'ypmatch first-key-in-map map' followed by a yp_first()/yp_next()
pair, the yp_first() and yp_next() both return the first key in the
table, which makes the entry appear to be duplicated.
A couple smaller things since I'm here:
- yp_main.c and yp_error.c both have a global 'int debug' in them.
For some reason, our cc/ld doesn't flag this as a multiply defined
symbol even though it should. Removed the declaration from yp_main.c;
we want the one in yp_error.c.
- The Makefile wasn't installing ypinit in the right place.
1998-02-11 19:15:32 +00:00
|
|
|
"$Id: yp_main.c,v 1.1 1997/11/09 20:54:38 wpaul Exp wpaul $";
|
1997-10-29 07:25:05 +00:00
|
|
|
#endif /* not lint */
|
|
|
|
|
1995-12-16 20:54:17 +00:00
|
|
|
/*
|
|
|
|
* ypserv startup function.
|
|
|
|
* We need out own main() since we have to do some additional work
|
|
|
|
* that rpcgen won't do for us. Most of this file was generated using
|
|
|
|
* rpcgen.new, and later modified.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "yp.h"
|
1997-10-29 07:25:05 +00:00
|
|
|
#include <err.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <memory.h>
|
1995-12-16 20:54:17 +00:00
|
|
|
#include <stdio.h>
|
1997-10-29 07:25:05 +00:00
|
|
|
#include <signal.h>
|
1995-12-16 20:54:17 +00:00
|
|
|
#include <stdlib.h> /* getenv, exit */
|
|
|
|
#include <string.h> /* strcmp */
|
1997-10-29 07:25:05 +00:00
|
|
|
#include <syslog.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <rpc/pmap_clnt.h> /* for pmap_unset */
|
1995-12-16 20:54:17 +00:00
|
|
|
#include <sys/ttycom.h> /* TIOCNOTTY */
|
|
|
|
#ifdef __cplusplus
|
|
|
|
#include <sysent.h> /* getdtablesize, open */
|
|
|
|
#endif /* __cplusplus */
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <sys/wait.h>
|
|
|
|
#include "yp_extern.h"
|
|
|
|
#include <rpc/rpc.h>
|
|
|
|
|
|
|
|
#ifndef SIG_PF
|
|
|
|
#define SIG_PF void(*)(int)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#define _RPCSVC_CLOSEDOWN 120
|
|
|
|
int _rpcpmstart; /* Started by a port monitor ? */
|
|
|
|
static int _rpcfdtype;
|
|
|
|
/* Whether Stream or Datagram ? */
|
|
|
|
/* States a server can be in wrt request */
|
|
|
|
|
|
|
|
#define _IDLE 0
|
|
|
|
#define _SERVED 1
|
|
|
|
#define _SERVING 2
|
|
|
|
|
1996-12-30 15:32:43 +00:00
|
|
|
extern void ypprog_1 __P((struct svc_req *, register SVCXPRT *));
|
|
|
|
extern void ypprog_2 __P((struct svc_req *, register SVCXPRT *));
|
1996-12-03 02:37:39 +00:00
|
|
|
extern int _rpc_dtablesize __P((void));
|
1995-12-16 20:54:17 +00:00
|
|
|
extern int _rpcsvcstate; /* Set when a request is serviced */
|
|
|
|
char *progname = "ypserv";
|
|
|
|
char *yp_dir = _PATH_YP;
|
Fix a bug in the database handle caching. This has to do with the way the
underlying database code works. When dealing with first/next queries, you
have the notion of a database 'cursor,' which is essentially a file pointer
for the database. To select the first entry, you do a fetch with the
R_FIRST flag set, then you can use the R_NEXT flag to enumerate the other
entries in the database. Unfortunately, doing a direct fetch with no flag
does _not_ set the 'cursor,' so you can't do a direct fetch and then
enumerate the table from there.
The bug is that cached handles generated as the result of a YPPROC_MATCH
were being treated as though they were the same as handles generated by
a YPPROC_FIRST, which is not the case. The manifestation is that if you
do a 'ypmatch first-key-in-map map' followed by a yp_first()/yp_next()
pair, the yp_first() and yp_next() both return the first key in the
table, which makes the entry appear to be duplicated.
A couple smaller things since I'm here:
- yp_main.c and yp_error.c both have a global 'int debug' in them.
For some reason, our cc/ld doesn't flag this as a multiply defined
symbol even though it should. Removed the declaration from yp_main.c;
we want the one in yp_error.c.
- The Makefile wasn't installing ypinit in the right place.
1998-02-11 19:15:32 +00:00
|
|
|
/*int debug = 0;*/
|
1995-12-16 20:54:17 +00:00
|
|
|
int do_dns = 0;
|
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.
1996-12-22 22:30:58 +00:00
|
|
|
int resfd;
|
1995-12-16 20:54:17 +00:00
|
|
|
|
|
|
|
static
|
|
|
|
void _msgout(char* msg)
|
|
|
|
{
|
|
|
|
if (debug) {
|
|
|
|
if (_rpcpmstart)
|
|
|
|
syslog(LOG_ERR, msg);
|
|
|
|
else
|
1997-10-29 07:25:05 +00:00
|
|
|
warnx("%s", msg);
|
1995-12-16 20:54:17 +00:00
|
|
|
} else
|
|
|
|
syslog(LOG_ERR, msg);
|
|
|
|
}
|
|
|
|
|
1996-12-03 02:37:39 +00:00
|
|
|
static void
|
|
|
|
yp_svc_run()
|
|
|
|
{
|
|
|
|
#ifdef FD_SETSIZE
|
|
|
|
fd_set readfds;
|
|
|
|
#else
|
|
|
|
int readfds;
|
|
|
|
#endif /* def FD_SETSIZE */
|
|
|
|
extern int forked;
|
|
|
|
int pid;
|
|
|
|
int fd_setsize = _rpc_dtablesize();
|
1996-12-30 18:51:59 +00:00
|
|
|
struct timeval timeout;
|
1996-12-03 02:37:39 +00:00
|
|
|
|
|
|
|
/* Establish the identity of the parent ypserv process. */
|
|
|
|
pid = getpid();
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
#ifdef FD_SETSIZE
|
|
|
|
readfds = svc_fdset;
|
|
|
|
#else
|
|
|
|
readfds = svc_fds;
|
|
|
|
#endif /* def FD_SETSIZE */
|
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.
1996-12-22 22:30:58 +00:00
|
|
|
|
1996-12-25 18:10:35 +00:00
|
|
|
FD_SET(resfd, &readfds);
|
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.
1996-12-22 22:30:58 +00:00
|
|
|
|
1996-12-30 18:51:59 +00:00
|
|
|
timeout.tv_sec = RESOLVER_TIMEOUT;
|
|
|
|
timeout.tv_usec = 0;
|
1996-12-03 02:37:39 +00:00
|
|
|
switch (select(fd_setsize, &readfds, NULL, NULL,
|
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.
1996-12-22 22:30:58 +00:00
|
|
|
&timeout)) {
|
1996-12-03 02:37:39 +00:00
|
|
|
case -1:
|
|
|
|
if (errno == EINTR) {
|
|
|
|
continue;
|
|
|
|
}
|
1997-10-29 07:25:05 +00:00
|
|
|
warn("svc_run: - select failed");
|
1996-12-03 02:37:39 +00:00
|
|
|
return;
|
|
|
|
case 0:
|
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.
1996-12-22 22:30:58 +00:00
|
|
|
yp_prune_dnsq();
|
|
|
|
break;
|
1996-12-03 02:37:39 +00:00
|
|
|
default:
|
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.
1996-12-22 22:30:58 +00:00
|
|
|
if (FD_ISSET(resfd, &readfds)) {
|
|
|
|
yp_run_dnsq();
|
|
|
|
FD_CLR(resfd, &readfds);
|
|
|
|
}
|
1996-12-03 02:37:39 +00:00
|
|
|
svc_getreqset(&readfds);
|
|
|
|
if (forked && pid != getpid())
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1995-12-16 20:54:17 +00:00
|
|
|
static void unregister()
|
|
|
|
{
|
|
|
|
(void) pmap_unset(YPPROG, YPVERS);
|
1996-02-26 02:34:27 +00:00
|
|
|
(void) pmap_unset(YPPROG, YPOLDVERS);
|
1995-12-16 20:54:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void reaper(sig)
|
|
|
|
int sig;
|
|
|
|
{
|
|
|
|
int status;
|
|
|
|
|
1996-02-24 22:01:48 +00:00
|
|
|
if (sig == SIGHUP) {
|
|
|
|
load_securenets();
|
Performance enhancements (I hope) and new stuff:
yp_dblookup.c:
- Implement database handle caching. What this means is that instead
of opening and closing map databases for each request, we open a
database and save the handle (and, if requested, the key index)
in an array. This saves a bit of overhead on things like repeated
YPPROC_NEXT calls, such as you'd get from getpwent(). Normally,
each YPPROC_NEXT would require open()ing the database, seeking
to the location supplied by the caller (which is time consuming with
hash databases as the R_CURSOR flag doesn't work), reading the
data, close()ing the database and then shipping the data off to
the caller. The system call overhead is prohibitive, especially
with very large maps. By caching the handle to an open database,
we elimitate at least the open()/close() system calls, as well
as the associated DB setup and tear-down operations, for a large
percentage of the time. This improves performance substantially at
the cost of consuming a little more memory than before.
Note that all the caching support is surrounded by #ifdef DB_CACHE
so that this same source module can still be used by other programs
that don't need it.
- Make yp_open_db() call yp_validdomain(). Doing it here saves cycles
when caching is enabled since a hit on the map cache list by
definition means that the domain being referenced is valid.
- Also make yp_open_db() check for exhaustion of file descriptors,
just in case.
yp_server.c:
- Reorganize things a little to take advantage of the database
handle caching. Add a call to yp_flush_all() in ypproc_clear_2_svc().
- Remove calls to yp_validdomain() from some of the service procedures.
yp_validdomain() is called inside yp_open_db() now, so procedures that
call into the database package don't need to use yp_validdomain()
themselves.
- Fix a bogosity in ypproc_maplist_2_svc(): don't summarily initiallize
the result.maps pointer to NULL. This causes yp_maplist_free()
to fail and leaks memory.
- Make ypproc_master_2_svc() copy the string it gets from the database
package into a private static buffer before trying to NUL terminate it.
This is necessary with the DB handle caching: stuffing a NUL into the
data returned by DB package will goof it up internally.
yp_main.c:
- Stuff for DB handle caching: call yp_init_dbs() to clear the
handle array and add call to yp_flush_all() to the SIGHUP
signal handler.
Makefile.yp:
- Reorganize to deal with database caching. yp_mkdb(8) can now be used
to send a YPPROC_CLEAR signal to ypserv(8). Call it after each map
is created to refresh ypserv's cache.
- Add support for mail.alias map.
Contributed by Mike Murphy (mrm@sceard.com).
- Make default location for the netgroups source file be /var/yp/netgroup
instead of /etc/netgroup.
mkaliases:
- New file: script to generate mail.alias map.
Contributed by Mike Murphy (mrm@sceard.com).
Makefile:
- Install Makefile.yp as /var/yp/Makefile.dist and link it to
/var/yp/Makefile only if /var/yp/Makefile doesn't already exist.
Suggested by Peter Wemm.
- Install new mkaliases script in /usr/libexec along with mknetid.
- Use somewhat saner approach to generating rpcgen-dependent files
as suggested by Garrett Wollman.
1996-04-28 04:38:52 +00:00
|
|
|
#ifdef DB_CACHE
|
|
|
|
yp_flush_all();
|
|
|
|
#endif
|
1996-02-24 22:01:48 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1995-12-16 20:54:17 +00:00
|
|
|
if (sig == SIGCHLD) {
|
|
|
|
while (wait3(&status, WNOHANG, NULL) > 0)
|
|
|
|
children--;
|
|
|
|
} else {
|
|
|
|
unregister();
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void usage()
|
|
|
|
{
|
1997-10-29 07:25:05 +00:00
|
|
|
fprintf(stderr, "usage: ypserv [-h] [-d] [-n] [-p path]\n");
|
1995-12-16 20:54:17 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
closedown(int sig)
|
|
|
|
{
|
|
|
|
if (_rpcsvcstate == _IDLE) {
|
|
|
|
extern fd_set svc_fdset;
|
|
|
|
static int size;
|
|
|
|
int i, openfd;
|
|
|
|
|
|
|
|
if (_rpcfdtype == SOCK_DGRAM) {
|
|
|
|
unregister();
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
if (size == 0) {
|
|
|
|
size = getdtablesize();
|
|
|
|
}
|
|
|
|
for (i = 0, openfd = 0; i < size && openfd < 2; i++)
|
|
|
|
if (FD_ISSET(i, &svc_fdset))
|
|
|
|
openfd++;
|
|
|
|
if (openfd <= 1) {
|
|
|
|
unregister();
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (_rpcsvcstate == _SERVED)
|
|
|
|
_rpcsvcstate = _IDLE;
|
|
|
|
|
|
|
|
(void) signal(SIGALRM, (SIG_PF) closedown);
|
|
|
|
(void) alarm(_RPCSVC_CLOSEDOWN/2);
|
|
|
|
}
|
|
|
|
|
1997-10-29 07:25:05 +00:00
|
|
|
int
|
1995-12-16 20:54:17 +00:00
|
|
|
main(argc, argv)
|
|
|
|
int argc;
|
|
|
|
char *argv[];
|
|
|
|
{
|
1995-12-23 21:35:35 +00:00
|
|
|
register SVCXPRT *transp = NULL;
|
1995-12-16 20:54:17 +00:00
|
|
|
int sock;
|
1995-12-23 21:35:35 +00:00
|
|
|
int proto = 0;
|
1995-12-16 20:54:17 +00:00
|
|
|
struct sockaddr_in saddr;
|
|
|
|
int asize = sizeof (saddr);
|
|
|
|
int ch;
|
|
|
|
|
1997-03-31 05:11:47 +00:00
|
|
|
while ((ch = getopt(argc, argv, "hdnp:")) != -1) {
|
1995-12-16 20:54:17 +00:00
|
|
|
switch(ch) {
|
|
|
|
case 'd':
|
1995-12-23 21:35:35 +00:00
|
|
|
debug = ypdb_debug = 1;
|
1995-12-16 20:54:17 +00:00
|
|
|
break;
|
|
|
|
case 'n':
|
|
|
|
do_dns = 1;
|
|
|
|
break;
|
|
|
|
case 'p':
|
|
|
|
yp_dir = optarg;
|
|
|
|
break;
|
|
|
|
case 'h':
|
|
|
|
default:
|
|
|
|
usage();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1996-02-24 22:01:48 +00:00
|
|
|
load_securenets();
|
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.
1996-12-22 22:30:58 +00:00
|
|
|
yp_init_resolver();
|
Performance enhancements (I hope) and new stuff:
yp_dblookup.c:
- Implement database handle caching. What this means is that instead
of opening and closing map databases for each request, we open a
database and save the handle (and, if requested, the key index)
in an array. This saves a bit of overhead on things like repeated
YPPROC_NEXT calls, such as you'd get from getpwent(). Normally,
each YPPROC_NEXT would require open()ing the database, seeking
to the location supplied by the caller (which is time consuming with
hash databases as the R_CURSOR flag doesn't work), reading the
data, close()ing the database and then shipping the data off to
the caller. The system call overhead is prohibitive, especially
with very large maps. By caching the handle to an open database,
we elimitate at least the open()/close() system calls, as well
as the associated DB setup and tear-down operations, for a large
percentage of the time. This improves performance substantially at
the cost of consuming a little more memory than before.
Note that all the caching support is surrounded by #ifdef DB_CACHE
so that this same source module can still be used by other programs
that don't need it.
- Make yp_open_db() call yp_validdomain(). Doing it here saves cycles
when caching is enabled since a hit on the map cache list by
definition means that the domain being referenced is valid.
- Also make yp_open_db() check for exhaustion of file descriptors,
just in case.
yp_server.c:
- Reorganize things a little to take advantage of the database
handle caching. Add a call to yp_flush_all() in ypproc_clear_2_svc().
- Remove calls to yp_validdomain() from some of the service procedures.
yp_validdomain() is called inside yp_open_db() now, so procedures that
call into the database package don't need to use yp_validdomain()
themselves.
- Fix a bogosity in ypproc_maplist_2_svc(): don't summarily initiallize
the result.maps pointer to NULL. This causes yp_maplist_free()
to fail and leaks memory.
- Make ypproc_master_2_svc() copy the string it gets from the database
package into a private static buffer before trying to NUL terminate it.
This is necessary with the DB handle caching: stuffing a NUL into the
data returned by DB package will goof it up internally.
yp_main.c:
- Stuff for DB handle caching: call yp_init_dbs() to clear the
handle array and add call to yp_flush_all() to the SIGHUP
signal handler.
Makefile.yp:
- Reorganize to deal with database caching. yp_mkdb(8) can now be used
to send a YPPROC_CLEAR signal to ypserv(8). Call it after each map
is created to refresh ypserv's cache.
- Add support for mail.alias map.
Contributed by Mike Murphy (mrm@sceard.com).
- Make default location for the netgroups source file be /var/yp/netgroup
instead of /etc/netgroup.
mkaliases:
- New file: script to generate mail.alias map.
Contributed by Mike Murphy (mrm@sceard.com).
Makefile:
- Install Makefile.yp as /var/yp/Makefile.dist and link it to
/var/yp/Makefile only if /var/yp/Makefile doesn't already exist.
Suggested by Peter Wemm.
- Install new mkaliases script in /usr/libexec along with mknetid.
- Use somewhat saner approach to generating rpcgen-dependent files
as suggested by Garrett Wollman.
1996-04-28 04:38:52 +00:00
|
|
|
#ifdef DB_CACHE
|
|
|
|
yp_init_dbs();
|
|
|
|
#endif
|
1995-12-16 20:54:17 +00:00
|
|
|
if (getsockname(0, (struct sockaddr *)&saddr, &asize) == 0) {
|
|
|
|
int ssize = sizeof (int);
|
|
|
|
|
|
|
|
if (saddr.sin_family != AF_INET)
|
|
|
|
exit(1);
|
|
|
|
if (getsockopt(0, SOL_SOCKET, SO_TYPE,
|
|
|
|
(char *)&_rpcfdtype, &ssize) == -1)
|
|
|
|
exit(1);
|
|
|
|
sock = 0;
|
|
|
|
_rpcpmstart = 1;
|
|
|
|
proto = 0;
|
1997-10-29 07:25:05 +00:00
|
|
|
openlog("ypserv", LOG_PID, LOG_DAEMON);
|
1995-12-16 20:54:17 +00:00
|
|
|
} else {
|
|
|
|
if (!debug) {
|
|
|
|
if (daemon(0,0)) {
|
1996-05-31 16:01:51 +00:00
|
|
|
err(1,"cannot fork");
|
1995-12-16 20:54:17 +00:00
|
|
|
}
|
1997-10-29 07:25:05 +00:00
|
|
|
openlog("ypserv", LOG_PID, LOG_DAEMON);
|
1995-12-16 20:54:17 +00:00
|
|
|
}
|
|
|
|
sock = RPC_ANYSOCK;
|
|
|
|
(void) pmap_unset(YPPROG, YPVERS);
|
1996-02-26 02:34:27 +00:00
|
|
|
(void) pmap_unset(YPPROG, 1);
|
1995-12-16 20:54:17 +00:00
|
|
|
}
|
|
|
|
|
1996-02-26 02:34:27 +00:00
|
|
|
if ((_rpcfdtype == 0) || (_rpcfdtype == SOCK_DGRAM)) {
|
1995-12-16 20:54:17 +00:00
|
|
|
transp = svcudp_create(sock);
|
|
|
|
if (transp == NULL) {
|
1997-10-29 07:25:05 +00:00
|
|
|
_msgout("cannot create udp service");
|
1995-12-16 20:54:17 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (!_rpcpmstart)
|
|
|
|
proto = IPPROTO_UDP;
|
1996-02-26 02:34:27 +00:00
|
|
|
if (!svc_register(transp, YPPROG, YPOLDVERS, ypprog_1, proto)) {
|
1997-10-29 07:25:05 +00:00
|
|
|
_msgout("unable to register (YPPROG, YPOLDVERS, udp)");
|
1995-12-16 20:54:17 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (!svc_register(transp, YPPROG, YPVERS, ypprog_2, proto)) {
|
1997-10-29 07:25:05 +00:00
|
|
|
_msgout("unable to register (YPPROG, YPVERS, udp)");
|
1995-12-16 20:54:17 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((_rpcfdtype == 0) || (_rpcfdtype == SOCK_STREAM)) {
|
|
|
|
transp = svctcp_create(sock, 0, 0);
|
|
|
|
if (transp == NULL) {
|
1997-10-29 07:25:05 +00:00
|
|
|
_msgout("cannot create tcp service");
|
1995-12-16 20:54:17 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (!_rpcpmstart)
|
|
|
|
proto = IPPROTO_TCP;
|
1996-02-26 02:34:27 +00:00
|
|
|
if (!svc_register(transp, YPPROG, YPOLDVERS, ypprog_1, proto)) {
|
1997-10-29 07:25:05 +00:00
|
|
|
_msgout("unable to register (YPPROG, YPOLDVERS, tcp)");
|
1996-02-26 02:34:27 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
1995-12-16 20:54:17 +00:00
|
|
|
if (!svc_register(transp, YPPROG, YPVERS, ypprog_2, proto)) {
|
1997-10-29 07:25:05 +00:00
|
|
|
_msgout("unable to register (YPPROG, YPVERS, tcp)");
|
1995-12-16 20:54:17 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (transp == (SVCXPRT *)NULL) {
|
|
|
|
_msgout("could not create a handle");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (_rpcpmstart) {
|
|
|
|
(void) signal(SIGALRM, (SIG_PF) closedown);
|
|
|
|
(void) alarm(_RPCSVC_CLOSEDOWN/2);
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Make sure SIGPIPE doesn't blow us away while servicing TCP
|
|
|
|
* connections.
|
|
|
|
*/
|
|
|
|
(void) signal(SIGPIPE, SIG_IGN);
|
|
|
|
(void) signal(SIGCHLD, (SIG_PF) reaper);
|
|
|
|
(void) signal(SIGTERM, (SIG_PF) reaper);
|
|
|
|
(void) signal(SIGINT, (SIG_PF) reaper);
|
|
|
|
(void) signal(SIGHUP, (SIG_PF) reaper);
|
|
|
|
yp_svc_run();
|
|
|
|
_msgout("svc_run returned");
|
|
|
|
exit(1);
|
|
|
|
/* NOTREACHED */
|
|
|
|
}
|