Fix a warning and restore a unit test result (#2379)

3 files changed, 43 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
index 17b2a63d9..170c2923c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,7 +70,7 @@
 /fuzz/fuzz_ds_ptree
 /fuzz/fuzz_ds_hash
 /fuzz/fuzz_ds_ahocorasick
-/fuzz/fuzz_ds_bitmap64
+/fuzz/fuzz_ds_bitmap64_fuse
 /fuzz/fuzz_ds_domain_classify
 /fuzz/fuzz_libinjection
 /fuzz/fuzz_binaryfusefilter
@@ -108,7 +108,7 @@
 /fuzz/fuzz_alg_bytestream_seed_corpus.zip
 /fuzz/fuzz_ds_libcache_seed_corpus.zip
 /fuzz/fuzz_ds_ptree_seed_corpus.zip
-/fuzz/fuzz_ds_bitmap64_seed_corpus.zip
+/fuzz/fuzz_ds_bitmap64_fuse_seed_corpus.zip
 /fuzz/fuzz_ds_domain_classify_seed_corpus.zip
 /fuzz/fuzz_libinjection_seed_corpus.zip
 /fuzz/fuzz_tls_certificate_seed_corpus.zip
diff --git a/src/lib/protocols/http.c b/src/lib/protocols/http.c
index 8d5d92f3e..38c1a698c 100644
--- a/src/lib/protocols/http.c
+++ b/src/lib/protocols/http.c
@@ -65,8 +65,7 @@ static char* forge_attempt_msg(struct ndpi_flow_struct *flow, char *msg, char *b
 
 /* *********************************************** */
 
-static void ndpi_set_binary_data_transfer(struct ndpi_detection_module_struct *ndpi_struct,
-					  struct ndpi_flow_struct *flow,
+static void ndpi_set_binary_data_transfer(struct ndpi_flow_struct *flow,
 					  char *msg) {
   char buf[256];
   
@@ -284,7 +283,7 @@ static ndpi_protocol_category_t ndpi_http_check_content(struct ndpi_detection_mo
 		NDPI_LOG_INFO(ndpi_struct, "found HTTP file transfer");
 
 		snprintf(str, sizeof(str), "Found binary mime %s", cmp_mimes[i]);
-		ndpi_set_binary_data_transfer(ndpi_struct, flow, str);
+		ndpi_set_binary_data_transfer(flow, str);
 		found = true;
 		break;
 	      }
@@ -382,7 +381,7 @@ static ndpi_protocol_category_t ndpi_http_check_content(struct ndpi_detection_mo
 	    /* No executable but just data transfer */
 	    snprintf(str, sizeof(str), "File download %s",
 		     flow->http.filename ? flow->http.filename : "");
-	    ndpi_set_binary_data_transfer(ndpi_struct, flow, str);
+	    ndpi_set_binary_data_transfer(flow, str);
 	  }
 	}
       }
diff --git a/tests/cfgs/default/result/ftp.pcap.out b/tests/cfgs/default/result/ftp.pcap.out
new file mode 100644
index 000000000..18c82eef4
--- /dev/null
+++ b/tests/cfgs/default/result/ftp.pcap.out
@@ -0,0 +1,38 @@
+DPI Packets (TCP):	39	(13.00 pkts/flow)
+Confidence Unknown          : 1 (flows)
+Confidence DPI              : 2 (flows)
+Num dissector calls: 541 (180.33 diss/flow)
+LRU cache ookla:      0/0/0 (insert/search/found)
+LRU cache bittorrent: 0/3/0 (insert/search/found)
+LRU cache zoom:       0/0/0 (insert/search/found)
+LRU cache stun:       0/0/0 (insert/search/found)
+LRU cache tls_cert:   0/0/0 (insert/search/found)
+LRU cache mining:     0/1/0 (insert/search/found)
+LRU cache msteams:    0/0/0 (insert/search/found)
+LRU cache stun_zoom:  0/0/0 (insert/search/found)
+Automa host:          0/0 (search/found)
+Automa domain:        0/0 (search/found)
+Automa tls cert:      0/0 (search/found)
+Automa risk mask:     0/0 (search/found)
+Automa common alpns:  0/0 (search/found)
+Patricia risk mask:   2/0 (search/found)
+Patricia risk mask IPv6: 0/0 (search/found)
+Patricia risk:        0/0 (search/found)
+Patricia risk IPv6:   0/0 (search/found)
+Patricia protocols:   6/0 (search/found)
+Patricia protocols IPv6: 0/0 (search/found)
+
+Unknown	132	118184	1
+FTP_CONTROL	68	5571	1
+FTP_DATA	9	1819	1
+
+Acceptable                       9 1819          1            
+Unsafe                          68 5571          1            
+Unrated                        132 118184        1            
+
+	1	TCP 192.168.1.212:50694 <-> 90.130.70.73:21 [proto: 1/FTP_CONTROL][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 12][cat: Download/7][41 pkts/2892 bytes <-> 27 pkts/2679 bytes][Goodput ratio: 6/33][8.48 sec][User: anonymous][Pwd: NcFTP@][bytes ratio: 0.038 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/0 236/108 4743/1377 849/305][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 71/99 96/307 7/45][Risk: ** Unsafe Protocol **** Clear-Text Credentials **][Risk Score: 110][Risk Info: Found FTP username (anonymous)][PLAIN TEXT (vsFTPd 3.0.3)][Plen Bins: 74,18,5,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+	2	TCP 192.168.1.212:50695 <-> 90.130.70.73:25685 [proto: 175/FTP_DATA][IP: 0/Unknown][ClearText][Confidence: DPI][DPI packets: 4][cat: Download/7][5 pkts/342 bytes <-> 4 pkts/1477 bytes][Goodput ratio: 0/82][0.09 sec][bytes ratio: -0.624 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/28 14/28 29/29 14/0][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 68/369 78/1271 5/521][PLAIN TEXT (    1 0        0        1073741)][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0]
+
+
+Undetected flows:
+	1	TCP 192.168.1.212:50696 <-> 90.130.70.73:24523 [proto: 0/Unknown][IP: 0/Unknown][ClearText][Confidence: Unknown][DPI packets: 23][54 pkts/3588 bytes <-> 78 pkts/114596 bytes][Goodput ratio: 0/95][0.15 sec][bytes ratio: -0.939 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 2/1 29/29 6/4][Pkt Len c2s/s2c min/avg/max/stddev: 66/66 66/1469 78/1506 2/227][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0]