discover: Don't free clients on write failure

[petitboot] / discover / discover-server.c

diff --git a/discover/discover-server.c b/discover/discover-server.c
index 25dbd1476cdd9d6cf2ba817d74716d7944e40542..2467e33dc97ac5b9cfc45c44576f18d6f969c79a 100644 (file)
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -34,6 +34,7 @@ struct client {
        struct list_item list;
        struct waiter *waiter;
        int fd;
+       bool remote_closed;
 };
 
 
@@ -89,9 +90,12 @@ static int client_write_message(
 {
        int rc;
 
+       if (client->remote_closed)
+               return -1;
+
        rc = pb_protocol_write_message(client->fd, message);
        if (rc)
-               talloc_free(client);
+               client->remote_closed = true;
 
        return rc;
 }
@@ -250,6 +254,9 @@ static int discover_server_process_connection(void *arg)
 
        client->fd = fd;
        client->server = server;
+       client->waiter = waiter_register_io(server->waitset, client->fd,
+                               WAIT_IN, discover_server_process_message,
+                               client);
 
        /* send sysinfo to client */
        rc = write_system_info_message(server, client, system_info_get());
@@ -275,10 +282,6 @@ static int discover_server_process_connection(void *arg)
                }
        }
 
-       client->waiter = waiter_register_io(server->waitset, client->fd,
-                               WAIT_IN, discover_server_process_message,
-                               client);
-
        return 0;
 }