diff options
| author | Toni <matzeton@googlemail.com> | 2022-03-02 12:02:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-02 12:02:09 +0100 |
| commit | 4da1453d904f03c536a6b982217d9785338a7f92 (patch) | |
| tree | 95fdbf7cc66ebe5a56b6861df818fec82398a379 /src/lib/ndpi_main.c | |
| parent | 736a80f9ce7a73e8c136d3621facb1bdb3637e65 (diff) | |
Added configureable ndpi packet processing limit. (#1466)
* The current behaviour ignores any user preferences
and was also incorrectly implemented, because the
flow->num_processed_pkts wraps every 65535 and nDPI
will process packets again until
NDPI_MAX_NUM_PKTS_PER_FLOW_TO_DISSECT reached.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'src/lib/ndpi_main.c')
| -rw-r--r-- | src/lib/ndpi_main.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 1ceabfaba..d9dc9ec02 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -848,6 +848,13 @@ int ndpi_set_detection_preferences(struct ndpi_detection_module_struct *ndpi_str ndpi_str->skip_tls_blocks_until_change_cipher = 1; break; + case ndpi_pref_max_packets_to_process: + if (value > 0xFFFF) { + return(-1); + } + ndpi_str->max_packets_to_process = value; + break; + default: return(-1); } @@ -2478,6 +2485,8 @@ struct ndpi_detection_module_struct *ndpi_init_detection_module(ndpi_init_prefs } } + ndpi_str->max_packets_to_process = NDPI_DEFAULT_MAX_NUM_PKTS_PER_FLOW_TO_DISSECT; + NDPI_BITMASK_RESET(ndpi_str->detection_bitmask); #ifdef NDPI_ENABLE_DEBUG_MESSAGES ndpi_str->user_data = NULL; @@ -5756,11 +5765,11 @@ ndpi_protocol ndpi_detection_process_packet(struct ndpi_detection_module_struct return(ret); } - flow->num_processed_pkts++; - - if(flow->num_processed_pkts > NDPI_MAX_NUM_PKTS_PER_FLOW_TO_DISSECT) + if(ndpi_str->max_packets_to_process > 0 && flow->num_processed_pkts >= ndpi_str->max_packets_to_process) return(ret); /* Avoid spending too much time with this flow */ + flow->num_processed_pkts++; + /* Init default */ ret.master_protocol = flow->detected_protocol_stack[1], ret.app_protocol = flow->detected_protocol_stack[0]; |