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=0eb0b09e5cdf28ca70ee7eb4030af634db594833;hb=37130ec4041bd703d706207d77b4398ea252be5a;hpb=4d53ca0ba7a855df0dea0808d395ee74c482dfb1 diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c index 0eb0b09..5a02394 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 @@ -56,6 +60,7 @@ struct nsm_host { char * name; char * path; nsm_address addr; + struct addrinfo *ai; time_t last_used; time_t send_next; unsigned int timeout; @@ -75,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 *); @@ -83,10 +88,11 @@ static void insert_host(struct nsm_host *); struct nsm_host * find_host(uint32_t); static int addr_get_port(nsm_address *); static void addr_set_port(nsm_address *, int); -static int host_lookup(int, const char *, nsm_address *); +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); static struct nsm_host * hosts = NULL; @@ -165,6 +171,10 @@ usage: fprintf(stderr, backup_hosts(_SM_DIR_PATH, _SM_BAK_PATH); get_hosts(_SM_BAK_PATH); + /* Get and update the NSM state. This will call sync() */ + nsm_state = nsm_get_state(opt_update_state); + set_kernel_nsm_state(nsm_state); + if (!opt_debug) { if (!opt_quiet) printf("Backgrounding to notify hosts...\n"); @@ -183,9 +193,6 @@ usage: fprintf(stderr, close(2); } - /* Get and update the NSM state. This will call sync() */ - nsm_state = nsm_get_state(opt_update_state); - notify(); if (hosts) { @@ -212,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"); @@ -225,12 +234,14 @@ notify(void) /* Bind source IP if provided on command line */ if (opt_srcaddr) { - if (!host_lookup(AF_INET, opt_srcaddr, &local_addr)) { + struct addrinfo *ai = host_lookup(AF_INET, opt_srcaddr); + if (!ai) { nsm_log(LOG_WARNING, "Not a valid hostname or address: \"%s\"\n", opt_srcaddr); exit(1); } + memcpy(&local_addr, ai->ai_addr, ai->ai_addrlen); /* We know it's IPv4 at this point */ } @@ -243,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) @@ -261,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; @@ -270,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 */ @@ -282,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); @@ -302,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; @@ -315,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); @@ -322,9 +360,24 @@ notify_host(int sock, struct nsm_host *host) *p++ = htonl(2); /* If we retransmitted 4 times, reset the port to force - * a new portmap lookup (in case statd was restarted) + * a new portmap lookup (in case statd was restarted). + * We also rotate through multiple IP addresses at this + * point. */ if (host->retries >= 4) { + struct addrinfo *first = host->ai; + struct addrinfo **next = &host->ai; + + /* 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; + /* 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; } @@ -368,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; } /* @@ -437,6 +494,7 @@ recv_reply(int sock) free(hp->name); free(hp->path); free(hp); + freeaddrinfo(hp->ai); return; } } @@ -477,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) @@ -502,20 +560,14 @@ get_hosts(const char *dirname) host = calloc(1, sizeof(*host)); snprintf(path, sizeof(path), "%s/%s", dirname, de->d_name); - if (!host_lookup(AF_UNSPEC, de->d_name, &host->addr)) { - nsm_log(LOG_WARNING, - "%s doesn't seem to be a valid address, skipped", - de->d_name); - unlink(path); - continue; - } - if (stat(path, &stb) < 0) continue; + host->last_used = stb.st_mtime; host->timeout = NSM_TIMEOUT; host->path = strdup(path); host->name = strdup(de->d_name); + host->retries = 100; /* force address retry */ insert_host(host); host = NULL; @@ -658,25 +710,19 @@ addr_set_port(nsm_address *addr, int port) } } -static int -host_lookup(int af, const char *name, nsm_address *addr) +static struct addrinfo * +host_lookup(int af, const char *name) { struct addrinfo hints, *ai; - int okay = 0; memset(&hints, 0, sizeof(hints)); hints.ai_family = af; + hints.ai_protocol = IPPROTO_UDP; if (getaddrinfo(name, NULL, &hints, &ai) != 0) - return 0; + return NULL; - if (ai->ai_addrlen < sizeof(*addr)) { - memcpy(addr, ai->ai_addr, ai->ai_addrlen); - okay = 1; - } - - freeaddrinfo(ai); - return okay; + return ai; } /* @@ -706,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; @@ -747,3 +793,16 @@ static void drop_privs(void) exit(1); } } + +static void set_kernel_nsm_state(int state) +{ + int fd; + + fd = open("/proc/sys/fs/nfs/nsm_local_state",O_WRONLY); + if (fd >= 0) { + char buf[20]; + snprintf(buf, sizeof(buf), "%d", state); + write(fd, buf, strlen(buf)); + close(fd); + } +}