Use a loopback UDP socket instead of a pipe.

[meshlink-tiny] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index 7f575dcf8183464c5c89afa0eb1e68aa433213cf..d4b6208693049cbed754a764c146fba91af11a55 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -40,8 +40,6 @@
 #define MSG_NOSIGNAL 0
 #endif
 
-static const int max_connection_burst = 100;
-
 /* Setup sockets */
 
 static void configure_tcp(connection_t *c) {
@@ -291,6 +289,22 @@ static bool get_next_outgoing_address(meshlink_handle_t *mesh, outgoing_t *outgo
        return false;
 }
 
+static void free_outgoing(outgoing_t *outgoing) {
+       meshlink_handle_t *mesh = outgoing->node->mesh;
+
+       timeout_del(&mesh->loop, &outgoing->ev);
+
+       if(outgoing->ai) {
+               if(outgoing->state == OUTGOING_RECENT || outgoing->state == OUTGOING_KNOWN) {
+                       free_known_addresses(outgoing->ai);
+               } else {
+                       freeaddrinfo(outgoing->ai);
+               }
+       }
+
+       free(outgoing);
+}
+
 void do_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
 begin:
 
@@ -299,7 +313,8 @@ begin:
                        /* We are waiting for a callback from the ADNS thread */
                } else if(outgoing->state == OUTGOING_NO_KNOWN_ADDRESSES) {
                        logger(mesh, MESHLINK_ERROR, "No known addresses for %s", outgoing->node->name);
-                       list_delete(mesh->outgoings, outgoing);
+                       free_outgoing(outgoing);
+                       mesh->outgoing = NULL;
                } else {
                        logger(mesh, MESHLINK_ERROR, "Could not set up a meta connection to %s", outgoing->node->name);
                        retry_outgoing(mesh, outgoing);
@@ -411,116 +426,13 @@ 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;
-
-       timeout_del(&mesh->loop, &outgoing->ev);
-
-       if(outgoing->ai) {
-               if(outgoing->state == OUTGOING_RECENT || outgoing->state == OUTGOING_KNOWN) {
-                       free_known_addresses(outgoing->ai);
-               } else {
-                       freeaddrinfo(outgoing->ai);
-               }
-       }
-
-       free(outgoing);
-}
-
 void init_outgoings(meshlink_handle_t *mesh) {
-       mesh->outgoings = list_alloc((list_action_t)free_outgoing);
+       mesh->outgoing = NULL;
 }
 
 void exit_outgoings(meshlink_handle_t *mesh) {
-       if(mesh->outgoings) {
-               list_delete_list(mesh->outgoings);
-               mesh->outgoings = NULL;
+       if(mesh->outgoing) {
+               free_outgoing(mesh->outgoing);
+               mesh->outgoing = NULL;
        }
 }