// 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;
}
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) {
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;
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))
+ if(len <= 0 || len > MAXSIZE) {
logger(LOG_ERR, "Receiving packet failed: %s", sockstrerror(sockerrno));
- return;
- }
+ return;
+ }
- 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);
+ 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) {
- 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);
+ }
+
+ 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);
+ }
}
- else
- return;
- }
- receive_udppacket(n, &pkt);
+ mutex_unlock(&mutex);
+ }
}
void handle_device_data(int sock, short events, void *data) {