X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfs3.c;h=051d728dae67a48e013cc6f988811ff0eb887622;hb=3ebe1efb5570c4a678774ebdf33b36be6dc49bbc;hp=cbf5650a13fba3ebc636d39a84a1c2999ad620e3;hpb=2246171d841d34e6368e340a6b76b7ee9d9a1084;p=bluesky.git

diff --git a/nfs3/nfs3.c b/nfs3/nfs3.c
index cbf5650..051d728 100644
--- a/nfs3/nfs3.c
+++ b/nfs3/nfs3.c
@@ -5,31 +5,75 @@
  */
 
 #include "nfs3_prot.h"
+#include "bluesky.h"
+
+extern BlueSkyFS *fs;
 
 static int null_int;
 static void *null_result = (void *)&null_int;
 
-void encode_fattr3(struct fattr3 *result, uint64_t inum)
+/* Check that a string is a valid file name.  We require that it be valid
+ * UTF-8, that it not be empty, and that it not contain embedded forward
+ * slashes.  Also checks that the length of the string is not more than the
+ * maximum allowed length.  This function does allow the names "." and "..".
+ * Returns TRUE if te string is allowed as a filename. */
+gboolean validate_filename(const char *filename)
+{
+    if (filename == NULL || filename[0] == '\0')
+        return FALSE;
+    if (strlen(filename) > 255)
+        return FALSE;
+    if (!g_utf8_validate(filename, -1, NULL))
+        return FALSE;
+    if (strchr(filename, '/') != NULL)
+        return FALSE;
+    return TRUE;
+}
+
+/* Look up a BlueSkyInode given an NFS filehandle.  Returns NULL if the
+ * filehandle is invalid. */
+BlueSkyInode *lookup_fh(nfs_fh3 *fh)
+{
+    BlueSkyInode *inode = NULL;
+    if (fh->data.data_len == 8) {
+        uint64_t inum = GUINT64_FROM_BE(*(uint64_t *)(fh->data.data_val));
+        inode = bluesky_get_inode(fs, inum);
+    }
+    return inode;
+}
+
+/* Copy inode attributes into NFS response.  The BlueSkyInode should be locked
+ * by the caller. */
+void encode_fattr3(struct fattr3 *result, BlueSkyInode *inode)
 {
-    result->type = NF3DIR;
-    result->mode = 0755;
-    result->nlink = 1;
-    result->uid = 0;
-    result->gid = 0;
-    result->size = 0;
+    result->type = inode->type;
+    result->mode = inode->mode;
+    result->nlink = inode->nlink;
+    result->uid = inode->uid;
+    result->gid = inode->gid;
+    result->size = inode->size;
     result->used = 0;
     result->rdev.major = 0;
     result->rdev.minor = 0;
     result->fsid = 0;
-    result->fileid = inum;
-    result->atime.seconds = 0;
-    result->atime.nseconds = 0;
-    result->mtime.seconds = 0;
-    result->mtime.nseconds = 0;
-    result->ctime.seconds = 0;
-    result->ctime.nseconds = 0;
+    result->fileid = inode->inum;
+    result->atime.seconds = inode->atime / 1000000;
+    result->atime.nseconds = (inode->atime % 1000000) * 1000;
+    result->mtime.seconds = inode->mtime / 1000000;
+    result->mtime.nseconds = (inode->mtime % 1000000) * 1000;
+    result->ctime.seconds = inode->ctime / 1000000;
+    result->ctime.nseconds = (inode->ctime % 1000000) * 1000;
 }
 
+void encode_pre_wcc(struct wcc_data *wcc, BlueSkyInode *inode)
+{
+    wcc->before.present = TRUE;
+    wcc->before.pre_op_attr_u.attributes.size = inode->size;
+    wcc->before.pre_op_attr_u.attributes.mtime.seconds = inode->mtime / 1000000;
+    wcc->before.pre_op_attr_u.attributes.mtime.nseconds = (inode->mtime % 1000000) * 1000;
+    wcc->before.pre_op_attr_u.attributes.ctime.seconds = inode->ctime / 1000000;
+    wcc->before.pre_op_attr_u.attributes.ctime.nseconds = (inode->ctime % 1000000) * 1000;
+}
 void *
 nfsproc3_null_3_svc(void *argp, struct svc_req *rqstp)
 {
@@ -41,8 +85,13 @@ nfsproc3_getattr_3_svc(nfs_fh3 *argp, struct svc_req *rqstp)
 {
     static getattr3res result;
 
-    result.status = NFS3_OK;
-    encode_fattr3(&result.getattr3res_u.attributes, 1);
+    BlueSkyInode *inode = lookup_fh(argp);
+    if (inode != NULL) {
+        result.status = NFS3_OK;
+        encode_fattr3(&result.getattr3res_u.attributes, inode);
+    } else {
+        result.status = NFS3ERR_STALE;
+    }
 
     return &result;
 }
@@ -62,7 +111,45 @@ nfsproc3_lookup_3_svc(diropargs3 *argp, struct svc_req *rqstp)
 {
     static lookup3res result;
 
-    result.status = NFS3ERR_NOTSUPP;
+    BlueSkyInode *dir = lookup_fh(&argp->dir);
+    if (dir == NULL) {
+        result.status = NFS3ERR_STALE;
+        result.lookup3res_u.resfail.present = FALSE;
+        return &result;
+    }
+
+    result.lookup3res_u.resfail.present = TRUE;
+    encode_fattr3(&result.lookup3res_u.resfail.post_op_attr_u.attributes, dir);
+    if (!validate_filename(argp->name)) {
+        if (strlen(argp->name) > 255)
+            result.status = NFS3ERR_NAMETOOLONG;
+        else
+            result.status = NFS3ERR_NOENT;
+        return &result;
+    }
+
+    /* TODO: Special-case "." and "..". */
+    uint64_t inum = bluesky_directory_lookup(dir, argp->name);
+    if (inum == 0) {
+        result.status = NFS3ERR_NOENT;
+        return &result;
+    }
+    BlueSkyInode *inode = bluesky_get_inode(fs, inum);
+    if (inode == NULL) {
+        result.status = NFS3ERR_NOENT;
+        return &result;
+    }
+
+    result.status = NFS3_OK;
+    result.lookup3res_u.resok.dir_attributes.present = TRUE;
+    encode_fattr3(&result.lookup3res_u.resok.dir_attributes.post_op_attr_u.attributes, dir);
+    result.lookup3res_u.resok.obj_attributes.present = TRUE;
+    encode_fattr3(&result.lookup3res_u.resok.obj_attributes.post_op_attr_u.attributes, inode);
+
+    static uint64_t fh_bytes;
+    fh_bytes = GUINT64_TO_BE(inum);
+    result.lookup3res_u.resok.object.data.data_len = 8;
+    result.lookup3res_u.resok.object.data.data_val = (char *)&fh_bytes;
 
     return &result;
 }
@@ -72,7 +159,17 @@ nfsproc3_access_3_svc(access3args *argp, struct svc_req *rqstp)
 {
     static access3res result;
 
-    result.status = NFS3ERR_NOTSUPP;
+    BlueSkyInode *inode = lookup_fh(&argp->object);
+    if (inode == NULL) {
+        result.status = NFS3ERR_STALE;
+        result.access3res_u.resfail.present = FALSE;
+        return &result;
+    }
+
+    result.status = NFS3_OK;
+    result.access3res_u.resok.obj_attributes.present = TRUE;
+    encode_fattr3(&result.access3res_u.resok.obj_attributes.post_op_attr_u.attributes, inode);
+    result.access3res_u.resok.access = argp->access;
 
     return &result;
 }
@@ -91,8 +188,35 @@ read3res *
 nfsproc3_read_3_svc(read3args *argp, struct svc_req *rqstp)
 {
     static read3res result;
+    static char buf[32768];
+
+    BlueSkyInode *inode = lookup_fh(&argp->file);
+    if (inode == NULL) {
+        result.status = NFS3ERR_STALE;
+        result.read3res_u.resfail.present = FALSE;
+        return &result;
+    }
+
+    int count = argp->count;
+    if (argp->offset >= inode->size) {
+        count = 0;
+        result.read3res_u.resok.eof = TRUE;
+    } else {
+        count = MIN(count, inode->size - argp->offset);
+        if (argp->offset + count == inode->size)
+            result.read3res_u.resok.eof = TRUE;
+        else
+            result.read3res_u.resok.eof = FALSE;
+
+        bluesky_file_read(inode, argp->offset, buf, count);
+    }
 
-    result.status = NFS3ERR_NOTSUPP;
+    result.status = NFS3_OK;
+    result.read3res_u.resok.file_attributes.present = TRUE;
+    encode_fattr3(&result.read3res_u.resok.file_attributes.post_op_attr_u.attributes, inode);
+    result.read3res_u.resok.count = count;
+    result.read3res_u.resok.data.data_val = buf;
+    result.read3res_u.resok.data.data_len = count;
 
     return &result;
 }
@@ -101,8 +225,39 @@ write3res *
 nfsproc3_write_3_svc(write3args *argp, struct svc_req *rqstp)
 {
     static write3res result;
-
-    result.status = NFS3ERR_NOTSUPP;
+    struct wcc_data wcc;
+    memset(&wcc, 0, sizeof(wcc));
+
+    BlueSkyInode *inode = lookup_fh(&argp->file);
+    if (inode == NULL) {
+        result.status = NFS3ERR_STALE;
+        result.write3res_u.resfail = wcc;
+        return &result;
+    }
+
+    encode_pre_wcc(&wcc, inode);
+    if (inode->type != BLUESKY_REGULAR) {
+        result.status = NFS3ERR_INVAL;
+        result.write3res_u.resfail = wcc;
+        return &result;
+    }
+
+    uint64_t lastbyte = argp->offset + argp->count;
+    if (lastbyte > inode->size) {
+        bluesky_file_truncate(inode, lastbyte);
+    }
+
+    if (argp->data.data_len < argp->count) {
+        /* ??? */
+    } else {
+        bluesky_file_write(inode, argp->offset,
+                           argp->data.data_val, argp->count);
+    }
+
+    encode_fattr3(&wcc.after.post_op_attr_u.attributes, inode);
+    result.write3res_u.resok.file_wcc = wcc;
+    result.write3res_u.resok.count = argp->count;
+    result.write3res_u.resok.committed = FILE_SYNC;
 
     return &result;
 }
@@ -111,8 +266,55 @@ diropres3 *
 nfsproc3_create_3_svc(create3args *argp, struct svc_req *rqstp)
 {
     static diropres3 result;
-
-    result.status = NFS3ERR_NOTSUPP;
+    struct wcc_data wcc;
+    memset(&wcc, 0, sizeof(wcc));
+
+    BlueSkyInode *dir = lookup_fh(&argp->where.dir);
+    if (dir == NULL) {
+        result.status = NFS3ERR_STALE;
+        result.diropres3_u.resfail = wcc;
+        return &result;
+    }
+
+    encode_pre_wcc(&wcc, dir);
+    if (dir->type != BLUESKY_DIRECTORY) {
+        result.status = NFS3ERR_NOTDIR;
+        result.diropres3_u.resfail = wcc;
+        return &result;
+    }
+
+    if (!validate_filename(argp->where.name)
+        || strcmp(argp->where.name, ".") == 0
+        || strcmp(argp->where.name, "..") == 0)
+    {
+        result.status = NFS3ERR_EXIST;
+        result.diropres3_u.resfail = wcc;
+        return &result;
+    }
+
+    BlueSkyInode *file;
+    file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), fs, BLUESKY_REGULAR);
+    file->nlink = 1;
+    file->mode = 0755;
+    int64_t time = bluesky_get_current_time();
+    printf("time: %lld\n", time);
+    file->mtime = time;
+    file->ctime = time;
+    file->atime = time;
+    bluesky_insert_inode(fs, file);
+    bluesky_directory_insert(dir, argp->where.name, file->inum);
+
+    wcc.after.present = TRUE;
+    encode_fattr3(&wcc.after.post_op_attr_u.attributes, dir);
+    result.diropres3_u.resok.obj_attributes.present = TRUE;
+    encode_fattr3(&result.diropres3_u.resok.obj_attributes.post_op_attr_u.attributes, file);
+    result.diropres3_u.resok.dir_wcc = wcc;
+
+    static uint64_t fh_bytes;
+    fh_bytes = GUINT64_TO_BE(file->inum);
+    result.diropres3_u.resok.obj.present = TRUE;
+    result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_len = 8;
+    result.diropres3_u.resok.obj.post_op_fh3_u.handle.data.data_val = (char *)&fh_bytes;
 
     return &result;
 }
@@ -187,12 +389,52 @@ nfsproc3_link_3_svc(link3args *argp, struct svc_req *rqstp)
     return &result;
 }
 
+gint bluesky_dirent_compare(gconstpointer a, gconstpointer b,
+                            gpointer unused);
+
 readdir3res *
 nfsproc3_readdir_3_svc(readdir3args *argp, struct svc_req *rqstp)
 {
     static readdir3res result;
 
-    result.status = NFS3ERR_NOTSUPP;
+    BlueSkyInode *dir = lookup_fh(&argp->dir);
+    if (dir == NULL) {
+        result.status = NFS3ERR_STALE;
+        result.readdir3res_u.resfail.present = FALSE;
+        return &result;
+    }
+
+    result.status = NFS3_OK;
+    result.readdir3res_u.resok.dir_attributes.present = TRUE;
+    encode_fattr3(&result.readdir3res_u.resok.dir_attributes.post_op_attr_u.attributes, dir);
+    memset(result.readdir3res_u.resok.cookieverf, 0,
+           sizeof(result.readdir3res_u.resok.cookieverf));
+
+#define MAX_READDIR_DIRENTS 4
+    static entry3 dirents[MAX_READDIR_DIRENTS];
+    int count = 0;
+
+    BlueSkyDirent start = {NULL, argp->cookie, 0};
+    GSequenceIter *i = g_sequence_search(dir->dirents, &start,
+                                         bluesky_dirent_compare, NULL);
+
+    while (count < MAX_READDIR_DIRENTS && !g_sequence_iter_is_end(i)) {
+        BlueSkyDirent *d = g_sequence_get(i);
+        dirents[count].fileid = d->inum;
+        dirents[count].name = d->name;
+        dirents[count].cookie = d->cookie;
+        dirents[count].nextentry = NULL;
+        if (count > 0)
+            dirents[count - 1].nextentry = &dirents[count];
+        i = g_sequence_iter_next(i);
+        count++;
+    }
+
+    if (count > 0)
+        result.readdir3res_u.resok.reply.entries = &dirents[0];
+    else
+        result.readdir3res_u.resok.reply.entries = NULL;
+    result.readdir3res_u.resok.reply.eof = g_sequence_iter_is_end(i);
 
     return &result;
 }
@@ -222,9 +464,10 @@ nfsproc3_fsinfo_3_svc(nfs_fh3 *argp, struct svc_req *rqstp)
 {
     static fsinfo3res result;
 
+    BlueSkyInode *inode = bluesky_get_inode(fs, 1);
     result.status = NFS3_OK;
     result.fsinfo3res_u.resok.obj_attributes.present = TRUE;
-    encode_fattr3(&result.fsinfo3res_u.resok.obj_attributes.post_op_attr_u.attributes, 1);
+    encode_fattr3(&result.fsinfo3res_u.resok.obj_attributes.post_op_attr_u.attributes, inode);
     result.fsinfo3res_u.resok.rtmax = 32768;
     result.fsinfo3res_u.resok.rtpref = 32768;
     result.fsinfo3res_u.resok.rtmult = 4096;
@@ -246,9 +489,10 @@ nfsproc3_pathconf_3_svc(nfs_fh3 *argp, struct svc_req *rqstp)
 {
     static pathconf3res result;
 
+    BlueSkyInode *inode = bluesky_get_inode(fs, 1);
     result.status = NFS3_OK;
     result.pathconf3res_u.resok.obj_attributes.present = TRUE;
-    encode_fattr3(&result.pathconf3res_u.resok.obj_attributes.post_op_attr_u.attributes, 1);
+    encode_fattr3(&result.pathconf3res_u.resok.obj_attributes.post_op_attr_u.attributes, inode);
     result.pathconf3res_u.resok.linkmax = 0xffffffff;
     result.pathconf3res_u.resok.name_max = 255;
     result.pathconf3res_u.resok.no_trunc = TRUE;