Merge remote-tracking branch 'remotes/iot/dev' into dev

Conflicts:
	src/include/ndpi_protocol_ids.h
	src/lib/ndpi_main.c
This commit is contained in:
Sorin Zamfir
2016-03-20 11:53:27 +02:00
committed by Sorin Zamfir
8 changed files with 370 additions and 4 deletions
+1 -1
View File
@@ -113,7 +113,7 @@ static u_int8_t undetected_flows_deleted = 0;
/**
* User preferences
*/
static u_int8_t enable_protocol_guess = 1, verbose = 0, nDPI_traceLevel = 0, json_flag = 0;
static u_int8_t enable_protocol_guess = 1, verbose = 0, nDPI_traceLevel = 2, json_flag = 0;
static u_int16_t decode_tunnels = 0;
static u_int16_t num_loops = 1;
static u_int8_t shutdown_app = 0, quiet_mode = 0;