X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/6f0d21388eeeb33893728d92dfc0f3a3a6d6aafe..4c8bebffd4bc105ebaa09256b7a57f4a6201bd52:/onak-conf.c?ds=sidebyside

diff --git a/onak-conf.c b/onak-conf.c
index 81d7bdf..ec61cd2 100644
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -1,9 +1,20 @@
 /*
  * 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"
@@ -17,6 +28,8 @@
 #include "log.h"
 #include "onak-conf.h"
 
+extern struct dbfuncs DBFUNCS;
+
 /*
  *	config - Runtime configuration for onak.
  *
@@ -31,6 +44,8 @@ struct onak_config config = {
 	NULL,			/* syncsites */
 	NULL,			/* logfile */
 
+	false,			/* use_keyd */
+
 	/*
 	 * Options for directory backends.
 	 */
@@ -43,8 +58,36 @@ struct onak_config config = {
 	NULL,			/* pg_dbname */
 	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 */
 };
 
+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];
@@ -60,9 +103,11 @@ void readconfig(const char *configfile) {
 		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) {
 			/*
@@ -125,6 +170,16 @@ void readconfig(const char *configfile) {
 			/*
 			 * 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 {
 			logthing(LOGTHING_ERROR,
 				"Unknown config line: %s", curline);
@@ -180,4 +235,12 @@ void cleanupconfig(void) {
 		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;
+	}
 }