fedor/wcm
1
0
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Cidr4 merge algorithm #5

Merged
PavelPatsey merged 91 commits from CIDR4_merge_algorithm into main 2025-01-27 22:05:39 +03:00
Conversation 4 Commits 91 Files Changed 17
+1 -1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5a8f98041f - Show all commits
vpn_manager/cidr4_merge/cidr4_merger.py
+1 -1
View File
@@ -32,7 +32,7 @@ def find_parent(a: Node, b: Node) -> Node:
mask = ((1 << mask_len) - 1) << (32 - mask_len) mask = ((1 << mask_len) - 1) << (32 - mask_len)
while ip_a & mask != ip_b & mask: while ip_a & mask != ip_b & mask:
mask_len -= 1 mask_len -= 1
mask = ((1 << mask_len) - 1) << (32 - mask_len) mask = (mask << 1) & ((1 << 32) - 1)
ip = ip_a & mask ip = ip_a & mask
parent_node = ip, mask_len parent_node = ip, mask_len
if parent_node == a or parent_node == b: if parent_node == a or parent_node == b: