Improved IPSec/ISAKMP detection. (#1600)

Signed-off-by: lns <matzeton@googlemail.com>

6 files changed, 48 insertions, 19 deletions

diff --git a/tests/pcap/ipsec_isakmp_esp.pcap b/tests/pcap/ipsec_isakmp_esp.pcap
new file mode 100644
index 000000000..6b60581ac
--- /dev/null
+++ b/tests/pcap/ipsec_isakmp_esp.pcap
diff --git a/tests/result/ah.pcapng.out b/tests/result/ah.pcapng.out
index 389483df8..0f0302951 100644
--- a/tests/result/ah.pcapng.out
+++ b/tests/result/ah.pcapng.out
@@ -1,11 +1,10 @@
-Guessed flow protos:	1
+Guessed flow protos:	0
 
-DPI Packets (UDP):	4	(4.00 pkts/flow)
+DPI Packets (UDP):	1	(1.00 pkts/flow)
 DPI Packets (other):	1	(1.00 pkts/flow)
-Confidence Match by port    : 1 (flows)
-Confidence DPI              : 1 (flows)
+Confidence DPI              : 2 (flows)
 
-IPsec	6	1768	2
+IPSec	6	1768	2
 
-	1	UDP 10.2.3.2:500 <-> 10.3.4.4:500 [proto: 79/IPsec][Encrypted][Confidence: Match by port][cat: VPN/2][2 pkts/770 bytes <-> 2 pkts/722 bytes][Goodput ratio: 89/88][0.02 sec][PLAIN TEXT (DELETE)][Plen Bins: 0,0,0,0,0,0,0,0,25,0,25,50,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	51 10.2.3.2:0 <-> 10.3.4.4:0 [proto: 79/IPsec][Encrypted][Confidence: DPI][cat: VPN/2][1 pkts/138 bytes <-> 1 pkts/138 bytes][Goodput ratio: 0/0][< 1 sec][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,0,0,0]
+	1	UDP 10.2.3.2:500 <-> 10.3.4.4:500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][2 pkts/770 bytes <-> 2 pkts/722 bytes][Goodput ratio: 89/88][0.02 sec][PLAIN TEXT (DELETE)][Plen Bins: 0,0,0,0,0,0,0,0,25,0,25,50,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	51 10.2.3.2:0 <-> 10.3.4.4:0 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][1 pkts/138 bytes <-> 1 pkts/138 bytes][Goodput ratio: 0/0][< 1 sec][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,0,0,0]
diff --git a/tests/result/esp.pcapng.out b/tests/result/esp.pcapng.out
index 0ad744457..f846df506 100644
--- a/tests/result/esp.pcapng.out
+++ b/tests/result/esp.pcapng.out
@@ -1,11 +1,10 @@
-Guessed flow protos:	1
+Guessed flow protos:	0
 
-DPI Packets (UDP):	4	(4.00 pkts/flow)
+DPI Packets (UDP):	1	(1.00 pkts/flow)
 DPI Packets (other):	1	(1.00 pkts/flow)
-Confidence Match by port    : 1 (flows)
-Confidence DPI              : 1 (flows)
+Confidence DPI              : 2 (flows)
 
-IPsec	6	1856	2
+IPSec	6	1856	2
 
-	1	UDP 10.2.3.2:500 <-> 10.3.4.4:500 [proto: 79/IPsec][Encrypted][Confidence: Match by port][cat: VPN/2][2 pkts/786 bytes <-> 2 pkts/738 bytes][Goodput ratio: 89/88][0.02 sec][PLAIN TEXT (DELETE)][Plen Bins: 0,0,0,0,0,0,0,0,0,25,25,50,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	50 10.2.3.2:0 <-> 10.3.4.4:0 [proto: 79/IPsec][Encrypted][Confidence: DPI][cat: VPN/2][1 pkts/166 bytes <-> 1 pkts/166 bytes][Goodput ratio: 0/0][0.00 sec][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,0,0,0]
+	1	UDP 10.2.3.2:500 <-> 10.3.4.4:500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][2 pkts/786 bytes <-> 2 pkts/738 bytes][Goodput ratio: 89/88][0.02 sec][PLAIN TEXT (DELETE)][Plen Bins: 0,0,0,0,0,0,0,0,0,25,25,50,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	50 10.2.3.2:0 <-> 10.3.4.4:0 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][1 pkts/166 bytes <-> 1 pkts/166 bytes][Goodput ratio: 0/0][0.00 sec][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,0,0,0]
diff --git a/tests/result/ipsec_isakmp_esp.pcap.out b/tests/result/ipsec_isakmp_esp.pcap.out
new file mode 100644
index 000000000..930c3b931
--- /dev/null
+++ b/tests/result/ipsec_isakmp_esp.pcap.out
@@ -0,0 +1,31 @@
+Guessed flow protos:	0
+
+DPI Packets (UDP):	24	(1.00 pkts/flow)
+Confidence DPI              : 24 (flows)
+
+IPSec	1080	580682	24
+
+	1	UDP 192.168.2.100:14500 <-> 109.237.187.227:4500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][133 pkts/90074 bytes <-> 158 pkts/61560 bytes][Goodput ratio: 94/89][< 1 sec][bytes ratio: 0.188 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/0 224588/183284 12245008/12245090 1295597/1170056][Pkt Len c2s/s2c min/avg/max/stddev: 122/82 677/390 1374/1374 512/393][PLAIN TEXT (@EmPAT)][Plen Bins: 0,0,14,14,24,0,7,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,7,0,0,5,0,0,0,7,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0]
+	2	UDP 192.168.2.100:14500 <-> 109.237.187.130:4500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][37 pkts/23230 bytes <-> 53 pkts/36862 bytes][Goodput ratio: 93/94][< 1 sec][bytes ratio: -0.227 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 51181/32575 761601/761794 163164/132507][Pkt Len c2s/s2c min/avg/max/stddev: 138/122 628/696 1374/1374 489/539][PLAIN TEXT (H.P.RE)][Plen Bins: 0,0,6,13,20,0,6,0,0,0,0,0,0,6,0,0,0,0,1,0,0,0,0,0,0,6,0,0,0,0,0,0,12,0,0,0,0,0,0,0,6,20,0,0,0,0,0,0]
+	3	UDP 192.168.2.100:10500 <-> 109.237.187.227:500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][54 pkts/44820 bytes <-> 53 pkts/11118 bytes][Goodput ratio: 95/80][< 1 sec][bytes ratio: 0.602 (Upload)][IAT c2s/s2c min/avg/max/stddev: 28/27 689892/698588 12245747/12245747 1998175/2019137][Pkt Len c2s/s2c min/avg/max/stddev: 818/94 830/210 842/330 12/118][PLAIN TEXT (rMpKau6)][Plen Bins: 0,25,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+	4	UDP 192.168.2.100:14500 <-> 109.237.187.195:4500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][42 pkts/30020 bytes <-> 48 pkts/21472 bytes][Goodput ratio: 94/91][15275.72 sec][bytes ratio: 0.166 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/0 85008/72283 1429414/1429546 288620/266457][Pkt Len c2s/s2c min/avg/max/stddev: 138/122 715/447 1374/1374 518/432][PLAIN TEXT (@yIwAf)][Plen Bins: 0,0,8,13,26,0,6,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,6,0,4,2,0,0,0,6,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0]
+	5	UDP 192.168.2.100:14500 <-> 109.237.187.193:4500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][43 pkts/32226 bytes <-> 47 pkts/14246 bytes][Goodput ratio: 94/86][18892.62 sec][bytes ratio: 0.387 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 66479/111886632 1521662/4249448008 281113/680210944][Pkt Len c2s/s2c min/avg/max/stddev: 138/122 749/303 1374/1070 516/284][PLAIN TEXT (@7Ac9 )][Plen Bins: 0,0,12,13,27,0,6,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,6,0,0,7,0,0,0,5,0,0,0,0,0,0,0,0,14,0,0,0,0,0,0]
+	6	UDP 192.168.2.100:14500 <-> 109.237.187.225:4500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][34 pkts/24848 bytes <-> 41 pkts/17850 bytes][Goodput ratio: 94/90][11474.04 sec][bytes ratio: 0.164 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 0/0 55649/128438992 1440343/4237012657 276939/726300096][Pkt Len c2s/s2c min/avg/max/stddev: 138/122 731/435 1374/1374 517/426][Risk: ** Malformed Packet **][Risk Score: 10][Risk Info: Invalid IPSec/ISAKMP Header][PLAIN TEXT (17Uv 2)][Plen Bins: 0,0,9,13,26,0,6,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,6,0,4,2,0,0,0,6,0,0,0,0,0,0,0,0,18,0,0,0,0,0,0]
+	7	UDP 192.168.2.100:14500 <-> 109.237.187.194:4500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][22 pkts/15216 bytes <-> 23 pkts/8650 bytes][Goodput ratio: 94/89][13749.36 sec][bytes ratio: 0.275 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 60292/56941 1020541/1007809 240062/230637][Pkt Len c2s/s2c min/avg/max/stddev: 138/122 692/376 1374/1374 518/361][Plen Bins: 0,0,8,13,29,0,6,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,6,0,2,6,0,0,0,4,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0]
+	8	UDP 192.168.2.100:14500 <-> 109.237.187.131:4500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][21 pkts/15042 bytes <-> 24 pkts/7632 bytes][Goodput ratio: 94/87][10912.86 sec][bytes ratio: 0.327 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 27756/24780 439840/418574 106400/93007][Pkt Len c2s/s2c min/avg/max/stddev: 138/122 716/318 1374/1070 518/302][PLAIN TEXT (90dItt)][Plen Bins: 0,0,13,13,27,0,6,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,6,0,0,6,0,0,0,6,0,0,0,0,0,0,0,0,13,0,0,0,0,0,0]
+	9	UDP 192.168.2.100:10500 <-> 109.237.187.195:500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][18 pkts/14940 bytes <-> 18 pkts/3816 bytes][Goodput ratio: 95/80][15261.44 sec][bytes ratio: 0.593 (Upload)][IAT c2s/s2c min/avg/max/stddev: 36/36 192067/306025504 998367/4281859929 327148/1102698112][Pkt Len c2s/s2c min/avg/max/stddev: 818/94 830/212 842/330 12/118][Plen Bins: 0,25,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+	10	UDP 192.168.2.100:10500 <-> 109.237.187.193:500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][16 pkts/13280 bytes <-> 16 pkts/3392 bytes][Goodput ratio: 95/80][18889.28 sec][bytes ratio: 0.593 (Upload)][IAT c2s/s2c min/avg/max/stddev: 39/37 306418/354402720 1523984/4249462086 469614/1174404608][Pkt Len c2s/s2c min/avg/max/stddev: 818/94 830/212 842/330 12/118][Plen Bins: 0,25,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+	11	UDP 192.168.2.100:10500 <-> 109.237.187.130:500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][12 pkts/9960 bytes <-> 12 pkts/2544 bytes][Goodput ratio: 95/80][< 1 sec][bytes ratio: 0.593 (Upload)][IAT c2s/s2c min/avg/max/stddev: 35/35 252278/252277 1325428/1325428 408560/408559][Pkt Len c2s/s2c min/avg/max/stddev: 818/94 830/212 842/330 12/118][Plen Bins: 0,25,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+	12	UDP 192.168.2.100:10500 <-> 109.237.187.225:500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][10 pkts/8300 bytes <-> 10 pkts/2120 bytes][Goodput ratio: 95/80][11474.15 sec][bytes ratio: 0.593 (Upload)][IAT c2s/s2c min/avg/max/stddev: 31/32 6872697/535642016 45333681/4237027358 15713330/1399069440][Pkt Len c2s/s2c min/avg/max/stddev: 818/94 830/212 842/330 12/118][Plen Bins: 0,25,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+	13	UDP 192.168.2.100:42593 <-> 109.237.187.193:4500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][6 pkts/3464 bytes <-> 9 pkts/5922 bytes][Goodput ratio: 93/94][< 1 sec][bytes ratio: -0.262 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 486/359 1429/1442 536/526][Pkt Len c2s/s2c min/avg/max/stddev: 138/122 577/658 1198/1198 452/478][Plen Bins: 0,0,6,13,13,0,6,0,6,0,0,0,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,0,34,0,0,0,0,0,0,0,0,0,0,0]
+	14	UDP 192.168.2.100:43811 <-> 109.237.187.193:4500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][6 pkts/3480 bytes <-> 9 pkts/5778 bytes][Goodput ratio: 93/93][2.75 sec][bytes ratio: -0.248 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 512/366 1540/1553 591/565][Pkt Len c2s/s2c min/avg/max/stddev: 138/122 580/642 1150/1150 421/460][PLAIN TEXT ( GZFVi)][Plen Bins: 0,0,6,13,13,0,6,0,0,0,0,6,0,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0]
+	15	UDP 192.168.2.100:10500 <-> 109.237.187.194:500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][8 pkts/6640 bytes <-> 8 pkts/1696 bytes][Goodput ratio: 95/80][13749.45 sec][bytes ratio: 0.593 (Upload)][IAT c2s/s2c min/avg/max/stddev: 37/37 224522/713469824 1021965/4279696240 400616/1594865024][Pkt Len c2s/s2c min/avg/max/stddev: 818/94 830/212 842/330 12/118][Plen Bins: 0,25,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+	16	UDP 192.168.2.100:14500 <-> 109.237.187.129:4500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][7 pkts/5014 bytes <-> 8 pkts/2544 bytes][Goodput ratio: 94/87][14.86 sec][bytes ratio: 0.327 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 292/2460 676/13183 264/4802][Pkt Len c2s/s2c min/avg/max/stddev: 138/122 716/318 1374/1070 518/302][PLAIN TEXT (OSfrCu Y)][Plen Bins: 0,0,13,13,27,0,6,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,6,0,0,6,0,0,0,6,0,0,0,0,0,0,0,0,13,0,0,0,0,0,0]
+	17	UDP 192.168.2.100:14500 <-> 109.237.187.226:4500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][7 pkts/5014 bytes <-> 8 pkts/2544 bytes][Goodput ratio: 94/87][< 1 sec][bytes ratio: 0.327 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/16 251/2354 683/12812 252/4684][Pkt Len c2s/s2c min/avg/max/stddev: 138/122 716/318 1374/1070 518/302][PLAIN TEXT (LpIBBE)][Plen Bins: 0,0,13,13,27,0,6,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,6,0,0,6,0,0,0,6,0,0,0,0,0,0,0,0,13,0,0,0,0,0,0]
+	18	UDP 192.168.2.100:41618 <-> 109.237.187.194:4500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][7 pkts/3670 bytes <-> 8 pkts/3652 bytes][Goodput ratio: 92/91][< 1 sec][bytes ratio: 0.002 (Mixed)][IAT c2s/s2c min/avg/max/stddev: 1/0 659/558 2402/2418 908/871][Pkt Len c2s/s2c min/avg/max/stddev: 138/122 524/456 1150/1150 415/408][Plen Bins: 0,0,6,13,27,0,6,0,0,0,0,0,6,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,0,0,0,0,0,0,0,0,0,0,0,0,0]
+	19	UDP 192.168.2.100:10500 <-> 109.237.187.131:500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][6 pkts/4980 bytes <-> 6 pkts/1272 bytes][Goodput ratio: 95/80][10912.94 sec][bytes ratio: 0.593 (Upload)][IAT c2s/s2c min/avg/max/stddev: 34/35 147192/1059489472 441504/4237516419 208110/1834834688][Pkt Len c2s/s2c min/avg/max/stddev: 818/94 830/212 842/330 12/118][Risk: ** Malformed Packet **][Risk Score: 10][Risk Info: Invalid IPSec/ISAKMP Header][Plen Bins: 0,25,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+	20	UDP 192.168.2.100:41618 <-> 109.237.187.194:500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][4 pkts/1816 bytes <-> 4 pkts/726 bytes][Goodput ratio: 91/77][< 1 sec][bytes ratio: 0.429 (Upload)][IAT c2s/s2c min/avg/max/stddev: 35/37 59/60 104/104 32/31][Pkt Len c2s/s2c min/avg/max/stddev: 378/80 454/182 530/458 65/160][Plen Bins: 0,38,0,0,0,0,0,0,0,0,12,12,0,12,12,12,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]
+	21	UDP 192.168.2.100:42593 <-> 109.237.187.193:500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][4 pkts/1816 bytes <-> 4 pkts/726 bytes][Goodput ratio: 91/77][< 1 sec][bytes ratio: 0.429 (Upload)][IAT c2s/s2c min/avg/max/stddev: 37/36 98/99 135/138 44/45][Pkt Len c2s/s2c min/avg/max/stddev: 378/80 454/182 530/458 65/160][Plen Bins: 0,38,0,0,0,0,0,0,0,0,12,12,0,12,12,12,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]
+	22	UDP 192.168.2.100:43811 <-> 109.237.187.193:500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][4 pkts/1816 bytes <-> 4 pkts/726 bytes][Goodput ratio: 91/77][< 1 sec][bytes ratio: 0.429 (Upload)][IAT c2s/s2c min/avg/max/stddev: 42/46 125/126 180/179 60/57][Pkt Len c2s/s2c min/avg/max/stddev: 378/80 454/182 530/458 65/160][Plen Bins: 0,38,0,0,0,0,0,0,0,0,12,12,0,12,12,12,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]
+	23	UDP 192.168.2.100:10500 <-> 109.237.187.129:500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][2 pkts/1660 bytes <-> 2 pkts/424 bytes][Goodput ratio: 95/80][0.06 sec][Plen Bins: 0,25,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
+	24	UDP 192.168.2.100:10500 <-> 109.237.187.226:500 [proto: 79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][2 pkts/1660 bytes <-> 2 pkts/424 bytes][Goodput ratio: 95/80][< 1 sec][Plen Bins: 0,25,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
diff --git a/tests/result/ipv6_in_gtp.pcap.out b/tests/result/ipv6_in_gtp.pcap.out
index 6d2ffca79..19c585f37 100644
--- a/tests/result/ipv6_in_gtp.pcap.out
+++ b/tests/result/ipv6_in_gtp.pcap.out
@@ -4,8 +4,8 @@ DPI Packets (UDP):	1	(1.00 pkts/flow)
 DPI Packets (other):	1	(1.00 pkts/flow)
 Confidence DPI              : 2 (flows)
 
-IPsec	1	166	1
+IPSec	1	166	1
 RTP	1	150	1
 
-	1	50 [2a01:4c8:c014:144e:1:2:945b:6761]:0 -> [2a01:4c8:f000:f49::4]:0 [VLAN: 2][proto: GTP:79/IPsec][Encrypted][Confidence: DPI][cat: VPN/2][1 pkts/166 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][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,0,0,0]
+	1	50 [2a01:4c8:c014:144e:1:2:945b:6761]:0 -> [2a01:4c8:f000:f49::4]:0 [VLAN: 2][proto: GTP:79/IPSec][Encrypted][Confidence: DPI][cat: VPN/2][1 pkts/166 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][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,0,0,0]
 	2	UDP [2607:fc20:4052:39e:490a:ea4d:17fe:e09c]:49120 -> [fd00:976a:bc67:193e::7]:25658 [VLAN: 5][proto: GTP:87/RTP][ClearText][Confidence: DPI][cat: Media/1][1 pkts/150 bytes -> 0 pkts/0 bytes][Goodput ratio: 29/0][< 1 sec][Plen Bins: 0,100,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,0]
diff --git a/tests/result/synscan.pcap.out b/tests/result/synscan.pcap.out
index 6edf5cdac..b0061fcd2 100644
--- a/tests/result/synscan.pcap.out
+++ b/tests/result/synscan.pcap.out
@@ -26,7 +26,7 @@ Mining	2	116	2
 RTSP	2	116	2
 IMAPS	2	116	2
 Telnet	2	116	2
-IPsec	2	116	2
+IPSec	2	116	2
 OSPF	2	116	2
 RDP	2	116	2
 VNC	6	348	6
@@ -78,7 +78,7 @@ iSCSI	2	116	2
 	17	TCP 172.16.0.8:36050 -> 64.13.134.52:443 [proto: 91/TLS][Encrypted][Confidence: Match by port][cat: Web/5][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][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,0,0,0]
 	18	TCP 172.16.0.8:36050 -> 64.13.134.52:445 [proto: 41/SMBv23][ClearText][Confidence: Match by port][cat: System/18][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][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,0,0,0]
 	19	TCP 172.16.0.8:36050 -> 64.13.134.52:465 [proto: 29/SMTPS][Encrypted][Confidence: Match by port][cat: Email/3][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][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,0,0,0]
-	20	TCP 172.16.0.8:36050 -> 64.13.134.52:500 [proto: 79/IPsec][Encrypted][Confidence: Match by port][cat: VPN/2][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][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,0,0,0]
+	20	TCP 172.16.0.8:36050 -> 64.13.134.52:500 [proto: 79/IPSec][Encrypted][Confidence: Match by port][cat: VPN/2][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][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,0,0,0]
 	21	TCP 172.16.0.8:36050 -> 64.13.134.52:514 [proto: 294/RSH][ClearText][Confidence: Match by port][cat: RemoteAccess/12][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Unsafe Protocol **][Risk Score: 10][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,0,0,0]
 	22	TCP 172.16.0.8:36050 -> 64.13.134.52:548 [proto: 97/AFP][ClearText][Confidence: Match by port][cat: DataTransfer/4][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][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,0,0,0]
 	23	TCP 172.16.0.8:36050 -> 64.13.134.52:554 [proto: 50/RTSP][ClearText][Confidence: Match by port][cat: Media/1][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][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,0,0,0]
@@ -139,7 +139,7 @@ iSCSI	2	116	2
 	78	TCP 172.16.0.8:36051 -> 64.13.134.52:443 [proto: 91/TLS][Encrypted][Confidence: Match by port][cat: Web/5][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][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,0,0,0]
 	79	TCP 172.16.0.8:36051 -> 64.13.134.52:445 [proto: 41/SMBv23][ClearText][Confidence: Match by port][cat: System/18][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][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,0,0,0]
 	80	TCP 172.16.0.8:36051 -> 64.13.134.52:465 [proto: 29/SMTPS][Encrypted][Confidence: Match by port][cat: Email/3][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][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,0,0,0]
-	81	TCP 172.16.0.8:36051 -> 64.13.134.52:500 [proto: 79/IPsec][Encrypted][Confidence: Match by port][cat: VPN/2][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][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,0,0,0]
+	81	TCP 172.16.0.8:36051 -> 64.13.134.52:500 [proto: 79/IPSec][Encrypted][Confidence: Match by port][cat: VPN/2][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][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,0,0,0]
 	82	TCP 172.16.0.8:36051 -> 64.13.134.52:514 [proto: 294/RSH][ClearText][Confidence: Match by port][cat: RemoteAccess/12][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][Risk: ** Unsafe Protocol **][Risk Score: 10][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,0,0,0]
 	83	TCP 172.16.0.8:36051 -> 64.13.134.52:548 [proto: 97/AFP][ClearText][Confidence: Match by port][cat: DataTransfer/4][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][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,0,0,0]
 	84	TCP 172.16.0.8:36051 -> 64.13.134.52:554 [proto: 50/RTSP][ClearText][Confidence: Match by port][cat: Media/1][1 pkts/58 bytes -> 0 pkts/0 bytes][Goodput ratio: 0/0][< 1 sec][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,0,0,0]