X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_setup.c;h=e71d4466dddd6fdd246e0cce6147e539d53e0298;hp=2c07ec63ebac40f4141fe85c6ae4906a6169dc5c;hb=6b12bea62fe2e4bd8b5b6bd0e5ca7f53318705db;hpb=e8fbef5de653e4df35eee49aae6e1ac92d6466e6 diff --git a/src/net_setup.c b/src/net_setup.c index 2c07ec63..e71d4466 100644 --- a/src/net_setup.c +++ b/src/net_setup.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: net_setup.c,v 1.1.2.47 2003/12/07 14:28:39 guus Exp $ + $Id: net_setup.c,v 1.1.2.48 2003/12/20 19:47:52 guus Exp $ */ #include "system.h" @@ -272,21 +272,20 @@ bool setup_myself(void) /* Check some options */ - if(get_config_bool(lookup_config(config_tree, "IndirectData"), &choice)) - if(choice) - myself->options |= OPTION_INDIRECT; + if(get_config_bool(lookup_config(config_tree, "IndirectData"), &choice) && choice) + myself->options |= OPTION_INDIRECT; + + if(get_config_bool(lookup_config(config_tree, "TCPOnly"), &choice) && choice) + myself->options |= OPTION_TCPONLY; - if(get_config_bool(lookup_config(config_tree, "TCPOnly"), &choice)) - if(choice) - myself->options |= OPTION_TCPONLY; + if(get_config_bool(lookup_config(myself->connection->config_tree, "IndirectData"), &choice) && choice) + myself->options |= OPTION_INDIRECT; - if(get_config_bool(lookup_config(myself->connection->config_tree, "IndirectData"), &choice)) - if(choice) - myself->options |= OPTION_INDIRECT; + if(get_config_bool(lookup_config(myself->connection->config_tree, "TCPOnly"), &choice) && choice) + myself->options |= OPTION_TCPONLY; - if(get_config_bool(lookup_config(myself->connection->config_tree, "TCPOnly"), &choice)) - if(choice) - myself->options |= OPTION_TCPONLY; + if(get_config_bool(lookup_config(myself->connection->config_tree, "DontFragment"), &choice) && choice) + myself->options |= OPTION_DONTFRAGMENT; if(myself->options & OPTION_TCPONLY) myself->options |= OPTION_INDIRECT;