X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Froute.c;h=77e018e9f6014cb46b8ef1158c3747b1cc954404;hb=HEAD;hp=4de61026af6def9191309429a86c8457c9de419f;hpb=fd7e81983ca4cae7cdf2a67a35500284f17761c4;p=meshlink

diff --git a/src/route.c b/src/route.c
index 4de61026..c63c0373 100644
--- a/src/route.c
+++ b/src/route.c
@@ -26,6 +26,8 @@
 #include "utils.h"
 
 static bool checklength(node_t *source, vpn_packet_t *packet, uint16_t length) {
+	assert(length);
+
 	if(packet->len < length) {
 		logger(source->mesh, MESHLINK_WARNING, "Got too short packet from %s", source->name);
 		return false;
@@ -35,6 +37,8 @@ static bool checklength(node_t *source, vpn_packet_t *packet, uint16_t length) {
 }
 
 void route(meshlink_handle_t *mesh, node_t *source, vpn_packet_t *packet) {
+	assert(source);
+
 	// TODO: route on name or key
 
 	meshlink_packethdr_t *hdr = (meshlink_packethdr_t *) packet->data;
@@ -53,9 +57,16 @@ void route(meshlink_handle_t *mesh, node_t *source, vpn_packet_t *packet) {
 		return;
 	}
 
+	size_t len = packet->len - sizeof(*hdr);
+
+	// Channel traffic accounting
+	if(source == mesh->self) {
+		dest->out_data += len + SPTPS_OVERHEAD;
+	}
+
 	if(dest == mesh->self) {
+		source->in_data += len + SPTPS_OVERHEAD;
 		const void *payload = packet->data + sizeof(*hdr);
-		size_t len = packet->len - sizeof(*hdr);
 
 		char hex[len * 2 + 1];
 
@@ -65,7 +76,9 @@ void route(meshlink_handle_t *mesh, node_t *source, vpn_packet_t *packet) {
 
 		logger(mesh, MESHLINK_DEBUG, "I received a packet for me with payload: %s\n", hex);
 
-		if(mesh->receive_cb) {
+		if(source->utcp) {
+			channel_receive(mesh, (meshlink_node_t *)source, payload, len);
+		} else if(mesh->receive_cb) {
 			mesh->receive_cb(mesh, (meshlink_node_t *)source, payload, len);
 		}