rename max_packet_size TP -> max_udp_payload_size
diff --git a/examples/client.c b/examples/client.c
index 1e634d3..6350a00 100644
--- a/examples/client.c
+++ b/examples/client.c
@@ -243,7 +243,7 @@
(uint8_t *) "\x05hq-28\x05hq-27\x08http/0.9", 21);
quiche_config_set_max_idle_timeout(config, 5000);
- quiche_config_set_max_packet_size(config, MAX_DATAGRAM_SIZE);
+ quiche_config_set_max_udp_payload_size(config, MAX_DATAGRAM_SIZE);
quiche_config_set_initial_max_data(config, 10000000);
quiche_config_set_initial_max_stream_data_bidi_local(config, 1000000);
quiche_config_set_initial_max_stream_data_uni(config, 1000000);
diff --git a/examples/client.rs b/examples/client.rs
index 716ea27..bbfc8f7 100644
--- a/examples/client.rs
+++ b/examples/client.rs
@@ -91,7 +91,7 @@
.unwrap();
config.set_max_idle_timeout(5000);
- config.set_max_packet_size(MAX_DATAGRAM_SIZE as u64);
+ config.set_max_udp_payload_size(MAX_DATAGRAM_SIZE as u64);
config.set_initial_max_data(10_000_000);
config.set_initial_max_stream_data_bidi_local(1_000_000);
config.set_initial_max_stream_data_bidi_remote(1_000_000);
diff --git a/examples/http3-client.c b/examples/http3-client.c
index e9132d7..f7423e6 100644
--- a/examples/http3-client.c
+++ b/examples/http3-client.c
@@ -330,7 +330,7 @@
sizeof(QUICHE_H3_APPLICATION_PROTOCOL) - 1);
quiche_config_set_max_idle_timeout(config, 5000);
- quiche_config_set_max_packet_size(config, MAX_DATAGRAM_SIZE);
+ quiche_config_set_max_udp_payload_size(config, MAX_DATAGRAM_SIZE);
quiche_config_set_initial_max_data(config, 10000000);
quiche_config_set_initial_max_stream_data_bidi_local(config, 1000000);
quiche_config_set_initial_max_stream_data_bidi_remote(config, 1000000);
diff --git a/examples/http3-client.rs b/examples/http3-client.rs
index 7ea25d5..696f846 100644
--- a/examples/http3-client.rs
+++ b/examples/http3-client.rs
@@ -89,7 +89,7 @@
.unwrap();
config.set_max_idle_timeout(5000);
- config.set_max_packet_size(MAX_DATAGRAM_SIZE as u64);
+ config.set_max_udp_payload_size(MAX_DATAGRAM_SIZE as u64);
config.set_initial_max_data(10_000_000);
config.set_initial_max_stream_data_bidi_local(1_000_000);
config.set_initial_max_stream_data_bidi_remote(1_000_000);
diff --git a/examples/http3-server.c b/examples/http3-server.c
index adf7b6c..fbef6f5 100644
--- a/examples/http3-server.c
+++ b/examples/http3-server.c
@@ -507,7 +507,7 @@
sizeof(QUICHE_H3_APPLICATION_PROTOCOL) - 1);
quiche_config_set_max_idle_timeout(config, 5000);
- quiche_config_set_max_packet_size(config, MAX_DATAGRAM_SIZE);
+ quiche_config_set_max_udp_payload_size(config, MAX_DATAGRAM_SIZE);
quiche_config_set_initial_max_data(config, 10000000);
quiche_config_set_initial_max_stream_data_bidi_local(config, 1000000);
quiche_config_set_initial_max_stream_data_bidi_remote(config, 1000000);
diff --git a/examples/http3-server.rs b/examples/http3-server.rs
index a785bfb..194ca00 100644
--- a/examples/http3-server.rs
+++ b/examples/http3-server.rs
@@ -98,7 +98,7 @@
.unwrap();
config.set_max_idle_timeout(5000);
- config.set_max_packet_size(MAX_DATAGRAM_SIZE as u64);
+ config.set_max_udp_payload_size(MAX_DATAGRAM_SIZE as u64);
config.set_initial_max_data(10_000_000);
config.set_initial_max_stream_data_bidi_local(1_000_000);
config.set_initial_max_stream_data_bidi_remote(1_000_000);
diff --git a/examples/server.c b/examples/server.c
index 4a4dded..113d21f 100644
--- a/examples/server.c
+++ b/examples/server.c
@@ -441,7 +441,7 @@
(uint8_t *) "\x05hq-28\x05hq-27\x08http/0.9", 21);
quiche_config_set_max_idle_timeout(config, 5000);
- quiche_config_set_max_packet_size(config, MAX_DATAGRAM_SIZE);
+ quiche_config_set_max_udp_payload_size(config, MAX_DATAGRAM_SIZE);
quiche_config_set_initial_max_data(config, 10000000);
quiche_config_set_initial_max_stream_data_bidi_local(config, 1000000);
quiche_config_set_initial_max_stream_data_bidi_remote(config, 1000000);
diff --git a/examples/server.rs b/examples/server.rs
index 3f45ff4..de7d4e8 100644
--- a/examples/server.rs
+++ b/examples/server.rs
@@ -94,7 +94,7 @@
.unwrap();
config.set_max_idle_timeout(5000);
- config.set_max_packet_size(MAX_DATAGRAM_SIZE as u64);
+ config.set_max_udp_payload_size(MAX_DATAGRAM_SIZE as u64);
config.set_initial_max_data(10_000_000);
config.set_initial_max_stream_data_bidi_local(1_000_000);
config.set_initial_max_stream_data_bidi_remote(1_000_000);
diff --git a/include/quiche.h b/include/quiche.h
index eef6653..7dfdedd 100644
--- a/include/quiche.h
+++ b/include/quiche.h
@@ -142,8 +142,8 @@
// Sets the `max_idle_timeout` transport parameter.
void quiche_config_set_max_idle_timeout(quiche_config *config, uint64_t v);
-// Sets the `max_packet_size` transport parameter.
-void quiche_config_set_max_packet_size(quiche_config *config, uint64_t v);
+// Sets the `max_udp_payload_size transport` parameter.
+void quiche_config_set_max_udp_payload_size(quiche_config *config, uint64_t v);
// Sets the `initial_max_data` transport parameter.
void quiche_config_set_initial_max_data(quiche_config *config, uint64_t v);
diff --git a/src/ffi.rs b/src/ffi.rs
index 9985272..845fc8a 100644
--- a/src/ffi.rs
+++ b/src/ffi.rs
@@ -154,8 +154,10 @@
}
#[no_mangle]
-pub extern fn quiche_config_set_max_packet_size(config: &mut Config, v: u64) {
- config.set_max_packet_size(v);
+pub extern fn quiche_config_set_max_udp_payload_size(
+ config: &mut Config, v: u64,
+) {
+ config.set_max_udp_payload_size(v);
}
#[no_mangle]
diff --git a/src/lib.rs b/src/lib.rs
index 8c40463..8093632 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -588,11 +588,11 @@
self.local_transport_params.max_idle_timeout = v;
}
- /// Sets the `max_packet_size transport` parameter.
+ /// Sets the `max_udp_payload_size transport` parameter.
///
/// The default value is `65527`.
- pub fn set_max_packet_size(&mut self, v: u64) {
- self.local_transport_params.max_packet_size = v;
+ pub fn set_max_udp_payload_size(&mut self, v: u64) {
+ self.local_transport_params.max_udp_payload_size = v;
}
/// Sets the `initial_max_data` transport parameter.
@@ -1900,20 +1900,21 @@
let mut left = b.cap();
- // Use max_packet_size as sent by the peer, except during the handshake
- // when we haven't parsed transport parameters yet, so use a default
- // value then.
+ // Use max_udp_payload_size as sent by the peer, except during the
+ // handshake when we haven't parsed transport parameters yet, so
+ // use a default value then.
let max_pkt_len = if self.is_established() {
// We cap the maximum packet size to 16KB or so, so that it can be
// always encoded with a 2-byte varint.
- cmp::min(16383, self.peer_transport_params.max_packet_size) as usize
+ cmp::min(16383, self.peer_transport_params.max_udp_payload_size)
+ as usize
} else {
// Allow for 1200 bytes (minimum QUIC packet size) during the
// handshake.
1200
};
- // Limit output packet size to respect peer's max_packet_size limit.
+ // Limit output packet size to respect peer's max_udp_payload_size limit.
left = cmp::min(left, max_pkt_len);
// Limit output packet size by congestion window size.
@@ -3549,7 +3550,7 @@
pub original_connection_id: Option<Vec<u8>>,
pub max_idle_timeout: u64,
pub stateless_reset_token: Option<Vec<u8>>,
- pub max_packet_size: u64,
+ pub max_udp_payload_size: u64,
pub initial_max_data: u64,
pub initial_max_stream_data_bidi_local: u64,
pub initial_max_stream_data_bidi_remote: u64,
@@ -3569,7 +3570,7 @@
original_connection_id: None,
max_idle_timeout: 0,
stateless_reset_token: None,
- max_packet_size: 65527,
+ max_udp_payload_size: 65527,
initial_max_data: 0,
initial_max_stream_data_bidi_local: 0,
initial_max_stream_data_bidi_remote: 0,
@@ -3619,9 +3620,9 @@
},
0x0003 => {
- tp.max_packet_size = val.get_varint()?;
+ tp.max_udp_payload_size = val.get_varint()?;
- if tp.max_packet_size < 1200 {
+ if tp.max_udp_payload_size < 1200 {
return Err(Error::InvalidTransportParam);
}
},
@@ -3749,13 +3750,13 @@
}
}
- if tp.max_packet_size != 0 {
+ if tp.max_udp_payload_size != 0 {
TransportParams::encode_param(
&mut b,
0x0003,
- octets::varint_len(tp.max_packet_size),
+ octets::varint_len(tp.max_udp_payload_size),
)?;
- b.put_varint(tp.max_packet_size)?;
+ b.put_varint(tp.max_udp_payload_size)?;
}
if tp.initial_max_data != 0 {
@@ -3872,7 +3873,7 @@
stateless_reset_token,
Some(self.disable_active_migration),
Some(self.max_idle_timeout),
- Some(self.max_packet_size),
+ Some(self.max_udp_payload_size),
Some(self.ack_delay_exponent),
Some(self.max_ack_delay),
Some(self.active_conn_id_limit),
@@ -4195,7 +4196,7 @@
original_connection_id: None,
max_idle_timeout: 30,
stateless_reset_token: Some(vec![0xba; 16]),
- max_packet_size: 23_421,
+ max_udp_payload_size: 23_421,
initial_max_data: 424_645_563,
initial_max_stream_data_bidi_local: 154_323_123,
initial_max_stream_data_bidi_remote: 6_587_456,
@@ -4222,7 +4223,7 @@
original_connection_id: None,
max_idle_timeout: 30,
stateless_reset_token: None,
- max_packet_size: 23_421,
+ max_udp_payload_size: 23_421,
initial_max_data: 424_645_563,
initial_max_stream_data_bidi_local: 154_323_123,
initial_max_stream_data_bidi_remote: 6_587_456,
@@ -5948,7 +5949,7 @@
config.set_initial_max_data(50000);
config.set_initial_max_stream_data_bidi_local(50000);
config.set_initial_max_stream_data_bidi_remote(50000);
- config.set_max_packet_size(1200);
+ config.set_max_udp_payload_size(1200);
config.verify_peer(false);
let mut pipe = testing::Pipe::with_client_config(&mut config).unwrap();
@@ -5984,7 +5985,7 @@
config.set_initial_max_data(50000);
config.set_initial_max_stream_data_bidi_local(50000);
config.set_initial_max_stream_data_bidi_remote(50000);
- config.set_max_packet_size(1200);
+ config.set_max_udp_payload_size(1200);
config.verify_peer(false);
let mut pipe = testing::Pipe::with_client_config(&mut config).unwrap();
@@ -6021,7 +6022,7 @@
config.set_initial_max_data(50000);
config.set_initial_max_stream_data_bidi_local(50000);
config.set_initial_max_stream_data_bidi_remote(50000);
- config.set_max_packet_size(1405);
+ config.set_max_udp_payload_size(1405);
config.verify_peer(false);
let mut pipe = testing::Pipe::with_client_config(&mut config).unwrap();
@@ -6058,7 +6059,7 @@
config.set_initial_max_data(50000);
config.set_initial_max_stream_data_bidi_local(50000);
config.set_initial_max_stream_data_bidi_remote(50000);
- config.set_max_packet_size(1406);
+ config.set_max_udp_payload_size(1406);
config.verify_peer(false);
let mut pipe = testing::Pipe::with_client_config(&mut config).unwrap();
diff --git a/tools/apps/src/bin/quiche-client.rs b/tools/apps/src/bin/quiche-client.rs
index fff5774..7850a61 100644
--- a/tools/apps/src/bin/quiche-client.rs
+++ b/tools/apps/src/bin/quiche-client.rs
@@ -114,7 +114,7 @@
config.set_application_protos(&conn_args.alpns).unwrap();
config.set_max_idle_timeout(5000);
- config.set_max_packet_size(MAX_DATAGRAM_SIZE as u64);
+ config.set_max_udp_payload_size(MAX_DATAGRAM_SIZE as u64);
config.set_initial_max_data(conn_args.max_data);
config.set_initial_max_stream_data_bidi_local(conn_args.max_stream_data);
config.set_initial_max_stream_data_bidi_remote(conn_args.max_stream_data);
diff --git a/tools/apps/src/bin/quiche-server.rs b/tools/apps/src/bin/quiche-server.rs
index df51a11..e115cf5 100644
--- a/tools/apps/src/bin/quiche-server.rs
+++ b/tools/apps/src/bin/quiche-server.rs
@@ -102,7 +102,7 @@
config.set_application_protos(&conn_args.alpns).unwrap();
config.set_max_idle_timeout(5000);
- config.set_max_packet_size(MAX_DATAGRAM_SIZE as u64);
+ config.set_max_udp_payload_size(MAX_DATAGRAM_SIZE as u64);
config.set_initial_max_data(conn_args.max_data);
config.set_initial_max_stream_data_bidi_local(conn_args.max_stream_data);
config.set_initial_max_stream_data_bidi_remote(conn_args.max_stream_data);
diff --git a/tools/http3_test/src/runner.rs b/tools/http3_test/src/runner.rs
index 5f4d2b0..8b68962 100644
--- a/tools/http3_test/src/runner.rs
+++ b/tools/http3_test/src/runner.rs
@@ -91,7 +91,7 @@
.unwrap();
config.set_max_idle_timeout(idle_timeout);
- config.set_max_packet_size(MAX_DATAGRAM_SIZE as u64);
+ config.set_max_udp_payload_size(MAX_DATAGRAM_SIZE as u64);
config.set_initial_max_data(max_data);
config.set_initial_max_stream_data_bidi_local(max_stream_data);
config.set_initial_max_stream_data_bidi_remote(max_stream_data);
