Dont setup outgoing connection to blacklisted nodes

[meshlink] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index 160195455b450a9e1f1dc158df064bcf5a8a013c..2564a9c1bd264460cd1d3028b64c3234ffa04090 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -43,8 +43,6 @@ 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);
 
@@ -102,7 +100,6 @@ int setup_listen_socket(const sockaddr_t *sa) {
        int nfd;
        char *addrstr;
        int option;
-       char *iface;
 
        nfd = socket(sa->sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
 
@@ -548,6 +545,11 @@ void handle_new_meta_connection(event_loop_t *loop, void *data, int flags) {
        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;
        }
@@ -656,6 +658,7 @@ void try_outgoing_connections(meshlink_handle_t *mesh) {
        // 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;
+               bool blacklisted;
                get_config_string(cfg, &name);
 
                if(!check_id(name)) {
@@ -666,6 +669,10 @@ void try_outgoing_connections(meshlink_handle_t *mesh) {
                        continue;
                }
 
+               get_config_bool(lookup_config(mesh->config, "blacklisted"), &blacklisted);
+               if (blacklisted)
+                       continue;
+
                bool found = false;
 
                for list_each(outgoing_t, outgoing, mesh->outgoings) {