Skip to content

Commit

Permalink
dgram: make send cb act as "error" event handler.
Browse files Browse the repository at this point in the history
This allows users to provide a callback that handles potential
errors resulting from a `socket.send` call. The original behavior
of emitting the error event on the socket is preserved.

Fixes nodejs#4846.
  • Loading branch information
chrisdickinson committed Jun 6, 2014
1 parent bd988a5 commit 48b32c5
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 1 deletion.
10 changes: 9 additions & 1 deletion lib/dgram.js
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,15 @@ Socket.prototype.send = function(buffer,

self._handle.lookup(address, function(ex, ip) {
if (ex) {
if (callback) callback(ex);
if (callback) {
callback(ex);

if (self.listeners('error').length)
self.emit('error', ex);

return;
}

self.emit('error', ex);
}
else if (self._handle) {
Expand Down
63 changes: 63 additions & 0 deletions test/simple/test-dgram-send-cb-quelches-error.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
// 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 dgram = require('dgram');
var dns = require('dns');

var socket = dgram.createSocket('udp4');
var buffer = new Buffer('gary busey');
var times = 0;

dns.setServers([]);

// assert that:
// * callbacks act as "error" listeners if given.
// * callbacks and error events are emitted in a certain order.
socket.send(buffer, 0, buffer.length, 100, 'dne.example.com', callbackOnly);

function callbackOnly(err) {
assert.ok(err);
socket.once('error', onEvent);
socket.send(buffer, 0, buffer.length, 100, 'dne.example.com', onCallback);
}

function onEvent(err) {
assert.ok(err);
assert.equal(times, 0);
times++;
maybeClose();
}

function onCallback(err) {
assert.ok(err);
assert.equal(times, 1);
times++;
maybeClose();
}

function maybeClose() {
if (times !== 2) {
return;
}
socket.close();
}

0 comments on commit 48b32c5

Please sign in to comment.