X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Froute.c;h=89271ba876168cdeb8a73e918386300449015da9;hp=1fd1d8ef314bcff97f87e1e6d19a0d2a9e963d7a;hb=30c0381d71d333a99f6c83ff9d03ef4a0857f423;hpb=0b9175e998c2180e5d73ef3d644a49d620c68cad

diff --git a/src/route.c b/src/route.c
index 1fd1d8ef..89271ba8 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.54 2003/07/06 22:11:33 guus Exp $
+    $Id: route.c,v 1.1.2.56 2003/07/07 11:11:33 guus Exp $
 */
 
 #include "config.h"
@@ -84,11 +84,11 @@ int routing_mode = RMODE_ROUTER;
 int priorityinheritance = 0;
 int macexpire = 600;
 int overwrite_mac = 0;
-mac_t mymac = {{0xFE, 0xFD, 0, 0, 0, 0}};
+static mac_t mymac = {{0xFE, 0xFD, 0, 0, 0, 0}};
 
 /* RFC 1071 */
 
-uint16_t inet_checksum(void *data, int len, uint16_t prevsum)
+static uint16_t inet_checksum(void *data, int len, uint16_t prevsum)
 {
 	uint16_t *p = data;
 	uint32_t checksum = prevsum ^ 0xFFFF;
@@ -107,7 +107,7 @@ uint16_t inet_checksum(void *data, int len, uint16_t prevsum)
 	return ~checksum;
 }
 
-int ratelimit(void) {
+static int ratelimit(void) {
 	static time_t lasttime = 0;
 	
 	if(lasttime == now)
@@ -117,7 +117,7 @@ int ratelimit(void) {
 	return 0;
 }
 	
-void learn_mac(mac_t *address)
+static void learn_mac(mac_t *address)
 {
 	subnet_t *subnet;
 	avl_node_t *node;
@@ -179,7 +179,7 @@ void age_mac(void)
 	}
 }
 
-node_t *route_mac(vpn_packet_t *packet)
+static node_t *route_mac(vpn_packet_t *packet)
 {
 	subnet_t *subnet;
 
@@ -201,7 +201,7 @@ node_t *route_mac(vpn_packet_t *packet)
 
 /* RFC 792 */
 
-void route_ipv4_unreachable(vpn_packet_t *packet, uint8_t code)
+static void route_ipv4_unreachable(vpn_packet_t *packet, uint8_t code)
 {
 	struct ip *hdr;
 	struct icmp *icmp;
@@ -260,7 +260,7 @@ void route_ipv4_unreachable(vpn_packet_t *packet, uint8_t code)
 	write_packet(packet);
 }
 
-node_t *route_ipv4(vpn_packet_t *packet)
+static node_t *route_ipv4(vpn_packet_t *packet)
 {
 	subnet_t *subnet;
 
@@ -286,11 +286,9 @@ node_t *route_ipv4(vpn_packet_t *packet)
 	return subnet->owner;
 }
 
-#ifdef HAVE_NETINET_IP6_H
-
 /* RFC 2463 */
 
-void route_ipv6_unreachable(vpn_packet_t *packet, uint8_t code)
+static void route_ipv6_unreachable(vpn_packet_t *packet, uint8_t code)
 {
 	struct ip6_hdr *hdr;
 	struct icmp6_hdr *icmp;
@@ -356,9 +354,7 @@ void route_ipv6_unreachable(vpn_packet_t *packet, uint8_t code)
 	write_packet(packet);
 }
 
-#endif
-
-node_t *route_ipv6(vpn_packet_t *packet)
+static node_t *route_ipv6(vpn_packet_t *packet)
 {
 	subnet_t *subnet;
 
@@ -376,26 +372,20 @@ node_t *route_ipv6(vpn_packet_t *packet)
 				   ntohs(*(uint16_t *) & packet->data[48]),
 				   ntohs(*(uint16_t *) & packet->data[50]),
 				   ntohs(*(uint16_t *) & packet->data[52]));
-#ifdef HAVE_NETINET_IP6_H
 		route_ipv6_unreachable(packet, ICMP6_DST_UNREACH_ADDR);
-#endif
 
 		return NULL;
 	}
 
-#ifdef HAVE_NETINET_IP6_H
 	if(!subnet->owner->status.reachable)
 		route_ipv6_unreachable(packet, ICMP6_DST_UNREACH_NOROUTE);
-#endif
 	
 	return subnet->owner;
 }
 
-#ifdef HAVE_NETINET_IP6_H
-
 /* RFC 2461 */
 
-void route_neighborsol(vpn_packet_t *packet)
+static void route_neighborsol(vpn_packet_t *packet)
 {
 	struct ip6_hdr *hdr;
 	struct nd_neighbor_solicit *ns;
@@ -504,11 +494,9 @@ void route_neighborsol(vpn_packet_t *packet)
 	write_packet(packet);
 }
 
-#endif
-
 /* RFC 826 */
 
-void route_arp(vpn_packet_t *packet)
+static void route_arp(vpn_packet_t *packet)
 {
 	struct ether_arp *arp;
 	subnet_t *subnet;
@@ -584,12 +572,10 @@ void route_outgoing(vpn_packet_t *packet)
 					break;
 
 				case 0x86DD:
-#ifdef HAVE_NETINET_IP6_H
 					if(packet->data[20] == IPPROTO_ICMPV6 && packet->data[54] == ND_NEIGHBOR_SOLICIT) {
 						route_neighborsol(packet);
 						return;
 					}
-#endif
 					n = route_ipv6(packet);
 					break;