Skip to content

Commit

Permalink
apps: remove dangling --multipath-old flag
Browse files Browse the repository at this point in the history
That was not doing much.
  • Loading branch information
qdeconinck committed Oct 27, 2023
1 parent 6a53adb commit d873320
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
6 changes: 0 additions & 6 deletions apps/src/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ pub struct CommonArgs {
pub qpack_blocked_streams: Option<u64>,
pub initial_cwnd_packets: u64,
pub multipath: bool,
pub multipath_old: bool,
}

/// Creates a new `CommonArgs` structure using the provided [`Docopt`].
Expand Down Expand Up @@ -198,7 +197,6 @@ impl Args for CommonArgs {
.unwrap();

let multipath = args.get_bool("--multipath");
let multipath_old = args.get_bool("--multipath-old");

CommonArgs {
alpns,
Expand All @@ -224,7 +222,6 @@ impl Args for CommonArgs {
qpack_blocked_streams,
initial_cwnd_packets,
multipath,
multipath_old,
}
}
}
Expand Down Expand Up @@ -255,7 +252,6 @@ impl Default for CommonArgs {
qpack_blocked_streams: None,
initial_cwnd_packets: 10,
multipath: false,
multipath_old: false,
}
}
}
Expand Down Expand Up @@ -294,7 +290,6 @@ Options:
--enable-active-migration Enable active connection migration.
--perform-migration Perform connection migration on another source port.
--multipath Enable multipath support.
--multipath-old Enable (old v4) multipath support.
-A --address ADDR ... Specify addresses to be used instead of the unspecified address. Non-routable addresses will lead to connectivity issues.
-R --rm-addr TIMEADDR ... Specify addresses to stop using after the provided time (format time,addr).
-S --status TIMEADDRSTAT ... Specify availability status to advertise to the peer after the provided time (format time,addr,available).
Expand Down Expand Up @@ -543,7 +538,6 @@ Options:
--disable-pacing Disable pacing (linux only).
--initial-cwnd-packets PACKETS The initial congestion window size in terms of packet count [default: 10].
--multipath Enable multipath support.
--multipath-old Enable (old v4) multipath support.
-h --help Show this screen.
";

Expand Down
2 changes: 1 addition & 1 deletion apps/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ pub fn connect(
scid_sent = true;
}

if (conn_args.multipath || conn_args.multipath_old) &&
if conn_args.multipath &&
probed_paths < addrs.len() &&
conn.available_dcids() > 0 &&
conn.probe_path(addrs[probed_paths], peer_addr).is_ok()
Expand Down

0 comments on commit d873320

Please sign in to comment.