codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add windows support to is_ip

This commit is contained in:
Calum Lind 2012-12-01 02:21:01 +00:00
parent 0b5b585992
commit 71183f6c19
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deluge/common.py
View File

@ -544,15 +544,23 @@ def is_ip(ip):
import socket import socket
#first we test ipv4 #first we test ipv4
try: try:
if socket.inet_pton(socket.AF_INET, "%s" % (ip)): if windows_check():
return True if socket.inet_aton("%s" % (ip)):
return True
else:
if socket.inet_pton(socket.AF_INET, "%s" % (ip)):
return True
except socket.error: except socket.error:
if not socket.has_ipv6: if not socket.has_ipv6:
return False return False
#now test ipv6 #now test ipv6
try: try:
if socket.inet_pton(socket.AF_INET6, "%s" % (ip)): if windows_check():
log.warning("ipv6 check unavailable on windows")
return True return True
else:
if socket.inet_pton(socket.AF_INET6, "%s" % (ip)):
return True
except socket.error: except socket.error:
return False return False