Add support for flow client/server information (#1671)
In a lot of places in ndPI we use *packet* source/dest info (address/port/direction) when we are interested in *flow* client/server info, instead. Add basic logic to autodetect this kind of information. nDPI doesn't perform any "flow management" itself but this task is delegated to the external application. It is then likely that the application might provide more reliable hints about flow client/server direction and about the TCP handshake presence: in that case, these information might be (optionally) passed to the library, disabling the internal "autodetect" logic. These new fields have been used in some LRU caches and in the "guessing" algorithm. It is quite likely that some other code needs to be updated.
This commit is contained in:
@@ -14,7 +14,7 @@ If not, see <http://www.gnu.org/licenses/>.
|
||||
"""
|
||||
|
||||
from collections import namedtuple
|
||||
from ndpi import NDPI, NDPIFlow
|
||||
from ndpi import NDPI, NDPIFlow, ffi
|
||||
import argparse
|
||||
import socket
|
||||
import dpkt
|
||||
@@ -131,7 +131,7 @@ if __name__ == "__main__":
|
||||
key = ppkt_to_flow_key(ppkt)
|
||||
try: # Try a Flow update
|
||||
flow = flow_cache[key]
|
||||
flow.detected_protocol = nDPI.process_packet(flow.ndpi_flow, ppkt.ip_bytes, time_ms)
|
||||
flow.detected_protocol = nDPI.process_packet(flow.ndpi_flow, ppkt.ip_bytes, time_ms, ffi.NULL)
|
||||
flow.pkts += 1
|
||||
flow.bytes += len(packet)
|
||||
except KeyError: # New Flow
|
||||
@@ -139,7 +139,7 @@ if __name__ == "__main__":
|
||||
flow.index = flow_count
|
||||
flow_count += 1
|
||||
flow.ndpi_flow = NDPIFlow() # We create an nDPIFlow object per Flow
|
||||
flow.detected_protocol = nDPI.process_packet(flow.ndpi_flow, ppkt.ip_bytes, time_ms)
|
||||
flow.detected_protocol = nDPI.process_packet(flow.ndpi_flow, ppkt.ip_bytes, time_ms, ffi.NULL)
|
||||
flow.pkts += 1
|
||||
flow.bytes += len(packet)
|
||||
flow_cache[key] = flow
|
||||
|
||||
Reference in New Issue
Block a user