Skip to content
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.

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

dgram: handle default address case when offset and length are specified #5407

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions lib/dgram.js
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,13 @@ function enqueue(self, toEnqueue) {
}


// valid combinations
// send(buffer, offset, length, port, address, callback)
// send(buffer, offset, length, port, address)
// send(buffer, offset, length, port)
// send(bufferOrList, port, address, callback)
// send(bufferOrList, port, address)
// send(bufferOrList, port)
Socket.prototype.send = function(buffer,
offset,
length,
Expand All @@ -294,8 +301,7 @@ Socket.prototype.send = function(buffer,
callback) {
var self = this;

// same as arguments.length === 5 || arguments.length === 6
if (address) {
if (address || (port && typeof port !== 'function')) {
buffer = sliceBuffer(buffer, offset, length);
} else {
callback = port;
Expand Down
43 changes: 43 additions & 0 deletions test/parallel/test-dgram-send-default-host.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
'use strict';

const common = require('../common');
const assert = require('assert');
const dgram = require('dgram');

if (common.isWindows) {
// on Windows this test will fail
// see https://github.com/nodejs/node/pull/5407
console.log('1..0 # Skipped: This test does not apply on Windows.');
return;
}

const client = dgram.createSocket('udp4');

const timer = setTimeout(function() {
throw new Error('Timeout');
}, common.platformTimeout(2000));

const toSend = [new Buffer(256), new Buffer(256), new Buffer(256), 'hello'];

toSend[0].fill('x');
toSend[1].fill('y');
toSend[2].fill('z');

client.on('listening', function() {
client.send(toSend[0], 0, toSend[0].length, common.PORT);
client.send(toSend[1], common.PORT);
client.send([toSend[2]], common.PORT);
client.send(toSend[3], 0, toSend[3].length, common.PORT);
});

client.on('message', function(buf, info) {
const expected = toSend.shift().toString();
assert.ok(buf.toString() === expected, 'message was received correctly');

if (toSend.length === 0) {
client.close();
clearTimeout(timer);
}
});

client.bind(common.PORT);