diff --git a/scapy/base_classes.py b/scapy/base_classes.py index 610240416c9bd45a13a1d68b7c6e368fa675a768..2b7eb4e556578f70c8cc0dfb85a86ad7d134f2ae 100644 --- a/scapy/base_classes.py +++ b/scapy/base_classes.py @@ -51,7 +51,7 @@ class SetGen(Gen): class Net(Gen): """Generate a list of IPs from a network address or a name""" name = "ip" - ipaddress = re.compile(r"^(\*|[0-2]?[0-9]?[0-9](-[0-2]?[0-9]?[0-9])?)\.(\*|[0-2]?[0-9]?[0-9](-[0-2]?[0-9]?[0-9])?)\.(\*|[0-2]?[0-9]?[0-9](-[0-2]?[0-9]?[0-9])?)\.(\*|[0-2]?[0-9]?[0-9](-[0-2]?[0-9]?[0-9])?)(/[0-3]?[0-9])?$") + ip_regex = re.compile(r"^(\*|[0-2]?[0-9]?[0-9](-[0-2]?[0-9]?[0-9])?)\.(\*|[0-2]?[0-9]?[0-9](-[0-2]?[0-9]?[0-9])?)\.(\*|[0-2]?[0-9]?[0-9](-[0-2]?[0-9]?[0-9])?)\.(\*|[0-2]?[0-9]?[0-9](-[0-2]?[0-9]?[0-9])?)(/[0-3]?[0-9])?$") @staticmethod def _parse_digit(a,netmask): @@ -70,7 +70,7 @@ class Net(Gen): @classmethod def _parse_net(cls, net): tmp=net.split('/')+["32"] - if not cls.ipaddress.match(net): + if not cls.ip_regex.match(net): tmp[0]=socket.gethostbyname(tmp[0]) netmask = int(tmp[1]) ret_list = [cls._parse_digit(x, y-netmask) for (x, y) in zip(tmp[0].split('.'), [8, 16, 24, 32])] diff --git a/scapy/layers/inet6.py b/scapy/layers/inet6.py index 1a66889fbcf9f9b185332afe990283d529e3724d..6e4f154ddf79c08b2f529fece12ad1e74e2538ac 100644 --- a/scapy/layers/inet6.py +++ b/scapy/layers/inet6.py @@ -153,13 +153,13 @@ def getmacbyip6(ip6, chainCC=0): class Net6(Gen): # syntax ex. fec0::/126 """Generate a list of IPv6s from a network address or a name""" name = "ipv6" - ipaddress = re.compile(r"^([a-fA-F0-9:]+)(/[1]?[0-3]?[0-9])?$") + ip_regex = re.compile(r"^([a-fA-F0-9:]+)(/[1]?[0-3]?[0-9])?$") def __init__(self, net): self.repr = net tmp = net.split('/')+["128"] - if not self.ipaddress.match(net): + if not self.ip_regex.match(net): tmp[0]=socket.getaddrinfo(tmp[0], None, socket.AF_INET6)[0][-1][0] netmask = int(tmp[1])