coolaj86
/
digd.js
2
1
Fork 1
Code Issues 7 Pull Requests 2 Releases Activity

don't throw on error

This commit is contained in:
AJ ONeal 2017-12-15 04:20:16 +00:00
parent d8ead3181d
commit e2393d965a
2 changed files with 58 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/tcpd.js
View File

@ -53,10 +53,11 @@ module.exports.create = function (cli, dnsd) {
process.exit(0); process.exit(0);
} }
console.error("TCP Server Error:"); console.error("TCP Server Error:");
console.error(err); console.error(err.stack);
tcpServer.close(function () { tcpServer.close(function () {
setTimeout(runTcp, 1000); setTimeout(runTcp, 1000);
}); });
//throw new Error(err);
}); });
tcpServer.listen(cli.port, function () { tcpServer.listen(cli.port, function () {

104
lib/udpd.js
View File

@ -1,58 +1,66 @@
'use strict'; 'use strict';
module.exports.create = function (cli, dnsd) { module.exports.create = function (cli, dnsd) {
var server = require('dgram').createSocket({ function runUdp() {
type: cli.udp6 ? 'udp6' : 'udp4' var server = require('dgram').createSocket({
, reuseAddr: true type: cli.udp6 ? 'udp6' : 'udp4'
}); , reuseAddr: true
server.bind({ });
port: cli.port server.bind({
, address: cli.address port: cli.port
}); , address: cli.address
var handlers = {};
handlers.onError = function (err) {
if ('EACCES' === err.code) {
console.error("");
console.error("EACCES: Couldn't bind to port. You probably need to use sudo, authbind, or setcap.");
console.error("");
process.exit(123);
return;
}
console.error("error:", err.stack);
server.close();
};
handlers.onMessage = function (nb, rinfo) {
//console.log('[DEBUG] got a UDP message', nb.length);
//console.log(nb.toString('hex'));
dnsd.onMessage(nb, function (err, newAb, dbgmsg) {
// TODO send legit error message
if (err) { server.send(Buffer.from([0x00])); return; }
server.send(newAb, rinfo.port, rinfo.address, function () {
console.log(dbgmsg, rinfo.port, rinfo.address);
});
}); });
};
handlers.onListening = function () { var handlers = {};
/*jshint validthis:true*/ handlers.onError = function (err) {
var server = this; if ('EACCES' === err.code) {
console.error("");
console.error("EACCES: Couldn't bind to port. You probably need to use sudo, authbind, or setcap.");
console.error("");
process.exit(123);
return;
}
console.error("UDP Server Error:");
console.error(err.stack);
server.close(function () {
setTimeout(runUdp, 1000);
});
//throw new Error(err);
};
if (cli.mdns || '224.0.0.251' === cli.nameserver) { handlers.onMessage = function (nb, rinfo) {
server.setBroadcast(true); //console.log('[DEBUG] got a UDP message', nb.length);
server.addMembership(cli.nameserver); //console.log(nb.toString('hex'));
}
console.log(''); dnsd.onMessage(nb, function (err, newAb, dbgmsg) {
console.log('Bound and Listening:'); // TODO send legit error message
console.log(server.address().address + '#' + server.address().port + ' (' + server.type + ')'); if (err) { server.send(Buffer.from([0x00]), rinfo.port, rinfo.address); return; }
}; server.send(newAb, rinfo.port, rinfo.address, function () {
console.log('[dnsd.onMessage] ' + dbgmsg, rinfo.port, rinfo.address);
});
});
};
server.on('error', handlers.onError); handlers.onListening = function () {
server.on('message', handlers.onMessage); /*jshint validthis:true*/
server.on('listening', handlers.onListening); var server = this;
return server; if (cli.mdns || '224.0.0.251' === cli.nameserver) {
server.setBroadcast(true);
server.addMembership(cli.nameserver);
}
console.log('');
console.log('Bound and Listening:');
console.log(server.address().address + '#' + server.address().port + ' (' + server.type + ')');
};
server.on('error', handlers.onError);
server.on('message', handlers.onMessage);
server.on('listening', handlers.onListening);
return server;
}
return runUdp();
}; };