diff --git a/Milter/dynip.py b/Milter/dynip.py index f4dcfd53ddbbf8a1818412b805fafe5d6897fbae..0070567c756262308fed1444f0bc02f35c026d45 100644 --- a/Milter/dynip.py +++ b/Milter/dynip.py @@ -48,9 +48,10 @@ def is_dynip(host,addr): True """ if host.startswith('[') and host.endswith(']'): - return True + return True # no ptr if addr: if host.find(addr) >= 0: return True + if addr.find(':') >= 0: return False # IP6 a = addr.split('.') ia = map(int,a) h = host diff --git a/Milter/utils.py b/Milter/utils.py index 6d6350c053c596ef7b0d98e16d26b5ec6124990b..d8d55164b204bef1877600ab5f2274ef1d58352e 100644 --- a/Milter/utils.py +++ b/Milter/utils.py @@ -28,16 +28,21 @@ ip6re = re.compile( '(?:%(hex4)s:){6}%(ls32)s$' }, re.IGNORECASE) # from spf.py -def addr2bin(str): +def addr2bin(s): """Convert a string IPv4 address into an unsigned integer.""" + if s.find(':') >= 0: + try: + return bin2long6(inet_pton(s)) + except: + raise socket.error("Invalid IP6 address: "+s) try: - return struct.unpack("!L", socket.inet_aton(str))[0] + return struct.unpack("!L", socket.inet_aton(s))[0] except socket.error: - raise socket.error("Invalid IP4 address: "+str) + raise socket.error("Invalid IP4 address: "+s) -def bin2long6(str): +def bin2long6(s): """Convert binary IP6 address into an unsigned Python long integer.""" - h, l = struct.unpack("!QQ", str) + h, l = struct.unpack("!QQ", s) return h << 64 | l if hasattr(socket,'has_ipv6') and socket.has_ipv6: