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

diff --git a/src/net_setup.c b/src/net_setup.c
index e101d9de..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.38 2003/07/22 21:13:23 guus Exp $
+    $Id: net_setup.c,v 1.1.2.40 2003/07/29 22:59:00 guus Exp $
 */
 
 #include "system.h"
@@ -362,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... */
 
@@ -442,14 +444,14 @@ bool setup_myself(void)
 
 	/* Open sockets */
 
-	memset(&hint, 0, sizeof(hint));
-
 	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);