summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcjihrig <cjihrig@gmail.com>2016-03-27 21:08:29 -0400
committercjihrig <cjihrig@gmail.com>2016-03-28 09:47:13 -0400
commit4bc1cccb228fdfd1a527de0ee1d9cedc6dac87e2 (patch)
tree6233b43b44b2dfa550edd5ec6357297c0ef78131
parent089c6a4fbaa4f0c737ad1ca09b8f823459983d3a (diff)
downloadnode-new-4bc1cccb228fdfd1a527de0ee1d9cedc6dac87e2.tar.gz
dgram: pass null as error on successful send()
Prior to c9fd9e21622abb7b3893af457f6aaafb2363ab46, UDP sockets would callback with a null error on successful send() calls. The current behavior is to pass 0 as the error. This commit restores the previous, more expected behavior. PR-URL: https://github.com/nodejs/node/pull/5929 Reviewed-By: Evan Lucas <evanlucas@me.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Brian White <mscdex@mscdex.net>
-rw-r--r--lib/dgram.js3
-rw-r--r--test/parallel/test-dgram-send-callback-buffer.js1
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/dgram.js b/lib/dgram.js
index 5ac06b40f7..4473282148 100644
--- a/lib/dgram.js
+++ b/lib/dgram.js
@@ -392,7 +392,10 @@ function doSend(ex, self, ip, buffer, address, port, callback) {
function afterSend(err, sent) {
if (err) {
err = exceptionWithHostPort(err, 'send', this.address, this.port);
+ } else {
+ err = null;
}
+
this.callback(err, sent);
}
diff --git a/test/parallel/test-dgram-send-callback-buffer.js b/test/parallel/test-dgram-send-callback-buffer.js
index e877b8d73b..e2966645d9 100644
--- a/test/parallel/test-dgram-send-callback-buffer.js
+++ b/test/parallel/test-dgram-send-callback-buffer.js
@@ -9,6 +9,7 @@ const client = dgram.createSocket('udp4');
const buf = Buffer.allocUnsafe(256);
const onMessage = common.mustCall(function(err, bytes) {
+ assert.strictEqual(err, null);
assert.equal(bytes, buf.length);
clearTimeout(timer);
client.close();