Skip to content

Commit c8950cd

Browse files
committed
dgram: make process.binding('udp_wrap') internal
PR-URL: #22475 Refs: #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>
1 parent 98b5d66 commit c8950cd

12 files changed

+21
-14
lines changed

lib/dgram.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,10 @@ const {
5252
defaultTriggerAsyncIdScope,
5353
symbols: { async_id_symbol, owner_symbol }
5454
} = require('internal/async_hooks');
55+
const { internalBinding } = require('internal/bootstrap/loaders');
5556
const { UV_UDP_REUSEADDR } = process.binding('constants').os;
5657

57-
const { UDP, SendWrap } = process.binding('udp_wrap');
58+
const { UDP, SendWrap } = internalBinding('udp_wrap');
5859

5960
const BIND_STATE_UNBOUND = 0;
6061
const BIND_STATE_BINDING = 1;

lib/internal/bootstrap/node.js

+1
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,7 @@
350350
new SafeSet([
351351
'cares_wrap',
352352
'fs_event_wrap',
353+
'udp_wrap',
353354
'uv',
354355
'pipe_wrap',
355356
'http_parser',

lib/internal/child_process.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const { WriteWrap } = internalBinding('stream_wrap');
2828
const { Pipe, constants: PipeConstants } = internalBinding('pipe_wrap');
2929
const { TCP } = internalBinding('tcp_wrap');
3030
const { TTY } = internalBinding('tty_wrap');
31-
const { UDP } = process.binding('udp_wrap');
31+
const { UDP } = internalBinding('udp_wrap');
3232
const SocketList = require('internal/socket_list');
3333
const { owner_symbol } = require('internal/async_hooks').symbols;
3434
const { convertToValidSignal } = require('internal/util');

lib/internal/dgram.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22
const { codes } = require('internal/errors');
33
const { internalBinding } = require('internal/bootstrap/loaders');
4-
const { UDP } = process.binding('udp_wrap');
4+
const { UDP } = internalBinding('udp_wrap');
55
const { isInt32 } = require('internal/validators');
66
const TTYWrap = internalBinding('tty_wrap');
77
const { UV_EINVAL } = internalBinding('uv');

src/udp_wrap.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -527,4 +527,4 @@ uv_udp_t* UDPWrap::UVHandle() {
527527

528528
} // namespace node
529529

530-
NODE_BUILTIN_MODULE_CONTEXT_AWARE(udp_wrap, node::UDPWrap::Initialize)
530+
NODE_MODULE_CONTEXT_AWARE_INTERNAL(udp_wrap, node::UDPWrap::Initialize)

test/parallel/test-accessor-properties.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const assert = require('assert');
1212
// their prototype
1313
const { internalBinding } = require('internal/test/binding');
1414
const TTY = internalBinding('tty_wrap').TTY;
15-
const UDP = process.binding('udp_wrap').UDP;
15+
const UDP = internalBinding('udp_wrap').UDP;
1616

1717
{
1818
// Should throw instead of raise assertions

test/parallel/test-cluster-dgram-bind-fd.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// Flags: --expose-internals
12
'use strict';
23
const common = require('../common');
34
if (common.isWindows)
@@ -9,7 +10,6 @@ const PACKETS_PER_WORKER = 10;
910
const assert = require('assert');
1011
const cluster = require('cluster');
1112
const dgram = require('dgram');
12-
const { UDP } = process.binding('udp_wrap');
1313

1414
if (cluster.isMaster)
1515
master();
@@ -18,6 +18,9 @@ else
1818

1919

2020
function master() {
21+
const { internalBinding } = require('internal/test/binding');
22+
const { UDP } = internalBinding('udp_wrap');
23+
2124
// Create a handle and use its fd.
2225
const rawHandle = new UDP();
2326
const err = rawHandle.bind(common.localhostIPv4, 0, 0);

test/parallel/test-dgram-bind-fd.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
// Flags: --expose-internals
12
'use strict';
23
const common = require('../common');
34
if (common.isWindows)
45
common.skip('Does not support binding fd on Windows');
56

67
const assert = require('assert');
78
const dgram = require('dgram');
8-
const { UDP } = process.binding('udp_wrap');
9+
const { internalBinding } = require('internal/test/binding');
10+
const { UDP } = internalBinding('udp_wrap');
911
const { UV_UDP_REUSEADDR } = process.binding('constants').os;
1012

1113
const BUFFER_SIZE = 4096;

test/parallel/test-dgram-create-socket-handle-fd.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ if (common.isWindows)
66

77
const assert = require('assert');
88
const dgram = require('dgram');
9-
const { UDP } = process.binding('udp_wrap');
109
const { internalBinding } = require('internal/test/binding');
10+
const { UDP } = internalBinding('udp_wrap');
1111
const { TCP, constants } = internalBinding('tcp_wrap');
1212
const _createSocketHandle = dgram._createSocketHandle;
1313

test/parallel/test-dgram-create-socket-handle.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
const common = require('../common');
44
const assert = require('assert');
55
const { _createSocketHandle } = require('internal/dgram');
6-
const UDP = process.binding('udp_wrap').UDP;
6+
const { internalBinding } = require('internal/test/binding');
7+
const UDP = internalBinding('udp_wrap').UDP;
78

89
{
910
// Create a handle that is not bound.

test/parallel/test-env-newprotomethod-remove-unnecessary-prototypes.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@ require('../common');
77

88
const assert = require('assert');
99
const { internalBinding } = require('internal/test/binding');
10-
1110
[
12-
process.binding('udp_wrap').UDP.prototype.bind6,
11+
internalBinding('udp_wrap').UDP.prototype.bind6,
1312
internalBinding('tcp_wrap').TCP.prototype.bind6,
14-
process.binding('udp_wrap').UDP.prototype.send6,
13+
internalBinding('udp_wrap').UDP.prototype.send6,
1514
internalBinding('tcp_wrap').TCP.prototype.bind,
16-
process.binding('udp_wrap').UDP.prototype.close,
15+
internalBinding('udp_wrap').UDP.prototype.close,
1716
internalBinding('tcp_wrap').TCP.prototype.open
1817
].forEach((binding, i) => {
1918
assert.strictEqual('prototype' in binding, false, `Test ${i} failed`);

test/sequential/test-async-wrap-getasyncid.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ if (common.hasCrypto) { // eslint-disable-line node-core/crypto-check
272272
}
273273

274274
{
275-
const binding = process.binding('udp_wrap');
275+
const binding = internalBinding('udp_wrap');
276276
const handle = new binding.UDP();
277277
const req = new binding.SendWrap();
278278
testInitialized(handle, 'UDP');

0 commit comments

Comments
 (0)