#ifdef HAVE_ZLIB
#define ZLIB_CONST
#include <zlib.h>
-#include <assert.h>
#endif
#include LZO1X_H
#endif
-#ifdef LZ4_H
-#include LZ4_H
+#ifdef HAVE_LZ4
+#include <lz4.h>
#endif
#include "address_cache.h"
static char lzo_wrkmem[LZO1X_999_MEM_COMPRESS > LZO1X_1_MEM_COMPRESS ? LZO1X_999_MEM_COMPRESS : LZO1X_1_MEM_COMPRESS];
#endif
+#ifdef HAVE_LZ4
+
#ifdef HAVE_LZ4_BUILTIN
static LZ4_stream_t lz4_stream;
#else
static void *lz4_state = NULL;
-#endif /* HAVE_LZ4_BUILTIN */
+#endif // HAVE_LZ4_BUILTIN
+
+#endif // HAVE_LZ4
static void send_udppacket(node_t *, vpn_packet_t *);
#ifdef HAVE_LZO
static length_t compress_packet_lzo(uint8_t *dest, const uint8_t *source, length_t len, compression_level_t level) {
- assert(level == COMPRESS_LZO_LO || level == COMPRESS_LZO_HI);
-
lzo_uint lzolen = MAXSIZE;
int result;
if(type == SPTPS_HANDSHAKE || tcponly || (!direct && !relay_supported) || (type != PKT_PROBE && origlen > relay->minmtu)) {
if(type != SPTPS_HANDSHAKE && (to->nexthop->connection->options >> 24) >= 7) {
- uint8_t buf[len + sizeof(to->id) + sizeof(from->id)];
+ const size_t buflen = len + sizeof(to->id) + sizeof(from->id);
+ uint8_t *buf = alloca(buflen);
uint8_t *buf_ptr = buf;
memcpy(buf_ptr, &to->id, sizeof(to->id));
buf_ptr += sizeof(to->id);
buf_ptr += sizeof(from->id);
memcpy(buf_ptr, data, len);
logger(DEBUG_TRAFFIC, LOG_INFO, "Sending packet from %s (%s) to %s (%s) via %s (%s) (TCP)", from->name, from->hostname, to->name, to->hostname, to->nexthop->name, to->nexthop->hostname);
- return send_sptps_tcppacket(to->nexthop->connection, buf, sizeof(buf));
+ return send_sptps_tcppacket(to->nexthop->connection, buf, buflen);
}
- char buf[B64_SIZE(len)];
+ char *buf = alloca(B64_SIZE(len));
b64encode_tinc(data, buf, len);
/* If this is a handshake packet, use ANS_KEY instead of REQ_KEY, for two reasons:
overhead += sizeof(to->id) + sizeof(from->id);
}
- char buf[len + overhead];
+ char *buf = alloca(len + overhead);
char *buf_ptr = buf;
if(relay_supported) {
myself->in_bytes += packet.len;
route(myself, &packet);
} else {
- usleep(errors * 50000);
+ sleep_millis(errors * 50);
errors++;
if(errors > 10) {