#include "device-handler.h"
#include "discover-server.h"
+#include "sysinfo.h"
struct discover_server {
int socket;
return client_write_message(server, client, message);
}
+static int write_system_info_message(struct discover_server *server,
+ struct client *client, const struct system_info *sysinfo)
+{
+ struct pb_protocol_message *message;
+ int len;
+
+ len = pb_protocol_system_info_len(sysinfo);
+
+ message = pb_protocol_create_message(client,
+ PB_PROTOCOL_ACTION_SYSTEM_INFO, len);
+ if (!message)
+ return -1;
+
+ pb_protocol_serialise_system_info(sysinfo, message->payload, len);
+
+ return client_write_message(server, client, message);
+}
+
static int discover_server_process_message(void *arg)
{
struct pb_protocol_message *message;
}
- if (message->action != PB_PROTOCOL_ACTION_BOOT) {
- pb_log("%s: invalid action %d\n", __func__, message->action);
- return 0;
- }
+ 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;
- boot_command = talloc(client, struct boot_command);
+ case PB_PROTOCOL_ACTION_CANCEL_DEFAULT:
+ device_handler_cancel_default(client->server->device_handler);
+ break;
- rc = pb_protocol_deserialise_boot_command(boot_command, message);
- if (rc) {
- pb_log("%s: no boot command?", __func__);
+ default:
+ pb_log("%s: invalid action %d\n", __func__, message->action);
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);
- if (!fd) {
+ if (fd < 0) {
pb_log("accept: %s\n", strerror(errno));
return 0;
}
client->fd = fd;
client->server = server;
+ /* send sysinfo to client */
+ rc = write_system_info_message(server, client, system_info_get());
+ if (rc)
+ return 0;
+
/* send existing devices to client */
n_devices = device_handler_get_device_count(server->device_handler);
for (i = 0; i < n_devices; i++) {
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;
}
write_boot_status_message(server, client, status);
}
+void discover_server_notify_system_info(struct discover_server *server,
+ const struct system_info *sysinfo)
+{
+ struct client *client;
+
+ list_for_each_entry(&server->clients, client, list)
+ write_system_info_message(server, client, sysinfo);
+}
+
void discover_server_set_device_source(struct discover_server *server,
struct device_handler *handler)
{
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;