diff options
| author | Luca Deri <deri@ntop.org> | 2024-05-17 16:38:02 +0200 |
|---|---|---|
| committer | Luca Deri <deri@ntop.org> | 2024-05-17 16:38:02 +0200 |
| commit | c63446e59220efd3b133bccbbd44ed97c86c78f1 (patch) | |
| tree | 1566b243405aa95bf084dc1ee24792baa9abd3a6 /src/include | |
| parent | 33d3d254acf20fcdb1db106cdf8161e73b9e747a (diff) | |
Cleaned up API
Removed
- int ndpi_load_ipv4_ptree_file(ndpi_ptree_t *tree, const char *path, u_int16_t protocol_id);
- int ndpi_load_ipv6_ptree_file(ndpi_ptree_t *tree, const char *path, u_int16_t protocol_id);
Added (it supports both IPv4 and v6)
+ int ndpi_load_ptree_file(ndpi_ptree_t *tree, const char *path, u_int16_t protocol_id);
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ndpi_api.h | 4 | ||||
| -rw-r--r-- | src/include/ndpi_private.h | 7 | ||||
| -rw-r--r-- | src/include/ndpi_typedefs.h | 6 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/include/ndpi_api.h b/src/include/ndpi_api.h index 3132e139b..ca365b8fe 100644 --- a/src/include/ndpi_api.h +++ b/src/include/ndpi_api.h @@ -1164,9 +1164,7 @@ extern "C" { ndpi_ptree_t* ndpi_ptree_create(void); int ndpi_ptree_insert(ndpi_ptree_t *tree, const ndpi_ip_addr_t *addr, u_int8_t bits, u_int64_t user_data); int ndpi_ptree_match_addr(ndpi_ptree_t *tree, const ndpi_ip_addr_t *addr, u_int64_t *user_data); - int ndpi_load_ipv4_ptree_file(ndpi_ptree_t *tree, const char *path, u_int16_t protocol_id); - int ndpi_load_ipv6_ptree_file(ndpi_ptree_t *tree, const char *path, u_int16_t protocol_id); - + int ndpi_load_ptree_file(ndpi_ptree_t *tree, const char *path, u_int16_t protocol_id); void ndpi_ptree_destroy(ndpi_ptree_t *tree); /* General purpose utilities */ diff --git a/src/include/ndpi_private.h b/src/include/ndpi_private.h index 4fabe1634..693b2cd57 100644 --- a/src/include/ndpi_private.h +++ b/src/include/ndpi_private.h @@ -320,12 +320,7 @@ struct ndpi_detection_module_struct { ndpi_list *trusted_issuer_dn; /* Patricia trees */ - ndpi_patricia_tree_t *ip_risk_mask_ptree; - ndpi_patricia_tree_t *ip_risk_mask_ptree6; - ndpi_patricia_tree_t *ip_risk_ptree; - ndpi_patricia_tree_t *ip_risk_ptree6; - ndpi_patricia_tree_t *protocols_ptree; /* IP-based protocol detection */ - ndpi_patricia_tree_t *protocols_ptree6; + ndpi_ptree_t *ip_risk_mask, *ip_risk, *protocols /* IP-based protocol detection */; /* *** If you add a new Patricia tree, please update ptree_type above! *** */ diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index 1c7bd2e6b..98897d462 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -1683,7 +1683,11 @@ typedef void (*ndpi_void_fn3_t)(ndpi_patricia_node_t *node, void *data, void *us /* **************************************** */ -typedef struct ndpi_ptree ndpi_ptree_t; +typedef struct ndpi_ptree +{ + ndpi_patricia_tree_t *v4; + ndpi_patricia_tree_t *v6; +} ndpi_ptree_t; /* **************************************** */ |