Skip to content

Commit

Permalink
net: initialize TCPWrap when receiving socket
Browse files Browse the repository at this point in the history
TCPWrap::Initialize() and PipeWrap::Initialize() should be called before
any data will be read from received socket. But, because of lazy
initialization of these bindings, Initialize() method isn't called.

Init bindings manually upon socket receiving.

See nodejs#4669
  • Loading branch information
indutny committed Jan 28, 2013
1 parent acd0df4 commit 42a40d9
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 0 deletions.
4 changes: 4 additions & 0 deletions lib/net.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ function Socket(options) {
stream.Duplex.call(this, options);

if (options.handle) {
// Initialize TCPWrap and PipeWrap
process.binding('tcp_wrap');
process.binding('pipe_wrap');

this._handle = options.handle; // private
} else if (typeof options.fd !== 'undefined') {
this._handle = createPipe();
Expand Down
67 changes: 67 additions & 0 deletions test/simple/test-cluster-net-send.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
// 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 fork = require('child_process').fork;
var net = require('net');

if (process.argv[2] !== 'child') {
console.error('[%d] master', process.pid);

var worker = fork(__filename, ['child']);
var called = false;

worker.once('message', function(msg, handle) {
assert.equal(msg, 'handle');
assert.ok(handle);
worker.send('got');

handle.on('data', function(data) {
called = true;
assert.equal(data.toString(), 'hello');
worker.kill();
});
});

process.once('exit', function() {
assert.ok(called);
});
} else {
console.error('[%d] worker', process.pid);

var server = net.createServer(function(c) {
process.once('message', function(msg) {
assert.equal(msg, 'got');
c.end('hello');
});
});
server.listen(common.PORT, function() {
var socket = net.connect(common.PORT, '127.0.0.1', function() {
process.send('handle', socket);
});
});

process.on('disconnect', function() {
process.exit();
server.close();
});
}

0 comments on commit 42a40d9

Please sign in to comment.