fix: same remote with diff secret for diff protocol

luscis · Jun 22, 2024 · 33d27ed · 33d27ed
1 parent 94f7e32
commit 33d27ed
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/pkg/config/ipsec.go b/pkg/config/ipsec.go
@@ -19,6 +19,9 @@ func (s *IPSecTunnel) Correct() {
 		s.Left = "%defaultroute"
 	}
 	s.Name = s.Id()
+	if s.RightId == "" {
+		s.RightId = s.Right
+	}
 }
 
 func (s *IPSecTunnel) Id() string {

diff --git a/pkg/switch/ipsec.go b/pkg/switch/ipsec.go
@@ -51,10 +51,10 @@ conn {{ .Name }}-c1
     auto=add
     also={{ .Name }}
 {{- if .LeftId }}
-    leftid=@c1.{{ .LeftId }}
+    leftid=@c1.{{ .LeftId }}.{{ .Transport }}
 {{- end }}
 {{- if .RightId }}
-    rightid=@c2.{{ .RightId }}
+    rightid=@c2.{{ .RightId }}.{{ .Transport }}
 {{- end }}
     leftprotoport=udp/8472
     rightprotoport=udp
@@ -63,10 +63,10 @@ conn {{ .Name }}-c2
     auto=add
     also={{ .Name }}
 {{- if .LeftId }}
-    leftid=@c2.{{ .LeftId }}
+    leftid=@c2.{{ .LeftId }}.{{ .Transport }}
 {{- end }}
 {{- if .RightId }}
-    rightid=@c1.{{ .RightId }}
+    rightid=@c1.{{ .RightId }}.{{ .Transport }}
 {{- end }}
     leftprotoport=udp
     rightprotoport=udp/8472
@@ -81,11 +81,11 @@ conn {{ .Name }}-c1
     leftikeport={{ .LeftPort }}
 {{- end }}
 {{- if .LeftId }}
-    leftid=@{{ .LeftId }}
+    leftid=@{{ .LeftId }}.{{ .Transport }}
 {{- end }}
     right={{ .Right }}
 {{- if .RightId }}
-    rightid=@{{ .RightId }}
+    rightid=@{{ .RightId }}.{{ .Transport }}
 {{- end }}
 {{- if .RightPort }}
     rightikeport={{ .RightPort }}
@@ -95,7 +95,7 @@ conn {{ .Name }}-c1
     rightprotoport=gre
 `
 	secretTmpl = `
-%any {{ .Right }} : PSK "{{ .Secret }}"
+%any {{ .RightId }}.{{ .Transport }} : PSK "{{ .Secret }}"
 `
 )