Skip to content

net: fix net keepalive and noDelay #43561

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

Merged
nodejs-github-bot merged 1 commit into from
Jun 29, 2022
Merged

net: fix net keepalive and noDelay #43561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
net: fix net keepalive and noDelay 
1. support setKeepAlive again
2. set keepalive and nodelay to socket which is created by server
  • Loading branch information
@theanarkh
theanarkh committed Jun 26, 2022
commit 474849d72e2bc8f175e63bb4198bee2109c82025
14 changes: 13 additions & 1 deletion lib/net.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,16 @@ Socket.prototype.setKeepAlive = function(enable, initialDelayMsecs) {
return this;
}

if (this._handle.setKeepAlive && enable !== this[kSetKeepAlive]) {
if (!this._handle.setKeepAlive) {
return this;
}

if (enable !== this[kSetKeepAlive] ||
(
enable &&
this[kSetKeepAliveInitialDelay] !== initialDelay
)
) {
this[kSetKeepAlive] = enable;
this[kSetKeepAliveInitialDelay] = initialDelay;
this._handle.setKeepAlive(enable, initialDelay);
Expand Down Expand Up @@ -1660,9 +1669,12 @@ function onconnection(err, clientHandle) {
});

if (self.noDelay && clientHandle.setNoDelay) {
socket[kSetNoDelay] = true;
clientHandle.setNoDelay(true);
}
if (self.keepAlive && clientHandle.setKeepAlive) {
socket[kSetKeepAlive] = true;
socket[kSetKeepAliveInitialDelay] = self.keepAliveInitialDelay;
clientHandle.setKeepAlive(true, self.keepAliveInitialDelay);
}

Expand Down
10 changes: 10 additions & 0 deletions test/parallel/test-net-server-keepalive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ const server = net.createServer({
keepAlive: true,
keepAliveInitialDelay: 1000
}, common.mustCall((socket) => {
const setKeepAlive = socket._handle.setKeepAlive;
socket._handle.setKeepAlive = common.mustCall((enable, initialDelay) => {
Comment thread
theanarkh marked this conversation as resolved.
assert.strictEqual(enable, true);
assert.match(String(initialDelay), /^2|3$/);
return setKeepAlive.call(socket._handle, enable, initialDelay);
}, 2);
socket.setKeepAlive(true, 1000);
socket.setKeepAlive(true, 2000);
socket.setKeepAlive(true, 3000);
socket.destroy();
server.close();
})).listen(0, common.mustCall(() => {
Expand All @@ -20,6 +29,7 @@ server._handle.onconnection = common.mustCall((err, clientHandle) => {
assert.strictEqual(enable, server.keepAlive);
assert.strictEqual(initialDelayMsecs, server.keepAliveInitialDelay);
setKeepAlive.call(clientHandle, enable, initialDelayMsecs);
clientHandle.setKeepAlive = setKeepAlive;
});
onconnection.call(server._handle, err, clientHandle);
});
3 changes: 3 additions & 0 deletions test/parallel/test-net-server-nodelay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ const net = require('net');
const server = net.createServer({
noDelay: true
}, common.mustCall((socket) => {
socket._handle.setNoDelay = common.mustNotCall();
socket.setNoDelay(true);
socket.destroy();
server.close();
})).listen(0, common.mustCall(() => {
Expand All @@ -18,6 +20,7 @@ server._handle.onconnection = common.mustCall((err, clientHandle) => {
clientHandle.setNoDelay = common.mustCall((enable) => {
assert.strictEqual(enable, server.noDelay);
setNoDelay.call(clientHandle, enable);
clientHandle.setNoDelay = setNoDelay;
});
onconnection.call(server._handle, err, clientHandle);
});