mirror of
https://github.com/optim-enterprises-bv/nDPId.git
synced 2025-11-01 02:37:48 +00:00
nDPId: Reduced flow-updates for TCP flows to 1/4 of the timeout value.
* nDPId: Fixed broken validation tests. * nDPId: Removed TICK_RESOLUTION, not required anymore. * c-collectd: Improved total layer4 payload calculation/update handling. * c-collectd: Updated RRD Graph script according to total layer4 payload changes. * py-flow-info.py: Fixed several bugs and syntax errors. * Python scripts: Added dirname(argv[0]) as search path for nDPIsrvd.py. * nDPIsrvd&nDPId-test: Fixed missing EPOLLERR check. Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
@@ -5,11 +5,18 @@ import sys
|
||||
|
||||
sys.path.append(os.path.dirname(sys.argv[0]) + '/../../dependencies')
|
||||
sys.path.append(os.path.dirname(sys.argv[0]) + '/../share/nDPId')
|
||||
sys.path.append(os.path.dirname(sys.argv[0]) + '/../usr/share/nDPId')
|
||||
sys.path.append(os.path.dirname(sys.argv[0]))
|
||||
sys.path.append(sys.base_prefix + '/share/nDPId')
|
||||
import nDPIsrvd
|
||||
from nDPIsrvd import nDPIsrvdSocket, TermColor
|
||||
|
||||
class Stats:
|
||||
KEYS = [ ['init','reconnect','shutdown','status' ], \
|
||||
[ 'new','end','idle','update', ],
|
||||
[ 'analyse' ], \
|
||||
[ 'guessed','detected','detection-update','not-detected' ], \
|
||||
[ 'packet', 'packet-flow'] ]
|
||||
ALL_KEYS = KEYS[0] + KEYS[1] + KEYS[2] + KEYS[3] + KEYS[4]
|
||||
|
||||
def __init__(self, nDPIsrvd_sock):
|
||||
self.nsock = nDPIsrvd_sock
|
||||
@@ -20,11 +27,7 @@ class Stats:
|
||||
self.print_nmb_every = self.print_dot_every * 5
|
||||
|
||||
def resetEventCounter(self):
|
||||
keys = ['init','reconnect','shutdown','status', \
|
||||
'new','end','idle','update','analyse', \
|
||||
'guessed','detected','detection-update','not-detected', \
|
||||
'packet', 'packet-flow']
|
||||
for k in keys:
|
||||
for k in Stats.ALL_KEYS:
|
||||
self.event_counter[k] = 0
|
||||
|
||||
def incrementEventCounter(self, json_dict):
|
||||
@@ -52,13 +55,9 @@ class Stats:
|
||||
return True
|
||||
|
||||
def getEventCounterStr(self):
|
||||
keys = [ [ 'init','reconnect','shutdown','status' ], \
|
||||
[ 'new','end','idle','update' ], \
|
||||
[ 'guessed','detected','detection-update','not-detected' ], \
|
||||
[ 'packet', 'packet-flow' ] ]
|
||||
retval = str()
|
||||
retval += '-' * 98 + '--\n'
|
||||
for klist in keys:
|
||||
for klist in Stats.KEYS:
|
||||
for k in klist:
|
||||
retval += '| {:<16}: {:<4} '.format(k, self.event_counter[k])
|
||||
retval += '\n--' + '-' * 98 + '\n'
|
||||
|
||||
Reference in New Issue
Block a user