aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLuca <deri@ntop.org>2019-11-12 16:37:18 +0100
committerLuca <deri@ntop.org>2019-11-12 16:37:18 +0100
commit7e87bfd03924c54f4c98bdc64810e3578c174112 (patch)
tree08f11b2a82f48a97032eee3ef89cff09eb7113cd /src
parentab9ccf9eb9a6571d84bd0b2c8e185565d0d700f6 (diff)
Added support of default /32 in ndpi_load_ipv4_ptree()
Diffstat (limited to 'src')
-rw-r--r--src/lib/ndpi_main.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 2641ceeaf..83cf59898 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -1979,17 +1979,15 @@ int ndpi_load_ipv4_ptree(struct ndpi_detection_module_struct *ndpi_str,
addr = strtok_r(line, "/", &saveptr);
if(addr) {
+ struct in_addr pin;
+ patricia_node_t *node;
+
cidr = strtok_r(NULL, "\n", &saveptr);
-
- if(cidr) {
- struct in_addr pin;
- patricia_node_t *node;
-
- pin.s_addr = inet_addr(addr);
- if((node = add_to_ptree(ndpi_str->protocols_ptree, AF_INET,
- &pin, atoi(cidr) /* bits */)) != NULL)
- node->value.user_value = protocol_id, num_loaded++;
- }
+
+ pin.s_addr = inet_addr(addr);
+ if((node = add_to_ptree(ndpi_str->protocols_ptree, AF_INET,
+ &pin, cidr ? atoi(cidr) : 32 /* bits */)) != NULL)
+ node->value.user_value = protocol_id, num_loaded++;
}
}