/*
net_socket.c -- Handle various kinds of sockets.
Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2017 Guus Sliepen <guus@tinc-vpn.org>
2006 Scott Lamb <slamb@slamb.org>
2009 Florian Forster <octo@verplant.org>
#include "net.h"
#include "netutl.h"
#include "protocol.h"
+#include "proxy.h"
#include "utils.h"
#include "xalloc.h"
#endif
int addressfamily = AF_UNSPEC;
+int mintimeout = 0;
int maxtimeout = 900;
int seconds_till_retry = 5;
int udp_rcvbuf = 0;
unsigned long arg = 1;
if(ioctlsocket(c->socket, FIONBIO, &arg) != 0) {
- logger(LOG_ERR, "ioctlsocket for %s: %d", c->hostname, sockstrerror(sockerrno));
+ logger(LOG_ERR, "ioctlsocket for %s: %s", c->hostname, sockstrerror(sockerrno));
}
#endif
option = IPTOS_LOWDELAY;
setsockopt(c->socket, SOL_IP, IP_TOS, (void *)&option, sizeof(option));
#endif
+
+#if defined(IPPROTO_IPV6) && defined(IPV6_TCLASS) && defined(IPTOS_LOWDELAY)
+ option = IPTOS_LOWDELAY;
+ setsockopt(c->socket, IPPROTO_IPV6, IPV6_TCLASS, (void *)&option, sizeof(option));
+#endif
}
static bool bind_to_interface(int sd) {
int status;
#endif /* defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) */
- if(!get_config_string (lookup_config (config_tree, "BindToInterface"), &iface))
+ 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;
+ free(iface);
status = setsockopt(sd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof(ifr));
if(status) {
- logger(LOG_ERR, "Can't bind to interface %s: %s", iface,
- strerror(errno));
+ logger(LOG_ERR, "Can't bind to interface %s: %s", ifr.ifr_ifrn.ifrn_name, strerror(errno));
return false;
}
+
#else /* if !defined(SOL_SOCKET) || !defined(SO_BINDTODEVICE) */
logger(LOG_WARNING, "%s not supported on this platform", "BindToInterface");
#endif
setsockopt(nfd, SOL_IPV6, IPV6_V6ONLY, (void *)&option, sizeof option);
#endif
- if(get_config_string
- (lookup_config(config_tree, "BindToInterface"), &iface)) {
+ 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);
+ ifr.ifr_ifrn.ifrn_name[IFNAMSIZ - 1] = 0;
+ free(iface);
if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof(ifr))) {
closesocket(nfd);
- logger(LOG_ERR, "Can't bind to interface %s: %s", iface,
- strerror(sockerrno));
+ logger(LOG_ERR, "Can't bind to interface %s: %s", ifr.ifr_ifrn.ifrn_name, strerror(sockerrno));
return -1;
}
+
#else
logger(LOG_WARNING, "%s not supported on this platform", "BindToInterface");
#endif
option = 1;
setsockopt(nfd, IPPROTO_IP, IP_DONTFRAGMENT, (void *)&option, sizeof(option));
}
-#else
-#warning No way to disable IPv4 fragmentation
#endif
#if defined(SOL_IPV6) && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
option = 1;
setsockopt(nfd, IPPROTO_IPV6, IPV6_DONTFRAG, (void *)&option, sizeof(option));
}
-#else
-#warning No way to disable IPv6 fragmentation
#endif
if (!bind_to_interface(nfd)) {
void retry_outgoing(outgoing_t *outgoing) {
outgoing->timeout += 5;
+ if(outgoing->timeout < mintimeout)
+ outgoing->timeout = mintimeout;
+
if(outgoing->timeout > maxtimeout)
outgoing->timeout = maxtimeout;
void finish_connecting(connection_t *c) {
ifdebug(CONNECTIONS) logger(LOG_INFO, "Connected to %s (%s)", c->name, c->hostname);
- if(proxytype != PROXY_EXEC)
- configure_tcp(c);
-
c->last_ping_time = now;
send_id(c);
if(fork()) {
c->socket = fd[0];
close(fd[1]);
- logger(LOG_DEBUG, "Using proxy %s", command);
+ ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Using proxy %s", command);
return;
}
#endif
}
+static bool is_valid_host_port(const char *host, const char *port) {
+ for(const char *p = host; *p; p++)
+ if(!isalnum(*p) && *p != '-' && *p != '.')
+ return false;
+
+ for(const char *p = port; *p; p++)
+ if(!isalnum(*p))
+ return false;
+
+ return true;
+}
+
void do_outgoing_connection(connection_t *c) {
- char *address, *port, *space;
- struct addrinfo *proxyai;
+ struct addrinfo *proxyai = NULL;
int result;
if(!c->outgoing) {
return;
}
+ char *address, *port, *space;
+
get_config_string(c->outgoing->cfg, &address);
space = strchr(address, ' ');
}
c->outgoing->ai = str2addrinfo(address, port, SOCK_STREAM);
- free(address);
- free(port);
+
+ // If we cannot resolve the address, maybe we are using a proxy that can?
+ if(!c->outgoing->ai && proxytype != PROXY_NONE && is_valid_host_port(address, port)) {
+ memset(&c->address, 0, sizeof c->address);
+ c->address.sa.sa_family = AF_UNKNOWN;
+ c->address.unknown.address = address;
+ c->address.unknown.port = port;
+ } else {
+ free(address);
+ free(port);
+ }
c->outgoing->aip = c->outgoing->ai;
c->outgoing->cfg = lookup_config_next(c->config_tree, c->outgoing->cfg);
+
+ if(!c->outgoing->ai && proxytype != PROXY_NONE)
+ goto connect;
}
if(!c->outgoing->aip) {
memcpy(&c->address, c->outgoing->aip->ai_addr, c->outgoing->aip->ai_addrlen);
c->outgoing->aip = c->outgoing->aip->ai_next;
+connect:
if(c->hostname)
free(c->hostname);
if(!proxytype) {
c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
- configure_tcp(c);
} else if(proxytype == PROXY_EXEC) {
+ c->status.proxy_passed = true;
do_outgoing_pipe(c, proxyhost);
} else {
proxyai = str2addrinfo(proxyhost, proxyport, SOCK_STREAM);
goto begin;
}
+ if(proxytype != PROXY_EXEC)
+ configure_tcp(c);
+
#ifdef FD_CLOEXEC
fcntl(c->socket, F_SETFD, FD_CLOEXEC);
#endif
#endif
bind_to_interface(c->socket);
+
+ int b = -1;
+
+ for(int i = 0; i < listen_sockets; i++) {
+ if(listen_socket[i].sa.sa.sa_family == c->address.sa.sa_family) {
+ if(b == -1) {
+ b = i;
+ } else {
+ b = -1;
+ break;
+ }
+ }
+ }
+
+ if(b != -1) {
+ sockaddr_t sa = listen_socket[b].sa;
+ if(sa.sa.sa_family == AF_INET)
+ sa.in.sin_port = 0;
+ else if(sa.sa.sa_family == AF_INET6)
+ sa.in6.sin6_port = 0;
+
+ if(bind(c->socket, &sa.sa, SALEN(sa.sa))) {
+ char *addrstr = sockaddr2hostname(&sa);
+ logger(LOG_ERR, "Can't bind to %s/tcp: %s", addrstr, sockstrerror(sockerrno));
+ free(addrstr);
+ }
+ }
}
/* Connect */
freeaddrinfo(proxyai);
}
+ now = time(NULL);
+
if(result == -1) {
if(sockinprogress(sockerrno)) {
+ c->last_ping_time = now;
c->status.connecting = true;
return;
}
c->outcompression = myself->connection->outcompression;
init_configuration(&c->config_tree);
- read_connection_config(c);
+ if(!read_connection_config(c)) {
+ free_connection(c);
+ outgoing->timeout = maxtimeout;
+ retry_outgoing(outgoing);
+ return;
+ }
outgoing->cfg = lookup_config(c->config_tree, "Address");
if(!outgoing->cfg) {
logger(LOG_ERR, "No address specified for %s", c->name);
free_connection(c);
+ outgoing->timeout = maxtimeout;
+ retry_outgoing(outgoing);
return;
}
projects / tinc / blobdiff