#include "blkid/blkid.h"
#endif
+/*
+ * Invoked by RPC service loop
+ */
+void cache_set_fds(fd_set *fdset);
+int cache_process_req(fd_set *readfds);
enum nfsd_fsid {
FSID_DEV = 0,
* Record is terminated with newline.
*
*/
-int cache_export_ent(char *domain, struct exportent *exp, char *p);
+static int cache_export_ent(char *domain, struct exportent *exp, char *p);
+#define INITIAL_MANAGED_GROUPS 100
char *lbuf = NULL;
int lbuflen = 0;
extern int use_ipaddr;
-void auth_unix_ip(FILE *f)
+static void auth_unix_ip(FILE *f)
{
/* requests are
* class IP-ADDR
*/
char *cp;
char class[20];
- char ipaddr[20];
+ char ipaddr[INET6_ADDRSTRLEN];
char *client = NULL;
struct addrinfo *tmp = NULL;
struct addrinfo *ai = NULL;
strcmp(class, "nfsd") != 0)
return;
- if (qword_get(&cp, ipaddr, 20) <= 0)
+ if (qword_get(&cp, ipaddr, sizeof(ipaddr)) <= 0)
return;
tmp = host_pton(ipaddr);
qword_print(f, "nfsd");
qword_print(f, ipaddr);
- qword_printint(f, time(0)+30*60);
+ qword_printuint(f, time(0) + DEFAULT_TTL);
if (use_ipaddr)
qword_print(f, ipaddr);
else if (client)
free(client);
}
-void auth_unix_gid(FILE *f)
+static void auth_unix_gid(FILE *f)
{
/* Request are
* uid
*/
uid_t uid;
struct passwd *pw;
- gid_t glist[100], *groups = glist;
- int ngroups = 100;
+ static gid_t *groups = NULL;
+ static int groups_len = 0;
+ gid_t *more_groups;
+ int ngroups;
int rv, i;
char *cp;
+ if (groups_len == 0) {
+ groups = malloc(sizeof(gid_t) * INITIAL_MANAGED_GROUPS);
+ if (!groups)
+ return;
+
+ groups_len = INITIAL_MANAGED_GROUPS;
+ }
+
+ ngroups = groups_len;
+
if (readline(fileno(f), &lbuf, &lbuflen) != 1)
return;
rv = -1;
else {
rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups);
- if (rv == -1 && ngroups >= 100) {
- groups = malloc(sizeof(gid_t)*ngroups);
- if (!groups)
+ if (rv == -1 && ngroups >= groups_len) {
+ more_groups = realloc(groups, sizeof(gid_t)*ngroups);
+ if (!more_groups)
rv = -1;
- else
+ else {
+ groups = more_groups;
+ groups_len = ngroups;
rv = getgrouplist(pw->pw_name, pw->pw_gid,
groups, &ngroups);
+ }
}
}
qword_printuint(f, uid);
- qword_printuint(f, time(0)+30*60);
+ qword_printuint(f, time(0) + DEFAULT_TTL);
if (rv >= 0) {
qword_printuint(f, ngroups);
for (i=0; i<ngroups; i++)
} else
qword_printuint(f, 0);
qword_eol(f);
-
- if (groups != glist)
- free(groups);
}
#if USE_BLKID
#define get_uuid_blkdev(path) (NULL)
#endif
-int get_uuid(const char *val, int uuidlen, char *u)
+static int get_uuid(const char *val, int uuidlen, char *u)
{
/* extract hex digits from uuidstr and compose a uuid
* of the given length (max 16), xoring bytes to make
return 1;
}
-int uuid_by_path(char *path, int type, int uuidlen, char *uuid)
+static int uuid_by_path(char *path, int type, int uuidlen, char *uuid)
{
/* get a uuid for the filesystem found at 'path'.
* There are several possible ways of generating the
return me->mnt_dir;
}
-void nfsd_fh(FILE *f)
+static void nfsd_fh(FILE *f)
{
/* request are:
* domain fsidtype fsid
for (type = 0;
uuid_by_path(path, type, uuidlen, u);
type++)
- if (memcmp(u, fhuuid, uuidlen) != 0)
+ if (memcmp(u, fhuuid, uuidlen) == 0)
break;
if (memcmp(u, fhuuid, uuidlen) != 0)
return;
}
-static void write_fsloc(FILE *f, struct exportent *ep, char *path)
+static void write_fsloc(FILE *f, struct exportent *ep)
{
struct servers *servers;
if (ep->e_fslocmethod == FSLOC_NONE)
return;
- servers = replicas_lookup(ep->e_fslocmethod, ep->e_fslocdata, path);
+ servers = replicas_lookup(ep->e_fslocmethod, ep->e_fslocdata);
if (!servers)
return;
qword_print(f, "fsloc");
{
qword_print(f, domain);
qword_print(f, path);
- qword_printint(f, time(0)+30*60);
if (exp) {
int different_fs = strcmp(path, exp->e_path) != 0;
int flag_mask = different_fs ? ~NFSEXP_FSID : ~0;
+ qword_printuint(f, time(0) + exp->e_ttl);
qword_printint(f, exp->e_flags & flag_mask);
qword_printint(f, exp->e_anonuid);
qword_printint(f, exp->e_anongid);
qword_printint(f, exp->e_fsid);
- write_fsloc(f, exp, path);
+ write_fsloc(f, exp);
write_secinfo(f, exp, flag_mask);
if (exp->e_uuid == NULL || different_fs) {
char u[16];
qword_print(f, "uuid");
qword_printhex(f, u, 16);
}
- }
+ } else
+ qword_printuint(f, time(0) + DEFAULT_TTL);
return qword_eol(f);
}
return found;
}
-void nfsd_export(FILE *f)
+static void nfsd_export(FILE *f)
{
/* requests are:
* domain path
char *cache_name;
void (*cache_handle)(FILE *f);
FILE *f;
+ char vbuf[RPC_CHAN_BUF_SIZE];
} cachelist[] = {
- { "auth.unix.ip", auth_unix_ip},
- { "auth.unix.gid", auth_unix_gid},
- { "nfsd.export", nfsd_export},
- { "nfsd.fh", nfsd_fh},
- { NULL, NULL }
+ { "auth.unix.ip", auth_unix_ip, NULL, ""},
+ { "auth.unix.gid", auth_unix_gid, NULL, ""},
+ { "nfsd.export", nfsd_export, NULL, ""},
+ { "nfsd.fh", nfsd_fh, NULL, ""},
+ { NULL, NULL, NULL, ""}
};
extern int manage_gids;
+
+/**
+ * cache_open - prepare communications channels with kernel RPC caches
+ *
+ */
void cache_open(void)
{
int i;
continue;
sprintf(path, "/proc/net/rpc/%s/channel", cachelist[i].cache_name);
cachelist[i].f = fopen(path, "r+");
+ if (cachelist[i].f != NULL) {
+ setvbuf(cachelist[i].f, cachelist[i].vbuf, _IOLBF,
+ RPC_CHAN_BUF_SIZE);
+ }
}
}
+/**
+ * cache_set_fds - prepare cache file descriptors for one iteration of the service loop
+ * @fdset: pointer to fd_set to prepare
+ */
void cache_set_fds(fd_set *fdset)
{
int i;
}
}
+/**
+ * cache_process_req - process any active cache file descriptors during service loop iteration
+ * @fdset: pointer to fd_set to examine for activity
+ */
int cache_process_req(fd_set *readfds)
{
int i;
/*
* Give IP->domain and domain+path->options to kernel
- * % echo nfsd $IP $[now+30*60] $domain > /proc/net/rpc/auth.unix.ip/channel
- * % echo $domain $path $[now+30*60] $options $anonuid $anongid $fsid > /proc/net/rpc/nfsd.export/channel
+ * % echo nfsd $IP $[now+DEFAULT_TTL] $domain > /proc/net/rpc/auth.unix.ip/channel
+ * % echo $domain $path $[now+DEFAULT_TTL] $options $anonuid $anongid $fsid > /proc/net/rpc/nfsd.export/channel
*/
-int cache_export_ent(char *domain, struct exportent *exp, char *path)
+static int cache_export_ent(char *domain, struct exportent *exp, char *path)
{
int err;
FILE *f = fopen("/proc/net/rpc/nfsd.export/channel", "w");
* and export them with the same options
*/
struct stat stb;
- int l = strlen(exp->e_path);
- int dev;
+ size_t l = strlen(exp->e_path);
+ __dev_t dev;
if (strlen(path) <= l || path[l] != '/' ||
strncmp(exp->e_path, path, l) != 0)
return err;
}
+/**
+ * cache_export - Inform kernel of a new nfs_export
+ * @exp: target nfs_export
+ * @path: NUL-terminated C string containing export path
+ */
int cache_export(nfs_export *exp, char *path)
{
- char buf[INET_ADDRSTRLEN];
+ char buf[INET6_ADDRSTRLEN];
int err;
FILE *f;
qword_print(f, "nfsd");
- qword_print(f,
+ qword_print(f,
host_ntop(get_addrlist(exp->m_client, 0), buf, sizeof(buf)));
- qword_printint(f, time(0)+30*60);
+ qword_printuint(f, time(0) + exp->m_export.e_ttl);
qword_print(f, exp->m_client->m_hostname);
err = qword_eol(f);
return err;
}
-/* Get a filehandle.
+/**
+ * cache_get_filehandle - given an nfs_export, get its root filehandle
+ * @exp: target nfs_export
+ * @len: length of requested file handle
+ * @p: NUL-terminated C string containing export path
+ *
+ * Returns pointer to NFS file handle of root directory of export
+ *
* {
* echo $domain $path $length
* read filehandle <&0
fh.fh_size = qword_get(&bp, (char *)fh.fh_handle, NFS3_FHSIZE);
return &fh;
}
-
projects / nfs-utils.git / blobdiff