Skip to content

S
sshuttle
Commit a33f6199 authored by Brian May's avatar Brian May
Browse files
Options

Remove broken IPv6 code.

parent 0f2c249e
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 7 deletions
src/ssh.py
View file @ a33f6199
...@@ -27,9 +27,7 @@ def connect(ssh_cmd, rhostport, python, stderr, options): ...@@ -27,9 +27,7 @@ def connect(ssh_cmd, rhostport, python, stderr, options):
main_exe = sys.argv[0] main_exe = sys.argv[0]
portl = [] portl = []
rhostIsIPv6 = False
if (rhostport or '').count(':') > 1: if (rhostport or '').count(':') > 1:
rhostIsIPv6 = True
if rhostport.count(']') or rhostport.count('['): if rhostport.count(']') or rhostport.count('['):
result = rhostport.split(']') result = rhostport.split(']')
rhost = result[0].strip('[') rhost = result[0].strip('[')
...@@ -48,10 +46,6 @@ def connect(ssh_cmd, rhostport, python, stderr, options): ...@@ -48,10 +46,6 @@ def connect(ssh_cmd, rhostport, python, stderr, options):
if rhost == '-': if rhost == '-':
rhost = None rhost = None
ipv6flag = []
if rhostIsIPv6:
ipv6flag = ['-6']
z = zlib.compressobj(1) z = zlib.compressobj(1)
content = readfile('assembler.py') content = readfile('assembler.py')
optdata = ''.join("%s=%r\n" % (k,v) for (k,v) in options.items()) optdata = ''.join("%s=%r\n" % (k,v) for (k,v) in options.items())
...@@ -88,7 +82,6 @@ def connect(ssh_cmd, rhostport, python, stderr, options): ...@@ -88,7 +82,6 @@ def connect(ssh_cmd, rhostport, python, stderr, options):
"exec \"$P\" -c '%s'") % pyscript "exec \"$P\" -c '%s'") % pyscript
argv = (sshl + argv = (sshl +
portl + portl +
ipv6flag +
[rhost, '--', pycmd]) [rhost, '--', pycmd])
(s1,s2) = socket.socketpair() (s1,s2) = socket.socketpair()
def setup(): def setup():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment