extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-04-27 12:49:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #667 from skuhl/server-version-print-early

Browse Source 
Print server's python version earlier
This commit is contained in:
Brian May 2021-07-30 07:52:28 +10:00 committed by GitHub
commit 7d44e890eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sshuttle/assembler.py
View File

@ -1,8 +1,12 @@
import sys import sys
import zlib import zlib
import types import types
import platform
verbosity = verbosity # noqa: F821 must be a previously defined global verbosity = verbosity # noqa: F821 must be a previously defined global
if verbosity > 0:
sys.stderr.write(' s: Running server on remote host with %s (version %s)\n'
% (sys.executable, platform.python_version()))
z = zlib.decompressobj() z = zlib.decompressobj()
while 1: while 1:
name = sys.stdin.readline().strip() name = sys.stdin.readline().strip()

3
sshuttle/server.py
View File

@ -5,7 +5,6 @@ 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
@ -272,8 +271,6 @@ def main(latency_control, latency_buffer_size, auto_hosts, to_nameserver,
auto_nets): auto_nets):
try: try:
helpers.logprefix = ' s: ' helpers.logprefix = ' s: '
debug1('Starting server with Python version %s'
% platform.python_version())
debug1('latency control setting = %r' % latency_control) debug1('latency control setting = %r' % latency_control)
if latency_buffer_size: if latency_buffer_size: