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

Don't parse node IDs if the sending node doesn't support them.

Browse source 
Currently, tinc tries to parse node IDs for all SPTPS packets, including
ones sent from older, pre-node-IDs tinc-1.1 nodes, and therefore doesn't
recognize packets from these nodes. This commit fixes that.

It also makes code slightly clearer by reducing the amount of fiddling
around packet offset/length.
This commit is contained in:
Etienne Dechamps 2015-05-18 20:48:45 +01:00
parent 643149b449
commit fef29d0193
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/net_packet.c
View file

@ -282,9 +282,8 @@ static bool receive_udppacket(node_t *n, vpn_packet_t *inpkt) {
} }
return false; return false;
} }
inpkt->offset += 2 * sizeof(node_id_t);
n->status.udppacket = true; n->status.udppacket = true;
bool result = sptps_receive_data(&n->sptps, DATA(inpkt), inpkt->len - 2 * sizeof(node_id_t)); bool result = sptps_receive_data(&n->sptps, DATA(inpkt), inpkt->len);
n->status.udppacket = false; n->status.udppacket = false;
if(!result) { if(!result) {
@ -1440,10 +1439,16 @@ skip_harder:
return; return;
} }
if(n->status.sptps) { pkt.offset = 0;
pkt.offset = 2 * sizeof(node_id_t);
if(!memcmp(DSTID(&pkt), &nullid, sizeof nullid)) { if(n->status.sptps) {
bool relay_enabled = (n->options >> 24) >= 4;
if (relay_enabled) {
pkt.offset = 2 * sizeof(node_id_t);
pkt.len -= pkt.offset;
}
if(!memcmp(DSTID(&pkt), &nullid, sizeof nullid) || !relay_enabled) {
direct = true; direct = true;
from = n; from = n;
to = myself; to = myself;
@ -1468,7 +1473,7 @@ skip_harder:
/* If we're not the final recipient, relay the packet. */ /* If we're not the final recipient, relay the packet. */
if(to != myself) { if(to != myself) {
send_sptps_data(to, from, 0, DATA(&pkt), pkt.len - 2 * sizeof(node_id_t)); send_sptps_data(to, from, 0, DATA(&pkt), pkt.len);
try_tx_sptps(to, true); try_tx_sptps(to, true);
return; return;
} }
@ -1477,7 +1482,6 @@ skip_harder:
from = n; from = n;
} }
pkt.offset = 0;
if(!receive_udppacket(from, &pkt)) if(!receive_udppacket(from, &pkt))
return; return;