X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_socket.c;h=7b6c493baeb30cc84935479a95d5e62e87a644f3;hb=eff41a69e1976fd521b4c524bed86b1bc095b10f;hp=3cbc5dd634fa2d60d302daab5a0959b9c16d9b17;hpb=84e02f6f2123197074b482b207a7cb13ff31a00f;p=meshlink diff --git a/src/net_socket.c b/src/net_socket.c index 3cbc5dd6..7b6c493b 100644 --- a/src/net_socket.c +++ b/src/net_socket.c @@ -58,13 +58,13 @@ static void configure_tcp(connection_t *c) { #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 } @@ -503,6 +503,7 @@ static struct addrinfo *get_known_addresses(node_t *n) { } 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); @@ -518,6 +519,9 @@ void setup_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) { 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) { if(n) outgoing->aip = outgoing->ai = get_known_addresses(n);