[src/trunk]: src/usr.sbin Convert to tirpc interface, and to be af-independent.

[fvdl <fvdl%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e56f71781586
branches:  trunk
changeset: 487577:e56f71781586
user:      fvdl <fvdl%NetBSD.org@localhost>
date:      Fri Jun 09 14:00:52 2000 +0000

description:
Convert to tirpc interface, and to be af-independent.

diffstat:

 usr.sbin/rpc.lockd/lock_proc.c  |  126 +++++++++++++++++++++++++++------------
 usr.sbin/rpc.lockd/lockd.c      |  105 +++++++++++++++++---------------
 usr.sbin/rpc.lockd/lockd_lock.c |    6 +-
 usr.sbin/rpc.lockd/lockd_lock.h |    4 +-
 usr.sbin/rpc.statd/stat_proc.c  |   15 +++-
 usr.sbin/rpc.statd/statd.c      |   25 ++-----
 6 files changed, 165 insertions(+), 116 deletions(-)

diffs (truncated from 582 to 300 lines):

diff -r ec7a950f140a -r e56f71781586 usr.sbin/rpc.lockd/lock_proc.c
--- a/usr.sbin/rpc.lockd/lock_proc.c    Fri Jun 09 13:30:42 2000 +0000
+++ b/usr.sbin/rpc.lockd/lock_proc.c    Fri Jun 09 14:00:52 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lock_proc.c,v 1.4 2000/06/07 14:34:40 bouyer Exp $     */
+/*     $NetBSD: lock_proc.c,v 1.5 2000/06/09 14:00:52 fvdl Exp $       */
 
 /*
  * Copyright (c) 1995
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: lock_proc.c,v 1.4 2000/06/07 14:34:40 bouyer Exp $");
+__RCSID("$NetBSD: lock_proc.c,v 1.5 2000/06/09 14:00:52 fvdl Exp $");
 #endif
 
 #include <sys/param.h>
@@ -48,6 +48,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <syslog.h>
+#include <netconfig.h>
 
 #include <rpc/rpc.h>
 #include <rpcsvc/sm_inter.h>
@@ -61,6 +62,7 @@
 #define        CLIENT_CACHE_LIFETIME   120     /* In seconds */
 
 static void    log_from_addr __P((char *, struct svc_req *));
+static int     addrcmp __P((struct sockaddr *, struct sockaddr *));
 
 /* log_from_addr ----------------------------------------------------------- */
 /*
@@ -74,17 +76,13 @@
        char *fun_name;
        struct svc_req *req;
 {
-       struct sockaddr_in *addr;
-       struct hostent *host;
-       char hostname_buf[40];
+       struct sockaddr *addr;
+       char hostname_buf[NI_MAXHOST];
 
-       addr = svc_getcaller(req->rq_xprt);
-       host = gethostbyaddr((char *)&(addr->sin_addr), addr->sin_len, AF_INET);
-       if (host) {
-               strncpy(hostname_buf, host->h_name, sizeof(hostname_buf));
-               hostname_buf[sizeof(hostname_buf) - 1] = '\0';
-       } else          /* No hostname available - print raw address */
-               strcpy(hostname_buf, inet_ntoa(addr->sin_addr));
+       addr = svc_getrpccaller(req->rq_xprt)->buf;
+       if (getnameinfo(addr , addr->sa_len, hostname_buf, sizeof hostname_buf,
+           NULL, 0, 0) != 0)
+               return;
 
        syslog(LOG_DEBUG, "%s from %s", fun_name, hostname_buf);
 }
@@ -120,17 +118,49 @@
  */
 static CLIENT *clnt_cache_ptr[CLIENT_CACHE_SIZE];
 static long clnt_cache_time[CLIENT_CACHE_SIZE];        /* time entry created */
-static struct in_addr clnt_cache_addr[CLIENT_CACHE_SIZE];
+static struct sockaddr_storage clnt_cache_addr[CLIENT_CACHE_SIZE];
 static int clnt_cache_next_to_use = 0;
 
+static int
+addrcmp(sa1, sa2)
+       struct sockaddr *sa1;
+       struct sockaddr *sa2;
+{
+       int len;
+       void *p1, *p2;
+
+       if (sa1->sa_family != sa2->sa_family)
+               return -1;
+
+       switch (sa1->sa_family) {
+       case AF_INET:
+               p1 = &((struct sockaddr_in *)sa1)->sin_addr;
+               p2 = &((struct sockaddr_in *)sa2)->sin_addr;
+               len = 4;
+               break;
+       case AF_INET6:
+               p1 = &((struct sockaddr_in6 *)sa1)->sin6_addr;
+               p2 = &((struct sockaddr_in6 *)sa2)->sin6_addr;
+               len = 16;
+               break;
+       default:
+               return -1;
+       }
+
+       return memcmp(p1, p2, len);
+}
+
 CLIENT *
 get_client(host_addr, vers)
-       struct sockaddr_in *host_addr;
-       u_long vers;
+       struct sockaddr *host_addr;
+       rpcvers_t vers;
 {
        CLIENT *client;
        struct timeval retry_time, time_now;
-       int i, sock_no;
+       int i;
+       char *netid;
+       struct netconfig *nconf;
+       char host[NI_MAXHOST];
 
        gettimeofday(&time_now, NULL);
 
@@ -150,8 +180,8 @@
                        clnt_cache_ptr[i] = NULL;
                        client = NULL;
                }
-               if (client && !memcmp(&clnt_cache_addr[i],
-                   &host_addr->sin_addr, sizeof(struct in_addr))) {
+               if (client && !addrcmp((struct sockaddr *)&clnt_cache_addr[i],
+                   host_addr)) {
                        /* Found it! */
                        if (debug_level > 3)
                                syslog(LOG_DEBUG, "Found CLIENT* in cache");
@@ -165,28 +195,47 @@
                clnt_cache_ptr[clnt_cache_next_to_use] = NULL;
        }
 
-       /* Create the new client handle */
-       sock_no = RPC_ANYSOCK;
-       retry_time.tv_sec = 5;
-       retry_time.tv_usec = 0;
-       host_addr->sin_port = 0; /* Force consultation with portmapper */
+       /*
+        * Need a host string for clnt_tp_create. Use NI_NUMERICHOST
+        * to avoid DNS lookups.
+        */
+       if (getnameinfo(host_addr, host_addr->sa_len, host, sizeof host,
+           NULL, 0, NI_NUMERICHOST) != 0) {
+               syslog(LOG_ERR, "unable to get name string for caller");
+               return NULL;
+       }
+
 #if 1
-       client = clntudp_create(host_addr, NLM_PROG, vers,
-           retry_time, &sock_no);
+       if (host_addr->sa_family == AF_INET6)
+               netid = "udp6";
+       else
+               netid = "udp";
 #else 
-       client = clnttcp_create(host_addr, NLM_PROG, vers,
-           &sock_no, 0, 0);
+       if (host_addr->sa_family == AF_INET6)
+               netid = "tcp6";
+       else
+               netid = "tcp";
 #endif
+       nconf = getnetconfigent(netid);
+       if (nconf == NULL) {
+               syslog(LOG_ERR, "could not get netconfig info for '%s': "
+                               "no /etc/netconfig file?", netid);
+               return NULL;
+       }
+
+       client = clnt_tp_create(host, NLM_PROG, vers, nconf);
+       freenetconfigent(nconf);
+
        if (!client) {
                syslog(LOG_ERR, clnt_spcreateerror("clntudp_create"));
-               syslog(LOG_ERR, "Unable to return result to %s",
-                   inet_ntoa(host_addr->sin_addr));
+               syslog(LOG_ERR, "Unable to return result to %s", host);
                return NULL;
        }
 
        /* Success - update the cache entry */
        clnt_cache_ptr[clnt_cache_next_to_use] = client;
-       clnt_cache_addr[clnt_cache_next_to_use] = host_addr->sin_addr;
+       memcpy(&clnt_cache_addr[clnt_cache_next_to_use], host_addr,
+           host_addr->sa_len);
        clnt_cache_time[clnt_cache_next_to_use] = time_now.tv_sec;
        if (++clnt_cache_next_to_use > CLIENT_CACHE_SIZE)
                clnt_cache_next_to_use = 0;
@@ -201,8 +250,7 @@
        clnt_control(client, CLSET_TIMEOUT, (char *)&retry_time);
 
        if (debug_level > 3)
-               syslog(LOG_DEBUG, "Created CLIENT* for %s",
-                   inet_ntoa(host_addr->sin_addr));
+               syslog(LOG_DEBUG, "Created CLIENT* for %s", host);
        return client;
 }
 
@@ -226,7 +274,7 @@
        struct timeval timeo;
        int success;
 
-       if ((cli = get_client((struct sockaddr_in *)addr, NLM_VERS)) != NULL) {
+       if ((cli = get_client(addr, NLM_VERS)) != NULL) {
                timeo.tv_sec = 0; /* No timeout - not expecting response */
                timeo.tv_usec = 0;
 
@@ -257,7 +305,7 @@
        struct timeval timeo;
        int success;
 
-       if ((cli = get_client((struct sockaddr_in *)addr, NLM_VERS4)) != NULL) {
+       if ((cli = get_client(addr, NLM_VERS4)) != NULL) {
                timeo.tv_sec = 0; /* No timeout - not expecting response */
                timeo.tv_usec = 0;
 
@@ -357,7 +405,7 @@
 {
        nlm_testres res;
        static char dummy;
-       struct sockaddr_in *addr;
+       struct sockaddr *addr;
        CLIENT *cli;
        int success;
        struct timeval timeo;
@@ -386,7 +434,7 @@
         * nlm_test has different result type to the other operations, so
         * can't use transmit_result() in this case
         */
-       addr = svc_getcaller(rqstp->rq_xprt);
+       addr = svc_getrpccaller(rqstp->rq_xprt)->buf;
        if ((cli = get_client(addr, NLM_VERS)) != NULL) {
                timeo.tv_sec = 0; /* No timeout - not expecting response */
                timeo.tv_usec = 0;
@@ -832,7 +880,7 @@
 {
        nlm4_testres res;
        static char dummy;
-       struct sockaddr_in *addr;
+       struct sockaddr *addr;
        CLIENT *cli;
        int success;
        struct timeval timeo;
@@ -856,7 +904,7 @@
         * nlm_test has different result type to the other operations, so
         * can't use transmit4_result() in this case
         */
-       addr = svc_getcaller(rqstp->rq_xprt);
+       addr = svc_getrpccaller(rqstp->rq_xprt)->buf;
        if ((cli = get_client(addr, NLM_VERS4)) != NULL) {
                timeo.tv_sec = 0; /* No timeout - not expecting response */
                timeo.tv_usec = 0;
@@ -1049,7 +1097,7 @@
        res.cookie = arg->cookie;
        res.stat.stat = nlm4_granted;
        transmit4_result(NLM4_GRANTED_RES, &res,
-           (struct sockaddr *)svc_getcaller(rqstp->rq_xprt));
+           (struct sockaddr *)svc_getrpccaller(rqstp->rq_xprt)->buf);
        return (NULL);
 }
 
diff -r ec7a950f140a -r e56f71781586 usr.sbin/rpc.lockd/lockd.c
--- a/usr.sbin/rpc.lockd/lockd.c        Fri Jun 09 13:30:42 2000 +0000
+++ b/usr.sbin/rpc.lockd/lockd.c        Fri Jun 09 14:00:52 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lockd.c,v 1.5 2000/06/07 14:34:40 bouyer Exp $ */
+/*     $NetBSD: lockd.c,v 1.6 2000/06/09 14:00:53 fvdl Exp $   */
 
 /*
  * Copyright (c) 1995
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: lockd.c,v 1.5 2000/06/07 14:34:40 bouyer Exp $");
+__RCSID("$NetBSD: lockd.c,v 1.6 2000/06/09 14:00:53 fvdl Exp $");
 #endif
 
 /*
@@ -45,6 +45,9 @@
  * The actual program logic is in the file lock_proc.c
  */
 
+#include <sys/types.h>
+#include <sys/socket.h>
+
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -54,6 +57,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <util.h>
+#include <netconfig.h>
 
 #include <rpc/rpc.h>
 #include <rpcsvc/sm_inter.h>
@@ -75,15 +79,18 @@
 
 void sigalarm_handler __P((int));
 
+char *transports[] = { "udp", "tcp", "udp6", "tcp6" };
+
 int
 main(argc, argv)