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 -5
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7c8ecea980 - Show all commits
vpn_manager/cidr4_merge/cidr4_merger.py
+1 -5
View File
@@ -9,10 +9,6 @@ class Cidr4MergerError(Exception):
pass pass
def sort_nodes(nodes: list[Node]) -> list[Node]:
return sorted(nodes)
def find_parent(a: Node, b: Node) -> Node: def find_parent(a: Node, b: Node) -> Node:
ip_a, mask_len_a = a ip_a, mask_len_a = a
ip_b, mask_len_b = b ip_b, mask_len_b = b
@@ -79,7 +75,7 @@ def main():
data = get_data(file) data = get_data(file)
nodes = list(map(cidr4_to_node, data)) nodes = list(map(cidr4_to_node, data))
nodes = sort_nodes(nodes) nodes = sorted(nodes)
merged_nodes, sum_dip = merge_nodes(nodes, required_len) merged_nodes, sum_dip = merge_nodes(nodes, required_len)
cidr4s = [make_cidr4(ip, mask_len) for ip, mask_len in merged_nodes] cidr4s = [make_cidr4(ip, mask_len) for ip, mask_len in merged_nodes]