X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fstatd%2Fcallback.c;h=d5d036e9fc28357b3ef703f3da3005f7cee0ad06;hb=6ab9cdacd2ea314a837c7affb840aeeec620cb66;hp=e3fad6a4e87a1a1c99a719fbd598d49f04a03550;hpb=8b7ad01b14df1e7529b9ba8a1ea17df0d6004ef9;p=nfs-utils.git

diff --git a/utils/statd/callback.c b/utils/statd/callback.c
index e3fad6a..d5d036e 100644
--- a/utils/statd/callback.c
+++ b/utils/statd/callback.c
@@ -1,16 +1,21 @@
 /*
  * Copyright (C) 1995, 1997-1999 Jeffrey A. Uphoff
  * Modified by Olaf Kirch, Oct. 1996.
+ * Modified by Lon Hohberger, Oct. 2000.
  *
  * NSM for Linux.
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "misc.h"
 #include "statd.h"
 #include "notlist.h"
+#include <arpa/inet.h>
 
 /* Callback notify list. */
-notify_list *cbnl = NULL;
+/* notify_list *cbnl = NULL; ... never used */
 
 
 /* 
@@ -24,12 +29,17 @@ sm_notify_1_svc(struct stat_chge *argp, struct svc_req *rqstp)
 {
 	notify_list    *lp, *call;
 	static char    *result = NULL;
+	char *ip_addr = xstrdup(inet_ntoa(svc_getcaller(rqstp->rq_xprt)
+					  ->sin_addr));
 
-	dprintf(L_DEBUG, "Received SM_NOTIFY from %s, state: %d",
+	dprintf(N_DEBUG, "Received SM_NOTIFY from %s, state: %d",
 				argp->mon_name, argp->state);
 
-	if ((lp = rtnl) != NULL) {
-		log(L_WARNING, "SM_NOTIFY from %s--nobody looking!",
+	/* 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)) {
+		note(N_WARNING, "SM_NOTIFY from %s while not monitoring any hosts.",
 				argp->mon_name, argp->state);
 		return ((void *) &result);
 	}
@@ -39,15 +49,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);
 }