gsadmin/noq
1
0
Fork 0
mirror of https://github.com/n0-computer/noq.git synced 2026-10-04 05:25:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated RNG seed argument from Endpoint::new

Browse Source
This commit is contained in:
Benjamin Saunders
2026-01-10 14:36:35 -08:00
committed by Dirkjan Ochtman
parent ee114c994f
commit 71d8dfa95c
4 changed files with 13 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quinn-proto/src/endpoint.rs
+3 -8
View File
@@ -61,20 +61,15 @@ impl Endpoint {
/// `allow_mtud` enables path MTU detection when requested by `Connection` configuration for
/// better performance. This requires that outgoing packets are never fragmented, which can be
/// achieved via e.g. the `IPV6_DONTFRAG` socket option.
///
/// If `rng_seed` is provided, it will be used to initialize the endpoint's rng (having priority
/// over the rng seed configured in [`EndpointConfig`]). Note that the `rng_seed` parameter will
/// be removed in a future release, so prefer setting it to `None` and configuring rng seeds
/// using [`EndpointConfig::rng_seed`].
pub fn new(
config: Arc<EndpointConfig>,
server_config: Option<Arc<ServerConfig>>,
allow_mtud: bool,
rng_seed: Option<[u8; 32]>,
) -> Self {
let rng_seed = rng_seed.or(config.rng_seed);
Self {
rng: rng_seed.map_or_else(StdRng::from_os_rng, StdRng::from_seed),
rng: config
.rng_seed
.map_or_else(StdRng::from_os_rng, StdRng::from_seed),
index: ConnectionIndex::default(),
connections: Slab::new(),
local_cid_generator: (config.connection_id_generator_factory.as_ref())(),
quinn-proto/src/tests/mod.rs
+7 -28
View File
@@ -49,12 +49,7 @@ use wasm_bindgen_test::wasm_bindgen_test as test;
fn version_negotiate_server() {
let _guard = subscribe();
let client_addr = "[::2]:7890".parse().unwrap();
let mut server = Endpoint::new(
Default::default(),
Some(Arc::new(server_config())),
true,
None,
);
let mut server = Endpoint::new(Default::default(), Some(Arc::new(server_config())), true);
let now = Instant::now();
let mut buf = Vec::with_capacity(server.config().get_max_udp_payload_size() as usize);
let event = server.handle(
@@ -92,7 +87,6 @@ fn version_negotiate_client() {
}),
None,
true,
None,
);
let (_, mut client_ch) = client
.connect(Instant::now(), client_config(), server_addr, "localhost")
@@ -200,8 +194,7 @@ fn server_stateless_reset() {
let mut pair = Pair::new(endpoint_config.clone(), server_config());
let (client_ch, _) = pair.connect();
pair.drive(); // Flush any post-handshake frames
pair.server.endpoint =
Endpoint::new(endpoint_config, Some(Arc::new(server_config())), true, None);
pair.server.endpoint = Endpoint::new(endpoint_config, Some(Arc::new(server_config())), true);
// Force the server to generate the smallest possible stateless reset
pair.client.connections.get_mut(&client_ch).unwrap().ping();
info!("resetting");
@@ -229,8 +222,7 @@ fn client_stateless_reset() {
let mut pair = Pair::new(endpoint_config.clone(), server_config());
let (_, server_ch) = pair.connect();
pair.client.endpoint =
Endpoint::new(endpoint_config, Some(Arc::new(server_config())), true, None);
pair.client.endpoint = Endpoint::new(endpoint_config, Some(Arc::new(server_config())), true);
// Send something big enough to allow room for a smaller stateless reset.
pair.server.connections.get_mut(&server_ch).unwrap().close(
pair.time,
@@ -259,7 +251,6 @@ fn stateless_reset_limit() {
endpoint_config.clone(),
Some(Arc::new(server_config())),
true,
None,
);
let time = Instant::now();
let mut buf = Vec::new();
@@ -1574,9 +1565,8 @@ fn cid_rotation() {
}),
Some(Arc::new(server_config())),
true,
None,
);
let client = Endpoint::new(Arc::new(EndpointConfig::default()), None, true, None);
let client = Endpoint::new(Arc::new(EndpointConfig::default()), None, true);
let mut pair = Pair::new_from_endpoint(client, server);
let (_, server_ch) = pair.connect();
@@ -2266,12 +2256,7 @@ fn big_cert_and_key() -> (CertificateDer<'static>, PrivateKeyDer<'static>) {
fn malformed_token_len() {
let _guard = subscribe();
let client_addr = "[::2]:7890".parse().unwrap();
let mut server = Endpoint::new(
Default::default(),
Some(Arc::new(server_config())),
true,
None,
);
let mut server = Endpoint::new(Default::default(), Some(Arc::new(server_config())), true);
let mut buf = Vec::with_capacity(server.config().get_max_udp_payload_size() as usize);
server.handle(
Instant::now(),
@@ -2375,13 +2360,12 @@ fn migrate_detects_new_mtu_and_respects_original_peer_max_udp_payload_size() {
Arc::new(server_endpoint_config),
Some(Arc::new(server_config())),
true,
None,
);
let client_endpoint_config = EndpointConfig {
max_udp_payload_size: VarInt::from(client_max_udp_payload_size),
..EndpointConfig::default()
};
let client = Endpoint::new(Arc::new(client_endpoint_config), None, true, None);
let client = Endpoint::new(Arc::new(client_endpoint_config), None, true);
let mut pair = Pair::new_from_endpoint(client, server);
pair.mtu = 1300;
@@ -3464,12 +3448,7 @@ fn oversized_datagrams_trigger_unblock() {
fn reject_short_idcid() {
let _guard = subscribe();
let client_addr = "[::2]:7890".parse().unwrap();
let mut server = Endpoint::new(
Default::default(),
Some(Arc::new(server_config())),
true,
None,
);
let mut server = Endpoint::new(Default::default(), Some(Arc::new(server_config())), true);
let now = Instant::now();
let mut buf = Vec::with_capacity(server.config().get_max_udp_payload_size() as usize);
// Initial header that has an empty DCID but is otherwise well-formed
quinn-proto/src/tests/util.rs
+2 -7
View File
@@ -53,13 +53,8 @@ impl Pair {
}
pub(super) fn new(endpoint_config: Arc<EndpointConfig>, server_config: ServerConfig) -> Self {
let server = Endpoint::new(
endpoint_config.clone(),
Some(Arc::new(server_config)),
true,
None,
);
let client = Endpoint::new(endpoint_config, None, true, None);
let server = Endpoint::new(endpoint_config.clone(), Some(Arc::new(server_config)), true);
let client = Endpoint::new(endpoint_config, None, true);
Self::new_from_endpoint(client, server)
}
quinn/src/endpoint.rs
+1 -6
View File
@@ -151,12 +151,7 @@ impl Endpoint {
let allow_mtud = !socket.may_fragment();
let rc = EndpointRef::new(
socket,
proto::Endpoint::new(
Arc::new(config),
server_config.map(Arc::new),
allow_mtud,
None,
),
proto::Endpoint::new(Arc::new(config), server_config.map(Arc::new), allow_mtud),
addr.is_ipv6(),
runtime.clone(),
);