X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet_setup.c;h=867fef9455592e5e5c0fa26e5f294517bdcdda99;hb=3e4829e78a3c7f7e19017d05611e5b69d5268119;hp=cb606caad46897e9cb73def798b178e82d5372af;hpb=5038964032ef55913b2d4741c67bf191b2208abb;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index cb606caa..867fef94 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -339,6 +339,7 @@ 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;
@@ -355,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);