also old changes

1 files changed, 15 insertions, 2 deletions

diff --git a/xvnc b/xvnc
index 649580a..caebfe8 100755
--- a/xvnc
+++ b/xvnc
@@ -1,4 +1,10 @@
 #!/bin/sh
+# TODO: create systemd service for ssh-x11vnc@ with dependency service
+# xvncviewer@
+#
+# Restrict connections to the port opened by ssh in xvncviewer@ to the
+# corresponding ssh-x11vnc@ service.
+
 remote_display=0
 reverse_connection()
 {
@@ -7,9 +13,16 @@ reverse_connection()
     remote_port=$((58000 + remote_display))
 
     local_port=$((59000 + display))
+    fuser -vk $local_port/tcp
     xvncviewer -listen $((local_port - 5500)) &
-    ssh "$@" -f -R "localhost:$remote_port:localhost:$local_port" -- \
-        x11vnc -q -connect_or_exit localhost:$remote_port -display :$remote_display
+    pid=$!
+    (
+        remote_display_arg=${remote_display:+ -display :$remote_display}
+        set -x
+        ssh "$@" -n -R "localhost:$remote_port:localhost:$local_port" -- \
+            x11vnc -q -connect_or_exit localhost:$remote_port ${remote_display_arg:- -find}
+    )
+    kill $pid
 }
 
 direct_connection()