Avoid allocating packet buffers unnecessarily.

[meshlink] / src / route.c

diff --git a/src/route.c b/src/route.c
index 450baf9049159e944174f86b1c0623d6fd0c19ea..ee36a9bfe4b17c8289d85053312a7d44ed2692c3 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -20,76 +20,73 @@
 #include "system.h"
 
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "net.h"
 #include "route.h"
 #include "utils.h"
-#include "libmeshlink.h"
-
-bool decrement_ttl = false;
-
-static bool ratelimit(int frequency) {
-       static time_t lasttime = 0;
-       static int count = 0;
-
-       if(lasttime == now.tv_sec) {
-               if(count >= frequency)
-                       return true;
-       } else {
-               lasttime = now.tv_sec;
-               count = 0;
-       }
-
-       count++;
-       return false;
-}
 
 static bool checklength(node_t *source, vpn_packet_t *packet, uint16_t length) {
+       assert(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
+       } else {
                return true;
+       }
 }
 
-void route(node_t *source,vpn_packet_t *packet) {
-    // TODO: route on name or key
-
-    node_t* owner = NULL;
-    node_t* via = NULL;
-    tincpackethdr* hdr = (tincpackethdr*)packet->data;
-    owner = lookup_node(hdr->destination);
-    logger(DEBUG_TRAFFIC, LOG_WARNING, "Routing packet from: %s . To: %s \n",hdr->source,hdr->destination);
-
-    //Check Lenght
-    if(!checklength(source, packet, (sizeof(tincpackethdr))))
-        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);
-    return;
-    }
-
-    if (owner == myself ) {
-    //TODO: implement sending received data from meshlink library to the application
-    logger(DEBUG_TRAFFIC, LOG_WARNING, "I received a packet for me with payload: %s \n", packet->data + sizeof *hdr);
-    (recv_callback)(packet->data + sizeof *hdr);
-    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");
-    return;
-    }
-
-    via = (owner->via == myself) ? owner->nexthop : owner->via;
-    if(via == source) {
-       logger(DEBUG_TRAFFIC, LOG_ERR, "Routing loop for packet from %s (%s)!", source->name, source->hostname);
-       return;
-    }
+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;
+       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 Length
+       if(!checklength(source, packet, sizeof(*hdr))) {
+               return;
+       }
 
-    send_packet(owner,packet);
-    return;
+       if(dest == NULL) {
+               //Lookup failed
+               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(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(!dest->status.reachable) {
+               //TODO: check what to do here, not just print a warning
+               logger(mesh, MESHLINK_WARNING, "The destination of a packet in the route() function is unreachable. Dropping packet.\n");
+               return;
+       }
+
+       if(dest == source) {
+               logger(mesh, MESHLINK_ERROR, "Routing loop for packet from %s!", source->name);
+               return;
+       }
+
+       send_packet(mesh, dest, packet);
+       return;
 }