extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2024-11-22 16:03:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Split expiration into handling into another function.

Browse Source
This commit is contained in:
Brian May 2011-05-31 15:14:40 +10:00
parent a8b71f6387
commit 94566b5efc
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
client.py
View File

@ -175,6 +175,16 @@ class FirewallClient:
raise Fatal('cleanup: %r returned %d' % (self.argv, rv))
dnsreqs = {}
def expire_connections(now, mux):
for chan,(peer,sock,timeout) in dnsreqs.items():
if timeout < now:
debug3('expiring dnsreqs channel=%d peer=%r\n' % (chan, peer))
del mux.channels[chan]
del dnsreqs[chan]
debug3('Remaining DNS requests: %d\n' % len(dnsreqs))
def onaccept(listener, mux, handlers):
global _extra_fd
try:
@ -207,9 +217,9 @@ def onaccept(listener, mux, handlers):
mux.send(chan, ssnet.CMD_CONNECT, '%s,%s' % dstip)
outwrap = MuxWrapper(mux, chan)
handlers.append(Proxy(SockWrapper(sock, sock), outwrap))
expire_connections(time.time(), mux)
dnsreqs = {}
def dns_done(chan, data):
peer,sock,timeout = dnsreqs.get(chan) or (None,None,None)
debug3('dns_done: channel=%r peer=%r\n' % (chan, peer))
@ -228,10 +238,7 @@ def ondns(listener, mux, handlers):
dnsreqs[chan] = peer,listener,now+30
mux.send(chan, ssnet.CMD_DNS_REQ, pkt)
mux.channels[chan] = lambda cmd,data: dns_done(chan,data)
for chan,(peer,sock,timeout) in dnsreqs.items():
if timeout < now:
del dnsreqs[chan]
debug3('Remaining DNS requests: %d\n' % len(dnsreqs))
expire_connections(now, mux)
def _main(listener, fw, ssh_cmd, remotename, python, latency_control,