X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fstatd%2Fsm-notify.c;h=5a023949191ad160e1edb8f57a06f97b7cf445df;hp=bb6c2efa3f4e949191f4831757f7cf5e649eafa6;hb=37130ec4041bd703d706207d77b4398ea252be5a;hpb=dda3455d8b96a7b078bc00c113e1af15ed421d5b

diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c
index bb6c2ef..5a02394 100644
--- 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);
 
@@ -215,7 +219,9 @@ notify(void)
 	nsm_address local_addr;
 	time_t	failtime = 0;
 	int	sock = -1;
+	int retry_cnt = 0;
 
+ retry:
 	sock = socket(AF_INET, SOCK_DGRAM, 0);
 	if (sock < 0) {
 		perror("socket");
@@ -248,7 +254,16 @@ notify(void)
 			exit(1);
 		}
 	} else {
-		(void) bindresvport(sock, (struct sockaddr_in *) &local_addr);
+		struct servent *se;
+		struct sockaddr_in *sin = (struct sockaddr_in *)&local_addr;
+		(void) bindresvport(sock, sin);
+		/* try to avoid known ports */
+		se = getservbyport(sin->sin_port, "udp");
+		if (se && retry_cnt < 100) {
+			retry_cnt++;
+			close(sock);
+			goto retry;
+		}
 	}
 
 	if (opt_max_retry)
@@ -266,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;
@@ -275,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 */
@@ -287,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);
@@ -307,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;
@@ -320,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);
@@ -332,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;
 	}
@@ -383,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;
 }
 
 /*
@@ -493,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)
@@ -521,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);
@@ -719,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;