Merge remote-tracking branch 'dechamps/sptpsabort' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Sat, 14 Mar 2015 11:44:38 +0000 (11:44 +0000)
committerGuus Sliepen <guus@tinc-vpn.org>
Sat, 14 Mar 2015 11:44:38 +0000 (11:44 +0000)
src/sptps.c

index a598768..4a9683f 100644 (file)
@@ -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);
        }