X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Froute.c;h=64196e53313dd0527a8f8ff82c9e53eccd803508;hb=17e54ea0bec4d3a3b9a760854dde6039c7a1c421;hp=d7c4c872fe27fed160af90458ea403ecd66e4387;hpb=a8a3a2c8ceb19bcb6c2c3ef0647c94d7d0624b7a;p=tinc

diff --git a/src/route.c b/src/route.c
index d7c4c872..64196e53 100644
--- a/src/route.c
+++ b/src/route.c
@@ -276,6 +276,27 @@ static void route_ipv4_unreachable(node_t *source, vpn_packet_t *packet, length_
 	ip_src = ip.ip_src;
 	ip_dst = ip.ip_dst;
 
+	/* Try to reply with an IP address assigned to the local machine */
+
+	if (type == ICMP_TIME_EXCEEDED && code == ICMP_EXC_TTL) {
+		int sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+		if (sockfd != -1) {
+			struct sockaddr_in addr;
+			memset(&addr, 0, sizeof(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));
+				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);
+		}
+	}
+
 	oldlen = packet->len - ether_size;
 
 	if(type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED)
@@ -448,7 +469,7 @@ static void route_ipv4(node_t *source, vpn_packet_t *packet) {
 static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, length_t ether_size, uint8_t type, uint8_t code) {
 	struct ip6_hdr ip6;
 	struct icmp6_hdr icmp6 = {0};
-	uint16_t checksum;
+	uint16_t checksum;	
 
 	struct {
 		struct in6_addr ip6_src;        /* source address */
@@ -473,6 +494,27 @@ static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, length_
 	pseudo.ip6_src = ip6.ip6_dst;
 	pseudo.ip6_dst = ip6.ip6_src;
 
+	/* Try to reply with an IP address assigned to the local machine */
+
+	if (type == ICMP6_TIME_EXCEEDED && code == ICMP6_TIME_EXCEED_TRANSIT) {
+		int sockfd = socket(AF_INET6, SOCK_DGRAM, 0);
+		if (sockfd != -1) {
+			struct sockaddr_in6 addr;
+			memset(&addr, 0, sizeof(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));
+				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);
+		}
+	}
+
 	pseudo.length = packet->len - ether_size;
 
 	if(type == ICMP6_PACKET_TOO_BIG)