Cameron Simpson avatar Cameron Simpson committed 4b21264

portfwd: run off some shutdown tracing, fix -N ssh mode, announce connections using ssh LocalCommand

Comments (0)

Files changed (1)

 do
   trap "sig=$sig
         echo \"\$cmd: received SIG\$sig\"
-        set -vx
         [ -z \"\$subprocs\" ] || synckill -v -s \"\$sig\" \$subprocs
         exit 1
        " "$sig"
 do
   # reload config on every pass
   cfg_pidfile=portfwd.$target.pid
-  cfg_command=:
+  cfg_command=
   cfg_outlog=portfwd-$target    # /dev/null
   cfg_monitor=
   if [ -s "$fwdcfg" ]
   [ -n "$cfg_command" ] || sshopts="$sshopts -N"
   $trace \
     tag_fd 2 "$target" \
-    sshto $sshopts -F "$sshcfg" "$target" "$cfg_command" \
+    sshto $sshopts -F "$sshcfg" \
+      -o "PermitLocalCommand=yes" -o "LocalCommand=</dev/null alert CONNECTED: sshpf $target &" \
+      "$target" "$cfg_command" \
     >>"$cfg_outlog" </dev/null &
   sshpid=$!
   subprocs="$subprocs $sshpid"
-  [ $first ] || alert "RESTARTED: sshpf $target [pid $sshpid]" &
+  [ $first ] || alert "RESTARTING: sshpf $target [pid $sshpid]" &
 
   # start monitor
   if [ -n "$cfg_monitor" ]
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.