X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Froute.c;h=ee36a9bfe4b17c8289d85053312a7d44ed2692c3;hb=529b8fab8c21e7ae5af91d742ff202eab38e51f3;hp=751ebc3362be109417c2ed736f349255c7ecf700;hpb=1da7f28315be17a4ed854cdceb97a870f16a511e;p=meshlink

diff --git a/src/route.c b/src/route.c
index 751ebc33..ee36a9bf 100644
--- a/src/route.c
+++ b/src/route.c
@@ -25,55 +25,68 @@
 #include "route.h"
 #include "utils.h"
 
-bool decrement_ttl = false;
-
 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 (%s)", source->name, source->hostname);
+		logger(source->mesh, MESHLINK_WARNING, "Got too short packet from %s", source->name);
 		return false;
-	} else
+	} else {
 		return true;
+	}
 }
 
 void route(meshlink_handle_t *mesh, node_t *source, vpn_packet_t *packet) {
+	assert(source);
+
 	// TODO: route on name or key
 
-	node_t *owner = NULL;
-	node_t *via = NULL;
 	meshlink_packethdr_t *hdr = (meshlink_packethdr_t *) packet->data;
-	owner = lookup_node(mesh, (char *)hdr->destination);
-	logger(mesh, MESHLINK_WARNING, "Routing packet from: %s . To: %s \n", hdr->source, hdr->destination);
+	node_t *dest = lookup_node(mesh, (char *)hdr->destination);
+	logger(mesh, MESHLINK_DEBUG, "Routing packet from \"%s\" to \"%s\"\n", hdr->source, hdr->destination);
 
-	//Check Lenght
-	if(!checklength(source, packet, (sizeof(meshlink_packethdr_t))))
+	//Check Length
+	if(!checklength(source, packet, sizeof(*hdr))) {
 		return;
+	}
 
-	if(owner == NULL) {
+	if(dest == NULL) {
 		//Lookup failed
-		logger(mesh, MESHLINK_WARNING, "Cant lookup the owner of a packet in the route() function. This should never happen!\n");
+		logger(mesh, MESHLINK_WARNING, "Can't lookup the destination of a packet in the route() function. This should never happen!\n");
 		logger(mesh, MESHLINK_WARNING, "Destination was: %s\n", hdr->destination);
 		return;
 	}
 
-	if(owner == mesh->self) {
-		logger(mesh, MESHLINK_WARNING, "I received a packet for me with payload: %s \n", packet->data + sizeof *hdr);
-		if(mesh->receive_cb)
-			mesh->receive_cb(mesh, (meshlink_node_t *)source, packet->data + sizeof *hdr, packet->len - sizeof *hdr);
+	if(dest == mesh->self) {
+		const void *payload = packet->data + sizeof(*hdr);
+		size_t len = packet->len - sizeof(*hdr);
+
+		char hex[len * 2 + 1];
+
+		if(mesh->log_level <= MESHLINK_DEBUG) {
+			bin2hex(payload, hex, len);        // don't do this unless it's going to be logged
+		}
+
+		logger(mesh, MESHLINK_DEBUG, "I received a packet for me with payload: %s\n", hex);
+
+		if(mesh->receive_cb) {
+			mesh->receive_cb(mesh, (meshlink_node_t *)source, payload, len);
+		}
+
 		return;
 	}
 
-	if(!owner->status.reachable) {
+	if(!dest->status.reachable) {
 		//TODO: check what to do here, not just print a warning
-		logger(mesh, MESHLINK_WARNING, "The owner of a packet in the route() function is unreachable. Dropping packet.\n");
+		logger(mesh, MESHLINK_WARNING, "The destination of a packet in the route() function is unreachable. Dropping packet.\n");
 		return;
 	}
 
-	via = (owner->via == mesh->self) ? owner->nexthop : owner->via;
-	if(via == source) {
-		logger(mesh, MESHLINK_ERROR, "Routing loop for packet from %s (%s)!", source->name, source->hostname);
+	if(dest == source) {
+		logger(mesh, MESHLINK_ERROR, "Routing loop for packet from %s!", source->name);
 		return;
 	}
 
-	send_packet(mesh, owner, packet);
+	send_packet(mesh, dest, packet);
 	return;
 }