X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=utils%2Fstatd%2Fsm-notify.c;h=72dcff436fd7f0d9a193dcba1198d1c3e8bfd10d;hb=9ccfe0fa5a43dfc4453b09e328565a6c8f999fe4;hp=76a378c3dd53f770379234d6818d9b5c99528ed6;hpb=69620a042d1151871a31f07ccd210b2dab49c628;p=nfs-utils.git diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c index 76a378c..72dcff4 100644 --- a/utils/statd/sm-notify.c +++ b/utils/statd/sm-notify.c @@ -118,17 +118,44 @@ static void smn_set_port(struct sockaddr *sap, const unsigned short port) } } -static struct addrinfo *smn_lookup(const sa_family_t family, const char *name) +static struct addrinfo *smn_lookup(const char *name) { struct addrinfo *ai, hint = { - .ai_family = family, +#if HAVE_DECL_AI_ADDRCONFIG + .ai_flags = AI_ADDRCONFIG, +#endif /* HAVE_DECL_AI_ADDRCONFIG */ + .ai_family = AF_INET, .ai_protocol = IPPROTO_UDP, }; + int error; + + error = getaddrinfo(name, NULL, &hint, &ai); + switch (error) { + case 0: + return ai; + case EAI_SYSTEM: + if (opt_debug) + nsm_log(LOG_ERR, "getaddrinfo(3): %s", + strerror(errno)); + break; + default: + if (opt_debug) + nsm_log(LOG_ERR, "getaddrinfo(3): %s", + gai_strerror(error)); + } - if (getaddrinfo(name, NULL, &hint, &ai) != 0) - return NULL; + return NULL; +} - return ai; +static void smn_forget_host(struct nsm_host *host) +{ + unlink(host->path); + free(host->path); + free(host->name); + if (host->ai) + freeaddrinfo(host->ai); + + free(host); } int @@ -189,10 +216,15 @@ usage: fprintf(stderr, exit(1); } + log_syslog = 1; + openlog("sm-notify", LOG_PID, LOG_DAEMON); + if (strcmp(_SM_BASE_PATH, BASEDIR) == 0) { - if (record_pid() == 0 && force == 0 && opt_update_state == 1) + if (record_pid() == 0 && force == 0 && opt_update_state == 1) { /* already run, don't try again */ + nsm_log(LOG_NOTICE, "Already notifying clients; Exiting!"); exit(0); + } } if (opt_srcaddr) { @@ -207,6 +239,12 @@ usage: fprintf(stderr, backup_hosts(_SM_DIR_PATH, _SM_BAK_PATH); get_hosts(_SM_BAK_PATH); + /* If there are not hosts to notify, just exit */ + if (!hosts) { + nsm_log(LOG_DEBUG, "No hosts to notify; exiting"); + return 0; + } + /* Get and update the NSM state. This will call sync() */ nsm_state = nsm_get_state(opt_update_state); set_kernel_nsm_state(nsm_state); @@ -215,9 +253,6 @@ usage: fprintf(stderr, if (!opt_quiet) printf("Backgrounding to notify hosts...\n"); - openlog("sm-notify", LOG_PID, LOG_DAEMON); - log_syslog = 1; - if (daemon(0, 0) < 0) { nsm_log(LOG_ERR, "unable to background: %s", strerror(errno)); @@ -272,7 +307,7 @@ notify(void) /* Bind source IP if provided on command line */ if (opt_srcaddr) { - struct addrinfo *ai = smn_lookup(AF_INET, opt_srcaddr); + struct addrinfo *ai = smn_lookup(opt_srcaddr); if (!ai) { nsm_log(LOG_ERR, "Not a valid hostname or address: \"%s\"", @@ -332,13 +367,8 @@ notify(void) hp = hosts; hosts = hp->next; - if (notify_host(sock, hp)){ - unlink(hp->path); - free(hp->name); - free(hp->path); - free(hp); + if (notify_host(sock, hp)) continue; - } /* Set the timeout for this call, using an exponential timeout strategy */ @@ -388,12 +418,12 @@ notify_host(int sock, struct nsm_host *host) host->xid = xid++; if (host->ai == NULL) { - host->ai = smn_lookup(AF_UNSPEC, host->name); + host->ai = smn_lookup(host->name); if (host->ai == NULL) { nsm_log(LOG_WARNING, - "%s doesn't seem to be a valid address," - " skipped", host->name); - return 1; + "DNS resolution of %s failed; " + "retrying later", host->name); + return 0; } } @@ -409,19 +439,27 @@ notify_host(int sock, struct nsm_host *host) * 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); + /* don't rotate if there is only one addrinfo */ + if (host->ai->ai_next == NULL) + memcpy(&host->addr, host->ai->ai_addr, + host->ai->ai_addrlen); + else { + 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); + } + smn_set_port((struct sockaddr *)&host->addr, 0); host->retries = 0; } @@ -537,11 +575,7 @@ recv_reply(int sock) if (p <= end) { nsm_log(LOG_DEBUG, "Host %s notified successfully", hp->name); - unlink(hp->path); - free(hp->name); - free(hp->path); - free(hp); - freeaddrinfo(hp->ai); + smn_forget_host(hp); return; } } @@ -771,7 +805,10 @@ static int record_pid(void) fd = open("/var/run/sm-notify.pid", O_CREAT|O_EXCL|O_WRONLY, 0600); if (fd < 0) return 0; - write(fd, pid, strlen(pid)); + if (write(fd, pid, strlen(pid)) != strlen(pid)) { + nsm_log(LOG_WARNING, "Writing to pid file failed: errno %d(%s)", + errno, strerror(errno)); + } close(fd); return 1; } @@ -807,12 +844,16 @@ static void drop_privs(void) static void set_kernel_nsm_state(int state) { int fd; + const char *file = "/proc/sys/fs/nfs/nsm_local_state"; - fd = open("/proc/sys/fs/nfs/nsm_local_state",O_WRONLY); + fd = open(file ,O_WRONLY); if (fd >= 0) { char buf[20]; snprintf(buf, sizeof(buf), "%d", state); - write(fd, buf, strlen(buf)); + if (write(fd, buf, strlen(buf)) != strlen(buf)) { + nsm_log(LOG_WARNING, "Writing to '%s' failed: errno %d (%s)", + file, errno, strerror(errno)); + } close(fd); } }