X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_packet.c;fp=src%2Fnet_packet.c;h=61a9f48e4677ddb099ff101dc6ac69d608dfd036;hb=b107b10c4ef70bdf74d6d6ac57ff5ab2698b9cb2;hp=7be466201eae816acca0d52ab3fd6ddcff545f92;hpb=9e00aaa5be9c92f1cee93bca3f0e473009cc3541;p=tinc

diff --git a/src/net_packet.c b/src/net_packet.c
index 7be46620..61a9f48e 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -576,7 +576,8 @@ static node_t *try_harder(const sockaddr_t *from, const vpn_packet_t *pkt) {
 	return found;
 }
 
-void handle_incoming_vpn_data(int sock, short events, void *data) {
+void handle_incoming_vpn_data(void *arg) {
+	listen_socket_t *l = arg;
 	vpn_packet_t pkt;
 	char *hostname;
 	sockaddr_t from;
@@ -584,35 +585,39 @@ void handle_incoming_vpn_data(int sock, short events, void *data) {
 	node_t *n;
 	int len;
 
-	len = recvfrom(sock, (char *) &pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen);
+	while(true) {
+		len = recvfrom(l->udp, (char *) &pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen);
 
-	if(len <= 0 || len > MAXSIZE) {
-		if(!sockwouldblock(sockerrno))
-			logger(LOG_ERR, "Receiving packet failed: %s", sockstrerror(sockerrno));
-		return;
-	}
+		if(len <= 0 || len > MAXSIZE) {
+			if(!sockwouldblock(sockerrno)) {
+				logger(LOG_ERR, "Receiving packet failed: %s", sockstrerror(sockerrno));
+				return;
+			}
+			continue;
+		}
 
-	pkt.len = len;
+		pkt.len = len;
 
-	sockaddrunmap(&from);		/* Some braindead IPv6 implementations do stupid things. */
+		sockaddrunmap(&from);		/* Some braindead IPv6 implementations do stupid things. */
 
-	n = lookup_node_udp(&from);
+		n = lookup_node_udp(&from);
 
-	if(!n) {
-		n = try_harder(&from, &pkt);
-		if(n)
-			update_node_udp(n, &from);
-		else ifdebug(PROTOCOL) {
-			hostname = sockaddr2hostname(&from);
-			logger(LOG_WARNING, "Received UDP packet from unknown source %s", hostname);
-			free(hostname);
-			return;
+		if(!n) {
+			n = try_harder(&from, &pkt);
+			if(n)
+				update_node_udp(n, &from);
+			else ifdebug(PROTOCOL) {
+				hostname = sockaddr2hostname(&from);
+				logger(LOG_WARNING, "Received UDP packet from unknown source %s", hostname);
+				free(hostname);
+				continue;
+			}
+			else
+				continue;
 		}
-		else
-			return;
-	}
 
-	receive_udppacket(n, &pkt);
+		receive_udppacket(n, &pkt);
+	}
 }
 
 void handle_device_data(int sock, short events, void *data) {