}
- if (message->action != PB_PROTOCOL_ACTION_BOOT) {
+ switch (message->action) {
+ case PB_PROTOCOL_ACTION_BOOT:
+ boot_command = talloc(client, struct boot_command);
+
+ rc = pb_protocol_deserialise_boot_command(boot_command,
+ message);
+ if (rc) {
+ pb_log("%s: no boot command?", __func__);
+ return 0;
+ }
+
+ device_handler_boot(client->server->device_handler,
+ boot_command);
+ break;
+
+ case PB_PROTOCOL_ACTION_CANCEL_DEFAULT:
+ device_handler_cancel_default(client->server->device_handler);
+ break;
+
+ default:
pb_log("%s: invalid action %d\n", __func__, message->action);
return 0;
}
- boot_command = talloc(client, struct boot_command);
-
- rc = pb_protocol_deserialise_boot_command(boot_command, message);
- if (rc) {
- pb_log("%s: no boot command?", __func__);
- return 0;
- }
-
- device_handler_boot(client->server->device_handler, boot_command);
return 0;
}
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);
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;
}
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;