From 7e87bfd03924c54f4c98bdc64810e3578c174112 Mon Sep 17 00:00:00 2001 From: Luca Date: Tue, 12 Nov 2019 16:37:18 +0100 Subject: Added support of default /32 in ndpi_load_ipv4_ptree() --- src/lib/ndpi_main.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src') 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++; } } -- cgit v1.2.3