Ensure everything compiles with -Wall without giving warnings.

[meshlink] / src / route.c

diff --git a/src/route.c b/src/route.c
index 4620665461d130a2a8fecc5f51f2a3cab8d362fb..de81c2b68ea5de8f398114fb80c2482317a4eb39 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -1,7 +1,6 @@
 /*
     route.c -- routing
-    Copyright (C) 2000 Ivo Timmermans <itimmermans@bigfoot.com>,
-                  2000 Guus Sliepen <guus@sliepen.warande.net>
+    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
@@ -13,100 +12,72 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: route.c,v 1.1.2.3 2000/11/20 19:12:17 guus Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "config.h"
-
-#include <utils.h>
-#include <xalloc.h>
-
-#include "net.h"
-#include "connection.h"
-
 #include "system.h"
 
-int routing_mode = 0;          /* Will be used to determine if we route by MAC or by payload's protocol */
-
-connection_t *route_packet(vpn_packet_t *packet)
-{
-  unsigned short type;
-cp
-  type = ntohs(*((unsigned short*)(&packet.data[12])))
-
-  if(routing_mode)
-    {
-      return route_mac(packet);
-    }
-
-  switch(type)
-    {
-      case 0x0800:
-        return route_ipv4(packet);
-      case 0x86DD:
-        return route_ipv6(packet);
-/*
-      case 0x8137:
-        return route_ipx(packet);
-      case 0x0806:
-        return route_arp(packet);
-*/
-      default:
-        if(debug_lvl >= DEBUG_TRAFFIC)
-          {
-            syslog(LOG_WARNING, _("Cannot route packet: unknown type %hx"), type);
-          }
-        return NULL;
-     }
-}
-
-connection_t *route_mac(vpn_packet_t *packet)
-{
-  connection_t *cl;
-cp
-  cl = lookup_subnet_mac((mac_t *)(&packet.data[6]));
-  if(!cl)
-    if(debug_lvl >= DEBUG_TRAFFIC)
-      {
-        syslog(LOG_WARNING, _("Cannot route packet: unknown destination address %x:%x:%x:%x:%x:%x"),
-               packet.data[6],
-               packet.data[7],
-               packet.data[8],
-               packet.data[9],
-               packet.data[10],
-               packet.data[11]);
-      } 
-cp  
-  return cl;  
-}
-
-
-connection_t *route_ipv4(vpn_packet_t *packet)
-{
-  ipv4_t dest;
-  connection_t *cl;
-cp
-  dest = ntohl(*((unsigned long*)(&packet.data[30]);
-  
-  cl = lookup_subnet_ipv4(dest);
-  if(!cl)
-    if(debug_lvl >= DEBUG_TRAFFIC)
-      {
-        syslog(LOG_WARNING, _("Cannot route packet: unknown destination address %d.%d.%d.%d"),
-               packet.data[30], packet.data[31], packet.data[32], packet.data[33]);
-      } 
-cp
-  return cl;  
+#include "logger.h"
+#include "meshlink_internal.h"
+#include "net.h"
+#include "route.h"
+#include "utils.h"
+
+bool decrement_ttl = false;
+
+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;
+       } else
+               return true;
 }
 
-connection_t *route_ipv6(vpn_packet_t *packet)
-{
-cp
-  syslog(LOG_WARNING, _("Cannot route packet: IPv6 routing not implemented yet"));
-cp
-  return NULL;
+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, (char *)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) {
+               logger(DEBUG_TRAFFIC, LOG_WARNING, "I received a packet for me with payload: %s \n", packet->data + sizeof *hdr);
+               if(mesh->receive_cb)
+                       mesh->receive_cb(mesh, (meshlink_node_t *)source, packet->data + sizeof *hdr, packet->len - 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;
 }