X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_packet.c;h=843926934df62b6d0befd10dab6782d9e4af2014;hb=c2a9ed9e98e3dc4218c74fff774ddfe654adfd72;hp=abfb55c411435af0e07d56ab021d9c7c01bbb742;hpb=9ade39b7d5564fb6f5a41946c9a23cfa7851a19f;p=tinc

diff --git a/src/net_packet.c b/src/net_packet.c
index abfb55c4..84392693 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -389,39 +389,49 @@ void receive_tcppacket(connection_t *c, const char *buffer, int len) {
 }
 
 static void send_sptps_packet(node_t *n, vpn_packet_t *origpkt) {
-	if(n->status.sptps) {
-		uint8_t type = 0;
-		int offset = 0;
-
-		if(!(origpkt->data[12] | origpkt->data[13])) {
-			sptps_send_record(&n->sptps, PKT_PROBE, (char *)origpkt->data, origpkt->len);
-			return;
+	if(!n->status.validkey) {
+		logger(DEBUG_TRAFFIC, LOG_INFO, "No valid key known yet for %s (%s)", n->name, n->hostname);
+		if(!n->status.waitingforkey)
+			send_req_key(n);
+		else if(n->last_req_key + 10 < time(NULL)) {
+			sptps_stop(&n->sptps);
+			n->status.waitingforkey = false;
+			send_req_key(n);
 		}
+		return;
+	}
 
-		if(routing_mode == RMODE_ROUTER)
-			offset = 14;
-		else
-			type = PKT_MAC;
-
-		if(origpkt->len < offset)
-			return;
+	uint8_t type = 0;
+	int offset = 0;
 
-		vpn_packet_t outpkt;
+	if(!(origpkt->data[12] | origpkt->data[13])) {
+		sptps_send_record(&n->sptps, PKT_PROBE, (char *)origpkt->data, origpkt->len);
+		return;
+	}
 
-		if(n->outcompression) {
-			int len = compress_packet(outpkt.data + offset, origpkt->data + offset, origpkt->len - offset, n->outcompression);
-			if(len < 0) {
-				logger(DEBUG_TRAFFIC, LOG_ERR, "Error while compressing packet to %s (%s)", n->name, n->hostname);
-			} else if(len < origpkt->len - offset) {
-				outpkt.len = len + offset;
-				origpkt = &outpkt;
-				type |= PKT_COMPRESSED;
-			}
-		}
+	if(routing_mode == RMODE_ROUTER)
+		offset = 14;
+	else
+		type = PKT_MAC;
 
-		sptps_send_record(&n->sptps, type, (char *)origpkt->data + offset, origpkt->len - offset);
+	if(origpkt->len < offset)
 		return;
+
+	vpn_packet_t outpkt;
+
+	if(n->outcompression) {
+		int len = compress_packet(outpkt.data + offset, origpkt->data + offset, origpkt->len - offset, n->outcompression);
+		if(len < 0) {
+			logger(DEBUG_TRAFFIC, LOG_ERR, "Error while compressing packet to %s (%s)", n->name, n->hostname);
+		} else if(len < origpkt->len - offset) {
+			outpkt.len = len + offset;
+			origpkt = &outpkt;
+			type |= PKT_COMPRESSED;
+		}
 	}
+
+	sptps_send_record(&n->sptps, type, (char *)origpkt->data + offset, origpkt->len - offset);
+	return;
 }
 
 static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
@@ -581,13 +591,15 @@ end:
 bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len) {
 	node_t *to = handle;
 
-	if(type >= SPTPS_HANDSHAKE || ((myself->options | to->options) & OPTION_TCPONLY)) {
+	if(type >= SPTPS_HANDSHAKE
+			|| ((myself->options | to->options) & OPTION_TCPONLY)
+			|| (type != PKT_PROBE && len > to->minmtu)) {
 		char buf[len * 4 / 3 + 5];
 		b64encode(data, buf, len);
 		if(!to->status.validkey)
 			return send_request(to->nexthop->connection, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, myself->name, to->name, buf, myself->incompression);
 		else
-			return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, myself->name, to->name, REQ_SPTPS, buf);
+			return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, myself->name, to->name, type >= SPTPS_HANDSHAKE ? REQ_SPTPS : REQ_PACKET, buf);
 	}
 
 	/* Send the packet */
@@ -620,6 +632,7 @@ bool receive_sptps_record(void *handle, uint8_t type, const char *data, uint16_t
 
 	if(type == SPTPS_HANDSHAKE) {
 		from->status.validkey = true;
+		from->status.waitingforkey = false;
 		logger(DEBUG_META, LOG_INFO, "SPTPS key exchange with %s (%s) succesful", from->name, from->hostname);
 		return true;
 	}