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

diff --git a/src/route.c b/src/route.c
index e4007b47..68873096 100644
--- a/src/route.c
+++ b/src/route.c
@@ -20,30 +20,22 @@
 #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(lasttime == mesh->loop.now.tv_sec) {
 		if(count >= frequency)
 			return true;
 	} else {
-		lasttime = now.tv_sec;
+		lasttime = mesh->loop.now.tv_sec;
 		count = 0;
 	}
 
@@ -51,7 +43,7 @@ static bool ratelimit(int frequency) {
 	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);
 		return false;
@@ -63,18 +55,26 @@ void route(node_t *source,vpn_packet_t *packet) {
     // TODO: route on name or key
 
     node_t* owner = NULL;
-    tincpackethdr* hdr = (tincpackethdr*)packet->data;
+    node_t* via = NULL;
+    meshlink_packethdr_t* hdr = (meshlink_packethdr_t*)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(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 == myself ) {
+    if (owner == mesh->self ) {
     //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);
+    logger(DEBUG_TRAFFIC, LOG_WARNING, "I received a packet for me with payload: %s \n", packet->data + sizeof *hdr);
+    (meshlink_receive_cb_t)(packet->data + sizeof *hdr);
     return;
     }
 
@@ -84,7 +84,11 @@ void route(node_t *source,vpn_packet_t *packet) {
     return;
     }
 
-    //TODO: I skipped here a lot of checks !
+    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;
+    }
 
     send_packet(owner,packet);
     return;