extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-01-30 09:48:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hyphen in hostname fix

Browse Source
This commit is contained in:
Thomas Bouve 2019-02-13 20:01:09 +01:00 committed by Brian May
parent 4e945ca4de
commit 4372c6c117
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sshuttle/options.py
View File

@ -32,7 +32,7 @@ def parse_subnetport(s):
if s.count(':') > 1: if s.count(':') > 1:
rx = r'(?:\[?([\w\:]+)(?:/(\d+))?]?)(?::(\d+)(?:-(\d+))?)?$' rx = r'(?:\[?([\w\:]+)(?:/(\d+))?]?)(?::(\d+)(?:-(\d+))?)?$'
else: else:
rx = r'([\w\.]+)(?:/(\d+))?(?::(\d+)(?:-(\d+))?)?$' rx = r'([\w\.\-]+)(?:/(\d+))?(?::(\d+)(?:-(\d+))?)?$'
m = re.match(rx, s) m = re.match(rx, s)
if not m: if not m:
@ -63,7 +63,7 @@ def parse_ipport(s):
elif ']' in s: elif ']' in s:
rx = r'(?:\[([^]]+)])(?::(\d+))?$' rx = r'(?:\[([^]]+)])(?::(\d+))?$'
else: else:
rx = r'([\w\.]+)(?::(\d+))?$' rx = r'([\w\.\-]+)(?::(\d+))?$'
m = re.match(rx, s) m = re.match(rx, s)
if not m: if not m: