X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_packet.c;h=a985390ca905ddbe70e737e94c97510b0208c1e1;hb=refs%2Fheads%2F1.1-threads;hp=269f314c85f9ae988023c312d5635843b17be187;hpb=fac60c692a5f838bec7498f13db872774f1ea717;p=tinc

diff --git a/src/net_packet.c b/src/net_packet.c
index 269f314c..a985390c 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -72,7 +72,7 @@ unsigned replaywin = 16;
 // mtuprobes ==    32: send 1 burst, sleep pingtimeout second
 // mtuprobes ==    33: no response from other side, restart PMTU discovery process
 
-static void send_mtu_probe_handler(int fd, short events, void *data) {
+static void send_mtu_probe_handler(void *data) {
 	node_t *n = data;
 	vpn_packet_t packet;
 	int len, i;
@@ -136,13 +136,15 @@ static void send_mtu_probe_handler(int fd, short events, void *data) {
 	}
 
 end:
-	event_add(&n->mtuevent, &(struct timeval){timeout, 0});
+	n->mtuevent.time = time(NULL) + timeout;
+	event_add(&n->mtuevent);
 }
 
 void send_mtu_probe(node_t *n) {
-	if(!timeout_initialized(&n->mtuevent))
-		timeout_set(&n->mtuevent, send_mtu_probe_handler, n);
-	send_mtu_probe_handler(0, 0, n);
+	event_del(&n->mtuevent);
+	n->mtuevent.handler = send_mtu_probe_handler;
+	n->mtuevent.data = n;
+	send_mtu_probe_handler(n);
 }
 
 void mtu_probe_h(node_t *n, vpn_packet_t *packet, length_t len) {
@@ -597,23 +599,26 @@ void handle_incoming_vpn_data(void *arg) {
 
 		sockaddrunmap(&from);		/* Some braindead IPv6 implementations do stupid things. */
 
+		mutex_lock(&mutex);
 		n = lookup_node_udp(&from);
 
 		if(!n) {
 			n = try_harder(&from, &pkt);
 			if(n)
 				update_node_udp(n, &from);
-			else ifdebug(PROTOCOL) {
+		}
+
+		if(n) {
+			receive_udppacket(n, &pkt);
+		} else {
+			ifdebug(PROTOCOL) {
 				hostname = sockaddr2hostname(&from);
 				logger(LOG_WARNING, "Received UDP packet from unknown source %s", hostname);
 				free(hostname);
-				continue;
 			}
-			else
-				continue;
 		}
 
-		receive_udppacket(n, &pkt);
+		mutex_unlock(&mutex);
 	}
 }