Skip to content

Commit

Permalink
net: unref timer in parent sockets
Browse files Browse the repository at this point in the history
`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
PR-URL: #891
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information
indutny committed Feb 19, 2015
1 parent ecef871 commit 9b6b055
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 9 deletions.
6 changes: 4 additions & 2 deletions lib/_tls_wrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,12 @@ function TLSSocket(socket, options) {
readable: false,
writable: false
});
if (socket) {
this._parent = socket;

// To prevent assertion in afterConnect()
if (socket)
// To prevent assertion in afterConnect()
this._connecting = socket._connecting;
}

this._tlsOptions = options;
this._secureEstablished = false;
Expand Down
21 changes: 14 additions & 7 deletions lib/net.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ function Socket(options) {
this._connecting = false;
this._hadError = false;
this._handle = null;
this._parent = null;
this._host = null;

if (typeof options === 'number')
Expand Down Expand Up @@ -179,6 +180,11 @@ function Socket(options) {
}
util.inherits(Socket, stream.Duplex);

Socket.prototype._unrefTimer = function unrefTimer() {
for (var s = this; s !== null; s = s._parent)
timers._unrefActive(s);
};

// the user has called .end(), and all the bytes have been
// sent out to the other side.
// If allowHalfOpen is false, or if the readable side has
Expand Down Expand Up @@ -445,7 +451,8 @@ Socket.prototype._destroy = function(exception, cb) {

this.readable = this.writable = false;

timers.unenroll(this);
for (var s = this; s !== null; s = s._parent)
timers.unenroll(s);

debug('close');
if (this._handle) {
Expand Down Expand Up @@ -490,7 +497,7 @@ function onread(nread, buffer) {
var self = handle.owner;
assert(handle === self._handle, 'handle != self._handle');

timers._unrefActive(self);
self._unrefTimer();

debug('onread', nread);

Expand Down Expand Up @@ -621,7 +628,7 @@ Socket.prototype._writeGeneric = function(writev, data, encoding, cb) {
this._pendingData = null;
this._pendingEncoding = '';

timers._unrefActive(this);
this._unrefTimer();

if (!this._handle) {
this._destroy(new Error('This socket is closed.'), cb);
Expand Down Expand Up @@ -749,7 +756,7 @@ function afterWrite(status, handle, req, err) {
return;
}

timers._unrefActive(self);
self._unrefTimer();

if (self !== process.stderr && self !== process.stdout)
debug('afterWrite call cb');
Expand Down Expand Up @@ -864,7 +871,7 @@ Socket.prototype.connect = function(options, cb) {
self.once('connect', cb);
}

timers._unrefActive(this);
this._unrefTimer();

self._connecting = true;
self.writable = true;
Expand Down Expand Up @@ -919,7 +926,7 @@ Socket.prototype.connect = function(options, cb) {
self._destroy();
});
} else {
timers._unrefActive(self);
self._unrefTimer();
connect(self,
ip,
port,
Expand Down Expand Up @@ -964,7 +971,7 @@ function afterConnect(status, handle, req, readable, writable) {
if (status == 0) {
self.readable = readable;
self.writable = writable;
timers._unrefActive(self);
self._unrefTimer();

self.emit('connect');

Expand Down
34 changes: 34 additions & 0 deletions test/parallel/test-tls-wrap-timeout.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
if (!process.versions.openssl) process.exit();

var common = require('../common');
var assert = require('assert');
var net = require('net');
var tls = require('tls');
var fs = require('fs');

var options = {
key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
};

var server = tls.createServer(options, function(c) {
setTimeout(function() {
c.write('hello');
setTimeout(function() {
c.destroy();
server.close();
}, 75);
}, 75);
});

server.listen(common.PORT, function() {
var socket = net.connect(common.PORT, function() {
socket.setTimeout(120, assert.fail);

var tsocket = tls.connect({
socket: socket,
rejectUnauthorized: false
});
tsocket.resume();
});
});

0 comments on commit 9b6b055

Please sign in to comment.