persistence of DeviceClass

[meshlink] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 5231a9dfca25fc16c1a8fd3fbf63b9c0a8001081..ad4b28b89708e0db5378ac5ec8ef460295c04dce 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -125,7 +125,7 @@ bool get_config_bool(const config_t *cfg, bool *result) {
                return true;
        }
 
-       logger(DEBUG_ALWAYS, LOG_ERR, "\"yes\" or \"no\" expected for configuration variable %s in %s line %d",
+       logger(NULL, MESHLINK_ERROR, "\"yes\" or \"no\" expected for configuration variable %s in %s line %d",
                   cfg->variable, cfg->file, cfg->line);
 
        return false;
@@ -138,12 +138,28 @@ bool get_config_int(const config_t *cfg, int *result) {
        if(sscanf(cfg->value, "%d", result) == 1)
                return true;
 
-       logger(DEBUG_ALWAYS, LOG_ERR, "Integer expected for configuration variable %s in %s line %d",
+       logger(NULL, MESHLINK_ERROR, "Integer expected for configuration variable %s in %s line %d",
                   cfg->variable, cfg->file, cfg->line);
 
        return false;
 }
 
+bool set_config_int(config_t *cfg, int val)
+{
+       if(!cfg)
+               return false;
+
+       char val_str[1024];
+       snprintf(val_str, sizeof(val_str), "%d", val);
+
+       if(cfg->value)
+               free(cfg->value);
+
+       cfg->value = xstrdup(val_str);
+
+       return true;
+}
+
 bool get_config_string(const config_t *cfg, char **result) {
        if(!cfg)
                return false;
@@ -153,6 +169,19 @@ bool get_config_string(const config_t *cfg, char **result) {
        return true;
 }
 
+bool set_config_string(config_t *cfg, const char* val)
+{
+       if(!cfg)
+               return false;
+
+       if(cfg->value)
+               free(cfg->value);
+
+       cfg->value = xstrdup(val);
+
+       return true;
+}
+
 bool get_config_address(const config_t *cfg, struct addrinfo **result) {
        struct addrinfo *ai;
 
@@ -166,7 +195,7 @@ bool get_config_address(const config_t *cfg, struct addrinfo **result) {
                return true;
        }
 
-       logger(DEBUG_ALWAYS, LOG_ERR, "Hostname or IP address expected for configuration variable %s in %s line %d",
+       logger(NULL, MESHLINK_ERROR, "Hostname or IP address expected for configuration variable %s in %s line %d",
                   cfg->variable, cfg->file, cfg->line);
 
        return false;
@@ -221,7 +250,7 @@ config_t *parse_config_line(char *line, const char *fname, int lineno) {
 
        if(!*value) {
                const char err[] = "No value for variable";
-               logger(DEBUG_ALWAYS, LOG_ERR, "%s `%s' on line %d while reading config file %s",
+               logger(NULL, MESHLINK_ERROR, "%s `%s' on line %d while reading config file %s",
                        err, variable, lineno, fname);
                return NULL;
        }
@@ -251,7 +280,7 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) {
        fp = fopen(fname, "r");
 
        if(!fp) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Cannot open config file %s: %s", fname, strerror(errno));
+               logger(NULL, MESHLINK_ERROR, "Cannot open config file %s: %s", fname, strerror(errno));
                return false;
        }
 
@@ -291,6 +320,45 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) {
        return result;
 }
 
+bool write_config_file(const struct splay_tree_t *config_tree, const char *fname)
+{
+       FILE *fp;
+
+       fp = fopen(fname, "w+");
+
+       if(!fp) {
+               logger(NULL, MESHLINK_ERROR, "Cannot open config file %s: %s", fname, strerror(errno));
+               return false;
+       }
+
+       for splay_each(config_t, cnf, config_tree)
+       {
+               if(fwrite(cnf->variable, sizeof(char), strlen(cnf->variable), fp) < strlen(cnf->variable)) {
+                       logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
+                       return false;
+               }
+
+               if(fwrite(" = ", sizeof(char), 3, fp) < 3) {
+                       logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
+                       return false;
+               }
+
+               if(fwrite(cnf->value, sizeof(char), strlen(cnf->value), fp) < strlen(cnf->value)) {
+                       logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
+                       return false;
+               }
+
+               if(fwrite("\n", sizeof(char), 1, fp) < 1) {
+                       logger(NULL, MESHLINK_ERROR, "Cannot write to config file %s: %s", fname, strerror(errno));
+                       return false;
+               }
+       }
+
+       fclose(fp);
+
+       return true;
+}
+
 bool read_server_config(meshlink_handle_t *mesh) {
        char filename[PATH_MAX];
        bool x;
@@ -300,7 +368,7 @@ bool read_server_config(meshlink_handle_t *mesh) {
        x = read_config_file(mesh->config, filename);
 
        if(!x && errno)
-               logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", filename, strerror(errno));
+               logger(mesh, MESHLINK_ERROR, "Failed to read `%s': %s", filename, strerror(errno));
 
        return x;
 }
@@ -315,6 +383,14 @@ bool read_host_config(meshlink_handle_t *mesh, splay_tree_t *config_tree, const
        return x;
 }
 
+bool write_host_config(struct meshlink_handle *mesh, const struct splay_tree_t *config_tree, const char *name)
+{
+       char filename[PATH_MAX];
+
+       snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+       return write_config_file(config_tree, filename);
+}
+
 bool append_config_file(meshlink_handle_t *mesh, const char *name, const char *key, const char *value) {
        char filename[PATH_MAX];
        snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
@@ -322,7 +398,7 @@ bool append_config_file(meshlink_handle_t *mesh, const char *name, const char *k
        FILE *fp = fopen(filename, "a");
 
        if(!fp) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Cannot open config file %s: %s", filename, strerror(errno));
+               logger(mesh, MESHLINK_ERROR, "Cannot open config file %s: %s", filename, strerror(errno));
        } else {
                fprintf(fp, "%s = %s\n", key, value);
                fclose(fp);