Merge pull request #2860 from jandubois/tunnel-error

AkihiroSuda · web-flow · commit 4d56dab41bf9 · 2024-11-07T13:48:26.000+09:00
Avoid crash when tunnel cannot be opened
diff --git a/pkg/portfwd/client.go b/pkg/portfwd/client.go
@@ -21,6 +21,7 @@ func HandleTCPConnection(ctx context.Context, client *guestagentclient.GuestAgen
 	stream, err := client.Tunnel(ctx)
 	if err != nil {
 		logrus.Errorf("could not open tcp tunnel for id: %s error:%v", id, err)
+		return
 	}
 
 	g, _ := errgroup.WithContext(ctx)
@@ -54,6 +55,7 @@ func HandleUDPConnection(ctx context.Context, client *guestagentclient.GuestAgen
 	stream, err := client.Tunnel(ctx)
 	if err != nil {
 		logrus.Errorf("could not open udp tunnel for id: %s error:%v", id, err)
+		return
 	}
 
 	g, _ := errgroup.WithContext(ctx)

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ func HandleTCPConnection(ctx context.Context, client *guestagentclient.GuestAgen`
`21`	`21`	`stream, err := client.Tunnel(ctx)`
`22`	`22`	`if err != nil {`
`23`	`23`	`logrus.Errorf("could not open tcp tunnel for id: %s error:%v", id, err)`
	`24`	`+ return`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`g, _ := errgroup.WithContext(ctx)`
`@@ -54,6 +55,7 @@ func HandleUDPConnection(ctx context.Context, client *guestagentclient.GuestAgen`
`54`	`55`	`stream, err := client.Tunnel(ctx)`
`55`	`56`	`if err != nil {`
`56`	`57`	`logrus.Errorf("could not open udp tunnel for id: %s error:%v", id, err)`
	`58`	`+ return`
`57`	`59`	`}`
`58`	`60`
`59`	`61`	`g, _ := errgroup.WithContext(ctx)`