From 0dae2c10c7db909964d0c00607e983c1fc9db978 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Fri, 1 Sep 2017 12:33:54 -0400 Subject: Remove clientRemove call from clientCast If an error occurs on a client socket during a broadcast, that client will show up in the kqueue loop with EV_EOF and get removed that way. Tested by sending SIGKILL to a client and watching its cursor disappear. --- server.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/server.c b/server.c index 6992dc5..85b1f6c 100644 --- a/server.c +++ b/server.c @@ -114,8 +114,6 @@ static struct Client *clientAdd(int fd) { return client; } -static void clientRemove(struct Client *client); - static bool clientSend(const struct Client *client, const struct ServerMessage *msg) { ssize_t len = send(client->fd, msg, sizeof(*msg), 0); if (len < 0) return false; @@ -130,16 +128,11 @@ static bool clientSend(const struct Client *client, const struct ServerMessage * } static void clientCast(const struct Client *origin, const struct ServerMessage *msg) { -retry: for (struct Client *client = clientHead; client; client = client->next) { if (client == origin) continue; if (client->tileX != origin->tileX) continue; if (client->tileY != origin->tileY) continue; - - if (!clientSend(client, msg)) { - clientRemove(client); - goto retry; - } + clientSend(client, msg); } } -- cgit 1.4.1