Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
sshuttle
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pub
sshuttle
Commits
bcd3205d
Commit
bcd3205d
authored
Nov 16, 2015
by
Brian May
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix passing latency_control to server.
parent
a651d748
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
assembler.py
sshuttle/assembler.py
+2
-1
server.py
sshuttle/server.py
+1
-5
No files found.
sshuttle/assembler.py
View file @
bcd3205d
...
...
@@ -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
)
sshuttle/server.py
View file @
bcd3205d
...
...
@@ -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
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment