Switch debian build system to dh

[onak.git] / onak-conf.c

diff --git a/onak-conf.c b/onak-conf.c
index 126bd565d4409515bf2f084333e8f27244791283..ec61cd2332b1eea0805f9052cf0b3a96e7b37117 100644 (file)
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -1,19 +1,35 @@
 /*
  * onak-conf.c - Routines related to runtime config.
  *
 /*
  * onak-conf.c - Routines related to runtime config.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002,2012 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
  */
 

+#include "config.h"
+

 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "ll.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "ll.h"

+#include "log.h"

 #include "onak-conf.h"
 
 #include "onak-conf.h"
 

+extern struct dbfuncs DBFUNCS;
+

 /*
  *     config - Runtime configuration for onak.
  *
 /*
  *     config - Runtime configuration for onak.
  *


@@ -26,35 +42,72 @@ struct onak_config config = {
        NULL,                   /* adminemail */
        NULL,                   /* mta */
        NULL,                   /* syncsites */
        NULL,                   /* adminemail */
        NULL,                   /* mta */
        NULL,                   /* syncsites */

+       NULL,                   /* logfile */
+
+       false,                  /* use_keyd */

 
        /*
         * Options for directory backends.
         */
 
        /*
         * Options for directory backends.
         */

-       "/home/noodles/onak-db",        /* db_dir */
+       NULL,                   /* db_dir */

 
        /*
         * Options for the Postgres backend.
         */
        NULL,                   /* pg_dbhost */
 
        /*
         * Options for the Postgres backend.
         */
        NULL,                   /* pg_dbhost */

-       "noodles",              /* pg_dbname */
+       NULL,                   /* pg_dbname */

        NULL,                   /* pg_dbuser */
        NULL,                   /* pg_dbpass */
        NULL,                   /* pg_dbuser */
        NULL,                   /* pg_dbpass */

+
+       /*
+        * Options for dynamic backends.
+        */
+       NULL,                   /* db_backend */
+       NULL,                   /* backends_dir */
+
+       &DBFUNCS,               /* Default dbfuncs struct */
+
+       true,                   /* Check packet sig hashes */

 };
 
 };
 

-void readconfig(void) {
+bool parsebool(char *str, bool fallback)
+{
+       if (!strcasecmp(str, "false") || !strcasecmp(str, "no") ||
+                       !strcasecmp(str, "0")) {
+               return false;
+       } else if (!strcasecmp(str, "true") || !strcasecmp(str, "yes") ||
+                       !strcasecmp(str, "1")) {
+               return true;
+       } else {
+               logthing(LOGTHING_CRITICAL,
+                       "Couldn't parse %s as a boolean config variable, "
+                       "returning fallback of '%s'.",
+                       str,
+                       fallback ? "true" : "false");
+               return fallback;
+       }
+}
+
+void readconfig(const char *configfile) {

        FILE *conffile;
        char  curline[1024];
        int   i;
 
        curline[1023] = 0;
        FILE *conffile;
        char  curline[1024];
        int   i;
 
        curline[1023] = 0;

-       conffile = fopen(CONFIGFILE, "r");
+       if (configfile == NULL) {
+               conffile = fopen(CONFIGFILE, "r");
+       } else {
+               conffile = fopen(configfile, "r");
+       }

        if (conffile != NULL) {
                fgets(curline, 1023, conffile);
 
                while (!feof(conffile)) {
        if (conffile != NULL) {
                fgets(curline, 1023, conffile);
 
                while (!feof(conffile)) {

-               for (i = strlen(curline) - 1; isspace(curline[i]); i--) {
-                       curline[i] = 0;
-               }
+                       for (i = strlen(curline) - 1;
+                                       i >= 0 && isspace(curline[i]);
+                                       i--) {
+                               curline[i] = 0;
+                       }

 
                if (curline[0] == '#' || curline[0] == 0) {
                        /*
 
                if (curline[0] == '#' || curline[0] == 0) {
                        /*


@@ -104,6 +157,10 @@ void readconfig(void) {
                } else if (!strncmp("syncsite ", curline, 9)) {
                        config.syncsites =
                                lladd(config.syncsites, strdup(&curline[9]));
                } else if (!strncmp("syncsite ", curline, 9)) {
                        config.syncsites =
                                lladd(config.syncsites, strdup(&curline[9]));

+               } else if (!strncmp("logfile ", curline, 8)) {
+                       config.logfile = strdup(&curline[8]);
+               } else if (!strncmp("loglevel ", curline, 9)) {
+                       setlogthreshold(atoi(&curline[9]));

                } else if (!strncmp("this_site ", curline, 10)) {
                        config.thissite = strdup(&curline[10]);
                } else if (!strncmp("socket_name ", curline, 12) ||
                } else if (!strncmp("this_site ", curline, 10)) {
                        config.thissite = strdup(&curline[10]);
                } else if (!strncmp("socket_name ", curline, 12) ||


@@ -113,14 +170,77 @@ void readconfig(void) {
                        /*
                         * Not applicable; ignored for compatibility with pksd.
                         */
                        /*
                         * Not applicable; ignored for compatibility with pksd.
                         */

+               } else if (!strncmp("db_backend ", curline, 11)) {
+                       config.db_backend = strdup(&curline[11]);
+               } else if (!strncmp("backends_dir ", curline, 13)) {
+                       config.backends_dir = strdup(&curline[13]);
+               } else if (!strncmp("use_keyd ", curline, 9)) {
+                       config.use_keyd = parsebool(&curline[9],
+                                               config.use_keyd);
+               } else if (!strncmp("check_sighash ", curline, 9)) {
+                       config.check_sighash = parsebool(&curline[9],
+                                               config.check_sighash);

                } else {
                } else {

-                       fprintf(stderr, "Unknown config line: %s\n", curline);
+                       logthing(LOGTHING_ERROR,
+                               "Unknown config line: %s", curline);

                }
 
                        fgets(curline, 1023, conffile);
                }
                fclose(conffile);
        } else {
                }
 
                        fgets(curline, 1023, conffile);
                }
                fclose(conffile);
        } else {

-               fprintf(stderr, "Couldn't open config file; using defaults.\n");
+               logthing(LOGTHING_NOTICE,
+                               "Couldn't open config file; using defaults.");
+       }
+}
+
+void cleanupconfig(void) {
+       if (config.thissite != NULL) {
+               free(config.thissite);
+               config.thissite = NULL;
+       }
+       if (config.adminemail != NULL) {
+               free(config.adminemail);
+               config.adminemail = NULL;
+       }
+       if (config.mta != NULL) {
+               free(config.mta);
+               config.mta = NULL;
+       }
+       if (config.db_dir != NULL) {
+               free(config.db_dir);
+               config.db_dir = NULL;
+       }
+       if (config.pg_dbhost != NULL) {
+               free(config.pg_dbhost);
+               config.pg_dbhost = NULL;
+       }
+       if (config.pg_dbname != NULL) {
+               free(config.pg_dbname);
+               config.pg_dbname = NULL;
+       }
+       if (config.pg_dbuser != NULL) {
+               free(config.pg_dbuser);
+               config.pg_dbuser = NULL;
+       }
+       if (config.pg_dbpass != NULL) {
+               free(config.pg_dbpass);
+               config.pg_dbpass = NULL;
+       }
+       if (config.syncsites != NULL) {
+               llfree(config.syncsites, free);
+               config.syncsites = NULL;
+       }
+       if (config.logfile != NULL) {
+               free(config.logfile);
+               config.logfile = NULL;
+       }
+       if (config.db_backend != NULL) {
+               free(config.db_backend);
+               config.db_backend = NULL;
+       }
+       if (config.backends_dir != NULL) {
+               free(config.backends_dir);
+               config.backends_dir = NULL;

        }
 }
        }
 }