extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-01-16 19:09:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #461 from joshuarli/doc/update-py2-removal

Browse Source 
doc: py2 removal clean sweep
This commit is contained in:
Brian May 2020-06-11 09:55:36 +10:00 committed by GitHub
commit a53f026056
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/manpage.rst
View File

@ -11,7 +11,7 @@ Description
----------- -----------
:program:`sshuttle` allows you to create a VPN connection from your :program:`sshuttle` allows you to create a VPN connection from your
machine to any remote server that you can connect to via machine to any remote server that you can connect to via
ssh, as long as that server has python 2.3 or higher. ssh, as long as that server has python 3.5 or higher.
To work, you must have root access on the local machine, To work, you must have root access on the local machine,
but you can have a normal account on the server. but you can have a normal account on the server.

5
docs/requirements.rst
View File

@ -57,9 +57,8 @@ cmd.exe with Administrator access. See :doc:`windows` for more information.
Server side Requirements Server side Requirements
------------------------ ------------------------
The server can run in any version of Python between 2.4 and 3.6.
However it is recommended that you use Python 2.7, Python 3.5 or later whenever - Python 3.5 or greater.
possible as support for older versions might be dropped in the future.
Additional Suggested Software Additional Suggested Software

3
sshuttle/ssnet.py
View File

@ -10,15 +10,12 @@ from sshuttle.helpers import b, log, debug1, debug2, debug3, Fatal
MAX_CHANNEL = 65535 MAX_CHANNEL = 65535
LATENCY_BUFFER_SIZE = 32768 LATENCY_BUFFER_SIZE = 32768
# these don't exist in the socket module in python 2.3!
SHUT_RD = 0 SHUT_RD = 0
SHUT_WR = 1 SHUT_WR = 1
SHUT_RDWR = 2 SHUT_RDWR = 2
HDR_LEN = 8 HDR_LEN = 8
CMD_EXIT = 0x4200 CMD_EXIT = 0x4200
CMD_PING = 0x4201 CMD_PING = 0x4201
CMD_PONG = 0x4202 CMD_PONG = 0x4202