Skip to content

Fix issues 67 and 68. #70

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

Open
bazhil wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix issues 67 and 68. #70

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d20ad6
Fix issues. All tests is passed for this code.
bazhil Jun 29, 2024
699cd1e
Fix issues.
bazhil Jun 29, 2024
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
14 changes: 11 additions & 3 deletions ipcalc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,11 @@ def __init__(self, ip, mask=None, version=0):
self.mask = (limit - count)
else:
raise ValueError('Invalid netmask')

#hard fix https://github.com/tehmaze/ipcalc/issues/67
if self.v != 6 and (len(self.dq) > 15 or ':' in self.dq):
self.v = 6

# Validate subnet size
if self.v == 6:
self.dq = self._itodq(self.ip)
Expand Down Expand Up @@ -291,9 +296,12 @@ def _dqtoi_ipv6(self, dq):
hx.insert(ix, '0')
elif dq.endswith('::'):
pass
elif '' in hx:
raise ValueError('%s: IPv6 address invalid: '
'compressed format detected in full notation' % dq)

# hide to fix https://github.com/tehmaze/ipcalc/issues/68
# elif '' in hx:
# raise ValueError('%s: IPv6 address invalid: '
# 'compressed format detected in full notation' % dq)

ip = ''
hx = [x == '' and '0' or x for x in hx]
for h in hx:
Expand Down