Commit bcd3205d authored by Brian May's avatar Brian May

Fix passing latency_control to server.

parent a651d748
...@@ -29,5 +29,6 @@ sys.stdout.flush() ...@@ -29,5 +29,6 @@ sys.stdout.flush()
import sshuttle.helpers import sshuttle.helpers
sshuttle.helpers.verbose = verbosity sshuttle.helpers.verbose = verbosity
import sshuttle.cmdline_options as options
from sshuttle.server import main from sshuttle.server import main
main() main(options.latency_control)
...@@ -15,10 +15,6 @@ from sshuttle.helpers import log, debug1, debug2, debug3, Fatal, \ ...@@ -15,10 +15,6 @@ from sshuttle.helpers import log, debug1, debug2, debug3, Fatal, \
resolvconf_random_nameserver resolvconf_random_nameserver
if not globals().get('latency_control'):
latency_control = None
def _ipmatch(ipstr): def _ipmatch(ipstr):
if ipstr == 'default': if ipstr == 'default':
ipstr = '0.0.0.0/0' ipstr = '0.0.0.0/0'
...@@ -210,7 +206,7 @@ class UdpProxy(Handler): ...@@ -210,7 +206,7 @@ class UdpProxy(Handler):
self.mux.send(self.chan, ssnet.CMD_UDP_DATA, hdr + data) self.mux.send(self.chan, ssnet.CMD_UDP_DATA, hdr + data)
def main(): def main(latency_control):
if helpers.verbose >= 1: if helpers.verbose >= 1:
helpers.logprefix = ' s: ' helpers.logprefix = ' s: '
else: else:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment