Skip to content

Commit 335b850

Browse files
committed
quic: stop guarding implemented ngtcp2 callback field
Signed-off-by: Renegade334 <contact.9a5d6388@renegade334.me.uk>
1 parent c4336d9 commit 335b850

2 files changed

Lines changed: 16 additions & 20 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: 14 additions & 18 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,
@@ -1698,20 +1698,18 @@ struct Session::Impl final : public MemoryRetainer {
16981698
on_get_new_cid,
16991699
on_cid_status,
17001700
ngtcp2_crypto_get_path_challenge_data2_cb,
1701-
#ifdef NGTCP2_CALLBACKS_V4
17021701
on_receive_stream_stop_sending,
17031702
#ifdef NGTCP2_CALLBACKS_V5
1704-
nullptr,
1705-
#endif // NGTCP2_CALLBACKS_V5
1706-
#endif // NGTCP2_CALLBACKS_V4
1703+
nullptr, // stream_close2
1704+
#endif
17071705
};
17081706

17091707
static constexpr ngtcp2_callbacks SERVER = {
1710-
nullptr, // stream_stop_sending
1708+
nullptr, // client_initial
17111709
ngtcp2_crypto_recv_client_initial_cb,
17121710
ngtcp2_crypto_recv_crypto_data_cb,
17131711
on_handshake_completed,
1714-
nullptr,
1712+
nullptr, // recv_version_negotiation
17151713
ngtcp2_crypto_encrypt_cb,
17161714
ngtcp2_crypto_decrypt_cb,
17171715
ngtcp2_crypto_hp_mask_cb,
@@ -1720,44 +1718,42 @@ struct Session::Impl final : public MemoryRetainer {
17201718
on_stream_open,
17211719
on_stream_close,
17221720
nullptr, // recv_stateless_reset (deprecated, use v2 below)
1723-
nullptr,
1721+
nullptr, // recv_retry
17241722
on_extend_max_streams_bidi,
17251723
on_extend_max_streams_uni,
17261724
on_rand,
17271725
nullptr, // get_new_connection_id (deprecated, use v2 below)
17281726
on_remove_connection_id,
17291727
ngtcp2_crypto_update_key_cb,
17301728
on_path_validation,
1731-
nullptr,
1729+
nullptr, // select_preferred_addr
17321730
on_stream_reset,
17331731
on_extend_max_remote_streams_bidi,
17341732
on_extend_max_remote_streams_uni,
17351733
on_extend_max_stream_data,
17361734
nullptr, // dcid_status (deprecated, use v2 below)
1737-
nullptr,
1738-
nullptr,
1735+
nullptr, // handshake_confirmed
1736+
nullptr, // recv_new_token
17391737
ngtcp2_crypto_delete_crypto_aead_ctx_cb,
17401738
ngtcp2_crypto_delete_crypto_cipher_ctx_cb,
17411739
on_receive_datagram,
17421740
on_acknowledge_datagram,
17431741
on_lost_datagram,
17441742
nullptr, // get_path_challenge_data (deprecated, use v2 below)
1745-
nullptr, // stream_stop_sending
1743+
nullptr, // stream_stop_sending (deprecated, use v2 below)
17461744
ngtcp2_crypto_version_negotiation_cb,
1747-
nullptr,
1745+
nullptr, // recv_rx_key
17481746
on_receive_tx_key,
17491747
on_early_data_rejected,
17501748
on_begin_path_validation,
17511749
on_receive_stateless_reset,
17521750
on_get_new_cid,
17531751
on_cid_status,
17541752
ngtcp2_crypto_get_path_challenge_data2_cb,
1755-
#ifdef NGTCP2_CALLBACKS_V4
17561753
on_receive_stream_stop_sending,
17571754
#ifdef NGTCP2_CALLBACKS_V5
1758-
nullptr,
1759-
#endif // NGTCP2_CALLBACKS_V5
1760-
#endif // NGTCP2_CALLBACKS_V4
1755+
nullptr, // stream_close2
1756+
#endif
17611757
};
17621758
};
17631759

0 commit comments

Comments
 (0)