aboutsummaryrefslogtreecommitdiff
path: root/src/lib/third_party
diff options
context:
space:
mode:
authorLuca Deri <deri@ntop.org>2020-05-06 12:51:44 +0200
committerLuca Deri <deri@ntop.org>2020-05-06 12:51:44 +0200
commit84f66b4d6b69d2e5a98d446d70e028d6fa560413 (patch)
tree94554c50477cf42ba91f531d8c90ff502f142eb5 /src/lib/third_party
parent7855e0318d41d567bc9dc6acb5c1bdc814728bc2 (diff)
Introduced custom protocols with IP and (optional) port support
Example - Single IP address ip:213.75.170.11@CustomProtocol - IP address with CIDR ip:213.75.170.11/32@CustomProtocol - IP address with CIDR and port ip:213.75.170.11/32:443@CustomProtocol Please note that there are some restrictions on the port usage. They have been listed in example/protos.txt
Diffstat (limited to 'src/lib/third_party')
-rw-r--r--src/lib/third_party/include/ndpi_patricia.h4
-rw-r--r--src/lib/third_party/src/ndpi_patricia.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/third_party/include/ndpi_patricia.h b/src/lib/third_party/include/ndpi_patricia.h
index ca8d5497f..572797d35 100644
--- a/src/lib/third_party/include/ndpi_patricia.h
+++ b/src/lib/third_party/include/ndpi_patricia.h
@@ -104,7 +104,9 @@ union patricia_node_value_t {
void *user_data;
/* User-defined values */
- u_int32_t user_value;
+ struct {
+ u_int16_t user_value, additional_user_value;
+ } uv;
};
typedef struct _patricia_node_t {
diff --git a/src/lib/third_party/src/ndpi_patricia.c b/src/lib/third_party/src/ndpi_patricia.c
index 617eaada9..139c17676 100644
--- a/src/lib/third_party/src/ndpi_patricia.c
+++ b/src/lib/third_party/src/ndpi_patricia.c
@@ -513,8 +513,7 @@ ndpi_patricia_search_best2 (patricia_tree_t *patricia, prefix_t *prefix, int inc
node->bit);
#endif /* PATRICIA_DEBUG */
node = node->r;
- }
- else {
+ } else {
#ifdef PATRICIA_DEBUG
if(node->prefix)
fprintf (stderr, "patricia_search_best: take left %s/%d\n",