Merge branch 'pavlosantoniou-dev' into dev

This commit is contained in:
Campus
2017-06-07 11:27:37 +02:00
2 changed files with 0 additions and 3 deletions
-1
View File
@@ -1288,7 +1288,6 @@ static int getTopStats(struct top_stats **topStats, struct port_stats *stats, u_
struct top_stats *s;
struct port_stats *sp, *tmp;
struct info_pair inf;
float pkt_burst;
u_int64_t total_ip_addrs = 0;
/* stats are ordered by packet number */
-2
View File
@@ -29,8 +29,6 @@ static void ndpi_check_tinc(struct ndpi_detection_module_struct *ndpi_struct, st
struct ndpi_packet_struct *packet = &flow->packet;
const u_int8_t *packet_payload = packet->payload;
u_int32_t payload_len = packet->payload_packet_len;
struct ndpi_id_struct *src = flow->src;
struct ndpi_id_struct *dst = flow->dst;
if(packet->udp != NULL) {
if(ndpi_struct->tinc_cache != NULL) {