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

memcpy() addresses from packet headers before calling the lookup functions.

Browse source 
This probably fixes a problem on the ARM architecture that causes tinc to fail to lookup IPv4 addresses.
This commit is contained in:
Guus Sliepen 2006-08-09 22:31:10 +00:00
parent 64e0519cb5
commit 134dc8995b
1 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/route.c
View file

@ -163,17 +163,23 @@ void age_subnets(void)
static void route_mac(node_t *source, vpn_packet_t *packet) static void route_mac(node_t *source, vpn_packet_t *packet)
{ {
subnet_t *subnet; subnet_t *subnet;
mac_t dest;
cp(); cp();
/* Learn source address */ /* Learn source address */
if(source == myself) if(source == myself) {
learn_mac((mac_t *)(&packet->data[6])); mac_t src;
memcpy(&src, &packet->data[6], sizeof src);
learn_mac(&src);
}
/* Lookup destination address */ /* Lookup destination address */
subnet = lookup_subnet_mac((mac_t *)(&packet->data[0])); memcpy(&dest, &packet->data[0], sizeof dest);
subnet = lookup_subnet_mac(&dest);
if(!subnet) { if(!subnet) {
broadcast_packet(source, packet); broadcast_packet(source, packet);
@ -316,18 +322,20 @@ static void route_ipv4_unicast(node_t *source, vpn_packet_t *packet)
{ {
subnet_t *subnet; subnet_t *subnet;
node_t *via; node_t *via;
ipv4_t dest;
cp(); cp();
subnet = lookup_subnet_ipv4((ipv4_t *) &packet->data[30]); memcpy(&dest, &packet->data[30], sizeof dest);
subnet = lookup_subnet_ipv4(&dest);
if(!subnet) { if(!subnet) {
ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet from %s (%s): unknown IPv4 destination address %d.%d.%d.%d"), ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet from %s (%s): unknown IPv4 destination address %d.%d.%d.%d"),
source->name, source->hostname, source->name, source->hostname,
packet->data[30], dest.x[0],
packet->data[31], dest.x[1],
packet->data[32], dest.x[2],
packet->data[33]); dest.x[3]);
route_ipv4_unreachable(source, packet, ICMP_DEST_UNREACH, ICMP_NET_UNKNOWN); route_ipv4_unreachable(source, packet, ICMP_DEST_UNREACH, ICMP_NET_UNKNOWN);
return; return;
@ -454,22 +462,24 @@ static void route_ipv6_unicast(node_t *source, vpn_packet_t *packet)
{ {
subnet_t *subnet; subnet_t *subnet;
node_t *via; node_t *via;
ipv6_t dest;
cp(); cp();
subnet = lookup_subnet_ipv6((ipv6_t *) &packet->data[38]); memcpy(&dest, &packet->data[38], sizeof dest);
subnet = lookup_subnet_ipv6(&dest);
if(!subnet) { if(!subnet) {
ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet from %s (%s): unknown IPv6 destination address %hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx"), ifdebug(TRAFFIC) logger(LOG_WARNING, _("Cannot route packet from %s (%s): unknown IPv6 destination address %hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx"),
source->name, source->hostname, source->name, source->hostname,
ntohs(*(uint16_t *) &packet->data[38]), ntohs(dest.x[0]),
ntohs(*(uint16_t *) &packet->data[40]), ntohs(dest.x[1]),
ntohs(*(uint16_t *) &packet->data[42]), ntohs(dest.x[2]),
ntohs(*(uint16_t *) &packet->data[44]), ntohs(dest.x[3]),
ntohs(*(uint16_t *) &packet->data[46]), ntohs(dest.x[4]),
ntohs(*(uint16_t *) &packet->data[48]), ntohs(dest.x[5]),
ntohs(*(uint16_t *) &packet->data[50]), ntohs(dest.x[6]),
ntohs(*(uint16_t *) &packet->data[52])); ntohs(dest.x[7]));
route_ipv6_unreachable(source, packet, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADDR); route_ipv6_unreachable(source, packet, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADDR);
return; return;