Skip to content

Commit 2f471f2

Browse files
committed
net: unref timer in parent sockets
`TLSSocket` wraps the original `net.Socket`, but writes/reads to/from `TLSSocket` do not touch the timers of original `net.Socket`. Introduce `socket._parent` property, and iterate through all parents to unref timers and prevent timeout event on original `net.Socket`. Fix: nodejs/node-v0.x-archive#9242
1 parent ed240f4 commit 2f471f2

File tree

3 files changed

+51
-7
lines changed

3 files changed

+51
-7
lines changed

lib/_tls_wrap.js

+2
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,8 @@ function TLSSocket(socket, options) {
213213
readable: false,
214214
writable: false
215215
});
216+
if (socket)
217+
this._parent = socket;
216218

217219
// To prevent assertion in afterConnect()
218220
if (socket)

lib/net.js

+15-7
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ function Socket(options) {
120120
this._connecting = false;
121121
this._hadError = false;
122122
this._handle = null;
123+
this._parent = null;
123124
this._host = null;
124125

125126
if (typeof options === 'number')
@@ -445,7 +446,8 @@ Socket.prototype._destroy = function(exception, cb) {
445446

446447
this.readable = this.writable = false;
447448

448-
timers.unenroll(this);
449+
for (var s = this; s !== null; s = s._parent)
450+
timers.unenroll(s);
449451

450452
debug('close');
451453
if (this._handle) {
@@ -490,7 +492,8 @@ function onread(nread, buffer) {
490492
var self = handle.owner;
491493
assert(handle === self._handle, 'handle != self._handle');
492494

493-
timers._unrefActive(self);
495+
for (var s = self; s !== null; s = s._parent)
496+
timers._unrefActive(s);
494497

495498
debug('onread', nread);
496499

@@ -621,7 +624,8 @@ Socket.prototype._writeGeneric = function(writev, data, encoding, cb) {
621624
this._pendingData = null;
622625
this._pendingEncoding = '';
623626

624-
timers._unrefActive(this);
627+
for (var s = this; s !== null; s = s._parent)
628+
timers._unrefActive(s);
625629

626630
if (!this._handle) {
627631
this._destroy(new Error('This socket is closed.'), cb);
@@ -749,7 +753,8 @@ function afterWrite(status, handle, req, err) {
749753
return;
750754
}
751755

752-
timers._unrefActive(self);
756+
for (var s = self; s !== null; s = s._parent)
757+
timers._unrefActive(s);
753758

754759
if (self !== process.stderr && self !== process.stdout)
755760
debug('afterWrite call cb');
@@ -864,7 +869,8 @@ Socket.prototype.connect = function(options, cb) {
864869
self.once('connect', cb);
865870
}
866871

867-
timers._unrefActive(this);
872+
for (var s = this; s !== null; s = s._parent)
873+
timers._unrefActive(s);
868874

869875
self._connecting = true;
870876
self.writable = true;
@@ -919,7 +925,8 @@ Socket.prototype.connect = function(options, cb) {
919925
self._destroy();
920926
});
921927
} else {
922-
timers._unrefActive(self);
928+
for (var s = self; s !== null; s = s._parent)
929+
timers._unrefActive(s);
923930
connect(self,
924931
ip,
925932
port,
@@ -964,7 +971,8 @@ function afterConnect(status, handle, req, readable, writable) {
964971
if (status == 0) {
965972
self.readable = readable;
966973
self.writable = writable;
967-
timers._unrefActive(self);
974+
for (var s = self; s !== null; s = s._parent)
975+
timers._unrefActive(s);
968976

969977
self.emit('connect');
970978

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
if (!process.versions.openssl) process.exit();
2+
3+
var common = require('../common');
4+
var assert = require('assert');
5+
var net = require('net');
6+
var tls = require('tls');
7+
var fs = require('fs');
8+
9+
var options = {
10+
key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
11+
cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
12+
};
13+
14+
var server = tls.createServer(options, function(c) {
15+
setTimeout(function() {
16+
c.write('hello');
17+
setTimeout(function() {
18+
c.destroy();
19+
server.close();
20+
}, 75);
21+
}, 75);
22+
});
23+
24+
server.listen(common.PORT, function() {
25+
var socket = net.connect(common.PORT, function() {
26+
socket.setTimeout(120, assert.fail);
27+
28+
var tsocket = tls.connect({
29+
socket: socket,
30+
rejectUnauthorized: false
31+
});
32+
tsocket.resume();
33+
});
34+
});

0 commit comments

Comments
 (0)