/*
* 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 */
/*
{
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);
}
* 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(¬ify, call);
}
- lp = NL_NEXT(lp);
- }
+
return ((void *) &result);
}