Stop using global variable mesh in net_packet.c.

[meshlink] / src / route.c

diff --git a/src/route.c b/src/route.c
index 450baf9049159e944174f86b1c0623d6fd0c19ea..9a0c64341e8b5cb0b3a08f1d4b07821c8d51ee05 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -20,10 +20,10 @@
 #include "system.h"
 
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "net.h"
 #include "route.h"
 #include "utils.h"
-#include "libmeshlink.h"
 
 bool decrement_ttl = false;
 
@@ -31,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;
        }
 
@@ -56,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) {
@@ -71,10 +71,10 @@ void route(node_t *source,vpn_packet_t *packet) {
     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 + sizeof *hdr);
-    (recv_callback)(packet->data + sizeof *hdr);
+    (meshlink_receive_cb_t)(packet->data + sizeof *hdr);
     return;
     }
 
@@ -84,12 +84,12 @@ void route(node_t *source,vpn_packet_t *packet) {
     return;
     }
 
-    via = (owner->via == myself) ? owner->nexthop : owner->via;
+    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);
+    send_packet(mesh, owner, packet);
     return;
 }