net: use _server
for internal book-keeping
The role of `this.server` is now split between `this._server` and `this.server`. Where the first one is used for counting active connections of `net.Server`, and the latter one is just a public API for users' consumption. The reasoning for this is simple, `TLSSocket` instances wrap `net.Socket` instances, thus both refer to the `net.Server` through the `this.server` property. However, only one of them should be used for `net.Server` connection count book-keeping, otherwise double-decrement will happen on socket destruction. Fix: #5083 PR-URL: https://github.com/nodejs/node/pull/5262 Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
parent
7550160e2b
commit
7885b1d7aa
@ -378,12 +378,6 @@ TLSSocket.prototype._init = function(socket, wrap) {
|
|||||||
|
|
||||||
this.server = options.server;
|
this.server = options.server;
|
||||||
|
|
||||||
// Move the server to TLSSocket, otherwise both `socket.destroy()` and
|
|
||||||
// `TLSSocket.destroy()` will decrement number of connections of the TLS
|
|
||||||
// server, leading to misfiring `server.close()` callback
|
|
||||||
if (socket && socket.server === this.server)
|
|
||||||
socket.server = null;
|
|
||||||
|
|
||||||
// For clients, we will always have either a given ca list or be using
|
// For clients, we will always have either a given ca list or be using
|
||||||
// default one
|
// default one
|
||||||
const requestCert = !!options.requestCert || !options.isServer;
|
const requestCert = !!options.requestCert || !options.isServer;
|
||||||
|
13
lib/net.js
13
lib/net.js
@ -171,6 +171,10 @@ function Socket(options) {
|
|||||||
this.read(0);
|
this.read(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Reserve properties
|
||||||
|
this.server = null;
|
||||||
|
this._server = null;
|
||||||
}
|
}
|
||||||
util.inherits(Socket, stream.Duplex);
|
util.inherits(Socket, stream.Duplex);
|
||||||
|
|
||||||
@ -481,12 +485,12 @@ Socket.prototype._destroy = function(exception, cb) {
|
|||||||
this.destroyed = true;
|
this.destroyed = true;
|
||||||
fireErrorCallbacks();
|
fireErrorCallbacks();
|
||||||
|
|
||||||
if (this.server) {
|
if (this._server) {
|
||||||
COUNTER_NET_SERVER_CONNECTION_CLOSE(this);
|
COUNTER_NET_SERVER_CONNECTION_CLOSE(this);
|
||||||
debug('has server');
|
debug('has server');
|
||||||
this.server._connections--;
|
this._server._connections--;
|
||||||
if (this.server._emitCloseIfDrained) {
|
if (this._server._emitCloseIfDrained) {
|
||||||
this.server._emitCloseIfDrained();
|
this._server._emitCloseIfDrained();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -1427,6 +1431,7 @@ function onconnection(err, clientHandle) {
|
|||||||
|
|
||||||
self._connections++;
|
self._connections++;
|
||||||
socket.server = self;
|
socket.server = self;
|
||||||
|
socket._server = self;
|
||||||
|
|
||||||
DTRACE_NET_SERVER_CONNECTION(socket);
|
DTRACE_NET_SERVER_CONNECTION(socket);
|
||||||
LTTNG_NET_SERVER_CONNECTION(socket);
|
LTTNG_NET_SERVER_CONNECTION(socket);
|
||||||
|
@ -11,6 +11,7 @@ var s = new net.Stream();
|
|||||||
|
|
||||||
s.server = new net.Server();
|
s.server = new net.Server();
|
||||||
s.server.connections = 10;
|
s.server.connections = 10;
|
||||||
|
s._server = s.server;
|
||||||
|
|
||||||
assert.equal(10, s.server.connections);
|
assert.equal(10, s.server.connections);
|
||||||
s.destroy();
|
s.destroy();
|
||||||
|
34
test/parallel/test-tls-server-connection-server.js
Normal file
34
test/parallel/test-tls-server-connection-server.js
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
'use strict';
|
||||||
|
const common = require('../common');
|
||||||
|
|
||||||
|
if (!common.hasCrypto) {
|
||||||
|
console.log('1..0 # Skipped: missing crypto');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const assert = require('assert');
|
||||||
|
const tls = require('tls');
|
||||||
|
const fs = require('fs');
|
||||||
|
|
||||||
|
const options = {
|
||||||
|
key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
|
||||||
|
cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
|
||||||
|
};
|
||||||
|
|
||||||
|
const server = tls.createServer(options, function(s) {
|
||||||
|
s.end('hello');
|
||||||
|
}).listen(common.PORT, function() {
|
||||||
|
const opts = {
|
||||||
|
port: common.PORT,
|
||||||
|
rejectUnauthorized: false
|
||||||
|
};
|
||||||
|
|
||||||
|
server.on('connection', common.mustCall(function(socket) {
|
||||||
|
assert(socket.server === server);
|
||||||
|
server.close();
|
||||||
|
}));
|
||||||
|
|
||||||
|
const client = tls.connect(opts, function() {
|
||||||
|
client.end();
|
||||||
|
});
|
||||||
|
});
|
Loading…
x
Reference in New Issue
Block a user