1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more lint

Browse Source
This commit is contained in:
Ryan Dahl 2010-12-01 17:29:11 -08:00
parent ac58d3a665
commit f22c248e4c
4 changed files with 91 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/constants.js
View File

@ -1 +1 @@
module.exports = process.binding("constants"); module.exports = process.binding('constants');

77
lib/dgram.js
View File

@ -1,6 +1,6 @@
var util = require("util"); var util = require('util');
var fs = require("fs"); var fs = require('fs');
var events = require("events"); var events = require('events');
var dns = require('dns'); var dns = require('dns');
var IOWatcher = process.binding('io_watcher').IOWatcher; var IOWatcher = process.binding('io_watcher').IOWatcher;
@ -31,10 +31,11 @@ function getPool() {
} }
function dnsLookup(type, hostname, callback) { function dnsLookup(type, hostname, callback) {
var family = (type ? ((type === "udp6") ? 6 : 4) : null); var family = (type ? ((type === 'udp6') ? 6 : 4) : null);
dns.lookup(hostname, family, function(err, ip, addressFamily) { dns.lookup(hostname, family, function(err, ip, addressFamily) {
if (!err && family && addressFamily !== family) { if (!err && family && addressFamily !== family) {
err = new Error('no address found in family '+type+' for '+hostname); err = new Error('no address found in family ' + type +
' for ' + hostname);
} }
callback(err, ip, addressFamily); callback(err, ip, addressFamily);
}); });
@ -45,10 +46,11 @@ function Socket (type, listener) {
var self = this; var self = this;
self.type = type; self.type = type;
if (type === "unix_dgram" || type === "udp4" || type === "udp6") { if (type === 'unix_dgram' || type === 'udp4' || type === 'udp6') {
self.fd = socket(self.type); self.fd = socket(self.type);
} else { } else {
throw new Error("Bad socket type specified. Valid types are: unix_dgram, udp4, udp6"); throw new Error('Bad socket type specified. Valid types are: ' +
'unix_dgram, udp4, udp6');
} }
if (typeof listener === 'function') { if (typeof listener === 'function') {
@ -70,7 +72,7 @@ function Socket (type, listener) {
} }
}; };
if (self.type === "udp4" || self.type === "udp6") { if (self.type === 'udp4' || self.type === 'udp6') {
self._startWatcher(); self._startWatcher();
} }
} }
@ -85,33 +87,37 @@ exports.createSocket = function (type, listener) {
Socket.prototype.bind = function() { Socket.prototype.bind = function() {
var self = this; var self = this;
if (this.type === "unix_dgram") { // bind(path) if (this.type === 'unix_dgram') {
if (typeof arguments[0] !== "string") { // bind(path)
throw new Error("unix_dgram sockets must be bound to a path in the filesystem"); if (typeof arguments[0] !== 'string') {
throw new Error('unix_dgram sockets must be bound to a path in ' +
'the filesystem');
} }
this.path = arguments[0]; this.path = arguments[0];
fs.unlink(this.path, function (err) { // unlink old file, OK if it doesn't exist // unlink old file, OK if it doesn't exist
fs.unlink(this.path, function(err) {
if (err && err.errno !== ENOENT) { if (err && err.errno !== ENOENT) {
throw err; throw err;
} else { } else {
try { try {
binding.bind(self.fd, self.path); binding.bind(self.fd, self.path);
self._startWatcher(); self._startWatcher();
self.emit("listening"); self.emit('listening');
} catch (err) { } catch (err) {
console.log("Error in unix_dgram bind of " + self.path); console.log('Error in unix_dgram bind of ' + self.path);
console.log(err.stack); console.log(err.stack);
throw err; throw err;
} }
} }
}); });
} else if (this.type === "udp4" || this.type === "udp6") { // bind(port, [address]) } else if (this.type === 'udp4' || this.type === 'udp6') {
// bind(port, [address])
if (arguments[1] === undefined) { if (arguments[1] === undefined) {
// Not bind()ing a specific address. Use INADDR_ANY and OS will pick one. // Not bind()ing a specific address. Use INADDR_ANY and OS will pick one.
// The address can be found with server.address() // The address can be found with server.address()
binding.bind(self.fd, arguments[0]); binding.bind(self.fd, arguments[0]);
this.emit("listening"); this.emit('listening');
} else { } else {
// the first argument is the port, the second an address // the first argument is the port, the second an address
this.port = arguments[0]; this.port = arguments[0];
@ -121,7 +127,7 @@ Socket.prototype.bind = function () {
} else { } else {
self.ip = ip; self.ip = ip;
binding.bind(self.fd, self.port, ip); binding.bind(self.fd, self.port, ip);
self.emit("listening"); self.emit('listening');
} }
}); });
} }
@ -130,7 +136,8 @@ Socket.prototype.bind = function () {
Socket.prototype._startWatcher = function() { Socket.prototype._startWatcher = function() {
if (! this._watcherStarted) { if (! this._watcherStarted) {
this.watcher.set(this.fd, true, false); // listen for read ready, not write ready // listen for read ready, not write ready
this.watcher.set(this.fd, true, false);
this.watcher.start(); this.watcher.start();
this._watcherStarted = true; this._watcherStarted = true;
} }
@ -154,7 +161,7 @@ Socket.prototype.setTTL = function(arg) {
if (newttl > 0 && newttl < 256) { if (newttl > 0 && newttl < 256) {
return binding.setTTL(this.fd, newttl); return binding.setTTL(this.fd, newttl);
} else { } else {
throw new Error("New TTL must be between 1 and 255"); throw new Error('New TTL must be between 1 and 255');
} }
}; };
@ -162,19 +169,22 @@ Socket.prototype.setTTL = function(arg) {
Socket.prototype.send = function(buffer, offset, length) { Socket.prototype.send = function(buffer, offset, length) {
var self = this; var self = this;
if (typeof offset !== "number" || typeof length !== "number") { if (typeof offset !== 'number' || typeof length !== 'number') {
throw new Error("send takes offset and length as args 2 and 3"); throw new Error('send takes offset and length as args 2 and 3');
} }
if (this.type === "unix_dgram") { // send(buffer, offset, length, path [, callback]) if (this.type === 'unix_dgram') {
if (typeof arguments[3] !== "string") { // send(buffer, offset, length, path [, callback])
throw new Error("unix_dgram sockets must send to a path in the filesystem"); if (typeof arguments[3] !== 'string') {
throw new Error('unix_dgram sockets must send to a path ' +
'in the filesystem');
} }
self.sendto(buffer, offset, length, arguments[3], null, arguments[4]); self.sendto(buffer, offset, length, arguments[3], null, arguments[4]);
} else if (this.type === "udp4" || this.type === "udp6") { // send(buffer, offset, length, port, address [, callback]) } else if (this.type === 'udp4' || this.type === 'udp6') {
if (typeof arguments[4] !== "string") { // send(buffer, offset, length, port, address [, callback])
throw new Error(this.type + " sockets must send to port, address"); if (typeof arguments[4] !== 'string') {
throw new Error(this.type + ' sockets must send to port, address');
} }
if (binding.isIP(arguments[4])) { if (binding.isIP(arguments[4])) {
@ -197,7 +207,12 @@ Socket.prototype.send = function(buffer, offset, length) {
} }
}; };
Socket.prototype.sendto = function(buffer, offset, length, port, addr, callback) { Socket.prototype.sendto = function(buffer,
offset,
length,
port,
addr,
callback) {
try { try {
var bytes = binding.sendto(this.fd, buffer, offset, length, 0, port, addr); var bytes = binding.sendto(this.fd, buffer, offset, length, 0, port, addr);
} catch (err) { } catch (err) {
@ -223,11 +238,11 @@ Socket.prototype.close = function () {
close(this.fd); close(this.fd);
this.fd = null; this.fd = null;
if (this.type === "unix_dgram" && this.path) { if (this.type === 'unix_dgram' && this.path) {
fs.unlink(this.path, function() { fs.unlink(this.path, function() {
self.emit("close"); self.emit('close');
}); });
} else { } else {
this.emit("close"); this.emit('close');
} }
}; };