X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfs3.c;h=2aa429955f12b327d366ad2fcb4a347ae6c648be;hb=d5e2f1643a99e57607e86173d832dbfa4f8b51c2;hp=593d6606dc79b8376ffd3097f5ee74d14f83d015;hpb=92a6fa8cd45e12f70f65f9d9fc6d1cdd6592878a;p=bluesky.git

diff --git a/nfs3/nfs3.c b/nfs3/nfs3.c
index 593d660..2aa4299 100644
--- a/nfs3/nfs3.c
+++ b/nfs3/nfs3.c
@@ -130,6 +130,7 @@ void encode_pre_wcc(struct wcc_data *wcc, BlueSkyInode *inode)
     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)
 {
@@ -257,8 +258,23 @@ readlink3res *
 nfsproc3_readlink_3_svc(nfs_fh3 *argp, struct svc_req *rqstp)
 {
     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;
 }
@@ -467,8 +483,59 @@ diropres3 *
 nfsproc3_symlink_3_svc(symlink3args *argp, struct svc_req *rqstp)
 {
     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;
 }
@@ -507,6 +574,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;
@@ -541,8 +610,54 @@ link3res *
 nfsproc3_link_3_svc(link3args *argp, struct svc_req *rqstp)
 {
     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;
 }
@@ -572,7 +687,7 @@ nfsproc3_readdir_3_svc(readdir3args *argp, struct svc_req *rqstp)
     static entry3 dirents[MAX_READDIR_DIRENTS];
     int count = 0;
 
-    BlueSkyDirent start = {NULL, argp->cookie, 0};
+    BlueSkyDirent start = {NULL, NULL, argp->cookie, 0};
     GSequenceIter *i = g_sequence_search(dir->dirents, &start,
                                          bluesky_dirent_compare, NULL);