github/DDNS
4
0
Fork 0
mirror of https://github.com/NewFuture/DDNS.git synced 2022-04-19 20:24:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #62 from xufan6/patch-1

Browse Source 
fix ip regex in ip address format
This commit is contained in:
New Future
2019-06-18 12:14:55 +08:00
committed by GitHub
parent bccb8406bb a920389a59
commit 5400a41049
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/ip.py
+3 -3
View File
@@ -63,7 +63,7 @@ def ip_regex_match(parrent_regex, match_regex):
if os_name == 'nt': # windows:
cmd = 'ipconfig'
else:
cmd = 'ifconfig || ip address'
cmd = 'ifconfig 2>/dev/null || ip address'
for s in popen(cmd).readlines():
addr = ip_pattern.search(s)
@@ -75,7 +75,7 @@ def regex_v4(reg): # ipv4 正则提取
if os_name == 'nt': # Windows: IPv4 xxx: 192.168.1.2
regex_str = r'IPv4 .*: ((?:\d{1,3}\.){3}\d{1,3})\W'
else:
regex_str = r'inet (?:addr\:)?((?:\d{1,3}\.){3}\d{1,3})\s'
regex_str = r'inet (?:addr\:)?((?:\d{1,3}\.){3}\d{1,3})[\s/]'
return ip_regex_match(regex_str, reg)
@@ -83,5 +83,5 @@ def regex_v6(reg): # ipv6 正则提取
if os_name == 'nt': # Windows: IPv4 xxx: ::1
regex_str = r'IPv6 .*: ([\:\dabcdef]*)?\W'
else:
regex_str = r'inet6 (?:addr\:)?([\:\dabcdef]*)?\s'
regex_str = r'inet6 (?:addr\:)?([\:\dabcdef]*)?[\s/%]'
return ip_regex_match(regex_str, reg)