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 -4
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 811432a2f5 - Show all commits
vpn_manager/cidr4_merge/cidr4_merger.py
+1 -4
View File
@@ -38,11 +38,8 @@ def calc_dip(mask_len_a: int, mask_len_b: int, mask_len_p: int) -> int:
def merge_two_nodes(node_a: Node, node_b: Node) -> tuple[Node, int]: def merge_two_nodes(node_a: Node, node_b: Node) -> tuple[Node, int]:
ip_a, mask_len_a = node_a
ip_b, mask_len_b = node_b
parent_node = find_parent(node_a, node_b) parent_node = find_parent(node_a, node_b)
_, mask_len_p = parent_node dip = calc_dip(node_a[1], node_b[1], parent_node[1])
dip = calc_dip(mask_len_a, mask_len_b, mask_len_p)
return parent_node, dip return parent_node, dip