/*
net_socket.c -- Handle various kinds of sockets.
- Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-2013 Guus Sliepen <guus@tinc-vpn.org>
- 2006 Scott Lamb <slamb@slamb.org>
- 2009 Florian Forster <octo@verplant.org>
+ Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
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
#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"
#endif
int addressfamily = AF_UNSPEC;
-int maxtimeout = 900;
int seconds_till_retry = 5;
-int udp_rcvbuf = 0;
-int udp_sndbuf = 0;
-
-listen_socket_t listen_socket[MAXSOCKETS];
-int listen_sockets;
-#ifndef HAVE_MINGW
-io_t unix_socket;
-#endif
-list_t *outgoing_list = NULL;
+int max_connection_burst = 100;
/* Setup sockets */
static void configure_tcp(connection_t *c) {
- int option;
-
#ifdef O_NONBLOCK
int flags = fcntl(c->socket, F_GETFL);
#endif
#if defined(SOL_TCP) && defined(TCP_NODELAY)
- option = 1;
- setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&option, sizeof option);
+ int nodelay = 1;
+ setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&nodelay, sizeof nodelay);
#endif
#if defined(SOL_IP) && defined(IP_TOS) && defined(IPTOS_LOWDELAY)
- option = IPTOS_LOWDELAY;
- setsockopt(c->socket, SOL_IP, IP_TOS, (void *)&option, sizeof option);
+ int lowdelay = IPTOS_LOWDELAY;
+ setsockopt(c->socket, SOL_IP, IP_TOS, (void *)&lowdelay, sizeof lowdelay);
#endif
}
-static bool bind_to_interface(int sd) {
- char *iface;
+static bool bind_to_address(meshlink_handle_t *mesh, connection_t *c) {
+ int s = -1;
-#if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
- struct ifreq ifr;
- int status;
-#endif /* defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) */
+ for(int i = 0; i < mesh->listen_sockets && mesh->listen_socket[i].bindto; i++) {
+ if(mesh->listen_socket[i].sa.sa.sa_family != c->address.sa.sa_family)
+ continue;
+ if(s >= 0)
+ return false;
+ s = i;
+ }
- if(!get_config_string (lookup_config (config_tree, "BindToInterface"), &iface))
- return true;
+ if(s < 0)
+ return false;
-#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;
+ sockaddr_t sa = mesh->listen_socket[s].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;
- 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));
+ if(bind(c->socket, &sa.sa, SALEN(sa.sa))) {
+ logger(DEBUG_CONNECTIONS, LOG_WARNING, "Can't bind outgoing socket: %s", 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;
}
int nfd;
char *addrstr;
int option;
- char *iface;
nfd = socket(sa->sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
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);
return nfd;
}
-int setup_vpn_in_socket(const sockaddr_t *sa) {
+int setup_vpn_in_socket(meshlink_handle_t *mesh, const sockaddr_t *sa) {
int nfd;
char *addrstr;
int option;
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);
#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));
}
#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));
}
#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);
return nfd;
} /* int setup_vpn_in_socket */
-static void retry_outgoing_handler(void *data) {
- setup_outgoing_connection(data);
+static void retry_outgoing_handler(event_loop_t *loop, void *data) {
+ meshlink_handle_t *mesh = loop->data;
+ outgoing_t *outgoing = data;
+ setup_outgoing_connection(mesh, outgoing);
}
-void retry_outgoing(outgoing_t *outgoing) {
+void retry_outgoing(meshlink_handle_t *mesh, outgoing_t *outgoing) {
outgoing->timeout += 5;
- if(outgoing->timeout > maxtimeout)
- outgoing->timeout = maxtimeout;
+ if(outgoing->timeout > mesh->maxtimeout)
+ outgoing->timeout = mesh->maxtimeout;
- timeout_add(&outgoing->ev, retry_outgoing_handler, outgoing, &(struct timeval){outgoing->timeout, rand() % 100000});
+ timeout_add(&mesh->loop, &outgoing->ev, retry_outgoing_handler, outgoing, &(struct timeval){outgoing->timeout, rand() % 100000});
logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Trying to re-establish outgoing connection in %d seconds", outgoing->timeout);
}
-void finish_connecting(connection_t *c) {
+void finish_connecting(meshlink_handle_t *mesh, connection_t *c) {
logger(DEBUG_CONNECTIONS, LOG_INFO, "Connected to %s (%s)", c->name, c->hostname);
- if(proxytype != PROXY_EXEC)
- configure_tcp(c);
-
- c->last_ping_time = time(NULL);
+ c->last_ping_time = mesh->loop.now.tv_sec;
c->status.connecting = false;
- send_id(c);
+ send_id(mesh, c);
}
-static void do_outgoing_pipe(connection_t *c, char *command) {
+static void do_outgoing_pipe(meshlink_handle_t *mesh, connection_t *c, char *command) {
#ifndef HAVE_MINGW
int fd[2];
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)
#endif
}
-static void handle_meta_write(connection_t *c) {
+static void handle_meta_write(meshlink_handle_t *mesh, connection_t *c) {
+ if(c->outbuf.len <= c->outbuf.offset)
+ return;
+
ssize_t outlen = send(c->socket, c->outbuf.data + c->outbuf.offset, c->outbuf.len - c->outbuf.offset, 0);
if(outlen <= 0) {
if(!errno || errno == EPIPE) {
logger(DEBUG_CONNECTIONS, LOG_ERR, "Could not send %d bytes of data to %s (%s): %s", c->outbuf.len - c->outbuf.offset, c->name, c->hostname, strerror(errno));
}
- terminate_connection(c, c->status.active);
+ terminate_connection(mesh, c, c->status.active);
return;
}
buffer_read(&c->outbuf, outlen);
if(!c->outbuf.len)
- io_set(&c->io, IO_READ);
+ io_set(&mesh->loop, &c->io, IO_READ);
}
-static void handle_meta_io(void *data, int flags) {
+static void handle_meta_io(event_loop_t *loop, void *data, int flags) {
+ meshlink_handle_t *mesh = loop->data;
connection_t *c = data;
if(c->status.connecting) {
int result;
socklen_t len = sizeof result;
- getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
+ getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
if(!result)
- finish_connecting(c);
+ finish_connecting(mesh, c);
else {
logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Error while connecting to %s (%s): %s", c->name, c->hostname, sockstrerror(result));
- terminate_connection(c, false);
+ terminate_connection(mesh, c, false);
return;
}
}
if(flags & IO_WRITE)
- handle_meta_write(c);
+ handle_meta_write(mesh, c);
else
- handle_meta_connection_data(c);
+ handle_meta_connection_data(mesh, c);
}
-bool do_outgoing_connection(outgoing_t *outgoing) {
+bool do_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
char *address, *port, *space;
struct addrinfo *proxyai = NULL;
int result;
if(!outgoing->ai) {
if(!outgoing->cfg) {
logger(DEBUG_CONNECTIONS, LOG_ERR, "Could not set up a meta connection to %s", outgoing->name);
- retry_outgoing(outgoing);
+ retry_outgoing(mesh, outgoing);
return false;
}
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");
}
logger(DEBUG_CONNECTIONS, LOG_INFO, "Trying to connect to %s (%s)", outgoing->name, c->hostname);
- if(!proxytype) {
+ if(!mesh->proxytype) {
c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
configure_tcp(c);
- } else if(proxytype == PROXY_EXEC) {
- do_outgoing_pipe(c, proxyhost);
+ } else if(mesh->proxytype == PROXY_EXEC) {
+ do_outgoing_pipe(mesh, c, mesh->proxyhost);
} else {
- proxyai = str2addrinfo(proxyhost, proxyport, SOCK_STREAM);
+ proxyai = str2addrinfo(mesh->proxyhost, mesh->proxyport, SOCK_STREAM);
if(!proxyai) {
free_connection(c);
goto begin;
}
- logger(DEBUG_CONNECTIONS, LOG_INFO, "Using proxy at %s port %s", proxyhost, proxyport);
+ logger(DEBUG_CONNECTIONS, LOG_INFO, "Using proxy at %s port %s", mesh->proxyhost, mesh->proxyport);
c->socket = socket(proxyai->ai_family, SOCK_STREAM, IPPROTO_TCP);
+ configure_tcp(c);
}
if(c->socket == -1) {
fcntl(c->socket, F_SETFD, FD_CLOEXEC);
#endif
- if(proxytype != PROXY_EXEC) {
+ if(mesh->proxytype != PROXY_EXEC) {
#if defined(SOL_IPV6) && defined(IPV6_V6ONLY)
int option = 1;
if(c->address.sa.sa_family == AF_INET6)
setsockopt(c->socket, SOL_IPV6, IPV6_V6ONLY, (void *)&option, sizeof option);
#endif
- bind_to_interface(c->socket);
+ bind_to_address(mesh, c);
}
/* Connect */
- if(!proxytype) {
+ if(!mesh->proxytype) {
result = connect(c->socket, &c->address.sa, SALEN(c->address.sa));
- } else if(proxytype == PROXY_EXEC) {
+ } else if(mesh->proxytype == PROXY_EXEC) {
result = 0;
} else {
result = connect(c->socket, proxyai->ai_addr, proxyai->ai_addrlen);
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->last_ping_time = time(NULL);
+ c->outcompression = mesh->self->connection->outcompression;
+ c->last_ping_time = mesh->loop.now.tv_sec;
- connection_add(c);
+ connection_add(mesh, c);
- io_add(&c->io, handle_meta_io, c, c->socket, IO_READ|IO_WRITE);
+ io_add(&mesh->loop, &c->io, handle_meta_io, c, c->socket, IO_READ|IO_WRITE);
return true;
}
-void setup_outgoing_connection(outgoing_t *outgoing) {
- timeout_del(&outgoing->ev);
+// Find edges pointing to this node, and use them to build a list of unique, known addresses.
+static struct addrinfo *get_known_addresses(node_t *n) {
+ struct addrinfo *ai = NULL;
+
+ for splay_each(edge_t, e, n->edge_tree) {
+ if(!e->reverse)
+ continue;
+
+ bool found = false;
+ for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
+ if(!sockaddrcmp(&e->reverse->address, (sockaddr_t *)aip->ai_addr)) {
+ found = true;
+ break;
+ }
+ }
+ if(found)
+ continue;
+
+ struct addrinfo *nai = xzalloc(sizeof *nai);
+ if(ai)
+ ai->ai_next = nai;
+ ai = nai;
+ ai->ai_family = e->reverse->address.sa.sa_family;
+ ai->ai_socktype = SOCK_STREAM;
+ ai->ai_protocol = IPPROTO_TCP;
+ ai->ai_addrlen = SALEN(e->reverse->address.sa);
+ ai->ai_addr = xmalloc(ai->ai_addrlen);
+ memcpy(ai->ai_addr, &e->reverse->address, ai->ai_addrlen);
+ }
+
+ return ai;
+}
- node_t *n = lookup_node(outgoing->name);
+void setup_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
+ bool blacklisted = false;
+ timeout_del(&mesh->loop, &outgoing->ev);
+
+ node_t *n = lookup_node(mesh, outgoing->name);
if(n && n->connection) {
logger(DEBUG_CONNECTIONS, LOG_INFO, "Already connected to %s", outgoing->name);
}
init_configuration(&outgoing->config_tree);
- read_host_config(outgoing->config_tree, outgoing->name);
+ read_host_config(mesh, outgoing->config_tree, outgoing->name);
outgoing->cfg = lookup_config(outgoing->config_tree, "Address");
+ get_config_bool(lookup_config(outgoing->config_tree, "blacklisted"), &blacklisted);
+ if (blacklisted) return;
+
if(!outgoing->cfg) {
- logger(DEBUG_ALWAYS, LOG_ERR, "No address specified for %s", outgoing->name);
- return;
+ if(n)
+ outgoing->aip = outgoing->ai = get_known_addresses(n);
+ if(!outgoing->ai) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "No address known for %s", outgoing->name);
+ return;
+ }
}
- do_outgoing_connection(outgoing);
+ do_outgoing_connection(mesh, outgoing);
}
/*
accept a new tcp connect and create a
new connection
*/
-void handle_new_meta_connection(void *data, int flags) {
+void handle_new_meta_connection(event_loop_t *loop, void *data, int flags) {
+ meshlink_handle_t *mesh = loop->data;
listen_socket_t *l = data;
connection_t *c;
sockaddr_t sa;
fd = accept(l->tcp.fd, &sa.sa, &len);
if(fd < 0) {
+ if(errno == EINVAL) { // TODO: check if Windows agrees
+ event_loop_stop(loop);
+ return;
+ }
+
logger(DEBUG_ALWAYS, LOG_ERR, "Accepting a new connection failed: %s", sockstrerror(sockerrno));
return;
}
sockaddrunmap(&sa);
- c = new_connection();
- c->name = xstrdup("<unknown>");
- c->outcipher = myself->connection->outcipher;
- c->outdigest = myself->connection->outdigest;
- c->outmaclength = myself->connection->outmaclength;
- c->outcompression = myself->connection->outcompression;
+ // Check if we get many connections from the same host
- c->address = sa;
- c->hostname = sockaddr2hostname(&sa);
- c->socket = fd;
- c->last_ping_time = time(NULL);
+ static sockaddr_t prev_sa;
+ static int tarpit = -1;
- logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection from %s", c->hostname);
+ if(tarpit >= 0) {
+ closesocket(tarpit);
+ tarpit = -1;
+ }
- io_add(&c->io, handle_meta_io, c, c->socket, IO_READ);
+ if(!sockaddrcmp_noport(&sa, &prev_sa)) {
+ static int samehost_burst;
+ static int samehost_burst_time;
- configure_tcp(c);
+ if(mesh->loop.now.tv_sec - samehost_burst_time > samehost_burst)
+ samehost_burst = 0;
+ else
+ samehost_burst -= mesh->loop.now.tv_sec - samehost_burst_time;
- connection_add(c);
+ samehost_burst_time = mesh->loop.now.tv_sec;
+ samehost_burst++;
- c->allow_request = ID;
- send_id(c);
-}
+ if(samehost_burst > max_connection_burst) {
+ tarpit = fd;
+ return;
+ }
+ }
-#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;
+ memcpy(&prev_sa, &sa, sizeof sa);
- fd = accept(io->fd, &sa.sa, &len);
+ // Check if we get many connections from different hosts
- if(fd < 0) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Accepting a new connection failed: %s", sockstrerror(sockerrno));
+ static int connection_burst;
+ static int connection_burst_time;
+
+ if(mesh->loop.now.tv_sec - connection_burst_time > connection_burst)
+ connection_burst = 0;
+ else
+ connection_burst -= mesh->loop.now.tv_sec - connection_burst_time;
+
+ connection_burst_time = mesh->loop.now.tv_sec;
+ connection_burst++;
+
+ if(connection_burst >= max_connection_burst) {
+ connection_burst = max_connection_burst;
+ tarpit = fd;
return;
}
- sockaddrunmap(&sa);
+ // Accept the new connection
c = new_connection();
- c->name = xstrdup("<control>");
+ c->name = xstrdup("<unknown>");
+ c->outcompression = mesh->self->connection->outcompression;
+
c->address = sa;
- c->hostname = xstrdup("localhost port unix");
+ c->hostname = sockaddr2hostname(&sa);
c->socket = fd;
- c->last_ping_time = time(NULL);
+ c->last_ping_time = mesh->loop.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);
+ io_add(&mesh->loop, &c->io, handle_meta_io, c, c->socket, IO_READ);
- connection_add(c);
+ configure_tcp(c);
- c->allow_request = ID;
+ connection_add(mesh, c);
- send_id(c);
+ c->allow_request = ID;
+ send_id(mesh, c);
}
-#endif
static void free_outgoing(outgoing_t *outgoing) {
- timeout_del(&outgoing->ev);
+ meshlink_handle_t *mesh = outgoing->mesh;
+
+ timeout_del(&mesh->loop, &outgoing->ev);
if(outgoing->ai)
freeaddrinfo(outgoing->ai);
free(outgoing);
}
-void try_outgoing_connections(void) {
+void try_outgoing_connections(meshlink_handle_t *mesh) {
/* If there is no outgoing list yet, create one. Otherwise, mark all outgoings as deleted. */
- if(!outgoing_list) {
- outgoing_list = list_alloc((list_action_t)free_outgoing);
+ if(!mesh->outgoings) {
+ mesh->outgoings = list_alloc((list_action_t)free_outgoing);
} else {
- for list_each(outgoing_t, outgoing, outgoing_list)
+ for list_each(outgoing_t, outgoing, mesh->outgoings)
outgoing->timeout = -1;
}
/* Make sure there is one outgoing_t in the list for each ConnectTo. */
- for(config_t *cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+ // TODO: Drop support for ConnectTo since AutoConnect is now always on?
+ for(config_t *cfg = lookup_config(mesh->config, "ConnectTo"); cfg; cfg = lookup_config_next(mesh->config, cfg)) {
char *name;
get_config_string(cfg, &name);
bool found = false;
- for list_each(outgoing_t, outgoing, outgoing_list) {
+ for list_each(outgoing_t, outgoing, mesh->outgoings) {
if(!strcmp(outgoing->name, name)) {
found = true;
outgoing->timeout = 0;
}
if(!found) {
- outgoing_t *outgoing = xmalloc_and_zero(sizeof *outgoing);
+ outgoing_t *outgoing = xzalloc(sizeof *outgoing);
+ outgoing->mesh = mesh;
outgoing->name = name;
- list_insert_tail(outgoing_list, outgoing);
- setup_outgoing_connection(outgoing);
+ list_insert_tail(mesh->outgoings, outgoing);
+ setup_outgoing_connection(mesh, outgoing);
}
}
/* 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);
- terminate_connection(c, c->status.active);
+ terminate_connection(mesh, c, c->status.active);
}
}
/* Delete outgoing_ts for which there is no ConnectTo. */
- for list_each(outgoing_t, outgoing, outgoing_list)
+ for list_each(outgoing_t, outgoing, mesh->outgoings)
if(outgoing->timeout == -1)
- list_delete_node(outgoing_list, node);
+ list_delete_node(mesh->outgoings, node);
}