Skip to content

Commit c2b540a

Browse files
dgram: make send cb act as "error" event handler.
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/node-v0.x-archive#4846.
1 parent a55c60c commit c2b540a

File tree

2 files changed

+63
-1
lines changed

2 files changed

+63
-1
lines changed

lib/dgram.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,15 @@ Socket.prototype.send = function(buffer,
304304

305305
self._handle.lookup(address, function(ex, ip) {
306306
if (ex) {
307-
if (callback) callback(ex);
307+
if (callback) {
308+
callback(ex);
309+
310+
if (self.listeners('error').length)
311+
self.emit('error', ex);
312+
313+
return;
314+
}
315+
308316
self.emit('error', ex);
309317
}
310318
else if (self._handle) {
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
// Copyright Joyent, Inc. and other Node contributors.
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a
4+
// copy of this software and associated documentation files (the
5+
// "Software"), to deal in the Software without restriction, including
6+
// without limitation the rights to use, copy, modify, merge, publish,
7+
// distribute, sublicense, and/or sell copies of the Software, and to permit
8+
// persons to whom the Software is furnished to do so, subject to the
9+
// following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
17+
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
18+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20+
// USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
22+
var common = require('../common');
23+
var assert = require('assert');
24+
var dgram = require('dgram');
25+
var dns = require('dns');
26+
27+
var socket = dgram.createSocket('udp4');
28+
var buffer = new Buffer('gary busey');
29+
var times = 0;
30+
31+
dns.setServers([]);
32+
33+
// assert that:
34+
// * callbacks act as "error" listeners if given.
35+
// * callbacks and error events are emitted in a certain order.
36+
socket.send(buffer, 0, buffer.length, 100, 'dne.example.com', callbackOnly);
37+
38+
function callbackOnly(err) {
39+
assert.ok(err);
40+
socket.once('error', onEvent);
41+
socket.send(buffer, 0, buffer.length, 100, 'dne.example.com', onCallback);
42+
}
43+
44+
function onEvent(err) {
45+
assert.ok(err);
46+
assert.equal(times, 0);
47+
times++;
48+
}
49+
50+
function onCallback(err) {
51+
assert.ok(err);
52+
assert.equal(times, 1);
53+
socket.close();
54+
}

0 commit comments

Comments
 (0)