]> git.meshlink.io Git - meshlink-tiny/blobdiff - src/net_socket.c
Remove listening sockets.
[meshlink-tiny] / src / net_socket.c
index 4989b6cf0578a0471a868cdfc8a1a09a633bdd32..fe7bf3af11183ac7547d6ccd65ed272fd4555183 100644 (file)
@@ -19,7 +19,6 @@
 
 #include "system.h"
 
-#include "adns.h"
 #include "conf.h"
 #include "connection.h"
 #include "list.h"
@@ -41,8 +40,6 @@
 #define MSG_NOSIGNAL 0
 #endif
 
-static const int max_connection_burst = 100;
-
 /* Setup sockets */
 
 static void configure_tcp(connection_t *c) {
@@ -174,44 +171,6 @@ static void handle_meta_io(event_loop_t *loop, void *data, int flags) {
        }
 }
 
-// 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;
-               }
-
-               // Create a new struct addrinfo, and put it at the head of the list.
-               struct addrinfo *nai = xzalloc(sizeof(*nai) + SALEN(e->reverse->address.sa));
-               nai->ai_next = ai;
-               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 = (struct sockaddr *)(nai + 1);
-               memcpy(ai->ai_addr, &e->reverse->address, ai->ai_addrlen);
-       }
-
-       return ai;
-}
-
 // Build a list of recently seen addresses.
 static struct addrinfo *get_recent_addresses(node_t *n) {
        struct addrinfo *ai = NULL;
@@ -252,28 +211,6 @@ static void free_known_addresses(struct addrinfo *ai) {
        }
 }
 
-static void canonical_resolve_cb(meshlink_handle_t *mesh, char *host, char *serv, void *data, struct addrinfo *ai, int err) {
-       (void)serv;
-       (void)err;
-       node_t *n = data;
-
-       free(host);
-       free(serv);
-
-       for list_each(outgoing_t, outgoing, mesh->outgoings) {
-               if(outgoing->node == n) {
-                       if(outgoing->state == OUTGOING_CANONICAL_RESOLVE) {
-                               outgoing->ai = ai;
-                               outgoing->aip = NULL;
-                               outgoing->state = OUTGOING_CANONICAL;
-                               do_outgoing_connection(mesh, outgoing);
-                       }
-
-                       return;
-               }
-       }
-}
-
 static bool get_next_outgoing_address(meshlink_handle_t *mesh, outgoing_t *outgoing) {
        (void)mesh;
 
@@ -293,15 +230,15 @@ static bool get_next_outgoing_address(meshlink_handle_t *mesh, outgoing_t *outgo
 
                        if(port) {
                                *port++ = 0;
-                               port = xstrdup(port);
-                               adns_queue(mesh, address, port, canonical_resolve_cb, outgoing->node, 2);
-                               return false;
+                               outgoing->ai = str2addrinfo(address, port, SOCK_STREAM);
+                               outgoing->aip = NULL;
+                               outgoing->state = OUTGOING_CANONICAL;
                        } else {
                                logger(mesh, MESHLINK_ERROR, "Canonical address for %s is missing port number", n->name);
-                               free(address);
                                outgoing->state = OUTGOING_RECENT;
                        }
 
+                       free(address);
                } else {
                        outgoing->state = OUTGOING_RECENT;
                }
@@ -339,24 +276,6 @@ static bool get_next_outgoing_address(meshlink_handle_t *mesh, outgoing_t *outgo
                        return true;
                }
 
-               free_known_addresses(outgoing->ai);
-               outgoing->ai = NULL;
-               outgoing->aip = NULL;
-               outgoing->state = OUTGOING_KNOWN;
-       }
-
-       if(outgoing->state == OUTGOING_KNOWN) {
-               if(!outgoing->aip) {
-                       outgoing->ai = get_known_addresses(outgoing->node);
-                       outgoing->aip = outgoing->ai;
-               } else {
-                       outgoing->aip = outgoing->aip->ai_next;
-               }
-
-               if(outgoing->aip) {
-                       return true;
-               }
-
                free_known_addresses(outgoing->ai);
                outgoing->ai = NULL;
                outgoing->aip = NULL;
@@ -490,93 +409,6 @@ void setup_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
        do_outgoing_connection(mesh, outgoing);
 }
 
-/// Delayed close of a filedescriptor.
-static void tarpit(meshlink_handle_t *mesh, int fd) {
-       if(!fd) {
-               return;
-       }
-
-       if(mesh->pits[mesh->next_pit]) {
-               closesocket(mesh->pits[mesh->next_pit]);
-       }
-
-       mesh->pits[mesh->next_pit++] = fd;
-
-       if(mesh->next_pit >= (int)(sizeof mesh->pits / sizeof mesh->pits[0])) {
-               mesh->next_pit = 0;
-       }
-}
-
-/*
-  accept a new tcp connect and create a
-  new connection
-*/
-void handle_new_meta_connection(event_loop_t *loop, void *data, int flags) {
-       (void)flags;
-       meshlink_handle_t *mesh = loop->data;
-       listen_socket_t *l = data;
-       connection_t *c;
-       sockaddr_t sa;
-       int fd;
-       socklen_t len = sizeof(sa);
-
-       memset(&sa, 0, sizeof(sa));
-
-       fd = accept(l->tcp.fd, &sa.sa, &len);
-
-       if(fd < 0) {
-               if(sockwouldblock(errno)) {
-                       return;
-               }
-
-               if(errno == EINVAL) { // TODO: check if Windows agrees
-                       event_loop_stop(loop);
-                       return;
-               }
-
-               logger(mesh, MESHLINK_ERROR, "Accepting a new connection failed: %s", sockstrerror(sockerrno));
-               return;
-       }
-
-       sockaddrunmap(&sa);
-
-       /* Rate limit incoming connections to max_connection_burst/second. */
-
-       if(mesh->loop.now.tv_sec != mesh->connection_burst_time) {
-               mesh->connection_burst_time = mesh->loop.now.tv_sec;
-               mesh->connection_burst = 0;
-       }
-
-       if(mesh->connection_burst >= max_connection_burst) {
-               tarpit(mesh, fd);
-               return;
-       }
-
-       mesh->connection_burst++;
-
-       // Accept the new connection
-
-       c = new_connection();
-       c->name = xstrdup("<unknown>");
-
-       c->address = sa;
-       c->socket = fd;
-       c->last_ping_time = mesh->loop.now.tv_sec;
-
-       char *hostname = sockaddr2hostname(&sa);
-       logger(mesh, MESHLINK_INFO, "Connection from %s", hostname);
-       free(hostname);
-
-       io_add(&mesh->loop, &c->io, handle_meta_io, c, c->socket, IO_READ);
-
-       configure_tcp(c);
-
-       connection_add(mesh, c);
-
-       c->allow_request = ID;
-       send_id(mesh, c);
-}
-
 static void free_outgoing(outgoing_t *outgoing) {
        meshlink_handle_t *mesh = outgoing->node->mesh;