Skip to content

Clean up distinguished but equivalent path in vmid_to_ipv4 #823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
minitech wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −5
Draft

Clean up distinguished but equivalent path in vmid_to_ipv4 #823

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions qubes/vm/mix/net.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,10 @@ def __str__(self):


def vmid_to_ipv4(prefix, vmid):
if vmid not in range(1, 256 * 254 + 1):
raise ValueError("vmid out of range")
# avoid .0 and .255 addresses, it may trip some heuristics
# if OS assumes /24 netmask
# preserve unchanged IPs for low vmid
if vmid < 255:
return ipaddress.IPv4Address(
"{}.{}.{}".format(prefix, (vmid >> 8) & 0xFF, vmid & 0xFF)
)
# don't reserve first .1 for vmid 0, as it is invalid
vmid -= 1
return ipaddress.IPv4Address(
Expand Down