Set FD_CLOEXEC flag on all sockets.

[tinc] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index dc5d2dc..1560541 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -2,7 +2,8 @@
     conf.c -- configuration code
     Copyright (C) 1998 Robert van der Meulen
                   1998-2005 Ivo Timmermans
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2010 Guus Sliepen <guus@tinc-vpn.org>
+                  2010-2011 Julien Muchembled <jm@jmuchemb.eu>
                  2000 Cris van Pelt
 
     This program is free software; you can redistribute it and/or modify
@@ -23,7 +24,9 @@
 #include "system.h"
 
 #include "avl_tree.h"
+#include "connection.h"
 #include "conf.h"
+#include "list.h"
 #include "logger.h"
 #include "netutl.h"                            /* for str2address */
 #include "protocol.h"
@@ -90,7 +93,7 @@ void config_add(avl_tree_t *config_tree, config_t *cfg) {
        avl_insert(config_tree, cfg);
 }
 
-config_t *lookup_config(avl_tree_t *config_tree, char *variable) {
+config_t *lookup_config(const avl_tree_t *config_tree, char *variable) {
        config_t cfg, *found;
 
        cfg.variable = variable;
@@ -108,7 +111,7 @@ config_t *lookup_config(avl_tree_t *config_tree, char *variable) {
        return found;
 }
 
-config_t *lookup_config_next(avl_tree_t *config_tree, const config_t *cfg) {
+config_t *lookup_config_next(const avl_tree_t *config_tree, const config_t *cfg) {
        avl_node_t *node;
        config_t *found;
 
@@ -186,7 +189,7 @@ bool get_config_address(const config_t *cfg, struct addrinfo **result) {
 }
 
 bool get_config_subnet(const config_t *cfg, subnet_t ** result) {
-       subnet_t subnet = {0};
+       subnet_t subnet = {NULL};
 
        if(!cfg)
                return false;
@@ -335,20 +338,42 @@ bool read_config_file(avl_tree_t *config_tree, const char *fname) {
        return result;
 }
 
-bool read_server_config() {
+void read_config_options(avl_tree_t *config_tree, const char *prefix) {
        list_node_t *node, *next;
-       char *fname;
-       bool x;
+       size_t prefix_len = prefix ? strlen(prefix) : 0;
 
        for(node = cmdline_conf->tail; node; node = next) {
-               config_t *cfg = (config_t *)node->data;
+               config_t *orig_cfg, *cfg = (config_t *)node->data;
                next = node->prev;
-               if (!strchr(cfg->variable, '.')) {
-                       config_add(config_tree, cfg);
+
+               if(!prefix) {
+                       if(strchr(cfg->variable, '.'))
+                               continue;
                        node->data = NULL;
                        list_unlink_node(cmdline_conf, node);
+               } else {
+                       if(strncmp(prefix, cfg->variable, prefix_len) ||
+                          cfg->variable[prefix_len] != '.')
+                               continue;
+                       /* Because host configuration is parsed again when
+                          reconnecting, nodes must not be freed when a prefix
+                          is given. */
+                       orig_cfg = cfg;
+                       cfg = new_config();
+                       cfg->variable = xstrdup(orig_cfg->variable + prefix_len + 1);
+                       cfg->value = xstrdup(orig_cfg->value);
+                       cfg->file = NULL;
+                       cfg->line = orig_cfg->line;
                }
+               config_add(config_tree, cfg);
        }
+}
+
+bool read_server_config(void) {
+       char *fname;
+       bool x;
+
+       read_config_options(config_tree, NULL);
 
        xasprintf(&fname, "%s/tinc.conf", confbase);
        x = read_config_file(config_tree, fname);
@@ -362,6 +387,19 @@ bool read_server_config() {
        return x;
 }
 
+bool read_connection_config(connection_t *c) {
+       char *fname;
+       bool x;
+
+       read_config_options(c->config_tree, c->name);
+
+       xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
+       x = read_config_file(c->config_tree, fname);
+       free(fname);
+
+       return x;
+}
+
 FILE *ask_and_open(const char *filename, const char *what) {
        FILE *r;
        char *directory;
@@ -430,24 +468,33 @@ bool disable_old_keys(FILE *f) {
        rewind(f);
        pos = ftell(f);
 
+       if(pos < 0)
+               return false;
+
        while(fgets(buf, sizeof buf, f)) {
                if(!strncmp(buf, "-----BEGIN RSA", 14)) {       
                        buf[11] = 'O';
                        buf[12] = 'L';
                        buf[13] = 'D';
-                       fseek(f, pos, SEEK_SET);
-                       fputs(buf, f);
+                       if(fseek(f, pos, SEEK_SET))
+                               break;
+                       if(fputs(buf, f) <= 0)
+                               break;
                        disabled = true;
                }
                else if(!strncmp(buf, "-----END RSA", 12)) {    
                        buf[ 9] = 'O';
                        buf[10] = 'L';
                        buf[11] = 'D';
-                       fseek(f, pos, SEEK_SET);
-                       fputs(buf, f);
+                       if(fseek(f, pos, SEEK_SET))
+                               break;
+                       if(fputs(buf, f) <= 0)
+                               break;
                        disabled = true;
                }
                pos = ftell(f);
+               if(pos < 0)
+                       break;
        }
 
        return disabled;