X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fstatd%2Fcallback.c;h=2f98aeb2adb468ae6e6d79a38a11d2a4a8346f8c;hp=c9c686d4f1c437c346c3652836981255fee88397;hb=e4719f90f77de2ea2c083cbc304b5cc7a7b516bd;hpb=c7f54cc9a23167dea6bdc3e93834d070efa7e7e7

diff --git a/utils/statd/callback.c b/utils/statd/callback.c
index c9c686d..2f98aeb 100644
--- a/utils/statd/callback.c
+++ b/utils/statd/callback.c
@@ -6,7 +6,14 @@
  * NSM for Linux.
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <arpa/inet.h>
+
+#include "rpcmisc.h"
+#include "misc.h"
 #include "statd.h"
 #include "notlist.h"
 
@@ -25,16 +32,16 @@ sm_notify_1_svc(struct stat_chge *argp, struct svc_req *rqstp)
 {
 	notify_list    *lp, *call;
 	static char    *result = NULL;
+	struct sockaddr_in *sin = nfs_getrpccaller_in(rqstp->rq_xprt);
+	char *ip_addr = xstrdup(inet_ntoa(sin->sin_addr));
 
-	dprintf(L_DEBUG, "Received SM_NOTIFY from %s, state: %d",
+	xlog(D_CALL, "Received SM_NOTIFY from %s, state: %d",
 				argp->mon_name, argp->state);
 
 	/* quick check - don't bother if we're not monitoring anyone */
-	/* LH - this was != MULL, meaning that if anyone _was_ in our RTNL,
-	 * we'd never pass this point. */
-	if (!(lp = rtnl)) {
-		log(L_WARNING, "SM_NOTIFY from %s while not monitoring any hosts.",
-				argp->mon_name, argp->state);
+	if (rtnl == NULL) {
+		xlog_warn("SM_NOTIFY from %s while not monitoring any hosts",
+				argp->mon_name);
 		return ((void *) &result);
 	}
 
@@ -43,15 +50,15 @@ sm_notify_1_svc(struct stat_chge *argp, struct svc_req *rqstp)
 	 * it. Lockd will want to continue monitoring the remote host
 	 * until it issues an SM_UNMON call.
 	 */
-	while ((lp = nlist_gethost(lp, argp->mon_name, 0)) != NULL) {
-		if (NL_STATE(lp) != argp->state) {
+	for (lp = rtnl ; lp ; lp = lp->next)
+		if (NL_STATE(lp) != argp->state &&
+		    (matchhostname(argp->mon_name, lp->dns_name) ||
+		     matchhostname(ip_addr, lp->dns_name))) {
 			NL_STATE(lp) = argp->state;
 			call = nlist_clone(lp);
-			NL_TYPE(call) = NOTIFY_CALLBACK;
 			nlist_insert(&notify, call);
 		}
-		lp = NL_NEXT(lp);
-	}
+
 
 	return ((void *) &result);
 }