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

stdin and stdout have different fds, so make SockWrapper take *two* socks.

Browse Source 
We'll need this when we have a SockWrapper pointing at a Mux on a subprocess
pipe.
This commit is contained in:
Avery Pennarun
2010-05-01 23:32:30 -04:00
parent 5f0bfb5d9e
commit d435c41bdb
2 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client.py
View File

@ -25,7 +25,7 @@ def _main(listener, listenport, use_server, remotename, subnets):
handlers = []
if use_server:
(serverproc, serversock) = ssh.connect(remotename)
mux = Mux(serversock)
mux = Mux(serversock, serversock)
handlers.append(mux)
# we definitely want to do this *after* starting ssh, or we might end
@ -48,8 +48,8 @@ def _main(listener, listenport, use_server, remotename, subnets):
outsock = socket.socket()
outsock.setsockopt(socket.SOL_IP, socket.IP_TTL, 42)
outsock.connect(dstip)
outwrap = SockWrapper(outsock)
handlers.append(Proxy(SockWrapper(sock), outwrap))
outwrap = SockWrapper(outsock, outsock)
handlers.append(Proxy(SockWrapper(sock, sock), outwrap))
handlers.append(Handler([listener], onaccept))
while 1: