Skip to content

client: cli: allow disable keepalive_continuous via CLI #487

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
kp-antonio-yang wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −6
Open

client: cli: allow disable keepalive_continuous via CLI #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions lightway-client/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ pub struct Config {
#[patch(attribute(clap(long)))]
#[patch(empty_value = false)]
#[patch(attribute(serde(default)))]
#[patch(attribute(doc = "Enable continuous Keepalive"))]
pub keepalive_continuous: bool,
#[patch(attribute(doc = "Disable continuous keepalive"))]
pub disable_keepalive_continuous: bool,

#[patch(attribute(clap(long)))]
#[patch(attribute(doc = r#"Time it takes to trigger a tracer packet
Expand Down Expand Up @@ -480,7 +480,7 @@ impl Default for Config {
keyshare: KeyShare::default(),
keepalive_interval: NonZeroDuration::from_std_duration(StdDuration::from_secs(10)),
keepalive_timeout: NonZeroDuration::from_std_duration(StdDuration::from_secs(60)),
keepalive_continuous: true,
disable_keepalive_continuous: false,
tracer_packet_timeout: NonZeroDuration::from_std_duration(StdDuration::from_secs(10)),
preferred_connection_wait_interval: Duration::from_std_duration(
StdDuration::from_secs(0),
Expand Down
2 changes: 1 addition & 1 deletion lightway-client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ impl<ExtAppState: Send + Sync> ClientConfig<ExtAppState> {
expresslane_metrics: None,
keepalive_interval: config.keepalive_interval.into(),
keepalive_timeout: config.keepalive_timeout.into(),
continuous_keepalive: config.keepalive_continuous,
continuous_keepalive: !config.disable_keepalive_continuous,
tracer_packet_timeout: config.tracer_packet_timeout.into(),
preferred_connection_wait_interval: config.preferred_connection_wait_interval.into(),
sndbuf: config.sndbuf,
Expand Down
2 changes: 1 addition & 1 deletion lightway-client/src/mobile/lightway.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ pub(crate) async fn async_lightway_start(
connect_conf,
sni_header: config.sni_header.clone(),
socket: outside_sockets[instance_id].take(),
enable_keepalive: config.keepalive_continuous,
enable_keepalive: !config.disable_keepalive_continuous,
enable_expresslane: config.enable_expresslane,
expresslane_keys_rotation_interval: config
.expresslane_keys_rotation_interval
Expand Down
1 change: 0 additions & 1 deletion tests/client/client_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ enable_tun_iouring: false
iouring_entry_count: 1024
keepalive_interval: 10s
keepalive_timeout: 30s
keepalive_continuous: true
enable_expresslane: false
enable_pmtud: false
# sndbuf: 1.5 MiB
Expand Down
Loading