Update android build

[meshlink] / src / route.c

diff --git a/src/route.c b/src/route.c
index 92a360ff7cf7818a7b243c28a5c9d2cf4767a931..77e018e9f6014cb46b8ef1158c3747b1cc954404 100644 (file)
--- 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) {
@@ -44,28 +45,34 @@ void route(meshlink_handle_t *mesh, node_t *source, vpn_packet_t *packet) {
        owner = 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 *hdr))
+       //Check Length
+       if(!checklength(source, packet, sizeof(*hdr))) {
                return;
+       }
 
        if(owner == 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 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) {
-               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;
        }