nfs-utils: Remove all uses of AI_ADDRCONFIG

[nfs-utils.git] / utils / statd / sm-notify.c

diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c
index 66a52eb93ca836b42ba86db2ec19f62dd5a4fbb5..b7f43715b5e536d284571a7a506aaed9942b3a7d 100644 (file)
--- a/utils/statd/sm-notify.c
+++ b/utils/statd/sm-notify.c
@@ -34,16 +34,14 @@
 #include "nsm.h"
 #include "nfsrpc.h"
 
-#ifndef HAVE_DECL_AI_ADDRCONFIG
-#define AI_ADDRCONFIG  0
-#endif
-
 #define NSM_TIMEOUT    2
 #define NSM_MAX_TIMEOUT        120     /* don't make this too big */
 
 struct nsm_host {
        struct nsm_host *       next;
        char *                  name;
+       char *                  mon_name;
+       char *                  my_name;
        struct addrinfo         *ai;
        time_t                  last_used;
        time_t                  send_next;
@@ -52,7 +50,7 @@ struct nsm_host {
        uint32_t                xid;
 };
 
-static char            nsm_hostname[256];
+static char            nsm_hostname[SM_MAXSTRLEN + 1];
 static int             nsm_state;
 static int             nsm_family = AF_INET;
 static int             opt_debug = 0;
@@ -76,7 +74,6 @@ smn_lookup(const char *name)
 {
        struct addrinfo *ai = NULL;
        struct addrinfo hint = {
-               .ai_flags       = AI_ADDRCONFIG,
                .ai_family      = (nsm_family == AF_INET ? AF_INET: AF_UNSPEC),
                .ai_protocol    = (int)IPPROTO_UDP,
        };
@@ -93,7 +90,8 @@ smn_lookup(const char *name)
 
 __attribute_malloc__
 static struct nsm_host *
-smn_alloc_host(const char *hostname, const time_t timestamp)
+smn_alloc_host(const char *hostname, const char *mon_name,
+               const char *my_name, const time_t timestamp)
 {
        struct nsm_host *host;
 
@@ -102,7 +100,14 @@ smn_alloc_host(const char *hostname, const time_t timestamp)
                goto out_nomem;
 
        host->name = strdup(hostname);
-       if (host->name == NULL) {
+       host->mon_name = strdup(mon_name);
+       host->my_name = strdup(my_name);
+       if (host->name == NULL ||
+           host->mon_name == NULL ||
+           host->my_name == NULL) {
+               free(host->my_name);
+               free(host->mon_name);
+               free(host->name);
                free(host);
                goto out_nomem;
        }
@@ -120,10 +125,13 @@ out_nomem:
 
 static void smn_forget_host(struct nsm_host *host)
 {
-       xlog(D_CALL, "Removing %s from notify list", host->name);
+       xlog(D_CALL, "Removing %s (%s, %s) from notify list",
+                       host->name, host->mon_name, host->my_name);
 
-       nsm_delete_notified_host(host->name);
+       nsm_delete_notified_host(host->name, host->mon_name, host->my_name);
 
+       free(host->my_name);
+       free(host->mon_name);
        free(host->name);
        if (host->ai)
                freeaddrinfo(host->ai);
@@ -134,12 +142,12 @@ static void smn_forget_host(struct nsm_host *host)
 static unsigned int
 smn_get_host(const char *hostname,
                __attribute__ ((unused)) const struct sockaddr *sap,
-               __attribute__ ((unused)) const struct mon *m,
-               const time_t timestamp)
+               const struct mon *m, const time_t timestamp)
 {
        struct nsm_host *host;
 
-       host = smn_alloc_host(hostname, timestamp);
+       host = smn_alloc_host(hostname,
+               m->mon_id.mon_name, m->mon_id.my_id.my_name, timestamp);
        if (host == NULL)
                return 0;
 
@@ -399,12 +407,33 @@ usage:            fprintf(stderr,
                }
        }
 
-       if (opt_srcaddr) {
-               strncpy(nsm_hostname, opt_srcaddr, sizeof(nsm_hostname)-1);
-       } else
-       if (gethostname(nsm_hostname, sizeof(nsm_hostname)) < 0) {
-               xlog(L_ERROR, "Failed to obtain name of local host: %m");
-               exit(1);
+       if (opt_srcaddr != NULL) {
+               struct addrinfo *ai = NULL;
+               struct addrinfo hint = {
+                       .ai_family      = AF_UNSPEC,
+                       .ai_flags       = AI_NUMERICHOST,
+               };
+
+               if (getaddrinfo(opt_srcaddr, NULL, &hint, &ai))
+                       /* not a presentation address - use it */
+                       strncpy(nsm_hostname, opt_srcaddr, sizeof(nsm_hostname));
+               else {
+                       /* was a presentation address - look it up in
+                        * /etc/hosts, so it can be used for my_name */
+                       int error;
+
+                       freeaddrinfo(ai);
+                       hint.ai_flags = AI_CANONNAME;
+                       error = getaddrinfo(opt_srcaddr, NULL, &hint, &ai);
+                       if (error != 0) {
+                               xlog(L_ERROR, "Bind address %s is unusable: %s",
+                                               opt_srcaddr, gai_strerror(error));
+                               exit(1);
+                       }
+                       strncpy(nsm_hostname, ai->ai_canonname,
+                                                       sizeof(nsm_hostname));
+                       freeaddrinfo(ai);
+               }
        }
 
        (void)nsm_retire_monitored_hosts();
@@ -522,6 +551,8 @@ notify(const int sock)
 static int
 notify_host(int sock, struct nsm_host *host)
 {
+       const char *my_name = (opt_srcaddr != NULL ?
+                                       nsm_hostname : host->my_name);
        struct sockaddr *sap;
        socklen_t salen;
 
@@ -567,8 +598,8 @@ notify_host(int sock, struct nsm_host *host)
                host->xid = nsm_xmit_rpcbind(sock, sap, SM_PROG, SM_VERS);
        else
                host->xid = nsm_xmit_notify(sock, sap, salen,
-                               SM_PROG, nsm_hostname, nsm_state);
-       
+                                       SM_PROG, my_name, nsm_state);
+
        return 0;
 }
 
@@ -598,15 +629,28 @@ recv_rpcbind_reply(struct sockaddr *sap, struct nsm_host *host, XDR *xdr)
 }
 
 /*
- * Successful NOTIFY call. Server returns void, so nothing
- * we need to do here.
+ * Successful NOTIFY call. Server returns void.
+ *
+ * Try sending another SM_NOTIFY with an unqualified "my_name"
+ * argument.  Reuse the port number.  If "my_name" is already
+ * unqualified, we're done.
  */
 static void
 recv_notify_reply(struct nsm_host *host)
 {
-       xlog(D_GENERAL, "Host %s notified successfully", host->name);
+       char *dot = strchr(host->my_name, '.');
 
-       smn_forget_host(host);
+       if (dot != NULL) {
+               *dot = '\0';
+               host->send_next = time(NULL);
+               host->xid = 0;
+               if (host->timeout >= NSM_MAX_TIMEOUT / 4)
+                       host->timeout = NSM_MAX_TIMEOUT / 4;
+               insert_host(host);
+       } else {
+               xlog(D_GENERAL, "Host %s notified successfully", host->name);
+               smn_forget_host(host);
+       }
 }
 
 /*