1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TLS: Finer locks on _cycle.

Browse Source 
Data being sent out of order.
This commit is contained in:
Theo Schlossnagle 2011-03-14 12:04:00 -07:00 committed by Ryan Dahl
parent 2e40328c82
commit e3925b741c
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/tls.js
View File

@ -508,33 +508,49 @@ exports.createSecurePair = function(credentials,
* Because it is also called everywhere, we also check if the connection has * Because it is also called everywhere, we also check if the connection has
* completed negotiation and emit 'secure' from here if it has. * completed negotiation and emit 'secure' from here if it has.
*/ */
SecurePair.prototype._cycle = function() { SecurePair.prototype._cycle = function(depth) {
depth = depth ? depth : 0;
if (this._done) { if (this._done) {
return; return;
} }
// Make this function reentrant. if(depth == 0) this._writeCalled = false;
if (this._cycleLock) return;
this._cycleLock = true;
this._writeCalled = false;
var established = this._secureEstablished; var established = this._secureEstablished;
this.encrypted._pull(); if (!this._cycleEncryptedPullLock) {
this.cleartext._pull(); this._cycleEncryptedPullLock = true;
this.cleartext._push(); this.encrypted._pull();
this.encrypted._push(); this._cycleEncryptedPullLock = false;
}
this._cycleLock = false; if (!this._cycleCleartextPullLock) {
this._cycleCleartextPullLock = true;
this.cleartext._pull();
this._cycleCleartextPullLock = false;
}
if (!this._cycleCleartextPushLock) {
this._cycleCleartextPushLock = true;
this.cleartext._push();
this._cycleCleartextPushLock = false;
}
if (!this._cycleEncryptedPushLock) {
this._cycleEncryptedPushLock = true;
this.encrypted._push();
this._cycleEncryptedPushLock = false;
}
if (this._done) { if (this._done) {
return; return;
} }
if ((!established && this._secureEstablished) || this._writeCalled) { if ((!established && this._secureEstablished) ||
(depth == 0 && this._writeCalled)) {
// If we were not established but now we are, let's cycle again. // If we were not established but now we are, let's cycle again.
// Or if there is some data to write... // Or if there is some data to write...
this._cycle(); this._cycle(depth + 1);
} }
}; };