diff options
author | oyyd <oyydoibh@gmail.com> | 2019-03-13 21:10:54 +0800 |
---|---|---|
committer | oyyd <oyydoibh@gmail.com> | 2019-03-15 10:26:37 +0800 |
commit | cd8b7391dcb1d889b7bf81f4bdb8f7990a6ad475 (patch) | |
tree | 78d174f9fe357ec91448f920cb61cc66a8a83a15 /lib/net.js | |
parent | d78d33d6916dcf8c88949b953664f40a10111467 (diff) | |
download | android-node-v8-cd8b7391dcb1d889b7bf81f4bdb8f7990a6ad475.tar.gz android-node-v8-cd8b7391dcb1d889b7bf81f4bdb8f7990a6ad475.tar.bz2 android-node-v8-cd8b7391dcb1d889b7bf81f4bdb8f7990a6ad475.zip |
net: some scattered cleanup
This commit cleans up net module, including: 1. remove assigning
`handle.readable` and `handle.writable` 2. documents
`NODE_PENDING_PIPE_INSTANCES` enviroment variable 3. use constants
for '0.0.0.0' and '::'.
PR-URL: https://github.com/nodejs/node/pull/24128
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Diffstat (limited to 'lib/net.js')
-rw-r--r-- | lib/net.js | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/net.js b/lib/net.js index 0e68e95400..ecf7258e8b 100644 --- a/lib/net.js +++ b/lib/net.js @@ -96,6 +96,9 @@ let dns; const { kTimeout } = require('internal/timers'); +const DEFAULT_IPV4_ADDR = '0.0.0.0'; +const DEFAULT_IPV6_ADDR = '::'; + function noop() {} function getFlags(ipv6Only) { @@ -789,10 +792,10 @@ function internalConnect( if (localAddress || localPort) { if (addressType === 4) { - localAddress = localAddress || '0.0.0.0'; + localAddress = localAddress || DEFAULT_IPV4_ADDR; err = self._handle.bind(localAddress, localPort); } else { // addressType === 6 - localAddress = localAddress || '::'; + localAddress = localAddress || DEFAULT_IPV6_ADDR; err = self._handle.bind6(localAddress, localPort, flags); } debug('binding to localAddress: %s and localPort: %d (addressType: %d)', @@ -1145,8 +1148,6 @@ function createServerHandle(address, port, addressType, fd, flags) { if (err) return err; - handle.readable = true; - handle.writable = true; assert(!address && !port); } else if (port === -1 && addressType === -1) { handle = new Pipe(PipeConstants.SERVER); @@ -1165,11 +1166,11 @@ function createServerHandle(address, port, addressType, fd, flags) { debug('bind to', address || 'any'); if (!address) { // Try binding to ipv6 first - err = handle.bind6('::', port, flags); + err = handle.bind6(DEFAULT_IPV6_ADDR, port, flags); if (err) { handle.close(); // Fallback to ipv4 - return createServerHandle('0.0.0.0', port); + return createServerHandle(DEFAULT_IPV4_ADDR, port); } } else if (addressType === 6) { err = handle.bind6(address, port, flags); @@ -1200,14 +1201,14 @@ function setupListenHandle(address, port, addressType, backlog, fd, flags) { // Try to bind to the unspecified IPv6 address, see if IPv6 is available if (!address && typeof fd !== 'number') { - rval = createServerHandle('::', port, 6, fd, flags); + rval = createServerHandle(DEFAULT_IPV6_ADDR, port, 6, fd, flags); if (typeof rval === 'number') { rval = null; - address = '0.0.0.0'; + address = DEFAULT_IPV4_ADDR; addressType = 4; } else { - address = '::'; + address = DEFAULT_IPV6_ADDR; addressType = 6; } } |