Fix passing latency_control to server.

This commit is contained in:
Brian May 2015-11-16 11:32:17 +11:00
parent a651d748cd
commit bcd3205db1
2 changed files with 3 additions and 6 deletions

View File

@ -29,5 +29,6 @@ sys.stdout.flush()
import sshuttle.helpers
sshuttle.helpers.verbose = verbosity
import sshuttle.cmdline_options as options
from sshuttle.server import main
main()
main(options.latency_control)

View File

@ -15,10 +15,6 @@ from sshuttle.helpers import log, debug1, debug2, debug3, Fatal, \
resolvconf_random_nameserver
if not globals().get('latency_control'):
latency_control = None
def _ipmatch(ipstr):
if ipstr == 'default':
ipstr = '0.0.0.0/0'
@ -210,7 +206,7 @@ class UdpProxy(Handler):
self.mux.send(self.chan, ssnet.CMD_UDP_DATA, hdr + data)
def main():
def main(latency_control):
if helpers.verbose >= 1:
helpers.logprefix = ' s: '
else: