mirror of
				https://github.com/optim-enterprises-bv/nDPId.git
				synced 2025-10-31 18:27:47 +00:00 
			
		
		
		
	Major nDPId extension. Sorry for the huge commit.
- nDPId: fixed invalid IP4/IP6 tuple compare - nDPIsrvd: fixed caching issue (finally) - added tiny c example (can be used to check flow manager sanity) - c-captured: use flow_last_seen timestamp from `struct nDPIsrvd_flow` - README.md update: added example JSON sequence - nDPId: added new flow event `update` necessary for correct timeout handling (and other future use-cases) - nDPIsrvd.h and nDPIsrvd.py: switched to an instance (consists of an alias/source tuple) based flow manager - every flow related event **must** now serialize `alias`, `source`, `flow_id`, `flow_last_seen` and `flow_idle_time` to make the timeout handling and verification process work correctly - nDPIsrvd.h: ability to profile any dynamic memory (de-)allocation - nDPIsrvd.py: removed PcapPacket class (unused) - py-flow-dashboard and py-flow-multiprocess: fixed race condition - py-flow-info: print statusbar with probably useful information - nDPId/nDPIsrvd.h: switched from packet-flow only timestamps (`pkt_*sec`) to a generic flow event timestamp `ts_msec` - nDPId-test: added additional checks - nDPId: increased ICMP flow timeout - nDPId: using event based i/o if capturing packets from a device - nDPIsrvd: fixed memory leak on shutdown if remote descriptors were still connected Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
		| @@ -18,7 +18,7 @@ class Stats: | ||||
|     print_dot_every = 10 | ||||
|     print_nmb_every = print_dot_every * 5 | ||||
|  | ||||
| def onJsonLineRecvd(json_dict, current_flow, global_user_data): | ||||
| def onJsonLineRecvd(json_dict, instance, current_flow, global_user_data): | ||||
|     validation_done = nDPIsrvd.validateAgainstSchema(json_dict) | ||||
|  | ||||
|     global_user_data.lines_processed += 1 | ||||
| @@ -45,7 +45,7 @@ if __name__ == '__main__': | ||||
|     nsock = nDPIsrvdSocket() | ||||
|     nsock.connect(address) | ||||
|     try: | ||||
|         nsock.loop(onJsonLineRecvd, Stats()) | ||||
|         nsock.loop(onJsonLineRecvd, None, Stats()) | ||||
|     except nDPIsrvd.SocketConnectionBroken as err: | ||||
|         sys.stderr.write('\n{}\n'.format(err)) | ||||
|     except KeyboardInterrupt: | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Toni Uhlig
					Toni Uhlig