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

diff --git a/src/route.c b/src/route.c
index d999d11e..68873096 100644
--- a/src/route.c
+++ b/src/route.c
@@ -24,7 +24,6 @@
 #include "net.h"
 #include "route.h"
 #include "utils.h"
-#include "libmeshlink.h"
 
 bool decrement_ttl = false;
 
@@ -32,11 +31,11 @@ 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;
 	}
 
@@ -57,12 +56,12 @@ void route(node_t *source,vpn_packet_t *packet) {
 
     node_t* owner = NULL;
     node_t* via = NULL;
-    tincpackethdr* hdr = (tincpackethdr*)packet->data;
+    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(tincpackethdr))))
+    if(!checklength(source, packet, (sizeof(meshlink_packethdr_t))))
         return;
 
     if (owner == NULL) {
@@ -75,7 +74,7 @@ void route(node_t *source,vpn_packet_t *packet) {
     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 + sizeof *hdr);
-    (recv_callback)(packet->data + sizeof *hdr);
+    (meshlink_receive_cb_t)(packet->data + sizeof *hdr);
     return;
     }