Skip to content

Cast input to IpRangeList #15

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

Merged
bd808 merged 1 commit into from
Aug 21, 2016
Merged

Cast input to IpRangeList #15

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
10 changes: 9 additions & 1 deletion iptools/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ def _cast(self, item):
if ipv4 == self._ipver and item > ipv4.MAX_IP:
# casting an ipv6 in an ipv4 range
# downcast to ipv4 iff address is in the IPv4 mapped block
if item in IpRange(ipv6.IPV4_MAPPED):
if item in _IPV6_MAPPED_IPV4:
item = item & ipv4.MAX_IP
# end if

Expand Down Expand Up @@ -395,6 +395,9 @@ def __iter__(self):
# end class IpRange


_IPV6_MAPPED_IPV4 = IpRange(ipv6.IPV4_MAPPED)


class IpRangeList (object):
"""
List of IpRange objects.
Expand Down Expand Up @@ -464,6 +467,11 @@ def __contains__(self, item):
:type item: str
:returns: ``True`` if address is in list, ``False`` otherwise.
"""
if isinstance(item, basestring):
item = _address2long(item)
if type(item) not in (type(1), type(ipv4.MAX_IP), type(ipv6.MAX_IP)):
raise TypeError(
"expected ip address, 32-bit integer or 128-bit integer")
for r in self.ips:
if item in r:
return True
Expand Down