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 5d967dc3c937dcbfd76119dd59b220ebcdd766d9..242b5864cfa04df44167fbd5b918046c2064c016 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -1,7 +1,6 @@
 /*
     route.c -- routing
-    Copyright (C) 2000-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,38 +20,14 @@
 #include "system.h"
 
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "net.h"
 #include "route.h"
 #include "utils.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;
-bool overwrite_mac = false;
-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;
@@ -60,6 +35,45 @@ static bool checklength(node_t *source, vpn_packet_t *packet, length_t length) {
                return true;
 }
 
-void route(node_t *source, vpn_packet_t *packet) {
-       // TODO: route on name or key
+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, 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 == 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);
+    (meshlink_receive_cb_t)(packet->data + sizeof *hdr);
+    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;
+    }
+
+    send_packet(mesh, owner, packet);
+    return;
 }