Add the DirectOnly option.

[oweals/tinc.git] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 6360c597029f93e4e390d10e87a639536f02ce57..867fef9455592e5e5c0fa26e5f294517bdcdda99 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -201,6 +201,65 @@ bool read_rsa_private_key(void) {
        return true;
 }
 
+/*
+  Read Subnets from all host config files
+*/
+static void load_all_subnets(void) {
+       DIR *dir;
+       struct dirent *ent;
+       char *dname;
+       char *fname;
+       avl_tree_t *config_tree;
+       config_t *cfg;
+       subnet_t *s;
+       node_t *n;
+       bool result;
+
+       xasprintf(&dname, "%s/hosts", confbase);
+       dir = opendir(dname);
+       if(!dir) {
+               logger(LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
+               free(dname);
+               return;
+       }
+
+       while((ent = readdir(dir))) {
+               if(!check_id(ent->d_name))
+                       continue;
+
+               n = lookup_node(ent->d_name);
+               if(n)
+                       continue;
+
+               #ifdef _DIRENT_HAVE_D_TYPE
+               //if(ent->d_type != DT_REG)
+               //      continue;
+               #endif
+
+               xasprintf(&fname, "%s/hosts/%s", confbase, ent->d_name);
+               init_configuration(&config_tree);
+               result = read_config_file(config_tree, fname);
+               free(fname);
+               if(!result)
+                       continue;
+
+               n = new_node();
+               n->name = xstrdup(ent->d_name);
+               node_add(n);
+
+               for(cfg = lookup_config(config_tree, "Subnet"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+                       if(!get_config_subnet(cfg, &s))
+                               continue;
+
+                       subnet_add(n, s);
+               }
+
+               exit_configuration(&config_tree);
+       }
+
+       closedir(dir);
+}
+
 /*
   Configure node_t myself and set up the local sockets (listen only)
 */
@@ -280,7 +339,10 @@ bool setup_myself(void) {
        if(myself->options & OPTION_TCPONLY)
                myself->options |= OPTION_INDIRECT;
 
+       get_config_bool(lookup_config(config_tree, "DirectOnly"), &directonly);
+       get_config_bool(lookup_config(config_tree, "StrictSubnets"), &strictsubnets);
        get_config_bool(lookup_config(config_tree, "TunnelServer"), &tunnelserver);
+       strictsubnets |= tunnelserver;
 
        if(get_config_string(lookup_config(config_tree, "Mode"), &mode)) {
                if(!strcasecmp(mode, "router"))
@@ -294,8 +356,21 @@ bool setup_myself(void) {
                        return false;
                }
                free(mode);
-       } else
-               routing_mode = RMODE_ROUTER;
+       }
+
+       if(get_config_string(lookup_config(config_tree, "Forwarding"), &mode)) {
+               if(!strcasecmp(mode, "off"))
+                       routing_mode = FMODE_OFF;
+               else if(!strcasecmp(mode, "internal"))
+                       routing_mode = FMODE_INTERNAL;
+               else if(!strcasecmp(mode, "kernel"))
+                       routing_mode = FMODE_KERNEL;
+               else {
+                       logger(LOG_ERR, "Invalid forwarding mode!");
+                       return false;
+               }
+               free(mode);
+       }
 
        choice = true;
        get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice);
@@ -426,6 +501,9 @@ bool setup_myself(void) {
 
        graph();
 
+       if(strictsubnets)
+               load_all_subnets();
+
        /* Open device */
 
        if(!setup_device())