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

Rename listener to tcp_listener, as it is TCP specific.

Browse Source
This commit is contained in:
Brian May 2011-06-06 10:43:39 +10:00
parent 08bd1dca46
commit 6e53b07002
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client.py
View File

@ -241,7 +241,7 @@ def ondns(listener, mux, handlers):
expire_connections(now, mux) expire_connections(now, mux)
def _main(listener, fw, ssh_cmd, remotename, python, latency_control, def _main(tcp_listener, fw, ssh_cmd, remotename, python, latency_control,
dnslistener, seed_hosts, auto_nets, dnslistener, seed_hosts, auto_nets,
syslog, daemon): syslog, daemon):
handlers = [] handlers = []
@ -321,7 +321,7 @@ def _main(listener, fw, ssh_cmd, remotename, python, latency_control,
fw.sethostip(name, ip) fw.sethostip(name, ip)
mux.got_host_list = onhostlist mux.got_host_list = onhostlist
handlers.append(Handler([listener], lambda: onaccept(listener, mux, handlers))) handlers.append(Handler([tcp_listener], lambda: onaccept(tcp_listener, mux, handlers)))
if dnslistener: if dnslistener:
handlers.append(Handler([dnslistener], lambda: ondns(dnslistener, mux, handlers))) handlers.append(Handler([dnslistener], lambda: ondns(dnslistener, mux, handlers)))
@ -363,12 +363,12 @@ def main(listenip, ssh_cmd, remotename, python, latency_control, dns,
debug2('Binding:') debug2('Binding:')
for port in ports: for port in ports:
debug2(' %d' % port) debug2(' %d' % port)
listener = socket.socket() tcp_listener = socket.socket()
listener.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) tcp_listener.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
dnslistener = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) dnslistener = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
dnslistener.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) dnslistener.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
try: try:
listener.bind((listenip[0], port)) tcp_listener.bind((listenip[0], port))
dnslistener.bind((listenip[0], port)) dnslistener.bind((listenip[0], port))
bound = True bound = True
break break
@ -378,8 +378,8 @@ def main(listenip, ssh_cmd, remotename, python, latency_control, dns,
if not bound: if not bound:
assert(last_e) assert(last_e)
raise last_e raise last_e
listener.listen(10) tcp_listener.listen(10)
listenip = listener.getsockname() listenip = tcp_listener.getsockname()
debug1('Listening on %r.\n' % (listenip,)) debug1('Listening on %r.\n' % (listenip,))
if dns: if dns:
@ -393,7 +393,7 @@ def main(listenip, ssh_cmd, remotename, python, latency_control, dns,
fw = FirewallClient(listenip[1], subnets_include, subnets_exclude, dnsport) fw = FirewallClient(listenip[1], subnets_include, subnets_exclude, dnsport)
try: try:
return _main(listener, fw, ssh_cmd, remotename, return _main(tcp_listener, fw, ssh_cmd, remotename,
python, latency_control, dnslistener, python, latency_control, dnslistener,
seed_hosts, auto_nets, syslog, daemon) seed_hosts, auto_nets, syslog, daemon)
finally: finally: