X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fdiscover-server.c;h=67ce266c4c433fced328f810360094cd8e60f10f;hb=4a78c9a5327cad94a2c23b9bff8edcd77fb54fa9;hp=138551ab2ddfa841a6e1533a884ee69541c02b30;hpb=556e622653c72de9b3eda70995e9f8619ee1c9a1;p=petitboot

diff --git a/discover/discover-server.c b/discover/discover-server.c
index 138551a..67ce266 100644
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -203,12 +203,12 @@ static int discover_server_process_message(void *arg)
 static int discover_server_process_connection(void *arg)
 {
 	struct discover_server *server = arg;
+	int fd, rc, i, n_devices;
 	struct client *client;
-	int fd, i, n_devices;
 
 	/* accept the incoming connection */
 	fd = accept(server->socket, NULL, 0);
-	if (!fd) {
+	if (fd < 0) {
 		pb_log("accept: %s\n", strerror(errno));
 		return 0;
 	}
@@ -229,15 +229,21 @@ static int discover_server_process_connection(void *arg)
 		const struct discover_device *device;
 
 		device = device_handler_get_device(server->device_handler, i);
-		write_device_add_message(server, client, device->device);
+		rc = write_device_add_message(server, client, device->device);
+		if (rc)
+			return 0;
 
-		list_for_each_entry(&device->boot_options, opt, list)
-			write_boot_option_add_message(server, client,
+		list_for_each_entry(&device->boot_options, opt, list) {
+			rc = write_boot_option_add_message(server, client,
 					opt->option);
+			if (rc)
+				return 0;
+		}
 	}
 
-	client->waiter = waiter_register(server->waitset, client->fd, WAIT_IN,
-				discover_server_process_message, client);
+	client->waiter = waiter_register_io(server->waitset, client->fd,
+				WAIT_IN, discover_server_process_message,
+				client);
 
 	return 0;
 }
@@ -322,7 +328,7 @@ struct discover_server *discover_server_init(struct waitset *waitset)
 		goto out_err;
 	}
 
-	server->waiter = waiter_register(server->waitset, server->socket,
+	server->waiter = waiter_register_io(server->waitset, server->socket,
 			WAIT_IN, discover_server_process_connection, server);
 
 	return server;