From: Guus Sliepen Date: Sun, 11 Apr 2010 17:20:02 +0000 (+0200) Subject: Fixes for definitions under Windows. X-Git-Tag: release-1.0.13~3 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=a9bbb3357a89e27185312fbce0ee134eda4eda90;p=tinc Fixes for definitions under Windows. --- diff --git a/lib/ipv6.h b/lib/ipv6.h index fee74f5e..d98001d6 100644 --- a/lib/ipv6.h +++ b/lib/ipv6.h @@ -95,6 +95,7 @@ struct icmp6_hdr { #define ICMP6_DST_UNREACH_NOROUTE 0 #define ICMP6_DST_UNREACH 1 #define ICMP6_PACKET_TOO_BIG 2 +#define ICMP6_DST_UNREACH_ADMIN 1 #define ICMP6_DST_UNREACH_ADDR 3 #define ND_NEIGHBOR_SOLICIT 135 #define ND_NEIGHBOR_ADVERT 136 diff --git a/src/route.c b/src/route.c index 853b7f5b..3d8d54af 100644 --- a/src/route.c +++ b/src/route.c @@ -50,7 +50,7 @@ static const size_t ip6_size = sizeof(struct ip6_hdr); static const size_t icmp6_size = sizeof(struct icmp6_hdr); static const size_t ns_size = sizeof(struct nd_neighbor_solicit); static const size_t opt_size = sizeof(struct nd_opt_hdr); -#define max(a, b) ((a) > (b) ? (a) : (b)) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) /* RFC 1071 */ @@ -398,10 +398,10 @@ static void route_ipv4_unicast(node_t *source, vpn_packet_t *packet) { if(directonly && subnet->owner != via) return route_ipv4_unreachable(source, packet, ICMP_DEST_UNREACH, ICMP_NET_ANO); - if(via && packet->len > max(via->mtu, 590) && via != myself) { + if(via && packet->len > MAX(via->mtu, 590) && 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 = max(via->mtu, 590); + packet->len = MAX(via->mtu, 590); route_ipv4_unreachable(source, packet, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED); } else { fragment_ipv4_packet(via, packet); @@ -549,9 +549,9 @@ static void route_ipv6_unicast(node_t *source, vpn_packet_t *packet) { if(directonly && subnet->owner != via) return route_ipv6_unreachable(source, packet, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADMIN); - if(via && packet->len > max(via->mtu, 1294) && via != myself) { + if(via && packet->len > MAX(via->mtu, 1294) && 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 = max(via->mtu, 1294); + packet->len = MAX(via->mtu, 1294); route_ipv6_unreachable(source, packet, ICMP6_PACKET_TOO_BIG, 0); return; }