X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Froute.c;h=00d3d142cb819146d934cede77c6de343af7f87f;hb=ea294dac41365a08a77b64c62c0ba630292d7a07;hp=de81c2b68ea5de8f398114fb80c2482317a4eb39;hpb=2cfd1205dc9c6e9d42cc569f415afe13f52357ec;p=meshlink

diff --git a/src/route.c b/src/route.c
index de81c2b6..00d3d142 100644
--- a/src/route.c
+++ b/src/route.c
@@ -29,9 +29,7 @@ bool decrement_ttl = false;
 
 static bool checklength(node_t *source, vpn_packet_t *packet, uint16_t length) {
 	if(packet->len < length) {
-		logger(DEBUG_TRAFFIC, LOG_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
 		return true;
@@ -44,37 +42,42 @@ void route(meshlink_handle_t *mesh, node_t *source, vpn_packet_t *packet) {
 	node_t *via = NULL;
 	meshlink_packethdr_t *hdr = (meshlink_packethdr_t *) packet->data;
 	owner = lookup_node(mesh, (char *)hdr->destination);
-	logger(DEBUG_TRAFFIC, LOG_WARNING,
-	       "Routing packet from: %s . To: %s \n", hdr->source,
-	       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))))
+	if(!checklength(source, packet, sizeof(*hdr)))
 		return;
 
 	if(owner == NULL) {
 		//Lookup failed
-		logger(DEBUG_TRAFFIC, LOG_WARNING, "Cant lookup the owner of a packet in the route() function. This should never happen!\n");
-		logger(DEBUG_TRAFFIC, LOG_WARNING, "Destination was: %s\n", hdr->destination);
+		logger(mesh, MESHLINK_WARNING, "Cant lookup the owner 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(DEBUG_TRAFFIC, LOG_WARNING, "I received a packet for me with payload: %s \n", packet->data + sizeof *hdr);
+		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, packet->data + sizeof *hdr, packet->len - sizeof *hdr);
+			mesh->receive_cb(mesh, (meshlink_node_t *)source, payload, len);
 		return;
 	}
 
 	if(!owner->status.reachable) {
 		//TODO: check what to do here, not just print a warning
-		logger(DEBUG_TRAFFIC, LOG_WARNING, "The owner of a packet in the route() function is unreachable. Dropping packet.\n");
+		logger(mesh, MESHLINK_WARNING, "The owner 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(DEBUG_TRAFFIC, LOG_ERR, "Routing loop for packet from %s (%s)!", source->name, source->hostname);
+		logger(mesh, MESHLINK_ERROR, "Routing loop for packet from %s!", source->name);
 		return;
 	}