supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix variable shuffling around ident handler

Browse Source 
Fixes #965
This commit is contained in:
Pavel Djundik 2017-03-17 22:19:08 +02:00
parent ff72ebbb74
commit c409328ddf
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/identification.js
View File

@ -30,10 +30,10 @@ class Identification {
var address = server.address(); var address = server.address();
log.info(`Identd server available on ${colors.green(address.address + ":" + address.port)}`); log.info(`Identd server available on ${colors.green(address.address + ":" + address.port)}`);
startedCallback(); startedCallback(this);
}); });
} else { } else {
startedCallback(); startedCallback(this);
} }
} }

5
src/plugins/irc-events/connection.js
View File

@ -6,7 +6,6 @@ var Helper = require("../../helper");
module.exports = function(irc, network) { module.exports = function(irc, network) {
var client = this; var client = this;
var identHandler = this.manager.identHandler;
network.channels[0].pushMessage(client, new Msg({ network.channels[0].pushMessage(client, new Msg({
text: "Network created, connecting to " + network.host + ":" + network.port + "..." text: "Network created, connecting to " + network.host + ":" + network.port + "..."
@ -65,12 +64,12 @@ module.exports = function(irc, network) {
let identSocketId; let identSocketId;
irc.on("raw socket connected", function(socket) { irc.on("raw socket connected", function(socket) {
identSocketId = identHandler.addSocket(socket, client.name || network.username); identSocketId = client.manager.identHandler.addSocket(socket, client.name || network.username);
}); });
irc.on("socket close", function() { irc.on("socket close", function() {
if (identSocketId > 0) { if (identSocketId > 0) {
identHandler.removeSocket(identSocketId); client.manager.identHandler.removeSocket(identSocketId);
identSocketId = 0; identSocketId = 0;
} }
}); });

3
src/server.js
View File

@ -13,7 +13,6 @@ var ldap = require("ldapjs");
var colors = require("colors/safe"); var colors = require("colors/safe");
const Identification = require("./identification"); const Identification = require("./identification");
let identHandler = null;
var manager = null; var manager = null;
var authFunction = localAuth; var authFunction = localAuth;
@ -89,7 +88,7 @@ in ${config.public ? "public" : "private"} mode`);
manager = new ClientManager(); manager = new ClientManager();
identHandler = new Identification(() => { new Identification((identHandler) => {
manager.init(identHandler, sockets); manager.init(identHandler, sockets);
}); });
}; };