Compare commits

...
8 Commits
8 changed files with 64 additions and 23 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
NDPI_MAJOR="3" NDPI_MAJOR="3"
NDPI_MINOR="1" NDPI_MINOR="2"
NDPI_PATCH="0" NDPI_PATCH="0"
NDPI_VERSION_SHORT="$NDPI_MAJOR.$NDPI_MINOR.$NDPI_PATCH" NDPI_VERSION_SHORT="$NDPI_MAJOR.$NDPI_MINOR.$NDPI_PATCH"
+1
View File
@@ -935,6 +935,7 @@ extern "C" {
u_int32_t ndpi_serializer_get_buffer_len(ndpi_serializer *serializer); u_int32_t ndpi_serializer_get_buffer_len(ndpi_serializer *serializer);
u_int32_t ndpi_serializer_get_internal_buffer_size(ndpi_serializer *serializer); u_int32_t ndpi_serializer_get_internal_buffer_size(ndpi_serializer *serializer);
int ndpi_serializer_set_buffer_len(ndpi_serializer *serializer, u_int32_t l); int ndpi_serializer_set_buffer_len(ndpi_serializer *serializer, u_int32_t l);
ndpi_serialization_format ndpi_serializer_get_format(ndpi_serializer *serializer);
void ndpi_serializer_set_csv_separator(ndpi_serializer *serializer, char separator); void ndpi_serializer_set_csv_separator(ndpi_serializer *serializer, char separator);
void ndpi_serializer_create_snapshot(ndpi_serializer *serializer); void ndpi_serializer_create_snapshot(ndpi_serializer *serializer);
+1 -1
View File
@@ -132,7 +132,7 @@ extern "C" {
u_int16_t** tcp_master_proto, u_int16_t** tcp_master_proto,
u_int16_t** udp_master_proto); u_int16_t** udp_master_proto);
#/* NDPI_PROTOCOL_NETBIOS */ #/* NDPI_PROTOCOL_NETBIOS */
int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len); int ndpi_netbios_name_interpret(char *in, size_t inlen, char *out, u_int out_len);
#ifdef NDPI_ENABLE_DEBUG_MESSAGES #ifdef NDPI_ENABLE_DEBUG_MESSAGES
void ndpi_debug_get_last_log_function_line(struct ndpi_detection_module_struct *ndpi_struct, void ndpi_debug_get_last_log_function_line(struct ndpi_detection_module_struct *ndpi_struct,
+6 -4
View File
@@ -1446,10 +1446,12 @@ typedef enum {
#define NDPI_SERIALIZER_DEFAULT_BUFFER_SIZE 8192 #define NDPI_SERIALIZER_DEFAULT_BUFFER_SIZE 8192
#define NDPI_SERIALIZER_DEFAULT_BUFFER_INCR 1024 #define NDPI_SERIALIZER_DEFAULT_BUFFER_INCR 1024
#define NDPI_SERIALIZER_STATUS_COMMA (1 << 0) #define NDPI_SERIALIZER_STATUS_COMMA (1 << 0)
#define NDPI_SERIALIZER_STATUS_ARRAY (1 << 1) #define NDPI_SERIALIZER_STATUS_ARRAY (1 << 1)
#define NDPI_SERIALIZER_STATUS_EOR (1 << 2) #define NDPI_SERIALIZER_STATUS_EOR (1 << 2)
#define NDPI_SERIALIZER_STATUS_SOB (1 << 3) #define NDPI_SERIALIZER_STATUS_SOB (1 << 3)
#define NDPI_SERIALIZER_STATUS_NOT_EMPTY (1 << 4)
typedef struct { typedef struct {
u_int32_t flags; u_int32_t flags;
+45 -7
View File
@@ -43,6 +43,14 @@
/* ********************************** */ /* ********************************** */
static u_int8_t ndpi_serialize_is_not_empty(ndpi_serializer *_serializer) {
ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
return(((serializer->status.flags & NDPI_SERIALIZER_STATUS_NOT_EMPTY) == NDPI_SERIALIZER_STATUS_NOT_EMPTY) ? 1 : 0);
}
/* ********************************** */
static u_int64_t ndpi_htonll(u_int64_t v) { static u_int64_t ndpi_htonll(u_int64_t v) {
union { u_int32_t lv[2]; u_int64_t llv; } u; union { u_int32_t lv[2]; u_int64_t llv; } u;
@@ -237,6 +245,13 @@ int ndpi_serializer_set_buffer_len(ndpi_serializer *_serializer, u_int32_t l) {
/* ********************************** */ /* ********************************** */
ndpi_serialization_format ndpi_serializer_get_format(ndpi_serializer *_serializer) {
ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
return serializer->fmt;
}
/* ********************************** */
void ndpi_serializer_set_csv_separator(ndpi_serializer *_serializer, char separator) { void ndpi_serializer_set_csv_separator(ndpi_serializer *_serializer, char separator) {
ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer; ndpi_private_serializer *serializer = (ndpi_private_serializer*)_serializer;
@@ -442,14 +457,17 @@ int ndpi_serialize_end_of_record(ndpi_serializer *_serializer) {
if(!(serializer->status.flags & NDPI_SERIALIZER_STATUS_ARRAY)) { if(!(serializer->status.flags & NDPI_SERIALIZER_STATUS_ARRAY)) {
serializer->buffer[0] = '['; serializer->buffer[0] = '[';
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used],
buff_diff, "]"); buff_diff, "]");
} }
serializer->status.flags |= NDPI_SERIALIZER_STATUS_ARRAY | NDPI_SERIALIZER_STATUS_EOR; serializer->status.flags |= NDPI_SERIALIZER_STATUS_ARRAY | NDPI_SERIALIZER_STATUS_EOR;
serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_COMMA; serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_COMMA;
} else { } else {
serializer->buffer[serializer->status.size_used++] = ndpi_serialization_end_of_record; serializer->buffer[serializer->status.size_used++] = ndpi_serialization_end_of_record;
} }
serializer->status.flags &= ~NDPI_SERIALIZER_STATUS_NOT_EMPTY;
return(0); return(0);
} }
@@ -556,6 +574,7 @@ int ndpi_serialize_uint32_uint32(ndpi_serializer *_serializer,
serializer->buffer[type_offset] = type; serializer->buffer[type_offset] = type;
} }
serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
return(0); return(0);
} }
@@ -607,6 +626,7 @@ int ndpi_serialize_uint32_uint64(ndpi_serializer *_serializer,
} }
} }
serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
return(0); return(0);
} }
@@ -660,6 +680,7 @@ int ndpi_serialize_uint32_int32(ndpi_serializer *_serializer,
serializer->buffer[type_offset] = type; serializer->buffer[type_offset] = type;
} }
serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
return(0); return(0);
} }
@@ -713,6 +734,7 @@ int ndpi_serialize_uint32_int64(ndpi_serializer *_serializer,
} }
} }
serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
return(0); return(0);
} }
@@ -761,6 +783,7 @@ int ndpi_serialize_uint32_float(ndpi_serializer *_serializer,
serializer->buffer[type_offset] = type; serializer->buffer[type_offset] = type;
} }
serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
return(0); return(0);
} }
@@ -811,6 +834,7 @@ static int ndpi_serialize_uint32_binary(ndpi_serializer *_serializer,
serializer->buffer[type_offset] = type; serializer->buffer[type_offset] = type;
} }
serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
return(0); return(0);
} }
@@ -851,6 +875,7 @@ int ndpi_serialize_uint32_boolean(ndpi_serializer *_serializer,
value ? "true" : "false"); value ? "true" : "false");
} }
serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
return(0); return(0);
} }
@@ -908,6 +933,8 @@ static int ndpi_serialize_binary_int32(ndpi_serializer *_serializer,
} }
} }
serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
return(0); return(0);
} }
@@ -967,6 +994,7 @@ int ndpi_serialize_binary_int64(ndpi_serializer *_serializer,
} }
} }
serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
return(0); return(0);
} }
@@ -1030,6 +1058,7 @@ static int ndpi_serialize_binary_uint32(ndpi_serializer *_serializer,
} }
} }
serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
return(0); return(0);
} }
@@ -1054,8 +1083,12 @@ int ndpi_serialize_string_uint32_format(ndpi_serializer *_serializer,
*/ */
return(ndpi_serialize_string_uint32(_serializer, key, value)); return(ndpi_serialize_string_uint32(_serializer, key, value));
} else } else {
return(ndpi_serialize_string_uint32_format(_serializer, key, value, format)); char buf[16];
snprintf(buf, sizeof(buf), format, value);
return(ndpi_serialize_string_string(_serializer, key, buf));
}
} }
/* ********************************** */ /* ********************************** */
@@ -1107,6 +1140,7 @@ static int ndpi_serialize_binary_uint64(ndpi_serializer *_serializer,
} }
} }
serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
return(0); return(0);
} }
@@ -1170,6 +1204,7 @@ static int ndpi_serialize_binary_float(ndpi_serializer *_serializer,
ndpi_serialize_single_float(serializer, value); ndpi_serialize_single_float(serializer, value);
} }
serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
return(0); return(0);
} }
@@ -1228,8 +1263,8 @@ static int ndpi_serialize_binary_raw(ndpi_serializer *_serializer,
ndpi_serialize_json_post(_serializer); ndpi_serialize_json_post(_serializer);
} else if(serializer->fmt == ndpi_serialization_format_csv) { } else if(serializer->fmt == ndpi_serialization_format_csv) {
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff, serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
"%s%s", (serializer->status.size_used > 0) ? serializer->csv_separator : "", "%s%s", ndpi_serialize_is_not_empty(_serializer) ? serializer->csv_separator : "",
value); value);
} else { } else {
serializer->buffer[serializer->status.size_used++] = (ndpi_serialization_string << 4) | ndpi_serialization_string; serializer->buffer[serializer->status.size_used++] = (ndpi_serialization_string << 4) | ndpi_serialization_string;
@@ -1237,6 +1272,7 @@ static int ndpi_serialize_binary_raw(ndpi_serializer *_serializer,
ndpi_serialize_single_string(serializer, value, vlen); ndpi_serialize_single_string(serializer, value, vlen);
} }
serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
return(0); return(0);
} }
@@ -1270,7 +1306,8 @@ int ndpi_serialize_string_binary(ndpi_serializer *_serializer,
/* Key is a string, value is a string (strlen is used to compute the len) */ /* Key is a string, value is a string (strlen is used to compute the len) */
int ndpi_serialize_string_string(ndpi_serializer *_serializer, int ndpi_serialize_string_string(ndpi_serializer *_serializer,
const char *key, const char *_value) { const char *key, const char *_value) {
return(ndpi_serialize_binary_binary(_serializer, key, strlen(key), _value, strlen(_value))); const char *value = _value ? _value : "";
return(ndpi_serialize_binary_binary(_serializer, key, strlen(key), value, strlen(value)));
} }
/* ********************************** */ /* ********************************** */
@@ -1315,10 +1352,11 @@ int ndpi_serialize_string_boolean(ndpi_serializer *_serializer,
ndpi_serialize_json_post(_serializer); ndpi_serialize_json_post(_serializer);
} else if(serializer->fmt == ndpi_serialization_format_csv) { } else if(serializer->fmt == ndpi_serialization_format_csv) {
serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff, serializer->status.size_used += snprintf((char *) &serializer->buffer[serializer->status.size_used], buff_diff,
"%s%s", (serializer->status.size_used > 0) ? serializer->csv_separator : "", "%s%s", ndpi_serialize_is_not_empty(_serializer) ? serializer->csv_separator : "",
value ? "true" : "false"); value ? "true" : "false");
} }
serializer->status.flags |= NDPI_SERIALIZER_STATUS_NOT_EMPTY;
return(0); return(0);
} }
+2 -1
View File
@@ -185,7 +185,8 @@ void ndpi_search_kerberos(struct ndpi_detection_module_struct *ndpi_struct,
body_offset = koffsetp + 1 + pad_len; body_offset = koffsetp + 1 + pad_len;
for(i=0; i<10; i++) if(packet->payload[body_offset] != 0x05) body_offset++; /* ASN.1 */ for(i=0; i<10 && body_offset < packet->payload_packet_len; i++)
if(packet->payload[body_offset] != 0x05) body_offset++; /* ASN.1 */
#ifdef KERBEROS_DEBUG #ifdef KERBEROS_DEBUG
printf("body_offset=%u [%02X %02X] [byte 0 must be 0x05]\n", body_offset, packet->payload[body_offset], packet->payload[body_offset+1]); printf("body_offset=%u [%02X %02X] [byte 0 must be 0x05]\n", body_offset, packet->payload[body_offset], packet->payload[body_offset+1]);
#endif #endif
+7 -8
View File
@@ -35,17 +35,17 @@ struct netbios_header {
}; };
/* The function below has been inherited by tcpdump */ /* The function below has been inherited by tcpdump */
int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) { int ndpi_netbios_name_interpret(char *in, size_t inlen, char *out, u_int out_len) {
int ret = 0, len; int ret = 0, len;
char *b; char *b;
len = (*in++)/2; len = (*in++)/2;
b = out; b = out;
*out = 0; *out = 0;
if(len > (out_len-1) || len < 1) if(len > (out_len-1) || len < 1 || 2*len > inlen)
return(-1); return(-1);
while (len--) { while (len--) {
if(in[0] < 'A' || in[0] > 'P' || in[1] < 'A' || in[1] > 'P') { if(in[0] < 'A' || in[0] > 'P' || in[1] < 'A' || in[1] > 'P') {
*out = 0; *out = 0;
@@ -53,7 +53,7 @@ int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) {
} }
*out = ((in[0]-'A')<<4) + (in[1]-'A'); *out = ((in[0]-'A')<<4) + (in[1]-'A');
in += 2; in += 2;
if(isprint(*out)) if(isprint(*out))
@@ -69,13 +69,12 @@ int ndpi_netbios_name_interpret(char *in, char *out, u_int out_len) {
return(ret); return(ret);
} }
static void ndpi_int_netbios_add_connection(struct ndpi_detection_module_struct static void ndpi_int_netbios_add_connection(struct ndpi_detection_module_struct
*ndpi_struct, struct ndpi_flow_struct *flow) { *ndpi_struct, struct ndpi_flow_struct *flow) {
char name[64]; char name[64];
u_int off = flow->packet.payload[12] == 0x20 ? 12 : 14; u_int off = flow->packet.payload[12] == 0x20 ? 12 : 14;
if(ndpi_netbios_name_interpret((char*)&flow->packet.payload[off], name, sizeof(name)) > 0) if(ndpi_netbios_name_interpret((char*)&flow->packet.payload[off], flow->packet.payload_packet_len - off, name, sizeof(name)) > 0)
snprintf((char*)flow->host_server_name, sizeof(flow->host_server_name)-1, "%s", name); snprintf((char*)flow->host_server_name, sizeof(flow->host_server_name)-1, "%s", name);
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_NETBIOS, NDPI_PROTOCOL_UNKNOWN); ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_NETBIOS, NDPI_PROTOCOL_UNKNOWN);
+1 -1
View File
@@ -294,7 +294,7 @@ static void ndpi_search_ssh_tcp(struct ndpi_detection_module_struct *ndpi_struct
ndpi_MD5_CTX ctx; ndpi_MD5_CTX ctx;
if(msgcode == 20 /* key exchange init */) { if(msgcode == 20 /* key exchange init */) {
char *hassh_buf = calloc(packet->payload_packet_len, sizeof(char)); char *hassh_buf = ndpi_calloc(packet->payload_packet_len, sizeof(char));
u_int i, len; u_int i, len;
#ifdef SSH_DEBUG #ifdef SSH_DEBUG