From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sun, 14 Dec 2014 12:05:30 +0000 (+0100)
Subject: Fix reception of SPTPS UDP packets.
X-Git-Tag: release-1.1pre11~19
X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=199573f1e834290290a1c278072a153b90443b05

Fix reception of SPTPS UDP packets.

Some bugs were introduced in 46fa12e666badb79e480c4b2399787551f8266d0.
---

diff --git a/src/net_packet.c b/src/net_packet.c
index a24a7add..ccc1de64 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -372,7 +372,7 @@ static bool receive_udppacket(node_t *n, vpn_packet_t *inpkt) {
 			}
 			return false;
 		}
-		if(!sptps_receive_data(&n->sptps, ((sptps_packet_t *)&inpkt)->data, inpkt->len)) {
+		if(!sptps_receive_data(&n->sptps, ((sptps_packet_t *)inpkt)->data, inpkt->len)) {
 			logger(DEBUG_TRAFFIC, LOG_ERR, "Got bad packet from %s (%s)", n->name, n->hostname);
 			return false;
 		}
@@ -1077,7 +1077,7 @@ skip_harder:
 	}
 
 	if(n->status.sptps) {
-		if(memcmp(&spkt->dstid, &nullid, sizeof nullid)) {
+		if(!memcmp(&spkt->dstid, &nullid, sizeof nullid)) {
 			direct = true;
 			from = n;
 			to = myself;