walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Assert ndatalen

This commit is contained in:
Tatsuhiro Tsujikawa 2020-04-04 16:28:38 +09:00
parent a60a34331b
commit 8d89a8dcb0
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/h2load_quic.cc
View File

@ -645,10 +645,7 @@ int Client::write_quic() {
switch (nwrite) { switch (nwrite) {
case NGTCP2_ERR_STREAM_DATA_BLOCKED: case NGTCP2_ERR_STREAM_DATA_BLOCKED:
case NGTCP2_ERR_STREAM_SHUT_WR: case NGTCP2_ERR_STREAM_SHUT_WR:
if (nwrite == NGTCP2_ERR_STREAM_DATA_BLOCKED && assert(ndatalen == -1);
ngtcp2_conn_get_max_data_left(quic.conn) == 0) {
return 0;
}
if (s->block_stream(stream_id) != 0) { if (s->block_stream(stream_id) != 0) {
return -1; return -1;
@ -666,18 +663,14 @@ int Client::write_quic() {
return -1; return -1;
} }
assert(ndatalen == -1);
quic_restart_pkt_timer(); quic_restart_pkt_timer();
if (nwrite == 0) { if (nwrite == 0) {
return 0; return 0;
} }
if (ndatalen >= 0) {
if (s->add_write_offset(stream_id, ndatalen) != 0) {
return -1;
}
}
write_udp(reinterpret_cast<sockaddr *>(ps.path.remote.addr), write_udp(reinterpret_cast<sockaddr *>(ps.path.remote.addr),
ps.path.remote.addrlen, buf.data(), nwrite); ps.path.remote.addrlen, buf.data(), nwrite);
} }