libexport.a: Factor SUBNETWORK checking out of check_client()

Clean up:  Factor the MCL_SUBNETWORK case out of check_client() and
client_checkaddr().  This will make it easier to add IPv6 support
eventually.

The logic in the new helper function will get a little more tangled
once IPv6 support is introduced.  Each slot in the clp address list
eventually may contain an address from either address family.

Note that the switch statement in client_checkaddr() is redundant,
since clp->cl_mtype is loop invariant.  This change makes SUBNETWORK
client checking more computationally efficient, at the cost of a few
extra lines of code.

This commit should not change code behavior in any way.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/support/export/client.c b/support/export/client.c
index 833f4a9d954320565fce0aa6c01a83da8fa8ebd0..42bf45ad5724468c0f23beb33e27c839da909957 100644 (file)
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -350,6 +350,27 @@ check_fqdn(const nfs_client *clp, const struct hostent *hp)
        return 0;
 }
 
        return 0;
 }
 

+/*
+ * Check each address listed in @hp against the subnetwork or
+ * host address stored in @clp.  Return 1 if an address in @hp
+ * matches the host address stored in @clp, otherwise zero.
+ */
+static int
+check_subnetwork(const nfs_client *clp, const struct hostent *hp)
+{
+       struct in_addr addr;
+       char **ap;
+
+       for (ap = hp->h_addr_list; *ap; ap++) {
+               addr = *(struct in_addr *)*ap;
+
+               if (!((clp->m_addrlist[0].s_addr ^ addr.s_addr) &
+                     clp->m_addrlist[1].s_addr))
+                       return 1;
+       }
+       return 0;
+}
+

 /*
  * Match a host (given its hostent record) to a client record. This
  * is usually called from mountd.
 /*
  * Match a host (given its hostent record) to a client record. This
  * is usually called from mountd.


@@ -365,11 +386,7 @@ client_check(nfs_client *clp, struct hostent *hp)
        case MCL_FQDN:
                return check_fqdn(clp, hp);
        case MCL_SUBNETWORK:
        case MCL_FQDN:
                return check_fqdn(clp, hp);
        case MCL_SUBNETWORK:

-               for (ap = hp->h_addr_list; *ap; ap++) {
-                       if (client_checkaddr(clp, *(struct in_addr *) *ap))
-                               return 1;
-               }
-               return 0;
+               return check_subnetwork(clp, hp);

        case MCL_WILDCARD:
                if (wildmat(hname, cname))
                        return 1;
        case MCL_WILDCARD:
                if (wildmat(hname, cname))
                        return 1;


@@ -434,11 +451,6 @@ client_check(nfs_client *clp, struct hostent *hp)
 static int
 client_checkaddr(nfs_client *clp, struct in_addr addr)
 {
 static int
 client_checkaddr(nfs_client *clp, struct in_addr addr)
 {

-       switch (clp->m_type) {
-       case MCL_SUBNETWORK:
-               return !((clp->m_addrlist[0].s_addr ^ addr.s_addr)
-                       & clp->m_addrlist[1].s_addr);
-       }

        return 0;
 }
 
        return 0;
 }