X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_setup.c;h=3695e18e6aedcba572a4c0b337726304ad886f24;hp=5a5564e9b15397831de10a42924cdff119cee5aa;hb=2ed154e73192d5e162544bc570abbb3a1df3ec83;hpb=eefa28059ab989c915a7d95fb4ae728abd7ce713

diff --git a/src/net_setup.c b/src/net_setup.c
index 5a5564e9..3695e18e 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.37 2003/07/22 20:55:20 guus Exp $
+    $Id: net_setup.c,v 1.1.2.40 2003/07/29 22:59:00 guus Exp $
 */
 
 #include "system.h"
@@ -201,9 +201,10 @@ bool setup_myself(void)
 	subnet_t *subnet;
 	char *name, *hostname, *mode, *afname, *cipher, *digest;
 	char *address = NULL;
+	char *envp[5];
 	struct addrinfo hint, *ai, *aip;
 	bool choice;
-	int err;
+	int i, err;
 
 	cp();
 
@@ -361,8 +362,10 @@ bool setup_myself(void)
 
 	keyexpires = now + keylifetime;
 	
-	EVP_CIPHER_CTX_init(&packet_ctx);
-	EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
+	if(myself->cipher) {
+		EVP_CIPHER_CTX_init(&packet_ctx);
+		EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
+	}
 
 	/* Check if we want to use message authentication codes... */
 
@@ -383,8 +386,7 @@ bool setup_myself(void)
 
 	myself->connection->outdigest = EVP_sha1();
 
-	if(get_config_int
-	   (lookup_config(myself->connection->config_tree, "MACLength"),
+	if(get_config_int(lookup_config(myself->connection->config_tree, "MACLength"),
 		&myself->maclength)) {
 		if(myself->digest) {
 			if(myself->maclength > myself->digest->md_size) {
@@ -402,8 +404,7 @@ bool setup_myself(void)
 
 	/* Compression */
 
-	if(get_config_int
-	   (lookup_config(myself->connection->config_tree, "Compression"),
+	if(get_config_int(lookup_config(myself->connection->config_tree, "Compression"),
 		&myself->compression)) {
 		if(myself->compression < 0 || myself->compression > 11) {
 			logger(LOG_ERR, _("Bogus compression level!"));
@@ -424,16 +425,33 @@ bool setup_myself(void)
 
 	graph();
 
-	/* Open sockets */
+	/* Open device */
+
+	if(!setup_device())
+		return false;
 
-	memset(&hint, 0, sizeof(hint));
+	/* Run tinc-up script to further initialize the tap interface */
+	asprintf(&envp[0], "NETNAME=%s", netname ? : "");
+	asprintf(&envp[1], "DEVICE=%s", device ? : "");
+	asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
+	asprintf(&envp[3], "NAME=%s", myself->name);
+	envp[4] = NULL;
+
+	execute_script("tinc-up", envp);
+
+	for(i = 0; i < 5; i++)
+		free(envp[i]);
+
+	/* Open sockets */
 
 	get_config_string(lookup_config(config_tree, "BindToAddress"), &address);
 
-	hint.ai_family = addressfamily;
-	hint.ai_socktype = SOCK_STREAM;
-	hint.ai_protocol = IPPROTO_TCP;
-	hint.ai_flags = AI_PASSIVE;
+	hint = (struct addrinfo) {
+		.ai_family = addressfamily,
+		.ai_socktype = SOCK_STREAM,
+		.ai_protocol = IPPROTO_TCP,
+		.ai_flags = AI_PASSIVE,
+	};
 
 	err = getaddrinfo(address, myport, &hint, &ai);
 
@@ -485,9 +503,6 @@ bool setup_myself(void)
 */
 bool setup_network_connections(void)
 {
-	char *envp[5];
-	int i;
-
 	cp();
 
 	now = time(NULL);
@@ -506,24 +521,9 @@ bool setup_network_connections(void)
 	} else
 		pingtimeout = 60;
 
-	if(!setup_device())
-		return false;
-
 	if(!setup_myself())
 		return false;
 
-	/* Run tinc-up script to further initialize the tap interface */
-	asprintf(&envp[0], "NETNAME=%s", netname ? : "");
-	asprintf(&envp[1], "DEVICE=%s", device ? : "");
-	asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
-	asprintf(&envp[3], "NAME=%s", myself->name);
-	envp[4] = NULL;
-
-	execute_script("tinc-up", envp);
-
-	for(i = 0; i < 5; i++)
-		free(envp[i]);
-
 	try_outgoing_connections();
 
 	return true;