Browse Source

tls: Cycle data when underlying socket drains

v0.9.10-release
isaacs 12 years ago
parent
commit
02374d0c17
  1. 12
      lib/tls.js
  2. 80
      test/simple/test-tls-fast-writing.js

12
lib/tls.js

@ -1298,6 +1298,18 @@ function pipe(pair, socket) {
cleartext.encrypted = pair.encrypted;
cleartext.authorized = false;
// cycle the data whenever the socket drains, so that
// we can pull some more into it. normally this would
// be handled by the fact that pipe() triggers read() calls
// on writable.drain, but CryptoStreams are a bit more
// complicated. Since the encrypted side actually gets
// its data from the cleartext side, we have to give it a
// light kick to get in motion again.
socket.on('drain', function() {
pair.encrypted.read(0);
pair.cleartext.read(0);
});
function onerror(e) {
if (cleartext._controlReleased) {
cleartext.emit('error', e);

80
test/simple/test-tls-fast-writing.js

@ -0,0 +1,80 @@
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to permit
// persons to whom the Software is furnished to do so, subject to the
// following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.
var common = require('../common');
var assert = require('assert');
var tls = require('tls');
var fs = require('fs');
var PORT = common.PORT;
var dir = common.fixturesDir;
var options = { key: fs.readFileSync(dir + '/test_key.pem'),
cert: fs.readFileSync(dir + '/test_cert.pem'),
ca: [ fs.readFileSync(dir + '/test_ca.pem') ] };
var server = tls.createServer(options, onconnection);
var gotChunk = false;
var gotDrain = false;
var timer = setTimeout(function() {
console.log('not ok - timed out');
process.exit(1);
}, 500);
function onconnection(conn) {
conn.on('data', function(c) {
if (!gotChunk) {
gotChunk = true;
console.log('ok - got chunk');
}
// just some basic sanity checks.
assert(c.length);
assert(Buffer.isBuffer(c));
if (gotDrain)
process.exit(0);
});
}
server.listen(PORT, function() {
var chunk = new Buffer(1024);
chunk.fill('x');
var opt = { port: PORT, rejectUnauthorized: false };
var conn = tls.connect(opt, function() {
conn.on('drain', ondrain);
write();
});
function ondrain() {
if (!gotDrain) {
gotDrain = true;
console.log('ok - got drain');
}
if (gotChunk)
process.exit(0);
write();
}
function write() {
// this needs to return false eventually
while (false !== conn.write(chunk));
}
});
Loading…
Cancel
Save