Code cleanup
This commit is contained in:
@@ -1703,7 +1703,7 @@ static void deleteScanners(struct single_flow_info *scanners) {
|
||||
|
||||
HASH_ITER(hh, scanners, s, tmp) {
|
||||
HASH_ITER(hh, s->ports, p, tmp2) {
|
||||
HASH_DEL(s->ports, p);
|
||||
if(s->ports) HASH_DEL(s->ports, p);
|
||||
free(p);
|
||||
}
|
||||
HASH_DEL(scanners, s);
|
||||
@@ -2600,11 +2600,13 @@ static void printFlowsStats() {
|
||||
//freeing the hash table
|
||||
HASH_ITER(hh, ja3ByHostsHashT, ja3ByHost_element, tmp) {
|
||||
HASH_ITER(hh, ja3ByHost_element->host_client_info_hasht, info_of_element, tmp2) {
|
||||
HASH_DEL(ja3ByHost_element->host_client_info_hasht, info_of_element);
|
||||
if(ja3ByHost_element->host_client_info_hasht)
|
||||
HASH_DEL(ja3ByHost_element->host_client_info_hasht, info_of_element);
|
||||
free(info_of_element);
|
||||
}
|
||||
HASH_ITER(hh, ja3ByHost_element->host_server_info_hasht, info_of_element, tmp2) {
|
||||
HASH_DEL(ja3ByHost_element->host_server_info_hasht, info_of_element);
|
||||
if(ja3ByHost_element->host_server_info_hasht)
|
||||
HASH_DEL(ja3ByHost_element->host_server_info_hasht, info_of_element);
|
||||
free(info_of_element);
|
||||
}
|
||||
HASH_DEL(ja3ByHostsHashT, ja3ByHost_element);
|
||||
@@ -2613,7 +2615,8 @@ static void printFlowsStats() {
|
||||
|
||||
HASH_ITER(hh, hostByJA3C_ht, hostByJA3Element, tmp3) {
|
||||
HASH_ITER(hh, hostByJA3C_ht->ipToDNS_ht, innerHashEl, tmp4) {
|
||||
HASH_DEL(hostByJA3Element->ipToDNS_ht, innerHashEl);
|
||||
if(hostByJA3Element->ipToDNS_ht)
|
||||
HASH_DEL(hostByJA3Element->ipToDNS_ht, innerHashEl);
|
||||
free(innerHashEl);
|
||||
}
|
||||
HASH_DEL(hostByJA3C_ht, hostByJA3Element);
|
||||
@@ -2623,7 +2626,8 @@ static void printFlowsStats() {
|
||||
hostByJA3Element = NULL;
|
||||
HASH_ITER(hh, hostByJA3S_ht, hostByJA3Element, tmp3) {
|
||||
HASH_ITER(hh, hostByJA3S_ht->ipToDNS_ht, innerHashEl, tmp4) {
|
||||
HASH_DEL(hostByJA3Element->ipToDNS_ht, innerHashEl);
|
||||
if(hostByJA3Element->ipToDNS_ht)
|
||||
HASH_DEL(hostByJA3Element->ipToDNS_ht, innerHashEl);
|
||||
free(innerHashEl);
|
||||
}
|
||||
HASH_DEL(hostByJA3S_ht, hostByJA3Element);
|
||||
|
||||
@@ -123,7 +123,6 @@ void ndpi_analyze_payload(struct ndpi_flow_info *flow,
|
||||
u_int16_t payload_len,
|
||||
u_int32_t packet_id) {
|
||||
struct payload_stats *ret;
|
||||
u_int i;
|
||||
struct flow_id_stats *f;
|
||||
struct packet_id_stats *p;
|
||||
|
||||
|
||||
+132
-126
@@ -45,26 +45,32 @@
|
||||
|
||||
static u_int64_t ndpi_htonll(u_int64_t v) {
|
||||
union { u_int32_t lv[2]; u_int64_t llv; } u;
|
||||
|
||||
u.lv[0] = htonl(v >> 32);
|
||||
u.lv[1] = htonl(v & 0xFFFFFFFFULL);
|
||||
return u.llv;
|
||||
|
||||
return(u.llv);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
static u_int64_t ndpi_ntohll(u_int64_t v) {
|
||||
union { u_int32_t lv[2]; u_int64_t llv; } u;
|
||||
|
||||
u.llv = v;
|
||||
return ((u_int64_t)ntohl(u.lv[0]) << 32) | (u_int64_t)ntohl(u.lv[1]);
|
||||
|
||||
return((u_int64_t)ntohl(u.lv[0]) << 32) | (u_int64_t)ntohl(u.lv[1]);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
static int ndpi_is_number(const char *str, u_int32_t str_len) {
|
||||
int i;
|
||||
for (i = 0; i < str_len; i++)
|
||||
if (!isdigit(str[i])) return 0;
|
||||
return 1;
|
||||
|
||||
for(i = 0; i < str_len; i++)
|
||||
if(!isdigit(str[i])) return(0);
|
||||
|
||||
return(1);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -80,7 +86,7 @@ static int ndpi_json_string_escape(const char *src, int src_len, char *dst, int
|
||||
|
||||
dst[j++] = '"';
|
||||
|
||||
for (i = 0; i < src_len && j < dst_max_len; i++) {
|
||||
for(i = 0; i < src_len && j < dst_max_len; i++) {
|
||||
|
||||
c = src[i];
|
||||
|
||||
@@ -122,7 +128,7 @@ static int ndpi_json_string_escape(const char *src, int src_len, char *dst, int
|
||||
dst[j++] = '"';
|
||||
dst[j+1] = '\0';
|
||||
|
||||
return j;
|
||||
return(j);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -178,7 +184,7 @@ int ndpi_init_serializer_ll(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);
|
||||
return(ndpi_init_serializer_ll(_serializer, fmt, NDPI_SERIALIZER_DEFAULT_BUFFER_SIZE));
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -250,9 +256,9 @@ static inline int ndpi_extend_serializer_buffer(ndpi_serializer *_serializer, u_
|
||||
void *r;
|
||||
ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
|
||||
|
||||
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)
|
||||
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;
|
||||
@@ -455,7 +461,7 @@ static inline void ndpi_serialize_json_pre(ndpi_serializer *_serializer) {
|
||||
serializer->status.size_used--; /* Remove ']'*/
|
||||
serializer->status.size_used--; /* Remove '}'*/
|
||||
|
||||
if (serializer->status.flags & NDPI_SERIALIZER_STATUS_SOB)
|
||||
if(serializer->status.flags & NDPI_SERIALIZER_STATUS_SOB)
|
||||
serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_SOB;
|
||||
else if(serializer->status.flags & NDPI_SERIALIZER_STATUS_COMMA)
|
||||
serializer->buffer[serializer->status.size_used++] = ',';
|
||||
@@ -479,10 +485,10 @@ static inline void ndpi_serialize_json_post(ndpi_serializer *_serializer) {
|
||||
static inline ndpi_serialization_type ndpi_serialize_key_uint32(ndpi_private_serializer *serializer, u_int32_t key) {
|
||||
ndpi_serialization_type kt;
|
||||
|
||||
if (key <= 0xff) {
|
||||
if(key <= 0xff) {
|
||||
ndpi_serialize_single_uint8(serializer, key);
|
||||
kt = ndpi_serialization_uint8;
|
||||
} else if (key <= 0xffff) {
|
||||
} else if(key <= 0xffff) {
|
||||
ndpi_serialize_single_uint16(serializer, key);
|
||||
kt = ndpi_serialization_uint16;
|
||||
} else {
|
||||
@@ -490,7 +496,7 @@ static inline ndpi_serialization_type ndpi_serialize_key_uint32(ndpi_private_ser
|
||||
kt = ndpi_serialization_uint32;
|
||||
}
|
||||
|
||||
return kt;
|
||||
return(kt);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -529,10 +535,10 @@ int ndpi_serialize_uint32_uint32(ndpi_serializer *_serializer,
|
||||
kt = ndpi_serialize_key_uint32(serializer, key);
|
||||
type = (kt << 4);
|
||||
|
||||
if (value <= 0xff) {
|
||||
if(value <= 0xff) {
|
||||
ndpi_serialize_single_uint8(serializer, value);
|
||||
type |= ndpi_serialization_uint8;
|
||||
} else if (value <= 0xffff) {
|
||||
} else if(value <= 0xffff) {
|
||||
ndpi_serialize_single_uint16(serializer, value);
|
||||
type |= ndpi_serialization_uint16;
|
||||
} else {
|
||||
@@ -577,7 +583,7 @@ int ndpi_serialize_uint32_uint64(ndpi_serializer *_serializer,
|
||||
(serializer->status.size_used > 0) ? serializer->csv_separator : "",
|
||||
(unsigned long long)value);
|
||||
} else {
|
||||
if (value <= 0xffffffff) {
|
||||
if(value <= 0xffffffff) {
|
||||
return(ndpi_serialize_uint32_uint32(_serializer, key, value));
|
||||
} else {
|
||||
ndpi_serialization_type kt;
|
||||
@@ -633,10 +639,10 @@ int ndpi_serialize_uint32_int32(ndpi_serializer *_serializer,
|
||||
kt = ndpi_serialize_key_uint32(serializer, key);
|
||||
type = (kt << 4);
|
||||
|
||||
if (value <= 127 && value >= -128) {
|
||||
if(value <= 127 && value >= -128) {
|
||||
ndpi_serialize_single_uint8(serializer, value);
|
||||
type |= ndpi_serialization_int8;
|
||||
} else if (value <= 32767 && value >= -32768) {
|
||||
} else if(value <= 32767 && value >= -32768) {
|
||||
ndpi_serialize_single_uint16(serializer, value);
|
||||
type |= ndpi_serialization_int16;
|
||||
} else {
|
||||
@@ -682,7 +688,7 @@ int ndpi_serialize_uint32_int64(ndpi_serializer *_serializer,
|
||||
(long long int)value);
|
||||
|
||||
} else {
|
||||
if (value <= 2147483647 && value >= -2147483648) {
|
||||
if(value <= 2147483647 && value >= -2147483648) {
|
||||
return(ndpi_serialize_uint32_int32(_serializer, key, value));
|
||||
} else {
|
||||
ndpi_serialization_type kt;
|
||||
@@ -805,7 +811,7 @@ static int ndpi_serialize_uint32_binary(ndpi_serializer *_serializer,
|
||||
int ndpi_serialize_uint32_string(ndpi_serializer *_serializer,
|
||||
u_int32_t key, const char *_value) {
|
||||
const char *value = _value ? _value : "";
|
||||
return ndpi_serialize_uint32_binary(_serializer, key, value, strlen(value));
|
||||
return(ndpi_serialize_uint32_binary(_serializer, key, value, strlen(value)));
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -817,8 +823,8 @@ static int ndpi_serialize_binary_int32(ndpi_serializer *_serializer,
|
||||
u_int32_t buff_diff = serializer->buffer_size - serializer->status.size_used;
|
||||
u_int32_t needed;
|
||||
|
||||
if (ndpi_is_number(key, klen))
|
||||
return ndpi_serialize_uint32_int32(_serializer, atoi(key), value);
|
||||
if(ndpi_is_number(key, klen))
|
||||
return(ndpi_serialize_uint32_int32(_serializer, atoi(key), value));
|
||||
|
||||
needed =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
@@ -847,11 +853,11 @@ static int ndpi_serialize_binary_int32(ndpi_serializer *_serializer,
|
||||
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
|
||||
"%s%d", (serializer->status.size_used > 0) ? serializer->csv_separator : "", value);
|
||||
} else {
|
||||
if (value <= 127 && value >= -128) {
|
||||
if(value <= 127 && value >= -128) {
|
||||
serializer->buffer[serializer->status.size_used++] = (ndpi_serialization_string << 4) | ndpi_serialization_int8;
|
||||
ndpi_serialize_single_string(serializer, key, klen);
|
||||
ndpi_serialize_single_uint8(serializer, value);
|
||||
} else if (value <= 32767 && value >= -32768) {
|
||||
} else if(value <= 32767 && value >= -32768) {
|
||||
serializer->buffer[serializer->status.size_used++] = (ndpi_serialization_string << 4) | ndpi_serialization_int16;
|
||||
ndpi_serialize_single_string(serializer, key, klen);
|
||||
ndpi_serialize_single_uint16(serializer, value);
|
||||
@@ -869,7 +875,7 @@ static int ndpi_serialize_binary_int32(ndpi_serializer *_serializer,
|
||||
|
||||
int ndpi_serialize_string_int32(ndpi_serializer *_serializer,
|
||||
const char *key, int32_t value) {
|
||||
return ndpi_serialize_binary_int32(_serializer, key, strlen(key), value);
|
||||
return(ndpi_serialize_binary_int32(_serializer, key, strlen(key), value));
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -881,8 +887,8 @@ int ndpi_serialize_binary_int64(ndpi_serializer *_serializer,
|
||||
u_int32_t buff_diff = serializer->buffer_size - serializer->status.size_used;
|
||||
u_int32_t needed;
|
||||
|
||||
if (ndpi_is_number(key, klen))
|
||||
return ndpi_serialize_uint32_int64(_serializer, atoi(key), value);
|
||||
if(ndpi_is_number(key, klen))
|
||||
return(ndpi_serialize_uint32_int64(_serializer, atoi(key), value));
|
||||
|
||||
needed =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
@@ -912,7 +918,7 @@ int ndpi_serialize_binary_int64(ndpi_serializer *_serializer,
|
||||
"%s%lld", (serializer->status.size_used > 0) ? serializer->csv_separator : "",
|
||||
(long long int)value);
|
||||
} else {
|
||||
if (value <= 2147483647 && value >= -2147483648) {
|
||||
if(value <= 2147483647 && value >= -2147483648) {
|
||||
return(ndpi_serialize_string_int32(_serializer, key, value));
|
||||
} else {
|
||||
serializer->buffer[serializer->status.size_used++] = (ndpi_serialization_string << 4) | ndpi_serialization_int64;
|
||||
@@ -928,7 +934,7 @@ int ndpi_serialize_binary_int64(ndpi_serializer *_serializer,
|
||||
|
||||
int ndpi_serialize_string_int64(ndpi_serializer *_serializer,
|
||||
const char *key, int64_t value) {
|
||||
return ndpi_serialize_binary_int64(_serializer, key, strlen(key), value);
|
||||
return(ndpi_serialize_binary_int64(_serializer, key, strlen(key), value));
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -939,8 +945,8 @@ static int ndpi_serialize_binary_uint32(ndpi_serializer *_serializer,
|
||||
u_int32_t buff_diff = serializer->buffer_size - serializer->status.size_used;
|
||||
u_int32_t needed;
|
||||
|
||||
if (ndpi_is_number(key, klen))
|
||||
return ndpi_serialize_uint32_uint32(_serializer, atoi(key), value);
|
||||
if(ndpi_is_number(key, klen))
|
||||
return(ndpi_serialize_uint32_uint32(_serializer, atoi(key), value));
|
||||
|
||||
needed =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
@@ -969,11 +975,11 @@ static int ndpi_serialize_binary_uint32(ndpi_serializer *_serializer,
|
||||
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
|
||||
"%s%u", (serializer->status.size_used > 0) ? serializer->csv_separator : "", value);
|
||||
} else {
|
||||
if (value <= 0xff) {
|
||||
if(value <= 0xff) {
|
||||
serializer->buffer[serializer->status.size_used++] = (ndpi_serialization_string << 4) | ndpi_serialization_uint8;
|
||||
ndpi_serialize_single_string(serializer, key, klen);
|
||||
ndpi_serialize_single_uint8(serializer, value);
|
||||
} else if (value <= 0xffff) {
|
||||
} else if(value <= 0xffff) {
|
||||
serializer->buffer[serializer->status.size_used++] = (ndpi_serialization_string << 4) | ndpi_serialization_uint16;
|
||||
ndpi_serialize_single_string(serializer, key, klen);
|
||||
ndpi_serialize_single_uint16(serializer, value);
|
||||
@@ -991,7 +997,7 @@ static int ndpi_serialize_binary_uint32(ndpi_serializer *_serializer,
|
||||
|
||||
int ndpi_serialize_string_uint32(ndpi_serializer *_serializer,
|
||||
const char *key, u_int32_t value) {
|
||||
return ndpi_serialize_binary_uint32(_serializer, key, strlen(key), value);
|
||||
return(ndpi_serialize_binary_uint32(_serializer, key, strlen(key), value));
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1021,8 +1027,8 @@ static int ndpi_serialize_binary_uint64(ndpi_serializer *_serializer,
|
||||
u_int32_t buff_diff = serializer->buffer_size - serializer->status.size_used;
|
||||
u_int32_t needed;
|
||||
|
||||
if (ndpi_is_number(key, klen))
|
||||
return ndpi_serialize_uint32_uint64(_serializer, atoi(key), value);
|
||||
if(ndpi_is_number(key, klen))
|
||||
return(ndpi_serialize_uint32_uint64(_serializer, atoi(key), value));
|
||||
|
||||
needed =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
@@ -1052,7 +1058,7 @@ static int ndpi_serialize_binary_uint64(ndpi_serializer *_serializer,
|
||||
"%s%llu", (serializer->status.size_used > 0) ? serializer->csv_separator : "",
|
||||
(unsigned long long)value);
|
||||
} else {
|
||||
if (value <= 0xffffffff) {
|
||||
if(value <= 0xffffffff) {
|
||||
return(ndpi_serialize_string_uint32(_serializer, key, value));
|
||||
} else {
|
||||
serializer->buffer[serializer->status.size_used++] = (ndpi_serialization_string << 4) | ndpi_serialization_uint64;
|
||||
@@ -1068,7 +1074,7 @@ static int ndpi_serialize_binary_uint64(ndpi_serializer *_serializer,
|
||||
|
||||
int ndpi_serialize_string_uint64(ndpi_serializer *_serializer,
|
||||
const char *key, u_int64_t value) {
|
||||
return ndpi_serialize_binary_uint64(_serializer, key, strlen(key), value);
|
||||
return(ndpi_serialize_binary_uint64(_serializer, key, strlen(key), value));
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1082,8 +1088,8 @@ static int ndpi_serialize_binary_float(ndpi_serializer *_serializer,
|
||||
u_int32_t buff_diff = serializer->buffer_size - serializer->status.size_used;
|
||||
u_int32_t needed;
|
||||
|
||||
if (ndpi_is_number(key, klen))
|
||||
return ndpi_serialize_uint32_float(_serializer, atoi(key), value, format);
|
||||
if(ndpi_is_number(key, klen))
|
||||
return(ndpi_serialize_uint32_float(_serializer, atoi(key), value, format));
|
||||
|
||||
needed =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
@@ -1133,7 +1139,7 @@ int ndpi_serialize_string_float(ndpi_serializer *_serializer,
|
||||
const char *key,
|
||||
float value,
|
||||
const char *format /* e.f. "%.2f" */) {
|
||||
return ndpi_serialize_binary_float(_serializer, key, strlen(key), value, format);
|
||||
return(ndpi_serialize_binary_float(_serializer, key, strlen(key), value, format));
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1148,8 +1154,8 @@ static int ndpi_serialize_binary_binary(ndpi_serializer *_serializer,
|
||||
u_int32_t buff_diff = serializer->buffer_size - serializer->status.size_used;
|
||||
u_int32_t needed;
|
||||
|
||||
if (ndpi_is_number(key, klen))
|
||||
return ndpi_serialize_uint32_string(_serializer, atoi(key), _value);
|
||||
if(ndpi_is_number(key, klen))
|
||||
return(ndpi_serialize_uint32_string(_serializer, atoi(key), _value));
|
||||
|
||||
needed =
|
||||
sizeof(u_int8_t) /* type */ +
|
||||
@@ -1197,7 +1203,7 @@ static int ndpi_serialize_binary_binary(ndpi_serializer *_serializer,
|
||||
int ndpi_serialize_string_binary(ndpi_serializer *_serializer,
|
||||
const char *key, const char *_value,
|
||||
u_int16_t vlen) {
|
||||
return ndpi_serialize_binary_binary(_serializer, key, strlen(key), _value, vlen);
|
||||
return(ndpi_serialize_binary_binary(_serializer, key, strlen(key), _value, vlen));
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1216,13 +1222,13 @@ int ndpi_serialize_start_of_block(ndpi_serializer *_serializer,
|
||||
u_int32_t buff_diff = serializer->buffer_size - serializer->status.size_used;
|
||||
u_int32_t needed, klen = strlen(key);
|
||||
|
||||
if (serializer->fmt != ndpi_serialization_format_json)
|
||||
return -1;
|
||||
if(serializer->fmt != ndpi_serialization_format_json)
|
||||
return(-1);
|
||||
|
||||
needed = 16 + klen;
|
||||
|
||||
if (buff_diff < needed) {
|
||||
if (ndpi_extend_serializer_buffer(_serializer, needed - buff_diff) < 0)
|
||||
if(buff_diff < needed) {
|
||||
if(ndpi_extend_serializer_buffer(_serializer, needed - buff_diff) < 0)
|
||||
return(-1);
|
||||
buff_diff = serializer->buffer_size - serializer->status.size_used;
|
||||
}
|
||||
@@ -1248,18 +1254,18 @@ int ndpi_serialize_end_of_block(ndpi_serializer *_serializer) {
|
||||
u_int32_t buff_diff = serializer->buffer_size - serializer->status.size_used;
|
||||
u_int32_t needed;
|
||||
|
||||
if (serializer->fmt != ndpi_serialization_format_json)
|
||||
return -1;
|
||||
if(serializer->fmt != ndpi_serialization_format_json)
|
||||
return(-1);
|
||||
|
||||
needed = 4;
|
||||
|
||||
if (buff_diff < needed) {
|
||||
if (ndpi_extend_serializer_buffer(_serializer, needed - buff_diff) < 0)
|
||||
if(buff_diff < needed) {
|
||||
if(ndpi_extend_serializer_buffer(_serializer, needed - buff_diff) < 0)
|
||||
return(-1);
|
||||
buff_diff = serializer->buffer_size - serializer->status.size_used;
|
||||
}
|
||||
|
||||
buff_diff = serializer->buffer_size - serializer->status.size_used;
|
||||
// buff_diff = serializer->buffer_size - serializer->status.size_used;
|
||||
ndpi_serialize_json_post(_serializer);
|
||||
|
||||
return(0);
|
||||
@@ -1287,7 +1293,7 @@ void ndpi_serializer_create_snapshot(ndpi_serializer *_serializer) {
|
||||
void ndpi_serializer_rollback_snapshot(ndpi_serializer *_serializer) {
|
||||
ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
|
||||
|
||||
if (serializer->has_snapshot) {
|
||||
if(serializer->has_snapshot) {
|
||||
memcpy(&serializer->status, &serializer->snapshot, sizeof(ndpi_private_serializer_status));
|
||||
serializer->has_snapshot = 0;
|
||||
|
||||
@@ -1340,7 +1346,7 @@ int ndpi_init_deserializer(ndpi_deserializer *deserializer,
|
||||
|
||||
ndpi_serialization_format ndpi_deserialize_get_format(ndpi_deserializer *_deserializer) {
|
||||
ndpi_private_deserializer *deserializer = (ndpi_private_deserializer*)_deserializer;
|
||||
return deserializer->fmt;
|
||||
return(deserializer->fmt);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1348,12 +1354,12 @@ ndpi_serialization_format ndpi_deserialize_get_format(ndpi_deserializer *_deseri
|
||||
static inline ndpi_serialization_type ndpi_deserialize_get_key_subtype(ndpi_private_deserializer *deserializer) {
|
||||
u_int8_t type;
|
||||
|
||||
if (deserializer->status.size_used >= deserializer->buffer_size)
|
||||
return ndpi_serialization_unknown;
|
||||
if(deserializer->status.size_used >= deserializer->buffer_size)
|
||||
return(ndpi_serialization_unknown);
|
||||
|
||||
type = deserializer->buffer[deserializer->status.size_used];
|
||||
|
||||
return (ndpi_serialization_type) (type >> 4);
|
||||
return((ndpi_serialization_type) (type >> 4));
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1361,12 +1367,12 @@ static inline ndpi_serialization_type ndpi_deserialize_get_key_subtype(ndpi_priv
|
||||
static inline ndpi_serialization_type ndpi_deserialize_get_value_subtype(ndpi_private_deserializer *deserializer) {
|
||||
u_int8_t type;
|
||||
|
||||
if (deserializer->status.size_used >= deserializer->buffer_size)
|
||||
if(deserializer->status.size_used >= deserializer->buffer_size)
|
||||
return(ndpi_serialization_unknown);
|
||||
|
||||
type = deserializer->buffer[deserializer->status.size_used];
|
||||
|
||||
return (ndpi_serialization_type) (type & 0xf);
|
||||
return(ndpi_serialization_type) (type & 0xf);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1404,7 +1410,7 @@ ndpi_serialization_type ndpi_deserialize_get_item_type(ndpi_deserializer *_deser
|
||||
}
|
||||
|
||||
*key_type = kt;
|
||||
return et;
|
||||
return(et);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1414,14 +1420,14 @@ static inline int ndpi_deserialize_get_single_string_size(ndpi_private_deseriali
|
||||
u_int16_t expected, str_len;
|
||||
|
||||
expected = sizeof(u_int16_t) /* len */;
|
||||
if (buff_diff < expected) return -2;
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
str_len = ntohs(*((u_int16_t *) &deserializer->buffer[offset]));
|
||||
|
||||
expected += str_len;
|
||||
if (buff_diff < expected) return -2;
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
return expected;
|
||||
return(expected);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1457,11 +1463,11 @@ static inline int ndpi_deserialize_get_single_size(ndpi_private_deserializer *de
|
||||
size = 0;
|
||||
break;
|
||||
default:
|
||||
return -2;
|
||||
return(-2);
|
||||
break;
|
||||
}
|
||||
|
||||
return size;
|
||||
return(size);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1475,25 +1481,25 @@ int ndpi_deserialize_next(ndpi_deserializer *_deserializer) {
|
||||
|
||||
expected = sizeof(u_int8_t) /* type */;
|
||||
|
||||
if (buff_diff < expected) return -2;
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
kt = ndpi_deserialize_get_key_subtype(deserializer);
|
||||
size = ndpi_deserialize_get_single_size(deserializer, kt, deserializer->status.size_used + expected);
|
||||
|
||||
if (size < 0) return -2;
|
||||
if(size < 0) return(-2);
|
||||
|
||||
expected += size;
|
||||
|
||||
et = ndpi_deserialize_get_value_subtype(deserializer);
|
||||
size = ndpi_deserialize_get_single_size(deserializer, et, deserializer->status.size_used + expected);
|
||||
|
||||
if (size < 0) return -2;
|
||||
if(size < 0) return(-2);
|
||||
|
||||
expected += size;
|
||||
|
||||
deserializer->status.size_used += expected;
|
||||
|
||||
return 0;
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1509,12 +1515,12 @@ int ndpi_deserialize_key_uint32(ndpi_deserializer *_deserializer,
|
||||
int size;
|
||||
|
||||
expected = sizeof(u_int8_t) /* type */;
|
||||
if (buff_diff < expected) return -2;
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
kt = ndpi_deserialize_get_key_subtype(deserializer);
|
||||
|
||||
size = ndpi_deserialize_get_single_size(deserializer, kt, deserializer->status.size_used + expected);
|
||||
if (size < 0) return -2;
|
||||
if(size < 0) return(-2);
|
||||
|
||||
offset = deserializer->status.size_used + expected;
|
||||
|
||||
@@ -1531,11 +1537,11 @@ int ndpi_deserialize_key_uint32(ndpi_deserializer *_deserializer,
|
||||
*key = v8;
|
||||
break;
|
||||
default:
|
||||
return -1;
|
||||
return(-1);
|
||||
break;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1549,16 +1555,16 @@ int ndpi_deserialize_key_string(ndpi_deserializer *_deserializer,
|
||||
int size;
|
||||
|
||||
expected = sizeof(u_int8_t) /* type */;
|
||||
if (buff_diff < expected) return -2;
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
kt = ndpi_deserialize_get_key_subtype(deserializer);
|
||||
|
||||
size = ndpi_deserialize_get_single_size(deserializer, kt, deserializer->status.size_used + expected);
|
||||
if (size < 0) return -2;
|
||||
if(size < 0) return(-2);
|
||||
|
||||
ndpi_deserialize_single_string(deserializer, deserializer->status.size_used + expected, key);
|
||||
|
||||
return 0;
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1574,17 +1580,17 @@ int ndpi_deserialize_value_uint32(ndpi_deserializer *_deserializer,
|
||||
int size;
|
||||
|
||||
expected = sizeof(u_int8_t) /* type */;
|
||||
if (buff_diff < expected) return -2;
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
kt = ndpi_deserialize_get_key_subtype(deserializer);
|
||||
size = ndpi_deserialize_get_single_size(deserializer, kt, deserializer->status.size_used + expected);
|
||||
if (size < 0) return -2;
|
||||
if(size < 0) return(-2);
|
||||
|
||||
expected += size;
|
||||
|
||||
et = ndpi_deserialize_get_value_subtype(deserializer);
|
||||
size = ndpi_deserialize_get_single_size(deserializer, et, deserializer->status.size_used + expected);
|
||||
if (size < 0) return -2;
|
||||
if(size < 0) return(-2);
|
||||
|
||||
offset = deserializer->status.size_used + expected;
|
||||
|
||||
@@ -1604,7 +1610,7 @@ int ndpi_deserialize_value_uint32(ndpi_deserializer *_deserializer,
|
||||
break;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1620,28 +1626,28 @@ int ndpi_deserialize_value_uint64(ndpi_deserializer *_deserializer,
|
||||
int rc;
|
||||
|
||||
expected = sizeof(u_int8_t) /* type */;
|
||||
if (buff_diff < expected) return -2;
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
kt = ndpi_deserialize_get_key_subtype(deserializer);
|
||||
size = ndpi_deserialize_get_single_size(deserializer, kt, deserializer->status.size_used + expected);
|
||||
if (size < 0) return -2;
|
||||
if(size < 0) return(-2);
|
||||
|
||||
expected += size;
|
||||
|
||||
et = ndpi_deserialize_get_value_subtype(deserializer);
|
||||
size = ndpi_deserialize_get_single_size(deserializer, et, deserializer->status.size_used + expected);
|
||||
if (size < 0) return -2;
|
||||
if(size < 0) return(-2);
|
||||
|
||||
if(et != ndpi_serialization_uint64) {
|
||||
/* Try with smaller uint types */
|
||||
rc = ndpi_deserialize_value_uint32(_deserializer, &v32);
|
||||
*value = v32;
|
||||
return rc;
|
||||
return(rc);
|
||||
}
|
||||
|
||||
ndpi_deserialize_single_uint64(deserializer, deserializer->status.size_used + expected, value);
|
||||
|
||||
return 0;
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1657,17 +1663,17 @@ int ndpi_deserialize_value_int32(ndpi_deserializer *_deserializer,
|
||||
int size;
|
||||
|
||||
expected = sizeof(u_int8_t) /* type */;
|
||||
if (buff_diff < expected) return -2;
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
kt = ndpi_deserialize_get_key_subtype(deserializer);
|
||||
size = ndpi_deserialize_get_single_size(deserializer, kt, deserializer->status.size_used + expected);
|
||||
if (size < 0) return -2;
|
||||
if(size < 0) return(-2);
|
||||
|
||||
expected += size;
|
||||
|
||||
et = ndpi_deserialize_get_value_subtype(deserializer);
|
||||
size = ndpi_deserialize_get_single_size(deserializer, et, deserializer->status.size_used + expected);
|
||||
if (size < 0) return -2;
|
||||
if(size < 0) return(-2);
|
||||
|
||||
offset = deserializer->status.size_used + expected;
|
||||
|
||||
@@ -1687,7 +1693,7 @@ int ndpi_deserialize_value_int32(ndpi_deserializer *_deserializer,
|
||||
break;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1703,28 +1709,28 @@ int ndpi_deserialize_value_int64(ndpi_deserializer *_deserializer,
|
||||
int rc;
|
||||
|
||||
expected = sizeof(u_int8_t) /* type */;
|
||||
if (buff_diff < expected) return(-2);
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
kt = ndpi_deserialize_get_key_subtype(deserializer);
|
||||
size = ndpi_deserialize_get_single_size(deserializer, kt, deserializer->status.size_used + expected);
|
||||
if (size < 0) return -2;
|
||||
if(size < 0) return(-2);
|
||||
|
||||
expected += size;
|
||||
|
||||
et = ndpi_deserialize_get_value_subtype(deserializer);
|
||||
size = ndpi_deserialize_get_single_size(deserializer, et, deserializer->status.size_used + expected);
|
||||
if (size < 0) return -2;
|
||||
if(size < 0) return(-2);
|
||||
|
||||
if(et != ndpi_serialization_int64) {
|
||||
/* Try with smaller int types */
|
||||
rc = ndpi_deserialize_value_int32(_deserializer, &v32);
|
||||
*value = v32;
|
||||
return rc;
|
||||
return(rc);
|
||||
}
|
||||
|
||||
ndpi_deserialize_single_int64(deserializer, deserializer->status.size_used + expected, value);
|
||||
|
||||
return 0;
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1738,24 +1744,24 @@ int ndpi_deserialize_value_float(ndpi_deserializer *_deserializer,
|
||||
int size;
|
||||
|
||||
expected = sizeof(u_int8_t) /* type */;
|
||||
if (buff_diff < expected) return(-2);
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
kt = ndpi_deserialize_get_key_subtype(deserializer);
|
||||
size = ndpi_deserialize_get_single_size(deserializer, kt, deserializer->status.size_used + expected);
|
||||
if (size < 0) return -2;
|
||||
if(size < 0) return(-2);
|
||||
|
||||
expected += size;
|
||||
|
||||
et = ndpi_deserialize_get_value_subtype(deserializer);
|
||||
size = ndpi_deserialize_get_single_size(deserializer, et, deserializer->status.size_used + expected);
|
||||
if (size < 0) return -2;
|
||||
if(size < 0) return(-2);
|
||||
|
||||
if(et != ndpi_serialization_float)
|
||||
return -1;
|
||||
return(-1);
|
||||
|
||||
ndpi_deserialize_single_float(deserializer, deserializer->status.size_used + expected, value);
|
||||
|
||||
return 0;
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1769,24 +1775,24 @@ int ndpi_deserialize_value_string(ndpi_deserializer *_deserializer,
|
||||
int size;
|
||||
|
||||
expected = sizeof(u_int8_t) /* type */;
|
||||
if (buff_diff < expected) return(-2);
|
||||
if(buff_diff < expected) return(-2);
|
||||
|
||||
kt = ndpi_deserialize_get_key_subtype(deserializer);
|
||||
size = ndpi_deserialize_get_single_size(deserializer, kt, deserializer->status.size_used + expected);
|
||||
if (size < 0) return -2;
|
||||
if(size < 0) return(-2);
|
||||
|
||||
expected += size;
|
||||
|
||||
et = ndpi_deserialize_get_value_subtype(deserializer);
|
||||
size = ndpi_deserialize_get_single_size(deserializer, et, deserializer->status.size_used + expected);
|
||||
if (size < 0) return -2;
|
||||
if(size < 0) return(-2);
|
||||
|
||||
if(et != ndpi_serialization_string)
|
||||
return -1;
|
||||
return(-1);
|
||||
|
||||
ndpi_deserialize_single_string(deserializer, deserializer->status.size_used + expected, value);
|
||||
|
||||
return 0;
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1801,30 +1807,30 @@ int ndpi_deserialize_clone_item(ndpi_deserializer *_deserializer, ndpi_serialize
|
||||
u_int16_t expected;
|
||||
int size;
|
||||
|
||||
if (serializer->fmt != ndpi_serialization_format_tlv)
|
||||
return -3;
|
||||
if(serializer->fmt != ndpi_serialization_format_tlv)
|
||||
return(-3);
|
||||
|
||||
expected = sizeof(u_int8_t) /* type */;
|
||||
|
||||
if (src_buff_diff < expected) return -2;
|
||||
if(src_buff_diff < expected) return(-2);
|
||||
|
||||
kt = ndpi_deserialize_get_key_subtype(deserializer);
|
||||
size = ndpi_deserialize_get_single_size(deserializer, kt, deserializer->status.size_used + expected);
|
||||
|
||||
if (size < 0) return -2;
|
||||
if(size < 0) return(-2);
|
||||
|
||||
expected += size;
|
||||
|
||||
et = ndpi_deserialize_get_value_subtype(deserializer);
|
||||
size = ndpi_deserialize_get_single_size(deserializer, et, deserializer->status.size_used + expected);
|
||||
|
||||
if (size < 0) return -2;
|
||||
if(size < 0) return(-2);
|
||||
|
||||
expected += size;
|
||||
|
||||
if (dst_buff_diff < expected) {
|
||||
if (ndpi_extend_serializer_buffer(_serializer, expected - dst_buff_diff) < 0)
|
||||
return -1;
|
||||
if(dst_buff_diff < expected) {
|
||||
if(ndpi_extend_serializer_buffer(_serializer, expected - dst_buff_diff) < 0)
|
||||
return(-1);
|
||||
dst_buff_diff = serializer->buffer_size - serializer->status.size_used;
|
||||
}
|
||||
|
||||
@@ -1834,7 +1840,7 @@ int ndpi_deserialize_clone_item(ndpi_deserializer *_deserializer, ndpi_serialize
|
||||
|
||||
serializer->status.size_used += expected;
|
||||
|
||||
return 0;
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
@@ -1852,7 +1858,7 @@ int ndpi_deserialize_clone_all(ndpi_deserializer *deserializer, ndpi_serializer
|
||||
|
||||
while((et = ndpi_deserialize_get_item_type(deserializer, &kt)) != ndpi_serialization_unknown) {
|
||||
|
||||
if (et == ndpi_serialization_end_of_record) {
|
||||
if(et == ndpi_serialization_end_of_record) {
|
||||
ndpi_serialize_end_of_record(serializer);
|
||||
ndpi_deserialize_next(deserializer);
|
||||
continue;
|
||||
@@ -1868,54 +1874,54 @@ int ndpi_deserialize_clone_all(ndpi_deserializer *deserializer, ndpi_serializer
|
||||
key_is_string = 1;
|
||||
break;
|
||||
default:
|
||||
return -1;
|
||||
return(-1);
|
||||
}
|
||||
|
||||
switch(et) {
|
||||
case ndpi_serialization_uint32:
|
||||
ndpi_deserialize_value_uint32(deserializer, &u32);
|
||||
if (key_is_string) ndpi_serialize_binary_uint32(serializer, ks.str, ks.str_len, u32);
|
||||
if(key_is_string) ndpi_serialize_binary_uint32(serializer, ks.str, ks.str_len, u32);
|
||||
else ndpi_serialize_uint32_uint32(serializer, k32, u32);
|
||||
break;
|
||||
|
||||
case ndpi_serialization_uint64:
|
||||
ndpi_deserialize_value_uint64(deserializer, &u64);
|
||||
if (key_is_string) ndpi_serialize_binary_uint64(serializer, ks.str, ks.str_len, u64);
|
||||
if(key_is_string) ndpi_serialize_binary_uint64(serializer, ks.str, ks.str_len, u64);
|
||||
else ndpi_serialize_uint32_uint64(serializer, k32, u64);
|
||||
break;
|
||||
|
||||
case ndpi_serialization_int32:
|
||||
ndpi_deserialize_value_int32(deserializer, &i32);
|
||||
if (key_is_string) ndpi_serialize_binary_int32(serializer, ks.str, ks.str_len, i32);
|
||||
if(key_is_string) ndpi_serialize_binary_int32(serializer, ks.str, ks.str_len, i32);
|
||||
else ndpi_serialize_uint32_int32(serializer, k32, i32);
|
||||
break;
|
||||
|
||||
case ndpi_serialization_int64:
|
||||
ndpi_deserialize_value_int64(deserializer, &i64);
|
||||
if (key_is_string) ndpi_serialize_binary_int64(serializer, ks.str, ks.str_len, i64);
|
||||
if(key_is_string) ndpi_serialize_binary_int64(serializer, ks.str, ks.str_len, i64);
|
||||
else ndpi_serialize_uint32_int64(serializer, k32, i64);
|
||||
break;
|
||||
|
||||
case ndpi_serialization_float:
|
||||
ndpi_deserialize_value_float(deserializer, &f);
|
||||
if (key_is_string) ndpi_serialize_binary_float(serializer, ks.str, ks.str_len, f, "%.3f");
|
||||
if(key_is_string) ndpi_serialize_binary_float(serializer, ks.str, ks.str_len, f, "%.3f");
|
||||
else ndpi_serialize_uint32_float(serializer, k32, f, "%.3f");
|
||||
break;
|
||||
|
||||
case ndpi_serialization_string:
|
||||
ndpi_deserialize_value_string(deserializer, &vs);
|
||||
if (key_is_string) ndpi_serialize_binary_binary(serializer, ks.str, ks.str_len, vs.str, vs.str_len);
|
||||
if(key_is_string) ndpi_serialize_binary_binary(serializer, ks.str, ks.str_len, vs.str, vs.str_len);
|
||||
else ndpi_serialize_uint32_binary(serializer, k32, vs.str, vs.str_len);
|
||||
break;
|
||||
|
||||
default:
|
||||
return -2;
|
||||
return(-2);
|
||||
}
|
||||
|
||||
ndpi_deserialize_next(deserializer);
|
||||
}
|
||||
|
||||
return 0;
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* ********************************** */
|
||||
|
||||
Reference in New Issue
Block a user