[fixup] lib/net: simplify err ERR_SOCKET_BAD_PORT

- simplify the ERR_SOCKET_BAD_PORT error definition in errors.js
  by replacing the cb arg with the string:
  'Port should be > 0 and < 65536. Received %s.'
- update the ERR_SOCKET_BAD_PORT test in test-internal-errors.js
- update the ERR_SOCKET_BAD_PORT constructor call in
  lib/dgram.js and lib/dns to include the actual port
  as the second arg
- update the already existing ERR_SOCKET_BAD_PORT message
  assertion in test-dns.js, to include the actual port.

Author: matzavinos

lib/dgram.js

@@ -417,7 +417,7 @@ Socket.prototype.send = function(buffer,
 
   port = port >>> 0;
   if (port === 0 || port > 65535)
-    throw new errors.RangeError('ERR_SOCKET_BAD_PORT');
+    throw new errors.RangeError('ERR_SOCKET_BAD_PORT', port);
 
   // Normalize callback so it's either a function or undefined but not anything
   // else.

lib/dns.js

@@ -216,7 +216,7 @@ function lookupService(host, port, callback) {
     throw new errors.TypeError('ERR_INVALID_OPT_VALUE', 'host', host);
 
   if (!isLegalPort(port))
-    throw new errors.RangeError('ERR_SOCKET_BAD_PORT');
+    throw new errors.RangeError('ERR_SOCKET_BAD_PORT', port);
 
   if (typeof callback !== 'function')
     throw new errors.TypeError('ERR_INVALID_CALLBACK');

lib/internal/errors.js

@@ -267,13 +267,7 @@ E('ERR_SERVER_ALREADY_LISTEN',
   'Listen method has been called more than once without closing.');
 E('ERR_SOCKET_ALREADY_BOUND', 'Socket is already bound');
 E('ERR_SOCKET_BAD_BUFFER_SIZE', 'Buffer size must be a positive integer');
-E('ERR_SOCKET_BAD_PORT', (port) => {
-  let portMsg = '';
-  if (typeof port !== 'undefined' && port !== null) {
-    portMsg = `:${port}`;
-  }
-  return `Port${portMsg} should be > 0 and < 65536`;
-});
+E('ERR_SOCKET_BAD_PORT', 'Port should be > 0 and < 65536. Received %s.');
 E('ERR_SOCKET_BAD_TYPE',
   'Bad socket type specified. Valid types are: udp4, udp6');
 E('ERR_SOCKET_BUFFER_SIZE',

test/parallel/test-dns.js

@@ -220,24 +220,23 @@ assert.throws(() => {
   message: `The value "${invalidHost}" is invalid for option "host"`
 }));
 
-const badPortMsg = common.expectsError({
-  code: 'ERR_SOCKET_BAD_PORT',
-  type: RangeError,
-  message: 'Port should be > 0 and < 65536'
-}, 4);
-assert.throws(() => dns.lookupService('0.0.0.0', null, common.mustNotCall()),
-              badPortMsg);
-
-assert.throws(
-  () => dns.lookupService('0.0.0.0', undefined, common.mustNotCall()),
-  badPortMsg
-);
-
-assert.throws(() => dns.lookupService('0.0.0.0', 65538, common.mustNotCall()),
-              badPortMsg);
-
-assert.throws(() => dns.lookupService('0.0.0.0', 'test', common.mustNotCall()),
-              badPortMsg);
+const portErr = (port) => {
+  common.expectsError(
+    () => {
+      dns.lookupService('0.0.0.0', port, common.mustNotCall());
+    },
+    {
+      code: 'ERR_SOCKET_BAD_PORT',
+      message:
+        `Port should be > 0 and < 65536. Received ${port}.`,
+      type: RangeError
+    }
+  );
+};
+portErr(null);
+portErr(undefined);
+portErr(65538);
+portErr('test');
 
 assert.throws(() => {
   dns.lookupService('0.0.0.0', 80, null);

test/parallel/test-internal-errors.js

@@ -242,12 +242,9 @@ assert.throws(
   }));
 
 // Test ERR_SOCKET_BAD_PORT
-assert.strictEqual(errors.message('ERR_SOCKET_BAD_PORT', []),
-                   'Port should be > 0 and < 65536');
-assert.strictEqual(errors.message('ERR_SOCKET_BAD_PORT', ['0']),
-                   'Port:0 should be > 0 and < 65536');
-assert.strictEqual(errors.message('ERR_SOCKET_BAD_PORT', [0]),
-                   'Port:0 should be > 0 and < 65536');
+assert.strictEqual(
+  errors.message('ERR_SOCKET_BAD_PORT', [0]),
+  'Port should be > 0 and < 65536. Received 0.');
 
 // Test ERR_TLS_CERT_ALTNAME_INVALID
 assert.strictEqual(