net: some scattered cleanup · nodejs/node@24e96b2 (original) (raw)
`@@ -95,6 +95,9 @@ const {
`
95
95
` validateTimerDuration
`
96
96
`} = require('internal/timers');
`
97
97
``
``
98
`+
const DEFAULT_IPV4_ADDR = '0.0.0.0';
`
``
99
`+
const DEFAULT_IPV6_ADDR = '::';
`
``
100
+
98
101
`function noop() {}
`
99
102
``
100
103
`function getFlags(ipv6Only) {
`
`@@ -810,10 +813,10 @@ function internalConnect(
`
810
813
``
811
814
`if (localAddress || localPort) {
`
812
815
`if (addressType === 4) {
`
813
``
`-
localAddress = localAddress || '0.0.0.0';
`
``
816
`+
localAddress = localAddress || DEFAULT_IPV4_ADDR;
`
814
817
`err = self._handle.bind(localAddress, localPort);
`
815
818
`} else { // addressType === 6
`
816
``
`-
localAddress = localAddress || '::';
`
``
819
`+
localAddress = localAddress || DEFAULT_IPV6_ADDR;
`
817
820
`err = self._handle.bind6(localAddress, localPort, flags);
`
818
821
`}
`
819
822
`debug('binding to localAddress: %s and localPort: %d (addressType: %d)',
`
`@@ -1165,8 +1168,6 @@ function createServerHandle(address, port, addressType, fd, flags) {
`
1165
1168
`if (err)
`
1166
1169
`return err;
`
1167
1170
``
1168
``
`-
handle.readable = true;
`
1169
``
`-
handle.writable = true;
`
1170
1171
`assert(!address && !port);
`
1171
1172
`} else if (port === -1 && addressType === -1) {
`
1172
1173
`handle = new Pipe(PipeConstants.SERVER);
`
`@@ -1185,11 +1186,11 @@ function createServerHandle(address, port, addressType, fd, flags) {
`
1185
1186
`debug('bind to', address || 'any');
`
1186
1187
`if (!address) {
`
1187
1188
`// Try binding to ipv6 first
`
1188
``
`-
err = handle.bind6('::', port, flags);
`
``
1189
`+
err = handle.bind6(DEFAULT_IPV6_ADDR, port, flags);
`
1189
1190
`if (err) {
`
1190
1191
`handle.close();
`
1191
1192
`// Fallback to ipv4
`
1192
``
`-
return createServerHandle('0.0.0.0', port);
`
``
1193
`+
return createServerHandle(DEFAULT_IPV4_ADDR, port);
`
1193
1194
`}
`
1194
1195
`} else if (addressType === 6) {
`
1195
1196
`err = handle.bind6(address, port, flags);
`
`@@ -1220,14 +1221,14 @@ function setupListenHandle(address, port, addressType, backlog, fd, flags) {
`
1220
1221
``
1221
1222
`// Try to bind to the unspecified IPv6 address, see if IPv6 is available
`
1222
1223
`if (!address && typeof fd !== 'number') {
`
1223
``
`-
rval = createServerHandle('::', port, 6, fd, flags);
`
``
1224
`+
rval = createServerHandle(DEFAULT_IPV6_ADDR, port, 6, fd, flags);
`
1224
1225
``
1225
1226
`if (typeof rval === 'number') {
`
1226
1227
`rval = null;
`
1227
``
`-
address = '0.0.0.0';
`
``
1228
`+
address = DEFAULT_IPV4_ADDR;
`
1228
1229
`addressType = 4;
`
1229
1230
`} else {
`
1230
``
`-
address = '::';
`
``
1231
`+
address = DEFAULT_IPV6_ADDR;
`
1231
1232
`addressType = 6;
`
1232
1233
`}
`
1233
1234
`}
`