Imported Upstream version 1.2.3

[nfs-utils.git] / utils / mountd / cache.c

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 2909ad331fc417a487c4b844455f11bcfddbb28e..f70f4d6e81a7e1ee7b57061f34b7d1c6d68ba162 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -37,6 +37,11 @@
 #include "blkid/blkid.h"
 #endif
 
 #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,
 
 enum nfsd_fsid {
        FSID_DEV = 0,


@@ -57,14 +62,14 @@ enum nfsd_fsid {
  * Record is terminated with newline.
  *
  */
  * 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);

 
 
 char *lbuf  = NULL;
 int lbuflen = 0;
 extern int use_ipaddr;
 
 
 
 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
 {
        /* requests are
         *  class IP-ADDR


@@ -75,7 +80,7 @@ void auth_unix_ip(FILE *f)
         */
        char *cp;
        char class[20];
         */
        char *cp;
        char class[20];

-       char ipaddr[20];
+       char ipaddr[INET6_ADDRSTRLEN];

        char *client = NULL;
        struct addrinfo *tmp = NULL;
        struct addrinfo *ai = NULL;
        char *client = NULL;
        struct addrinfo *tmp = NULL;
        struct addrinfo *ai = NULL;


@@ -90,7 +95,7 @@ void auth_unix_ip(FILE *f)
            strcmp(class, "nfsd") != 0)
                return;
 
            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);
                return;
 
        tmp = host_pton(ipaddr);


@@ -120,7 +125,7 @@ void auth_unix_ip(FILE *f)
        free(client);
 }
 
        free(client);
 }
 

-void auth_unix_gid(FILE *f)
+static void auth_unix_gid(FILE *f)

 {
        /* Request are
         *  uid
 {
        /* Request are
         *  uid


@@ -214,7 +219,7 @@ static const char *get_uuid_blkdev(char *path)
 #define get_uuid_blkdev(path) (NULL)
 #endif
 
 #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
 {
        /* extract hex digits from uuidstr and compose a uuid
         * of the given length (max 16), xoring bytes to make


@@ -244,7 +249,7 @@ int get_uuid(const char *val, int uuidlen, char *u)
        return 1;
 }
 
        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
 {
        /* get a uuid for the filesystem found at 'path'.
         * There are several possible ways of generating the


@@ -323,7 +328,7 @@ static char *next_mnt(void **v, char *p)
        return me->mnt_dir;
 }
 
        return me->mnt_dir;
 }
 

-void nfsd_fh(FILE *f)
+static void nfsd_fh(FILE *f)

 {
        /* request are:
         *  domain fsidtype fsid
 {
        /* request are:
         *  domain fsidtype fsid


@@ -742,7 +747,7 @@ lookup_export(char *dom, char *path, struct addrinfo *ai)
        return found;
 }
 
        return found;
 }
 

-void nfsd_export(FILE *f)
+static void nfsd_export(FILE *f)

 {
        /* requests are:
         *  domain path
 {
        /* requests are:
         *  domain path


@@ -817,6 +822,11 @@ struct {
 };
 
 extern int manage_gids;
 };
 
 extern int manage_gids;

+
+/**
+ * cache_open - prepare communications channels with kernel RPC caches
+ *
+ */

 void cache_open(void) 
 {
        int i;
 void cache_open(void) 
 {
        int i;


@@ -829,6 +839,10 @@ void cache_open(void)
        }
 }
 
        }
 }
 

+/**
+ * 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;
 void cache_set_fds(fd_set *fdset)
 {
        int i;


@@ -838,6 +852,10 @@ void cache_set_fds(fd_set *fdset)
        }
 }
 
        }
 }
 

+/**
+ * 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;
 int cache_process_req(fd_set *readfds) 
 {
        int i;


@@ -860,7 +878,7 @@ int cache_process_req(fd_set *readfds)
  * % echo $domain $path $[now+30*60] $options $anonuid $anongid $fsid > /proc/net/rpc/nfsd.export/channel
  */
 
  * % echo $domain $path $[now+30*60] $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");
 {
        int err;
        FILE *f = fopen("/proc/net/rpc/nfsd.export/channel", "w");


@@ -918,9 +936,14 @@ int cache_export_ent(char *domain, struct exportent *exp, char *path)
        return err;
 }
 
        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)
 {
 int cache_export(nfs_export *exp, char *path)
 {

-       char buf[INET_ADDRSTRLEN];
+       char buf[INET6_ADDRSTRLEN];

        int err;
        FILE *f;
 
        int err;
        FILE *f;
 


@@ -930,7 +953,7 @@ int cache_export(nfs_export *exp, char *path)
 
 
        qword_print(f, "nfsd");
 
 
        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_print(f, exp->m_client->m_hostname);
                host_ntop(get_addrlist(exp->m_client, 0), buf, sizeof(buf)));
        qword_printint(f, time(0)+30*60);
        qword_print(f, exp->m_client->m_hostname);


@@ -943,7 +966,14 @@ int cache_export(nfs_export *exp, char *path)
        return err;
 }
 
        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
  * { 
  *   echo $domain $path $length 
  *   read filehandle <&0


@@ -977,4 +1007,3 @@ cache_get_filehandle(nfs_export *exp, int len, char *p)
        fh.fh_size = qword_get(&bp, (char *)fh.fh_handle, NFS3_FHSIZE);
        return &fh;
 }
        fh.fh_size = qword_get(&bp, (char *)fh.fh_handle, NFS3_FHSIZE);
        return &fh;
 }

-