FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

quic: multiple fixups and updates · nodejs/node@cd9fd09 · GitHub

/ node Public

Commit cd9fd09

Browse files
jasnell
committed
quic: multiple fixups and updates
Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #59342 Reviewed-By: Stephen Belanger <admin@stephenbelanger.com> Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
1 parent a6c5d27 commit cd9fd09

44 files changed

Lines changed: 647 additions & 361 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎configure.py‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -852,12 +852,6 @@
852852

853853
# End dummy list.
854854

855-
parser.add_argument('--with-quic',
856-
action='store_true',
857-
dest='quic',
858-
default=None,
859-
help='build with QUIC support')
860-
861855
parser.add_argument('--without-ssl',
862856
action='store_true',
863857
dest='without_ssl',
@@ -1835,7 +1829,6 @@ def configure_openssl(o):
18351829
variables['node_shared_ngtcp2'] = b(options.shared_ngtcp2)
18361830
variables['node_shared_nghttp3'] = b(options.shared_nghttp3)
18371831
variables['openssl_is_fips'] = b(options.openssl_is_fips)
1838-
variables['node_quic'] = b(options.quic)
18391832
variables['node_fipsinstall'] = b(False)
18401833

18411834
if options.openssl_no_asm:
@@ -1897,10 +1890,6 @@ def without_ssl_error(option):
18971890
if options.openssl_is_fips and not options.shared_openssl:
18981891
variables['node_fipsinstall'] = b(True)
18991892

1900-
variables['openssl_quic'] = b(options.quic)
1901-
if options.quic:
1902-
o['defines'] += ['NODE_OPENSSL_HAS_QUIC']
1903-
19041893
configure_library('openssl', o)
19051894

19061895
o['variables']['openssl_version'] = get_openssl_version(o)

‎doc/api/cli.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,6 +1135,16 @@ If the ES module being `require()`'d contains top-level `await`, this flag
11351135
allows Node.js to evaluate the module, try to locate the
11361136
top-level awaits, and print their location to help users find them.
11371137

1138+
### `--experimental-quic`
1139+
1140+
<!-- YAML
1141+
added: REPLACEME
1142+
-->
1143+
1144+
> Stability: 1.1 - Active development
1145+
1146+
Enable experimental support for the QUIC protocol.
1147+
11381148
### `--experimental-require-module`
11391149

11401150
<!-- YAML
@@ -1816,6 +1826,16 @@ added: v21.2.0
18161826
18171827
Disable exposition of [Navigator API][] on the global scope.
18181828

1829+
### `--no-experimental-quic`
1830+
1831+
<!-- YAML
1832+
added: REPLACEME
1833+
-->
1834+
1835+
> Stability: 1.1 - Active Development
1836+
1837+
Use this flag to disable QUIC.
1838+
18191839
### `--no-experimental-repl-await`
18201840

18211841
<!-- YAML

‎doc/node-config-schema.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,9 @@
159159
"experimental-print-required-tla": {
160160
"type": "boolean"
161161
},
162+
"experimental-quic": {
163+
"type": "boolean"
164+
},
162165
"experimental-repl-await": {
163166
"type": "boolean"
164167
},

‎doc/node.1‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,9 @@ flag is no longer required as WASI is enabled by default.
226226
.It Fl -experimental-quic
227227
Enable the experimental QUIC support.
228228
.
229+
.It Fl -no-experimental-quic
230+
Disable the experimental QUIC support.
231+
.
229232
.It Fl -experimental-inspector-network-resource
230233
Enable experimental support for inspector network resources.
231234
.

‎lib/internal/bootstrap/node.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,13 @@ const features = {
285285
get require_module() {
286286
return getOptionValue('--experimental-require-module');
287287
},
288+
get quic() {
289+
// TODO(@jasnell): When the implementation is updated to support Boring,
290+
// then this should be refactored to depend not only on the OpenSSL version.
291+
return !openSSLIsBoringSSL &&
292+
getOptionValue('--experimental-quic') &&
293+
process.config.variables.openssl_version >= 810549279; // >= 3.5.1
294+
},
288295
};
289296

290297
ObjectDefineProperty(process, 'features', {

‎node.gyp‎

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,14 @@
193193
'src/quic/preferredaddress.cc',
194194
'src/quic/sessionticket.cc',
195195
'src/quic/tokens.cc',
196-
# 'src/quic/transportparams.cc',
196+
'src/quic/application.cc',
197+
'src/quic/endpoint.cc',
198+
'src/quic/http3.cc',
199+
'src/quic/session.cc',
200+
'src/quic/streams.cc',
201+
'src/quic/tlscontext.cc',
202+
'src/quic/transportparams.cc',
203+
'src/quic/quic.cc',
197204
# headers to make for a more pleasant IDE experience
198205
'src/aliased_buffer.h',
199206
'src/aliased_buffer-inl.h',
@@ -339,7 +346,13 @@
339346
'src/quic/preferredaddress.h',
340347
'src/quic/sessionticket.h',
341348
'src/quic/tokens.h',
342-
# 'src/quic/transportparams.h',
349+
'src/quic/transportparams.h',
350+
'src/quic/application.h',
351+
'src/quic/endpoint.h',
352+
'src/quic/http3.h',
353+
'src/quic/session.h',
354+
'src/quic/streams.h',
355+
'src/quic/tlscontext.h',
343356
'src/quic/guard.h',
344357
],
345358
'node_crypto_sources': [
@@ -402,21 +415,6 @@
402415
'src/node_crypto.cc',
403416
'src/node_crypto.h',
404417
],
405-
'node_quic_sources': [
406-
'src/quic/application.cc',
407-
'src/quic/endpoint.cc',
408-
'src/quic/http3.cc',
409-
'src/quic/session.cc',
410-
'src/quic/streams.cc',
411-
'src/quic/tlscontext.cc',
412-
'src/quic/application.h',
413-
'src/quic/endpoint.h',
414-
'src/quic/http3.h',
415-
'src/quic/session.h',
416-
'src/quic/streams.h',
417-
'src/quic/tlscontext.h',
418-
'src/quic/quic.cc',
419-
],
420418
'node_cctest_openssl_sources': [
421419
'test/cctest/test_crypto_clienthello.cc',
422420
'test/cctest/test_node_crypto.cc',
@@ -960,11 +958,6 @@
960958
'deps/ncrypto/ncrypto.gyp:ncrypto',
961959
],
962960
}],
963-
[ 'node_quic=="true"', {
964-
'sources': [
965-
'<@(node_quic_sources)',
966-
],
967-
}],
968961
[ 'node_use_sqlite=="true"', {
969962
'sources': [
970963
'<@(node_sqlite_sources)',

‎node.gypi‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -425,12 +425,6 @@
425425
}],
426426
]
427427
}],
428-
[ 'openssl_quic=="true" and node_shared_ngtcp2=="false"', {
429-
'dependencies': [ './deps/ngtcp2/ngtcp2.gyp:ngtcp2' ]
430-
}],
431-
[ 'openssl_quic=="true" and node_shared_nghttp3=="false"', {
432-
'dependencies': [ './deps/ngtcp2/ngtcp2.gyp:nghttp3' ]
433-
}]
434428
]
435429
}, {
436430
'defines': [ 'HAVE_OPENSSL=0' ]

‎src/node_binding.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "node.h"
1111
#define NAPI_EXPERIMENTAL
1212
#include "node_api.h"
13+
#include "quic/guard.h"
1314
#include "uv.h"
1415

1516
enum {
@@ -30,7 +31,7 @@ static_assert(static_cast<int>(NM_F_LINKED) ==
3031
#define NODE_BUILTIN_ICU_BINDINGS(V)
3132
#endif
3233

33-
#if HAVE_OPENSSL && NODE_OPENSSL_HAS_QUIC
34+
#if HAVE_OPENSSL && OPENSSL_NO_QUIC != 1
3435
#define NODE_BUILTIN_QUIC_BINDINGS(V) V(quic)
3536
#else
3637
#define NODE_BUILTIN_QUIC_BINDINGS(V)

‎src/node_builtins.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include "node_external_reference.h"
55
#include "node_internals.h"
66
#include "node_threadsafe_cow-inl.h"
7+
#include "quic/guard.h"
78
#include "simdutf.h"
89
#include "util-inl.h"
910

@@ -137,10 +138,10 @@ BuiltinLoader::BuiltinCategories BuiltinLoader::GetBuiltinCategories() const {
137138
"internal/http2/core", "internal/http2/compat",
138139
"internal/streams/lazy_transform",
139140
#endif // !HAVE_OPENSSL
140-
#if !NODE_OPENSSL_HAS_QUIC
141+
#ifndef OPENSSL_NO_QUIC
141142
"internal/quic/quic", "internal/quic/symbols", "internal/quic/stats",
142143
"internal/quic/state",
143-
#endif // !NODE_OPENSSL_HAS_QUIC
144+
#endif // !OPENSSL_NO_QUIC
144145
"quic", // Experimental.
145146
"sqlite", // Experimental.
146147
"sys", // Deprecated.

‎src/node_external_reference.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include <cinttypes>
77
#include <vector>
8+
#include "quic/guard.h"
89
#include "v8-fast-api-calls.h"
910
#include "v8.h"
1011

@@ -135,7 +136,7 @@ class ExternalReferenceRegistry {
135136
#define EXTERNAL_REFERENCE_BINDING_LIST_CRYPTO(V)
136137
#endif // HAVE_OPENSSL
137138

138-
#if HAVE_OPENSSL && NODE_OPENSSL_HAS_QUIC
139+
#if HAVE_OPENSSL && OPENSSL_NO_QUIC != 1
139140
#define EXTERNAL_REFERENCE_BINDING_LIST_QUIC(V) V(quic)
140141
#else
141142
#define EXTERNAL_REFERENCE_BINDING_LIST_QUIC(V)

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL