extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-04-25 11:48:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Print Python version used for the various stages.

Browse Source
This commit is contained in:
Brian May 2015-12-01 10:01:50 +11:00
parent 5ab76a6ba9
commit 43d6ad6a51
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sshuttle/client.py
View File

@ -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,
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 = []

4
sshuttle/firewall.py
View File

@ -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():
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:

4
sshuttle/hostwatch.py
View File

@ -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):
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)

4
sshuttle/server.py
View File

@ -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):
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: