Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support ipv6 tunnels #195

Merged
merged 5 commits into from
Oct 24, 2020
Merged

support ipv6 tunnels #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aadde59
timeout for transport socket
g0djan Oct 24, 2020
1e374b2
rebase + timeout
g0djan Oct 24, 2020
dc9870a
remove trailing whitespace
g0djan Oct 24, 2020
28f60ef
cli --help syntax
g0djan Oct 24, 2020
c23785f
change message
g0djan Oct 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,12 @@ CLI usage
usage: sshtunnel [-h] [-U SSH_USERNAME] [-p SSH_PORT] [-P SSH_PASSWORD] -R
IP:PORT [IP:PORT ...] [-L [IP:PORT [IP:PORT ...]]]
[-k SSH_HOST_KEY] [-K KEY_FILE] [-S KEY_PASSWORD] [-t] [-v]
[-V] [-x IP:PORT] [-c SSH_CONFIG_FILE] [-z] [-n] [-d [FOLDER [FOLDER ...]]]
[-V] [-x IP:PORT] [-c SSH_CONFIG_FILE] [-z] [-n]
[-d [FOLDER [FOLDER ...]]]
ssh_address

Pure python ssh tunnel utils
Version 0.1.5
Version 0.2.0

positional arguments:
ssh_address SSH server IP address (GW for SSH tunnels)
Expand Down
5 changes: 5 additions & 0 deletions changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ CONTRIBUTORS
- `Dan Harbin`_
- `Ignacio Peluffo`_
- `Niels Zeilemaker`_
- `Georgy Rylov`_

CHANGELOG
=========

- v.0.2.0 (`Georgy Rylov`_)
+ Support IPv6 without proxy command. Use built-in paramiko create socket logic. The logic tries to use ipv6 socket family first, then ipv4 socket family.

- v.0.1.5 (`JM Fernández`_)
+ Introduce `block_on_close` attribute

Expand Down Expand Up @@ -121,6 +125,7 @@ CHANGELOG
.. _Dan Harbin: https://github.com/RasterBurn
.. _Ignacio Peluffo: https://github.com/ipeluffo
.. _Niels Zeilemaker: https://github.com/NielsZeilemaker
.. _Georgy Rylov: https://github.com/g0djan
.. _#13: https://github.com/pahaz/sshtunnel/issues/13
.. _#16: https://github.com/pahaz/sshtunnel/issues/16
.. _#19: https://github.com/pahaz/sshtunnel/issues/19
Expand Down
6 changes: 4 additions & 2 deletions sshtunnel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
input_ = input


__version__ = '0.1.5'
__version__ = '0.2.0'
__author__ = 'pahaz'


Expand Down Expand Up @@ -1111,11 +1111,13 @@ def _get_transport(self):
self.logger.debug('Connecting via proxy: {0}'.format(proxy_repr))
_socket = self.ssh_proxy
else:
_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
_socket = (self.ssh_host, self.ssh_port)
if isinstance(_socket, socket.socket):
_socket.settimeout(SSH_TIMEOUT)
_socket.connect((self.ssh_host, self.ssh_port))
transport = paramiko.Transport(_socket)
g0djan marked this conversation as resolved.
Show resolved Hide resolved
if isinstance(transport.sock, socket.socket):
transport.sock.settimeout(SSH_TIMEOUT)
transport.set_keepalive(self.set_keepalive)
transport.use_compression(compress=self.compression)
transport.daemon = self.daemon_transport
Expand Down