From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 14 Mar 2015 11:44:38 +0000 (+0000)
Subject: Merge remote-tracking branch 'dechamps/sptpsabort' into 1.1
X-Git-Tag: release-1.1pre12~197
X-Git-Url: https://www.tinc-vpn.org/git/browse?a=commitdiff_plain;h=f9ecaa10768926302f24a70975f36e360b51c8ce;hp=c23e50385d9de538af676706596f6508b2ceb01a;p=tinc

Merge remote-tracking branch 'dechamps/sptpsabort' into 1.1
---

diff --git a/src/sptps.c b/src/sptps.c
index a5987682..4a9683f2 100644
--- a/src/sptps.c
+++ b/src/sptps.c
@@ -483,10 +483,10 @@ static bool sptps_receive_data_datagram(sptps_t *s, const char *data, size_t len
 		if(!s->instate)
 			return error(s, EIO, "Application record received before handshake finished");
 		if(!s->receive_record(s->handle, type, buffer + 1, len - 21))
-			abort();
+			return false;
 	} else if(type == SPTPS_HANDSHAKE) {
 		if(!receive_handshake(s, buffer + 1, len - 21))
-			abort();
+			return false;
 	} else {
 		return error(s, EIO, "Invalid record type %d", type);
 	}