X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Froute.c;h=79832dcad0f4c899bc3cbc936884707b08445fa0;hb=53b239863ea0a44270d877945fa2014ec626ad01;hp=e11a792201bb578ee259edd41e85fea5bb0e14ab;hpb=2c6b2d70e6640f39563ad7bb0aa0ba87f883848c;p=tinc diff --git a/src/route.c b/src/route.c index e11a7922..79832dca 100644 --- a/src/route.c +++ b/src/route.c @@ -54,10 +54,6 @@ 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); -#ifndef MAX -#define MAX(a, b) ((a) > (b) ? (a) : (b)) -#endif - static timeout_t age_subnets_timeout; /* RFC 1071 */ @@ -485,7 +481,7 @@ static void clamp_mss(const node_t *source, const node_t *via, vpn_packet_t *pac csum += csum >> 16; csum ^= 0xffff; DATA(packet)[start + 16] = csum >> 8; - DATA(packet)[start + 17] = csum; + DATA(packet)[start + 17] = csum & 0xff; break; } } @@ -494,7 +490,7 @@ static void age_subnets(void *data) { (void)data; bool left = false; - for splay_each(subnet_t, s, myself->subnet_tree) { + for splay_each(subnet_t, s, &myself->subnet_tree) { if(s->expires && s->expires < now.tv_sec) { if(debug_level >= DEBUG_TRAFFIC) { char netstr[MAXNETSTR]; @@ -504,7 +500,7 @@ static void age_subnets(void *data) { } } - for list_each(connection_t, c, connection_list) + for list_each(connection_t, c, &connection_list) if(c->edge) { send_del_subnet(c, s); } @@ -543,7 +539,7 @@ static void learn_mac(mac_t *address) { /* And tell all other tinc daemons it's our MAC */ - for list_each(connection_t, c, connection_list) + for list_each(connection_t, c, &connection_list) if(c->edge) { send_add_subnet(c, subnet); } @@ -1111,7 +1107,7 @@ static void route_mac(node_t *source, vpn_packet_t *packet) { static void send_pcap(vpn_packet_t *packet) { pcap = false; - for list_each(connection_t, c, connection_list) { + for list_each(connection_t, c, &connection_list) { if(!c->status.pcap) { continue; }