Skip to content

Commit 90c82f2

Browse files
committed
wip: slight change, no errors in example now.
* Related #20 [ci skip]
1 parent 0b51749 commit 90c82f2

File tree

2 files changed

+45
-51
lines changed

2 files changed

+45
-51
lines changed

src/bin/client_test.rs

Lines changed: 34 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ struct TestData {
3838
}
3939

4040
const STREAMS: u64 = 10000;
41-
const MESSAGES: i64 = 400;
41+
const MESSAGES: i64 = 200;
4242

4343

4444
fn main() {
@@ -102,8 +102,8 @@ fn main() {
102102
config.set_initial_max_data(10_000_000);
103103
config.set_initial_max_stream_data_bidi_local(1_000_000);
104104
config.set_initial_max_stream_data_bidi_remote(1_000_000);
105-
config.set_initial_max_streams_bidi(10000);
106-
config.set_initial_max_streams_uni(10000);
105+
config.set_initial_max_streams_bidi(100000);
106+
config.set_initial_max_streams_uni(100000);
107107
config.set_disable_active_migration(true);
108108

109109
// Generate a random source connection ID for the connection.
@@ -232,52 +232,46 @@ fn main() {
232232
for s in conn.readable() {
233233
while let Ok((_read, _fin)) = conn.stream_recv(s, &mut buf) {
234234
// ignore messages, just consume.
235-
// println!("received {} bytes", read);
236-
237-
// let stream_buf = &buf[..read];
238-
239-
// println!(
240-
// "stream {} has {} bytes (fin? {})",
241-
// s,
242-
// stream_buf.len(),
243-
// fin
244-
// );
245-
246-
// println!("{}", unsafe {
247-
// std::str::from_utf8_unchecked(stream_buf)
248-
// });
249-
250235
}
251236
}
252237

253238
for s in conn.writable() {
254-
// println!("Writing stream {}", s);
255-
// get the application data
256-
let app_data = conn.stream_application_data(s)
257-
.unwrap()
258-
.downcast_mut::<TestData>()
259-
.unwrap();
260-
261-
// println!("numruns {}", app_data.num_messages);
262-
// dec the number of messages
239+
// get the application data
240+
let app_data = conn.stream_application_data(s)
241+
.unwrap()
242+
.downcast_mut::<TestData>()
243+
.unwrap();
244+
245+
// decrement the number of messages
246+
if app_data.num_messages > 0 {
263247
app_data.num_messages = app_data.num_messages - 1;
248+
}
264249

265-
let fin = app_data.num_messages <= 1;
266-
if fin {
267-
println!{"finishing {}", s};
268-
}
269-
if app_data.num_messages > 0 {
270-
let _written = match conn.stream_send(s, b"Hello!", fin) {
271-
Ok(v) => v,
250+
let fin = app_data.num_messages <= 0;
251+
if fin {
252+
println!{"finishing {}", s};
253+
match conn.stream_send(s, &[0; 0], true) {
254+
Ok(v) => v,
272255

273-
Err(quiche::Error::Done) => 0,
256+
Err(quiche::Error::Done) => 0,
274257

275-
Err(e) => {
276-
println!("{} stream send failed {:?}", conn.trace_id(), e);
277-
return;
278-
},
258+
Err(e) => {
259+
println!("{} stream send failed {:?}", conn.trace_id(), e);
260+
return;
261+
},
279262
};
280-
}
263+
} else {
264+
match conn.stream_send(s, b"Hello!", false) {
265+
Ok(v) => v,
266+
267+
Err(quiche::Error::Done) => 0,
268+
269+
Err(e) => {
270+
println!("{} stream send failed {:?}", conn.trace_id(), e);
271+
return;
272+
},
273+
};
274+
}
281275
}
282276

283277
// Generate outgoing QUIC packets and send them on the UDP socket, until

src/bin/server_test.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ fn main() {
9595
config.set_initial_max_stream_data_bidi_local(1_000_000);
9696
config.set_initial_max_stream_data_bidi_remote(1_000_000);
9797
config.set_initial_max_stream_data_uni(1_000_000);
98-
config.set_initial_max_streams_bidi(10000);
99-
config.set_initial_max_streams_uni(10000);
98+
config.set_initial_max_streams_bidi(100000);
99+
config.set_initial_max_streams_uni(100000);
100100
config.set_disable_active_migration(true);
101101
config.enable_early_data();
102102

@@ -429,16 +429,16 @@ fn validate_token<'a>(
429429

430430
/// Handles newly writable streams.
431431
fn handle_writable(client: &mut Client, stream_id: u64) {
432-
let conn = &mut client.conn;
433-
// end early
434-
match conn.stream_send(stream_id, &[], true) {
435-
Ok(..) => (),
432+
// let conn = &mut client.conn;
433+
// // end early
434+
// match conn.stream_send(stream_id, &[], true) {
435+
// Ok(..) => (),
436436

437-
Err(quiche::Error::Done) => (),
437+
// Err(quiche::Error::Done) => (),
438438

439-
Err(e) => {
440-
println!("{} stream send failed {:?}", conn.trace_id(), e);
439+
// Err(e) => {
440+
// println!("{} stream send failed {:?}", conn.trace_id(), e);
441441

442-
},
443-
}
442+
// },
443+
// }
444444
}

0 commit comments

Comments
 (0)