X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=onak-conf.c;h=0af6a45458e2c708a87d8822c3286f48aec25f8d;hb=90e64dba702acb22eef4f6d70dc0ac885b1bedbf;hp=a29a58bfc7979df54957028a24cbc5b8734c72e9;hpb=25515318015210c5f201950031bc0269f945f48a;p=onak.git

diff --git a/onak-conf.c b/onak-conf.c
index a29a58b..0af6a45 100644
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -28,7 +28,7 @@
 #include "log.h"
 #include "onak-conf.h"
 
-extern struct dbfuncs DBFUNCS;
+extern struct onak_dbctx *DBINIT(struct onak_db_config *dbcfg, bool readonly);
 
 /*
  *	config - Runtime configuration for onak.
@@ -37,37 +37,25 @@ extern struct dbfuncs DBFUNCS;
  *	config file.
  */
 struct onak_config config = {
-	128,			/* maxkeys */
-	NULL,			/* thissite */
-	NULL,			/* adminemail */
-	NULL,			/* mta */
-	NULL,			/* syncsites */
-	NULL,			/* logfile */
+	.maxkeys = 128,
+	.thissite = NULL,
+	.adminemail = NULL,
+	.mta = NULL,
+	.syncsites = NULL,
+	.logfile = NULL,
 
-	false,			/* use_keyd */
+	.use_keyd = false,
+	.sock_dir = ".",
 
-	/*
-	 * Options for directory backends.
-	 */
-	NULL,			/* db_dir */
+	.backends = NULL,
+	.backends_dir = NULL,
 
-	/*
-	 * Options for the Postgres backend.
-	 */
-	NULL,			/* pg_dbhost */
-	NULL,			/* pg_dbname */
-	NULL,			/* pg_dbuser */
-	NULL,			/* pg_dbpass */
+	.dbinit = DBINIT,
 
-	/*
-	 * Options for dynamic backends.
-	 */
-	NULL,			/* db_backend */
-	NULL,			/* backends_dir */
+	.check_sighash = true,
 
-	&DBFUNCS,		/* Default dbfuncs struct */
-
-	true,			/* Check packet sig hashes */
+	.bin_dir = NULL,
+	.mail_dir = NULL,
 };
 
 bool parsebool(char *str, bool fallback)
@@ -94,6 +82,7 @@ void readconfig(const char *configfile) {
 	int   i;
 	char *dir, *conf;
 	size_t len;
+	struct onak_db_config *backend;
 
 	curline[1023] = 0;
 	if (configfile == NULL) {
@@ -118,7 +107,17 @@ void readconfig(const char *configfile) {
 		conffile = fopen(configfile, "r");
 	}
 	if (conffile != NULL) {
-		fgets(curline, 1023, conffile);
+		if (!fgets(curline, 1023, conffile)) {
+			logthing(LOGTHING_CRITICAL,
+				"Problem reading configuration file.");
+			fclose(conffile);
+			return;
+		}
+
+		/* Add a single DB configuration */
+		backend = calloc(1, sizeof(*backend));
+		config.backend = backend;
+		config.backends = lladd(NULL, backend);
 
 		while (!feof(conffile)) {
 			for (i = strlen(curline) - 1;
@@ -132,7 +131,7 @@ void readconfig(const char *configfile) {
 			 * Comment line, ignore.
 			 */
 		} else if (!strncmp("db_dir ", curline, 7)) {
-			config.db_dir = strdup(&curline[7]);
+			backend->location = strdup(&curline[7]);
 		} else if (!strncmp("debug ", curline, 6)) {
 			/*
 			 * Not supported yet; ignore for compatibility with
@@ -165,13 +164,13 @@ void readconfig(const char *configfile) {
 		} else if (!strncmp("max_reply_keys ", curline, 15)) {
 			config.maxkeys = atoi(&curline[15]);
 		} else if (!strncmp("pg_dbhost ", curline, 10)) {
-			config.pg_dbhost = strdup(&curline[10]);
+			backend->hostname = strdup(&curline[10]);
 		} else if (!strncmp("pg_dbname ", curline, 10)) {
-			config.pg_dbname = strdup(&curline[10]);
+			backend->location = strdup(&curline[10]);
 		} else if (!strncmp("pg_dbuser ", curline, 10)) {
-			config.pg_dbuser = strdup(&curline[10]);
+			backend->username = strdup(&curline[10]);
 		} else if (!strncmp("pg_dbpass ", curline, 10)) {
-			config.pg_dbpass = strdup(&curline[10]);
+			backend->password = strdup(&curline[10]);
 		} else if (!strncmp("syncsite ", curline, 9)) {
 			config.syncsites =
 				lladd(config.syncsites, strdup(&curline[9]));
@@ -182,19 +181,25 @@ void readconfig(const char *configfile) {
 		} else if (!strncmp("this_site ", curline, 10)) {
 			config.thissite = strdup(&curline[10]);
 		} else if (!strncmp("socket_name ", curline, 12) ||
-				!strncmp("pks_bin_dir ", curline, 12) ||
-				!strncmp("mail_dir ", curline, 9) ||
 				!strncmp("www_port ", curline, 9)) {
 			/*
 			 * Not applicable; ignored for compatibility with pksd.
 			 */
+		} else if (!strncmp("pks_bin_dir ", curline, 12)) {
+			config.bin_dir = strdup(&curline[12]);
+		} else if (!strncmp("mail_dir ", curline, 9)) {
+			config.mail_dir = strdup(&curline[9]);
 		} else if (!strncmp("db_backend ", curline, 11)) {
+			backend->type = strdup(&curline[11]);
+			backend->name = strdup(&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("sock_dir ", curline, 9)) {
+			config.sock_dir = strdup(&curline[9]);
 		} else if (!strncmp("check_sighash ", curline, 9)) {
 			config.check_sighash = parsebool(&curline[9],
 						config.check_sighash);
@@ -203,7 +208,12 @@ void readconfig(const char *configfile) {
 				"Unknown config line: %s", curline);
 		}
 
-			fgets(curline, 1023, conffile);
+			if (!fgets(curline, 1023, conffile) &&
+					!feof(conffile)) {
+				logthing(LOGTHING_CRITICAL,
+					"Problem reading configuration file.");
+				break;
+			}
 		}
 		fclose(conffile);
 	} else {
@@ -212,7 +222,41 @@ void readconfig(const char *configfile) {
 	}
 }
 
+void cleanupdbconfig(void *object)
+{
+	struct onak_db_config *dbconfig = (struct onak_db_config *) object;
+
+	if (dbconfig->name != NULL) {
+		free(dbconfig->name);
+		dbconfig->name = NULL;
+	}
+	if (dbconfig->type != NULL) {
+		free(dbconfig->type);
+		dbconfig->type = NULL;
+	}
+	if (dbconfig->location != NULL) {
+		free(dbconfig->location);
+		dbconfig->location = NULL;
+	}
+	if (dbconfig->hostname != NULL) {
+		free(dbconfig->hostname);
+		dbconfig->hostname = NULL;
+	}
+	if (dbconfig->username != NULL) {
+		free(dbconfig->username);
+		dbconfig->username = NULL;
+	}
+	if (dbconfig->password != NULL) {
+		free(dbconfig->password);
+		dbconfig->password = NULL;
+	}
+}
+
 void cleanupconfig(void) {
+	/* Free any defined DB backend configuration first */
+	llfree(config.backends, cleanupdbconfig);
+	config.backends = NULL;
+
 	if (config.thissite != NULL) {
 		free(config.thissite);
 		config.thissite = NULL;
@@ -225,26 +269,6 @@ void cleanupconfig(void) {
 		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;
@@ -261,4 +285,12 @@ void cleanupconfig(void) {
 		free(config.backends_dir);
 		config.backends_dir = NULL;
 	}
+	if (config.bin_dir != NULL) {
+		free(config.bin_dir);
+		config.bin_dir = NULL;
+	}
+	if (config.mail_dir != NULL) {
+		free(config.mail_dir);
+		config.mail_dir = NULL;
+	}
 }