X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Froute.c;h=ee36a9bfe4b17c8289d85053312a7d44ed2692c3;hp=e4007b4715a9d99093863d4cf6b9b50cf6501222;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=39238ae1f27e37cd2708596c49d90d733c930695

diff --git a/src/route.c b/src/route.c
index e4007b47..ee36a9bf 100644
--- a/src/route.c
+++ b/src/route.c
@@ -20,72 +20,73 @@
 #include "system.h"
 
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "net.h"
 #include "route.h"
 #include "utils.h"
-#include "libmeshlink.h"
-
-rmode_t routing_mode = RMODE_ROUTER;
-fmode_t forwarding_mode = FMODE_INTERNAL;
-bmode_t broadcast_mode = BMODE_MST;
-bool decrement_ttl = false;
-bool directonly = false;
-bool priorityinheritance = false;
-int macexpire = 600;
-mac_t mymac = {{0xFE, 0xFD, 0, 0, 0, 0}};
-bool pcap = 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);
 
-static bool checklength(node_t *source, vpn_packet_t *packet, length_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
+	} else {
 		return true;
+	}
 }
 
-void route(node_t *source,vpn_packet_t *packet) {
-    // TODO: route on name or key
-
-    node_t* owner = NULL;
-    tincpackethdr* hdr = (tincpackethdr*)packet->data;
-    owner = lookup_node(hdr->destination);
-    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");
-    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 + 46);
-    (recv_callback)(packet->data + 46);
-    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;
-    }
-
-    //TODO: I skipped here a lot of checks !
-
-    send_packet(owner,packet);
-    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;
+	}
+
+	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;
 }