From 354e22d58663063bf6c236a10a1b5802f3090348 Mon Sep 17 00:00:00 2001
From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Tue, 20 May 2025 11:14:50 +0200
Subject: [PATCH] adjust tramp socket path

this has to match .ssh/config
ControlPath ~/.ssh/sockets/ssh.%r.%n.%p

Signed-off-by: Andreas Gerler <baron@bundesbrandschatzamt.de>
---
 bba.org | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/bba.org b/bba.org
index 91e19ecd..013f5941 100644
--- a/bba.org
+++ b/bba.org
@@ -969,11 +969,29 @@ Use our default socket files
 
 #+BEGIN_SRC emacs-lisp
   (if (file-accessible-directory-p "~/.ssh/sockets")
-  (setq tramp-ssh-controlmaster-options "-o ControlMaster=auto -o ControlPath='~/.ssh/sockets/ssh.%%C' -o ControlPersist=600"))
+  (setq tramp-ssh-controlmaster-options "-o ControlMaster=auto -o ControlPath='~/.ssh/sockets/ssh.%%r.%%n.%%p' -o ControlPersist=600"))
 #+END_SRC
 
 TRAMP gcloud ssh
 
+#+NAME:gssh
+#+begin_src sh :eval never :tangle no
+  #!/bin/bash
+
+  HOST="$1"
+
+  if [[ $HOST = *"@"* ]] ; then
+      USER=$(echo $HOST | cut -d'@' -f1)
+      HOST=$(echo $HOST | cut -d'@' -f2)
+  fi
+
+  gcloud config list | grep 'Your active'
+  ZONE=$(gcloud compute instances list |grep -E "^$HOST[[:space:]]" | awk '{print $2}')
+  echo zone: $ZONE
+  gcloud compute ssh --zone=$ZONE --tunnel-through-iap "$@"
+#+end_src
+
+
 #+begin_src emacs-lisp
   (require 'tramp)
   (eval-after-load "tramp"
-- 
2.47.3