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

h2load: Deal with error from ngtcp2_conn_submit_crypto_data

This commit is contained in:
Tatsuhiro Tsujikawa 2022-05-15 12:01:07 +09:00
parent 59d6828848
commit 516cf851c3
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/h2load.h
View File

@ -501,7 +501,7 @@ struct Client {
size_t secretlen); size_t secretlen);
void quic_set_tls_alert(uint8_t alert); void quic_set_tls_alert(uint8_t alert);
void quic_write_client_handshake(ngtcp2_crypto_level level, int quic_write_client_handshake(ngtcp2_crypto_level level,
const uint8_t *data, size_t datalen); const uint8_t *data, size_t datalen);
int quic_pkt_timeout(); int quic_pkt_timeout();
void quic_restart_pkt_timer(); void quic_restart_pkt_timer();

27
src/h2load_quic.cc
View File

@ -267,8 +267,11 @@ namespace {
int add_handshake_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL ossl_level, int add_handshake_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL ossl_level,
const uint8_t *data, size_t len) { const uint8_t *data, size_t len) {
auto c = static_cast<Client *>(SSL_get_app_data(ssl)); auto c = static_cast<Client *>(SSL_get_app_data(ssl));
c->quic_write_client_handshake( if (c->quic_write_client_handshake(
ngtcp2_crypto_openssl_from_ossl_encryption_level(ossl_level), data, len); ngtcp2_crypto_openssl_from_ossl_encryption_level(ossl_level), data,
len) != 0) {
return 0;
}
return 1; return 1;
} }
} // namespace } // namespace
@ -332,8 +335,11 @@ namespace {
int add_handshake_data(SSL *ssl, ssl_encryption_level_t ssl_level, int add_handshake_data(SSL *ssl, ssl_encryption_level_t ssl_level,
const uint8_t *data, size_t len) { const uint8_t *data, size_t len) {
auto c = static_cast<Client *>(SSL_get_app_data(ssl)); auto c = static_cast<Client *>(SSL_get_app_data(ssl));
c->quic_write_client_handshake( if (c->quic_write_client_handshake(
ngtcp2_crypto_boringssl_from_ssl_encryption_level(ssl_level), data, len); ngtcp2_crypto_boringssl_from_ssl_encryption_level(ssl_level), data,
len) != 0) {
return 0;
}
return 1; return 1;
} }
} // namespace } // namespace
@ -576,11 +582,20 @@ int Client::quic_on_tx_secret(ngtcp2_crypto_level level, const uint8_t *secret,
void Client::quic_set_tls_alert(uint8_t alert) { quic.tls_alert = alert; } void Client::quic_set_tls_alert(uint8_t alert) { quic.tls_alert = alert; }
void Client::quic_write_client_handshake(ngtcp2_crypto_level level, int Client::quic_write_client_handshake(ngtcp2_crypto_level level,
const uint8_t *data, size_t datalen) { const uint8_t *data, size_t datalen) {
int rv;
assert(level < 2); assert(level < 2);
ngtcp2_conn_submit_crypto_data(quic.conn, level, data, datalen); rv = ngtcp2_conn_submit_crypto_data(quic.conn, level, data, datalen);
if (rv != 0) {
std::cerr << "ngtcp2_conn_submit_crypto_data: " << ngtcp2_strerror(rv)
<< std::endl;
return -1;
}
return 0;
} }
void quic_pkt_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) { void quic_pkt_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {