X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Froute.c;h=323edec2c1420175efeeffb633373f5aedc44cd6;hb=c1e8152f4fe5e4557784d8411e50006d461b8786;hp=382a6dde68dc8817c0d3391d0f5749529d97cae5;hpb=5db596c6844169f1eb5f804b72abe99d067aaa5a;p=tinc

diff --git a/src/route.c b/src/route.c
index 382a6dde..323edec2 100644
--- a/src/route.c
+++ b/src/route.c
@@ -17,74 +17,48 @@
     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.57 2003/07/12 17:41:47 guus Exp $
+    $Id: route.c,v 1.1.2.61 2003/07/18 12:21:03 guus Exp $
 */
 
-#include "config.h"
+#include "system.h"
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#include <sys/socket.h>
-#include <netinet/in.h>
-#ifdef HAVE_NET_IF_H
-#include <net/if.h>
-#endif
 #ifdef HAVE_NET_ETHERNET_H
 #include <net/ethernet.h>
 #endif
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
+#ifdef HAVE_NET_IF_ARP_H
+#include <net/if_arp.h>
 #endif
-#include <netinet/ip.h>
+#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
+#ifdef HAVE_NETINET_IF_ETHER_H
 #include <netinet/if_ether.h>
-#include <utils.h>
-#include <xalloc.h>
-#include <string.h>
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
 #endif
 
-#include <avl_tree.h>
-
-#include "net.h"
+#include "avl_tree.h"
 #include "connection.h"
-#include "subnet.h"
-#include "route.h"
-#include "protocol.h"
 #include "device.h"
+#include "ethernet.h"
+#include "ipv4.h"
+#include "ipv6.h"
 #include "logger.h"
-
-#include "system.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
+#include "net.h"
+#include "protocol.h"
+#include "route.h"
+#include "subnet.h"
+#include "utils.h"
 
 int routing_mode = RMODE_ROUTER;
 int priorityinheritance = 0;
 int macexpire = 600;
 int overwrite_mac = 0;
-static mac_t mymac = {{0xFE, 0xFD, 0, 0, 0, 0}};
+mac_t mymac = {{0xFE, 0xFD, 0, 0, 0, 0}};
 
 /* RFC 1071 */