X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Froute.c;h=0eb39aafd7611e4edfa6aac05fc4afb899f8ae40;hb=35cbcab5e38ad286dfe85c6958b47a87c8885c41;hp=764d9b82ca309a78bc54d750f3a46e55f2187275;hpb=3c72744cc47f02815bbef5de39ce3740f23be3a0;p=meshlink

diff --git a/src/route.c b/src/route.c
index 764d9b82..0eb39aaf 100644
--- a/src/route.c
+++ b/src/route.c
@@ -20,19 +20,13 @@
 #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;
@@ -50,7 +44,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;
@@ -78,10 +72,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 +85,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);
     return;
 }