Merge branch 'dev' of https://github.com/ntop/nDPI into dev

This commit is contained in:
Luca Deri
2019-09-11 17:14:52 +02:00
3 changed files with 25 additions and 5 deletions
+2
View File
@@ -819,6 +819,8 @@ extern "C" {
char* ndpi_ssl_version2str(u_int16_t version);
/* Serializer */
int ndpi_init_serializer_ll(ndpi_serializer *serializer, ndpi_serialization_format fmt,
u_int32_t buffer_size);
int ndpi_init_serializer(ndpi_serializer *serializer, ndpi_serialization_format fmt);
void ndpi_term_serializer(ndpi_serializer *serializer);
void ndpi_reset_serializer(ndpi_serializer *serializer);
+4
View File
@@ -1357,6 +1357,9 @@ typedef enum {
ndpi_serialization_string
} ndpi_serialization_type;
#define NDPI_SERIALIZER_DEFAULT_BUFFER_SIZE 8192
#define NDPI_SERIALIZER_DEFAULT_BUFFER_INCR 1024
#define NDPI_SERIALIZER_STATUS_COMMA (1 << 0)
#define NDPI_SERIALIZER_STATUS_ARRAY (1 << 1)
#define NDPI_SERIALIZER_STATUS_EOR (1 << 2)
@@ -1368,6 +1371,7 @@ typedef struct {
typedef struct {
ndpi_private_serializer_status status;
u_int32_t initial_buffer_size;
u_int32_t buffer_size;
ndpi_serialization_format fmt;
u_int8_t *buffer;
+19 -5
View File
@@ -148,13 +148,14 @@ void ndpi_reset_serializer(ndpi_serializer *_serializer) {
/* ********************************** */
int ndpi_init_serializer(ndpi_serializer *_serializer,
ndpi_serialization_format fmt) {
int ndpi_init_serializer_ll(ndpi_serializer *_serializer,
ndpi_serialization_format fmt,
u_int32_t buffer_size) {
ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
memset(serializer, 0, sizeof(ndpi_private_serializer));
serializer->buffer_size = 8192;
serializer->initial_buffer_size = serializer->buffer_size = buffer_size;
serializer->buffer = (u_int8_t *) malloc(serializer->buffer_size * sizeof(u_int8_t));
if(serializer->buffer == NULL)
@@ -175,6 +176,13 @@ int ndpi_init_serializer(ndpi_serializer *_serializer,
/* ********************************** */
int ndpi_init_serializer(ndpi_serializer *_serializer,
ndpi_serialization_format fmt) {
return ndpi_init_serializer_ll(_serializer, fmt, NDPI_SERIALIZER_DEFAULT_BUFFER_SIZE);
}
/* ********************************** */
char* ndpi_serializer_get_buffer(ndpi_serializer *_serializer, u_int32_t *buffer_len) {
ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
char *buf = (char*)serializer->buffer;
@@ -242,8 +250,14 @@ static inline int ndpi_extend_serializer_buffer(ndpi_serializer *_serializer, u_
void *r;
ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
if(min_len < 1024)
min_len = 1024;
if (min_len < NDPI_SERIALIZER_DEFAULT_BUFFER_INCR) {
if (serializer->initial_buffer_size < NDPI_SERIALIZER_DEFAULT_BUFFER_INCR) {
if (min_len < serializer->initial_buffer_size)
min_len = serializer->initial_buffer_size;
} else {
min_len = NDPI_SERIALIZER_DEFAULT_BUFFER_INCR;
}
}
new_size = serializer->buffer_size + min_len;