moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Remove inhSocket stuff at least for now: a) It's untested and liekly dangerous, b) does not work with SSH connections

This commit is contained in:
Bryan Ashby 2015-12-07 21:44:42 -07:00
parent 06974973a3
commit 4458bcfd37
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/door.js
View File

@ -95,7 +95,7 @@ Door.prototype.run = function() {
args[i] = self.exeInfo.args[i].format({ args[i] = self.exeInfo.args[i].format({
dropFile : self.exeInfo.dropFile, dropFile : self.exeInfo.dropFile,
node : self.exeInfo.node.toString(), node : self.exeInfo.node.toString(),
inhSocket : self.exeInfo.inhSocket.toString(), //inhSocket : self.exeInfo.inhSocket.toString(),
srvPort : sockServer ? sockServer.address().port.toString() : '-1', srvPort : sockServer ? sockServer.address().port.toString() : '-1',
userId : self.client.user.userId.toString(), userId : self.client.user.userId.toString(),
}); });

3
core/dropfile.js
View File

@ -154,7 +154,8 @@ function DropFile(client, fileType) {
// :TODO: local/serial/telnet need to be configurable -- which also changes socket handle! // :TODO: local/serial/telnet need to be configurable -- which also changes socket handle!
return iconv.encode([ return iconv.encode([
'2', // :TODO: This needs to be configurable! '2', // :TODO: This needs to be configurable!
self.client.output._handle.fd.toString(), // :TODO: ALWAYS -1 on Windows! // :TODO: Completely broken right now -- This need to be configurable & come from temp socket server most likely
'-1', // self.client.output._handle.fd.toString(), // :TODO: ALWAYS -1 on Windows!
'57600', '57600',
Config.general.boardName, Config.general.boardName,
self.client.user.userId.toString(), self.client.user.userId.toString(),

4
mods/abracadabra.js
View File

@ -70,6 +70,7 @@ function AbracadabraModule(options) {
this.config = options.menuConfig.config; this.config = options.menuConfig.config;
// :TODO: MenuModule.validateConfig(cb) -- validate config section gracefully instead of asserts!
assert(_.isString(this.config.name, 'Config \'name\' is required')); assert(_.isString(this.config.name, 'Config \'name\' is required'));
assert(_.isString(this.config.dropFileType, 'Config \'dropFileType\' is required')); assert(_.isString(this.config.dropFileType, 'Config \'dropFileType\' is required'));
assert(_.isString(this.config.cmd, 'Config \'cmd\' is required')); assert(_.isString(this.config.cmd, 'Config \'cmd\' is required'));
@ -140,6 +141,7 @@ function AbracadabraModule(options) {
], ],
function complete(err) { function complete(err) {
if(err) { if(err) {
self.client.log.warn( { error : err.toString() }, 'Could not start door');
self.lastError = err; self.lastError = err;
self.prevMenu(); self.prevMenu();
} else { } else {
@ -158,7 +160,7 @@ function AbracadabraModule(options) {
encoding : self.config.encoding || self.client.term.outputEncoding, encoding : self.config.encoding || self.client.term.outputEncoding,
dropFile : self.dropFile.fileName, dropFile : self.dropFile.fileName,
node : self.client.node, node : self.client.node,
inhSocket : self.client.output._handle.fd, //inhSocket : self.client.output._handle.fd,
}; };
var doorInstance = new door.Door(self.client, exeInfo); var doorInstance = new door.Door(self.client, exeInfo);