j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Try to reply with node address only when decrementing the TTL.

Browse source 
Signed-off-by: Vittorio Gambaletta <openwrt@vittgam.net>
This commit is contained in:
Vittorio Gambaletta (VittGam) 2015-09-04 17:04:03 +02:00 committed by Guus Sliepen
parent 92203bdbcb
commit 17e54ea0be
1 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/route.c
View file

@ -259,7 +259,6 @@ static void route_ipv4_unreachable(node_t *source, vpn_packet_t *packet, length_
struct in_addr ip_src; struct in_addr ip_src;
struct in_addr ip_dst; struct in_addr ip_dst;
uint32_t oldlen; uint32_t oldlen;
int sockfd;
if(ratelimit(3)) if(ratelimit(3))
return; return;
@ -279,21 +278,23 @@ static void route_ipv4_unreachable(node_t *source, vpn_packet_t *packet, length_
/* Try to reply with an IP address assigned to the local machine */ /* Try to reply with an IP address assigned to the local machine */
sockfd = socket(AF_INET, SOCK_DGRAM, 0); if (type == ICMP_TIME_EXCEEDED && code == ICMP_EXC_TTL) {
if (sockfd != -1) { int sockfd = socket(AF_INET, SOCK_DGRAM, 0);
struct sockaddr_in addr; if (sockfd != -1) {
memset(&addr, 0, sizeof(addr)); struct sockaddr_in addr;
addr.sin_family = AF_INET;
addr.sin_addr = ip.ip_src;
if (!connect(sockfd, (const struct sockaddr*) &addr, sizeof(addr))) {
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
socklen_t addrlen = sizeof(addr); addr.sin_addr = ip.ip_src;
if (!getsockname(sockfd, (struct sockaddr*) &addr, &addrlen) && addrlen <= sizeof(addr)) { if (!connect(sockfd, (const struct sockaddr*) &addr, sizeof(addr))) {
ip_dst = addr.sin_addr; memset(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET;
socklen_t addrlen = sizeof(addr);
if (!getsockname(sockfd, (struct sockaddr*) &addr, &addrlen) && addrlen <= sizeof(addr)) {
ip_dst = addr.sin_addr;
}
} }
close(sockfd);
} }
close(sockfd);
} }
oldlen = packet->len - ether_size; oldlen = packet->len - ether_size;
@ -469,7 +470,6 @@ static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, length_
struct ip6_hdr ip6; struct ip6_hdr ip6;
struct icmp6_hdr icmp6 = {0}; struct icmp6_hdr icmp6 = {0};
uint16_t checksum; uint16_t checksum;
int sockfd;
struct { struct {
struct in6_addr ip6_src; /* source address */ struct in6_addr ip6_src; /* source address */
@ -496,21 +496,23 @@ static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, length_
/* Try to reply with an IP address assigned to the local machine */ /* Try to reply with an IP address assigned to the local machine */
sockfd = socket(AF_INET6, SOCK_DGRAM, 0); if (type == ICMP6_TIME_EXCEEDED && code == ICMP6_TIME_EXCEED_TRANSIT) {
if (sockfd != -1) { int sockfd = socket(AF_INET6, SOCK_DGRAM, 0);
struct sockaddr_in6 addr; if (sockfd != -1) {
memset(&addr, 0, sizeof(addr)); struct sockaddr_in6 addr;
addr.sin6_family = AF_INET6;
addr.sin6_addr = ip6.ip6_src;
if (!connect(sockfd, (const struct sockaddr*) &addr, sizeof(addr))) {
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(addr));
addr.sin6_family = AF_INET6; addr.sin6_family = AF_INET6;
socklen_t addrlen = sizeof(addr); addr.sin6_addr = ip6.ip6_src;
if (!getsockname(sockfd, (struct sockaddr*) &addr, &addrlen) && addrlen <= sizeof(addr)) { if (!connect(sockfd, (const struct sockaddr*) &addr, sizeof(addr))) {
pseudo.ip6_src = addr.sin6_addr; memset(&addr, 0, sizeof(addr));
addr.sin6_family = AF_INET6;
socklen_t addrlen = sizeof(addr);
if (!getsockname(sockfd, (struct sockaddr*) &addr, &addrlen) && addrlen <= sizeof(addr)) {
pseudo.ip6_src = addr.sin6_addr;
}
} }
close(sockfd);
} }
close(sockfd);
} }
pseudo.length = packet->len - ether_size; pseudo.length = packet->len - ether_size;