diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2010-01-14 12:23:19 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2010-01-15 14:55:51 -0500 |
| commit | cbd3a131e5c02bbd7b92a72b3ac467d71cfee1c4 (patch) | |
| tree | 026b19a8311b83c5bf9a16edd7299020ff528a07 /utils/statd/monitor.c | |
| parent | f0d3a4bedccca7cce48296757bc1c8bd59b80828 (diff) | |
| download | nfs-utils-cbd3a131e5c02bbd7b92a72b3ac467d71cfee1c4.tar.gz nfs-utils-cbd3a131e5c02bbd7b92a72b3ac467d71cfee1c4.tar.xz nfs-utils-cbd3a131e5c02bbd7b92a72b3ac467d71cfee1c4.zip | |
statd: Introduce statd version of matchhostname()
For the near future, statd will support IPv6 but exportfs will not.
Thus statd will need a version of matchhostname() that can deal
properly with IPv6 remotes. To reduce the risk of breaking exportfs,
introduce a separate version of matchhostname() for statd to use while
exportfs continues to use the existing AF_INET-only implementation.
Note that statd will never send matchhostname() a hostname string
containing export wildcards, so is_hostame() is not needed in the
statd version of matchhostname(). This saves some computational
expense when comparing hostnames.
A separate statd-specific implementation of matchhostname() allows
some flexibility in the long term, as well. We might want to enrich
the matching heuristics of our SM_NOTIFY, for example, or replace
them entirely with a heuristic that is not dependent upon DNS.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'utils/statd/monitor.c')
| -rw-r--r-- | utils/statd/monitor.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/utils/statd/monitor.c b/utils/statd/monitor.c index f818b2b..51075b5 100644 --- a/utils/statd/monitor.c +++ b/utils/statd/monitor.c @@ -22,7 +22,6 @@ #include <dirent.h> #include "rpcmisc.h" -#include "misc.h" #include "nsm.h" #include "statd.h" #include "notlist.h" @@ -145,7 +144,7 @@ sm_mon_1_svc(struct mon *argp, struct svc_req *rqstp) clnt = rtnl; while ((clnt = nlist_gethost(clnt, mon_name, 0))) { - if (matchhostname(NL_MY_NAME(clnt), my_name) && + if (statd_matchhostname(NL_MY_NAME(clnt), my_name) && NL_MY_PROC(clnt) == id->my_proc && NL_MY_PROG(clnt) == id->my_prog && NL_MY_VERS(clnt) == id->my_vers && @@ -298,7 +297,7 @@ sm_unmon_1_svc(struct mon_id *argp, struct svc_req *rqstp) * entry winds up in the list the way I'm currently handling them.) */ while ((clnt = nlist_gethost(clnt, mon_name, 0))) { - if (matchhostname(NL_MY_NAME(clnt), my_name) && + if (statd_matchhostname(NL_MY_NAME(clnt), my_name) && NL_MY_PROC(clnt) == id->my_proc && NL_MY_PROG(clnt) == id->my_prog && NL_MY_VERS(clnt) == id->my_vers) { |