Skip to content

Cherrypicked commits from joyent/node #1163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cjihrig wants to merge 4 commits into from
Closed

Cherrypicked commits from joyent/node #1163

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f4290b
build: allow custom PackageMaker path
Mar 11, 2015
690c96c
doc: fix '\\' typos on Windows
stcruy Mar 15, 2015
095ae0d
net: use cached peername to resolve remote fields
Mar 10, 2015
1e52904
make: remove node_dtrace from cpplint excludes
Nov 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
net: use cached peername to resolve remote fields 
Allows socket.remote* properties to still be accessed even after the
socket is closed.

Fixes: nodejs/node-v0.x-archive#9287
PR-URL: nodejs/node-v0.x-archive#9366
Reviewed-By: Colin Ihrig <[email protected]>
  • Loading branch information
@cjihrig
James Hartig authored and cjihrig committed Mar 16, 2015
commit 095ae0daa4a30811ddcfa069f2c176aa96f233bf
7 changes: 4 additions & 3 deletions lib/net.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,10 +556,10 @@ function onread(nread, buffer) {


Socket.prototype._getpeername = function() {
if (!this._handle || !this._handle.getpeername) {
return {};
}
if (!this._peername) {
if (!this._handle || !this._handle.getpeername) {
return {};
}
var out = {};
var err = this._handle.getpeername(out);
if (err) return {}; // FIXME(bnoordhuis) Throw?
Expand Down Expand Up @@ -865,6 +865,7 @@ Socket.prototype.connect = function(options, cb) {
this._writableState.errorEmitted = false;
this.destroyed = false;
this._handle = null;
this._peername = null;
}

var self = this;
Expand Down
12 changes: 12 additions & 0 deletions test/parallel/test-net-remote-address-port.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ var server = net.createServer(function(socket) {
socket.on('end', function() {
if (++conns_closed == 2) server.close();
});
socket.on('close', function() {
assert.notEqual(-1, remoteAddrCandidates.indexOf(socket.remoteAddress));
assert.notEqual(-1, remoteFamilyCandidates.indexOf(socket.remoteFamily));
});
socket.resume();
});

Expand All @@ -32,12 +36,20 @@ server.listen(common.PORT, 'localhost', function() {
assert.equal(common.PORT, client.remotePort);
client.end();
});
client.on('close', function() {
assert.notEqual(-1, remoteAddrCandidates.indexOf(client.remoteAddress));
assert.notEqual(-1, remoteFamilyCandidates.indexOf(client.remoteFamily));
});
client2.on('connect', function() {
assert.notEqual(-1, remoteAddrCandidates.indexOf(client2.remoteAddress));
assert.notEqual(-1, remoteFamilyCandidates.indexOf(client2.remoteFamily));
assert.equal(common.PORT, client2.remotePort);
client2.end();
});
client2.on('close', function() {
assert.notEqual(-1, remoteAddrCandidates.indexOf(client2.remoteAddress));
assert.notEqual(-1, remoteFamilyCandidates.indexOf(client2.remoteFamily));
});
});

process.on('exit', function() {
Expand Down