diff options
author | Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> | 2021-12-22 19:54:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-22 19:54:06 +0100 |
commit | 91bb77a8806ee2987e856f66674cf3aa8b1d60db (patch) | |
tree | 0f2a06cc9b64a8af221552e87ae771ac882ab4b5 /python/ndpi.py | |
parent | 02da143e4567cbfe32b139561ec3a702ce380fc7 (diff) |
A final(?) effort to reduce memory usage per flow (#1389)
Remove some unused fields and re-organize other ones.
In particular:
* Update the parameters of `ndpi_ssl_version2str()` function
* Zattoo, Thunder: these timestamps aren't really used.
* Ftp/mail: these protocols are dissected only over TCP.
* Attention must be paid to TLS.Bittorrent flows to avoid invalid
read/write to `flow->protos.bittorrent.hash` field.
This is the last(?) commit of a long series (see 22241a1d, 227e586e,
730c2360, a8ffcd8b) aiming to reduce library memory consumption.
Before, at nDPI 4.0 (more precisly, at a6b10cf7, because memory stats
were wrong until that commit):
```
nDPI Memory statistics:
nDPI Memory (once): 221.15 KB
Flow Memory (per flow): 2.94 KB
```
Now:
```
nDPI Memory statistics:
nDPI Memory (once): 231.71 KB
Flow Memory (per flow): 1008 B <---------
```
i.e. memory usage per flow has been reduced by 66%, dropping below the
psychological threshold of 1 KB.
To further reduce this value, we probably need to look into #1279:
let's fight this battle another day.
Diffstat (limited to 'python/ndpi.py')
-rw-r--r-- | python/ndpi.py | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/python/ndpi.py b/python/ndpi.py index ba081acb9..d3a1f6389 100644 --- a/python/ndpi.py +++ b/python/ndpi.py @@ -452,12 +452,6 @@ struct ndpi_id_struct { /* NDPI_PROTOCOL_GNUTELLA */ uint32_t gnutella_ts; - /* NDPI_PROTOCOL_THUNDER */ - uint32_t thunder_ts; - - /* NDPI_PROTOCOL_ZATTOO */ - uint32_t zattoo_ts; - /* NDPI_PROTOCOL_UNENCRYPTED_JABBER */ uint32_t jabber_stun_or_ft_ts; @@ -497,7 +491,6 @@ struct ndpi_flow_tcp_struct { /* NDPI_PROTOCOL_IRC */ uint8_t irc_stage; - uint8_t irc_port; /* NDPI_PROTOCOL_H323 */ uint8_t h323_valid_packets; @@ -912,11 +905,7 @@ struct ndpi_detection_module_struct { uint32_t irc_timeout; /* gnutella parameters */ uint32_t gnutella_timeout; - /* thunder parameters */ - uint32_t thunder_timeout; /* rstp */ - uint32_t orb_rstp_ts_timeout; - uint32_t zattoo_connection_timeout; uint32_t jabber_stun_timeout; uint32_t jabber_file_transfer_timeout; uint8_t ip_version_limit; @@ -1001,12 +990,11 @@ struct ndpi_flow_struct { */ struct { ndpi_http_method method; - char *url, *content_type, *user_agent; - uint8_t num_request_headers, num_response_headers; uint8_t request_version; /* 0=1.0 and 1=1.1. Create an enum for this? */ uint16_t response_status_code; /* 200, 404, etc. */ - uint8_t detected_os[32]; /* Via HTTP/QUIC User-Agent */ - uint8_t nat_ip[24]; + char *url, *content_type, *user_agent; + char *detected_os; /* Via HTTP/QUIC User-Agent */ + char *nat_ip; /* Via HTTP X-Forwarded-For */ } http; @@ -1049,8 +1037,6 @@ struct ndpi_flow_struct { } kerberos; struct { - char ssl_version_str[12]; - uint16_t ssl_version, server_names_len; char *server_names, *alpn, *tls_supported_versions, *issuerDN, *subjectDN; uint32_t notBefore, notAfter; char ja3_client[33], ja3_server[33]; @@ -1062,6 +1048,7 @@ struct ndpi_flow_struct { char *esni; } encrypted_sni; ndpi_cipher_weakness server_unsafe_cipher; + uint16_t ssl_version, server_names_len; } tls_quic; struct { |