sm-notify command: include <config.h>

[nfs-utils.git] / utils / statd / sm-notify.c

diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c
index 98c03f9d142656906d36bb7e558851d6b5328c6c..5a023949191ad160e1edb8f57a06f97b7cf445df 100644 (file)
--- a/utils/statd/sm-notify.c
+++ b/utils/statd/sm-notify.c
@@ -4,6 +4,10 @@
  * Copyright (C) 2004-2006 Olaf Kirch <okir@suse.de>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
@@ -76,7 +80,7 @@ static int            log_syslog = 0;
 
 static unsigned int    nsm_get_state(int);
 static void            notify(void);
-static void            notify_host(int, struct nsm_host *);
+static int             notify_host(int, struct nsm_host *);
 static void            recv_reply(int);
 static void            backup_hosts(const char *, const char *);
 static void            get_hosts(const char *);
@@ -86,7 +90,7 @@ static int            addr_get_port(nsm_address *);
 static void            addr_set_port(nsm_address *, int);
 static struct addrinfo *host_lookup(int, const char *);
 void                   nsm_log(int fac, const char *fmt, ...);
-static int             record_pid();
+static int             record_pid(void);
 static void            drop_privs(void);
 static void set_kernel_nsm_state(int state);
 
@@ -277,7 +281,7 @@ notify(void)
                if (failtime && now >= failtime)
                        break;
 
-               while ((wait = hosts->send_next - now) <= 0) {
+               while (hosts && ((wait = hosts->send_next - now) <= 0)) {
                        /* Never send more than 10 packets at once */
                        if (sent++ >= 10)
                                break;
@@ -286,7 +290,13 @@ notify(void)
                        hp = hosts;
                        hosts = hp->next;
 
-                       notify_host(sock, hp);
+                       if (notify_host(sock, hp)){
+                               unlink(hp->path);
+                               free(hp->name);
+                               free(hp->path);
+                               free(hp);
+                               continue;
+                       }
 
                        /* Set the timeout for this call, using an
                           exponential timeout strategy */
@@ -298,6 +308,8 @@ notify(void)
 
                        insert_host(hp);
                }
+               if (hosts == NULL)
+                       return;
 
                nsm_log(LOG_DEBUG, "Host %s due in %ld seconds",
                                hosts->name, wait);
@@ -318,7 +330,7 @@ notify(void)
 /*
  * Send notification to a single host
  */
-void
+int
 notify_host(int sock, struct nsm_host *host)
 {
        static unsigned int     xid = 0;
@@ -331,6 +343,16 @@ notify_host(int sock, struct nsm_host *host)
        if (!host->xid)
                host->xid = xid++;
 
+       if (host->ai == NULL) {
+               host->ai = host_lookup(AF_UNSPEC, host->name);
+               if (host->ai == NULL) {
+                       nsm_log(LOG_WARNING,
+                               "%s doesn't seem to be a valid address,"
+                               " skipped", host->name);
+                       return 1;
+               }
+       }
+
        memset(msgbuf, 0, sizeof(msgbuf));
        p = msgbuf;
        *p++ = htonl(host->xid);
@@ -343,14 +365,19 @@ notify_host(int sock, struct nsm_host *host)
         * point.
         */
        if (host->retries >= 4) {
-               struct addrinfo *hold = host->ai;
+               struct addrinfo *first = host->ai;
                struct addrinfo **next = &host->ai;
-               *next = hold->ai_next;
+
+               /* remove the first entry from the list */
+               host->ai = first->ai_next;
+               first->ai_next = NULL;
+               /* find the end of the list */
+               next = &first->ai_next;
                while ( *next )
                        next = & (*next)->ai_next;
-               *next = hold;
-               hold->ai_next = NULL;
-               memcpy(&host->addr, hold->ai_addr, hold->ai_addrlen);
+               /* put first entry at end */
+               *next = first;
+               memcpy(&host->addr, first->ai_addr, first->ai_addrlen);
                addr_set_port(&host->addr, 0);
                host->retries = 0;
        }
@@ -394,7 +421,11 @@ notify_host(int sock, struct nsm_host *host)
        }
        len = (p - msgbuf) << 2;
 
-       sendto(sock, msgbuf, len, 0, (struct sockaddr *) &dest, sizeof(dest));
+       if (sendto(sock, msgbuf, len, 0, (struct sockaddr *) &dest, sizeof(dest)) < 0)
+               nsm_log(LOG_WARNING, "Sending Reboot Notification to "
+                       "'%s' failed: errno %d (%s)", host->name, errno, strerror(errno));
+       
+       return 0;
 }
 
 /*
@@ -504,7 +535,7 @@ backup_hosts(const char *dirname, const char *bakname)
 }
 
 /*
- * Get all entries from sm.bak and convert them to host names
+ * Get all entries from sm.bak and convert them to host entries
  */
 static void
 get_hosts(const char *dirname)
@@ -532,15 +563,6 @@ get_hosts(const char *dirname)
                if (stat(path, &stb) < 0)
                        continue;
 
-               host->ai = host_lookup(AF_UNSPEC, de->d_name);
-               if (! host->ai) {
-                       nsm_log(LOG_WARNING,
-                               "%s doesn't seem to be a valid address, skipped",
-                               de->d_name);
-                       unlink(path);
-                       continue;
-               }
-
                host->last_used = stb.st_mtime;
                host->timeout = NSM_TIMEOUT;
                host->path = strdup(path);
@@ -730,7 +752,7 @@ nsm_log(int fac, const char *fmt, ...)
  * program exits.
  * If file already exists, fail.
  */
-static int record_pid()
+static int record_pid(void)
 {
        char pid[20];
        int fd;