X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Froute.c;h=a11c55aefeee1ca3906cc17b13a4afff8d55b5a1;hb=9cde0d32cf209388cc59b06b7dcb0c3432f97da5;hp=0509b962ca4a8279b710662cd68c237e814652b6;hpb=698191fd2f512f3618e2d60592fcd57cd750b965;p=meshlink

diff --git a/src/route.c b/src/route.c
index 0509b962..ee36a9bf 100644
--- 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,81 @@
     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.2 2000/11/04 22:57:33 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 "system.h"
 
+#include "logger.h"
+#include "meshlink_internal.h"
 #include "net.h"
-#include "connlist.h"
+#include "route.h"
+#include "utils.h"
+
+static bool checklength(node_t *source, vpn_packet_t *packet, uint16_t length) {
+	assert(length);
+
+	if(packet->len < length) {
+		logger(source->mesh, MESHLINK_WARNING, "Got too short packet from %s", source->name);
+		return false;
+	} else {
+		return true;
+	}
+}
 
-#include "system.h"
+void route(meshlink_handle_t *mesh, node_t *source, vpn_packet_t *packet) {
+	assert(source);
 
-int routing_mode = 0;		/* Will be used to determine if we route by MAC or by payload's protocol */
-
-conn_list_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;
-     }
-}
+	// TODO: route on name or key
 
-conn_list_t *route_mac(vpn_packet_t *packet)
-{
-  conn_list_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;  
-}
+	meshlink_packethdr_t *hdr = (meshlink_packethdr_t *) packet->data;
+	node_t *dest = lookup_node(mesh, (char *)hdr->destination);
+	logger(mesh, MESHLINK_DEBUG, "Routing packet from \"%s\" to \"%s\"\n", hdr->source, hdr->destination);
 
+	//Check Length
+	if(!checklength(source, packet, sizeof(*hdr))) {
+		return;
+	}
 
-conn_list_t *route_ipv4(vpn_packet_t *packet)
-{
-  ipv4_t dest;
-  conn_list_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;  
-}
+	if(dest == NULL) {
+		//Lookup failed
+		logger(mesh, MESHLINK_WARNING, "Can't lookup the destination of a packet in the route() function. This should never happen!\n");
+		logger(mesh, MESHLINK_WARNING, "Destination was: %s\n", hdr->destination);
+		return;
+	}
+
+	if(dest == mesh->self) {
+		const void *payload = packet->data + sizeof(*hdr);
+		size_t len = packet->len - sizeof(*hdr);
+
+		char hex[len * 2 + 1];
+
+		if(mesh->log_level <= MESHLINK_DEBUG) {
+			bin2hex(payload, hex, len);        // don't do this unless it's going to be logged
+		}
+
+		logger(mesh, MESHLINK_DEBUG, "I received a packet for me with payload: %s\n", hex);
+
+		if(mesh->receive_cb) {
+			mesh->receive_cb(mesh, (meshlink_node_t *)source, payload, len);
+		}
+
+		return;
+	}
+
+	if(!dest->status.reachable) {
+		//TODO: check what to do here, not just print a warning
+		logger(mesh, MESHLINK_WARNING, "The destination of a packet in the route() function is unreachable. Dropping packet.\n");
+		return;
+	}
+
+	if(dest == source) {
+		logger(mesh, MESHLINK_ERROR, "Routing loop for packet from %s!", source->name);
+		return;
+	}
 
-conn_list_t *route_ipv6(vpn_packet_t *packet)
-{
-cp
-  syslog(LOG_WARNING, _("Cannot route packet: IPv6 routing not implemented yet"));
-cp
-  return NULL;
+	send_packet(mesh, dest, packet);
+	return;
 }