Merge remote-tracking branch 'origin/master' into saverio

[meshlink] / src / route.c

diff --git a/src/route.c b/src/route.c
index 52e7a69d4785058d942ae8da0789158182f8392b..cffb7d25ab491cf6c31590e6570a826de75afc1c 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
@@ -33,7 +32,6 @@ 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;
 
@@ -65,17 +63,26 @@ void route(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);
+    logger(DEBUG_TRAFFIC, LOG_WARNING, "Routing packet from: %s . To: %s \n",hdr->source,hdr->destination);
+
+    //Check Lenght
+    if(!checklength(source, packet, (sizeof(tincpackethdr))))
+        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 == myself ) {
     //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);
     return;
     }
 
@@ -85,7 +92,16 @@ void route(node_t *source,vpn_packet_t *packet) {
     return;
     }
 
-    //TODO: I skipped here a lot of checks !
+    via = (owner->via == myself) ? 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;