X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfs3.c;h=693175be4b754cfb71b46671895ae8ac5e263948;hb=c3245fe423dd5c3a68b4c1e90ba253e7fae3473e;hp=2c0d1500573977de6740c3bdcdb0582bb4015f80;hpb=8a2ef6b448a40c790e7df154c12b54932f3e62e0;p=bluesky.git

diff --git a/nfs3/nfs3.c b/nfs3/nfs3.c
index 2c0d150..693175b 100644
--- a/nfs3/nfs3.c
+++ b/nfs3/nfs3.c
@@ -119,6 +119,14 @@ void encode_fattr3(struct fattr3 *result, BlueSkyInode *inode)
     result->mtime.nseconds = (inode->mtime % 1000000) * 1000;
     result->ctime.seconds = inode->ctime / 1000000;
     result->ctime.nseconds = (inode->ctime % 1000000) * 1000;
+
+    switch (inode->type) {
+    case BLUESKY_SYMLINK:
+        result->size = strlen(inode->symlink_contents);
+        break;
+    default:
+        break;
+    }
 }
 
 void encode_pre_wcc(struct wcc_data *wcc, BlueSkyInode *inode)
@@ -132,13 +140,13 @@ void encode_pre_wcc(struct wcc_data *wcc, BlueSkyInode *inode)
 }
 
 void *
-nfsproc3_null_3_svc(void *argp, struct svc_req *rqstp)
+nfsproc3_null_3_svc(void *argp, RPCRequest *req)
 {
     return null_result;
 }
 
 getattr3res *
-nfsproc3_getattr_3_svc(nfs_fh3 *argp, struct svc_req *rqstp)
+nfsproc3_getattr_3_svc(nfs_fh3 *argp, RPCRequest *req)
 {
     static getattr3res result;
 
@@ -154,7 +162,7 @@ nfsproc3_getattr_3_svc(nfs_fh3 *argp, struct svc_req *rqstp)
 }
 
 wccstat3 *
-nfsproc3_setattr_3_svc(setattr3args *argp, struct svc_req *rqstp)
+nfsproc3_setattr_3_svc(setattr3args *argp, RPCRequest *req)
 {
     static wccstat3 result;
 
@@ -187,7 +195,7 @@ nfsproc3_setattr_3_svc(setattr3args *argp, struct svc_req *rqstp)
 }
 
 lookup3res *
-nfsproc3_lookup_3_svc(diropargs3 *argp, struct svc_req *rqstp)
+nfsproc3_lookup_3_svc(diropargs3 *argp, RPCRequest *req)
 {
     static lookup3res result;
 
@@ -235,7 +243,7 @@ nfsproc3_lookup_3_svc(diropargs3 *argp, struct svc_req *rqstp)
 }
 
 access3res *
-nfsproc3_access_3_svc(access3args *argp, struct svc_req *rqstp)
+nfsproc3_access_3_svc(access3args *argp, RPCRequest *req)
 {
     static access3res result;
 
@@ -255,17 +263,32 @@ nfsproc3_access_3_svc(access3args *argp, struct svc_req *rqstp)
 }
 
 readlink3res *
-nfsproc3_readlink_3_svc(nfs_fh3 *argp, struct svc_req *rqstp)
+nfsproc3_readlink_3_svc(nfs_fh3 *argp, RPCRequest *req)
 {
     static readlink3res result;
+    memset(&result, 0, sizeof(result));
 
-    result.status = NFS3ERR_NOTSUPP;
+    BlueSkyInode *inode = lookup_fh(argp);
+    if (inode != NULL) {
+        if (inode->type == BLUESKY_SYMLINK) {
+            result.status = NFS3_OK;
+            result.readlink3res_u.resok.symlink_attributes.present = TRUE;
+            encode_fattr3(&result.readlink3res_u.resok.symlink_attributes.post_op_attr_u.attributes, inode);
+            result.readlink3res_u.resok.data = inode->symlink_contents;
+        } else {
+            result.status = NFS3ERR_INVAL;
+            result.readlink3res_u.resfail.present = TRUE;
+            encode_fattr3(&result.readlink3res_u.resfail.post_op_attr_u.attributes, inode);
+        }
+    } else {
+        result.status = NFS3ERR_STALE;
+    }
 
     return &result;
 }
 
 read3res *
-nfsproc3_read_3_svc(read3args *argp, struct svc_req *rqstp)
+nfsproc3_read_3_svc(read3args *argp, RPCRequest *req)
 {
     static read3res result;
     static char buf[32768];
@@ -302,7 +325,7 @@ nfsproc3_read_3_svc(read3args *argp, struct svc_req *rqstp)
 }
 
 write3res *
-nfsproc3_write_3_svc(write3args *argp, struct svc_req *rqstp)
+nfsproc3_write_3_svc(write3args *argp, RPCRequest *req)
 {
     static write3res result;
     struct wcc_data wcc;
@@ -334,6 +357,7 @@ nfsproc3_write_3_svc(write3args *argp, struct svc_req *rqstp)
                            argp->data.data_val, argp->count);
     }
 
+    wcc.after.present = TRUE;
     encode_fattr3(&wcc.after.post_op_attr_u.attributes, inode);
     result.write3res_u.resok.file_wcc = wcc;
     result.write3res_u.resok.count = argp->count;
@@ -343,7 +367,7 @@ nfsproc3_write_3_svc(write3args *argp, struct svc_req *rqstp)
 }
 
 diropres3 *
-nfsproc3_create_3_svc(create3args *argp, struct svc_req *rqstp)
+nfsproc3_create_3_svc(create3args *argp, RPCRequest *req)
 {
     static diropres3 result;
     struct wcc_data wcc;
@@ -404,7 +428,7 @@ nfsproc3_create_3_svc(create3args *argp, struct svc_req *rqstp)
 }
 
 diropres3 *
-nfsproc3_mkdir_3_svc(mkdir3args *argp, struct svc_req *rqstp)
+nfsproc3_mkdir_3_svc(mkdir3args *argp, RPCRequest *req)
 {
     static diropres3 result;
     struct wcc_data wcc;
@@ -465,17 +489,68 @@ nfsproc3_mkdir_3_svc(mkdir3args *argp, struct svc_req *rqstp)
 }
 
 diropres3 *
-nfsproc3_symlink_3_svc(symlink3args *argp, struct svc_req *rqstp)
+nfsproc3_symlink_3_svc(symlink3args *argp, RPCRequest *req)
 {
     static diropres3 result;
+    struct wcc_data wcc;
+    memset(&wcc, 0, sizeof(wcc));
 
-    result.status = NFS3ERR_NOTSUPP;
+    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_SYMLINK);
+    file->nlink = 1;
+    file->mode = 0755;
+    int64_t time = bluesky_get_current_time();
+    file->mtime = time;
+    file->ctime = time;
+    file->atime = time;
+    file->ntime = time;
+    file->symlink_contents = g_strdup(argp->symlink.symlink_data);
+    bluesky_insert_inode(fs, file);
+    bluesky_directory_insert(dir, argp->where.name, file->inum);
+
+    dir->mtime = dir->ctime = bluesky_get_current_time();
+    dir->change_count++;
+
+    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;
 }
 
 diropres3 *
-nfsproc3_mknod_3_svc(mknod3args *argp, struct svc_req *rqstp)
+nfsproc3_mknod_3_svc(mknod3args *argp, RPCRequest *req)
 {
     static diropres3 result;
 
@@ -485,7 +560,7 @@ nfsproc3_mknod_3_svc(mknod3args *argp, struct svc_req *rqstp)
 }
 
 wccstat3 *
-nfsproc3_remove_3_svc(diropargs3 *argp, struct svc_req *rqstp)
+nfsproc3_remove_3_svc(diropargs3 *argp, RPCRequest *req)
 {
     static wccstat3 result;
 
@@ -508,6 +583,8 @@ nfsproc3_remove_3_svc(diropargs3 *argp, struct svc_req *rqstp)
         return &result;
     }
 
+    /* TODO: Decrement link count, deallocate inode if needed. */
+
     bluesky_directory_remove(dir, argp->name);
 
     result.status = NFS3_OK;
@@ -519,31 +596,150 @@ nfsproc3_remove_3_svc(diropargs3 *argp, struct svc_req *rqstp)
 }
 
 wccstat3 *
-nfsproc3_rmdir_3_svc(diropargs3 *argp, struct svc_req *rqstp)
+nfsproc3_rmdir_3_svc(diropargs3 *argp, RPCRequest *req)
 {
     static wccstat3 result;
 
-    result.status = NFS3ERR_NOTSUPP;
+    result.wccstat3_u.wcc.before.present = FALSE;
+    result.wccstat3_u.wcc.after.present = FALSE;
+
+    BlueSkyInode *dir = lookup_fh(&argp->dir);
+    if (dir == NULL) {
+        result.status = NFS3ERR_STALE;
+        return &result;
+    }
+
+    encode_pre_wcc(&result.wccstat3_u.wcc, dir);
+
+    if (!validate_filename(argp->name)
+        || strcmp(argp->name, ".") == 0
+        || strcmp(argp->name, "..") == 0)
+    {
+        result.status = NFS3ERR_NOENT;
+        return &result;
+    }
+
+    uint64_t inum = bluesky_directory_lookup(dir, argp->name);
+    BlueSkyInode *inode = bluesky_get_inode(fs, inum);
+    if (inode == NULL) {
+        result.status = NFS3ERR_NOENT;
+        return &result;
+    }
+
+    if (inode->type != BLUESKY_DIRECTORY) {
+        result.status = NFS3ERR_NOTDIR;
+        return &result;
+    }
+    if (g_sequence_get_length(inode->dirents) > 0) {
+        printf("Directory not empty: %d entries\n",
+               g_sequence_get_length(inode->dirents));
+        result.status = NFS3ERR_NOTEMPTY;
+        return &result;
+    }
+
+    /* TODO: Decrement link count, deallocate inode if needed. */
+
+    bluesky_directory_remove(dir, argp->name);
+
+    result.status = NFS3_OK;
+    result.wccstat3_u.wcc.after.present = TRUE;
+    encode_fattr3(&result.wccstat3_u.wcc.after.post_op_attr_u.attributes,
+                  dir);
 
     return &result;
 }
 
 rename3res *
-nfsproc3_rename_3_svc(rename3args *argp, struct svc_req *rqstp)
+nfsproc3_rename_3_svc(rename3args *argp, RPCRequest *req)
 {
     static rename3res result;
+    wcc_data *wcc1 = &result.rename3res_u.res.fromdir_wcc;
+    wcc_data *wcc2 = &result.rename3res_u.res.todir_wcc;
+    memset(wcc1, 0, sizeof(*wcc1));
+    memset(wcc2, 0, sizeof(*wcc2));
 
-    result.status = NFS3ERR_NOTSUPP;
+    BlueSkyInode *dir1 = lookup_fh(&argp->from.dir);
+    if (dir1 == NULL) {
+        result.status = NFS3ERR_STALE;
+        return &result;
+    }
+    encode_pre_wcc(wcc1, dir1);
+
+    BlueSkyInode *dir2 = lookup_fh(&argp->to.dir);
+    if (dir2 == NULL) {
+        result.status = NFS3ERR_STALE;
+        return &result;
+    }
+    encode_pre_wcc(wcc2, dir1);
+
+    gboolean status = bluesky_rename(dir1, argp->from.name,
+                                     dir2, argp->to.name,
+                                     TRUE, TRUE);
+
+    wcc1->after.present = TRUE;
+    encode_fattr3(&wcc1->after.post_op_attr_u.attributes, dir1);
+    wcc2->after.present = TRUE;
+    encode_fattr3(&wcc2->after.post_op_attr_u.attributes, dir2);
+    if (status)
+        result.status = NFS3_OK;
+    else
+        result.status = NFS3ERR_PERM;
 
     return &result;
 }
 
 link3res *
-nfsproc3_link_3_svc(link3args *argp, struct svc_req *rqstp)
+nfsproc3_link_3_svc(link3args *argp, RPCRequest *req)
 {
     static link3res result;
+    struct wcc_data wcc;
+    memset(&wcc, 0, sizeof(wcc));
 
-    result.status = NFS3ERR_NOTSUPP;
+    BlueSkyInode *inode = lookup_fh(&argp->file);
+    if (inode == NULL) {
+        result.status = NFS3ERR_STALE;
+        result.link3res_u.res.linkdir_wcc = wcc;
+        return &result;
+    }
+
+    BlueSkyInode *dir = lookup_fh(&argp->link.dir);
+    if (dir == NULL) {
+        result.status = NFS3ERR_STALE;
+        result.link3res_u.res.linkdir_wcc = wcc;
+        return &result;
+    }
+
+    encode_pre_wcc(&wcc, dir);
+    if (dir->type != BLUESKY_DIRECTORY) {
+        result.status = NFS3ERR_NOTDIR;
+        result.link3res_u.res.linkdir_wcc = wcc;
+        return &result;
+    }
+
+    if (!validate_filename(argp->link.name)
+        || strcmp(argp->link.name, ".") == 0
+        || strcmp(argp->link.name, "..") == 0
+        || bluesky_directory_lookup(dir, argp->link.name) != 0)
+    {
+        result.status = NFS3ERR_EXIST;
+        result.link3res_u.res.linkdir_wcc = wcc;
+        return &result;
+    }
+
+    if (!bluesky_directory_insert(dir, argp->link.name, inode->inum)) {
+        result.status = NFS3ERR_EXIST;
+        result.link3res_u.res.linkdir_wcc = wcc;
+        return &result;
+    }
+    inode->nlink++;
+    bluesky_inode_update_ctime(inode, 0);
+
+    result.status = NFS3_OK;
+    wcc.after.present = TRUE;
+    encode_fattr3(&wcc.after.post_op_attr_u.attributes, dir);
+    result.link3res_u.res.file_attributes.present = TRUE;
+    encode_fattr3(&result.link3res_u.res.file_attributes.post_op_attr_u.attributes, inode);
+    result.link3res_u.res.linkdir_wcc = wcc;
 
     return &result;
 }
@@ -551,8 +747,9 @@ nfsproc3_link_3_svc(link3args *argp, struct svc_req *rqstp)
 gint bluesky_dirent_compare(gconstpointer a, gconstpointer b,
                             gpointer unused);
 
+#define MAX_READDIR_DIRENTS 64
 readdir3res *
-nfsproc3_readdir_3_svc(readdir3args *argp, struct svc_req *rqstp)
+nfsproc3_readdir_3_svc(readdir3args *argp, RPCRequest *req)
 {
     static readdir3res result;
 
@@ -569,7 +766,6 @@ nfsproc3_readdir_3_svc(readdir3args *argp, struct svc_req *rqstp)
     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;
 
@@ -599,27 +795,105 @@ nfsproc3_readdir_3_svc(readdir3args *argp, struct svc_req *rqstp)
 }
 
 readdirplus3res *
-nfsproc3_readdirplus_3_svc(readdirplus3args *argp, struct svc_req *rqstp)
+nfsproc3_readdirplus_3_svc(readdirplus3args *argp, RPCRequest *req)
 {
+    /* XDR-encoded sizes:
+     *   post_op_attr: 88 bytes
+     *   base readdirplus3resok: 88 + 16 bytes
+     *   base directory entry: 24 bytes + filename
+     *   attributes/fh3: 88 + 8 + filehandle size
+     */
+    size_t dircount = 88 + 16, attrcount = 0;
     static readdirplus3res result;
 
-    result.status = NFS3ERR_NOTSUPP;
+    BlueSkyInode *dir = lookup_fh(&argp->dir);
+    if (dir == NULL) {
+        result.status = NFS3ERR_STALE;
+        result.readdirplus3res_u.resfail.present = FALSE;
+        return &result;
+    }
+
+    result.status = NFS3_OK;
+    result.readdirplus3res_u.resok.dir_attributes.present = TRUE;
+    encode_fattr3(&result.readdirplus3res_u.resok.dir_attributes.post_op_attr_u.attributes, dir);
+    memset(result.readdirplus3res_u.resok.cookieverf, 0,
+           sizeof(result.readdirplus3res_u.resok.cookieverf));
+
+    static entryplus3 dirents[MAX_READDIR_DIRENTS];
+    static uint64_t fh_bytes[MAX_READDIR_DIRENTS];
+    int count = 0;
+
+    /* TODO: Handle dircount, maxcount arguments from client. */
+
+    BlueSkyDirent start = {NULL, 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);
+        BlueSkyInode *inode = bluesky_get_inode(fs, d->inum);
+        if (inode != NULL) {
+            dircount += 24 + ((strlen(d->name) + 3) & ~3);
+            attrcount += 88 + 8 + 8;
+            if (dircount > argp->dircount
+                || dircount + attrcount > argp->maxcount)
+                break;
+            dirents[count].fileid = d->inum;
+            dirents[count].name = d->name;
+            dirents[count].cookie = d->cookie;
+            dirents[count].nextentry = NULL;
+            dirents[count].name_attributes.present = TRUE;
+            encode_fattr3(&dirents[count].name_attributes.post_op_attr_u.attributes, inode);
+            fh_bytes[count] = GUINT64_TO_BE(d->inum);
+            dirents[count].name_handle.present = TRUE;
+            dirents[count].name_handle.post_op_fh3_u.handle.data.data_len = 8;
+            dirents[count].name_handle.post_op_fh3_u.handle.data.data_val
+                = (char *)&fh_bytes[count];
+            if (count > 0)
+                dirents[count - 1].nextentry = &dirents[count];
+            count++;
+        }
+        i = g_sequence_iter_next(i);
+    }
+
+    if (count > 0)
+        result.readdirplus3res_u.resok.reply.entries = &dirents[0];
+    else
+        result.readdirplus3res_u.resok.reply.entries = NULL;
+    result.readdirplus3res_u.resok.reply.eof = g_sequence_iter_is_end(i);
 
     return &result;
 }
 
 fsstat3res *
-nfsproc3_fsstat_3_svc(nfs_fh3 *argp, struct svc_req *rqstp)
+nfsproc3_fsstat_3_svc(nfs_fh3 *argp, RPCRequest *req)
 {
     static fsstat3res result;
 
-    result.status = NFS3ERR_NOTSUPP;
+    BlueSkyInode *inode = lookup_fh(argp);
+    if (inode == NULL) {
+        result.status = NFS3ERR_STALE;
+        result.fsstat3res_u.resfail.present = FALSE;
+        return &result;
+    }
+
+    result.status = NFS3_OK;
+    result.fsstat3res_u.resok.obj_attributes.present = TRUE;
+    encode_fattr3(&result.fsstat3res_u.resok.obj_attributes.post_op_attr_u.attributes, inode);
+
+    result.fsstat3res_u.resok.tbytes = (1 << 30);
+    result.fsstat3res_u.resok.fbytes = (1 << 30);
+    result.fsstat3res_u.resok.abytes = (1 << 30);
+    result.fsstat3res_u.resok.tfiles = 0;
+    result.fsstat3res_u.resok.ffiles = 0;
+    result.fsstat3res_u.resok.afiles = 0;
+    result.fsstat3res_u.resok.invarsec = 0;
 
     return &result;
 }
 
 fsinfo3res *
-nfsproc3_fsinfo_3_svc(nfs_fh3 *argp, struct svc_req *rqstp)
+nfsproc3_fsinfo_3_svc(nfs_fh3 *argp, RPCRequest *req)
 {
     static fsinfo3res result;
 
@@ -644,7 +918,7 @@ nfsproc3_fsinfo_3_svc(nfs_fh3 *argp, struct svc_req *rqstp)
 }
 
 pathconf3res *
-nfsproc3_pathconf_3_svc(nfs_fh3 *argp, struct svc_req *rqstp)
+nfsproc3_pathconf_3_svc(nfs_fh3 *argp, RPCRequest *req)
 {
     static pathconf3res result;
 
@@ -663,7 +937,7 @@ nfsproc3_pathconf_3_svc(nfs_fh3 *argp, struct svc_req *rqstp)
 }
 
 commit3res *
-nfsproc3_commit_3_svc(commit3args *argp, struct svc_req *rqstp)
+nfsproc3_commit_3_svc(commit3args *argp, RPCRequest *req)
 {
     static commit3res result;