merged with remote

This commit is contained in:
MrRadix
2020-07-22 11:56:51 +02:00
4 changed files with 30 additions and 10 deletions
+3 -3
View File
@@ -8,9 +8,9 @@ AC_ARG_WITH(sanitizer, AS_HELP_STRING([--with-sanitizer], [Build with suppor
AC_ARG_ENABLE(fuzztargets, AS_HELP_STRING([--enable-fuzztargets], [Enable fuzz targets]),[enable_fuzztargets=$enableval],[enable_fuzztargets=no])
AM_CONDITIONAL([BUILD_FUZZTARGETS], [test "x$enable_fuzztargets" = "xyes"])
AS_IF([test "${with_sanitizer+set}" = set -o "x$enable_fuzztargets" = "xyes"],[
CFLAGS="${CFLAGS} -g3 -O0 -Wno-unused-value -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=leak -fno-omit-frame-pointer"
LDFLAGS="${LDFLAGS} -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=leak"
AS_IF([test "${with_sanitizer+set}" = set],[
CFLAGS+="${CFLAGS} -g3 -O0 -Wno-unused-value -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=leak -fno-omit-frame-pointer"
LDFLAGS+="${LDFLAGS} -fsanitize=address -fsanitize=undefined -fno-sanitize=alignment -fsanitize=leak"
])
LT_INIT
+2 -2
View File
@@ -76,8 +76,8 @@ typedef enum {
NDPI_TLS_NOT_CARRYING_HTTPS,
NDPI_SUSPICIOUS_DGA_DOMAIN,
NDPI_MALFORMED_PACKET,
NDPI_SSH_OBSOLETE_CLIENT_SIGNATURE,
NDPI_SSH_OBSOLETE_SERVER_SIGNATURE,
NDPI_SSH_OBSOLETE_CLIENT_VERSION_OR_CIPHER,
NDPI_SSH_OBSOLETE_SERVER_VERSION_OR_CIPHER,
/* Leave this as last member */
NDPI_MAX_RISK
+5 -5
View File
@@ -1524,12 +1524,12 @@ const char* ndpi_risk2str(ndpi_risk_enum risk) {
case NDPI_MALFORMED_PACKET:
return("Malformed packet");
case NDPI_SSH_OBSOLETE_CLIENT_SIGNATURE:
return("SSH Obsolete Client Signature");
case NDPI_SSH_OBSOLETE_SERVER_SIGNATURE:
return("SSH Obsolete Server Signature");
case NDPI_SSH_OBSOLETE_CLIENT_VERSION_OR_CIPHER:
return("SSH obsolete client version/cipher");
case NDPI_SSH_OBSOLETE_SERVER_VERSION_OR_CIPHER:
return("SSH obsolete server version/cipher");
default:
snprintf(buf, sizeof(buf), "%d", (int)risk);
return(buf);
+20
View File
@@ -47,6 +47,26 @@ static __inline u_int8_t _hll_rank(u_int32_t hash, u_int8_t bits) {
return i;
}
/*
IMPORTANT: memory usage notes
[i: 4] 16 bytes
[i: 5] 32 bytes
[i: 6] 64 bytes
[i: 7] 128 bytes
[i: 8] 256 bytes
[i: 9] 512 bytes
[i: 10] 1024 bytes
[i: 11] 2048 bytes
[i: 12] 4096 bytes
[i: 13] 8192 bytes
[i: 14] 16384 bytes
[i: 15] 32768 bytes
[i: 16] 65536 bytes
[i: 17] 131072 bytes
[i: 18] 262144 bytes
[i: 19] 524288 bytes
*/
int hll_init(struct ndpi_hll *hll, u_int8_t bits) {
if(bits < 4 || bits > 20) {
errno = ERANGE;