dgram lookup always asynchronous

lib/dgram.js

@@ -43,11 +43,6 @@ function isIP(address) {
 
 
 function lookup(address, family, callback) {
-  // implicit 'bind before send' needs to run on the same tick
-  var matchedFamily = isIP(address);
-  if (matchedFamily)
-    return callback(null, address, matchedFamily);
-
   if (!dns)
     dns = require('dns');
 
@@ -110,6 +105,23 @@ exports.createSocket = function(type, listener) {
   return new Socket(type, listener);
 };
 
+Socket.prototype._bind = function(ip, port) {
+  var ret;
+
+  if (!ip) {
+    if (this.type == 'udp4')
+      ip = '0.0.0.0';
+    else if (this.type == 'udp6')
+      ip = '::0';
+  }
+
+  ret = this._handle.bind(ip, port || 0, /*flags=*/0);
+
+  if (!ret)
+    this._bound = true;
+
+  return ret;
+};
 
 Socket.prototype.bind = function(port, address) {
   var self = this;
@@ -119,22 +131,17 @@ Socket.prototype.bind = function(port, address) {
   // resolve address first
   self._handle.lookup(address, function(err, ip) {
     if (!err) {
-      if (self._handle.bind(ip, port || 0, /*flags=*/0)) {
+      if (self._bind(ip, port)) {
         err = errnoException(errno, 'bind');
       }
       else {
-        self._bound = true;
         self._startReceiving();
         self.emit('listening');
       }
     }
 
     if (err) {
-      // caller may not have had a chance yet to register its
-      // error event listener so defer the error to the next tick
-      process.nextTick(function() {
-        self.emit('error', err);
-      });
+      self.emit('error', err);
     }
   });
 };
@@ -314,7 +321,7 @@ Socket.prototype._startReceiving = function() {
     return;
 
   if (!this._bound) {
-    this.bind(); // bind to random port
+    this._bind(); // bind to random port
 
     // sanity check
     if (!this._bound)

test/simple/test-dgram-broadcast-multi-process.js

@@ -162,7 +162,9 @@ if (process.argv[2] !== 'child') {
   // bind the address explicitly for sending
   // INADDR_BROADCAST to only one interface
   sendSocket.bind(common.PORT, bindAddress);
-  sendSocket.setBroadcast(true);
+  sendSocket.on('listening', function () {
+    sendSocket.setBroadcast(true);
+  });
 
   sendSocket.on('close', function() {
     console.error('[PARENT] sendSocket closed');

test/simple/test-dgram-listen-after-bind.js

@@ -0,0 +1,43 @@
+// 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');
+
+socket.bind();
+
+var fired = false;
+var timer = setTimeout(function () {
+  socket.close();
+}, 100);
+
+socket.on('listening', function () {
+  clearTimeout(timer);
+  fired = true;
+  socket.close();
+});
+
+socket.on('close', function () {
+  assert(fired, 'listening should fire after bind');
+});

test/simple/test-dgram-multicast-multi-process.js

@@ -149,10 +149,13 @@ if (process.argv[2] !== 'child') {
   // call is what creates the actual socket...
   sendSocket.bind();
 
-  sendSocket.setTTL(1);
-  sendSocket.setBroadcast(true);
-  sendSocket.setMulticastTTL(1);
-  sendSocket.setMulticastLoopback(true);
+  // The socket is actually created async now
+  sendSocket.on('listening', function () {
+    sendSocket.setTTL(1);
+    sendSocket.setBroadcast(true);
+    sendSocket.setMulticastTTL(1);
+    sendSocket.setMulticastLoopback(true);
+  });
 
   sendSocket.on('close', function() {
     console.error('[PARENT] sendSocket closed');
@@ -221,5 +224,7 @@ if (process.argv[2] === 'child') {
 
   listenSocket.bind(common.PORT);
 
-  listenSocket.addMembership(LOCAL_BROADCAST_HOST);
+  listenSocket.on('listening', function () {
+    listenSocket.addMembership(LOCAL_BROADCAST_HOST);
+  });
 }

test/simple/test-dgram-multicast-setTTL.js

@@ -26,16 +26,18 @@ var common = require('../common'),
     socket = dgram.createSocket('udp4');
 
 socket.bind(common.PORT);
-socket.setMulticastTTL(16);
+socket.on('listening', function () {
+  socket.setMulticastTTL(16);
 
-//Try to set an invalid TTL (valid ttl is > 0 and < 256)
-try {
-  socket.setMulticastTTL(1000);
-} catch (e) {
-  thrown = true;
-}
+  //Try to set an invalid TTL (valid ttl is > 0 and < 256)
+  try {
+    socket.setMulticastTTL(1000);
+  } catch (e) {
+    thrown = true;
+  }
 
-assert(thrown, 'Setting an invalid multicast TTL should throw some error');
+  assert(thrown, 'Setting an invalid multicast TTL should throw some error');
 
-//close the socket
-socket.close();
+  //close the socket
+  socket.close();
+});