incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

catch more client-specific exceptions

Browse Source
This commit is contained in:
Martin Michelsen
2022-06-26 11:41:39 -07:00
parent e0c44f8642
commit cf8dd69edc
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Server.cc
+23 -4
View File
@@ -40,7 +40,11 @@ void Server::disconnect_client(shared_ptr<Client> c) {
this->channel_to_client.erase(&c->channel); this->channel_to_client.erase(&c->channel);
c->channel.disconnect(); c->channel.disconnect();
process_disconnect(this->state, c); try {
process_disconnect(this->state, c);
} catch (const exception& e) {
this->log(WARNING, "Error during client disconnect cleanup: %s", e.what());
}
// c is destroyed here (process_disconnect should remove any other references // c is destroyed here (process_disconnect should remove any other references
// to it, e.g. from Lobby objects) // to it, e.g. from Lobby objects)
} }
@@ -83,7 +87,12 @@ void Server::on_listen_accept(struct evconnlistener* listener,
c->channel.context_obj = this; c->channel.context_obj = this;
this->channel_to_client.emplace(&c->channel, c); this->channel_to_client.emplace(&c->channel, c);
process_connect(this->state, c); try {
process_connect(this->state, c);
} catch (const exception& e) {
this->log(WARNING, "Error during client initialization: %s", e.what());
this->disconnect_client(c);
}
} }
void Server::connect_client( void Server::connect_client(
@@ -105,7 +114,12 @@ void Server::connect_client(
sin->sin_addr.s_addr = htonl(address); sin->sin_addr.s_addr = htonl(address);
sin->sin_port = htons(port); sin->sin_port = htons(port);
process_connect(this->state, c); try {
process_connect(this->state, c);
} catch (const exception& e) {
this->log(WARNING, "Error during client initialization: %s", e.what());
this->disconnect_client(c);
}
} }
void Server::on_listen_error(struct evconnlistener* listener) { void Server::on_listen_error(struct evconnlistener* listener) {
@@ -122,7 +136,12 @@ void Server::on_client_input(Channel& ch, uint16_t command, uint32_t flag, std::
if (c->should_disconnect) { if (c->should_disconnect) {
server->disconnect_client(c); server->disconnect_client(c);
} else { } else {
process_command(server->state, c, command, flag, data); try {
process_command(server->state, c, command, flag, data);
} catch (const exception& e) {
server->log(WARNING, "Error processing client command: %s", e.what());
c->should_disconnect = true;
}
if (c->should_disconnect) { if (c->should_disconnect) {
server->disconnect_client(c); server->disconnect_client(c);
} }