bump libnDPI to 2b230e28e0612e8654ad617534deb9aaaabd51b7

 * fixes loading of gambling lists which increased nDPId's memory usage *a lot*
 * nDPId: handle EINTR correctly

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

1 files changed, 71 insertions, 0 deletions

diff --git a/test/results/flow-info/default/zabbix.pcap.out b/test/results/flow-info/default/zabbix.pcap.out
index f6709f6e1..c22da72c8 100644
--- a/test/results/flow-info/default/zabbix.pcap.out
+++ b/test/results/flow-info/default/zabbix.pcap.out
@@ -3,5 +3,76 @@
      DAEMON-EVENT: [Flows][active: 0 / 0|skipped: 0|!detected: 0|guessed: 0|detection-updates: 0|updates: 0]
               new: [.....1] [ip4][..tcp] [..192.168.67.98][57162] -> [..192.168.67.25][10050] 
          detected: [.....1] [ip4][..tcp] [..192.168.67.98][57162] -> [..192.168.67.25][10050] [Zabbix][Unknown][Network][Acceptable]
+     DAEMON-EVENT: [Processed: 10 pkts][ZLib][compressions: 0|diff: 0 / 0]
+     DAEMON-EVENT: [Flows][active: 1 / 1|skipped: 0|!detected: 0|guessed: 0|detection-updates: 0|updates: 0]
+              new: [.....2] [ip4][..tcp] [...192.168.7.16][36699] -> [...192.168.7.17][10051] 
+         detected: [.....2] [ip4][..tcp] [...192.168.7.16][36699] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [.....3] [ip4][..tcp] [...192.168.7.16][54089] -> [...192.168.7.17][10051] 
+         detected: [.....3] [ip4][..tcp] [...192.168.7.16][54089] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [.....4] [ip4][..tcp] [...192.168.7.16][37781] -> [...192.168.7.17][10051] 
+         detected: [.....4] [ip4][..tcp] [...192.168.7.16][37781] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
               end: [.....1] [ip4][..tcp] [..192.168.67.98][57162] -> [..192.168.67.25][10050] [Zabbix][Unknown][Network][Acceptable]
+              new: [.....5] [ip4][..tcp] [...192.168.7.16][58079] -> [...192.168.7.17][10051] 
+         detected: [.....5] [ip4][..tcp] [...192.168.7.16][58079] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [.....6] [ip4][..tcp] [...192.168.7.16][33661] -> [...192.168.7.17][10051] 
+         detected: [.....6] [ip4][..tcp] [...192.168.7.16][33661] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [.....7] [ip4][..tcp] [...192.168.7.16][40553] -> [...192.168.7.17][10051] 
+         detected: [.....7] [ip4][..tcp] [...192.168.7.16][40553] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [.....8] [ip4][..tcp] [...192.168.7.16][36755] -> [...192.168.7.17][10051] 
+         detected: [.....8] [ip4][..tcp] [...192.168.7.16][36755] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [.....9] [ip4][..tcp] [...192.168.7.16][43395] -> [...192.168.7.17][10051] 
+         detected: [.....9] [ip4][..tcp] [...192.168.7.16][43395] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [....10] [ip4][..tcp] [...192.168.7.16][45197] -> [...192.168.7.17][10051] 
+              new: [....11] [ip4][..tcp] [...192.168.7.16][35243] -> [...192.168.7.17][10051] 
+         detected: [....10] [ip4][..tcp] [...192.168.7.16][45197] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+         detected: [....11] [ip4][..tcp] [...192.168.7.16][35243] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [....12] [ip4][..tcp] [...192.168.7.16][36623] -> [...192.168.7.17][10051] 
+         detected: [....12] [ip4][..tcp] [...192.168.7.16][36623] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [....13] [ip4][..tcp] [...192.168.7.16][35627] -> [...192.168.7.17][10051] 
+         detected: [....13] [ip4][..tcp] [...192.168.7.16][35627] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [....14] [ip4][..tcp] [...192.168.7.16][49215] -> [...192.168.7.17][10051] 
+         detected: [....14] [ip4][..tcp] [...192.168.7.16][49215] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [....15] [ip4][..tcp] [...192.168.7.16][55759] -> [...192.168.7.17][10051] 
+         detected: [....15] [ip4][..tcp] [...192.168.7.16][55759] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [....16] [ip4][..tcp] [...192.168.7.16][50639] -> [...192.168.7.17][10051] 
+         detected: [....16] [ip4][..tcp] [...192.168.7.16][50639] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [....17] [ip4][..tcp] [...192.168.7.16][41309] -> [...192.168.7.17][10051] 
+         detected: [....17] [ip4][..tcp] [...192.168.7.16][41309] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [....18] [ip4][..tcp] [...192.168.7.16][60217] -> [...192.168.7.17][10051] 
+              new: [....19] [ip4][..tcp] [...192.168.7.16][43677] -> [...192.168.7.17][10051] 
+         detected: [....19] [ip4][..tcp] [...192.168.7.16][43677] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+         detected: [....18] [ip4][..tcp] [...192.168.7.16][60217] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [....20] [ip4][..tcp] [...192.168.7.16][48677] -> [...192.168.7.17][10051] 
+         detected: [....20] [ip4][..tcp] [...192.168.7.16][48677] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [.....2] [ip4][..tcp] [...192.168.7.16][36699] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [.....3] [ip4][..tcp] [...192.168.7.16][54089] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [....21] [ip4][..tcp] [...192.168.7.16][52901] -> [...192.168.7.17][10051] 
+         detected: [....21] [ip4][..tcp] [...192.168.7.16][52901] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [....22] [ip4][..tcp] [...192.168.7.16][48017] -> [...192.168.7.17][10051] 
+         detected: [....22] [ip4][..tcp] [...192.168.7.16][48017] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [.....5] [ip4][..tcp] [...192.168.7.16][58079] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [.....4] [ip4][..tcp] [...192.168.7.16][37781] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [....23] [ip4][..tcp] [...192.168.7.16][39595] -> [...192.168.7.17][10051] 
+         detected: [....23] [ip4][..tcp] [...192.168.7.16][39595] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [.....6] [ip4][..tcp] [...192.168.7.16][33661] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              new: [....24] [ip4][..tcp] [...192.168.7.16][36763] -> [...192.168.7.17][10051] 
+         detected: [....24] [ip4][..tcp] [...192.168.7.16][36763] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [.....8] [ip4][..tcp] [...192.168.7.16][36755] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [....24] [ip4][..tcp] [...192.168.7.16][36763] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [....14] [ip4][..tcp] [...192.168.7.16][49215] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [....10] [ip4][..tcp] [...192.168.7.16][45197] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [....17] [ip4][..tcp] [...192.168.7.16][41309] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [.....9] [ip4][..tcp] [...192.168.7.16][43395] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [....11] [ip4][..tcp] [...192.168.7.16][35243] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [....15] [ip4][..tcp] [...192.168.7.16][55759] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [....19] [ip4][..tcp] [...192.168.7.16][43677] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [....23] [ip4][..tcp] [...192.168.7.16][39595] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [....13] [ip4][..tcp] [...192.168.7.16][35627] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [....18] [ip4][..tcp] [...192.168.7.16][60217] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [....22] [ip4][..tcp] [...192.168.7.16][48017] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [....16] [ip4][..tcp] [...192.168.7.16][50639] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [....20] [ip4][..tcp] [...192.168.7.16][48677] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [.....7] [ip4][..tcp] [...192.168.7.16][40553] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [....21] [ip4][..tcp] [...192.168.7.16][52901] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
+              end: [....12] [ip4][..tcp] [...192.168.7.16][36623] -> [...192.168.7.17][10051] [Zabbix][Unknown][Network][Acceptable]
      DAEMON-EVENT: shutdown