X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fstatd%2Fsm-notify.c;h=e5ca904e32665b04c0420c87e98e858b1174ffd6;hp=1059a888949cd21984837de1af31683fba90695f;hb=7862a784c2990b1f5330959d30069a637a041715;hpb=0210f16cf1bd2f87b7fe4336311c6dfd88030f8b diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c index 1059a88..e5ca904 100644 --- a/utils/statd/sm-notify.c +++ b/utils/statd/sm-notify.c @@ -4,6 +4,10 @@ * Copyright (C) 2004-2006 Olaf Kirch */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -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); @@ -130,7 +134,7 @@ main(int argc, char **argv) _SM_STATE_PATH == NULL || _SM_DIR_PATH == NULL || _SM_BAK_PATH == NULL) { - nsm_log(LOG_WARNING, "unable to allocate memory"); + nsm_log(LOG_ERR, "unable to allocate memory"); exit(1); } strcat(strcpy(_SM_STATE_PATH, _SM_BASE_PATH), "/state"); @@ -147,7 +151,7 @@ main(int argc, char **argv) usage: fprintf(stderr, "Usage: sm-notify [-dfq] [-m max-retry-minutes] [-p srcport]\n" " [-P /path/to/state/directory] [-v my_host_name]\n"); - return 1; + exit(1); } if (strcmp(_SM_BASE_PATH, BASEDIR) == 0) { @@ -160,8 +164,9 @@ usage: fprintf(stderr, strncpy(nsm_hostname, opt_srcaddr, sizeof(nsm_hostname)-1); } else if (gethostname(nsm_hostname, sizeof(nsm_hostname)) < 0) { - perror("gethostname"); - return 1; + nsm_log(LOG_ERR, "Failed to obtain name of local host: %s", + strerror(errno)); + exit(1); } backup_hosts(_SM_DIR_PATH, _SM_BAK_PATH); @@ -179,9 +184,9 @@ usage: fprintf(stderr, log_syslog = 1; if (daemon(0, 0) < 0) { - nsm_log(LOG_WARNING, "unable to background: %s", + nsm_log(LOG_ERR, "unable to background: %s", strerror(errno)); - return 1; + exit(1); } close(0); @@ -200,10 +205,10 @@ usage: fprintf(stderr, "Unable to notify %s, giving up", hp->name); } - return 1; + exit(1); } - return 0; + exit(0); } /* @@ -220,7 +225,8 @@ notify(void) retry: sock = socket(AF_INET, SOCK_DGRAM, 0); if (sock < 0) { - perror("socket"); + nsm_log(LOG_ERR, "Failed to create RPC socket: %s", + strerror(errno)); exit(1); } fcntl(sock, F_SETFL, O_NONBLOCK); @@ -232,13 +238,16 @@ notify(void) if (opt_srcaddr) { struct addrinfo *ai = host_lookup(AF_INET, opt_srcaddr); if (!ai) { - nsm_log(LOG_WARNING, - "Not a valid hostname or address: \"%s\"\n", + nsm_log(LOG_ERR, + "Not a valid hostname or address: \"%s\"", opt_srcaddr); exit(1); } - memcpy(&local_addr, ai->ai_addr, ai->ai_addrlen); + /* We know it's IPv4 at this point */ + memcpy(&local_addr, ai->ai_addr, ai->ai_addrlen); + + freeaddrinfo(ai); } /* Use source port if provided on the command line, @@ -246,14 +255,16 @@ notify(void) if (opt_srcport) { addr_set_port(&local_addr, opt_srcport); if (bind(sock, (struct sockaddr *) &local_addr, sizeof(local_addr)) < 0) { - perror("bind"); + nsm_log(LOG_ERR, "Failed to bind RPC socket: %s", + strerror(errno)); exit(1); } } else { struct servent *se; - (void) bindresvport(sock, (struct sockaddr_in *) &local_addr); + struct sockaddr_in *sin = (struct sockaddr_in *)&local_addr; + (void) bindresvport(sock, sin); /* try to avoid known ports */ - se = getservbyport(local_addr.sin_port, "udp"); + se = getservbyport(sin->sin_port, "udp"); if (se && retry_cnt < 100) { retry_cnt++; close(sock); @@ -276,7 +287,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; @@ -285,7 +296,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 */ @@ -297,6 +314,8 @@ notify(void) insert_host(hp); } + if (hosts == NULL) + return; nsm_log(LOG_DEBUG, "Host %s due in %ld seconds", hosts->name, wait); @@ -317,7 +336,7 @@ notify(void) /* * Send notification to a single host */ -void +int notify_host(int sock, struct nsm_host *host) { static unsigned int xid = 0; @@ -330,6 +349,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); @@ -342,14 +371,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; } @@ -393,7 +427,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; } /* @@ -457,7 +495,8 @@ recv_reply(int sock) * packet) */ if (p <= end) { - nsm_log(LOG_DEBUG, "Host %s notified successfully", hp->name); + nsm_log(LOG_DEBUG, "Host %s notified successfully", + hp->name); unlink(hp->path); free(hp->name); free(hp->path); @@ -481,7 +520,8 @@ backup_hosts(const char *dirname, const char *bakname) DIR *dir; if (!(dir = opendir(dirname))) { - perror(dirname); + nsm_log(LOG_WARNING, + "Failed to open %s: %s", dirname, strerror(errno)); return; } @@ -503,7 +543,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) @@ -513,7 +553,8 @@ get_hosts(const char *dirname) DIR *dir; if (!(dir = opendir(dirname))) { - perror(dirname); + nsm_log(LOG_WARNING, + "Failed to open %s: %s", dirname, strerror(errno)); return; } @@ -526,20 +567,15 @@ get_hosts(const char *dirname) continue; if (host == NULL) host = calloc(1, sizeof(*host)); + if (host == NULL) { + nsm_log(LOG_WARNING, "Unable to allocate memory"); + return; + } snprintf(path, sizeof(path), "%s/%s", dirname, de->d_name); 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); @@ -639,17 +675,17 @@ nsm_get_state(int update) snprintf(newfile, sizeof(newfile), "%s.new", _SM_STATE_PATH); if ((fd = open(newfile, O_CREAT|O_WRONLY, 0644)) < 0) { - nsm_log(LOG_WARNING, "Cannot create %s: %m", newfile); + nsm_log(LOG_ERR, "Cannot create %s: %m", newfile); exit(1); } if (write(fd, &state, sizeof(state)) != sizeof(state)) { - nsm_log(LOG_WARNING, + nsm_log(LOG_ERR, "Failed to write state to %s", newfile); exit(1); } close(fd); if (rename(newfile, _SM_STATE_PATH) < 0) { - nsm_log(LOG_WARNING, + nsm_log(LOG_ERR, "Cannot create %s: %m", _SM_STATE_PATH); exit(1); } @@ -729,7 +765,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; @@ -758,7 +794,7 @@ static void drop_privs(void) if (st.st_uid == 0) { nsm_log(LOG_WARNING, - "sm-notify running as root. chown %s to choose different user\n", + "sm-notify running as root. chown %s to choose different user", _SM_DIR_PATH); return; }