X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_packet.c;h=acc90c97497668f00e491d724d801626e2648402;hb=refs%2Fheads%2Fmaster;hp=02a617d1922bfae065a41539b14ddedec707964e;hpb=730bb4a28b4970aa05586b1c02be7420cd491462;p=meshlink

diff --git a/src/net_packet.c b/src/net_packet.c
index 02a617d1..acc90c97 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -29,6 +29,7 @@
 #include "netutl.h"
 #include "protocol.h"
 #include "route.h"
+#include "sptps.h"
 #include "utils.h"
 #include "xalloc.h"
 
@@ -37,6 +38,7 @@ int keylifetime = 0;
 static void send_udppacket(meshlink_handle_t *mesh, node_t *, vpn_packet_t *);
 
 #define MAX_SEQNO 1073741824
+#define PROBE_OVERHEAD (SPTPS_DATAGRAM_OVERHEAD + 40)
 
 /* mtuprobes == 1..30: initial discovery, send bursts with 1 second interval
    mtuprobes ==    31: sleep pinginterval seconds
@@ -142,6 +144,7 @@ static void send_mtu_probe_handler(event_loop_t *loop, void *data) {
 
 		logger(mesh, MESHLINK_DEBUG, "Sending MTU probe length %d to %s", len, n->name);
 
+		n->out_meta += packet.len + PROBE_OVERHEAD;
 		send_udppacket(mesh, n, &packet);
 	}
 
@@ -161,6 +164,8 @@ void send_mtu_probe(meshlink_handle_t *mesh, node_t *n) {
 }
 
 static void mtu_probe_h(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet, uint16_t len) {
+	n->in_meta += len + PROBE_OVERHEAD;
+
 	if(len < 64) {
 		logger(mesh, MESHLINK_WARNING, "Got too short MTU probe length %d from %s", packet->len, n->name);
 		return;
@@ -178,6 +183,8 @@ static void mtu_probe_h(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet
 
 		bool udp_confirmed = n->status.udp_confirmed;
 		n->status.udp_confirmed = true;
+		logger(mesh, MESHLINK_DEBUG, "Sending MTU probe reply %d to %s", packet->len, n->name);
+		n->out_meta += packet->len + PROBE_OVERHEAD;
 		send_udppacket(mesh, n, packet);
 		n->status.udp_confirmed = udp_confirmed;
 	} else {
@@ -238,9 +245,6 @@ static void receive_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *pac
 	if(n->status.blacklisted) {
 		logger(mesh, MESHLINK_WARNING, "Dropping packet from blacklisted node %s", n->name);
 	} else {
-		n->in_packets++;
-		n->in_bytes += packet->len;
-
 		route(mesh, n, packet);
 	}
 }
@@ -279,6 +283,11 @@ static void send_sptps_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *
 	}
 
 	if(!n->status.validkey) {
+		if(n->connection && (n->connection->flags & PROTOCOL_TINY) & n->connection->status.active) {
+			send_raw_packet(mesh, n->connection, origpkt);
+			return;
+		}
+
 		logger(mesh, MESHLINK_INFO, "No valid key known yet for %s", n->name);
 
 		if(!n->status.waitingforkey) {
@@ -529,8 +538,6 @@ bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t
 */
 void send_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet) {
 	if(n == mesh->self) {
-		n->out_packets++;
-		n->out_bytes += packet->len;
 		// TODO: send to application
 		return;
 	}
@@ -542,8 +549,6 @@ void send_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet) {
 		return;
 	}
 
-	n->out_packets++;
-	n->out_bytes += packet->len;
 	n->status.want_udp = true;
 
 	send_sptps_packet(mesh, n, packet);