statd - only unregister/register once.

[nfs-utils.git] / utils / statd / monitor.c

diff --git a/utils/statd/monitor.c b/utils/statd/monitor.c
index 98cbf4a5940ba660bda50aa944f01769b0ee9ea4..b45208205b7baff811db49ba1e1d5d3132eb9989 100644 (file)
--- a/utils/statd/monitor.c
+++ b/utils/statd/monitor.c
@@ -19,6 +19,7 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <arpa/inet.h>
+#include <dirent.h>
 #include "misc.h"
 #include "statd.h"
 #include "notlist.h"
@@ -26,6 +27,7 @@
 
 notify_list *          rtnl = NULL;    /* Run-time notify list. */
 
+#define LINELEN (4*(8+1)+SM_PRIV_SIZE*2+1)
 
 /*
  * Services SM_MON requests.
@@ -42,7 +44,7 @@ sm_mon_1_svc(struct mon *argp, struct svc_req *rqstp)
        notify_list     *clnt;
        struct in_addr  my_addr;
 #ifdef RESTRICTED_STATD
-       struct in_addr  mon_addr, caller;
+       struct in_addr  caller;
 #else
        struct hostent  *hostinfo = NULL;
 #endif
@@ -87,6 +89,11 @@ sm_mon_1_svc(struct mon *argp, struct svc_req *rqstp)
                goto failure;
        }
 
+#if 0
+       This is not usable anymore.  Linux-kernel can be configured to use
+       host names with NSM so that multi-homed hosts are handled properly.
+               NeilBrown 15mar2007
+
        /* 3.   mon_name must be an address in dotted quad.
         *      Again, specific to the linux kernel lockd.
         */
@@ -96,22 +103,25 @@ sm_mon_1_svc(struct mon *argp, struct svc_req *rqstp)
                        mon_name);
                goto failure;
        }
-#else
+#endif
+#endif
        /*
         * Check hostnames.  If I can't look them up, I won't monitor.  This
         * might not be legal, but it adds a little bit of safety and sanity.
         */
 
        /* must check for /'s in hostname!  See CERT's CA-96.09 for details. */
-       if (strchr(mon_name, '/')) {
-               note(N_CRIT, "SM_MON request for hostname containing '/': %s",
-                       mon_name);
+       if (strchr(mon_name, '/') || mon_name[0] == '.') {
+               note(N_CRIT, "SM_MON request for hostname containing '/' "
+                    "or starting '.': %s", mon_name);
                note(N_CRIT, "POSSIBLE SPOOF/ATTACK ATTEMPT!");
                goto failure;
        } else if (gethostbyname(mon_name) == NULL) {
                note(N_WARNING, "gethostbyname error for %s", mon_name);
                goto failure;
-       } else if (!(hostinfo = gethostbyname(my_name))) {
+       }
+#ifndef RESTRICTED_STATD
+       if (!(hostinfo = gethostbyname(my_name))) {
                note(N_WARNING, "gethostbyname error for %s", my_name);
                goto failure;
        } else
@@ -173,13 +183,28 @@ sm_mon_1_svc(struct mon *argp, struct svc_req *rqstp)
 
        path=xmalloc(strlen(SM_DIR)+strlen(mon_name)+2);
        sprintf(path, "%s/%s", SM_DIR, mon_name);
-       if ((fd = open(path, O_WRONLY|O_SYNC|O_CREAT, S_IRUSR|S_IWUSR)) < 0) {
+       if ((fd = open(path, O_WRONLY|O_SYNC|O_CREAT|O_APPEND,
+                      S_IRUSR|S_IWUSR)) < 0) {
                /* Didn't fly.  We won't monitor. */
                note(N_ERROR, "creat(%s) failed: %s", path, strerror (errno));
                nlist_free(NULL, clnt);
                free(path);
                goto failure;
        }
+       {
+               char buf[LINELEN + 1 + SM_MAXSTRLEN + 2];
+               char *e;
+               int i;
+               e = buf + sprintf(buf, "%08x %08x %08x %08x ",
+                                 my_addr.s_addr, id->my_prog,
+                                 id->my_vers, id->my_proc);
+               for (i=0; i<SM_PRIV_SIZE; i++)
+                       e += sprintf(e, "%02x", 0xff & (argp->priv[i]));
+               if (e+1-buf != LINELEN) abort();
+               e += sprintf(e, " %s\n", mon_name);
+               write(fd, buf, e-buf);
+       }
+
        free(path);
        /* PRC: do the HA callout: */
        ha_callout("add-client", mon_name, my_name, -1);
@@ -196,6 +221,64 @@ failure:
        return (&result);
 }
 
+void load_state(void)
+{
+       DIR *d;
+       struct dirent *de;
+       char buf[LINELEN + 1 + SM_MAXSTRLEN + 2];
+
+       d = opendir(SM_DIR);
+       if (!d)
+               return;
+       while ((de = readdir(d))) {
+               char *path;
+               FILE *f;
+               int p;
+
+               if (de->d_name[0] == '.')
+                       continue;
+               path = xmalloc(strlen(SM_DIR)+strlen(de->d_name)+2);
+               sprintf(path, "%s/%s", SM_DIR, de->d_name);
+               f = fopen(path, "r");
+               free(path);
+               if (f == NULL)
+                       continue;
+               while (fgets(buf, sizeof(buf), f) != NULL) {
+                       int addr, proc, prog, vers;
+                       char priv[SM_PRIV_SIZE];
+                       char *b;
+                       int i;
+                       notify_list     *clnt;
+
+                       buf[sizeof(buf)-1] = 0;
+                       b = strchr(buf, '\n');
+                       if (b) *b = 0;
+                       sscanf(buf, "%x %x %x %x ",
+                              &addr, &prog, &vers, &proc);
+                       b = buf+36;
+                       for (i=0; i<SM_PRIV_SIZE; i++) {
+                               sscanf(b, "%2x", &p);
+                               priv[i] = p;
+                               b += 2;
+                       }
+                       b++;
+                       clnt = nlist_new("127.0.0.1", b, 0);
+                       if (!clnt)
+                               break;
+                       NL_ADDR(clnt).s_addr = addr;
+                       NL_MY_PROG(clnt) = prog;
+                       NL_MY_VERS(clnt) = vers;
+                       NL_MY_PROC(clnt) = proc;
+                       memcpy(NL_PRIV(clnt), priv, SM_PRIV_SIZE);
+                       nlist_insert(&rtnl, clnt);
+               }
+               fclose(f);
+       }
+       closedir(d);
+}
+
+
+
 
 /*
  * Services SM_UNMON requests.