Skip to content

Sync ztunnel 1.26.8 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bmangoen wants to merge 3 commits into
base: release-1.26
Choose a base branch
from
+11 −19
Open

Sync ztunnel 1.26.8 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f2a880
Automator: update [email protected] in istio/ztunnel@release-…
istio-testing Dec 3, 2025
03e224f
Set socket options outside trace! (#1691)
istio-testing Dec 13, 2025
4865b24
Merge tag '1.26.8' into sync-ztunnel-1.26.8
bmangoen Jan 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "istio build-tools",
"image": "gcr.io/istio-testing/build-tools:release-1.26-80a1b41acf1fe5b60c2b49153f6d3f9ed3a82a0d",
"image": "gcr.io/istio-testing/build-tools:release-1.26-512a1e34a2bc63dd3c54ddcba27df1bcf95e7360",
"privileged": true,
"remoteEnv": {
"USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
Expand Down
2 changes: 1 addition & 1 deletion common/.commonfiles.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3c071fd614ac519af1ca763cfe46521b7113b16c
2a3998972172ea44d10217ac13cabfac18a47fff
2 changes: 1 addition & 1 deletion common/scripts/setup_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ fi
TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
PROJECT_ID=${PROJECT_ID:-istio-testing}
if [[ "${IMAGE_VERSION:-}" == "" ]]; then
IMAGE_VERSION=release-1.26-80a1b41acf1fe5b60c2b49153f6d3f9ed3a82a0d
IMAGE_VERSION=release-1.26-512a1e34a2bc63dd3c54ddcba27df1bcf95e7360
fi
if [[ "${IMAGE_NAME:-}" == "" ]]; then
IMAGE_NAME=build-tools
Expand Down
12 changes: 4 additions & 8 deletions src/proxy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,19 +114,15 @@ impl DefaultSocketFactory {
.with_time(cfg.keepalive_time)
.with_retries(cfg.keepalive_retries)
.with_interval(cfg.keepalive_interval);
tracing::trace!(
"set keepalive: {:?}",
socket2::SockRef::from(&s).set_tcp_keepalive(&ka)
);
let res = socket2::SockRef::from(&s).set_tcp_keepalive(&ka);
tracing::trace!("set keepalive: {:?}", res);
}
if cfg.user_timeout_enabled {
// https://blog.cloudflare.com/when-tcp-sockets-refuse-to-die/
// TCP_USER_TIMEOUT = TCP_KEEPIDLE + TCP_KEEPINTVL * TCP_KEEPCNT.
let ut = cfg.keepalive_time + cfg.keepalive_retries * cfg.keepalive_interval;
tracing::trace!(
"set user timeout: {:?}",
socket2::SockRef::from(&s).set_tcp_user_timeout(Some(ut))
);
let res = socket2::SockRef::from(&s).set_tcp_user_timeout(Some(ut));
tracing::trace!("set user timeout: {:?}", res);
}
Ok(())
}
Expand Down
12 changes: 4 additions & 8 deletions src/socket.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,17 +175,13 @@ impl Listener {
.with_time(cfg.keepalive_time)
.with_retries(cfg.keepalive_retries)
.with_interval(cfg.keepalive_interval);
tracing::trace!(
"set keepalive: {:?}",
SockRef::from(&stream).set_tcp_keepalive(&ka)
);
let res = SockRef::from(&stream).set_tcp_keepalive(&ka);
tracing::trace!("set keepalive: {:?}", res);
}
if cfg.user_timeout_enabled {
let ut = cfg.keepalive_time + cfg.keepalive_retries * cfg.keepalive_interval;
tracing::trace!(
"set user timeout: {:?}",
SockRef::from(&stream).set_tcp_user_timeout(Some(ut))
);
let res = SockRef::from(&stream).set_tcp_user_timeout(Some(ut));
tracing::trace!("set user timeout: {:?}", res);
}
}
Ok((stream, remote))
Expand Down