Fix passing latency_control to server.

Author: brianmay

sshuttle/assembler.py

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

sshuttle/server.py

@@ -15,10 +15,6 @@
     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 @@ def callback(self):
         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: