X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=nfs3%2Fnfsd.c;h=40d7a6e23124d8064e69d874b0191aa538a5fb70;hb=388030970805a70cb4fad34ade5e3de7a3607a57;hp=727011d209c79b285d64977907b7cf5c7c69a466;hpb=afdaf6a249027cccc296b8923dd95fd38736b70d;p=bluesky.git

diff --git a/nfs3/nfsd.c b/nfs3/nfsd.c
index 727011d..40d7a6e 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>
@@ -25,34 +26,52 @@ void register_rpc();
 
 BlueSkyFS *fs;
 BlueSkyStore *store;
-static uint8_t filesystem_key[16];
+
+/* 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_crypt_random_bytes(filesystem_key, sizeof(filesystem_key));
-    printf("Filesystem key: ");
-    for (i = 0; i < sizeof(filesystem_key); i++) {
-        printf("%02x", filesystem_key[i]);
-    }
-    printf("\n");
-
-    store = bluesky_store_new("file");
-    fs = bluesky_init_fs("export", store);
-    fs->encryption_key = filesystem_key;
-
-    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);
-    }
+    const char *target = getenv("BLUESKY_TARGET");
+    if (target == NULL)
+        target = "s3";
+
+    const char *key = getenv("BLUESKY_KEY");
+    if (key == NULL)
+        key = "";
+
+    const char *profile_output = getenv("BLUESKY_PROFILE_OUT");
+    if (profile_output != NULL)
+        bluesky_profile_set_output(fopen(profile_output, "a"));
+
+    store = bluesky_store_new(target);
+    fs = bluesky_init_fs("export", store, key);
+
+    const char *stats_output = getenv("BLUESKY_STATS_OUT");
+    if (stats_output != NULL)
+        bluesky_stats_run_periodic_dump(fopen(stats_output, "a"));
+
+    bluesky_crypt_random_bytes(nfsd_instance_verf_cookie,
+                               sizeof(nfsd_instance_verf_cookie));
+
+    register_rpc();
 
     svc_run();
     fprintf(stderr, "%s", "svc_run returned");