/*
route.c -- routing
Copyright (C) 2000-2005 Ivo Timmermans,
- 2000-2014 Guus Sliepen <guus@tinc-vpn.org>
- 2015 Vittorio Gambaletta
+ 2000-2017 Guus Sliepen <guus@tinc-vpn.org>
+ 2015-2016 Vittorio Gambaletta
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
static void swap_mac_addresses(vpn_packet_t *packet) {
mac_t tmp;
- memcpy(&tmp, &packet->data[0], sizeof tmp);
- memcpy(&packet->data[0], &packet->data[6], sizeof tmp);
- memcpy(&packet->data[6], &tmp, sizeof tmp);
+ memcpy(&tmp, &packet->data[0], sizeof(tmp));
+ memcpy(&packet->data[0], &packet->data[6], sizeof(tmp));
+ memcpy(&packet->data[6], &tmp, sizeof(tmp));
}
/* RFC 792 */
if(s->expires && s->expires <= now) {
ifdebug(TRAFFIC) {
char netstr[MAXNETSTR];
- if(net2str(netstr, sizeof netstr, s))
+ if(net2str(netstr, sizeof(netstr), s))
logger(LOG_INFO, "Subnet %s expired", netstr);
}
node_t *via;
ipv4_t dest;
- memcpy(&dest, &packet->data[30], sizeof dest);
+ memcpy(&dest, &packet->data[30], sizeof(dest));
subnet = lookup_subnet_ipv4(&dest);
if(!subnet) {
node_t *via;
ipv6_t dest;
- memcpy(&dest, &packet->data[38], sizeof dest);
+ memcpy(&dest, &packet->data[38], sizeof(dest));
subnet = lookup_subnet_ipv6(&dest);
if(!subnet) {
if(!do_decrement_ttl(source, packet))
return;
+ if(priorityinheritance)
+ packet->priority = ((packet->data[14] & 0x0f) << 4) | (packet->data[15] >> 4);
+
via = (subnet->owner->via == myself) ? subnet->owner->nexthop : subnet->owner->via;
if(via == source) {
if(source == myself) {
mac_t src;
- memcpy(&src, &packet->data[6], sizeof src);
+ memcpy(&src, &packet->data[6], sizeof(src));
learn_mac(&src);
}
/* Lookup destination address */
- memcpy(&dest, &packet->data[0], sizeof dest);
+ memcpy(&dest, &packet->data[0], sizeof(dest));
subnet = lookup_subnet_mac(NULL, &dest);
if(!subnet) {
uint16_t type = packet->data[12] << 8 | packet->data[13];
- if(priorityinheritance && type == ETH_P_IP && packet->len >= ether_size + ip_size)
- packet->priority = packet->data[15];
+ if(priorityinheritance) {
+ if(type == ETH_P_IP && packet->len >= ether_size + ip_size)
+ packet->priority = packet->data[15];
+ else if(type == ETH_P_IPV6 && packet->len >= ether_size + ip6_size)
+ packet->priority = ((packet->data[14] & 0x0f) << 4) | (packet->data[15] >> 4);
+ }
// Handle packets larger than PMTU