projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check for IPv6 header files.
[tinc]
/
src
/
route.c
diff --git
a/src/route.c
b/src/route.c
index
571b1ba
..
b6ec0dc
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.
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.5
0 2003/06/11 19:28:35
guus Exp $
+ $Id: route.c,v 1.1.2.5
3 2003/07/06 17:49:49
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-38,8
+38,10
@@
#endif
#include <netinet/ip.h>
#include <netinet/ip_icmp.h>
#endif
#include <netinet/ip.h>
#include <netinet/ip_icmp.h>
+#ifdef HAVE_NETINET_IP6_H
#include <netinet/ip6.h>
#include <netinet/icmp6.h>
#include <netinet/ip6.h>
#include <netinet/icmp6.h>
+#endif
#include <netinet/if_ether.h>
#include <utils.h>
#include <xalloc.h>
#include <netinet/if_ether.h>
#include <utils.h>
#include <xalloc.h>
@@
-60,15
+62,29
@@
#include "system.h"
#include "system.h"
+/* Missing definitions */
+
#ifndef ETHER_ADDR_LEN
#define ETHER_ADDR_LEN 6
#endif
#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;
int macexpire = 600;
int overwrite_mac = 0;
int routing_mode = RMODE_ROUTER;
int priorityinheritance = 0;
int macexpire = 600;
int overwrite_mac = 0;
-mac_t mymac = {
0xFE, 0xFD, 0, 0, 0, 0
};
+mac_t mymac = {
{0xFE, 0xFD, 0, 0, 0, 0}
};
/* RFC 1071 */
/* RFC 1071 */
@@
-210,8
+226,8
@@
void route_ipv4_unreachable(vpn_packet_t *packet, uint8_t code)
memcpy(&ip_dst, &hdr->ip_dst, 4);
oldlen = packet->len - 14;
memcpy(&ip_dst, &hdr->ip_dst, 4);
oldlen = packet->len - 14;
- if(oldlen >= IP_MSS - sizeof(*hdr) - sizeof(
struct icmphdr
))
- oldlen = IP_MSS - sizeof(*hdr) - sizeof(
struct icmphdr
);
+ if(oldlen >= IP_MSS - sizeof(*hdr) - sizeof(
*icmp
))
+ oldlen = IP_MSS - sizeof(*hdr) - sizeof(
*icmp
);
/* Copy first part of original contents to ICMP message */
/* Copy first part of original contents to ICMP message */
@@
-274,6
+290,8
@@
node_t *route_ipv4(vpn_packet_t *packet)
return subnet->owner;
}
return subnet->owner;
}
+#ifdef HAVE_NETINET_IP6_H
+
/* RFC 2463 */
void route_ipv6_unreachable(vpn_packet_t *packet, uint8_t code)
/* RFC 2463 */
void route_ipv6_unreachable(vpn_packet_t *packet, uint8_t code)
@@
-342,6
+360,8
@@
void route_ipv6_unreachable(vpn_packet_t *packet, uint8_t code)
write_packet(packet);
}
write_packet(packet);
}
+#endif
+
node_t *route_ipv6(vpn_packet_t *packet)
{
subnet_t *subnet;
node_t *route_ipv6(vpn_packet_t *packet)
{
subnet_t *subnet;
@@
-362,17
+382,23
@@
node_t *route_ipv6(vpn_packet_t *packet)
ntohs(*(uint16_t *) & packet->data[50]),
ntohs(*(uint16_t *) & packet->data[52]));
}
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);
route_ipv6_unreachable(packet, ICMP6_DST_UNREACH_ADDR);
+#endif
return NULL;
}
return NULL;
}
+#ifdef HAVE_NETINET_IP6_H
if(!subnet->owner->status.reachable)
route_ipv6_unreachable(packet, ICMP6_DST_UNREACH_NOROUTE);
if(!subnet->owner->status.reachable)
route_ipv6_unreachable(packet, ICMP6_DST_UNREACH_NOROUTE);
-
+#endif
+
return subnet->owner;
}
return subnet->owner;
}
+#ifdef HAVE_NETINET_IP6_H
+
/* RFC 2461 */
void route_neighborsol(vpn_packet_t *packet)
/* RFC 2461 */
void route_neighborsol(vpn_packet_t *packet)
@@
-489,6
+515,8
@@
void route_neighborsol(vpn_packet_t *packet)
write_packet(packet);
}
write_packet(packet);
}
+#endif
+
/* RFC 826 */
void route_arp(vpn_packet_t *packet)
/* RFC 826 */
void route_arp(vpn_packet_t *packet)
@@
-572,10
+600,12
@@
void route_outgoing(vpn_packet_t *packet)
break;
case 0x86DD:
break;
case 0x86DD:
+#ifdef HAVE_NETINET_IP6_H
if(packet->data[20] == IPPROTO_ICMPV6 && packet->data[54] == ND_NEIGHBOR_SOLICIT) {
route_neighborsol(packet);
return;
}
if(packet->data[20] == IPPROTO_ICMPV6 && packet->data[54] == ND_NEIGHBOR_SOLICIT) {
route_neighborsol(packet);
return;
}
+#endif
n = route_ipv6(packet);
break;
n = route_ipv6(packet);
break;