TeaSpeak/TeaWeb
TeaSpeak/TeaWeb
1
0
Fork 0
Code Issues 1 Pull requests Activity

Improved ban disconnect handling

Browse source 
Signed-off-by: WolverinDEV <git@teaspeak.de>
This commit is contained in:
WolverinDEV 2019-12-21 16:23:35 +01:00
parent a842cffd74
commit cd01b9d89e
No known key found for this signature in database
GPG key ID: 77A6C15085150EEB
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
shared/js/ConnectionHandler.ts
View file

@ -554,17 +554,8 @@ class ConnectionHandler {
auto_reconnect = false; auto_reconnect = false;
break; break;
case DisconnectReason.HANDSHAKE_BANNED: case DisconnectReason.HANDSHAKE_BANNED:
this.log.log(log.server.Type.SERVER_BANNED, { //Reason message already printed because of the command error handling
invoker: { this.sound.play(Sound.CONNECTION_BANNED);
client_name: data["invokername"],
client_id: parseInt(data["invokerid"]),
client_unique_id: data["invokeruid"]
},
message: data["reasonmsg"],
time: parseInt(data["time"])
});
this.sound.play(Sound.CONNECTION_BANNED); //TODO findout if it was a disconnect or a connect refuse
break; break;
case DisconnectReason.CLIENT_BANNED: case DisconnectReason.CLIENT_BANNED:
this.log.log(log.server.Type.SERVER_BANNED, { this.log.log(log.server.Type.SERVER_BANNED, {
@ -577,7 +568,7 @@ class ConnectionHandler {
message: data["reasonmsg"], message: data["reasonmsg"],
time: parseInt(data["time"]) time: parseInt(data["time"])
}); });
this.sound.play(Sound.CONNECTION_BANNED); //TODO findout if it was a disconnect or a connect refuse this.sound.play(Sound.CONNECTION_BANNED);
break; break;
default: default:
log.error(LogCategory.CLIENT, tr("Got uncaught disconnect!")); log.error(LogCategory.CLIENT, tr("Got uncaught disconnect!"));

2
shared/js/connection/HandshakeHandler.ts
View file

@ -131,7 +131,7 @@ namespace connection {
if(error.id == 1028) { if(error.id == 1028) {
this.connection.client.handleDisconnect(DisconnectReason.SERVER_REQUIRES_PASSWORD); this.connection.client.handleDisconnect(DisconnectReason.SERVER_REQUIRES_PASSWORD);
} else if(error.id == 783 || error.id == 519) { } else if(error.id == 783 || error.id == 519) {
error.extra_message = parseInt(error.extra_message) == NaN ? "8" : error.extra_message; error.extra_message = isNaN(parseInt(error.extra_message)) ? "8" : error.extra_message;
this.connection.client.handleDisconnect(DisconnectReason.IDENTITY_TOO_LOW, error); this.connection.client.handleDisconnect(DisconnectReason.IDENTITY_TOO_LOW, error);
} else if(error.id == 3329) { } else if(error.id == 3329) {
this.connection.client.handleDisconnect(DisconnectReason.HANDSHAKE_BANNED, error); this.connection.client.handleDisconnect(DisconnectReason.HANDSHAKE_BANNED, error);