extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-04-20 17:28:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename dnslistener to dns_listener for consistency with tcp_listener.

Browse Source
This commit is contained in:
Brian May 2011-06-06 10:44:38 +10:00
parent 6e53b07002
commit 97dca42291
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client.py
View File

@ -242,7 +242,7 @@ def ondns(listener, mux, handlers):
def _main(tcp_listener, fw, ssh_cmd, remotename, python, latency_control, def _main(tcp_listener, fw, ssh_cmd, remotename, python, latency_control,
dnslistener, seed_hosts, auto_nets, dns_listener, seed_hosts, auto_nets,
syslog, daemon): syslog, daemon):
handlers = [] handlers = []
if helpers.verbose >= 1: if helpers.verbose >= 1:
@ -323,8 +323,8 @@ def _main(tcp_listener, fw, ssh_cmd, remotename, python, latency_control,
handlers.append(Handler([tcp_listener], lambda: onaccept(tcp_listener, mux, handlers))) handlers.append(Handler([tcp_listener], lambda: onaccept(tcp_listener, mux, handlers)))
if dnslistener: if dns_listener:
handlers.append(Handler([dnslistener], lambda: ondns(dnslistener, mux, handlers))) handlers.append(Handler([dns_listener], lambda: ondns(dns_listener, mux, handlers)))
if seed_hosts != None: if seed_hosts != None:
debug1('seed_hosts: %r\n' % seed_hosts) debug1('seed_hosts: %r\n' % seed_hosts)
@ -365,11 +365,11 @@ def main(listenip, ssh_cmd, remotename, python, latency_control, dns,
debug2(' %d' % port) debug2(' %d' % port)
tcp_listener = socket.socket() tcp_listener = socket.socket()
tcp_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) dns_listener = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
dnslistener.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) dns_listener.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
try: try:
tcp_listener.bind((listenip[0], port)) tcp_listener.bind((listenip[0], port))
dnslistener.bind((listenip[0], port)) dns_listener.bind((listenip[0], port))
bound = True bound = True
break break
except socket.error, e: except socket.error, e:
@ -383,18 +383,18 @@ def main(listenip, ssh_cmd, remotename, python, latency_control, dns,
debug1('Listening on %r.\n' % (listenip,)) debug1('Listening on %r.\n' % (listenip,))
if dns: if dns:
dnsip = dnslistener.getsockname() dnsip = dns_listener.getsockname()
debug1('DNS listening on %r.\n' % (dnsip,)) debug1('DNS listening on %r.\n' % (dnsip,))
dnsport = dnsip[1] dnsport = dnsip[1]
else: else:
dnsport = 0 dnsport = 0
dnslistener = None dns_listener = None
fw = FirewallClient(listenip[1], subnets_include, subnets_exclude, dnsport) fw = FirewallClient(listenip[1], subnets_include, subnets_exclude, dnsport)
try: try:
return _main(tcp_listener, fw, ssh_cmd, remotename, return _main(tcp_listener, fw, ssh_cmd, remotename,
python, latency_control, dnslistener, python, latency_control, dns_listener,
seed_hosts, auto_nets, syslog, daemon) seed_hosts, auto_nets, syslog, daemon)
finally: finally:
try: try: