X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_packet.c;h=0bef53433030d0606e49151ca6de2a8d34d0a67c;hb=b1cae6a2011f704dc4d3b02972def561d5c6bcb9;hp=857f00fac867452be47c1a5b63e652945333ae49;hpb=0d133a5ff230ad78da3208d32521d7549836187e;p=meshlink

diff --git a/src/net_packet.c b/src/net_packet.c
index 857f00fa..0bef5343 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -70,7 +70,7 @@ static void send_mtu_probe_handler(event_loop_t *loop, void *data) {
 	if(n->mtuprobes > 32) {
 		if(!n->minmtu) {
 			n->mtuprobes = 31;
-			timeout = mesh->pinginterval;
+			timeout = mesh->dev_class_traits[n->devclass].pinginterval;
 			goto end;
 		}
 
@@ -99,13 +99,13 @@ static void send_mtu_probe_handler(event_loop_t *loop, void *data) {
 	}
 
 	if(n->mtuprobes == 31) {
-		timeout = mesh->pinginterval;
+		timeout = mesh->dev_class_traits[n->devclass].pinginterval;
 		goto end;
 	} else if(n->mtuprobes == 32) {
-		timeout = mesh->pingtimeout;
+		timeout = mesh->dev_class_traits[n->devclass].pingtimeout;
 	}
 
-	for(int i = 0; i < 4 + mesh->localdiscovery; i++) {
+	for(int i = 0; i < 5; i++) {
 		int len;
 
 		if(i == 0) {
@@ -261,11 +261,6 @@ static void send_sptps_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *
 		return;
 	}
 
-	if(n->outcompression) {
-		logger(mesh, MESHLINK_ERROR, "Error while compressing packet to %s", n->name);
-		return;
-	}
-
 	sptps_send_record(&n->sptps, type, origpkt->data, origpkt->len);
 	return;
 }
@@ -284,10 +279,8 @@ static void choose_udp_address(meshlink_handle_t *mesh, const node_t *n, const s
 	   to the node's reflexive UDP address discovered during key
 	   exchange. */
 
-	static int x = 0;
-
-	if(++x >= 3) {
-		x = 0;
+	if(++mesh->udp_choice >= 3) {
+		mesh->udp_choice = 0;
 		return;
 	}
 
@@ -341,22 +334,12 @@ static void choose_broadcast_address(meshlink_handle_t *mesh, const node_t *n, c
 	*sock = rand() % mesh->listen_sockets;
 
 	if(mesh->listen_socket[*sock].sa.sa.sa_family == AF_INET6) {
-		if(mesh->localdiscovery_address.sa.sa_family == AF_INET6) {
-			mesh->localdiscovery_address.in6.sin6_port = n->prevedge->address.in.sin_port;
-			*sa = &mesh->localdiscovery_address;
-		} else {
-			broadcast_ipv6.in6.sin6_port = n->prevedge->address.in.sin_port;
-			broadcast_ipv6.in6.sin6_scope_id = mesh->listen_socket[*sock].sa.in6.sin6_scope_id;
-			*sa = &broadcast_ipv6;
-		}
+		broadcast_ipv6.in6.sin6_port = n->prevedge->address.in.sin_port;
+		broadcast_ipv6.in6.sin6_scope_id = mesh->listen_socket[*sock].sa.in6.sin6_scope_id;
+		*sa = &broadcast_ipv6;
 	} else {
-		if(mesh->localdiscovery_address.sa.sa_family == AF_INET) {
-			mesh->localdiscovery_address.in.sin_port = n->prevedge->address.in.sin_port;
-			*sa = &mesh->localdiscovery_address;
-		} else {
-			broadcast_ipv4.in.sin_port = n->prevedge->address.in.sin_port;
-			*sa = &broadcast_ipv4;
-		}
+		broadcast_ipv4.in.sin_port = n->prevedge->address.in.sin_port;
+		*sa = &broadcast_ipv4;
 	}
 }
 
@@ -375,15 +358,14 @@ bool send_sptps_data(void *handle, uint8_t type, const void *data, size_t len) {
 
 	/* Send it via TCP if it is a handshake packet, TCPOnly is in use, or this packet is larger than the MTU. */
 
-	if(type >= SPTPS_HANDSHAKE || ((mesh->self->options | to->options) & OPTION_TCPONLY) || (type != PKT_PROBE && len > to->minmtu)) {
+	if(type >= SPTPS_HANDSHAKE || (type != PKT_PROBE && len > to->minmtu)) {
 		char buf[len * 4 / 3 + 5];
 		b64encode(data, buf, len);
 
 		/* If no valid key is known yet, send the packets using ANS_KEY requests,
 		   to ensure we get to learn the reflexive UDP address. */
 		if(!to->status.validkey) {
-			to->incompression = mesh->self->incompression;
-			return send_request(mesh, to->nexthop->connection, NULL, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, mesh->self->name, to->name, buf, to->incompression);
+			return send_request(mesh, to->nexthop->connection, NULL, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, mesh->self->name, to->name, buf, 0);
 		} else {
 			return send_request(mesh, to->nexthop->connection, NULL, "%d %s %s %d %s", REQ_KEY, mesh->self->name, to->name, REQ_SPTPS, buf);
 		}
@@ -424,7 +406,7 @@ bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t
 
 	if(type == SPTPS_HANDSHAKE) {
 		if(!from->status.validkey) {
-			logger(mesh, MESHLINK_INFO, "SPTPS key exchange with %s succesful", from->name);
+			logger(mesh, MESHLINK_INFO, "SPTPS key exchange with %s successful", from->name);
 			from->status.validkey = true;
 			from->status.waitingforkey = false;
 
@@ -514,7 +496,6 @@ void broadcast_packet(meshlink_handle_t *mesh, const node_t *from, vpn_packet_t
 static node_t *try_harder(meshlink_handle_t *mesh, const sockaddr_t *from, const vpn_packet_t *pkt) {
 	node_t *n = NULL;
 	bool hard = false;
-	static time_t last_hard_try = 0;
 
 	for splay_each(edge_t, e, mesh->edges) {
 		if(!e->to->status.reachable || e->to == mesh->self) {
@@ -522,7 +503,7 @@ static node_t *try_harder(meshlink_handle_t *mesh, const sockaddr_t *from, const
 		}
 
 		if(sockaddrcmp_noport(from, &e->address)) {
-			if(last_hard_try == mesh->loop.now.tv_sec) {
+			if(mesh->last_hard_try == mesh->loop.now.tv_sec) {
 				continue;
 			}
 
@@ -538,10 +519,9 @@ static node_t *try_harder(meshlink_handle_t *mesh, const sockaddr_t *from, const
 	}
 
 	if(hard) {
-		last_hard_try = mesh->loop.now.tv_sec;
+		mesh->last_hard_try = mesh->loop.now.tv_sec;
 	}
 
-	last_hard_try = mesh->loop.now.tv_sec;
 	return n;
 }
 
@@ -551,11 +531,13 @@ void handle_incoming_vpn_data(event_loop_t *loop, void *data, int flags) {
 	listen_socket_t *ls = data;
 	vpn_packet_t pkt;
 	char *hostname;
-	sockaddr_t from = {0};
+	sockaddr_t from;
 	socklen_t fromlen = sizeof(from);
 	node_t *n;
 	int len;
 
+	memset(&from, 0, sizeof(from));
+
 	len = recvfrom(ls->udp.fd, pkt.data, MAXSIZE, 0, &from.sa, &fromlen);
 
 	if(len <= 0 || len > MAXSIZE) {