X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=8a733896780ea7c589f53125d81482c888903c61;hb=f4851be7f5dade24a5f43d366188c033c0f8b426;hp=ca681e854577919f68a98f5d80e6b83beaf995b7;hpb=9de37fa18e63d71a4676e9d1c9820b09861c949b;p=tinc

diff --git a/src/net_socket.c b/src/net_socket.c
index ca681e85..8a733896 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -464,45 +464,48 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
   accept a new tcp connect and create a
   new connection
 */
-void handle_new_meta_connection(int sock, short events, void *data) {
+void handle_new_meta_connection(void *data) {
+	listen_socket_t *l = data;
 	connection_t *c;
 	sockaddr_t sa;
 	int fd;
 	socklen_t len = sizeof sa;
 
-	fd = accept(sock, &sa.sa, &len);
+	while(true) {
+		fd = accept(l->tcp, &sa.sa, &len);
 
-	if(fd < 0) {
-		logger(LOG_ERR, "Accepting a new connection failed: %s", sockstrerror(sockerrno));
-		return;
-	}
+		if(fd < 0) {
+			logger(LOG_ERR, "Accepting a new connection failed: %s", sockstrerror(sockerrno));
+			return;
+		}
 
-	sockaddrunmap(&sa);
+		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;
+		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;
 
-	c->address = sa;
-	c->hostname = sockaddr2hostname(&sa);
-	c->socket = fd;
-	c->last_ping_time = time(NULL);
+		c->address = sa;
+		c->hostname = sockaddr2hostname(&sa);
+		c->socket = fd;
+		c->last_ping_time = time(NULL);
 
-	ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection from %s", c->hostname);
+		ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection from %s", c->hostname);
 
-	configure_tcp(c);
+		configure_tcp(c);
 
-	connection_add(c);
+		connection_add(c);
 
-	c->allow_request = ID;
-	send_id(c);
+		c->allow_request = ID;
+		send_id(c);
 
-	if(!thread_create(&c->thread, handle_meta_connection_data, c)) {
-		logger(LOG_ERR, "create_thread() failed: %s", strerror(errno));
-		abort();
+		if(!thread_create(&c->thread, handle_meta_connection_data, c)) {
+			logger(LOG_ERR, "create_thread() failed: %s", strerror(errno));
+			abort();
+		}
 	}
 }