diff --git a/lib/dgram.js b/lib/dgram.js index 6ff8cf251386..61132efb68d1 100644 --- a/lib/dgram.js +++ b/lib/dgram.js @@ -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) { diff --git a/test/simple/test-dgram-send-cb-quelches-error.js b/test/simple/test-dgram-send-cb-quelches-error.js new file mode 100644 index 000000000000..337b6f9a66d6 --- /dev/null +++ b/test/simple/test-dgram-send-cb-quelches-error.js @@ -0,0 +1,64 @@ +// 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 socket = dgram.createSocket('udp4'); +var buffer = new Buffer('gary busey'); +var order = 0; + +var callbackOrder; +var eventOrder; + +// 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); + eventOrder = order++; + check(); +} + +function onCallback(err) { + assert.ok(err); + callbackOrder = order++; + check(); +} + +function check() { + if (eventOrder !== undefined && callbackOrder !== undefined) { + assert.ok(eventOrder < callbackOrder); + socket.close(); + } +}