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
43d6ad6a
Commit
43d6ad6a
authored
Nov 30, 2015
by
Brian May
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Print Python version used for the various stages.
parent
5ab76a6b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
0 deletions
+16
-0
client.py
sshuttle/client.py
+4
-0
firewall.py
sshuttle/firewall.py
+4
-0
hostwatch.py
sshuttle/hostwatch.py
+4
-0
server.py
sshuttle/server.py
+4
-0
No files found.
sshuttle/client.py
View file @
43d6ad6a
...
@@ -10,6 +10,7 @@ import sshuttle.ssnet as ssnet
...
@@ -10,6 +10,7 @@ import sshuttle.ssnet as ssnet
import
sshuttle.ssh
as
ssh
import
sshuttle.ssh
as
ssh
import
sshuttle.ssyslog
as
ssyslog
import
sshuttle.ssyslog
as
ssyslog
import
sys
import
sys
import
platform
from
sshuttle.ssnet
import
SockWrapper
,
Handler
,
Proxy
,
Mux
,
MuxWrapper
from
sshuttle.ssnet
import
SockWrapper
,
Handler
,
Proxy
,
Mux
,
MuxWrapper
from
sshuttle.helpers
import
log
,
debug1
,
debug2
,
debug3
,
Fatal
,
islocal
,
\
from
sshuttle.helpers
import
log
,
debug1
,
debug2
,
debug3
,
Fatal
,
islocal
,
\
resolvconf_nameservers
resolvconf_nameservers
...
@@ -384,6 +385,9 @@ def _main(tcp_listener, udp_listener, fw, ssh_cmd, remotename,
...
@@ -384,6 +385,9 @@ def _main(tcp_listener, udp_listener, fw, ssh_cmd, remotename,
dns_listener
,
seed_hosts
,
auto_nets
,
dns_listener
,
seed_hosts
,
auto_nets
,
syslog
,
daemon
):
syslog
,
daemon
):
debug1
(
'Starting client with Python version
%
s
\n
'
%
platform
.
python_version
())
method
=
fw
.
method
method
=
fw
.
method
handlers
=
[]
handlers
=
[]
...
...
sshuttle/firewall.py
View file @
43d6ad6a
...
@@ -4,6 +4,7 @@ import signal
...
@@ -4,6 +4,7 @@ import signal
import
sshuttle.ssyslog
as
ssyslog
import
sshuttle.ssyslog
as
ssyslog
import
sys
import
sys
import
os
import
os
import
platform
from
sshuttle.helpers
import
debug1
,
debug2
,
Fatal
from
sshuttle.helpers
import
debug1
,
debug2
,
Fatal
from
sshuttle.methods
import
get_auto_method
,
get_method
from
sshuttle.methods
import
get_auto_method
,
get_method
...
@@ -86,6 +87,9 @@ def setup_daemon():
...
@@ -86,6 +87,9 @@ def setup_daemon():
def
main
(
method_name
,
syslog
):
def
main
(
method_name
,
syslog
):
stdin
,
stdout
=
setup_daemon
()
stdin
,
stdout
=
setup_daemon
()
debug1
(
'Starting firewall with Python version
%
s
\n
'
%
platform
.
python_version
())
if
method_name
==
"auto"
:
if
method_name
==
"auto"
:
method
=
get_auto_method
()
method
=
get_auto_method
()
else
:
else
:
...
...
sshuttle/hostwatch.py
View file @
43d6ad6a
...
@@ -5,6 +5,7 @@ import select
...
@@ -5,6 +5,7 @@ import select
import
errno
import
errno
import
os
import
os
import
sys
import
sys
import
platform
import
subprocess
as
ssubprocess
import
subprocess
as
ssubprocess
import
sshuttle.helpers
as
helpers
import
sshuttle.helpers
as
helpers
...
@@ -255,6 +256,9 @@ def hw_main(seed_hosts):
...
@@ -255,6 +256,9 @@ def hw_main(seed_hosts):
else
:
else
:
helpers
.
logprefix
=
'hostwatch: '
helpers
.
logprefix
=
'hostwatch: '
debug1
(
'Starting hostwatch with Python version
%
s
\n
'
%
platform
.
python_version
())
read_host_cache
()
read_host_cache
()
_enqueue
(
_check_etc_hosts
)
_enqueue
(
_check_etc_hosts
)
...
...
sshuttle/server.py
View file @
43d6ad6a
...
@@ -5,6 +5,7 @@ import traceback
...
@@ -5,6 +5,7 @@ import traceback
import
time
import
time
import
sys
import
sys
import
os
import
os
import
platform
import
sshuttle.ssnet
as
ssnet
import
sshuttle.ssnet
as
ssnet
import
sshuttle.helpers
as
helpers
import
sshuttle.helpers
as
helpers
...
@@ -214,6 +215,9 @@ class UdpProxy(Handler):
...
@@ -214,6 +215,9 @@ class UdpProxy(Handler):
def
main
(
latency_control
):
def
main
(
latency_control
):
debug1
(
'Starting server with Python version
%
s
\n
'
%
platform
.
python_version
())
if
helpers
.
verbose
>=
1
:
if
helpers
.
verbose
>=
1
:
helpers
.
logprefix
=
' s: '
helpers
.
logprefix
=
' s: '
else
:
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