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

diff --git a/src/net_setup.c b/src/net_setup.c
index 6b55521b..ee8296cd 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -63,13 +63,11 @@ bool node_read_ecdsa_public_key(node_t *n) {
 
 	splay_tree_t *config_tree;
 	FILE *fp;
-	char *pubname = NULL, *hcfname = NULL;
+	char *pubname = NULL;
 	char *p;
 
-	xasprintf(&hcfname, "%s" SLASH "hosts" SLASH "%s", confbase, n->name);
-
 	init_configuration(&config_tree);
-	if(!read_config_file(config_tree, hcfname))
+	if(!read_host_config(config_tree, n->name))
 		goto exit;
 
 	/* First, check for simple ECDSAPublicKey statement */
@@ -97,7 +95,6 @@ bool node_read_ecdsa_public_key(node_t *n) {
 
 exit:
 	exit_configuration(&config_tree);
-	free(hcfname);
 	free(pubname);
 	return n->ecdsa;
 }
@@ -110,6 +107,12 @@ bool read_ecdsa_public_key(connection_t *c) {
 	char *fname;
 	char *p;
 
+	if(!c->config_tree) {
+		init_configuration(&c->config_tree);
+		if(!read_host_config(c->config_tree, c->name))
+			return false;
+	}
+
 	/* First, check for simple ECDSAPublicKey statement */
 
 	if(get_config_string(lookup_config(c->config_tree, "ECDSAPublicKey"), &p)) {
@@ -220,6 +223,30 @@ static bool read_ecdsa_private_key(void) {
 	return myself->connection->ecdsa;
 }
 
+static bool read_invitation_key(void) {
+	FILE *fp;
+	char *fname;
+
+	if(invitation_key) {
+		ecdsa_free(invitation_key);
+		invitation_key = NULL;
+	}
+
+	xasprintf(&fname, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", confbase);
+
+	fp = fopen(fname, "r");
+
+	if(fp) {
+		invitation_key = ecdsa_read_pem_private_key(fp);
+		fclose(fp);
+		if(!invitation_key)
+			logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", fname, strerror(errno));
+	}
+
+	free(fname);
+	return invitation_key;
+}
+
 static bool read_rsa_private_key(void) {
 	FILE *fp;
 	char *fname;
@@ -313,14 +340,10 @@ void load_all_subnets(void) {
 		//	continue;
 		#endif
 
-		char *fname;
-		xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, ent->d_name);
-
 		splay_tree_t *config_tree;
 		init_configuration(&config_tree);
 		read_config_options(config_tree, ent->d_name);
-		read_config_file(config_tree, fname);
-		free(fname);
+		read_host_config(config_tree, ent->d_name);
 
 		if(!n) {
 			n = new_node();
@@ -421,6 +444,7 @@ bool setup_myself_reloadable(void) {
 	char *fmode = NULL;
 	char *bmode = NULL;
 	char *afname = NULL;
+	char *address = NULL;
 	char *space;
 	bool choice;
 
@@ -511,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;
@@ -604,6 +638,8 @@ bool setup_myself_reloadable(void) {
 
 	get_config_bool(lookup_config(config_tree, "DisableBuggyPeers"), &disablebuggypeers);
 
+	read_invitation_key();
+
 	return true;
 }
 
@@ -612,7 +648,6 @@ bool setup_myself_reloadable(void) {
 */
 static bool setup_myself(void) {
 	char *name, *hostname, *cipher, *digest, *type;
-	char *fname = NULL;
 	char *address = NULL;
 
 	if(!(name = get_name())) {
@@ -624,10 +659,7 @@ static bool setup_myself(void) {
 	myself->connection = new_connection();
 	myself->name = name;
 	myself->connection->name = xstrdup(name);
-	xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
-	read_config_options(config_tree, name);
-	read_config_file(config_tree, fname);
-	free(fname);
+	read_host_config(config_tree, name);
 
 	if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
 		myport = xstrdup("655");
@@ -917,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;
 			}