dgram: make process.binding('udp_wrap') internal
PR-URL: https://github.com/nodejs/node/pull/22475 Refs: https://github.com/nodejs/node/issues/22160 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Michaël Zasso <targos@protonmail.com>
This commit is contained in:
parent
98b5d66629
commit
c8950cdabc
@ -52,9 +52,10 @@ const {
|
|||||||
defaultTriggerAsyncIdScope,
|
defaultTriggerAsyncIdScope,
|
||||||
symbols: { async_id_symbol, owner_symbol }
|
symbols: { async_id_symbol, owner_symbol }
|
||||||
} = require('internal/async_hooks');
|
} = require('internal/async_hooks');
|
||||||
|
const { internalBinding } = require('internal/bootstrap/loaders');
|
||||||
const { UV_UDP_REUSEADDR } = process.binding('constants').os;
|
const { UV_UDP_REUSEADDR } = process.binding('constants').os;
|
||||||
|
|
||||||
const { UDP, SendWrap } = process.binding('udp_wrap');
|
const { UDP, SendWrap } = internalBinding('udp_wrap');
|
||||||
|
|
||||||
const BIND_STATE_UNBOUND = 0;
|
const BIND_STATE_UNBOUND = 0;
|
||||||
const BIND_STATE_BINDING = 1;
|
const BIND_STATE_BINDING = 1;
|
||||||
|
@ -350,6 +350,7 @@
|
|||||||
new SafeSet([
|
new SafeSet([
|
||||||
'cares_wrap',
|
'cares_wrap',
|
||||||
'fs_event_wrap',
|
'fs_event_wrap',
|
||||||
|
'udp_wrap',
|
||||||
'uv',
|
'uv',
|
||||||
'pipe_wrap',
|
'pipe_wrap',
|
||||||
'http_parser',
|
'http_parser',
|
||||||
|
@ -28,7 +28,7 @@ const { WriteWrap } = internalBinding('stream_wrap');
|
|||||||
const { Pipe, constants: PipeConstants } = internalBinding('pipe_wrap');
|
const { Pipe, constants: PipeConstants } = internalBinding('pipe_wrap');
|
||||||
const { TCP } = internalBinding('tcp_wrap');
|
const { TCP } = internalBinding('tcp_wrap');
|
||||||
const { TTY } = internalBinding('tty_wrap');
|
const { TTY } = internalBinding('tty_wrap');
|
||||||
const { UDP } = process.binding('udp_wrap');
|
const { UDP } = internalBinding('udp_wrap');
|
||||||
const SocketList = require('internal/socket_list');
|
const SocketList = require('internal/socket_list');
|
||||||
const { owner_symbol } = require('internal/async_hooks').symbols;
|
const { owner_symbol } = require('internal/async_hooks').symbols;
|
||||||
const { convertToValidSignal } = require('internal/util');
|
const { convertToValidSignal } = require('internal/util');
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
const { codes } = require('internal/errors');
|
const { codes } = require('internal/errors');
|
||||||
const { internalBinding } = require('internal/bootstrap/loaders');
|
const { internalBinding } = require('internal/bootstrap/loaders');
|
||||||
const { UDP } = process.binding('udp_wrap');
|
const { UDP } = internalBinding('udp_wrap');
|
||||||
const { isInt32 } = require('internal/validators');
|
const { isInt32 } = require('internal/validators');
|
||||||
const TTYWrap = internalBinding('tty_wrap');
|
const TTYWrap = internalBinding('tty_wrap');
|
||||||
const { UV_EINVAL } = internalBinding('uv');
|
const { UV_EINVAL } = internalBinding('uv');
|
||||||
|
@ -527,4 +527,4 @@ uv_udp_t* UDPWrap::UVHandle() {
|
|||||||
|
|
||||||
} // namespace node
|
} // namespace node
|
||||||
|
|
||||||
NODE_BUILTIN_MODULE_CONTEXT_AWARE(udp_wrap, node::UDPWrap::Initialize)
|
NODE_MODULE_CONTEXT_AWARE_INTERNAL(udp_wrap, node::UDPWrap::Initialize)
|
||||||
|
@ -12,7 +12,7 @@ const assert = require('assert');
|
|||||||
// their prototype
|
// their prototype
|
||||||
const { internalBinding } = require('internal/test/binding');
|
const { internalBinding } = require('internal/test/binding');
|
||||||
const TTY = internalBinding('tty_wrap').TTY;
|
const TTY = internalBinding('tty_wrap').TTY;
|
||||||
const UDP = process.binding('udp_wrap').UDP;
|
const UDP = internalBinding('udp_wrap').UDP;
|
||||||
|
|
||||||
{
|
{
|
||||||
// Should throw instead of raise assertions
|
// Should throw instead of raise assertions
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Flags: --expose-internals
|
||||||
'use strict';
|
'use strict';
|
||||||
const common = require('../common');
|
const common = require('../common');
|
||||||
if (common.isWindows)
|
if (common.isWindows)
|
||||||
@ -9,7 +10,6 @@ const PACKETS_PER_WORKER = 10;
|
|||||||
const assert = require('assert');
|
const assert = require('assert');
|
||||||
const cluster = require('cluster');
|
const cluster = require('cluster');
|
||||||
const dgram = require('dgram');
|
const dgram = require('dgram');
|
||||||
const { UDP } = process.binding('udp_wrap');
|
|
||||||
|
|
||||||
if (cluster.isMaster)
|
if (cluster.isMaster)
|
||||||
master();
|
master();
|
||||||
@ -18,6 +18,9 @@ else
|
|||||||
|
|
||||||
|
|
||||||
function master() {
|
function master() {
|
||||||
|
const { internalBinding } = require('internal/test/binding');
|
||||||
|
const { UDP } = internalBinding('udp_wrap');
|
||||||
|
|
||||||
// Create a handle and use its fd.
|
// Create a handle and use its fd.
|
||||||
const rawHandle = new UDP();
|
const rawHandle = new UDP();
|
||||||
const err = rawHandle.bind(common.localhostIPv4, 0, 0);
|
const err = rawHandle.bind(common.localhostIPv4, 0, 0);
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Flags: --expose-internals
|
||||||
'use strict';
|
'use strict';
|
||||||
const common = require('../common');
|
const common = require('../common');
|
||||||
if (common.isWindows)
|
if (common.isWindows)
|
||||||
@ -5,7 +6,8 @@ if (common.isWindows)
|
|||||||
|
|
||||||
const assert = require('assert');
|
const assert = require('assert');
|
||||||
const dgram = require('dgram');
|
const dgram = require('dgram');
|
||||||
const { UDP } = process.binding('udp_wrap');
|
const { internalBinding } = require('internal/test/binding');
|
||||||
|
const { UDP } = internalBinding('udp_wrap');
|
||||||
const { UV_UDP_REUSEADDR } = process.binding('constants').os;
|
const { UV_UDP_REUSEADDR } = process.binding('constants').os;
|
||||||
|
|
||||||
const BUFFER_SIZE = 4096;
|
const BUFFER_SIZE = 4096;
|
||||||
|
@ -6,8 +6,8 @@ if (common.isWindows)
|
|||||||
|
|
||||||
const assert = require('assert');
|
const assert = require('assert');
|
||||||
const dgram = require('dgram');
|
const dgram = require('dgram');
|
||||||
const { UDP } = process.binding('udp_wrap');
|
|
||||||
const { internalBinding } = require('internal/test/binding');
|
const { internalBinding } = require('internal/test/binding');
|
||||||
|
const { UDP } = internalBinding('udp_wrap');
|
||||||
const { TCP, constants } = internalBinding('tcp_wrap');
|
const { TCP, constants } = internalBinding('tcp_wrap');
|
||||||
const _createSocketHandle = dgram._createSocketHandle;
|
const _createSocketHandle = dgram._createSocketHandle;
|
||||||
|
|
||||||
|
@ -3,7 +3,8 @@
|
|||||||
const common = require('../common');
|
const common = require('../common');
|
||||||
const assert = require('assert');
|
const assert = require('assert');
|
||||||
const { _createSocketHandle } = require('internal/dgram');
|
const { _createSocketHandle } = require('internal/dgram');
|
||||||
const UDP = process.binding('udp_wrap').UDP;
|
const { internalBinding } = require('internal/test/binding');
|
||||||
|
const UDP = internalBinding('udp_wrap').UDP;
|
||||||
|
|
||||||
{
|
{
|
||||||
// Create a handle that is not bound.
|
// Create a handle that is not bound.
|
||||||
|
@ -7,13 +7,12 @@ require('../common');
|
|||||||
|
|
||||||
const assert = require('assert');
|
const assert = require('assert');
|
||||||
const { internalBinding } = require('internal/test/binding');
|
const { internalBinding } = require('internal/test/binding');
|
||||||
|
|
||||||
[
|
[
|
||||||
process.binding('udp_wrap').UDP.prototype.bind6,
|
internalBinding('udp_wrap').UDP.prototype.bind6,
|
||||||
internalBinding('tcp_wrap').TCP.prototype.bind6,
|
internalBinding('tcp_wrap').TCP.prototype.bind6,
|
||||||
process.binding('udp_wrap').UDP.prototype.send6,
|
internalBinding('udp_wrap').UDP.prototype.send6,
|
||||||
internalBinding('tcp_wrap').TCP.prototype.bind,
|
internalBinding('tcp_wrap').TCP.prototype.bind,
|
||||||
process.binding('udp_wrap').UDP.prototype.close,
|
internalBinding('udp_wrap').UDP.prototype.close,
|
||||||
internalBinding('tcp_wrap').TCP.prototype.open
|
internalBinding('tcp_wrap').TCP.prototype.open
|
||||||
].forEach((binding, i) => {
|
].forEach((binding, i) => {
|
||||||
assert.strictEqual('prototype' in binding, false, `Test ${i} failed`);
|
assert.strictEqual('prototype' in binding, false, `Test ${i} failed`);
|
||||||
|
@ -272,7 +272,7 @@ if (common.hasCrypto) { // eslint-disable-line node-core/crypto-check
|
|||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
const binding = process.binding('udp_wrap');
|
const binding = internalBinding('udp_wrap');
|
||||||
const handle = new binding.UDP();
|
const handle = new binding.UDP();
|
||||||
const req = new binding.SendWrap();
|
const req = new binding.SendWrap();
|
||||||
testInitialized(handle, 'UDP');
|
testInitialized(handle, 'UDP');
|
||||||
|
Loading…
x
Reference in New Issue
Block a user