Fixed bug another with getting children from a node

Author: figglewatts

cidr_trie/__init__.py

@@ -72,6 +72,7 @@ def get_values(self, prefix: str) -> List[Tuple[str, Any]]:
             if m > mask:
                 continue
 
+            # make sure this ip is within the network defined by the mask
             if self.ip == (ip & get_subnet_mask(m, v6)):
                 ip_str = f"{ip_itoa(self.ip, v6)}/{m}"
                 result.append((ip_str, self.masks[m]))
@@ -325,7 +326,7 @@ def find_all(self, prefix: str, children: bool=False) -> List[Tuple[str, Any]]:
         """
         self.validate_ip_type_for_trie(prefix)
         result = []
-        ip, _ = cidr_atoi(prefix)
+        ip, mask = cidr_atoi(prefix)
 
         # for each node on the way down
         last_node = None
@@ -338,7 +339,13 @@ def find_all(self, prefix: str, children: bool=False) -> List[Tuple[str, Any]]:
         if children and last_node.ip == ip:
             # for each child node underneath the last found node
             for node in self.traverse_inorder_from_node(last_node):
-                result += node.get_child_values(prefix)
+                # skip the first node, as it's already in the result
+                if node.ip == last_node.ip:
+                    continue
+
+                # make sure this child is within the prefix
+                if (node.ip & get_subnet_mask(mask, self.v6)) == (ip & get_subnet_mask(mask, self.v6)):
+                    result += node.get_child_values(prefix)
 
         return result
 

docs/conf.py

@@ -22,7 +22,7 @@
 author = 'Figglewatts'
 
 # The full version, including alpha/beta/rc tags
-release = '3.1.1'
+release = '3.1.2'
 
 
 # -- General configuration ---------------------------------------------------

setup.py

@@ -6,7 +6,7 @@ def readme():
         return r.read()
 
 setup(name="cidr_trie",
-      version="3.1.1",
+      version="3.1.2",
       description="Store/search CIDR prefixes in a trie structure.",
       long_description=readme(),
       long_description_content_type="text/x-rst",