X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfs3.c;h=0ba7f56a4cb3757504d60e72fb0c04e9959bfef7;hb=4bef26446b9100f63ac3c953b7f96f1966673980;hp=2aa429955f12b327d366ad2fcb4a347ae6c648be;hpb=d5e2f1643a99e57607e86173d832dbfa4f8b51c2;p=bluesky.git

diff --git a/nfs3/nfs3.c b/nfs3/nfs3.c
index 2aa4299..0ba7f56 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)
@@ -349,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;
@@ -600,8 +609,37 @@ rename3res *
 nfsproc3_rename_3_svc(rename3args *argp, struct svc_req *rqstp)
 {
     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;
 }
@@ -665,6 +703,7 @@ nfsproc3_link_3_svc(link3args *argp, struct svc_req *rqstp)
 gint bluesky_dirent_compare(gconstpointer a, gconstpointer b,
                             gpointer unused);
 
+#define MAX_READDIR_DIRENTS 4
 readdir3res *
 nfsproc3_readdir_3_svc(readdir3args *argp, struct svc_req *rqstp)
 {
@@ -683,7 +722,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;
 
@@ -717,7 +755,56 @@ nfsproc3_readdirplus_3_svc(readdirplus3args *argp, struct svc_req *rqstp)
 {
     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) {
+            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;
 }