No easy way to properly detect header files...

[tinc] / src / route.c

diff --git a/src/route.c b/src/route.c
index a6f6e46..5823f37 100644 (file)
--- 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.60 2003/07/18 12:16:24 guus Exp $
+    $Id: route.c,v 1.1.2.63 2003/07/31 13:18:34 guus Exp $
 */
 
 #include "system.h"
@@ -31,9 +31,6 @@
 #ifdef HAVE_NETINET_IP_ICMP_H
 #include <netinet/ip_icmp.h>
 #endif
-#ifdef HAVE_NETINET_IP6_H
-#include <netinet/ip6.h>
-#endif
 #ifdef HAVE_NETINET_ICMP6_H
 #include <netinet/icmp6.h>
 #endif
@@ -54,28 +51,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 */
@@ -99,14 +78,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)