#include <grp.h>
#ifndef BASEDIR
-#define BASEDIR "/var/lib/nfs"
+# ifdef NFS_STATEDIR
+# define BASEDIR NFS_STATEDIR
+# else
+# define BASEDIR "/var/lib/nfs"
+# endif
#endif
#define DEFAULT_SM_STATE_PATH BASEDIR "/state"
char * name;
char * path;
nsm_address addr;
+ struct addrinfo *ai;
time_t last_used;
time_t send_next;
unsigned int timeout;
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 void drop_privs(void);
if (optind < argc) {
usage: fprintf(stderr,
"Usage: sm-notify [-dfq] [-m max-retry-minutes] [-p srcport]\n"
- " [-P /path/to/state/directory] [-N my_host_name\n");
+ " [-P /path/to/state/directory] [-v my_host_name]\n");
return 1;
}
if (strcmp(_SM_BASE_PATH, BASEDIR) == 0) {
- if (record_pid() == 0 && force == 0 && opt_update_state == 0)
+ if (record_pid() == 0 && force == 0 && opt_update_state == 1)
/* already run, don't try again */
exit(0);
}
/* 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 */
}
*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 *hold = host->ai;
+ struct addrinfo **next = &host->ai;
+ *next = hold->ai_next;
+ while ( *next )
+ next = & (*next)->ai_next;
+ *next = hold;
+ hold->ai_next = NULL;
+ memcpy(&host->addr, hold->ai_addr, hold->ai_addrlen);
addr_set_port(&host->addr, 0);
host->retries = 0;
}
free(hp->name);
free(hp->path);
free(hp);
+ freeaddrinfo(hp->ai);
return;
}
}
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)) {
+ 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);
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;
}
}
-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;
-
- if (ai->ai_addrlen < sizeof(*addr)) {
- memcpy(addr, ai->ai_addr, ai->ai_addrlen);
- okay = 1;
- }
+ return NULL;
- freeaddrinfo(ai);
- return okay;
+ return ai;
}
/*
snprintf(pid, 20, "%d\n", getpid());
fd = open("/var/run/sm-notify.pid", O_CREAT|O_EXCL|O_WRONLY, 0600);
- if (!fd)
+ if (fd < 0)
return 0;
write(fd, pid, strlen(pid));
close(fd);