Merge pull request #2959 from thelounge/xpaw/relax-identd

Relax identd checks to make it more compatible
This commit is contained in:
Pavel Djundik 2019-01-15 13:32:39 +02:00 committed by GitHub
commit 13d21ce002
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -56,11 +56,8 @@ class Identification {
}
for (const connection of this.connections.values()) {
if (connection.socket.remoteAddress === socket.remoteAddress
&& connection.socket.remotePort === fport
&& connection.socket.localPort === lport
&& connection.socket.localAddress === socket.localAddress) {
return socket.write(`${lport}, ${fport} : USERID : UNIX : ${connection.user}\r\n`);
if (connection.socket.remotePort === fport && connection.socket.localPort === lport) {
return socket.write(`${lport}, ${fport} : USERID : TheLounge : ${connection.user}\r\n`);
}
}
@ -91,9 +88,7 @@ class Identification {
let file = "# Warning: file generated by The Lounge: changes will be overwritten!\n";
this.connections.forEach((connection) => {
file += `to ${connection.socket.remoteAddress}`
+ ` fport ${connection.socket.remotePort}`
+ ` from ${connection.socket.localAddress}`
file += `fport ${connection.socket.remotePort}`
+ ` lport ${connection.socket.localPort}`
+ ` { reply "${connection.user}" }\n`;
});