X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=ee8296cd5b49fff47892b64770ffab8ec871c320;hb=b811e980e3a2a301c019459b91df2252468fd572;hp=747dbd89c1dc8dad313d98f87cf9807eb8b66bda;hpb=ced4c1a327b321a6d73028a3a15b41b0be64d910;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index 747dbd89..ee8296cd 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -444,6 +444,7 @@ bool setup_myself_reloadable(void) {
 	char *fmode = NULL;
 	char *bmode = NULL;
 	char *afname = NULL;
+	char *address = NULL;
 	char *space;
 	bool choice;
 
@@ -534,6 +535,16 @@ bool setup_myself_reloadable(void) {
 	get_config_bool(lookup_config(config_tree, "DirectOnly"), &directonly);
 	get_config_bool(lookup_config(config_tree, "LocalDiscovery"), &localdiscovery);
 
+	memset(&localdiscovery_address, 0, sizeof localdiscovery_address);
+	if(get_config_string(lookup_config(config_tree, "LocalDiscoveryAddress"), &address)) {
+		struct addrinfo *ai = str2addrinfo(address, myport, SOCK_DGRAM);
+		free(address);
+		if(!ai)
+			return false;
+		memcpy(&localdiscovery_address, ai->ai_addr, ai->ai_addrlen);
+	}
+
+
 	if(get_config_string(lookup_config(config_tree, "Mode"), &rmode)) {
 		if(!strcasecmp(rmode, "router"))
 			routing_mode = RMODE_ROUTER;
@@ -938,8 +949,7 @@ static bool setup_myself(void) {
 			free(address);
 
 			if(err || !ai) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "getaddrinfo",
-					   gai_strerror(err));
+				logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "getaddrinfo", err == EAI_SYSTEM ? strerror(err) : gai_strerror(err));
 				return false;
 			}