X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fexport%2Fexport.c;h=e5e6cb0504158447d006c8855c58e54a4e5c581e;hp=eef2c3b5fcb5a247bb9e74f4c0f1ec97bc969f03;hb=4cacc965afc4fb03a465ffcc6cb3078aeadc3818;hpb=d38ea02d0e4bcdc4e0114567028596f7bcba45b9 diff --git a/support/export/export.c b/support/export/export.c index eef2c3b..e5e6cb0 100644 --- a/support/export/export.c +++ b/support/export/export.c @@ -6,7 +6,9 @@ * Copyright (C) 1995, 1996 Olaf Kirch */ -#include "config.h" +#ifdef HAVE_CONFIG_H +#include +#endif #include #include @@ -17,7 +19,8 @@ #include "nfslib.h" #include "exportfs.h" -nfs_export *exportlist[MCL_MAXTYPES] = { NULL, }; +exp_hash_table exportlist[MCL_MAXTYPES] = {{NULL, {{NULL,NULL}, }}, }; +static int export_hash(char *); static void export_init(nfs_export *exp, nfs_client *clp, struct exportent *nep); @@ -83,11 +86,14 @@ export_init(nfs_export *exp, nfs_client *clp, struct exportent *nep) struct exportent *e = &exp->m_export; dupexportent(e, nep); + if (nep->e_hostname) + e->e_hostname = xstrdup(nep->e_hostname); exp->m_exported = 0; exp->m_xtabent = 0; exp->m_mayexport = 0; exp->m_changed = 0; + exp->m_warned = 0; exp->m_client = clp; clp->m_count++; } @@ -106,6 +112,8 @@ export_dup(nfs_export *exp, struct hostent *hp) new = (nfs_export *) xmalloc(sizeof(*new)); memcpy(new, exp, sizeof(*new)); dupexportent(&new->m_export, &exp->m_export); + if (exp->m_export.e_hostname) + new->m_export.e_hostname = xstrdup(exp->m_export.e_hostname); clp = client_dup(exp->m_client, hp); clp->m_count++; new->m_client = clp; @@ -113,26 +121,40 @@ export_dup(nfs_export *exp, struct hostent *hp) new->m_exported = 0; new->m_xtabent = 0; new->m_changed = 0; + new->m_warned = 0; export_add(new); return new; } - -void +/* + * Add export entry to hash table + */ +void export_add(nfs_export *exp) { - nfs_export **epp; - int type = exp->m_client->m_type; - int slen = strlen(exp->m_export.e_path); - - if (type < 0 || type >= MCL_MAXTYPES) - xlog(L_FATAL, "unknown client type in export_add"); - - epp = exportlist + type; - while (*epp && slen < strlen((*epp)->m_export.e_path)) - epp = &((*epp)->m_next); - exp->m_next = *epp; - *epp = exp; + exp_hash_table *p_tbl; + exp_hash_entry *p_hen; + nfs_export *p_next; + + int type = exp->m_client->m_type; + int pos; + + pos = export_hash(exp->m_export.e_path); + p_tbl = &(exportlist[type]); /* pointer to hash table */ + p_hen = &(p_tbl->entries[pos]); /* pointer to hash table entry */ + + if (!(p_hen->p_first)) { /* hash table entry is empty */ + p_hen->p_first = exp; + p_hen->p_last = exp; + + exp->m_next = p_tbl->p_head; + p_tbl->p_head = exp; + } else { /* hash table entry is NOT empty */ + p_next = p_hen->p_last->m_next; + p_hen->p_last->m_next = exp; + exp->m_next = p_next; + p_hen->p_last = exp; + } } nfs_export * @@ -142,7 +164,7 @@ export_find(struct hostent *hp, char *path) int i; for (i = 0; i < MCL_MAXTYPES; i++) { - for (exp = exportlist[i]; exp; exp = exp->m_next) { + for (exp = exportlist[i].p_head; exp; exp = exp->m_next) { if (!export_check(exp, hp, path)) continue; if (exp->m_client->m_type == MCL_FQDN) @@ -161,7 +183,7 @@ export_allowed_internal (struct hostent *hp, char *path) int i; for (i = 0; i < MCL_MAXTYPES; i++) { - for (exp = exportlist[i]; exp; exp = exp->m_next) { + for (exp = exportlist[i].p_head; exp; exp = exp->m_next) { if (!exp->m_mayexport || !export_check(exp, hp, path)) continue; @@ -172,10 +194,9 @@ export_allowed_internal (struct hostent *hp, char *path) return NULL; } -struct exportent * +nfs_export * export_allowed(struct hostent *hp, char *path) { - static struct exportent ee; nfs_export *exp; char epath[MAXPATHLEN+1]; char *p = NULL; @@ -188,10 +209,8 @@ export_allowed(struct hostent *hp, char *path) /* Try the longest matching exported pathname. */ while (1) { exp = export_allowed_internal (hp, epath); - if (exp) { - dupexportent(&ee, &exp->m_export); - return ⅇ - } + if (exp) + return exp; /* We have to treat the root, "/", specially. */ if (p == &epath[1]) break; p = strrchr(epath, '/'); @@ -202,17 +221,30 @@ export_allowed(struct hostent *hp, char *path) return NULL; } +/* + * Search hash table for export entry. + */ nfs_export * -export_lookup(char *hname, char *path, int canonical) +export_lookup(char *hname, char *path, int canonical) { - nfs_client *clp; - nfs_export *exp; + nfs_client *clp; + nfs_export *exp; + exp_hash_entry *p_hen; - if (!(clp = client_lookup(hname, canonical))) + int pos; + + clp = client_lookup(hname, canonical); + if(clp == NULL) return NULL; - for (exp = exportlist[clp->m_type]; exp; exp = exp->m_next) - if (exp->m_client == clp && !strcmp(exp->m_export.e_path, path)) - return exp; + + pos = export_hash(path); + p_hen = &(exportlist[clp->m_type].entries[pos]); + for(exp = p_hen->p_first; exp && (exp != p_hen->p_last->m_next); + exp = exp->m_next) { + if (exp->m_client == clp && !strcmp(exp->m_export.e_path, path)) { + return exp; + } + } return NULL; } @@ -229,10 +261,10 @@ void export_freeall(void) { nfs_export *exp, *nxt; - int i; + int i, j; for (i = 0; i < MCL_MAXTYPES; i++) { - for (exp = exportlist[i]; exp; exp = nxt) { + for (exp = exportlist[i].p_head; exp; exp = nxt) { nxt = exp->m_next; client_release(exp->m_client); if (exp->m_export.e_squids) @@ -241,21 +273,45 @@ export_freeall(void) xfree(exp->m_export.e_sqgids); if (exp->m_export.e_mountpoint) free(exp->m_export.e_mountpoint); + if (exp->m_export.e_fslocdata) + xfree(exp->m_export.e_fslocdata); + xfree(exp->m_export.e_hostname); xfree(exp); } - exportlist[i] = NULL; + for(j = 0; j < HASH_TABLE_SIZE; j++) { + exportlist[i].entries[j].p_first = NULL; + exportlist[i].entries[j].p_last = NULL; + } + exportlist[i].p_head = NULL; } client_freeall(); } -void -export_reset(nfs_export *exp) +/* + * Compute and returns integer from string. + * Note: Its understood the smae integers can be same for + * different strings, but it should not matter. + */ +static unsigned int +strtoint(char *str) +{ + int i = 0; + unsigned int n = 0; + + while ( str[i] != '\0') { + n+=((int)str[i])*i; + i++; + } + return n; +} + +/* + * Hash function + */ +static int +export_hash(char *str) { - if (!exp) - return; + int num = strtoint(str); - /* Restore m_path. */ - strncpy(exp->m_export.m_path, exp->m_export.e_path, - sizeof (exp->m_export.m_path) - 1); - exp->m_export.m_path[sizeof (exp->m_export.m_path) - 1] = '\0'; + return num % HASH_TABLE_SIZE; }