X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Froute.c;h=3fe6edb2f8680abf012e405f2f1dc2d19ac8e4dc;hb=e050753d1fc4d4465032919746c2a4db78f19932;hp=fc08f5f7aae7c8cb3a1a87bb3c96821677e1a672;hpb=d6b45d005530496e48325a6174ecdd889a17bfc1;p=tinc

diff --git a/src/route.c b/src/route.c
index fc08f5f7..3fe6edb2 100644
--- a/src/route.c
+++ b/src/route.c
@@ -59,34 +59,31 @@ static const size_t opt_size = sizeof(struct nd_opt_hdr);
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
 #endif
 
-volatile int dummy;
 static timeout_t age_subnets_timeout;
 
 /* RFC 1071 */
 
-static uint16_t inet_checksum(void *data, int len, uint16_t prevsum) {
-	uint16_t *p = data;
+static uint16_t inet_checksum(void *vdata, size_t len, uint16_t prevsum) {
+	uint8_t *data = vdata;
+	uint16_t word;
 	uint32_t checksum = prevsum ^ 0xFFFF;
 
 	while(len >= 2) {
-		checksum += *p++;
+		memcpy(&word, data, sizeof(word));
+		checksum += word;
+		data += 2;
 		len -= 2;
 	}
 
 	if(len) {
-		checksum += *(uint8_t *)p;
+		checksum += *data;
 	}
 
 	while(checksum >> 16) {
 		checksum = (checksum & 0xFFFF) + (checksum >> 16);
 	}
 
-	// Work around a compiler optimization bug.
-	if(checksum) {
-		dummy = 1;
-	}
-
-	return ~checksum;
+	return (uint16_t) ~checksum;
 }
 
 static bool ratelimit(int frequency) {
@@ -202,7 +199,7 @@ static void route_ipv4_unreachable(node_t *source, vpn_packet_t *packet, length_
 	ip.ip_src = ip_dst;
 	ip.ip_dst = ip_src;
 
-	ip.ip_sum = inet_checksum(&ip, ip_size, ~0);
+	ip.ip_sum = inet_checksum(&ip, ip_size, 0xFFFF);
 
 	/* Fill in ICMP header */
 
@@ -210,7 +207,7 @@ static void route_ipv4_unreachable(node_t *source, vpn_packet_t *packet, length_
 	icmp.icmp_code = code;
 	icmp.icmp_cksum = 0;
 
-	icmp.icmp_cksum = inet_checksum(&icmp, icmp_size, ~0);
+	icmp.icmp_cksum = inet_checksum(&icmp, icmp_size, 0xFFFF);
 	icmp.icmp_cksum = inet_checksum(DATA(packet) + ether_size + ip_size + icmp_size, oldlen, icmp.icmp_cksum);
 
 	/* Copy structs on stack back to packet */
@@ -315,7 +312,7 @@ static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, length_
 
 	/* Generate checksum */
 
-	checksum = inet_checksum(&pseudo, sizeof(pseudo), ~0);
+	checksum = inet_checksum(&pseudo, sizeof(pseudo), 0xFFFF);
 	checksum = inet_checksum(&icmp6, icmp6_size, checksum);
 	checksum = inet_checksum(DATA(packet) + ether_size + ip6_size + icmp6_size, ntohl(pseudo.length) - icmp6_size, checksum);
 
@@ -404,7 +401,7 @@ static void clamp_mss(const node_t *source, const node_t *via, vpn_packet_t *pac
 	}
 
 	/* Find TCP header */
-	int start = ether_size;
+	size_t start = ether_size;
 	uint16_t type = DATA(packet)[12] << 8 | DATA(packet)[13];
 
 	if(type == ETH_P_8021Q) {
@@ -576,7 +573,7 @@ static void route_broadcast(node_t *source, vpn_packet_t *packet) {
 static void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet, length_t ether_size) {
 	struct ip ip;
 	vpn_packet_t fragment;
-	int maxlen, todo;
+	size_t maxlen, todo;
 	uint8_t *offset;
 	uint16_t ip_off, origf;
 
@@ -604,7 +601,7 @@ static void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet, length_t et
 	ip_off &= IP_OFFMASK;
 
 	while(todo) {
-		int len = todo > maxlen ? maxlen : todo;
+		size_t len = todo > maxlen ? maxlen : todo;
 		memcpy(DATA(&fragment) + ether_size + ip_size, offset, len);
 		todo -= len;
 		offset += len;
@@ -612,7 +609,7 @@ static void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet, length_t et
 		ip.ip_len = htons(ip_size + len);
 		ip.ip_off = htons(ip_off | origf | (todo ? IP_MF : 0));
 		ip.ip_sum = 0;
-		ip.ip_sum = inet_checksum(&ip, ip_size, ~0);
+		ip.ip_sum = inet_checksum(&ip, ip_size, 0xFFFF);
 		memcpy(DATA(&fragment), DATA(packet), ether_size);
 		memcpy(DATA(&fragment) + ether_size, &ip, ip_size);
 		fragment.len = ether_size + ip_size + len;
@@ -860,7 +857,7 @@ static void route_neighborsol(node_t *source, vpn_packet_t *packet) {
 
 	/* Generate checksum */
 
-	checksum = inet_checksum(&pseudo, sizeof(pseudo), ~0);
+	checksum = inet_checksum(&pseudo, sizeof(pseudo), 0xFFFF);
 	checksum = inet_checksum(&ns, ns_size, checksum);
 
 	if(has_opt) {
@@ -934,7 +931,7 @@ static void route_neighborsol(node_t *source, vpn_packet_t *packet) {
 
 	/* Generate checksum */
 
-	checksum = inet_checksum(&pseudo, sizeof(pseudo), ~0);
+	checksum = inet_checksum(&pseudo, sizeof(pseudo), 0xFFFF);
 	checksum = inet_checksum(&ns, ns_size, checksum);
 
 	if(has_opt) {