X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfsd.c;h=8641a567401abdde2b449d4acfdd58c845f9cdd8;hb=7fea6eae8397d399c2557bdcbb969255dd440d72;hp=55819e05fd36b50f5c3c2238388dd8835357820f;hpb=3c5c5e9b5a8650e0549712e20e007ba2399656bf;p=bluesky.git

diff --git a/nfs3/nfsd.c b/nfs3/nfsd.c
index 55819e0..8641a56 100644
--- a/nfs3/nfsd.c
+++ b/nfs3/nfsd.c
@@ -10,6 +10,7 @@
  * filesystem. */
 
 #include "mount_prot.h"
+#include "nfs3_prot.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <rpc/pmap_clnt.h>
@@ -26,28 +27,39 @@ void register_rpc();
 BlueSkyFS *fs;
 BlueSkyStore *store;
 
+/* A cookie value returned for uncommitted writes and verified by commits; this
+ * should be a unique value each time the server is started. */
+char nfsd_instance_verf_cookie[NFS3_WRITEVERFSIZE];
+
+static void shutdown_handler(int num)
+{
+    g_print("SIGINT caught, shutting down...\n");
+    g_print("Proxy statistics:\n");
+    bluesky_stats_dump_all();
+    exit(1);
+}
+
 int main(int argc, char *argv[])
 {
     int i;
+
+    signal(SIGPIPE, SIG_IGN);
+    signal(SIGINT, shutdown_handler);
+
     bluesky_init();
-    register_rpc();
+    g_set_prgname("nfsd");
 
-    bluesky_options.synchronous_stores = 1;
+    const char *target = getenv("BLUESKY_TARGET");
+    if (target == NULL)
+        target = "s3";
 
-    store = bluesky_store_new("s3");
+    store = bluesky_store_new(target);
     fs = bluesky_init_fs("export", store);
 
-    BlueSkyInode *root;
-    root = bluesky_get_inode(fs, BLUESKY_ROOT_INUM);
-    if (root == NULL) {
-        printf("Initializing fresh root inode...\n");
-        root = bluesky_new_inode(BLUESKY_ROOT_INUM, fs, BLUESKY_DIRECTORY);
-        root->nlink = 1;
-        root->mode = 0755;
-        bluesky_insert_inode(fs, root);
-    }
-
-    bluesky_debug_dump(fs);
+    bluesky_crypt_random_bytes(nfsd_instance_verf_cookie,
+                               sizeof(nfsd_instance_verf_cookie));
+
+    register_rpc();
 
     svc_run();
     fprintf(stderr, "%s", "svc_run returned");