X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet_socket.c;h=1521208f76986ef518ce73934bcac7bfab7de7a1;hb=21f0bddfa4dca5fb21c9dc4970ac64fa8fe706e4;hp=072984bfaab51abb8d1d46a7f6773a5ce05924b6;hpb=06a4a8c153407b690a3ce3f0e7fdaa8568ccb1a3;p=meshlink diff --git a/src/net_socket.c b/src/net_socket.c index 072984bf..1521208f 100644 --- a/src/net_socket.c +++ b/src/net_socket.c @@ -1,9 +1,6 @@ /* net_socket.c -- Handle various kinds of sockets. - Copyright (C) 1998-2005 Ivo Timmermans, - 2000-2014 Guus Sliepen - 2006 Scott Lamb - 2009 Florian Forster + Copyright (C) 2014 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,11 +21,10 @@ #include "conf.h" #include "connection.h" -#include "control_common.h" #include "list.h" #include "logger.h" +#include "meshlink_internal.h" #include "meta.h" -#include "names.h" #include "net.h" #include "netutl.h" #include "protocol.h" @@ -43,15 +39,10 @@ int addressfamily = AF_UNSPEC; int maxtimeout = 900; int seconds_till_retry = 5; -int udp_rcvbuf = 0; -int udp_sndbuf = 0; int max_connection_burst = 100; listen_socket_t listen_socket[MAXSOCKETS]; int listen_sockets; -#ifndef HAVE_MINGW -io_t unix_socket; -#endif list_t *outgoing_list = NULL; /* Setup sockets */ @@ -84,35 +75,6 @@ static void configure_tcp(connection_t *c) { #endif } -static bool bind_to_interface(int sd) { - char *iface; - -#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) - struct ifreq ifr; - int status; -#endif /* defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) */ - - if(!get_config_string (lookup_config (config_tree, "BindToInterface"), &iface)) - return true; - -#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) - memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ); - ifr.ifr_ifrn.ifrn_name[IFNAMSIZ - 1] = 0; - - status = setsockopt(sd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof(ifr)); - if(status) { - logger(DEBUG_ALWAYS, LOG_ERR, "Can't bind to interface %s: %s", iface, - strerror(errno)); - return false; - } -#else /* if !defined(SOL_SOCKET) || !defined(SO_BINDTODEVICE) */ - logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform", "BindToInterface"); -#endif - - return true; -} - static bool bind_to_address(connection_t *c) { int s = -1; @@ -168,25 +130,6 @@ int setup_listen_socket(const sockaddr_t *sa) { setsockopt(nfd, SOL_IPV6, IPV6_V6ONLY, (void *)&option, sizeof option); #endif - if(get_config_string - (lookup_config(config_tree, "BindToInterface"), &iface)) { -#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) - struct ifreq ifr; - - memset(&ifr, 0, sizeof ifr); - strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ); - - if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof ifr)) { - closesocket(nfd); - logger(DEBUG_ALWAYS, LOG_ERR, "Can't bind to interface %s: %s", iface, - strerror(sockerrno)); - return -1; - } -#else - logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform", "BindToInterface"); -#endif - } - if(bind(nfd, &sa->sa, SALEN(sa->sa))) { closesocket(nfd); addrstr = sockaddr2hostname(sa); @@ -246,12 +189,6 @@ int setup_vpn_in_socket(const sockaddr_t *sa) { setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof option); setsockopt(nfd, SOL_SOCKET, SO_BROADCAST, (void *)&option, sizeof option); - if(udp_rcvbuf && setsockopt(nfd, SOL_SOCKET, SO_RCVBUF, (void *)&udp_rcvbuf, sizeof(udp_rcvbuf))) - logger(DEBUG_ALWAYS, LOG_WARNING, "Can't set UDP SO_RCVBUF to %i: %s", udp_rcvbuf, strerror(errno)); - - if(udp_sndbuf && setsockopt(nfd, SOL_SOCKET, SO_SNDBUF, (void *)&udp_sndbuf, sizeof(udp_sndbuf))) - logger(DEBUG_ALWAYS, LOG_WARNING, "Can't set UDP SO_SNDBUF to %i: %s", udp_sndbuf, strerror(errno)); - #if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY) if(sa->sa.sa_family == AF_INET6) setsockopt(nfd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&option, sizeof option); @@ -262,12 +199,12 @@ int setup_vpn_in_socket(const sockaddr_t *sa) { #endif #if defined(SOL_IP) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO) - if(myself->options & OPTION_PMTU_DISCOVERY) { + if(mesh->self->options & OPTION_PMTU_DISCOVERY) { option = IP_PMTUDISC_DO; setsockopt(nfd, SOL_IP, IP_MTU_DISCOVER, (void *)&option, sizeof(option)); } #elif defined(IPPROTO_IP) && defined(IP_DONTFRAGMENT) - if(myself->options & OPTION_PMTU_DISCOVERY) { + if(mesh->self->options & OPTION_PMTU_DISCOVERY) { option = 1; setsockopt(nfd, IPPROTO_IP, IP_DONTFRAGMENT, (void *)&option, sizeof(option)); } @@ -276,12 +213,12 @@ int setup_vpn_in_socket(const sockaddr_t *sa) { #endif #if defined(SOL_IPV6) && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO) - if(myself->options & OPTION_PMTU_DISCOVERY) { + if(mesh->self->options & OPTION_PMTU_DISCOVERY) { option = IPV6_PMTUDISC_DO; setsockopt(nfd, SOL_IPV6, IPV6_MTU_DISCOVER, (void *)&option, sizeof(option)); } #elif defined(IPPROTO_IPV6) && defined(IPV6_DONTFRAG) - if(myself->options & OPTION_PMTU_DISCOVERY) { + if(mesh->self->options & OPTION_PMTU_DISCOVERY) { option = 1; setsockopt(nfd, IPPROTO_IPV6, IPV6_DONTFRAG, (void *)&option, sizeof(option)); } @@ -289,11 +226,6 @@ int setup_vpn_in_socket(const sockaddr_t *sa) { #warning No way to disable IPv6 fragmentation #endif - if (!bind_to_interface(nfd)) { - closesocket(nfd); - return -1; - } - if(bind(nfd, &sa->sa, SALEN(sa->sa))) { closesocket(nfd); addrstr = sockaddr2hostname(sa); @@ -361,9 +293,7 @@ static void do_outgoing_pipe(connection_t *c, char *command) { setenv("REMOTEADDRESS", host, true); setenv("REMOTEPORT", port, true); setenv("NODE", c->name, true); - setenv("NAME", myself->name, true); - if(netname) - setenv("NETNAME", netname, true); + setenv("NAME", mesh->self->name, true); int result = system(command); if(result < 0) @@ -446,6 +376,7 @@ begin: port = xstrdup(space + 1); *space = 0; } else { + // TODO: Only allow Address statements? if(!get_config_string(lookup_config(outgoing->config_tree, "Port"), &port)) port = xstrdup("655"); } @@ -508,7 +439,6 @@ begin: setsockopt(c->socket, SOL_IPV6, IPV6_V6ONLY, (void *)&option, sizeof option); #endif - bind_to_interface(c->socket); bind_to_address(c); } @@ -534,10 +464,7 @@ begin: c->status.connecting = true; c->name = xstrdup(outgoing->name); - c->outcipher = myself->connection->outcipher; - c->outdigest = myself->connection->outdigest; - c->outmaclength = myself->connection->outmaclength; - c->outcompression = myself->connection->outcompression; + c->outcompression = mesh->self->connection->outcompression; c->last_ping_time = now.tv_sec; connection_add(c); @@ -681,10 +608,7 @@ void handle_new_meta_connection(void *data, int flags) { c = new_connection(); c->name = xstrdup(""); - c->outcipher = myself->connection->outcipher; - c->outdigest = myself->connection->outdigest; - c->outmaclength = myself->connection->outmaclength; - c->outcompression = myself->connection->outcompression; + c->outcompression = mesh->self->connection->outcompression; c->address = sa; c->hostname = sockaddr2hostname(&sa); @@ -703,45 +627,6 @@ void handle_new_meta_connection(void *data, int flags) { send_id(c); } -#ifndef HAVE_MINGW -/* - accept a new UNIX socket connection -*/ -void handle_new_unix_connection(void *data, int flags) { - io_t *io = data; - connection_t *c; - sockaddr_t sa; - int fd; - socklen_t len = sizeof sa; - - fd = accept(io->fd, &sa.sa, &len); - - if(fd < 0) { - logger(DEBUG_ALWAYS, LOG_ERR, "Accepting a new connection failed: %s", sockstrerror(sockerrno)); - return; - } - - sockaddrunmap(&sa); - - c = new_connection(); - c->name = xstrdup(""); - c->address = sa; - c->hostname = xstrdup("localhost port unix"); - c->socket = fd; - c->last_ping_time = now.tv_sec; - - logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection from %s", c->hostname); - - io_add(&c->io, handle_meta_io, c, c->socket, IO_READ); - - connection_add(c); - - c->allow_request = ID; - - send_id(c); -} -#endif - static void free_outgoing(outgoing_t *outgoing) { timeout_del(&outgoing->ev); @@ -769,6 +654,7 @@ void try_outgoing_connections(void) { /* Make sure there is one outgoing_t in the list for each ConnectTo. */ + // TODO: Drop support for ConnectTo since AutoConnect is now always on? for(config_t *cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg)) { char *name; get_config_string(cfg, &name); @@ -801,7 +687,7 @@ void try_outgoing_connections(void) { /* Terminate any connections whose outgoing_t is to be deleted. */ - for list_each(connection_t, c, connection_list) { + for list_each(connection_t, c, mesh->connections) { if(c->outgoing && c->outgoing->timeout == -1) { c->outgoing = NULL; logger(DEBUG_CONNECTIONS, LOG_INFO, "No more outgoing connection to %s", c->name);