Skip to content

Commit 5415548

Browse files
committed
fixup! quic: stop guarding implemented ngtcp2 callback field
1 parent ca1110d commit 5415548

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎src/quic/http3.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1445,7 +1445,7 @@ class Http3ApplicationImpl final : public Session::Application {
14451445

14461446
static constexpr nghttp3_callbacks kCallbacks = {
14471447
on_acked_stream_data,
1448-
nullptr, // nghttp3_stream_close (deprecated)
1448+
nullptr, // stream_close (deprecated, use v2 below)
14491449
on_receive_data,
14501450
on_deferred_consume,
14511451
on_begin_headers,
@@ -1458,7 +1458,7 @@ class Http3ApplicationImpl final : public Session::Application {
14581458
on_end_stream,
14591459
on_do_reset_stream,
14601460
on_shutdown,
1461-
nullptr, // recv_settings (deprecated)
1461+
nullptr, // recv_settings (deprecated, use v2 below)
14621462
on_receive_origin,
14631463
on_end_origin,
14641464
on_rand,

‎src/quic/session.cc‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1654,7 +1654,7 @@ struct Session::Impl final : public MemoryRetainer {
16541654

16551655
static constexpr ngtcp2_callbacks CLIENT = {
16561656
ngtcp2_crypto_client_initial_cb,
1657-
nullptr, // stream_stop_sending
1657+
nullptr, // recv_client_initial
16581658
ngtcp2_crypto_recv_crypto_data_cb,
16591659
on_handshake_completed,
16601660
on_receive_version_negotiation,
@@ -1688,7 +1688,7 @@ struct Session::Impl final : public MemoryRetainer {
16881688
on_acknowledge_datagram,
16891689
on_lost_datagram,
16901690
nullptr, // get_path_challenge_data (deprecated, use v2 below)
1691-
nullptr, // stream_stop_sending
1691+
nullptr, // stream_stop_sending (deprecated, use v2 below)
16921692
ngtcp2_crypto_version_negotiation_cb,
16931693
on_receive_rx_key,
16941694
on_receive_tx_key,
@@ -1700,16 +1700,16 @@ struct Session::Impl final : public MemoryRetainer {
17001700
ngtcp2_crypto_get_path_challenge_data2_cb,
17011701
on_receive_stream_stop_sending,
17021702
#ifdef NGTCP2_CALLBACKS_V5
1703-
nullptr,
1703+
nullptr, // stream_close2
17041704
#endif
17051705
};
17061706

17071707
static constexpr ngtcp2_callbacks SERVER = {
1708-
nullptr, // stream_stop_sending
1708+
nullptr, // client_initial
17091709
ngtcp2_crypto_recv_client_initial_cb,
17101710
ngtcp2_crypto_recv_crypto_data_cb,
17111711
on_handshake_completed,
1712-
nullptr,
1712+
nullptr, // recv_version_negotiation
17131713
ngtcp2_crypto_encrypt_cb,
17141714
ngtcp2_crypto_decrypt_cb,
17151715
ngtcp2_crypto_hp_mask_cb,
@@ -1718,31 +1718,31 @@ struct Session::Impl final : public MemoryRetainer {
17181718
on_stream_open,
17191719
on_stream_close,
17201720
nullptr, // recv_stateless_reset (deprecated, use v2 below)
1721-
nullptr,
1721+
nullptr, // recv_retry
17221722
on_extend_max_streams_bidi,
17231723
on_extend_max_streams_uni,
17241724
on_rand,
17251725
nullptr, // get_new_connection_id (deprecated, use v2 below)
17261726
on_remove_connection_id,
17271727
ngtcp2_crypto_update_key_cb,
17281728
on_path_validation,
1729-
nullptr,
1729+
nullptr, // select_preferred_addr
17301730
on_stream_reset,
17311731
on_extend_max_remote_streams_bidi,
17321732
on_extend_max_remote_streams_uni,
17331733
on_extend_max_stream_data,
17341734
nullptr, // dcid_status (deprecated, use v2 below)
1735-
nullptr,
1736-
nullptr,
1735+
nullptr, // handshake_confirmed
1736+
nullptr, // recv_new_token
17371737
ngtcp2_crypto_delete_crypto_aead_ctx_cb,
17381738
ngtcp2_crypto_delete_crypto_cipher_ctx_cb,
17391739
on_receive_datagram,
17401740
on_acknowledge_datagram,
17411741
on_lost_datagram,
17421742
nullptr, // get_path_challenge_data (deprecated, use v2 below)
1743-
nullptr, // stream_stop_sending
1743+
nullptr, // stream_stop_sending (deprecated, use v2 below)
17441744
ngtcp2_crypto_version_negotiation_cb,
1745-
nullptr,
1745+
nullptr, // recv_rx_key
17461746
on_receive_tx_key,
17471747
on_early_data_rejected,
17481748
on_begin_path_validation,
@@ -1752,7 +1752,7 @@ struct Session::Impl final : public MemoryRetainer {
17521752
ngtcp2_crypto_get_path_challenge_data2_cb,
17531753
on_receive_stream_stop_sending,
17541754
#ifdef NGTCP2_CALLBACKS_V5
1755-
nullptr,
1755+
nullptr, // stream_close2
17561756
#endif
17571757
};
17581758
};

0 commit comments

Comments
 (0)