projects / tinc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix format string warnings.
[tinc] / src / route.c
diff --git a/src/route.c b/src/route.c
index 48ba0e8..7e0dfc6 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -1,7 +1,7 @@
 /*
     route.c -- routing
-    Copyright (C) 2000-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 2000-2005 Ivo Timmermans,
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -17,27 +17,11 @@
     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.74 2003/12/22 11:04:17 guus Exp $
+    $Id$
 */
 
 #include "system.h"
 
-#ifdef HAVE_NET_ETHERNET_H
-#include <net/ethernet.h>
-#endif
-#ifdef HAVE_NET_IF_ARP_H
-#include <net/if_arp.h>
-#endif
-#ifdef HAVE_NETINET_IP_ICMP_H
-#include <netinet/ip_icmp.h>
-#endif
-#ifdef HAVE_NETINET_ICMP6_H
-#include <netinet/icmp6.h>
-#endif
-#ifdef HAVE_NETINET_IF_ETHER_H
-#include <netinet/if_ether.h>
-#endif
-
 #include "avl_tree.h"
 #include "connection.h"
 #include "ethernet.h"
@@ -69,7 +53,7 @@ static const size_t opt_size = sizeof(struct nd_opt_hdr);
 
 /* RFC 1071 */
 
-static __inline__ 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;
@@ -88,7 +72,7 @@ static __inline__ uint16_t inet_checksum(void *data, int len, uint16_t prevsum)
        return ~checksum;
 }
 
-static __inline__ bool ratelimit(int frequency) {
+static bool ratelimit(int frequency) {
        static time_t lasttime = 0;
        static int count = 0;
        
@@ -103,7 +87,7 @@ static __inline__ bool ratelimit(int frequency) {
        return false;
 }
 
-static __inline__ bool checklength(node_t *source, vpn_packet_t *packet, length_t length) {
+static bool checklength(node_t *source, vpn_packet_t *packet, length_t length) {
        if(packet->len < length) {
                ifdebug(TRAFFIC) logger(LOG_WARNING, _("Got too short packet from %s (%s)"), source->name, source->hostname);
                return false;
@@ -111,7 +95,7 @@ static __inline__ bool checklength(node_t *source, vpn_packet_t *packet, length_
                return true;
 }
        
-static __inline__ void learn_mac(mac_t *address)
+static void learn_mac(mac_t *address)
 {
        subnet_t *subnet;
        avl_node_t *node;
@@ -176,7 +160,7 @@ void age_subnets(void)
        }
 }
 
-static __inline__ void route_mac(node_t *source, vpn_packet_t *packet)
+static void route_mac(node_t *source, vpn_packet_t *packet)
 {
        subnet_t *subnet;
 
@@ -278,7 +262,7 @@ static void route_ipv4_unreachable(node_t *source, vpn_packet_t *packet, uint8_t
 
 /* RFC 791 */
 
-static __inline__ void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet) {
+static void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet) {
        struct ip ip;
        vpn_packet_t fragment;
        int len, maxlen, todo;
@@ -296,7 +280,7 @@ static __inline__ void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet)
        todo = ntohs(ip.ip_len) - ip_size;
 
        if(ether_size + ip_size + todo != packet->len) {
-               ifdebug(TRAFFIC) logger(LOG_WARNING, _("Length of packet (%d) doesn't match length in IPv4 header (%d)"), packet->len, ether_size + ip_size + todo);
+               ifdebug(TRAFFIC) logger(LOG_WARNING, _("Length of packet (%d) doesn't match length in IPv4 header (%zd)"), packet->len, ether_size + ip_size + todo);
                return;
        }
 
@@ -328,9 +312,10 @@ static __inline__ void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet)
        }       
 }
 
-static __inline__ void route_ipv4_unicast(node_t *source, vpn_packet_t *packet)
+static void route_ipv4_unicast(node_t *source, vpn_packet_t *packet)
 {
        subnet_t *subnet;
+       node_t *via;
 
        cp();
 
@@ -359,13 +344,15 @@ static __inline__ void route_ipv4_unicast(node_t *source, vpn_packet_t *packet)
        if(priorityinheritance)
                packet->priority = packet->data[15];
 
-       if(subnet->owner->options & OPTION_PMTU_DISCOVERY && packet->len > subnet->owner->mtu && subnet->owner != myself) {
-               ifdebug(TRAFFIC) logger(LOG_INFO, _("Packet for %s (%s) length %d larger than MTU %d"), subnet->owner->name, subnet->owner->hostname, packet->len, subnet->owner->mtu);
+       via = (subnet->owner->via == myself) ? subnet->owner->nexthop : subnet->owner->via;
+       
+       if(via && packet->len > via->mtu && via != myself) {
+               ifdebug(TRAFFIC) logger(LOG_INFO, _("Packet for %s (%s) length %d larger than MTU %d"), subnet->owner->name, subnet->owner->hostname, packet->len, via->mtu);
                if(packet->data[20] & 0x40) {
-                       packet->len = subnet->owner->mtu;
+                       packet->len = via->mtu;
                        route_ipv4_unreachable(source, packet, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED);
                } else {
-                       fragment_ipv4_packet(subnet->owner, packet);
+                       fragment_ipv4_packet(via, packet);
                }
 
                return;
@@ -374,7 +361,7 @@ static __inline__ void route_ipv4_unicast(node_t *source, vpn_packet_t *packet)
        send_packet(subnet->owner, packet);
 }
 
-static __inline__ void route_ipv4(node_t *source, vpn_packet_t *packet)
+static void route_ipv4(node_t *source, vpn_packet_t *packet)
 {
        cp();
 
@@ -463,9 +450,10 @@ static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, uint8_t
        send_packet(source, packet);
 }
 
-static __inline__ void route_ipv6_unicast(node_t *source, vpn_packet_t *packet)
+static void route_ipv6_unicast(node_t *source, vpn_packet_t *packet)
 {
        subnet_t *subnet;
+       node_t *via;
 
        cp();
 
@@ -494,10 +482,12 @@ static __inline__ void route_ipv6_unicast(node_t *source, vpn_packet_t *packet)
 
        if(!subnet->owner->status.reachable)
                route_ipv6_unreachable(source, packet, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOROUTE);
+
+       via = (subnet->owner->via == myself) ? subnet->owner->nexthop : subnet->owner->via;
        
-       if(subnet->owner->options & OPTION_PMTU_DISCOVERY && packet->len > subnet->owner->mtu && subnet->owner != myself) {
-               ifdebug(TRAFFIC) logger(LOG_INFO, _("Packet for %s (%s) length %d larger than MTU %d"), subnet->owner->name, subnet->owner->hostname, packet->len, subnet->owner->mtu);
-               packet->len = subnet->owner->mtu;
+       if(via && packet->len > via->mtu && via != myself) {
+               ifdebug(TRAFFIC) logger(LOG_INFO, _("Packet for %s (%s) length %d larger than MTU %d"), subnet->owner->name, subnet->owner->hostname, packet->len, via->mtu);
+               packet->len = via->mtu;
                route_ipv6_unreachable(source, packet, ICMP6_PACKET_TOO_BIG, 0);
                return;
        }
@@ -633,7 +623,7 @@ static void route_neighborsol(node_t *source, vpn_packet_t *packet)
        send_packet(source, packet);
 }
 
-static __inline__ void route_ipv6(node_t *source, vpn_packet_t *packet)
+static void route_ipv6(node_t *source, vpn_packet_t *packet)
 {
        cp();
 
tinc, the VPN daemon