New '-o' option to configure server or hosts from command line

[tinc] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 7c8cd0b..36c0fdb 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -2,6 +2,7 @@
     connection.c -- connection list management
     Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
+                  2008      Max Rijevski <maksuf@gmail.com>
 
     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
@@ -40,8 +41,8 @@ static int connection_compare(const connection_t *a, const connection_t *b) {
 void init_connections(void) {
        connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, (avl_action_t) free_connection);
        broadcast = new_connection();
-       broadcast->name = xstrdup(_("everyone"));
-       broadcast->hostname = xstrdup(_("BROADCAST"));
+       broadcast->name = xstrdup("everyone");
+       broadcast->hostname = xstrdup("BROADCAST");
 }
 
 void exit_connections(void) {
@@ -115,25 +116,40 @@ void dump_connections(void) {
        avl_node_t *node;
        connection_t *c;
 
-       logger(LOG_DEBUG, _("Connections:"));
+       logger(LOG_DEBUG, "Connections:");
 
        for(node = connection_tree->head; node; node = node->next) {
                c = node->data;
-               logger(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x outbuf %d/%d/%d"),
+               logger(LOG_DEBUG, " %s at %s options %x socket %d status %04x outbuf %d/%d/%d",
                           c->name, c->hostname, c->options, c->socket, bitfield_to_int(&c->status, sizeof c->status),
                           c->outbufsize, c->outbufstart, c->outbuflen);
        }
 
-       logger(LOG_DEBUG, _("End of connections."));
+       logger(LOG_DEBUG, "End of connections.");
 }
 
 bool read_connection_config(connection_t *c) {
+       list_node_t *node, *next;
+       size_t name_len = strlen(c->name);
        char *fname;
-       int x;
+       bool x;
+
+       for(node = cmdline_conf->tail; node; node = next) {
+               config_t *cfg = (config_t *)node->data;
+               next = node->prev;
+               if (!strncmp(c->name, cfg->variable, name_len) && cfg->variable[name_len] == '.') {
+                       config_t *new_cfg = new_config();
+                       new_cfg->variable = xstrdup(cfg->variable + name_len + 1);
+                       new_cfg->value = xstrdup(cfg->value);
+                       new_cfg->file = NULL;
+                       new_cfg->line = cfg->line;
+                       config_add(c->config_tree, new_cfg);
+               }
+       }
 
        xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
        x = read_config_file(c->config_tree, fname);
        free(fname);
 
-       return x == 0;
+       return x;
 }