Fix reception of SPTPS UDP packets.
authorGuus Sliepen <guus@tinc-vpn.org>
Sun, 14 Dec 2014 12:05:30 +0000 (13:05 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Sun, 14 Dec 2014 12:05:30 +0000 (13:05 +0100)
Some bugs were introduced in 46fa12e666badb79e480c4b2399787551f8266d0.

src/net_packet.c

index a24a7ad..ccc1de6 100644 (file)
@@ -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;