X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Froute.c;h=f7a728dc80278cac5ed62f2912f6b163428a534c;hb=7afe8daaf5ba221968a3e2beff61fa653f497cb1;hp=92a360ff7cf7818a7b243c28a5c9d2cf4767a931;hpb=257493390b8f103f792fa99c823b0bf7c46020a2;p=meshlink

diff --git a/src/route.c b/src/route.c
index 92a360ff..f7a728dc 100644
--- a/src/route.c
+++ b/src/route.c
@@ -29,10 +29,11 @@ bool decrement_ttl = false;
 
 static bool checklength(node_t *source, vpn_packet_t *packet, uint16_t 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) {
@@ -45,8 +46,9 @@ void route(meshlink_handle_t *mesh, node_t *source, vpn_packet_t *packet) {
 	logger(mesh, MESHLINK_DEBUG, "Routing packet from \"%s\" to \"%s\"\n", hdr->source, hdr->destination);
 
 	//Check Lenght
-	if(!checklength(source, packet, sizeof *hdr))
+	if(!checklength(source, packet, sizeof(*hdr))) {
 		return;
+	}
 
 	if(owner == NULL) {
 		//Lookup failed
@@ -56,16 +58,21 @@ void route(meshlink_handle_t *mesh, node_t *source, vpn_packet_t *packet) {
 	}
 
 	if(owner == mesh->self) {
-		const void *payload = packet->data + sizeof *hdr;
-		size_t len = packet->len - 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
+		}
 
-		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)
+		if(mesh->receive_cb) {
 			mesh->receive_cb(mesh, (meshlink_node_t *)source, payload, len);
+		}
+
 		return;
 	}
 
@@ -76,8 +83,9 @@ void route(meshlink_handle_t *mesh, node_t *source, vpn_packet_t *packet) {
 	}
 
 	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);
+		logger(mesh, MESHLINK_ERROR, "Routing loop for packet from %s!", source->name);
 		return;
 	}