Rule changes work in progress

This commit is contained in:
Luca Deri
2020-12-11 17:25:57 +01:00
parent 21ad3a1775
commit 5cb6ddfd22
3 changed files with 30 additions and 4 deletions
+23 -2
View File
@@ -1571,17 +1571,38 @@ typedef enum {
rule_drop
} ndpi_rule_action;
typedef struct {
typedef struct _ndpi_rule {
/* Ancillary information */
u_int16_t id;
char *description;
/* Keys */
u_int8_t l4_proto;
ndpi_rule_action action;
ndpi_rule_peer client, server; /* Network byte order */
u_int16_t l7_proto;
u_int8_t reverseable_rule:1 /* src <-> dst */, _not_used:7;
/* Rule actions */
ndpi_rule_action action;
/* Internal use */
struct _ndpi_rule *list_next; /* Linked list of rules */
} ndpi_rule;
/*
Matching order
- L7 protocol
- match client/server
*/
typedef struct {
u_int32_t num_rules;
ndpi_rule *root;
ndpi_rule *l7_rules[NDPI_LAST_IMPLEMENTED_PROTOCOL], *l7_any;
} ndpi_rules;
#endif /* __NDPI_TYPEDEFS_H__ */
+1 -1
View File
@@ -1691,7 +1691,7 @@ u_int8_t ndpi_is_tor_flow(struct ndpi_detection_module_struct *ndpi_str, struct
/* ******************************************* */
static patricia_node_t *add_to_ptree(patricia_tree_t *tree, int family, void *addr, int bits) {
static patricia_node_t* add_to_ptree(patricia_tree_t *tree, int family, void *addr, int bits) {
prefix_t prefix;
patricia_node_t *node;