Skip to content

Added a type tunnel configuration with backwards compatible behaviour. #6

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

Merged
death merged 1 commit into from
Jul 3, 2018
Merged

Added a type tunnel configuration with backwards compatible behaviour. #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 34 additions & 5 deletions ssh-tunnels.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@
;; - Set the variable `ssh-tunnels-configurations', e.g.:
;;
;; (setq ssh-tunnels-configurations
;; '((:name "my tunnel"
;; '((:name "my local tunnel"
;; :local-port 1234
;; :remote-port 3306
;; :login "me@host")
;; (:name "my remote tunnel"
;; :type "-R"
;; :local-port 1234
;; :remote-port 3306
;; :login "me@host")))
Expand Down Expand Up @@ -111,6 +116,13 @@ with the following properties:

:name - The name of the tunnel.

:type - Tunnel type; defaults to \"-L\" (Local).
May also be \"-R\" or \"-D\" for Remote and Dynamic port forwards.
If set to \"SH\", no port forwarding will be attempted and your ssh
client is responsible for tunnelling (e.g. with ~/.ssh/config), in
this case `:login' must match your ~/.ssh/config entry and `:host',
`:local-port' and `:remote-port' are ignored.

:login - The SSH login to use.

:host - The tunneling host; defaults to \"localhost\".
Expand Down Expand Up @@ -172,6 +184,7 @@ become irrelevant if `ssh-tunnels-configurations' changes.")
(setq tabulated-list-format
(vector `("S" 1 t)
`("Name" ,name-width t)
`("T." 2 t)
`("LPort" ,local-port-width ssh-tunnels--lport> :right-align t)
`("Host" ,host-width t)
`("RPort" ,remote-port-width ssh-tunnels--rport> :right-align t)
Expand All @@ -180,13 +193,15 @@ become irrelevant if `ssh-tunnels-configurations' changes.")
(let ((entries '()))
(dolist (tunnel ssh-tunnels-configurations)
(let* ((name (ssh-tunnels--property tunnel :name))
(tunnel-type (ssh-tunnels--property tunnel :type))
(local-port (ssh-tunnels--property tunnel :local-port))
(host (ssh-tunnels--property tunnel :host))
(remote-port (ssh-tunnels--property tunnel :remote-port))
(login (ssh-tunnels--property tunnel :login)))
(push (list tunnel
(vector (if (ssh-tunnels--check tunnel) "R" " ")
(ssh-tunnels--pretty-name name)
tunnel-type
(number-to-string local-port)
host
(number-to-string remote-port)
Expand Down Expand Up @@ -248,25 +263,39 @@ become irrelevant if `ssh-tunnels-configurations' changes.")
(defun ssh-tunnels--property (tunnel key)
(cond ((eq key :host)
(or (cl-getf tunnel :host) "localhost"))
((eq key :type)
(or (cl-getf tunnel :type) "-L"))
((eq key :local-port)
(or (gethash (cl-getf tunnel :name) ssh-tunnels--state-table)
(cl-getf tunnel :local-port)
(cl-getf tunnel :remote-port)))
(cl-getf tunnel :remote-port)
(if (string= (cl-getf tunnel :type) "SH") 0)))
((eq key :remote-port)
(or (cl-getf tunnel :remote-port)
(cl-getf tunnel :local-port)))
(cl-getf tunnel :local-port)
(if (string= (cl-getf tunnel :type) "SH") 0)))
(t
(cl-getf tunnel key))))

(defun ssh-tunnels--command (tunnel command)
(let* ((name (ssh-tunnels--property tunnel :name))
(tunnel-type (ssh-tunnels--property tunnel :type))
(local-port (ssh-tunnels--property tunnel :local-port))
(remote-port (ssh-tunnels--property tunnel :remote-port))
(host (ssh-tunnels--property tunnel :host))
(login (ssh-tunnels--property tunnel :login))
(tunnel-definition
(if (eq command :run)
(cond ((string= tunnel-type "-D")
(format "%s:%s" host local-port))
; Default Local/Remote port forwarding
(t (format "%s:%s:%s"
local-port host remote-port)))))
(args (cond ((eq command :run)
(list "-M" "-f" "-N" "-T"
"-L" (format "%s:%s:%s" local-port host remote-port)))
(append (list "-M" "-f" "-N" "-T")
(cond ((string= tunnel-type "SH") nil)
(t (list tunnel-type
tunnel-definition)))))
((eq command :kill)
(list "-O" "exit"))
((eq command :check)
Expand Down