Fix a memory leak in the NFS-over-UDP code.

[bluesky.git] / nfs3 / nfsd.c

diff --git a/nfs3/nfsd.c b/nfs3/nfsd.c
index ab7b749..fc1f955 100644 (file)
--- a/nfs3/nfsd.c
+++ b/nfs3/nfsd.c
@@ -19,34 +19,41 @@
 #include <netinet/in.h>
 #include <glib.h>
 
-#include "libs3.h"
 #include "bluesky.h"
 
 void register_rpc();
 
 BlueSkyFS *fs;
+BlueSkyStore *store;
+
+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[])
 {
-    g_thread_init(NULL);
-    register_rpc();
+    int i;
+
+    signal(SIGPIPE, SIG_IGN);
+    signal(SIGINT, shutdown_handler);
 
-    S3_initialize(NULL, S3_INIT_ALL);
+    bluesky_init();
+    g_set_prgname("nfsd");
 
-    fs = bluesky_new_fs("export");
+    const char *target = getenv("BLUESKY_TARGET");
+    if (target == NULL)
+        target = "s3";
 
-    BlueSkyInode *root;
-    root = bluesky_new_inode(BLUESKY_ROOT_INUM, fs, BLUESKY_DIRECTORY);
-    root->nlink = 1;
-    root->mode = 0755;
-    bluesky_insert_inode(fs, root);
+    store = bluesky_store_new(target);
+    fs = bluesky_init_fs("export", store);
+
+    register_rpc();
 
-    BlueSkyInode *file;
-    file = bluesky_new_inode(bluesky_fs_alloc_inode(fs), fs, BLUESKY_REGULAR);
-    file->nlink = 1;
-    file->mode = 0755;
-    bluesky_insert_inode(fs, file);
-    bluesky_directory_insert(root, "demo", file->inum);
+    bluesky_debug_dump(fs);
 
     svc_run();
     fprintf(stderr, "%s", "svc_run returned");