X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=64d25150c7cb49fd532aca7f13c20a15fd248af0;hb=8f8424445810aa7d5e9d4d537494e64811a8e29f;hp=34d8980e55a771acd13d2472eacca699e8d0c879;hpb=3c163a3796c984deb874fb1cca1ed9a85fc1d087;p=tinc diff --git a/src/net_setup.c b/src/net_setup.c index 34d8980e..64d25150 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; } @@ -226,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; @@ -319,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(); @@ -427,6 +444,7 @@ bool setup_myself_reloadable(void) { char *fmode = NULL; char *bmode = NULL; char *afname = NULL; + char *address = NULL; char *space; bool choice; @@ -437,11 +455,7 @@ bool setup_myself_reloadable(void) { free(scriptextension); if(!get_config_string(lookup_config(config_tree, "ScriptsExtension"), &scriptextension)) -#ifdef HAVE_MINGW - scriptextension = xstrdup(".bat"); -#else scriptextension = xstrdup(""); -#endif get_config_string(lookup_config(config_tree, "Proxy"), &proxy); if(proxy) { @@ -517,6 +531,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; @@ -610,6 +634,8 @@ bool setup_myself_reloadable(void) { get_config_bool(lookup_config(config_tree, "DisableBuggyPeers"), &disablebuggypeers); + read_invitation_key(); + return true; } @@ -618,7 +644,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())) { @@ -630,10 +655,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"); @@ -685,7 +707,12 @@ static bool setup_myself(void) { get_config_bool(lookup_config(config_tree, "TunnelServer"), &tunnelserver); strictsubnets |= tunnelserver; - + if(get_config_int(lookup_config(config_tree, "MaxConnectionBurst"), &max_connection_burst)) { + if(max_connection_burst <= 0) { + logger(DEBUG_ALWAYS, LOG_ERR, "MaxConnectionBurst cannot be negative!"); + return false; + } + } if(get_config_int(lookup_config(config_tree, "UDPRcvBuf"), &udp_rcvbuf)) { if(udp_rcvbuf <= 0) { @@ -802,12 +829,11 @@ static bool setup_myself(void) { io_add(&device_io, handle_device_data, NULL, device_fd, IO_READ); /* Run tinc-up script to further initialize the tap interface */ - char *envp[5]; + char *envp[5] = {NULL}; xasprintf(&envp[0], "NETNAME=%s", netname ? : ""); xasprintf(&envp[1], "DEVICE=%s", device ? : ""); xasprintf(&envp[2], "INTERFACE=%s", iface ? : ""); xasprintf(&envp[3], "NAME=%s", myself->name); - envp[4] = NULL; execute_script("tinc-up", envp); @@ -820,37 +846,6 @@ static bool setup_myself(void) { /* Open sockets */ -#ifndef HAVE_MINGW - int unix_fd = socket(AF_UNIX, SOCK_STREAM, 0); - if(unix_fd < 0) { - logger(DEBUG_ALWAYS, LOG_ERR, "Could not create UNIX socket: %s", sockstrerror(errno)); - return false; - } - - struct sockaddr_un sa; - sa.sun_family = AF_UNIX; - strncpy(sa.sun_path, unixsocketname, sizeof sa.sun_path); - - if(connect(unix_fd, (struct sockaddr *)&sa, sizeof sa) >= 0) { - logger(DEBUG_ALWAYS, LOG_ERR, "UNIX socket %s is still in use!", unixsocketname); - return false; - } - - unlink(unixsocketname); - - if(bind(unix_fd, (struct sockaddr *)&sa, sizeof sa) < 0) { - logger(DEBUG_ALWAYS, LOG_ERR, "Could not bind UNIX socket to %s: %s", unixsocketname, sockstrerror(errno)); - return false; - } - - if(listen(unix_fd, 3) < 0) { - logger(DEBUG_ALWAYS, LOG_ERR, "Could not listen on UNIX socket %s: %s", unixsocketname, sockstrerror(errno)); - return false; - } - - io_add(&unix_socket, handle_new_unix_connection, &unix_socket, unix_fd, IO_READ); -#endif - if(!do_detach && getenv("LISTEN_FDS")) { sockaddr_t sa; socklen_t salen; @@ -923,8 +918,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; } @@ -1035,17 +1029,11 @@ void close_network_connections(void) { close(listen_socket[i].udp.fd); } -#ifndef HAVE_MINGW - io_del(&unix_socket); - close(unix_socket.fd); -#endif - - char *envp[5]; + char *envp[5] = {NULL}; xasprintf(&envp[0], "NETNAME=%s", netname ? : ""); xasprintf(&envp[1], "DEVICE=%s", device ? : ""); xasprintf(&envp[2], "INTERFACE=%s", iface ? : ""); xasprintf(&envp[3], "NAME=%s", myself->name); - envp[4] = NULL; exit_requests(); exit_edges();