diff options
Diffstat (limited to 'nfsd/nfsd.h')
| -rw-r--r-- | nfsd/nfsd.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/nfsd/nfsd.h b/nfsd/nfsd.h index 7b6f530d..e89a411b 100644 --- a/nfsd/nfsd.h +++ b/nfsd/nfsd.h @@ -1,5 +1,5 @@ -/* - Copyright (C) 1996 Free Software Foundation, Inc. +/* + Copyright (C) 1996,98,2002 Free Software Foundation, Inc. Written by Michael I. Bushnell, p/BSG. This file is part of the GNU Hurd. @@ -18,14 +18,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ -typedef int bool_t; - #include <sys/types.h> #include <sys/socket.h> #include <errno.h> #include <netinet/in.h> #include <cthreads.h> -#include "../nfs/rpcsvc/nfs_prot.h" /* XXX */ +#include <rpc/types.h> +#include "../nfs/nfs-spec.h" /* XXX */ #include <hurd/fs.h> /* These should be configuration options */ @@ -34,7 +33,7 @@ typedef int bool_t; #define REPLY_KEEP_TIMEOUT 120 /* two minutes */ #define MAXIOSIZE 10240 -struct idspec +struct idspec { struct idspec *next, **prevp; int nuids, ngids; @@ -46,7 +45,7 @@ struct idspec struct cache_handle { struct cache_handle *next, **prevp; - char handle[NFS_FHSIZE]; + char handle[NFS2_FHSIZE]; struct idspec *ids; file_t port; time_t lastuse; @@ -67,17 +66,17 @@ struct cached_reply struct procedure { - error_t (*func) (struct cache_handle *, int *, int **); - size_t (*alloc_reply) (int *); + error_t (*func) (struct cache_handle *, int *, int **, int); + size_t (*alloc_reply) (int *, int); int need_handle; int process_error; }; -struct proctable +struct proctable { int min; int max; - struct procedure procs[0]; + struct procedure procs[]; }; volatile struct mapped_time_value *mapped_time; @@ -92,6 +91,9 @@ extern struct sockaddr_in main_address, pmap_address; /* Name of the file on disk containing the filesystem index table */ extern char *index_file_name; +/* Our auth server */ +auth_t authserver; + /* cache.c */ int *process_cred (int *, struct idspec **); @@ -107,15 +109,14 @@ void release_cached_reply (struct cached_reply *cr); void scan_replies (void); /* loop.c */ -void server_loop (void); +void server_loop (int); /* ops.c */ -extern struct proctable nfstable, mounttable, pmaptable; +extern struct proctable nfs2table, mounttable, pmaptable; /* xdr.c */ -int *skip_cred (int *); -int nfs_error_trans (error_t); -int *encode_fattr (int *, struct stat *); +int nfs_error_trans (error_t, int); +int *encode_fattr (int *, struct stat *, int version); int *decode_name (int *, char **); int *encode_fhandle (int *, char *); int *encode_string (int *, char *); |