bivashy/Blitz-Proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(ip): add ip.sb fallback for public IP detection

Browse Source
This commit is contained in:
ReturnFI
2025-12-14 20:42:25 +00:00
parent 9972f0f89b
commit a78b6206d6
1 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
core/scripts/hysteria2/ip.py
View File

@ -32,29 +32,53 @@ def get_interface_addresses():
ipv4_address = "" ipv4_address = ""
ipv6_address = "" ipv6_address = ""
interfaces = subprocess.check_output(["ip", "-o", "link", "show"]).decode() try:
interfaces = [ interfaces_output = subprocess.check_output(["ip", "-o", "link", "show"], stderr=subprocess.DEVNULL).decode()
line.split(": ")[1] interface_lines = interfaces_output.strip().splitlines()
for line in interfaces.strip().splitlines() candidate_interfaces = []
if not re.match(r"^(lo|wgcf|warp)$", line.split(": ")[1]) for line in interface_lines:
] parts = line.split(': ')
if len(parts) > 1:
iface_name = parts[1].split('@')[0]
if iface_name not in ["lo", "wgcf", "warp"]:
candidate_interfaces.append(iface_name)
for iface in interfaces: for iface in candidate_interfaces:
try:
if not ipv4_address:
ipv4_output = subprocess.check_output(["ip", "-o", "-4", "addr", "show", iface], stderr=subprocess.DEVNULL).decode()
for line in ipv4_output.strip().splitlines():
addr = line.split()[3].split("/")[0]
if not re.match(r"^(127\.|10\.|192\.168\.|172\.(1[6-9]|2[0-9]|3[0-1]))", addr):
ipv4_address = addr
break
if not ipv6_address:
ipv6_output = subprocess.check_output(["ip", "-o", "-6", "addr", "show", iface], stderr=subprocess.DEVNULL).decode()
for line in ipv6_output.strip().splitlines():
addr = line.split()[3].split("/")[0]
if not re.match(r"^(::1|fe80:)", addr):
ipv6_address = addr
break
except subprocess.CalledProcessError:
continue
except (subprocess.CalledProcessError, FileNotFoundError):
pass
if not ipv4_address:
try: try:
ipv4 = subprocess.check_output(["ip", "-o", "-4", "addr", "show", iface]).decode() ipv4_address = subprocess.check_output(["curl", "-s", "-4", "ip.sb"], timeout=5).decode().strip()
for line in ipv4.strip().splitlines(): if not re.match(r"^\d{1,3}(\.\d{1,3}){3}$", ipv4_address):
addr = line.split()[3].split("/")[0] ipv4_address = ""
if not re.match(r"^(127\.|10\.|192\.168\.|172\.(1[6-9]|2[0-9]|3[0-1]))", addr): except (subprocess.CalledProcessError, FileNotFoundError, subprocess.TimeoutExpired):
ipv4_address = addr ipv4_address = ""
break
ipv6 = subprocess.check_output(["ip", "-o", "-6", "addr", "show", iface]).decode() if not ipv6_address:
for line in ipv6.strip().splitlines(): try:
addr = line.split()[3].split("/")[0] ipv6_address = subprocess.check_output(["curl", "-s", "-6", "ip.sb"], timeout=5).decode().strip()
if not re.match(r"^(::1|fe80:)", addr): if ":" not in ipv6_address:
ipv6_address = addr ipv6_address = ""
break except (subprocess.CalledProcessError, FileNotFoundError, subprocess.TimeoutExpired):
except subprocess.CalledProcessError: ipv6_address = ""
continue
return ipv4_address, ipv6_address return ipv4_address, ipv6_address