Stop using the global variable mesh in most of the rest of the code.

[meshlink] / src / route.c

diff --git a/src/route.c b/src/route.c
index 764d9b82ca309a78bc54d750f3a46e55f2187275..242b5864cfa04df44167fbd5b918046c2064c016 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -20,37 +20,14 @@
 #include "system.h"
 
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "net.h"
 #include "route.h"
 #include "utils.h"
-#include "libmeshlink.h"
 
-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);
                return false;
@@ -58,17 +35,17 @@ static bool checklength(node_t *source, vpn_packet_t *packet, length_t length) {
                return true;
 }
 
-void route(node_t *source,vpn_packet_t *packet) {
+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;
-    tincpackethdr* hdr = (tincpackethdr*)packet->data;
-    owner = lookup_node(hdr->destination);
+    meshlink_packethdr_t* hdr = (meshlink_packethdr_t*)packet->data;
+    owner = lookup_node(mesh, 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) {
@@ -78,10 +55,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 + 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;
     }
 
@@ -91,17 +68,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;
     }
 
-    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);
+    send_packet(mesh, owner, packet);
     return;
 }