/*
* onak-conf.c - Routines related to runtime config.
*
- * Copyright 2002 Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002,2012 Jonathan McDowell <noodles@earth.li>
*
* 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
#include "log.h"
#include "onak-conf.h"
-extern struct dbfuncs DBFUNCS;
+extern struct onak_dbctx *DBINIT(bool readonly);
/*
* config - Runtime configuration for onak.
NULL, /* logfile */
false, /* use_keyd */
+ ".", /* sock_dir */
/*
* Options for directory backends.
NULL, /* db_backend */
NULL, /* backends_dir */
- &DBFUNCS, /* Default dbfuncs struct */
+ DBINIT, /* Default db initialisation function */
+
+ true, /* Check packet sig hashes */
};
bool parsebool(char *str, bool fallback)
FILE *conffile;
char curline[1024];
int i;
+ char *dir, *conf;
+ size_t len;
curline[1023] = 0;
if (configfile == NULL) {
- conffile = fopen(CONFIGFILE, "r");
+ conffile = NULL;
+ if ((dir = getenv("XDG_CONFIG_HOME")) != NULL) {
+ len = strlen(dir) + 1 + 9 + 1; /* dir + / + onak.conf + NUL */
+ conf = malloc(len);
+ snprintf(conf, len, "%s/onak.conf", dir);
+ conffile = fopen(conf, "r");
+ free(conf);
+ } else if ((dir = getenv("HOME")) != NULL) {
+ len = strlen(dir) + 18 + 1; /* dir + /.config/onak.conf + NUL */
+ conf = malloc(len);
+ snprintf(conf, len, "%s/.config/onak.conf", dir);
+ conffile = fopen(conf, "r");
+ free(conf);
+ }
+ if (conffile == NULL) {
+ conffile = fopen(CONFIGFILE, "r");
+ }
} else {
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;
+ }
while (!feof(conffile)) {
for (i = strlen(curline) - 1;
} 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);
} else {
logthing(LOGTHING_ERROR,
"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 {