From 9c0528a2b7feb6e1bf3adc51640553b3b7cc22ff Mon Sep 17 00:00:00 2001 From: Martin Weindel Date: Mon, 9 Dec 2024 08:57:50 +0100 Subject: [PATCH 1/2] restrict ping sequence number to 16bit --- cmd/vpn_client/app/pathcontroller/ping.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/vpn_client/app/pathcontroller/ping.go b/cmd/vpn_client/app/pathcontroller/ping.go index cba4bc4..d2f002c 100644 --- a/cmd/vpn_client/app/pathcontroller/ping.go +++ b/cmd/vpn_client/app/pathcontroller/ping.go @@ -84,12 +84,12 @@ func (p *icmpPinger) ping(client net.IP) error { return fmt.Errorf("error setting deadline: %w", err) } - seq := p.lastSeq.Add(1) + seq := p.lastSeq.Add(1) & 0xffff // is marshalled as uint16 so we need to mask it msg := icmp.Message{ Type: ipv6.ICMPTypeEchoRequest, Code: 0, Body: &icmp.Echo{ - ID: os.Getpid() & 0xffff, + ID: os.Getpid() & 0xffff, // is marshalled as uint16 so we need to mask it Seq: int(seq), Data: []byte(echoPayload), }, From 7172d86422322e43e8abb8f36fff6ebc842393a2 Mon Sep 17 00:00:00 2001 From: Martin Weindel Date: Mon, 9 Dec 2024 08:58:30 +0100 Subject: [PATCH 2/2] update path for image vector file --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4907964..babbcab 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ Please see [Reversed VPN Tunnel Setup and Configuration](https://github.com/gard *Note: Remember the image name reported at the end similar to* ```txt - VPN client image: localhost:5001/europe-docker_pkg_dev_gardener-project_public_gardener_vpn-client:0.26.0-dev + VPN client image: localhost:5001/europe-docker_pkg_dev_gardener-project_public_gardener_vpn-client:0.33.0-dev ``` **VPN server image** @@ -76,22 +76,22 @@ Please see [Reversed VPN Tunnel Setup and Configuration](https://github.com/gard *Note: Remember the image name reported at the end similar to* ```txt - VPN server image: localhost:5001/europe-docker_pkg_dev_gardener-project_public_gardener_vpn-server:0.26.0-dev + VPN server image: localhost:5001/europe-docker_pkg_dev_gardener-project_public_gardener_vpn-server:0.33.0-dev ``` -- adjust the image vector file `imagevector/images.yaml` in Gardener to image repositories and tags provided by the last step +- adjust the image vector file `imagevector/containers.yaml` in Gardener to image repositories and tags provided by the last step ``` ... - name: vpn-server sourceRepository: github.com/gardener/vpn2 repository: localhost:5001/europe-docker_pkg_dev_gardener-project_public_gardener_vpn-server - tag: 0.26.0-dev + tag: 0.33.0-dev ... - name: vpn-client sourceRepository: github.com/gardener/vpn2 repository: localhost:5001/europe-docker_pkg_dev_gardener-project_public_gardener_vpn-client - tag: 0.26.0-dev + tag: 0.33.0-dev ... ```