GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — quic: extract transport logic from Application to Session · nodejs/node@e2e2829

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

src/quic

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/quic/README.md‎`

Copy file name to clipboardExpand all lines: src/quic/README.md

+6-6Lines changed: 6 additions & 6 deletions

Display the source diff
Display the rich diff

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ data channels that carry application data.`
`77`	`77`
`78`	`78`	`Every entry point that may generate outbound data creates a`
`79`	`79`	`SendPendingDataScope`. Scopes nest — an internal depth counter ensures
`80`		-`Application::SendPendingData()` is called exactly once, when the outermost
	`80`	+`Session::SendPendingData()` is called exactly once, when the outermost
`81`	`81`	`scope exits:`
`82`	`82`
`83`	`83`	```cpp
`@@ -218,13 +218,13 @@ Session::Receive()`
`218`	`218`
`219`	`219`	```text
`220`	`220`	`SendPendingDataScope::~SendPendingDataScope()`
`221`		`- → Application::SendPendingData()`
	`221`	`+ → Session::SendPendingData()`
`222`	`222`	`Loop (up to max_packet_count):`
`223`		`- ├── GetStreamData() // pull data from next stream`
`224`		`- │ └── stream->Pull() // bob pull from Outbound→DataQueue`
`225`		`- ├── WriteVStream() // ngtcp2_conn_writev_stream()`
	`223`	`+ ├── application().GetStreamData() // pull data from next stream`
	`224`	`+ │ └── stream->Pull() // bob pull from Outbound→DataQueue`
	`225`	`+ ├── WriteVStream() // ngtcp2_conn_writev_stream()`
`226`	`226`	`│ encrypts, frames, paces`
`227`		`- ├── if ndatalen > 0: StreamCommit()`
	`227`	`+ ├── if ndatalen > 0: application().StreamCommit()`
`228`	`228`	`│ stream->Commit(datalen, fin)`
`229`	`229`	`├── if nwrite > 0: Send() // uv_udp_send()`
`230`	`230`	`├── if WRITE_MORE: continue // room for more in this packet`

Collapse file

`‎src/quic/application.cc‎`

Copy file name to clipboardExpand all lines: src/quic/application.cc

+6-449Lines changed: 6 additions & 449 deletions

Large diffs are not rendered by default.

Collapse file

`‎src/quic/application.h‎`

Copy file name to clipboardExpand all lines: src/quic/application.h

-56Lines changed: 0 additions & 56 deletions

Original file line number	Diff line number	Diff line change
`@@ -205,10 +205,6 @@ class Session::Application : public MemoryRetainer {`
`205`	`205`	`return false;`
`206`	`206`	`}`
`207`	`207`
`208`		`- // Signals to the Application that it should serialize and transmit any`
`209`		`- // pending session and stream packets it has accumulated.`
`210`		`- void SendPendingData();`
`211`		`-`
`212`	`208`	`// Returns true if the application protocol supports sending and`
`213`	`209`	`// receiving headers on streams (e.g. HTTP/3). Applications that`
`214`	`210`	`// do not support headers should return false (the default).`
`@@ -243,10 +239,6 @@ class Session::Application : public MemoryRetainer {`
`243`	`239`	`return {StreamPriority::DEFAULT, StreamPriorityFlags::NON_INCREMENTAL};`
`244`	`240`	`}`
`245`	`241`
`246`		`- // The StreamData struct is used by the application to pass pending stream`
`247`		`- // data to the session for transmission.`
`248`		`- struct StreamData;`
`249`		`-`
`250`	`242`	`virtual int GetStreamData(StreamData* data) = 0;`
`251`	`243`	`virtual bool StreamCommit(StreamData* data, size_t datalen) = 0;`
`252`	`244`
`@@ -262,57 +254,9 @@ class Session::Application : public MemoryRetainer {`
`262`	`254`	`}`
`263`	`255`
`264`	`256`	`private:`
`265`		`- Packet::Ptr CreateStreamDataPacket();`
`266`		`-`
`267`		`- // Tries to pack a pending datagram into the current packet buffer.`
`268`		`- // If < 0 is returned, either NGTCP2_ERR_WRITE_MORE or a fatal error is`
`269`		`- // returned; the caller must check. If > 0 is returned, the packet is done`
`270`		`- // and the value is the size of the finalized packet. If 0 is returned,`
`271`		`- // the datagram is either congestion limited or was abandoned`
`272`		`- ssize_t TryWritePendingDatagram(PathStorage* path,`
`273`		`- uint8_t* dest,`
`274`		`- size_t destlen,`
`275`		`- uint64_t ts);`
`276`		`-`
`277`		`- // Write the given stream_data into the buffer. The PacketInfo out-param`
`278`		`- // is populated by ngtcp2 with per-packet metadata (e.g., ECN codepoint)`
`279`		`- // that should be applied when sending the packet.`
`280`		`- ssize_t WriteVStream(PathStorage* path,`
`281`		`- PacketInfo* pi,`
`282`		`- uint8_t* buf,`
`283`		`- ssize_t* ndatalen,`
`284`		`- size_t max_packet_size,`
`285`		`- const StreamData& stream_data,`
`286`		`- uint64_t ts);`
`287`		`-`
`288`	`257`	`Session* session_ = nullptr;`
`289`	`258`	`};`
`290`	`259`
`291`		`-struct Session::Application::StreamData final {`
`292`		`- // The actual number of vectors in the struct, up to kMaxVectorCount.`
`293`		`- size_t count = 0;`
`294`		`- // The stream identifier. If this is a negative value then no stream is`
`295`		`- // identified.`
`296`		`- stream_id id = -1;`
`297`		`- int fin = 0;`
`298`		`- ngtcp2_vec data[kMaxVectorCount]{};`
`299`		`- BaseObjectPtr<Stream> stream;`
`300`		`-`
`301`		`- static_assert(sizeof(ngtcp2_vec) == sizeof(nghttp3_vec) &&`
`302`		`- alignof(ngtcp2_vec) == alignof(nghttp3_vec) &&`
`303`		`- offsetof(ngtcp2_vec, base) == offsetof(nghttp3_vec, base) &&`
`304`		`- offsetof(ngtcp2_vec, len) == offsetof(nghttp3_vec, len),`
`305`		`- "ngtcp2_vec and nghttp3_vec must have identical layout");`
`306`		`- inline operator nghttp3_vec*() {`
`307`		`- return reinterpret_cast<nghttp3_vec*>(data);`
`308`		`- }`
`309`		`-`
`310`		`- inline operator const ngtcp2_vec*() const { return data; }`
`311`		`- inline operator ngtcp2_vec*() { return data; }`
`312`		`-`
`313`		`- std::string ToString() const;`
`314`		`-};`
`315`		`-`
`316`	`260`	`// Create a DefaultApplication for the given session.`
`317`	`261`	`std::unique_ptr<Session::Application> CreateDefaultApplication(`
`318`	`262`	`Session* session, const Session::Application_Options& options);`

Collapse file

`‎src/quic/http3.cc‎`

Copy file name to clipboardExpand all lines: src/quic/http3.cc

+40-46Lines changed: 40 additions & 46 deletions

Original file line number	Diff line number	Diff line change
`@@ -209,24 +209,25 @@ class Http3ApplicationImpl final : public Session::Application {`
`209`	`209`	`started_ = true;`
`210`	`210`	`Debug(&session(), "Starting HTTP/3 application.");`
`211`	`211`
`212`		`- auto params = ngtcp2_conn_get_remote_transport_params(session());`
`213`		`- if (params == nullptr) [[unlikely]] {`
	`212`	`+ const auto params = session().remote_transport_params();`
	`213`	`+ if (!params) [[unlikely]] {`
`214`	`214`	`// The params are not available yet. Cannot start.`
`215`	`215`	`Debug(&session(),`
`216`	`216`	`"Cannot start HTTP/3 application yet. No remote transport params");`
`217`	`217`	`return false;`
`218`	`218`	`}`
`219`	`219`
`220`		`- if (params->initial_max_streams_uni < 3) {`
	`220`	`+ if (params.initial_max_streams_uni() < 3) {`
`221`	`221`	`// HTTP3 requires 3 unidirectional control streams to be opened in each`
`222`	`222`	`// direction in additional to the bidirectional streams that are used to`
`223`	`223`	`// actually carry request and response payload back and forth.`
`224`	`224`	`// See:`
`225`	`225`	`// https://nghttp2.org/nghttp3/programmers-guide.html#binding-control-streams`
`226`	`226`	`Debug(&session(),`
`227`	`227`	`"Cannot start HTTP/3 application. Initial max "`
`228`		`- "unidirectional streams [%zu] is too low. Must be at least 3",`
`229`		`- params->initial_max_streams_uni);`
	`228`	`+ "unidirectional streams [%" PRIu64`
	`229`	`+ "] is too low. Must be at least 3",`
	`230`	`+ params.initial_max_streams_uni());`
`230`	`231`	`return false;`
`231`	`232`	`}`
`232`	`233`
`@@ -235,17 +236,14 @@ class Http3ApplicationImpl final : public Session::Application {`
`235`	`236`	`// of requests that the client can actually created.`
`236`	`237`	`if (session().is_server()) {`
`237`	`238`	`nghttp3_conn_set_max_client_streams_bidi(`
`238`		`- *this, params->initial_max_streams_bidi);`
	`239`	`+ *this, params.initial_max_streams_bidi());`
`239`	`240`	`}`
`240`	`241`
`241`	`242`	`Debug(&session(), "Creating and binding HTTP/3 control streams");`
`242`	`243`	`bool ret =`
`243`		`- ngtcp2_conn_open_uni_stream(session(), &control_stream_id_, nullptr) ==`
`244`		`- 0 &&`
`245`		`- ngtcp2_conn_open_uni_stream(`
`246`		`- session(), &qpack_enc_stream_id_, nullptr) == 0 &&`
`247`		`- ngtcp2_conn_open_uni_stream(`
`248`		`- session(), &qpack_dec_stream_id_, nullptr) == 0 &&`
	`244`	`+ session().OpenUnidirectionalStream(&control_stream_id_) &&`
	`245`	`+ session().OpenUnidirectionalStream(&qpack_enc_stream_id_) &&`
	`246`	`+ session().OpenUnidirectionalStream(&qpack_dec_stream_id_) &&`
`249`	`247`	`nghttp3_conn_bind_control_stream(*this, control_stream_id_) == 0 &&`
`250`	`248`	`nghttp3_conn_bind_qpack_streams(`
`251`	`249`	`*this, qpack_enc_stream_id_, qpack_dec_stream_id_) == 0;`
`@@ -306,8 +304,7 @@ class Http3ApplicationImpl final : public Session::Application {`
`306`	`304`	`Debug(&session(),`
`307`	`305`	`"Extending stream and connection offset by %zd bytes",`
`308`	`306`	`nread);`
`309`		`- session().ExtendStreamOffset(id, nread);`
`310`		`- session().ExtendOffset(nread);`
	`307`	`+ session().Consume(id, nread);`
`311`	`308`	`}`
`312`	`309`
`313`	`310`	`// If this data arrived as 0-RTT, mark the stream. We set it after`
`@@ -365,24 +362,11 @@ class Http3ApplicationImpl final : public Session::Application {`
`365`	`362`	`case EndpointLabel::LOCAL:`
`366`	`363`	`return;`
`367`	`364`	`case EndpointLabel::REMOTE: {`
`368`		`- switch (direction) {`
`369`		`- case Direction::BIDIRECTIONAL: {`
`370`		`- Debug(&session(),`
`371`		`- "HTTP/3 application extending max bidi streams by %" PRIu64,`
`372`		`- max_streams);`
`373`		`- ngtcp2_conn_extend_max_streams_bidi(`
`374`		`- session(), static_cast<size_t>(max_streams));`
`375`		`- break;`
`376`		`- }`
`377`		`- case Direction::UNIDIRECTIONAL: {`
`378`		`- Debug(&session(),`
`379`		`- "HTTP/3 application extending max uni streams by %" PRIu64,`
`380`		`- max_streams);`
`381`		`- ngtcp2_conn_extend_max_streams_uni(`
`382`		`- session(), static_cast<size_t>(max_streams));`
`383`		`- break;`
`384`		`- }`
`385`		`- }`
	`365`	`+ Debug(&session(),`
	`366`	`+ "HTTP/3 application extending max %s streams by %" PRIu64,`
	`367`	`+ direction == Direction::BIDIRECTIONAL ? "bidi" : "uni",`
	`368`	`+ max_streams);`
	`369`	`+ session().ExtendMaxStreams(direction, max_streams);`
`386`	`370`	`}`
`387`	`371`	`}`
`388`	`372`	`}`
`@@ -530,8 +514,7 @@ class Http3ApplicationImpl final : public Session::Application {`
`530`	`514`	`return;`
`531`	`515`	`}`
`532`	`516`
`533`		`- session().SetLastError(`
`534`		`- QuicError::ForApplication(nghttp3_err_infer_quic_app_error_code(rv)));`
	`517`	`+ session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(rv));`
`535`	`518`	`session().Close();`
`536`	`519`	`}`
`537`	`520`
`@@ -548,8 +531,7 @@ class Http3ApplicationImpl final : public Session::Application {`
`548`	`531`	`return;`
`549`	`532`	`}`
`550`	`533`
`551`		`- session().SetLastError(`
`552`		`- QuicError::ForApplication(nghttp3_err_infer_quic_app_error_code(rv)));`
	`534`	`+ session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(rv));`
`553`	`535`	`session().Close();`
`554`	`536`	`}`
`555`	`537`
`@@ -687,17 +669,30 @@ class Http3ApplicationImpl final : public Session::Application {`
`687`	`669`	`return {StreamPriority::DEFAULT, StreamPriorityFlags::NON_INCREMENTAL};`
`688`	`670`	`}`
`689`	`671`
`690`		`- int GetStreamData(StreamData* data) override {`
	`672`	`+ int GetStreamData(Session::StreamData* data) override {`
	`673`	`+ static_assert(`
	`674`	`+ sizeof(ngtcp2_vec) == sizeof(nghttp3_vec) &&`
	`675`	`+ alignof(ngtcp2_vec) == alignof(nghttp3_vec) &&`
	`676`	`+ offsetof(ngtcp2_vec, base) == offsetof(nghttp3_vec, base) &&`
	`677`	`+ offsetof(ngtcp2_vec, len) == offsetof(nghttp3_vec, len),`
	`678`	`+ "ngtcp2_vec and nghttp3_vec must have identical layout");`
`691`	`679`	`data->count = kMaxVectorCount;`
`692`	`680`	`ssize_t ret = 0;`
`693`	`681`	`Debug(&session(), "HTTP/3 application getting stream data");`
`694`	`682`	`if (conn_ && session().max_data_left()) {`
`695`		`- ret = nghttp3_conn_writev_stream(`
`696`		`- this, &data->id, &data->fin, data, data->count);`
	`683`	`+ // nghttp3 reports fin through an int out-param; bridge it to the bool.`
	`684`	`+ int fin = 0;`
	`685`	`+ ret =`
	`686`	`+ nghttp3_conn_writev_stream(*this,`
	`687`	`+ &data->id,`
	`688`	`+ &fin,`
	`689`	`+ reinterpret_cast<nghttp3_vec*>(data->data),`
	`690`	`+ data->count);`
`697`	`691`	`// A negative return value indicates an error.`
`698`	`692`	`if (ret < 0) {`
`699`	`693`	`return static_cast<int>(ret);`
`700`	`694`	`}`
	`695`	`+ data->fin = fin != 0;`
`701`	`696`
`702`	`697`	`data->count = static_cast<size_t>(ret);`
`703`	`698`	`if (data->id >= 0 && data->id != control_stream_id_ &&`
`@@ -710,7 +705,7 @@ class Http3ApplicationImpl final : public Session::Application {`
`710`	`705`	`return 0;`
`711`	`706`	`}`
`712`	`707`
`713`		`- bool StreamCommit(StreamData* data, size_t datalen) override {`
	`708`	`+ bool StreamCommit(Session::StreamData* data, size_t datalen) override {`
`714`	`709`	`Debug(&session(),`
`715`	`710`	`"HTTP/3 application committing stream %" PRIi64 " data %zu",`
`716`	`711`	`data->id,`
`@@ -720,8 +715,7 @@ class Http3ApplicationImpl final : public Session::Application {`
`720`	`715`	`// nghttp3 tracks its own offset via add_write_offset.`
`721`	`716`	`int err = nghttp3_conn_add_write_offset(*this, data->id, datalen);`
`722`	`717`	`if (err != 0) {`
`723`		`- session().SetLastError(QuicError::ForApplication(`
`724`		`- nghttp3_err_infer_quic_app_error_code(err)));`
	`718`	`+ session().SetApplicationError(nghttp3_err_infer_quic_app_error_code(err));`
`725`	`719`	`return false;`
`726`	`720`	`}`
`727`	`721`	`// Raw application bytes are committed to the stream's outbound`
`@@ -1212,10 +1206,10 @@ class Http3ApplicationImpl final : public Session::Application {`
`1212`	`1206`	`void* conn_user_data,`
`1213`	`1207`	`void* stream_user_data) {`
`1214`	`1208`	`NGHTTP3_CALLBACK_SCOPE(app);`
`1215`		`- auto& session = app.session();`
`1216`		`- Debug(&session, "HTTP/3 application deferred consume %zu bytes", consumed);`
`1217`		`- session.ExtendStreamOffset(id, consumed);`
`1218`		`- session.ExtendOffset(consumed);`
	`1209`	`+ Debug(&app.session(),`
	`1210`	`+ "HTTP/3 application deferred consume %zu bytes",`
	`1211`	`+ consumed);`
	`1212`	`+ app.session().Consume(id, consumed);`
`1219`	`1213`	`return NGTCP2_SUCCESS;`
`1220`	`1214`	`}`
`1221`	`1215`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.