X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Froute.c;h=7dd7635fae937cb2d034d61dd29be6c3200e3c94;hp=3d9b28bd24a24b7d158e753e74baaa5211d05e87;hb=eefa28059ab989c915a7d95fb4ae728abd7ce713;hpb=e449d94caef963809d417f16497f6f978e10d731

diff --git a/src/route.c b/src/route.c
index 3d9b28bd..7dd7635f 100644
--- a/src/route.c
+++ b/src/route.c
@@ -17,7 +17,7 @@
     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.59 2003/07/17 15:06:27 guus Exp $
+    $Id: route.c,v 1.1.2.62 2003/07/22 20:55:20 guus Exp $
 */
 
 #include "system.h"
@@ -44,6 +44,9 @@
 #include "avl_tree.h"
 #include "connection.h"
 #include "device.h"
+#include "ethernet.h"
+#include "ipv4.h"
+#include "ipv6.h"
 #include "logger.h"
 #include "net.h"
 #include "protocol.h"
@@ -51,28 +54,10 @@
 #include "subnet.h"
 #include "utils.h"
 
-/* Missing definitions */
-
-#ifndef ETHER_ADDR_LEN
-#define ETHER_ADDR_LEN 6
-#endif
-
-#ifndef ICMP_DEST_UNREACH
-#define ICMP_DEST_UNREACH 3
-#endif
-
-#ifndef ICMP_NET_UNKNOWN
-#define ICMP_NET_UNKNOWN 6
-#endif
-
-#ifndef ICMP_NET_UNREACH
-#define ICMP_NET_UNREACH 0
-#endif
-
-int routing_mode = RMODE_ROUTER;
-int priorityinheritance = 0;
+rmode_t routing_mode = RMODE_ROUTER;
+bool priorityinheritance = false;
 int macexpire = 600;
-int overwrite_mac = 0;
+bool overwrite_mac = false;
 mac_t mymac = {{0xFE, 0xFD, 0, 0, 0, 0}};
 
 /* RFC 1071 */
@@ -96,14 +81,14 @@ static uint16_t inet_checksum(void *data, int len, uint16_t prevsum)
 	return ~checksum;
 }
 
-static int ratelimit(void) {
+static bool ratelimit(void) {
 	static time_t lasttime = 0;
 	
 	if(lasttime == now)
-		return 1;
+		return true;
 
 	lasttime = now;
-	return 0;
+	return false;
 }
 	
 static void learn_mac(mac_t *address)