X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Froute.c;h=de81c2b68ea5de8f398114fb80c2482317a4eb39;hb=bd8eb9b38758f16f8f0207dcd5b743bfacb535cb;hp=cffb7d25ab491cf6c31590e6570a826de75afc1c;hpb=22f930e7c6352a1b43b1605799925e10fced254a;p=meshlink

diff --git a/src/route.c b/src/route.c
index cffb7d25..de81c2b6 100644
--- a/src/route.c
+++ b/src/route.c
@@ -20,89 +20,64 @@
 #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(DEBUG_TRAFFIC, LOG_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;
-    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;
+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(DEBUG_TRAFFIC, LOG_WARNING,
+	       "Routing packet from: %s . To: %s \n", hdr->source,
+	       hdr->destination);
+
+	//Check Lenght
+	if(!checklength(source, packet, (sizeof(meshlink_packethdr_t))))
+		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 == 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 == mesh->self) {
+		logger(DEBUG_TRAFFIC, LOG_WARNING, "I received a packet for me with payload: %s \n", packet->data + sizeof *hdr);
+		if(mesh->receive_cb)
+			mesh->receive_cb(mesh, (meshlink_node_t *)source, packet->data + sizeof *hdr, packet->len - sizeof *hdr);
+		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;
+	}
 
-    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 == mesh->self) ? owner->nexthop : owner->via;
+	if(via == source) {
+		logger(DEBUG_TRAFFIC, LOG_ERR, "Routing loop for packet from %s (%s)!", source->name, source->hostname);
+		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);
+	send_packet(mesh, owner, packet);
 	return;
-    }
-
-    if (directonly && owner!=via) {
-    logger(DEBUG_TRAFFIC, LOG_WARNING, "Direct Only is requested. Dropping packet because direct connection not available \n");
-    return;
-    }
-
-    send_packet(owner,packet);
-    return;
 }