X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=support%2Fexport%2Fclient.c;h=21ad2724dab64cecb400cedf275b0b35332e19cf;hb=291b329ad1f5a65270097f4ec3a8dd465df42669;hp=20d662af0c4efe69fe09a0456468b0d2b6f9605e;hpb=aa4b66b12b631885ed85f3ebe97e68b033407178;p=nfs-utils.git diff --git a/support/export/client.c b/support/export/client.c index 20d662a..21ad272 100644 --- a/support/export/client.c +++ b/support/export/client.c @@ -17,7 +17,7 @@ #include #include #include -#include "xmalloc.h" + #include "misc.h" #include "nfslib.h" #include "exportfs.h" @@ -30,8 +30,6 @@ extern int innetgr(char *netgr, char *host, char *, char *); #endif static char *add_name(char *old, const char *add); -static int client_init(nfs_client *clp, const char *hname, - struct hostent *hp); nfs_client *clientlist[MCL_MAXTYPES] = { NULL, }; @@ -39,6 +37,9 @@ nfs_client *clientlist[MCL_MAXTYPES] = { NULL, }; static void init_addrlist(nfs_client *clp, const struct hostent *hp) { + struct sockaddr_in sin = { + .sin_family = AF_INET, + }; char **ap; int i; @@ -46,9 +47,10 @@ init_addrlist(nfs_client *clp, const struct hostent *hp) return; ap = hp->h_addr_list; - for (i = 0; *ap != NULL && i < NFSCLNT_ADDRMAX; i++, ap++) - clp->m_addrlist[i] = *(struct in_addr *)*ap; - + for (i = 0; *ap != NULL && i < NFSCLNT_ADDRMAX; i++, ap++) { + sin.sin_addr = *(struct in_addr *)*ap; + set_addrlist_in(clp, i, &sin); + } clp->m_naddr = i; } @@ -56,7 +58,84 @@ static void client_free(nfs_client *clp) { free(clp->m_hostname); - xfree(clp); + free(clp); +} + +static int +init_netmask(nfs_client *clp, const char *slash) +{ + struct sockaddr_in sin = { + .sin_family = AF_INET, + }; + + if (strchr(slash + 1, '.') != NULL) + sin.sin_addr.s_addr = inet_addr(slash + 1); + else { + int prefixlen = atoi(slash + 1); + if (0 < prefixlen && prefixlen <= 32) + sin.sin_addr.s_addr = + htonl((uint32_t)~0 << (32 - prefixlen)); + else + goto out_badprefix; + } + + set_addrlist_in(clp, 1, &sin); + return 1; + +out_badprefix: + xlog(L_ERROR, "Invalid prefix `%s' for %s", slash + 1, clp->m_hostname); + return 0; +} + +static int +init_subnetwork(nfs_client *clp) +{ + struct sockaddr_in sin = { + .sin_family = AF_INET, + }; + static char slash32[] = "/32"; + char *cp; + + cp = strchr(clp->m_hostname, '/'); + if (cp == NULL) + cp = slash32; + + *cp = '\0'; + sin.sin_addr.s_addr = inet_addr(clp->m_hostname); + set_addrlist_in(clp, 0, &sin); + *cp = '/'; + + return init_netmask(clp, cp); +} + +static int +client_init(nfs_client *clp, const char *hname, const struct hostent *hp) +{ + clp->m_hostname = strdup(hname); + if (clp->m_hostname == NULL) + return 0; + + clp->m_exported = 0; + clp->m_count = 0; + clp->m_naddr = 0; + + if (clp->m_type == MCL_SUBNETWORK) + return init_subnetwork(clp); + + init_addrlist(clp, hp); + return 1; +} + +static void +client_add(nfs_client *clp) +{ + nfs_client **cpp; + + cpp = &clientlist[clp->m_type]; + while (*cpp != NULL) + cpp = &((*cpp)->m_next); + clp->m_next = NULL; + *cpp = clp; } /* if canonical is set, then we *know* this is already a canonical name @@ -111,9 +190,10 @@ client_lookup(char *hname, int canonical) } } - if (!clp) { - clp = (nfs_client *) xmalloc(sizeof(*clp)); - memset(clp, 0, sizeof(*clp)); + if (clp == NULL) { + clp = calloc(1, sizeof(*clp)); + if (clp == NULL) + goto out; clp->m_type = htype; if (!client_init(clp, hname, NULL)) { client_free(clp); @@ -138,7 +218,9 @@ client_dup(nfs_client *clp, struct hostent *hp) { nfs_client *new; - new = (nfs_client *) xmalloc(sizeof(*new)); + new = (nfs_client *)malloc(sizeof(*new)); + if (new == NULL) + return NULL; memcpy(new, clp, sizeof(*new)); new->m_type = MCL_FQDN; new->m_hostname = NULL; @@ -151,61 +233,6 @@ client_dup(nfs_client *clp, struct hostent *hp) return new; } -static int -client_init(nfs_client *clp, const char *hname, struct hostent *hp) -{ - clp->m_hostname = strdup(hname); - if (clp->m_hostname == NULL) - return 0; - - clp->m_exported = 0; - clp->m_count = 0; - clp->m_naddr = 0; - - if (clp->m_type == MCL_SUBNETWORK) { - char *cp = strchr(clp->m_hostname, '/'); - static char slash32[] = "/32"; - - if(!cp) cp = slash32; - *cp = '\0'; - clp->m_addrlist[0].s_addr = inet_addr(clp->m_hostname); - if (strchr(cp + 1, '.')) { - clp->m_addrlist[1].s_addr = inet_addr(cp+1); - } - else { - int netmask = atoi(cp + 1); - if (0 < netmask && netmask <= 32) { - clp->m_addrlist[1].s_addr = - htonl ((uint32_t) ~0 << (32 - netmask)); - } - else { - xlog(L_ERROR, "invalid netmask `%s' for %s", - cp + 1, clp->m_hostname); - return 0; - } - } - *cp = '/'; - return 1; - } - - init_addrlist(clp, hp); - return 1; -} - -void -client_add(nfs_client *clp) -{ - nfs_client **cpp; - - if (clp->m_type < 0 || clp->m_type >= MCL_MAXTYPES) - xlog(L_FATAL, "unknown client type in client_add"); - cpp = clientlist + clp->m_type; - while (*cpp) - cpp = &((*cpp)->m_next); - clp->m_next = NULL; - *cpp = clp; -} - void client_release(nfs_client *clp) { @@ -352,6 +379,7 @@ add_name(char *old, const char *add) static int check_fqdn(const nfs_client *clp, const struct hostent *hp) { + const struct sockaddr_in *sin; struct in_addr addr; char **ap; int i; @@ -359,9 +387,11 @@ check_fqdn(const nfs_client *clp, const struct hostent *hp) for (ap = hp->h_addr_list; *ap; ap++) { addr = *(struct in_addr *)*ap; - for (i = 0; i < clp->m_naddr; i++) - if (clp->m_addrlist[i].s_addr == addr.s_addr) + for (i = 0; i < clp->m_naddr; i++) { + sin = get_addrlist_in(clp, i); + if (sin->sin_addr.s_addr == addr.s_addr) return 1; + } } return 0; } @@ -374,14 +404,17 @@ check_fqdn(const nfs_client *clp, const struct hostent *hp) static int check_subnetwork(const nfs_client *clp, const struct hostent *hp) { + const struct sockaddr_in *address, *mask; struct in_addr addr; char **ap; for (ap = hp->h_addr_list; *ap; ap++) { + address = get_addrlist_in(clp, 0); + mask = get_addrlist_in(clp, 1); addr = *(struct in_addr *)*ap; - if (!((clp->m_addrlist[0].s_addr ^ addr.s_addr) & - clp->m_addrlist[1].s_addr)) + if (!((address->sin_addr.s_addr ^ addr.s_addr) & + mask->sin_addr.s_addr)) return 1; } return 0;