server side support for cookies, basic tests

[disorder] / server / disorderd.c

diff --git a/server/disorderd.c b/server/disorderd.c
index 944777a8a94e7047a0a5b0bdd5316d25623d45fe..34d9e23fb2f33d79494323d1171bac22e76c1817 100644 (file)
--- a/server/disorderd.c
+++ b/server/disorderd.c
@@ -38,6 +38,7 @@
 #include <sys/time.h>
 #include <pcre.h>
 #include <fcntl.h>
+#include <gcrypt.h>
 
 #include "daemonize.h"
 #include "event.h"
@@ -71,7 +72,6 @@ static const struct option options[] = {
   { "foreground", no_argument, 0, 'f' },
   { "log", required_argument, 0, 'l' },
   { "pidfile", required_argument, 0, 'P' },
-  { "no-initial-rescan", no_argument, 0, 'N' },
   { "wide-open", no_argument, 0, 'w' },
   { "syslog", no_argument, 0, 's' },
   { 0, 0, 0, 0 }
@@ -95,7 +95,7 @@ static void help(void) {
 
 /* display version number and terminate */
 static void version(void) {
-  xprintf("disorderd version %s\n", disorder_version_string);
+  xprintf("%s", disorder_version_string);
   xfclose(stdout);
   exit(0);
 }
@@ -207,7 +207,6 @@ static void fix_path(void) {
 int main(int argc, char **argv) {
   int n, background = 1, logsyslog = 0;
   const char *pidfile = 0;
-  int initial_rescan = 1;
 
   set_progname(argv);
   mem_init();
@@ -223,7 +222,6 @@ int main(int argc, char **argv) {
     case 'd': debugging = 1; break;
     case 'f': background = 0; break;
     case 'P': pidfile = optarg; break;
-    case 'N': initial_rescan = 0; break;
     case 's': logsyslog = 1; break;
     case 'w': wideopen = 1; break;
     default: fatal(0, "invalid option");
@@ -241,6 +239,8 @@ int main(int argc, char **argv) {
   info("process ID %lu", (unsigned long)getpid());
   fix_path();
   srand(time(0));                      /* don't start the same every time */
+  /* gcrypt initialization */
+  gcry_control(GCRYCTL_INIT_SECMEM, 1);
   /* create event loop */
   ev = ev_new();
   if(ev_child_setup(ev)) fatal(0, "ev_child_setup failed");
@@ -264,8 +264,8 @@ int main(int argc, char **argv) {
   if(config->lock) {
     const char *lockfile;
     int lockfd;
-   struct flock lock;
-    
+    struct flock lock;
+
     lockfile = config_get_file("lock");
     if((lockfd = open(lockfile, O_RDWR|O_CREAT, 0600)) < 0)
       fatal(errno, "error opening %s", lockfile);
@@ -288,9 +288,12 @@ int main(int argc, char **argv) {
   if(ev_signal(ev, SIGTERM, handle_sigterm, 0)) fatal(0, "ev_signal failed");
   /* ignore SIGPIPE */
   signal(SIGPIPE, SIG_IGN);
-  /* start a rescan straight away */
-  if(initial_rescan)
-    trackdb_rescan(ev);
+  /* start a rescan straight away if this is a new installation */
+  if(!trackdb_existing_database) {
+    trackdb_rescan(0/*ev*/);
+    /* No ev -> the rescan will block.  Since we called reconfigure() already
+     * any clients will also be forced to block. */
+  }
   rescan_after(86400);
   /* periodically tidy up the database */
   dbgc_after(60);