extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-08-10 08:07:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

add option to allow the remote python binary's name/path to be specified

Browse Source
This commit is contained in:
chocolateboy
2010-09-03 15:46:25 +01:00
committed by Avery Pennarun
parent 5bf8687ce3
commit ee74110cff
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client.py
View File

@ -92,7 +92,7 @@ class FirewallClient:
raise Fatal('cleanup: %r returned %d' % (self.argv, rv))
def _main(listener, fw, use_server, remotename, seed_hosts, auto_nets):
def _main(listener, fw, use_server, remotename, python, seed_hosts, auto_nets):
handlers = []
if use_server:
if helpers.verbose >= 1:
@ -100,7 +100,7 @@ def _main(listener, fw, use_server, remotename, seed_hosts, auto_nets):
else:
helpers.logprefix = 'client: '
debug1('connecting to server...\n')
(serverproc, serversock) = ssh.connect(remotename)
(serverproc, serversock) = ssh.connect(remotename, python)
mux = Mux(serversock, serversock)
handlers.append(mux)
@ -188,7 +188,7 @@ def _main(listener, fw, use_server, remotename, seed_hosts, auto_nets):
mux.check_fullness()
def main(listenip, use_server, remotename, seed_hosts, auto_nets,
def main(listenip, use_server, remotename, python, seed_hosts, auto_nets,
subnets_include, subnets_exclude):
debug1('Starting sshuttle proxy.\n')
listener = socket.socket()
@ -220,6 +220,6 @@ def main(listenip, use_server, remotename, seed_hosts, auto_nets,
try:
return _main(listener, fw, use_server, remotename,
seed_hosts, auto_nets)
python, seed_hosts, auto_nets)
finally:
fw.done()