Skip to content

Commit f066f91

Browse files
committed
quic: update to use update path challenge callback
1 parent 7c7acdc commit f066f91

1 file changed

Lines changed: 17 additions & 14 deletions

File tree

src/quic/session.cc

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -107,17 +107,20 @@ namespace quic {
107107
V(DATAGRAMS_ACKNOWLEDGED, datagrams_acknowledged) \
108108
V(DATAGRAMS_LOST, datagrams_lost)
109109

110+
#define NO_SIDE_EFFECT true
111+
#define SIDE_EFFECT false
112+
110113
#define SESSION_JS_METHODS(V) \
111-
V(Destroy, destroy, false) \
112-
V(GetRemoteAddress, getRemoteAddress, true) \
113-
V(GetCertificate, getCertificate, true) \
114-
V(GetEphemeralKeyInfo, getEphemeralKey, true) \
115-
V(GetPeerCertificate, getPeerCertificate, true) \
116-
V(GracefulClose, gracefulClose, false) \
117-
V(SilentClose, silentClose, false) \
118-
V(UpdateKey, updateKey, false) \
119-
V(OpenStream, openStream, false) \
120-
V(SendDatagram, sendDatagram, false)
114+
V(Destroy, destroy, SIDE_EFFECT) \
115+
V(GetRemoteAddress, getRemoteAddress, NO_SIDE_EFFECT) \
116+
V(GetCertificate, getCertificate, NO_SIDE_EFFECT) \
117+
V(GetEphemeralKeyInfo, getEphemeralKey, NO_SIDE_EFFECT) \
118+
V(GetPeerCertificate, getPeerCertificate, NO_SIDE_EFFECT) \
119+
V(GracefulClose, gracefulClose, SIDE_EFFECT) \
120+
V(SilentClose, silentClose, SIDE_EFFECT) \
121+
V(UpdateKey, updateKey, SIDE_EFFECT) \
122+
V(OpenStream, openStream, SIDE_EFFECT) \
123+
V(SendDatagram, sendDatagram, SIDE_EFFECT)
121124

122125
struct Session::State final {
123126
#define V(_, name, type) type name;
@@ -1234,7 +1237,7 @@ struct Session::Impl final : public MemoryRetainer {
12341237
on_receive_datagram,
12351238
on_acknowledge_datagram,
12361239
on_lost_datagram,
1237-
ngtcp2_crypto_get_path_challenge_data_cb,
1240+
nullptr, // get_path_challenge_data (deprecated, use v2 below)
12381241
on_stream_stop_sending,
12391242
ngtcp2_crypto_version_negotiation_cb,
12401243
on_receive_rx_key,
@@ -1244,7 +1247,7 @@ struct Session::Impl final : public MemoryRetainer {
12441247
on_receive_stateless_reset,
12451248
on_get_new_cid,
12461249
on_cid_status,
1247-
nullptr};
1250+
ngtcp2_crypto_get_path_challenge_data2_cb};
12481251

12491252
static constexpr ngtcp2_callbacks SERVER = {
12501253
nullptr,
@@ -1281,7 +1284,7 @@ struct Session::Impl final : public MemoryRetainer {
12811284
on_receive_datagram,
12821285
on_acknowledge_datagram,
12831286
on_lost_datagram,
1284-
ngtcp2_crypto_get_path_challenge_data_cb,
1287+
nullptr, // get_path_challenge_data (deprecated, use v2 below)
12851288
on_stream_stop_sending,
12861289
ngtcp2_crypto_version_negotiation_cb,
12871290
nullptr,
@@ -1291,7 +1294,7 @@ struct Session::Impl final : public MemoryRetainer {
12911294
on_receive_stateless_reset,
12921295
on_get_new_cid,
12931296
on_cid_status,
1294-
nullptr};
1297+
ngtcp2_crypto_get_path_challenge_data2_cb};
12951298
};
12961299

12971300
#undef NGTCP2_CALLBACK_SCOPE

0 commit comments

Comments
 (0)