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
+7 -10
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 14c8e66f60 - Show all commits
vpn_manager/cidr4_merge/cidr4_merger.py
+2 -5
View File
@@ -48,18 +48,15 @@ def merge_nodes(a: Node, b: Node) -> tuple[Node, int]:
mask = (mask << 1) & ((1 << 32) - 1) mask = (mask << 1) & ((1 << 32) - 1)
return ia & mask, min_l return ia & mask, min_l
def calc_dip(la, lb, lp): def calc_dip(l1, lp):
def dip(l1, lp):
m = lp + 1 m = lp + 1
res = 1 << (l1 - m) res = 1 << (l1 - m)
res -= 1 res -= 1
res <<= 32 - l1 res <<= 32 - l1
return res return res
return dip(la, lp) + dip(lb, lp)
p = find_parent(a, b) p = find_parent(a, b)
dip = calc_dip(a[1], b[1], p[1]) dip = calc_dip(a[1], p[1]) + calc_dip(b[1], p[1])
return p, dip return p, dip