mirror of
https://github.com/optim-enterprises-bv/nDPId.git
synced 2025-10-30 17:57:48 +00:00
f713ec702b
* fixed inconsistent processing of remaining flows during nDPId shutdown phase * fixed multiple `detected' flow events (instead only `detection-update' flow events can occur after a `detected' flow event) * fixed nDPIsrvd.py invalid message buffer handling * improved run_tests.sh so only valid pcap capture files are getting processed (and some more cosmetics + logging) Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
53 lines
1.8 KiB
Python
Executable File
53 lines
1.8 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
|
|
import os
|
|
import sys
|
|
|
|
sys.path.append(os.path.dirname(sys.argv[0]) + '/../share/nDPId')
|
|
sys.path.append(os.path.dirname(sys.argv[0]) + '/../usr/share/nDPId')
|
|
try:
|
|
import nDPIsrvd
|
|
from nDPIsrvd import nDPIsrvdSocket, TermColor
|
|
except ImportError:
|
|
sys.path.append(os.path.dirname(sys.argv[0]) + '/../../dependencies')
|
|
import nDPIsrvd
|
|
from nDPIsrvd import nDPIsrvdSocket, TermColor
|
|
|
|
class Stats:
|
|
lines_processed = 0
|
|
print_dot_every = 10
|
|
print_nmb_every = print_dot_every * 5
|
|
|
|
def onJsonLineRecvd(json_dict, current_flow, global_user_data):
|
|
validation_done = nDPIsrvd.validateAgainstSchema(json_dict)
|
|
|
|
global_user_data.lines_processed += 1
|
|
if global_user_data.lines_processed % global_user_data.print_dot_every == 0:
|
|
sys.stdout.write('.')
|
|
sys.stdout.flush()
|
|
print_nmb_every = global_user_data.print_nmb_every + (len(str(global_user_data.lines_processed)) * global_user_data.print_dot_every)
|
|
if global_user_data.lines_processed % print_nmb_every == 0:
|
|
sys.stdout.write(str(global_user_data.lines_processed))
|
|
sys.stdout.flush()
|
|
|
|
return validation_done
|
|
|
|
if __name__ == '__main__':
|
|
argparser = nDPIsrvd.defaultArgumentParser()
|
|
args = argparser.parse_args()
|
|
address = nDPIsrvd.validateAddress(args)
|
|
|
|
sys.stderr.write('Recv buffer size: {}\n'.format(nDPIsrvd.NETWORK_BUFFER_MAX_SIZE))
|
|
sys.stderr.write('Connecting to {} ..\n'.format(address[0]+':'+str(address[1]) if type(address) is tuple else address))
|
|
|
|
nDPIsrvd.initSchemaValidator(os.path.dirname(sys.argv[0]) + '/../../schema')
|
|
|
|
nsock = nDPIsrvdSocket()
|
|
nsock.connect(address)
|
|
try:
|
|
nsock.loop(onJsonLineRecvd, Stats())
|
|
except nDPIsrvd.SocketConnectionBroken as err:
|
|
sys.stderr.write('\n{}\n'.format(err))
|
|
except KeyboardInterrupt:
|
|
print()
|