X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Froute.c;h=9ab0688dc96376eee892ff2df87c9568565645f9;hb=76c7550c8ab0e9c0ee14a9c396baa008cfb9bc42;hp=f09a1041f1f8aca3561a49001fc74680180462af;hpb=fb7b6e7a0c966a88a682f656ca1caeb9a0583c5b;p=meshlink

diff --git a/src/route.c b/src/route.c
index f09a1041..9ab0688d 100644
--- a/src/route.c
+++ b/src/route.c
@@ -20,71 +20,67 @@
 #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, length_t length) {
+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 (%s)", source->name, source->hostname);
 		return false;
 	} 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);
-    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) {
+	// TODO: route on name or key
+
+	node_t *owner = NULL;
+	node_t *via = NULL;
+	meshlink_packethdr_t *hdr = (meshlink_packethdr_t *) packet->data;
+	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)))
+		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, "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);
+
+		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(!owner->status.reachable) {
+		//TODO: check what to do here, not just print a warning
+		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(mesh, MESHLINK_ERROR, "Routing loop for packet from %s (%s)!", source->name, source->hostname);
+		return;
+	}
+
+	send_packet(mesh, owner, packet);
+	return;
 }